From 53cfee79505d86737282c639554e87202116ff1b Mon Sep 17 00:00:00 2001 From: Joseph Anthony Pasquale Holsten Date: Wed, 30 Jan 2013 18:27:07 -0800 Subject: [PATCH 0001/1622] add fedora 18 support --- definitions/.fedora/cleanup.sh | 5 ++++ definitions/.fedora/ks.cfg | 42 ++++++++++++++++++++++++++++ definitions/.fedora/session.rb | 13 +++++++++ definitions/fedora-18/chef-client.sh | 1 + definitions/fedora-18/cleanup.sh | 1 + definitions/fedora-18/definition.rb | 16 +++++++++++ definitions/fedora-18/ks.cfg | 1 + definitions/fedora-18/minimize.sh | 1 + definitions/fedora-18/vagrant.sh | 1 + 9 files changed, 81 insertions(+) create mode 100644 definitions/.fedora/cleanup.sh create mode 100644 definitions/.fedora/ks.cfg create mode 100644 definitions/.fedora/session.rb create mode 120000 definitions/fedora-18/chef-client.sh create mode 120000 definitions/fedora-18/cleanup.sh create mode 100644 definitions/fedora-18/definition.rb create mode 120000 definitions/fedora-18/ks.cfg create mode 120000 definitions/fedora-18/minimize.sh create mode 120000 definitions/fedora-18/vagrant.sh diff --git a/definitions/.fedora/cleanup.sh b/definitions/.fedora/cleanup.sh new file mode 100644 index 000000000..c515ffa94 --- /dev/null +++ b/definitions/.fedora/cleanup.sh @@ -0,0 +1,5 @@ +#!/bin/bash -eux +yum -y erase gtk2 libX11 hicolor-icon-theme freetype +yum -y clean all +rm -rf VBoxGuestAdditions_*.iso VBoxGuestAdditions_*.iso.? +rm -f /tmp/chef*rpm diff --git a/definitions/.fedora/ks.cfg b/definitions/.fedora/ks.cfg new file mode 100644 index 000000000..7b71473d2 --- /dev/null +++ b/definitions/.fedora/ks.cfg @@ -0,0 +1,42 @@ +install +cdrom +lang en_US.UTF-8 +keyboard us +network --bootproto=dhcp +rootpw --iscrypted $1$damlkd,f$UC/u5pUts5QiU3ow.CSso/ +firewall --disabled +authconfig --enableshadow --passalgo=sha512 +selinux --disabled +timezone UTC +bootloader --location=mbr +text +skipx +zerombr +clearpart --all --initlabel +autopart +auth --useshadow --enablemd5 +firstboot --disabled +reboot + +%packages +@Core +@Development Tools +openssl-devel +readline-devel +zlib-devel +kernel-devel +wget +%end + +%post +# update root certs +wget -O/etc/pki/tls/certs/ca-bundle.crt http://curl.haxx.se/ca/cacert.pem +# vagrant +groupadd vagrant +useradd vagrant -g vagrant -G wheel -u 900 +echo "vagrant" | passwd --stdin vagrant +# sudo +echo 'Defaults:vagrant !requiretty' > /etc/sudoers.d/vagrant +echo '%vagrant ALL=(ALL) NOPASSWD: ALL' >> /etc/sudoers.d/vagrant +chmod 440 /etc/sudoers.d/vagrant +%end diff --git a/definitions/.fedora/session.rb b/definitions/.fedora/session.rb new file mode 100644 index 000000000..7a4d0dd4a --- /dev/null +++ b/definitions/.fedora/session.rb @@ -0,0 +1,13 @@ +require File.dirname(__FILE__) + "/../.common/session.rb" + +FEDORA_SESSION = + COMMON_SESSION.merge({ :boot_cmd_sequence => + [ ' text ks=http://%IP%:%PORT%/ks.cfg' ], + :kickstart_file => "ks.cfg", + :os_type_id => 'Fedora_64', + :memory_size=> "512", + :postinstall_files => [ "chef-client.sh", + "vagrant.sh", + "cleanup.sh", + "minimize.sh" ], + :shutdown_cmd => "/sbin/halt -h -p" }) diff --git a/definitions/fedora-18/chef-client.sh b/definitions/fedora-18/chef-client.sh new file mode 120000 index 000000000..635081810 --- /dev/null +++ b/definitions/fedora-18/chef-client.sh @@ -0,0 +1 @@ +../.common/chef-client.sh \ No newline at end of file diff --git a/definitions/fedora-18/cleanup.sh b/definitions/fedora-18/cleanup.sh new file mode 120000 index 000000000..1cf83b27e --- /dev/null +++ b/definitions/fedora-18/cleanup.sh @@ -0,0 +1 @@ +../.fedora/cleanup.sh \ No newline at end of file diff --git a/definitions/fedora-18/definition.rb b/definitions/fedora-18/definition.rb new file mode 100644 index 000000000..06dae1e80 --- /dev/null +++ b/definitions/fedora-18/definition.rb @@ -0,0 +1,16 @@ +require File.dirname(__FILE__) + "/../.fedora/session.rb" + +iso = "Fedora-18-x86_64-DVD.iso" + +session = + FEDORA_SESSION.merge( # :boot_cmd_sequence => + #[ ' linux text biosdevname=0 ks=http://%IP%:%PORT%/ks.cfg' ], + #:memory_size=> '480', + :iso_file => iso, + #:iso_md5 => "a991defc0a602d04f064c43290df0131", + :iso_src => "http://mirrors.kernel.org/fedora/releases/18/Fedora/x86_64/iso/#{iso}" + # Minimum RAM requirement for installation is 512MB. + #:memory_size=> '512', +) + +Veewee::Session.declare session diff --git a/definitions/fedora-18/ks.cfg b/definitions/fedora-18/ks.cfg new file mode 120000 index 000000000..15c8071a4 --- /dev/null +++ b/definitions/fedora-18/ks.cfg @@ -0,0 +1 @@ +../.fedora/ks.cfg \ No newline at end of file diff --git a/definitions/fedora-18/minimize.sh b/definitions/fedora-18/minimize.sh new file mode 120000 index 000000000..b3632ccbc --- /dev/null +++ b/definitions/fedora-18/minimize.sh @@ -0,0 +1 @@ +../.common/minimize.sh \ No newline at end of file diff --git a/definitions/fedora-18/vagrant.sh b/definitions/fedora-18/vagrant.sh new file mode 120000 index 000000000..702949639 --- /dev/null +++ b/definitions/fedora-18/vagrant.sh @@ -0,0 +1 @@ +../.common/vagrant.sh \ No newline at end of file From cd31cd6ffab1207e3d016902a99db547770c0639 Mon Sep 17 00:00:00 2001 From: Joseph Anthony Pasquale Holsten Date: Wed, 6 Feb 2013 23:01:19 +0000 Subject: [PATCH 0002/1622] fix dependencies for vbox additions, remove minor cruft --- definitions/.fedora/ks.cfg | 9 ++++++--- definitions/fedora-18/definition.rb | 9 ++------- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/definitions/.fedora/ks.cfg b/definitions/.fedora/ks.cfg index 7b71473d2..0decd94df 100644 --- a/definitions/.fedora/ks.cfg +++ b/definitions/.fedora/ks.cfg @@ -20,12 +20,15 @@ reboot %packages @Core -@Development Tools +bzip2 +gcc +kernel-devel +kernel-headers openssl-devel readline-devel -zlib-devel -kernel-devel +tar wget +zlib-devel %end %post diff --git a/definitions/fedora-18/definition.rb b/definitions/fedora-18/definition.rb index 06dae1e80..cb2d82dde 100644 --- a/definitions/fedora-18/definition.rb +++ b/definitions/fedora-18/definition.rb @@ -3,14 +3,9 @@ iso = "Fedora-18-x86_64-DVD.iso" session = - FEDORA_SESSION.merge( # :boot_cmd_sequence => - #[ ' linux text biosdevname=0 ks=http://%IP%:%PORT%/ks.cfg' ], - #:memory_size=> '480', - :iso_file => iso, - #:iso_md5 => "a991defc0a602d04f064c43290df0131", + FEDORA_SESSION.merge( :iso_file => iso, + :iso_md5 => "17d5c860bf9dc83e035882a7b33ffc77", :iso_src => "http://mirrors.kernel.org/fedora/releases/18/Fedora/x86_64/iso/#{iso}" - # Minimum RAM requirement for installation is 512MB. - #:memory_size=> '512', ) Veewee::Session.declare session From 97ded1f18885194d7a0238e9b1764c9e4870e421 Mon Sep 17 00:00:00 2001 From: Robert Newson Date: Fri, 15 Feb 2013 12:53:58 +0000 Subject: [PATCH 0003/1622] Update to ubuntu 12.04.2 --- definitions/ubuntu-12.04-i386/definition.rb | 4 ++-- definitions/ubuntu-12.04/definition.rb | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/definitions/ubuntu-12.04-i386/definition.rb b/definitions/ubuntu-12.04-i386/definition.rb index 120d45d1f..6eca9d23f 100644 --- a/definitions/ubuntu-12.04-i386/definition.rb +++ b/definitions/ubuntu-12.04-i386/definition.rb @@ -1,11 +1,11 @@ require File.dirname(__FILE__) + "/../.ubuntu/session.rb" -iso = "ubuntu-12.04.1-server-i386.iso" +iso = "ubuntu-12.04.2-server-i386.iso" session = UBUNTU_SESSION.merge( :os_type_id => 'Ubuntu', :iso_file => iso, - :iso_md5 => "3daaa312833a7da1e85e2a02787e4b66", + :iso_md5 => "7d186655efe871ea1a1492faf635beee", :iso_src => "http://releases.ubuntu.com/12.04/#{iso}" ) Veewee::Session.declare session diff --git a/definitions/ubuntu-12.04/definition.rb b/definitions/ubuntu-12.04/definition.rb index 7b597b6e3..3dba1db50 100644 --- a/definitions/ubuntu-12.04/definition.rb +++ b/definitions/ubuntu-12.04/definition.rb @@ -1,10 +1,10 @@ require File.dirname(__FILE__) + "/../.ubuntu/session.rb" -iso = "ubuntu-12.04.1-server-amd64.iso" +iso = "ubuntu-12.04.2-server-amd64.iso" session = UBUNTU_SESSION.merge( :iso_file => iso, - :iso_md5 => "a8c667e871f48f3a662f3fbf1c3ddb17", + :iso_md5 => "af5f788aee1b32c4b2634734309cc9e9", :iso_src => "http://releases.ubuntu.com/12.04/#{iso}" ) Veewee::Session.declare session From f0c989d837bbed57a8abe9fb36ce75cc98ca9f5a Mon Sep 17 00:00:00 2001 From: jtimberman Date: Sun, 24 Feb 2013 14:48:11 -0700 Subject: [PATCH 0004/1622] update for 11.2.0 links --- README.md | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 8ae6e56e0..49e4ea5c3 100644 --- a/README.md +++ b/README.md @@ -11,7 +11,7 @@ make "Don't Repeat Yourself" (DRY) modular baseboxes. Thanks Tim! ## Current Baseboxes The following baseboxes are publicly available and were built using -this project, and Chef 10.18.2. Future releases of Chef and baseboxes +this project, and Chef 11.2.0. Future releases of Chef and baseboxes will follow the naming convention used here: opscode_PLATFORM-VERSION_chef-VERSION.box @@ -19,6 +19,17 @@ will follow the naming convention used here: And located in the opscode-vm S3 bucket's vagrant directory as linked below. +* [opscode-centos-5.8](https://opscode-vm.s3.amazonaws.com/vagrant/opscode_centos-5.8_chef-11.2.0.box) +* [opscode-centos-6.3](https://opscode-vm.s3.amazonaws.com/vagrant/opscode_centos-6.3_chef-11.2.0.box) +* [opscode-ubuntu-10.04](https://opscode-vm.s3.amazonaws.com/vagrant/opscode_ubuntu-10.04_chef-11.2.0.box) +* [opscode-ubuntu-12.04](https://opscode-vm.s3.amazonaws.com/vagrant/opscode_ubuntu-12.04_chef-11.2.0.box) + +At this time, 32 bit boxes have not yet been built with Chef 11.2.0. + +## Older Baseboxes + +The following base boxes were built with Chef 10.18.2. + * [opscode-centos-5.8-i386](https://opscode-vm.s3.amazonaws.com/vagrant/opscode_centos-5.8-i386_chef-10.18.2.box) * [opscode-centos-5.8](https://opscode-vm.s3.amazonaws.com/vagrant/opscode_centos-5.8_chef-10.18.2.box) * [opscode-centos-6.3-i386](https://opscode-vm.s3.amazonaws.com/vagrant/opscode_centos-6.3-i386_chef-10.18.2.box) @@ -28,8 +39,6 @@ below. * [opscode-ubuntu-12.04-i386](https://opscode-vm.s3.amazonaws.com/vagrant/opscode_ubuntu-12.04-i386_chef-10.18.2.box) * [opscode-ubuntu-12.04](https://opscode-vm.s3.amazonaws.com/vagrant/opscode_ubuntu-12.04_chef-10.18.2.box) -## Older Baseboxes - The following base boxes were built with Chef 10.14.4. * [opscode-centos-5.8-i386](https://opscode-vm.s3.amazonaws.com/vagrant/boxes/opscode-centos-5.8-i386.box) From 92bf5a7a9fc887b6ba1a5da0c82c98b8dbb9a1f5 Mon Sep 17 00:00:00 2001 From: "Julian C. Dunn" Date: Wed, 6 Mar 2013 15:23:43 -0800 Subject: [PATCH 0005/1622] "#" is not a valid comment character for Windows batch files; use "REM" --- definitions/.windows/install-vbox.bat | 4 ++-- definitions/.windows/mount-validation.bat | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/definitions/.windows/install-vbox.bat b/definitions/.windows/install-vbox.bat index 8c34e3683..e5ccc4402 100644 --- a/definitions/.windows/install-vbox.bat +++ b/definitions/.windows/install-vbox.bat @@ -1,5 +1,5 @@ -# with this, we can open the iso, and extract the VBoxWindowsAdditions.exe! -# http://downloads.sourceforge.net/sevenzip/7z920.exe +REM with this, we can open the iso, and extract the VBoxWindowsAdditions.exe! +REM http://downloads.sourceforge.net/sevenzip/7z920.exe cmd /c certutil -addstore -f "TrustedPublisher" a:oracle-cert.cer cmd /c e:\VBoxWindowsAdditions-amd64.exe /S cmd /c shutdown.exe /r /t 0 /d p:2:4 /c "Vagrant reboot for VBoxWindowsAdditions" diff --git a/definitions/.windows/mount-validation.bat b/definitions/.windows/mount-validation.bat index e71179906..c58d832c3 100644 --- a/definitions/.windows/mount-validation.bat +++ b/definitions/.windows/mount-validation.bat @@ -1,3 +1,3 @@ -# This is so we can pass the validation test +REM This is so we can pass the validation test cmd /c net use z: \\vboxsrv\veewee-validation From 44aa385b7e26ec63f1a767f03f0057e988b63dcd Mon Sep 17 00:00:00 2001 From: Hippie Hacker Date: Fri, 15 Mar 2013 15:46:33 -0700 Subject: [PATCH 0006/1622] windows 8+2012 --- definitions/.windows/install-chef.bat | 8 +- definitions/.windows/install-vbox.bat | 2 +- definitions/.windows/mount-validation.bat | 2 +- definitions/.windows/session.rb | 2 +- .../windows-2008r2-standard/definition.rb | 4 +- .../windows-2012-standard/Autounattend.xml | 230 +++++++++++++++++ definitions/windows-2012-standard/README.md | 87 +++++++ .../windows-2012-standard/definition.rb | 17 ++ .../windows-2012-standard/install-chef.bat | 1 + .../windows-2012-standard/install-vbox.bat | 1 + .../mount-validation.bat | 1 + .../windows-2012-standard/oracle-cert.cer | 1 + .../windows-7-enterprise/definition.rb | 4 +- .../windows-8-enterprise/Autounattend.xml | 235 ++++++++++++++++++ definitions/windows-8-enterprise/README.md | 87 +++++++ .../windows-8-enterprise/definition.rb | 15 ++ .../windows-8-enterprise/install-chef.bat | 1 + .../windows-8-enterprise/install-vbox.bat | 1 + .../windows-8-enterprise/mount-validation.bat | 1 + .../windows-8-enterprise/oracle-cert.cer | 1 + 20 files changed, 694 insertions(+), 7 deletions(-) create mode 100644 definitions/windows-2012-standard/Autounattend.xml create mode 100644 definitions/windows-2012-standard/README.md create mode 100644 definitions/windows-2012-standard/definition.rb create mode 120000 definitions/windows-2012-standard/install-chef.bat create mode 120000 definitions/windows-2012-standard/install-vbox.bat create mode 120000 definitions/windows-2012-standard/mount-validation.bat create mode 120000 definitions/windows-2012-standard/oracle-cert.cer create mode 100644 definitions/windows-8-enterprise/Autounattend.xml create mode 100644 definitions/windows-8-enterprise/README.md create mode 100644 definitions/windows-8-enterprise/definition.rb create mode 120000 definitions/windows-8-enterprise/install-chef.bat create mode 120000 definitions/windows-8-enterprise/install-vbox.bat create mode 120000 definitions/windows-8-enterprise/mount-validation.bat create mode 120000 definitions/windows-8-enterprise/oracle-cert.cer diff --git a/definitions/.windows/install-chef.bat b/definitions/.windows/install-chef.bat index c90bfb677..0c255a2b1 100644 --- a/definitions/.windows/install-chef.bat +++ b/definitions/.windows/install-chef.bat @@ -1,2 +1,6 @@ -cmd /C cscript %TEMP%\wget.vbs /url:http://www.opscode.com/chef/install.msi /path:%TEMP%\chef-client.msi -cmd /C msiexec /qn /i %TEMP%\chef-client.msi +timeout 10 +REM sleeping to give outbound networkingh a chance to come up +cmd /C cscript wget.vbs /url:http://10.12.13.1/chef-client-11.4.0-18-gdf096fa-1.windows.msi /path:chef-client.msi +cmd /C msiexec /qn /i chef-client.msi +timeout 120 + diff --git a/definitions/.windows/install-vbox.bat b/definitions/.windows/install-vbox.bat index 8c34e3683..b28b58d3e 100644 --- a/definitions/.windows/install-vbox.bat +++ b/definitions/.windows/install-vbox.bat @@ -2,5 +2,5 @@ # http://downloads.sourceforge.net/sevenzip/7z920.exe cmd /c certutil -addstore -f "TrustedPublisher" a:oracle-cert.cer cmd /c e:\VBoxWindowsAdditions-amd64.exe /S -cmd /c shutdown.exe /r /t 0 /d p:2:4 /c "Vagrant reboot for VBoxWindowsAdditions" +cmd /c shutdown.exe /r /t 5 /d p:2:4 /c "Vagrant reboot for VBoxWindowsAdditions" diff --git a/definitions/.windows/mount-validation.bat b/definitions/.windows/mount-validation.bat index e71179906..ae458c1d6 100644 --- a/definitions/.windows/mount-validation.bat +++ b/definitions/.windows/mount-validation.bat @@ -1,3 +1,3 @@ -# This is so we can pass the validation test +REM This is so we can pass the validation test... I don't know that it's necessary cmd /c net use z: \\vboxsrv\veewee-validation diff --git a/definitions/.windows/session.rb b/definitions/.windows/session.rb index 182b0b95d..f639f260d 100644 --- a/definitions/.windows/session.rb +++ b/definitions/.windows/session.rb @@ -12,7 +12,7 @@ :postinstall_files => [ "install-chef.bat", "install-vbox.bat", # would be interesting to only include this on vbox - "mount-validation.bat" # maybe test if we are within a vbox vm? + # "mount-validation.bat" # maybe test if we are within a vbox vm? # because this will eventually run on kvm, openstack, etc etc ], :video_memory_size => '48', diff --git a/definitions/windows-2008r2-standard/definition.rb b/definitions/windows-2008r2-standard/definition.rb index 31a37278b..31dc7e185 100644 --- a/definitions/windows-2008r2-standard/definition.rb +++ b/definitions/windows-2008r2-standard/definition.rb @@ -8,7 +8,9 @@ :iso_download_instructions => "Download and install full featured software for 180-day trial at http://technet.microsoft.com/en-us/evalcenter/dd459137.aspx", :iso_src => iso_src, :iso_file => File.basename(iso_src), - :iso_md5 => "4263be2cf3c59177c45085c0a7bc6ca5" + :iso_md5 => "4263be2cf3c59177c45085c0a7bc6ca5", + :kickstart_port => "7150" + }) Veewee::Session.declare session diff --git a/definitions/windows-2012-standard/Autounattend.xml b/definitions/windows-2012-standard/Autounattend.xml new file mode 100644 index 000000000..3f3d0ef9f --- /dev/null +++ b/definitions/windows-2012-standard/Autounattend.xml @@ -0,0 +1,230 @@ + + + + + + + + + + + + + + 1 + Primary + 20000 + + + + + + false + NTFS + C + 1 + 1 + + + + + 0 + true + + + OnError + + + + + YC6KT-GKW9T-YTKYR-T4X34-R7VHC + Never + + + true + Vagrant Fullname + Vagrant Inc + + + + + + 0 + 1 + + OnError + false + + + /IMAGE/NAME + Windows Server 2008 R2 SERVERSTANDARD + + + + + + + + + + en-US + + en-US + en-US + en-US + en-US + en-US + + + + + + + + + vagrant + true</PlainText> + </AdministratorPassword> + <LocalAccounts> + <LocalAccount wcm:action="add"> + <Password> + <Value>vagrant</Value> + <PlainText>true</PlainText> + </Password> + <Description>Vagrant User</Description> + <DisplayName>vagrant</DisplayName> + <Group>administrators</Group> + <Name>vagrant</Name> + </LocalAccount> + </LocalAccounts> + </UserAccounts> + <OOBE> + <HideEULAPage>true</HideEULAPage> + <HideWirelessSetupInOOBE>true</HideWirelessSetupInOOBE> + <NetworkLocation>Home</NetworkLocation> + </OOBE> + <AutoLogon> + <Password> + <Value>vagrant</Value> + <PlainText>true</PlainText> + </Password> + <Username>administrator</Username> + <Enabled>true</Enabled> + </AutoLogon> + <FirstLogonCommands> + <!-- <SynchronousCommand wcm:action="add"> --> + <!-- <CommandLine>cmd.exe /c a:install-cygwin-sshd.bat</CommandLine> --> + <!-- <Description>Install Cygwin SSH</Description> --> + <!-- <Order>1</Order> --> + <!-- <RequiresUserInput>true</RequiresUserInput> --> + <!-- </SynchronousCommand> --> + <!-- <SynchronousCommand wcm:action="add"> --> + <!-- <CommandLine>cmd.exe /c a:install-winrm.bat</CommandLine> --> + <!-- <Description>Install Win RM</Description> --> + <!-- <Order>2</Order> --> + <!-- <RequiresUserInput>true</RequiresUserInput> --> + <!-- </SynchronousCommand> --> + <SynchronousCommand wcm:action="add"> + <CommandLine>cmd.exe /c winrm quickconfig -q</CommandLine> + <Description>winrm quickconfig -q</Description> + <Order>1</Order> + <RequiresUserInput>true</RequiresUserInput> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <CommandLine>cmd.exe /c winrm quickconfig -transport:http</CommandLine> + <Description>winrm quickconfig -transport:http</Description> + <Order>2</Order> + <RequiresUserInput>true</RequiresUserInput> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <CommandLine>cmd.exe /c winrm set winrm/config @{MaxTimeoutms="1800000"}</CommandLine> + <Description>Win RM MaxTimoutms</Description> + <Order>3</Order> + <RequiresUserInput>true</RequiresUserInput> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <CommandLine>cmd.exe /c winrm set winrm/config/winrs @{MaxMemoryPerShellMB="300"}</CommandLine> + <Description>Win RM MaxMemoryPerShellMB</Description> + <Order>4</Order> + <RequiresUserInput>true</RequiresUserInput> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <CommandLine>cmd.exe /c winrm set winrm/config/service @{AllowUnencrypted="true"}</CommandLine> + <Description>Win RM AllowUnencrypted</Description> + <Order>5</Order> + <RequiresUserInput>true</RequiresUserInput> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <CommandLine>cmd.exe /c winrm set winrm/config/service/auth @{Basic="true"}</CommandLine> + <Description>Win RM auth Basic</Description> + <Order>6</Order> + <RequiresUserInput>true</RequiresUserInput> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <CommandLine>cmd.exe /c winrm set winrm/config/client/auth @{Basic="true"}</CommandLine> + <Description>Win RM auth Basic</Description> + <Order>7</Order> + <RequiresUserInput>true</RequiresUserInput> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <CommandLine>cmd.exe /c winrm set winrm/config/listener?Address=*+Transport=HTTP @{Port="5985"} </CommandLine> + <Description>Win RM listener Address/Port</Description> + <Order>8</Order> + <RequiresUserInput>true</RequiresUserInput> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <CommandLine>cmd.exe /c netsh advfirewall firewall set rule group="remote administration" new enable=yes </CommandLine> + <Description>Win RM adv firewall enable</Description> + <Order>9</Order> + <RequiresUserInput>true</RequiresUserInput> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <CommandLine>cmd.exe /c netsh firewall add portopening TCP 5985 "Port 5985" </CommandLine> + <Description>Win RM port open</Description> + <Order>10</Order> + <RequiresUserInput>true</RequiresUserInput> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <CommandLine>cmd.exe /c net stop winrm </CommandLine> + <Description>Stop Win RM Service </Description> + <Order>11</Order> + <RequiresUserInput>true</RequiresUserInput> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <CommandLine>cmd.exe /c sc config winrm start= auto</CommandLine> + <Description>Win RM Autostart</Description> + <Order>12</Order> + <RequiresUserInput>true</RequiresUserInput> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <CommandLine>cmd.exe /c net start winrm </CommandLine> + <Description>Start Win RM Service</Description> + <Order>13</Order> + <RequiresUserInput>true</RequiresUserInput> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <CommandLine>powershell -Command "Set-ExecutionPolicy -ExecutionPolicy RemoteSigned -Force"</CommandLine> + <Description>Start Win RM Service</Description> + <Order>14</Order> + <RequiresUserInput>true</RequiresUserInput> + </SynchronousCommand> + </FirstLogonCommands> + <ShowWindowsLive>false</ShowWindowsLive> + </component> + </settings> + <settings pass="specialize"> + <component name="Microsoft-Windows-Shell-Setup" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" > + <OEMInformation> + <HelpCustomized>false</HelpCustomized> + </OEMInformation> + <!-- Rename computer here. --> + <ComputerName>vagrant-2008R2</ComputerName> + <TimeZone>Pacific Standard Time</TimeZone> + <RegisteredOwner></RegisteredOwner> + </component> + <component name="Microsoft-Windows-Security-SPP-UX" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <SkipAutoActivation>true</SkipAutoActivation> + </component> + </settings> + <cpi:offlineImage cpi:source="catalog:d:/sources/install_windows server 2008 r2 serverdatacenter.clg" xmlns:cpi="urn:schemas-microsoft-com:cpi" /> +</unattend> diff --git a/definitions/windows-2012-standard/README.md b/definitions/windows-2012-standard/README.md new file mode 100644 index 000000000..be39b6e15 --- /dev/null +++ b/definitions/windows-2012-standard/README.md @@ -0,0 +1,87 @@ +You can download a free trial of Windows Server 2008 R2 with Service Pack 1 from two different locations manually: + +* url: http://technet.microsoft.com/en-us/evalcenter/dd459137.aspx +* url: http://msdn.microsoft.com/en-us/evalcenter/ee175713.aspx + +But they seem to always generate the same url of http://care.dlservice.microsoft.com//dl/download/7/5/E/75EC4E54-5B02-42D6-8879-D8D3A25FBEF7/7601.17514.101119-1850_x64fre_server_eval_en-us-GRMSXEVAL_EN_DVD.iso + +* 64bit +* filename: 7601.17514.101119-1850_x64fre_server_eval_en-us-GRMSXEVAL_EN_DVD.iso +* md5sum: 4263be2cf3c59177c45085c0a7bc6ca5 + + +The installation uses the Standard Windows Unattended installation. The XML file was created using the Windows AIK kit, but the file can also be edited by hand. + +To edit the Autounattend.xml and validate it you can download The Windows® Automated Installation Kit (AIK) for Windows® 7: + +* url: http://www.microsoft.com/download/en/details.aspx?id=5753 +* file: KB3AIK_EN.iso +* md5sum: 1e73b24a89eceab9d50585b92db5482f + +AIK also includes dism, which will allow you to choose a specific version: + +If you want to install a different version, edit Autoattended.xml and replace the /IMAGE/NAME value with +one of the names listed in the 2008r2 install.wim on the install DVD .iso + + +```xml +<InstallFrom> + <MetaData wcm:action="add"> + <Key>/IMAGE/NAME</Key> + <Value>Windows Server 2008 R2 SERVERSTANDARD</Value> + </MetaData> +</InstallFrom> +``` + + +``` +PS C:\Users\Administrator> Dism /Get-WIMInfo /WimFile:d:\sources\install.wim + +Deployment Image Servicing and Management tool +Version: 6.1.7600.16385 + +Details for image : d:\sources\install.wim + +Index : 1 +Name : Windows Server 2008 R2 SERVERSTANDARD +Description : Windows Server 2008 R2 SERVERSTANDARD +Size : 10,510,643,622 bytes + +Index : 2 +Name : Windows Server 2008 R2 SERVERSTANDARDCORE +Description : Windows Server 2008 R2 SERVERSTANDARDCORE +Size : 3,564,132,307 bytes + +Index : 3 +Name : Windows Server 2008 R2 SERVERENTERPRISE +Description : Windows Server 2008 R2 SERVERENTERPRISE +Size : 10,511,024,733 bytes + +Index : 4 +Name : Windows Server 2008 R2 SERVERENTERPRISECORE +Description : Windows Server 2008 R2 SERVERENTERPRISECORE +Size : 3,564,106,331 bytes + +Index : 5 +Name : Windows Server 2008 R2 SERVERDATACENTER +Description : Windows Server 2008 R2 SERVERDATACENTER +Size : 10,511,131,897 bytes + +Index : 6 +Name : Windows Server 2008 R2 SERVERDATACENTERCORE +Description : Windows Server 2008 R2 SERVERDATACENTERCORE +Size : 3,564,144,547 bytes + +Index : 7 +Name : Windows Server 2008 R2 SERVERWEB +Description : Windows Server 2008 R2 SERVERWEB +Size : 10,520,222,743 bytes + +Index : 8 +Name : Windows Server 2008 R2 SERVERWEBCORE +Description : Windows Server 2008 R2 SERVERWEBCORE +Size : 3,562,750,400 bytes + +The operation completed successfully. +``` + diff --git a/definitions/windows-2012-standard/definition.rb b/definitions/windows-2012-standard/definition.rb new file mode 100644 index 000000000..552e58708 --- /dev/null +++ b/definitions/windows-2012-standard/definition.rb @@ -0,0 +1,17 @@ +# -*- coding: utf-8 -*- +require File.dirname(__FILE__) + "/../.windows/session.rb" + +iso_src = "http://care.dlservice.microsoft.com//dl/download/7/5/E/75EC4E54-5B02-42D6-8879-D8D3A25FBEF7/7601.17514.101119-1850_x64fre_server_eval_en-us-GRMSXEVAL_EN_DVD.iso" + +session = WINDOWS_SESSION.merge({ + :os_type_id => 'Windows2008_64', + :iso_download_instructions => "Download and install full featured software for 180-day trial at http://technet.microsoft.com/en-us/evalcenter/dd459137.aspx", + :iso_src => iso_src, + :iso_file => File.basename(iso_src), + :iso_md5 => "4263be2cf3c59177c45085c0a7bc6ca5", + :kickstart_port => "7140" + }) + +Veewee::Session.declare session + + diff --git a/definitions/windows-2012-standard/install-chef.bat b/definitions/windows-2012-standard/install-chef.bat new file mode 120000 index 000000000..0494fd4af --- /dev/null +++ b/definitions/windows-2012-standard/install-chef.bat @@ -0,0 +1 @@ +../.windows/install-chef.bat \ No newline at end of file diff --git a/definitions/windows-2012-standard/install-vbox.bat b/definitions/windows-2012-standard/install-vbox.bat new file mode 120000 index 000000000..2ff5531e3 --- /dev/null +++ b/definitions/windows-2012-standard/install-vbox.bat @@ -0,0 +1 @@ +../.windows/install-vbox.bat \ No newline at end of file diff --git a/definitions/windows-2012-standard/mount-validation.bat b/definitions/windows-2012-standard/mount-validation.bat new file mode 120000 index 000000000..e137688e8 --- /dev/null +++ b/definitions/windows-2012-standard/mount-validation.bat @@ -0,0 +1 @@ +../.windows/mount-validation.bat \ No newline at end of file diff --git a/definitions/windows-2012-standard/oracle-cert.cer b/definitions/windows-2012-standard/oracle-cert.cer new file mode 120000 index 000000000..5fbb0d341 --- /dev/null +++ b/definitions/windows-2012-standard/oracle-cert.cer @@ -0,0 +1 @@ +../.windows/oracle-cert.cer \ No newline at end of file diff --git a/definitions/windows-7-enterprise/definition.rb b/definitions/windows-7-enterprise/definition.rb index 8f0f4a30a..9b799bc24 100644 --- a/definitions/windows-7-enterprise/definition.rb +++ b/definitions/windows-7-enterprise/definition.rb @@ -8,7 +8,9 @@ :iso_download_instructions => "Download Windows 7 Enterprise 90-day Trial at http://technet.microsoft.com/en-us/evalcenter/cc442495.aspx", :iso_file => File.basename(iso_src), :iso_src => iso_src, - :iso_md5 => "1d0d239a252cb53e466d39e752b17c28" + :iso_md5 => "1d0d239a252cb53e466d39e752b17c28", + :kickstart_port => "7150" + }) Veewee::Session.declare session diff --git a/definitions/windows-8-enterprise/Autounattend.xml b/definitions/windows-8-enterprise/Autounattend.xml new file mode 100644 index 000000000..6d0aa0962 --- /dev/null +++ b/definitions/windows-8-enterprise/Autounattend.xml @@ -0,0 +1,235 @@ +<?xml version="1.0" encoding="utf-8"?> +<unattend xmlns="urn:schemas-microsoft-com:unattend"> + <servicing></servicing> + + <settings pass="windowsPE"> + + <component name="Microsoft-Windows-Setup" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + + <DiskConfiguration> + <Disk wcm:action="add"> + + <CreatePartitions> + <CreatePartition wcm:action="add"> + <Order>1</Order> + <Type>Primary</Type> + <Size>20000</Size> + </CreatePartition> + </CreatePartitions> + + <ModifyPartitions> + <ModifyPartition wcm:action="add"> + <Extend>false</Extend> + <Format>NTFS</Format> + <Letter>C</Letter> + <Order>1</Order> + <PartitionID>1</PartitionID> + <Label>Windows 2008R2</Label> + </ModifyPartition> + </ModifyPartitions> + + <DiskID>0</DiskID> + <WillWipeDisk>true</WillWipeDisk> + + </Disk> + <WillShowUI>OnError</WillShowUI> + </DiskConfiguration> + + <UserData> + <!-- Product Key from http://technet.microsoft.com/en-us/library/ff793406.aspx --> + <ProductKey>YC6KT-GKW9T-YTKYR-T4X34-R7VHC + <WillShowUI>Never</WillShowUI> + </ProductKey> + + <AcceptEula>true</AcceptEula> + <FullName>Vagrant Fullname</FullName> + <Organization>Vagrant Inc</Organization> + </UserData> + + <ImageInstall> + <OSImage> + <InstallTo> + <DiskID>0</DiskID> + <PartitionID>1</PartitionID> + </InstallTo> + <WillShowUI>OnError</WillShowUI> + <InstallToAvailablePartition>false</InstallToAvailablePartition> + <InstallFrom> + <MetaData wcm:action="add"> + <Key>/IMAGE/NAME</Key> + <Value>Windows 8 Enterprise Evaluation</Value> + </MetaData> + </InstallFrom> + </OSImage> + </ImageInstall> + + </component> + + <component name="Microsoft-Windows-International-Core-WinPE" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <SetupUILanguage> + <UILanguage>en-US</UILanguage> + </SetupUILanguage> + <InputLocale>en-US</InputLocale> + <SystemLocale>en-US</SystemLocale> + <UILanguage>en-US</UILanguage> + <UILanguageFallback>en-US</UILanguageFallback> + <UserLocale>en-US</UserLocale> + </component> + </settings> + + + <settings pass="oobeSystem"> + <component name="Microsoft-Windows-Shell-Setup" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <UserAccounts> + <AdministratorPassword> + <Value>vagrant</Value> + <PlainText>true</PlainText> + </AdministratorPassword> + <LocalAccounts> + <LocalAccount wcm:action="add"> + <Password> + <Value>vagrant</Value> + <PlainText>true</PlainText> + </Password> + <Description>Vagrant User</Description> + <DisplayName>vagrant</DisplayName> + <Group>administrators</Group> + <Name>vagrant</Name> + </LocalAccount> + </LocalAccounts> + </UserAccounts> + <OOBE> + <HideEULAPage>true</HideEULAPage> + <HideWirelessSetupInOOBE>true</HideWirelessSetupInOOBE> + <NetworkLocation>Home</NetworkLocation> + <ProtectYourPC>1</ProtectYourPC> + <HideOnlineAccountScreens>true</HideOnlineAccountScreens> + <HideLocalAccountScreen>true</HideLocalAccountScreen> + <SkipUserOOBE>true</SkipUserOOBE> + <HideOEMRegistrationScreen>true</HideOEMRegistrationScreen> + </OOBE> + <AutoLogon> + <Password> + <Value>vagrant</Value> + <PlainText>true</PlainText> + </Password> + <Username>administrator</Username> + <Enabled>true</Enabled> + </AutoLogon> + <FirstLogonCommands> + <!-- <SynchronousCommand wcm:action="add"> --> + <!-- <CommandLine>cmd.exe /c a:install-cygwin-sshd.bat</CommandLine> --> + <!-- <Description>Install Cygwin SSH</Description> --> + <!-- <Order>1</Order> --> + <!-- <RequiresUserInput>true</RequiresUserInput> --> + <!-- </SynchronousCommand> --> + <!-- <SynchronousCommand wcm:action="add"> --> + <!-- <CommandLine>cmd.exe /c a:install-winrm.bat</CommandLine> --> + <!-- <Description>Install Win RM</Description> --> + <!-- <Order>2</Order> --> + <!-- <RequiresUserInput>true</RequiresUserInput> --> + <!-- </SynchronousCommand> --> + <SynchronousCommand wcm:action="add"> + <CommandLine>cmd.exe /c winrm quickconfig -q</CommandLine> + <Description>winrm quickconfig -q</Description> + <Order>1</Order> + <RequiresUserInput>true</RequiresUserInput> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <CommandLine>cmd.exe /c winrm quickconfig -transport:http</CommandLine> + <Description>winrm quickconfig -transport:http</Description> + <Order>2</Order> + <RequiresUserInput>true</RequiresUserInput> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <CommandLine>cmd.exe /c winrm set winrm/config @{MaxTimeoutms="1800000"}</CommandLine> + <Description>Win RM MaxTimoutms</Description> + <Order>3</Order> + <RequiresUserInput>true</RequiresUserInput> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <CommandLine>cmd.exe /c winrm set winrm/config/winrs @{MaxMemoryPerShellMB="300"}</CommandLine> + <Description>Win RM MaxMemoryPerShellMB</Description> + <Order>4</Order> + <RequiresUserInput>true</RequiresUserInput> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <CommandLine>cmd.exe /c winrm set winrm/config/service @{AllowUnencrypted="true"}</CommandLine> + <Description>Win RM AllowUnencrypted</Description> + <Order>5</Order> + <RequiresUserInput>true</RequiresUserInput> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <CommandLine>cmd.exe /c winrm set winrm/config/service/auth @{Basic="true"}</CommandLine> + <Description>Win RM auth Basic</Description> + <Order>6</Order> + <RequiresUserInput>true</RequiresUserInput> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <CommandLine>cmd.exe /c winrm set winrm/config/client/auth @{Basic="true"}</CommandLine> + <Description>Win RM auth Basic</Description> + <Order>7</Order> + <RequiresUserInput>true</RequiresUserInput> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <CommandLine>cmd.exe /c winrm set winrm/config/listener?Address=*+Transport=HTTP @{Port="5985"} </CommandLine> + <Description>Win RM listener Address/Port</Description> + <Order>8</Order> + <RequiresUserInput>true</RequiresUserInput> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <CommandLine>cmd.exe /c netsh advfirewall firewall set rule group="remote administration" new enable=yes </CommandLine> + <Description>Win RM adv firewall enable</Description> + <Order>9</Order> + <RequiresUserInput>true</RequiresUserInput> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <CommandLine>cmd.exe /c netsh firewall add portopening TCP 5985 "Port 5985" </CommandLine> + <Description>Win RM port open</Description> + <Order>10</Order> + <RequiresUserInput>true</RequiresUserInput> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <CommandLine>cmd.exe /c net stop winrm </CommandLine> + <Description>Stop Win RM Service </Description> + <Order>11</Order> + <RequiresUserInput>true</RequiresUserInput> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <CommandLine>cmd.exe /c sc config winrm start= auto</CommandLine> + <Description>Win RM Autostart</Description> + <Order>12</Order> + <RequiresUserInput>true</RequiresUserInput> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <CommandLine>cmd.exe /c net start winrm </CommandLine> + <Description>Start Win RM Service</Description> + <Order>13</Order> + <RequiresUserInput>true</RequiresUserInput> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <CommandLine>powershell -Command "Set-ExecutionPolicy -ExecutionPolicy RemoteSigned -Force"</CommandLine> + <Description>Start Win RM Service</Description> + <Order>14</Order> + <RequiresUserInput>true</RequiresUserInput> + </SynchronousCommand> + </FirstLogonCommands> + <ShowWindowsLive>false</ShowWindowsLive> + </component> + </settings> + <settings pass="specialize"> + <component name="Microsoft-Windows-Shell-Setup" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" > + <OEMInformation> + <HelpCustomized>false</HelpCustomized> + </OEMInformation> + <!-- Rename computer here. --> + <ComputerName>vagrant-2008R2</ComputerName> + <TimeZone>Pacific Standard Time</TimeZone> + <RegisteredOwner></RegisteredOwner> + </component> + <component name="Microsoft-Windows-Security-SPP-UX" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <SkipAutoActivation>true</SkipAutoActivation> + </component> + </settings> + <cpi:offlineImage cpi:source="catalog:d:/sources/install_windows server 2008 r2 serverdatacenter.clg" xmlns:cpi="urn:schemas-microsoft-com:cpi" /> +</unattend> diff --git a/definitions/windows-8-enterprise/README.md b/definitions/windows-8-enterprise/README.md new file mode 100644 index 000000000..be39b6e15 --- /dev/null +++ b/definitions/windows-8-enterprise/README.md @@ -0,0 +1,87 @@ +You can download a free trial of Windows Server 2008 R2 with Service Pack 1 from two different locations manually: + +* url: http://technet.microsoft.com/en-us/evalcenter/dd459137.aspx +* url: http://msdn.microsoft.com/en-us/evalcenter/ee175713.aspx + +But they seem to always generate the same url of http://care.dlservice.microsoft.com//dl/download/7/5/E/75EC4E54-5B02-42D6-8879-D8D3A25FBEF7/7601.17514.101119-1850_x64fre_server_eval_en-us-GRMSXEVAL_EN_DVD.iso + +* 64bit +* filename: 7601.17514.101119-1850_x64fre_server_eval_en-us-GRMSXEVAL_EN_DVD.iso +* md5sum: 4263be2cf3c59177c45085c0a7bc6ca5 + + +The installation uses the Standard Windows Unattended installation. The XML file was created using the Windows AIK kit, but the file can also be edited by hand. + +To edit the Autounattend.xml and validate it you can download The Windows® Automated Installation Kit (AIK) for Windows® 7: + +* url: http://www.microsoft.com/download/en/details.aspx?id=5753 +* file: KB3AIK_EN.iso +* md5sum: 1e73b24a89eceab9d50585b92db5482f + +AIK also includes dism, which will allow you to choose a specific version: + +If you want to install a different version, edit Autoattended.xml and replace the /IMAGE/NAME value with +one of the names listed in the 2008r2 install.wim on the install DVD .iso + + +```xml +<InstallFrom> + <MetaData wcm:action="add"> + <Key>/IMAGE/NAME</Key> + <Value>Windows Server 2008 R2 SERVERSTANDARD</Value> + </MetaData> +</InstallFrom> +``` + + +``` +PS C:\Users\Administrator> Dism /Get-WIMInfo /WimFile:d:\sources\install.wim + +Deployment Image Servicing and Management tool +Version: 6.1.7600.16385 + +Details for image : d:\sources\install.wim + +Index : 1 +Name : Windows Server 2008 R2 SERVERSTANDARD +Description : Windows Server 2008 R2 SERVERSTANDARD +Size : 10,510,643,622 bytes + +Index : 2 +Name : Windows Server 2008 R2 SERVERSTANDARDCORE +Description : Windows Server 2008 R2 SERVERSTANDARDCORE +Size : 3,564,132,307 bytes + +Index : 3 +Name : Windows Server 2008 R2 SERVERENTERPRISE +Description : Windows Server 2008 R2 SERVERENTERPRISE +Size : 10,511,024,733 bytes + +Index : 4 +Name : Windows Server 2008 R2 SERVERENTERPRISECORE +Description : Windows Server 2008 R2 SERVERENTERPRISECORE +Size : 3,564,106,331 bytes + +Index : 5 +Name : Windows Server 2008 R2 SERVERDATACENTER +Description : Windows Server 2008 R2 SERVERDATACENTER +Size : 10,511,131,897 bytes + +Index : 6 +Name : Windows Server 2008 R2 SERVERDATACENTERCORE +Description : Windows Server 2008 R2 SERVERDATACENTERCORE +Size : 3,564,144,547 bytes + +Index : 7 +Name : Windows Server 2008 R2 SERVERWEB +Description : Windows Server 2008 R2 SERVERWEB +Size : 10,520,222,743 bytes + +Index : 8 +Name : Windows Server 2008 R2 SERVERWEBCORE +Description : Windows Server 2008 R2 SERVERWEBCORE +Size : 3,562,750,400 bytes + +The operation completed successfully. +``` + diff --git a/definitions/windows-8-enterprise/definition.rb b/definitions/windows-8-enterprise/definition.rb new file mode 100644 index 000000000..63ecdbbf3 --- /dev/null +++ b/definitions/windows-8-enterprise/definition.rb @@ -0,0 +1,15 @@ +# -*- coding: utf-8 -*- +require File.dirname(__FILE__) + "/../.windows/session.rb" + +iso_src = "http://care.dlservice.microsoft.com/dl/download/5/3/C/53C31ED0-886C-4F81-9A38-F58CE4CE71E8/9200.16384.WIN8_RTM.120725-1247_X64FRE_ENTERPRISE_EVAL_EN-US-HRM_CENA_X64FREE_EN-US_DV5.ISO" + +session = WINDOWS_SESSION.merge({ + :os_type_id => 'Windows8_64', + :iso_download_instructions => "Download Windows 8 Enterprise 90-day Trial at http://msdn.microsoft.com/en-us/evalcenter/jj554510.aspx", + :iso_file => File.basename(iso_src), + :iso_src => iso_src, + :iso_md5 => "6beffd994574ca89417286f0dc056108", + :memory_size=> "512" + }) + +Veewee::Session.declare session diff --git a/definitions/windows-8-enterprise/install-chef.bat b/definitions/windows-8-enterprise/install-chef.bat new file mode 120000 index 000000000..0494fd4af --- /dev/null +++ b/definitions/windows-8-enterprise/install-chef.bat @@ -0,0 +1 @@ +../.windows/install-chef.bat \ No newline at end of file diff --git a/definitions/windows-8-enterprise/install-vbox.bat b/definitions/windows-8-enterprise/install-vbox.bat new file mode 120000 index 000000000..2ff5531e3 --- /dev/null +++ b/definitions/windows-8-enterprise/install-vbox.bat @@ -0,0 +1 @@ +../.windows/install-vbox.bat \ No newline at end of file diff --git a/definitions/windows-8-enterprise/mount-validation.bat b/definitions/windows-8-enterprise/mount-validation.bat new file mode 120000 index 000000000..e137688e8 --- /dev/null +++ b/definitions/windows-8-enterprise/mount-validation.bat @@ -0,0 +1 @@ +../.windows/mount-validation.bat \ No newline at end of file diff --git a/definitions/windows-8-enterprise/oracle-cert.cer b/definitions/windows-8-enterprise/oracle-cert.cer new file mode 120000 index 000000000..5fbb0d341 --- /dev/null +++ b/definitions/windows-8-enterprise/oracle-cert.cer @@ -0,0 +1 @@ +../.windows/oracle-cert.cer \ No newline at end of file From 1603e2ca62e6affade864872f0caf9b20ad32acf Mon Sep 17 00:00:00 2001 From: Hippie Hacker <chris@hippiehacker.org> Date: Mon, 18 Mar 2013 07:44:31 -0700 Subject: [PATCH 0007/1622] Changed default kickstart port so that vms can be build simultaneously --- definitions/windows-2008r2-standard/definition.rb | 4 +++- definitions/windows-7-enterprise/definition.rb | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/definitions/windows-2008r2-standard/definition.rb b/definitions/windows-2008r2-standard/definition.rb index 31a37278b..31dc7e185 100644 --- a/definitions/windows-2008r2-standard/definition.rb +++ b/definitions/windows-2008r2-standard/definition.rb @@ -8,7 +8,9 @@ :iso_download_instructions => "Download and install full featured software for 180-day trial at http://technet.microsoft.com/en-us/evalcenter/dd459137.aspx", :iso_src => iso_src, :iso_file => File.basename(iso_src), - :iso_md5 => "4263be2cf3c59177c45085c0a7bc6ca5" + :iso_md5 => "4263be2cf3c59177c45085c0a7bc6ca5", + :kickstart_port => "7150" + }) Veewee::Session.declare session diff --git a/definitions/windows-7-enterprise/definition.rb b/definitions/windows-7-enterprise/definition.rb index 8f0f4a30a..9b799bc24 100644 --- a/definitions/windows-7-enterprise/definition.rb +++ b/definitions/windows-7-enterprise/definition.rb @@ -8,7 +8,9 @@ :iso_download_instructions => "Download Windows 7 Enterprise 90-day Trial at http://technet.microsoft.com/en-us/evalcenter/cc442495.aspx", :iso_file => File.basename(iso_src), :iso_src => iso_src, - :iso_md5 => "1d0d239a252cb53e466d39e752b17c28" + :iso_md5 => "1d0d239a252cb53e466d39e752b17c28", + :kickstart_port => "7150" + }) Veewee::Session.declare session From f78790441114bca224566ea5db86ca3e8ebc88fc Mon Sep 17 00:00:00 2001 From: Hippie Hacker <chris@hippiehacker.org> Date: Mon, 18 Mar 2013 07:44:49 -0700 Subject: [PATCH 0008/1622] Add windows 2012 and 8 --- .../windows-2012-standard/Autounattend.xml | 230 +++++++++++++++++ definitions/windows-2012-standard/README.md | 87 +++++++ .../windows-2012-standard/definition.rb | 17 ++ .../windows-2012-standard/install-chef.bat | 1 + .../windows-2012-standard/install-vbox.bat | 1 + .../mount-validation.bat | 1 + .../windows-2012-standard/oracle-cert.cer | 1 + .../windows-8-enterprise/Autounattend.xml | 235 ++++++++++++++++++ definitions/windows-8-enterprise/README.md | 87 +++++++ .../windows-8-enterprise/definition.rb | 15 ++ .../windows-8-enterprise/install-chef.bat | 1 + .../windows-8-enterprise/install-vbox.bat | 1 + .../windows-8-enterprise/mount-validation.bat | 1 + .../windows-8-enterprise/oracle-cert.cer | 1 + 14 files changed, 679 insertions(+) create mode 100644 definitions/windows-2012-standard/Autounattend.xml create mode 100644 definitions/windows-2012-standard/README.md create mode 100644 definitions/windows-2012-standard/definition.rb create mode 120000 definitions/windows-2012-standard/install-chef.bat create mode 120000 definitions/windows-2012-standard/install-vbox.bat create mode 120000 definitions/windows-2012-standard/mount-validation.bat create mode 120000 definitions/windows-2012-standard/oracle-cert.cer create mode 100644 definitions/windows-8-enterprise/Autounattend.xml create mode 100644 definitions/windows-8-enterprise/README.md create mode 100644 definitions/windows-8-enterprise/definition.rb create mode 120000 definitions/windows-8-enterprise/install-chef.bat create mode 120000 definitions/windows-8-enterprise/install-vbox.bat create mode 120000 definitions/windows-8-enterprise/mount-validation.bat create mode 120000 definitions/windows-8-enterprise/oracle-cert.cer diff --git a/definitions/windows-2012-standard/Autounattend.xml b/definitions/windows-2012-standard/Autounattend.xml new file mode 100644 index 000000000..3f3d0ef9f --- /dev/null +++ b/definitions/windows-2012-standard/Autounattend.xml @@ -0,0 +1,230 @@ +<?xml version="1.0" encoding="utf-8"?> +<unattend xmlns="urn:schemas-microsoft-com:unattend"> + <servicing></servicing> + + <settings pass="windowsPE"> + + <component name="Microsoft-Windows-Setup" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + + <DiskConfiguration> + <Disk wcm:action="add"> + + <CreatePartitions> + <CreatePartition wcm:action="add"> + <Order>1</Order> + <Type>Primary</Type> + <Size>20000</Size> + </CreatePartition> + </CreatePartitions> + + <ModifyPartitions> + <ModifyPartition wcm:action="add"> + <Extend>false</Extend> + <Format>NTFS</Format> + <Letter>C</Letter> + <Order>1</Order> + <PartitionID>1</PartitionID> + <Label>Windows 2008R2</Label> + </ModifyPartition> + </ModifyPartitions> + + <DiskID>0</DiskID> + <WillWipeDisk>true</WillWipeDisk> + + </Disk> + <WillShowUI>OnError</WillShowUI> + </DiskConfiguration> + + <UserData> + <!-- Product Key from http://technet.microsoft.com/en-us/library/ff793406.aspx --> + <ProductKey>YC6KT-GKW9T-YTKYR-T4X34-R7VHC + <WillShowUI>Never</WillShowUI> + </ProductKey> + + <AcceptEula>true</AcceptEula> + <FullName>Vagrant Fullname</FullName> + <Organization>Vagrant Inc</Organization> + </UserData> + + <ImageInstall> + <OSImage> + <InstallTo> + <DiskID>0</DiskID> + <PartitionID>1</PartitionID> + </InstallTo> + <WillShowUI>OnError</WillShowUI> + <InstallToAvailablePartition>false</InstallToAvailablePartition> + <InstallFrom> + <MetaData wcm:action="add"> + <Key>/IMAGE/NAME</Key> + <Value>Windows Server 2008 R2 SERVERSTANDARD</Value> + </MetaData> + </InstallFrom> + </OSImage> + </ImageInstall> + + </component> + + <component name="Microsoft-Windows-International-Core-WinPE" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <SetupUILanguage> + <UILanguage>en-US</UILanguage> + </SetupUILanguage> + <InputLocale>en-US</InputLocale> + <SystemLocale>en-US</SystemLocale> + <UILanguage>en-US</UILanguage> + <UILanguageFallback>en-US</UILanguageFallback> + <UserLocale>en-US</UserLocale> + </component> + </settings> + + + <settings pass="oobeSystem"> + <component name="Microsoft-Windows-Shell-Setup" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <UserAccounts> + <AdministratorPassword> + <Value>vagrant</Value> + <PlainText>true</PlainText> + </AdministratorPassword> + <LocalAccounts> + <LocalAccount wcm:action="add"> + <Password> + <Value>vagrant</Value> + <PlainText>true</PlainText> + </Password> + <Description>Vagrant User</Description> + <DisplayName>vagrant</DisplayName> + <Group>administrators</Group> + <Name>vagrant</Name> + </LocalAccount> + </LocalAccounts> + </UserAccounts> + <OOBE> + <HideEULAPage>true</HideEULAPage> + <HideWirelessSetupInOOBE>true</HideWirelessSetupInOOBE> + <NetworkLocation>Home</NetworkLocation> + </OOBE> + <AutoLogon> + <Password> + <Value>vagrant</Value> + <PlainText>true</PlainText> + </Password> + <Username>administrator</Username> + <Enabled>true</Enabled> + </AutoLogon> + <FirstLogonCommands> + <!-- <SynchronousCommand wcm:action="add"> --> + <!-- <CommandLine>cmd.exe /c a:install-cygwin-sshd.bat</CommandLine> --> + <!-- <Description>Install Cygwin SSH</Description> --> + <!-- <Order>1</Order> --> + <!-- <RequiresUserInput>true</RequiresUserInput> --> + <!-- </SynchronousCommand> --> + <!-- <SynchronousCommand wcm:action="add"> --> + <!-- <CommandLine>cmd.exe /c a:install-winrm.bat</CommandLine> --> + <!-- <Description>Install Win RM</Description> --> + <!-- <Order>2</Order> --> + <!-- <RequiresUserInput>true</RequiresUserInput> --> + <!-- </SynchronousCommand> --> + <SynchronousCommand wcm:action="add"> + <CommandLine>cmd.exe /c winrm quickconfig -q</CommandLine> + <Description>winrm quickconfig -q</Description> + <Order>1</Order> + <RequiresUserInput>true</RequiresUserInput> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <CommandLine>cmd.exe /c winrm quickconfig -transport:http</CommandLine> + <Description>winrm quickconfig -transport:http</Description> + <Order>2</Order> + <RequiresUserInput>true</RequiresUserInput> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <CommandLine>cmd.exe /c winrm set winrm/config @{MaxTimeoutms="1800000"}</CommandLine> + <Description>Win RM MaxTimoutms</Description> + <Order>3</Order> + <RequiresUserInput>true</RequiresUserInput> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <CommandLine>cmd.exe /c winrm set winrm/config/winrs @{MaxMemoryPerShellMB="300"}</CommandLine> + <Description>Win RM MaxMemoryPerShellMB</Description> + <Order>4</Order> + <RequiresUserInput>true</RequiresUserInput> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <CommandLine>cmd.exe /c winrm set winrm/config/service @{AllowUnencrypted="true"}</CommandLine> + <Description>Win RM AllowUnencrypted</Description> + <Order>5</Order> + <RequiresUserInput>true</RequiresUserInput> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <CommandLine>cmd.exe /c winrm set winrm/config/service/auth @{Basic="true"}</CommandLine> + <Description>Win RM auth Basic</Description> + <Order>6</Order> + <RequiresUserInput>true</RequiresUserInput> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <CommandLine>cmd.exe /c winrm set winrm/config/client/auth @{Basic="true"}</CommandLine> + <Description>Win RM auth Basic</Description> + <Order>7</Order> + <RequiresUserInput>true</RequiresUserInput> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <CommandLine>cmd.exe /c winrm set winrm/config/listener?Address=*+Transport=HTTP @{Port="5985"} </CommandLine> + <Description>Win RM listener Address/Port</Description> + <Order>8</Order> + <RequiresUserInput>true</RequiresUserInput> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <CommandLine>cmd.exe /c netsh advfirewall firewall set rule group="remote administration" new enable=yes </CommandLine> + <Description>Win RM adv firewall enable</Description> + <Order>9</Order> + <RequiresUserInput>true</RequiresUserInput> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <CommandLine>cmd.exe /c netsh firewall add portopening TCP 5985 "Port 5985" </CommandLine> + <Description>Win RM port open</Description> + <Order>10</Order> + <RequiresUserInput>true</RequiresUserInput> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <CommandLine>cmd.exe /c net stop winrm </CommandLine> + <Description>Stop Win RM Service </Description> + <Order>11</Order> + <RequiresUserInput>true</RequiresUserInput> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <CommandLine>cmd.exe /c sc config winrm start= auto</CommandLine> + <Description>Win RM Autostart</Description> + <Order>12</Order> + <RequiresUserInput>true</RequiresUserInput> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <CommandLine>cmd.exe /c net start winrm </CommandLine> + <Description>Start Win RM Service</Description> + <Order>13</Order> + <RequiresUserInput>true</RequiresUserInput> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <CommandLine>powershell -Command "Set-ExecutionPolicy -ExecutionPolicy RemoteSigned -Force"</CommandLine> + <Description>Start Win RM Service</Description> + <Order>14</Order> + <RequiresUserInput>true</RequiresUserInput> + </SynchronousCommand> + </FirstLogonCommands> + <ShowWindowsLive>false</ShowWindowsLive> + </component> + </settings> + <settings pass="specialize"> + <component name="Microsoft-Windows-Shell-Setup" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" > + <OEMInformation> + <HelpCustomized>false</HelpCustomized> + </OEMInformation> + <!-- Rename computer here. --> + <ComputerName>vagrant-2008R2</ComputerName> + <TimeZone>Pacific Standard Time</TimeZone> + <RegisteredOwner></RegisteredOwner> + </component> + <component name="Microsoft-Windows-Security-SPP-UX" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <SkipAutoActivation>true</SkipAutoActivation> + </component> + </settings> + <cpi:offlineImage cpi:source="catalog:d:/sources/install_windows server 2008 r2 serverdatacenter.clg" xmlns:cpi="urn:schemas-microsoft-com:cpi" /> +</unattend> diff --git a/definitions/windows-2012-standard/README.md b/definitions/windows-2012-standard/README.md new file mode 100644 index 000000000..be39b6e15 --- /dev/null +++ b/definitions/windows-2012-standard/README.md @@ -0,0 +1,87 @@ +You can download a free trial of Windows Server 2008 R2 with Service Pack 1 from two different locations manually: + +* url: http://technet.microsoft.com/en-us/evalcenter/dd459137.aspx +* url: http://msdn.microsoft.com/en-us/evalcenter/ee175713.aspx + +But they seem to always generate the same url of http://care.dlservice.microsoft.com//dl/download/7/5/E/75EC4E54-5B02-42D6-8879-D8D3A25FBEF7/7601.17514.101119-1850_x64fre_server_eval_en-us-GRMSXEVAL_EN_DVD.iso + +* 64bit +* filename: 7601.17514.101119-1850_x64fre_server_eval_en-us-GRMSXEVAL_EN_DVD.iso +* md5sum: 4263be2cf3c59177c45085c0a7bc6ca5 + + +The installation uses the Standard Windows Unattended installation. The XML file was created using the Windows AIK kit, but the file can also be edited by hand. + +To edit the Autounattend.xml and validate it you can download The Windows® Automated Installation Kit (AIK) for Windows® 7: + +* url: http://www.microsoft.com/download/en/details.aspx?id=5753 +* file: KB3AIK_EN.iso +* md5sum: 1e73b24a89eceab9d50585b92db5482f + +AIK also includes dism, which will allow you to choose a specific version: + +If you want to install a different version, edit Autoattended.xml and replace the /IMAGE/NAME value with +one of the names listed in the 2008r2 install.wim on the install DVD .iso + + +```xml +<InstallFrom> + <MetaData wcm:action="add"> + <Key>/IMAGE/NAME</Key> + <Value>Windows Server 2008 R2 SERVERSTANDARD</Value> + </MetaData> +</InstallFrom> +``` + + +``` +PS C:\Users\Administrator> Dism /Get-WIMInfo /WimFile:d:\sources\install.wim + +Deployment Image Servicing and Management tool +Version: 6.1.7600.16385 + +Details for image : d:\sources\install.wim + +Index : 1 +Name : Windows Server 2008 R2 SERVERSTANDARD +Description : Windows Server 2008 R2 SERVERSTANDARD +Size : 10,510,643,622 bytes + +Index : 2 +Name : Windows Server 2008 R2 SERVERSTANDARDCORE +Description : Windows Server 2008 R2 SERVERSTANDARDCORE +Size : 3,564,132,307 bytes + +Index : 3 +Name : Windows Server 2008 R2 SERVERENTERPRISE +Description : Windows Server 2008 R2 SERVERENTERPRISE +Size : 10,511,024,733 bytes + +Index : 4 +Name : Windows Server 2008 R2 SERVERENTERPRISECORE +Description : Windows Server 2008 R2 SERVERENTERPRISECORE +Size : 3,564,106,331 bytes + +Index : 5 +Name : Windows Server 2008 R2 SERVERDATACENTER +Description : Windows Server 2008 R2 SERVERDATACENTER +Size : 10,511,131,897 bytes + +Index : 6 +Name : Windows Server 2008 R2 SERVERDATACENTERCORE +Description : Windows Server 2008 R2 SERVERDATACENTERCORE +Size : 3,564,144,547 bytes + +Index : 7 +Name : Windows Server 2008 R2 SERVERWEB +Description : Windows Server 2008 R2 SERVERWEB +Size : 10,520,222,743 bytes + +Index : 8 +Name : Windows Server 2008 R2 SERVERWEBCORE +Description : Windows Server 2008 R2 SERVERWEBCORE +Size : 3,562,750,400 bytes + +The operation completed successfully. +``` + diff --git a/definitions/windows-2012-standard/definition.rb b/definitions/windows-2012-standard/definition.rb new file mode 100644 index 000000000..552e58708 --- /dev/null +++ b/definitions/windows-2012-standard/definition.rb @@ -0,0 +1,17 @@ +# -*- coding: utf-8 -*- +require File.dirname(__FILE__) + "/../.windows/session.rb" + +iso_src = "http://care.dlservice.microsoft.com//dl/download/7/5/E/75EC4E54-5B02-42D6-8879-D8D3A25FBEF7/7601.17514.101119-1850_x64fre_server_eval_en-us-GRMSXEVAL_EN_DVD.iso" + +session = WINDOWS_SESSION.merge({ + :os_type_id => 'Windows2008_64', + :iso_download_instructions => "Download and install full featured software for 180-day trial at http://technet.microsoft.com/en-us/evalcenter/dd459137.aspx", + :iso_src => iso_src, + :iso_file => File.basename(iso_src), + :iso_md5 => "4263be2cf3c59177c45085c0a7bc6ca5", + :kickstart_port => "7140" + }) + +Veewee::Session.declare session + + diff --git a/definitions/windows-2012-standard/install-chef.bat b/definitions/windows-2012-standard/install-chef.bat new file mode 120000 index 000000000..0494fd4af --- /dev/null +++ b/definitions/windows-2012-standard/install-chef.bat @@ -0,0 +1 @@ +../.windows/install-chef.bat \ No newline at end of file diff --git a/definitions/windows-2012-standard/install-vbox.bat b/definitions/windows-2012-standard/install-vbox.bat new file mode 120000 index 000000000..2ff5531e3 --- /dev/null +++ b/definitions/windows-2012-standard/install-vbox.bat @@ -0,0 +1 @@ +../.windows/install-vbox.bat \ No newline at end of file diff --git a/definitions/windows-2012-standard/mount-validation.bat b/definitions/windows-2012-standard/mount-validation.bat new file mode 120000 index 000000000..e137688e8 --- /dev/null +++ b/definitions/windows-2012-standard/mount-validation.bat @@ -0,0 +1 @@ +../.windows/mount-validation.bat \ No newline at end of file diff --git a/definitions/windows-2012-standard/oracle-cert.cer b/definitions/windows-2012-standard/oracle-cert.cer new file mode 120000 index 000000000..5fbb0d341 --- /dev/null +++ b/definitions/windows-2012-standard/oracle-cert.cer @@ -0,0 +1 @@ +../.windows/oracle-cert.cer \ No newline at end of file diff --git a/definitions/windows-8-enterprise/Autounattend.xml b/definitions/windows-8-enterprise/Autounattend.xml new file mode 100644 index 000000000..6d0aa0962 --- /dev/null +++ b/definitions/windows-8-enterprise/Autounattend.xml @@ -0,0 +1,235 @@ +<?xml version="1.0" encoding="utf-8"?> +<unattend xmlns="urn:schemas-microsoft-com:unattend"> + <servicing></servicing> + + <settings pass="windowsPE"> + + <component name="Microsoft-Windows-Setup" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + + <DiskConfiguration> + <Disk wcm:action="add"> + + <CreatePartitions> + <CreatePartition wcm:action="add"> + <Order>1</Order> + <Type>Primary</Type> + <Size>20000</Size> + </CreatePartition> + </CreatePartitions> + + <ModifyPartitions> + <ModifyPartition wcm:action="add"> + <Extend>false</Extend> + <Format>NTFS</Format> + <Letter>C</Letter> + <Order>1</Order> + <PartitionID>1</PartitionID> + <Label>Windows 2008R2</Label> + </ModifyPartition> + </ModifyPartitions> + + <DiskID>0</DiskID> + <WillWipeDisk>true</WillWipeDisk> + + </Disk> + <WillShowUI>OnError</WillShowUI> + </DiskConfiguration> + + <UserData> + <!-- Product Key from http://technet.microsoft.com/en-us/library/ff793406.aspx --> + <ProductKey>YC6KT-GKW9T-YTKYR-T4X34-R7VHC + <WillShowUI>Never</WillShowUI> + </ProductKey> + + <AcceptEula>true</AcceptEula> + <FullName>Vagrant Fullname</FullName> + <Organization>Vagrant Inc</Organization> + </UserData> + + <ImageInstall> + <OSImage> + <InstallTo> + <DiskID>0</DiskID> + <PartitionID>1</PartitionID> + </InstallTo> + <WillShowUI>OnError</WillShowUI> + <InstallToAvailablePartition>false</InstallToAvailablePartition> + <InstallFrom> + <MetaData wcm:action="add"> + <Key>/IMAGE/NAME</Key> + <Value>Windows 8 Enterprise Evaluation</Value> + </MetaData> + </InstallFrom> + </OSImage> + </ImageInstall> + + </component> + + <component name="Microsoft-Windows-International-Core-WinPE" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <SetupUILanguage> + <UILanguage>en-US</UILanguage> + </SetupUILanguage> + <InputLocale>en-US</InputLocale> + <SystemLocale>en-US</SystemLocale> + <UILanguage>en-US</UILanguage> + <UILanguageFallback>en-US</UILanguageFallback> + <UserLocale>en-US</UserLocale> + </component> + </settings> + + + <settings pass="oobeSystem"> + <component name="Microsoft-Windows-Shell-Setup" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <UserAccounts> + <AdministratorPassword> + <Value>vagrant</Value> + <PlainText>true</PlainText> + </AdministratorPassword> + <LocalAccounts> + <LocalAccount wcm:action="add"> + <Password> + <Value>vagrant</Value> + <PlainText>true</PlainText> + </Password> + <Description>Vagrant User</Description> + <DisplayName>vagrant</DisplayName> + <Group>administrators</Group> + <Name>vagrant</Name> + </LocalAccount> + </LocalAccounts> + </UserAccounts> + <OOBE> + <HideEULAPage>true</HideEULAPage> + <HideWirelessSetupInOOBE>true</HideWirelessSetupInOOBE> + <NetworkLocation>Home</NetworkLocation> + <ProtectYourPC>1</ProtectYourPC> + <HideOnlineAccountScreens>true</HideOnlineAccountScreens> + <HideLocalAccountScreen>true</HideLocalAccountScreen> + <SkipUserOOBE>true</SkipUserOOBE> + <HideOEMRegistrationScreen>true</HideOEMRegistrationScreen> + </OOBE> + <AutoLogon> + <Password> + <Value>vagrant</Value> + <PlainText>true</PlainText> + </Password> + <Username>administrator</Username> + <Enabled>true</Enabled> + </AutoLogon> + <FirstLogonCommands> + <!-- <SynchronousCommand wcm:action="add"> --> + <!-- <CommandLine>cmd.exe /c a:install-cygwin-sshd.bat</CommandLine> --> + <!-- <Description>Install Cygwin SSH</Description> --> + <!-- <Order>1</Order> --> + <!-- <RequiresUserInput>true</RequiresUserInput> --> + <!-- </SynchronousCommand> --> + <!-- <SynchronousCommand wcm:action="add"> --> + <!-- <CommandLine>cmd.exe /c a:install-winrm.bat</CommandLine> --> + <!-- <Description>Install Win RM</Description> --> + <!-- <Order>2</Order> --> + <!-- <RequiresUserInput>true</RequiresUserInput> --> + <!-- </SynchronousCommand> --> + <SynchronousCommand wcm:action="add"> + <CommandLine>cmd.exe /c winrm quickconfig -q</CommandLine> + <Description>winrm quickconfig -q</Description> + <Order>1</Order> + <RequiresUserInput>true</RequiresUserInput> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <CommandLine>cmd.exe /c winrm quickconfig -transport:http</CommandLine> + <Description>winrm quickconfig -transport:http</Description> + <Order>2</Order> + <RequiresUserInput>true</RequiresUserInput> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <CommandLine>cmd.exe /c winrm set winrm/config @{MaxTimeoutms="1800000"}</CommandLine> + <Description>Win RM MaxTimoutms</Description> + <Order>3</Order> + <RequiresUserInput>true</RequiresUserInput> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <CommandLine>cmd.exe /c winrm set winrm/config/winrs @{MaxMemoryPerShellMB="300"}</CommandLine> + <Description>Win RM MaxMemoryPerShellMB</Description> + <Order>4</Order> + <RequiresUserInput>true</RequiresUserInput> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <CommandLine>cmd.exe /c winrm set winrm/config/service @{AllowUnencrypted="true"}</CommandLine> + <Description>Win RM AllowUnencrypted</Description> + <Order>5</Order> + <RequiresUserInput>true</RequiresUserInput> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <CommandLine>cmd.exe /c winrm set winrm/config/service/auth @{Basic="true"}</CommandLine> + <Description>Win RM auth Basic</Description> + <Order>6</Order> + <RequiresUserInput>true</RequiresUserInput> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <CommandLine>cmd.exe /c winrm set winrm/config/client/auth @{Basic="true"}</CommandLine> + <Description>Win RM auth Basic</Description> + <Order>7</Order> + <RequiresUserInput>true</RequiresUserInput> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <CommandLine>cmd.exe /c winrm set winrm/config/listener?Address=*+Transport=HTTP @{Port="5985"} </CommandLine> + <Description>Win RM listener Address/Port</Description> + <Order>8</Order> + <RequiresUserInput>true</RequiresUserInput> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <CommandLine>cmd.exe /c netsh advfirewall firewall set rule group="remote administration" new enable=yes </CommandLine> + <Description>Win RM adv firewall enable</Description> + <Order>9</Order> + <RequiresUserInput>true</RequiresUserInput> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <CommandLine>cmd.exe /c netsh firewall add portopening TCP 5985 "Port 5985" </CommandLine> + <Description>Win RM port open</Description> + <Order>10</Order> + <RequiresUserInput>true</RequiresUserInput> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <CommandLine>cmd.exe /c net stop winrm </CommandLine> + <Description>Stop Win RM Service </Description> + <Order>11</Order> + <RequiresUserInput>true</RequiresUserInput> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <CommandLine>cmd.exe /c sc config winrm start= auto</CommandLine> + <Description>Win RM Autostart</Description> + <Order>12</Order> + <RequiresUserInput>true</RequiresUserInput> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <CommandLine>cmd.exe /c net start winrm </CommandLine> + <Description>Start Win RM Service</Description> + <Order>13</Order> + <RequiresUserInput>true</RequiresUserInput> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <CommandLine>powershell -Command "Set-ExecutionPolicy -ExecutionPolicy RemoteSigned -Force"</CommandLine> + <Description>Start Win RM Service</Description> + <Order>14</Order> + <RequiresUserInput>true</RequiresUserInput> + </SynchronousCommand> + </FirstLogonCommands> + <ShowWindowsLive>false</ShowWindowsLive> + </component> + </settings> + <settings pass="specialize"> + <component name="Microsoft-Windows-Shell-Setup" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" > + <OEMInformation> + <HelpCustomized>false</HelpCustomized> + </OEMInformation> + <!-- Rename computer here. --> + <ComputerName>vagrant-2008R2</ComputerName> + <TimeZone>Pacific Standard Time</TimeZone> + <RegisteredOwner></RegisteredOwner> + </component> + <component name="Microsoft-Windows-Security-SPP-UX" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <SkipAutoActivation>true</SkipAutoActivation> + </component> + </settings> + <cpi:offlineImage cpi:source="catalog:d:/sources/install_windows server 2008 r2 serverdatacenter.clg" xmlns:cpi="urn:schemas-microsoft-com:cpi" /> +</unattend> diff --git a/definitions/windows-8-enterprise/README.md b/definitions/windows-8-enterprise/README.md new file mode 100644 index 000000000..be39b6e15 --- /dev/null +++ b/definitions/windows-8-enterprise/README.md @@ -0,0 +1,87 @@ +You can download a free trial of Windows Server 2008 R2 with Service Pack 1 from two different locations manually: + +* url: http://technet.microsoft.com/en-us/evalcenter/dd459137.aspx +* url: http://msdn.microsoft.com/en-us/evalcenter/ee175713.aspx + +But they seem to always generate the same url of http://care.dlservice.microsoft.com//dl/download/7/5/E/75EC4E54-5B02-42D6-8879-D8D3A25FBEF7/7601.17514.101119-1850_x64fre_server_eval_en-us-GRMSXEVAL_EN_DVD.iso + +* 64bit +* filename: 7601.17514.101119-1850_x64fre_server_eval_en-us-GRMSXEVAL_EN_DVD.iso +* md5sum: 4263be2cf3c59177c45085c0a7bc6ca5 + + +The installation uses the Standard Windows Unattended installation. The XML file was created using the Windows AIK kit, but the file can also be edited by hand. + +To edit the Autounattend.xml and validate it you can download The Windows® Automated Installation Kit (AIK) for Windows® 7: + +* url: http://www.microsoft.com/download/en/details.aspx?id=5753 +* file: KB3AIK_EN.iso +* md5sum: 1e73b24a89eceab9d50585b92db5482f + +AIK also includes dism, which will allow you to choose a specific version: + +If you want to install a different version, edit Autoattended.xml and replace the /IMAGE/NAME value with +one of the names listed in the 2008r2 install.wim on the install DVD .iso + + +```xml +<InstallFrom> + <MetaData wcm:action="add"> + <Key>/IMAGE/NAME</Key> + <Value>Windows Server 2008 R2 SERVERSTANDARD</Value> + </MetaData> +</InstallFrom> +``` + + +``` +PS C:\Users\Administrator> Dism /Get-WIMInfo /WimFile:d:\sources\install.wim + +Deployment Image Servicing and Management tool +Version: 6.1.7600.16385 + +Details for image : d:\sources\install.wim + +Index : 1 +Name : Windows Server 2008 R2 SERVERSTANDARD +Description : Windows Server 2008 R2 SERVERSTANDARD +Size : 10,510,643,622 bytes + +Index : 2 +Name : Windows Server 2008 R2 SERVERSTANDARDCORE +Description : Windows Server 2008 R2 SERVERSTANDARDCORE +Size : 3,564,132,307 bytes + +Index : 3 +Name : Windows Server 2008 R2 SERVERENTERPRISE +Description : Windows Server 2008 R2 SERVERENTERPRISE +Size : 10,511,024,733 bytes + +Index : 4 +Name : Windows Server 2008 R2 SERVERENTERPRISECORE +Description : Windows Server 2008 R2 SERVERENTERPRISECORE +Size : 3,564,106,331 bytes + +Index : 5 +Name : Windows Server 2008 R2 SERVERDATACENTER +Description : Windows Server 2008 R2 SERVERDATACENTER +Size : 10,511,131,897 bytes + +Index : 6 +Name : Windows Server 2008 R2 SERVERDATACENTERCORE +Description : Windows Server 2008 R2 SERVERDATACENTERCORE +Size : 3,564,144,547 bytes + +Index : 7 +Name : Windows Server 2008 R2 SERVERWEB +Description : Windows Server 2008 R2 SERVERWEB +Size : 10,520,222,743 bytes + +Index : 8 +Name : Windows Server 2008 R2 SERVERWEBCORE +Description : Windows Server 2008 R2 SERVERWEBCORE +Size : 3,562,750,400 bytes + +The operation completed successfully. +``` + diff --git a/definitions/windows-8-enterprise/definition.rb b/definitions/windows-8-enterprise/definition.rb new file mode 100644 index 000000000..63ecdbbf3 --- /dev/null +++ b/definitions/windows-8-enterprise/definition.rb @@ -0,0 +1,15 @@ +# -*- coding: utf-8 -*- +require File.dirname(__FILE__) + "/../.windows/session.rb" + +iso_src = "http://care.dlservice.microsoft.com/dl/download/5/3/C/53C31ED0-886C-4F81-9A38-F58CE4CE71E8/9200.16384.WIN8_RTM.120725-1247_X64FRE_ENTERPRISE_EVAL_EN-US-HRM_CENA_X64FREE_EN-US_DV5.ISO" + +session = WINDOWS_SESSION.merge({ + :os_type_id => 'Windows8_64', + :iso_download_instructions => "Download Windows 8 Enterprise 90-day Trial at http://msdn.microsoft.com/en-us/evalcenter/jj554510.aspx", + :iso_file => File.basename(iso_src), + :iso_src => iso_src, + :iso_md5 => "6beffd994574ca89417286f0dc056108", + :memory_size=> "512" + }) + +Veewee::Session.declare session diff --git a/definitions/windows-8-enterprise/install-chef.bat b/definitions/windows-8-enterprise/install-chef.bat new file mode 120000 index 000000000..0494fd4af --- /dev/null +++ b/definitions/windows-8-enterprise/install-chef.bat @@ -0,0 +1 @@ +../.windows/install-chef.bat \ No newline at end of file diff --git a/definitions/windows-8-enterprise/install-vbox.bat b/definitions/windows-8-enterprise/install-vbox.bat new file mode 120000 index 000000000..2ff5531e3 --- /dev/null +++ b/definitions/windows-8-enterprise/install-vbox.bat @@ -0,0 +1 @@ +../.windows/install-vbox.bat \ No newline at end of file diff --git a/definitions/windows-8-enterprise/mount-validation.bat b/definitions/windows-8-enterprise/mount-validation.bat new file mode 120000 index 000000000..e137688e8 --- /dev/null +++ b/definitions/windows-8-enterprise/mount-validation.bat @@ -0,0 +1 @@ +../.windows/mount-validation.bat \ No newline at end of file diff --git a/definitions/windows-8-enterprise/oracle-cert.cer b/definitions/windows-8-enterprise/oracle-cert.cer new file mode 120000 index 000000000..5fbb0d341 --- /dev/null +++ b/definitions/windows-8-enterprise/oracle-cert.cer @@ -0,0 +1 @@ +../.windows/oracle-cert.cer \ No newline at end of file From 845f8776c32ece9aff82f6fb384339ca5bca9453 Mon Sep 17 00:00:00 2001 From: Hippie Hacker <chris@hippiehacker.org> Date: Mon, 18 Mar 2013 07:45:17 -0700 Subject: [PATCH 0009/1622] Added timeout before installing chef (mainly for windows 8) --- definitions/.windows/install-chef.bat | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/definitions/.windows/install-chef.bat b/definitions/.windows/install-chef.bat index c90bfb677..eea2e3842 100644 --- a/definitions/.windows/install-chef.bat +++ b/definitions/.windows/install-chef.bat @@ -1,2 +1,6 @@ -cmd /C cscript %TEMP%\wget.vbs /url:http://www.opscode.com/chef/install.msi /path:%TEMP%\chef-client.msi -cmd /C msiexec /qn /i %TEMP%\chef-client.msi +timeout 10 +REM sleeping to give outbound networking a chance to come up +cmd /C cscript wget.vbs /url:http://www.opscode.com/chef/install.msi /path:chef-client.msi +cmd /C msiexec /qn /i chef-client.msi + + From 6c68f96a0506936ea6fb7a31dfd125d4b2f8d0a1 Mon Sep 17 00:00:00 2001 From: Hippie Hacker <chris@hippiehacker.org> Date: Mon, 18 Mar 2013 07:45:43 -0700 Subject: [PATCH 0010/1622] Don't reboot imediately, on really fast machines it causes winrm error --- definitions/.windows/install-vbox.bat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/definitions/.windows/install-vbox.bat b/definitions/.windows/install-vbox.bat index e5ccc4402..bd4035137 100644 --- a/definitions/.windows/install-vbox.bat +++ b/definitions/.windows/install-vbox.bat @@ -2,5 +2,5 @@ REM with this, we can open the iso, and extract the VBoxWindowsAdditions.exe! REM http://downloads.sourceforge.net/sevenzip/7z920.exe cmd /c certutil -addstore -f "TrustedPublisher" a:oracle-cert.cer cmd /c e:\VBoxWindowsAdditions-amd64.exe /S -cmd /c shutdown.exe /r /t 0 /d p:2:4 /c "Vagrant reboot for VBoxWindowsAdditions" +cmd /c shutdown.exe /r /t 5 /d p:2:4 /c "Vagrant reboot for VBoxWindowsAdditions" From c756eb142b0ee42c2768bb96197adc3024aa5904 Mon Sep 17 00:00:00 2001 From: Hippie Hacker <chris@hippiehacker.org> Date: Mon, 18 Mar 2013 07:46:15 -0700 Subject: [PATCH 0011/1622] mount validation fails on some oses... wait for veewee validation to try --- definitions/.windows/mount-validation.bat | 2 +- definitions/.windows/session.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/definitions/.windows/mount-validation.bat b/definitions/.windows/mount-validation.bat index c58d832c3..ae458c1d6 100644 --- a/definitions/.windows/mount-validation.bat +++ b/definitions/.windows/mount-validation.bat @@ -1,3 +1,3 @@ -REM This is so we can pass the validation test +REM This is so we can pass the validation test... I don't know that it's necessary cmd /c net use z: \\vboxsrv\veewee-validation diff --git a/definitions/.windows/session.rb b/definitions/.windows/session.rb index 182b0b95d..f639f260d 100644 --- a/definitions/.windows/session.rb +++ b/definitions/.windows/session.rb @@ -12,7 +12,7 @@ :postinstall_files => [ "install-chef.bat", "install-vbox.bat", # would be interesting to only include this on vbox - "mount-validation.bat" # maybe test if we are within a vbox vm? + # "mount-validation.bat" # maybe test if we are within a vbox vm? # because this will eventually run on kvm, openstack, etc etc ], :video_memory_size => '48', From d7e0dd656a67f3b0c2db8347bb5ffe36eb13fa07 Mon Sep 17 00:00:00 2001 From: Hippie Hacker <chris@hippiehacker.org> Date: Fri, 22 Mar 2013 11:43:37 -0700 Subject: [PATCH 0012/1622] Updates for windows-8 and windows-2012 --- definitions/windows-2008r2-standard/definition.rb | 1 + definitions/windows-2012-standard/Autounattend.xml | 11 ++++++++--- definitions/windows-2012-standard/definition.rb | 14 +++++++++----- definitions/windows-7-enterprise/definition.rb | 2 +- definitions/windows-8-enterprise/Autounattend.xml | 4 ++-- definitions/windows-8-enterprise/definition.rb | 2 ++ 6 files changed, 23 insertions(+), 11 deletions(-) diff --git a/definitions/windows-2008r2-standard/definition.rb b/definitions/windows-2008r2-standard/definition.rb index 31dc7e185..fc9784dac 100644 --- a/definitions/windows-2008r2-standard/definition.rb +++ b/definitions/windows-2008r2-standard/definition.rb @@ -9,6 +9,7 @@ :iso_src => iso_src, :iso_file => File.basename(iso_src), :iso_md5 => "4263be2cf3c59177c45085c0a7bc6ca5", + :winrm_host_port => "2008", :kickstart_port => "7150" }) diff --git a/definitions/windows-2012-standard/Autounattend.xml b/definitions/windows-2012-standard/Autounattend.xml index 3f3d0ef9f..6de7ff759 100644 --- a/definitions/windows-2012-standard/Autounattend.xml +++ b/definitions/windows-2012-standard/Autounattend.xml @@ -24,7 +24,7 @@ <Letter>C</Letter> <Order>1</Order> <PartitionID>1</PartitionID> - <Label>Windows 2008R2</Label> + <Label>Windows 2012</Label> </ModifyPartition> </ModifyPartitions> @@ -57,7 +57,7 @@ <InstallFrom> <MetaData wcm:action="add"> <Key>/IMAGE/NAME</Key> - <Value>Windows Server 2008 R2 SERVERSTANDARD</Value> + <Value>Windows Server 2012 SERVERSTANDARD</Value> </MetaData> </InstallFrom> </OSImage> @@ -102,6 +102,11 @@ <HideEULAPage>true</HideEULAPage> <HideWirelessSetupInOOBE>true</HideWirelessSetupInOOBE> <NetworkLocation>Home</NetworkLocation> + <ProtectYourPC>1</ProtectYourPC> + <HideOnlineAccountScreens>true</HideOnlineAccountScreens> + <HideLocalAccountScreen>true</HideLocalAccountScreen> + <SkipUserOOBE>true</SkipUserOOBE> + <HideOEMRegistrationScreen>true</HideOEMRegistrationScreen> </OOBE> <AutoLogon> <Password> @@ -218,7 +223,7 @@ <HelpCustomized>false</HelpCustomized> </OEMInformation> <!-- Rename computer here. --> - <ComputerName>vagrant-2008R2</ComputerName> + <ComputerName>vagrant-2012</ComputerName> <TimeZone>Pacific Standard Time</TimeZone> <RegisteredOwner></RegisteredOwner> </component> diff --git a/definitions/windows-2012-standard/definition.rb b/definitions/windows-2012-standard/definition.rb index 552e58708..8362fdaac 100644 --- a/definitions/windows-2012-standard/definition.rb +++ b/definitions/windows-2012-standard/definition.rb @@ -1,15 +1,19 @@ # -*- coding: utf-8 -*- require File.dirname(__FILE__) + "/../.windows/session.rb" -iso_src = "http://care.dlservice.microsoft.com//dl/download/7/5/E/75EC4E54-5B02-42D6-8879-D8D3A25FBEF7/7601.17514.101119-1850_x64fre_server_eval_en-us-GRMSXEVAL_EN_DVD.iso" +iso_src ="http://care.dlservice.microsoft.com//dl/download/6/D/A/6DAB58BA-F939-451D-9101-7DE07DC09C03/9200.16384.WIN8_RTM.120725-1247_X64FRE_SERVER_EVAL_EN-US-HRM_SSS_X64FREE_EN-US_DV5.ISO" +#"http://care.dlservice.microsoft.com//dl/download/6/D/A/6DAB58BA-F939-451D-9101-7DE07DC09C03/9200.16384.WIN8_RTM.120725-1247_X64FRE_SERVER_EVAL_EN-US-HRM_SSS_X64FREE_EN-US_DV5.ISO?lcid=1033&cprod=winsvr2012rtmisotn" +#"http://care.dlservice.microsoft.com/download/6/D/A/6DAB58BA-F939-451D-9101-7DE07DC09C03/9200.16384.WIN8_RTM.120725-1247_X64FRE_SERVER_EVAL_EN-US-HRM_SSS_X64FREE_EN-US_DV5.ISO" session = WINDOWS_SESSION.merge({ - :os_type_id => 'Windows2008_64', - :iso_download_instructions => "Download and install full featured software for 180-day trial at http://technet.microsoft.com/en-us/evalcenter/dd459137.aspx", + :os_type_id => 'Windows8_64', + :iso_download_instructions => "Download and install full featured software for 180-day trial at http://technet.microsoft.com/en-US/evalcenter/hh670538.aspx", :iso_src => iso_src, :iso_file => File.basename(iso_src), - :iso_md5 => "4263be2cf3c59177c45085c0a7bc6ca5", - :kickstart_port => "7140" + :iso_md5 => "8503997171f731d9bd1cb0b0edc31f3d", + :kickstart_port => "7140", + :winrm_host_port => "2012", + :memory_size=> "512" }) Veewee::Session.declare session diff --git a/definitions/windows-7-enterprise/definition.rb b/definitions/windows-7-enterprise/definition.rb index 9b799bc24..89a7652d4 100644 --- a/definitions/windows-7-enterprise/definition.rb +++ b/definitions/windows-7-enterprise/definition.rb @@ -9,8 +9,8 @@ :iso_file => File.basename(iso_src), :iso_src => iso_src, :iso_md5 => "1d0d239a252cb53e466d39e752b17c28", + :winrm_host_port => "5987", :kickstart_port => "7150" - }) Veewee::Session.declare session diff --git a/definitions/windows-8-enterprise/Autounattend.xml b/definitions/windows-8-enterprise/Autounattend.xml index 6d0aa0962..7348cd0a5 100644 --- a/definitions/windows-8-enterprise/Autounattend.xml +++ b/definitions/windows-8-enterprise/Autounattend.xml @@ -24,7 +24,7 @@ <Letter>C</Letter> <Order>1</Order> <PartitionID>1</PartitionID> - <Label>Windows 2008R2</Label> + <Label>Windows 8</Label> </ModifyPartition> </ModifyPartitions> @@ -223,7 +223,7 @@ <HelpCustomized>false</HelpCustomized> </OEMInformation> <!-- Rename computer here. --> - <ComputerName>vagrant-2008R2</ComputerName> + <ComputerName>vagrant-8</ComputerName> <TimeZone>Pacific Standard Time</TimeZone> <RegisteredOwner></RegisteredOwner> </component> diff --git a/definitions/windows-8-enterprise/definition.rb b/definitions/windows-8-enterprise/definition.rb index 63ecdbbf3..6c0fc301a 100644 --- a/definitions/windows-8-enterprise/definition.rb +++ b/definitions/windows-8-enterprise/definition.rb @@ -9,6 +9,8 @@ :iso_file => File.basename(iso_src), :iso_src => iso_src, :iso_md5 => "6beffd994574ca89417286f0dc056108", + :winrm_host_port => "5988", + :kickstart_port => "7150", :memory_size=> "512" }) From 02927a770440a3785b2df766f7240c9c998093f6 Mon Sep 17 00:00:00 2001 From: Hippie Hacker <chris@hippiehacker.org> Date: Fri, 22 Mar 2013 11:49:12 -0700 Subject: [PATCH 0013/1622] fix up batches to point to public places --- definitions/.windows/install-chef.bat | 8 ++------ definitions/.windows/install-vbox.bat | 2 -- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/definitions/.windows/install-chef.bat b/definitions/.windows/install-chef.bat index 0c255a2b1..fd1edf95c 100644 --- a/definitions/.windows/install-chef.bat +++ b/definitions/.windows/install-chef.bat @@ -1,6 +1,2 @@ -timeout 10 -REM sleeping to give outbound networkingh a chance to come up -cmd /C cscript wget.vbs /url:http://10.12.13.1/chef-client-11.4.0-18-gdf096fa-1.windows.msi /path:chef-client.msi -cmd /C msiexec /qn /i chef-client.msi -timeout 120 - +cmd /C powershell (New-Object System.Net.Webclient).DownloadFile('http://http://www.opscode.com/chef/install.msi','c:\chef-client.msi') +cmd /C msiexec /qn /i c:\chef-client.msi diff --git a/definitions/.windows/install-vbox.bat b/definitions/.windows/install-vbox.bat index bd4035137..614c415c7 100644 --- a/definitions/.windows/install-vbox.bat +++ b/definitions/.windows/install-vbox.bat @@ -1,5 +1,3 @@ -REM with this, we can open the iso, and extract the VBoxWindowsAdditions.exe! -REM http://downloads.sourceforge.net/sevenzip/7z920.exe cmd /c certutil -addstore -f "TrustedPublisher" a:oracle-cert.cer cmd /c e:\VBoxWindowsAdditions-amd64.exe /S cmd /c shutdown.exe /r /t 5 /d p:2:4 /c "Vagrant reboot for VBoxWindowsAdditions" From 65c1532d111ce3813dfc0b426df7fbfd2d21d4db Mon Sep 17 00:00:00 2001 From: Chulki Lee <chulki@asperasoft.com> Date: Wed, 13 Mar 2013 10:26:10 -0700 Subject: [PATCH 0014/1622] Use Centos, not RedHat for os_type_id --- definitions/.centos/session.rb | 2 +- definitions/centos-5.5-i386/definition.rb | 2 +- definitions/centos-5.8-i386/definition.rb | 2 +- definitions/centos-5.8/definition.rb | 2 +- definitions/centos-6.2-i386/definition.rb | 2 +- definitions/centos-6.3-i386/definition.rb | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/definitions/.centos/session.rb b/definitions/.centos/session.rb index d9a1f3119..9c49280aa 100644 --- a/definitions/.centos/session.rb +++ b/definitions/.centos/session.rb @@ -4,7 +4,7 @@ COMMON_SESSION.merge({ :boot_cmd_sequence => [ 'linux text ks=http://%IP%:%PORT%/ks.cfg<Enter>' ], :kickstart_file => "ks.cfg", - :os_type_id => 'RedHat_64', + :os_type_id => 'Centos_64', :postinstall_files => [ "chef-client.sh", "vagrant.sh", "cleanup.sh", diff --git a/definitions/centos-5.5-i386/definition.rb b/definitions/centos-5.5-i386/definition.rb index 63a543f99..120e68fc5 100644 --- a/definitions/centos-5.5-i386/definition.rb +++ b/definitions/centos-5.5-i386/definition.rb @@ -3,7 +3,7 @@ iso = "CentOS-5.5-i386-bin-DVD.iso" session = - CENTOS_SESSION.merge({ :os_type_id => 'RedHat', + CENTOS_SESSION.merge({ :os_type_id => 'Centos', :iso_file => iso, :iso_md5 => "75c92246479df172de41b14c9b966344", :iso_src => "http://mirror.teklinks.com/centos/5.5/isos/i386/#{iso}" }) diff --git a/definitions/centos-5.8-i386/definition.rb b/definitions/centos-5.8-i386/definition.rb index 7dc306560..f0bd51278 100644 --- a/definitions/centos-5.8-i386/definition.rb +++ b/definitions/centos-5.8-i386/definition.rb @@ -3,7 +3,7 @@ iso = "CentOS-5.8-i386-bin-DVD-1of2.iso" session = - CENTOS_SESSION.merge({ :os_type_id => 'RedHat', + CENTOS_SESSION.merge({ :os_type_id => 'Centos', :iso_file => iso, :iso_md5 => "0fdd45c43b5d8fb9e05f4255c5855f9c", :iso_src => "http://mirror.stanford.edu/yum/pub/centos/5.8/isos/i386/#{iso}" }) diff --git a/definitions/centos-5.8/definition.rb b/definitions/centos-5.8/definition.rb index 47501f7ca..8807f010e 100644 --- a/definitions/centos-5.8/definition.rb +++ b/definitions/centos-5.8/definition.rb @@ -3,7 +3,7 @@ iso = "CentOS-5.8-x86_64-bin-DVD-1of2.iso" session = - CENTOS_SESSION.merge({ :os_type_id => 'RedHat', + CENTOS_SESSION.merge({ :os_type_id => 'Centos', :iso_file => iso, :iso_md5 => "8a3bf0030f192022943f83fe6b2cf373", :iso_src => "http://mirror.stanford.edu/yum/pub/centos/5.8/isos/x86_64/#{iso}" }) diff --git a/definitions/centos-6.2-i386/definition.rb b/definitions/centos-6.2-i386/definition.rb index 8e26304b3..f00fa7cdf 100644 --- a/definitions/centos-6.2-i386/definition.rb +++ b/definitions/centos-6.2-i386/definition.rb @@ -6,7 +6,7 @@ CENTOS_SESSION.merge( :boot_cmd_sequence => [ '<Tab> text ks=http://%IP%:%PORT%/ks.cfg<Enter>' ], :memory_size=> '480', - :os_type_id => 'RedHat', + :os_type_id => 'Centos', :iso_file => iso, :iso_md5 => "8c976288ed53dc97439f7ab5854f2648", :iso_src => "http://vault.centos.org/6.2/isos/i386/#{iso}" ) diff --git a/definitions/centos-6.3-i386/definition.rb b/definitions/centos-6.3-i386/definition.rb index 58648e7fd..cd56f11df 100644 --- a/definitions/centos-6.3-i386/definition.rb +++ b/definitions/centos-6.3-i386/definition.rb @@ -6,7 +6,7 @@ CENTOS_SESSION.merge( :boot_cmd_sequence => [ '<Tab> text ks=http://%IP%:%PORT%/ks.cfg<Enter>' ], :memory_size=> '480', - :os_type_id => 'RedHat', + :os_type_id => 'Centos', :iso_file => iso, :iso_md5 => "0285160d8ba3cfc720ea55e98e464eac", :iso_src => "http://mirrors.kernel.org/centos/6.3/isos/i386/#{iso}" ) From 3378c8bcfe286f52bd1d6ddf2c883e1f96e184f5 Mon Sep 17 00:00:00 2001 From: ctdk <jbingham@gmail.com> Date: Wed, 3 Apr 2013 15:16:49 -0700 Subject: [PATCH 0015/1622] debian 6.0.5 is no longer available, change to 6.0.7 --- .../{debian-6.0.5-i386 => debian-6.0.7-i386}/chef-client.sh | 0 .../{debian-6.0.5-i386 => debian-6.0.7-i386}/cleanup.sh | 0 .../{debian-6.0.5-i386 => debian-6.0.7-i386}/definition.rb | 6 +++--- .../{debian-6.0.5-i386 => debian-6.0.7-i386}/minimize.sh | 0 .../{debian-6.0.5-i386 => debian-6.0.7-i386}/networking.sh | 0 .../{debian-6.0.5-i386 => debian-6.0.7-i386}/preseed.cfg | 0 .../{debian-6.0.5-i386 => debian-6.0.7-i386}/sudoers.sh | 0 .../{debian-6.0.5-i386 => debian-6.0.7-i386}/update.sh | 0 .../{debian-6.0.5-i386 => debian-6.0.7-i386}/vagrant.sh | 0 definitions/{debian-6.0.5 => debian-6.0.7}/chef-client.sh | 0 definitions/{debian-6.0.5 => debian-6.0.7}/cleanup.sh | 0 definitions/{debian-6.0.5 => debian-6.0.7}/definition.rb | 6 +++--- definitions/{debian-6.0.5 => debian-6.0.7}/minimize.sh | 0 definitions/{debian-6.0.5 => debian-6.0.7}/networking.sh | 0 definitions/{debian-6.0.5 => debian-6.0.7}/preseed.cfg | 0 definitions/{debian-6.0.5 => debian-6.0.7}/sudoers.sh | 0 definitions/{debian-6.0.5 => debian-6.0.7}/update.sh | 0 definitions/{debian-6.0.5 => debian-6.0.7}/vagrant.sh | 0 18 files changed, 6 insertions(+), 6 deletions(-) rename definitions/{debian-6.0.5-i386 => debian-6.0.7-i386}/chef-client.sh (100%) rename definitions/{debian-6.0.5-i386 => debian-6.0.7-i386}/cleanup.sh (100%) rename definitions/{debian-6.0.5-i386 => debian-6.0.7-i386}/definition.rb (64%) rename definitions/{debian-6.0.5-i386 => debian-6.0.7-i386}/minimize.sh (100%) rename definitions/{debian-6.0.5-i386 => debian-6.0.7-i386}/networking.sh (100%) rename definitions/{debian-6.0.5-i386 => debian-6.0.7-i386}/preseed.cfg (100%) rename definitions/{debian-6.0.5-i386 => debian-6.0.7-i386}/sudoers.sh (100%) rename definitions/{debian-6.0.5-i386 => debian-6.0.7-i386}/update.sh (100%) rename definitions/{debian-6.0.5-i386 => debian-6.0.7-i386}/vagrant.sh (100%) rename definitions/{debian-6.0.5 => debian-6.0.7}/chef-client.sh (100%) rename definitions/{debian-6.0.5 => debian-6.0.7}/cleanup.sh (100%) rename definitions/{debian-6.0.5 => debian-6.0.7}/definition.rb (59%) rename definitions/{debian-6.0.5 => debian-6.0.7}/minimize.sh (100%) rename definitions/{debian-6.0.5 => debian-6.0.7}/networking.sh (100%) rename definitions/{debian-6.0.5 => debian-6.0.7}/preseed.cfg (100%) rename definitions/{debian-6.0.5 => debian-6.0.7}/sudoers.sh (100%) rename definitions/{debian-6.0.5 => debian-6.0.7}/update.sh (100%) rename definitions/{debian-6.0.5 => debian-6.0.7}/vagrant.sh (100%) diff --git a/definitions/debian-6.0.5-i386/chef-client.sh b/definitions/debian-6.0.7-i386/chef-client.sh similarity index 100% rename from definitions/debian-6.0.5-i386/chef-client.sh rename to definitions/debian-6.0.7-i386/chef-client.sh diff --git a/definitions/debian-6.0.5-i386/cleanup.sh b/definitions/debian-6.0.7-i386/cleanup.sh similarity index 100% rename from definitions/debian-6.0.5-i386/cleanup.sh rename to definitions/debian-6.0.7-i386/cleanup.sh diff --git a/definitions/debian-6.0.5-i386/definition.rb b/definitions/debian-6.0.7-i386/definition.rb similarity index 64% rename from definitions/debian-6.0.5-i386/definition.rb rename to definitions/debian-6.0.7-i386/definition.rb index 03086c9f5..7b87a7e61 100644 --- a/definitions/debian-6.0.5-i386/definition.rb +++ b/definitions/debian-6.0.7-i386/definition.rb @@ -1,11 +1,11 @@ require File.dirname(__FILE__) + "/../.debian/session.rb" -iso = "debian-6.0.5-i386-CD-1.iso" +iso = "debian-6.0.7-i386-CD-1.iso" session = DEBIAN_SESSION.merge( :os_type_id => 'Debian', :iso_file => iso, - :iso_md5 => "fc9399969a435fe118d5605334477204", - :iso_src => "http://cdimage.debian.org/debian-cd/6.0.5/i386/iso-cd/#{iso}") + :iso_md5 => "4480eeae60213eb92e1fce15ebf2faf4", + :iso_src => "http://cdimage.debian.org/debian-cd/6.0.7/i386/iso-cd/#{iso}") Veewee::Session.declare session diff --git a/definitions/debian-6.0.5-i386/minimize.sh b/definitions/debian-6.0.7-i386/minimize.sh similarity index 100% rename from definitions/debian-6.0.5-i386/minimize.sh rename to definitions/debian-6.0.7-i386/minimize.sh diff --git a/definitions/debian-6.0.5-i386/networking.sh b/definitions/debian-6.0.7-i386/networking.sh similarity index 100% rename from definitions/debian-6.0.5-i386/networking.sh rename to definitions/debian-6.0.7-i386/networking.sh diff --git a/definitions/debian-6.0.5-i386/preseed.cfg b/definitions/debian-6.0.7-i386/preseed.cfg similarity index 100% rename from definitions/debian-6.0.5-i386/preseed.cfg rename to definitions/debian-6.0.7-i386/preseed.cfg diff --git a/definitions/debian-6.0.5-i386/sudoers.sh b/definitions/debian-6.0.7-i386/sudoers.sh similarity index 100% rename from definitions/debian-6.0.5-i386/sudoers.sh rename to definitions/debian-6.0.7-i386/sudoers.sh diff --git a/definitions/debian-6.0.5-i386/update.sh b/definitions/debian-6.0.7-i386/update.sh similarity index 100% rename from definitions/debian-6.0.5-i386/update.sh rename to definitions/debian-6.0.7-i386/update.sh diff --git a/definitions/debian-6.0.5-i386/vagrant.sh b/definitions/debian-6.0.7-i386/vagrant.sh similarity index 100% rename from definitions/debian-6.0.5-i386/vagrant.sh rename to definitions/debian-6.0.7-i386/vagrant.sh diff --git a/definitions/debian-6.0.5/chef-client.sh b/definitions/debian-6.0.7/chef-client.sh similarity index 100% rename from definitions/debian-6.0.5/chef-client.sh rename to definitions/debian-6.0.7/chef-client.sh diff --git a/definitions/debian-6.0.5/cleanup.sh b/definitions/debian-6.0.7/cleanup.sh similarity index 100% rename from definitions/debian-6.0.5/cleanup.sh rename to definitions/debian-6.0.7/cleanup.sh diff --git a/definitions/debian-6.0.5/definition.rb b/definitions/debian-6.0.7/definition.rb similarity index 59% rename from definitions/debian-6.0.5/definition.rb rename to definitions/debian-6.0.7/definition.rb index 91834a345..f2ce29790 100644 --- a/definitions/debian-6.0.5/definition.rb +++ b/definitions/debian-6.0.7/definition.rb @@ -1,10 +1,10 @@ require File.dirname(__FILE__) + "/../.debian/session.rb" -iso = "debian-6.0.5-amd64-CD-1.iso" +iso = "debian-6.0.7-amd64-CD-1.iso" session = DEBIAN_SESSION.merge( :iso_file => iso, - :iso_md5 => "bccf90bdaf352a554e8af99f0af6c655", - :iso_src => "http://cdimage.debian.org/debian-cd/6.0.5/amd64/iso-cd/#{iso}") + :iso_md5 => "8f0e86d19bc90768da08cdafb4f9edbb", + :iso_src => "http://cdimage.debian.org/debian-cd/6.0.7/amd64/iso-cd/#{iso}") Veewee::Session.declare session diff --git a/definitions/debian-6.0.5/minimize.sh b/definitions/debian-6.0.7/minimize.sh similarity index 100% rename from definitions/debian-6.0.5/minimize.sh rename to definitions/debian-6.0.7/minimize.sh diff --git a/definitions/debian-6.0.5/networking.sh b/definitions/debian-6.0.7/networking.sh similarity index 100% rename from definitions/debian-6.0.5/networking.sh rename to definitions/debian-6.0.7/networking.sh diff --git a/definitions/debian-6.0.5/preseed.cfg b/definitions/debian-6.0.7/preseed.cfg similarity index 100% rename from definitions/debian-6.0.5/preseed.cfg rename to definitions/debian-6.0.7/preseed.cfg diff --git a/definitions/debian-6.0.5/sudoers.sh b/definitions/debian-6.0.7/sudoers.sh similarity index 100% rename from definitions/debian-6.0.5/sudoers.sh rename to definitions/debian-6.0.7/sudoers.sh diff --git a/definitions/debian-6.0.5/update.sh b/definitions/debian-6.0.7/update.sh similarity index 100% rename from definitions/debian-6.0.5/update.sh rename to definitions/debian-6.0.7/update.sh diff --git a/definitions/debian-6.0.5/vagrant.sh b/definitions/debian-6.0.7/vagrant.sh similarity index 100% rename from definitions/debian-6.0.5/vagrant.sh rename to definitions/debian-6.0.7/vagrant.sh From 75c4a285d3888c88d34d356c1249358c3e411ada Mon Sep 17 00:00:00 2001 From: "Julian C. Dunn" <jdunn@opscode.com> Date: Fri, 19 Apr 2013 17:36:13 -0400 Subject: [PATCH 0016/1622] Repin gemset to Vagrant 1.1 versions and veewee head --- Gemfile | 6 +-- Gemfile.lock | 131 ++++++++++++++++++++++++--------------------------- 2 files changed, 65 insertions(+), 72 deletions(-) diff --git a/Gemfile b/Gemfile index e193d99a5..b0860f79c 100644 --- a/Gemfile +++ b/Gemfile @@ -1,6 +1,6 @@ -source :rubygems +source "https://rubygems.org" -gem "vagrant", "~> 1.0" -gem "veewee", "~> 0.3.7" +gem "vagrant", :git => 'https://github.com/mitchellh/vagrant.git', :tag => 'v1.1.5' +gem "veewee", :git => 'https://github.com/jedi4ever/veewee.git', :ref => '164a10dd24' gem "em-winrm" # for windows! gem "rake" diff --git a/Gemfile.lock b/Gemfile.lock index a5398c4a9..bfc335c6c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,5 +1,39 @@ +GIT + remote: https://github.com/jedi4ever/veewee.git + revision: 164a10dd246ed67c0a9a655b915eb0c1d6144203 + ref: 164a10dd24 + specs: + veewee (0.3.7) + ansi (~> 1.3.0) + childprocess + fission (= 0.4.0) + fog (~> 1.8) + grit + highline + i18n + json + net-ssh (>= 2.2.0) + popen4 (~> 0.1.2) + progressbar + ruby-vnc (~> 1.0.0) + thor (~> 0.15) + +GIT + remote: https://github.com/mitchellh/vagrant.git + revision: 64e360814c3ad960d810456add977fd4c7d47ce6 + tag: v1.1.5 + specs: + vagrant (1.1.5) + childprocess (~> 0.3.7) + erubis (~> 2.7.0) + i18n (~> 0.6.0) + json (>= 1.5.1, < 1.8.0) + log4r (~> 1.1.9) + net-scp (~> 1.1.0) + net-ssh (~> 2.6.6) + GEM - remote: http://rubygems.org/ + remote: https://rubygems.org/ specs: CFPropertyList (2.0.17) libxml-ruby (>= 1.1.0) @@ -9,16 +43,10 @@ GEM gyoku (>= 0.4.0) nokogiri (>= 1.4.0) ansi (1.3.0) - archive-tar-minitar (0.5.2) - builder (3.1.4) - childprocess (0.3.6) - ffi (~> 1.0, >= 1.0.6) - cucumber (1.2.1) - builder (>= 2.1.2) - diff-lcs (>= 1.1.3) - gherkin (~> 2.11.0) - json (>= 1.4.6) - diff-lcs (1.1.3) + builder (3.2.0) + childprocess (0.3.9) + ffi (~> 1.0, >= 1.0.11) + diff-lcs (1.2.3) em-winrm (0.5.4) eventmachine (= 1.0.0.beta.3) mixlib-log (>= 1.3.0) @@ -26,23 +54,21 @@ GEM winrm (~> 1.1.0) erubis (2.7.0) eventmachine (1.0.0.beta.3) - excon (0.16.10) - ffi (1.3.1) + excon (0.20.1) + ffi (1.7.0) fission (0.4.0) CFPropertyList (~> 2.0.17) - fog (1.9.0) + fog (1.10.1) builder - excon (~> 0.14) + excon (~> 0.20) formatador (~> 0.2.0) mime-types multi_json (~> 1.0) - net-scp (~> 1.0.4) + net-scp (~> 1.1) net-ssh (>= 2.1.3) nokogiri (~> 1.5.0) ruby-hmac formatador (0.2.4) - gherkin (2.11.5) - json (>= 1.4.6) grit (2.5.0) diff-lcs (~> 1.1) mime-types (~> 1.15) @@ -51,41 +77,33 @@ GEM ffi (>= 1.0.1) gyoku (1.0.0) builder (>= 2.1.2) - highline (1.6.15) + highline (1.6.18) httpclient (2.2.0.2) httpi (0.9.7) rack - i18n (0.6.1) - json (1.5.4) - libxml-ruby (2.4.0) + i18n (0.6.4) + json (1.7.7) + libxml-ruby (2.6.0) little-plugger (1.1.3) log4r (1.1.10) logging (1.6.2) little-plugger (>= 1.1.3) - mime-types (1.19) - mixlib-log (1.4.1) - multi_json (1.5.0) - net-scp (1.0.4) - net-ssh (>= 1.99.1) - net-ssh (2.2.2) - nokogiri (1.5.6) - nori (1.1.4) + mime-types (1.22) + mixlib-log (1.6.0) + multi_json (1.7.2) + net-scp (1.1.0) + net-ssh (>= 2.6.5) + net-ssh (2.6.7) + nokogiri (1.5.9) + nori (1.1.5) open4 (1.3.0) popen4 (0.1.2) Platform (>= 0.4.0) open4 (>= 0.4.0) posix-spawn (0.3.6) - progressbar (0.12.0) - rack (1.5.0) - rake (10.0.3) - rspec (2.12.0) - rspec-core (~> 2.12.0) - rspec-expectations (~> 2.12.0) - rspec-mocks (~> 2.12.0) - rspec-core (2.12.2) - rspec-expectations (2.12.1) - diff-lcs (~> 1.1.3) - rspec-mocks (2.12.1) + progressbar (0.20.0) + rack (1.5.2) + rake (10.0.4) ruby-hmac (0.4.0) ruby-vnc (1.0.1) rubyntlm (0.1.1) @@ -97,33 +115,8 @@ GEM nokogiri (>= 1.4.0) nori (~> 1.0) wasabi (~> 1.0) - thor (0.16.0) + thor (0.18.1) uuidtools (2.1.3) - vagrant (1.0.5) - archive-tar-minitar (= 0.5.2) - childprocess (~> 0.3.1) - erubis (~> 2.7.0) - i18n (~> 0.6.0) - json (~> 1.5.1) - log4r (~> 1.1.9) - net-scp (~> 1.0.4) - net-ssh (~> 2.2.2) - veewee (0.3.7) - ansi (~> 1.3.0) - childprocess - cucumber (>= 1.0.0) - fission (= 0.4.0) - fog (~> 1.8) - grit - highline - i18n - net-ssh (~> 2.2.0) - popen4 (~> 0.1.2) - progressbar - rspec (~> 2.5) - ruby-vnc (~> 1.0.0) - thor (~> 0.15) - vagrant (>= 0.9) wasabi (1.0.0) nokogiri (>= 1.4.0) winrm (1.1.2) @@ -141,5 +134,5 @@ PLATFORMS DEPENDENCIES em-winrm rake - vagrant (~> 1.0.5) - veewee (>= 0.3.7) + vagrant! + veewee! From cc336a11726c0b59220bb37013df7a21d38277f1 Mon Sep 17 00:00:00 2001 From: "Julian C. Dunn" <jdunn@opscode.com> Date: Sat, 20 Apr 2013 01:44:09 -0400 Subject: [PATCH 0017/1622] Bugfix for CentOS x86_64 box not having RedHat_64 as type; this will cause a build failure. Import box templates for CentOS 5.9 and CentOS 6.4. --- definitions/centos-5.8/definition.rb | 2 +- definitions/centos-5.9-i386/chef-client.sh | 3 ++ definitions/centos-5.9-i386/cleanup.sh | 5 +++ definitions/centos-5.9-i386/definition.rb | 11 ++++++ definitions/centos-5.9-i386/ks.cfg | 39 ++++++++++++++++++++++ definitions/centos-5.9-i386/minimize.sh | 4 +++ definitions/centos-5.9-i386/vagrant.sh | 17 ++++++++++ definitions/centos-5.9/chef-client.sh | 3 ++ definitions/centos-5.9/cleanup.sh | 5 +++ definitions/centos-5.9/definition.rb | 11 ++++++ definitions/centos-5.9/ks.cfg | 39 ++++++++++++++++++++++ definitions/centos-5.9/minimize.sh | 4 +++ definitions/centos-5.9/vagrant.sh | 17 ++++++++++ definitions/centos-6.4-i386/chef-client.sh | 3 ++ definitions/centos-6.4-i386/cleanup.sh | 5 +++ definitions/centos-6.4-i386/definition.rb | 14 ++++++++ definitions/centos-6.4-i386/ks.cfg | 39 ++++++++++++++++++++++ definitions/centos-6.4-i386/minimize.sh | 4 +++ definitions/centos-6.4-i386/vagrant.sh | 17 ++++++++++ definitions/centos-6.4/chef-client.sh | 3 ++ definitions/centos-6.4/cleanup.sh | 5 +++ definitions/centos-6.4/definition.rb | 13 ++++++++ definitions/centos-6.4/ks.cfg | 39 ++++++++++++++++++++++ definitions/centos-6.4/minimize.sh | 4 +++ definitions/centos-6.4/vagrant.sh | 17 ++++++++++ 25 files changed, 322 insertions(+), 1 deletion(-) create mode 100644 definitions/centos-5.9-i386/chef-client.sh create mode 100644 definitions/centos-5.9-i386/cleanup.sh create mode 100644 definitions/centos-5.9-i386/definition.rb create mode 100644 definitions/centos-5.9-i386/ks.cfg create mode 100644 definitions/centos-5.9-i386/minimize.sh create mode 100644 definitions/centos-5.9-i386/vagrant.sh create mode 100644 definitions/centos-5.9/chef-client.sh create mode 100644 definitions/centos-5.9/cleanup.sh create mode 100644 definitions/centos-5.9/definition.rb create mode 100644 definitions/centos-5.9/ks.cfg create mode 100644 definitions/centos-5.9/minimize.sh create mode 100644 definitions/centos-5.9/vagrant.sh create mode 100644 definitions/centos-6.4-i386/chef-client.sh create mode 100644 definitions/centos-6.4-i386/cleanup.sh create mode 100644 definitions/centos-6.4-i386/definition.rb create mode 100644 definitions/centos-6.4-i386/ks.cfg create mode 100644 definitions/centos-6.4-i386/minimize.sh create mode 100644 definitions/centos-6.4-i386/vagrant.sh create mode 100644 definitions/centos-6.4/chef-client.sh create mode 100644 definitions/centos-6.4/cleanup.sh create mode 100644 definitions/centos-6.4/definition.rb create mode 100644 definitions/centos-6.4/ks.cfg create mode 100644 definitions/centos-6.4/minimize.sh create mode 100644 definitions/centos-6.4/vagrant.sh diff --git a/definitions/centos-5.8/definition.rb b/definitions/centos-5.8/definition.rb index 47501f7ca..5293d51d3 100644 --- a/definitions/centos-5.8/definition.rb +++ b/definitions/centos-5.8/definition.rb @@ -3,7 +3,7 @@ iso = "CentOS-5.8-x86_64-bin-DVD-1of2.iso" session = - CENTOS_SESSION.merge({ :os_type_id => 'RedHat', + CENTOS_SESSION.merge({ :os_type_id => 'RedHat_64', :iso_file => iso, :iso_md5 => "8a3bf0030f192022943f83fe6b2cf373", :iso_src => "http://mirror.stanford.edu/yum/pub/centos/5.8/isos/x86_64/#{iso}" }) diff --git a/definitions/centos-5.9-i386/chef-client.sh b/definitions/centos-5.9-i386/chef-client.sh new file mode 100644 index 000000000..f1f28d4d2 --- /dev/null +++ b/definitions/centos-5.9-i386/chef-client.sh @@ -0,0 +1,3 @@ +#!/bin/bash -eux + +wget -O - http://opscode.com/chef/install.sh | sudo bash diff --git a/definitions/centos-5.9-i386/cleanup.sh b/definitions/centos-5.9-i386/cleanup.sh new file mode 100644 index 000000000..922c3d6b5 --- /dev/null +++ b/definitions/centos-5.9-i386/cleanup.sh @@ -0,0 +1,5 @@ +#!/bin/bash -eux +yum -y erase gtk2 libX11 hicolor-icon-theme avahi freetype bitstream-vera-fonts +yum -y clean all +rm -rf VBoxGuestAdditions_*.iso VBoxGuestAdditions_*.iso.? +rm -f /tmp/chef*rpm diff --git a/definitions/centos-5.9-i386/definition.rb b/definitions/centos-5.9-i386/definition.rb new file mode 100644 index 000000000..4dfd46d3f --- /dev/null +++ b/definitions/centos-5.9-i386/definition.rb @@ -0,0 +1,11 @@ +require File.dirname(__FILE__) + "/../.centos/session.rb" + +iso = "CentOS-5.9-i386-bin-DVD-1of2.iso" + +session = + CENTOS_SESSION.merge({ :os_type_id => 'RedHat', + :iso_file => iso, + :iso_md5 => "c8caaa18400dfde2065d8ef58eb9e9bf", + :iso_src => "http://mirror.stanford.edu/yum/pub/centos/5.9/isos/i386/#{iso}" }) + +Veewee::Session.declare session diff --git a/definitions/centos-5.9-i386/ks.cfg b/definitions/centos-5.9-i386/ks.cfg new file mode 100644 index 000000000..e00fd5a2a --- /dev/null +++ b/definitions/centos-5.9-i386/ks.cfg @@ -0,0 +1,39 @@ +install +cdrom +lang en_US.UTF-8 +keyboard us +network --bootproto=dhcp +rootpw --iscrypted $1$damlkd,f$UC/u5pUts5QiU3ow.CSso/ +firewall --disabled +authconfig --enableshadow --passalgo=sha512 +selinux --disabled +timezone UTC +bootloader --location=mbr +text +skipx +zerombr +clearpart --all --initlabel +autopart +auth --useshadow --enablemd5 +firstboot --disabled +reboot + +%packages --ignoremissing +@Base +@Core +@Development Tools +openssl-devel +readline-devel +zlib-devel +kernel-devel + +%post +# update root certs +wget -O/etc/pki/tls/certs/ca-bundle.crt http://curl.haxx.se/ca/cacert.pem +# vagrant +groupadd vagrant -g 999 +useradd vagrant -g vagrant -G wheel -u 900 +echo "vagrant" | passwd --stdin vagrant +# sudo +echo "vagrant ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers +sed -i "s/^.*requiretty/#Defaults requiretty/" /etc/sudoers diff --git a/definitions/centos-5.9-i386/minimize.sh b/definitions/centos-5.9-i386/minimize.sh new file mode 100644 index 000000000..3846a1d65 --- /dev/null +++ b/definitions/centos-5.9-i386/minimize.sh @@ -0,0 +1,4 @@ +#!/bin/bash -eux + +dd if=/dev/zero of=/EMPTY bs=1M +rm -f /EMPTY diff --git a/definitions/centos-5.9-i386/vagrant.sh b/definitions/centos-5.9-i386/vagrant.sh new file mode 100644 index 000000000..9368ef636 --- /dev/null +++ b/definitions/centos-5.9-i386/vagrant.sh @@ -0,0 +1,17 @@ +#!/bin/bash -eux + +mkdir /tmp/vbox +VER=$(cat /home/vagrant/.vbox_version) +wget http://download.virtualbox.org/virtualbox/$VER/VBoxGuestAdditions_$VER.iso +mount -o loop VBoxGuestAdditions_$VER.iso /tmp/vbox +sh /tmp/vbox/VBoxLinuxAdditions.run +umount /tmp/vbox +rmdir /tmp/vbox +rm *.iso + +mkdir /home/vagrant/.ssh +wget --no-check-certificate \ + 'http://github.com/mitchellh/vagrant/raw/master/keys/vagrant.pub' \ + -O /home/vagrant/.ssh/authorized_keys +chown -R vagrant /home/vagrant/.ssh +chmod -R go-rwsx /home/vagrant/.ssh diff --git a/definitions/centos-5.9/chef-client.sh b/definitions/centos-5.9/chef-client.sh new file mode 100644 index 000000000..f1f28d4d2 --- /dev/null +++ b/definitions/centos-5.9/chef-client.sh @@ -0,0 +1,3 @@ +#!/bin/bash -eux + +wget -O - http://opscode.com/chef/install.sh | sudo bash diff --git a/definitions/centos-5.9/cleanup.sh b/definitions/centos-5.9/cleanup.sh new file mode 100644 index 000000000..922c3d6b5 --- /dev/null +++ b/definitions/centos-5.9/cleanup.sh @@ -0,0 +1,5 @@ +#!/bin/bash -eux +yum -y erase gtk2 libX11 hicolor-icon-theme avahi freetype bitstream-vera-fonts +yum -y clean all +rm -rf VBoxGuestAdditions_*.iso VBoxGuestAdditions_*.iso.? +rm -f /tmp/chef*rpm diff --git a/definitions/centos-5.9/definition.rb b/definitions/centos-5.9/definition.rb new file mode 100644 index 000000000..7dbecf7ab --- /dev/null +++ b/definitions/centos-5.9/definition.rb @@ -0,0 +1,11 @@ +require File.dirname(__FILE__) + "/../.centos/session.rb" + +iso = "CentOS-5.9-x86_64-bin-DVD-1of2.iso" + +session = + CENTOS_SESSION.merge({ :os_type_id => 'RedHat_64', + :iso_file => iso, + :iso_md5 => "bb795391846e76a7071893cbdf6163c3", + :iso_src => "http://mirror.stanford.edu/yum/pub/centos/5.9/isos/x86_64/#{iso}" }) + +Veewee::Session.declare session diff --git a/definitions/centos-5.9/ks.cfg b/definitions/centos-5.9/ks.cfg new file mode 100644 index 000000000..e00fd5a2a --- /dev/null +++ b/definitions/centos-5.9/ks.cfg @@ -0,0 +1,39 @@ +install +cdrom +lang en_US.UTF-8 +keyboard us +network --bootproto=dhcp +rootpw --iscrypted $1$damlkd,f$UC/u5pUts5QiU3ow.CSso/ +firewall --disabled +authconfig --enableshadow --passalgo=sha512 +selinux --disabled +timezone UTC +bootloader --location=mbr +text +skipx +zerombr +clearpart --all --initlabel +autopart +auth --useshadow --enablemd5 +firstboot --disabled +reboot + +%packages --ignoremissing +@Base +@Core +@Development Tools +openssl-devel +readline-devel +zlib-devel +kernel-devel + +%post +# update root certs +wget -O/etc/pki/tls/certs/ca-bundle.crt http://curl.haxx.se/ca/cacert.pem +# vagrant +groupadd vagrant -g 999 +useradd vagrant -g vagrant -G wheel -u 900 +echo "vagrant" | passwd --stdin vagrant +# sudo +echo "vagrant ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers +sed -i "s/^.*requiretty/#Defaults requiretty/" /etc/sudoers diff --git a/definitions/centos-5.9/minimize.sh b/definitions/centos-5.9/minimize.sh new file mode 100644 index 000000000..3846a1d65 --- /dev/null +++ b/definitions/centos-5.9/minimize.sh @@ -0,0 +1,4 @@ +#!/bin/bash -eux + +dd if=/dev/zero of=/EMPTY bs=1M +rm -f /EMPTY diff --git a/definitions/centos-5.9/vagrant.sh b/definitions/centos-5.9/vagrant.sh new file mode 100644 index 000000000..9368ef636 --- /dev/null +++ b/definitions/centos-5.9/vagrant.sh @@ -0,0 +1,17 @@ +#!/bin/bash -eux + +mkdir /tmp/vbox +VER=$(cat /home/vagrant/.vbox_version) +wget http://download.virtualbox.org/virtualbox/$VER/VBoxGuestAdditions_$VER.iso +mount -o loop VBoxGuestAdditions_$VER.iso /tmp/vbox +sh /tmp/vbox/VBoxLinuxAdditions.run +umount /tmp/vbox +rmdir /tmp/vbox +rm *.iso + +mkdir /home/vagrant/.ssh +wget --no-check-certificate \ + 'http://github.com/mitchellh/vagrant/raw/master/keys/vagrant.pub' \ + -O /home/vagrant/.ssh/authorized_keys +chown -R vagrant /home/vagrant/.ssh +chmod -R go-rwsx /home/vagrant/.ssh diff --git a/definitions/centos-6.4-i386/chef-client.sh b/definitions/centos-6.4-i386/chef-client.sh new file mode 100644 index 000000000..f1f28d4d2 --- /dev/null +++ b/definitions/centos-6.4-i386/chef-client.sh @@ -0,0 +1,3 @@ +#!/bin/bash -eux + +wget -O - http://opscode.com/chef/install.sh | sudo bash diff --git a/definitions/centos-6.4-i386/cleanup.sh b/definitions/centos-6.4-i386/cleanup.sh new file mode 100644 index 000000000..922c3d6b5 --- /dev/null +++ b/definitions/centos-6.4-i386/cleanup.sh @@ -0,0 +1,5 @@ +#!/bin/bash -eux +yum -y erase gtk2 libX11 hicolor-icon-theme avahi freetype bitstream-vera-fonts +yum -y clean all +rm -rf VBoxGuestAdditions_*.iso VBoxGuestAdditions_*.iso.? +rm -f /tmp/chef*rpm diff --git a/definitions/centos-6.4-i386/definition.rb b/definitions/centos-6.4-i386/definition.rb new file mode 100644 index 000000000..dd6a26fb2 --- /dev/null +++ b/definitions/centos-6.4-i386/definition.rb @@ -0,0 +1,14 @@ +require File.dirname(__FILE__) + "/../.centos/session.rb" + +iso = "CentOS-6.4-i386-bin-DVD1.iso" + +session = + CENTOS_SESSION.merge( :boot_cmd_sequence => + [ '<Tab> text ks=http://%IP%:%PORT%/ks.cfg<Enter>' ], + :memory_size=> '480', + :os_type_id => 'RedHat', + :iso_file => iso, + :iso_md5 => "a6049df141579169b217cbb625da4c6d", + :iso_src => "http://mirrors.kernel.org/centos/6.4/isos/i386/#{iso}" ) + +Veewee::Session.declare session diff --git a/definitions/centos-6.4-i386/ks.cfg b/definitions/centos-6.4-i386/ks.cfg new file mode 100644 index 000000000..e00fd5a2a --- /dev/null +++ b/definitions/centos-6.4-i386/ks.cfg @@ -0,0 +1,39 @@ +install +cdrom +lang en_US.UTF-8 +keyboard us +network --bootproto=dhcp +rootpw --iscrypted $1$damlkd,f$UC/u5pUts5QiU3ow.CSso/ +firewall --disabled +authconfig --enableshadow --passalgo=sha512 +selinux --disabled +timezone UTC +bootloader --location=mbr +text +skipx +zerombr +clearpart --all --initlabel +autopart +auth --useshadow --enablemd5 +firstboot --disabled +reboot + +%packages --ignoremissing +@Base +@Core +@Development Tools +openssl-devel +readline-devel +zlib-devel +kernel-devel + +%post +# update root certs +wget -O/etc/pki/tls/certs/ca-bundle.crt http://curl.haxx.se/ca/cacert.pem +# vagrant +groupadd vagrant -g 999 +useradd vagrant -g vagrant -G wheel -u 900 +echo "vagrant" | passwd --stdin vagrant +# sudo +echo "vagrant ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers +sed -i "s/^.*requiretty/#Defaults requiretty/" /etc/sudoers diff --git a/definitions/centos-6.4-i386/minimize.sh b/definitions/centos-6.4-i386/minimize.sh new file mode 100644 index 000000000..3846a1d65 --- /dev/null +++ b/definitions/centos-6.4-i386/minimize.sh @@ -0,0 +1,4 @@ +#!/bin/bash -eux + +dd if=/dev/zero of=/EMPTY bs=1M +rm -f /EMPTY diff --git a/definitions/centos-6.4-i386/vagrant.sh b/definitions/centos-6.4-i386/vagrant.sh new file mode 100644 index 000000000..9368ef636 --- /dev/null +++ b/definitions/centos-6.4-i386/vagrant.sh @@ -0,0 +1,17 @@ +#!/bin/bash -eux + +mkdir /tmp/vbox +VER=$(cat /home/vagrant/.vbox_version) +wget http://download.virtualbox.org/virtualbox/$VER/VBoxGuestAdditions_$VER.iso +mount -o loop VBoxGuestAdditions_$VER.iso /tmp/vbox +sh /tmp/vbox/VBoxLinuxAdditions.run +umount /tmp/vbox +rmdir /tmp/vbox +rm *.iso + +mkdir /home/vagrant/.ssh +wget --no-check-certificate \ + 'http://github.com/mitchellh/vagrant/raw/master/keys/vagrant.pub' \ + -O /home/vagrant/.ssh/authorized_keys +chown -R vagrant /home/vagrant/.ssh +chmod -R go-rwsx /home/vagrant/.ssh diff --git a/definitions/centos-6.4/chef-client.sh b/definitions/centos-6.4/chef-client.sh new file mode 100644 index 000000000..f1f28d4d2 --- /dev/null +++ b/definitions/centos-6.4/chef-client.sh @@ -0,0 +1,3 @@ +#!/bin/bash -eux + +wget -O - http://opscode.com/chef/install.sh | sudo bash diff --git a/definitions/centos-6.4/cleanup.sh b/definitions/centos-6.4/cleanup.sh new file mode 100644 index 000000000..922c3d6b5 --- /dev/null +++ b/definitions/centos-6.4/cleanup.sh @@ -0,0 +1,5 @@ +#!/bin/bash -eux +yum -y erase gtk2 libX11 hicolor-icon-theme avahi freetype bitstream-vera-fonts +yum -y clean all +rm -rf VBoxGuestAdditions_*.iso VBoxGuestAdditions_*.iso.? +rm -f /tmp/chef*rpm diff --git a/definitions/centos-6.4/definition.rb b/definitions/centos-6.4/definition.rb new file mode 100644 index 000000000..da83564ab --- /dev/null +++ b/definitions/centos-6.4/definition.rb @@ -0,0 +1,13 @@ +require File.dirname(__FILE__) + "/../.centos/session.rb" + +iso = "CentOS-6.4-x86_64-bin-DVD1.iso" + +session = + CENTOS_SESSION.merge( :boot_cmd_sequence => + [ '<Tab> text ks=http://%IP%:%PORT%/ks.cfg<Enter>' ], + :memory_size=> '480', + :iso_file => iso, + :iso_md5 => "0128cfc7c86072b13ee80dd013e0e5d7", + :iso_src => "http://mirrors.kernel.org/centos/6.4/isos/x86_64/#{iso}" ) + +Veewee::Session.declare session diff --git a/definitions/centos-6.4/ks.cfg b/definitions/centos-6.4/ks.cfg new file mode 100644 index 000000000..e00fd5a2a --- /dev/null +++ b/definitions/centos-6.4/ks.cfg @@ -0,0 +1,39 @@ +install +cdrom +lang en_US.UTF-8 +keyboard us +network --bootproto=dhcp +rootpw --iscrypted $1$damlkd,f$UC/u5pUts5QiU3ow.CSso/ +firewall --disabled +authconfig --enableshadow --passalgo=sha512 +selinux --disabled +timezone UTC +bootloader --location=mbr +text +skipx +zerombr +clearpart --all --initlabel +autopart +auth --useshadow --enablemd5 +firstboot --disabled +reboot + +%packages --ignoremissing +@Base +@Core +@Development Tools +openssl-devel +readline-devel +zlib-devel +kernel-devel + +%post +# update root certs +wget -O/etc/pki/tls/certs/ca-bundle.crt http://curl.haxx.se/ca/cacert.pem +# vagrant +groupadd vagrant -g 999 +useradd vagrant -g vagrant -G wheel -u 900 +echo "vagrant" | passwd --stdin vagrant +# sudo +echo "vagrant ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers +sed -i "s/^.*requiretty/#Defaults requiretty/" /etc/sudoers diff --git a/definitions/centos-6.4/minimize.sh b/definitions/centos-6.4/minimize.sh new file mode 100644 index 000000000..3846a1d65 --- /dev/null +++ b/definitions/centos-6.4/minimize.sh @@ -0,0 +1,4 @@ +#!/bin/bash -eux + +dd if=/dev/zero of=/EMPTY bs=1M +rm -f /EMPTY diff --git a/definitions/centos-6.4/vagrant.sh b/definitions/centos-6.4/vagrant.sh new file mode 100644 index 000000000..9368ef636 --- /dev/null +++ b/definitions/centos-6.4/vagrant.sh @@ -0,0 +1,17 @@ +#!/bin/bash -eux + +mkdir /tmp/vbox +VER=$(cat /home/vagrant/.vbox_version) +wget http://download.virtualbox.org/virtualbox/$VER/VBoxGuestAdditions_$VER.iso +mount -o loop VBoxGuestAdditions_$VER.iso /tmp/vbox +sh /tmp/vbox/VBoxLinuxAdditions.run +umount /tmp/vbox +rmdir /tmp/vbox +rm *.iso + +mkdir /home/vagrant/.ssh +wget --no-check-certificate \ + 'http://github.com/mitchellh/vagrant/raw/master/keys/vagrant.pub' \ + -O /home/vagrant/.ssh/authorized_keys +chown -R vagrant /home/vagrant/.ssh +chmod -R go-rwsx /home/vagrant/.ssh From 6dddcf3caf0143353e24d8f44ab97fac772d371c Mon Sep 17 00:00:00 2001 From: "Julian C. Dunn" <jdunn@opscode.com> Date: Mon, 22 Apr 2013 09:57:38 -0400 Subject: [PATCH 0018/1622] Use @sneal's vagrant-windows gem for now until @BIAINC's gets fixed for use with Vagrant 1.1/1.2. Bugfix for wget.vbs not being in vagrant's home directory, but rather in %TEMP% --- Gemfile | 1 + Gemfile.lock | 10 ++++++++++ definitions/.windows/install-chef.bat | 2 +- 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/Gemfile b/Gemfile index b0860f79c..615881491 100644 --- a/Gemfile +++ b/Gemfile @@ -2,5 +2,6 @@ source "https://rubygems.org" gem "vagrant", :git => 'https://github.com/mitchellh/vagrant.git', :tag => 'v1.1.5' gem "veewee", :git => 'https://github.com/jedi4ever/veewee.git', :ref => '164a10dd24' +gem "vagrant-windows", :git => 'https://github.com/sneal/vagrant-windows.git', :branch => 'vagrant-1.1-plugin-architecture-vbox4.1' # mainline vagrant-windows isn't working yet with Vagrant 1.1 gem "em-winrm" # for windows! gem "rake" diff --git a/Gemfile.lock b/Gemfile.lock index bfc335c6c..cd7aa7654 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -32,6 +32,15 @@ GIT net-scp (~> 1.1.0) net-ssh (~> 2.6.6) +GIT + remote: https://github.com/sneal/vagrant-windows.git + revision: fbe11646d674e2ee5253089b958fdc2e573aab78 + branch: vagrant-1.1-plugin-architecture-vbox4.1 + specs: + vagrant-windows (0.2.0) + highline + winrm (~> 1.1.1) + GEM remote: https://rubygems.org/ specs: @@ -135,4 +144,5 @@ DEPENDENCIES em-winrm rake vagrant! + vagrant-windows! veewee! diff --git a/definitions/.windows/install-chef.bat b/definitions/.windows/install-chef.bat index eea2e3842..861b80c87 100644 --- a/definitions/.windows/install-chef.bat +++ b/definitions/.windows/install-chef.bat @@ -1,6 +1,6 @@ timeout 10 REM sleeping to give outbound networking a chance to come up -cmd /C cscript wget.vbs /url:http://www.opscode.com/chef/install.msi /path:chef-client.msi +cmd /C cscript %TEMP%\wget.vbs /url:http://www.opscode.com/chef/install.msi /path:chef-client.msi cmd /C msiexec /qn /i chef-client.msi From 21f79f80d85ca8d2c3b97bdf0a57cedad1ae79e6 Mon Sep 17 00:00:00 2001 From: "Julian C. Dunn" <jdunn@opscode.com> Date: Tue, 23 Apr 2013 10:41:37 -0700 Subject: [PATCH 0019/1622] Fix documentation for building, as well as adding links to the Chef 11.4.0 baseboxes. --- README.md | 35 +++++++++++++++++++++++++---------- 1 file changed, 25 insertions(+), 10 deletions(-) diff --git a/README.md b/README.md index 49e4ea5c3..4e453907e 100644 --- a/README.md +++ b/README.md @@ -11,7 +11,7 @@ make "Don't Repeat Yourself" (DRY) modular baseboxes. Thanks Tim! ## Current Baseboxes The following baseboxes are publicly available and were built using -this project, and Chef 11.2.0. Future releases of Chef and baseboxes +this project, and Chef 11.4.0. Future releases of Chef and baseboxes will follow the naming convention used here: opscode_PLATFORM-VERSION_chef-VERSION.box @@ -19,15 +19,29 @@ will follow the naming convention used here: And located in the opscode-vm S3 bucket's vagrant directory as linked below. -* [opscode-centos-5.8](https://opscode-vm.s3.amazonaws.com/vagrant/opscode_centos-5.8_chef-11.2.0.box) -* [opscode-centos-6.3](https://opscode-vm.s3.amazonaws.com/vagrant/opscode_centos-6.3_chef-11.2.0.box) +64-bit boxes: + +* [opscode-centos-5.9](https://opscode-vm.s3.amazonaws.com/vagrant/opscode_centos-5.9_chef-11.4.0.box) +* [opscode-centos-6.4](https://opscode-vm.s3.amazonaws.com/vagrant/opscode_centos-6.4_chef-11.4.0.box) * [opscode-ubuntu-10.04](https://opscode-vm.s3.amazonaws.com/vagrant/opscode_ubuntu-10.04_chef-11.2.0.box) * [opscode-ubuntu-12.04](https://opscode-vm.s3.amazonaws.com/vagrant/opscode_ubuntu-12.04_chef-11.2.0.box) -At this time, 32 bit boxes have not yet been built with Chef 11.2.0. +32-bit boxes: + +* [opscode-centos-5.9-i386](https://opscode-vm.s3.amazonaws.com/vagrant/opscode_centos-5.9-i386_chef-11.4.0.box) +* [opscode-centos-6.4-i386](https://opscode-vm.s3.amazonaws.com/vagrant/opscode_centos-6.4-i386_chef-11.4.0.box) +* [opscode-ubuntu-10.04-i386](https://opscode-vm.s3.amazonaws.com/vagrant/opscode_ubuntu-10.04-i386_chef-11.2.0.box) +* [opscode-ubuntu-12.04-i386](https://opscode-vm.s3.amazonaws.com/vagrant/opscode_ubuntu-12.04-i386_chef-11.2.0.box) ## Older Baseboxes +The following base boxes were built with Chef 11.2.0. + +* [opscode-centos-5.8](https://opscode-vm.s3.amazonaws.com/vagrant/opscode_centos-5.8_chef-11.4.0.box) +* [opscode-centos-6.3](https://opscode-vm.s3.amazonaws.com/vagrant/opscode_centos-6.3_chef-11.2.0.box) +* [opscode-ubuntu-10.04](https://opscode-vm.s3.amazonaws.com/vagrant/opscode_ubuntu-10.04_chef-11.2.0.box) +* [opscode-ubuntu-12.04](https://opscode-vm.s3.amazonaws.com/vagrant/opscode_ubuntu-12.04_chef-11.2.0.box) + The following base boxes were built with Chef 10.18.2. * [opscode-centos-5.8-i386](https://opscode-vm.s3.amazonaws.com/vagrant/opscode_centos-5.8-i386_chef-10.18.2.box) @@ -56,26 +70,26 @@ First, clone the project, then install the required Gems with Bundler. $ git clone git://github.com/opscode/bento.git $ cd bento - $ bundle install --binstubs + $ bundle install List available baseboxes that can be built: - $ bundle exec vagrant basebox list + $ bundle exec veewee vbox list Build, for example, the ubuntu-12.04 basebox. - $ bundle exec vagrant basebox build ubuntu-12.04 + $ bundle exec veewee vbox build ubuntu-12.04 You can validate the basebox using Veewee's built in validator. However note that the test for Ruby (and Puppet) will fail. The Ruby installation is in `/opt/chef/embedded`, and we do not add the bin directory to the `$PATH`, and we don't use Puppet internally. - $ bundle exec vagrant basebox validate ubuntu-12.04 + $ bundle exec veewee vbox validate ubuntu-12.04 Aside from that, the basebox should be ready to use. Export it: - $ bundle exec vagrant basebox export ubuntu-12.04 + $ bundle exec veewee vbox export ubuntu-12.04 Congratulations! You now have `./ubuntu-12.04.box`, a fully functional basebox that you can then add to Vagrant and start testing cookbooks. @@ -155,8 +169,9 @@ License and Authors - Author:: Joshua Timberman (<joshua@opscode.com>) - Author:: Tim Dysinger (<tim@dysinger.net>) - Author:: Chris McClimans (<chris@hippiehacker.org>) +- Author:: Julian Dunn (<jdunn@opscode.com>) -Copyright:: 2012, Opscode, Inc (<legal@opscode.com>) +Copyright:: 2012-2013, Opscode, Inc (<legal@opscode.com>) Copyright:: 2011-2012, Tim Dysinger (<tim@dysinger.net>) Licensed under the Apache License, Version 2.0 (the "License"); From 0e42832183bdbcee2e2f78abbf646cdfcea12eb7 Mon Sep 17 00:00:00 2001 From: Will Maier <wcmaier@m.aier.us> Date: Wed, 24 Apr 2013 15:22:49 +0000 Subject: [PATCH 0020/1622] Add a task to update apt-get on boot in ubuntu. --- definitions/.ubuntu/update.sh | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/definitions/.ubuntu/update.sh b/definitions/.ubuntu/update.sh index e7829d6f9..80e8dd3f9 100644 --- a/definitions/.ubuntu/update.sh +++ b/definitions/.ubuntu/update.sh @@ -5,3 +5,11 @@ apt-get -y upgrade # ensure the correct kernel headers are installed apt-get -y install linux-headers-$(uname -r) + +# update package index on boot +cat <<EOF > /etc/init/refresh-apt.conf +description "update package index" +start on networking +task +exec /usr/bin/apt-get update +EOF From b7a60b53b22851bcc09ca1a418c7b16c6c7ce1f7 Mon Sep 17 00:00:00 2001 From: "Julian C. Dunn" <jdunn@opscode.com> Date: Thu, 25 Apr 2013 08:57:44 -0700 Subject: [PATCH 0021/1622] Update documentation for Chef 11.4.4. Update Gemfile for vagrant 1.2.2 --- Gemfile | 2 +- Gemfile.lock | 6 +++--- README.md | 36 ++++++++++++++++++++++++++---------- 3 files changed, 30 insertions(+), 14 deletions(-) diff --git a/Gemfile b/Gemfile index 615881491..1eb8eab88 100644 --- a/Gemfile +++ b/Gemfile @@ -1,6 +1,6 @@ source "https://rubygems.org" -gem "vagrant", :git => 'https://github.com/mitchellh/vagrant.git', :tag => 'v1.1.5' +gem "vagrant", :git => 'https://github.com/mitchellh/vagrant.git', :tag => 'v1.2.2' gem "veewee", :git => 'https://github.com/jedi4ever/veewee.git', :ref => '164a10dd24' gem "vagrant-windows", :git => 'https://github.com/sneal/vagrant-windows.git', :branch => 'vagrant-1.1-plugin-architecture-vbox4.1' # mainline vagrant-windows isn't working yet with Vagrant 1.1 gem "em-winrm" # for windows! diff --git a/Gemfile.lock b/Gemfile.lock index cd7aa7654..8664c621d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -20,10 +20,10 @@ GIT GIT remote: https://github.com/mitchellh/vagrant.git - revision: 64e360814c3ad960d810456add977fd4c7d47ce6 - tag: v1.1.5 + revision: 7e400d00a3c5a0fdf2809c8b5001a035415a607b + tag: v1.2.2 specs: - vagrant (1.1.5) + vagrant (1.2.2) childprocess (~> 0.3.7) erubis (~> 2.7.0) i18n (~> 0.6.0) diff --git a/README.md b/README.md index 4e453907e..2f399d336 100644 --- a/README.md +++ b/README.md @@ -11,33 +11,49 @@ make "Don't Repeat Yourself" (DRY) modular baseboxes. Thanks Tim! ## Current Baseboxes The following baseboxes are publicly available and were built using -this project, and Chef 11.4.0. Future releases of Chef and baseboxes +this project, and Chef 11.4.4. Future releases of Chef and baseboxes will follow the naming convention used here: opscode_PLATFORM-VERSION_chef-VERSION.box -And located in the opscode-vm S3 bucket's vagrant directory as linked +and located in the opscode-vm S3 bucket's vagrant directory as linked below. 64-bit boxes: +* [opscode-centos-5.9](https://opscode-vm.s3.amazonaws.com/vagrant/opscode_centos-5.9_chef-11.4.4.box) +* [opscode-centos-6.4](https://opscode-vm.s3.amazonaws.com/vagrant/opscode_centos-6.4_chef-11.4.4.box) +* [opscode-ubuntu-10.04](https://opscode-vm.s3.amazonaws.com/vagrant/opscode_ubuntu-10.04_chef-11.4.4.box) +* [opscode-ubuntu-12.04](https://opscode-vm.s3.amazonaws.com/vagrant/opscode_ubuntu-12.04_chef-11.4.4.box) + +32-bit boxes: + +* [opscode-centos-5.9-i386](https://opscode-vm.s3.amazonaws.com/vagrant/opscode_centos-5.9-i386_chef-11.4.4.box) +* [opscode-centos-6.4-i386](https://opscode-vm.s3.amazonaws.com/vagrant/opscode_centos-6.4-i386_chef-11.4.4.box) +* [opscode-ubuntu-10.04-i386](https://opscode-vm.s3.amazonaws.com/vagrant/opscode_ubuntu-10.04-i386_chef-11.4.4.box) +* [opscode-ubuntu-12.04-i386](https://opscode-vm.s3.amazonaws.com/vagrant/opscode_ubuntu-12.04-i386_chef-11.4.4.box) + +## Older Baseboxes + +The following base boxes were built with Chef 11.4.0. + +64-bit boxes: + * [opscode-centos-5.9](https://opscode-vm.s3.amazonaws.com/vagrant/opscode_centos-5.9_chef-11.4.0.box) * [opscode-centos-6.4](https://opscode-vm.s3.amazonaws.com/vagrant/opscode_centos-6.4_chef-11.4.0.box) -* [opscode-ubuntu-10.04](https://opscode-vm.s3.amazonaws.com/vagrant/opscode_ubuntu-10.04_chef-11.2.0.box) -* [opscode-ubuntu-12.04](https://opscode-vm.s3.amazonaws.com/vagrant/opscode_ubuntu-12.04_chef-11.2.0.box) +* [opscode-ubuntu-10.04](https://opscode-vm.s3.amazonaws.com/vagrant/opscode_ubuntu-10.04_chef-11.4.0.box) +* [opscode-ubuntu-12.04](https://opscode-vm.s3.amazonaws.com/vagrant/opscode_ubuntu-12.04_chef-11.4.0.box) 32-bit boxes: * [opscode-centos-5.9-i386](https://opscode-vm.s3.amazonaws.com/vagrant/opscode_centos-5.9-i386_chef-11.4.0.box) * [opscode-centos-6.4-i386](https://opscode-vm.s3.amazonaws.com/vagrant/opscode_centos-6.4-i386_chef-11.4.0.box) -* [opscode-ubuntu-10.04-i386](https://opscode-vm.s3.amazonaws.com/vagrant/opscode_ubuntu-10.04-i386_chef-11.2.0.box) -* [opscode-ubuntu-12.04-i386](https://opscode-vm.s3.amazonaws.com/vagrant/opscode_ubuntu-12.04-i386_chef-11.2.0.box) - -## Older Baseboxes +* [opscode-ubuntu-10.04-i386](https://opscode-vm.s3.amazonaws.com/vagrant/opscode_ubuntu-10.04-i386_chef-11.4.0.box) +* [opscode-ubuntu-12.04-i386](https://opscode-vm.s3.amazonaws.com/vagrant/opscode_ubuntu-12.04-i386_chef-11.4.0.box) -The following base boxes were built with Chef 11.2.0. +The following base boxes were built with Chef 11.2.0. (No 32-bit boxes were built for Chef 11.2.0.) -* [opscode-centos-5.8](https://opscode-vm.s3.amazonaws.com/vagrant/opscode_centos-5.8_chef-11.4.0.box) +* [opscode-centos-5.8](https://opscode-vm.s3.amazonaws.com/vagrant/opscode_centos-5.8_chef-11.2.0.box) * [opscode-centos-6.3](https://opscode-vm.s3.amazonaws.com/vagrant/opscode_centos-6.3_chef-11.2.0.box) * [opscode-ubuntu-10.04](https://opscode-vm.s3.amazonaws.com/vagrant/opscode_ubuntu-10.04_chef-11.2.0.box) * [opscode-ubuntu-12.04](https://opscode-vm.s3.amazonaws.com/vagrant/opscode_ubuntu-12.04_chef-11.2.0.box) From 18ad8258bfdc82fa11bdb5075d3d97b29bf5fcee Mon Sep 17 00:00:00 2001 From: John Bellone <jb@thunkbrightly.com> Date: Sat, 13 Apr 2013 16:04:09 -0400 Subject: [PATCH 0022/1622] Added ubuntu-12.10 definitions. This was a copy from the ubuntu-12.04 definitions basically wholesale. --- definitions/ubuntu-12.10-i386/chef-client.sh | 1 + definitions/ubuntu-12.10-i386/cleanup.sh | 1 + definitions/ubuntu-12.10-i386/definition.rb | 11 +++++++++++ definitions/ubuntu-12.10-i386/minimize.sh | 1 + definitions/ubuntu-12.10-i386/networking.sh | 1 + definitions/ubuntu-12.10-i386/preseed.cfg | 1 + definitions/ubuntu-12.10-i386/sudoers.sh | 4 ++++ definitions/ubuntu-12.10-i386/update.sh | 1 + definitions/ubuntu-12.10-i386/vagrant.sh | 1 + definitions/ubuntu-12.10/chef-client.sh | 1 + definitions/ubuntu-12.10/cleanup.sh | 1 + definitions/ubuntu-12.10/definition.rb | 11 +++++++++++ definitions/ubuntu-12.10/minimize.sh | 1 + definitions/ubuntu-12.10/networking.sh | 1 + definitions/ubuntu-12.10/preseed.cfg | 1 + definitions/ubuntu-12.10/sudoers.sh | 4 ++++ definitions/ubuntu-12.10/update.sh | 1 + definitions/ubuntu-12.10/vagrant.sh | 1 + 18 files changed, 44 insertions(+) create mode 120000 definitions/ubuntu-12.10-i386/chef-client.sh create mode 120000 definitions/ubuntu-12.10-i386/cleanup.sh create mode 100644 definitions/ubuntu-12.10-i386/definition.rb create mode 120000 definitions/ubuntu-12.10-i386/minimize.sh create mode 120000 definitions/ubuntu-12.10-i386/networking.sh create mode 120000 definitions/ubuntu-12.10-i386/preseed.cfg create mode 100644 definitions/ubuntu-12.10-i386/sudoers.sh create mode 120000 definitions/ubuntu-12.10-i386/update.sh create mode 120000 definitions/ubuntu-12.10-i386/vagrant.sh create mode 120000 definitions/ubuntu-12.10/chef-client.sh create mode 120000 definitions/ubuntu-12.10/cleanup.sh create mode 100644 definitions/ubuntu-12.10/definition.rb create mode 120000 definitions/ubuntu-12.10/minimize.sh create mode 120000 definitions/ubuntu-12.10/networking.sh create mode 120000 definitions/ubuntu-12.10/preseed.cfg create mode 100644 definitions/ubuntu-12.10/sudoers.sh create mode 120000 definitions/ubuntu-12.10/update.sh create mode 120000 definitions/ubuntu-12.10/vagrant.sh diff --git a/definitions/ubuntu-12.10-i386/chef-client.sh b/definitions/ubuntu-12.10-i386/chef-client.sh new file mode 120000 index 000000000..635081810 --- /dev/null +++ b/definitions/ubuntu-12.10-i386/chef-client.sh @@ -0,0 +1 @@ +../.common/chef-client.sh \ No newline at end of file diff --git a/definitions/ubuntu-12.10-i386/cleanup.sh b/definitions/ubuntu-12.10-i386/cleanup.sh new file mode 120000 index 000000000..e5858f10d --- /dev/null +++ b/definitions/ubuntu-12.10-i386/cleanup.sh @@ -0,0 +1 @@ +../.ubuntu/cleanup.sh \ No newline at end of file diff --git a/definitions/ubuntu-12.10-i386/definition.rb b/definitions/ubuntu-12.10-i386/definition.rb new file mode 100644 index 000000000..2241e89c5 --- /dev/null +++ b/definitions/ubuntu-12.10-i386/definition.rb @@ -0,0 +1,11 @@ +require File.dirname(__FILE__) + "/../.ubuntu/session.rb" + +iso = "ubuntu-12.10-server-i386.iso" + +session = + UBUNTU_SESSION.merge( :os_type_id => 'Ubuntu', + :iso_file => iso, + :iso_md5 => "b3d4d4edfc8f291af0b83f8a2ba19a2f", + :iso_src => "http://releases.ubuntu.com/12.10/#{iso}" ) + +Veewee::Session.declare session diff --git a/definitions/ubuntu-12.10-i386/minimize.sh b/definitions/ubuntu-12.10-i386/minimize.sh new file mode 120000 index 000000000..b3632ccbc --- /dev/null +++ b/definitions/ubuntu-12.10-i386/minimize.sh @@ -0,0 +1 @@ +../.common/minimize.sh \ No newline at end of file diff --git a/definitions/ubuntu-12.10-i386/networking.sh b/definitions/ubuntu-12.10-i386/networking.sh new file mode 120000 index 000000000..8b49862eb --- /dev/null +++ b/definitions/ubuntu-12.10-i386/networking.sh @@ -0,0 +1 @@ +../.ubuntu/networking.sh \ No newline at end of file diff --git a/definitions/ubuntu-12.10-i386/preseed.cfg b/definitions/ubuntu-12.10-i386/preseed.cfg new file mode 120000 index 000000000..0aca6daae --- /dev/null +++ b/definitions/ubuntu-12.10-i386/preseed.cfg @@ -0,0 +1 @@ +../.ubuntu/preseed.cfg \ No newline at end of file diff --git a/definitions/ubuntu-12.10-i386/sudoers.sh b/definitions/ubuntu-12.10-i386/sudoers.sh new file mode 100644 index 000000000..5fce3dd2c --- /dev/null +++ b/definitions/ubuntu-12.10-i386/sudoers.sh @@ -0,0 +1,4 @@ +#!/bin/bash -eux + +sed -i -e '/Defaults\s\+env_reset/a Defaults\texempt_group=sudo' /etc/sudoers +sed -i -e 's/%sudo ALL=(ALL:ALL) ALL/%sudo ALL=NOPASSWD:ALL/g' /etc/sudoers diff --git a/definitions/ubuntu-12.10-i386/update.sh b/definitions/ubuntu-12.10-i386/update.sh new file mode 120000 index 000000000..20b3a9ab6 --- /dev/null +++ b/definitions/ubuntu-12.10-i386/update.sh @@ -0,0 +1 @@ +../.ubuntu/update.sh \ No newline at end of file diff --git a/definitions/ubuntu-12.10-i386/vagrant.sh b/definitions/ubuntu-12.10-i386/vagrant.sh new file mode 120000 index 000000000..702949639 --- /dev/null +++ b/definitions/ubuntu-12.10-i386/vagrant.sh @@ -0,0 +1 @@ +../.common/vagrant.sh \ No newline at end of file diff --git a/definitions/ubuntu-12.10/chef-client.sh b/definitions/ubuntu-12.10/chef-client.sh new file mode 120000 index 000000000..635081810 --- /dev/null +++ b/definitions/ubuntu-12.10/chef-client.sh @@ -0,0 +1 @@ +../.common/chef-client.sh \ No newline at end of file diff --git a/definitions/ubuntu-12.10/cleanup.sh b/definitions/ubuntu-12.10/cleanup.sh new file mode 120000 index 000000000..e5858f10d --- /dev/null +++ b/definitions/ubuntu-12.10/cleanup.sh @@ -0,0 +1 @@ +../.ubuntu/cleanup.sh \ No newline at end of file diff --git a/definitions/ubuntu-12.10/definition.rb b/definitions/ubuntu-12.10/definition.rb new file mode 100644 index 000000000..c5a31277d --- /dev/null +++ b/definitions/ubuntu-12.10/definition.rb @@ -0,0 +1,11 @@ +require File.dirname(__FILE__) + "/../.ubuntu/session.rb" + +iso = "ubuntu-12.10-server-amd64.iso" + +session = + UBUNTU_SESSION.merge( :os_type_id => 'Ubuntu', + :iso_file => iso, + :iso_md5 => "4bd3270bde86d7e4e017e3847a4af485", + :iso_src => "http://releases.ubuntu.com/12.10/#{iso}" ) + +Veewee::Session.declare session diff --git a/definitions/ubuntu-12.10/minimize.sh b/definitions/ubuntu-12.10/minimize.sh new file mode 120000 index 000000000..b3632ccbc --- /dev/null +++ b/definitions/ubuntu-12.10/minimize.sh @@ -0,0 +1 @@ +../.common/minimize.sh \ No newline at end of file diff --git a/definitions/ubuntu-12.10/networking.sh b/definitions/ubuntu-12.10/networking.sh new file mode 120000 index 000000000..8b49862eb --- /dev/null +++ b/definitions/ubuntu-12.10/networking.sh @@ -0,0 +1 @@ +../.ubuntu/networking.sh \ No newline at end of file diff --git a/definitions/ubuntu-12.10/preseed.cfg b/definitions/ubuntu-12.10/preseed.cfg new file mode 120000 index 000000000..0aca6daae --- /dev/null +++ b/definitions/ubuntu-12.10/preseed.cfg @@ -0,0 +1 @@ +../.ubuntu/preseed.cfg \ No newline at end of file diff --git a/definitions/ubuntu-12.10/sudoers.sh b/definitions/ubuntu-12.10/sudoers.sh new file mode 100644 index 000000000..5fce3dd2c --- /dev/null +++ b/definitions/ubuntu-12.10/sudoers.sh @@ -0,0 +1,4 @@ +#!/bin/bash -eux + +sed -i -e '/Defaults\s\+env_reset/a Defaults\texempt_group=sudo' /etc/sudoers +sed -i -e 's/%sudo ALL=(ALL:ALL) ALL/%sudo ALL=NOPASSWD:ALL/g' /etc/sudoers diff --git a/definitions/ubuntu-12.10/update.sh b/definitions/ubuntu-12.10/update.sh new file mode 120000 index 000000000..20b3a9ab6 --- /dev/null +++ b/definitions/ubuntu-12.10/update.sh @@ -0,0 +1 @@ +../.ubuntu/update.sh \ No newline at end of file diff --git a/definitions/ubuntu-12.10/vagrant.sh b/definitions/ubuntu-12.10/vagrant.sh new file mode 120000 index 000000000..702949639 --- /dev/null +++ b/definitions/ubuntu-12.10/vagrant.sh @@ -0,0 +1 @@ +../.common/vagrant.sh \ No newline at end of file From 151324fdb83e490959c09fafd6b159ab83447b20 Mon Sep 17 00:00:00 2001 From: "Julian C. Dunn" <jdunn@opscode.com> Date: Thu, 2 May 2013 13:23:51 -0400 Subject: [PATCH 0023/1622] Fixed Windows Bento box builds on Windows 8. Thanks to @adamedx for this fix, which I cargo-culted from the knife-windows project: https://github.com/opscode/knife-windows/commit/d7b6efed3f03a56027d746b8fd093d15c3b176a4 --- definitions/.windows/install-chef.bat | 50 ++++++++++++++++++++++++--- 1 file changed, 46 insertions(+), 4 deletions(-) diff --git a/definitions/.windows/install-chef.bat b/definitions/.windows/install-chef.bat index 861b80c87..44b465954 100644 --- a/definitions/.windows/install-chef.bat +++ b/definitions/.windows/install-chef.bat @@ -1,6 +1,48 @@ -timeout 10 -REM sleeping to give outbound networking a chance to come up -cmd /C cscript %TEMP%\wget.vbs /url:http://www.opscode.com/chef/install.msi /path:chef-client.msi -cmd /C msiexec /qn /i chef-client.msi +@REM Loop ten times to make sure outbound networking is up +FOR /L %%n IN (1,1,10) DO ( + PING -n 1 www.opscode.com + IF %ERRORLEVEL% == 0 CALL :wget + TIMEOUT 10 +) +:err +ECHO "Couldn't reach Opscode even after 10 retries" +GOTO :done + +:wget +@rem Install Chef using chef-client MSI installer +@setlocal + +@set REMOTE_SOURCE_MSI_URL=https://www.opscode.com/chef/install.msi +@set LOCAL_DESTINATION_MSI_PATH=%TEMP%\chef-client-latest.msi +@set FALLBACK_QUERY_STRING=?DownloadContext=PowerShell + +@set ALTERNATE_DOWNLOAD_COMMAND=$webClient=new-object System.Net.WebClient; $webClient.DownloadFile('%REMOTE_SOURCE_MSI_URL%%FALLBACK_QUERY_STRING%', '%LOCAL_DESTINATION_MSI_PATH%') + +cscript /nologo %TEMP%\wget.vbs /url:%REMOTE_SOURCE_MSI_URL% /path:"%LOCAL_DESTINATION_MSI_PATH%" + +@rem Work around issues found in Windows Server 2012 around job objects not respecting WSMAN memory quotas +@rem that cause the MSI download process to exceed the quota even when it is increased by administrators. +@rem Retry the download using a more memory-efficient mechanism that only works if PowerShell is available. +@if ERRORLEVEL 1 ( + echo Warning: Failed to download %REMOTE_SOURCE_MSI_URL% to %LOCAL_DESTINATION_MSI_PATH% + echo Warning: Retrying download with PowerShell if available + if EXIST "%LOCAL_DESTINATION_MSI_PATH%" del /f /q "%LOCAL_DESTINATION_MSI_PATH%" + echo powershell -noprofile -noninteractive -command "%ALTERNATE_DOWNLOAD_COMMAND%" + powershell -noprofile -noninteractive -command "%ALTERNATE_DOWNLOAD_COMMAND%" + if NOT ERRORLEVEL 1 ( + echo Download succeeded + ) else ( + echo Failed to download %REMOTE_SOURCE_MSI_URL% + echo Subsequent attempt to install the downloaded MSI is likely to fail + ) +) + +msiexec /qb /i "%LOCAL_DESTINATION_MSI_PATH%" + +@endlocal +EXIT + +:done +EXIT From c29ee8508dbc30f53f6b935bacb0af395168a446 Mon Sep 17 00:00:00 2001 From: "Julian C. Dunn" <jdunn@opscode.com> Date: Thu, 2 May 2013 13:26:08 -0400 Subject: [PATCH 0024/1622] Remove broken Windows 2012 definitions. These were copied from the Windows 2008R2 definition but don't actually build Windows 2012 boxes; they only build a Windows 2008R2 box. --- .../windows-2012-standard/Autounattend.xml | 230 ------------------ definitions/windows-2012-standard/README.md | 87 ------- .../windows-2012-standard/definition.rb | 17 -- .../windows-2012-standard/install-chef.bat | 1 - .../windows-2012-standard/install-vbox.bat | 1 - .../mount-validation.bat | 1 - .../windows-2012-standard/oracle-cert.cer | 1 - 7 files changed, 338 deletions(-) delete mode 100644 definitions/windows-2012-standard/Autounattend.xml delete mode 100644 definitions/windows-2012-standard/README.md delete mode 100644 definitions/windows-2012-standard/definition.rb delete mode 120000 definitions/windows-2012-standard/install-chef.bat delete mode 120000 definitions/windows-2012-standard/install-vbox.bat delete mode 120000 definitions/windows-2012-standard/mount-validation.bat delete mode 120000 definitions/windows-2012-standard/oracle-cert.cer diff --git a/definitions/windows-2012-standard/Autounattend.xml b/definitions/windows-2012-standard/Autounattend.xml deleted file mode 100644 index 3f3d0ef9f..000000000 --- a/definitions/windows-2012-standard/Autounattend.xml +++ /dev/null @@ -1,230 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<unattend xmlns="urn:schemas-microsoft-com:unattend"> - <servicing></servicing> - - <settings pass="windowsPE"> - - <component name="Microsoft-Windows-Setup" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - - <DiskConfiguration> - <Disk wcm:action="add"> - - <CreatePartitions> - <CreatePartition wcm:action="add"> - <Order>1</Order> - <Type>Primary</Type> - <Size>20000</Size> - </CreatePartition> - </CreatePartitions> - - <ModifyPartitions> - <ModifyPartition wcm:action="add"> - <Extend>false</Extend> - <Format>NTFS</Format> - <Letter>C</Letter> - <Order>1</Order> - <PartitionID>1</PartitionID> - <Label>Windows 2008R2</Label> - </ModifyPartition> - </ModifyPartitions> - - <DiskID>0</DiskID> - <WillWipeDisk>true</WillWipeDisk> - - </Disk> - <WillShowUI>OnError</WillShowUI> - </DiskConfiguration> - - <UserData> - <!-- Product Key from http://technet.microsoft.com/en-us/library/ff793406.aspx --> - <ProductKey>YC6KT-GKW9T-YTKYR-T4X34-R7VHC - <WillShowUI>Never</WillShowUI> - </ProductKey> - - <AcceptEula>true</AcceptEula> - <FullName>Vagrant Fullname</FullName> - <Organization>Vagrant Inc</Organization> - </UserData> - - <ImageInstall> - <OSImage> - <InstallTo> - <DiskID>0</DiskID> - <PartitionID>1</PartitionID> - </InstallTo> - <WillShowUI>OnError</WillShowUI> - <InstallToAvailablePartition>false</InstallToAvailablePartition> - <InstallFrom> - <MetaData wcm:action="add"> - <Key>/IMAGE/NAME</Key> - <Value>Windows Server 2008 R2 SERVERSTANDARD</Value> - </MetaData> - </InstallFrom> - </OSImage> - </ImageInstall> - - </component> - - <component name="Microsoft-Windows-International-Core-WinPE" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - <SetupUILanguage> - <UILanguage>en-US</UILanguage> - </SetupUILanguage> - <InputLocale>en-US</InputLocale> - <SystemLocale>en-US</SystemLocale> - <UILanguage>en-US</UILanguage> - <UILanguageFallback>en-US</UILanguageFallback> - <UserLocale>en-US</UserLocale> - </component> - </settings> - - - <settings pass="oobeSystem"> - <component name="Microsoft-Windows-Shell-Setup" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - <UserAccounts> - <AdministratorPassword> - <Value>vagrant</Value> - <PlainText>true</PlainText> - </AdministratorPassword> - <LocalAccounts> - <LocalAccount wcm:action="add"> - <Password> - <Value>vagrant</Value> - <PlainText>true</PlainText> - </Password> - <Description>Vagrant User</Description> - <DisplayName>vagrant</DisplayName> - <Group>administrators</Group> - <Name>vagrant</Name> - </LocalAccount> - </LocalAccounts> - </UserAccounts> - <OOBE> - <HideEULAPage>true</HideEULAPage> - <HideWirelessSetupInOOBE>true</HideWirelessSetupInOOBE> - <NetworkLocation>Home</NetworkLocation> - </OOBE> - <AutoLogon> - <Password> - <Value>vagrant</Value> - <PlainText>true</PlainText> - </Password> - <Username>administrator</Username> - <Enabled>true</Enabled> - </AutoLogon> - <FirstLogonCommands> - <!-- <SynchronousCommand wcm:action="add"> --> - <!-- <CommandLine>cmd.exe /c a:install-cygwin-sshd.bat</CommandLine> --> - <!-- <Description>Install Cygwin SSH</Description> --> - <!-- <Order>1</Order> --> - <!-- <RequiresUserInput>true</RequiresUserInput> --> - <!-- </SynchronousCommand> --> - <!-- <SynchronousCommand wcm:action="add"> --> - <!-- <CommandLine>cmd.exe /c a:install-winrm.bat</CommandLine> --> - <!-- <Description>Install Win RM</Description> --> - <!-- <Order>2</Order> --> - <!-- <RequiresUserInput>true</RequiresUserInput> --> - <!-- </SynchronousCommand> --> - <SynchronousCommand wcm:action="add"> - <CommandLine>cmd.exe /c winrm quickconfig -q</CommandLine> - <Description>winrm quickconfig -q</Description> - <Order>1</Order> - <RequiresUserInput>true</RequiresUserInput> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <CommandLine>cmd.exe /c winrm quickconfig -transport:http</CommandLine> - <Description>winrm quickconfig -transport:http</Description> - <Order>2</Order> - <RequiresUserInput>true</RequiresUserInput> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <CommandLine>cmd.exe /c winrm set winrm/config @{MaxTimeoutms="1800000"}</CommandLine> - <Description>Win RM MaxTimoutms</Description> - <Order>3</Order> - <RequiresUserInput>true</RequiresUserInput> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <CommandLine>cmd.exe /c winrm set winrm/config/winrs @{MaxMemoryPerShellMB="300"}</CommandLine> - <Description>Win RM MaxMemoryPerShellMB</Description> - <Order>4</Order> - <RequiresUserInput>true</RequiresUserInput> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <CommandLine>cmd.exe /c winrm set winrm/config/service @{AllowUnencrypted="true"}</CommandLine> - <Description>Win RM AllowUnencrypted</Description> - <Order>5</Order> - <RequiresUserInput>true</RequiresUserInput> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <CommandLine>cmd.exe /c winrm set winrm/config/service/auth @{Basic="true"}</CommandLine> - <Description>Win RM auth Basic</Description> - <Order>6</Order> - <RequiresUserInput>true</RequiresUserInput> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <CommandLine>cmd.exe /c winrm set winrm/config/client/auth @{Basic="true"}</CommandLine> - <Description>Win RM auth Basic</Description> - <Order>7</Order> - <RequiresUserInput>true</RequiresUserInput> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <CommandLine>cmd.exe /c winrm set winrm/config/listener?Address=*+Transport=HTTP @{Port="5985"} </CommandLine> - <Description>Win RM listener Address/Port</Description> - <Order>8</Order> - <RequiresUserInput>true</RequiresUserInput> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <CommandLine>cmd.exe /c netsh advfirewall firewall set rule group="remote administration" new enable=yes </CommandLine> - <Description>Win RM adv firewall enable</Description> - <Order>9</Order> - <RequiresUserInput>true</RequiresUserInput> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <CommandLine>cmd.exe /c netsh firewall add portopening TCP 5985 "Port 5985" </CommandLine> - <Description>Win RM port open</Description> - <Order>10</Order> - <RequiresUserInput>true</RequiresUserInput> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <CommandLine>cmd.exe /c net stop winrm </CommandLine> - <Description>Stop Win RM Service </Description> - <Order>11</Order> - <RequiresUserInput>true</RequiresUserInput> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <CommandLine>cmd.exe /c sc config winrm start= auto</CommandLine> - <Description>Win RM Autostart</Description> - <Order>12</Order> - <RequiresUserInput>true</RequiresUserInput> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <CommandLine>cmd.exe /c net start winrm </CommandLine> - <Description>Start Win RM Service</Description> - <Order>13</Order> - <RequiresUserInput>true</RequiresUserInput> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <CommandLine>powershell -Command "Set-ExecutionPolicy -ExecutionPolicy RemoteSigned -Force"</CommandLine> - <Description>Start Win RM Service</Description> - <Order>14</Order> - <RequiresUserInput>true</RequiresUserInput> - </SynchronousCommand> - </FirstLogonCommands> - <ShowWindowsLive>false</ShowWindowsLive> - </component> - </settings> - <settings pass="specialize"> - <component name="Microsoft-Windows-Shell-Setup" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" > - <OEMInformation> - <HelpCustomized>false</HelpCustomized> - </OEMInformation> - <!-- Rename computer here. --> - <ComputerName>vagrant-2008R2</ComputerName> - <TimeZone>Pacific Standard Time</TimeZone> - <RegisteredOwner></RegisteredOwner> - </component> - <component name="Microsoft-Windows-Security-SPP-UX" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - <SkipAutoActivation>true</SkipAutoActivation> - </component> - </settings> - <cpi:offlineImage cpi:source="catalog:d:/sources/install_windows server 2008 r2 serverdatacenter.clg" xmlns:cpi="urn:schemas-microsoft-com:cpi" /> -</unattend> diff --git a/definitions/windows-2012-standard/README.md b/definitions/windows-2012-standard/README.md deleted file mode 100644 index be39b6e15..000000000 --- a/definitions/windows-2012-standard/README.md +++ /dev/null @@ -1,87 +0,0 @@ -You can download a free trial of Windows Server 2008 R2 with Service Pack 1 from two different locations manually: - -* url: http://technet.microsoft.com/en-us/evalcenter/dd459137.aspx -* url: http://msdn.microsoft.com/en-us/evalcenter/ee175713.aspx - -But they seem to always generate the same url of http://care.dlservice.microsoft.com//dl/download/7/5/E/75EC4E54-5B02-42D6-8879-D8D3A25FBEF7/7601.17514.101119-1850_x64fre_server_eval_en-us-GRMSXEVAL_EN_DVD.iso - -* 64bit -* filename: 7601.17514.101119-1850_x64fre_server_eval_en-us-GRMSXEVAL_EN_DVD.iso -* md5sum: 4263be2cf3c59177c45085c0a7bc6ca5 - - -The installation uses the Standard Windows Unattended installation. The XML file was created using the Windows AIK kit, but the file can also be edited by hand. - -To edit the Autounattend.xml and validate it you can download The Windows® Automated Installation Kit (AIK) for Windows® 7: - -* url: http://www.microsoft.com/download/en/details.aspx?id=5753 -* file: KB3AIK_EN.iso -* md5sum: 1e73b24a89eceab9d50585b92db5482f - -AIK also includes dism, which will allow you to choose a specific version: - -If you want to install a different version, edit Autoattended.xml and replace the /IMAGE/NAME value with -one of the names listed in the 2008r2 install.wim on the install DVD .iso - - -```xml -<InstallFrom> - <MetaData wcm:action="add"> - <Key>/IMAGE/NAME</Key> - <Value>Windows Server 2008 R2 SERVERSTANDARD</Value> - </MetaData> -</InstallFrom> -``` - - -``` -PS C:\Users\Administrator> Dism /Get-WIMInfo /WimFile:d:\sources\install.wim - -Deployment Image Servicing and Management tool -Version: 6.1.7600.16385 - -Details for image : d:\sources\install.wim - -Index : 1 -Name : Windows Server 2008 R2 SERVERSTANDARD -Description : Windows Server 2008 R2 SERVERSTANDARD -Size : 10,510,643,622 bytes - -Index : 2 -Name : Windows Server 2008 R2 SERVERSTANDARDCORE -Description : Windows Server 2008 R2 SERVERSTANDARDCORE -Size : 3,564,132,307 bytes - -Index : 3 -Name : Windows Server 2008 R2 SERVERENTERPRISE -Description : Windows Server 2008 R2 SERVERENTERPRISE -Size : 10,511,024,733 bytes - -Index : 4 -Name : Windows Server 2008 R2 SERVERENTERPRISECORE -Description : Windows Server 2008 R2 SERVERENTERPRISECORE -Size : 3,564,106,331 bytes - -Index : 5 -Name : Windows Server 2008 R2 SERVERDATACENTER -Description : Windows Server 2008 R2 SERVERDATACENTER -Size : 10,511,131,897 bytes - -Index : 6 -Name : Windows Server 2008 R2 SERVERDATACENTERCORE -Description : Windows Server 2008 R2 SERVERDATACENTERCORE -Size : 3,564,144,547 bytes - -Index : 7 -Name : Windows Server 2008 R2 SERVERWEB -Description : Windows Server 2008 R2 SERVERWEB -Size : 10,520,222,743 bytes - -Index : 8 -Name : Windows Server 2008 R2 SERVERWEBCORE -Description : Windows Server 2008 R2 SERVERWEBCORE -Size : 3,562,750,400 bytes - -The operation completed successfully. -``` - diff --git a/definitions/windows-2012-standard/definition.rb b/definitions/windows-2012-standard/definition.rb deleted file mode 100644 index 552e58708..000000000 --- a/definitions/windows-2012-standard/definition.rb +++ /dev/null @@ -1,17 +0,0 @@ -# -*- coding: utf-8 -*- -require File.dirname(__FILE__) + "/../.windows/session.rb" - -iso_src = "http://care.dlservice.microsoft.com//dl/download/7/5/E/75EC4E54-5B02-42D6-8879-D8D3A25FBEF7/7601.17514.101119-1850_x64fre_server_eval_en-us-GRMSXEVAL_EN_DVD.iso" - -session = WINDOWS_SESSION.merge({ - :os_type_id => 'Windows2008_64', - :iso_download_instructions => "Download and install full featured software for 180-day trial at http://technet.microsoft.com/en-us/evalcenter/dd459137.aspx", - :iso_src => iso_src, - :iso_file => File.basename(iso_src), - :iso_md5 => "4263be2cf3c59177c45085c0a7bc6ca5", - :kickstart_port => "7140" - }) - -Veewee::Session.declare session - - diff --git a/definitions/windows-2012-standard/install-chef.bat b/definitions/windows-2012-standard/install-chef.bat deleted file mode 120000 index 0494fd4af..000000000 --- a/definitions/windows-2012-standard/install-chef.bat +++ /dev/null @@ -1 +0,0 @@ -../.windows/install-chef.bat \ No newline at end of file diff --git a/definitions/windows-2012-standard/install-vbox.bat b/definitions/windows-2012-standard/install-vbox.bat deleted file mode 120000 index 2ff5531e3..000000000 --- a/definitions/windows-2012-standard/install-vbox.bat +++ /dev/null @@ -1 +0,0 @@ -../.windows/install-vbox.bat \ No newline at end of file diff --git a/definitions/windows-2012-standard/mount-validation.bat b/definitions/windows-2012-standard/mount-validation.bat deleted file mode 120000 index e137688e8..000000000 --- a/definitions/windows-2012-standard/mount-validation.bat +++ /dev/null @@ -1 +0,0 @@ -../.windows/mount-validation.bat \ No newline at end of file diff --git a/definitions/windows-2012-standard/oracle-cert.cer b/definitions/windows-2012-standard/oracle-cert.cer deleted file mode 120000 index 5fbb0d341..000000000 --- a/definitions/windows-2012-standard/oracle-cert.cer +++ /dev/null @@ -1 +0,0 @@ -../.windows/oracle-cert.cer \ No newline at end of file From 0fd49d5d616dbd7a4510a02f1bdaf5c3dfd4ab2d Mon Sep 17 00:00:00 2001 From: "Julian C. Dunn" <jdunn@opscode.com> Date: Thu, 2 May 2013 15:28:28 -0400 Subject: [PATCH 0025/1622] Don't repeat os_type_id from .centos common defs --- definitions/centos-5.8/definition.rb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/definitions/centos-5.8/definition.rb b/definitions/centos-5.8/definition.rb index 8fb0de04f..19eb69ab9 100644 --- a/definitions/centos-5.8/definition.rb +++ b/definitions/centos-5.8/definition.rb @@ -3,8 +3,7 @@ iso = "CentOS-5.8-x86_64-bin-DVD-1of2.iso" session = - CENTOS_SESSION.merge({ :os_type_id => 'Centos_64', - :iso_file => iso, + CENTOS_SESSION.merge({ :iso_file => iso, :iso_md5 => "8a3bf0030f192022943f83fe6b2cf373", :iso_src => "http://mirror.stanford.edu/yum/pub/centos/5.8/isos/x86_64/#{iso}" }) From 55e964020abee88107b64ea38b1f868320d11183 Mon Sep 17 00:00:00 2001 From: "Julian C. Dunn" <jdunn@opscode.com> Date: Mon, 6 May 2013 22:57:48 -0500 Subject: [PATCH 0026/1622] Fix Windows 8 Enterprise box builds. KMS license key was outdated, and I allocated insufficient RAM to it. --- definitions/windows-8-enterprise/Autounattend.xml | 4 ++-- definitions/windows-8-enterprise/definition.rb | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/definitions/windows-8-enterprise/Autounattend.xml b/definitions/windows-8-enterprise/Autounattend.xml index 7348cd0a5..793830739 100644 --- a/definitions/windows-8-enterprise/Autounattend.xml +++ b/definitions/windows-8-enterprise/Autounattend.xml @@ -36,8 +36,8 @@ </DiskConfiguration> <UserData> - <!-- Product Key from http://technet.microsoft.com/en-us/library/ff793406.aspx --> - <ProductKey>YC6KT-GKW9T-YTKYR-T4X34-R7VHC + <!-- Product Key from http://technet.microsoft.com/en-us/library/jj612867.aspx --> + <ProductKey>32JNW-9KQ84-P47T8-D8GGY-CWCK7 <WillShowUI>Never</WillShowUI> </ProductKey> diff --git a/definitions/windows-8-enterprise/definition.rb b/definitions/windows-8-enterprise/definition.rb index 565b72013..6c0fc301a 100644 --- a/definitions/windows-8-enterprise/definition.rb +++ b/definitions/windows-8-enterprise/definition.rb @@ -10,7 +10,8 @@ :iso_src => iso_src, :iso_md5 => "6beffd994574ca89417286f0dc056108", :winrm_host_port => "5988", - :kickstart_port => "7150" + :kickstart_port => "7150", + :memory_size=> "512" }) Veewee::Session.declare session From ffb30b9f075774fe76d53202044f7d311a232860 Mon Sep 17 00:00:00 2001 From: "Julian C. Dunn" <jdunn@opscode.com> Date: Mon, 6 May 2013 21:57:46 -0500 Subject: [PATCH 0027/1622] Remove chef client for provisionerless base boxes support --- definitions/.centos/session.rb | 3 +-- definitions/.ubuntu/session.rb | 1 - 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/definitions/.centos/session.rb b/definitions/.centos/session.rb index 9c49280aa..d1d1164fe 100644 --- a/definitions/.centos/session.rb +++ b/definitions/.centos/session.rb @@ -5,8 +5,7 @@ [ 'linux text ks=http://%IP%:%PORT%/ks.cfg<Enter>' ], :kickstart_file => "ks.cfg", :os_type_id => 'Centos_64', - :postinstall_files => [ "chef-client.sh", - "vagrant.sh", + :postinstall_files => [ "vagrant.sh", "cleanup.sh", "minimize.sh" ], :shutdown_cmd => "/sbin/halt -h -p" }) diff --git a/definitions/.ubuntu/session.rb b/definitions/.ubuntu/session.rb index ab020b257..36ea00ed0 100644 --- a/definitions/.ubuntu/session.rb +++ b/definitions/.ubuntu/session.rb @@ -28,7 +28,6 @@ ], :os_type_id => 'Ubuntu_64', :postinstall_files => [ "update.sh", - "chef-client.sh", "vagrant.sh", "networking.sh", "sudoers.sh", From e50ffa8c8a6fdf2b574736b6c6d0a65b548c65c4 Mon Sep 17 00:00:00 2001 From: "Julian C. Dunn" <jdunn@opscode.com> Date: Sat, 11 May 2013 00:18:38 -0400 Subject: [PATCH 0028/1622] [BENTO-10] Add "UseDNS no" to all sshd configs to speed up vagrant, when no reverse DNS is available. --- definitions/.centos/session.rb | 1 + definitions/.common/sshd.sh | 3 +++ definitions/.debian/session.rb | 1 + definitions/.ubuntu/session.rb | 1 + definitions/centos-5.5-i386/sshd.sh | 1 + definitions/centos-5.5/sshd.sh | 1 + definitions/centos-5.6/sshd.sh | 1 + definitions/centos-5.7/sshd.sh | 1 + definitions/centos-5.8-i386/sshd.sh | 1 + definitions/centos-5.8/sshd.sh | 1 + definitions/centos-5.9-i386/sshd.sh | 1 + definitions/centos-5.9/sshd.sh | 1 + definitions/centos-6.0/sshd.sh | 1 + definitions/centos-6.2-i386/sshd.sh | 1 + definitions/centos-6.2/sshd.sh | 1 + definitions/centos-6.3-i386/sshd.sh | 1 + definitions/centos-6.3/sshd.sh | 1 + definitions/centos-6.4-i386/sshd.sh | 1 + definitions/centos-6.4/sshd.sh | 1 + definitions/ubuntu-10.04-i386/sshd.sh | 1 + definitions/ubuntu-10.04/sshd.sh | 1 + definitions/ubuntu-10.10/sshd.sh | 1 + definitions/ubuntu-11.04/sshd.sh | 1 + definitions/ubuntu-11.10/sshd.sh | 1 + definitions/ubuntu-12.04-i386/sshd.sh | 1 + definitions/ubuntu-12.04/sshd.sh | 1 + definitions/ubuntu-12.10-i386/sshd.sh | 1 + definitions/ubuntu-12.10/sshd.sh | 1 + 28 files changed, 30 insertions(+) create mode 100644 definitions/.common/sshd.sh create mode 120000 definitions/centos-5.5-i386/sshd.sh create mode 120000 definitions/centos-5.5/sshd.sh create mode 120000 definitions/centos-5.6/sshd.sh create mode 120000 definitions/centos-5.7/sshd.sh create mode 120000 definitions/centos-5.8-i386/sshd.sh create mode 120000 definitions/centos-5.8/sshd.sh create mode 120000 definitions/centos-5.9-i386/sshd.sh create mode 120000 definitions/centos-5.9/sshd.sh create mode 120000 definitions/centos-6.0/sshd.sh create mode 120000 definitions/centos-6.2-i386/sshd.sh create mode 120000 definitions/centos-6.2/sshd.sh create mode 120000 definitions/centos-6.3-i386/sshd.sh create mode 120000 definitions/centos-6.3/sshd.sh create mode 120000 definitions/centos-6.4-i386/sshd.sh create mode 120000 definitions/centos-6.4/sshd.sh create mode 120000 definitions/ubuntu-10.04-i386/sshd.sh create mode 120000 definitions/ubuntu-10.04/sshd.sh create mode 120000 definitions/ubuntu-10.10/sshd.sh create mode 120000 definitions/ubuntu-11.04/sshd.sh create mode 120000 definitions/ubuntu-11.10/sshd.sh create mode 120000 definitions/ubuntu-12.04-i386/sshd.sh create mode 120000 definitions/ubuntu-12.04/sshd.sh create mode 120000 definitions/ubuntu-12.10-i386/sshd.sh create mode 120000 definitions/ubuntu-12.10/sshd.sh diff --git a/definitions/.centos/session.rb b/definitions/.centos/session.rb index 9c49280aa..6d5986dd0 100644 --- a/definitions/.centos/session.rb +++ b/definitions/.centos/session.rb @@ -7,6 +7,7 @@ :os_type_id => 'Centos_64', :postinstall_files => [ "chef-client.sh", "vagrant.sh", + "sshd.sh", "cleanup.sh", "minimize.sh" ], :shutdown_cmd => "/sbin/halt -h -p" }) diff --git a/definitions/.common/sshd.sh b/definitions/.common/sshd.sh new file mode 100644 index 000000000..c6e4f20a6 --- /dev/null +++ b/definitions/.common/sshd.sh @@ -0,0 +1,3 @@ +#!/bin/bash -eux + +echo "UseDNS no" >> /etc/ssh/sshd_config diff --git a/definitions/.debian/session.rb b/definitions/.debian/session.rb index 277f4803f..81c436a61 100644 --- a/definitions/.debian/session.rb +++ b/definitions/.debian/session.rb @@ -22,6 +22,7 @@ :postinstall_files => [ "update.sh", "chef-client.sh", "vagrant.sh", + "sshd.sh", "networking.sh", "sudoers.sh", "cleanup.sh", diff --git a/definitions/.ubuntu/session.rb b/definitions/.ubuntu/session.rb index ab020b257..250825058 100644 --- a/definitions/.ubuntu/session.rb +++ b/definitions/.ubuntu/session.rb @@ -30,6 +30,7 @@ :postinstall_files => [ "update.sh", "chef-client.sh", "vagrant.sh", + "sshd.sh", "networking.sh", "sudoers.sh", "cleanup.sh", diff --git a/definitions/centos-5.5-i386/sshd.sh b/definitions/centos-5.5-i386/sshd.sh new file mode 120000 index 000000000..f353f2d00 --- /dev/null +++ b/definitions/centos-5.5-i386/sshd.sh @@ -0,0 +1 @@ +../.common/sshd.sh \ No newline at end of file diff --git a/definitions/centos-5.5/sshd.sh b/definitions/centos-5.5/sshd.sh new file mode 120000 index 000000000..f353f2d00 --- /dev/null +++ b/definitions/centos-5.5/sshd.sh @@ -0,0 +1 @@ +../.common/sshd.sh \ No newline at end of file diff --git a/definitions/centos-5.6/sshd.sh b/definitions/centos-5.6/sshd.sh new file mode 120000 index 000000000..f353f2d00 --- /dev/null +++ b/definitions/centos-5.6/sshd.sh @@ -0,0 +1 @@ +../.common/sshd.sh \ No newline at end of file diff --git a/definitions/centos-5.7/sshd.sh b/definitions/centos-5.7/sshd.sh new file mode 120000 index 000000000..f353f2d00 --- /dev/null +++ b/definitions/centos-5.7/sshd.sh @@ -0,0 +1 @@ +../.common/sshd.sh \ No newline at end of file diff --git a/definitions/centos-5.8-i386/sshd.sh b/definitions/centos-5.8-i386/sshd.sh new file mode 120000 index 000000000..f353f2d00 --- /dev/null +++ b/definitions/centos-5.8-i386/sshd.sh @@ -0,0 +1 @@ +../.common/sshd.sh \ No newline at end of file diff --git a/definitions/centos-5.8/sshd.sh b/definitions/centos-5.8/sshd.sh new file mode 120000 index 000000000..f353f2d00 --- /dev/null +++ b/definitions/centos-5.8/sshd.sh @@ -0,0 +1 @@ +../.common/sshd.sh \ No newline at end of file diff --git a/definitions/centos-5.9-i386/sshd.sh b/definitions/centos-5.9-i386/sshd.sh new file mode 120000 index 000000000..f353f2d00 --- /dev/null +++ b/definitions/centos-5.9-i386/sshd.sh @@ -0,0 +1 @@ +../.common/sshd.sh \ No newline at end of file diff --git a/definitions/centos-5.9/sshd.sh b/definitions/centos-5.9/sshd.sh new file mode 120000 index 000000000..f353f2d00 --- /dev/null +++ b/definitions/centos-5.9/sshd.sh @@ -0,0 +1 @@ +../.common/sshd.sh \ No newline at end of file diff --git a/definitions/centos-6.0/sshd.sh b/definitions/centos-6.0/sshd.sh new file mode 120000 index 000000000..f353f2d00 --- /dev/null +++ b/definitions/centos-6.0/sshd.sh @@ -0,0 +1 @@ +../.common/sshd.sh \ No newline at end of file diff --git a/definitions/centos-6.2-i386/sshd.sh b/definitions/centos-6.2-i386/sshd.sh new file mode 120000 index 000000000..f353f2d00 --- /dev/null +++ b/definitions/centos-6.2-i386/sshd.sh @@ -0,0 +1 @@ +../.common/sshd.sh \ No newline at end of file diff --git a/definitions/centos-6.2/sshd.sh b/definitions/centos-6.2/sshd.sh new file mode 120000 index 000000000..f353f2d00 --- /dev/null +++ b/definitions/centos-6.2/sshd.sh @@ -0,0 +1 @@ +../.common/sshd.sh \ No newline at end of file diff --git a/definitions/centos-6.3-i386/sshd.sh b/definitions/centos-6.3-i386/sshd.sh new file mode 120000 index 000000000..f353f2d00 --- /dev/null +++ b/definitions/centos-6.3-i386/sshd.sh @@ -0,0 +1 @@ +../.common/sshd.sh \ No newline at end of file diff --git a/definitions/centos-6.3/sshd.sh b/definitions/centos-6.3/sshd.sh new file mode 120000 index 000000000..f353f2d00 --- /dev/null +++ b/definitions/centos-6.3/sshd.sh @@ -0,0 +1 @@ +../.common/sshd.sh \ No newline at end of file diff --git a/definitions/centos-6.4-i386/sshd.sh b/definitions/centos-6.4-i386/sshd.sh new file mode 120000 index 000000000..f353f2d00 --- /dev/null +++ b/definitions/centos-6.4-i386/sshd.sh @@ -0,0 +1 @@ +../.common/sshd.sh \ No newline at end of file diff --git a/definitions/centos-6.4/sshd.sh b/definitions/centos-6.4/sshd.sh new file mode 120000 index 000000000..f353f2d00 --- /dev/null +++ b/definitions/centos-6.4/sshd.sh @@ -0,0 +1 @@ +../.common/sshd.sh \ No newline at end of file diff --git a/definitions/ubuntu-10.04-i386/sshd.sh b/definitions/ubuntu-10.04-i386/sshd.sh new file mode 120000 index 000000000..f353f2d00 --- /dev/null +++ b/definitions/ubuntu-10.04-i386/sshd.sh @@ -0,0 +1 @@ +../.common/sshd.sh \ No newline at end of file diff --git a/definitions/ubuntu-10.04/sshd.sh b/definitions/ubuntu-10.04/sshd.sh new file mode 120000 index 000000000..f353f2d00 --- /dev/null +++ b/definitions/ubuntu-10.04/sshd.sh @@ -0,0 +1 @@ +../.common/sshd.sh \ No newline at end of file diff --git a/definitions/ubuntu-10.10/sshd.sh b/definitions/ubuntu-10.10/sshd.sh new file mode 120000 index 000000000..f353f2d00 --- /dev/null +++ b/definitions/ubuntu-10.10/sshd.sh @@ -0,0 +1 @@ +../.common/sshd.sh \ No newline at end of file diff --git a/definitions/ubuntu-11.04/sshd.sh b/definitions/ubuntu-11.04/sshd.sh new file mode 120000 index 000000000..f353f2d00 --- /dev/null +++ b/definitions/ubuntu-11.04/sshd.sh @@ -0,0 +1 @@ +../.common/sshd.sh \ No newline at end of file diff --git a/definitions/ubuntu-11.10/sshd.sh b/definitions/ubuntu-11.10/sshd.sh new file mode 120000 index 000000000..f353f2d00 --- /dev/null +++ b/definitions/ubuntu-11.10/sshd.sh @@ -0,0 +1 @@ +../.common/sshd.sh \ No newline at end of file diff --git a/definitions/ubuntu-12.04-i386/sshd.sh b/definitions/ubuntu-12.04-i386/sshd.sh new file mode 120000 index 000000000..f353f2d00 --- /dev/null +++ b/definitions/ubuntu-12.04-i386/sshd.sh @@ -0,0 +1 @@ +../.common/sshd.sh \ No newline at end of file diff --git a/definitions/ubuntu-12.04/sshd.sh b/definitions/ubuntu-12.04/sshd.sh new file mode 120000 index 000000000..f353f2d00 --- /dev/null +++ b/definitions/ubuntu-12.04/sshd.sh @@ -0,0 +1 @@ +../.common/sshd.sh \ No newline at end of file diff --git a/definitions/ubuntu-12.10-i386/sshd.sh b/definitions/ubuntu-12.10-i386/sshd.sh new file mode 120000 index 000000000..f353f2d00 --- /dev/null +++ b/definitions/ubuntu-12.10-i386/sshd.sh @@ -0,0 +1 @@ +../.common/sshd.sh \ No newline at end of file diff --git a/definitions/ubuntu-12.10/sshd.sh b/definitions/ubuntu-12.10/sshd.sh new file mode 120000 index 000000000..f353f2d00 --- /dev/null +++ b/definitions/ubuntu-12.10/sshd.sh @@ -0,0 +1 @@ +../.common/sshd.sh \ No newline at end of file From 89c9959f72e39b83879d03139d5033ceb6c4713f Mon Sep 17 00:00:00 2001 From: "Julian C. Dunn" <jdunn@opscode.com> Date: Sun, 12 May 2013 22:19:01 -0400 Subject: [PATCH 0029/1622] [BENTO-35] Remove chef-client.sh and symlinks from all definitions. Update README to reflect the fact that we no longer ship Chef with baseboxes. --- README.md | 28 +++++++++++++++----- definitions/.common/chef-client.sh | 3 --- definitions/.debian/session.rb | 1 - definitions/centos-5.5-i386/chef-client.sh | 1 - definitions/centos-5.5/chef-client.sh | 1 - definitions/centos-5.6/chef-client.sh | 1 - definitions/centos-5.7/chef-client.sh | 1 - definitions/centos-5.8-i386/chef-client.sh | 1 - definitions/centos-5.8/chef-client.sh | 1 - definitions/centos-6.0/chef-client.sh | 1 - definitions/centos-6.2-i386/chef-client.sh | 1 - definitions/centos-6.2/chef-client.sh | 1 - definitions/centos-6.3-i386/chef-client.sh | 1 - definitions/centos-6.3/chef-client.sh | 1 - definitions/debian-6.0.5-i386/chef-client.sh | 1 - definitions/debian-6.0.5/chef-client.sh | 1 - definitions/ubuntu-10.04-i386/chef-client.sh | 1 - definitions/ubuntu-10.04/chef-client.sh | 1 - definitions/ubuntu-10.10/chef-client.sh | 1 - definitions/ubuntu-11.04/chef-client.sh | 1 - definitions/ubuntu-11.10/chef-client.sh | 1 - definitions/ubuntu-12.04-i386/chef-client.sh | 1 - definitions/ubuntu-12.04/chef-client.sh | 1 - definitions/ubuntu-12.10-i386/chef-client.sh | 1 - definitions/ubuntu-12.10/chef-client.sh | 1 - 25 files changed, 21 insertions(+), 33 deletions(-) delete mode 100644 definitions/.common/chef-client.sh delete mode 120000 definitions/centos-5.5-i386/chef-client.sh delete mode 120000 definitions/centos-5.5/chef-client.sh delete mode 120000 definitions/centos-5.6/chef-client.sh delete mode 120000 definitions/centos-5.7/chef-client.sh delete mode 120000 definitions/centos-5.8-i386/chef-client.sh delete mode 120000 definitions/centos-5.8/chef-client.sh delete mode 120000 definitions/centos-6.0/chef-client.sh delete mode 120000 definitions/centos-6.2-i386/chef-client.sh delete mode 120000 definitions/centos-6.2/chef-client.sh delete mode 120000 definitions/centos-6.3-i386/chef-client.sh delete mode 120000 definitions/centos-6.3/chef-client.sh delete mode 120000 definitions/debian-6.0.5-i386/chef-client.sh delete mode 120000 definitions/debian-6.0.5/chef-client.sh delete mode 120000 definitions/ubuntu-10.04-i386/chef-client.sh delete mode 120000 definitions/ubuntu-10.04/chef-client.sh delete mode 120000 definitions/ubuntu-10.10/chef-client.sh delete mode 120000 definitions/ubuntu-11.04/chef-client.sh delete mode 120000 definitions/ubuntu-11.10/chef-client.sh delete mode 120000 definitions/ubuntu-12.04-i386/chef-client.sh delete mode 120000 definitions/ubuntu-12.04/chef-client.sh delete mode 120000 definitions/ubuntu-12.10-i386/chef-client.sh delete mode 120000 definitions/ubuntu-12.10/chef-client.sh diff --git a/README.md b/README.md index 2f399d336..5f1bdc11d 100644 --- a/README.md +++ b/README.md @@ -11,13 +11,29 @@ make "Don't Repeat Yourself" (DRY) modular baseboxes. Thanks Tim! ## Current Baseboxes The following baseboxes are publicly available and were built using -this project, and Chef 11.4.4. Future releases of Chef and baseboxes -will follow the naming convention used here: +this project. Note that our baseboxes no longer include Chef Client. +Vagrant can be instructed to install Chef at runtime using the +[vagrant-omnibus](https://github.com/schisamo/vagrant-omnibus) plugin. - opscode_PLATFORM-VERSION_chef-VERSION.box +64-bit boxes: + +* [opscode-centos-5.9](https://opscode-vm.s3.amazonaws.com/vagrant/opscode_centos-5.9_provisionerless.box) +* [opscode-centos-6.4](https://opscode-vm.s3.amazonaws.com/vagrant/opscode_centos-6.4_provisionerless.box) +* [opscode-ubuntu-10.04](https://opscode-vm.s3.amazonaws.com/vagrant/opscode_ubuntu-10.04_provisionerless.box) +* [opscode-ubuntu-12.04](https://opscode-vm.s3.amazonaws.com/vagrant/opscode_ubuntu-12.04_provisionerless.box) + +32-bit boxes: + +* [opscode-centos-5.9-i386](https://opscode-vm.s3.amazonaws.com/vagrant/opscode_centos-5.9-i386_provisionerless.box) +* [opscode-centos-6.4-i386](https://opscode-vm.s3.amazonaws.com/vagrant/opscode_centos-6.4-i386_provisionerless.box) +* [opscode-ubuntu-10.04-i386](https://opscode-vm.s3.amazonaws.com/vagrant/opscode_ubuntu-10.04-i386_provisionerless.box) +* [opscode-ubuntu-12.04-i386](https://opscode-vm.s3.amazonaws.com/vagrant/opscode_ubuntu-12.04-i386_provisionerless.box) -and located in the opscode-vm S3 bucket's vagrant directory as linked -below. +## Older Baseboxes + +Older baseboxes include Chef. + +The following base boxes were built with Chef 11.4.4. 64-bit boxes: @@ -33,8 +49,6 @@ below. * [opscode-ubuntu-10.04-i386](https://opscode-vm.s3.amazonaws.com/vagrant/opscode_ubuntu-10.04-i386_chef-11.4.4.box) * [opscode-ubuntu-12.04-i386](https://opscode-vm.s3.amazonaws.com/vagrant/opscode_ubuntu-12.04-i386_chef-11.4.4.box) -## Older Baseboxes - The following base boxes were built with Chef 11.4.0. 64-bit boxes: diff --git a/definitions/.common/chef-client.sh b/definitions/.common/chef-client.sh deleted file mode 100644 index f1f28d4d2..000000000 --- a/definitions/.common/chef-client.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash -eux - -wget -O - http://opscode.com/chef/install.sh | sudo bash diff --git a/definitions/.debian/session.rb b/definitions/.debian/session.rb index 81c436a61..80306953e 100644 --- a/definitions/.debian/session.rb +++ b/definitions/.debian/session.rb @@ -20,7 +20,6 @@ ], :os_type_id => 'Debian_64', :postinstall_files => [ "update.sh", - "chef-client.sh", "vagrant.sh", "sshd.sh", "networking.sh", diff --git a/definitions/centos-5.5-i386/chef-client.sh b/definitions/centos-5.5-i386/chef-client.sh deleted file mode 120000 index 635081810..000000000 --- a/definitions/centos-5.5-i386/chef-client.sh +++ /dev/null @@ -1 +0,0 @@ -../.common/chef-client.sh \ No newline at end of file diff --git a/definitions/centos-5.5/chef-client.sh b/definitions/centos-5.5/chef-client.sh deleted file mode 120000 index 635081810..000000000 --- a/definitions/centos-5.5/chef-client.sh +++ /dev/null @@ -1 +0,0 @@ -../.common/chef-client.sh \ No newline at end of file diff --git a/definitions/centos-5.6/chef-client.sh b/definitions/centos-5.6/chef-client.sh deleted file mode 120000 index 635081810..000000000 --- a/definitions/centos-5.6/chef-client.sh +++ /dev/null @@ -1 +0,0 @@ -../.common/chef-client.sh \ No newline at end of file diff --git a/definitions/centos-5.7/chef-client.sh b/definitions/centos-5.7/chef-client.sh deleted file mode 120000 index 635081810..000000000 --- a/definitions/centos-5.7/chef-client.sh +++ /dev/null @@ -1 +0,0 @@ -../.common/chef-client.sh \ No newline at end of file diff --git a/definitions/centos-5.8-i386/chef-client.sh b/definitions/centos-5.8-i386/chef-client.sh deleted file mode 120000 index 635081810..000000000 --- a/definitions/centos-5.8-i386/chef-client.sh +++ /dev/null @@ -1 +0,0 @@ -../.common/chef-client.sh \ No newline at end of file diff --git a/definitions/centos-5.8/chef-client.sh b/definitions/centos-5.8/chef-client.sh deleted file mode 120000 index 635081810..000000000 --- a/definitions/centos-5.8/chef-client.sh +++ /dev/null @@ -1 +0,0 @@ -../.common/chef-client.sh \ No newline at end of file diff --git a/definitions/centos-6.0/chef-client.sh b/definitions/centos-6.0/chef-client.sh deleted file mode 120000 index 635081810..000000000 --- a/definitions/centos-6.0/chef-client.sh +++ /dev/null @@ -1 +0,0 @@ -../.common/chef-client.sh \ No newline at end of file diff --git a/definitions/centos-6.2-i386/chef-client.sh b/definitions/centos-6.2-i386/chef-client.sh deleted file mode 120000 index 635081810..000000000 --- a/definitions/centos-6.2-i386/chef-client.sh +++ /dev/null @@ -1 +0,0 @@ -../.common/chef-client.sh \ No newline at end of file diff --git a/definitions/centos-6.2/chef-client.sh b/definitions/centos-6.2/chef-client.sh deleted file mode 120000 index 635081810..000000000 --- a/definitions/centos-6.2/chef-client.sh +++ /dev/null @@ -1 +0,0 @@ -../.common/chef-client.sh \ No newline at end of file diff --git a/definitions/centos-6.3-i386/chef-client.sh b/definitions/centos-6.3-i386/chef-client.sh deleted file mode 120000 index 635081810..000000000 --- a/definitions/centos-6.3-i386/chef-client.sh +++ /dev/null @@ -1 +0,0 @@ -../.common/chef-client.sh \ No newline at end of file diff --git a/definitions/centos-6.3/chef-client.sh b/definitions/centos-6.3/chef-client.sh deleted file mode 120000 index 635081810..000000000 --- a/definitions/centos-6.3/chef-client.sh +++ /dev/null @@ -1 +0,0 @@ -../.common/chef-client.sh \ No newline at end of file diff --git a/definitions/debian-6.0.5-i386/chef-client.sh b/definitions/debian-6.0.5-i386/chef-client.sh deleted file mode 120000 index 635081810..000000000 --- a/definitions/debian-6.0.5-i386/chef-client.sh +++ /dev/null @@ -1 +0,0 @@ -../.common/chef-client.sh \ No newline at end of file diff --git a/definitions/debian-6.0.5/chef-client.sh b/definitions/debian-6.0.5/chef-client.sh deleted file mode 120000 index 635081810..000000000 --- a/definitions/debian-6.0.5/chef-client.sh +++ /dev/null @@ -1 +0,0 @@ -../.common/chef-client.sh \ No newline at end of file diff --git a/definitions/ubuntu-10.04-i386/chef-client.sh b/definitions/ubuntu-10.04-i386/chef-client.sh deleted file mode 120000 index 635081810..000000000 --- a/definitions/ubuntu-10.04-i386/chef-client.sh +++ /dev/null @@ -1 +0,0 @@ -../.common/chef-client.sh \ No newline at end of file diff --git a/definitions/ubuntu-10.04/chef-client.sh b/definitions/ubuntu-10.04/chef-client.sh deleted file mode 120000 index 635081810..000000000 --- a/definitions/ubuntu-10.04/chef-client.sh +++ /dev/null @@ -1 +0,0 @@ -../.common/chef-client.sh \ No newline at end of file diff --git a/definitions/ubuntu-10.10/chef-client.sh b/definitions/ubuntu-10.10/chef-client.sh deleted file mode 120000 index 635081810..000000000 --- a/definitions/ubuntu-10.10/chef-client.sh +++ /dev/null @@ -1 +0,0 @@ -../.common/chef-client.sh \ No newline at end of file diff --git a/definitions/ubuntu-11.04/chef-client.sh b/definitions/ubuntu-11.04/chef-client.sh deleted file mode 120000 index 635081810..000000000 --- a/definitions/ubuntu-11.04/chef-client.sh +++ /dev/null @@ -1 +0,0 @@ -../.common/chef-client.sh \ No newline at end of file diff --git a/definitions/ubuntu-11.10/chef-client.sh b/definitions/ubuntu-11.10/chef-client.sh deleted file mode 120000 index 635081810..000000000 --- a/definitions/ubuntu-11.10/chef-client.sh +++ /dev/null @@ -1 +0,0 @@ -../.common/chef-client.sh \ No newline at end of file diff --git a/definitions/ubuntu-12.04-i386/chef-client.sh b/definitions/ubuntu-12.04-i386/chef-client.sh deleted file mode 120000 index 635081810..000000000 --- a/definitions/ubuntu-12.04-i386/chef-client.sh +++ /dev/null @@ -1 +0,0 @@ -../.common/chef-client.sh \ No newline at end of file diff --git a/definitions/ubuntu-12.04/chef-client.sh b/definitions/ubuntu-12.04/chef-client.sh deleted file mode 120000 index 635081810..000000000 --- a/definitions/ubuntu-12.04/chef-client.sh +++ /dev/null @@ -1 +0,0 @@ -../.common/chef-client.sh \ No newline at end of file diff --git a/definitions/ubuntu-12.10-i386/chef-client.sh b/definitions/ubuntu-12.10-i386/chef-client.sh deleted file mode 120000 index 635081810..000000000 --- a/definitions/ubuntu-12.10-i386/chef-client.sh +++ /dev/null @@ -1 +0,0 @@ -../.common/chef-client.sh \ No newline at end of file diff --git a/definitions/ubuntu-12.10/chef-client.sh b/definitions/ubuntu-12.10/chef-client.sh deleted file mode 120000 index 635081810..000000000 --- a/definitions/ubuntu-12.10/chef-client.sh +++ /dev/null @@ -1 +0,0 @@ -../.common/chef-client.sh \ No newline at end of file From c8630cdad18f283ab3c02a4a8f001915dd768a4f Mon Sep 17 00:00:00 2001 From: jtimberman <joshua@opscode.com> Date: Sun, 12 May 2013 20:47:11 -0600 Subject: [PATCH 0030/1622] Add Debian 7.0.0 definitions This is a start on having Debian 7.0 basebox support in bento. Manual steps required for building at this time: - Hit enter to select American English on "Configure the Keyboard" - Hit enter to NOT scan another media on "Configure the package manager" - Hit enter to use network mirror on "Configure the package manager" 64 and 32 bit baseboxes are already uploaded to the S3 bucket built with these definitions. They include Chef 11.4.4 because we haven't made baseboxes provisionerless (yet). The API that serves up Chef omnibus packages doesn't have Debian 7 yet, so these have a chef-client.sh that hits the API with the Debian 6 version requested. --- definitions/debian-7.0.0-i386/chef-client.sh | 4 ++++ definitions/debian-7.0.0-i386/cleanup.sh | 1 + definitions/debian-7.0.0-i386/definition.rb | 11 +++++++++++ definitions/debian-7.0.0-i386/minimize.sh | 1 + definitions/debian-7.0.0-i386/networking.sh | 1 + definitions/debian-7.0.0-i386/preseed.cfg | 1 + definitions/debian-7.0.0-i386/sshd.sh | 1 + definitions/debian-7.0.0-i386/sudoers.sh | 1 + definitions/debian-7.0.0-i386/update.sh | 1 + definitions/debian-7.0.0-i386/vagrant.sh | 1 + definitions/debian-7.0.0/chef-client.sh | 4 ++++ definitions/debian-7.0.0/cleanup.sh | 1 + definitions/debian-7.0.0/definition.rb | 10 ++++++++++ definitions/debian-7.0.0/minimize.sh | 1 + definitions/debian-7.0.0/networking.sh | 1 + definitions/debian-7.0.0/preseed.cfg | 1 + definitions/debian-7.0.0/sshd.sh | 1 + definitions/debian-7.0.0/sudoers.sh | 1 + definitions/debian-7.0.0/update.sh | 1 + definitions/debian-7.0.0/vagrant.sh | 1 + 20 files changed, 45 insertions(+) create mode 100644 definitions/debian-7.0.0-i386/chef-client.sh create mode 120000 definitions/debian-7.0.0-i386/cleanup.sh create mode 100644 definitions/debian-7.0.0-i386/definition.rb create mode 120000 definitions/debian-7.0.0-i386/minimize.sh create mode 120000 definitions/debian-7.0.0-i386/networking.sh create mode 120000 definitions/debian-7.0.0-i386/preseed.cfg create mode 120000 definitions/debian-7.0.0-i386/sshd.sh create mode 120000 definitions/debian-7.0.0-i386/sudoers.sh create mode 120000 definitions/debian-7.0.0-i386/update.sh create mode 120000 definitions/debian-7.0.0-i386/vagrant.sh create mode 100644 definitions/debian-7.0.0/chef-client.sh create mode 120000 definitions/debian-7.0.0/cleanup.sh create mode 100644 definitions/debian-7.0.0/definition.rb create mode 120000 definitions/debian-7.0.0/minimize.sh create mode 120000 definitions/debian-7.0.0/networking.sh create mode 120000 definitions/debian-7.0.0/preseed.cfg create mode 120000 definitions/debian-7.0.0/sshd.sh create mode 120000 definitions/debian-7.0.0/sudoers.sh create mode 120000 definitions/debian-7.0.0/update.sh create mode 120000 definitions/debian-7.0.0/vagrant.sh diff --git a/definitions/debian-7.0.0-i386/chef-client.sh b/definitions/debian-7.0.0-i386/chef-client.sh new file mode 100644 index 000000000..187d40e0d --- /dev/null +++ b/definitions/debian-7.0.0-i386/chef-client.sh @@ -0,0 +1,4 @@ +#!/bin/bash -eux + +wget -O /tmp/chef.deb 'http://www.opscode.com/chef/download?v=&prerelease=false&p=debian&pv=6&m=i686' +dpkg -i /tmp/chef.deb diff --git a/definitions/debian-7.0.0-i386/cleanup.sh b/definitions/debian-7.0.0-i386/cleanup.sh new file mode 120000 index 000000000..ce0b1c87e --- /dev/null +++ b/definitions/debian-7.0.0-i386/cleanup.sh @@ -0,0 +1 @@ +../.debian/cleanup.sh \ No newline at end of file diff --git a/definitions/debian-7.0.0-i386/definition.rb b/definitions/debian-7.0.0-i386/definition.rb new file mode 100644 index 000000000..160434c7c --- /dev/null +++ b/definitions/debian-7.0.0-i386/definition.rb @@ -0,0 +1,11 @@ +require File.dirname(__FILE__) + "/../.debian/session.rb" + +iso = "debian-7.0.0-i386-CD-1.iso" + +session = + DEBIAN_SESSION.merge( :os_type_id => 'Debian', + :iso_file => iso, + :iso_md5 => "c438bb93ac988e3a763107ab484a8c86", + :iso_src => "http://cdimage.debian.org/debian-cd/7.0.0/i386/iso-cd/#{iso}") + +Veewee::Session.declare session diff --git a/definitions/debian-7.0.0-i386/minimize.sh b/definitions/debian-7.0.0-i386/minimize.sh new file mode 120000 index 000000000..b3632ccbc --- /dev/null +++ b/definitions/debian-7.0.0-i386/minimize.sh @@ -0,0 +1 @@ +../.common/minimize.sh \ No newline at end of file diff --git a/definitions/debian-7.0.0-i386/networking.sh b/definitions/debian-7.0.0-i386/networking.sh new file mode 120000 index 000000000..614c95017 --- /dev/null +++ b/definitions/debian-7.0.0-i386/networking.sh @@ -0,0 +1 @@ +../.debian/networking.sh \ No newline at end of file diff --git a/definitions/debian-7.0.0-i386/preseed.cfg b/definitions/debian-7.0.0-i386/preseed.cfg new file mode 120000 index 000000000..29478e94f --- /dev/null +++ b/definitions/debian-7.0.0-i386/preseed.cfg @@ -0,0 +1 @@ +../.debian/preseed.cfg \ No newline at end of file diff --git a/definitions/debian-7.0.0-i386/sshd.sh b/definitions/debian-7.0.0-i386/sshd.sh new file mode 120000 index 000000000..f353f2d00 --- /dev/null +++ b/definitions/debian-7.0.0-i386/sshd.sh @@ -0,0 +1 @@ +../.common/sshd.sh \ No newline at end of file diff --git a/definitions/debian-7.0.0-i386/sudoers.sh b/definitions/debian-7.0.0-i386/sudoers.sh new file mode 120000 index 000000000..70234a7ff --- /dev/null +++ b/definitions/debian-7.0.0-i386/sudoers.sh @@ -0,0 +1 @@ +../.debian/sudoers.sh \ No newline at end of file diff --git a/definitions/debian-7.0.0-i386/update.sh b/definitions/debian-7.0.0-i386/update.sh new file mode 120000 index 000000000..bb97dfccb --- /dev/null +++ b/definitions/debian-7.0.0-i386/update.sh @@ -0,0 +1 @@ +../.debian/update.sh \ No newline at end of file diff --git a/definitions/debian-7.0.0-i386/vagrant.sh b/definitions/debian-7.0.0-i386/vagrant.sh new file mode 120000 index 000000000..702949639 --- /dev/null +++ b/definitions/debian-7.0.0-i386/vagrant.sh @@ -0,0 +1 @@ +../.common/vagrant.sh \ No newline at end of file diff --git a/definitions/debian-7.0.0/chef-client.sh b/definitions/debian-7.0.0/chef-client.sh new file mode 100644 index 000000000..d27498c6b --- /dev/null +++ b/definitions/debian-7.0.0/chef-client.sh @@ -0,0 +1,4 @@ +#!/bin/bash -eux + +wget -O /tmp/chef.deb 'http://www.opscode.com/chef/download?v=&prerelease=false&p=debian&pv=6&m=x86_64' +dpkg -i /tmp/chef.deb diff --git a/definitions/debian-7.0.0/cleanup.sh b/definitions/debian-7.0.0/cleanup.sh new file mode 120000 index 000000000..ce0b1c87e --- /dev/null +++ b/definitions/debian-7.0.0/cleanup.sh @@ -0,0 +1 @@ +../.debian/cleanup.sh \ No newline at end of file diff --git a/definitions/debian-7.0.0/definition.rb b/definitions/debian-7.0.0/definition.rb new file mode 100644 index 000000000..3947e71a1 --- /dev/null +++ b/definitions/debian-7.0.0/definition.rb @@ -0,0 +1,10 @@ +require File.dirname(__FILE__) + "/../.debian/session.rb" + +iso = "debian-7.0.0-amd64-CD-1.iso" + +session = + DEBIAN_SESSION.merge( :iso_file => iso, + :iso_md5 => "5f9aea239b122454dc360d52e85d6bf8", + :iso_src => "http://cdimage.debian.org/debian-cd/7.0.0/amd64/iso-cd/#{iso}") + +Veewee::Session.declare session diff --git a/definitions/debian-7.0.0/minimize.sh b/definitions/debian-7.0.0/minimize.sh new file mode 120000 index 000000000..b3632ccbc --- /dev/null +++ b/definitions/debian-7.0.0/minimize.sh @@ -0,0 +1 @@ +../.common/minimize.sh \ No newline at end of file diff --git a/definitions/debian-7.0.0/networking.sh b/definitions/debian-7.0.0/networking.sh new file mode 120000 index 000000000..614c95017 --- /dev/null +++ b/definitions/debian-7.0.0/networking.sh @@ -0,0 +1 @@ +../.debian/networking.sh \ No newline at end of file diff --git a/definitions/debian-7.0.0/preseed.cfg b/definitions/debian-7.0.0/preseed.cfg new file mode 120000 index 000000000..29478e94f --- /dev/null +++ b/definitions/debian-7.0.0/preseed.cfg @@ -0,0 +1 @@ +../.debian/preseed.cfg \ No newline at end of file diff --git a/definitions/debian-7.0.0/sshd.sh b/definitions/debian-7.0.0/sshd.sh new file mode 120000 index 000000000..f353f2d00 --- /dev/null +++ b/definitions/debian-7.0.0/sshd.sh @@ -0,0 +1 @@ +../.common/sshd.sh \ No newline at end of file diff --git a/definitions/debian-7.0.0/sudoers.sh b/definitions/debian-7.0.0/sudoers.sh new file mode 120000 index 000000000..70234a7ff --- /dev/null +++ b/definitions/debian-7.0.0/sudoers.sh @@ -0,0 +1 @@ +../.debian/sudoers.sh \ No newline at end of file diff --git a/definitions/debian-7.0.0/update.sh b/definitions/debian-7.0.0/update.sh new file mode 120000 index 000000000..bb97dfccb --- /dev/null +++ b/definitions/debian-7.0.0/update.sh @@ -0,0 +1 @@ +../.debian/update.sh \ No newline at end of file diff --git a/definitions/debian-7.0.0/vagrant.sh b/definitions/debian-7.0.0/vagrant.sh new file mode 120000 index 000000000..702949639 --- /dev/null +++ b/definitions/debian-7.0.0/vagrant.sh @@ -0,0 +1 @@ +../.common/vagrant.sh \ No newline at end of file From 7edf4f78ee23bd8a3159a6dfdd3b7890cef7cfb1 Mon Sep 17 00:00:00 2001 From: jtimberman <joshua@opscode.com> Date: Sun, 12 May 2013 21:54:49 -0600 Subject: [PATCH 0031/1622] Move debian 7 to provisionerless too --- definitions/debian-7.0.0-i386/chef-client.sh | 4 ---- definitions/debian-7.0.0/chef-client.sh | 4 ---- 2 files changed, 8 deletions(-) delete mode 100644 definitions/debian-7.0.0-i386/chef-client.sh delete mode 100644 definitions/debian-7.0.0/chef-client.sh diff --git a/definitions/debian-7.0.0-i386/chef-client.sh b/definitions/debian-7.0.0-i386/chef-client.sh deleted file mode 100644 index 187d40e0d..000000000 --- a/definitions/debian-7.0.0-i386/chef-client.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash -eux - -wget -O /tmp/chef.deb 'http://www.opscode.com/chef/download?v=&prerelease=false&p=debian&pv=6&m=i686' -dpkg -i /tmp/chef.deb diff --git a/definitions/debian-7.0.0/chef-client.sh b/definitions/debian-7.0.0/chef-client.sh deleted file mode 100644 index d27498c6b..000000000 --- a/definitions/debian-7.0.0/chef-client.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash -eux - -wget -O /tmp/chef.deb 'http://www.opscode.com/chef/download?v=&prerelease=false&p=debian&pv=6&m=x86_64' -dpkg -i /tmp/chef.deb From f3e53f66c32123bcd8bac4046cd9314d2fd5e1bd Mon Sep 17 00:00:00 2001 From: "Julian C. Dunn" <jdunn@opscode.com> Date: Mon, 13 May 2013 10:15:51 -0400 Subject: [PATCH 0032/1622] [BENTO-37] Added definitions for ubuntu 13.04. --- definitions/ubuntu-13.04-i386/cleanup.sh | 1 + definitions/ubuntu-13.04-i386/definition.rb | 11 +++++++++++ definitions/ubuntu-13.04-i386/minimize.sh | 1 + definitions/ubuntu-13.04-i386/networking.sh | 1 + definitions/ubuntu-13.04-i386/preseed.cfg | 1 + definitions/ubuntu-13.04-i386/sshd.sh | 1 + definitions/ubuntu-13.04-i386/sudoers.sh | 4 ++++ definitions/ubuntu-13.04-i386/update.sh | 1 + definitions/ubuntu-13.04-i386/vagrant.sh | 1 + definitions/ubuntu-13.04/cleanup.sh | 1 + definitions/ubuntu-13.04/definition.rb | 10 ++++++++++ definitions/ubuntu-13.04/minimize.sh | 1 + definitions/ubuntu-13.04/networking.sh | 1 + definitions/ubuntu-13.04/preseed.cfg | 1 + definitions/ubuntu-13.04/sshd.sh | 1 + definitions/ubuntu-13.04/sudoers.sh | 4 ++++ definitions/ubuntu-13.04/update.sh | 1 + definitions/ubuntu-13.04/vagrant.sh | 1 + 18 files changed, 43 insertions(+) create mode 120000 definitions/ubuntu-13.04-i386/cleanup.sh create mode 100644 definitions/ubuntu-13.04-i386/definition.rb create mode 120000 definitions/ubuntu-13.04-i386/minimize.sh create mode 120000 definitions/ubuntu-13.04-i386/networking.sh create mode 120000 definitions/ubuntu-13.04-i386/preseed.cfg create mode 120000 definitions/ubuntu-13.04-i386/sshd.sh create mode 100644 definitions/ubuntu-13.04-i386/sudoers.sh create mode 120000 definitions/ubuntu-13.04-i386/update.sh create mode 120000 definitions/ubuntu-13.04-i386/vagrant.sh create mode 120000 definitions/ubuntu-13.04/cleanup.sh create mode 100644 definitions/ubuntu-13.04/definition.rb create mode 120000 definitions/ubuntu-13.04/minimize.sh create mode 120000 definitions/ubuntu-13.04/networking.sh create mode 120000 definitions/ubuntu-13.04/preseed.cfg create mode 120000 definitions/ubuntu-13.04/sshd.sh create mode 100644 definitions/ubuntu-13.04/sudoers.sh create mode 120000 definitions/ubuntu-13.04/update.sh create mode 120000 definitions/ubuntu-13.04/vagrant.sh diff --git a/definitions/ubuntu-13.04-i386/cleanup.sh b/definitions/ubuntu-13.04-i386/cleanup.sh new file mode 120000 index 000000000..e5858f10d --- /dev/null +++ b/definitions/ubuntu-13.04-i386/cleanup.sh @@ -0,0 +1 @@ +../.ubuntu/cleanup.sh \ No newline at end of file diff --git a/definitions/ubuntu-13.04-i386/definition.rb b/definitions/ubuntu-13.04-i386/definition.rb new file mode 100644 index 000000000..03ef96224 --- /dev/null +++ b/definitions/ubuntu-13.04-i386/definition.rb @@ -0,0 +1,11 @@ +require File.dirname(__FILE__) + "/../.ubuntu/session.rb" + +iso = "ubuntu-13.04-server-i386.iso" + +session = + UBUNTU_SESSION.merge( :os_type_id => 'Ubuntu', + :iso_file => iso, + :iso_md5 => "73d595b804149fca9547ed94db8ff44f", + :iso_src => "http://releases.ubuntu.com/13.04/#{iso}" ) + +Veewee::Session.declare session diff --git a/definitions/ubuntu-13.04-i386/minimize.sh b/definitions/ubuntu-13.04-i386/minimize.sh new file mode 120000 index 000000000..b3632ccbc --- /dev/null +++ b/definitions/ubuntu-13.04-i386/minimize.sh @@ -0,0 +1 @@ +../.common/minimize.sh \ No newline at end of file diff --git a/definitions/ubuntu-13.04-i386/networking.sh b/definitions/ubuntu-13.04-i386/networking.sh new file mode 120000 index 000000000..8b49862eb --- /dev/null +++ b/definitions/ubuntu-13.04-i386/networking.sh @@ -0,0 +1 @@ +../.ubuntu/networking.sh \ No newline at end of file diff --git a/definitions/ubuntu-13.04-i386/preseed.cfg b/definitions/ubuntu-13.04-i386/preseed.cfg new file mode 120000 index 000000000..0aca6daae --- /dev/null +++ b/definitions/ubuntu-13.04-i386/preseed.cfg @@ -0,0 +1 @@ +../.ubuntu/preseed.cfg \ No newline at end of file diff --git a/definitions/ubuntu-13.04-i386/sshd.sh b/definitions/ubuntu-13.04-i386/sshd.sh new file mode 120000 index 000000000..f353f2d00 --- /dev/null +++ b/definitions/ubuntu-13.04-i386/sshd.sh @@ -0,0 +1 @@ +../.common/sshd.sh \ No newline at end of file diff --git a/definitions/ubuntu-13.04-i386/sudoers.sh b/definitions/ubuntu-13.04-i386/sudoers.sh new file mode 100644 index 000000000..5fce3dd2c --- /dev/null +++ b/definitions/ubuntu-13.04-i386/sudoers.sh @@ -0,0 +1,4 @@ +#!/bin/bash -eux + +sed -i -e '/Defaults\s\+env_reset/a Defaults\texempt_group=sudo' /etc/sudoers +sed -i -e 's/%sudo ALL=(ALL:ALL) ALL/%sudo ALL=NOPASSWD:ALL/g' /etc/sudoers diff --git a/definitions/ubuntu-13.04-i386/update.sh b/definitions/ubuntu-13.04-i386/update.sh new file mode 120000 index 000000000..20b3a9ab6 --- /dev/null +++ b/definitions/ubuntu-13.04-i386/update.sh @@ -0,0 +1 @@ +../.ubuntu/update.sh \ No newline at end of file diff --git a/definitions/ubuntu-13.04-i386/vagrant.sh b/definitions/ubuntu-13.04-i386/vagrant.sh new file mode 120000 index 000000000..702949639 --- /dev/null +++ b/definitions/ubuntu-13.04-i386/vagrant.sh @@ -0,0 +1 @@ +../.common/vagrant.sh \ No newline at end of file diff --git a/definitions/ubuntu-13.04/cleanup.sh b/definitions/ubuntu-13.04/cleanup.sh new file mode 120000 index 000000000..e5858f10d --- /dev/null +++ b/definitions/ubuntu-13.04/cleanup.sh @@ -0,0 +1 @@ +../.ubuntu/cleanup.sh \ No newline at end of file diff --git a/definitions/ubuntu-13.04/definition.rb b/definitions/ubuntu-13.04/definition.rb new file mode 100644 index 000000000..1bffb1e39 --- /dev/null +++ b/definitions/ubuntu-13.04/definition.rb @@ -0,0 +1,10 @@ +require File.dirname(__FILE__) + "/../.ubuntu/session.rb" + +iso = "ubuntu-13.04-server-amd64.iso" + +session = + UBUNTU_SESSION.merge( :iso_file => iso, + :iso_md5 => "7d335ca541fc4945b674459cde7bffb9", + :iso_src => "http://releases.ubuntu.com/13.04/#{iso}" ) + +Veewee::Session.declare session diff --git a/definitions/ubuntu-13.04/minimize.sh b/definitions/ubuntu-13.04/minimize.sh new file mode 120000 index 000000000..b3632ccbc --- /dev/null +++ b/definitions/ubuntu-13.04/minimize.sh @@ -0,0 +1 @@ +../.common/minimize.sh \ No newline at end of file diff --git a/definitions/ubuntu-13.04/networking.sh b/definitions/ubuntu-13.04/networking.sh new file mode 120000 index 000000000..8b49862eb --- /dev/null +++ b/definitions/ubuntu-13.04/networking.sh @@ -0,0 +1 @@ +../.ubuntu/networking.sh \ No newline at end of file diff --git a/definitions/ubuntu-13.04/preseed.cfg b/definitions/ubuntu-13.04/preseed.cfg new file mode 120000 index 000000000..0aca6daae --- /dev/null +++ b/definitions/ubuntu-13.04/preseed.cfg @@ -0,0 +1 @@ +../.ubuntu/preseed.cfg \ No newline at end of file diff --git a/definitions/ubuntu-13.04/sshd.sh b/definitions/ubuntu-13.04/sshd.sh new file mode 120000 index 000000000..f353f2d00 --- /dev/null +++ b/definitions/ubuntu-13.04/sshd.sh @@ -0,0 +1 @@ +../.common/sshd.sh \ No newline at end of file diff --git a/definitions/ubuntu-13.04/sudoers.sh b/definitions/ubuntu-13.04/sudoers.sh new file mode 100644 index 000000000..5fce3dd2c --- /dev/null +++ b/definitions/ubuntu-13.04/sudoers.sh @@ -0,0 +1,4 @@ +#!/bin/bash -eux + +sed -i -e '/Defaults\s\+env_reset/a Defaults\texempt_group=sudo' /etc/sudoers +sed -i -e 's/%sudo ALL=(ALL:ALL) ALL/%sudo ALL=NOPASSWD:ALL/g' /etc/sudoers diff --git a/definitions/ubuntu-13.04/update.sh b/definitions/ubuntu-13.04/update.sh new file mode 120000 index 000000000..20b3a9ab6 --- /dev/null +++ b/definitions/ubuntu-13.04/update.sh @@ -0,0 +1 @@ +../.ubuntu/update.sh \ No newline at end of file diff --git a/definitions/ubuntu-13.04/vagrant.sh b/definitions/ubuntu-13.04/vagrant.sh new file mode 120000 index 000000000..702949639 --- /dev/null +++ b/definitions/ubuntu-13.04/vagrant.sh @@ -0,0 +1 @@ +../.common/vagrant.sh \ No newline at end of file From bd46551571aa1b7abc52b52ca951ac52e75daefa Mon Sep 17 00:00:00 2001 From: "Julian C. Dunn" <jdunn@opscode.com> Date: Mon, 13 May 2013 14:02:55 -0400 Subject: [PATCH 0033/1622] Upgrade to veewee that has hooks (we may use them) @WinRb vagrant-windows 1.0.x is released; no need to depend on @sneal's fork --- Gemfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Gemfile b/Gemfile index 1eb8eab88..4036627b8 100644 --- a/Gemfile +++ b/Gemfile @@ -1,7 +1,7 @@ source "https://rubygems.org" gem "vagrant", :git => 'https://github.com/mitchellh/vagrant.git', :tag => 'v1.2.2' -gem "veewee", :git => 'https://github.com/jedi4ever/veewee.git', :ref => '164a10dd24' -gem "vagrant-windows", :git => 'https://github.com/sneal/vagrant-windows.git', :branch => 'vagrant-1.1-plugin-architecture-vbox4.1' # mainline vagrant-windows isn't working yet with Vagrant 1.1 +gem "veewee", :git => 'https://github.com/jedi4ever/veewee.git', :ref => '4e5d50de' +gem "vagrant-windows", "~> 1.0.0" # still not working with Vagrant 1.2 btw gem "em-winrm" # for windows! gem "rake" From 786d82b4c6110d6a0e74dd7b3431195240d89438 Mon Sep 17 00:00:00 2001 From: "Julian C. Dunn" <jdunn@opscode.com> Date: Tue, 14 May 2013 23:39:40 -0400 Subject: [PATCH 0034/1622] [BENTO-36] Fix manual prompting for "Configure the Keyboard" --- definitions/.debian/session.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/definitions/.debian/session.rb b/definitions/.debian/session.rb index 80306953e..3ea5ac0e7 100644 --- a/definitions/.debian/session.rb +++ b/definitions/.debian/session.rb @@ -10,6 +10,7 @@ 'auto ', 'locale=en_US ', 'kbd-chooser/method=us ', + 'keyboard-configuration/xkb-keymap=us ', 'netcfg/get_hostname=%NAME% ', 'netcfg/get_domain=vagrantup.com ', 'fb=false ', From 65ee2abaa52f9fcc6d579b14b1602b8345929059 Mon Sep 17 00:00:00 2001 From: "Julian C. Dunn" <jdunn@opscode.com> Date: Wed, 15 May 2013 14:54:09 -0400 Subject: [PATCH 0035/1622] [BENTO-36] Fix remaining manual prompts in auto-install. Suppress Debian's own Virtualbox extensions from being installed in the bento box. Switch to mirrors.kernel.org; the main Debian site doesn't seem to be the most reliable and causes builds to fail. --- definitions/.debian/preseed.cfg | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/definitions/.debian/preseed.cfg b/definitions/.debian/preseed.cfg index e083ee32b..84314f3d9 100644 --- a/definitions/.debian/preseed.cfg +++ b/definitions/.debian/preseed.cfg @@ -1,4 +1,3 @@ -choose-mirror-bin mirror/http/proxy string d-i base-installer/kernel/override-image string linux-server d-i clock-setup/utc boolean true d-i clock-setup/utc-auto boolean true @@ -7,7 +6,7 @@ d-i grub-installer/only_debian boolean true d-i grub-installer/with_other_os boolean true d-i mirror/country string manual d-i mirror/http/directory string /debian -d-i mirror/http/hostname string http.us.debian.org +d-i mirror/http/hostname string mirrors.kernel.org d-i mirror/http/proxy string d-i partman-auto-lvm/guided_size string max d-i partman-auto/choose_recipe select atomic @@ -32,8 +31,14 @@ d-i pkgsel/include string openssh-server sudo bzip2 acpid cryptsetup zlib1g-dev d-i pkgsel/install-language-support boolean false d-i pkgsel/update-policy select unattended-upgrades d-i pkgsel/upgrade select full-upgrade +# Prevent packaged version of VirtualBox Guest Additions being installed: +d-i preseed/early_command string sed -i \ + '/in-target/idiscover(){/sbin/discover|grep -v VirtualBox;}' \ + /usr/lib/pre-pkgsel.d/20install-hwpackages d-i time/zone string UTC d-i user-setup/allow-password-weak boolean true d-i user-setup/encrypt-home boolean false +apt-cdrom-setup apt-setup/cdrom/set-first boolean false +apt-mirror-setup apt-setup/use_mirror boolean true popularity-contest popularity-contest/participate boolean false tasksel tasksel/first multiselect standard, ubuntu-server From 801c3b08fe9263fdbdae3c35c5b36057622a6488 Mon Sep 17 00:00:00 2001 From: "Julian C. Dunn" <jdunn@opscode.com> Date: Wed, 15 May 2013 15:14:54 -0400 Subject: [PATCH 0036/1622] [BENTO-36] Debian boxes need 'make' and 'dkms' for the VirtualBox Guest Extensions compile to work properly. --- definitions/.debian/preseed.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/definitions/.debian/preseed.cfg b/definitions/.debian/preseed.cfg index 84314f3d9..4f17f1c04 100644 --- a/definitions/.debian/preseed.cfg +++ b/definitions/.debian/preseed.cfg @@ -27,7 +27,7 @@ d-i passwd/user-uid string 900 d-i passwd/user-password password vagrant d-i passwd/user-password-again password vagrant d-i passwd/username string vagrant -d-i pkgsel/include string openssh-server sudo bzip2 acpid cryptsetup zlib1g-dev wget curl +d-i pkgsel/include string openssh-server sudo bzip2 acpid cryptsetup zlib1g-dev wget curl dkms make d-i pkgsel/install-language-support boolean false d-i pkgsel/update-policy select unattended-upgrades d-i pkgsel/upgrade select full-upgrade From b506120e1b827ff9c64ad90bf5e104ff48c00cef Mon Sep 17 00:00:00 2001 From: "Julian C. Dunn" <jdunn@opscode.com> Date: Thu, 16 May 2013 21:12:50 -0400 Subject: [PATCH 0037/1622] [BENTO-19] Use the VirtualBox ISO that veewee attaches to the machine, rather than wgetting it. Also, retrieve the vagrant key over https. --- definitions/.common/vagrant.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/definitions/.common/vagrant.sh b/definitions/.common/vagrant.sh index 9368ef636..796329544 100644 --- a/definitions/.common/vagrant.sh +++ b/definitions/.common/vagrant.sh @@ -2,7 +2,6 @@ mkdir /tmp/vbox VER=$(cat /home/vagrant/.vbox_version) -wget http://download.virtualbox.org/virtualbox/$VER/VBoxGuestAdditions_$VER.iso mount -o loop VBoxGuestAdditions_$VER.iso /tmp/vbox sh /tmp/vbox/VBoxLinuxAdditions.run umount /tmp/vbox @@ -11,7 +10,7 @@ rm *.iso mkdir /home/vagrant/.ssh wget --no-check-certificate \ - 'http://github.com/mitchellh/vagrant/raw/master/keys/vagrant.pub' \ + 'https://github.com/mitchellh/vagrant/raw/master/keys/vagrant.pub' \ -O /home/vagrant/.ssh/authorized_keys chown -R vagrant /home/vagrant/.ssh chmod -R go-rwsx /home/vagrant/.ssh From 545493d1fd3823e7429df297ed7806b92647300a Mon Sep 17 00:00:00 2001 From: Lew Goettner <lew@goettner.net> Date: Fri, 17 May 2013 20:47:39 -0400 Subject: [PATCH 0038/1622] [BENTO-41] Check to see if you're on VirtualBox Because vagrant is now multi-provider, you might not want these installed. --- definitions/.common/vagrant.sh | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/definitions/.common/vagrant.sh b/definitions/.common/vagrant.sh index 9368ef636..ae70a2fff 100644 --- a/definitions/.common/vagrant.sh +++ b/definitions/.common/vagrant.sh @@ -1,13 +1,15 @@ #!/bin/bash -eux -mkdir /tmp/vbox -VER=$(cat /home/vagrant/.vbox_version) -wget http://download.virtualbox.org/virtualbox/$VER/VBoxGuestAdditions_$VER.iso -mount -o loop VBoxGuestAdditions_$VER.iso /tmp/vbox -sh /tmp/vbox/VBoxLinuxAdditions.run -umount /tmp/vbox -rmdir /tmp/vbox -rm *.iso +if [ -f /home/vagrant/.vbox_version ]; then + mkdir /tmp/vbox + VER=$(cat /home/vagrant/.vbox_version) + wget http://download.virtualbox.org/virtualbox/$VER/VBoxGuestAdditions_$VER.iso + mount -o loop VBoxGuestAdditions_$VER.iso /tmp/vbox + sh /tmp/vbox/VBoxLinuxAdditions.run + umount /tmp/vbox + rmdir /tmp/vbox + rm *.iso +fi mkdir /home/vagrant/.ssh wget --no-check-certificate \ From 6ae7bb712fbecff562f476c7ff072b032db9866b Mon Sep 17 00:00:00 2001 From: "Julian C. Dunn" <jdunn@opscode.com> Date: Mon, 20 May 2013 22:00:33 -0500 Subject: [PATCH 0039/1622] Fix PR#33 - CentOS 5.8 is in the vault now. Thanks @someara. --- definitions/centos-5.8-i386/definition.rb | 2 +- definitions/centos-5.8/definition.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/definitions/centos-5.8-i386/definition.rb b/definitions/centos-5.8-i386/definition.rb index f0bd51278..6eb7161e8 100644 --- a/definitions/centos-5.8-i386/definition.rb +++ b/definitions/centos-5.8-i386/definition.rb @@ -6,6 +6,6 @@ CENTOS_SESSION.merge({ :os_type_id => 'Centos', :iso_file => iso, :iso_md5 => "0fdd45c43b5d8fb9e05f4255c5855f9c", - :iso_src => "http://mirror.stanford.edu/yum/pub/centos/5.8/isos/i386/#{iso}" }) + :iso_src => "http://vault.centos.org/5.8/isos/i386/#{iso}" }) Veewee::Session.declare session diff --git a/definitions/centos-5.8/definition.rb b/definitions/centos-5.8/definition.rb index 19eb69ab9..d8ad63d63 100644 --- a/definitions/centos-5.8/definition.rb +++ b/definitions/centos-5.8/definition.rb @@ -5,6 +5,6 @@ session = CENTOS_SESSION.merge({ :iso_file => iso, :iso_md5 => "8a3bf0030f192022943f83fe6b2cf373", - :iso_src => "http://mirror.stanford.edu/yum/pub/centos/5.8/isos/x86_64/#{iso}" }) + :iso_src => "http://vault.centos.org/5.8/isos/x86_64/#{iso}" }) Veewee::Session.declare session From 3c24176eb25e6766cead84a0b69d69210f303c90 Mon Sep 17 00:00:00 2001 From: Lew Goettner <lew@goettner.net> Date: Tue, 21 May 2013 14:11:51 -0400 Subject: [PATCH 0040/1622] [BENTO-45] Install vmware tools if on fusion provider. --- definitions/.common/vagrant.sh | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/definitions/.common/vagrant.sh b/definitions/.common/vagrant.sh index ae70a2fff..af1758645 100644 --- a/definitions/.common/vagrant.sh +++ b/definitions/.common/vagrant.sh @@ -11,6 +11,21 @@ if [ -f /home/vagrant/.vbox_version ]; then rm *.iso fi +if [ -f /home/vagrant/.vmfusion_version ]; then + #Set Linux-specific paths and ISO filename + home_dir="/home/vagrant" + iso_name="linux.iso" + mount_point="/tmp/vmware-tools" + #Run install, unmount ISO and remove it + mkdir ${mount_point} + cd ${home_dir} + /bin/mount -o loop ${iso_name} ${mount_point} + tar zxf ${mount_point}/*.tar.gz && cd vmware-tools-distrib && ./vmware-install.pl --default + /bin/umount ${mount_point} + /bin/rm -rf ${home_dir}/${iso_name} ${home_dir}/vmware-tools-distrib + rmdir ${mount_point} +fi + mkdir /home/vagrant/.ssh wget --no-check-certificate \ 'http://github.com/mitchellh/vagrant/raw/master/keys/vagrant.pub' \ From e849ca27e45ff7c108c0e7072feb670e45a57c51 Mon Sep 17 00:00:00 2001 From: Lew Goettner <lew@goettner.net> Date: Tue, 21 May 2013 15:05:37 -0400 Subject: [PATCH 0041/1622] [BENTO-46] Update the centos-6.4 definition to use the common components. --- definitions/centos-6.4/chef-client.sh | 3 -- definitions/centos-6.4/cleanup.sh | 6 +--- definitions/centos-6.4/ks.cfg | 40 +-------------------------- definitions/centos-6.4/minimize.sh | 5 +--- definitions/centos-6.4/vagrant.sh | 18 +----------- 5 files changed, 4 insertions(+), 68 deletions(-) delete mode 100644 definitions/centos-6.4/chef-client.sh mode change 100644 => 120000 definitions/centos-6.4/cleanup.sh mode change 100644 => 120000 definitions/centos-6.4/ks.cfg mode change 100644 => 120000 definitions/centos-6.4/minimize.sh mode change 100644 => 120000 definitions/centos-6.4/vagrant.sh diff --git a/definitions/centos-6.4/chef-client.sh b/definitions/centos-6.4/chef-client.sh deleted file mode 100644 index f1f28d4d2..000000000 --- a/definitions/centos-6.4/chef-client.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash -eux - -wget -O - http://opscode.com/chef/install.sh | sudo bash diff --git a/definitions/centos-6.4/cleanup.sh b/definitions/centos-6.4/cleanup.sh deleted file mode 100644 index 922c3d6b5..000000000 --- a/definitions/centos-6.4/cleanup.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/bash -eux -yum -y erase gtk2 libX11 hicolor-icon-theme avahi freetype bitstream-vera-fonts -yum -y clean all -rm -rf VBoxGuestAdditions_*.iso VBoxGuestAdditions_*.iso.? -rm -f /tmp/chef*rpm diff --git a/definitions/centos-6.4/cleanup.sh b/definitions/centos-6.4/cleanup.sh new file mode 120000 index 000000000..4658a8585 --- /dev/null +++ b/definitions/centos-6.4/cleanup.sh @@ -0,0 +1 @@ +../.centos/cleanup.sh \ No newline at end of file diff --git a/definitions/centos-6.4/ks.cfg b/definitions/centos-6.4/ks.cfg deleted file mode 100644 index e00fd5a2a..000000000 --- a/definitions/centos-6.4/ks.cfg +++ /dev/null @@ -1,39 +0,0 @@ -install -cdrom -lang en_US.UTF-8 -keyboard us -network --bootproto=dhcp -rootpw --iscrypted $1$damlkd,f$UC/u5pUts5QiU3ow.CSso/ -firewall --disabled -authconfig --enableshadow --passalgo=sha512 -selinux --disabled -timezone UTC -bootloader --location=mbr -text -skipx -zerombr -clearpart --all --initlabel -autopart -auth --useshadow --enablemd5 -firstboot --disabled -reboot - -%packages --ignoremissing -@Base -@Core -@Development Tools -openssl-devel -readline-devel -zlib-devel -kernel-devel - -%post -# update root certs -wget -O/etc/pki/tls/certs/ca-bundle.crt http://curl.haxx.se/ca/cacert.pem -# vagrant -groupadd vagrant -g 999 -useradd vagrant -g vagrant -G wheel -u 900 -echo "vagrant" | passwd --stdin vagrant -# sudo -echo "vagrant ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers -sed -i "s/^.*requiretty/#Defaults requiretty/" /etc/sudoers diff --git a/definitions/centos-6.4/ks.cfg b/definitions/centos-6.4/ks.cfg new file mode 120000 index 000000000..24af87031 --- /dev/null +++ b/definitions/centos-6.4/ks.cfg @@ -0,0 +1 @@ +../.centos/ks.cfg \ No newline at end of file diff --git a/definitions/centos-6.4/minimize.sh b/definitions/centos-6.4/minimize.sh deleted file mode 100644 index 3846a1d65..000000000 --- a/definitions/centos-6.4/minimize.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash -eux - -dd if=/dev/zero of=/EMPTY bs=1M -rm -f /EMPTY diff --git a/definitions/centos-6.4/minimize.sh b/definitions/centos-6.4/minimize.sh new file mode 120000 index 000000000..b3632ccbc --- /dev/null +++ b/definitions/centos-6.4/minimize.sh @@ -0,0 +1 @@ +../.common/minimize.sh \ No newline at end of file diff --git a/definitions/centos-6.4/vagrant.sh b/definitions/centos-6.4/vagrant.sh deleted file mode 100644 index 9368ef636..000000000 --- a/definitions/centos-6.4/vagrant.sh +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/bash -eux - -mkdir /tmp/vbox -VER=$(cat /home/vagrant/.vbox_version) -wget http://download.virtualbox.org/virtualbox/$VER/VBoxGuestAdditions_$VER.iso -mount -o loop VBoxGuestAdditions_$VER.iso /tmp/vbox -sh /tmp/vbox/VBoxLinuxAdditions.run -umount /tmp/vbox -rmdir /tmp/vbox -rm *.iso - -mkdir /home/vagrant/.ssh -wget --no-check-certificate \ - 'http://github.com/mitchellh/vagrant/raw/master/keys/vagrant.pub' \ - -O /home/vagrant/.ssh/authorized_keys -chown -R vagrant /home/vagrant/.ssh -chmod -R go-rwsx /home/vagrant/.ssh diff --git a/definitions/centos-6.4/vagrant.sh b/definitions/centos-6.4/vagrant.sh new file mode 120000 index 000000000..702949639 --- /dev/null +++ b/definitions/centos-6.4/vagrant.sh @@ -0,0 +1 @@ +../.common/vagrant.sh \ No newline at end of file From 151500a4c3507da77aa957bbace84642fd994f45 Mon Sep 17 00:00:00 2001 From: Lew Goettner <lew@goettner.net> Date: Tue, 21 May 2013 15:08:10 -0400 Subject: [PATCH 0042/1622] [BENTO-46] Update the centos-6.4-i386 definition to use the common components. --- definitions/centos-6.4-i386/chef-client.sh | 3 -- definitions/centos-6.4-i386/cleanup.sh | 6 +--- definitions/centos-6.4-i386/ks.cfg | 40 +--------------------- definitions/centos-6.4-i386/minimize.sh | 5 +-- definitions/centos-6.4-i386/vagrant.sh | 18 +--------- 5 files changed, 4 insertions(+), 68 deletions(-) delete mode 100644 definitions/centos-6.4-i386/chef-client.sh mode change 100644 => 120000 definitions/centos-6.4-i386/cleanup.sh mode change 100644 => 120000 definitions/centos-6.4-i386/ks.cfg mode change 100644 => 120000 definitions/centos-6.4-i386/minimize.sh mode change 100644 => 120000 definitions/centos-6.4-i386/vagrant.sh diff --git a/definitions/centos-6.4-i386/chef-client.sh b/definitions/centos-6.4-i386/chef-client.sh deleted file mode 100644 index f1f28d4d2..000000000 --- a/definitions/centos-6.4-i386/chef-client.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash -eux - -wget -O - http://opscode.com/chef/install.sh | sudo bash diff --git a/definitions/centos-6.4-i386/cleanup.sh b/definitions/centos-6.4-i386/cleanup.sh deleted file mode 100644 index 922c3d6b5..000000000 --- a/definitions/centos-6.4-i386/cleanup.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/bash -eux -yum -y erase gtk2 libX11 hicolor-icon-theme avahi freetype bitstream-vera-fonts -yum -y clean all -rm -rf VBoxGuestAdditions_*.iso VBoxGuestAdditions_*.iso.? -rm -f /tmp/chef*rpm diff --git a/definitions/centos-6.4-i386/cleanup.sh b/definitions/centos-6.4-i386/cleanup.sh new file mode 120000 index 000000000..4658a8585 --- /dev/null +++ b/definitions/centos-6.4-i386/cleanup.sh @@ -0,0 +1 @@ +../.centos/cleanup.sh \ No newline at end of file diff --git a/definitions/centos-6.4-i386/ks.cfg b/definitions/centos-6.4-i386/ks.cfg deleted file mode 100644 index e00fd5a2a..000000000 --- a/definitions/centos-6.4-i386/ks.cfg +++ /dev/null @@ -1,39 +0,0 @@ -install -cdrom -lang en_US.UTF-8 -keyboard us -network --bootproto=dhcp -rootpw --iscrypted $1$damlkd,f$UC/u5pUts5QiU3ow.CSso/ -firewall --disabled -authconfig --enableshadow --passalgo=sha512 -selinux --disabled -timezone UTC -bootloader --location=mbr -text -skipx -zerombr -clearpart --all --initlabel -autopart -auth --useshadow --enablemd5 -firstboot --disabled -reboot - -%packages --ignoremissing -@Base -@Core -@Development Tools -openssl-devel -readline-devel -zlib-devel -kernel-devel - -%post -# update root certs -wget -O/etc/pki/tls/certs/ca-bundle.crt http://curl.haxx.se/ca/cacert.pem -# vagrant -groupadd vagrant -g 999 -useradd vagrant -g vagrant -G wheel -u 900 -echo "vagrant" | passwd --stdin vagrant -# sudo -echo "vagrant ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers -sed -i "s/^.*requiretty/#Defaults requiretty/" /etc/sudoers diff --git a/definitions/centos-6.4-i386/ks.cfg b/definitions/centos-6.4-i386/ks.cfg new file mode 120000 index 000000000..24af87031 --- /dev/null +++ b/definitions/centos-6.4-i386/ks.cfg @@ -0,0 +1 @@ +../.centos/ks.cfg \ No newline at end of file diff --git a/definitions/centos-6.4-i386/minimize.sh b/definitions/centos-6.4-i386/minimize.sh deleted file mode 100644 index 3846a1d65..000000000 --- a/definitions/centos-6.4-i386/minimize.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash -eux - -dd if=/dev/zero of=/EMPTY bs=1M -rm -f /EMPTY diff --git a/definitions/centos-6.4-i386/minimize.sh b/definitions/centos-6.4-i386/minimize.sh new file mode 120000 index 000000000..b3632ccbc --- /dev/null +++ b/definitions/centos-6.4-i386/minimize.sh @@ -0,0 +1 @@ +../.common/minimize.sh \ No newline at end of file diff --git a/definitions/centos-6.4-i386/vagrant.sh b/definitions/centos-6.4-i386/vagrant.sh deleted file mode 100644 index 9368ef636..000000000 --- a/definitions/centos-6.4-i386/vagrant.sh +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/bash -eux - -mkdir /tmp/vbox -VER=$(cat /home/vagrant/.vbox_version) -wget http://download.virtualbox.org/virtualbox/$VER/VBoxGuestAdditions_$VER.iso -mount -o loop VBoxGuestAdditions_$VER.iso /tmp/vbox -sh /tmp/vbox/VBoxLinuxAdditions.run -umount /tmp/vbox -rmdir /tmp/vbox -rm *.iso - -mkdir /home/vagrant/.ssh -wget --no-check-certificate \ - 'http://github.com/mitchellh/vagrant/raw/master/keys/vagrant.pub' \ - -O /home/vagrant/.ssh/authorized_keys -chown -R vagrant /home/vagrant/.ssh -chmod -R go-rwsx /home/vagrant/.ssh diff --git a/definitions/centos-6.4-i386/vagrant.sh b/definitions/centos-6.4-i386/vagrant.sh new file mode 120000 index 000000000..702949639 --- /dev/null +++ b/definitions/centos-6.4-i386/vagrant.sh @@ -0,0 +1 @@ +../.common/vagrant.sh \ No newline at end of file From 1531b95f1a5d7d853c7d92dfd62553dcf4deb78d Mon Sep 17 00:00:00 2001 From: "Julian C. Dunn" <jdunn@opscode.com> Date: Thu, 16 May 2013 21:12:50 -0400 Subject: [PATCH 0043/1622] [BENTO-19] Use the VirtualBox ISO that veewee attaches to the machine, rather than wgetting it. Also, retrieve the vagrant key over https. --- definitions/.common/vagrant.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/definitions/.common/vagrant.sh b/definitions/.common/vagrant.sh index ae70a2fff..88cea2d71 100644 --- a/definitions/.common/vagrant.sh +++ b/definitions/.common/vagrant.sh @@ -3,7 +3,6 @@ if [ -f /home/vagrant/.vbox_version ]; then mkdir /tmp/vbox VER=$(cat /home/vagrant/.vbox_version) - wget http://download.virtualbox.org/virtualbox/$VER/VBoxGuestAdditions_$VER.iso mount -o loop VBoxGuestAdditions_$VER.iso /tmp/vbox sh /tmp/vbox/VBoxLinuxAdditions.run umount /tmp/vbox @@ -13,7 +12,7 @@ fi mkdir /home/vagrant/.ssh wget --no-check-certificate \ - 'http://github.com/mitchellh/vagrant/raw/master/keys/vagrant.pub' \ + 'https://github.com/mitchellh/vagrant/raw/master/keys/vagrant.pub' \ -O /home/vagrant/.ssh/authorized_keys chown -R vagrant /home/vagrant/.ssh chmod -R go-rwsx /home/vagrant/.ssh From 8d069ead2fb687f2ed44275de4d5f9ae884c2bc6 Mon Sep 17 00:00:00 2001 From: "Julian C. Dunn" <jdunn@opscode.com> Date: Wed, 15 May 2013 15:32:08 -0400 Subject: [PATCH 0044/1622] Fix merge conflict --- definitions/.debian/preseed.cfg | 3 +++ 1 file changed, 3 insertions(+) diff --git a/definitions/.debian/preseed.cfg b/definitions/.debian/preseed.cfg index 4f17f1c04..820f090c5 100644 --- a/definitions/.debian/preseed.cfg +++ b/definitions/.debian/preseed.cfg @@ -1,9 +1,12 @@ +choose-mirror-bin mirror/http/proxy string +d-i apt-setup/use_mirror boolean true d-i base-installer/kernel/override-image string linux-server d-i clock-setup/utc boolean true d-i clock-setup/utc-auto boolean true d-i finish-install/reboot_in_progress note d-i grub-installer/only_debian boolean true d-i grub-installer/with_other_os boolean true +d-i keymap select us d-i mirror/country string manual d-i mirror/http/directory string /debian d-i mirror/http/hostname string mirrors.kernel.org From 9eaa4e5964bb0e7e8c7a19d2211df53f3b1dab81 Mon Sep 17 00:00:00 2001 From: "Julian C. Dunn" <jdunn@opscode.com> Date: Wed, 15 May 2013 15:32:08 -0400 Subject: [PATCH 0045/1622] Fix merge conflict --- definitions/.debian/preseed.cfg | 3 +++ 1 file changed, 3 insertions(+) diff --git a/definitions/.debian/preseed.cfg b/definitions/.debian/preseed.cfg index 4f17f1c04..820f090c5 100644 --- a/definitions/.debian/preseed.cfg +++ b/definitions/.debian/preseed.cfg @@ -1,9 +1,12 @@ +choose-mirror-bin mirror/http/proxy string +d-i apt-setup/use_mirror boolean true d-i base-installer/kernel/override-image string linux-server d-i clock-setup/utc boolean true d-i clock-setup/utc-auto boolean true d-i finish-install/reboot_in_progress note d-i grub-installer/only_debian boolean true d-i grub-installer/with_other_os boolean true +d-i keymap select us d-i mirror/country string manual d-i mirror/http/directory string /debian d-i mirror/http/hostname string mirrors.kernel.org From 865833c14816e5ff6c00022dd49bfe80dbdd02e4 Mon Sep 17 00:00:00 2001 From: "Julian C. Dunn" <jdunn@opscode.com> Date: Wed, 15 May 2013 15:32:08 -0400 Subject: [PATCH 0046/1622] Fix merge conflict --- definitions/.debian/preseed.cfg | 3 +++ 1 file changed, 3 insertions(+) diff --git a/definitions/.debian/preseed.cfg b/definitions/.debian/preseed.cfg index 4f17f1c04..820f090c5 100644 --- a/definitions/.debian/preseed.cfg +++ b/definitions/.debian/preseed.cfg @@ -1,9 +1,12 @@ +choose-mirror-bin mirror/http/proxy string +d-i apt-setup/use_mirror boolean true d-i base-installer/kernel/override-image string linux-server d-i clock-setup/utc boolean true d-i clock-setup/utc-auto boolean true d-i finish-install/reboot_in_progress note d-i grub-installer/only_debian boolean true d-i grub-installer/with_other_os boolean true +d-i keymap select us d-i mirror/country string manual d-i mirror/http/directory string /debian d-i mirror/http/hostname string mirrors.kernel.org From 5e0f2143879dc159b0227da7c9a89ac5edf08c4d Mon Sep 17 00:00:00 2001 From: "Julian C. Dunn" <jdunn@opscode.com> Date: Wed, 22 May 2013 17:33:26 -0500 Subject: [PATCH 0047/1622] Fix Gemfile and Gemfile.lock --- Gemfile | 2 +- Gemfile.lock | 31 ++++++++++++------------------- 2 files changed, 13 insertions(+), 20 deletions(-) diff --git a/Gemfile b/Gemfile index 4036627b8..689833d52 100644 --- a/Gemfile +++ b/Gemfile @@ -1,7 +1,7 @@ source "https://rubygems.org" gem "vagrant", :git => 'https://github.com/mitchellh/vagrant.git', :tag => 'v1.2.2' -gem "veewee", :git => 'https://github.com/jedi4ever/veewee.git', :ref => '4e5d50de' +gem "veewee", :git => 'https://github.com/jedi4ever/veewee.git', :ref => '4e5d50de48' gem "vagrant-windows", "~> 1.0.0" # still not working with Vagrant 1.2 btw gem "em-winrm" # for windows! gem "rake" diff --git a/Gemfile.lock b/Gemfile.lock index 8664c621d..21d514cfe 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,7 +1,7 @@ GIT remote: https://github.com/jedi4ever/veewee.git - revision: 164a10dd246ed67c0a9a655b915eb0c1d6144203 - ref: 164a10dd24 + revision: 4e5d50de4866472bd3e7060157ac573457196760 + ref: 4e5d50de48 specs: veewee (0.3.7) ansi (~> 1.3.0) @@ -32,15 +32,6 @@ GIT net-scp (~> 1.1.0) net-ssh (~> 2.6.6) -GIT - remote: https://github.com/sneal/vagrant-windows.git - revision: fbe11646d674e2ee5253089b958fdc2e573aab78 - branch: vagrant-1.1-plugin-architecture-vbox4.1 - specs: - vagrant-windows (0.2.0) - highline - winrm (~> 1.1.1) - GEM remote: https://rubygems.org/ specs: @@ -55,7 +46,7 @@ GEM builder (3.2.0) childprocess (0.3.9) ffi (~> 1.0, >= 1.0.11) - diff-lcs (1.2.3) + diff-lcs (1.2.4) em-winrm (0.5.4) eventmachine (= 1.0.0.beta.3) mixlib-log (>= 1.3.0) @@ -63,16 +54,16 @@ GEM winrm (~> 1.1.0) erubis (2.7.0) eventmachine (1.0.0.beta.3) - excon (0.20.1) + excon (0.22.1) ffi (1.7.0) fission (0.4.0) CFPropertyList (~> 2.0.17) - fog (1.10.1) + fog (1.11.1) builder excon (~> 0.20) formatador (~> 0.2.0) + json (~> 1.7) mime-types - multi_json (~> 1.0) net-scp (~> 1.1) net-ssh (>= 2.1.3) nokogiri (~> 1.5.0) @@ -86,7 +77,7 @@ GEM ffi (>= 1.0.1) gyoku (1.0.0) builder (>= 2.1.2) - highline (1.6.18) + highline (1.6.19) httpclient (2.2.0.2) httpi (0.9.7) rack @@ -97,9 +88,8 @@ GEM log4r (1.1.10) logging (1.6.2) little-plugger (>= 1.1.3) - mime-types (1.22) + mime-types (1.23) mixlib-log (1.6.0) - multi_json (1.7.2) net-scp (1.1.0) net-ssh (>= 2.6.5) net-ssh (2.6.7) @@ -126,6 +116,9 @@ GEM wasabi (~> 1.0) thor (0.18.1) uuidtools (2.1.3) + vagrant-windows (1.0.1) + highline + winrm (~> 1.1.1) wasabi (1.0.0) nokogiri (>= 1.4.0) winrm (1.1.2) @@ -144,5 +137,5 @@ DEPENDENCIES em-winrm rake vagrant! - vagrant-windows! + vagrant-windows (~> 1.0.0) veewee! From 41c08fbce3b488276945a5f1d43a821fa2f02dee Mon Sep 17 00:00:00 2001 From: "Julian C. Dunn" <jdunn@opscode.com> Date: Thu, 23 May 2013 00:40:06 -0500 Subject: [PATCH 0048/1622] First pass at fixing Windows 2012 definition --- .../windows-2012-standard/Autounattend.xml | 243 +++++++----------- definitions/windows-2012-standard/README.md | 75 ++---- 2 files changed, 110 insertions(+), 208 deletions(-) diff --git a/definitions/windows-2012-standard/Autounattend.xml b/definitions/windows-2012-standard/Autounattend.xml index 6de7ff759..15c79f955 100644 --- a/definitions/windows-2012-standard/Autounattend.xml +++ b/definitions/windows-2012-standard/Autounattend.xml @@ -1,235 +1,166 @@ <?xml version="1.0" encoding="utf-8"?> <unattend xmlns="urn:schemas-microsoft-com:unattend"> - <servicing></servicing> - <settings pass="windowsPE"> - + <component name="Microsoft-Windows-International-Core-WinPE" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <SetupUILanguage> + <UILanguage>en-US</UILanguage> + </SetupUILanguage> + <InputLocale>en-US</InputLocale> + <SystemLocale>en-US</SystemLocale> + <UILanguage>en-US</UILanguage> + <UserLocale>en-US</UserLocale> + </component> <component name="Microsoft-Windows-Setup" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - <DiskConfiguration> <Disk wcm:action="add"> - <CreatePartitions> <CreatePartition wcm:action="add"> <Order>1</Order> - <Type>Primary</Type> <Size>20000</Size> + <Type>Primary</Type> </CreatePartition> </CreatePartitions> - <ModifyPartitions> <ModifyPartition wcm:action="add"> <Extend>false</Extend> <Format>NTFS</Format> + <Label>Windows 2012</Label> <Letter>C</Letter> <Order>1</Order> <PartitionID>1</PartitionID> - <Label>Windows 2012</Label> </ModifyPartition> </ModifyPartitions> - <DiskID>0</DiskID> <WillWipeDisk>true</WillWipeDisk> - </Disk> - <WillShowUI>OnError</WillShowUI> </DiskConfiguration> - - <UserData> - <!-- Product Key from http://technet.microsoft.com/en-us/library/ff793406.aspx --> - <ProductKey>YC6KT-GKW9T-YTKYR-T4X34-R7VHC - <WillShowUI>Never</WillShowUI> - </ProductKey> - - <AcceptEula>true</AcceptEula> - <FullName>Vagrant Fullname</FullName> - <Organization>Vagrant Inc</Organization> - </UserData> - <ImageInstall> <OSImage> - <InstallTo> - <DiskID>0</DiskID> - <PartitionID>1</PartitionID> - </InstallTo> - <WillShowUI>OnError</WillShowUI> - <InstallToAvailablePartition>false</InstallToAvailablePartition> <InstallFrom> <MetaData wcm:action="add"> <Key>/IMAGE/NAME</Key> <Value>Windows Server 2012 SERVERSTANDARD</Value> </MetaData> </InstallFrom> + <InstallTo> + <DiskID>0</DiskID> + <PartitionID>1</PartitionID> + </InstallTo> </OSImage> </ImageInstall> - + <UserData> + <ProductKey> + <Key>XC9B7-NBPP2-83J2H-RHMBY-92BT4</Key> + </ProductKey> + <AcceptEula>true</AcceptEula> + <FullName>Vagrant</FullName> + <Organization>Vagrant</Organization> + </UserData> </component> - - <component name="Microsoft-Windows-International-Core-WinPE" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - <SetupUILanguage> - <UILanguage>en-US</UILanguage> - </SetupUILanguage> - <InputLocale>en-US</InputLocale> - <SystemLocale>en-US</SystemLocale> - <UILanguage>en-US</UILanguage> - <UILanguageFallback>en-US</UILanguageFallback> - <UserLocale>en-US</UserLocale> + </settings> + <settings pass="specialize"> + <component name="Microsoft-Windows-Shell-Setup" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <AutoLogon> + <Password> + <Value>dgBhAGcAcgBhAG4AdABQAGEAcwBzAHcAbwByAGQA</Value> + <PlainText>false</PlainText> + </Password> + <Enabled>true</Enabled> + <Username>Administrator</Username> + </AutoLogon> + <ComputerName>vagrant-2012</ComputerName> + <RegisteredOrganization>Vagrant</RegisteredOrganization> + <RegisteredOwner>Vagrant</RegisteredOwner> + <TimeZone>UTC</TimeZone> + <ProductKey>XC9B7-NBPP2-83J2H-RHMBY-92BT4</ProductKey> + </component> + <component name="Microsoft-Windows-Security-SPP-UX" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <SkipAutoActivation>true</SkipAutoActivation> </component> </settings> - - <settings pass="oobeSystem"> <component name="Microsoft-Windows-Shell-Setup" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - <UserAccounts> - <AdministratorPassword> - <Value>vagrant</Value> - <PlainText>true</PlainText> - </AdministratorPassword> - <LocalAccounts> - <LocalAccount wcm:action="add"> - <Password> - <Value>vagrant</Value> - <PlainText>true</PlainText> - </Password> - <Description>Vagrant User</Description> - <DisplayName>vagrant</DisplayName> - <Group>administrators</Group> - <Name>vagrant</Name> - </LocalAccount> - </LocalAccounts> - </UserAccounts> - <OOBE> - <HideEULAPage>true</HideEULAPage> - <HideWirelessSetupInOOBE>true</HideWirelessSetupInOOBE> - <NetworkLocation>Home</NetworkLocation> - <ProtectYourPC>1</ProtectYourPC> - <HideOnlineAccountScreens>true</HideOnlineAccountScreens> - <HideLocalAccountScreen>true</HideLocalAccountScreen> - <SkipUserOOBE>true</SkipUserOOBE> - <HideOEMRegistrationScreen>true</HideOEMRegistrationScreen> - </OOBE> <AutoLogon> <Password> - <Value>vagrant</Value> - <PlainText>true</PlainText> + <Value>dgBhAGcAcgBhAG4AdABQAGEAcwBzAHcAbwByAGQA</Value> + <PlainText>false</PlainText> </Password> - <Username>administrator</Username> <Enabled>true</Enabled> + <Username>Administrator</Username> </AutoLogon> <FirstLogonCommands> - <!-- <SynchronousCommand wcm:action="add"> --> - <!-- <CommandLine>cmd.exe /c a:install-cygwin-sshd.bat</CommandLine> --> - <!-- <Description>Install Cygwin SSH</Description> --> - <!-- <Order>1</Order> --> - <!-- <RequiresUserInput>true</RequiresUserInput> --> - <!-- </SynchronousCommand> --> - <!-- <SynchronousCommand wcm:action="add"> --> - <!-- <CommandLine>cmd.exe /c a:install-winrm.bat</CommandLine> --> - <!-- <Description>Install Win RM</Description> --> - <!-- <Order>2</Order> --> - <!-- <RequiresUserInput>true</RequiresUserInput> --> - <!-- </SynchronousCommand> --> <SynchronousCommand wcm:action="add"> - <CommandLine>cmd.exe /c winrm quickconfig -q</CommandLine> - <Description>winrm quickconfig -q</Description> <Order>1</Order> <RequiresUserInput>true</RequiresUserInput> + <CommandLine>cmd.exe /c winrm quickconfig -q</CommandLine> + <Description>winrm quickconfig -q</Description> </SynchronousCommand> <SynchronousCommand wcm:action="add"> - <CommandLine>cmd.exe /c winrm quickconfig -transport:http</CommandLine> - <Description>winrm quickconfig -transport:http</Description> <Order>2</Order> + <CommandLine>cmd.exe /c winrm set winrm/config/winrs '@{MaxMemoryPerShellMB="300"}'</CommandLine> <RequiresUserInput>true</RequiresUserInput> + <Description>winrm memory</Description> </SynchronousCommand> <SynchronousCommand wcm:action="add"> - <CommandLine>cmd.exe /c winrm set winrm/config @{MaxTimeoutms="1800000"}</CommandLine> - <Description>Win RM MaxTimoutms</Description> + <CommandLine>cmd.exe /c winrm set winrm/config '@{MaxTimeoutms="1800000"}'</CommandLine> + <Description>winrm timeout</Description> <Order>3</Order> <RequiresUserInput>true</RequiresUserInput> </SynchronousCommand> <SynchronousCommand wcm:action="add"> - <CommandLine>cmd.exe /c winrm set winrm/config/winrs @{MaxMemoryPerShellMB="300"}</CommandLine> - <Description>Win RM MaxMemoryPerShellMB</Description> + <CommandLine>cmd.exe /c winrm set winrm/config/service '@{AllowUnencrypted="true"}'</CommandLine> + <Description>winrm encryption</Description> <Order>4</Order> <RequiresUserInput>true</RequiresUserInput> </SynchronousCommand> <SynchronousCommand wcm:action="add"> - <CommandLine>cmd.exe /c winrm set winrm/config/service @{AllowUnencrypted="true"}</CommandLine> - <Description>Win RM AllowUnencrypted</Description> + <CommandLine>winrm set winrm/config/service/auth '@{Basic="true"}'</CommandLine> + <Description>winrm basic auth</Description> <Order>5</Order> <RequiresUserInput>true</RequiresUserInput> </SynchronousCommand> <SynchronousCommand wcm:action="add"> - <CommandLine>cmd.exe /c winrm set winrm/config/service/auth @{Basic="true"}</CommandLine> - <Description>Win RM auth Basic</Description> + <CommandLine>cmd.exe /c netsh advfirewall firewall set rule name="Windows Remote Management (HTTP-In)" profile=public protocol=tcp localport=5985 remoteip=localsubnet new remoteip=any</CommandLine> + <Description>winrm firewall</Description> <Order>6</Order> <RequiresUserInput>true</RequiresUserInput> </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <CommandLine>cmd.exe /c winrm set winrm/config/client/auth @{Basic="true"}</CommandLine> - <Description>Win RM auth Basic</Description> - <Order>7</Order> - <RequiresUserInput>true</RequiresUserInput> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <CommandLine>cmd.exe /c winrm set winrm/config/listener?Address=*+Transport=HTTP @{Port="5985"} </CommandLine> - <Description>Win RM listener Address/Port</Description> - <Order>8</Order> - <RequiresUserInput>true</RequiresUserInput> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <CommandLine>cmd.exe /c netsh advfirewall firewall set rule group="remote administration" new enable=yes </CommandLine> - <Description>Win RM adv firewall enable</Description> - <Order>9</Order> - <RequiresUserInput>true</RequiresUserInput> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <CommandLine>cmd.exe /c netsh firewall add portopening TCP 5985 "Port 5985" </CommandLine> - <Description>Win RM port open</Description> - <Order>10</Order> - <RequiresUserInput>true</RequiresUserInput> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <CommandLine>cmd.exe /c net stop winrm </CommandLine> - <Description>Stop Win RM Service </Description> - <Order>11</Order> - <RequiresUserInput>true</RequiresUserInput> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <CommandLine>cmd.exe /c sc config winrm start= auto</CommandLine> - <Description>Win RM Autostart</Description> - <Order>12</Order> - <RequiresUserInput>true</RequiresUserInput> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <CommandLine>cmd.exe /c net start winrm </CommandLine> - <Description>Start Win RM Service</Description> - <Order>13</Order> - <RequiresUserInput>true</RequiresUserInput> - </SynchronousCommand> <SynchronousCommand wcm:action="add"> <CommandLine>powershell -Command "Set-ExecutionPolicy -ExecutionPolicy RemoteSigned -Force"</CommandLine> - <Description>Start Win RM Service</Description> - <Order>14</Order> + <Description>fix powershell remote exec policy</Description> + <Order>7</Order> <RequiresUserInput>true</RequiresUserInput> </SynchronousCommand> </FirstLogonCommands> + <OOBE> + <HideEULAPage>true</HideEULAPage> + <HideWirelessSetupInOOBE>true</HideWirelessSetupInOOBE> + <NetworkLocation>Home</NetworkLocation> + <ProtectYourPC>1</ProtectYourPC> + <HideOnlineAccountScreens>true</HideOnlineAccountScreens> + <HideOEMRegistrationScreen>true</HideOEMRegistrationScreen> + <HideLocalAccountScreen>true</HideLocalAccountScreen> + </OOBE> + <UserAccounts> + <AdministratorPassword> + <Value>dgBhAGcAcgBhAG4AdABBAGQAbQBpAG4AaQBzAHQAcgBhAHQAbwByAFAAYQBzAHMAdwBvAHIAZAA=</Value> + <PlainText>false</PlainText> + </AdministratorPassword> + <LocalAccounts> + <LocalAccount wcm:action="add"> + <Password> + <Value>dgBhAGcAcgBhAG4AdABQAGEAcwBzAHcAbwByAGQA</Value> + <PlainText>false</PlainText> + </Password> + <Description>Vagrant User</Description> + <DisplayName>vagrant</DisplayName> + <Group>Administrators</Group> + <Name>vagrant</Name> + </LocalAccount> + </LocalAccounts> + </UserAccounts> <ShowWindowsLive>false</ShowWindowsLive> </component> </settings> - <settings pass="specialize"> - <component name="Microsoft-Windows-Shell-Setup" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" > - <OEMInformation> - <HelpCustomized>false</HelpCustomized> - </OEMInformation> - <!-- Rename computer here. --> - <ComputerName>vagrant-2012</ComputerName> - <TimeZone>Pacific Standard Time</TimeZone> - <RegisteredOwner></RegisteredOwner> - </component> - <component name="Microsoft-Windows-Security-SPP-UX" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - <SkipAutoActivation>true</SkipAutoActivation> - </component> - </settings> - <cpi:offlineImage cpi:source="catalog:d:/sources/install_windows server 2008 r2 serverdatacenter.clg" xmlns:cpi="urn:schemas-microsoft-com:cpi" /> + <cpi:offlineImage cpi:source="wim:c:/users/administrator/documents/install.wim#Windows Server 2012 SERVERSTANDARD" xmlns:cpi="urn:schemas-microsoft-com:cpi" /> </unattend> diff --git a/definitions/windows-2012-standard/README.md b/definitions/windows-2012-standard/README.md index be39b6e15..562c739f7 100644 --- a/definitions/windows-2012-standard/README.md +++ b/definitions/windows-2012-standard/README.md @@ -1,86 +1,57 @@ -You can download a free trial of Windows Server 2008 R2 with Service Pack 1 from two different locations manually: +You can download a free trial of Windows Server 2012 from Microsoft: -* url: http://technet.microsoft.com/en-us/evalcenter/dd459137.aspx -* url: http://msdn.microsoft.com/en-us/evalcenter/ee175713.aspx - -But they seem to always generate the same url of http://care.dlservice.microsoft.com//dl/download/7/5/E/75EC4E54-5B02-42D6-8879-D8D3A25FBEF7/7601.17514.101119-1850_x64fre_server_eval_en-us-GRMSXEVAL_EN_DVD.iso - -* 64bit -* filename: 7601.17514.101119-1850_x64fre_server_eval_en-us-GRMSXEVAL_EN_DVD.iso -* md5sum: 4263be2cf3c59177c45085c0a7bc6ca5 +* url: http://technet.microsoft.com/en-us/evalcenter/hh670538.aspx +But they seem to always generate the same URL that's in the definition. If it ever changes, you can update the definition. The installation uses the Standard Windows Unattended installation. The XML file was created using the Windows AIK kit, but the file can also be edited by hand. -To edit the Autounattend.xml and validate it you can download The Windows® Automated Installation Kit (AIK) for Windows® 7: +To edit the Autounattend.xml and validate it you can download The Windows® Automated Deployment Kit (ADK) for Windows® 8. Windows Server 2012 is based off Windows 8. -* url: http://www.microsoft.com/download/en/details.aspx?id=5753 -* file: KB3AIK_EN.iso -* md5sum: 1e73b24a89eceab9d50585b92db5482f +* url: http://www.microsoft.com/en-us/download/details.aspx?id=30652 -AIK also includes dism, which will allow you to choose a specific version: +ADK also includes dism, which will allow you to choose a specific version of Windows 2012 to install. If you want to install a different version, edit Autoattended.xml and replace the /IMAGE/NAME value with -one of the names listed in the 2008r2 install.wim on the install DVD .iso +one of the names listed in the Server 2012 install.wim on the install DVD .iso ```xml <InstallFrom> <MetaData wcm:action="add"> <Key>/IMAGE/NAME</Key> - <Value>Windows Server 2008 R2 SERVERSTANDARD</Value> + <Value>Windows Server 2012 SERVERSTANDARD</Value> </MetaData> </InstallFrom> ``` - ``` -PS C:\Users\Administrator> Dism /Get-WIMInfo /WimFile:d:\sources\install.wim +PS C:\Users\Administrator> Dism /Get-WIMInfo /WimFile:D:\sources\install.wim Deployment Image Servicing and Management tool -Version: 6.1.7600.16385 +Version: 6.2.9200.16384 -Details for image : d:\sources\install.wim +Details for image : D:\sources\install.wim Index : 1 -Name : Windows Server 2008 R2 SERVERSTANDARD -Description : Windows Server 2008 R2 SERVERSTANDARD -Size : 10,510,643,622 bytes +Name : Windows Server 2012 SERVERSTANDARDCORE +Description : Windows Server 2012 SERVERSTANDARDCORE +Size : 7,182,564,199 bytes Index : 2 -Name : Windows Server 2008 R2 SERVERSTANDARDCORE -Description : Windows Server 2008 R2 SERVERSTANDARDCORE -Size : 3,564,132,307 bytes +Name : Windows Server 2012 SERVERSTANDARD +Description : Windows Server 2012 SERVERSTANDARD +Size : 12,002,145,363 bytes Index : 3 -Name : Windows Server 2008 R2 SERVERENTERPRISE -Description : Windows Server 2008 R2 SERVERENTERPRISE -Size : 10,511,024,733 bytes +Name : Windows Server 2012 SERVERDATACENTERCORE +Description : Windows Server 2012 SERVERDATACENTERCORE +Size : 7,177,138,892 bytes Index : 4 -Name : Windows Server 2008 R2 SERVERENTERPRISECORE -Description : Windows Server 2008 R2 SERVERENTERPRISECORE -Size : 3,564,106,331 bytes - -Index : 5 -Name : Windows Server 2008 R2 SERVERDATACENTER -Description : Windows Server 2008 R2 SERVERDATACENTER -Size : 10,511,131,897 bytes - -Index : 6 -Name : Windows Server 2008 R2 SERVERDATACENTERCORE -Description : Windows Server 2008 R2 SERVERDATACENTERCORE -Size : 3,564,144,547 bytes - -Index : 7 -Name : Windows Server 2008 R2 SERVERWEB -Description : Windows Server 2008 R2 SERVERWEB -Size : 10,520,222,743 bytes - -Index : 8 -Name : Windows Server 2008 R2 SERVERWEBCORE -Description : Windows Server 2008 R2 SERVERWEBCORE -Size : 3,562,750,400 bytes +Name : Windows Server 2012 SERVERDATACENTER +Description : Windows Server 2012 SERVERDATACENTER +Size : 11,997,664,663 bytes The operation completed successfully. ``` From 8a122ef90f3c2803082eebbc2e125dc4eef129c8 Mon Sep 17 00:00:00 2001 From: "Julian C. Dunn" <jdunn@opscode.com> Date: Thu, 23 May 2013 09:48:53 -0500 Subject: [PATCH 0049/1622] Fix ProductKey being in the wrong place, leading to 'no images found' error. Fix extra quotes when running winrm commands under cmd.exe --- definitions/windows-2012-standard/Autounattend.xml | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/definitions/windows-2012-standard/Autounattend.xml b/definitions/windows-2012-standard/Autounattend.xml index 15c79f955..9f0ed42f4 100644 --- a/definitions/windows-2012-standard/Autounattend.xml +++ b/definitions/windows-2012-standard/Autounattend.xml @@ -49,9 +49,6 @@ </OSImage> </ImageInstall> <UserData> - <ProductKey> - <Key>XC9B7-NBPP2-83J2H-RHMBY-92BT4</Key> - </ProductKey> <AcceptEula>true</AcceptEula> <FullName>Vagrant</FullName> <Organization>Vagrant</Organization> @@ -97,24 +94,24 @@ </SynchronousCommand> <SynchronousCommand wcm:action="add"> <Order>2</Order> - <CommandLine>cmd.exe /c winrm set winrm/config/winrs '@{MaxMemoryPerShellMB="300"}'</CommandLine> + <CommandLine>cmd.exe /c winrm set winrm/config/winrs @{MaxMemoryPerShellMB="300"}</CommandLine> <RequiresUserInput>true</RequiresUserInput> <Description>winrm memory</Description> </SynchronousCommand> <SynchronousCommand wcm:action="add"> - <CommandLine>cmd.exe /c winrm set winrm/config '@{MaxTimeoutms="1800000"}'</CommandLine> + <CommandLine>cmd.exe /c winrm set winrm/config @{MaxTimeoutms="1800000"}</CommandLine> <Description>winrm timeout</Description> <Order>3</Order> <RequiresUserInput>true</RequiresUserInput> </SynchronousCommand> <SynchronousCommand wcm:action="add"> - <CommandLine>cmd.exe /c winrm set winrm/config/service '@{AllowUnencrypted="true"}'</CommandLine> + <CommandLine>cmd.exe /c winrm set winrm/config/service @{AllowUnencrypted="true"}</CommandLine> <Description>winrm encryption</Description> <Order>4</Order> <RequiresUserInput>true</RequiresUserInput> </SynchronousCommand> <SynchronousCommand wcm:action="add"> - <CommandLine>winrm set winrm/config/service/auth '@{Basic="true"}'</CommandLine> + <CommandLine>winrm set winrm/config/service/auth @{Basic="true"}</CommandLine> <Description>winrm basic auth</Description> <Order>5</Order> <RequiresUserInput>true</RequiresUserInput> From 3d67a0640f11e017483bcfa98379f5c8fb5a5093 Mon Sep 17 00:00:00 2001 From: "Julian C. Dunn" <jdunn@opscode.com> Date: Thu, 30 May 2013 00:51:30 -0400 Subject: [PATCH 0050/1622] Added SUSE Linux Enterprise Server 11 SP2 definitions. Remove legacy ruby.sh --- definitions/.common/ruby.sh | 21 - definitions/.suse/session.rb | 18 + definitions/sles-11-sp2-i386/autoinst.xml | 2567 ++++++++++++++++++++ definitions/sles-11-sp2-i386/cleanup.sh | 9 + definitions/sles-11-sp2-i386/definition.rb | 12 + definitions/sles-11-sp2-i386/minimize.sh | 1 + definitions/sles-11-sp2-i386/sshd.sh | 1 + definitions/sles-11-sp2-i386/vagrant.sh | 1 + definitions/sles-11-sp2/autoinst.xml | 2567 ++++++++++++++++++++ definitions/sles-11-sp2/cleanup.sh | 9 + definitions/sles-11-sp2/definition.rb | 12 + definitions/sles-11-sp2/minimize.sh | 1 + definitions/sles-11-sp2/sshd.sh | 1 + definitions/sles-11-sp2/vagrant.sh | 1 + 14 files changed, 5200 insertions(+), 21 deletions(-) delete mode 100644 definitions/.common/ruby.sh create mode 100644 definitions/.suse/session.rb create mode 100644 definitions/sles-11-sp2-i386/autoinst.xml create mode 100644 definitions/sles-11-sp2-i386/cleanup.sh create mode 100644 definitions/sles-11-sp2-i386/definition.rb create mode 120000 definitions/sles-11-sp2-i386/minimize.sh create mode 120000 definitions/sles-11-sp2-i386/sshd.sh create mode 120000 definitions/sles-11-sp2-i386/vagrant.sh create mode 100644 definitions/sles-11-sp2/autoinst.xml create mode 100644 definitions/sles-11-sp2/cleanup.sh create mode 100644 definitions/sles-11-sp2/definition.rb create mode 120000 definitions/sles-11-sp2/minimize.sh create mode 120000 definitions/sles-11-sp2/sshd.sh create mode 120000 definitions/sles-11-sp2/vagrant.sh diff --git a/definitions/.common/ruby.sh b/definitions/.common/ruby.sh deleted file mode 100644 index 8cc4c4284..000000000 --- a/definitions/.common/ruby.sh +++ /dev/null @@ -1,21 +0,0 @@ -#!/bin/bash -eux - -wget -O- http://pyyaml.org/download/libyaml/yaml-0.1.4.tar.gz | tar oxz -cd yaml* -./configure --prefix=/opt/ruby -make && make install -cd .. -rm -rf *yaml* - -wget -O- http://ftp.ruby-lang.org/pub/ruby/1.9/ruby-1.9.2-p290.tar.gz | tar oxz -cd ruby* -./configure --prefix=/opt/ruby --with-opt-dir=/opt/ruby -make && make install -/opt/ruby/bin/gem update --system -/opt/ruby/bin/gem update -/opt/ruby/bin/gem clean -/opt/ruby/bin/gem install chef puppet --no-rdoc --no-ri -cd .. -rm -rf *ruby* - -echo 'PATH=$PATH:/opt/ruby/bin' > /etc/profile.d/ruby.sh diff --git a/definitions/.suse/session.rb b/definitions/.suse/session.rb new file mode 100644 index 000000000..041649d21 --- /dev/null +++ b/definitions/.suse/session.rb @@ -0,0 +1,18 @@ +require File.dirname(__FILE__) + "/../.common/session.rb" + +SUSE_SESSION = + COMMON_SESSION.merge({ :boot_cmd_sequence => [ + '<Esc><Enter>', + 'linux netdevice=eth0 netsetup=dhcp install=cd:/', + ' lang=en_US autoyast=http://%IP%:%PORT%/autoinst.xml', + ' textmode=1', + '<Enter>' + ], + # in here twice for a reason - YaST2 requests it twice + :kickstart_file => ["autoinst.xml", "autoinst.xml"], + :os_type_id => 'OpenSUSE_64', + :postinstall_files => [ "vagrant.sh", + "sshd.sh", + "cleanup.sh", + "minimize.sh" ], + :shutdown_cmd => "/sbin/halt -h -p" }) diff --git a/definitions/sles-11-sp2-i386/autoinst.xml b/definitions/sles-11-sp2-i386/autoinst.xml new file mode 100644 index 000000000..82aefc696 --- /dev/null +++ b/definitions/sles-11-sp2-i386/autoinst.xml @@ -0,0 +1,2567 @@ +<?xml version="1.0"?> +<!DOCTYPE profile> +<profile xmlns="http://www.suse.com/1.0/yast2ns" xmlns:config="http://www.suse.com/1.0/configns"> + <add-on> + <add_on_products config:type="list"> + <listentry> + <media_url><![CDATA[http://demeter.uni-regensburg.de/SLE11SP2-SDK-x86/DVD1/]]></media_url> + <product>sle-sdk</product> + <product_dir>/</product_dir> + </listentry> + </add_on_products> + </add-on> + <bootloader> + <device_map config:type="list"> + <device_map_entry> + <firmware>hd0</firmware> + <linux>/dev/sda</linux> + </device_map_entry> + </device_map> + <global> + <activate>true</activate> + <boot_root>true</boot_root> + <default>SUSE Linux Enterprise Server 11 SP2 - 3.0.13-0.27</default> + <generic_mbr>true</generic_mbr> + <gfxmenu>/boot/message</gfxmenu> + <lines_cache_id>2</lines_cache_id> + <timeout config:type="integer">8</timeout> + </global> + <initrd_modules config:type="list"> + <initrd_module> + <module>ahci</module> + </initrd_module> + <initrd_module> + <module>ata_piix</module> + </initrd_module> + <initrd_module> + <module>ata_generic</module> + </initrd_module> + <initrd_module> + <module>jbd</module> + </initrd_module> + <initrd_module> + <module>mbcache</module> + </initrd_module> + <initrd_module> + <module>ext3</module> + </initrd_module> + </initrd_modules> + <loader_type>grub</loader_type> + <sections config:type="list"> + <section> + <append>resume=/dev/sda1 splash=silent crashkernel=128M-:64M showopts</append> + <image>(hd0,1)/boot/vmlinuz-3.0.13-0.27-default</image> + <initial>1</initial> + <initrd>(hd0,1)/boot/initrd-3.0.13-0.27-default</initrd> + <lines_cache_id>0</lines_cache_id> + <name>SUSE Linux Enterprise Server 11 SP2 - 3.0.13-0.27</name> + <original_name>linux</original_name> + <root>/dev/sda2</root> + <type>image</type> + <vgamode>0x314</vgamode> + </section> + <section> + <append>showopts ide=nodma apm=off noresume edd=off powersaved=off nohz=off highres=off processor.max_cstate=1 nomodeset x11failsafe</append> + <image>(hd0,1)/boot/vmlinuz-3.0.13-0.27-default</image> + <initrd>(hd0,1)/boot/initrd-3.0.13-0.27-default</initrd> + <lines_cache_id>1</lines_cache_id> + <name>Failsafe -- SUSE Linux Enterprise Server 11 SP2 - 3.0.13-0.27</name> + <original_name>failsafe</original_name> + <root>/dev/sda2</root> + <type>image</type> + <vgamode>0x314</vgamode> + </section> + </sections> + </bootloader> + <ca_mgm> + <CAName>YaST_Default_CA</CAName> + <ca_commonName>YaST Default CA (vagrant-sles-11sp2-x86)</ca_commonName> + <country>US</country> + <locality></locality> + <organisation></organisation> + <organisationUnit></organisationUnit> + <password>ENTER PASSWORD HERE</password> + <server_commonName>vagrant-sles-11sp2-x86.vagrantup.com</server_commonName> + <server_email>postmaster@vagrantup.com</server_email> + <state></state> + <takeLocalServerName config:type="boolean">false</takeLocalServerName> + </ca_mgm> + <deploy_image> + <image_installation config:type="boolean">false</image_installation> + </deploy_image> + <general> + <ask-list config:type="list"/> + <mode> + <confirm config:type="boolean">false</confirm> + </mode> + <mouse> + <id>none</id> + </mouse> + <proposals config:type="list"/> + <signature-handling> + <accept_file_without_checksum config:type="boolean">true</accept_file_without_checksum> + <accept_non_trusted_gpg_key config:type="boolean">true</accept_non_trusted_gpg_key> + <accept_unknown_gpg_key config:type="boolean">true</accept_unknown_gpg_key> + <accept_unsigned_file config:type="boolean">true</accept_unsigned_file> + <accept_verification_failed config:type="boolean">false</accept_verification_failed> + <import_gpg_key config:type="boolean">true</import_gpg_key> + </signature-handling> + <storage/> + </general> + <groups config:type="list"> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>100</gid> + <group_password>x</group_password> + <groupname>users</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>19</gid> + <group_password>x</group_password> + <groupname>floppy</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>1</gid> + <group_password>x</group_password> + <groupname>bin</groupname> + <userlist>daemon</userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>41</gid> + <group_password>x</group_password> + <groupname>xok</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>65533</gid> + <group_password>x</group_password> + <groupname>nobody</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>43</gid> + <group_password>x</group_password> + <groupname>modem</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>5</gid> + <group_password>x</group_password> + <groupname>tty</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>7</gid> + <group_password>x</group_password> + <groupname>lp</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>104</gid> + <group_password>!</group_password> + <groupname>uuidd</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>51</gid> + <group_password>!</group_password> + <groupname>postfix</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>112</gid> + <group_password>!</group_password> + <groupname>gdm</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>65534</gid> + <group_password>x</group_password> + <groupname>nogroup</groupname> + <userlist>nobody</userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>101</gid> + <group_password>!</group_password> + <groupname>messagebus</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>59</gid> + <group_password>!</group_password> + <groupname>maildrop</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>33</gid> + <group_password>x</group_password> + <groupname>video</groupname> + <userlist>vagrant</userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>3</gid> + <group_password>x</group_password> + <groupname>sys</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>15</gid> + <group_password>x</group_password> + <groupname>shadow</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>20</gid> + <group_password>x</group_password> + <groupname>cdrom</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>21</gid> + <group_password>x</group_password> + <groupname>console</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>42</gid> + <group_password>x</group_password> + <groupname>trusted</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>102</gid> + <group_password>!</group_password> + <groupname>haldaemon</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>106</gid> + <group_password>!</group_password> + <groupname>puppet</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>16</gid> + <group_password>x</group_password> + <groupname>dialout</groupname> + <userlist>vagrant</userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>107</gid> + <group_password>!</group_password> + <groupname>polkituser</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>10</gid> + <group_password>x</group_password> + <groupname>wheel</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>109</gid> + <group_password>!</group_password> + <groupname>pulse</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>8</gid> + <group_password>x</group_password> + <groupname>www</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>40</gid> + <group_password>x</group_password> + <groupname>games</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>6</gid> + <group_password>x</group_password> + <groupname>disk</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>17</gid> + <group_password>x</group_password> + <groupname>audio</groupname> + <userlist>pulse</userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>111</gid> + <group_password>!</group_password> + <groupname>suse-ncc</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>49</gid> + <group_password>x</group_password> + <groupname>ftp</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>103</gid> + <group_password>!</group_password> + <groupname>tape</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>25</gid> + <group_password>!</group_password> + <groupname>at</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>9</gid> + <group_password>x</group_password> + <groupname>kmem</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>32</gid> + <group_password>x</group_password> + <groupname>public</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>12</gid> + <group_password>x</group_password> + <groupname>mail</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>0</gid> + <group_password>x</group_password> + <groupname>root</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>2</gid> + <group_password>x</group_password> + <groupname>daemon</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>105</gid> + <group_password>!</group_password> + <groupname>sfcb</groupname> + <userlist>root</userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>108</gid> + <group_password>!</group_password> + <groupname>ntp</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>14</gid> + <group_password>x</group_password> + <groupname>uucp</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>110</gid> + <group_password>!</group_password> + <groupname>pulse-access</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>71</gid> + <group_password>!</group_password> + <groupname>ntadmin</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>62</gid> + <group_password>x</group_password> + <groupname>man</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>22</gid> + <group_password>x</group_password> + <groupname>utmp</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>13</gid> + <group_password>x</group_password> + <groupname>news</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>65</gid> + <group_password>!</group_password> + <groupname>sshd</groupname> + <userlist></userlist> + </group> + </groups> + <host> + <hosts config:type="list"> + <hosts_entry> + <host_address>127.0.0.1</host_address> + <names config:type="list"> + <name>localhost</name> + </names> + </hosts_entry> + <hosts_entry> + <host_address>::1</host_address> + <names config:type="list"> + <name>localhost ipv6-localhost ipv6-loopback</name> + </names> + </hosts_entry> + <hosts_entry> + <host_address>fe00::0</host_address> + <names config:type="list"> + <name>ipv6-localnet</name> + </names> + </hosts_entry> + <hosts_entry> + <host_address>ff00::0</host_address> + <names config:type="list"> + <name>ipv6-mcastprefix</name> + </names> + </hosts_entry> + <hosts_entry> + <host_address>ff02::1</host_address> + <names config:type="list"> + <name>ipv6-allnodes</name> + </names> + </hosts_entry> + <hosts_entry> + <host_address>ff02::2</host_address> + <names config:type="list"> + <name>ipv6-allrouters</name> + </names> + </hosts_entry> + <hosts_entry> + <host_address>ff02::3</host_address> + <names config:type="list"> + <name>ipv6-allhosts</name> + </names> + </hosts_entry> + </hosts> + </host> + <login_settings/> + <networking> + <dhcp_options> + <dhclient_client_id></dhclient_client_id> + <dhclient_hostname_option>AUTO</dhclient_hostname_option> + </dhcp_options> + <dns> + <dhcp_hostname config:type="boolean">false</dhcp_hostname> + <domain>vagrantup.com</domain> + <hostname>vagrant-sles-11sp2-x86</hostname> + <resolv_conf_policy>auto</resolv_conf_policy> + <searchlist config:type="list"> + <search>vagrantup.com</search> + </searchlist> + <write_hostname config:type="boolean">true</write_hostname> + </dns> + <interfaces config:type="list"> + <interface> + <bootproto>dhcp</bootproto> + <device>eth0</device> + <name>82540EM Gigabit Ethernet Controller</name> + <startmode>auto</startmode> + <usercontrol>no</usercontrol> + </interface> + </interfaces> + <managed config:type="boolean">false</managed> + <net-udev config:type="list"> + <rule> + <name>eth0</name> + <rule>KERNELS</rule> + <value>0000:00:03.0</value> + </rule> + </net-udev> + <routing> + <ip_forward config:type="boolean">false</ip_forward> + </routing> + </networking> + <partitioning config:type="list"> + <drive> + <device>/dev/sda</device> + <initialize config:type="boolean">true</initialize> + <partitions config:type="list"> + <partition> + <create config:type="boolean">true</create> + <crypt_fs config:type="boolean">false</crypt_fs> + <filesystem config:type="symbol">swap</filesystem> + <format config:type="boolean">true</format> + <fstopt>defaults</fstopt> + <loop_fs config:type="boolean">false</loop_fs> + <mount>swap</mount> + <mountby config:type="symbol">device</mountby> + <partition_id config:type="integer">130</partition_id> + <partition_nr config:type="integer">1</partition_nr> + <raid_options/> + <resize config:type="boolean">false</resize> + <size>1561492992</size> + </partition> + <partition> + <create config:type="boolean">true</create> + <crypt_fs config:type="boolean">false</crypt_fs> + <filesystem config:type="symbol">ext3</filesystem> + <format config:type="boolean">true</format> + <fstopt>acl,user_xattr</fstopt> + <loop_fs config:type="boolean">false</loop_fs> + <mount>/</mount> + <mountby config:type="symbol">device</mountby> + <partition_id config:type="integer">131</partition_id> + <partition_nr config:type="integer">2</partition_nr> + <raid_options/> + <resize config:type="boolean">false</resize> + <size>19895844352</size> + </partition> + </partitions> + <pesize></pesize> + <type config:type="symbol">CT_DISK</type> + <use>all</use> + </drive> + </partitioning> + <report> + <errors> + <log config:type="boolean">true</log> + <show config:type="boolean">true</show> + <timeout config:type="integer">0</timeout> + </errors> + <messages> + <log config:type="boolean">true</log> + <show config:type="boolean">true</show> + <timeout config:type="integer">0</timeout> + </messages> + <warnings> + <log config:type="boolean">true</log> + <show config:type="boolean">true</show> + <timeout config:type="integer">0</timeout> + </warnings> + <yesno_messages> + <log config:type="boolean">true</log> + <show config:type="boolean">true</show> + <timeout config:type="integer">0</timeout> + </yesno_messages> + </report> + <software> + + <packages config:type="list"> + <package>desktop-translations</package> + <package>gconf2-branding-SLES</package> + <package>libproxy0-config-gnome</package> + <package>sle-sdk-release</package> + <package>sle-sdk-release-SDK</package> + <package>sles-manuals_en</package> + <package>yast2-trans-en_US</package> + </packages> + <patterns config:type="list"> + <pattern>Basis-Devel</pattern> + <pattern>Minimal</pattern> + <pattern>apparmor</pattern> + <pattern>base</pattern> + <pattern>sdk_kernel</pattern> + <pattern>sdk_libs</pattern> + <pattern>sdk_ruby</pattern> + </patterns> + <remove-packages config:type="list"> + <package>3ddiag</package> + <package>CASA</package> + <package>CASA-devel</package> + <package>CASA_auth_token_client</package> + <package>CASA_auth_token_client-devel</package> + <package>ConsoleKit-devel</package> + <package>ConsoleKit-x11</package> + <package>DirectFB-devel</package> + <package>FastCGI</package> + <package>IlmBase</package> + <package>IlmBase-devel</package> + <package>ImageMagick</package> + <package>ImageMagick-devel</package> + <package>LibVNCServer</package> + <package>LibVNCServer-devel</package> + <package>Mesa</package> + <package>Mesa-devel</package> + <package>ModemManager</package> + <package>Modules</package> + <package>NetworkManager</package> + <package>NetworkManager-devel</package> + <package>NetworkManager-glib</package> + <package>NetworkManager-gnome</package> + <package>NetworkManager-kde4</package> + <package>NetworkManager-kde4-lang</package> + <package>NetworkManager-kde4-libs</package> + <package>OpenEXR</package> + <package>OpenEXR-devel</package> + <package>OpenIPMI-devel</package> + <package>PackageKit</package> + <package>PackageKit-devel</package> + <package>PackageKit-lang</package> + <package>PolicyKit-devel</package> + <package>PolicyKit-gnome</package> + <package>PolicyKit-gnome-devel</package> + <package>PolicyKit-gnome-libs</package> + <package>SDL-devel</package> + <package>SDL_net</package> + <package>SDL_net-devel</package> + <package>TeX-Guy</package> + <package>TeX-Guy-devel</package> + <package>VFlib3</package> + <package>VFlib3-devel</package> + <package>WindowMaker</package> + <package>WindowMaker-devel</package> + <package>a2ps</package> + <package>aalib</package> + <package>aalib-devel</package> + <package>akonadi-runtime</package> + <package>akregator</package> + <package>alsa-devel</package> + <package>alsa-firmware</package> + <package>alsa-plugins-pulse</package> + <package>alsa-tools</package> + <package>alsa-tools-devel</package> + <package>anthy</package> + <package>anthy-devel</package> + <package>antlr</package> + <package>apache2</package> + <package>apache2-devel</package> + <package>apache2-mod_perl</package> + <package>apache2-mod_perl-devel</package> + <package>apache2-prefork</package> + <package>apache2-utils</package> + <package>apache2-worker</package> + <package>apparmor-profile-editor</package> + <package>art-sharp2</package> + <package>arts</package> + <package>arts-devel</package> + <package>aspell-devel</package> + <package>at-spi</package> + <package>at-spi-devel</package> + <package>at-spi-lang</package> + <package>atk-devel</package> + <package>audiofile</package> + <package>audiofile-devel</package> + <package>audit-devel</package> + <package>automoc4</package> + <package>avahi</package> + <package>avahi-compat-howl-devel</package> + <package>avahi-compat-mDNSResponder-devel</package> + <package>avahi-lang</package> + <package>babl-0_0</package> + <package>banshee-1</package> + <package>banshee-1-backend-engine-gstreamer</package> + <package>banshee-1-backend-platform-gnome</package> + <package>banshee-1-backend-platform-unix</package> + <package>banshee-1-devel</package> + <package>banshee-1-extensions-default</package> + <package>banshee-1-lang</package> + <package>beagle-devel</package> + <package>bind-devel</package> + <package>binutils-devel</package> + <package>bluez</package> + <package>bluez-devel</package> + <package>boo</package> + <package>boo-devel</package> + <package>boost-devel</package> + <package>bootsplash-branding-SLED</package> + <package>cairo-devel</package> + <package>cairomm</package> + <package>cairomm-devel</package> + <package>canna</package> + <package>canna-devel</package> + <package>canna-libs</package> + <package>cannadic</package> + <package>capi4linux</package> + <package>capi4linux-devel</package> + <package>cdk</package> + <package>cdk-devel</package> + <package>cdrdao</package> + <package>chasen</package> + <package>chasen-devel</package> + <package>check</package> + <package>check-devel</package> + <package>chmlib</package> + <package>chmlib-devel</package> + <package>cim-schema</package> + <package>clucene-core</package> + <package>clucene-core-devel</package> + <package>cmake</package> + <package>compiz</package> + <package>compiz-branding-SLE</package> + <package>compiz-devel</package> + <package>compiz-gnome</package> + <package>coolkey-devel</package> + <package>cracklib-devel</package> + <package>crash-devel</package> + <package>crimson</package> + <package>cscope</package> + <package>cups</package> + <package>cups-devel</package> + <package>cvsps</package> + <package>cyrus-imapd-devel</package> + <package>cyrus-sasl-crammd5</package> + <package>cyrus-sasl-devel</package> + <package>dante</package> + <package>dante-devel</package> + <package>db1</package> + <package>db1-devel</package> + <package>db43</package> + <package>db43-devel</package> + <package>dbus-1-devel</package> + <package>dbus-1-glib-devel</package> + <package>dbus-1-python-devel</package> + <package>dbus-1-qt3</package> + <package>dbus-1-qt3-devel</package> + <package>dbus-1-x11</package> + <package>dejagnu</package> + <package>dejavu</package> + <package>desktop-data-openSUSE</package> + <package>desktop-file-utils</package> + <package>devhelp</package> + <package>devhelp-devel</package> + <package>devhelp-lang</package> + <package>device-mapper-devel</package> + <package>dhcp</package> + <package>dhcp-client</package> + <package>dhcp-devel</package> + <package>diffstat</package> + <package>dmapi-devel</package> + <package>dnsmasq</package> + <package>docbook-xsl-stylesheets</package> + <package>docbook_4</package> + <package>doxygen</package> + <package>dvd+rw-tools</package> + <package>e2fsprogs-devel</package> + <package>emacs</package> + <package>emacs-nox</package> + <package>emacs-x11</package> + <package>enchant</package> + <package>enchant-devel</package> + <package>enscript</package> + <package>eog</package> + <package>eog-devel</package> + <package>eog-lang</package> + <package>espeak</package> + <package>evince</package> + <package>evince-devel</package> + <package>evince-lang</package> + <package>evoldap2-devel</package> + <package>evolution</package> + <package>evolution-data-server</package> + <package>evolution-data-server-devel</package> + <package>evolution-data-server-lang</package> + <package>evolution-devel</package> + <package>evolution-lang</package> + <package>expect-devel</package> + <package>facter</package> + <package>fam</package> + <package>fam-devel</package> + <package>farsight</package> + <package>farsight-devel</package> + <package>festival</package> + <package>festival-devel</package> + <package>fftw</package> + <package>fftw-devel</package> + <package>fftw-mpi</package> + <package>fftw-mpi-devel</package> + <package>fftw-threads</package> + <package>fftw-threads-devel</package> + <package>fftw3</package> + <package>fftw3-devel</package> + <package>fftw3-threads</package> + <package>fftw3-threads-devel</package> + <package>file-devel</package> + <package>fileshareset</package> + <package>finch</package> + <package>finch-devel</package> + <package>flac-devel</package> + <package>fltk</package> + <package>fltk-devel</package> + <package>fontconfig-devel</package> + <package>fonts-config</package> + <package>foomatic-filters</package> + <package>freeglut</package> + <package>freeglut-devel</package> + <package>freeradius-client-devel</package> + <package>freeradius-client-libs</package> + <package>freeradius-server-devel</package> + <package>freeradius-server-libs</package> + <package>freetype</package> + <package>freetype2-devel</package> + <package>fribidi</package> + <package>fribidi-devel</package> + <package>ft2demos</package> + <package>fuse-devel</package> + <package>fwnn-devel</package> + <package>fxload</package> + <package>gcc-gij</package> + <package>gcc-java</package> + <package>gcc43-gij</package> + <package>gcc43-java</package> + <package>gconf-sharp2</package> + <package>gconf2-devel</package> + <package>gconfmm</package> + <package>gconfmm-devel</package> + <package>gd</package> + <package>gd-devel</package> + <package>gdbm-32bit</package> + <package>gdk-pixbuf</package> + <package>gdk-pixbuf-devel</package> + <package>gegl-0_0</package> + <package>gettext-tools</package> + <package>gfxboot-branding-SLED</package> + <package>gfxboot-devel</package> + <package>ggz</package> + <package>ggz-client-libs</package> + <package>ggz-client-libs-devel</package> + <package>ggz-client-libs-lang</package> + <package>ghex</package> + <package>ghex-devel</package> + <package>ghex-lang</package> + <package>ghostscript-devel</package> + <package>ghostscript-fonts-other</package> + <package>ghostscript-fonts-std</package> + <package>ghostscript-ijs-devel</package> + <package>ghostscript-library</package> + <package>ghostscript-omni</package> + <package>ghostscript-x11</package> + <package>giflib-devel</package> + <package>gimp</package> + <package>gimp-branding-SLED</package> + <package>gimp-devel</package> + <package>gimp-lang</package> + <package>gimp-plugins-python</package> + <package>git</package> + <package>git-arch</package> + <package>git-core</package> + <package>git-cvs</package> + <package>git-daemon</package> + <package>git-email</package> + <package>git-gui</package> + <package>git-svn</package> + <package>git-web</package> + <package>gitk</package> + <package>gjdoc</package> + <package>glade-sharp2</package> + <package>glade3</package> + <package>glade3-lang</package> + <package>glib</package> + <package>glib-devel</package> + <package>glib-sharp2</package> + <package>glib2-devel</package> + <package>glibmm2</package> + <package>glibmm2-devel</package> + <package>glitz</package> + <package>glitz-devel</package> + <package>gltt</package> + <package>gltt-devel</package> + <package>gmime-2_4-devel</package> + <package>gmime-devel</package> + <package>gmp-devel</package> + <package>gnet</package> + <package>gnet-devel</package> + <package>gnokii</package> + <package>gnokii-devel</package> + <package>gnokii-smsd</package> + <package>gnome-certauth-devel</package> + <package>gnome-control-center</package> + <package>gnome-control-center-devel</package> + <package>gnome-control-center-lang</package> + <package>gnome-desktop</package> + <package>gnome-desktop-devel</package> + <package>gnome-desktop-lang</package> + <package>gnome-doc-utils</package> + <package>gnome-doc-utils-devel</package> + <package>gnome-doc-utils-lang</package> + <package>gnome-keyring-devel</package> + <package>gnome-keyring-sharp</package> + <package>gnome-keyring-sharp-devel</package> + <package>gnome-libs</package> + <package>gnome-libs-devel</package> + <package>gnome-mag</package> + <package>gnome-mag-devel</package> + <package>gnome-mag-lang</package> + <package>gnome-main-menu</package> + <package>gnome-main-menu-lang</package> + <package>gnome-media</package> + <package>gnome-media-devel</package> + <package>gnome-media-lang</package> + <package>gnome-menus</package> + <package>gnome-menus-branding-SLED</package> + <package>gnome-menus-devel</package> + <package>gnome-menus-lang</package> + <package>gnome-mount</package> + <package>gnome-mount-lang</package> + <package>gnome-panel</package> + <package>gnome-panel-devel</package> + <package>gnome-panel-lang</package> + <package>gnome-pilot</package> + <package>gnome-pilot-devel</package> + <package>gnome-pilot-lang</package> + <package>gnome-settings-daemon</package> + <package>gnome-settings-daemon-devel</package> + <package>gnome-settings-daemon-lang</package> + <package>gnome-sharp2</package> + <package>gnome-speech</package> + <package>gnome-speech-devel</package> + <package>gnome-themes</package> + <package>gnome-utils</package> + <package>gnome-utils-devel</package> + <package>gnome-utils-lang</package> + <package>gnome-vfs-sharp2</package> + <package>gnome-vfs2</package> + <package>gnome-vfs2-devel</package> + <package>gnome-vfs2-lang</package> + <package>gnome-vfsmm</package> + <package>gnome-vfsmm-devel</package> + <package>gnopernicus</package> + <package>gnopernicus-devel</package> + <package>gnopernicus-lang</package> + <package>gnutls</package> + <package>goffice</package> + <package>goffice-devel</package> + <package>goffice-lang</package> + <package>goocanvas</package> + <package>goocanvas-devel</package> + <package>goocanvas-lang</package> + <package>goom2k4</package> + <package>goom2k4-devel</package> + <package>graphviz</package> + <package>graphviz-devel</package> + <package>graphviz-gd</package> + <package>graphviz-gnome</package> + <package>gstreamer-0_10</package> + <package>gstreamer-0_10-devel</package> + <package>gstreamer-0_10-lang</package> + <package>gstreamer-0_10-plugins-base</package> + <package>gstreamer-0_10-plugins-base-devel</package> + <package>gstreamer-0_10-plugins-base-lang</package> + <package>gstreamer-0_10-plugins-good</package> + <package>gstreamer-0_10-plugins-good-lang</package> + <package>gstreamer-0_10-utils</package> + <package>gstreamer-utils</package> + <package>gtk</package> + <package>gtk-devel</package> + <package>gtk-lang</package> + <package>gtk-sharp2</package> + <package>gtk-vnc-devel</package> + <package>gtk2-devel</package> + <package>gtkglext</package> + <package>gtkglext-devel</package> + <package>gtkhtml2</package> + <package>gtkhtml2-devel</package> + <package>gtkhtml2-lang</package> + <package>gtkhtml314-sharp</package> + <package>gtkmm2</package> + <package>gtkmm2-devel</package> + <package>gtksourceview-devel</package> + <package>gtksourceview-lang</package> + <package>gtksourceview18</package> + <package>gtksourceview18-devel</package> + <package>gtkspell</package> + <package>gtkspell-devel</package> + <package>gtkspell-lang</package> + <package>gucharmap</package> + <package>gucharmap-devel</package> + <package>gucharmap-lang</package> + <package>guile</package> + <package>guile-devel</package> + <package>gutenprint</package> + <package>gutenprint-devel</package> + <package>gvfs-devel</package> + <package>gxmhtml</package> + <package>hal-devel</package> + <package>hal-palm</package> + <package>htdig</package> + <package>htdig-devel</package> + <package>hunspell</package> + <package>hunspell-devel</package> + <package>hunspell-tools</package> + <package>hwinfo-devel</package> + <package>i4l-base</package> + <package>icewm</package> + <package>icewm-lite</package> + <package>id3lib</package> + <package>id3lib-devel</package> + <package>imap-devel</package> + <package>imap-lib</package> + <package>imlib</package> + <package>imlib-devel</package> + <package>imlib2</package> + <package>imlib2-devel</package> + <package>indent</package> + <package>info2html</package> + <package>inn</package> + <package>inn-devel</package> + <package>intltool</package> + <package>ipadic</package> + <package>iptables-devel</package> + <package>iso-codes</package> + <package>iso-codes-devel</package> + <package>iso_ent</package> + <package>ispell</package> + <package>ispell-american</package> + <package>ispell-brazilian</package> + <package>ispell-british</package> + <package>ispell-czech</package> + <package>ispell-danish</package> + <package>ispell-finnish</package> + <package>ispell-french</package> + <package>ispell-german</package> + <package>ispell-hungarian</package> + <package>ispell-italian</package> + <package>ispell-ngerman</package> + <package>ispell-norsk</package> + <package>ispell-polish</package> + <package>ispell-portuguese</package> + <package>ispell-russian</package> + <package>ispell-slovak</package> + <package>ispell-spanish</package> + <package>ispell-swedish</package> + <package>itcl-devel</package> + <package>java-1_4_2-ibm</package> + <package>java-1_4_2-ibm-devel</package> + <package>java-1_5_0-gcj-compat</package> + <package>java-1_5_0-gcj-compat-devel</package> + <package>java-1_6_0-ibm</package> + <package>java-1_6_0-ibm-devel</package> + <package>joe</package> + <package>jpackage-utils</package> + <package>k3b</package> + <package>k3b-devel</package> + <package>k3b-lang</package> + <package>kaddressbook</package> + <package>kalarm</package> + <package>kde-susetranslations</package> + <package>kde4-filesystem</package> + <package>kde4-kgreeter-plugins</package> + <package>kdebase3</package> + <package>kdebase3-devel</package> + <package>kdebase3-runtime</package> + <package>kdebase4-SLED</package> + <package>kdebase4-SLED-lang</package> + <package>kdebase4-runtime</package> + <package>kdebase4-runtime-branding-SLED</package> + <package>kdebase4-workspace</package> + <package>kdebase4-workspace-branding-SLED</package> + <package>kdebase4-workspace-devel</package> + <package>kdebase4-workspace-ksysguardd</package> + <package>kdelibs3</package> + <package>kdelibs3-arts</package> + <package>kdelibs3-default-style</package> + <package>kdelibs3-devel</package> + <package>kdelibs3-doc</package> + <package>kdelibs4</package> + <package>kdelibs4-branding-SLED</package> + <package>kdelibs4-core</package> + <package>kdelibs4-doc</package> + <package>kdemultimedia3-arts</package> + <package>kdepim3</package> + <package>kdepim4</package> + <package>kdepim4-devel</package> + <package>kdepimlibs4</package> + <package>kdialog</package> + <package>kdm</package> + <package>kdm-branding-SLED</package> + <package>kernel-docs</package> + <package>kernel-syms</package> + <package>kernel-trace-devel</package> + <package>kernel-xen-devel</package> + <package>keyutils-devel</package> + <package>kio_sysinfo</package> + <package>kio_sysinfo-branding-SLED</package> + <package>kmail</package> + <package>knode</package> + <package>kontact</package> + <package>korganizer</package> + <package>kpilot</package> + <package>krb5-devel</package> + <package>ksh-devel</package> + <package>ktorrent</package> + <package>ktorrent-devel</package> + <package>ktorrent-lang</package> + <package>kwin</package> + <package>ladspa-devel</package> + <package>lib3ds-1-3</package> + <package>lib3ds-devel</package> + <package>libFLAC++6</package> + <package>libFLAC8</package> + <package>libHX-devel</package> + <package>libMagick++-devel</package> + <package>libMagick++1</package> + <package>libMagickWand1</package> + <package>libQtWebKit-devel</package> + <package>libQtWebKit4</package> + <package>libXerces-c-devel</package> + <package>libXerces-c28</package> + <package>libXiterm</package> + <package>libXiterm-devel</package> + <package>libacl-devel</package> + <package>libadns-devel</package> + <package>libadns1</package> + <package>libakode</package> + <package>libakode-devel</package> + <package>libakonadi4</package> + <package>libakonadiprotocolinternals-devel</package> + <package>libakonadiprotocolinternals1</package> + <package>libao</package> + <package>libao-devel</package> + <package>libapparmor-devel</package> + <package>libapr-util1</package> + <package>libapr-util1-devel</package> + <package>libapr1</package> + <package>libapr1-devel</package> + <package>libarchive-devel</package> + <package>libart_lgpl</package> + <package>libart_lgpl-devel</package> + <package>libassuan-devel</package> + <package>libatomic-ops-devel</package> + <package>libattr-devel</package> + <package>libavahi-core5</package> + <package>libavahi-devel</package> + <package>libavahi-glib-devel</package> + <package>libavahi-gobject-devel</package> + <package>libavahi-gobject0</package> + <package>libavahi-ui0</package> + <package>libavc1394-0</package> + <package>libavc1394-devel</package> + <package>libbabl-0_0-0</package> + <package>libbeagle-devel</package> + <package>libbeagle-python</package> + <package>libbeagle1</package> + <package>libbitmask-devel</package> + <package>libbitmask1</package> + <package>libblkid-devel</package> + <package>libblocxx-devel</package> + <package>libbonobo</package> + <package>libbonobo-devel</package> + <package>libbonobo-lang</package> + <package>libbonoboui</package> + <package>libbonoboui-devel</package> + <package>libbonoboui-lang</package> + <package>libboost_date_time1_36_0</package> + <package>libboost_filesystem1_36_0</package> + <package>libboost_graph1_36_0</package> + <package>libboost_iostreams1_36_0</package> + <package>libboost_math1_36_0</package> + <package>libboost_mpi1_36_0</package> + <package>libboost_program_options1_36_0</package> + <package>libboost_python1_36_0</package> + <package>libboost_serialization1_36_0</package> + <package>libboost_signals1_36_0</package> + <package>libboost_system1_36_0</package> + <package>libboost_test1_36_0</package> + <package>libboost_thread1_36_0</package> + <package>libboost_wave1_36_0</package> + <package>libbotan-1_6_4</package> + <package>libbotan-devel</package> + <package>libbtctl</package> + <package>libbtctl-devel</package> + <package>libbtctl-lang</package> + <package>libbtctl4</package> + <package>libbz2-devel</package> + <package>libcaca</package> + <package>libcaca-devel</package> + <package>libcanberra-gtk</package> + <package>libcanberra-gtk0</package> + <package>libcanberra0</package> + <package>libcap-devel</package> + <package>libcap-ng0</package> + <package>libcdda_interface0</package> + <package>libcdda_paranoia0</package> + <package>libcddb-devel</package> + <package>libcddb2</package> + <package>libcdio++0</package> + <package>libcdio-devel</package> + <package>libcgroup-devel</package> + <package>libcgroup1</package> + <package>libchewing</package> + <package>libchewing-devel</package> + <package>libcmpiutil</package> + <package>libcmpiutil-devel</package> + <package>libcolorblind0</package> + <package>libcom_err-devel</package> + <package>libcompizconfig</package> + <package>libcompizconfig-devel</package> + <package>libcppunit-1_12-0</package> + <package>libcppunit-devel</package> + <package>libcpuset-devel</package> + <package>libcpuset1</package> + <package>libcroco</package> + <package>libcroco-0_6-3</package> + <package>libcroco-devel</package> + <package>libcryptsetup-devel</package> + <package>libcsync-devel</package> + <package>libcsync0</package> + <package>libcurl-devel</package> + <package>libdaemon-devel</package> + <package>libdaemon0</package> + <package>libdatrie-devel</package> + <package>libdatrie0</package> + <package>libdb-4_5-32bit</package> + <package>libdb-4_5-devel</package> + <package>libdbus-1-qt3-0</package> + <package>libdbus-1-qt3-0-devel</package> + <package>libdc1394-22</package> + <package>libdc1394-devel</package> + <package>libdc1394_control12</package> + <package>libdc1394_control12-devel</package> + <package>libdhcp6client-1_0-2</package> + <package>libdhcp6client-devel</package> + <package>libdigikam-devel</package> + <package>libdiscid1</package> + <package>libdjvulibre-devel</package> + <package>libdjvulibre21</package> + <package>libdmxview-devel</package> + <package>libdmxview0</package> + <package>libdnet-devel</package> + <package>libdnet1</package> + <package>libdns_sd</package> + <package>libdrm</package> + <package>libdrm-devel</package> + <package>libdv-devel</package> + <package>libdv4</package> + <package>libdvdread4</package> + <package>libdw-devel</package> + <package>libebl-devel</package> + <package>libedit-devel</package> + <package>libedit0</package> + <package>libelf-devel</package> + <package>libenchant1</package> + <package>libesd-devel</package> + <package>libesd0</package> + <package>libesmtp-devel</package> + <package>libevoldap-2_4-2</package> + <package>libevtlog-devel</package> + <package>libevtlog0</package> + <package>libexempi-devel</package> + <package>libexempi3</package> + <package>libexif-devel</package> + <package>libexiv2-4</package> + <package>libexiv2-devel</package> + <package>libexpat-devel</package> + <package>libext2fs-devel</package> + <package>libfarsight-0_1-3</package> + <package>libffi-devel</package> + <package>libffi43</package> + <package>libffi43-devel</package> + <package>libflaim-devel</package> + <package>libfprint-devel</package> + <package>libfreebl3</package> + <package>libfreebob</package> + <package>libfreebob-devel</package> + <package>libgadu</package> + <package>libgadu-devel</package> + <package>libgail-gnome</package> + <package>libgail-gnome-devel</package> + <package>libgcj-devel</package> + <package>libgcj43</package> + <package>libgcj43-devel</package> + <package>libgcj43-jar</package> + <package>libgcj_bc43</package> + <package>libgcrypt-devel</package> + <package>libgda-3_0-3</package> + <package>libgda-3_0-devel</package> + <package>libgdiplus0</package> + <package>libgegl-0_0-0</package> + <package>libgeoclue0</package> + <package>libgfortran46</package> + <package>libggz2</package> + <package>libggz2-devel</package> + <package>libgimpprint</package> + <package>libgimpprint-devel</package> + <package>libglade2</package> + <package>libglade2-devel</package> + <package>libglademm</package> + <package>libglademm-2_4-1</package> + <package>libglademm-devel</package> + <package>libgladeui-1-9</package> + <package>libgladeui-1_0-devel</package> + <package>libgmime-2_0-3</package> + <package>libgmime-2_4-2</package> + <package>libgmm++-devel</package> + <package>libgnome</package> + <package>libgnome-certauth0</package> + <package>libgnome-desktop-2-11</package> + <package>libgnome-devel</package> + <package>libgnome-lang</package> + <package>libgnome-menu2</package> + <package>libgnome-window-settings1</package> + <package>libgnomecanvas</package> + <package>libgnomecanvas-devel</package> + <package>libgnomecanvas-lang</package> + <package>libgnomecanvasmm</package> + <package>libgnomecanvasmm-devel</package> + <package>libgnomecups</package> + <package>libgnomecups-devel</package> + <package>libgnomecups-lang</package> + <package>libgnomedb</package> + <package>libgnomedb-devel</package> + <package>libgnomedb-lang</package> + <package>libgnomekbd</package> + <package>libgnomekbd-devel</package> + <package>libgnomekbd-lang</package> + <package>libgnomeprint</package> + <package>libgnomeprint-devel</package> + <package>libgnomeprint-lang</package> + <package>libgnomeprintui</package> + <package>libgnomeprintui-devel</package> + <package>libgnomeprintui-lang</package> + <package>libgnomesu</package> + <package>libgnomesu-devel</package> + <package>libgnomesu-lang</package> + <package>libgnomesu0</package> + <package>libgnomeui</package> + <package>libgnomeui-devel</package> + <package>libgnomeui-lang</package> + <package>libgnomevfsmm-2_6-1</package> + <package>libgnutls-devel</package> + <package>libgnutls-extra-devel</package> + <package>libgnutls-extra26</package> + <package>libgoocanvas3</package> + <package>libgpg-error-devel</package> + <package>libgpgme-devel</package> + <package>libgphoto2-devel</package> + <package>libgpod-devel</package> + <package>libgsf</package> + <package>libgsf-1-114</package> + <package>libgsf-devel</package> + <package>libgsf-gnome</package> + <package>libgsm-devel</package> + <package>libgsm1</package> + <package>libgssglue-devel</package> + <package>libgstapp-0_10-0</package> + <package>libgstinterfaces-0_10-0</package> + <package>libgstreamer-0_10-0</package> + <package>libgtk-vnc-1_0-0</package> + <package>libgtkhtml</package> + <package>libgtkhtml-devel</package> + <package>libgtksourceview-2_0-0</package> + <package>libgtop</package> + <package>libgtop-2_0-7</package> + <package>libgtop-devel</package> + <package>libgtop-lang</package> + <package>libgudev-1_0-0</package> + <package>libgweather</package> + <package>libgweather-devel</package> + <package>libgweather-lang</package> + <package>libgweather1</package> + <package>libhangul</package> + <package>libhangul-devel</package> + <package>libhowl0</package> + <package>libical-devel</package> + <package>libical0</package> + <package>libicu-devel</package> + <package>libid3tag</package> + <package>libid3tag-devel</package> + <package>libidl-devel</package> + <package>libidn-devel</package> + <package>libiec61883</package> + <package>libiec61883-devel</package> + <package>libieee1284</package> + <package>libiniparser-devel</package> + <package>libiniparser0</package> + <package>libiptcdata</package> + <package>libiptcdata-devel</package> + <package>libiptcdata0</package> + <package>libiso9660-5</package> + <package>libiterm</package> + <package>libiterm-devel</package> + <package>libjack-devel</package> + <package>libjack0</package> + <package>libjasper</package> + <package>libjasper-devel</package> + <package>libjingle-0_3-0</package> + <package>libjingle-devel</package> + <package>libjpeg-devel</package> + <package>libkcal</package> + <package>libkcal-devel</package> + <package>libkcal2</package> + <package>libkcddb4</package> + <package>libkcddb4-devel</package> + <package>libkcompactdisc4</package> + <package>libkcompactdisc4-devel</package> + <package>libkdcraw3</package> + <package>libkdcraw3-devel</package> + <package>libkdcraw3-lang</package> + <package>libkde4</package> + <package>libkde4-devel</package> + <package>libkdecore4</package> + <package>libkdecore4-devel</package> + <package>libkdepim4</package> + <package>libkdepim4-devel</package> + <package>libkdepimlibs4</package> + <package>libkdepimlibs4-devel</package> + <package>libkexiv2-3</package> + <package>libkexiv2-3-devel</package> + <package>libkexiv2-7</package> + <package>libkipi-devel</package> + <package>libkipi6</package> + <package>libkmime-devel</package> + <package>libkmime2</package> + <package>libknotificationitem-1-1</package> + <package>libkonq-devel</package> + <package>libkonq5</package> + <package>libksba-devel</package> + <package>libktnef-devel</package> + <package>libktnef1</package> + <package>liblazy-devel</package> + <package>liblazy1</package> + <package>liblcms-devel</package> + <package>libldapcpp-devel</package> + <package>liblog4c-devel</package> + <package>liblog4c3</package> + <package>libloudmouth-1-0</package> + <package>liblpsolve55</package> + <package>liblua5_1</package> + <package>libmalaga-devel</package> + <package>libmalaga7</package> + <package>libmcrypt</package> + <package>libmcrypt-devel</package> + <package>libmikmod</package> + <package>libmikmod-devel</package> + <package>libmm-devel</package> + <package>libmm14</package> + <package>libmng-devel</package> + <package>libmpcdec-devel</package> + <package>libmpcdec5</package> + <package>libmspack-devel</package> + <package>libmtp-devel</package> + <package>libmtp8</package> + <package>libmusicbrainz-devel</package> + <package>libmusicbrainz3-6</package> + <package>libmusicbrainz3-devel</package> + <package>libmusicbrainz4</package> + <package>libmysqlclient-devel</package> + <package>libmysqlclient15</package> + <package>libmysqlclient_r15</package> + <package>libneon-devel</package> + <package>libneon27</package> + <package>libnetapi-devel</package> + <package>libnetapi0</package> + <package>libnetcontrol0</package> + <package>libnetpbm-devel</package> + <package>libnetpbm10</package> + <package>libnewt0_52</package> + <package>libnjb</package> + <package>libnjb-devel</package> + <package>libnjb5</package> + <package>libnl-devel</package> + <package>libnotify</package> + <package>libnotify-devel</package> + <package>libnotify1</package> + <package>libnscd-devel</package> + <package>libnsssharedhelper0</package> + <package>libnuma-devel</package> + <package>libofa-devel</package> + <package>libofa0</package> + <package>libogg-devel</package> + <package>libogg0</package> + <package>liboil</package> + <package>liboil-devel</package> + <package>libopenbabel-devel</package> + <package>libopenbabel3</package> + <package>libopencdk-devel</package> + <package>libopencdk10</package> + <package>libopenraw-devel</package> + <package>libopenraw1</package> + <package>libopenssl-devel</package> + <package>libopensync</package> + <package>libopensync-devel</package> + <package>libopensync-plugin-evolution2</package> + <package>libopensync-plugin-evolution2-devel</package> + <package>libopensync-plugin-palm</package> + <package>libopensync-plugin-palm-devel</package> + <package>liborc-0_4-0</package> + <package>libosip2</package> + <package>libosip2-devel</package> + <package>libotf</package> + <package>libotf-devel</package> + <package>libotr-devel</package> + <package>libotr2</package> + <package>libp11-1</package> + <package>libp11-devel</package> + <package>libpackagekit-glib10</package> + <package>libpackagekit-glib10-devel</package> + <package>libpangomm-1_4-1</package> + <package>libpcap-devel</package> + <package>libpciaccess0</package> + <package>libpciaccess0-devel</package> + <package>libphonon4</package> + <package>libpisock-devel</package> + <package>libpisock9</package> + <package>libpisync-devel</package> + <package>libpisync1</package> + <package>libpixman-1-0-devel</package> + <package>libpkcs11-helper1</package> + <package>libpng-devel</package> + <package>libpolkit-qt0</package> + <package>libpoppler-devel</package> + <package>libpoppler-glib-devel</package> + <package>libpoppler-glib4</package> + <package>libpoppler-qt2</package> + <package>libpoppler-qt3-devel</package> + <package>libpoppler-qt4-3</package> + <package>libpoppler-qt4-devel</package> + <package>libpoppler5</package> + <package>libpst4</package> + <package>libpt2</package> + <package>libpt2-devel</package> + <package>libpulse-browse0</package> + <package>libpulse-devel</package> + <package>libpulse-mainloop-glib0</package> + <package>libpulse0</package> + <package>libpurple</package> + <package>libpurple-devel</package> + <package>libpurple-lang</package> + <package>libqca2</package> + <package>libqca2-devel</package> + <package>libqdialogsolver1</package> + <package>libqdialogsolver1-devel</package> + <package>libqimageblitz-devel</package> + <package>libqimageblitz4</package> + <package>libqscintilla-devel</package> + <package>libqscintilla2-5</package> + <package>libqt4</package> + <package>libqt4-devel</package> + <package>libqt4-qt3support</package> + <package>libqt4-sql</package> + <package>libqt4-sql-mysql</package> + <package>libqt4-sql-postgresql</package> + <package>libqt4-sql-sqlite</package> + <package>libqt4-sql-unixODBC</package> + <package>libqt4-x11</package> + <package>libqtpod-devel</package> + <package>libqtpod0</package> + <package>libquadmath46</package> + <package>libquicktime</package> + <package>libquicktime-devel</package> + <package>libraptor-devel</package> + <package>libraptor1</package> + <package>librasqal-devel</package> + <package>librasqal1</package> + <package>libraw1394-11</package> + <package>libraw1394-8</package> + <package>libraw1394-devel</package> + <package>libredland-devel</package> + <package>libredland0</package> + <package>libreiserfs-devel</package> + <package>libreoffice</package> + <package>libreoffice-base</package> + <package>libreoffice-branding-SLED</package> + <package>libreoffice-branding-upstream</package> + <package>libreoffice-calc</package> + <package>libreoffice-icon-themes</package> + <package>libreoffice-impress</package> + <package>libreoffice-sdk</package> + <package>libreoffice-writer</package> + <package>librsvg</package> + <package>librsvg-devel</package> + <package>libsamplerate</package> + <package>libsamplerate-devel</package> + <package>libsatsolver-devel</package> + <package>libsblim-cmpiutil1</package> + <package>libselinux-devel</package> + <package>libsemanage-devel</package> + <package>libsemanage1</package> + <package>libsensors3-devel</package> + <package>libsensors4</package> + <package>libsepol-devel</package> + <package>libsexy</package> + <package>libsexy-devel</package> + <package>libshout-devel</package> + <package>libshout3</package> + <package>libsidplay1</package> + <package>libsidplay1-devel</package> + <package>libsigc++2</package> + <package>libsigc++2-devel</package> + <package>libslab-lang</package> + <package>libslab0</package> + <package>libsmbclient-devel</package> + <package>libsmbios-devel</package> + <package>libsmbsharemodes-devel</package> + <package>libsmbsharemodes0</package> + <package>libsndfile</package> + <package>libsndfile-devel</package> + <package>libsoprano-devel</package> + <package>libsoprano4</package> + <package>libsoup-devel</package> + <package>libspectre-devel</package> + <package>libspectre1</package> + <package>libspeex</package> + <package>libssh2-devel</package> + <package>libstrigi0</package> + <package>libstroke</package> + <package>libstroke-devel</package> + <package>libsyncml-devel</package> + <package>libsyncml0</package> + <package>libtalloc-devel</package> + <package>libtasn1-devel</package> + <package>libtdb-devel</package> + <package>libtelepathy</package> + <package>libtelepathy-devel</package> + <package>libtelepathy-glib0</package> + <package>libtheora-devel</package> + <package>libtheora0</package> + <package>libtidy</package> + <package>libtidy-devel</package> + <package>libtiff-devel</package> + <package>libtirpc-devel</package> + <package>libtomoe-gtk0</package> + <package>libtspi1</package> + <package>libtunepimp</package> + <package>libtunepimp-devel</package> + <package>libtunepimp5</package> + <package>libudev-devel</package> + <package>libudf0</package> + <package>libunique-1_0-0</package> + <package>libunwind</package> + <package>libunwind-devel</package> + <package>libupsclient1</package> + <package>libusb-devel</package> + <package>libusbpp-0_1-4</package> + <package>libustr-1_0-1</package> + <package>libustr-devel</package> + <package>libuuid-devel</package> + <package>libvirt-client</package> + <package>libvirt-devel</package> + <package>libvisual</package> + <package>libvisual-devel</package> + <package>libvoikko-devel</package> + <package>libvoikko1</package> + <package>libvorbis</package> + <package>libvorbis-devel</package> + <package>libwavpack1</package> + <package>libwbclient-devel</package> + <package>libwbxml2-0</package> + <package>libwbxml2-devel</package> + <package>libwebkit-1_0-1</package> + <package>libwebkit-1_0-2</package> + <package>libwebkit-devel</package> + <package>libwebkit-lang</package> + <package>libwmf</package> + <package>libwmf-devel</package> + <package>libwmf-gnome</package> + <package>libwnck</package> + <package>libwnck-1-22</package> + <package>libwnck-devel</package> + <package>libwnck-lang</package> + <package>libwpd-0_8-8</package> + <package>libwpd-devel</package> + <package>libwpg-0_1-1</package> + <package>libwpg-devel</package> + <package>libwps-0_1-1</package> + <package>libwps-devel</package> + <package>libwsman-devel</package> + <package>libwsman1</package> + <package>libxcrypt-devel</package> + <package>libxine-devel</package> + <package>libxine1</package> + <package>libxklavier-devel</package> + <package>libxklavier15</package> + <package>libxml2-devel</package> + <package>libxslt-devel</package> + <package>libyajl1</package> + <package>libzio-devel</package> + <package>libzip-devel</package> + <package>libzip1</package> + <package>libzvbi0</package> + <package>libzypp-devel</package> + <package>limal-apparmor-notifications</package> + <package>limal-apparmor-notifications-devel</package> + <package>limal-ca-mgm-devel</package> + <package>limal-devel</package> + <package>limal-devtools</package> + <package>limal-nfs-server-devel</package> + <package>linux-atm-devel</package> + <package>linux-atm-lib</package> + <package>lksctp-tools</package> + <package>lksctp-tools-devel</package> + <package>loudmouth-devel</package> + <package>lua</package> + <package>lua-devel</package> + <package>lzo-devel</package> + <package>m17n-db</package> + <package>m17n-lib</package> + <package>m17n-lib-devel</package> + <package>malaga-suomi</package> + <package>meanwhile</package> + <package>meanwhile-devel</package> + <package>metacity</package> + <package>metacity-devel</package> + <package>metacity-lang</package> + <package>mhash</package> + <package>mhash-devel</package> + <package>misc-console-font</package> + <package>mono-addins</package> + <package>mono-basic</package> + <package>mono-core</package> + <package>mono-data</package> + <package>mono-data-oracle</package> + <package>mono-data-sqlite</package> + <package>mono-devel</package> + <package>mono-extras</package> + <package>mono-jscript</package> + <package>mono-tools</package> + <package>mono-wcf</package> + <package>mono-web</package> + <package>mono-winforms</package> + <package>mono-zeroconf</package> + <package>mono-zeroconf-provider-avahi</package> + <package>monodevelop</package> + <package>monodoc-core</package> + <package>mozilla-nspr</package> + <package>mozilla-nspr-devel</package> + <package>mozilla-nss</package> + <package>mozilla-nss-devel</package> + <package>mozilla-xulrunner192</package> + <package>mozilla-xulrunner192-gnome</package> + <package>mpfr-devel</package> + <package>mpi-selector</package> + <package>mpich</package> + <package>mpich-devel</package> + <package>mysql</package> + <package>mysql-client</package> + <package>nagios</package> + <package>nagios-devel</package> + <package>nagios-www</package> + <package>nant</package> + <package>nautilus</package> + <package>nautilus-cd-burner</package> + <package>nautilus-cd-burner-devel</package> + <package>nautilus-cd-burner-lang</package> + <package>nautilus-devel</package> + <package>nautilus-lang</package> + <package>ndesk-dbus</package> + <package>ndesk-dbus-glib</package> + <package>ndesk-dbus-glib-devel</package> + <package>net-snmp</package> + <package>net-snmp-devel</package> + <package>netatalk</package> + <package>netatalk-devel</package> + <package>netcat-openbsd</package> + <package>newt</package> + <package>newt-devel</package> + <package>newt-static</package> + <package>nfsidmap-devel</package> + <package>notification-daemon</package> + <package>notification-daemon-lang</package> + <package>notify-sharp</package> + <package>nss-mdns</package> + <package>nss-shared-helper-devel</package> + <package>nut</package> + <package>nut-classic</package> + <package>nut-devel</package> + <package>opal</package> + <package>opal-devel</package> + <package>openCryptoki</package> + <package>openCryptoki-64bit</package> + <package>openCryptoki-devel</package> + <package>openct-devel</package> + <package>openhpi</package> + <package>openhpi-daemon</package> + <package>openhpi-devel</package> + <package>openjade</package> + <package>openjade-devel</package> + <package>openldap2-devel</package> + <package>openmotif-devel</package> + <package>openmotif-libs</package> + <package>openmpi</package> + <package>openobex-devel</package> + <package>openobex-glib-devel</package> + <package>opensc-devel</package> + <package>openslp-devel</package> + <package>opensp</package> + <package>opensp-devel</package> + <package>openwsman-client</package> + <package>openwsman-server</package> + <package>orbit</package> + <package>orbit-devel</package> + <package>orbit2-devel</package> + <package>oxygen-icon-theme</package> + <package>oxygen-icon-theme-scalable</package> + <package>ozerocdoff</package> + <package>pam-devel</package> + <package>pango-devel</package> + <package>pangomm-devel</package> + <package>parted-devel</package> + <package>patchutils</package> + <package>pciutils-devel</package> + <package>pcre-devel</package> + <package>pcsc-acr38</package> + <package>pcsc-acr38-devel</package> + <package>pcsc-lite-devel</package> + <package>perl-32bit</package> + <package>perl-Crypt-OpenSSL-RSA</package> + <package>perl-Mail-DKIM</package> + <package>perl-MailTools</package> + <package>perl-Net-DNS</package> + <package>perl-Net-IP</package> + <package>perl-NetAddr-IP</package> + <package>perl-SNMP</package> + <package>perl-Tie-IxHash</package> + <package>perl-Tk</package> + <package>perl-Tk-devel</package> + <package>perl-spamassassin</package> + <package>phonon</package> + <package>phonon-backend-gstreamer-0_10</package> + <package>phonon-devel</package> + <package>php5</package> + <package>php5-ctype</package> + <package>php5-devel</package> + <package>php5-dom</package> + <package>php5-hash</package> + <package>php5-iconv</package> + <package>php5-json</package> + <package>php5-pdo</package> + <package>php5-sqlite</package> + <package>php5-suhosin</package> + <package>php5-tokenizer</package> + <package>php5-xmlreader</package> + <package>php5-xmlwriter</package> + <package>php53</package> + <package>php53-ctype</package> + <package>php53-dom</package> + <package>php53-iconv</package> + <package>php53-json</package> + <package>php53-tokenizer</package> + <package>php53-xmlreader</package> + <package>php53-xmlwriter</package> + <package>pidgin</package> + <package>pidgin-devel</package> + <package>pilot-link</package> + <package>pkcs11-helper</package> + <package>pkcs11-helper-devel</package> + <package>planner</package> + <package>planner-devel</package> + <package>planner-lang</package> + <package>plasma-addons</package> + <package>plasma-theme-aya</package> + <package>plasmoid-networkmanagement</package> + <package>plasmoid-quickaccess</package> + <package>plotutils</package> + <package>poppler-data</package> + <package>poppler-tools</package> + <package>popt-devel</package> + <package>portmap</package> + <package>postfix-devel</package> + <package>postgresql-devel</package> + <package>postgresql-libs</package> + <package>ppp-devel</package> + <package>ppp-userpass</package> + <package>pstoedit</package> + <package>pstoedit-devel</package> + <package>pulseaudio</package> + <package>pulseaudio-esound-compat</package> + <package>pulseaudio-lang</package> + <package>puppet</package> + <package>python-cairo</package> + <package>python-cairo-devel</package> + <package>python-devel</package> + <package>python-gnome</package> + <package>python-gnome-devel</package> + <package>python-gobject2</package> + <package>python-gobject2-devel</package> + <package>python-gtk</package> + <package>python-gtk-devel</package> + <package>python-gtkglext</package> + <package>python-gtkglext-devel</package> + <package>python-gtksourceview</package> + <package>python-gtksourceview-devel</package> + <package>python-numeric</package> + <package>python-numpy</package> + <package>python-orbit</package> + <package>python-orbit-devel</package> + <package>pyxml</package> + <package>qt3</package> + <package>qt3-devel</package> + <package>quagga</package> + <package>quagga-devel</package> + <package>quilt</package> + <package>raptor</package> + <package>rarian</package> + <package>rarian-devel</package> + <package>re2c</package> + <package>readline-devel</package> + <package>recode-devel</package> + <package>rpm-devel</package> + <package>rrdtool</package> + <package>rrdtool-devel</package> + <package>rsyslog</package> + <package>ruby-doc-html</package> + <package>ruby-doc-ri</package> + <package>ruby-examples</package> + <package>ruby-fcgi</package> + <package>ruby-mysql</package> + <package>ruby-selinux</package> + <package>ruby-test-suite</package> + <package>ruby-tk</package> + <package>sablot</package> + <package>sablot-devel</package> + <package>samba-devel</package> + <package>sane-backends</package> + <package>sane-frontends</package> + <package>sax2-libsax</package> + <package>sax2-libsax-devel</package> + <package>sax2-libsax-perl</package> + <package>sax2-tools</package> + <package>sblim-cmpi-base</package> + <package>sblim-cmpi-base-devel</package> + <package>sblim-cmpi-devel</package> + <package>sblim-cmpiutil-devel</package> + <package>sblim-indication_helper</package> + <package>sblim-sfcb</package> + <package>sblim-sfcc</package> + <package>sblim-sfcc-devel</package> + <package>scim</package> + <package>scim-devel</package> + <package>scpm-devel</package> + <package>scrollkeeper</package> + <package>scrollkeeper-lang</package> + <package>seahorse</package> + <package>seahorse-devel</package> + <package>seahorse-lang</package> + <package>sendmail</package> + <package>sendmail-devel</package> + <package>sg3_utils-devel</package> + <package>sgml-skel</package> + <package>shared-mime-info</package> + <package>silc-toolkit</package> + <package>silc-toolkit-devel</package> + <package>slang</package> + <package>slang-devel</package> + <package>soprano</package> + <package>soprano-backend-redland</package> + <package>spamassassin</package> + <package>speex-devel</package> + <package>splashy-devel</package> + <package>sqlite2</package> + <package>sqlite3-devel</package> + <package>startup-notification</package> + <package>startup-notification-devel</package> + <package>strigi</package> + <package>strigi-devel</package> + <package>subversion</package> + <package>subversion-perl</package> + <package>susehelp</package> + <package>susehelp_cz</package> + <package>susehelp_de</package> + <package>susehelp_en</package> + <package>susehelp_es</package> + <package>susehelp_fr</package> + <package>susehelp_hu</package> + <package>susehelp_it</package> + <package>swig</package> + <package>syslogd</package> + <package>t1lib</package> + <package>t1lib-devel</package> + <package>taglib</package> + <package>taglib-devel</package> + <package>taglib-sharp</package> + <package>tango-icon-theme</package> + <package>tcl-devel</package> + <package>tcpd-devel</package> + <package>telepathy-glib-devel</package> + <package>telepathy-mission-control</package> + <package>telepathy-mission-control-devel</package> + <package>texlive-bin-devel</package> + <package>texlive-devel</package> + <package>tk-devel</package> + <package>tla</package> + <package>tn5250</package> + <package>tn5250-devel</package> + <package>tomoe</package> + <package>tomoe-devel</package> + <package>tomoe-gtk</package> + <package>tomoe-gtk-devel</package> + <package>tomoe-gtk-lang</package> + <package>totem-pl-parser</package> + <package>totem-pl-parser-devel</package> + <package>totem-pl-parser-lang</package> + <package>trousers</package> + <package>trousers-devel</package> + <package>tsclient</package> + <package>tsclient-devel</package> + <package>tsclient-lang</package> + <package>uim</package> + <package>uim-devel</package> + <package>unixODBC</package> + <package>unixODBC-devel</package> + <package>unsermake</package> + <package>update-desktop-files</package> + <package>usb_modeswitch</package> + <package>usb_modeswitch-data</package> + <package>valgrind</package> + <package>valgrind-devel</package> + <package>vte</package> + <package>vte-devel</package> + <package>vte-lang</package> + <package>wdiff</package> + <package>webkit-sharp</package> + <package>wireshark</package> + <package>wireshark-devel</package> + <package>wodim-devel</package> + <package>wordcut</package> + <package>wordcut-devel</package> + <package>words</package> + <package>wpa_supplicant</package> + <package>wvstreams</package> + <package>wvstreams-devel</package> + <package>wxGTK-compat</package> + <package>wxGTK-devel</package> + <package>wxGTK-gl</package> + <package>x11-input-wacom</package> + <package>x11-input-wacom-devel</package> + <package>x11-input-wacom-tools</package> + <package>xalan-j2</package> + <package>xaw3d-devel</package> + <package>xbase</package> + <package>xbase-devel</package> + <package>xdelta</package> + <package>xdelta-devel</package> + <package>xdg-menu</package> + <package>xen-devel</package> + <package>xen-libs</package> + <package>xerces-j2</package> + <package>xerces-j2-bootstrap</package> + <package>xerces-j2-xml-apis</package> + <package>xfsprogs-devel</package> + <package>xml-commons-apis-bootstrap</package> + <package>xml-commons-resolver-bootstrap</package> + <package>xml-commons-which-bootstrap</package> + <package>xmlcharent</package> + <package>xorg-x11</package> + <package>xorg-x11-devel</package> + <package>xorg-x11-fonts</package> + <package>xorg-x11-fonts-core</package> + <package>xorg-x11-fonts-devel</package> + <package>xorg-x11-libICE-devel</package> + <package>xorg-x11-libSM-devel</package> + <package>xorg-x11-libX11-devel</package> + <package>xorg-x11-libXau-devel</package> + <package>xorg-x11-libXdmcp-devel</package> + <package>xorg-x11-libXext-devel</package> + <package>xorg-x11-libXfixes-devel</package> + <package>xorg-x11-libXmu-devel</package> + <package>xorg-x11-libXp-devel</package> + <package>xorg-x11-libXpm-devel</package> + <package>xorg-x11-libXprintUtil-devel</package> + <package>xorg-x11-libXrender-devel</package> + <package>xorg-x11-libXt-devel</package> + <package>xorg-x11-libXv-devel</package> + <package>xorg-x11-libfontenc-devel</package> + <package>xorg-x11-libxcb-devel</package> + <package>xorg-x11-libxkbfile-devel</package> + <package>xorg-x11-proto-devel</package> + <package>xorg-x11-server</package> + <package>xorg-x11-util-devel</package> + <package>xorg-x11-xauth</package> + <package>xorg-x11-xtrans-devel</package> + <package>xosd</package> + <package>xosd-devel</package> + <package>xsp</package> + <package>xterm</package> + <package>xz-devel</package> + <package>yast2-core-devel</package> + <package>yast2-devtools</package> + <package>yast2-gtk</package> + <package>yast2-libyui-devel</package> + <package>yast2-ncurses-devel</package> + <package>yast2-qt</package> + <package>yast2-qt-devel</package> + <package>yast2-qt-pkg</package> + <package>yast2-storage-devel</package> + <package>yast2-ycp-ui-bindings-devel</package> + <package>yelp</package> + <package>yelp-lang</package> + <package>zenity</package> + <package>zenity-lang</package> + <package>zlib-devel</package> + <package>zsh</package> + <package>zvbi-devel</package> + </remove-packages> + + </software> + <user_defaults> + <expire></expire> + <group>100</group> + <groups>video,dialout</groups> + <home>/home</home> + <inactive>-1</inactive> + <shell>/bin/bash</shell> + <skel>/etc/skel</skel> + <umask>022</umask> + </user_defaults> + <users config:type="list"> + <user> + <encrypted config:type="boolean">true</encrypted> + <fullname>vagrant</fullname> + <gid>100</gid> + <home>/home/vagrant</home> + <password_settings> + <expire></expire> + <flag></flag> + <inact></inact> + <max>99999</max> + <min>0</min> + <warn>7</warn> + </password_settings> + <shell>/bin/bash</shell> + <uid>1000</uid> + <user_password>$2y$05$NA1Li9ZKJOLRW5mMTXm6/e5r8dltWS5RpDZpvHrI82aLE00V51tdi</user_password> + <username>vagrant</username> + </user> + <user> + <encrypted config:type="boolean">true</encrypted> + <fullname>Games account</fullname> + <gid>100</gid> + <home>/var/games</home> + <password_settings> + <expire></expire> + <flag></flag> + <inact></inact> + <max></max> + <min></min> + <warn></warn> + </password_settings> + <shell>/bin/bash</shell> + <uid>12</uid> + <user_password>*</user_password> + <username>games</username> + </user> + <user> + <encrypted config:type="boolean">true</encrypted> + <fullname>bin</fullname> + <gid>1</gid> + <home>/bin</home> + <password_settings> + <expire></expire> + <flag></flag> + <inact></inact> + <max></max> + <min></min> + <warn></warn> + </password_settings> + <shell>/bin/bash</shell> + <uid>1</uid> + <user_password>*</user_password> + <username>bin</username> + </user> + <user> + <encrypted config:type="boolean">true</encrypted> + <fullname>nobody</fullname> + <gid>65533</gid> + <home>/var/lib/nobody</home> + <password_settings> + <expire></expire> + <flag></flag> + <inact></inact> + <max></max> + <min></min> + <warn></warn> + </password_settings> + <shell>/bin/bash</shell> + <uid>65534</uid> + <user_password>*</user_password> + <username>nobody</username> + </user> + <user> + <encrypted config:type="boolean">true</encrypted> + <fullname>Printing daemon</fullname> + <gid>7</gid> + <home>/var/spool/lpd</home> + <password_settings> + <expire></expire> + <flag></flag> + <inact></inact> + <max></max> + <min></min> + <warn></warn> + </password_settings> + <shell>/bin/bash</shell> + <uid>4</uid> + <user_password>*</user_password> + <username>lp</username> + </user> + <user> + <encrypted config:type="boolean">true</encrypted> + <fullname>User for uuidd</fullname> + <gid>104</gid> + <home>/var/run/uuidd</home> + <password_settings> + <expire></expire> + <flag></flag> + <inact></inact> + <max>99999</max> + <min>0</min> + <warn>7</warn> + </password_settings> + <shell>/bin/false</shell> + <uid>102</uid> + <user_password>*</user_password> + <username>uuidd</username> + </user> + <user> + <encrypted config:type="boolean">true</encrypted> + <fullname>Postfix Daemon</fullname> + <gid>51</gid> + <home>/var/spool/postfix</home> + <password_settings> + <expire></expire> + <flag></flag> + <inact></inact> + <max>99999</max> + <min>0</min> + <warn>7</warn> + </password_settings> + <shell>/bin/false</shell> + <uid>51</uid> + <user_password>*</user_password> + <username>postfix</username> + </user> + <user> + <encrypted config:type="boolean">true</encrypted> + <fullname>Novell Customer Center User</fullname> + <gid>111</gid> + <home>/var/lib/YaST2/suse-ncc-fakehome</home> + <password_settings> + <expire></expire> + <flag></flag> + <inact></inact> + <max>99999</max> + <min>0</min> + <warn>7</warn> + </password_settings> + <shell>/bin/bash</shell> + <uid>106</uid> + <user_password>*</user_password> + <username>suse-ncc</username> + </user> + <user> + <encrypted config:type="boolean">true</encrypted> + <fullname>FTP account</fullname> + <gid>49</gid> + <home>/srv/ftp</home> + <password_settings> + <expire></expire> + <flag></flag> + <inact></inact> + <max></max> + <min></min> + <warn></warn> + </password_settings> + <shell>/bin/bash</shell> + <uid>40</uid> + <user_password>*</user_password> + <username>ftp</username> + </user> + <user> + <encrypted config:type="boolean">true</encrypted> + <fullname>Gnome Display Manager daemon</fullname> + <gid>112</gid> + <home>/var/lib/gdm</home> + <password_settings> + <expire></expire> + <flag></flag> + <inact></inact> + <max>99999</max> + <min>0</min> + <warn>7</warn> + </password_settings> + <shell>/bin/false</shell> + <uid>107</uid> + <user_password>*</user_password> + <username>gdm</username> + </user> + <user> + <encrypted config:type="boolean">true</encrypted> + <fullname>Batch jobs daemon</fullname> + <gid>25</gid> + <home>/var/spool/atjobs</home> + <password_settings> + <expire></expire> + <flag></flag> + <inact></inact> + <max>99999</max> + <min>0</min> + <warn>7</warn> + </password_settings> + <shell>/bin/bash</shell> + <uid>25</uid> + <user_password>*</user_password> + <username>at</username> + </user> + <user> + <encrypted config:type="boolean">true</encrypted> + <fullname>root</fullname> + <gid>0</gid> + <home>/root</home> + <password_settings> + <expire></expire> + <flag></flag> + <inact></inact> + <max></max> + <min></min> + <warn></warn> + </password_settings> + <shell>/bin/bash</shell> + <uid>0</uid> + <user_password>$2y$05$NA1Li9ZKJOLRW5mMTXm6/e5r8dltWS5RpDZpvHrI82aLE00V51tdi</user_password> + <username>root</username> + </user> + <user> + <encrypted config:type="boolean">true</encrypted> + <fullname>Mailer daemon</fullname> + <gid>12</gid> + <home>/var/spool/clientmqueue</home> + <password_settings> + <expire></expire> + <flag></flag> + <inact></inact> + <max></max> + <min></min> + <warn></warn> + </password_settings> + <shell>/bin/false</shell> + <uid>8</uid> + <user_password>*</user_password> + <username>mail</username> + </user> + <user> + <encrypted config:type="boolean">true</encrypted> + <fullname>Daemon</fullname> + <gid>2</gid> + <home>/sbin</home> + <password_settings> + <expire></expire> + <flag></flag> + <inact></inact> + <max></max> + <min></min> + <warn></warn> + </password_settings> + <shell>/bin/bash</shell> + <uid>2</uid> + <user_password>*</user_password> + <username>daemon</username> + </user> + <user> + <encrypted config:type="boolean">true</encrypted> + <fullname>NTP daemon</fullname> + <gid>108</gid> + <home>/var/lib/ntp</home> + <password_settings> + <expire></expire> + <flag></flag> + <inact></inact> + <max>99999</max> + <min>0</min> + <warn>7</warn> + </password_settings> + <shell>/bin/false</shell> + <uid>74</uid> + <user_password>*</user_password> + <username>ntp</username> + </user> + <user> + <encrypted config:type="boolean">true</encrypted> + <fullname>Unix-to-Unix CoPy system</fullname> + <gid>14</gid> + <home>/etc/uucp</home> + <password_settings> + <expire></expire> + <flag></flag> + <inact></inact> + <max></max> + <min></min> + <warn></warn> + </password_settings> + <shell>/bin/bash</shell> + <uid>10</uid> + <user_password>*</user_password> + <username>uucp</username> + </user> + <user> + <encrypted config:type="boolean">true</encrypted> + <fullname>User for D-Bus</fullname> + <gid>101</gid> + <home>/var/run/dbus</home> + <password_settings> + <expire></expire> + <flag></flag> + <inact></inact> + <max></max> + <min>0</min> + <warn>7</warn> + </password_settings> + <shell>/bin/false</shell> + <uid>100</uid> + <user_password>*</user_password> + <username>messagebus</username> + </user> + <user> + <encrypted config:type="boolean">true</encrypted> + <fullname>User for haldaemon</fullname> + <gid>102</gid> + <home>/var/run/hald</home> + <password_settings> + <expire></expire> + <flag></flag> + <inact></inact> + <max></max> + <min>0</min> + <warn>7</warn> + </password_settings> + <shell>/bin/false</shell> + <uid>101</uid> + <user_password>*</user_password> + <username>haldaemon</username> + </user> + <user> + <encrypted config:type="boolean">true</encrypted> + <fullname>WWW daemon apache</fullname> + <gid>8</gid> + <home>/var/lib/wwwrun</home> + <password_settings> + <expire></expire> + <flag></flag> + <inact></inact> + <max></max> + <min></min> + <warn></warn> + </password_settings> + <shell>/bin/false</shell> + <uid>30</uid> + <user_password>*</user_password> + <username>wwwrun</username> + </user> + <user> + <encrypted config:type="boolean">true</encrypted> + <fullname>Manual pages viewer</fullname> + <gid>62</gid> + <home>/var/cache/man</home> + <password_settings> + <expire></expire> + <flag></flag> + <inact></inact> + <max></max> + <min></min> + <warn></warn> + </password_settings> + <shell>/bin/bash</shell> + <uid>13</uid> + <user_password>*</user_password> + <username>man</username> + </user> + <user> + <encrypted config:type="boolean">true</encrypted> + <fullname>PolicyKit</fullname> + <gid>107</gid> + <home>/var/run/PolicyKit</home> + <password_settings> + <expire></expire> + <flag></flag> + <inact></inact> + <max>99999</max> + <min>0</min> + <warn>7</warn> + </password_settings> + <shell>/bin/false</shell> + <uid>104</uid> + <user_password>*</user_password> + <username>polkituser</username> + </user> + <user> + <encrypted config:type="boolean">true</encrypted> + <fullname>News system</fullname> + <gid>13</gid> + <home>/etc/news</home> + <password_settings> + <expire></expire> + <flag></flag> + <inact></inact> + <max></max> + <min></min> + <warn></warn> + </password_settings> + <shell>/bin/bash</shell> + <uid>9</uid> + <user_password>*</user_password> + <username>news</username> + </user> + <user> + <fullname>SSH daemon</fullname> + <gid>65</gid> + <home>/var/lib/sshd</home> + <shell>/bin/false</shell> + <uid>71</uid> + <username>sshd</username> + </user> + <user> + <encrypted config:type="boolean">true</encrypted> + <fullname>PulseAudio daemon</fullname> + <gid>109</gid> + <home>/var/lib/pulseaudio</home> + <password_settings> + <expire></expire> + <flag></flag> + <inact></inact> + <max>99999</max> + <min>0</min> + <warn>7</warn> + </password_settings> + <shell>/bin/false</shell> + <uid>105</uid> + <user_password>*</user_password> + <username>pulse</username> + </user> + </users> +</profile> diff --git a/definitions/sles-11-sp2-i386/cleanup.sh b/definitions/sles-11-sp2-i386/cleanup.sh new file mode 100644 index 000000000..dcb1d72bc --- /dev/null +++ b/definitions/sles-11-sp2-i386/cleanup.sh @@ -0,0 +1,9 @@ +#!/bin/bash -eux + +# remove zypper locks on removed packages to avoid later dependency problems +zypper --non-interactive rl \* +# zypper --non-interactive remove `rpm -qa virtualbox-guest-*` >/dev/null 2>&1 +# Add an online copy of the SLES DVD1 as a software repository, instead of the mounted DVD +zypper removerepo 'SUSE-Linux-Enterprise-Server-11-SP2 11.2.2-1.234' +zypper addrepo 'http://demeter.uni-regensburg.de/SLES11SP2-x86/DVD1/' 'SLES11SP2-x86 DVD1 Online' +zypper refresh diff --git a/definitions/sles-11-sp2-i386/definition.rb b/definitions/sles-11-sp2-i386/definition.rb new file mode 100644 index 000000000..0ee06e5b4 --- /dev/null +++ b/definitions/sles-11-sp2-i386/definition.rb @@ -0,0 +1,12 @@ +require File.dirname(__FILE__) + "/../.suse/session.rb" + +iso = "SLES-11-SP2-DVD-i586-GM-DVD1.iso" + +session = + SUSE_SESSION.merge( :memory_size=> '480', + :iso_download_instructions => "Download evaluation version from http://download.novell.com/Download?buildid=FkjGyLMMiss~", + :iso_file => iso, + :iso_md5 => "a0b34f6237b2b2a6b2174c82b40ed326", + :iso_src => "") + +Veewee::Session.declare session diff --git a/definitions/sles-11-sp2-i386/minimize.sh b/definitions/sles-11-sp2-i386/minimize.sh new file mode 120000 index 000000000..b3632ccbc --- /dev/null +++ b/definitions/sles-11-sp2-i386/minimize.sh @@ -0,0 +1 @@ +../.common/minimize.sh \ No newline at end of file diff --git a/definitions/sles-11-sp2-i386/sshd.sh b/definitions/sles-11-sp2-i386/sshd.sh new file mode 120000 index 000000000..f353f2d00 --- /dev/null +++ b/definitions/sles-11-sp2-i386/sshd.sh @@ -0,0 +1 @@ +../.common/sshd.sh \ No newline at end of file diff --git a/definitions/sles-11-sp2-i386/vagrant.sh b/definitions/sles-11-sp2-i386/vagrant.sh new file mode 120000 index 000000000..702949639 --- /dev/null +++ b/definitions/sles-11-sp2-i386/vagrant.sh @@ -0,0 +1 @@ +../.common/vagrant.sh \ No newline at end of file diff --git a/definitions/sles-11-sp2/autoinst.xml b/definitions/sles-11-sp2/autoinst.xml new file mode 100644 index 000000000..2dd64ffdb --- /dev/null +++ b/definitions/sles-11-sp2/autoinst.xml @@ -0,0 +1,2567 @@ +<?xml version="1.0"?> +<!DOCTYPE profile> +<profile xmlns="http://www.suse.com/1.0/yast2ns" xmlns:config="http://www.suse.com/1.0/configns"> + <add-on> + <add_on_products config:type="list"> + <listentry> + <media_url><![CDATA[http://demeter.uni-regensburg.de/SLE11SP2-SDK-x64/DVD1/]]></media_url> + <product>sle-sdk</product> + <product_dir>/</product_dir> + </listentry> + </add_on_products> + </add-on> + <bootloader> + <device_map config:type="list"> + <device_map_entry> + <firmware>hd0</firmware> + <linux>/dev/sda</linux> + </device_map_entry> + </device_map> + <global> + <activate>true</activate> + <boot_root>true</boot_root> + <default>SUSE Linux Enterprise Server 11 SP2 - 3.0.13-0.27</default> + <generic_mbr>true</generic_mbr> + <gfxmenu>/boot/message</gfxmenu> + <lines_cache_id>2</lines_cache_id> + <timeout config:type="integer">8</timeout> + </global> + <initrd_modules config:type="list"> + <initrd_module> + <module>ahci</module> + </initrd_module> + <initrd_module> + <module>ata_piix</module> + </initrd_module> + <initrd_module> + <module>ata_generic</module> + </initrd_module> + <initrd_module> + <module>jbd</module> + </initrd_module> + <initrd_module> + <module>mbcache</module> + </initrd_module> + <initrd_module> + <module>ext3</module> + </initrd_module> + </initrd_modules> + <loader_type>grub</loader_type> + <sections config:type="list"> + <section> + <append>resume=/dev/sda1 splash=silent crashkernel=128M-:64M showopts</append> + <image>(hd0,1)/boot/vmlinuz-3.0.13-0.27-default</image> + <initial>1</initial> + <initrd>(hd0,1)/boot/initrd-3.0.13-0.27-default</initrd> + <lines_cache_id>0</lines_cache_id> + <name>SUSE Linux Enterprise Server 11 SP2 - 3.0.13-0.27</name> + <original_name>linux</original_name> + <root>/dev/sda2</root> + <type>image</type> + <vgamode>0x314</vgamode> + </section> + <section> + <append>showopts ide=nodma apm=off noresume edd=off powersaved=off nohz=off highres=off processor.max_cstate=1 nomodeset x11failsafe</append> + <image>(hd0,1)/boot/vmlinuz-3.0.13-0.27-default</image> + <initrd>(hd0,1)/boot/initrd-3.0.13-0.27-default</initrd> + <lines_cache_id>1</lines_cache_id> + <name>Failsafe -- SUSE Linux Enterprise Server 11 SP2 - 3.0.13-0.27</name> + <original_name>failsafe</original_name> + <root>/dev/sda2</root> + <type>image</type> + <vgamode>0x314</vgamode> + </section> + </sections> + </bootloader> + <ca_mgm> + <CAName>YaST_Default_CA</CAName> + <ca_commonName>YaST Default CA (vagrant-sles-11sp2-x64)</ca_commonName> + <country>US</country> + <locality></locality> + <organisation></organisation> + <organisationUnit></organisationUnit> + <password>ENTER PASSWORD HERE</password> + <server_commonName>vagrant-sles-11sp2-x64.vagrantup.com</server_commonName> + <server_email>postmaster@vagrantup.com</server_email> + <state></state> + <takeLocalServerName config:type="boolean">false</takeLocalServerName> + </ca_mgm> + <deploy_image> + <image_installation config:type="boolean">false</image_installation> + </deploy_image> + <general> + <ask-list config:type="list"/> + <mode> + <confirm config:type="boolean">false</confirm> + </mode> + <mouse> + <id>none</id> + </mouse> + <proposals config:type="list"/> + <signature-handling> + <accept_file_without_checksum config:type="boolean">true</accept_file_without_checksum> + <accept_non_trusted_gpg_key config:type="boolean">true</accept_non_trusted_gpg_key> + <accept_unknown_gpg_key config:type="boolean">true</accept_unknown_gpg_key> + <accept_unsigned_file config:type="boolean">true</accept_unsigned_file> + <accept_verification_failed config:type="boolean">false</accept_verification_failed> + <import_gpg_key config:type="boolean">true</import_gpg_key> + </signature-handling> + <storage/> + </general> + <groups config:type="list"> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>100</gid> + <group_password>x</group_password> + <groupname>users</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>19</gid> + <group_password>x</group_password> + <groupname>floppy</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>1</gid> + <group_password>x</group_password> + <groupname>bin</groupname> + <userlist>daemon</userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>41</gid> + <group_password>x</group_password> + <groupname>xok</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>65533</gid> + <group_password>x</group_password> + <groupname>nobody</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>43</gid> + <group_password>x</group_password> + <groupname>modem</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>5</gid> + <group_password>x</group_password> + <groupname>tty</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>7</gid> + <group_password>x</group_password> + <groupname>lp</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>104</gid> + <group_password>!</group_password> + <groupname>uuidd</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>51</gid> + <group_password>!</group_password> + <groupname>postfix</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>112</gid> + <group_password>!</group_password> + <groupname>gdm</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>65534</gid> + <group_password>x</group_password> + <groupname>nogroup</groupname> + <userlist>nobody</userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>101</gid> + <group_password>!</group_password> + <groupname>messagebus</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>59</gid> + <group_password>!</group_password> + <groupname>maildrop</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>33</gid> + <group_password>x</group_password> + <groupname>video</groupname> + <userlist>vagrant</userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>3</gid> + <group_password>x</group_password> + <groupname>sys</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>15</gid> + <group_password>x</group_password> + <groupname>shadow</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>20</gid> + <group_password>x</group_password> + <groupname>cdrom</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>21</gid> + <group_password>x</group_password> + <groupname>console</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>42</gid> + <group_password>x</group_password> + <groupname>trusted</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>102</gid> + <group_password>!</group_password> + <groupname>haldaemon</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>106</gid> + <group_password>!</group_password> + <groupname>puppet</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>16</gid> + <group_password>x</group_password> + <groupname>dialout</groupname> + <userlist>vagrant</userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>107</gid> + <group_password>!</group_password> + <groupname>polkituser</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>10</gid> + <group_password>x</group_password> + <groupname>wheel</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>109</gid> + <group_password>!</group_password> + <groupname>pulse</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>8</gid> + <group_password>x</group_password> + <groupname>www</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>40</gid> + <group_password>x</group_password> + <groupname>games</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>6</gid> + <group_password>x</group_password> + <groupname>disk</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>17</gid> + <group_password>x</group_password> + <groupname>audio</groupname> + <userlist>pulse</userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>111</gid> + <group_password>!</group_password> + <groupname>suse-ncc</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>49</gid> + <group_password>x</group_password> + <groupname>ftp</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>103</gid> + <group_password>!</group_password> + <groupname>tape</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>25</gid> + <group_password>!</group_password> + <groupname>at</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>9</gid> + <group_password>x</group_password> + <groupname>kmem</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>32</gid> + <group_password>x</group_password> + <groupname>public</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>12</gid> + <group_password>x</group_password> + <groupname>mail</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>0</gid> + <group_password>x</group_password> + <groupname>root</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>2</gid> + <group_password>x</group_password> + <groupname>daemon</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>105</gid> + <group_password>!</group_password> + <groupname>sfcb</groupname> + <userlist>root</userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>108</gid> + <group_password>!</group_password> + <groupname>ntp</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>14</gid> + <group_password>x</group_password> + <groupname>uucp</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>110</gid> + <group_password>!</group_password> + <groupname>pulse-access</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>71</gid> + <group_password>!</group_password> + <groupname>ntadmin</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>62</gid> + <group_password>x</group_password> + <groupname>man</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>22</gid> + <group_password>x</group_password> + <groupname>utmp</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>13</gid> + <group_password>x</group_password> + <groupname>news</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>65</gid> + <group_password>!</group_password> + <groupname>sshd</groupname> + <userlist></userlist> + </group> + </groups> + <host> + <hosts config:type="list"> + <hosts_entry> + <host_address>127.0.0.1</host_address> + <names config:type="list"> + <name>localhost</name> + </names> + </hosts_entry> + <hosts_entry> + <host_address>::1</host_address> + <names config:type="list"> + <name>localhost ipv6-localhost ipv6-loopback</name> + </names> + </hosts_entry> + <hosts_entry> + <host_address>fe00::0</host_address> + <names config:type="list"> + <name>ipv6-localnet</name> + </names> + </hosts_entry> + <hosts_entry> + <host_address>ff00::0</host_address> + <names config:type="list"> + <name>ipv6-mcastprefix</name> + </names> + </hosts_entry> + <hosts_entry> + <host_address>ff02::1</host_address> + <names config:type="list"> + <name>ipv6-allnodes</name> + </names> + </hosts_entry> + <hosts_entry> + <host_address>ff02::2</host_address> + <names config:type="list"> + <name>ipv6-allrouters</name> + </names> + </hosts_entry> + <hosts_entry> + <host_address>ff02::3</host_address> + <names config:type="list"> + <name>ipv6-allhosts</name> + </names> + </hosts_entry> + </hosts> + </host> + <login_settings/> + <networking> + <dhcp_options> + <dhclient_client_id></dhclient_client_id> + <dhclient_hostname_option>AUTO</dhclient_hostname_option> + </dhcp_options> + <dns> + <dhcp_hostname config:type="boolean">false</dhcp_hostname> + <domain>vagrantup.com</domain> + <hostname>vagrant-sles-11sp2-x64</hostname> + <resolv_conf_policy>auto</resolv_conf_policy> + <searchlist config:type="list"> + <search>vagrantup.com</search> + </searchlist> + <write_hostname config:type="boolean">true</write_hostname> + </dns> + <interfaces config:type="list"> + <interface> + <bootproto>dhcp</bootproto> + <device>eth0</device> + <name>82540EM Gigabit Ethernet Controller</name> + <startmode>auto</startmode> + <usercontrol>no</usercontrol> + </interface> + </interfaces> + <managed config:type="boolean">false</managed> + <net-udev config:type="list"> + <rule> + <name>eth0</name> + <rule>KERNELS</rule> + <value>0000:00:03.0</value> + </rule> + </net-udev> + <routing> + <ip_forward config:type="boolean">false</ip_forward> + </routing> + </networking> + <partitioning config:type="list"> + <drive> + <device>/dev/sda</device> + <initialize config:type="boolean">true</initialize> + <partitions config:type="list"> + <partition> + <create config:type="boolean">true</create> + <crypt_fs config:type="boolean">false</crypt_fs> + <filesystem config:type="symbol">swap</filesystem> + <format config:type="boolean">true</format> + <fstopt>defaults</fstopt> + <loop_fs config:type="boolean">false</loop_fs> + <mount>swap</mount> + <mountby config:type="symbol">device</mountby> + <partition_id config:type="integer">130</partition_id> + <partition_nr config:type="integer">1</partition_nr> + <raid_options/> + <resize config:type="boolean">false</resize> + <size>1561492992</size> + </partition> + <partition> + <create config:type="boolean">true</create> + <crypt_fs config:type="boolean">false</crypt_fs> + <filesystem config:type="symbol">ext3</filesystem> + <format config:type="boolean">true</format> + <fstopt>acl,user_xattr</fstopt> + <loop_fs config:type="boolean">false</loop_fs> + <mount>/</mount> + <mountby config:type="symbol">device</mountby> + <partition_id config:type="integer">131</partition_id> + <partition_nr config:type="integer">2</partition_nr> + <raid_options/> + <resize config:type="boolean">false</resize> + <size>19895844352</size> + </partition> + </partitions> + <pesize></pesize> + <type config:type="symbol">CT_DISK</type> + <use>all</use> + </drive> + </partitioning> + <report> + <errors> + <log config:type="boolean">true</log> + <show config:type="boolean">true</show> + <timeout config:type="integer">0</timeout> + </errors> + <messages> + <log config:type="boolean">true</log> + <show config:type="boolean">true</show> + <timeout config:type="integer">0</timeout> + </messages> + <warnings> + <log config:type="boolean">true</log> + <show config:type="boolean">true</show> + <timeout config:type="integer">0</timeout> + </warnings> + <yesno_messages> + <log config:type="boolean">true</log> + <show config:type="boolean">true</show> + <timeout config:type="integer">0</timeout> + </yesno_messages> + </report> + <software> + + <packages config:type="list"> + <package>desktop-translations</package> + <package>gconf2-branding-SLES</package> + <package>libproxy0-config-gnome</package> + <package>sle-sdk-release</package> + <package>sle-sdk-release-SDK</package> + <package>sles-manuals_en</package> + <package>yast2-trans-en_US</package> + </packages> + <patterns config:type="list"> + <pattern>Basis-Devel</pattern> + <pattern>Minimal</pattern> + <pattern>apparmor</pattern> + <pattern>base</pattern> + <pattern>sdk_kernel</pattern> + <pattern>sdk_libs</pattern> + <pattern>sdk_ruby</pattern> + </patterns> + <remove-packages config:type="list"> + <package>3ddiag</package> + <package>CASA</package> + <package>CASA-devel</package> + <package>CASA_auth_token_client</package> + <package>CASA_auth_token_client-devel</package> + <package>ConsoleKit-devel</package> + <package>ConsoleKit-x11</package> + <package>DirectFB-devel</package> + <package>FastCGI</package> + <package>IlmBase</package> + <package>IlmBase-devel</package> + <package>ImageMagick</package> + <package>ImageMagick-devel</package> + <package>LibVNCServer</package> + <package>LibVNCServer-devel</package> + <package>Mesa</package> + <package>Mesa-devel</package> + <package>ModemManager</package> + <package>Modules</package> + <package>NetworkManager</package> + <package>NetworkManager-devel</package> + <package>NetworkManager-glib</package> + <package>NetworkManager-gnome</package> + <package>NetworkManager-kde4</package> + <package>NetworkManager-kde4-lang</package> + <package>NetworkManager-kde4-libs</package> + <package>OpenEXR</package> + <package>OpenEXR-devel</package> + <package>OpenIPMI-devel</package> + <package>PackageKit</package> + <package>PackageKit-devel</package> + <package>PackageKit-lang</package> + <package>PolicyKit-devel</package> + <package>PolicyKit-gnome</package> + <package>PolicyKit-gnome-devel</package> + <package>PolicyKit-gnome-libs</package> + <package>SDL-devel</package> + <package>SDL_net</package> + <package>SDL_net-devel</package> + <package>TeX-Guy</package> + <package>TeX-Guy-devel</package> + <package>VFlib3</package> + <package>VFlib3-devel</package> + <package>WindowMaker</package> + <package>WindowMaker-devel</package> + <package>a2ps</package> + <package>aalib</package> + <package>aalib-devel</package> + <package>akonadi-runtime</package> + <package>akregator</package> + <package>alsa-devel</package> + <package>alsa-firmware</package> + <package>alsa-plugins-pulse</package> + <package>alsa-tools</package> + <package>alsa-tools-devel</package> + <package>anthy</package> + <package>anthy-devel</package> + <package>antlr</package> + <package>apache2</package> + <package>apache2-devel</package> + <package>apache2-mod_perl</package> + <package>apache2-mod_perl-devel</package> + <package>apache2-prefork</package> + <package>apache2-utils</package> + <package>apache2-worker</package> + <package>apparmor-profile-editor</package> + <package>art-sharp2</package> + <package>arts</package> + <package>arts-devel</package> + <package>aspell-devel</package> + <package>at-spi</package> + <package>at-spi-devel</package> + <package>at-spi-lang</package> + <package>atk-devel</package> + <package>audiofile</package> + <package>audiofile-devel</package> + <package>audit-devel</package> + <package>automoc4</package> + <package>avahi</package> + <package>avahi-compat-howl-devel</package> + <package>avahi-compat-mDNSResponder-devel</package> + <package>avahi-lang</package> + <package>babl-0_0</package> + <package>banshee-1</package> + <package>banshee-1-backend-engine-gstreamer</package> + <package>banshee-1-backend-platform-gnome</package> + <package>banshee-1-backend-platform-unix</package> + <package>banshee-1-devel</package> + <package>banshee-1-extensions-default</package> + <package>banshee-1-lang</package> + <package>beagle-devel</package> + <package>bind-devel</package> + <package>binutils-devel</package> + <package>bluez</package> + <package>bluez-devel</package> + <package>boo</package> + <package>boo-devel</package> + <package>boost-devel</package> + <package>bootsplash-branding-SLED</package> + <package>cairo-devel</package> + <package>cairomm</package> + <package>cairomm-devel</package> + <package>canna</package> + <package>canna-devel</package> + <package>canna-libs</package> + <package>cannadic</package> + <package>capi4linux</package> + <package>capi4linux-devel</package> + <package>cdk</package> + <package>cdk-devel</package> + <package>cdrdao</package> + <package>chasen</package> + <package>chasen-devel</package> + <package>check</package> + <package>check-devel</package> + <package>chmlib</package> + <package>chmlib-devel</package> + <package>cim-schema</package> + <package>clucene-core</package> + <package>clucene-core-devel</package> + <package>cmake</package> + <package>compiz</package> + <package>compiz-branding-SLE</package> + <package>compiz-devel</package> + <package>compiz-gnome</package> + <package>coolkey-devel</package> + <package>cracklib-devel</package> + <package>crash-devel</package> + <package>crimson</package> + <package>cscope</package> + <package>cups</package> + <package>cups-devel</package> + <package>cvsps</package> + <package>cyrus-imapd-devel</package> + <package>cyrus-sasl-crammd5</package> + <package>cyrus-sasl-devel</package> + <package>dante</package> + <package>dante-devel</package> + <package>db1</package> + <package>db1-devel</package> + <package>db43</package> + <package>db43-devel</package> + <package>dbus-1-devel</package> + <package>dbus-1-glib-devel</package> + <package>dbus-1-python-devel</package> + <package>dbus-1-qt3</package> + <package>dbus-1-qt3-devel</package> + <package>dbus-1-x11</package> + <package>dejagnu</package> + <package>dejavu</package> + <package>desktop-data-openSUSE</package> + <package>desktop-file-utils</package> + <package>devhelp</package> + <package>devhelp-devel</package> + <package>devhelp-lang</package> + <package>device-mapper-devel</package> + <package>dhcp</package> + <package>dhcp-client</package> + <package>dhcp-devel</package> + <package>diffstat</package> + <package>dmapi-devel</package> + <package>dnsmasq</package> + <package>docbook-xsl-stylesheets</package> + <package>docbook_4</package> + <package>doxygen</package> + <package>dvd+rw-tools</package> + <package>e2fsprogs-devel</package> + <package>emacs</package> + <package>emacs-nox</package> + <package>emacs-x11</package> + <package>enchant</package> + <package>enchant-devel</package> + <package>enscript</package> + <package>eog</package> + <package>eog-devel</package> + <package>eog-lang</package> + <package>espeak</package> + <package>evince</package> + <package>evince-devel</package> + <package>evince-lang</package> + <package>evoldap2-devel</package> + <package>evolution</package> + <package>evolution-data-server</package> + <package>evolution-data-server-devel</package> + <package>evolution-data-server-lang</package> + <package>evolution-devel</package> + <package>evolution-lang</package> + <package>expect-devel</package> + <package>facter</package> + <package>fam</package> + <package>fam-devel</package> + <package>farsight</package> + <package>farsight-devel</package> + <package>festival</package> + <package>festival-devel</package> + <package>fftw</package> + <package>fftw-devel</package> + <package>fftw-mpi</package> + <package>fftw-mpi-devel</package> + <package>fftw-threads</package> + <package>fftw-threads-devel</package> + <package>fftw3</package> + <package>fftw3-devel</package> + <package>fftw3-threads</package> + <package>fftw3-threads-devel</package> + <package>file-devel</package> + <package>fileshareset</package> + <package>finch</package> + <package>finch-devel</package> + <package>flac-devel</package> + <package>fltk</package> + <package>fltk-devel</package> + <package>fontconfig-devel</package> + <package>fonts-config</package> + <package>foomatic-filters</package> + <package>freeglut</package> + <package>freeglut-devel</package> + <package>freeradius-client-devel</package> + <package>freeradius-client-libs</package> + <package>freeradius-server-devel</package> + <package>freeradius-server-libs</package> + <package>freetype</package> + <package>freetype2-devel</package> + <package>fribidi</package> + <package>fribidi-devel</package> + <package>ft2demos</package> + <package>fuse-devel</package> + <package>fwnn-devel</package> + <package>fxload</package> + <package>gcc-gij</package> + <package>gcc-java</package> + <package>gcc43-gij</package> + <package>gcc43-java</package> + <package>gconf-sharp2</package> + <package>gconf2-devel</package> + <package>gconfmm</package> + <package>gconfmm-devel</package> + <package>gd</package> + <package>gd-devel</package> + <package>gdbm-32bit</package> + <package>gdk-pixbuf</package> + <package>gdk-pixbuf-devel</package> + <package>gegl-0_0</package> + <package>gettext-tools</package> + <package>gfxboot-branding-SLED</package> + <package>gfxboot-devel</package> + <package>ggz</package> + <package>ggz-client-libs</package> + <package>ggz-client-libs-devel</package> + <package>ggz-client-libs-lang</package> + <package>ghex</package> + <package>ghex-devel</package> + <package>ghex-lang</package> + <package>ghostscript-devel</package> + <package>ghostscript-fonts-other</package> + <package>ghostscript-fonts-std</package> + <package>ghostscript-ijs-devel</package> + <package>ghostscript-library</package> + <package>ghostscript-omni</package> + <package>ghostscript-x11</package> + <package>giflib-devel</package> + <package>gimp</package> + <package>gimp-branding-SLED</package> + <package>gimp-devel</package> + <package>gimp-lang</package> + <package>gimp-plugins-python</package> + <package>git</package> + <package>git-arch</package> + <package>git-core</package> + <package>git-cvs</package> + <package>git-daemon</package> + <package>git-email</package> + <package>git-gui</package> + <package>git-svn</package> + <package>git-web</package> + <package>gitk</package> + <package>gjdoc</package> + <package>glade-sharp2</package> + <package>glade3</package> + <package>glade3-lang</package> + <package>glib</package> + <package>glib-devel</package> + <package>glib-sharp2</package> + <package>glib2-devel</package> + <package>glibmm2</package> + <package>glibmm2-devel</package> + <package>glitz</package> + <package>glitz-devel</package> + <package>gltt</package> + <package>gltt-devel</package> + <package>gmime-2_4-devel</package> + <package>gmime-devel</package> + <package>gmp-devel</package> + <package>gnet</package> + <package>gnet-devel</package> + <package>gnokii</package> + <package>gnokii-devel</package> + <package>gnokii-smsd</package> + <package>gnome-certauth-devel</package> + <package>gnome-control-center</package> + <package>gnome-control-center-devel</package> + <package>gnome-control-center-lang</package> + <package>gnome-desktop</package> + <package>gnome-desktop-devel</package> + <package>gnome-desktop-lang</package> + <package>gnome-doc-utils</package> + <package>gnome-doc-utils-devel</package> + <package>gnome-doc-utils-lang</package> + <package>gnome-keyring-devel</package> + <package>gnome-keyring-sharp</package> + <package>gnome-keyring-sharp-devel</package> + <package>gnome-libs</package> + <package>gnome-libs-devel</package> + <package>gnome-mag</package> + <package>gnome-mag-devel</package> + <package>gnome-mag-lang</package> + <package>gnome-main-menu</package> + <package>gnome-main-menu-lang</package> + <package>gnome-media</package> + <package>gnome-media-devel</package> + <package>gnome-media-lang</package> + <package>gnome-menus</package> + <package>gnome-menus-branding-SLED</package> + <package>gnome-menus-devel</package> + <package>gnome-menus-lang</package> + <package>gnome-mount</package> + <package>gnome-mount-lang</package> + <package>gnome-panel</package> + <package>gnome-panel-devel</package> + <package>gnome-panel-lang</package> + <package>gnome-pilot</package> + <package>gnome-pilot-devel</package> + <package>gnome-pilot-lang</package> + <package>gnome-settings-daemon</package> + <package>gnome-settings-daemon-devel</package> + <package>gnome-settings-daemon-lang</package> + <package>gnome-sharp2</package> + <package>gnome-speech</package> + <package>gnome-speech-devel</package> + <package>gnome-themes</package> + <package>gnome-utils</package> + <package>gnome-utils-devel</package> + <package>gnome-utils-lang</package> + <package>gnome-vfs-sharp2</package> + <package>gnome-vfs2</package> + <package>gnome-vfs2-devel</package> + <package>gnome-vfs2-lang</package> + <package>gnome-vfsmm</package> + <package>gnome-vfsmm-devel</package> + <package>gnopernicus</package> + <package>gnopernicus-devel</package> + <package>gnopernicus-lang</package> + <package>gnutls</package> + <package>goffice</package> + <package>goffice-devel</package> + <package>goffice-lang</package> + <package>goocanvas</package> + <package>goocanvas-devel</package> + <package>goocanvas-lang</package> + <package>goom2k4</package> + <package>goom2k4-devel</package> + <package>graphviz</package> + <package>graphviz-devel</package> + <package>graphviz-gd</package> + <package>graphviz-gnome</package> + <package>gstreamer-0_10</package> + <package>gstreamer-0_10-devel</package> + <package>gstreamer-0_10-lang</package> + <package>gstreamer-0_10-plugins-base</package> + <package>gstreamer-0_10-plugins-base-devel</package> + <package>gstreamer-0_10-plugins-base-lang</package> + <package>gstreamer-0_10-plugins-good</package> + <package>gstreamer-0_10-plugins-good-lang</package> + <package>gstreamer-0_10-utils</package> + <package>gstreamer-utils</package> + <package>gtk</package> + <package>gtk-devel</package> + <package>gtk-lang</package> + <package>gtk-sharp2</package> + <package>gtk-vnc-devel</package> + <package>gtk2-devel</package> + <package>gtkglext</package> + <package>gtkglext-devel</package> + <package>gtkhtml2</package> + <package>gtkhtml2-devel</package> + <package>gtkhtml2-lang</package> + <package>gtkhtml314-sharp</package> + <package>gtkmm2</package> + <package>gtkmm2-devel</package> + <package>gtksourceview-devel</package> + <package>gtksourceview-lang</package> + <package>gtksourceview18</package> + <package>gtksourceview18-devel</package> + <package>gtkspell</package> + <package>gtkspell-devel</package> + <package>gtkspell-lang</package> + <package>gucharmap</package> + <package>gucharmap-devel</package> + <package>gucharmap-lang</package> + <package>guile</package> + <package>guile-devel</package> + <package>gutenprint</package> + <package>gutenprint-devel</package> + <package>gvfs-devel</package> + <package>gxmhtml</package> + <package>hal-devel</package> + <package>hal-palm</package> + <package>htdig</package> + <package>htdig-devel</package> + <package>hunspell</package> + <package>hunspell-devel</package> + <package>hunspell-tools</package> + <package>hwinfo-devel</package> + <package>i4l-base</package> + <package>icewm</package> + <package>icewm-lite</package> + <package>id3lib</package> + <package>id3lib-devel</package> + <package>imap-devel</package> + <package>imap-lib</package> + <package>imlib</package> + <package>imlib-devel</package> + <package>imlib2</package> + <package>imlib2-devel</package> + <package>indent</package> + <package>info2html</package> + <package>inn</package> + <package>inn-devel</package> + <package>intltool</package> + <package>ipadic</package> + <package>iptables-devel</package> + <package>iso-codes</package> + <package>iso-codes-devel</package> + <package>iso_ent</package> + <package>ispell</package> + <package>ispell-american</package> + <package>ispell-brazilian</package> + <package>ispell-british</package> + <package>ispell-czech</package> + <package>ispell-danish</package> + <package>ispell-finnish</package> + <package>ispell-french</package> + <package>ispell-german</package> + <package>ispell-hungarian</package> + <package>ispell-italian</package> + <package>ispell-ngerman</package> + <package>ispell-norsk</package> + <package>ispell-polish</package> + <package>ispell-portuguese</package> + <package>ispell-russian</package> + <package>ispell-slovak</package> + <package>ispell-spanish</package> + <package>ispell-swedish</package> + <package>itcl-devel</package> + <package>java-1_4_2-ibm</package> + <package>java-1_4_2-ibm-devel</package> + <package>java-1_5_0-gcj-compat</package> + <package>java-1_5_0-gcj-compat-devel</package> + <package>java-1_6_0-ibm</package> + <package>java-1_6_0-ibm-devel</package> + <package>joe</package> + <package>jpackage-utils</package> + <package>k3b</package> + <package>k3b-devel</package> + <package>k3b-lang</package> + <package>kaddressbook</package> + <package>kalarm</package> + <package>kde-susetranslations</package> + <package>kde4-filesystem</package> + <package>kde4-kgreeter-plugins</package> + <package>kdebase3</package> + <package>kdebase3-devel</package> + <package>kdebase3-runtime</package> + <package>kdebase4-SLED</package> + <package>kdebase4-SLED-lang</package> + <package>kdebase4-runtime</package> + <package>kdebase4-runtime-branding-SLED</package> + <package>kdebase4-workspace</package> + <package>kdebase4-workspace-branding-SLED</package> + <package>kdebase4-workspace-devel</package> + <package>kdebase4-workspace-ksysguardd</package> + <package>kdelibs3</package> + <package>kdelibs3-arts</package> + <package>kdelibs3-default-style</package> + <package>kdelibs3-devel</package> + <package>kdelibs3-doc</package> + <package>kdelibs4</package> + <package>kdelibs4-branding-SLED</package> + <package>kdelibs4-core</package> + <package>kdelibs4-doc</package> + <package>kdemultimedia3-arts</package> + <package>kdepim3</package> + <package>kdepim4</package> + <package>kdepim4-devel</package> + <package>kdepimlibs4</package> + <package>kdialog</package> + <package>kdm</package> + <package>kdm-branding-SLED</package> + <package>kernel-docs</package> + <package>kernel-syms</package> + <package>kernel-trace-devel</package> + <package>kernel-xen-devel</package> + <package>keyutils-devel</package> + <package>kio_sysinfo</package> + <package>kio_sysinfo-branding-SLED</package> + <package>kmail</package> + <package>knode</package> + <package>kontact</package> + <package>korganizer</package> + <package>kpilot</package> + <package>krb5-devel</package> + <package>ksh-devel</package> + <package>ktorrent</package> + <package>ktorrent-devel</package> + <package>ktorrent-lang</package> + <package>kwin</package> + <package>ladspa-devel</package> + <package>lib3ds-1-3</package> + <package>lib3ds-devel</package> + <package>libFLAC++6</package> + <package>libFLAC8</package> + <package>libHX-devel</package> + <package>libMagick++-devel</package> + <package>libMagick++1</package> + <package>libMagickWand1</package> + <package>libQtWebKit-devel</package> + <package>libQtWebKit4</package> + <package>libXerces-c-devel</package> + <package>libXerces-c28</package> + <package>libXiterm</package> + <package>libXiterm-devel</package> + <package>libacl-devel</package> + <package>libadns-devel</package> + <package>libadns1</package> + <package>libakode</package> + <package>libakode-devel</package> + <package>libakonadi4</package> + <package>libakonadiprotocolinternals-devel</package> + <package>libakonadiprotocolinternals1</package> + <package>libao</package> + <package>libao-devel</package> + <package>libapparmor-devel</package> + <package>libapr-util1</package> + <package>libapr-util1-devel</package> + <package>libapr1</package> + <package>libapr1-devel</package> + <package>libarchive-devel</package> + <package>libart_lgpl</package> + <package>libart_lgpl-devel</package> + <package>libassuan-devel</package> + <package>libatomic-ops-devel</package> + <package>libattr-devel</package> + <package>libavahi-core5</package> + <package>libavahi-devel</package> + <package>libavahi-glib-devel</package> + <package>libavahi-gobject-devel</package> + <package>libavahi-gobject0</package> + <package>libavahi-ui0</package> + <package>libavc1394-0</package> + <package>libavc1394-devel</package> + <package>libbabl-0_0-0</package> + <package>libbeagle-devel</package> + <package>libbeagle-python</package> + <package>libbeagle1</package> + <package>libbitmask-devel</package> + <package>libbitmask1</package> + <package>libblkid-devel</package> + <package>libblocxx-devel</package> + <package>libbonobo</package> + <package>libbonobo-devel</package> + <package>libbonobo-lang</package> + <package>libbonoboui</package> + <package>libbonoboui-devel</package> + <package>libbonoboui-lang</package> + <package>libboost_date_time1_36_0</package> + <package>libboost_filesystem1_36_0</package> + <package>libboost_graph1_36_0</package> + <package>libboost_iostreams1_36_0</package> + <package>libboost_math1_36_0</package> + <package>libboost_mpi1_36_0</package> + <package>libboost_program_options1_36_0</package> + <package>libboost_python1_36_0</package> + <package>libboost_serialization1_36_0</package> + <package>libboost_signals1_36_0</package> + <package>libboost_system1_36_0</package> + <package>libboost_test1_36_0</package> + <package>libboost_thread1_36_0</package> + <package>libboost_wave1_36_0</package> + <package>libbotan-1_6_4</package> + <package>libbotan-devel</package> + <package>libbtctl</package> + <package>libbtctl-devel</package> + <package>libbtctl-lang</package> + <package>libbtctl4</package> + <package>libbz2-devel</package> + <package>libcaca</package> + <package>libcaca-devel</package> + <package>libcanberra-gtk</package> + <package>libcanberra-gtk0</package> + <package>libcanberra0</package> + <package>libcap-devel</package> + <package>libcap-ng0</package> + <package>libcdda_interface0</package> + <package>libcdda_paranoia0</package> + <package>libcddb-devel</package> + <package>libcddb2</package> + <package>libcdio++0</package> + <package>libcdio-devel</package> + <package>libcgroup-devel</package> + <package>libcgroup1</package> + <package>libchewing</package> + <package>libchewing-devel</package> + <package>libcmpiutil</package> + <package>libcmpiutil-devel</package> + <package>libcolorblind0</package> + <package>libcom_err-devel</package> + <package>libcompizconfig</package> + <package>libcompizconfig-devel</package> + <package>libcppunit-1_12-0</package> + <package>libcppunit-devel</package> + <package>libcpuset-devel</package> + <package>libcpuset1</package> + <package>libcroco</package> + <package>libcroco-0_6-3</package> + <package>libcroco-devel</package> + <package>libcryptsetup-devel</package> + <package>libcsync-devel</package> + <package>libcsync0</package> + <package>libcurl-devel</package> + <package>libdaemon-devel</package> + <package>libdaemon0</package> + <package>libdatrie-devel</package> + <package>libdatrie0</package> + <package>libdb-4_5-32bit</package> + <package>libdb-4_5-devel</package> + <package>libdbus-1-qt3-0</package> + <package>libdbus-1-qt3-0-devel</package> + <package>libdc1394-22</package> + <package>libdc1394-devel</package> + <package>libdc1394_control12</package> + <package>libdc1394_control12-devel</package> + <package>libdhcp6client-1_0-2</package> + <package>libdhcp6client-devel</package> + <package>libdigikam-devel</package> + <package>libdiscid1</package> + <package>libdjvulibre-devel</package> + <package>libdjvulibre21</package> + <package>libdmxview-devel</package> + <package>libdmxview0</package> + <package>libdnet-devel</package> + <package>libdnet1</package> + <package>libdns_sd</package> + <package>libdrm</package> + <package>libdrm-devel</package> + <package>libdv-devel</package> + <package>libdv4</package> + <package>libdvdread4</package> + <package>libdw-devel</package> + <package>libebl-devel</package> + <package>libedit-devel</package> + <package>libedit0</package> + <package>libelf-devel</package> + <package>libenchant1</package> + <package>libesd-devel</package> + <package>libesd0</package> + <package>libesmtp-devel</package> + <package>libevoldap-2_4-2</package> + <package>libevtlog-devel</package> + <package>libevtlog0</package> + <package>libexempi-devel</package> + <package>libexempi3</package> + <package>libexif-devel</package> + <package>libexiv2-4</package> + <package>libexiv2-devel</package> + <package>libexpat-devel</package> + <package>libext2fs-devel</package> + <package>libfarsight-0_1-3</package> + <package>libffi-devel</package> + <package>libffi43</package> + <package>libffi43-devel</package> + <package>libflaim-devel</package> + <package>libfprint-devel</package> + <package>libfreebl3</package> + <package>libfreebob</package> + <package>libfreebob-devel</package> + <package>libgadu</package> + <package>libgadu-devel</package> + <package>libgail-gnome</package> + <package>libgail-gnome-devel</package> + <package>libgcj-devel</package> + <package>libgcj43</package> + <package>libgcj43-devel</package> + <package>libgcj43-jar</package> + <package>libgcj_bc43</package> + <package>libgcrypt-devel</package> + <package>libgda-3_0-3</package> + <package>libgda-3_0-devel</package> + <package>libgdiplus0</package> + <package>libgegl-0_0-0</package> + <package>libgeoclue0</package> + <package>libgfortran46</package> + <package>libggz2</package> + <package>libggz2-devel</package> + <package>libgimpprint</package> + <package>libgimpprint-devel</package> + <package>libglade2</package> + <package>libglade2-devel</package> + <package>libglademm</package> + <package>libglademm-2_4-1</package> + <package>libglademm-devel</package> + <package>libgladeui-1-9</package> + <package>libgladeui-1_0-devel</package> + <package>libgmime-2_0-3</package> + <package>libgmime-2_4-2</package> + <package>libgmm++-devel</package> + <package>libgnome</package> + <package>libgnome-certauth0</package> + <package>libgnome-desktop-2-11</package> + <package>libgnome-devel</package> + <package>libgnome-lang</package> + <package>libgnome-menu2</package> + <package>libgnome-window-settings1</package> + <package>libgnomecanvas</package> + <package>libgnomecanvas-devel</package> + <package>libgnomecanvas-lang</package> + <package>libgnomecanvasmm</package> + <package>libgnomecanvasmm-devel</package> + <package>libgnomecups</package> + <package>libgnomecups-devel</package> + <package>libgnomecups-lang</package> + <package>libgnomedb</package> + <package>libgnomedb-devel</package> + <package>libgnomedb-lang</package> + <package>libgnomekbd</package> + <package>libgnomekbd-devel</package> + <package>libgnomekbd-lang</package> + <package>libgnomeprint</package> + <package>libgnomeprint-devel</package> + <package>libgnomeprint-lang</package> + <package>libgnomeprintui</package> + <package>libgnomeprintui-devel</package> + <package>libgnomeprintui-lang</package> + <package>libgnomesu</package> + <package>libgnomesu-devel</package> + <package>libgnomesu-lang</package> + <package>libgnomesu0</package> + <package>libgnomeui</package> + <package>libgnomeui-devel</package> + <package>libgnomeui-lang</package> + <package>libgnomevfsmm-2_6-1</package> + <package>libgnutls-devel</package> + <package>libgnutls-extra-devel</package> + <package>libgnutls-extra26</package> + <package>libgoocanvas3</package> + <package>libgpg-error-devel</package> + <package>libgpgme-devel</package> + <package>libgphoto2-devel</package> + <package>libgpod-devel</package> + <package>libgsf</package> + <package>libgsf-1-114</package> + <package>libgsf-devel</package> + <package>libgsf-gnome</package> + <package>libgsm-devel</package> + <package>libgsm1</package> + <package>libgssglue-devel</package> + <package>libgstapp-0_10-0</package> + <package>libgstinterfaces-0_10-0</package> + <package>libgstreamer-0_10-0</package> + <package>libgtk-vnc-1_0-0</package> + <package>libgtkhtml</package> + <package>libgtkhtml-devel</package> + <package>libgtksourceview-2_0-0</package> + <package>libgtop</package> + <package>libgtop-2_0-7</package> + <package>libgtop-devel</package> + <package>libgtop-lang</package> + <package>libgudev-1_0-0</package> + <package>libgweather</package> + <package>libgweather-devel</package> + <package>libgweather-lang</package> + <package>libgweather1</package> + <package>libhangul</package> + <package>libhangul-devel</package> + <package>libhowl0</package> + <package>libical-devel</package> + <package>libical0</package> + <package>libicu-devel</package> + <package>libid3tag</package> + <package>libid3tag-devel</package> + <package>libidl-devel</package> + <package>libidn-devel</package> + <package>libiec61883</package> + <package>libiec61883-devel</package> + <package>libieee1284</package> + <package>libiniparser-devel</package> + <package>libiniparser0</package> + <package>libiptcdata</package> + <package>libiptcdata-devel</package> + <package>libiptcdata0</package> + <package>libiso9660-5</package> + <package>libiterm</package> + <package>libiterm-devel</package> + <package>libjack-devel</package> + <package>libjack0</package> + <package>libjasper</package> + <package>libjasper-devel</package> + <package>libjingle-0_3-0</package> + <package>libjingle-devel</package> + <package>libjpeg-devel</package> + <package>libkcal</package> + <package>libkcal-devel</package> + <package>libkcal2</package> + <package>libkcddb4</package> + <package>libkcddb4-devel</package> + <package>libkcompactdisc4</package> + <package>libkcompactdisc4-devel</package> + <package>libkdcraw3</package> + <package>libkdcraw3-devel</package> + <package>libkdcraw3-lang</package> + <package>libkde4</package> + <package>libkde4-devel</package> + <package>libkdecore4</package> + <package>libkdecore4-devel</package> + <package>libkdepim4</package> + <package>libkdepim4-devel</package> + <package>libkdepimlibs4</package> + <package>libkdepimlibs4-devel</package> + <package>libkexiv2-3</package> + <package>libkexiv2-3-devel</package> + <package>libkexiv2-7</package> + <package>libkipi-devel</package> + <package>libkipi6</package> + <package>libkmime-devel</package> + <package>libkmime2</package> + <package>libknotificationitem-1-1</package> + <package>libkonq-devel</package> + <package>libkonq5</package> + <package>libksba-devel</package> + <package>libktnef-devel</package> + <package>libktnef1</package> + <package>liblazy-devel</package> + <package>liblazy1</package> + <package>liblcms-devel</package> + <package>libldapcpp-devel</package> + <package>liblog4c-devel</package> + <package>liblog4c3</package> + <package>libloudmouth-1-0</package> + <package>liblpsolve55</package> + <package>liblua5_1</package> + <package>libmalaga-devel</package> + <package>libmalaga7</package> + <package>libmcrypt</package> + <package>libmcrypt-devel</package> + <package>libmikmod</package> + <package>libmikmod-devel</package> + <package>libmm-devel</package> + <package>libmm14</package> + <package>libmng-devel</package> + <package>libmpcdec-devel</package> + <package>libmpcdec5</package> + <package>libmspack-devel</package> + <package>libmtp-devel</package> + <package>libmtp8</package> + <package>libmusicbrainz-devel</package> + <package>libmusicbrainz3-6</package> + <package>libmusicbrainz3-devel</package> + <package>libmusicbrainz4</package> + <package>libmysqlclient-devel</package> + <package>libmysqlclient15</package> + <package>libmysqlclient_r15</package> + <package>libneon-devel</package> + <package>libneon27</package> + <package>libnetapi-devel</package> + <package>libnetapi0</package> + <package>libnetcontrol0</package> + <package>libnetpbm-devel</package> + <package>libnetpbm10</package> + <package>libnewt0_52</package> + <package>libnjb</package> + <package>libnjb-devel</package> + <package>libnjb5</package> + <package>libnl-devel</package> + <package>libnotify</package> + <package>libnotify-devel</package> + <package>libnotify1</package> + <package>libnscd-devel</package> + <package>libnsssharedhelper0</package> + <package>libnuma-devel</package> + <package>libofa-devel</package> + <package>libofa0</package> + <package>libogg-devel</package> + <package>libogg0</package> + <package>liboil</package> + <package>liboil-devel</package> + <package>libopenbabel-devel</package> + <package>libopenbabel3</package> + <package>libopencdk-devel</package> + <package>libopencdk10</package> + <package>libopenraw-devel</package> + <package>libopenraw1</package> + <package>libopenssl-devel</package> + <package>libopensync</package> + <package>libopensync-devel</package> + <package>libopensync-plugin-evolution2</package> + <package>libopensync-plugin-evolution2-devel</package> + <package>libopensync-plugin-palm</package> + <package>libopensync-plugin-palm-devel</package> + <package>liborc-0_4-0</package> + <package>libosip2</package> + <package>libosip2-devel</package> + <package>libotf</package> + <package>libotf-devel</package> + <package>libotr-devel</package> + <package>libotr2</package> + <package>libp11-1</package> + <package>libp11-devel</package> + <package>libpackagekit-glib10</package> + <package>libpackagekit-glib10-devel</package> + <package>libpangomm-1_4-1</package> + <package>libpcap-devel</package> + <package>libpciaccess0</package> + <package>libpciaccess0-devel</package> + <package>libphonon4</package> + <package>libpisock-devel</package> + <package>libpisock9</package> + <package>libpisync-devel</package> + <package>libpisync1</package> + <package>libpixman-1-0-devel</package> + <package>libpkcs11-helper1</package> + <package>libpng-devel</package> + <package>libpolkit-qt0</package> + <package>libpoppler-devel</package> + <package>libpoppler-glib-devel</package> + <package>libpoppler-glib4</package> + <package>libpoppler-qt2</package> + <package>libpoppler-qt3-devel</package> + <package>libpoppler-qt4-3</package> + <package>libpoppler-qt4-devel</package> + <package>libpoppler5</package> + <package>libpst4</package> + <package>libpt2</package> + <package>libpt2-devel</package> + <package>libpulse-browse0</package> + <package>libpulse-devel</package> + <package>libpulse-mainloop-glib0</package> + <package>libpulse0</package> + <package>libpurple</package> + <package>libpurple-devel</package> + <package>libpurple-lang</package> + <package>libqca2</package> + <package>libqca2-devel</package> + <package>libqdialogsolver1</package> + <package>libqdialogsolver1-devel</package> + <package>libqimageblitz-devel</package> + <package>libqimageblitz4</package> + <package>libqscintilla-devel</package> + <package>libqscintilla2-5</package> + <package>libqt4</package> + <package>libqt4-devel</package> + <package>libqt4-qt3support</package> + <package>libqt4-sql</package> + <package>libqt4-sql-mysql</package> + <package>libqt4-sql-postgresql</package> + <package>libqt4-sql-sqlite</package> + <package>libqt4-sql-unixODBC</package> + <package>libqt4-x11</package> + <package>libqtpod-devel</package> + <package>libqtpod0</package> + <package>libquadmath46</package> + <package>libquicktime</package> + <package>libquicktime-devel</package> + <package>libraptor-devel</package> + <package>libraptor1</package> + <package>librasqal-devel</package> + <package>librasqal1</package> + <package>libraw1394-11</package> + <package>libraw1394-8</package> + <package>libraw1394-devel</package> + <package>libredland-devel</package> + <package>libredland0</package> + <package>libreiserfs-devel</package> + <package>libreoffice</package> + <package>libreoffice-base</package> + <package>libreoffice-branding-SLED</package> + <package>libreoffice-branding-upstream</package> + <package>libreoffice-calc</package> + <package>libreoffice-icon-themes</package> + <package>libreoffice-impress</package> + <package>libreoffice-sdk</package> + <package>libreoffice-writer</package> + <package>librsvg</package> + <package>librsvg-devel</package> + <package>libsamplerate</package> + <package>libsamplerate-devel</package> + <package>libsatsolver-devel</package> + <package>libsblim-cmpiutil1</package> + <package>libselinux-devel</package> + <package>libsemanage-devel</package> + <package>libsemanage1</package> + <package>libsensors3-devel</package> + <package>libsensors4</package> + <package>libsepol-devel</package> + <package>libsexy</package> + <package>libsexy-devel</package> + <package>libshout-devel</package> + <package>libshout3</package> + <package>libsidplay1</package> + <package>libsidplay1-devel</package> + <package>libsigc++2</package> + <package>libsigc++2-devel</package> + <package>libslab-lang</package> + <package>libslab0</package> + <package>libsmbclient-devel</package> + <package>libsmbios-devel</package> + <package>libsmbsharemodes-devel</package> + <package>libsmbsharemodes0</package> + <package>libsndfile</package> + <package>libsndfile-devel</package> + <package>libsoprano-devel</package> + <package>libsoprano4</package> + <package>libsoup-devel</package> + <package>libspectre-devel</package> + <package>libspectre1</package> + <package>libspeex</package> + <package>libssh2-devel</package> + <package>libstrigi0</package> + <package>libstroke</package> + <package>libstroke-devel</package> + <package>libsyncml-devel</package> + <package>libsyncml0</package> + <package>libtalloc-devel</package> + <package>libtasn1-devel</package> + <package>libtdb-devel</package> + <package>libtelepathy</package> + <package>libtelepathy-devel</package> + <package>libtelepathy-glib0</package> + <package>libtheora-devel</package> + <package>libtheora0</package> + <package>libtidy</package> + <package>libtidy-devel</package> + <package>libtiff-devel</package> + <package>libtirpc-devel</package> + <package>libtomoe-gtk0</package> + <package>libtspi1</package> + <package>libtunepimp</package> + <package>libtunepimp-devel</package> + <package>libtunepimp5</package> + <package>libudev-devel</package> + <package>libudf0</package> + <package>libunique-1_0-0</package> + <package>libunwind</package> + <package>libunwind-devel</package> + <package>libupsclient1</package> + <package>libusb-devel</package> + <package>libusbpp-0_1-4</package> + <package>libustr-1_0-1</package> + <package>libustr-devel</package> + <package>libuuid-devel</package> + <package>libvirt-client</package> + <package>libvirt-devel</package> + <package>libvisual</package> + <package>libvisual-devel</package> + <package>libvoikko-devel</package> + <package>libvoikko1</package> + <package>libvorbis</package> + <package>libvorbis-devel</package> + <package>libwavpack1</package> + <package>libwbclient-devel</package> + <package>libwbxml2-0</package> + <package>libwbxml2-devel</package> + <package>libwebkit-1_0-1</package> + <package>libwebkit-1_0-2</package> + <package>libwebkit-devel</package> + <package>libwebkit-lang</package> + <package>libwmf</package> + <package>libwmf-devel</package> + <package>libwmf-gnome</package> + <package>libwnck</package> + <package>libwnck-1-22</package> + <package>libwnck-devel</package> + <package>libwnck-lang</package> + <package>libwpd-0_8-8</package> + <package>libwpd-devel</package> + <package>libwpg-0_1-1</package> + <package>libwpg-devel</package> + <package>libwps-0_1-1</package> + <package>libwps-devel</package> + <package>libwsman-devel</package> + <package>libwsman1</package> + <package>libxcrypt-devel</package> + <package>libxine-devel</package> + <package>libxine1</package> + <package>libxklavier-devel</package> + <package>libxklavier15</package> + <package>libxml2-devel</package> + <package>libxslt-devel</package> + <package>libyajl1</package> + <package>libzio-devel</package> + <package>libzip-devel</package> + <package>libzip1</package> + <package>libzvbi0</package> + <package>libzypp-devel</package> + <package>limal-apparmor-notifications</package> + <package>limal-apparmor-notifications-devel</package> + <package>limal-ca-mgm-devel</package> + <package>limal-devel</package> + <package>limal-devtools</package> + <package>limal-nfs-server-devel</package> + <package>linux-atm-devel</package> + <package>linux-atm-lib</package> + <package>lksctp-tools</package> + <package>lksctp-tools-devel</package> + <package>loudmouth-devel</package> + <package>lua</package> + <package>lua-devel</package> + <package>lzo-devel</package> + <package>m17n-db</package> + <package>m17n-lib</package> + <package>m17n-lib-devel</package> + <package>malaga-suomi</package> + <package>meanwhile</package> + <package>meanwhile-devel</package> + <package>metacity</package> + <package>metacity-devel</package> + <package>metacity-lang</package> + <package>mhash</package> + <package>mhash-devel</package> + <package>misc-console-font</package> + <package>mono-addins</package> + <package>mono-basic</package> + <package>mono-core</package> + <package>mono-data</package> + <package>mono-data-oracle</package> + <package>mono-data-sqlite</package> + <package>mono-devel</package> + <package>mono-extras</package> + <package>mono-jscript</package> + <package>mono-tools</package> + <package>mono-wcf</package> + <package>mono-web</package> + <package>mono-winforms</package> + <package>mono-zeroconf</package> + <package>mono-zeroconf-provider-avahi</package> + <package>monodevelop</package> + <package>monodoc-core</package> + <package>mozilla-nspr</package> + <package>mozilla-nspr-devel</package> + <package>mozilla-nss</package> + <package>mozilla-nss-devel</package> + <package>mozilla-xulrunner192</package> + <package>mozilla-xulrunner192-gnome</package> + <package>mpfr-devel</package> + <package>mpi-selector</package> + <package>mpich</package> + <package>mpich-devel</package> + <package>mysql</package> + <package>mysql-client</package> + <package>nagios</package> + <package>nagios-devel</package> + <package>nagios-www</package> + <package>nant</package> + <package>nautilus</package> + <package>nautilus-cd-burner</package> + <package>nautilus-cd-burner-devel</package> + <package>nautilus-cd-burner-lang</package> + <package>nautilus-devel</package> + <package>nautilus-lang</package> + <package>ndesk-dbus</package> + <package>ndesk-dbus-glib</package> + <package>ndesk-dbus-glib-devel</package> + <package>net-snmp</package> + <package>net-snmp-devel</package> + <package>netatalk</package> + <package>netatalk-devel</package> + <package>netcat-openbsd</package> + <package>newt</package> + <package>newt-devel</package> + <package>newt-static</package> + <package>nfsidmap-devel</package> + <package>notification-daemon</package> + <package>notification-daemon-lang</package> + <package>notify-sharp</package> + <package>nss-mdns</package> + <package>nss-shared-helper-devel</package> + <package>nut</package> + <package>nut-classic</package> + <package>nut-devel</package> + <package>opal</package> + <package>opal-devel</package> + <package>openCryptoki</package> + <package>openCryptoki-64bit</package> + <package>openCryptoki-devel</package> + <package>openct-devel</package> + <package>openhpi</package> + <package>openhpi-daemon</package> + <package>openhpi-devel</package> + <package>openjade</package> + <package>openjade-devel</package> + <package>openldap2-devel</package> + <package>openmotif-devel</package> + <package>openmotif-libs</package> + <package>openmpi</package> + <package>openobex-devel</package> + <package>openobex-glib-devel</package> + <package>opensc-devel</package> + <package>openslp-devel</package> + <package>opensp</package> + <package>opensp-devel</package> + <package>openwsman-client</package> + <package>openwsman-server</package> + <package>orbit</package> + <package>orbit-devel</package> + <package>orbit2-devel</package> + <package>oxygen-icon-theme</package> + <package>oxygen-icon-theme-scalable</package> + <package>ozerocdoff</package> + <package>pam-devel</package> + <package>pango-devel</package> + <package>pangomm-devel</package> + <package>parted-devel</package> + <package>patchutils</package> + <package>pciutils-devel</package> + <package>pcre-devel</package> + <package>pcsc-acr38</package> + <package>pcsc-acr38-devel</package> + <package>pcsc-lite-devel</package> + <package>perl-32bit</package> + <package>perl-Crypt-OpenSSL-RSA</package> + <package>perl-Mail-DKIM</package> + <package>perl-MailTools</package> + <package>perl-Net-DNS</package> + <package>perl-Net-IP</package> + <package>perl-NetAddr-IP</package> + <package>perl-SNMP</package> + <package>perl-Tie-IxHash</package> + <package>perl-Tk</package> + <package>perl-Tk-devel</package> + <package>perl-spamassassin</package> + <package>phonon</package> + <package>phonon-backend-gstreamer-0_10</package> + <package>phonon-devel</package> + <package>php5</package> + <package>php5-ctype</package> + <package>php5-devel</package> + <package>php5-dom</package> + <package>php5-hash</package> + <package>php5-iconv</package> + <package>php5-json</package> + <package>php5-pdo</package> + <package>php5-sqlite</package> + <package>php5-suhosin</package> + <package>php5-tokenizer</package> + <package>php5-xmlreader</package> + <package>php5-xmlwriter</package> + <package>php53</package> + <package>php53-ctype</package> + <package>php53-dom</package> + <package>php53-iconv</package> + <package>php53-json</package> + <package>php53-tokenizer</package> + <package>php53-xmlreader</package> + <package>php53-xmlwriter</package> + <package>pidgin</package> + <package>pidgin-devel</package> + <package>pilot-link</package> + <package>pkcs11-helper</package> + <package>pkcs11-helper-devel</package> + <package>planner</package> + <package>planner-devel</package> + <package>planner-lang</package> + <package>plasma-addons</package> + <package>plasma-theme-aya</package> + <package>plasmoid-networkmanagement</package> + <package>plasmoid-quickaccess</package> + <package>plotutils</package> + <package>poppler-data</package> + <package>poppler-tools</package> + <package>popt-devel</package> + <package>portmap</package> + <package>postfix-devel</package> + <package>postgresql-devel</package> + <package>postgresql-libs</package> + <package>ppp-devel</package> + <package>ppp-userpass</package> + <package>pstoedit</package> + <package>pstoedit-devel</package> + <package>pulseaudio</package> + <package>pulseaudio-esound-compat</package> + <package>pulseaudio-lang</package> + <package>puppet</package> + <package>python-cairo</package> + <package>python-cairo-devel</package> + <package>python-devel</package> + <package>python-gnome</package> + <package>python-gnome-devel</package> + <package>python-gobject2</package> + <package>python-gobject2-devel</package> + <package>python-gtk</package> + <package>python-gtk-devel</package> + <package>python-gtkglext</package> + <package>python-gtkglext-devel</package> + <package>python-gtksourceview</package> + <package>python-gtksourceview-devel</package> + <package>python-numeric</package> + <package>python-numpy</package> + <package>python-orbit</package> + <package>python-orbit-devel</package> + <package>pyxml</package> + <package>qt3</package> + <package>qt3-devel</package> + <package>quagga</package> + <package>quagga-devel</package> + <package>quilt</package> + <package>raptor</package> + <package>rarian</package> + <package>rarian-devel</package> + <package>re2c</package> + <package>readline-devel</package> + <package>recode-devel</package> + <package>rpm-devel</package> + <package>rrdtool</package> + <package>rrdtool-devel</package> + <package>rsyslog</package> + <package>ruby-doc-html</package> + <package>ruby-doc-ri</package> + <package>ruby-examples</package> + <package>ruby-fcgi</package> + <package>ruby-mysql</package> + <package>ruby-selinux</package> + <package>ruby-test-suite</package> + <package>ruby-tk</package> + <package>sablot</package> + <package>sablot-devel</package> + <package>samba-devel</package> + <package>sane-backends</package> + <package>sane-frontends</package> + <package>sax2-libsax</package> + <package>sax2-libsax-devel</package> + <package>sax2-libsax-perl</package> + <package>sax2-tools</package> + <package>sblim-cmpi-base</package> + <package>sblim-cmpi-base-devel</package> + <package>sblim-cmpi-devel</package> + <package>sblim-cmpiutil-devel</package> + <package>sblim-indication_helper</package> + <package>sblim-sfcb</package> + <package>sblim-sfcc</package> + <package>sblim-sfcc-devel</package> + <package>scim</package> + <package>scim-devel</package> + <package>scpm-devel</package> + <package>scrollkeeper</package> + <package>scrollkeeper-lang</package> + <package>seahorse</package> + <package>seahorse-devel</package> + <package>seahorse-lang</package> + <package>sendmail</package> + <package>sendmail-devel</package> + <package>sg3_utils-devel</package> + <package>sgml-skel</package> + <package>shared-mime-info</package> + <package>silc-toolkit</package> + <package>silc-toolkit-devel</package> + <package>slang</package> + <package>slang-devel</package> + <package>soprano</package> + <package>soprano-backend-redland</package> + <package>spamassassin</package> + <package>speex-devel</package> + <package>splashy-devel</package> + <package>sqlite2</package> + <package>sqlite3-devel</package> + <package>startup-notification</package> + <package>startup-notification-devel</package> + <package>strigi</package> + <package>strigi-devel</package> + <package>subversion</package> + <package>subversion-perl</package> + <package>susehelp</package> + <package>susehelp_cz</package> + <package>susehelp_de</package> + <package>susehelp_en</package> + <package>susehelp_es</package> + <package>susehelp_fr</package> + <package>susehelp_hu</package> + <package>susehelp_it</package> + <package>swig</package> + <package>syslogd</package> + <package>t1lib</package> + <package>t1lib-devel</package> + <package>taglib</package> + <package>taglib-devel</package> + <package>taglib-sharp</package> + <package>tango-icon-theme</package> + <package>tcl-devel</package> + <package>tcpd-devel</package> + <package>telepathy-glib-devel</package> + <package>telepathy-mission-control</package> + <package>telepathy-mission-control-devel</package> + <package>texlive-bin-devel</package> + <package>texlive-devel</package> + <package>tk-devel</package> + <package>tla</package> + <package>tn5250</package> + <package>tn5250-devel</package> + <package>tomoe</package> + <package>tomoe-devel</package> + <package>tomoe-gtk</package> + <package>tomoe-gtk-devel</package> + <package>tomoe-gtk-lang</package> + <package>totem-pl-parser</package> + <package>totem-pl-parser-devel</package> + <package>totem-pl-parser-lang</package> + <package>trousers</package> + <package>trousers-devel</package> + <package>tsclient</package> + <package>tsclient-devel</package> + <package>tsclient-lang</package> + <package>uim</package> + <package>uim-devel</package> + <package>unixODBC</package> + <package>unixODBC-devel</package> + <package>unsermake</package> + <package>update-desktop-files</package> + <package>usb_modeswitch</package> + <package>usb_modeswitch-data</package> + <package>valgrind</package> + <package>valgrind-devel</package> + <package>vte</package> + <package>vte-devel</package> + <package>vte-lang</package> + <package>wdiff</package> + <package>webkit-sharp</package> + <package>wireshark</package> + <package>wireshark-devel</package> + <package>wodim-devel</package> + <package>wordcut</package> + <package>wordcut-devel</package> + <package>words</package> + <package>wpa_supplicant</package> + <package>wvstreams</package> + <package>wvstreams-devel</package> + <package>wxGTK-compat</package> + <package>wxGTK-devel</package> + <package>wxGTK-gl</package> + <package>x11-input-wacom</package> + <package>x11-input-wacom-devel</package> + <package>x11-input-wacom-tools</package> + <package>xalan-j2</package> + <package>xaw3d-devel</package> + <package>xbase</package> + <package>xbase-devel</package> + <package>xdelta</package> + <package>xdelta-devel</package> + <package>xdg-menu</package> + <package>xen-devel</package> + <package>xen-libs</package> + <package>xerces-j2</package> + <package>xerces-j2-bootstrap</package> + <package>xerces-j2-xml-apis</package> + <package>xfsprogs-devel</package> + <package>xml-commons-apis-bootstrap</package> + <package>xml-commons-resolver-bootstrap</package> + <package>xml-commons-which-bootstrap</package> + <package>xmlcharent</package> + <package>xorg-x11</package> + <package>xorg-x11-devel</package> + <package>xorg-x11-fonts</package> + <package>xorg-x11-fonts-core</package> + <package>xorg-x11-fonts-devel</package> + <package>xorg-x11-libICE-devel</package> + <package>xorg-x11-libSM-devel</package> + <package>xorg-x11-libX11-devel</package> + <package>xorg-x11-libXau-devel</package> + <package>xorg-x11-libXdmcp-devel</package> + <package>xorg-x11-libXext-devel</package> + <package>xorg-x11-libXfixes-devel</package> + <package>xorg-x11-libXmu-devel</package> + <package>xorg-x11-libXp-devel</package> + <package>xorg-x11-libXpm-devel</package> + <package>xorg-x11-libXprintUtil-devel</package> + <package>xorg-x11-libXrender-devel</package> + <package>xorg-x11-libXt-devel</package> + <package>xorg-x11-libXv-devel</package> + <package>xorg-x11-libfontenc-devel</package> + <package>xorg-x11-libxcb-devel</package> + <package>xorg-x11-libxkbfile-devel</package> + <package>xorg-x11-proto-devel</package> + <package>xorg-x11-server</package> + <package>xorg-x11-util-devel</package> + <package>xorg-x11-xauth</package> + <package>xorg-x11-xtrans-devel</package> + <package>xosd</package> + <package>xosd-devel</package> + <package>xsp</package> + <package>xterm</package> + <package>xz-devel</package> + <package>yast2-core-devel</package> + <package>yast2-devtools</package> + <package>yast2-gtk</package> + <package>yast2-libyui-devel</package> + <package>yast2-ncurses-devel</package> + <package>yast2-qt</package> + <package>yast2-qt-devel</package> + <package>yast2-qt-pkg</package> + <package>yast2-storage-devel</package> + <package>yast2-ycp-ui-bindings-devel</package> + <package>yelp</package> + <package>yelp-lang</package> + <package>zenity</package> + <package>zenity-lang</package> + <package>zlib-devel</package> + <package>zsh</package> + <package>zvbi-devel</package> + </remove-packages> + + </software> + <user_defaults> + <expire></expire> + <group>100</group> + <groups>video,dialout</groups> + <home>/home</home> + <inactive>-1</inactive> + <shell>/bin/bash</shell> + <skel>/etc/skel</skel> + <umask>022</umask> + </user_defaults> + <users config:type="list"> + <user> + <encrypted config:type="boolean">true</encrypted> + <fullname>vagrant</fullname> + <gid>100</gid> + <home>/home/vagrant</home> + <password_settings> + <expire></expire> + <flag></flag> + <inact></inact> + <max>99999</max> + <min>0</min> + <warn>7</warn> + </password_settings> + <shell>/bin/bash</shell> + <uid>1000</uid> + <user_password>$2y$05$NA1Li9ZKJOLRW5mMTXm6/e5r8dltWS5RpDZpvHrI82aLE00V51tdi</user_password> + <username>vagrant</username> + </user> + <user> + <encrypted config:type="boolean">true</encrypted> + <fullname>Games account</fullname> + <gid>100</gid> + <home>/var/games</home> + <password_settings> + <expire></expire> + <flag></flag> + <inact></inact> + <max></max> + <min></min> + <warn></warn> + </password_settings> + <shell>/bin/bash</shell> + <uid>12</uid> + <user_password>*</user_password> + <username>games</username> + </user> + <user> + <encrypted config:type="boolean">true</encrypted> + <fullname>bin</fullname> + <gid>1</gid> + <home>/bin</home> + <password_settings> + <expire></expire> + <flag></flag> + <inact></inact> + <max></max> + <min></min> + <warn></warn> + </password_settings> + <shell>/bin/bash</shell> + <uid>1</uid> + <user_password>*</user_password> + <username>bin</username> + </user> + <user> + <encrypted config:type="boolean">true</encrypted> + <fullname>nobody</fullname> + <gid>65533</gid> + <home>/var/lib/nobody</home> + <password_settings> + <expire></expire> + <flag></flag> + <inact></inact> + <max></max> + <min></min> + <warn></warn> + </password_settings> + <shell>/bin/bash</shell> + <uid>65534</uid> + <user_password>*</user_password> + <username>nobody</username> + </user> + <user> + <encrypted config:type="boolean">true</encrypted> + <fullname>Printing daemon</fullname> + <gid>7</gid> + <home>/var/spool/lpd</home> + <password_settings> + <expire></expire> + <flag></flag> + <inact></inact> + <max></max> + <min></min> + <warn></warn> + </password_settings> + <shell>/bin/bash</shell> + <uid>4</uid> + <user_password>*</user_password> + <username>lp</username> + </user> + <user> + <encrypted config:type="boolean">true</encrypted> + <fullname>User for uuidd</fullname> + <gid>104</gid> + <home>/var/run/uuidd</home> + <password_settings> + <expire></expire> + <flag></flag> + <inact></inact> + <max>99999</max> + <min>0</min> + <warn>7</warn> + </password_settings> + <shell>/bin/false</shell> + <uid>102</uid> + <user_password>*</user_password> + <username>uuidd</username> + </user> + <user> + <encrypted config:type="boolean">true</encrypted> + <fullname>Postfix Daemon</fullname> + <gid>51</gid> + <home>/var/spool/postfix</home> + <password_settings> + <expire></expire> + <flag></flag> + <inact></inact> + <max>99999</max> + <min>0</min> + <warn>7</warn> + </password_settings> + <shell>/bin/false</shell> + <uid>51</uid> + <user_password>*</user_password> + <username>postfix</username> + </user> + <user> + <encrypted config:type="boolean">true</encrypted> + <fullname>Novell Customer Center User</fullname> + <gid>111</gid> + <home>/var/lib/YaST2/suse-ncc-fakehome</home> + <password_settings> + <expire></expire> + <flag></flag> + <inact></inact> + <max>99999</max> + <min>0</min> + <warn>7</warn> + </password_settings> + <shell>/bin/bash</shell> + <uid>106</uid> + <user_password>*</user_password> + <username>suse-ncc</username> + </user> + <user> + <encrypted config:type="boolean">true</encrypted> + <fullname>FTP account</fullname> + <gid>49</gid> + <home>/srv/ftp</home> + <password_settings> + <expire></expire> + <flag></flag> + <inact></inact> + <max></max> + <min></min> + <warn></warn> + </password_settings> + <shell>/bin/bash</shell> + <uid>40</uid> + <user_password>*</user_password> + <username>ftp</username> + </user> + <user> + <encrypted config:type="boolean">true</encrypted> + <fullname>Gnome Display Manager daemon</fullname> + <gid>112</gid> + <home>/var/lib/gdm</home> + <password_settings> + <expire></expire> + <flag></flag> + <inact></inact> + <max>99999</max> + <min>0</min> + <warn>7</warn> + </password_settings> + <shell>/bin/false</shell> + <uid>107</uid> + <user_password>*</user_password> + <username>gdm</username> + </user> + <user> + <encrypted config:type="boolean">true</encrypted> + <fullname>Batch jobs daemon</fullname> + <gid>25</gid> + <home>/var/spool/atjobs</home> + <password_settings> + <expire></expire> + <flag></flag> + <inact></inact> + <max>99999</max> + <min>0</min> + <warn>7</warn> + </password_settings> + <shell>/bin/bash</shell> + <uid>25</uid> + <user_password>*</user_password> + <username>at</username> + </user> + <user> + <encrypted config:type="boolean">true</encrypted> + <fullname>root</fullname> + <gid>0</gid> + <home>/root</home> + <password_settings> + <expire></expire> + <flag></flag> + <inact></inact> + <max></max> + <min></min> + <warn></warn> + </password_settings> + <shell>/bin/bash</shell> + <uid>0</uid> + <user_password>$2y$05$NA1Li9ZKJOLRW5mMTXm6/e5r8dltWS5RpDZpvHrI82aLE00V51tdi</user_password> + <username>root</username> + </user> + <user> + <encrypted config:type="boolean">true</encrypted> + <fullname>Mailer daemon</fullname> + <gid>12</gid> + <home>/var/spool/clientmqueue</home> + <password_settings> + <expire></expire> + <flag></flag> + <inact></inact> + <max></max> + <min></min> + <warn></warn> + </password_settings> + <shell>/bin/false</shell> + <uid>8</uid> + <user_password>*</user_password> + <username>mail</username> + </user> + <user> + <encrypted config:type="boolean">true</encrypted> + <fullname>Daemon</fullname> + <gid>2</gid> + <home>/sbin</home> + <password_settings> + <expire></expire> + <flag></flag> + <inact></inact> + <max></max> + <min></min> + <warn></warn> + </password_settings> + <shell>/bin/bash</shell> + <uid>2</uid> + <user_password>*</user_password> + <username>daemon</username> + </user> + <user> + <encrypted config:type="boolean">true</encrypted> + <fullname>NTP daemon</fullname> + <gid>108</gid> + <home>/var/lib/ntp</home> + <password_settings> + <expire></expire> + <flag></flag> + <inact></inact> + <max>99999</max> + <min>0</min> + <warn>7</warn> + </password_settings> + <shell>/bin/false</shell> + <uid>74</uid> + <user_password>*</user_password> + <username>ntp</username> + </user> + <user> + <encrypted config:type="boolean">true</encrypted> + <fullname>Unix-to-Unix CoPy system</fullname> + <gid>14</gid> + <home>/etc/uucp</home> + <password_settings> + <expire></expire> + <flag></flag> + <inact></inact> + <max></max> + <min></min> + <warn></warn> + </password_settings> + <shell>/bin/bash</shell> + <uid>10</uid> + <user_password>*</user_password> + <username>uucp</username> + </user> + <user> + <encrypted config:type="boolean">true</encrypted> + <fullname>User for D-Bus</fullname> + <gid>101</gid> + <home>/var/run/dbus</home> + <password_settings> + <expire></expire> + <flag></flag> + <inact></inact> + <max></max> + <min>0</min> + <warn>7</warn> + </password_settings> + <shell>/bin/false</shell> + <uid>100</uid> + <user_password>*</user_password> + <username>messagebus</username> + </user> + <user> + <encrypted config:type="boolean">true</encrypted> + <fullname>User for haldaemon</fullname> + <gid>102</gid> + <home>/var/run/hald</home> + <password_settings> + <expire></expire> + <flag></flag> + <inact></inact> + <max></max> + <min>0</min> + <warn>7</warn> + </password_settings> + <shell>/bin/false</shell> + <uid>101</uid> + <user_password>*</user_password> + <username>haldaemon</username> + </user> + <user> + <encrypted config:type="boolean">true</encrypted> + <fullname>WWW daemon apache</fullname> + <gid>8</gid> + <home>/var/lib/wwwrun</home> + <password_settings> + <expire></expire> + <flag></flag> + <inact></inact> + <max></max> + <min></min> + <warn></warn> + </password_settings> + <shell>/bin/false</shell> + <uid>30</uid> + <user_password>*</user_password> + <username>wwwrun</username> + </user> + <user> + <encrypted config:type="boolean">true</encrypted> + <fullname>Manual pages viewer</fullname> + <gid>62</gid> + <home>/var/cache/man</home> + <password_settings> + <expire></expire> + <flag></flag> + <inact></inact> + <max></max> + <min></min> + <warn></warn> + </password_settings> + <shell>/bin/bash</shell> + <uid>13</uid> + <user_password>*</user_password> + <username>man</username> + </user> + <user> + <encrypted config:type="boolean">true</encrypted> + <fullname>PolicyKit</fullname> + <gid>107</gid> + <home>/var/run/PolicyKit</home> + <password_settings> + <expire></expire> + <flag></flag> + <inact></inact> + <max>99999</max> + <min>0</min> + <warn>7</warn> + </password_settings> + <shell>/bin/false</shell> + <uid>104</uid> + <user_password>*</user_password> + <username>polkituser</username> + </user> + <user> + <encrypted config:type="boolean">true</encrypted> + <fullname>News system</fullname> + <gid>13</gid> + <home>/etc/news</home> + <password_settings> + <expire></expire> + <flag></flag> + <inact></inact> + <max></max> + <min></min> + <warn></warn> + </password_settings> + <shell>/bin/bash</shell> + <uid>9</uid> + <user_password>*</user_password> + <username>news</username> + </user> + <user> + <fullname>SSH daemon</fullname> + <gid>65</gid> + <home>/var/lib/sshd</home> + <shell>/bin/false</shell> + <uid>71</uid> + <username>sshd</username> + </user> + <user> + <encrypted config:type="boolean">true</encrypted> + <fullname>PulseAudio daemon</fullname> + <gid>109</gid> + <home>/var/lib/pulseaudio</home> + <password_settings> + <expire></expire> + <flag></flag> + <inact></inact> + <max>99999</max> + <min>0</min> + <warn>7</warn> + </password_settings> + <shell>/bin/false</shell> + <uid>105</uid> + <user_password>*</user_password> + <username>pulse</username> + </user> + </users> +</profile> diff --git a/definitions/sles-11-sp2/cleanup.sh b/definitions/sles-11-sp2/cleanup.sh new file mode 100644 index 000000000..02bc7e322 --- /dev/null +++ b/definitions/sles-11-sp2/cleanup.sh @@ -0,0 +1,9 @@ +#!/bin/bash -eux + +# remove zypper locks on removed packages to avoid later dependency problems +zypper --non-interactive rl \* +# zypper --non-interactive remove `rpm -qa virtualbox-guest-*` >/dev/null 2>&1 +# Add an online copy of the SLES DVD1 as a software repository, instead of the mounted DVD +zypper removerepo 'SUSE-Linux-Enterprise-Server-11-SP2 11.2.2-1.234' +zypper addrepo 'http://demeter.uni-regensburg.de/SLES11SP2-x64/DVD1/' 'SLES11SP2-x64 DVD1 Online' +zypper refresh diff --git a/definitions/sles-11-sp2/definition.rb b/definitions/sles-11-sp2/definition.rb new file mode 100644 index 000000000..413e26e73 --- /dev/null +++ b/definitions/sles-11-sp2/definition.rb @@ -0,0 +1,12 @@ +require File.dirname(__FILE__) + "/../.suse/session.rb" + +iso = "SLES-11-SP2-DVD-x86_64-GM-DVD1.iso" + +session = + SUSE_SESSION.merge( :memory_size=> '480', + :iso_download_instructions => "Download evaluation version from http://download.novell.com/SummaryFree.jsp?buildid=h0AOp5AT-18~", + :iso_file => iso, + :iso_md5 => "461d82ae6e15062b0807c1338f040497", + :iso_src => "") + +Veewee::Session.declare session diff --git a/definitions/sles-11-sp2/minimize.sh b/definitions/sles-11-sp2/minimize.sh new file mode 120000 index 000000000..b3632ccbc --- /dev/null +++ b/definitions/sles-11-sp2/minimize.sh @@ -0,0 +1 @@ +../.common/minimize.sh \ No newline at end of file diff --git a/definitions/sles-11-sp2/sshd.sh b/definitions/sles-11-sp2/sshd.sh new file mode 120000 index 000000000..f353f2d00 --- /dev/null +++ b/definitions/sles-11-sp2/sshd.sh @@ -0,0 +1 @@ +../.common/sshd.sh \ No newline at end of file diff --git a/definitions/sles-11-sp2/vagrant.sh b/definitions/sles-11-sp2/vagrant.sh new file mode 120000 index 000000000..702949639 --- /dev/null +++ b/definitions/sles-11-sp2/vagrant.sh @@ -0,0 +1 @@ +../.common/vagrant.sh \ No newline at end of file From 12e7185ba3a46291aae546f5b9d342ded872dbb7 Mon Sep 17 00:00:00 2001 From: "Julian C. Dunn" <jdunn@opscode.com> Date: Thu, 30 May 2013 01:00:30 -0400 Subject: [PATCH 0051/1622] Remove Ruby from base install --- definitions/sles-11-sp2/autoinst.xml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/definitions/sles-11-sp2/autoinst.xml b/definitions/sles-11-sp2/autoinst.xml index 2dd64ffdb..d87edad1f 100644 --- a/definitions/sles-11-sp2/autoinst.xml +++ b/definitions/sles-11-sp2/autoinst.xml @@ -610,7 +610,6 @@ <pattern>base</pattern> <pattern>sdk_kernel</pattern> <pattern>sdk_libs</pattern> - <pattern>sdk_ruby</pattern> </patterns> <remove-packages config:type="list"> <package>3ddiag</package> @@ -690,6 +689,7 @@ <package>audiofile</package> <package>audiofile-devel</package> <package>audit-devel</package> + <package>augeas-lenses</package> <package>automoc4</package> <package>avahi</package> <package>avahi-compat-howl-devel</package> @@ -1936,6 +1936,9 @@ <package>rrdtool</package> <package>rrdtool-devel</package> <package>rsyslog</package> + <package>ruby</package> + <package>rubygems</package> + <package>ruby-devel</package> <package>ruby-doc-html</package> <package>ruby-doc-ri</package> <package>ruby-examples</package> From f6c875feb9394a758239b9e723cc73c16f52facf Mon Sep 17 00:00:00 2001 From: "Julian C. Dunn" <jdunn@opscode.com> Date: Thu, 30 May 2013 01:10:26 -0400 Subject: [PATCH 0052/1622] Continue slimming down autoinstall, removing ruby and unnecessary libs for sdk --- definitions/sles-11-sp2-i386/autoinst.xml | 6 ++++-- definitions/sles-11-sp2/autoinst.xml | 1 - 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/definitions/sles-11-sp2-i386/autoinst.xml b/definitions/sles-11-sp2-i386/autoinst.xml index 82aefc696..8773e8fb6 100644 --- a/definitions/sles-11-sp2-i386/autoinst.xml +++ b/definitions/sles-11-sp2-i386/autoinst.xml @@ -609,8 +609,6 @@ <pattern>apparmor</pattern> <pattern>base</pattern> <pattern>sdk_kernel</pattern> - <pattern>sdk_libs</pattern> - <pattern>sdk_ruby</pattern> </patterns> <remove-packages config:type="list"> <package>3ddiag</package> @@ -690,6 +688,7 @@ <package>audiofile</package> <package>audiofile-devel</package> <package>audit-devel</package> + <package>augeas-lenses</package> <package>automoc4</package> <package>avahi</package> <package>avahi-compat-howl-devel</package> @@ -1936,6 +1935,9 @@ <package>rrdtool</package> <package>rrdtool-devel</package> <package>rsyslog</package> + <package>ruby</package> + <package>rubygems</package> + <package>ruby-devel</package> <package>ruby-doc-html</package> <package>ruby-doc-ri</package> <package>ruby-examples</package> diff --git a/definitions/sles-11-sp2/autoinst.xml b/definitions/sles-11-sp2/autoinst.xml index d87edad1f..5b2647b26 100644 --- a/definitions/sles-11-sp2/autoinst.xml +++ b/definitions/sles-11-sp2/autoinst.xml @@ -609,7 +609,6 @@ <pattern>apparmor</pattern> <pattern>base</pattern> <pattern>sdk_kernel</pattern> - <pattern>sdk_libs</pattern> </patterns> <remove-packages config:type="list"> <package>3ddiag</package> From b739a0886096c9024e7fc59d3e5f90ec20603e61 Mon Sep 17 00:00:00 2001 From: Xabier de Zuazo <xabier@onddo.com> Date: Thu, 30 May 2013 11:31:50 +0200 Subject: [PATCH 0053/1622] [BENTO-49] Debian 6 definitions broken: missing sshd.sh --- definitions/debian-6.0.7-i386/sshd.sh | 3 +++ definitions/debian-6.0.7/sshd.sh | 3 +++ 2 files changed, 6 insertions(+) create mode 100644 definitions/debian-6.0.7-i386/sshd.sh create mode 100644 definitions/debian-6.0.7/sshd.sh diff --git a/definitions/debian-6.0.7-i386/sshd.sh b/definitions/debian-6.0.7-i386/sshd.sh new file mode 100644 index 000000000..c6e4f20a6 --- /dev/null +++ b/definitions/debian-6.0.7-i386/sshd.sh @@ -0,0 +1,3 @@ +#!/bin/bash -eux + +echo "UseDNS no" >> /etc/ssh/sshd_config diff --git a/definitions/debian-6.0.7/sshd.sh b/definitions/debian-6.0.7/sshd.sh new file mode 100644 index 000000000..c6e4f20a6 --- /dev/null +++ b/definitions/debian-6.0.7/sshd.sh @@ -0,0 +1,3 @@ +#!/bin/bash -eux + +echo "UseDNS no" >> /etc/ssh/sshd_config From 1eda938a7acd65e78da3b0ac4278fb5505bad5fc Mon Sep 17 00:00:00 2001 From: Xabier de Zuazo <xabier@onddo.com> Date: Thu, 30 May 2013 14:25:03 +0200 Subject: [PATCH 0054/1622] [BENTO-49] Debian 6 sshd.sh files change from files to symlinks --- definitions/debian-6.0.7-i386/sshd.sh | 4 +--- definitions/debian-6.0.7/sshd.sh | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) mode change 100644 => 120000 definitions/debian-6.0.7-i386/sshd.sh mode change 100644 => 120000 definitions/debian-6.0.7/sshd.sh diff --git a/definitions/debian-6.0.7-i386/sshd.sh b/definitions/debian-6.0.7-i386/sshd.sh deleted file mode 100644 index c6e4f20a6..000000000 --- a/definitions/debian-6.0.7-i386/sshd.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash -eux - -echo "UseDNS no" >> /etc/ssh/sshd_config diff --git a/definitions/debian-6.0.7-i386/sshd.sh b/definitions/debian-6.0.7-i386/sshd.sh new file mode 120000 index 000000000..f353f2d00 --- /dev/null +++ b/definitions/debian-6.0.7-i386/sshd.sh @@ -0,0 +1 @@ +../.common/sshd.sh \ No newline at end of file diff --git a/definitions/debian-6.0.7/sshd.sh b/definitions/debian-6.0.7/sshd.sh deleted file mode 100644 index c6e4f20a6..000000000 --- a/definitions/debian-6.0.7/sshd.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash -eux - -echo "UseDNS no" >> /etc/ssh/sshd_config diff --git a/definitions/debian-6.0.7/sshd.sh b/definitions/debian-6.0.7/sshd.sh new file mode 120000 index 000000000..f353f2d00 --- /dev/null +++ b/definitions/debian-6.0.7/sshd.sh @@ -0,0 +1 @@ +../.common/sshd.sh \ No newline at end of file From 5a8c71add0c50b5e5f8489c5d4289e3e3578b00e Mon Sep 17 00:00:00 2001 From: Xabier de Zuazo <xabier@onddo.com> Date: Thu, 30 May 2013 14:28:30 +0200 Subject: [PATCH 0055/1622] README: added sshd.sh common script --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 5f1bdc11d..90b75b070 100644 --- a/README.md +++ b/README.md @@ -150,6 +150,7 @@ filename, its source URL, and the MD5 checksum of the file. * `minimize.sh`: Zeroes out the root disk to reduce file size of the box * `ruby.sh`: **Deprecated** Use `chef-client.sh` * `session.rb`: Baseline session settings for Veewee +* `sshd.sh`: Adds some sshd configs to speed up vagrant * `vagrant.sh`: Installs VirtualBox Guest Additions, adds the Vagrant SSH key From 3adf574c33d90cec1dcc2edad41354ebdb6b24d4 Mon Sep 17 00:00:00 2001 From: Ian Garrison <garrison@opscode.com> Date: Mon, 17 Jun 2013 11:41:05 -0700 Subject: [PATCH 0056/1622] Bento references some files in the aws-preprod account, management requested that they be moved to production as its odd for us to serve things publicly out of the preprod account. Corp ticket PROD-300. As part of this a new IAM account opscode-bento-uploader was created within the aws-production account, but its access it limited to the s3://opscode-vm-bento bucket. These credentials are in the 'Dev/Consulting/Support AWS' folder in teampass. --- README.md | 88 +++++++++++++++++++++++++++---------------------------- 1 file changed, 44 insertions(+), 44 deletions(-) diff --git a/README.md b/README.md index 90b75b070..263f05447 100644 --- a/README.md +++ b/README.md @@ -17,17 +17,17 @@ Vagrant can be instructed to install Chef at runtime using the 64-bit boxes: -* [opscode-centos-5.9](https://opscode-vm.s3.amazonaws.com/vagrant/opscode_centos-5.9_provisionerless.box) -* [opscode-centos-6.4](https://opscode-vm.s3.amazonaws.com/vagrant/opscode_centos-6.4_provisionerless.box) -* [opscode-ubuntu-10.04](https://opscode-vm.s3.amazonaws.com/vagrant/opscode_ubuntu-10.04_provisionerless.box) -* [opscode-ubuntu-12.04](https://opscode-vm.s3.amazonaws.com/vagrant/opscode_ubuntu-12.04_provisionerless.box) +* [opscode-centos-5.9](https://opscode-vm-bento.s3.amazonaws.com/vagrant/opscode_centos-5.9_provisionerless.box) +* [opscode-centos-6.4](https://opscode-vm-bento.s3.amazonaws.com/vagrant/opscode_centos-6.4_provisionerless.box) +* [opscode-ubuntu-10.04](https://opscode-vm-bento.s3.amazonaws.com/vagrant/opscode_ubuntu-10.04_provisionerless.box) +* [opscode-ubuntu-12.04](https://opscode-vm-bento.s3.amazonaws.com/vagrant/opscode_ubuntu-12.04_provisionerless.box) 32-bit boxes: -* [opscode-centos-5.9-i386](https://opscode-vm.s3.amazonaws.com/vagrant/opscode_centos-5.9-i386_provisionerless.box) -* [opscode-centos-6.4-i386](https://opscode-vm.s3.amazonaws.com/vagrant/opscode_centos-6.4-i386_provisionerless.box) -* [opscode-ubuntu-10.04-i386](https://opscode-vm.s3.amazonaws.com/vagrant/opscode_ubuntu-10.04-i386_provisionerless.box) -* [opscode-ubuntu-12.04-i386](https://opscode-vm.s3.amazonaws.com/vagrant/opscode_ubuntu-12.04-i386_provisionerless.box) +* [opscode-centos-5.9-i386](https://opscode-vm-bento.s3.amazonaws.com/vagrant/opscode_centos-5.9-i386_provisionerless.box) +* [opscode-centos-6.4-i386](https://opscode-vm-bento.s3.amazonaws.com/vagrant/opscode_centos-6.4-i386_provisionerless.box) +* [opscode-ubuntu-10.04-i386](https://opscode-vm-bento.s3.amazonaws.com/vagrant/opscode_ubuntu-10.04-i386_provisionerless.box) +* [opscode-ubuntu-12.04-i386](https://opscode-vm-bento.s3.amazonaws.com/vagrant/opscode_ubuntu-12.04-i386_provisionerless.box) ## Older Baseboxes @@ -37,62 +37,62 @@ The following base boxes were built with Chef 11.4.4. 64-bit boxes: -* [opscode-centos-5.9](https://opscode-vm.s3.amazonaws.com/vagrant/opscode_centos-5.9_chef-11.4.4.box) -* [opscode-centos-6.4](https://opscode-vm.s3.amazonaws.com/vagrant/opscode_centos-6.4_chef-11.4.4.box) -* [opscode-ubuntu-10.04](https://opscode-vm.s3.amazonaws.com/vagrant/opscode_ubuntu-10.04_chef-11.4.4.box) -* [opscode-ubuntu-12.04](https://opscode-vm.s3.amazonaws.com/vagrant/opscode_ubuntu-12.04_chef-11.4.4.box) +* [opscode-centos-5.9](https://opscode-vm-bento.s3.amazonaws.com/vagrant/opscode_centos-5.9_chef-11.4.4.box) +* [opscode-centos-6.4](https://opscode-vm-bento.s3.amazonaws.com/vagrant/opscode_centos-6.4_chef-11.4.4.box) +* [opscode-ubuntu-10.04](https://opscode-vm-bento.s3.amazonaws.com/vagrant/opscode_ubuntu-10.04_chef-11.4.4.box) +* [opscode-ubuntu-12.04](https://opscode-vm-bento.s3.amazonaws.com/vagrant/opscode_ubuntu-12.04_chef-11.4.4.box) 32-bit boxes: -* [opscode-centos-5.9-i386](https://opscode-vm.s3.amazonaws.com/vagrant/opscode_centos-5.9-i386_chef-11.4.4.box) -* [opscode-centos-6.4-i386](https://opscode-vm.s3.amazonaws.com/vagrant/opscode_centos-6.4-i386_chef-11.4.4.box) -* [opscode-ubuntu-10.04-i386](https://opscode-vm.s3.amazonaws.com/vagrant/opscode_ubuntu-10.04-i386_chef-11.4.4.box) -* [opscode-ubuntu-12.04-i386](https://opscode-vm.s3.amazonaws.com/vagrant/opscode_ubuntu-12.04-i386_chef-11.4.4.box) +* [opscode-centos-5.9-i386](https://opscode-vm-bento.s3.amazonaws.com/vagrant/opscode_centos-5.9-i386_chef-11.4.4.box) +* [opscode-centos-6.4-i386](https://opscode-vm-bento.s3.amazonaws.com/vagrant/opscode_centos-6.4-i386_chef-11.4.4.box) +* [opscode-ubuntu-10.04-i386](https://opscode-vm-bento.s3.amazonaws.com/vagrant/opscode_ubuntu-10.04-i386_chef-11.4.4.box) +* [opscode-ubuntu-12.04-i386](https://opscode-vm-bento.s3.amazonaws.com/vagrant/opscode_ubuntu-12.04-i386_chef-11.4.4.box) The following base boxes were built with Chef 11.4.0. 64-bit boxes: -* [opscode-centos-5.9](https://opscode-vm.s3.amazonaws.com/vagrant/opscode_centos-5.9_chef-11.4.0.box) -* [opscode-centos-6.4](https://opscode-vm.s3.amazonaws.com/vagrant/opscode_centos-6.4_chef-11.4.0.box) -* [opscode-ubuntu-10.04](https://opscode-vm.s3.amazonaws.com/vagrant/opscode_ubuntu-10.04_chef-11.4.0.box) -* [opscode-ubuntu-12.04](https://opscode-vm.s3.amazonaws.com/vagrant/opscode_ubuntu-12.04_chef-11.4.0.box) +* [opscode-centos-5.9](https://opscode-vm-bento.s3.amazonaws.com/vagrant/opscode_centos-5.9_chef-11.4.0.box) +* [opscode-centos-6.4](https://opscode-vm-bento.s3.amazonaws.com/vagrant/opscode_centos-6.4_chef-11.4.0.box) +* [opscode-ubuntu-10.04](https://opscode-vm-bento.s3.amazonaws.com/vagrant/opscode_ubuntu-10.04_chef-11.4.0.box) +* [opscode-ubuntu-12.04](https://opscode-vm-bento.s3.amazonaws.com/vagrant/opscode_ubuntu-12.04_chef-11.4.0.box) 32-bit boxes: -* [opscode-centos-5.9-i386](https://opscode-vm.s3.amazonaws.com/vagrant/opscode_centos-5.9-i386_chef-11.4.0.box) -* [opscode-centos-6.4-i386](https://opscode-vm.s3.amazonaws.com/vagrant/opscode_centos-6.4-i386_chef-11.4.0.box) -* [opscode-ubuntu-10.04-i386](https://opscode-vm.s3.amazonaws.com/vagrant/opscode_ubuntu-10.04-i386_chef-11.4.0.box) -* [opscode-ubuntu-12.04-i386](https://opscode-vm.s3.amazonaws.com/vagrant/opscode_ubuntu-12.04-i386_chef-11.4.0.box) +* [opscode-centos-5.9-i386](https://opscode-vm-bento.s3.amazonaws.com/vagrant/opscode_centos-5.9-i386_chef-11.4.0.box) +* [opscode-centos-6.4-i386](https://opscode-vm-bento.s3.amazonaws.com/vagrant/opscode_centos-6.4-i386_chef-11.4.0.box) +* [opscode-ubuntu-10.04-i386](https://opscode-vm-bento.s3.amazonaws.com/vagrant/opscode_ubuntu-10.04-i386_chef-11.4.0.box) +* [opscode-ubuntu-12.04-i386](https://opscode-vm-bento.s3.amazonaws.com/vagrant/opscode_ubuntu-12.04-i386_chef-11.4.0.box) The following base boxes were built with Chef 11.2.0. (No 32-bit boxes were built for Chef 11.2.0.) -* [opscode-centos-5.8](https://opscode-vm.s3.amazonaws.com/vagrant/opscode_centos-5.8_chef-11.2.0.box) -* [opscode-centos-6.3](https://opscode-vm.s3.amazonaws.com/vagrant/opscode_centos-6.3_chef-11.2.0.box) -* [opscode-ubuntu-10.04](https://opscode-vm.s3.amazonaws.com/vagrant/opscode_ubuntu-10.04_chef-11.2.0.box) -* [opscode-ubuntu-12.04](https://opscode-vm.s3.amazonaws.com/vagrant/opscode_ubuntu-12.04_chef-11.2.0.box) +* [opscode-centos-5.8](https://opscode-vm-bento.s3.amazonaws.com/vagrant/opscode_centos-5.8_chef-11.2.0.box) +* [opscode-centos-6.3](https://opscode-vm-bento.s3.amazonaws.com/vagrant/opscode_centos-6.3_chef-11.2.0.box) +* [opscode-ubuntu-10.04](https://opscode-vm-bento.s3.amazonaws.com/vagrant/opscode_ubuntu-10.04_chef-11.2.0.box) +* [opscode-ubuntu-12.04](https://opscode-vm-bento.s3.amazonaws.com/vagrant/opscode_ubuntu-12.04_chef-11.2.0.box) The following base boxes were built with Chef 10.18.2. -* [opscode-centos-5.8-i386](https://opscode-vm.s3.amazonaws.com/vagrant/opscode_centos-5.8-i386_chef-10.18.2.box) -* [opscode-centos-5.8](https://opscode-vm.s3.amazonaws.com/vagrant/opscode_centos-5.8_chef-10.18.2.box) -* [opscode-centos-6.3-i386](https://opscode-vm.s3.amazonaws.com/vagrant/opscode_centos-6.3-i386_chef-10.18.2.box) -* [opscode-centos-6.3](https://opscode-vm.s3.amazonaws.com/vagrant/opscode_centos-6.3_chef-10.18.2.box) -* [opscode-ubuntu-10.04-i386](https://opscode-vm.s3.amazonaws.com/vagrant/opscode_ubuntu-10.04-i386_chef-10.18.2.box) -* [opscode-ubuntu-10.04](https://opscode-vm.s3.amazonaws.com/vagrant/opscode_ubuntu-10.04_chef-10.18.2.box) -* [opscode-ubuntu-12.04-i386](https://opscode-vm.s3.amazonaws.com/vagrant/opscode_ubuntu-12.04-i386_chef-10.18.2.box) -* [opscode-ubuntu-12.04](https://opscode-vm.s3.amazonaws.com/vagrant/opscode_ubuntu-12.04_chef-10.18.2.box) +* [opscode-centos-5.8-i386](https://opscode-vm-bento.s3.amazonaws.com/vagrant/opscode_centos-5.8-i386_chef-10.18.2.box) +* [opscode-centos-5.8](https://opscode-vm-bento.s3.amazonaws.com/vagrant/opscode_centos-5.8_chef-10.18.2.box) +* [opscode-centos-6.3-i386](https://opscode-vm-bento.s3.amazonaws.com/vagrant/opscode_centos-6.3-i386_chef-10.18.2.box) +* [opscode-centos-6.3](https://opscode-vm-bento.s3.amazonaws.com/vagrant/opscode_centos-6.3_chef-10.18.2.box) +* [opscode-ubuntu-10.04-i386](https://opscode-vm-bento.s3.amazonaws.com/vagrant/opscode_ubuntu-10.04-i386_chef-10.18.2.box) +* [opscode-ubuntu-10.04](https://opscode-vm-bento.s3.amazonaws.com/vagrant/opscode_ubuntu-10.04_chef-10.18.2.box) +* [opscode-ubuntu-12.04-i386](https://opscode-vm-bento.s3.amazonaws.com/vagrant/opscode_ubuntu-12.04-i386_chef-10.18.2.box) +* [opscode-ubuntu-12.04](https://opscode-vm-bento.s3.amazonaws.com/vagrant/opscode_ubuntu-12.04_chef-10.18.2.box) The following base boxes were built with Chef 10.14.4. -* [opscode-centos-5.8-i386](https://opscode-vm.s3.amazonaws.com/vagrant/boxes/opscode-centos-5.8-i386.box) -* [opscode-centos-5.8](https://opscode-vm.s3.amazonaws.com/vagrant/boxes/opscode-centos-5.8.box) -* [opscode-centos-6.3-i386](https://opscode-vm.s3.amazonaws.com/vagrant/boxes/opscode-centos-6.3-i386.box) -* [opscode-centos-6.3](https://opscode-vm.s3.amazonaws.com/vagrant/boxes/opscode-centos-6.3.box) -* [opscode-ubuntu-10.04](https://opscode-vm.s3.amazonaws.com/vagrant/boxes/opscode-ubuntu-10.04.box) -* [opscode-ubuntu-10.04-i386](https://opscode-vm.s3.amazonaws.com/vagrant/boxes/opscode-ubuntu-10.04-i386.box) -* [opscode-ubuntu-12.04](https://opscode-vm.s3.amazonaws.com/vagrant/boxes/opscode-ubuntu-12.04.box) -* [opscode-ubuntu-12.04-i386](https://opscode-vm.s3.amazonaws.com/vagrant/boxes/opscode-ubuntu-12.04-i386.box) +* [opscode-centos-5.8-i386](https://opscode-vm-bento.s3.amazonaws.com/vagrant/boxes/opscode-centos-5.8-i386.box) +* [opscode-centos-5.8](https://opscode-vm-bento.s3.amazonaws.com/vagrant/boxes/opscode-centos-5.8.box) +* [opscode-centos-6.3-i386](https://opscode-vm-bento.s3.amazonaws.com/vagrant/boxes/opscode-centos-6.3-i386.box) +* [opscode-centos-6.3](https://opscode-vm-bento.s3.amazonaws.com/vagrant/boxes/opscode-centos-6.3.box) +* [opscode-ubuntu-10.04](https://opscode-vm-bento.s3.amazonaws.com/vagrant/boxes/opscode-ubuntu-10.04.box) +* [opscode-ubuntu-10.04-i386](https://opscode-vm-bento.s3.amazonaws.com/vagrant/boxes/opscode-ubuntu-10.04-i386.box) +* [opscode-ubuntu-12.04](https://opscode-vm-bento.s3.amazonaws.com/vagrant/boxes/opscode-ubuntu-12.04.box) +* [opscode-ubuntu-12.04-i386](https://opscode-vm-bento.s3.amazonaws.com/vagrant/boxes/opscode-ubuntu-12.04-i386.box) # Getting Started From 29389c7f1436d97fa8723e2f0bd2637bf0bac5b9 Mon Sep 17 00:00:00 2001 From: Hector Castro <hectcastro@gmail.com> Date: Mon, 24 Jun 2013 09:41:25 -0400 Subject: [PATCH 0057/1622] [BENTO-53] Fixed paths for Debian 6.0.7 ISOs. --- definitions/debian-6.0.7-i386/definition.rb | 2 +- definitions/debian-6.0.7/definition.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/definitions/debian-6.0.7-i386/definition.rb b/definitions/debian-6.0.7-i386/definition.rb index 7b87a7e61..54637aa0b 100644 --- a/definitions/debian-6.0.7-i386/definition.rb +++ b/definitions/debian-6.0.7-i386/definition.rb @@ -6,6 +6,6 @@ DEBIAN_SESSION.merge( :os_type_id => 'Debian', :iso_file => iso, :iso_md5 => "4480eeae60213eb92e1fce15ebf2faf4", - :iso_src => "http://cdimage.debian.org/debian-cd/6.0.7/i386/iso-cd/#{iso}") + :iso_src => "http://cdimage.debian.org/cdimage/archive/6.0.7/i386/iso-cd/#{iso}") Veewee::Session.declare session diff --git a/definitions/debian-6.0.7/definition.rb b/definitions/debian-6.0.7/definition.rb index f2ce29790..6aeb3f69b 100644 --- a/definitions/debian-6.0.7/definition.rb +++ b/definitions/debian-6.0.7/definition.rb @@ -5,6 +5,6 @@ session = DEBIAN_SESSION.merge( :iso_file => iso, :iso_md5 => "8f0e86d19bc90768da08cdafb4f9edbb", - :iso_src => "http://cdimage.debian.org/debian-cd/6.0.7/amd64/iso-cd/#{iso}") + :iso_src => "http://cdimage.debian.org/cdimage/archive/6.0.7/amd64/iso-cd/#{iso}") Veewee::Session.declare session From 6fb71876ccf641241502d62caa0a4eaf6b35ef05 Mon Sep 17 00:00:00 2001 From: Vasily Mikhaylichenko <vasily.mikhaylichenko@gmail.com> Date: Tue, 25 Jun 2013 01:49:27 +1000 Subject: [PATCH 0058/1622] Fix Debian 7 definitions --- .../{debian-7.0.0-i386 => debian-7.1.0-i386}/cleanup.sh | 0 .../{debian-7.0.0-i386 => debian-7.1.0-i386}/definition.rb | 6 +++--- .../{debian-7.0.0-i386 => debian-7.1.0-i386}/minimize.sh | 0 .../{debian-7.0.0-i386 => debian-7.1.0-i386}/networking.sh | 0 .../{debian-7.0.0-i386 => debian-7.1.0-i386}/preseed.cfg | 0 .../{debian-7.0.0-i386 => debian-7.1.0-i386}/sshd.sh | 0 .../{debian-7.0.0-i386 => debian-7.1.0-i386}/sudoers.sh | 0 .../{debian-7.0.0-i386 => debian-7.1.0-i386}/update.sh | 0 .../{debian-7.0.0-i386 => debian-7.1.0-i386}/vagrant.sh | 0 definitions/{debian-7.0.0 => debian-7.1.0}/cleanup.sh | 0 definitions/{debian-7.0.0 => debian-7.1.0}/definition.rb | 6 +++--- definitions/{debian-7.0.0 => debian-7.1.0}/minimize.sh | 0 definitions/{debian-7.0.0 => debian-7.1.0}/networking.sh | 0 definitions/{debian-7.0.0 => debian-7.1.0}/preseed.cfg | 0 definitions/{debian-7.0.0 => debian-7.1.0}/sshd.sh | 0 definitions/{debian-7.0.0 => debian-7.1.0}/sudoers.sh | 0 definitions/{debian-7.0.0 => debian-7.1.0}/update.sh | 0 definitions/{debian-7.0.0 => debian-7.1.0}/vagrant.sh | 0 18 files changed, 6 insertions(+), 6 deletions(-) rename definitions/{debian-7.0.0-i386 => debian-7.1.0-i386}/cleanup.sh (100%) rename definitions/{debian-7.0.0-i386 => debian-7.1.0-i386}/definition.rb (64%) rename definitions/{debian-7.0.0-i386 => debian-7.1.0-i386}/minimize.sh (100%) rename definitions/{debian-7.0.0-i386 => debian-7.1.0-i386}/networking.sh (100%) rename definitions/{debian-7.0.0-i386 => debian-7.1.0-i386}/preseed.cfg (100%) rename definitions/{debian-7.0.0-i386 => debian-7.1.0-i386}/sshd.sh (100%) rename definitions/{debian-7.0.0-i386 => debian-7.1.0-i386}/sudoers.sh (100%) rename definitions/{debian-7.0.0-i386 => debian-7.1.0-i386}/update.sh (100%) rename definitions/{debian-7.0.0-i386 => debian-7.1.0-i386}/vagrant.sh (100%) rename definitions/{debian-7.0.0 => debian-7.1.0}/cleanup.sh (100%) rename definitions/{debian-7.0.0 => debian-7.1.0}/definition.rb (59%) rename definitions/{debian-7.0.0 => debian-7.1.0}/minimize.sh (100%) rename definitions/{debian-7.0.0 => debian-7.1.0}/networking.sh (100%) rename definitions/{debian-7.0.0 => debian-7.1.0}/preseed.cfg (100%) rename definitions/{debian-7.0.0 => debian-7.1.0}/sshd.sh (100%) rename definitions/{debian-7.0.0 => debian-7.1.0}/sudoers.sh (100%) rename definitions/{debian-7.0.0 => debian-7.1.0}/update.sh (100%) rename definitions/{debian-7.0.0 => debian-7.1.0}/vagrant.sh (100%) diff --git a/definitions/debian-7.0.0-i386/cleanup.sh b/definitions/debian-7.1.0-i386/cleanup.sh similarity index 100% rename from definitions/debian-7.0.0-i386/cleanup.sh rename to definitions/debian-7.1.0-i386/cleanup.sh diff --git a/definitions/debian-7.0.0-i386/definition.rb b/definitions/debian-7.1.0-i386/definition.rb similarity index 64% rename from definitions/debian-7.0.0-i386/definition.rb rename to definitions/debian-7.1.0-i386/definition.rb index 160434c7c..02702cf48 100644 --- a/definitions/debian-7.0.0-i386/definition.rb +++ b/definitions/debian-7.1.0-i386/definition.rb @@ -1,11 +1,11 @@ require File.dirname(__FILE__) + "/../.debian/session.rb" -iso = "debian-7.0.0-i386-CD-1.iso" +iso = "debian-7.1.0-i386-CD-1.iso" session = DEBIAN_SESSION.merge( :os_type_id => 'Debian', :iso_file => iso, - :iso_md5 => "c438bb93ac988e3a763107ab484a8c86", - :iso_src => "http://cdimage.debian.org/debian-cd/7.0.0/i386/iso-cd/#{iso}") + :iso_md5 => "c29ec2db6754dadd341b9763164aca9a", + :iso_src => "http://cdimage.debian.org/debian-cd/7.1.0/i386/iso-cd/#{iso}") Veewee::Session.declare session diff --git a/definitions/debian-7.0.0-i386/minimize.sh b/definitions/debian-7.1.0-i386/minimize.sh similarity index 100% rename from definitions/debian-7.0.0-i386/minimize.sh rename to definitions/debian-7.1.0-i386/minimize.sh diff --git a/definitions/debian-7.0.0-i386/networking.sh b/definitions/debian-7.1.0-i386/networking.sh similarity index 100% rename from definitions/debian-7.0.0-i386/networking.sh rename to definitions/debian-7.1.0-i386/networking.sh diff --git a/definitions/debian-7.0.0-i386/preseed.cfg b/definitions/debian-7.1.0-i386/preseed.cfg similarity index 100% rename from definitions/debian-7.0.0-i386/preseed.cfg rename to definitions/debian-7.1.0-i386/preseed.cfg diff --git a/definitions/debian-7.0.0-i386/sshd.sh b/definitions/debian-7.1.0-i386/sshd.sh similarity index 100% rename from definitions/debian-7.0.0-i386/sshd.sh rename to definitions/debian-7.1.0-i386/sshd.sh diff --git a/definitions/debian-7.0.0-i386/sudoers.sh b/definitions/debian-7.1.0-i386/sudoers.sh similarity index 100% rename from definitions/debian-7.0.0-i386/sudoers.sh rename to definitions/debian-7.1.0-i386/sudoers.sh diff --git a/definitions/debian-7.0.0-i386/update.sh b/definitions/debian-7.1.0-i386/update.sh similarity index 100% rename from definitions/debian-7.0.0-i386/update.sh rename to definitions/debian-7.1.0-i386/update.sh diff --git a/definitions/debian-7.0.0-i386/vagrant.sh b/definitions/debian-7.1.0-i386/vagrant.sh similarity index 100% rename from definitions/debian-7.0.0-i386/vagrant.sh rename to definitions/debian-7.1.0-i386/vagrant.sh diff --git a/definitions/debian-7.0.0/cleanup.sh b/definitions/debian-7.1.0/cleanup.sh similarity index 100% rename from definitions/debian-7.0.0/cleanup.sh rename to definitions/debian-7.1.0/cleanup.sh diff --git a/definitions/debian-7.0.0/definition.rb b/definitions/debian-7.1.0/definition.rb similarity index 59% rename from definitions/debian-7.0.0/definition.rb rename to definitions/debian-7.1.0/definition.rb index 3947e71a1..97d9b0175 100644 --- a/definitions/debian-7.0.0/definition.rb +++ b/definitions/debian-7.1.0/definition.rb @@ -1,10 +1,10 @@ require File.dirname(__FILE__) + "/../.debian/session.rb" -iso = "debian-7.0.0-amd64-CD-1.iso" +iso = "debian-7.1.0-amd64-CD-1.iso" session = DEBIAN_SESSION.merge( :iso_file => iso, - :iso_md5 => "5f9aea239b122454dc360d52e85d6bf8", - :iso_src => "http://cdimage.debian.org/debian-cd/7.0.0/amd64/iso-cd/#{iso}") + :iso_md5 => "6813af64cc9487099210afed14a080e0", + :iso_src => "http://cdimage.debian.org/debian-cd/7.1.0/amd64/iso-cd/#{iso}") Veewee::Session.declare session diff --git a/definitions/debian-7.0.0/minimize.sh b/definitions/debian-7.1.0/minimize.sh similarity index 100% rename from definitions/debian-7.0.0/minimize.sh rename to definitions/debian-7.1.0/minimize.sh diff --git a/definitions/debian-7.0.0/networking.sh b/definitions/debian-7.1.0/networking.sh similarity index 100% rename from definitions/debian-7.0.0/networking.sh rename to definitions/debian-7.1.0/networking.sh diff --git a/definitions/debian-7.0.0/preseed.cfg b/definitions/debian-7.1.0/preseed.cfg similarity index 100% rename from definitions/debian-7.0.0/preseed.cfg rename to definitions/debian-7.1.0/preseed.cfg diff --git a/definitions/debian-7.0.0/sshd.sh b/definitions/debian-7.1.0/sshd.sh similarity index 100% rename from definitions/debian-7.0.0/sshd.sh rename to definitions/debian-7.1.0/sshd.sh diff --git a/definitions/debian-7.0.0/sudoers.sh b/definitions/debian-7.1.0/sudoers.sh similarity index 100% rename from definitions/debian-7.0.0/sudoers.sh rename to definitions/debian-7.1.0/sudoers.sh diff --git a/definitions/debian-7.0.0/update.sh b/definitions/debian-7.1.0/update.sh similarity index 100% rename from definitions/debian-7.0.0/update.sh rename to definitions/debian-7.1.0/update.sh diff --git a/definitions/debian-7.0.0/vagrant.sh b/definitions/debian-7.1.0/vagrant.sh similarity index 100% rename from definitions/debian-7.0.0/vagrant.sh rename to definitions/debian-7.1.0/vagrant.sh From 0aadbf1f8bbf93c233972b418951667d22ba301c Mon Sep 17 00:00:00 2001 From: "Julian C. Dunn" <jdunn@opscode.com> Date: Wed, 3 Jul 2013 18:45:15 -0400 Subject: [PATCH 0059/1622] [BENTO-56] Fix missing vagrant user in the sudoers file --- definitions/.suse/session.rb | 1 + definitions/.suse/sudoers.sh | 3 +++ definitions/sles-11-sp2-i386/sudoers.sh | 1 + definitions/sles-11-sp2/sudoers.sh | 1 + 4 files changed, 6 insertions(+) create mode 100644 definitions/.suse/sudoers.sh create mode 120000 definitions/sles-11-sp2-i386/sudoers.sh create mode 120000 definitions/sles-11-sp2/sudoers.sh diff --git a/definitions/.suse/session.rb b/definitions/.suse/session.rb index 041649d21..c1b3e1762 100644 --- a/definitions/.suse/session.rb +++ b/definitions/.suse/session.rb @@ -13,6 +13,7 @@ :os_type_id => 'OpenSUSE_64', :postinstall_files => [ "vagrant.sh", "sshd.sh", + "sudoers.sh", "cleanup.sh", "minimize.sh" ], :shutdown_cmd => "/sbin/halt -h -p" }) diff --git a/definitions/.suse/sudoers.sh b/definitions/.suse/sudoers.sh new file mode 100644 index 000000000..eb80f3f88 --- /dev/null +++ b/definitions/.suse/sudoers.sh @@ -0,0 +1,3 @@ +# update sudoers - can't do this in autoinst.xml +echo -e "\nupdate sudoers ..." +echo -e "vagrant ALL=(ALL) NOPASSWD: ALL\n" >> /etc/sudoers diff --git a/definitions/sles-11-sp2-i386/sudoers.sh b/definitions/sles-11-sp2-i386/sudoers.sh new file mode 120000 index 000000000..18d9cf04d --- /dev/null +++ b/definitions/sles-11-sp2-i386/sudoers.sh @@ -0,0 +1 @@ +../.suse/sudoers.sh \ No newline at end of file diff --git a/definitions/sles-11-sp2/sudoers.sh b/definitions/sles-11-sp2/sudoers.sh new file mode 120000 index 000000000..18d9cf04d --- /dev/null +++ b/definitions/sles-11-sp2/sudoers.sh @@ -0,0 +1 @@ +../.suse/sudoers.sh \ No newline at end of file From 6a8755d76e0482d4245a5e9430cce3a3500cffac Mon Sep 17 00:00:00 2001 From: "Julian C. Dunn" <jdunn@opscode.com> Date: Fri, 5 Jul 2013 13:08:54 -0400 Subject: [PATCH 0060/1622] Clean up for new provisionerless box format. Add sshd optimization. --- definitions/.fedora/cleanup.sh | 1 - definitions/.fedora/session.rb | 4 ++-- definitions/fedora-18/chef-client.sh | 1 - definitions/fedora-18/sshd.sh | 1 + 4 files changed, 3 insertions(+), 4 deletions(-) delete mode 120000 definitions/fedora-18/chef-client.sh create mode 120000 definitions/fedora-18/sshd.sh diff --git a/definitions/.fedora/cleanup.sh b/definitions/.fedora/cleanup.sh index c515ffa94..a4d82c900 100644 --- a/definitions/.fedora/cleanup.sh +++ b/definitions/.fedora/cleanup.sh @@ -1,5 +1,4 @@ #!/bin/bash -eux yum -y erase gtk2 libX11 hicolor-icon-theme freetype yum -y clean all -rm -rf VBoxGuestAdditions_*.iso VBoxGuestAdditions_*.iso.? rm -f /tmp/chef*rpm diff --git a/definitions/.fedora/session.rb b/definitions/.fedora/session.rb index 7a4d0dd4a..8fae74a1e 100644 --- a/definitions/.fedora/session.rb +++ b/definitions/.fedora/session.rb @@ -6,8 +6,8 @@ :kickstart_file => "ks.cfg", :os_type_id => 'Fedora_64', :memory_size=> "512", - :postinstall_files => [ "chef-client.sh", - "vagrant.sh", + :postinstall_files => [ "vagrant.sh", + "sshd.sh", "cleanup.sh", "minimize.sh" ], :shutdown_cmd => "/sbin/halt -h -p" }) diff --git a/definitions/fedora-18/chef-client.sh b/definitions/fedora-18/chef-client.sh deleted file mode 120000 index 635081810..000000000 --- a/definitions/fedora-18/chef-client.sh +++ /dev/null @@ -1 +0,0 @@ -../.common/chef-client.sh \ No newline at end of file diff --git a/definitions/fedora-18/sshd.sh b/definitions/fedora-18/sshd.sh new file mode 120000 index 000000000..f353f2d00 --- /dev/null +++ b/definitions/fedora-18/sshd.sh @@ -0,0 +1 @@ +../.common/sshd.sh \ No newline at end of file From b9a0e725afbd3eb834590ccac91a04e024143a11 Mon Sep 17 00:00:00 2001 From: "Julian C. Dunn" <jdunn@opscode.com> Date: Fri, 5 Jul 2013 13:39:32 -0400 Subject: [PATCH 0061/1622] [BENTO-50] Add documentation for all current baseboxes --- README.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/README.md b/README.md index 263f05447..956363f56 100644 --- a/README.md +++ b/README.md @@ -19,13 +19,17 @@ Vagrant can be instructed to install Chef at runtime using the * [opscode-centos-5.9](https://opscode-vm-bento.s3.amazonaws.com/vagrant/opscode_centos-5.9_provisionerless.box) * [opscode-centos-6.4](https://opscode-vm-bento.s3.amazonaws.com/vagrant/opscode_centos-6.4_provisionerless.box) +* [opscode-debian-7.1.0](https://opscode-vm-bento.s3.amazonaws.com/vagrant/opscode_debian-7.1.0_provisionerless.box) +* [opscode-fedora-18](https://opscode-vm-bento.s3.amazonaws.com/vagrant/opscode-fedora-18_provisionerless.box) * [opscode-ubuntu-10.04](https://opscode-vm-bento.s3.amazonaws.com/vagrant/opscode_ubuntu-10.04_provisionerless.box) * [opscode-ubuntu-12.04](https://opscode-vm-bento.s3.amazonaws.com/vagrant/opscode_ubuntu-12.04_provisionerless.box) +* [opscode-ubuntu-13.04](https://opscode-vm-bento.s3.amazonaws.com/vagrant/opscode_ubuntu-13.04_provisionerless.box) 32-bit boxes: * [opscode-centos-5.9-i386](https://opscode-vm-bento.s3.amazonaws.com/vagrant/opscode_centos-5.9-i386_provisionerless.box) * [opscode-centos-6.4-i386](https://opscode-vm-bento.s3.amazonaws.com/vagrant/opscode_centos-6.4-i386_provisionerless.box) +* [opscode-debian-7.1.0-i386](https://opscode-vm-bento.s3.amazonaws.com/vagrant/opscode_debian-7.1.0-i386_provisionerless.box) * [opscode-ubuntu-10.04-i386](https://opscode-vm-bento.s3.amazonaws.com/vagrant/opscode_ubuntu-10.04-i386_provisionerless.box) * [opscode-ubuntu-12.04-i386](https://opscode-vm-bento.s3.amazonaws.com/vagrant/opscode_ubuntu-12.04-i386_provisionerless.box) From 9c6d30c242c989675d21a77e58a2e5c94c675e1f Mon Sep 17 00:00:00 2001 From: "Julian C. Dunn" <jdunn@opscode.com> Date: Sun, 7 Jul 2013 02:00:23 -0400 Subject: [PATCH 0062/1622] Switch to manual partitioning since autopart makes /tmp too small to actually run tests sensibly --- definitions/.fedora/ks.cfg | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/definitions/.fedora/ks.cfg b/definitions/.fedora/ks.cfg index 0decd94df..c89695e03 100644 --- a/definitions/.fedora/ks.cfg +++ b/definitions/.fedora/ks.cfg @@ -13,7 +13,12 @@ text skipx zerombr clearpart --all --initlabel -autopart +part /boot --fstype=ext4 --size=500 +part pv.2 --grow --size=500 +volgroup vg_vagrant --pesize=32768 pv.2 +logvol / --fstype=ext4 --name=lv_root --vgname=vg_vagrant --size=1024 --grow +logvol swap --fstype=swap --name=lv_swap --vgname=vg_vagrant --size=528 --grow --maxsize=1056 +bootloader --location=mbr --append="norhgb biosdevname=0" auth --useshadow --enablemd5 firstboot --disabled reboot From f69e2facbcebd8d868ccda58cf420c0cfcb57bcf Mon Sep 17 00:00:00 2001 From: "Julian C. Dunn" <jdunn@opscode.com> Date: Tue, 9 Jul 2013 00:21:06 -0400 Subject: [PATCH 0063/1622] Added definitions for Fedora 19, Schrodinger's Cat --- definitions/fedora-19/cleanup.sh | 1 + definitions/fedora-19/definition.rb | 11 +++++++++++ definitions/fedora-19/ks.cfg | 1 + definitions/fedora-19/minimize.sh | 1 + definitions/fedora-19/sshd.sh | 1 + definitions/fedora-19/vagrant.sh | 1 + 6 files changed, 16 insertions(+) create mode 120000 definitions/fedora-19/cleanup.sh create mode 100644 definitions/fedora-19/definition.rb create mode 120000 definitions/fedora-19/ks.cfg create mode 120000 definitions/fedora-19/minimize.sh create mode 120000 definitions/fedora-19/sshd.sh create mode 120000 definitions/fedora-19/vagrant.sh diff --git a/definitions/fedora-19/cleanup.sh b/definitions/fedora-19/cleanup.sh new file mode 120000 index 000000000..1cf83b27e --- /dev/null +++ b/definitions/fedora-19/cleanup.sh @@ -0,0 +1 @@ +../.fedora/cleanup.sh \ No newline at end of file diff --git a/definitions/fedora-19/definition.rb b/definitions/fedora-19/definition.rb new file mode 100644 index 000000000..b39a8b485 --- /dev/null +++ b/definitions/fedora-19/definition.rb @@ -0,0 +1,11 @@ +require File.dirname(__FILE__) + "/../.fedora/session.rb" + +iso = "Fedora-19-x86_64-DVD.iso" + +session = + FEDORA_SESSION.merge( :iso_file => iso, + :iso_md5 => "638d69c23621d5befc714bcd66b0611e", + :iso_src => "http://mirrors.kernel.org/fedora/releases/19/Fedora/x86_64/iso/#{iso}" +) + +Veewee::Session.declare session diff --git a/definitions/fedora-19/ks.cfg b/definitions/fedora-19/ks.cfg new file mode 120000 index 000000000..15c8071a4 --- /dev/null +++ b/definitions/fedora-19/ks.cfg @@ -0,0 +1 @@ +../.fedora/ks.cfg \ No newline at end of file diff --git a/definitions/fedora-19/minimize.sh b/definitions/fedora-19/minimize.sh new file mode 120000 index 000000000..b3632ccbc --- /dev/null +++ b/definitions/fedora-19/minimize.sh @@ -0,0 +1 @@ +../.common/minimize.sh \ No newline at end of file diff --git a/definitions/fedora-19/sshd.sh b/definitions/fedora-19/sshd.sh new file mode 120000 index 000000000..f353f2d00 --- /dev/null +++ b/definitions/fedora-19/sshd.sh @@ -0,0 +1 @@ +../.common/sshd.sh \ No newline at end of file diff --git a/definitions/fedora-19/vagrant.sh b/definitions/fedora-19/vagrant.sh new file mode 120000 index 000000000..702949639 --- /dev/null +++ b/definitions/fedora-19/vagrant.sh @@ -0,0 +1 @@ +../.common/vagrant.sh \ No newline at end of file From eb07f601dec2ecb02a8f1eb3be03b758f04c6c5f Mon Sep 17 00:00:00 2001 From: "Julian C. Dunn" <jdunn@opscode.com> Date: Tue, 9 Jul 2013 11:28:00 -0500 Subject: [PATCH 0064/1622] Added definitions for SUSE Linux Enterprise Server 11 SP3. --- definitions/sles-11-sp3-i386/autoinst.xml | 2569 ++++++++++++++++++++ definitions/sles-11-sp3-i386/cleanup.sh | 9 + definitions/sles-11-sp3-i386/definition.rb | 12 + definitions/sles-11-sp3-i386/minimize.sh | 1 + definitions/sles-11-sp3-i386/sshd.sh | 1 + definitions/sles-11-sp3-i386/sudoers.sh | 1 + definitions/sles-11-sp3-i386/vagrant.sh | 1 + definitions/sles-11-sp3/autoinst.xml | 2569 ++++++++++++++++++++ definitions/sles-11-sp3/cleanup.sh | 9 + definitions/sles-11-sp3/definition.rb | 12 + definitions/sles-11-sp3/minimize.sh | 1 + definitions/sles-11-sp3/sshd.sh | 1 + definitions/sles-11-sp3/sudoers.sh | 1 + definitions/sles-11-sp3/vagrant.sh | 1 + 14 files changed, 5188 insertions(+) create mode 100644 definitions/sles-11-sp3-i386/autoinst.xml create mode 100644 definitions/sles-11-sp3-i386/cleanup.sh create mode 100644 definitions/sles-11-sp3-i386/definition.rb create mode 120000 definitions/sles-11-sp3-i386/minimize.sh create mode 120000 definitions/sles-11-sp3-i386/sshd.sh create mode 120000 definitions/sles-11-sp3-i386/sudoers.sh create mode 120000 definitions/sles-11-sp3-i386/vagrant.sh create mode 100644 definitions/sles-11-sp3/autoinst.xml create mode 100644 definitions/sles-11-sp3/cleanup.sh create mode 100644 definitions/sles-11-sp3/definition.rb create mode 120000 definitions/sles-11-sp3/minimize.sh create mode 120000 definitions/sles-11-sp3/sshd.sh create mode 120000 definitions/sles-11-sp3/sudoers.sh create mode 120000 definitions/sles-11-sp3/vagrant.sh diff --git a/definitions/sles-11-sp3-i386/autoinst.xml b/definitions/sles-11-sp3-i386/autoinst.xml new file mode 100644 index 000000000..1277f42a7 --- /dev/null +++ b/definitions/sles-11-sp3-i386/autoinst.xml @@ -0,0 +1,2569 @@ +<?xml version="1.0"?> +<!DOCTYPE profile> +<profile xmlns="http://www.suse.com/1.0/yast2ns" xmlns:config="http://www.suse.com/1.0/configns"> + <add-on> + <add_on_products config:type="list"> + <listentry> + <media_url><![CDATA[http://demeter.uni-regensburg.de/SLE11SP3-SDK-x86/DVD1/]]></media_url> + <product>sle-sdk</product> + <product_dir>/</product_dir> + </listentry> + </add_on_products> + </add-on> + <bootloader> + <device_map config:type="list"> + <device_map_entry> + <firmware>hd0</firmware> + <linux>/dev/sda</linux> + </device_map_entry> + </device_map> + <global> + <activate>true</activate> + <boot_root>true</boot_root> + <default>SUSE Linux Enterprise Server 11 SP3 - 3.0.76-0.11</default> + <generic_mbr>true</generic_mbr> + <gfxmenu>/boot/message</gfxmenu> + <lines_cache_id>2</lines_cache_id> + <timeout config:type="integer">8</timeout> + </global> + <initrd_modules config:type="list"> + <initrd_module> + <module>ahci</module> + </initrd_module> + <initrd_module> + <module>ata_piix</module> + </initrd_module> + <initrd_module> + <module>ata_generic</module> + </initrd_module> + <initrd_module> + <module>jbd</module> + </initrd_module> + <initrd_module> + <module>mbcache</module> + </initrd_module> + <initrd_module> + <module>ext3</module> + </initrd_module> + </initrd_modules> + <loader_type>grub</loader_type> + <sections config:type="list"> + <section> + <append>resume=/dev/sda1 splash=silent crashkernel=128M-:64M showopts</append> + <image>(hd0,1)/boot/vmlinuz-3.0.76-0.11-default</image> + <initial>1</initial> + <initrd>(hd0,1)/boot/initrd-3.0.76-0.11-default</initrd> + <lines_cache_id>0</lines_cache_id> + <name>SUSE Linux Enterprise Server 11 SP3 - 3.0.76-0.11</name> + <original_name>linux</original_name> + <root>/dev/sda2</root> + <type>image</type> + <vgamode>0x314</vgamode> + </section> + <section> + <append>showopts ide=nodma apm=off noresume edd=off powersaved=off nohz=off highres=off processor.max_cstate=1 nomodeset x11failsafe</append> + <image>(hd0,1)/boot/vmlinuz-3.0.76-0.11-default</image> + <initrd>(hd0,1)/boot/initrd-3.0.76-0.11-default</initrd> + <lines_cache_id>1</lines_cache_id> + <name>Failsafe -- SUSE Linux Enterprise Server 11 SP3 - 3.0.76-0.11</name> + <original_name>failsafe</original_name> + <root>/dev/sda2</root> + <type>image</type> + <vgamode>0x314</vgamode> + </section> + </sections> + </bootloader> + <ca_mgm> + <CAName>YaST_Default_CA</CAName> + <ca_commonName>YaST Default CA (vagrant-sles-11sp3-x86)</ca_commonName> + <country>US</country> + <locality></locality> + <organisation></organisation> + <organisationUnit></organisationUnit> + <password>ENTER PASSWORD HERE</password> + <server_commonName>vagrant-sles-11sp3-x86.vagrantup.com</server_commonName> + <server_email>postmaster@vagrantup.com</server_email> + <state></state> + <takeLocalServerName config:type="boolean">false</takeLocalServerName> + </ca_mgm> + <deploy_image> + <image_installation config:type="boolean">false</image_installation> + </deploy_image> + <general> + <ask-list config:type="list"/> + <mode> + <confirm config:type="boolean">false</confirm> + </mode> + <mouse> + <id>none</id> + </mouse> + <proposals config:type="list"/> + <signature-handling> + <accept_file_without_checksum config:type="boolean">true</accept_file_without_checksum> + <accept_non_trusted_gpg_key config:type="boolean">true</accept_non_trusted_gpg_key> + <accept_unknown_gpg_key config:type="boolean">true</accept_unknown_gpg_key> + <accept_unsigned_file config:type="boolean">true</accept_unsigned_file> + <accept_verification_failed config:type="boolean">false</accept_verification_failed> + <import_gpg_key config:type="boolean">true</import_gpg_key> + </signature-handling> + <storage/> + </general> + <groups config:type="list"> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>100</gid> + <group_password>x</group_password> + <groupname>users</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>19</gid> + <group_password>x</group_password> + <groupname>floppy</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>1</gid> + <group_password>x</group_password> + <groupname>bin</groupname> + <userlist>daemon</userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>41</gid> + <group_password>x</group_password> + <groupname>xok</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>65533</gid> + <group_password>x</group_password> + <groupname>nobody</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>43</gid> + <group_password>x</group_password> + <groupname>modem</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>5</gid> + <group_password>x</group_password> + <groupname>tty</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>7</gid> + <group_password>x</group_password> + <groupname>lp</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>104</gid> + <group_password>!</group_password> + <groupname>uuidd</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>51</gid> + <group_password>!</group_password> + <groupname>postfix</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>112</gid> + <group_password>!</group_password> + <groupname>gdm</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>65534</gid> + <group_password>x</group_password> + <groupname>nogroup</groupname> + <userlist>nobody</userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>101</gid> + <group_password>!</group_password> + <groupname>messagebus</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>59</gid> + <group_password>!</group_password> + <groupname>maildrop</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>33</gid> + <group_password>x</group_password> + <groupname>video</groupname> + <userlist>vagrant</userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>3</gid> + <group_password>x</group_password> + <groupname>sys</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>15</gid> + <group_password>x</group_password> + <groupname>shadow</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>20</gid> + <group_password>x</group_password> + <groupname>cdrom</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>21</gid> + <group_password>x</group_password> + <groupname>console</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>42</gid> + <group_password>x</group_password> + <groupname>trusted</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>102</gid> + <group_password>!</group_password> + <groupname>haldaemon</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>106</gid> + <group_password>!</group_password> + <groupname>puppet</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>16</gid> + <group_password>x</group_password> + <groupname>dialout</groupname> + <userlist>vagrant</userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>107</gid> + <group_password>!</group_password> + <groupname>polkituser</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>10</gid> + <group_password>x</group_password> + <groupname>wheel</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>109</gid> + <group_password>!</group_password> + <groupname>pulse</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>8</gid> + <group_password>x</group_password> + <groupname>www</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>40</gid> + <group_password>x</group_password> + <groupname>games</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>6</gid> + <group_password>x</group_password> + <groupname>disk</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>17</gid> + <group_password>x</group_password> + <groupname>audio</groupname> + <userlist>pulse</userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>111</gid> + <group_password>!</group_password> + <groupname>suse-ncc</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>49</gid> + <group_password>x</group_password> + <groupname>ftp</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>103</gid> + <group_password>!</group_password> + <groupname>tape</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>25</gid> + <group_password>!</group_password> + <groupname>at</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>9</gid> + <group_password>x</group_password> + <groupname>kmem</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>32</gid> + <group_password>x</group_password> + <groupname>public</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>12</gid> + <group_password>x</group_password> + <groupname>mail</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>0</gid> + <group_password>x</group_password> + <groupname>root</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>2</gid> + <group_password>x</group_password> + <groupname>daemon</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>105</gid> + <group_password>!</group_password> + <groupname>sfcb</groupname> + <userlist>root</userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>108</gid> + <group_password>!</group_password> + <groupname>ntp</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>14</gid> + <group_password>x</group_password> + <groupname>uucp</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>110</gid> + <group_password>!</group_password> + <groupname>pulse-access</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>71</gid> + <group_password>!</group_password> + <groupname>ntadmin</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>62</gid> + <group_password>x</group_password> + <groupname>man</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>22</gid> + <group_password>x</group_password> + <groupname>utmp</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>13</gid> + <group_password>x</group_password> + <groupname>news</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>65</gid> + <group_password>!</group_password> + <groupname>sshd</groupname> + <userlist></userlist> + </group> + </groups> + <host> + <hosts config:type="list"> + <hosts_entry> + <host_address>127.0.0.1</host_address> + <names config:type="list"> + <name>localhost</name> + </names> + </hosts_entry> + <hosts_entry> + <host_address>::1</host_address> + <names config:type="list"> + <name>localhost ipv6-localhost ipv6-loopback</name> + </names> + </hosts_entry> + <hosts_entry> + <host_address>fe00::0</host_address> + <names config:type="list"> + <name>ipv6-localnet</name> + </names> + </hosts_entry> + <hosts_entry> + <host_address>ff00::0</host_address> + <names config:type="list"> + <name>ipv6-mcastprefix</name> + </names> + </hosts_entry> + <hosts_entry> + <host_address>ff02::1</host_address> + <names config:type="list"> + <name>ipv6-allnodes</name> + </names> + </hosts_entry> + <hosts_entry> + <host_address>ff02::2</host_address> + <names config:type="list"> + <name>ipv6-allrouters</name> + </names> + </hosts_entry> + <hosts_entry> + <host_address>ff02::3</host_address> + <names config:type="list"> + <name>ipv6-allhosts</name> + </names> + </hosts_entry> + </hosts> + </host> + <login_settings/> + <networking> + <dhcp_options> + <dhclient_client_id></dhclient_client_id> + <dhclient_hostname_option>AUTO</dhclient_hostname_option> + </dhcp_options> + <dns> + <dhcp_hostname config:type="boolean">false</dhcp_hostname> + <domain>vagrantup.com</domain> + <hostname>vagrant-sles-11sp3-x86</hostname> + <resolv_conf_policy>auto</resolv_conf_policy> + <searchlist config:type="list"> + <search>vagrantup.com</search> + </searchlist> + <write_hostname config:type="boolean">true</write_hostname> + </dns> + <interfaces config:type="list"> + <interface> + <bootproto>dhcp</bootproto> + <device>eth0</device> + <name>82540EM Gigabit Ethernet Controller</name> + <startmode>auto</startmode> + <usercontrol>no</usercontrol> + </interface> + </interfaces> + <managed config:type="boolean">false</managed> + <net-udev config:type="list"> + <rule> + <name>eth0</name> + <rule>KERNELS</rule> + <value>0000:00:03.0</value> + </rule> + </net-udev> + <routing> + <ip_forward config:type="boolean">false</ip_forward> + </routing> + </networking> + <partitioning config:type="list"> + <drive> + <device>/dev/sda</device> + <initialize config:type="boolean">true</initialize> + <partitions config:type="list"> + <partition> + <create config:type="boolean">true</create> + <crypt_fs config:type="boolean">false</crypt_fs> + <filesystem config:type="symbol">swap</filesystem> + <format config:type="boolean">true</format> + <fstopt>defaults</fstopt> + <loop_fs config:type="boolean">false</loop_fs> + <mount>swap</mount> + <mountby config:type="symbol">device</mountby> + <partition_id config:type="integer">130</partition_id> + <partition_nr config:type="integer">1</partition_nr> + <raid_options/> + <resize config:type="boolean">false</resize> + <size>1561492992</size> + </partition> + <partition> + <create config:type="boolean">true</create> + <crypt_fs config:type="boolean">false</crypt_fs> + <filesystem config:type="symbol">ext3</filesystem> + <format config:type="boolean">true</format> + <fstopt>acl,user_xattr</fstopt> + <loop_fs config:type="boolean">false</loop_fs> + <mount>/</mount> + <mountby config:type="symbol">device</mountby> + <partition_id config:type="integer">131</partition_id> + <partition_nr config:type="integer">2</partition_nr> + <raid_options/> + <resize config:type="boolean">false</resize> + <size>19895844352</size> + </partition> + </partitions> + <pesize></pesize> + <type config:type="symbol">CT_DISK</type> + <use>all</use> + </drive> + </partitioning> + <report> + <errors> + <log config:type="boolean">true</log> + <show config:type="boolean">true</show> + <timeout config:type="integer">0</timeout> + </errors> + <messages> + <log config:type="boolean">true</log> + <show config:type="boolean">true</show> + <timeout config:type="integer">0</timeout> + </messages> + <warnings> + <log config:type="boolean">true</log> + <show config:type="boolean">true</show> + <timeout config:type="integer">0</timeout> + </warnings> + <yesno_messages> + <log config:type="boolean">true</log> + <show config:type="boolean">true</show> + <timeout config:type="integer">0</timeout> + </yesno_messages> + </report> + <software> + + <packages config:type="list"> + <package>desktop-translations</package> + <package>gconf2-branding-SLES</package> + <package>libproxy0-config-gnome</package> + <package>sle-sdk-release</package> + <package>sle-sdk-release-SDK</package> + <package>sles-manuals_en</package> + <package>yast2-trans-en_US</package> + </packages> + <patterns config:type="list"> + <pattern>Basis-Devel</pattern> + <pattern>Minimal</pattern> + <pattern>apparmor</pattern> + <pattern>base</pattern> + <pattern>sdk_kernel</pattern> + </patterns> + <remove-packages config:type="list"> + <package>3ddiag</package> + <package>CASA</package> + <package>CASA-devel</package> + <package>CASA_auth_token_client</package> + <package>CASA_auth_token_client-devel</package> + <package>ConsoleKit-devel</package> + <package>ConsoleKit-x11</package> + <package>DirectFB-devel</package> + <package>FastCGI</package> + <package>IlmBase</package> + <package>IlmBase-devel</package> + <package>ImageMagick</package> + <package>ImageMagick-devel</package> + <package>LibVNCServer</package> + <package>LibVNCServer-devel</package> + <package>Mesa</package> + <package>Mesa-devel</package> + <package>ModemManager</package> + <package>Modules</package> + <package>NetworkManager</package> + <package>NetworkManager-devel</package> + <package>NetworkManager-glib</package> + <package>NetworkManager-gnome</package> + <package>NetworkManager-kde4</package> + <package>NetworkManager-kde4-lang</package> + <package>NetworkManager-kde4-libs</package> + <package>OpenEXR</package> + <package>OpenEXR-devel</package> + <package>OpenIPMI-devel</package> + <package>PackageKit</package> + <package>PackageKit-devel</package> + <package>PackageKit-lang</package> + <package>PolicyKit-devel</package> + <package>PolicyKit-gnome</package> + <package>PolicyKit-gnome-devel</package> + <package>PolicyKit-gnome-libs</package> + <package>SDL-devel</package> + <package>SDL_net</package> + <package>SDL_net-devel</package> + <package>TeX-Guy</package> + <package>TeX-Guy-devel</package> + <package>VFlib3</package> + <package>VFlib3-devel</package> + <package>WindowMaker</package> + <package>WindowMaker-devel</package> + <package>a2ps</package> + <package>aalib</package> + <package>aalib-devel</package> + <package>akonadi-runtime</package> + <package>akregator</package> + <package>alsa-devel</package> + <package>alsa-firmware</package> + <package>alsa-plugins-pulse</package> + <package>alsa-tools</package> + <package>alsa-tools-devel</package> + <package>anthy</package> + <package>anthy-devel</package> + <package>antlr</package> + <package>apache2</package> + <package>apache2-devel</package> + <package>apache2-mod_perl</package> + <package>apache2-mod_perl-devel</package> + <package>apache2-prefork</package> + <package>apache2-utils</package> + <package>apache2-worker</package> + <package>apparmor-profile-editor</package> + <package>art-sharp2</package> + <package>arts</package> + <package>arts-devel</package> + <package>aspell-devel</package> + <package>at-spi</package> + <package>at-spi-devel</package> + <package>at-spi-lang</package> + <package>atk-devel</package> + <package>audiofile</package> + <package>audiofile-devel</package> + <package>audit-devel</package> + <package>augeas-lenses</package> + <package>automoc4</package> + <package>avahi</package> + <package>avahi-compat-howl-devel</package> + <package>avahi-compat-mDNSResponder-devel</package> + <package>avahi-lang</package> + <package>babl-0_0</package> + <package>banshee-1</package> + <package>banshee-1-backend-engine-gstreamer</package> + <package>banshee-1-backend-platform-gnome</package> + <package>banshee-1-backend-platform-unix</package> + <package>banshee-1-devel</package> + <package>banshee-1-extensions-default</package> + <package>banshee-1-lang</package> + <package>beagle-devel</package> + <package>bind-devel</package> + <package>binutils-devel</package> + <package>bluez</package> + <package>bluez-devel</package> + <package>boo</package> + <package>boo-devel</package> + <package>boost-devel</package> + <package>bootsplash-branding-SLED</package> + <package>cairo-devel</package> + <package>cairomm</package> + <package>cairomm-devel</package> + <package>canna</package> + <package>canna-devel</package> + <package>canna-libs</package> + <package>cannadic</package> + <package>capi4linux</package> + <package>capi4linux-devel</package> + <package>cdk</package> + <package>cdk-devel</package> + <package>cdrdao</package> + <package>chasen</package> + <package>chasen-devel</package> + <package>check</package> + <package>check-devel</package> + <package>chmlib</package> + <package>chmlib-devel</package> + <package>cim-schema</package> + <package>clucene-core</package> + <package>clucene-core-devel</package> + <package>cmake</package> + <package>compiz</package> + <package>compiz-branding-SLE</package> + <package>compiz-devel</package> + <package>compiz-gnome</package> + <package>coolkey-devel</package> + <package>cracklib-devel</package> + <package>crash-devel</package> + <package>crimson</package> + <package>cscope</package> + <package>cups</package> + <package>cups-devel</package> + <package>cvsps</package> + <package>cyrus-imapd-devel</package> + <package>cyrus-sasl-crammd5</package> + <package>cyrus-sasl-devel</package> + <package>dante</package> + <package>dante-devel</package> + <package>db1</package> + <package>db1-devel</package> + <package>db43</package> + <package>db43-devel</package> + <package>dbus-1-devel</package> + <package>dbus-1-glib-devel</package> + <package>dbus-1-python-devel</package> + <package>dbus-1-qt3</package> + <package>dbus-1-qt3-devel</package> + <package>dbus-1-x11</package> + <package>dejagnu</package> + <package>dejavu</package> + <package>desktop-data-openSUSE</package> + <package>desktop-file-utils</package> + <package>devhelp</package> + <package>devhelp-devel</package> + <package>devhelp-lang</package> + <package>device-mapper-devel</package> + <package>dhcp</package> + <package>dhcp-client</package> + <package>dhcp-devel</package> + <package>diffstat</package> + <package>dmapi-devel</package> + <package>dnsmasq</package> + <package>docbook-xsl-stylesheets</package> + <package>docbook_4</package> + <package>doxygen</package> + <package>dvd+rw-tools</package> + <package>e2fsprogs-devel</package> + <package>emacs</package> + <package>emacs-nox</package> + <package>emacs-x11</package> + <package>enchant</package> + <package>enchant-devel</package> + <package>enscript</package> + <package>eog</package> + <package>eog-devel</package> + <package>eog-lang</package> + <package>espeak</package> + <package>evince</package> + <package>evince-devel</package> + <package>evince-lang</package> + <package>evoldap2-devel</package> + <package>evolution</package> + <package>evolution-data-server</package> + <package>evolution-data-server-devel</package> + <package>evolution-data-server-lang</package> + <package>evolution-devel</package> + <package>evolution-lang</package> + <package>expect-devel</package> + <package>facter</package> + <package>fam</package> + <package>fam-devel</package> + <package>farsight</package> + <package>farsight-devel</package> + <package>festival</package> + <package>festival-devel</package> + <package>fftw</package> + <package>fftw-devel</package> + <package>fftw-mpi</package> + <package>fftw-mpi-devel</package> + <package>fftw-threads</package> + <package>fftw-threads-devel</package> + <package>fftw3</package> + <package>fftw3-devel</package> + <package>fftw3-threads</package> + <package>fftw3-threads-devel</package> + <package>file-devel</package> + <package>fileshareset</package> + <package>finch</package> + <package>finch-devel</package> + <package>flac-devel</package> + <package>fltk</package> + <package>fltk-devel</package> + <package>fontconfig-devel</package> + <package>fonts-config</package> + <package>foomatic-filters</package> + <package>freeglut</package> + <package>freeglut-devel</package> + <package>freeradius-client-devel</package> + <package>freeradius-client-libs</package> + <package>freeradius-server-devel</package> + <package>freeradius-server-libs</package> + <package>freetype</package> + <package>freetype2-devel</package> + <package>fribidi</package> + <package>fribidi-devel</package> + <package>ft2demos</package> + <package>fuse-devel</package> + <package>fwnn-devel</package> + <package>fxload</package> + <package>gcc-gij</package> + <package>gcc-java</package> + <package>gcc43-gij</package> + <package>gcc43-java</package> + <package>gconf-sharp2</package> + <package>gconf2-devel</package> + <package>gconfmm</package> + <package>gconfmm-devel</package> + <package>gd</package> + <package>gd-devel</package> + <package>gdbm-32bit</package> + <package>gdk-pixbuf</package> + <package>gdk-pixbuf-devel</package> + <package>gegl-0_0</package> + <package>gettext-tools</package> + <package>gfxboot-branding-SLED</package> + <package>gfxboot-devel</package> + <package>ggz</package> + <package>ggz-client-libs</package> + <package>ggz-client-libs-devel</package> + <package>ggz-client-libs-lang</package> + <package>ghex</package> + <package>ghex-devel</package> + <package>ghex-lang</package> + <package>ghostscript-devel</package> + <package>ghostscript-fonts-other</package> + <package>ghostscript-fonts-std</package> + <package>ghostscript-ijs-devel</package> + <package>ghostscript-library</package> + <package>ghostscript-omni</package> + <package>ghostscript-x11</package> + <package>giflib-devel</package> + <package>gimp</package> + <package>gimp-branding-SLED</package> + <package>gimp-devel</package> + <package>gimp-lang</package> + <package>gimp-plugins-python</package> + <package>git</package> + <package>git-arch</package> + <package>git-core</package> + <package>git-cvs</package> + <package>git-daemon</package> + <package>git-email</package> + <package>git-gui</package> + <package>git-svn</package> + <package>git-web</package> + <package>gitk</package> + <package>gjdoc</package> + <package>glade-sharp2</package> + <package>glade3</package> + <package>glade3-lang</package> + <package>glib</package> + <package>glib-devel</package> + <package>glib-sharp2</package> + <package>glib2-devel</package> + <package>glibmm2</package> + <package>glibmm2-devel</package> + <package>glitz</package> + <package>glitz-devel</package> + <package>gltt</package> + <package>gltt-devel</package> + <package>gmime-2_4-devel</package> + <package>gmime-devel</package> + <package>gmp-devel</package> + <package>gnet</package> + <package>gnet-devel</package> + <package>gnokii</package> + <package>gnokii-devel</package> + <package>gnokii-smsd</package> + <package>gnome-certauth-devel</package> + <package>gnome-control-center</package> + <package>gnome-control-center-devel</package> + <package>gnome-control-center-lang</package> + <package>gnome-desktop</package> + <package>gnome-desktop-devel</package> + <package>gnome-desktop-lang</package> + <package>gnome-doc-utils</package> + <package>gnome-doc-utils-devel</package> + <package>gnome-doc-utils-lang</package> + <package>gnome-keyring-devel</package> + <package>gnome-keyring-sharp</package> + <package>gnome-keyring-sharp-devel</package> + <package>gnome-libs</package> + <package>gnome-libs-devel</package> + <package>gnome-mag</package> + <package>gnome-mag-devel</package> + <package>gnome-mag-lang</package> + <package>gnome-main-menu</package> + <package>gnome-main-menu-lang</package> + <package>gnome-media</package> + <package>gnome-media-devel</package> + <package>gnome-media-lang</package> + <package>gnome-menus</package> + <package>gnome-menus-branding-SLED</package> + <package>gnome-menus-devel</package> + <package>gnome-menus-lang</package> + <package>gnome-mount</package> + <package>gnome-mount-lang</package> + <package>gnome-panel</package> + <package>gnome-panel-devel</package> + <package>gnome-panel-lang</package> + <package>gnome-pilot</package> + <package>gnome-pilot-devel</package> + <package>gnome-pilot-lang</package> + <package>gnome-settings-daemon</package> + <package>gnome-settings-daemon-devel</package> + <package>gnome-settings-daemon-lang</package> + <package>gnome-sharp2</package> + <package>gnome-speech</package> + <package>gnome-speech-devel</package> + <package>gnome-themes</package> + <package>gnome-utils</package> + <package>gnome-utils-devel</package> + <package>gnome-utils-lang</package> + <package>gnome-vfs-sharp2</package> + <package>gnome-vfs2</package> + <package>gnome-vfs2-devel</package> + <package>gnome-vfs2-lang</package> + <package>gnome-vfsmm</package> + <package>gnome-vfsmm-devel</package> + <package>gnopernicus</package> + <package>gnopernicus-devel</package> + <package>gnopernicus-lang</package> + <package>gnutls</package> + <package>goffice</package> + <package>goffice-devel</package> + <package>goffice-lang</package> + <package>goocanvas</package> + <package>goocanvas-devel</package> + <package>goocanvas-lang</package> + <package>goom2k4</package> + <package>goom2k4-devel</package> + <package>graphviz</package> + <package>graphviz-devel</package> + <package>graphviz-gd</package> + <package>graphviz-gnome</package> + <package>gstreamer-0_10</package> + <package>gstreamer-0_10-devel</package> + <package>gstreamer-0_10-lang</package> + <package>gstreamer-0_10-plugins-base</package> + <package>gstreamer-0_10-plugins-base-devel</package> + <package>gstreamer-0_10-plugins-base-lang</package> + <package>gstreamer-0_10-plugins-good</package> + <package>gstreamer-0_10-plugins-good-lang</package> + <package>gstreamer-0_10-utils</package> + <package>gstreamer-utils</package> + <package>gtk</package> + <package>gtk-devel</package> + <package>gtk-lang</package> + <package>gtk-sharp2</package> + <package>gtk-vnc-devel</package> + <package>gtk2-devel</package> + <package>gtkglext</package> + <package>gtkglext-devel</package> + <package>gtkhtml2</package> + <package>gtkhtml2-devel</package> + <package>gtkhtml2-lang</package> + <package>gtkhtml314-sharp</package> + <package>gtkmm2</package> + <package>gtkmm2-devel</package> + <package>gtksourceview-devel</package> + <package>gtksourceview-lang</package> + <package>gtksourceview18</package> + <package>gtksourceview18-devel</package> + <package>gtkspell</package> + <package>gtkspell-devel</package> + <package>gtkspell-lang</package> + <package>gucharmap</package> + <package>gucharmap-devel</package> + <package>gucharmap-lang</package> + <package>guile</package> + <package>guile-devel</package> + <package>gutenprint</package> + <package>gutenprint-devel</package> + <package>gvfs-devel</package> + <package>gxmhtml</package> + <package>hal-devel</package> + <package>hal-palm</package> + <package>htdig</package> + <package>htdig-devel</package> + <package>hunspell</package> + <package>hunspell-devel</package> + <package>hunspell-tools</package> + <package>hwinfo-devel</package> + <package>i4l-base</package> + <package>icewm</package> + <package>icewm-lite</package> + <package>id3lib</package> + <package>id3lib-devel</package> + <package>imap-devel</package> + <package>imap-lib</package> + <package>imlib</package> + <package>imlib-devel</package> + <package>imlib2</package> + <package>imlib2-devel</package> + <package>indent</package> + <package>info2html</package> + <package>inn</package> + <package>inn-devel</package> + <package>intltool</package> + <package>ipadic</package> + <package>iptables-devel</package> + <package>iso-codes</package> + <package>iso-codes-devel</package> + <package>iso_ent</package> + <package>ispell</package> + <package>ispell-american</package> + <package>ispell-brazilian</package> + <package>ispell-british</package> + <package>ispell-czech</package> + <package>ispell-danish</package> + <package>ispell-finnish</package> + <package>ispell-french</package> + <package>ispell-german</package> + <package>ispell-hungarian</package> + <package>ispell-italian</package> + <package>ispell-ngerman</package> + <package>ispell-norsk</package> + <package>ispell-polish</package> + <package>ispell-portuguese</package> + <package>ispell-russian</package> + <package>ispell-slovak</package> + <package>ispell-spanish</package> + <package>ispell-swedish</package> + <package>itcl-devel</package> + <package>java-1_4_2-ibm</package> + <package>java-1_4_2-ibm-devel</package> + <package>java-1_5_0-gcj-compat</package> + <package>java-1_5_0-gcj-compat-devel</package> + <package>java-1_6_0-ibm</package> + <package>java-1_6_0-ibm-devel</package> + <package>joe</package> + <package>jpackage-utils</package> + <package>k3b</package> + <package>k3b-devel</package> + <package>k3b-lang</package> + <package>kaddressbook</package> + <package>kalarm</package> + <package>kde-susetranslations</package> + <package>kde4-filesystem</package> + <package>kde4-kgreeter-plugins</package> + <package>kdebase3</package> + <package>kdebase3-devel</package> + <package>kdebase3-runtime</package> + <package>kdebase4-SLED</package> + <package>kdebase4-SLED-lang</package> + <package>kdebase4-runtime</package> + <package>kdebase4-runtime-branding-SLED</package> + <package>kdebase4-workspace</package> + <package>kdebase4-workspace-branding-SLED</package> + <package>kdebase4-workspace-devel</package> + <package>kdebase4-workspace-ksysguardd</package> + <package>kdelibs3</package> + <package>kdelibs3-arts</package> + <package>kdelibs3-default-style</package> + <package>kdelibs3-devel</package> + <package>kdelibs3-doc</package> + <package>kdelibs4</package> + <package>kdelibs4-branding-SLED</package> + <package>kdelibs4-core</package> + <package>kdelibs4-doc</package> + <package>kdemultimedia3-arts</package> + <package>kdepim3</package> + <package>kdepim4</package> + <package>kdepim4-devel</package> + <package>kdepimlibs4</package> + <package>kdialog</package> + <package>kdm</package> + <package>kdm-branding-SLED</package> + <package>kernel-docs</package> + <package>kernel-syms</package> + <package>kernel-trace-devel</package> + <package>kernel-xen-devel</package> + <package>keyutils-devel</package> + <package>kio_sysinfo</package> + <package>kio_sysinfo-branding-SLED</package> + <package>kmail</package> + <package>knode</package> + <package>kontact</package> + <package>korganizer</package> + <package>kpilot</package> + <package>krb5-devel</package> + <package>ksh-devel</package> + <package>ktorrent</package> + <package>ktorrent-devel</package> + <package>ktorrent-lang</package> + <package>kwin</package> + <package>ladspa-devel</package> + <package>lib3ds-1-3</package> + <package>lib3ds-devel</package> + <package>libFLAC++6</package> + <package>libFLAC8</package> + <package>libHX-devel</package> + <package>libMagick++-devel</package> + <package>libMagick++1</package> + <package>libMagickWand1</package> + <package>libQtWebKit-devel</package> + <package>libQtWebKit4</package> + <package>libXerces-c-devel</package> + <package>libXerces-c28</package> + <package>libXiterm</package> + <package>libXiterm-devel</package> + <package>libacl-devel</package> + <package>libadns-devel</package> + <package>libadns1</package> + <package>libakode</package> + <package>libakode-devel</package> + <package>libakonadi4</package> + <package>libakonadiprotocolinternals-devel</package> + <package>libakonadiprotocolinternals1</package> + <package>libao</package> + <package>libao-devel</package> + <package>libapparmor-devel</package> + <package>libapr-util1</package> + <package>libapr-util1-devel</package> + <package>libapr1</package> + <package>libapr1-devel</package> + <package>libarchive-devel</package> + <package>libart_lgpl</package> + <package>libart_lgpl-devel</package> + <package>libassuan-devel</package> + <package>libatomic-ops-devel</package> + <package>libattr-devel</package> + <package>libavahi-core5</package> + <package>libavahi-devel</package> + <package>libavahi-glib-devel</package> + <package>libavahi-gobject-devel</package> + <package>libavahi-gobject0</package> + <package>libavahi-ui0</package> + <package>libavc1394-0</package> + <package>libavc1394-devel</package> + <package>libbabl-0_0-0</package> + <package>libbeagle-devel</package> + <package>libbeagle-python</package> + <package>libbeagle1</package> + <package>libbitmask-devel</package> + <package>libbitmask1</package> + <package>libblkid-devel</package> + <package>libblocxx-devel</package> + <package>libbonobo</package> + <package>libbonobo-devel</package> + <package>libbonobo-lang</package> + <package>libbonoboui</package> + <package>libbonoboui-devel</package> + <package>libbonoboui-lang</package> + <package>libboost_date_time1_36_0</package> + <package>libboost_filesystem1_36_0</package> + <package>libboost_graph1_36_0</package> + <package>libboost_iostreams1_36_0</package> + <package>libboost_math1_36_0</package> + <package>libboost_mpi1_36_0</package> + <package>libboost_program_options1_36_0</package> + <package>libboost_python1_36_0</package> + <package>libboost_serialization1_36_0</package> + <package>libboost_signals1_36_0</package> + <package>libboost_system1_36_0</package> + <package>libboost_test1_36_0</package> + <package>libboost_thread1_36_0</package> + <package>libboost_wave1_36_0</package> + <package>libbotan-1_6_4</package> + <package>libbotan-devel</package> + <package>libbtctl</package> + <package>libbtctl-devel</package> + <package>libbtctl-lang</package> + <package>libbtctl4</package> + <package>libbz2-devel</package> + <package>libcaca</package> + <package>libcaca-devel</package> + <package>libcanberra-gtk</package> + <package>libcanberra-gtk0</package> + <package>libcanberra0</package> + <package>libcap-devel</package> + <package>libcap-ng0</package> + <package>libcdda_interface0</package> + <package>libcdda_paranoia0</package> + <package>libcddb-devel</package> + <package>libcddb2</package> + <package>libcdio++0</package> + <package>libcdio-devel</package> + <package>libcgroup-devel</package> + <package>libcgroup1</package> + <package>libchewing</package> + <package>libchewing-devel</package> + <package>libcmpiutil</package> + <package>libcmpiutil-devel</package> + <package>libcolorblind0</package> + <package>libcom_err-devel</package> + <package>libcompizconfig</package> + <package>libcompizconfig-devel</package> + <package>libcppunit-1_12-0</package> + <package>libcppunit-devel</package> + <package>libcpuset-devel</package> + <package>libcpuset1</package> + <package>libcroco</package> + <package>libcroco-0_6-3</package> + <package>libcroco-devel</package> + <package>libcryptsetup-devel</package> + <package>libcsync-devel</package> + <package>libcsync0</package> + <package>libcurl-devel</package> + <package>libdaemon-devel</package> + <package>libdaemon0</package> + <package>libdatrie-devel</package> + <package>libdatrie0</package> + <package>libdb-4_5-32bit</package> + <package>libdb-4_5-devel</package> + <package>libdbus-1-qt3-0</package> + <package>libdbus-1-qt3-0-devel</package> + <package>libdc1394-22</package> + <package>libdc1394-devel</package> + <package>libdc1394_control12</package> + <package>libdc1394_control12-devel</package> + <package>libdhcp6client-1_0-2</package> + <package>libdhcp6client-devel</package> + <package>libdigikam-devel</package> + <package>libdiscid1</package> + <package>libdjvulibre-devel</package> + <package>libdjvulibre21</package> + <package>libdmxview-devel</package> + <package>libdmxview0</package> + <package>libdnet-devel</package> + <package>libdnet1</package> + <package>libdns_sd</package> + <package>libdrm</package> + <package>libdrm-devel</package> + <package>libdv-devel</package> + <package>libdv4</package> + <package>libdvdread4</package> + <package>libdw-devel</package> + <package>libebl-devel</package> + <package>libedit-devel</package> + <package>libedit0</package> + <package>libelf-devel</package> + <package>libenchant1</package> + <package>libesd-devel</package> + <package>libesd0</package> + <package>libesmtp-devel</package> + <package>libevoldap-2_4-2</package> + <package>libevtlog-devel</package> + <package>libevtlog0</package> + <package>libexempi-devel</package> + <package>libexempi3</package> + <package>libexif-devel</package> + <package>libexiv2-4</package> + <package>libexiv2-devel</package> + <package>libexpat-devel</package> + <package>libext2fs-devel</package> + <package>libfarsight-0_1-3</package> + <package>libffi-devel</package> + <package>libffi43</package> + <package>libffi43-devel</package> + <package>libflaim-devel</package> + <package>libfprint-devel</package> + <package>libfreebl3</package> + <package>libfreebob</package> + <package>libfreebob-devel</package> + <package>libgadu</package> + <package>libgadu-devel</package> + <package>libgail-gnome</package> + <package>libgail-gnome-devel</package> + <package>libgcj-devel</package> + <package>libgcj43</package> + <package>libgcj43-devel</package> + <package>libgcj43-jar</package> + <package>libgcj_bc43</package> + <package>libgcrypt-devel</package> + <package>libgda-3_0-3</package> + <package>libgda-3_0-devel</package> + <package>libgdiplus0</package> + <package>libgegl-0_0-0</package> + <package>libgeoclue0</package> + <package>libgfortran46</package> + <package>libggz2</package> + <package>libggz2-devel</package> + <package>libgimpprint</package> + <package>libgimpprint-devel</package> + <package>libglade2</package> + <package>libglade2-devel</package> + <package>libglademm</package> + <package>libglademm-2_4-1</package> + <package>libglademm-devel</package> + <package>libgladeui-1-9</package> + <package>libgladeui-1_0-devel</package> + <package>libgmime-2_0-3</package> + <package>libgmime-2_4-2</package> + <package>libgmm++-devel</package> + <package>libgnome</package> + <package>libgnome-certauth0</package> + <package>libgnome-desktop-2-11</package> + <package>libgnome-devel</package> + <package>libgnome-lang</package> + <package>libgnome-menu2</package> + <package>libgnome-window-settings1</package> + <package>libgnomecanvas</package> + <package>libgnomecanvas-devel</package> + <package>libgnomecanvas-lang</package> + <package>libgnomecanvasmm</package> + <package>libgnomecanvasmm-devel</package> + <package>libgnomecups</package> + <package>libgnomecups-devel</package> + <package>libgnomecups-lang</package> + <package>libgnomedb</package> + <package>libgnomedb-devel</package> + <package>libgnomedb-lang</package> + <package>libgnomekbd</package> + <package>libgnomekbd-devel</package> + <package>libgnomekbd-lang</package> + <package>libgnomeprint</package> + <package>libgnomeprint-devel</package> + <package>libgnomeprint-lang</package> + <package>libgnomeprintui</package> + <package>libgnomeprintui-devel</package> + <package>libgnomeprintui-lang</package> + <package>libgnomesu</package> + <package>libgnomesu-devel</package> + <package>libgnomesu-lang</package> + <package>libgnomesu0</package> + <package>libgnomeui</package> + <package>libgnomeui-devel</package> + <package>libgnomeui-lang</package> + <package>libgnomevfsmm-2_6-1</package> + <package>libgnutls-devel</package> + <package>libgnutls-extra-devel</package> + <package>libgnutls-extra26</package> + <package>libgoocanvas3</package> + <package>libgpg-error-devel</package> + <package>libgpgme-devel</package> + <package>libgphoto2-devel</package> + <package>libgpod-devel</package> + <package>libgsf</package> + <package>libgsf-1-114</package> + <package>libgsf-devel</package> + <package>libgsf-gnome</package> + <package>libgsm-devel</package> + <package>libgsm1</package> + <package>libgssglue-devel</package> + <package>libgstapp-0_10-0</package> + <package>libgstinterfaces-0_10-0</package> + <package>libgstreamer-0_10-0</package> + <package>libgtk-vnc-1_0-0</package> + <package>libgtkhtml</package> + <package>libgtkhtml-devel</package> + <package>libgtksourceview-2_0-0</package> + <package>libgtop</package> + <package>libgtop-2_0-7</package> + <package>libgtop-devel</package> + <package>libgtop-lang</package> + <package>libgudev-1_0-0</package> + <package>libgweather</package> + <package>libgweather-devel</package> + <package>libgweather-lang</package> + <package>libgweather1</package> + <package>libhangul</package> + <package>libhangul-devel</package> + <package>libhowl0</package> + <package>libical-devel</package> + <package>libical0</package> + <package>libicu-devel</package> + <package>libid3tag</package> + <package>libid3tag-devel</package> + <package>libidl-devel</package> + <package>libidn-devel</package> + <package>libiec61883</package> + <package>libiec61883-devel</package> + <package>libieee1284</package> + <package>libiniparser-devel</package> + <package>libiniparser0</package> + <package>libiptcdata</package> + <package>libiptcdata-devel</package> + <package>libiptcdata0</package> + <package>libiso9660-5</package> + <package>libiterm</package> + <package>libiterm-devel</package> + <package>libjack-devel</package> + <package>libjack0</package> + <package>libjasper</package> + <package>libjasper-devel</package> + <package>libjingle-0_3-0</package> + <package>libjingle-devel</package> + <package>libjpeg-devel</package> + <package>libkcal</package> + <package>libkcal-devel</package> + <package>libkcal2</package> + <package>libkcddb4</package> + <package>libkcddb4-devel</package> + <package>libkcompactdisc4</package> + <package>libkcompactdisc4-devel</package> + <package>libkdcraw3</package> + <package>libkdcraw3-devel</package> + <package>libkdcraw3-lang</package> + <package>libkde4</package> + <package>libkde4-devel</package> + <package>libkdecore4</package> + <package>libkdecore4-devel</package> + <package>libkdepim4</package> + <package>libkdepim4-devel</package> + <package>libkdepimlibs4</package> + <package>libkdepimlibs4-devel</package> + <package>libkexiv2-3</package> + <package>libkexiv2-3-devel</package> + <package>libkexiv2-7</package> + <package>libkipi-devel</package> + <package>libkipi6</package> + <package>libkmime-devel</package> + <package>libkmime2</package> + <package>libknotificationitem-1-1</package> + <package>libkonq-devel</package> + <package>libkonq5</package> + <package>libksba-devel</package> + <package>libktnef-devel</package> + <package>libktnef1</package> + <package>liblazy-devel</package> + <package>liblazy1</package> + <package>liblcms-devel</package> + <package>libldapcpp-devel</package> + <package>liblog4c-devel</package> + <package>liblog4c3</package> + <package>libloudmouth-1-0</package> + <package>liblpsolve55</package> + <package>liblua5_1</package> + <package>libmalaga-devel</package> + <package>libmalaga7</package> + <package>libmcrypt</package> + <package>libmcrypt-devel</package> + <package>libmikmod</package> + <package>libmikmod-devel</package> + <package>libmm-devel</package> + <package>libmm14</package> + <package>libmng-devel</package> + <package>libmpcdec-devel</package> + <package>libmpcdec5</package> + <package>libmspack-devel</package> + <package>libmtp-devel</package> + <package>libmtp8</package> + <package>libmusicbrainz-devel</package> + <package>libmusicbrainz3-6</package> + <package>libmusicbrainz3-devel</package> + <package>libmusicbrainz4</package> + <package>libmysqlclient-devel</package> + <package>libmysqlclient15</package> + <package>libmysqlclient_r15</package> + <package>libneon-devel</package> + <package>libneon27</package> + <package>libnetapi-devel</package> + <package>libnetapi0</package> + <package>libnetcontrol0</package> + <package>libnetpbm-devel</package> + <package>libnetpbm10</package> + <package>libnewt0_52</package> + <package>libnjb</package> + <package>libnjb-devel</package> + <package>libnjb5</package> + <package>libnl-devel</package> + <package>libnotify</package> + <package>libnotify-devel</package> + <package>libnotify1</package> + <package>libnscd-devel</package> + <package>libnsssharedhelper0</package> + <package>libnuma-devel</package> + <package>libofa-devel</package> + <package>libofa0</package> + <package>libogg-devel</package> + <package>libogg0</package> + <package>liboil</package> + <package>liboil-devel</package> + <package>libopenbabel-devel</package> + <package>libopenbabel3</package> + <package>libopencdk-devel</package> + <package>libopencdk10</package> + <package>libopenraw-devel</package> + <package>libopenraw1</package> + <package>libopenssl-devel</package> + <package>libopensync</package> + <package>libopensync-devel</package> + <package>libopensync-plugin-evolution2</package> + <package>libopensync-plugin-evolution2-devel</package> + <package>libopensync-plugin-palm</package> + <package>libopensync-plugin-palm-devel</package> + <package>liborc-0_4-0</package> + <package>libosip2</package> + <package>libosip2-devel</package> + <package>libotf</package> + <package>libotf-devel</package> + <package>libotr-devel</package> + <package>libotr2</package> + <package>libp11-1</package> + <package>libp11-devel</package> + <package>libpackagekit-glib10</package> + <package>libpackagekit-glib10-devel</package> + <package>libpangomm-1_4-1</package> + <package>libpcap-devel</package> + <package>libpciaccess0</package> + <package>libpciaccess0-devel</package> + <package>libphonon4</package> + <package>libpisock-devel</package> + <package>libpisock9</package> + <package>libpisync-devel</package> + <package>libpisync1</package> + <package>libpixman-1-0-devel</package> + <package>libpkcs11-helper1</package> + <package>libpng-devel</package> + <package>libpolkit-qt0</package> + <package>libpoppler-devel</package> + <package>libpoppler-glib-devel</package> + <package>libpoppler-glib4</package> + <package>libpoppler-qt2</package> + <package>libpoppler-qt3-devel</package> + <package>libpoppler-qt4-3</package> + <package>libpoppler-qt4-devel</package> + <package>libpoppler5</package> + <package>libpst4</package> + <package>libpt2</package> + <package>libpt2-devel</package> + <package>libpulse-browse0</package> + <package>libpulse-devel</package> + <package>libpulse-mainloop-glib0</package> + <package>libpulse0</package> + <package>libpurple</package> + <package>libpurple-devel</package> + <package>libpurple-lang</package> + <package>libqca2</package> + <package>libqca2-devel</package> + <package>libqdialogsolver1</package> + <package>libqdialogsolver1-devel</package> + <package>libqimageblitz-devel</package> + <package>libqimageblitz4</package> + <package>libqscintilla-devel</package> + <package>libqscintilla2-5</package> + <package>libqt4</package> + <package>libqt4-devel</package> + <package>libqt4-qt3support</package> + <package>libqt4-sql</package> + <package>libqt4-sql-mysql</package> + <package>libqt4-sql-postgresql</package> + <package>libqt4-sql-sqlite</package> + <package>libqt4-sql-unixODBC</package> + <package>libqt4-x11</package> + <package>libqtpod-devel</package> + <package>libqtpod0</package> + <package>libquadmath46</package> + <package>libquicktime</package> + <package>libquicktime-devel</package> + <package>libraptor-devel</package> + <package>libraptor1</package> + <package>librasqal-devel</package> + <package>librasqal1</package> + <package>libraw1394-11</package> + <package>libraw1394-8</package> + <package>libraw1394-devel</package> + <package>libredland-devel</package> + <package>libredland0</package> + <package>libreiserfs-devel</package> + <package>libreoffice</package> + <package>libreoffice-base</package> + <package>libreoffice-branding-SLED</package> + <package>libreoffice-branding-upstream</package> + <package>libreoffice-calc</package> + <package>libreoffice-icon-themes</package> + <package>libreoffice-impress</package> + <package>libreoffice-sdk</package> + <package>libreoffice-writer</package> + <package>librsvg</package> + <package>librsvg-devel</package> + <package>libsamplerate</package> + <package>libsamplerate-devel</package> + <package>libsatsolver-devel</package> + <package>libsblim-cmpiutil1</package> + <package>libselinux-devel</package> + <package>libsemanage-devel</package> + <package>libsemanage1</package> + <package>libsensors3-devel</package> + <package>libsensors4</package> + <package>libsepol-devel</package> + <package>libsexy</package> + <package>libsexy-devel</package> + <package>libshout-devel</package> + <package>libshout3</package> + <package>libsidplay1</package> + <package>libsidplay1-devel</package> + <package>libsigc++2</package> + <package>libsigc++2-devel</package> + <package>libslab-lang</package> + <package>libslab0</package> + <package>libsmbclient-devel</package> + <package>libsmbios-devel</package> + <package>libsmbsharemodes-devel</package> + <package>libsmbsharemodes0</package> + <package>libsndfile</package> + <package>libsndfile-devel</package> + <package>libsoprano-devel</package> + <package>libsoprano4</package> + <package>libsoup-devel</package> + <package>libspectre-devel</package> + <package>libspectre1</package> + <package>libspeex</package> + <package>libssh2-devel</package> + <package>libstrigi0</package> + <package>libstroke</package> + <package>libstroke-devel</package> + <package>libsyncml-devel</package> + <package>libsyncml0</package> + <package>libtalloc-devel</package> + <package>libtasn1-devel</package> + <package>libtdb-devel</package> + <package>libtelepathy</package> + <package>libtelepathy-devel</package> + <package>libtelepathy-glib0</package> + <package>libtheora-devel</package> + <package>libtheora0</package> + <package>libtidy</package> + <package>libtidy-devel</package> + <package>libtiff-devel</package> + <package>libtirpc-devel</package> + <package>libtomoe-gtk0</package> + <package>libtspi1</package> + <package>libtunepimp</package> + <package>libtunepimp-devel</package> + <package>libtunepimp5</package> + <package>libudev-devel</package> + <package>libudf0</package> + <package>libunique-1_0-0</package> + <package>libunwind</package> + <package>libunwind-devel</package> + <package>libupsclient1</package> + <package>libusb-devel</package> + <package>libusbpp-0_1-4</package> + <package>libustr-1_0-1</package> + <package>libustr-devel</package> + <package>libuuid-devel</package> + <package>libvirt-client</package> + <package>libvirt-devel</package> + <package>libvisual</package> + <package>libvisual-devel</package> + <package>libvoikko-devel</package> + <package>libvoikko1</package> + <package>libvorbis</package> + <package>libvorbis-devel</package> + <package>libwavpack1</package> + <package>libwbclient-devel</package> + <package>libwbxml2-0</package> + <package>libwbxml2-devel</package> + <package>libwebkit-1_0-1</package> + <package>libwebkit-1_0-2</package> + <package>libwebkit-devel</package> + <package>libwebkit-lang</package> + <package>libwmf</package> + <package>libwmf-devel</package> + <package>libwmf-gnome</package> + <package>libwnck</package> + <package>libwnck-1-22</package> + <package>libwnck-devel</package> + <package>libwnck-lang</package> + <package>libwpd-0_8-8</package> + <package>libwpd-devel</package> + <package>libwpg-0_1-1</package> + <package>libwpg-devel</package> + <package>libwps-0_1-1</package> + <package>libwps-devel</package> + <package>libwsman-devel</package> + <package>libwsman1</package> + <package>libxcrypt-devel</package> + <package>libxine-devel</package> + <package>libxine1</package> + <package>libxklavier-devel</package> + <package>libxklavier15</package> + <package>libxml2-devel</package> + <package>libxslt-devel</package> + <package>libyajl1</package> + <package>libzio-devel</package> + <package>libzip-devel</package> + <package>libzip1</package> + <package>libzvbi0</package> + <package>libzypp-devel</package> + <package>limal-apparmor-notifications</package> + <package>limal-apparmor-notifications-devel</package> + <package>limal-ca-mgm-devel</package> + <package>limal-devel</package> + <package>limal-devtools</package> + <package>limal-nfs-server-devel</package> + <package>linux-atm-devel</package> + <package>linux-atm-lib</package> + <package>lksctp-tools</package> + <package>lksctp-tools-devel</package> + <package>loudmouth-devel</package> + <package>lua</package> + <package>lua-devel</package> + <package>lzo-devel</package> + <package>m17n-db</package> + <package>m17n-lib</package> + <package>m17n-lib-devel</package> + <package>malaga-suomi</package> + <package>meanwhile</package> + <package>meanwhile-devel</package> + <package>metacity</package> + <package>metacity-devel</package> + <package>metacity-lang</package> + <package>mhash</package> + <package>mhash-devel</package> + <package>misc-console-font</package> + <package>mono-addins</package> + <package>mono-basic</package> + <package>mono-core</package> + <package>mono-data</package> + <package>mono-data-oracle</package> + <package>mono-data-sqlite</package> + <package>mono-devel</package> + <package>mono-extras</package> + <package>mono-jscript</package> + <package>mono-tools</package> + <package>mono-wcf</package> + <package>mono-web</package> + <package>mono-winforms</package> + <package>mono-zeroconf</package> + <package>mono-zeroconf-provider-avahi</package> + <package>monodevelop</package> + <package>monodoc-core</package> + <package>mozilla-nspr</package> + <package>mozilla-nspr-devel</package> + <package>mozilla-nss</package> + <package>mozilla-nss-devel</package> + <package>mozilla-xulrunner192</package> + <package>mozilla-xulrunner192-gnome</package> + <package>mpfr-devel</package> + <package>mpi-selector</package> + <package>mpich</package> + <package>mpich-devel</package> + <package>mysql</package> + <package>mysql-client</package> + <package>nagios</package> + <package>nagios-devel</package> + <package>nagios-www</package> + <package>nant</package> + <package>nautilus</package> + <package>nautilus-cd-burner</package> + <package>nautilus-cd-burner-devel</package> + <package>nautilus-cd-burner-lang</package> + <package>nautilus-devel</package> + <package>nautilus-lang</package> + <package>ndesk-dbus</package> + <package>ndesk-dbus-glib</package> + <package>ndesk-dbus-glib-devel</package> + <package>net-snmp</package> + <package>net-snmp-devel</package> + <package>netatalk</package> + <package>netatalk-devel</package> + <package>netcat-openbsd</package> + <package>newt</package> + <package>newt-devel</package> + <package>newt-static</package> + <package>nfsidmap-devel</package> + <package>notification-daemon</package> + <package>notification-daemon-lang</package> + <package>notify-sharp</package> + <package>nss-mdns</package> + <package>nss-shared-helper-devel</package> + <package>nut</package> + <package>nut-classic</package> + <package>nut-devel</package> + <package>opal</package> + <package>opal-devel</package> + <package>openCryptoki</package> + <package>openCryptoki-64bit</package> + <package>openCryptoki-devel</package> + <package>openct-devel</package> + <package>openhpi</package> + <package>openhpi-daemon</package> + <package>openhpi-devel</package> + <package>openjade</package> + <package>openjade-devel</package> + <package>openldap2-devel</package> + <package>openmotif-devel</package> + <package>openmotif-libs</package> + <package>openmpi</package> + <package>openobex-devel</package> + <package>openobex-glib-devel</package> + <package>opensc-devel</package> + <package>openslp-devel</package> + <package>opensp</package> + <package>opensp-devel</package> + <package>openwsman-client</package> + <package>openwsman-server</package> + <package>orbit</package> + <package>orbit-devel</package> + <package>orbit2-devel</package> + <package>oxygen-icon-theme</package> + <package>oxygen-icon-theme-scalable</package> + <package>ozerocdoff</package> + <package>pam-devel</package> + <package>pango-devel</package> + <package>pangomm-devel</package> + <package>parted-devel</package> + <package>patchutils</package> + <package>pciutils-devel</package> + <package>pcre-devel</package> + <package>pcsc-acr38</package> + <package>pcsc-acr38-devel</package> + <package>pcsc-lite-devel</package> + <package>perl-32bit</package> + <package>perl-Crypt-OpenSSL-RSA</package> + <package>perl-Mail-DKIM</package> + <package>perl-MailTools</package> + <package>perl-Net-DNS</package> + <package>perl-Net-IP</package> + <package>perl-NetAddr-IP</package> + <package>perl-SNMP</package> + <package>perl-Tie-IxHash</package> + <package>perl-Tk</package> + <package>perl-Tk-devel</package> + <package>perl-spamassassin</package> + <package>phonon</package> + <package>phonon-backend-gstreamer-0_10</package> + <package>phonon-devel</package> + <package>php5</package> + <package>php5-ctype</package> + <package>php5-devel</package> + <package>php5-dom</package> + <package>php5-hash</package> + <package>php5-iconv</package> + <package>php5-json</package> + <package>php5-pdo</package> + <package>php5-sqlite</package> + <package>php5-suhosin</package> + <package>php5-tokenizer</package> + <package>php5-xmlreader</package> + <package>php5-xmlwriter</package> + <package>php53</package> + <package>php53-ctype</package> + <package>php53-dom</package> + <package>php53-iconv</package> + <package>php53-json</package> + <package>php53-tokenizer</package> + <package>php53-xmlreader</package> + <package>php53-xmlwriter</package> + <package>pidgin</package> + <package>pidgin-devel</package> + <package>pilot-link</package> + <package>pkcs11-helper</package> + <package>pkcs11-helper-devel</package> + <package>planner</package> + <package>planner-devel</package> + <package>planner-lang</package> + <package>plasma-addons</package> + <package>plasma-theme-aya</package> + <package>plasmoid-networkmanagement</package> + <package>plasmoid-quickaccess</package> + <package>plotutils</package> + <package>poppler-data</package> + <package>poppler-tools</package> + <package>popt-devel</package> + <package>portmap</package> + <package>postfix-devel</package> + <package>postgresql-devel</package> + <package>postgresql-libs</package> + <package>ppp-devel</package> + <package>ppp-userpass</package> + <package>pstoedit</package> + <package>pstoedit-devel</package> + <package>pulseaudio</package> + <package>pulseaudio-esound-compat</package> + <package>pulseaudio-lang</package> + <package>puppet</package> + <package>python-cairo</package> + <package>python-cairo-devel</package> + <package>python-devel</package> + <package>python-gnome</package> + <package>python-gnome-devel</package> + <package>python-gobject2</package> + <package>python-gobject2-devel</package> + <package>python-gtk</package> + <package>python-gtk-devel</package> + <package>python-gtkglext</package> + <package>python-gtkglext-devel</package> + <package>python-gtksourceview</package> + <package>python-gtksourceview-devel</package> + <package>python-numeric</package> + <package>python-numpy</package> + <package>python-orbit</package> + <package>python-orbit-devel</package> + <package>pyxml</package> + <package>qt3</package> + <package>qt3-devel</package> + <package>quagga</package> + <package>quagga-devel</package> + <package>quilt</package> + <package>raptor</package> + <package>rarian</package> + <package>rarian-devel</package> + <package>re2c</package> + <package>readline-devel</package> + <package>recode-devel</package> + <package>rpm-devel</package> + <package>rrdtool</package> + <package>rrdtool-devel</package> + <package>rsyslog</package> + <package>ruby</package> + <package>rubygems</package> + <package>ruby-devel</package> + <package>ruby-doc-html</package> + <package>ruby-doc-ri</package> + <package>ruby-examples</package> + <package>ruby-fcgi</package> + <package>ruby-mysql</package> + <package>ruby-selinux</package> + <package>ruby-test-suite</package> + <package>ruby-tk</package> + <package>sablot</package> + <package>sablot-devel</package> + <package>samba-devel</package> + <package>sane-backends</package> + <package>sane-frontends</package> + <package>sax2-libsax</package> + <package>sax2-libsax-devel</package> + <package>sax2-libsax-perl</package> + <package>sax2-tools</package> + <package>sblim-cmpi-base</package> + <package>sblim-cmpi-base-devel</package> + <package>sblim-cmpi-devel</package> + <package>sblim-cmpiutil-devel</package> + <package>sblim-indication_helper</package> + <package>sblim-sfcb</package> + <package>sblim-sfcc</package> + <package>sblim-sfcc-devel</package> + <package>scim</package> + <package>scim-devel</package> + <package>scpm-devel</package> + <package>scrollkeeper</package> + <package>scrollkeeper-lang</package> + <package>seahorse</package> + <package>seahorse-devel</package> + <package>seahorse-lang</package> + <package>sendmail</package> + <package>sendmail-devel</package> + <package>sg3_utils-devel</package> + <package>sgml-skel</package> + <package>shared-mime-info</package> + <package>silc-toolkit</package> + <package>silc-toolkit-devel</package> + <package>slang</package> + <package>slang-devel</package> + <package>soprano</package> + <package>soprano-backend-redland</package> + <package>spamassassin</package> + <package>speex-devel</package> + <package>splashy-devel</package> + <package>sqlite2</package> + <package>sqlite3-devel</package> + <package>startup-notification</package> + <package>startup-notification-devel</package> + <package>strigi</package> + <package>strigi-devel</package> + <package>subversion</package> + <package>subversion-perl</package> + <package>susehelp</package> + <package>susehelp_cz</package> + <package>susehelp_de</package> + <package>susehelp_en</package> + <package>susehelp_es</package> + <package>susehelp_fr</package> + <package>susehelp_hu</package> + <package>susehelp_it</package> + <package>swig</package> + <package>syslogd</package> + <package>t1lib</package> + <package>t1lib-devel</package> + <package>taglib</package> + <package>taglib-devel</package> + <package>taglib-sharp</package> + <package>tango-icon-theme</package> + <package>tcl-devel</package> + <package>tcpd-devel</package> + <package>telepathy-glib-devel</package> + <package>telepathy-mission-control</package> + <package>telepathy-mission-control-devel</package> + <package>texlive-bin-devel</package> + <package>texlive-devel</package> + <package>tk-devel</package> + <package>tla</package> + <package>tn5250</package> + <package>tn5250-devel</package> + <package>tomoe</package> + <package>tomoe-devel</package> + <package>tomoe-gtk</package> + <package>tomoe-gtk-devel</package> + <package>tomoe-gtk-lang</package> + <package>totem-pl-parser</package> + <package>totem-pl-parser-devel</package> + <package>totem-pl-parser-lang</package> + <package>trousers</package> + <package>trousers-devel</package> + <package>tsclient</package> + <package>tsclient-devel</package> + <package>tsclient-lang</package> + <package>uim</package> + <package>uim-devel</package> + <package>unixODBC</package> + <package>unixODBC-devel</package> + <package>unsermake</package> + <package>update-desktop-files</package> + <package>usb_modeswitch</package> + <package>usb_modeswitch-data</package> + <package>valgrind</package> + <package>valgrind-devel</package> + <package>vte</package> + <package>vte-devel</package> + <package>vte-lang</package> + <package>wdiff</package> + <package>webkit-sharp</package> + <package>wireshark</package> + <package>wireshark-devel</package> + <package>wodim-devel</package> + <package>wordcut</package> + <package>wordcut-devel</package> + <package>words</package> + <package>wpa_supplicant</package> + <package>wvstreams</package> + <package>wvstreams-devel</package> + <package>wxGTK-compat</package> + <package>wxGTK-devel</package> + <package>wxGTK-gl</package> + <package>x11-input-wacom</package> + <package>x11-input-wacom-devel</package> + <package>x11-input-wacom-tools</package> + <package>xalan-j2</package> + <package>xaw3d-devel</package> + <package>xbase</package> + <package>xbase-devel</package> + <package>xdelta</package> + <package>xdelta-devel</package> + <package>xdg-menu</package> + <package>xen-devel</package> + <package>xen-libs</package> + <package>xerces-j2</package> + <package>xerces-j2-bootstrap</package> + <package>xerces-j2-xml-apis</package> + <package>xfsprogs-devel</package> + <package>xml-commons-apis-bootstrap</package> + <package>xml-commons-resolver-bootstrap</package> + <package>xml-commons-which-bootstrap</package> + <package>xmlcharent</package> + <package>xorg-x11</package> + <package>xorg-x11-devel</package> + <package>xorg-x11-fonts</package> + <package>xorg-x11-fonts-core</package> + <package>xorg-x11-fonts-devel</package> + <package>xorg-x11-libICE-devel</package> + <package>xorg-x11-libSM-devel</package> + <package>xorg-x11-libX11-devel</package> + <package>xorg-x11-libXau-devel</package> + <package>xorg-x11-libXdmcp-devel</package> + <package>xorg-x11-libXext-devel</package> + <package>xorg-x11-libXfixes-devel</package> + <package>xorg-x11-libXmu-devel</package> + <package>xorg-x11-libXp-devel</package> + <package>xorg-x11-libXpm-devel</package> + <package>xorg-x11-libXprintUtil-devel</package> + <package>xorg-x11-libXrender-devel</package> + <package>xorg-x11-libXt-devel</package> + <package>xorg-x11-libXv-devel</package> + <package>xorg-x11-libfontenc-devel</package> + <package>xorg-x11-libxcb-devel</package> + <package>xorg-x11-libxkbfile-devel</package> + <package>xorg-x11-proto-devel</package> + <package>xorg-x11-server</package> + <package>xorg-x11-util-devel</package> + <package>xorg-x11-xauth</package> + <package>xorg-x11-xtrans-devel</package> + <package>xosd</package> + <package>xosd-devel</package> + <package>xsp</package> + <package>xterm</package> + <package>xz-devel</package> + <package>yast2-core-devel</package> + <package>yast2-devtools</package> + <package>yast2-gtk</package> + <package>yast2-libyui-devel</package> + <package>yast2-ncurses-devel</package> + <package>yast2-qt</package> + <package>yast2-qt-devel</package> + <package>yast2-qt-pkg</package> + <package>yast2-storage-devel</package> + <package>yast2-ycp-ui-bindings-devel</package> + <package>yelp</package> + <package>yelp-lang</package> + <package>zenity</package> + <package>zenity-lang</package> + <package>zlib-devel</package> + <package>zsh</package> + <package>zvbi-devel</package> + </remove-packages> + + </software> + <user_defaults> + <expire></expire> + <group>100</group> + <groups>video,dialout</groups> + <home>/home</home> + <inactive>-1</inactive> + <shell>/bin/bash</shell> + <skel>/etc/skel</skel> + <umask>022</umask> + </user_defaults> + <users config:type="list"> + <user> + <encrypted config:type="boolean">true</encrypted> + <fullname>vagrant</fullname> + <gid>100</gid> + <home>/home/vagrant</home> + <password_settings> + <expire></expire> + <flag></flag> + <inact></inact> + <max>99999</max> + <min>0</min> + <warn>7</warn> + </password_settings> + <shell>/bin/bash</shell> + <uid>1000</uid> + <user_password>$2y$05$NA1Li9ZKJOLRW5mMTXm6/e5r8dltWS5RpDZpvHrI82aLE00V51tdi</user_password> + <username>vagrant</username> + </user> + <user> + <encrypted config:type="boolean">true</encrypted> + <fullname>Games account</fullname> + <gid>100</gid> + <home>/var/games</home> + <password_settings> + <expire></expire> + <flag></flag> + <inact></inact> + <max></max> + <min></min> + <warn></warn> + </password_settings> + <shell>/bin/bash</shell> + <uid>12</uid> + <user_password>*</user_password> + <username>games</username> + </user> + <user> + <encrypted config:type="boolean">true</encrypted> + <fullname>bin</fullname> + <gid>1</gid> + <home>/bin</home> + <password_settings> + <expire></expire> + <flag></flag> + <inact></inact> + <max></max> + <min></min> + <warn></warn> + </password_settings> + <shell>/bin/bash</shell> + <uid>1</uid> + <user_password>*</user_password> + <username>bin</username> + </user> + <user> + <encrypted config:type="boolean">true</encrypted> + <fullname>nobody</fullname> + <gid>65533</gid> + <home>/var/lib/nobody</home> + <password_settings> + <expire></expire> + <flag></flag> + <inact></inact> + <max></max> + <min></min> + <warn></warn> + </password_settings> + <shell>/bin/bash</shell> + <uid>65534</uid> + <user_password>*</user_password> + <username>nobody</username> + </user> + <user> + <encrypted config:type="boolean">true</encrypted> + <fullname>Printing daemon</fullname> + <gid>7</gid> + <home>/var/spool/lpd</home> + <password_settings> + <expire></expire> + <flag></flag> + <inact></inact> + <max></max> + <min></min> + <warn></warn> + </password_settings> + <shell>/bin/bash</shell> + <uid>4</uid> + <user_password>*</user_password> + <username>lp</username> + </user> + <user> + <encrypted config:type="boolean">true</encrypted> + <fullname>User for uuidd</fullname> + <gid>104</gid> + <home>/var/run/uuidd</home> + <password_settings> + <expire></expire> + <flag></flag> + <inact></inact> + <max>99999</max> + <min>0</min> + <warn>7</warn> + </password_settings> + <shell>/bin/false</shell> + <uid>102</uid> + <user_password>*</user_password> + <username>uuidd</username> + </user> + <user> + <encrypted config:type="boolean">true</encrypted> + <fullname>Postfix Daemon</fullname> + <gid>51</gid> + <home>/var/spool/postfix</home> + <password_settings> + <expire></expire> + <flag></flag> + <inact></inact> + <max>99999</max> + <min>0</min> + <warn>7</warn> + </password_settings> + <shell>/bin/false</shell> + <uid>51</uid> + <user_password>*</user_password> + <username>postfix</username> + </user> + <user> + <encrypted config:type="boolean">true</encrypted> + <fullname>Novell Customer Center User</fullname> + <gid>111</gid> + <home>/var/lib/YaST2/suse-ncc-fakehome</home> + <password_settings> + <expire></expire> + <flag></flag> + <inact></inact> + <max>99999</max> + <min>0</min> + <warn>7</warn> + </password_settings> + <shell>/bin/bash</shell> + <uid>106</uid> + <user_password>*</user_password> + <username>suse-ncc</username> + </user> + <user> + <encrypted config:type="boolean">true</encrypted> + <fullname>FTP account</fullname> + <gid>49</gid> + <home>/srv/ftp</home> + <password_settings> + <expire></expire> + <flag></flag> + <inact></inact> + <max></max> + <min></min> + <warn></warn> + </password_settings> + <shell>/bin/bash</shell> + <uid>40</uid> + <user_password>*</user_password> + <username>ftp</username> + </user> + <user> + <encrypted config:type="boolean">true</encrypted> + <fullname>Gnome Display Manager daemon</fullname> + <gid>112</gid> + <home>/var/lib/gdm</home> + <password_settings> + <expire></expire> + <flag></flag> + <inact></inact> + <max>99999</max> + <min>0</min> + <warn>7</warn> + </password_settings> + <shell>/bin/false</shell> + <uid>107</uid> + <user_password>*</user_password> + <username>gdm</username> + </user> + <user> + <encrypted config:type="boolean">true</encrypted> + <fullname>Batch jobs daemon</fullname> + <gid>25</gid> + <home>/var/spool/atjobs</home> + <password_settings> + <expire></expire> + <flag></flag> + <inact></inact> + <max>99999</max> + <min>0</min> + <warn>7</warn> + </password_settings> + <shell>/bin/bash</shell> + <uid>25</uid> + <user_password>*</user_password> + <username>at</username> + </user> + <user> + <encrypted config:type="boolean">true</encrypted> + <fullname>root</fullname> + <gid>0</gid> + <home>/root</home> + <password_settings> + <expire></expire> + <flag></flag> + <inact></inact> + <max></max> + <min></min> + <warn></warn> + </password_settings> + <shell>/bin/bash</shell> + <uid>0</uid> + <user_password>$2y$05$NA1Li9ZKJOLRW5mMTXm6/e5r8dltWS5RpDZpvHrI82aLE00V51tdi</user_password> + <username>root</username> + </user> + <user> + <encrypted config:type="boolean">true</encrypted> + <fullname>Mailer daemon</fullname> + <gid>12</gid> + <home>/var/spool/clientmqueue</home> + <password_settings> + <expire></expire> + <flag></flag> + <inact></inact> + <max></max> + <min></min> + <warn></warn> + </password_settings> + <shell>/bin/false</shell> + <uid>8</uid> + <user_password>*</user_password> + <username>mail</username> + </user> + <user> + <encrypted config:type="boolean">true</encrypted> + <fullname>Daemon</fullname> + <gid>2</gid> + <home>/sbin</home> + <password_settings> + <expire></expire> + <flag></flag> + <inact></inact> + <max></max> + <min></min> + <warn></warn> + </password_settings> + <shell>/bin/bash</shell> + <uid>2</uid> + <user_password>*</user_password> + <username>daemon</username> + </user> + <user> + <encrypted config:type="boolean">true</encrypted> + <fullname>NTP daemon</fullname> + <gid>108</gid> + <home>/var/lib/ntp</home> + <password_settings> + <expire></expire> + <flag></flag> + <inact></inact> + <max>99999</max> + <min>0</min> + <warn>7</warn> + </password_settings> + <shell>/bin/false</shell> + <uid>74</uid> + <user_password>*</user_password> + <username>ntp</username> + </user> + <user> + <encrypted config:type="boolean">true</encrypted> + <fullname>Unix-to-Unix CoPy system</fullname> + <gid>14</gid> + <home>/etc/uucp</home> + <password_settings> + <expire></expire> + <flag></flag> + <inact></inact> + <max></max> + <min></min> + <warn></warn> + </password_settings> + <shell>/bin/bash</shell> + <uid>10</uid> + <user_password>*</user_password> + <username>uucp</username> + </user> + <user> + <encrypted config:type="boolean">true</encrypted> + <fullname>User for D-Bus</fullname> + <gid>101</gid> + <home>/var/run/dbus</home> + <password_settings> + <expire></expire> + <flag></flag> + <inact></inact> + <max></max> + <min>0</min> + <warn>7</warn> + </password_settings> + <shell>/bin/false</shell> + <uid>100</uid> + <user_password>*</user_password> + <username>messagebus</username> + </user> + <user> + <encrypted config:type="boolean">true</encrypted> + <fullname>User for haldaemon</fullname> + <gid>102</gid> + <home>/var/run/hald</home> + <password_settings> + <expire></expire> + <flag></flag> + <inact></inact> + <max></max> + <min>0</min> + <warn>7</warn> + </password_settings> + <shell>/bin/false</shell> + <uid>101</uid> + <user_password>*</user_password> + <username>haldaemon</username> + </user> + <user> + <encrypted config:type="boolean">true</encrypted> + <fullname>WWW daemon apache</fullname> + <gid>8</gid> + <home>/var/lib/wwwrun</home> + <password_settings> + <expire></expire> + <flag></flag> + <inact></inact> + <max></max> + <min></min> + <warn></warn> + </password_settings> + <shell>/bin/false</shell> + <uid>30</uid> + <user_password>*</user_password> + <username>wwwrun</username> + </user> + <user> + <encrypted config:type="boolean">true</encrypted> + <fullname>Manual pages viewer</fullname> + <gid>62</gid> + <home>/var/cache/man</home> + <password_settings> + <expire></expire> + <flag></flag> + <inact></inact> + <max></max> + <min></min> + <warn></warn> + </password_settings> + <shell>/bin/bash</shell> + <uid>13</uid> + <user_password>*</user_password> + <username>man</username> + </user> + <user> + <encrypted config:type="boolean">true</encrypted> + <fullname>PolicyKit</fullname> + <gid>107</gid> + <home>/var/run/PolicyKit</home> + <password_settings> + <expire></expire> + <flag></flag> + <inact></inact> + <max>99999</max> + <min>0</min> + <warn>7</warn> + </password_settings> + <shell>/bin/false</shell> + <uid>104</uid> + <user_password>*</user_password> + <username>polkituser</username> + </user> + <user> + <encrypted config:type="boolean">true</encrypted> + <fullname>News system</fullname> + <gid>13</gid> + <home>/etc/news</home> + <password_settings> + <expire></expire> + <flag></flag> + <inact></inact> + <max></max> + <min></min> + <warn></warn> + </password_settings> + <shell>/bin/bash</shell> + <uid>9</uid> + <user_password>*</user_password> + <username>news</username> + </user> + <user> + <fullname>SSH daemon</fullname> + <gid>65</gid> + <home>/var/lib/sshd</home> + <shell>/bin/false</shell> + <uid>71</uid> + <username>sshd</username> + </user> + <user> + <encrypted config:type="boolean">true</encrypted> + <fullname>PulseAudio daemon</fullname> + <gid>109</gid> + <home>/var/lib/pulseaudio</home> + <password_settings> + <expire></expire> + <flag></flag> + <inact></inact> + <max>99999</max> + <min>0</min> + <warn>7</warn> + </password_settings> + <shell>/bin/false</shell> + <uid>105</uid> + <user_password>*</user_password> + <username>pulse</username> + </user> + </users> +</profile> diff --git a/definitions/sles-11-sp3-i386/cleanup.sh b/definitions/sles-11-sp3-i386/cleanup.sh new file mode 100644 index 000000000..6b6548a6d --- /dev/null +++ b/definitions/sles-11-sp3-i386/cleanup.sh @@ -0,0 +1,9 @@ +#!/bin/bash -eux + +# remove zypper locks on removed packages to avoid later dependency problems +zypper --non-interactive rl \* +# zypper --non-interactive remove `rpm -qa virtualbox-guest-*` >/dev/null 2>&1 +# Add an online copy of the SLES DVD1 as a software repository, instead of the mounted DVD +zypper removerepo 'SUSE-Linux-Enterprise-Server-11-SP3 11.3.3-1.138' +zypper addrepo 'http://demeter.uni-regensburg.de/SLES11SP3-x86/DVD1/' 'SLES11SP3-x86 DVD1 Online' +zypper refresh diff --git a/definitions/sles-11-sp3-i386/definition.rb b/definitions/sles-11-sp3-i386/definition.rb new file mode 100644 index 000000000..42d8f71a0 --- /dev/null +++ b/definitions/sles-11-sp3-i386/definition.rb @@ -0,0 +1,12 @@ +require File.dirname(__FILE__) + "/../.suse/session.rb" + +iso = "SLES-11-SP3-DVD-i586-GM-DVD1.iso" + +session = + SUSE_SESSION.merge( :memory_size=> '480', + :iso_download_instructions => "Download 60-day evaluation from http://download.novell.com/protected/Summary.jsp?buildid=4uiuDMzX0ck~", + :iso_file => iso, + :iso_md5 => "5c30a409fc8fb3343b4dc90d93ff2c89", + :iso_src => "") + +Veewee::Session.declare session diff --git a/definitions/sles-11-sp3-i386/minimize.sh b/definitions/sles-11-sp3-i386/minimize.sh new file mode 120000 index 000000000..b3632ccbc --- /dev/null +++ b/definitions/sles-11-sp3-i386/minimize.sh @@ -0,0 +1 @@ +../.common/minimize.sh \ No newline at end of file diff --git a/definitions/sles-11-sp3-i386/sshd.sh b/definitions/sles-11-sp3-i386/sshd.sh new file mode 120000 index 000000000..f353f2d00 --- /dev/null +++ b/definitions/sles-11-sp3-i386/sshd.sh @@ -0,0 +1 @@ +../.common/sshd.sh \ No newline at end of file diff --git a/definitions/sles-11-sp3-i386/sudoers.sh b/definitions/sles-11-sp3-i386/sudoers.sh new file mode 120000 index 000000000..18d9cf04d --- /dev/null +++ b/definitions/sles-11-sp3-i386/sudoers.sh @@ -0,0 +1 @@ +../.suse/sudoers.sh \ No newline at end of file diff --git a/definitions/sles-11-sp3-i386/vagrant.sh b/definitions/sles-11-sp3-i386/vagrant.sh new file mode 120000 index 000000000..702949639 --- /dev/null +++ b/definitions/sles-11-sp3-i386/vagrant.sh @@ -0,0 +1 @@ +../.common/vagrant.sh \ No newline at end of file diff --git a/definitions/sles-11-sp3/autoinst.xml b/definitions/sles-11-sp3/autoinst.xml new file mode 100644 index 000000000..9eca2bea0 --- /dev/null +++ b/definitions/sles-11-sp3/autoinst.xml @@ -0,0 +1,2569 @@ +<?xml version="1.0"?> +<!DOCTYPE profile> +<profile xmlns="http://www.suse.com/1.0/yast2ns" xmlns:config="http://www.suse.com/1.0/configns"> + <add-on> + <add_on_products config:type="list"> + <listentry> + <media_url><![CDATA[http://demeter.uni-regensburg.de/SLE11SP3-SDK-x64/DVD1/]]></media_url> + <product>sle-sdk</product> + <product_dir>/</product_dir> + </listentry> + </add_on_products> + </add-on> + <bootloader> + <device_map config:type="list"> + <device_map_entry> + <firmware>hd0</firmware> + <linux>/dev/sda</linux> + </device_map_entry> + </device_map> + <global> + <activate>true</activate> + <boot_root>true</boot_root> + <default>SUSE Linux Enterprise Server 11 SP3 - 3.0.76-0.11</default> + <generic_mbr>true</generic_mbr> + <gfxmenu>/boot/message</gfxmenu> + <lines_cache_id>2</lines_cache_id> + <timeout config:type="integer">8</timeout> + </global> + <initrd_modules config:type="list"> + <initrd_module> + <module>ahci</module> + </initrd_module> + <initrd_module> + <module>ata_piix</module> + </initrd_module> + <initrd_module> + <module>ata_generic</module> + </initrd_module> + <initrd_module> + <module>jbd</module> + </initrd_module> + <initrd_module> + <module>mbcache</module> + </initrd_module> + <initrd_module> + <module>ext3</module> + </initrd_module> + </initrd_modules> + <loader_type>grub</loader_type> + <sections config:type="list"> + <section> + <append>resume=/dev/sda1 splash=silent crashkernel=128M-:64M showopts</append> + <image>(hd0,1)/boot/vmlinuz-3.0.76-0.11-default</image> + <initial>1</initial> + <initrd>(hd0,1)/boot/initrd-3.0.76-0.11-default</initrd> + <lines_cache_id>0</lines_cache_id> + <name>SUSE Linux Enterprise Server 11 SP3 - 3.0.76-0.11</name> + <original_name>linux</original_name> + <root>/dev/sda2</root> + <type>image</type> + <vgamode>0x314</vgamode> + </section> + <section> + <append>showopts ide=nodma apm=off noresume edd=off powersaved=off nohz=off highres=off processor.max_cstate=1 nomodeset x11failsafe</append> + <image>(hd0,1)/boot/vmlinuz-3.0.76-0.11-default</image> + <initrd>(hd0,1)/boot/initrd-3.0.76-0.11-default</initrd> + <lines_cache_id>1</lines_cache_id> + <name>Failsafe -- SUSE Linux Enterprise Server 11 SP3 - 3.0.76-0.11</name> + <original_name>failsafe</original_name> + <root>/dev/sda2</root> + <type>image</type> + <vgamode>0x314</vgamode> + </section> + </sections> + </bootloader> + <ca_mgm> + <CAName>YaST_Default_CA</CAName> + <ca_commonName>YaST Default CA (vagrant-sles-11sp3-x64)</ca_commonName> + <country>US</country> + <locality></locality> + <organisation></organisation> + <organisationUnit></organisationUnit> + <password>ENTER PASSWORD HERE</password> + <server_commonName>vagrant-sles-11sp3-x64.vagrantup.com</server_commonName> + <server_email>postmaster@vagrantup.com</server_email> + <state></state> + <takeLocalServerName config:type="boolean">false</takeLocalServerName> + </ca_mgm> + <deploy_image> + <image_installation config:type="boolean">false</image_installation> + </deploy_image> + <general> + <ask-list config:type="list"/> + <mode> + <confirm config:type="boolean">false</confirm> + </mode> + <mouse> + <id>none</id> + </mouse> + <proposals config:type="list"/> + <signature-handling> + <accept_file_without_checksum config:type="boolean">true</accept_file_without_checksum> + <accept_non_trusted_gpg_key config:type="boolean">true</accept_non_trusted_gpg_key> + <accept_unknown_gpg_key config:type="boolean">true</accept_unknown_gpg_key> + <accept_unsigned_file config:type="boolean">true</accept_unsigned_file> + <accept_verification_failed config:type="boolean">false</accept_verification_failed> + <import_gpg_key config:type="boolean">true</import_gpg_key> + </signature-handling> + <storage/> + </general> + <groups config:type="list"> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>100</gid> + <group_password>x</group_password> + <groupname>users</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>19</gid> + <group_password>x</group_password> + <groupname>floppy</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>1</gid> + <group_password>x</group_password> + <groupname>bin</groupname> + <userlist>daemon</userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>41</gid> + <group_password>x</group_password> + <groupname>xok</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>65533</gid> + <group_password>x</group_password> + <groupname>nobody</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>43</gid> + <group_password>x</group_password> + <groupname>modem</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>5</gid> + <group_password>x</group_password> + <groupname>tty</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>7</gid> + <group_password>x</group_password> + <groupname>lp</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>104</gid> + <group_password>!</group_password> + <groupname>uuidd</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>51</gid> + <group_password>!</group_password> + <groupname>postfix</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>112</gid> + <group_password>!</group_password> + <groupname>gdm</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>65534</gid> + <group_password>x</group_password> + <groupname>nogroup</groupname> + <userlist>nobody</userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>101</gid> + <group_password>!</group_password> + <groupname>messagebus</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>59</gid> + <group_password>!</group_password> + <groupname>maildrop</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>33</gid> + <group_password>x</group_password> + <groupname>video</groupname> + <userlist>vagrant</userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>3</gid> + <group_password>x</group_password> + <groupname>sys</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>15</gid> + <group_password>x</group_password> + <groupname>shadow</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>20</gid> + <group_password>x</group_password> + <groupname>cdrom</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>21</gid> + <group_password>x</group_password> + <groupname>console</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>42</gid> + <group_password>x</group_password> + <groupname>trusted</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>102</gid> + <group_password>!</group_password> + <groupname>haldaemon</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>106</gid> + <group_password>!</group_password> + <groupname>puppet</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>16</gid> + <group_password>x</group_password> + <groupname>dialout</groupname> + <userlist>vagrant</userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>107</gid> + <group_password>!</group_password> + <groupname>polkituser</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>10</gid> + <group_password>x</group_password> + <groupname>wheel</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>109</gid> + <group_password>!</group_password> + <groupname>pulse</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>8</gid> + <group_password>x</group_password> + <groupname>www</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>40</gid> + <group_password>x</group_password> + <groupname>games</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>6</gid> + <group_password>x</group_password> + <groupname>disk</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>17</gid> + <group_password>x</group_password> + <groupname>audio</groupname> + <userlist>pulse</userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>111</gid> + <group_password>!</group_password> + <groupname>suse-ncc</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>49</gid> + <group_password>x</group_password> + <groupname>ftp</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>103</gid> + <group_password>!</group_password> + <groupname>tape</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>25</gid> + <group_password>!</group_password> + <groupname>at</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>9</gid> + <group_password>x</group_password> + <groupname>kmem</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>32</gid> + <group_password>x</group_password> + <groupname>public</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>12</gid> + <group_password>x</group_password> + <groupname>mail</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>0</gid> + <group_password>x</group_password> + <groupname>root</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>2</gid> + <group_password>x</group_password> + <groupname>daemon</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>105</gid> + <group_password>!</group_password> + <groupname>sfcb</groupname> + <userlist>root</userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>108</gid> + <group_password>!</group_password> + <groupname>ntp</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>14</gid> + <group_password>x</group_password> + <groupname>uucp</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>110</gid> + <group_password>!</group_password> + <groupname>pulse-access</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>71</gid> + <group_password>!</group_password> + <groupname>ntadmin</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>62</gid> + <group_password>x</group_password> + <groupname>man</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>22</gid> + <group_password>x</group_password> + <groupname>utmp</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>13</gid> + <group_password>x</group_password> + <groupname>news</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>65</gid> + <group_password>!</group_password> + <groupname>sshd</groupname> + <userlist></userlist> + </group> + </groups> + <host> + <hosts config:type="list"> + <hosts_entry> + <host_address>127.0.0.1</host_address> + <names config:type="list"> + <name>localhost</name> + </names> + </hosts_entry> + <hosts_entry> + <host_address>::1</host_address> + <names config:type="list"> + <name>localhost ipv6-localhost ipv6-loopback</name> + </names> + </hosts_entry> + <hosts_entry> + <host_address>fe00::0</host_address> + <names config:type="list"> + <name>ipv6-localnet</name> + </names> + </hosts_entry> + <hosts_entry> + <host_address>ff00::0</host_address> + <names config:type="list"> + <name>ipv6-mcastprefix</name> + </names> + </hosts_entry> + <hosts_entry> + <host_address>ff02::1</host_address> + <names config:type="list"> + <name>ipv6-allnodes</name> + </names> + </hosts_entry> + <hosts_entry> + <host_address>ff02::2</host_address> + <names config:type="list"> + <name>ipv6-allrouters</name> + </names> + </hosts_entry> + <hosts_entry> + <host_address>ff02::3</host_address> + <names config:type="list"> + <name>ipv6-allhosts</name> + </names> + </hosts_entry> + </hosts> + </host> + <login_settings/> + <networking> + <dhcp_options> + <dhclient_client_id></dhclient_client_id> + <dhclient_hostname_option>AUTO</dhclient_hostname_option> + </dhcp_options> + <dns> + <dhcp_hostname config:type="boolean">false</dhcp_hostname> + <domain>vagrantup.com</domain> + <hostname>vagrant-sles-11sp3-x64</hostname> + <resolv_conf_policy>auto</resolv_conf_policy> + <searchlist config:type="list"> + <search>vagrantup.com</search> + </searchlist> + <write_hostname config:type="boolean">true</write_hostname> + </dns> + <interfaces config:type="list"> + <interface> + <bootproto>dhcp</bootproto> + <device>eth0</device> + <name>82540EM Gigabit Ethernet Controller</name> + <startmode>auto</startmode> + <usercontrol>no</usercontrol> + </interface> + </interfaces> + <managed config:type="boolean">false</managed> + <net-udev config:type="list"> + <rule> + <name>eth0</name> + <rule>KERNELS</rule> + <value>0000:00:03.0</value> + </rule> + </net-udev> + <routing> + <ip_forward config:type="boolean">false</ip_forward> + </routing> + </networking> + <partitioning config:type="list"> + <drive> + <device>/dev/sda</device> + <initialize config:type="boolean">true</initialize> + <partitions config:type="list"> + <partition> + <create config:type="boolean">true</create> + <crypt_fs config:type="boolean">false</crypt_fs> + <filesystem config:type="symbol">swap</filesystem> + <format config:type="boolean">true</format> + <fstopt>defaults</fstopt> + <loop_fs config:type="boolean">false</loop_fs> + <mount>swap</mount> + <mountby config:type="symbol">device</mountby> + <partition_id config:type="integer">130</partition_id> + <partition_nr config:type="integer">1</partition_nr> + <raid_options/> + <resize config:type="boolean">false</resize> + <size>1561492992</size> + </partition> + <partition> + <create config:type="boolean">true</create> + <crypt_fs config:type="boolean">false</crypt_fs> + <filesystem config:type="symbol">ext3</filesystem> + <format config:type="boolean">true</format> + <fstopt>acl,user_xattr</fstopt> + <loop_fs config:type="boolean">false</loop_fs> + <mount>/</mount> + <mountby config:type="symbol">device</mountby> + <partition_id config:type="integer">131</partition_id> + <partition_nr config:type="integer">2</partition_nr> + <raid_options/> + <resize config:type="boolean">false</resize> + <size>19895844352</size> + </partition> + </partitions> + <pesize></pesize> + <type config:type="symbol">CT_DISK</type> + <use>all</use> + </drive> + </partitioning> + <report> + <errors> + <log config:type="boolean">true</log> + <show config:type="boolean">true</show> + <timeout config:type="integer">0</timeout> + </errors> + <messages> + <log config:type="boolean">true</log> + <show config:type="boolean">true</show> + <timeout config:type="integer">0</timeout> + </messages> + <warnings> + <log config:type="boolean">true</log> + <show config:type="boolean">true</show> + <timeout config:type="integer">0</timeout> + </warnings> + <yesno_messages> + <log config:type="boolean">true</log> + <show config:type="boolean">true</show> + <timeout config:type="integer">0</timeout> + </yesno_messages> + </report> + <software> + + <packages config:type="list"> + <package>desktop-translations</package> + <package>gconf2-branding-SLES</package> + <package>libproxy0-config-gnome</package> + <package>sle-sdk-release</package> + <package>sle-sdk-release-SDK</package> + <package>sles-manuals_en</package> + <package>yast2-trans-en_US</package> + </packages> + <patterns config:type="list"> + <pattern>Basis-Devel</pattern> + <pattern>Minimal</pattern> + <pattern>apparmor</pattern> + <pattern>base</pattern> + <pattern>sdk_kernel</pattern> + </patterns> + <remove-packages config:type="list"> + <package>3ddiag</package> + <package>CASA</package> + <package>CASA-devel</package> + <package>CASA_auth_token_client</package> + <package>CASA_auth_token_client-devel</package> + <package>ConsoleKit-devel</package> + <package>ConsoleKit-x11</package> + <package>DirectFB-devel</package> + <package>FastCGI</package> + <package>IlmBase</package> + <package>IlmBase-devel</package> + <package>ImageMagick</package> + <package>ImageMagick-devel</package> + <package>LibVNCServer</package> + <package>LibVNCServer-devel</package> + <package>Mesa</package> + <package>Mesa-devel</package> + <package>ModemManager</package> + <package>Modules</package> + <package>NetworkManager</package> + <package>NetworkManager-devel</package> + <package>NetworkManager-glib</package> + <package>NetworkManager-gnome</package> + <package>NetworkManager-kde4</package> + <package>NetworkManager-kde4-lang</package> + <package>NetworkManager-kde4-libs</package> + <package>OpenEXR</package> + <package>OpenEXR-devel</package> + <package>OpenIPMI-devel</package> + <package>PackageKit</package> + <package>PackageKit-devel</package> + <package>PackageKit-lang</package> + <package>PolicyKit-devel</package> + <package>PolicyKit-gnome</package> + <package>PolicyKit-gnome-devel</package> + <package>PolicyKit-gnome-libs</package> + <package>SDL-devel</package> + <package>SDL_net</package> + <package>SDL_net-devel</package> + <package>TeX-Guy</package> + <package>TeX-Guy-devel</package> + <package>VFlib3</package> + <package>VFlib3-devel</package> + <package>WindowMaker</package> + <package>WindowMaker-devel</package> + <package>a2ps</package> + <package>aalib</package> + <package>aalib-devel</package> + <package>akonadi-runtime</package> + <package>akregator</package> + <package>alsa-devel</package> + <package>alsa-firmware</package> + <package>alsa-plugins-pulse</package> + <package>alsa-tools</package> + <package>alsa-tools-devel</package> + <package>anthy</package> + <package>anthy-devel</package> + <package>antlr</package> + <package>apache2</package> + <package>apache2-devel</package> + <package>apache2-mod_perl</package> + <package>apache2-mod_perl-devel</package> + <package>apache2-prefork</package> + <package>apache2-utils</package> + <package>apache2-worker</package> + <package>apparmor-profile-editor</package> + <package>art-sharp2</package> + <package>arts</package> + <package>arts-devel</package> + <package>aspell-devel</package> + <package>at-spi</package> + <package>at-spi-devel</package> + <package>at-spi-lang</package> + <package>atk-devel</package> + <package>audiofile</package> + <package>audiofile-devel</package> + <package>audit-devel</package> + <package>augeas-lenses</package> + <package>automoc4</package> + <package>avahi</package> + <package>avahi-compat-howl-devel</package> + <package>avahi-compat-mDNSResponder-devel</package> + <package>avahi-lang</package> + <package>babl-0_0</package> + <package>banshee-1</package> + <package>banshee-1-backend-engine-gstreamer</package> + <package>banshee-1-backend-platform-gnome</package> + <package>banshee-1-backend-platform-unix</package> + <package>banshee-1-devel</package> + <package>banshee-1-extensions-default</package> + <package>banshee-1-lang</package> + <package>beagle-devel</package> + <package>bind-devel</package> + <package>binutils-devel</package> + <package>bluez</package> + <package>bluez-devel</package> + <package>boo</package> + <package>boo-devel</package> + <package>boost-devel</package> + <package>bootsplash-branding-SLED</package> + <package>cairo-devel</package> + <package>cairomm</package> + <package>cairomm-devel</package> + <package>canna</package> + <package>canna-devel</package> + <package>canna-libs</package> + <package>cannadic</package> + <package>capi4linux</package> + <package>capi4linux-devel</package> + <package>cdk</package> + <package>cdk-devel</package> + <package>cdrdao</package> + <package>chasen</package> + <package>chasen-devel</package> + <package>check</package> + <package>check-devel</package> + <package>chmlib</package> + <package>chmlib-devel</package> + <package>cim-schema</package> + <package>clucene-core</package> + <package>clucene-core-devel</package> + <package>cmake</package> + <package>compiz</package> + <package>compiz-branding-SLE</package> + <package>compiz-devel</package> + <package>compiz-gnome</package> + <package>coolkey-devel</package> + <package>cracklib-devel</package> + <package>crash-devel</package> + <package>crimson</package> + <package>cscope</package> + <package>cups</package> + <package>cups-devel</package> + <package>cvsps</package> + <package>cyrus-imapd-devel</package> + <package>cyrus-sasl-crammd5</package> + <package>cyrus-sasl-devel</package> + <package>dante</package> + <package>dante-devel</package> + <package>db1</package> + <package>db1-devel</package> + <package>db43</package> + <package>db43-devel</package> + <package>dbus-1-devel</package> + <package>dbus-1-glib-devel</package> + <package>dbus-1-python-devel</package> + <package>dbus-1-qt3</package> + <package>dbus-1-qt3-devel</package> + <package>dbus-1-x11</package> + <package>dejagnu</package> + <package>dejavu</package> + <package>desktop-data-openSUSE</package> + <package>desktop-file-utils</package> + <package>devhelp</package> + <package>devhelp-devel</package> + <package>devhelp-lang</package> + <package>device-mapper-devel</package> + <package>dhcp</package> + <package>dhcp-client</package> + <package>dhcp-devel</package> + <package>diffstat</package> + <package>dmapi-devel</package> + <package>dnsmasq</package> + <package>docbook-xsl-stylesheets</package> + <package>docbook_4</package> + <package>doxygen</package> + <package>dvd+rw-tools</package> + <package>e2fsprogs-devel</package> + <package>emacs</package> + <package>emacs-nox</package> + <package>emacs-x11</package> + <package>enchant</package> + <package>enchant-devel</package> + <package>enscript</package> + <package>eog</package> + <package>eog-devel</package> + <package>eog-lang</package> + <package>espeak</package> + <package>evince</package> + <package>evince-devel</package> + <package>evince-lang</package> + <package>evoldap2-devel</package> + <package>evolution</package> + <package>evolution-data-server</package> + <package>evolution-data-server-devel</package> + <package>evolution-data-server-lang</package> + <package>evolution-devel</package> + <package>evolution-lang</package> + <package>expect-devel</package> + <package>facter</package> + <package>fam</package> + <package>fam-devel</package> + <package>farsight</package> + <package>farsight-devel</package> + <package>festival</package> + <package>festival-devel</package> + <package>fftw</package> + <package>fftw-devel</package> + <package>fftw-mpi</package> + <package>fftw-mpi-devel</package> + <package>fftw-threads</package> + <package>fftw-threads-devel</package> + <package>fftw3</package> + <package>fftw3-devel</package> + <package>fftw3-threads</package> + <package>fftw3-threads-devel</package> + <package>file-devel</package> + <package>fileshareset</package> + <package>finch</package> + <package>finch-devel</package> + <package>flac-devel</package> + <package>fltk</package> + <package>fltk-devel</package> + <package>fontconfig-devel</package> + <package>fonts-config</package> + <package>foomatic-filters</package> + <package>freeglut</package> + <package>freeglut-devel</package> + <package>freeradius-client-devel</package> + <package>freeradius-client-libs</package> + <package>freeradius-server-devel</package> + <package>freeradius-server-libs</package> + <package>freetype</package> + <package>freetype2-devel</package> + <package>fribidi</package> + <package>fribidi-devel</package> + <package>ft2demos</package> + <package>fuse-devel</package> + <package>fwnn-devel</package> + <package>fxload</package> + <package>gcc-gij</package> + <package>gcc-java</package> + <package>gcc43-gij</package> + <package>gcc43-java</package> + <package>gconf-sharp2</package> + <package>gconf2-devel</package> + <package>gconfmm</package> + <package>gconfmm-devel</package> + <package>gd</package> + <package>gd-devel</package> + <package>gdbm-32bit</package> + <package>gdk-pixbuf</package> + <package>gdk-pixbuf-devel</package> + <package>gegl-0_0</package> + <package>gettext-tools</package> + <package>gfxboot-branding-SLED</package> + <package>gfxboot-devel</package> + <package>ggz</package> + <package>ggz-client-libs</package> + <package>ggz-client-libs-devel</package> + <package>ggz-client-libs-lang</package> + <package>ghex</package> + <package>ghex-devel</package> + <package>ghex-lang</package> + <package>ghostscript-devel</package> + <package>ghostscript-fonts-other</package> + <package>ghostscript-fonts-std</package> + <package>ghostscript-ijs-devel</package> + <package>ghostscript-library</package> + <package>ghostscript-omni</package> + <package>ghostscript-x11</package> + <package>giflib-devel</package> + <package>gimp</package> + <package>gimp-branding-SLED</package> + <package>gimp-devel</package> + <package>gimp-lang</package> + <package>gimp-plugins-python</package> + <package>git</package> + <package>git-arch</package> + <package>git-core</package> + <package>git-cvs</package> + <package>git-daemon</package> + <package>git-email</package> + <package>git-gui</package> + <package>git-svn</package> + <package>git-web</package> + <package>gitk</package> + <package>gjdoc</package> + <package>glade-sharp2</package> + <package>glade3</package> + <package>glade3-lang</package> + <package>glib</package> + <package>glib-devel</package> + <package>glib-sharp2</package> + <package>glib2-devel</package> + <package>glibmm2</package> + <package>glibmm2-devel</package> + <package>glitz</package> + <package>glitz-devel</package> + <package>gltt</package> + <package>gltt-devel</package> + <package>gmime-2_4-devel</package> + <package>gmime-devel</package> + <package>gmp-devel</package> + <package>gnet</package> + <package>gnet-devel</package> + <package>gnokii</package> + <package>gnokii-devel</package> + <package>gnokii-smsd</package> + <package>gnome-certauth-devel</package> + <package>gnome-control-center</package> + <package>gnome-control-center-devel</package> + <package>gnome-control-center-lang</package> + <package>gnome-desktop</package> + <package>gnome-desktop-devel</package> + <package>gnome-desktop-lang</package> + <package>gnome-doc-utils</package> + <package>gnome-doc-utils-devel</package> + <package>gnome-doc-utils-lang</package> + <package>gnome-keyring-devel</package> + <package>gnome-keyring-sharp</package> + <package>gnome-keyring-sharp-devel</package> + <package>gnome-libs</package> + <package>gnome-libs-devel</package> + <package>gnome-mag</package> + <package>gnome-mag-devel</package> + <package>gnome-mag-lang</package> + <package>gnome-main-menu</package> + <package>gnome-main-menu-lang</package> + <package>gnome-media</package> + <package>gnome-media-devel</package> + <package>gnome-media-lang</package> + <package>gnome-menus</package> + <package>gnome-menus-branding-SLED</package> + <package>gnome-menus-devel</package> + <package>gnome-menus-lang</package> + <package>gnome-mount</package> + <package>gnome-mount-lang</package> + <package>gnome-panel</package> + <package>gnome-panel-devel</package> + <package>gnome-panel-lang</package> + <package>gnome-pilot</package> + <package>gnome-pilot-devel</package> + <package>gnome-pilot-lang</package> + <package>gnome-settings-daemon</package> + <package>gnome-settings-daemon-devel</package> + <package>gnome-settings-daemon-lang</package> + <package>gnome-sharp2</package> + <package>gnome-speech</package> + <package>gnome-speech-devel</package> + <package>gnome-themes</package> + <package>gnome-utils</package> + <package>gnome-utils-devel</package> + <package>gnome-utils-lang</package> + <package>gnome-vfs-sharp2</package> + <package>gnome-vfs2</package> + <package>gnome-vfs2-devel</package> + <package>gnome-vfs2-lang</package> + <package>gnome-vfsmm</package> + <package>gnome-vfsmm-devel</package> + <package>gnopernicus</package> + <package>gnopernicus-devel</package> + <package>gnopernicus-lang</package> + <package>gnutls</package> + <package>goffice</package> + <package>goffice-devel</package> + <package>goffice-lang</package> + <package>goocanvas</package> + <package>goocanvas-devel</package> + <package>goocanvas-lang</package> + <package>goom2k4</package> + <package>goom2k4-devel</package> + <package>graphviz</package> + <package>graphviz-devel</package> + <package>graphviz-gd</package> + <package>graphviz-gnome</package> + <package>gstreamer-0_10</package> + <package>gstreamer-0_10-devel</package> + <package>gstreamer-0_10-lang</package> + <package>gstreamer-0_10-plugins-base</package> + <package>gstreamer-0_10-plugins-base-devel</package> + <package>gstreamer-0_10-plugins-base-lang</package> + <package>gstreamer-0_10-plugins-good</package> + <package>gstreamer-0_10-plugins-good-lang</package> + <package>gstreamer-0_10-utils</package> + <package>gstreamer-utils</package> + <package>gtk</package> + <package>gtk-devel</package> + <package>gtk-lang</package> + <package>gtk-sharp2</package> + <package>gtk-vnc-devel</package> + <package>gtk2-devel</package> + <package>gtkglext</package> + <package>gtkglext-devel</package> + <package>gtkhtml2</package> + <package>gtkhtml2-devel</package> + <package>gtkhtml2-lang</package> + <package>gtkhtml314-sharp</package> + <package>gtkmm2</package> + <package>gtkmm2-devel</package> + <package>gtksourceview-devel</package> + <package>gtksourceview-lang</package> + <package>gtksourceview18</package> + <package>gtksourceview18-devel</package> + <package>gtkspell</package> + <package>gtkspell-devel</package> + <package>gtkspell-lang</package> + <package>gucharmap</package> + <package>gucharmap-devel</package> + <package>gucharmap-lang</package> + <package>guile</package> + <package>guile-devel</package> + <package>gutenprint</package> + <package>gutenprint-devel</package> + <package>gvfs-devel</package> + <package>gxmhtml</package> + <package>hal-devel</package> + <package>hal-palm</package> + <package>htdig</package> + <package>htdig-devel</package> + <package>hunspell</package> + <package>hunspell-devel</package> + <package>hunspell-tools</package> + <package>hwinfo-devel</package> + <package>i4l-base</package> + <package>icewm</package> + <package>icewm-lite</package> + <package>id3lib</package> + <package>id3lib-devel</package> + <package>imap-devel</package> + <package>imap-lib</package> + <package>imlib</package> + <package>imlib-devel</package> + <package>imlib2</package> + <package>imlib2-devel</package> + <package>indent</package> + <package>info2html</package> + <package>inn</package> + <package>inn-devel</package> + <package>intltool</package> + <package>ipadic</package> + <package>iptables-devel</package> + <package>iso-codes</package> + <package>iso-codes-devel</package> + <package>iso_ent</package> + <package>ispell</package> + <package>ispell-american</package> + <package>ispell-brazilian</package> + <package>ispell-british</package> + <package>ispell-czech</package> + <package>ispell-danish</package> + <package>ispell-finnish</package> + <package>ispell-french</package> + <package>ispell-german</package> + <package>ispell-hungarian</package> + <package>ispell-italian</package> + <package>ispell-ngerman</package> + <package>ispell-norsk</package> + <package>ispell-polish</package> + <package>ispell-portuguese</package> + <package>ispell-russian</package> + <package>ispell-slovak</package> + <package>ispell-spanish</package> + <package>ispell-swedish</package> + <package>itcl-devel</package> + <package>java-1_4_2-ibm</package> + <package>java-1_4_2-ibm-devel</package> + <package>java-1_5_0-gcj-compat</package> + <package>java-1_5_0-gcj-compat-devel</package> + <package>java-1_6_0-ibm</package> + <package>java-1_6_0-ibm-devel</package> + <package>joe</package> + <package>jpackage-utils</package> + <package>k3b</package> + <package>k3b-devel</package> + <package>k3b-lang</package> + <package>kaddressbook</package> + <package>kalarm</package> + <package>kde-susetranslations</package> + <package>kde4-filesystem</package> + <package>kde4-kgreeter-plugins</package> + <package>kdebase3</package> + <package>kdebase3-devel</package> + <package>kdebase3-runtime</package> + <package>kdebase4-SLED</package> + <package>kdebase4-SLED-lang</package> + <package>kdebase4-runtime</package> + <package>kdebase4-runtime-branding-SLED</package> + <package>kdebase4-workspace</package> + <package>kdebase4-workspace-branding-SLED</package> + <package>kdebase4-workspace-devel</package> + <package>kdebase4-workspace-ksysguardd</package> + <package>kdelibs3</package> + <package>kdelibs3-arts</package> + <package>kdelibs3-default-style</package> + <package>kdelibs3-devel</package> + <package>kdelibs3-doc</package> + <package>kdelibs4</package> + <package>kdelibs4-branding-SLED</package> + <package>kdelibs4-core</package> + <package>kdelibs4-doc</package> + <package>kdemultimedia3-arts</package> + <package>kdepim3</package> + <package>kdepim4</package> + <package>kdepim4-devel</package> + <package>kdepimlibs4</package> + <package>kdialog</package> + <package>kdm</package> + <package>kdm-branding-SLED</package> + <package>kernel-docs</package> + <package>kernel-syms</package> + <package>kernel-trace-devel</package> + <package>kernel-xen-devel</package> + <package>keyutils-devel</package> + <package>kio_sysinfo</package> + <package>kio_sysinfo-branding-SLED</package> + <package>kmail</package> + <package>knode</package> + <package>kontact</package> + <package>korganizer</package> + <package>kpilot</package> + <package>krb5-devel</package> + <package>ksh-devel</package> + <package>ktorrent</package> + <package>ktorrent-devel</package> + <package>ktorrent-lang</package> + <package>kwin</package> + <package>ladspa-devel</package> + <package>lib3ds-1-3</package> + <package>lib3ds-devel</package> + <package>libFLAC++6</package> + <package>libFLAC8</package> + <package>libHX-devel</package> + <package>libMagick++-devel</package> + <package>libMagick++1</package> + <package>libMagickWand1</package> + <package>libQtWebKit-devel</package> + <package>libQtWebKit4</package> + <package>libXerces-c-devel</package> + <package>libXerces-c28</package> + <package>libXiterm</package> + <package>libXiterm-devel</package> + <package>libacl-devel</package> + <package>libadns-devel</package> + <package>libadns1</package> + <package>libakode</package> + <package>libakode-devel</package> + <package>libakonadi4</package> + <package>libakonadiprotocolinternals-devel</package> + <package>libakonadiprotocolinternals1</package> + <package>libao</package> + <package>libao-devel</package> + <package>libapparmor-devel</package> + <package>libapr-util1</package> + <package>libapr-util1-devel</package> + <package>libapr1</package> + <package>libapr1-devel</package> + <package>libarchive-devel</package> + <package>libart_lgpl</package> + <package>libart_lgpl-devel</package> + <package>libassuan-devel</package> + <package>libatomic-ops-devel</package> + <package>libattr-devel</package> + <package>libavahi-core5</package> + <package>libavahi-devel</package> + <package>libavahi-glib-devel</package> + <package>libavahi-gobject-devel</package> + <package>libavahi-gobject0</package> + <package>libavahi-ui0</package> + <package>libavc1394-0</package> + <package>libavc1394-devel</package> + <package>libbabl-0_0-0</package> + <package>libbeagle-devel</package> + <package>libbeagle-python</package> + <package>libbeagle1</package> + <package>libbitmask-devel</package> + <package>libbitmask1</package> + <package>libblkid-devel</package> + <package>libblocxx-devel</package> + <package>libbonobo</package> + <package>libbonobo-devel</package> + <package>libbonobo-lang</package> + <package>libbonoboui</package> + <package>libbonoboui-devel</package> + <package>libbonoboui-lang</package> + <package>libboost_date_time1_36_0</package> + <package>libboost_filesystem1_36_0</package> + <package>libboost_graph1_36_0</package> + <package>libboost_iostreams1_36_0</package> + <package>libboost_math1_36_0</package> + <package>libboost_mpi1_36_0</package> + <package>libboost_program_options1_36_0</package> + <package>libboost_python1_36_0</package> + <package>libboost_serialization1_36_0</package> + <package>libboost_signals1_36_0</package> + <package>libboost_system1_36_0</package> + <package>libboost_test1_36_0</package> + <package>libboost_thread1_36_0</package> + <package>libboost_wave1_36_0</package> + <package>libbotan-1_6_4</package> + <package>libbotan-devel</package> + <package>libbtctl</package> + <package>libbtctl-devel</package> + <package>libbtctl-lang</package> + <package>libbtctl4</package> + <package>libbz2-devel</package> + <package>libcaca</package> + <package>libcaca-devel</package> + <package>libcanberra-gtk</package> + <package>libcanberra-gtk0</package> + <package>libcanberra0</package> + <package>libcap-devel</package> + <package>libcap-ng0</package> + <package>libcdda_interface0</package> + <package>libcdda_paranoia0</package> + <package>libcddb-devel</package> + <package>libcddb2</package> + <package>libcdio++0</package> + <package>libcdio-devel</package> + <package>libcgroup-devel</package> + <package>libcgroup1</package> + <package>libchewing</package> + <package>libchewing-devel</package> + <package>libcmpiutil</package> + <package>libcmpiutil-devel</package> + <package>libcolorblind0</package> + <package>libcom_err-devel</package> + <package>libcompizconfig</package> + <package>libcompizconfig-devel</package> + <package>libcppunit-1_12-0</package> + <package>libcppunit-devel</package> + <package>libcpuset-devel</package> + <package>libcpuset1</package> + <package>libcroco</package> + <package>libcroco-0_6-3</package> + <package>libcroco-devel</package> + <package>libcryptsetup-devel</package> + <package>libcsync-devel</package> + <package>libcsync0</package> + <package>libcurl-devel</package> + <package>libdaemon-devel</package> + <package>libdaemon0</package> + <package>libdatrie-devel</package> + <package>libdatrie0</package> + <package>libdb-4_5-32bit</package> + <package>libdb-4_5-devel</package> + <package>libdbus-1-qt3-0</package> + <package>libdbus-1-qt3-0-devel</package> + <package>libdc1394-22</package> + <package>libdc1394-devel</package> + <package>libdc1394_control12</package> + <package>libdc1394_control12-devel</package> + <package>libdhcp6client-1_0-2</package> + <package>libdhcp6client-devel</package> + <package>libdigikam-devel</package> + <package>libdiscid1</package> + <package>libdjvulibre-devel</package> + <package>libdjvulibre21</package> + <package>libdmxview-devel</package> + <package>libdmxview0</package> + <package>libdnet-devel</package> + <package>libdnet1</package> + <package>libdns_sd</package> + <package>libdrm</package> + <package>libdrm-devel</package> + <package>libdv-devel</package> + <package>libdv4</package> + <package>libdvdread4</package> + <package>libdw-devel</package> + <package>libebl-devel</package> + <package>libedit-devel</package> + <package>libedit0</package> + <package>libelf-devel</package> + <package>libenchant1</package> + <package>libesd-devel</package> + <package>libesd0</package> + <package>libesmtp-devel</package> + <package>libevoldap-2_4-2</package> + <package>libevtlog-devel</package> + <package>libevtlog0</package> + <package>libexempi-devel</package> + <package>libexempi3</package> + <package>libexif-devel</package> + <package>libexiv2-4</package> + <package>libexiv2-devel</package> + <package>libexpat-devel</package> + <package>libext2fs-devel</package> + <package>libfarsight-0_1-3</package> + <package>libffi-devel</package> + <package>libffi43</package> + <package>libffi43-devel</package> + <package>libflaim-devel</package> + <package>libfprint-devel</package> + <package>libfreebl3</package> + <package>libfreebob</package> + <package>libfreebob-devel</package> + <package>libgadu</package> + <package>libgadu-devel</package> + <package>libgail-gnome</package> + <package>libgail-gnome-devel</package> + <package>libgcj-devel</package> + <package>libgcj43</package> + <package>libgcj43-devel</package> + <package>libgcj43-jar</package> + <package>libgcj_bc43</package> + <package>libgcrypt-devel</package> + <package>libgda-3_0-3</package> + <package>libgda-3_0-devel</package> + <package>libgdiplus0</package> + <package>libgegl-0_0-0</package> + <package>libgeoclue0</package> + <package>libgfortran46</package> + <package>libggz2</package> + <package>libggz2-devel</package> + <package>libgimpprint</package> + <package>libgimpprint-devel</package> + <package>libglade2</package> + <package>libglade2-devel</package> + <package>libglademm</package> + <package>libglademm-2_4-1</package> + <package>libglademm-devel</package> + <package>libgladeui-1-9</package> + <package>libgladeui-1_0-devel</package> + <package>libgmime-2_0-3</package> + <package>libgmime-2_4-2</package> + <package>libgmm++-devel</package> + <package>libgnome</package> + <package>libgnome-certauth0</package> + <package>libgnome-desktop-2-11</package> + <package>libgnome-devel</package> + <package>libgnome-lang</package> + <package>libgnome-menu2</package> + <package>libgnome-window-settings1</package> + <package>libgnomecanvas</package> + <package>libgnomecanvas-devel</package> + <package>libgnomecanvas-lang</package> + <package>libgnomecanvasmm</package> + <package>libgnomecanvasmm-devel</package> + <package>libgnomecups</package> + <package>libgnomecups-devel</package> + <package>libgnomecups-lang</package> + <package>libgnomedb</package> + <package>libgnomedb-devel</package> + <package>libgnomedb-lang</package> + <package>libgnomekbd</package> + <package>libgnomekbd-devel</package> + <package>libgnomekbd-lang</package> + <package>libgnomeprint</package> + <package>libgnomeprint-devel</package> + <package>libgnomeprint-lang</package> + <package>libgnomeprintui</package> + <package>libgnomeprintui-devel</package> + <package>libgnomeprintui-lang</package> + <package>libgnomesu</package> + <package>libgnomesu-devel</package> + <package>libgnomesu-lang</package> + <package>libgnomesu0</package> + <package>libgnomeui</package> + <package>libgnomeui-devel</package> + <package>libgnomeui-lang</package> + <package>libgnomevfsmm-2_6-1</package> + <package>libgnutls-devel</package> + <package>libgnutls-extra-devel</package> + <package>libgnutls-extra26</package> + <package>libgoocanvas3</package> + <package>libgpg-error-devel</package> + <package>libgpgme-devel</package> + <package>libgphoto2-devel</package> + <package>libgpod-devel</package> + <package>libgsf</package> + <package>libgsf-1-114</package> + <package>libgsf-devel</package> + <package>libgsf-gnome</package> + <package>libgsm-devel</package> + <package>libgsm1</package> + <package>libgssglue-devel</package> + <package>libgstapp-0_10-0</package> + <package>libgstinterfaces-0_10-0</package> + <package>libgstreamer-0_10-0</package> + <package>libgtk-vnc-1_0-0</package> + <package>libgtkhtml</package> + <package>libgtkhtml-devel</package> + <package>libgtksourceview-2_0-0</package> + <package>libgtop</package> + <package>libgtop-2_0-7</package> + <package>libgtop-devel</package> + <package>libgtop-lang</package> + <package>libgudev-1_0-0</package> + <package>libgweather</package> + <package>libgweather-devel</package> + <package>libgweather-lang</package> + <package>libgweather1</package> + <package>libhangul</package> + <package>libhangul-devel</package> + <package>libhowl0</package> + <package>libical-devel</package> + <package>libical0</package> + <package>libicu-devel</package> + <package>libid3tag</package> + <package>libid3tag-devel</package> + <package>libidl-devel</package> + <package>libidn-devel</package> + <package>libiec61883</package> + <package>libiec61883-devel</package> + <package>libieee1284</package> + <package>libiniparser-devel</package> + <package>libiniparser0</package> + <package>libiptcdata</package> + <package>libiptcdata-devel</package> + <package>libiptcdata0</package> + <package>libiso9660-5</package> + <package>libiterm</package> + <package>libiterm-devel</package> + <package>libjack-devel</package> + <package>libjack0</package> + <package>libjasper</package> + <package>libjasper-devel</package> + <package>libjingle-0_3-0</package> + <package>libjingle-devel</package> + <package>libjpeg-devel</package> + <package>libkcal</package> + <package>libkcal-devel</package> + <package>libkcal2</package> + <package>libkcddb4</package> + <package>libkcddb4-devel</package> + <package>libkcompactdisc4</package> + <package>libkcompactdisc4-devel</package> + <package>libkdcraw3</package> + <package>libkdcraw3-devel</package> + <package>libkdcraw3-lang</package> + <package>libkde4</package> + <package>libkde4-devel</package> + <package>libkdecore4</package> + <package>libkdecore4-devel</package> + <package>libkdepim4</package> + <package>libkdepim4-devel</package> + <package>libkdepimlibs4</package> + <package>libkdepimlibs4-devel</package> + <package>libkexiv2-3</package> + <package>libkexiv2-3-devel</package> + <package>libkexiv2-7</package> + <package>libkipi-devel</package> + <package>libkipi6</package> + <package>libkmime-devel</package> + <package>libkmime2</package> + <package>libknotificationitem-1-1</package> + <package>libkonq-devel</package> + <package>libkonq5</package> + <package>libksba-devel</package> + <package>libktnef-devel</package> + <package>libktnef1</package> + <package>liblazy-devel</package> + <package>liblazy1</package> + <package>liblcms-devel</package> + <package>libldapcpp-devel</package> + <package>liblog4c-devel</package> + <package>liblog4c3</package> + <package>libloudmouth-1-0</package> + <package>liblpsolve55</package> + <package>liblua5_1</package> + <package>libmalaga-devel</package> + <package>libmalaga7</package> + <package>libmcrypt</package> + <package>libmcrypt-devel</package> + <package>libmikmod</package> + <package>libmikmod-devel</package> + <package>libmm-devel</package> + <package>libmm14</package> + <package>libmng-devel</package> + <package>libmpcdec-devel</package> + <package>libmpcdec5</package> + <package>libmspack-devel</package> + <package>libmtp-devel</package> + <package>libmtp8</package> + <package>libmusicbrainz-devel</package> + <package>libmusicbrainz3-6</package> + <package>libmusicbrainz3-devel</package> + <package>libmusicbrainz4</package> + <package>libmysqlclient-devel</package> + <package>libmysqlclient15</package> + <package>libmysqlclient_r15</package> + <package>libneon-devel</package> + <package>libneon27</package> + <package>libnetapi-devel</package> + <package>libnetapi0</package> + <package>libnetcontrol0</package> + <package>libnetpbm-devel</package> + <package>libnetpbm10</package> + <package>libnewt0_52</package> + <package>libnjb</package> + <package>libnjb-devel</package> + <package>libnjb5</package> + <package>libnl-devel</package> + <package>libnotify</package> + <package>libnotify-devel</package> + <package>libnotify1</package> + <package>libnscd-devel</package> + <package>libnsssharedhelper0</package> + <package>libnuma-devel</package> + <package>libofa-devel</package> + <package>libofa0</package> + <package>libogg-devel</package> + <package>libogg0</package> + <package>liboil</package> + <package>liboil-devel</package> + <package>libopenbabel-devel</package> + <package>libopenbabel3</package> + <package>libopencdk-devel</package> + <package>libopencdk10</package> + <package>libopenraw-devel</package> + <package>libopenraw1</package> + <package>libopenssl-devel</package> + <package>libopensync</package> + <package>libopensync-devel</package> + <package>libopensync-plugin-evolution2</package> + <package>libopensync-plugin-evolution2-devel</package> + <package>libopensync-plugin-palm</package> + <package>libopensync-plugin-palm-devel</package> + <package>liborc-0_4-0</package> + <package>libosip2</package> + <package>libosip2-devel</package> + <package>libotf</package> + <package>libotf-devel</package> + <package>libotr-devel</package> + <package>libotr2</package> + <package>libp11-1</package> + <package>libp11-devel</package> + <package>libpackagekit-glib10</package> + <package>libpackagekit-glib10-devel</package> + <package>libpangomm-1_4-1</package> + <package>libpcap-devel</package> + <package>libpciaccess0</package> + <package>libpciaccess0-devel</package> + <package>libphonon4</package> + <package>libpisock-devel</package> + <package>libpisock9</package> + <package>libpisync-devel</package> + <package>libpisync1</package> + <package>libpixman-1-0-devel</package> + <package>libpkcs11-helper1</package> + <package>libpng-devel</package> + <package>libpolkit-qt0</package> + <package>libpoppler-devel</package> + <package>libpoppler-glib-devel</package> + <package>libpoppler-glib4</package> + <package>libpoppler-qt2</package> + <package>libpoppler-qt3-devel</package> + <package>libpoppler-qt4-3</package> + <package>libpoppler-qt4-devel</package> + <package>libpoppler5</package> + <package>libpst4</package> + <package>libpt2</package> + <package>libpt2-devel</package> + <package>libpulse-browse0</package> + <package>libpulse-devel</package> + <package>libpulse-mainloop-glib0</package> + <package>libpulse0</package> + <package>libpurple</package> + <package>libpurple-devel</package> + <package>libpurple-lang</package> + <package>libqca2</package> + <package>libqca2-devel</package> + <package>libqdialogsolver1</package> + <package>libqdialogsolver1-devel</package> + <package>libqimageblitz-devel</package> + <package>libqimageblitz4</package> + <package>libqscintilla-devel</package> + <package>libqscintilla2-5</package> + <package>libqt4</package> + <package>libqt4-devel</package> + <package>libqt4-qt3support</package> + <package>libqt4-sql</package> + <package>libqt4-sql-mysql</package> + <package>libqt4-sql-postgresql</package> + <package>libqt4-sql-sqlite</package> + <package>libqt4-sql-unixODBC</package> + <package>libqt4-x11</package> + <package>libqtpod-devel</package> + <package>libqtpod0</package> + <package>libquadmath46</package> + <package>libquicktime</package> + <package>libquicktime-devel</package> + <package>libraptor-devel</package> + <package>libraptor1</package> + <package>librasqal-devel</package> + <package>librasqal1</package> + <package>libraw1394-11</package> + <package>libraw1394-8</package> + <package>libraw1394-devel</package> + <package>libredland-devel</package> + <package>libredland0</package> + <package>libreiserfs-devel</package> + <package>libreoffice</package> + <package>libreoffice-base</package> + <package>libreoffice-branding-SLED</package> + <package>libreoffice-branding-upstream</package> + <package>libreoffice-calc</package> + <package>libreoffice-icon-themes</package> + <package>libreoffice-impress</package> + <package>libreoffice-sdk</package> + <package>libreoffice-writer</package> + <package>librsvg</package> + <package>librsvg-devel</package> + <package>libsamplerate</package> + <package>libsamplerate-devel</package> + <package>libsatsolver-devel</package> + <package>libsblim-cmpiutil1</package> + <package>libselinux-devel</package> + <package>libsemanage-devel</package> + <package>libsemanage1</package> + <package>libsensors3-devel</package> + <package>libsensors4</package> + <package>libsepol-devel</package> + <package>libsexy</package> + <package>libsexy-devel</package> + <package>libshout-devel</package> + <package>libshout3</package> + <package>libsidplay1</package> + <package>libsidplay1-devel</package> + <package>libsigc++2</package> + <package>libsigc++2-devel</package> + <package>libslab-lang</package> + <package>libslab0</package> + <package>libsmbclient-devel</package> + <package>libsmbios-devel</package> + <package>libsmbsharemodes-devel</package> + <package>libsmbsharemodes0</package> + <package>libsndfile</package> + <package>libsndfile-devel</package> + <package>libsoprano-devel</package> + <package>libsoprano4</package> + <package>libsoup-devel</package> + <package>libspectre-devel</package> + <package>libspectre1</package> + <package>libspeex</package> + <package>libssh2-devel</package> + <package>libstrigi0</package> + <package>libstroke</package> + <package>libstroke-devel</package> + <package>libsyncml-devel</package> + <package>libsyncml0</package> + <package>libtalloc-devel</package> + <package>libtasn1-devel</package> + <package>libtdb-devel</package> + <package>libtelepathy</package> + <package>libtelepathy-devel</package> + <package>libtelepathy-glib0</package> + <package>libtheora-devel</package> + <package>libtheora0</package> + <package>libtidy</package> + <package>libtidy-devel</package> + <package>libtiff-devel</package> + <package>libtirpc-devel</package> + <package>libtomoe-gtk0</package> + <package>libtspi1</package> + <package>libtunepimp</package> + <package>libtunepimp-devel</package> + <package>libtunepimp5</package> + <package>libudev-devel</package> + <package>libudf0</package> + <package>libunique-1_0-0</package> + <package>libunwind</package> + <package>libunwind-devel</package> + <package>libupsclient1</package> + <package>libusb-devel</package> + <package>libusbpp-0_1-4</package> + <package>libustr-1_0-1</package> + <package>libustr-devel</package> + <package>libuuid-devel</package> + <package>libvirt-client</package> + <package>libvirt-devel</package> + <package>libvisual</package> + <package>libvisual-devel</package> + <package>libvoikko-devel</package> + <package>libvoikko1</package> + <package>libvorbis</package> + <package>libvorbis-devel</package> + <package>libwavpack1</package> + <package>libwbclient-devel</package> + <package>libwbxml2-0</package> + <package>libwbxml2-devel</package> + <package>libwebkit-1_0-1</package> + <package>libwebkit-1_0-2</package> + <package>libwebkit-devel</package> + <package>libwebkit-lang</package> + <package>libwmf</package> + <package>libwmf-devel</package> + <package>libwmf-gnome</package> + <package>libwnck</package> + <package>libwnck-1-22</package> + <package>libwnck-devel</package> + <package>libwnck-lang</package> + <package>libwpd-0_8-8</package> + <package>libwpd-devel</package> + <package>libwpg-0_1-1</package> + <package>libwpg-devel</package> + <package>libwps-0_1-1</package> + <package>libwps-devel</package> + <package>libwsman-devel</package> + <package>libwsman1</package> + <package>libxcrypt-devel</package> + <package>libxine-devel</package> + <package>libxine1</package> + <package>libxklavier-devel</package> + <package>libxklavier15</package> + <package>libxml2-devel</package> + <package>libxslt-devel</package> + <package>libyajl1</package> + <package>libzio-devel</package> + <package>libzip-devel</package> + <package>libzip1</package> + <package>libzvbi0</package> + <package>libzypp-devel</package> + <package>limal-apparmor-notifications</package> + <package>limal-apparmor-notifications-devel</package> + <package>limal-ca-mgm-devel</package> + <package>limal-devel</package> + <package>limal-devtools</package> + <package>limal-nfs-server-devel</package> + <package>linux-atm-devel</package> + <package>linux-atm-lib</package> + <package>lksctp-tools</package> + <package>lksctp-tools-devel</package> + <package>loudmouth-devel</package> + <package>lua</package> + <package>lua-devel</package> + <package>lzo-devel</package> + <package>m17n-db</package> + <package>m17n-lib</package> + <package>m17n-lib-devel</package> + <package>malaga-suomi</package> + <package>meanwhile</package> + <package>meanwhile-devel</package> + <package>metacity</package> + <package>metacity-devel</package> + <package>metacity-lang</package> + <package>mhash</package> + <package>mhash-devel</package> + <package>misc-console-font</package> + <package>mono-addins</package> + <package>mono-basic</package> + <package>mono-core</package> + <package>mono-data</package> + <package>mono-data-oracle</package> + <package>mono-data-sqlite</package> + <package>mono-devel</package> + <package>mono-extras</package> + <package>mono-jscript</package> + <package>mono-tools</package> + <package>mono-wcf</package> + <package>mono-web</package> + <package>mono-winforms</package> + <package>mono-zeroconf</package> + <package>mono-zeroconf-provider-avahi</package> + <package>monodevelop</package> + <package>monodoc-core</package> + <package>mozilla-nspr</package> + <package>mozilla-nspr-devel</package> + <package>mozilla-nss</package> + <package>mozilla-nss-devel</package> + <package>mozilla-xulrunner192</package> + <package>mozilla-xulrunner192-gnome</package> + <package>mpfr-devel</package> + <package>mpi-selector</package> + <package>mpich</package> + <package>mpich-devel</package> + <package>mysql</package> + <package>mysql-client</package> + <package>nagios</package> + <package>nagios-devel</package> + <package>nagios-www</package> + <package>nant</package> + <package>nautilus</package> + <package>nautilus-cd-burner</package> + <package>nautilus-cd-burner-devel</package> + <package>nautilus-cd-burner-lang</package> + <package>nautilus-devel</package> + <package>nautilus-lang</package> + <package>ndesk-dbus</package> + <package>ndesk-dbus-glib</package> + <package>ndesk-dbus-glib-devel</package> + <package>net-snmp</package> + <package>net-snmp-devel</package> + <package>netatalk</package> + <package>netatalk-devel</package> + <package>netcat-openbsd</package> + <package>newt</package> + <package>newt-devel</package> + <package>newt-static</package> + <package>nfsidmap-devel</package> + <package>notification-daemon</package> + <package>notification-daemon-lang</package> + <package>notify-sharp</package> + <package>nss-mdns</package> + <package>nss-shared-helper-devel</package> + <package>nut</package> + <package>nut-classic</package> + <package>nut-devel</package> + <package>opal</package> + <package>opal-devel</package> + <package>openCryptoki</package> + <package>openCryptoki-64bit</package> + <package>openCryptoki-devel</package> + <package>openct-devel</package> + <package>openhpi</package> + <package>openhpi-daemon</package> + <package>openhpi-devel</package> + <package>openjade</package> + <package>openjade-devel</package> + <package>openldap2-devel</package> + <package>openmotif-devel</package> + <package>openmotif-libs</package> + <package>openmpi</package> + <package>openobex-devel</package> + <package>openobex-glib-devel</package> + <package>opensc-devel</package> + <package>openslp-devel</package> + <package>opensp</package> + <package>opensp-devel</package> + <package>openwsman-client</package> + <package>openwsman-server</package> + <package>orbit</package> + <package>orbit-devel</package> + <package>orbit2-devel</package> + <package>oxygen-icon-theme</package> + <package>oxygen-icon-theme-scalable</package> + <package>ozerocdoff</package> + <package>pam-devel</package> + <package>pango-devel</package> + <package>pangomm-devel</package> + <package>parted-devel</package> + <package>patchutils</package> + <package>pciutils-devel</package> + <package>pcre-devel</package> + <package>pcsc-acr38</package> + <package>pcsc-acr38-devel</package> + <package>pcsc-lite-devel</package> + <package>perl-32bit</package> + <package>perl-Crypt-OpenSSL-RSA</package> + <package>perl-Mail-DKIM</package> + <package>perl-MailTools</package> + <package>perl-Net-DNS</package> + <package>perl-Net-IP</package> + <package>perl-NetAddr-IP</package> + <package>perl-SNMP</package> + <package>perl-Tie-IxHash</package> + <package>perl-Tk</package> + <package>perl-Tk-devel</package> + <package>perl-spamassassin</package> + <package>phonon</package> + <package>phonon-backend-gstreamer-0_10</package> + <package>phonon-devel</package> + <package>php5</package> + <package>php5-ctype</package> + <package>php5-devel</package> + <package>php5-dom</package> + <package>php5-hash</package> + <package>php5-iconv</package> + <package>php5-json</package> + <package>php5-pdo</package> + <package>php5-sqlite</package> + <package>php5-suhosin</package> + <package>php5-tokenizer</package> + <package>php5-xmlreader</package> + <package>php5-xmlwriter</package> + <package>php53</package> + <package>php53-ctype</package> + <package>php53-dom</package> + <package>php53-iconv</package> + <package>php53-json</package> + <package>php53-tokenizer</package> + <package>php53-xmlreader</package> + <package>php53-xmlwriter</package> + <package>pidgin</package> + <package>pidgin-devel</package> + <package>pilot-link</package> + <package>pkcs11-helper</package> + <package>pkcs11-helper-devel</package> + <package>planner</package> + <package>planner-devel</package> + <package>planner-lang</package> + <package>plasma-addons</package> + <package>plasma-theme-aya</package> + <package>plasmoid-networkmanagement</package> + <package>plasmoid-quickaccess</package> + <package>plotutils</package> + <package>poppler-data</package> + <package>poppler-tools</package> + <package>popt-devel</package> + <package>portmap</package> + <package>postfix-devel</package> + <package>postgresql-devel</package> + <package>postgresql-libs</package> + <package>ppp-devel</package> + <package>ppp-userpass</package> + <package>pstoedit</package> + <package>pstoedit-devel</package> + <package>pulseaudio</package> + <package>pulseaudio-esound-compat</package> + <package>pulseaudio-lang</package> + <package>puppet</package> + <package>python-cairo</package> + <package>python-cairo-devel</package> + <package>python-devel</package> + <package>python-gnome</package> + <package>python-gnome-devel</package> + <package>python-gobject2</package> + <package>python-gobject2-devel</package> + <package>python-gtk</package> + <package>python-gtk-devel</package> + <package>python-gtkglext</package> + <package>python-gtkglext-devel</package> + <package>python-gtksourceview</package> + <package>python-gtksourceview-devel</package> + <package>python-numeric</package> + <package>python-numpy</package> + <package>python-orbit</package> + <package>python-orbit-devel</package> + <package>pyxml</package> + <package>qt3</package> + <package>qt3-devel</package> + <package>quagga</package> + <package>quagga-devel</package> + <package>quilt</package> + <package>raptor</package> + <package>rarian</package> + <package>rarian-devel</package> + <package>re2c</package> + <package>readline-devel</package> + <package>recode-devel</package> + <package>rpm-devel</package> + <package>rrdtool</package> + <package>rrdtool-devel</package> + <package>rsyslog</package> + <package>ruby</package> + <package>rubygems</package> + <package>ruby-devel</package> + <package>ruby-doc-html</package> + <package>ruby-doc-ri</package> + <package>ruby-examples</package> + <package>ruby-fcgi</package> + <package>ruby-mysql</package> + <package>ruby-selinux</package> + <package>ruby-test-suite</package> + <package>ruby-tk</package> + <package>sablot</package> + <package>sablot-devel</package> + <package>samba-devel</package> + <package>sane-backends</package> + <package>sane-frontends</package> + <package>sax2-libsax</package> + <package>sax2-libsax-devel</package> + <package>sax2-libsax-perl</package> + <package>sax2-tools</package> + <package>sblim-cmpi-base</package> + <package>sblim-cmpi-base-devel</package> + <package>sblim-cmpi-devel</package> + <package>sblim-cmpiutil-devel</package> + <package>sblim-indication_helper</package> + <package>sblim-sfcb</package> + <package>sblim-sfcc</package> + <package>sblim-sfcc-devel</package> + <package>scim</package> + <package>scim-devel</package> + <package>scpm-devel</package> + <package>scrollkeeper</package> + <package>scrollkeeper-lang</package> + <package>seahorse</package> + <package>seahorse-devel</package> + <package>seahorse-lang</package> + <package>sendmail</package> + <package>sendmail-devel</package> + <package>sg3_utils-devel</package> + <package>sgml-skel</package> + <package>shared-mime-info</package> + <package>silc-toolkit</package> + <package>silc-toolkit-devel</package> + <package>slang</package> + <package>slang-devel</package> + <package>soprano</package> + <package>soprano-backend-redland</package> + <package>spamassassin</package> + <package>speex-devel</package> + <package>splashy-devel</package> + <package>sqlite2</package> + <package>sqlite3-devel</package> + <package>startup-notification</package> + <package>startup-notification-devel</package> + <package>strigi</package> + <package>strigi-devel</package> + <package>subversion</package> + <package>subversion-perl</package> + <package>susehelp</package> + <package>susehelp_cz</package> + <package>susehelp_de</package> + <package>susehelp_en</package> + <package>susehelp_es</package> + <package>susehelp_fr</package> + <package>susehelp_hu</package> + <package>susehelp_it</package> + <package>swig</package> + <package>syslogd</package> + <package>t1lib</package> + <package>t1lib-devel</package> + <package>taglib</package> + <package>taglib-devel</package> + <package>taglib-sharp</package> + <package>tango-icon-theme</package> + <package>tcl-devel</package> + <package>tcpd-devel</package> + <package>telepathy-glib-devel</package> + <package>telepathy-mission-control</package> + <package>telepathy-mission-control-devel</package> + <package>texlive-bin-devel</package> + <package>texlive-devel</package> + <package>tk-devel</package> + <package>tla</package> + <package>tn5250</package> + <package>tn5250-devel</package> + <package>tomoe</package> + <package>tomoe-devel</package> + <package>tomoe-gtk</package> + <package>tomoe-gtk-devel</package> + <package>tomoe-gtk-lang</package> + <package>totem-pl-parser</package> + <package>totem-pl-parser-devel</package> + <package>totem-pl-parser-lang</package> + <package>trousers</package> + <package>trousers-devel</package> + <package>tsclient</package> + <package>tsclient-devel</package> + <package>tsclient-lang</package> + <package>uim</package> + <package>uim-devel</package> + <package>unixODBC</package> + <package>unixODBC-devel</package> + <package>unsermake</package> + <package>update-desktop-files</package> + <package>usb_modeswitch</package> + <package>usb_modeswitch-data</package> + <package>valgrind</package> + <package>valgrind-devel</package> + <package>vte</package> + <package>vte-devel</package> + <package>vte-lang</package> + <package>wdiff</package> + <package>webkit-sharp</package> + <package>wireshark</package> + <package>wireshark-devel</package> + <package>wodim-devel</package> + <package>wordcut</package> + <package>wordcut-devel</package> + <package>words</package> + <package>wpa_supplicant</package> + <package>wvstreams</package> + <package>wvstreams-devel</package> + <package>wxGTK-compat</package> + <package>wxGTK-devel</package> + <package>wxGTK-gl</package> + <package>x11-input-wacom</package> + <package>x11-input-wacom-devel</package> + <package>x11-input-wacom-tools</package> + <package>xalan-j2</package> + <package>xaw3d-devel</package> + <package>xbase</package> + <package>xbase-devel</package> + <package>xdelta</package> + <package>xdelta-devel</package> + <package>xdg-menu</package> + <package>xen-devel</package> + <package>xen-libs</package> + <package>xerces-j2</package> + <package>xerces-j2-bootstrap</package> + <package>xerces-j2-xml-apis</package> + <package>xfsprogs-devel</package> + <package>xml-commons-apis-bootstrap</package> + <package>xml-commons-resolver-bootstrap</package> + <package>xml-commons-which-bootstrap</package> + <package>xmlcharent</package> + <package>xorg-x11</package> + <package>xorg-x11-devel</package> + <package>xorg-x11-fonts</package> + <package>xorg-x11-fonts-core</package> + <package>xorg-x11-fonts-devel</package> + <package>xorg-x11-libICE-devel</package> + <package>xorg-x11-libSM-devel</package> + <package>xorg-x11-libX11-devel</package> + <package>xorg-x11-libXau-devel</package> + <package>xorg-x11-libXdmcp-devel</package> + <package>xorg-x11-libXext-devel</package> + <package>xorg-x11-libXfixes-devel</package> + <package>xorg-x11-libXmu-devel</package> + <package>xorg-x11-libXp-devel</package> + <package>xorg-x11-libXpm-devel</package> + <package>xorg-x11-libXprintUtil-devel</package> + <package>xorg-x11-libXrender-devel</package> + <package>xorg-x11-libXt-devel</package> + <package>xorg-x11-libXv-devel</package> + <package>xorg-x11-libfontenc-devel</package> + <package>xorg-x11-libxcb-devel</package> + <package>xorg-x11-libxkbfile-devel</package> + <package>xorg-x11-proto-devel</package> + <package>xorg-x11-server</package> + <package>xorg-x11-util-devel</package> + <package>xorg-x11-xauth</package> + <package>xorg-x11-xtrans-devel</package> + <package>xosd</package> + <package>xosd-devel</package> + <package>xsp</package> + <package>xterm</package> + <package>xz-devel</package> + <package>yast2-core-devel</package> + <package>yast2-devtools</package> + <package>yast2-gtk</package> + <package>yast2-libyui-devel</package> + <package>yast2-ncurses-devel</package> + <package>yast2-qt</package> + <package>yast2-qt-devel</package> + <package>yast2-qt-pkg</package> + <package>yast2-storage-devel</package> + <package>yast2-ycp-ui-bindings-devel</package> + <package>yelp</package> + <package>yelp-lang</package> + <package>zenity</package> + <package>zenity-lang</package> + <package>zlib-devel</package> + <package>zsh</package> + <package>zvbi-devel</package> + </remove-packages> + + </software> + <user_defaults> + <expire></expire> + <group>100</group> + <groups>video,dialout</groups> + <home>/home</home> + <inactive>-1</inactive> + <shell>/bin/bash</shell> + <skel>/etc/skel</skel> + <umask>022</umask> + </user_defaults> + <users config:type="list"> + <user> + <encrypted config:type="boolean">true</encrypted> + <fullname>vagrant</fullname> + <gid>100</gid> + <home>/home/vagrant</home> + <password_settings> + <expire></expire> + <flag></flag> + <inact></inact> + <max>99999</max> + <min>0</min> + <warn>7</warn> + </password_settings> + <shell>/bin/bash</shell> + <uid>1000</uid> + <user_password>$2y$05$NA1Li9ZKJOLRW5mMTXm6/e5r8dltWS5RpDZpvHrI82aLE00V51tdi</user_password> + <username>vagrant</username> + </user> + <user> + <encrypted config:type="boolean">true</encrypted> + <fullname>Games account</fullname> + <gid>100</gid> + <home>/var/games</home> + <password_settings> + <expire></expire> + <flag></flag> + <inact></inact> + <max></max> + <min></min> + <warn></warn> + </password_settings> + <shell>/bin/bash</shell> + <uid>12</uid> + <user_password>*</user_password> + <username>games</username> + </user> + <user> + <encrypted config:type="boolean">true</encrypted> + <fullname>bin</fullname> + <gid>1</gid> + <home>/bin</home> + <password_settings> + <expire></expire> + <flag></flag> + <inact></inact> + <max></max> + <min></min> + <warn></warn> + </password_settings> + <shell>/bin/bash</shell> + <uid>1</uid> + <user_password>*</user_password> + <username>bin</username> + </user> + <user> + <encrypted config:type="boolean">true</encrypted> + <fullname>nobody</fullname> + <gid>65533</gid> + <home>/var/lib/nobody</home> + <password_settings> + <expire></expire> + <flag></flag> + <inact></inact> + <max></max> + <min></min> + <warn></warn> + </password_settings> + <shell>/bin/bash</shell> + <uid>65534</uid> + <user_password>*</user_password> + <username>nobody</username> + </user> + <user> + <encrypted config:type="boolean">true</encrypted> + <fullname>Printing daemon</fullname> + <gid>7</gid> + <home>/var/spool/lpd</home> + <password_settings> + <expire></expire> + <flag></flag> + <inact></inact> + <max></max> + <min></min> + <warn></warn> + </password_settings> + <shell>/bin/bash</shell> + <uid>4</uid> + <user_password>*</user_password> + <username>lp</username> + </user> + <user> + <encrypted config:type="boolean">true</encrypted> + <fullname>User for uuidd</fullname> + <gid>104</gid> + <home>/var/run/uuidd</home> + <password_settings> + <expire></expire> + <flag></flag> + <inact></inact> + <max>99999</max> + <min>0</min> + <warn>7</warn> + </password_settings> + <shell>/bin/false</shell> + <uid>102</uid> + <user_password>*</user_password> + <username>uuidd</username> + </user> + <user> + <encrypted config:type="boolean">true</encrypted> + <fullname>Postfix Daemon</fullname> + <gid>51</gid> + <home>/var/spool/postfix</home> + <password_settings> + <expire></expire> + <flag></flag> + <inact></inact> + <max>99999</max> + <min>0</min> + <warn>7</warn> + </password_settings> + <shell>/bin/false</shell> + <uid>51</uid> + <user_password>*</user_password> + <username>postfix</username> + </user> + <user> + <encrypted config:type="boolean">true</encrypted> + <fullname>Novell Customer Center User</fullname> + <gid>111</gid> + <home>/var/lib/YaST2/suse-ncc-fakehome</home> + <password_settings> + <expire></expire> + <flag></flag> + <inact></inact> + <max>99999</max> + <min>0</min> + <warn>7</warn> + </password_settings> + <shell>/bin/bash</shell> + <uid>106</uid> + <user_password>*</user_password> + <username>suse-ncc</username> + </user> + <user> + <encrypted config:type="boolean">true</encrypted> + <fullname>FTP account</fullname> + <gid>49</gid> + <home>/srv/ftp</home> + <password_settings> + <expire></expire> + <flag></flag> + <inact></inact> + <max></max> + <min></min> + <warn></warn> + </password_settings> + <shell>/bin/bash</shell> + <uid>40</uid> + <user_password>*</user_password> + <username>ftp</username> + </user> + <user> + <encrypted config:type="boolean">true</encrypted> + <fullname>Gnome Display Manager daemon</fullname> + <gid>112</gid> + <home>/var/lib/gdm</home> + <password_settings> + <expire></expire> + <flag></flag> + <inact></inact> + <max>99999</max> + <min>0</min> + <warn>7</warn> + </password_settings> + <shell>/bin/false</shell> + <uid>107</uid> + <user_password>*</user_password> + <username>gdm</username> + </user> + <user> + <encrypted config:type="boolean">true</encrypted> + <fullname>Batch jobs daemon</fullname> + <gid>25</gid> + <home>/var/spool/atjobs</home> + <password_settings> + <expire></expire> + <flag></flag> + <inact></inact> + <max>99999</max> + <min>0</min> + <warn>7</warn> + </password_settings> + <shell>/bin/bash</shell> + <uid>25</uid> + <user_password>*</user_password> + <username>at</username> + </user> + <user> + <encrypted config:type="boolean">true</encrypted> + <fullname>root</fullname> + <gid>0</gid> + <home>/root</home> + <password_settings> + <expire></expire> + <flag></flag> + <inact></inact> + <max></max> + <min></min> + <warn></warn> + </password_settings> + <shell>/bin/bash</shell> + <uid>0</uid> + <user_password>$2y$05$NA1Li9ZKJOLRW5mMTXm6/e5r8dltWS5RpDZpvHrI82aLE00V51tdi</user_password> + <username>root</username> + </user> + <user> + <encrypted config:type="boolean">true</encrypted> + <fullname>Mailer daemon</fullname> + <gid>12</gid> + <home>/var/spool/clientmqueue</home> + <password_settings> + <expire></expire> + <flag></flag> + <inact></inact> + <max></max> + <min></min> + <warn></warn> + </password_settings> + <shell>/bin/false</shell> + <uid>8</uid> + <user_password>*</user_password> + <username>mail</username> + </user> + <user> + <encrypted config:type="boolean">true</encrypted> + <fullname>Daemon</fullname> + <gid>2</gid> + <home>/sbin</home> + <password_settings> + <expire></expire> + <flag></flag> + <inact></inact> + <max></max> + <min></min> + <warn></warn> + </password_settings> + <shell>/bin/bash</shell> + <uid>2</uid> + <user_password>*</user_password> + <username>daemon</username> + </user> + <user> + <encrypted config:type="boolean">true</encrypted> + <fullname>NTP daemon</fullname> + <gid>108</gid> + <home>/var/lib/ntp</home> + <password_settings> + <expire></expire> + <flag></flag> + <inact></inact> + <max>99999</max> + <min>0</min> + <warn>7</warn> + </password_settings> + <shell>/bin/false</shell> + <uid>74</uid> + <user_password>*</user_password> + <username>ntp</username> + </user> + <user> + <encrypted config:type="boolean">true</encrypted> + <fullname>Unix-to-Unix CoPy system</fullname> + <gid>14</gid> + <home>/etc/uucp</home> + <password_settings> + <expire></expire> + <flag></flag> + <inact></inact> + <max></max> + <min></min> + <warn></warn> + </password_settings> + <shell>/bin/bash</shell> + <uid>10</uid> + <user_password>*</user_password> + <username>uucp</username> + </user> + <user> + <encrypted config:type="boolean">true</encrypted> + <fullname>User for D-Bus</fullname> + <gid>101</gid> + <home>/var/run/dbus</home> + <password_settings> + <expire></expire> + <flag></flag> + <inact></inact> + <max></max> + <min>0</min> + <warn>7</warn> + </password_settings> + <shell>/bin/false</shell> + <uid>100</uid> + <user_password>*</user_password> + <username>messagebus</username> + </user> + <user> + <encrypted config:type="boolean">true</encrypted> + <fullname>User for haldaemon</fullname> + <gid>102</gid> + <home>/var/run/hald</home> + <password_settings> + <expire></expire> + <flag></flag> + <inact></inact> + <max></max> + <min>0</min> + <warn>7</warn> + </password_settings> + <shell>/bin/false</shell> + <uid>101</uid> + <user_password>*</user_password> + <username>haldaemon</username> + </user> + <user> + <encrypted config:type="boolean">true</encrypted> + <fullname>WWW daemon apache</fullname> + <gid>8</gid> + <home>/var/lib/wwwrun</home> + <password_settings> + <expire></expire> + <flag></flag> + <inact></inact> + <max></max> + <min></min> + <warn></warn> + </password_settings> + <shell>/bin/false</shell> + <uid>30</uid> + <user_password>*</user_password> + <username>wwwrun</username> + </user> + <user> + <encrypted config:type="boolean">true</encrypted> + <fullname>Manual pages viewer</fullname> + <gid>62</gid> + <home>/var/cache/man</home> + <password_settings> + <expire></expire> + <flag></flag> + <inact></inact> + <max></max> + <min></min> + <warn></warn> + </password_settings> + <shell>/bin/bash</shell> + <uid>13</uid> + <user_password>*</user_password> + <username>man</username> + </user> + <user> + <encrypted config:type="boolean">true</encrypted> + <fullname>PolicyKit</fullname> + <gid>107</gid> + <home>/var/run/PolicyKit</home> + <password_settings> + <expire></expire> + <flag></flag> + <inact></inact> + <max>99999</max> + <min>0</min> + <warn>7</warn> + </password_settings> + <shell>/bin/false</shell> + <uid>104</uid> + <user_password>*</user_password> + <username>polkituser</username> + </user> + <user> + <encrypted config:type="boolean">true</encrypted> + <fullname>News system</fullname> + <gid>13</gid> + <home>/etc/news</home> + <password_settings> + <expire></expire> + <flag></flag> + <inact></inact> + <max></max> + <min></min> + <warn></warn> + </password_settings> + <shell>/bin/bash</shell> + <uid>9</uid> + <user_password>*</user_password> + <username>news</username> + </user> + <user> + <fullname>SSH daemon</fullname> + <gid>65</gid> + <home>/var/lib/sshd</home> + <shell>/bin/false</shell> + <uid>71</uid> + <username>sshd</username> + </user> + <user> + <encrypted config:type="boolean">true</encrypted> + <fullname>PulseAudio daemon</fullname> + <gid>109</gid> + <home>/var/lib/pulseaudio</home> + <password_settings> + <expire></expire> + <flag></flag> + <inact></inact> + <max>99999</max> + <min>0</min> + <warn>7</warn> + </password_settings> + <shell>/bin/false</shell> + <uid>105</uid> + <user_password>*</user_password> + <username>pulse</username> + </user> + </users> +</profile> diff --git a/definitions/sles-11-sp3/cleanup.sh b/definitions/sles-11-sp3/cleanup.sh new file mode 100644 index 000000000..0870a61a1 --- /dev/null +++ b/definitions/sles-11-sp3/cleanup.sh @@ -0,0 +1,9 @@ +#!/bin/bash -eux + +# remove zypper locks on removed packages to avoid later dependency problems +zypper --non-interactive rl \* +# zypper --non-interactive remove `rpm -qa virtualbox-guest-*` >/dev/null 2>&1 +# Add an online copy of the SLES DVD1 as a software repository, instead of the mounted DVD +zypper removerepo 'SUSE-Linux-Enterprise-Server-11-SP3 11.3.3-1.138' +zypper addrepo 'http://demeter.uni-regensburg.de/SLES11SP3-x64/DVD1/' 'SLES11SP3-x64 DVD1 Online' +zypper refresh diff --git a/definitions/sles-11-sp3/definition.rb b/definitions/sles-11-sp3/definition.rb new file mode 100644 index 000000000..0a7e688ff --- /dev/null +++ b/definitions/sles-11-sp3/definition.rb @@ -0,0 +1,12 @@ +require File.dirname(__FILE__) + "/../.suse/session.rb" + +iso = "SLES-11-SP3-DVD-x86_64-GM-DVD1.iso" + +session = + SUSE_SESSION.merge( :memory_size=> '480', + :iso_download_instructions => "Download evaluation version from http://download.novell.com/protected/Summary.jsp?buildid=Q_VbW21BiB4~", + :iso_file => iso, + :iso_md5 => "480b70d50cbb538382dc2b9325221e1b", + :iso_src => "") + +Veewee::Session.declare session diff --git a/definitions/sles-11-sp3/minimize.sh b/definitions/sles-11-sp3/minimize.sh new file mode 120000 index 000000000..b3632ccbc --- /dev/null +++ b/definitions/sles-11-sp3/minimize.sh @@ -0,0 +1 @@ +../.common/minimize.sh \ No newline at end of file diff --git a/definitions/sles-11-sp3/sshd.sh b/definitions/sles-11-sp3/sshd.sh new file mode 120000 index 000000000..f353f2d00 --- /dev/null +++ b/definitions/sles-11-sp3/sshd.sh @@ -0,0 +1 @@ +../.common/sshd.sh \ No newline at end of file diff --git a/definitions/sles-11-sp3/sudoers.sh b/definitions/sles-11-sp3/sudoers.sh new file mode 120000 index 000000000..18d9cf04d --- /dev/null +++ b/definitions/sles-11-sp3/sudoers.sh @@ -0,0 +1 @@ +../.suse/sudoers.sh \ No newline at end of file diff --git a/definitions/sles-11-sp3/vagrant.sh b/definitions/sles-11-sp3/vagrant.sh new file mode 120000 index 000000000..702949639 --- /dev/null +++ b/definitions/sles-11-sp3/vagrant.sh @@ -0,0 +1 @@ +../.common/vagrant.sh \ No newline at end of file From aeb94c9410d1cce46b38ee982e1b1fee738ee8ad Mon Sep 17 00:00:00 2001 From: Jameson <jamesonjlee@gmail.com> Date: Sun, 14 Jul 2013 14:05:48 -0700 Subject: [PATCH 0065/1622] Sudoers should do secure_path as suggested by debian's wiki - http://wiki.debian.org/sudo Solves issues with ldconfig, start-stop-daemon not being ing $PATH during chef-omnibus install down the line --- definitions/.debian/sudoers.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/definitions/.debian/sudoers.sh b/definitions/.debian/sudoers.sh index e7673ae00..e284d8fb4 100644 --- a/definitions/.debian/sudoers.sh +++ b/definitions/.debian/sudoers.sh @@ -1,4 +1,4 @@ #!/bin/bash -eux -sed -i -e '/Defaults\s\+env_reset/a Defaults\texempt_group=sudo' /etc/sudoers +sed -i -e '/Defaults\s\+env_reset/a Defaults\tsecure_path="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"' /etc/sudoers sed -i -e 's/%sudo ALL=(ALL) ALL/%sudo ALL=NOPASSWD:ALL/g' /etc/sudoers From f0eca4ff4c24fc04f03ad2bf58ad7266b0b4c843 Mon Sep 17 00:00:00 2001 From: Justin Clarke <justin@digitalally.com.au> Date: Fri, 16 Aug 2013 12:25:48 +1000 Subject: [PATCH 0066/1622] Ensure /etc/sudoers sed replacement works for Debian 7.x. --- definitions/debian-7.1.0/sudoers.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) mode change 120000 => 100644 definitions/debian-7.1.0/sudoers.sh diff --git a/definitions/debian-7.1.0/sudoers.sh b/definitions/debian-7.1.0/sudoers.sh deleted file mode 120000 index 70234a7ff..000000000 --- a/definitions/debian-7.1.0/sudoers.sh +++ /dev/null @@ -1 +0,0 @@ -../.debian/sudoers.sh \ No newline at end of file diff --git a/definitions/debian-7.1.0/sudoers.sh b/definitions/debian-7.1.0/sudoers.sh new file mode 100644 index 000000000..36862e097 --- /dev/null +++ b/definitions/debian-7.1.0/sudoers.sh @@ -0,0 +1,4 @@ +#!/bin/bash -eux + +sed -i -e '/Defaults\s\+env_reset/a Defaults\tsecure_path="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"' /etc/sudoers +sed -i -e 's/%sudo\tALL=(ALL:ALL) ALL/%sudo\tALL=(ALL:ALL) NOPASSWD: ALL/' /etc/sudoers From ad4c9c59d6c3b666e07ecbaefad0da49a2bea3d7 Mon Sep 17 00:00:00 2001 From: Justin Clarke <justin@digitalally.com.au> Date: Sat, 17 Aug 2013 15:56:12 +1000 Subject: [PATCH 0067/1622] Add preseed command to comment out cdrom in /etc/apt/sources.list. --- definitions/debian-7.1.0/preseed.cfg | 49 +++++++++++++++++++++++++++- 1 file changed, 48 insertions(+), 1 deletion(-) mode change 120000 => 100644 definitions/debian-7.1.0/preseed.cfg diff --git a/definitions/debian-7.1.0/preseed.cfg b/definitions/debian-7.1.0/preseed.cfg deleted file mode 120000 index 29478e94f..000000000 --- a/definitions/debian-7.1.0/preseed.cfg +++ /dev/null @@ -1 +0,0 @@ -../.debian/preseed.cfg \ No newline at end of file diff --git a/definitions/debian-7.1.0/preseed.cfg b/definitions/debian-7.1.0/preseed.cfg new file mode 100644 index 000000000..bffb74bfe --- /dev/null +++ b/definitions/debian-7.1.0/preseed.cfg @@ -0,0 +1,48 @@ +choose-mirror-bin mirror/http/proxy string +d-i apt-setup/use_mirror boolean true +d-i base-installer/kernel/override-image string linux-server +d-i clock-setup/utc boolean true +d-i clock-setup/utc-auto boolean true +d-i finish-install/reboot_in_progress note +d-i grub-installer/only_debian boolean true +d-i grub-installer/with_other_os boolean true +d-i keymap select us +d-i mirror/country string manual +d-i mirror/http/directory string /debian +d-i mirror/http/hostname string mirrors.kernel.org +d-i mirror/http/proxy string +d-i partman-auto-lvm/guided_size string max +d-i partman-auto/choose_recipe select atomic +d-i partman-auto/method string lvm +d-i partman-lvm/confirm boolean true +d-i partman-lvm/confirm boolean true +d-i partman-lvm/confirm_nooverwrite boolean true +d-i partman-lvm/device_remove_lvm boolean true +d-i partman/choose_partition select finish +d-i partman/confirm boolean true +d-i partman/confirm_nooverwrite boolean true +d-i partman/confirm_write_new_label boolean true +d-i passwd/root-login boolean false +d-i passwd/root-password-again password vagrant +d-i passwd/root-password password vagrant +d-i passwd/user-fullname string vagrant +d-i passwd/user-uid string 900 +d-i passwd/user-password password vagrant +d-i passwd/user-password-again password vagrant +d-i passwd/username string vagrant +d-i pkgsel/include string openssh-server sudo bzip2 acpid cryptsetup zlib1g-dev wget curl dkms make +d-i pkgsel/install-language-support boolean false +d-i pkgsel/update-policy select unattended-upgrades +d-i pkgsel/upgrade select full-upgrade +# Prevent packaged version of VirtualBox Guest Additions being installed: +d-i preseed/early_command string sed -i \ + '/in-target/idiscover(){/sbin/discover|grep -v VirtualBox;}' \ + /usr/lib/pre-pkgsel.d/20install-hwpackages +d-i time/zone string UTC +d-i user-setup/allow-password-weak boolean true +d-i user-setup/encrypt-home boolean false +d-i preseed/late_command string sed -i '/^deb cdrom:/s/^/#/' /target/etc/apt/sources.list +apt-cdrom-setup apt-setup/cdrom/set-first boolean false +apt-mirror-setup apt-setup/use_mirror boolean true +popularity-contest popularity-contest/participate boolean false +tasksel tasksel/first multiselect standard, ubuntu-server From e464b25ac1e4d6b3182ee9505ad3372d4a33865e Mon Sep 17 00:00:00 2001 From: Seth Chisamore <schisamo@opscode.com> Date: Wed, 28 Aug 2013 15:56:18 -0400 Subject: [PATCH 0068/1622] [BENTO-13] ensure `kudzu` is uninstalled on CentOS boxes By default Vagrant uses a DNS proxy in it's NAT networking mode. This effectively shields the guest VM from DNS changes on the host. It also has the nice side effect of nuking hard coded `nameserver` values left over in `/etc/resolv.conf` from base box authoring time. The `kudzu` autoconfig service blocks this behavior though and does not allow `/sbin/dhclient-script` to add the DNS proxy server value to `/etc/resolv.conf`. SIDE COMMENTARY - `kudzu` is a POS and was removed in CentOS 6+. --- definitions/.centos/cleanup.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/definitions/.centos/cleanup.sh b/definitions/.centos/cleanup.sh index 922c3d6b5..19e473a9f 100644 --- a/definitions/.centos/cleanup.sh +++ b/definitions/.centos/cleanup.sh @@ -1,5 +1,5 @@ #!/bin/bash -eux -yum -y erase gtk2 libX11 hicolor-icon-theme avahi freetype bitstream-vera-fonts +yum -y erase gtk2 libX11 hicolor-icon-theme avahi freetype bitstream-vera-fonts kudzu yum -y clean all rm -rf VBoxGuestAdditions_*.iso VBoxGuestAdditions_*.iso.? rm -f /tmp/chef*rpm From eb6614b1071d4cd4d117af3b31aae8ca33c6dd12 Mon Sep 17 00:00:00 2001 From: Seth Chisamore <schisamo@opscode.com> Date: Wed, 28 Aug 2013 17:43:27 -0400 Subject: [PATCH 0069/1622] CentOS 5.9 cleanup.sh scripts should be symlink to .centos/cleanup.sh --- definitions/centos-5.9-i386/cleanup.sh | 6 +----- definitions/centos-5.9/cleanup.sh | 6 +----- 2 files changed, 2 insertions(+), 10 deletions(-) mode change 100644 => 120000 definitions/centos-5.9-i386/cleanup.sh mode change 100644 => 120000 definitions/centos-5.9/cleanup.sh diff --git a/definitions/centos-5.9-i386/cleanup.sh b/definitions/centos-5.9-i386/cleanup.sh deleted file mode 100644 index 922c3d6b5..000000000 --- a/definitions/centos-5.9-i386/cleanup.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/bash -eux -yum -y erase gtk2 libX11 hicolor-icon-theme avahi freetype bitstream-vera-fonts -yum -y clean all -rm -rf VBoxGuestAdditions_*.iso VBoxGuestAdditions_*.iso.? -rm -f /tmp/chef*rpm diff --git a/definitions/centos-5.9-i386/cleanup.sh b/definitions/centos-5.9-i386/cleanup.sh new file mode 120000 index 000000000..4658a8585 --- /dev/null +++ b/definitions/centos-5.9-i386/cleanup.sh @@ -0,0 +1 @@ +../.centos/cleanup.sh \ No newline at end of file diff --git a/definitions/centos-5.9/cleanup.sh b/definitions/centos-5.9/cleanup.sh deleted file mode 100644 index 922c3d6b5..000000000 --- a/definitions/centos-5.9/cleanup.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/bash -eux -yum -y erase gtk2 libX11 hicolor-icon-theme avahi freetype bitstream-vera-fonts -yum -y clean all -rm -rf VBoxGuestAdditions_*.iso VBoxGuestAdditions_*.iso.? -rm -f /tmp/chef*rpm diff --git a/definitions/centos-5.9/cleanup.sh b/definitions/centos-5.9/cleanup.sh new file mode 120000 index 000000000..4658a8585 --- /dev/null +++ b/definitions/centos-5.9/cleanup.sh @@ -0,0 +1 @@ +../.centos/cleanup.sh \ No newline at end of file From 033b1b450c433f04d7cf988f360d61ef2d416c6f Mon Sep 17 00:00:00 2001 From: "Julian C. Dunn" <jdunn@opscode.com> Date: Thu, 29 Aug 2013 00:03:10 -0400 Subject: [PATCH 0070/1622] Bump to Vagrant 1.2.7 --- Gemfile | 2 +- Gemfile.lock | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/Gemfile b/Gemfile index 689833d52..ca0c901b1 100644 --- a/Gemfile +++ b/Gemfile @@ -1,6 +1,6 @@ source "https://rubygems.org" -gem "vagrant", :git => 'https://github.com/mitchellh/vagrant.git', :tag => 'v1.2.2' +gem "vagrant", :git => 'https://github.com/mitchellh/vagrant.git', :tag => 'v1.2.7' gem "veewee", :git => 'https://github.com/jedi4ever/veewee.git', :ref => '4e5d50de48' gem "vagrant-windows", "~> 1.0.0" # still not working with Vagrant 1.2 btw gem "em-winrm" # for windows! diff --git a/Gemfile.lock b/Gemfile.lock index 21d514cfe..0f0b64458 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -20,14 +20,13 @@ GIT GIT remote: https://github.com/mitchellh/vagrant.git - revision: 7e400d00a3c5a0fdf2809c8b5001a035415a607b - tag: v1.2.2 + revision: 7ec0ee1d00a916f80b109a298bab08e391945243 + tag: v1.2.7 specs: - vagrant (1.2.2) + vagrant (1.2.7) childprocess (~> 0.3.7) erubis (~> 2.7.0) i18n (~> 0.6.0) - json (>= 1.5.1, < 1.8.0) log4r (~> 1.1.9) net-scp (~> 1.1.0) net-ssh (~> 2.6.6) From 607e0b2e761dd8b00587a0b94ccc275b33f272fe Mon Sep 17 00:00:00 2001 From: "Julian C. Dunn" <jdunn@opscode.com> Date: Thu, 29 Aug 2013 00:33:20 -0400 Subject: [PATCH 0071/1622] Import same fix from PR#72 to i386 box. i386 gets no love! --- definitions/debian-7.1.0-i386/preseed.cfg | 49 ++++++++++++++++++++++- 1 file changed, 48 insertions(+), 1 deletion(-) mode change 120000 => 100644 definitions/debian-7.1.0-i386/preseed.cfg diff --git a/definitions/debian-7.1.0-i386/preseed.cfg b/definitions/debian-7.1.0-i386/preseed.cfg deleted file mode 120000 index 29478e94f..000000000 --- a/definitions/debian-7.1.0-i386/preseed.cfg +++ /dev/null @@ -1 +0,0 @@ -../.debian/preseed.cfg \ No newline at end of file diff --git a/definitions/debian-7.1.0-i386/preseed.cfg b/definitions/debian-7.1.0-i386/preseed.cfg new file mode 100644 index 000000000..12257db86 --- /dev/null +++ b/definitions/debian-7.1.0-i386/preseed.cfg @@ -0,0 +1,48 @@ +choose-mirror-bin mirror/http/proxy string +d-i apt-setup/use_mirror boolean true +d-i base-installer/kernel/override-image string linux-server +d-i clock-setup/utc boolean true +d-i clock-setup/utc-auto boolean true +d-i finish-install/reboot_in_progress note +d-i grub-installer/only_debian boolean true +d-i grub-installer/with_other_os boolean true +d-i keymap select us +d-i mirror/country string manual +d-i mirror/http/directory string /debian +d-i mirror/http/hostname string mirrors.kernel.org +d-i mirror/http/proxy string +d-i partman-auto-lvm/guided_size string max +d-i partman-auto/choose_recipe select atomic +d-i partman-auto/method string lvm +d-i partman-lvm/confirm boolean true +d-i partman-lvm/confirm boolean true +d-i partman-lvm/confirm_nooverwrite boolean true +d-i partman-lvm/device_remove_lvm boolean true +d-i partman/choose_partition select finish +d-i partman/confirm boolean true +d-i partman/confirm_nooverwrite boolean true +d-i partman/confirm_write_new_label boolean true +d-i passwd/root-login boolean false +d-i passwd/root-password-again password vagrant +d-i passwd/root-password password vagrant +d-i passwd/user-fullname string vagrant +d-i passwd/user-uid string 900 +d-i passwd/user-password password vagrant +d-i passwd/user-password-again password vagrant +d-i passwd/username string vagrant +d-i pkgsel/include string openssh-server sudo bzip2 acpid cryptsetup zlib1g-dev wget curl dkms make +d-i pkgsel/install-language-support boolean false +d-i pkgsel/update-policy select unattended-upgrades +d-i pkgsel/upgrade select full-upgrade +# Prevent packaged version of VirtualBox Guest Additions being installed: +d-i preseed/early_command string sed -i \ + '/in-target/idiscover(){/sbin/discover|grep -v VirtualBox;}' \ + /usr/lib/pre-pkgsel.d/20install-hwpackages +d-i time/zone string UTC +d-i user-setup/allow-password-weak boolean true +d-i user-setup/encrypt-home boolean false +d-i preseed/late_command string sed -i '/^deb cdrom:/s/^/#/' /target/etc/apt/sources.list +apt-cdrom-setup apt-setup/cdrom/set-first boolean false +apt-mirror-setup apt-setup/use_mirror boolean true +popularity-contest popularity-contest/participate boolean false +tasksel tasksel/first multiselect standard, ubuntu-server From 7e4892b416e2cccf2f4c9b4848e19732cf0da5dd Mon Sep 17 00:00:00 2001 From: "Julian C. Dunn" <jdunn@opscode.com> Date: Thu, 29 Aug 2013 00:49:15 -0400 Subject: [PATCH 0072/1622] Added Fedora 19 to list of documented boxes. --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 956363f56..ad978c576 100644 --- a/README.md +++ b/README.md @@ -21,6 +21,7 @@ Vagrant can be instructed to install Chef at runtime using the * [opscode-centos-6.4](https://opscode-vm-bento.s3.amazonaws.com/vagrant/opscode_centos-6.4_provisionerless.box) * [opscode-debian-7.1.0](https://opscode-vm-bento.s3.amazonaws.com/vagrant/opscode_debian-7.1.0_provisionerless.box) * [opscode-fedora-18](https://opscode-vm-bento.s3.amazonaws.com/vagrant/opscode-fedora-18_provisionerless.box) +* [opscode-fedora-19](https://opscode-vm-bento.s3.amazonaws.com/vagrant/opscode-fedora-19_provisionerless.box) * [opscode-ubuntu-10.04](https://opscode-vm-bento.s3.amazonaws.com/vagrant/opscode_ubuntu-10.04_provisionerless.box) * [opscode-ubuntu-12.04](https://opscode-vm-bento.s3.amazonaws.com/vagrant/opscode_ubuntu-12.04_provisionerless.box) * [opscode-ubuntu-13.04](https://opscode-vm-bento.s3.amazonaws.com/vagrant/opscode_ubuntu-13.04_provisionerless.box) From 4e17f1dcc48dab86b92a9839417770d97a3232e0 Mon Sep 17 00:00:00 2001 From: "Julian C. Dunn" <jdunn@opscode.com> Date: Tue, 24 Sep 2013 00:58:07 -0400 Subject: [PATCH 0073/1622] Updated to vagrant-windows that works under Vagrant 1.2 and 1.3 --- Gemfile | 2 +- Gemfile.lock | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/Gemfile b/Gemfile index ca0c901b1..be2c8bb73 100644 --- a/Gemfile +++ b/Gemfile @@ -2,6 +2,6 @@ source "https://rubygems.org" gem "vagrant", :git => 'https://github.com/mitchellh/vagrant.git', :tag => 'v1.2.7' gem "veewee", :git => 'https://github.com/jedi4ever/veewee.git', :ref => '4e5d50de48' -gem "vagrant-windows", "~> 1.0.0" # still not working with Vagrant 1.2 btw +gem "vagrant-windows", "~> 1.2.1" gem "em-winrm" # for windows! gem "rake" diff --git a/Gemfile.lock b/Gemfile.lock index 0f0b64458..9252b27e4 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -115,8 +115,7 @@ GEM wasabi (~> 1.0) thor (0.18.1) uuidtools (2.1.3) - vagrant-windows (1.0.1) - highline + vagrant-windows (1.2.1) winrm (~> 1.1.1) wasabi (1.0.0) nokogiri (>= 1.4.0) @@ -136,5 +135,5 @@ DEPENDENCIES em-winrm rake vagrant! - vagrant-windows (~> 1.0.0) + vagrant-windows (~> 1.2.1) veewee! From aa9fa6b74f5a2bf28a29a81f7e480fc063393a9b Mon Sep 17 00:00:00 2001 From: "Julian C. Dunn" <jdunn@opscode.com> Date: Tue, 24 Sep 2013 11:33:49 -0400 Subject: [PATCH 0074/1622] [BENTO-84] Update definitions to 12.04.3 --- definitions/ubuntu-12.04-i386/definition.rb | 4 ++-- definitions/ubuntu-12.04/definition.rb | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/definitions/ubuntu-12.04-i386/definition.rb b/definitions/ubuntu-12.04-i386/definition.rb index 6eca9d23f..23ededc85 100644 --- a/definitions/ubuntu-12.04-i386/definition.rb +++ b/definitions/ubuntu-12.04-i386/definition.rb @@ -1,11 +1,11 @@ require File.dirname(__FILE__) + "/../.ubuntu/session.rb" -iso = "ubuntu-12.04.2-server-i386.iso" +iso = "ubuntu-12.04.3-server-i386.iso" session = UBUNTU_SESSION.merge( :os_type_id => 'Ubuntu', :iso_file => iso, - :iso_md5 => "7d186655efe871ea1a1492faf635beee", + :iso_md5 => "e7917ff0543d8248d00ffb166def849e", :iso_src => "http://releases.ubuntu.com/12.04/#{iso}" ) Veewee::Session.declare session diff --git a/definitions/ubuntu-12.04/definition.rb b/definitions/ubuntu-12.04/definition.rb index 3dba1db50..32e3229ec 100644 --- a/definitions/ubuntu-12.04/definition.rb +++ b/definitions/ubuntu-12.04/definition.rb @@ -1,10 +1,10 @@ require File.dirname(__FILE__) + "/../.ubuntu/session.rb" -iso = "ubuntu-12.04.2-server-amd64.iso" +iso = "ubuntu-12.04.3-server-amd64.iso" session = UBUNTU_SESSION.merge( :iso_file => iso, - :iso_md5 => "af5f788aee1b32c4b2634734309cc9e9", + :iso_md5 => "2cbe868812a871242cdcdd8f2fd6feb9", :iso_src => "http://releases.ubuntu.com/12.04/#{iso}" ) Veewee::Session.declare session From 9ad721e0a81a96d787bef3b76c4010110df20d7e Mon Sep 17 00:00:00 2001 From: Tom Duffield <tom@opscode.com> Date: Mon, 30 Sep 2013 10:53:23 -0500 Subject: [PATCH 0075/1622] adding packer support --- .gitignore | 6 + README.md | 11 +- Thorfile | 62 + definitions/.debian/sudoers.sh | 2 +- definitions/convert-to-packer-templates.rb | 31 + packer/centos-5.9-i386.json | 83 + packer/centos-5.9-x86_64.json | 83 + packer/centos-6.4-i386.json | 83 + packer/centos-6.4-x86_64.json | 83 + packer/debian-6.0.7-amd64.json | 113 + packer/debian-6.0.7-i386.json | 113 + packer/debian-7.1.0-amd64.json | 113 + packer/debian-7.1.0-i386.json | 113 + packer/fedora-18-i386.json | 90 + packer/fedora-18-x86_64.json | 90 + packer/fedora-19-i386.json | 88 + packer/fedora-19-x86_64.json | 88 + packer/fedora-20-i386.json | 88 + packer/fedora-20-x86_64.json | 88 + packer/http/centos-5.9/ks.cfg | 39 + packer/http/centos-6.4/ks.cfg | 39 + packer/http/debian-6.0.7/preseed.cfg | 47 + packer/http/debian-7.1.0/preseed.cfg | 48 + packer/http/fedora-18/ks.cfg | 51 + packer/http/fedora-19/ks.cfg | 51 + packer/http/fedora-20/ks.cfg | 51 + packer/http/ubuntu-10.04/preseed.cfg | 31 + packer/http/ubuntu-10.10/preseed.cfg | 31 + packer/http/ubuntu-12.04/preseed.cfg | 31 + packer/http/ubuntu-12.10/preseed.cfg | 31 + packer/http/ubuntu-13.04/preseed.cfg | 31 + packer/scripts/centos/cleanup.sh | 5 + packer/scripts/centos/ks.cfg | 39 + packer/scripts/common/chef.sh | 3 + packer/scripts/common/minimize.sh | 7 + packer/scripts/common/shutdown.sh | 1 + packer/scripts/common/sshd.sh | 3 + packer/scripts/common/sudoers.sh | 4 + packer/scripts/common/vagrant.sh | 8 + packer/scripts/common/vmtools.sh | 27 + packer/scripts/debian/cleanup.sh | 6 + packer/scripts/debian/networking.sh | 7 + packer/scripts/debian/preseed.cfg | 47 + packer/scripts/debian/sudoers.sh | 7 + packer/scripts/debian/update.sh | 4 + packer/scripts/fedora/cleanup.sh | 4 + packer/scripts/fedora/ks.cfg | 50 + packer/scripts/fedora/shutdown.sh | 1 + packer/scripts/fedora/sudoers.sh | 4 + packer/scripts/suse/sudoers.sh | 3 + packer/scripts/ubuntu/cleanup.sh | 6 + packer/scripts/ubuntu/networking.sh | 7 + packer/scripts/ubuntu/preseed.cfg | 31 + packer/scripts/ubuntu/sudoers.sh | 4 + packer/scripts/ubuntu/update.sh | 15 + packer/scripts/windows/install-chef.bat | 47 + packer/scripts/windows/install-vbox.bat | 4 + packer/scripts/windows/mount-validation.bat | 3 + packer/scripts/windows/oracle-cert.cer | Bin 0 -> 1398 bytes packer/ubuntu-10.04-amd64.json | 134 + packer/ubuntu-10.04-i386.json | 135 + packer/ubuntu-12.04-amd64.json | 135 + packer/ubuntu-12.04-i386.json | 135 + packer/ubuntu-12.10-amd64.json | 135 + packer/ubuntu-12.10-i386.json | 135 + packer/ubuntu-13.04-amd64.json | 136 + packer/ubuntu-13.04-i386.json | 135 + templates/.centos/cleanup.sh | 5 + templates/.centos/ks.cfg | 39 + templates/.common/chef_omnibus.sh | 261 ++ templates/.common/minimize.sh | 4 + templates/.common/sshd.sh | 3 + templates/.common/sudoers.sh | 4 + templates/.common/vagrant.sh | 34 + templates/.debian/cleanup.sh | 6 + templates/.debian/networking.sh | 7 + templates/.debian/preseed.cfg | 47 + templates/.debian/sudoers.sh | 4 + templates/.debian/update.sh | 4 + templates/.fedora/cleanup.sh | 4 + templates/.fedora/ks.cfg | 50 + templates/.suse/sudoers.sh | 3 + templates/.ubuntu/cleanup.sh | 6 + templates/.ubuntu/networking.sh | 7 + templates/.ubuntu/preseed.cfg | 31 + templates/.ubuntu/sudoers.sh | 4 + templates/.ubuntu/update.sh | 15 + templates/.windows/install-chef.bat | 47 + templates/.windows/install-vbox.bat | 4 + templates/.windows/mount-validation.bat | 3 + templates/.windows/oracle-cert.cer | Bin 0 -> 1398 bytes templates/centos-5.5-i386/http/ks.cfg | 39 + templates/centos-5.5-i386/scripts/cleanup.sh | 5 + templates/centos-5.5-i386/scripts/minimize.sh | 4 + templates/centos-5.5-i386/scripts/sshd.sh | 3 + templates/centos-5.5-i386/scripts/vagrant.sh | 33 + templates/centos-5.5-i386/template.json | 88 + templates/centos-5.5/http/ks.cfg | 39 + templates/centos-5.5/scripts/cleanup.sh | 5 + templates/centos-5.5/scripts/minimize.sh | 4 + templates/centos-5.5/scripts/sshd.sh | 3 + templates/centos-5.5/scripts/vagrant.sh | 33 + templates/centos-5.5/template.json | 88 + templates/centos-5.6/http/ks.cfg | 39 + templates/centos-5.6/scripts/cleanup.sh | 5 + templates/centos-5.6/scripts/minimize.sh | 4 + templates/centos-5.6/scripts/sshd.sh | 3 + templates/centos-5.6/scripts/vagrant.sh | 33 + templates/centos-5.6/template.json | 88 + templates/centos-5.7/http/ks.cfg | 39 + templates/centos-5.7/scripts/cleanup.sh | 5 + templates/centos-5.7/scripts/minimize.sh | 4 + templates/centos-5.7/scripts/sshd.sh | 3 + templates/centos-5.7/scripts/vagrant.sh | 33 + templates/centos-5.7/template.json | 88 + templates/centos-5.8-i386/http/ks.cfg | 39 + templates/centos-5.8-i386/scripts/cleanup.sh | 5 + templates/centos-5.8-i386/scripts/minimize.sh | 4 + templates/centos-5.8-i386/scripts/sshd.sh | 3 + templates/centos-5.8-i386/scripts/vagrant.sh | 33 + templates/centos-5.8-i386/template.json | 88 + templates/centos-5.8/http/ks.cfg | 39 + templates/centos-5.8/scripts/cleanup.sh | 5 + templates/centos-5.8/scripts/minimize.sh | 4 + templates/centos-5.8/scripts/sshd.sh | 3 + templates/centos-5.8/scripts/vagrant.sh | 33 + templates/centos-5.8/template.json | 88 + templates/centos-5.9-i386/http/ks.cfg | 39 + templates/centos-5.9-i386/scripts/cleanup.sh | 5 + templates/centos-5.9-i386/scripts/minimize.sh | 4 + templates/centos-5.9-i386/scripts/sshd.sh | 3 + templates/centos-5.9-i386/scripts/vagrant.sh | 17 + templates/centos-5.9-i386/template.json | 88 + templates/centos-5.9/http/ks.cfg | 39 + templates/centos-5.9/scripts/cleanup.sh | 5 + templates/centos-5.9/scripts/minimize.sh | 4 + templates/centos-5.9/scripts/sshd.sh | 3 + templates/centos-5.9/scripts/vagrant.sh | 17 + templates/centos-5.9/template.json | 88 + templates/centos-6.0/http/ks.cfg | 39 + templates/centos-6.0/scripts/cleanup.sh | 5 + templates/centos-6.0/scripts/minimize.sh | 4 + templates/centos-6.0/scripts/sshd.sh | 3 + templates/centos-6.0/scripts/vagrant.sh | 33 + templates/centos-6.0/template.json | 88 + templates/centos-6.2-i386/http/ks.cfg | 39 + templates/centos-6.2-i386/scripts/cleanup.sh | 5 + templates/centos-6.2-i386/scripts/minimize.sh | 4 + templates/centos-6.2-i386/scripts/sshd.sh | 3 + templates/centos-6.2-i386/scripts/vagrant.sh | 33 + templates/centos-6.2-i386/template.json | 88 + templates/centos-6.2/http/ks.cfg | 39 + templates/centos-6.2/scripts/cleanup.sh | 5 + templates/centos-6.2/scripts/minimize.sh | 4 + templates/centos-6.2/scripts/sshd.sh | 3 + templates/centos-6.2/scripts/vagrant.sh | 33 + templates/centos-6.2/template.json | 88 + templates/centos-6.3-i386/http/ks.cfg | 39 + templates/centos-6.3-i386/scripts/cleanup.sh | 5 + templates/centos-6.3-i386/scripts/minimize.sh | 4 + templates/centos-6.3-i386/scripts/sshd.sh | 3 + templates/centos-6.3-i386/scripts/vagrant.sh | 33 + templates/centos-6.3-i386/template.json | 88 + templates/centos-6.3/http/ks.cfg | 39 + templates/centos-6.3/scripts/cleanup.sh | 5 + templates/centos-6.3/scripts/minimize.sh | 4 + templates/centos-6.3/scripts/sshd.sh | 3 + templates/centos-6.3/scripts/vagrant.sh | 33 + templates/centos-6.3/template.json | 88 + templates/centos-6.4-i386/http/ks.cfg | 39 + templates/centos-6.4-i386/scripts/cleanup.sh | 5 + templates/centos-6.4-i386/scripts/minimize.sh | 4 + templates/centos-6.4-i386/scripts/sshd.sh | 3 + templates/centos-6.4-i386/scripts/vagrant.sh | 33 + templates/centos-6.4-i386/template.json | 88 + templates/centos-6.4/http/ks.cfg | 39 + templates/centos-6.4/scripts/cleanup.sh | 5 + templates/centos-6.4/scripts/minimize.sh | 4 + templates/centos-6.4/scripts/sshd.sh | 3 + templates/centos-6.4/scripts/vagrant.sh | 33 + templates/centos-6.4/template.json | 88 + templates/debian-6.0.7-i386/http/preseed.cfg | 47 + .../debian-6.0.7-i386/scripts/cleanup.sh | 6 + .../debian-6.0.7-i386/scripts/minimize.sh | 4 + .../debian-6.0.7-i386/scripts/networking.sh | 7 + templates/debian-6.0.7-i386/scripts/sshd.sh | 3 + .../debian-6.0.7-i386/scripts/sudoers.sh | 4 + templates/debian-6.0.7-i386/scripts/update.sh | 4 + .../debian-6.0.7-i386/scripts/vagrant.sh | 33 + templates/debian-6.0.7-i386/template.json | 119 + templates/debian-6.0.7/http/preseed.cfg | 47 + templates/debian-6.0.7/scripts/cleanup.sh | 6 + templates/debian-6.0.7/scripts/minimize.sh | 4 + templates/debian-6.0.7/scripts/networking.sh | 7 + templates/debian-6.0.7/scripts/sshd.sh | 3 + templates/debian-6.0.7/scripts/sudoers.sh | 4 + templates/debian-6.0.7/scripts/update.sh | 4 + templates/debian-6.0.7/scripts/vagrant.sh | 33 + templates/debian-6.0.7/template.json | 119 + templates/debian-7.1.0-i386/http/preseed.cfg | 47 + .../debian-7.1.0-i386/scripts/cleanup.sh | 6 + .../debian-7.1.0-i386/scripts/minimize.sh | 4 + .../debian-7.1.0-i386/scripts/networking.sh | 7 + templates/debian-7.1.0-i386/scripts/sshd.sh | 3 + .../debian-7.1.0-i386/scripts/sudoers.sh | 4 + templates/debian-7.1.0-i386/scripts/update.sh | 4 + .../debian-7.1.0-i386/scripts/vagrant.sh | 33 + templates/debian-7.1.0-i386/template.json | 119 + templates/debian-7.1.0/http/preseed.cfg | 47 + templates/debian-7.1.0/scripts/cleanup.sh | 6 + templates/debian-7.1.0/scripts/minimize.sh | 4 + templates/debian-7.1.0/scripts/networking.sh | 7 + templates/debian-7.1.0/scripts/sshd.sh | 3 + templates/debian-7.1.0/scripts/sudoers.sh | 4 + templates/debian-7.1.0/scripts/update.sh | 4 + templates/debian-7.1.0/scripts/vagrant.sh | 33 + templates/debian-7.1.0/template.json | 119 + templates/fedora-18/http/ks.cfg | 50 + templates/fedora-18/scripts/cleanup.sh | 4 + templates/fedora-18/scripts/minimize.sh | 4 + templates/fedora-18/scripts/sshd.sh | 3 + templates/fedora-18/scripts/vagrant.sh | 33 + templates/fedora-18/template.json | 88 + templates/fedora-19/http/ks.cfg | 50 + templates/fedora-19/scripts/cleanup.sh | 4 + templates/fedora-19/scripts/minimize.sh | 4 + templates/fedora-19/scripts/sshd.sh | 3 + templates/fedora-19/scripts/vagrant.sh | 33 + templates/fedora-19/template.json | 88 + templates/sles-11-sp2-i386/http/autoinst.xml | 2569 +++++++++++++++++ templates/sles-11-sp2-i386/scripts/cleanup.sh | 9 + .../sles-11-sp2-i386/scripts/minimize.sh | 4 + templates/sles-11-sp2-i386/scripts/sshd.sh | 3 + templates/sles-11-sp2-i386/scripts/sudoers.sh | 3 + templates/sles-11-sp2-i386/scripts/vagrant.sh | 33 + templates/sles-11-sp2-i386/template.json | 97 + templates/sles-11-sp2/http/autoinst.xml | 2569 +++++++++++++++++ templates/sles-11-sp2/scripts/cleanup.sh | 9 + templates/sles-11-sp2/scripts/minimize.sh | 4 + templates/sles-11-sp2/scripts/sshd.sh | 3 + templates/sles-11-sp2/scripts/sudoers.sh | 3 + templates/sles-11-sp2/scripts/vagrant.sh | 33 + templates/sles-11-sp2/template.json | 97 + templates/sles-11-sp3-i386/http/autoinst.xml | 2569 +++++++++++++++++ templates/sles-11-sp3-i386/scripts/cleanup.sh | 9 + .../sles-11-sp3-i386/scripts/minimize.sh | 4 + templates/sles-11-sp3-i386/scripts/sshd.sh | 3 + templates/sles-11-sp3-i386/scripts/sudoers.sh | 3 + templates/sles-11-sp3-i386/scripts/vagrant.sh | 33 + templates/sles-11-sp3-i386/template.json | 97 + templates/sles-11-sp3/http/autoinst.xml | 2569 +++++++++++++++++ templates/sles-11-sp3/scripts/cleanup.sh | 9 + templates/sles-11-sp3/scripts/minimize.sh | 4 + templates/sles-11-sp3/scripts/sshd.sh | 3 + templates/sles-11-sp3/scripts/sudoers.sh | 3 + templates/sles-11-sp3/scripts/vagrant.sh | 33 + templates/sles-11-sp3/template.json | 97 + templates/ubuntu-10.04-i386/http/preseed.cfg | 31 + .../ubuntu-10.04-i386/scripts/cleanup.sh | 6 + .../ubuntu-10.04-i386/scripts/minimize.sh | 4 + .../ubuntu-10.04-i386/scripts/networking.sh | 7 + templates/ubuntu-10.04-i386/scripts/sshd.sh | 3 + .../ubuntu-10.04-i386/scripts/sudoers.sh | 4 + templates/ubuntu-10.04-i386/scripts/update.sh | 15 + .../ubuntu-10.04-i386/scripts/vagrant.sh | 33 + templates/ubuntu-10.04-i386/template.json | 133 + templates/ubuntu-10.04/http/preseed.cfg | 31 + templates/ubuntu-10.04/scripts/cleanup.sh | 6 + templates/ubuntu-10.04/scripts/minimize.sh | 4 + templates/ubuntu-10.04/scripts/networking.sh | 7 + templates/ubuntu-10.04/scripts/sshd.sh | 3 + templates/ubuntu-10.04/scripts/sudoers.sh | 4 + templates/ubuntu-10.04/scripts/update.sh | 15 + templates/ubuntu-10.04/scripts/vagrant.sh | 33 + templates/ubuntu-10.04/template.json | 194 ++ templates/ubuntu-10.10/http/preseed.cfg | 31 + templates/ubuntu-10.10/scripts/cleanup.sh | 6 + templates/ubuntu-10.10/scripts/minimize.sh | 4 + templates/ubuntu-10.10/scripts/networking.sh | 7 + templates/ubuntu-10.10/scripts/sshd.sh | 3 + templates/ubuntu-10.10/scripts/sudoers.sh | 4 + templates/ubuntu-10.10/scripts/update.sh | 15 + templates/ubuntu-10.10/scripts/vagrant.sh | 33 + templates/ubuntu-10.10/template.json | 133 + templates/ubuntu-11.04/http/preseed.cfg | 31 + templates/ubuntu-11.04/scripts/cleanup.sh | 6 + templates/ubuntu-11.04/scripts/minimize.sh | 4 + templates/ubuntu-11.04/scripts/networking.sh | 7 + templates/ubuntu-11.04/scripts/sshd.sh | 3 + templates/ubuntu-11.04/scripts/sudoers.sh | 4 + templates/ubuntu-11.04/scripts/update.sh | 15 + templates/ubuntu-11.04/scripts/vagrant.sh | 33 + templates/ubuntu-11.04/template.json | 133 + templates/ubuntu-11.10/http/preseed.cfg | 31 + templates/ubuntu-11.10/scripts/cleanup.sh | 6 + templates/ubuntu-11.10/scripts/minimize.sh | 4 + templates/ubuntu-11.10/scripts/networking.sh | 7 + templates/ubuntu-11.10/scripts/sshd.sh | 3 + templates/ubuntu-11.10/scripts/sudoers.sh | 4 + templates/ubuntu-11.10/scripts/update.sh | 15 + templates/ubuntu-11.10/scripts/vagrant.sh | 33 + templates/ubuntu-11.10/template.json | 133 + templates/ubuntu-12.04-i386/http/preseed.cfg | 31 + .../ubuntu-12.04-i386/scripts/cleanup.sh | 6 + .../ubuntu-12.04-i386/scripts/minimize.sh | 4 + .../ubuntu-12.04-i386/scripts/networking.sh | 7 + templates/ubuntu-12.04-i386/scripts/sshd.sh | 3 + .../ubuntu-12.04-i386/scripts/sudoers.sh | 4 + templates/ubuntu-12.04-i386/scripts/update.sh | 15 + .../ubuntu-12.04-i386/scripts/vagrant.sh | 33 + templates/ubuntu-12.04-i386/template.json | 133 + templates/ubuntu-12.04/http/preseed.cfg | 31 + templates/ubuntu-12.04/new.json | 77 + templates/ubuntu-12.04/scripts/sudoers.sh | 4 + templates/ubuntu-12.04/template.json | 135 + templates/ubuntu-12.10-i386/http/preseed.cfg | 31 + .../ubuntu-12.10-i386/scripts/cleanup.sh | 6 + .../ubuntu-12.10-i386/scripts/minimize.sh | 4 + .../ubuntu-12.10-i386/scripts/networking.sh | 7 + templates/ubuntu-12.10-i386/scripts/sshd.sh | 3 + .../ubuntu-12.10-i386/scripts/sudoers.sh | 4 + templates/ubuntu-12.10-i386/scripts/update.sh | 15 + .../ubuntu-12.10-i386/scripts/vagrant.sh | 33 + templates/ubuntu-12.10-i386/template.json | 133 + templates/ubuntu-12.10/http/preseed.cfg | 31 + templates/ubuntu-12.10/scripts/cleanup.sh | 6 + templates/ubuntu-12.10/scripts/minimize.sh | 4 + templates/ubuntu-12.10/scripts/networking.sh | 7 + templates/ubuntu-12.10/scripts/sshd.sh | 3 + templates/ubuntu-12.10/scripts/sudoers.sh | 4 + templates/ubuntu-12.10/scripts/update.sh | 15 + templates/ubuntu-12.10/scripts/vagrant.sh | 33 + templates/ubuntu-12.10/template.json | 133 + templates/ubuntu-13.04-i386/http/preseed.cfg | 31 + .../ubuntu-13.04-i386/scripts/cleanup.sh | 6 + .../ubuntu-13.04-i386/scripts/minimize.sh | 4 + .../ubuntu-13.04-i386/scripts/networking.sh | 7 + templates/ubuntu-13.04-i386/scripts/sshd.sh | 3 + .../ubuntu-13.04-i386/scripts/sudoers.sh | 4 + templates/ubuntu-13.04-i386/scripts/update.sh | 15 + .../ubuntu-13.04-i386/scripts/vagrant.sh | 33 + templates/ubuntu-13.04-i386/template.json | 133 + templates/ubuntu-13.04/http/preseed.cfg | 31 + templates/ubuntu-13.04/new.json | 135 + templates/ubuntu-13.04/scripts/cleanup.sh | 6 + templates/ubuntu-13.04/scripts/minimize.sh | 4 + templates/ubuntu-13.04/scripts/networking.sh | 7 + templates/ubuntu-13.04/scripts/sshd.sh | 3 + templates/ubuntu-13.04/scripts/sudoers.sh | 4 + templates/ubuntu-13.04/scripts/update.sh | 15 + templates/ubuntu-13.04/scripts/vagrant.sh | 33 + templates/ubuntu-13.04/template.json | 136 + 352 files changed, 21419 insertions(+), 7 deletions(-) create mode 100644 Thorfile create mode 100755 definitions/convert-to-packer-templates.rb create mode 100644 packer/centos-5.9-i386.json create mode 100644 packer/centos-5.9-x86_64.json create mode 100644 packer/centos-6.4-i386.json create mode 100644 packer/centos-6.4-x86_64.json create mode 100644 packer/debian-6.0.7-amd64.json create mode 100644 packer/debian-6.0.7-i386.json create mode 100644 packer/debian-7.1.0-amd64.json create mode 100644 packer/debian-7.1.0-i386.json create mode 100644 packer/fedora-18-i386.json create mode 100644 packer/fedora-18-x86_64.json create mode 100644 packer/fedora-19-i386.json create mode 100644 packer/fedora-19-x86_64.json create mode 100644 packer/fedora-20-i386.json create mode 100644 packer/fedora-20-x86_64.json create mode 100644 packer/http/centos-5.9/ks.cfg create mode 100644 packer/http/centos-6.4/ks.cfg create mode 100644 packer/http/debian-6.0.7/preseed.cfg create mode 100644 packer/http/debian-7.1.0/preseed.cfg create mode 100644 packer/http/fedora-18/ks.cfg create mode 100644 packer/http/fedora-19/ks.cfg create mode 100644 packer/http/fedora-20/ks.cfg create mode 100644 packer/http/ubuntu-10.04/preseed.cfg create mode 100644 packer/http/ubuntu-10.10/preseed.cfg create mode 100644 packer/http/ubuntu-12.04/preseed.cfg create mode 100644 packer/http/ubuntu-12.10/preseed.cfg create mode 100644 packer/http/ubuntu-13.04/preseed.cfg create mode 100644 packer/scripts/centos/cleanup.sh create mode 100644 packer/scripts/centos/ks.cfg create mode 100644 packer/scripts/common/chef.sh create mode 100644 packer/scripts/common/minimize.sh create mode 100644 packer/scripts/common/shutdown.sh create mode 100644 packer/scripts/common/sshd.sh create mode 100644 packer/scripts/common/sudoers.sh create mode 100644 packer/scripts/common/vagrant.sh create mode 100644 packer/scripts/common/vmtools.sh create mode 100644 packer/scripts/debian/cleanup.sh create mode 100644 packer/scripts/debian/networking.sh create mode 100644 packer/scripts/debian/preseed.cfg create mode 100644 packer/scripts/debian/sudoers.sh create mode 100644 packer/scripts/debian/update.sh create mode 100644 packer/scripts/fedora/cleanup.sh create mode 100644 packer/scripts/fedora/ks.cfg create mode 100644 packer/scripts/fedora/shutdown.sh create mode 100644 packer/scripts/fedora/sudoers.sh create mode 100644 packer/scripts/suse/sudoers.sh create mode 100644 packer/scripts/ubuntu/cleanup.sh create mode 100644 packer/scripts/ubuntu/networking.sh create mode 100644 packer/scripts/ubuntu/preseed.cfg create mode 100644 packer/scripts/ubuntu/sudoers.sh create mode 100644 packer/scripts/ubuntu/update.sh create mode 100644 packer/scripts/windows/install-chef.bat create mode 100644 packer/scripts/windows/install-vbox.bat create mode 100644 packer/scripts/windows/mount-validation.bat create mode 100644 packer/scripts/windows/oracle-cert.cer create mode 100644 packer/ubuntu-10.04-amd64.json create mode 100644 packer/ubuntu-10.04-i386.json create mode 100644 packer/ubuntu-12.04-amd64.json create mode 100644 packer/ubuntu-12.04-i386.json create mode 100644 packer/ubuntu-12.10-amd64.json create mode 100644 packer/ubuntu-12.10-i386.json create mode 100644 packer/ubuntu-13.04-amd64.json create mode 100644 packer/ubuntu-13.04-i386.json create mode 100644 templates/.centos/cleanup.sh create mode 100644 templates/.centos/ks.cfg create mode 100644 templates/.common/chef_omnibus.sh create mode 100644 templates/.common/minimize.sh create mode 100644 templates/.common/sshd.sh create mode 100644 templates/.common/sudoers.sh create mode 100644 templates/.common/vagrant.sh create mode 100644 templates/.debian/cleanup.sh create mode 100644 templates/.debian/networking.sh create mode 100644 templates/.debian/preseed.cfg create mode 100644 templates/.debian/sudoers.sh create mode 100644 templates/.debian/update.sh create mode 100644 templates/.fedora/cleanup.sh create mode 100644 templates/.fedora/ks.cfg create mode 100644 templates/.suse/sudoers.sh create mode 100644 templates/.ubuntu/cleanup.sh create mode 100644 templates/.ubuntu/networking.sh create mode 100644 templates/.ubuntu/preseed.cfg create mode 100644 templates/.ubuntu/sudoers.sh create mode 100644 templates/.ubuntu/update.sh create mode 100644 templates/.windows/install-chef.bat create mode 100644 templates/.windows/install-vbox.bat create mode 100644 templates/.windows/mount-validation.bat create mode 100644 templates/.windows/oracle-cert.cer create mode 100644 templates/centos-5.5-i386/http/ks.cfg create mode 100644 templates/centos-5.5-i386/scripts/cleanup.sh create mode 100644 templates/centos-5.5-i386/scripts/minimize.sh create mode 100644 templates/centos-5.5-i386/scripts/sshd.sh create mode 100644 templates/centos-5.5-i386/scripts/vagrant.sh create mode 100644 templates/centos-5.5-i386/template.json create mode 100644 templates/centos-5.5/http/ks.cfg create mode 100644 templates/centos-5.5/scripts/cleanup.sh create mode 100644 templates/centos-5.5/scripts/minimize.sh create mode 100644 templates/centos-5.5/scripts/sshd.sh create mode 100644 templates/centos-5.5/scripts/vagrant.sh create mode 100644 templates/centos-5.5/template.json create mode 100644 templates/centos-5.6/http/ks.cfg create mode 100644 templates/centos-5.6/scripts/cleanup.sh create mode 100644 templates/centos-5.6/scripts/minimize.sh create mode 100644 templates/centos-5.6/scripts/sshd.sh create mode 100644 templates/centos-5.6/scripts/vagrant.sh create mode 100644 templates/centos-5.6/template.json create mode 100644 templates/centos-5.7/http/ks.cfg create mode 100644 templates/centos-5.7/scripts/cleanup.sh create mode 100644 templates/centos-5.7/scripts/minimize.sh create mode 100644 templates/centos-5.7/scripts/sshd.sh create mode 100644 templates/centos-5.7/scripts/vagrant.sh create mode 100644 templates/centos-5.7/template.json create mode 100644 templates/centos-5.8-i386/http/ks.cfg create mode 100644 templates/centos-5.8-i386/scripts/cleanup.sh create mode 100644 templates/centos-5.8-i386/scripts/minimize.sh create mode 100644 templates/centos-5.8-i386/scripts/sshd.sh create mode 100644 templates/centos-5.8-i386/scripts/vagrant.sh create mode 100644 templates/centos-5.8-i386/template.json create mode 100644 templates/centos-5.8/http/ks.cfg create mode 100644 templates/centos-5.8/scripts/cleanup.sh create mode 100644 templates/centos-5.8/scripts/minimize.sh create mode 100644 templates/centos-5.8/scripts/sshd.sh create mode 100644 templates/centos-5.8/scripts/vagrant.sh create mode 100644 templates/centos-5.8/template.json create mode 100644 templates/centos-5.9-i386/http/ks.cfg create mode 100644 templates/centos-5.9-i386/scripts/cleanup.sh create mode 100644 templates/centos-5.9-i386/scripts/minimize.sh create mode 100644 templates/centos-5.9-i386/scripts/sshd.sh create mode 100644 templates/centos-5.9-i386/scripts/vagrant.sh create mode 100644 templates/centos-5.9-i386/template.json create mode 100644 templates/centos-5.9/http/ks.cfg create mode 100644 templates/centos-5.9/scripts/cleanup.sh create mode 100644 templates/centos-5.9/scripts/minimize.sh create mode 100644 templates/centos-5.9/scripts/sshd.sh create mode 100644 templates/centos-5.9/scripts/vagrant.sh create mode 100644 templates/centos-5.9/template.json create mode 100644 templates/centos-6.0/http/ks.cfg create mode 100644 templates/centos-6.0/scripts/cleanup.sh create mode 100644 templates/centos-6.0/scripts/minimize.sh create mode 100644 templates/centos-6.0/scripts/sshd.sh create mode 100644 templates/centos-6.0/scripts/vagrant.sh create mode 100644 templates/centos-6.0/template.json create mode 100644 templates/centos-6.2-i386/http/ks.cfg create mode 100644 templates/centos-6.2-i386/scripts/cleanup.sh create mode 100644 templates/centos-6.2-i386/scripts/minimize.sh create mode 100644 templates/centos-6.2-i386/scripts/sshd.sh create mode 100644 templates/centos-6.2-i386/scripts/vagrant.sh create mode 100644 templates/centos-6.2-i386/template.json create mode 100644 templates/centos-6.2/http/ks.cfg create mode 100644 templates/centos-6.2/scripts/cleanup.sh create mode 100644 templates/centos-6.2/scripts/minimize.sh create mode 100644 templates/centos-6.2/scripts/sshd.sh create mode 100644 templates/centos-6.2/scripts/vagrant.sh create mode 100644 templates/centos-6.2/template.json create mode 100644 templates/centos-6.3-i386/http/ks.cfg create mode 100644 templates/centos-6.3-i386/scripts/cleanup.sh create mode 100644 templates/centos-6.3-i386/scripts/minimize.sh create mode 100644 templates/centos-6.3-i386/scripts/sshd.sh create mode 100644 templates/centos-6.3-i386/scripts/vagrant.sh create mode 100644 templates/centos-6.3-i386/template.json create mode 100644 templates/centos-6.3/http/ks.cfg create mode 100644 templates/centos-6.3/scripts/cleanup.sh create mode 100644 templates/centos-6.3/scripts/minimize.sh create mode 100644 templates/centos-6.3/scripts/sshd.sh create mode 100644 templates/centos-6.3/scripts/vagrant.sh create mode 100644 templates/centos-6.3/template.json create mode 100644 templates/centos-6.4-i386/http/ks.cfg create mode 100644 templates/centos-6.4-i386/scripts/cleanup.sh create mode 100644 templates/centos-6.4-i386/scripts/minimize.sh create mode 100644 templates/centos-6.4-i386/scripts/sshd.sh create mode 100644 templates/centos-6.4-i386/scripts/vagrant.sh create mode 100644 templates/centos-6.4-i386/template.json create mode 100644 templates/centos-6.4/http/ks.cfg create mode 100644 templates/centos-6.4/scripts/cleanup.sh create mode 100644 templates/centos-6.4/scripts/minimize.sh create mode 100644 templates/centos-6.4/scripts/sshd.sh create mode 100644 templates/centos-6.4/scripts/vagrant.sh create mode 100644 templates/centos-6.4/template.json create mode 100644 templates/debian-6.0.7-i386/http/preseed.cfg create mode 100644 templates/debian-6.0.7-i386/scripts/cleanup.sh create mode 100644 templates/debian-6.0.7-i386/scripts/minimize.sh create mode 100644 templates/debian-6.0.7-i386/scripts/networking.sh create mode 100644 templates/debian-6.0.7-i386/scripts/sshd.sh create mode 100644 templates/debian-6.0.7-i386/scripts/sudoers.sh create mode 100644 templates/debian-6.0.7-i386/scripts/update.sh create mode 100644 templates/debian-6.0.7-i386/scripts/vagrant.sh create mode 100644 templates/debian-6.0.7-i386/template.json create mode 100644 templates/debian-6.0.7/http/preseed.cfg create mode 100644 templates/debian-6.0.7/scripts/cleanup.sh create mode 100644 templates/debian-6.0.7/scripts/minimize.sh create mode 100644 templates/debian-6.0.7/scripts/networking.sh create mode 100644 templates/debian-6.0.7/scripts/sshd.sh create mode 100644 templates/debian-6.0.7/scripts/sudoers.sh create mode 100644 templates/debian-6.0.7/scripts/update.sh create mode 100644 templates/debian-6.0.7/scripts/vagrant.sh create mode 100644 templates/debian-6.0.7/template.json create mode 100644 templates/debian-7.1.0-i386/http/preseed.cfg create mode 100644 templates/debian-7.1.0-i386/scripts/cleanup.sh create mode 100644 templates/debian-7.1.0-i386/scripts/minimize.sh create mode 100644 templates/debian-7.1.0-i386/scripts/networking.sh create mode 100644 templates/debian-7.1.0-i386/scripts/sshd.sh create mode 100644 templates/debian-7.1.0-i386/scripts/sudoers.sh create mode 100644 templates/debian-7.1.0-i386/scripts/update.sh create mode 100644 templates/debian-7.1.0-i386/scripts/vagrant.sh create mode 100644 templates/debian-7.1.0-i386/template.json create mode 100644 templates/debian-7.1.0/http/preseed.cfg create mode 100644 templates/debian-7.1.0/scripts/cleanup.sh create mode 100644 templates/debian-7.1.0/scripts/minimize.sh create mode 100644 templates/debian-7.1.0/scripts/networking.sh create mode 100644 templates/debian-7.1.0/scripts/sshd.sh create mode 100644 templates/debian-7.1.0/scripts/sudoers.sh create mode 100644 templates/debian-7.1.0/scripts/update.sh create mode 100644 templates/debian-7.1.0/scripts/vagrant.sh create mode 100644 templates/debian-7.1.0/template.json create mode 100644 templates/fedora-18/http/ks.cfg create mode 100644 templates/fedora-18/scripts/cleanup.sh create mode 100644 templates/fedora-18/scripts/minimize.sh create mode 100644 templates/fedora-18/scripts/sshd.sh create mode 100644 templates/fedora-18/scripts/vagrant.sh create mode 100644 templates/fedora-18/template.json create mode 100644 templates/fedora-19/http/ks.cfg create mode 100644 templates/fedora-19/scripts/cleanup.sh create mode 100644 templates/fedora-19/scripts/minimize.sh create mode 100644 templates/fedora-19/scripts/sshd.sh create mode 100644 templates/fedora-19/scripts/vagrant.sh create mode 100644 templates/fedora-19/template.json create mode 100644 templates/sles-11-sp2-i386/http/autoinst.xml create mode 100644 templates/sles-11-sp2-i386/scripts/cleanup.sh create mode 100644 templates/sles-11-sp2-i386/scripts/minimize.sh create mode 100644 templates/sles-11-sp2-i386/scripts/sshd.sh create mode 100644 templates/sles-11-sp2-i386/scripts/sudoers.sh create mode 100644 templates/sles-11-sp2-i386/scripts/vagrant.sh create mode 100644 templates/sles-11-sp2-i386/template.json create mode 100644 templates/sles-11-sp2/http/autoinst.xml create mode 100644 templates/sles-11-sp2/scripts/cleanup.sh create mode 100644 templates/sles-11-sp2/scripts/minimize.sh create mode 100644 templates/sles-11-sp2/scripts/sshd.sh create mode 100644 templates/sles-11-sp2/scripts/sudoers.sh create mode 100644 templates/sles-11-sp2/scripts/vagrant.sh create mode 100644 templates/sles-11-sp2/template.json create mode 100644 templates/sles-11-sp3-i386/http/autoinst.xml create mode 100644 templates/sles-11-sp3-i386/scripts/cleanup.sh create mode 100644 templates/sles-11-sp3-i386/scripts/minimize.sh create mode 100644 templates/sles-11-sp3-i386/scripts/sshd.sh create mode 100644 templates/sles-11-sp3-i386/scripts/sudoers.sh create mode 100644 templates/sles-11-sp3-i386/scripts/vagrant.sh create mode 100644 templates/sles-11-sp3-i386/template.json create mode 100644 templates/sles-11-sp3/http/autoinst.xml create mode 100644 templates/sles-11-sp3/scripts/cleanup.sh create mode 100644 templates/sles-11-sp3/scripts/minimize.sh create mode 100644 templates/sles-11-sp3/scripts/sshd.sh create mode 100644 templates/sles-11-sp3/scripts/sudoers.sh create mode 100644 templates/sles-11-sp3/scripts/vagrant.sh create mode 100644 templates/sles-11-sp3/template.json create mode 100644 templates/ubuntu-10.04-i386/http/preseed.cfg create mode 100644 templates/ubuntu-10.04-i386/scripts/cleanup.sh create mode 100644 templates/ubuntu-10.04-i386/scripts/minimize.sh create mode 100644 templates/ubuntu-10.04-i386/scripts/networking.sh create mode 100644 templates/ubuntu-10.04-i386/scripts/sshd.sh create mode 100644 templates/ubuntu-10.04-i386/scripts/sudoers.sh create mode 100644 templates/ubuntu-10.04-i386/scripts/update.sh create mode 100644 templates/ubuntu-10.04-i386/scripts/vagrant.sh create mode 100644 templates/ubuntu-10.04-i386/template.json create mode 100644 templates/ubuntu-10.04/http/preseed.cfg create mode 100644 templates/ubuntu-10.04/scripts/cleanup.sh create mode 100644 templates/ubuntu-10.04/scripts/minimize.sh create mode 100644 templates/ubuntu-10.04/scripts/networking.sh create mode 100644 templates/ubuntu-10.04/scripts/sshd.sh create mode 100644 templates/ubuntu-10.04/scripts/sudoers.sh create mode 100644 templates/ubuntu-10.04/scripts/update.sh create mode 100644 templates/ubuntu-10.04/scripts/vagrant.sh create mode 100644 templates/ubuntu-10.04/template.json create mode 100644 templates/ubuntu-10.10/http/preseed.cfg create mode 100644 templates/ubuntu-10.10/scripts/cleanup.sh create mode 100644 templates/ubuntu-10.10/scripts/minimize.sh create mode 100644 templates/ubuntu-10.10/scripts/networking.sh create mode 100644 templates/ubuntu-10.10/scripts/sshd.sh create mode 100644 templates/ubuntu-10.10/scripts/sudoers.sh create mode 100644 templates/ubuntu-10.10/scripts/update.sh create mode 100644 templates/ubuntu-10.10/scripts/vagrant.sh create mode 100644 templates/ubuntu-10.10/template.json create mode 100644 templates/ubuntu-11.04/http/preseed.cfg create mode 100644 templates/ubuntu-11.04/scripts/cleanup.sh create mode 100644 templates/ubuntu-11.04/scripts/minimize.sh create mode 100644 templates/ubuntu-11.04/scripts/networking.sh create mode 100644 templates/ubuntu-11.04/scripts/sshd.sh create mode 100644 templates/ubuntu-11.04/scripts/sudoers.sh create mode 100644 templates/ubuntu-11.04/scripts/update.sh create mode 100644 templates/ubuntu-11.04/scripts/vagrant.sh create mode 100644 templates/ubuntu-11.04/template.json create mode 100644 templates/ubuntu-11.10/http/preseed.cfg create mode 100644 templates/ubuntu-11.10/scripts/cleanup.sh create mode 100644 templates/ubuntu-11.10/scripts/minimize.sh create mode 100644 templates/ubuntu-11.10/scripts/networking.sh create mode 100644 templates/ubuntu-11.10/scripts/sshd.sh create mode 100644 templates/ubuntu-11.10/scripts/sudoers.sh create mode 100644 templates/ubuntu-11.10/scripts/update.sh create mode 100644 templates/ubuntu-11.10/scripts/vagrant.sh create mode 100644 templates/ubuntu-11.10/template.json create mode 100644 templates/ubuntu-12.04-i386/http/preseed.cfg create mode 100644 templates/ubuntu-12.04-i386/scripts/cleanup.sh create mode 100644 templates/ubuntu-12.04-i386/scripts/minimize.sh create mode 100644 templates/ubuntu-12.04-i386/scripts/networking.sh create mode 100644 templates/ubuntu-12.04-i386/scripts/sshd.sh create mode 100644 templates/ubuntu-12.04-i386/scripts/sudoers.sh create mode 100644 templates/ubuntu-12.04-i386/scripts/update.sh create mode 100644 templates/ubuntu-12.04-i386/scripts/vagrant.sh create mode 100644 templates/ubuntu-12.04-i386/template.json create mode 100644 templates/ubuntu-12.04/http/preseed.cfg create mode 100644 templates/ubuntu-12.04/new.json create mode 100644 templates/ubuntu-12.04/scripts/sudoers.sh create mode 100644 templates/ubuntu-12.04/template.json create mode 100644 templates/ubuntu-12.10-i386/http/preseed.cfg create mode 100644 templates/ubuntu-12.10-i386/scripts/cleanup.sh create mode 100644 templates/ubuntu-12.10-i386/scripts/minimize.sh create mode 100644 templates/ubuntu-12.10-i386/scripts/networking.sh create mode 100644 templates/ubuntu-12.10-i386/scripts/sshd.sh create mode 100644 templates/ubuntu-12.10-i386/scripts/sudoers.sh create mode 100644 templates/ubuntu-12.10-i386/scripts/update.sh create mode 100644 templates/ubuntu-12.10-i386/scripts/vagrant.sh create mode 100644 templates/ubuntu-12.10-i386/template.json create mode 100644 templates/ubuntu-12.10/http/preseed.cfg create mode 100644 templates/ubuntu-12.10/scripts/cleanup.sh create mode 100644 templates/ubuntu-12.10/scripts/minimize.sh create mode 100644 templates/ubuntu-12.10/scripts/networking.sh create mode 100644 templates/ubuntu-12.10/scripts/sshd.sh create mode 100644 templates/ubuntu-12.10/scripts/sudoers.sh create mode 100644 templates/ubuntu-12.10/scripts/update.sh create mode 100644 templates/ubuntu-12.10/scripts/vagrant.sh create mode 100644 templates/ubuntu-12.10/template.json create mode 100644 templates/ubuntu-13.04-i386/http/preseed.cfg create mode 100644 templates/ubuntu-13.04-i386/scripts/cleanup.sh create mode 100644 templates/ubuntu-13.04-i386/scripts/minimize.sh create mode 100644 templates/ubuntu-13.04-i386/scripts/networking.sh create mode 100644 templates/ubuntu-13.04-i386/scripts/sshd.sh create mode 100644 templates/ubuntu-13.04-i386/scripts/sudoers.sh create mode 100644 templates/ubuntu-13.04-i386/scripts/update.sh create mode 100644 templates/ubuntu-13.04-i386/scripts/vagrant.sh create mode 100644 templates/ubuntu-13.04-i386/template.json create mode 100644 templates/ubuntu-13.04/http/preseed.cfg create mode 100644 templates/ubuntu-13.04/new.json create mode 100644 templates/ubuntu-13.04/scripts/cleanup.sh create mode 100644 templates/ubuntu-13.04/scripts/minimize.sh create mode 100644 templates/ubuntu-13.04/scripts/networking.sh create mode 100644 templates/ubuntu-13.04/scripts/sshd.sh create mode 100644 templates/ubuntu-13.04/scripts/sudoers.sh create mode 100644 templates/ubuntu-13.04/scripts/update.sh create mode 100644 templates/ubuntu-13.04/scripts/vagrant.sh create mode 100644 templates/ubuntu-13.04/template.json diff --git a/.gitignore b/.gitignore index 02f8fc944..a5bd03a89 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,9 @@ bin/ iso/ *.box virtualfloppy.vfd +packer_cache/ +packer.log +vmware/ +virtualbox/ +packer.log +.DS_Store diff --git a/README.md b/README.md index ad978c576..8dc89877e 100644 --- a/README.md +++ b/README.md @@ -1,10 +1,9 @@ -Bento is a project that encapsulates -[Veewee](https://github.com/jedi4ever/veewee/) definitions for -building [Vagrant](http://vagrantup.com) baseboxes. We use these boxes -internally at Opscode for testing Hosted Chef, Private Chef and -our open source [cookbooks](http://community.opscode.com/users/Opscode). +Bento is a project that encapsulates [Packer](http://packer.io) templates for building +[Vagrant](http://vagrantup.com) baseboxes. We use these boxes internally at Opscode for +testing Hosted Chef, Private Chef and our open source [cookbooks](http://community.opscode.com/users/Opscode) -These basebox definitions are originally based on +These basebox templates were converted from [VeeWee](https://github.com/jedi4ever/veewee) +definitions originally based on [work done by Tim Dysinger](https://github.com/dysinger/basebox) to make "Don't Repeat Yourself" (DRY) modular baseboxes. Thanks Tim! diff --git a/Thorfile b/Thorfile new file mode 100644 index 000000000..c823f1b68 --- /dev/null +++ b/Thorfile @@ -0,0 +1,62 @@ +# vi: ft=ruby + +require 'bundler' +require 'thor' +require 'fileutils' +require 'timeout' + +class Packer < Thor + + desc 'validate', "Validate all the packer templates" + def validate + Dir.chdir './packer' do + templates = Dir.glob("*.json") + templates.each do |template| + puts "#{template}" + system "packer validate #{template}" + puts "\n" + end + end + end + + desc 'clean', "Description goes here" + def clean(what) + if what == "cache" + FileUtils.rm_rf(Dir.glob('./packer/packer_cache/*')) + elsif what == "boxes" + FileUtils.rm_rf(Dir.glob('./packer/*.box')) + end + end + + desc 'build', "Execute the packer builder" + option :os, :banner => "<os>", :default => "*" + option :ver, :banner => "<version>", :default => "*" + option :bits, :banner => "<bits>" + option :only, :banner => "<only>" + + + def build + Dir.chdir './packer' do + + if options[:bits] + processor = options[:bits] == "64" ? "{amd64,x86_64}" : "i386" + else + processor = "*" + end + + templates = Dir.glob("#{options[:os]}-#{options[:ver]}-#{processor}.json") + + if options[:only] + templates.each do |template| + name = template.chomp(".json").split("-") + system "packer build -only=#{name[0]}-#{name[1]}-#{name[2]}-#{options[:only]} #{template}" + end + else + templates.each do |template| + system "packer build #{template}" + end + end + end + end + +end diff --git a/definitions/.debian/sudoers.sh b/definitions/.debian/sudoers.sh index e284d8fb4..36862e097 100644 --- a/definitions/.debian/sudoers.sh +++ b/definitions/.debian/sudoers.sh @@ -1,4 +1,4 @@ #!/bin/bash -eux sed -i -e '/Defaults\s\+env_reset/a Defaults\tsecure_path="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"' /etc/sudoers -sed -i -e 's/%sudo ALL=(ALL) ALL/%sudo ALL=NOPASSWD:ALL/g' /etc/sudoers +sed -i -e 's/%sudo\tALL=(ALL:ALL) ALL/%sudo\tALL=(ALL:ALL) NOPASSWD: ALL/' /etc/sudoers diff --git a/definitions/convert-to-packer-templates.rb b/definitions/convert-to-packer-templates.rb new file mode 100755 index 000000000..ffe9d048b --- /dev/null +++ b/definitions/convert-to-packer-templates.rb @@ -0,0 +1,31 @@ +require 'json' + +# Create Vanilla Image Templates +Dir.glob("*").each { |os| + unless os == "convert.rb" || os == "packer_cache" + + puts "Converting #{os}" + `veewee-to-packer ./#{os}/definition.rb -o ../templates/#{os}` + + template = JSON.parse(File.read("../templates/#{os}/template.json")) + + # Save Provisionless Template + template["post-processors"] = [ { "type" => "vagrant", "output" => "#{os}-{{.Provider}}.box"} ] + + vanilla_image = File.open("../templates/#{os}/vanilla.json", "w") + file.write(JSON.pretty_generate(template)) + file.close + + # Save Chef-Provisioned Template + template["provisioners"].each { |provisioner| + provisioner["override"].each { |provider| + template[provisioner][provider]["execute_command"] = "echo 'vagrant'|sudo -S sh '{{.Path}}'; curl https://opscode.com/chef/install.sh | sudo bash" + } + } + template["post-processors"] = [ { "type" => "vagrant", "output" => "#{os}-{{.Provider}}-with-chef.box"} ] + + chef_image = File.open("../templates/#{os}/chef.json", "w") + file.write(JSON.pretty_generate(template)) + file.close + end +} diff --git a/packer/centos-5.9-i386.json b/packer/centos-5.9-i386.json new file mode 100644 index 000000000..34451b0a9 --- /dev/null +++ b/packer/centos-5.9-i386.json @@ -0,0 +1,83 @@ +{ + "builders": [ + { + "boot_command": [ + "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/centos-6.4/ks.cfg<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "guest_os_type": "RedHat", + "http_directory": "http", + "iso_checksum": "78f976b190ce44716eb672f71203df978474dfb4", + "iso_checksum_type": "sha1", + "iso_url": "http://mirrors.kernel.org/centos/5.9/isos/i386/CentOS-5.9-i386-bin-DVD-1of2.iso", + "shutdown_command": "echo '/sbin/halt -h -p' > shutdown.sh; echo 'vagrant'|sudo -S sh 'shutdown.sh'", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "name": "centos-5.9-i386-vbox", + "type": "virtualbox", + "vboxmanage": [ + [ + "modifyvm", + "{{.Name}}", + "--memory", + "384" + ], + [ + "modifyvm", + "{{.Name}}", + "--cpus", + "1" + ] + ], + "virtualbox_version_file": ".vbox_version" + }, + { + "boot_command": [ + "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/centos-5.9/ks.cfg<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "guest_os_type": "centos", + "http_directory": "http", + "iso_checksum": "78f976b190ce44716eb672f71203df978474dfb4", + "iso_checksum_type": "sha1", + "iso_url": "http://mirrors.kernel.org/centos/5.9/isos/i386/CentOS-5.9-i386-bin-DVD-1of2.iso", + "shutdown_command": "echo '/sbin/halt -h -p' > shutdown.sh; echo 'vagrant'|sudo -S sh 'shutdown.sh'", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "name": "centos-5.9-i386-vmware", + "type": "vmware", + "vmx_data": { + "cpuid.coresPerSocket": "1", + "memsize": "384", + "numvcpus": "1" + } + } + ], + "post-processors": [ + { + "output": "centos-5.9-i386-{{.Provider}}.box", + "type": "vagrant" + } + ], + "provisioners": [ + { + "execute_command": "echo 'vagrant' | sudo -S bash '{{.Path}}'", + "scripts": [ + "scripts/common/vagrant.sh", + "scripts/common/sshd.sh", + "scripts/common/vagrant.sh", + "scripts/common/vmtools.sh", + "scripts/centos/cleanup.sh", + "scripts/common/minimize.sh" + ], + "type": "shell" + } + ] +} diff --git a/packer/centos-5.9-x86_64.json b/packer/centos-5.9-x86_64.json new file mode 100644 index 000000000..0c59885ba --- /dev/null +++ b/packer/centos-5.9-x86_64.json @@ -0,0 +1,83 @@ +{ + "builders": [ + { + "boot_command": [ + "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/centos-6.4/ks.cfg<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "guest_os_type": "RedHat_64", + "http_directory": "http", + "iso_checksum": "c12e01b546f00a965b8414abf0860b08d0bba3c9", + "iso_checksum_type": "sha1", + "iso_url": "http://mirrors.kernel.org/centos/5.9/isos/x86_64/CentOS-5.9-x86_64-bin-DVD-1of2.iso", + "shutdown_command": "echo '/sbin/halt -h -p' > shutdown.sh; echo 'vagrant'|sudo -S sh 'shutdown.sh'", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "name": "centos-5.9-x86_64-vbox", + "type": "virtualbox", + "vboxmanage": [ + [ + "modifyvm", + "{{.Name}}", + "--memory", + "384" + ], + [ + "modifyvm", + "{{.Name}}", + "--cpus", + "1" + ] + ], + "virtualbox_version_file": ".vbox_version" + }, + { + "boot_command": [ + "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/centos-5.9/ks.cfg<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "guest_os_type": "centos-64", + "http_directory": "http", + "iso_checksum": "c12e01b546f00a965b8414abf0860b08d0bba3c9", + "iso_checksum_type": "sha1", + "iso_url": "http://mirrors.kernel.org/centos/5.9/isos/x86_64/CentOS-5.9-x86_64-bin-DVD-1of2.iso", + "shutdown_command": "echo '/sbin/halt -h -p' > shutdown.sh; echo 'vagrant'|sudo -S sh 'shutdown.sh'", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "name": "centos-5.9-x86_64-vmware", + "type": "vmware", + "vmx_data": { + "cpuid.coresPerSocket": "1", + "memsize": "384", + "numvcpus": "1" + } + } + ], + "post-processors": [ + { + "output": "centos-5.9-x86_64-{{.Provider}}.box", + "type": "vagrant" + } + ], + "provisioners": [ + { + "execute_command": "echo 'vagrant' | sudo -S bash '{{.Path}}'", + "scripts": [ + "scripts/common/vagrant.sh", + "scripts/common/sshd.sh", + "scripts/common/vagrant.sh", + "scripts/common/vmtools.sh", + "scripts/centos/cleanup.sh", + "scripts/common/minimize.sh" + ], + "type": "shell" + } + ] +} diff --git a/packer/centos-6.4-i386.json b/packer/centos-6.4-i386.json new file mode 100644 index 000000000..17fd3fba7 --- /dev/null +++ b/packer/centos-6.4-i386.json @@ -0,0 +1,83 @@ +{ + "builders": [ + { + "boot_command": [ + "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/centos-6.4/ks.cfg<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "guest_os_type": "RedHat", + "http_directory": "http", + "iso_checksum": "4bd3a1de6f6dfcd7a2199487abf5a9304d696cae", + "iso_checksum_type": "sha1", + "iso_url": "http://mirrors.kernel.org/centos/6.4/isos/i386/CentOS-6.4-i386-bin-DVD1.iso", + "shutdown_command": "echo '/sbin/halt -h -p' > shutdown.sh; echo 'vagrant'|sudo -S sh 'shutdown.sh'", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "name": "centos-6.4-i386-vbox", + "type": "virtualbox", + "vboxmanage": [ + [ + "modifyvm", + "{{.Name}}", + "--memory", + "480" + ], + [ + "modifyvm", + "{{.Name}}", + "--cpus", + "1" + ] + ], + "virtualbox_version_file": ".vbox_version" + }, + { + "boot_command": [ + "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/centos-6.4/ks.cfg<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "guest_os_type": "centos", + "http_directory": "http", + "iso_checksum": "4bd3a1de6f6dfcd7a2199487abf5a9304d696cae", + "iso_checksum_type": "sha1", + "iso_url": "http://mirrors.kernel.org/centos/6.4/isos/i386/CentOS-6.4-i386-bin-DVD1.iso", + "shutdown_command": "echo '/sbin/halt -h -p' > shutdown.sh; echo 'vagrant'|sudo -S sh 'shutdown.sh'", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "name": "centos-6.4-i386-vmware", + "type": "vmware", + "vmx_data": { + "cpuid.coresPerSocket": "1", + "memsize": "480", + "numvcpus": "1" + } + } + ], + "post-processors": [ + { + "output": "centos-6.4-i386-{{.Provider}}.box", + "type": "vagrant" + } + ], + "provisioners": [ + { + "execute_command": "echo 'vagrant' | sudo -S bash '{{.Path}}'", + "scripts": [ + "scripts/common/sshd.sh", + "scripts/common/vagrant.sh", + "scripts/common/vmtools.sh", + "scripts/centos/cleanup.sh", + "scripts/common/minimize.sh" + ], + "type": "shell" + } + ] +} + diff --git a/packer/centos-6.4-x86_64.json b/packer/centos-6.4-x86_64.json new file mode 100644 index 000000000..91793e431 --- /dev/null +++ b/packer/centos-6.4-x86_64.json @@ -0,0 +1,83 @@ +{ + "builders": [ + { + "boot_command": [ + "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/centos-6.4/ks.cfg<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "guest_os_type": "RedHat_64", + "http_directory": "http", + "iso_checksum": "8672dc087f1b0eda60b9efaa41b82f034f185e24", + "iso_checksum_type": "sha1", + "iso_url": "http://mirrors.kernel.org/centos/6.4/isos/x86_64/CentOS-6.4-x86_64-bin-DVD1.iso", + "shutdown_command": "echo '/sbin/halt -h -p' > shutdown.sh; echo 'vagrant'|sudo -S sh 'shutdown.sh'", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "name": "centos-6.4-x86_64-vbox", + "type": "virtualbox", + "vboxmanage": [ + [ + "modifyvm", + "{{.Name}}", + "--memory", + "480" + ], + [ + "modifyvm", + "{{.Name}}", + "--cpus", + "1" + ] + ], + "virtualbox_version_file": ".vbox_version" + }, + { + "boot_command": [ + "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/centos-6.4/ks.cfg<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "guest_os_type": "centos-64", + "http_directory": "http", + "iso_checksum": "8672dc087f1b0eda60b9efaa41b82f034f185e24", + "iso_checksum_type": "sha1", + "iso_url": "http://mirrors.kernel.org/centos/6.4/isos/x86_64/CentOS-6.4-x86_64-bin-DVD1.iso", + "shutdown_command": "echo '/sbin/halt -h -p' > shutdown.sh; echo 'vagrant'|sudo -S sh 'shutdown.sh'", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "name": "centos-6.4-x86_64-vmware", + "type": "vmware", + "vmx_data": { + "cpuid.coresPerSocket": "1", + "memsize": "480", + "numvcpus": "1" + } + } + ], + "post-processors": [ + { + "output": "centos-6.4-x86_64-{{.Provider}}.box", + "type": "vagrant" + } + ], + "provisioners": [ + { + "execute_command": "echo 'vagrant' | sudo -S bash '{{.Path}}'", + "scripts": [ + "scripts/common/sshd.sh", + "scripts/common/vagrant.sh", + "scripts/common/vmtools.sh", + "scripts/centos/cleanup.sh", + "scripts/common/minimize.sh" + ], + "type": "shell" + } + ] +} + diff --git a/packer/debian-6.0.7-amd64.json b/packer/debian-6.0.7-amd64.json new file mode 100644 index 000000000..f8c7c4d3b --- /dev/null +++ b/packer/debian-6.0.7-amd64.json @@ -0,0 +1,113 @@ +{ + "builders": [ + { + "name": "debian-6.0.7-amd64-vbox", + "type": "virtualbox", + "boot_command": [ + "<esc><wait>", + "install <wait>", + "preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/debian-6.0.7/preseed.cfg <wait>", + "debian-installer=en_US <wait>", + "auto <wait>", + "locale=en_US <wait>", + "kbd-chooser/method=us <wait>", + "keyboard-configuration/xkb-keymap=us <wait>", + "netcfg/get_hostname={{ .Name }} <wait>", + "netcfg/get_domain=vagrantup.com <wait>", + "fb=false <wait>", + "debconf/frontend=noninteractive <wait>", + "console-setup/ask_detect=false <wait>", + "console-keymaps-at/keymap=us <wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "guest_os_type": "Debian_64", + "http_directory": "http", + "iso_checksum": "33877b8bff3a7def4ba1b551615d8459a3a7b268", + "iso_checksum_type": "sha1", + "iso_url": "http://cdimage.debian.org/cdimage/archive/6.0.7/amd64/iso-cd/debian-6.0.7-amd64-CD-1.iso", + "ssh_username": "vagrant", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_wait_timeout": "10000s", + "shutdown_command": "echo '/sbin/shutdown -hP now' > shutdown.sh; echo 'vagrant'|sudo -S sh 'shutdown.sh'", + "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "virtualbox_version_file": ".vbox_version", + "vboxmanage": [ + [ + "modifyvm", + "{{.Name}}", + "--memory", + "384" + ], + [ + "modifyvm", + "{{.Name}}", + "--cpus", + "1" + ] + ] + }, + { + "name": "debian-6.0.7-amd64-vmware", + "type": "vmware", + "boot_command": [ + "<esc><wait>", + "install <wait>", + "preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/debian-6.0.7/preseed.cfg <wait>", + "debian-installer=en_US <wait>", + "auto <wait>", + "locale=en_US <wait>", + "kbd-chooser/method=us <wait>", + "keyboard-configuration/xkb-keymap=us <wait>", + "netcfg/get_hostname={{ .Name }} <wait>", + "netcfg/get_domain=vagrantup.com <wait>", + "fb=false <wait>", + "debconf/frontend=noninteractive <wait>", + "console-setup/ask_detect=false <wait>", + "console-keymaps-at/keymap=us <wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "guest_os_type": "debian5-64", + "http_directory": "http", + "iso_checksum": "33877b8bff3a7def4ba1b551615d8459a3a7b268", + "iso_checksum_type": "sha1", + "iso_url": "http://cdimage.debian.org/cdimage/archive/6.0.7/amd64/iso-cd/debian-6.0.7-amd64-CD-1.iso", + "ssh_username": "vagrant", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_wait_timeout": "10000s", + "shutdown_command": "echo '/sbin/shutdown -hP now' > shutdown.sh; echo 'vagrant'|sudo -S sh 'shutdown.sh'", + "vmx_data": { + "memsize": "384", + "numvcpus": "1", + "cpuid.coresPerSocket": "1" + } + } + ], + "post-processors": [ + { + "type": "vagrant", + "output": "debian-6.0.7-amd64-{{.Provider}}.box" + } + ], + "provisioners": [ + { + "type": "shell", + "scripts": [ + "scripts/debian/update.sh", + "scripts/common/sshd.sh", + "scripts/debian/networking.sh", + "scripts/debian/sudoers.sh", + "scripts/common/vagrant.sh", + "scripts/common/vmtools.sh", + "scripts/debian/cleanup.sh", + "scripts/common/minimize.sh" + ], + "execute_command": "echo 'vagrant'|sudo -S sh '{{.Path}}'" + } + ] +} diff --git a/packer/debian-6.0.7-i386.json b/packer/debian-6.0.7-i386.json new file mode 100644 index 000000000..9afee678c --- /dev/null +++ b/packer/debian-6.0.7-i386.json @@ -0,0 +1,113 @@ +{ + "builders": [ + { + "name": "debian-6.0.7-i386-vbox", + "type": "virtualbox", + "boot_command": [ + "<esc><wait>", + "install <wait>", + "preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/debian-6.0.7/preseed.cfg <wait>", + "debian-installer=en_US <wait>", + "auto <wait>", + "locale=en_US <wait>", + "kbd-chooser/method=us <wait>", + "keyboard-configuration/xkb-keymap=us <wait>", + "netcfg/get_hostname={{ .Name }} <wait>", + "netcfg/get_domain=vagrantup.com <wait>", + "fb=false <wait>", + "debconf/frontend=noninteractive <wait>", + "console-setup/ask_detect=false <wait>", + "console-keymaps-at/keymap=us <wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "guest_os_type": "Debian", + "http_directory": "http", + "iso_checksum": "de0d9ce1eb8d238dd3747a28586655b526b398a2", + "iso_checksum_type": "sha1", + "iso_url": "http://cdimage.debian.org/cdimage/archive/6.0.7/i386/iso-cd/debian-6.0.7-i386-CD-1.iso", + "ssh_username": "vagrant", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_wait_timeout": "10000s", + "shutdown_command": "echo '/sbin/shutdown -hP now' > shutdown.sh; echo 'vagrant'|sudo -S sh 'shutdown.sh'", + "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "virtualbox_version_file": ".vbox_version", + "vboxmanage": [ + [ + "modifyvm", + "{{.Name}}", + "--memory", + "384" + ], + [ + "modifyvm", + "{{.Name}}", + "--cpus", + "1" + ] + ] + }, + { + "name": "debian-6.0.7-i386-vmware", + "type": "vmware", + "boot_command": [ + "<esc><wait>", + "install <wait>", + "preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/debian-6.0.7/preseed.cfg <wait>", + "debian-installer=en_US <wait>", + "auto <wait>", + "locale=en_US <wait>", + "kbd-chooser/method=us <wait>", + "keyboard-configuration/xkb-keymap=us <wait>", + "netcfg/get_hostname={{ .Name }} <wait>", + "netcfg/get_domain=vagrantup.com <wait>", + "fb=false <wait>", + "debconf/frontend=noninteractive <wait>", + "console-setup/ask_detect=false <wait>", + "console-keymaps-at/keymap=us <wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "guest_os_type": "debian5", + "http_directory": "http", + "iso_checksum": "de0d9ce1eb8d238dd3747a28586655b526b398a2", + "iso_checksum_type": "sha1", + "iso_url": "http://cdimage.debian.org/cdimage/archive/6.0.7/i386/iso-cd/debian-6.0.7-i386-CD-1.iso", + "ssh_username": "vagrant", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_wait_timeout": "10000s", + "shutdown_command": "echo '/sbin/shutdown -hP now' > shutdown.sh; echo 'vagrant'|sudo -S sh 'shutdown.sh'", + "vmx_data": { + "memsize": "384", + "numvcpus": "1", + "cpuid.coresPerSocket": "1" + } + } + ], + "post-processors": [ + { + "type": "vagrant", + "output": "debian-6.0.7-i386-{{.Provider}}.box" + } + ], + "provisioners": [ + { + "type": "shell", + "scripts": [ + "scripts/debian/update.sh", + "scripts/common/sshd.sh", + "scripts/debian/networking.sh", + "scripts/debian/sudoers.sh", + "scripts/common/vagrant.sh", + "scripts/common/vmtools.sh", + "scripts/debian/cleanup.sh", + "scripts/common/minimize.sh" + ], + "execute_command": "echo 'vagrant'|sudo -S sh '{{.Path}}'" + } + ] +} diff --git a/packer/debian-7.1.0-amd64.json b/packer/debian-7.1.0-amd64.json new file mode 100644 index 000000000..8d6d368dd --- /dev/null +++ b/packer/debian-7.1.0-amd64.json @@ -0,0 +1,113 @@ +{ + "builders": [ + { + "name": "debian-7.1.0-amd64-vbox", + "type": "virtualbox", + "boot_command": [ + "<esc><wait>", + "install <wait>", + "preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/debian-7.1.0/preseed.cfg <wait>", + "debian-installer=en_US <wait>", + "auto <wait>", + "locale=en_US <wait>", + "kbd-chooser/method=us <wait>", + "keyboard-configuration/xkb-keymap=us <wait>", + "netcfg/get_hostname={{ .Name }} <wait>", + "netcfg/get_domain=vagrantup.com <wait>", + "fb=false <wait>", + "debconf/frontend=noninteractive <wait>", + "console-setup/ask_detect=false <wait>", + "console-keymaps-at/keymap=us <wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "guest_os_type": "Debian_64", + "http_directory": "http", + "iso_checksum": "a294e443f3bd09414b4c314f1328c170620f879f", + "iso_checksum_type": "sha1", + "iso_url": "http://cdimage.debian.org/debian-cd/7.1.0/amd64/iso-cd/debian-7.1.0-amd64-CD-1.iso", + "ssh_username": "vagrant", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_wait_timeout": "10000s", + "shutdown_command": "echo '/sbin/shutdown -hP now' > shutdown.sh; echo 'vagrant'|sudo -S sh 'shutdown.sh'", + "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "virtualbox_version_file": ".vbox_version", + "vboxmanage": [ + [ + "modifyvm", + "{{.Name}}", + "--memory", + "384" + ], + [ + "modifyvm", + "{{.Name}}", + "--cpus", + "1" + ] + ] + }, + { + "name": "debian-7.1.0-amd64-vmware", + "type": "vmware", + "boot_command": [ + "<esc><wait>", + "install <wait>", + "preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/debian-7.1.0/preseed.cfg <wait>", + "debian-installer=en_US <wait>", + "auto <wait>", + "locale=en_US <wait>", + "kbd-chooser/method=us <wait>", + "keyboard-configuration/xkb-keymap=us <wait>", + "netcfg/get_hostname={{ .Name }} <wait>", + "netcfg/get_domain=vagrantup.com <wait>", + "fb=false <wait>", + "debconf/frontend=noninteractive <wait>", + "console-setup/ask_detect=false <wait>", + "console-keymaps-at/keymap=us <wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "guest_os_type": "debian5-64", + "http_directory": "http", + "iso_checksum": "a294e443f3bd09414b4c314f1328c170620f879f", + "iso_checksum_type": "sha1", + "iso_url": "http://cdimage.debian.org/debian-cd/7.1.0/amd64/iso-cd/debian-7.1.0-amd64-CD-1.iso", + "ssh_username": "vagrant", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_wait_timeout": "10000s", + "shutdown_command": "echo '/sbin/shutdown -hP now' > shutdown.sh; echo 'vagrant'|sudo -S sh 'shutdown.sh'", + "vmx_data": { + "memsize": "384", + "numvcpus": "1", + "cpuid.coresPerSocket": "1" + } + } + ], + "post-processors": [ + { + "type": "vagrant", + "output": "debian-7.1.0-amd64-{{.Provider}}.box" + } + ], + "provisioners": [ + { + "type": "shell", + "scripts": [ + "scripts/debian/update.sh", + "scripts/common/sshd.sh", + "scripts/debian/networking.sh", + "scripts/debian/sudoers.sh", + "scripts/common/vagrant.sh", + "scripts/common/vmtools.sh", + "scripts/debian/cleanup.sh", + "scripts/common/minimize.sh" + ], + "execute_command": "echo 'vagrant'|sudo -S sh '{{.Path}}'" + } + ] +} diff --git a/packer/debian-7.1.0-i386.json b/packer/debian-7.1.0-i386.json new file mode 100644 index 000000000..4648fd4e6 --- /dev/null +++ b/packer/debian-7.1.0-i386.json @@ -0,0 +1,113 @@ +{ + "builders": [ + { + "name": "debian-7.1.0-i386-vbox", + "type": "virtualbox", + "boot_command": [ + "<esc><wait>", + "install <wait>", + "preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/debian-7.1.0/preseed.cfg <wait>", + "debian-installer=en_US <wait>", + "auto <wait>", + "locale=en_US <wait>", + "kbd-chooser/method=us <wait>", + "keyboard-configuration/xkb-keymap=us <wait>", + "netcfg/get_hostname={{ .Name }} <wait>", + "netcfg/get_domain=vagrantup.com <wait>", + "fb=false <wait>", + "debconf/frontend=noninteractive <wait>", + "console-setup/ask_detect=false <wait>", + "console-keymaps-at/keymap=us <wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "guest_os_type": "Debian", + "http_directory": "http", + "iso_checksum": "fecd8856e6cf5e248a52e31deb9ebb0e61129f82", + "iso_checksum_type": "sha1", + "iso_url": "http://cdimage.debian.org/debian-cd/7.1.0/i386/iso-cd/debian-7.1.0-i386-CD-1.iso", + "ssh_username": "vagrant", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_wait_timeout": "10000s", + "shutdown_command": "echo '/sbin/shutdown -hP now' > shutdown.sh; echo 'vagrant'|sudo -S sh 'shutdown.sh'", + "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "virtualbox_version_file": ".vbox_version", + "vboxmanage": [ + [ + "modifyvm", + "{{.Name}}", + "--memory", + "384" + ], + [ + "modifyvm", + "{{.Name}}", + "--cpus", + "1" + ] + ] + }, + { + "name": "debian-7.1.0-i386-vmware", + "type": "vmware", + "boot_command": [ + "<esc><wait>", + "install <wait>", + "preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/debian-7.1.0/preseed.cfg <wait>", + "debian-installer=en_US <wait>", + "auto <wait>", + "locale=en_US <wait>", + "kbd-chooser/method=us <wait>", + "keyboard-configuration/xkb-keymap=us <wait>", + "netcfg/get_hostname={{ .Name }} <wait>", + "netcfg/get_domain=vagrantup.com <wait>", + "fb=false <wait>", + "debconf/frontend=noninteractive <wait>", + "console-setup/ask_detect=false <wait>", + "console-keymaps-at/keymap=us <wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "guest_os_type": "debian5", + "http_directory": "http", + "iso_checksum": "fecd8856e6cf5e248a52e31deb9ebb0e61129f82", + "iso_checksum_type": "sha1", + "iso_url": "http://cdimage.debian.org/debian-cd/7.1.0/i386/iso-cd/debian-7.1.0-i386-CD-1.iso", + "ssh_username": "vagrant", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_wait_timeout": "10000s", + "shutdown_command": "echo '/sbin/shutdown -hP now' > shutdown.sh; echo 'vagrant'|sudo -S sh 'shutdown.sh'", + "vmx_data": { + "memsize": "384", + "numvcpus": "1", + "cpuid.coresPerSocket": "1" + } + } + ], + "post-processors": [ + { + "type": "vagrant", + "output": "debian-7.1.0-i386-{{.Provider}}.box" + } + ], + "provisioners": [ + { + "type": "shell", + "scripts": [ + "scripts/debian/update.sh", + "scripts/common/sshd.sh", + "scripts/debian/networking.sh", + "scripts/debian/sudoers.sh", + "scripts/common/vagrant.sh", + "scripts/common/vmtools.sh", + "scripts/debian/cleanup.sh", + "scripts/common/minimize.sh" + ], + "execute_command": "echo 'vagrant'|sudo -S sh '{{.Path}}'" + } + ] +} diff --git a/packer/fedora-18-i386.json b/packer/fedora-18-i386.json new file mode 100644 index 000000000..7a07bdf4f --- /dev/null +++ b/packer/fedora-18-i386.json @@ -0,0 +1,90 @@ +{ + "builders": [ + { + "boot_command": [ + "<tab> linux ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/fedora-18/ks.cfg<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "guest_os_type": "Fedora", + "http_directory": "http", + "iso_checksum": "a22e6ab7b0e5e93397e4a1d8d994693d0afb9ad46b1f47a4fe10bfbbc2e7f354", + "iso_checksum_type": "sha256", + "iso_url": "http://mirrors.kernel.org/fedora/releases/18/Fedora/i386/iso/Fedora-18-i386-DVD.iso", + "shutdown_command": "echo 'vagrant'|sudo -S sh '/tmp/shutdown.sh'", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "name": "fedora-18-i386-vbox", + "type": "virtualbox", + "vboxmanage": [ + [ + "modifyvm", + "{{.Name}}", + "--memory", + "512" + ], + [ + "modifyvm", + "{{.Name}}", + "--cpus", + "1" + ] + ], + "virtualbox_version_file": ".vbox_version" + }, + { + "boot_command": [ + "<tab> linux ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/fedora-18/ks.cfg<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "guest_os_type": "fedora", + "http_directory": "http", + "iso_checksum": "a22e6ab7b0e5e93397e4a1d8d994693d0afb9ad46b1f47a4fe10bfbbc2e7f354", + "iso_checksum_type": "sha256", + "iso_url": "http://mirrors.kernel.org/fedora/releases/18/Fedora/i386/iso/Fedora-18-i386-DVD.iso", + "shutdown_command": "echo 'vagrant'|sudo -S sh '/tmp/shutdown.sh'", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "tools_upload_flavor": "linux", + "tools_upload_path": "/home/vagrant/vmware_tools.iso", + "name": "fedora-18-i386-vmware", + "type": "vmware", + "vmx_data": { + "cpuid.coresPerSocket": "1", + "memsize": "512", + "numvcpus": "1" + } + } + ], + "post-processors": [ + { + "output": "fedora-18-x86_64-{{.Provider}}.box", + "type": "vagrant" + } + ], + "provisioners": [ + { + "type": "file", + "source": "scripts/fedora/shutdown.sh", + "destination": "/tmp/shutdown.sh" + }, + { + "execute_command": "echo 'vagrant' | {{.Vars}} sudo -E -S sh '{{.Path}}'", + "scripts": [ + "scripts/common/sshd.sh", + "scripts/common/vmtools.sh", + "scripts/common/vagrant.sh", + "scripts/fedora/cleanup.sh", + "scripts/common/minimize.sh" + ], + "type": "shell" + } + ] +} + diff --git a/packer/fedora-18-x86_64.json b/packer/fedora-18-x86_64.json new file mode 100644 index 000000000..b77a5bb9d --- /dev/null +++ b/packer/fedora-18-x86_64.json @@ -0,0 +1,90 @@ +{ + "builders": [ + { + "boot_command": [ + "<tab> linux ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/fedora-18/ks.cfg<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "guest_os_type": "Fedora_64", + "http_directory": "http", + "iso_checksum": "91c5f0aca391acf76a047e284144f90d66d3d5f5dcd26b01f368a43236832c03", + "iso_checksum_type": "sha256", + "iso_url": "http://mirrors.kernel.org/fedora/releases/18/Fedora/x86_64/iso/Fedora-18-x86_64-DVD.iso", + "shutdown_command": "echo 'vagrant'|sudo -S sh '/tmp/shutdown.sh'", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "name": "fedora-18-x86_64-vbox", + "type": "virtualbox", + "vboxmanage": [ + [ + "modifyvm", + "{{.Name}}", + "--memory", + "512" + ], + [ + "modifyvm", + "{{.Name}}", + "--cpus", + "1" + ] + ], + "virtualbox_version_file": ".vbox_version" + }, + { + "boot_command": [ + "<tab> linux ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/fedora-18/ks.cfg<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "guest_os_type": "fedora-64", + "http_directory": "http", + "iso_checksum": "91c5f0aca391acf76a047e284144f90d66d3d5f5dcd26b01f368a43236832c03", + "iso_checksum_type": "sha256", + "iso_url": "http://mirrors.kernel.org/fedora/releases/18/Fedora/x86_64/iso/Fedora-18-x86_64-DVD.iso", + "shutdown_command": "echo 'vagrant'|sudo -S sh '/tmp/shutdown.sh'", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "tools_upload_flavor": "linux", + "tools_upload_path": "/home/vagrant/vmware_tools.iso", + "name": "fedora-18-x86_64-vmware", + "type": "vmware", + "vmx_data": { + "cpuid.coresPerSocket": "1", + "memsize": "512", + "numvcpus": "1" + } + } + ], + "post-processors": [ + { + "output": "fedora-18-x86_64-{{.Provider}}.box", + "type": "vagrant" + } + ], + "provisioners": [ + { + "type": "file", + "source": "scripts/fedora/shutdown.sh", + "destination": "/tmp/shutdown.sh" + }, + { + "execute_command": "echo 'vagrant' | {{.Vars}} sudo -E -S sh '{{.Path}}'", + "scripts": [ + "scripts/common/sshd.sh", + "scripts/common/vmtools.sh", + "scripts/common/vagrant.sh", + "scripts/fedora/cleanup.sh", + "scripts/common/minimize.sh" + ], + "type": "shell" + } + ] +} + diff --git a/packer/fedora-19-i386.json b/packer/fedora-19-i386.json new file mode 100644 index 000000000..d1bdaa9b2 --- /dev/null +++ b/packer/fedora-19-i386.json @@ -0,0 +1,88 @@ +{ + "builders": [ + { + "boot_command": [ + "<tab> linux ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/fedora-19/ks.cfg<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "guest_os_type": "Fedora", + "http_directory": "http", + "iso_checksum": "0da29695c4f503e2b27350406c1ceb7a4e5b9b699ea722774368fd16ab277bce", + "iso_checksum_type": "sha256", + "iso_url": "http://mirrors.kernel.org/fedora/releases/19/Fedora/i386/iso/Fedora-19-i386-DVD.iso", + "shutdown_command": "echo 'vagrant'|sudo -S sh '/tmp/shutdown.sh'", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "name": "fedora-19-i386-vbox", + "type": "virtualbox", + "vboxmanage": [ + [ + "modifyvm", + "{{.Name}}", + "--memory", + "512" + ], + [ + "modifyvm", + "{{.Name}}", + "--cpus", + "1" + ] + ], + "virtualbox_version_file": ".vbox_version" + }, + { + "boot_command": [ + "<tab> linux ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/fedora-19/ks.cfg<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "guest_os_type": "fedora", + "http_directory": "http", + "iso_checksum": "0da29695c4f503e2b27350406c1ceb7a4e5b9b699ea722774368fd16ab277bce", + "iso_checksum_type": "sha256", + "iso_url": "http://mirrors.kernel.org/fedora/releases/19/Fedora/i386/iso/Fedora-19-i386-DVD.iso", + "shutdown_command": "echo 'vagrant'|sudo -S sh '/tmp/shutdown.sh'", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "name": "fedora-19-i386-vmware", + "type": "vmware", + "vmx_data": { + "cpuid.coresPerSocket": "1", + "memsize": "512", + "numvcpus": "1" + } + } + ], + "post-processors": [ + { + "output": "fedora-19-i386-{{.Provider}}.box", + "type": "vagrant" + } + ], + "provisioners": [ + { + "type": "file", + "source": "scripts/fedora/shutdown.sh", + "destination": "/tmp/shutdown.sh" + }, + { + "execute_command": "echo 'vagrant' | {{.Vars}} sudo -E -S sh '{{.Path}}'", + "scripts": [ + "scripts/common/sshd.sh", + "scripts/common/vmtools.sh", + "scripts/common/vagrant.sh", + "scripts/fedora/cleanup.sh", + "scripts/common/minimize.sh" + ], + "type": "shell" + } + ] +} + diff --git a/packer/fedora-19-x86_64.json b/packer/fedora-19-x86_64.json new file mode 100644 index 000000000..42646ca4e --- /dev/null +++ b/packer/fedora-19-x86_64.json @@ -0,0 +1,88 @@ +{ + "builders": [ + { + "boot_command": [ + "<tab> linux ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/fedora-19/ks.cfg<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "guest_os_type": "Fedora_64", + "http_directory": "http", + "iso_checksum": "6e7e263e607cfcadc90ea2ef5668aa3945d9eca596485a7a1f8a9f2478cc7084", + "iso_checksum_type": "sha256", + "iso_url": "http://mirrors.kernel.org/fedora/releases/19/Fedora/x86_64/iso/Fedora-19-x86_64-DVD.iso", + "shutdown_command": "echo 'vagrant'|sudo -S sh '/tmp/shutdown.sh'", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "name": "fedora-19-x86_64-vbox", + "type": "virtualbox", + "vboxmanage": [ + [ + "modifyvm", + "{{.Name}}", + "--memory", + "512" + ], + [ + "modifyvm", + "{{.Name}}", + "--cpus", + "1" + ] + ], + "virtualbox_version_file": ".vbox_version" + }, + { + "boot_command": [ + "<tab> linux ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/fedora-19/ks.cfg<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "guest_os_type": "fedora-64", + "http_directory": "http", + "iso_checksum": "6e7e263e607cfcadc90ea2ef5668aa3945d9eca596485a7a1f8a9f2478cc7084", + "iso_checksum_type": "sha256", + "iso_url": "http://mirrors.kernel.org/fedora/releases/19/Fedora/x86_64/iso/Fedora-19-x86_64-DVD.iso", + "shutdown_command": "echo 'vagrant'|sudo -S sh '/tmp/shutdown.sh'", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "name": "fedora-19-x86_64-vmware", + "type": "vmware", + "vmx_data": { + "cpuid.coresPerSocket": "1", + "memsize": "512", + "numvcpus": "1" + } + } + ], + "post-processors": [ + { + "output": "fedora-19-x86_64-{{.Provider}}.box", + "type": "vagrant" + } + ], + "provisioners": [ + { + "type": "file", + "source": "scripts/fedora/shutdown.sh", + "destination": "/tmp/shutdown.sh" + }, + { + "execute_command": "echo 'vagrant' | {{.Vars}} sudo -E -S sh '{{.Path}}'", + "scripts": [ + "scripts/common/sshd.sh", + "scripts/common/vmtools.sh", + "scripts/common/vagrant.sh", + "scripts/fedora/cleanup.sh", + "scripts/common/minimize.sh" + ], + "type": "shell" + } + ] +} + diff --git a/packer/fedora-20-i386.json b/packer/fedora-20-i386.json new file mode 100644 index 000000000..d2c5e1c5e --- /dev/null +++ b/packer/fedora-20-i386.json @@ -0,0 +1,88 @@ +{ + "builders": [ + { + "boot_command": [ + "<tab> linux ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/fedora-19/ks.cfg<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "guest_os_type": "Fedora", + "http_directory": "http", + "iso_checksum": "24e3a6446b7e2e2b0a3591271c896c41eae01f733a65aa4f5bf43e99bfcfc25e", + "iso_checksum_type": "sha256", + "iso_url": "http://mirrors.kernel.org/fedora/releases/20/Fedora/i386/iso/Fedora-20-i386-DVD.iso", + "shutdown_command": "echo 'vagrant'|sudo -S sh '/tmp/shutdown.sh'", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "name": "fedora-20-i386-vbox", + "type": "virtualbox", + "vboxmanage": [ + [ + "modifyvm", + "{{.Name}}", + "--memory", + "512" + ], + [ + "modifyvm", + "{{.Name}}", + "--cpus", + "1" + ] + ], + "virtualbox_version_file": ".vbox_version" + }, + { + "boot_command": [ + "<tab> linux ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/fedora-19/ks.cfg<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "guest_os_type": "fedora", + "http_directory": "http", + "iso_checksum": "0da29695c4f503e2b27350406c1ceb7a4e5b9b699ea722774368fd16ab277bce", + "iso_checksum_type": "sha256", + "iso_url": "http://mirrors.kernel.org/fedora/releases/19/Fedora/i386/iso/Fedora-19-i386-DVD.iso", + "shutdown_command": "echo 'vagrant'|sudo -S sh '/tmp/shutdown.sh'", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "name": "fedora-19-i386-vmware", + "type": "vmware", + "vmx_data": { + "cpuid.coresPerSocket": "1", + "memsize": "512", + "numvcpus": "1" + } + } + ], + "post-processors": [ + { + "output": "fedora-19-i386-{{.Provider}}.box", + "type": "vagrant" + } + ], + "provisioners": [ + { + "type": "file", + "source": "scripts/fedora/shutdown.sh", + "destination": "/tmp/shutdown.sh" + }, + { + "execute_command": "echo 'vagrant' | {{.Vars}} sudo -E -S sh '{{.Path}}'", + "scripts": [ + "scripts/common/sshd.sh", + "scripts/common/vmtools.sh", + "scripts/common/vagrant.sh", + "scripts/fedora/cleanup.sh", + "scripts/common/minimize.sh" + ], + "type": "shell" + } + ] +} + diff --git a/packer/fedora-20-x86_64.json b/packer/fedora-20-x86_64.json new file mode 100644 index 000000000..b744ad31f --- /dev/null +++ b/packer/fedora-20-x86_64.json @@ -0,0 +1,88 @@ +{ + "builders": [ + { + "boot_command": [ + "<tab> linux ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/fedora-20/ks.cfg<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "guest_os_type": "Fedora_64", + "http_directory": "http", + "iso_checksum": "749763da40ebf6cb3a9ed46434b2d165d09938cf24b51992da656d9125ff0290", + "iso_checksum_type": "sha256", + "iso_url": "http://mirrors.kernel.org/fedora/releases/test/20-Alpha/Fedora/x86_64/iso/Fedora-20-Alpha-x86_64-DVD.iso", + "shutdown_command": "echo 'vagrant'|sudo -S sh '/tmp/shutdown.sh'", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "name": "fedora-20-x86_64-vbox", + "type": "virtualbox", + "vboxmanage": [ + [ + "modifyvm", + "{{.Name}}", + "--memory", + "512" + ], + [ + "modifyvm", + "{{.Name}}", + "--cpus", + "1" + ] + ], + "virtualbox_version_file": ".vbox_version" + }, + { + "boot_command": [ + "<tab> linux ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/fedora-20/ks.cfg<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "guest_os_type": "fedora-64", + "http_directory": "http", + "iso_checksum": "749763da40ebf6cb3a9ed46434b2d165d09938cf24b51992da656d9125ff0290", + "iso_checksum_type": "sha256", + "iso_url": "http://mirrors.kernel.org/fedora/releases/test/20-Alpha/Fedora/x86_64/iso/Fedora-20-Alpha-x86_64-DVD.iso", + "shutdown_command": "echo 'vagrant'|sudo -S sh '/tmp/shutdown.sh'", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "name": "fedora-20-x86_64-vmware", + "type": "vmware", + "vmx_data": { + "cpuid.coresPerSocket": "1", + "memsize": "512", + "numvcpus": "1" + } + } + ], + "post-processors": [ + { + "output": "fedora-20-x86_64-{{.Provider}}.box", + "type": "vagrant" + } + ], + "provisioners": [ + { + "type": "file", + "source": "scripts/fedora/shutdown.sh", + "destination": "/tmp/shutdown.sh" + }, + { + "execute_command": "echo 'vagrant' | {{.Vars}} sudo -E -S sh '{{.Path}}'", + "scripts": [ + "scripts/common/sshd.sh", + "scripts/common/vmtools.sh", + "scripts/common/vagrant.sh", + "scripts/fedora/cleanup.sh", + "scripts/common/minimize.sh" + ], + "type": "shell" + } + ] +} + diff --git a/packer/http/centos-5.9/ks.cfg b/packer/http/centos-5.9/ks.cfg new file mode 100644 index 000000000..e00fd5a2a --- /dev/null +++ b/packer/http/centos-5.9/ks.cfg @@ -0,0 +1,39 @@ +install +cdrom +lang en_US.UTF-8 +keyboard us +network --bootproto=dhcp +rootpw --iscrypted $1$damlkd,f$UC/u5pUts5QiU3ow.CSso/ +firewall --disabled +authconfig --enableshadow --passalgo=sha512 +selinux --disabled +timezone UTC +bootloader --location=mbr +text +skipx +zerombr +clearpart --all --initlabel +autopart +auth --useshadow --enablemd5 +firstboot --disabled +reboot + +%packages --ignoremissing +@Base +@Core +@Development Tools +openssl-devel +readline-devel +zlib-devel +kernel-devel + +%post +# update root certs +wget -O/etc/pki/tls/certs/ca-bundle.crt http://curl.haxx.se/ca/cacert.pem +# vagrant +groupadd vagrant -g 999 +useradd vagrant -g vagrant -G wheel -u 900 +echo "vagrant" | passwd --stdin vagrant +# sudo +echo "vagrant ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers +sed -i "s/^.*requiretty/#Defaults requiretty/" /etc/sudoers diff --git a/packer/http/centos-6.4/ks.cfg b/packer/http/centos-6.4/ks.cfg new file mode 100644 index 000000000..e00fd5a2a --- /dev/null +++ b/packer/http/centos-6.4/ks.cfg @@ -0,0 +1,39 @@ +install +cdrom +lang en_US.UTF-8 +keyboard us +network --bootproto=dhcp +rootpw --iscrypted $1$damlkd,f$UC/u5pUts5QiU3ow.CSso/ +firewall --disabled +authconfig --enableshadow --passalgo=sha512 +selinux --disabled +timezone UTC +bootloader --location=mbr +text +skipx +zerombr +clearpart --all --initlabel +autopart +auth --useshadow --enablemd5 +firstboot --disabled +reboot + +%packages --ignoremissing +@Base +@Core +@Development Tools +openssl-devel +readline-devel +zlib-devel +kernel-devel + +%post +# update root certs +wget -O/etc/pki/tls/certs/ca-bundle.crt http://curl.haxx.se/ca/cacert.pem +# vagrant +groupadd vagrant -g 999 +useradd vagrant -g vagrant -G wheel -u 900 +echo "vagrant" | passwd --stdin vagrant +# sudo +echo "vagrant ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers +sed -i "s/^.*requiretty/#Defaults requiretty/" /etc/sudoers diff --git a/packer/http/debian-6.0.7/preseed.cfg b/packer/http/debian-6.0.7/preseed.cfg new file mode 100644 index 000000000..f9ae0023b --- /dev/null +++ b/packer/http/debian-6.0.7/preseed.cfg @@ -0,0 +1,47 @@ +choose-mirror-bin mirror/http/proxy string +d-i apt-setup/use_mirror boolean true +d-i base-installer/kernel/override-image string linux-server +d-i clock-setup/utc boolean true +d-i clock-setup/utc-auto boolean true +d-i finish-install/reboot_in_progress note +d-i grub-installer/only_debian boolean true +d-i grub-installer/with_other_os boolean true +d-i keymap select us +d-i mirror/country string manual +d-i mirror/http/directory string /debian +d-i mirror/http/hostname string mirrors.kernel.org +d-i mirror/http/proxy string +d-i partman-auto-lvm/guided_size string max +d-i partman-auto/choose_recipe select atomic +d-i partman-auto/method string lvm +d-i partman-lvm/confirm boolean true +d-i partman-lvm/confirm boolean true +d-i partman-lvm/confirm_nooverwrite boolean true +d-i partman-lvm/device_remove_lvm boolean true +d-i partman/choose_partition select finish +d-i partman/confirm boolean true +d-i partman/confirm_nooverwrite boolean true +d-i partman/confirm_write_new_label boolean true +d-i passwd/root-login boolean false +d-i passwd/root-password-again password vagrant +d-i passwd/root-password password vagrant +d-i passwd/user-fullname string vagrant +d-i passwd/user-uid string 900 +d-i passwd/user-password password vagrant +d-i passwd/user-password-again password vagrant +d-i passwd/username string vagrant +d-i pkgsel/include string openssh-server sudo bzip2 acpid cryptsetup zlib1g-dev wget curl dkms make nfs-common +d-i pkgsel/install-language-support boolean false +d-i pkgsel/update-policy select unattended-upgrades +d-i pkgsel/upgrade select full-upgrade +# Prevent packaged version of VirtualBox Guest Additions being installed: +d-i preseed/early_command string sed -i \ + '/in-target/idiscover(){/sbin/discover|grep -v VirtualBox;}' \ + /usr/lib/pre-pkgsel.d/20install-hwpackages +d-i time/zone string UTC +d-i user-setup/allow-password-weak boolean true +d-i user-setup/encrypt-home boolean false +apt-cdrom-setup apt-setup/cdrom/set-first boolean false +apt-mirror-setup apt-setup/use_mirror boolean true +popularity-contest popularity-contest/participate boolean false +tasksel tasksel/first multiselect standard, ubuntu-server diff --git a/packer/http/debian-7.1.0/preseed.cfg b/packer/http/debian-7.1.0/preseed.cfg new file mode 100644 index 000000000..ced8699d2 --- /dev/null +++ b/packer/http/debian-7.1.0/preseed.cfg @@ -0,0 +1,48 @@ +choose-mirror-bin mirror/http/proxy string +d-i apt-setup/use_mirror boolean true +d-i base-installer/kernel/override-image string linux-server +d-i clock-setup/utc boolean true +d-i clock-setup/utc-auto boolean true +d-i finish-install/reboot_in_progress note +d-i grub-installer/only_debian boolean true +d-i grub-installer/with_other_os boolean true +d-i keymap select us +d-i mirror/country string manual +d-i mirror/http/directory string /debian +d-i mirror/http/hostname string mirrors.kernel.org +d-i mirror/http/proxy string +d-i partman-auto-lvm/guided_size string max +d-i partman-auto/choose_recipe select atomic +d-i partman-auto/method string lvm +d-i partman-lvm/confirm boolean true +d-i partman-lvm/confirm boolean true +d-i partman-lvm/confirm_nooverwrite boolean true +d-i partman-lvm/device_remove_lvm boolean true +d-i partman/choose_partition select finish +d-i partman/confirm boolean true +d-i partman/confirm_nooverwrite boolean true +d-i partman/confirm_write_new_label boolean true +d-i passwd/root-login boolean false +d-i passwd/root-password-again password vagrant +d-i passwd/root-password password vagrant +d-i passwd/user-fullname string vagrant +d-i passwd/user-uid string 900 +d-i passwd/user-password password vagrant +d-i passwd/user-password-again password vagrant +d-i passwd/username string vagrant +d-i pkgsel/include string openssh-server sudo bzip2 acpid cryptsetup zlib1g-dev wget curl dkms make nfs-common +d-i pkgsel/install-language-support boolean false +d-i pkgsel/update-policy select unattended-upgrades +d-i pkgsel/upgrade select full-upgrade +# Prevent packaged version of VirtualBox Guest Additions being installed: +d-i preseed/early_command string sed -i \ + '/in-target/idiscover(){/sbin/discover|grep -v VirtualBox;}' \ + /usr/lib/pre-pkgsel.d/20install-hwpackages +d-i time/zone string UTC +d-i user-setup/allow-password-weak boolean true +d-i user-setup/encrypt-home boolean false +d-i preseed/late_command string sed -i '/^deb cdrom:/s/^/#/' /target/etc/apt/sources.list +apt-cdrom-setup apt-setup/cdrom/set-first boolean false +apt-mirror-setup apt-setup/use_mirror boolean true +popularity-contest popularity-contest/participate boolean false +tasksel tasksel/first multiselect standard, ubuntu-server diff --git a/packer/http/fedora-18/ks.cfg b/packer/http/fedora-18/ks.cfg new file mode 100644 index 000000000..786aa3aeb --- /dev/null +++ b/packer/http/fedora-18/ks.cfg @@ -0,0 +1,51 @@ +install +cdrom +lang en_US.UTF-8 +keyboard us +network --bootproto=dhcp +rootpw --iscrypted $1$damlkd,f$UC/u5pUts5QiU3ow.CSso/ +firewall --disabled +authconfig --enableshadow --passalgo=sha512 +selinux --disabled +timezone UTC +bootloader --location=mbr +text +skipx +zerombr +clearpart --all --initlabel +part /boot --fstype=ext4 --size=500 +part pv.2 --grow --size=500 +volgroup vg_vagrant --pesize=32768 pv.2 +logvol / --fstype=ext4 --name=lv_root --vgname=vg_vagrant --size=1024 --grow +logvol swap --fstype=swap --name=lv_swap --vgname=vg_vagrant --size=528 --grow --maxsize=1056 +bootloader --location=mbr --append="norhgb biosdevname=0" +auth --useshadow --enablemd5 +firstboot --disabled +reboot + +%packages +@Core +bzip2 +gcc +kernel-devel +kernel-headers +openssl-devel +readline-devel +tar +wget +net-tools +zlib-devel +%end + +%post +# update root certs +wget -O/etc/pki/tls/certs/ca-bundle.crt http://curl.haxx.se/ca/cacert.pem +# vagrant +groupadd vagrant +useradd vagrant -g vagrant -G wheel -u 900 +echo "vagrant" | passwd --stdin vagrant +# sudo +echo 'Defaults:vagrant !requiretty' > /etc/sudoers.d/vagrant +echo '%vagrant ALL=(ALL) NOPASSWD: ALL' >> /etc/sudoers.d/vagrant +chmod 440 /etc/sudoers.d/vagrant +%end diff --git a/packer/http/fedora-19/ks.cfg b/packer/http/fedora-19/ks.cfg new file mode 100644 index 000000000..786aa3aeb --- /dev/null +++ b/packer/http/fedora-19/ks.cfg @@ -0,0 +1,51 @@ +install +cdrom +lang en_US.UTF-8 +keyboard us +network --bootproto=dhcp +rootpw --iscrypted $1$damlkd,f$UC/u5pUts5QiU3ow.CSso/ +firewall --disabled +authconfig --enableshadow --passalgo=sha512 +selinux --disabled +timezone UTC +bootloader --location=mbr +text +skipx +zerombr +clearpart --all --initlabel +part /boot --fstype=ext4 --size=500 +part pv.2 --grow --size=500 +volgroup vg_vagrant --pesize=32768 pv.2 +logvol / --fstype=ext4 --name=lv_root --vgname=vg_vagrant --size=1024 --grow +logvol swap --fstype=swap --name=lv_swap --vgname=vg_vagrant --size=528 --grow --maxsize=1056 +bootloader --location=mbr --append="norhgb biosdevname=0" +auth --useshadow --enablemd5 +firstboot --disabled +reboot + +%packages +@Core +bzip2 +gcc +kernel-devel +kernel-headers +openssl-devel +readline-devel +tar +wget +net-tools +zlib-devel +%end + +%post +# update root certs +wget -O/etc/pki/tls/certs/ca-bundle.crt http://curl.haxx.se/ca/cacert.pem +# vagrant +groupadd vagrant +useradd vagrant -g vagrant -G wheel -u 900 +echo "vagrant" | passwd --stdin vagrant +# sudo +echo 'Defaults:vagrant !requiretty' > /etc/sudoers.d/vagrant +echo '%vagrant ALL=(ALL) NOPASSWD: ALL' >> /etc/sudoers.d/vagrant +chmod 440 /etc/sudoers.d/vagrant +%end diff --git a/packer/http/fedora-20/ks.cfg b/packer/http/fedora-20/ks.cfg new file mode 100644 index 000000000..786aa3aeb --- /dev/null +++ b/packer/http/fedora-20/ks.cfg @@ -0,0 +1,51 @@ +install +cdrom +lang en_US.UTF-8 +keyboard us +network --bootproto=dhcp +rootpw --iscrypted $1$damlkd,f$UC/u5pUts5QiU3ow.CSso/ +firewall --disabled +authconfig --enableshadow --passalgo=sha512 +selinux --disabled +timezone UTC +bootloader --location=mbr +text +skipx +zerombr +clearpart --all --initlabel +part /boot --fstype=ext4 --size=500 +part pv.2 --grow --size=500 +volgroup vg_vagrant --pesize=32768 pv.2 +logvol / --fstype=ext4 --name=lv_root --vgname=vg_vagrant --size=1024 --grow +logvol swap --fstype=swap --name=lv_swap --vgname=vg_vagrant --size=528 --grow --maxsize=1056 +bootloader --location=mbr --append="norhgb biosdevname=0" +auth --useshadow --enablemd5 +firstboot --disabled +reboot + +%packages +@Core +bzip2 +gcc +kernel-devel +kernel-headers +openssl-devel +readline-devel +tar +wget +net-tools +zlib-devel +%end + +%post +# update root certs +wget -O/etc/pki/tls/certs/ca-bundle.crt http://curl.haxx.se/ca/cacert.pem +# vagrant +groupadd vagrant +useradd vagrant -g vagrant -G wheel -u 900 +echo "vagrant" | passwd --stdin vagrant +# sudo +echo 'Defaults:vagrant !requiretty' > /etc/sudoers.d/vagrant +echo '%vagrant ALL=(ALL) NOPASSWD: ALL' >> /etc/sudoers.d/vagrant +chmod 440 /etc/sudoers.d/vagrant +%end diff --git a/packer/http/ubuntu-10.04/preseed.cfg b/packer/http/ubuntu-10.04/preseed.cfg new file mode 100644 index 000000000..0a4d4939b --- /dev/null +++ b/packer/http/ubuntu-10.04/preseed.cfg @@ -0,0 +1,31 @@ +choose-mirror-bin mirror/http/proxy string +d-i base-installer/kernel/override-image string linux-server +d-i clock-setup/utc boolean true +d-i clock-setup/utc-auto boolean true +d-i finish-install/reboot_in_progress note +d-i grub-installer/only_debian boolean true +d-i grub-installer/with_other_os boolean true +d-i partman-auto-lvm/guided_size string max +d-i partman-auto/choose_recipe select atomic +d-i partman-auto/method string lvm +d-i partman-lvm/confirm boolean true +d-i partman-lvm/confirm boolean true +d-i partman-lvm/confirm_nooverwrite boolean true +d-i partman-lvm/device_remove_lvm boolean true +d-i partman/choose_partition select finish +d-i partman/confirm boolean true +d-i partman/confirm_nooverwrite boolean true +d-i partman/confirm_write_new_label boolean true +d-i passwd/user-fullname string vagrant +d-i passwd/user-uid string 900 +d-i passwd/user-password password vagrant +d-i passwd/user-password-again password vagrant +d-i passwd/username string vagrant +d-i pkgsel/include string openssh-server cryptsetup build-essential libssl-dev libreadline-dev zlib1g-dev linux-source dkms nfs-common +d-i pkgsel/install-language-support boolean false +d-i pkgsel/update-policy select unattended-upgrades +d-i pkgsel/upgrade select full-upgrade +d-i time/zone string UTC +d-i user-setup/allow-password-weak boolean true +d-i user-setup/encrypt-home boolean false +tasksel tasksel/first multiselect standard, ubuntu-server diff --git a/packer/http/ubuntu-10.10/preseed.cfg b/packer/http/ubuntu-10.10/preseed.cfg new file mode 100644 index 000000000..1744c4d16 --- /dev/null +++ b/packer/http/ubuntu-10.10/preseed.cfg @@ -0,0 +1,31 @@ +choose-mirror-bin mirror/http/proxy string +d-i base-installer/kernel/override-image string linux-server +d-i clock-setup/utc boolean true +d-i clock-setup/utc-auto boolean true +d-i finish-install/reboot_in_progress note +d-i grub-installer/only_debian boolean true +d-i grub-installer/with_other_os boolean true +d-i netcfg/wireless_wep string +d-i partman-auto-lvm/guided_size string max +d-i partman-auto/choose_recipe select atomic +d-i partman-auto/method string lvm +d-i partman-lvm/confirm boolean true +d-i partman-lvm/confirm_nooverwrite boolean true +d-i partman-lvm/device_remove_lvm boolean true +d-i partman/choose_partition select finish +d-i partman/confirm boolean true +d-i partman/confirm_nooverwrite boolean true +d-i partman/confirm_write_new_label boolean true +d-i passwd/user-fullname string vagrant +d-i passwd/user-uid string 900 +d-i passwd/user-password password vagrant +d-i passwd/user-password-again password vagrant +d-i passwd/username string vagrant +d-i pkgsel/include string openssh-server cryptsetup build-essential libssl-dev libreadline-dev zlib1g-dev linux-source dkms nfs-common +d-i pkgsel/install-language-support boolean false +d-i pkgsel/update-policy select none +d-i pkgsel/upgrade select full-upgrade +d-i time/zone string UTC +d-i user-setup/allow-password-weak boolean true +d-i user-setup/encrypt-home boolean false +tasksel tasksel/first multiselect standard, ubuntu-server diff --git a/packer/http/ubuntu-12.04/preseed.cfg b/packer/http/ubuntu-12.04/preseed.cfg new file mode 100644 index 000000000..0a4d4939b --- /dev/null +++ b/packer/http/ubuntu-12.04/preseed.cfg @@ -0,0 +1,31 @@ +choose-mirror-bin mirror/http/proxy string +d-i base-installer/kernel/override-image string linux-server +d-i clock-setup/utc boolean true +d-i clock-setup/utc-auto boolean true +d-i finish-install/reboot_in_progress note +d-i grub-installer/only_debian boolean true +d-i grub-installer/with_other_os boolean true +d-i partman-auto-lvm/guided_size string max +d-i partman-auto/choose_recipe select atomic +d-i partman-auto/method string lvm +d-i partman-lvm/confirm boolean true +d-i partman-lvm/confirm boolean true +d-i partman-lvm/confirm_nooverwrite boolean true +d-i partman-lvm/device_remove_lvm boolean true +d-i partman/choose_partition select finish +d-i partman/confirm boolean true +d-i partman/confirm_nooverwrite boolean true +d-i partman/confirm_write_new_label boolean true +d-i passwd/user-fullname string vagrant +d-i passwd/user-uid string 900 +d-i passwd/user-password password vagrant +d-i passwd/user-password-again password vagrant +d-i passwd/username string vagrant +d-i pkgsel/include string openssh-server cryptsetup build-essential libssl-dev libreadline-dev zlib1g-dev linux-source dkms nfs-common +d-i pkgsel/install-language-support boolean false +d-i pkgsel/update-policy select unattended-upgrades +d-i pkgsel/upgrade select full-upgrade +d-i time/zone string UTC +d-i user-setup/allow-password-weak boolean true +d-i user-setup/encrypt-home boolean false +tasksel tasksel/first multiselect standard, ubuntu-server diff --git a/packer/http/ubuntu-12.10/preseed.cfg b/packer/http/ubuntu-12.10/preseed.cfg new file mode 100644 index 000000000..0a4d4939b --- /dev/null +++ b/packer/http/ubuntu-12.10/preseed.cfg @@ -0,0 +1,31 @@ +choose-mirror-bin mirror/http/proxy string +d-i base-installer/kernel/override-image string linux-server +d-i clock-setup/utc boolean true +d-i clock-setup/utc-auto boolean true +d-i finish-install/reboot_in_progress note +d-i grub-installer/only_debian boolean true +d-i grub-installer/with_other_os boolean true +d-i partman-auto-lvm/guided_size string max +d-i partman-auto/choose_recipe select atomic +d-i partman-auto/method string lvm +d-i partman-lvm/confirm boolean true +d-i partman-lvm/confirm boolean true +d-i partman-lvm/confirm_nooverwrite boolean true +d-i partman-lvm/device_remove_lvm boolean true +d-i partman/choose_partition select finish +d-i partman/confirm boolean true +d-i partman/confirm_nooverwrite boolean true +d-i partman/confirm_write_new_label boolean true +d-i passwd/user-fullname string vagrant +d-i passwd/user-uid string 900 +d-i passwd/user-password password vagrant +d-i passwd/user-password-again password vagrant +d-i passwd/username string vagrant +d-i pkgsel/include string openssh-server cryptsetup build-essential libssl-dev libreadline-dev zlib1g-dev linux-source dkms nfs-common +d-i pkgsel/install-language-support boolean false +d-i pkgsel/update-policy select unattended-upgrades +d-i pkgsel/upgrade select full-upgrade +d-i time/zone string UTC +d-i user-setup/allow-password-weak boolean true +d-i user-setup/encrypt-home boolean false +tasksel tasksel/first multiselect standard, ubuntu-server diff --git a/packer/http/ubuntu-13.04/preseed.cfg b/packer/http/ubuntu-13.04/preseed.cfg new file mode 100644 index 000000000..0a4d4939b --- /dev/null +++ b/packer/http/ubuntu-13.04/preseed.cfg @@ -0,0 +1,31 @@ +choose-mirror-bin mirror/http/proxy string +d-i base-installer/kernel/override-image string linux-server +d-i clock-setup/utc boolean true +d-i clock-setup/utc-auto boolean true +d-i finish-install/reboot_in_progress note +d-i grub-installer/only_debian boolean true +d-i grub-installer/with_other_os boolean true +d-i partman-auto-lvm/guided_size string max +d-i partman-auto/choose_recipe select atomic +d-i partman-auto/method string lvm +d-i partman-lvm/confirm boolean true +d-i partman-lvm/confirm boolean true +d-i partman-lvm/confirm_nooverwrite boolean true +d-i partman-lvm/device_remove_lvm boolean true +d-i partman/choose_partition select finish +d-i partman/confirm boolean true +d-i partman/confirm_nooverwrite boolean true +d-i partman/confirm_write_new_label boolean true +d-i passwd/user-fullname string vagrant +d-i passwd/user-uid string 900 +d-i passwd/user-password password vagrant +d-i passwd/user-password-again password vagrant +d-i passwd/username string vagrant +d-i pkgsel/include string openssh-server cryptsetup build-essential libssl-dev libreadline-dev zlib1g-dev linux-source dkms nfs-common +d-i pkgsel/install-language-support boolean false +d-i pkgsel/update-policy select unattended-upgrades +d-i pkgsel/upgrade select full-upgrade +d-i time/zone string UTC +d-i user-setup/allow-password-weak boolean true +d-i user-setup/encrypt-home boolean false +tasksel tasksel/first multiselect standard, ubuntu-server diff --git a/packer/scripts/centos/cleanup.sh b/packer/scripts/centos/cleanup.sh new file mode 100644 index 000000000..19e473a9f --- /dev/null +++ b/packer/scripts/centos/cleanup.sh @@ -0,0 +1,5 @@ +#!/bin/bash -eux +yum -y erase gtk2 libX11 hicolor-icon-theme avahi freetype bitstream-vera-fonts kudzu +yum -y clean all +rm -rf VBoxGuestAdditions_*.iso VBoxGuestAdditions_*.iso.? +rm -f /tmp/chef*rpm diff --git a/packer/scripts/centos/ks.cfg b/packer/scripts/centos/ks.cfg new file mode 100644 index 000000000..e00fd5a2a --- /dev/null +++ b/packer/scripts/centos/ks.cfg @@ -0,0 +1,39 @@ +install +cdrom +lang en_US.UTF-8 +keyboard us +network --bootproto=dhcp +rootpw --iscrypted $1$damlkd,f$UC/u5pUts5QiU3ow.CSso/ +firewall --disabled +authconfig --enableshadow --passalgo=sha512 +selinux --disabled +timezone UTC +bootloader --location=mbr +text +skipx +zerombr +clearpart --all --initlabel +autopart +auth --useshadow --enablemd5 +firstboot --disabled +reboot + +%packages --ignoremissing +@Base +@Core +@Development Tools +openssl-devel +readline-devel +zlib-devel +kernel-devel + +%post +# update root certs +wget -O/etc/pki/tls/certs/ca-bundle.crt http://curl.haxx.se/ca/cacert.pem +# vagrant +groupadd vagrant -g 999 +useradd vagrant -g vagrant -G wheel -u 900 +echo "vagrant" | passwd --stdin vagrant +# sudo +echo "vagrant ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers +sed -i "s/^.*requiretty/#Defaults requiretty/" /etc/sudoers diff --git a/packer/scripts/common/chef.sh b/packer/scripts/common/chef.sh new file mode 100644 index 000000000..c359971d0 --- /dev/null +++ b/packer/scripts/common/chef.sh @@ -0,0 +1,3 @@ +#!/bin/bash -eux + +curl -L www.opscode.com/chef/install.sh | bash \ No newline at end of file diff --git a/packer/scripts/common/minimize.sh b/packer/scripts/common/minimize.sh new file mode 100644 index 000000000..66a67663a --- /dev/null +++ b/packer/scripts/common/minimize.sh @@ -0,0 +1,7 @@ +#!/bin/bash -eux + +dd if=/dev/zero of=/EMPTY bs=1M +rm -f /EMPTY +# Block until the empty file has been removed, otherwise, Packer +# will try to kill the box while the disk is still full and that's bad +sync diff --git a/packer/scripts/common/shutdown.sh b/packer/scripts/common/shutdown.sh new file mode 100644 index 000000000..7d7aee557 --- /dev/null +++ b/packer/scripts/common/shutdown.sh @@ -0,0 +1 @@ +shutdown -P now diff --git a/packer/scripts/common/sshd.sh b/packer/scripts/common/sshd.sh new file mode 100644 index 000000000..c6e4f20a6 --- /dev/null +++ b/packer/scripts/common/sshd.sh @@ -0,0 +1,3 @@ +#!/bin/bash -eux + +echo "UseDNS no" >> /etc/ssh/sshd_config diff --git a/packer/scripts/common/sudoers.sh b/packer/scripts/common/sudoers.sh new file mode 100644 index 000000000..5fce3dd2c --- /dev/null +++ b/packer/scripts/common/sudoers.sh @@ -0,0 +1,4 @@ +#!/bin/bash -eux + +sed -i -e '/Defaults\s\+env_reset/a Defaults\texempt_group=sudo' /etc/sudoers +sed -i -e 's/%sudo ALL=(ALL:ALL) ALL/%sudo ALL=NOPASSWD:ALL/g' /etc/sudoers diff --git a/packer/scripts/common/vagrant.sh b/packer/scripts/common/vagrant.sh new file mode 100644 index 000000000..de5925554 --- /dev/null +++ b/packer/scripts/common/vagrant.sh @@ -0,0 +1,8 @@ +#!/bin/bash + +mkdir /home/vagrant/.ssh +wget --no-check-certificate \ + 'https://github.com/mitchellh/vagrant/raw/master/keys/vagrant.pub' \ + -O /home/vagrant/.ssh/authorized_keys +chown -R vagrant /home/vagrant/.ssh +chmod -R go-rwsx /home/vagrant/.ssh diff --git a/packer/scripts/common/vmtools.sh b/packer/scripts/common/vmtools.sh new file mode 100644 index 000000000..a49332626 --- /dev/null +++ b/packer/scripts/common/vmtools.sh @@ -0,0 +1,27 @@ +#!/bin/bash + +if [ -f /home/vagrant/.vbox_version ]; then + mkdir /tmp/vbox + VER=$(cat /home/vagrant/.vbox_version) + mount -o loop /home/vagrant/VBoxGuestAdditions_$VER.iso /tmp/vbox + sh /tmp/vbox/VBoxLinuxAdditions.run + umount /tmp/vbox + rmdir /tmp/vbox + rm /home/vagrant/*.iso +fi + +if [ -f /home/vagrant/vmware_tools.iso ]; then + echo "Installing VMWare Tools" + #Set Linux-specific paths and ISO filename + home_dir="/home/vagrant" + iso_name="vmware_tools.iso" + mount_point="/tmp/vmware-tools" + #Run install, unmount ISO and remove it + mkdir ${mount_point} + cd ${home_dir} + /bin/mount -o loop ${iso_name} ${mount_point} + tar zxf ${mount_point}/*.tar.gz && cd vmware-tools-distrib && ./vmware-install.pl --default + /bin/umount ${mount_point} + /bin/rm -rf ${home_dir}/${iso_name} ${home_dir}/vmware-tools-distrib + rmdir ${mount_point} +fi diff --git a/packer/scripts/debian/cleanup.sh b/packer/scripts/debian/cleanup.sh new file mode 100644 index 000000000..6c7f703d6 --- /dev/null +++ b/packer/scripts/debian/cleanup.sh @@ -0,0 +1,6 @@ +#!/bin/bash -eux + +apt-get -y autoremove +apt-get -y clean +rm -rf VBoxGuestAdditions_*.iso VBoxGuestAdditions_*.iso.? +rm -f /tmp/chef*deb diff --git a/packer/scripts/debian/networking.sh b/packer/scripts/debian/networking.sh new file mode 100644 index 000000000..de3269a58 --- /dev/null +++ b/packer/scripts/debian/networking.sh @@ -0,0 +1,7 @@ +#!/bin/bash -eux + +rm /etc/udev/rules.d/70-persistent-net.rules +mkdir /etc/udev/rules.d/70-persistent-net.rules +rm /lib/udev/rules.d/75-persistent-net-generator.rules +rm -rf /dev/.udev/ /var/lib/dhcp3/* +echo "pre-up sleep 2" >> /etc/network/interfaces diff --git a/packer/scripts/debian/preseed.cfg b/packer/scripts/debian/preseed.cfg new file mode 100644 index 000000000..820f090c5 --- /dev/null +++ b/packer/scripts/debian/preseed.cfg @@ -0,0 +1,47 @@ +choose-mirror-bin mirror/http/proxy string +d-i apt-setup/use_mirror boolean true +d-i base-installer/kernel/override-image string linux-server +d-i clock-setup/utc boolean true +d-i clock-setup/utc-auto boolean true +d-i finish-install/reboot_in_progress note +d-i grub-installer/only_debian boolean true +d-i grub-installer/with_other_os boolean true +d-i keymap select us +d-i mirror/country string manual +d-i mirror/http/directory string /debian +d-i mirror/http/hostname string mirrors.kernel.org +d-i mirror/http/proxy string +d-i partman-auto-lvm/guided_size string max +d-i partman-auto/choose_recipe select atomic +d-i partman-auto/method string lvm +d-i partman-lvm/confirm boolean true +d-i partman-lvm/confirm boolean true +d-i partman-lvm/confirm_nooverwrite boolean true +d-i partman-lvm/device_remove_lvm boolean true +d-i partman/choose_partition select finish +d-i partman/confirm boolean true +d-i partman/confirm_nooverwrite boolean true +d-i partman/confirm_write_new_label boolean true +d-i passwd/root-login boolean false +d-i passwd/root-password-again password vagrant +d-i passwd/root-password password vagrant +d-i passwd/user-fullname string vagrant +d-i passwd/user-uid string 900 +d-i passwd/user-password password vagrant +d-i passwd/user-password-again password vagrant +d-i passwd/username string vagrant +d-i pkgsel/include string openssh-server sudo bzip2 acpid cryptsetup zlib1g-dev wget curl dkms make +d-i pkgsel/install-language-support boolean false +d-i pkgsel/update-policy select unattended-upgrades +d-i pkgsel/upgrade select full-upgrade +# Prevent packaged version of VirtualBox Guest Additions being installed: +d-i preseed/early_command string sed -i \ + '/in-target/idiscover(){/sbin/discover|grep -v VirtualBox;}' \ + /usr/lib/pre-pkgsel.d/20install-hwpackages +d-i time/zone string UTC +d-i user-setup/allow-password-weak boolean true +d-i user-setup/encrypt-home boolean false +apt-cdrom-setup apt-setup/cdrom/set-first boolean false +apt-mirror-setup apt-setup/use_mirror boolean true +popularity-contest popularity-contest/participate boolean false +tasksel tasksel/first multiselect standard, ubuntu-server diff --git a/packer/scripts/debian/sudoers.sh b/packer/scripts/debian/sudoers.sh new file mode 100644 index 000000000..3fdfb5418 --- /dev/null +++ b/packer/scripts/debian/sudoers.sh @@ -0,0 +1,7 @@ +#!/bin/bash -eux + +# Only add the secure path line if it is not already present - Debian 7.1.0 +# includes it by default. +grep -q 'secure_path' /etc/sudoers || sed -i -e '/Defaults\s\+env_reset/a Defaults\tsecure_path="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"' /etc/sudoers + +sed -i -e 's/^%sudo.*/%sudo ALL=(ALL) NOPASSWD: ALL/' /etc/sudoers diff --git a/packer/scripts/debian/update.sh b/packer/scripts/debian/update.sh new file mode 100644 index 000000000..a4cc91499 --- /dev/null +++ b/packer/scripts/debian/update.sh @@ -0,0 +1,4 @@ +#!/bin/bash -eux + +apt-get update +apt-get -y upgrade diff --git a/packer/scripts/fedora/cleanup.sh b/packer/scripts/fedora/cleanup.sh new file mode 100644 index 000000000..a4d82c900 --- /dev/null +++ b/packer/scripts/fedora/cleanup.sh @@ -0,0 +1,4 @@ +#!/bin/bash -eux +yum -y erase gtk2 libX11 hicolor-icon-theme freetype +yum -y clean all +rm -f /tmp/chef*rpm diff --git a/packer/scripts/fedora/ks.cfg b/packer/scripts/fedora/ks.cfg new file mode 100644 index 000000000..92561c227 --- /dev/null +++ b/packer/scripts/fedora/ks.cfg @@ -0,0 +1,50 @@ +install +cdrom +lang en_US.UTF-8 +keyboard us +network --bootproto=dhcp +rootpw --iscrypted $1$damlkd,f$UC/u5pUts5QiU3ow.CSso/ +firewall --disabled +authconfig --enableshadow --passalgo=sha512 +selinux --disabled +timezone UTC +bootloader --location=mbr +text +skipx +zerombr +clearpart --all --initlabel +part /boot --fstype=ext4 --size=500 +part pv.2 --grow --size=500 +volgroup vg_vagrant --pesize=32768 pv.2 +logvol / --fstype=ext4 --name=lv_root --vgname=vg_vagrant --size=1024 --grow +logvol swap --fstype=swap --name=lv_swap --vgname=vg_vagrant --size=528 --grow --maxsize=1056 +bootloader --location=mbr --append="norhgb biosdevname=0" +auth --useshadow --enablemd5 +firstboot --disabled +reboot + +%packages +@Core +bzip2 +gcc +kernel-devel +kernel-headers +openssl-devel +readline-devel +tar +wget +zlib-devel +%end + +%post +# update root certs +wget -O /etc/pki/tls/certs/ca-bundle.crt http://curl.haxx.se/ca/cacert.pem +# vagrant +groupadd vagrant +useradd vagrant -g vagrant -G wheel -u 900 +echo "vagrant" | passwd --stdin vagrant +# sudo +echo 'Defaults:vagrant !requiretty' > /etc/sudoers.d/vagrant +echo '%vagrant ALL=(ALL) NOPASSWD: ALL' >> /etc/sudoers.d/vagrant +chmod 440 /etc/sudoers.d/vagrant +%end diff --git a/packer/scripts/fedora/shutdown.sh b/packer/scripts/fedora/shutdown.sh new file mode 100644 index 000000000..bb7ec991b --- /dev/null +++ b/packer/scripts/fedora/shutdown.sh @@ -0,0 +1 @@ +/sbin/halt -h -p diff --git a/packer/scripts/fedora/sudoers.sh b/packer/scripts/fedora/sudoers.sh new file mode 100644 index 000000000..da3af2d5a --- /dev/null +++ b/packer/scripts/fedora/sudoers.sh @@ -0,0 +1,4 @@ +#!/bin/bash -eux + +sed -i -e '/Defaults\s\+env_reset/a Defaults\texempt_group=sudo' /etc/sudoers +sed -i -e 's/%admin ALL=(ALL) ALL/%sudo ALL=NOPASSWD:ALL/g' /etc/sudoers diff --git a/packer/scripts/suse/sudoers.sh b/packer/scripts/suse/sudoers.sh new file mode 100644 index 000000000..eb80f3f88 --- /dev/null +++ b/packer/scripts/suse/sudoers.sh @@ -0,0 +1,3 @@ +# update sudoers - can't do this in autoinst.xml +echo -e "\nupdate sudoers ..." +echo -e "vagrant ALL=(ALL) NOPASSWD: ALL\n" >> /etc/sudoers diff --git a/packer/scripts/ubuntu/cleanup.sh b/packer/scripts/ubuntu/cleanup.sh new file mode 100644 index 000000000..6c7f703d6 --- /dev/null +++ b/packer/scripts/ubuntu/cleanup.sh @@ -0,0 +1,6 @@ +#!/bin/bash -eux + +apt-get -y autoremove +apt-get -y clean +rm -rf VBoxGuestAdditions_*.iso VBoxGuestAdditions_*.iso.? +rm -f /tmp/chef*deb diff --git a/packer/scripts/ubuntu/networking.sh b/packer/scripts/ubuntu/networking.sh new file mode 100644 index 000000000..de3269a58 --- /dev/null +++ b/packer/scripts/ubuntu/networking.sh @@ -0,0 +1,7 @@ +#!/bin/bash -eux + +rm /etc/udev/rules.d/70-persistent-net.rules +mkdir /etc/udev/rules.d/70-persistent-net.rules +rm /lib/udev/rules.d/75-persistent-net-generator.rules +rm -rf /dev/.udev/ /var/lib/dhcp3/* +echo "pre-up sleep 2" >> /etc/network/interfaces diff --git a/packer/scripts/ubuntu/preseed.cfg b/packer/scripts/ubuntu/preseed.cfg new file mode 100644 index 000000000..903f2e14b --- /dev/null +++ b/packer/scripts/ubuntu/preseed.cfg @@ -0,0 +1,31 @@ +choose-mirror-bin mirror/http/proxy string +d-i base-installer/kernel/override-image string linux-server +d-i clock-setup/utc boolean true +d-i clock-setup/utc-auto boolean true +d-i finish-install/reboot_in_progress note +d-i grub-installer/only_debian boolean true +d-i grub-installer/with_other_os boolean true +d-i partman-auto-lvm/guided_size string max +d-i partman-auto/choose_recipe select atomic +d-i partman-auto/method string lvm +d-i partman-lvm/confirm boolean true +d-i partman-lvm/confirm boolean true +d-i partman-lvm/confirm_nooverwrite boolean true +d-i partman-lvm/device_remove_lvm boolean true +d-i partman/choose_partition select finish +d-i partman/confirm boolean true +d-i partman/confirm_nooverwrite boolean true +d-i partman/confirm_write_new_label boolean true +d-i passwd/user-fullname string vagrant +d-i passwd/user-uid string 900 +d-i passwd/user-password password vagrant +d-i passwd/user-password-again password vagrant +d-i passwd/username string vagrant +d-i pkgsel/include string openssh-server cryptsetup build-essential libssl-dev libreadline-dev zlib1g-dev linux-source dkms +d-i pkgsel/install-language-support boolean false +d-i pkgsel/update-policy select unattended-upgrades +d-i pkgsel/upgrade select full-upgrade +d-i time/zone string UTC +d-i user-setup/allow-password-weak boolean true +d-i user-setup/encrypt-home boolean false +tasksel tasksel/first multiselect standard, ubuntu-server diff --git a/packer/scripts/ubuntu/sudoers.sh b/packer/scripts/ubuntu/sudoers.sh new file mode 100644 index 000000000..ce45b7611 --- /dev/null +++ b/packer/scripts/ubuntu/sudoers.sh @@ -0,0 +1,4 @@ +#!/bin/bash -eux + +sed -i -e '/Defaults\s\+env_reset/a Defaults\texempt_group=admin' /etc/sudoers +sed -i -e 's/%admin ALL=(ALL) ALL/%admin ALL=NOPASSWD:ALL/g' /etc/sudoers diff --git a/packer/scripts/ubuntu/update.sh b/packer/scripts/ubuntu/update.sh new file mode 100644 index 000000000..80e8dd3f9 --- /dev/null +++ b/packer/scripts/ubuntu/update.sh @@ -0,0 +1,15 @@ +#!/bin/bash -eux + +apt-get update +apt-get -y upgrade + +# ensure the correct kernel headers are installed +apt-get -y install linux-headers-$(uname -r) + +# update package index on boot +cat <<EOF > /etc/init/refresh-apt.conf +description "update package index" +start on networking +task +exec /usr/bin/apt-get update +EOF diff --git a/packer/scripts/windows/install-chef.bat b/packer/scripts/windows/install-chef.bat new file mode 100644 index 000000000..2107a1b29 --- /dev/null +++ b/packer/scripts/windows/install-chef.bat @@ -0,0 +1,47 @@ +@REM Loop ten times to make sure outbound networking is up +FOR /L %%n IN (1,1,10) DO ( + PING -n 1 www.opscode.com + IF %ERRORLEVEL% == 0 CALL :wget + TIMEOUT 10 +) + +:err +ECHO "Couldn't reach Opscode even after 10 retries" +GOTO :done + +:wget +@rem Install Chef using chef-client MSI installer +@setlocal + +@set REMOTE_SOURCE_MSI_URL=https://www.opscode.com/chef/install.msi +@set LOCAL_DESTINATION_MSI_PATH=%TEMP%\chef-client-latest.msi +@set FALLBACK_QUERY_STRING=?DownloadContext=PowerShell + +@set ALTERNATE_DOWNLOAD_COMMAND=$webClient=new-object System.Net.WebClient; $webClient.DownloadFile('%REMOTE_SOURCE_MSI_URL%%FALLBACK_QUERY_STRING%', '%LOCAL_DESTINATION_MSI_PATH%') + +cscript /nologo %TEMP%\wget.vbs /url:%REMOTE_SOURCE_MSI_URL% /path:"%LOCAL_DESTINATION_MSI_PATH%" + +@rem Work around issues found in Windows Server 2012 around job objects not respecting WSMAN memory quotas +@rem that cause the MSI download process to exceed the quota even when it is increased by administrators. +@rem Retry the download using a more memory-efficient mechanism that only works if PowerShell is available. +@if ERRORLEVEL 1 ( + echo Warning: Failed to download %REMOTE_SOURCE_MSI_URL% to %LOCAL_DESTINATION_MSI_PATH% + echo Warning: Retrying download with PowerShell if available + if EXIST "%LOCAL_DESTINATION_MSI_PATH%" del /f /q "%LOCAL_DESTINATION_MSI_PATH%" + echo powershell -noprofile -noninteractive -command "%ALTERNATE_DOWNLOAD_COMMAND%" + powershell -noprofile -noninteractive -command "%ALTERNATE_DOWNLOAD_COMMAND%" + if NOT ERRORLEVEL 1 ( + echo Download succeeded + ) else ( + echo Failed to download %REMOTE_SOURCE_MSI_URL% + echo Subsequent attempt to install the downloaded MSI is likely to fail + ) +) + +msiexec /qb /i "%LOCAL_DESTINATION_MSI_PATH%" + +@endlocal +EXIT + +:done +EXIT diff --git a/packer/scripts/windows/install-vbox.bat b/packer/scripts/windows/install-vbox.bat new file mode 100644 index 000000000..614c415c7 --- /dev/null +++ b/packer/scripts/windows/install-vbox.bat @@ -0,0 +1,4 @@ +cmd /c certutil -addstore -f "TrustedPublisher" a:oracle-cert.cer +cmd /c e:\VBoxWindowsAdditions-amd64.exe /S +cmd /c shutdown.exe /r /t 5 /d p:2:4 /c "Vagrant reboot for VBoxWindowsAdditions" + diff --git a/packer/scripts/windows/mount-validation.bat b/packer/scripts/windows/mount-validation.bat new file mode 100644 index 000000000..ae458c1d6 --- /dev/null +++ b/packer/scripts/windows/mount-validation.bat @@ -0,0 +1,3 @@ +REM This is so we can pass the validation test... I don't know that it's necessary +cmd /c net use z: \\vboxsrv\veewee-validation + diff --git a/packer/scripts/windows/oracle-cert.cer b/packer/scripts/windows/oracle-cert.cer new file mode 100644 index 0000000000000000000000000000000000000000..6f3380d48553956036650bc711ca5aed73a1224d GIT binary patch literal 1398 zcmXqLVl6UgVu@P7%*4pVBoH|JX8KPK#!$sYJbaVIzH}P!vT<s)d9;1!Wn^S!WiV*m zV#sa4$;KSY!Y0fV8f++TAPVAe3G;=e7G(x!rswG>c;+SR8Oj^Tf+V<w#b6Q&Aw{Ld zB?^A2CFS`=*@o5zmJkI-A*n^V#R~ap3Z=!V3W+5O86_nJ#a8<I<>lpiWk6Glfu`yu z=jZAd6(lNXBx@QP80s15fHX4;tHMop&PgmTRxnm@&QD2I068QxFI~aNz|cU!+0j5w zoY&CMz{tSD01TplToWMI+{oC}($q4_pm8gzw}cG@LFRJ^b2%sGWTxd8<z*(q{K_uO z7nGV(o}Zth5S)=;lv->kZ6FC!%_Sn_UzC`flL~Z0Q9*uDVo7Fxo}rzA4aA?OE}7|> zC5br-o-PV7$LcEhW+oTq7w4yyC<FtE^2DN4g)pF%DPYYCWkxW=nXwse(8Q>O97Bw( z49rc8{0u;GE~X|%MuyHw?*%`8FjtXzIendtSKY3w*O-60EAjFQ2OV~w_ftDDLUzu_ z85<Wa=?S-*nejb)|0Bzi=ZAKyJXs+1{&U}<E!<r7eBtNQVs{iy`CpdM8+pV3kFKYd z;{O}R&%U~HRFb)|&*|X#58c1RGz)!dcTGuVbeeB)eCp1-hX0aX)OY`{ZrXppaE9c( z=3cQz#vO?t;*(yVb7)<pC3A9tz>SryzkP0TS}(uOwDSCq)A{l5xun*{K0kH+^Qm$< z{v9i2H}l%A36FnQYWvH^<3!H>xUK(c<{T^S(EK-X{(E*tk9{wuILuppXYONpzdIrm z6;8kD=Vfr5%TV)i?iWRwFs0(DVJoe?Co?fKGB7S~Vyp&+NI5v&$_leE888^|0pmoL zpONuD3kx$7dxL=kh%e7#X<%+(y1;mWVVgcE6#^4sa&fY;E+`r4CKu(PCP(LBXNZ&@ zP|CmsWP$>VtpO-ub0@TUFt+`0Wn>p;HqbKAVB^qc1LhxgCPpzCe97BD7-Whn3y%R8 zObau!K_QII$jFjvkZhm=;~OxxNkHA1pIlsk;yeRuxGE+rzDdkXL{YAf<eStY19^}; zlvyMU#2Q4-&s_PcTJ4MX$-e&UA6V7iKfbhlE--&^Lj33ibQCZQSp*Ek*tmecWMOPF zXJV9Q;V@tWCO}{aBPUQ`5duu0j10%my}A5s>tn4l8@-n`97fxDH}mY7!8P?YpYXXe zANBj<Zy#8B<=plhr2w0$&kh}Y;3_J_rq%O(!d;Kdh!69Qrx$0(Z#pBlLibZ#!*^ku zETe+LaLfPw_xTrys&70sPe)j1+iVq`aMSBM(lw_ziD+!<3Y)OpMqT!-=r7Lxi?JI@ z<mcTks*7urddn8t7Ob=7j{GmlCwc6O!YLD(?sT2IaC=(b)&muZ35!DO?Rt6F3ICk! zzWcisYuQ$<<p-zv%;P9Gxv*7GE-~|}O~UcDuPhm!mwENJ*Y;evpI^83&Bmf4#}q;F kZ>ww{IP}*EUbv-wBB=FaQSwz;n~wTPeHRx#@~!?40OZx*k^lez literal 0 HcmV?d00001 diff --git a/packer/ubuntu-10.04-amd64.json b/packer/ubuntu-10.04-amd64.json new file mode 100644 index 000000000..9d10a50af --- /dev/null +++ b/packer/ubuntu-10.04-amd64.json @@ -0,0 +1,134 @@ +{ + "builders": [ + { + "boot_command": [ + "<esc><wait>", + "<esc><wait>", + "<enter><wait>", + "/install/vmlinuz<wait>", + " auto<wait>", + " console-setup/ask_detect=false<wait>", + " console-setup/layoutcode=us<wait>", + " console-setup/modelcode=pc105<wait>", + " debconf/frontend=noninteractive<wait>", + " debian-installer=en_US<wait>", + " fb=false<wait>", + " initrd=/install/initrd.gz<wait>", + " kbd-chooser/method=us<wait>", + " keyboard-configuration/layout=USA<wait>", + " keyboard-configuration/variant=USA<wait>", + " locale=en_US<wait>", + " netcfg/get_domain=vm<wait>", + " netcfg/get_hostname=vagrant<wait>", + " noapic<wait>", + " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/ubuntu-10.04/preseed.cfg<wait>", + " -- <wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "guest_os_type": "Ubuntu_64", + "http_directory": "http", + "iso_checksum": "796e80702d65f2ee96e88874a1ab437e24df9cd6", + "iso_checksum_type": "sha1", + "iso_url": "http://releases.ubuntu.com/10.04.4/ubuntu-10.04.4-server-amd64.iso", + "shutdown_command": "echo 'vagrant'|sudo -S sh '/tmp/shutdown.sh'", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "name": "ubuntu-10.04-amd64-vbox", + "type": "virtualbox", + "vboxmanage": [ + [ + "modifyvm", + "{{.Name}}", + "--memory", + "384" + ], + [ + "modifyvm", + "{{.Name}}", + "--cpus", + "1" + ] + ], + "virtualbox_version_file": ".vbox_version" + }, + { + "boot_command": [ + "<esc><wait>", + "<esc><wait>", + "<enter><wait>", + "/install/vmlinuz<wait>", + " auto<wait>", + " console-setup/ask_detect=false<wait>", + " console-setup/layoutcode=us<wait>", + " console-setup/modelcode=pc105<wait>", + " debconf/frontend=noninteractive<wait>", + " debian-installer=en_US<wait>", + " fb=false<wait>", + " initrd=/install/initrd.gz<wait>", + " kbd-chooser/method=us<wait>", + " keyboard-configuration/layout=USA<wait>", + " keyboard-configuration/variant=USA<wait>", + " locale=en_US<wait>", + " netcfg/get_domain=vm<wait>", + " netcfg/get_hostname=vagrant<wait>", + " noapic<wait>", + " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/ubuntu-10.04/preseed.cfg<wait>", + " -- <wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "guest_os_type": "ubuntu-64", + "http_directory": "http", + "iso_checksum": "796e80702d65f2ee96e88874a1ab437e24df9cd6", + "iso_checksum_type": "sha1", + "iso_url": "http://releases.ubuntu.com/10.04.4/ubuntu-10.04.4-server-amd64.iso", + "shutdown_command": "echo 'vagrant'|sudo -S sh '/tmp/shutdown.sh'", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "tools_upload_flavor": "linux", + "tools_upload_path": "/home/vagrant/vmware_tools.iso", + "name": "ubuntu-10.04-amd64-vmware", + "type": "vmware", + "vmx_data": { + "cpuid.coresPerSocket": "1", + "memsize": "384", + "numvcpus": "1" + } + } + ], + "post-processors": [ + { + "output": "ubuntu-10.04-amd64-{{.Provider}}.box", + "type": "vagrant" + } + ], + "provisioners": [ + { + "type": "file", + "source": "scripts/common/shutdown.sh", + "destination": "/tmp/shutdown.sh" + }, + { + "execute_command": "echo 'vagrant' | sudo -S bash '{{.Path}}'", + "scripts": [ + "scripts/ubuntu/update.sh", + "scripts/common/sshd.sh", + "scripts/ubuntu/networking.sh", + "scripts/ubuntu/sudoers.sh", + "scripts/common/vagrant.sh", + "scripts/common/vmtools.sh", + "scripts/ubuntu/cleanup.sh", + "scripts/common/minimize.sh" + ], + "type": "shell" + } + ] +} diff --git a/packer/ubuntu-10.04-i386.json b/packer/ubuntu-10.04-i386.json new file mode 100644 index 000000000..2884b7973 --- /dev/null +++ b/packer/ubuntu-10.04-i386.json @@ -0,0 +1,135 @@ +{ + "builders": [ + { + "boot_command": [ + "<esc><wait>", + "<esc><wait>", + "<enter><wait>", + "/install/vmlinuz<wait>", + " auto<wait>", + " console-setup/ask_detect=false<wait>", + " console-setup/layoutcode=us<wait>", + " console-setup/modelcode=pc105<wait>", + " debconf/frontend=noninteractive<wait>", + " debian-installer=en_US<wait>", + " fb=false<wait>", + " initrd=/install/initrd.gz<wait>", + " kbd-chooser/method=us<wait>", + " keyboard-configuration/layout=USA<wait>", + " keyboard-configuration/variant=USA<wait>", + " locale=en_US<wait>", + " netcfg/get_domain=vm<wait>", + " netcfg/get_hostname=vagrant<wait>", + " noapic<wait>", + " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/ubuntu-10.04/preseed.cfg<wait>", + " -- <wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "guest_os_type": "Ubuntu", + "http_directory": "http", + "iso_checksum": "5695d8b6b914269d1374ac8d4c3dd3786e92d3fe", + "iso_checksum_type": "sha1", + "iso_url": "http://releases.ubuntu.com/10.04.4/ubuntu-10.04.4-server-i386.iso", + "shutdown_command": "echo 'vagrant'|sudo -S sh '/tmp/shutdown.sh'", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "name": "ubuntu-10.04-i386-vbox", + "type": "virtualbox", + "vboxmanage": [ + [ + "modifyvm", + "{{.Name}}", + "--memory", + "384" + ], + [ + "modifyvm", + "{{.Name}}", + "--cpus", + "1" + ] + ], + "virtualbox_version_file": ".vbox_version" + }, + { + "boot_command": [ + "<esc><wait>", + "<esc><wait>", + "<enter><wait>", + "/install/vmlinuz<wait>", + " auto<wait>", + " console-setup/ask_detect=false<wait>", + " console-setup/layoutcode=us<wait>", + " console-setup/modelcode=pc105<wait>", + " debconf/frontend=noninteractive<wait>", + " debian-installer=en_US<wait>", + " fb=false<wait>", + " initrd=/install/initrd.gz<wait>", + " kbd-chooser/method=us<wait>", + " keyboard-configuration/layout=USA<wait>", + " keyboard-configuration/variant=USA<wait>", + " locale=en_US<wait>", + " netcfg/get_domain=vm<wait>", + " netcfg/get_hostname=vagrant<wait>", + " noapic<wait>", + " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/ubuntu-10.04/preseed.cfg<wait>", + " -- <wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "guest_os_type": "ubuntu", + "http_directory": "http", + "iso_checksum": "5695d8b6b914269d1374ac8d4c3dd3786e92d3fe", + "iso_checksum_type": "sha1", + "iso_url": "http://releases.ubuntu.com/10.04.4/ubuntu-10.04.4-server-i386.iso", + "shutdown_command": "echo 'vagrant'|sudo -S sh '/tmp/shutdown.sh'", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "tools_upload_flavor": "linux", + "tools_upload_path": "/home/vagrant/vmware_tools.iso", + "name": "ubuntu-10.04-i386-vmware", + "type": "vmware", + "vmx_data": { + "cpuid.coresPerSocket": "1", + "memsize": "384", + "numvcpus": "1" + } + } + ], + "post-processors": [ + { + "output": "ubuntu-10.04-i386-{{.Provider}}.box", + "type": "vagrant" + } + ], + "provisioners": [ + { + "type": "file", + "source": "scripts/common/shutdown.sh", + "destination": "/tmp/shutdown.sh" + }, + { + "execute_command": "echo 'vagrant'|sudo -S sh '{{.Path}}'", + "scripts": [ + "scripts/ubuntu/update.sh", + "scripts/common/sshd.sh", + "scripts/ubuntu/networking.sh", + "scripts/ubuntu/sudoers.sh", + "scripts/common/vagrant.sh", + "scripts/common/vmtools.sh", + "scripts/ubuntu/cleanup.sh", + "scripts/common/minimize.sh" + ], + "type": "shell" + } + ] +} + diff --git a/packer/ubuntu-12.04-amd64.json b/packer/ubuntu-12.04-amd64.json new file mode 100644 index 000000000..ff3b87834 --- /dev/null +++ b/packer/ubuntu-12.04-amd64.json @@ -0,0 +1,135 @@ +{ + "builders": [ + { + "type": "virtualbox", + "name": "ubuntu-12.04-amd64-vbox", + "boot_command": [ + "<esc><wait>", + "<esc><wait>", + "<enter><wait>", + "/install/vmlinuz<wait>", + " auto<wait>", + " console-setup/ask_detect=false<wait>", + " console-setup/layoutcode=us<wait>", + " console-setup/modelcode=pc105<wait>", + " debconf/frontend=noninteractive<wait>", + " debian-installer=en_US<wait>", + " fb=false<wait>", + " initrd=/install/initrd.gz<wait>", + " kbd-chooser/method=us<wait>", + " keyboard-configuration/layout=USA<wait>", + " keyboard-configuration/variant=USA<wait>", + " locale=en_US<wait>", + " netcfg/get_domain=vm<wait>", + " netcfg/get_hostname=vagrant<wait>", + " noapic<wait>", + " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/ubuntu-12.04/preseed.cfg<wait>", + " -- <wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "guest_os_type": "Ubuntu_64", + "http_directory": "http", + "iso_checksum": "4e36c272dde245cfadf14ff8895566571a38f4d2", + "iso_checksum_type": "sha1", + "iso_url": "http://releases.ubuntu.com/12.04/ubuntu-12.04.3-server-amd64.iso", + "ssh_username": "vagrant", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_wait_timeout": "10000s", + "shutdown_command": "echo 'vagrant'|sudo -S sh '/tmp/shutdown.sh'", + "guest_additions_path": "VBoxGuestAdditions_{{ .Version }}.iso", + "virtualbox_version_file": ".vbox_version", + "vboxmanage": [ + [ + "modifyvm", + "{{.Name}}", + "--memory", + "384" + ], + [ + "modifyvm", + "{{.Name}}", + "--cpus", + "1" + ] + ] + }, + { + "boot_command": [ + "<esc><wait>", + "<esc><wait>", + "<enter><wait>", + "/install/vmlinuz<wait>", + " auto<wait>", + " console-setup/ask_detect=false<wait>", + " console-setup/layoutcode=us<wait>", + " console-setup/modelcode=pc105<wait>", + " debconf/frontend=noninteractive<wait>", + " debian-installer=en_US<wait>", + " fb=false<wait>", + " initrd=/install/initrd.gz<wait>", + " kbd-chooser/method=us<wait>", + " keyboard-configuration/layout=USA<wait>", + " keyboard-configuration/variant=USA<wait>", + " locale=en_US<wait>", + " netcfg/get_domain=vm<wait>", + " netcfg/get_hostname=vagrant<wait>", + " noapic<wait>", + " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/ubuntu-12.04/preseed.cfg<wait>", + " -- <wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "guest_os_type": "ubuntu-64", + "http_directory": "http", + "iso_checksum": "983cfa31d1a376e0c6d2e431af7e0e5757f8d28a", + "iso_checksum_type": "sha1", + "iso_url": "http://releases.ubuntu.com/12.04/ubuntu-12.04.3-server-amd64.iso", + "shutdown_command": "echo 'vagrant'|sudo -S sh 'shutdown.sh'", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "tools_upload_flavor": "linux", + "tools_upload_path": "/home/vagrant/vmware_tools.iso", + "name": "ubuntu-12.04-amd64-vmware", + "type": "vmware", + "vmx_data": { + "cpuid.coresPerSocket": "1", + "memsize": "384", + "numvcpus": "1" + } + } + ], + "post-processors": [ + { + "type": "vagrant", + "output": "ubuntu-12.04-amd64-{{.Provider}}.box" + } + ], + "provisioners": [ + { + "type": "file", + "source": "scripts/common/shutdown.sh", + "destination": "/tmp/shutdown.sh" + }, + { + "execute_command": "echo 'vagrant' | sudo -S bash '{{.Path}}'", + "scripts": [ + "scripts/ubuntu/update.sh", + "scripts/common/sshd.sh", + "scripts/ubuntu/networking.sh", + "scripts/ubuntu/sudoers.sh", + "scripts/common/vagrant.sh", + "scripts/common/vmtools.sh", + "scripts/ubuntu/cleanup.sh", + "scripts/common/minimize.sh" + ], + "type": "shell" + } + ] +} + diff --git a/packer/ubuntu-12.04-i386.json b/packer/ubuntu-12.04-i386.json new file mode 100644 index 000000000..9c2064a25 --- /dev/null +++ b/packer/ubuntu-12.04-i386.json @@ -0,0 +1,135 @@ +{ + "builders": [ + { + "boot_command": [ + "<esc><wait>", + "<esc><wait>", + "<enter><wait>", + "/install/vmlinuz<wait>", + " auto<wait>", + " console-setup/ask_detect=false<wait>", + " console-setup/layoutcode=us<wait>", + " console-setup/modelcode=pc105<wait>", + " debconf/frontend=noninteractive<wait>", + " debian-installer=en_US<wait>", + " fb=false<wait>", + " initrd=/install/initrd.gz<wait>", + " kbd-chooser/method=us<wait>", + " keyboard-configuration/layout=USA<wait>", + " keyboard-configuration/variant=USA<wait>", + " locale=en_US<wait>", + " netcfg/get_domain=vm<wait>", + " netcfg/get_hostname=vagrant<wait>", + " noapic<wait>", + " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/ubuntu-12.04/preseed.cfg<wait>", + " -- <wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "guest_os_type": "Ubuntu", + "http_directory": "http", + "iso_checksum": "2ec0e913959f6c2ba7a558e8bfa361428bb00e56", + "iso_checksum_type": "sha1", + "iso_url": "http://releases.ubuntu.com/12.04/ubuntu-12.04.3-server-i386.iso", + "shutdown_command": "echo 'vagrant'|sudo -S sh '/tmp/shutdown.sh'", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "name": "ubuntu-12.04-i386-vbox", + "type": "virtualbox", + "vboxmanage": [ + [ + "modifyvm", + "{{.Name}}", + "--memory", + "384" + ], + [ + "modifyvm", + "{{.Name}}", + "--cpus", + "1" + ] + ], + "virtualbox_version_file": ".vbox_version" + }, + { + "boot_command": [ + "<esc><wait>", + "<esc><wait>", + "<enter><wait>", + "/install/vmlinuz<wait>", + " auto<wait>", + " console-setup/ask_detect=false<wait>", + " console-setup/layoutcode=us<wait>", + " console-setup/modelcode=pc105<wait>", + " debconf/frontend=noninteractive<wait>", + " debian-installer=en_US<wait>", + " fb=false<wait>", + " initrd=/install/initrd.gz<wait>", + " kbd-chooser/method=us<wait>", + " keyboard-configuration/layout=USA<wait>", + " keyboard-configuration/variant=USA<wait>", + " locale=en_US<wait>", + " netcfg/get_domain=vm<wait>", + " netcfg/get_hostname=vagrant<wait>", + " noapic<wait>", + " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/ubuntu-12.04/preseed.cfg<wait>", + " -- <wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "guest_os_type": "ubuntu", + "http_directory": "http", + "iso_checksum": "f6fb4e12e12e6ba4247aee5985dd92cc5a653122", + "iso_checksum_type": "sha1", + "iso_url": "http://releases.ubuntu.com/12.04/ubuntu-12.04.3-server-i386.iso", + "shutdown_command": "echo 'vagrant'|sudo -S sh '/tmp/shutdown.sh'", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "tools_upload_flavor": "linux", + "tools_upload_path": "/home/vagrant/vmware_tools.iso", + "name": "ubuntu-12.04-i386-vmware", + "type": "vmware", + "vmx_data": { + "cpuid.coresPerSocket": "1", + "memsize": "384", + "numvcpus": "1" + } + } + ], + "post-processors": [ + { + "output": "ubuntu-12.04-i386-{{.Provider}}.box", + "type": "vagrant" + } + ], + "provisioners": [ + { + "type": "file", + "source": "scripts/common/shutdown.sh", + "destination": "/tmp/shutdown.sh" + }, + { + "execute_command": "echo 'vagrant'|sudo -S sh '{{.Path}}'", + "scripts": [ + "scripts/ubuntu/update.sh", + "scripts/common/sshd.sh", + "scripts/ubuntu/networking.sh", + "scripts/ubuntu/sudoers.sh", + "scripts/common/vagrant.sh", + "scripts/common/vmtools.sh", + "scripts/ubuntu/cleanup.sh", + "scripts/common/minimize.sh" + ], + "type": "shell" + } + ] +} + diff --git a/packer/ubuntu-12.10-amd64.json b/packer/ubuntu-12.10-amd64.json new file mode 100644 index 000000000..7be1367a0 --- /dev/null +++ b/packer/ubuntu-12.10-amd64.json @@ -0,0 +1,135 @@ +{ + "builders": [ + { + "boot_command": [ + "<esc><wait>", + "<esc><wait>", + "<enter><wait>", + "/install/vmlinuz<wait>", + " auto<wait>", + " console-setup/ask_detect=false<wait>", + " console-setup/layoutcode=us<wait>", + " console-setup/modelcode=pc105<wait>", + " debconf/frontend=noninteractive<wait>", + " debian-installer=en_US<wait>", + " fb=false<wait>", + " initrd=/install/initrd.gz<wait>", + " kbd-chooser/method=us<wait>", + " keyboard-configuration/layout=USA<wait>", + " keyboard-configuration/variant=USA<wait>", + " locale=en_US<wait>", + " netcfg/get_domain=vm<wait>", + " netcfg/get_hostname=vagrant<wait>", + " noapic<wait>", + " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/ubuntu-12.10/preseed.cfg<wait>", + " -- <wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "guest_os_type": "Ubuntu", + "http_directory": "http", + "iso_checksum": "e2a48af008ff3c4db6a8235151a1e90ea600fceb", + "iso_checksum_type": "sha1", + "iso_url": "http://releases.ubuntu.com/12.10/ubuntu-12.10-server-amd64.iso", + "shutdown_command": "echo 'vagrant'|sudo -S sh '/tmp/shutdown.sh'", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "name": "ubuntu-12.10-amd64-vbox", + "type": "virtualbox", + "vboxmanage": [ + [ + "modifyvm", + "{{.Name}}", + "--memory", + "384" + ], + [ + "modifyvm", + "{{.Name}}", + "--cpus", + "1" + ] + ], + "virtualbox_version_file": ".vbox_version" + }, + { + "boot_command": [ + "<esc><wait>", + "<esc><wait>", + "<enter><wait>", + "/install/vmlinuz<wait>", + " auto<wait>", + " console-setup/ask_detect=false<wait>", + " console-setup/layoutcode=us<wait>", + " console-setup/modelcode=pc105<wait>", + " debconf/frontend=noninteractive<wait>", + " debian-installer=en_US<wait>", + " fb=false<wait>", + " initrd=/install/initrd.gz<wait>", + " kbd-chooser/method=us<wait>", + " keyboard-configuration/layout=USA<wait>", + " keyboard-configuration/variant=USA<wait>", + " locale=en_US<wait>", + " netcfg/get_domain=vm<wait>", + " netcfg/get_hostname=vagrant<wait>", + " noapic<wait>", + " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/ubuntu-12.10/preseed.cfg<wait>", + " -- <wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "guest_os_type": "ubuntu", + "http_directory": "http", + "iso_checksum": "e2a48af008ff3c4db6a8235151a1e90ea600fceb", + "iso_checksum_type": "sha1", + "iso_url": "http://releases.ubuntu.com/12.10/ubuntu-12.10-server-amd64.iso", + "shutdown_command": "echo 'vagrant'|sudo -S sh '/tmp/shutdown.sh'", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "tools_upload_flavor": "linux", + "tools_upload_path": "/home/vagrant/vmware_tools.iso", + "name": "ubuntu-12.10-amd64-vmware", + "type": "vmware", + "vmx_data": { + "cpuid.coresPerSocket": "1", + "memsize": "384", + "numvcpus": "1" + } + } + ], + "post-processors": [ + { + "output": "ubuntu-12.10-amd64-{{.Provider}}.box", + "type": "vagrant" + } + ], + "provisioners": [ + { + "type": "file", + "source": "scripts/common/shutdown.sh", + "destination": "/tmp/shutdown.sh" + }, + { + "execute_command": "echo 'vagrant'|sudo -S sh '{{.Path}}'", + "scripts": [ + "scripts/ubuntu/update.sh", + "scripts/common/sshd.sh", + "scripts/ubuntu/networking.sh", + "scripts/ubuntu/sudoers.sh", + "scripts/common/vagrant.sh", + "scripts/common/vmtools.sh", + "scripts/ubuntu/cleanup.sh", + "scripts/common/minimize.sh" + ], + "type": "shell" + } + ] +} + diff --git a/packer/ubuntu-12.10-i386.json b/packer/ubuntu-12.10-i386.json new file mode 100644 index 000000000..06efb331d --- /dev/null +++ b/packer/ubuntu-12.10-i386.json @@ -0,0 +1,135 @@ +{ + "builders": [ + { + "boot_command": [ + "<esc><wait>", + "<esc><wait>", + "<enter><wait>", + "/install/vmlinuz<wait>", + " auto<wait>", + " console-setup/ask_detect=false<wait>", + " console-setup/layoutcode=us<wait>", + " console-setup/modelcode=pc105<wait>", + " debconf/frontend=noninteractive<wait>", + " debian-installer=en_US<wait>", + " fb=false<wait>", + " initrd=/install/initrd.gz<wait>", + " kbd-chooser/method=us<wait>", + " keyboard-configuration/layout=USA<wait>", + " keyboard-configuration/variant=USA<wait>", + " locale=en_US<wait>", + " netcfg/get_domain=vm<wait>", + " netcfg/get_hostname=vagrant<wait>", + " noapic<wait>", + " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/ubuntu-12.10/preseed.cfg<wait>", + " -- <wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "guest_os_type": "Ubuntu", + "http_directory": "http", + "iso_checksum": "e0e48be7ae21003cf0b25591d71d8cdbee7063e7", + "iso_checksum_type": "sha1", + "iso_url": "http://releases.ubuntu.com/12.10/ubuntu-12.10-server-i386.iso", + "shutdown_command": "echo 'vagrant'|sudo -S sh '/tmp/shutdown.sh'", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "name": "ubuntu-12.10-i386-vbox", + "type": "virtualbox", + "vboxmanage": [ + [ + "modifyvm", + "{{.Name}}", + "--memory", + "384" + ], + [ + "modifyvm", + "{{.Name}}", + "--cpus", + "1" + ] + ], + "virtualbox_version_file": ".vbox_version" + }, + { + "boot_command": [ + "<esc><wait>", + "<esc><wait>", + "<enter><wait>", + "/install/vmlinuz<wait>", + " auto<wait>", + " console-setup/ask_detect=false<wait>", + " console-setup/layoutcode=us<wait>", + " console-setup/modelcode=pc105<wait>", + " debconf/frontend=noninteractive<wait>", + " debian-installer=en_US<wait>", + " fb=false<wait>", + " initrd=/install/initrd.gz<wait>", + " kbd-chooser/method=us<wait>", + " keyboard-configuration/layout=USA<wait>", + " keyboard-configuration/variant=USA<wait>", + " locale=en_US<wait>", + " netcfg/get_domain=vm<wait>", + " netcfg/get_hostname=vagrant<wait>", + " noapic<wait>", + " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/ubuntu-12.10/preseed.cfg<wait>", + " -- <wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "guest_os_type": "ubuntu", + "http_directory": "http", + "iso_checksum": "e0e48be7ae21003cf0b25591d71d8cdbee7063e7", + "iso_checksum_type": "sha1", + "iso_url": "http://releases.ubuntu.com/12.10/ubuntu-12.10-server-i386.iso", + "shutdown_command": "echo 'vagrant'|sudo -S sh '/tmp/shutdown.sh'", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "tools_upload_flavor": "linux", + "tools_upload_path": "/home/vagrant/vmware_tools.iso", + "name": "ubuntu-12.10-i386-vmware", + "type": "vmware", + "vmx_data": { + "cpuid.coresPerSocket": "1", + "memsize": "384", + "numvcpus": "1" + } + } + ], + "post-processors": [ + { + "output": "ubuntu-12.10-i386-{{.Provider}}.box", + "type": "vagrant" + } + ], + "provisioners": [ + { + "type": "file", + "source": "scripts/common/shutdown.sh", + "destination": "/tmp/shutdown.sh" + }, + { + "execute_command": "echo 'vagrant'|sudo -S sh '{{.Path}}'", + "scripts": [ + "scripts/ubuntu/update.sh", + "scripts/common/sshd.sh", + "scripts/ubuntu/networking.sh", + "scripts/ubuntu/sudoers.sh", + "scripts/common/vagrant.sh", + "scripts/common/vmtools.sh", + "scripts/ubuntu/cleanup.sh", + "scripts/common/minimize.sh" + ], + "type": "shell" + } + ] +} + diff --git a/packer/ubuntu-13.04-amd64.json b/packer/ubuntu-13.04-amd64.json new file mode 100644 index 000000000..e429bab2f --- /dev/null +++ b/packer/ubuntu-13.04-amd64.json @@ -0,0 +1,136 @@ +{ + "builders": [ + { + "boot_command": [ + "<esc><wait>", + "<esc><wait>", + "<enter><wait>", + "/install/vmlinuz<wait>", + " auto<wait>", + " console-setup/ask_detect=false<wait>", + " console-setup/layoutcode=us<wait>", + " console-setup/modelcode=pc105<wait>", + " debconf/frontend=noninteractive<wait>", + " debian-installer=en_US<wait>", + " fb=false<wait>", + " initrd=/install/initrd.gz<wait>", + " kbd-chooser/method=us<wait>", + " keyboard-configuration/layout=USA<wait>", + " keyboard-configuration/variant=USA<wait>", + " locale=en_US<wait>", + " netcfg/get_domain=vm<wait>", + " netcfg/get_hostname=vagrant<wait>", + " noapic<wait>", + " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/ubuntu-13.04/preseed.cfg<wait>", + " -- <wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "guest_os_type": "Ubuntu_64", + "http_directory": "http", + "iso_checksum": "2af1c223f586f59237212bb9c06ad774673c8952", + "iso_checksum_type": "sha1", + "iso_url": "http://releases.ubuntu.com/13.04/ubuntu-13.04-server-amd64.iso", + "shutdown_command": "echo 'vagrant'|sudo -S sh '/tmp/shutdown.sh'", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "name": "ubuntu-13.04-amd64-vbox", + "type": "virtualbox", + "vboxmanage": [ + [ + "modifyvm", + "{{.Name}}", + "--memory", + "384" + ], + [ + "modifyvm", + "{{.Name}}", + "--cpus", + "1" + ] + ], + "virtualbox_version_file": ".vbox_version" + }, + { + "boot_command": [ + "<esc><wait>", + "<esc><wait>", + "<enter><wait>", + "/install/vmlinuz<wait>", + " auto<wait>", + " console-setup/ask_detect=false<wait>", + " console-setup/layoutcode=us<wait>", + " console-setup/modelcode=pc105<wait>", + " debconf/frontend=noninteractive<wait>", + " debian-installer=en_US<wait>", + " fb=false<wait>", + " initrd=/install/initrd.gz<wait>", + " kbd-chooser/method=us<wait>", + " keyboard-configuration/layout=USA<wait>", + " keyboard-configuration/variant=USA<wait>", + " locale=en_US<wait>", + " netcfg/get_domain=vm<wait>", + " netcfg/get_hostname=vagrant<wait>", + " noapic<wait>", + " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/ubuntu-13.04/preseed.cfg<wait>", + " -- <wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "guest_os_type": "ubuntu-64", + "headless": true, + "http_directory": "http", + "iso_checksum": "2af1c223f586f59237212bb9c06ad774673c8952", + "iso_checksum_type": "sha1", + "iso_url": "http://releases.ubuntu.com/13.04/ubuntu-13.04-server-amd64.iso", + "shutdown_command": "echo 'vagrant'|sudo -S sh '/tmp/shutdown.sh'", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "tools_upload_flavor": "linux", + "tools_upload_path": "/home/vagrant/vmware_tools.iso", + "name": "ubuntu-13.04-amd64-vmware", + "type": "vmware", + "vmx_data": { + "cpuid.coresPerSocket": "1", + "memsize": "384", + "numvcpus": "1" + } + } + ], + "post-processors": [ + { + "output": "ubuntu-13.04-amd64-{{.Provider}}.box", + "type": "vagrant" + } + ], + "provisioners": [ + { + "type": "file", + "source": "scripts/common/shutdown.sh", + "destination": "/tmp/shutdown.sh" + }, + { + "execute_command": "echo 'vagrant'|sudo -S sh '{{.Path}}'", + "scripts": [ + "scripts/ubuntu/update.sh", + "scripts/common/sshd.sh", + "scripts/ubuntu/networking.sh", + "scripts/ubuntu/sudoers.sh", + "scripts/common/vagrant.sh", + "scripts/common/vmtools.sh", + "scripts/ubuntu/cleanup.sh", + "scripts/common/minimize.sh" + ], + "type": "shell" + } + ] +} + diff --git a/packer/ubuntu-13.04-i386.json b/packer/ubuntu-13.04-i386.json new file mode 100644 index 000000000..edb80c241 --- /dev/null +++ b/packer/ubuntu-13.04-i386.json @@ -0,0 +1,135 @@ +{ + "builders": [ + { + "boot_command": [ + "<esc><wait>", + "<esc><wait>", + "<enter><wait>", + "/install/vmlinuz<wait>", + " auto<wait>", + " console-setup/ask_detect=false<wait>", + " console-setup/layoutcode=us<wait>", + " console-setup/modelcode=pc105<wait>", + " debconf/frontend=noninteractive<wait>", + " debian-installer=en_US<wait>", + " fb=false<wait>", + " initrd=/install/initrd.gz<wait>", + " kbd-chooser/method=us<wait>", + " keyboard-configuration/layout=USA<wait>", + " keyboard-configuration/variant=USA<wait>", + " locale=en_US<wait>", + " netcfg/get_domain=vm<wait>", + " netcfg/get_hostname=vagrant<wait>", + " noapic<wait>", + " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/ubuntu-13.04/preseed.cfg<wait>", + " -- <wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "guest_os_type": "Ubuntu", + "http_directory": "http", + "iso_checksum": "27bbe172d66d4ce634d10fd655e840f72fe56130", + "iso_checksum_type": "sha1", + "iso_url": "http://releases.ubuntu.com/13.04/ubuntu-13.04-server-i386.iso", + "shutdown_command": "echo 'vagrant'|sudo -S sh '/tmp/shutdown.sh'", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "name": "ubuntu-13.04-i386-vbox", + "type": "virtualbox", + "vboxmanage": [ + [ + "modifyvm", + "{{.Name}}", + "--memory", + "384" + ], + [ + "modifyvm", + "{{.Name}}", + "--cpus", + "1" + ] + ], + "virtualbox_version_file": ".vbox_version" + }, + { + "boot_command": [ + "<esc><wait>", + "<esc><wait>", + "<enter><wait>", + "/install/vmlinuz<wait>", + " auto<wait>", + " console-setup/ask_detect=false<wait>", + " console-setup/layoutcode=us<wait>", + " console-setup/modelcode=pc105<wait>", + " debconf/frontend=noninteractive<wait>", + " debian-installer=en_US<wait>", + " fb=false<wait>", + " initrd=/install/initrd.gz<wait>", + " kbd-chooser/method=us<wait>", + " keyboard-configuration/layout=USA<wait>", + " keyboard-configuration/variant=USA<wait>", + " locale=en_US<wait>", + " netcfg/get_domain=vm<wait>", + " netcfg/get_hostname=vagrant<wait>", + " noapic<wait>", + " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/ubuntu-13.04/preseed.cfg<wait>", + " -- <wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "guest_os_type": "ubuntu", + "http_directory": "http", + "iso_checksum": "27bbe172d66d4ce634d10fd655e840f72fe56130", + "iso_checksum_type": "sha1", + "iso_url": "http://releases.ubuntu.com/13.04/ubuntu-13.04-server-i386.iso", + "shutdown_command": "echo 'vagrant'|sudo -S sh '/tmp/shutdown.sh'", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "tools_upload_flavor": "linux", + "tools_upload_path": "/home/vagrant/vmware_tools.iso", + "name": "ubuntu-13.04-i386-vmware", + "type": "vmware", + "vmx_data": { + "cpuid.coresPerSocket": "1", + "memsize": "384", + "numvcpus": "1" + } + } + ], + "post-processors": [ + { + "output": "ubuntu-13.04-i386-{{.Provider}}.box", + "type": "vagrant" + } + ], + "provisioners": [ + { + "type": "file", + "source": "scripts/common/shutdown.sh", + "destination": "/tmp/shutdown.sh" + }, + { + "execute_command": "echo 'vagrant'|sudo -S sh '{{.Path}}'", + "scripts": [ + "scripts/ubuntu/update.sh", + "scripts/common/sshd.sh", + "scripts/ubuntu/networking.sh", + "scripts/ubuntu/sudoers.sh", + "scripts/common/vagrant.sh", + "scripts/common/vmtools.sh", + "scripts/ubuntu/cleanup.sh", + "scripts/common/minimize.sh" + ], + "type": "shell" + } + ] +} + diff --git a/templates/.centos/cleanup.sh b/templates/.centos/cleanup.sh new file mode 100644 index 000000000..922c3d6b5 --- /dev/null +++ b/templates/.centos/cleanup.sh @@ -0,0 +1,5 @@ +#!/bin/bash -eux +yum -y erase gtk2 libX11 hicolor-icon-theme avahi freetype bitstream-vera-fonts +yum -y clean all +rm -rf VBoxGuestAdditions_*.iso VBoxGuestAdditions_*.iso.? +rm -f /tmp/chef*rpm diff --git a/templates/.centos/ks.cfg b/templates/.centos/ks.cfg new file mode 100644 index 000000000..e00fd5a2a --- /dev/null +++ b/templates/.centos/ks.cfg @@ -0,0 +1,39 @@ +install +cdrom +lang en_US.UTF-8 +keyboard us +network --bootproto=dhcp +rootpw --iscrypted $1$damlkd,f$UC/u5pUts5QiU3ow.CSso/ +firewall --disabled +authconfig --enableshadow --passalgo=sha512 +selinux --disabled +timezone UTC +bootloader --location=mbr +text +skipx +zerombr +clearpart --all --initlabel +autopart +auth --useshadow --enablemd5 +firstboot --disabled +reboot + +%packages --ignoremissing +@Base +@Core +@Development Tools +openssl-devel +readline-devel +zlib-devel +kernel-devel + +%post +# update root certs +wget -O/etc/pki/tls/certs/ca-bundle.crt http://curl.haxx.se/ca/cacert.pem +# vagrant +groupadd vagrant -g 999 +useradd vagrant -g vagrant -G wheel -u 900 +echo "vagrant" | passwd --stdin vagrant +# sudo +echo "vagrant ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers +sed -i "s/^.*requiretty/#Defaults requiretty/" /etc/sudoers diff --git a/templates/.common/chef_omnibus.sh b/templates/.common/chef_omnibus.sh new file mode 100644 index 000000000..c975b6019 --- /dev/null +++ b/templates/.common/chef_omnibus.sh @@ -0,0 +1,261 @@ +#!/bin/bash + +# This is the current stable release to default to, with Omnibus patch level (e.g. 10.12.0-1) +# Note that the chef template downloads 'x.y.z' not 'x.y.z-r' which should be a duplicate of the latest -r +use_shell=0 + +prerelease="false" + +# Check whether a command exists - returns 0 if it does, 1 if it does not +exists() { + if command -v $1 >/dev/null 2>&1 + then + return 0 + else + return 1 + fi +} + +# Set the filename for a deb, based on version and machine +deb_filename() { + filetype="deb" + if [ "$machine" = "x86_64" ]; + then + filename="chef_${version}_amd64.deb" + else + filename="chef_${version}_i386.deb" + fi +} + +# Set the filename for an rpm, based on version and machine +rpm_filename() { + filetype="rpm" + filename="chef-${version}.${machine}.rpm" +} + +# Set the filename for a Solaris SVR4 package, based on version and machine +svr4_filename() { + PATH=/usr/sfw/bin:$PATH + filetype="solaris" + filename="chef-${version}.${machine}.solaris" +} + +# Set the filename for the sh archive +shell_filename() { + filetype="sh" + filename="chef-${version}-${platform}-${platform_version}-${machine}.sh" +} + +report_bug() { + echo "Please file a bug report at http://tickets.opscode.com" + echo "Project: Chef" + echo "Component: Packages" + echo "Label: Omnibus" + echo "Version: $version" + echo " " + echo "Please detail your operating system type, version and any other relevant details" +} + +# Get command line arguments +while getopts spv: opt +do + case "$opt" in + v) version="$OPTARG";; + s) use_shell=1;; + p) prerelease="true";; + \?) # unknown flag + echo >&2 \ + "usage: $0 [-s] [-v version]" + exit 1;; + esac +done +shift `expr $OPTIND - 1` + +machine=$(printf `uname -m`) + +# Retrieve Platform and Platform Version +if [ -f "/etc/lsb-release" ] && grep -q DISTRIB_ID /etc/lsb-release; +then + platform=$(grep DISTRIB_ID /etc/lsb-release | cut -d "=" -f 2 | tr '[A-Z]' '[a-z]') + platform_version=$(grep DISTRIB_RELEASE /etc/lsb-release | cut -d "=" -f 2) +elif [ -f "/etc/debian_version" ]; +then + platform="debian" + platform_version=$(printf `cat /etc/debian_version`) +elif [ -f "/etc/redhat-release" ]; +then + platform=$(sed 's/^\(.\+\) release.*/\1/' /etc/redhat-release | tr '[A-Z]' '[a-z]') + platform_version=$(sed 's/^.\+ release \([.0-9]\+\).*/\1/' /etc/redhat-release) + + # If /etc/redhat-release exists, we act like RHEL by default + if [ "$platform" = "fedora" ]; + then + # Change platform version for use below. + platform_version="6.0" + fi + platform="el" +elif [ -f "/etc/system-release" ]; +then + platform=$(sed 's/^\(.\+\) release.\+/\1/' /etc/system-release | tr '[A-Z]' '[a-z]') + platform_version=$(sed 's/^.\+ release \([.0-9]\+\).*/\1/' /etc/system-release | tr '[A-Z]' '[a-z]') + # amazon is built off of fedora, so act like RHEL + if [ "$platform" = "amazon linux ami" ]; + then + platform="el" + platform_version="6.0" + fi +# Apple OS X +elif [ -f "/usr/bin/sw_vers" ]; +then + platform="mac_os_x" + # Matching the tab-space with sed is error-prone + platform_version=$(sw_vers | awk '/^ProductVersion:/ { print $2 }') + + major_version=$(echo $platform_version | cut -d. -f1,2) + case $major_version in + "10.6") platform_version="10.6" ;; + "10.7") platform_version="10.7" ;; + "10.8") platform_version="10.7" ;; + *) echo "No builds for platform: $major_version" + report_bug + exit 1 + ;; + esac + + # x86_64 Apple hardware often runs 32-bit kernels (see OHAI-63) + x86_64=$(sysctl -n hw.optional.x86_64) + if [ $x86_64 -eq 1 ]; then + machine="x86_64" + fi +elif [ -f "/etc/release" ]; +then + platform="solaris2" + machine=$(/usr/bin/uname -p) + platform_version=$(/usr/bin/uname -r) +elif [ -f "/etc/SuSE-release" ]; +then + if grep -q 'Enterprise' /etc/SuSE-release; + then + platform="sles" + platform_version=$(awk '/^VERSION/ {V = $3}; /^PATCHLEVEL/ {P = $3}; END {print V "." P}' /etc/SuSE-release) + else + platform="suse" + platform_version=$(awk '/^VERSION =/ { print $3 }' /etc/SuSE-release) + fi +fi + +if [ "x$platform" = "x" ]; +then + echo "Unable to determine platform version!" + report_bug + exit 1 +fi + +# Mangle $platform_version to pull the correct build +# for various platforms +major_version=$(echo $platform_version | cut -d. -f1) +case $platform in + "el") + case $major_version in + "5") platform_version="5" ;; + "6") platform_version="6" ;; + esac + ;; + "debian") + case $major_version in + "5") platform_version="6";; + "6") platform_version="6";; + esac + ;; +esac + +if [ "x$platform_version" = "x" ]; +then + echo "Unable to determine platform version!" + report_bug + exit 1 +fi + +if [ $use_shell = 1 ]; +then + shell_filename +else + case $platform in + "ubuntu") deb_filename ;; + "debian") deb_filename ;; + "el") rpm_filename ;; + "suse") rpm_filename ;; + "sles") rpm_filename ;; + "fedora") rpm_filename ;; + "solaris2") svr4_filename ;; + *) shell_filename ;; + esac +fi + +echo "Downloading Chef $version for ${platform}..." + +url="http://www.opscode.com/chef/download?v=${version}&prerelease=${prerelease}&p=${platform}&pv=${platform_version}&m=${machine}" +tmp_dir=$(mktemp -d -t tmp.XXXXXXXX || echo "/tmp") + +if exists wget; +then + downloader="wget" + wget -O "$tmp_dir/$filename" $url 2>/tmp/stderr +elif exists curl; +then + downloader="curl" + curl -L $url > "$tmp_dir/$filename" +else + echo "Cannot find wget or curl - cannot install Chef!" + exit 5 +fi + +# Check to see if we got a 404 or an empty file + +unable_to_retrieve_package() { + echo "Unable to retrieve a valid package!" + report_bug + echo "URL: $url" + exit 1 +} + +if [ "$downloader" = "curl" ] +then + #do curl stuff + grep "The specified key does not exist." "$tmp_dir/$filename" 2>&1 >/dev/null + if [ $? -eq 0 ] || [ ! -s "$tmp_dir/$filename" ] + then + unable_to_retrieve_package + fi +elif [ "$downloader" = "wget" ] +then + #do wget stuff + grep "ERROR 404" /tmp/stderr 2>&1 >/dev/null + if [ $? -eq 0 ] || [ ! -s "$tmp_dir/$filename" ] + then + unable_to_retrieve_package + fi +fi + +echo "Installing Chef $version" +case "$filetype" in + "rpm") rpm -Uvh "$tmp_dir/$filename" ;; + "deb") dpkg -i "$tmp_dir/$filename" ;; + "solaris") echo "conflict=nocheck" > /tmp/nocheck + echo "action=nocheck" >> /tmp/nocheck + pkgadd -n -d "$tmp_dir/$filename" -a /tmp/nocheck chef + ;; + "sh" ) bash "$tmp_dir/$filename" ;; +esac + +if [ "$tmp_dir" != "/tmp" ]; +then + rm -r "$tmp_dir" +fi + +if [ $? -ne 0 ]; +then + echo "Installation failed" + report_bug + exit 1 +fi diff --git a/templates/.common/minimize.sh b/templates/.common/minimize.sh new file mode 100644 index 000000000..3846a1d65 --- /dev/null +++ b/templates/.common/minimize.sh @@ -0,0 +1,4 @@ +#!/bin/bash -eux + +dd if=/dev/zero of=/EMPTY bs=1M +rm -f /EMPTY diff --git a/templates/.common/sshd.sh b/templates/.common/sshd.sh new file mode 100644 index 000000000..c6e4f20a6 --- /dev/null +++ b/templates/.common/sshd.sh @@ -0,0 +1,3 @@ +#!/bin/bash -eux + +echo "UseDNS no" >> /etc/ssh/sshd_config diff --git a/templates/.common/sudoers.sh b/templates/.common/sudoers.sh new file mode 100644 index 000000000..5fce3dd2c --- /dev/null +++ b/templates/.common/sudoers.sh @@ -0,0 +1,4 @@ +#!/bin/bash -eux + +sed -i -e '/Defaults\s\+env_reset/a Defaults\texempt_group=sudo' /etc/sudoers +sed -i -e 's/%sudo ALL=(ALL:ALL) ALL/%sudo ALL=NOPASSWD:ALL/g' /etc/sudoers diff --git a/templates/.common/vagrant.sh b/templates/.common/vagrant.sh new file mode 100644 index 000000000..cf13f435c --- /dev/null +++ b/templates/.common/vagrant.sh @@ -0,0 +1,34 @@ +#!/bin/bash + +#if [ -f /home/vagrant/.vbox_version ]; then +# mkdir /tmp/vbox +# VER=$(cat /home/vagrant/.vbox_version) +# mount -o loop VBoxGuestAdditions_$VER.iso /tmp/vbox +# sh /tmp/vbox/VBoxLinuxAdditions.run +# umount /tmp/vbox +# rmdir /tmp/vbox +# rm *.iso +#fi + +if [ -f /home/vagrant/vmware_tools.iso ]; then + echo "Installing VMWare Tools" + #Set Linux-specific paths and ISO filename + home_dir="/home/vagrant" + iso_name="vmware_tools.iso" + mount_point="/tmp/vmware-tools" + #Run install, unmount ISO and remove it + mkdir ${mount_point} + cd ${home_dir} + /bin/mount -o loop ${iso_name} ${mount_point} + tar zxf ${mount_point}/*.tar.gz && cd vmware-tools-distrib && ./vmware-install.pl --default + /bin/umount ${mount_point} + /bin/rm -rf ${home_dir}/${iso_name} ${home_dir}/vmware-tools-distrib + rmdir ${mount_point} +fi + +mkdir /home/vagrant/.ssh +wget --no-check-certificate \ + 'https://github.com/mitchellh/vagrant/raw/master/keys/vagrant.pub' \ + -O /home/vagrant/.ssh/authorized_keys +chown -R vagrant /home/vagrant/.ssh +chmod -R go-rwsx /home/vagrant/.ssh diff --git a/templates/.debian/cleanup.sh b/templates/.debian/cleanup.sh new file mode 100644 index 000000000..6c7f703d6 --- /dev/null +++ b/templates/.debian/cleanup.sh @@ -0,0 +1,6 @@ +#!/bin/bash -eux + +apt-get -y autoremove +apt-get -y clean +rm -rf VBoxGuestAdditions_*.iso VBoxGuestAdditions_*.iso.? +rm -f /tmp/chef*deb diff --git a/templates/.debian/networking.sh b/templates/.debian/networking.sh new file mode 100644 index 000000000..de3269a58 --- /dev/null +++ b/templates/.debian/networking.sh @@ -0,0 +1,7 @@ +#!/bin/bash -eux + +rm /etc/udev/rules.d/70-persistent-net.rules +mkdir /etc/udev/rules.d/70-persistent-net.rules +rm /lib/udev/rules.d/75-persistent-net-generator.rules +rm -rf /dev/.udev/ /var/lib/dhcp3/* +echo "pre-up sleep 2" >> /etc/network/interfaces diff --git a/templates/.debian/preseed.cfg b/templates/.debian/preseed.cfg new file mode 100644 index 000000000..820f090c5 --- /dev/null +++ b/templates/.debian/preseed.cfg @@ -0,0 +1,47 @@ +choose-mirror-bin mirror/http/proxy string +d-i apt-setup/use_mirror boolean true +d-i base-installer/kernel/override-image string linux-server +d-i clock-setup/utc boolean true +d-i clock-setup/utc-auto boolean true +d-i finish-install/reboot_in_progress note +d-i grub-installer/only_debian boolean true +d-i grub-installer/with_other_os boolean true +d-i keymap select us +d-i mirror/country string manual +d-i mirror/http/directory string /debian +d-i mirror/http/hostname string mirrors.kernel.org +d-i mirror/http/proxy string +d-i partman-auto-lvm/guided_size string max +d-i partman-auto/choose_recipe select atomic +d-i partman-auto/method string lvm +d-i partman-lvm/confirm boolean true +d-i partman-lvm/confirm boolean true +d-i partman-lvm/confirm_nooverwrite boolean true +d-i partman-lvm/device_remove_lvm boolean true +d-i partman/choose_partition select finish +d-i partman/confirm boolean true +d-i partman/confirm_nooverwrite boolean true +d-i partman/confirm_write_new_label boolean true +d-i passwd/root-login boolean false +d-i passwd/root-password-again password vagrant +d-i passwd/root-password password vagrant +d-i passwd/user-fullname string vagrant +d-i passwd/user-uid string 900 +d-i passwd/user-password password vagrant +d-i passwd/user-password-again password vagrant +d-i passwd/username string vagrant +d-i pkgsel/include string openssh-server sudo bzip2 acpid cryptsetup zlib1g-dev wget curl dkms make +d-i pkgsel/install-language-support boolean false +d-i pkgsel/update-policy select unattended-upgrades +d-i pkgsel/upgrade select full-upgrade +# Prevent packaged version of VirtualBox Guest Additions being installed: +d-i preseed/early_command string sed -i \ + '/in-target/idiscover(){/sbin/discover|grep -v VirtualBox;}' \ + /usr/lib/pre-pkgsel.d/20install-hwpackages +d-i time/zone string UTC +d-i user-setup/allow-password-weak boolean true +d-i user-setup/encrypt-home boolean false +apt-cdrom-setup apt-setup/cdrom/set-first boolean false +apt-mirror-setup apt-setup/use_mirror boolean true +popularity-contest popularity-contest/participate boolean false +tasksel tasksel/first multiselect standard, ubuntu-server diff --git a/templates/.debian/sudoers.sh b/templates/.debian/sudoers.sh new file mode 100644 index 000000000..e7673ae00 --- /dev/null +++ b/templates/.debian/sudoers.sh @@ -0,0 +1,4 @@ +#!/bin/bash -eux + +sed -i -e '/Defaults\s\+env_reset/a Defaults\texempt_group=sudo' /etc/sudoers +sed -i -e 's/%sudo ALL=(ALL) ALL/%sudo ALL=NOPASSWD:ALL/g' /etc/sudoers diff --git a/templates/.debian/update.sh b/templates/.debian/update.sh new file mode 100644 index 000000000..a4cc91499 --- /dev/null +++ b/templates/.debian/update.sh @@ -0,0 +1,4 @@ +#!/bin/bash -eux + +apt-get update +apt-get -y upgrade diff --git a/templates/.fedora/cleanup.sh b/templates/.fedora/cleanup.sh new file mode 100644 index 000000000..a4d82c900 --- /dev/null +++ b/templates/.fedora/cleanup.sh @@ -0,0 +1,4 @@ +#!/bin/bash -eux +yum -y erase gtk2 libX11 hicolor-icon-theme freetype +yum -y clean all +rm -f /tmp/chef*rpm diff --git a/templates/.fedora/ks.cfg b/templates/.fedora/ks.cfg new file mode 100644 index 000000000..c89695e03 --- /dev/null +++ b/templates/.fedora/ks.cfg @@ -0,0 +1,50 @@ +install +cdrom +lang en_US.UTF-8 +keyboard us +network --bootproto=dhcp +rootpw --iscrypted $1$damlkd,f$UC/u5pUts5QiU3ow.CSso/ +firewall --disabled +authconfig --enableshadow --passalgo=sha512 +selinux --disabled +timezone UTC +bootloader --location=mbr +text +skipx +zerombr +clearpart --all --initlabel +part /boot --fstype=ext4 --size=500 +part pv.2 --grow --size=500 +volgroup vg_vagrant --pesize=32768 pv.2 +logvol / --fstype=ext4 --name=lv_root --vgname=vg_vagrant --size=1024 --grow +logvol swap --fstype=swap --name=lv_swap --vgname=vg_vagrant --size=528 --grow --maxsize=1056 +bootloader --location=mbr --append="norhgb biosdevname=0" +auth --useshadow --enablemd5 +firstboot --disabled +reboot + +%packages +@Core +bzip2 +gcc +kernel-devel +kernel-headers +openssl-devel +readline-devel +tar +wget +zlib-devel +%end + +%post +# update root certs +wget -O/etc/pki/tls/certs/ca-bundle.crt http://curl.haxx.se/ca/cacert.pem +# vagrant +groupadd vagrant +useradd vagrant -g vagrant -G wheel -u 900 +echo "vagrant" | passwd --stdin vagrant +# sudo +echo 'Defaults:vagrant !requiretty' > /etc/sudoers.d/vagrant +echo '%vagrant ALL=(ALL) NOPASSWD: ALL' >> /etc/sudoers.d/vagrant +chmod 440 /etc/sudoers.d/vagrant +%end diff --git a/templates/.suse/sudoers.sh b/templates/.suse/sudoers.sh new file mode 100644 index 000000000..eb80f3f88 --- /dev/null +++ b/templates/.suse/sudoers.sh @@ -0,0 +1,3 @@ +# update sudoers - can't do this in autoinst.xml +echo -e "\nupdate sudoers ..." +echo -e "vagrant ALL=(ALL) NOPASSWD: ALL\n" >> /etc/sudoers diff --git a/templates/.ubuntu/cleanup.sh b/templates/.ubuntu/cleanup.sh new file mode 100644 index 000000000..6c7f703d6 --- /dev/null +++ b/templates/.ubuntu/cleanup.sh @@ -0,0 +1,6 @@ +#!/bin/bash -eux + +apt-get -y autoremove +apt-get -y clean +rm -rf VBoxGuestAdditions_*.iso VBoxGuestAdditions_*.iso.? +rm -f /tmp/chef*deb diff --git a/templates/.ubuntu/networking.sh b/templates/.ubuntu/networking.sh new file mode 100644 index 000000000..de3269a58 --- /dev/null +++ b/templates/.ubuntu/networking.sh @@ -0,0 +1,7 @@ +#!/bin/bash -eux + +rm /etc/udev/rules.d/70-persistent-net.rules +mkdir /etc/udev/rules.d/70-persistent-net.rules +rm /lib/udev/rules.d/75-persistent-net-generator.rules +rm -rf /dev/.udev/ /var/lib/dhcp3/* +echo "pre-up sleep 2" >> /etc/network/interfaces diff --git a/templates/.ubuntu/preseed.cfg b/templates/.ubuntu/preseed.cfg new file mode 100644 index 000000000..903f2e14b --- /dev/null +++ b/templates/.ubuntu/preseed.cfg @@ -0,0 +1,31 @@ +choose-mirror-bin mirror/http/proxy string +d-i base-installer/kernel/override-image string linux-server +d-i clock-setup/utc boolean true +d-i clock-setup/utc-auto boolean true +d-i finish-install/reboot_in_progress note +d-i grub-installer/only_debian boolean true +d-i grub-installer/with_other_os boolean true +d-i partman-auto-lvm/guided_size string max +d-i partman-auto/choose_recipe select atomic +d-i partman-auto/method string lvm +d-i partman-lvm/confirm boolean true +d-i partman-lvm/confirm boolean true +d-i partman-lvm/confirm_nooverwrite boolean true +d-i partman-lvm/device_remove_lvm boolean true +d-i partman/choose_partition select finish +d-i partman/confirm boolean true +d-i partman/confirm_nooverwrite boolean true +d-i partman/confirm_write_new_label boolean true +d-i passwd/user-fullname string vagrant +d-i passwd/user-uid string 900 +d-i passwd/user-password password vagrant +d-i passwd/user-password-again password vagrant +d-i passwd/username string vagrant +d-i pkgsel/include string openssh-server cryptsetup build-essential libssl-dev libreadline-dev zlib1g-dev linux-source dkms +d-i pkgsel/install-language-support boolean false +d-i pkgsel/update-policy select unattended-upgrades +d-i pkgsel/upgrade select full-upgrade +d-i time/zone string UTC +d-i user-setup/allow-password-weak boolean true +d-i user-setup/encrypt-home boolean false +tasksel tasksel/first multiselect standard, ubuntu-server diff --git a/templates/.ubuntu/sudoers.sh b/templates/.ubuntu/sudoers.sh new file mode 100644 index 000000000..ce45b7611 --- /dev/null +++ b/templates/.ubuntu/sudoers.sh @@ -0,0 +1,4 @@ +#!/bin/bash -eux + +sed -i -e '/Defaults\s\+env_reset/a Defaults\texempt_group=admin' /etc/sudoers +sed -i -e 's/%admin ALL=(ALL) ALL/%admin ALL=NOPASSWD:ALL/g' /etc/sudoers diff --git a/templates/.ubuntu/update.sh b/templates/.ubuntu/update.sh new file mode 100644 index 000000000..80e8dd3f9 --- /dev/null +++ b/templates/.ubuntu/update.sh @@ -0,0 +1,15 @@ +#!/bin/bash -eux + +apt-get update +apt-get -y upgrade + +# ensure the correct kernel headers are installed +apt-get -y install linux-headers-$(uname -r) + +# update package index on boot +cat <<EOF > /etc/init/refresh-apt.conf +description "update package index" +start on networking +task +exec /usr/bin/apt-get update +EOF diff --git a/templates/.windows/install-chef.bat b/templates/.windows/install-chef.bat new file mode 100644 index 000000000..2107a1b29 --- /dev/null +++ b/templates/.windows/install-chef.bat @@ -0,0 +1,47 @@ +@REM Loop ten times to make sure outbound networking is up +FOR /L %%n IN (1,1,10) DO ( + PING -n 1 www.opscode.com + IF %ERRORLEVEL% == 0 CALL :wget + TIMEOUT 10 +) + +:err +ECHO "Couldn't reach Opscode even after 10 retries" +GOTO :done + +:wget +@rem Install Chef using chef-client MSI installer +@setlocal + +@set REMOTE_SOURCE_MSI_URL=https://www.opscode.com/chef/install.msi +@set LOCAL_DESTINATION_MSI_PATH=%TEMP%\chef-client-latest.msi +@set FALLBACK_QUERY_STRING=?DownloadContext=PowerShell + +@set ALTERNATE_DOWNLOAD_COMMAND=$webClient=new-object System.Net.WebClient; $webClient.DownloadFile('%REMOTE_SOURCE_MSI_URL%%FALLBACK_QUERY_STRING%', '%LOCAL_DESTINATION_MSI_PATH%') + +cscript /nologo %TEMP%\wget.vbs /url:%REMOTE_SOURCE_MSI_URL% /path:"%LOCAL_DESTINATION_MSI_PATH%" + +@rem Work around issues found in Windows Server 2012 around job objects not respecting WSMAN memory quotas +@rem that cause the MSI download process to exceed the quota even when it is increased by administrators. +@rem Retry the download using a more memory-efficient mechanism that only works if PowerShell is available. +@if ERRORLEVEL 1 ( + echo Warning: Failed to download %REMOTE_SOURCE_MSI_URL% to %LOCAL_DESTINATION_MSI_PATH% + echo Warning: Retrying download with PowerShell if available + if EXIST "%LOCAL_DESTINATION_MSI_PATH%" del /f /q "%LOCAL_DESTINATION_MSI_PATH%" + echo powershell -noprofile -noninteractive -command "%ALTERNATE_DOWNLOAD_COMMAND%" + powershell -noprofile -noninteractive -command "%ALTERNATE_DOWNLOAD_COMMAND%" + if NOT ERRORLEVEL 1 ( + echo Download succeeded + ) else ( + echo Failed to download %REMOTE_SOURCE_MSI_URL% + echo Subsequent attempt to install the downloaded MSI is likely to fail + ) +) + +msiexec /qb /i "%LOCAL_DESTINATION_MSI_PATH%" + +@endlocal +EXIT + +:done +EXIT diff --git a/templates/.windows/install-vbox.bat b/templates/.windows/install-vbox.bat new file mode 100644 index 000000000..614c415c7 --- /dev/null +++ b/templates/.windows/install-vbox.bat @@ -0,0 +1,4 @@ +cmd /c certutil -addstore -f "TrustedPublisher" a:oracle-cert.cer +cmd /c e:\VBoxWindowsAdditions-amd64.exe /S +cmd /c shutdown.exe /r /t 5 /d p:2:4 /c "Vagrant reboot for VBoxWindowsAdditions" + diff --git a/templates/.windows/mount-validation.bat b/templates/.windows/mount-validation.bat new file mode 100644 index 000000000..ae458c1d6 --- /dev/null +++ b/templates/.windows/mount-validation.bat @@ -0,0 +1,3 @@ +REM This is so we can pass the validation test... I don't know that it's necessary +cmd /c net use z: \\vboxsrv\veewee-validation + diff --git a/templates/.windows/oracle-cert.cer b/templates/.windows/oracle-cert.cer new file mode 100644 index 0000000000000000000000000000000000000000..6f3380d48553956036650bc711ca5aed73a1224d GIT binary patch literal 1398 zcmXqLVl6UgVu@P7%*4pVBoH|JX8KPK#!$sYJbaVIzH}P!vT<s)d9;1!Wn^S!WiV*m zV#sa4$;KSY!Y0fV8f++TAPVAe3G;=e7G(x!rswG>c;+SR8Oj^Tf+V<w#b6Q&Aw{Ld zB?^A2CFS`=*@o5zmJkI-A*n^V#R~ap3Z=!V3W+5O86_nJ#a8<I<>lpiWk6Glfu`yu z=jZAd6(lNXBx@QP80s15fHX4;tHMop&PgmTRxnm@&QD2I068QxFI~aNz|cU!+0j5w zoY&CMz{tSD01TplToWMI+{oC}($q4_pm8gzw}cG@LFRJ^b2%sGWTxd8<z*(q{K_uO z7nGV(o}Zth5S)=;lv->kZ6FC!%_Sn_UzC`flL~Z0Q9*uDVo7Fxo}rzA4aA?OE}7|> zC5br-o-PV7$LcEhW+oTq7w4yyC<FtE^2DN4g)pF%DPYYCWkxW=nXwse(8Q>O97Bw( z49rc8{0u;GE~X|%MuyHw?*%`8FjtXzIendtSKY3w*O-60EAjFQ2OV~w_ftDDLUzu_ z85<Wa=?S-*nejb)|0Bzi=ZAKyJXs+1{&U}<E!<r7eBtNQVs{iy`CpdM8+pV3kFKYd z;{O}R&%U~HRFb)|&*|X#58c1RGz)!dcTGuVbeeB)eCp1-hX0aX)OY`{ZrXppaE9c( z=3cQz#vO?t;*(yVb7)<pC3A9tz>SryzkP0TS}(uOwDSCq)A{l5xun*{K0kH+^Qm$< z{v9i2H}l%A36FnQYWvH^<3!H>xUK(c<{T^S(EK-X{(E*tk9{wuILuppXYONpzdIrm z6;8kD=Vfr5%TV)i?iWRwFs0(DVJoe?Co?fKGB7S~Vyp&+NI5v&$_leE888^|0pmoL zpONuD3kx$7dxL=kh%e7#X<%+(y1;mWVVgcE6#^4sa&fY;E+`r4CKu(PCP(LBXNZ&@ zP|CmsWP$>VtpO-ub0@TUFt+`0Wn>p;HqbKAVB^qc1LhxgCPpzCe97BD7-Whn3y%R8 zObau!K_QII$jFjvkZhm=;~OxxNkHA1pIlsk;yeRuxGE+rzDdkXL{YAf<eStY19^}; zlvyMU#2Q4-&s_PcTJ4MX$-e&UA6V7iKfbhlE--&^Lj33ibQCZQSp*Ek*tmecWMOPF zXJV9Q;V@tWCO}{aBPUQ`5duu0j10%my}A5s>tn4l8@-n`97fxDH}mY7!8P?YpYXXe zANBj<Zy#8B<=plhr2w0$&kh}Y;3_J_rq%O(!d;Kdh!69Qrx$0(Z#pBlLibZ#!*^ku zETe+LaLfPw_xTrys&70sPe)j1+iVq`aMSBM(lw_ziD+!<3Y)OpMqT!-=r7Lxi?JI@ z<mcTks*7urddn8t7Ob=7j{GmlCwc6O!YLD(?sT2IaC=(b)&muZ35!DO?Rt6F3ICk! zzWcisYuQ$<<p-zv%;P9Gxv*7GE-~|}O~UcDuPhm!mwENJ*Y;evpI^83&Bmf4#}q;F kZ>ww{IP}*EUbv-wBB=FaQSwz;n~wTPeHRx#@~!?40OZx*k^lez literal 0 HcmV?d00001 diff --git a/templates/centos-5.5-i386/http/ks.cfg b/templates/centos-5.5-i386/http/ks.cfg new file mode 100644 index 000000000..e00fd5a2a --- /dev/null +++ b/templates/centos-5.5-i386/http/ks.cfg @@ -0,0 +1,39 @@ +install +cdrom +lang en_US.UTF-8 +keyboard us +network --bootproto=dhcp +rootpw --iscrypted $1$damlkd,f$UC/u5pUts5QiU3ow.CSso/ +firewall --disabled +authconfig --enableshadow --passalgo=sha512 +selinux --disabled +timezone UTC +bootloader --location=mbr +text +skipx +zerombr +clearpart --all --initlabel +autopart +auth --useshadow --enablemd5 +firstboot --disabled +reboot + +%packages --ignoremissing +@Base +@Core +@Development Tools +openssl-devel +readline-devel +zlib-devel +kernel-devel + +%post +# update root certs +wget -O/etc/pki/tls/certs/ca-bundle.crt http://curl.haxx.se/ca/cacert.pem +# vagrant +groupadd vagrant -g 999 +useradd vagrant -g vagrant -G wheel -u 900 +echo "vagrant" | passwd --stdin vagrant +# sudo +echo "vagrant ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers +sed -i "s/^.*requiretty/#Defaults requiretty/" /etc/sudoers diff --git a/templates/centos-5.5-i386/scripts/cleanup.sh b/templates/centos-5.5-i386/scripts/cleanup.sh new file mode 100644 index 000000000..922c3d6b5 --- /dev/null +++ b/templates/centos-5.5-i386/scripts/cleanup.sh @@ -0,0 +1,5 @@ +#!/bin/bash -eux +yum -y erase gtk2 libX11 hicolor-icon-theme avahi freetype bitstream-vera-fonts +yum -y clean all +rm -rf VBoxGuestAdditions_*.iso VBoxGuestAdditions_*.iso.? +rm -f /tmp/chef*rpm diff --git a/templates/centos-5.5-i386/scripts/minimize.sh b/templates/centos-5.5-i386/scripts/minimize.sh new file mode 100644 index 000000000..3846a1d65 --- /dev/null +++ b/templates/centos-5.5-i386/scripts/minimize.sh @@ -0,0 +1,4 @@ +#!/bin/bash -eux + +dd if=/dev/zero of=/EMPTY bs=1M +rm -f /EMPTY diff --git a/templates/centos-5.5-i386/scripts/sshd.sh b/templates/centos-5.5-i386/scripts/sshd.sh new file mode 100644 index 000000000..c6e4f20a6 --- /dev/null +++ b/templates/centos-5.5-i386/scripts/sshd.sh @@ -0,0 +1,3 @@ +#!/bin/bash -eux + +echo "UseDNS no" >> /etc/ssh/sshd_config diff --git a/templates/centos-5.5-i386/scripts/vagrant.sh b/templates/centos-5.5-i386/scripts/vagrant.sh new file mode 100644 index 000000000..72dd2f444 --- /dev/null +++ b/templates/centos-5.5-i386/scripts/vagrant.sh @@ -0,0 +1,33 @@ +#!/bin/bash -eux + +if [ -f /home/vagrant/.vbox_version ]; then + mkdir /tmp/vbox + VER=$(cat /home/vagrant/.vbox_version) + mount -o loop VBoxGuestAdditions_$VER.iso /tmp/vbox + sh /tmp/vbox/VBoxLinuxAdditions.run + umount /tmp/vbox + rmdir /tmp/vbox + rm *.iso +fi + +if [ -f /home/vagrant/.vmfusion_version ]; then + #Set Linux-specific paths and ISO filename + home_dir="/home/vagrant" + iso_name="linux.iso" + mount_point="/tmp/vmware-tools" + #Run install, unmount ISO and remove it + mkdir ${mount_point} + cd ${home_dir} + /bin/mount -o loop ${iso_name} ${mount_point} + tar zxf ${mount_point}/*.tar.gz && cd vmware-tools-distrib && ./vmware-install.pl --default + /bin/umount ${mount_point} + /bin/rm -rf ${home_dir}/${iso_name} ${home_dir}/vmware-tools-distrib + rmdir ${mount_point} +fi + +mkdir /home/vagrant/.ssh +wget --no-check-certificate \ + 'https://github.com/mitchellh/vagrant/raw/master/keys/vagrant.pub' \ + -O /home/vagrant/.ssh/authorized_keys +chown -R vagrant /home/vagrant/.ssh +chmod -R go-rwsx /home/vagrant/.ssh diff --git a/templates/centos-5.5-i386/template.json b/templates/centos-5.5-i386/template.json new file mode 100644 index 000000000..0dfa5f94f --- /dev/null +++ b/templates/centos-5.5-i386/template.json @@ -0,0 +1,88 @@ +{ + "provisioners": [ + { + "type": "shell", + "scripts": [ + "scripts/vagrant.sh", + "scripts/sshd.sh", + "scripts/cleanup.sh", + "scripts/minimize.sh" + ], + "override": { + "virtualbox": { + "execute_command": "echo 'vagrant'|sudo -S sh '{{.Path}}'" + }, + "vmware": { + "execute_command": "echo 'vagrant'|sudo -S sh '{{.Path}}'" + } + } + } + ], + "builders": [ + { + "type": "virtualbox", + "boot_command": [ + "linux text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/ks.cfg<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "guest_os_type": "RedHat", + "http_directory": "http", + "iso_checksum": "75c92246479df172de41b14c9b966344", + "iso_checksum_type": "md5", + "iso_url": "http://mirror.teklinks.com/centos/5.5/isos/i386/CentOS-5.5-i386-bin-DVD.iso", + "ssh_username": "vagrant", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_wait_timeout": "10000s", + "shutdown_command": "echo '/sbin/halt -h -p' > shutdown.sh; echo 'vagrant'|sudo -S sh 'shutdown.sh'", + "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "virtualbox_version_file": ".vbox_version", + "vboxmanage": [ + [ + "modifyvm", + "{{.Name}}", + "--memory", + "384" + ], + [ + "modifyvm", + "{{.Name}}", + "--cpus", + "1" + ] + ], + "iso_md5": "75c92246479df172de41b14c9b966344" + }, + { + "type": "vmware", + "boot_command": [ + "linux text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/ks.cfg<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "guest_os_type": "centos", + "http_directory": "http", + "iso_checksum": "75c92246479df172de41b14c9b966344", + "iso_checksum_type": "md5", + "iso_url": "http://mirror.teklinks.com/centos/5.5/isos/i386/CentOS-5.5-i386-bin-DVD.iso", + "ssh_username": "vagrant", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_wait_timeout": "10000s", + "shutdown_command": "echo '/sbin/halt -h -p' > shutdown.sh; echo 'vagrant'|sudo -S sh 'shutdown.sh'", + "vmx_data": { + "memsize": "384", + "numvcpus": "1", + "cpuid.coresPerSocket": "1" + }, + "iso_md5": "75c92246479df172de41b14c9b966344" + } + ], + "post-provisioner": [ + { + "type": "vagrant", + "output": "centos-5.5-i386-{{.Provisioner}}.box" + } + ] +} \ No newline at end of file diff --git a/templates/centos-5.5/http/ks.cfg b/templates/centos-5.5/http/ks.cfg new file mode 100644 index 000000000..e00fd5a2a --- /dev/null +++ b/templates/centos-5.5/http/ks.cfg @@ -0,0 +1,39 @@ +install +cdrom +lang en_US.UTF-8 +keyboard us +network --bootproto=dhcp +rootpw --iscrypted $1$damlkd,f$UC/u5pUts5QiU3ow.CSso/ +firewall --disabled +authconfig --enableshadow --passalgo=sha512 +selinux --disabled +timezone UTC +bootloader --location=mbr +text +skipx +zerombr +clearpart --all --initlabel +autopart +auth --useshadow --enablemd5 +firstboot --disabled +reboot + +%packages --ignoremissing +@Base +@Core +@Development Tools +openssl-devel +readline-devel +zlib-devel +kernel-devel + +%post +# update root certs +wget -O/etc/pki/tls/certs/ca-bundle.crt http://curl.haxx.se/ca/cacert.pem +# vagrant +groupadd vagrant -g 999 +useradd vagrant -g vagrant -G wheel -u 900 +echo "vagrant" | passwd --stdin vagrant +# sudo +echo "vagrant ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers +sed -i "s/^.*requiretty/#Defaults requiretty/" /etc/sudoers diff --git a/templates/centos-5.5/scripts/cleanup.sh b/templates/centos-5.5/scripts/cleanup.sh new file mode 100644 index 000000000..922c3d6b5 --- /dev/null +++ b/templates/centos-5.5/scripts/cleanup.sh @@ -0,0 +1,5 @@ +#!/bin/bash -eux +yum -y erase gtk2 libX11 hicolor-icon-theme avahi freetype bitstream-vera-fonts +yum -y clean all +rm -rf VBoxGuestAdditions_*.iso VBoxGuestAdditions_*.iso.? +rm -f /tmp/chef*rpm diff --git a/templates/centos-5.5/scripts/minimize.sh b/templates/centos-5.5/scripts/minimize.sh new file mode 100644 index 000000000..3846a1d65 --- /dev/null +++ b/templates/centos-5.5/scripts/minimize.sh @@ -0,0 +1,4 @@ +#!/bin/bash -eux + +dd if=/dev/zero of=/EMPTY bs=1M +rm -f /EMPTY diff --git a/templates/centos-5.5/scripts/sshd.sh b/templates/centos-5.5/scripts/sshd.sh new file mode 100644 index 000000000..c6e4f20a6 --- /dev/null +++ b/templates/centos-5.5/scripts/sshd.sh @@ -0,0 +1,3 @@ +#!/bin/bash -eux + +echo "UseDNS no" >> /etc/ssh/sshd_config diff --git a/templates/centos-5.5/scripts/vagrant.sh b/templates/centos-5.5/scripts/vagrant.sh new file mode 100644 index 000000000..72dd2f444 --- /dev/null +++ b/templates/centos-5.5/scripts/vagrant.sh @@ -0,0 +1,33 @@ +#!/bin/bash -eux + +if [ -f /home/vagrant/.vbox_version ]; then + mkdir /tmp/vbox + VER=$(cat /home/vagrant/.vbox_version) + mount -o loop VBoxGuestAdditions_$VER.iso /tmp/vbox + sh /tmp/vbox/VBoxLinuxAdditions.run + umount /tmp/vbox + rmdir /tmp/vbox + rm *.iso +fi + +if [ -f /home/vagrant/.vmfusion_version ]; then + #Set Linux-specific paths and ISO filename + home_dir="/home/vagrant" + iso_name="linux.iso" + mount_point="/tmp/vmware-tools" + #Run install, unmount ISO and remove it + mkdir ${mount_point} + cd ${home_dir} + /bin/mount -o loop ${iso_name} ${mount_point} + tar zxf ${mount_point}/*.tar.gz && cd vmware-tools-distrib && ./vmware-install.pl --default + /bin/umount ${mount_point} + /bin/rm -rf ${home_dir}/${iso_name} ${home_dir}/vmware-tools-distrib + rmdir ${mount_point} +fi + +mkdir /home/vagrant/.ssh +wget --no-check-certificate \ + 'https://github.com/mitchellh/vagrant/raw/master/keys/vagrant.pub' \ + -O /home/vagrant/.ssh/authorized_keys +chown -R vagrant /home/vagrant/.ssh +chmod -R go-rwsx /home/vagrant/.ssh diff --git a/templates/centos-5.5/template.json b/templates/centos-5.5/template.json new file mode 100644 index 000000000..ca16eb9ec --- /dev/null +++ b/templates/centos-5.5/template.json @@ -0,0 +1,88 @@ +{ + "provisioners": [ + { + "type": "shell", + "scripts": [ + "scripts/vagrant.sh", + "scripts/sshd.sh", + "scripts/cleanup.sh", + "scripts/minimize.sh" + ], + "override": { + "virtualbox": { + "execute_command": "echo 'vagrant'|sudo -S sh '{{.Path}}'" + }, + "vmware": { + "execute_command": "echo 'vagrant'|sudo -S sh '{{.Path}}'" + } + } + } + ], + "builders": [ + { + "type": "virtualbox", + "boot_command": [ + "linux text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/ks.cfg<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "guest_os_type": "RedHat_64", + "http_directory": "http", + "iso_checksum": "ac177a5476e3b255b89b659e5b10ba03", + "iso_checksum_type": "md5", + "iso_url": "http://mirror.teklinks.com/centos/5.5/isos/x86_64/CentOS-5.5-x86_64-bin-DVD-1of2.iso", + "ssh_username": "vagrant", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_wait_timeout": "10000s", + "shutdown_command": "echo '/sbin/halt -h -p' > shutdown.sh; echo 'vagrant'|sudo -S sh 'shutdown.sh'", + "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "virtualbox_version_file": ".vbox_version", + "vboxmanage": [ + [ + "modifyvm", + "{{.Name}}", + "--memory", + "384" + ], + [ + "modifyvm", + "{{.Name}}", + "--cpus", + "1" + ] + ], + "iso_md5": "ac177a5476e3b255b89b659e5b10ba03" + }, + { + "type": "vmware", + "boot_command": [ + "linux text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/ks.cfg<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "guest_os_type": "centos-64", + "http_directory": "http", + "iso_checksum": "ac177a5476e3b255b89b659e5b10ba03", + "iso_checksum_type": "md5", + "iso_url": "http://mirror.teklinks.com/centos/5.5/isos/x86_64/CentOS-5.5-x86_64-bin-DVD-1of2.iso", + "ssh_username": "vagrant", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_wait_timeout": "10000s", + "shutdown_command": "echo '/sbin/halt -h -p' > shutdown.sh; echo 'vagrant'|sudo -S sh 'shutdown.sh'", + "vmx_data": { + "memsize": "384", + "numvcpus": "1", + "cpuid.coresPerSocket": "1" + }, + "iso_md5": "ac177a5476e3b255b89b659e5b10ba03" + } + ], + "post-provisioner": [ + { + "type": "vagrant", + "output": "centos-5.5-{{.Provisioner}}.box" + } + ] +} \ No newline at end of file diff --git a/templates/centos-5.6/http/ks.cfg b/templates/centos-5.6/http/ks.cfg new file mode 100644 index 000000000..e00fd5a2a --- /dev/null +++ b/templates/centos-5.6/http/ks.cfg @@ -0,0 +1,39 @@ +install +cdrom +lang en_US.UTF-8 +keyboard us +network --bootproto=dhcp +rootpw --iscrypted $1$damlkd,f$UC/u5pUts5QiU3ow.CSso/ +firewall --disabled +authconfig --enableshadow --passalgo=sha512 +selinux --disabled +timezone UTC +bootloader --location=mbr +text +skipx +zerombr +clearpart --all --initlabel +autopart +auth --useshadow --enablemd5 +firstboot --disabled +reboot + +%packages --ignoremissing +@Base +@Core +@Development Tools +openssl-devel +readline-devel +zlib-devel +kernel-devel + +%post +# update root certs +wget -O/etc/pki/tls/certs/ca-bundle.crt http://curl.haxx.se/ca/cacert.pem +# vagrant +groupadd vagrant -g 999 +useradd vagrant -g vagrant -G wheel -u 900 +echo "vagrant" | passwd --stdin vagrant +# sudo +echo "vagrant ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers +sed -i "s/^.*requiretty/#Defaults requiretty/" /etc/sudoers diff --git a/templates/centos-5.6/scripts/cleanup.sh b/templates/centos-5.6/scripts/cleanup.sh new file mode 100644 index 000000000..922c3d6b5 --- /dev/null +++ b/templates/centos-5.6/scripts/cleanup.sh @@ -0,0 +1,5 @@ +#!/bin/bash -eux +yum -y erase gtk2 libX11 hicolor-icon-theme avahi freetype bitstream-vera-fonts +yum -y clean all +rm -rf VBoxGuestAdditions_*.iso VBoxGuestAdditions_*.iso.? +rm -f /tmp/chef*rpm diff --git a/templates/centos-5.6/scripts/minimize.sh b/templates/centos-5.6/scripts/minimize.sh new file mode 100644 index 000000000..3846a1d65 --- /dev/null +++ b/templates/centos-5.6/scripts/minimize.sh @@ -0,0 +1,4 @@ +#!/bin/bash -eux + +dd if=/dev/zero of=/EMPTY bs=1M +rm -f /EMPTY diff --git a/templates/centos-5.6/scripts/sshd.sh b/templates/centos-5.6/scripts/sshd.sh new file mode 100644 index 000000000..c6e4f20a6 --- /dev/null +++ b/templates/centos-5.6/scripts/sshd.sh @@ -0,0 +1,3 @@ +#!/bin/bash -eux + +echo "UseDNS no" >> /etc/ssh/sshd_config diff --git a/templates/centos-5.6/scripts/vagrant.sh b/templates/centos-5.6/scripts/vagrant.sh new file mode 100644 index 000000000..72dd2f444 --- /dev/null +++ b/templates/centos-5.6/scripts/vagrant.sh @@ -0,0 +1,33 @@ +#!/bin/bash -eux + +if [ -f /home/vagrant/.vbox_version ]; then + mkdir /tmp/vbox + VER=$(cat /home/vagrant/.vbox_version) + mount -o loop VBoxGuestAdditions_$VER.iso /tmp/vbox + sh /tmp/vbox/VBoxLinuxAdditions.run + umount /tmp/vbox + rmdir /tmp/vbox + rm *.iso +fi + +if [ -f /home/vagrant/.vmfusion_version ]; then + #Set Linux-specific paths and ISO filename + home_dir="/home/vagrant" + iso_name="linux.iso" + mount_point="/tmp/vmware-tools" + #Run install, unmount ISO and remove it + mkdir ${mount_point} + cd ${home_dir} + /bin/mount -o loop ${iso_name} ${mount_point} + tar zxf ${mount_point}/*.tar.gz && cd vmware-tools-distrib && ./vmware-install.pl --default + /bin/umount ${mount_point} + /bin/rm -rf ${home_dir}/${iso_name} ${home_dir}/vmware-tools-distrib + rmdir ${mount_point} +fi + +mkdir /home/vagrant/.ssh +wget --no-check-certificate \ + 'https://github.com/mitchellh/vagrant/raw/master/keys/vagrant.pub' \ + -O /home/vagrant/.ssh/authorized_keys +chown -R vagrant /home/vagrant/.ssh +chmod -R go-rwsx /home/vagrant/.ssh diff --git a/templates/centos-5.6/template.json b/templates/centos-5.6/template.json new file mode 100644 index 000000000..b03dc17af --- /dev/null +++ b/templates/centos-5.6/template.json @@ -0,0 +1,88 @@ +{ + "provisioners": [ + { + "type": "shell", + "scripts": [ + "scripts/vagrant.sh", + "scripts/sshd.sh", + "scripts/cleanup.sh", + "scripts/minimize.sh" + ], + "override": { + "virtualbox": { + "execute_command": "echo 'vagrant'|sudo -S sh '{{.Path}}'" + }, + "vmware": { + "execute_command": "echo 'vagrant'|sudo -S sh '{{.Path}}'" + } + } + } + ], + "builders": [ + { + "type": "virtualbox", + "boot_command": [ + "linux text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/ks.cfg<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "guest_os_type": "RedHat_64", + "http_directory": "http", + "iso_checksum": "b37209879c0fb158fac25045527241ee", + "iso_checksum_type": "md5", + "iso_url": "http://mirror.teklinks.com/centos/5.6/isos/x86_64/CentOS-5.6-x86_64-bin-DVD-1of2.iso", + "ssh_username": "vagrant", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_wait_timeout": "10000s", + "shutdown_command": "echo '/sbin/halt -h -p' > shutdown.sh; echo 'vagrant'|sudo -S sh 'shutdown.sh'", + "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "virtualbox_version_file": ".vbox_version", + "vboxmanage": [ + [ + "modifyvm", + "{{.Name}}", + "--memory", + "384" + ], + [ + "modifyvm", + "{{.Name}}", + "--cpus", + "1" + ] + ], + "iso_md5": "b37209879c0fb158fac25045527241ee" + }, + { + "type": "vmware", + "boot_command": [ + "linux text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/ks.cfg<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "guest_os_type": "centos-64", + "http_directory": "http", + "iso_checksum": "b37209879c0fb158fac25045527241ee", + "iso_checksum_type": "md5", + "iso_url": "http://mirror.teklinks.com/centos/5.6/isos/x86_64/CentOS-5.6-x86_64-bin-DVD-1of2.iso", + "ssh_username": "vagrant", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_wait_timeout": "10000s", + "shutdown_command": "echo '/sbin/halt -h -p' > shutdown.sh; echo 'vagrant'|sudo -S sh 'shutdown.sh'", + "vmx_data": { + "memsize": "384", + "numvcpus": "1", + "cpuid.coresPerSocket": "1" + }, + "iso_md5": "b37209879c0fb158fac25045527241ee" + } + ], + "post-provisioner": [ + { + "type": "vagrant", + "output": "centos-5.6-{{.Provisioner}}.box" + } + ] +} \ No newline at end of file diff --git a/templates/centos-5.7/http/ks.cfg b/templates/centos-5.7/http/ks.cfg new file mode 100644 index 000000000..e00fd5a2a --- /dev/null +++ b/templates/centos-5.7/http/ks.cfg @@ -0,0 +1,39 @@ +install +cdrom +lang en_US.UTF-8 +keyboard us +network --bootproto=dhcp +rootpw --iscrypted $1$damlkd,f$UC/u5pUts5QiU3ow.CSso/ +firewall --disabled +authconfig --enableshadow --passalgo=sha512 +selinux --disabled +timezone UTC +bootloader --location=mbr +text +skipx +zerombr +clearpart --all --initlabel +autopart +auth --useshadow --enablemd5 +firstboot --disabled +reboot + +%packages --ignoremissing +@Base +@Core +@Development Tools +openssl-devel +readline-devel +zlib-devel +kernel-devel + +%post +# update root certs +wget -O/etc/pki/tls/certs/ca-bundle.crt http://curl.haxx.se/ca/cacert.pem +# vagrant +groupadd vagrant -g 999 +useradd vagrant -g vagrant -G wheel -u 900 +echo "vagrant" | passwd --stdin vagrant +# sudo +echo "vagrant ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers +sed -i "s/^.*requiretty/#Defaults requiretty/" /etc/sudoers diff --git a/templates/centos-5.7/scripts/cleanup.sh b/templates/centos-5.7/scripts/cleanup.sh new file mode 100644 index 000000000..922c3d6b5 --- /dev/null +++ b/templates/centos-5.7/scripts/cleanup.sh @@ -0,0 +1,5 @@ +#!/bin/bash -eux +yum -y erase gtk2 libX11 hicolor-icon-theme avahi freetype bitstream-vera-fonts +yum -y clean all +rm -rf VBoxGuestAdditions_*.iso VBoxGuestAdditions_*.iso.? +rm -f /tmp/chef*rpm diff --git a/templates/centos-5.7/scripts/minimize.sh b/templates/centos-5.7/scripts/minimize.sh new file mode 100644 index 000000000..3846a1d65 --- /dev/null +++ b/templates/centos-5.7/scripts/minimize.sh @@ -0,0 +1,4 @@ +#!/bin/bash -eux + +dd if=/dev/zero of=/EMPTY bs=1M +rm -f /EMPTY diff --git a/templates/centos-5.7/scripts/sshd.sh b/templates/centos-5.7/scripts/sshd.sh new file mode 100644 index 000000000..c6e4f20a6 --- /dev/null +++ b/templates/centos-5.7/scripts/sshd.sh @@ -0,0 +1,3 @@ +#!/bin/bash -eux + +echo "UseDNS no" >> /etc/ssh/sshd_config diff --git a/templates/centos-5.7/scripts/vagrant.sh b/templates/centos-5.7/scripts/vagrant.sh new file mode 100644 index 000000000..72dd2f444 --- /dev/null +++ b/templates/centos-5.7/scripts/vagrant.sh @@ -0,0 +1,33 @@ +#!/bin/bash -eux + +if [ -f /home/vagrant/.vbox_version ]; then + mkdir /tmp/vbox + VER=$(cat /home/vagrant/.vbox_version) + mount -o loop VBoxGuestAdditions_$VER.iso /tmp/vbox + sh /tmp/vbox/VBoxLinuxAdditions.run + umount /tmp/vbox + rmdir /tmp/vbox + rm *.iso +fi + +if [ -f /home/vagrant/.vmfusion_version ]; then + #Set Linux-specific paths and ISO filename + home_dir="/home/vagrant" + iso_name="linux.iso" + mount_point="/tmp/vmware-tools" + #Run install, unmount ISO and remove it + mkdir ${mount_point} + cd ${home_dir} + /bin/mount -o loop ${iso_name} ${mount_point} + tar zxf ${mount_point}/*.tar.gz && cd vmware-tools-distrib && ./vmware-install.pl --default + /bin/umount ${mount_point} + /bin/rm -rf ${home_dir}/${iso_name} ${home_dir}/vmware-tools-distrib + rmdir ${mount_point} +fi + +mkdir /home/vagrant/.ssh +wget --no-check-certificate \ + 'https://github.com/mitchellh/vagrant/raw/master/keys/vagrant.pub' \ + -O /home/vagrant/.ssh/authorized_keys +chown -R vagrant /home/vagrant/.ssh +chmod -R go-rwsx /home/vagrant/.ssh diff --git a/templates/centos-5.7/template.json b/templates/centos-5.7/template.json new file mode 100644 index 000000000..d17efb965 --- /dev/null +++ b/templates/centos-5.7/template.json @@ -0,0 +1,88 @@ +{ + "provisioners": [ + { + "type": "shell", + "scripts": [ + "scripts/vagrant.sh", + "scripts/sshd.sh", + "scripts/cleanup.sh", + "scripts/minimize.sh" + ], + "override": { + "virtualbox": { + "execute_command": "echo 'vagrant'|sudo -S sh '{{.Path}}'" + }, + "vmware": { + "execute_command": "echo 'vagrant'|sudo -S sh '{{.Path}}'" + } + } + } + ], + "builders": [ + { + "type": "virtualbox", + "boot_command": [ + "linux text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/ks.cfg<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "guest_os_type": "RedHat_64", + "http_directory": "http", + "iso_checksum": "55eadec0a6e87c5f2883f734d43fdb58", + "iso_checksum_type": "md5", + "iso_url": "http://vault.centos.org/5.7/isos/x86_64/CentOS-5.7-x86_64-bin-DVD-1of2.iso", + "ssh_username": "vagrant", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_wait_timeout": "10000s", + "shutdown_command": "echo '/sbin/halt -h -p' > shutdown.sh; echo 'vagrant'|sudo -S sh 'shutdown.sh'", + "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "virtualbox_version_file": ".vbox_version", + "vboxmanage": [ + [ + "modifyvm", + "{{.Name}}", + "--memory", + "384" + ], + [ + "modifyvm", + "{{.Name}}", + "--cpus", + "1" + ] + ], + "iso_md5": "55eadec0a6e87c5f2883f734d43fdb58" + }, + { + "type": "vmware", + "boot_command": [ + "linux text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/ks.cfg<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "guest_os_type": "centos-64", + "http_directory": "http", + "iso_checksum": "55eadec0a6e87c5f2883f734d43fdb58", + "iso_checksum_type": "md5", + "iso_url": "http://vault.centos.org/5.7/isos/x86_64/CentOS-5.7-x86_64-bin-DVD-1of2.iso", + "ssh_username": "vagrant", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_wait_timeout": "10000s", + "shutdown_command": "echo '/sbin/halt -h -p' > shutdown.sh; echo 'vagrant'|sudo -S sh 'shutdown.sh'", + "vmx_data": { + "memsize": "384", + "numvcpus": "1", + "cpuid.coresPerSocket": "1" + }, + "iso_md5": "55eadec0a6e87c5f2883f734d43fdb58" + } + ], + "post-provisioner": [ + { + "type": "vagrant", + "output": "centos-5.7-{{.Provisioner}}.box" + } + ] +} \ No newline at end of file diff --git a/templates/centos-5.8-i386/http/ks.cfg b/templates/centos-5.8-i386/http/ks.cfg new file mode 100644 index 000000000..e00fd5a2a --- /dev/null +++ b/templates/centos-5.8-i386/http/ks.cfg @@ -0,0 +1,39 @@ +install +cdrom +lang en_US.UTF-8 +keyboard us +network --bootproto=dhcp +rootpw --iscrypted $1$damlkd,f$UC/u5pUts5QiU3ow.CSso/ +firewall --disabled +authconfig --enableshadow --passalgo=sha512 +selinux --disabled +timezone UTC +bootloader --location=mbr +text +skipx +zerombr +clearpart --all --initlabel +autopart +auth --useshadow --enablemd5 +firstboot --disabled +reboot + +%packages --ignoremissing +@Base +@Core +@Development Tools +openssl-devel +readline-devel +zlib-devel +kernel-devel + +%post +# update root certs +wget -O/etc/pki/tls/certs/ca-bundle.crt http://curl.haxx.se/ca/cacert.pem +# vagrant +groupadd vagrant -g 999 +useradd vagrant -g vagrant -G wheel -u 900 +echo "vagrant" | passwd --stdin vagrant +# sudo +echo "vagrant ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers +sed -i "s/^.*requiretty/#Defaults requiretty/" /etc/sudoers diff --git a/templates/centos-5.8-i386/scripts/cleanup.sh b/templates/centos-5.8-i386/scripts/cleanup.sh new file mode 100644 index 000000000..922c3d6b5 --- /dev/null +++ b/templates/centos-5.8-i386/scripts/cleanup.sh @@ -0,0 +1,5 @@ +#!/bin/bash -eux +yum -y erase gtk2 libX11 hicolor-icon-theme avahi freetype bitstream-vera-fonts +yum -y clean all +rm -rf VBoxGuestAdditions_*.iso VBoxGuestAdditions_*.iso.? +rm -f /tmp/chef*rpm diff --git a/templates/centos-5.8-i386/scripts/minimize.sh b/templates/centos-5.8-i386/scripts/minimize.sh new file mode 100644 index 000000000..3846a1d65 --- /dev/null +++ b/templates/centos-5.8-i386/scripts/minimize.sh @@ -0,0 +1,4 @@ +#!/bin/bash -eux + +dd if=/dev/zero of=/EMPTY bs=1M +rm -f /EMPTY diff --git a/templates/centos-5.8-i386/scripts/sshd.sh b/templates/centos-5.8-i386/scripts/sshd.sh new file mode 100644 index 000000000..c6e4f20a6 --- /dev/null +++ b/templates/centos-5.8-i386/scripts/sshd.sh @@ -0,0 +1,3 @@ +#!/bin/bash -eux + +echo "UseDNS no" >> /etc/ssh/sshd_config diff --git a/templates/centos-5.8-i386/scripts/vagrant.sh b/templates/centos-5.8-i386/scripts/vagrant.sh new file mode 100644 index 000000000..72dd2f444 --- /dev/null +++ b/templates/centos-5.8-i386/scripts/vagrant.sh @@ -0,0 +1,33 @@ +#!/bin/bash -eux + +if [ -f /home/vagrant/.vbox_version ]; then + mkdir /tmp/vbox + VER=$(cat /home/vagrant/.vbox_version) + mount -o loop VBoxGuestAdditions_$VER.iso /tmp/vbox + sh /tmp/vbox/VBoxLinuxAdditions.run + umount /tmp/vbox + rmdir /tmp/vbox + rm *.iso +fi + +if [ -f /home/vagrant/.vmfusion_version ]; then + #Set Linux-specific paths and ISO filename + home_dir="/home/vagrant" + iso_name="linux.iso" + mount_point="/tmp/vmware-tools" + #Run install, unmount ISO and remove it + mkdir ${mount_point} + cd ${home_dir} + /bin/mount -o loop ${iso_name} ${mount_point} + tar zxf ${mount_point}/*.tar.gz && cd vmware-tools-distrib && ./vmware-install.pl --default + /bin/umount ${mount_point} + /bin/rm -rf ${home_dir}/${iso_name} ${home_dir}/vmware-tools-distrib + rmdir ${mount_point} +fi + +mkdir /home/vagrant/.ssh +wget --no-check-certificate \ + 'https://github.com/mitchellh/vagrant/raw/master/keys/vagrant.pub' \ + -O /home/vagrant/.ssh/authorized_keys +chown -R vagrant /home/vagrant/.ssh +chmod -R go-rwsx /home/vagrant/.ssh diff --git a/templates/centos-5.8-i386/template.json b/templates/centos-5.8-i386/template.json new file mode 100644 index 000000000..1fe4a9fff --- /dev/null +++ b/templates/centos-5.8-i386/template.json @@ -0,0 +1,88 @@ +{ + "provisioners": [ + { + "type": "shell", + "scripts": [ + "scripts/vagrant.sh", + "scripts/sshd.sh", + "scripts/cleanup.sh", + "scripts/minimize.sh" + ], + "override": { + "virtualbox": { + "execute_command": "echo 'vagrant'|sudo -S sh '{{.Path}}'" + }, + "vmware": { + "execute_command": "echo 'vagrant'|sudo -S sh '{{.Path}}'" + } + } + } + ], + "builders": [ + { + "type": "virtualbox", + "boot_command": [ + "linux text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/ks.cfg<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "guest_os_type": "RedHat", + "http_directory": "http", + "iso_checksum": "0fdd45c43b5d8fb9e05f4255c5855f9c", + "iso_checksum_type": "md5", + "iso_url": "http://vault.centos.org/5.8/isos/i386/CentOS-5.8-i386-bin-DVD-1of2.iso", + "ssh_username": "vagrant", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_wait_timeout": "10000s", + "shutdown_command": "echo '/sbin/halt -h -p' > shutdown.sh; echo 'vagrant'|sudo -S sh 'shutdown.sh'", + "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "virtualbox_version_file": ".vbox_version", + "vboxmanage": [ + [ + "modifyvm", + "{{.Name}}", + "--memory", + "384" + ], + [ + "modifyvm", + "{{.Name}}", + "--cpus", + "1" + ] + ], + "iso_md5": "0fdd45c43b5d8fb9e05f4255c5855f9c" + }, + { + "type": "vmware", + "boot_command": [ + "linux text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/ks.cfg<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "guest_os_type": "centos", + "http_directory": "http", + "iso_checksum": "0fdd45c43b5d8fb9e05f4255c5855f9c", + "iso_checksum_type": "md5", + "iso_url": "http://vault.centos.org/5.8/isos/i386/CentOS-5.8-i386-bin-DVD-1of2.iso", + "ssh_username": "vagrant", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_wait_timeout": "10000s", + "shutdown_command": "echo '/sbin/halt -h -p' > shutdown.sh; echo 'vagrant'|sudo -S sh 'shutdown.sh'", + "vmx_data": { + "memsize": "384", + "numvcpus": "1", + "cpuid.coresPerSocket": "1" + }, + "iso_md5": "0fdd45c43b5d8fb9e05f4255c5855f9c" + } + ], + "post-provisioner": [ + { + "type": "vagrant", + "output": "centos-5.8-i386-{{.Provisioner}}.box" + } + ] +} \ No newline at end of file diff --git a/templates/centos-5.8/http/ks.cfg b/templates/centos-5.8/http/ks.cfg new file mode 100644 index 000000000..e00fd5a2a --- /dev/null +++ b/templates/centos-5.8/http/ks.cfg @@ -0,0 +1,39 @@ +install +cdrom +lang en_US.UTF-8 +keyboard us +network --bootproto=dhcp +rootpw --iscrypted $1$damlkd,f$UC/u5pUts5QiU3ow.CSso/ +firewall --disabled +authconfig --enableshadow --passalgo=sha512 +selinux --disabled +timezone UTC +bootloader --location=mbr +text +skipx +zerombr +clearpart --all --initlabel +autopart +auth --useshadow --enablemd5 +firstboot --disabled +reboot + +%packages --ignoremissing +@Base +@Core +@Development Tools +openssl-devel +readline-devel +zlib-devel +kernel-devel + +%post +# update root certs +wget -O/etc/pki/tls/certs/ca-bundle.crt http://curl.haxx.se/ca/cacert.pem +# vagrant +groupadd vagrant -g 999 +useradd vagrant -g vagrant -G wheel -u 900 +echo "vagrant" | passwd --stdin vagrant +# sudo +echo "vagrant ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers +sed -i "s/^.*requiretty/#Defaults requiretty/" /etc/sudoers diff --git a/templates/centos-5.8/scripts/cleanup.sh b/templates/centos-5.8/scripts/cleanup.sh new file mode 100644 index 000000000..922c3d6b5 --- /dev/null +++ b/templates/centos-5.8/scripts/cleanup.sh @@ -0,0 +1,5 @@ +#!/bin/bash -eux +yum -y erase gtk2 libX11 hicolor-icon-theme avahi freetype bitstream-vera-fonts +yum -y clean all +rm -rf VBoxGuestAdditions_*.iso VBoxGuestAdditions_*.iso.? +rm -f /tmp/chef*rpm diff --git a/templates/centos-5.8/scripts/minimize.sh b/templates/centos-5.8/scripts/minimize.sh new file mode 100644 index 000000000..3846a1d65 --- /dev/null +++ b/templates/centos-5.8/scripts/minimize.sh @@ -0,0 +1,4 @@ +#!/bin/bash -eux + +dd if=/dev/zero of=/EMPTY bs=1M +rm -f /EMPTY diff --git a/templates/centos-5.8/scripts/sshd.sh b/templates/centos-5.8/scripts/sshd.sh new file mode 100644 index 000000000..c6e4f20a6 --- /dev/null +++ b/templates/centos-5.8/scripts/sshd.sh @@ -0,0 +1,3 @@ +#!/bin/bash -eux + +echo "UseDNS no" >> /etc/ssh/sshd_config diff --git a/templates/centos-5.8/scripts/vagrant.sh b/templates/centos-5.8/scripts/vagrant.sh new file mode 100644 index 000000000..72dd2f444 --- /dev/null +++ b/templates/centos-5.8/scripts/vagrant.sh @@ -0,0 +1,33 @@ +#!/bin/bash -eux + +if [ -f /home/vagrant/.vbox_version ]; then + mkdir /tmp/vbox + VER=$(cat /home/vagrant/.vbox_version) + mount -o loop VBoxGuestAdditions_$VER.iso /tmp/vbox + sh /tmp/vbox/VBoxLinuxAdditions.run + umount /tmp/vbox + rmdir /tmp/vbox + rm *.iso +fi + +if [ -f /home/vagrant/.vmfusion_version ]; then + #Set Linux-specific paths and ISO filename + home_dir="/home/vagrant" + iso_name="linux.iso" + mount_point="/tmp/vmware-tools" + #Run install, unmount ISO and remove it + mkdir ${mount_point} + cd ${home_dir} + /bin/mount -o loop ${iso_name} ${mount_point} + tar zxf ${mount_point}/*.tar.gz && cd vmware-tools-distrib && ./vmware-install.pl --default + /bin/umount ${mount_point} + /bin/rm -rf ${home_dir}/${iso_name} ${home_dir}/vmware-tools-distrib + rmdir ${mount_point} +fi + +mkdir /home/vagrant/.ssh +wget --no-check-certificate \ + 'https://github.com/mitchellh/vagrant/raw/master/keys/vagrant.pub' \ + -O /home/vagrant/.ssh/authorized_keys +chown -R vagrant /home/vagrant/.ssh +chmod -R go-rwsx /home/vagrant/.ssh diff --git a/templates/centos-5.8/template.json b/templates/centos-5.8/template.json new file mode 100644 index 000000000..e36ed397e --- /dev/null +++ b/templates/centos-5.8/template.json @@ -0,0 +1,88 @@ +{ + "provisioners": [ + { + "type": "shell", + "scripts": [ + "scripts/vagrant.sh", + "scripts/sshd.sh", + "scripts/cleanup.sh", + "scripts/minimize.sh" + ], + "override": { + "virtualbox": { + "execute_command": "echo 'vagrant'|sudo -S sh '{{.Path}}'" + }, + "vmware": { + "execute_command": "echo 'vagrant'|sudo -S sh '{{.Path}}'" + } + } + } + ], + "builders": [ + { + "type": "virtualbox", + "boot_command": [ + "linux text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/ks.cfg<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "guest_os_type": "RedHat_64", + "http_directory": "http", + "iso_checksum": "8a3bf0030f192022943f83fe6b2cf373", + "iso_checksum_type": "md5", + "iso_url": "http://vault.centos.org/5.8/isos/x86_64/CentOS-5.8-x86_64-bin-DVD-1of2.iso", + "ssh_username": "vagrant", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_wait_timeout": "10000s", + "shutdown_command": "echo '/sbin/halt -h -p' > shutdown.sh; echo 'vagrant'|sudo -S sh 'shutdown.sh'", + "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "virtualbox_version_file": ".vbox_version", + "vboxmanage": [ + [ + "modifyvm", + "{{.Name}}", + "--memory", + "384" + ], + [ + "modifyvm", + "{{.Name}}", + "--cpus", + "1" + ] + ], + "iso_md5": "8a3bf0030f192022943f83fe6b2cf373" + }, + { + "type": "vmware", + "boot_command": [ + "linux text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/ks.cfg<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "guest_os_type": "centos-64", + "http_directory": "http", + "iso_checksum": "8a3bf0030f192022943f83fe6b2cf373", + "iso_checksum_type": "md5", + "iso_url": "http://vault.centos.org/5.8/isos/x86_64/CentOS-5.8-x86_64-bin-DVD-1of2.iso", + "ssh_username": "vagrant", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_wait_timeout": "10000s", + "shutdown_command": "echo '/sbin/halt -h -p' > shutdown.sh; echo 'vagrant'|sudo -S sh 'shutdown.sh'", + "vmx_data": { + "memsize": "384", + "numvcpus": "1", + "cpuid.coresPerSocket": "1" + }, + "iso_md5": "8a3bf0030f192022943f83fe6b2cf373" + } + ], + "post-provisioner": [ + { + "type": "vagrant", + "output": "centos-5.8-{{.Provisioner}}.box" + } + ] +} \ No newline at end of file diff --git a/templates/centos-5.9-i386/http/ks.cfg b/templates/centos-5.9-i386/http/ks.cfg new file mode 100644 index 000000000..e00fd5a2a --- /dev/null +++ b/templates/centos-5.9-i386/http/ks.cfg @@ -0,0 +1,39 @@ +install +cdrom +lang en_US.UTF-8 +keyboard us +network --bootproto=dhcp +rootpw --iscrypted $1$damlkd,f$UC/u5pUts5QiU3ow.CSso/ +firewall --disabled +authconfig --enableshadow --passalgo=sha512 +selinux --disabled +timezone UTC +bootloader --location=mbr +text +skipx +zerombr +clearpart --all --initlabel +autopart +auth --useshadow --enablemd5 +firstboot --disabled +reboot + +%packages --ignoremissing +@Base +@Core +@Development Tools +openssl-devel +readline-devel +zlib-devel +kernel-devel + +%post +# update root certs +wget -O/etc/pki/tls/certs/ca-bundle.crt http://curl.haxx.se/ca/cacert.pem +# vagrant +groupadd vagrant -g 999 +useradd vagrant -g vagrant -G wheel -u 900 +echo "vagrant" | passwd --stdin vagrant +# sudo +echo "vagrant ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers +sed -i "s/^.*requiretty/#Defaults requiretty/" /etc/sudoers diff --git a/templates/centos-5.9-i386/scripts/cleanup.sh b/templates/centos-5.9-i386/scripts/cleanup.sh new file mode 100644 index 000000000..922c3d6b5 --- /dev/null +++ b/templates/centos-5.9-i386/scripts/cleanup.sh @@ -0,0 +1,5 @@ +#!/bin/bash -eux +yum -y erase gtk2 libX11 hicolor-icon-theme avahi freetype bitstream-vera-fonts +yum -y clean all +rm -rf VBoxGuestAdditions_*.iso VBoxGuestAdditions_*.iso.? +rm -f /tmp/chef*rpm diff --git a/templates/centos-5.9-i386/scripts/minimize.sh b/templates/centos-5.9-i386/scripts/minimize.sh new file mode 100644 index 000000000..3846a1d65 --- /dev/null +++ b/templates/centos-5.9-i386/scripts/minimize.sh @@ -0,0 +1,4 @@ +#!/bin/bash -eux + +dd if=/dev/zero of=/EMPTY bs=1M +rm -f /EMPTY diff --git a/templates/centos-5.9-i386/scripts/sshd.sh b/templates/centos-5.9-i386/scripts/sshd.sh new file mode 100644 index 000000000..c6e4f20a6 --- /dev/null +++ b/templates/centos-5.9-i386/scripts/sshd.sh @@ -0,0 +1,3 @@ +#!/bin/bash -eux + +echo "UseDNS no" >> /etc/ssh/sshd_config diff --git a/templates/centos-5.9-i386/scripts/vagrant.sh b/templates/centos-5.9-i386/scripts/vagrant.sh new file mode 100644 index 000000000..9368ef636 --- /dev/null +++ b/templates/centos-5.9-i386/scripts/vagrant.sh @@ -0,0 +1,17 @@ +#!/bin/bash -eux + +mkdir /tmp/vbox +VER=$(cat /home/vagrant/.vbox_version) +wget http://download.virtualbox.org/virtualbox/$VER/VBoxGuestAdditions_$VER.iso +mount -o loop VBoxGuestAdditions_$VER.iso /tmp/vbox +sh /tmp/vbox/VBoxLinuxAdditions.run +umount /tmp/vbox +rmdir /tmp/vbox +rm *.iso + +mkdir /home/vagrant/.ssh +wget --no-check-certificate \ + 'http://github.com/mitchellh/vagrant/raw/master/keys/vagrant.pub' \ + -O /home/vagrant/.ssh/authorized_keys +chown -R vagrant /home/vagrant/.ssh +chmod -R go-rwsx /home/vagrant/.ssh diff --git a/templates/centos-5.9-i386/template.json b/templates/centos-5.9-i386/template.json new file mode 100644 index 000000000..0f6d07bad --- /dev/null +++ b/templates/centos-5.9-i386/template.json @@ -0,0 +1,88 @@ +{ + "provisioners": [ + { + "type": "shell", + "scripts": [ + "scripts/vagrant.sh", + "scripts/sshd.sh", + "scripts/cleanup.sh", + "scripts/minimize.sh" + ], + "override": { + "virtualbox": { + "execute_command": "echo 'vagrant'|sudo -S sh '{{.Path}}'" + }, + "vmware": { + "execute_command": "echo 'vagrant'|sudo -S sh '{{.Path}}'" + } + } + } + ], + "builders": [ + { + "type": "virtualbox", + "boot_command": [ + "linux text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/ks.cfg<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "guest_os_type": "RedHat", + "http_directory": "http", + "iso_checksum": "c8caaa18400dfde2065d8ef58eb9e9bf", + "iso_checksum_type": "md5", + "iso_url": "http://mirror.stanford.edu/yum/pub/centos/5.9/isos/i386/CentOS-5.9-i386-bin-DVD-1of2.iso", + "ssh_username": "vagrant", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_wait_timeout": "10000s", + "shutdown_command": "echo '/sbin/halt -h -p' > shutdown.sh; echo 'vagrant'|sudo -S sh 'shutdown.sh'", + "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "virtualbox_version_file": ".vbox_version", + "vboxmanage": [ + [ + "modifyvm", + "{{.Name}}", + "--memory", + "384" + ], + [ + "modifyvm", + "{{.Name}}", + "--cpus", + "1" + ] + ], + "iso_md5": "c8caaa18400dfde2065d8ef58eb9e9bf" + }, + { + "type": "vmware", + "boot_command": [ + "linux text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/ks.cfg<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "guest_os_type": "RedHat", + "http_directory": "http", + "iso_checksum": "c8caaa18400dfde2065d8ef58eb9e9bf", + "iso_checksum_type": "md5", + "iso_url": "http://mirror.stanford.edu/yum/pub/centos/5.9/isos/i386/CentOS-5.9-i386-bin-DVD-1of2.iso", + "ssh_username": "vagrant", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_wait_timeout": "10000s", + "shutdown_command": "echo '/sbin/halt -h -p' > shutdown.sh; echo 'vagrant'|sudo -S sh 'shutdown.sh'", + "vmx_data": { + "memsize": "384", + "numvcpus": "1", + "cpuid.coresPerSocket": "1" + }, + "iso_md5": "c8caaa18400dfde2065d8ef58eb9e9bf" + } + ], + "post-provisioner": [ + { + "type": "vagrant", + "output": "centos-5.9-i386-{{.Provisioner}}.box" + } + ] +} \ No newline at end of file diff --git a/templates/centos-5.9/http/ks.cfg b/templates/centos-5.9/http/ks.cfg new file mode 100644 index 000000000..e00fd5a2a --- /dev/null +++ b/templates/centos-5.9/http/ks.cfg @@ -0,0 +1,39 @@ +install +cdrom +lang en_US.UTF-8 +keyboard us +network --bootproto=dhcp +rootpw --iscrypted $1$damlkd,f$UC/u5pUts5QiU3ow.CSso/ +firewall --disabled +authconfig --enableshadow --passalgo=sha512 +selinux --disabled +timezone UTC +bootloader --location=mbr +text +skipx +zerombr +clearpart --all --initlabel +autopart +auth --useshadow --enablemd5 +firstboot --disabled +reboot + +%packages --ignoremissing +@Base +@Core +@Development Tools +openssl-devel +readline-devel +zlib-devel +kernel-devel + +%post +# update root certs +wget -O/etc/pki/tls/certs/ca-bundle.crt http://curl.haxx.se/ca/cacert.pem +# vagrant +groupadd vagrant -g 999 +useradd vagrant -g vagrant -G wheel -u 900 +echo "vagrant" | passwd --stdin vagrant +# sudo +echo "vagrant ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers +sed -i "s/^.*requiretty/#Defaults requiretty/" /etc/sudoers diff --git a/templates/centos-5.9/scripts/cleanup.sh b/templates/centos-5.9/scripts/cleanup.sh new file mode 100644 index 000000000..922c3d6b5 --- /dev/null +++ b/templates/centos-5.9/scripts/cleanup.sh @@ -0,0 +1,5 @@ +#!/bin/bash -eux +yum -y erase gtk2 libX11 hicolor-icon-theme avahi freetype bitstream-vera-fonts +yum -y clean all +rm -rf VBoxGuestAdditions_*.iso VBoxGuestAdditions_*.iso.? +rm -f /tmp/chef*rpm diff --git a/templates/centos-5.9/scripts/minimize.sh b/templates/centos-5.9/scripts/minimize.sh new file mode 100644 index 000000000..3846a1d65 --- /dev/null +++ b/templates/centos-5.9/scripts/minimize.sh @@ -0,0 +1,4 @@ +#!/bin/bash -eux + +dd if=/dev/zero of=/EMPTY bs=1M +rm -f /EMPTY diff --git a/templates/centos-5.9/scripts/sshd.sh b/templates/centos-5.9/scripts/sshd.sh new file mode 100644 index 000000000..c6e4f20a6 --- /dev/null +++ b/templates/centos-5.9/scripts/sshd.sh @@ -0,0 +1,3 @@ +#!/bin/bash -eux + +echo "UseDNS no" >> /etc/ssh/sshd_config diff --git a/templates/centos-5.9/scripts/vagrant.sh b/templates/centos-5.9/scripts/vagrant.sh new file mode 100644 index 000000000..9368ef636 --- /dev/null +++ b/templates/centos-5.9/scripts/vagrant.sh @@ -0,0 +1,17 @@ +#!/bin/bash -eux + +mkdir /tmp/vbox +VER=$(cat /home/vagrant/.vbox_version) +wget http://download.virtualbox.org/virtualbox/$VER/VBoxGuestAdditions_$VER.iso +mount -o loop VBoxGuestAdditions_$VER.iso /tmp/vbox +sh /tmp/vbox/VBoxLinuxAdditions.run +umount /tmp/vbox +rmdir /tmp/vbox +rm *.iso + +mkdir /home/vagrant/.ssh +wget --no-check-certificate \ + 'http://github.com/mitchellh/vagrant/raw/master/keys/vagrant.pub' \ + -O /home/vagrant/.ssh/authorized_keys +chown -R vagrant /home/vagrant/.ssh +chmod -R go-rwsx /home/vagrant/.ssh diff --git a/templates/centos-5.9/template.json b/templates/centos-5.9/template.json new file mode 100644 index 000000000..9ad8411c8 --- /dev/null +++ b/templates/centos-5.9/template.json @@ -0,0 +1,88 @@ +{ + "provisioners": [ + { + "type": "shell", + "scripts": [ + "scripts/vagrant.sh", + "scripts/sshd.sh", + "scripts/cleanup.sh", + "scripts/minimize.sh" + ], + "override": { + "virtualbox": { + "execute_command": "echo 'vagrant'|sudo -S sh '{{.Path}}'" + }, + "vmware": { + "execute_command": "echo 'vagrant'|sudo -S sh '{{.Path}}'" + } + } + } + ], + "builders": [ + { + "type": "virtualbox", + "boot_command": [ + "linux text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/ks.cfg<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "guest_os_type": "RedHat_64", + "http_directory": "http", + "iso_checksum": "bb795391846e76a7071893cbdf6163c3", + "iso_checksum_type": "md5", + "iso_url": "http://mirror.stanford.edu/yum/pub/centos/5.9/isos/x86_64/CentOS-5.9-x86_64-bin-DVD-1of2.iso", + "ssh_username": "vagrant", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_wait_timeout": "10000s", + "shutdown_command": "echo '/sbin/halt -h -p' > shutdown.sh; echo 'vagrant'|sudo -S sh 'shutdown.sh'", + "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "virtualbox_version_file": ".vbox_version", + "vboxmanage": [ + [ + "modifyvm", + "{{.Name}}", + "--memory", + "384" + ], + [ + "modifyvm", + "{{.Name}}", + "--cpus", + "1" + ] + ], + "iso_md5": "bb795391846e76a7071893cbdf6163c3" + }, + { + "type": "vmware", + "boot_command": [ + "linux text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/ks.cfg<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "guest_os_type": "RedHat_64", + "http_directory": "http", + "iso_checksum": "bb795391846e76a7071893cbdf6163c3", + "iso_checksum_type": "md5", + "iso_url": "http://mirror.stanford.edu/yum/pub/centos/5.9/isos/x86_64/CentOS-5.9-x86_64-bin-DVD-1of2.iso", + "ssh_username": "vagrant", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_wait_timeout": "10000s", + "shutdown_command": "echo '/sbin/halt -h -p' > shutdown.sh; echo 'vagrant'|sudo -S sh 'shutdown.sh'", + "vmx_data": { + "memsize": "384", + "numvcpus": "1", + "cpuid.coresPerSocket": "1" + }, + "iso_md5": "bb795391846e76a7071893cbdf6163c3" + } + ], + "post-provisioner": [ + { + "type": "vagrant", + "output": "centos-5.9-{{.Provisioner}}.box" + } + ] +} \ No newline at end of file diff --git a/templates/centos-6.0/http/ks.cfg b/templates/centos-6.0/http/ks.cfg new file mode 100644 index 000000000..e00fd5a2a --- /dev/null +++ b/templates/centos-6.0/http/ks.cfg @@ -0,0 +1,39 @@ +install +cdrom +lang en_US.UTF-8 +keyboard us +network --bootproto=dhcp +rootpw --iscrypted $1$damlkd,f$UC/u5pUts5QiU3ow.CSso/ +firewall --disabled +authconfig --enableshadow --passalgo=sha512 +selinux --disabled +timezone UTC +bootloader --location=mbr +text +skipx +zerombr +clearpart --all --initlabel +autopart +auth --useshadow --enablemd5 +firstboot --disabled +reboot + +%packages --ignoremissing +@Base +@Core +@Development Tools +openssl-devel +readline-devel +zlib-devel +kernel-devel + +%post +# update root certs +wget -O/etc/pki/tls/certs/ca-bundle.crt http://curl.haxx.se/ca/cacert.pem +# vagrant +groupadd vagrant -g 999 +useradd vagrant -g vagrant -G wheel -u 900 +echo "vagrant" | passwd --stdin vagrant +# sudo +echo "vagrant ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers +sed -i "s/^.*requiretty/#Defaults requiretty/" /etc/sudoers diff --git a/templates/centos-6.0/scripts/cleanup.sh b/templates/centos-6.0/scripts/cleanup.sh new file mode 100644 index 000000000..922c3d6b5 --- /dev/null +++ b/templates/centos-6.0/scripts/cleanup.sh @@ -0,0 +1,5 @@ +#!/bin/bash -eux +yum -y erase gtk2 libX11 hicolor-icon-theme avahi freetype bitstream-vera-fonts +yum -y clean all +rm -rf VBoxGuestAdditions_*.iso VBoxGuestAdditions_*.iso.? +rm -f /tmp/chef*rpm diff --git a/templates/centos-6.0/scripts/minimize.sh b/templates/centos-6.0/scripts/minimize.sh new file mode 100644 index 000000000..3846a1d65 --- /dev/null +++ b/templates/centos-6.0/scripts/minimize.sh @@ -0,0 +1,4 @@ +#!/bin/bash -eux + +dd if=/dev/zero of=/EMPTY bs=1M +rm -f /EMPTY diff --git a/templates/centos-6.0/scripts/sshd.sh b/templates/centos-6.0/scripts/sshd.sh new file mode 100644 index 000000000..c6e4f20a6 --- /dev/null +++ b/templates/centos-6.0/scripts/sshd.sh @@ -0,0 +1,3 @@ +#!/bin/bash -eux + +echo "UseDNS no" >> /etc/ssh/sshd_config diff --git a/templates/centos-6.0/scripts/vagrant.sh b/templates/centos-6.0/scripts/vagrant.sh new file mode 100644 index 000000000..72dd2f444 --- /dev/null +++ b/templates/centos-6.0/scripts/vagrant.sh @@ -0,0 +1,33 @@ +#!/bin/bash -eux + +if [ -f /home/vagrant/.vbox_version ]; then + mkdir /tmp/vbox + VER=$(cat /home/vagrant/.vbox_version) + mount -o loop VBoxGuestAdditions_$VER.iso /tmp/vbox + sh /tmp/vbox/VBoxLinuxAdditions.run + umount /tmp/vbox + rmdir /tmp/vbox + rm *.iso +fi + +if [ -f /home/vagrant/.vmfusion_version ]; then + #Set Linux-specific paths and ISO filename + home_dir="/home/vagrant" + iso_name="linux.iso" + mount_point="/tmp/vmware-tools" + #Run install, unmount ISO and remove it + mkdir ${mount_point} + cd ${home_dir} + /bin/mount -o loop ${iso_name} ${mount_point} + tar zxf ${mount_point}/*.tar.gz && cd vmware-tools-distrib && ./vmware-install.pl --default + /bin/umount ${mount_point} + /bin/rm -rf ${home_dir}/${iso_name} ${home_dir}/vmware-tools-distrib + rmdir ${mount_point} +fi + +mkdir /home/vagrant/.ssh +wget --no-check-certificate \ + 'https://github.com/mitchellh/vagrant/raw/master/keys/vagrant.pub' \ + -O /home/vagrant/.ssh/authorized_keys +chown -R vagrant /home/vagrant/.ssh +chmod -R go-rwsx /home/vagrant/.ssh diff --git a/templates/centos-6.0/template.json b/templates/centos-6.0/template.json new file mode 100644 index 000000000..8400917c8 --- /dev/null +++ b/templates/centos-6.0/template.json @@ -0,0 +1,88 @@ +{ + "provisioners": [ + { + "type": "shell", + "scripts": [ + "scripts/vagrant.sh", + "scripts/sshd.sh", + "scripts/cleanup.sh", + "scripts/minimize.sh" + ], + "override": { + "virtualbox": { + "execute_command": "echo 'vagrant'|sudo -S sh '{{.Path}}'" + }, + "vmware": { + "execute_command": "echo 'vagrant'|sudo -S sh '{{.Path}}'" + } + } + } + ], + "builders": [ + { + "type": "virtualbox", + "boot_command": [ + "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/ks.cfg<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "guest_os_type": "RedHat_64", + "http_directory": "http", + "iso_checksum": "7c148e0a1b330186adef66ee3e2d433d", + "iso_checksum_type": "md5", + "iso_url": "http://vault.centos.org/6.0/isos/x86_64/CentOS-6.0-x86_64-bin-DVD1.iso", + "ssh_username": "vagrant", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_wait_timeout": "10000s", + "shutdown_command": "echo '/sbin/halt -h -p' > shutdown.sh; echo 'vagrant'|sudo -S sh 'shutdown.sh'", + "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "virtualbox_version_file": ".vbox_version", + "vboxmanage": [ + [ + "modifyvm", + "{{.Name}}", + "--memory", + "384" + ], + [ + "modifyvm", + "{{.Name}}", + "--cpus", + "1" + ] + ], + "iso_md5": "7c148e0a1b330186adef66ee3e2d433d" + }, + { + "type": "vmware", + "boot_command": [ + "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/ks.cfg<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "guest_os_type": "centos-64", + "http_directory": "http", + "iso_checksum": "7c148e0a1b330186adef66ee3e2d433d", + "iso_checksum_type": "md5", + "iso_url": "http://vault.centos.org/6.0/isos/x86_64/CentOS-6.0-x86_64-bin-DVD1.iso", + "ssh_username": "vagrant", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_wait_timeout": "10000s", + "shutdown_command": "echo '/sbin/halt -h -p' > shutdown.sh; echo 'vagrant'|sudo -S sh 'shutdown.sh'", + "vmx_data": { + "memsize": "384", + "numvcpus": "1", + "cpuid.coresPerSocket": "1" + }, + "iso_md5": "7c148e0a1b330186adef66ee3e2d433d" + } + ], + "post-provisioner": [ + { + "type": "vagrant", + "output": "centos-6.0-{{.Provisioner}}.box" + } + ] +} \ No newline at end of file diff --git a/templates/centos-6.2-i386/http/ks.cfg b/templates/centos-6.2-i386/http/ks.cfg new file mode 100644 index 000000000..e00fd5a2a --- /dev/null +++ b/templates/centos-6.2-i386/http/ks.cfg @@ -0,0 +1,39 @@ +install +cdrom +lang en_US.UTF-8 +keyboard us +network --bootproto=dhcp +rootpw --iscrypted $1$damlkd,f$UC/u5pUts5QiU3ow.CSso/ +firewall --disabled +authconfig --enableshadow --passalgo=sha512 +selinux --disabled +timezone UTC +bootloader --location=mbr +text +skipx +zerombr +clearpart --all --initlabel +autopart +auth --useshadow --enablemd5 +firstboot --disabled +reboot + +%packages --ignoremissing +@Base +@Core +@Development Tools +openssl-devel +readline-devel +zlib-devel +kernel-devel + +%post +# update root certs +wget -O/etc/pki/tls/certs/ca-bundle.crt http://curl.haxx.se/ca/cacert.pem +# vagrant +groupadd vagrant -g 999 +useradd vagrant -g vagrant -G wheel -u 900 +echo "vagrant" | passwd --stdin vagrant +# sudo +echo "vagrant ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers +sed -i "s/^.*requiretty/#Defaults requiretty/" /etc/sudoers diff --git a/templates/centos-6.2-i386/scripts/cleanup.sh b/templates/centos-6.2-i386/scripts/cleanup.sh new file mode 100644 index 000000000..922c3d6b5 --- /dev/null +++ b/templates/centos-6.2-i386/scripts/cleanup.sh @@ -0,0 +1,5 @@ +#!/bin/bash -eux +yum -y erase gtk2 libX11 hicolor-icon-theme avahi freetype bitstream-vera-fonts +yum -y clean all +rm -rf VBoxGuestAdditions_*.iso VBoxGuestAdditions_*.iso.? +rm -f /tmp/chef*rpm diff --git a/templates/centos-6.2-i386/scripts/minimize.sh b/templates/centos-6.2-i386/scripts/minimize.sh new file mode 100644 index 000000000..3846a1d65 --- /dev/null +++ b/templates/centos-6.2-i386/scripts/minimize.sh @@ -0,0 +1,4 @@ +#!/bin/bash -eux + +dd if=/dev/zero of=/EMPTY bs=1M +rm -f /EMPTY diff --git a/templates/centos-6.2-i386/scripts/sshd.sh b/templates/centos-6.2-i386/scripts/sshd.sh new file mode 100644 index 000000000..c6e4f20a6 --- /dev/null +++ b/templates/centos-6.2-i386/scripts/sshd.sh @@ -0,0 +1,3 @@ +#!/bin/bash -eux + +echo "UseDNS no" >> /etc/ssh/sshd_config diff --git a/templates/centos-6.2-i386/scripts/vagrant.sh b/templates/centos-6.2-i386/scripts/vagrant.sh new file mode 100644 index 000000000..72dd2f444 --- /dev/null +++ b/templates/centos-6.2-i386/scripts/vagrant.sh @@ -0,0 +1,33 @@ +#!/bin/bash -eux + +if [ -f /home/vagrant/.vbox_version ]; then + mkdir /tmp/vbox + VER=$(cat /home/vagrant/.vbox_version) + mount -o loop VBoxGuestAdditions_$VER.iso /tmp/vbox + sh /tmp/vbox/VBoxLinuxAdditions.run + umount /tmp/vbox + rmdir /tmp/vbox + rm *.iso +fi + +if [ -f /home/vagrant/.vmfusion_version ]; then + #Set Linux-specific paths and ISO filename + home_dir="/home/vagrant" + iso_name="linux.iso" + mount_point="/tmp/vmware-tools" + #Run install, unmount ISO and remove it + mkdir ${mount_point} + cd ${home_dir} + /bin/mount -o loop ${iso_name} ${mount_point} + tar zxf ${mount_point}/*.tar.gz && cd vmware-tools-distrib && ./vmware-install.pl --default + /bin/umount ${mount_point} + /bin/rm -rf ${home_dir}/${iso_name} ${home_dir}/vmware-tools-distrib + rmdir ${mount_point} +fi + +mkdir /home/vagrant/.ssh +wget --no-check-certificate \ + 'https://github.com/mitchellh/vagrant/raw/master/keys/vagrant.pub' \ + -O /home/vagrant/.ssh/authorized_keys +chown -R vagrant /home/vagrant/.ssh +chmod -R go-rwsx /home/vagrant/.ssh diff --git a/templates/centos-6.2-i386/template.json b/templates/centos-6.2-i386/template.json new file mode 100644 index 000000000..2e29da1ab --- /dev/null +++ b/templates/centos-6.2-i386/template.json @@ -0,0 +1,88 @@ +{ + "provisioners": [ + { + "type": "shell", + "scripts": [ + "scripts/vagrant.sh", + "scripts/sshd.sh", + "scripts/cleanup.sh", + "scripts/minimize.sh" + ], + "override": { + "virtualbox": { + "execute_command": "echo 'vagrant'|sudo -S sh '{{.Path}}'" + }, + "vmware": { + "execute_command": "echo 'vagrant'|sudo -S sh '{{.Path}}'" + } + } + } + ], + "builders": [ + { + "type": "virtualbox", + "boot_command": [ + "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/ks.cfg<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "guest_os_type": "RedHat", + "http_directory": "http", + "iso_checksum": "8c976288ed53dc97439f7ab5854f2648", + "iso_checksum_type": "md5", + "iso_url": "http://vault.centos.org/6.2/isos/i386/CentOS-6.2-i386-bin-DVD1.iso", + "ssh_username": "vagrant", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_wait_timeout": "10000s", + "shutdown_command": "echo '/sbin/halt -h -p' > shutdown.sh; echo 'vagrant'|sudo -S sh 'shutdown.sh'", + "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "virtualbox_version_file": ".vbox_version", + "vboxmanage": [ + [ + "modifyvm", + "{{.Name}}", + "--memory", + "480" + ], + [ + "modifyvm", + "{{.Name}}", + "--cpus", + "1" + ] + ], + "iso_md5": "8c976288ed53dc97439f7ab5854f2648" + }, + { + "type": "vmware", + "boot_command": [ + "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/ks.cfg<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "guest_os_type": "centos", + "http_directory": "http", + "iso_checksum": "8c976288ed53dc97439f7ab5854f2648", + "iso_checksum_type": "md5", + "iso_url": "http://vault.centos.org/6.2/isos/i386/CentOS-6.2-i386-bin-DVD1.iso", + "ssh_username": "vagrant", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_wait_timeout": "10000s", + "shutdown_command": "echo '/sbin/halt -h -p' > shutdown.sh; echo 'vagrant'|sudo -S sh 'shutdown.sh'", + "vmx_data": { + "memsize": "480", + "numvcpus": "1", + "cpuid.coresPerSocket": "1" + }, + "iso_md5": "8c976288ed53dc97439f7ab5854f2648" + } + ], + "post-provisioner": [ + { + "type": "vagrant", + "output": "centos-6.2-i386-{{.Provisioner}}.box" + } + ] +} \ No newline at end of file diff --git a/templates/centos-6.2/http/ks.cfg b/templates/centos-6.2/http/ks.cfg new file mode 100644 index 000000000..e00fd5a2a --- /dev/null +++ b/templates/centos-6.2/http/ks.cfg @@ -0,0 +1,39 @@ +install +cdrom +lang en_US.UTF-8 +keyboard us +network --bootproto=dhcp +rootpw --iscrypted $1$damlkd,f$UC/u5pUts5QiU3ow.CSso/ +firewall --disabled +authconfig --enableshadow --passalgo=sha512 +selinux --disabled +timezone UTC +bootloader --location=mbr +text +skipx +zerombr +clearpart --all --initlabel +autopart +auth --useshadow --enablemd5 +firstboot --disabled +reboot + +%packages --ignoremissing +@Base +@Core +@Development Tools +openssl-devel +readline-devel +zlib-devel +kernel-devel + +%post +# update root certs +wget -O/etc/pki/tls/certs/ca-bundle.crt http://curl.haxx.se/ca/cacert.pem +# vagrant +groupadd vagrant -g 999 +useradd vagrant -g vagrant -G wheel -u 900 +echo "vagrant" | passwd --stdin vagrant +# sudo +echo "vagrant ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers +sed -i "s/^.*requiretty/#Defaults requiretty/" /etc/sudoers diff --git a/templates/centos-6.2/scripts/cleanup.sh b/templates/centos-6.2/scripts/cleanup.sh new file mode 100644 index 000000000..922c3d6b5 --- /dev/null +++ b/templates/centos-6.2/scripts/cleanup.sh @@ -0,0 +1,5 @@ +#!/bin/bash -eux +yum -y erase gtk2 libX11 hicolor-icon-theme avahi freetype bitstream-vera-fonts +yum -y clean all +rm -rf VBoxGuestAdditions_*.iso VBoxGuestAdditions_*.iso.? +rm -f /tmp/chef*rpm diff --git a/templates/centos-6.2/scripts/minimize.sh b/templates/centos-6.2/scripts/minimize.sh new file mode 100644 index 000000000..3846a1d65 --- /dev/null +++ b/templates/centos-6.2/scripts/minimize.sh @@ -0,0 +1,4 @@ +#!/bin/bash -eux + +dd if=/dev/zero of=/EMPTY bs=1M +rm -f /EMPTY diff --git a/templates/centos-6.2/scripts/sshd.sh b/templates/centos-6.2/scripts/sshd.sh new file mode 100644 index 000000000..c6e4f20a6 --- /dev/null +++ b/templates/centos-6.2/scripts/sshd.sh @@ -0,0 +1,3 @@ +#!/bin/bash -eux + +echo "UseDNS no" >> /etc/ssh/sshd_config diff --git a/templates/centos-6.2/scripts/vagrant.sh b/templates/centos-6.2/scripts/vagrant.sh new file mode 100644 index 000000000..72dd2f444 --- /dev/null +++ b/templates/centos-6.2/scripts/vagrant.sh @@ -0,0 +1,33 @@ +#!/bin/bash -eux + +if [ -f /home/vagrant/.vbox_version ]; then + mkdir /tmp/vbox + VER=$(cat /home/vagrant/.vbox_version) + mount -o loop VBoxGuestAdditions_$VER.iso /tmp/vbox + sh /tmp/vbox/VBoxLinuxAdditions.run + umount /tmp/vbox + rmdir /tmp/vbox + rm *.iso +fi + +if [ -f /home/vagrant/.vmfusion_version ]; then + #Set Linux-specific paths and ISO filename + home_dir="/home/vagrant" + iso_name="linux.iso" + mount_point="/tmp/vmware-tools" + #Run install, unmount ISO and remove it + mkdir ${mount_point} + cd ${home_dir} + /bin/mount -o loop ${iso_name} ${mount_point} + tar zxf ${mount_point}/*.tar.gz && cd vmware-tools-distrib && ./vmware-install.pl --default + /bin/umount ${mount_point} + /bin/rm -rf ${home_dir}/${iso_name} ${home_dir}/vmware-tools-distrib + rmdir ${mount_point} +fi + +mkdir /home/vagrant/.ssh +wget --no-check-certificate \ + 'https://github.com/mitchellh/vagrant/raw/master/keys/vagrant.pub' \ + -O /home/vagrant/.ssh/authorized_keys +chown -R vagrant /home/vagrant/.ssh +chmod -R go-rwsx /home/vagrant/.ssh diff --git a/templates/centos-6.2/template.json b/templates/centos-6.2/template.json new file mode 100644 index 000000000..d26f0be6a --- /dev/null +++ b/templates/centos-6.2/template.json @@ -0,0 +1,88 @@ +{ + "provisioners": [ + { + "type": "shell", + "scripts": [ + "scripts/vagrant.sh", + "scripts/sshd.sh", + "scripts/cleanup.sh", + "scripts/minimize.sh" + ], + "override": { + "virtualbox": { + "execute_command": "echo 'vagrant'|sudo -S sh '{{.Path}}'" + }, + "vmware": { + "execute_command": "echo 'vagrant'|sudo -S sh '{{.Path}}'" + } + } + } + ], + "builders": [ + { + "type": "virtualbox", + "boot_command": [ + "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/ks.cfg<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "guest_os_type": "RedHat_64", + "http_directory": "http", + "iso_checksum": "26fdf8c5a787a674f3219a3554b131ca", + "iso_checksum_type": "md5", + "iso_url": "http://vault.centos.org/6.2/isos/x86_64/CentOS-6.2-x86_64-bin-DVD1.iso", + "ssh_username": "vagrant", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_wait_timeout": "10000s", + "shutdown_command": "echo '/sbin/halt -h -p' > shutdown.sh; echo 'vagrant'|sudo -S sh 'shutdown.sh'", + "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "virtualbox_version_file": ".vbox_version", + "vboxmanage": [ + [ + "modifyvm", + "{{.Name}}", + "--memory", + "480" + ], + [ + "modifyvm", + "{{.Name}}", + "--cpus", + "1" + ] + ], + "iso_md5": "26fdf8c5a787a674f3219a3554b131ca" + }, + { + "type": "vmware", + "boot_command": [ + "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/ks.cfg<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "guest_os_type": "centos-64", + "http_directory": "http", + "iso_checksum": "26fdf8c5a787a674f3219a3554b131ca", + "iso_checksum_type": "md5", + "iso_url": "http://vault.centos.org/6.2/isos/x86_64/CentOS-6.2-x86_64-bin-DVD1.iso", + "ssh_username": "vagrant", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_wait_timeout": "10000s", + "shutdown_command": "echo '/sbin/halt -h -p' > shutdown.sh; echo 'vagrant'|sudo -S sh 'shutdown.sh'", + "vmx_data": { + "memsize": "480", + "numvcpus": "1", + "cpuid.coresPerSocket": "1" + }, + "iso_md5": "26fdf8c5a787a674f3219a3554b131ca" + } + ], + "post-provisioner": [ + { + "type": "vagrant", + "output": "centos-6.2-{{.Provisioner}}.box" + } + ] +} \ No newline at end of file diff --git a/templates/centos-6.3-i386/http/ks.cfg b/templates/centos-6.3-i386/http/ks.cfg new file mode 100644 index 000000000..e00fd5a2a --- /dev/null +++ b/templates/centos-6.3-i386/http/ks.cfg @@ -0,0 +1,39 @@ +install +cdrom +lang en_US.UTF-8 +keyboard us +network --bootproto=dhcp +rootpw --iscrypted $1$damlkd,f$UC/u5pUts5QiU3ow.CSso/ +firewall --disabled +authconfig --enableshadow --passalgo=sha512 +selinux --disabled +timezone UTC +bootloader --location=mbr +text +skipx +zerombr +clearpart --all --initlabel +autopart +auth --useshadow --enablemd5 +firstboot --disabled +reboot + +%packages --ignoremissing +@Base +@Core +@Development Tools +openssl-devel +readline-devel +zlib-devel +kernel-devel + +%post +# update root certs +wget -O/etc/pki/tls/certs/ca-bundle.crt http://curl.haxx.se/ca/cacert.pem +# vagrant +groupadd vagrant -g 999 +useradd vagrant -g vagrant -G wheel -u 900 +echo "vagrant" | passwd --stdin vagrant +# sudo +echo "vagrant ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers +sed -i "s/^.*requiretty/#Defaults requiretty/" /etc/sudoers diff --git a/templates/centos-6.3-i386/scripts/cleanup.sh b/templates/centos-6.3-i386/scripts/cleanup.sh new file mode 100644 index 000000000..922c3d6b5 --- /dev/null +++ b/templates/centos-6.3-i386/scripts/cleanup.sh @@ -0,0 +1,5 @@ +#!/bin/bash -eux +yum -y erase gtk2 libX11 hicolor-icon-theme avahi freetype bitstream-vera-fonts +yum -y clean all +rm -rf VBoxGuestAdditions_*.iso VBoxGuestAdditions_*.iso.? +rm -f /tmp/chef*rpm diff --git a/templates/centos-6.3-i386/scripts/minimize.sh b/templates/centos-6.3-i386/scripts/minimize.sh new file mode 100644 index 000000000..3846a1d65 --- /dev/null +++ b/templates/centos-6.3-i386/scripts/minimize.sh @@ -0,0 +1,4 @@ +#!/bin/bash -eux + +dd if=/dev/zero of=/EMPTY bs=1M +rm -f /EMPTY diff --git a/templates/centos-6.3-i386/scripts/sshd.sh b/templates/centos-6.3-i386/scripts/sshd.sh new file mode 100644 index 000000000..c6e4f20a6 --- /dev/null +++ b/templates/centos-6.3-i386/scripts/sshd.sh @@ -0,0 +1,3 @@ +#!/bin/bash -eux + +echo "UseDNS no" >> /etc/ssh/sshd_config diff --git a/templates/centos-6.3-i386/scripts/vagrant.sh b/templates/centos-6.3-i386/scripts/vagrant.sh new file mode 100644 index 000000000..72dd2f444 --- /dev/null +++ b/templates/centos-6.3-i386/scripts/vagrant.sh @@ -0,0 +1,33 @@ +#!/bin/bash -eux + +if [ -f /home/vagrant/.vbox_version ]; then + mkdir /tmp/vbox + VER=$(cat /home/vagrant/.vbox_version) + mount -o loop VBoxGuestAdditions_$VER.iso /tmp/vbox + sh /tmp/vbox/VBoxLinuxAdditions.run + umount /tmp/vbox + rmdir /tmp/vbox + rm *.iso +fi + +if [ -f /home/vagrant/.vmfusion_version ]; then + #Set Linux-specific paths and ISO filename + home_dir="/home/vagrant" + iso_name="linux.iso" + mount_point="/tmp/vmware-tools" + #Run install, unmount ISO and remove it + mkdir ${mount_point} + cd ${home_dir} + /bin/mount -o loop ${iso_name} ${mount_point} + tar zxf ${mount_point}/*.tar.gz && cd vmware-tools-distrib && ./vmware-install.pl --default + /bin/umount ${mount_point} + /bin/rm -rf ${home_dir}/${iso_name} ${home_dir}/vmware-tools-distrib + rmdir ${mount_point} +fi + +mkdir /home/vagrant/.ssh +wget --no-check-certificate \ + 'https://github.com/mitchellh/vagrant/raw/master/keys/vagrant.pub' \ + -O /home/vagrant/.ssh/authorized_keys +chown -R vagrant /home/vagrant/.ssh +chmod -R go-rwsx /home/vagrant/.ssh diff --git a/templates/centos-6.3-i386/template.json b/templates/centos-6.3-i386/template.json new file mode 100644 index 000000000..438b27c8e --- /dev/null +++ b/templates/centos-6.3-i386/template.json @@ -0,0 +1,88 @@ +{ + "provisioners": [ + { + "type": "shell", + "scripts": [ + "scripts/vagrant.sh", + "scripts/sshd.sh", + "scripts/cleanup.sh", + "scripts/minimize.sh" + ], + "override": { + "virtualbox": { + "execute_command": "echo 'vagrant'|sudo -S sh '{{.Path}}'" + }, + "vmware": { + "execute_command": "echo 'vagrant'|sudo -S sh '{{.Path}}'" + } + } + } + ], + "builders": [ + { + "type": "virtualbox", + "boot_command": [ + "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/ks.cfg<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "guest_os_type": "RedHat", + "http_directory": "http", + "iso_checksum": "0285160d8ba3cfc720ea55e98e464eac", + "iso_checksum_type": "md5", + "iso_url": "http://mirrors.kernel.org/centos/6.3/isos/i386/CentOS-6.3-i386-bin-DVD1.iso", + "ssh_username": "vagrant", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_wait_timeout": "10000s", + "shutdown_command": "echo '/sbin/halt -h -p' > shutdown.sh; echo 'vagrant'|sudo -S sh 'shutdown.sh'", + "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "virtualbox_version_file": ".vbox_version", + "vboxmanage": [ + [ + "modifyvm", + "{{.Name}}", + "--memory", + "480" + ], + [ + "modifyvm", + "{{.Name}}", + "--cpus", + "1" + ] + ], + "iso_md5": "0285160d8ba3cfc720ea55e98e464eac" + }, + { + "type": "vmware", + "boot_command": [ + "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/ks.cfg<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "guest_os_type": "centos", + "http_directory": "http", + "iso_checksum": "0285160d8ba3cfc720ea55e98e464eac", + "iso_checksum_type": "md5", + "iso_url": "http://mirrors.kernel.org/centos/6.3/isos/i386/CentOS-6.3-i386-bin-DVD1.iso", + "ssh_username": "vagrant", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_wait_timeout": "10000s", + "shutdown_command": "echo '/sbin/halt -h -p' > shutdown.sh; echo 'vagrant'|sudo -S sh 'shutdown.sh'", + "vmx_data": { + "memsize": "480", + "numvcpus": "1", + "cpuid.coresPerSocket": "1" + }, + "iso_md5": "0285160d8ba3cfc720ea55e98e464eac" + } + ], + "post-provisioner": [ + { + "type": "vagrant", + "output": "centos-6.3-i386-{{.Provisioner}}.box" + } + ] +} \ No newline at end of file diff --git a/templates/centos-6.3/http/ks.cfg b/templates/centos-6.3/http/ks.cfg new file mode 100644 index 000000000..e00fd5a2a --- /dev/null +++ b/templates/centos-6.3/http/ks.cfg @@ -0,0 +1,39 @@ +install +cdrom +lang en_US.UTF-8 +keyboard us +network --bootproto=dhcp +rootpw --iscrypted $1$damlkd,f$UC/u5pUts5QiU3ow.CSso/ +firewall --disabled +authconfig --enableshadow --passalgo=sha512 +selinux --disabled +timezone UTC +bootloader --location=mbr +text +skipx +zerombr +clearpart --all --initlabel +autopart +auth --useshadow --enablemd5 +firstboot --disabled +reboot + +%packages --ignoremissing +@Base +@Core +@Development Tools +openssl-devel +readline-devel +zlib-devel +kernel-devel + +%post +# update root certs +wget -O/etc/pki/tls/certs/ca-bundle.crt http://curl.haxx.se/ca/cacert.pem +# vagrant +groupadd vagrant -g 999 +useradd vagrant -g vagrant -G wheel -u 900 +echo "vagrant" | passwd --stdin vagrant +# sudo +echo "vagrant ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers +sed -i "s/^.*requiretty/#Defaults requiretty/" /etc/sudoers diff --git a/templates/centos-6.3/scripts/cleanup.sh b/templates/centos-6.3/scripts/cleanup.sh new file mode 100644 index 000000000..922c3d6b5 --- /dev/null +++ b/templates/centos-6.3/scripts/cleanup.sh @@ -0,0 +1,5 @@ +#!/bin/bash -eux +yum -y erase gtk2 libX11 hicolor-icon-theme avahi freetype bitstream-vera-fonts +yum -y clean all +rm -rf VBoxGuestAdditions_*.iso VBoxGuestAdditions_*.iso.? +rm -f /tmp/chef*rpm diff --git a/templates/centos-6.3/scripts/minimize.sh b/templates/centos-6.3/scripts/minimize.sh new file mode 100644 index 000000000..3846a1d65 --- /dev/null +++ b/templates/centos-6.3/scripts/minimize.sh @@ -0,0 +1,4 @@ +#!/bin/bash -eux + +dd if=/dev/zero of=/EMPTY bs=1M +rm -f /EMPTY diff --git a/templates/centos-6.3/scripts/sshd.sh b/templates/centos-6.3/scripts/sshd.sh new file mode 100644 index 000000000..c6e4f20a6 --- /dev/null +++ b/templates/centos-6.3/scripts/sshd.sh @@ -0,0 +1,3 @@ +#!/bin/bash -eux + +echo "UseDNS no" >> /etc/ssh/sshd_config diff --git a/templates/centos-6.3/scripts/vagrant.sh b/templates/centos-6.3/scripts/vagrant.sh new file mode 100644 index 000000000..72dd2f444 --- /dev/null +++ b/templates/centos-6.3/scripts/vagrant.sh @@ -0,0 +1,33 @@ +#!/bin/bash -eux + +if [ -f /home/vagrant/.vbox_version ]; then + mkdir /tmp/vbox + VER=$(cat /home/vagrant/.vbox_version) + mount -o loop VBoxGuestAdditions_$VER.iso /tmp/vbox + sh /tmp/vbox/VBoxLinuxAdditions.run + umount /tmp/vbox + rmdir /tmp/vbox + rm *.iso +fi + +if [ -f /home/vagrant/.vmfusion_version ]; then + #Set Linux-specific paths and ISO filename + home_dir="/home/vagrant" + iso_name="linux.iso" + mount_point="/tmp/vmware-tools" + #Run install, unmount ISO and remove it + mkdir ${mount_point} + cd ${home_dir} + /bin/mount -o loop ${iso_name} ${mount_point} + tar zxf ${mount_point}/*.tar.gz && cd vmware-tools-distrib && ./vmware-install.pl --default + /bin/umount ${mount_point} + /bin/rm -rf ${home_dir}/${iso_name} ${home_dir}/vmware-tools-distrib + rmdir ${mount_point} +fi + +mkdir /home/vagrant/.ssh +wget --no-check-certificate \ + 'https://github.com/mitchellh/vagrant/raw/master/keys/vagrant.pub' \ + -O /home/vagrant/.ssh/authorized_keys +chown -R vagrant /home/vagrant/.ssh +chmod -R go-rwsx /home/vagrant/.ssh diff --git a/templates/centos-6.3/template.json b/templates/centos-6.3/template.json new file mode 100644 index 000000000..e1fd6a247 --- /dev/null +++ b/templates/centos-6.3/template.json @@ -0,0 +1,88 @@ +{ + "provisioners": [ + { + "type": "shell", + "scripts": [ + "scripts/vagrant.sh", + "scripts/sshd.sh", + "scripts/cleanup.sh", + "scripts/minimize.sh" + ], + "override": { + "virtualbox": { + "execute_command": "echo 'vagrant'|sudo -S sh '{{.Path}}'" + }, + "vmware": { + "execute_command": "echo 'vagrant'|sudo -S sh '{{.Path}}'" + } + } + } + ], + "builders": [ + { + "type": "virtualbox", + "boot_command": [ + "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/ks.cfg<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "guest_os_type": "RedHat_64", + "http_directory": "http", + "iso_checksum": "a991defc0a602d04f064c43290df0131", + "iso_checksum_type": "md5", + "iso_url": "http://mirrors.kernel.org/centos/6.3/isos/x86_64/CentOS-6.3-x86_64-bin-DVD1.iso", + "ssh_username": "vagrant", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_wait_timeout": "10000s", + "shutdown_command": "echo '/sbin/halt -h -p' > shutdown.sh; echo 'vagrant'|sudo -S sh 'shutdown.sh'", + "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "virtualbox_version_file": ".vbox_version", + "vboxmanage": [ + [ + "modifyvm", + "{{.Name}}", + "--memory", + "480" + ], + [ + "modifyvm", + "{{.Name}}", + "--cpus", + "1" + ] + ], + "iso_md5": "a991defc0a602d04f064c43290df0131" + }, + { + "type": "vmware", + "boot_command": [ + "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/ks.cfg<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "guest_os_type": "centos-64", + "http_directory": "http", + "iso_checksum": "a991defc0a602d04f064c43290df0131", + "iso_checksum_type": "md5", + "iso_url": "http://mirrors.kernel.org/centos/6.3/isos/x86_64/CentOS-6.3-x86_64-bin-DVD1.iso", + "ssh_username": "vagrant", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_wait_timeout": "10000s", + "shutdown_command": "echo '/sbin/halt -h -p' > shutdown.sh; echo 'vagrant'|sudo -S sh 'shutdown.sh'", + "vmx_data": { + "memsize": "480", + "numvcpus": "1", + "cpuid.coresPerSocket": "1" + }, + "iso_md5": "a991defc0a602d04f064c43290df0131" + } + ], + "post-provisioner": [ + { + "type": "vagrant", + "output": "centos-6.3-{{.Provisioner}}.box" + } + ] +} \ No newline at end of file diff --git a/templates/centos-6.4-i386/http/ks.cfg b/templates/centos-6.4-i386/http/ks.cfg new file mode 100644 index 000000000..e00fd5a2a --- /dev/null +++ b/templates/centos-6.4-i386/http/ks.cfg @@ -0,0 +1,39 @@ +install +cdrom +lang en_US.UTF-8 +keyboard us +network --bootproto=dhcp +rootpw --iscrypted $1$damlkd,f$UC/u5pUts5QiU3ow.CSso/ +firewall --disabled +authconfig --enableshadow --passalgo=sha512 +selinux --disabled +timezone UTC +bootloader --location=mbr +text +skipx +zerombr +clearpart --all --initlabel +autopart +auth --useshadow --enablemd5 +firstboot --disabled +reboot + +%packages --ignoremissing +@Base +@Core +@Development Tools +openssl-devel +readline-devel +zlib-devel +kernel-devel + +%post +# update root certs +wget -O/etc/pki/tls/certs/ca-bundle.crt http://curl.haxx.se/ca/cacert.pem +# vagrant +groupadd vagrant -g 999 +useradd vagrant -g vagrant -G wheel -u 900 +echo "vagrant" | passwd --stdin vagrant +# sudo +echo "vagrant ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers +sed -i "s/^.*requiretty/#Defaults requiretty/" /etc/sudoers diff --git a/templates/centos-6.4-i386/scripts/cleanup.sh b/templates/centos-6.4-i386/scripts/cleanup.sh new file mode 100644 index 000000000..922c3d6b5 --- /dev/null +++ b/templates/centos-6.4-i386/scripts/cleanup.sh @@ -0,0 +1,5 @@ +#!/bin/bash -eux +yum -y erase gtk2 libX11 hicolor-icon-theme avahi freetype bitstream-vera-fonts +yum -y clean all +rm -rf VBoxGuestAdditions_*.iso VBoxGuestAdditions_*.iso.? +rm -f /tmp/chef*rpm diff --git a/templates/centos-6.4-i386/scripts/minimize.sh b/templates/centos-6.4-i386/scripts/minimize.sh new file mode 100644 index 000000000..3846a1d65 --- /dev/null +++ b/templates/centos-6.4-i386/scripts/minimize.sh @@ -0,0 +1,4 @@ +#!/bin/bash -eux + +dd if=/dev/zero of=/EMPTY bs=1M +rm -f /EMPTY diff --git a/templates/centos-6.4-i386/scripts/sshd.sh b/templates/centos-6.4-i386/scripts/sshd.sh new file mode 100644 index 000000000..c6e4f20a6 --- /dev/null +++ b/templates/centos-6.4-i386/scripts/sshd.sh @@ -0,0 +1,3 @@ +#!/bin/bash -eux + +echo "UseDNS no" >> /etc/ssh/sshd_config diff --git a/templates/centos-6.4-i386/scripts/vagrant.sh b/templates/centos-6.4-i386/scripts/vagrant.sh new file mode 100644 index 000000000..72dd2f444 --- /dev/null +++ b/templates/centos-6.4-i386/scripts/vagrant.sh @@ -0,0 +1,33 @@ +#!/bin/bash -eux + +if [ -f /home/vagrant/.vbox_version ]; then + mkdir /tmp/vbox + VER=$(cat /home/vagrant/.vbox_version) + mount -o loop VBoxGuestAdditions_$VER.iso /tmp/vbox + sh /tmp/vbox/VBoxLinuxAdditions.run + umount /tmp/vbox + rmdir /tmp/vbox + rm *.iso +fi + +if [ -f /home/vagrant/.vmfusion_version ]; then + #Set Linux-specific paths and ISO filename + home_dir="/home/vagrant" + iso_name="linux.iso" + mount_point="/tmp/vmware-tools" + #Run install, unmount ISO and remove it + mkdir ${mount_point} + cd ${home_dir} + /bin/mount -o loop ${iso_name} ${mount_point} + tar zxf ${mount_point}/*.tar.gz && cd vmware-tools-distrib && ./vmware-install.pl --default + /bin/umount ${mount_point} + /bin/rm -rf ${home_dir}/${iso_name} ${home_dir}/vmware-tools-distrib + rmdir ${mount_point} +fi + +mkdir /home/vagrant/.ssh +wget --no-check-certificate \ + 'https://github.com/mitchellh/vagrant/raw/master/keys/vagrant.pub' \ + -O /home/vagrant/.ssh/authorized_keys +chown -R vagrant /home/vagrant/.ssh +chmod -R go-rwsx /home/vagrant/.ssh diff --git a/templates/centos-6.4-i386/template.json b/templates/centos-6.4-i386/template.json new file mode 100644 index 000000000..fbfca6086 --- /dev/null +++ b/templates/centos-6.4-i386/template.json @@ -0,0 +1,88 @@ +{ + "provisioners": [ + { + "type": "shell", + "scripts": [ + "scripts/vagrant.sh", + "scripts/sshd.sh", + "scripts/cleanup.sh", + "scripts/minimize.sh" + ], + "override": { + "virtualbox": { + "execute_command": "echo 'vagrant'|sudo -S sh '{{.Path}}'" + }, + "vmware": { + "execute_command": "echo 'vagrant'|sudo -S sh '{{.Path}}'" + } + } + } + ], + "builders": [ + { + "type": "virtualbox", + "boot_command": [ + "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/ks.cfg<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "guest_os_type": "RedHat", + "http_directory": "http", + "iso_checksum": "a6049df141579169b217cbb625da4c6d", + "iso_checksum_type": "md5", + "iso_url": "http://mirrors.kernel.org/centos/6.4/isos/i386/CentOS-6.4-i386-bin-DVD1.iso", + "ssh_username": "vagrant", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_wait_timeout": "10000s", + "shutdown_command": "echo '/sbin/halt -h -p' > shutdown.sh; echo 'vagrant'|sudo -S sh 'shutdown.sh'", + "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "virtualbox_version_file": ".vbox_version", + "vboxmanage": [ + [ + "modifyvm", + "{{.Name}}", + "--memory", + "480" + ], + [ + "modifyvm", + "{{.Name}}", + "--cpus", + "1" + ] + ], + "iso_md5": "a6049df141579169b217cbb625da4c6d" + }, + { + "type": "vmware", + "boot_command": [ + "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/ks.cfg<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "guest_os_type": "RedHat", + "http_directory": "http", + "iso_checksum": "a6049df141579169b217cbb625da4c6d", + "iso_checksum_type": "md5", + "iso_url": "http://mirrors.kernel.org/centos/6.4/isos/i386/CentOS-6.4-i386-bin-DVD1.iso", + "ssh_username": "vagrant", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_wait_timeout": "10000s", + "shutdown_command": "echo '/sbin/halt -h -p' > shutdown.sh; echo 'vagrant'|sudo -S sh 'shutdown.sh'", + "vmx_data": { + "memsize": "480", + "numvcpus": "1", + "cpuid.coresPerSocket": "1" + }, + "iso_md5": "a6049df141579169b217cbb625da4c6d" + } + ], + "post-provisioner": [ + { + "type": "vagrant", + "output": "centos-6.4-i386-{{.Provisioner}}.box" + } + ] +} \ No newline at end of file diff --git a/templates/centos-6.4/http/ks.cfg b/templates/centos-6.4/http/ks.cfg new file mode 100644 index 000000000..e00fd5a2a --- /dev/null +++ b/templates/centos-6.4/http/ks.cfg @@ -0,0 +1,39 @@ +install +cdrom +lang en_US.UTF-8 +keyboard us +network --bootproto=dhcp +rootpw --iscrypted $1$damlkd,f$UC/u5pUts5QiU3ow.CSso/ +firewall --disabled +authconfig --enableshadow --passalgo=sha512 +selinux --disabled +timezone UTC +bootloader --location=mbr +text +skipx +zerombr +clearpart --all --initlabel +autopart +auth --useshadow --enablemd5 +firstboot --disabled +reboot + +%packages --ignoremissing +@Base +@Core +@Development Tools +openssl-devel +readline-devel +zlib-devel +kernel-devel + +%post +# update root certs +wget -O/etc/pki/tls/certs/ca-bundle.crt http://curl.haxx.se/ca/cacert.pem +# vagrant +groupadd vagrant -g 999 +useradd vagrant -g vagrant -G wheel -u 900 +echo "vagrant" | passwd --stdin vagrant +# sudo +echo "vagrant ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers +sed -i "s/^.*requiretty/#Defaults requiretty/" /etc/sudoers diff --git a/templates/centos-6.4/scripts/cleanup.sh b/templates/centos-6.4/scripts/cleanup.sh new file mode 100644 index 000000000..922c3d6b5 --- /dev/null +++ b/templates/centos-6.4/scripts/cleanup.sh @@ -0,0 +1,5 @@ +#!/bin/bash -eux +yum -y erase gtk2 libX11 hicolor-icon-theme avahi freetype bitstream-vera-fonts +yum -y clean all +rm -rf VBoxGuestAdditions_*.iso VBoxGuestAdditions_*.iso.? +rm -f /tmp/chef*rpm diff --git a/templates/centos-6.4/scripts/minimize.sh b/templates/centos-6.4/scripts/minimize.sh new file mode 100644 index 000000000..3846a1d65 --- /dev/null +++ b/templates/centos-6.4/scripts/minimize.sh @@ -0,0 +1,4 @@ +#!/bin/bash -eux + +dd if=/dev/zero of=/EMPTY bs=1M +rm -f /EMPTY diff --git a/templates/centos-6.4/scripts/sshd.sh b/templates/centos-6.4/scripts/sshd.sh new file mode 100644 index 000000000..c6e4f20a6 --- /dev/null +++ b/templates/centos-6.4/scripts/sshd.sh @@ -0,0 +1,3 @@ +#!/bin/bash -eux + +echo "UseDNS no" >> /etc/ssh/sshd_config diff --git a/templates/centos-6.4/scripts/vagrant.sh b/templates/centos-6.4/scripts/vagrant.sh new file mode 100644 index 000000000..72dd2f444 --- /dev/null +++ b/templates/centos-6.4/scripts/vagrant.sh @@ -0,0 +1,33 @@ +#!/bin/bash -eux + +if [ -f /home/vagrant/.vbox_version ]; then + mkdir /tmp/vbox + VER=$(cat /home/vagrant/.vbox_version) + mount -o loop VBoxGuestAdditions_$VER.iso /tmp/vbox + sh /tmp/vbox/VBoxLinuxAdditions.run + umount /tmp/vbox + rmdir /tmp/vbox + rm *.iso +fi + +if [ -f /home/vagrant/.vmfusion_version ]; then + #Set Linux-specific paths and ISO filename + home_dir="/home/vagrant" + iso_name="linux.iso" + mount_point="/tmp/vmware-tools" + #Run install, unmount ISO and remove it + mkdir ${mount_point} + cd ${home_dir} + /bin/mount -o loop ${iso_name} ${mount_point} + tar zxf ${mount_point}/*.tar.gz && cd vmware-tools-distrib && ./vmware-install.pl --default + /bin/umount ${mount_point} + /bin/rm -rf ${home_dir}/${iso_name} ${home_dir}/vmware-tools-distrib + rmdir ${mount_point} +fi + +mkdir /home/vagrant/.ssh +wget --no-check-certificate \ + 'https://github.com/mitchellh/vagrant/raw/master/keys/vagrant.pub' \ + -O /home/vagrant/.ssh/authorized_keys +chown -R vagrant /home/vagrant/.ssh +chmod -R go-rwsx /home/vagrant/.ssh diff --git a/templates/centos-6.4/template.json b/templates/centos-6.4/template.json new file mode 100644 index 000000000..24debf9b9 --- /dev/null +++ b/templates/centos-6.4/template.json @@ -0,0 +1,88 @@ +{ + "provisioners": [ + { + "type": "shell", + "scripts": [ + "scripts/vagrant.sh", + "scripts/sshd.sh", + "scripts/cleanup.sh", + "scripts/minimize.sh" + ], + "override": { + "virtualbox": { + "execute_command": "echo 'vagrant'|sudo -S sh '{{.Path}}'" + }, + "vmware": { + "execute_command": "echo 'vagrant'|sudo -S sh '{{.Path}}'" + } + } + } + ], + "builders": [ + { + "type": "virtualbox", + "boot_command": [ + "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/ks.cfg<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "guest_os_type": "RedHat_64", + "http_directory": "http", + "iso_checksum": "0128cfc7c86072b13ee80dd013e0e5d7", + "iso_checksum_type": "md5", + "iso_url": "http://mirrors.kernel.org/centos/6.4/isos/x86_64/CentOS-6.4-x86_64-bin-DVD1.iso", + "ssh_username": "vagrant", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_wait_timeout": "10000s", + "shutdown_command": "echo '/sbin/halt -h -p' > shutdown.sh; echo 'vagrant'|sudo -S sh 'shutdown.sh'", + "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "virtualbox_version_file": ".vbox_version", + "vboxmanage": [ + [ + "modifyvm", + "{{.Name}}", + "--memory", + "480" + ], + [ + "modifyvm", + "{{.Name}}", + "--cpus", + "1" + ] + ], + "iso_md5": "0128cfc7c86072b13ee80dd013e0e5d7" + }, + { + "type": "vmware", + "boot_command": [ + "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/ks.cfg<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "guest_os_type": "centos-64", + "http_directory": "http", + "iso_checksum": "0128cfc7c86072b13ee80dd013e0e5d7", + "iso_checksum_type": "md5", + "iso_url": "http://mirrors.kernel.org/centos/6.4/isos/x86_64/CentOS-6.4-x86_64-bin-DVD1.iso", + "ssh_username": "vagrant", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_wait_timeout": "10000s", + "shutdown_command": "echo '/sbin/halt -h -p' > shutdown.sh; echo 'vagrant'|sudo -S sh 'shutdown.sh'", + "vmx_data": { + "memsize": "480", + "numvcpus": "1", + "cpuid.coresPerSocket": "1" + }, + "iso_md5": "0128cfc7c86072b13ee80dd013e0e5d7" + } + ], + "post-provisioner": [ + { + "type": "vagrant", + "output": "centos-6.4-{{.Provisioner}}.box" + } + ] +} \ No newline at end of file diff --git a/templates/debian-6.0.7-i386/http/preseed.cfg b/templates/debian-6.0.7-i386/http/preseed.cfg new file mode 100644 index 000000000..820f090c5 --- /dev/null +++ b/templates/debian-6.0.7-i386/http/preseed.cfg @@ -0,0 +1,47 @@ +choose-mirror-bin mirror/http/proxy string +d-i apt-setup/use_mirror boolean true +d-i base-installer/kernel/override-image string linux-server +d-i clock-setup/utc boolean true +d-i clock-setup/utc-auto boolean true +d-i finish-install/reboot_in_progress note +d-i grub-installer/only_debian boolean true +d-i grub-installer/with_other_os boolean true +d-i keymap select us +d-i mirror/country string manual +d-i mirror/http/directory string /debian +d-i mirror/http/hostname string mirrors.kernel.org +d-i mirror/http/proxy string +d-i partman-auto-lvm/guided_size string max +d-i partman-auto/choose_recipe select atomic +d-i partman-auto/method string lvm +d-i partman-lvm/confirm boolean true +d-i partman-lvm/confirm boolean true +d-i partman-lvm/confirm_nooverwrite boolean true +d-i partman-lvm/device_remove_lvm boolean true +d-i partman/choose_partition select finish +d-i partman/confirm boolean true +d-i partman/confirm_nooverwrite boolean true +d-i partman/confirm_write_new_label boolean true +d-i passwd/root-login boolean false +d-i passwd/root-password-again password vagrant +d-i passwd/root-password password vagrant +d-i passwd/user-fullname string vagrant +d-i passwd/user-uid string 900 +d-i passwd/user-password password vagrant +d-i passwd/user-password-again password vagrant +d-i passwd/username string vagrant +d-i pkgsel/include string openssh-server sudo bzip2 acpid cryptsetup zlib1g-dev wget curl dkms make +d-i pkgsel/install-language-support boolean false +d-i pkgsel/update-policy select unattended-upgrades +d-i pkgsel/upgrade select full-upgrade +# Prevent packaged version of VirtualBox Guest Additions being installed: +d-i preseed/early_command string sed -i \ + '/in-target/idiscover(){/sbin/discover|grep -v VirtualBox;}' \ + /usr/lib/pre-pkgsel.d/20install-hwpackages +d-i time/zone string UTC +d-i user-setup/allow-password-weak boolean true +d-i user-setup/encrypt-home boolean false +apt-cdrom-setup apt-setup/cdrom/set-first boolean false +apt-mirror-setup apt-setup/use_mirror boolean true +popularity-contest popularity-contest/participate boolean false +tasksel tasksel/first multiselect standard, ubuntu-server diff --git a/templates/debian-6.0.7-i386/scripts/cleanup.sh b/templates/debian-6.0.7-i386/scripts/cleanup.sh new file mode 100644 index 000000000..6c7f703d6 --- /dev/null +++ b/templates/debian-6.0.7-i386/scripts/cleanup.sh @@ -0,0 +1,6 @@ +#!/bin/bash -eux + +apt-get -y autoremove +apt-get -y clean +rm -rf VBoxGuestAdditions_*.iso VBoxGuestAdditions_*.iso.? +rm -f /tmp/chef*deb diff --git a/templates/debian-6.0.7-i386/scripts/minimize.sh b/templates/debian-6.0.7-i386/scripts/minimize.sh new file mode 100644 index 000000000..3846a1d65 --- /dev/null +++ b/templates/debian-6.0.7-i386/scripts/minimize.sh @@ -0,0 +1,4 @@ +#!/bin/bash -eux + +dd if=/dev/zero of=/EMPTY bs=1M +rm -f /EMPTY diff --git a/templates/debian-6.0.7-i386/scripts/networking.sh b/templates/debian-6.0.7-i386/scripts/networking.sh new file mode 100644 index 000000000..de3269a58 --- /dev/null +++ b/templates/debian-6.0.7-i386/scripts/networking.sh @@ -0,0 +1,7 @@ +#!/bin/bash -eux + +rm /etc/udev/rules.d/70-persistent-net.rules +mkdir /etc/udev/rules.d/70-persistent-net.rules +rm /lib/udev/rules.d/75-persistent-net-generator.rules +rm -rf /dev/.udev/ /var/lib/dhcp3/* +echo "pre-up sleep 2" >> /etc/network/interfaces diff --git a/templates/debian-6.0.7-i386/scripts/sshd.sh b/templates/debian-6.0.7-i386/scripts/sshd.sh new file mode 100644 index 000000000..c6e4f20a6 --- /dev/null +++ b/templates/debian-6.0.7-i386/scripts/sshd.sh @@ -0,0 +1,3 @@ +#!/bin/bash -eux + +echo "UseDNS no" >> /etc/ssh/sshd_config diff --git a/templates/debian-6.0.7-i386/scripts/sudoers.sh b/templates/debian-6.0.7-i386/scripts/sudoers.sh new file mode 100644 index 000000000..e7673ae00 --- /dev/null +++ b/templates/debian-6.0.7-i386/scripts/sudoers.sh @@ -0,0 +1,4 @@ +#!/bin/bash -eux + +sed -i -e '/Defaults\s\+env_reset/a Defaults\texempt_group=sudo' /etc/sudoers +sed -i -e 's/%sudo ALL=(ALL) ALL/%sudo ALL=NOPASSWD:ALL/g' /etc/sudoers diff --git a/templates/debian-6.0.7-i386/scripts/update.sh b/templates/debian-6.0.7-i386/scripts/update.sh new file mode 100644 index 000000000..a4cc91499 --- /dev/null +++ b/templates/debian-6.0.7-i386/scripts/update.sh @@ -0,0 +1,4 @@ +#!/bin/bash -eux + +apt-get update +apt-get -y upgrade diff --git a/templates/debian-6.0.7-i386/scripts/vagrant.sh b/templates/debian-6.0.7-i386/scripts/vagrant.sh new file mode 100644 index 000000000..72dd2f444 --- /dev/null +++ b/templates/debian-6.0.7-i386/scripts/vagrant.sh @@ -0,0 +1,33 @@ +#!/bin/bash -eux + +if [ -f /home/vagrant/.vbox_version ]; then + mkdir /tmp/vbox + VER=$(cat /home/vagrant/.vbox_version) + mount -o loop VBoxGuestAdditions_$VER.iso /tmp/vbox + sh /tmp/vbox/VBoxLinuxAdditions.run + umount /tmp/vbox + rmdir /tmp/vbox + rm *.iso +fi + +if [ -f /home/vagrant/.vmfusion_version ]; then + #Set Linux-specific paths and ISO filename + home_dir="/home/vagrant" + iso_name="linux.iso" + mount_point="/tmp/vmware-tools" + #Run install, unmount ISO and remove it + mkdir ${mount_point} + cd ${home_dir} + /bin/mount -o loop ${iso_name} ${mount_point} + tar zxf ${mount_point}/*.tar.gz && cd vmware-tools-distrib && ./vmware-install.pl --default + /bin/umount ${mount_point} + /bin/rm -rf ${home_dir}/${iso_name} ${home_dir}/vmware-tools-distrib + rmdir ${mount_point} +fi + +mkdir /home/vagrant/.ssh +wget --no-check-certificate \ + 'https://github.com/mitchellh/vagrant/raw/master/keys/vagrant.pub' \ + -O /home/vagrant/.ssh/authorized_keys +chown -R vagrant /home/vagrant/.ssh +chmod -R go-rwsx /home/vagrant/.ssh diff --git a/templates/debian-6.0.7-i386/template.json b/templates/debian-6.0.7-i386/template.json new file mode 100644 index 000000000..09515f5b2 --- /dev/null +++ b/templates/debian-6.0.7-i386/template.json @@ -0,0 +1,119 @@ +{ + "provisioners": [ + { + "type": "shell", + "scripts": [ + "scripts/update.sh", + "scripts/vagrant.sh", + "scripts/sshd.sh", + "scripts/networking.sh", + "scripts/sudoers.sh", + "scripts/cleanup.sh", + "scripts/minimize.sh" + ], + "override": { + "virtualbox": { + "execute_command": "echo 'vagrant'|sudo -S sh '{{.Path}}'" + }, + "vmware": { + "execute_command": "echo 'vagrant'|sudo -S sh '{{.Path}}'" + } + } + } + ], + "builders": [ + { + "type": "virtualbox", + "boot_command": [ + "<esc><wait>", + "install <wait>", + "preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/preseed.cfg <wait>", + "debian-installer=en_US <wait>", + "auto <wait>", + "locale=en_US <wait>", + "kbd-chooser/method=us <wait>", + "keyboard-configuration/xkb-keymap=us <wait>", + "netcfg/get_hostname={{ .Name }} <wait>", + "netcfg/get_domain=vagrantup.com <wait>", + "fb=false <wait>", + "debconf/frontend=noninteractive <wait>", + "console-setup/ask_detect=false <wait>", + "console-keymaps-at/keymap=us <wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "guest_os_type": "Debian", + "http_directory": "http", + "iso_checksum": "4480eeae60213eb92e1fce15ebf2faf4", + "iso_checksum_type": "md5", + "iso_url": "http://cdimage.debian.org/cdimage/archive/6.0.7/i386/iso-cd/debian-6.0.7-i386-CD-1.iso", + "ssh_username": "vagrant", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_wait_timeout": "10000s", + "shutdown_command": "echo '/sbin/shutdown -h -P now' > shutdown.sh; echo 'vagrant'|sudo -S sh 'shutdown.sh'", + "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "virtualbox_version_file": ".vbox_version", + "vboxmanage": [ + [ + "modifyvm", + "{{.Name}}", + "--memory", + "384" + ], + [ + "modifyvm", + "{{.Name}}", + "--cpus", + "1" + ] + ], + "iso_md5": "4480eeae60213eb92e1fce15ebf2faf4" + }, + { + "type": "vmware", + "boot_command": [ + "<esc><wait>", + "install <wait>", + "preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/preseed.cfg <wait>", + "debian-installer=en_US <wait>", + "auto <wait>", + "locale=en_US <wait>", + "kbd-chooser/method=us <wait>", + "keyboard-configuration/xkb-keymap=us <wait>", + "netcfg/get_hostname={{ .Name }} <wait>", + "netcfg/get_domain=vagrantup.com <wait>", + "fb=false <wait>", + "debconf/frontend=noninteractive <wait>", + "console-setup/ask_detect=false <wait>", + "console-keymaps-at/keymap=us <wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "guest_os_type": "debian5", + "http_directory": "http", + "iso_checksum": "4480eeae60213eb92e1fce15ebf2faf4", + "iso_checksum_type": "md5", + "iso_url": "http://cdimage.debian.org/cdimage/archive/6.0.7/i386/iso-cd/debian-6.0.7-i386-CD-1.iso", + "ssh_username": "vagrant", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_wait_timeout": "10000s", + "shutdown_command": "echo '/sbin/shutdown -h -P now' > shutdown.sh; echo 'vagrant'|sudo -S sh 'shutdown.sh'", + "vmx_data": { + "memsize": "384", + "numvcpus": "1", + "cpuid.coresPerSocket": "1" + }, + "iso_md5": "4480eeae60213eb92e1fce15ebf2faf4" + } + ], + "post-provisioner": [ + { + "type": "vagrant", + "output": "debian-6.0.7-i386-{{.Provisioner}}.box" + } + ] +} \ No newline at end of file diff --git a/templates/debian-6.0.7/http/preseed.cfg b/templates/debian-6.0.7/http/preseed.cfg new file mode 100644 index 000000000..820f090c5 --- /dev/null +++ b/templates/debian-6.0.7/http/preseed.cfg @@ -0,0 +1,47 @@ +choose-mirror-bin mirror/http/proxy string +d-i apt-setup/use_mirror boolean true +d-i base-installer/kernel/override-image string linux-server +d-i clock-setup/utc boolean true +d-i clock-setup/utc-auto boolean true +d-i finish-install/reboot_in_progress note +d-i grub-installer/only_debian boolean true +d-i grub-installer/with_other_os boolean true +d-i keymap select us +d-i mirror/country string manual +d-i mirror/http/directory string /debian +d-i mirror/http/hostname string mirrors.kernel.org +d-i mirror/http/proxy string +d-i partman-auto-lvm/guided_size string max +d-i partman-auto/choose_recipe select atomic +d-i partman-auto/method string lvm +d-i partman-lvm/confirm boolean true +d-i partman-lvm/confirm boolean true +d-i partman-lvm/confirm_nooverwrite boolean true +d-i partman-lvm/device_remove_lvm boolean true +d-i partman/choose_partition select finish +d-i partman/confirm boolean true +d-i partman/confirm_nooverwrite boolean true +d-i partman/confirm_write_new_label boolean true +d-i passwd/root-login boolean false +d-i passwd/root-password-again password vagrant +d-i passwd/root-password password vagrant +d-i passwd/user-fullname string vagrant +d-i passwd/user-uid string 900 +d-i passwd/user-password password vagrant +d-i passwd/user-password-again password vagrant +d-i passwd/username string vagrant +d-i pkgsel/include string openssh-server sudo bzip2 acpid cryptsetup zlib1g-dev wget curl dkms make +d-i pkgsel/install-language-support boolean false +d-i pkgsel/update-policy select unattended-upgrades +d-i pkgsel/upgrade select full-upgrade +# Prevent packaged version of VirtualBox Guest Additions being installed: +d-i preseed/early_command string sed -i \ + '/in-target/idiscover(){/sbin/discover|grep -v VirtualBox;}' \ + /usr/lib/pre-pkgsel.d/20install-hwpackages +d-i time/zone string UTC +d-i user-setup/allow-password-weak boolean true +d-i user-setup/encrypt-home boolean false +apt-cdrom-setup apt-setup/cdrom/set-first boolean false +apt-mirror-setup apt-setup/use_mirror boolean true +popularity-contest popularity-contest/participate boolean false +tasksel tasksel/first multiselect standard, ubuntu-server diff --git a/templates/debian-6.0.7/scripts/cleanup.sh b/templates/debian-6.0.7/scripts/cleanup.sh new file mode 100644 index 000000000..6c7f703d6 --- /dev/null +++ b/templates/debian-6.0.7/scripts/cleanup.sh @@ -0,0 +1,6 @@ +#!/bin/bash -eux + +apt-get -y autoremove +apt-get -y clean +rm -rf VBoxGuestAdditions_*.iso VBoxGuestAdditions_*.iso.? +rm -f /tmp/chef*deb diff --git a/templates/debian-6.0.7/scripts/minimize.sh b/templates/debian-6.0.7/scripts/minimize.sh new file mode 100644 index 000000000..3846a1d65 --- /dev/null +++ b/templates/debian-6.0.7/scripts/minimize.sh @@ -0,0 +1,4 @@ +#!/bin/bash -eux + +dd if=/dev/zero of=/EMPTY bs=1M +rm -f /EMPTY diff --git a/templates/debian-6.0.7/scripts/networking.sh b/templates/debian-6.0.7/scripts/networking.sh new file mode 100644 index 000000000..de3269a58 --- /dev/null +++ b/templates/debian-6.0.7/scripts/networking.sh @@ -0,0 +1,7 @@ +#!/bin/bash -eux + +rm /etc/udev/rules.d/70-persistent-net.rules +mkdir /etc/udev/rules.d/70-persistent-net.rules +rm /lib/udev/rules.d/75-persistent-net-generator.rules +rm -rf /dev/.udev/ /var/lib/dhcp3/* +echo "pre-up sleep 2" >> /etc/network/interfaces diff --git a/templates/debian-6.0.7/scripts/sshd.sh b/templates/debian-6.0.7/scripts/sshd.sh new file mode 100644 index 000000000..c6e4f20a6 --- /dev/null +++ b/templates/debian-6.0.7/scripts/sshd.sh @@ -0,0 +1,3 @@ +#!/bin/bash -eux + +echo "UseDNS no" >> /etc/ssh/sshd_config diff --git a/templates/debian-6.0.7/scripts/sudoers.sh b/templates/debian-6.0.7/scripts/sudoers.sh new file mode 100644 index 000000000..e7673ae00 --- /dev/null +++ b/templates/debian-6.0.7/scripts/sudoers.sh @@ -0,0 +1,4 @@ +#!/bin/bash -eux + +sed -i -e '/Defaults\s\+env_reset/a Defaults\texempt_group=sudo' /etc/sudoers +sed -i -e 's/%sudo ALL=(ALL) ALL/%sudo ALL=NOPASSWD:ALL/g' /etc/sudoers diff --git a/templates/debian-6.0.7/scripts/update.sh b/templates/debian-6.0.7/scripts/update.sh new file mode 100644 index 000000000..a4cc91499 --- /dev/null +++ b/templates/debian-6.0.7/scripts/update.sh @@ -0,0 +1,4 @@ +#!/bin/bash -eux + +apt-get update +apt-get -y upgrade diff --git a/templates/debian-6.0.7/scripts/vagrant.sh b/templates/debian-6.0.7/scripts/vagrant.sh new file mode 100644 index 000000000..72dd2f444 --- /dev/null +++ b/templates/debian-6.0.7/scripts/vagrant.sh @@ -0,0 +1,33 @@ +#!/bin/bash -eux + +if [ -f /home/vagrant/.vbox_version ]; then + mkdir /tmp/vbox + VER=$(cat /home/vagrant/.vbox_version) + mount -o loop VBoxGuestAdditions_$VER.iso /tmp/vbox + sh /tmp/vbox/VBoxLinuxAdditions.run + umount /tmp/vbox + rmdir /tmp/vbox + rm *.iso +fi + +if [ -f /home/vagrant/.vmfusion_version ]; then + #Set Linux-specific paths and ISO filename + home_dir="/home/vagrant" + iso_name="linux.iso" + mount_point="/tmp/vmware-tools" + #Run install, unmount ISO and remove it + mkdir ${mount_point} + cd ${home_dir} + /bin/mount -o loop ${iso_name} ${mount_point} + tar zxf ${mount_point}/*.tar.gz && cd vmware-tools-distrib && ./vmware-install.pl --default + /bin/umount ${mount_point} + /bin/rm -rf ${home_dir}/${iso_name} ${home_dir}/vmware-tools-distrib + rmdir ${mount_point} +fi + +mkdir /home/vagrant/.ssh +wget --no-check-certificate \ + 'https://github.com/mitchellh/vagrant/raw/master/keys/vagrant.pub' \ + -O /home/vagrant/.ssh/authorized_keys +chown -R vagrant /home/vagrant/.ssh +chmod -R go-rwsx /home/vagrant/.ssh diff --git a/templates/debian-6.0.7/template.json b/templates/debian-6.0.7/template.json new file mode 100644 index 000000000..8d35430f8 --- /dev/null +++ b/templates/debian-6.0.7/template.json @@ -0,0 +1,119 @@ +{ + "provisioners": [ + { + "type": "shell", + "scripts": [ + "scripts/update.sh", + "scripts/vagrant.sh", + "scripts/sshd.sh", + "scripts/networking.sh", + "scripts/sudoers.sh", + "scripts/cleanup.sh", + "scripts/minimize.sh" + ], + "override": { + "virtualbox": { + "execute_command": "echo 'vagrant'|sudo -S sh '{{.Path}}'" + }, + "vmware": { + "execute_command": "echo 'vagrant'|sudo -S sh '{{.Path}}'" + } + } + } + ], + "builders": [ + { + "type": "virtualbox", + "boot_command": [ + "<esc><wait>", + "install <wait>", + "preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/preseed.cfg <wait>", + "debian-installer=en_US <wait>", + "auto <wait>", + "locale=en_US <wait>", + "kbd-chooser/method=us <wait>", + "keyboard-configuration/xkb-keymap=us <wait>", + "netcfg/get_hostname={{ .Name }} <wait>", + "netcfg/get_domain=vagrantup.com <wait>", + "fb=false <wait>", + "debconf/frontend=noninteractive <wait>", + "console-setup/ask_detect=false <wait>", + "console-keymaps-at/keymap=us <wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "guest_os_type": "Debian_64", + "http_directory": "http", + "iso_checksum": "8f0e86d19bc90768da08cdafb4f9edbb", + "iso_checksum_type": "md5", + "iso_url": "http://cdimage.debian.org/cdimage/archive/6.0.7/amd64/iso-cd/debian-6.0.7-amd64-CD-1.iso", + "ssh_username": "vagrant", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_wait_timeout": "10000s", + "shutdown_command": "echo '/sbin/shutdown -h -P now' > shutdown.sh; echo 'vagrant'|sudo -S sh 'shutdown.sh'", + "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "virtualbox_version_file": ".vbox_version", + "vboxmanage": [ + [ + "modifyvm", + "{{.Name}}", + "--memory", + "384" + ], + [ + "modifyvm", + "{{.Name}}", + "--cpus", + "1" + ] + ], + "iso_md5": "8f0e86d19bc90768da08cdafb4f9edbb" + }, + { + "type": "vmware", + "boot_command": [ + "<esc><wait>", + "install <wait>", + "preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/preseed.cfg <wait>", + "debian-installer=en_US <wait>", + "auto <wait>", + "locale=en_US <wait>", + "kbd-chooser/method=us <wait>", + "keyboard-configuration/xkb-keymap=us <wait>", + "netcfg/get_hostname={{ .Name }} <wait>", + "netcfg/get_domain=vagrantup.com <wait>", + "fb=false <wait>", + "debconf/frontend=noninteractive <wait>", + "console-setup/ask_detect=false <wait>", + "console-keymaps-at/keymap=us <wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "guest_os_type": "debian5-64", + "http_directory": "http", + "iso_checksum": "8f0e86d19bc90768da08cdafb4f9edbb", + "iso_checksum_type": "md5", + "iso_url": "http://cdimage.debian.org/cdimage/archive/6.0.7/amd64/iso-cd/debian-6.0.7-amd64-CD-1.iso", + "ssh_username": "vagrant", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_wait_timeout": "10000s", + "shutdown_command": "echo '/sbin/shutdown -h -P now' > shutdown.sh; echo 'vagrant'|sudo -S sh 'shutdown.sh'", + "vmx_data": { + "memsize": "384", + "numvcpus": "1", + "cpuid.coresPerSocket": "1" + }, + "iso_md5": "8f0e86d19bc90768da08cdafb4f9edbb" + } + ], + "post-provisioner": [ + { + "type": "vagrant", + "output": "debian-6.0.7-{{.Provisioner}}.box" + } + ] +} \ No newline at end of file diff --git a/templates/debian-7.1.0-i386/http/preseed.cfg b/templates/debian-7.1.0-i386/http/preseed.cfg new file mode 100644 index 000000000..820f090c5 --- /dev/null +++ b/templates/debian-7.1.0-i386/http/preseed.cfg @@ -0,0 +1,47 @@ +choose-mirror-bin mirror/http/proxy string +d-i apt-setup/use_mirror boolean true +d-i base-installer/kernel/override-image string linux-server +d-i clock-setup/utc boolean true +d-i clock-setup/utc-auto boolean true +d-i finish-install/reboot_in_progress note +d-i grub-installer/only_debian boolean true +d-i grub-installer/with_other_os boolean true +d-i keymap select us +d-i mirror/country string manual +d-i mirror/http/directory string /debian +d-i mirror/http/hostname string mirrors.kernel.org +d-i mirror/http/proxy string +d-i partman-auto-lvm/guided_size string max +d-i partman-auto/choose_recipe select atomic +d-i partman-auto/method string lvm +d-i partman-lvm/confirm boolean true +d-i partman-lvm/confirm boolean true +d-i partman-lvm/confirm_nooverwrite boolean true +d-i partman-lvm/device_remove_lvm boolean true +d-i partman/choose_partition select finish +d-i partman/confirm boolean true +d-i partman/confirm_nooverwrite boolean true +d-i partman/confirm_write_new_label boolean true +d-i passwd/root-login boolean false +d-i passwd/root-password-again password vagrant +d-i passwd/root-password password vagrant +d-i passwd/user-fullname string vagrant +d-i passwd/user-uid string 900 +d-i passwd/user-password password vagrant +d-i passwd/user-password-again password vagrant +d-i passwd/username string vagrant +d-i pkgsel/include string openssh-server sudo bzip2 acpid cryptsetup zlib1g-dev wget curl dkms make +d-i pkgsel/install-language-support boolean false +d-i pkgsel/update-policy select unattended-upgrades +d-i pkgsel/upgrade select full-upgrade +# Prevent packaged version of VirtualBox Guest Additions being installed: +d-i preseed/early_command string sed -i \ + '/in-target/idiscover(){/sbin/discover|grep -v VirtualBox;}' \ + /usr/lib/pre-pkgsel.d/20install-hwpackages +d-i time/zone string UTC +d-i user-setup/allow-password-weak boolean true +d-i user-setup/encrypt-home boolean false +apt-cdrom-setup apt-setup/cdrom/set-first boolean false +apt-mirror-setup apt-setup/use_mirror boolean true +popularity-contest popularity-contest/participate boolean false +tasksel tasksel/first multiselect standard, ubuntu-server diff --git a/templates/debian-7.1.0-i386/scripts/cleanup.sh b/templates/debian-7.1.0-i386/scripts/cleanup.sh new file mode 100644 index 000000000..6c7f703d6 --- /dev/null +++ b/templates/debian-7.1.0-i386/scripts/cleanup.sh @@ -0,0 +1,6 @@ +#!/bin/bash -eux + +apt-get -y autoremove +apt-get -y clean +rm -rf VBoxGuestAdditions_*.iso VBoxGuestAdditions_*.iso.? +rm -f /tmp/chef*deb diff --git a/templates/debian-7.1.0-i386/scripts/minimize.sh b/templates/debian-7.1.0-i386/scripts/minimize.sh new file mode 100644 index 000000000..3846a1d65 --- /dev/null +++ b/templates/debian-7.1.0-i386/scripts/minimize.sh @@ -0,0 +1,4 @@ +#!/bin/bash -eux + +dd if=/dev/zero of=/EMPTY bs=1M +rm -f /EMPTY diff --git a/templates/debian-7.1.0-i386/scripts/networking.sh b/templates/debian-7.1.0-i386/scripts/networking.sh new file mode 100644 index 000000000..de3269a58 --- /dev/null +++ b/templates/debian-7.1.0-i386/scripts/networking.sh @@ -0,0 +1,7 @@ +#!/bin/bash -eux + +rm /etc/udev/rules.d/70-persistent-net.rules +mkdir /etc/udev/rules.d/70-persistent-net.rules +rm /lib/udev/rules.d/75-persistent-net-generator.rules +rm -rf /dev/.udev/ /var/lib/dhcp3/* +echo "pre-up sleep 2" >> /etc/network/interfaces diff --git a/templates/debian-7.1.0-i386/scripts/sshd.sh b/templates/debian-7.1.0-i386/scripts/sshd.sh new file mode 100644 index 000000000..c6e4f20a6 --- /dev/null +++ b/templates/debian-7.1.0-i386/scripts/sshd.sh @@ -0,0 +1,3 @@ +#!/bin/bash -eux + +echo "UseDNS no" >> /etc/ssh/sshd_config diff --git a/templates/debian-7.1.0-i386/scripts/sudoers.sh b/templates/debian-7.1.0-i386/scripts/sudoers.sh new file mode 100644 index 000000000..e7673ae00 --- /dev/null +++ b/templates/debian-7.1.0-i386/scripts/sudoers.sh @@ -0,0 +1,4 @@ +#!/bin/bash -eux + +sed -i -e '/Defaults\s\+env_reset/a Defaults\texempt_group=sudo' /etc/sudoers +sed -i -e 's/%sudo ALL=(ALL) ALL/%sudo ALL=NOPASSWD:ALL/g' /etc/sudoers diff --git a/templates/debian-7.1.0-i386/scripts/update.sh b/templates/debian-7.1.0-i386/scripts/update.sh new file mode 100644 index 000000000..a4cc91499 --- /dev/null +++ b/templates/debian-7.1.0-i386/scripts/update.sh @@ -0,0 +1,4 @@ +#!/bin/bash -eux + +apt-get update +apt-get -y upgrade diff --git a/templates/debian-7.1.0-i386/scripts/vagrant.sh b/templates/debian-7.1.0-i386/scripts/vagrant.sh new file mode 100644 index 000000000..72dd2f444 --- /dev/null +++ b/templates/debian-7.1.0-i386/scripts/vagrant.sh @@ -0,0 +1,33 @@ +#!/bin/bash -eux + +if [ -f /home/vagrant/.vbox_version ]; then + mkdir /tmp/vbox + VER=$(cat /home/vagrant/.vbox_version) + mount -o loop VBoxGuestAdditions_$VER.iso /tmp/vbox + sh /tmp/vbox/VBoxLinuxAdditions.run + umount /tmp/vbox + rmdir /tmp/vbox + rm *.iso +fi + +if [ -f /home/vagrant/.vmfusion_version ]; then + #Set Linux-specific paths and ISO filename + home_dir="/home/vagrant" + iso_name="linux.iso" + mount_point="/tmp/vmware-tools" + #Run install, unmount ISO and remove it + mkdir ${mount_point} + cd ${home_dir} + /bin/mount -o loop ${iso_name} ${mount_point} + tar zxf ${mount_point}/*.tar.gz && cd vmware-tools-distrib && ./vmware-install.pl --default + /bin/umount ${mount_point} + /bin/rm -rf ${home_dir}/${iso_name} ${home_dir}/vmware-tools-distrib + rmdir ${mount_point} +fi + +mkdir /home/vagrant/.ssh +wget --no-check-certificate \ + 'https://github.com/mitchellh/vagrant/raw/master/keys/vagrant.pub' \ + -O /home/vagrant/.ssh/authorized_keys +chown -R vagrant /home/vagrant/.ssh +chmod -R go-rwsx /home/vagrant/.ssh diff --git a/templates/debian-7.1.0-i386/template.json b/templates/debian-7.1.0-i386/template.json new file mode 100644 index 000000000..fd01e8b18 --- /dev/null +++ b/templates/debian-7.1.0-i386/template.json @@ -0,0 +1,119 @@ +{ + "provisioners": [ + { + "type": "shell", + "scripts": [ + "scripts/update.sh", + "scripts/vagrant.sh", + "scripts/sshd.sh", + "scripts/networking.sh", + "scripts/sudoers.sh", + "scripts/cleanup.sh", + "scripts/minimize.sh" + ], + "override": { + "virtualbox": { + "execute_command": "echo 'vagrant'|sudo -S sh '{{.Path}}'" + }, + "vmware": { + "execute_command": "echo 'vagrant'|sudo -S sh '{{.Path}}'" + } + } + } + ], + "builders": [ + { + "type": "virtualbox", + "boot_command": [ + "<esc><wait>", + "install <wait>", + "preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/preseed.cfg <wait>", + "debian-installer=en_US <wait>", + "auto <wait>", + "locale=en_US <wait>", + "kbd-chooser/method=us <wait>", + "keyboard-configuration/xkb-keymap=us <wait>", + "netcfg/get_hostname={{ .Name }} <wait>", + "netcfg/get_domain=vagrantup.com <wait>", + "fb=false <wait>", + "debconf/frontend=noninteractive <wait>", + "console-setup/ask_detect=false <wait>", + "console-keymaps-at/keymap=us <wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "guest_os_type": "Debian", + "http_directory": "http", + "iso_checksum": "c29ec2db6754dadd341b9763164aca9a", + "iso_checksum_type": "md5", + "iso_url": "http://cdimage.debian.org/debian-cd/7.1.0/i386/iso-cd/debian-7.1.0-i386-CD-1.iso", + "ssh_username": "vagrant", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_wait_timeout": "10000s", + "shutdown_command": "echo '/sbin/shutdown -h -P now' > shutdown.sh; echo 'vagrant'|sudo -S sh 'shutdown.sh'", + "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "virtualbox_version_file": ".vbox_version", + "vboxmanage": [ + [ + "modifyvm", + "{{.Name}}", + "--memory", + "384" + ], + [ + "modifyvm", + "{{.Name}}", + "--cpus", + "1" + ] + ], + "iso_md5": "c29ec2db6754dadd341b9763164aca9a" + }, + { + "type": "vmware", + "boot_command": [ + "<esc><wait>", + "install <wait>", + "preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/preseed.cfg <wait>", + "debian-installer=en_US <wait>", + "auto <wait>", + "locale=en_US <wait>", + "kbd-chooser/method=us <wait>", + "keyboard-configuration/xkb-keymap=us <wait>", + "netcfg/get_hostname={{ .Name }} <wait>", + "netcfg/get_domain=vagrantup.com <wait>", + "fb=false <wait>", + "debconf/frontend=noninteractive <wait>", + "console-setup/ask_detect=false <wait>", + "console-keymaps-at/keymap=us <wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "guest_os_type": "debian5", + "http_directory": "http", + "iso_checksum": "c29ec2db6754dadd341b9763164aca9a", + "iso_checksum_type": "md5", + "iso_url": "http://cdimage.debian.org/debian-cd/7.1.0/i386/iso-cd/debian-7.1.0-i386-CD-1.iso", + "ssh_username": "vagrant", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_wait_timeout": "10000s", + "shutdown_command": "echo '/sbin/shutdown -h -P now' > shutdown.sh; echo 'vagrant'|sudo -S sh 'shutdown.sh'", + "vmx_data": { + "memsize": "384", + "numvcpus": "1", + "cpuid.coresPerSocket": "1" + }, + "iso_md5": "c29ec2db6754dadd341b9763164aca9a" + } + ], + "post-provisioner": [ + { + "type": "vagrant", + "output": "debian-7.1.0-i386-{{.Provisioner}}.box" + } + ] +} \ No newline at end of file diff --git a/templates/debian-7.1.0/http/preseed.cfg b/templates/debian-7.1.0/http/preseed.cfg new file mode 100644 index 000000000..820f090c5 --- /dev/null +++ b/templates/debian-7.1.0/http/preseed.cfg @@ -0,0 +1,47 @@ +choose-mirror-bin mirror/http/proxy string +d-i apt-setup/use_mirror boolean true +d-i base-installer/kernel/override-image string linux-server +d-i clock-setup/utc boolean true +d-i clock-setup/utc-auto boolean true +d-i finish-install/reboot_in_progress note +d-i grub-installer/only_debian boolean true +d-i grub-installer/with_other_os boolean true +d-i keymap select us +d-i mirror/country string manual +d-i mirror/http/directory string /debian +d-i mirror/http/hostname string mirrors.kernel.org +d-i mirror/http/proxy string +d-i partman-auto-lvm/guided_size string max +d-i partman-auto/choose_recipe select atomic +d-i partman-auto/method string lvm +d-i partman-lvm/confirm boolean true +d-i partman-lvm/confirm boolean true +d-i partman-lvm/confirm_nooverwrite boolean true +d-i partman-lvm/device_remove_lvm boolean true +d-i partman/choose_partition select finish +d-i partman/confirm boolean true +d-i partman/confirm_nooverwrite boolean true +d-i partman/confirm_write_new_label boolean true +d-i passwd/root-login boolean false +d-i passwd/root-password-again password vagrant +d-i passwd/root-password password vagrant +d-i passwd/user-fullname string vagrant +d-i passwd/user-uid string 900 +d-i passwd/user-password password vagrant +d-i passwd/user-password-again password vagrant +d-i passwd/username string vagrant +d-i pkgsel/include string openssh-server sudo bzip2 acpid cryptsetup zlib1g-dev wget curl dkms make +d-i pkgsel/install-language-support boolean false +d-i pkgsel/update-policy select unattended-upgrades +d-i pkgsel/upgrade select full-upgrade +# Prevent packaged version of VirtualBox Guest Additions being installed: +d-i preseed/early_command string sed -i \ + '/in-target/idiscover(){/sbin/discover|grep -v VirtualBox;}' \ + /usr/lib/pre-pkgsel.d/20install-hwpackages +d-i time/zone string UTC +d-i user-setup/allow-password-weak boolean true +d-i user-setup/encrypt-home boolean false +apt-cdrom-setup apt-setup/cdrom/set-first boolean false +apt-mirror-setup apt-setup/use_mirror boolean true +popularity-contest popularity-contest/participate boolean false +tasksel tasksel/first multiselect standard, ubuntu-server diff --git a/templates/debian-7.1.0/scripts/cleanup.sh b/templates/debian-7.1.0/scripts/cleanup.sh new file mode 100644 index 000000000..6c7f703d6 --- /dev/null +++ b/templates/debian-7.1.0/scripts/cleanup.sh @@ -0,0 +1,6 @@ +#!/bin/bash -eux + +apt-get -y autoremove +apt-get -y clean +rm -rf VBoxGuestAdditions_*.iso VBoxGuestAdditions_*.iso.? +rm -f /tmp/chef*deb diff --git a/templates/debian-7.1.0/scripts/minimize.sh b/templates/debian-7.1.0/scripts/minimize.sh new file mode 100644 index 000000000..3846a1d65 --- /dev/null +++ b/templates/debian-7.1.0/scripts/minimize.sh @@ -0,0 +1,4 @@ +#!/bin/bash -eux + +dd if=/dev/zero of=/EMPTY bs=1M +rm -f /EMPTY diff --git a/templates/debian-7.1.0/scripts/networking.sh b/templates/debian-7.1.0/scripts/networking.sh new file mode 100644 index 000000000..de3269a58 --- /dev/null +++ b/templates/debian-7.1.0/scripts/networking.sh @@ -0,0 +1,7 @@ +#!/bin/bash -eux + +rm /etc/udev/rules.d/70-persistent-net.rules +mkdir /etc/udev/rules.d/70-persistent-net.rules +rm /lib/udev/rules.d/75-persistent-net-generator.rules +rm -rf /dev/.udev/ /var/lib/dhcp3/* +echo "pre-up sleep 2" >> /etc/network/interfaces diff --git a/templates/debian-7.1.0/scripts/sshd.sh b/templates/debian-7.1.0/scripts/sshd.sh new file mode 100644 index 000000000..c6e4f20a6 --- /dev/null +++ b/templates/debian-7.1.0/scripts/sshd.sh @@ -0,0 +1,3 @@ +#!/bin/bash -eux + +echo "UseDNS no" >> /etc/ssh/sshd_config diff --git a/templates/debian-7.1.0/scripts/sudoers.sh b/templates/debian-7.1.0/scripts/sudoers.sh new file mode 100644 index 000000000..e7673ae00 --- /dev/null +++ b/templates/debian-7.1.0/scripts/sudoers.sh @@ -0,0 +1,4 @@ +#!/bin/bash -eux + +sed -i -e '/Defaults\s\+env_reset/a Defaults\texempt_group=sudo' /etc/sudoers +sed -i -e 's/%sudo ALL=(ALL) ALL/%sudo ALL=NOPASSWD:ALL/g' /etc/sudoers diff --git a/templates/debian-7.1.0/scripts/update.sh b/templates/debian-7.1.0/scripts/update.sh new file mode 100644 index 000000000..a4cc91499 --- /dev/null +++ b/templates/debian-7.1.0/scripts/update.sh @@ -0,0 +1,4 @@ +#!/bin/bash -eux + +apt-get update +apt-get -y upgrade diff --git a/templates/debian-7.1.0/scripts/vagrant.sh b/templates/debian-7.1.0/scripts/vagrant.sh new file mode 100644 index 000000000..72dd2f444 --- /dev/null +++ b/templates/debian-7.1.0/scripts/vagrant.sh @@ -0,0 +1,33 @@ +#!/bin/bash -eux + +if [ -f /home/vagrant/.vbox_version ]; then + mkdir /tmp/vbox + VER=$(cat /home/vagrant/.vbox_version) + mount -o loop VBoxGuestAdditions_$VER.iso /tmp/vbox + sh /tmp/vbox/VBoxLinuxAdditions.run + umount /tmp/vbox + rmdir /tmp/vbox + rm *.iso +fi + +if [ -f /home/vagrant/.vmfusion_version ]; then + #Set Linux-specific paths and ISO filename + home_dir="/home/vagrant" + iso_name="linux.iso" + mount_point="/tmp/vmware-tools" + #Run install, unmount ISO and remove it + mkdir ${mount_point} + cd ${home_dir} + /bin/mount -o loop ${iso_name} ${mount_point} + tar zxf ${mount_point}/*.tar.gz && cd vmware-tools-distrib && ./vmware-install.pl --default + /bin/umount ${mount_point} + /bin/rm -rf ${home_dir}/${iso_name} ${home_dir}/vmware-tools-distrib + rmdir ${mount_point} +fi + +mkdir /home/vagrant/.ssh +wget --no-check-certificate \ + 'https://github.com/mitchellh/vagrant/raw/master/keys/vagrant.pub' \ + -O /home/vagrant/.ssh/authorized_keys +chown -R vagrant /home/vagrant/.ssh +chmod -R go-rwsx /home/vagrant/.ssh diff --git a/templates/debian-7.1.0/template.json b/templates/debian-7.1.0/template.json new file mode 100644 index 000000000..34dfa4b01 --- /dev/null +++ b/templates/debian-7.1.0/template.json @@ -0,0 +1,119 @@ +{ + "provisioners": [ + { + "type": "shell", + "scripts": [ + "scripts/update.sh", + "scripts/vagrant.sh", + "scripts/sshd.sh", + "scripts/networking.sh", + "scripts/sudoers.sh", + "scripts/cleanup.sh", + "scripts/minimize.sh" + ], + "override": { + "virtualbox": { + "execute_command": "echo 'vagrant'|sudo -S sh '{{.Path}}'" + }, + "vmware": { + "execute_command": "echo 'vagrant'|sudo -S sh '{{.Path}}'" + } + } + } + ], + "builders": [ + { + "type": "virtualbox", + "boot_command": [ + "<esc><wait>", + "install <wait>", + "preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/preseed.cfg <wait>", + "debian-installer=en_US <wait>", + "auto <wait>", + "locale=en_US <wait>", + "kbd-chooser/method=us <wait>", + "keyboard-configuration/xkb-keymap=us <wait>", + "netcfg/get_hostname={{ .Name }} <wait>", + "netcfg/get_domain=vagrantup.com <wait>", + "fb=false <wait>", + "debconf/frontend=noninteractive <wait>", + "console-setup/ask_detect=false <wait>", + "console-keymaps-at/keymap=us <wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "guest_os_type": "Debian_64", + "http_directory": "http", + "iso_checksum": "6813af64cc9487099210afed14a080e0", + "iso_checksum_type": "md5", + "iso_url": "http://cdimage.debian.org/debian-cd/7.1.0/amd64/iso-cd/debian-7.1.0-amd64-CD-1.iso", + "ssh_username": "vagrant", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_wait_timeout": "10000s", + "shutdown_command": "echo '/sbin/shutdown -h -P now' > shutdown.sh; echo 'vagrant'|sudo -S sh 'shutdown.sh'", + "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "virtualbox_version_file": ".vbox_version", + "vboxmanage": [ + [ + "modifyvm", + "{{.Name}}", + "--memory", + "384" + ], + [ + "modifyvm", + "{{.Name}}", + "--cpus", + "1" + ] + ], + "iso_md5": "6813af64cc9487099210afed14a080e0" + }, + { + "type": "vmware", + "boot_command": [ + "<esc><wait>", + "install <wait>", + "preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/preseed.cfg <wait>", + "debian-installer=en_US <wait>", + "auto <wait>", + "locale=en_US <wait>", + "kbd-chooser/method=us <wait>", + "keyboard-configuration/xkb-keymap=us <wait>", + "netcfg/get_hostname={{ .Name }} <wait>", + "netcfg/get_domain=vagrantup.com <wait>", + "fb=false <wait>", + "debconf/frontend=noninteractive <wait>", + "console-setup/ask_detect=false <wait>", + "console-keymaps-at/keymap=us <wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "guest_os_type": "debian5-64", + "http_directory": "http", + "iso_checksum": "6813af64cc9487099210afed14a080e0", + "iso_checksum_type": "md5", + "iso_url": "http://cdimage.debian.org/debian-cd/7.1.0/amd64/iso-cd/debian-7.1.0-amd64-CD-1.iso", + "ssh_username": "vagrant", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_wait_timeout": "10000s", + "shutdown_command": "echo '/sbin/shutdown -h -P now' > shutdown.sh; echo 'vagrant'|sudo -S sh 'shutdown.sh'", + "vmx_data": { + "memsize": "384", + "numvcpus": "1", + "cpuid.coresPerSocket": "1" + }, + "iso_md5": "6813af64cc9487099210afed14a080e0" + } + ], + "post-provisioner": [ + { + "type": "vagrant", + "output": "debian-7.1.0-{{.Provisioner}}.box" + } + ] +} \ No newline at end of file diff --git a/templates/fedora-18/http/ks.cfg b/templates/fedora-18/http/ks.cfg new file mode 100644 index 000000000..c89695e03 --- /dev/null +++ b/templates/fedora-18/http/ks.cfg @@ -0,0 +1,50 @@ +install +cdrom +lang en_US.UTF-8 +keyboard us +network --bootproto=dhcp +rootpw --iscrypted $1$damlkd,f$UC/u5pUts5QiU3ow.CSso/ +firewall --disabled +authconfig --enableshadow --passalgo=sha512 +selinux --disabled +timezone UTC +bootloader --location=mbr +text +skipx +zerombr +clearpart --all --initlabel +part /boot --fstype=ext4 --size=500 +part pv.2 --grow --size=500 +volgroup vg_vagrant --pesize=32768 pv.2 +logvol / --fstype=ext4 --name=lv_root --vgname=vg_vagrant --size=1024 --grow +logvol swap --fstype=swap --name=lv_swap --vgname=vg_vagrant --size=528 --grow --maxsize=1056 +bootloader --location=mbr --append="norhgb biosdevname=0" +auth --useshadow --enablemd5 +firstboot --disabled +reboot + +%packages +@Core +bzip2 +gcc +kernel-devel +kernel-headers +openssl-devel +readline-devel +tar +wget +zlib-devel +%end + +%post +# update root certs +wget -O/etc/pki/tls/certs/ca-bundle.crt http://curl.haxx.se/ca/cacert.pem +# vagrant +groupadd vagrant +useradd vagrant -g vagrant -G wheel -u 900 +echo "vagrant" | passwd --stdin vagrant +# sudo +echo 'Defaults:vagrant !requiretty' > /etc/sudoers.d/vagrant +echo '%vagrant ALL=(ALL) NOPASSWD: ALL' >> /etc/sudoers.d/vagrant +chmod 440 /etc/sudoers.d/vagrant +%end diff --git a/templates/fedora-18/scripts/cleanup.sh b/templates/fedora-18/scripts/cleanup.sh new file mode 100644 index 000000000..a4d82c900 --- /dev/null +++ b/templates/fedora-18/scripts/cleanup.sh @@ -0,0 +1,4 @@ +#!/bin/bash -eux +yum -y erase gtk2 libX11 hicolor-icon-theme freetype +yum -y clean all +rm -f /tmp/chef*rpm diff --git a/templates/fedora-18/scripts/minimize.sh b/templates/fedora-18/scripts/minimize.sh new file mode 100644 index 000000000..3846a1d65 --- /dev/null +++ b/templates/fedora-18/scripts/minimize.sh @@ -0,0 +1,4 @@ +#!/bin/bash -eux + +dd if=/dev/zero of=/EMPTY bs=1M +rm -f /EMPTY diff --git a/templates/fedora-18/scripts/sshd.sh b/templates/fedora-18/scripts/sshd.sh new file mode 100644 index 000000000..c6e4f20a6 --- /dev/null +++ b/templates/fedora-18/scripts/sshd.sh @@ -0,0 +1,3 @@ +#!/bin/bash -eux + +echo "UseDNS no" >> /etc/ssh/sshd_config diff --git a/templates/fedora-18/scripts/vagrant.sh b/templates/fedora-18/scripts/vagrant.sh new file mode 100644 index 000000000..72dd2f444 --- /dev/null +++ b/templates/fedora-18/scripts/vagrant.sh @@ -0,0 +1,33 @@ +#!/bin/bash -eux + +if [ -f /home/vagrant/.vbox_version ]; then + mkdir /tmp/vbox + VER=$(cat /home/vagrant/.vbox_version) + mount -o loop VBoxGuestAdditions_$VER.iso /tmp/vbox + sh /tmp/vbox/VBoxLinuxAdditions.run + umount /tmp/vbox + rmdir /tmp/vbox + rm *.iso +fi + +if [ -f /home/vagrant/.vmfusion_version ]; then + #Set Linux-specific paths and ISO filename + home_dir="/home/vagrant" + iso_name="linux.iso" + mount_point="/tmp/vmware-tools" + #Run install, unmount ISO and remove it + mkdir ${mount_point} + cd ${home_dir} + /bin/mount -o loop ${iso_name} ${mount_point} + tar zxf ${mount_point}/*.tar.gz && cd vmware-tools-distrib && ./vmware-install.pl --default + /bin/umount ${mount_point} + /bin/rm -rf ${home_dir}/${iso_name} ${home_dir}/vmware-tools-distrib + rmdir ${mount_point} +fi + +mkdir /home/vagrant/.ssh +wget --no-check-certificate \ + 'https://github.com/mitchellh/vagrant/raw/master/keys/vagrant.pub' \ + -O /home/vagrant/.ssh/authorized_keys +chown -R vagrant /home/vagrant/.ssh +chmod -R go-rwsx /home/vagrant/.ssh diff --git a/templates/fedora-18/template.json b/templates/fedora-18/template.json new file mode 100644 index 000000000..5b57e6f02 --- /dev/null +++ b/templates/fedora-18/template.json @@ -0,0 +1,88 @@ +{ + "provisioners": [ + { + "type": "shell", + "scripts": [ + "scripts/vagrant.sh", + "scripts/sshd.sh", + "scripts/cleanup.sh", + "scripts/minimize.sh" + ], + "override": { + "virtualbox": { + "execute_command": "echo 'vagrant'|sudo -S sh '{{.Path}}'" + }, + "vmware": { + "execute_command": "echo 'vagrant'|sudo -S sh '{{.Path}}'" + } + } + } + ], + "builders": [ + { + "type": "virtualbox", + "boot_command": [ + "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/ks.cfg<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "guest_os_type": "Fedora_64", + "http_directory": "http", + "iso_checksum": "17d5c860bf9dc83e035882a7b33ffc77", + "iso_checksum_type": "md5", + "iso_url": "http://mirrors.kernel.org/fedora/releases/18/Fedora/x86_64/iso/Fedora-18-x86_64-DVD.iso", + "ssh_username": "vagrant", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_wait_timeout": "10000s", + "shutdown_command": "echo '/sbin/halt -h -p' > shutdown.sh; echo 'vagrant'|sudo -S sh 'shutdown.sh'", + "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "virtualbox_version_file": ".vbox_version", + "vboxmanage": [ + [ + "modifyvm", + "{{.Name}}", + "--memory", + "512" + ], + [ + "modifyvm", + "{{.Name}}", + "--cpus", + "1" + ] + ], + "iso_md5": "17d5c860bf9dc83e035882a7b33ffc77" + }, + { + "type": "vmware", + "boot_command": [ + "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/ks.cfg<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "guest_os_type": "fedora-64", + "http_directory": "http", + "iso_checksum": "17d5c860bf9dc83e035882a7b33ffc77", + "iso_checksum_type": "md5", + "iso_url": "http://mirrors.kernel.org/fedora/releases/18/Fedora/x86_64/iso/Fedora-18-x86_64-DVD.iso", + "ssh_username": "vagrant", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_wait_timeout": "10000s", + "shutdown_command": "echo '/sbin/halt -h -p' > shutdown.sh; echo 'vagrant'|sudo -S sh 'shutdown.sh'", + "vmx_data": { + "memsize": "512", + "numvcpus": "1", + "cpuid.coresPerSocket": "1" + }, + "iso_md5": "17d5c860bf9dc83e035882a7b33ffc77" + } + ], + "post-provisioner": [ + { + "type": "vagrant", + "output": "fedora-18-{{.Provisioner}}.box" + } + ] +} \ No newline at end of file diff --git a/templates/fedora-19/http/ks.cfg b/templates/fedora-19/http/ks.cfg new file mode 100644 index 000000000..c89695e03 --- /dev/null +++ b/templates/fedora-19/http/ks.cfg @@ -0,0 +1,50 @@ +install +cdrom +lang en_US.UTF-8 +keyboard us +network --bootproto=dhcp +rootpw --iscrypted $1$damlkd,f$UC/u5pUts5QiU3ow.CSso/ +firewall --disabled +authconfig --enableshadow --passalgo=sha512 +selinux --disabled +timezone UTC +bootloader --location=mbr +text +skipx +zerombr +clearpart --all --initlabel +part /boot --fstype=ext4 --size=500 +part pv.2 --grow --size=500 +volgroup vg_vagrant --pesize=32768 pv.2 +logvol / --fstype=ext4 --name=lv_root --vgname=vg_vagrant --size=1024 --grow +logvol swap --fstype=swap --name=lv_swap --vgname=vg_vagrant --size=528 --grow --maxsize=1056 +bootloader --location=mbr --append="norhgb biosdevname=0" +auth --useshadow --enablemd5 +firstboot --disabled +reboot + +%packages +@Core +bzip2 +gcc +kernel-devel +kernel-headers +openssl-devel +readline-devel +tar +wget +zlib-devel +%end + +%post +# update root certs +wget -O/etc/pki/tls/certs/ca-bundle.crt http://curl.haxx.se/ca/cacert.pem +# vagrant +groupadd vagrant +useradd vagrant -g vagrant -G wheel -u 900 +echo "vagrant" | passwd --stdin vagrant +# sudo +echo 'Defaults:vagrant !requiretty' > /etc/sudoers.d/vagrant +echo '%vagrant ALL=(ALL) NOPASSWD: ALL' >> /etc/sudoers.d/vagrant +chmod 440 /etc/sudoers.d/vagrant +%end diff --git a/templates/fedora-19/scripts/cleanup.sh b/templates/fedora-19/scripts/cleanup.sh new file mode 100644 index 000000000..a4d82c900 --- /dev/null +++ b/templates/fedora-19/scripts/cleanup.sh @@ -0,0 +1,4 @@ +#!/bin/bash -eux +yum -y erase gtk2 libX11 hicolor-icon-theme freetype +yum -y clean all +rm -f /tmp/chef*rpm diff --git a/templates/fedora-19/scripts/minimize.sh b/templates/fedora-19/scripts/minimize.sh new file mode 100644 index 000000000..3846a1d65 --- /dev/null +++ b/templates/fedora-19/scripts/minimize.sh @@ -0,0 +1,4 @@ +#!/bin/bash -eux + +dd if=/dev/zero of=/EMPTY bs=1M +rm -f /EMPTY diff --git a/templates/fedora-19/scripts/sshd.sh b/templates/fedora-19/scripts/sshd.sh new file mode 100644 index 000000000..c6e4f20a6 --- /dev/null +++ b/templates/fedora-19/scripts/sshd.sh @@ -0,0 +1,3 @@ +#!/bin/bash -eux + +echo "UseDNS no" >> /etc/ssh/sshd_config diff --git a/templates/fedora-19/scripts/vagrant.sh b/templates/fedora-19/scripts/vagrant.sh new file mode 100644 index 000000000..72dd2f444 --- /dev/null +++ b/templates/fedora-19/scripts/vagrant.sh @@ -0,0 +1,33 @@ +#!/bin/bash -eux + +if [ -f /home/vagrant/.vbox_version ]; then + mkdir /tmp/vbox + VER=$(cat /home/vagrant/.vbox_version) + mount -o loop VBoxGuestAdditions_$VER.iso /tmp/vbox + sh /tmp/vbox/VBoxLinuxAdditions.run + umount /tmp/vbox + rmdir /tmp/vbox + rm *.iso +fi + +if [ -f /home/vagrant/.vmfusion_version ]; then + #Set Linux-specific paths and ISO filename + home_dir="/home/vagrant" + iso_name="linux.iso" + mount_point="/tmp/vmware-tools" + #Run install, unmount ISO and remove it + mkdir ${mount_point} + cd ${home_dir} + /bin/mount -o loop ${iso_name} ${mount_point} + tar zxf ${mount_point}/*.tar.gz && cd vmware-tools-distrib && ./vmware-install.pl --default + /bin/umount ${mount_point} + /bin/rm -rf ${home_dir}/${iso_name} ${home_dir}/vmware-tools-distrib + rmdir ${mount_point} +fi + +mkdir /home/vagrant/.ssh +wget --no-check-certificate \ + 'https://github.com/mitchellh/vagrant/raw/master/keys/vagrant.pub' \ + -O /home/vagrant/.ssh/authorized_keys +chown -R vagrant /home/vagrant/.ssh +chmod -R go-rwsx /home/vagrant/.ssh diff --git a/templates/fedora-19/template.json b/templates/fedora-19/template.json new file mode 100644 index 000000000..47b080612 --- /dev/null +++ b/templates/fedora-19/template.json @@ -0,0 +1,88 @@ +{ + "provisioners": [ + { + "type": "shell", + "scripts": [ + "scripts/vagrant.sh", + "scripts/sshd.sh", + "scripts/cleanup.sh", + "scripts/minimize.sh" + ], + "override": { + "virtualbox": { + "execute_command": "echo 'vagrant'|sudo -S sh '{{.Path}}'" + }, + "vmware": { + "execute_command": "echo 'vagrant'|sudo -S sh '{{.Path}}'" + } + } + } + ], + "builders": [ + { + "type": "virtualbox", + "boot_command": [ + "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/ks.cfg<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "guest_os_type": "Fedora_64", + "http_directory": "http", + "iso_checksum": "638d69c23621d5befc714bcd66b0611e", + "iso_checksum_type": "md5", + "iso_url": "http://mirrors.kernel.org/fedora/releases/19/Fedora/x86_64/iso/Fedora-19-x86_64-DVD.iso", + "ssh_username": "vagrant", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_wait_timeout": "10000s", + "shutdown_command": "echo '/sbin/halt -h -p' > shutdown.sh; echo 'vagrant'|sudo -S sh 'shutdown.sh'", + "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "virtualbox_version_file": ".vbox_version", + "vboxmanage": [ + [ + "modifyvm", + "{{.Name}}", + "--memory", + "512" + ], + [ + "modifyvm", + "{{.Name}}", + "--cpus", + "1" + ] + ], + "iso_md5": "638d69c23621d5befc714bcd66b0611e" + }, + { + "type": "vmware", + "boot_command": [ + "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/ks.cfg<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "guest_os_type": "fedora-64", + "http_directory": "http", + "iso_checksum": "638d69c23621d5befc714bcd66b0611e", + "iso_checksum_type": "md5", + "iso_url": "http://mirrors.kernel.org/fedora/releases/19/Fedora/x86_64/iso/Fedora-19-x86_64-DVD.iso", + "ssh_username": "vagrant", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_wait_timeout": "10000s", + "shutdown_command": "echo '/sbin/halt -h -p' > shutdown.sh; echo 'vagrant'|sudo -S sh 'shutdown.sh'", + "vmx_data": { + "memsize": "512", + "numvcpus": "1", + "cpuid.coresPerSocket": "1" + }, + "iso_md5": "638d69c23621d5befc714bcd66b0611e" + } + ], + "post-provisioner": [ + { + "type": "vagrant", + "output": "fedora-19-{{.Provisioner}}.box" + } + ] +} \ No newline at end of file diff --git a/templates/sles-11-sp2-i386/http/autoinst.xml b/templates/sles-11-sp2-i386/http/autoinst.xml new file mode 100644 index 000000000..8773e8fb6 --- /dev/null +++ b/templates/sles-11-sp2-i386/http/autoinst.xml @@ -0,0 +1,2569 @@ +<?xml version="1.0"?> +<!DOCTYPE profile> +<profile xmlns="http://www.suse.com/1.0/yast2ns" xmlns:config="http://www.suse.com/1.0/configns"> + <add-on> + <add_on_products config:type="list"> + <listentry> + <media_url><![CDATA[http://demeter.uni-regensburg.de/SLE11SP2-SDK-x86/DVD1/]]></media_url> + <product>sle-sdk</product> + <product_dir>/</product_dir> + </listentry> + </add_on_products> + </add-on> + <bootloader> + <device_map config:type="list"> + <device_map_entry> + <firmware>hd0</firmware> + <linux>/dev/sda</linux> + </device_map_entry> + </device_map> + <global> + <activate>true</activate> + <boot_root>true</boot_root> + <default>SUSE Linux Enterprise Server 11 SP2 - 3.0.13-0.27</default> + <generic_mbr>true</generic_mbr> + <gfxmenu>/boot/message</gfxmenu> + <lines_cache_id>2</lines_cache_id> + <timeout config:type="integer">8</timeout> + </global> + <initrd_modules config:type="list"> + <initrd_module> + <module>ahci</module> + </initrd_module> + <initrd_module> + <module>ata_piix</module> + </initrd_module> + <initrd_module> + <module>ata_generic</module> + </initrd_module> + <initrd_module> + <module>jbd</module> + </initrd_module> + <initrd_module> + <module>mbcache</module> + </initrd_module> + <initrd_module> + <module>ext3</module> + </initrd_module> + </initrd_modules> + <loader_type>grub</loader_type> + <sections config:type="list"> + <section> + <append>resume=/dev/sda1 splash=silent crashkernel=128M-:64M showopts</append> + <image>(hd0,1)/boot/vmlinuz-3.0.13-0.27-default</image> + <initial>1</initial> + <initrd>(hd0,1)/boot/initrd-3.0.13-0.27-default</initrd> + <lines_cache_id>0</lines_cache_id> + <name>SUSE Linux Enterprise Server 11 SP2 - 3.0.13-0.27</name> + <original_name>linux</original_name> + <root>/dev/sda2</root> + <type>image</type> + <vgamode>0x314</vgamode> + </section> + <section> + <append>showopts ide=nodma apm=off noresume edd=off powersaved=off nohz=off highres=off processor.max_cstate=1 nomodeset x11failsafe</append> + <image>(hd0,1)/boot/vmlinuz-3.0.13-0.27-default</image> + <initrd>(hd0,1)/boot/initrd-3.0.13-0.27-default</initrd> + <lines_cache_id>1</lines_cache_id> + <name>Failsafe -- SUSE Linux Enterprise Server 11 SP2 - 3.0.13-0.27</name> + <original_name>failsafe</original_name> + <root>/dev/sda2</root> + <type>image</type> + <vgamode>0x314</vgamode> + </section> + </sections> + </bootloader> + <ca_mgm> + <CAName>YaST_Default_CA</CAName> + <ca_commonName>YaST Default CA (vagrant-sles-11sp2-x86)</ca_commonName> + <country>US</country> + <locality></locality> + <organisation></organisation> + <organisationUnit></organisationUnit> + <password>ENTER PASSWORD HERE</password> + <server_commonName>vagrant-sles-11sp2-x86.vagrantup.com</server_commonName> + <server_email>postmaster@vagrantup.com</server_email> + <state></state> + <takeLocalServerName config:type="boolean">false</takeLocalServerName> + </ca_mgm> + <deploy_image> + <image_installation config:type="boolean">false</image_installation> + </deploy_image> + <general> + <ask-list config:type="list"/> + <mode> + <confirm config:type="boolean">false</confirm> + </mode> + <mouse> + <id>none</id> + </mouse> + <proposals config:type="list"/> + <signature-handling> + <accept_file_without_checksum config:type="boolean">true</accept_file_without_checksum> + <accept_non_trusted_gpg_key config:type="boolean">true</accept_non_trusted_gpg_key> + <accept_unknown_gpg_key config:type="boolean">true</accept_unknown_gpg_key> + <accept_unsigned_file config:type="boolean">true</accept_unsigned_file> + <accept_verification_failed config:type="boolean">false</accept_verification_failed> + <import_gpg_key config:type="boolean">true</import_gpg_key> + </signature-handling> + <storage/> + </general> + <groups config:type="list"> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>100</gid> + <group_password>x</group_password> + <groupname>users</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>19</gid> + <group_password>x</group_password> + <groupname>floppy</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>1</gid> + <group_password>x</group_password> + <groupname>bin</groupname> + <userlist>daemon</userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>41</gid> + <group_password>x</group_password> + <groupname>xok</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>65533</gid> + <group_password>x</group_password> + <groupname>nobody</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>43</gid> + <group_password>x</group_password> + <groupname>modem</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>5</gid> + <group_password>x</group_password> + <groupname>tty</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>7</gid> + <group_password>x</group_password> + <groupname>lp</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>104</gid> + <group_password>!</group_password> + <groupname>uuidd</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>51</gid> + <group_password>!</group_password> + <groupname>postfix</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>112</gid> + <group_password>!</group_password> + <groupname>gdm</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>65534</gid> + <group_password>x</group_password> + <groupname>nogroup</groupname> + <userlist>nobody</userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>101</gid> + <group_password>!</group_password> + <groupname>messagebus</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>59</gid> + <group_password>!</group_password> + <groupname>maildrop</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>33</gid> + <group_password>x</group_password> + <groupname>video</groupname> + <userlist>vagrant</userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>3</gid> + <group_password>x</group_password> + <groupname>sys</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>15</gid> + <group_password>x</group_password> + <groupname>shadow</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>20</gid> + <group_password>x</group_password> + <groupname>cdrom</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>21</gid> + <group_password>x</group_password> + <groupname>console</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>42</gid> + <group_password>x</group_password> + <groupname>trusted</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>102</gid> + <group_password>!</group_password> + <groupname>haldaemon</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>106</gid> + <group_password>!</group_password> + <groupname>puppet</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>16</gid> + <group_password>x</group_password> + <groupname>dialout</groupname> + <userlist>vagrant</userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>107</gid> + <group_password>!</group_password> + <groupname>polkituser</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>10</gid> + <group_password>x</group_password> + <groupname>wheel</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>109</gid> + <group_password>!</group_password> + <groupname>pulse</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>8</gid> + <group_password>x</group_password> + <groupname>www</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>40</gid> + <group_password>x</group_password> + <groupname>games</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>6</gid> + <group_password>x</group_password> + <groupname>disk</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>17</gid> + <group_password>x</group_password> + <groupname>audio</groupname> + <userlist>pulse</userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>111</gid> + <group_password>!</group_password> + <groupname>suse-ncc</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>49</gid> + <group_password>x</group_password> + <groupname>ftp</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>103</gid> + <group_password>!</group_password> + <groupname>tape</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>25</gid> + <group_password>!</group_password> + <groupname>at</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>9</gid> + <group_password>x</group_password> + <groupname>kmem</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>32</gid> + <group_password>x</group_password> + <groupname>public</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>12</gid> + <group_password>x</group_password> + <groupname>mail</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>0</gid> + <group_password>x</group_password> + <groupname>root</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>2</gid> + <group_password>x</group_password> + <groupname>daemon</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>105</gid> + <group_password>!</group_password> + <groupname>sfcb</groupname> + <userlist>root</userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>108</gid> + <group_password>!</group_password> + <groupname>ntp</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>14</gid> + <group_password>x</group_password> + <groupname>uucp</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>110</gid> + <group_password>!</group_password> + <groupname>pulse-access</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>71</gid> + <group_password>!</group_password> + <groupname>ntadmin</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>62</gid> + <group_password>x</group_password> + <groupname>man</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>22</gid> + <group_password>x</group_password> + <groupname>utmp</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>13</gid> + <group_password>x</group_password> + <groupname>news</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>65</gid> + <group_password>!</group_password> + <groupname>sshd</groupname> + <userlist></userlist> + </group> + </groups> + <host> + <hosts config:type="list"> + <hosts_entry> + <host_address>127.0.0.1</host_address> + <names config:type="list"> + <name>localhost</name> + </names> + </hosts_entry> + <hosts_entry> + <host_address>::1</host_address> + <names config:type="list"> + <name>localhost ipv6-localhost ipv6-loopback</name> + </names> + </hosts_entry> + <hosts_entry> + <host_address>fe00::0</host_address> + <names config:type="list"> + <name>ipv6-localnet</name> + </names> + </hosts_entry> + <hosts_entry> + <host_address>ff00::0</host_address> + <names config:type="list"> + <name>ipv6-mcastprefix</name> + </names> + </hosts_entry> + <hosts_entry> + <host_address>ff02::1</host_address> + <names config:type="list"> + <name>ipv6-allnodes</name> + </names> + </hosts_entry> + <hosts_entry> + <host_address>ff02::2</host_address> + <names config:type="list"> + <name>ipv6-allrouters</name> + </names> + </hosts_entry> + <hosts_entry> + <host_address>ff02::3</host_address> + <names config:type="list"> + <name>ipv6-allhosts</name> + </names> + </hosts_entry> + </hosts> + </host> + <login_settings/> + <networking> + <dhcp_options> + <dhclient_client_id></dhclient_client_id> + <dhclient_hostname_option>AUTO</dhclient_hostname_option> + </dhcp_options> + <dns> + <dhcp_hostname config:type="boolean">false</dhcp_hostname> + <domain>vagrantup.com</domain> + <hostname>vagrant-sles-11sp2-x86</hostname> + <resolv_conf_policy>auto</resolv_conf_policy> + <searchlist config:type="list"> + <search>vagrantup.com</search> + </searchlist> + <write_hostname config:type="boolean">true</write_hostname> + </dns> + <interfaces config:type="list"> + <interface> + <bootproto>dhcp</bootproto> + <device>eth0</device> + <name>82540EM Gigabit Ethernet Controller</name> + <startmode>auto</startmode> + <usercontrol>no</usercontrol> + </interface> + </interfaces> + <managed config:type="boolean">false</managed> + <net-udev config:type="list"> + <rule> + <name>eth0</name> + <rule>KERNELS</rule> + <value>0000:00:03.0</value> + </rule> + </net-udev> + <routing> + <ip_forward config:type="boolean">false</ip_forward> + </routing> + </networking> + <partitioning config:type="list"> + <drive> + <device>/dev/sda</device> + <initialize config:type="boolean">true</initialize> + <partitions config:type="list"> + <partition> + <create config:type="boolean">true</create> + <crypt_fs config:type="boolean">false</crypt_fs> + <filesystem config:type="symbol">swap</filesystem> + <format config:type="boolean">true</format> + <fstopt>defaults</fstopt> + <loop_fs config:type="boolean">false</loop_fs> + <mount>swap</mount> + <mountby config:type="symbol">device</mountby> + <partition_id config:type="integer">130</partition_id> + <partition_nr config:type="integer">1</partition_nr> + <raid_options/> + <resize config:type="boolean">false</resize> + <size>1561492992</size> + </partition> + <partition> + <create config:type="boolean">true</create> + <crypt_fs config:type="boolean">false</crypt_fs> + <filesystem config:type="symbol">ext3</filesystem> + <format config:type="boolean">true</format> + <fstopt>acl,user_xattr</fstopt> + <loop_fs config:type="boolean">false</loop_fs> + <mount>/</mount> + <mountby config:type="symbol">device</mountby> + <partition_id config:type="integer">131</partition_id> + <partition_nr config:type="integer">2</partition_nr> + <raid_options/> + <resize config:type="boolean">false</resize> + <size>19895844352</size> + </partition> + </partitions> + <pesize></pesize> + <type config:type="symbol">CT_DISK</type> + <use>all</use> + </drive> + </partitioning> + <report> + <errors> + <log config:type="boolean">true</log> + <show config:type="boolean">true</show> + <timeout config:type="integer">0</timeout> + </errors> + <messages> + <log config:type="boolean">true</log> + <show config:type="boolean">true</show> + <timeout config:type="integer">0</timeout> + </messages> + <warnings> + <log config:type="boolean">true</log> + <show config:type="boolean">true</show> + <timeout config:type="integer">0</timeout> + </warnings> + <yesno_messages> + <log config:type="boolean">true</log> + <show config:type="boolean">true</show> + <timeout config:type="integer">0</timeout> + </yesno_messages> + </report> + <software> + + <packages config:type="list"> + <package>desktop-translations</package> + <package>gconf2-branding-SLES</package> + <package>libproxy0-config-gnome</package> + <package>sle-sdk-release</package> + <package>sle-sdk-release-SDK</package> + <package>sles-manuals_en</package> + <package>yast2-trans-en_US</package> + </packages> + <patterns config:type="list"> + <pattern>Basis-Devel</pattern> + <pattern>Minimal</pattern> + <pattern>apparmor</pattern> + <pattern>base</pattern> + <pattern>sdk_kernel</pattern> + </patterns> + <remove-packages config:type="list"> + <package>3ddiag</package> + <package>CASA</package> + <package>CASA-devel</package> + <package>CASA_auth_token_client</package> + <package>CASA_auth_token_client-devel</package> + <package>ConsoleKit-devel</package> + <package>ConsoleKit-x11</package> + <package>DirectFB-devel</package> + <package>FastCGI</package> + <package>IlmBase</package> + <package>IlmBase-devel</package> + <package>ImageMagick</package> + <package>ImageMagick-devel</package> + <package>LibVNCServer</package> + <package>LibVNCServer-devel</package> + <package>Mesa</package> + <package>Mesa-devel</package> + <package>ModemManager</package> + <package>Modules</package> + <package>NetworkManager</package> + <package>NetworkManager-devel</package> + <package>NetworkManager-glib</package> + <package>NetworkManager-gnome</package> + <package>NetworkManager-kde4</package> + <package>NetworkManager-kde4-lang</package> + <package>NetworkManager-kde4-libs</package> + <package>OpenEXR</package> + <package>OpenEXR-devel</package> + <package>OpenIPMI-devel</package> + <package>PackageKit</package> + <package>PackageKit-devel</package> + <package>PackageKit-lang</package> + <package>PolicyKit-devel</package> + <package>PolicyKit-gnome</package> + <package>PolicyKit-gnome-devel</package> + <package>PolicyKit-gnome-libs</package> + <package>SDL-devel</package> + <package>SDL_net</package> + <package>SDL_net-devel</package> + <package>TeX-Guy</package> + <package>TeX-Guy-devel</package> + <package>VFlib3</package> + <package>VFlib3-devel</package> + <package>WindowMaker</package> + <package>WindowMaker-devel</package> + <package>a2ps</package> + <package>aalib</package> + <package>aalib-devel</package> + <package>akonadi-runtime</package> + <package>akregator</package> + <package>alsa-devel</package> + <package>alsa-firmware</package> + <package>alsa-plugins-pulse</package> + <package>alsa-tools</package> + <package>alsa-tools-devel</package> + <package>anthy</package> + <package>anthy-devel</package> + <package>antlr</package> + <package>apache2</package> + <package>apache2-devel</package> + <package>apache2-mod_perl</package> + <package>apache2-mod_perl-devel</package> + <package>apache2-prefork</package> + <package>apache2-utils</package> + <package>apache2-worker</package> + <package>apparmor-profile-editor</package> + <package>art-sharp2</package> + <package>arts</package> + <package>arts-devel</package> + <package>aspell-devel</package> + <package>at-spi</package> + <package>at-spi-devel</package> + <package>at-spi-lang</package> + <package>atk-devel</package> + <package>audiofile</package> + <package>audiofile-devel</package> + <package>audit-devel</package> + <package>augeas-lenses</package> + <package>automoc4</package> + <package>avahi</package> + <package>avahi-compat-howl-devel</package> + <package>avahi-compat-mDNSResponder-devel</package> + <package>avahi-lang</package> + <package>babl-0_0</package> + <package>banshee-1</package> + <package>banshee-1-backend-engine-gstreamer</package> + <package>banshee-1-backend-platform-gnome</package> + <package>banshee-1-backend-platform-unix</package> + <package>banshee-1-devel</package> + <package>banshee-1-extensions-default</package> + <package>banshee-1-lang</package> + <package>beagle-devel</package> + <package>bind-devel</package> + <package>binutils-devel</package> + <package>bluez</package> + <package>bluez-devel</package> + <package>boo</package> + <package>boo-devel</package> + <package>boost-devel</package> + <package>bootsplash-branding-SLED</package> + <package>cairo-devel</package> + <package>cairomm</package> + <package>cairomm-devel</package> + <package>canna</package> + <package>canna-devel</package> + <package>canna-libs</package> + <package>cannadic</package> + <package>capi4linux</package> + <package>capi4linux-devel</package> + <package>cdk</package> + <package>cdk-devel</package> + <package>cdrdao</package> + <package>chasen</package> + <package>chasen-devel</package> + <package>check</package> + <package>check-devel</package> + <package>chmlib</package> + <package>chmlib-devel</package> + <package>cim-schema</package> + <package>clucene-core</package> + <package>clucene-core-devel</package> + <package>cmake</package> + <package>compiz</package> + <package>compiz-branding-SLE</package> + <package>compiz-devel</package> + <package>compiz-gnome</package> + <package>coolkey-devel</package> + <package>cracklib-devel</package> + <package>crash-devel</package> + <package>crimson</package> + <package>cscope</package> + <package>cups</package> + <package>cups-devel</package> + <package>cvsps</package> + <package>cyrus-imapd-devel</package> + <package>cyrus-sasl-crammd5</package> + <package>cyrus-sasl-devel</package> + <package>dante</package> + <package>dante-devel</package> + <package>db1</package> + <package>db1-devel</package> + <package>db43</package> + <package>db43-devel</package> + <package>dbus-1-devel</package> + <package>dbus-1-glib-devel</package> + <package>dbus-1-python-devel</package> + <package>dbus-1-qt3</package> + <package>dbus-1-qt3-devel</package> + <package>dbus-1-x11</package> + <package>dejagnu</package> + <package>dejavu</package> + <package>desktop-data-openSUSE</package> + <package>desktop-file-utils</package> + <package>devhelp</package> + <package>devhelp-devel</package> + <package>devhelp-lang</package> + <package>device-mapper-devel</package> + <package>dhcp</package> + <package>dhcp-client</package> + <package>dhcp-devel</package> + <package>diffstat</package> + <package>dmapi-devel</package> + <package>dnsmasq</package> + <package>docbook-xsl-stylesheets</package> + <package>docbook_4</package> + <package>doxygen</package> + <package>dvd+rw-tools</package> + <package>e2fsprogs-devel</package> + <package>emacs</package> + <package>emacs-nox</package> + <package>emacs-x11</package> + <package>enchant</package> + <package>enchant-devel</package> + <package>enscript</package> + <package>eog</package> + <package>eog-devel</package> + <package>eog-lang</package> + <package>espeak</package> + <package>evince</package> + <package>evince-devel</package> + <package>evince-lang</package> + <package>evoldap2-devel</package> + <package>evolution</package> + <package>evolution-data-server</package> + <package>evolution-data-server-devel</package> + <package>evolution-data-server-lang</package> + <package>evolution-devel</package> + <package>evolution-lang</package> + <package>expect-devel</package> + <package>facter</package> + <package>fam</package> + <package>fam-devel</package> + <package>farsight</package> + <package>farsight-devel</package> + <package>festival</package> + <package>festival-devel</package> + <package>fftw</package> + <package>fftw-devel</package> + <package>fftw-mpi</package> + <package>fftw-mpi-devel</package> + <package>fftw-threads</package> + <package>fftw-threads-devel</package> + <package>fftw3</package> + <package>fftw3-devel</package> + <package>fftw3-threads</package> + <package>fftw3-threads-devel</package> + <package>file-devel</package> + <package>fileshareset</package> + <package>finch</package> + <package>finch-devel</package> + <package>flac-devel</package> + <package>fltk</package> + <package>fltk-devel</package> + <package>fontconfig-devel</package> + <package>fonts-config</package> + <package>foomatic-filters</package> + <package>freeglut</package> + <package>freeglut-devel</package> + <package>freeradius-client-devel</package> + <package>freeradius-client-libs</package> + <package>freeradius-server-devel</package> + <package>freeradius-server-libs</package> + <package>freetype</package> + <package>freetype2-devel</package> + <package>fribidi</package> + <package>fribidi-devel</package> + <package>ft2demos</package> + <package>fuse-devel</package> + <package>fwnn-devel</package> + <package>fxload</package> + <package>gcc-gij</package> + <package>gcc-java</package> + <package>gcc43-gij</package> + <package>gcc43-java</package> + <package>gconf-sharp2</package> + <package>gconf2-devel</package> + <package>gconfmm</package> + <package>gconfmm-devel</package> + <package>gd</package> + <package>gd-devel</package> + <package>gdbm-32bit</package> + <package>gdk-pixbuf</package> + <package>gdk-pixbuf-devel</package> + <package>gegl-0_0</package> + <package>gettext-tools</package> + <package>gfxboot-branding-SLED</package> + <package>gfxboot-devel</package> + <package>ggz</package> + <package>ggz-client-libs</package> + <package>ggz-client-libs-devel</package> + <package>ggz-client-libs-lang</package> + <package>ghex</package> + <package>ghex-devel</package> + <package>ghex-lang</package> + <package>ghostscript-devel</package> + <package>ghostscript-fonts-other</package> + <package>ghostscript-fonts-std</package> + <package>ghostscript-ijs-devel</package> + <package>ghostscript-library</package> + <package>ghostscript-omni</package> + <package>ghostscript-x11</package> + <package>giflib-devel</package> + <package>gimp</package> + <package>gimp-branding-SLED</package> + <package>gimp-devel</package> + <package>gimp-lang</package> + <package>gimp-plugins-python</package> + <package>git</package> + <package>git-arch</package> + <package>git-core</package> + <package>git-cvs</package> + <package>git-daemon</package> + <package>git-email</package> + <package>git-gui</package> + <package>git-svn</package> + <package>git-web</package> + <package>gitk</package> + <package>gjdoc</package> + <package>glade-sharp2</package> + <package>glade3</package> + <package>glade3-lang</package> + <package>glib</package> + <package>glib-devel</package> + <package>glib-sharp2</package> + <package>glib2-devel</package> + <package>glibmm2</package> + <package>glibmm2-devel</package> + <package>glitz</package> + <package>glitz-devel</package> + <package>gltt</package> + <package>gltt-devel</package> + <package>gmime-2_4-devel</package> + <package>gmime-devel</package> + <package>gmp-devel</package> + <package>gnet</package> + <package>gnet-devel</package> + <package>gnokii</package> + <package>gnokii-devel</package> + <package>gnokii-smsd</package> + <package>gnome-certauth-devel</package> + <package>gnome-control-center</package> + <package>gnome-control-center-devel</package> + <package>gnome-control-center-lang</package> + <package>gnome-desktop</package> + <package>gnome-desktop-devel</package> + <package>gnome-desktop-lang</package> + <package>gnome-doc-utils</package> + <package>gnome-doc-utils-devel</package> + <package>gnome-doc-utils-lang</package> + <package>gnome-keyring-devel</package> + <package>gnome-keyring-sharp</package> + <package>gnome-keyring-sharp-devel</package> + <package>gnome-libs</package> + <package>gnome-libs-devel</package> + <package>gnome-mag</package> + <package>gnome-mag-devel</package> + <package>gnome-mag-lang</package> + <package>gnome-main-menu</package> + <package>gnome-main-menu-lang</package> + <package>gnome-media</package> + <package>gnome-media-devel</package> + <package>gnome-media-lang</package> + <package>gnome-menus</package> + <package>gnome-menus-branding-SLED</package> + <package>gnome-menus-devel</package> + <package>gnome-menus-lang</package> + <package>gnome-mount</package> + <package>gnome-mount-lang</package> + <package>gnome-panel</package> + <package>gnome-panel-devel</package> + <package>gnome-panel-lang</package> + <package>gnome-pilot</package> + <package>gnome-pilot-devel</package> + <package>gnome-pilot-lang</package> + <package>gnome-settings-daemon</package> + <package>gnome-settings-daemon-devel</package> + <package>gnome-settings-daemon-lang</package> + <package>gnome-sharp2</package> + <package>gnome-speech</package> + <package>gnome-speech-devel</package> + <package>gnome-themes</package> + <package>gnome-utils</package> + <package>gnome-utils-devel</package> + <package>gnome-utils-lang</package> + <package>gnome-vfs-sharp2</package> + <package>gnome-vfs2</package> + <package>gnome-vfs2-devel</package> + <package>gnome-vfs2-lang</package> + <package>gnome-vfsmm</package> + <package>gnome-vfsmm-devel</package> + <package>gnopernicus</package> + <package>gnopernicus-devel</package> + <package>gnopernicus-lang</package> + <package>gnutls</package> + <package>goffice</package> + <package>goffice-devel</package> + <package>goffice-lang</package> + <package>goocanvas</package> + <package>goocanvas-devel</package> + <package>goocanvas-lang</package> + <package>goom2k4</package> + <package>goom2k4-devel</package> + <package>graphviz</package> + <package>graphviz-devel</package> + <package>graphviz-gd</package> + <package>graphviz-gnome</package> + <package>gstreamer-0_10</package> + <package>gstreamer-0_10-devel</package> + <package>gstreamer-0_10-lang</package> + <package>gstreamer-0_10-plugins-base</package> + <package>gstreamer-0_10-plugins-base-devel</package> + <package>gstreamer-0_10-plugins-base-lang</package> + <package>gstreamer-0_10-plugins-good</package> + <package>gstreamer-0_10-plugins-good-lang</package> + <package>gstreamer-0_10-utils</package> + <package>gstreamer-utils</package> + <package>gtk</package> + <package>gtk-devel</package> + <package>gtk-lang</package> + <package>gtk-sharp2</package> + <package>gtk-vnc-devel</package> + <package>gtk2-devel</package> + <package>gtkglext</package> + <package>gtkglext-devel</package> + <package>gtkhtml2</package> + <package>gtkhtml2-devel</package> + <package>gtkhtml2-lang</package> + <package>gtkhtml314-sharp</package> + <package>gtkmm2</package> + <package>gtkmm2-devel</package> + <package>gtksourceview-devel</package> + <package>gtksourceview-lang</package> + <package>gtksourceview18</package> + <package>gtksourceview18-devel</package> + <package>gtkspell</package> + <package>gtkspell-devel</package> + <package>gtkspell-lang</package> + <package>gucharmap</package> + <package>gucharmap-devel</package> + <package>gucharmap-lang</package> + <package>guile</package> + <package>guile-devel</package> + <package>gutenprint</package> + <package>gutenprint-devel</package> + <package>gvfs-devel</package> + <package>gxmhtml</package> + <package>hal-devel</package> + <package>hal-palm</package> + <package>htdig</package> + <package>htdig-devel</package> + <package>hunspell</package> + <package>hunspell-devel</package> + <package>hunspell-tools</package> + <package>hwinfo-devel</package> + <package>i4l-base</package> + <package>icewm</package> + <package>icewm-lite</package> + <package>id3lib</package> + <package>id3lib-devel</package> + <package>imap-devel</package> + <package>imap-lib</package> + <package>imlib</package> + <package>imlib-devel</package> + <package>imlib2</package> + <package>imlib2-devel</package> + <package>indent</package> + <package>info2html</package> + <package>inn</package> + <package>inn-devel</package> + <package>intltool</package> + <package>ipadic</package> + <package>iptables-devel</package> + <package>iso-codes</package> + <package>iso-codes-devel</package> + <package>iso_ent</package> + <package>ispell</package> + <package>ispell-american</package> + <package>ispell-brazilian</package> + <package>ispell-british</package> + <package>ispell-czech</package> + <package>ispell-danish</package> + <package>ispell-finnish</package> + <package>ispell-french</package> + <package>ispell-german</package> + <package>ispell-hungarian</package> + <package>ispell-italian</package> + <package>ispell-ngerman</package> + <package>ispell-norsk</package> + <package>ispell-polish</package> + <package>ispell-portuguese</package> + <package>ispell-russian</package> + <package>ispell-slovak</package> + <package>ispell-spanish</package> + <package>ispell-swedish</package> + <package>itcl-devel</package> + <package>java-1_4_2-ibm</package> + <package>java-1_4_2-ibm-devel</package> + <package>java-1_5_0-gcj-compat</package> + <package>java-1_5_0-gcj-compat-devel</package> + <package>java-1_6_0-ibm</package> + <package>java-1_6_0-ibm-devel</package> + <package>joe</package> + <package>jpackage-utils</package> + <package>k3b</package> + <package>k3b-devel</package> + <package>k3b-lang</package> + <package>kaddressbook</package> + <package>kalarm</package> + <package>kde-susetranslations</package> + <package>kde4-filesystem</package> + <package>kde4-kgreeter-plugins</package> + <package>kdebase3</package> + <package>kdebase3-devel</package> + <package>kdebase3-runtime</package> + <package>kdebase4-SLED</package> + <package>kdebase4-SLED-lang</package> + <package>kdebase4-runtime</package> + <package>kdebase4-runtime-branding-SLED</package> + <package>kdebase4-workspace</package> + <package>kdebase4-workspace-branding-SLED</package> + <package>kdebase4-workspace-devel</package> + <package>kdebase4-workspace-ksysguardd</package> + <package>kdelibs3</package> + <package>kdelibs3-arts</package> + <package>kdelibs3-default-style</package> + <package>kdelibs3-devel</package> + <package>kdelibs3-doc</package> + <package>kdelibs4</package> + <package>kdelibs4-branding-SLED</package> + <package>kdelibs4-core</package> + <package>kdelibs4-doc</package> + <package>kdemultimedia3-arts</package> + <package>kdepim3</package> + <package>kdepim4</package> + <package>kdepim4-devel</package> + <package>kdepimlibs4</package> + <package>kdialog</package> + <package>kdm</package> + <package>kdm-branding-SLED</package> + <package>kernel-docs</package> + <package>kernel-syms</package> + <package>kernel-trace-devel</package> + <package>kernel-xen-devel</package> + <package>keyutils-devel</package> + <package>kio_sysinfo</package> + <package>kio_sysinfo-branding-SLED</package> + <package>kmail</package> + <package>knode</package> + <package>kontact</package> + <package>korganizer</package> + <package>kpilot</package> + <package>krb5-devel</package> + <package>ksh-devel</package> + <package>ktorrent</package> + <package>ktorrent-devel</package> + <package>ktorrent-lang</package> + <package>kwin</package> + <package>ladspa-devel</package> + <package>lib3ds-1-3</package> + <package>lib3ds-devel</package> + <package>libFLAC++6</package> + <package>libFLAC8</package> + <package>libHX-devel</package> + <package>libMagick++-devel</package> + <package>libMagick++1</package> + <package>libMagickWand1</package> + <package>libQtWebKit-devel</package> + <package>libQtWebKit4</package> + <package>libXerces-c-devel</package> + <package>libXerces-c28</package> + <package>libXiterm</package> + <package>libXiterm-devel</package> + <package>libacl-devel</package> + <package>libadns-devel</package> + <package>libadns1</package> + <package>libakode</package> + <package>libakode-devel</package> + <package>libakonadi4</package> + <package>libakonadiprotocolinternals-devel</package> + <package>libakonadiprotocolinternals1</package> + <package>libao</package> + <package>libao-devel</package> + <package>libapparmor-devel</package> + <package>libapr-util1</package> + <package>libapr-util1-devel</package> + <package>libapr1</package> + <package>libapr1-devel</package> + <package>libarchive-devel</package> + <package>libart_lgpl</package> + <package>libart_lgpl-devel</package> + <package>libassuan-devel</package> + <package>libatomic-ops-devel</package> + <package>libattr-devel</package> + <package>libavahi-core5</package> + <package>libavahi-devel</package> + <package>libavahi-glib-devel</package> + <package>libavahi-gobject-devel</package> + <package>libavahi-gobject0</package> + <package>libavahi-ui0</package> + <package>libavc1394-0</package> + <package>libavc1394-devel</package> + <package>libbabl-0_0-0</package> + <package>libbeagle-devel</package> + <package>libbeagle-python</package> + <package>libbeagle1</package> + <package>libbitmask-devel</package> + <package>libbitmask1</package> + <package>libblkid-devel</package> + <package>libblocxx-devel</package> + <package>libbonobo</package> + <package>libbonobo-devel</package> + <package>libbonobo-lang</package> + <package>libbonoboui</package> + <package>libbonoboui-devel</package> + <package>libbonoboui-lang</package> + <package>libboost_date_time1_36_0</package> + <package>libboost_filesystem1_36_0</package> + <package>libboost_graph1_36_0</package> + <package>libboost_iostreams1_36_0</package> + <package>libboost_math1_36_0</package> + <package>libboost_mpi1_36_0</package> + <package>libboost_program_options1_36_0</package> + <package>libboost_python1_36_0</package> + <package>libboost_serialization1_36_0</package> + <package>libboost_signals1_36_0</package> + <package>libboost_system1_36_0</package> + <package>libboost_test1_36_0</package> + <package>libboost_thread1_36_0</package> + <package>libboost_wave1_36_0</package> + <package>libbotan-1_6_4</package> + <package>libbotan-devel</package> + <package>libbtctl</package> + <package>libbtctl-devel</package> + <package>libbtctl-lang</package> + <package>libbtctl4</package> + <package>libbz2-devel</package> + <package>libcaca</package> + <package>libcaca-devel</package> + <package>libcanberra-gtk</package> + <package>libcanberra-gtk0</package> + <package>libcanberra0</package> + <package>libcap-devel</package> + <package>libcap-ng0</package> + <package>libcdda_interface0</package> + <package>libcdda_paranoia0</package> + <package>libcddb-devel</package> + <package>libcddb2</package> + <package>libcdio++0</package> + <package>libcdio-devel</package> + <package>libcgroup-devel</package> + <package>libcgroup1</package> + <package>libchewing</package> + <package>libchewing-devel</package> + <package>libcmpiutil</package> + <package>libcmpiutil-devel</package> + <package>libcolorblind0</package> + <package>libcom_err-devel</package> + <package>libcompizconfig</package> + <package>libcompizconfig-devel</package> + <package>libcppunit-1_12-0</package> + <package>libcppunit-devel</package> + <package>libcpuset-devel</package> + <package>libcpuset1</package> + <package>libcroco</package> + <package>libcroco-0_6-3</package> + <package>libcroco-devel</package> + <package>libcryptsetup-devel</package> + <package>libcsync-devel</package> + <package>libcsync0</package> + <package>libcurl-devel</package> + <package>libdaemon-devel</package> + <package>libdaemon0</package> + <package>libdatrie-devel</package> + <package>libdatrie0</package> + <package>libdb-4_5-32bit</package> + <package>libdb-4_5-devel</package> + <package>libdbus-1-qt3-0</package> + <package>libdbus-1-qt3-0-devel</package> + <package>libdc1394-22</package> + <package>libdc1394-devel</package> + <package>libdc1394_control12</package> + <package>libdc1394_control12-devel</package> + <package>libdhcp6client-1_0-2</package> + <package>libdhcp6client-devel</package> + <package>libdigikam-devel</package> + <package>libdiscid1</package> + <package>libdjvulibre-devel</package> + <package>libdjvulibre21</package> + <package>libdmxview-devel</package> + <package>libdmxview0</package> + <package>libdnet-devel</package> + <package>libdnet1</package> + <package>libdns_sd</package> + <package>libdrm</package> + <package>libdrm-devel</package> + <package>libdv-devel</package> + <package>libdv4</package> + <package>libdvdread4</package> + <package>libdw-devel</package> + <package>libebl-devel</package> + <package>libedit-devel</package> + <package>libedit0</package> + <package>libelf-devel</package> + <package>libenchant1</package> + <package>libesd-devel</package> + <package>libesd0</package> + <package>libesmtp-devel</package> + <package>libevoldap-2_4-2</package> + <package>libevtlog-devel</package> + <package>libevtlog0</package> + <package>libexempi-devel</package> + <package>libexempi3</package> + <package>libexif-devel</package> + <package>libexiv2-4</package> + <package>libexiv2-devel</package> + <package>libexpat-devel</package> + <package>libext2fs-devel</package> + <package>libfarsight-0_1-3</package> + <package>libffi-devel</package> + <package>libffi43</package> + <package>libffi43-devel</package> + <package>libflaim-devel</package> + <package>libfprint-devel</package> + <package>libfreebl3</package> + <package>libfreebob</package> + <package>libfreebob-devel</package> + <package>libgadu</package> + <package>libgadu-devel</package> + <package>libgail-gnome</package> + <package>libgail-gnome-devel</package> + <package>libgcj-devel</package> + <package>libgcj43</package> + <package>libgcj43-devel</package> + <package>libgcj43-jar</package> + <package>libgcj_bc43</package> + <package>libgcrypt-devel</package> + <package>libgda-3_0-3</package> + <package>libgda-3_0-devel</package> + <package>libgdiplus0</package> + <package>libgegl-0_0-0</package> + <package>libgeoclue0</package> + <package>libgfortran46</package> + <package>libggz2</package> + <package>libggz2-devel</package> + <package>libgimpprint</package> + <package>libgimpprint-devel</package> + <package>libglade2</package> + <package>libglade2-devel</package> + <package>libglademm</package> + <package>libglademm-2_4-1</package> + <package>libglademm-devel</package> + <package>libgladeui-1-9</package> + <package>libgladeui-1_0-devel</package> + <package>libgmime-2_0-3</package> + <package>libgmime-2_4-2</package> + <package>libgmm++-devel</package> + <package>libgnome</package> + <package>libgnome-certauth0</package> + <package>libgnome-desktop-2-11</package> + <package>libgnome-devel</package> + <package>libgnome-lang</package> + <package>libgnome-menu2</package> + <package>libgnome-window-settings1</package> + <package>libgnomecanvas</package> + <package>libgnomecanvas-devel</package> + <package>libgnomecanvas-lang</package> + <package>libgnomecanvasmm</package> + <package>libgnomecanvasmm-devel</package> + <package>libgnomecups</package> + <package>libgnomecups-devel</package> + <package>libgnomecups-lang</package> + <package>libgnomedb</package> + <package>libgnomedb-devel</package> + <package>libgnomedb-lang</package> + <package>libgnomekbd</package> + <package>libgnomekbd-devel</package> + <package>libgnomekbd-lang</package> + <package>libgnomeprint</package> + <package>libgnomeprint-devel</package> + <package>libgnomeprint-lang</package> + <package>libgnomeprintui</package> + <package>libgnomeprintui-devel</package> + <package>libgnomeprintui-lang</package> + <package>libgnomesu</package> + <package>libgnomesu-devel</package> + <package>libgnomesu-lang</package> + <package>libgnomesu0</package> + <package>libgnomeui</package> + <package>libgnomeui-devel</package> + <package>libgnomeui-lang</package> + <package>libgnomevfsmm-2_6-1</package> + <package>libgnutls-devel</package> + <package>libgnutls-extra-devel</package> + <package>libgnutls-extra26</package> + <package>libgoocanvas3</package> + <package>libgpg-error-devel</package> + <package>libgpgme-devel</package> + <package>libgphoto2-devel</package> + <package>libgpod-devel</package> + <package>libgsf</package> + <package>libgsf-1-114</package> + <package>libgsf-devel</package> + <package>libgsf-gnome</package> + <package>libgsm-devel</package> + <package>libgsm1</package> + <package>libgssglue-devel</package> + <package>libgstapp-0_10-0</package> + <package>libgstinterfaces-0_10-0</package> + <package>libgstreamer-0_10-0</package> + <package>libgtk-vnc-1_0-0</package> + <package>libgtkhtml</package> + <package>libgtkhtml-devel</package> + <package>libgtksourceview-2_0-0</package> + <package>libgtop</package> + <package>libgtop-2_0-7</package> + <package>libgtop-devel</package> + <package>libgtop-lang</package> + <package>libgudev-1_0-0</package> + <package>libgweather</package> + <package>libgweather-devel</package> + <package>libgweather-lang</package> + <package>libgweather1</package> + <package>libhangul</package> + <package>libhangul-devel</package> + <package>libhowl0</package> + <package>libical-devel</package> + <package>libical0</package> + <package>libicu-devel</package> + <package>libid3tag</package> + <package>libid3tag-devel</package> + <package>libidl-devel</package> + <package>libidn-devel</package> + <package>libiec61883</package> + <package>libiec61883-devel</package> + <package>libieee1284</package> + <package>libiniparser-devel</package> + <package>libiniparser0</package> + <package>libiptcdata</package> + <package>libiptcdata-devel</package> + <package>libiptcdata0</package> + <package>libiso9660-5</package> + <package>libiterm</package> + <package>libiterm-devel</package> + <package>libjack-devel</package> + <package>libjack0</package> + <package>libjasper</package> + <package>libjasper-devel</package> + <package>libjingle-0_3-0</package> + <package>libjingle-devel</package> + <package>libjpeg-devel</package> + <package>libkcal</package> + <package>libkcal-devel</package> + <package>libkcal2</package> + <package>libkcddb4</package> + <package>libkcddb4-devel</package> + <package>libkcompactdisc4</package> + <package>libkcompactdisc4-devel</package> + <package>libkdcraw3</package> + <package>libkdcraw3-devel</package> + <package>libkdcraw3-lang</package> + <package>libkde4</package> + <package>libkde4-devel</package> + <package>libkdecore4</package> + <package>libkdecore4-devel</package> + <package>libkdepim4</package> + <package>libkdepim4-devel</package> + <package>libkdepimlibs4</package> + <package>libkdepimlibs4-devel</package> + <package>libkexiv2-3</package> + <package>libkexiv2-3-devel</package> + <package>libkexiv2-7</package> + <package>libkipi-devel</package> + <package>libkipi6</package> + <package>libkmime-devel</package> + <package>libkmime2</package> + <package>libknotificationitem-1-1</package> + <package>libkonq-devel</package> + <package>libkonq5</package> + <package>libksba-devel</package> + <package>libktnef-devel</package> + <package>libktnef1</package> + <package>liblazy-devel</package> + <package>liblazy1</package> + <package>liblcms-devel</package> + <package>libldapcpp-devel</package> + <package>liblog4c-devel</package> + <package>liblog4c3</package> + <package>libloudmouth-1-0</package> + <package>liblpsolve55</package> + <package>liblua5_1</package> + <package>libmalaga-devel</package> + <package>libmalaga7</package> + <package>libmcrypt</package> + <package>libmcrypt-devel</package> + <package>libmikmod</package> + <package>libmikmod-devel</package> + <package>libmm-devel</package> + <package>libmm14</package> + <package>libmng-devel</package> + <package>libmpcdec-devel</package> + <package>libmpcdec5</package> + <package>libmspack-devel</package> + <package>libmtp-devel</package> + <package>libmtp8</package> + <package>libmusicbrainz-devel</package> + <package>libmusicbrainz3-6</package> + <package>libmusicbrainz3-devel</package> + <package>libmusicbrainz4</package> + <package>libmysqlclient-devel</package> + <package>libmysqlclient15</package> + <package>libmysqlclient_r15</package> + <package>libneon-devel</package> + <package>libneon27</package> + <package>libnetapi-devel</package> + <package>libnetapi0</package> + <package>libnetcontrol0</package> + <package>libnetpbm-devel</package> + <package>libnetpbm10</package> + <package>libnewt0_52</package> + <package>libnjb</package> + <package>libnjb-devel</package> + <package>libnjb5</package> + <package>libnl-devel</package> + <package>libnotify</package> + <package>libnotify-devel</package> + <package>libnotify1</package> + <package>libnscd-devel</package> + <package>libnsssharedhelper0</package> + <package>libnuma-devel</package> + <package>libofa-devel</package> + <package>libofa0</package> + <package>libogg-devel</package> + <package>libogg0</package> + <package>liboil</package> + <package>liboil-devel</package> + <package>libopenbabel-devel</package> + <package>libopenbabel3</package> + <package>libopencdk-devel</package> + <package>libopencdk10</package> + <package>libopenraw-devel</package> + <package>libopenraw1</package> + <package>libopenssl-devel</package> + <package>libopensync</package> + <package>libopensync-devel</package> + <package>libopensync-plugin-evolution2</package> + <package>libopensync-plugin-evolution2-devel</package> + <package>libopensync-plugin-palm</package> + <package>libopensync-plugin-palm-devel</package> + <package>liborc-0_4-0</package> + <package>libosip2</package> + <package>libosip2-devel</package> + <package>libotf</package> + <package>libotf-devel</package> + <package>libotr-devel</package> + <package>libotr2</package> + <package>libp11-1</package> + <package>libp11-devel</package> + <package>libpackagekit-glib10</package> + <package>libpackagekit-glib10-devel</package> + <package>libpangomm-1_4-1</package> + <package>libpcap-devel</package> + <package>libpciaccess0</package> + <package>libpciaccess0-devel</package> + <package>libphonon4</package> + <package>libpisock-devel</package> + <package>libpisock9</package> + <package>libpisync-devel</package> + <package>libpisync1</package> + <package>libpixman-1-0-devel</package> + <package>libpkcs11-helper1</package> + <package>libpng-devel</package> + <package>libpolkit-qt0</package> + <package>libpoppler-devel</package> + <package>libpoppler-glib-devel</package> + <package>libpoppler-glib4</package> + <package>libpoppler-qt2</package> + <package>libpoppler-qt3-devel</package> + <package>libpoppler-qt4-3</package> + <package>libpoppler-qt4-devel</package> + <package>libpoppler5</package> + <package>libpst4</package> + <package>libpt2</package> + <package>libpt2-devel</package> + <package>libpulse-browse0</package> + <package>libpulse-devel</package> + <package>libpulse-mainloop-glib0</package> + <package>libpulse0</package> + <package>libpurple</package> + <package>libpurple-devel</package> + <package>libpurple-lang</package> + <package>libqca2</package> + <package>libqca2-devel</package> + <package>libqdialogsolver1</package> + <package>libqdialogsolver1-devel</package> + <package>libqimageblitz-devel</package> + <package>libqimageblitz4</package> + <package>libqscintilla-devel</package> + <package>libqscintilla2-5</package> + <package>libqt4</package> + <package>libqt4-devel</package> + <package>libqt4-qt3support</package> + <package>libqt4-sql</package> + <package>libqt4-sql-mysql</package> + <package>libqt4-sql-postgresql</package> + <package>libqt4-sql-sqlite</package> + <package>libqt4-sql-unixODBC</package> + <package>libqt4-x11</package> + <package>libqtpod-devel</package> + <package>libqtpod0</package> + <package>libquadmath46</package> + <package>libquicktime</package> + <package>libquicktime-devel</package> + <package>libraptor-devel</package> + <package>libraptor1</package> + <package>librasqal-devel</package> + <package>librasqal1</package> + <package>libraw1394-11</package> + <package>libraw1394-8</package> + <package>libraw1394-devel</package> + <package>libredland-devel</package> + <package>libredland0</package> + <package>libreiserfs-devel</package> + <package>libreoffice</package> + <package>libreoffice-base</package> + <package>libreoffice-branding-SLED</package> + <package>libreoffice-branding-upstream</package> + <package>libreoffice-calc</package> + <package>libreoffice-icon-themes</package> + <package>libreoffice-impress</package> + <package>libreoffice-sdk</package> + <package>libreoffice-writer</package> + <package>librsvg</package> + <package>librsvg-devel</package> + <package>libsamplerate</package> + <package>libsamplerate-devel</package> + <package>libsatsolver-devel</package> + <package>libsblim-cmpiutil1</package> + <package>libselinux-devel</package> + <package>libsemanage-devel</package> + <package>libsemanage1</package> + <package>libsensors3-devel</package> + <package>libsensors4</package> + <package>libsepol-devel</package> + <package>libsexy</package> + <package>libsexy-devel</package> + <package>libshout-devel</package> + <package>libshout3</package> + <package>libsidplay1</package> + <package>libsidplay1-devel</package> + <package>libsigc++2</package> + <package>libsigc++2-devel</package> + <package>libslab-lang</package> + <package>libslab0</package> + <package>libsmbclient-devel</package> + <package>libsmbios-devel</package> + <package>libsmbsharemodes-devel</package> + <package>libsmbsharemodes0</package> + <package>libsndfile</package> + <package>libsndfile-devel</package> + <package>libsoprano-devel</package> + <package>libsoprano4</package> + <package>libsoup-devel</package> + <package>libspectre-devel</package> + <package>libspectre1</package> + <package>libspeex</package> + <package>libssh2-devel</package> + <package>libstrigi0</package> + <package>libstroke</package> + <package>libstroke-devel</package> + <package>libsyncml-devel</package> + <package>libsyncml0</package> + <package>libtalloc-devel</package> + <package>libtasn1-devel</package> + <package>libtdb-devel</package> + <package>libtelepathy</package> + <package>libtelepathy-devel</package> + <package>libtelepathy-glib0</package> + <package>libtheora-devel</package> + <package>libtheora0</package> + <package>libtidy</package> + <package>libtidy-devel</package> + <package>libtiff-devel</package> + <package>libtirpc-devel</package> + <package>libtomoe-gtk0</package> + <package>libtspi1</package> + <package>libtunepimp</package> + <package>libtunepimp-devel</package> + <package>libtunepimp5</package> + <package>libudev-devel</package> + <package>libudf0</package> + <package>libunique-1_0-0</package> + <package>libunwind</package> + <package>libunwind-devel</package> + <package>libupsclient1</package> + <package>libusb-devel</package> + <package>libusbpp-0_1-4</package> + <package>libustr-1_0-1</package> + <package>libustr-devel</package> + <package>libuuid-devel</package> + <package>libvirt-client</package> + <package>libvirt-devel</package> + <package>libvisual</package> + <package>libvisual-devel</package> + <package>libvoikko-devel</package> + <package>libvoikko1</package> + <package>libvorbis</package> + <package>libvorbis-devel</package> + <package>libwavpack1</package> + <package>libwbclient-devel</package> + <package>libwbxml2-0</package> + <package>libwbxml2-devel</package> + <package>libwebkit-1_0-1</package> + <package>libwebkit-1_0-2</package> + <package>libwebkit-devel</package> + <package>libwebkit-lang</package> + <package>libwmf</package> + <package>libwmf-devel</package> + <package>libwmf-gnome</package> + <package>libwnck</package> + <package>libwnck-1-22</package> + <package>libwnck-devel</package> + <package>libwnck-lang</package> + <package>libwpd-0_8-8</package> + <package>libwpd-devel</package> + <package>libwpg-0_1-1</package> + <package>libwpg-devel</package> + <package>libwps-0_1-1</package> + <package>libwps-devel</package> + <package>libwsman-devel</package> + <package>libwsman1</package> + <package>libxcrypt-devel</package> + <package>libxine-devel</package> + <package>libxine1</package> + <package>libxklavier-devel</package> + <package>libxklavier15</package> + <package>libxml2-devel</package> + <package>libxslt-devel</package> + <package>libyajl1</package> + <package>libzio-devel</package> + <package>libzip-devel</package> + <package>libzip1</package> + <package>libzvbi0</package> + <package>libzypp-devel</package> + <package>limal-apparmor-notifications</package> + <package>limal-apparmor-notifications-devel</package> + <package>limal-ca-mgm-devel</package> + <package>limal-devel</package> + <package>limal-devtools</package> + <package>limal-nfs-server-devel</package> + <package>linux-atm-devel</package> + <package>linux-atm-lib</package> + <package>lksctp-tools</package> + <package>lksctp-tools-devel</package> + <package>loudmouth-devel</package> + <package>lua</package> + <package>lua-devel</package> + <package>lzo-devel</package> + <package>m17n-db</package> + <package>m17n-lib</package> + <package>m17n-lib-devel</package> + <package>malaga-suomi</package> + <package>meanwhile</package> + <package>meanwhile-devel</package> + <package>metacity</package> + <package>metacity-devel</package> + <package>metacity-lang</package> + <package>mhash</package> + <package>mhash-devel</package> + <package>misc-console-font</package> + <package>mono-addins</package> + <package>mono-basic</package> + <package>mono-core</package> + <package>mono-data</package> + <package>mono-data-oracle</package> + <package>mono-data-sqlite</package> + <package>mono-devel</package> + <package>mono-extras</package> + <package>mono-jscript</package> + <package>mono-tools</package> + <package>mono-wcf</package> + <package>mono-web</package> + <package>mono-winforms</package> + <package>mono-zeroconf</package> + <package>mono-zeroconf-provider-avahi</package> + <package>monodevelop</package> + <package>monodoc-core</package> + <package>mozilla-nspr</package> + <package>mozilla-nspr-devel</package> + <package>mozilla-nss</package> + <package>mozilla-nss-devel</package> + <package>mozilla-xulrunner192</package> + <package>mozilla-xulrunner192-gnome</package> + <package>mpfr-devel</package> + <package>mpi-selector</package> + <package>mpich</package> + <package>mpich-devel</package> + <package>mysql</package> + <package>mysql-client</package> + <package>nagios</package> + <package>nagios-devel</package> + <package>nagios-www</package> + <package>nant</package> + <package>nautilus</package> + <package>nautilus-cd-burner</package> + <package>nautilus-cd-burner-devel</package> + <package>nautilus-cd-burner-lang</package> + <package>nautilus-devel</package> + <package>nautilus-lang</package> + <package>ndesk-dbus</package> + <package>ndesk-dbus-glib</package> + <package>ndesk-dbus-glib-devel</package> + <package>net-snmp</package> + <package>net-snmp-devel</package> + <package>netatalk</package> + <package>netatalk-devel</package> + <package>netcat-openbsd</package> + <package>newt</package> + <package>newt-devel</package> + <package>newt-static</package> + <package>nfsidmap-devel</package> + <package>notification-daemon</package> + <package>notification-daemon-lang</package> + <package>notify-sharp</package> + <package>nss-mdns</package> + <package>nss-shared-helper-devel</package> + <package>nut</package> + <package>nut-classic</package> + <package>nut-devel</package> + <package>opal</package> + <package>opal-devel</package> + <package>openCryptoki</package> + <package>openCryptoki-64bit</package> + <package>openCryptoki-devel</package> + <package>openct-devel</package> + <package>openhpi</package> + <package>openhpi-daemon</package> + <package>openhpi-devel</package> + <package>openjade</package> + <package>openjade-devel</package> + <package>openldap2-devel</package> + <package>openmotif-devel</package> + <package>openmotif-libs</package> + <package>openmpi</package> + <package>openobex-devel</package> + <package>openobex-glib-devel</package> + <package>opensc-devel</package> + <package>openslp-devel</package> + <package>opensp</package> + <package>opensp-devel</package> + <package>openwsman-client</package> + <package>openwsman-server</package> + <package>orbit</package> + <package>orbit-devel</package> + <package>orbit2-devel</package> + <package>oxygen-icon-theme</package> + <package>oxygen-icon-theme-scalable</package> + <package>ozerocdoff</package> + <package>pam-devel</package> + <package>pango-devel</package> + <package>pangomm-devel</package> + <package>parted-devel</package> + <package>patchutils</package> + <package>pciutils-devel</package> + <package>pcre-devel</package> + <package>pcsc-acr38</package> + <package>pcsc-acr38-devel</package> + <package>pcsc-lite-devel</package> + <package>perl-32bit</package> + <package>perl-Crypt-OpenSSL-RSA</package> + <package>perl-Mail-DKIM</package> + <package>perl-MailTools</package> + <package>perl-Net-DNS</package> + <package>perl-Net-IP</package> + <package>perl-NetAddr-IP</package> + <package>perl-SNMP</package> + <package>perl-Tie-IxHash</package> + <package>perl-Tk</package> + <package>perl-Tk-devel</package> + <package>perl-spamassassin</package> + <package>phonon</package> + <package>phonon-backend-gstreamer-0_10</package> + <package>phonon-devel</package> + <package>php5</package> + <package>php5-ctype</package> + <package>php5-devel</package> + <package>php5-dom</package> + <package>php5-hash</package> + <package>php5-iconv</package> + <package>php5-json</package> + <package>php5-pdo</package> + <package>php5-sqlite</package> + <package>php5-suhosin</package> + <package>php5-tokenizer</package> + <package>php5-xmlreader</package> + <package>php5-xmlwriter</package> + <package>php53</package> + <package>php53-ctype</package> + <package>php53-dom</package> + <package>php53-iconv</package> + <package>php53-json</package> + <package>php53-tokenizer</package> + <package>php53-xmlreader</package> + <package>php53-xmlwriter</package> + <package>pidgin</package> + <package>pidgin-devel</package> + <package>pilot-link</package> + <package>pkcs11-helper</package> + <package>pkcs11-helper-devel</package> + <package>planner</package> + <package>planner-devel</package> + <package>planner-lang</package> + <package>plasma-addons</package> + <package>plasma-theme-aya</package> + <package>plasmoid-networkmanagement</package> + <package>plasmoid-quickaccess</package> + <package>plotutils</package> + <package>poppler-data</package> + <package>poppler-tools</package> + <package>popt-devel</package> + <package>portmap</package> + <package>postfix-devel</package> + <package>postgresql-devel</package> + <package>postgresql-libs</package> + <package>ppp-devel</package> + <package>ppp-userpass</package> + <package>pstoedit</package> + <package>pstoedit-devel</package> + <package>pulseaudio</package> + <package>pulseaudio-esound-compat</package> + <package>pulseaudio-lang</package> + <package>puppet</package> + <package>python-cairo</package> + <package>python-cairo-devel</package> + <package>python-devel</package> + <package>python-gnome</package> + <package>python-gnome-devel</package> + <package>python-gobject2</package> + <package>python-gobject2-devel</package> + <package>python-gtk</package> + <package>python-gtk-devel</package> + <package>python-gtkglext</package> + <package>python-gtkglext-devel</package> + <package>python-gtksourceview</package> + <package>python-gtksourceview-devel</package> + <package>python-numeric</package> + <package>python-numpy</package> + <package>python-orbit</package> + <package>python-orbit-devel</package> + <package>pyxml</package> + <package>qt3</package> + <package>qt3-devel</package> + <package>quagga</package> + <package>quagga-devel</package> + <package>quilt</package> + <package>raptor</package> + <package>rarian</package> + <package>rarian-devel</package> + <package>re2c</package> + <package>readline-devel</package> + <package>recode-devel</package> + <package>rpm-devel</package> + <package>rrdtool</package> + <package>rrdtool-devel</package> + <package>rsyslog</package> + <package>ruby</package> + <package>rubygems</package> + <package>ruby-devel</package> + <package>ruby-doc-html</package> + <package>ruby-doc-ri</package> + <package>ruby-examples</package> + <package>ruby-fcgi</package> + <package>ruby-mysql</package> + <package>ruby-selinux</package> + <package>ruby-test-suite</package> + <package>ruby-tk</package> + <package>sablot</package> + <package>sablot-devel</package> + <package>samba-devel</package> + <package>sane-backends</package> + <package>sane-frontends</package> + <package>sax2-libsax</package> + <package>sax2-libsax-devel</package> + <package>sax2-libsax-perl</package> + <package>sax2-tools</package> + <package>sblim-cmpi-base</package> + <package>sblim-cmpi-base-devel</package> + <package>sblim-cmpi-devel</package> + <package>sblim-cmpiutil-devel</package> + <package>sblim-indication_helper</package> + <package>sblim-sfcb</package> + <package>sblim-sfcc</package> + <package>sblim-sfcc-devel</package> + <package>scim</package> + <package>scim-devel</package> + <package>scpm-devel</package> + <package>scrollkeeper</package> + <package>scrollkeeper-lang</package> + <package>seahorse</package> + <package>seahorse-devel</package> + <package>seahorse-lang</package> + <package>sendmail</package> + <package>sendmail-devel</package> + <package>sg3_utils-devel</package> + <package>sgml-skel</package> + <package>shared-mime-info</package> + <package>silc-toolkit</package> + <package>silc-toolkit-devel</package> + <package>slang</package> + <package>slang-devel</package> + <package>soprano</package> + <package>soprano-backend-redland</package> + <package>spamassassin</package> + <package>speex-devel</package> + <package>splashy-devel</package> + <package>sqlite2</package> + <package>sqlite3-devel</package> + <package>startup-notification</package> + <package>startup-notification-devel</package> + <package>strigi</package> + <package>strigi-devel</package> + <package>subversion</package> + <package>subversion-perl</package> + <package>susehelp</package> + <package>susehelp_cz</package> + <package>susehelp_de</package> + <package>susehelp_en</package> + <package>susehelp_es</package> + <package>susehelp_fr</package> + <package>susehelp_hu</package> + <package>susehelp_it</package> + <package>swig</package> + <package>syslogd</package> + <package>t1lib</package> + <package>t1lib-devel</package> + <package>taglib</package> + <package>taglib-devel</package> + <package>taglib-sharp</package> + <package>tango-icon-theme</package> + <package>tcl-devel</package> + <package>tcpd-devel</package> + <package>telepathy-glib-devel</package> + <package>telepathy-mission-control</package> + <package>telepathy-mission-control-devel</package> + <package>texlive-bin-devel</package> + <package>texlive-devel</package> + <package>tk-devel</package> + <package>tla</package> + <package>tn5250</package> + <package>tn5250-devel</package> + <package>tomoe</package> + <package>tomoe-devel</package> + <package>tomoe-gtk</package> + <package>tomoe-gtk-devel</package> + <package>tomoe-gtk-lang</package> + <package>totem-pl-parser</package> + <package>totem-pl-parser-devel</package> + <package>totem-pl-parser-lang</package> + <package>trousers</package> + <package>trousers-devel</package> + <package>tsclient</package> + <package>tsclient-devel</package> + <package>tsclient-lang</package> + <package>uim</package> + <package>uim-devel</package> + <package>unixODBC</package> + <package>unixODBC-devel</package> + <package>unsermake</package> + <package>update-desktop-files</package> + <package>usb_modeswitch</package> + <package>usb_modeswitch-data</package> + <package>valgrind</package> + <package>valgrind-devel</package> + <package>vte</package> + <package>vte-devel</package> + <package>vte-lang</package> + <package>wdiff</package> + <package>webkit-sharp</package> + <package>wireshark</package> + <package>wireshark-devel</package> + <package>wodim-devel</package> + <package>wordcut</package> + <package>wordcut-devel</package> + <package>words</package> + <package>wpa_supplicant</package> + <package>wvstreams</package> + <package>wvstreams-devel</package> + <package>wxGTK-compat</package> + <package>wxGTK-devel</package> + <package>wxGTK-gl</package> + <package>x11-input-wacom</package> + <package>x11-input-wacom-devel</package> + <package>x11-input-wacom-tools</package> + <package>xalan-j2</package> + <package>xaw3d-devel</package> + <package>xbase</package> + <package>xbase-devel</package> + <package>xdelta</package> + <package>xdelta-devel</package> + <package>xdg-menu</package> + <package>xen-devel</package> + <package>xen-libs</package> + <package>xerces-j2</package> + <package>xerces-j2-bootstrap</package> + <package>xerces-j2-xml-apis</package> + <package>xfsprogs-devel</package> + <package>xml-commons-apis-bootstrap</package> + <package>xml-commons-resolver-bootstrap</package> + <package>xml-commons-which-bootstrap</package> + <package>xmlcharent</package> + <package>xorg-x11</package> + <package>xorg-x11-devel</package> + <package>xorg-x11-fonts</package> + <package>xorg-x11-fonts-core</package> + <package>xorg-x11-fonts-devel</package> + <package>xorg-x11-libICE-devel</package> + <package>xorg-x11-libSM-devel</package> + <package>xorg-x11-libX11-devel</package> + <package>xorg-x11-libXau-devel</package> + <package>xorg-x11-libXdmcp-devel</package> + <package>xorg-x11-libXext-devel</package> + <package>xorg-x11-libXfixes-devel</package> + <package>xorg-x11-libXmu-devel</package> + <package>xorg-x11-libXp-devel</package> + <package>xorg-x11-libXpm-devel</package> + <package>xorg-x11-libXprintUtil-devel</package> + <package>xorg-x11-libXrender-devel</package> + <package>xorg-x11-libXt-devel</package> + <package>xorg-x11-libXv-devel</package> + <package>xorg-x11-libfontenc-devel</package> + <package>xorg-x11-libxcb-devel</package> + <package>xorg-x11-libxkbfile-devel</package> + <package>xorg-x11-proto-devel</package> + <package>xorg-x11-server</package> + <package>xorg-x11-util-devel</package> + <package>xorg-x11-xauth</package> + <package>xorg-x11-xtrans-devel</package> + <package>xosd</package> + <package>xosd-devel</package> + <package>xsp</package> + <package>xterm</package> + <package>xz-devel</package> + <package>yast2-core-devel</package> + <package>yast2-devtools</package> + <package>yast2-gtk</package> + <package>yast2-libyui-devel</package> + <package>yast2-ncurses-devel</package> + <package>yast2-qt</package> + <package>yast2-qt-devel</package> + <package>yast2-qt-pkg</package> + <package>yast2-storage-devel</package> + <package>yast2-ycp-ui-bindings-devel</package> + <package>yelp</package> + <package>yelp-lang</package> + <package>zenity</package> + <package>zenity-lang</package> + <package>zlib-devel</package> + <package>zsh</package> + <package>zvbi-devel</package> + </remove-packages> + + </software> + <user_defaults> + <expire></expire> + <group>100</group> + <groups>video,dialout</groups> + <home>/home</home> + <inactive>-1</inactive> + <shell>/bin/bash</shell> + <skel>/etc/skel</skel> + <umask>022</umask> + </user_defaults> + <users config:type="list"> + <user> + <encrypted config:type="boolean">true</encrypted> + <fullname>vagrant</fullname> + <gid>100</gid> + <home>/home/vagrant</home> + <password_settings> + <expire></expire> + <flag></flag> + <inact></inact> + <max>99999</max> + <min>0</min> + <warn>7</warn> + </password_settings> + <shell>/bin/bash</shell> + <uid>1000</uid> + <user_password>$2y$05$NA1Li9ZKJOLRW5mMTXm6/e5r8dltWS5RpDZpvHrI82aLE00V51tdi</user_password> + <username>vagrant</username> + </user> + <user> + <encrypted config:type="boolean">true</encrypted> + <fullname>Games account</fullname> + <gid>100</gid> + <home>/var/games</home> + <password_settings> + <expire></expire> + <flag></flag> + <inact></inact> + <max></max> + <min></min> + <warn></warn> + </password_settings> + <shell>/bin/bash</shell> + <uid>12</uid> + <user_password>*</user_password> + <username>games</username> + </user> + <user> + <encrypted config:type="boolean">true</encrypted> + <fullname>bin</fullname> + <gid>1</gid> + <home>/bin</home> + <password_settings> + <expire></expire> + <flag></flag> + <inact></inact> + <max></max> + <min></min> + <warn></warn> + </password_settings> + <shell>/bin/bash</shell> + <uid>1</uid> + <user_password>*</user_password> + <username>bin</username> + </user> + <user> + <encrypted config:type="boolean">true</encrypted> + <fullname>nobody</fullname> + <gid>65533</gid> + <home>/var/lib/nobody</home> + <password_settings> + <expire></expire> + <flag></flag> + <inact></inact> + <max></max> + <min></min> + <warn></warn> + </password_settings> + <shell>/bin/bash</shell> + <uid>65534</uid> + <user_password>*</user_password> + <username>nobody</username> + </user> + <user> + <encrypted config:type="boolean">true</encrypted> + <fullname>Printing daemon</fullname> + <gid>7</gid> + <home>/var/spool/lpd</home> + <password_settings> + <expire></expire> + <flag></flag> + <inact></inact> + <max></max> + <min></min> + <warn></warn> + </password_settings> + <shell>/bin/bash</shell> + <uid>4</uid> + <user_password>*</user_password> + <username>lp</username> + </user> + <user> + <encrypted config:type="boolean">true</encrypted> + <fullname>User for uuidd</fullname> + <gid>104</gid> + <home>/var/run/uuidd</home> + <password_settings> + <expire></expire> + <flag></flag> + <inact></inact> + <max>99999</max> + <min>0</min> + <warn>7</warn> + </password_settings> + <shell>/bin/false</shell> + <uid>102</uid> + <user_password>*</user_password> + <username>uuidd</username> + </user> + <user> + <encrypted config:type="boolean">true</encrypted> + <fullname>Postfix Daemon</fullname> + <gid>51</gid> + <home>/var/spool/postfix</home> + <password_settings> + <expire></expire> + <flag></flag> + <inact></inact> + <max>99999</max> + <min>0</min> + <warn>7</warn> + </password_settings> + <shell>/bin/false</shell> + <uid>51</uid> + <user_password>*</user_password> + <username>postfix</username> + </user> + <user> + <encrypted config:type="boolean">true</encrypted> + <fullname>Novell Customer Center User</fullname> + <gid>111</gid> + <home>/var/lib/YaST2/suse-ncc-fakehome</home> + <password_settings> + <expire></expire> + <flag></flag> + <inact></inact> + <max>99999</max> + <min>0</min> + <warn>7</warn> + </password_settings> + <shell>/bin/bash</shell> + <uid>106</uid> + <user_password>*</user_password> + <username>suse-ncc</username> + </user> + <user> + <encrypted config:type="boolean">true</encrypted> + <fullname>FTP account</fullname> + <gid>49</gid> + <home>/srv/ftp</home> + <password_settings> + <expire></expire> + <flag></flag> + <inact></inact> + <max></max> + <min></min> + <warn></warn> + </password_settings> + <shell>/bin/bash</shell> + <uid>40</uid> + <user_password>*</user_password> + <username>ftp</username> + </user> + <user> + <encrypted config:type="boolean">true</encrypted> + <fullname>Gnome Display Manager daemon</fullname> + <gid>112</gid> + <home>/var/lib/gdm</home> + <password_settings> + <expire></expire> + <flag></flag> + <inact></inact> + <max>99999</max> + <min>0</min> + <warn>7</warn> + </password_settings> + <shell>/bin/false</shell> + <uid>107</uid> + <user_password>*</user_password> + <username>gdm</username> + </user> + <user> + <encrypted config:type="boolean">true</encrypted> + <fullname>Batch jobs daemon</fullname> + <gid>25</gid> + <home>/var/spool/atjobs</home> + <password_settings> + <expire></expire> + <flag></flag> + <inact></inact> + <max>99999</max> + <min>0</min> + <warn>7</warn> + </password_settings> + <shell>/bin/bash</shell> + <uid>25</uid> + <user_password>*</user_password> + <username>at</username> + </user> + <user> + <encrypted config:type="boolean">true</encrypted> + <fullname>root</fullname> + <gid>0</gid> + <home>/root</home> + <password_settings> + <expire></expire> + <flag></flag> + <inact></inact> + <max></max> + <min></min> + <warn></warn> + </password_settings> + <shell>/bin/bash</shell> + <uid>0</uid> + <user_password>$2y$05$NA1Li9ZKJOLRW5mMTXm6/e5r8dltWS5RpDZpvHrI82aLE00V51tdi</user_password> + <username>root</username> + </user> + <user> + <encrypted config:type="boolean">true</encrypted> + <fullname>Mailer daemon</fullname> + <gid>12</gid> + <home>/var/spool/clientmqueue</home> + <password_settings> + <expire></expire> + <flag></flag> + <inact></inact> + <max></max> + <min></min> + <warn></warn> + </password_settings> + <shell>/bin/false</shell> + <uid>8</uid> + <user_password>*</user_password> + <username>mail</username> + </user> + <user> + <encrypted config:type="boolean">true</encrypted> + <fullname>Daemon</fullname> + <gid>2</gid> + <home>/sbin</home> + <password_settings> + <expire></expire> + <flag></flag> + <inact></inact> + <max></max> + <min></min> + <warn></warn> + </password_settings> + <shell>/bin/bash</shell> + <uid>2</uid> + <user_password>*</user_password> + <username>daemon</username> + </user> + <user> + <encrypted config:type="boolean">true</encrypted> + <fullname>NTP daemon</fullname> + <gid>108</gid> + <home>/var/lib/ntp</home> + <password_settings> + <expire></expire> + <flag></flag> + <inact></inact> + <max>99999</max> + <min>0</min> + <warn>7</warn> + </password_settings> + <shell>/bin/false</shell> + <uid>74</uid> + <user_password>*</user_password> + <username>ntp</username> + </user> + <user> + <encrypted config:type="boolean">true</encrypted> + <fullname>Unix-to-Unix CoPy system</fullname> + <gid>14</gid> + <home>/etc/uucp</home> + <password_settings> + <expire></expire> + <flag></flag> + <inact></inact> + <max></max> + <min></min> + <warn></warn> + </password_settings> + <shell>/bin/bash</shell> + <uid>10</uid> + <user_password>*</user_password> + <username>uucp</username> + </user> + <user> + <encrypted config:type="boolean">true</encrypted> + <fullname>User for D-Bus</fullname> + <gid>101</gid> + <home>/var/run/dbus</home> + <password_settings> + <expire></expire> + <flag></flag> + <inact></inact> + <max></max> + <min>0</min> + <warn>7</warn> + </password_settings> + <shell>/bin/false</shell> + <uid>100</uid> + <user_password>*</user_password> + <username>messagebus</username> + </user> + <user> + <encrypted config:type="boolean">true</encrypted> + <fullname>User for haldaemon</fullname> + <gid>102</gid> + <home>/var/run/hald</home> + <password_settings> + <expire></expire> + <flag></flag> + <inact></inact> + <max></max> + <min>0</min> + <warn>7</warn> + </password_settings> + <shell>/bin/false</shell> + <uid>101</uid> + <user_password>*</user_password> + <username>haldaemon</username> + </user> + <user> + <encrypted config:type="boolean">true</encrypted> + <fullname>WWW daemon apache</fullname> + <gid>8</gid> + <home>/var/lib/wwwrun</home> + <password_settings> + <expire></expire> + <flag></flag> + <inact></inact> + <max></max> + <min></min> + <warn></warn> + </password_settings> + <shell>/bin/false</shell> + <uid>30</uid> + <user_password>*</user_password> + <username>wwwrun</username> + </user> + <user> + <encrypted config:type="boolean">true</encrypted> + <fullname>Manual pages viewer</fullname> + <gid>62</gid> + <home>/var/cache/man</home> + <password_settings> + <expire></expire> + <flag></flag> + <inact></inact> + <max></max> + <min></min> + <warn></warn> + </password_settings> + <shell>/bin/bash</shell> + <uid>13</uid> + <user_password>*</user_password> + <username>man</username> + </user> + <user> + <encrypted config:type="boolean">true</encrypted> + <fullname>PolicyKit</fullname> + <gid>107</gid> + <home>/var/run/PolicyKit</home> + <password_settings> + <expire></expire> + <flag></flag> + <inact></inact> + <max>99999</max> + <min>0</min> + <warn>7</warn> + </password_settings> + <shell>/bin/false</shell> + <uid>104</uid> + <user_password>*</user_password> + <username>polkituser</username> + </user> + <user> + <encrypted config:type="boolean">true</encrypted> + <fullname>News system</fullname> + <gid>13</gid> + <home>/etc/news</home> + <password_settings> + <expire></expire> + <flag></flag> + <inact></inact> + <max></max> + <min></min> + <warn></warn> + </password_settings> + <shell>/bin/bash</shell> + <uid>9</uid> + <user_password>*</user_password> + <username>news</username> + </user> + <user> + <fullname>SSH daemon</fullname> + <gid>65</gid> + <home>/var/lib/sshd</home> + <shell>/bin/false</shell> + <uid>71</uid> + <username>sshd</username> + </user> + <user> + <encrypted config:type="boolean">true</encrypted> + <fullname>PulseAudio daemon</fullname> + <gid>109</gid> + <home>/var/lib/pulseaudio</home> + <password_settings> + <expire></expire> + <flag></flag> + <inact></inact> + <max>99999</max> + <min>0</min> + <warn>7</warn> + </password_settings> + <shell>/bin/false</shell> + <uid>105</uid> + <user_password>*</user_password> + <username>pulse</username> + </user> + </users> +</profile> diff --git a/templates/sles-11-sp2-i386/scripts/cleanup.sh b/templates/sles-11-sp2-i386/scripts/cleanup.sh new file mode 100644 index 000000000..dcb1d72bc --- /dev/null +++ b/templates/sles-11-sp2-i386/scripts/cleanup.sh @@ -0,0 +1,9 @@ +#!/bin/bash -eux + +# remove zypper locks on removed packages to avoid later dependency problems +zypper --non-interactive rl \* +# zypper --non-interactive remove `rpm -qa virtualbox-guest-*` >/dev/null 2>&1 +# Add an online copy of the SLES DVD1 as a software repository, instead of the mounted DVD +zypper removerepo 'SUSE-Linux-Enterprise-Server-11-SP2 11.2.2-1.234' +zypper addrepo 'http://demeter.uni-regensburg.de/SLES11SP2-x86/DVD1/' 'SLES11SP2-x86 DVD1 Online' +zypper refresh diff --git a/templates/sles-11-sp2-i386/scripts/minimize.sh b/templates/sles-11-sp2-i386/scripts/minimize.sh new file mode 100644 index 000000000..3846a1d65 --- /dev/null +++ b/templates/sles-11-sp2-i386/scripts/minimize.sh @@ -0,0 +1,4 @@ +#!/bin/bash -eux + +dd if=/dev/zero of=/EMPTY bs=1M +rm -f /EMPTY diff --git a/templates/sles-11-sp2-i386/scripts/sshd.sh b/templates/sles-11-sp2-i386/scripts/sshd.sh new file mode 100644 index 000000000..c6e4f20a6 --- /dev/null +++ b/templates/sles-11-sp2-i386/scripts/sshd.sh @@ -0,0 +1,3 @@ +#!/bin/bash -eux + +echo "UseDNS no" >> /etc/ssh/sshd_config diff --git a/templates/sles-11-sp2-i386/scripts/sudoers.sh b/templates/sles-11-sp2-i386/scripts/sudoers.sh new file mode 100644 index 000000000..eb80f3f88 --- /dev/null +++ b/templates/sles-11-sp2-i386/scripts/sudoers.sh @@ -0,0 +1,3 @@ +# update sudoers - can't do this in autoinst.xml +echo -e "\nupdate sudoers ..." +echo -e "vagrant ALL=(ALL) NOPASSWD: ALL\n" >> /etc/sudoers diff --git a/templates/sles-11-sp2-i386/scripts/vagrant.sh b/templates/sles-11-sp2-i386/scripts/vagrant.sh new file mode 100644 index 000000000..72dd2f444 --- /dev/null +++ b/templates/sles-11-sp2-i386/scripts/vagrant.sh @@ -0,0 +1,33 @@ +#!/bin/bash -eux + +if [ -f /home/vagrant/.vbox_version ]; then + mkdir /tmp/vbox + VER=$(cat /home/vagrant/.vbox_version) + mount -o loop VBoxGuestAdditions_$VER.iso /tmp/vbox + sh /tmp/vbox/VBoxLinuxAdditions.run + umount /tmp/vbox + rmdir /tmp/vbox + rm *.iso +fi + +if [ -f /home/vagrant/.vmfusion_version ]; then + #Set Linux-specific paths and ISO filename + home_dir="/home/vagrant" + iso_name="linux.iso" + mount_point="/tmp/vmware-tools" + #Run install, unmount ISO and remove it + mkdir ${mount_point} + cd ${home_dir} + /bin/mount -o loop ${iso_name} ${mount_point} + tar zxf ${mount_point}/*.tar.gz && cd vmware-tools-distrib && ./vmware-install.pl --default + /bin/umount ${mount_point} + /bin/rm -rf ${home_dir}/${iso_name} ${home_dir}/vmware-tools-distrib + rmdir ${mount_point} +fi + +mkdir /home/vagrant/.ssh +wget --no-check-certificate \ + 'https://github.com/mitchellh/vagrant/raw/master/keys/vagrant.pub' \ + -O /home/vagrant/.ssh/authorized_keys +chown -R vagrant /home/vagrant/.ssh +chmod -R go-rwsx /home/vagrant/.ssh diff --git a/templates/sles-11-sp2-i386/template.json b/templates/sles-11-sp2-i386/template.json new file mode 100644 index 000000000..f15163ca6 --- /dev/null +++ b/templates/sles-11-sp2-i386/template.json @@ -0,0 +1,97 @@ +{ + "provisioners": [ + { + "type": "shell", + "scripts": [ + "scripts/vagrant.sh", + "scripts/sshd.sh", + "scripts/sudoers.sh", + "scripts/cleanup.sh", + "scripts/minimize.sh" + ], + "override": { + "virtualbox": { + "execute_command": "echo 'vagrant'|sudo -S sh '{{.Path}}'" + }, + "vmware": { + "execute_command": "echo 'vagrant'|sudo -S sh '{{.Path}}'" + } + } + } + ], + "builders": [ + { + "type": "virtualbox", + "boot_command": [ + "<esc><enter><wait>", + "linux netdevice=eth0 netsetup=dhcp install=cd:/<wait>", + " lang=en_US autoyast=http://{{ .HTTPIP }}:{{ .HTTPPort }}/autoinst.xml<wait>", + " textmode=1<wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "guest_os_type": "OpenSUSE_64", + "http_directory": "http", + "iso_checksum": "a0b34f6237b2b2a6b2174c82b40ed326", + "iso_checksum_type": "md5", + "iso_url": "", + "ssh_username": "vagrant", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_wait_timeout": "10000s", + "shutdown_command": "echo '/sbin/halt -h -p' > shutdown.sh; echo 'vagrant'|sudo -S sh 'shutdown.sh'", + "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "virtualbox_version_file": ".vbox_version", + "vboxmanage": [ + [ + "modifyvm", + "{{.Name}}", + "--memory", + "480" + ], + [ + "modifyvm", + "{{.Name}}", + "--cpus", + "1" + ] + ], + "iso_md5": "a0b34f6237b2b2a6b2174c82b40ed326" + }, + { + "type": "vmware", + "boot_command": [ + "<esc><enter><wait>", + "linux netdevice=eth0 netsetup=dhcp install=cd:/<wait>", + " lang=en_US autoyast=http://{{ .HTTPIP }}:{{ .HTTPPort }}/autoinst.xml<wait>", + " textmode=1<wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "guest_os_type": "opensuse-64", + "http_directory": "http", + "iso_checksum": "a0b34f6237b2b2a6b2174c82b40ed326", + "iso_checksum_type": "md5", + "iso_url": "", + "ssh_username": "vagrant", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_wait_timeout": "10000s", + "shutdown_command": "echo '/sbin/halt -h -p' > shutdown.sh; echo 'vagrant'|sudo -S sh 'shutdown.sh'", + "vmx_data": { + "memsize": "480", + "numvcpus": "1", + "cpuid.coresPerSocket": "1" + }, + "iso_md5": "a0b34f6237b2b2a6b2174c82b40ed326" + } + ], + "post-provisioner": [ + { + "type": "vagrant", + "output": "sles-11-sp2-i386-{{.Provisioner}}.box" + } + ] +} \ No newline at end of file diff --git a/templates/sles-11-sp2/http/autoinst.xml b/templates/sles-11-sp2/http/autoinst.xml new file mode 100644 index 000000000..5b2647b26 --- /dev/null +++ b/templates/sles-11-sp2/http/autoinst.xml @@ -0,0 +1,2569 @@ +<?xml version="1.0"?> +<!DOCTYPE profile> +<profile xmlns="http://www.suse.com/1.0/yast2ns" xmlns:config="http://www.suse.com/1.0/configns"> + <add-on> + <add_on_products config:type="list"> + <listentry> + <media_url><![CDATA[http://demeter.uni-regensburg.de/SLE11SP2-SDK-x64/DVD1/]]></media_url> + <product>sle-sdk</product> + <product_dir>/</product_dir> + </listentry> + </add_on_products> + </add-on> + <bootloader> + <device_map config:type="list"> + <device_map_entry> + <firmware>hd0</firmware> + <linux>/dev/sda</linux> + </device_map_entry> + </device_map> + <global> + <activate>true</activate> + <boot_root>true</boot_root> + <default>SUSE Linux Enterprise Server 11 SP2 - 3.0.13-0.27</default> + <generic_mbr>true</generic_mbr> + <gfxmenu>/boot/message</gfxmenu> + <lines_cache_id>2</lines_cache_id> + <timeout config:type="integer">8</timeout> + </global> + <initrd_modules config:type="list"> + <initrd_module> + <module>ahci</module> + </initrd_module> + <initrd_module> + <module>ata_piix</module> + </initrd_module> + <initrd_module> + <module>ata_generic</module> + </initrd_module> + <initrd_module> + <module>jbd</module> + </initrd_module> + <initrd_module> + <module>mbcache</module> + </initrd_module> + <initrd_module> + <module>ext3</module> + </initrd_module> + </initrd_modules> + <loader_type>grub</loader_type> + <sections config:type="list"> + <section> + <append>resume=/dev/sda1 splash=silent crashkernel=128M-:64M showopts</append> + <image>(hd0,1)/boot/vmlinuz-3.0.13-0.27-default</image> + <initial>1</initial> + <initrd>(hd0,1)/boot/initrd-3.0.13-0.27-default</initrd> + <lines_cache_id>0</lines_cache_id> + <name>SUSE Linux Enterprise Server 11 SP2 - 3.0.13-0.27</name> + <original_name>linux</original_name> + <root>/dev/sda2</root> + <type>image</type> + <vgamode>0x314</vgamode> + </section> + <section> + <append>showopts ide=nodma apm=off noresume edd=off powersaved=off nohz=off highres=off processor.max_cstate=1 nomodeset x11failsafe</append> + <image>(hd0,1)/boot/vmlinuz-3.0.13-0.27-default</image> + <initrd>(hd0,1)/boot/initrd-3.0.13-0.27-default</initrd> + <lines_cache_id>1</lines_cache_id> + <name>Failsafe -- SUSE Linux Enterprise Server 11 SP2 - 3.0.13-0.27</name> + <original_name>failsafe</original_name> + <root>/dev/sda2</root> + <type>image</type> + <vgamode>0x314</vgamode> + </section> + </sections> + </bootloader> + <ca_mgm> + <CAName>YaST_Default_CA</CAName> + <ca_commonName>YaST Default CA (vagrant-sles-11sp2-x64)</ca_commonName> + <country>US</country> + <locality></locality> + <organisation></organisation> + <organisationUnit></organisationUnit> + <password>ENTER PASSWORD HERE</password> + <server_commonName>vagrant-sles-11sp2-x64.vagrantup.com</server_commonName> + <server_email>postmaster@vagrantup.com</server_email> + <state></state> + <takeLocalServerName config:type="boolean">false</takeLocalServerName> + </ca_mgm> + <deploy_image> + <image_installation config:type="boolean">false</image_installation> + </deploy_image> + <general> + <ask-list config:type="list"/> + <mode> + <confirm config:type="boolean">false</confirm> + </mode> + <mouse> + <id>none</id> + </mouse> + <proposals config:type="list"/> + <signature-handling> + <accept_file_without_checksum config:type="boolean">true</accept_file_without_checksum> + <accept_non_trusted_gpg_key config:type="boolean">true</accept_non_trusted_gpg_key> + <accept_unknown_gpg_key config:type="boolean">true</accept_unknown_gpg_key> + <accept_unsigned_file config:type="boolean">true</accept_unsigned_file> + <accept_verification_failed config:type="boolean">false</accept_verification_failed> + <import_gpg_key config:type="boolean">true</import_gpg_key> + </signature-handling> + <storage/> + </general> + <groups config:type="list"> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>100</gid> + <group_password>x</group_password> + <groupname>users</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>19</gid> + <group_password>x</group_password> + <groupname>floppy</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>1</gid> + <group_password>x</group_password> + <groupname>bin</groupname> + <userlist>daemon</userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>41</gid> + <group_password>x</group_password> + <groupname>xok</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>65533</gid> + <group_password>x</group_password> + <groupname>nobody</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>43</gid> + <group_password>x</group_password> + <groupname>modem</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>5</gid> + <group_password>x</group_password> + <groupname>tty</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>7</gid> + <group_password>x</group_password> + <groupname>lp</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>104</gid> + <group_password>!</group_password> + <groupname>uuidd</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>51</gid> + <group_password>!</group_password> + <groupname>postfix</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>112</gid> + <group_password>!</group_password> + <groupname>gdm</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>65534</gid> + <group_password>x</group_password> + <groupname>nogroup</groupname> + <userlist>nobody</userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>101</gid> + <group_password>!</group_password> + <groupname>messagebus</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>59</gid> + <group_password>!</group_password> + <groupname>maildrop</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>33</gid> + <group_password>x</group_password> + <groupname>video</groupname> + <userlist>vagrant</userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>3</gid> + <group_password>x</group_password> + <groupname>sys</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>15</gid> + <group_password>x</group_password> + <groupname>shadow</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>20</gid> + <group_password>x</group_password> + <groupname>cdrom</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>21</gid> + <group_password>x</group_password> + <groupname>console</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>42</gid> + <group_password>x</group_password> + <groupname>trusted</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>102</gid> + <group_password>!</group_password> + <groupname>haldaemon</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>106</gid> + <group_password>!</group_password> + <groupname>puppet</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>16</gid> + <group_password>x</group_password> + <groupname>dialout</groupname> + <userlist>vagrant</userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>107</gid> + <group_password>!</group_password> + <groupname>polkituser</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>10</gid> + <group_password>x</group_password> + <groupname>wheel</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>109</gid> + <group_password>!</group_password> + <groupname>pulse</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>8</gid> + <group_password>x</group_password> + <groupname>www</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>40</gid> + <group_password>x</group_password> + <groupname>games</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>6</gid> + <group_password>x</group_password> + <groupname>disk</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>17</gid> + <group_password>x</group_password> + <groupname>audio</groupname> + <userlist>pulse</userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>111</gid> + <group_password>!</group_password> + <groupname>suse-ncc</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>49</gid> + <group_password>x</group_password> + <groupname>ftp</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>103</gid> + <group_password>!</group_password> + <groupname>tape</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>25</gid> + <group_password>!</group_password> + <groupname>at</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>9</gid> + <group_password>x</group_password> + <groupname>kmem</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>32</gid> + <group_password>x</group_password> + <groupname>public</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>12</gid> + <group_password>x</group_password> + <groupname>mail</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>0</gid> + <group_password>x</group_password> + <groupname>root</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>2</gid> + <group_password>x</group_password> + <groupname>daemon</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>105</gid> + <group_password>!</group_password> + <groupname>sfcb</groupname> + <userlist>root</userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>108</gid> + <group_password>!</group_password> + <groupname>ntp</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>14</gid> + <group_password>x</group_password> + <groupname>uucp</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>110</gid> + <group_password>!</group_password> + <groupname>pulse-access</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>71</gid> + <group_password>!</group_password> + <groupname>ntadmin</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>62</gid> + <group_password>x</group_password> + <groupname>man</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>22</gid> + <group_password>x</group_password> + <groupname>utmp</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>13</gid> + <group_password>x</group_password> + <groupname>news</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>65</gid> + <group_password>!</group_password> + <groupname>sshd</groupname> + <userlist></userlist> + </group> + </groups> + <host> + <hosts config:type="list"> + <hosts_entry> + <host_address>127.0.0.1</host_address> + <names config:type="list"> + <name>localhost</name> + </names> + </hosts_entry> + <hosts_entry> + <host_address>::1</host_address> + <names config:type="list"> + <name>localhost ipv6-localhost ipv6-loopback</name> + </names> + </hosts_entry> + <hosts_entry> + <host_address>fe00::0</host_address> + <names config:type="list"> + <name>ipv6-localnet</name> + </names> + </hosts_entry> + <hosts_entry> + <host_address>ff00::0</host_address> + <names config:type="list"> + <name>ipv6-mcastprefix</name> + </names> + </hosts_entry> + <hosts_entry> + <host_address>ff02::1</host_address> + <names config:type="list"> + <name>ipv6-allnodes</name> + </names> + </hosts_entry> + <hosts_entry> + <host_address>ff02::2</host_address> + <names config:type="list"> + <name>ipv6-allrouters</name> + </names> + </hosts_entry> + <hosts_entry> + <host_address>ff02::3</host_address> + <names config:type="list"> + <name>ipv6-allhosts</name> + </names> + </hosts_entry> + </hosts> + </host> + <login_settings/> + <networking> + <dhcp_options> + <dhclient_client_id></dhclient_client_id> + <dhclient_hostname_option>AUTO</dhclient_hostname_option> + </dhcp_options> + <dns> + <dhcp_hostname config:type="boolean">false</dhcp_hostname> + <domain>vagrantup.com</domain> + <hostname>vagrant-sles-11sp2-x64</hostname> + <resolv_conf_policy>auto</resolv_conf_policy> + <searchlist config:type="list"> + <search>vagrantup.com</search> + </searchlist> + <write_hostname config:type="boolean">true</write_hostname> + </dns> + <interfaces config:type="list"> + <interface> + <bootproto>dhcp</bootproto> + <device>eth0</device> + <name>82540EM Gigabit Ethernet Controller</name> + <startmode>auto</startmode> + <usercontrol>no</usercontrol> + </interface> + </interfaces> + <managed config:type="boolean">false</managed> + <net-udev config:type="list"> + <rule> + <name>eth0</name> + <rule>KERNELS</rule> + <value>0000:00:03.0</value> + </rule> + </net-udev> + <routing> + <ip_forward config:type="boolean">false</ip_forward> + </routing> + </networking> + <partitioning config:type="list"> + <drive> + <device>/dev/sda</device> + <initialize config:type="boolean">true</initialize> + <partitions config:type="list"> + <partition> + <create config:type="boolean">true</create> + <crypt_fs config:type="boolean">false</crypt_fs> + <filesystem config:type="symbol">swap</filesystem> + <format config:type="boolean">true</format> + <fstopt>defaults</fstopt> + <loop_fs config:type="boolean">false</loop_fs> + <mount>swap</mount> + <mountby config:type="symbol">device</mountby> + <partition_id config:type="integer">130</partition_id> + <partition_nr config:type="integer">1</partition_nr> + <raid_options/> + <resize config:type="boolean">false</resize> + <size>1561492992</size> + </partition> + <partition> + <create config:type="boolean">true</create> + <crypt_fs config:type="boolean">false</crypt_fs> + <filesystem config:type="symbol">ext3</filesystem> + <format config:type="boolean">true</format> + <fstopt>acl,user_xattr</fstopt> + <loop_fs config:type="boolean">false</loop_fs> + <mount>/</mount> + <mountby config:type="symbol">device</mountby> + <partition_id config:type="integer">131</partition_id> + <partition_nr config:type="integer">2</partition_nr> + <raid_options/> + <resize config:type="boolean">false</resize> + <size>19895844352</size> + </partition> + </partitions> + <pesize></pesize> + <type config:type="symbol">CT_DISK</type> + <use>all</use> + </drive> + </partitioning> + <report> + <errors> + <log config:type="boolean">true</log> + <show config:type="boolean">true</show> + <timeout config:type="integer">0</timeout> + </errors> + <messages> + <log config:type="boolean">true</log> + <show config:type="boolean">true</show> + <timeout config:type="integer">0</timeout> + </messages> + <warnings> + <log config:type="boolean">true</log> + <show config:type="boolean">true</show> + <timeout config:type="integer">0</timeout> + </warnings> + <yesno_messages> + <log config:type="boolean">true</log> + <show config:type="boolean">true</show> + <timeout config:type="integer">0</timeout> + </yesno_messages> + </report> + <software> + + <packages config:type="list"> + <package>desktop-translations</package> + <package>gconf2-branding-SLES</package> + <package>libproxy0-config-gnome</package> + <package>sle-sdk-release</package> + <package>sle-sdk-release-SDK</package> + <package>sles-manuals_en</package> + <package>yast2-trans-en_US</package> + </packages> + <patterns config:type="list"> + <pattern>Basis-Devel</pattern> + <pattern>Minimal</pattern> + <pattern>apparmor</pattern> + <pattern>base</pattern> + <pattern>sdk_kernel</pattern> + </patterns> + <remove-packages config:type="list"> + <package>3ddiag</package> + <package>CASA</package> + <package>CASA-devel</package> + <package>CASA_auth_token_client</package> + <package>CASA_auth_token_client-devel</package> + <package>ConsoleKit-devel</package> + <package>ConsoleKit-x11</package> + <package>DirectFB-devel</package> + <package>FastCGI</package> + <package>IlmBase</package> + <package>IlmBase-devel</package> + <package>ImageMagick</package> + <package>ImageMagick-devel</package> + <package>LibVNCServer</package> + <package>LibVNCServer-devel</package> + <package>Mesa</package> + <package>Mesa-devel</package> + <package>ModemManager</package> + <package>Modules</package> + <package>NetworkManager</package> + <package>NetworkManager-devel</package> + <package>NetworkManager-glib</package> + <package>NetworkManager-gnome</package> + <package>NetworkManager-kde4</package> + <package>NetworkManager-kde4-lang</package> + <package>NetworkManager-kde4-libs</package> + <package>OpenEXR</package> + <package>OpenEXR-devel</package> + <package>OpenIPMI-devel</package> + <package>PackageKit</package> + <package>PackageKit-devel</package> + <package>PackageKit-lang</package> + <package>PolicyKit-devel</package> + <package>PolicyKit-gnome</package> + <package>PolicyKit-gnome-devel</package> + <package>PolicyKit-gnome-libs</package> + <package>SDL-devel</package> + <package>SDL_net</package> + <package>SDL_net-devel</package> + <package>TeX-Guy</package> + <package>TeX-Guy-devel</package> + <package>VFlib3</package> + <package>VFlib3-devel</package> + <package>WindowMaker</package> + <package>WindowMaker-devel</package> + <package>a2ps</package> + <package>aalib</package> + <package>aalib-devel</package> + <package>akonadi-runtime</package> + <package>akregator</package> + <package>alsa-devel</package> + <package>alsa-firmware</package> + <package>alsa-plugins-pulse</package> + <package>alsa-tools</package> + <package>alsa-tools-devel</package> + <package>anthy</package> + <package>anthy-devel</package> + <package>antlr</package> + <package>apache2</package> + <package>apache2-devel</package> + <package>apache2-mod_perl</package> + <package>apache2-mod_perl-devel</package> + <package>apache2-prefork</package> + <package>apache2-utils</package> + <package>apache2-worker</package> + <package>apparmor-profile-editor</package> + <package>art-sharp2</package> + <package>arts</package> + <package>arts-devel</package> + <package>aspell-devel</package> + <package>at-spi</package> + <package>at-spi-devel</package> + <package>at-spi-lang</package> + <package>atk-devel</package> + <package>audiofile</package> + <package>audiofile-devel</package> + <package>audit-devel</package> + <package>augeas-lenses</package> + <package>automoc4</package> + <package>avahi</package> + <package>avahi-compat-howl-devel</package> + <package>avahi-compat-mDNSResponder-devel</package> + <package>avahi-lang</package> + <package>babl-0_0</package> + <package>banshee-1</package> + <package>banshee-1-backend-engine-gstreamer</package> + <package>banshee-1-backend-platform-gnome</package> + <package>banshee-1-backend-platform-unix</package> + <package>banshee-1-devel</package> + <package>banshee-1-extensions-default</package> + <package>banshee-1-lang</package> + <package>beagle-devel</package> + <package>bind-devel</package> + <package>binutils-devel</package> + <package>bluez</package> + <package>bluez-devel</package> + <package>boo</package> + <package>boo-devel</package> + <package>boost-devel</package> + <package>bootsplash-branding-SLED</package> + <package>cairo-devel</package> + <package>cairomm</package> + <package>cairomm-devel</package> + <package>canna</package> + <package>canna-devel</package> + <package>canna-libs</package> + <package>cannadic</package> + <package>capi4linux</package> + <package>capi4linux-devel</package> + <package>cdk</package> + <package>cdk-devel</package> + <package>cdrdao</package> + <package>chasen</package> + <package>chasen-devel</package> + <package>check</package> + <package>check-devel</package> + <package>chmlib</package> + <package>chmlib-devel</package> + <package>cim-schema</package> + <package>clucene-core</package> + <package>clucene-core-devel</package> + <package>cmake</package> + <package>compiz</package> + <package>compiz-branding-SLE</package> + <package>compiz-devel</package> + <package>compiz-gnome</package> + <package>coolkey-devel</package> + <package>cracklib-devel</package> + <package>crash-devel</package> + <package>crimson</package> + <package>cscope</package> + <package>cups</package> + <package>cups-devel</package> + <package>cvsps</package> + <package>cyrus-imapd-devel</package> + <package>cyrus-sasl-crammd5</package> + <package>cyrus-sasl-devel</package> + <package>dante</package> + <package>dante-devel</package> + <package>db1</package> + <package>db1-devel</package> + <package>db43</package> + <package>db43-devel</package> + <package>dbus-1-devel</package> + <package>dbus-1-glib-devel</package> + <package>dbus-1-python-devel</package> + <package>dbus-1-qt3</package> + <package>dbus-1-qt3-devel</package> + <package>dbus-1-x11</package> + <package>dejagnu</package> + <package>dejavu</package> + <package>desktop-data-openSUSE</package> + <package>desktop-file-utils</package> + <package>devhelp</package> + <package>devhelp-devel</package> + <package>devhelp-lang</package> + <package>device-mapper-devel</package> + <package>dhcp</package> + <package>dhcp-client</package> + <package>dhcp-devel</package> + <package>diffstat</package> + <package>dmapi-devel</package> + <package>dnsmasq</package> + <package>docbook-xsl-stylesheets</package> + <package>docbook_4</package> + <package>doxygen</package> + <package>dvd+rw-tools</package> + <package>e2fsprogs-devel</package> + <package>emacs</package> + <package>emacs-nox</package> + <package>emacs-x11</package> + <package>enchant</package> + <package>enchant-devel</package> + <package>enscript</package> + <package>eog</package> + <package>eog-devel</package> + <package>eog-lang</package> + <package>espeak</package> + <package>evince</package> + <package>evince-devel</package> + <package>evince-lang</package> + <package>evoldap2-devel</package> + <package>evolution</package> + <package>evolution-data-server</package> + <package>evolution-data-server-devel</package> + <package>evolution-data-server-lang</package> + <package>evolution-devel</package> + <package>evolution-lang</package> + <package>expect-devel</package> + <package>facter</package> + <package>fam</package> + <package>fam-devel</package> + <package>farsight</package> + <package>farsight-devel</package> + <package>festival</package> + <package>festival-devel</package> + <package>fftw</package> + <package>fftw-devel</package> + <package>fftw-mpi</package> + <package>fftw-mpi-devel</package> + <package>fftw-threads</package> + <package>fftw-threads-devel</package> + <package>fftw3</package> + <package>fftw3-devel</package> + <package>fftw3-threads</package> + <package>fftw3-threads-devel</package> + <package>file-devel</package> + <package>fileshareset</package> + <package>finch</package> + <package>finch-devel</package> + <package>flac-devel</package> + <package>fltk</package> + <package>fltk-devel</package> + <package>fontconfig-devel</package> + <package>fonts-config</package> + <package>foomatic-filters</package> + <package>freeglut</package> + <package>freeglut-devel</package> + <package>freeradius-client-devel</package> + <package>freeradius-client-libs</package> + <package>freeradius-server-devel</package> + <package>freeradius-server-libs</package> + <package>freetype</package> + <package>freetype2-devel</package> + <package>fribidi</package> + <package>fribidi-devel</package> + <package>ft2demos</package> + <package>fuse-devel</package> + <package>fwnn-devel</package> + <package>fxload</package> + <package>gcc-gij</package> + <package>gcc-java</package> + <package>gcc43-gij</package> + <package>gcc43-java</package> + <package>gconf-sharp2</package> + <package>gconf2-devel</package> + <package>gconfmm</package> + <package>gconfmm-devel</package> + <package>gd</package> + <package>gd-devel</package> + <package>gdbm-32bit</package> + <package>gdk-pixbuf</package> + <package>gdk-pixbuf-devel</package> + <package>gegl-0_0</package> + <package>gettext-tools</package> + <package>gfxboot-branding-SLED</package> + <package>gfxboot-devel</package> + <package>ggz</package> + <package>ggz-client-libs</package> + <package>ggz-client-libs-devel</package> + <package>ggz-client-libs-lang</package> + <package>ghex</package> + <package>ghex-devel</package> + <package>ghex-lang</package> + <package>ghostscript-devel</package> + <package>ghostscript-fonts-other</package> + <package>ghostscript-fonts-std</package> + <package>ghostscript-ijs-devel</package> + <package>ghostscript-library</package> + <package>ghostscript-omni</package> + <package>ghostscript-x11</package> + <package>giflib-devel</package> + <package>gimp</package> + <package>gimp-branding-SLED</package> + <package>gimp-devel</package> + <package>gimp-lang</package> + <package>gimp-plugins-python</package> + <package>git</package> + <package>git-arch</package> + <package>git-core</package> + <package>git-cvs</package> + <package>git-daemon</package> + <package>git-email</package> + <package>git-gui</package> + <package>git-svn</package> + <package>git-web</package> + <package>gitk</package> + <package>gjdoc</package> + <package>glade-sharp2</package> + <package>glade3</package> + <package>glade3-lang</package> + <package>glib</package> + <package>glib-devel</package> + <package>glib-sharp2</package> + <package>glib2-devel</package> + <package>glibmm2</package> + <package>glibmm2-devel</package> + <package>glitz</package> + <package>glitz-devel</package> + <package>gltt</package> + <package>gltt-devel</package> + <package>gmime-2_4-devel</package> + <package>gmime-devel</package> + <package>gmp-devel</package> + <package>gnet</package> + <package>gnet-devel</package> + <package>gnokii</package> + <package>gnokii-devel</package> + <package>gnokii-smsd</package> + <package>gnome-certauth-devel</package> + <package>gnome-control-center</package> + <package>gnome-control-center-devel</package> + <package>gnome-control-center-lang</package> + <package>gnome-desktop</package> + <package>gnome-desktop-devel</package> + <package>gnome-desktop-lang</package> + <package>gnome-doc-utils</package> + <package>gnome-doc-utils-devel</package> + <package>gnome-doc-utils-lang</package> + <package>gnome-keyring-devel</package> + <package>gnome-keyring-sharp</package> + <package>gnome-keyring-sharp-devel</package> + <package>gnome-libs</package> + <package>gnome-libs-devel</package> + <package>gnome-mag</package> + <package>gnome-mag-devel</package> + <package>gnome-mag-lang</package> + <package>gnome-main-menu</package> + <package>gnome-main-menu-lang</package> + <package>gnome-media</package> + <package>gnome-media-devel</package> + <package>gnome-media-lang</package> + <package>gnome-menus</package> + <package>gnome-menus-branding-SLED</package> + <package>gnome-menus-devel</package> + <package>gnome-menus-lang</package> + <package>gnome-mount</package> + <package>gnome-mount-lang</package> + <package>gnome-panel</package> + <package>gnome-panel-devel</package> + <package>gnome-panel-lang</package> + <package>gnome-pilot</package> + <package>gnome-pilot-devel</package> + <package>gnome-pilot-lang</package> + <package>gnome-settings-daemon</package> + <package>gnome-settings-daemon-devel</package> + <package>gnome-settings-daemon-lang</package> + <package>gnome-sharp2</package> + <package>gnome-speech</package> + <package>gnome-speech-devel</package> + <package>gnome-themes</package> + <package>gnome-utils</package> + <package>gnome-utils-devel</package> + <package>gnome-utils-lang</package> + <package>gnome-vfs-sharp2</package> + <package>gnome-vfs2</package> + <package>gnome-vfs2-devel</package> + <package>gnome-vfs2-lang</package> + <package>gnome-vfsmm</package> + <package>gnome-vfsmm-devel</package> + <package>gnopernicus</package> + <package>gnopernicus-devel</package> + <package>gnopernicus-lang</package> + <package>gnutls</package> + <package>goffice</package> + <package>goffice-devel</package> + <package>goffice-lang</package> + <package>goocanvas</package> + <package>goocanvas-devel</package> + <package>goocanvas-lang</package> + <package>goom2k4</package> + <package>goom2k4-devel</package> + <package>graphviz</package> + <package>graphviz-devel</package> + <package>graphviz-gd</package> + <package>graphviz-gnome</package> + <package>gstreamer-0_10</package> + <package>gstreamer-0_10-devel</package> + <package>gstreamer-0_10-lang</package> + <package>gstreamer-0_10-plugins-base</package> + <package>gstreamer-0_10-plugins-base-devel</package> + <package>gstreamer-0_10-plugins-base-lang</package> + <package>gstreamer-0_10-plugins-good</package> + <package>gstreamer-0_10-plugins-good-lang</package> + <package>gstreamer-0_10-utils</package> + <package>gstreamer-utils</package> + <package>gtk</package> + <package>gtk-devel</package> + <package>gtk-lang</package> + <package>gtk-sharp2</package> + <package>gtk-vnc-devel</package> + <package>gtk2-devel</package> + <package>gtkglext</package> + <package>gtkglext-devel</package> + <package>gtkhtml2</package> + <package>gtkhtml2-devel</package> + <package>gtkhtml2-lang</package> + <package>gtkhtml314-sharp</package> + <package>gtkmm2</package> + <package>gtkmm2-devel</package> + <package>gtksourceview-devel</package> + <package>gtksourceview-lang</package> + <package>gtksourceview18</package> + <package>gtksourceview18-devel</package> + <package>gtkspell</package> + <package>gtkspell-devel</package> + <package>gtkspell-lang</package> + <package>gucharmap</package> + <package>gucharmap-devel</package> + <package>gucharmap-lang</package> + <package>guile</package> + <package>guile-devel</package> + <package>gutenprint</package> + <package>gutenprint-devel</package> + <package>gvfs-devel</package> + <package>gxmhtml</package> + <package>hal-devel</package> + <package>hal-palm</package> + <package>htdig</package> + <package>htdig-devel</package> + <package>hunspell</package> + <package>hunspell-devel</package> + <package>hunspell-tools</package> + <package>hwinfo-devel</package> + <package>i4l-base</package> + <package>icewm</package> + <package>icewm-lite</package> + <package>id3lib</package> + <package>id3lib-devel</package> + <package>imap-devel</package> + <package>imap-lib</package> + <package>imlib</package> + <package>imlib-devel</package> + <package>imlib2</package> + <package>imlib2-devel</package> + <package>indent</package> + <package>info2html</package> + <package>inn</package> + <package>inn-devel</package> + <package>intltool</package> + <package>ipadic</package> + <package>iptables-devel</package> + <package>iso-codes</package> + <package>iso-codes-devel</package> + <package>iso_ent</package> + <package>ispell</package> + <package>ispell-american</package> + <package>ispell-brazilian</package> + <package>ispell-british</package> + <package>ispell-czech</package> + <package>ispell-danish</package> + <package>ispell-finnish</package> + <package>ispell-french</package> + <package>ispell-german</package> + <package>ispell-hungarian</package> + <package>ispell-italian</package> + <package>ispell-ngerman</package> + <package>ispell-norsk</package> + <package>ispell-polish</package> + <package>ispell-portuguese</package> + <package>ispell-russian</package> + <package>ispell-slovak</package> + <package>ispell-spanish</package> + <package>ispell-swedish</package> + <package>itcl-devel</package> + <package>java-1_4_2-ibm</package> + <package>java-1_4_2-ibm-devel</package> + <package>java-1_5_0-gcj-compat</package> + <package>java-1_5_0-gcj-compat-devel</package> + <package>java-1_6_0-ibm</package> + <package>java-1_6_0-ibm-devel</package> + <package>joe</package> + <package>jpackage-utils</package> + <package>k3b</package> + <package>k3b-devel</package> + <package>k3b-lang</package> + <package>kaddressbook</package> + <package>kalarm</package> + <package>kde-susetranslations</package> + <package>kde4-filesystem</package> + <package>kde4-kgreeter-plugins</package> + <package>kdebase3</package> + <package>kdebase3-devel</package> + <package>kdebase3-runtime</package> + <package>kdebase4-SLED</package> + <package>kdebase4-SLED-lang</package> + <package>kdebase4-runtime</package> + <package>kdebase4-runtime-branding-SLED</package> + <package>kdebase4-workspace</package> + <package>kdebase4-workspace-branding-SLED</package> + <package>kdebase4-workspace-devel</package> + <package>kdebase4-workspace-ksysguardd</package> + <package>kdelibs3</package> + <package>kdelibs3-arts</package> + <package>kdelibs3-default-style</package> + <package>kdelibs3-devel</package> + <package>kdelibs3-doc</package> + <package>kdelibs4</package> + <package>kdelibs4-branding-SLED</package> + <package>kdelibs4-core</package> + <package>kdelibs4-doc</package> + <package>kdemultimedia3-arts</package> + <package>kdepim3</package> + <package>kdepim4</package> + <package>kdepim4-devel</package> + <package>kdepimlibs4</package> + <package>kdialog</package> + <package>kdm</package> + <package>kdm-branding-SLED</package> + <package>kernel-docs</package> + <package>kernel-syms</package> + <package>kernel-trace-devel</package> + <package>kernel-xen-devel</package> + <package>keyutils-devel</package> + <package>kio_sysinfo</package> + <package>kio_sysinfo-branding-SLED</package> + <package>kmail</package> + <package>knode</package> + <package>kontact</package> + <package>korganizer</package> + <package>kpilot</package> + <package>krb5-devel</package> + <package>ksh-devel</package> + <package>ktorrent</package> + <package>ktorrent-devel</package> + <package>ktorrent-lang</package> + <package>kwin</package> + <package>ladspa-devel</package> + <package>lib3ds-1-3</package> + <package>lib3ds-devel</package> + <package>libFLAC++6</package> + <package>libFLAC8</package> + <package>libHX-devel</package> + <package>libMagick++-devel</package> + <package>libMagick++1</package> + <package>libMagickWand1</package> + <package>libQtWebKit-devel</package> + <package>libQtWebKit4</package> + <package>libXerces-c-devel</package> + <package>libXerces-c28</package> + <package>libXiterm</package> + <package>libXiterm-devel</package> + <package>libacl-devel</package> + <package>libadns-devel</package> + <package>libadns1</package> + <package>libakode</package> + <package>libakode-devel</package> + <package>libakonadi4</package> + <package>libakonadiprotocolinternals-devel</package> + <package>libakonadiprotocolinternals1</package> + <package>libao</package> + <package>libao-devel</package> + <package>libapparmor-devel</package> + <package>libapr-util1</package> + <package>libapr-util1-devel</package> + <package>libapr1</package> + <package>libapr1-devel</package> + <package>libarchive-devel</package> + <package>libart_lgpl</package> + <package>libart_lgpl-devel</package> + <package>libassuan-devel</package> + <package>libatomic-ops-devel</package> + <package>libattr-devel</package> + <package>libavahi-core5</package> + <package>libavahi-devel</package> + <package>libavahi-glib-devel</package> + <package>libavahi-gobject-devel</package> + <package>libavahi-gobject0</package> + <package>libavahi-ui0</package> + <package>libavc1394-0</package> + <package>libavc1394-devel</package> + <package>libbabl-0_0-0</package> + <package>libbeagle-devel</package> + <package>libbeagle-python</package> + <package>libbeagle1</package> + <package>libbitmask-devel</package> + <package>libbitmask1</package> + <package>libblkid-devel</package> + <package>libblocxx-devel</package> + <package>libbonobo</package> + <package>libbonobo-devel</package> + <package>libbonobo-lang</package> + <package>libbonoboui</package> + <package>libbonoboui-devel</package> + <package>libbonoboui-lang</package> + <package>libboost_date_time1_36_0</package> + <package>libboost_filesystem1_36_0</package> + <package>libboost_graph1_36_0</package> + <package>libboost_iostreams1_36_0</package> + <package>libboost_math1_36_0</package> + <package>libboost_mpi1_36_0</package> + <package>libboost_program_options1_36_0</package> + <package>libboost_python1_36_0</package> + <package>libboost_serialization1_36_0</package> + <package>libboost_signals1_36_0</package> + <package>libboost_system1_36_0</package> + <package>libboost_test1_36_0</package> + <package>libboost_thread1_36_0</package> + <package>libboost_wave1_36_0</package> + <package>libbotan-1_6_4</package> + <package>libbotan-devel</package> + <package>libbtctl</package> + <package>libbtctl-devel</package> + <package>libbtctl-lang</package> + <package>libbtctl4</package> + <package>libbz2-devel</package> + <package>libcaca</package> + <package>libcaca-devel</package> + <package>libcanberra-gtk</package> + <package>libcanberra-gtk0</package> + <package>libcanberra0</package> + <package>libcap-devel</package> + <package>libcap-ng0</package> + <package>libcdda_interface0</package> + <package>libcdda_paranoia0</package> + <package>libcddb-devel</package> + <package>libcddb2</package> + <package>libcdio++0</package> + <package>libcdio-devel</package> + <package>libcgroup-devel</package> + <package>libcgroup1</package> + <package>libchewing</package> + <package>libchewing-devel</package> + <package>libcmpiutil</package> + <package>libcmpiutil-devel</package> + <package>libcolorblind0</package> + <package>libcom_err-devel</package> + <package>libcompizconfig</package> + <package>libcompizconfig-devel</package> + <package>libcppunit-1_12-0</package> + <package>libcppunit-devel</package> + <package>libcpuset-devel</package> + <package>libcpuset1</package> + <package>libcroco</package> + <package>libcroco-0_6-3</package> + <package>libcroco-devel</package> + <package>libcryptsetup-devel</package> + <package>libcsync-devel</package> + <package>libcsync0</package> + <package>libcurl-devel</package> + <package>libdaemon-devel</package> + <package>libdaemon0</package> + <package>libdatrie-devel</package> + <package>libdatrie0</package> + <package>libdb-4_5-32bit</package> + <package>libdb-4_5-devel</package> + <package>libdbus-1-qt3-0</package> + <package>libdbus-1-qt3-0-devel</package> + <package>libdc1394-22</package> + <package>libdc1394-devel</package> + <package>libdc1394_control12</package> + <package>libdc1394_control12-devel</package> + <package>libdhcp6client-1_0-2</package> + <package>libdhcp6client-devel</package> + <package>libdigikam-devel</package> + <package>libdiscid1</package> + <package>libdjvulibre-devel</package> + <package>libdjvulibre21</package> + <package>libdmxview-devel</package> + <package>libdmxview0</package> + <package>libdnet-devel</package> + <package>libdnet1</package> + <package>libdns_sd</package> + <package>libdrm</package> + <package>libdrm-devel</package> + <package>libdv-devel</package> + <package>libdv4</package> + <package>libdvdread4</package> + <package>libdw-devel</package> + <package>libebl-devel</package> + <package>libedit-devel</package> + <package>libedit0</package> + <package>libelf-devel</package> + <package>libenchant1</package> + <package>libesd-devel</package> + <package>libesd0</package> + <package>libesmtp-devel</package> + <package>libevoldap-2_4-2</package> + <package>libevtlog-devel</package> + <package>libevtlog0</package> + <package>libexempi-devel</package> + <package>libexempi3</package> + <package>libexif-devel</package> + <package>libexiv2-4</package> + <package>libexiv2-devel</package> + <package>libexpat-devel</package> + <package>libext2fs-devel</package> + <package>libfarsight-0_1-3</package> + <package>libffi-devel</package> + <package>libffi43</package> + <package>libffi43-devel</package> + <package>libflaim-devel</package> + <package>libfprint-devel</package> + <package>libfreebl3</package> + <package>libfreebob</package> + <package>libfreebob-devel</package> + <package>libgadu</package> + <package>libgadu-devel</package> + <package>libgail-gnome</package> + <package>libgail-gnome-devel</package> + <package>libgcj-devel</package> + <package>libgcj43</package> + <package>libgcj43-devel</package> + <package>libgcj43-jar</package> + <package>libgcj_bc43</package> + <package>libgcrypt-devel</package> + <package>libgda-3_0-3</package> + <package>libgda-3_0-devel</package> + <package>libgdiplus0</package> + <package>libgegl-0_0-0</package> + <package>libgeoclue0</package> + <package>libgfortran46</package> + <package>libggz2</package> + <package>libggz2-devel</package> + <package>libgimpprint</package> + <package>libgimpprint-devel</package> + <package>libglade2</package> + <package>libglade2-devel</package> + <package>libglademm</package> + <package>libglademm-2_4-1</package> + <package>libglademm-devel</package> + <package>libgladeui-1-9</package> + <package>libgladeui-1_0-devel</package> + <package>libgmime-2_0-3</package> + <package>libgmime-2_4-2</package> + <package>libgmm++-devel</package> + <package>libgnome</package> + <package>libgnome-certauth0</package> + <package>libgnome-desktop-2-11</package> + <package>libgnome-devel</package> + <package>libgnome-lang</package> + <package>libgnome-menu2</package> + <package>libgnome-window-settings1</package> + <package>libgnomecanvas</package> + <package>libgnomecanvas-devel</package> + <package>libgnomecanvas-lang</package> + <package>libgnomecanvasmm</package> + <package>libgnomecanvasmm-devel</package> + <package>libgnomecups</package> + <package>libgnomecups-devel</package> + <package>libgnomecups-lang</package> + <package>libgnomedb</package> + <package>libgnomedb-devel</package> + <package>libgnomedb-lang</package> + <package>libgnomekbd</package> + <package>libgnomekbd-devel</package> + <package>libgnomekbd-lang</package> + <package>libgnomeprint</package> + <package>libgnomeprint-devel</package> + <package>libgnomeprint-lang</package> + <package>libgnomeprintui</package> + <package>libgnomeprintui-devel</package> + <package>libgnomeprintui-lang</package> + <package>libgnomesu</package> + <package>libgnomesu-devel</package> + <package>libgnomesu-lang</package> + <package>libgnomesu0</package> + <package>libgnomeui</package> + <package>libgnomeui-devel</package> + <package>libgnomeui-lang</package> + <package>libgnomevfsmm-2_6-1</package> + <package>libgnutls-devel</package> + <package>libgnutls-extra-devel</package> + <package>libgnutls-extra26</package> + <package>libgoocanvas3</package> + <package>libgpg-error-devel</package> + <package>libgpgme-devel</package> + <package>libgphoto2-devel</package> + <package>libgpod-devel</package> + <package>libgsf</package> + <package>libgsf-1-114</package> + <package>libgsf-devel</package> + <package>libgsf-gnome</package> + <package>libgsm-devel</package> + <package>libgsm1</package> + <package>libgssglue-devel</package> + <package>libgstapp-0_10-0</package> + <package>libgstinterfaces-0_10-0</package> + <package>libgstreamer-0_10-0</package> + <package>libgtk-vnc-1_0-0</package> + <package>libgtkhtml</package> + <package>libgtkhtml-devel</package> + <package>libgtksourceview-2_0-0</package> + <package>libgtop</package> + <package>libgtop-2_0-7</package> + <package>libgtop-devel</package> + <package>libgtop-lang</package> + <package>libgudev-1_0-0</package> + <package>libgweather</package> + <package>libgweather-devel</package> + <package>libgweather-lang</package> + <package>libgweather1</package> + <package>libhangul</package> + <package>libhangul-devel</package> + <package>libhowl0</package> + <package>libical-devel</package> + <package>libical0</package> + <package>libicu-devel</package> + <package>libid3tag</package> + <package>libid3tag-devel</package> + <package>libidl-devel</package> + <package>libidn-devel</package> + <package>libiec61883</package> + <package>libiec61883-devel</package> + <package>libieee1284</package> + <package>libiniparser-devel</package> + <package>libiniparser0</package> + <package>libiptcdata</package> + <package>libiptcdata-devel</package> + <package>libiptcdata0</package> + <package>libiso9660-5</package> + <package>libiterm</package> + <package>libiterm-devel</package> + <package>libjack-devel</package> + <package>libjack0</package> + <package>libjasper</package> + <package>libjasper-devel</package> + <package>libjingle-0_3-0</package> + <package>libjingle-devel</package> + <package>libjpeg-devel</package> + <package>libkcal</package> + <package>libkcal-devel</package> + <package>libkcal2</package> + <package>libkcddb4</package> + <package>libkcddb4-devel</package> + <package>libkcompactdisc4</package> + <package>libkcompactdisc4-devel</package> + <package>libkdcraw3</package> + <package>libkdcraw3-devel</package> + <package>libkdcraw3-lang</package> + <package>libkde4</package> + <package>libkde4-devel</package> + <package>libkdecore4</package> + <package>libkdecore4-devel</package> + <package>libkdepim4</package> + <package>libkdepim4-devel</package> + <package>libkdepimlibs4</package> + <package>libkdepimlibs4-devel</package> + <package>libkexiv2-3</package> + <package>libkexiv2-3-devel</package> + <package>libkexiv2-7</package> + <package>libkipi-devel</package> + <package>libkipi6</package> + <package>libkmime-devel</package> + <package>libkmime2</package> + <package>libknotificationitem-1-1</package> + <package>libkonq-devel</package> + <package>libkonq5</package> + <package>libksba-devel</package> + <package>libktnef-devel</package> + <package>libktnef1</package> + <package>liblazy-devel</package> + <package>liblazy1</package> + <package>liblcms-devel</package> + <package>libldapcpp-devel</package> + <package>liblog4c-devel</package> + <package>liblog4c3</package> + <package>libloudmouth-1-0</package> + <package>liblpsolve55</package> + <package>liblua5_1</package> + <package>libmalaga-devel</package> + <package>libmalaga7</package> + <package>libmcrypt</package> + <package>libmcrypt-devel</package> + <package>libmikmod</package> + <package>libmikmod-devel</package> + <package>libmm-devel</package> + <package>libmm14</package> + <package>libmng-devel</package> + <package>libmpcdec-devel</package> + <package>libmpcdec5</package> + <package>libmspack-devel</package> + <package>libmtp-devel</package> + <package>libmtp8</package> + <package>libmusicbrainz-devel</package> + <package>libmusicbrainz3-6</package> + <package>libmusicbrainz3-devel</package> + <package>libmusicbrainz4</package> + <package>libmysqlclient-devel</package> + <package>libmysqlclient15</package> + <package>libmysqlclient_r15</package> + <package>libneon-devel</package> + <package>libneon27</package> + <package>libnetapi-devel</package> + <package>libnetapi0</package> + <package>libnetcontrol0</package> + <package>libnetpbm-devel</package> + <package>libnetpbm10</package> + <package>libnewt0_52</package> + <package>libnjb</package> + <package>libnjb-devel</package> + <package>libnjb5</package> + <package>libnl-devel</package> + <package>libnotify</package> + <package>libnotify-devel</package> + <package>libnotify1</package> + <package>libnscd-devel</package> + <package>libnsssharedhelper0</package> + <package>libnuma-devel</package> + <package>libofa-devel</package> + <package>libofa0</package> + <package>libogg-devel</package> + <package>libogg0</package> + <package>liboil</package> + <package>liboil-devel</package> + <package>libopenbabel-devel</package> + <package>libopenbabel3</package> + <package>libopencdk-devel</package> + <package>libopencdk10</package> + <package>libopenraw-devel</package> + <package>libopenraw1</package> + <package>libopenssl-devel</package> + <package>libopensync</package> + <package>libopensync-devel</package> + <package>libopensync-plugin-evolution2</package> + <package>libopensync-plugin-evolution2-devel</package> + <package>libopensync-plugin-palm</package> + <package>libopensync-plugin-palm-devel</package> + <package>liborc-0_4-0</package> + <package>libosip2</package> + <package>libosip2-devel</package> + <package>libotf</package> + <package>libotf-devel</package> + <package>libotr-devel</package> + <package>libotr2</package> + <package>libp11-1</package> + <package>libp11-devel</package> + <package>libpackagekit-glib10</package> + <package>libpackagekit-glib10-devel</package> + <package>libpangomm-1_4-1</package> + <package>libpcap-devel</package> + <package>libpciaccess0</package> + <package>libpciaccess0-devel</package> + <package>libphonon4</package> + <package>libpisock-devel</package> + <package>libpisock9</package> + <package>libpisync-devel</package> + <package>libpisync1</package> + <package>libpixman-1-0-devel</package> + <package>libpkcs11-helper1</package> + <package>libpng-devel</package> + <package>libpolkit-qt0</package> + <package>libpoppler-devel</package> + <package>libpoppler-glib-devel</package> + <package>libpoppler-glib4</package> + <package>libpoppler-qt2</package> + <package>libpoppler-qt3-devel</package> + <package>libpoppler-qt4-3</package> + <package>libpoppler-qt4-devel</package> + <package>libpoppler5</package> + <package>libpst4</package> + <package>libpt2</package> + <package>libpt2-devel</package> + <package>libpulse-browse0</package> + <package>libpulse-devel</package> + <package>libpulse-mainloop-glib0</package> + <package>libpulse0</package> + <package>libpurple</package> + <package>libpurple-devel</package> + <package>libpurple-lang</package> + <package>libqca2</package> + <package>libqca2-devel</package> + <package>libqdialogsolver1</package> + <package>libqdialogsolver1-devel</package> + <package>libqimageblitz-devel</package> + <package>libqimageblitz4</package> + <package>libqscintilla-devel</package> + <package>libqscintilla2-5</package> + <package>libqt4</package> + <package>libqt4-devel</package> + <package>libqt4-qt3support</package> + <package>libqt4-sql</package> + <package>libqt4-sql-mysql</package> + <package>libqt4-sql-postgresql</package> + <package>libqt4-sql-sqlite</package> + <package>libqt4-sql-unixODBC</package> + <package>libqt4-x11</package> + <package>libqtpod-devel</package> + <package>libqtpod0</package> + <package>libquadmath46</package> + <package>libquicktime</package> + <package>libquicktime-devel</package> + <package>libraptor-devel</package> + <package>libraptor1</package> + <package>librasqal-devel</package> + <package>librasqal1</package> + <package>libraw1394-11</package> + <package>libraw1394-8</package> + <package>libraw1394-devel</package> + <package>libredland-devel</package> + <package>libredland0</package> + <package>libreiserfs-devel</package> + <package>libreoffice</package> + <package>libreoffice-base</package> + <package>libreoffice-branding-SLED</package> + <package>libreoffice-branding-upstream</package> + <package>libreoffice-calc</package> + <package>libreoffice-icon-themes</package> + <package>libreoffice-impress</package> + <package>libreoffice-sdk</package> + <package>libreoffice-writer</package> + <package>librsvg</package> + <package>librsvg-devel</package> + <package>libsamplerate</package> + <package>libsamplerate-devel</package> + <package>libsatsolver-devel</package> + <package>libsblim-cmpiutil1</package> + <package>libselinux-devel</package> + <package>libsemanage-devel</package> + <package>libsemanage1</package> + <package>libsensors3-devel</package> + <package>libsensors4</package> + <package>libsepol-devel</package> + <package>libsexy</package> + <package>libsexy-devel</package> + <package>libshout-devel</package> + <package>libshout3</package> + <package>libsidplay1</package> + <package>libsidplay1-devel</package> + <package>libsigc++2</package> + <package>libsigc++2-devel</package> + <package>libslab-lang</package> + <package>libslab0</package> + <package>libsmbclient-devel</package> + <package>libsmbios-devel</package> + <package>libsmbsharemodes-devel</package> + <package>libsmbsharemodes0</package> + <package>libsndfile</package> + <package>libsndfile-devel</package> + <package>libsoprano-devel</package> + <package>libsoprano4</package> + <package>libsoup-devel</package> + <package>libspectre-devel</package> + <package>libspectre1</package> + <package>libspeex</package> + <package>libssh2-devel</package> + <package>libstrigi0</package> + <package>libstroke</package> + <package>libstroke-devel</package> + <package>libsyncml-devel</package> + <package>libsyncml0</package> + <package>libtalloc-devel</package> + <package>libtasn1-devel</package> + <package>libtdb-devel</package> + <package>libtelepathy</package> + <package>libtelepathy-devel</package> + <package>libtelepathy-glib0</package> + <package>libtheora-devel</package> + <package>libtheora0</package> + <package>libtidy</package> + <package>libtidy-devel</package> + <package>libtiff-devel</package> + <package>libtirpc-devel</package> + <package>libtomoe-gtk0</package> + <package>libtspi1</package> + <package>libtunepimp</package> + <package>libtunepimp-devel</package> + <package>libtunepimp5</package> + <package>libudev-devel</package> + <package>libudf0</package> + <package>libunique-1_0-0</package> + <package>libunwind</package> + <package>libunwind-devel</package> + <package>libupsclient1</package> + <package>libusb-devel</package> + <package>libusbpp-0_1-4</package> + <package>libustr-1_0-1</package> + <package>libustr-devel</package> + <package>libuuid-devel</package> + <package>libvirt-client</package> + <package>libvirt-devel</package> + <package>libvisual</package> + <package>libvisual-devel</package> + <package>libvoikko-devel</package> + <package>libvoikko1</package> + <package>libvorbis</package> + <package>libvorbis-devel</package> + <package>libwavpack1</package> + <package>libwbclient-devel</package> + <package>libwbxml2-0</package> + <package>libwbxml2-devel</package> + <package>libwebkit-1_0-1</package> + <package>libwebkit-1_0-2</package> + <package>libwebkit-devel</package> + <package>libwebkit-lang</package> + <package>libwmf</package> + <package>libwmf-devel</package> + <package>libwmf-gnome</package> + <package>libwnck</package> + <package>libwnck-1-22</package> + <package>libwnck-devel</package> + <package>libwnck-lang</package> + <package>libwpd-0_8-8</package> + <package>libwpd-devel</package> + <package>libwpg-0_1-1</package> + <package>libwpg-devel</package> + <package>libwps-0_1-1</package> + <package>libwps-devel</package> + <package>libwsman-devel</package> + <package>libwsman1</package> + <package>libxcrypt-devel</package> + <package>libxine-devel</package> + <package>libxine1</package> + <package>libxklavier-devel</package> + <package>libxklavier15</package> + <package>libxml2-devel</package> + <package>libxslt-devel</package> + <package>libyajl1</package> + <package>libzio-devel</package> + <package>libzip-devel</package> + <package>libzip1</package> + <package>libzvbi0</package> + <package>libzypp-devel</package> + <package>limal-apparmor-notifications</package> + <package>limal-apparmor-notifications-devel</package> + <package>limal-ca-mgm-devel</package> + <package>limal-devel</package> + <package>limal-devtools</package> + <package>limal-nfs-server-devel</package> + <package>linux-atm-devel</package> + <package>linux-atm-lib</package> + <package>lksctp-tools</package> + <package>lksctp-tools-devel</package> + <package>loudmouth-devel</package> + <package>lua</package> + <package>lua-devel</package> + <package>lzo-devel</package> + <package>m17n-db</package> + <package>m17n-lib</package> + <package>m17n-lib-devel</package> + <package>malaga-suomi</package> + <package>meanwhile</package> + <package>meanwhile-devel</package> + <package>metacity</package> + <package>metacity-devel</package> + <package>metacity-lang</package> + <package>mhash</package> + <package>mhash-devel</package> + <package>misc-console-font</package> + <package>mono-addins</package> + <package>mono-basic</package> + <package>mono-core</package> + <package>mono-data</package> + <package>mono-data-oracle</package> + <package>mono-data-sqlite</package> + <package>mono-devel</package> + <package>mono-extras</package> + <package>mono-jscript</package> + <package>mono-tools</package> + <package>mono-wcf</package> + <package>mono-web</package> + <package>mono-winforms</package> + <package>mono-zeroconf</package> + <package>mono-zeroconf-provider-avahi</package> + <package>monodevelop</package> + <package>monodoc-core</package> + <package>mozilla-nspr</package> + <package>mozilla-nspr-devel</package> + <package>mozilla-nss</package> + <package>mozilla-nss-devel</package> + <package>mozilla-xulrunner192</package> + <package>mozilla-xulrunner192-gnome</package> + <package>mpfr-devel</package> + <package>mpi-selector</package> + <package>mpich</package> + <package>mpich-devel</package> + <package>mysql</package> + <package>mysql-client</package> + <package>nagios</package> + <package>nagios-devel</package> + <package>nagios-www</package> + <package>nant</package> + <package>nautilus</package> + <package>nautilus-cd-burner</package> + <package>nautilus-cd-burner-devel</package> + <package>nautilus-cd-burner-lang</package> + <package>nautilus-devel</package> + <package>nautilus-lang</package> + <package>ndesk-dbus</package> + <package>ndesk-dbus-glib</package> + <package>ndesk-dbus-glib-devel</package> + <package>net-snmp</package> + <package>net-snmp-devel</package> + <package>netatalk</package> + <package>netatalk-devel</package> + <package>netcat-openbsd</package> + <package>newt</package> + <package>newt-devel</package> + <package>newt-static</package> + <package>nfsidmap-devel</package> + <package>notification-daemon</package> + <package>notification-daemon-lang</package> + <package>notify-sharp</package> + <package>nss-mdns</package> + <package>nss-shared-helper-devel</package> + <package>nut</package> + <package>nut-classic</package> + <package>nut-devel</package> + <package>opal</package> + <package>opal-devel</package> + <package>openCryptoki</package> + <package>openCryptoki-64bit</package> + <package>openCryptoki-devel</package> + <package>openct-devel</package> + <package>openhpi</package> + <package>openhpi-daemon</package> + <package>openhpi-devel</package> + <package>openjade</package> + <package>openjade-devel</package> + <package>openldap2-devel</package> + <package>openmotif-devel</package> + <package>openmotif-libs</package> + <package>openmpi</package> + <package>openobex-devel</package> + <package>openobex-glib-devel</package> + <package>opensc-devel</package> + <package>openslp-devel</package> + <package>opensp</package> + <package>opensp-devel</package> + <package>openwsman-client</package> + <package>openwsman-server</package> + <package>orbit</package> + <package>orbit-devel</package> + <package>orbit2-devel</package> + <package>oxygen-icon-theme</package> + <package>oxygen-icon-theme-scalable</package> + <package>ozerocdoff</package> + <package>pam-devel</package> + <package>pango-devel</package> + <package>pangomm-devel</package> + <package>parted-devel</package> + <package>patchutils</package> + <package>pciutils-devel</package> + <package>pcre-devel</package> + <package>pcsc-acr38</package> + <package>pcsc-acr38-devel</package> + <package>pcsc-lite-devel</package> + <package>perl-32bit</package> + <package>perl-Crypt-OpenSSL-RSA</package> + <package>perl-Mail-DKIM</package> + <package>perl-MailTools</package> + <package>perl-Net-DNS</package> + <package>perl-Net-IP</package> + <package>perl-NetAddr-IP</package> + <package>perl-SNMP</package> + <package>perl-Tie-IxHash</package> + <package>perl-Tk</package> + <package>perl-Tk-devel</package> + <package>perl-spamassassin</package> + <package>phonon</package> + <package>phonon-backend-gstreamer-0_10</package> + <package>phonon-devel</package> + <package>php5</package> + <package>php5-ctype</package> + <package>php5-devel</package> + <package>php5-dom</package> + <package>php5-hash</package> + <package>php5-iconv</package> + <package>php5-json</package> + <package>php5-pdo</package> + <package>php5-sqlite</package> + <package>php5-suhosin</package> + <package>php5-tokenizer</package> + <package>php5-xmlreader</package> + <package>php5-xmlwriter</package> + <package>php53</package> + <package>php53-ctype</package> + <package>php53-dom</package> + <package>php53-iconv</package> + <package>php53-json</package> + <package>php53-tokenizer</package> + <package>php53-xmlreader</package> + <package>php53-xmlwriter</package> + <package>pidgin</package> + <package>pidgin-devel</package> + <package>pilot-link</package> + <package>pkcs11-helper</package> + <package>pkcs11-helper-devel</package> + <package>planner</package> + <package>planner-devel</package> + <package>planner-lang</package> + <package>plasma-addons</package> + <package>plasma-theme-aya</package> + <package>plasmoid-networkmanagement</package> + <package>plasmoid-quickaccess</package> + <package>plotutils</package> + <package>poppler-data</package> + <package>poppler-tools</package> + <package>popt-devel</package> + <package>portmap</package> + <package>postfix-devel</package> + <package>postgresql-devel</package> + <package>postgresql-libs</package> + <package>ppp-devel</package> + <package>ppp-userpass</package> + <package>pstoedit</package> + <package>pstoedit-devel</package> + <package>pulseaudio</package> + <package>pulseaudio-esound-compat</package> + <package>pulseaudio-lang</package> + <package>puppet</package> + <package>python-cairo</package> + <package>python-cairo-devel</package> + <package>python-devel</package> + <package>python-gnome</package> + <package>python-gnome-devel</package> + <package>python-gobject2</package> + <package>python-gobject2-devel</package> + <package>python-gtk</package> + <package>python-gtk-devel</package> + <package>python-gtkglext</package> + <package>python-gtkglext-devel</package> + <package>python-gtksourceview</package> + <package>python-gtksourceview-devel</package> + <package>python-numeric</package> + <package>python-numpy</package> + <package>python-orbit</package> + <package>python-orbit-devel</package> + <package>pyxml</package> + <package>qt3</package> + <package>qt3-devel</package> + <package>quagga</package> + <package>quagga-devel</package> + <package>quilt</package> + <package>raptor</package> + <package>rarian</package> + <package>rarian-devel</package> + <package>re2c</package> + <package>readline-devel</package> + <package>recode-devel</package> + <package>rpm-devel</package> + <package>rrdtool</package> + <package>rrdtool-devel</package> + <package>rsyslog</package> + <package>ruby</package> + <package>rubygems</package> + <package>ruby-devel</package> + <package>ruby-doc-html</package> + <package>ruby-doc-ri</package> + <package>ruby-examples</package> + <package>ruby-fcgi</package> + <package>ruby-mysql</package> + <package>ruby-selinux</package> + <package>ruby-test-suite</package> + <package>ruby-tk</package> + <package>sablot</package> + <package>sablot-devel</package> + <package>samba-devel</package> + <package>sane-backends</package> + <package>sane-frontends</package> + <package>sax2-libsax</package> + <package>sax2-libsax-devel</package> + <package>sax2-libsax-perl</package> + <package>sax2-tools</package> + <package>sblim-cmpi-base</package> + <package>sblim-cmpi-base-devel</package> + <package>sblim-cmpi-devel</package> + <package>sblim-cmpiutil-devel</package> + <package>sblim-indication_helper</package> + <package>sblim-sfcb</package> + <package>sblim-sfcc</package> + <package>sblim-sfcc-devel</package> + <package>scim</package> + <package>scim-devel</package> + <package>scpm-devel</package> + <package>scrollkeeper</package> + <package>scrollkeeper-lang</package> + <package>seahorse</package> + <package>seahorse-devel</package> + <package>seahorse-lang</package> + <package>sendmail</package> + <package>sendmail-devel</package> + <package>sg3_utils-devel</package> + <package>sgml-skel</package> + <package>shared-mime-info</package> + <package>silc-toolkit</package> + <package>silc-toolkit-devel</package> + <package>slang</package> + <package>slang-devel</package> + <package>soprano</package> + <package>soprano-backend-redland</package> + <package>spamassassin</package> + <package>speex-devel</package> + <package>splashy-devel</package> + <package>sqlite2</package> + <package>sqlite3-devel</package> + <package>startup-notification</package> + <package>startup-notification-devel</package> + <package>strigi</package> + <package>strigi-devel</package> + <package>subversion</package> + <package>subversion-perl</package> + <package>susehelp</package> + <package>susehelp_cz</package> + <package>susehelp_de</package> + <package>susehelp_en</package> + <package>susehelp_es</package> + <package>susehelp_fr</package> + <package>susehelp_hu</package> + <package>susehelp_it</package> + <package>swig</package> + <package>syslogd</package> + <package>t1lib</package> + <package>t1lib-devel</package> + <package>taglib</package> + <package>taglib-devel</package> + <package>taglib-sharp</package> + <package>tango-icon-theme</package> + <package>tcl-devel</package> + <package>tcpd-devel</package> + <package>telepathy-glib-devel</package> + <package>telepathy-mission-control</package> + <package>telepathy-mission-control-devel</package> + <package>texlive-bin-devel</package> + <package>texlive-devel</package> + <package>tk-devel</package> + <package>tla</package> + <package>tn5250</package> + <package>tn5250-devel</package> + <package>tomoe</package> + <package>tomoe-devel</package> + <package>tomoe-gtk</package> + <package>tomoe-gtk-devel</package> + <package>tomoe-gtk-lang</package> + <package>totem-pl-parser</package> + <package>totem-pl-parser-devel</package> + <package>totem-pl-parser-lang</package> + <package>trousers</package> + <package>trousers-devel</package> + <package>tsclient</package> + <package>tsclient-devel</package> + <package>tsclient-lang</package> + <package>uim</package> + <package>uim-devel</package> + <package>unixODBC</package> + <package>unixODBC-devel</package> + <package>unsermake</package> + <package>update-desktop-files</package> + <package>usb_modeswitch</package> + <package>usb_modeswitch-data</package> + <package>valgrind</package> + <package>valgrind-devel</package> + <package>vte</package> + <package>vte-devel</package> + <package>vte-lang</package> + <package>wdiff</package> + <package>webkit-sharp</package> + <package>wireshark</package> + <package>wireshark-devel</package> + <package>wodim-devel</package> + <package>wordcut</package> + <package>wordcut-devel</package> + <package>words</package> + <package>wpa_supplicant</package> + <package>wvstreams</package> + <package>wvstreams-devel</package> + <package>wxGTK-compat</package> + <package>wxGTK-devel</package> + <package>wxGTK-gl</package> + <package>x11-input-wacom</package> + <package>x11-input-wacom-devel</package> + <package>x11-input-wacom-tools</package> + <package>xalan-j2</package> + <package>xaw3d-devel</package> + <package>xbase</package> + <package>xbase-devel</package> + <package>xdelta</package> + <package>xdelta-devel</package> + <package>xdg-menu</package> + <package>xen-devel</package> + <package>xen-libs</package> + <package>xerces-j2</package> + <package>xerces-j2-bootstrap</package> + <package>xerces-j2-xml-apis</package> + <package>xfsprogs-devel</package> + <package>xml-commons-apis-bootstrap</package> + <package>xml-commons-resolver-bootstrap</package> + <package>xml-commons-which-bootstrap</package> + <package>xmlcharent</package> + <package>xorg-x11</package> + <package>xorg-x11-devel</package> + <package>xorg-x11-fonts</package> + <package>xorg-x11-fonts-core</package> + <package>xorg-x11-fonts-devel</package> + <package>xorg-x11-libICE-devel</package> + <package>xorg-x11-libSM-devel</package> + <package>xorg-x11-libX11-devel</package> + <package>xorg-x11-libXau-devel</package> + <package>xorg-x11-libXdmcp-devel</package> + <package>xorg-x11-libXext-devel</package> + <package>xorg-x11-libXfixes-devel</package> + <package>xorg-x11-libXmu-devel</package> + <package>xorg-x11-libXp-devel</package> + <package>xorg-x11-libXpm-devel</package> + <package>xorg-x11-libXprintUtil-devel</package> + <package>xorg-x11-libXrender-devel</package> + <package>xorg-x11-libXt-devel</package> + <package>xorg-x11-libXv-devel</package> + <package>xorg-x11-libfontenc-devel</package> + <package>xorg-x11-libxcb-devel</package> + <package>xorg-x11-libxkbfile-devel</package> + <package>xorg-x11-proto-devel</package> + <package>xorg-x11-server</package> + <package>xorg-x11-util-devel</package> + <package>xorg-x11-xauth</package> + <package>xorg-x11-xtrans-devel</package> + <package>xosd</package> + <package>xosd-devel</package> + <package>xsp</package> + <package>xterm</package> + <package>xz-devel</package> + <package>yast2-core-devel</package> + <package>yast2-devtools</package> + <package>yast2-gtk</package> + <package>yast2-libyui-devel</package> + <package>yast2-ncurses-devel</package> + <package>yast2-qt</package> + <package>yast2-qt-devel</package> + <package>yast2-qt-pkg</package> + <package>yast2-storage-devel</package> + <package>yast2-ycp-ui-bindings-devel</package> + <package>yelp</package> + <package>yelp-lang</package> + <package>zenity</package> + <package>zenity-lang</package> + <package>zlib-devel</package> + <package>zsh</package> + <package>zvbi-devel</package> + </remove-packages> + + </software> + <user_defaults> + <expire></expire> + <group>100</group> + <groups>video,dialout</groups> + <home>/home</home> + <inactive>-1</inactive> + <shell>/bin/bash</shell> + <skel>/etc/skel</skel> + <umask>022</umask> + </user_defaults> + <users config:type="list"> + <user> + <encrypted config:type="boolean">true</encrypted> + <fullname>vagrant</fullname> + <gid>100</gid> + <home>/home/vagrant</home> + <password_settings> + <expire></expire> + <flag></flag> + <inact></inact> + <max>99999</max> + <min>0</min> + <warn>7</warn> + </password_settings> + <shell>/bin/bash</shell> + <uid>1000</uid> + <user_password>$2y$05$NA1Li9ZKJOLRW5mMTXm6/e5r8dltWS5RpDZpvHrI82aLE00V51tdi</user_password> + <username>vagrant</username> + </user> + <user> + <encrypted config:type="boolean">true</encrypted> + <fullname>Games account</fullname> + <gid>100</gid> + <home>/var/games</home> + <password_settings> + <expire></expire> + <flag></flag> + <inact></inact> + <max></max> + <min></min> + <warn></warn> + </password_settings> + <shell>/bin/bash</shell> + <uid>12</uid> + <user_password>*</user_password> + <username>games</username> + </user> + <user> + <encrypted config:type="boolean">true</encrypted> + <fullname>bin</fullname> + <gid>1</gid> + <home>/bin</home> + <password_settings> + <expire></expire> + <flag></flag> + <inact></inact> + <max></max> + <min></min> + <warn></warn> + </password_settings> + <shell>/bin/bash</shell> + <uid>1</uid> + <user_password>*</user_password> + <username>bin</username> + </user> + <user> + <encrypted config:type="boolean">true</encrypted> + <fullname>nobody</fullname> + <gid>65533</gid> + <home>/var/lib/nobody</home> + <password_settings> + <expire></expire> + <flag></flag> + <inact></inact> + <max></max> + <min></min> + <warn></warn> + </password_settings> + <shell>/bin/bash</shell> + <uid>65534</uid> + <user_password>*</user_password> + <username>nobody</username> + </user> + <user> + <encrypted config:type="boolean">true</encrypted> + <fullname>Printing daemon</fullname> + <gid>7</gid> + <home>/var/spool/lpd</home> + <password_settings> + <expire></expire> + <flag></flag> + <inact></inact> + <max></max> + <min></min> + <warn></warn> + </password_settings> + <shell>/bin/bash</shell> + <uid>4</uid> + <user_password>*</user_password> + <username>lp</username> + </user> + <user> + <encrypted config:type="boolean">true</encrypted> + <fullname>User for uuidd</fullname> + <gid>104</gid> + <home>/var/run/uuidd</home> + <password_settings> + <expire></expire> + <flag></flag> + <inact></inact> + <max>99999</max> + <min>0</min> + <warn>7</warn> + </password_settings> + <shell>/bin/false</shell> + <uid>102</uid> + <user_password>*</user_password> + <username>uuidd</username> + </user> + <user> + <encrypted config:type="boolean">true</encrypted> + <fullname>Postfix Daemon</fullname> + <gid>51</gid> + <home>/var/spool/postfix</home> + <password_settings> + <expire></expire> + <flag></flag> + <inact></inact> + <max>99999</max> + <min>0</min> + <warn>7</warn> + </password_settings> + <shell>/bin/false</shell> + <uid>51</uid> + <user_password>*</user_password> + <username>postfix</username> + </user> + <user> + <encrypted config:type="boolean">true</encrypted> + <fullname>Novell Customer Center User</fullname> + <gid>111</gid> + <home>/var/lib/YaST2/suse-ncc-fakehome</home> + <password_settings> + <expire></expire> + <flag></flag> + <inact></inact> + <max>99999</max> + <min>0</min> + <warn>7</warn> + </password_settings> + <shell>/bin/bash</shell> + <uid>106</uid> + <user_password>*</user_password> + <username>suse-ncc</username> + </user> + <user> + <encrypted config:type="boolean">true</encrypted> + <fullname>FTP account</fullname> + <gid>49</gid> + <home>/srv/ftp</home> + <password_settings> + <expire></expire> + <flag></flag> + <inact></inact> + <max></max> + <min></min> + <warn></warn> + </password_settings> + <shell>/bin/bash</shell> + <uid>40</uid> + <user_password>*</user_password> + <username>ftp</username> + </user> + <user> + <encrypted config:type="boolean">true</encrypted> + <fullname>Gnome Display Manager daemon</fullname> + <gid>112</gid> + <home>/var/lib/gdm</home> + <password_settings> + <expire></expire> + <flag></flag> + <inact></inact> + <max>99999</max> + <min>0</min> + <warn>7</warn> + </password_settings> + <shell>/bin/false</shell> + <uid>107</uid> + <user_password>*</user_password> + <username>gdm</username> + </user> + <user> + <encrypted config:type="boolean">true</encrypted> + <fullname>Batch jobs daemon</fullname> + <gid>25</gid> + <home>/var/spool/atjobs</home> + <password_settings> + <expire></expire> + <flag></flag> + <inact></inact> + <max>99999</max> + <min>0</min> + <warn>7</warn> + </password_settings> + <shell>/bin/bash</shell> + <uid>25</uid> + <user_password>*</user_password> + <username>at</username> + </user> + <user> + <encrypted config:type="boolean">true</encrypted> + <fullname>root</fullname> + <gid>0</gid> + <home>/root</home> + <password_settings> + <expire></expire> + <flag></flag> + <inact></inact> + <max></max> + <min></min> + <warn></warn> + </password_settings> + <shell>/bin/bash</shell> + <uid>0</uid> + <user_password>$2y$05$NA1Li9ZKJOLRW5mMTXm6/e5r8dltWS5RpDZpvHrI82aLE00V51tdi</user_password> + <username>root</username> + </user> + <user> + <encrypted config:type="boolean">true</encrypted> + <fullname>Mailer daemon</fullname> + <gid>12</gid> + <home>/var/spool/clientmqueue</home> + <password_settings> + <expire></expire> + <flag></flag> + <inact></inact> + <max></max> + <min></min> + <warn></warn> + </password_settings> + <shell>/bin/false</shell> + <uid>8</uid> + <user_password>*</user_password> + <username>mail</username> + </user> + <user> + <encrypted config:type="boolean">true</encrypted> + <fullname>Daemon</fullname> + <gid>2</gid> + <home>/sbin</home> + <password_settings> + <expire></expire> + <flag></flag> + <inact></inact> + <max></max> + <min></min> + <warn></warn> + </password_settings> + <shell>/bin/bash</shell> + <uid>2</uid> + <user_password>*</user_password> + <username>daemon</username> + </user> + <user> + <encrypted config:type="boolean">true</encrypted> + <fullname>NTP daemon</fullname> + <gid>108</gid> + <home>/var/lib/ntp</home> + <password_settings> + <expire></expire> + <flag></flag> + <inact></inact> + <max>99999</max> + <min>0</min> + <warn>7</warn> + </password_settings> + <shell>/bin/false</shell> + <uid>74</uid> + <user_password>*</user_password> + <username>ntp</username> + </user> + <user> + <encrypted config:type="boolean">true</encrypted> + <fullname>Unix-to-Unix CoPy system</fullname> + <gid>14</gid> + <home>/etc/uucp</home> + <password_settings> + <expire></expire> + <flag></flag> + <inact></inact> + <max></max> + <min></min> + <warn></warn> + </password_settings> + <shell>/bin/bash</shell> + <uid>10</uid> + <user_password>*</user_password> + <username>uucp</username> + </user> + <user> + <encrypted config:type="boolean">true</encrypted> + <fullname>User for D-Bus</fullname> + <gid>101</gid> + <home>/var/run/dbus</home> + <password_settings> + <expire></expire> + <flag></flag> + <inact></inact> + <max></max> + <min>0</min> + <warn>7</warn> + </password_settings> + <shell>/bin/false</shell> + <uid>100</uid> + <user_password>*</user_password> + <username>messagebus</username> + </user> + <user> + <encrypted config:type="boolean">true</encrypted> + <fullname>User for haldaemon</fullname> + <gid>102</gid> + <home>/var/run/hald</home> + <password_settings> + <expire></expire> + <flag></flag> + <inact></inact> + <max></max> + <min>0</min> + <warn>7</warn> + </password_settings> + <shell>/bin/false</shell> + <uid>101</uid> + <user_password>*</user_password> + <username>haldaemon</username> + </user> + <user> + <encrypted config:type="boolean">true</encrypted> + <fullname>WWW daemon apache</fullname> + <gid>8</gid> + <home>/var/lib/wwwrun</home> + <password_settings> + <expire></expire> + <flag></flag> + <inact></inact> + <max></max> + <min></min> + <warn></warn> + </password_settings> + <shell>/bin/false</shell> + <uid>30</uid> + <user_password>*</user_password> + <username>wwwrun</username> + </user> + <user> + <encrypted config:type="boolean">true</encrypted> + <fullname>Manual pages viewer</fullname> + <gid>62</gid> + <home>/var/cache/man</home> + <password_settings> + <expire></expire> + <flag></flag> + <inact></inact> + <max></max> + <min></min> + <warn></warn> + </password_settings> + <shell>/bin/bash</shell> + <uid>13</uid> + <user_password>*</user_password> + <username>man</username> + </user> + <user> + <encrypted config:type="boolean">true</encrypted> + <fullname>PolicyKit</fullname> + <gid>107</gid> + <home>/var/run/PolicyKit</home> + <password_settings> + <expire></expire> + <flag></flag> + <inact></inact> + <max>99999</max> + <min>0</min> + <warn>7</warn> + </password_settings> + <shell>/bin/false</shell> + <uid>104</uid> + <user_password>*</user_password> + <username>polkituser</username> + </user> + <user> + <encrypted config:type="boolean">true</encrypted> + <fullname>News system</fullname> + <gid>13</gid> + <home>/etc/news</home> + <password_settings> + <expire></expire> + <flag></flag> + <inact></inact> + <max></max> + <min></min> + <warn></warn> + </password_settings> + <shell>/bin/bash</shell> + <uid>9</uid> + <user_password>*</user_password> + <username>news</username> + </user> + <user> + <fullname>SSH daemon</fullname> + <gid>65</gid> + <home>/var/lib/sshd</home> + <shell>/bin/false</shell> + <uid>71</uid> + <username>sshd</username> + </user> + <user> + <encrypted config:type="boolean">true</encrypted> + <fullname>PulseAudio daemon</fullname> + <gid>109</gid> + <home>/var/lib/pulseaudio</home> + <password_settings> + <expire></expire> + <flag></flag> + <inact></inact> + <max>99999</max> + <min>0</min> + <warn>7</warn> + </password_settings> + <shell>/bin/false</shell> + <uid>105</uid> + <user_password>*</user_password> + <username>pulse</username> + </user> + </users> +</profile> diff --git a/templates/sles-11-sp2/scripts/cleanup.sh b/templates/sles-11-sp2/scripts/cleanup.sh new file mode 100644 index 000000000..02bc7e322 --- /dev/null +++ b/templates/sles-11-sp2/scripts/cleanup.sh @@ -0,0 +1,9 @@ +#!/bin/bash -eux + +# remove zypper locks on removed packages to avoid later dependency problems +zypper --non-interactive rl \* +# zypper --non-interactive remove `rpm -qa virtualbox-guest-*` >/dev/null 2>&1 +# Add an online copy of the SLES DVD1 as a software repository, instead of the mounted DVD +zypper removerepo 'SUSE-Linux-Enterprise-Server-11-SP2 11.2.2-1.234' +zypper addrepo 'http://demeter.uni-regensburg.de/SLES11SP2-x64/DVD1/' 'SLES11SP2-x64 DVD1 Online' +zypper refresh diff --git a/templates/sles-11-sp2/scripts/minimize.sh b/templates/sles-11-sp2/scripts/minimize.sh new file mode 100644 index 000000000..3846a1d65 --- /dev/null +++ b/templates/sles-11-sp2/scripts/minimize.sh @@ -0,0 +1,4 @@ +#!/bin/bash -eux + +dd if=/dev/zero of=/EMPTY bs=1M +rm -f /EMPTY diff --git a/templates/sles-11-sp2/scripts/sshd.sh b/templates/sles-11-sp2/scripts/sshd.sh new file mode 100644 index 000000000..c6e4f20a6 --- /dev/null +++ b/templates/sles-11-sp2/scripts/sshd.sh @@ -0,0 +1,3 @@ +#!/bin/bash -eux + +echo "UseDNS no" >> /etc/ssh/sshd_config diff --git a/templates/sles-11-sp2/scripts/sudoers.sh b/templates/sles-11-sp2/scripts/sudoers.sh new file mode 100644 index 000000000..eb80f3f88 --- /dev/null +++ b/templates/sles-11-sp2/scripts/sudoers.sh @@ -0,0 +1,3 @@ +# update sudoers - can't do this in autoinst.xml +echo -e "\nupdate sudoers ..." +echo -e "vagrant ALL=(ALL) NOPASSWD: ALL\n" >> /etc/sudoers diff --git a/templates/sles-11-sp2/scripts/vagrant.sh b/templates/sles-11-sp2/scripts/vagrant.sh new file mode 100644 index 000000000..72dd2f444 --- /dev/null +++ b/templates/sles-11-sp2/scripts/vagrant.sh @@ -0,0 +1,33 @@ +#!/bin/bash -eux + +if [ -f /home/vagrant/.vbox_version ]; then + mkdir /tmp/vbox + VER=$(cat /home/vagrant/.vbox_version) + mount -o loop VBoxGuestAdditions_$VER.iso /tmp/vbox + sh /tmp/vbox/VBoxLinuxAdditions.run + umount /tmp/vbox + rmdir /tmp/vbox + rm *.iso +fi + +if [ -f /home/vagrant/.vmfusion_version ]; then + #Set Linux-specific paths and ISO filename + home_dir="/home/vagrant" + iso_name="linux.iso" + mount_point="/tmp/vmware-tools" + #Run install, unmount ISO and remove it + mkdir ${mount_point} + cd ${home_dir} + /bin/mount -o loop ${iso_name} ${mount_point} + tar zxf ${mount_point}/*.tar.gz && cd vmware-tools-distrib && ./vmware-install.pl --default + /bin/umount ${mount_point} + /bin/rm -rf ${home_dir}/${iso_name} ${home_dir}/vmware-tools-distrib + rmdir ${mount_point} +fi + +mkdir /home/vagrant/.ssh +wget --no-check-certificate \ + 'https://github.com/mitchellh/vagrant/raw/master/keys/vagrant.pub' \ + -O /home/vagrant/.ssh/authorized_keys +chown -R vagrant /home/vagrant/.ssh +chmod -R go-rwsx /home/vagrant/.ssh diff --git a/templates/sles-11-sp2/template.json b/templates/sles-11-sp2/template.json new file mode 100644 index 000000000..983b4a8f7 --- /dev/null +++ b/templates/sles-11-sp2/template.json @@ -0,0 +1,97 @@ +{ + "provisioners": [ + { + "type": "shell", + "scripts": [ + "scripts/vagrant.sh", + "scripts/sshd.sh", + "scripts/sudoers.sh", + "scripts/cleanup.sh", + "scripts/minimize.sh" + ], + "override": { + "virtualbox": { + "execute_command": "echo 'vagrant'|sudo -S sh '{{.Path}}'" + }, + "vmware": { + "execute_command": "echo 'vagrant'|sudo -S sh '{{.Path}}'" + } + } + } + ], + "builders": [ + { + "type": "virtualbox", + "boot_command": [ + "<esc><enter><wait>", + "linux netdevice=eth0 netsetup=dhcp install=cd:/<wait>", + " lang=en_US autoyast=http://{{ .HTTPIP }}:{{ .HTTPPort }}/autoinst.xml<wait>", + " textmode=1<wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "guest_os_type": "OpenSUSE_64", + "http_directory": "http", + "iso_checksum": "461d82ae6e15062b0807c1338f040497", + "iso_checksum_type": "md5", + "iso_url": "", + "ssh_username": "vagrant", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_wait_timeout": "10000s", + "shutdown_command": "echo '/sbin/halt -h -p' > shutdown.sh; echo 'vagrant'|sudo -S sh 'shutdown.sh'", + "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "virtualbox_version_file": ".vbox_version", + "vboxmanage": [ + [ + "modifyvm", + "{{.Name}}", + "--memory", + "480" + ], + [ + "modifyvm", + "{{.Name}}", + "--cpus", + "1" + ] + ], + "iso_md5": "461d82ae6e15062b0807c1338f040497" + }, + { + "type": "vmware", + "boot_command": [ + "<esc><enter><wait>", + "linux netdevice=eth0 netsetup=dhcp install=cd:/<wait>", + " lang=en_US autoyast=http://{{ .HTTPIP }}:{{ .HTTPPort }}/autoinst.xml<wait>", + " textmode=1<wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "guest_os_type": "opensuse-64", + "http_directory": "http", + "iso_checksum": "461d82ae6e15062b0807c1338f040497", + "iso_checksum_type": "md5", + "iso_url": "", + "ssh_username": "vagrant", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_wait_timeout": "10000s", + "shutdown_command": "echo '/sbin/halt -h -p' > shutdown.sh; echo 'vagrant'|sudo -S sh 'shutdown.sh'", + "vmx_data": { + "memsize": "480", + "numvcpus": "1", + "cpuid.coresPerSocket": "1" + }, + "iso_md5": "461d82ae6e15062b0807c1338f040497" + } + ], + "post-provisioner": [ + { + "type": "vagrant", + "output": "sles-11-sp2-{{.Provisioner}}.box" + } + ] +} \ No newline at end of file diff --git a/templates/sles-11-sp3-i386/http/autoinst.xml b/templates/sles-11-sp3-i386/http/autoinst.xml new file mode 100644 index 000000000..1277f42a7 --- /dev/null +++ b/templates/sles-11-sp3-i386/http/autoinst.xml @@ -0,0 +1,2569 @@ +<?xml version="1.0"?> +<!DOCTYPE profile> +<profile xmlns="http://www.suse.com/1.0/yast2ns" xmlns:config="http://www.suse.com/1.0/configns"> + <add-on> + <add_on_products config:type="list"> + <listentry> + <media_url><![CDATA[http://demeter.uni-regensburg.de/SLE11SP3-SDK-x86/DVD1/]]></media_url> + <product>sle-sdk</product> + <product_dir>/</product_dir> + </listentry> + </add_on_products> + </add-on> + <bootloader> + <device_map config:type="list"> + <device_map_entry> + <firmware>hd0</firmware> + <linux>/dev/sda</linux> + </device_map_entry> + </device_map> + <global> + <activate>true</activate> + <boot_root>true</boot_root> + <default>SUSE Linux Enterprise Server 11 SP3 - 3.0.76-0.11</default> + <generic_mbr>true</generic_mbr> + <gfxmenu>/boot/message</gfxmenu> + <lines_cache_id>2</lines_cache_id> + <timeout config:type="integer">8</timeout> + </global> + <initrd_modules config:type="list"> + <initrd_module> + <module>ahci</module> + </initrd_module> + <initrd_module> + <module>ata_piix</module> + </initrd_module> + <initrd_module> + <module>ata_generic</module> + </initrd_module> + <initrd_module> + <module>jbd</module> + </initrd_module> + <initrd_module> + <module>mbcache</module> + </initrd_module> + <initrd_module> + <module>ext3</module> + </initrd_module> + </initrd_modules> + <loader_type>grub</loader_type> + <sections config:type="list"> + <section> + <append>resume=/dev/sda1 splash=silent crashkernel=128M-:64M showopts</append> + <image>(hd0,1)/boot/vmlinuz-3.0.76-0.11-default</image> + <initial>1</initial> + <initrd>(hd0,1)/boot/initrd-3.0.76-0.11-default</initrd> + <lines_cache_id>0</lines_cache_id> + <name>SUSE Linux Enterprise Server 11 SP3 - 3.0.76-0.11</name> + <original_name>linux</original_name> + <root>/dev/sda2</root> + <type>image</type> + <vgamode>0x314</vgamode> + </section> + <section> + <append>showopts ide=nodma apm=off noresume edd=off powersaved=off nohz=off highres=off processor.max_cstate=1 nomodeset x11failsafe</append> + <image>(hd0,1)/boot/vmlinuz-3.0.76-0.11-default</image> + <initrd>(hd0,1)/boot/initrd-3.0.76-0.11-default</initrd> + <lines_cache_id>1</lines_cache_id> + <name>Failsafe -- SUSE Linux Enterprise Server 11 SP3 - 3.0.76-0.11</name> + <original_name>failsafe</original_name> + <root>/dev/sda2</root> + <type>image</type> + <vgamode>0x314</vgamode> + </section> + </sections> + </bootloader> + <ca_mgm> + <CAName>YaST_Default_CA</CAName> + <ca_commonName>YaST Default CA (vagrant-sles-11sp3-x86)</ca_commonName> + <country>US</country> + <locality></locality> + <organisation></organisation> + <organisationUnit></organisationUnit> + <password>ENTER PASSWORD HERE</password> + <server_commonName>vagrant-sles-11sp3-x86.vagrantup.com</server_commonName> + <server_email>postmaster@vagrantup.com</server_email> + <state></state> + <takeLocalServerName config:type="boolean">false</takeLocalServerName> + </ca_mgm> + <deploy_image> + <image_installation config:type="boolean">false</image_installation> + </deploy_image> + <general> + <ask-list config:type="list"/> + <mode> + <confirm config:type="boolean">false</confirm> + </mode> + <mouse> + <id>none</id> + </mouse> + <proposals config:type="list"/> + <signature-handling> + <accept_file_without_checksum config:type="boolean">true</accept_file_without_checksum> + <accept_non_trusted_gpg_key config:type="boolean">true</accept_non_trusted_gpg_key> + <accept_unknown_gpg_key config:type="boolean">true</accept_unknown_gpg_key> + <accept_unsigned_file config:type="boolean">true</accept_unsigned_file> + <accept_verification_failed config:type="boolean">false</accept_verification_failed> + <import_gpg_key config:type="boolean">true</import_gpg_key> + </signature-handling> + <storage/> + </general> + <groups config:type="list"> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>100</gid> + <group_password>x</group_password> + <groupname>users</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>19</gid> + <group_password>x</group_password> + <groupname>floppy</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>1</gid> + <group_password>x</group_password> + <groupname>bin</groupname> + <userlist>daemon</userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>41</gid> + <group_password>x</group_password> + <groupname>xok</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>65533</gid> + <group_password>x</group_password> + <groupname>nobody</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>43</gid> + <group_password>x</group_password> + <groupname>modem</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>5</gid> + <group_password>x</group_password> + <groupname>tty</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>7</gid> + <group_password>x</group_password> + <groupname>lp</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>104</gid> + <group_password>!</group_password> + <groupname>uuidd</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>51</gid> + <group_password>!</group_password> + <groupname>postfix</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>112</gid> + <group_password>!</group_password> + <groupname>gdm</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>65534</gid> + <group_password>x</group_password> + <groupname>nogroup</groupname> + <userlist>nobody</userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>101</gid> + <group_password>!</group_password> + <groupname>messagebus</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>59</gid> + <group_password>!</group_password> + <groupname>maildrop</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>33</gid> + <group_password>x</group_password> + <groupname>video</groupname> + <userlist>vagrant</userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>3</gid> + <group_password>x</group_password> + <groupname>sys</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>15</gid> + <group_password>x</group_password> + <groupname>shadow</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>20</gid> + <group_password>x</group_password> + <groupname>cdrom</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>21</gid> + <group_password>x</group_password> + <groupname>console</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>42</gid> + <group_password>x</group_password> + <groupname>trusted</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>102</gid> + <group_password>!</group_password> + <groupname>haldaemon</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>106</gid> + <group_password>!</group_password> + <groupname>puppet</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>16</gid> + <group_password>x</group_password> + <groupname>dialout</groupname> + <userlist>vagrant</userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>107</gid> + <group_password>!</group_password> + <groupname>polkituser</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>10</gid> + <group_password>x</group_password> + <groupname>wheel</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>109</gid> + <group_password>!</group_password> + <groupname>pulse</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>8</gid> + <group_password>x</group_password> + <groupname>www</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>40</gid> + <group_password>x</group_password> + <groupname>games</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>6</gid> + <group_password>x</group_password> + <groupname>disk</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>17</gid> + <group_password>x</group_password> + <groupname>audio</groupname> + <userlist>pulse</userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>111</gid> + <group_password>!</group_password> + <groupname>suse-ncc</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>49</gid> + <group_password>x</group_password> + <groupname>ftp</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>103</gid> + <group_password>!</group_password> + <groupname>tape</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>25</gid> + <group_password>!</group_password> + <groupname>at</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>9</gid> + <group_password>x</group_password> + <groupname>kmem</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>32</gid> + <group_password>x</group_password> + <groupname>public</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>12</gid> + <group_password>x</group_password> + <groupname>mail</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>0</gid> + <group_password>x</group_password> + <groupname>root</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>2</gid> + <group_password>x</group_password> + <groupname>daemon</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>105</gid> + <group_password>!</group_password> + <groupname>sfcb</groupname> + <userlist>root</userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>108</gid> + <group_password>!</group_password> + <groupname>ntp</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>14</gid> + <group_password>x</group_password> + <groupname>uucp</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>110</gid> + <group_password>!</group_password> + <groupname>pulse-access</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>71</gid> + <group_password>!</group_password> + <groupname>ntadmin</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>62</gid> + <group_password>x</group_password> + <groupname>man</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>22</gid> + <group_password>x</group_password> + <groupname>utmp</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>13</gid> + <group_password>x</group_password> + <groupname>news</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>65</gid> + <group_password>!</group_password> + <groupname>sshd</groupname> + <userlist></userlist> + </group> + </groups> + <host> + <hosts config:type="list"> + <hosts_entry> + <host_address>127.0.0.1</host_address> + <names config:type="list"> + <name>localhost</name> + </names> + </hosts_entry> + <hosts_entry> + <host_address>::1</host_address> + <names config:type="list"> + <name>localhost ipv6-localhost ipv6-loopback</name> + </names> + </hosts_entry> + <hosts_entry> + <host_address>fe00::0</host_address> + <names config:type="list"> + <name>ipv6-localnet</name> + </names> + </hosts_entry> + <hosts_entry> + <host_address>ff00::0</host_address> + <names config:type="list"> + <name>ipv6-mcastprefix</name> + </names> + </hosts_entry> + <hosts_entry> + <host_address>ff02::1</host_address> + <names config:type="list"> + <name>ipv6-allnodes</name> + </names> + </hosts_entry> + <hosts_entry> + <host_address>ff02::2</host_address> + <names config:type="list"> + <name>ipv6-allrouters</name> + </names> + </hosts_entry> + <hosts_entry> + <host_address>ff02::3</host_address> + <names config:type="list"> + <name>ipv6-allhosts</name> + </names> + </hosts_entry> + </hosts> + </host> + <login_settings/> + <networking> + <dhcp_options> + <dhclient_client_id></dhclient_client_id> + <dhclient_hostname_option>AUTO</dhclient_hostname_option> + </dhcp_options> + <dns> + <dhcp_hostname config:type="boolean">false</dhcp_hostname> + <domain>vagrantup.com</domain> + <hostname>vagrant-sles-11sp3-x86</hostname> + <resolv_conf_policy>auto</resolv_conf_policy> + <searchlist config:type="list"> + <search>vagrantup.com</search> + </searchlist> + <write_hostname config:type="boolean">true</write_hostname> + </dns> + <interfaces config:type="list"> + <interface> + <bootproto>dhcp</bootproto> + <device>eth0</device> + <name>82540EM Gigabit Ethernet Controller</name> + <startmode>auto</startmode> + <usercontrol>no</usercontrol> + </interface> + </interfaces> + <managed config:type="boolean">false</managed> + <net-udev config:type="list"> + <rule> + <name>eth0</name> + <rule>KERNELS</rule> + <value>0000:00:03.0</value> + </rule> + </net-udev> + <routing> + <ip_forward config:type="boolean">false</ip_forward> + </routing> + </networking> + <partitioning config:type="list"> + <drive> + <device>/dev/sda</device> + <initialize config:type="boolean">true</initialize> + <partitions config:type="list"> + <partition> + <create config:type="boolean">true</create> + <crypt_fs config:type="boolean">false</crypt_fs> + <filesystem config:type="symbol">swap</filesystem> + <format config:type="boolean">true</format> + <fstopt>defaults</fstopt> + <loop_fs config:type="boolean">false</loop_fs> + <mount>swap</mount> + <mountby config:type="symbol">device</mountby> + <partition_id config:type="integer">130</partition_id> + <partition_nr config:type="integer">1</partition_nr> + <raid_options/> + <resize config:type="boolean">false</resize> + <size>1561492992</size> + </partition> + <partition> + <create config:type="boolean">true</create> + <crypt_fs config:type="boolean">false</crypt_fs> + <filesystem config:type="symbol">ext3</filesystem> + <format config:type="boolean">true</format> + <fstopt>acl,user_xattr</fstopt> + <loop_fs config:type="boolean">false</loop_fs> + <mount>/</mount> + <mountby config:type="symbol">device</mountby> + <partition_id config:type="integer">131</partition_id> + <partition_nr config:type="integer">2</partition_nr> + <raid_options/> + <resize config:type="boolean">false</resize> + <size>19895844352</size> + </partition> + </partitions> + <pesize></pesize> + <type config:type="symbol">CT_DISK</type> + <use>all</use> + </drive> + </partitioning> + <report> + <errors> + <log config:type="boolean">true</log> + <show config:type="boolean">true</show> + <timeout config:type="integer">0</timeout> + </errors> + <messages> + <log config:type="boolean">true</log> + <show config:type="boolean">true</show> + <timeout config:type="integer">0</timeout> + </messages> + <warnings> + <log config:type="boolean">true</log> + <show config:type="boolean">true</show> + <timeout config:type="integer">0</timeout> + </warnings> + <yesno_messages> + <log config:type="boolean">true</log> + <show config:type="boolean">true</show> + <timeout config:type="integer">0</timeout> + </yesno_messages> + </report> + <software> + + <packages config:type="list"> + <package>desktop-translations</package> + <package>gconf2-branding-SLES</package> + <package>libproxy0-config-gnome</package> + <package>sle-sdk-release</package> + <package>sle-sdk-release-SDK</package> + <package>sles-manuals_en</package> + <package>yast2-trans-en_US</package> + </packages> + <patterns config:type="list"> + <pattern>Basis-Devel</pattern> + <pattern>Minimal</pattern> + <pattern>apparmor</pattern> + <pattern>base</pattern> + <pattern>sdk_kernel</pattern> + </patterns> + <remove-packages config:type="list"> + <package>3ddiag</package> + <package>CASA</package> + <package>CASA-devel</package> + <package>CASA_auth_token_client</package> + <package>CASA_auth_token_client-devel</package> + <package>ConsoleKit-devel</package> + <package>ConsoleKit-x11</package> + <package>DirectFB-devel</package> + <package>FastCGI</package> + <package>IlmBase</package> + <package>IlmBase-devel</package> + <package>ImageMagick</package> + <package>ImageMagick-devel</package> + <package>LibVNCServer</package> + <package>LibVNCServer-devel</package> + <package>Mesa</package> + <package>Mesa-devel</package> + <package>ModemManager</package> + <package>Modules</package> + <package>NetworkManager</package> + <package>NetworkManager-devel</package> + <package>NetworkManager-glib</package> + <package>NetworkManager-gnome</package> + <package>NetworkManager-kde4</package> + <package>NetworkManager-kde4-lang</package> + <package>NetworkManager-kde4-libs</package> + <package>OpenEXR</package> + <package>OpenEXR-devel</package> + <package>OpenIPMI-devel</package> + <package>PackageKit</package> + <package>PackageKit-devel</package> + <package>PackageKit-lang</package> + <package>PolicyKit-devel</package> + <package>PolicyKit-gnome</package> + <package>PolicyKit-gnome-devel</package> + <package>PolicyKit-gnome-libs</package> + <package>SDL-devel</package> + <package>SDL_net</package> + <package>SDL_net-devel</package> + <package>TeX-Guy</package> + <package>TeX-Guy-devel</package> + <package>VFlib3</package> + <package>VFlib3-devel</package> + <package>WindowMaker</package> + <package>WindowMaker-devel</package> + <package>a2ps</package> + <package>aalib</package> + <package>aalib-devel</package> + <package>akonadi-runtime</package> + <package>akregator</package> + <package>alsa-devel</package> + <package>alsa-firmware</package> + <package>alsa-plugins-pulse</package> + <package>alsa-tools</package> + <package>alsa-tools-devel</package> + <package>anthy</package> + <package>anthy-devel</package> + <package>antlr</package> + <package>apache2</package> + <package>apache2-devel</package> + <package>apache2-mod_perl</package> + <package>apache2-mod_perl-devel</package> + <package>apache2-prefork</package> + <package>apache2-utils</package> + <package>apache2-worker</package> + <package>apparmor-profile-editor</package> + <package>art-sharp2</package> + <package>arts</package> + <package>arts-devel</package> + <package>aspell-devel</package> + <package>at-spi</package> + <package>at-spi-devel</package> + <package>at-spi-lang</package> + <package>atk-devel</package> + <package>audiofile</package> + <package>audiofile-devel</package> + <package>audit-devel</package> + <package>augeas-lenses</package> + <package>automoc4</package> + <package>avahi</package> + <package>avahi-compat-howl-devel</package> + <package>avahi-compat-mDNSResponder-devel</package> + <package>avahi-lang</package> + <package>babl-0_0</package> + <package>banshee-1</package> + <package>banshee-1-backend-engine-gstreamer</package> + <package>banshee-1-backend-platform-gnome</package> + <package>banshee-1-backend-platform-unix</package> + <package>banshee-1-devel</package> + <package>banshee-1-extensions-default</package> + <package>banshee-1-lang</package> + <package>beagle-devel</package> + <package>bind-devel</package> + <package>binutils-devel</package> + <package>bluez</package> + <package>bluez-devel</package> + <package>boo</package> + <package>boo-devel</package> + <package>boost-devel</package> + <package>bootsplash-branding-SLED</package> + <package>cairo-devel</package> + <package>cairomm</package> + <package>cairomm-devel</package> + <package>canna</package> + <package>canna-devel</package> + <package>canna-libs</package> + <package>cannadic</package> + <package>capi4linux</package> + <package>capi4linux-devel</package> + <package>cdk</package> + <package>cdk-devel</package> + <package>cdrdao</package> + <package>chasen</package> + <package>chasen-devel</package> + <package>check</package> + <package>check-devel</package> + <package>chmlib</package> + <package>chmlib-devel</package> + <package>cim-schema</package> + <package>clucene-core</package> + <package>clucene-core-devel</package> + <package>cmake</package> + <package>compiz</package> + <package>compiz-branding-SLE</package> + <package>compiz-devel</package> + <package>compiz-gnome</package> + <package>coolkey-devel</package> + <package>cracklib-devel</package> + <package>crash-devel</package> + <package>crimson</package> + <package>cscope</package> + <package>cups</package> + <package>cups-devel</package> + <package>cvsps</package> + <package>cyrus-imapd-devel</package> + <package>cyrus-sasl-crammd5</package> + <package>cyrus-sasl-devel</package> + <package>dante</package> + <package>dante-devel</package> + <package>db1</package> + <package>db1-devel</package> + <package>db43</package> + <package>db43-devel</package> + <package>dbus-1-devel</package> + <package>dbus-1-glib-devel</package> + <package>dbus-1-python-devel</package> + <package>dbus-1-qt3</package> + <package>dbus-1-qt3-devel</package> + <package>dbus-1-x11</package> + <package>dejagnu</package> + <package>dejavu</package> + <package>desktop-data-openSUSE</package> + <package>desktop-file-utils</package> + <package>devhelp</package> + <package>devhelp-devel</package> + <package>devhelp-lang</package> + <package>device-mapper-devel</package> + <package>dhcp</package> + <package>dhcp-client</package> + <package>dhcp-devel</package> + <package>diffstat</package> + <package>dmapi-devel</package> + <package>dnsmasq</package> + <package>docbook-xsl-stylesheets</package> + <package>docbook_4</package> + <package>doxygen</package> + <package>dvd+rw-tools</package> + <package>e2fsprogs-devel</package> + <package>emacs</package> + <package>emacs-nox</package> + <package>emacs-x11</package> + <package>enchant</package> + <package>enchant-devel</package> + <package>enscript</package> + <package>eog</package> + <package>eog-devel</package> + <package>eog-lang</package> + <package>espeak</package> + <package>evince</package> + <package>evince-devel</package> + <package>evince-lang</package> + <package>evoldap2-devel</package> + <package>evolution</package> + <package>evolution-data-server</package> + <package>evolution-data-server-devel</package> + <package>evolution-data-server-lang</package> + <package>evolution-devel</package> + <package>evolution-lang</package> + <package>expect-devel</package> + <package>facter</package> + <package>fam</package> + <package>fam-devel</package> + <package>farsight</package> + <package>farsight-devel</package> + <package>festival</package> + <package>festival-devel</package> + <package>fftw</package> + <package>fftw-devel</package> + <package>fftw-mpi</package> + <package>fftw-mpi-devel</package> + <package>fftw-threads</package> + <package>fftw-threads-devel</package> + <package>fftw3</package> + <package>fftw3-devel</package> + <package>fftw3-threads</package> + <package>fftw3-threads-devel</package> + <package>file-devel</package> + <package>fileshareset</package> + <package>finch</package> + <package>finch-devel</package> + <package>flac-devel</package> + <package>fltk</package> + <package>fltk-devel</package> + <package>fontconfig-devel</package> + <package>fonts-config</package> + <package>foomatic-filters</package> + <package>freeglut</package> + <package>freeglut-devel</package> + <package>freeradius-client-devel</package> + <package>freeradius-client-libs</package> + <package>freeradius-server-devel</package> + <package>freeradius-server-libs</package> + <package>freetype</package> + <package>freetype2-devel</package> + <package>fribidi</package> + <package>fribidi-devel</package> + <package>ft2demos</package> + <package>fuse-devel</package> + <package>fwnn-devel</package> + <package>fxload</package> + <package>gcc-gij</package> + <package>gcc-java</package> + <package>gcc43-gij</package> + <package>gcc43-java</package> + <package>gconf-sharp2</package> + <package>gconf2-devel</package> + <package>gconfmm</package> + <package>gconfmm-devel</package> + <package>gd</package> + <package>gd-devel</package> + <package>gdbm-32bit</package> + <package>gdk-pixbuf</package> + <package>gdk-pixbuf-devel</package> + <package>gegl-0_0</package> + <package>gettext-tools</package> + <package>gfxboot-branding-SLED</package> + <package>gfxboot-devel</package> + <package>ggz</package> + <package>ggz-client-libs</package> + <package>ggz-client-libs-devel</package> + <package>ggz-client-libs-lang</package> + <package>ghex</package> + <package>ghex-devel</package> + <package>ghex-lang</package> + <package>ghostscript-devel</package> + <package>ghostscript-fonts-other</package> + <package>ghostscript-fonts-std</package> + <package>ghostscript-ijs-devel</package> + <package>ghostscript-library</package> + <package>ghostscript-omni</package> + <package>ghostscript-x11</package> + <package>giflib-devel</package> + <package>gimp</package> + <package>gimp-branding-SLED</package> + <package>gimp-devel</package> + <package>gimp-lang</package> + <package>gimp-plugins-python</package> + <package>git</package> + <package>git-arch</package> + <package>git-core</package> + <package>git-cvs</package> + <package>git-daemon</package> + <package>git-email</package> + <package>git-gui</package> + <package>git-svn</package> + <package>git-web</package> + <package>gitk</package> + <package>gjdoc</package> + <package>glade-sharp2</package> + <package>glade3</package> + <package>glade3-lang</package> + <package>glib</package> + <package>glib-devel</package> + <package>glib-sharp2</package> + <package>glib2-devel</package> + <package>glibmm2</package> + <package>glibmm2-devel</package> + <package>glitz</package> + <package>glitz-devel</package> + <package>gltt</package> + <package>gltt-devel</package> + <package>gmime-2_4-devel</package> + <package>gmime-devel</package> + <package>gmp-devel</package> + <package>gnet</package> + <package>gnet-devel</package> + <package>gnokii</package> + <package>gnokii-devel</package> + <package>gnokii-smsd</package> + <package>gnome-certauth-devel</package> + <package>gnome-control-center</package> + <package>gnome-control-center-devel</package> + <package>gnome-control-center-lang</package> + <package>gnome-desktop</package> + <package>gnome-desktop-devel</package> + <package>gnome-desktop-lang</package> + <package>gnome-doc-utils</package> + <package>gnome-doc-utils-devel</package> + <package>gnome-doc-utils-lang</package> + <package>gnome-keyring-devel</package> + <package>gnome-keyring-sharp</package> + <package>gnome-keyring-sharp-devel</package> + <package>gnome-libs</package> + <package>gnome-libs-devel</package> + <package>gnome-mag</package> + <package>gnome-mag-devel</package> + <package>gnome-mag-lang</package> + <package>gnome-main-menu</package> + <package>gnome-main-menu-lang</package> + <package>gnome-media</package> + <package>gnome-media-devel</package> + <package>gnome-media-lang</package> + <package>gnome-menus</package> + <package>gnome-menus-branding-SLED</package> + <package>gnome-menus-devel</package> + <package>gnome-menus-lang</package> + <package>gnome-mount</package> + <package>gnome-mount-lang</package> + <package>gnome-panel</package> + <package>gnome-panel-devel</package> + <package>gnome-panel-lang</package> + <package>gnome-pilot</package> + <package>gnome-pilot-devel</package> + <package>gnome-pilot-lang</package> + <package>gnome-settings-daemon</package> + <package>gnome-settings-daemon-devel</package> + <package>gnome-settings-daemon-lang</package> + <package>gnome-sharp2</package> + <package>gnome-speech</package> + <package>gnome-speech-devel</package> + <package>gnome-themes</package> + <package>gnome-utils</package> + <package>gnome-utils-devel</package> + <package>gnome-utils-lang</package> + <package>gnome-vfs-sharp2</package> + <package>gnome-vfs2</package> + <package>gnome-vfs2-devel</package> + <package>gnome-vfs2-lang</package> + <package>gnome-vfsmm</package> + <package>gnome-vfsmm-devel</package> + <package>gnopernicus</package> + <package>gnopernicus-devel</package> + <package>gnopernicus-lang</package> + <package>gnutls</package> + <package>goffice</package> + <package>goffice-devel</package> + <package>goffice-lang</package> + <package>goocanvas</package> + <package>goocanvas-devel</package> + <package>goocanvas-lang</package> + <package>goom2k4</package> + <package>goom2k4-devel</package> + <package>graphviz</package> + <package>graphviz-devel</package> + <package>graphviz-gd</package> + <package>graphviz-gnome</package> + <package>gstreamer-0_10</package> + <package>gstreamer-0_10-devel</package> + <package>gstreamer-0_10-lang</package> + <package>gstreamer-0_10-plugins-base</package> + <package>gstreamer-0_10-plugins-base-devel</package> + <package>gstreamer-0_10-plugins-base-lang</package> + <package>gstreamer-0_10-plugins-good</package> + <package>gstreamer-0_10-plugins-good-lang</package> + <package>gstreamer-0_10-utils</package> + <package>gstreamer-utils</package> + <package>gtk</package> + <package>gtk-devel</package> + <package>gtk-lang</package> + <package>gtk-sharp2</package> + <package>gtk-vnc-devel</package> + <package>gtk2-devel</package> + <package>gtkglext</package> + <package>gtkglext-devel</package> + <package>gtkhtml2</package> + <package>gtkhtml2-devel</package> + <package>gtkhtml2-lang</package> + <package>gtkhtml314-sharp</package> + <package>gtkmm2</package> + <package>gtkmm2-devel</package> + <package>gtksourceview-devel</package> + <package>gtksourceview-lang</package> + <package>gtksourceview18</package> + <package>gtksourceview18-devel</package> + <package>gtkspell</package> + <package>gtkspell-devel</package> + <package>gtkspell-lang</package> + <package>gucharmap</package> + <package>gucharmap-devel</package> + <package>gucharmap-lang</package> + <package>guile</package> + <package>guile-devel</package> + <package>gutenprint</package> + <package>gutenprint-devel</package> + <package>gvfs-devel</package> + <package>gxmhtml</package> + <package>hal-devel</package> + <package>hal-palm</package> + <package>htdig</package> + <package>htdig-devel</package> + <package>hunspell</package> + <package>hunspell-devel</package> + <package>hunspell-tools</package> + <package>hwinfo-devel</package> + <package>i4l-base</package> + <package>icewm</package> + <package>icewm-lite</package> + <package>id3lib</package> + <package>id3lib-devel</package> + <package>imap-devel</package> + <package>imap-lib</package> + <package>imlib</package> + <package>imlib-devel</package> + <package>imlib2</package> + <package>imlib2-devel</package> + <package>indent</package> + <package>info2html</package> + <package>inn</package> + <package>inn-devel</package> + <package>intltool</package> + <package>ipadic</package> + <package>iptables-devel</package> + <package>iso-codes</package> + <package>iso-codes-devel</package> + <package>iso_ent</package> + <package>ispell</package> + <package>ispell-american</package> + <package>ispell-brazilian</package> + <package>ispell-british</package> + <package>ispell-czech</package> + <package>ispell-danish</package> + <package>ispell-finnish</package> + <package>ispell-french</package> + <package>ispell-german</package> + <package>ispell-hungarian</package> + <package>ispell-italian</package> + <package>ispell-ngerman</package> + <package>ispell-norsk</package> + <package>ispell-polish</package> + <package>ispell-portuguese</package> + <package>ispell-russian</package> + <package>ispell-slovak</package> + <package>ispell-spanish</package> + <package>ispell-swedish</package> + <package>itcl-devel</package> + <package>java-1_4_2-ibm</package> + <package>java-1_4_2-ibm-devel</package> + <package>java-1_5_0-gcj-compat</package> + <package>java-1_5_0-gcj-compat-devel</package> + <package>java-1_6_0-ibm</package> + <package>java-1_6_0-ibm-devel</package> + <package>joe</package> + <package>jpackage-utils</package> + <package>k3b</package> + <package>k3b-devel</package> + <package>k3b-lang</package> + <package>kaddressbook</package> + <package>kalarm</package> + <package>kde-susetranslations</package> + <package>kde4-filesystem</package> + <package>kde4-kgreeter-plugins</package> + <package>kdebase3</package> + <package>kdebase3-devel</package> + <package>kdebase3-runtime</package> + <package>kdebase4-SLED</package> + <package>kdebase4-SLED-lang</package> + <package>kdebase4-runtime</package> + <package>kdebase4-runtime-branding-SLED</package> + <package>kdebase4-workspace</package> + <package>kdebase4-workspace-branding-SLED</package> + <package>kdebase4-workspace-devel</package> + <package>kdebase4-workspace-ksysguardd</package> + <package>kdelibs3</package> + <package>kdelibs3-arts</package> + <package>kdelibs3-default-style</package> + <package>kdelibs3-devel</package> + <package>kdelibs3-doc</package> + <package>kdelibs4</package> + <package>kdelibs4-branding-SLED</package> + <package>kdelibs4-core</package> + <package>kdelibs4-doc</package> + <package>kdemultimedia3-arts</package> + <package>kdepim3</package> + <package>kdepim4</package> + <package>kdepim4-devel</package> + <package>kdepimlibs4</package> + <package>kdialog</package> + <package>kdm</package> + <package>kdm-branding-SLED</package> + <package>kernel-docs</package> + <package>kernel-syms</package> + <package>kernel-trace-devel</package> + <package>kernel-xen-devel</package> + <package>keyutils-devel</package> + <package>kio_sysinfo</package> + <package>kio_sysinfo-branding-SLED</package> + <package>kmail</package> + <package>knode</package> + <package>kontact</package> + <package>korganizer</package> + <package>kpilot</package> + <package>krb5-devel</package> + <package>ksh-devel</package> + <package>ktorrent</package> + <package>ktorrent-devel</package> + <package>ktorrent-lang</package> + <package>kwin</package> + <package>ladspa-devel</package> + <package>lib3ds-1-3</package> + <package>lib3ds-devel</package> + <package>libFLAC++6</package> + <package>libFLAC8</package> + <package>libHX-devel</package> + <package>libMagick++-devel</package> + <package>libMagick++1</package> + <package>libMagickWand1</package> + <package>libQtWebKit-devel</package> + <package>libQtWebKit4</package> + <package>libXerces-c-devel</package> + <package>libXerces-c28</package> + <package>libXiterm</package> + <package>libXiterm-devel</package> + <package>libacl-devel</package> + <package>libadns-devel</package> + <package>libadns1</package> + <package>libakode</package> + <package>libakode-devel</package> + <package>libakonadi4</package> + <package>libakonadiprotocolinternals-devel</package> + <package>libakonadiprotocolinternals1</package> + <package>libao</package> + <package>libao-devel</package> + <package>libapparmor-devel</package> + <package>libapr-util1</package> + <package>libapr-util1-devel</package> + <package>libapr1</package> + <package>libapr1-devel</package> + <package>libarchive-devel</package> + <package>libart_lgpl</package> + <package>libart_lgpl-devel</package> + <package>libassuan-devel</package> + <package>libatomic-ops-devel</package> + <package>libattr-devel</package> + <package>libavahi-core5</package> + <package>libavahi-devel</package> + <package>libavahi-glib-devel</package> + <package>libavahi-gobject-devel</package> + <package>libavahi-gobject0</package> + <package>libavahi-ui0</package> + <package>libavc1394-0</package> + <package>libavc1394-devel</package> + <package>libbabl-0_0-0</package> + <package>libbeagle-devel</package> + <package>libbeagle-python</package> + <package>libbeagle1</package> + <package>libbitmask-devel</package> + <package>libbitmask1</package> + <package>libblkid-devel</package> + <package>libblocxx-devel</package> + <package>libbonobo</package> + <package>libbonobo-devel</package> + <package>libbonobo-lang</package> + <package>libbonoboui</package> + <package>libbonoboui-devel</package> + <package>libbonoboui-lang</package> + <package>libboost_date_time1_36_0</package> + <package>libboost_filesystem1_36_0</package> + <package>libboost_graph1_36_0</package> + <package>libboost_iostreams1_36_0</package> + <package>libboost_math1_36_0</package> + <package>libboost_mpi1_36_0</package> + <package>libboost_program_options1_36_0</package> + <package>libboost_python1_36_0</package> + <package>libboost_serialization1_36_0</package> + <package>libboost_signals1_36_0</package> + <package>libboost_system1_36_0</package> + <package>libboost_test1_36_0</package> + <package>libboost_thread1_36_0</package> + <package>libboost_wave1_36_0</package> + <package>libbotan-1_6_4</package> + <package>libbotan-devel</package> + <package>libbtctl</package> + <package>libbtctl-devel</package> + <package>libbtctl-lang</package> + <package>libbtctl4</package> + <package>libbz2-devel</package> + <package>libcaca</package> + <package>libcaca-devel</package> + <package>libcanberra-gtk</package> + <package>libcanberra-gtk0</package> + <package>libcanberra0</package> + <package>libcap-devel</package> + <package>libcap-ng0</package> + <package>libcdda_interface0</package> + <package>libcdda_paranoia0</package> + <package>libcddb-devel</package> + <package>libcddb2</package> + <package>libcdio++0</package> + <package>libcdio-devel</package> + <package>libcgroup-devel</package> + <package>libcgroup1</package> + <package>libchewing</package> + <package>libchewing-devel</package> + <package>libcmpiutil</package> + <package>libcmpiutil-devel</package> + <package>libcolorblind0</package> + <package>libcom_err-devel</package> + <package>libcompizconfig</package> + <package>libcompizconfig-devel</package> + <package>libcppunit-1_12-0</package> + <package>libcppunit-devel</package> + <package>libcpuset-devel</package> + <package>libcpuset1</package> + <package>libcroco</package> + <package>libcroco-0_6-3</package> + <package>libcroco-devel</package> + <package>libcryptsetup-devel</package> + <package>libcsync-devel</package> + <package>libcsync0</package> + <package>libcurl-devel</package> + <package>libdaemon-devel</package> + <package>libdaemon0</package> + <package>libdatrie-devel</package> + <package>libdatrie0</package> + <package>libdb-4_5-32bit</package> + <package>libdb-4_5-devel</package> + <package>libdbus-1-qt3-0</package> + <package>libdbus-1-qt3-0-devel</package> + <package>libdc1394-22</package> + <package>libdc1394-devel</package> + <package>libdc1394_control12</package> + <package>libdc1394_control12-devel</package> + <package>libdhcp6client-1_0-2</package> + <package>libdhcp6client-devel</package> + <package>libdigikam-devel</package> + <package>libdiscid1</package> + <package>libdjvulibre-devel</package> + <package>libdjvulibre21</package> + <package>libdmxview-devel</package> + <package>libdmxview0</package> + <package>libdnet-devel</package> + <package>libdnet1</package> + <package>libdns_sd</package> + <package>libdrm</package> + <package>libdrm-devel</package> + <package>libdv-devel</package> + <package>libdv4</package> + <package>libdvdread4</package> + <package>libdw-devel</package> + <package>libebl-devel</package> + <package>libedit-devel</package> + <package>libedit0</package> + <package>libelf-devel</package> + <package>libenchant1</package> + <package>libesd-devel</package> + <package>libesd0</package> + <package>libesmtp-devel</package> + <package>libevoldap-2_4-2</package> + <package>libevtlog-devel</package> + <package>libevtlog0</package> + <package>libexempi-devel</package> + <package>libexempi3</package> + <package>libexif-devel</package> + <package>libexiv2-4</package> + <package>libexiv2-devel</package> + <package>libexpat-devel</package> + <package>libext2fs-devel</package> + <package>libfarsight-0_1-3</package> + <package>libffi-devel</package> + <package>libffi43</package> + <package>libffi43-devel</package> + <package>libflaim-devel</package> + <package>libfprint-devel</package> + <package>libfreebl3</package> + <package>libfreebob</package> + <package>libfreebob-devel</package> + <package>libgadu</package> + <package>libgadu-devel</package> + <package>libgail-gnome</package> + <package>libgail-gnome-devel</package> + <package>libgcj-devel</package> + <package>libgcj43</package> + <package>libgcj43-devel</package> + <package>libgcj43-jar</package> + <package>libgcj_bc43</package> + <package>libgcrypt-devel</package> + <package>libgda-3_0-3</package> + <package>libgda-3_0-devel</package> + <package>libgdiplus0</package> + <package>libgegl-0_0-0</package> + <package>libgeoclue0</package> + <package>libgfortran46</package> + <package>libggz2</package> + <package>libggz2-devel</package> + <package>libgimpprint</package> + <package>libgimpprint-devel</package> + <package>libglade2</package> + <package>libglade2-devel</package> + <package>libglademm</package> + <package>libglademm-2_4-1</package> + <package>libglademm-devel</package> + <package>libgladeui-1-9</package> + <package>libgladeui-1_0-devel</package> + <package>libgmime-2_0-3</package> + <package>libgmime-2_4-2</package> + <package>libgmm++-devel</package> + <package>libgnome</package> + <package>libgnome-certauth0</package> + <package>libgnome-desktop-2-11</package> + <package>libgnome-devel</package> + <package>libgnome-lang</package> + <package>libgnome-menu2</package> + <package>libgnome-window-settings1</package> + <package>libgnomecanvas</package> + <package>libgnomecanvas-devel</package> + <package>libgnomecanvas-lang</package> + <package>libgnomecanvasmm</package> + <package>libgnomecanvasmm-devel</package> + <package>libgnomecups</package> + <package>libgnomecups-devel</package> + <package>libgnomecups-lang</package> + <package>libgnomedb</package> + <package>libgnomedb-devel</package> + <package>libgnomedb-lang</package> + <package>libgnomekbd</package> + <package>libgnomekbd-devel</package> + <package>libgnomekbd-lang</package> + <package>libgnomeprint</package> + <package>libgnomeprint-devel</package> + <package>libgnomeprint-lang</package> + <package>libgnomeprintui</package> + <package>libgnomeprintui-devel</package> + <package>libgnomeprintui-lang</package> + <package>libgnomesu</package> + <package>libgnomesu-devel</package> + <package>libgnomesu-lang</package> + <package>libgnomesu0</package> + <package>libgnomeui</package> + <package>libgnomeui-devel</package> + <package>libgnomeui-lang</package> + <package>libgnomevfsmm-2_6-1</package> + <package>libgnutls-devel</package> + <package>libgnutls-extra-devel</package> + <package>libgnutls-extra26</package> + <package>libgoocanvas3</package> + <package>libgpg-error-devel</package> + <package>libgpgme-devel</package> + <package>libgphoto2-devel</package> + <package>libgpod-devel</package> + <package>libgsf</package> + <package>libgsf-1-114</package> + <package>libgsf-devel</package> + <package>libgsf-gnome</package> + <package>libgsm-devel</package> + <package>libgsm1</package> + <package>libgssglue-devel</package> + <package>libgstapp-0_10-0</package> + <package>libgstinterfaces-0_10-0</package> + <package>libgstreamer-0_10-0</package> + <package>libgtk-vnc-1_0-0</package> + <package>libgtkhtml</package> + <package>libgtkhtml-devel</package> + <package>libgtksourceview-2_0-0</package> + <package>libgtop</package> + <package>libgtop-2_0-7</package> + <package>libgtop-devel</package> + <package>libgtop-lang</package> + <package>libgudev-1_0-0</package> + <package>libgweather</package> + <package>libgweather-devel</package> + <package>libgweather-lang</package> + <package>libgweather1</package> + <package>libhangul</package> + <package>libhangul-devel</package> + <package>libhowl0</package> + <package>libical-devel</package> + <package>libical0</package> + <package>libicu-devel</package> + <package>libid3tag</package> + <package>libid3tag-devel</package> + <package>libidl-devel</package> + <package>libidn-devel</package> + <package>libiec61883</package> + <package>libiec61883-devel</package> + <package>libieee1284</package> + <package>libiniparser-devel</package> + <package>libiniparser0</package> + <package>libiptcdata</package> + <package>libiptcdata-devel</package> + <package>libiptcdata0</package> + <package>libiso9660-5</package> + <package>libiterm</package> + <package>libiterm-devel</package> + <package>libjack-devel</package> + <package>libjack0</package> + <package>libjasper</package> + <package>libjasper-devel</package> + <package>libjingle-0_3-0</package> + <package>libjingle-devel</package> + <package>libjpeg-devel</package> + <package>libkcal</package> + <package>libkcal-devel</package> + <package>libkcal2</package> + <package>libkcddb4</package> + <package>libkcddb4-devel</package> + <package>libkcompactdisc4</package> + <package>libkcompactdisc4-devel</package> + <package>libkdcraw3</package> + <package>libkdcraw3-devel</package> + <package>libkdcraw3-lang</package> + <package>libkde4</package> + <package>libkde4-devel</package> + <package>libkdecore4</package> + <package>libkdecore4-devel</package> + <package>libkdepim4</package> + <package>libkdepim4-devel</package> + <package>libkdepimlibs4</package> + <package>libkdepimlibs4-devel</package> + <package>libkexiv2-3</package> + <package>libkexiv2-3-devel</package> + <package>libkexiv2-7</package> + <package>libkipi-devel</package> + <package>libkipi6</package> + <package>libkmime-devel</package> + <package>libkmime2</package> + <package>libknotificationitem-1-1</package> + <package>libkonq-devel</package> + <package>libkonq5</package> + <package>libksba-devel</package> + <package>libktnef-devel</package> + <package>libktnef1</package> + <package>liblazy-devel</package> + <package>liblazy1</package> + <package>liblcms-devel</package> + <package>libldapcpp-devel</package> + <package>liblog4c-devel</package> + <package>liblog4c3</package> + <package>libloudmouth-1-0</package> + <package>liblpsolve55</package> + <package>liblua5_1</package> + <package>libmalaga-devel</package> + <package>libmalaga7</package> + <package>libmcrypt</package> + <package>libmcrypt-devel</package> + <package>libmikmod</package> + <package>libmikmod-devel</package> + <package>libmm-devel</package> + <package>libmm14</package> + <package>libmng-devel</package> + <package>libmpcdec-devel</package> + <package>libmpcdec5</package> + <package>libmspack-devel</package> + <package>libmtp-devel</package> + <package>libmtp8</package> + <package>libmusicbrainz-devel</package> + <package>libmusicbrainz3-6</package> + <package>libmusicbrainz3-devel</package> + <package>libmusicbrainz4</package> + <package>libmysqlclient-devel</package> + <package>libmysqlclient15</package> + <package>libmysqlclient_r15</package> + <package>libneon-devel</package> + <package>libneon27</package> + <package>libnetapi-devel</package> + <package>libnetapi0</package> + <package>libnetcontrol0</package> + <package>libnetpbm-devel</package> + <package>libnetpbm10</package> + <package>libnewt0_52</package> + <package>libnjb</package> + <package>libnjb-devel</package> + <package>libnjb5</package> + <package>libnl-devel</package> + <package>libnotify</package> + <package>libnotify-devel</package> + <package>libnotify1</package> + <package>libnscd-devel</package> + <package>libnsssharedhelper0</package> + <package>libnuma-devel</package> + <package>libofa-devel</package> + <package>libofa0</package> + <package>libogg-devel</package> + <package>libogg0</package> + <package>liboil</package> + <package>liboil-devel</package> + <package>libopenbabel-devel</package> + <package>libopenbabel3</package> + <package>libopencdk-devel</package> + <package>libopencdk10</package> + <package>libopenraw-devel</package> + <package>libopenraw1</package> + <package>libopenssl-devel</package> + <package>libopensync</package> + <package>libopensync-devel</package> + <package>libopensync-plugin-evolution2</package> + <package>libopensync-plugin-evolution2-devel</package> + <package>libopensync-plugin-palm</package> + <package>libopensync-plugin-palm-devel</package> + <package>liborc-0_4-0</package> + <package>libosip2</package> + <package>libosip2-devel</package> + <package>libotf</package> + <package>libotf-devel</package> + <package>libotr-devel</package> + <package>libotr2</package> + <package>libp11-1</package> + <package>libp11-devel</package> + <package>libpackagekit-glib10</package> + <package>libpackagekit-glib10-devel</package> + <package>libpangomm-1_4-1</package> + <package>libpcap-devel</package> + <package>libpciaccess0</package> + <package>libpciaccess0-devel</package> + <package>libphonon4</package> + <package>libpisock-devel</package> + <package>libpisock9</package> + <package>libpisync-devel</package> + <package>libpisync1</package> + <package>libpixman-1-0-devel</package> + <package>libpkcs11-helper1</package> + <package>libpng-devel</package> + <package>libpolkit-qt0</package> + <package>libpoppler-devel</package> + <package>libpoppler-glib-devel</package> + <package>libpoppler-glib4</package> + <package>libpoppler-qt2</package> + <package>libpoppler-qt3-devel</package> + <package>libpoppler-qt4-3</package> + <package>libpoppler-qt4-devel</package> + <package>libpoppler5</package> + <package>libpst4</package> + <package>libpt2</package> + <package>libpt2-devel</package> + <package>libpulse-browse0</package> + <package>libpulse-devel</package> + <package>libpulse-mainloop-glib0</package> + <package>libpulse0</package> + <package>libpurple</package> + <package>libpurple-devel</package> + <package>libpurple-lang</package> + <package>libqca2</package> + <package>libqca2-devel</package> + <package>libqdialogsolver1</package> + <package>libqdialogsolver1-devel</package> + <package>libqimageblitz-devel</package> + <package>libqimageblitz4</package> + <package>libqscintilla-devel</package> + <package>libqscintilla2-5</package> + <package>libqt4</package> + <package>libqt4-devel</package> + <package>libqt4-qt3support</package> + <package>libqt4-sql</package> + <package>libqt4-sql-mysql</package> + <package>libqt4-sql-postgresql</package> + <package>libqt4-sql-sqlite</package> + <package>libqt4-sql-unixODBC</package> + <package>libqt4-x11</package> + <package>libqtpod-devel</package> + <package>libqtpod0</package> + <package>libquadmath46</package> + <package>libquicktime</package> + <package>libquicktime-devel</package> + <package>libraptor-devel</package> + <package>libraptor1</package> + <package>librasqal-devel</package> + <package>librasqal1</package> + <package>libraw1394-11</package> + <package>libraw1394-8</package> + <package>libraw1394-devel</package> + <package>libredland-devel</package> + <package>libredland0</package> + <package>libreiserfs-devel</package> + <package>libreoffice</package> + <package>libreoffice-base</package> + <package>libreoffice-branding-SLED</package> + <package>libreoffice-branding-upstream</package> + <package>libreoffice-calc</package> + <package>libreoffice-icon-themes</package> + <package>libreoffice-impress</package> + <package>libreoffice-sdk</package> + <package>libreoffice-writer</package> + <package>librsvg</package> + <package>librsvg-devel</package> + <package>libsamplerate</package> + <package>libsamplerate-devel</package> + <package>libsatsolver-devel</package> + <package>libsblim-cmpiutil1</package> + <package>libselinux-devel</package> + <package>libsemanage-devel</package> + <package>libsemanage1</package> + <package>libsensors3-devel</package> + <package>libsensors4</package> + <package>libsepol-devel</package> + <package>libsexy</package> + <package>libsexy-devel</package> + <package>libshout-devel</package> + <package>libshout3</package> + <package>libsidplay1</package> + <package>libsidplay1-devel</package> + <package>libsigc++2</package> + <package>libsigc++2-devel</package> + <package>libslab-lang</package> + <package>libslab0</package> + <package>libsmbclient-devel</package> + <package>libsmbios-devel</package> + <package>libsmbsharemodes-devel</package> + <package>libsmbsharemodes0</package> + <package>libsndfile</package> + <package>libsndfile-devel</package> + <package>libsoprano-devel</package> + <package>libsoprano4</package> + <package>libsoup-devel</package> + <package>libspectre-devel</package> + <package>libspectre1</package> + <package>libspeex</package> + <package>libssh2-devel</package> + <package>libstrigi0</package> + <package>libstroke</package> + <package>libstroke-devel</package> + <package>libsyncml-devel</package> + <package>libsyncml0</package> + <package>libtalloc-devel</package> + <package>libtasn1-devel</package> + <package>libtdb-devel</package> + <package>libtelepathy</package> + <package>libtelepathy-devel</package> + <package>libtelepathy-glib0</package> + <package>libtheora-devel</package> + <package>libtheora0</package> + <package>libtidy</package> + <package>libtidy-devel</package> + <package>libtiff-devel</package> + <package>libtirpc-devel</package> + <package>libtomoe-gtk0</package> + <package>libtspi1</package> + <package>libtunepimp</package> + <package>libtunepimp-devel</package> + <package>libtunepimp5</package> + <package>libudev-devel</package> + <package>libudf0</package> + <package>libunique-1_0-0</package> + <package>libunwind</package> + <package>libunwind-devel</package> + <package>libupsclient1</package> + <package>libusb-devel</package> + <package>libusbpp-0_1-4</package> + <package>libustr-1_0-1</package> + <package>libustr-devel</package> + <package>libuuid-devel</package> + <package>libvirt-client</package> + <package>libvirt-devel</package> + <package>libvisual</package> + <package>libvisual-devel</package> + <package>libvoikko-devel</package> + <package>libvoikko1</package> + <package>libvorbis</package> + <package>libvorbis-devel</package> + <package>libwavpack1</package> + <package>libwbclient-devel</package> + <package>libwbxml2-0</package> + <package>libwbxml2-devel</package> + <package>libwebkit-1_0-1</package> + <package>libwebkit-1_0-2</package> + <package>libwebkit-devel</package> + <package>libwebkit-lang</package> + <package>libwmf</package> + <package>libwmf-devel</package> + <package>libwmf-gnome</package> + <package>libwnck</package> + <package>libwnck-1-22</package> + <package>libwnck-devel</package> + <package>libwnck-lang</package> + <package>libwpd-0_8-8</package> + <package>libwpd-devel</package> + <package>libwpg-0_1-1</package> + <package>libwpg-devel</package> + <package>libwps-0_1-1</package> + <package>libwps-devel</package> + <package>libwsman-devel</package> + <package>libwsman1</package> + <package>libxcrypt-devel</package> + <package>libxine-devel</package> + <package>libxine1</package> + <package>libxklavier-devel</package> + <package>libxklavier15</package> + <package>libxml2-devel</package> + <package>libxslt-devel</package> + <package>libyajl1</package> + <package>libzio-devel</package> + <package>libzip-devel</package> + <package>libzip1</package> + <package>libzvbi0</package> + <package>libzypp-devel</package> + <package>limal-apparmor-notifications</package> + <package>limal-apparmor-notifications-devel</package> + <package>limal-ca-mgm-devel</package> + <package>limal-devel</package> + <package>limal-devtools</package> + <package>limal-nfs-server-devel</package> + <package>linux-atm-devel</package> + <package>linux-atm-lib</package> + <package>lksctp-tools</package> + <package>lksctp-tools-devel</package> + <package>loudmouth-devel</package> + <package>lua</package> + <package>lua-devel</package> + <package>lzo-devel</package> + <package>m17n-db</package> + <package>m17n-lib</package> + <package>m17n-lib-devel</package> + <package>malaga-suomi</package> + <package>meanwhile</package> + <package>meanwhile-devel</package> + <package>metacity</package> + <package>metacity-devel</package> + <package>metacity-lang</package> + <package>mhash</package> + <package>mhash-devel</package> + <package>misc-console-font</package> + <package>mono-addins</package> + <package>mono-basic</package> + <package>mono-core</package> + <package>mono-data</package> + <package>mono-data-oracle</package> + <package>mono-data-sqlite</package> + <package>mono-devel</package> + <package>mono-extras</package> + <package>mono-jscript</package> + <package>mono-tools</package> + <package>mono-wcf</package> + <package>mono-web</package> + <package>mono-winforms</package> + <package>mono-zeroconf</package> + <package>mono-zeroconf-provider-avahi</package> + <package>monodevelop</package> + <package>monodoc-core</package> + <package>mozilla-nspr</package> + <package>mozilla-nspr-devel</package> + <package>mozilla-nss</package> + <package>mozilla-nss-devel</package> + <package>mozilla-xulrunner192</package> + <package>mozilla-xulrunner192-gnome</package> + <package>mpfr-devel</package> + <package>mpi-selector</package> + <package>mpich</package> + <package>mpich-devel</package> + <package>mysql</package> + <package>mysql-client</package> + <package>nagios</package> + <package>nagios-devel</package> + <package>nagios-www</package> + <package>nant</package> + <package>nautilus</package> + <package>nautilus-cd-burner</package> + <package>nautilus-cd-burner-devel</package> + <package>nautilus-cd-burner-lang</package> + <package>nautilus-devel</package> + <package>nautilus-lang</package> + <package>ndesk-dbus</package> + <package>ndesk-dbus-glib</package> + <package>ndesk-dbus-glib-devel</package> + <package>net-snmp</package> + <package>net-snmp-devel</package> + <package>netatalk</package> + <package>netatalk-devel</package> + <package>netcat-openbsd</package> + <package>newt</package> + <package>newt-devel</package> + <package>newt-static</package> + <package>nfsidmap-devel</package> + <package>notification-daemon</package> + <package>notification-daemon-lang</package> + <package>notify-sharp</package> + <package>nss-mdns</package> + <package>nss-shared-helper-devel</package> + <package>nut</package> + <package>nut-classic</package> + <package>nut-devel</package> + <package>opal</package> + <package>opal-devel</package> + <package>openCryptoki</package> + <package>openCryptoki-64bit</package> + <package>openCryptoki-devel</package> + <package>openct-devel</package> + <package>openhpi</package> + <package>openhpi-daemon</package> + <package>openhpi-devel</package> + <package>openjade</package> + <package>openjade-devel</package> + <package>openldap2-devel</package> + <package>openmotif-devel</package> + <package>openmotif-libs</package> + <package>openmpi</package> + <package>openobex-devel</package> + <package>openobex-glib-devel</package> + <package>opensc-devel</package> + <package>openslp-devel</package> + <package>opensp</package> + <package>opensp-devel</package> + <package>openwsman-client</package> + <package>openwsman-server</package> + <package>orbit</package> + <package>orbit-devel</package> + <package>orbit2-devel</package> + <package>oxygen-icon-theme</package> + <package>oxygen-icon-theme-scalable</package> + <package>ozerocdoff</package> + <package>pam-devel</package> + <package>pango-devel</package> + <package>pangomm-devel</package> + <package>parted-devel</package> + <package>patchutils</package> + <package>pciutils-devel</package> + <package>pcre-devel</package> + <package>pcsc-acr38</package> + <package>pcsc-acr38-devel</package> + <package>pcsc-lite-devel</package> + <package>perl-32bit</package> + <package>perl-Crypt-OpenSSL-RSA</package> + <package>perl-Mail-DKIM</package> + <package>perl-MailTools</package> + <package>perl-Net-DNS</package> + <package>perl-Net-IP</package> + <package>perl-NetAddr-IP</package> + <package>perl-SNMP</package> + <package>perl-Tie-IxHash</package> + <package>perl-Tk</package> + <package>perl-Tk-devel</package> + <package>perl-spamassassin</package> + <package>phonon</package> + <package>phonon-backend-gstreamer-0_10</package> + <package>phonon-devel</package> + <package>php5</package> + <package>php5-ctype</package> + <package>php5-devel</package> + <package>php5-dom</package> + <package>php5-hash</package> + <package>php5-iconv</package> + <package>php5-json</package> + <package>php5-pdo</package> + <package>php5-sqlite</package> + <package>php5-suhosin</package> + <package>php5-tokenizer</package> + <package>php5-xmlreader</package> + <package>php5-xmlwriter</package> + <package>php53</package> + <package>php53-ctype</package> + <package>php53-dom</package> + <package>php53-iconv</package> + <package>php53-json</package> + <package>php53-tokenizer</package> + <package>php53-xmlreader</package> + <package>php53-xmlwriter</package> + <package>pidgin</package> + <package>pidgin-devel</package> + <package>pilot-link</package> + <package>pkcs11-helper</package> + <package>pkcs11-helper-devel</package> + <package>planner</package> + <package>planner-devel</package> + <package>planner-lang</package> + <package>plasma-addons</package> + <package>plasma-theme-aya</package> + <package>plasmoid-networkmanagement</package> + <package>plasmoid-quickaccess</package> + <package>plotutils</package> + <package>poppler-data</package> + <package>poppler-tools</package> + <package>popt-devel</package> + <package>portmap</package> + <package>postfix-devel</package> + <package>postgresql-devel</package> + <package>postgresql-libs</package> + <package>ppp-devel</package> + <package>ppp-userpass</package> + <package>pstoedit</package> + <package>pstoedit-devel</package> + <package>pulseaudio</package> + <package>pulseaudio-esound-compat</package> + <package>pulseaudio-lang</package> + <package>puppet</package> + <package>python-cairo</package> + <package>python-cairo-devel</package> + <package>python-devel</package> + <package>python-gnome</package> + <package>python-gnome-devel</package> + <package>python-gobject2</package> + <package>python-gobject2-devel</package> + <package>python-gtk</package> + <package>python-gtk-devel</package> + <package>python-gtkglext</package> + <package>python-gtkglext-devel</package> + <package>python-gtksourceview</package> + <package>python-gtksourceview-devel</package> + <package>python-numeric</package> + <package>python-numpy</package> + <package>python-orbit</package> + <package>python-orbit-devel</package> + <package>pyxml</package> + <package>qt3</package> + <package>qt3-devel</package> + <package>quagga</package> + <package>quagga-devel</package> + <package>quilt</package> + <package>raptor</package> + <package>rarian</package> + <package>rarian-devel</package> + <package>re2c</package> + <package>readline-devel</package> + <package>recode-devel</package> + <package>rpm-devel</package> + <package>rrdtool</package> + <package>rrdtool-devel</package> + <package>rsyslog</package> + <package>ruby</package> + <package>rubygems</package> + <package>ruby-devel</package> + <package>ruby-doc-html</package> + <package>ruby-doc-ri</package> + <package>ruby-examples</package> + <package>ruby-fcgi</package> + <package>ruby-mysql</package> + <package>ruby-selinux</package> + <package>ruby-test-suite</package> + <package>ruby-tk</package> + <package>sablot</package> + <package>sablot-devel</package> + <package>samba-devel</package> + <package>sane-backends</package> + <package>sane-frontends</package> + <package>sax2-libsax</package> + <package>sax2-libsax-devel</package> + <package>sax2-libsax-perl</package> + <package>sax2-tools</package> + <package>sblim-cmpi-base</package> + <package>sblim-cmpi-base-devel</package> + <package>sblim-cmpi-devel</package> + <package>sblim-cmpiutil-devel</package> + <package>sblim-indication_helper</package> + <package>sblim-sfcb</package> + <package>sblim-sfcc</package> + <package>sblim-sfcc-devel</package> + <package>scim</package> + <package>scim-devel</package> + <package>scpm-devel</package> + <package>scrollkeeper</package> + <package>scrollkeeper-lang</package> + <package>seahorse</package> + <package>seahorse-devel</package> + <package>seahorse-lang</package> + <package>sendmail</package> + <package>sendmail-devel</package> + <package>sg3_utils-devel</package> + <package>sgml-skel</package> + <package>shared-mime-info</package> + <package>silc-toolkit</package> + <package>silc-toolkit-devel</package> + <package>slang</package> + <package>slang-devel</package> + <package>soprano</package> + <package>soprano-backend-redland</package> + <package>spamassassin</package> + <package>speex-devel</package> + <package>splashy-devel</package> + <package>sqlite2</package> + <package>sqlite3-devel</package> + <package>startup-notification</package> + <package>startup-notification-devel</package> + <package>strigi</package> + <package>strigi-devel</package> + <package>subversion</package> + <package>subversion-perl</package> + <package>susehelp</package> + <package>susehelp_cz</package> + <package>susehelp_de</package> + <package>susehelp_en</package> + <package>susehelp_es</package> + <package>susehelp_fr</package> + <package>susehelp_hu</package> + <package>susehelp_it</package> + <package>swig</package> + <package>syslogd</package> + <package>t1lib</package> + <package>t1lib-devel</package> + <package>taglib</package> + <package>taglib-devel</package> + <package>taglib-sharp</package> + <package>tango-icon-theme</package> + <package>tcl-devel</package> + <package>tcpd-devel</package> + <package>telepathy-glib-devel</package> + <package>telepathy-mission-control</package> + <package>telepathy-mission-control-devel</package> + <package>texlive-bin-devel</package> + <package>texlive-devel</package> + <package>tk-devel</package> + <package>tla</package> + <package>tn5250</package> + <package>tn5250-devel</package> + <package>tomoe</package> + <package>tomoe-devel</package> + <package>tomoe-gtk</package> + <package>tomoe-gtk-devel</package> + <package>tomoe-gtk-lang</package> + <package>totem-pl-parser</package> + <package>totem-pl-parser-devel</package> + <package>totem-pl-parser-lang</package> + <package>trousers</package> + <package>trousers-devel</package> + <package>tsclient</package> + <package>tsclient-devel</package> + <package>tsclient-lang</package> + <package>uim</package> + <package>uim-devel</package> + <package>unixODBC</package> + <package>unixODBC-devel</package> + <package>unsermake</package> + <package>update-desktop-files</package> + <package>usb_modeswitch</package> + <package>usb_modeswitch-data</package> + <package>valgrind</package> + <package>valgrind-devel</package> + <package>vte</package> + <package>vte-devel</package> + <package>vte-lang</package> + <package>wdiff</package> + <package>webkit-sharp</package> + <package>wireshark</package> + <package>wireshark-devel</package> + <package>wodim-devel</package> + <package>wordcut</package> + <package>wordcut-devel</package> + <package>words</package> + <package>wpa_supplicant</package> + <package>wvstreams</package> + <package>wvstreams-devel</package> + <package>wxGTK-compat</package> + <package>wxGTK-devel</package> + <package>wxGTK-gl</package> + <package>x11-input-wacom</package> + <package>x11-input-wacom-devel</package> + <package>x11-input-wacom-tools</package> + <package>xalan-j2</package> + <package>xaw3d-devel</package> + <package>xbase</package> + <package>xbase-devel</package> + <package>xdelta</package> + <package>xdelta-devel</package> + <package>xdg-menu</package> + <package>xen-devel</package> + <package>xen-libs</package> + <package>xerces-j2</package> + <package>xerces-j2-bootstrap</package> + <package>xerces-j2-xml-apis</package> + <package>xfsprogs-devel</package> + <package>xml-commons-apis-bootstrap</package> + <package>xml-commons-resolver-bootstrap</package> + <package>xml-commons-which-bootstrap</package> + <package>xmlcharent</package> + <package>xorg-x11</package> + <package>xorg-x11-devel</package> + <package>xorg-x11-fonts</package> + <package>xorg-x11-fonts-core</package> + <package>xorg-x11-fonts-devel</package> + <package>xorg-x11-libICE-devel</package> + <package>xorg-x11-libSM-devel</package> + <package>xorg-x11-libX11-devel</package> + <package>xorg-x11-libXau-devel</package> + <package>xorg-x11-libXdmcp-devel</package> + <package>xorg-x11-libXext-devel</package> + <package>xorg-x11-libXfixes-devel</package> + <package>xorg-x11-libXmu-devel</package> + <package>xorg-x11-libXp-devel</package> + <package>xorg-x11-libXpm-devel</package> + <package>xorg-x11-libXprintUtil-devel</package> + <package>xorg-x11-libXrender-devel</package> + <package>xorg-x11-libXt-devel</package> + <package>xorg-x11-libXv-devel</package> + <package>xorg-x11-libfontenc-devel</package> + <package>xorg-x11-libxcb-devel</package> + <package>xorg-x11-libxkbfile-devel</package> + <package>xorg-x11-proto-devel</package> + <package>xorg-x11-server</package> + <package>xorg-x11-util-devel</package> + <package>xorg-x11-xauth</package> + <package>xorg-x11-xtrans-devel</package> + <package>xosd</package> + <package>xosd-devel</package> + <package>xsp</package> + <package>xterm</package> + <package>xz-devel</package> + <package>yast2-core-devel</package> + <package>yast2-devtools</package> + <package>yast2-gtk</package> + <package>yast2-libyui-devel</package> + <package>yast2-ncurses-devel</package> + <package>yast2-qt</package> + <package>yast2-qt-devel</package> + <package>yast2-qt-pkg</package> + <package>yast2-storage-devel</package> + <package>yast2-ycp-ui-bindings-devel</package> + <package>yelp</package> + <package>yelp-lang</package> + <package>zenity</package> + <package>zenity-lang</package> + <package>zlib-devel</package> + <package>zsh</package> + <package>zvbi-devel</package> + </remove-packages> + + </software> + <user_defaults> + <expire></expire> + <group>100</group> + <groups>video,dialout</groups> + <home>/home</home> + <inactive>-1</inactive> + <shell>/bin/bash</shell> + <skel>/etc/skel</skel> + <umask>022</umask> + </user_defaults> + <users config:type="list"> + <user> + <encrypted config:type="boolean">true</encrypted> + <fullname>vagrant</fullname> + <gid>100</gid> + <home>/home/vagrant</home> + <password_settings> + <expire></expire> + <flag></flag> + <inact></inact> + <max>99999</max> + <min>0</min> + <warn>7</warn> + </password_settings> + <shell>/bin/bash</shell> + <uid>1000</uid> + <user_password>$2y$05$NA1Li9ZKJOLRW5mMTXm6/e5r8dltWS5RpDZpvHrI82aLE00V51tdi</user_password> + <username>vagrant</username> + </user> + <user> + <encrypted config:type="boolean">true</encrypted> + <fullname>Games account</fullname> + <gid>100</gid> + <home>/var/games</home> + <password_settings> + <expire></expire> + <flag></flag> + <inact></inact> + <max></max> + <min></min> + <warn></warn> + </password_settings> + <shell>/bin/bash</shell> + <uid>12</uid> + <user_password>*</user_password> + <username>games</username> + </user> + <user> + <encrypted config:type="boolean">true</encrypted> + <fullname>bin</fullname> + <gid>1</gid> + <home>/bin</home> + <password_settings> + <expire></expire> + <flag></flag> + <inact></inact> + <max></max> + <min></min> + <warn></warn> + </password_settings> + <shell>/bin/bash</shell> + <uid>1</uid> + <user_password>*</user_password> + <username>bin</username> + </user> + <user> + <encrypted config:type="boolean">true</encrypted> + <fullname>nobody</fullname> + <gid>65533</gid> + <home>/var/lib/nobody</home> + <password_settings> + <expire></expire> + <flag></flag> + <inact></inact> + <max></max> + <min></min> + <warn></warn> + </password_settings> + <shell>/bin/bash</shell> + <uid>65534</uid> + <user_password>*</user_password> + <username>nobody</username> + </user> + <user> + <encrypted config:type="boolean">true</encrypted> + <fullname>Printing daemon</fullname> + <gid>7</gid> + <home>/var/spool/lpd</home> + <password_settings> + <expire></expire> + <flag></flag> + <inact></inact> + <max></max> + <min></min> + <warn></warn> + </password_settings> + <shell>/bin/bash</shell> + <uid>4</uid> + <user_password>*</user_password> + <username>lp</username> + </user> + <user> + <encrypted config:type="boolean">true</encrypted> + <fullname>User for uuidd</fullname> + <gid>104</gid> + <home>/var/run/uuidd</home> + <password_settings> + <expire></expire> + <flag></flag> + <inact></inact> + <max>99999</max> + <min>0</min> + <warn>7</warn> + </password_settings> + <shell>/bin/false</shell> + <uid>102</uid> + <user_password>*</user_password> + <username>uuidd</username> + </user> + <user> + <encrypted config:type="boolean">true</encrypted> + <fullname>Postfix Daemon</fullname> + <gid>51</gid> + <home>/var/spool/postfix</home> + <password_settings> + <expire></expire> + <flag></flag> + <inact></inact> + <max>99999</max> + <min>0</min> + <warn>7</warn> + </password_settings> + <shell>/bin/false</shell> + <uid>51</uid> + <user_password>*</user_password> + <username>postfix</username> + </user> + <user> + <encrypted config:type="boolean">true</encrypted> + <fullname>Novell Customer Center User</fullname> + <gid>111</gid> + <home>/var/lib/YaST2/suse-ncc-fakehome</home> + <password_settings> + <expire></expire> + <flag></flag> + <inact></inact> + <max>99999</max> + <min>0</min> + <warn>7</warn> + </password_settings> + <shell>/bin/bash</shell> + <uid>106</uid> + <user_password>*</user_password> + <username>suse-ncc</username> + </user> + <user> + <encrypted config:type="boolean">true</encrypted> + <fullname>FTP account</fullname> + <gid>49</gid> + <home>/srv/ftp</home> + <password_settings> + <expire></expire> + <flag></flag> + <inact></inact> + <max></max> + <min></min> + <warn></warn> + </password_settings> + <shell>/bin/bash</shell> + <uid>40</uid> + <user_password>*</user_password> + <username>ftp</username> + </user> + <user> + <encrypted config:type="boolean">true</encrypted> + <fullname>Gnome Display Manager daemon</fullname> + <gid>112</gid> + <home>/var/lib/gdm</home> + <password_settings> + <expire></expire> + <flag></flag> + <inact></inact> + <max>99999</max> + <min>0</min> + <warn>7</warn> + </password_settings> + <shell>/bin/false</shell> + <uid>107</uid> + <user_password>*</user_password> + <username>gdm</username> + </user> + <user> + <encrypted config:type="boolean">true</encrypted> + <fullname>Batch jobs daemon</fullname> + <gid>25</gid> + <home>/var/spool/atjobs</home> + <password_settings> + <expire></expire> + <flag></flag> + <inact></inact> + <max>99999</max> + <min>0</min> + <warn>7</warn> + </password_settings> + <shell>/bin/bash</shell> + <uid>25</uid> + <user_password>*</user_password> + <username>at</username> + </user> + <user> + <encrypted config:type="boolean">true</encrypted> + <fullname>root</fullname> + <gid>0</gid> + <home>/root</home> + <password_settings> + <expire></expire> + <flag></flag> + <inact></inact> + <max></max> + <min></min> + <warn></warn> + </password_settings> + <shell>/bin/bash</shell> + <uid>0</uid> + <user_password>$2y$05$NA1Li9ZKJOLRW5mMTXm6/e5r8dltWS5RpDZpvHrI82aLE00V51tdi</user_password> + <username>root</username> + </user> + <user> + <encrypted config:type="boolean">true</encrypted> + <fullname>Mailer daemon</fullname> + <gid>12</gid> + <home>/var/spool/clientmqueue</home> + <password_settings> + <expire></expire> + <flag></flag> + <inact></inact> + <max></max> + <min></min> + <warn></warn> + </password_settings> + <shell>/bin/false</shell> + <uid>8</uid> + <user_password>*</user_password> + <username>mail</username> + </user> + <user> + <encrypted config:type="boolean">true</encrypted> + <fullname>Daemon</fullname> + <gid>2</gid> + <home>/sbin</home> + <password_settings> + <expire></expire> + <flag></flag> + <inact></inact> + <max></max> + <min></min> + <warn></warn> + </password_settings> + <shell>/bin/bash</shell> + <uid>2</uid> + <user_password>*</user_password> + <username>daemon</username> + </user> + <user> + <encrypted config:type="boolean">true</encrypted> + <fullname>NTP daemon</fullname> + <gid>108</gid> + <home>/var/lib/ntp</home> + <password_settings> + <expire></expire> + <flag></flag> + <inact></inact> + <max>99999</max> + <min>0</min> + <warn>7</warn> + </password_settings> + <shell>/bin/false</shell> + <uid>74</uid> + <user_password>*</user_password> + <username>ntp</username> + </user> + <user> + <encrypted config:type="boolean">true</encrypted> + <fullname>Unix-to-Unix CoPy system</fullname> + <gid>14</gid> + <home>/etc/uucp</home> + <password_settings> + <expire></expire> + <flag></flag> + <inact></inact> + <max></max> + <min></min> + <warn></warn> + </password_settings> + <shell>/bin/bash</shell> + <uid>10</uid> + <user_password>*</user_password> + <username>uucp</username> + </user> + <user> + <encrypted config:type="boolean">true</encrypted> + <fullname>User for D-Bus</fullname> + <gid>101</gid> + <home>/var/run/dbus</home> + <password_settings> + <expire></expire> + <flag></flag> + <inact></inact> + <max></max> + <min>0</min> + <warn>7</warn> + </password_settings> + <shell>/bin/false</shell> + <uid>100</uid> + <user_password>*</user_password> + <username>messagebus</username> + </user> + <user> + <encrypted config:type="boolean">true</encrypted> + <fullname>User for haldaemon</fullname> + <gid>102</gid> + <home>/var/run/hald</home> + <password_settings> + <expire></expire> + <flag></flag> + <inact></inact> + <max></max> + <min>0</min> + <warn>7</warn> + </password_settings> + <shell>/bin/false</shell> + <uid>101</uid> + <user_password>*</user_password> + <username>haldaemon</username> + </user> + <user> + <encrypted config:type="boolean">true</encrypted> + <fullname>WWW daemon apache</fullname> + <gid>8</gid> + <home>/var/lib/wwwrun</home> + <password_settings> + <expire></expire> + <flag></flag> + <inact></inact> + <max></max> + <min></min> + <warn></warn> + </password_settings> + <shell>/bin/false</shell> + <uid>30</uid> + <user_password>*</user_password> + <username>wwwrun</username> + </user> + <user> + <encrypted config:type="boolean">true</encrypted> + <fullname>Manual pages viewer</fullname> + <gid>62</gid> + <home>/var/cache/man</home> + <password_settings> + <expire></expire> + <flag></flag> + <inact></inact> + <max></max> + <min></min> + <warn></warn> + </password_settings> + <shell>/bin/bash</shell> + <uid>13</uid> + <user_password>*</user_password> + <username>man</username> + </user> + <user> + <encrypted config:type="boolean">true</encrypted> + <fullname>PolicyKit</fullname> + <gid>107</gid> + <home>/var/run/PolicyKit</home> + <password_settings> + <expire></expire> + <flag></flag> + <inact></inact> + <max>99999</max> + <min>0</min> + <warn>7</warn> + </password_settings> + <shell>/bin/false</shell> + <uid>104</uid> + <user_password>*</user_password> + <username>polkituser</username> + </user> + <user> + <encrypted config:type="boolean">true</encrypted> + <fullname>News system</fullname> + <gid>13</gid> + <home>/etc/news</home> + <password_settings> + <expire></expire> + <flag></flag> + <inact></inact> + <max></max> + <min></min> + <warn></warn> + </password_settings> + <shell>/bin/bash</shell> + <uid>9</uid> + <user_password>*</user_password> + <username>news</username> + </user> + <user> + <fullname>SSH daemon</fullname> + <gid>65</gid> + <home>/var/lib/sshd</home> + <shell>/bin/false</shell> + <uid>71</uid> + <username>sshd</username> + </user> + <user> + <encrypted config:type="boolean">true</encrypted> + <fullname>PulseAudio daemon</fullname> + <gid>109</gid> + <home>/var/lib/pulseaudio</home> + <password_settings> + <expire></expire> + <flag></flag> + <inact></inact> + <max>99999</max> + <min>0</min> + <warn>7</warn> + </password_settings> + <shell>/bin/false</shell> + <uid>105</uid> + <user_password>*</user_password> + <username>pulse</username> + </user> + </users> +</profile> diff --git a/templates/sles-11-sp3-i386/scripts/cleanup.sh b/templates/sles-11-sp3-i386/scripts/cleanup.sh new file mode 100644 index 000000000..6b6548a6d --- /dev/null +++ b/templates/sles-11-sp3-i386/scripts/cleanup.sh @@ -0,0 +1,9 @@ +#!/bin/bash -eux + +# remove zypper locks on removed packages to avoid later dependency problems +zypper --non-interactive rl \* +# zypper --non-interactive remove `rpm -qa virtualbox-guest-*` >/dev/null 2>&1 +# Add an online copy of the SLES DVD1 as a software repository, instead of the mounted DVD +zypper removerepo 'SUSE-Linux-Enterprise-Server-11-SP3 11.3.3-1.138' +zypper addrepo 'http://demeter.uni-regensburg.de/SLES11SP3-x86/DVD1/' 'SLES11SP3-x86 DVD1 Online' +zypper refresh diff --git a/templates/sles-11-sp3-i386/scripts/minimize.sh b/templates/sles-11-sp3-i386/scripts/minimize.sh new file mode 100644 index 000000000..3846a1d65 --- /dev/null +++ b/templates/sles-11-sp3-i386/scripts/minimize.sh @@ -0,0 +1,4 @@ +#!/bin/bash -eux + +dd if=/dev/zero of=/EMPTY bs=1M +rm -f /EMPTY diff --git a/templates/sles-11-sp3-i386/scripts/sshd.sh b/templates/sles-11-sp3-i386/scripts/sshd.sh new file mode 100644 index 000000000..c6e4f20a6 --- /dev/null +++ b/templates/sles-11-sp3-i386/scripts/sshd.sh @@ -0,0 +1,3 @@ +#!/bin/bash -eux + +echo "UseDNS no" >> /etc/ssh/sshd_config diff --git a/templates/sles-11-sp3-i386/scripts/sudoers.sh b/templates/sles-11-sp3-i386/scripts/sudoers.sh new file mode 100644 index 000000000..eb80f3f88 --- /dev/null +++ b/templates/sles-11-sp3-i386/scripts/sudoers.sh @@ -0,0 +1,3 @@ +# update sudoers - can't do this in autoinst.xml +echo -e "\nupdate sudoers ..." +echo -e "vagrant ALL=(ALL) NOPASSWD: ALL\n" >> /etc/sudoers diff --git a/templates/sles-11-sp3-i386/scripts/vagrant.sh b/templates/sles-11-sp3-i386/scripts/vagrant.sh new file mode 100644 index 000000000..72dd2f444 --- /dev/null +++ b/templates/sles-11-sp3-i386/scripts/vagrant.sh @@ -0,0 +1,33 @@ +#!/bin/bash -eux + +if [ -f /home/vagrant/.vbox_version ]; then + mkdir /tmp/vbox + VER=$(cat /home/vagrant/.vbox_version) + mount -o loop VBoxGuestAdditions_$VER.iso /tmp/vbox + sh /tmp/vbox/VBoxLinuxAdditions.run + umount /tmp/vbox + rmdir /tmp/vbox + rm *.iso +fi + +if [ -f /home/vagrant/.vmfusion_version ]; then + #Set Linux-specific paths and ISO filename + home_dir="/home/vagrant" + iso_name="linux.iso" + mount_point="/tmp/vmware-tools" + #Run install, unmount ISO and remove it + mkdir ${mount_point} + cd ${home_dir} + /bin/mount -o loop ${iso_name} ${mount_point} + tar zxf ${mount_point}/*.tar.gz && cd vmware-tools-distrib && ./vmware-install.pl --default + /bin/umount ${mount_point} + /bin/rm -rf ${home_dir}/${iso_name} ${home_dir}/vmware-tools-distrib + rmdir ${mount_point} +fi + +mkdir /home/vagrant/.ssh +wget --no-check-certificate \ + 'https://github.com/mitchellh/vagrant/raw/master/keys/vagrant.pub' \ + -O /home/vagrant/.ssh/authorized_keys +chown -R vagrant /home/vagrant/.ssh +chmod -R go-rwsx /home/vagrant/.ssh diff --git a/templates/sles-11-sp3-i386/template.json b/templates/sles-11-sp3-i386/template.json new file mode 100644 index 000000000..1a982d11d --- /dev/null +++ b/templates/sles-11-sp3-i386/template.json @@ -0,0 +1,97 @@ +{ + "provisioners": [ + { + "type": "shell", + "scripts": [ + "scripts/vagrant.sh", + "scripts/sshd.sh", + "scripts/sudoers.sh", + "scripts/cleanup.sh", + "scripts/minimize.sh" + ], + "override": { + "virtualbox": { + "execute_command": "echo 'vagrant'|sudo -S sh '{{.Path}}'" + }, + "vmware": { + "execute_command": "echo 'vagrant'|sudo -S sh '{{.Path}}'" + } + } + } + ], + "builders": [ + { + "type": "virtualbox", + "boot_command": [ + "<esc><enter><wait>", + "linux netdevice=eth0 netsetup=dhcp install=cd:/<wait>", + " lang=en_US autoyast=http://{{ .HTTPIP }}:{{ .HTTPPort }}/autoinst.xml<wait>", + " textmode=1<wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "guest_os_type": "OpenSUSE_64", + "http_directory": "http", + "iso_checksum": "5c30a409fc8fb3343b4dc90d93ff2c89", + "iso_checksum_type": "md5", + "iso_url": "", + "ssh_username": "vagrant", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_wait_timeout": "10000s", + "shutdown_command": "echo '/sbin/halt -h -p' > shutdown.sh; echo 'vagrant'|sudo -S sh 'shutdown.sh'", + "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "virtualbox_version_file": ".vbox_version", + "vboxmanage": [ + [ + "modifyvm", + "{{.Name}}", + "--memory", + "480" + ], + [ + "modifyvm", + "{{.Name}}", + "--cpus", + "1" + ] + ], + "iso_md5": "5c30a409fc8fb3343b4dc90d93ff2c89" + }, + { + "type": "vmware", + "boot_command": [ + "<esc><enter><wait>", + "linux netdevice=eth0 netsetup=dhcp install=cd:/<wait>", + " lang=en_US autoyast=http://{{ .HTTPIP }}:{{ .HTTPPort }}/autoinst.xml<wait>", + " textmode=1<wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "guest_os_type": "opensuse-64", + "http_directory": "http", + "iso_checksum": "5c30a409fc8fb3343b4dc90d93ff2c89", + "iso_checksum_type": "md5", + "iso_url": "", + "ssh_username": "vagrant", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_wait_timeout": "10000s", + "shutdown_command": "echo '/sbin/halt -h -p' > shutdown.sh; echo 'vagrant'|sudo -S sh 'shutdown.sh'", + "vmx_data": { + "memsize": "480", + "numvcpus": "1", + "cpuid.coresPerSocket": "1" + }, + "iso_md5": "5c30a409fc8fb3343b4dc90d93ff2c89" + } + ], + "post-provisioner": [ + { + "type": "vagrant", + "output": "sles-11-sp3-i386-{{.Provisioner}}.box" + } + ] +} \ No newline at end of file diff --git a/templates/sles-11-sp3/http/autoinst.xml b/templates/sles-11-sp3/http/autoinst.xml new file mode 100644 index 000000000..9eca2bea0 --- /dev/null +++ b/templates/sles-11-sp3/http/autoinst.xml @@ -0,0 +1,2569 @@ +<?xml version="1.0"?> +<!DOCTYPE profile> +<profile xmlns="http://www.suse.com/1.0/yast2ns" xmlns:config="http://www.suse.com/1.0/configns"> + <add-on> + <add_on_products config:type="list"> + <listentry> + <media_url><![CDATA[http://demeter.uni-regensburg.de/SLE11SP3-SDK-x64/DVD1/]]></media_url> + <product>sle-sdk</product> + <product_dir>/</product_dir> + </listentry> + </add_on_products> + </add-on> + <bootloader> + <device_map config:type="list"> + <device_map_entry> + <firmware>hd0</firmware> + <linux>/dev/sda</linux> + </device_map_entry> + </device_map> + <global> + <activate>true</activate> + <boot_root>true</boot_root> + <default>SUSE Linux Enterprise Server 11 SP3 - 3.0.76-0.11</default> + <generic_mbr>true</generic_mbr> + <gfxmenu>/boot/message</gfxmenu> + <lines_cache_id>2</lines_cache_id> + <timeout config:type="integer">8</timeout> + </global> + <initrd_modules config:type="list"> + <initrd_module> + <module>ahci</module> + </initrd_module> + <initrd_module> + <module>ata_piix</module> + </initrd_module> + <initrd_module> + <module>ata_generic</module> + </initrd_module> + <initrd_module> + <module>jbd</module> + </initrd_module> + <initrd_module> + <module>mbcache</module> + </initrd_module> + <initrd_module> + <module>ext3</module> + </initrd_module> + </initrd_modules> + <loader_type>grub</loader_type> + <sections config:type="list"> + <section> + <append>resume=/dev/sda1 splash=silent crashkernel=128M-:64M showopts</append> + <image>(hd0,1)/boot/vmlinuz-3.0.76-0.11-default</image> + <initial>1</initial> + <initrd>(hd0,1)/boot/initrd-3.0.76-0.11-default</initrd> + <lines_cache_id>0</lines_cache_id> + <name>SUSE Linux Enterprise Server 11 SP3 - 3.0.76-0.11</name> + <original_name>linux</original_name> + <root>/dev/sda2</root> + <type>image</type> + <vgamode>0x314</vgamode> + </section> + <section> + <append>showopts ide=nodma apm=off noresume edd=off powersaved=off nohz=off highres=off processor.max_cstate=1 nomodeset x11failsafe</append> + <image>(hd0,1)/boot/vmlinuz-3.0.76-0.11-default</image> + <initrd>(hd0,1)/boot/initrd-3.0.76-0.11-default</initrd> + <lines_cache_id>1</lines_cache_id> + <name>Failsafe -- SUSE Linux Enterprise Server 11 SP3 - 3.0.76-0.11</name> + <original_name>failsafe</original_name> + <root>/dev/sda2</root> + <type>image</type> + <vgamode>0x314</vgamode> + </section> + </sections> + </bootloader> + <ca_mgm> + <CAName>YaST_Default_CA</CAName> + <ca_commonName>YaST Default CA (vagrant-sles-11sp3-x64)</ca_commonName> + <country>US</country> + <locality></locality> + <organisation></organisation> + <organisationUnit></organisationUnit> + <password>ENTER PASSWORD HERE</password> + <server_commonName>vagrant-sles-11sp3-x64.vagrantup.com</server_commonName> + <server_email>postmaster@vagrantup.com</server_email> + <state></state> + <takeLocalServerName config:type="boolean">false</takeLocalServerName> + </ca_mgm> + <deploy_image> + <image_installation config:type="boolean">false</image_installation> + </deploy_image> + <general> + <ask-list config:type="list"/> + <mode> + <confirm config:type="boolean">false</confirm> + </mode> + <mouse> + <id>none</id> + </mouse> + <proposals config:type="list"/> + <signature-handling> + <accept_file_without_checksum config:type="boolean">true</accept_file_without_checksum> + <accept_non_trusted_gpg_key config:type="boolean">true</accept_non_trusted_gpg_key> + <accept_unknown_gpg_key config:type="boolean">true</accept_unknown_gpg_key> + <accept_unsigned_file config:type="boolean">true</accept_unsigned_file> + <accept_verification_failed config:type="boolean">false</accept_verification_failed> + <import_gpg_key config:type="boolean">true</import_gpg_key> + </signature-handling> + <storage/> + </general> + <groups config:type="list"> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>100</gid> + <group_password>x</group_password> + <groupname>users</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>19</gid> + <group_password>x</group_password> + <groupname>floppy</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>1</gid> + <group_password>x</group_password> + <groupname>bin</groupname> + <userlist>daemon</userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>41</gid> + <group_password>x</group_password> + <groupname>xok</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>65533</gid> + <group_password>x</group_password> + <groupname>nobody</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>43</gid> + <group_password>x</group_password> + <groupname>modem</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>5</gid> + <group_password>x</group_password> + <groupname>tty</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>7</gid> + <group_password>x</group_password> + <groupname>lp</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>104</gid> + <group_password>!</group_password> + <groupname>uuidd</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>51</gid> + <group_password>!</group_password> + <groupname>postfix</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>112</gid> + <group_password>!</group_password> + <groupname>gdm</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>65534</gid> + <group_password>x</group_password> + <groupname>nogroup</groupname> + <userlist>nobody</userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>101</gid> + <group_password>!</group_password> + <groupname>messagebus</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>59</gid> + <group_password>!</group_password> + <groupname>maildrop</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>33</gid> + <group_password>x</group_password> + <groupname>video</groupname> + <userlist>vagrant</userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>3</gid> + <group_password>x</group_password> + <groupname>sys</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>15</gid> + <group_password>x</group_password> + <groupname>shadow</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>20</gid> + <group_password>x</group_password> + <groupname>cdrom</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>21</gid> + <group_password>x</group_password> + <groupname>console</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>42</gid> + <group_password>x</group_password> + <groupname>trusted</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>102</gid> + <group_password>!</group_password> + <groupname>haldaemon</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>106</gid> + <group_password>!</group_password> + <groupname>puppet</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>16</gid> + <group_password>x</group_password> + <groupname>dialout</groupname> + <userlist>vagrant</userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>107</gid> + <group_password>!</group_password> + <groupname>polkituser</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>10</gid> + <group_password>x</group_password> + <groupname>wheel</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>109</gid> + <group_password>!</group_password> + <groupname>pulse</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>8</gid> + <group_password>x</group_password> + <groupname>www</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>40</gid> + <group_password>x</group_password> + <groupname>games</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>6</gid> + <group_password>x</group_password> + <groupname>disk</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>17</gid> + <group_password>x</group_password> + <groupname>audio</groupname> + <userlist>pulse</userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>111</gid> + <group_password>!</group_password> + <groupname>suse-ncc</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>49</gid> + <group_password>x</group_password> + <groupname>ftp</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>103</gid> + <group_password>!</group_password> + <groupname>tape</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>25</gid> + <group_password>!</group_password> + <groupname>at</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>9</gid> + <group_password>x</group_password> + <groupname>kmem</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>32</gid> + <group_password>x</group_password> + <groupname>public</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>12</gid> + <group_password>x</group_password> + <groupname>mail</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>0</gid> + <group_password>x</group_password> + <groupname>root</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>2</gid> + <group_password>x</group_password> + <groupname>daemon</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>105</gid> + <group_password>!</group_password> + <groupname>sfcb</groupname> + <userlist>root</userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>108</gid> + <group_password>!</group_password> + <groupname>ntp</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>14</gid> + <group_password>x</group_password> + <groupname>uucp</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>110</gid> + <group_password>!</group_password> + <groupname>pulse-access</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>71</gid> + <group_password>!</group_password> + <groupname>ntadmin</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>62</gid> + <group_password>x</group_password> + <groupname>man</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>22</gid> + <group_password>x</group_password> + <groupname>utmp</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>13</gid> + <group_password>x</group_password> + <groupname>news</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>65</gid> + <group_password>!</group_password> + <groupname>sshd</groupname> + <userlist></userlist> + </group> + </groups> + <host> + <hosts config:type="list"> + <hosts_entry> + <host_address>127.0.0.1</host_address> + <names config:type="list"> + <name>localhost</name> + </names> + </hosts_entry> + <hosts_entry> + <host_address>::1</host_address> + <names config:type="list"> + <name>localhost ipv6-localhost ipv6-loopback</name> + </names> + </hosts_entry> + <hosts_entry> + <host_address>fe00::0</host_address> + <names config:type="list"> + <name>ipv6-localnet</name> + </names> + </hosts_entry> + <hosts_entry> + <host_address>ff00::0</host_address> + <names config:type="list"> + <name>ipv6-mcastprefix</name> + </names> + </hosts_entry> + <hosts_entry> + <host_address>ff02::1</host_address> + <names config:type="list"> + <name>ipv6-allnodes</name> + </names> + </hosts_entry> + <hosts_entry> + <host_address>ff02::2</host_address> + <names config:type="list"> + <name>ipv6-allrouters</name> + </names> + </hosts_entry> + <hosts_entry> + <host_address>ff02::3</host_address> + <names config:type="list"> + <name>ipv6-allhosts</name> + </names> + </hosts_entry> + </hosts> + </host> + <login_settings/> + <networking> + <dhcp_options> + <dhclient_client_id></dhclient_client_id> + <dhclient_hostname_option>AUTO</dhclient_hostname_option> + </dhcp_options> + <dns> + <dhcp_hostname config:type="boolean">false</dhcp_hostname> + <domain>vagrantup.com</domain> + <hostname>vagrant-sles-11sp3-x64</hostname> + <resolv_conf_policy>auto</resolv_conf_policy> + <searchlist config:type="list"> + <search>vagrantup.com</search> + </searchlist> + <write_hostname config:type="boolean">true</write_hostname> + </dns> + <interfaces config:type="list"> + <interface> + <bootproto>dhcp</bootproto> + <device>eth0</device> + <name>82540EM Gigabit Ethernet Controller</name> + <startmode>auto</startmode> + <usercontrol>no</usercontrol> + </interface> + </interfaces> + <managed config:type="boolean">false</managed> + <net-udev config:type="list"> + <rule> + <name>eth0</name> + <rule>KERNELS</rule> + <value>0000:00:03.0</value> + </rule> + </net-udev> + <routing> + <ip_forward config:type="boolean">false</ip_forward> + </routing> + </networking> + <partitioning config:type="list"> + <drive> + <device>/dev/sda</device> + <initialize config:type="boolean">true</initialize> + <partitions config:type="list"> + <partition> + <create config:type="boolean">true</create> + <crypt_fs config:type="boolean">false</crypt_fs> + <filesystem config:type="symbol">swap</filesystem> + <format config:type="boolean">true</format> + <fstopt>defaults</fstopt> + <loop_fs config:type="boolean">false</loop_fs> + <mount>swap</mount> + <mountby config:type="symbol">device</mountby> + <partition_id config:type="integer">130</partition_id> + <partition_nr config:type="integer">1</partition_nr> + <raid_options/> + <resize config:type="boolean">false</resize> + <size>1561492992</size> + </partition> + <partition> + <create config:type="boolean">true</create> + <crypt_fs config:type="boolean">false</crypt_fs> + <filesystem config:type="symbol">ext3</filesystem> + <format config:type="boolean">true</format> + <fstopt>acl,user_xattr</fstopt> + <loop_fs config:type="boolean">false</loop_fs> + <mount>/</mount> + <mountby config:type="symbol">device</mountby> + <partition_id config:type="integer">131</partition_id> + <partition_nr config:type="integer">2</partition_nr> + <raid_options/> + <resize config:type="boolean">false</resize> + <size>19895844352</size> + </partition> + </partitions> + <pesize></pesize> + <type config:type="symbol">CT_DISK</type> + <use>all</use> + </drive> + </partitioning> + <report> + <errors> + <log config:type="boolean">true</log> + <show config:type="boolean">true</show> + <timeout config:type="integer">0</timeout> + </errors> + <messages> + <log config:type="boolean">true</log> + <show config:type="boolean">true</show> + <timeout config:type="integer">0</timeout> + </messages> + <warnings> + <log config:type="boolean">true</log> + <show config:type="boolean">true</show> + <timeout config:type="integer">0</timeout> + </warnings> + <yesno_messages> + <log config:type="boolean">true</log> + <show config:type="boolean">true</show> + <timeout config:type="integer">0</timeout> + </yesno_messages> + </report> + <software> + + <packages config:type="list"> + <package>desktop-translations</package> + <package>gconf2-branding-SLES</package> + <package>libproxy0-config-gnome</package> + <package>sle-sdk-release</package> + <package>sle-sdk-release-SDK</package> + <package>sles-manuals_en</package> + <package>yast2-trans-en_US</package> + </packages> + <patterns config:type="list"> + <pattern>Basis-Devel</pattern> + <pattern>Minimal</pattern> + <pattern>apparmor</pattern> + <pattern>base</pattern> + <pattern>sdk_kernel</pattern> + </patterns> + <remove-packages config:type="list"> + <package>3ddiag</package> + <package>CASA</package> + <package>CASA-devel</package> + <package>CASA_auth_token_client</package> + <package>CASA_auth_token_client-devel</package> + <package>ConsoleKit-devel</package> + <package>ConsoleKit-x11</package> + <package>DirectFB-devel</package> + <package>FastCGI</package> + <package>IlmBase</package> + <package>IlmBase-devel</package> + <package>ImageMagick</package> + <package>ImageMagick-devel</package> + <package>LibVNCServer</package> + <package>LibVNCServer-devel</package> + <package>Mesa</package> + <package>Mesa-devel</package> + <package>ModemManager</package> + <package>Modules</package> + <package>NetworkManager</package> + <package>NetworkManager-devel</package> + <package>NetworkManager-glib</package> + <package>NetworkManager-gnome</package> + <package>NetworkManager-kde4</package> + <package>NetworkManager-kde4-lang</package> + <package>NetworkManager-kde4-libs</package> + <package>OpenEXR</package> + <package>OpenEXR-devel</package> + <package>OpenIPMI-devel</package> + <package>PackageKit</package> + <package>PackageKit-devel</package> + <package>PackageKit-lang</package> + <package>PolicyKit-devel</package> + <package>PolicyKit-gnome</package> + <package>PolicyKit-gnome-devel</package> + <package>PolicyKit-gnome-libs</package> + <package>SDL-devel</package> + <package>SDL_net</package> + <package>SDL_net-devel</package> + <package>TeX-Guy</package> + <package>TeX-Guy-devel</package> + <package>VFlib3</package> + <package>VFlib3-devel</package> + <package>WindowMaker</package> + <package>WindowMaker-devel</package> + <package>a2ps</package> + <package>aalib</package> + <package>aalib-devel</package> + <package>akonadi-runtime</package> + <package>akregator</package> + <package>alsa-devel</package> + <package>alsa-firmware</package> + <package>alsa-plugins-pulse</package> + <package>alsa-tools</package> + <package>alsa-tools-devel</package> + <package>anthy</package> + <package>anthy-devel</package> + <package>antlr</package> + <package>apache2</package> + <package>apache2-devel</package> + <package>apache2-mod_perl</package> + <package>apache2-mod_perl-devel</package> + <package>apache2-prefork</package> + <package>apache2-utils</package> + <package>apache2-worker</package> + <package>apparmor-profile-editor</package> + <package>art-sharp2</package> + <package>arts</package> + <package>arts-devel</package> + <package>aspell-devel</package> + <package>at-spi</package> + <package>at-spi-devel</package> + <package>at-spi-lang</package> + <package>atk-devel</package> + <package>audiofile</package> + <package>audiofile-devel</package> + <package>audit-devel</package> + <package>augeas-lenses</package> + <package>automoc4</package> + <package>avahi</package> + <package>avahi-compat-howl-devel</package> + <package>avahi-compat-mDNSResponder-devel</package> + <package>avahi-lang</package> + <package>babl-0_0</package> + <package>banshee-1</package> + <package>banshee-1-backend-engine-gstreamer</package> + <package>banshee-1-backend-platform-gnome</package> + <package>banshee-1-backend-platform-unix</package> + <package>banshee-1-devel</package> + <package>banshee-1-extensions-default</package> + <package>banshee-1-lang</package> + <package>beagle-devel</package> + <package>bind-devel</package> + <package>binutils-devel</package> + <package>bluez</package> + <package>bluez-devel</package> + <package>boo</package> + <package>boo-devel</package> + <package>boost-devel</package> + <package>bootsplash-branding-SLED</package> + <package>cairo-devel</package> + <package>cairomm</package> + <package>cairomm-devel</package> + <package>canna</package> + <package>canna-devel</package> + <package>canna-libs</package> + <package>cannadic</package> + <package>capi4linux</package> + <package>capi4linux-devel</package> + <package>cdk</package> + <package>cdk-devel</package> + <package>cdrdao</package> + <package>chasen</package> + <package>chasen-devel</package> + <package>check</package> + <package>check-devel</package> + <package>chmlib</package> + <package>chmlib-devel</package> + <package>cim-schema</package> + <package>clucene-core</package> + <package>clucene-core-devel</package> + <package>cmake</package> + <package>compiz</package> + <package>compiz-branding-SLE</package> + <package>compiz-devel</package> + <package>compiz-gnome</package> + <package>coolkey-devel</package> + <package>cracklib-devel</package> + <package>crash-devel</package> + <package>crimson</package> + <package>cscope</package> + <package>cups</package> + <package>cups-devel</package> + <package>cvsps</package> + <package>cyrus-imapd-devel</package> + <package>cyrus-sasl-crammd5</package> + <package>cyrus-sasl-devel</package> + <package>dante</package> + <package>dante-devel</package> + <package>db1</package> + <package>db1-devel</package> + <package>db43</package> + <package>db43-devel</package> + <package>dbus-1-devel</package> + <package>dbus-1-glib-devel</package> + <package>dbus-1-python-devel</package> + <package>dbus-1-qt3</package> + <package>dbus-1-qt3-devel</package> + <package>dbus-1-x11</package> + <package>dejagnu</package> + <package>dejavu</package> + <package>desktop-data-openSUSE</package> + <package>desktop-file-utils</package> + <package>devhelp</package> + <package>devhelp-devel</package> + <package>devhelp-lang</package> + <package>device-mapper-devel</package> + <package>dhcp</package> + <package>dhcp-client</package> + <package>dhcp-devel</package> + <package>diffstat</package> + <package>dmapi-devel</package> + <package>dnsmasq</package> + <package>docbook-xsl-stylesheets</package> + <package>docbook_4</package> + <package>doxygen</package> + <package>dvd+rw-tools</package> + <package>e2fsprogs-devel</package> + <package>emacs</package> + <package>emacs-nox</package> + <package>emacs-x11</package> + <package>enchant</package> + <package>enchant-devel</package> + <package>enscript</package> + <package>eog</package> + <package>eog-devel</package> + <package>eog-lang</package> + <package>espeak</package> + <package>evince</package> + <package>evince-devel</package> + <package>evince-lang</package> + <package>evoldap2-devel</package> + <package>evolution</package> + <package>evolution-data-server</package> + <package>evolution-data-server-devel</package> + <package>evolution-data-server-lang</package> + <package>evolution-devel</package> + <package>evolution-lang</package> + <package>expect-devel</package> + <package>facter</package> + <package>fam</package> + <package>fam-devel</package> + <package>farsight</package> + <package>farsight-devel</package> + <package>festival</package> + <package>festival-devel</package> + <package>fftw</package> + <package>fftw-devel</package> + <package>fftw-mpi</package> + <package>fftw-mpi-devel</package> + <package>fftw-threads</package> + <package>fftw-threads-devel</package> + <package>fftw3</package> + <package>fftw3-devel</package> + <package>fftw3-threads</package> + <package>fftw3-threads-devel</package> + <package>file-devel</package> + <package>fileshareset</package> + <package>finch</package> + <package>finch-devel</package> + <package>flac-devel</package> + <package>fltk</package> + <package>fltk-devel</package> + <package>fontconfig-devel</package> + <package>fonts-config</package> + <package>foomatic-filters</package> + <package>freeglut</package> + <package>freeglut-devel</package> + <package>freeradius-client-devel</package> + <package>freeradius-client-libs</package> + <package>freeradius-server-devel</package> + <package>freeradius-server-libs</package> + <package>freetype</package> + <package>freetype2-devel</package> + <package>fribidi</package> + <package>fribidi-devel</package> + <package>ft2demos</package> + <package>fuse-devel</package> + <package>fwnn-devel</package> + <package>fxload</package> + <package>gcc-gij</package> + <package>gcc-java</package> + <package>gcc43-gij</package> + <package>gcc43-java</package> + <package>gconf-sharp2</package> + <package>gconf2-devel</package> + <package>gconfmm</package> + <package>gconfmm-devel</package> + <package>gd</package> + <package>gd-devel</package> + <package>gdbm-32bit</package> + <package>gdk-pixbuf</package> + <package>gdk-pixbuf-devel</package> + <package>gegl-0_0</package> + <package>gettext-tools</package> + <package>gfxboot-branding-SLED</package> + <package>gfxboot-devel</package> + <package>ggz</package> + <package>ggz-client-libs</package> + <package>ggz-client-libs-devel</package> + <package>ggz-client-libs-lang</package> + <package>ghex</package> + <package>ghex-devel</package> + <package>ghex-lang</package> + <package>ghostscript-devel</package> + <package>ghostscript-fonts-other</package> + <package>ghostscript-fonts-std</package> + <package>ghostscript-ijs-devel</package> + <package>ghostscript-library</package> + <package>ghostscript-omni</package> + <package>ghostscript-x11</package> + <package>giflib-devel</package> + <package>gimp</package> + <package>gimp-branding-SLED</package> + <package>gimp-devel</package> + <package>gimp-lang</package> + <package>gimp-plugins-python</package> + <package>git</package> + <package>git-arch</package> + <package>git-core</package> + <package>git-cvs</package> + <package>git-daemon</package> + <package>git-email</package> + <package>git-gui</package> + <package>git-svn</package> + <package>git-web</package> + <package>gitk</package> + <package>gjdoc</package> + <package>glade-sharp2</package> + <package>glade3</package> + <package>glade3-lang</package> + <package>glib</package> + <package>glib-devel</package> + <package>glib-sharp2</package> + <package>glib2-devel</package> + <package>glibmm2</package> + <package>glibmm2-devel</package> + <package>glitz</package> + <package>glitz-devel</package> + <package>gltt</package> + <package>gltt-devel</package> + <package>gmime-2_4-devel</package> + <package>gmime-devel</package> + <package>gmp-devel</package> + <package>gnet</package> + <package>gnet-devel</package> + <package>gnokii</package> + <package>gnokii-devel</package> + <package>gnokii-smsd</package> + <package>gnome-certauth-devel</package> + <package>gnome-control-center</package> + <package>gnome-control-center-devel</package> + <package>gnome-control-center-lang</package> + <package>gnome-desktop</package> + <package>gnome-desktop-devel</package> + <package>gnome-desktop-lang</package> + <package>gnome-doc-utils</package> + <package>gnome-doc-utils-devel</package> + <package>gnome-doc-utils-lang</package> + <package>gnome-keyring-devel</package> + <package>gnome-keyring-sharp</package> + <package>gnome-keyring-sharp-devel</package> + <package>gnome-libs</package> + <package>gnome-libs-devel</package> + <package>gnome-mag</package> + <package>gnome-mag-devel</package> + <package>gnome-mag-lang</package> + <package>gnome-main-menu</package> + <package>gnome-main-menu-lang</package> + <package>gnome-media</package> + <package>gnome-media-devel</package> + <package>gnome-media-lang</package> + <package>gnome-menus</package> + <package>gnome-menus-branding-SLED</package> + <package>gnome-menus-devel</package> + <package>gnome-menus-lang</package> + <package>gnome-mount</package> + <package>gnome-mount-lang</package> + <package>gnome-panel</package> + <package>gnome-panel-devel</package> + <package>gnome-panel-lang</package> + <package>gnome-pilot</package> + <package>gnome-pilot-devel</package> + <package>gnome-pilot-lang</package> + <package>gnome-settings-daemon</package> + <package>gnome-settings-daemon-devel</package> + <package>gnome-settings-daemon-lang</package> + <package>gnome-sharp2</package> + <package>gnome-speech</package> + <package>gnome-speech-devel</package> + <package>gnome-themes</package> + <package>gnome-utils</package> + <package>gnome-utils-devel</package> + <package>gnome-utils-lang</package> + <package>gnome-vfs-sharp2</package> + <package>gnome-vfs2</package> + <package>gnome-vfs2-devel</package> + <package>gnome-vfs2-lang</package> + <package>gnome-vfsmm</package> + <package>gnome-vfsmm-devel</package> + <package>gnopernicus</package> + <package>gnopernicus-devel</package> + <package>gnopernicus-lang</package> + <package>gnutls</package> + <package>goffice</package> + <package>goffice-devel</package> + <package>goffice-lang</package> + <package>goocanvas</package> + <package>goocanvas-devel</package> + <package>goocanvas-lang</package> + <package>goom2k4</package> + <package>goom2k4-devel</package> + <package>graphviz</package> + <package>graphviz-devel</package> + <package>graphviz-gd</package> + <package>graphviz-gnome</package> + <package>gstreamer-0_10</package> + <package>gstreamer-0_10-devel</package> + <package>gstreamer-0_10-lang</package> + <package>gstreamer-0_10-plugins-base</package> + <package>gstreamer-0_10-plugins-base-devel</package> + <package>gstreamer-0_10-plugins-base-lang</package> + <package>gstreamer-0_10-plugins-good</package> + <package>gstreamer-0_10-plugins-good-lang</package> + <package>gstreamer-0_10-utils</package> + <package>gstreamer-utils</package> + <package>gtk</package> + <package>gtk-devel</package> + <package>gtk-lang</package> + <package>gtk-sharp2</package> + <package>gtk-vnc-devel</package> + <package>gtk2-devel</package> + <package>gtkglext</package> + <package>gtkglext-devel</package> + <package>gtkhtml2</package> + <package>gtkhtml2-devel</package> + <package>gtkhtml2-lang</package> + <package>gtkhtml314-sharp</package> + <package>gtkmm2</package> + <package>gtkmm2-devel</package> + <package>gtksourceview-devel</package> + <package>gtksourceview-lang</package> + <package>gtksourceview18</package> + <package>gtksourceview18-devel</package> + <package>gtkspell</package> + <package>gtkspell-devel</package> + <package>gtkspell-lang</package> + <package>gucharmap</package> + <package>gucharmap-devel</package> + <package>gucharmap-lang</package> + <package>guile</package> + <package>guile-devel</package> + <package>gutenprint</package> + <package>gutenprint-devel</package> + <package>gvfs-devel</package> + <package>gxmhtml</package> + <package>hal-devel</package> + <package>hal-palm</package> + <package>htdig</package> + <package>htdig-devel</package> + <package>hunspell</package> + <package>hunspell-devel</package> + <package>hunspell-tools</package> + <package>hwinfo-devel</package> + <package>i4l-base</package> + <package>icewm</package> + <package>icewm-lite</package> + <package>id3lib</package> + <package>id3lib-devel</package> + <package>imap-devel</package> + <package>imap-lib</package> + <package>imlib</package> + <package>imlib-devel</package> + <package>imlib2</package> + <package>imlib2-devel</package> + <package>indent</package> + <package>info2html</package> + <package>inn</package> + <package>inn-devel</package> + <package>intltool</package> + <package>ipadic</package> + <package>iptables-devel</package> + <package>iso-codes</package> + <package>iso-codes-devel</package> + <package>iso_ent</package> + <package>ispell</package> + <package>ispell-american</package> + <package>ispell-brazilian</package> + <package>ispell-british</package> + <package>ispell-czech</package> + <package>ispell-danish</package> + <package>ispell-finnish</package> + <package>ispell-french</package> + <package>ispell-german</package> + <package>ispell-hungarian</package> + <package>ispell-italian</package> + <package>ispell-ngerman</package> + <package>ispell-norsk</package> + <package>ispell-polish</package> + <package>ispell-portuguese</package> + <package>ispell-russian</package> + <package>ispell-slovak</package> + <package>ispell-spanish</package> + <package>ispell-swedish</package> + <package>itcl-devel</package> + <package>java-1_4_2-ibm</package> + <package>java-1_4_2-ibm-devel</package> + <package>java-1_5_0-gcj-compat</package> + <package>java-1_5_0-gcj-compat-devel</package> + <package>java-1_6_0-ibm</package> + <package>java-1_6_0-ibm-devel</package> + <package>joe</package> + <package>jpackage-utils</package> + <package>k3b</package> + <package>k3b-devel</package> + <package>k3b-lang</package> + <package>kaddressbook</package> + <package>kalarm</package> + <package>kde-susetranslations</package> + <package>kde4-filesystem</package> + <package>kde4-kgreeter-plugins</package> + <package>kdebase3</package> + <package>kdebase3-devel</package> + <package>kdebase3-runtime</package> + <package>kdebase4-SLED</package> + <package>kdebase4-SLED-lang</package> + <package>kdebase4-runtime</package> + <package>kdebase4-runtime-branding-SLED</package> + <package>kdebase4-workspace</package> + <package>kdebase4-workspace-branding-SLED</package> + <package>kdebase4-workspace-devel</package> + <package>kdebase4-workspace-ksysguardd</package> + <package>kdelibs3</package> + <package>kdelibs3-arts</package> + <package>kdelibs3-default-style</package> + <package>kdelibs3-devel</package> + <package>kdelibs3-doc</package> + <package>kdelibs4</package> + <package>kdelibs4-branding-SLED</package> + <package>kdelibs4-core</package> + <package>kdelibs4-doc</package> + <package>kdemultimedia3-arts</package> + <package>kdepim3</package> + <package>kdepim4</package> + <package>kdepim4-devel</package> + <package>kdepimlibs4</package> + <package>kdialog</package> + <package>kdm</package> + <package>kdm-branding-SLED</package> + <package>kernel-docs</package> + <package>kernel-syms</package> + <package>kernel-trace-devel</package> + <package>kernel-xen-devel</package> + <package>keyutils-devel</package> + <package>kio_sysinfo</package> + <package>kio_sysinfo-branding-SLED</package> + <package>kmail</package> + <package>knode</package> + <package>kontact</package> + <package>korganizer</package> + <package>kpilot</package> + <package>krb5-devel</package> + <package>ksh-devel</package> + <package>ktorrent</package> + <package>ktorrent-devel</package> + <package>ktorrent-lang</package> + <package>kwin</package> + <package>ladspa-devel</package> + <package>lib3ds-1-3</package> + <package>lib3ds-devel</package> + <package>libFLAC++6</package> + <package>libFLAC8</package> + <package>libHX-devel</package> + <package>libMagick++-devel</package> + <package>libMagick++1</package> + <package>libMagickWand1</package> + <package>libQtWebKit-devel</package> + <package>libQtWebKit4</package> + <package>libXerces-c-devel</package> + <package>libXerces-c28</package> + <package>libXiterm</package> + <package>libXiterm-devel</package> + <package>libacl-devel</package> + <package>libadns-devel</package> + <package>libadns1</package> + <package>libakode</package> + <package>libakode-devel</package> + <package>libakonadi4</package> + <package>libakonadiprotocolinternals-devel</package> + <package>libakonadiprotocolinternals1</package> + <package>libao</package> + <package>libao-devel</package> + <package>libapparmor-devel</package> + <package>libapr-util1</package> + <package>libapr-util1-devel</package> + <package>libapr1</package> + <package>libapr1-devel</package> + <package>libarchive-devel</package> + <package>libart_lgpl</package> + <package>libart_lgpl-devel</package> + <package>libassuan-devel</package> + <package>libatomic-ops-devel</package> + <package>libattr-devel</package> + <package>libavahi-core5</package> + <package>libavahi-devel</package> + <package>libavahi-glib-devel</package> + <package>libavahi-gobject-devel</package> + <package>libavahi-gobject0</package> + <package>libavahi-ui0</package> + <package>libavc1394-0</package> + <package>libavc1394-devel</package> + <package>libbabl-0_0-0</package> + <package>libbeagle-devel</package> + <package>libbeagle-python</package> + <package>libbeagle1</package> + <package>libbitmask-devel</package> + <package>libbitmask1</package> + <package>libblkid-devel</package> + <package>libblocxx-devel</package> + <package>libbonobo</package> + <package>libbonobo-devel</package> + <package>libbonobo-lang</package> + <package>libbonoboui</package> + <package>libbonoboui-devel</package> + <package>libbonoboui-lang</package> + <package>libboost_date_time1_36_0</package> + <package>libboost_filesystem1_36_0</package> + <package>libboost_graph1_36_0</package> + <package>libboost_iostreams1_36_0</package> + <package>libboost_math1_36_0</package> + <package>libboost_mpi1_36_0</package> + <package>libboost_program_options1_36_0</package> + <package>libboost_python1_36_0</package> + <package>libboost_serialization1_36_0</package> + <package>libboost_signals1_36_0</package> + <package>libboost_system1_36_0</package> + <package>libboost_test1_36_0</package> + <package>libboost_thread1_36_0</package> + <package>libboost_wave1_36_0</package> + <package>libbotan-1_6_4</package> + <package>libbotan-devel</package> + <package>libbtctl</package> + <package>libbtctl-devel</package> + <package>libbtctl-lang</package> + <package>libbtctl4</package> + <package>libbz2-devel</package> + <package>libcaca</package> + <package>libcaca-devel</package> + <package>libcanberra-gtk</package> + <package>libcanberra-gtk0</package> + <package>libcanberra0</package> + <package>libcap-devel</package> + <package>libcap-ng0</package> + <package>libcdda_interface0</package> + <package>libcdda_paranoia0</package> + <package>libcddb-devel</package> + <package>libcddb2</package> + <package>libcdio++0</package> + <package>libcdio-devel</package> + <package>libcgroup-devel</package> + <package>libcgroup1</package> + <package>libchewing</package> + <package>libchewing-devel</package> + <package>libcmpiutil</package> + <package>libcmpiutil-devel</package> + <package>libcolorblind0</package> + <package>libcom_err-devel</package> + <package>libcompizconfig</package> + <package>libcompizconfig-devel</package> + <package>libcppunit-1_12-0</package> + <package>libcppunit-devel</package> + <package>libcpuset-devel</package> + <package>libcpuset1</package> + <package>libcroco</package> + <package>libcroco-0_6-3</package> + <package>libcroco-devel</package> + <package>libcryptsetup-devel</package> + <package>libcsync-devel</package> + <package>libcsync0</package> + <package>libcurl-devel</package> + <package>libdaemon-devel</package> + <package>libdaemon0</package> + <package>libdatrie-devel</package> + <package>libdatrie0</package> + <package>libdb-4_5-32bit</package> + <package>libdb-4_5-devel</package> + <package>libdbus-1-qt3-0</package> + <package>libdbus-1-qt3-0-devel</package> + <package>libdc1394-22</package> + <package>libdc1394-devel</package> + <package>libdc1394_control12</package> + <package>libdc1394_control12-devel</package> + <package>libdhcp6client-1_0-2</package> + <package>libdhcp6client-devel</package> + <package>libdigikam-devel</package> + <package>libdiscid1</package> + <package>libdjvulibre-devel</package> + <package>libdjvulibre21</package> + <package>libdmxview-devel</package> + <package>libdmxview0</package> + <package>libdnet-devel</package> + <package>libdnet1</package> + <package>libdns_sd</package> + <package>libdrm</package> + <package>libdrm-devel</package> + <package>libdv-devel</package> + <package>libdv4</package> + <package>libdvdread4</package> + <package>libdw-devel</package> + <package>libebl-devel</package> + <package>libedit-devel</package> + <package>libedit0</package> + <package>libelf-devel</package> + <package>libenchant1</package> + <package>libesd-devel</package> + <package>libesd0</package> + <package>libesmtp-devel</package> + <package>libevoldap-2_4-2</package> + <package>libevtlog-devel</package> + <package>libevtlog0</package> + <package>libexempi-devel</package> + <package>libexempi3</package> + <package>libexif-devel</package> + <package>libexiv2-4</package> + <package>libexiv2-devel</package> + <package>libexpat-devel</package> + <package>libext2fs-devel</package> + <package>libfarsight-0_1-3</package> + <package>libffi-devel</package> + <package>libffi43</package> + <package>libffi43-devel</package> + <package>libflaim-devel</package> + <package>libfprint-devel</package> + <package>libfreebl3</package> + <package>libfreebob</package> + <package>libfreebob-devel</package> + <package>libgadu</package> + <package>libgadu-devel</package> + <package>libgail-gnome</package> + <package>libgail-gnome-devel</package> + <package>libgcj-devel</package> + <package>libgcj43</package> + <package>libgcj43-devel</package> + <package>libgcj43-jar</package> + <package>libgcj_bc43</package> + <package>libgcrypt-devel</package> + <package>libgda-3_0-3</package> + <package>libgda-3_0-devel</package> + <package>libgdiplus0</package> + <package>libgegl-0_0-0</package> + <package>libgeoclue0</package> + <package>libgfortran46</package> + <package>libggz2</package> + <package>libggz2-devel</package> + <package>libgimpprint</package> + <package>libgimpprint-devel</package> + <package>libglade2</package> + <package>libglade2-devel</package> + <package>libglademm</package> + <package>libglademm-2_4-1</package> + <package>libglademm-devel</package> + <package>libgladeui-1-9</package> + <package>libgladeui-1_0-devel</package> + <package>libgmime-2_0-3</package> + <package>libgmime-2_4-2</package> + <package>libgmm++-devel</package> + <package>libgnome</package> + <package>libgnome-certauth0</package> + <package>libgnome-desktop-2-11</package> + <package>libgnome-devel</package> + <package>libgnome-lang</package> + <package>libgnome-menu2</package> + <package>libgnome-window-settings1</package> + <package>libgnomecanvas</package> + <package>libgnomecanvas-devel</package> + <package>libgnomecanvas-lang</package> + <package>libgnomecanvasmm</package> + <package>libgnomecanvasmm-devel</package> + <package>libgnomecups</package> + <package>libgnomecups-devel</package> + <package>libgnomecups-lang</package> + <package>libgnomedb</package> + <package>libgnomedb-devel</package> + <package>libgnomedb-lang</package> + <package>libgnomekbd</package> + <package>libgnomekbd-devel</package> + <package>libgnomekbd-lang</package> + <package>libgnomeprint</package> + <package>libgnomeprint-devel</package> + <package>libgnomeprint-lang</package> + <package>libgnomeprintui</package> + <package>libgnomeprintui-devel</package> + <package>libgnomeprintui-lang</package> + <package>libgnomesu</package> + <package>libgnomesu-devel</package> + <package>libgnomesu-lang</package> + <package>libgnomesu0</package> + <package>libgnomeui</package> + <package>libgnomeui-devel</package> + <package>libgnomeui-lang</package> + <package>libgnomevfsmm-2_6-1</package> + <package>libgnutls-devel</package> + <package>libgnutls-extra-devel</package> + <package>libgnutls-extra26</package> + <package>libgoocanvas3</package> + <package>libgpg-error-devel</package> + <package>libgpgme-devel</package> + <package>libgphoto2-devel</package> + <package>libgpod-devel</package> + <package>libgsf</package> + <package>libgsf-1-114</package> + <package>libgsf-devel</package> + <package>libgsf-gnome</package> + <package>libgsm-devel</package> + <package>libgsm1</package> + <package>libgssglue-devel</package> + <package>libgstapp-0_10-0</package> + <package>libgstinterfaces-0_10-0</package> + <package>libgstreamer-0_10-0</package> + <package>libgtk-vnc-1_0-0</package> + <package>libgtkhtml</package> + <package>libgtkhtml-devel</package> + <package>libgtksourceview-2_0-0</package> + <package>libgtop</package> + <package>libgtop-2_0-7</package> + <package>libgtop-devel</package> + <package>libgtop-lang</package> + <package>libgudev-1_0-0</package> + <package>libgweather</package> + <package>libgweather-devel</package> + <package>libgweather-lang</package> + <package>libgweather1</package> + <package>libhangul</package> + <package>libhangul-devel</package> + <package>libhowl0</package> + <package>libical-devel</package> + <package>libical0</package> + <package>libicu-devel</package> + <package>libid3tag</package> + <package>libid3tag-devel</package> + <package>libidl-devel</package> + <package>libidn-devel</package> + <package>libiec61883</package> + <package>libiec61883-devel</package> + <package>libieee1284</package> + <package>libiniparser-devel</package> + <package>libiniparser0</package> + <package>libiptcdata</package> + <package>libiptcdata-devel</package> + <package>libiptcdata0</package> + <package>libiso9660-5</package> + <package>libiterm</package> + <package>libiterm-devel</package> + <package>libjack-devel</package> + <package>libjack0</package> + <package>libjasper</package> + <package>libjasper-devel</package> + <package>libjingle-0_3-0</package> + <package>libjingle-devel</package> + <package>libjpeg-devel</package> + <package>libkcal</package> + <package>libkcal-devel</package> + <package>libkcal2</package> + <package>libkcddb4</package> + <package>libkcddb4-devel</package> + <package>libkcompactdisc4</package> + <package>libkcompactdisc4-devel</package> + <package>libkdcraw3</package> + <package>libkdcraw3-devel</package> + <package>libkdcraw3-lang</package> + <package>libkde4</package> + <package>libkde4-devel</package> + <package>libkdecore4</package> + <package>libkdecore4-devel</package> + <package>libkdepim4</package> + <package>libkdepim4-devel</package> + <package>libkdepimlibs4</package> + <package>libkdepimlibs4-devel</package> + <package>libkexiv2-3</package> + <package>libkexiv2-3-devel</package> + <package>libkexiv2-7</package> + <package>libkipi-devel</package> + <package>libkipi6</package> + <package>libkmime-devel</package> + <package>libkmime2</package> + <package>libknotificationitem-1-1</package> + <package>libkonq-devel</package> + <package>libkonq5</package> + <package>libksba-devel</package> + <package>libktnef-devel</package> + <package>libktnef1</package> + <package>liblazy-devel</package> + <package>liblazy1</package> + <package>liblcms-devel</package> + <package>libldapcpp-devel</package> + <package>liblog4c-devel</package> + <package>liblog4c3</package> + <package>libloudmouth-1-0</package> + <package>liblpsolve55</package> + <package>liblua5_1</package> + <package>libmalaga-devel</package> + <package>libmalaga7</package> + <package>libmcrypt</package> + <package>libmcrypt-devel</package> + <package>libmikmod</package> + <package>libmikmod-devel</package> + <package>libmm-devel</package> + <package>libmm14</package> + <package>libmng-devel</package> + <package>libmpcdec-devel</package> + <package>libmpcdec5</package> + <package>libmspack-devel</package> + <package>libmtp-devel</package> + <package>libmtp8</package> + <package>libmusicbrainz-devel</package> + <package>libmusicbrainz3-6</package> + <package>libmusicbrainz3-devel</package> + <package>libmusicbrainz4</package> + <package>libmysqlclient-devel</package> + <package>libmysqlclient15</package> + <package>libmysqlclient_r15</package> + <package>libneon-devel</package> + <package>libneon27</package> + <package>libnetapi-devel</package> + <package>libnetapi0</package> + <package>libnetcontrol0</package> + <package>libnetpbm-devel</package> + <package>libnetpbm10</package> + <package>libnewt0_52</package> + <package>libnjb</package> + <package>libnjb-devel</package> + <package>libnjb5</package> + <package>libnl-devel</package> + <package>libnotify</package> + <package>libnotify-devel</package> + <package>libnotify1</package> + <package>libnscd-devel</package> + <package>libnsssharedhelper0</package> + <package>libnuma-devel</package> + <package>libofa-devel</package> + <package>libofa0</package> + <package>libogg-devel</package> + <package>libogg0</package> + <package>liboil</package> + <package>liboil-devel</package> + <package>libopenbabel-devel</package> + <package>libopenbabel3</package> + <package>libopencdk-devel</package> + <package>libopencdk10</package> + <package>libopenraw-devel</package> + <package>libopenraw1</package> + <package>libopenssl-devel</package> + <package>libopensync</package> + <package>libopensync-devel</package> + <package>libopensync-plugin-evolution2</package> + <package>libopensync-plugin-evolution2-devel</package> + <package>libopensync-plugin-palm</package> + <package>libopensync-plugin-palm-devel</package> + <package>liborc-0_4-0</package> + <package>libosip2</package> + <package>libosip2-devel</package> + <package>libotf</package> + <package>libotf-devel</package> + <package>libotr-devel</package> + <package>libotr2</package> + <package>libp11-1</package> + <package>libp11-devel</package> + <package>libpackagekit-glib10</package> + <package>libpackagekit-glib10-devel</package> + <package>libpangomm-1_4-1</package> + <package>libpcap-devel</package> + <package>libpciaccess0</package> + <package>libpciaccess0-devel</package> + <package>libphonon4</package> + <package>libpisock-devel</package> + <package>libpisock9</package> + <package>libpisync-devel</package> + <package>libpisync1</package> + <package>libpixman-1-0-devel</package> + <package>libpkcs11-helper1</package> + <package>libpng-devel</package> + <package>libpolkit-qt0</package> + <package>libpoppler-devel</package> + <package>libpoppler-glib-devel</package> + <package>libpoppler-glib4</package> + <package>libpoppler-qt2</package> + <package>libpoppler-qt3-devel</package> + <package>libpoppler-qt4-3</package> + <package>libpoppler-qt4-devel</package> + <package>libpoppler5</package> + <package>libpst4</package> + <package>libpt2</package> + <package>libpt2-devel</package> + <package>libpulse-browse0</package> + <package>libpulse-devel</package> + <package>libpulse-mainloop-glib0</package> + <package>libpulse0</package> + <package>libpurple</package> + <package>libpurple-devel</package> + <package>libpurple-lang</package> + <package>libqca2</package> + <package>libqca2-devel</package> + <package>libqdialogsolver1</package> + <package>libqdialogsolver1-devel</package> + <package>libqimageblitz-devel</package> + <package>libqimageblitz4</package> + <package>libqscintilla-devel</package> + <package>libqscintilla2-5</package> + <package>libqt4</package> + <package>libqt4-devel</package> + <package>libqt4-qt3support</package> + <package>libqt4-sql</package> + <package>libqt4-sql-mysql</package> + <package>libqt4-sql-postgresql</package> + <package>libqt4-sql-sqlite</package> + <package>libqt4-sql-unixODBC</package> + <package>libqt4-x11</package> + <package>libqtpod-devel</package> + <package>libqtpod0</package> + <package>libquadmath46</package> + <package>libquicktime</package> + <package>libquicktime-devel</package> + <package>libraptor-devel</package> + <package>libraptor1</package> + <package>librasqal-devel</package> + <package>librasqal1</package> + <package>libraw1394-11</package> + <package>libraw1394-8</package> + <package>libraw1394-devel</package> + <package>libredland-devel</package> + <package>libredland0</package> + <package>libreiserfs-devel</package> + <package>libreoffice</package> + <package>libreoffice-base</package> + <package>libreoffice-branding-SLED</package> + <package>libreoffice-branding-upstream</package> + <package>libreoffice-calc</package> + <package>libreoffice-icon-themes</package> + <package>libreoffice-impress</package> + <package>libreoffice-sdk</package> + <package>libreoffice-writer</package> + <package>librsvg</package> + <package>librsvg-devel</package> + <package>libsamplerate</package> + <package>libsamplerate-devel</package> + <package>libsatsolver-devel</package> + <package>libsblim-cmpiutil1</package> + <package>libselinux-devel</package> + <package>libsemanage-devel</package> + <package>libsemanage1</package> + <package>libsensors3-devel</package> + <package>libsensors4</package> + <package>libsepol-devel</package> + <package>libsexy</package> + <package>libsexy-devel</package> + <package>libshout-devel</package> + <package>libshout3</package> + <package>libsidplay1</package> + <package>libsidplay1-devel</package> + <package>libsigc++2</package> + <package>libsigc++2-devel</package> + <package>libslab-lang</package> + <package>libslab0</package> + <package>libsmbclient-devel</package> + <package>libsmbios-devel</package> + <package>libsmbsharemodes-devel</package> + <package>libsmbsharemodes0</package> + <package>libsndfile</package> + <package>libsndfile-devel</package> + <package>libsoprano-devel</package> + <package>libsoprano4</package> + <package>libsoup-devel</package> + <package>libspectre-devel</package> + <package>libspectre1</package> + <package>libspeex</package> + <package>libssh2-devel</package> + <package>libstrigi0</package> + <package>libstroke</package> + <package>libstroke-devel</package> + <package>libsyncml-devel</package> + <package>libsyncml0</package> + <package>libtalloc-devel</package> + <package>libtasn1-devel</package> + <package>libtdb-devel</package> + <package>libtelepathy</package> + <package>libtelepathy-devel</package> + <package>libtelepathy-glib0</package> + <package>libtheora-devel</package> + <package>libtheora0</package> + <package>libtidy</package> + <package>libtidy-devel</package> + <package>libtiff-devel</package> + <package>libtirpc-devel</package> + <package>libtomoe-gtk0</package> + <package>libtspi1</package> + <package>libtunepimp</package> + <package>libtunepimp-devel</package> + <package>libtunepimp5</package> + <package>libudev-devel</package> + <package>libudf0</package> + <package>libunique-1_0-0</package> + <package>libunwind</package> + <package>libunwind-devel</package> + <package>libupsclient1</package> + <package>libusb-devel</package> + <package>libusbpp-0_1-4</package> + <package>libustr-1_0-1</package> + <package>libustr-devel</package> + <package>libuuid-devel</package> + <package>libvirt-client</package> + <package>libvirt-devel</package> + <package>libvisual</package> + <package>libvisual-devel</package> + <package>libvoikko-devel</package> + <package>libvoikko1</package> + <package>libvorbis</package> + <package>libvorbis-devel</package> + <package>libwavpack1</package> + <package>libwbclient-devel</package> + <package>libwbxml2-0</package> + <package>libwbxml2-devel</package> + <package>libwebkit-1_0-1</package> + <package>libwebkit-1_0-2</package> + <package>libwebkit-devel</package> + <package>libwebkit-lang</package> + <package>libwmf</package> + <package>libwmf-devel</package> + <package>libwmf-gnome</package> + <package>libwnck</package> + <package>libwnck-1-22</package> + <package>libwnck-devel</package> + <package>libwnck-lang</package> + <package>libwpd-0_8-8</package> + <package>libwpd-devel</package> + <package>libwpg-0_1-1</package> + <package>libwpg-devel</package> + <package>libwps-0_1-1</package> + <package>libwps-devel</package> + <package>libwsman-devel</package> + <package>libwsman1</package> + <package>libxcrypt-devel</package> + <package>libxine-devel</package> + <package>libxine1</package> + <package>libxklavier-devel</package> + <package>libxklavier15</package> + <package>libxml2-devel</package> + <package>libxslt-devel</package> + <package>libyajl1</package> + <package>libzio-devel</package> + <package>libzip-devel</package> + <package>libzip1</package> + <package>libzvbi0</package> + <package>libzypp-devel</package> + <package>limal-apparmor-notifications</package> + <package>limal-apparmor-notifications-devel</package> + <package>limal-ca-mgm-devel</package> + <package>limal-devel</package> + <package>limal-devtools</package> + <package>limal-nfs-server-devel</package> + <package>linux-atm-devel</package> + <package>linux-atm-lib</package> + <package>lksctp-tools</package> + <package>lksctp-tools-devel</package> + <package>loudmouth-devel</package> + <package>lua</package> + <package>lua-devel</package> + <package>lzo-devel</package> + <package>m17n-db</package> + <package>m17n-lib</package> + <package>m17n-lib-devel</package> + <package>malaga-suomi</package> + <package>meanwhile</package> + <package>meanwhile-devel</package> + <package>metacity</package> + <package>metacity-devel</package> + <package>metacity-lang</package> + <package>mhash</package> + <package>mhash-devel</package> + <package>misc-console-font</package> + <package>mono-addins</package> + <package>mono-basic</package> + <package>mono-core</package> + <package>mono-data</package> + <package>mono-data-oracle</package> + <package>mono-data-sqlite</package> + <package>mono-devel</package> + <package>mono-extras</package> + <package>mono-jscript</package> + <package>mono-tools</package> + <package>mono-wcf</package> + <package>mono-web</package> + <package>mono-winforms</package> + <package>mono-zeroconf</package> + <package>mono-zeroconf-provider-avahi</package> + <package>monodevelop</package> + <package>monodoc-core</package> + <package>mozilla-nspr</package> + <package>mozilla-nspr-devel</package> + <package>mozilla-nss</package> + <package>mozilla-nss-devel</package> + <package>mozilla-xulrunner192</package> + <package>mozilla-xulrunner192-gnome</package> + <package>mpfr-devel</package> + <package>mpi-selector</package> + <package>mpich</package> + <package>mpich-devel</package> + <package>mysql</package> + <package>mysql-client</package> + <package>nagios</package> + <package>nagios-devel</package> + <package>nagios-www</package> + <package>nant</package> + <package>nautilus</package> + <package>nautilus-cd-burner</package> + <package>nautilus-cd-burner-devel</package> + <package>nautilus-cd-burner-lang</package> + <package>nautilus-devel</package> + <package>nautilus-lang</package> + <package>ndesk-dbus</package> + <package>ndesk-dbus-glib</package> + <package>ndesk-dbus-glib-devel</package> + <package>net-snmp</package> + <package>net-snmp-devel</package> + <package>netatalk</package> + <package>netatalk-devel</package> + <package>netcat-openbsd</package> + <package>newt</package> + <package>newt-devel</package> + <package>newt-static</package> + <package>nfsidmap-devel</package> + <package>notification-daemon</package> + <package>notification-daemon-lang</package> + <package>notify-sharp</package> + <package>nss-mdns</package> + <package>nss-shared-helper-devel</package> + <package>nut</package> + <package>nut-classic</package> + <package>nut-devel</package> + <package>opal</package> + <package>opal-devel</package> + <package>openCryptoki</package> + <package>openCryptoki-64bit</package> + <package>openCryptoki-devel</package> + <package>openct-devel</package> + <package>openhpi</package> + <package>openhpi-daemon</package> + <package>openhpi-devel</package> + <package>openjade</package> + <package>openjade-devel</package> + <package>openldap2-devel</package> + <package>openmotif-devel</package> + <package>openmotif-libs</package> + <package>openmpi</package> + <package>openobex-devel</package> + <package>openobex-glib-devel</package> + <package>opensc-devel</package> + <package>openslp-devel</package> + <package>opensp</package> + <package>opensp-devel</package> + <package>openwsman-client</package> + <package>openwsman-server</package> + <package>orbit</package> + <package>orbit-devel</package> + <package>orbit2-devel</package> + <package>oxygen-icon-theme</package> + <package>oxygen-icon-theme-scalable</package> + <package>ozerocdoff</package> + <package>pam-devel</package> + <package>pango-devel</package> + <package>pangomm-devel</package> + <package>parted-devel</package> + <package>patchutils</package> + <package>pciutils-devel</package> + <package>pcre-devel</package> + <package>pcsc-acr38</package> + <package>pcsc-acr38-devel</package> + <package>pcsc-lite-devel</package> + <package>perl-32bit</package> + <package>perl-Crypt-OpenSSL-RSA</package> + <package>perl-Mail-DKIM</package> + <package>perl-MailTools</package> + <package>perl-Net-DNS</package> + <package>perl-Net-IP</package> + <package>perl-NetAddr-IP</package> + <package>perl-SNMP</package> + <package>perl-Tie-IxHash</package> + <package>perl-Tk</package> + <package>perl-Tk-devel</package> + <package>perl-spamassassin</package> + <package>phonon</package> + <package>phonon-backend-gstreamer-0_10</package> + <package>phonon-devel</package> + <package>php5</package> + <package>php5-ctype</package> + <package>php5-devel</package> + <package>php5-dom</package> + <package>php5-hash</package> + <package>php5-iconv</package> + <package>php5-json</package> + <package>php5-pdo</package> + <package>php5-sqlite</package> + <package>php5-suhosin</package> + <package>php5-tokenizer</package> + <package>php5-xmlreader</package> + <package>php5-xmlwriter</package> + <package>php53</package> + <package>php53-ctype</package> + <package>php53-dom</package> + <package>php53-iconv</package> + <package>php53-json</package> + <package>php53-tokenizer</package> + <package>php53-xmlreader</package> + <package>php53-xmlwriter</package> + <package>pidgin</package> + <package>pidgin-devel</package> + <package>pilot-link</package> + <package>pkcs11-helper</package> + <package>pkcs11-helper-devel</package> + <package>planner</package> + <package>planner-devel</package> + <package>planner-lang</package> + <package>plasma-addons</package> + <package>plasma-theme-aya</package> + <package>plasmoid-networkmanagement</package> + <package>plasmoid-quickaccess</package> + <package>plotutils</package> + <package>poppler-data</package> + <package>poppler-tools</package> + <package>popt-devel</package> + <package>portmap</package> + <package>postfix-devel</package> + <package>postgresql-devel</package> + <package>postgresql-libs</package> + <package>ppp-devel</package> + <package>ppp-userpass</package> + <package>pstoedit</package> + <package>pstoedit-devel</package> + <package>pulseaudio</package> + <package>pulseaudio-esound-compat</package> + <package>pulseaudio-lang</package> + <package>puppet</package> + <package>python-cairo</package> + <package>python-cairo-devel</package> + <package>python-devel</package> + <package>python-gnome</package> + <package>python-gnome-devel</package> + <package>python-gobject2</package> + <package>python-gobject2-devel</package> + <package>python-gtk</package> + <package>python-gtk-devel</package> + <package>python-gtkglext</package> + <package>python-gtkglext-devel</package> + <package>python-gtksourceview</package> + <package>python-gtksourceview-devel</package> + <package>python-numeric</package> + <package>python-numpy</package> + <package>python-orbit</package> + <package>python-orbit-devel</package> + <package>pyxml</package> + <package>qt3</package> + <package>qt3-devel</package> + <package>quagga</package> + <package>quagga-devel</package> + <package>quilt</package> + <package>raptor</package> + <package>rarian</package> + <package>rarian-devel</package> + <package>re2c</package> + <package>readline-devel</package> + <package>recode-devel</package> + <package>rpm-devel</package> + <package>rrdtool</package> + <package>rrdtool-devel</package> + <package>rsyslog</package> + <package>ruby</package> + <package>rubygems</package> + <package>ruby-devel</package> + <package>ruby-doc-html</package> + <package>ruby-doc-ri</package> + <package>ruby-examples</package> + <package>ruby-fcgi</package> + <package>ruby-mysql</package> + <package>ruby-selinux</package> + <package>ruby-test-suite</package> + <package>ruby-tk</package> + <package>sablot</package> + <package>sablot-devel</package> + <package>samba-devel</package> + <package>sane-backends</package> + <package>sane-frontends</package> + <package>sax2-libsax</package> + <package>sax2-libsax-devel</package> + <package>sax2-libsax-perl</package> + <package>sax2-tools</package> + <package>sblim-cmpi-base</package> + <package>sblim-cmpi-base-devel</package> + <package>sblim-cmpi-devel</package> + <package>sblim-cmpiutil-devel</package> + <package>sblim-indication_helper</package> + <package>sblim-sfcb</package> + <package>sblim-sfcc</package> + <package>sblim-sfcc-devel</package> + <package>scim</package> + <package>scim-devel</package> + <package>scpm-devel</package> + <package>scrollkeeper</package> + <package>scrollkeeper-lang</package> + <package>seahorse</package> + <package>seahorse-devel</package> + <package>seahorse-lang</package> + <package>sendmail</package> + <package>sendmail-devel</package> + <package>sg3_utils-devel</package> + <package>sgml-skel</package> + <package>shared-mime-info</package> + <package>silc-toolkit</package> + <package>silc-toolkit-devel</package> + <package>slang</package> + <package>slang-devel</package> + <package>soprano</package> + <package>soprano-backend-redland</package> + <package>spamassassin</package> + <package>speex-devel</package> + <package>splashy-devel</package> + <package>sqlite2</package> + <package>sqlite3-devel</package> + <package>startup-notification</package> + <package>startup-notification-devel</package> + <package>strigi</package> + <package>strigi-devel</package> + <package>subversion</package> + <package>subversion-perl</package> + <package>susehelp</package> + <package>susehelp_cz</package> + <package>susehelp_de</package> + <package>susehelp_en</package> + <package>susehelp_es</package> + <package>susehelp_fr</package> + <package>susehelp_hu</package> + <package>susehelp_it</package> + <package>swig</package> + <package>syslogd</package> + <package>t1lib</package> + <package>t1lib-devel</package> + <package>taglib</package> + <package>taglib-devel</package> + <package>taglib-sharp</package> + <package>tango-icon-theme</package> + <package>tcl-devel</package> + <package>tcpd-devel</package> + <package>telepathy-glib-devel</package> + <package>telepathy-mission-control</package> + <package>telepathy-mission-control-devel</package> + <package>texlive-bin-devel</package> + <package>texlive-devel</package> + <package>tk-devel</package> + <package>tla</package> + <package>tn5250</package> + <package>tn5250-devel</package> + <package>tomoe</package> + <package>tomoe-devel</package> + <package>tomoe-gtk</package> + <package>tomoe-gtk-devel</package> + <package>tomoe-gtk-lang</package> + <package>totem-pl-parser</package> + <package>totem-pl-parser-devel</package> + <package>totem-pl-parser-lang</package> + <package>trousers</package> + <package>trousers-devel</package> + <package>tsclient</package> + <package>tsclient-devel</package> + <package>tsclient-lang</package> + <package>uim</package> + <package>uim-devel</package> + <package>unixODBC</package> + <package>unixODBC-devel</package> + <package>unsermake</package> + <package>update-desktop-files</package> + <package>usb_modeswitch</package> + <package>usb_modeswitch-data</package> + <package>valgrind</package> + <package>valgrind-devel</package> + <package>vte</package> + <package>vte-devel</package> + <package>vte-lang</package> + <package>wdiff</package> + <package>webkit-sharp</package> + <package>wireshark</package> + <package>wireshark-devel</package> + <package>wodim-devel</package> + <package>wordcut</package> + <package>wordcut-devel</package> + <package>words</package> + <package>wpa_supplicant</package> + <package>wvstreams</package> + <package>wvstreams-devel</package> + <package>wxGTK-compat</package> + <package>wxGTK-devel</package> + <package>wxGTK-gl</package> + <package>x11-input-wacom</package> + <package>x11-input-wacom-devel</package> + <package>x11-input-wacom-tools</package> + <package>xalan-j2</package> + <package>xaw3d-devel</package> + <package>xbase</package> + <package>xbase-devel</package> + <package>xdelta</package> + <package>xdelta-devel</package> + <package>xdg-menu</package> + <package>xen-devel</package> + <package>xen-libs</package> + <package>xerces-j2</package> + <package>xerces-j2-bootstrap</package> + <package>xerces-j2-xml-apis</package> + <package>xfsprogs-devel</package> + <package>xml-commons-apis-bootstrap</package> + <package>xml-commons-resolver-bootstrap</package> + <package>xml-commons-which-bootstrap</package> + <package>xmlcharent</package> + <package>xorg-x11</package> + <package>xorg-x11-devel</package> + <package>xorg-x11-fonts</package> + <package>xorg-x11-fonts-core</package> + <package>xorg-x11-fonts-devel</package> + <package>xorg-x11-libICE-devel</package> + <package>xorg-x11-libSM-devel</package> + <package>xorg-x11-libX11-devel</package> + <package>xorg-x11-libXau-devel</package> + <package>xorg-x11-libXdmcp-devel</package> + <package>xorg-x11-libXext-devel</package> + <package>xorg-x11-libXfixes-devel</package> + <package>xorg-x11-libXmu-devel</package> + <package>xorg-x11-libXp-devel</package> + <package>xorg-x11-libXpm-devel</package> + <package>xorg-x11-libXprintUtil-devel</package> + <package>xorg-x11-libXrender-devel</package> + <package>xorg-x11-libXt-devel</package> + <package>xorg-x11-libXv-devel</package> + <package>xorg-x11-libfontenc-devel</package> + <package>xorg-x11-libxcb-devel</package> + <package>xorg-x11-libxkbfile-devel</package> + <package>xorg-x11-proto-devel</package> + <package>xorg-x11-server</package> + <package>xorg-x11-util-devel</package> + <package>xorg-x11-xauth</package> + <package>xorg-x11-xtrans-devel</package> + <package>xosd</package> + <package>xosd-devel</package> + <package>xsp</package> + <package>xterm</package> + <package>xz-devel</package> + <package>yast2-core-devel</package> + <package>yast2-devtools</package> + <package>yast2-gtk</package> + <package>yast2-libyui-devel</package> + <package>yast2-ncurses-devel</package> + <package>yast2-qt</package> + <package>yast2-qt-devel</package> + <package>yast2-qt-pkg</package> + <package>yast2-storage-devel</package> + <package>yast2-ycp-ui-bindings-devel</package> + <package>yelp</package> + <package>yelp-lang</package> + <package>zenity</package> + <package>zenity-lang</package> + <package>zlib-devel</package> + <package>zsh</package> + <package>zvbi-devel</package> + </remove-packages> + + </software> + <user_defaults> + <expire></expire> + <group>100</group> + <groups>video,dialout</groups> + <home>/home</home> + <inactive>-1</inactive> + <shell>/bin/bash</shell> + <skel>/etc/skel</skel> + <umask>022</umask> + </user_defaults> + <users config:type="list"> + <user> + <encrypted config:type="boolean">true</encrypted> + <fullname>vagrant</fullname> + <gid>100</gid> + <home>/home/vagrant</home> + <password_settings> + <expire></expire> + <flag></flag> + <inact></inact> + <max>99999</max> + <min>0</min> + <warn>7</warn> + </password_settings> + <shell>/bin/bash</shell> + <uid>1000</uid> + <user_password>$2y$05$NA1Li9ZKJOLRW5mMTXm6/e5r8dltWS5RpDZpvHrI82aLE00V51tdi</user_password> + <username>vagrant</username> + </user> + <user> + <encrypted config:type="boolean">true</encrypted> + <fullname>Games account</fullname> + <gid>100</gid> + <home>/var/games</home> + <password_settings> + <expire></expire> + <flag></flag> + <inact></inact> + <max></max> + <min></min> + <warn></warn> + </password_settings> + <shell>/bin/bash</shell> + <uid>12</uid> + <user_password>*</user_password> + <username>games</username> + </user> + <user> + <encrypted config:type="boolean">true</encrypted> + <fullname>bin</fullname> + <gid>1</gid> + <home>/bin</home> + <password_settings> + <expire></expire> + <flag></flag> + <inact></inact> + <max></max> + <min></min> + <warn></warn> + </password_settings> + <shell>/bin/bash</shell> + <uid>1</uid> + <user_password>*</user_password> + <username>bin</username> + </user> + <user> + <encrypted config:type="boolean">true</encrypted> + <fullname>nobody</fullname> + <gid>65533</gid> + <home>/var/lib/nobody</home> + <password_settings> + <expire></expire> + <flag></flag> + <inact></inact> + <max></max> + <min></min> + <warn></warn> + </password_settings> + <shell>/bin/bash</shell> + <uid>65534</uid> + <user_password>*</user_password> + <username>nobody</username> + </user> + <user> + <encrypted config:type="boolean">true</encrypted> + <fullname>Printing daemon</fullname> + <gid>7</gid> + <home>/var/spool/lpd</home> + <password_settings> + <expire></expire> + <flag></flag> + <inact></inact> + <max></max> + <min></min> + <warn></warn> + </password_settings> + <shell>/bin/bash</shell> + <uid>4</uid> + <user_password>*</user_password> + <username>lp</username> + </user> + <user> + <encrypted config:type="boolean">true</encrypted> + <fullname>User for uuidd</fullname> + <gid>104</gid> + <home>/var/run/uuidd</home> + <password_settings> + <expire></expire> + <flag></flag> + <inact></inact> + <max>99999</max> + <min>0</min> + <warn>7</warn> + </password_settings> + <shell>/bin/false</shell> + <uid>102</uid> + <user_password>*</user_password> + <username>uuidd</username> + </user> + <user> + <encrypted config:type="boolean">true</encrypted> + <fullname>Postfix Daemon</fullname> + <gid>51</gid> + <home>/var/spool/postfix</home> + <password_settings> + <expire></expire> + <flag></flag> + <inact></inact> + <max>99999</max> + <min>0</min> + <warn>7</warn> + </password_settings> + <shell>/bin/false</shell> + <uid>51</uid> + <user_password>*</user_password> + <username>postfix</username> + </user> + <user> + <encrypted config:type="boolean">true</encrypted> + <fullname>Novell Customer Center User</fullname> + <gid>111</gid> + <home>/var/lib/YaST2/suse-ncc-fakehome</home> + <password_settings> + <expire></expire> + <flag></flag> + <inact></inact> + <max>99999</max> + <min>0</min> + <warn>7</warn> + </password_settings> + <shell>/bin/bash</shell> + <uid>106</uid> + <user_password>*</user_password> + <username>suse-ncc</username> + </user> + <user> + <encrypted config:type="boolean">true</encrypted> + <fullname>FTP account</fullname> + <gid>49</gid> + <home>/srv/ftp</home> + <password_settings> + <expire></expire> + <flag></flag> + <inact></inact> + <max></max> + <min></min> + <warn></warn> + </password_settings> + <shell>/bin/bash</shell> + <uid>40</uid> + <user_password>*</user_password> + <username>ftp</username> + </user> + <user> + <encrypted config:type="boolean">true</encrypted> + <fullname>Gnome Display Manager daemon</fullname> + <gid>112</gid> + <home>/var/lib/gdm</home> + <password_settings> + <expire></expire> + <flag></flag> + <inact></inact> + <max>99999</max> + <min>0</min> + <warn>7</warn> + </password_settings> + <shell>/bin/false</shell> + <uid>107</uid> + <user_password>*</user_password> + <username>gdm</username> + </user> + <user> + <encrypted config:type="boolean">true</encrypted> + <fullname>Batch jobs daemon</fullname> + <gid>25</gid> + <home>/var/spool/atjobs</home> + <password_settings> + <expire></expire> + <flag></flag> + <inact></inact> + <max>99999</max> + <min>0</min> + <warn>7</warn> + </password_settings> + <shell>/bin/bash</shell> + <uid>25</uid> + <user_password>*</user_password> + <username>at</username> + </user> + <user> + <encrypted config:type="boolean">true</encrypted> + <fullname>root</fullname> + <gid>0</gid> + <home>/root</home> + <password_settings> + <expire></expire> + <flag></flag> + <inact></inact> + <max></max> + <min></min> + <warn></warn> + </password_settings> + <shell>/bin/bash</shell> + <uid>0</uid> + <user_password>$2y$05$NA1Li9ZKJOLRW5mMTXm6/e5r8dltWS5RpDZpvHrI82aLE00V51tdi</user_password> + <username>root</username> + </user> + <user> + <encrypted config:type="boolean">true</encrypted> + <fullname>Mailer daemon</fullname> + <gid>12</gid> + <home>/var/spool/clientmqueue</home> + <password_settings> + <expire></expire> + <flag></flag> + <inact></inact> + <max></max> + <min></min> + <warn></warn> + </password_settings> + <shell>/bin/false</shell> + <uid>8</uid> + <user_password>*</user_password> + <username>mail</username> + </user> + <user> + <encrypted config:type="boolean">true</encrypted> + <fullname>Daemon</fullname> + <gid>2</gid> + <home>/sbin</home> + <password_settings> + <expire></expire> + <flag></flag> + <inact></inact> + <max></max> + <min></min> + <warn></warn> + </password_settings> + <shell>/bin/bash</shell> + <uid>2</uid> + <user_password>*</user_password> + <username>daemon</username> + </user> + <user> + <encrypted config:type="boolean">true</encrypted> + <fullname>NTP daemon</fullname> + <gid>108</gid> + <home>/var/lib/ntp</home> + <password_settings> + <expire></expire> + <flag></flag> + <inact></inact> + <max>99999</max> + <min>0</min> + <warn>7</warn> + </password_settings> + <shell>/bin/false</shell> + <uid>74</uid> + <user_password>*</user_password> + <username>ntp</username> + </user> + <user> + <encrypted config:type="boolean">true</encrypted> + <fullname>Unix-to-Unix CoPy system</fullname> + <gid>14</gid> + <home>/etc/uucp</home> + <password_settings> + <expire></expire> + <flag></flag> + <inact></inact> + <max></max> + <min></min> + <warn></warn> + </password_settings> + <shell>/bin/bash</shell> + <uid>10</uid> + <user_password>*</user_password> + <username>uucp</username> + </user> + <user> + <encrypted config:type="boolean">true</encrypted> + <fullname>User for D-Bus</fullname> + <gid>101</gid> + <home>/var/run/dbus</home> + <password_settings> + <expire></expire> + <flag></flag> + <inact></inact> + <max></max> + <min>0</min> + <warn>7</warn> + </password_settings> + <shell>/bin/false</shell> + <uid>100</uid> + <user_password>*</user_password> + <username>messagebus</username> + </user> + <user> + <encrypted config:type="boolean">true</encrypted> + <fullname>User for haldaemon</fullname> + <gid>102</gid> + <home>/var/run/hald</home> + <password_settings> + <expire></expire> + <flag></flag> + <inact></inact> + <max></max> + <min>0</min> + <warn>7</warn> + </password_settings> + <shell>/bin/false</shell> + <uid>101</uid> + <user_password>*</user_password> + <username>haldaemon</username> + </user> + <user> + <encrypted config:type="boolean">true</encrypted> + <fullname>WWW daemon apache</fullname> + <gid>8</gid> + <home>/var/lib/wwwrun</home> + <password_settings> + <expire></expire> + <flag></flag> + <inact></inact> + <max></max> + <min></min> + <warn></warn> + </password_settings> + <shell>/bin/false</shell> + <uid>30</uid> + <user_password>*</user_password> + <username>wwwrun</username> + </user> + <user> + <encrypted config:type="boolean">true</encrypted> + <fullname>Manual pages viewer</fullname> + <gid>62</gid> + <home>/var/cache/man</home> + <password_settings> + <expire></expire> + <flag></flag> + <inact></inact> + <max></max> + <min></min> + <warn></warn> + </password_settings> + <shell>/bin/bash</shell> + <uid>13</uid> + <user_password>*</user_password> + <username>man</username> + </user> + <user> + <encrypted config:type="boolean">true</encrypted> + <fullname>PolicyKit</fullname> + <gid>107</gid> + <home>/var/run/PolicyKit</home> + <password_settings> + <expire></expire> + <flag></flag> + <inact></inact> + <max>99999</max> + <min>0</min> + <warn>7</warn> + </password_settings> + <shell>/bin/false</shell> + <uid>104</uid> + <user_password>*</user_password> + <username>polkituser</username> + </user> + <user> + <encrypted config:type="boolean">true</encrypted> + <fullname>News system</fullname> + <gid>13</gid> + <home>/etc/news</home> + <password_settings> + <expire></expire> + <flag></flag> + <inact></inact> + <max></max> + <min></min> + <warn></warn> + </password_settings> + <shell>/bin/bash</shell> + <uid>9</uid> + <user_password>*</user_password> + <username>news</username> + </user> + <user> + <fullname>SSH daemon</fullname> + <gid>65</gid> + <home>/var/lib/sshd</home> + <shell>/bin/false</shell> + <uid>71</uid> + <username>sshd</username> + </user> + <user> + <encrypted config:type="boolean">true</encrypted> + <fullname>PulseAudio daemon</fullname> + <gid>109</gid> + <home>/var/lib/pulseaudio</home> + <password_settings> + <expire></expire> + <flag></flag> + <inact></inact> + <max>99999</max> + <min>0</min> + <warn>7</warn> + </password_settings> + <shell>/bin/false</shell> + <uid>105</uid> + <user_password>*</user_password> + <username>pulse</username> + </user> + </users> +</profile> diff --git a/templates/sles-11-sp3/scripts/cleanup.sh b/templates/sles-11-sp3/scripts/cleanup.sh new file mode 100644 index 000000000..0870a61a1 --- /dev/null +++ b/templates/sles-11-sp3/scripts/cleanup.sh @@ -0,0 +1,9 @@ +#!/bin/bash -eux + +# remove zypper locks on removed packages to avoid later dependency problems +zypper --non-interactive rl \* +# zypper --non-interactive remove `rpm -qa virtualbox-guest-*` >/dev/null 2>&1 +# Add an online copy of the SLES DVD1 as a software repository, instead of the mounted DVD +zypper removerepo 'SUSE-Linux-Enterprise-Server-11-SP3 11.3.3-1.138' +zypper addrepo 'http://demeter.uni-regensburg.de/SLES11SP3-x64/DVD1/' 'SLES11SP3-x64 DVD1 Online' +zypper refresh diff --git a/templates/sles-11-sp3/scripts/minimize.sh b/templates/sles-11-sp3/scripts/minimize.sh new file mode 100644 index 000000000..3846a1d65 --- /dev/null +++ b/templates/sles-11-sp3/scripts/minimize.sh @@ -0,0 +1,4 @@ +#!/bin/bash -eux + +dd if=/dev/zero of=/EMPTY bs=1M +rm -f /EMPTY diff --git a/templates/sles-11-sp3/scripts/sshd.sh b/templates/sles-11-sp3/scripts/sshd.sh new file mode 100644 index 000000000..c6e4f20a6 --- /dev/null +++ b/templates/sles-11-sp3/scripts/sshd.sh @@ -0,0 +1,3 @@ +#!/bin/bash -eux + +echo "UseDNS no" >> /etc/ssh/sshd_config diff --git a/templates/sles-11-sp3/scripts/sudoers.sh b/templates/sles-11-sp3/scripts/sudoers.sh new file mode 100644 index 000000000..eb80f3f88 --- /dev/null +++ b/templates/sles-11-sp3/scripts/sudoers.sh @@ -0,0 +1,3 @@ +# update sudoers - can't do this in autoinst.xml +echo -e "\nupdate sudoers ..." +echo -e "vagrant ALL=(ALL) NOPASSWD: ALL\n" >> /etc/sudoers diff --git a/templates/sles-11-sp3/scripts/vagrant.sh b/templates/sles-11-sp3/scripts/vagrant.sh new file mode 100644 index 000000000..72dd2f444 --- /dev/null +++ b/templates/sles-11-sp3/scripts/vagrant.sh @@ -0,0 +1,33 @@ +#!/bin/bash -eux + +if [ -f /home/vagrant/.vbox_version ]; then + mkdir /tmp/vbox + VER=$(cat /home/vagrant/.vbox_version) + mount -o loop VBoxGuestAdditions_$VER.iso /tmp/vbox + sh /tmp/vbox/VBoxLinuxAdditions.run + umount /tmp/vbox + rmdir /tmp/vbox + rm *.iso +fi + +if [ -f /home/vagrant/.vmfusion_version ]; then + #Set Linux-specific paths and ISO filename + home_dir="/home/vagrant" + iso_name="linux.iso" + mount_point="/tmp/vmware-tools" + #Run install, unmount ISO and remove it + mkdir ${mount_point} + cd ${home_dir} + /bin/mount -o loop ${iso_name} ${mount_point} + tar zxf ${mount_point}/*.tar.gz && cd vmware-tools-distrib && ./vmware-install.pl --default + /bin/umount ${mount_point} + /bin/rm -rf ${home_dir}/${iso_name} ${home_dir}/vmware-tools-distrib + rmdir ${mount_point} +fi + +mkdir /home/vagrant/.ssh +wget --no-check-certificate \ + 'https://github.com/mitchellh/vagrant/raw/master/keys/vagrant.pub' \ + -O /home/vagrant/.ssh/authorized_keys +chown -R vagrant /home/vagrant/.ssh +chmod -R go-rwsx /home/vagrant/.ssh diff --git a/templates/sles-11-sp3/template.json b/templates/sles-11-sp3/template.json new file mode 100644 index 000000000..ede834b1a --- /dev/null +++ b/templates/sles-11-sp3/template.json @@ -0,0 +1,97 @@ +{ + "provisioners": [ + { + "type": "shell", + "scripts": [ + "scripts/vagrant.sh", + "scripts/sshd.sh", + "scripts/sudoers.sh", + "scripts/cleanup.sh", + "scripts/minimize.sh" + ], + "override": { + "virtualbox": { + "execute_command": "echo 'vagrant'|sudo -S sh '{{.Path}}'" + }, + "vmware": { + "execute_command": "echo 'vagrant'|sudo -S sh '{{.Path}}'" + } + } + } + ], + "builders": [ + { + "type": "virtualbox", + "boot_command": [ + "<esc><enter><wait>", + "linux netdevice=eth0 netsetup=dhcp install=cd:/<wait>", + " lang=en_US autoyast=http://{{ .HTTPIP }}:{{ .HTTPPort }}/autoinst.xml<wait>", + " textmode=1<wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "guest_os_type": "OpenSUSE_64", + "http_directory": "http", + "iso_checksum": "480b70d50cbb538382dc2b9325221e1b", + "iso_checksum_type": "md5", + "iso_url": "", + "ssh_username": "vagrant", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_wait_timeout": "10000s", + "shutdown_command": "echo '/sbin/halt -h -p' > shutdown.sh; echo 'vagrant'|sudo -S sh 'shutdown.sh'", + "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "virtualbox_version_file": ".vbox_version", + "vboxmanage": [ + [ + "modifyvm", + "{{.Name}}", + "--memory", + "480" + ], + [ + "modifyvm", + "{{.Name}}", + "--cpus", + "1" + ] + ], + "iso_md5": "480b70d50cbb538382dc2b9325221e1b" + }, + { + "type": "vmware", + "boot_command": [ + "<esc><enter><wait>", + "linux netdevice=eth0 netsetup=dhcp install=cd:/<wait>", + " lang=en_US autoyast=http://{{ .HTTPIP }}:{{ .HTTPPort }}/autoinst.xml<wait>", + " textmode=1<wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "guest_os_type": "opensuse-64", + "http_directory": "http", + "iso_checksum": "480b70d50cbb538382dc2b9325221e1b", + "iso_checksum_type": "md5", + "iso_url": "", + "ssh_username": "vagrant", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_wait_timeout": "10000s", + "shutdown_command": "echo '/sbin/halt -h -p' > shutdown.sh; echo 'vagrant'|sudo -S sh 'shutdown.sh'", + "vmx_data": { + "memsize": "480", + "numvcpus": "1", + "cpuid.coresPerSocket": "1" + }, + "iso_md5": "480b70d50cbb538382dc2b9325221e1b" + } + ], + "post-provisioner": [ + { + "type": "vagrant", + "output": "sles-11-sp3-{{.Provisioner}}.box" + } + ] +} \ No newline at end of file diff --git a/templates/ubuntu-10.04-i386/http/preseed.cfg b/templates/ubuntu-10.04-i386/http/preseed.cfg new file mode 100644 index 000000000..903f2e14b --- /dev/null +++ b/templates/ubuntu-10.04-i386/http/preseed.cfg @@ -0,0 +1,31 @@ +choose-mirror-bin mirror/http/proxy string +d-i base-installer/kernel/override-image string linux-server +d-i clock-setup/utc boolean true +d-i clock-setup/utc-auto boolean true +d-i finish-install/reboot_in_progress note +d-i grub-installer/only_debian boolean true +d-i grub-installer/with_other_os boolean true +d-i partman-auto-lvm/guided_size string max +d-i partman-auto/choose_recipe select atomic +d-i partman-auto/method string lvm +d-i partman-lvm/confirm boolean true +d-i partman-lvm/confirm boolean true +d-i partman-lvm/confirm_nooverwrite boolean true +d-i partman-lvm/device_remove_lvm boolean true +d-i partman/choose_partition select finish +d-i partman/confirm boolean true +d-i partman/confirm_nooverwrite boolean true +d-i partman/confirm_write_new_label boolean true +d-i passwd/user-fullname string vagrant +d-i passwd/user-uid string 900 +d-i passwd/user-password password vagrant +d-i passwd/user-password-again password vagrant +d-i passwd/username string vagrant +d-i pkgsel/include string openssh-server cryptsetup build-essential libssl-dev libreadline-dev zlib1g-dev linux-source dkms +d-i pkgsel/install-language-support boolean false +d-i pkgsel/update-policy select unattended-upgrades +d-i pkgsel/upgrade select full-upgrade +d-i time/zone string UTC +d-i user-setup/allow-password-weak boolean true +d-i user-setup/encrypt-home boolean false +tasksel tasksel/first multiselect standard, ubuntu-server diff --git a/templates/ubuntu-10.04-i386/scripts/cleanup.sh b/templates/ubuntu-10.04-i386/scripts/cleanup.sh new file mode 100644 index 000000000..6c7f703d6 --- /dev/null +++ b/templates/ubuntu-10.04-i386/scripts/cleanup.sh @@ -0,0 +1,6 @@ +#!/bin/bash -eux + +apt-get -y autoremove +apt-get -y clean +rm -rf VBoxGuestAdditions_*.iso VBoxGuestAdditions_*.iso.? +rm -f /tmp/chef*deb diff --git a/templates/ubuntu-10.04-i386/scripts/minimize.sh b/templates/ubuntu-10.04-i386/scripts/minimize.sh new file mode 100644 index 000000000..3846a1d65 --- /dev/null +++ b/templates/ubuntu-10.04-i386/scripts/minimize.sh @@ -0,0 +1,4 @@ +#!/bin/bash -eux + +dd if=/dev/zero of=/EMPTY bs=1M +rm -f /EMPTY diff --git a/templates/ubuntu-10.04-i386/scripts/networking.sh b/templates/ubuntu-10.04-i386/scripts/networking.sh new file mode 100644 index 000000000..de3269a58 --- /dev/null +++ b/templates/ubuntu-10.04-i386/scripts/networking.sh @@ -0,0 +1,7 @@ +#!/bin/bash -eux + +rm /etc/udev/rules.d/70-persistent-net.rules +mkdir /etc/udev/rules.d/70-persistent-net.rules +rm /lib/udev/rules.d/75-persistent-net-generator.rules +rm -rf /dev/.udev/ /var/lib/dhcp3/* +echo "pre-up sleep 2" >> /etc/network/interfaces diff --git a/templates/ubuntu-10.04-i386/scripts/sshd.sh b/templates/ubuntu-10.04-i386/scripts/sshd.sh new file mode 100644 index 000000000..c6e4f20a6 --- /dev/null +++ b/templates/ubuntu-10.04-i386/scripts/sshd.sh @@ -0,0 +1,3 @@ +#!/bin/bash -eux + +echo "UseDNS no" >> /etc/ssh/sshd_config diff --git a/templates/ubuntu-10.04-i386/scripts/sudoers.sh b/templates/ubuntu-10.04-i386/scripts/sudoers.sh new file mode 100644 index 000000000..ce45b7611 --- /dev/null +++ b/templates/ubuntu-10.04-i386/scripts/sudoers.sh @@ -0,0 +1,4 @@ +#!/bin/bash -eux + +sed -i -e '/Defaults\s\+env_reset/a Defaults\texempt_group=admin' /etc/sudoers +sed -i -e 's/%admin ALL=(ALL) ALL/%admin ALL=NOPASSWD:ALL/g' /etc/sudoers diff --git a/templates/ubuntu-10.04-i386/scripts/update.sh b/templates/ubuntu-10.04-i386/scripts/update.sh new file mode 100644 index 000000000..80e8dd3f9 --- /dev/null +++ b/templates/ubuntu-10.04-i386/scripts/update.sh @@ -0,0 +1,15 @@ +#!/bin/bash -eux + +apt-get update +apt-get -y upgrade + +# ensure the correct kernel headers are installed +apt-get -y install linux-headers-$(uname -r) + +# update package index on boot +cat <<EOF > /etc/init/refresh-apt.conf +description "update package index" +start on networking +task +exec /usr/bin/apt-get update +EOF diff --git a/templates/ubuntu-10.04-i386/scripts/vagrant.sh b/templates/ubuntu-10.04-i386/scripts/vagrant.sh new file mode 100644 index 000000000..72dd2f444 --- /dev/null +++ b/templates/ubuntu-10.04-i386/scripts/vagrant.sh @@ -0,0 +1,33 @@ +#!/bin/bash -eux + +if [ -f /home/vagrant/.vbox_version ]; then + mkdir /tmp/vbox + VER=$(cat /home/vagrant/.vbox_version) + mount -o loop VBoxGuestAdditions_$VER.iso /tmp/vbox + sh /tmp/vbox/VBoxLinuxAdditions.run + umount /tmp/vbox + rmdir /tmp/vbox + rm *.iso +fi + +if [ -f /home/vagrant/.vmfusion_version ]; then + #Set Linux-specific paths and ISO filename + home_dir="/home/vagrant" + iso_name="linux.iso" + mount_point="/tmp/vmware-tools" + #Run install, unmount ISO and remove it + mkdir ${mount_point} + cd ${home_dir} + /bin/mount -o loop ${iso_name} ${mount_point} + tar zxf ${mount_point}/*.tar.gz && cd vmware-tools-distrib && ./vmware-install.pl --default + /bin/umount ${mount_point} + /bin/rm -rf ${home_dir}/${iso_name} ${home_dir}/vmware-tools-distrib + rmdir ${mount_point} +fi + +mkdir /home/vagrant/.ssh +wget --no-check-certificate \ + 'https://github.com/mitchellh/vagrant/raw/master/keys/vagrant.pub' \ + -O /home/vagrant/.ssh/authorized_keys +chown -R vagrant /home/vagrant/.ssh +chmod -R go-rwsx /home/vagrant/.ssh diff --git a/templates/ubuntu-10.04-i386/template.json b/templates/ubuntu-10.04-i386/template.json new file mode 100644 index 000000000..d43c889e8 --- /dev/null +++ b/templates/ubuntu-10.04-i386/template.json @@ -0,0 +1,133 @@ +{ + "provisioners": [ + { + "type": "shell", + "scripts": [ + "scripts/update.sh", + "scripts/vagrant.sh", + "scripts/sshd.sh", + "scripts/networking.sh", + "scripts/sudoers.sh", + "scripts/cleanup.sh", + "scripts/minimize.sh" + ], + "override": { + "virtualbox": { + "execute_command": "echo 'vagrant'|sudo -S sh '{{.Path}}'" + }, + "vmware": { + "execute_command": "echo 'vagrant'|sudo -S sh '{{.Path}}'" + } + } + } + ], + "builders": [ + { + "type": "virtualbox", + "boot_command": [ + "<esc><wait>", + "<esc><wait>", + "<enter><wait>", + "/install/vmlinuz<wait>", + " auto<wait>", + " console-setup/ask_detect=false<wait>", + " console-setup/layoutcode=us<wait>", + " console-setup/modelcode=pc105<wait>", + " debconf/frontend=noninteractive<wait>", + " debian-installer=en_US<wait>", + " fb=false<wait>", + " initrd=/install/initrd.gz<wait>", + " kbd-chooser/method=us<wait>", + " keyboard-configuration/layout=USA<wait>", + " keyboard-configuration/variant=USA<wait>", + " locale=en_US<wait>", + " netcfg/get_domain=vm<wait>", + " netcfg/get_hostname=vagrant<wait>", + " noapic<wait>", + " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/preseed.cfg<wait>", + " -- <wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "guest_os_type": "Ubuntu", + "http_directory": "http", + "iso_checksum": "fc08a01e78348e3918180ea91a6883bb", + "iso_checksum_type": "md5", + "iso_url": "http://releases.ubuntu.com/10.04.4/ubuntu-10.04.4-server-i386.iso", + "ssh_username": "vagrant", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_wait_timeout": "10000s", + "shutdown_command": "echo 'shutdown -P now' > shutdown.sh; echo 'vagrant'|sudo -S sh 'shutdown.sh'", + "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "virtualbox_version_file": ".vbox_version", + "vboxmanage": [ + [ + "modifyvm", + "{{.Name}}", + "--memory", + "384" + ], + [ + "modifyvm", + "{{.Name}}", + "--cpus", + "1" + ] + ], + "iso_md5": "fc08a01e78348e3918180ea91a6883bb" + }, + { + "type": "vmware", + "boot_command": [ + "<esc><wait>", + "<esc><wait>", + "<enter><wait>", + "/install/vmlinuz<wait>", + " auto<wait>", + " console-setup/ask_detect=false<wait>", + " console-setup/layoutcode=us<wait>", + " console-setup/modelcode=pc105<wait>", + " debconf/frontend=noninteractive<wait>", + " debian-installer=en_US<wait>", + " fb=false<wait>", + " initrd=/install/initrd.gz<wait>", + " kbd-chooser/method=us<wait>", + " keyboard-configuration/layout=USA<wait>", + " keyboard-configuration/variant=USA<wait>", + " locale=en_US<wait>", + " netcfg/get_domain=vm<wait>", + " netcfg/get_hostname=vagrant<wait>", + " noapic<wait>", + " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/preseed.cfg<wait>", + " -- <wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "guest_os_type": "ubuntu", + "http_directory": "http", + "iso_checksum": "fc08a01e78348e3918180ea91a6883bb", + "iso_checksum_type": "md5", + "iso_url": "http://releases.ubuntu.com/10.04.4/ubuntu-10.04.4-server-i386.iso", + "ssh_username": "vagrant", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_wait_timeout": "10000s", + "shutdown_command": "echo 'shutdown -P now' > shutdown.sh; echo 'vagrant'|sudo -S sh 'shutdown.sh'", + "vmx_data": { + "memsize": "384", + "numvcpus": "1", + "cpuid.coresPerSocket": "1" + }, + "iso_md5": "fc08a01e78348e3918180ea91a6883bb" + } + ], + "post-provisioner": [ + { + "type": "vagrant", + "output": "ubuntu-10.04-i386-{{.Provisioner}}.box" + } + ] +} \ No newline at end of file diff --git a/templates/ubuntu-10.04/http/preseed.cfg b/templates/ubuntu-10.04/http/preseed.cfg new file mode 100644 index 000000000..903f2e14b --- /dev/null +++ b/templates/ubuntu-10.04/http/preseed.cfg @@ -0,0 +1,31 @@ +choose-mirror-bin mirror/http/proxy string +d-i base-installer/kernel/override-image string linux-server +d-i clock-setup/utc boolean true +d-i clock-setup/utc-auto boolean true +d-i finish-install/reboot_in_progress note +d-i grub-installer/only_debian boolean true +d-i grub-installer/with_other_os boolean true +d-i partman-auto-lvm/guided_size string max +d-i partman-auto/choose_recipe select atomic +d-i partman-auto/method string lvm +d-i partman-lvm/confirm boolean true +d-i partman-lvm/confirm boolean true +d-i partman-lvm/confirm_nooverwrite boolean true +d-i partman-lvm/device_remove_lvm boolean true +d-i partman/choose_partition select finish +d-i partman/confirm boolean true +d-i partman/confirm_nooverwrite boolean true +d-i partman/confirm_write_new_label boolean true +d-i passwd/user-fullname string vagrant +d-i passwd/user-uid string 900 +d-i passwd/user-password password vagrant +d-i passwd/user-password-again password vagrant +d-i passwd/username string vagrant +d-i pkgsel/include string openssh-server cryptsetup build-essential libssl-dev libreadline-dev zlib1g-dev linux-source dkms +d-i pkgsel/install-language-support boolean false +d-i pkgsel/update-policy select unattended-upgrades +d-i pkgsel/upgrade select full-upgrade +d-i time/zone string UTC +d-i user-setup/allow-password-weak boolean true +d-i user-setup/encrypt-home boolean false +tasksel tasksel/first multiselect standard, ubuntu-server diff --git a/templates/ubuntu-10.04/scripts/cleanup.sh b/templates/ubuntu-10.04/scripts/cleanup.sh new file mode 100644 index 000000000..6c7f703d6 --- /dev/null +++ b/templates/ubuntu-10.04/scripts/cleanup.sh @@ -0,0 +1,6 @@ +#!/bin/bash -eux + +apt-get -y autoremove +apt-get -y clean +rm -rf VBoxGuestAdditions_*.iso VBoxGuestAdditions_*.iso.? +rm -f /tmp/chef*deb diff --git a/templates/ubuntu-10.04/scripts/minimize.sh b/templates/ubuntu-10.04/scripts/minimize.sh new file mode 100644 index 000000000..3846a1d65 --- /dev/null +++ b/templates/ubuntu-10.04/scripts/minimize.sh @@ -0,0 +1,4 @@ +#!/bin/bash -eux + +dd if=/dev/zero of=/EMPTY bs=1M +rm -f /EMPTY diff --git a/templates/ubuntu-10.04/scripts/networking.sh b/templates/ubuntu-10.04/scripts/networking.sh new file mode 100644 index 000000000..de3269a58 --- /dev/null +++ b/templates/ubuntu-10.04/scripts/networking.sh @@ -0,0 +1,7 @@ +#!/bin/bash -eux + +rm /etc/udev/rules.d/70-persistent-net.rules +mkdir /etc/udev/rules.d/70-persistent-net.rules +rm /lib/udev/rules.d/75-persistent-net-generator.rules +rm -rf /dev/.udev/ /var/lib/dhcp3/* +echo "pre-up sleep 2" >> /etc/network/interfaces diff --git a/templates/ubuntu-10.04/scripts/sshd.sh b/templates/ubuntu-10.04/scripts/sshd.sh new file mode 100644 index 000000000..c6e4f20a6 --- /dev/null +++ b/templates/ubuntu-10.04/scripts/sshd.sh @@ -0,0 +1,3 @@ +#!/bin/bash -eux + +echo "UseDNS no" >> /etc/ssh/sshd_config diff --git a/templates/ubuntu-10.04/scripts/sudoers.sh b/templates/ubuntu-10.04/scripts/sudoers.sh new file mode 100644 index 000000000..ce45b7611 --- /dev/null +++ b/templates/ubuntu-10.04/scripts/sudoers.sh @@ -0,0 +1,4 @@ +#!/bin/bash -eux + +sed -i -e '/Defaults\s\+env_reset/a Defaults\texempt_group=admin' /etc/sudoers +sed -i -e 's/%admin ALL=(ALL) ALL/%admin ALL=NOPASSWD:ALL/g' /etc/sudoers diff --git a/templates/ubuntu-10.04/scripts/update.sh b/templates/ubuntu-10.04/scripts/update.sh new file mode 100644 index 000000000..80e8dd3f9 --- /dev/null +++ b/templates/ubuntu-10.04/scripts/update.sh @@ -0,0 +1,15 @@ +#!/bin/bash -eux + +apt-get update +apt-get -y upgrade + +# ensure the correct kernel headers are installed +apt-get -y install linux-headers-$(uname -r) + +# update package index on boot +cat <<EOF > /etc/init/refresh-apt.conf +description "update package index" +start on networking +task +exec /usr/bin/apt-get update +EOF diff --git a/templates/ubuntu-10.04/scripts/vagrant.sh b/templates/ubuntu-10.04/scripts/vagrant.sh new file mode 100644 index 000000000..72dd2f444 --- /dev/null +++ b/templates/ubuntu-10.04/scripts/vagrant.sh @@ -0,0 +1,33 @@ +#!/bin/bash -eux + +if [ -f /home/vagrant/.vbox_version ]; then + mkdir /tmp/vbox + VER=$(cat /home/vagrant/.vbox_version) + mount -o loop VBoxGuestAdditions_$VER.iso /tmp/vbox + sh /tmp/vbox/VBoxLinuxAdditions.run + umount /tmp/vbox + rmdir /tmp/vbox + rm *.iso +fi + +if [ -f /home/vagrant/.vmfusion_version ]; then + #Set Linux-specific paths and ISO filename + home_dir="/home/vagrant" + iso_name="linux.iso" + mount_point="/tmp/vmware-tools" + #Run install, unmount ISO and remove it + mkdir ${mount_point} + cd ${home_dir} + /bin/mount -o loop ${iso_name} ${mount_point} + tar zxf ${mount_point}/*.tar.gz && cd vmware-tools-distrib && ./vmware-install.pl --default + /bin/umount ${mount_point} + /bin/rm -rf ${home_dir}/${iso_name} ${home_dir}/vmware-tools-distrib + rmdir ${mount_point} +fi + +mkdir /home/vagrant/.ssh +wget --no-check-certificate \ + 'https://github.com/mitchellh/vagrant/raw/master/keys/vagrant.pub' \ + -O /home/vagrant/.ssh/authorized_keys +chown -R vagrant /home/vagrant/.ssh +chmod -R go-rwsx /home/vagrant/.ssh diff --git a/templates/ubuntu-10.04/template.json b/templates/ubuntu-10.04/template.json new file mode 100644 index 000000000..ba4203c41 --- /dev/null +++ b/templates/ubuntu-10.04/template.json @@ -0,0 +1,194 @@ +{ + "provisioners": [ + { + "type": "shell", + "scripts": [ + "scripts/update.sh", + "scripts/vagrant.sh", + "scripts/sshd.sh", + "scripts/networking.sh", + "scripts/sudoers.sh", + "scripts/cleanup.sh", + "scripts/minimize.sh" + ], + "override": { + "virtualbox-with-chef": { + "execute_command": "echo 'vagrant'|sudo -S sh '{{.Path}}'; curl https://opscode.com/chef/install.sh | sudo bash" + + }, + "virtualbox": { + "execute_command": "echo 'vagrant'|sudo -S sh '{{.Path}}'" + }, + "vmware": { + "execute_command": "echo 'vagrant'|sudo -S sh '{{.Path}}'" + } + } + } + ], + "builders": [ + { + "name": "virtualbox-with-chef", + "type": "virtualbox", + "boot_command": [ + "<esc><wait>", + "<esc><wait>", + "<enter><wait>", + "/install/vmlinuz<wait>", + " auto<wait>", + " console-setup/ask_detect=false<wait>", + " console-setup/layoutcode=us<wait>", + " console-setup/modelcode=pc105<wait>", + " debconf/frontend=noninteractive<wait>", + " debian-installer=en_US<wait>", + " fb=false<wait>", + " initrd=/install/initrd.gz<wait>", + " kbd-chooser/method=us<wait>", + " keyboard-configuration/layout=USA<wait>", + " keyboard-configuration/variant=USA<wait>", + " locale=en_US<wait>", + " netcfg/get_domain=vm<wait>", + " netcfg/get_hostname=vagrant<wait>", + " noapic<wait>", + " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/preseed.cfg<wait>", + " -- <wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "guest_os_type": "Ubuntu_64", + "http_directory": "http", + "iso_checksum": "9b218654cdcdf9722171648c52f8a088", + "iso_checksum_type": "md5", + "iso_url": "http://releases.ubuntu.com/10.04.4/ubuntu-10.04.4-server-amd64.iso", + "ssh_username": "vagrant", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_wait_timeout": "10000s", + "shutdown_command": "echo 'shutdown -P now' > shutdown.sh; echo 'vagrant'|sudo -S sh 'shutdown.sh'", + "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "virtualbox_version_file": ".vbox_version", + "vboxmanage": [ + [ + "modifyvm", + "{{.Name}}", + "--memory", + "384" + ], + [ + "modifyvm", + "{{.Name}}", + "--cpus", + "1" + ] + ], + "iso_md5": "9b218654cdcdf9722171648c52f8a088" + }, + { + "type": "virtualbox", + "boot_command": [ + "<esc><wait>", + "<esc><wait>", + "<enter><wait>", + "/install/vmlinuz<wait>", + " auto<wait>", + " console-setup/ask_detect=false<wait>", + " console-setup/layoutcode=us<wait>", + " console-setup/modelcode=pc105<wait>", + " debconf/frontend=noninteractive<wait>", + " debian-installer=en_US<wait>", + " fb=false<wait>", + " initrd=/install/initrd.gz<wait>", + " kbd-chooser/method=us<wait>", + " keyboard-configuration/layout=USA<wait>", + " keyboard-configuration/variant=USA<wait>", + " locale=en_US<wait>", + " netcfg/get_domain=vm<wait>", + " netcfg/get_hostname=vagrant<wait>", + " noapic<wait>", + " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/preseed.cfg<wait>", + " -- <wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "guest_os_type": "Ubuntu_64", + "http_directory": "http", + "iso_checksum": "9b218654cdcdf9722171648c52f8a088", + "iso_checksum_type": "md5", + "iso_url": "http://releases.ubuntu.com/10.04.4/ubuntu-10.04.4-server-amd64.iso", + "ssh_username": "vagrant", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_wait_timeout": "10000s", + "shutdown_command": "echo 'shutdown -P now' > shutdown.sh; echo 'vagrant'|sudo -S sh 'shutdown.sh'", + "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "virtualbox_version_file": ".vbox_version", + "vboxmanage": [ + [ + "modifyvm", + "{{.Name}}", + "--memory", + "384" + ], + [ + "modifyvm", + "{{.Name}}", + "--cpus", + "1" + ] + ], + "iso_md5": "9b218654cdcdf9722171648c52f8a088" + }, + { + "type": "vmware", + "boot_command": [ + "<esc><wait>", + "<esc><wait>", + "<enter><wait>", + "/install/vmlinuz<wait>", + " auto<wait>", + " console-setup/ask_detect=false<wait>", + " console-setup/layoutcode=us<wait>", + " console-setup/modelcode=pc105<wait>", + " debconf/frontend=noninteractive<wait>", + " debian-installer=en_US<wait>", + " fb=false<wait>", + " initrd=/install/initrd.gz<wait>", + " kbd-chooser/method=us<wait>", + " keyboard-configuration/layout=USA<wait>", + " keyboard-configuration/variant=USA<wait>", + " locale=en_US<wait>", + " netcfg/get_domain=vm<wait>", + " netcfg/get_hostname=vagrant<wait>", + " noapic<wait>", + " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/preseed.cfg<wait>", + " -- <wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "guest_os_type": "ubuntu-64", + "http_directory": "http", + "iso_checksum": "9b218654cdcdf9722171648c52f8a088", + "iso_checksum_type": "md5", + "iso_url": "http://releases.ubuntu.com/10.04.4/ubuntu-10.04.4-server-amd64.iso", + "ssh_username": "vagrant", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_wait_timeout": "10000s", + "shutdown_command": "echo 'shutdown -P now' > shutdown.sh; echo 'vagrant'|sudo -S sh 'shutdown.sh'", + "vmx_data": { + "memsize": "384", + "numvcpus": "1", + "cpuid.coresPerSocket": "1" + }, + "iso_md5": "9b218654cdcdf9722171648c52f8a088" + } + ], + "post-provisioner": [ + { + "type": "vagrant", + "output": "ubuntu-10.04-{{.Provisioner}}.box" + } + ] +} diff --git a/templates/ubuntu-10.10/http/preseed.cfg b/templates/ubuntu-10.10/http/preseed.cfg new file mode 100644 index 000000000..903f2e14b --- /dev/null +++ b/templates/ubuntu-10.10/http/preseed.cfg @@ -0,0 +1,31 @@ +choose-mirror-bin mirror/http/proxy string +d-i base-installer/kernel/override-image string linux-server +d-i clock-setup/utc boolean true +d-i clock-setup/utc-auto boolean true +d-i finish-install/reboot_in_progress note +d-i grub-installer/only_debian boolean true +d-i grub-installer/with_other_os boolean true +d-i partman-auto-lvm/guided_size string max +d-i partman-auto/choose_recipe select atomic +d-i partman-auto/method string lvm +d-i partman-lvm/confirm boolean true +d-i partman-lvm/confirm boolean true +d-i partman-lvm/confirm_nooverwrite boolean true +d-i partman-lvm/device_remove_lvm boolean true +d-i partman/choose_partition select finish +d-i partman/confirm boolean true +d-i partman/confirm_nooverwrite boolean true +d-i partman/confirm_write_new_label boolean true +d-i passwd/user-fullname string vagrant +d-i passwd/user-uid string 900 +d-i passwd/user-password password vagrant +d-i passwd/user-password-again password vagrant +d-i passwd/username string vagrant +d-i pkgsel/include string openssh-server cryptsetup build-essential libssl-dev libreadline-dev zlib1g-dev linux-source dkms +d-i pkgsel/install-language-support boolean false +d-i pkgsel/update-policy select unattended-upgrades +d-i pkgsel/upgrade select full-upgrade +d-i time/zone string UTC +d-i user-setup/allow-password-weak boolean true +d-i user-setup/encrypt-home boolean false +tasksel tasksel/first multiselect standard, ubuntu-server diff --git a/templates/ubuntu-10.10/scripts/cleanup.sh b/templates/ubuntu-10.10/scripts/cleanup.sh new file mode 100644 index 000000000..6c7f703d6 --- /dev/null +++ b/templates/ubuntu-10.10/scripts/cleanup.sh @@ -0,0 +1,6 @@ +#!/bin/bash -eux + +apt-get -y autoremove +apt-get -y clean +rm -rf VBoxGuestAdditions_*.iso VBoxGuestAdditions_*.iso.? +rm -f /tmp/chef*deb diff --git a/templates/ubuntu-10.10/scripts/minimize.sh b/templates/ubuntu-10.10/scripts/minimize.sh new file mode 100644 index 000000000..3846a1d65 --- /dev/null +++ b/templates/ubuntu-10.10/scripts/minimize.sh @@ -0,0 +1,4 @@ +#!/bin/bash -eux + +dd if=/dev/zero of=/EMPTY bs=1M +rm -f /EMPTY diff --git a/templates/ubuntu-10.10/scripts/networking.sh b/templates/ubuntu-10.10/scripts/networking.sh new file mode 100644 index 000000000..de3269a58 --- /dev/null +++ b/templates/ubuntu-10.10/scripts/networking.sh @@ -0,0 +1,7 @@ +#!/bin/bash -eux + +rm /etc/udev/rules.d/70-persistent-net.rules +mkdir /etc/udev/rules.d/70-persistent-net.rules +rm /lib/udev/rules.d/75-persistent-net-generator.rules +rm -rf /dev/.udev/ /var/lib/dhcp3/* +echo "pre-up sleep 2" >> /etc/network/interfaces diff --git a/templates/ubuntu-10.10/scripts/sshd.sh b/templates/ubuntu-10.10/scripts/sshd.sh new file mode 100644 index 000000000..c6e4f20a6 --- /dev/null +++ b/templates/ubuntu-10.10/scripts/sshd.sh @@ -0,0 +1,3 @@ +#!/bin/bash -eux + +echo "UseDNS no" >> /etc/ssh/sshd_config diff --git a/templates/ubuntu-10.10/scripts/sudoers.sh b/templates/ubuntu-10.10/scripts/sudoers.sh new file mode 100644 index 000000000..ce45b7611 --- /dev/null +++ b/templates/ubuntu-10.10/scripts/sudoers.sh @@ -0,0 +1,4 @@ +#!/bin/bash -eux + +sed -i -e '/Defaults\s\+env_reset/a Defaults\texempt_group=admin' /etc/sudoers +sed -i -e 's/%admin ALL=(ALL) ALL/%admin ALL=NOPASSWD:ALL/g' /etc/sudoers diff --git a/templates/ubuntu-10.10/scripts/update.sh b/templates/ubuntu-10.10/scripts/update.sh new file mode 100644 index 000000000..80e8dd3f9 --- /dev/null +++ b/templates/ubuntu-10.10/scripts/update.sh @@ -0,0 +1,15 @@ +#!/bin/bash -eux + +apt-get update +apt-get -y upgrade + +# ensure the correct kernel headers are installed +apt-get -y install linux-headers-$(uname -r) + +# update package index on boot +cat <<EOF > /etc/init/refresh-apt.conf +description "update package index" +start on networking +task +exec /usr/bin/apt-get update +EOF diff --git a/templates/ubuntu-10.10/scripts/vagrant.sh b/templates/ubuntu-10.10/scripts/vagrant.sh new file mode 100644 index 000000000..72dd2f444 --- /dev/null +++ b/templates/ubuntu-10.10/scripts/vagrant.sh @@ -0,0 +1,33 @@ +#!/bin/bash -eux + +if [ -f /home/vagrant/.vbox_version ]; then + mkdir /tmp/vbox + VER=$(cat /home/vagrant/.vbox_version) + mount -o loop VBoxGuestAdditions_$VER.iso /tmp/vbox + sh /tmp/vbox/VBoxLinuxAdditions.run + umount /tmp/vbox + rmdir /tmp/vbox + rm *.iso +fi + +if [ -f /home/vagrant/.vmfusion_version ]; then + #Set Linux-specific paths and ISO filename + home_dir="/home/vagrant" + iso_name="linux.iso" + mount_point="/tmp/vmware-tools" + #Run install, unmount ISO and remove it + mkdir ${mount_point} + cd ${home_dir} + /bin/mount -o loop ${iso_name} ${mount_point} + tar zxf ${mount_point}/*.tar.gz && cd vmware-tools-distrib && ./vmware-install.pl --default + /bin/umount ${mount_point} + /bin/rm -rf ${home_dir}/${iso_name} ${home_dir}/vmware-tools-distrib + rmdir ${mount_point} +fi + +mkdir /home/vagrant/.ssh +wget --no-check-certificate \ + 'https://github.com/mitchellh/vagrant/raw/master/keys/vagrant.pub' \ + -O /home/vagrant/.ssh/authorized_keys +chown -R vagrant /home/vagrant/.ssh +chmod -R go-rwsx /home/vagrant/.ssh diff --git a/templates/ubuntu-10.10/template.json b/templates/ubuntu-10.10/template.json new file mode 100644 index 000000000..716827697 --- /dev/null +++ b/templates/ubuntu-10.10/template.json @@ -0,0 +1,133 @@ +{ + "provisioners": [ + { + "type": "shell", + "scripts": [ + "scripts/update.sh", + "scripts/vagrant.sh", + "scripts/sshd.sh", + "scripts/networking.sh", + "scripts/sudoers.sh", + "scripts/cleanup.sh", + "scripts/minimize.sh" + ], + "override": { + "virtualbox": { + "execute_command": "echo 'vagrant'|sudo -S sh '{{.Path}}'" + }, + "vmware": { + "execute_command": "echo 'vagrant'|sudo -S sh '{{.Path}}'" + } + } + } + ], + "builders": [ + { + "type": "virtualbox", + "boot_command": [ + "<esc><wait>", + "<esc><wait>", + "<enter><wait>", + "/install/vmlinuz<wait>", + " auto<wait>", + " console-setup/ask_detect=false<wait>", + " console-setup/layoutcode=us<wait>", + " console-setup/modelcode=pc105<wait>", + " debconf/frontend=noninteractive<wait>", + " debian-installer=en_US<wait>", + " fb=false<wait>", + " initrd=/install/initrd.gz<wait>", + " kbd-chooser/method=us<wait>", + " keyboard-configuration/layout=USA<wait>", + " keyboard-configuration/variant=USA<wait>", + " locale=en_US<wait>", + " netcfg/get_domain=vm<wait>", + " netcfg/get_hostname=vagrant<wait>", + " noapic<wait>", + " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/preseed.cfg<wait>", + " -- <wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "guest_os_type": "Ubuntu_64", + "http_directory": "http", + "iso_checksum": "ab66a1d59a8d78e9ea8ef9b021d6574a", + "iso_checksum_type": "md5", + "iso_url": "http://releases.ubuntu.com/10.10/ubuntu-10.10-server-amd64.iso", + "ssh_username": "vagrant", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_wait_timeout": "10000s", + "shutdown_command": "echo 'shutdown -P now' > shutdown.sh; echo 'vagrant'|sudo -S sh 'shutdown.sh'", + "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "virtualbox_version_file": ".vbox_version", + "vboxmanage": [ + [ + "modifyvm", + "{{.Name}}", + "--memory", + "384" + ], + [ + "modifyvm", + "{{.Name}}", + "--cpus", + "1" + ] + ], + "iso_md5": "ab66a1d59a8d78e9ea8ef9b021d6574a" + }, + { + "type": "vmware", + "boot_command": [ + "<esc><wait>", + "<esc><wait>", + "<enter><wait>", + "/install/vmlinuz<wait>", + " auto<wait>", + " console-setup/ask_detect=false<wait>", + " console-setup/layoutcode=us<wait>", + " console-setup/modelcode=pc105<wait>", + " debconf/frontend=noninteractive<wait>", + " debian-installer=en_US<wait>", + " fb=false<wait>", + " initrd=/install/initrd.gz<wait>", + " kbd-chooser/method=us<wait>", + " keyboard-configuration/layout=USA<wait>", + " keyboard-configuration/variant=USA<wait>", + " locale=en_US<wait>", + " netcfg/get_domain=vm<wait>", + " netcfg/get_hostname=vagrant<wait>", + " noapic<wait>", + " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/preseed.cfg<wait>", + " -- <wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "guest_os_type": "ubuntu-64", + "http_directory": "http", + "iso_checksum": "ab66a1d59a8d78e9ea8ef9b021d6574a", + "iso_checksum_type": "md5", + "iso_url": "http://releases.ubuntu.com/10.10/ubuntu-10.10-server-amd64.iso", + "ssh_username": "vagrant", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_wait_timeout": "10000s", + "shutdown_command": "echo 'shutdown -P now' > shutdown.sh; echo 'vagrant'|sudo -S sh 'shutdown.sh'", + "vmx_data": { + "memsize": "384", + "numvcpus": "1", + "cpuid.coresPerSocket": "1" + }, + "iso_md5": "ab66a1d59a8d78e9ea8ef9b021d6574a" + } + ], + "post-provisioner": [ + { + "type": "vagrant", + "output": "ubuntu-10.10-{{.Provisioner}}.box" + } + ] +} \ No newline at end of file diff --git a/templates/ubuntu-11.04/http/preseed.cfg b/templates/ubuntu-11.04/http/preseed.cfg new file mode 100644 index 000000000..903f2e14b --- /dev/null +++ b/templates/ubuntu-11.04/http/preseed.cfg @@ -0,0 +1,31 @@ +choose-mirror-bin mirror/http/proxy string +d-i base-installer/kernel/override-image string linux-server +d-i clock-setup/utc boolean true +d-i clock-setup/utc-auto boolean true +d-i finish-install/reboot_in_progress note +d-i grub-installer/only_debian boolean true +d-i grub-installer/with_other_os boolean true +d-i partman-auto-lvm/guided_size string max +d-i partman-auto/choose_recipe select atomic +d-i partman-auto/method string lvm +d-i partman-lvm/confirm boolean true +d-i partman-lvm/confirm boolean true +d-i partman-lvm/confirm_nooverwrite boolean true +d-i partman-lvm/device_remove_lvm boolean true +d-i partman/choose_partition select finish +d-i partman/confirm boolean true +d-i partman/confirm_nooverwrite boolean true +d-i partman/confirm_write_new_label boolean true +d-i passwd/user-fullname string vagrant +d-i passwd/user-uid string 900 +d-i passwd/user-password password vagrant +d-i passwd/user-password-again password vagrant +d-i passwd/username string vagrant +d-i pkgsel/include string openssh-server cryptsetup build-essential libssl-dev libreadline-dev zlib1g-dev linux-source dkms +d-i pkgsel/install-language-support boolean false +d-i pkgsel/update-policy select unattended-upgrades +d-i pkgsel/upgrade select full-upgrade +d-i time/zone string UTC +d-i user-setup/allow-password-weak boolean true +d-i user-setup/encrypt-home boolean false +tasksel tasksel/first multiselect standard, ubuntu-server diff --git a/templates/ubuntu-11.04/scripts/cleanup.sh b/templates/ubuntu-11.04/scripts/cleanup.sh new file mode 100644 index 000000000..6c7f703d6 --- /dev/null +++ b/templates/ubuntu-11.04/scripts/cleanup.sh @@ -0,0 +1,6 @@ +#!/bin/bash -eux + +apt-get -y autoremove +apt-get -y clean +rm -rf VBoxGuestAdditions_*.iso VBoxGuestAdditions_*.iso.? +rm -f /tmp/chef*deb diff --git a/templates/ubuntu-11.04/scripts/minimize.sh b/templates/ubuntu-11.04/scripts/minimize.sh new file mode 100644 index 000000000..3846a1d65 --- /dev/null +++ b/templates/ubuntu-11.04/scripts/minimize.sh @@ -0,0 +1,4 @@ +#!/bin/bash -eux + +dd if=/dev/zero of=/EMPTY bs=1M +rm -f /EMPTY diff --git a/templates/ubuntu-11.04/scripts/networking.sh b/templates/ubuntu-11.04/scripts/networking.sh new file mode 100644 index 000000000..de3269a58 --- /dev/null +++ b/templates/ubuntu-11.04/scripts/networking.sh @@ -0,0 +1,7 @@ +#!/bin/bash -eux + +rm /etc/udev/rules.d/70-persistent-net.rules +mkdir /etc/udev/rules.d/70-persistent-net.rules +rm /lib/udev/rules.d/75-persistent-net-generator.rules +rm -rf /dev/.udev/ /var/lib/dhcp3/* +echo "pre-up sleep 2" >> /etc/network/interfaces diff --git a/templates/ubuntu-11.04/scripts/sshd.sh b/templates/ubuntu-11.04/scripts/sshd.sh new file mode 100644 index 000000000..c6e4f20a6 --- /dev/null +++ b/templates/ubuntu-11.04/scripts/sshd.sh @@ -0,0 +1,3 @@ +#!/bin/bash -eux + +echo "UseDNS no" >> /etc/ssh/sshd_config diff --git a/templates/ubuntu-11.04/scripts/sudoers.sh b/templates/ubuntu-11.04/scripts/sudoers.sh new file mode 100644 index 000000000..ce45b7611 --- /dev/null +++ b/templates/ubuntu-11.04/scripts/sudoers.sh @@ -0,0 +1,4 @@ +#!/bin/bash -eux + +sed -i -e '/Defaults\s\+env_reset/a Defaults\texempt_group=admin' /etc/sudoers +sed -i -e 's/%admin ALL=(ALL) ALL/%admin ALL=NOPASSWD:ALL/g' /etc/sudoers diff --git a/templates/ubuntu-11.04/scripts/update.sh b/templates/ubuntu-11.04/scripts/update.sh new file mode 100644 index 000000000..80e8dd3f9 --- /dev/null +++ b/templates/ubuntu-11.04/scripts/update.sh @@ -0,0 +1,15 @@ +#!/bin/bash -eux + +apt-get update +apt-get -y upgrade + +# ensure the correct kernel headers are installed +apt-get -y install linux-headers-$(uname -r) + +# update package index on boot +cat <<EOF > /etc/init/refresh-apt.conf +description "update package index" +start on networking +task +exec /usr/bin/apt-get update +EOF diff --git a/templates/ubuntu-11.04/scripts/vagrant.sh b/templates/ubuntu-11.04/scripts/vagrant.sh new file mode 100644 index 000000000..72dd2f444 --- /dev/null +++ b/templates/ubuntu-11.04/scripts/vagrant.sh @@ -0,0 +1,33 @@ +#!/bin/bash -eux + +if [ -f /home/vagrant/.vbox_version ]; then + mkdir /tmp/vbox + VER=$(cat /home/vagrant/.vbox_version) + mount -o loop VBoxGuestAdditions_$VER.iso /tmp/vbox + sh /tmp/vbox/VBoxLinuxAdditions.run + umount /tmp/vbox + rmdir /tmp/vbox + rm *.iso +fi + +if [ -f /home/vagrant/.vmfusion_version ]; then + #Set Linux-specific paths and ISO filename + home_dir="/home/vagrant" + iso_name="linux.iso" + mount_point="/tmp/vmware-tools" + #Run install, unmount ISO and remove it + mkdir ${mount_point} + cd ${home_dir} + /bin/mount -o loop ${iso_name} ${mount_point} + tar zxf ${mount_point}/*.tar.gz && cd vmware-tools-distrib && ./vmware-install.pl --default + /bin/umount ${mount_point} + /bin/rm -rf ${home_dir}/${iso_name} ${home_dir}/vmware-tools-distrib + rmdir ${mount_point} +fi + +mkdir /home/vagrant/.ssh +wget --no-check-certificate \ + 'https://github.com/mitchellh/vagrant/raw/master/keys/vagrant.pub' \ + -O /home/vagrant/.ssh/authorized_keys +chown -R vagrant /home/vagrant/.ssh +chmod -R go-rwsx /home/vagrant/.ssh diff --git a/templates/ubuntu-11.04/template.json b/templates/ubuntu-11.04/template.json new file mode 100644 index 000000000..91427bf9f --- /dev/null +++ b/templates/ubuntu-11.04/template.json @@ -0,0 +1,133 @@ +{ + "provisioners": [ + { + "type": "shell", + "scripts": [ + "scripts/update.sh", + "scripts/vagrant.sh", + "scripts/sshd.sh", + "scripts/networking.sh", + "scripts/sudoers.sh", + "scripts/cleanup.sh", + "scripts/minimize.sh" + ], + "override": { + "virtualbox": { + "execute_command": "echo 'vagrant'|sudo -S sh '{{.Path}}'" + }, + "vmware": { + "execute_command": "echo 'vagrant'|sudo -S sh '{{.Path}}'" + } + } + } + ], + "builders": [ + { + "type": "virtualbox", + "boot_command": [ + "<esc><wait>", + "<esc><wait>", + "<enter><wait>", + "/install/vmlinuz<wait>", + " auto<wait>", + " console-setup/ask_detect=false<wait>", + " console-setup/layoutcode=us<wait>", + " console-setup/modelcode=pc105<wait>", + " debconf/frontend=noninteractive<wait>", + " debian-installer=en_US<wait>", + " fb=false<wait>", + " initrd=/install/initrd.gz<wait>", + " kbd-chooser/method=us<wait>", + " keyboard-configuration/layout=USA<wait>", + " keyboard-configuration/variant=USA<wait>", + " locale=en_US<wait>", + " netcfg/get_domain=vm<wait>", + " netcfg/get_hostname=vagrant<wait>", + " noapic<wait>", + " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/preseed.cfg<wait>", + " -- <wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "guest_os_type": "Ubuntu_64", + "http_directory": "http", + "iso_checksum": "355ca2417522cb4a77e0295bf45c5cd5", + "iso_checksum_type": "md5", + "iso_url": "http://releases.ubuntu.com/11.04/ubuntu-11.04-server-amd64.iso", + "ssh_username": "vagrant", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_wait_timeout": "10000s", + "shutdown_command": "echo 'shutdown -P now' > shutdown.sh; echo 'vagrant'|sudo -S sh 'shutdown.sh'", + "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "virtualbox_version_file": ".vbox_version", + "vboxmanage": [ + [ + "modifyvm", + "{{.Name}}", + "--memory", + "384" + ], + [ + "modifyvm", + "{{.Name}}", + "--cpus", + "1" + ] + ], + "iso_md5": "355ca2417522cb4a77e0295bf45c5cd5" + }, + { + "type": "vmware", + "boot_command": [ + "<esc><wait>", + "<esc><wait>", + "<enter><wait>", + "/install/vmlinuz<wait>", + " auto<wait>", + " console-setup/ask_detect=false<wait>", + " console-setup/layoutcode=us<wait>", + " console-setup/modelcode=pc105<wait>", + " debconf/frontend=noninteractive<wait>", + " debian-installer=en_US<wait>", + " fb=false<wait>", + " initrd=/install/initrd.gz<wait>", + " kbd-chooser/method=us<wait>", + " keyboard-configuration/layout=USA<wait>", + " keyboard-configuration/variant=USA<wait>", + " locale=en_US<wait>", + " netcfg/get_domain=vm<wait>", + " netcfg/get_hostname=vagrant<wait>", + " noapic<wait>", + " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/preseed.cfg<wait>", + " -- <wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "guest_os_type": "ubuntu-64", + "http_directory": "http", + "iso_checksum": "355ca2417522cb4a77e0295bf45c5cd5", + "iso_checksum_type": "md5", + "iso_url": "http://releases.ubuntu.com/11.04/ubuntu-11.04-server-amd64.iso", + "ssh_username": "vagrant", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_wait_timeout": "10000s", + "shutdown_command": "echo 'shutdown -P now' > shutdown.sh; echo 'vagrant'|sudo -S sh 'shutdown.sh'", + "vmx_data": { + "memsize": "384", + "numvcpus": "1", + "cpuid.coresPerSocket": "1" + }, + "iso_md5": "355ca2417522cb4a77e0295bf45c5cd5" + } + ], + "post-provisioner": [ + { + "type": "vagrant", + "output": "ubuntu-11.04-{{.Provisioner}}.box" + } + ] +} \ No newline at end of file diff --git a/templates/ubuntu-11.10/http/preseed.cfg b/templates/ubuntu-11.10/http/preseed.cfg new file mode 100644 index 000000000..903f2e14b --- /dev/null +++ b/templates/ubuntu-11.10/http/preseed.cfg @@ -0,0 +1,31 @@ +choose-mirror-bin mirror/http/proxy string +d-i base-installer/kernel/override-image string linux-server +d-i clock-setup/utc boolean true +d-i clock-setup/utc-auto boolean true +d-i finish-install/reboot_in_progress note +d-i grub-installer/only_debian boolean true +d-i grub-installer/with_other_os boolean true +d-i partman-auto-lvm/guided_size string max +d-i partman-auto/choose_recipe select atomic +d-i partman-auto/method string lvm +d-i partman-lvm/confirm boolean true +d-i partman-lvm/confirm boolean true +d-i partman-lvm/confirm_nooverwrite boolean true +d-i partman-lvm/device_remove_lvm boolean true +d-i partman/choose_partition select finish +d-i partman/confirm boolean true +d-i partman/confirm_nooverwrite boolean true +d-i partman/confirm_write_new_label boolean true +d-i passwd/user-fullname string vagrant +d-i passwd/user-uid string 900 +d-i passwd/user-password password vagrant +d-i passwd/user-password-again password vagrant +d-i passwd/username string vagrant +d-i pkgsel/include string openssh-server cryptsetup build-essential libssl-dev libreadline-dev zlib1g-dev linux-source dkms +d-i pkgsel/install-language-support boolean false +d-i pkgsel/update-policy select unattended-upgrades +d-i pkgsel/upgrade select full-upgrade +d-i time/zone string UTC +d-i user-setup/allow-password-weak boolean true +d-i user-setup/encrypt-home boolean false +tasksel tasksel/first multiselect standard, ubuntu-server diff --git a/templates/ubuntu-11.10/scripts/cleanup.sh b/templates/ubuntu-11.10/scripts/cleanup.sh new file mode 100644 index 000000000..6c7f703d6 --- /dev/null +++ b/templates/ubuntu-11.10/scripts/cleanup.sh @@ -0,0 +1,6 @@ +#!/bin/bash -eux + +apt-get -y autoremove +apt-get -y clean +rm -rf VBoxGuestAdditions_*.iso VBoxGuestAdditions_*.iso.? +rm -f /tmp/chef*deb diff --git a/templates/ubuntu-11.10/scripts/minimize.sh b/templates/ubuntu-11.10/scripts/minimize.sh new file mode 100644 index 000000000..3846a1d65 --- /dev/null +++ b/templates/ubuntu-11.10/scripts/minimize.sh @@ -0,0 +1,4 @@ +#!/bin/bash -eux + +dd if=/dev/zero of=/EMPTY bs=1M +rm -f /EMPTY diff --git a/templates/ubuntu-11.10/scripts/networking.sh b/templates/ubuntu-11.10/scripts/networking.sh new file mode 100644 index 000000000..de3269a58 --- /dev/null +++ b/templates/ubuntu-11.10/scripts/networking.sh @@ -0,0 +1,7 @@ +#!/bin/bash -eux + +rm /etc/udev/rules.d/70-persistent-net.rules +mkdir /etc/udev/rules.d/70-persistent-net.rules +rm /lib/udev/rules.d/75-persistent-net-generator.rules +rm -rf /dev/.udev/ /var/lib/dhcp3/* +echo "pre-up sleep 2" >> /etc/network/interfaces diff --git a/templates/ubuntu-11.10/scripts/sshd.sh b/templates/ubuntu-11.10/scripts/sshd.sh new file mode 100644 index 000000000..c6e4f20a6 --- /dev/null +++ b/templates/ubuntu-11.10/scripts/sshd.sh @@ -0,0 +1,3 @@ +#!/bin/bash -eux + +echo "UseDNS no" >> /etc/ssh/sshd_config diff --git a/templates/ubuntu-11.10/scripts/sudoers.sh b/templates/ubuntu-11.10/scripts/sudoers.sh new file mode 100644 index 000000000..ce45b7611 --- /dev/null +++ b/templates/ubuntu-11.10/scripts/sudoers.sh @@ -0,0 +1,4 @@ +#!/bin/bash -eux + +sed -i -e '/Defaults\s\+env_reset/a Defaults\texempt_group=admin' /etc/sudoers +sed -i -e 's/%admin ALL=(ALL) ALL/%admin ALL=NOPASSWD:ALL/g' /etc/sudoers diff --git a/templates/ubuntu-11.10/scripts/update.sh b/templates/ubuntu-11.10/scripts/update.sh new file mode 100644 index 000000000..80e8dd3f9 --- /dev/null +++ b/templates/ubuntu-11.10/scripts/update.sh @@ -0,0 +1,15 @@ +#!/bin/bash -eux + +apt-get update +apt-get -y upgrade + +# ensure the correct kernel headers are installed +apt-get -y install linux-headers-$(uname -r) + +# update package index on boot +cat <<EOF > /etc/init/refresh-apt.conf +description "update package index" +start on networking +task +exec /usr/bin/apt-get update +EOF diff --git a/templates/ubuntu-11.10/scripts/vagrant.sh b/templates/ubuntu-11.10/scripts/vagrant.sh new file mode 100644 index 000000000..72dd2f444 --- /dev/null +++ b/templates/ubuntu-11.10/scripts/vagrant.sh @@ -0,0 +1,33 @@ +#!/bin/bash -eux + +if [ -f /home/vagrant/.vbox_version ]; then + mkdir /tmp/vbox + VER=$(cat /home/vagrant/.vbox_version) + mount -o loop VBoxGuestAdditions_$VER.iso /tmp/vbox + sh /tmp/vbox/VBoxLinuxAdditions.run + umount /tmp/vbox + rmdir /tmp/vbox + rm *.iso +fi + +if [ -f /home/vagrant/.vmfusion_version ]; then + #Set Linux-specific paths and ISO filename + home_dir="/home/vagrant" + iso_name="linux.iso" + mount_point="/tmp/vmware-tools" + #Run install, unmount ISO and remove it + mkdir ${mount_point} + cd ${home_dir} + /bin/mount -o loop ${iso_name} ${mount_point} + tar zxf ${mount_point}/*.tar.gz && cd vmware-tools-distrib && ./vmware-install.pl --default + /bin/umount ${mount_point} + /bin/rm -rf ${home_dir}/${iso_name} ${home_dir}/vmware-tools-distrib + rmdir ${mount_point} +fi + +mkdir /home/vagrant/.ssh +wget --no-check-certificate \ + 'https://github.com/mitchellh/vagrant/raw/master/keys/vagrant.pub' \ + -O /home/vagrant/.ssh/authorized_keys +chown -R vagrant /home/vagrant/.ssh +chmod -R go-rwsx /home/vagrant/.ssh diff --git a/templates/ubuntu-11.10/template.json b/templates/ubuntu-11.10/template.json new file mode 100644 index 000000000..3d2bb19ef --- /dev/null +++ b/templates/ubuntu-11.10/template.json @@ -0,0 +1,133 @@ +{ + "provisioners": [ + { + "type": "shell", + "scripts": [ + "scripts/update.sh", + "scripts/vagrant.sh", + "scripts/sshd.sh", + "scripts/networking.sh", + "scripts/sudoers.sh", + "scripts/cleanup.sh", + "scripts/minimize.sh" + ], + "override": { + "virtualbox": { + "execute_command": "echo 'vagrant'|sudo -S sh '{{.Path}}'" + }, + "vmware": { + "execute_command": "echo 'vagrant'|sudo -S sh '{{.Path}}'" + } + } + } + ], + "builders": [ + { + "type": "virtualbox", + "boot_command": [ + "<esc><wait>", + "<esc><wait>", + "<enter><wait>", + "/install/vmlinuz<wait>", + " auto<wait>", + " console-setup/ask_detect=false<wait>", + " console-setup/layoutcode=us<wait>", + " console-setup/modelcode=pc105<wait>", + " debconf/frontend=noninteractive<wait>", + " debian-installer=en_US<wait>", + " fb=false<wait>", + " initrd=/install/initrd.gz<wait>", + " kbd-chooser/method=us<wait>", + " keyboard-configuration/layout=USA<wait>", + " keyboard-configuration/variant=USA<wait>", + " locale=en_US<wait>", + " netcfg/get_domain=vm<wait>", + " netcfg/get_hostname=vagrant<wait>", + " noapic<wait>", + " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/preseed.cfg<wait>", + " -- <wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "guest_os_type": "Ubuntu_64", + "http_directory": "http", + "iso_checksum": "f8a0112b7cb5dcd6d564dbe59f18c35f", + "iso_checksum_type": "md5", + "iso_url": "http://releases.ubuntu.com/11.10/ubuntu-11.10-server-amd64.iso", + "ssh_username": "vagrant", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_wait_timeout": "10000s", + "shutdown_command": "echo 'shutdown -P now' > shutdown.sh; echo 'vagrant'|sudo -S sh 'shutdown.sh'", + "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "virtualbox_version_file": ".vbox_version", + "vboxmanage": [ + [ + "modifyvm", + "{{.Name}}", + "--memory", + "384" + ], + [ + "modifyvm", + "{{.Name}}", + "--cpus", + "1" + ] + ], + "iso_md5": "f8a0112b7cb5dcd6d564dbe59f18c35f" + }, + { + "type": "vmware", + "boot_command": [ + "<esc><wait>", + "<esc><wait>", + "<enter><wait>", + "/install/vmlinuz<wait>", + " auto<wait>", + " console-setup/ask_detect=false<wait>", + " console-setup/layoutcode=us<wait>", + " console-setup/modelcode=pc105<wait>", + " debconf/frontend=noninteractive<wait>", + " debian-installer=en_US<wait>", + " fb=false<wait>", + " initrd=/install/initrd.gz<wait>", + " kbd-chooser/method=us<wait>", + " keyboard-configuration/layout=USA<wait>", + " keyboard-configuration/variant=USA<wait>", + " locale=en_US<wait>", + " netcfg/get_domain=vm<wait>", + " netcfg/get_hostname=vagrant<wait>", + " noapic<wait>", + " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/preseed.cfg<wait>", + " -- <wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "guest_os_type": "ubuntu-64", + "http_directory": "http", + "iso_checksum": "f8a0112b7cb5dcd6d564dbe59f18c35f", + "iso_checksum_type": "md5", + "iso_url": "http://releases.ubuntu.com/11.10/ubuntu-11.10-server-amd64.iso", + "ssh_username": "vagrant", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_wait_timeout": "10000s", + "shutdown_command": "echo 'shutdown -P now' > shutdown.sh; echo 'vagrant'|sudo -S sh 'shutdown.sh'", + "vmx_data": { + "memsize": "384", + "numvcpus": "1", + "cpuid.coresPerSocket": "1" + }, + "iso_md5": "f8a0112b7cb5dcd6d564dbe59f18c35f" + } + ], + "post-provisioner": [ + { + "type": "vagrant", + "output": "ubuntu-11.10-{{.Provisioner}}.box" + } + ] +} \ No newline at end of file diff --git a/templates/ubuntu-12.04-i386/http/preseed.cfg b/templates/ubuntu-12.04-i386/http/preseed.cfg new file mode 100644 index 000000000..903f2e14b --- /dev/null +++ b/templates/ubuntu-12.04-i386/http/preseed.cfg @@ -0,0 +1,31 @@ +choose-mirror-bin mirror/http/proxy string +d-i base-installer/kernel/override-image string linux-server +d-i clock-setup/utc boolean true +d-i clock-setup/utc-auto boolean true +d-i finish-install/reboot_in_progress note +d-i grub-installer/only_debian boolean true +d-i grub-installer/with_other_os boolean true +d-i partman-auto-lvm/guided_size string max +d-i partman-auto/choose_recipe select atomic +d-i partman-auto/method string lvm +d-i partman-lvm/confirm boolean true +d-i partman-lvm/confirm boolean true +d-i partman-lvm/confirm_nooverwrite boolean true +d-i partman-lvm/device_remove_lvm boolean true +d-i partman/choose_partition select finish +d-i partman/confirm boolean true +d-i partman/confirm_nooverwrite boolean true +d-i partman/confirm_write_new_label boolean true +d-i passwd/user-fullname string vagrant +d-i passwd/user-uid string 900 +d-i passwd/user-password password vagrant +d-i passwd/user-password-again password vagrant +d-i passwd/username string vagrant +d-i pkgsel/include string openssh-server cryptsetup build-essential libssl-dev libreadline-dev zlib1g-dev linux-source dkms +d-i pkgsel/install-language-support boolean false +d-i pkgsel/update-policy select unattended-upgrades +d-i pkgsel/upgrade select full-upgrade +d-i time/zone string UTC +d-i user-setup/allow-password-weak boolean true +d-i user-setup/encrypt-home boolean false +tasksel tasksel/first multiselect standard, ubuntu-server diff --git a/templates/ubuntu-12.04-i386/scripts/cleanup.sh b/templates/ubuntu-12.04-i386/scripts/cleanup.sh new file mode 100644 index 000000000..6c7f703d6 --- /dev/null +++ b/templates/ubuntu-12.04-i386/scripts/cleanup.sh @@ -0,0 +1,6 @@ +#!/bin/bash -eux + +apt-get -y autoremove +apt-get -y clean +rm -rf VBoxGuestAdditions_*.iso VBoxGuestAdditions_*.iso.? +rm -f /tmp/chef*deb diff --git a/templates/ubuntu-12.04-i386/scripts/minimize.sh b/templates/ubuntu-12.04-i386/scripts/minimize.sh new file mode 100644 index 000000000..3846a1d65 --- /dev/null +++ b/templates/ubuntu-12.04-i386/scripts/minimize.sh @@ -0,0 +1,4 @@ +#!/bin/bash -eux + +dd if=/dev/zero of=/EMPTY bs=1M +rm -f /EMPTY diff --git a/templates/ubuntu-12.04-i386/scripts/networking.sh b/templates/ubuntu-12.04-i386/scripts/networking.sh new file mode 100644 index 000000000..de3269a58 --- /dev/null +++ b/templates/ubuntu-12.04-i386/scripts/networking.sh @@ -0,0 +1,7 @@ +#!/bin/bash -eux + +rm /etc/udev/rules.d/70-persistent-net.rules +mkdir /etc/udev/rules.d/70-persistent-net.rules +rm /lib/udev/rules.d/75-persistent-net-generator.rules +rm -rf /dev/.udev/ /var/lib/dhcp3/* +echo "pre-up sleep 2" >> /etc/network/interfaces diff --git a/templates/ubuntu-12.04-i386/scripts/sshd.sh b/templates/ubuntu-12.04-i386/scripts/sshd.sh new file mode 100644 index 000000000..c6e4f20a6 --- /dev/null +++ b/templates/ubuntu-12.04-i386/scripts/sshd.sh @@ -0,0 +1,3 @@ +#!/bin/bash -eux + +echo "UseDNS no" >> /etc/ssh/sshd_config diff --git a/templates/ubuntu-12.04-i386/scripts/sudoers.sh b/templates/ubuntu-12.04-i386/scripts/sudoers.sh new file mode 100644 index 000000000..5fce3dd2c --- /dev/null +++ b/templates/ubuntu-12.04-i386/scripts/sudoers.sh @@ -0,0 +1,4 @@ +#!/bin/bash -eux + +sed -i -e '/Defaults\s\+env_reset/a Defaults\texempt_group=sudo' /etc/sudoers +sed -i -e 's/%sudo ALL=(ALL:ALL) ALL/%sudo ALL=NOPASSWD:ALL/g' /etc/sudoers diff --git a/templates/ubuntu-12.04-i386/scripts/update.sh b/templates/ubuntu-12.04-i386/scripts/update.sh new file mode 100644 index 000000000..80e8dd3f9 --- /dev/null +++ b/templates/ubuntu-12.04-i386/scripts/update.sh @@ -0,0 +1,15 @@ +#!/bin/bash -eux + +apt-get update +apt-get -y upgrade + +# ensure the correct kernel headers are installed +apt-get -y install linux-headers-$(uname -r) + +# update package index on boot +cat <<EOF > /etc/init/refresh-apt.conf +description "update package index" +start on networking +task +exec /usr/bin/apt-get update +EOF diff --git a/templates/ubuntu-12.04-i386/scripts/vagrant.sh b/templates/ubuntu-12.04-i386/scripts/vagrant.sh new file mode 100644 index 000000000..72dd2f444 --- /dev/null +++ b/templates/ubuntu-12.04-i386/scripts/vagrant.sh @@ -0,0 +1,33 @@ +#!/bin/bash -eux + +if [ -f /home/vagrant/.vbox_version ]; then + mkdir /tmp/vbox + VER=$(cat /home/vagrant/.vbox_version) + mount -o loop VBoxGuestAdditions_$VER.iso /tmp/vbox + sh /tmp/vbox/VBoxLinuxAdditions.run + umount /tmp/vbox + rmdir /tmp/vbox + rm *.iso +fi + +if [ -f /home/vagrant/.vmfusion_version ]; then + #Set Linux-specific paths and ISO filename + home_dir="/home/vagrant" + iso_name="linux.iso" + mount_point="/tmp/vmware-tools" + #Run install, unmount ISO and remove it + mkdir ${mount_point} + cd ${home_dir} + /bin/mount -o loop ${iso_name} ${mount_point} + tar zxf ${mount_point}/*.tar.gz && cd vmware-tools-distrib && ./vmware-install.pl --default + /bin/umount ${mount_point} + /bin/rm -rf ${home_dir}/${iso_name} ${home_dir}/vmware-tools-distrib + rmdir ${mount_point} +fi + +mkdir /home/vagrant/.ssh +wget --no-check-certificate \ + 'https://github.com/mitchellh/vagrant/raw/master/keys/vagrant.pub' \ + -O /home/vagrant/.ssh/authorized_keys +chown -R vagrant /home/vagrant/.ssh +chmod -R go-rwsx /home/vagrant/.ssh diff --git a/templates/ubuntu-12.04-i386/template.json b/templates/ubuntu-12.04-i386/template.json new file mode 100644 index 000000000..20468d887 --- /dev/null +++ b/templates/ubuntu-12.04-i386/template.json @@ -0,0 +1,133 @@ +{ + "provisioners": [ + { + "type": "shell", + "scripts": [ + "scripts/update.sh", + "scripts/vagrant.sh", + "scripts/sshd.sh", + "scripts/networking.sh", + "scripts/sudoers.sh", + "scripts/cleanup.sh", + "scripts/minimize.sh" + ], + "override": { + "virtualbox": { + "execute_command": "echo 'vagrant'|sudo -S sh '{{.Path}}'" + }, + "vmware": { + "execute_command": "echo 'vagrant'|sudo -S sh '{{.Path}}'" + } + } + } + ], + "builders": [ + { + "type": "virtualbox", + "boot_command": [ + "<esc><wait>", + "<esc><wait>", + "<enter><wait>", + "/install/vmlinuz<wait>", + " auto<wait>", + " console-setup/ask_detect=false<wait>", + " console-setup/layoutcode=us<wait>", + " console-setup/modelcode=pc105<wait>", + " debconf/frontend=noninteractive<wait>", + " debian-installer=en_US<wait>", + " fb=false<wait>", + " initrd=/install/initrd.gz<wait>", + " kbd-chooser/method=us<wait>", + " keyboard-configuration/layout=USA<wait>", + " keyboard-configuration/variant=USA<wait>", + " locale=en_US<wait>", + " netcfg/get_domain=vm<wait>", + " netcfg/get_hostname=vagrant<wait>", + " noapic<wait>", + " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/preseed.cfg<wait>", + " -- <wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "guest_os_type": "Ubuntu", + "http_directory": "http", + "iso_checksum": "7d186655efe871ea1a1492faf635beee", + "iso_checksum_type": "md5", + "iso_url": "http://releases.ubuntu.com/12.04/ubuntu-12.04.2-server-i386.iso", + "ssh_username": "vagrant", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_wait_timeout": "10000s", + "shutdown_command": "echo 'shutdown -P now' > shutdown.sh; echo 'vagrant'|sudo -S sh 'shutdown.sh'", + "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "virtualbox_version_file": ".vbox_version", + "vboxmanage": [ + [ + "modifyvm", + "{{.Name}}", + "--memory", + "384" + ], + [ + "modifyvm", + "{{.Name}}", + "--cpus", + "1" + ] + ], + "iso_md5": "7d186655efe871ea1a1492faf635beee" + }, + { + "type": "vmware", + "boot_command": [ + "<esc><wait>", + "<esc><wait>", + "<enter><wait>", + "/install/vmlinuz<wait>", + " auto<wait>", + " console-setup/ask_detect=false<wait>", + " console-setup/layoutcode=us<wait>", + " console-setup/modelcode=pc105<wait>", + " debconf/frontend=noninteractive<wait>", + " debian-installer=en_US<wait>", + " fb=false<wait>", + " initrd=/install/initrd.gz<wait>", + " kbd-chooser/method=us<wait>", + " keyboard-configuration/layout=USA<wait>", + " keyboard-configuration/variant=USA<wait>", + " locale=en_US<wait>", + " netcfg/get_domain=vm<wait>", + " netcfg/get_hostname=vagrant<wait>", + " noapic<wait>", + " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/preseed.cfg<wait>", + " -- <wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "guest_os_type": "ubuntu", + "http_directory": "http", + "iso_checksum": "7d186655efe871ea1a1492faf635beee", + "iso_checksum_type": "md5", + "iso_url": "http://releases.ubuntu.com/12.04/ubuntu-12.04.2-server-i386.iso", + "ssh_username": "vagrant", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_wait_timeout": "10000s", + "shutdown_command": "echo 'shutdown -P now' > shutdown.sh; echo 'vagrant'|sudo -S sh 'shutdown.sh'", + "vmx_data": { + "memsize": "384", + "numvcpus": "1", + "cpuid.coresPerSocket": "1" + }, + "iso_md5": "7d186655efe871ea1a1492faf635beee" + } + ], + "post-provisioner": [ + { + "type": "vagrant", + "output": "ubuntu-12.04-i386-{{.Provisioner}}.box" + } + ] +} \ No newline at end of file diff --git a/templates/ubuntu-12.04/http/preseed.cfg b/templates/ubuntu-12.04/http/preseed.cfg new file mode 100644 index 000000000..903f2e14b --- /dev/null +++ b/templates/ubuntu-12.04/http/preseed.cfg @@ -0,0 +1,31 @@ +choose-mirror-bin mirror/http/proxy string +d-i base-installer/kernel/override-image string linux-server +d-i clock-setup/utc boolean true +d-i clock-setup/utc-auto boolean true +d-i finish-install/reboot_in_progress note +d-i grub-installer/only_debian boolean true +d-i grub-installer/with_other_os boolean true +d-i partman-auto-lvm/guided_size string max +d-i partman-auto/choose_recipe select atomic +d-i partman-auto/method string lvm +d-i partman-lvm/confirm boolean true +d-i partman-lvm/confirm boolean true +d-i partman-lvm/confirm_nooverwrite boolean true +d-i partman-lvm/device_remove_lvm boolean true +d-i partman/choose_partition select finish +d-i partman/confirm boolean true +d-i partman/confirm_nooverwrite boolean true +d-i partman/confirm_write_new_label boolean true +d-i passwd/user-fullname string vagrant +d-i passwd/user-uid string 900 +d-i passwd/user-password password vagrant +d-i passwd/user-password-again password vagrant +d-i passwd/username string vagrant +d-i pkgsel/include string openssh-server cryptsetup build-essential libssl-dev libreadline-dev zlib1g-dev linux-source dkms +d-i pkgsel/install-language-support boolean false +d-i pkgsel/update-policy select unattended-upgrades +d-i pkgsel/upgrade select full-upgrade +d-i time/zone string UTC +d-i user-setup/allow-password-weak boolean true +d-i user-setup/encrypt-home boolean false +tasksel tasksel/first multiselect standard, ubuntu-server diff --git a/templates/ubuntu-12.04/new.json b/templates/ubuntu-12.04/new.json new file mode 100644 index 000000000..1c636c285 --- /dev/null +++ b/templates/ubuntu-12.04/new.json @@ -0,0 +1,77 @@ +{ + "builders": [ + { + "boot_command": [ + "<esc><wait>", + "<esc><wait>", + "<enter><wait>", + "/install/vmlinuz<wait>", + " auto<wait>", + " console-setup/ask_detect=false<wait>", + " console-setup/layoutcode=us<wait>", + " console-setup/modelcode=pc105<wait>", + " debconf/frontend=noninteractive<wait>", + " debian-installer=en_US<wait>", + " fb=false<wait>", + " initrd=/install/initrd.gz<wait>", + " kbd-chooser/method=us<wait>", + " keyboard-configuration/layout=USA<wait>", + " keyboard-configuration/variant=USA<wait>", + " locale=en_US<wait>", + " netcfg/get_domain=vm<wait>", + " netcfg/get_hostname=vagrant<wait>", + " noapic<wait>", + " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/preseed.cfg<wait>", + " -- <wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "guest_os_type": "ubuntu-64", + "http_directory": "http", + "iso_checksum": "af5f788aee1b32c4b2634734309cc9e9", + "iso_checksum_type": "md5", + "iso_url": "http://releases.ubuntu.com/12.04/ubuntu-12.04.2-server-amd64.iso", + "shutdown_command": "echo 'shutdown -P now' > shutdown.sh; echo 'vagrant'|sudo -S sh 'shutdown.sh'", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "tools_upload_flavor": "linux", + "tools_upload_path": "/home/vagrant/vmware_tools.iso", + "type": "vmware", + "vmx_data": { + "cpuid.coresPerSocket": "1", + "memsize": "384", + "numvcpus": "1" + } + } + ], + "post-processors": [ + { + "type": "vagrant", + "output": "ubuntu-12.04-{{.Provider}}.box" + } + ], + "provisioners": [ + { + "override": { + "vmware": { + "execute_command": "echo 'vagrant' | sudo -S bash '{{.Path}}'" + } + }, + "scripts": [ + "../.ubuntu/update.sh", + "../.common/sshd.sh", + "../.ubuntu/networking.sh", + "../.common/sudoers.sh", + "../.ubuntu/cleanup.sh", + "../.common/vagrant.sh", + "../.common/minimize.sh", + "../.common/chef_omnibus.sh" + ], + "type": "shell" + } + ] +} + diff --git a/templates/ubuntu-12.04/scripts/sudoers.sh b/templates/ubuntu-12.04/scripts/sudoers.sh new file mode 100644 index 000000000..5fce3dd2c --- /dev/null +++ b/templates/ubuntu-12.04/scripts/sudoers.sh @@ -0,0 +1,4 @@ +#!/bin/bash -eux + +sed -i -e '/Defaults\s\+env_reset/a Defaults\texempt_group=sudo' /etc/sudoers +sed -i -e 's/%sudo ALL=(ALL:ALL) ALL/%sudo ALL=NOPASSWD:ALL/g' /etc/sudoers diff --git a/templates/ubuntu-12.04/template.json b/templates/ubuntu-12.04/template.json new file mode 100644 index 000000000..6da6fa33f --- /dev/null +++ b/templates/ubuntu-12.04/template.json @@ -0,0 +1,135 @@ +{ + "provisioners": [ + { + "type": "shell", + "scripts": [ + "scripts/update.sh", + "scripts/vagrant.sh", + "scripts/sshd.sh", + "scripts/networking.sh", + "scripts/sudoers.sh", + "scripts/cleanup.sh", + "scripts/minimize.sh" + ], + "override": { + "virtualbox": { + "execute_command": "echo 'vagrant'|sudo -S sh '{{.Path}}'" + }, + "vmware": { + "execute_command": "echo 'vagrant'|sudo -S sh '{{.Path}}'; curl https://opscode.com/chef/install.sh | sudo bash" + } + } + } + ], + "builders": [ + { + "type": "virtualbox", + "boot_command": [ + "<esc><wait>", + "<esc><wait>", + "<enter><wait>", + "/install/vmlinuz<wait>", + " auto<wait>", + " console-setup/ask_detect=false<wait>", + " console-setup/layoutcode=us<wait>", + " console-setup/modelcode=pc105<wait>", + " debconf/frontend=noninteractive<wait>", + " debian-installer=en_US<wait>", + " fb=false<wait>", + " initrd=/install/initrd.gz<wait>", + " kbd-chooser/method=us<wait>", + " keyboard-configuration/layout=USA<wait>", + " keyboard-configuration/variant=USA<wait>", + " locale=en_US<wait>", + " netcfg/get_domain=vm<wait>", + " netcfg/get_hostname=vagrant<wait>", + " noapic<wait>", + " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/preseed.cfg<wait>", + " -- <wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "guest_os_type": "Ubuntu_64", + "http_directory": "http", + "iso_checksum": "af5f788aee1b32c4b2634734309cc9e9", + "iso_checksum_type": "md5", + "iso_url": "http://releases.ubuntu.com/12.04/ubuntu-12.04.2-server-amd64.iso", + "ssh_username": "vagrant", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_wait_timeout": "10000s", + "shutdown_command": "echo 'shutdown -P now' > shutdown.sh; echo 'vagrant'|sudo -S sh 'shutdown.sh'", + "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "virtualbox_version_file": ".vbox_version", + "vboxmanage": [ + [ + "modifyvm", + "{{.Name}}", + "--memory", + "384" + ], + [ + "modifyvm", + "{{.Name}}", + "--cpus", + "1" + ] + ], + "iso_md5": "af5f788aee1b32c4b2634734309cc9e9" + }, + { + "type": "vmware", + "boot_command": [ + "<esc><wait>", + "<esc><wait>", + "<enter><wait>", + "/install/vmlinuz<wait>", + " auto<wait>", + " console-setup/ask_detect=false<wait>", + " console-setup/layoutcode=us<wait>", + " console-setup/modelcode=pc105<wait>", + " debconf/frontend=noninteractive<wait>", + " debian-installer=en_US<wait>", + " fb=false<wait>", + " initrd=/install/initrd.gz<wait>", + " kbd-chooser/method=us<wait>", + " keyboard-configuration/layout=USA<wait>", + " keyboard-configuration/variant=USA<wait>", + " locale=en_US<wait>", + " netcfg/get_domain=vm<wait>", + " netcfg/get_hostname=vagrant<wait>", + " noapic<wait>", + " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/preseed.cfg<wait>", + " -- <wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "tools_upload_flavor": "darwin", + "tools_upload_path": "../.common/{{.Flavor}}.iso", + "guest_os_type": "ubuntu-64", + "http_directory": "http", + "iso_checksum": "af5f788aee1b32c4b2634734309cc9e9", + "iso_checksum_type": "md5", + "iso_url": "http://releases.ubuntu.com/12.04/ubuntu-12.04.2-server-amd64.iso", + "ssh_username": "vagrant", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_wait_timeout": "10000s", + "shutdown_command": "echo 'shutdown -P now' > shutdown.sh; echo 'vagrant'|sudo -S sh 'shutdown.sh'", + "vmx_data": { + "memsize": "384", + "numvcpus": "1", + "cpuid.coresPerSocket": "1" + }, + "iso_md5": "af5f788aee1b32c4b2634734309cc9e9" + } + ], + "post-processors": [ + { + "type": "vagrant", + "output": "ubuntu-12.04-{{.Provider}}.box" + } + ] +} diff --git a/templates/ubuntu-12.10-i386/http/preseed.cfg b/templates/ubuntu-12.10-i386/http/preseed.cfg new file mode 100644 index 000000000..903f2e14b --- /dev/null +++ b/templates/ubuntu-12.10-i386/http/preseed.cfg @@ -0,0 +1,31 @@ +choose-mirror-bin mirror/http/proxy string +d-i base-installer/kernel/override-image string linux-server +d-i clock-setup/utc boolean true +d-i clock-setup/utc-auto boolean true +d-i finish-install/reboot_in_progress note +d-i grub-installer/only_debian boolean true +d-i grub-installer/with_other_os boolean true +d-i partman-auto-lvm/guided_size string max +d-i partman-auto/choose_recipe select atomic +d-i partman-auto/method string lvm +d-i partman-lvm/confirm boolean true +d-i partman-lvm/confirm boolean true +d-i partman-lvm/confirm_nooverwrite boolean true +d-i partman-lvm/device_remove_lvm boolean true +d-i partman/choose_partition select finish +d-i partman/confirm boolean true +d-i partman/confirm_nooverwrite boolean true +d-i partman/confirm_write_new_label boolean true +d-i passwd/user-fullname string vagrant +d-i passwd/user-uid string 900 +d-i passwd/user-password password vagrant +d-i passwd/user-password-again password vagrant +d-i passwd/username string vagrant +d-i pkgsel/include string openssh-server cryptsetup build-essential libssl-dev libreadline-dev zlib1g-dev linux-source dkms +d-i pkgsel/install-language-support boolean false +d-i pkgsel/update-policy select unattended-upgrades +d-i pkgsel/upgrade select full-upgrade +d-i time/zone string UTC +d-i user-setup/allow-password-weak boolean true +d-i user-setup/encrypt-home boolean false +tasksel tasksel/first multiselect standard, ubuntu-server diff --git a/templates/ubuntu-12.10-i386/scripts/cleanup.sh b/templates/ubuntu-12.10-i386/scripts/cleanup.sh new file mode 100644 index 000000000..6c7f703d6 --- /dev/null +++ b/templates/ubuntu-12.10-i386/scripts/cleanup.sh @@ -0,0 +1,6 @@ +#!/bin/bash -eux + +apt-get -y autoremove +apt-get -y clean +rm -rf VBoxGuestAdditions_*.iso VBoxGuestAdditions_*.iso.? +rm -f /tmp/chef*deb diff --git a/templates/ubuntu-12.10-i386/scripts/minimize.sh b/templates/ubuntu-12.10-i386/scripts/minimize.sh new file mode 100644 index 000000000..3846a1d65 --- /dev/null +++ b/templates/ubuntu-12.10-i386/scripts/minimize.sh @@ -0,0 +1,4 @@ +#!/bin/bash -eux + +dd if=/dev/zero of=/EMPTY bs=1M +rm -f /EMPTY diff --git a/templates/ubuntu-12.10-i386/scripts/networking.sh b/templates/ubuntu-12.10-i386/scripts/networking.sh new file mode 100644 index 000000000..de3269a58 --- /dev/null +++ b/templates/ubuntu-12.10-i386/scripts/networking.sh @@ -0,0 +1,7 @@ +#!/bin/bash -eux + +rm /etc/udev/rules.d/70-persistent-net.rules +mkdir /etc/udev/rules.d/70-persistent-net.rules +rm /lib/udev/rules.d/75-persistent-net-generator.rules +rm -rf /dev/.udev/ /var/lib/dhcp3/* +echo "pre-up sleep 2" >> /etc/network/interfaces diff --git a/templates/ubuntu-12.10-i386/scripts/sshd.sh b/templates/ubuntu-12.10-i386/scripts/sshd.sh new file mode 100644 index 000000000..c6e4f20a6 --- /dev/null +++ b/templates/ubuntu-12.10-i386/scripts/sshd.sh @@ -0,0 +1,3 @@ +#!/bin/bash -eux + +echo "UseDNS no" >> /etc/ssh/sshd_config diff --git a/templates/ubuntu-12.10-i386/scripts/sudoers.sh b/templates/ubuntu-12.10-i386/scripts/sudoers.sh new file mode 100644 index 000000000..5fce3dd2c --- /dev/null +++ b/templates/ubuntu-12.10-i386/scripts/sudoers.sh @@ -0,0 +1,4 @@ +#!/bin/bash -eux + +sed -i -e '/Defaults\s\+env_reset/a Defaults\texempt_group=sudo' /etc/sudoers +sed -i -e 's/%sudo ALL=(ALL:ALL) ALL/%sudo ALL=NOPASSWD:ALL/g' /etc/sudoers diff --git a/templates/ubuntu-12.10-i386/scripts/update.sh b/templates/ubuntu-12.10-i386/scripts/update.sh new file mode 100644 index 000000000..80e8dd3f9 --- /dev/null +++ b/templates/ubuntu-12.10-i386/scripts/update.sh @@ -0,0 +1,15 @@ +#!/bin/bash -eux + +apt-get update +apt-get -y upgrade + +# ensure the correct kernel headers are installed +apt-get -y install linux-headers-$(uname -r) + +# update package index on boot +cat <<EOF > /etc/init/refresh-apt.conf +description "update package index" +start on networking +task +exec /usr/bin/apt-get update +EOF diff --git a/templates/ubuntu-12.10-i386/scripts/vagrant.sh b/templates/ubuntu-12.10-i386/scripts/vagrant.sh new file mode 100644 index 000000000..72dd2f444 --- /dev/null +++ b/templates/ubuntu-12.10-i386/scripts/vagrant.sh @@ -0,0 +1,33 @@ +#!/bin/bash -eux + +if [ -f /home/vagrant/.vbox_version ]; then + mkdir /tmp/vbox + VER=$(cat /home/vagrant/.vbox_version) + mount -o loop VBoxGuestAdditions_$VER.iso /tmp/vbox + sh /tmp/vbox/VBoxLinuxAdditions.run + umount /tmp/vbox + rmdir /tmp/vbox + rm *.iso +fi + +if [ -f /home/vagrant/.vmfusion_version ]; then + #Set Linux-specific paths and ISO filename + home_dir="/home/vagrant" + iso_name="linux.iso" + mount_point="/tmp/vmware-tools" + #Run install, unmount ISO and remove it + mkdir ${mount_point} + cd ${home_dir} + /bin/mount -o loop ${iso_name} ${mount_point} + tar zxf ${mount_point}/*.tar.gz && cd vmware-tools-distrib && ./vmware-install.pl --default + /bin/umount ${mount_point} + /bin/rm -rf ${home_dir}/${iso_name} ${home_dir}/vmware-tools-distrib + rmdir ${mount_point} +fi + +mkdir /home/vagrant/.ssh +wget --no-check-certificate \ + 'https://github.com/mitchellh/vagrant/raw/master/keys/vagrant.pub' \ + -O /home/vagrant/.ssh/authorized_keys +chown -R vagrant /home/vagrant/.ssh +chmod -R go-rwsx /home/vagrant/.ssh diff --git a/templates/ubuntu-12.10-i386/template.json b/templates/ubuntu-12.10-i386/template.json new file mode 100644 index 000000000..782409383 --- /dev/null +++ b/templates/ubuntu-12.10-i386/template.json @@ -0,0 +1,133 @@ +{ + "provisioners": [ + { + "type": "shell", + "scripts": [ + "scripts/update.sh", + "scripts/vagrant.sh", + "scripts/sshd.sh", + "scripts/networking.sh", + "scripts/sudoers.sh", + "scripts/cleanup.sh", + "scripts/minimize.sh" + ], + "override": { + "virtualbox": { + "execute_command": "echo 'vagrant'|sudo -S sh '{{.Path}}'" + }, + "vmware": { + "execute_command": "echo 'vagrant'|sudo -S sh '{{.Path}}'" + } + } + } + ], + "builders": [ + { + "type": "virtualbox", + "boot_command": [ + "<esc><wait>", + "<esc><wait>", + "<enter><wait>", + "/install/vmlinuz<wait>", + " auto<wait>", + " console-setup/ask_detect=false<wait>", + " console-setup/layoutcode=us<wait>", + " console-setup/modelcode=pc105<wait>", + " debconf/frontend=noninteractive<wait>", + " debian-installer=en_US<wait>", + " fb=false<wait>", + " initrd=/install/initrd.gz<wait>", + " kbd-chooser/method=us<wait>", + " keyboard-configuration/layout=USA<wait>", + " keyboard-configuration/variant=USA<wait>", + " locale=en_US<wait>", + " netcfg/get_domain=vm<wait>", + " netcfg/get_hostname=vagrant<wait>", + " noapic<wait>", + " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/preseed.cfg<wait>", + " -- <wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "guest_os_type": "Ubuntu", + "http_directory": "http", + "iso_checksum": "b3d4d4edfc8f291af0b83f8a2ba19a2f", + "iso_checksum_type": "md5", + "iso_url": "http://releases.ubuntu.com/12.10/ubuntu-12.10-server-i386.iso", + "ssh_username": "vagrant", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_wait_timeout": "10000s", + "shutdown_command": "echo 'shutdown -P now' > shutdown.sh; echo 'vagrant'|sudo -S sh 'shutdown.sh'", + "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "virtualbox_version_file": ".vbox_version", + "vboxmanage": [ + [ + "modifyvm", + "{{.Name}}", + "--memory", + "384" + ], + [ + "modifyvm", + "{{.Name}}", + "--cpus", + "1" + ] + ], + "iso_md5": "b3d4d4edfc8f291af0b83f8a2ba19a2f" + }, + { + "type": "vmware", + "boot_command": [ + "<esc><wait>", + "<esc><wait>", + "<enter><wait>", + "/install/vmlinuz<wait>", + " auto<wait>", + " console-setup/ask_detect=false<wait>", + " console-setup/layoutcode=us<wait>", + " console-setup/modelcode=pc105<wait>", + " debconf/frontend=noninteractive<wait>", + " debian-installer=en_US<wait>", + " fb=false<wait>", + " initrd=/install/initrd.gz<wait>", + " kbd-chooser/method=us<wait>", + " keyboard-configuration/layout=USA<wait>", + " keyboard-configuration/variant=USA<wait>", + " locale=en_US<wait>", + " netcfg/get_domain=vm<wait>", + " netcfg/get_hostname=vagrant<wait>", + " noapic<wait>", + " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/preseed.cfg<wait>", + " -- <wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "guest_os_type": "ubuntu", + "http_directory": "http", + "iso_checksum": "b3d4d4edfc8f291af0b83f8a2ba19a2f", + "iso_checksum_type": "md5", + "iso_url": "http://releases.ubuntu.com/12.10/ubuntu-12.10-server-i386.iso", + "ssh_username": "vagrant", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_wait_timeout": "10000s", + "shutdown_command": "echo 'shutdown -P now' > shutdown.sh; echo 'vagrant'|sudo -S sh 'shutdown.sh'", + "vmx_data": { + "memsize": "384", + "numvcpus": "1", + "cpuid.coresPerSocket": "1" + }, + "iso_md5": "b3d4d4edfc8f291af0b83f8a2ba19a2f" + } + ], + "post-provisioner": [ + { + "type": "vagrant", + "output": "ubuntu-12.10-i386-{{.Provisioner}}.box" + } + ] +} \ No newline at end of file diff --git a/templates/ubuntu-12.10/http/preseed.cfg b/templates/ubuntu-12.10/http/preseed.cfg new file mode 100644 index 000000000..903f2e14b --- /dev/null +++ b/templates/ubuntu-12.10/http/preseed.cfg @@ -0,0 +1,31 @@ +choose-mirror-bin mirror/http/proxy string +d-i base-installer/kernel/override-image string linux-server +d-i clock-setup/utc boolean true +d-i clock-setup/utc-auto boolean true +d-i finish-install/reboot_in_progress note +d-i grub-installer/only_debian boolean true +d-i grub-installer/with_other_os boolean true +d-i partman-auto-lvm/guided_size string max +d-i partman-auto/choose_recipe select atomic +d-i partman-auto/method string lvm +d-i partman-lvm/confirm boolean true +d-i partman-lvm/confirm boolean true +d-i partman-lvm/confirm_nooverwrite boolean true +d-i partman-lvm/device_remove_lvm boolean true +d-i partman/choose_partition select finish +d-i partman/confirm boolean true +d-i partman/confirm_nooverwrite boolean true +d-i partman/confirm_write_new_label boolean true +d-i passwd/user-fullname string vagrant +d-i passwd/user-uid string 900 +d-i passwd/user-password password vagrant +d-i passwd/user-password-again password vagrant +d-i passwd/username string vagrant +d-i pkgsel/include string openssh-server cryptsetup build-essential libssl-dev libreadline-dev zlib1g-dev linux-source dkms +d-i pkgsel/install-language-support boolean false +d-i pkgsel/update-policy select unattended-upgrades +d-i pkgsel/upgrade select full-upgrade +d-i time/zone string UTC +d-i user-setup/allow-password-weak boolean true +d-i user-setup/encrypt-home boolean false +tasksel tasksel/first multiselect standard, ubuntu-server diff --git a/templates/ubuntu-12.10/scripts/cleanup.sh b/templates/ubuntu-12.10/scripts/cleanup.sh new file mode 100644 index 000000000..6c7f703d6 --- /dev/null +++ b/templates/ubuntu-12.10/scripts/cleanup.sh @@ -0,0 +1,6 @@ +#!/bin/bash -eux + +apt-get -y autoremove +apt-get -y clean +rm -rf VBoxGuestAdditions_*.iso VBoxGuestAdditions_*.iso.? +rm -f /tmp/chef*deb diff --git a/templates/ubuntu-12.10/scripts/minimize.sh b/templates/ubuntu-12.10/scripts/minimize.sh new file mode 100644 index 000000000..3846a1d65 --- /dev/null +++ b/templates/ubuntu-12.10/scripts/minimize.sh @@ -0,0 +1,4 @@ +#!/bin/bash -eux + +dd if=/dev/zero of=/EMPTY bs=1M +rm -f /EMPTY diff --git a/templates/ubuntu-12.10/scripts/networking.sh b/templates/ubuntu-12.10/scripts/networking.sh new file mode 100644 index 000000000..de3269a58 --- /dev/null +++ b/templates/ubuntu-12.10/scripts/networking.sh @@ -0,0 +1,7 @@ +#!/bin/bash -eux + +rm /etc/udev/rules.d/70-persistent-net.rules +mkdir /etc/udev/rules.d/70-persistent-net.rules +rm /lib/udev/rules.d/75-persistent-net-generator.rules +rm -rf /dev/.udev/ /var/lib/dhcp3/* +echo "pre-up sleep 2" >> /etc/network/interfaces diff --git a/templates/ubuntu-12.10/scripts/sshd.sh b/templates/ubuntu-12.10/scripts/sshd.sh new file mode 100644 index 000000000..c6e4f20a6 --- /dev/null +++ b/templates/ubuntu-12.10/scripts/sshd.sh @@ -0,0 +1,3 @@ +#!/bin/bash -eux + +echo "UseDNS no" >> /etc/ssh/sshd_config diff --git a/templates/ubuntu-12.10/scripts/sudoers.sh b/templates/ubuntu-12.10/scripts/sudoers.sh new file mode 100644 index 000000000..5fce3dd2c --- /dev/null +++ b/templates/ubuntu-12.10/scripts/sudoers.sh @@ -0,0 +1,4 @@ +#!/bin/bash -eux + +sed -i -e '/Defaults\s\+env_reset/a Defaults\texempt_group=sudo' /etc/sudoers +sed -i -e 's/%sudo ALL=(ALL:ALL) ALL/%sudo ALL=NOPASSWD:ALL/g' /etc/sudoers diff --git a/templates/ubuntu-12.10/scripts/update.sh b/templates/ubuntu-12.10/scripts/update.sh new file mode 100644 index 000000000..80e8dd3f9 --- /dev/null +++ b/templates/ubuntu-12.10/scripts/update.sh @@ -0,0 +1,15 @@ +#!/bin/bash -eux + +apt-get update +apt-get -y upgrade + +# ensure the correct kernel headers are installed +apt-get -y install linux-headers-$(uname -r) + +# update package index on boot +cat <<EOF > /etc/init/refresh-apt.conf +description "update package index" +start on networking +task +exec /usr/bin/apt-get update +EOF diff --git a/templates/ubuntu-12.10/scripts/vagrant.sh b/templates/ubuntu-12.10/scripts/vagrant.sh new file mode 100644 index 000000000..72dd2f444 --- /dev/null +++ b/templates/ubuntu-12.10/scripts/vagrant.sh @@ -0,0 +1,33 @@ +#!/bin/bash -eux + +if [ -f /home/vagrant/.vbox_version ]; then + mkdir /tmp/vbox + VER=$(cat /home/vagrant/.vbox_version) + mount -o loop VBoxGuestAdditions_$VER.iso /tmp/vbox + sh /tmp/vbox/VBoxLinuxAdditions.run + umount /tmp/vbox + rmdir /tmp/vbox + rm *.iso +fi + +if [ -f /home/vagrant/.vmfusion_version ]; then + #Set Linux-specific paths and ISO filename + home_dir="/home/vagrant" + iso_name="linux.iso" + mount_point="/tmp/vmware-tools" + #Run install, unmount ISO and remove it + mkdir ${mount_point} + cd ${home_dir} + /bin/mount -o loop ${iso_name} ${mount_point} + tar zxf ${mount_point}/*.tar.gz && cd vmware-tools-distrib && ./vmware-install.pl --default + /bin/umount ${mount_point} + /bin/rm -rf ${home_dir}/${iso_name} ${home_dir}/vmware-tools-distrib + rmdir ${mount_point} +fi + +mkdir /home/vagrant/.ssh +wget --no-check-certificate \ + 'https://github.com/mitchellh/vagrant/raw/master/keys/vagrant.pub' \ + -O /home/vagrant/.ssh/authorized_keys +chown -R vagrant /home/vagrant/.ssh +chmod -R go-rwsx /home/vagrant/.ssh diff --git a/templates/ubuntu-12.10/template.json b/templates/ubuntu-12.10/template.json new file mode 100644 index 000000000..ac8c456a4 --- /dev/null +++ b/templates/ubuntu-12.10/template.json @@ -0,0 +1,133 @@ +{ + "provisioners": [ + { + "type": "shell", + "scripts": [ + "scripts/update.sh", + "scripts/vagrant.sh", + "scripts/sshd.sh", + "scripts/networking.sh", + "scripts/sudoers.sh", + "scripts/cleanup.sh", + "scripts/minimize.sh" + ], + "override": { + "virtualbox": { + "execute_command": "echo 'vagrant'|sudo -S sh '{{.Path}}'" + }, + "vmware": { + "execute_command": "echo 'vagrant'|sudo -S sh '{{.Path}}'" + } + } + } + ], + "builders": [ + { + "type": "virtualbox", + "boot_command": [ + "<esc><wait>", + "<esc><wait>", + "<enter><wait>", + "/install/vmlinuz<wait>", + " auto<wait>", + " console-setup/ask_detect=false<wait>", + " console-setup/layoutcode=us<wait>", + " console-setup/modelcode=pc105<wait>", + " debconf/frontend=noninteractive<wait>", + " debian-installer=en_US<wait>", + " fb=false<wait>", + " initrd=/install/initrd.gz<wait>", + " kbd-chooser/method=us<wait>", + " keyboard-configuration/layout=USA<wait>", + " keyboard-configuration/variant=USA<wait>", + " locale=en_US<wait>", + " netcfg/get_domain=vm<wait>", + " netcfg/get_hostname=vagrant<wait>", + " noapic<wait>", + " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/preseed.cfg<wait>", + " -- <wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "guest_os_type": "Ubuntu", + "http_directory": "http", + "iso_checksum": "4bd3270bde86d7e4e017e3847a4af485", + "iso_checksum_type": "md5", + "iso_url": "http://releases.ubuntu.com/12.10/ubuntu-12.10-server-amd64.iso", + "ssh_username": "vagrant", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_wait_timeout": "10000s", + "shutdown_command": "echo 'shutdown -P now' > shutdown.sh; echo 'vagrant'|sudo -S sh 'shutdown.sh'", + "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "virtualbox_version_file": ".vbox_version", + "vboxmanage": [ + [ + "modifyvm", + "{{.Name}}", + "--memory", + "384" + ], + [ + "modifyvm", + "{{.Name}}", + "--cpus", + "1" + ] + ], + "iso_md5": "4bd3270bde86d7e4e017e3847a4af485" + }, + { + "type": "vmware", + "boot_command": [ + "<esc><wait>", + "<esc><wait>", + "<enter><wait>", + "/install/vmlinuz<wait>", + " auto<wait>", + " console-setup/ask_detect=false<wait>", + " console-setup/layoutcode=us<wait>", + " console-setup/modelcode=pc105<wait>", + " debconf/frontend=noninteractive<wait>", + " debian-installer=en_US<wait>", + " fb=false<wait>", + " initrd=/install/initrd.gz<wait>", + " kbd-chooser/method=us<wait>", + " keyboard-configuration/layout=USA<wait>", + " keyboard-configuration/variant=USA<wait>", + " locale=en_US<wait>", + " netcfg/get_domain=vm<wait>", + " netcfg/get_hostname=vagrant<wait>", + " noapic<wait>", + " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/preseed.cfg<wait>", + " -- <wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "guest_os_type": "ubuntu", + "http_directory": "http", + "iso_checksum": "4bd3270bde86d7e4e017e3847a4af485", + "iso_checksum_type": "md5", + "iso_url": "http://releases.ubuntu.com/12.10/ubuntu-12.10-server-amd64.iso", + "ssh_username": "vagrant", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_wait_timeout": "10000s", + "shutdown_command": "echo 'shutdown -P now' > shutdown.sh; echo 'vagrant'|sudo -S sh 'shutdown.sh'", + "vmx_data": { + "memsize": "384", + "numvcpus": "1", + "cpuid.coresPerSocket": "1" + }, + "iso_md5": "4bd3270bde86d7e4e017e3847a4af485" + } + ], + "post-provisioner": [ + { + "type": "vagrant", + "output": "ubuntu-12.10-{{.Provisioner}}.box" + } + ] +} \ No newline at end of file diff --git a/templates/ubuntu-13.04-i386/http/preseed.cfg b/templates/ubuntu-13.04-i386/http/preseed.cfg new file mode 100644 index 000000000..903f2e14b --- /dev/null +++ b/templates/ubuntu-13.04-i386/http/preseed.cfg @@ -0,0 +1,31 @@ +choose-mirror-bin mirror/http/proxy string +d-i base-installer/kernel/override-image string linux-server +d-i clock-setup/utc boolean true +d-i clock-setup/utc-auto boolean true +d-i finish-install/reboot_in_progress note +d-i grub-installer/only_debian boolean true +d-i grub-installer/with_other_os boolean true +d-i partman-auto-lvm/guided_size string max +d-i partman-auto/choose_recipe select atomic +d-i partman-auto/method string lvm +d-i partman-lvm/confirm boolean true +d-i partman-lvm/confirm boolean true +d-i partman-lvm/confirm_nooverwrite boolean true +d-i partman-lvm/device_remove_lvm boolean true +d-i partman/choose_partition select finish +d-i partman/confirm boolean true +d-i partman/confirm_nooverwrite boolean true +d-i partman/confirm_write_new_label boolean true +d-i passwd/user-fullname string vagrant +d-i passwd/user-uid string 900 +d-i passwd/user-password password vagrant +d-i passwd/user-password-again password vagrant +d-i passwd/username string vagrant +d-i pkgsel/include string openssh-server cryptsetup build-essential libssl-dev libreadline-dev zlib1g-dev linux-source dkms +d-i pkgsel/install-language-support boolean false +d-i pkgsel/update-policy select unattended-upgrades +d-i pkgsel/upgrade select full-upgrade +d-i time/zone string UTC +d-i user-setup/allow-password-weak boolean true +d-i user-setup/encrypt-home boolean false +tasksel tasksel/first multiselect standard, ubuntu-server diff --git a/templates/ubuntu-13.04-i386/scripts/cleanup.sh b/templates/ubuntu-13.04-i386/scripts/cleanup.sh new file mode 100644 index 000000000..6c7f703d6 --- /dev/null +++ b/templates/ubuntu-13.04-i386/scripts/cleanup.sh @@ -0,0 +1,6 @@ +#!/bin/bash -eux + +apt-get -y autoremove +apt-get -y clean +rm -rf VBoxGuestAdditions_*.iso VBoxGuestAdditions_*.iso.? +rm -f /tmp/chef*deb diff --git a/templates/ubuntu-13.04-i386/scripts/minimize.sh b/templates/ubuntu-13.04-i386/scripts/minimize.sh new file mode 100644 index 000000000..3846a1d65 --- /dev/null +++ b/templates/ubuntu-13.04-i386/scripts/minimize.sh @@ -0,0 +1,4 @@ +#!/bin/bash -eux + +dd if=/dev/zero of=/EMPTY bs=1M +rm -f /EMPTY diff --git a/templates/ubuntu-13.04-i386/scripts/networking.sh b/templates/ubuntu-13.04-i386/scripts/networking.sh new file mode 100644 index 000000000..de3269a58 --- /dev/null +++ b/templates/ubuntu-13.04-i386/scripts/networking.sh @@ -0,0 +1,7 @@ +#!/bin/bash -eux + +rm /etc/udev/rules.d/70-persistent-net.rules +mkdir /etc/udev/rules.d/70-persistent-net.rules +rm /lib/udev/rules.d/75-persistent-net-generator.rules +rm -rf /dev/.udev/ /var/lib/dhcp3/* +echo "pre-up sleep 2" >> /etc/network/interfaces diff --git a/templates/ubuntu-13.04-i386/scripts/sshd.sh b/templates/ubuntu-13.04-i386/scripts/sshd.sh new file mode 100644 index 000000000..c6e4f20a6 --- /dev/null +++ b/templates/ubuntu-13.04-i386/scripts/sshd.sh @@ -0,0 +1,3 @@ +#!/bin/bash -eux + +echo "UseDNS no" >> /etc/ssh/sshd_config diff --git a/templates/ubuntu-13.04-i386/scripts/sudoers.sh b/templates/ubuntu-13.04-i386/scripts/sudoers.sh new file mode 100644 index 000000000..5fce3dd2c --- /dev/null +++ b/templates/ubuntu-13.04-i386/scripts/sudoers.sh @@ -0,0 +1,4 @@ +#!/bin/bash -eux + +sed -i -e '/Defaults\s\+env_reset/a Defaults\texempt_group=sudo' /etc/sudoers +sed -i -e 's/%sudo ALL=(ALL:ALL) ALL/%sudo ALL=NOPASSWD:ALL/g' /etc/sudoers diff --git a/templates/ubuntu-13.04-i386/scripts/update.sh b/templates/ubuntu-13.04-i386/scripts/update.sh new file mode 100644 index 000000000..80e8dd3f9 --- /dev/null +++ b/templates/ubuntu-13.04-i386/scripts/update.sh @@ -0,0 +1,15 @@ +#!/bin/bash -eux + +apt-get update +apt-get -y upgrade + +# ensure the correct kernel headers are installed +apt-get -y install linux-headers-$(uname -r) + +# update package index on boot +cat <<EOF > /etc/init/refresh-apt.conf +description "update package index" +start on networking +task +exec /usr/bin/apt-get update +EOF diff --git a/templates/ubuntu-13.04-i386/scripts/vagrant.sh b/templates/ubuntu-13.04-i386/scripts/vagrant.sh new file mode 100644 index 000000000..72dd2f444 --- /dev/null +++ b/templates/ubuntu-13.04-i386/scripts/vagrant.sh @@ -0,0 +1,33 @@ +#!/bin/bash -eux + +if [ -f /home/vagrant/.vbox_version ]; then + mkdir /tmp/vbox + VER=$(cat /home/vagrant/.vbox_version) + mount -o loop VBoxGuestAdditions_$VER.iso /tmp/vbox + sh /tmp/vbox/VBoxLinuxAdditions.run + umount /tmp/vbox + rmdir /tmp/vbox + rm *.iso +fi + +if [ -f /home/vagrant/.vmfusion_version ]; then + #Set Linux-specific paths and ISO filename + home_dir="/home/vagrant" + iso_name="linux.iso" + mount_point="/tmp/vmware-tools" + #Run install, unmount ISO and remove it + mkdir ${mount_point} + cd ${home_dir} + /bin/mount -o loop ${iso_name} ${mount_point} + tar zxf ${mount_point}/*.tar.gz && cd vmware-tools-distrib && ./vmware-install.pl --default + /bin/umount ${mount_point} + /bin/rm -rf ${home_dir}/${iso_name} ${home_dir}/vmware-tools-distrib + rmdir ${mount_point} +fi + +mkdir /home/vagrant/.ssh +wget --no-check-certificate \ + 'https://github.com/mitchellh/vagrant/raw/master/keys/vagrant.pub' \ + -O /home/vagrant/.ssh/authorized_keys +chown -R vagrant /home/vagrant/.ssh +chmod -R go-rwsx /home/vagrant/.ssh diff --git a/templates/ubuntu-13.04-i386/template.json b/templates/ubuntu-13.04-i386/template.json new file mode 100644 index 000000000..46f137a61 --- /dev/null +++ b/templates/ubuntu-13.04-i386/template.json @@ -0,0 +1,133 @@ +{ + "provisioners": [ + { + "type": "shell", + "scripts": [ + "scripts/update.sh", + "scripts/vagrant.sh", + "scripts/sshd.sh", + "scripts/networking.sh", + "scripts/sudoers.sh", + "scripts/cleanup.sh", + "scripts/minimize.sh" + ], + "override": { + "virtualbox": { + "execute_command": "echo 'vagrant'|sudo -S sh '{{.Path}}'" + }, + "vmware": { + "execute_command": "echo 'vagrant'|sudo -S sh '{{.Path}}'" + } + } + } + ], + "builders": [ + { + "type": "virtualbox", + "boot_command": [ + "<esc><wait>", + "<esc><wait>", + "<enter><wait>", + "/install/vmlinuz<wait>", + " auto<wait>", + " console-setup/ask_detect=false<wait>", + " console-setup/layoutcode=us<wait>", + " console-setup/modelcode=pc105<wait>", + " debconf/frontend=noninteractive<wait>", + " debian-installer=en_US<wait>", + " fb=false<wait>", + " initrd=/install/initrd.gz<wait>", + " kbd-chooser/method=us<wait>", + " keyboard-configuration/layout=USA<wait>", + " keyboard-configuration/variant=USA<wait>", + " locale=en_US<wait>", + " netcfg/get_domain=vm<wait>", + " netcfg/get_hostname=vagrant<wait>", + " noapic<wait>", + " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/preseed.cfg<wait>", + " -- <wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "guest_os_type": "Ubuntu", + "http_directory": "http", + "iso_checksum": "73d595b804149fca9547ed94db8ff44f", + "iso_checksum_type": "md5", + "iso_url": "http://releases.ubuntu.com/13.04/ubuntu-13.04-server-i386.iso", + "ssh_username": "vagrant", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_wait_timeout": "10000s", + "shutdown_command": "echo 'shutdown -P now' > shutdown.sh; echo 'vagrant'|sudo -S sh 'shutdown.sh'", + "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "virtualbox_version_file": ".vbox_version", + "vboxmanage": [ + [ + "modifyvm", + "{{.Name}}", + "--memory", + "384" + ], + [ + "modifyvm", + "{{.Name}}", + "--cpus", + "1" + ] + ], + "iso_md5": "73d595b804149fca9547ed94db8ff44f" + }, + { + "type": "vmware", + "boot_command": [ + "<esc><wait>", + "<esc><wait>", + "<enter><wait>", + "/install/vmlinuz<wait>", + " auto<wait>", + " console-setup/ask_detect=false<wait>", + " console-setup/layoutcode=us<wait>", + " console-setup/modelcode=pc105<wait>", + " debconf/frontend=noninteractive<wait>", + " debian-installer=en_US<wait>", + " fb=false<wait>", + " initrd=/install/initrd.gz<wait>", + " kbd-chooser/method=us<wait>", + " keyboard-configuration/layout=USA<wait>", + " keyboard-configuration/variant=USA<wait>", + " locale=en_US<wait>", + " netcfg/get_domain=vm<wait>", + " netcfg/get_hostname=vagrant<wait>", + " noapic<wait>", + " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/preseed.cfg<wait>", + " -- <wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "guest_os_type": "ubuntu", + "http_directory": "http", + "iso_checksum": "73d595b804149fca9547ed94db8ff44f", + "iso_checksum_type": "md5", + "iso_url": "http://releases.ubuntu.com/13.04/ubuntu-13.04-server-i386.iso", + "ssh_username": "vagrant", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_wait_timeout": "10000s", + "shutdown_command": "echo 'shutdown -P now' > shutdown.sh; echo 'vagrant'|sudo -S sh 'shutdown.sh'", + "vmx_data": { + "memsize": "384", + "numvcpus": "1", + "cpuid.coresPerSocket": "1" + }, + "iso_md5": "73d595b804149fca9547ed94db8ff44f" + } + ], + "post-provisioner": [ + { + "type": "vagrant", + "output": "ubuntu-13.04-i386-{{.Provisioner}}.box" + } + ] +} \ No newline at end of file diff --git a/templates/ubuntu-13.04/http/preseed.cfg b/templates/ubuntu-13.04/http/preseed.cfg new file mode 100644 index 000000000..903f2e14b --- /dev/null +++ b/templates/ubuntu-13.04/http/preseed.cfg @@ -0,0 +1,31 @@ +choose-mirror-bin mirror/http/proxy string +d-i base-installer/kernel/override-image string linux-server +d-i clock-setup/utc boolean true +d-i clock-setup/utc-auto boolean true +d-i finish-install/reboot_in_progress note +d-i grub-installer/only_debian boolean true +d-i grub-installer/with_other_os boolean true +d-i partman-auto-lvm/guided_size string max +d-i partman-auto/choose_recipe select atomic +d-i partman-auto/method string lvm +d-i partman-lvm/confirm boolean true +d-i partman-lvm/confirm boolean true +d-i partman-lvm/confirm_nooverwrite boolean true +d-i partman-lvm/device_remove_lvm boolean true +d-i partman/choose_partition select finish +d-i partman/confirm boolean true +d-i partman/confirm_nooverwrite boolean true +d-i partman/confirm_write_new_label boolean true +d-i passwd/user-fullname string vagrant +d-i passwd/user-uid string 900 +d-i passwd/user-password password vagrant +d-i passwd/user-password-again password vagrant +d-i passwd/username string vagrant +d-i pkgsel/include string openssh-server cryptsetup build-essential libssl-dev libreadline-dev zlib1g-dev linux-source dkms +d-i pkgsel/install-language-support boolean false +d-i pkgsel/update-policy select unattended-upgrades +d-i pkgsel/upgrade select full-upgrade +d-i time/zone string UTC +d-i user-setup/allow-password-weak boolean true +d-i user-setup/encrypt-home boolean false +tasksel tasksel/first multiselect standard, ubuntu-server diff --git a/templates/ubuntu-13.04/new.json b/templates/ubuntu-13.04/new.json new file mode 100644 index 000000000..fe90ae035 --- /dev/null +++ b/templates/ubuntu-13.04/new.json @@ -0,0 +1,135 @@ +{ + "builders": [ + { + "boot_command": [ + "<esc><wait>", + "<esc><wait>", + "<enter><wait>", + "/install/vmlinuz<wait>", + " auto<wait>", + " console-setup/ask_detect=false<wait>", + " console-setup/layoutcode=us<wait>", + " console-setup/modelcode=pc105<wait>", + " debconf/frontend=noninteractive<wait>", + " debian-installer=en_US<wait>", + " fb=false<wait>", + " initrd=/install/initrd.gz<wait>", + " kbd-chooser/method=us<wait>", + " keyboard-configuration/layout=USA<wait>", + " keyboard-configuration/variant=USA<wait>", + " locale=en_US<wait>", + " netcfg/get_domain=vm<wait>", + " netcfg/get_hostname=vagrant<wait>", + " noapic<wait>", + " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/preseed.cfg<wait>", + " -- <wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "guest_os_type": "Ubuntu_64", + "http_directory": "http", + "iso_checksum": "7d335ca541fc4945b674459cde7bffb9", + "iso_checksum_type": "md5", + "iso_url": "http://releases.ubuntu.com/13.04/ubuntu-13.04-server-amd64.iso", + "shutdown_command": "echo 'shutdown -P now' > shutdown.sh; echo 'vagrant'|sudo -S sh 'shutdown.sh'", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "virtualbox", + "vboxmanage": [ + [ + "modifyvm", + "{{.Name}}", + "--memory", + "384" + ], + [ + "modifyvm", + "{{.Name}}", + "--cpus", + "1" + ] + ], + "virtualbox_version_file": ".vbox_version" + }, + { + "boot_command": [ + "<esc><wait>", + "<esc><wait>", + "<enter><wait>", + "/install/vmlinuz<wait>", + " auto<wait>", + " console-setup/ask_detect=false<wait>", + " console-setup/layoutcode=us<wait>", + " console-setup/modelcode=pc105<wait>", + " debconf/frontend=noninteractive<wait>", + " debian-installer=en_US<wait>", + " fb=false<wait>", + " initrd=/install/initrd.gz<wait>", + " kbd-chooser/method=us<wait>", + " keyboard-configuration/layout=USA<wait>", + " keyboard-configuration/variant=USA<wait>", + " locale=en_US<wait>", + " netcfg/get_domain=vm<wait>", + " netcfg/get_hostname=vagrant<wait>", + " noapic<wait>", + " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/preseed.cfg<wait>", + " -- <wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "guest_os_type": "ubuntu-64", + "headless": true, + "http_directory": "http", + "iso_checksum": "7d335ca541fc4945b674459cde7bffb9", + "iso_checksum_type": "md5", + "iso_url": "http://releases.ubuntu.com/13.04/ubuntu-13.04-server-amd64.iso", + "shutdown_command": "echo 'shutdown -P now' > shutdown.sh; echo 'vagrant'|sudo -S sh 'shutdown.sh'", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "tools_upload_flavor": "darwin", + "tools_upload_path": "./common/{{.Flavor}}.iso", + "type": "vmware", + "vmx_data": { + "cpuid.coresPerSocket": "1", + "memsize": "384", + "numvcpus": "1" + } + } + ], + "post-provisioner": [ + { + "output": "ubuntu-13.04-{{.Provisioner}}.box", + "type": "vagrant" + } + ], + "provisioners": [ + { + "override": { + "virtualbox": { + "execute_command": "echo 'vagrant'|sudo -S sh '{{.Path}}'" + }, + "vmware": { + "execute_command": "echo 'vagrant'|sudo -S sh '{{.Path}}'" + } + }, + "scripts": [ + "scripts/update.sh", + "scripts/vagrant.sh", + "scripts/sshd.sh", + "scripts/networking.sh", + "scripts/sudoers.sh", + "scripts/cleanup.sh", + "scripts/minimize.sh" + ], + "type": "shell" + } + ] +} + diff --git a/templates/ubuntu-13.04/scripts/cleanup.sh b/templates/ubuntu-13.04/scripts/cleanup.sh new file mode 100644 index 000000000..6c7f703d6 --- /dev/null +++ b/templates/ubuntu-13.04/scripts/cleanup.sh @@ -0,0 +1,6 @@ +#!/bin/bash -eux + +apt-get -y autoremove +apt-get -y clean +rm -rf VBoxGuestAdditions_*.iso VBoxGuestAdditions_*.iso.? +rm -f /tmp/chef*deb diff --git a/templates/ubuntu-13.04/scripts/minimize.sh b/templates/ubuntu-13.04/scripts/minimize.sh new file mode 100644 index 000000000..3846a1d65 --- /dev/null +++ b/templates/ubuntu-13.04/scripts/minimize.sh @@ -0,0 +1,4 @@ +#!/bin/bash -eux + +dd if=/dev/zero of=/EMPTY bs=1M +rm -f /EMPTY diff --git a/templates/ubuntu-13.04/scripts/networking.sh b/templates/ubuntu-13.04/scripts/networking.sh new file mode 100644 index 000000000..de3269a58 --- /dev/null +++ b/templates/ubuntu-13.04/scripts/networking.sh @@ -0,0 +1,7 @@ +#!/bin/bash -eux + +rm /etc/udev/rules.d/70-persistent-net.rules +mkdir /etc/udev/rules.d/70-persistent-net.rules +rm /lib/udev/rules.d/75-persistent-net-generator.rules +rm -rf /dev/.udev/ /var/lib/dhcp3/* +echo "pre-up sleep 2" >> /etc/network/interfaces diff --git a/templates/ubuntu-13.04/scripts/sshd.sh b/templates/ubuntu-13.04/scripts/sshd.sh new file mode 100644 index 000000000..c6e4f20a6 --- /dev/null +++ b/templates/ubuntu-13.04/scripts/sshd.sh @@ -0,0 +1,3 @@ +#!/bin/bash -eux + +echo "UseDNS no" >> /etc/ssh/sshd_config diff --git a/templates/ubuntu-13.04/scripts/sudoers.sh b/templates/ubuntu-13.04/scripts/sudoers.sh new file mode 100644 index 000000000..5fce3dd2c --- /dev/null +++ b/templates/ubuntu-13.04/scripts/sudoers.sh @@ -0,0 +1,4 @@ +#!/bin/bash -eux + +sed -i -e '/Defaults\s\+env_reset/a Defaults\texempt_group=sudo' /etc/sudoers +sed -i -e 's/%sudo ALL=(ALL:ALL) ALL/%sudo ALL=NOPASSWD:ALL/g' /etc/sudoers diff --git a/templates/ubuntu-13.04/scripts/update.sh b/templates/ubuntu-13.04/scripts/update.sh new file mode 100644 index 000000000..80e8dd3f9 --- /dev/null +++ b/templates/ubuntu-13.04/scripts/update.sh @@ -0,0 +1,15 @@ +#!/bin/bash -eux + +apt-get update +apt-get -y upgrade + +# ensure the correct kernel headers are installed +apt-get -y install linux-headers-$(uname -r) + +# update package index on boot +cat <<EOF > /etc/init/refresh-apt.conf +description "update package index" +start on networking +task +exec /usr/bin/apt-get update +EOF diff --git a/templates/ubuntu-13.04/scripts/vagrant.sh b/templates/ubuntu-13.04/scripts/vagrant.sh new file mode 100644 index 000000000..72dd2f444 --- /dev/null +++ b/templates/ubuntu-13.04/scripts/vagrant.sh @@ -0,0 +1,33 @@ +#!/bin/bash -eux + +if [ -f /home/vagrant/.vbox_version ]; then + mkdir /tmp/vbox + VER=$(cat /home/vagrant/.vbox_version) + mount -o loop VBoxGuestAdditions_$VER.iso /tmp/vbox + sh /tmp/vbox/VBoxLinuxAdditions.run + umount /tmp/vbox + rmdir /tmp/vbox + rm *.iso +fi + +if [ -f /home/vagrant/.vmfusion_version ]; then + #Set Linux-specific paths and ISO filename + home_dir="/home/vagrant" + iso_name="linux.iso" + mount_point="/tmp/vmware-tools" + #Run install, unmount ISO and remove it + mkdir ${mount_point} + cd ${home_dir} + /bin/mount -o loop ${iso_name} ${mount_point} + tar zxf ${mount_point}/*.tar.gz && cd vmware-tools-distrib && ./vmware-install.pl --default + /bin/umount ${mount_point} + /bin/rm -rf ${home_dir}/${iso_name} ${home_dir}/vmware-tools-distrib + rmdir ${mount_point} +fi + +mkdir /home/vagrant/.ssh +wget --no-check-certificate \ + 'https://github.com/mitchellh/vagrant/raw/master/keys/vagrant.pub' \ + -O /home/vagrant/.ssh/authorized_keys +chown -R vagrant /home/vagrant/.ssh +chmod -R go-rwsx /home/vagrant/.ssh diff --git a/templates/ubuntu-13.04/template.json b/templates/ubuntu-13.04/template.json new file mode 100644 index 000000000..c87744a70 --- /dev/null +++ b/templates/ubuntu-13.04/template.json @@ -0,0 +1,136 @@ +{ + "provisioners": [ + { + "type": "shell", + "scripts": [ + "scripts/update.sh", + "scripts/vagrant.sh", + "scripts/sshd.sh", + "scripts/networking.sh", + "scripts/sudoers.sh", + "scripts/cleanup.sh", + "scripts/minimize.sh" + ], + "override": { + "virtualbox": { + "execute_command": "echo 'vagrant'|sudo -S sh '{{.Path}}'" + }, + "vmware": { + "execute_command": "echo 'vagrant'|sudo -S sh '{{.Path}}'" + } + } + } + ], + "builders": [ + { + "type": "virtualbox", + "boot_command": [ + "<esc><wait>", + "<esc><wait>", + "<enter><wait>", + "/install/vmlinuz<wait>", + " auto<wait>", + " console-setup/ask_detect=false<wait>", + " console-setup/layoutcode=us<wait>", + " console-setup/modelcode=pc105<wait>", + " debconf/frontend=noninteractive<wait>", + " debian-installer=en_US<wait>", + " fb=false<wait>", + " initrd=/install/initrd.gz<wait>", + " kbd-chooser/method=us<wait>", + " keyboard-configuration/layout=USA<wait>", + " keyboard-configuration/variant=USA<wait>", + " locale=en_US<wait>", + " netcfg/get_domain=vm<wait>", + " netcfg/get_hostname=vagrant<wait>", + " noapic<wait>", + " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/preseed.cfg<wait>", + " -- <wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "guest_os_type": "Ubuntu_64", + "http_directory": "http", + "iso_checksum": "7d335ca541fc4945b674459cde7bffb9", + "iso_checksum_type": "md5", + "iso_url": "http://releases.ubuntu.com/13.04/ubuntu-13.04-server-amd64.iso", + "ssh_username": "vagrant", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_wait_timeout": "10000s", + "shutdown_command": "echo 'shutdown -P now' > shutdown.sh; echo 'vagrant'|sudo -S sh 'shutdown.sh'", + "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "virtualbox_version_file": ".vbox_version", + "vboxmanage": [ + [ + "modifyvm", + "{{.Name}}", + "--memory", + "384" + ], + [ + "modifyvm", + "{{.Name}}", + "--cpus", + "1" + ] + ], + "iso_md5": "7d335ca541fc4945b674459cde7bffb9" + }, + { + "type": "vmware", + "boot_command": [ + "<esc><wait>", + "<esc><wait>", + "<enter><wait>", + "/install/vmlinuz<wait>", + " auto<wait>", + " console-setup/ask_detect=false<wait>", + " console-setup/layoutcode=us<wait>", + " console-setup/modelcode=pc105<wait>", + " debconf/frontend=noninteractive<wait>", + " debian-installer=en_US<wait>", + " fb=false<wait>", + " initrd=/install/initrd.gz<wait>", + " kbd-chooser/method=us<wait>", + " keyboard-configuration/layout=USA<wait>", + " keyboard-configuration/variant=USA<wait>", + " locale=en_US<wait>", + " netcfg/get_domain=vm<wait>", + " netcfg/get_hostname=vagrant<wait>", + " noapic<wait>", + " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/preseed.cfg<wait>", + " -- <wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "headless": true, + "tools_upload_flavor": "darwin", + "tools_upload_path": "./common/{{.Flavor}}.iso", + "guest_os_type": "ubuntu-64", + "http_directory": "http", + "iso_checksum": "7d335ca541fc4945b674459cde7bffb9", + "iso_checksum_type": "md5", + "iso_url": "http://releases.ubuntu.com/13.04/ubuntu-13.04-server-amd64.iso", + "ssh_username": "vagrant", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_wait_timeout": "10000s", + "shutdown_command": "echo 'shutdown -P now' > shutdown.sh; echo 'vagrant'|sudo -S sh 'shutdown.sh'", + "vmx_data": { + "memsize": "384", + "numvcpus": "1", + "cpuid.coresPerSocket": "1" + }, + "iso_md5": "7d335ca541fc4945b674459cde7bffb9" + } + ], + "post-provisioner": [ + { + "type": "vagrant", + "output": "ubuntu-13.04-{{.Provisioner}}.box" + } + ] +} From fd92d8097f6b135d5c02ff3871c3afcb704cab62 Mon Sep 17 00:00:00 2001 From: "Julian C. Dunn" <jdunn@opscode.com> Date: Mon, 30 Sep 2013 13:13:15 -0400 Subject: [PATCH 0076/1622] Fixup readme for packer --- README.md | 89 +++++++++---------------------------------------------- 1 file changed, 14 insertions(+), 75 deletions(-) diff --git a/README.md b/README.md index 8dc89877e..e0ec643a4 100644 --- a/README.md +++ b/README.md @@ -100,89 +100,26 @@ The following base boxes were built with Chef 10.14.4. # Getting Started -First, clone the project, then install the required Gems with Bundler. +First, install [Packer](http://packer.io) and then clone this project. - $ git clone git://github.com/opscode/bento.git - $ cd bento - $ bundle install +Inside the ``packer`` directory, a JSON file describes each box that can be built. You can use ``packer build`` to build the +boxes. -List available baseboxes that can be built: + $ packer build debian-7.1.0-i386.json - $ bundle exec veewee vbox list +If you only have VMware or VirtualBox available, you may also tell Packer to build only that box. -Build, for example, the ubuntu-12.04 basebox. + $ packer build -only=virtualbox debian-7.1.0-i386.json - $ bundle exec veewee vbox build ubuntu-12.04 +Congratulations! You now have `./debian-7.1.0-i386-virtualbox.box` and `./debian-7.1.0-i386-vmware.box`, fully-functional +baseboxes that you can then add to Vagrant and start testing cookbooks. -You can validate the basebox using Veewee's built in validator. -However note that the test for Ruby (and Puppet) will fail. The Ruby -installation is in `/opt/chef/embedded`, and we do not add the bin -directory to the `$PATH`, and we don't use Puppet internally. +# Legacy Veewee Definitions - $ bundle exec veewee vbox validate ubuntu-12.04 +The legacy veewee definitions are still in the "definitions" directory. These are unsupported and will be removed in the future. -Aside from that, the basebox should be ready to use. Export it: - - $ bundle exec veewee vbox export ubuntu-12.04 - -Congratulations! You now have `./ubuntu-12.04.box`, a fully functional -basebox that you can then add to Vagrant and start testing cookbooks. - -# How It Works - -Veewee reads the definition specified and automatically builds a -VirtualBox machine. The VirtualBox guest additions and the target OS -ISO are downloaded into the `iso/` directory. - -We use Veewee version 0.3.0.alpha+ because it contains fixes for -building CentOS boxes under certain circumstances. - -# Definitions - -The definitions themselves are split up into directories that get -symlinked into specific basebox directories. - -Most of the files are symlinked for a particular box. The one -exception is the `definition.rb` file, which contains the specific -configuration for the Veewee session for a basebox, including the ISO -filename, its source URL, and the MD5 checksum of the file. - -## Common - -* `chef-client.sh`: Installs Chef and Ruby with - [Opscode's full stack installer](http://opscode.com/chef/install) -* `minimize.sh`: Zeroes out the root disk to reduce file size of the box -* `ruby.sh`: **Deprecated** Use `chef-client.sh` -* `session.rb`: Baseline session settings for Veewee -* `sshd.sh`: Adds some sshd configs to speed up vagrant -* `vagrant.sh`: Installs VirtualBox Guest Additions, adds the Vagrant - SSH key - -## CentOS - -* `cleanup.sh`: Removes unneeded packages, cleans up package cache, - and removes the VBox ISO and Chef rpm -* `ks.cfg`: Kickstart file for automated OS installation -* `session.rb`: General CentOS session settings for Veewee - -## Ubuntu - -* `cleanup.sh`: Removes unneeded packages, cleans up package cache, - and removes the VBox ISO and Chef deb -* `networking.sh`: Removes networking setup like udev that may - interfere with Vagrant network setup -* `preseed.cfg`: The Debian Preseed file for automated OS installation -* `session.rb`: General Ubuntu session settings for Veewee -* `sudoers.sh`: Customization for `/etc/sudoers` -* `update.sh`: Ensures that the OS installation is updated - -## Windows - -* `install-chef.bat`: Installs Chef and Ruby with - [Opscode's full stack installer](http://opscode.com/chef/install) -* `oracle-cert.cer`: Needed for automated install via install-vbox.bat -* `install-vbox.bat`: Installs VirtualBox Guest Additions -* `mount-validation.bat`: Mounts the validation drive +Packer does not yet support Windows, so the veewee definitions are still used for building those boxes. You must build these +boxes yourself due to licensing constraints. Bugs and Issues =============== @@ -205,6 +142,8 @@ License and Authors - Author:: Tim Dysinger (<tim@dysinger.net>) - Author:: Chris McClimans (<chris@hippiehacker.org>) - Author:: Julian Dunn (<jdunn@opscode.com>) +- Author:: Tom Duffield (<tom@opscode.com>) +- Author:: Ross Timson (<ross@rosstimson.com>) Copyright:: 2012-2013, Opscode, Inc (<legal@opscode.com>) Copyright:: 2011-2012, Tim Dysinger (<tim@dysinger.net>) From 7418da4f5b4c340dba644da7960e68b0355a4fce Mon Sep 17 00:00:00 2001 From: Matt Whiteley <mwhiteley@engineyard.com> Date: Mon, 30 Sep 2013 12:55:10 -0700 Subject: [PATCH 0077/1622] Since the 12.04 release, Ubuntu uses the more standard "sudo" group --- packer/ubuntu-12.04-amd64.json | 2 +- packer/ubuntu-12.04-i386.json | 2 +- packer/ubuntu-12.10-amd64.json | 2 +- packer/ubuntu-12.10-i386.json | 2 +- packer/ubuntu-13.04-amd64.json | 2 +- packer/ubuntu-13.04-i386.json | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/packer/ubuntu-12.04-amd64.json b/packer/ubuntu-12.04-amd64.json index ff3b87834..8db1e7495 100644 --- a/packer/ubuntu-12.04-amd64.json +++ b/packer/ubuntu-12.04-amd64.json @@ -122,7 +122,7 @@ "scripts/ubuntu/update.sh", "scripts/common/sshd.sh", "scripts/ubuntu/networking.sh", - "scripts/ubuntu/sudoers.sh", + "scripts/common/sudoers.sh", "scripts/common/vagrant.sh", "scripts/common/vmtools.sh", "scripts/ubuntu/cleanup.sh", diff --git a/packer/ubuntu-12.04-i386.json b/packer/ubuntu-12.04-i386.json index 9c2064a25..bec63d7a1 100644 --- a/packer/ubuntu-12.04-i386.json +++ b/packer/ubuntu-12.04-i386.json @@ -122,7 +122,7 @@ "scripts/ubuntu/update.sh", "scripts/common/sshd.sh", "scripts/ubuntu/networking.sh", - "scripts/ubuntu/sudoers.sh", + "scripts/common/sudoers.sh", "scripts/common/vagrant.sh", "scripts/common/vmtools.sh", "scripts/ubuntu/cleanup.sh", diff --git a/packer/ubuntu-12.10-amd64.json b/packer/ubuntu-12.10-amd64.json index 7be1367a0..86022dfdb 100644 --- a/packer/ubuntu-12.10-amd64.json +++ b/packer/ubuntu-12.10-amd64.json @@ -122,7 +122,7 @@ "scripts/ubuntu/update.sh", "scripts/common/sshd.sh", "scripts/ubuntu/networking.sh", - "scripts/ubuntu/sudoers.sh", + "scripts/common/sudoers.sh", "scripts/common/vagrant.sh", "scripts/common/vmtools.sh", "scripts/ubuntu/cleanup.sh", diff --git a/packer/ubuntu-12.10-i386.json b/packer/ubuntu-12.10-i386.json index 06efb331d..9c30208f5 100644 --- a/packer/ubuntu-12.10-i386.json +++ b/packer/ubuntu-12.10-i386.json @@ -122,7 +122,7 @@ "scripts/ubuntu/update.sh", "scripts/common/sshd.sh", "scripts/ubuntu/networking.sh", - "scripts/ubuntu/sudoers.sh", + "scripts/common/sudoers.sh", "scripts/common/vagrant.sh", "scripts/common/vmtools.sh", "scripts/ubuntu/cleanup.sh", diff --git a/packer/ubuntu-13.04-amd64.json b/packer/ubuntu-13.04-amd64.json index e429bab2f..061d40e41 100644 --- a/packer/ubuntu-13.04-amd64.json +++ b/packer/ubuntu-13.04-amd64.json @@ -123,7 +123,7 @@ "scripts/ubuntu/update.sh", "scripts/common/sshd.sh", "scripts/ubuntu/networking.sh", - "scripts/ubuntu/sudoers.sh", + "scripts/common/sudoers.sh", "scripts/common/vagrant.sh", "scripts/common/vmtools.sh", "scripts/ubuntu/cleanup.sh", diff --git a/packer/ubuntu-13.04-i386.json b/packer/ubuntu-13.04-i386.json index edb80c241..703d1126b 100644 --- a/packer/ubuntu-13.04-i386.json +++ b/packer/ubuntu-13.04-i386.json @@ -122,7 +122,7 @@ "scripts/ubuntu/update.sh", "scripts/common/sshd.sh", "scripts/ubuntu/networking.sh", - "scripts/ubuntu/sudoers.sh", + "scripts/common/sudoers.sh", "scripts/common/vagrant.sh", "scripts/common/vmtools.sh", "scripts/ubuntu/cleanup.sh", From 15a432962125905112a3fb14efaec8762366e2b8 Mon Sep 17 00:00:00 2001 From: Tom Duffield <tom@opscode.com> Date: Mon, 30 Sep 2013 15:56:04 -0500 Subject: [PATCH 0078/1622] removed name field from all templates --- packer/centos-5.9-i386.json | 2 -- packer/centos-5.9-x86_64.json | 2 -- packer/centos-6.4-i386.json | 2 -- packer/centos-6.4-x86_64.json | 2 -- packer/debian-6.0.7-amd64.json | 2 -- packer/debian-6.0.7-i386.json | 2 -- packer/debian-7.1.0-amd64.json | 2 -- packer/debian-7.1.0-i386.json | 2 -- packer/fedora-18-i386.json | 2 -- packer/fedora-18-x86_64.json | 2 -- packer/fedora-19-i386.json | 2 -- packer/fedora-19-x86_64.json | 2 -- packer/fedora-20-i386.json | 2 -- packer/fedora-20-x86_64.json | 2 -- packer/ubuntu-10.04-amd64.json | 2 -- packer/ubuntu-10.04-i386.json | 2 -- packer/ubuntu-12.04-amd64.json | 2 -- packer/ubuntu-12.04-i386.json | 2 -- packer/ubuntu-12.10-amd64.json | 2 -- packer/ubuntu-12.10-i386.json | 2 -- packer/ubuntu-13.04-amd64.json | 2 -- packer/ubuntu-13.04-i386.json | 2 -- 22 files changed, 44 deletions(-) diff --git a/packer/centos-5.9-i386.json b/packer/centos-5.9-i386.json index 34451b0a9..ae4255d2d 100644 --- a/packer/centos-5.9-i386.json +++ b/packer/centos-5.9-i386.json @@ -17,7 +17,6 @@ "ssh_port": 22, "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", - "name": "centos-5.9-i386-vbox", "type": "virtualbox", "vboxmanage": [ [ @@ -51,7 +50,6 @@ "ssh_port": 22, "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", - "name": "centos-5.9-i386-vmware", "type": "vmware", "vmx_data": { "cpuid.coresPerSocket": "1", diff --git a/packer/centos-5.9-x86_64.json b/packer/centos-5.9-x86_64.json index 0c59885ba..9a915ce5e 100644 --- a/packer/centos-5.9-x86_64.json +++ b/packer/centos-5.9-x86_64.json @@ -17,7 +17,6 @@ "ssh_port": 22, "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", - "name": "centos-5.9-x86_64-vbox", "type": "virtualbox", "vboxmanage": [ [ @@ -51,7 +50,6 @@ "ssh_port": 22, "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", - "name": "centos-5.9-x86_64-vmware", "type": "vmware", "vmx_data": { "cpuid.coresPerSocket": "1", diff --git a/packer/centos-6.4-i386.json b/packer/centos-6.4-i386.json index 17fd3fba7..bbeab0efe 100644 --- a/packer/centos-6.4-i386.json +++ b/packer/centos-6.4-i386.json @@ -17,7 +17,6 @@ "ssh_port": 22, "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", - "name": "centos-6.4-i386-vbox", "type": "virtualbox", "vboxmanage": [ [ @@ -51,7 +50,6 @@ "ssh_port": 22, "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", - "name": "centos-6.4-i386-vmware", "type": "vmware", "vmx_data": { "cpuid.coresPerSocket": "1", diff --git a/packer/centos-6.4-x86_64.json b/packer/centos-6.4-x86_64.json index 91793e431..9cc5a8893 100644 --- a/packer/centos-6.4-x86_64.json +++ b/packer/centos-6.4-x86_64.json @@ -17,7 +17,6 @@ "ssh_port": 22, "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", - "name": "centos-6.4-x86_64-vbox", "type": "virtualbox", "vboxmanage": [ [ @@ -51,7 +50,6 @@ "ssh_port": 22, "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", - "name": "centos-6.4-x86_64-vmware", "type": "vmware", "vmx_data": { "cpuid.coresPerSocket": "1", diff --git a/packer/debian-6.0.7-amd64.json b/packer/debian-6.0.7-amd64.json index f8c7c4d3b..cd68c5271 100644 --- a/packer/debian-6.0.7-amd64.json +++ b/packer/debian-6.0.7-amd64.json @@ -1,7 +1,6 @@ { "builders": [ { - "name": "debian-6.0.7-amd64-vbox", "type": "virtualbox", "boot_command": [ "<esc><wait>", @@ -50,7 +49,6 @@ ] }, { - "name": "debian-6.0.7-amd64-vmware", "type": "vmware", "boot_command": [ "<esc><wait>", diff --git a/packer/debian-6.0.7-i386.json b/packer/debian-6.0.7-i386.json index 9afee678c..ff3c32cb6 100644 --- a/packer/debian-6.0.7-i386.json +++ b/packer/debian-6.0.7-i386.json @@ -1,7 +1,6 @@ { "builders": [ { - "name": "debian-6.0.7-i386-vbox", "type": "virtualbox", "boot_command": [ "<esc><wait>", @@ -50,7 +49,6 @@ ] }, { - "name": "debian-6.0.7-i386-vmware", "type": "vmware", "boot_command": [ "<esc><wait>", diff --git a/packer/debian-7.1.0-amd64.json b/packer/debian-7.1.0-amd64.json index 8d6d368dd..99d560862 100644 --- a/packer/debian-7.1.0-amd64.json +++ b/packer/debian-7.1.0-amd64.json @@ -1,7 +1,6 @@ { "builders": [ { - "name": "debian-7.1.0-amd64-vbox", "type": "virtualbox", "boot_command": [ "<esc><wait>", @@ -50,7 +49,6 @@ ] }, { - "name": "debian-7.1.0-amd64-vmware", "type": "vmware", "boot_command": [ "<esc><wait>", diff --git a/packer/debian-7.1.0-i386.json b/packer/debian-7.1.0-i386.json index 4648fd4e6..fb1626616 100644 --- a/packer/debian-7.1.0-i386.json +++ b/packer/debian-7.1.0-i386.json @@ -1,7 +1,6 @@ { "builders": [ { - "name": "debian-7.1.0-i386-vbox", "type": "virtualbox", "boot_command": [ "<esc><wait>", @@ -50,7 +49,6 @@ ] }, { - "name": "debian-7.1.0-i386-vmware", "type": "vmware", "boot_command": [ "<esc><wait>", diff --git a/packer/fedora-18-i386.json b/packer/fedora-18-i386.json index 7a07bdf4f..b0dd14d05 100644 --- a/packer/fedora-18-i386.json +++ b/packer/fedora-18-i386.json @@ -17,7 +17,6 @@ "ssh_port": 22, "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", - "name": "fedora-18-i386-vbox", "type": "virtualbox", "vboxmanage": [ [ @@ -53,7 +52,6 @@ "ssh_wait_timeout": "10000s", "tools_upload_flavor": "linux", "tools_upload_path": "/home/vagrant/vmware_tools.iso", - "name": "fedora-18-i386-vmware", "type": "vmware", "vmx_data": { "cpuid.coresPerSocket": "1", diff --git a/packer/fedora-18-x86_64.json b/packer/fedora-18-x86_64.json index b77a5bb9d..f770047fc 100644 --- a/packer/fedora-18-x86_64.json +++ b/packer/fedora-18-x86_64.json @@ -17,7 +17,6 @@ "ssh_port": 22, "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", - "name": "fedora-18-x86_64-vbox", "type": "virtualbox", "vboxmanage": [ [ @@ -53,7 +52,6 @@ "ssh_wait_timeout": "10000s", "tools_upload_flavor": "linux", "tools_upload_path": "/home/vagrant/vmware_tools.iso", - "name": "fedora-18-x86_64-vmware", "type": "vmware", "vmx_data": { "cpuid.coresPerSocket": "1", diff --git a/packer/fedora-19-i386.json b/packer/fedora-19-i386.json index d1bdaa9b2..06ca3f3aa 100644 --- a/packer/fedora-19-i386.json +++ b/packer/fedora-19-i386.json @@ -17,7 +17,6 @@ "ssh_port": 22, "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", - "name": "fedora-19-i386-vbox", "type": "virtualbox", "vboxmanage": [ [ @@ -51,7 +50,6 @@ "ssh_port": 22, "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", - "name": "fedora-19-i386-vmware", "type": "vmware", "vmx_data": { "cpuid.coresPerSocket": "1", diff --git a/packer/fedora-19-x86_64.json b/packer/fedora-19-x86_64.json index 42646ca4e..f700502cc 100644 --- a/packer/fedora-19-x86_64.json +++ b/packer/fedora-19-x86_64.json @@ -17,7 +17,6 @@ "ssh_port": 22, "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", - "name": "fedora-19-x86_64-vbox", "type": "virtualbox", "vboxmanage": [ [ @@ -51,7 +50,6 @@ "ssh_port": 22, "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", - "name": "fedora-19-x86_64-vmware", "type": "vmware", "vmx_data": { "cpuid.coresPerSocket": "1", diff --git a/packer/fedora-20-i386.json b/packer/fedora-20-i386.json index d2c5e1c5e..4bae4cfee 100644 --- a/packer/fedora-20-i386.json +++ b/packer/fedora-20-i386.json @@ -17,7 +17,6 @@ "ssh_port": 22, "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", - "name": "fedora-20-i386-vbox", "type": "virtualbox", "vboxmanage": [ [ @@ -51,7 +50,6 @@ "ssh_port": 22, "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", - "name": "fedora-19-i386-vmware", "type": "vmware", "vmx_data": { "cpuid.coresPerSocket": "1", diff --git a/packer/fedora-20-x86_64.json b/packer/fedora-20-x86_64.json index b744ad31f..995a018b7 100644 --- a/packer/fedora-20-x86_64.json +++ b/packer/fedora-20-x86_64.json @@ -17,7 +17,6 @@ "ssh_port": 22, "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", - "name": "fedora-20-x86_64-vbox", "type": "virtualbox", "vboxmanage": [ [ @@ -51,7 +50,6 @@ "ssh_port": 22, "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", - "name": "fedora-20-x86_64-vmware", "type": "vmware", "vmx_data": { "cpuid.coresPerSocket": "1", diff --git a/packer/ubuntu-10.04-amd64.json b/packer/ubuntu-10.04-amd64.json index 9d10a50af..956590a1b 100644 --- a/packer/ubuntu-10.04-amd64.json +++ b/packer/ubuntu-10.04-amd64.json @@ -38,7 +38,6 @@ "ssh_port": 22, "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", - "name": "ubuntu-10.04-amd64-vbox", "type": "virtualbox", "vboxmanage": [ [ @@ -95,7 +94,6 @@ "ssh_wait_timeout": "10000s", "tools_upload_flavor": "linux", "tools_upload_path": "/home/vagrant/vmware_tools.iso", - "name": "ubuntu-10.04-amd64-vmware", "type": "vmware", "vmx_data": { "cpuid.coresPerSocket": "1", diff --git a/packer/ubuntu-10.04-i386.json b/packer/ubuntu-10.04-i386.json index 2884b7973..7e252f92e 100644 --- a/packer/ubuntu-10.04-i386.json +++ b/packer/ubuntu-10.04-i386.json @@ -38,7 +38,6 @@ "ssh_port": 22, "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", - "name": "ubuntu-10.04-i386-vbox", "type": "virtualbox", "vboxmanage": [ [ @@ -95,7 +94,6 @@ "ssh_wait_timeout": "10000s", "tools_upload_flavor": "linux", "tools_upload_path": "/home/vagrant/vmware_tools.iso", - "name": "ubuntu-10.04-i386-vmware", "type": "vmware", "vmx_data": { "cpuid.coresPerSocket": "1", diff --git a/packer/ubuntu-12.04-amd64.json b/packer/ubuntu-12.04-amd64.json index ff3b87834..7614296c6 100644 --- a/packer/ubuntu-12.04-amd64.json +++ b/packer/ubuntu-12.04-amd64.json @@ -2,7 +2,6 @@ "builders": [ { "type": "virtualbox", - "name": "ubuntu-12.04-amd64-vbox", "boot_command": [ "<esc><wait>", "<esc><wait>", @@ -95,7 +94,6 @@ "ssh_wait_timeout": "10000s", "tools_upload_flavor": "linux", "tools_upload_path": "/home/vagrant/vmware_tools.iso", - "name": "ubuntu-12.04-amd64-vmware", "type": "vmware", "vmx_data": { "cpuid.coresPerSocket": "1", diff --git a/packer/ubuntu-12.04-i386.json b/packer/ubuntu-12.04-i386.json index 9c2064a25..44ecea303 100644 --- a/packer/ubuntu-12.04-i386.json +++ b/packer/ubuntu-12.04-i386.json @@ -38,7 +38,6 @@ "ssh_port": 22, "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", - "name": "ubuntu-12.04-i386-vbox", "type": "virtualbox", "vboxmanage": [ [ @@ -95,7 +94,6 @@ "ssh_wait_timeout": "10000s", "tools_upload_flavor": "linux", "tools_upload_path": "/home/vagrant/vmware_tools.iso", - "name": "ubuntu-12.04-i386-vmware", "type": "vmware", "vmx_data": { "cpuid.coresPerSocket": "1", diff --git a/packer/ubuntu-12.10-amd64.json b/packer/ubuntu-12.10-amd64.json index 7be1367a0..f67208171 100644 --- a/packer/ubuntu-12.10-amd64.json +++ b/packer/ubuntu-12.10-amd64.json @@ -38,7 +38,6 @@ "ssh_port": 22, "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", - "name": "ubuntu-12.10-amd64-vbox", "type": "virtualbox", "vboxmanage": [ [ @@ -95,7 +94,6 @@ "ssh_wait_timeout": "10000s", "tools_upload_flavor": "linux", "tools_upload_path": "/home/vagrant/vmware_tools.iso", - "name": "ubuntu-12.10-amd64-vmware", "type": "vmware", "vmx_data": { "cpuid.coresPerSocket": "1", diff --git a/packer/ubuntu-12.10-i386.json b/packer/ubuntu-12.10-i386.json index 06efb331d..0a3db5070 100644 --- a/packer/ubuntu-12.10-i386.json +++ b/packer/ubuntu-12.10-i386.json @@ -38,7 +38,6 @@ "ssh_port": 22, "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", - "name": "ubuntu-12.10-i386-vbox", "type": "virtualbox", "vboxmanage": [ [ @@ -95,7 +94,6 @@ "ssh_wait_timeout": "10000s", "tools_upload_flavor": "linux", "tools_upload_path": "/home/vagrant/vmware_tools.iso", - "name": "ubuntu-12.10-i386-vmware", "type": "vmware", "vmx_data": { "cpuid.coresPerSocket": "1", diff --git a/packer/ubuntu-13.04-amd64.json b/packer/ubuntu-13.04-amd64.json index e429bab2f..177e7f003 100644 --- a/packer/ubuntu-13.04-amd64.json +++ b/packer/ubuntu-13.04-amd64.json @@ -38,7 +38,6 @@ "ssh_port": 22, "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", - "name": "ubuntu-13.04-amd64-vbox", "type": "virtualbox", "vboxmanage": [ [ @@ -96,7 +95,6 @@ "ssh_wait_timeout": "10000s", "tools_upload_flavor": "linux", "tools_upload_path": "/home/vagrant/vmware_tools.iso", - "name": "ubuntu-13.04-amd64-vmware", "type": "vmware", "vmx_data": { "cpuid.coresPerSocket": "1", diff --git a/packer/ubuntu-13.04-i386.json b/packer/ubuntu-13.04-i386.json index edb80c241..3721eab15 100644 --- a/packer/ubuntu-13.04-i386.json +++ b/packer/ubuntu-13.04-i386.json @@ -38,7 +38,6 @@ "ssh_port": 22, "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", - "name": "ubuntu-13.04-i386-vbox", "type": "virtualbox", "vboxmanage": [ [ @@ -95,7 +94,6 @@ "ssh_wait_timeout": "10000s", "tools_upload_flavor": "linux", "tools_upload_path": "/home/vagrant/vmware_tools.iso", - "name": "ubuntu-13.04-i386-vmware", "type": "vmware", "vmx_data": { "cpuid.coresPerSocket": "1", From e156c70c5c948f59b8deabcc135d84a41da8bc99 Mon Sep 17 00:00:00 2001 From: Tom Duffield <tom@opscode.com> Date: Mon, 30 Sep 2013 17:32:34 -0500 Subject: [PATCH 0079/1622] removing the creation of shutdown files for CentOS builds --- packer/centos-5.9-i386.json | 6 +++--- packer/centos-5.9-x86_64.json | 6 +++--- packer/centos-6.4-i386.json | 6 +++--- packer/centos-6.4-x86_64.json | 6 +++--- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/packer/centos-5.9-i386.json b/packer/centos-5.9-i386.json index ae4255d2d..e9833c8d3 100644 --- a/packer/centos-5.9-i386.json +++ b/packer/centos-5.9-i386.json @@ -12,7 +12,7 @@ "iso_checksum": "78f976b190ce44716eb672f71203df978474dfb4", "iso_checksum_type": "sha1", "iso_url": "http://mirrors.kernel.org/centos/5.9/isos/i386/CentOS-5.9-i386-bin-DVD-1of2.iso", - "shutdown_command": "echo '/sbin/halt -h -p' > shutdown.sh; echo 'vagrant'|sudo -S sh 'shutdown.sh'", + "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", @@ -45,7 +45,7 @@ "iso_checksum": "78f976b190ce44716eb672f71203df978474dfb4", "iso_checksum_type": "sha1", "iso_url": "http://mirrors.kernel.org/centos/5.9/isos/i386/CentOS-5.9-i386-bin-DVD-1of2.iso", - "shutdown_command": "echo '/sbin/halt -h -p' > shutdown.sh; echo 'vagrant'|sudo -S sh 'shutdown.sh'", + "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", @@ -66,7 +66,7 @@ ], "provisioners": [ { - "execute_command": "echo 'vagrant' | sudo -S bash '{{.Path}}'", + "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E bash '{{.Path}}'", "scripts": [ "scripts/common/vagrant.sh", "scripts/common/sshd.sh", diff --git a/packer/centos-5.9-x86_64.json b/packer/centos-5.9-x86_64.json index 9a915ce5e..a4c013445 100644 --- a/packer/centos-5.9-x86_64.json +++ b/packer/centos-5.9-x86_64.json @@ -12,7 +12,7 @@ "iso_checksum": "c12e01b546f00a965b8414abf0860b08d0bba3c9", "iso_checksum_type": "sha1", "iso_url": "http://mirrors.kernel.org/centos/5.9/isos/x86_64/CentOS-5.9-x86_64-bin-DVD-1of2.iso", - "shutdown_command": "echo '/sbin/halt -h -p' > shutdown.sh; echo 'vagrant'|sudo -S sh 'shutdown.sh'", + "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", @@ -45,7 +45,7 @@ "iso_checksum": "c12e01b546f00a965b8414abf0860b08d0bba3c9", "iso_checksum_type": "sha1", "iso_url": "http://mirrors.kernel.org/centos/5.9/isos/x86_64/CentOS-5.9-x86_64-bin-DVD-1of2.iso", - "shutdown_command": "echo '/sbin/halt -h -p' > shutdown.sh; echo 'vagrant'|sudo -S sh 'shutdown.sh'", + "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", @@ -66,7 +66,7 @@ ], "provisioners": [ { - "execute_command": "echo 'vagrant' | sudo -S bash '{{.Path}}'", + "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E bash '{{.Path}}'", "scripts": [ "scripts/common/vagrant.sh", "scripts/common/sshd.sh", diff --git a/packer/centos-6.4-i386.json b/packer/centos-6.4-i386.json index bbeab0efe..24cfe3b09 100644 --- a/packer/centos-6.4-i386.json +++ b/packer/centos-6.4-i386.json @@ -12,7 +12,7 @@ "iso_checksum": "4bd3a1de6f6dfcd7a2199487abf5a9304d696cae", "iso_checksum_type": "sha1", "iso_url": "http://mirrors.kernel.org/centos/6.4/isos/i386/CentOS-6.4-i386-bin-DVD1.iso", - "shutdown_command": "echo '/sbin/halt -h -p' > shutdown.sh; echo 'vagrant'|sudo -S sh 'shutdown.sh'", + "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", @@ -45,7 +45,7 @@ "iso_checksum": "4bd3a1de6f6dfcd7a2199487abf5a9304d696cae", "iso_checksum_type": "sha1", "iso_url": "http://mirrors.kernel.org/centos/6.4/isos/i386/CentOS-6.4-i386-bin-DVD1.iso", - "shutdown_command": "echo '/sbin/halt -h -p' > shutdown.sh; echo 'vagrant'|sudo -S sh 'shutdown.sh'", + "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", @@ -66,7 +66,7 @@ ], "provisioners": [ { - "execute_command": "echo 'vagrant' | sudo -S bash '{{.Path}}'", + "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E bash '{{.Path}}'", "scripts": [ "scripts/common/sshd.sh", "scripts/common/vagrant.sh", diff --git a/packer/centos-6.4-x86_64.json b/packer/centos-6.4-x86_64.json index 9cc5a8893..26bee72de 100644 --- a/packer/centos-6.4-x86_64.json +++ b/packer/centos-6.4-x86_64.json @@ -12,7 +12,7 @@ "iso_checksum": "8672dc087f1b0eda60b9efaa41b82f034f185e24", "iso_checksum_type": "sha1", "iso_url": "http://mirrors.kernel.org/centos/6.4/isos/x86_64/CentOS-6.4-x86_64-bin-DVD1.iso", - "shutdown_command": "echo '/sbin/halt -h -p' > shutdown.sh; echo 'vagrant'|sudo -S sh 'shutdown.sh'", + "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", @@ -45,7 +45,7 @@ "iso_checksum": "8672dc087f1b0eda60b9efaa41b82f034f185e24", "iso_checksum_type": "sha1", "iso_url": "http://mirrors.kernel.org/centos/6.4/isos/x86_64/CentOS-6.4-x86_64-bin-DVD1.iso", - "shutdown_command": "echo '/sbin/halt -h -p' > shutdown.sh; echo 'vagrant'|sudo -S sh 'shutdown.sh'", + "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", @@ -66,7 +66,7 @@ ], "provisioners": [ { - "execute_command": "echo 'vagrant' | sudo -S bash '{{.Path}}'", + "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E bash '{{.Path}}'", "scripts": [ "scripts/common/sshd.sh", "scripts/common/vagrant.sh", From 4321677c256f87883f0f43bd9c1c7311acb4a190 Mon Sep 17 00:00:00 2001 From: Tom Duffield <tom@opscode.com> Date: Mon, 30 Sep 2013 17:50:28 -0500 Subject: [PATCH 0080/1622] condensing vboxmanage value; removed shutdown file for debian boxes --- packer/centos-5.9-i386.json | 14 ++------------ packer/centos-5.9-x86_64.json | 14 ++------------ packer/centos-6.4-i386.json | 14 ++------------ packer/centos-6.4-x86_64.json | 14 ++------------ packer/debian-6.0.7-amd64.json | 20 +++++--------------- packer/debian-6.0.7-i386.json | 18 ++++-------------- packer/debian-7.1.0-amd64.json | 18 ++++-------------- packer/debian-7.1.0-i386.json | 18 ++++-------------- packer/fedora-18-i386.json | 14 ++------------ packer/fedora-18-x86_64.json | 14 ++------------ packer/fedora-19-i386.json | 14 ++------------ packer/fedora-19-x86_64.json | 14 ++------------ packer/fedora-20-i386.json | 14 ++------------ packer/fedora-20-x86_64.json | 14 ++------------ packer/ubuntu-10.04-amd64.json | 14 ++------------ packer/ubuntu-10.04-i386.json | 14 ++------------ packer/ubuntu-12.04-amd64.json | 14 ++------------ packer/ubuntu-12.04-i386.json | 14 ++------------ packer/ubuntu-12.10-amd64.json | 14 ++------------ packer/ubuntu-12.10-i386.json | 14 ++------------ packer/ubuntu-13.04-amd64.json | 14 ++------------ packer/ubuntu-13.04-i386.json | 14 ++------------ 22 files changed, 53 insertions(+), 273 deletions(-) diff --git a/packer/centos-5.9-i386.json b/packer/centos-5.9-i386.json index e9833c8d3..618c9efd5 100644 --- a/packer/centos-5.9-i386.json +++ b/packer/centos-5.9-i386.json @@ -19,18 +19,8 @@ "ssh_wait_timeout": "10000s", "type": "virtualbox", "vboxmanage": [ - [ - "modifyvm", - "{{.Name}}", - "--memory", - "384" - ], - [ - "modifyvm", - "{{.Name}}", - "--cpus", - "1" - ] + [ "modifyvm", "{{.Name}}", "--memory", "384" ], + [ "modifyvm", "{{.Name}}", "--cpus", "1" ] ], "virtualbox_version_file": ".vbox_version" }, diff --git a/packer/centos-5.9-x86_64.json b/packer/centos-5.9-x86_64.json index a4c013445..4c18ad766 100644 --- a/packer/centos-5.9-x86_64.json +++ b/packer/centos-5.9-x86_64.json @@ -19,18 +19,8 @@ "ssh_wait_timeout": "10000s", "type": "virtualbox", "vboxmanage": [ - [ - "modifyvm", - "{{.Name}}", - "--memory", - "384" - ], - [ - "modifyvm", - "{{.Name}}", - "--cpus", - "1" - ] + [ "modifyvm", "{{.Name}}", "--memory", "384" ], + [ "modifyvm", "{{.Name}}", "--cpus", "1" ] ], "virtualbox_version_file": ".vbox_version" }, diff --git a/packer/centos-6.4-i386.json b/packer/centos-6.4-i386.json index 24cfe3b09..b14aa69ba 100644 --- a/packer/centos-6.4-i386.json +++ b/packer/centos-6.4-i386.json @@ -19,18 +19,8 @@ "ssh_wait_timeout": "10000s", "type": "virtualbox", "vboxmanage": [ - [ - "modifyvm", - "{{.Name}}", - "--memory", - "480" - ], - [ - "modifyvm", - "{{.Name}}", - "--cpus", - "1" - ] + [ "modifyvm", "{{.Name}}", "--memory", "384" ], + [ "modifyvm", "{{.Name}}", "--cpus", "1" ] ], "virtualbox_version_file": ".vbox_version" }, diff --git a/packer/centos-6.4-x86_64.json b/packer/centos-6.4-x86_64.json index 26bee72de..6c8d887f3 100644 --- a/packer/centos-6.4-x86_64.json +++ b/packer/centos-6.4-x86_64.json @@ -19,18 +19,8 @@ "ssh_wait_timeout": "10000s", "type": "virtualbox", "vboxmanage": [ - [ - "modifyvm", - "{{.Name}}", - "--memory", - "480" - ], - [ - "modifyvm", - "{{.Name}}", - "--cpus", - "1" - ] + [ "modifyvm", "{{.Name}}", "--memory", "384" ], + [ "modifyvm", "{{.Name}}", "--cpus", "1" ] ], "virtualbox_version_file": ".vbox_version" }, diff --git a/packer/debian-6.0.7-amd64.json b/packer/debian-6.0.7-amd64.json index cd68c5271..f03d89417 100644 --- a/packer/debian-6.0.7-amd64.json +++ b/packer/debian-6.0.7-amd64.json @@ -30,22 +30,12 @@ "ssh_password": "vagrant", "ssh_port": 22, "ssh_wait_timeout": "10000s", - "shutdown_command": "echo '/sbin/shutdown -hP now' > shutdown.sh; echo 'vagrant'|sudo -S sh 'shutdown.sh'", + "shutdown_command": "echo 'vagrant'|sudo -S /sbin/shutdown -hP now", "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "virtualbox_version_file": ".vbox_version", "vboxmanage": [ - [ - "modifyvm", - "{{.Name}}", - "--memory", - "384" - ], - [ - "modifyvm", - "{{.Name}}", - "--cpus", - "1" - ] + [ "modifyvm", "{{.Name}}", "--memory", "384" ], + [ "modifyvm", "{{.Name}}", "--cpus", "1" ] ] }, { @@ -78,7 +68,7 @@ "ssh_password": "vagrant", "ssh_port": 22, "ssh_wait_timeout": "10000s", - "shutdown_command": "echo '/sbin/shutdown -hP now' > shutdown.sh; echo 'vagrant'|sudo -S sh 'shutdown.sh'", + "shutdown_command": "echo 'vagrant'|sudo -S /sbin/shutdown -hP now", "vmx_data": { "memsize": "384", "numvcpus": "1", @@ -105,7 +95,7 @@ "scripts/debian/cleanup.sh", "scripts/common/minimize.sh" ], - "execute_command": "echo 'vagrant'|sudo -S sh '{{.Path}}'" + "execute_command": "echo 'vagrant'|{{.Vars}} sudo -S -E bash '{{.Path}}'" } ] } diff --git a/packer/debian-6.0.7-i386.json b/packer/debian-6.0.7-i386.json index ff3c32cb6..6b2a82f7e 100644 --- a/packer/debian-6.0.7-i386.json +++ b/packer/debian-6.0.7-i386.json @@ -30,22 +30,12 @@ "ssh_password": "vagrant", "ssh_port": 22, "ssh_wait_timeout": "10000s", - "shutdown_command": "echo '/sbin/shutdown -hP now' > shutdown.sh; echo 'vagrant'|sudo -S sh 'shutdown.sh'", + "shutdown_command": "echo 'vagrant'|sudo -S /sbin/shutdown -hP now", "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "virtualbox_version_file": ".vbox_version", "vboxmanage": [ - [ - "modifyvm", - "{{.Name}}", - "--memory", - "384" - ], - [ - "modifyvm", - "{{.Name}}", - "--cpus", - "1" - ] + [ "modifyvm", "{{.Name}}", "--memory", "384" ], + [ "modifyvm", "{{.Name}}", "--cpus", "1" ] ] }, { @@ -78,7 +68,7 @@ "ssh_password": "vagrant", "ssh_port": 22, "ssh_wait_timeout": "10000s", - "shutdown_command": "echo '/sbin/shutdown -hP now' > shutdown.sh; echo 'vagrant'|sudo -S sh 'shutdown.sh'", + "shutdown_command": "echo 'vagrant'|sudo -S /sbin/shutdown -hP now", "vmx_data": { "memsize": "384", "numvcpus": "1", diff --git a/packer/debian-7.1.0-amd64.json b/packer/debian-7.1.0-amd64.json index 99d560862..eab546e0d 100644 --- a/packer/debian-7.1.0-amd64.json +++ b/packer/debian-7.1.0-amd64.json @@ -30,22 +30,12 @@ "ssh_password": "vagrant", "ssh_port": 22, "ssh_wait_timeout": "10000s", - "shutdown_command": "echo '/sbin/shutdown -hP now' > shutdown.sh; echo 'vagrant'|sudo -S sh 'shutdown.sh'", + "shutdown_command": "echo 'vagrant'|sudo -S /sbin/shutdown -hP now", "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "virtualbox_version_file": ".vbox_version", "vboxmanage": [ - [ - "modifyvm", - "{{.Name}}", - "--memory", - "384" - ], - [ - "modifyvm", - "{{.Name}}", - "--cpus", - "1" - ] + [ "modifyvm", "{{.Name}}", "--memory", "384" ], + [ "modifyvm", "{{.Name}}", "--cpus", "1" ] ] }, { @@ -78,7 +68,7 @@ "ssh_password": "vagrant", "ssh_port": 22, "ssh_wait_timeout": "10000s", - "shutdown_command": "echo '/sbin/shutdown -hP now' > shutdown.sh; echo 'vagrant'|sudo -S sh 'shutdown.sh'", + "shutdown_command": "echo 'vagrant'|sudo -S /sbin/shutdown -hP now", "vmx_data": { "memsize": "384", "numvcpus": "1", diff --git a/packer/debian-7.1.0-i386.json b/packer/debian-7.1.0-i386.json index fb1626616..89937f0c7 100644 --- a/packer/debian-7.1.0-i386.json +++ b/packer/debian-7.1.0-i386.json @@ -30,22 +30,12 @@ "ssh_password": "vagrant", "ssh_port": 22, "ssh_wait_timeout": "10000s", - "shutdown_command": "echo '/sbin/shutdown -hP now' > shutdown.sh; echo 'vagrant'|sudo -S sh 'shutdown.sh'", + "shutdown_command": "echo 'vagrant'|sudo -S /sbin/shutdown -hP now", "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "virtualbox_version_file": ".vbox_version", "vboxmanage": [ - [ - "modifyvm", - "{{.Name}}", - "--memory", - "384" - ], - [ - "modifyvm", - "{{.Name}}", - "--cpus", - "1" - ] + [ "modifyvm", "{{.Name}}", "--memory", "384" ], + [ "modifyvm", "{{.Name}}", "--cpus", "1" ] ] }, { @@ -78,7 +68,7 @@ "ssh_password": "vagrant", "ssh_port": 22, "ssh_wait_timeout": "10000s", - "shutdown_command": "echo '/sbin/shutdown -hP now' > shutdown.sh; echo 'vagrant'|sudo -S sh 'shutdown.sh'", + "shutdown_command": "echo 'vagrant'|sudo -S /sbin/shutdown -hP now", "vmx_data": { "memsize": "384", "numvcpus": "1", diff --git a/packer/fedora-18-i386.json b/packer/fedora-18-i386.json index b0dd14d05..0f071422b 100644 --- a/packer/fedora-18-i386.json +++ b/packer/fedora-18-i386.json @@ -19,18 +19,8 @@ "ssh_wait_timeout": "10000s", "type": "virtualbox", "vboxmanage": [ - [ - "modifyvm", - "{{.Name}}", - "--memory", - "512" - ], - [ - "modifyvm", - "{{.Name}}", - "--cpus", - "1" - ] + [ "modifyvm", "{{.Name}}", "--memory", "384" ], + [ "modifyvm", "{{.Name}}", "--cpus", "1" ] ], "virtualbox_version_file": ".vbox_version" }, diff --git a/packer/fedora-18-x86_64.json b/packer/fedora-18-x86_64.json index f770047fc..6c6e221f3 100644 --- a/packer/fedora-18-x86_64.json +++ b/packer/fedora-18-x86_64.json @@ -19,18 +19,8 @@ "ssh_wait_timeout": "10000s", "type": "virtualbox", "vboxmanage": [ - [ - "modifyvm", - "{{.Name}}", - "--memory", - "512" - ], - [ - "modifyvm", - "{{.Name}}", - "--cpus", - "1" - ] + [ "modifyvm", "{{.Name}}", "--memory", "384" ], + [ "modifyvm", "{{.Name}}", "--cpus", "1" ] ], "virtualbox_version_file": ".vbox_version" }, diff --git a/packer/fedora-19-i386.json b/packer/fedora-19-i386.json index 06ca3f3aa..51a1f75cf 100644 --- a/packer/fedora-19-i386.json +++ b/packer/fedora-19-i386.json @@ -19,18 +19,8 @@ "ssh_wait_timeout": "10000s", "type": "virtualbox", "vboxmanage": [ - [ - "modifyvm", - "{{.Name}}", - "--memory", - "512" - ], - [ - "modifyvm", - "{{.Name}}", - "--cpus", - "1" - ] + [ "modifyvm", "{{.Name}}", "--memory", "384" ], + [ "modifyvm", "{{.Name}}", "--cpus", "1" ] ], "virtualbox_version_file": ".vbox_version" }, diff --git a/packer/fedora-19-x86_64.json b/packer/fedora-19-x86_64.json index f700502cc..189547034 100644 --- a/packer/fedora-19-x86_64.json +++ b/packer/fedora-19-x86_64.json @@ -19,18 +19,8 @@ "ssh_wait_timeout": "10000s", "type": "virtualbox", "vboxmanage": [ - [ - "modifyvm", - "{{.Name}}", - "--memory", - "512" - ], - [ - "modifyvm", - "{{.Name}}", - "--cpus", - "1" - ] + [ "modifyvm", "{{.Name}}", "--memory", "384" ], + [ "modifyvm", "{{.Name}}", "--cpus", "1" ] ], "virtualbox_version_file": ".vbox_version" }, diff --git a/packer/fedora-20-i386.json b/packer/fedora-20-i386.json index 4bae4cfee..badb8100e 100644 --- a/packer/fedora-20-i386.json +++ b/packer/fedora-20-i386.json @@ -19,18 +19,8 @@ "ssh_wait_timeout": "10000s", "type": "virtualbox", "vboxmanage": [ - [ - "modifyvm", - "{{.Name}}", - "--memory", - "512" - ], - [ - "modifyvm", - "{{.Name}}", - "--cpus", - "1" - ] + [ "modifyvm", "{{.Name}}", "--memory", "384" ], + [ "modifyvm", "{{.Name}}", "--cpus", "1" ] ], "virtualbox_version_file": ".vbox_version" }, diff --git a/packer/fedora-20-x86_64.json b/packer/fedora-20-x86_64.json index 995a018b7..860d5ea29 100644 --- a/packer/fedora-20-x86_64.json +++ b/packer/fedora-20-x86_64.json @@ -19,18 +19,8 @@ "ssh_wait_timeout": "10000s", "type": "virtualbox", "vboxmanage": [ - [ - "modifyvm", - "{{.Name}}", - "--memory", - "512" - ], - [ - "modifyvm", - "{{.Name}}", - "--cpus", - "1" - ] + [ "modifyvm", "{{.Name}}", "--memory", "384" ], + [ "modifyvm", "{{.Name}}", "--cpus", "1" ] ], "virtualbox_version_file": ".vbox_version" }, diff --git a/packer/ubuntu-10.04-amd64.json b/packer/ubuntu-10.04-amd64.json index 956590a1b..a2d26a914 100644 --- a/packer/ubuntu-10.04-amd64.json +++ b/packer/ubuntu-10.04-amd64.json @@ -40,18 +40,8 @@ "ssh_wait_timeout": "10000s", "type": "virtualbox", "vboxmanage": [ - [ - "modifyvm", - "{{.Name}}", - "--memory", - "384" - ], - [ - "modifyvm", - "{{.Name}}", - "--cpus", - "1" - ] + [ "modifyvm", "{{.Name}}", "--memory", "384" ], + [ "modifyvm", "{{.Name}}", "--cpus", "1" ] ], "virtualbox_version_file": ".vbox_version" }, diff --git a/packer/ubuntu-10.04-i386.json b/packer/ubuntu-10.04-i386.json index 7e252f92e..de8eea1c0 100644 --- a/packer/ubuntu-10.04-i386.json +++ b/packer/ubuntu-10.04-i386.json @@ -40,18 +40,8 @@ "ssh_wait_timeout": "10000s", "type": "virtualbox", "vboxmanage": [ - [ - "modifyvm", - "{{.Name}}", - "--memory", - "384" - ], - [ - "modifyvm", - "{{.Name}}", - "--cpus", - "1" - ] + [ "modifyvm", "{{.Name}}", "--memory", "384" ], + [ "modifyvm", "{{.Name}}", "--cpus", "1" ] ], "virtualbox_version_file": ".vbox_version" }, diff --git a/packer/ubuntu-12.04-amd64.json b/packer/ubuntu-12.04-amd64.json index 7614296c6..cc2d0e68a 100644 --- a/packer/ubuntu-12.04-amd64.json +++ b/packer/ubuntu-12.04-amd64.json @@ -41,18 +41,8 @@ "guest_additions_path": "VBoxGuestAdditions_{{ .Version }}.iso", "virtualbox_version_file": ".vbox_version", "vboxmanage": [ - [ - "modifyvm", - "{{.Name}}", - "--memory", - "384" - ], - [ - "modifyvm", - "{{.Name}}", - "--cpus", - "1" - ] + [ "modifyvm", "{{.Name}}", "--memory", "384" ], + [ "modifyvm", "{{.Name}}", "--cpus", "1" ] ] }, { diff --git a/packer/ubuntu-12.04-i386.json b/packer/ubuntu-12.04-i386.json index 44ecea303..57cfb9e93 100644 --- a/packer/ubuntu-12.04-i386.json +++ b/packer/ubuntu-12.04-i386.json @@ -40,18 +40,8 @@ "ssh_wait_timeout": "10000s", "type": "virtualbox", "vboxmanage": [ - [ - "modifyvm", - "{{.Name}}", - "--memory", - "384" - ], - [ - "modifyvm", - "{{.Name}}", - "--cpus", - "1" - ] + [ "modifyvm", "{{.Name}}", "--memory", "384" ], + [ "modifyvm", "{{.Name}}", "--cpus", "1" ] ], "virtualbox_version_file": ".vbox_version" }, diff --git a/packer/ubuntu-12.10-amd64.json b/packer/ubuntu-12.10-amd64.json index f67208171..ad87d7064 100644 --- a/packer/ubuntu-12.10-amd64.json +++ b/packer/ubuntu-12.10-amd64.json @@ -40,18 +40,8 @@ "ssh_wait_timeout": "10000s", "type": "virtualbox", "vboxmanage": [ - [ - "modifyvm", - "{{.Name}}", - "--memory", - "384" - ], - [ - "modifyvm", - "{{.Name}}", - "--cpus", - "1" - ] + [ "modifyvm", "{{.Name}}", "--memory", "384" ], + [ "modifyvm", "{{.Name}}", "--cpus", "1" ] ], "virtualbox_version_file": ".vbox_version" }, diff --git a/packer/ubuntu-12.10-i386.json b/packer/ubuntu-12.10-i386.json index 0a3db5070..6a6ecd1e8 100644 --- a/packer/ubuntu-12.10-i386.json +++ b/packer/ubuntu-12.10-i386.json @@ -40,18 +40,8 @@ "ssh_wait_timeout": "10000s", "type": "virtualbox", "vboxmanage": [ - [ - "modifyvm", - "{{.Name}}", - "--memory", - "384" - ], - [ - "modifyvm", - "{{.Name}}", - "--cpus", - "1" - ] + [ "modifyvm", "{{.Name}}", "--memory", "384" ], + [ "modifyvm", "{{.Name}}", "--cpus", "1" ] ], "virtualbox_version_file": ".vbox_version" }, diff --git a/packer/ubuntu-13.04-amd64.json b/packer/ubuntu-13.04-amd64.json index 177e7f003..c10d5742b 100644 --- a/packer/ubuntu-13.04-amd64.json +++ b/packer/ubuntu-13.04-amd64.json @@ -40,18 +40,8 @@ "ssh_wait_timeout": "10000s", "type": "virtualbox", "vboxmanage": [ - [ - "modifyvm", - "{{.Name}}", - "--memory", - "384" - ], - [ - "modifyvm", - "{{.Name}}", - "--cpus", - "1" - ] + [ "modifyvm", "{{.Name}}", "--memory", "384" ], + [ "modifyvm", "{{.Name}}", "--cpus", "1" ] ], "virtualbox_version_file": ".vbox_version" }, diff --git a/packer/ubuntu-13.04-i386.json b/packer/ubuntu-13.04-i386.json index 3721eab15..94a894e41 100644 --- a/packer/ubuntu-13.04-i386.json +++ b/packer/ubuntu-13.04-i386.json @@ -40,18 +40,8 @@ "ssh_wait_timeout": "10000s", "type": "virtualbox", "vboxmanage": [ - [ - "modifyvm", - "{{.Name}}", - "--memory", - "384" - ], - [ - "modifyvm", - "{{.Name}}", - "--cpus", - "1" - ] + [ "modifyvm", "{{.Name}}", "--memory", "384" ], + [ "modifyvm", "{{.Name}}", "--cpus", "1" ] ], "virtualbox_version_file": ".vbox_version" }, From 40339e3088270664306fb9d0adc362b8d852ba43 Mon Sep 17 00:00:00 2001 From: Tom Duffield <tom@opscode.com> Date: Mon, 30 Sep 2013 18:40:58 -0500 Subject: [PATCH 0081/1622] removing shutdown script from fedora --- packer/fedora-18-i386.json | 13 ++++--------- packer/fedora-18-x86_64.json | 13 ++++--------- packer/fedora-19-i386.json | 13 ++++--------- packer/fedora-19-x86_64.json | 13 ++++--------- packer/fedora-20-i386.json | 13 ++++--------- packer/fedora-20-x86_64.json | 2 +- 6 files changed, 21 insertions(+), 46 deletions(-) diff --git a/packer/fedora-18-i386.json b/packer/fedora-18-i386.json index 0f071422b..6148971a5 100644 --- a/packer/fedora-18-i386.json +++ b/packer/fedora-18-i386.json @@ -12,14 +12,14 @@ "iso_checksum": "a22e6ab7b0e5e93397e4a1d8d994693d0afb9ad46b1f47a4fe10bfbbc2e7f354", "iso_checksum_type": "sha256", "iso_url": "http://mirrors.kernel.org/fedora/releases/18/Fedora/i386/iso/Fedora-18-i386-DVD.iso", - "shutdown_command": "echo 'vagrant'|sudo -S sh '/tmp/shutdown.sh'", + "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", "type": "virtualbox", "vboxmanage": [ - [ "modifyvm", "{{.Name}}", "--memory", "384" ], + [ "modifyvm", "{{.Name}}", "--memory", "512" ], [ "modifyvm", "{{.Name}}", "--cpus", "1" ] ], "virtualbox_version_file": ".vbox_version" @@ -35,7 +35,7 @@ "iso_checksum": "a22e6ab7b0e5e93397e4a1d8d994693d0afb9ad46b1f47a4fe10bfbbc2e7f354", "iso_checksum_type": "sha256", "iso_url": "http://mirrors.kernel.org/fedora/releases/18/Fedora/i386/iso/Fedora-18-i386-DVD.iso", - "shutdown_command": "echo 'vagrant'|sudo -S sh '/tmp/shutdown.sh'", + "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", @@ -58,12 +58,7 @@ ], "provisioners": [ { - "type": "file", - "source": "scripts/fedora/shutdown.sh", - "destination": "/tmp/shutdown.sh" - }, - { - "execute_command": "echo 'vagrant' | {{.Vars}} sudo -E -S sh '{{.Path}}'", + "execute_command": "echo 'vagrant' | {{.Vars}} sudo -E -S bash '{{.Path}}'", "scripts": [ "scripts/common/sshd.sh", "scripts/common/vmtools.sh", diff --git a/packer/fedora-18-x86_64.json b/packer/fedora-18-x86_64.json index 6c6e221f3..14b9fe7a8 100644 --- a/packer/fedora-18-x86_64.json +++ b/packer/fedora-18-x86_64.json @@ -12,14 +12,14 @@ "iso_checksum": "91c5f0aca391acf76a047e284144f90d66d3d5f5dcd26b01f368a43236832c03", "iso_checksum_type": "sha256", "iso_url": "http://mirrors.kernel.org/fedora/releases/18/Fedora/x86_64/iso/Fedora-18-x86_64-DVD.iso", - "shutdown_command": "echo 'vagrant'|sudo -S sh '/tmp/shutdown.sh'", + "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", "type": "virtualbox", "vboxmanage": [ - [ "modifyvm", "{{.Name}}", "--memory", "384" ], + [ "modifyvm", "{{.Name}}", "--memory", "512" ], [ "modifyvm", "{{.Name}}", "--cpus", "1" ] ], "virtualbox_version_file": ".vbox_version" @@ -35,7 +35,7 @@ "iso_checksum": "91c5f0aca391acf76a047e284144f90d66d3d5f5dcd26b01f368a43236832c03", "iso_checksum_type": "sha256", "iso_url": "http://mirrors.kernel.org/fedora/releases/18/Fedora/x86_64/iso/Fedora-18-x86_64-DVD.iso", - "shutdown_command": "echo 'vagrant'|sudo -S sh '/tmp/shutdown.sh'", + "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", @@ -58,12 +58,7 @@ ], "provisioners": [ { - "type": "file", - "source": "scripts/fedora/shutdown.sh", - "destination": "/tmp/shutdown.sh" - }, - { - "execute_command": "echo 'vagrant' | {{.Vars}} sudo -E -S sh '{{.Path}}'", + "execute_command": "echo 'vagrant' | {{.Vars}} sudo -E -S bash '{{.Path}}'", "scripts": [ "scripts/common/sshd.sh", "scripts/common/vmtools.sh", diff --git a/packer/fedora-19-i386.json b/packer/fedora-19-i386.json index 51a1f75cf..2024dd4dc 100644 --- a/packer/fedora-19-i386.json +++ b/packer/fedora-19-i386.json @@ -12,14 +12,14 @@ "iso_checksum": "0da29695c4f503e2b27350406c1ceb7a4e5b9b699ea722774368fd16ab277bce", "iso_checksum_type": "sha256", "iso_url": "http://mirrors.kernel.org/fedora/releases/19/Fedora/i386/iso/Fedora-19-i386-DVD.iso", - "shutdown_command": "echo 'vagrant'|sudo -S sh '/tmp/shutdown.sh'", + "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", "type": "virtualbox", "vboxmanage": [ - [ "modifyvm", "{{.Name}}", "--memory", "384" ], + [ "modifyvm", "{{.Name}}", "--memory", "512" ], [ "modifyvm", "{{.Name}}", "--cpus", "1" ] ], "virtualbox_version_file": ".vbox_version" @@ -35,7 +35,7 @@ "iso_checksum": "0da29695c4f503e2b27350406c1ceb7a4e5b9b699ea722774368fd16ab277bce", "iso_checksum_type": "sha256", "iso_url": "http://mirrors.kernel.org/fedora/releases/19/Fedora/i386/iso/Fedora-19-i386-DVD.iso", - "shutdown_command": "echo 'vagrant'|sudo -S sh '/tmp/shutdown.sh'", + "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", @@ -56,12 +56,7 @@ ], "provisioners": [ { - "type": "file", - "source": "scripts/fedora/shutdown.sh", - "destination": "/tmp/shutdown.sh" - }, - { - "execute_command": "echo 'vagrant' | {{.Vars}} sudo -E -S sh '{{.Path}}'", + "execute_command": "echo 'vagrant' | {{.Vars}} sudo -E -S bash '{{.Path}}'", "scripts": [ "scripts/common/sshd.sh", "scripts/common/vmtools.sh", diff --git a/packer/fedora-19-x86_64.json b/packer/fedora-19-x86_64.json index 189547034..69dba152a 100644 --- a/packer/fedora-19-x86_64.json +++ b/packer/fedora-19-x86_64.json @@ -12,14 +12,14 @@ "iso_checksum": "6e7e263e607cfcadc90ea2ef5668aa3945d9eca596485a7a1f8a9f2478cc7084", "iso_checksum_type": "sha256", "iso_url": "http://mirrors.kernel.org/fedora/releases/19/Fedora/x86_64/iso/Fedora-19-x86_64-DVD.iso", - "shutdown_command": "echo 'vagrant'|sudo -S sh '/tmp/shutdown.sh'", + "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", "type": "virtualbox", "vboxmanage": [ - [ "modifyvm", "{{.Name}}", "--memory", "384" ], + [ "modifyvm", "{{.Name}}", "--memory", "512" ], [ "modifyvm", "{{.Name}}", "--cpus", "1" ] ], "virtualbox_version_file": ".vbox_version" @@ -35,7 +35,7 @@ "iso_checksum": "6e7e263e607cfcadc90ea2ef5668aa3945d9eca596485a7a1f8a9f2478cc7084", "iso_checksum_type": "sha256", "iso_url": "http://mirrors.kernel.org/fedora/releases/19/Fedora/x86_64/iso/Fedora-19-x86_64-DVD.iso", - "shutdown_command": "echo 'vagrant'|sudo -S sh '/tmp/shutdown.sh'", + "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", @@ -56,12 +56,7 @@ ], "provisioners": [ { - "type": "file", - "source": "scripts/fedora/shutdown.sh", - "destination": "/tmp/shutdown.sh" - }, - { - "execute_command": "echo 'vagrant' | {{.Vars}} sudo -E -S sh '{{.Path}}'", + "execute_command": "echo 'vagrant' | {{.Vars}} sudo -E -S bash '{{.Path}}'", "scripts": [ "scripts/common/sshd.sh", "scripts/common/vmtools.sh", diff --git a/packer/fedora-20-i386.json b/packer/fedora-20-i386.json index badb8100e..f375a0d2f 100644 --- a/packer/fedora-20-i386.json +++ b/packer/fedora-20-i386.json @@ -12,14 +12,14 @@ "iso_checksum": "24e3a6446b7e2e2b0a3591271c896c41eae01f733a65aa4f5bf43e99bfcfc25e", "iso_checksum_type": "sha256", "iso_url": "http://mirrors.kernel.org/fedora/releases/20/Fedora/i386/iso/Fedora-20-i386-DVD.iso", - "shutdown_command": "echo 'vagrant'|sudo -S sh '/tmp/shutdown.sh'", + "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", "type": "virtualbox", "vboxmanage": [ - [ "modifyvm", "{{.Name}}", "--memory", "384" ], + [ "modifyvm", "{{.Name}}", "--memory", "512" ], [ "modifyvm", "{{.Name}}", "--cpus", "1" ] ], "virtualbox_version_file": ".vbox_version" @@ -35,7 +35,7 @@ "iso_checksum": "0da29695c4f503e2b27350406c1ceb7a4e5b9b699ea722774368fd16ab277bce", "iso_checksum_type": "sha256", "iso_url": "http://mirrors.kernel.org/fedora/releases/19/Fedora/i386/iso/Fedora-19-i386-DVD.iso", - "shutdown_command": "echo 'vagrant'|sudo -S sh '/tmp/shutdown.sh'", + "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", @@ -56,12 +56,7 @@ ], "provisioners": [ { - "type": "file", - "source": "scripts/fedora/shutdown.sh", - "destination": "/tmp/shutdown.sh" - }, - { - "execute_command": "echo 'vagrant' | {{.Vars}} sudo -E -S sh '{{.Path}}'", + "execute_command": "echo 'vagrant' | {{.Vars}} sudo -E -S bash '{{.Path}}'", "scripts": [ "scripts/common/sshd.sh", "scripts/common/vmtools.sh", diff --git a/packer/fedora-20-x86_64.json b/packer/fedora-20-x86_64.json index 860d5ea29..e4a8c528a 100644 --- a/packer/fedora-20-x86_64.json +++ b/packer/fedora-20-x86_64.json @@ -19,7 +19,7 @@ "ssh_wait_timeout": "10000s", "type": "virtualbox", "vboxmanage": [ - [ "modifyvm", "{{.Name}}", "--memory", "384" ], + [ "modifyvm", "{{.Name}}", "--memory", "512" ], [ "modifyvm", "{{.Name}}", "--cpus", "1" ] ], "virtualbox_version_file": ".vbox_version" From aa16342ddd7b3f1db433309e284c325ecfc3101e Mon Sep 17 00:00:00 2001 From: Tom Duffield <tom@opscode.com> Date: Mon, 30 Sep 2013 20:59:12 -0500 Subject: [PATCH 0082/1622] removing shutdown scripts from ubuntu templates --- packer/fedora-20-x86_64.json | 6 +++--- packer/ubuntu-10.04-amd64.json | 11 +++-------- packer/ubuntu-10.04-i386.json | 11 +++-------- packer/ubuntu-12.04-amd64.json | 11 +++-------- packer/ubuntu-12.04-i386.json | 11 +++-------- packer/ubuntu-12.10-amd64.json | 11 +++-------- packer/ubuntu-12.10-i386.json | 11 +++-------- packer/ubuntu-13.04-amd64.json | 11 +++-------- packer/ubuntu-13.04-i386.json | 6 +++--- 9 files changed, 27 insertions(+), 62 deletions(-) diff --git a/packer/fedora-20-x86_64.json b/packer/fedora-20-x86_64.json index e4a8c528a..500c42c0a 100644 --- a/packer/fedora-20-x86_64.json +++ b/packer/fedora-20-x86_64.json @@ -12,7 +12,7 @@ "iso_checksum": "749763da40ebf6cb3a9ed46434b2d165d09938cf24b51992da656d9125ff0290", "iso_checksum_type": "sha256", "iso_url": "http://mirrors.kernel.org/fedora/releases/test/20-Alpha/Fedora/x86_64/iso/Fedora-20-Alpha-x86_64-DVD.iso", - "shutdown_command": "echo 'vagrant'|sudo -S sh '/tmp/shutdown.sh'", + "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", @@ -35,7 +35,7 @@ "iso_checksum": "749763da40ebf6cb3a9ed46434b2d165d09938cf24b51992da656d9125ff0290", "iso_checksum_type": "sha256", "iso_url": "http://mirrors.kernel.org/fedora/releases/test/20-Alpha/Fedora/x86_64/iso/Fedora-20-Alpha-x86_64-DVD.iso", - "shutdown_command": "echo 'vagrant'|sudo -S sh '/tmp/shutdown.sh'", + "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", @@ -61,7 +61,7 @@ "destination": "/tmp/shutdown.sh" }, { - "execute_command": "echo 'vagrant' | {{.Vars}} sudo -E -S sh '{{.Path}}'", + "execute_command": "echo 'vagrant' | {{.Vars}} sudo -E -S bash '{{.Path}}'", "scripts": [ "scripts/common/sshd.sh", "scripts/common/vmtools.sh", diff --git a/packer/ubuntu-10.04-amd64.json b/packer/ubuntu-10.04-amd64.json index a2d26a914..1b08ca2ca 100644 --- a/packer/ubuntu-10.04-amd64.json +++ b/packer/ubuntu-10.04-amd64.json @@ -33,7 +33,7 @@ "iso_checksum": "796e80702d65f2ee96e88874a1ab437e24df9cd6", "iso_checksum_type": "sha1", "iso_url": "http://releases.ubuntu.com/10.04.4/ubuntu-10.04.4-server-amd64.iso", - "shutdown_command": "echo 'vagrant'|sudo -S sh '/tmp/shutdown.sh'", + "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", @@ -77,7 +77,7 @@ "iso_checksum": "796e80702d65f2ee96e88874a1ab437e24df9cd6", "iso_checksum_type": "sha1", "iso_url": "http://releases.ubuntu.com/10.04.4/ubuntu-10.04.4-server-amd64.iso", - "shutdown_command": "echo 'vagrant'|sudo -S sh '/tmp/shutdown.sh'", + "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", @@ -100,12 +100,7 @@ ], "provisioners": [ { - "type": "file", - "source": "scripts/common/shutdown.sh", - "destination": "/tmp/shutdown.sh" - }, - { - "execute_command": "echo 'vagrant' | sudo -S bash '{{.Path}}'", + "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E bash '{{.Path}}'", "scripts": [ "scripts/ubuntu/update.sh", "scripts/common/sshd.sh", diff --git a/packer/ubuntu-10.04-i386.json b/packer/ubuntu-10.04-i386.json index de8eea1c0..774e7d03f 100644 --- a/packer/ubuntu-10.04-i386.json +++ b/packer/ubuntu-10.04-i386.json @@ -33,7 +33,7 @@ "iso_checksum": "5695d8b6b914269d1374ac8d4c3dd3786e92d3fe", "iso_checksum_type": "sha1", "iso_url": "http://releases.ubuntu.com/10.04.4/ubuntu-10.04.4-server-i386.iso", - "shutdown_command": "echo 'vagrant'|sudo -S sh '/tmp/shutdown.sh'", + "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", @@ -77,7 +77,7 @@ "iso_checksum": "5695d8b6b914269d1374ac8d4c3dd3786e92d3fe", "iso_checksum_type": "sha1", "iso_url": "http://releases.ubuntu.com/10.04.4/ubuntu-10.04.4-server-i386.iso", - "shutdown_command": "echo 'vagrant'|sudo -S sh '/tmp/shutdown.sh'", + "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", @@ -100,12 +100,7 @@ ], "provisioners": [ { - "type": "file", - "source": "scripts/common/shutdown.sh", - "destination": "/tmp/shutdown.sh" - }, - { - "execute_command": "echo 'vagrant'|sudo -S sh '{{.Path}}'", + "execute_command": "echo 'vagrant'|{{.Vars}} sudo -S -E bash '{{.Path}}'", "scripts": [ "scripts/ubuntu/update.sh", "scripts/common/sshd.sh", diff --git a/packer/ubuntu-12.04-amd64.json b/packer/ubuntu-12.04-amd64.json index cc2d0e68a..82f74989c 100644 --- a/packer/ubuntu-12.04-amd64.json +++ b/packer/ubuntu-12.04-amd64.json @@ -37,7 +37,7 @@ "ssh_password": "vagrant", "ssh_port": 22, "ssh_wait_timeout": "10000s", - "shutdown_command": "echo 'vagrant'|sudo -S sh '/tmp/shutdown.sh'", + "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", "guest_additions_path": "VBoxGuestAdditions_{{ .Version }}.iso", "virtualbox_version_file": ".vbox_version", "vboxmanage": [ @@ -77,7 +77,7 @@ "iso_checksum": "983cfa31d1a376e0c6d2e431af7e0e5757f8d28a", "iso_checksum_type": "sha1", "iso_url": "http://releases.ubuntu.com/12.04/ubuntu-12.04.3-server-amd64.iso", - "shutdown_command": "echo 'vagrant'|sudo -S sh 'shutdown.sh'", + "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", @@ -100,12 +100,7 @@ ], "provisioners": [ { - "type": "file", - "source": "scripts/common/shutdown.sh", - "destination": "/tmp/shutdown.sh" - }, - { - "execute_command": "echo 'vagrant' | sudo -S bash '{{.Path}}'", + "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E bash '{{.Path}}'", "scripts": [ "scripts/ubuntu/update.sh", "scripts/common/sshd.sh", diff --git a/packer/ubuntu-12.04-i386.json b/packer/ubuntu-12.04-i386.json index 57cfb9e93..0b8235fc0 100644 --- a/packer/ubuntu-12.04-i386.json +++ b/packer/ubuntu-12.04-i386.json @@ -33,7 +33,7 @@ "iso_checksum": "2ec0e913959f6c2ba7a558e8bfa361428bb00e56", "iso_checksum_type": "sha1", "iso_url": "http://releases.ubuntu.com/12.04/ubuntu-12.04.3-server-i386.iso", - "shutdown_command": "echo 'vagrant'|sudo -S sh '/tmp/shutdown.sh'", + "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", @@ -77,7 +77,7 @@ "iso_checksum": "f6fb4e12e12e6ba4247aee5985dd92cc5a653122", "iso_checksum_type": "sha1", "iso_url": "http://releases.ubuntu.com/12.04/ubuntu-12.04.3-server-i386.iso", - "shutdown_command": "echo 'vagrant'|sudo -S sh '/tmp/shutdown.sh'", + "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", @@ -100,12 +100,7 @@ ], "provisioners": [ { - "type": "file", - "source": "scripts/common/shutdown.sh", - "destination": "/tmp/shutdown.sh" - }, - { - "execute_command": "echo 'vagrant'|sudo -S sh '{{.Path}}'", + "execute_command": "echo 'vagrant'|{{.Vars}} sudo -S -E bash '{{.Path}}'", "scripts": [ "scripts/ubuntu/update.sh", "scripts/common/sshd.sh", diff --git a/packer/ubuntu-12.10-amd64.json b/packer/ubuntu-12.10-amd64.json index ad87d7064..78f6bb4d6 100644 --- a/packer/ubuntu-12.10-amd64.json +++ b/packer/ubuntu-12.10-amd64.json @@ -33,7 +33,7 @@ "iso_checksum": "e2a48af008ff3c4db6a8235151a1e90ea600fceb", "iso_checksum_type": "sha1", "iso_url": "http://releases.ubuntu.com/12.10/ubuntu-12.10-server-amd64.iso", - "shutdown_command": "echo 'vagrant'|sudo -S sh '/tmp/shutdown.sh'", + "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", @@ -77,7 +77,7 @@ "iso_checksum": "e2a48af008ff3c4db6a8235151a1e90ea600fceb", "iso_checksum_type": "sha1", "iso_url": "http://releases.ubuntu.com/12.10/ubuntu-12.10-server-amd64.iso", - "shutdown_command": "echo 'vagrant'|sudo -S sh '/tmp/shutdown.sh'", + "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", @@ -100,12 +100,7 @@ ], "provisioners": [ { - "type": "file", - "source": "scripts/common/shutdown.sh", - "destination": "/tmp/shutdown.sh" - }, - { - "execute_command": "echo 'vagrant'|sudo -S sh '{{.Path}}'", + "execute_command": "echo 'vagrant'|{{.Vars}} sudo -S -E bash '{{.Path}}'", "scripts": [ "scripts/ubuntu/update.sh", "scripts/common/sshd.sh", diff --git a/packer/ubuntu-12.10-i386.json b/packer/ubuntu-12.10-i386.json index 6a6ecd1e8..31da1e259 100644 --- a/packer/ubuntu-12.10-i386.json +++ b/packer/ubuntu-12.10-i386.json @@ -33,7 +33,7 @@ "iso_checksum": "e0e48be7ae21003cf0b25591d71d8cdbee7063e7", "iso_checksum_type": "sha1", "iso_url": "http://releases.ubuntu.com/12.10/ubuntu-12.10-server-i386.iso", - "shutdown_command": "echo 'vagrant'|sudo -S sh '/tmp/shutdown.sh'", + "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", @@ -77,7 +77,7 @@ "iso_checksum": "e0e48be7ae21003cf0b25591d71d8cdbee7063e7", "iso_checksum_type": "sha1", "iso_url": "http://releases.ubuntu.com/12.10/ubuntu-12.10-server-i386.iso", - "shutdown_command": "echo 'vagrant'|sudo -S sh '/tmp/shutdown.sh'", + "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", @@ -100,12 +100,7 @@ ], "provisioners": [ { - "type": "file", - "source": "scripts/common/shutdown.sh", - "destination": "/tmp/shutdown.sh" - }, - { - "execute_command": "echo 'vagrant'|sudo -S sh '{{.Path}}'", + "execute_command": "echo 'vagrant'|{{.Vars}} sudo -S -E bash '{{.Path}}'", "scripts": [ "scripts/ubuntu/update.sh", "scripts/common/sshd.sh", diff --git a/packer/ubuntu-13.04-amd64.json b/packer/ubuntu-13.04-amd64.json index c10d5742b..33adfa05f 100644 --- a/packer/ubuntu-13.04-amd64.json +++ b/packer/ubuntu-13.04-amd64.json @@ -33,7 +33,7 @@ "iso_checksum": "2af1c223f586f59237212bb9c06ad774673c8952", "iso_checksum_type": "sha1", "iso_url": "http://releases.ubuntu.com/13.04/ubuntu-13.04-server-amd64.iso", - "shutdown_command": "echo 'vagrant'|sudo -S sh '/tmp/shutdown.sh'", + "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", @@ -78,7 +78,7 @@ "iso_checksum": "2af1c223f586f59237212bb9c06ad774673c8952", "iso_checksum_type": "sha1", "iso_url": "http://releases.ubuntu.com/13.04/ubuntu-13.04-server-amd64.iso", - "shutdown_command": "echo 'vagrant'|sudo -S sh '/tmp/shutdown.sh'", + "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", @@ -101,12 +101,7 @@ ], "provisioners": [ { - "type": "file", - "source": "scripts/common/shutdown.sh", - "destination": "/tmp/shutdown.sh" - }, - { - "execute_command": "echo 'vagrant'|sudo -S sh '{{.Path}}'", + "execute_command": "echo 'vagrant'|{{.Vars}} sudo -S -E bash '{{.Path}}'", "scripts": [ "scripts/ubuntu/update.sh", "scripts/common/sshd.sh", diff --git a/packer/ubuntu-13.04-i386.json b/packer/ubuntu-13.04-i386.json index 94a894e41..b990dad54 100644 --- a/packer/ubuntu-13.04-i386.json +++ b/packer/ubuntu-13.04-i386.json @@ -33,7 +33,7 @@ "iso_checksum": "27bbe172d66d4ce634d10fd655e840f72fe56130", "iso_checksum_type": "sha1", "iso_url": "http://releases.ubuntu.com/13.04/ubuntu-13.04-server-i386.iso", - "shutdown_command": "echo 'vagrant'|sudo -S sh '/tmp/shutdown.sh'", + "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", @@ -77,7 +77,7 @@ "iso_checksum": "27bbe172d66d4ce634d10fd655e840f72fe56130", "iso_checksum_type": "sha1", "iso_url": "http://releases.ubuntu.com/13.04/ubuntu-13.04-server-i386.iso", - "shutdown_command": "echo 'vagrant'|sudo -S sh '/tmp/shutdown.sh'", + "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", @@ -105,7 +105,7 @@ "destination": "/tmp/shutdown.sh" }, { - "execute_command": "echo 'vagrant'|sudo -S sh '{{.Path}}'", + "execute_command": "echo 'vagrant'|{{.Vars}} sudo -S -E bash '{{.Path}}'", "scripts": [ "scripts/ubuntu/update.sh", "scripts/common/sshd.sh", From 48f36ab3ab92b40463e344b64f6394a545c4fb67 Mon Sep 17 00:00:00 2001 From: "Julian C. Dunn" <jdunn@opscode.com> Date: Mon, 30 Sep 2013 16:05:46 -0400 Subject: [PATCH 0083/1622] [BENTO-8] Added FreeBSD 9.1+ZFS packer templates based on veewee template. --- packer/freebsd-9.1-amd64.json | 99 ++++++++++++++++++++ packer/http/freebsd-9.1/install.sh | 99 ++++++++++++++++++++ packer/scripts/freebsd/postinstall.csh | 124 +++++++++++++++++++++++++ 3 files changed, 322 insertions(+) create mode 100644 packer/freebsd-9.1-amd64.json create mode 100644 packer/http/freebsd-9.1/install.sh create mode 100644 packer/scripts/freebsd/postinstall.csh diff --git a/packer/freebsd-9.1-amd64.json b/packer/freebsd-9.1-amd64.json new file mode 100644 index 000000000..ad4c5194b --- /dev/null +++ b/packer/freebsd-9.1-amd64.json @@ -0,0 +1,99 @@ +{ + "provisioners": [ + { + "type": "shell", + "scripts": [ + "scripts/freebsd/postinstall.csh" + ], + "execute_command": "cat '{{.Path}}' | su -" + } + ], + "builders": [ + { + "type": "virtualbox", + "boot_command": [ + "<esc><wait>", + "load geom_mbr<wait>", + "<enter><wait>", + "load zfs<wait>", + "<enter><wait>", + "boot -s<wait>", + "<enter><wait>", + "<wait10><wait10>", + "/bin/sh<enter><wait>", + "mdmfs -s 100m md1 /tmp<enter><wait>", + "dhclient -l /tmp/dhclient.lease.em0 em0<enter><wait>", + "fetch -o /tmp/install.sh http://{{ .HTTPIP }}:{{ .HTTPPort }}/freebsd-9.1/install.sh && chmod +x /tmp/install.sh && /tmp/install.sh {{ .Name }}<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 10140, + "guest_os_type": "FreeBSD_64", + "http_directory": "http", + "iso_checksum": "f0a320fd52383c42649d48ea545915a9", + "iso_checksum_type": "md5", + "iso_url": "http://ftp.freebsd.org/pub/FreeBSD/releases/amd64/amd64/ISO-IMAGES/9.1/FreeBSD-9.1-RELEASE-amd64-disc1.iso", + "ssh_username": "vagrant", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_wait_timeout": "10000s", + "shutdown_command": "echo 'shutdown -p now' > shutdown.sh; cat 'shutdown.sh' | su -", + "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "virtualbox_version_file": ".vbox_version", + "vboxmanage": [ + [ + "modifyvm", + "{{.Name}}", + "--memory", + "512" + ], + [ + "modifyvm", + "{{.Name}}", + "--cpus", + "1" + ] + ] + }, + { + "type": "vmware", + "boot_command": [ + "<esc><wait>", + "load geom_mbr<wait>", + "<enter><wait>", + "load zfs<wait>", + "<enter><wait>", + "boot -s<wait>", + "<enter><wait>", + "<wait10><wait10>", + "/bin/sh<enter><wait>", + "mdmfs -s 100m md1 /tmp<enter><wait>", + "dhclient -l /tmp/dhclient.lease.em0 em0<enter><wait>", + "<wait5>", + "fetch -o /tmp/install.sh http://{{ .HTTPIP }}:{{ .HTTPPort }}/freebsd-9.1/install.sh && chmod +x /tmp/install.sh && /tmp/install.sh {{ .Name }}<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 10140, + "guest_os_type": "freebsd-64", + "http_directory": "http", + "iso_checksum": "f0a320fd52383c42649d48ea545915a9", + "iso_checksum_type": "md5", + "iso_url": "http://ftp.freebsd.org/pub/FreeBSD/releases/amd64/amd64/ISO-IMAGES/9.1/FreeBSD-9.1-RELEASE-amd64-disc1.iso", + "ssh_username": "vagrant", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_wait_timeout": "10000s", + "shutdown_command": "echo 'shutdown -p now' > shutdown.sh; cat 'shutdown.sh' | su -", + "vmx_data": { + "memsize": "512", + "numvcpus": "1", + "cpuid.coresPerSocket": "1" + } + } + ], + "post-processors": [ + { + "output": "freebsd-9.1-amd64-{{.Provider}}.box", + "type": "vagrant" + } + ] +} diff --git a/packer/http/freebsd-9.1/install.sh b/packer/http/freebsd-9.1/install.sh new file mode 100644 index 000000000..1126e39ed --- /dev/null +++ b/packer/http/freebsd-9.1/install.sh @@ -0,0 +1,99 @@ +#!/bin/sh -x + +# Credit: http://www.aisecure.net/2011/05/01/root-on-zfs-freebsd-current/ + +NAME=$1 + +# create disks +# for variations in the root disk device name between VMware and Virtualbox +if [ -e /dev/ada0 ]; then + DISKSLICE=ada0 +else + DISKSLICE=da0 +fi + +gpart create -s gpt $DISKSLICE +gpart add -b 34 -s 94 -t freebsd-boot $DISKSLICE +gpart add -t freebsd-zfs -l disk0 $DISKSLICE +gpart bootcode -b /boot/pmbr -p /boot/gptzfsboot -i 1 $DISKSLICE + +# align disks +gnop create -S 4096 /dev/gpt/disk0 +zpool create -o altroot=/mnt -o cachefile=/tmp/zpool.cache zroot /dev/gpt/disk0.nop +zpool export zroot +gnop destroy /dev/gpt/disk0.nop +zpool import -o altroot=/mnt -o cachefile=/tmp/zpool.cache zroot + +zpool set bootfs=zroot zroot +zfs set checksum=fletcher4 zroot + +# set up zfs pools +zfs create zroot/usr +zfs create zroot/usr/home +zfs create zroot/var +zfs create -o compression=on -o exec=on -o setuid=off zroot/tmp +zfs create -o compression=lzjb -o setuid=off zroot/usr/ports +zfs create -o compression=off -o exec=off -o setuid=off zroot/usr/ports/distfiles +zfs create -o compression=off -o exec=off -o setuid=off zroot/usr/ports/packages +zfs create -o compression=lzjb -o exec=off -o setuid=off zroot/usr/src +zfs create -o compression=lzjb -o exec=off -o setuid=off zroot/var/crash +zfs create -o exec=off -o setuid=off zroot/var/db +zfs create -o compression=lzjb -o exec=on -o setuid=off zroot/var/db/pkg +zfs create -o exec=off -o setuid=off zroot/var/empty +zfs create -o compression=lzjb -o exec=off -o setuid=off zroot/var/log +zfs create -o compression=gzip -o exec=off -o setuid=off zroot/var/mail +zfs create -o exec=off -o setuid=off zroot/var/run +zfs create -o compression=lzjb -o exec=on -o setuid=off zroot/var/tmp + +# fixup +chmod 1777 /mnt/tmp +cd /mnt ; ln -s usr/home home +sleep 10 +chmod 1777 /mnt/var/tmp + +# set up swap +zfs create -V 2G zroot/swap +zfs set org.freebsd:swap=on zroot/swap +zfs set checksum=off zroot/swap + +# Install the OS +cd /usr/freebsd-dist +cat base.txz | tar --unlink -xpJf - -C /mnt +cat lib32.txz | tar --unlink -xpJf - -C /mnt +cat kernel.txz | tar --unlink -xpJf - -C /mnt +cat src.txz | tar --unlink -xpJf - -C /mnt + +cp /tmp/zpool.cache /mnt/boot/zfs/zpool.cache + +sleep 10 +# Enable required services +cat >> /mnt/etc/rc.conf << EOT +zfs_enable="YES" +hostname="${NAME}" +ifconfig_em0="dhcp" +sshd_enable="YES" +EOT + +# Tune and boot from zfs +cat >> /mnt/boot/loader.conf << EOT +zfs_load="YES" +vfs.root.mountfrom="zfs:zroot" +vm.kmem_size="200M" +vm.kmem_size_max="200M" +vfs.zfs.arc_max="40M" +vfs.zfs.vdev.cache.size="5M" +EOT + +# Enable swap +echo '/dev/gpt/swap0 none swap sw 0 0' > /mnt/etc/fstab + +# Set up user accounts +zfs create zroot/usr/home/vagrant +echo "vagrant" | pw -V /mnt/etc useradd vagrant -h 0 -s csh -G wheel -d /home/vagrant -c "Vagrant User" +echo "vagrant" | pw -V /mnt/etc usermod root + +chown 1001:1001 /mnt/home/vagrant + +# Reboot +reboot + diff --git a/packer/scripts/freebsd/postinstall.csh b/packer/scripts/freebsd/postinstall.csh new file mode 100644 index 000000000..9f558cbce --- /dev/null +++ b/packer/scripts/freebsd/postinstall.csh @@ -0,0 +1,124 @@ +#!/bin/csh -x +# NB: at the point when this script is run, vagrant's shell is csh + +set echo + +#Set the time correctly +ntpdate -v -b in.pool.ntp.org + +date > /etc/vagrant_box_build_time + +# allow freebsd-update to run fetch without stdin attached to a terminal +sed 's/\[ ! -t 0 \]/false/' /usr/sbin/freebsd-update > /tmp/freebsd-update +chmod +x /tmp/freebsd-update + +# update FreeBSD +env PAGER=/bin/cat /tmp/freebsd-update fetch +env PAGER=/bin/cat /tmp/freebsd-update install + +# allow portsnap to run fetch without stdin attached to a terminal +sed 's/\[ ! -t 0 \]/false/' /usr/sbin/portsnap > /tmp/portsnap +chmod +x /tmp/portsnap + +# reduce the ports we extract to a minimum +cat >> /etc/portsnap.conf << EOT +REFUSE accessibility arabic archivers astro audio benchmarks biology cad +REFUSE chinese comms databases deskutils distfiles dns editors finance french +REFUSE ftp games german graphics hebrew hungarian irc japanese java korean +REFUSE mail math multimedia net net-im net-mgmt net-p2p news packages palm +REFUSE polish portuguese print russian science sysutils ukrainian +REFUSE vietnamese www x11 x11-clocks x11-drivers x11-fm x11-fonts x11-servers +REFUSE x11-themes x11-toolkits x11-wm +EOT + +# get new ports +/tmp/portsnap fetch extract + +# build packages for sudo and bash +pkg_delete -af +cd /usr/ports/security/sudo +make -DBATCH package-recursive clean +cd /usr/ports/shells/bash-static +make -DBATCH package clean + +#Installing vagrant keys +mkdir /home/vagrant/.ssh +chmod 700 /home/vagrant/.ssh +cd /home/vagrant/.ssh +fetch -am -o authorized_keys 'https://raw.github.com/mitchellh/vagrant/master/keys/vagrant.pub' +chown -R vagrant /home/vagrant/.ssh +chmod -R go-rwsx /home/vagrant/.ssh + +# Cleaning portstree to save space +# http://www.freebsd.org/doc/en_US.ISO8859-1/books/handbook/ports-using.html +cd /usr/ports/ports-mgmt/portupgrade +make install -DBATCH clean + +/usr/local/sbin/portsclean -C + +# As sharedfolders are not in defaults ports tree +# We will use vagrant via NFS +# Enable NFS +echo 'rpcbind_enable="YES"' >> /etc/rc.conf +echo 'nfs_server_enable="YES"' >> /etc/rc.conf +echo 'mountd_flags="-r"' >> /etc/rc.conf + +# Enable passwordless sudo +echo "vagrant ALL=(ALL) NOPASSWD: ALL" >> /usr/local/etc/sudoers +# Restore correct su permissions +# I'll leave that up to the reader :) + +cd /usr/ports/devel/libtool +make clean +make install -DBATCH + +# disable X11 because vagrants are (usually) headless +cat >> /etc/make.conf << EOT +WITHOUT_X11="YES" +EOT + +cd /usr/ports/emulators/virtualbox-ose-additions +make -DBATCH package clean + +cd /usr/ports/emulators/virtio-kmod +make -DBATCH install + +# undo our customizations +sed -i '' -e '/^REFUSE /d' /etc/portsnap.conf +# sed -i '' -e '/^WITHOUT_X11/d' /etc/make.conf + +echo 'vboxdrv_load="YES"' >> /boot/loader.conf +echo 'vboxnet_enable="YES"' >> /etc/rc.conf +echo 'vboxguest_enable="YES"' >> /etc/rc.conf +echo 'vboxservice_enable="YES"' >> /etc/rc.conf + +cat >> /boot/loader.conf << EOT +virtio_load="YES" +virtio_pci_load="YES" +virtio_blk_load="YES" +if_vtnet_load="YES" +virtio_balloon_load="YES" +EOT + +# sed -i.bak -Ee 's|/dev/ada?|/dev/vtbd|' /etc/fstab +echo 'ifconfig_vtnet0_name="em0"' >> /etc/rc.conf +echo 'ifconfig_vtnet1_name="em1"' >> /etc/rc.conf +echo 'ifconfig_vtnet2_name="em2"' >> /etc/rc.conf +echo 'ifconfig_vtnet3_name="em3"' >> /etc/rc.conf + +pw groupadd vboxusers +pw groupmod vboxusers -m vagrant + +#Bash needs to be the shell for tests to validate +pw usermod vagrant -s /usr/local/bin/bash + +echo "==============================================================================" +echo "NOTE: FreeBSD - Vagrant" +echo "When using this basebox you need to do some special stuff in your Vagrantfile" +echo "1) Enable HostOnly network" +echo " config.vm.network ...." +echo "2) Use nfs instead of shared folders" +echo ' config.vm.share_folder("v-root", "/vagrant", ".", :nfs => true)' +echo "=============================================================================" + +exit From e679638c114427ca24f6b3ec35e758c142d2d48b Mon Sep 17 00:00:00 2001 From: "Julian C. Dunn" <jdunn@opscode.com> Date: Tue, 1 Oct 2013 12:32:09 -0400 Subject: [PATCH 0084/1622] Remove bash from the image. It was only needed for veewee validation. --- packer/scripts/freebsd/postinstall.csh | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/packer/scripts/freebsd/postinstall.csh b/packer/scripts/freebsd/postinstall.csh index 9f558cbce..1705c6410 100644 --- a/packer/scripts/freebsd/postinstall.csh +++ b/packer/scripts/freebsd/postinstall.csh @@ -34,12 +34,10 @@ EOT # get new ports /tmp/portsnap fetch extract -# build packages for sudo and bash +# build package for sudo pkg_delete -af cd /usr/ports/security/sudo make -DBATCH package-recursive clean -cd /usr/ports/shells/bash-static -make -DBATCH package clean #Installing vagrant keys mkdir /home/vagrant/.ssh @@ -68,10 +66,6 @@ echo "vagrant ALL=(ALL) NOPASSWD: ALL" >> /usr/local/etc/sudoers # Restore correct su permissions # I'll leave that up to the reader :) -cd /usr/ports/devel/libtool -make clean -make install -DBATCH - # disable X11 because vagrants are (usually) headless cat >> /etc/make.conf << EOT WITHOUT_X11="YES" @@ -85,7 +79,6 @@ make -DBATCH install # undo our customizations sed -i '' -e '/^REFUSE /d' /etc/portsnap.conf -# sed -i '' -e '/^WITHOUT_X11/d' /etc/make.conf echo 'vboxdrv_load="YES"' >> /boot/loader.conf echo 'vboxnet_enable="YES"' >> /etc/rc.conf @@ -109,9 +102,6 @@ echo 'ifconfig_vtnet3_name="em3"' >> /etc/rc.conf pw groupadd vboxusers pw groupmod vboxusers -m vagrant -#Bash needs to be the shell for tests to validate -pw usermod vagrant -s /usr/local/bin/bash - echo "==============================================================================" echo "NOTE: FreeBSD - Vagrant" echo "When using this basebox you need to do some special stuff in your Vagrantfile" From ac643d697bfda1610084a6d5608a5238a1bac7b9 Mon Sep 17 00:00:00 2001 From: Tom Duffield <tom@opscode.com> Date: Tue, 1 Oct 2013 16:42:06 -0500 Subject: [PATCH 0085/1622] add empty builds directory with a subdirectory for each build type --- builds/virtualbox/.gitignore | 4 ++++ builds/vmware/.gitignore | 4 ++++ 2 files changed, 8 insertions(+) create mode 100644 builds/virtualbox/.gitignore create mode 100644 builds/vmware/.gitignore diff --git a/builds/virtualbox/.gitignore b/builds/virtualbox/.gitignore new file mode 100644 index 000000000..86d0cb272 --- /dev/null +++ b/builds/virtualbox/.gitignore @@ -0,0 +1,4 @@ +# Ignore everything in this directory +* +# Except this file +!.gitignore \ No newline at end of file diff --git a/builds/vmware/.gitignore b/builds/vmware/.gitignore new file mode 100644 index 000000000..86d0cb272 --- /dev/null +++ b/builds/vmware/.gitignore @@ -0,0 +1,4 @@ +# Ignore everything in this directory +* +# Except this file +!.gitignore \ No newline at end of file From 05fe17cdd3919e360974e61afe1e9f4f8d60c819 Mon Sep 17 00:00:00 2001 From: Tom Duffield <tom@opscode.com> Date: Tue, 1 Oct 2013 16:56:33 -0500 Subject: [PATCH 0086/1622] vagrant boxes now match current naming conventions and are built into the builds directory --- packer/centos-5.9-i386.json | 2 +- packer/centos-5.9-x86_64.json | 2 +- packer/centos-6.4-i386.json | 2 +- packer/centos-6.4-x86_64.json | 2 +- packer/debian-6.0.7-amd64.json | 2 +- packer/debian-6.0.7-i386.json | 2 +- packer/debian-7.1.0-amd64.json | 2 +- packer/debian-7.1.0-i386.json | 2 +- packer/fedora-18-i386.json | 2 +- packer/fedora-18-x86_64.json | 2 +- packer/fedora-19-i386.json | 2 +- packer/fedora-19-x86_64.json | 2 +- packer/fedora-20-i386.json | 2 +- packer/fedora-20-x86_64.json | 7 +------ packer/freebsd-9.1-amd64.json | 2 +- packer/ubuntu-10.04-amd64.json | 2 +- packer/ubuntu-10.04-i386.json | 2 +- packer/ubuntu-12.04-amd64.json | 2 +- packer/ubuntu-12.04-i386.json | 2 +- packer/ubuntu-12.10-amd64.json | 2 +- packer/ubuntu-12.10-i386.json | 2 +- packer/ubuntu-13.04-amd64.json | 2 +- packer/ubuntu-13.04-i386.json | 2 +- 23 files changed, 23 insertions(+), 28 deletions(-) diff --git a/packer/centos-5.9-i386.json b/packer/centos-5.9-i386.json index 618c9efd5..1d4e7aa2c 100644 --- a/packer/centos-5.9-i386.json +++ b/packer/centos-5.9-i386.json @@ -50,7 +50,7 @@ ], "post-processors": [ { - "output": "centos-5.9-i386-{{.Provider}}.box", + "output": "../builds/{{.Provider}}/opscode_centos-5.9-i386_provisionerless.box", "type": "vagrant" } ], diff --git a/packer/centos-5.9-x86_64.json b/packer/centos-5.9-x86_64.json index 4c18ad766..d29245b0a 100644 --- a/packer/centos-5.9-x86_64.json +++ b/packer/centos-5.9-x86_64.json @@ -50,7 +50,7 @@ ], "post-processors": [ { - "output": "centos-5.9-x86_64-{{.Provider}}.box", + "output": "../builds/{{.Provider}}/opscode_centos-5.9_provisionerless.box", "type": "vagrant" } ], diff --git a/packer/centos-6.4-i386.json b/packer/centos-6.4-i386.json index b14aa69ba..0df6ead14 100644 --- a/packer/centos-6.4-i386.json +++ b/packer/centos-6.4-i386.json @@ -50,7 +50,7 @@ ], "post-processors": [ { - "output": "centos-6.4-i386-{{.Provider}}.box", + "output": "../builds/{{.Provider}}/opscode_centos-6.4-i386_provisionerless.box", "type": "vagrant" } ], diff --git a/packer/centos-6.4-x86_64.json b/packer/centos-6.4-x86_64.json index 6c8d887f3..9fc78042d 100644 --- a/packer/centos-6.4-x86_64.json +++ b/packer/centos-6.4-x86_64.json @@ -50,7 +50,7 @@ ], "post-processors": [ { - "output": "centos-6.4-x86_64-{{.Provider}}.box", + "output": "../builds/{{.Provider}}/opscode_centos-6.4_provisionerless.box", "type": "vagrant" } ], diff --git a/packer/debian-6.0.7-amd64.json b/packer/debian-6.0.7-amd64.json index f03d89417..b4365fd16 100644 --- a/packer/debian-6.0.7-amd64.json +++ b/packer/debian-6.0.7-amd64.json @@ -79,7 +79,7 @@ "post-processors": [ { "type": "vagrant", - "output": "debian-6.0.7-amd64-{{.Provider}}.box" + "output": "../builds/{{.Provider}}/opscode_debian-6.0.7_provisionerless.box" } ], "provisioners": [ diff --git a/packer/debian-6.0.7-i386.json b/packer/debian-6.0.7-i386.json index 6b2a82f7e..208180968 100644 --- a/packer/debian-6.0.7-i386.json +++ b/packer/debian-6.0.7-i386.json @@ -79,7 +79,7 @@ "post-processors": [ { "type": "vagrant", - "output": "debian-6.0.7-i386-{{.Provider}}.box" + "output": "../builds/{{.Provider}}/opscode_debian-6.0.7-i386_provisionerless.box" } ], "provisioners": [ diff --git a/packer/debian-7.1.0-amd64.json b/packer/debian-7.1.0-amd64.json index eab546e0d..47b46cd8a 100644 --- a/packer/debian-7.1.0-amd64.json +++ b/packer/debian-7.1.0-amd64.json @@ -79,7 +79,7 @@ "post-processors": [ { "type": "vagrant", - "output": "debian-7.1.0-amd64-{{.Provider}}.box" + "output": "../builds/{{.Provider}}/opscode_debian-7.1.0_provisionerless.box" } ], "provisioners": [ diff --git a/packer/debian-7.1.0-i386.json b/packer/debian-7.1.0-i386.json index 89937f0c7..917e2824f 100644 --- a/packer/debian-7.1.0-i386.json +++ b/packer/debian-7.1.0-i386.json @@ -79,7 +79,7 @@ "post-processors": [ { "type": "vagrant", - "output": "debian-7.1.0-i386-{{.Provider}}.box" + "output": "../builds/{{.Provider}}/opscode_debian-7.1.0-i386_provisionerless.box" } ], "provisioners": [ diff --git a/packer/fedora-18-i386.json b/packer/fedora-18-i386.json index 6148971a5..35871aef5 100644 --- a/packer/fedora-18-i386.json +++ b/packer/fedora-18-i386.json @@ -52,7 +52,7 @@ ], "post-processors": [ { - "output": "fedora-18-x86_64-{{.Provider}}.box", + "output": "../builds/{{.Provider}}/opscode_fedora-18_provisionerless.box", "type": "vagrant" } ], diff --git a/packer/fedora-18-x86_64.json b/packer/fedora-18-x86_64.json index 14b9fe7a8..eafb7073d 100644 --- a/packer/fedora-18-x86_64.json +++ b/packer/fedora-18-x86_64.json @@ -52,7 +52,7 @@ ], "post-processors": [ { - "output": "fedora-18-x86_64-{{.Provider}}.box", + "output": "../builds/{{.Provider}}/opscode_fedora-18_provisionerless.box", "type": "vagrant" } ], diff --git a/packer/fedora-19-i386.json b/packer/fedora-19-i386.json index 2024dd4dc..192c208e0 100644 --- a/packer/fedora-19-i386.json +++ b/packer/fedora-19-i386.json @@ -50,7 +50,7 @@ ], "post-processors": [ { - "output": "fedora-19-i386-{{.Provider}}.box", + "output": "../builds/{{.Provider}}/opscode_fedora-19-i386_provisionerless.box", "type": "vagrant" } ], diff --git a/packer/fedora-19-x86_64.json b/packer/fedora-19-x86_64.json index 69dba152a..8326bdf42 100644 --- a/packer/fedora-19-x86_64.json +++ b/packer/fedora-19-x86_64.json @@ -50,7 +50,7 @@ ], "post-processors": [ { - "output": "fedora-19-x86_64-{{.Provider}}.box", + "output": "../builds/{{.Provider}}/opscode_fedora-19_provisionerless.box", "type": "vagrant" } ], diff --git a/packer/fedora-20-i386.json b/packer/fedora-20-i386.json index f375a0d2f..a1b9a8394 100644 --- a/packer/fedora-20-i386.json +++ b/packer/fedora-20-i386.json @@ -50,7 +50,7 @@ ], "post-processors": [ { - "output": "fedora-19-i386-{{.Provider}}.box", + "output": "../builds/{{.Provider}}/opscode_fedora-19-i386_provisionerless.box", "type": "vagrant" } ], diff --git a/packer/fedora-20-x86_64.json b/packer/fedora-20-x86_64.json index 500c42c0a..458e3603d 100644 --- a/packer/fedora-20-x86_64.json +++ b/packer/fedora-20-x86_64.json @@ -50,16 +50,11 @@ ], "post-processors": [ { - "output": "fedora-20-x86_64-{{.Provider}}.box", + "output": "../builds/{{.Provider}}/opscode_fedora-20-x86_64_provisionerless.box", "type": "vagrant" } ], "provisioners": [ - { - "type": "file", - "source": "scripts/fedora/shutdown.sh", - "destination": "/tmp/shutdown.sh" - }, { "execute_command": "echo 'vagrant' | {{.Vars}} sudo -E -S bash '{{.Path}}'", "scripts": [ diff --git a/packer/freebsd-9.1-amd64.json b/packer/freebsd-9.1-amd64.json index ad4c5194b..b8268734a 100644 --- a/packer/freebsd-9.1-amd64.json +++ b/packer/freebsd-9.1-amd64.json @@ -92,7 +92,7 @@ ], "post-processors": [ { - "output": "freebsd-9.1-amd64-{{.Provider}}.box", + "output": "../builds/{{.Provider}}/opscode_freebsd-9.1_provisionerless.box", "type": "vagrant" } ] diff --git a/packer/ubuntu-10.04-amd64.json b/packer/ubuntu-10.04-amd64.json index 1b08ca2ca..6941d7211 100644 --- a/packer/ubuntu-10.04-amd64.json +++ b/packer/ubuntu-10.04-amd64.json @@ -94,7 +94,7 @@ ], "post-processors": [ { - "output": "ubuntu-10.04-amd64-{{.Provider}}.box", + "output": "../builds/{{.Provider}}/opscode_ubuntu-10.04_provisionerless.box", "type": "vagrant" } ], diff --git a/packer/ubuntu-10.04-i386.json b/packer/ubuntu-10.04-i386.json index 774e7d03f..8856a91f5 100644 --- a/packer/ubuntu-10.04-i386.json +++ b/packer/ubuntu-10.04-i386.json @@ -94,7 +94,7 @@ ], "post-processors": [ { - "output": "ubuntu-10.04-i386-{{.Provider}}.box", + "output": "../builds/{{.Provider}}/opscode_ubuntu-10.04-i386_provisionerless.box", "type": "vagrant" } ], diff --git a/packer/ubuntu-12.04-amd64.json b/packer/ubuntu-12.04-amd64.json index 82f74989c..9642ff8c6 100644 --- a/packer/ubuntu-12.04-amd64.json +++ b/packer/ubuntu-12.04-amd64.json @@ -95,7 +95,7 @@ "post-processors": [ { "type": "vagrant", - "output": "ubuntu-12.04-amd64-{{.Provider}}.box" + "output": "../builds/{{.Provider}}/opscode_ubuntu-12.04_provisionerless.box" } ], "provisioners": [ diff --git a/packer/ubuntu-12.04-i386.json b/packer/ubuntu-12.04-i386.json index 0b8235fc0..b7702769d 100644 --- a/packer/ubuntu-12.04-i386.json +++ b/packer/ubuntu-12.04-i386.json @@ -94,7 +94,7 @@ ], "post-processors": [ { - "output": "ubuntu-12.04-i386-{{.Provider}}.box", + "output": "../builds/{{.Provider}}/opscode_ubuntu-12.04-i386_provisionerless.box", "type": "vagrant" } ], diff --git a/packer/ubuntu-12.10-amd64.json b/packer/ubuntu-12.10-amd64.json index 78f6bb4d6..8d0b59606 100644 --- a/packer/ubuntu-12.10-amd64.json +++ b/packer/ubuntu-12.10-amd64.json @@ -94,7 +94,7 @@ ], "post-processors": [ { - "output": "ubuntu-12.10-amd64-{{.Provider}}.box", + "output": "../builds/{{.Provider}}/opscode_ubuntu-12.10-amd64_provisionerless.box", "type": "vagrant" } ], diff --git a/packer/ubuntu-12.10-i386.json b/packer/ubuntu-12.10-i386.json index 31da1e259..43deb3acc 100644 --- a/packer/ubuntu-12.10-i386.json +++ b/packer/ubuntu-12.10-i386.json @@ -94,7 +94,7 @@ ], "post-processors": [ { - "output": "ubuntu-12.10-i386-{{.Provider}}.box", + "output": "../builds/{{.Provider}}/opscode_ubuntu-12.10-i386_provisionerless.box", "type": "vagrant" } ], diff --git a/packer/ubuntu-13.04-amd64.json b/packer/ubuntu-13.04-amd64.json index 33adfa05f..e7e94fcaf 100644 --- a/packer/ubuntu-13.04-amd64.json +++ b/packer/ubuntu-13.04-amd64.json @@ -95,7 +95,7 @@ ], "post-processors": [ { - "output": "ubuntu-13.04-amd64-{{.Provider}}.box", + "output": "../builds/{{.Provider}}/opscode_ubuntu-13.04_provisionerless.box", "type": "vagrant" } ], diff --git a/packer/ubuntu-13.04-i386.json b/packer/ubuntu-13.04-i386.json index b990dad54..51363bf4b 100644 --- a/packer/ubuntu-13.04-i386.json +++ b/packer/ubuntu-13.04-i386.json @@ -94,7 +94,7 @@ ], "post-processors": [ { - "output": "ubuntu-13.04-i386-{{.Provider}}.box", + "output": "../builds/{{.Provider}}/opscode_ubuntu-13.04-i386_provisionerless.box", "type": "vagrant" } ], From 4bc2e4dcc41c1a832f252d10585583db8a591313 Mon Sep 17 00:00:00 2001 From: Tom Duffield <tom@opscode.com> Date: Tue, 1 Oct 2013 16:59:10 -0500 Subject: [PATCH 0087/1622] modified .gitignore --- .gitignore | 3 --- 1 file changed, 3 deletions(-) diff --git a/.gitignore b/.gitignore index a5bd03a89..635044e1e 100644 --- a/.gitignore +++ b/.gitignore @@ -5,7 +5,4 @@ iso/ virtualfloppy.vfd packer_cache/ packer.log -vmware/ -virtualbox/ -packer.log .DS_Store From f239b591495677b215a2f63d9980944e33d63df7 Mon Sep 17 00:00:00 2001 From: Tom Duffield <tom@opscode.com> Date: Tue, 1 Oct 2013 21:46:42 -0500 Subject: [PATCH 0088/1622] pointing CentOS 5.9 to the correct HTTP directory --- packer/centos-5.9-i386.json | 2 +- packer/centos-5.9-x86_64.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packer/centos-5.9-i386.json b/packer/centos-5.9-i386.json index 1d4e7aa2c..9aa7c817b 100644 --- a/packer/centos-5.9-i386.json +++ b/packer/centos-5.9-i386.json @@ -2,7 +2,7 @@ "builders": [ { "boot_command": [ - "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/centos-6.4/ks.cfg<enter><wait>" + "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/centos-5.9/ks.cfg<enter><wait>" ], "boot_wait": "10s", "disk_size": 40960, diff --git a/packer/centos-5.9-x86_64.json b/packer/centos-5.9-x86_64.json index d29245b0a..c29c55ed8 100644 --- a/packer/centos-5.9-x86_64.json +++ b/packer/centos-5.9-x86_64.json @@ -2,7 +2,7 @@ "builders": [ { "boot_command": [ - "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/centos-6.4/ks.cfg<enter><wait>" + "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/centos-5.9/ks.cfg<enter><wait>" ], "boot_wait": "10s", "disk_size": 40960, From d82058163ab586f4f62ad18b41549e8959dc18a0 Mon Sep 17 00:00:00 2001 From: "Julian C. Dunn" <jdunn@opscode.com> Date: Tue, 1 Oct 2013 23:58:49 -0400 Subject: [PATCH 0089/1622] Clean FreeBSD boxes to save space. Use Bourne shell for that script, since FreeBSD doesn't have bash by default, and the script will work on all Linuxes anyway. --- packer/freebsd-9.1-amd64.json | 3 ++- packer/scripts/common/minimize.sh | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/packer/freebsd-9.1-amd64.json b/packer/freebsd-9.1-amd64.json index ad4c5194b..7016e1163 100644 --- a/packer/freebsd-9.1-amd64.json +++ b/packer/freebsd-9.1-amd64.json @@ -3,7 +3,8 @@ { "type": "shell", "scripts": [ - "scripts/freebsd/postinstall.csh" + "scripts/freebsd/postinstall.csh", + "scripts/common/minimize.sh" ], "execute_command": "cat '{{.Path}}' | su -" } diff --git a/packer/scripts/common/minimize.sh b/packer/scripts/common/minimize.sh index 66a67663a..9a014d87f 100644 --- a/packer/scripts/common/minimize.sh +++ b/packer/scripts/common/minimize.sh @@ -1,4 +1,4 @@ -#!/bin/bash -eux +#!/bin/sh -eux dd if=/dev/zero of=/EMPTY bs=1M rm -f /EMPTY From 8134df5abdb83b496b1256c456f7b1b27fd9cdf7 Mon Sep 17 00:00:00 2001 From: Tom Duffield <tom@opscode.com> Date: Wed, 2 Oct 2013 09:08:13 -0500 Subject: [PATCH 0090/1622] compressing vboxmanage for freebsd --- packer/freebsd-9.1-amd64.json | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/packer/freebsd-9.1-amd64.json b/packer/freebsd-9.1-amd64.json index 10cf47fff..2a6b148de 100644 --- a/packer/freebsd-9.1-amd64.json +++ b/packer/freebsd-9.1-amd64.json @@ -41,18 +41,8 @@ "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "virtualbox_version_file": ".vbox_version", "vboxmanage": [ - [ - "modifyvm", - "{{.Name}}", - "--memory", - "512" - ], - [ - "modifyvm", - "{{.Name}}", - "--cpus", - "1" - ] + [ "modifyvm", "{{.Name}}", "--memory", "512" ], + [ "modifyvm", "{{.Name}}", "--cpus", "1" ] ] }, { From 224e3d7f3f84487b18bb4a4886334aa58fcb206b Mon Sep 17 00:00:00 2001 From: Tom Duffield <tom@opscode.com> Date: Thu, 3 Oct 2013 15:20:55 -0500 Subject: [PATCH 0091/1622] missed -amd64 on ubuntu 12.10 template --- packer/ubuntu-12.10-amd64.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packer/ubuntu-12.10-amd64.json b/packer/ubuntu-12.10-amd64.json index 8d0b59606..fa7bc0391 100644 --- a/packer/ubuntu-12.10-amd64.json +++ b/packer/ubuntu-12.10-amd64.json @@ -94,7 +94,7 @@ ], "post-processors": [ { - "output": "../builds/{{.Provider}}/opscode_ubuntu-12.10-amd64_provisionerless.box", + "output": "../builds/{{.Provider}}/opscode_ubuntu-12.10_provisionerless.box", "type": "vagrant" } ], From 8d58c071611eb156332ed84697a6843e6bb22f24 Mon Sep 17 00:00:00 2001 From: Sean OMeara <someara@opscode.com> Date: Sun, 13 Oct 2013 13:10:25 -0400 Subject: [PATCH 0092/1622] fixing packer templates to work on vmware --- packer/centos-5.9-i386.json | 5 +++-- packer/centos-5.9-x86_64.json | 5 +++-- packer/centos-6.4-i386.json | 5 +++-- packer/centos-6.4-x86_64.json | 6 +++--- packer/debian-6.0.7-amd64.json | 1 + packer/debian-6.0.7-i386.json | 1 + packer/debian-7.1.0-amd64.json | 1 + packer/debian-7.1.0-i386.json | 1 + packer/fedora-18-i386.json | 7 +++---- packer/fedora-18-x86_64.json | 7 +++---- packer/fedora-19-i386.json | 5 +++-- packer/fedora-19-x86_64.json | 5 +++-- packer/fedora-20-i386.json | 7 ++++--- packer/fedora-20-x86_64.json | 5 +++-- packer/scripts/centos/cleanup.sh | 5 +++++ packer/scripts/common/vmtools.sh | 24 ++++++++++-------------- packer/ubuntu-10.04-amd64.json | 7 +++---- packer/ubuntu-10.04-i386.json | 8 +++----- packer/ubuntu-12.04-amd64.json | 10 ++++------ packer/ubuntu-12.04-i386.json | 9 ++++----- packer/ubuntu-12.10-amd64.json | 11 +++++------ packer/ubuntu-12.10-i386.json | 5 ++--- packer/ubuntu-13.04-amd64.json | 9 ++++----- packer/ubuntu-13.04-i386.json | 9 ++++----- 24 files changed, 79 insertions(+), 79 deletions(-) diff --git a/packer/centos-5.9-i386.json b/packer/centos-5.9-i386.json index 9aa7c817b..b70141288 100644 --- a/packer/centos-5.9-i386.json +++ b/packer/centos-5.9-i386.json @@ -1,6 +1,7 @@ { "builders": [ { + "type": "virtualbox", "boot_command": [ "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/centos-5.9/ks.cfg<enter><wait>" ], @@ -17,7 +18,6 @@ "ssh_port": 22, "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", - "type": "virtualbox", "vboxmanage": [ [ "modifyvm", "{{.Name}}", "--memory", "384" ], [ "modifyvm", "{{.Name}}", "--cpus", "1" ] @@ -25,6 +25,7 @@ "virtualbox_version_file": ".vbox_version" }, { + "type": "vmware", "boot_command": [ "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/centos-5.9/ks.cfg<enter><wait>" ], @@ -35,12 +36,12 @@ "iso_checksum": "78f976b190ce44716eb672f71203df978474dfb4", "iso_checksum_type": "sha1", "iso_url": "http://mirrors.kernel.org/centos/5.9/isos/i386/CentOS-5.9-i386-bin-DVD-1of2.iso", + "tools_upload_flavor": "linux", "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", - "type": "vmware", "vmx_data": { "cpuid.coresPerSocket": "1", "memsize": "384", diff --git a/packer/centos-5.9-x86_64.json b/packer/centos-5.9-x86_64.json index c29c55ed8..3711463d1 100644 --- a/packer/centos-5.9-x86_64.json +++ b/packer/centos-5.9-x86_64.json @@ -1,6 +1,7 @@ { "builders": [ { + "type": "virtualbox", "boot_command": [ "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/centos-5.9/ks.cfg<enter><wait>" ], @@ -17,7 +18,6 @@ "ssh_port": 22, "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", - "type": "virtualbox", "vboxmanage": [ [ "modifyvm", "{{.Name}}", "--memory", "384" ], [ "modifyvm", "{{.Name}}", "--cpus", "1" ] @@ -25,6 +25,7 @@ "virtualbox_version_file": ".vbox_version" }, { + "type": "vmware", "boot_command": [ "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/centos-5.9/ks.cfg<enter><wait>" ], @@ -35,12 +36,12 @@ "iso_checksum": "c12e01b546f00a965b8414abf0860b08d0bba3c9", "iso_checksum_type": "sha1", "iso_url": "http://mirrors.kernel.org/centos/5.9/isos/x86_64/CentOS-5.9-x86_64-bin-DVD-1of2.iso", + "tools_upload_flavor": "linux", "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", - "type": "vmware", "vmx_data": { "cpuid.coresPerSocket": "1", "memsize": "384", diff --git a/packer/centos-6.4-i386.json b/packer/centos-6.4-i386.json index 0df6ead14..f4af904d2 100644 --- a/packer/centos-6.4-i386.json +++ b/packer/centos-6.4-i386.json @@ -1,6 +1,7 @@ { "builders": [ { + "type": "virtualbox", "boot_command": [ "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/centos-6.4/ks.cfg<enter><wait>" ], @@ -17,7 +18,6 @@ "ssh_port": 22, "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", - "type": "virtualbox", "vboxmanage": [ [ "modifyvm", "{{.Name}}", "--memory", "384" ], [ "modifyvm", "{{.Name}}", "--cpus", "1" ] @@ -25,6 +25,7 @@ "virtualbox_version_file": ".vbox_version" }, { + "type": "vmware", "boot_command": [ "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/centos-6.4/ks.cfg<enter><wait>" ], @@ -35,12 +36,12 @@ "iso_checksum": "4bd3a1de6f6dfcd7a2199487abf5a9304d696cae", "iso_checksum_type": "sha1", "iso_url": "http://mirrors.kernel.org/centos/6.4/isos/i386/CentOS-6.4-i386-bin-DVD1.iso", + "tools_upload_flavor": "linux", "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", - "type": "vmware", "vmx_data": { "cpuid.coresPerSocket": "1", "memsize": "480", diff --git a/packer/centos-6.4-x86_64.json b/packer/centos-6.4-x86_64.json index 9fc78042d..76011d8a3 100644 --- a/packer/centos-6.4-x86_64.json +++ b/packer/centos-6.4-x86_64.json @@ -1,6 +1,7 @@ { "builders": [ { + "type": "virtualbox", "boot_command": [ "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/centos-6.4/ks.cfg<enter><wait>" ], @@ -17,7 +18,6 @@ "ssh_port": 22, "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", - "type": "virtualbox", "vboxmanage": [ [ "modifyvm", "{{.Name}}", "--memory", "384" ], [ "modifyvm", "{{.Name}}", "--cpus", "1" ] @@ -25,6 +25,7 @@ "virtualbox_version_file": ".vbox_version" }, { + "type": "vmware", "boot_command": [ "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/centos-6.4/ks.cfg<enter><wait>" ], @@ -35,12 +36,12 @@ "iso_checksum": "8672dc087f1b0eda60b9efaa41b82f034f185e24", "iso_checksum_type": "sha1", "iso_url": "http://mirrors.kernel.org/centos/6.4/isos/x86_64/CentOS-6.4-x86_64-bin-DVD1.iso", + "tools_upload_flavor": "linux", "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", - "type": "vmware", "vmx_data": { "cpuid.coresPerSocket": "1", "memsize": "480", @@ -68,4 +69,3 @@ } ] } - diff --git a/packer/debian-6.0.7-amd64.json b/packer/debian-6.0.7-amd64.json index b4365fd16..e69d028b3 100644 --- a/packer/debian-6.0.7-amd64.json +++ b/packer/debian-6.0.7-amd64.json @@ -26,6 +26,7 @@ "iso_checksum": "33877b8bff3a7def4ba1b551615d8459a3a7b268", "iso_checksum_type": "sha1", "iso_url": "http://cdimage.debian.org/cdimage/archive/6.0.7/amd64/iso-cd/debian-6.0.7-amd64-CD-1.iso", + "tools_upload_flavor": "linux", "ssh_username": "vagrant", "ssh_password": "vagrant", "ssh_port": 22, diff --git a/packer/debian-6.0.7-i386.json b/packer/debian-6.0.7-i386.json index 208180968..b9edde289 100644 --- a/packer/debian-6.0.7-i386.json +++ b/packer/debian-6.0.7-i386.json @@ -26,6 +26,7 @@ "iso_checksum": "de0d9ce1eb8d238dd3747a28586655b526b398a2", "iso_checksum_type": "sha1", "iso_url": "http://cdimage.debian.org/cdimage/archive/6.0.7/i386/iso-cd/debian-6.0.7-i386-CD-1.iso", + "tools_upload_flavor": "linux", "ssh_username": "vagrant", "ssh_password": "vagrant", "ssh_port": 22, diff --git a/packer/debian-7.1.0-amd64.json b/packer/debian-7.1.0-amd64.json index 47b46cd8a..415571b2e 100644 --- a/packer/debian-7.1.0-amd64.json +++ b/packer/debian-7.1.0-amd64.json @@ -26,6 +26,7 @@ "iso_checksum": "a294e443f3bd09414b4c314f1328c170620f879f", "iso_checksum_type": "sha1", "iso_url": "http://cdimage.debian.org/debian-cd/7.1.0/amd64/iso-cd/debian-7.1.0-amd64-CD-1.iso", + "tools_upload_flavor": "linux", "ssh_username": "vagrant", "ssh_password": "vagrant", "ssh_port": 22, diff --git a/packer/debian-7.1.0-i386.json b/packer/debian-7.1.0-i386.json index 917e2824f..8cd139429 100644 --- a/packer/debian-7.1.0-i386.json +++ b/packer/debian-7.1.0-i386.json @@ -26,6 +26,7 @@ "iso_checksum": "fecd8856e6cf5e248a52e31deb9ebb0e61129f82", "iso_checksum_type": "sha1", "iso_url": "http://cdimage.debian.org/debian-cd/7.1.0/i386/iso-cd/debian-7.1.0-i386-CD-1.iso", + "tools_upload_flavor": "linux", "ssh_username": "vagrant", "ssh_password": "vagrant", "ssh_port": 22, diff --git a/packer/fedora-18-i386.json b/packer/fedora-18-i386.json index 35871aef5..9a2fda533 100644 --- a/packer/fedora-18-i386.json +++ b/packer/fedora-18-i386.json @@ -1,6 +1,7 @@ { "builders": [ { + "type": "virtualbox," "boot_command": [ "<tab> linux ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/fedora-18/ks.cfg<enter><wait>" ], @@ -17,7 +18,6 @@ "ssh_port": 22, "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", - "type": "virtualbox", "vboxmanage": [ [ "modifyvm", "{{.Name}}", "--memory", "512" ], [ "modifyvm", "{{.Name}}", "--cpus", "1" ] @@ -25,6 +25,7 @@ "virtualbox_version_file": ".vbox_version" }, { + "type": "vmware", "boot_command": [ "<tab> linux ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/fedora-18/ks.cfg<enter><wait>" ], @@ -35,14 +36,12 @@ "iso_checksum": "a22e6ab7b0e5e93397e4a1d8d994693d0afb9ad46b1f47a4fe10bfbbc2e7f354", "iso_checksum_type": "sha256", "iso_url": "http://mirrors.kernel.org/fedora/releases/18/Fedora/i386/iso/Fedora-18-i386-DVD.iso", + "tools_upload_flavor": "linux", "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", - "tools_upload_flavor": "linux", - "tools_upload_path": "/home/vagrant/vmware_tools.iso", - "type": "vmware", "vmx_data": { "cpuid.coresPerSocket": "1", "memsize": "512", diff --git a/packer/fedora-18-x86_64.json b/packer/fedora-18-x86_64.json index eafb7073d..38ce0a011 100644 --- a/packer/fedora-18-x86_64.json +++ b/packer/fedora-18-x86_64.json @@ -1,6 +1,7 @@ { "builders": [ { + "type": "virtualbox", "boot_command": [ "<tab> linux ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/fedora-18/ks.cfg<enter><wait>" ], @@ -17,7 +18,6 @@ "ssh_port": 22, "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", - "type": "virtualbox", "vboxmanage": [ [ "modifyvm", "{{.Name}}", "--memory", "512" ], [ "modifyvm", "{{.Name}}", "--cpus", "1" ] @@ -25,6 +25,7 @@ "virtualbox_version_file": ".vbox_version" }, { + "type": "vmware", "boot_command": [ "<tab> linux ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/fedora-18/ks.cfg<enter><wait>" ], @@ -35,14 +36,12 @@ "iso_checksum": "91c5f0aca391acf76a047e284144f90d66d3d5f5dcd26b01f368a43236832c03", "iso_checksum_type": "sha256", "iso_url": "http://mirrors.kernel.org/fedora/releases/18/Fedora/x86_64/iso/Fedora-18-x86_64-DVD.iso", + "tools_upload_flavor": "linux", "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", - "tools_upload_flavor": "linux", - "tools_upload_path": "/home/vagrant/vmware_tools.iso", - "type": "vmware", "vmx_data": { "cpuid.coresPerSocket": "1", "memsize": "512", diff --git a/packer/fedora-19-i386.json b/packer/fedora-19-i386.json index 192c208e0..8894ba540 100644 --- a/packer/fedora-19-i386.json +++ b/packer/fedora-19-i386.json @@ -1,6 +1,7 @@ { "builders": [ { + "type": "virtualbox", "boot_command": [ "<tab> linux ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/fedora-19/ks.cfg<enter><wait>" ], @@ -17,7 +18,6 @@ "ssh_port": 22, "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", - "type": "virtualbox", "vboxmanage": [ [ "modifyvm", "{{.Name}}", "--memory", "512" ], [ "modifyvm", "{{.Name}}", "--cpus", "1" ] @@ -25,6 +25,7 @@ "virtualbox_version_file": ".vbox_version" }, { + "type": "vmware", "boot_command": [ "<tab> linux ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/fedora-19/ks.cfg<enter><wait>" ], @@ -35,12 +36,12 @@ "iso_checksum": "0da29695c4f503e2b27350406c1ceb7a4e5b9b699ea722774368fd16ab277bce", "iso_checksum_type": "sha256", "iso_url": "http://mirrors.kernel.org/fedora/releases/19/Fedora/i386/iso/Fedora-19-i386-DVD.iso", + "tools_upload_flavor": "linux", "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", - "type": "vmware", "vmx_data": { "cpuid.coresPerSocket": "1", "memsize": "512", diff --git a/packer/fedora-19-x86_64.json b/packer/fedora-19-x86_64.json index 8326bdf42..3787f2c16 100644 --- a/packer/fedora-19-x86_64.json +++ b/packer/fedora-19-x86_64.json @@ -1,6 +1,7 @@ { "builders": [ { + "type": "virtualbox", "boot_command": [ "<tab> linux ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/fedora-19/ks.cfg<enter><wait>" ], @@ -17,7 +18,6 @@ "ssh_port": 22, "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", - "type": "virtualbox", "vboxmanage": [ [ "modifyvm", "{{.Name}}", "--memory", "512" ], [ "modifyvm", "{{.Name}}", "--cpus", "1" ] @@ -25,6 +25,7 @@ "virtualbox_version_file": ".vbox_version" }, { + "type": "vmware", "boot_command": [ "<tab> linux ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/fedora-19/ks.cfg<enter><wait>" ], @@ -35,12 +36,12 @@ "iso_checksum": "6e7e263e607cfcadc90ea2ef5668aa3945d9eca596485a7a1f8a9f2478cc7084", "iso_checksum_type": "sha256", "iso_url": "http://mirrors.kernel.org/fedora/releases/19/Fedora/x86_64/iso/Fedora-19-x86_64-DVD.iso", + "tools_upload_flavor": "linux", "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", - "type": "vmware", "vmx_data": { "cpuid.coresPerSocket": "1", "memsize": "512", diff --git a/packer/fedora-20-i386.json b/packer/fedora-20-i386.json index a1b9a8394..7e42a5bed 100644 --- a/packer/fedora-20-i386.json +++ b/packer/fedora-20-i386.json @@ -1,6 +1,7 @@ { "builders": [ { + "type": "virtualbox", "boot_command": [ "<tab> linux ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/fedora-19/ks.cfg<enter><wait>" ], @@ -17,7 +18,6 @@ "ssh_port": 22, "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", - "type": "virtualbox", "vboxmanage": [ [ "modifyvm", "{{.Name}}", "--memory", "512" ], [ "modifyvm", "{{.Name}}", "--cpus", "1" ] @@ -25,6 +25,7 @@ "virtualbox_version_file": ".vbox_version" }, { + "type": "vmware", "boot_command": [ "<tab> linux ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/fedora-19/ks.cfg<enter><wait>" ], @@ -34,13 +35,13 @@ "http_directory": "http", "iso_checksum": "0da29695c4f503e2b27350406c1ceb7a4e5b9b699ea722774368fd16ab277bce", "iso_checksum_type": "sha256", - "iso_url": "http://mirrors.kernel.org/fedora/releases/19/Fedora/i386/iso/Fedora-19-i386-DVD.iso", + "iso_url": "http://mirrors.kernel.org/fedora/releases/19/Fedora/i386/iso/Fedora-19-i386-DVD.iso" + "tools_upload_flavor": "linux", "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", - "type": "vmware", "vmx_data": { "cpuid.coresPerSocket": "1", "memsize": "512", diff --git a/packer/fedora-20-x86_64.json b/packer/fedora-20-x86_64.json index 458e3603d..6f6b78d61 100644 --- a/packer/fedora-20-x86_64.json +++ b/packer/fedora-20-x86_64.json @@ -1,6 +1,7 @@ { "builders": [ { + "type": "virtualbox", "boot_command": [ "<tab> linux ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/fedora-20/ks.cfg<enter><wait>" ], @@ -17,7 +18,6 @@ "ssh_port": 22, "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", - "type": "virtualbox", "vboxmanage": [ [ "modifyvm", "{{.Name}}", "--memory", "512" ], [ "modifyvm", "{{.Name}}", "--cpus", "1" ] @@ -25,6 +25,7 @@ "virtualbox_version_file": ".vbox_version" }, { + "type": "vmware", "boot_command": [ "<tab> linux ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/fedora-20/ks.cfg<enter><wait>" ], @@ -35,12 +36,12 @@ "iso_checksum": "749763da40ebf6cb3a9ed46434b2d165d09938cf24b51992da656d9125ff0290", "iso_checksum_type": "sha256", "iso_url": "http://mirrors.kernel.org/fedora/releases/test/20-Alpha/Fedora/x86_64/iso/Fedora-20-Alpha-x86_64-DVD.iso", + "tools_upload_flavor": "linux", "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", - "type": "vmware", "vmx_data": { "cpuid.coresPerSocket": "1", "memsize": "512", diff --git a/packer/scripts/centos/cleanup.sh b/packer/scripts/centos/cleanup.sh index 19e473a9f..cb79a25ec 100644 --- a/packer/scripts/centos/cleanup.sh +++ b/packer/scripts/centos/cleanup.sh @@ -3,3 +3,8 @@ yum -y erase gtk2 libX11 hicolor-icon-theme avahi freetype bitstream-vera-fonts yum -y clean all rm -rf VBoxGuestAdditions_*.iso VBoxGuestAdditions_*.iso.? rm -f /tmp/chef*rpm + +# clean up redhat interface persistence +rm -f /etc/udev/rules.d/70-persistent-net.rules +sed -i 's/^HWADDR.*$//' /etc/sysconfig/network-scripts/ifcfg-eth0 +sed -i 's/^UUID.*$//' /etc/sysconfig/network-scripts/ifcfg-eth0 diff --git a/packer/scripts/common/vmtools.sh b/packer/scripts/common/vmtools.sh index a49332626..e32a29480 100644 --- a/packer/scripts/common/vmtools.sh +++ b/packer/scripts/common/vmtools.sh @@ -10,18 +10,14 @@ if [ -f /home/vagrant/.vbox_version ]; then rm /home/vagrant/*.iso fi -if [ -f /home/vagrant/vmware_tools.iso ]; then - echo "Installing VMWare Tools" - #Set Linux-specific paths and ISO filename - home_dir="/home/vagrant" - iso_name="vmware_tools.iso" - mount_point="/tmp/vmware-tools" - #Run install, unmount ISO and remove it - mkdir ${mount_point} - cd ${home_dir} - /bin/mount -o loop ${iso_name} ${mount_point} - tar zxf ${mount_point}/*.tar.gz && cd vmware-tools-distrib && ./vmware-install.pl --default - /bin/umount ${mount_point} - /bin/rm -rf ${home_dir}/${iso_name} ${home_dir}/vmware-tools-distrib - rmdir ${mount_point} +if [ $PACKER_BUILDER_TYPE == 'vmware' ]; then + mkdir /tmp/vmfusion + mkdir /tmp/vmfusion-archive + mount -o loop /home/vagrant/linux.iso /tmp/vmfusion + tar xzf /tmp/vmfusion/VMwareTools-*.tar.gz -C /tmp/vmfusion-archive + /tmp/vmfusion-archive/vmware-tools-distrib/vmware-install.pl --default + umount /tmp/vmfusion + rm -rf /tmp/vmfusion + rm -rf /tmp/vmfusion-archive + rm /home/vagrant/*.iso fi diff --git a/packer/ubuntu-10.04-amd64.json b/packer/ubuntu-10.04-amd64.json index 6941d7211..b769da5d9 100644 --- a/packer/ubuntu-10.04-amd64.json +++ b/packer/ubuntu-10.04-amd64.json @@ -1,6 +1,7 @@ { "builders": [ { + "type": "virtualbox", "boot_command": [ "<esc><wait>", "<esc><wait>", @@ -38,7 +39,6 @@ "ssh_port": 22, "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", - "type": "virtualbox", "vboxmanage": [ [ "modifyvm", "{{.Name}}", "--memory", "384" ], [ "modifyvm", "{{.Name}}", "--cpus", "1" ] @@ -46,6 +46,7 @@ "virtualbox_version_file": ".vbox_version" }, { + "type": "vmware", "boot_command": [ "<esc><wait>", "<esc><wait>", @@ -77,14 +78,12 @@ "iso_checksum": "796e80702d65f2ee96e88874a1ab437e24df9cd6", "iso_checksum_type": "sha1", "iso_url": "http://releases.ubuntu.com/10.04.4/ubuntu-10.04.4-server-amd64.iso", + "tools_upload_flavor": "linux", "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", - "tools_upload_flavor": "linux", - "tools_upload_path": "/home/vagrant/vmware_tools.iso", - "type": "vmware", "vmx_data": { "cpuid.coresPerSocket": "1", "memsize": "384", diff --git a/packer/ubuntu-10.04-i386.json b/packer/ubuntu-10.04-i386.json index 8856a91f5..bd00e2cb3 100644 --- a/packer/ubuntu-10.04-i386.json +++ b/packer/ubuntu-10.04-i386.json @@ -1,6 +1,7 @@ { "builders": [ { + "type": "virtualbox", "boot_command": [ "<esc><wait>", "<esc><wait>", @@ -38,7 +39,6 @@ "ssh_port": 22, "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", - "type": "virtualbox", "vboxmanage": [ [ "modifyvm", "{{.Name}}", "--memory", "384" ], [ "modifyvm", "{{.Name}}", "--cpus", "1" ] @@ -46,6 +46,7 @@ "virtualbox_version_file": ".vbox_version" }, { + "type": "vmware", "boot_command": [ "<esc><wait>", "<esc><wait>", @@ -77,14 +78,12 @@ "iso_checksum": "5695d8b6b914269d1374ac8d4c3dd3786e92d3fe", "iso_checksum_type": "sha1", "iso_url": "http://releases.ubuntu.com/10.04.4/ubuntu-10.04.4-server-i386.iso", + "tools_upload_flavor": "linux", "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", - "tools_upload_flavor": "linux", - "tools_upload_path": "/home/vagrant/vmware_tools.iso", - "type": "vmware", "vmx_data": { "cpuid.coresPerSocket": "1", "memsize": "384", @@ -115,4 +114,3 @@ } ] } - diff --git a/packer/ubuntu-12.04-amd64.json b/packer/ubuntu-12.04-amd64.json index 429714987..43c8bd5f0 100644 --- a/packer/ubuntu-12.04-amd64.json +++ b/packer/ubuntu-12.04-amd64.json @@ -46,6 +46,7 @@ ] }, { + "type": "vmware", "boot_command": [ "<esc><wait>", "<esc><wait>", @@ -74,17 +75,15 @@ "disk_size": 40960, "guest_os_type": "ubuntu-64", "http_directory": "http", - "iso_checksum": "983cfa31d1a376e0c6d2e431af7e0e5757f8d28a", + "iso_checksum": "4e36c272dde245cfadf14ff8895566571a38f4d2", "iso_checksum_type": "sha1", "iso_url": "http://releases.ubuntu.com/12.04/ubuntu-12.04.3-server-amd64.iso", + "tools_upload_flavor": "linux", "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", - "tools_upload_flavor": "linux", - "tools_upload_path": "/home/vagrant/vmware_tools.iso", - "type": "vmware", "vmx_data": { "cpuid.coresPerSocket": "1", "memsize": "384", @@ -105,7 +104,7 @@ "scripts/ubuntu/update.sh", "scripts/common/sshd.sh", "scripts/ubuntu/networking.sh", - "scripts/common/sudoers.sh", + "scripts/ubuntu/sudoers.sh", "scripts/common/vagrant.sh", "scripts/common/vmtools.sh", "scripts/ubuntu/cleanup.sh", @@ -115,4 +114,3 @@ } ] } - diff --git a/packer/ubuntu-12.04-i386.json b/packer/ubuntu-12.04-i386.json index 1c2e34f37..74f4a0a1d 100644 --- a/packer/ubuntu-12.04-i386.json +++ b/packer/ubuntu-12.04-i386.json @@ -1,6 +1,7 @@ { "builders": [ { + "type": "virtualbox", "boot_command": [ "<esc><wait>", "<esc><wait>", @@ -38,7 +39,6 @@ "ssh_port": 22, "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", - "type": "virtualbox", "vboxmanage": [ [ "modifyvm", "{{.Name}}", "--memory", "384" ], [ "modifyvm", "{{.Name}}", "--cpus", "1" ] @@ -46,6 +46,7 @@ "virtualbox_version_file": ".vbox_version" }, { + "type": "vmware", "boot_command": [ "<esc><wait>", "<esc><wait>", @@ -77,14 +78,12 @@ "iso_checksum": "f6fb4e12e12e6ba4247aee5985dd92cc5a653122", "iso_checksum_type": "sha1", "iso_url": "http://releases.ubuntu.com/12.04/ubuntu-12.04.3-server-i386.iso", + "tools_upload_flavor": "linux", "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", - "tools_upload_flavor": "linux", - "tools_upload_path": "/home/vagrant/vmware_tools.iso", - "type": "vmware", "vmx_data": { "cpuid.coresPerSocket": "1", "memsize": "384", @@ -105,7 +104,7 @@ "scripts/ubuntu/update.sh", "scripts/common/sshd.sh", "scripts/ubuntu/networking.sh", - "scripts/common/sudoers.sh", + "scripts/ubuntu/sudoers.sh", "scripts/common/vagrant.sh", "scripts/common/vmtools.sh", "scripts/ubuntu/cleanup.sh", diff --git a/packer/ubuntu-12.10-amd64.json b/packer/ubuntu-12.10-amd64.json index 061816561..3c07d1b7c 100644 --- a/packer/ubuntu-12.10-amd64.json +++ b/packer/ubuntu-12.10-amd64.json @@ -1,6 +1,7 @@ { "builders": [ { + "type": "virtualbox", "boot_command": [ "<esc><wait>", "<esc><wait>", @@ -38,7 +39,6 @@ "ssh_port": 22, "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", - "type": "virtualbox", "vboxmanage": [ [ "modifyvm", "{{.Name}}", "--memory", "384" ], [ "modifyvm", "{{.Name}}", "--cpus", "1" ] @@ -46,6 +46,7 @@ "virtualbox_version_file": ".vbox_version" }, { + "type": "vmware", "boot_command": [ "<esc><wait>", "<esc><wait>", @@ -77,14 +78,12 @@ "iso_checksum": "e2a48af008ff3c4db6a8235151a1e90ea600fceb", "iso_checksum_type": "sha1", "iso_url": "http://releases.ubuntu.com/12.10/ubuntu-12.10-server-amd64.iso", + "tools_upload_flavor": "linux", "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", - "tools_upload_flavor": "linux", - "tools_upload_path": "/home/vagrant/vmware_tools.iso", - "type": "vmware", "vmx_data": { "cpuid.coresPerSocket": "1", "memsize": "384", @@ -94,7 +93,7 @@ ], "post-processors": [ { - "output": "../builds/{{.Provider}}/opscode_ubuntu-12.10_provisionerless.box", + "output": "../builds/{{.Provider}}/opscode_ubuntu-12.10-amd64_provisionerless.box", "type": "vagrant" } ], @@ -105,7 +104,7 @@ "scripts/ubuntu/update.sh", "scripts/common/sshd.sh", "scripts/ubuntu/networking.sh", - "scripts/common/sudoers.sh", + "scripts/ubuntu/sudoers.sh", "scripts/common/vagrant.sh", "scripts/common/vmtools.sh", "scripts/ubuntu/cleanup.sh", diff --git a/packer/ubuntu-12.10-i386.json b/packer/ubuntu-12.10-i386.json index 1dd5c1f27..6733d1b5e 100644 --- a/packer/ubuntu-12.10-i386.json +++ b/packer/ubuntu-12.10-i386.json @@ -77,13 +77,12 @@ "iso_checksum": "e0e48be7ae21003cf0b25591d71d8cdbee7063e7", "iso_checksum_type": "sha1", "iso_url": "http://releases.ubuntu.com/12.10/ubuntu-12.10-server-i386.iso", + "tools_upload_flavor": "linux", "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", - "tools_upload_flavor": "linux", - "tools_upload_path": "/home/vagrant/vmware_tools.iso", "type": "vmware", "vmx_data": { "cpuid.coresPerSocket": "1", @@ -105,7 +104,7 @@ "scripts/ubuntu/update.sh", "scripts/common/sshd.sh", "scripts/ubuntu/networking.sh", - "scripts/common/sudoers.sh", + "scripts/ubuntu/sudoers.sh", "scripts/common/vagrant.sh", "scripts/common/vmtools.sh", "scripts/ubuntu/cleanup.sh", diff --git a/packer/ubuntu-13.04-amd64.json b/packer/ubuntu-13.04-amd64.json index 21c4046cc..51cf98571 100644 --- a/packer/ubuntu-13.04-amd64.json +++ b/packer/ubuntu-13.04-amd64.json @@ -1,6 +1,7 @@ { "builders": [ { + "type": "virtualbox", "boot_command": [ "<esc><wait>", "<esc><wait>", @@ -38,7 +39,6 @@ "ssh_port": 22, "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", - "type": "virtualbox", "vboxmanage": [ [ "modifyvm", "{{.Name}}", "--memory", "384" ], [ "modifyvm", "{{.Name}}", "--cpus", "1" ] @@ -46,6 +46,7 @@ "virtualbox_version_file": ".vbox_version" }, { + "type": "vmware", "boot_command": [ "<esc><wait>", "<esc><wait>", @@ -78,14 +79,12 @@ "iso_checksum": "2af1c223f586f59237212bb9c06ad774673c8952", "iso_checksum_type": "sha1", "iso_url": "http://releases.ubuntu.com/13.04/ubuntu-13.04-server-amd64.iso", + "tools_upload_flavor": "linux", "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", - "tools_upload_flavor": "linux", - "tools_upload_path": "/home/vagrant/vmware_tools.iso", - "type": "vmware", "vmx_data": { "cpuid.coresPerSocket": "1", "memsize": "384", @@ -106,7 +105,7 @@ "scripts/ubuntu/update.sh", "scripts/common/sshd.sh", "scripts/ubuntu/networking.sh", - "scripts/common/sudoers.sh", + "scripts/ubuntu/sudoers.sh", "scripts/common/vagrant.sh", "scripts/common/vmtools.sh", "scripts/ubuntu/cleanup.sh", diff --git a/packer/ubuntu-13.04-i386.json b/packer/ubuntu-13.04-i386.json index 877bb86e0..5f2371c87 100644 --- a/packer/ubuntu-13.04-i386.json +++ b/packer/ubuntu-13.04-i386.json @@ -1,6 +1,7 @@ { "builders": [ { + "type": "virtualbox", "boot_command": [ "<esc><wait>", "<esc><wait>", @@ -38,7 +39,6 @@ "ssh_port": 22, "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", - "type": "virtualbox", "vboxmanage": [ [ "modifyvm", "{{.Name}}", "--memory", "384" ], [ "modifyvm", "{{.Name}}", "--cpus", "1" ] @@ -46,6 +46,7 @@ "virtualbox_version_file": ".vbox_version" }, { + "type": "vmware", "boot_command": [ "<esc><wait>", "<esc><wait>", @@ -77,14 +78,12 @@ "iso_checksum": "27bbe172d66d4ce634d10fd655e840f72fe56130", "iso_checksum_type": "sha1", "iso_url": "http://releases.ubuntu.com/13.04/ubuntu-13.04-server-i386.iso", + "tools_upload_flavor": "linux", "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", - "tools_upload_flavor": "linux", - "tools_upload_path": "/home/vagrant/vmware_tools.iso", - "type": "vmware", "vmx_data": { "cpuid.coresPerSocket": "1", "memsize": "384", @@ -110,7 +109,7 @@ "scripts/ubuntu/update.sh", "scripts/common/sshd.sh", "scripts/ubuntu/networking.sh", - "scripts/common/sudoers.sh", + "scripts/ubuntu/sudoers.sh", "scripts/common/vagrant.sh", "scripts/common/vmtools.sh", "scripts/ubuntu/cleanup.sh", From 29398d3b1b5b54cc998f0b775244fa1b7e152902 Mon Sep 17 00:00:00 2001 From: "Julian C. Dunn" <jdunn@opscode.com> Date: Thu, 17 Oct 2013 23:51:30 -0400 Subject: [PATCH 0093/1622] Use proper packer env var for checking VirtualBox --- packer/scripts/common/vmtools.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packer/scripts/common/vmtools.sh b/packer/scripts/common/vmtools.sh index e32a29480..2ab74c8ff 100644 --- a/packer/scripts/common/vmtools.sh +++ b/packer/scripts/common/vmtools.sh @@ -1,6 +1,6 @@ #!/bin/bash -if [ -f /home/vagrant/.vbox_version ]; then +if [ $PACKER_BUILDER_TYPE == 'virtualbox' ]; then mkdir /tmp/vbox VER=$(cat /home/vagrant/.vbox_version) mount -o loop /home/vagrant/VBoxGuestAdditions_$VER.iso /tmp/vbox From df7d0ce8846b705fdf0b323e528c621385c31b99 Mon Sep 17 00:00:00 2001 From: John Deatherage <john@routeoflastresort.com> Date: Fri, 18 Oct 2013 13:36:31 -0700 Subject: [PATCH 0094/1622] added ubuntu-13.10 packer templates w/debian sudoers scripts --- packer/http/ubuntu-13.10/preseed.cfg | 31 +++++++ packer/ubuntu-13.10-amd64.json | 117 ++++++++++++++++++++++++++ packer/ubuntu-13.10-i386.json | 121 +++++++++++++++++++++++++++ 3 files changed, 269 insertions(+) create mode 100644 packer/http/ubuntu-13.10/preseed.cfg create mode 100644 packer/ubuntu-13.10-amd64.json create mode 100644 packer/ubuntu-13.10-i386.json diff --git a/packer/http/ubuntu-13.10/preseed.cfg b/packer/http/ubuntu-13.10/preseed.cfg new file mode 100644 index 000000000..0a4d4939b --- /dev/null +++ b/packer/http/ubuntu-13.10/preseed.cfg @@ -0,0 +1,31 @@ +choose-mirror-bin mirror/http/proxy string +d-i base-installer/kernel/override-image string linux-server +d-i clock-setup/utc boolean true +d-i clock-setup/utc-auto boolean true +d-i finish-install/reboot_in_progress note +d-i grub-installer/only_debian boolean true +d-i grub-installer/with_other_os boolean true +d-i partman-auto-lvm/guided_size string max +d-i partman-auto/choose_recipe select atomic +d-i partman-auto/method string lvm +d-i partman-lvm/confirm boolean true +d-i partman-lvm/confirm boolean true +d-i partman-lvm/confirm_nooverwrite boolean true +d-i partman-lvm/device_remove_lvm boolean true +d-i partman/choose_partition select finish +d-i partman/confirm boolean true +d-i partman/confirm_nooverwrite boolean true +d-i partman/confirm_write_new_label boolean true +d-i passwd/user-fullname string vagrant +d-i passwd/user-uid string 900 +d-i passwd/user-password password vagrant +d-i passwd/user-password-again password vagrant +d-i passwd/username string vagrant +d-i pkgsel/include string openssh-server cryptsetup build-essential libssl-dev libreadline-dev zlib1g-dev linux-source dkms nfs-common +d-i pkgsel/install-language-support boolean false +d-i pkgsel/update-policy select unattended-upgrades +d-i pkgsel/upgrade select full-upgrade +d-i time/zone string UTC +d-i user-setup/allow-password-weak boolean true +d-i user-setup/encrypt-home boolean false +tasksel tasksel/first multiselect standard, ubuntu-server diff --git a/packer/ubuntu-13.10-amd64.json b/packer/ubuntu-13.10-amd64.json new file mode 100644 index 000000000..405d4f7e4 --- /dev/null +++ b/packer/ubuntu-13.10-amd64.json @@ -0,0 +1,117 @@ +{ + "builders": [ + { + "type": "virtualbox", + "boot_command": [ + "<esc><wait>", + "<esc><wait>", + "<enter><wait>", + "/install/vmlinuz<wait>", + " auto<wait>", + " console-setup/ask_detect=false<wait>", + " console-setup/layoutcode=us<wait>", + " console-setup/modelcode=pc105<wait>", + " debconf/frontend=noninteractive<wait>", + " debian-installer=en_US<wait>", + " fb=false<wait>", + " initrd=/install/initrd.gz<wait>", + " kbd-chooser/method=us<wait>", + " keyboard-configuration/layout=USA<wait>", + " keyboard-configuration/variant=USA<wait>", + " locale=en_US<wait>", + " netcfg/get_domain=vm<wait>", + " netcfg/get_hostname=vagrant<wait>", + " noapic<wait>", + " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/ubuntu-13.10/preseed.cfg<wait>", + " -- <wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "guest_os_type": "Ubuntu_64", + "http_directory": "http", + "iso_checksum": "5dd72c694c3a7e06a3b4dd651ca26cfc70985004", + "iso_checksum_type": "sha1", + "iso_url": "http://releases.ubuntu.com/13.10/ubuntu-13.10-server-amd64.iso", + "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "vboxmanage": [ + [ "modifyvm", "{{.Name}}", "--memory", "384" ], + [ "modifyvm", "{{.Name}}", "--cpus", "1" ] + ], + "virtualbox_version_file": ".vbox_version" + }, + { + "type": "vmware", + "boot_command": [ + "<esc><wait>", + "<esc><wait>", + "<enter><wait>", + "/install/vmlinuz<wait>", + " auto<wait>", + " console-setup/ask_detect=false<wait>", + " console-setup/layoutcode=us<wait>", + " console-setup/modelcode=pc105<wait>", + " debconf/frontend=noninteractive<wait>", + " debian-installer=en_US<wait>", + " fb=false<wait>", + " initrd=/install/initrd.gz<wait>", + " kbd-chooser/method=us<wait>", + " keyboard-configuration/layout=USA<wait>", + " keyboard-configuration/variant=USA<wait>", + " locale=en_US<wait>", + " netcfg/get_domain=vm<wait>", + " netcfg/get_hostname=vagrant<wait>", + " noapic<wait>", + " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/ubuntu-13.10/preseed.cfg<wait>", + " -- <wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "guest_os_type": "ubuntu-64", + "headless": true, + "http_directory": "http", + "iso_checksum": "5dd72c694c3a7e06a3b4dd651ca26cfc70985004", + "iso_checksum_type": "sha1", + "iso_url": "http://releases.ubuntu.com/13.10/ubuntu-13.10-server-amd64.iso", + "tools_upload_flavor": "linux", + "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "vmx_data": { + "cpuid.coresPerSocket": "1", + "memsize": "384", + "numvcpus": "1" + } + } + ], + "post-processors": [ + { + "output": "../builds/{{.Provider}}/opscode_ubuntu-13.10_provisionerless.box", + "type": "vagrant" + } + ], + "provisioners": [ + { + "execute_command": "echo 'vagrant'|{{.Vars}} sudo -S -E bash '{{.Path}}'", + "scripts": [ + "scripts/ubuntu/update.sh", + "scripts/common/sshd.sh", + "scripts/ubuntu/networking.sh", + "scripts/debian/sudoers.sh", + "scripts/common/vagrant.sh", + "scripts/common/vmtools.sh", + "scripts/ubuntu/cleanup.sh", + "scripts/common/minimize.sh" + ], + "type": "shell" + } + ] +} diff --git a/packer/ubuntu-13.10-i386.json b/packer/ubuntu-13.10-i386.json new file mode 100644 index 000000000..887497ce9 --- /dev/null +++ b/packer/ubuntu-13.10-i386.json @@ -0,0 +1,121 @@ +{ + "builders": [ + { + "type": "virtualbox", + "boot_command": [ + "<esc><wait>", + "<esc><wait>", + "<enter><wait>", + "/install/vmlinuz<wait>", + " auto<wait>", + " console-setup/ask_detect=false<wait>", + " console-setup/layoutcode=us<wait>", + " console-setup/modelcode=pc105<wait>", + " debconf/frontend=noninteractive<wait>", + " debian-installer=en_US<wait>", + " fb=false<wait>", + " initrd=/install/initrd.gz<wait>", + " kbd-chooser/method=us<wait>", + " keyboard-configuration/layout=USA<wait>", + " keyboard-configuration/variant=USA<wait>", + " locale=en_US<wait>", + " netcfg/get_domain=vm<wait>", + " netcfg/get_hostname=vagrant<wait>", + " noapic<wait>", + " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/ubuntu-13.10/preseed.cfg<wait>", + " -- <wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "guest_os_type": "Ubuntu", + "http_directory": "http", + "iso_checksum": "2dda06d01d3ad495b53f7c03a4313b4af76a1c96", + "iso_checksum_type": "sha1", + "iso_url": "http://releases.ubuntu.com/13.10/ubuntu-13.10-server-i386.iso", + "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "vboxmanage": [ + [ "modifyvm", "{{.Name}}", "--memory", "384" ], + [ "modifyvm", "{{.Name}}", "--cpus", "1" ] + ], + "virtualbox_version_file": ".vbox_version" + }, + { + "type": "vmware", + "boot_command": [ + "<esc><wait>", + "<esc><wait>", + "<enter><wait>", + "/install/vmlinuz<wait>", + " auto<wait>", + " console-setup/ask_detect=false<wait>", + " console-setup/layoutcode=us<wait>", + " console-setup/modelcode=pc105<wait>", + " debconf/frontend=noninteractive<wait>", + " debian-installer=en_US<wait>", + " fb=false<wait>", + " initrd=/install/initrd.gz<wait>", + " kbd-chooser/method=us<wait>", + " keyboard-configuration/layout=USA<wait>", + " keyboard-configuration/variant=USA<wait>", + " locale=en_US<wait>", + " netcfg/get_domain=vm<wait>", + " netcfg/get_hostname=vagrant<wait>", + " noapic<wait>", + " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/ubuntu-13.10/preseed.cfg<wait>", + " -- <wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "guest_os_type": "ubuntu", + "http_directory": "http", + "iso_checksum": "2dda06d01d3ad495b53f7c03a4313b4af76a1c96", + "iso_checksum_type": "sha1", + "iso_url": "http://releases.ubuntu.com/13.10/ubuntu-13.10-server-i386.iso", + "tools_upload_flavor": "linux", + "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "vmx_data": { + "cpuid.coresPerSocket": "1", + "memsize": "384", + "numvcpus": "1" + } + } + ], + "post-processors": [ + { + "output": "../builds/{{.Provider}}/opscode_ubuntu-13.10-i386_provisionerless.box", + "type": "vagrant" + } + ], + "provisioners": [ + { + "type": "file", + "source": "scripts/common/shutdown.sh", + "destination": "/tmp/shutdown.sh" + }, + { + "execute_command": "echo 'vagrant'|{{.Vars}} sudo -S -E bash '{{.Path}}'", + "scripts": [ + "scripts/ubuntu/update.sh", + "scripts/common/sshd.sh", + "scripts/ubuntu/networking.sh", + "scripts/debian/sudoers.sh", + "scripts/common/vagrant.sh", + "scripts/common/vmtools.sh", + "scripts/ubuntu/cleanup.sh", + "scripts/common/minimize.sh" + ], + "type": "shell" + } + ] +} From d6bf5caf3fa5150fdedb86a20f217cc6418ca62d Mon Sep 17 00:00:00 2001 From: Sean OMeara <someara@opscode.com> Date: Sun, 20 Oct 2013 16:38:42 -0400 Subject: [PATCH 0095/1622] updating debian-7.1.0 to debian-7.2.0 --- ...an-7.1.0-amd64.json => debian-7.2.0-amd64.json} | 14 +++++++------- ...bian-7.1.0-i386.json => debian-7.2.0-i386.json} | 14 +++++++------- 2 files changed, 14 insertions(+), 14 deletions(-) rename packer/{debian-7.1.0-amd64.json => debian-7.2.0-amd64.json} (86%) rename packer/{debian-7.1.0-i386.json => debian-7.2.0-i386.json} (87%) diff --git a/packer/debian-7.1.0-amd64.json b/packer/debian-7.2.0-amd64.json similarity index 86% rename from packer/debian-7.1.0-amd64.json rename to packer/debian-7.2.0-amd64.json index 415571b2e..e2e74fb1c 100644 --- a/packer/debian-7.1.0-amd64.json +++ b/packer/debian-7.2.0-amd64.json @@ -5,7 +5,7 @@ "boot_command": [ "<esc><wait>", "install <wait>", - "preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/debian-7.1.0/preseed.cfg <wait>", + "preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/debian-7.2.0/preseed.cfg <wait>", "debian-installer=en_US <wait>", "auto <wait>", "locale=en_US <wait>", @@ -23,9 +23,9 @@ "disk_size": 40960, "guest_os_type": "Debian_64", "http_directory": "http", - "iso_checksum": "a294e443f3bd09414b4c314f1328c170620f879f", + "iso_checksum": "c7c1e2bf7ec4760b9fecf77fefa6062b73330359", "iso_checksum_type": "sha1", - "iso_url": "http://cdimage.debian.org/debian-cd/7.1.0/amd64/iso-cd/debian-7.1.0-amd64-CD-1.iso", + "iso_url": "http://cdimage.debian.org/debian-cd/7.2.0/amd64/iso-cd/debian-7.2.0-amd64-CD-1.iso", "tools_upload_flavor": "linux", "ssh_username": "vagrant", "ssh_password": "vagrant", @@ -44,7 +44,7 @@ "boot_command": [ "<esc><wait>", "install <wait>", - "preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/debian-7.1.0/preseed.cfg <wait>", + "preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/debian-7.2.0/preseed.cfg <wait>", "debian-installer=en_US <wait>", "auto <wait>", "locale=en_US <wait>", @@ -62,9 +62,9 @@ "disk_size": 40960, "guest_os_type": "debian5-64", "http_directory": "http", - "iso_checksum": "a294e443f3bd09414b4c314f1328c170620f879f", + "iso_checksum": "c7c1e2bf7ec4760b9fecf77fefa6062b73330359", "iso_checksum_type": "sha1", - "iso_url": "http://cdimage.debian.org/debian-cd/7.1.0/amd64/iso-cd/debian-7.1.0-amd64-CD-1.iso", + "iso_url": "http://cdimage.debian.org/debian-cd/7.2.0/amd64/iso-cd/debian-7.2.0-amd64-CD-1.iso", "ssh_username": "vagrant", "ssh_password": "vagrant", "ssh_port": 22, @@ -80,7 +80,7 @@ "post-processors": [ { "type": "vagrant", - "output": "../builds/{{.Provider}}/opscode_debian-7.1.0_provisionerless.box" + "output": "../builds/{{.Provider}}/opscode_debian-7.2.0_provisionerless.box" } ], "provisioners": [ diff --git a/packer/debian-7.1.0-i386.json b/packer/debian-7.2.0-i386.json similarity index 87% rename from packer/debian-7.1.0-i386.json rename to packer/debian-7.2.0-i386.json index 8cd139429..5a163ffda 100644 --- a/packer/debian-7.1.0-i386.json +++ b/packer/debian-7.2.0-i386.json @@ -5,7 +5,7 @@ "boot_command": [ "<esc><wait>", "install <wait>", - "preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/debian-7.1.0/preseed.cfg <wait>", + "preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/debian-7.2.0/preseed.cfg <wait>", "debian-installer=en_US <wait>", "auto <wait>", "locale=en_US <wait>", @@ -23,9 +23,9 @@ "disk_size": 40960, "guest_os_type": "Debian", "http_directory": "http", - "iso_checksum": "fecd8856e6cf5e248a52e31deb9ebb0e61129f82", + "iso_checksum": "011d42505fdafeb9be2bd0379a12d4042f24cfd5", "iso_checksum_type": "sha1", - "iso_url": "http://cdimage.debian.org/debian-cd/7.1.0/i386/iso-cd/debian-7.1.0-i386-CD-1.iso", + "iso_url": "http://cdimage.debian.org/debian-cd/7.2.0/i386/iso-cd/debian-7.2.0-i386-CD-1.iso", "tools_upload_flavor": "linux", "ssh_username": "vagrant", "ssh_password": "vagrant", @@ -44,7 +44,7 @@ "boot_command": [ "<esc><wait>", "install <wait>", - "preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/debian-7.1.0/preseed.cfg <wait>", + "preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/debian-7.2.0/preseed.cfg <wait>", "debian-installer=en_US <wait>", "auto <wait>", "locale=en_US <wait>", @@ -62,9 +62,9 @@ "disk_size": 40960, "guest_os_type": "debian5", "http_directory": "http", - "iso_checksum": "fecd8856e6cf5e248a52e31deb9ebb0e61129f82", + "iso_checksum": "011d42505fdafeb9be2bd0379a12d4042f24cfd5", "iso_checksum_type": "sha1", - "iso_url": "http://cdimage.debian.org/debian-cd/7.1.0/i386/iso-cd/debian-7.1.0-i386-CD-1.iso", + "iso_url": "http://cdimage.debian.org/debian-cd/7.2.0/i386/iso-cd/debian-7.2.0-i386-CD-1.iso", "ssh_username": "vagrant", "ssh_password": "vagrant", "ssh_port": 22, @@ -80,7 +80,7 @@ "post-processors": [ { "type": "vagrant", - "output": "../builds/{{.Provider}}/opscode_debian-7.1.0-i386_provisionerless.box" + "output": "../builds/{{.Provider}}/opscode_debian-7.2.0-i386_provisionerless.box" } ], "provisioners": [ From 708642ded7d06c64b648e85e1d9fd964ba370dc8 Mon Sep 17 00:00:00 2001 From: Sean OMeara <someara@opscode.com> Date: Mon, 21 Oct 2013 22:14:54 -0400 Subject: [PATCH 0096/1622] updating debian-7 for 7.2.0 --- packer/http/{debian-7.1.0 => debian-7.2.0}/preseed.cfg | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename packer/http/{debian-7.1.0 => debian-7.2.0}/preseed.cfg (100%) diff --git a/packer/http/debian-7.1.0/preseed.cfg b/packer/http/debian-7.2.0/preseed.cfg similarity index 100% rename from packer/http/debian-7.1.0/preseed.cfg rename to packer/http/debian-7.2.0/preseed.cfg From 3fa5285599c9182150297bbb0f2bacb7cc5c6320 Mon Sep 17 00:00:00 2001 From: Sean OMeara <someara@opscode.com> Date: Mon, 21 Oct 2013 22:27:13 -0400 Subject: [PATCH 0097/1622] updating debian-6 for 6.0.8 --- ...an-6.0.7-amd64.json => debian-6.0.8-amd64.json} | 14 +++++++------- ...bian-6.0.7-i386.json => debian-6.0.8-i386.json} | 14 +++++++------- .../{debian-6.0.7 => debian-6.0.8}/preseed.cfg | 0 3 files changed, 14 insertions(+), 14 deletions(-) rename packer/{debian-6.0.7-amd64.json => debian-6.0.8-amd64.json} (90%) rename packer/{debian-6.0.7-i386.json => debian-6.0.8-i386.json} (90%) rename packer/http/{debian-6.0.7 => debian-6.0.8}/preseed.cfg (100%) diff --git a/packer/debian-6.0.7-amd64.json b/packer/debian-6.0.8-amd64.json similarity index 90% rename from packer/debian-6.0.7-amd64.json rename to packer/debian-6.0.8-amd64.json index e69d028b3..5cdddb0dd 100644 --- a/packer/debian-6.0.7-amd64.json +++ b/packer/debian-6.0.8-amd64.json @@ -5,7 +5,7 @@ "boot_command": [ "<esc><wait>", "install <wait>", - "preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/debian-6.0.7/preseed.cfg <wait>", + "preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/debian-6.0.8/preseed.cfg <wait>", "debian-installer=en_US <wait>", "auto <wait>", "locale=en_US <wait>", @@ -23,9 +23,9 @@ "disk_size": 40960, "guest_os_type": "Debian_64", "http_directory": "http", - "iso_checksum": "33877b8bff3a7def4ba1b551615d8459a3a7b268", + "iso_checksum": "144194cea77f0e527fd07bd6aa28d1ab50cb5a95", "iso_checksum_type": "sha1", - "iso_url": "http://cdimage.debian.org/cdimage/archive/6.0.7/amd64/iso-cd/debian-6.0.7-amd64-CD-1.iso", + "iso_url": "http://cdimage.debian.org/cdimage/archive/6.0.8/amd64/iso-cd/debian-6.0.8-amd64-CD-1.iso", "tools_upload_flavor": "linux", "ssh_username": "vagrant", "ssh_password": "vagrant", @@ -44,7 +44,7 @@ "boot_command": [ "<esc><wait>", "install <wait>", - "preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/debian-6.0.7/preseed.cfg <wait>", + "preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/debian-6.0.8/preseed.cfg <wait>", "debian-installer=en_US <wait>", "auto <wait>", "locale=en_US <wait>", @@ -62,9 +62,9 @@ "disk_size": 40960, "guest_os_type": "debian5-64", "http_directory": "http", - "iso_checksum": "33877b8bff3a7def4ba1b551615d8459a3a7b268", + "iso_checksum": "144194cea77f0e527fd07bd6aa28d1ab50cb5a95", "iso_checksum_type": "sha1", - "iso_url": "http://cdimage.debian.org/cdimage/archive/6.0.7/amd64/iso-cd/debian-6.0.7-amd64-CD-1.iso", + "iso_url": "http://cdimage.debian.org/cdimage/archive/6.0.8/amd64/iso-cd/debian-6.0.8-amd64-CD-1.iso", "ssh_username": "vagrant", "ssh_password": "vagrant", "ssh_port": 22, @@ -80,7 +80,7 @@ "post-processors": [ { "type": "vagrant", - "output": "../builds/{{.Provider}}/opscode_debian-6.0.7_provisionerless.box" + "output": "../builds/{{.Provider}}/opscode_debian-6.0.8_provisionerless.box" } ], "provisioners": [ diff --git a/packer/debian-6.0.7-i386.json b/packer/debian-6.0.8-i386.json similarity index 90% rename from packer/debian-6.0.7-i386.json rename to packer/debian-6.0.8-i386.json index b9edde289..5677ab5e4 100644 --- a/packer/debian-6.0.7-i386.json +++ b/packer/debian-6.0.8-i386.json @@ -5,7 +5,7 @@ "boot_command": [ "<esc><wait>", "install <wait>", - "preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/debian-6.0.7/preseed.cfg <wait>", + "preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/debian-6.0.8/preseed.cfg <wait>", "debian-installer=en_US <wait>", "auto <wait>", "locale=en_US <wait>", @@ -23,9 +23,9 @@ "disk_size": 40960, "guest_os_type": "Debian", "http_directory": "http", - "iso_checksum": "de0d9ce1eb8d238dd3747a28586655b526b398a2", + "iso_checksum": "144194cea77f0e527fd07bd6aa28d1ab50cb5a95", "iso_checksum_type": "sha1", - "iso_url": "http://cdimage.debian.org/cdimage/archive/6.0.7/i386/iso-cd/debian-6.0.7-i386-CD-1.iso", + "iso_url": "http://cdimage.debian.org/cdimage/archive/6.0.8/i386/iso-cd/debian-6.0.8-i386-CD-1.iso", "tools_upload_flavor": "linux", "ssh_username": "vagrant", "ssh_password": "vagrant", @@ -44,7 +44,7 @@ "boot_command": [ "<esc><wait>", "install <wait>", - "preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/debian-6.0.7/preseed.cfg <wait>", + "preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/debian-6.0.8/preseed.cfg <wait>", "debian-installer=en_US <wait>", "auto <wait>", "locale=en_US <wait>", @@ -62,9 +62,9 @@ "disk_size": 40960, "guest_os_type": "debian5", "http_directory": "http", - "iso_checksum": "de0d9ce1eb8d238dd3747a28586655b526b398a2", + "iso_checksum": "144194cea77f0e527fd07bd6aa28d1ab50cb5a95", "iso_checksum_type": "sha1", - "iso_url": "http://cdimage.debian.org/cdimage/archive/6.0.7/i386/iso-cd/debian-6.0.7-i386-CD-1.iso", + "iso_url": "http://cdimage.debian.org/cdimage/archive/6.0.8/i386/iso-cd/debian-6.0.8-i386-CD-1.iso", "ssh_username": "vagrant", "ssh_password": "vagrant", "ssh_port": 22, @@ -80,7 +80,7 @@ "post-processors": [ { "type": "vagrant", - "output": "../builds/{{.Provider}}/opscode_debian-6.0.7-i386_provisionerless.box" + "output": "../builds/{{.Provider}}/opscode_debian-6.0.8-i386_provisionerless.box" } ], "provisioners": [ diff --git a/packer/http/debian-6.0.7/preseed.cfg b/packer/http/debian-6.0.8/preseed.cfg similarity index 100% rename from packer/http/debian-6.0.7/preseed.cfg rename to packer/http/debian-6.0.8/preseed.cfg From 29dd3d7ba1190f47d22f0676c231136b44b15c06 Mon Sep 17 00:00:00 2001 From: "Julian C. Dunn" <jdunn@opscode.com> Date: Wed, 23 Oct 2013 22:19:11 -0400 Subject: [PATCH 0098/1622] Upgrade to CentOS 5.10 --- ...centos-5.9-i386.json => centos-5.10-i386.json} | 15 +++++++-------- ...os-5.9-x86_64.json => centos-5.10-x86_64.json} | 15 +++++++-------- packer/http/{centos-5.9 => centos-5.10}/ks.cfg | 0 3 files changed, 14 insertions(+), 16 deletions(-) rename packer/{centos-5.9-i386.json => centos-5.10-i386.json} (78%) rename packer/{centos-5.9-x86_64.json => centos-5.10-x86_64.json} (78%) rename packer/http/{centos-5.9 => centos-5.10}/ks.cfg (100%) diff --git a/packer/centos-5.9-i386.json b/packer/centos-5.10-i386.json similarity index 78% rename from packer/centos-5.9-i386.json rename to packer/centos-5.10-i386.json index b70141288..41ee0109c 100644 --- a/packer/centos-5.9-i386.json +++ b/packer/centos-5.10-i386.json @@ -3,16 +3,16 @@ { "type": "virtualbox", "boot_command": [ - "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/centos-5.9/ks.cfg<enter><wait>" + "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/centos-5.10/ks.cfg<enter><wait>" ], "boot_wait": "10s", "disk_size": 40960, "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "guest_os_type": "RedHat", "http_directory": "http", - "iso_checksum": "78f976b190ce44716eb672f71203df978474dfb4", + "iso_checksum": "bb4e61210e1c0389fdf55c59bd2dd7bc957dd400", "iso_checksum_type": "sha1", - "iso_url": "http://mirrors.kernel.org/centos/5.9/isos/i386/CentOS-5.9-i386-bin-DVD-1of2.iso", + "iso_url": "http://mirrors.kernel.org/centos/5.10/isos/i386/CentOS-5.10-i386-bin-DVD-1of2.iso", "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, @@ -27,15 +27,15 @@ { "type": "vmware", "boot_command": [ - "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/centos-5.9/ks.cfg<enter><wait>" + "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/centos-5.10/ks.cfg<enter><wait>" ], "boot_wait": "10s", "disk_size": 40960, "guest_os_type": "centos", "http_directory": "http", - "iso_checksum": "78f976b190ce44716eb672f71203df978474dfb4", + "iso_checksum": "bb4e61210e1c0389fdf55c59bd2dd7bc957dd400", "iso_checksum_type": "sha1", - "iso_url": "http://mirrors.kernel.org/centos/5.9/isos/i386/CentOS-5.9-i386-bin-DVD-1of2.iso", + "iso_url": "http://mirrors.kernel.org/centos/5.10/isos/i386/CentOS-5.10-i386-bin-DVD-1of2.iso", "tools_upload_flavor": "linux", "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", @@ -51,7 +51,7 @@ ], "post-processors": [ { - "output": "../builds/{{.Provider}}/opscode_centos-5.9-i386_provisionerless.box", + "output": "../builds/{{.Provider}}/opscode_centos-5.10-i386_provisionerless.box", "type": "vagrant" } ], @@ -61,7 +61,6 @@ "scripts": [ "scripts/common/vagrant.sh", "scripts/common/sshd.sh", - "scripts/common/vagrant.sh", "scripts/common/vmtools.sh", "scripts/centos/cleanup.sh", "scripts/common/minimize.sh" diff --git a/packer/centos-5.9-x86_64.json b/packer/centos-5.10-x86_64.json similarity index 78% rename from packer/centos-5.9-x86_64.json rename to packer/centos-5.10-x86_64.json index 3711463d1..d3c6ee149 100644 --- a/packer/centos-5.9-x86_64.json +++ b/packer/centos-5.10-x86_64.json @@ -3,16 +3,16 @@ { "type": "virtualbox", "boot_command": [ - "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/centos-5.9/ks.cfg<enter><wait>" + "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/centos-5.10/ks.cfg<enter><wait>" ], "boot_wait": "10s", "disk_size": 40960, "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "guest_os_type": "RedHat_64", "http_directory": "http", - "iso_checksum": "c12e01b546f00a965b8414abf0860b08d0bba3c9", + "iso_checksum": "d8403b3fe4972eda3e147ee76d682a4a3beae1e1", "iso_checksum_type": "sha1", - "iso_url": "http://mirrors.kernel.org/centos/5.9/isos/x86_64/CentOS-5.9-x86_64-bin-DVD-1of2.iso", + "iso_url": "http://mirrors.kernel.org/centos/5.10/isos/x86_64/CentOS-5.10-x86_64-bin-DVD-1of2.iso", "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, @@ -27,15 +27,15 @@ { "type": "vmware", "boot_command": [ - "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/centos-5.9/ks.cfg<enter><wait>" + "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/centos-5.10/ks.cfg<enter><wait>" ], "boot_wait": "10s", "disk_size": 40960, "guest_os_type": "centos-64", "http_directory": "http", - "iso_checksum": "c12e01b546f00a965b8414abf0860b08d0bba3c9", + "iso_checksum": "d8403b3fe4972eda3e147ee76d682a4a3beae1e1", "iso_checksum_type": "sha1", - "iso_url": "http://mirrors.kernel.org/centos/5.9/isos/x86_64/CentOS-5.9-x86_64-bin-DVD-1of2.iso", + "iso_url": "http://mirrors.kernel.org/centos/5.10/isos/x86_64/CentOS-5.10-x86_64-bin-DVD-1of2.iso", "tools_upload_flavor": "linux", "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", @@ -51,7 +51,7 @@ ], "post-processors": [ { - "output": "../builds/{{.Provider}}/opscode_centos-5.9_provisionerless.box", + "output": "../builds/{{.Provider}}/opscode_centos-5.10_provisionerless.box", "type": "vagrant" } ], @@ -61,7 +61,6 @@ "scripts": [ "scripts/common/vagrant.sh", "scripts/common/sshd.sh", - "scripts/common/vagrant.sh", "scripts/common/vmtools.sh", "scripts/centos/cleanup.sh", "scripts/common/minimize.sh" diff --git a/packer/http/centos-5.9/ks.cfg b/packer/http/centos-5.10/ks.cfg similarity index 100% rename from packer/http/centos-5.9/ks.cfg rename to packer/http/centos-5.10/ks.cfg From c583af142098d162f1d9fdabf5d734280c60f400 Mon Sep 17 00:00:00 2001 From: "Julian C. Dunn" <jdunn@opscode.com> Date: Wed, 30 Oct 2013 17:03:22 -0400 Subject: [PATCH 0099/1622] CentOS 6.4 won't install with only 384MB of RAM -- this was fixed in the vmware section but not in the virtualbox section, so copy it. --- packer/centos-6.4-i386.json | 2 +- packer/centos-6.4-x86_64.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packer/centos-6.4-i386.json b/packer/centos-6.4-i386.json index f4af904d2..cb9ad4f76 100644 --- a/packer/centos-6.4-i386.json +++ b/packer/centos-6.4-i386.json @@ -19,7 +19,7 @@ "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", "vboxmanage": [ - [ "modifyvm", "{{.Name}}", "--memory", "384" ], + [ "modifyvm", "{{.Name}}", "--memory", "480" ], [ "modifyvm", "{{.Name}}", "--cpus", "1" ] ], "virtualbox_version_file": ".vbox_version" diff --git a/packer/centos-6.4-x86_64.json b/packer/centos-6.4-x86_64.json index 76011d8a3..bef6db39a 100644 --- a/packer/centos-6.4-x86_64.json +++ b/packer/centos-6.4-x86_64.json @@ -19,7 +19,7 @@ "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", "vboxmanage": [ - [ "modifyvm", "{{.Name}}", "--memory", "384" ], + [ "modifyvm", "{{.Name}}", "--memory", "480" ], [ "modifyvm", "{{.Name}}", "--cpus", "1" ] ], "virtualbox_version_file": ".vbox_version" From 3f6f5ebfbf6262ca01890ddc89c984b7a0a87499 Mon Sep 17 00:00:00 2001 From: Sean OMeara <someara@opscode.com> Date: Wed, 30 Oct 2013 18:10:21 -0400 Subject: [PATCH 0100/1622] setting selinux to permissive by default. testing of selinux cookbook is broken with disabled --- definitions/.centos/ks.cfg | 2 +- packer/http/centos-6.4/ks.cfg | 2 +- packer/scripts/centos/ks.cfg | 2 +- packer/scripts/fedora/ks.cfg | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/definitions/.centos/ks.cfg b/definitions/.centos/ks.cfg index e00fd5a2a..3f71306d4 100644 --- a/definitions/.centos/ks.cfg +++ b/definitions/.centos/ks.cfg @@ -6,7 +6,7 @@ network --bootproto=dhcp rootpw --iscrypted $1$damlkd,f$UC/u5pUts5QiU3ow.CSso/ firewall --disabled authconfig --enableshadow --passalgo=sha512 -selinux --disabled +selinux --permissive timezone UTC bootloader --location=mbr text diff --git a/packer/http/centos-6.4/ks.cfg b/packer/http/centos-6.4/ks.cfg index e00fd5a2a..3f71306d4 100644 --- a/packer/http/centos-6.4/ks.cfg +++ b/packer/http/centos-6.4/ks.cfg @@ -6,7 +6,7 @@ network --bootproto=dhcp rootpw --iscrypted $1$damlkd,f$UC/u5pUts5QiU3ow.CSso/ firewall --disabled authconfig --enableshadow --passalgo=sha512 -selinux --disabled +selinux --permissive timezone UTC bootloader --location=mbr text diff --git a/packer/scripts/centos/ks.cfg b/packer/scripts/centos/ks.cfg index e00fd5a2a..3f71306d4 100644 --- a/packer/scripts/centos/ks.cfg +++ b/packer/scripts/centos/ks.cfg @@ -6,7 +6,7 @@ network --bootproto=dhcp rootpw --iscrypted $1$damlkd,f$UC/u5pUts5QiU3ow.CSso/ firewall --disabled authconfig --enableshadow --passalgo=sha512 -selinux --disabled +selinux --permissive timezone UTC bootloader --location=mbr text diff --git a/packer/scripts/fedora/ks.cfg b/packer/scripts/fedora/ks.cfg index 92561c227..55dc04972 100644 --- a/packer/scripts/fedora/ks.cfg +++ b/packer/scripts/fedora/ks.cfg @@ -6,7 +6,7 @@ network --bootproto=dhcp rootpw --iscrypted $1$damlkd,f$UC/u5pUts5QiU3ow.CSso/ firewall --disabled authconfig --enableshadow --passalgo=sha512 -selinux --disabled +selinux --permissive timezone UTC bootloader --location=mbr text From 1cd5692dbb1ca23d82a751c31539f9bb9271ccc3 Mon Sep 17 00:00:00 2001 From: "Julian C. Dunn" <jdunn@opscode.com> Date: Thu, 31 Oct 2013 00:09:41 -0400 Subject: [PATCH 0101/1622] Fix all Packer validation errors --- packer/debian-6.0.8-amd64.json | 2 +- packer/debian-6.0.8-i386.json | 2 +- packer/debian-7.2.0-amd64.json | 2 +- packer/debian-7.2.0-i386.json | 2 +- packer/fedora-18-i386.json | 2 +- packer/fedora-20-i386.json | 4 ++-- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/packer/debian-6.0.8-amd64.json b/packer/debian-6.0.8-amd64.json index 5cdddb0dd..c31297675 100644 --- a/packer/debian-6.0.8-amd64.json +++ b/packer/debian-6.0.8-amd64.json @@ -26,7 +26,6 @@ "iso_checksum": "144194cea77f0e527fd07bd6aa28d1ab50cb5a95", "iso_checksum_type": "sha1", "iso_url": "http://cdimage.debian.org/cdimage/archive/6.0.8/amd64/iso-cd/debian-6.0.8-amd64-CD-1.iso", - "tools_upload_flavor": "linux", "ssh_username": "vagrant", "ssh_password": "vagrant", "ssh_port": 22, @@ -70,6 +69,7 @@ "ssh_port": 22, "ssh_wait_timeout": "10000s", "shutdown_command": "echo 'vagrant'|sudo -S /sbin/shutdown -hP now", + "tools_upload_flavor": "linux", "vmx_data": { "memsize": "384", "numvcpus": "1", diff --git a/packer/debian-6.0.8-i386.json b/packer/debian-6.0.8-i386.json index 5677ab5e4..209aed76a 100644 --- a/packer/debian-6.0.8-i386.json +++ b/packer/debian-6.0.8-i386.json @@ -26,7 +26,6 @@ "iso_checksum": "144194cea77f0e527fd07bd6aa28d1ab50cb5a95", "iso_checksum_type": "sha1", "iso_url": "http://cdimage.debian.org/cdimage/archive/6.0.8/i386/iso-cd/debian-6.0.8-i386-CD-1.iso", - "tools_upload_flavor": "linux", "ssh_username": "vagrant", "ssh_password": "vagrant", "ssh_port": 22, @@ -70,6 +69,7 @@ "ssh_port": 22, "ssh_wait_timeout": "10000s", "shutdown_command": "echo 'vagrant'|sudo -S /sbin/shutdown -hP now", + "tools_upload_flavor": "linux", "vmx_data": { "memsize": "384", "numvcpus": "1", diff --git a/packer/debian-7.2.0-amd64.json b/packer/debian-7.2.0-amd64.json index e2e74fb1c..3bc593a3f 100644 --- a/packer/debian-7.2.0-amd64.json +++ b/packer/debian-7.2.0-amd64.json @@ -26,7 +26,6 @@ "iso_checksum": "c7c1e2bf7ec4760b9fecf77fefa6062b73330359", "iso_checksum_type": "sha1", "iso_url": "http://cdimage.debian.org/debian-cd/7.2.0/amd64/iso-cd/debian-7.2.0-amd64-CD-1.iso", - "tools_upload_flavor": "linux", "ssh_username": "vagrant", "ssh_password": "vagrant", "ssh_port": 22, @@ -70,6 +69,7 @@ "ssh_port": 22, "ssh_wait_timeout": "10000s", "shutdown_command": "echo 'vagrant'|sudo -S /sbin/shutdown -hP now", + "tools_upload_flavor": "linux", "vmx_data": { "memsize": "384", "numvcpus": "1", diff --git a/packer/debian-7.2.0-i386.json b/packer/debian-7.2.0-i386.json index 5a163ffda..c3103c46a 100644 --- a/packer/debian-7.2.0-i386.json +++ b/packer/debian-7.2.0-i386.json @@ -26,7 +26,6 @@ "iso_checksum": "011d42505fdafeb9be2bd0379a12d4042f24cfd5", "iso_checksum_type": "sha1", "iso_url": "http://cdimage.debian.org/debian-cd/7.2.0/i386/iso-cd/debian-7.2.0-i386-CD-1.iso", - "tools_upload_flavor": "linux", "ssh_username": "vagrant", "ssh_password": "vagrant", "ssh_port": 22, @@ -70,6 +69,7 @@ "ssh_port": 22, "ssh_wait_timeout": "10000s", "shutdown_command": "echo 'vagrant'|sudo -S /sbin/shutdown -hP now", + "tools_upload_flavor": "linux", "vmx_data": { "memsize": "384", "numvcpus": "1", diff --git a/packer/fedora-18-i386.json b/packer/fedora-18-i386.json index 9a2fda533..67c413f58 100644 --- a/packer/fedora-18-i386.json +++ b/packer/fedora-18-i386.json @@ -1,7 +1,7 @@ { "builders": [ { - "type": "virtualbox," + "type": "virtualbox", "boot_command": [ "<tab> linux ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/fedora-18/ks.cfg<enter><wait>" ], diff --git a/packer/fedora-20-i386.json b/packer/fedora-20-i386.json index 7e42a5bed..ca196ff4e 100644 --- a/packer/fedora-20-i386.json +++ b/packer/fedora-20-i386.json @@ -33,9 +33,9 @@ "disk_size": 40960, "guest_os_type": "fedora", "http_directory": "http", - "iso_checksum": "0da29695c4f503e2b27350406c1ceb7a4e5b9b699ea722774368fd16ab277bce", + "iso_checksum": "24e3a6446b7e2e2b0a3591271c896c41eae01f733a65aa4f5bf43e99bfcfc25e", "iso_checksum_type": "sha256", - "iso_url": "http://mirrors.kernel.org/fedora/releases/19/Fedora/i386/iso/Fedora-19-i386-DVD.iso" + "iso_url": "http://mirrors.kernel.org/fedora/releases/20/Fedora/i386/iso/Fedora-20-i386-DVD.iso", "tools_upload_flavor": "linux", "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", "ssh_password": "vagrant", From 266efe1986ddd90cd6af91a376b647251303f326 Mon Sep 17 00:00:00 2001 From: Andy Thompson <athompson@inviqa.com> Date: Sat, 2 Nov 2013 12:53:15 +0000 Subject: [PATCH 0102/1622] [BENTO-5] Add NFS client capability to CentOS and Fedora templates. All other packer templates already have this added. --- packer/http/centos-5.10/ks.cfg | 1 + packer/http/centos-6.4/ks.cfg | 1 + packer/http/fedora-18/ks.cfg | 1 + packer/http/fedora-19/ks.cfg | 1 + packer/http/fedora-20/ks.cfg | 1 + packer/scripts/centos/ks.cfg | 1 + packer/scripts/fedora/ks.cfg | 1 + 7 files changed, 7 insertions(+) diff --git a/packer/http/centos-5.10/ks.cfg b/packer/http/centos-5.10/ks.cfg index e00fd5a2a..089c44b39 100644 --- a/packer/http/centos-5.10/ks.cfg +++ b/packer/http/centos-5.10/ks.cfg @@ -26,6 +26,7 @@ openssl-devel readline-devel zlib-devel kernel-devel +nfs-utils %post # update root certs diff --git a/packer/http/centos-6.4/ks.cfg b/packer/http/centos-6.4/ks.cfg index 3f71306d4..0cbcda37d 100644 --- a/packer/http/centos-6.4/ks.cfg +++ b/packer/http/centos-6.4/ks.cfg @@ -26,6 +26,7 @@ openssl-devel readline-devel zlib-devel kernel-devel +nfs-utils %post # update root certs diff --git a/packer/http/fedora-18/ks.cfg b/packer/http/fedora-18/ks.cfg index 786aa3aeb..fa3928b25 100644 --- a/packer/http/fedora-18/ks.cfg +++ b/packer/http/fedora-18/ks.cfg @@ -35,6 +35,7 @@ tar wget net-tools zlib-devel +nfs-utils %end %post diff --git a/packer/http/fedora-19/ks.cfg b/packer/http/fedora-19/ks.cfg index 786aa3aeb..fa3928b25 100644 --- a/packer/http/fedora-19/ks.cfg +++ b/packer/http/fedora-19/ks.cfg @@ -35,6 +35,7 @@ tar wget net-tools zlib-devel +nfs-utils %end %post diff --git a/packer/http/fedora-20/ks.cfg b/packer/http/fedora-20/ks.cfg index 786aa3aeb..fa3928b25 100644 --- a/packer/http/fedora-20/ks.cfg +++ b/packer/http/fedora-20/ks.cfg @@ -35,6 +35,7 @@ tar wget net-tools zlib-devel +nfs-utils %end %post diff --git a/packer/scripts/centos/ks.cfg b/packer/scripts/centos/ks.cfg index 3f71306d4..0cbcda37d 100644 --- a/packer/scripts/centos/ks.cfg +++ b/packer/scripts/centos/ks.cfg @@ -26,6 +26,7 @@ openssl-devel readline-devel zlib-devel kernel-devel +nfs-utils %post # update root certs diff --git a/packer/scripts/fedora/ks.cfg b/packer/scripts/fedora/ks.cfg index 55dc04972..aee62b7f3 100644 --- a/packer/scripts/fedora/ks.cfg +++ b/packer/scripts/fedora/ks.cfg @@ -34,6 +34,7 @@ readline-devel tar wget zlib-devel +nfs-utils %end %post From 25612e524214c98e32f049f18c1be610f3ffb8f5 Mon Sep 17 00:00:00 2001 From: "Julian C. Dunn" <jdunn@opscode.com> Date: Thu, 31 Oct 2013 16:41:55 -0400 Subject: [PATCH 0103/1622] Added templates for RHEL. These re-use the CentOS kickstart scripts, but have the correct ISO checksums. --- packer/rhel-5.10-i386.json | 71 +++++++++++++++++++++++++++++++++++ packer/rhel-5.10-x86_64.json | 71 +++++++++++++++++++++++++++++++++++ packer/rhel-6.4-i386.json | 72 ++++++++++++++++++++++++++++++++++++ packer/rhel-6.4-x86_64.json | 71 +++++++++++++++++++++++++++++++++++ 4 files changed, 285 insertions(+) create mode 100644 packer/rhel-5.10-i386.json create mode 100644 packer/rhel-5.10-x86_64.json create mode 100644 packer/rhel-6.4-i386.json create mode 100644 packer/rhel-6.4-x86_64.json diff --git a/packer/rhel-5.10-i386.json b/packer/rhel-5.10-i386.json new file mode 100644 index 000000000..552fc802e --- /dev/null +++ b/packer/rhel-5.10-i386.json @@ -0,0 +1,71 @@ +{ + "builders": [ + { + "type": "virtualbox", + "boot_command": [ + "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/centos-5.10/ks.cfg<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "guest_os_type": "RedHat", + "http_directory": "http", + "iso_checksum": "3a4db78ab70d866057c5285e0064d78125e1b8fd9dcaefea28818f6604b3515d", + "iso_checksum_type": "sha256", + "iso_url": "https://content-web.rhn.redhat.com/rhn/isos/rhel-5.10/md5sum/1ab756241a4a209b8d39abe6bace84a9/rhel-server-5.10-i386-dvd.iso", + "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "vboxmanage": [ + [ "modifyvm", "{{.Name}}", "--memory", "384" ], + [ "modifyvm", "{{.Name}}", "--cpus", "1" ] + ], + "virtualbox_version_file": ".vbox_version" + }, + { + "type": "vmware", + "boot_command": [ + "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/centos-5.10/ks.cfg<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "guest_os_type": "redhat", + "http_directory": "http", + "iso_checksum": "3a4db78ab70d866057c5285e0064d78125e1b8fd9dcaefea28818f6604b3515d", + "iso_checksum_type": "sha256", + "iso_url": "https://content-web.rhn.redhat.com/rhn/isos/rhel-5.10/md5sum/1ab756241a4a209b8d39abe6bace84a9/rhel-server-5.10-i386-dvd.iso", + "tools_upload_flavor": "linux", + "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "vmx_data": { + "cpuid.coresPerSocket": "1", + "memsize": "384", + "numvcpus": "1" + } + } + ], + "post-processors": [ + { + "output": "../builds/{{.Provider}}/opscode_rhel-5.10-i386_provisionerless.box", + "type": "vagrant" + } + ], + "provisioners": [ + { + "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E bash '{{.Path}}'", + "scripts": [ + "scripts/common/vagrant.sh", + "scripts/common/sshd.sh", + "scripts/common/vmtools.sh", + "scripts/centos/cleanup.sh", + "scripts/common/minimize.sh" + ], + "type": "shell" + } + ] +} diff --git a/packer/rhel-5.10-x86_64.json b/packer/rhel-5.10-x86_64.json new file mode 100644 index 000000000..9c55fb3f6 --- /dev/null +++ b/packer/rhel-5.10-x86_64.json @@ -0,0 +1,71 @@ +{ + "builders": [ + { + "type": "virtualbox", + "boot_command": [ + "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/centos-5.10/ks.cfg<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "guest_os_type": "RedHat_64", + "http_directory": "http", + "iso_checksum": "8b38e74b0993d478aad9c950f51a3e3441199639a3422e06fc3beca1f8825bf2", + "iso_checksum_type": "sha256", + "iso_url": "https://content-web.rhn.redhat.com/rhn/isos/rhel-5.10/md5sum/86cc2d5548ee2ff9c8d3e2b4db3e6001/rhel-server-5.10-x86_64-dvd.iso", + "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "vboxmanage": [ + [ "modifyvm", "{{.Name}}", "--memory", "384" ], + [ "modifyvm", "{{.Name}}", "--cpus", "1" ] + ], + "virtualbox_version_file": ".vbox_version" + }, + { + "type": "vmware", + "boot_command": [ + "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/centos-5.10/ks.cfg<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "guest_os_type": "redhat-64", + "http_directory": "http", + "iso_checksum": "8b38e74b0993d478aad9c950f51a3e3441199639a3422e06fc3beca1f8825bf2", + "iso_checksum_type": "sha256", + "iso_url": "https://content-web.rhn.redhat.com/rhn/isos/rhel-5.10/md5sum/86cc2d5548ee2ff9c8d3e2b4db3e6001/rhel-server-5.10-x86_64-dvd.iso", + "tools_upload_flavor": "linux", + "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "vmx_data": { + "cpuid.coresPerSocket": "1", + "memsize": "384", + "numvcpus": "1" + } + } + ], + "post-processors": [ + { + "output": "../builds/{{.Provider}}/opscode_rhel-5.10_provisionerless.box", + "type": "vagrant" + } + ], + "provisioners": [ + { + "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E bash '{{.Path}}'", + "scripts": [ + "scripts/common/vagrant.sh", + "scripts/common/sshd.sh", + "scripts/common/vmtools.sh", + "scripts/centos/cleanup.sh", + "scripts/common/minimize.sh" + ], + "type": "shell" + } + ] +} diff --git a/packer/rhel-6.4-i386.json b/packer/rhel-6.4-i386.json new file mode 100644 index 000000000..cb673c2b3 --- /dev/null +++ b/packer/rhel-6.4-i386.json @@ -0,0 +1,72 @@ +{ + "builders": [ + { + "type": "virtualbox", + "boot_command": [ + "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/centos-6.4/ks.cfg<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "guest_os_type": "RedHat", + "http_directory": "http", + "iso_checksum": "d953b7e1cc9fcc0415b78dcd79737929842575ae8b903d6868e337a2a21dcaee", + "iso_checksum_type": "sha256", + "iso_url": "https://content-web.rhn.redhat.com/rhn/isos/rhel-6.4/md5sum/2f1927af5bca9a34f2d9488655b4fdf4/rhel-server-6.4-i386-dvd.iso", + "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "vboxmanage": [ + [ "modifyvm", "{{.Name}}", "--memory", "480" ], + [ "modifyvm", "{{.Name}}", "--cpus", "1" ] + ], + "virtualbox_version_file": ".vbox_version" + }, + { + "type": "vmware", + "boot_command": [ + "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/centos-6.4/ks.cfg<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "guest_os_type": "redhat", + "http_directory": "http", + "iso_checksum": "d953b7e1cc9fcc0415b78dcd79737929842575ae8b903d6868e337a2a21dcaee", + "iso_checksum_type": "sha256", + "iso_url": "https://content-web.rhn.redhat.com/rhn/isos/rhel-6.4/md5sum/2f1927af5bca9a34f2d9488655b4fdf4/rhel-server-6.4-i386-dvd.iso", + "tools_upload_flavor": "linux", + "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "vmx_data": { + "cpuid.coresPerSocket": "1", + "memsize": "480", + "numvcpus": "1" + } + } + ], + "post-processors": [ + { + "output": "../builds/{{.Provider}}/opscode_rhel-6.4-i386_provisionerless.box", + "type": "vagrant" + } + ], + "provisioners": [ + { + "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E bash '{{.Path}}'", + "scripts": [ + "scripts/common/sshd.sh", + "scripts/common/vagrant.sh", + "scripts/common/vmtools.sh", + "scripts/centos/cleanup.sh", + "scripts/common/minimize.sh" + ], + "type": "shell" + } + ] +} + diff --git a/packer/rhel-6.4-x86_64.json b/packer/rhel-6.4-x86_64.json new file mode 100644 index 000000000..ab9cb0755 --- /dev/null +++ b/packer/rhel-6.4-x86_64.json @@ -0,0 +1,71 @@ +{ + "builders": [ + { + "type": "virtualbox", + "boot_command": [ + "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/centos-6.4/ks.cfg<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "guest_os_type": "RedHat_64", + "http_directory": "http", + "iso_checksum": "1eabfc4eb1bea0d1d6c6c2802c7d44c6e68078b678186669bd2bcb87ca2ebeb8", + "iso_checksum_type": "sha256", + "iso_url": "https://content-web.rhn.redhat.com/rhn/isos/rhel-6.4/md5sum/467b53791903f9a0c477cbb1b24ffd1f/rhel-server-6.4-x86_64-dvd.iso", + "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "vboxmanage": [ + [ "modifyvm", "{{.Name}}", "--memory", "480" ], + [ "modifyvm", "{{.Name}}", "--cpus", "1" ] + ], + "virtualbox_version_file": ".vbox_version" + }, + { + "type": "vmware", + "boot_command": [ + "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/centos-6.4/ks.cfg<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "guest_os_type": "redhat-64", + "http_directory": "http", + "iso_checksum": "1eabfc4eb1bea0d1d6c6c2802c7d44c6e68078b678186669bd2bcb87ca2ebeb8", + "iso_checksum_type": "sha256", + "iso_url": "https://content-web.rhn.redhat.com/rhn/isos/rhel-6.4/md5sum/467b53791903f9a0c477cbb1b24ffd1f/rhel-server-6.4-x86_64-dvd.iso", + "tools_upload_flavor": "linux", + "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "vmx_data": { + "cpuid.coresPerSocket": "1", + "memsize": "480", + "numvcpus": "1" + } + } + ], + "post-processors": [ + { + "output": "../builds/{{.Provider}}/opscode_redhat-6.4_provisionerless.box", + "type": "vagrant" + } + ], + "provisioners": [ + { + "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E bash '{{.Path}}'", + "scripts": [ + "scripts/common/sshd.sh", + "scripts/common/vagrant.sh", + "scripts/common/vmtools.sh", + "scripts/centos/cleanup.sh", + "scripts/common/minimize.sh" + ], + "type": "shell" + } + ] +} From 251bacf87c1406385e6e64ac9b08e2d922b2f88d Mon Sep 17 00:00:00 2001 From: "Julian C. Dunn" <jdunn@opscode.com> Date: Sun, 3 Nov 2013 18:42:16 -0500 Subject: [PATCH 0104/1622] Added working definition for Windows 2012R2 Standard Edition --- Gemfile | 4 +- Gemfile.lock | 104 +++++------ .../windows-2012r2-standard/Autounattend.xml | 164 ++++++++++++++++++ definitions/windows-2012r2-standard/README.md | 58 +++++++ .../windows-2012r2-standard/definition.rb | 20 +++ .../windows-2012r2-standard/install-chef.bat | 47 +++++ .../windows-2012r2-standard/install-vbox.bat | 4 + .../mount-validation.bat | 3 + .../windows-2012r2-standard/oracle-cert.cer | Bin 0 -> 1398 bytes 9 files changed, 350 insertions(+), 54 deletions(-) create mode 100644 definitions/windows-2012r2-standard/Autounattend.xml create mode 100644 definitions/windows-2012r2-standard/README.md create mode 100644 definitions/windows-2012r2-standard/definition.rb create mode 100644 definitions/windows-2012r2-standard/install-chef.bat create mode 100644 definitions/windows-2012r2-standard/install-vbox.bat create mode 100644 definitions/windows-2012r2-standard/mount-validation.bat create mode 100644 definitions/windows-2012r2-standard/oracle-cert.cer diff --git a/Gemfile b/Gemfile index be2c8bb73..83a3308ac 100644 --- a/Gemfile +++ b/Gemfile @@ -1,7 +1,7 @@ source "https://rubygems.org" -gem "vagrant", :git => 'https://github.com/mitchellh/vagrant.git', :tag => 'v1.2.7' -gem "veewee", :git => 'https://github.com/jedi4ever/veewee.git', :ref => '4e5d50de48' +gem "vagrant", :git => 'https://github.com/mitchellh/vagrant.git', :tag => 'v1.3.5' +gem "veewee", "~> 0.3.12" gem "vagrant-windows", "~> 1.2.1" gem "em-winrm" # for windows! gem "rake" diff --git a/Gemfile.lock b/Gemfile.lock index 9252b27e4..75d289536 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,29 +1,9 @@ -GIT - remote: https://github.com/jedi4ever/veewee.git - revision: 4e5d50de4866472bd3e7060157ac573457196760 - ref: 4e5d50de48 - specs: - veewee (0.3.7) - ansi (~> 1.3.0) - childprocess - fission (= 0.4.0) - fog (~> 1.8) - grit - highline - i18n - json - net-ssh (>= 2.2.0) - popen4 (~> 0.1.2) - progressbar - ruby-vnc (~> 1.0.0) - thor (~> 0.15) - GIT remote: https://github.com/mitchellh/vagrant.git - revision: 7ec0ee1d00a916f80b109a298bab08e391945243 - tag: v1.2.7 + revision: a40522f5fabccb9ddabad03d836e120ff5d14093 + tag: v1.3.5 specs: - vagrant (1.2.7) + vagrant (1.3.5) childprocess (~> 0.3.7) erubis (~> 2.7.0) i18n (~> 0.6.0) @@ -42,30 +22,30 @@ GEM gyoku (>= 0.4.0) nokogiri (>= 1.4.0) ansi (1.3.0) - builder (3.2.0) + builder (3.2.2) childprocess (0.3.9) ffi (~> 1.0, >= 1.0.11) diff-lcs (1.2.4) em-winrm (0.5.4) - eventmachine (= 1.0.0.beta.3) + eventmachine (~> 1.0.0) mixlib-log (>= 1.3.0) uuidtools (~> 2.1.1) winrm (~> 1.1.0) erubis (2.7.0) - eventmachine (1.0.0.beta.3) - excon (0.22.1) - ffi (1.7.0) + eventmachine (1.0.3) + excon (0.28.0) + ffi (1.9.3) fission (0.4.0) CFPropertyList (~> 2.0.17) - fog (1.11.1) + fog (1.18.0) builder - excon (~> 0.20) + excon (~> 0.28.0) formatador (~> 0.2.0) - json (~> 1.7) mime-types + multi_json (~> 1.0) net-scp (~> 1.1) net-ssh (>= 2.1.3) - nokogiri (~> 1.5.0) + nokogiri (~> 1.5) ruby-hmac formatador (0.2.4) grit (2.5.0) @@ -74,34 +54,39 @@ GEM posix-spawn (~> 0.3.6) gssapi (1.0.3) ffi (>= 1.0.1) - gyoku (1.0.0) + gyoku (1.1.0) builder (>= 2.1.2) - highline (1.6.19) - httpclient (2.2.0.2) + highline (1.6.20) + httpclient (2.3.4.1) httpi (0.9.7) rack - i18n (0.6.4) - json (1.7.7) - libxml-ruby (2.6.0) + i18n (0.6.5) + json (1.8.1) + libxml-ruby (2.7.0) little-plugger (1.1.3) log4r (1.1.10) - logging (1.6.2) + logging (1.8.1) little-plugger (>= 1.1.3) - mime-types (1.23) + multi_json (>= 1.3.6) + mime-types (1.25) + mini_portile (0.5.2) mixlib-log (1.6.0) - net-scp (1.1.0) + multi_json (1.8.2) + net-scp (1.1.2) net-ssh (>= 2.6.5) - net-ssh (2.6.7) - nokogiri (1.5.9) + net-ssh (2.6.8) + nokogiri (1.6.0) + mini_portile (~> 0.5.0) nori (1.1.5) open4 (1.3.0) + os (0.9.6) popen4 (0.1.2) Platform (>= 0.4.0) open4 (>= 0.4.0) posix-spawn (0.3.6) - progressbar (0.20.0) + progressbar (0.21.0) rack (1.5.2) - rake (10.0.4) + rake (10.1.0) ruby-hmac (0.4.0) ruby-vnc (1.0.1) rubyntlm (0.1.1) @@ -114,16 +99,31 @@ GEM nori (~> 1.0) wasabi (~> 1.0) thor (0.18.1) - uuidtools (2.1.3) - vagrant-windows (1.2.1) + uuidtools (2.1.4) + vagrant-windows (1.2.3) winrm (~> 1.1.1) + veewee (0.3.12) + ansi (~> 1.3.0) + childprocess + fission (= 0.4.0) + fog (~> 1.8) + grit + highline + i18n + json + net-ssh (>= 2.2.0) + os (~> 0.9.6) + popen4 (~> 0.1.2) + progressbar + ruby-vnc (~> 1.0.0) + thor (~> 0.15) wasabi (1.0.0) nokogiri (>= 1.4.0) - winrm (1.1.2) + winrm (1.1.3) gssapi (~> 1.0.0) - httpclient (~> 2.2.0.2) - logging (~> 1.6.1) - nokogiri (~> 1.5.0) + httpclient (~> 2.2, >= 2.2.0.2) + logging (~> 1.6, >= 1.6.1) + nokogiri (~> 1.5) rubyntlm (~> 0.1.1) savon (= 0.9.5) uuidtools (~> 2.1.2) @@ -136,4 +136,4 @@ DEPENDENCIES rake vagrant! vagrant-windows (~> 1.2.1) - veewee! + veewee (~> 0.3.12) diff --git a/definitions/windows-2012r2-standard/Autounattend.xml b/definitions/windows-2012r2-standard/Autounattend.xml new file mode 100644 index 000000000..23f68051c --- /dev/null +++ b/definitions/windows-2012r2-standard/Autounattend.xml @@ -0,0 +1,164 @@ +<?xml version="1.0" encoding="utf-8"?> +<unattend xmlns="urn:schemas-microsoft-com:unattend"> + <servicing></servicing> + <settings pass="windowsPE"> + <component name="Microsoft-Windows-International-Core-WinPE" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <SetupUILanguage> + <UILanguage>en-US</UILanguage> + </SetupUILanguage> + <InputLocale>en-US</InputLocale> + <SystemLocale>en-US</SystemLocale> + <UILanguage>en-US</UILanguage> + <UserLocale>en-US</UserLocale> + </component> + <component name="Microsoft-Windows-Setup" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <DiskConfiguration> + <Disk wcm:action="add"> + <CreatePartitions> + <CreatePartition wcm:action="add"> + <Order>1</Order> + <Size>20000</Size> + <Type>Primary</Type> + </CreatePartition> + </CreatePartitions> + <ModifyPartitions> + <ModifyPartition wcm:action="add"> + <Extend>false</Extend> + <Format>NTFS</Format> + <Label>Windows 2012R2</Label> + <Letter>C</Letter> + <Order>1</Order> + <PartitionID>1</PartitionID> + </ModifyPartition> + </ModifyPartitions> + <DiskID>0</DiskID> + <WillWipeDisk>true</WillWipeDisk> + </Disk> + </DiskConfiguration> + <ImageInstall> + <OSImage> + <InstallFrom> + <MetaData wcm:action="add"> + <Key>/IMAGE/NAME</Key> + <Value>Windows Server 2012 R2 SERVERSTANDARD</Value> + </MetaData> + </InstallFrom> + <InstallTo> + <DiskID>0</DiskID> + <PartitionID>1</PartitionID> + </InstallTo> + </OSImage> + </ImageInstall> + <UserData> + <AcceptEula>true</AcceptEula> + <FullName>Vagrant</FullName> + <Organization>Vagrant</Organization> + </UserData> + </component> + </settings> + <settings pass="specialize"> + <component name="Microsoft-Windows-Shell-Setup" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <AutoLogon> + <Password> + <Value>dgBhAGcAcgBhAG4AdABQAGEAcwBzAHcAbwByAGQA</Value> + <PlainText>false</PlainText> + </Password> + <Enabled>true</Enabled> + <Username>Administrator</Username> + </AutoLogon> + <ComputerName>vagrant-2012</ComputerName> + <RegisteredOrganization>Vagrant</RegisteredOrganization> + <RegisteredOwner>Vagrant</RegisteredOwner> + <TimeZone>UTC</TimeZone> + <ProductKey>W3GGN-FT8W3-Y4M27-J84CP-Q3VJ9</ProductKey> + </component> + <component name="Microsoft-Windows-Security-SPP-UX" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <SkipAutoActivation>true</SkipAutoActivation> + </component> + </settings> + <settings pass="oobeSystem"> + <component name="Microsoft-Windows-Shell-Setup" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <AutoLogon> + <Password> + <Value>dgBhAGcAcgBhAG4AdABQAGEAcwBzAHcAbwByAGQA</Value> + <PlainText>false</PlainText> + </Password> + <Enabled>true</Enabled> + <Username>Administrator</Username> + </AutoLogon> + <FirstLogonCommands> + <SynchronousCommand wcm:action="add"> + <Order>1</Order> + <RequiresUserInput>true</RequiresUserInput> + <CommandLine>cmd.exe /c winrm quickconfig -q</CommandLine> + <Description>winrm quickconfig -q</Description> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <Order>2</Order> + <CommandLine>cmd.exe /c winrm set winrm/config/winrs @{MaxMemoryPerShellMB="300"}</CommandLine> + <RequiresUserInput>true</RequiresUserInput> + <Description>winrm memory</Description> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <CommandLine>cmd.exe /c winrm set winrm/config @{MaxTimeoutms="1800000"}</CommandLine> + <Description>winrm timeout</Description> + <Order>3</Order> + <RequiresUserInput>true</RequiresUserInput> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <CommandLine>cmd.exe /c winrm set winrm/config/service @{AllowUnencrypted="true"}</CommandLine> + <Description>winrm encryption</Description> + <Order>4</Order> + <RequiresUserInput>true</RequiresUserInput> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <CommandLine>winrm set winrm/config/service/auth @{Basic="true"}</CommandLine> + <Description>winrm basic auth</Description> + <Order>5</Order> + <RequiresUserInput>true</RequiresUserInput> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <CommandLine>cmd.exe /c netsh advfirewall firewall set rule name="Windows Remote Management (HTTP-In)" profile=public protocol=tcp localport=5985 remoteip=localsubnet new remoteip=any</CommandLine> + <Description>winrm firewall</Description> + <Order>6</Order> + <RequiresUserInput>true</RequiresUserInput> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <CommandLine>powershell -Command "Set-ExecutionPolicy -ExecutionPolicy RemoteSigned -Force"</CommandLine> + <Description>fix powershell remote exec policy</Description> + <Order>7</Order> + <RequiresUserInput>true</RequiresUserInput> + </SynchronousCommand> + </FirstLogonCommands> + <OOBE> + <HideEULAPage>true</HideEULAPage> + <HideWirelessSetupInOOBE>true</HideWirelessSetupInOOBE> + <NetworkLocation>Home</NetworkLocation> + <ProtectYourPC>1</ProtectYourPC> + <HideOnlineAccountScreens>true</HideOnlineAccountScreens> + <HideOEMRegistrationScreen>true</HideOEMRegistrationScreen> + <HideLocalAccountScreen>true</HideLocalAccountScreen> + </OOBE> + <UserAccounts> + <AdministratorPassword> + <Value>dgBhAGcAcgBhAG4AdABBAGQAbQBpAG4AaQBzAHQAcgBhAHQAbwByAFAAYQBzAHMAdwBvAHIAZAA=</Value> + <PlainText>false</PlainText> + </AdministratorPassword> + <LocalAccounts> + <LocalAccount wcm:action="add"> + <Password> + <Value>dgBhAGcAcgBhAG4AdABQAGEAcwBzAHcAbwByAGQA</Value> + <PlainText>false</PlainText> + </Password> + <Description>Vagrant User</Description> + <DisplayName>vagrant</DisplayName> + <Group>Administrators</Group> + <Name>vagrant</Name> + </LocalAccount> + </LocalAccounts> + </UserAccounts> + <ShowWindowsLive>false</ShowWindowsLive> + </component> + </settings> + <cpi:offlineImage cpi:source="wim:c:/users/administrator/documents/install.wim#Windows Server 2012R2 SERVERSTANDARD" xmlns:cpi="urn:schemas-microsoft-com:cpi" /> +</unattend> diff --git a/definitions/windows-2012r2-standard/README.md b/definitions/windows-2012r2-standard/README.md new file mode 100644 index 000000000..562c739f7 --- /dev/null +++ b/definitions/windows-2012r2-standard/README.md @@ -0,0 +1,58 @@ +You can download a free trial of Windows Server 2012 from Microsoft: + +* url: http://technet.microsoft.com/en-us/evalcenter/hh670538.aspx + +But they seem to always generate the same URL that's in the definition. If it ever changes, you can update the definition. + +The installation uses the Standard Windows Unattended installation. The XML file was created using the Windows AIK kit, but the file can also be edited by hand. + +To edit the Autounattend.xml and validate it you can download The Windows® Automated Deployment Kit (ADK) for Windows® 8. Windows Server 2012 is based off Windows 8. + +* url: http://www.microsoft.com/en-us/download/details.aspx?id=30652 + +ADK also includes dism, which will allow you to choose a specific version of Windows 2012 to install. + +If you want to install a different version, edit Autoattended.xml and replace the /IMAGE/NAME value with +one of the names listed in the Server 2012 install.wim on the install DVD .iso + + +```xml +<InstallFrom> + <MetaData wcm:action="add"> + <Key>/IMAGE/NAME</Key> + <Value>Windows Server 2012 SERVERSTANDARD</Value> + </MetaData> +</InstallFrom> +``` + +``` +PS C:\Users\Administrator> Dism /Get-WIMInfo /WimFile:D:\sources\install.wim + +Deployment Image Servicing and Management tool +Version: 6.2.9200.16384 + +Details for image : D:\sources\install.wim + +Index : 1 +Name : Windows Server 2012 SERVERSTANDARDCORE +Description : Windows Server 2012 SERVERSTANDARDCORE +Size : 7,182,564,199 bytes + +Index : 2 +Name : Windows Server 2012 SERVERSTANDARD +Description : Windows Server 2012 SERVERSTANDARD +Size : 12,002,145,363 bytes + +Index : 3 +Name : Windows Server 2012 SERVERDATACENTERCORE +Description : Windows Server 2012 SERVERDATACENTERCORE +Size : 7,177,138,892 bytes + +Index : 4 +Name : Windows Server 2012 SERVERDATACENTER +Description : Windows Server 2012 SERVERDATACENTER +Size : 11,997,664,663 bytes + +The operation completed successfully. +``` + diff --git a/definitions/windows-2012r2-standard/definition.rb b/definitions/windows-2012r2-standard/definition.rb new file mode 100644 index 000000000..a37367dd1 --- /dev/null +++ b/definitions/windows-2012r2-standard/definition.rb @@ -0,0 +1,20 @@ +# -*- coding: utf-8 -*- +require File.dirname(__FILE__) + "/../.windows/session.rb" + +iso_src = "http://care.dlservice.microsoft.com/dl/download/6/2/A/62A76ABB-9990-4EFC-A4FE-C7D698DAEB96/9600.16384.WINBLUE_RTM.130821-1623_X64FRE_SERVER_EVAL_EN-US-IRM_SSS_X64FREE_EN-US_DV5.ISO" + +session = WINDOWS_SESSION.merge({ + :os_type_id => 'Windows8_64', + :iso_download_instructions => "Download and install full featured software for 180-day trial at http://technet.microsoft.com/en-US/evalcenter/hh670538.aspx", + :iso_src => iso_src, + :iso_file => File.basename(iso_src), + :iso_md5 => "458ff91f8abc21b75cb544744bf92e6a", + :kickstart_port => "7122", + :winrm_host_port => "2012", + :memory_size=> "512", + :virtualbox => { + :extradata => 'VBoxInternal/CPUM/CMPXCHG16B 1', + } + }) + +Veewee::Session.declare session diff --git a/definitions/windows-2012r2-standard/install-chef.bat b/definitions/windows-2012r2-standard/install-chef.bat new file mode 100644 index 000000000..2107a1b29 --- /dev/null +++ b/definitions/windows-2012r2-standard/install-chef.bat @@ -0,0 +1,47 @@ +@REM Loop ten times to make sure outbound networking is up +FOR /L %%n IN (1,1,10) DO ( + PING -n 1 www.opscode.com + IF %ERRORLEVEL% == 0 CALL :wget + TIMEOUT 10 +) + +:err +ECHO "Couldn't reach Opscode even after 10 retries" +GOTO :done + +:wget +@rem Install Chef using chef-client MSI installer +@setlocal + +@set REMOTE_SOURCE_MSI_URL=https://www.opscode.com/chef/install.msi +@set LOCAL_DESTINATION_MSI_PATH=%TEMP%\chef-client-latest.msi +@set FALLBACK_QUERY_STRING=?DownloadContext=PowerShell + +@set ALTERNATE_DOWNLOAD_COMMAND=$webClient=new-object System.Net.WebClient; $webClient.DownloadFile('%REMOTE_SOURCE_MSI_URL%%FALLBACK_QUERY_STRING%', '%LOCAL_DESTINATION_MSI_PATH%') + +cscript /nologo %TEMP%\wget.vbs /url:%REMOTE_SOURCE_MSI_URL% /path:"%LOCAL_DESTINATION_MSI_PATH%" + +@rem Work around issues found in Windows Server 2012 around job objects not respecting WSMAN memory quotas +@rem that cause the MSI download process to exceed the quota even when it is increased by administrators. +@rem Retry the download using a more memory-efficient mechanism that only works if PowerShell is available. +@if ERRORLEVEL 1 ( + echo Warning: Failed to download %REMOTE_SOURCE_MSI_URL% to %LOCAL_DESTINATION_MSI_PATH% + echo Warning: Retrying download with PowerShell if available + if EXIST "%LOCAL_DESTINATION_MSI_PATH%" del /f /q "%LOCAL_DESTINATION_MSI_PATH%" + echo powershell -noprofile -noninteractive -command "%ALTERNATE_DOWNLOAD_COMMAND%" + powershell -noprofile -noninteractive -command "%ALTERNATE_DOWNLOAD_COMMAND%" + if NOT ERRORLEVEL 1 ( + echo Download succeeded + ) else ( + echo Failed to download %REMOTE_SOURCE_MSI_URL% + echo Subsequent attempt to install the downloaded MSI is likely to fail + ) +) + +msiexec /qb /i "%LOCAL_DESTINATION_MSI_PATH%" + +@endlocal +EXIT + +:done +EXIT diff --git a/definitions/windows-2012r2-standard/install-vbox.bat b/definitions/windows-2012r2-standard/install-vbox.bat new file mode 100644 index 000000000..614c415c7 --- /dev/null +++ b/definitions/windows-2012r2-standard/install-vbox.bat @@ -0,0 +1,4 @@ +cmd /c certutil -addstore -f "TrustedPublisher" a:oracle-cert.cer +cmd /c e:\VBoxWindowsAdditions-amd64.exe /S +cmd /c shutdown.exe /r /t 5 /d p:2:4 /c "Vagrant reboot for VBoxWindowsAdditions" + diff --git a/definitions/windows-2012r2-standard/mount-validation.bat b/definitions/windows-2012r2-standard/mount-validation.bat new file mode 100644 index 000000000..ae458c1d6 --- /dev/null +++ b/definitions/windows-2012r2-standard/mount-validation.bat @@ -0,0 +1,3 @@ +REM This is so we can pass the validation test... I don't know that it's necessary +cmd /c net use z: \\vboxsrv\veewee-validation + diff --git a/definitions/windows-2012r2-standard/oracle-cert.cer b/definitions/windows-2012r2-standard/oracle-cert.cer new file mode 100644 index 0000000000000000000000000000000000000000..6f3380d48553956036650bc711ca5aed73a1224d GIT binary patch literal 1398 zcmXqLVl6UgVu@P7%*4pVBoH|JX8KPK#!$sYJbaVIzH}P!vT<s)d9;1!Wn^S!WiV*m zV#sa4$;KSY!Y0fV8f++TAPVAe3G;=e7G(x!rswG>c;+SR8Oj^Tf+V<w#b6Q&Aw{Ld zB?^A2CFS`=*@o5zmJkI-A*n^V#R~ap3Z=!V3W+5O86_nJ#a8<I<>lpiWk6Glfu`yu z=jZAd6(lNXBx@QP80s15fHX4;tHMop&PgmTRxnm@&QD2I068QxFI~aNz|cU!+0j5w zoY&CMz{tSD01TplToWMI+{oC}($q4_pm8gzw}cG@LFRJ^b2%sGWTxd8<z*(q{K_uO z7nGV(o}Zth5S)=;lv->kZ6FC!%_Sn_UzC`flL~Z0Q9*uDVo7Fxo}rzA4aA?OE}7|> zC5br-o-PV7$LcEhW+oTq7w4yyC<FtE^2DN4g)pF%DPYYCWkxW=nXwse(8Q>O97Bw( z49rc8{0u;GE~X|%MuyHw?*%`8FjtXzIendtSKY3w*O-60EAjFQ2OV~w_ftDDLUzu_ z85<Wa=?S-*nejb)|0Bzi=ZAKyJXs+1{&U}<E!<r7eBtNQVs{iy`CpdM8+pV3kFKYd z;{O}R&%U~HRFb)|&*|X#58c1RGz)!dcTGuVbeeB)eCp1-hX0aX)OY`{ZrXppaE9c( z=3cQz#vO?t;*(yVb7)<pC3A9tz>SryzkP0TS}(uOwDSCq)A{l5xun*{K0kH+^Qm$< z{v9i2H}l%A36FnQYWvH^<3!H>xUK(c<{T^S(EK-X{(E*tk9{wuILuppXYONpzdIrm z6;8kD=Vfr5%TV)i?iWRwFs0(DVJoe?Co?fKGB7S~Vyp&+NI5v&$_leE888^|0pmoL zpONuD3kx$7dxL=kh%e7#X<%+(y1;mWVVgcE6#^4sa&fY;E+`r4CKu(PCP(LBXNZ&@ zP|CmsWP$>VtpO-ub0@TUFt+`0Wn>p;HqbKAVB^qc1LhxgCPpzCe97BD7-Whn3y%R8 zObau!K_QII$jFjvkZhm=;~OxxNkHA1pIlsk;yeRuxGE+rzDdkXL{YAf<eStY19^}; zlvyMU#2Q4-&s_PcTJ4MX$-e&UA6V7iKfbhlE--&^Lj33ibQCZQSp*Ek*tmecWMOPF zXJV9Q;V@tWCO}{aBPUQ`5duu0j10%my}A5s>tn4l8@-n`97fxDH}mY7!8P?YpYXXe zANBj<Zy#8B<=plhr2w0$&kh}Y;3_J_rq%O(!d;Kdh!69Qrx$0(Z#pBlLibZ#!*^ku zETe+LaLfPw_xTrys&70sPe)j1+iVq`aMSBM(lw_ziD+!<3Y)OpMqT!-=r7Lxi?JI@ z<mcTks*7urddn8t7Ob=7j{GmlCwc6O!YLD(?sT2IaC=(b)&muZ35!DO?Rt6F3ICk! zzWcisYuQ$<<p-zv%;P9Gxv*7GE-~|}O~UcDuPhm!mwENJ*Y;evpI^83&Bmf4#}q;F kZ>ww{IP}*EUbv-wBB=FaQSwz;n~wTPeHRx#@~!?40OZx*k^lez literal 0 HcmV?d00001 From a55c98806270bde092e6831b79ec6cd5bd933718 Mon Sep 17 00:00:00 2001 From: "Julian C. Dunn" <jdunn@opscode.com> Date: Sun, 3 Nov 2013 18:46:11 -0500 Subject: [PATCH 0105/1622] Update links for Windows 2012R2. --- definitions/windows-2012r2-standard/README.md | 30 +++++++++---------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/definitions/windows-2012r2-standard/README.md b/definitions/windows-2012r2-standard/README.md index 562c739f7..42ab14e6a 100644 --- a/definitions/windows-2012r2-standard/README.md +++ b/definitions/windows-2012r2-standard/README.md @@ -1,26 +1,26 @@ -You can download a free trial of Windows Server 2012 from Microsoft: +You can download a free trial of Windows Server 2012R2 from Microsoft: -* url: http://technet.microsoft.com/en-us/evalcenter/hh670538.aspx +* url: http://technet.microsoft.com/en-US/evalcenter/dn205286.aspx But they seem to always generate the same URL that's in the definition. If it ever changes, you can update the definition. The installation uses the Standard Windows Unattended installation. The XML file was created using the Windows AIK kit, but the file can also be edited by hand. -To edit the Autounattend.xml and validate it you can download The Windows® Automated Deployment Kit (ADK) for Windows® 8. Windows Server 2012 is based off Windows 8. +To edit the Autounattend.xml and validate it you can download The Windows® Automated Deployment Kit (ADK) for Windows® 8.1. Windows Server 2012R2 is based off Windows 8.1. -* url: http://www.microsoft.com/en-us/download/details.aspx?id=30652 +* url: http://www.microsoft.com/en-us/download/details.aspx?id=39982 -ADK also includes dism, which will allow you to choose a specific version of Windows 2012 to install. +ADK also includes dism, which will allow you to choose a specific version of Windows 2012R2 to install. If you want to install a different version, edit Autoattended.xml and replace the /IMAGE/NAME value with -one of the names listed in the Server 2012 install.wim on the install DVD .iso +one of the names listed in the Server 2012R2 install.wim on the install DVD .iso ```xml <InstallFrom> <MetaData wcm:action="add"> <Key>/IMAGE/NAME</Key> - <Value>Windows Server 2012 SERVERSTANDARD</Value> + <Value>Windows Server 2012R2 SERVERSTANDARD</Value> </MetaData> </InstallFrom> ``` @@ -34,23 +34,23 @@ Version: 6.2.9200.16384 Details for image : D:\sources\install.wim Index : 1 -Name : Windows Server 2012 SERVERSTANDARDCORE -Description : Windows Server 2012 SERVERSTANDARDCORE +Name : Windows Server 2012R2 SERVERSTANDARDCORE +Description : Windows Server 2012R2 SERVERSTANDARDCORE Size : 7,182,564,199 bytes Index : 2 -Name : Windows Server 2012 SERVERSTANDARD -Description : Windows Server 2012 SERVERSTANDARD +Name : Windows Server 2012R2 SERVERSTANDARD +Description : Windows Server 2012R2 SERVERSTANDARD Size : 12,002,145,363 bytes Index : 3 -Name : Windows Server 2012 SERVERDATACENTERCORE -Description : Windows Server 2012 SERVERDATACENTERCORE +Name : Windows Server 2012R2 SERVERDATACENTERCORE +Description : Windows Server 2012R2 SERVERDATACENTERCORE Size : 7,177,138,892 bytes Index : 4 -Name : Windows Server 2012 SERVERDATACENTER -Description : Windows Server 2012 SERVERDATACENTER +Name : Windows Server 2012R2 SERVERDATACENTER +Description : Windows Server 2012R2 SERVERDATACENTER Size : 11,997,664,663 bytes The operation completed successfully. From 9260049c5a4d2ef4cd1303219e6e7a524122ec7e Mon Sep 17 00:00:00 2001 From: "Julian C. Dunn" <jdunn@opscode.com> Date: Sun, 3 Nov 2013 19:09:50 -0500 Subject: [PATCH 0106/1622] Fix .gitignore for iso dir --- .gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 635044e1e..39d25a216 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,6 @@ bin/ .bundle/ -iso/ +iso *.box virtualfloppy.vfd packer_cache/ From 6f998e1d6a4e168b7d8d4658fd7307a3c0c60237 Mon Sep 17 00:00:00 2001 From: "Julian C. Dunn" <jdunn@opscode.com> Date: Wed, 6 Nov 2013 00:02:37 -0500 Subject: [PATCH 0107/1622] [GH-109] Updated ISO for Debian 6.0.8 by @petecheslock --- packer/debian-6.0.8-amd64.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packer/debian-6.0.8-amd64.json b/packer/debian-6.0.8-amd64.json index c31297675..6cdec87a0 100644 --- a/packer/debian-6.0.8-amd64.json +++ b/packer/debian-6.0.8-amd64.json @@ -23,7 +23,7 @@ "disk_size": 40960, "guest_os_type": "Debian_64", "http_directory": "http", - "iso_checksum": "144194cea77f0e527fd07bd6aa28d1ab50cb5a95", + "iso_checksum": "d0ec1c64c00ff601995139dbacfb54109a23788f", "iso_checksum_type": "sha1", "iso_url": "http://cdimage.debian.org/cdimage/archive/6.0.8/amd64/iso-cd/debian-6.0.8-amd64-CD-1.iso", "ssh_username": "vagrant", @@ -61,7 +61,7 @@ "disk_size": 40960, "guest_os_type": "debian5-64", "http_directory": "http", - "iso_checksum": "144194cea77f0e527fd07bd6aa28d1ab50cb5a95", + "iso_checksum": "d0ec1c64c00ff601995139dbacfb54109a23788f", "iso_checksum_type": "sha1", "iso_url": "http://cdimage.debian.org/cdimage/archive/6.0.8/amd64/iso-cd/debian-6.0.8-amd64-CD-1.iso", "ssh_username": "vagrant", From 588db7b7e025888ec157af35c3a959417cb1c93d Mon Sep 17 00:00:00 2001 From: "Julian C. Dunn" <jdunn@opscode.com> Date: Wed, 6 Nov 2013 23:57:21 -0500 Subject: [PATCH 0108/1622] Fix documentation in README; add info on how to build legacy veewee baseboxes as well. --- README.md | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index e0ec643a4..2b75dbae7 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,10 @@ +# Bento + Bento is a project that encapsulates [Packer](http://packer.io) templates for building [Vagrant](http://vagrantup.com) baseboxes. We use these boxes internally at Opscode for -testing Hosted Chef, Private Chef and our open source [cookbooks](http://community.opscode.com/users/Opscode) +testing Hosted Enterprise Chef, Private Enterprise Chef and our open source [cookbooks](http://community.opscode.com/users/Opscode) via [test-kitchen](http://github.com/opscode/test-kitchen). -These basebox templates were converted from [VeeWee](https://github.com/jedi4ever/veewee) +These basebox templates were converted from [veewee](https://github.com/jedi4ever/veewee) definitions originally based on [work done by Tim Dysinger](https://github.com/dysinger/basebox) to make "Don't Repeat Yourself" (DRY) modular baseboxes. Thanks Tim! @@ -114,12 +116,14 @@ If you only have VMware or VirtualBox available, you may also tell Packer to bui Congratulations! You now have `./debian-7.1.0-i386-virtualbox.box` and `./debian-7.1.0-i386-vmware.box`, fully-functional baseboxes that you can then add to Vagrant and start testing cookbooks. -# Legacy Veewee Definitions +# Veewee Definitions The legacy veewee definitions are still in the "definitions" directory. These are unsupported and will be removed in the future. -Packer does not yet support Windows, so the veewee definitions are still used for building those boxes. You must build these -boxes yourself due to licensing constraints. +Packer does not yet support Windows, so the veewee definitions are still used for building those boxes. You must build these boxes yourself due to licensing constraints. You can build these as follows: + + $ bundle install + $ bundle exec veewee vbox build [definition-name] Bugs and Issues =============== @@ -145,8 +149,8 @@ License and Authors - Author:: Tom Duffield (<tom@opscode.com>) - Author:: Ross Timson (<ross@rosstimson.com>) -Copyright:: 2012-2013, Opscode, Inc (<legal@opscode.com>) -Copyright:: 2011-2012, Tim Dysinger (<tim@dysinger.net>) +* Copyright:: 2012-2013, Opscode, Inc (<legal@opscode.com>) +* Copyright:: 2011-2012, Tim Dysinger (<tim@dysinger.net>) Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. From d0697cee50c2e31c25fd1b64566c30147cb32040 Mon Sep 17 00:00:00 2001 From: Brian Flad <bflad417@gmail.com> Date: Thu, 7 Nov 2013 21:52:46 -0500 Subject: [PATCH 0109/1622] Fix BENTO-94 in CentOS/RHEL by disabling fingerprint PAM module in cleanup.sh --- packer/scripts/centos/cleanup.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/packer/scripts/centos/cleanup.sh b/packer/scripts/centos/cleanup.sh index cb79a25ec..a111947cf 100644 --- a/packer/scripts/centos/cleanup.sh +++ b/packer/scripts/centos/cleanup.sh @@ -4,6 +4,9 @@ yum -y clean all rm -rf VBoxGuestAdditions_*.iso VBoxGuestAdditions_*.iso.? rm -f /tmp/chef*rpm +# BENTO-94: PAM unable to dlopen(/lib64/security/pam_fprintd.so) +authconfig --disablefingerprint --update + # clean up redhat interface persistence rm -f /etc/udev/rules.d/70-persistent-net.rules sed -i 's/^HWADDR.*$//' /etc/sysconfig/network-scripts/ifcfg-eth0 From 76062cb56d671d63353da6d341dab5d9bcb8f95e Mon Sep 17 00:00:00 2001 From: Brian Flad <bflad417@gmail.com> Date: Thu, 7 Nov 2013 23:39:29 -0500 Subject: [PATCH 0110/1622] Move authconfig cleanup to authconfig kickstart for CentOS/RHEL 6 --- packer/http/centos-6.4/ks.cfg | 3 +-- packer/scripts/centos/cleanup.sh | 3 --- packer/scripts/centos/ks.cfg | 5 ++--- 3 files changed, 3 insertions(+), 8 deletions(-) diff --git a/packer/http/centos-6.4/ks.cfg b/packer/http/centos-6.4/ks.cfg index 0cbcda37d..ceeb13e4c 100644 --- a/packer/http/centos-6.4/ks.cfg +++ b/packer/http/centos-6.4/ks.cfg @@ -5,7 +5,6 @@ keyboard us network --bootproto=dhcp rootpw --iscrypted $1$damlkd,f$UC/u5pUts5QiU3ow.CSso/ firewall --disabled -authconfig --enableshadow --passalgo=sha512 selinux --permissive timezone UTC bootloader --location=mbr @@ -14,7 +13,7 @@ skipx zerombr clearpart --all --initlabel autopart -auth --useshadow --enablemd5 +auth --disablefingerprint --enableshadow --passalgo=sha512 --kickstart firstboot --disabled reboot diff --git a/packer/scripts/centos/cleanup.sh b/packer/scripts/centos/cleanup.sh index a111947cf..cb79a25ec 100644 --- a/packer/scripts/centos/cleanup.sh +++ b/packer/scripts/centos/cleanup.sh @@ -4,9 +4,6 @@ yum -y clean all rm -rf VBoxGuestAdditions_*.iso VBoxGuestAdditions_*.iso.? rm -f /tmp/chef*rpm -# BENTO-94: PAM unable to dlopen(/lib64/security/pam_fprintd.so) -authconfig --disablefingerprint --update - # clean up redhat interface persistence rm -f /etc/udev/rules.d/70-persistent-net.rules sed -i 's/^HWADDR.*$//' /etc/sysconfig/network-scripts/ifcfg-eth0 diff --git a/packer/scripts/centos/ks.cfg b/packer/scripts/centos/ks.cfg index 0cbcda37d..f515ad36d 100644 --- a/packer/scripts/centos/ks.cfg +++ b/packer/scripts/centos/ks.cfg @@ -5,7 +5,6 @@ keyboard us network --bootproto=dhcp rootpw --iscrypted $1$damlkd,f$UC/u5pUts5QiU3ow.CSso/ firewall --disabled -authconfig --enableshadow --passalgo=sha512 selinux --permissive timezone UTC bootloader --location=mbr @@ -13,8 +12,8 @@ text skipx zerombr clearpart --all --initlabel -autopart -auth --useshadow --enablemd5 +autopart +authconfig --disablefingerprint --enableshadow --passalgo=sha512 --kickstart firstboot --disabled reboot From 3ecae0a3749e99b7bdba245e159363bcdb9285e9 Mon Sep 17 00:00:00 2001 From: Brian Flad <bflad417@gmail.com> Date: Thu, 7 Nov 2013 23:43:45 -0500 Subject: [PATCH 0111/1622] Consistently use auth in scripts/centos/ks.cfg http/centos-6.4/ks.cfg --- packer/scripts/centos/ks.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packer/scripts/centos/ks.cfg b/packer/scripts/centos/ks.cfg index f515ad36d..f4a943802 100644 --- a/packer/scripts/centos/ks.cfg +++ b/packer/scripts/centos/ks.cfg @@ -13,7 +13,7 @@ skipx zerombr clearpart --all --initlabel autopart -authconfig --disablefingerprint --enableshadow --passalgo=sha512 --kickstart +auth --disablefingerprint --enableshadow --passalgo=sha512 --kickstart firstboot --disabled reboot From 8eeadb13275c67b643671959c20d57fdc196a050 Mon Sep 17 00:00:00 2001 From: Brian Flad <bflad417@gmail.com> Date: Fri, 8 Nov 2013 03:10:54 -0500 Subject: [PATCH 0112/1622] BENTO-95 Removed CentOS cleanup.sh packages for removal --- packer/http/centos-5.10/ks.cfg | 8 ++++++-- packer/http/centos-6.4/ks.cfg | 6 ++++-- packer/scripts/centos/cleanup.sh | 1 - packer/scripts/centos/ks.cfg | 6 ++++-- 4 files changed, 14 insertions(+), 7 deletions(-) diff --git a/packer/http/centos-5.10/ks.cfg b/packer/http/centos-5.10/ks.cfg index 089c44b39..7f3e3d8dc 100644 --- a/packer/http/centos-5.10/ks.cfg +++ b/packer/http/centos-5.10/ks.cfg @@ -22,11 +22,15 @@ reboot @Base @Core @Development Tools +kernel-devel +nfs-utils openssl-devel readline-devel zlib-devel -kernel-devel -nfs-utils +-avahi +-bluez-utils +-dogtail +-kudzu %post # update root certs diff --git a/packer/http/centos-6.4/ks.cfg b/packer/http/centos-6.4/ks.cfg index 0cbcda37d..79ea35c72 100644 --- a/packer/http/centos-6.4/ks.cfg +++ b/packer/http/centos-6.4/ks.cfg @@ -22,11 +22,13 @@ reboot @Base @Core @Development Tools +kernel-devel +nfs-utils openssl-devel readline-devel zlib-devel -kernel-devel -nfs-utils +-fprintd-pam +-intltool %post # update root certs diff --git a/packer/scripts/centos/cleanup.sh b/packer/scripts/centos/cleanup.sh index cb79a25ec..9b3e37da5 100644 --- a/packer/scripts/centos/cleanup.sh +++ b/packer/scripts/centos/cleanup.sh @@ -1,5 +1,4 @@ #!/bin/bash -eux -yum -y erase gtk2 libX11 hicolor-icon-theme avahi freetype bitstream-vera-fonts kudzu yum -y clean all rm -rf VBoxGuestAdditions_*.iso VBoxGuestAdditions_*.iso.? rm -f /tmp/chef*rpm diff --git a/packer/scripts/centos/ks.cfg b/packer/scripts/centos/ks.cfg index 0cbcda37d..79ea35c72 100644 --- a/packer/scripts/centos/ks.cfg +++ b/packer/scripts/centos/ks.cfg @@ -22,11 +22,13 @@ reboot @Base @Core @Development Tools +kernel-devel +nfs-utils openssl-devel readline-devel zlib-devel -kernel-devel -nfs-utils +-fprintd-pam +-intltool %post # update root certs From 8d4bdaa263148f572e68dc3fe6d7b553d40163fd Mon Sep 17 00:00:00 2001 From: Brian Flad <bflad417@gmail.com> Date: Fri, 8 Nov 2013 03:24:49 -0500 Subject: [PATCH 0113/1622] BENTO-94 CentOS auth --disablefingerprint is extraneous with removal of fprintd-pam package in kickstart --- packer/http/centos-6.4/ks.cfg | 2 +- packer/scripts/centos/ks.cfg | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packer/http/centos-6.4/ks.cfg b/packer/http/centos-6.4/ks.cfg index 2e9555007..86268a4bf 100644 --- a/packer/http/centos-6.4/ks.cfg +++ b/packer/http/centos-6.4/ks.cfg @@ -13,7 +13,7 @@ skipx zerombr clearpart --all --initlabel autopart -auth --disablefingerprint --enableshadow --passalgo=sha512 --kickstart +auth --enableshadow --passalgo=sha512 --kickstart firstboot --disabled reboot diff --git a/packer/scripts/centos/ks.cfg b/packer/scripts/centos/ks.cfg index f85eff55a..8945775ba 100644 --- a/packer/scripts/centos/ks.cfg +++ b/packer/scripts/centos/ks.cfg @@ -13,7 +13,7 @@ skipx zerombr clearpart --all --initlabel autopart -auth --disablefingerprint --enableshadow --passalgo=sha512 --kickstart +auth --enableshadow --passalgo=sha512 --kickstart firstboot --disabled reboot From 9e90c39b6a527733f32cd0ef01aae3fa85eabd0d Mon Sep 17 00:00:00 2001 From: Mathew Hartley <matt@route66.sytes.net> Date: Wed, 13 Nov 2013 12:56:41 +1300 Subject: [PATCH 0114/1622] BENTO-96 fix execute_command for debian to include env vars --- packer/debian-6.0.8-i386.json | 4 ++-- packer/debian-7.2.0-amd64.json | 4 ++-- packer/debian-7.2.0-i386.json | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/packer/debian-6.0.8-i386.json b/packer/debian-6.0.8-i386.json index 209aed76a..af0b17155 100644 --- a/packer/debian-6.0.8-i386.json +++ b/packer/debian-6.0.8-i386.json @@ -85,7 +85,7 @@ ], "provisioners": [ { - "type": "shell", + "execute_command": "echo 'vagrant' | {{.Vars}} sudo -E -S bash '{{.Path}}'", "scripts": [ "scripts/debian/update.sh", "scripts/common/sshd.sh", @@ -96,7 +96,7 @@ "scripts/debian/cleanup.sh", "scripts/common/minimize.sh" ], - "execute_command": "echo 'vagrant'|sudo -S sh '{{.Path}}'" + "type": "shell" } ] } diff --git a/packer/debian-7.2.0-amd64.json b/packer/debian-7.2.0-amd64.json index 3bc593a3f..88397f7e1 100644 --- a/packer/debian-7.2.0-amd64.json +++ b/packer/debian-7.2.0-amd64.json @@ -85,7 +85,7 @@ ], "provisioners": [ { - "type": "shell", + "execute_command": "echo 'vagrant' | {{.Vars}} sudo -E -S bash '{{.Path}}'", "scripts": [ "scripts/debian/update.sh", "scripts/common/sshd.sh", @@ -96,7 +96,7 @@ "scripts/debian/cleanup.sh", "scripts/common/minimize.sh" ], - "execute_command": "echo 'vagrant'|sudo -S sh '{{.Path}}'" + "type": "shell" } ] } diff --git a/packer/debian-7.2.0-i386.json b/packer/debian-7.2.0-i386.json index c3103c46a..bd1a6d09d 100644 --- a/packer/debian-7.2.0-i386.json +++ b/packer/debian-7.2.0-i386.json @@ -85,7 +85,7 @@ ], "provisioners": [ { - "type": "shell", + "execute_command": "echo 'vagrant' | {{.Vars}} sudo -E -S bash '{{.Path}}'", "scripts": [ "scripts/debian/update.sh", "scripts/common/sshd.sh", @@ -96,7 +96,7 @@ "scripts/debian/cleanup.sh", "scripts/common/minimize.sh" ], - "execute_command": "echo 'vagrant'|sudo -S sh '{{.Path}}'" + "type": "shell" } ] } From 44a57e65f3da5a427d7c8c4c9a337509cb77ba9a Mon Sep 17 00:00:00 2001 From: "Julian C. Dunn" <jdunn@opscode.com> Date: Sun, 17 Nov 2013 11:41:26 -0500 Subject: [PATCH 0115/1622] [BENTO-91] Re-fix sudoers rules for Ubuntu >= 12.04 --- packer/ubuntu-12.04-amd64.json | 2 +- packer/ubuntu-12.04-i386.json | 2 +- packer/ubuntu-12.10-amd64.json | 2 +- packer/ubuntu-12.10-i386.json | 2 +- packer/ubuntu-13.04-amd64.json | 2 +- packer/ubuntu-13.04-i386.json | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/packer/ubuntu-12.04-amd64.json b/packer/ubuntu-12.04-amd64.json index 43c8bd5f0..863abb5eb 100644 --- a/packer/ubuntu-12.04-amd64.json +++ b/packer/ubuntu-12.04-amd64.json @@ -104,7 +104,7 @@ "scripts/ubuntu/update.sh", "scripts/common/sshd.sh", "scripts/ubuntu/networking.sh", - "scripts/ubuntu/sudoers.sh", + "scripts/common/sudoers.sh", "scripts/common/vagrant.sh", "scripts/common/vmtools.sh", "scripts/ubuntu/cleanup.sh", diff --git a/packer/ubuntu-12.04-i386.json b/packer/ubuntu-12.04-i386.json index 74f4a0a1d..256586050 100644 --- a/packer/ubuntu-12.04-i386.json +++ b/packer/ubuntu-12.04-i386.json @@ -104,7 +104,7 @@ "scripts/ubuntu/update.sh", "scripts/common/sshd.sh", "scripts/ubuntu/networking.sh", - "scripts/ubuntu/sudoers.sh", + "scripts/common/sudoers.sh", "scripts/common/vagrant.sh", "scripts/common/vmtools.sh", "scripts/ubuntu/cleanup.sh", diff --git a/packer/ubuntu-12.10-amd64.json b/packer/ubuntu-12.10-amd64.json index 3c07d1b7c..90dd3f86b 100644 --- a/packer/ubuntu-12.10-amd64.json +++ b/packer/ubuntu-12.10-amd64.json @@ -104,7 +104,7 @@ "scripts/ubuntu/update.sh", "scripts/common/sshd.sh", "scripts/ubuntu/networking.sh", - "scripts/ubuntu/sudoers.sh", + "scripts/common/sudoers.sh", "scripts/common/vagrant.sh", "scripts/common/vmtools.sh", "scripts/ubuntu/cleanup.sh", diff --git a/packer/ubuntu-12.10-i386.json b/packer/ubuntu-12.10-i386.json index 6733d1b5e..816c88938 100644 --- a/packer/ubuntu-12.10-i386.json +++ b/packer/ubuntu-12.10-i386.json @@ -104,7 +104,7 @@ "scripts/ubuntu/update.sh", "scripts/common/sshd.sh", "scripts/ubuntu/networking.sh", - "scripts/ubuntu/sudoers.sh", + "scripts/common/sudoers.sh", "scripts/common/vagrant.sh", "scripts/common/vmtools.sh", "scripts/ubuntu/cleanup.sh", diff --git a/packer/ubuntu-13.04-amd64.json b/packer/ubuntu-13.04-amd64.json index 51cf98571..c67bc8fd3 100644 --- a/packer/ubuntu-13.04-amd64.json +++ b/packer/ubuntu-13.04-amd64.json @@ -105,7 +105,7 @@ "scripts/ubuntu/update.sh", "scripts/common/sshd.sh", "scripts/ubuntu/networking.sh", - "scripts/ubuntu/sudoers.sh", + "scripts/common/sudoers.sh", "scripts/common/vagrant.sh", "scripts/common/vmtools.sh", "scripts/ubuntu/cleanup.sh", diff --git a/packer/ubuntu-13.04-i386.json b/packer/ubuntu-13.04-i386.json index 5f2371c87..ebcbdef91 100644 --- a/packer/ubuntu-13.04-i386.json +++ b/packer/ubuntu-13.04-i386.json @@ -109,7 +109,7 @@ "scripts/ubuntu/update.sh", "scripts/common/sshd.sh", "scripts/ubuntu/networking.sh", - "scripts/ubuntu/sudoers.sh", + "scripts/common/sudoers.sh", "scripts/common/vagrant.sh", "scripts/common/vmtools.sh", "scripts/ubuntu/cleanup.sh", From 9079b526a34257c770e8fa83938e000b9154844c Mon Sep 17 00:00:00 2001 From: "Julian C. Dunn" <jdunn@opscode.com> Date: Sun, 17 Nov 2013 19:37:39 -0500 Subject: [PATCH 0116/1622] [GH-111] Enable building of provisionerless and provisioner boxes --- packer/centos-5.10-i386.json | 7 ++++++- packer/centos-5.10-x86_64.json | 7 ++++++- packer/centos-6.4-i386.json | 7 ++++++- packer/centos-6.4-x86_64.json | 7 ++++++- packer/debian-6.0.8-amd64.json | 7 ++++++- packer/debian-6.0.8-i386.json | 9 +++++++-- packer/debian-7.2.0-amd64.json | 9 +++++++-- packer/debian-7.2.0-i386.json | 9 +++++++-- packer/fedora-18-i386.json | 7 ++++++- packer/fedora-18-x86_64.json | 7 ++++++- packer/fedora-19-i386.json | 7 ++++++- packer/fedora-19-x86_64.json | 7 ++++++- packer/fedora-20-i386.json | 7 ++++++- packer/fedora-20-x86_64.json | 7 ++++++- packer/freebsd-9.1-amd64.json | 6 +++++- packer/rhel-5.10-i386.json | 7 ++++++- packer/rhel-5.10-x86_64.json | 7 ++++++- packer/rhel-6.4-i386.json | 7 ++++++- packer/rhel-6.4-x86_64.json | 7 ++++++- packer/scripts/common/chef.sh | 19 +++++++++++++++++-- packer/ubuntu-10.04-amd64.json | 7 ++++++- packer/ubuntu-10.04-i386.json | 7 ++++++- packer/ubuntu-12.04-amd64.json | 7 ++++++- packer/ubuntu-12.04-i386.json | 7 ++++++- packer/ubuntu-12.10-amd64.json | 7 ++++++- packer/ubuntu-12.10-i386.json | 7 ++++++- packer/ubuntu-13.04-amd64.json | 7 ++++++- packer/ubuntu-13.04-i386.json | 7 ++++++- packer/ubuntu-13.10-amd64.json | 7 ++++++- packer/ubuntu-13.10-i386.json | 7 ++++++- 30 files changed, 193 insertions(+), 34 deletions(-) diff --git a/packer/centos-5.10-i386.json b/packer/centos-5.10-i386.json index 41ee0109c..46cdb7e5c 100644 --- a/packer/centos-5.10-i386.json +++ b/packer/centos-5.10-i386.json @@ -1,4 +1,7 @@ { + "variables": { + "chef_version": "provisionerless" + }, "builders": [ { "type": "virtualbox", @@ -51,17 +54,19 @@ ], "post-processors": [ { - "output": "../builds/{{.Provider}}/opscode_centos-5.10-i386_provisionerless.box", + "output": "../builds/{{.Provider}}/opscode_centos-5.10-i386_chef-{{user `chef_version`}}.box", "type": "vagrant" } ], "provisioners": [ { + "environment_vars": [ "CHEF_VERSION={{user `chef_version`}}" ], "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E bash '{{.Path}}'", "scripts": [ "scripts/common/vagrant.sh", "scripts/common/sshd.sh", "scripts/common/vmtools.sh", + "scripts/common/chef.sh", "scripts/centos/cleanup.sh", "scripts/common/minimize.sh" ], diff --git a/packer/centos-5.10-x86_64.json b/packer/centos-5.10-x86_64.json index d3c6ee149..b34164bb1 100644 --- a/packer/centos-5.10-x86_64.json +++ b/packer/centos-5.10-x86_64.json @@ -1,4 +1,7 @@ { + "variables": { + "chef_version": "provisionerless" + }, "builders": [ { "type": "virtualbox", @@ -51,17 +54,19 @@ ], "post-processors": [ { - "output": "../builds/{{.Provider}}/opscode_centos-5.10_provisionerless.box", + "output": "../builds/{{.Provider}}/opscode_centos-5.10_chef-{{user `chef_version`}}.box", "type": "vagrant" } ], "provisioners": [ { + "environment_vars": [ "CHEF_VERSION={{user `chef_version`}}" ], "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E bash '{{.Path}}'", "scripts": [ "scripts/common/vagrant.sh", "scripts/common/sshd.sh", "scripts/common/vmtools.sh", + "scripts/common/chef.sh", "scripts/centos/cleanup.sh", "scripts/common/minimize.sh" ], diff --git a/packer/centos-6.4-i386.json b/packer/centos-6.4-i386.json index cb9ad4f76..038814527 100644 --- a/packer/centos-6.4-i386.json +++ b/packer/centos-6.4-i386.json @@ -1,4 +1,7 @@ { + "variables": { + "chef_version": "provisionerless" + }, "builders": [ { "type": "virtualbox", @@ -51,17 +54,19 @@ ], "post-processors": [ { - "output": "../builds/{{.Provider}}/opscode_centos-6.4-i386_provisionerless.box", + "output": "../builds/{{.Provider}}/opscode_centos-6.4-i386_chef-{{user `chef_version`}}.box", "type": "vagrant" } ], "provisioners": [ { + "environment_vars": [ "CHEF_VERSION={{user `chef_version`}}" ], "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E bash '{{.Path}}'", "scripts": [ "scripts/common/sshd.sh", "scripts/common/vagrant.sh", "scripts/common/vmtools.sh", + "scripts/common/chef.sh", "scripts/centos/cleanup.sh", "scripts/common/minimize.sh" ], diff --git a/packer/centos-6.4-x86_64.json b/packer/centos-6.4-x86_64.json index bef6db39a..07dc48b3e 100644 --- a/packer/centos-6.4-x86_64.json +++ b/packer/centos-6.4-x86_64.json @@ -1,4 +1,7 @@ { + "variables": { + "chef_version": "provisionerless" + }, "builders": [ { "type": "virtualbox", @@ -51,17 +54,19 @@ ], "post-processors": [ { - "output": "../builds/{{.Provider}}/opscode_centos-6.4_provisionerless.box", + "output": "../builds/{{.Provider}}/opscode_centos-6.4_chef-{{user `chef_version`}}.box", "type": "vagrant" } ], "provisioners": [ { + "environment_vars": [ "CHEF_VERSION={{user `chef_version`}}" ], "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E bash '{{.Path}}'", "scripts": [ "scripts/common/sshd.sh", "scripts/common/vagrant.sh", "scripts/common/vmtools.sh", + "scripts/common/chef.sh", "scripts/centos/cleanup.sh", "scripts/common/minimize.sh" ], diff --git a/packer/debian-6.0.8-amd64.json b/packer/debian-6.0.8-amd64.json index 6cdec87a0..1956d1d0d 100644 --- a/packer/debian-6.0.8-amd64.json +++ b/packer/debian-6.0.8-amd64.json @@ -1,4 +1,7 @@ { + "variables": { + "chef_version": "provisionerless" + }, "builders": [ { "type": "virtualbox", @@ -80,7 +83,7 @@ "post-processors": [ { "type": "vagrant", - "output": "../builds/{{.Provider}}/opscode_debian-6.0.8_provisionerless.box" + "output": "../builds/{{.Provider}}/opscode_debian-6.0.8_chef-{{user `chef_version`}}.box" } ], "provisioners": [ @@ -93,9 +96,11 @@ "scripts/debian/sudoers.sh", "scripts/common/vagrant.sh", "scripts/common/vmtools.sh", + "scripts/common/chef.sh", "scripts/debian/cleanup.sh", "scripts/common/minimize.sh" ], + "environment_vars": [ "CHEF_VERSION={{user `chef_version`}}" ], "execute_command": "echo 'vagrant'|{{.Vars}} sudo -S -E bash '{{.Path}}'" } ] diff --git a/packer/debian-6.0.8-i386.json b/packer/debian-6.0.8-i386.json index af0b17155..fa14f6be6 100644 --- a/packer/debian-6.0.8-i386.json +++ b/packer/debian-6.0.8-i386.json @@ -1,4 +1,7 @@ { + "variables": { + "chef_version": "provisionerless" + }, "builders": [ { "type": "virtualbox", @@ -80,7 +83,7 @@ "post-processors": [ { "type": "vagrant", - "output": "../builds/{{.Provider}}/opscode_debian-6.0.8-i386_provisionerless.box" + "output": "../builds/{{.Provider}}/opscode_debian-6.0.8-i386_chef-{{user `chef_version`}}.box" } ], "provisioners": [ @@ -93,10 +96,12 @@ "scripts/debian/sudoers.sh", "scripts/common/vagrant.sh", "scripts/common/vmtools.sh", + "scripts/common/chef.sh", "scripts/debian/cleanup.sh", "scripts/common/minimize.sh" ], - "type": "shell" + "type": "shell", + "environment_vars": [ "CHEF_VERSION={{user `chef_version`}}" ] } ] } diff --git a/packer/debian-7.2.0-amd64.json b/packer/debian-7.2.0-amd64.json index 88397f7e1..b70593095 100644 --- a/packer/debian-7.2.0-amd64.json +++ b/packer/debian-7.2.0-amd64.json @@ -1,4 +1,7 @@ { + "variables": { + "chef_version": "provisionerless" + }, "builders": [ { "type": "virtualbox", @@ -80,7 +83,7 @@ "post-processors": [ { "type": "vagrant", - "output": "../builds/{{.Provider}}/opscode_debian-7.2.0_provisionerless.box" + "output": "../builds/{{.Provider}}/opscode_debian-7.2.0_chef-{{user `chef_version`}}.box" } ], "provisioners": [ @@ -93,10 +96,12 @@ "scripts/debian/sudoers.sh", "scripts/common/vagrant.sh", "scripts/common/vmtools.sh", + "scripts/common/chef.sh", "scripts/debian/cleanup.sh", "scripts/common/minimize.sh" ], - "type": "shell" + "type": "shell", + "environment_vars": [ "CHEF_VERSION={{user `chef_version`}}" ] } ] } diff --git a/packer/debian-7.2.0-i386.json b/packer/debian-7.2.0-i386.json index bd1a6d09d..438e96058 100644 --- a/packer/debian-7.2.0-i386.json +++ b/packer/debian-7.2.0-i386.json @@ -1,4 +1,7 @@ { + "variables": { + "chef_version": "provisionerless" + }, "builders": [ { "type": "virtualbox", @@ -80,7 +83,7 @@ "post-processors": [ { "type": "vagrant", - "output": "../builds/{{.Provider}}/opscode_debian-7.2.0-i386_provisionerless.box" + "output": "../builds/{{.Provider}}/opscode_debian-7.2.0-i386_chef-{{user `chef_version`}}.box" } ], "provisioners": [ @@ -93,10 +96,12 @@ "scripts/debian/sudoers.sh", "scripts/common/vagrant.sh", "scripts/common/vmtools.sh", + "scripts/common/chef.sh", "scripts/debian/cleanup.sh", "scripts/common/minimize.sh" ], - "type": "shell" + "type": "shell", + "environment_vars": [ "CHEF_VERSION={{user `chef_version`}}" ] } ] } diff --git a/packer/fedora-18-i386.json b/packer/fedora-18-i386.json index 67c413f58..e00ebda4d 100644 --- a/packer/fedora-18-i386.json +++ b/packer/fedora-18-i386.json @@ -1,4 +1,7 @@ { + "variables": { + "chef_version": "provisionerless" + }, "builders": [ { "type": "virtualbox", @@ -51,16 +54,18 @@ ], "post-processors": [ { - "output": "../builds/{{.Provider}}/opscode_fedora-18_provisionerless.box", + "output": "../builds/{{.Provider}}/opscode_fedora-18_chef-{{user `chef_version`}}.box", "type": "vagrant" } ], "provisioners": [ { + "environment_vars": [ "CHEF_VERSION={{user `chef_version`}}" ], "execute_command": "echo 'vagrant' | {{.Vars}} sudo -E -S bash '{{.Path}}'", "scripts": [ "scripts/common/sshd.sh", "scripts/common/vmtools.sh", + "scripts/common/chef.sh", "scripts/common/vagrant.sh", "scripts/fedora/cleanup.sh", "scripts/common/minimize.sh" diff --git a/packer/fedora-18-x86_64.json b/packer/fedora-18-x86_64.json index 38ce0a011..fa42ea5a5 100644 --- a/packer/fedora-18-x86_64.json +++ b/packer/fedora-18-x86_64.json @@ -1,4 +1,7 @@ { + "variables": { + "chef_version": "provisionerless" + }, "builders": [ { "type": "virtualbox", @@ -51,16 +54,18 @@ ], "post-processors": [ { - "output": "../builds/{{.Provider}}/opscode_fedora-18_provisionerless.box", + "output": "../builds/{{.Provider}}/opscode_fedora-18_chef-{{user `chef_version`}}.box", "type": "vagrant" } ], "provisioners": [ { + "environment_vars": [ "CHEF_VERSION={{user `chef_version`}}" ], "execute_command": "echo 'vagrant' | {{.Vars}} sudo -E -S bash '{{.Path}}'", "scripts": [ "scripts/common/sshd.sh", "scripts/common/vmtools.sh", + "scripts/common/chef.sh", "scripts/common/vagrant.sh", "scripts/fedora/cleanup.sh", "scripts/common/minimize.sh" diff --git a/packer/fedora-19-i386.json b/packer/fedora-19-i386.json index 8894ba540..28378b9e2 100644 --- a/packer/fedora-19-i386.json +++ b/packer/fedora-19-i386.json @@ -1,4 +1,7 @@ { + "variables": { + "chef_version": "provisionerless" + }, "builders": [ { "type": "virtualbox", @@ -51,16 +54,18 @@ ], "post-processors": [ { - "output": "../builds/{{.Provider}}/opscode_fedora-19-i386_provisionerless.box", + "output": "../builds/{{.Provider}}/opscode_fedora-19-i386_chef-{{user `chef_version`}}.box", "type": "vagrant" } ], "provisioners": [ { + "environment_vars": [ "CHEF_VERSION={{user `chef_version`}}" ], "execute_command": "echo 'vagrant' | {{.Vars}} sudo -E -S bash '{{.Path}}'", "scripts": [ "scripts/common/sshd.sh", "scripts/common/vmtools.sh", + "scripts/common/chef.sh", "scripts/common/vagrant.sh", "scripts/fedora/cleanup.sh", "scripts/common/minimize.sh" diff --git a/packer/fedora-19-x86_64.json b/packer/fedora-19-x86_64.json index 3787f2c16..8feeabe8b 100644 --- a/packer/fedora-19-x86_64.json +++ b/packer/fedora-19-x86_64.json @@ -1,4 +1,7 @@ { + "variables": { + "chef_version": "provisionerless" + }, "builders": [ { "type": "virtualbox", @@ -51,16 +54,18 @@ ], "post-processors": [ { - "output": "../builds/{{.Provider}}/opscode_fedora-19_provisionerless.box", + "output": "../builds/{{.Provider}}/opscode_fedora-19_chef-{{user `chef_version`}}.box", "type": "vagrant" } ], "provisioners": [ { + "environment_vars": [ "CHEF_VERSION={{user `chef_version`}}" ], "execute_command": "echo 'vagrant' | {{.Vars}} sudo -E -S bash '{{.Path}}'", "scripts": [ "scripts/common/sshd.sh", "scripts/common/vmtools.sh", + "scripts/common/chef.sh", "scripts/common/vagrant.sh", "scripts/fedora/cleanup.sh", "scripts/common/minimize.sh" diff --git a/packer/fedora-20-i386.json b/packer/fedora-20-i386.json index ca196ff4e..a1b3d80dc 100644 --- a/packer/fedora-20-i386.json +++ b/packer/fedora-20-i386.json @@ -1,4 +1,7 @@ { + "variables": { + "chef_version": "provisionerless" + }, "builders": [ { "type": "virtualbox", @@ -51,16 +54,18 @@ ], "post-processors": [ { - "output": "../builds/{{.Provider}}/opscode_fedora-19-i386_provisionerless.box", + "output": "../builds/{{.Provider}}/opscode_fedora-19-i386_chef-{{user `chef_version`}}.box", "type": "vagrant" } ], "provisioners": [ { + "environment_vars": [ "CHEF_VERSION={{user `chef_version`}}" ], "execute_command": "echo 'vagrant' | {{.Vars}} sudo -E -S bash '{{.Path}}'", "scripts": [ "scripts/common/sshd.sh", "scripts/common/vmtools.sh", + "scripts/common/chef.sh", "scripts/common/vagrant.sh", "scripts/fedora/cleanup.sh", "scripts/common/minimize.sh" diff --git a/packer/fedora-20-x86_64.json b/packer/fedora-20-x86_64.json index 6f6b78d61..d8df7675e 100644 --- a/packer/fedora-20-x86_64.json +++ b/packer/fedora-20-x86_64.json @@ -1,4 +1,7 @@ { + "variables": { + "chef_version": "provisionerless" + }, "builders": [ { "type": "virtualbox", @@ -51,16 +54,18 @@ ], "post-processors": [ { - "output": "../builds/{{.Provider}}/opscode_fedora-20-x86_64_provisionerless.box", + "output": "../builds/{{.Provider}}/opscode_fedora-20-x86_64_chef-{{user `chef_version`}}.box", "type": "vagrant" } ], "provisioners": [ { + "environment_vars": [ "CHEF_VERSION={{user `chef_version`}}" ], "execute_command": "echo 'vagrant' | {{.Vars}} sudo -E -S bash '{{.Path}}'", "scripts": [ "scripts/common/sshd.sh", "scripts/common/vmtools.sh", + "scripts/common/chef.sh", "scripts/common/vagrant.sh", "scripts/fedora/cleanup.sh", "scripts/common/minimize.sh" diff --git a/packer/freebsd-9.1-amd64.json b/packer/freebsd-9.1-amd64.json index 2a6b148de..588c4eb1e 100644 --- a/packer/freebsd-9.1-amd64.json +++ b/packer/freebsd-9.1-amd64.json @@ -1,6 +1,10 @@ { + "variables": { + "chef_version": "provisionerless" + }, "provisioners": [ { + "environment_vars": [ "CHEF_VERSION={{user `chef_version`}}" ], "type": "shell", "scripts": [ "scripts/freebsd/postinstall.csh", @@ -83,7 +87,7 @@ ], "post-processors": [ { - "output": "../builds/{{.Provider}}/opscode_freebsd-9.1_provisionerless.box", + "output": "../builds/{{.Provider}}/opscode_freebsd-9.1_chef-{{user `chef_version`}}.box", "type": "vagrant" } ] diff --git a/packer/rhel-5.10-i386.json b/packer/rhel-5.10-i386.json index 552fc802e..5b41407ea 100644 --- a/packer/rhel-5.10-i386.json +++ b/packer/rhel-5.10-i386.json @@ -1,4 +1,7 @@ { + "variables": { + "chef_version": "provisionerless" + }, "builders": [ { "type": "virtualbox", @@ -51,17 +54,19 @@ ], "post-processors": [ { - "output": "../builds/{{.Provider}}/opscode_rhel-5.10-i386_provisionerless.box", + "output": "../builds/{{.Provider}}/opscode_rhel-5.10-i386_chef-{{user `chef_version`}}.box", "type": "vagrant" } ], "provisioners": [ { + "environment_vars": [ "CHEF_VERSION={{user `chef_version`}}" ], "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E bash '{{.Path}}'", "scripts": [ "scripts/common/vagrant.sh", "scripts/common/sshd.sh", "scripts/common/vmtools.sh", + "scripts/common/chef.sh", "scripts/centos/cleanup.sh", "scripts/common/minimize.sh" ], diff --git a/packer/rhel-5.10-x86_64.json b/packer/rhel-5.10-x86_64.json index 9c55fb3f6..4315d4797 100644 --- a/packer/rhel-5.10-x86_64.json +++ b/packer/rhel-5.10-x86_64.json @@ -1,4 +1,7 @@ { + "variables": { + "chef_version": "provisionerless" + }, "builders": [ { "type": "virtualbox", @@ -51,17 +54,19 @@ ], "post-processors": [ { - "output": "../builds/{{.Provider}}/opscode_rhel-5.10_provisionerless.box", + "output": "../builds/{{.Provider}}/opscode_rhel-5.10_chef-{{user `chef_version`}}.box", "type": "vagrant" } ], "provisioners": [ { + "environment_vars": [ "CHEF_VERSION={{user `chef_version`}}" ], "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E bash '{{.Path}}'", "scripts": [ "scripts/common/vagrant.sh", "scripts/common/sshd.sh", "scripts/common/vmtools.sh", + "scripts/common/chef.sh", "scripts/centos/cleanup.sh", "scripts/common/minimize.sh" ], diff --git a/packer/rhel-6.4-i386.json b/packer/rhel-6.4-i386.json index cb673c2b3..28a74f820 100644 --- a/packer/rhel-6.4-i386.json +++ b/packer/rhel-6.4-i386.json @@ -1,4 +1,7 @@ { + "variables": { + "chef_version": "provisionerless" + }, "builders": [ { "type": "virtualbox", @@ -51,17 +54,19 @@ ], "post-processors": [ { - "output": "../builds/{{.Provider}}/opscode_rhel-6.4-i386_provisionerless.box", + "output": "../builds/{{.Provider}}/opscode_rhel-6.4-i386_chef-{{user `chef_version`}}.box", "type": "vagrant" } ], "provisioners": [ { + "environment_vars": [ "CHEF_VERSION={{user `chef_version`}}" ], "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E bash '{{.Path}}'", "scripts": [ "scripts/common/sshd.sh", "scripts/common/vagrant.sh", "scripts/common/vmtools.sh", + "scripts/common/chef.sh", "scripts/centos/cleanup.sh", "scripts/common/minimize.sh" ], diff --git a/packer/rhel-6.4-x86_64.json b/packer/rhel-6.4-x86_64.json index ab9cb0755..4c217d375 100644 --- a/packer/rhel-6.4-x86_64.json +++ b/packer/rhel-6.4-x86_64.json @@ -1,4 +1,7 @@ { + "variables": { + "chef_version": "provisionerless" + }, "builders": [ { "type": "virtualbox", @@ -51,17 +54,19 @@ ], "post-processors": [ { - "output": "../builds/{{.Provider}}/opscode_redhat-6.4_provisionerless.box", + "output": "../builds/{{.Provider}}/opscode_redhat-6.4_chef-{{user `chef_version`}}.box", "type": "vagrant" } ], "provisioners": [ { + "environment_vars": [ "CHEF_VERSION={{user `chef_version`}}" ], "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E bash '{{.Path}}'", "scripts": [ "scripts/common/sshd.sh", "scripts/common/vagrant.sh", "scripts/common/vmtools.sh", + "scripts/common/chef.sh", "scripts/centos/cleanup.sh", "scripts/common/minimize.sh" ], diff --git a/packer/scripts/common/chef.sh b/packer/scripts/common/chef.sh index c359971d0..f6d24394d 100644 --- a/packer/scripts/common/chef.sh +++ b/packer/scripts/common/chef.sh @@ -1,3 +1,18 @@ -#!/bin/bash -eux +#!/bin/sh -eux -curl -L www.opscode.com/chef/install.sh | bash \ No newline at end of file +# Set $CHEF_VERSION inside Packer's template. Valid options are: +# 'provisionerless' -- build a box without Chef +# 'x.y.z' -- build a box with version x.y.z of Chef +# 'latest' -- build a box with the latest version of Chef + +if [ $CHEF_VERSION != 'provisionerless' ]; then + if [ $CHEF_VERSION == 'latest' ]; then + echo "Installing latest Chef version" + sh <(curl -L https://www.opscode.com/chef/install.sh) + else + echo "Installing Chef version $CHEF_VERSION" + sh <(curl -L https://www.opscode.com/chef/install.sh) -v $CHEF_VERSION + fi +else + echo "Building a box without Chef" +fi diff --git a/packer/ubuntu-10.04-amd64.json b/packer/ubuntu-10.04-amd64.json index b769da5d9..5a310a89e 100644 --- a/packer/ubuntu-10.04-amd64.json +++ b/packer/ubuntu-10.04-amd64.json @@ -1,4 +1,7 @@ { + "variables": { + "chef_version": "provisionerless" + }, "builders": [ { "type": "virtualbox", @@ -93,12 +96,13 @@ ], "post-processors": [ { - "output": "../builds/{{.Provider}}/opscode_ubuntu-10.04_provisionerless.box", + "output": "../builds/{{.Provider}}/opscode_ubuntu-10.04_chef-{{user `chef_version`}}.box", "type": "vagrant" } ], "provisioners": [ { + "environment_vars": [ "CHEF_VERSION={{user `chef_version`}}" ], "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E bash '{{.Path}}'", "scripts": [ "scripts/ubuntu/update.sh", @@ -107,6 +111,7 @@ "scripts/ubuntu/sudoers.sh", "scripts/common/vagrant.sh", "scripts/common/vmtools.sh", + "scripts/common/chef.sh", "scripts/ubuntu/cleanup.sh", "scripts/common/minimize.sh" ], diff --git a/packer/ubuntu-10.04-i386.json b/packer/ubuntu-10.04-i386.json index bd00e2cb3..5971584e1 100644 --- a/packer/ubuntu-10.04-i386.json +++ b/packer/ubuntu-10.04-i386.json @@ -1,4 +1,7 @@ { + "variables": { + "chef_version": "provisionerless" + }, "builders": [ { "type": "virtualbox", @@ -93,12 +96,13 @@ ], "post-processors": [ { - "output": "../builds/{{.Provider}}/opscode_ubuntu-10.04-i386_provisionerless.box", + "output": "../builds/{{.Provider}}/opscode_ubuntu-10.04-i386_chef-{{user `chef_version`}}.box", "type": "vagrant" } ], "provisioners": [ { + "environment_vars": [ "CHEF_VERSION={{user `chef_version`}}" ], "execute_command": "echo 'vagrant'|{{.Vars}} sudo -S -E bash '{{.Path}}'", "scripts": [ "scripts/ubuntu/update.sh", @@ -107,6 +111,7 @@ "scripts/ubuntu/sudoers.sh", "scripts/common/vagrant.sh", "scripts/common/vmtools.sh", + "scripts/common/chef.sh", "scripts/ubuntu/cleanup.sh", "scripts/common/minimize.sh" ], diff --git a/packer/ubuntu-12.04-amd64.json b/packer/ubuntu-12.04-amd64.json index 863abb5eb..59ecb85f3 100644 --- a/packer/ubuntu-12.04-amd64.json +++ b/packer/ubuntu-12.04-amd64.json @@ -1,4 +1,7 @@ { + "variables": { + "chef_version": "provisionerless" + }, "builders": [ { "type": "virtualbox", @@ -94,11 +97,12 @@ "post-processors": [ { "type": "vagrant", - "output": "../builds/{{.Provider}}/opscode_ubuntu-12.04_provisionerless.box" + "output": "../builds/{{.Provider}}/opscode_ubuntu-12.04_chef-{{user `chef_version`}}.box" } ], "provisioners": [ { + "environment_vars": [ "CHEF_VERSION={{user `chef_version`}}" ], "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E bash '{{.Path}}'", "scripts": [ "scripts/ubuntu/update.sh", @@ -107,6 +111,7 @@ "scripts/common/sudoers.sh", "scripts/common/vagrant.sh", "scripts/common/vmtools.sh", + "scripts/common/chef.sh", "scripts/ubuntu/cleanup.sh", "scripts/common/minimize.sh" ], diff --git a/packer/ubuntu-12.04-i386.json b/packer/ubuntu-12.04-i386.json index 256586050..8005279b7 100644 --- a/packer/ubuntu-12.04-i386.json +++ b/packer/ubuntu-12.04-i386.json @@ -1,4 +1,7 @@ { + "variables": { + "chef_version": "provisionerless" + }, "builders": [ { "type": "virtualbox", @@ -93,12 +96,13 @@ ], "post-processors": [ { - "output": "../builds/{{.Provider}}/opscode_ubuntu-12.04-i386_provisionerless.box", + "output": "../builds/{{.Provider}}/opscode_ubuntu-12.04-i386_chef-{{user `chef_version`}}.box", "type": "vagrant" } ], "provisioners": [ { + "environment_vars": [ "CHEF_VERSION={{user `chef_version`}}" ], "execute_command": "echo 'vagrant'|{{.Vars}} sudo -S -E bash '{{.Path}}'", "scripts": [ "scripts/ubuntu/update.sh", @@ -107,6 +111,7 @@ "scripts/common/sudoers.sh", "scripts/common/vagrant.sh", "scripts/common/vmtools.sh", + "scripts/common/chef.sh", "scripts/ubuntu/cleanup.sh", "scripts/common/minimize.sh" ], diff --git a/packer/ubuntu-12.10-amd64.json b/packer/ubuntu-12.10-amd64.json index 90dd3f86b..8deb0f458 100644 --- a/packer/ubuntu-12.10-amd64.json +++ b/packer/ubuntu-12.10-amd64.json @@ -1,4 +1,7 @@ { + "variables": { + "chef_version": "provisionerless" + }, "builders": [ { "type": "virtualbox", @@ -93,12 +96,13 @@ ], "post-processors": [ { - "output": "../builds/{{.Provider}}/opscode_ubuntu-12.10-amd64_provisionerless.box", + "output": "../builds/{{.Provider}}/opscode_ubuntu-12.10-amd64_chef-{{user `chef_version`}}.box", "type": "vagrant" } ], "provisioners": [ { + "environment_vars": [ "CHEF_VERSION={{user `chef_version`}}" ], "execute_command": "echo 'vagrant'|{{.Vars}} sudo -S -E bash '{{.Path}}'", "scripts": [ "scripts/ubuntu/update.sh", @@ -107,6 +111,7 @@ "scripts/common/sudoers.sh", "scripts/common/vagrant.sh", "scripts/common/vmtools.sh", + "scripts/common/chef.sh", "scripts/ubuntu/cleanup.sh", "scripts/common/minimize.sh" ], diff --git a/packer/ubuntu-12.10-i386.json b/packer/ubuntu-12.10-i386.json index 816c88938..b8fa4148e 100644 --- a/packer/ubuntu-12.10-i386.json +++ b/packer/ubuntu-12.10-i386.json @@ -1,4 +1,7 @@ { + "variables": { + "chef_version": "provisionerless" + }, "builders": [ { "boot_command": [ @@ -93,12 +96,13 @@ ], "post-processors": [ { - "output": "../builds/{{.Provider}}/opscode_ubuntu-12.10-i386_provisionerless.box", + "output": "../builds/{{.Provider}}/opscode_ubuntu-12.10-i386_chef-{{user `chef_version`}}.box", "type": "vagrant" } ], "provisioners": [ { + "environment_vars": [ "CHEF_VERSION={{user `chef_version`}}" ], "execute_command": "echo 'vagrant'|{{.Vars}} sudo -S -E bash '{{.Path}}'", "scripts": [ "scripts/ubuntu/update.sh", @@ -107,6 +111,7 @@ "scripts/common/sudoers.sh", "scripts/common/vagrant.sh", "scripts/common/vmtools.sh", + "scripts/common/chef.sh", "scripts/ubuntu/cleanup.sh", "scripts/common/minimize.sh" ], diff --git a/packer/ubuntu-13.04-amd64.json b/packer/ubuntu-13.04-amd64.json index c67bc8fd3..3085551b1 100644 --- a/packer/ubuntu-13.04-amd64.json +++ b/packer/ubuntu-13.04-amd64.json @@ -1,4 +1,7 @@ { + "variables": { + "chef_version": "provisionerless" + }, "builders": [ { "type": "virtualbox", @@ -94,12 +97,13 @@ ], "post-processors": [ { - "output": "../builds/{{.Provider}}/opscode_ubuntu-13.04_provisionerless.box", + "output": "../builds/{{.Provider}}/opscode_ubuntu-13.04_chef-{{user `chef_version`}}.box", "type": "vagrant" } ], "provisioners": [ { + "environment_vars": [ "CHEF_VERSION={{user `chef_version`}}" ], "execute_command": "echo 'vagrant'|{{.Vars}} sudo -S -E bash '{{.Path}}'", "scripts": [ "scripts/ubuntu/update.sh", @@ -108,6 +112,7 @@ "scripts/common/sudoers.sh", "scripts/common/vagrant.sh", "scripts/common/vmtools.sh", + "scripts/common/chef.sh", "scripts/ubuntu/cleanup.sh", "scripts/common/minimize.sh" ], diff --git a/packer/ubuntu-13.04-i386.json b/packer/ubuntu-13.04-i386.json index ebcbdef91..9d3b955ea 100644 --- a/packer/ubuntu-13.04-i386.json +++ b/packer/ubuntu-13.04-i386.json @@ -1,4 +1,7 @@ { + "variables": { + "chef_version": "provisionerless" + }, "builders": [ { "type": "virtualbox", @@ -93,7 +96,7 @@ ], "post-processors": [ { - "output": "../builds/{{.Provider}}/opscode_ubuntu-13.04-i386_provisionerless.box", + "output": "../builds/{{.Provider}}/opscode_ubuntu-13.04-i386_chef-{{user `chef_version`}}.box", "type": "vagrant" } ], @@ -104,6 +107,7 @@ "destination": "/tmp/shutdown.sh" }, { + "environment_vars": [ "CHEF_VERSION={{user `chef_version`}}" ], "execute_command": "echo 'vagrant'|{{.Vars}} sudo -S -E bash '{{.Path}}'", "scripts": [ "scripts/ubuntu/update.sh", @@ -112,6 +116,7 @@ "scripts/common/sudoers.sh", "scripts/common/vagrant.sh", "scripts/common/vmtools.sh", + "scripts/common/chef.sh", "scripts/ubuntu/cleanup.sh", "scripts/common/minimize.sh" ], diff --git a/packer/ubuntu-13.10-amd64.json b/packer/ubuntu-13.10-amd64.json index 405d4f7e4..8ff59fb4b 100644 --- a/packer/ubuntu-13.10-amd64.json +++ b/packer/ubuntu-13.10-amd64.json @@ -1,4 +1,7 @@ { + "variables": { + "chef_version": "provisionerless" + }, "builders": [ { "type": "virtualbox", @@ -94,12 +97,13 @@ ], "post-processors": [ { - "output": "../builds/{{.Provider}}/opscode_ubuntu-13.10_provisionerless.box", + "output": "../builds/{{.Provider}}/opscode_ubuntu-13.10_chef-{{user `chef_version`}}.box", "type": "vagrant" } ], "provisioners": [ { + "environment_vars": [ "CHEF_VERSION={{user `chef_version`}}" ], "execute_command": "echo 'vagrant'|{{.Vars}} sudo -S -E bash '{{.Path}}'", "scripts": [ "scripts/ubuntu/update.sh", @@ -108,6 +112,7 @@ "scripts/debian/sudoers.sh", "scripts/common/vagrant.sh", "scripts/common/vmtools.sh", + "scripts/common/chef.sh", "scripts/ubuntu/cleanup.sh", "scripts/common/minimize.sh" ], diff --git a/packer/ubuntu-13.10-i386.json b/packer/ubuntu-13.10-i386.json index 887497ce9..b2fc1f41b 100644 --- a/packer/ubuntu-13.10-i386.json +++ b/packer/ubuntu-13.10-i386.json @@ -1,4 +1,7 @@ { + "variables": { + "chef_version": "provisionerless" + }, "builders": [ { "type": "virtualbox", @@ -93,7 +96,7 @@ ], "post-processors": [ { - "output": "../builds/{{.Provider}}/opscode_ubuntu-13.10-i386_provisionerless.box", + "output": "../builds/{{.Provider}}/opscode_ubuntu-13.10-i386_chef-{{user `chef_version`}}.box", "type": "vagrant" } ], @@ -104,6 +107,7 @@ "destination": "/tmp/shutdown.sh" }, { + "environment_vars": [ "CHEF_VERSION={{user `chef_version`}}" ], "execute_command": "echo 'vagrant'|{{.Vars}} sudo -S -E bash '{{.Path}}'", "scripts": [ "scripts/ubuntu/update.sh", @@ -112,6 +116,7 @@ "scripts/debian/sudoers.sh", "scripts/common/vagrant.sh", "scripts/common/vmtools.sh", + "scripts/common/chef.sh", "scripts/ubuntu/cleanup.sh", "scripts/common/minimize.sh" ], From d28687df362b0665eecc51655f95125b1be1a573 Mon Sep 17 00:00:00 2001 From: Pete Cheslock <petecheslock@gmail.com> Date: Mon, 4 Nov 2013 16:12:43 -0500 Subject: [PATCH 0117/1622] [GH-108] Fixes to minimize size of FreeBSD 9.1 amd64 build, increase memory, etc. --- packer/freebsd-9.1-amd64.json | 5 ++-- packer/scripts/freebsd/cleanup.sh | 15 ++++++++++++ packer/scripts/freebsd/postinstall.csh | 33 ++++---------------------- 3 files changed, 22 insertions(+), 31 deletions(-) create mode 100644 packer/scripts/freebsd/cleanup.sh diff --git a/packer/freebsd-9.1-amd64.json b/packer/freebsd-9.1-amd64.json index 588c4eb1e..b9769525b 100644 --- a/packer/freebsd-9.1-amd64.json +++ b/packer/freebsd-9.1-amd64.json @@ -8,6 +8,7 @@ "type": "shell", "scripts": [ "scripts/freebsd/postinstall.csh", + "scripts/freebsd/cleanup.sh", "scripts/common/minimize.sh" ], "execute_command": "cat '{{.Path}}' | su -" @@ -45,7 +46,7 @@ "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "virtualbox_version_file": ".vbox_version", "vboxmanage": [ - [ "modifyvm", "{{.Name}}", "--memory", "512" ], + [ "modifyvm", "{{.Name}}", "--memory", "768" ], [ "modifyvm", "{{.Name}}", "--cpus", "1" ] ] }, @@ -79,7 +80,7 @@ "ssh_wait_timeout": "10000s", "shutdown_command": "echo 'shutdown -p now' > shutdown.sh; cat 'shutdown.sh' | su -", "vmx_data": { - "memsize": "512", + "memsize": "768", "numvcpus": "1", "cpuid.coresPerSocket": "1" } diff --git a/packer/scripts/freebsd/cleanup.sh b/packer/scripts/freebsd/cleanup.sh new file mode 100644 index 000000000..42d61ab0c --- /dev/null +++ b/packer/scripts/freebsd/cleanup.sh @@ -0,0 +1,15 @@ +#!/bin/sh -eux + +# Purge files we don't need any longer +rm -rf /tmp/chef* +rm -rf /home/vagrant/VBox*.iso +rm -rf /usr/ports/distfiles/* +rm -rf /var/db/freebsd-update/files +mkdir /var/db/freebsd-update/files +rm -rf /var/db/freebsd-update/*-rollback +rm -rf /var/db/freebsd-update/install.* +rm -rf /boot/kernel.old +rm -rf /usr/src/* +rm -rf /*.core + +exit diff --git a/packer/scripts/freebsd/postinstall.csh b/packer/scripts/freebsd/postinstall.csh index 1705c6410..b76fc7690 100644 --- a/packer/scripts/freebsd/postinstall.csh +++ b/packer/scripts/freebsd/postinstall.csh @@ -16,28 +16,8 @@ chmod +x /tmp/freebsd-update env PAGER=/bin/cat /tmp/freebsd-update fetch env PAGER=/bin/cat /tmp/freebsd-update install -# allow portsnap to run fetch without stdin attached to a terminal -sed 's/\[ ! -t 0 \]/false/' /usr/sbin/portsnap > /tmp/portsnap -chmod +x /tmp/portsnap - -# reduce the ports we extract to a minimum -cat >> /etc/portsnap.conf << EOT -REFUSE accessibility arabic archivers astro audio benchmarks biology cad -REFUSE chinese comms databases deskutils distfiles dns editors finance french -REFUSE ftp games german graphics hebrew hungarian irc japanese java korean -REFUSE mail math multimedia net net-im net-mgmt net-p2p news packages palm -REFUSE polish portuguese print russian science sysutils ukrainian -REFUSE vietnamese www x11 x11-clocks x11-drivers x11-fm x11-fonts x11-servers -REFUSE x11-themes x11-toolkits x11-wm -EOT - -# get new ports -/tmp/portsnap fetch extract - -# build package for sudo -pkg_delete -af -cd /usr/ports/security/sudo -make -DBATCH package-recursive clean +#Install sudo and bash and curl +pkg_add -r sudo bash-static curl #Installing vagrant keys mkdir /home/vagrant/.ssh @@ -49,8 +29,7 @@ chmod -R go-rwsx /home/vagrant/.ssh # Cleaning portstree to save space # http://www.freebsd.org/doc/en_US.ISO8859-1/books/handbook/ports-using.html -cd /usr/ports/ports-mgmt/portupgrade -make install -DBATCH clean +pkg_add -r portupgrade /usr/local/sbin/portsclean -C @@ -71,11 +50,7 @@ cat >> /etc/make.conf << EOT WITHOUT_X11="YES" EOT -cd /usr/ports/emulators/virtualbox-ose-additions -make -DBATCH package clean - -cd /usr/ports/emulators/virtio-kmod -make -DBATCH install +pkg_add -r virtualbox-ose-additions virtio-kmod # undo our customizations sed -i '' -e '/^REFUSE /d' /etc/portsnap.conf From 188e369272f097e69010b3c0a4e6a221096c7b45 Mon Sep 17 00:00:00 2001 From: "Julian C. Dunn" <jdunn@opscode.com> Date: Wed, 20 Nov 2013 09:01:30 -0500 Subject: [PATCH 0118/1622] Fix incorrect CPU type on Ubuntu 12.10. --- packer/ubuntu-12.10-amd64.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packer/ubuntu-12.10-amd64.json b/packer/ubuntu-12.10-amd64.json index 8deb0f458..af5fcc213 100644 --- a/packer/ubuntu-12.10-amd64.json +++ b/packer/ubuntu-12.10-amd64.json @@ -32,7 +32,7 @@ "boot_wait": "10s", "disk_size": 40960, "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", - "guest_os_type": "Ubuntu", + "guest_os_type": "Ubuntu_64", "http_directory": "http", "iso_checksum": "e2a48af008ff3c4db6a8235151a1e90ea600fceb", "iso_checksum_type": "sha1", @@ -76,7 +76,7 @@ ], "boot_wait": "10s", "disk_size": 40960, - "guest_os_type": "ubuntu", + "guest_os_type": "ubuntu-64", "http_directory": "http", "iso_checksum": "e2a48af008ff3c4db6a8235151a1e90ea600fceb", "iso_checksum_type": "sha1", From 56c1daf14db3ef339f5f2f8b292fbad7c098f6fb Mon Sep 17 00:00:00 2001 From: Pete Cheslock <petecheslock@gmail.com> Date: Sun, 24 Nov 2013 00:08:54 -0500 Subject: [PATCH 0119/1622] Bash is dead, Long live Bash. This adjusts the following * Remove bash - no longer needed for vagrant * Removes installing portsclean - as cleanup script does this * Add a Freebsd i386 9.1 build config --- packer/freebsd-9.1-i386.json | 91 ++++++++++++++++++++++++++ packer/scripts/freebsd/postinstall.csh | 8 +-- 2 files changed, 92 insertions(+), 7 deletions(-) create mode 100644 packer/freebsd-9.1-i386.json diff --git a/packer/freebsd-9.1-i386.json b/packer/freebsd-9.1-i386.json new file mode 100644 index 000000000..5ea957b5e --- /dev/null +++ b/packer/freebsd-9.1-i386.json @@ -0,0 +1,91 @@ +{ + "provisioners": [ + { + "type": "shell", + "scripts": [ + "scripts/freebsd/postinstall.csh", + "scripts/freebsd/cleanup.sh", + "scripts/common/minimize.sh" + ], + "execute_command": "cat '{{.Path}}' | su -" + } + ], + "builders": [ + { + "type": "virtualbox", + "boot_command": [ + "<esc><wait>", + "load geom_mbr<wait>", + "<enter><wait>", + "load zfs<wait>", + "<enter><wait>", + "boot -s<wait>", + "<enter><wait>", + "<wait10><wait10>", + "/bin/sh<enter><wait>", + "mdmfs -s 100m md1 /tmp<enter><wait>", + "dhclient -l /tmp/dhclient.lease.em0 em0<enter><wait>", + "fetch -o /tmp/install.sh http://{{ .HTTPIP }}:{{ .HTTPPort }}/freebsd-9.1/install.sh && chmod +x /tmp/install.sh && /tmp/install.sh {{ .Name }}<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 10140, + "guest_os_type": "FreeBSD_64", + "http_directory": "http", + "iso_checksum": "e37d86ce83908bf4b667fdae7298bca5", + "iso_checksum_type": "md5", + "iso_url": "http://ftp.freebsd.org/pub/FreeBSD/releases/i386/i386/ISO-IMAGES/9.1/FreeBSD-9.1-RELEASE-i386-disc1.iso", + "ssh_username": "vagrant", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_wait_timeout": "10000s", + "shutdown_command": "echo 'shutdown -p now' > shutdown.sh; cat 'shutdown.sh' | su -", + "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "virtualbox_version_file": ".vbox_version", + "vboxmanage": [ + [ "modifyvm", "{{.Name}}", "--memory", "768" ], + [ "modifyvm", "{{.Name}}", "--cpus", "1" ] + ] + }, + { + "type": "vmware", + "boot_command": [ + "<esc><wait>", + "load geom_mbr<wait>", + "<enter><wait>", + "load zfs<wait>", + "<enter><wait>", + "boot -s<wait>", + "<enter><wait>", + "<wait10><wait10>", + "/bin/sh<enter><wait>", + "mdmfs -s 100m md1 /tmp<enter><wait>", + "dhclient -l /tmp/dhclient.lease.em0 em0<enter><wait>", + "<wait5>", + "fetch -o /tmp/install.sh http://{{ .HTTPIP }}:{{ .HTTPPort }}/freebsd-9.1/install.sh && chmod +x /tmp/install.sh && /tmp/install.sh {{ .Name }}<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 10140, + "guest_os_type": "freebsd-64", + "http_directory": "http", + "iso_checksum": "e37d86ce83908bf4b667fdae7298bca5", + "iso_checksum_type": "md5", + "iso_url": "http://ftp.freebsd.org/pub/FreeBSD/releases/i386/i386/ISO-IMAGES/9.1/FreeBSD-9.1-RELEASE-i386-disc1.iso", + "ssh_username": "vagrant", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_wait_timeout": "10000s", + "shutdown_command": "echo 'shutdown -p now' > shutdown.sh; cat 'shutdown.sh' | su -", + "vmx_data": { + "memsize": "768", + "numvcpus": "1", + "cpuid.coresPerSocket": "1" + } + } + ], + "post-processors": [ + { + "output": "../builds/{{.Provider}}/opscode_freebsd-9.1_provisionerless.box", + "type": "vagrant" + } + ] +} diff --git a/packer/scripts/freebsd/postinstall.csh b/packer/scripts/freebsd/postinstall.csh index b76fc7690..6b3cb70bd 100644 --- a/packer/scripts/freebsd/postinstall.csh +++ b/packer/scripts/freebsd/postinstall.csh @@ -17,7 +17,7 @@ env PAGER=/bin/cat /tmp/freebsd-update fetch env PAGER=/bin/cat /tmp/freebsd-update install #Install sudo and bash and curl -pkg_add -r sudo bash-static curl +pkg_add -r sudo curl #Installing vagrant keys mkdir /home/vagrant/.ssh @@ -27,12 +27,6 @@ fetch -am -o authorized_keys 'https://raw.github.com/mitchellh/vagrant/master/ke chown -R vagrant /home/vagrant/.ssh chmod -R go-rwsx /home/vagrant/.ssh -# Cleaning portstree to save space -# http://www.freebsd.org/doc/en_US.ISO8859-1/books/handbook/ports-using.html -pkg_add -r portupgrade - -/usr/local/sbin/portsclean -C - # As sharedfolders are not in defaults ports tree # We will use vagrant via NFS # Enable NFS From 4fb33f49026b807d5a3d4b3f847534f775b572a0 Mon Sep 17 00:00:00 2001 From: "Julian C. Dunn" <jdunn@opscode.com> Date: Sun, 24 Nov 2013 22:19:28 -0500 Subject: [PATCH 0120/1622] Allow building of i386 FreeBSD box provisionerless or with Chef. --- packer/freebsd-9.1-i386.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/packer/freebsd-9.1-i386.json b/packer/freebsd-9.1-i386.json index 5ea957b5e..772768a38 100644 --- a/packer/freebsd-9.1-i386.json +++ b/packer/freebsd-9.1-i386.json @@ -1,4 +1,7 @@ { + "variables": { + "chef_version": "provisionerless" + }, "provisioners": [ { "type": "shell", From 1a6503fd00e77df852f99e84e4f832f1a4b76d29 Mon Sep 17 00:00:00 2001 From: Jon Bass <jbass@ptc.com> Date: Thu, 24 Oct 2013 16:43:01 -0400 Subject: [PATCH 0121/1622] Use correct sudoers changes for Ubuntu 12+. In the veewee definitions, Ubuntu 10 and 11 use the common ubuntu configuration which exempts the admin group. The Ubuntu 12 and 13 definitions don't use the common configuration, instead they use the sudo group. Set exempt sudo user based on lsb_release and handle sudoers NOPASSWD config change correctly. --- packer/scripts/ubuntu/sudoers.sh | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/packer/scripts/ubuntu/sudoers.sh b/packer/scripts/ubuntu/sudoers.sh index ce45b7611..3f5877e8d 100644 --- a/packer/scripts/ubuntu/sudoers.sh +++ b/packer/scripts/ubuntu/sudoers.sh @@ -1,4 +1,17 @@ #!/bin/bash -eux -sed -i -e '/Defaults\s\+env_reset/a Defaults\texempt_group=admin' /etc/sudoers -sed -i -e 's/%admin ALL=(ALL) ALL/%admin ALL=NOPASSWD:ALL/g' /etc/sudoers +# https://help.ubuntu.com/community/CheckingYourUbuntuVersion +if [ lsb_release > /dev/null 2>&1 ] +then + # Get the major version (like "12" from the version string (like "12.04") + major_version=$(lsb_release -r | cut -f 2 | cut -d . -f 1) +fi + +if [ ! -z "$major_version" -a "$major_version" -lt 12 ] +then + sed -i -e '/Defaults\s\+env_reset/a Defaults\texempt_group=admin' /etc/sudoers + sed -i -e 's/%admin\s*ALL=(ALL) ALL/%admin\tALL=NOPASSWD:ALL/g' /etc/sudoers +else + sed -i -e '/Defaults\s\+env_reset/a Defaults\texempt_group=sudo' /etc/sudoers + sed -i -e 's/%sudo\s*ALL=(ALL:ALL) ALL/%sudo\tALL=NOPASSWD:ALL/g' /etc/sudoers +fi From 9ce23fbab3995b88336956888c7e0eab97b5c935 Mon Sep 17 00:00:00 2001 From: "Julian C. Dunn" <jdunn@opscode.com> Date: Sun, 24 Nov 2013 22:25:39 -0500 Subject: [PATCH 0122/1622] For all Ubuntu boxes, use @jon918's unified sudoers script from [GH98] rather than random variants. --- packer/ubuntu-12.04-amd64.json | 2 +- packer/ubuntu-12.04-i386.json | 2 +- packer/ubuntu-12.10-amd64.json | 2 +- packer/ubuntu-12.10-i386.json | 2 +- packer/ubuntu-13.04-amd64.json | 2 +- packer/ubuntu-13.04-i386.json | 2 +- packer/ubuntu-13.10-amd64.json | 2 +- packer/ubuntu-13.10-i386.json | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/packer/ubuntu-12.04-amd64.json b/packer/ubuntu-12.04-amd64.json index 59ecb85f3..49bbca10e 100644 --- a/packer/ubuntu-12.04-amd64.json +++ b/packer/ubuntu-12.04-amd64.json @@ -108,7 +108,7 @@ "scripts/ubuntu/update.sh", "scripts/common/sshd.sh", "scripts/ubuntu/networking.sh", - "scripts/common/sudoers.sh", + "scripts/ubuntu/sudoers.sh", "scripts/common/vagrant.sh", "scripts/common/vmtools.sh", "scripts/common/chef.sh", diff --git a/packer/ubuntu-12.04-i386.json b/packer/ubuntu-12.04-i386.json index 8005279b7..f39cef81f 100644 --- a/packer/ubuntu-12.04-i386.json +++ b/packer/ubuntu-12.04-i386.json @@ -108,7 +108,7 @@ "scripts/ubuntu/update.sh", "scripts/common/sshd.sh", "scripts/ubuntu/networking.sh", - "scripts/common/sudoers.sh", + "scripts/ubuntu/sudoers.sh", "scripts/common/vagrant.sh", "scripts/common/vmtools.sh", "scripts/common/chef.sh", diff --git a/packer/ubuntu-12.10-amd64.json b/packer/ubuntu-12.10-amd64.json index af5fcc213..431e9f91b 100644 --- a/packer/ubuntu-12.10-amd64.json +++ b/packer/ubuntu-12.10-amd64.json @@ -108,7 +108,7 @@ "scripts/ubuntu/update.sh", "scripts/common/sshd.sh", "scripts/ubuntu/networking.sh", - "scripts/common/sudoers.sh", + "scripts/ubuntu/sudoers.sh", "scripts/common/vagrant.sh", "scripts/common/vmtools.sh", "scripts/common/chef.sh", diff --git a/packer/ubuntu-12.10-i386.json b/packer/ubuntu-12.10-i386.json index b8fa4148e..1d3a3b0f1 100644 --- a/packer/ubuntu-12.10-i386.json +++ b/packer/ubuntu-12.10-i386.json @@ -108,7 +108,7 @@ "scripts/ubuntu/update.sh", "scripts/common/sshd.sh", "scripts/ubuntu/networking.sh", - "scripts/common/sudoers.sh", + "scripts/ubuntu/sudoers.sh", "scripts/common/vagrant.sh", "scripts/common/vmtools.sh", "scripts/common/chef.sh", diff --git a/packer/ubuntu-13.04-amd64.json b/packer/ubuntu-13.04-amd64.json index 3085551b1..22e68bd8c 100644 --- a/packer/ubuntu-13.04-amd64.json +++ b/packer/ubuntu-13.04-amd64.json @@ -109,7 +109,7 @@ "scripts/ubuntu/update.sh", "scripts/common/sshd.sh", "scripts/ubuntu/networking.sh", - "scripts/common/sudoers.sh", + "scripts/ubuntu/sudoers.sh", "scripts/common/vagrant.sh", "scripts/common/vmtools.sh", "scripts/common/chef.sh", diff --git a/packer/ubuntu-13.04-i386.json b/packer/ubuntu-13.04-i386.json index 9d3b955ea..082449bcc 100644 --- a/packer/ubuntu-13.04-i386.json +++ b/packer/ubuntu-13.04-i386.json @@ -113,7 +113,7 @@ "scripts/ubuntu/update.sh", "scripts/common/sshd.sh", "scripts/ubuntu/networking.sh", - "scripts/common/sudoers.sh", + "scripts/ubuntu/sudoers.sh", "scripts/common/vagrant.sh", "scripts/common/vmtools.sh", "scripts/common/chef.sh", diff --git a/packer/ubuntu-13.10-amd64.json b/packer/ubuntu-13.10-amd64.json index 8ff59fb4b..22d7d4ab3 100644 --- a/packer/ubuntu-13.10-amd64.json +++ b/packer/ubuntu-13.10-amd64.json @@ -109,7 +109,7 @@ "scripts/ubuntu/update.sh", "scripts/common/sshd.sh", "scripts/ubuntu/networking.sh", - "scripts/debian/sudoers.sh", + "scripts/ubuntu/sudoers.sh", "scripts/common/vagrant.sh", "scripts/common/vmtools.sh", "scripts/common/chef.sh", diff --git a/packer/ubuntu-13.10-i386.json b/packer/ubuntu-13.10-i386.json index b2fc1f41b..c92d83687 100644 --- a/packer/ubuntu-13.10-i386.json +++ b/packer/ubuntu-13.10-i386.json @@ -113,7 +113,7 @@ "scripts/ubuntu/update.sh", "scripts/common/sshd.sh", "scripts/ubuntu/networking.sh", - "scripts/debian/sudoers.sh", + "scripts/ubuntu/sudoers.sh", "scripts/common/vagrant.sh", "scripts/common/vmtools.sh", "scripts/common/chef.sh", From e7ece7c29665bf0ceced367e651c8d57f673defd Mon Sep 17 00:00:00 2001 From: "Julian C. Dunn" <jdunn@opscode.com> Date: Sun, 17 Nov 2013 21:06:15 -0500 Subject: [PATCH 0123/1622] Added Fedora 20 Beta support. --- packer/fedora-20-i386.json | 14 +++++++------- packer/fedora-20-x86_64.json | 8 ++++---- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/packer/fedora-20-i386.json b/packer/fedora-20-i386.json index a1b3d80dc..7366fcaaa 100644 --- a/packer/fedora-20-i386.json +++ b/packer/fedora-20-i386.json @@ -6,16 +6,16 @@ { "type": "virtualbox", "boot_command": [ - "<tab> linux ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/fedora-19/ks.cfg<enter><wait>" + "<tab> linux ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/fedora-20/ks.cfg<enter><wait>" ], "boot_wait": "10s", "disk_size": 40960, "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "guest_os_type": "Fedora", "http_directory": "http", - "iso_checksum": "24e3a6446b7e2e2b0a3591271c896c41eae01f733a65aa4f5bf43e99bfcfc25e", + "iso_checksum": "d98caa59fa72c4817e040060149ca3951aef6c16ccf485522527e7efa3ebbd74", "iso_checksum_type": "sha256", - "iso_url": "http://mirrors.kernel.org/fedora/releases/20/Fedora/i386/iso/Fedora-20-i386-DVD.iso", + "iso_url": "http://download.fedoraproject.org/pub/fedora/linux/releases/test/20-Beta/Fedora/i386/iso/Fedora-20-Beta-i386-DVD.iso", "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", "ssh_password": "vagrant", "ssh_port": 22, @@ -30,15 +30,15 @@ { "type": "vmware", "boot_command": [ - "<tab> linux ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/fedora-19/ks.cfg<enter><wait>" + "<tab> linux ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/fedora-20/ks.cfg<enter><wait>" ], "boot_wait": "10s", "disk_size": 40960, "guest_os_type": "fedora", "http_directory": "http", - "iso_checksum": "24e3a6446b7e2e2b0a3591271c896c41eae01f733a65aa4f5bf43e99bfcfc25e", + "iso_checksum": "d98caa59fa72c4817e040060149ca3951aef6c16ccf485522527e7efa3ebbd74", "iso_checksum_type": "sha256", - "iso_url": "http://mirrors.kernel.org/fedora/releases/20/Fedora/i386/iso/Fedora-20-i386-DVD.iso", + "iso_url": "http://download.fedoraproject.org/pub/fedora/linux/releases/test/20-Beta/Fedora/i386/iso/Fedora-20-Beta-i386-DVD.iso", "tools_upload_flavor": "linux", "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", "ssh_password": "vagrant", @@ -54,7 +54,7 @@ ], "post-processors": [ { - "output": "../builds/{{.Provider}}/opscode_fedora-19-i386_chef-{{user `chef_version`}}.box", + "output": "../builds/{{.Provider}}/opscode_fedora-20-i386_chef-{{user `chef_version`}}.box", "type": "vagrant" } ], diff --git a/packer/fedora-20-x86_64.json b/packer/fedora-20-x86_64.json index d8df7675e..a2dfd0222 100644 --- a/packer/fedora-20-x86_64.json +++ b/packer/fedora-20-x86_64.json @@ -13,9 +13,9 @@ "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "guest_os_type": "Fedora_64", "http_directory": "http", - "iso_checksum": "749763da40ebf6cb3a9ed46434b2d165d09938cf24b51992da656d9125ff0290", + "iso_checksum": "04e76a36eb97d6fcdc35e6a2ecdb7b7631a4d220cf70cfbffd0f17db000ae3ac", "iso_checksum_type": "sha256", - "iso_url": "http://mirrors.kernel.org/fedora/releases/test/20-Alpha/Fedora/x86_64/iso/Fedora-20-Alpha-x86_64-DVD.iso", + "iso_url": "http://download.fedoraproject.org/pub/fedora/linux/releases/test/20-Beta/Fedora/x86_64/iso/Fedora-20-Beta-x86_64-DVD.iso", "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", "ssh_password": "vagrant", "ssh_port": 22, @@ -36,9 +36,9 @@ "disk_size": 40960, "guest_os_type": "fedora-64", "http_directory": "http", - "iso_checksum": "749763da40ebf6cb3a9ed46434b2d165d09938cf24b51992da656d9125ff0290", + "iso_checksum": "04e76a36eb97d6fcdc35e6a2ecdb7b7631a4d220cf70cfbffd0f17db000ae3ac", "iso_checksum_type": "sha256", - "iso_url": "http://mirrors.kernel.org/fedora/releases/test/20-Alpha/Fedora/x86_64/iso/Fedora-20-Alpha-x86_64-DVD.iso", + "iso_url": "http://download.fedoraproject.org/pub/fedora/linux/releases/test/20-Beta/Fedora/x86_64/iso/Fedora-20-Beta-x86_64-DVD.iso", "tools_upload_flavor": "linux", "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", "ssh_password": "vagrant", From 5c7b4ae31684fc1cc5e92e4418dc91cceea70a06 Mon Sep 17 00:00:00 2001 From: "Julian C. Dunn" <jdunn@opscode.com> Date: Sat, 23 Nov 2013 13:03:57 -0500 Subject: [PATCH 0124/1622] Migrate to RHEL 6.5. Also be consistent about the output package name. --- packer/rhel-5.10-x86_64.json | 2 +- packer/{rhel-6.4-i386.json => rhel-6.5-i386.json} | 10 +++++----- .../{rhel-6.4-x86_64.json => rhel-6.5-x86_64.json} | 13 +++++++------ 3 files changed, 13 insertions(+), 12 deletions(-) rename packer/{rhel-6.4-i386.json => rhel-6.5-i386.json} (85%) rename packer/{rhel-6.4-x86_64.json => rhel-6.5-x86_64.json} (83%) diff --git a/packer/rhel-5.10-x86_64.json b/packer/rhel-5.10-x86_64.json index 4315d4797..ec9485fee 100644 --- a/packer/rhel-5.10-x86_64.json +++ b/packer/rhel-5.10-x86_64.json @@ -34,7 +34,7 @@ ], "boot_wait": "10s", "disk_size": 40960, - "guest_os_type": "redhat-64", + "guest_os_type": "rhel5-64", "http_directory": "http", "iso_checksum": "8b38e74b0993d478aad9c950f51a3e3441199639a3422e06fc3beca1f8825bf2", "iso_checksum_type": "sha256", diff --git a/packer/rhel-6.4-i386.json b/packer/rhel-6.5-i386.json similarity index 85% rename from packer/rhel-6.4-i386.json rename to packer/rhel-6.5-i386.json index 28a74f820..2d6e4112c 100644 --- a/packer/rhel-6.4-i386.json +++ b/packer/rhel-6.5-i386.json @@ -13,9 +13,9 @@ "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "guest_os_type": "RedHat", "http_directory": "http", - "iso_checksum": "d953b7e1cc9fcc0415b78dcd79737929842575ae8b903d6868e337a2a21dcaee", + "iso_checksum": "eec692b436193ba9fc365cafe2b8f85323d98192dc99b23b02ae75045667fe4a", "iso_checksum_type": "sha256", - "iso_url": "https://content-web.rhn.redhat.com/rhn/isos/rhel-6.4/md5sum/2f1927af5bca9a34f2d9488655b4fdf4/rhel-server-6.4-i386-dvd.iso", + "iso_url": "https://content-web.rhn.redhat.com/rhn/isos/rhel-6.5/md5sum/04a1fa06a6b7e70cd586535eea83c0ef/rhel-server-6.5-i386-dvd.iso", "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, @@ -36,9 +36,9 @@ "disk_size": 40960, "guest_os_type": "redhat", "http_directory": "http", - "iso_checksum": "d953b7e1cc9fcc0415b78dcd79737929842575ae8b903d6868e337a2a21dcaee", + "iso_checksum": "eec692b436193ba9fc365cafe2b8f85323d98192dc99b23b02ae75045667fe4a", "iso_checksum_type": "sha256", - "iso_url": "https://content-web.rhn.redhat.com/rhn/isos/rhel-6.4/md5sum/2f1927af5bca9a34f2d9488655b4fdf4/rhel-server-6.4-i386-dvd.iso", + "iso_url": "https://content-web.rhn.redhat.com/rhn/isos/rhel-6.5/md5sum/04a1fa06a6b7e70cd586535eea83c0ef/rhel-server-6.5-i386-dvd.iso", "tools_upload_flavor": "linux", "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", @@ -54,7 +54,7 @@ ], "post-processors": [ { - "output": "../builds/{{.Provider}}/opscode_rhel-6.4-i386_chef-{{user `chef_version`}}.box", + "output": "../builds/{{.Provider}}/opscode_rhel-6.5-i386_chef-{{user `chef_version`}}.box", "type": "vagrant" } ], diff --git a/packer/rhel-6.4-x86_64.json b/packer/rhel-6.5-x86_64.json similarity index 83% rename from packer/rhel-6.4-x86_64.json rename to packer/rhel-6.5-x86_64.json index 4c217d375..e8f020b91 100644 --- a/packer/rhel-6.4-x86_64.json +++ b/packer/rhel-6.5-x86_64.json @@ -13,9 +13,9 @@ "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "guest_os_type": "RedHat_64", "http_directory": "http", - "iso_checksum": "1eabfc4eb1bea0d1d6c6c2802c7d44c6e68078b678186669bd2bcb87ca2ebeb8", + "iso_checksum": "a51b90f3dd4585781293ea08adde60eeb9cfa94670943bd99e9c07f13a259539", "iso_checksum_type": "sha256", - "iso_url": "https://content-web.rhn.redhat.com/rhn/isos/rhel-6.4/md5sum/467b53791903f9a0c477cbb1b24ffd1f/rhel-server-6.4-x86_64-dvd.iso", + "iso_url": "https://content-web.rhn.redhat.com/rhn/isos/rhel-6.5/md5sum/a84d4d9eddb36fb417832166cd10a4c2/rhel-server-6.5-x86_64-dvd.iso", "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, @@ -34,11 +34,12 @@ ], "boot_wait": "10s", "disk_size": 40960, - "guest_os_type": "redhat-64", + "guest_os_type": "rhel6-64", "http_directory": "http", - "iso_checksum": "1eabfc4eb1bea0d1d6c6c2802c7d44c6e68078b678186669bd2bcb87ca2ebeb8", + "iso_checksum": "a51b90f3dd4585781293ea08adde60eeb9cfa94670943bd99e9c07f13a259539" +, "iso_checksum_type": "sha256", - "iso_url": "https://content-web.rhn.redhat.com/rhn/isos/rhel-6.4/md5sum/467b53791903f9a0c477cbb1b24ffd1f/rhel-server-6.4-x86_64-dvd.iso", + "iso_url": "https://content-web.rhn.redhat.com/rhn/isos/rhel-6.5/md5sum/a84d4d9eddb36fb417832166cd10a4c2/rhel-server-6.5-x86_64-dvd.iso", "tools_upload_flavor": "linux", "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", @@ -54,7 +55,7 @@ ], "post-processors": [ { - "output": "../builds/{{.Provider}}/opscode_redhat-6.4_chef-{{user `chef_version`}}.box", + "output": "../builds/{{.Provider}}/opscode_rhel-6.5_chef-{{user `chef_version`}}.box", "type": "vagrant" } ], From 4088fb31528f2ace08cb514873768de51e4dbd53 Mon Sep 17 00:00:00 2001 From: KOMATSU Seiji <skomatsu.comutt@gmail.com> Date: Sun, 24 Nov 2013 19:54:23 +0900 Subject: [PATCH 0125/1622] [GH121] Added new user variable, mirror, that can be used to override the (mostly-US-centric) HTTP sites for speeding up builds in other regions. --- README.md | 10 +++++++--- packer/centos-5.10-i386.json | 5 +++-- packer/centos-5.10-x86_64.json | 5 +++-- packer/centos-6.4-i386.json | 5 +++-- packer/centos-6.4-x86_64.json | 5 +++-- packer/debian-6.0.8-amd64.json | 7 ++++--- packer/debian-6.0.8-i386.json | 7 ++++--- packer/debian-7.2.0-amd64.json | 7 ++++--- packer/debian-7.2.0-i386.json | 7 ++++--- packer/fedora-18-i386.json | 7 ++++--- packer/fedora-18-x86_64.json | 7 ++++--- packer/fedora-19-i386.json | 7 ++++--- packer/fedora-19-x86_64.json | 7 ++++--- packer/fedora-20-i386.json | 7 ++++--- packer/fedora-20-x86_64.json | 4 ++-- packer/freebsd-9.1-amd64.json | 5 +++-- packer/freebsd-9.1-i386.json | 7 ++++--- packer/ubuntu-10.04-amd64.json | 7 ++++--- packer/ubuntu-10.04-i386.json | 7 ++++--- packer/ubuntu-12.04-amd64.json | 7 ++++--- packer/ubuntu-12.04-i386.json | 7 ++++--- packer/ubuntu-12.10-amd64.json | 7 ++++--- packer/ubuntu-12.10-i386.json | 7 ++++--- packer/ubuntu-13.04-amd64.json | 7 ++++--- packer/ubuntu-13.04-i386.json | 7 ++++--- packer/ubuntu-13.10-amd64.json | 7 ++++--- packer/ubuntu-13.10-i386.json | 7 ++++--- 27 files changed, 104 insertions(+), 75 deletions(-) diff --git a/README.md b/README.md index 2b75dbae7..a5864b83e 100644 --- a/README.md +++ b/README.md @@ -107,13 +107,17 @@ First, install [Packer](http://packer.io) and then clone this project. Inside the ``packer`` directory, a JSON file describes each box that can be built. You can use ``packer build`` to build the boxes. - $ packer build debian-7.1.0-i386.json + $ packer build debian-7.2.0-i386.json + +If you want to use a another mirror site, use mirror variable. + + $ packer build -var 'mirror=http://ftp.jaist.ac.jp/pub/Linux/debian-cdimage/release' debian-7.2.0-i386.json If you only have VMware or VirtualBox available, you may also tell Packer to build only that box. - $ packer build -only=virtualbox debian-7.1.0-i386.json + $ packer build -only=virtualbox debian-7.2.0-i386.json -Congratulations! You now have `./debian-7.1.0-i386-virtualbox.box` and `./debian-7.1.0-i386-vmware.box`, fully-functional +Congratulations! You now have `./debian-7.2.0-i386-virtualbox.box` and `./debian-7.2.0-i386-vmware.box`, fully-functional baseboxes that you can then add to Vagrant and start testing cookbooks. # Veewee Definitions diff --git a/packer/centos-5.10-i386.json b/packer/centos-5.10-i386.json index 46cdb7e5c..2b8cbfef1 100644 --- a/packer/centos-5.10-i386.json +++ b/packer/centos-5.10-i386.json @@ -1,6 +1,7 @@ { "variables": { - "chef_version": "provisionerless" + "chef_version": "provisionerless", + "mirror": "http://mirrors.kernel.org/centos" }, "builders": [ { @@ -15,7 +16,7 @@ "http_directory": "http", "iso_checksum": "bb4e61210e1c0389fdf55c59bd2dd7bc957dd400", "iso_checksum_type": "sha1", - "iso_url": "http://mirrors.kernel.org/centos/5.10/isos/i386/CentOS-5.10-i386-bin-DVD-1of2.iso", + "iso_url": "{{user `mirror`}}/5.10/isos/i386/CentOS-5.10-i386-bin-DVD-1of2.iso", "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, diff --git a/packer/centos-5.10-x86_64.json b/packer/centos-5.10-x86_64.json index b34164bb1..3101eb6a6 100644 --- a/packer/centos-5.10-x86_64.json +++ b/packer/centos-5.10-x86_64.json @@ -1,6 +1,7 @@ { "variables": { - "chef_version": "provisionerless" + "chef_version": "provisionerless", + "mirror": "http://mirrors.kernel.org/centos" }, "builders": [ { @@ -15,7 +16,7 @@ "http_directory": "http", "iso_checksum": "d8403b3fe4972eda3e147ee76d682a4a3beae1e1", "iso_checksum_type": "sha1", - "iso_url": "http://mirrors.kernel.org/centos/5.10/isos/x86_64/CentOS-5.10-x86_64-bin-DVD-1of2.iso", + "iso_url": "{{user `mirror`}}/5.10/isos/x86_64/CentOS-5.10-x86_64-bin-DVD-1of2.iso", "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, diff --git a/packer/centos-6.4-i386.json b/packer/centos-6.4-i386.json index 038814527..832ad711b 100644 --- a/packer/centos-6.4-i386.json +++ b/packer/centos-6.4-i386.json @@ -1,6 +1,7 @@ { "variables": { - "chef_version": "provisionerless" + "chef_version": "provisionerless", + "mirror": "http://mirrors.kernel.org/centos" }, "builders": [ { @@ -15,7 +16,7 @@ "http_directory": "http", "iso_checksum": "4bd3a1de6f6dfcd7a2199487abf5a9304d696cae", "iso_checksum_type": "sha1", - "iso_url": "http://mirrors.kernel.org/centos/6.4/isos/i386/CentOS-6.4-i386-bin-DVD1.iso", + "iso_url": "{{user `mirror`}}/6.4/isos/i386/CentOS-6.4-i386-bin-DVD1.iso", "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, diff --git a/packer/centos-6.4-x86_64.json b/packer/centos-6.4-x86_64.json index 07dc48b3e..4cd772959 100644 --- a/packer/centos-6.4-x86_64.json +++ b/packer/centos-6.4-x86_64.json @@ -1,6 +1,7 @@ { "variables": { - "chef_version": "provisionerless" + "chef_version": "provisionerless", + "mirror": "http://mirrors.kernel.org/centos" }, "builders": [ { @@ -15,7 +16,7 @@ "http_directory": "http", "iso_checksum": "8672dc087f1b0eda60b9efaa41b82f034f185e24", "iso_checksum_type": "sha1", - "iso_url": "http://mirrors.kernel.org/centos/6.4/isos/x86_64/CentOS-6.4-x86_64-bin-DVD1.iso", + "iso_url": "{{user `mirror`}}/6.4/isos/x86_64/CentOS-6.4-x86_64-bin-DVD1.iso", "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, diff --git a/packer/debian-6.0.8-amd64.json b/packer/debian-6.0.8-amd64.json index 1956d1d0d..5425975df 100644 --- a/packer/debian-6.0.8-amd64.json +++ b/packer/debian-6.0.8-amd64.json @@ -1,6 +1,7 @@ { "variables": { - "chef_version": "provisionerless" + "chef_version": "provisionerless", + "mirror": "http://cdimage.debian.org/cdimage/archive" }, "builders": [ { @@ -28,7 +29,7 @@ "http_directory": "http", "iso_checksum": "d0ec1c64c00ff601995139dbacfb54109a23788f", "iso_checksum_type": "sha1", - "iso_url": "http://cdimage.debian.org/cdimage/archive/6.0.8/amd64/iso-cd/debian-6.0.8-amd64-CD-1.iso", + "iso_url": "{{user `mirror`}}/6.0.8/amd64/iso-cd/debian-6.0.8-amd64-CD-1.iso", "ssh_username": "vagrant", "ssh_password": "vagrant", "ssh_port": 22, @@ -66,7 +67,7 @@ "http_directory": "http", "iso_checksum": "d0ec1c64c00ff601995139dbacfb54109a23788f", "iso_checksum_type": "sha1", - "iso_url": "http://cdimage.debian.org/cdimage/archive/6.0.8/amd64/iso-cd/debian-6.0.8-amd64-CD-1.iso", + "iso_url": "{{user `mirror`}}/6.0.8/amd64/iso-cd/debian-6.0.8-amd64-CD-1.iso", "ssh_username": "vagrant", "ssh_password": "vagrant", "ssh_port": 22, diff --git a/packer/debian-6.0.8-i386.json b/packer/debian-6.0.8-i386.json index fa14f6be6..305c0d7b9 100644 --- a/packer/debian-6.0.8-i386.json +++ b/packer/debian-6.0.8-i386.json @@ -1,6 +1,7 @@ { "variables": { - "chef_version": "provisionerless" + "chef_version": "provisionerless", + "mirror": "http://cdimage.debian.org/cdimage/archive" }, "builders": [ { @@ -28,7 +29,7 @@ "http_directory": "http", "iso_checksum": "144194cea77f0e527fd07bd6aa28d1ab50cb5a95", "iso_checksum_type": "sha1", - "iso_url": "http://cdimage.debian.org/cdimage/archive/6.0.8/i386/iso-cd/debian-6.0.8-i386-CD-1.iso", + "iso_url": "{{user `mirror`}}/6.0.8/i386/iso-cd/debian-6.0.8-i386-CD-1.iso", "ssh_username": "vagrant", "ssh_password": "vagrant", "ssh_port": 22, @@ -66,7 +67,7 @@ "http_directory": "http", "iso_checksum": "144194cea77f0e527fd07bd6aa28d1ab50cb5a95", "iso_checksum_type": "sha1", - "iso_url": "http://cdimage.debian.org/cdimage/archive/6.0.8/i386/iso-cd/debian-6.0.8-i386-CD-1.iso", + "iso_url": "{{user `mirror`}}/6.0.8/i386/iso-cd/debian-6.0.8-i386-CD-1.iso", "ssh_username": "vagrant", "ssh_password": "vagrant", "ssh_port": 22, diff --git a/packer/debian-7.2.0-amd64.json b/packer/debian-7.2.0-amd64.json index b70593095..3342d2c96 100644 --- a/packer/debian-7.2.0-amd64.json +++ b/packer/debian-7.2.0-amd64.json @@ -1,6 +1,7 @@ { "variables": { - "chef_version": "provisionerless" + "chef_version": "provisionerless", + "mirror": "http://cdimage.debian.org/debian-cd" }, "builders": [ { @@ -28,7 +29,7 @@ "http_directory": "http", "iso_checksum": "c7c1e2bf7ec4760b9fecf77fefa6062b73330359", "iso_checksum_type": "sha1", - "iso_url": "http://cdimage.debian.org/debian-cd/7.2.0/amd64/iso-cd/debian-7.2.0-amd64-CD-1.iso", + "iso_url": "{{user `mirror`}}/7.2.0/amd64/iso-cd/debian-7.2.0-amd64-CD-1.iso", "ssh_username": "vagrant", "ssh_password": "vagrant", "ssh_port": 22, @@ -66,7 +67,7 @@ "http_directory": "http", "iso_checksum": "c7c1e2bf7ec4760b9fecf77fefa6062b73330359", "iso_checksum_type": "sha1", - "iso_url": "http://cdimage.debian.org/debian-cd/7.2.0/amd64/iso-cd/debian-7.2.0-amd64-CD-1.iso", + "iso_url": "{{user `mirror`}}/7.2.0/amd64/iso-cd/debian-7.2.0-amd64-CD-1.iso", "ssh_username": "vagrant", "ssh_password": "vagrant", "ssh_port": 22, diff --git a/packer/debian-7.2.0-i386.json b/packer/debian-7.2.0-i386.json index 438e96058..3a699c027 100644 --- a/packer/debian-7.2.0-i386.json +++ b/packer/debian-7.2.0-i386.json @@ -1,6 +1,7 @@ { "variables": { - "chef_version": "provisionerless" + "chef_version": "provisionerless", + "mirror": "http://cdimage.debian.org/debian-cd" }, "builders": [ { @@ -28,7 +29,7 @@ "http_directory": "http", "iso_checksum": "011d42505fdafeb9be2bd0379a12d4042f24cfd5", "iso_checksum_type": "sha1", - "iso_url": "http://cdimage.debian.org/debian-cd/7.2.0/i386/iso-cd/debian-7.2.0-i386-CD-1.iso", + "iso_url": "{{user `mirror`}}/7.2.0/i386/iso-cd/debian-7.2.0-i386-CD-1.iso", "ssh_username": "vagrant", "ssh_password": "vagrant", "ssh_port": 22, @@ -66,7 +67,7 @@ "http_directory": "http", "iso_checksum": "011d42505fdafeb9be2bd0379a12d4042f24cfd5", "iso_checksum_type": "sha1", - "iso_url": "http://cdimage.debian.org/debian-cd/7.2.0/i386/iso-cd/debian-7.2.0-i386-CD-1.iso", + "iso_url": "{{user `mirror`}}/7.2.0/i386/iso-cd/debian-7.2.0-i386-CD-1.iso", "ssh_username": "vagrant", "ssh_password": "vagrant", "ssh_port": 22, diff --git a/packer/fedora-18-i386.json b/packer/fedora-18-i386.json index e00ebda4d..a3d17f620 100644 --- a/packer/fedora-18-i386.json +++ b/packer/fedora-18-i386.json @@ -1,6 +1,7 @@ { "variables": { - "chef_version": "provisionerless" + "chef_version": "provisionerless", + "mirror": "http://mirrors.kernel.org/fedora" }, "builders": [ { @@ -15,7 +16,7 @@ "http_directory": "http", "iso_checksum": "a22e6ab7b0e5e93397e4a1d8d994693d0afb9ad46b1f47a4fe10bfbbc2e7f354", "iso_checksum_type": "sha256", - "iso_url": "http://mirrors.kernel.org/fedora/releases/18/Fedora/i386/iso/Fedora-18-i386-DVD.iso", + "iso_url": "{{user `mirror`}}/releases/18/Fedora/i386/iso/Fedora-18-i386-DVD.iso", "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", "ssh_password": "vagrant", "ssh_port": 22, @@ -38,7 +39,7 @@ "http_directory": "http", "iso_checksum": "a22e6ab7b0e5e93397e4a1d8d994693d0afb9ad46b1f47a4fe10bfbbc2e7f354", "iso_checksum_type": "sha256", - "iso_url": "http://mirrors.kernel.org/fedora/releases/18/Fedora/i386/iso/Fedora-18-i386-DVD.iso", + "iso_url": "{{user `mirror`}}/releases/18/Fedora/i386/iso/Fedora-18-i386-DVD.iso", "tools_upload_flavor": "linux", "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", "ssh_password": "vagrant", diff --git a/packer/fedora-18-x86_64.json b/packer/fedora-18-x86_64.json index fa42ea5a5..8418be18d 100644 --- a/packer/fedora-18-x86_64.json +++ b/packer/fedora-18-x86_64.json @@ -1,6 +1,7 @@ { "variables": { - "chef_version": "provisionerless" + "chef_version": "provisionerless", + "mirror": "http://mirrors.kernel.org/fedora" }, "builders": [ { @@ -15,7 +16,7 @@ "http_directory": "http", "iso_checksum": "91c5f0aca391acf76a047e284144f90d66d3d5f5dcd26b01f368a43236832c03", "iso_checksum_type": "sha256", - "iso_url": "http://mirrors.kernel.org/fedora/releases/18/Fedora/x86_64/iso/Fedora-18-x86_64-DVD.iso", + "iso_url": "{{user `mirror`}}/releases/18/Fedora/x86_64/iso/Fedora-18-x86_64-DVD.iso", "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", "ssh_password": "vagrant", "ssh_port": 22, @@ -38,7 +39,7 @@ "http_directory": "http", "iso_checksum": "91c5f0aca391acf76a047e284144f90d66d3d5f5dcd26b01f368a43236832c03", "iso_checksum_type": "sha256", - "iso_url": "http://mirrors.kernel.org/fedora/releases/18/Fedora/x86_64/iso/Fedora-18-x86_64-DVD.iso", + "iso_url": "{{user `mirror`}}/releases/18/Fedora/x86_64/iso/Fedora-18-x86_64-DVD.iso", "tools_upload_flavor": "linux", "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", "ssh_password": "vagrant", diff --git a/packer/fedora-19-i386.json b/packer/fedora-19-i386.json index 28378b9e2..f5a102b6f 100644 --- a/packer/fedora-19-i386.json +++ b/packer/fedora-19-i386.json @@ -1,6 +1,7 @@ { "variables": { - "chef_version": "provisionerless" + "chef_version": "provisionerless", + "mirror": "http://mirrors.kernel.org/fedora" }, "builders": [ { @@ -15,7 +16,7 @@ "http_directory": "http", "iso_checksum": "0da29695c4f503e2b27350406c1ceb7a4e5b9b699ea722774368fd16ab277bce", "iso_checksum_type": "sha256", - "iso_url": "http://mirrors.kernel.org/fedora/releases/19/Fedora/i386/iso/Fedora-19-i386-DVD.iso", + "iso_url": "{{user `mirror`}}/releases/19/Fedora/i386/iso/Fedora-19-i386-DVD.iso", "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", "ssh_password": "vagrant", "ssh_port": 22, @@ -38,7 +39,7 @@ "http_directory": "http", "iso_checksum": "0da29695c4f503e2b27350406c1ceb7a4e5b9b699ea722774368fd16ab277bce", "iso_checksum_type": "sha256", - "iso_url": "http://mirrors.kernel.org/fedora/releases/19/Fedora/i386/iso/Fedora-19-i386-DVD.iso", + "iso_url": "{{user `mirror`}}/releases/19/Fedora/i386/iso/Fedora-19-i386-DVD.iso", "tools_upload_flavor": "linux", "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", "ssh_password": "vagrant", diff --git a/packer/fedora-19-x86_64.json b/packer/fedora-19-x86_64.json index 8feeabe8b..43a761102 100644 --- a/packer/fedora-19-x86_64.json +++ b/packer/fedora-19-x86_64.json @@ -1,6 +1,7 @@ { "variables": { - "chef_version": "provisionerless" + "chef_version": "provisionerless", + "mirror": "http://mirrors.kernel.org/fedora" }, "builders": [ { @@ -15,7 +16,7 @@ "http_directory": "http", "iso_checksum": "6e7e263e607cfcadc90ea2ef5668aa3945d9eca596485a7a1f8a9f2478cc7084", "iso_checksum_type": "sha256", - "iso_url": "http://mirrors.kernel.org/fedora/releases/19/Fedora/x86_64/iso/Fedora-19-x86_64-DVD.iso", + "iso_url": "{{user `mirror`}}/releases/19/Fedora/x86_64/iso/Fedora-19-x86_64-DVD.iso", "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", "ssh_password": "vagrant", "ssh_port": 22, @@ -38,7 +39,7 @@ "http_directory": "http", "iso_checksum": "6e7e263e607cfcadc90ea2ef5668aa3945d9eca596485a7a1f8a9f2478cc7084", "iso_checksum_type": "sha256", - "iso_url": "http://mirrors.kernel.org/fedora/releases/19/Fedora/x86_64/iso/Fedora-19-x86_64-DVD.iso", + "iso_url": "{{user `mirror`}}/releases/19/Fedora/x86_64/iso/Fedora-19-x86_64-DVD.iso", "tools_upload_flavor": "linux", "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", "ssh_password": "vagrant", diff --git a/packer/fedora-20-i386.json b/packer/fedora-20-i386.json index 7366fcaaa..fc300cbd6 100644 --- a/packer/fedora-20-i386.json +++ b/packer/fedora-20-i386.json @@ -1,6 +1,7 @@ { "variables": { - "chef_version": "provisionerless" + "chef_version": "provisionerless", + "mirror": "http://mirrors.kernel.org/fedora" }, "builders": [ { @@ -15,7 +16,7 @@ "http_directory": "http", "iso_checksum": "d98caa59fa72c4817e040060149ca3951aef6c16ccf485522527e7efa3ebbd74", "iso_checksum_type": "sha256", - "iso_url": "http://download.fedoraproject.org/pub/fedora/linux/releases/test/20-Beta/Fedora/i386/iso/Fedora-20-Beta-i386-DVD.iso", + "iso_url": "{{user `mirror`}}/releases/test/20-Beta/Fedora/i386/iso/Fedora-20-Beta-i386-DVD.iso", "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", "ssh_password": "vagrant", "ssh_port": 22, @@ -38,7 +39,7 @@ "http_directory": "http", "iso_checksum": "d98caa59fa72c4817e040060149ca3951aef6c16ccf485522527e7efa3ebbd74", "iso_checksum_type": "sha256", - "iso_url": "http://download.fedoraproject.org/pub/fedora/linux/releases/test/20-Beta/Fedora/i386/iso/Fedora-20-Beta-i386-DVD.iso", + "iso_url": "{{user `mirror`}}/releases/test/20-Beta/Fedora/i386/iso/Fedora-20-Beta-i386-DVD.iso", "tools_upload_flavor": "linux", "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", "ssh_password": "vagrant", diff --git a/packer/fedora-20-x86_64.json b/packer/fedora-20-x86_64.json index a2dfd0222..6ebd57b39 100644 --- a/packer/fedora-20-x86_64.json +++ b/packer/fedora-20-x86_64.json @@ -15,7 +15,7 @@ "http_directory": "http", "iso_checksum": "04e76a36eb97d6fcdc35e6a2ecdb7b7631a4d220cf70cfbffd0f17db000ae3ac", "iso_checksum_type": "sha256", - "iso_url": "http://download.fedoraproject.org/pub/fedora/linux/releases/test/20-Beta/Fedora/x86_64/iso/Fedora-20-Beta-x86_64-DVD.iso", + "iso_url": "{{user `mirror`}}/releases/test/20-Beta/Fedora/x86_64/iso/Fedora-20-Beta-x86_64-DVD.iso", "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", "ssh_password": "vagrant", "ssh_port": 22, @@ -38,7 +38,7 @@ "http_directory": "http", "iso_checksum": "04e76a36eb97d6fcdc35e6a2ecdb7b7631a4d220cf70cfbffd0f17db000ae3ac", "iso_checksum_type": "sha256", - "iso_url": "http://download.fedoraproject.org/pub/fedora/linux/releases/test/20-Beta/Fedora/x86_64/iso/Fedora-20-Beta-x86_64-DVD.iso", + "iso_url": "{{user `mirror`}}/releases/test/20-Beta/Fedora/x86_64/iso/Fedora-20-Beta-x86_64-DVD.iso", "tools_upload_flavor": "linux", "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", "ssh_password": "vagrant", diff --git a/packer/freebsd-9.1-amd64.json b/packer/freebsd-9.1-amd64.json index b9769525b..379cdf8d0 100644 --- a/packer/freebsd-9.1-amd64.json +++ b/packer/freebsd-9.1-amd64.json @@ -1,6 +1,7 @@ { "variables": { - "chef_version": "provisionerless" + "chef_version": "provisionerless", + "mirror": "http://ftp.freebsd.org/pub/FreeBSD" }, "provisioners": [ { @@ -37,7 +38,7 @@ "http_directory": "http", "iso_checksum": "f0a320fd52383c42649d48ea545915a9", "iso_checksum_type": "md5", - "iso_url": "http://ftp.freebsd.org/pub/FreeBSD/releases/amd64/amd64/ISO-IMAGES/9.1/FreeBSD-9.1-RELEASE-amd64-disc1.iso", + "iso_url": "{{user `mirror`}}/releases/amd64/amd64/ISO-IMAGES/9.1/FreeBSD-9.1-RELEASE-amd64-disc1.iso", "ssh_username": "vagrant", "ssh_password": "vagrant", "ssh_port": 22, diff --git a/packer/freebsd-9.1-i386.json b/packer/freebsd-9.1-i386.json index 772768a38..634c6515e 100644 --- a/packer/freebsd-9.1-i386.json +++ b/packer/freebsd-9.1-i386.json @@ -1,6 +1,7 @@ { "variables": { - "chef_version": "provisionerless" + "chef_version": "provisionerless", + "mirror": "http://ftp.freebsd.org/pub/FreeBSD" }, "provisioners": [ { @@ -36,7 +37,7 @@ "http_directory": "http", "iso_checksum": "e37d86ce83908bf4b667fdae7298bca5", "iso_checksum_type": "md5", - "iso_url": "http://ftp.freebsd.org/pub/FreeBSD/releases/i386/i386/ISO-IMAGES/9.1/FreeBSD-9.1-RELEASE-i386-disc1.iso", + "iso_url": "{{user `mirror`}}/releases/i386/i386/ISO-IMAGES/9.1/FreeBSD-9.1-RELEASE-i386-disc1.iso", "ssh_username": "vagrant", "ssh_password": "vagrant", "ssh_port": 22, @@ -72,7 +73,7 @@ "http_directory": "http", "iso_checksum": "e37d86ce83908bf4b667fdae7298bca5", "iso_checksum_type": "md5", - "iso_url": "http://ftp.freebsd.org/pub/FreeBSD/releases/i386/i386/ISO-IMAGES/9.1/FreeBSD-9.1-RELEASE-i386-disc1.iso", + "iso_url": "{{user `mirror`}}/releases/i386/i386/ISO-IMAGES/9.1/FreeBSD-9.1-RELEASE-i386-disc1.iso", "ssh_username": "vagrant", "ssh_password": "vagrant", "ssh_port": 22, diff --git a/packer/ubuntu-10.04-amd64.json b/packer/ubuntu-10.04-amd64.json index 5a310a89e..7b7a4d71b 100644 --- a/packer/ubuntu-10.04-amd64.json +++ b/packer/ubuntu-10.04-amd64.json @@ -1,6 +1,7 @@ { "variables": { - "chef_version": "provisionerless" + "chef_version": "provisionerless", + "mirror": "http://releases.ubuntu.com" }, "builders": [ { @@ -36,7 +37,7 @@ "http_directory": "http", "iso_checksum": "796e80702d65f2ee96e88874a1ab437e24df9cd6", "iso_checksum_type": "sha1", - "iso_url": "http://releases.ubuntu.com/10.04.4/ubuntu-10.04.4-server-amd64.iso", + "iso_url": "{{user `mirror`}}/10.04.4/ubuntu-10.04.4-server-amd64.iso", "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", "ssh_password": "vagrant", "ssh_port": 22, @@ -80,7 +81,7 @@ "http_directory": "http", "iso_checksum": "796e80702d65f2ee96e88874a1ab437e24df9cd6", "iso_checksum_type": "sha1", - "iso_url": "http://releases.ubuntu.com/10.04.4/ubuntu-10.04.4-server-amd64.iso", + "iso_url": "{{user `mirror`}}/10.04.4/ubuntu-10.04.4-server-amd64.iso", "tools_upload_flavor": "linux", "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", "ssh_password": "vagrant", diff --git a/packer/ubuntu-10.04-i386.json b/packer/ubuntu-10.04-i386.json index 5971584e1..ed195f3bd 100644 --- a/packer/ubuntu-10.04-i386.json +++ b/packer/ubuntu-10.04-i386.json @@ -1,6 +1,7 @@ { "variables": { - "chef_version": "provisionerless" + "chef_version": "provisionerless", + "mirror": "http://releases.ubuntu.com" }, "builders": [ { @@ -36,7 +37,7 @@ "http_directory": "http", "iso_checksum": "5695d8b6b914269d1374ac8d4c3dd3786e92d3fe", "iso_checksum_type": "sha1", - "iso_url": "http://releases.ubuntu.com/10.04.4/ubuntu-10.04.4-server-i386.iso", + "iso_url": "{{user `mirror`}}/10.04.4/ubuntu-10.04.4-server-i386.iso", "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", "ssh_password": "vagrant", "ssh_port": 22, @@ -80,7 +81,7 @@ "http_directory": "http", "iso_checksum": "5695d8b6b914269d1374ac8d4c3dd3786e92d3fe", "iso_checksum_type": "sha1", - "iso_url": "http://releases.ubuntu.com/10.04.4/ubuntu-10.04.4-server-i386.iso", + "iso_url": "{{user `mirror`}}/10.04.4/ubuntu-10.04.4-server-i386.iso", "tools_upload_flavor": "linux", "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", "ssh_password": "vagrant", diff --git a/packer/ubuntu-12.04-amd64.json b/packer/ubuntu-12.04-amd64.json index 49bbca10e..7888bc3fb 100644 --- a/packer/ubuntu-12.04-amd64.json +++ b/packer/ubuntu-12.04-amd64.json @@ -1,6 +1,7 @@ { "variables": { - "chef_version": "provisionerless" + "chef_version": "provisionerless", + "mirror": "http://releases.ubuntu.com" }, "builders": [ { @@ -35,7 +36,7 @@ "http_directory": "http", "iso_checksum": "4e36c272dde245cfadf14ff8895566571a38f4d2", "iso_checksum_type": "sha1", - "iso_url": "http://releases.ubuntu.com/12.04/ubuntu-12.04.3-server-amd64.iso", + "iso_url": "{{user `mirror`}}/12.04/ubuntu-12.04.3-server-amd64.iso", "ssh_username": "vagrant", "ssh_password": "vagrant", "ssh_port": 22, @@ -80,7 +81,7 @@ "http_directory": "http", "iso_checksum": "4e36c272dde245cfadf14ff8895566571a38f4d2", "iso_checksum_type": "sha1", - "iso_url": "http://releases.ubuntu.com/12.04/ubuntu-12.04.3-server-amd64.iso", + "iso_url": "{{user `mirror`}}/12.04/ubuntu-12.04.3-server-amd64.iso", "tools_upload_flavor": "linux", "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", "ssh_password": "vagrant", diff --git a/packer/ubuntu-12.04-i386.json b/packer/ubuntu-12.04-i386.json index f39cef81f..7fa77a102 100644 --- a/packer/ubuntu-12.04-i386.json +++ b/packer/ubuntu-12.04-i386.json @@ -1,6 +1,7 @@ { "variables": { - "chef_version": "provisionerless" + "chef_version": "provisionerless", + "mirror": "http://releases.ubuntu.com" }, "builders": [ { @@ -36,7 +37,7 @@ "http_directory": "http", "iso_checksum": "2ec0e913959f6c2ba7a558e8bfa361428bb00e56", "iso_checksum_type": "sha1", - "iso_url": "http://releases.ubuntu.com/12.04/ubuntu-12.04.3-server-i386.iso", + "iso_url": "{{user `mirror`}}/12.04/ubuntu-12.04.3-server-i386.iso", "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", "ssh_password": "vagrant", "ssh_port": 22, @@ -80,7 +81,7 @@ "http_directory": "http", "iso_checksum": "f6fb4e12e12e6ba4247aee5985dd92cc5a653122", "iso_checksum_type": "sha1", - "iso_url": "http://releases.ubuntu.com/12.04/ubuntu-12.04.3-server-i386.iso", + "iso_url": "{{user `mirror`}}/12.04/ubuntu-12.04.3-server-i386.iso", "tools_upload_flavor": "linux", "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", "ssh_password": "vagrant", diff --git a/packer/ubuntu-12.10-amd64.json b/packer/ubuntu-12.10-amd64.json index 431e9f91b..1dbed051f 100644 --- a/packer/ubuntu-12.10-amd64.json +++ b/packer/ubuntu-12.10-amd64.json @@ -1,6 +1,7 @@ { "variables": { - "chef_version": "provisionerless" + "chef_version": "provisionerless", + "mirror": "http://releases.ubuntu.com" }, "builders": [ { @@ -36,7 +37,7 @@ "http_directory": "http", "iso_checksum": "e2a48af008ff3c4db6a8235151a1e90ea600fceb", "iso_checksum_type": "sha1", - "iso_url": "http://releases.ubuntu.com/12.10/ubuntu-12.10-server-amd64.iso", + "iso_url": "{{user `mirror`}}/12.10/ubuntu-12.10-server-amd64.iso", "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", "ssh_password": "vagrant", "ssh_port": 22, @@ -80,7 +81,7 @@ "http_directory": "http", "iso_checksum": "e2a48af008ff3c4db6a8235151a1e90ea600fceb", "iso_checksum_type": "sha1", - "iso_url": "http://releases.ubuntu.com/12.10/ubuntu-12.10-server-amd64.iso", + "iso_url": "{{user `mirror`}}/12.10/ubuntu-12.10-server-amd64.iso", "tools_upload_flavor": "linux", "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", "ssh_password": "vagrant", diff --git a/packer/ubuntu-12.10-i386.json b/packer/ubuntu-12.10-i386.json index 1d3a3b0f1..9463c76b8 100644 --- a/packer/ubuntu-12.10-i386.json +++ b/packer/ubuntu-12.10-i386.json @@ -1,6 +1,7 @@ { "variables": { - "chef_version": "provisionerless" + "chef_version": "provisionerless", + "mirror": "http://releases.ubuntu.com" }, "builders": [ { @@ -35,7 +36,7 @@ "http_directory": "http", "iso_checksum": "e0e48be7ae21003cf0b25591d71d8cdbee7063e7", "iso_checksum_type": "sha1", - "iso_url": "http://releases.ubuntu.com/12.10/ubuntu-12.10-server-i386.iso", + "iso_url": "{{user `mirror`}}/12.10/ubuntu-12.10-server-i386.iso", "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", "ssh_password": "vagrant", "ssh_port": 22, @@ -79,7 +80,7 @@ "http_directory": "http", "iso_checksum": "e0e48be7ae21003cf0b25591d71d8cdbee7063e7", "iso_checksum_type": "sha1", - "iso_url": "http://releases.ubuntu.com/12.10/ubuntu-12.10-server-i386.iso", + "iso_url": "{{user `mirror`}}/12.10/ubuntu-12.10-server-i386.iso", "tools_upload_flavor": "linux", "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", "ssh_password": "vagrant", diff --git a/packer/ubuntu-13.04-amd64.json b/packer/ubuntu-13.04-amd64.json index 22e68bd8c..a9ad786f1 100644 --- a/packer/ubuntu-13.04-amd64.json +++ b/packer/ubuntu-13.04-amd64.json @@ -1,6 +1,7 @@ { "variables": { - "chef_version": "provisionerless" + "chef_version": "provisionerless", + "mirror": "http://releases.ubuntu.com" }, "builders": [ { @@ -36,7 +37,7 @@ "http_directory": "http", "iso_checksum": "2af1c223f586f59237212bb9c06ad774673c8952", "iso_checksum_type": "sha1", - "iso_url": "http://releases.ubuntu.com/13.04/ubuntu-13.04-server-amd64.iso", + "iso_url": "{{user `mirror`}}/13.04/ubuntu-13.04-server-amd64.iso", "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", "ssh_password": "vagrant", "ssh_port": 22, @@ -81,7 +82,7 @@ "http_directory": "http", "iso_checksum": "2af1c223f586f59237212bb9c06ad774673c8952", "iso_checksum_type": "sha1", - "iso_url": "http://releases.ubuntu.com/13.04/ubuntu-13.04-server-amd64.iso", + "iso_url": "{{user `mirror`}}/13.04/ubuntu-13.04-server-amd64.iso", "tools_upload_flavor": "linux", "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", "ssh_password": "vagrant", diff --git a/packer/ubuntu-13.04-i386.json b/packer/ubuntu-13.04-i386.json index 082449bcc..a273c4640 100644 --- a/packer/ubuntu-13.04-i386.json +++ b/packer/ubuntu-13.04-i386.json @@ -1,6 +1,7 @@ { "variables": { - "chef_version": "provisionerless" + "chef_version": "provisionerless", + "mirror": "http://releases.ubuntu.com" }, "builders": [ { @@ -36,7 +37,7 @@ "http_directory": "http", "iso_checksum": "27bbe172d66d4ce634d10fd655e840f72fe56130", "iso_checksum_type": "sha1", - "iso_url": "http://releases.ubuntu.com/13.04/ubuntu-13.04-server-i386.iso", + "iso_url": "{{user `mirror`}}/13.04/ubuntu-13.04-server-i386.iso", "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", "ssh_password": "vagrant", "ssh_port": 22, @@ -80,7 +81,7 @@ "http_directory": "http", "iso_checksum": "27bbe172d66d4ce634d10fd655e840f72fe56130", "iso_checksum_type": "sha1", - "iso_url": "http://releases.ubuntu.com/13.04/ubuntu-13.04-server-i386.iso", + "iso_url": "{{user `mirror`}}/13.04/ubuntu-13.04-server-i386.iso", "tools_upload_flavor": "linux", "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", "ssh_password": "vagrant", diff --git a/packer/ubuntu-13.10-amd64.json b/packer/ubuntu-13.10-amd64.json index 22d7d4ab3..763ae85ce 100644 --- a/packer/ubuntu-13.10-amd64.json +++ b/packer/ubuntu-13.10-amd64.json @@ -1,6 +1,7 @@ { "variables": { - "chef_version": "provisionerless" + "chef_version": "provisionerless", + "mirror": "http://releases.ubuntu.com" }, "builders": [ { @@ -36,7 +37,7 @@ "http_directory": "http", "iso_checksum": "5dd72c694c3a7e06a3b4dd651ca26cfc70985004", "iso_checksum_type": "sha1", - "iso_url": "http://releases.ubuntu.com/13.10/ubuntu-13.10-server-amd64.iso", + "iso_url": "{{user `mirror`}}/13.10/ubuntu-13.10-server-amd64.iso", "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", "ssh_password": "vagrant", "ssh_port": 22, @@ -81,7 +82,7 @@ "http_directory": "http", "iso_checksum": "5dd72c694c3a7e06a3b4dd651ca26cfc70985004", "iso_checksum_type": "sha1", - "iso_url": "http://releases.ubuntu.com/13.10/ubuntu-13.10-server-amd64.iso", + "iso_url": "{{user `mirror`}}/13.10/ubuntu-13.10-server-amd64.iso", "tools_upload_flavor": "linux", "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", "ssh_password": "vagrant", diff --git a/packer/ubuntu-13.10-i386.json b/packer/ubuntu-13.10-i386.json index c92d83687..cc0feb1ae 100644 --- a/packer/ubuntu-13.10-i386.json +++ b/packer/ubuntu-13.10-i386.json @@ -1,6 +1,7 @@ { "variables": { - "chef_version": "provisionerless" + "chef_version": "provisionerless", + "mirror": "http://releases.ubuntu.com" }, "builders": [ { @@ -36,7 +37,7 @@ "http_directory": "http", "iso_checksum": "2dda06d01d3ad495b53f7c03a4313b4af76a1c96", "iso_checksum_type": "sha1", - "iso_url": "http://releases.ubuntu.com/13.10/ubuntu-13.10-server-i386.iso", + "iso_url": "{{user `mirror`}}/13.10/ubuntu-13.10-server-i386.iso", "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", "ssh_password": "vagrant", "ssh_port": 22, @@ -80,7 +81,7 @@ "http_directory": "http", "iso_checksum": "2dda06d01d3ad495b53f7c03a4313b4af76a1c96", "iso_checksum_type": "sha1", - "iso_url": "http://releases.ubuntu.com/13.10/ubuntu-13.10-server-i386.iso", + "iso_url": "{{user `mirror`}}/13.10/ubuntu-13.10-server-i386.iso", "tools_upload_flavor": "linux", "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", "ssh_password": "vagrant", From 49c539ceed14ee73d18842d11a419b3abe7966ab Mon Sep 17 00:00:00 2001 From: "Julian C. Dunn" <jdunn@opscode.com> Date: Wed, 27 Nov 2013 17:29:17 -0500 Subject: [PATCH 0126/1622] Fix missing mirror variable. --- packer/fedora-20-x86_64.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packer/fedora-20-x86_64.json b/packer/fedora-20-x86_64.json index 6ebd57b39..78da43915 100644 --- a/packer/fedora-20-x86_64.json +++ b/packer/fedora-20-x86_64.json @@ -1,6 +1,7 @@ { "variables": { - "chef_version": "provisionerless" + "chef_version": "provisionerless", + "mirror": "http://download.fedoraproject.org/pub/fedora/linux" }, "builders": [ { From da8e0f41c425921a4b41cc62388aa2fc8f48475b Mon Sep 17 00:00:00 2001 From: "Julian C. Dunn" <jdunn@opscode.com> Date: Wed, 27 Nov 2013 23:40:46 -0500 Subject: [PATCH 0127/1622] Implement Travis-CI for basic sanity checking of templates --- .travis.yml | 8 +++ Gemfile | 4 ++ Gemfile.lock | 139 --------------------------------------------------- 3 files changed, 12 insertions(+), 139 deletions(-) create mode 100644 .travis.yml delete mode 100644 Gemfile.lock diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 000000000..c07ce8790 --- /dev/null +++ b/.travis.yml @@ -0,0 +1,8 @@ +rvm: + - 1.9.3 + - 2.0.0 + +before_install: wget --no-check-certificate https://dl.bintray.com/mitchellh/packer/0.4.0_linux_amd64.zip && unzip -d packer 0.4.0_linux_amd64.zip +before_script: export PATH=$PATH:$PWD/packer + +script: bundle exec thor packer:validate diff --git a/Gemfile b/Gemfile index 83a3308ac..3c5b4fdf2 100644 --- a/Gemfile +++ b/Gemfile @@ -5,3 +5,7 @@ gem "veewee", "~> 0.3.12" gem "vagrant-windows", "~> 1.2.1" gem "em-winrm" # for windows! gem "rake" + +group :test do + gem "thor" +end diff --git a/Gemfile.lock b/Gemfile.lock deleted file mode 100644 index 75d289536..000000000 --- a/Gemfile.lock +++ /dev/null @@ -1,139 +0,0 @@ -GIT - remote: https://github.com/mitchellh/vagrant.git - revision: a40522f5fabccb9ddabad03d836e120ff5d14093 - tag: v1.3.5 - specs: - vagrant (1.3.5) - childprocess (~> 0.3.7) - erubis (~> 2.7.0) - i18n (~> 0.6.0) - log4r (~> 1.1.9) - net-scp (~> 1.1.0) - net-ssh (~> 2.6.6) - -GEM - remote: https://rubygems.org/ - specs: - CFPropertyList (2.0.17) - libxml-ruby (>= 1.1.0) - rake (>= 0.7.0) - Platform (0.4.0) - akami (1.2.0) - gyoku (>= 0.4.0) - nokogiri (>= 1.4.0) - ansi (1.3.0) - builder (3.2.2) - childprocess (0.3.9) - ffi (~> 1.0, >= 1.0.11) - diff-lcs (1.2.4) - em-winrm (0.5.4) - eventmachine (~> 1.0.0) - mixlib-log (>= 1.3.0) - uuidtools (~> 2.1.1) - winrm (~> 1.1.0) - erubis (2.7.0) - eventmachine (1.0.3) - excon (0.28.0) - ffi (1.9.3) - fission (0.4.0) - CFPropertyList (~> 2.0.17) - fog (1.18.0) - builder - excon (~> 0.28.0) - formatador (~> 0.2.0) - mime-types - multi_json (~> 1.0) - net-scp (~> 1.1) - net-ssh (>= 2.1.3) - nokogiri (~> 1.5) - ruby-hmac - formatador (0.2.4) - grit (2.5.0) - diff-lcs (~> 1.1) - mime-types (~> 1.15) - posix-spawn (~> 0.3.6) - gssapi (1.0.3) - ffi (>= 1.0.1) - gyoku (1.1.0) - builder (>= 2.1.2) - highline (1.6.20) - httpclient (2.3.4.1) - httpi (0.9.7) - rack - i18n (0.6.5) - json (1.8.1) - libxml-ruby (2.7.0) - little-plugger (1.1.3) - log4r (1.1.10) - logging (1.8.1) - little-plugger (>= 1.1.3) - multi_json (>= 1.3.6) - mime-types (1.25) - mini_portile (0.5.2) - mixlib-log (1.6.0) - multi_json (1.8.2) - net-scp (1.1.2) - net-ssh (>= 2.6.5) - net-ssh (2.6.8) - nokogiri (1.6.0) - mini_portile (~> 0.5.0) - nori (1.1.5) - open4 (1.3.0) - os (0.9.6) - popen4 (0.1.2) - Platform (>= 0.4.0) - open4 (>= 0.4.0) - posix-spawn (0.3.6) - progressbar (0.21.0) - rack (1.5.2) - rake (10.1.0) - ruby-hmac (0.4.0) - ruby-vnc (1.0.1) - rubyntlm (0.1.1) - savon (0.9.5) - akami (~> 1.0) - builder (>= 2.1.2) - gyoku (>= 0.4.0) - httpi (~> 0.9) - nokogiri (>= 1.4.0) - nori (~> 1.0) - wasabi (~> 1.0) - thor (0.18.1) - uuidtools (2.1.4) - vagrant-windows (1.2.3) - winrm (~> 1.1.1) - veewee (0.3.12) - ansi (~> 1.3.0) - childprocess - fission (= 0.4.0) - fog (~> 1.8) - grit - highline - i18n - json - net-ssh (>= 2.2.0) - os (~> 0.9.6) - popen4 (~> 0.1.2) - progressbar - ruby-vnc (~> 1.0.0) - thor (~> 0.15) - wasabi (1.0.0) - nokogiri (>= 1.4.0) - winrm (1.1.3) - gssapi (~> 1.0.0) - httpclient (~> 2.2, >= 2.2.0.2) - logging (~> 1.6, >= 1.6.1) - nokogiri (~> 1.5) - rubyntlm (~> 0.1.1) - savon (= 0.9.5) - uuidtools (~> 2.1.2) - -PLATFORMS - ruby - -DEPENDENCIES - em-winrm - rake - vagrant! - vagrant-windows (~> 1.2.1) - veewee (~> 0.3.12) From d80aefa745a2011502fe5ba94a9dd43701490599 Mon Sep 17 00:00:00 2001 From: "Julian C. Dunn" <jdunn@opscode.com> Date: Thu, 28 Nov 2013 15:49:02 -0500 Subject: [PATCH 0128/1622] Bugfixes: * Standardize on output filenames: 64-bit boxes should never include arch. * Fix a bug in FreeBSD template where mirror was not getting substituted. * Add arch i386 to Fedora box so it doesn't get overwritten by x86_64 box --- packer/fedora-18-i386.json | 2 +- packer/fedora-20-x86_64.json | 2 +- packer/freebsd-9.1-amd64.json | 2 +- packer/ubuntu-12.10-amd64.json | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/packer/fedora-18-i386.json b/packer/fedora-18-i386.json index a3d17f620..f5a5fd87a 100644 --- a/packer/fedora-18-i386.json +++ b/packer/fedora-18-i386.json @@ -55,7 +55,7 @@ ], "post-processors": [ { - "output": "../builds/{{.Provider}}/opscode_fedora-18_chef-{{user `chef_version`}}.box", + "output": "../builds/{{.Provider}}/opscode_fedora-18-i386_chef-{{user `chef_version`}}.box", "type": "vagrant" } ], diff --git a/packer/fedora-20-x86_64.json b/packer/fedora-20-x86_64.json index 78da43915..0bbf5bc7d 100644 --- a/packer/fedora-20-x86_64.json +++ b/packer/fedora-20-x86_64.json @@ -55,7 +55,7 @@ ], "post-processors": [ { - "output": "../builds/{{.Provider}}/opscode_fedora-20-x86_64_chef-{{user `chef_version`}}.box", + "output": "../builds/{{.Provider}}/opscode_fedora-20_chef-{{user `chef_version`}}.box", "type": "vagrant" } ], diff --git a/packer/freebsd-9.1-amd64.json b/packer/freebsd-9.1-amd64.json index 379cdf8d0..0fae4038a 100644 --- a/packer/freebsd-9.1-amd64.json +++ b/packer/freebsd-9.1-amd64.json @@ -74,7 +74,7 @@ "http_directory": "http", "iso_checksum": "f0a320fd52383c42649d48ea545915a9", "iso_checksum_type": "md5", - "iso_url": "http://ftp.freebsd.org/pub/FreeBSD/releases/amd64/amd64/ISO-IMAGES/9.1/FreeBSD-9.1-RELEASE-amd64-disc1.iso", + "iso_url": "{{user `mirror`}}/releases/amd64/amd64/ISO-IMAGES/9.1/FreeBSD-9.1-RELEASE-amd64-disc1.iso", "ssh_username": "vagrant", "ssh_password": "vagrant", "ssh_port": 22, diff --git a/packer/ubuntu-12.10-amd64.json b/packer/ubuntu-12.10-amd64.json index 1dbed051f..b6444b8dc 100644 --- a/packer/ubuntu-12.10-amd64.json +++ b/packer/ubuntu-12.10-amd64.json @@ -97,7 +97,7 @@ ], "post-processors": [ { - "output": "../builds/{{.Provider}}/opscode_ubuntu-12.10-amd64_chef-{{user `chef_version`}}.box", + "output": "../builds/{{.Provider}}/opscode_ubuntu-12.10_chef-{{user `chef_version`}}.box", "type": "vagrant" } ], From be1153c0789ddb2496fe673c2ec5bd464088eff2 Mon Sep 17 00:00:00 2001 From: "Julian C. Dunn" <jdunn@opscode.com> Date: Wed, 27 Nov 2013 22:37:21 -0500 Subject: [PATCH 0129/1622] Bash 3 (such as deployed on SuSE Linux Enterprise Server) cannot handle <( syntax; also it needs the old x$FOO == x'blah' hackery otherwise it'll print "error: unary operator expected" --- packer/scripts/common/chef.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/packer/scripts/common/chef.sh b/packer/scripts/common/chef.sh index f6d24394d..fed3071bb 100644 --- a/packer/scripts/common/chef.sh +++ b/packer/scripts/common/chef.sh @@ -5,13 +5,13 @@ # 'x.y.z' -- build a box with version x.y.z of Chef # 'latest' -- build a box with the latest version of Chef -if [ $CHEF_VERSION != 'provisionerless' ]; then - if [ $CHEF_VERSION == 'latest' ]; then +if [ x$CHEF_VERSION != x'provisionerless' ]; then + if [ x$CHEF_VERSION == x'latest' ]; then echo "Installing latest Chef version" - sh <(curl -L https://www.opscode.com/chef/install.sh) + curl -L https://www.opscode.com/chef/install.sh | sh else echo "Installing Chef version $CHEF_VERSION" - sh <(curl -L https://www.opscode.com/chef/install.sh) -v $CHEF_VERSION + curl -L https://www.opscode.com/chef/install.sh | sh -s -- -v $CHEF_VERSION fi else echo "Building a box without Chef" From a4e46140163ae6feb188c6a11c3f2c7435edf925 Mon Sep 17 00:00:00 2001 From: "Julian C. Dunn" <jdunn@opscode.com> Date: Fri, 29 Nov 2013 15:32:23 -0500 Subject: [PATCH 0130/1622] [BENTO-98] Handle missing 'curl' with 'wget'. Fix output file naming on FreeBSD i386. --- packer/freebsd-9.1-i386.json | 2 +- packer/scripts/common/chef.sh | 25 +++++++++++++++++++++++-- 2 files changed, 24 insertions(+), 3 deletions(-) diff --git a/packer/freebsd-9.1-i386.json b/packer/freebsd-9.1-i386.json index 634c6515e..0c7da3e86 100644 --- a/packer/freebsd-9.1-i386.json +++ b/packer/freebsd-9.1-i386.json @@ -88,7 +88,7 @@ ], "post-processors": [ { - "output": "../builds/{{.Provider}}/opscode_freebsd-9.1_provisionerless.box", + "output": "../builds/{{.Provider}}/opscode_freebsd-9.1-i386_chef-{{user `chef_version`}}.box", "type": "vagrant" } ] diff --git a/packer/scripts/common/chef.sh b/packer/scripts/common/chef.sh index fed3071bb..9503ea682 100644 --- a/packer/scripts/common/chef.sh +++ b/packer/scripts/common/chef.sh @@ -5,13 +5,34 @@ # 'x.y.z' -- build a box with version x.y.z of Chef # 'latest' -- build a box with the latest version of Chef +exists() { + if command -v $1 &>/dev/null + then + return 0 + else + return 1 + fi +} + if [ x$CHEF_VERSION != x'provisionerless' ]; then if [ x$CHEF_VERSION == x'latest' ]; then echo "Installing latest Chef version" - curl -L https://www.opscode.com/chef/install.sh | sh + if exists wget; then + wget https://www.opscode.com/chef/install.sh -O - | sh + else + if exists curl; then + curl -L https://www.opscode.com/chef/install.sh | sh + fi + fi else echo "Installing Chef version $CHEF_VERSION" - curl -L https://www.opscode.com/chef/install.sh | sh -s -- -v $CHEF_VERSION + if exists wget; then + wget https://www.opscode.com/chef/install.sh -O - | sh -s -- -v $CHEF_VERSION + else + if exists curl; then + curl -L https://www.opscode.com/chef/install.sh | sh -s -- -v $CHEF_VERSION + fi + fi fi else echo "Building a box without Chef" From 44d1d8ebf16fb2b6560613867394a7f7e942a9f0 Mon Sep 17 00:00:00 2001 From: "Julian C. Dunn" <jdunn@opscode.com> Date: Fri, 29 Nov 2013 22:27:03 -0500 Subject: [PATCH 0131/1622] Fix FreeBSD i386 guest_os_type --- packer/freebsd-9.1-i386.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packer/freebsd-9.1-i386.json b/packer/freebsd-9.1-i386.json index 0c7da3e86..8627b0be0 100644 --- a/packer/freebsd-9.1-i386.json +++ b/packer/freebsd-9.1-i386.json @@ -33,7 +33,7 @@ ], "boot_wait": "10s", "disk_size": 10140, - "guest_os_type": "FreeBSD_64", + "guest_os_type": "FreeBSD", "http_directory": "http", "iso_checksum": "e37d86ce83908bf4b667fdae7298bca5", "iso_checksum_type": "md5", @@ -69,7 +69,7 @@ ], "boot_wait": "10s", "disk_size": 10140, - "guest_os_type": "freebsd-64", + "guest_os_type": "freebsd", "http_directory": "http", "iso_checksum": "e37d86ce83908bf4b667fdae7298bca5", "iso_checksum_type": "md5", From a779cd4bcf779fccc26c548791e7094b3ed663bf Mon Sep 17 00:00:00 2001 From: Anthony Scalisi <scalisi.a@gmail.com> Date: Sat, 23 Nov 2013 12:18:47 -0800 Subject: [PATCH 0132/1622] [BENTO-97] Specify output_directory and add vm_name, allowing for boxes to be built in parallel. --- packer/centos-5.10-i386.json | 6 +++++- packer/centos-5.10-x86_64.json | 6 +++++- packer/centos-6.4-i386.json | 6 +++++- packer/centos-6.4-x86_64.json | 6 +++++- packer/debian-6.0.8-amd64.json | 4 ++++ packer/debian-6.0.8-i386.json | 4 ++++ packer/debian-7.2.0-amd64.json | 4 ++++ packer/debian-7.2.0-i386.json | 4 ++++ packer/fedora-18-i386.json | 6 +++++- packer/fedora-18-x86_64.json | 6 +++++- packer/fedora-19-i386.json | 6 +++++- packer/fedora-19-x86_64.json | 6 +++++- packer/fedora-20-i386.json | 6 +++++- packer/fedora-20-x86_64.json | 6 +++++- packer/freebsd-9.1-amd64.json | 4 ++++ packer/rhel-5.10-i386.json | 6 +++++- packer/rhel-5.10-x86_64.json | 6 +++++- packer/rhel-6.5-i386.json | 6 +++++- packer/rhel-6.5-x86_64.json | 6 +++++- packer/ubuntu-10.04-amd64.json | 6 +++++- packer/ubuntu-10.04-i386.json | 6 +++++- packer/ubuntu-12.04-amd64.json | 4 ++++ packer/ubuntu-12.04-i386.json | 6 +++++- packer/ubuntu-12.10-amd64.json | 6 +++++- packer/ubuntu-12.10-i386.json | 6 +++++- packer/ubuntu-13.04-amd64.json | 6 +++++- packer/ubuntu-13.04-i386.json | 6 +++++- packer/ubuntu-13.10-amd64.json | 6 +++++- packer/ubuntu-13.10-i386.json | 6 +++++- 29 files changed, 139 insertions(+), 23 deletions(-) diff --git a/packer/centos-5.10-i386.json b/packer/centos-5.10-i386.json index 2b8cbfef1..75f9697e8 100644 --- a/packer/centos-5.10-i386.json +++ b/packer/centos-5.10-i386.json @@ -26,7 +26,9 @@ [ "modifyvm", "{{.Name}}", "--memory", "384" ], [ "modifyvm", "{{.Name}}", "--cpus", "1" ] ], - "virtualbox_version_file": ".vbox_version" + "virtualbox_version_file": ".vbox_version", + "vm_name": "packer-centos-5.10-i386", + "output_directory": "packer-centos-5.10-i386" }, { "type": "vmware", @@ -46,6 +48,8 @@ "ssh_port": 22, "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", + "vm_name": "packer-centos-5.10-i386", + "output_directory": "packer-centos-5.10-i386", "vmx_data": { "cpuid.coresPerSocket": "1", "memsize": "384", diff --git a/packer/centos-5.10-x86_64.json b/packer/centos-5.10-x86_64.json index 3101eb6a6..6f59eae31 100644 --- a/packer/centos-5.10-x86_64.json +++ b/packer/centos-5.10-x86_64.json @@ -26,7 +26,9 @@ [ "modifyvm", "{{.Name}}", "--memory", "384" ], [ "modifyvm", "{{.Name}}", "--cpus", "1" ] ], - "virtualbox_version_file": ".vbox_version" + "virtualbox_version_file": ".vbox_version", + "vm_name": "packer-centos-5.10-x86_64", + "output_directory": "packer-centos-5.10-x86_64" }, { "type": "vmware", @@ -46,6 +48,8 @@ "ssh_port": 22, "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", + "vm_name": "packer-centos-5.10-x86_64", + "output_directory": "packer-centos-5.10-x86_64", "vmx_data": { "cpuid.coresPerSocket": "1", "memsize": "384", diff --git a/packer/centos-6.4-i386.json b/packer/centos-6.4-i386.json index 832ad711b..9e5097308 100644 --- a/packer/centos-6.4-i386.json +++ b/packer/centos-6.4-i386.json @@ -26,7 +26,9 @@ [ "modifyvm", "{{.Name}}", "--memory", "480" ], [ "modifyvm", "{{.Name}}", "--cpus", "1" ] ], - "virtualbox_version_file": ".vbox_version" + "virtualbox_version_file": ".vbox_version", + "vm_name": "packer-centos-6.4-i386", + "output_directory": "packer-centos-6.4-i386" }, { "type": "vmware", @@ -46,6 +48,8 @@ "ssh_port": 22, "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", + "vm_name": "packer-centos-6.4-i386", + "output_directory": "packer-centos-6.4-i386", "vmx_data": { "cpuid.coresPerSocket": "1", "memsize": "480", diff --git a/packer/centos-6.4-x86_64.json b/packer/centos-6.4-x86_64.json index 4cd772959..ca4a556b0 100644 --- a/packer/centos-6.4-x86_64.json +++ b/packer/centos-6.4-x86_64.json @@ -26,7 +26,9 @@ [ "modifyvm", "{{.Name}}", "--memory", "480" ], [ "modifyvm", "{{.Name}}", "--cpus", "1" ] ], - "virtualbox_version_file": ".vbox_version" + "virtualbox_version_file": ".vbox_version", + "vm_name": "packer-centos-6.4-x86_64", + "output_directory": "packer-centos-6.4-x86_64" }, { "type": "vmware", @@ -46,6 +48,8 @@ "ssh_port": 22, "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", + "vm_name": "packer-centos-6.4-x86_64", + "output_directory": "packer-centos-6.4-x86_64", "vmx_data": { "cpuid.coresPerSocket": "1", "memsize": "480", diff --git a/packer/debian-6.0.8-amd64.json b/packer/debian-6.0.8-amd64.json index 5425975df..f112b9215 100644 --- a/packer/debian-6.0.8-amd64.json +++ b/packer/debian-6.0.8-amd64.json @@ -37,6 +37,8 @@ "shutdown_command": "echo 'vagrant'|sudo -S /sbin/shutdown -hP now", "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "virtualbox_version_file": ".vbox_version", + "vm_name": "packer-debian-6.0.8-amd64", + "output_directory": "packer-debian-6.0.8-amd64", "vboxmanage": [ [ "modifyvm", "{{.Name}}", "--memory", "384" ], [ "modifyvm", "{{.Name}}", "--cpus", "1" ] @@ -74,6 +76,8 @@ "ssh_wait_timeout": "10000s", "shutdown_command": "echo 'vagrant'|sudo -S /sbin/shutdown -hP now", "tools_upload_flavor": "linux", + "vm_name": "packer-debian-6.0.8-amd64", + "output_directory": "packer-debian-6.0.8-amd64", "vmx_data": { "memsize": "384", "numvcpus": "1", diff --git a/packer/debian-6.0.8-i386.json b/packer/debian-6.0.8-i386.json index 305c0d7b9..6c8d71557 100644 --- a/packer/debian-6.0.8-i386.json +++ b/packer/debian-6.0.8-i386.json @@ -37,6 +37,8 @@ "shutdown_command": "echo 'vagrant'|sudo -S /sbin/shutdown -hP now", "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "virtualbox_version_file": ".vbox_version", + "vm_name": "packer-debian-6.0.8-i386", + "output_directory": "packer-debian-6.0.8-i386", "vboxmanage": [ [ "modifyvm", "{{.Name}}", "--memory", "384" ], [ "modifyvm", "{{.Name}}", "--cpus", "1" ] @@ -74,6 +76,8 @@ "ssh_wait_timeout": "10000s", "shutdown_command": "echo 'vagrant'|sudo -S /sbin/shutdown -hP now", "tools_upload_flavor": "linux", + "vm_name": "packer-debian-6.0.8-i386", + "output_directory": "packer-debian-6.0.8-i386", "vmx_data": { "memsize": "384", "numvcpus": "1", diff --git a/packer/debian-7.2.0-amd64.json b/packer/debian-7.2.0-amd64.json index 3342d2c96..752eb142d 100644 --- a/packer/debian-7.2.0-amd64.json +++ b/packer/debian-7.2.0-amd64.json @@ -37,6 +37,8 @@ "shutdown_command": "echo 'vagrant'|sudo -S /sbin/shutdown -hP now", "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "virtualbox_version_file": ".vbox_version", + "vm_name": "packer-debian-7.2.0-amd64", + "output_directory": "packer-debian-7.2.0-amd64", "vboxmanage": [ [ "modifyvm", "{{.Name}}", "--memory", "384" ], [ "modifyvm", "{{.Name}}", "--cpus", "1" ] @@ -74,6 +76,8 @@ "ssh_wait_timeout": "10000s", "shutdown_command": "echo 'vagrant'|sudo -S /sbin/shutdown -hP now", "tools_upload_flavor": "linux", + "vm_name": "packer-debian-7.2.0-amd64", + "output_directory": "packer-debian-7.2.0-amd64", "vmx_data": { "memsize": "384", "numvcpus": "1", diff --git a/packer/debian-7.2.0-i386.json b/packer/debian-7.2.0-i386.json index 3a699c027..7f3b9b305 100644 --- a/packer/debian-7.2.0-i386.json +++ b/packer/debian-7.2.0-i386.json @@ -37,6 +37,8 @@ "shutdown_command": "echo 'vagrant'|sudo -S /sbin/shutdown -hP now", "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "virtualbox_version_file": ".vbox_version", + "vm_name": "packer-debian-7.2.0-i386", + "output_directory": "packer-debian-7.2.0-i386", "vboxmanage": [ [ "modifyvm", "{{.Name}}", "--memory", "384" ], [ "modifyvm", "{{.Name}}", "--cpus", "1" ] @@ -74,6 +76,8 @@ "ssh_wait_timeout": "10000s", "shutdown_command": "echo 'vagrant'|sudo -S /sbin/shutdown -hP now", "tools_upload_flavor": "linux", + "vm_name": "packer-debian-7.2.0-i386", + "output_directory": "packer-debian-7.2.0-i386", "vmx_data": { "memsize": "384", "numvcpus": "1", diff --git a/packer/fedora-18-i386.json b/packer/fedora-18-i386.json index f5a5fd87a..11d9ad701 100644 --- a/packer/fedora-18-i386.json +++ b/packer/fedora-18-i386.json @@ -26,7 +26,9 @@ [ "modifyvm", "{{.Name}}", "--memory", "512" ], [ "modifyvm", "{{.Name}}", "--cpus", "1" ] ], - "virtualbox_version_file": ".vbox_version" + "virtualbox_version_file": ".vbox_version", + "vm_name": "packer-fedora-18-i386", + "output_directory": "packer-fedora-18-i386" }, { "type": "vmware", @@ -46,6 +48,8 @@ "ssh_port": 22, "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", + "vm_name": "packer-fedora-18-i386", + "output_directory": "packer-fedora-18-i386", "vmx_data": { "cpuid.coresPerSocket": "1", "memsize": "512", diff --git a/packer/fedora-18-x86_64.json b/packer/fedora-18-x86_64.json index 8418be18d..34ed58f4b 100644 --- a/packer/fedora-18-x86_64.json +++ b/packer/fedora-18-x86_64.json @@ -26,7 +26,9 @@ [ "modifyvm", "{{.Name}}", "--memory", "512" ], [ "modifyvm", "{{.Name}}", "--cpus", "1" ] ], - "virtualbox_version_file": ".vbox_version" + "virtualbox_version_file": ".vbox_version", + "vm_name": "packer-fedora-18-x86_64", + "output_directory": "packer-fedora-18-x86_64" }, { "type": "vmware", @@ -46,6 +48,8 @@ "ssh_port": 22, "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", + "vm_name": "packer-fedora-18-x86_64", + "output_directory": "packer-fedora-18-x86_64", "vmx_data": { "cpuid.coresPerSocket": "1", "memsize": "512", diff --git a/packer/fedora-19-i386.json b/packer/fedora-19-i386.json index f5a102b6f..eac0b2b37 100644 --- a/packer/fedora-19-i386.json +++ b/packer/fedora-19-i386.json @@ -26,7 +26,9 @@ [ "modifyvm", "{{.Name}}", "--memory", "512" ], [ "modifyvm", "{{.Name}}", "--cpus", "1" ] ], - "virtualbox_version_file": ".vbox_version" + "virtualbox_version_file": ".vbox_version", + "vm_name": "packer-fedora-19-i386", + "output_directory": "packer-fedora-19-i386" }, { "type": "vmware", @@ -46,6 +48,8 @@ "ssh_port": 22, "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", + "vm_name": "packer-fedora-19-i386", + "output_directory": "packer-fedora-19-i386", "vmx_data": { "cpuid.coresPerSocket": "1", "memsize": "512", diff --git a/packer/fedora-19-x86_64.json b/packer/fedora-19-x86_64.json index 43a761102..2b48c15ae 100644 --- a/packer/fedora-19-x86_64.json +++ b/packer/fedora-19-x86_64.json @@ -26,7 +26,9 @@ [ "modifyvm", "{{.Name}}", "--memory", "512" ], [ "modifyvm", "{{.Name}}", "--cpus", "1" ] ], - "virtualbox_version_file": ".vbox_version" + "virtualbox_version_file": ".vbox_version", + "vm_name": "packer-fedora-19-x86_64", + "output_directory": "packer-fedora-19-x86_64" }, { "type": "vmware", @@ -46,6 +48,8 @@ "ssh_port": 22, "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", + "vm_name": "packer-fedora-19-x86_64", + "output_directory": "packer-fedora-19-x86_64", "vmx_data": { "cpuid.coresPerSocket": "1", "memsize": "512", diff --git a/packer/fedora-20-i386.json b/packer/fedora-20-i386.json index fc300cbd6..726e23c1c 100644 --- a/packer/fedora-20-i386.json +++ b/packer/fedora-20-i386.json @@ -26,7 +26,9 @@ [ "modifyvm", "{{.Name}}", "--memory", "512" ], [ "modifyvm", "{{.Name}}", "--cpus", "1" ] ], - "virtualbox_version_file": ".vbox_version" + "virtualbox_version_file": ".vbox_version", + "vm_name": "packer-fedora-20-i386", + "output_directory": "packer-fedora-20-i386" }, { "type": "vmware", @@ -46,6 +48,8 @@ "ssh_port": 22, "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", + "vm_name": "packer-fedora-20-i386", + "output_directory": "packer-fedora-20-i386", "vmx_data": { "cpuid.coresPerSocket": "1", "memsize": "512", diff --git a/packer/fedora-20-x86_64.json b/packer/fedora-20-x86_64.json index 0bbf5bc7d..3e056eeab 100644 --- a/packer/fedora-20-x86_64.json +++ b/packer/fedora-20-x86_64.json @@ -26,7 +26,9 @@ [ "modifyvm", "{{.Name}}", "--memory", "512" ], [ "modifyvm", "{{.Name}}", "--cpus", "1" ] ], - "virtualbox_version_file": ".vbox_version" + "virtualbox_version_file": ".vbox_version", + "vm_name": "packer-fedora-20-x86_64", + "output_directory": "packer-fedora-20-x86_64" }, { "type": "vmware", @@ -46,6 +48,8 @@ "ssh_port": 22, "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", + "vm_name": "packer-fedora-20-x86_64", + "output_directory": "packer-fedora-20-x86_64", "vmx_data": { "cpuid.coresPerSocket": "1", "memsize": "512", diff --git a/packer/freebsd-9.1-amd64.json b/packer/freebsd-9.1-amd64.json index 0fae4038a..1549d45de 100644 --- a/packer/freebsd-9.1-amd64.json +++ b/packer/freebsd-9.1-amd64.json @@ -46,6 +46,8 @@ "shutdown_command": "echo 'shutdown -p now' > shutdown.sh; cat 'shutdown.sh' | su -", "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "virtualbox_version_file": ".vbox_version", + "vm_name": "packer-freebsd-9.1-amd64", + "output_directory": "packer-freebsd-9.1-amd64", "vboxmanage": [ [ "modifyvm", "{{.Name}}", "--memory", "768" ], [ "modifyvm", "{{.Name}}", "--cpus", "1" ] @@ -80,6 +82,8 @@ "ssh_port": 22, "ssh_wait_timeout": "10000s", "shutdown_command": "echo 'shutdown -p now' > shutdown.sh; cat 'shutdown.sh' | su -", + "vm_name": "packer-freebsd-9.1-amd64", + "output_directory": "packer-freebsd-9.1-amd64", "vmx_data": { "memsize": "768", "numvcpus": "1", diff --git a/packer/rhel-5.10-i386.json b/packer/rhel-5.10-i386.json index 5b41407ea..4adbeea98 100644 --- a/packer/rhel-5.10-i386.json +++ b/packer/rhel-5.10-i386.json @@ -25,7 +25,9 @@ [ "modifyvm", "{{.Name}}", "--memory", "384" ], [ "modifyvm", "{{.Name}}", "--cpus", "1" ] ], - "virtualbox_version_file": ".vbox_version" + "virtualbox_version_file": ".vbox_version", + "vm_name": "packer-rhel-5.10-i386", + "output_directory": "packer-rhel-5.10-i386" }, { "type": "vmware", @@ -45,6 +47,8 @@ "ssh_port": 22, "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", + "vm_name": "packer-rhel-5.10-i386", + "output_directory": "packer-rhel-5.10-i386", "vmx_data": { "cpuid.coresPerSocket": "1", "memsize": "384", diff --git a/packer/rhel-5.10-x86_64.json b/packer/rhel-5.10-x86_64.json index ec9485fee..d871a5663 100644 --- a/packer/rhel-5.10-x86_64.json +++ b/packer/rhel-5.10-x86_64.json @@ -25,7 +25,9 @@ [ "modifyvm", "{{.Name}}", "--memory", "384" ], [ "modifyvm", "{{.Name}}", "--cpus", "1" ] ], - "virtualbox_version_file": ".vbox_version" + "virtualbox_version_file": ".vbox_version", + "vm_name": "packer-rhel-5.10-x86_64", + "output_directory": "packer-rhel-5.10-x86_64" }, { "type": "vmware", @@ -45,6 +47,8 @@ "ssh_port": 22, "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", + "vm_name": "packer-rhel-5.10-x86_64", + "output_directory": "packer-rhel-5.10-x86_64", "vmx_data": { "cpuid.coresPerSocket": "1", "memsize": "384", diff --git a/packer/rhel-6.5-i386.json b/packer/rhel-6.5-i386.json index 2d6e4112c..2af6e32a8 100644 --- a/packer/rhel-6.5-i386.json +++ b/packer/rhel-6.5-i386.json @@ -25,7 +25,9 @@ [ "modifyvm", "{{.Name}}", "--memory", "480" ], [ "modifyvm", "{{.Name}}", "--cpus", "1" ] ], - "virtualbox_version_file": ".vbox_version" + "virtualbox_version_file": ".vbox_version", + "vm_name": "packer-rhel-6.4-i386", + "output_directory": "packer-rhel-6.4-i386" }, { "type": "vmware", @@ -45,6 +47,8 @@ "ssh_port": 22, "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", + "vm_name": "packer-rhel-6.4-i386", + "output_directory": "packer-rhel-6.4-i386", "vmx_data": { "cpuid.coresPerSocket": "1", "memsize": "480", diff --git a/packer/rhel-6.5-x86_64.json b/packer/rhel-6.5-x86_64.json index e8f020b91..44608b4d7 100644 --- a/packer/rhel-6.5-x86_64.json +++ b/packer/rhel-6.5-x86_64.json @@ -25,7 +25,9 @@ [ "modifyvm", "{{.Name}}", "--memory", "480" ], [ "modifyvm", "{{.Name}}", "--cpus", "1" ] ], - "virtualbox_version_file": ".vbox_version" + "virtualbox_version_file": ".vbox_version", + "vm_name": "packer-rhel-6.4-x86_64", + "output_directory": "packer-rhel-6.4-x86_64" }, { "type": "vmware", @@ -46,6 +48,8 @@ "ssh_port": 22, "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", + "vm_name": "packer-rhel-6.4-x86_64", + "output_directory": "packer-rhel-6.4-x86_64", "vmx_data": { "cpuid.coresPerSocket": "1", "memsize": "480", diff --git a/packer/ubuntu-10.04-amd64.json b/packer/ubuntu-10.04-amd64.json index 7b7a4d71b..3e103b1ae 100644 --- a/packer/ubuntu-10.04-amd64.json +++ b/packer/ubuntu-10.04-amd64.json @@ -47,7 +47,9 @@ [ "modifyvm", "{{.Name}}", "--memory", "384" ], [ "modifyvm", "{{.Name}}", "--cpus", "1" ] ], - "virtualbox_version_file": ".vbox_version" + "virtualbox_version_file": ".vbox_version", + "vm_name": "packer-ubuntu-10.04-amd64", + "output_directory": "packer-ubuntu-10.04-amd64" }, { "type": "vmware", @@ -88,6 +90,8 @@ "ssh_port": 22, "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", + "vm_name": "packer-ubuntu-10.04-amd64", + "output_directory": "packer-ubuntu-10.04-amd64", "vmx_data": { "cpuid.coresPerSocket": "1", "memsize": "384", diff --git a/packer/ubuntu-10.04-i386.json b/packer/ubuntu-10.04-i386.json index ed195f3bd..120b1fdec 100644 --- a/packer/ubuntu-10.04-i386.json +++ b/packer/ubuntu-10.04-i386.json @@ -47,7 +47,9 @@ [ "modifyvm", "{{.Name}}", "--memory", "384" ], [ "modifyvm", "{{.Name}}", "--cpus", "1" ] ], - "virtualbox_version_file": ".vbox_version" + "virtualbox_version_file": ".vbox_version", + "vm_name": "packer-ubuntu-10.04-i386", + "output_directory": "packer-ubuntu-10.04-i386" }, { "type": "vmware", @@ -88,6 +90,8 @@ "ssh_port": 22, "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", + "vm_name": "packer-ubuntu-10.04-i386", + "output_directory": "packer-ubuntu-10.04-i386", "vmx_data": { "cpuid.coresPerSocket": "1", "memsize": "384", diff --git a/packer/ubuntu-12.04-amd64.json b/packer/ubuntu-12.04-amd64.json index 7888bc3fb..53805a262 100644 --- a/packer/ubuntu-12.04-amd64.json +++ b/packer/ubuntu-12.04-amd64.json @@ -44,6 +44,8 @@ "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", "guest_additions_path": "VBoxGuestAdditions_{{ .Version }}.iso", "virtualbox_version_file": ".vbox_version", + "vm_name": "packer-ubuntu-12.04-amd64", + "output_directory": "packer-ubuntu-12.04-amd64", "vboxmanage": [ [ "modifyvm", "{{.Name}}", "--memory", "384" ], [ "modifyvm", "{{.Name}}", "--cpus", "1" ] @@ -88,6 +90,8 @@ "ssh_port": 22, "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", + "vm_name": "packer-ubuntu-12.04-amd64", + "output_directory": "packer-ubuntu-12.04-amd64", "vmx_data": { "cpuid.coresPerSocket": "1", "memsize": "384", diff --git a/packer/ubuntu-12.04-i386.json b/packer/ubuntu-12.04-i386.json index 7fa77a102..62c1e39c4 100644 --- a/packer/ubuntu-12.04-i386.json +++ b/packer/ubuntu-12.04-i386.json @@ -47,7 +47,9 @@ [ "modifyvm", "{{.Name}}", "--memory", "384" ], [ "modifyvm", "{{.Name}}", "--cpus", "1" ] ], - "virtualbox_version_file": ".vbox_version" + "virtualbox_version_file": ".vbox_version", + "vm_name": "packer-ubuntu-12.04-i386", + "output_directory": "packer-ubuntu-12.04-i386" }, { "type": "vmware", @@ -88,6 +90,8 @@ "ssh_port": 22, "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", + "vm_name": "packer-ubuntu-12.04-i386", + "output_directory": "packer-ubuntu-12.04-i386", "vmx_data": { "cpuid.coresPerSocket": "1", "memsize": "384", diff --git a/packer/ubuntu-12.10-amd64.json b/packer/ubuntu-12.10-amd64.json index b6444b8dc..e622e3cbf 100644 --- a/packer/ubuntu-12.10-amd64.json +++ b/packer/ubuntu-12.10-amd64.json @@ -47,7 +47,9 @@ [ "modifyvm", "{{.Name}}", "--memory", "384" ], [ "modifyvm", "{{.Name}}", "--cpus", "1" ] ], - "virtualbox_version_file": ".vbox_version" + "virtualbox_version_file": ".vbox_version", + "vm_name": "packer-ubuntu-12.10-amd64", + "output_directory": "packer-ubuntu-12.10-amd64" }, { "type": "vmware", @@ -88,6 +90,8 @@ "ssh_port": 22, "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", + "vm_name": "packer-ubuntu-12.10-amd64", + "output_directory": "packer-ubuntu-12.10-amd64", "vmx_data": { "cpuid.coresPerSocket": "1", "memsize": "384", diff --git a/packer/ubuntu-12.10-i386.json b/packer/ubuntu-12.10-i386.json index 9463c76b8..49d173018 100644 --- a/packer/ubuntu-12.10-i386.json +++ b/packer/ubuntu-12.10-i386.json @@ -47,7 +47,9 @@ [ "modifyvm", "{{.Name}}", "--memory", "384" ], [ "modifyvm", "{{.Name}}", "--cpus", "1" ] ], - "virtualbox_version_file": ".vbox_version" + "virtualbox_version_file": ".vbox_version", + "vm_name": "packer-ubuntu-12.10-i386", + "output_directory": "packer-ubuntu-12.10-i386" }, { "boot_command": [ @@ -87,6 +89,8 @@ "ssh_port": 22, "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", + "vm_name": "packer-ubuntu-12.10-i386", + "output_directory": "packer-ubuntu-12.10-i386", "type": "vmware", "vmx_data": { "cpuid.coresPerSocket": "1", diff --git a/packer/ubuntu-13.04-amd64.json b/packer/ubuntu-13.04-amd64.json index a9ad786f1..0ed4ca3be 100644 --- a/packer/ubuntu-13.04-amd64.json +++ b/packer/ubuntu-13.04-amd64.json @@ -47,7 +47,9 @@ [ "modifyvm", "{{.Name}}", "--memory", "384" ], [ "modifyvm", "{{.Name}}", "--cpus", "1" ] ], - "virtualbox_version_file": ".vbox_version" + "virtualbox_version_file": ".vbox_version", + "vm_name": "packer-ubuntu-13.04-amd64", + "output_directory": "packer-ubuntu-13.04-amd64" }, { "type": "vmware", @@ -89,6 +91,8 @@ "ssh_port": 22, "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", + "vm_name": "packer-ubuntu-13.04-amd64", + "output_directory": "packer-ubuntu-13.04-amd64", "vmx_data": { "cpuid.coresPerSocket": "1", "memsize": "384", diff --git a/packer/ubuntu-13.04-i386.json b/packer/ubuntu-13.04-i386.json index a273c4640..0145018c6 100644 --- a/packer/ubuntu-13.04-i386.json +++ b/packer/ubuntu-13.04-i386.json @@ -47,7 +47,9 @@ [ "modifyvm", "{{.Name}}", "--memory", "384" ], [ "modifyvm", "{{.Name}}", "--cpus", "1" ] ], - "virtualbox_version_file": ".vbox_version" + "virtualbox_version_file": ".vbox_version", + "vm_name": "packer-ubuntu-13.04-i386", + "output_directory": "packer-ubuntu-13.04-i386" }, { "type": "vmware", @@ -88,6 +90,8 @@ "ssh_port": 22, "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", + "vm_name": "packer-ubuntu-13.04-i386", + "output_directory": "packer-ubuntu-13.04-i386", "vmx_data": { "cpuid.coresPerSocket": "1", "memsize": "384", diff --git a/packer/ubuntu-13.10-amd64.json b/packer/ubuntu-13.10-amd64.json index 763ae85ce..7aa408d88 100644 --- a/packer/ubuntu-13.10-amd64.json +++ b/packer/ubuntu-13.10-amd64.json @@ -47,7 +47,9 @@ [ "modifyvm", "{{.Name}}", "--memory", "384" ], [ "modifyvm", "{{.Name}}", "--cpus", "1" ] ], - "virtualbox_version_file": ".vbox_version" + "virtualbox_version_file": ".vbox_version", + "vm_name": "packer-ubuntu-13.10-amd64", + "output_directory": "packer-ubuntu-13.10-amd64" }, { "type": "vmware", @@ -89,6 +91,8 @@ "ssh_port": 22, "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", + "vm_name": "packer-ubuntu-13.10-amd64", + "output_directory": "packer-ubuntu-13.10-amd64", "vmx_data": { "cpuid.coresPerSocket": "1", "memsize": "384", diff --git a/packer/ubuntu-13.10-i386.json b/packer/ubuntu-13.10-i386.json index cc0feb1ae..42670ace7 100644 --- a/packer/ubuntu-13.10-i386.json +++ b/packer/ubuntu-13.10-i386.json @@ -47,7 +47,9 @@ [ "modifyvm", "{{.Name}}", "--memory", "384" ], [ "modifyvm", "{{.Name}}", "--cpus", "1" ] ], - "virtualbox_version_file": ".vbox_version" + "virtualbox_version_file": ".vbox_version", + "vm_name": "packer-ubuntu-13.10-i386", + "output_directory": "packer-ubuntu-13.10-i386" }, { "type": "vmware", @@ -88,6 +90,8 @@ "ssh_port": 22, "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", + "vm_name": "packer-ubuntu-13.10-i386", + "output_directory": "packer-ubuntu-13.10-i386", "vmx_data": { "cpuid.coresPerSocket": "1", "memsize": "384", From 2548cc4458894f1c833b14532c6259eb32b72e7f Mon Sep 17 00:00:00 2001 From: "Julian C. Dunn" <jdunn@opscode.com> Date: Sat, 30 Nov 2013 18:13:43 -0500 Subject: [PATCH 0133/1622] [BENTO-97] Apply @scalp42's fixes to the i386 FreeBSD definition as well --- packer/freebsd-9.1-i386.json | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/packer/freebsd-9.1-i386.json b/packer/freebsd-9.1-i386.json index 8627b0be0..e7a0387cf 100644 --- a/packer/freebsd-9.1-i386.json +++ b/packer/freebsd-9.1-i386.json @@ -45,6 +45,8 @@ "shutdown_command": "echo 'shutdown -p now' > shutdown.sh; cat 'shutdown.sh' | su -", "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "virtualbox_version_file": ".vbox_version", + "vm_name": "packer-freebsd-9.1-i386", + "output_directory": "packer-freebsd-9.1-i386", "vboxmanage": [ [ "modifyvm", "{{.Name}}", "--memory", "768" ], [ "modifyvm", "{{.Name}}", "--cpus", "1" ] @@ -79,6 +81,8 @@ "ssh_port": 22, "ssh_wait_timeout": "10000s", "shutdown_command": "echo 'shutdown -p now' > shutdown.sh; cat 'shutdown.sh' | su -", + "vm_name": "packer-freebsd-9.1-i386", + "output_directory": "packer-freebsd-9.1-i386", "vmx_data": { "memsize": "768", "numvcpus": "1", From cd75fc26a05391e5f7273399fb3e76838eca961f Mon Sep 17 00:00:00 2001 From: "Julian C. Dunn" <jdunn@opscode.com> Date: Sun, 1 Dec 2013 15:10:52 -0500 Subject: [PATCH 0134/1622] Repair incorrect SHA1 checksum on Ubuntu 12.04-i386 box (only under the VMware clauses) --- packer/ubuntu-12.04-i386.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packer/ubuntu-12.04-i386.json b/packer/ubuntu-12.04-i386.json index 62c1e39c4..bd5e27534 100644 --- a/packer/ubuntu-12.04-i386.json +++ b/packer/ubuntu-12.04-i386.json @@ -81,7 +81,7 @@ "disk_size": 40960, "guest_os_type": "ubuntu", "http_directory": "http", - "iso_checksum": "f6fb4e12e12e6ba4247aee5985dd92cc5a653122", + "iso_checksum": "2ec0e913959f6c2ba7a558e8bfa361428bb00e56", "iso_checksum_type": "sha1", "iso_url": "{{user `mirror`}}/12.04/ubuntu-12.04.3-server-i386.iso", "tools_upload_flavor": "linux", From a7fe5f814e8ef513d93a8a6f8a79adaeb3be1eaf Mon Sep 17 00:00:00 2001 From: "Julian C. Dunn" <jdunn@opscode.com> Date: Fri, 29 Nov 2013 23:10:47 -0500 Subject: [PATCH 0135/1622] Update to FreeBSD 9.2. This required a lot of work to redo the ZFS install.sh. Under FreeBSD 9.2, you can no longer mount the temporary zroot under /mnt during the install, since / is a read-only filesystem (being the CD-ROM). I took the opportunity to remove a lot of the legacy cruft in install.sh, like all the gpart.nop hackery. Much was stolen from this procedure: https://wiki.freebsd.org/RootOnZFS/GPTZFSBoot --- ...-9.1-amd64.json => freebsd-9.2-amd64.json} | 32 +++++------ ...sd-9.1-i386.json => freebsd-9.2-i386.json} | 28 +++++----- .../{freebsd-9.1 => freebsd-9.2}/install.sh | 54 ++++++++++--------- 3 files changed, 61 insertions(+), 53 deletions(-) rename packer/{freebsd-9.1-amd64.json => freebsd-9.2-amd64.json} (74%) rename packer/{freebsd-9.1-i386.json => freebsd-9.2-i386.json} (73%) rename packer/http/{freebsd-9.1 => freebsd-9.2}/install.sh (66%) diff --git a/packer/freebsd-9.1-amd64.json b/packer/freebsd-9.2-amd64.json similarity index 74% rename from packer/freebsd-9.1-amd64.json rename to packer/freebsd-9.2-amd64.json index 1549d45de..adfa8e2d3 100644 --- a/packer/freebsd-9.1-amd64.json +++ b/packer/freebsd-9.2-amd64.json @@ -29,16 +29,17 @@ "<wait10><wait10>", "/bin/sh<enter><wait>", "mdmfs -s 100m md1 /tmp<enter><wait>", + "mdmfs -s 100m md2 /mnt<enter><wait>", "dhclient -l /tmp/dhclient.lease.em0 em0<enter><wait>", - "fetch -o /tmp/install.sh http://{{ .HTTPIP }}:{{ .HTTPPort }}/freebsd-9.1/install.sh && chmod +x /tmp/install.sh && /tmp/install.sh {{ .Name }}<enter><wait>" + "fetch -o /tmp/install.sh http://{{ .HTTPIP }}:{{ .HTTPPort }}/freebsd-9.2/install.sh && chmod +x /tmp/install.sh && /tmp/install.sh {{ .Name }}<enter><wait>" ], "boot_wait": "10s", "disk_size": 10140, "guest_os_type": "FreeBSD_64", "http_directory": "http", - "iso_checksum": "f0a320fd52383c42649d48ea545915a9", - "iso_checksum_type": "md5", - "iso_url": "{{user `mirror`}}/releases/amd64/amd64/ISO-IMAGES/9.1/FreeBSD-9.1-RELEASE-amd64-disc1.iso", + "iso_checksum": "a8c1751b83646530148766618a89a97009e7500e7057a5cbe3afd74ef480c915", + "iso_checksum_type": "sha256", + "iso_url": "{{user `mirror`}}/releases/amd64/amd64/ISO-IMAGES/9.2/FreeBSD-9.2-RELEASE-amd64-disc1.iso", "ssh_username": "vagrant", "ssh_password": "vagrant", "ssh_port": 22, @@ -46,10 +47,10 @@ "shutdown_command": "echo 'shutdown -p now' > shutdown.sh; cat 'shutdown.sh' | su -", "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "virtualbox_version_file": ".vbox_version", - "vm_name": "packer-freebsd-9.1-amd64", - "output_directory": "packer-freebsd-9.1-amd64", + "vm_name": "packer-freebsd-9.2-amd64", + "output_directory": "packer-freebsd-9.2-amd64", "vboxmanage": [ - [ "modifyvm", "{{.Name}}", "--memory", "768" ], + [ "modifyvm", "{{.Name}}", "--memory", "512" ], [ "modifyvm", "{{.Name}}", "--cpus", "1" ] ] }, @@ -66,26 +67,27 @@ "<wait10><wait10>", "/bin/sh<enter><wait>", "mdmfs -s 100m md1 /tmp<enter><wait>", + "mdmfs -s 100m md2 /mnt<enter><wait>", "dhclient -l /tmp/dhclient.lease.em0 em0<enter><wait>", "<wait5>", - "fetch -o /tmp/install.sh http://{{ .HTTPIP }}:{{ .HTTPPort }}/freebsd-9.1/install.sh && chmod +x /tmp/install.sh && /tmp/install.sh {{ .Name }}<enter><wait>" + "fetch -o /tmp/install.sh http://{{ .HTTPIP }}:{{ .HTTPPort }}/freebsd-9.2/install.sh && chmod +x /tmp/install.sh && /tmp/install.sh {{ .Name }}<enter><wait>" ], "boot_wait": "10s", "disk_size": 10140, "guest_os_type": "freebsd-64", "http_directory": "http", - "iso_checksum": "f0a320fd52383c42649d48ea545915a9", - "iso_checksum_type": "md5", - "iso_url": "{{user `mirror`}}/releases/amd64/amd64/ISO-IMAGES/9.1/FreeBSD-9.1-RELEASE-amd64-disc1.iso", + "iso_checksum": "a8c1751b83646530148766618a89a97009e7500e7057a5cbe3afd74ef480c915", + "iso_checksum_type": "sha256", + "iso_url": "{{user `mirror`}}/releases/amd64/amd64/ISO-IMAGES/9.2/FreeBSD-9.2-RELEASE-amd64-disc1.iso", "ssh_username": "vagrant", "ssh_password": "vagrant", "ssh_port": 22, "ssh_wait_timeout": "10000s", "shutdown_command": "echo 'shutdown -p now' > shutdown.sh; cat 'shutdown.sh' | su -", - "vm_name": "packer-freebsd-9.1-amd64", - "output_directory": "packer-freebsd-9.1-amd64", + "vm_name": "packer-freebsd-9.2-amd64", + "output_directory": "packer-freebsd-9.2-amd64", "vmx_data": { - "memsize": "768", + "memsize": "512", "numvcpus": "1", "cpuid.coresPerSocket": "1" } @@ -93,7 +95,7 @@ ], "post-processors": [ { - "output": "../builds/{{.Provider}}/opscode_freebsd-9.1_chef-{{user `chef_version`}}.box", + "output": "../builds/{{.Provider}}/opscode_freebsd-9.2_chef-{{user `chef_version`}}.box", "type": "vagrant" } ] diff --git a/packer/freebsd-9.1-i386.json b/packer/freebsd-9.2-i386.json similarity index 73% rename from packer/freebsd-9.1-i386.json rename to packer/freebsd-9.2-i386.json index e7a0387cf..32340d89a 100644 --- a/packer/freebsd-9.1-i386.json +++ b/packer/freebsd-9.2-i386.json @@ -28,16 +28,17 @@ "<wait10><wait10>", "/bin/sh<enter><wait>", "mdmfs -s 100m md1 /tmp<enter><wait>", + "mdmfs -s 100m md2 /mnt<enter><wait>", "dhclient -l /tmp/dhclient.lease.em0 em0<enter><wait>", - "fetch -o /tmp/install.sh http://{{ .HTTPIP }}:{{ .HTTPPort }}/freebsd-9.1/install.sh && chmod +x /tmp/install.sh && /tmp/install.sh {{ .Name }}<enter><wait>" + "fetch -o /tmp/install.sh http://{{ .HTTPIP }}:{{ .HTTPPort }}/freebsd-9.2/install.sh && chmod +x /tmp/install.sh && /tmp/install.sh {{ .Name }}<enter><wait>" ], "boot_wait": "10s", "disk_size": 10140, "guest_os_type": "FreeBSD", "http_directory": "http", - "iso_checksum": "e37d86ce83908bf4b667fdae7298bca5", - "iso_checksum_type": "md5", - "iso_url": "{{user `mirror`}}/releases/i386/i386/ISO-IMAGES/9.1/FreeBSD-9.1-RELEASE-i386-disc1.iso", + "iso_checksum": "76093c27288f0ab939a5de14b621ec8eb1420d96343132c2b7c382747d35b67c", + "iso_checksum_type": "sha256", + "iso_url": "{{user `mirror`}}/releases/i386/ISO-IMAGES/9.2/FreeBSD-9.2-RELEASE-i386-disc1.iso", "ssh_username": "vagrant", "ssh_password": "vagrant", "ssh_port": 22, @@ -45,8 +46,8 @@ "shutdown_command": "echo 'shutdown -p now' > shutdown.sh; cat 'shutdown.sh' | su -", "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "virtualbox_version_file": ".vbox_version", - "vm_name": "packer-freebsd-9.1-i386", - "output_directory": "packer-freebsd-9.1-i386", + "vm_name": "packer-freebsd-9.2-i386", + "output_directory": "packer-freebsd-9.2-i386", "vboxmanage": [ [ "modifyvm", "{{.Name}}", "--memory", "768" ], [ "modifyvm", "{{.Name}}", "--cpus", "1" ] @@ -65,24 +66,25 @@ "<wait10><wait10>", "/bin/sh<enter><wait>", "mdmfs -s 100m md1 /tmp<enter><wait>", + "mdmfs -s 100m md2 /mnt<enter><wait>", "dhclient -l /tmp/dhclient.lease.em0 em0<enter><wait>", "<wait5>", - "fetch -o /tmp/install.sh http://{{ .HTTPIP }}:{{ .HTTPPort }}/freebsd-9.1/install.sh && chmod +x /tmp/install.sh && /tmp/install.sh {{ .Name }}<enter><wait>" + "fetch -o /tmp/install.sh http://{{ .HTTPIP }}:{{ .HTTPPort }}/freebsd-9.2/install.sh && chmod +x /tmp/install.sh && /tmp/install.sh {{ .Name }}<enter><wait>" ], "boot_wait": "10s", "disk_size": 10140, "guest_os_type": "freebsd", "http_directory": "http", - "iso_checksum": "e37d86ce83908bf4b667fdae7298bca5", - "iso_checksum_type": "md5", - "iso_url": "{{user `mirror`}}/releases/i386/i386/ISO-IMAGES/9.1/FreeBSD-9.1-RELEASE-i386-disc1.iso", + "iso_checksum": "76093c27288f0ab939a5de14b621ec8eb1420d96343132c2b7c382747d35b67c", + "iso_checksum_type": "sha256", + "iso_url": "{{user `mirror`}}/releases/i386/ISO-IMAGES/9.2/FreeBSD-9.2-RELEASE-i386-disc1.iso", "ssh_username": "vagrant", "ssh_password": "vagrant", "ssh_port": 22, "ssh_wait_timeout": "10000s", "shutdown_command": "echo 'shutdown -p now' > shutdown.sh; cat 'shutdown.sh' | su -", - "vm_name": "packer-freebsd-9.1-i386", - "output_directory": "packer-freebsd-9.1-i386", + "vm_name": "packer-freebsd-9.2-i386", + "output_directory": "packer-freebsd-9.2-i386", "vmx_data": { "memsize": "768", "numvcpus": "1", @@ -92,7 +94,7 @@ ], "post-processors": [ { - "output": "../builds/{{.Provider}}/opscode_freebsd-9.1-i386_chef-{{user `chef_version`}}.box", + "output": "../builds/{{.Provider}}/opscode_freebsd-9.2-i386_chef-{{user `chef_version`}}.box", "type": "vagrant" } ] diff --git a/packer/http/freebsd-9.1/install.sh b/packer/http/freebsd-9.2/install.sh similarity index 66% rename from packer/http/freebsd-9.1/install.sh rename to packer/http/freebsd-9.2/install.sh index 1126e39ed..5922b434a 100644 --- a/packer/http/freebsd-9.1/install.sh +++ b/packer/http/freebsd-9.2/install.sh @@ -1,6 +1,9 @@ #!/bin/sh -x # Credit: http://www.aisecure.net/2011/05/01/root-on-zfs-freebsd-current/ +# +# Heavily re-adapted from https://wiki.freebsd.org/RootOnZFS/GPTZFSBoot +# by Julian Dunn (jdunn@opscode.com) to remove legacy junk NAME=$1 @@ -17,14 +20,9 @@ gpart add -b 34 -s 94 -t freebsd-boot $DISKSLICE gpart add -t freebsd-zfs -l disk0 $DISKSLICE gpart bootcode -b /boot/pmbr -p /boot/gptzfsboot -i 1 $DISKSLICE -# align disks -gnop create -S 4096 /dev/gpt/disk0 -zpool create -o altroot=/mnt -o cachefile=/tmp/zpool.cache zroot /dev/gpt/disk0.nop -zpool export zroot -gnop destroy /dev/gpt/disk0.nop -zpool import -o altroot=/mnt -o cachefile=/tmp/zpool.cache zroot - +zpool create -o altroot=/mnt -o cachefile=/tmp/zpool.cache zroot /dev/gpt/disk0 zpool set bootfs=zroot zroot + zfs set checksum=fletcher4 zroot # set up zfs pools @@ -46,28 +44,29 @@ zfs create -o exec=off -o setuid=off zroot/var/run zfs create -o compression=lzjb -o exec=on -o setuid=off zroot/var/tmp # fixup -chmod 1777 /mnt/tmp -cd /mnt ; ln -s usr/home home -sleep 10 -chmod 1777 /mnt/var/tmp +chmod 1777 /mnt/zroot/tmp +cd /mnt/zroot ; ln -s usr/home home +chmod 1777 /mnt/zroot/var/tmp # set up swap zfs create -V 2G zroot/swap zfs set org.freebsd:swap=on zroot/swap zfs set checksum=off zroot/swap +swapon /dev/zvol/zroot/swap # Install the OS cd /usr/freebsd-dist -cat base.txz | tar --unlink -xpJf - -C /mnt -cat lib32.txz | tar --unlink -xpJf - -C /mnt -cat kernel.txz | tar --unlink -xpJf - -C /mnt -cat src.txz | tar --unlink -xpJf - -C /mnt +cat base.txz | tar --unlink -xpJf - -C /mnt/zroot +cat lib32.txz | tar --unlink -xpJf - -C /mnt/zroot +cat kernel.txz | tar --unlink -xpJf - -C /mnt/zroot +cat src.txz | tar --unlink -xpJf - -C /mnt/zroot + +cp /tmp/zpool.cache /mnt/zroot/boot/zfs/zpool.cache -cp /tmp/zpool.cache /mnt/boot/zfs/zpool.cache +zfs set readonly=on zroot/var/empty -sleep 10 # Enable required services -cat >> /mnt/etc/rc.conf << EOT +cat >> /mnt/zroot/etc/rc.conf << EOT zfs_enable="YES" hostname="${NAME}" ifconfig_em0="dhcp" @@ -75,7 +74,7 @@ sshd_enable="YES" EOT # Tune and boot from zfs -cat >> /mnt/boot/loader.conf << EOT +cat >> /mnt/zroot/boot/loader.conf << EOT zfs_load="YES" vfs.root.mountfrom="zfs:zroot" vm.kmem_size="200M" @@ -84,16 +83,21 @@ vfs.zfs.arc_max="40M" vfs.zfs.vdev.cache.size="5M" EOT -# Enable swap -echo '/dev/gpt/swap0 none swap sw 0 0' > /mnt/etc/fstab +# zfs doesn't use an fstab, but some rc scripts expect one +touch /mnt/zroot/etc/fstab # Set up user accounts zfs create zroot/usr/home/vagrant -echo "vagrant" | pw -V /mnt/etc useradd vagrant -h 0 -s csh -G wheel -d /home/vagrant -c "Vagrant User" -echo "vagrant" | pw -V /mnt/etc usermod root +echo "vagrant" | pw -V /mnt/zroot/etc useradd vagrant -h 0 -s csh -G wheel -d /home/vagrant -c "Vagrant User" +echo "vagrant" | pw -V /mnt/zroot/etc usermod root -chown 1001:1001 /mnt/home/vagrant +chown 1001:1001 /mnt/zroot/home/vagrant + +zfs unmount -a +zfs set mountpoint=legacy zroot +zfs set mountpoint=/tmp zroot/tmp +zfs set mountpoint=/usr zroot/usr +zfs set mountpoint=/var zroot/var # Reboot reboot - From 35ef30bd20c8ced4e7d58dd6cc7a991f156837bd Mon Sep 17 00:00:00 2001 From: "Julian C. Dunn" <jdunn@opscode.com> Date: Sun, 1 Dec 2013 18:36:53 -0500 Subject: [PATCH 0136/1622] Remove veewee-to-packer migration templates. --- templates/.centos/cleanup.sh | 5 - templates/.centos/ks.cfg | 39 - templates/.common/chef_omnibus.sh | 261 -- templates/.common/minimize.sh | 4 - templates/.common/sshd.sh | 3 - templates/.common/sudoers.sh | 4 - templates/.common/vagrant.sh | 34 - templates/.debian/cleanup.sh | 6 - templates/.debian/networking.sh | 7 - templates/.debian/preseed.cfg | 47 - templates/.debian/sudoers.sh | 4 - templates/.debian/update.sh | 4 - templates/.fedora/cleanup.sh | 4 - templates/.fedora/ks.cfg | 50 - templates/.suse/sudoers.sh | 3 - templates/.ubuntu/cleanup.sh | 6 - templates/.ubuntu/networking.sh | 7 - templates/.ubuntu/preseed.cfg | 31 - templates/.ubuntu/sudoers.sh | 4 - templates/.ubuntu/update.sh | 15 - templates/.windows/install-chef.bat | 47 - templates/.windows/install-vbox.bat | 4 - templates/.windows/mount-validation.bat | 3 - templates/.windows/oracle-cert.cer | Bin 1398 -> 0 bytes templates/centos-5.5-i386/http/ks.cfg | 39 - templates/centos-5.5-i386/scripts/cleanup.sh | 5 - templates/centos-5.5-i386/scripts/minimize.sh | 4 - templates/centos-5.5-i386/scripts/sshd.sh | 3 - templates/centos-5.5-i386/scripts/vagrant.sh | 33 - templates/centos-5.5-i386/template.json | 88 - templates/centos-5.5/http/ks.cfg | 39 - templates/centos-5.5/scripts/cleanup.sh | 5 - templates/centos-5.5/scripts/minimize.sh | 4 - templates/centos-5.5/scripts/sshd.sh | 3 - templates/centos-5.5/scripts/vagrant.sh | 33 - templates/centos-5.5/template.json | 88 - templates/centos-5.6/http/ks.cfg | 39 - templates/centos-5.6/scripts/cleanup.sh | 5 - templates/centos-5.6/scripts/minimize.sh | 4 - templates/centos-5.6/scripts/sshd.sh | 3 - templates/centos-5.6/scripts/vagrant.sh | 33 - templates/centos-5.6/template.json | 88 - templates/centos-5.7/http/ks.cfg | 39 - templates/centos-5.7/scripts/cleanup.sh | 5 - templates/centos-5.7/scripts/minimize.sh | 4 - templates/centos-5.7/scripts/sshd.sh | 3 - templates/centos-5.7/scripts/vagrant.sh | 33 - templates/centos-5.7/template.json | 88 - templates/centos-5.8-i386/http/ks.cfg | 39 - templates/centos-5.8-i386/scripts/cleanup.sh | 5 - templates/centos-5.8-i386/scripts/minimize.sh | 4 - templates/centos-5.8-i386/scripts/sshd.sh | 3 - templates/centos-5.8-i386/scripts/vagrant.sh | 33 - templates/centos-5.8-i386/template.json | 88 - templates/centos-5.8/http/ks.cfg | 39 - templates/centos-5.8/scripts/cleanup.sh | 5 - templates/centos-5.8/scripts/minimize.sh | 4 - templates/centos-5.8/scripts/sshd.sh | 3 - templates/centos-5.8/scripts/vagrant.sh | 33 - templates/centos-5.8/template.json | 88 - templates/centos-5.9-i386/http/ks.cfg | 39 - templates/centos-5.9-i386/scripts/cleanup.sh | 5 - templates/centos-5.9-i386/scripts/minimize.sh | 4 - templates/centos-5.9-i386/scripts/sshd.sh | 3 - templates/centos-5.9-i386/scripts/vagrant.sh | 17 - templates/centos-5.9-i386/template.json | 88 - templates/centos-5.9/http/ks.cfg | 39 - templates/centos-5.9/scripts/cleanup.sh | 5 - templates/centos-5.9/scripts/minimize.sh | 4 - templates/centos-5.9/scripts/sshd.sh | 3 - templates/centos-5.9/scripts/vagrant.sh | 17 - templates/centos-5.9/template.json | 88 - templates/centos-6.0/http/ks.cfg | 39 - templates/centos-6.0/scripts/cleanup.sh | 5 - templates/centos-6.0/scripts/minimize.sh | 4 - templates/centos-6.0/scripts/sshd.sh | 3 - templates/centos-6.0/scripts/vagrant.sh | 33 - templates/centos-6.0/template.json | 88 - templates/centos-6.2-i386/http/ks.cfg | 39 - templates/centos-6.2-i386/scripts/cleanup.sh | 5 - templates/centos-6.2-i386/scripts/minimize.sh | 4 - templates/centos-6.2-i386/scripts/sshd.sh | 3 - templates/centos-6.2-i386/scripts/vagrant.sh | 33 - templates/centos-6.2-i386/template.json | 88 - templates/centos-6.2/http/ks.cfg | 39 - templates/centos-6.2/scripts/cleanup.sh | 5 - templates/centos-6.2/scripts/minimize.sh | 4 - templates/centos-6.2/scripts/sshd.sh | 3 - templates/centos-6.2/scripts/vagrant.sh | 33 - templates/centos-6.2/template.json | 88 - templates/centos-6.3-i386/http/ks.cfg | 39 - templates/centos-6.3-i386/scripts/cleanup.sh | 5 - templates/centos-6.3-i386/scripts/minimize.sh | 4 - templates/centos-6.3-i386/scripts/sshd.sh | 3 - templates/centos-6.3-i386/scripts/vagrant.sh | 33 - templates/centos-6.3-i386/template.json | 88 - templates/centos-6.3/http/ks.cfg | 39 - templates/centos-6.3/scripts/cleanup.sh | 5 - templates/centos-6.3/scripts/minimize.sh | 4 - templates/centos-6.3/scripts/sshd.sh | 3 - templates/centos-6.3/scripts/vagrant.sh | 33 - templates/centos-6.3/template.json | 88 - templates/centos-6.4-i386/http/ks.cfg | 39 - templates/centos-6.4-i386/scripts/cleanup.sh | 5 - templates/centos-6.4-i386/scripts/minimize.sh | 4 - templates/centos-6.4-i386/scripts/sshd.sh | 3 - templates/centos-6.4-i386/scripts/vagrant.sh | 33 - templates/centos-6.4-i386/template.json | 88 - templates/centos-6.4/http/ks.cfg | 39 - templates/centos-6.4/scripts/cleanup.sh | 5 - templates/centos-6.4/scripts/minimize.sh | 4 - templates/centos-6.4/scripts/sshd.sh | 3 - templates/centos-6.4/scripts/vagrant.sh | 33 - templates/centos-6.4/template.json | 88 - templates/debian-6.0.7-i386/http/preseed.cfg | 47 - .../debian-6.0.7-i386/scripts/cleanup.sh | 6 - .../debian-6.0.7-i386/scripts/minimize.sh | 4 - .../debian-6.0.7-i386/scripts/networking.sh | 7 - templates/debian-6.0.7-i386/scripts/sshd.sh | 3 - .../debian-6.0.7-i386/scripts/sudoers.sh | 4 - templates/debian-6.0.7-i386/scripts/update.sh | 4 - .../debian-6.0.7-i386/scripts/vagrant.sh | 33 - templates/debian-6.0.7-i386/template.json | 119 - templates/debian-6.0.7/http/preseed.cfg | 47 - templates/debian-6.0.7/scripts/cleanup.sh | 6 - templates/debian-6.0.7/scripts/minimize.sh | 4 - templates/debian-6.0.7/scripts/networking.sh | 7 - templates/debian-6.0.7/scripts/sshd.sh | 3 - templates/debian-6.0.7/scripts/sudoers.sh | 4 - templates/debian-6.0.7/scripts/update.sh | 4 - templates/debian-6.0.7/scripts/vagrant.sh | 33 - templates/debian-6.0.7/template.json | 119 - templates/debian-7.1.0-i386/http/preseed.cfg | 47 - .../debian-7.1.0-i386/scripts/cleanup.sh | 6 - .../debian-7.1.0-i386/scripts/minimize.sh | 4 - .../debian-7.1.0-i386/scripts/networking.sh | 7 - templates/debian-7.1.0-i386/scripts/sshd.sh | 3 - .../debian-7.1.0-i386/scripts/sudoers.sh | 4 - templates/debian-7.1.0-i386/scripts/update.sh | 4 - .../debian-7.1.0-i386/scripts/vagrant.sh | 33 - templates/debian-7.1.0-i386/template.json | 119 - templates/debian-7.1.0/http/preseed.cfg | 47 - templates/debian-7.1.0/scripts/cleanup.sh | 6 - templates/debian-7.1.0/scripts/minimize.sh | 4 - templates/debian-7.1.0/scripts/networking.sh | 7 - templates/debian-7.1.0/scripts/sshd.sh | 3 - templates/debian-7.1.0/scripts/sudoers.sh | 4 - templates/debian-7.1.0/scripts/update.sh | 4 - templates/debian-7.1.0/scripts/vagrant.sh | 33 - templates/debian-7.1.0/template.json | 119 - templates/fedora-18/http/ks.cfg | 50 - templates/fedora-18/scripts/cleanup.sh | 4 - templates/fedora-18/scripts/minimize.sh | 4 - templates/fedora-18/scripts/sshd.sh | 3 - templates/fedora-18/scripts/vagrant.sh | 33 - templates/fedora-18/template.json | 88 - templates/fedora-19/http/ks.cfg | 50 - templates/fedora-19/scripts/cleanup.sh | 4 - templates/fedora-19/scripts/minimize.sh | 4 - templates/fedora-19/scripts/sshd.sh | 3 - templates/fedora-19/scripts/vagrant.sh | 33 - templates/fedora-19/template.json | 88 - templates/sles-11-sp2-i386/http/autoinst.xml | 2569 ----------------- templates/sles-11-sp2-i386/scripts/cleanup.sh | 9 - .../sles-11-sp2-i386/scripts/minimize.sh | 4 - templates/sles-11-sp2-i386/scripts/sshd.sh | 3 - templates/sles-11-sp2-i386/scripts/sudoers.sh | 3 - templates/sles-11-sp2-i386/scripts/vagrant.sh | 33 - templates/sles-11-sp2-i386/template.json | 97 - templates/sles-11-sp2/http/autoinst.xml | 2569 ----------------- templates/sles-11-sp2/scripts/cleanup.sh | 9 - templates/sles-11-sp2/scripts/minimize.sh | 4 - templates/sles-11-sp2/scripts/sshd.sh | 3 - templates/sles-11-sp2/scripts/sudoers.sh | 3 - templates/sles-11-sp2/scripts/vagrant.sh | 33 - templates/sles-11-sp2/template.json | 97 - templates/sles-11-sp3-i386/http/autoinst.xml | 2569 ----------------- templates/sles-11-sp3-i386/scripts/cleanup.sh | 9 - .../sles-11-sp3-i386/scripts/minimize.sh | 4 - templates/sles-11-sp3-i386/scripts/sshd.sh | 3 - templates/sles-11-sp3-i386/scripts/sudoers.sh | 3 - templates/sles-11-sp3-i386/scripts/vagrant.sh | 33 - templates/sles-11-sp3-i386/template.json | 97 - templates/sles-11-sp3/http/autoinst.xml | 2569 ----------------- templates/sles-11-sp3/scripts/cleanup.sh | 9 - templates/sles-11-sp3/scripts/minimize.sh | 4 - templates/sles-11-sp3/scripts/sshd.sh | 3 - templates/sles-11-sp3/scripts/sudoers.sh | 3 - templates/sles-11-sp3/scripts/vagrant.sh | 33 - templates/sles-11-sp3/template.json | 97 - templates/ubuntu-10.04-i386/http/preseed.cfg | 31 - .../ubuntu-10.04-i386/scripts/cleanup.sh | 6 - .../ubuntu-10.04-i386/scripts/minimize.sh | 4 - .../ubuntu-10.04-i386/scripts/networking.sh | 7 - templates/ubuntu-10.04-i386/scripts/sshd.sh | 3 - .../ubuntu-10.04-i386/scripts/sudoers.sh | 4 - templates/ubuntu-10.04-i386/scripts/update.sh | 15 - .../ubuntu-10.04-i386/scripts/vagrant.sh | 33 - templates/ubuntu-10.04-i386/template.json | 133 - templates/ubuntu-10.04/http/preseed.cfg | 31 - templates/ubuntu-10.04/scripts/cleanup.sh | 6 - templates/ubuntu-10.04/scripts/minimize.sh | 4 - templates/ubuntu-10.04/scripts/networking.sh | 7 - templates/ubuntu-10.04/scripts/sshd.sh | 3 - templates/ubuntu-10.04/scripts/sudoers.sh | 4 - templates/ubuntu-10.04/scripts/update.sh | 15 - templates/ubuntu-10.04/scripts/vagrant.sh | 33 - templates/ubuntu-10.04/template.json | 194 -- templates/ubuntu-10.10/http/preseed.cfg | 31 - templates/ubuntu-10.10/scripts/cleanup.sh | 6 - templates/ubuntu-10.10/scripts/minimize.sh | 4 - templates/ubuntu-10.10/scripts/networking.sh | 7 - templates/ubuntu-10.10/scripts/sshd.sh | 3 - templates/ubuntu-10.10/scripts/sudoers.sh | 4 - templates/ubuntu-10.10/scripts/update.sh | 15 - templates/ubuntu-10.10/scripts/vagrant.sh | 33 - templates/ubuntu-10.10/template.json | 133 - templates/ubuntu-11.04/http/preseed.cfg | 31 - templates/ubuntu-11.04/scripts/cleanup.sh | 6 - templates/ubuntu-11.04/scripts/minimize.sh | 4 - templates/ubuntu-11.04/scripts/networking.sh | 7 - templates/ubuntu-11.04/scripts/sshd.sh | 3 - templates/ubuntu-11.04/scripts/sudoers.sh | 4 - templates/ubuntu-11.04/scripts/update.sh | 15 - templates/ubuntu-11.04/scripts/vagrant.sh | 33 - templates/ubuntu-11.04/template.json | 133 - templates/ubuntu-11.10/http/preseed.cfg | 31 - templates/ubuntu-11.10/scripts/cleanup.sh | 6 - templates/ubuntu-11.10/scripts/minimize.sh | 4 - templates/ubuntu-11.10/scripts/networking.sh | 7 - templates/ubuntu-11.10/scripts/sshd.sh | 3 - templates/ubuntu-11.10/scripts/sudoers.sh | 4 - templates/ubuntu-11.10/scripts/update.sh | 15 - templates/ubuntu-11.10/scripts/vagrant.sh | 33 - templates/ubuntu-11.10/template.json | 133 - templates/ubuntu-12.04-i386/http/preseed.cfg | 31 - .../ubuntu-12.04-i386/scripts/cleanup.sh | 6 - .../ubuntu-12.04-i386/scripts/minimize.sh | 4 - .../ubuntu-12.04-i386/scripts/networking.sh | 7 - templates/ubuntu-12.04-i386/scripts/sshd.sh | 3 - .../ubuntu-12.04-i386/scripts/sudoers.sh | 4 - templates/ubuntu-12.04-i386/scripts/update.sh | 15 - .../ubuntu-12.04-i386/scripts/vagrant.sh | 33 - templates/ubuntu-12.04-i386/template.json | 133 - templates/ubuntu-12.04/http/preseed.cfg | 31 - templates/ubuntu-12.04/new.json | 77 - templates/ubuntu-12.04/scripts/sudoers.sh | 4 - templates/ubuntu-12.04/template.json | 135 - templates/ubuntu-12.10-i386/http/preseed.cfg | 31 - .../ubuntu-12.10-i386/scripts/cleanup.sh | 6 - .../ubuntu-12.10-i386/scripts/minimize.sh | 4 - .../ubuntu-12.10-i386/scripts/networking.sh | 7 - templates/ubuntu-12.10-i386/scripts/sshd.sh | 3 - .../ubuntu-12.10-i386/scripts/sudoers.sh | 4 - templates/ubuntu-12.10-i386/scripts/update.sh | 15 - .../ubuntu-12.10-i386/scripts/vagrant.sh | 33 - templates/ubuntu-12.10-i386/template.json | 133 - templates/ubuntu-12.10/http/preseed.cfg | 31 - templates/ubuntu-12.10/scripts/cleanup.sh | 6 - templates/ubuntu-12.10/scripts/minimize.sh | 4 - templates/ubuntu-12.10/scripts/networking.sh | 7 - templates/ubuntu-12.10/scripts/sshd.sh | 3 - templates/ubuntu-12.10/scripts/sudoers.sh | 4 - templates/ubuntu-12.10/scripts/update.sh | 15 - templates/ubuntu-12.10/scripts/vagrant.sh | 33 - templates/ubuntu-12.10/template.json | 133 - templates/ubuntu-13.04-i386/http/preseed.cfg | 31 - .../ubuntu-13.04-i386/scripts/cleanup.sh | 6 - .../ubuntu-13.04-i386/scripts/minimize.sh | 4 - .../ubuntu-13.04-i386/scripts/networking.sh | 7 - templates/ubuntu-13.04-i386/scripts/sshd.sh | 3 - .../ubuntu-13.04-i386/scripts/sudoers.sh | 4 - templates/ubuntu-13.04-i386/scripts/update.sh | 15 - .../ubuntu-13.04-i386/scripts/vagrant.sh | 33 - templates/ubuntu-13.04-i386/template.json | 133 - templates/ubuntu-13.04/http/preseed.cfg | 31 - templates/ubuntu-13.04/new.json | 135 - templates/ubuntu-13.04/scripts/cleanup.sh | 6 - templates/ubuntu-13.04/scripts/minimize.sh | 4 - templates/ubuntu-13.04/scripts/networking.sh | 7 - templates/ubuntu-13.04/scripts/sshd.sh | 3 - templates/ubuntu-13.04/scripts/sudoers.sh | 4 - templates/ubuntu-13.04/scripts/update.sh | 15 - templates/ubuntu-13.04/scripts/vagrant.sh | 33 - templates/ubuntu-13.04/template.json | 136 - 285 files changed, 18090 deletions(-) delete mode 100644 templates/.centos/cleanup.sh delete mode 100644 templates/.centos/ks.cfg delete mode 100644 templates/.common/chef_omnibus.sh delete mode 100644 templates/.common/minimize.sh delete mode 100644 templates/.common/sshd.sh delete mode 100644 templates/.common/sudoers.sh delete mode 100644 templates/.common/vagrant.sh delete mode 100644 templates/.debian/cleanup.sh delete mode 100644 templates/.debian/networking.sh delete mode 100644 templates/.debian/preseed.cfg delete mode 100644 templates/.debian/sudoers.sh delete mode 100644 templates/.debian/update.sh delete mode 100644 templates/.fedora/cleanup.sh delete mode 100644 templates/.fedora/ks.cfg delete mode 100644 templates/.suse/sudoers.sh delete mode 100644 templates/.ubuntu/cleanup.sh delete mode 100644 templates/.ubuntu/networking.sh delete mode 100644 templates/.ubuntu/preseed.cfg delete mode 100644 templates/.ubuntu/sudoers.sh delete mode 100644 templates/.ubuntu/update.sh delete mode 100644 templates/.windows/install-chef.bat delete mode 100644 templates/.windows/install-vbox.bat delete mode 100644 templates/.windows/mount-validation.bat delete mode 100644 templates/.windows/oracle-cert.cer delete mode 100644 templates/centos-5.5-i386/http/ks.cfg delete mode 100644 templates/centos-5.5-i386/scripts/cleanup.sh delete mode 100644 templates/centos-5.5-i386/scripts/minimize.sh delete mode 100644 templates/centos-5.5-i386/scripts/sshd.sh delete mode 100644 templates/centos-5.5-i386/scripts/vagrant.sh delete mode 100644 templates/centos-5.5-i386/template.json delete mode 100644 templates/centos-5.5/http/ks.cfg delete mode 100644 templates/centos-5.5/scripts/cleanup.sh delete mode 100644 templates/centos-5.5/scripts/minimize.sh delete mode 100644 templates/centos-5.5/scripts/sshd.sh delete mode 100644 templates/centos-5.5/scripts/vagrant.sh delete mode 100644 templates/centos-5.5/template.json delete mode 100644 templates/centos-5.6/http/ks.cfg delete mode 100644 templates/centos-5.6/scripts/cleanup.sh delete mode 100644 templates/centos-5.6/scripts/minimize.sh delete mode 100644 templates/centos-5.6/scripts/sshd.sh delete mode 100644 templates/centos-5.6/scripts/vagrant.sh delete mode 100644 templates/centos-5.6/template.json delete mode 100644 templates/centos-5.7/http/ks.cfg delete mode 100644 templates/centos-5.7/scripts/cleanup.sh delete mode 100644 templates/centos-5.7/scripts/minimize.sh delete mode 100644 templates/centos-5.7/scripts/sshd.sh delete mode 100644 templates/centos-5.7/scripts/vagrant.sh delete mode 100644 templates/centos-5.7/template.json delete mode 100644 templates/centos-5.8-i386/http/ks.cfg delete mode 100644 templates/centos-5.8-i386/scripts/cleanup.sh delete mode 100644 templates/centos-5.8-i386/scripts/minimize.sh delete mode 100644 templates/centos-5.8-i386/scripts/sshd.sh delete mode 100644 templates/centos-5.8-i386/scripts/vagrant.sh delete mode 100644 templates/centos-5.8-i386/template.json delete mode 100644 templates/centos-5.8/http/ks.cfg delete mode 100644 templates/centos-5.8/scripts/cleanup.sh delete mode 100644 templates/centos-5.8/scripts/minimize.sh delete mode 100644 templates/centos-5.8/scripts/sshd.sh delete mode 100644 templates/centos-5.8/scripts/vagrant.sh delete mode 100644 templates/centos-5.8/template.json delete mode 100644 templates/centos-5.9-i386/http/ks.cfg delete mode 100644 templates/centos-5.9-i386/scripts/cleanup.sh delete mode 100644 templates/centos-5.9-i386/scripts/minimize.sh delete mode 100644 templates/centos-5.9-i386/scripts/sshd.sh delete mode 100644 templates/centos-5.9-i386/scripts/vagrant.sh delete mode 100644 templates/centos-5.9-i386/template.json delete mode 100644 templates/centos-5.9/http/ks.cfg delete mode 100644 templates/centos-5.9/scripts/cleanup.sh delete mode 100644 templates/centos-5.9/scripts/minimize.sh delete mode 100644 templates/centos-5.9/scripts/sshd.sh delete mode 100644 templates/centos-5.9/scripts/vagrant.sh delete mode 100644 templates/centos-5.9/template.json delete mode 100644 templates/centos-6.0/http/ks.cfg delete mode 100644 templates/centos-6.0/scripts/cleanup.sh delete mode 100644 templates/centos-6.0/scripts/minimize.sh delete mode 100644 templates/centos-6.0/scripts/sshd.sh delete mode 100644 templates/centos-6.0/scripts/vagrant.sh delete mode 100644 templates/centos-6.0/template.json delete mode 100644 templates/centos-6.2-i386/http/ks.cfg delete mode 100644 templates/centos-6.2-i386/scripts/cleanup.sh delete mode 100644 templates/centos-6.2-i386/scripts/minimize.sh delete mode 100644 templates/centos-6.2-i386/scripts/sshd.sh delete mode 100644 templates/centos-6.2-i386/scripts/vagrant.sh delete mode 100644 templates/centos-6.2-i386/template.json delete mode 100644 templates/centos-6.2/http/ks.cfg delete mode 100644 templates/centos-6.2/scripts/cleanup.sh delete mode 100644 templates/centos-6.2/scripts/minimize.sh delete mode 100644 templates/centos-6.2/scripts/sshd.sh delete mode 100644 templates/centos-6.2/scripts/vagrant.sh delete mode 100644 templates/centos-6.2/template.json delete mode 100644 templates/centos-6.3-i386/http/ks.cfg delete mode 100644 templates/centos-6.3-i386/scripts/cleanup.sh delete mode 100644 templates/centos-6.3-i386/scripts/minimize.sh delete mode 100644 templates/centos-6.3-i386/scripts/sshd.sh delete mode 100644 templates/centos-6.3-i386/scripts/vagrant.sh delete mode 100644 templates/centos-6.3-i386/template.json delete mode 100644 templates/centos-6.3/http/ks.cfg delete mode 100644 templates/centos-6.3/scripts/cleanup.sh delete mode 100644 templates/centos-6.3/scripts/minimize.sh delete mode 100644 templates/centos-6.3/scripts/sshd.sh delete mode 100644 templates/centos-6.3/scripts/vagrant.sh delete mode 100644 templates/centos-6.3/template.json delete mode 100644 templates/centos-6.4-i386/http/ks.cfg delete mode 100644 templates/centos-6.4-i386/scripts/cleanup.sh delete mode 100644 templates/centos-6.4-i386/scripts/minimize.sh delete mode 100644 templates/centos-6.4-i386/scripts/sshd.sh delete mode 100644 templates/centos-6.4-i386/scripts/vagrant.sh delete mode 100644 templates/centos-6.4-i386/template.json delete mode 100644 templates/centos-6.4/http/ks.cfg delete mode 100644 templates/centos-6.4/scripts/cleanup.sh delete mode 100644 templates/centos-6.4/scripts/minimize.sh delete mode 100644 templates/centos-6.4/scripts/sshd.sh delete mode 100644 templates/centos-6.4/scripts/vagrant.sh delete mode 100644 templates/centos-6.4/template.json delete mode 100644 templates/debian-6.0.7-i386/http/preseed.cfg delete mode 100644 templates/debian-6.0.7-i386/scripts/cleanup.sh delete mode 100644 templates/debian-6.0.7-i386/scripts/minimize.sh delete mode 100644 templates/debian-6.0.7-i386/scripts/networking.sh delete mode 100644 templates/debian-6.0.7-i386/scripts/sshd.sh delete mode 100644 templates/debian-6.0.7-i386/scripts/sudoers.sh delete mode 100644 templates/debian-6.0.7-i386/scripts/update.sh delete mode 100644 templates/debian-6.0.7-i386/scripts/vagrant.sh delete mode 100644 templates/debian-6.0.7-i386/template.json delete mode 100644 templates/debian-6.0.7/http/preseed.cfg delete mode 100644 templates/debian-6.0.7/scripts/cleanup.sh delete mode 100644 templates/debian-6.0.7/scripts/minimize.sh delete mode 100644 templates/debian-6.0.7/scripts/networking.sh delete mode 100644 templates/debian-6.0.7/scripts/sshd.sh delete mode 100644 templates/debian-6.0.7/scripts/sudoers.sh delete mode 100644 templates/debian-6.0.7/scripts/update.sh delete mode 100644 templates/debian-6.0.7/scripts/vagrant.sh delete mode 100644 templates/debian-6.0.7/template.json delete mode 100644 templates/debian-7.1.0-i386/http/preseed.cfg delete mode 100644 templates/debian-7.1.0-i386/scripts/cleanup.sh delete mode 100644 templates/debian-7.1.0-i386/scripts/minimize.sh delete mode 100644 templates/debian-7.1.0-i386/scripts/networking.sh delete mode 100644 templates/debian-7.1.0-i386/scripts/sshd.sh delete mode 100644 templates/debian-7.1.0-i386/scripts/sudoers.sh delete mode 100644 templates/debian-7.1.0-i386/scripts/update.sh delete mode 100644 templates/debian-7.1.0-i386/scripts/vagrant.sh delete mode 100644 templates/debian-7.1.0-i386/template.json delete mode 100644 templates/debian-7.1.0/http/preseed.cfg delete mode 100644 templates/debian-7.1.0/scripts/cleanup.sh delete mode 100644 templates/debian-7.1.0/scripts/minimize.sh delete mode 100644 templates/debian-7.1.0/scripts/networking.sh delete mode 100644 templates/debian-7.1.0/scripts/sshd.sh delete mode 100644 templates/debian-7.1.0/scripts/sudoers.sh delete mode 100644 templates/debian-7.1.0/scripts/update.sh delete mode 100644 templates/debian-7.1.0/scripts/vagrant.sh delete mode 100644 templates/debian-7.1.0/template.json delete mode 100644 templates/fedora-18/http/ks.cfg delete mode 100644 templates/fedora-18/scripts/cleanup.sh delete mode 100644 templates/fedora-18/scripts/minimize.sh delete mode 100644 templates/fedora-18/scripts/sshd.sh delete mode 100644 templates/fedora-18/scripts/vagrant.sh delete mode 100644 templates/fedora-18/template.json delete mode 100644 templates/fedora-19/http/ks.cfg delete mode 100644 templates/fedora-19/scripts/cleanup.sh delete mode 100644 templates/fedora-19/scripts/minimize.sh delete mode 100644 templates/fedora-19/scripts/sshd.sh delete mode 100644 templates/fedora-19/scripts/vagrant.sh delete mode 100644 templates/fedora-19/template.json delete mode 100644 templates/sles-11-sp2-i386/http/autoinst.xml delete mode 100644 templates/sles-11-sp2-i386/scripts/cleanup.sh delete mode 100644 templates/sles-11-sp2-i386/scripts/minimize.sh delete mode 100644 templates/sles-11-sp2-i386/scripts/sshd.sh delete mode 100644 templates/sles-11-sp2-i386/scripts/sudoers.sh delete mode 100644 templates/sles-11-sp2-i386/scripts/vagrant.sh delete mode 100644 templates/sles-11-sp2-i386/template.json delete mode 100644 templates/sles-11-sp2/http/autoinst.xml delete mode 100644 templates/sles-11-sp2/scripts/cleanup.sh delete mode 100644 templates/sles-11-sp2/scripts/minimize.sh delete mode 100644 templates/sles-11-sp2/scripts/sshd.sh delete mode 100644 templates/sles-11-sp2/scripts/sudoers.sh delete mode 100644 templates/sles-11-sp2/scripts/vagrant.sh delete mode 100644 templates/sles-11-sp2/template.json delete mode 100644 templates/sles-11-sp3-i386/http/autoinst.xml delete mode 100644 templates/sles-11-sp3-i386/scripts/cleanup.sh delete mode 100644 templates/sles-11-sp3-i386/scripts/minimize.sh delete mode 100644 templates/sles-11-sp3-i386/scripts/sshd.sh delete mode 100644 templates/sles-11-sp3-i386/scripts/sudoers.sh delete mode 100644 templates/sles-11-sp3-i386/scripts/vagrant.sh delete mode 100644 templates/sles-11-sp3-i386/template.json delete mode 100644 templates/sles-11-sp3/http/autoinst.xml delete mode 100644 templates/sles-11-sp3/scripts/cleanup.sh delete mode 100644 templates/sles-11-sp3/scripts/minimize.sh delete mode 100644 templates/sles-11-sp3/scripts/sshd.sh delete mode 100644 templates/sles-11-sp3/scripts/sudoers.sh delete mode 100644 templates/sles-11-sp3/scripts/vagrant.sh delete mode 100644 templates/sles-11-sp3/template.json delete mode 100644 templates/ubuntu-10.04-i386/http/preseed.cfg delete mode 100644 templates/ubuntu-10.04-i386/scripts/cleanup.sh delete mode 100644 templates/ubuntu-10.04-i386/scripts/minimize.sh delete mode 100644 templates/ubuntu-10.04-i386/scripts/networking.sh delete mode 100644 templates/ubuntu-10.04-i386/scripts/sshd.sh delete mode 100644 templates/ubuntu-10.04-i386/scripts/sudoers.sh delete mode 100644 templates/ubuntu-10.04-i386/scripts/update.sh delete mode 100644 templates/ubuntu-10.04-i386/scripts/vagrant.sh delete mode 100644 templates/ubuntu-10.04-i386/template.json delete mode 100644 templates/ubuntu-10.04/http/preseed.cfg delete mode 100644 templates/ubuntu-10.04/scripts/cleanup.sh delete mode 100644 templates/ubuntu-10.04/scripts/minimize.sh delete mode 100644 templates/ubuntu-10.04/scripts/networking.sh delete mode 100644 templates/ubuntu-10.04/scripts/sshd.sh delete mode 100644 templates/ubuntu-10.04/scripts/sudoers.sh delete mode 100644 templates/ubuntu-10.04/scripts/update.sh delete mode 100644 templates/ubuntu-10.04/scripts/vagrant.sh delete mode 100644 templates/ubuntu-10.04/template.json delete mode 100644 templates/ubuntu-10.10/http/preseed.cfg delete mode 100644 templates/ubuntu-10.10/scripts/cleanup.sh delete mode 100644 templates/ubuntu-10.10/scripts/minimize.sh delete mode 100644 templates/ubuntu-10.10/scripts/networking.sh delete mode 100644 templates/ubuntu-10.10/scripts/sshd.sh delete mode 100644 templates/ubuntu-10.10/scripts/sudoers.sh delete mode 100644 templates/ubuntu-10.10/scripts/update.sh delete mode 100644 templates/ubuntu-10.10/scripts/vagrant.sh delete mode 100644 templates/ubuntu-10.10/template.json delete mode 100644 templates/ubuntu-11.04/http/preseed.cfg delete mode 100644 templates/ubuntu-11.04/scripts/cleanup.sh delete mode 100644 templates/ubuntu-11.04/scripts/minimize.sh delete mode 100644 templates/ubuntu-11.04/scripts/networking.sh delete mode 100644 templates/ubuntu-11.04/scripts/sshd.sh delete mode 100644 templates/ubuntu-11.04/scripts/sudoers.sh delete mode 100644 templates/ubuntu-11.04/scripts/update.sh delete mode 100644 templates/ubuntu-11.04/scripts/vagrant.sh delete mode 100644 templates/ubuntu-11.04/template.json delete mode 100644 templates/ubuntu-11.10/http/preseed.cfg delete mode 100644 templates/ubuntu-11.10/scripts/cleanup.sh delete mode 100644 templates/ubuntu-11.10/scripts/minimize.sh delete mode 100644 templates/ubuntu-11.10/scripts/networking.sh delete mode 100644 templates/ubuntu-11.10/scripts/sshd.sh delete mode 100644 templates/ubuntu-11.10/scripts/sudoers.sh delete mode 100644 templates/ubuntu-11.10/scripts/update.sh delete mode 100644 templates/ubuntu-11.10/scripts/vagrant.sh delete mode 100644 templates/ubuntu-11.10/template.json delete mode 100644 templates/ubuntu-12.04-i386/http/preseed.cfg delete mode 100644 templates/ubuntu-12.04-i386/scripts/cleanup.sh delete mode 100644 templates/ubuntu-12.04-i386/scripts/minimize.sh delete mode 100644 templates/ubuntu-12.04-i386/scripts/networking.sh delete mode 100644 templates/ubuntu-12.04-i386/scripts/sshd.sh delete mode 100644 templates/ubuntu-12.04-i386/scripts/sudoers.sh delete mode 100644 templates/ubuntu-12.04-i386/scripts/update.sh delete mode 100644 templates/ubuntu-12.04-i386/scripts/vagrant.sh delete mode 100644 templates/ubuntu-12.04-i386/template.json delete mode 100644 templates/ubuntu-12.04/http/preseed.cfg delete mode 100644 templates/ubuntu-12.04/new.json delete mode 100644 templates/ubuntu-12.04/scripts/sudoers.sh delete mode 100644 templates/ubuntu-12.04/template.json delete mode 100644 templates/ubuntu-12.10-i386/http/preseed.cfg delete mode 100644 templates/ubuntu-12.10-i386/scripts/cleanup.sh delete mode 100644 templates/ubuntu-12.10-i386/scripts/minimize.sh delete mode 100644 templates/ubuntu-12.10-i386/scripts/networking.sh delete mode 100644 templates/ubuntu-12.10-i386/scripts/sshd.sh delete mode 100644 templates/ubuntu-12.10-i386/scripts/sudoers.sh delete mode 100644 templates/ubuntu-12.10-i386/scripts/update.sh delete mode 100644 templates/ubuntu-12.10-i386/scripts/vagrant.sh delete mode 100644 templates/ubuntu-12.10-i386/template.json delete mode 100644 templates/ubuntu-12.10/http/preseed.cfg delete mode 100644 templates/ubuntu-12.10/scripts/cleanup.sh delete mode 100644 templates/ubuntu-12.10/scripts/minimize.sh delete mode 100644 templates/ubuntu-12.10/scripts/networking.sh delete mode 100644 templates/ubuntu-12.10/scripts/sshd.sh delete mode 100644 templates/ubuntu-12.10/scripts/sudoers.sh delete mode 100644 templates/ubuntu-12.10/scripts/update.sh delete mode 100644 templates/ubuntu-12.10/scripts/vagrant.sh delete mode 100644 templates/ubuntu-12.10/template.json delete mode 100644 templates/ubuntu-13.04-i386/http/preseed.cfg delete mode 100644 templates/ubuntu-13.04-i386/scripts/cleanup.sh delete mode 100644 templates/ubuntu-13.04-i386/scripts/minimize.sh delete mode 100644 templates/ubuntu-13.04-i386/scripts/networking.sh delete mode 100644 templates/ubuntu-13.04-i386/scripts/sshd.sh delete mode 100644 templates/ubuntu-13.04-i386/scripts/sudoers.sh delete mode 100644 templates/ubuntu-13.04-i386/scripts/update.sh delete mode 100644 templates/ubuntu-13.04-i386/scripts/vagrant.sh delete mode 100644 templates/ubuntu-13.04-i386/template.json delete mode 100644 templates/ubuntu-13.04/http/preseed.cfg delete mode 100644 templates/ubuntu-13.04/new.json delete mode 100644 templates/ubuntu-13.04/scripts/cleanup.sh delete mode 100644 templates/ubuntu-13.04/scripts/minimize.sh delete mode 100644 templates/ubuntu-13.04/scripts/networking.sh delete mode 100644 templates/ubuntu-13.04/scripts/sshd.sh delete mode 100644 templates/ubuntu-13.04/scripts/sudoers.sh delete mode 100644 templates/ubuntu-13.04/scripts/update.sh delete mode 100644 templates/ubuntu-13.04/scripts/vagrant.sh delete mode 100644 templates/ubuntu-13.04/template.json diff --git a/templates/.centos/cleanup.sh b/templates/.centos/cleanup.sh deleted file mode 100644 index 922c3d6b5..000000000 --- a/templates/.centos/cleanup.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/bash -eux -yum -y erase gtk2 libX11 hicolor-icon-theme avahi freetype bitstream-vera-fonts -yum -y clean all -rm -rf VBoxGuestAdditions_*.iso VBoxGuestAdditions_*.iso.? -rm -f /tmp/chef*rpm diff --git a/templates/.centos/ks.cfg b/templates/.centos/ks.cfg deleted file mode 100644 index e00fd5a2a..000000000 --- a/templates/.centos/ks.cfg +++ /dev/null @@ -1,39 +0,0 @@ -install -cdrom -lang en_US.UTF-8 -keyboard us -network --bootproto=dhcp -rootpw --iscrypted $1$damlkd,f$UC/u5pUts5QiU3ow.CSso/ -firewall --disabled -authconfig --enableshadow --passalgo=sha512 -selinux --disabled -timezone UTC -bootloader --location=mbr -text -skipx -zerombr -clearpart --all --initlabel -autopart -auth --useshadow --enablemd5 -firstboot --disabled -reboot - -%packages --ignoremissing -@Base -@Core -@Development Tools -openssl-devel -readline-devel -zlib-devel -kernel-devel - -%post -# update root certs -wget -O/etc/pki/tls/certs/ca-bundle.crt http://curl.haxx.se/ca/cacert.pem -# vagrant -groupadd vagrant -g 999 -useradd vagrant -g vagrant -G wheel -u 900 -echo "vagrant" | passwd --stdin vagrant -# sudo -echo "vagrant ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers -sed -i "s/^.*requiretty/#Defaults requiretty/" /etc/sudoers diff --git a/templates/.common/chef_omnibus.sh b/templates/.common/chef_omnibus.sh deleted file mode 100644 index c975b6019..000000000 --- a/templates/.common/chef_omnibus.sh +++ /dev/null @@ -1,261 +0,0 @@ -#!/bin/bash - -# This is the current stable release to default to, with Omnibus patch level (e.g. 10.12.0-1) -# Note that the chef template downloads 'x.y.z' not 'x.y.z-r' which should be a duplicate of the latest -r -use_shell=0 - -prerelease="false" - -# Check whether a command exists - returns 0 if it does, 1 if it does not -exists() { - if command -v $1 >/dev/null 2>&1 - then - return 0 - else - return 1 - fi -} - -# Set the filename for a deb, based on version and machine -deb_filename() { - filetype="deb" - if [ "$machine" = "x86_64" ]; - then - filename="chef_${version}_amd64.deb" - else - filename="chef_${version}_i386.deb" - fi -} - -# Set the filename for an rpm, based on version and machine -rpm_filename() { - filetype="rpm" - filename="chef-${version}.${machine}.rpm" -} - -# Set the filename for a Solaris SVR4 package, based on version and machine -svr4_filename() { - PATH=/usr/sfw/bin:$PATH - filetype="solaris" - filename="chef-${version}.${machine}.solaris" -} - -# Set the filename for the sh archive -shell_filename() { - filetype="sh" - filename="chef-${version}-${platform}-${platform_version}-${machine}.sh" -} - -report_bug() { - echo "Please file a bug report at http://tickets.opscode.com" - echo "Project: Chef" - echo "Component: Packages" - echo "Label: Omnibus" - echo "Version: $version" - echo " " - echo "Please detail your operating system type, version and any other relevant details" -} - -# Get command line arguments -while getopts spv: opt -do - case "$opt" in - v) version="$OPTARG";; - s) use_shell=1;; - p) prerelease="true";; - \?) # unknown flag - echo >&2 \ - "usage: $0 [-s] [-v version]" - exit 1;; - esac -done -shift `expr $OPTIND - 1` - -machine=$(printf `uname -m`) - -# Retrieve Platform and Platform Version -if [ -f "/etc/lsb-release" ] && grep -q DISTRIB_ID /etc/lsb-release; -then - platform=$(grep DISTRIB_ID /etc/lsb-release | cut -d "=" -f 2 | tr '[A-Z]' '[a-z]') - platform_version=$(grep DISTRIB_RELEASE /etc/lsb-release | cut -d "=" -f 2) -elif [ -f "/etc/debian_version" ]; -then - platform="debian" - platform_version=$(printf `cat /etc/debian_version`) -elif [ -f "/etc/redhat-release" ]; -then - platform=$(sed 's/^\(.\+\) release.*/\1/' /etc/redhat-release | tr '[A-Z]' '[a-z]') - platform_version=$(sed 's/^.\+ release \([.0-9]\+\).*/\1/' /etc/redhat-release) - - # If /etc/redhat-release exists, we act like RHEL by default - if [ "$platform" = "fedora" ]; - then - # Change platform version for use below. - platform_version="6.0" - fi - platform="el" -elif [ -f "/etc/system-release" ]; -then - platform=$(sed 's/^\(.\+\) release.\+/\1/' /etc/system-release | tr '[A-Z]' '[a-z]') - platform_version=$(sed 's/^.\+ release \([.0-9]\+\).*/\1/' /etc/system-release | tr '[A-Z]' '[a-z]') - # amazon is built off of fedora, so act like RHEL - if [ "$platform" = "amazon linux ami" ]; - then - platform="el" - platform_version="6.0" - fi -# Apple OS X -elif [ -f "/usr/bin/sw_vers" ]; -then - platform="mac_os_x" - # Matching the tab-space with sed is error-prone - platform_version=$(sw_vers | awk '/^ProductVersion:/ { print $2 }') - - major_version=$(echo $platform_version | cut -d. -f1,2) - case $major_version in - "10.6") platform_version="10.6" ;; - "10.7") platform_version="10.7" ;; - "10.8") platform_version="10.7" ;; - *) echo "No builds for platform: $major_version" - report_bug - exit 1 - ;; - esac - - # x86_64 Apple hardware often runs 32-bit kernels (see OHAI-63) - x86_64=$(sysctl -n hw.optional.x86_64) - if [ $x86_64 -eq 1 ]; then - machine="x86_64" - fi -elif [ -f "/etc/release" ]; -then - platform="solaris2" - machine=$(/usr/bin/uname -p) - platform_version=$(/usr/bin/uname -r) -elif [ -f "/etc/SuSE-release" ]; -then - if grep -q 'Enterprise' /etc/SuSE-release; - then - platform="sles" - platform_version=$(awk '/^VERSION/ {V = $3}; /^PATCHLEVEL/ {P = $3}; END {print V "." P}' /etc/SuSE-release) - else - platform="suse" - platform_version=$(awk '/^VERSION =/ { print $3 }' /etc/SuSE-release) - fi -fi - -if [ "x$platform" = "x" ]; -then - echo "Unable to determine platform version!" - report_bug - exit 1 -fi - -# Mangle $platform_version to pull the correct build -# for various platforms -major_version=$(echo $platform_version | cut -d. -f1) -case $platform in - "el") - case $major_version in - "5") platform_version="5" ;; - "6") platform_version="6" ;; - esac - ;; - "debian") - case $major_version in - "5") platform_version="6";; - "6") platform_version="6";; - esac - ;; -esac - -if [ "x$platform_version" = "x" ]; -then - echo "Unable to determine platform version!" - report_bug - exit 1 -fi - -if [ $use_shell = 1 ]; -then - shell_filename -else - case $platform in - "ubuntu") deb_filename ;; - "debian") deb_filename ;; - "el") rpm_filename ;; - "suse") rpm_filename ;; - "sles") rpm_filename ;; - "fedora") rpm_filename ;; - "solaris2") svr4_filename ;; - *) shell_filename ;; - esac -fi - -echo "Downloading Chef $version for ${platform}..." - -url="http://www.opscode.com/chef/download?v=${version}&prerelease=${prerelease}&p=${platform}&pv=${platform_version}&m=${machine}" -tmp_dir=$(mktemp -d -t tmp.XXXXXXXX || echo "/tmp") - -if exists wget; -then - downloader="wget" - wget -O "$tmp_dir/$filename" $url 2>/tmp/stderr -elif exists curl; -then - downloader="curl" - curl -L $url > "$tmp_dir/$filename" -else - echo "Cannot find wget or curl - cannot install Chef!" - exit 5 -fi - -# Check to see if we got a 404 or an empty file - -unable_to_retrieve_package() { - echo "Unable to retrieve a valid package!" - report_bug - echo "URL: $url" - exit 1 -} - -if [ "$downloader" = "curl" ] -then - #do curl stuff - grep "The specified key does not exist." "$tmp_dir/$filename" 2>&1 >/dev/null - if [ $? -eq 0 ] || [ ! -s "$tmp_dir/$filename" ] - then - unable_to_retrieve_package - fi -elif [ "$downloader" = "wget" ] -then - #do wget stuff - grep "ERROR 404" /tmp/stderr 2>&1 >/dev/null - if [ $? -eq 0 ] || [ ! -s "$tmp_dir/$filename" ] - then - unable_to_retrieve_package - fi -fi - -echo "Installing Chef $version" -case "$filetype" in - "rpm") rpm -Uvh "$tmp_dir/$filename" ;; - "deb") dpkg -i "$tmp_dir/$filename" ;; - "solaris") echo "conflict=nocheck" > /tmp/nocheck - echo "action=nocheck" >> /tmp/nocheck - pkgadd -n -d "$tmp_dir/$filename" -a /tmp/nocheck chef - ;; - "sh" ) bash "$tmp_dir/$filename" ;; -esac - -if [ "$tmp_dir" != "/tmp" ]; -then - rm -r "$tmp_dir" -fi - -if [ $? -ne 0 ]; -then - echo "Installation failed" - report_bug - exit 1 -fi diff --git a/templates/.common/minimize.sh b/templates/.common/minimize.sh deleted file mode 100644 index 3846a1d65..000000000 --- a/templates/.common/minimize.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash -eux - -dd if=/dev/zero of=/EMPTY bs=1M -rm -f /EMPTY diff --git a/templates/.common/sshd.sh b/templates/.common/sshd.sh deleted file mode 100644 index c6e4f20a6..000000000 --- a/templates/.common/sshd.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash -eux - -echo "UseDNS no" >> /etc/ssh/sshd_config diff --git a/templates/.common/sudoers.sh b/templates/.common/sudoers.sh deleted file mode 100644 index 5fce3dd2c..000000000 --- a/templates/.common/sudoers.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash -eux - -sed -i -e '/Defaults\s\+env_reset/a Defaults\texempt_group=sudo' /etc/sudoers -sed -i -e 's/%sudo ALL=(ALL:ALL) ALL/%sudo ALL=NOPASSWD:ALL/g' /etc/sudoers diff --git a/templates/.common/vagrant.sh b/templates/.common/vagrant.sh deleted file mode 100644 index cf13f435c..000000000 --- a/templates/.common/vagrant.sh +++ /dev/null @@ -1,34 +0,0 @@ -#!/bin/bash - -#if [ -f /home/vagrant/.vbox_version ]; then -# mkdir /tmp/vbox -# VER=$(cat /home/vagrant/.vbox_version) -# mount -o loop VBoxGuestAdditions_$VER.iso /tmp/vbox -# sh /tmp/vbox/VBoxLinuxAdditions.run -# umount /tmp/vbox -# rmdir /tmp/vbox -# rm *.iso -#fi - -if [ -f /home/vagrant/vmware_tools.iso ]; then - echo "Installing VMWare Tools" - #Set Linux-specific paths and ISO filename - home_dir="/home/vagrant" - iso_name="vmware_tools.iso" - mount_point="/tmp/vmware-tools" - #Run install, unmount ISO and remove it - mkdir ${mount_point} - cd ${home_dir} - /bin/mount -o loop ${iso_name} ${mount_point} - tar zxf ${mount_point}/*.tar.gz && cd vmware-tools-distrib && ./vmware-install.pl --default - /bin/umount ${mount_point} - /bin/rm -rf ${home_dir}/${iso_name} ${home_dir}/vmware-tools-distrib - rmdir ${mount_point} -fi - -mkdir /home/vagrant/.ssh -wget --no-check-certificate \ - 'https://github.com/mitchellh/vagrant/raw/master/keys/vagrant.pub' \ - -O /home/vagrant/.ssh/authorized_keys -chown -R vagrant /home/vagrant/.ssh -chmod -R go-rwsx /home/vagrant/.ssh diff --git a/templates/.debian/cleanup.sh b/templates/.debian/cleanup.sh deleted file mode 100644 index 6c7f703d6..000000000 --- a/templates/.debian/cleanup.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/bash -eux - -apt-get -y autoremove -apt-get -y clean -rm -rf VBoxGuestAdditions_*.iso VBoxGuestAdditions_*.iso.? -rm -f /tmp/chef*deb diff --git a/templates/.debian/networking.sh b/templates/.debian/networking.sh deleted file mode 100644 index de3269a58..000000000 --- a/templates/.debian/networking.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/bash -eux - -rm /etc/udev/rules.d/70-persistent-net.rules -mkdir /etc/udev/rules.d/70-persistent-net.rules -rm /lib/udev/rules.d/75-persistent-net-generator.rules -rm -rf /dev/.udev/ /var/lib/dhcp3/* -echo "pre-up sleep 2" >> /etc/network/interfaces diff --git a/templates/.debian/preseed.cfg b/templates/.debian/preseed.cfg deleted file mode 100644 index 820f090c5..000000000 --- a/templates/.debian/preseed.cfg +++ /dev/null @@ -1,47 +0,0 @@ -choose-mirror-bin mirror/http/proxy string -d-i apt-setup/use_mirror boolean true -d-i base-installer/kernel/override-image string linux-server -d-i clock-setup/utc boolean true -d-i clock-setup/utc-auto boolean true -d-i finish-install/reboot_in_progress note -d-i grub-installer/only_debian boolean true -d-i grub-installer/with_other_os boolean true -d-i keymap select us -d-i mirror/country string manual -d-i mirror/http/directory string /debian -d-i mirror/http/hostname string mirrors.kernel.org -d-i mirror/http/proxy string -d-i partman-auto-lvm/guided_size string max -d-i partman-auto/choose_recipe select atomic -d-i partman-auto/method string lvm -d-i partman-lvm/confirm boolean true -d-i partman-lvm/confirm boolean true -d-i partman-lvm/confirm_nooverwrite boolean true -d-i partman-lvm/device_remove_lvm boolean true -d-i partman/choose_partition select finish -d-i partman/confirm boolean true -d-i partman/confirm_nooverwrite boolean true -d-i partman/confirm_write_new_label boolean true -d-i passwd/root-login boolean false -d-i passwd/root-password-again password vagrant -d-i passwd/root-password password vagrant -d-i passwd/user-fullname string vagrant -d-i passwd/user-uid string 900 -d-i passwd/user-password password vagrant -d-i passwd/user-password-again password vagrant -d-i passwd/username string vagrant -d-i pkgsel/include string openssh-server sudo bzip2 acpid cryptsetup zlib1g-dev wget curl dkms make -d-i pkgsel/install-language-support boolean false -d-i pkgsel/update-policy select unattended-upgrades -d-i pkgsel/upgrade select full-upgrade -# Prevent packaged version of VirtualBox Guest Additions being installed: -d-i preseed/early_command string sed -i \ - '/in-target/idiscover(){/sbin/discover|grep -v VirtualBox;}' \ - /usr/lib/pre-pkgsel.d/20install-hwpackages -d-i time/zone string UTC -d-i user-setup/allow-password-weak boolean true -d-i user-setup/encrypt-home boolean false -apt-cdrom-setup apt-setup/cdrom/set-first boolean false -apt-mirror-setup apt-setup/use_mirror boolean true -popularity-contest popularity-contest/participate boolean false -tasksel tasksel/first multiselect standard, ubuntu-server diff --git a/templates/.debian/sudoers.sh b/templates/.debian/sudoers.sh deleted file mode 100644 index e7673ae00..000000000 --- a/templates/.debian/sudoers.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash -eux - -sed -i -e '/Defaults\s\+env_reset/a Defaults\texempt_group=sudo' /etc/sudoers -sed -i -e 's/%sudo ALL=(ALL) ALL/%sudo ALL=NOPASSWD:ALL/g' /etc/sudoers diff --git a/templates/.debian/update.sh b/templates/.debian/update.sh deleted file mode 100644 index a4cc91499..000000000 --- a/templates/.debian/update.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash -eux - -apt-get update -apt-get -y upgrade diff --git a/templates/.fedora/cleanup.sh b/templates/.fedora/cleanup.sh deleted file mode 100644 index a4d82c900..000000000 --- a/templates/.fedora/cleanup.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash -eux -yum -y erase gtk2 libX11 hicolor-icon-theme freetype -yum -y clean all -rm -f /tmp/chef*rpm diff --git a/templates/.fedora/ks.cfg b/templates/.fedora/ks.cfg deleted file mode 100644 index c89695e03..000000000 --- a/templates/.fedora/ks.cfg +++ /dev/null @@ -1,50 +0,0 @@ -install -cdrom -lang en_US.UTF-8 -keyboard us -network --bootproto=dhcp -rootpw --iscrypted $1$damlkd,f$UC/u5pUts5QiU3ow.CSso/ -firewall --disabled -authconfig --enableshadow --passalgo=sha512 -selinux --disabled -timezone UTC -bootloader --location=mbr -text -skipx -zerombr -clearpart --all --initlabel -part /boot --fstype=ext4 --size=500 -part pv.2 --grow --size=500 -volgroup vg_vagrant --pesize=32768 pv.2 -logvol / --fstype=ext4 --name=lv_root --vgname=vg_vagrant --size=1024 --grow -logvol swap --fstype=swap --name=lv_swap --vgname=vg_vagrant --size=528 --grow --maxsize=1056 -bootloader --location=mbr --append="norhgb biosdevname=0" -auth --useshadow --enablemd5 -firstboot --disabled -reboot - -%packages -@Core -bzip2 -gcc -kernel-devel -kernel-headers -openssl-devel -readline-devel -tar -wget -zlib-devel -%end - -%post -# update root certs -wget -O/etc/pki/tls/certs/ca-bundle.crt http://curl.haxx.se/ca/cacert.pem -# vagrant -groupadd vagrant -useradd vagrant -g vagrant -G wheel -u 900 -echo "vagrant" | passwd --stdin vagrant -# sudo -echo 'Defaults:vagrant !requiretty' > /etc/sudoers.d/vagrant -echo '%vagrant ALL=(ALL) NOPASSWD: ALL' >> /etc/sudoers.d/vagrant -chmod 440 /etc/sudoers.d/vagrant -%end diff --git a/templates/.suse/sudoers.sh b/templates/.suse/sudoers.sh deleted file mode 100644 index eb80f3f88..000000000 --- a/templates/.suse/sudoers.sh +++ /dev/null @@ -1,3 +0,0 @@ -# update sudoers - can't do this in autoinst.xml -echo -e "\nupdate sudoers ..." -echo -e "vagrant ALL=(ALL) NOPASSWD: ALL\n" >> /etc/sudoers diff --git a/templates/.ubuntu/cleanup.sh b/templates/.ubuntu/cleanup.sh deleted file mode 100644 index 6c7f703d6..000000000 --- a/templates/.ubuntu/cleanup.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/bash -eux - -apt-get -y autoremove -apt-get -y clean -rm -rf VBoxGuestAdditions_*.iso VBoxGuestAdditions_*.iso.? -rm -f /tmp/chef*deb diff --git a/templates/.ubuntu/networking.sh b/templates/.ubuntu/networking.sh deleted file mode 100644 index de3269a58..000000000 --- a/templates/.ubuntu/networking.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/bash -eux - -rm /etc/udev/rules.d/70-persistent-net.rules -mkdir /etc/udev/rules.d/70-persistent-net.rules -rm /lib/udev/rules.d/75-persistent-net-generator.rules -rm -rf /dev/.udev/ /var/lib/dhcp3/* -echo "pre-up sleep 2" >> /etc/network/interfaces diff --git a/templates/.ubuntu/preseed.cfg b/templates/.ubuntu/preseed.cfg deleted file mode 100644 index 903f2e14b..000000000 --- a/templates/.ubuntu/preseed.cfg +++ /dev/null @@ -1,31 +0,0 @@ -choose-mirror-bin mirror/http/proxy string -d-i base-installer/kernel/override-image string linux-server -d-i clock-setup/utc boolean true -d-i clock-setup/utc-auto boolean true -d-i finish-install/reboot_in_progress note -d-i grub-installer/only_debian boolean true -d-i grub-installer/with_other_os boolean true -d-i partman-auto-lvm/guided_size string max -d-i partman-auto/choose_recipe select atomic -d-i partman-auto/method string lvm -d-i partman-lvm/confirm boolean true -d-i partman-lvm/confirm boolean true -d-i partman-lvm/confirm_nooverwrite boolean true -d-i partman-lvm/device_remove_lvm boolean true -d-i partman/choose_partition select finish -d-i partman/confirm boolean true -d-i partman/confirm_nooverwrite boolean true -d-i partman/confirm_write_new_label boolean true -d-i passwd/user-fullname string vagrant -d-i passwd/user-uid string 900 -d-i passwd/user-password password vagrant -d-i passwd/user-password-again password vagrant -d-i passwd/username string vagrant -d-i pkgsel/include string openssh-server cryptsetup build-essential libssl-dev libreadline-dev zlib1g-dev linux-source dkms -d-i pkgsel/install-language-support boolean false -d-i pkgsel/update-policy select unattended-upgrades -d-i pkgsel/upgrade select full-upgrade -d-i time/zone string UTC -d-i user-setup/allow-password-weak boolean true -d-i user-setup/encrypt-home boolean false -tasksel tasksel/first multiselect standard, ubuntu-server diff --git a/templates/.ubuntu/sudoers.sh b/templates/.ubuntu/sudoers.sh deleted file mode 100644 index ce45b7611..000000000 --- a/templates/.ubuntu/sudoers.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash -eux - -sed -i -e '/Defaults\s\+env_reset/a Defaults\texempt_group=admin' /etc/sudoers -sed -i -e 's/%admin ALL=(ALL) ALL/%admin ALL=NOPASSWD:ALL/g' /etc/sudoers diff --git a/templates/.ubuntu/update.sh b/templates/.ubuntu/update.sh deleted file mode 100644 index 80e8dd3f9..000000000 --- a/templates/.ubuntu/update.sh +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/bash -eux - -apt-get update -apt-get -y upgrade - -# ensure the correct kernel headers are installed -apt-get -y install linux-headers-$(uname -r) - -# update package index on boot -cat <<EOF > /etc/init/refresh-apt.conf -description "update package index" -start on networking -task -exec /usr/bin/apt-get update -EOF diff --git a/templates/.windows/install-chef.bat b/templates/.windows/install-chef.bat deleted file mode 100644 index 2107a1b29..000000000 --- a/templates/.windows/install-chef.bat +++ /dev/null @@ -1,47 +0,0 @@ -@REM Loop ten times to make sure outbound networking is up -FOR /L %%n IN (1,1,10) DO ( - PING -n 1 www.opscode.com - IF %ERRORLEVEL% == 0 CALL :wget - TIMEOUT 10 -) - -:err -ECHO "Couldn't reach Opscode even after 10 retries" -GOTO :done - -:wget -@rem Install Chef using chef-client MSI installer -@setlocal - -@set REMOTE_SOURCE_MSI_URL=https://www.opscode.com/chef/install.msi -@set LOCAL_DESTINATION_MSI_PATH=%TEMP%\chef-client-latest.msi -@set FALLBACK_QUERY_STRING=?DownloadContext=PowerShell - -@set ALTERNATE_DOWNLOAD_COMMAND=$webClient=new-object System.Net.WebClient; $webClient.DownloadFile('%REMOTE_SOURCE_MSI_URL%%FALLBACK_QUERY_STRING%', '%LOCAL_DESTINATION_MSI_PATH%') - -cscript /nologo %TEMP%\wget.vbs /url:%REMOTE_SOURCE_MSI_URL% /path:"%LOCAL_DESTINATION_MSI_PATH%" - -@rem Work around issues found in Windows Server 2012 around job objects not respecting WSMAN memory quotas -@rem that cause the MSI download process to exceed the quota even when it is increased by administrators. -@rem Retry the download using a more memory-efficient mechanism that only works if PowerShell is available. -@if ERRORLEVEL 1 ( - echo Warning: Failed to download %REMOTE_SOURCE_MSI_URL% to %LOCAL_DESTINATION_MSI_PATH% - echo Warning: Retrying download with PowerShell if available - if EXIST "%LOCAL_DESTINATION_MSI_PATH%" del /f /q "%LOCAL_DESTINATION_MSI_PATH%" - echo powershell -noprofile -noninteractive -command "%ALTERNATE_DOWNLOAD_COMMAND%" - powershell -noprofile -noninteractive -command "%ALTERNATE_DOWNLOAD_COMMAND%" - if NOT ERRORLEVEL 1 ( - echo Download succeeded - ) else ( - echo Failed to download %REMOTE_SOURCE_MSI_URL% - echo Subsequent attempt to install the downloaded MSI is likely to fail - ) -) - -msiexec /qb /i "%LOCAL_DESTINATION_MSI_PATH%" - -@endlocal -EXIT - -:done -EXIT diff --git a/templates/.windows/install-vbox.bat b/templates/.windows/install-vbox.bat deleted file mode 100644 index 614c415c7..000000000 --- a/templates/.windows/install-vbox.bat +++ /dev/null @@ -1,4 +0,0 @@ -cmd /c certutil -addstore -f "TrustedPublisher" a:oracle-cert.cer -cmd /c e:\VBoxWindowsAdditions-amd64.exe /S -cmd /c shutdown.exe /r /t 5 /d p:2:4 /c "Vagrant reboot for VBoxWindowsAdditions" - diff --git a/templates/.windows/mount-validation.bat b/templates/.windows/mount-validation.bat deleted file mode 100644 index ae458c1d6..000000000 --- a/templates/.windows/mount-validation.bat +++ /dev/null @@ -1,3 +0,0 @@ -REM This is so we can pass the validation test... I don't know that it's necessary -cmd /c net use z: \\vboxsrv\veewee-validation - diff --git a/templates/.windows/oracle-cert.cer b/templates/.windows/oracle-cert.cer deleted file mode 100644 index 6f3380d48553956036650bc711ca5aed73a1224d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1398 zcmXqLVl6UgVu@P7%*4pVBoH|JX8KPK#!$sYJbaVIzH}P!vT<s)d9;1!Wn^S!WiV*m zV#sa4$;KSY!Y0fV8f++TAPVAe3G;=e7G(x!rswG>c;+SR8Oj^Tf+V<w#b6Q&Aw{Ld zB?^A2CFS`=*@o5zmJkI-A*n^V#R~ap3Z=!V3W+5O86_nJ#a8<I<>lpiWk6Glfu`yu z=jZAd6(lNXBx@QP80s15fHX4;tHMop&PgmTRxnm@&QD2I068QxFI~aNz|cU!+0j5w zoY&CMz{tSD01TplToWMI+{oC}($q4_pm8gzw}cG@LFRJ^b2%sGWTxd8<z*(q{K_uO z7nGV(o}Zth5S)=;lv->kZ6FC!%_Sn_UzC`flL~Z0Q9*uDVo7Fxo}rzA4aA?OE}7|> zC5br-o-PV7$LcEhW+oTq7w4yyC<FtE^2DN4g)pF%DPYYCWkxW=nXwse(8Q>O97Bw( z49rc8{0u;GE~X|%MuyHw?*%`8FjtXzIendtSKY3w*O-60EAjFQ2OV~w_ftDDLUzu_ z85<Wa=?S-*nejb)|0Bzi=ZAKyJXs+1{&U}<E!<r7eBtNQVs{iy`CpdM8+pV3kFKYd z;{O}R&%U~HRFb)|&*|X#58c1RGz)!dcTGuVbeeB)eCp1-hX0aX)OY`{ZrXppaE9c( z=3cQz#vO?t;*(yVb7)<pC3A9tz>SryzkP0TS}(uOwDSCq)A{l5xun*{K0kH+^Qm$< z{v9i2H}l%A36FnQYWvH^<3!H>xUK(c<{T^S(EK-X{(E*tk9{wuILuppXYONpzdIrm z6;8kD=Vfr5%TV)i?iWRwFs0(DVJoe?Co?fKGB7S~Vyp&+NI5v&$_leE888^|0pmoL zpONuD3kx$7dxL=kh%e7#X<%+(y1;mWVVgcE6#^4sa&fY;E+`r4CKu(PCP(LBXNZ&@ zP|CmsWP$>VtpO-ub0@TUFt+`0Wn>p;HqbKAVB^qc1LhxgCPpzCe97BD7-Whn3y%R8 zObau!K_QII$jFjvkZhm=;~OxxNkHA1pIlsk;yeRuxGE+rzDdkXL{YAf<eStY19^}; zlvyMU#2Q4-&s_PcTJ4MX$-e&UA6V7iKfbhlE--&^Lj33ibQCZQSp*Ek*tmecWMOPF zXJV9Q;V@tWCO}{aBPUQ`5duu0j10%my}A5s>tn4l8@-n`97fxDH}mY7!8P?YpYXXe zANBj<Zy#8B<=plhr2w0$&kh}Y;3_J_rq%O(!d;Kdh!69Qrx$0(Z#pBlLibZ#!*^ku zETe+LaLfPw_xTrys&70sPe)j1+iVq`aMSBM(lw_ziD+!<3Y)OpMqT!-=r7Lxi?JI@ z<mcTks*7urddn8t7Ob=7j{GmlCwc6O!YLD(?sT2IaC=(b)&muZ35!DO?Rt6F3ICk! zzWcisYuQ$<<p-zv%;P9Gxv*7GE-~|}O~UcDuPhm!mwENJ*Y;evpI^83&Bmf4#}q;F kZ>ww{IP}*EUbv-wBB=FaQSwz;n~wTPeHRx#@~!?40OZx*k^lez diff --git a/templates/centos-5.5-i386/http/ks.cfg b/templates/centos-5.5-i386/http/ks.cfg deleted file mode 100644 index e00fd5a2a..000000000 --- a/templates/centos-5.5-i386/http/ks.cfg +++ /dev/null @@ -1,39 +0,0 @@ -install -cdrom -lang en_US.UTF-8 -keyboard us -network --bootproto=dhcp -rootpw --iscrypted $1$damlkd,f$UC/u5pUts5QiU3ow.CSso/ -firewall --disabled -authconfig --enableshadow --passalgo=sha512 -selinux --disabled -timezone UTC -bootloader --location=mbr -text -skipx -zerombr -clearpart --all --initlabel -autopart -auth --useshadow --enablemd5 -firstboot --disabled -reboot - -%packages --ignoremissing -@Base -@Core -@Development Tools -openssl-devel -readline-devel -zlib-devel -kernel-devel - -%post -# update root certs -wget -O/etc/pki/tls/certs/ca-bundle.crt http://curl.haxx.se/ca/cacert.pem -# vagrant -groupadd vagrant -g 999 -useradd vagrant -g vagrant -G wheel -u 900 -echo "vagrant" | passwd --stdin vagrant -# sudo -echo "vagrant ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers -sed -i "s/^.*requiretty/#Defaults requiretty/" /etc/sudoers diff --git a/templates/centos-5.5-i386/scripts/cleanup.sh b/templates/centos-5.5-i386/scripts/cleanup.sh deleted file mode 100644 index 922c3d6b5..000000000 --- a/templates/centos-5.5-i386/scripts/cleanup.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/bash -eux -yum -y erase gtk2 libX11 hicolor-icon-theme avahi freetype bitstream-vera-fonts -yum -y clean all -rm -rf VBoxGuestAdditions_*.iso VBoxGuestAdditions_*.iso.? -rm -f /tmp/chef*rpm diff --git a/templates/centos-5.5-i386/scripts/minimize.sh b/templates/centos-5.5-i386/scripts/minimize.sh deleted file mode 100644 index 3846a1d65..000000000 --- a/templates/centos-5.5-i386/scripts/minimize.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash -eux - -dd if=/dev/zero of=/EMPTY bs=1M -rm -f /EMPTY diff --git a/templates/centos-5.5-i386/scripts/sshd.sh b/templates/centos-5.5-i386/scripts/sshd.sh deleted file mode 100644 index c6e4f20a6..000000000 --- a/templates/centos-5.5-i386/scripts/sshd.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash -eux - -echo "UseDNS no" >> /etc/ssh/sshd_config diff --git a/templates/centos-5.5-i386/scripts/vagrant.sh b/templates/centos-5.5-i386/scripts/vagrant.sh deleted file mode 100644 index 72dd2f444..000000000 --- a/templates/centos-5.5-i386/scripts/vagrant.sh +++ /dev/null @@ -1,33 +0,0 @@ -#!/bin/bash -eux - -if [ -f /home/vagrant/.vbox_version ]; then - mkdir /tmp/vbox - VER=$(cat /home/vagrant/.vbox_version) - mount -o loop VBoxGuestAdditions_$VER.iso /tmp/vbox - sh /tmp/vbox/VBoxLinuxAdditions.run - umount /tmp/vbox - rmdir /tmp/vbox - rm *.iso -fi - -if [ -f /home/vagrant/.vmfusion_version ]; then - #Set Linux-specific paths and ISO filename - home_dir="/home/vagrant" - iso_name="linux.iso" - mount_point="/tmp/vmware-tools" - #Run install, unmount ISO and remove it - mkdir ${mount_point} - cd ${home_dir} - /bin/mount -o loop ${iso_name} ${mount_point} - tar zxf ${mount_point}/*.tar.gz && cd vmware-tools-distrib && ./vmware-install.pl --default - /bin/umount ${mount_point} - /bin/rm -rf ${home_dir}/${iso_name} ${home_dir}/vmware-tools-distrib - rmdir ${mount_point} -fi - -mkdir /home/vagrant/.ssh -wget --no-check-certificate \ - 'https://github.com/mitchellh/vagrant/raw/master/keys/vagrant.pub' \ - -O /home/vagrant/.ssh/authorized_keys -chown -R vagrant /home/vagrant/.ssh -chmod -R go-rwsx /home/vagrant/.ssh diff --git a/templates/centos-5.5-i386/template.json b/templates/centos-5.5-i386/template.json deleted file mode 100644 index 0dfa5f94f..000000000 --- a/templates/centos-5.5-i386/template.json +++ /dev/null @@ -1,88 +0,0 @@ -{ - "provisioners": [ - { - "type": "shell", - "scripts": [ - "scripts/vagrant.sh", - "scripts/sshd.sh", - "scripts/cleanup.sh", - "scripts/minimize.sh" - ], - "override": { - "virtualbox": { - "execute_command": "echo 'vagrant'|sudo -S sh '{{.Path}}'" - }, - "vmware": { - "execute_command": "echo 'vagrant'|sudo -S sh '{{.Path}}'" - } - } - } - ], - "builders": [ - { - "type": "virtualbox", - "boot_command": [ - "linux text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/ks.cfg<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": 40960, - "guest_os_type": "RedHat", - "http_directory": "http", - "iso_checksum": "75c92246479df172de41b14c9b966344", - "iso_checksum_type": "md5", - "iso_url": "http://mirror.teklinks.com/centos/5.5/isos/i386/CentOS-5.5-i386-bin-DVD.iso", - "ssh_username": "vagrant", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_wait_timeout": "10000s", - "shutdown_command": "echo '/sbin/halt -h -p' > shutdown.sh; echo 'vagrant'|sudo -S sh 'shutdown.sh'", - "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", - "virtualbox_version_file": ".vbox_version", - "vboxmanage": [ - [ - "modifyvm", - "{{.Name}}", - "--memory", - "384" - ], - [ - "modifyvm", - "{{.Name}}", - "--cpus", - "1" - ] - ], - "iso_md5": "75c92246479df172de41b14c9b966344" - }, - { - "type": "vmware", - "boot_command": [ - "linux text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/ks.cfg<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": 40960, - "guest_os_type": "centos", - "http_directory": "http", - "iso_checksum": "75c92246479df172de41b14c9b966344", - "iso_checksum_type": "md5", - "iso_url": "http://mirror.teklinks.com/centos/5.5/isos/i386/CentOS-5.5-i386-bin-DVD.iso", - "ssh_username": "vagrant", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_wait_timeout": "10000s", - "shutdown_command": "echo '/sbin/halt -h -p' > shutdown.sh; echo 'vagrant'|sudo -S sh 'shutdown.sh'", - "vmx_data": { - "memsize": "384", - "numvcpus": "1", - "cpuid.coresPerSocket": "1" - }, - "iso_md5": "75c92246479df172de41b14c9b966344" - } - ], - "post-provisioner": [ - { - "type": "vagrant", - "output": "centos-5.5-i386-{{.Provisioner}}.box" - } - ] -} \ No newline at end of file diff --git a/templates/centos-5.5/http/ks.cfg b/templates/centos-5.5/http/ks.cfg deleted file mode 100644 index e00fd5a2a..000000000 --- a/templates/centos-5.5/http/ks.cfg +++ /dev/null @@ -1,39 +0,0 @@ -install -cdrom -lang en_US.UTF-8 -keyboard us -network --bootproto=dhcp -rootpw --iscrypted $1$damlkd,f$UC/u5pUts5QiU3ow.CSso/ -firewall --disabled -authconfig --enableshadow --passalgo=sha512 -selinux --disabled -timezone UTC -bootloader --location=mbr -text -skipx -zerombr -clearpart --all --initlabel -autopart -auth --useshadow --enablemd5 -firstboot --disabled -reboot - -%packages --ignoremissing -@Base -@Core -@Development Tools -openssl-devel -readline-devel -zlib-devel -kernel-devel - -%post -# update root certs -wget -O/etc/pki/tls/certs/ca-bundle.crt http://curl.haxx.se/ca/cacert.pem -# vagrant -groupadd vagrant -g 999 -useradd vagrant -g vagrant -G wheel -u 900 -echo "vagrant" | passwd --stdin vagrant -# sudo -echo "vagrant ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers -sed -i "s/^.*requiretty/#Defaults requiretty/" /etc/sudoers diff --git a/templates/centos-5.5/scripts/cleanup.sh b/templates/centos-5.5/scripts/cleanup.sh deleted file mode 100644 index 922c3d6b5..000000000 --- a/templates/centos-5.5/scripts/cleanup.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/bash -eux -yum -y erase gtk2 libX11 hicolor-icon-theme avahi freetype bitstream-vera-fonts -yum -y clean all -rm -rf VBoxGuestAdditions_*.iso VBoxGuestAdditions_*.iso.? -rm -f /tmp/chef*rpm diff --git a/templates/centos-5.5/scripts/minimize.sh b/templates/centos-5.5/scripts/minimize.sh deleted file mode 100644 index 3846a1d65..000000000 --- a/templates/centos-5.5/scripts/minimize.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash -eux - -dd if=/dev/zero of=/EMPTY bs=1M -rm -f /EMPTY diff --git a/templates/centos-5.5/scripts/sshd.sh b/templates/centos-5.5/scripts/sshd.sh deleted file mode 100644 index c6e4f20a6..000000000 --- a/templates/centos-5.5/scripts/sshd.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash -eux - -echo "UseDNS no" >> /etc/ssh/sshd_config diff --git a/templates/centos-5.5/scripts/vagrant.sh b/templates/centos-5.5/scripts/vagrant.sh deleted file mode 100644 index 72dd2f444..000000000 --- a/templates/centos-5.5/scripts/vagrant.sh +++ /dev/null @@ -1,33 +0,0 @@ -#!/bin/bash -eux - -if [ -f /home/vagrant/.vbox_version ]; then - mkdir /tmp/vbox - VER=$(cat /home/vagrant/.vbox_version) - mount -o loop VBoxGuestAdditions_$VER.iso /tmp/vbox - sh /tmp/vbox/VBoxLinuxAdditions.run - umount /tmp/vbox - rmdir /tmp/vbox - rm *.iso -fi - -if [ -f /home/vagrant/.vmfusion_version ]; then - #Set Linux-specific paths and ISO filename - home_dir="/home/vagrant" - iso_name="linux.iso" - mount_point="/tmp/vmware-tools" - #Run install, unmount ISO and remove it - mkdir ${mount_point} - cd ${home_dir} - /bin/mount -o loop ${iso_name} ${mount_point} - tar zxf ${mount_point}/*.tar.gz && cd vmware-tools-distrib && ./vmware-install.pl --default - /bin/umount ${mount_point} - /bin/rm -rf ${home_dir}/${iso_name} ${home_dir}/vmware-tools-distrib - rmdir ${mount_point} -fi - -mkdir /home/vagrant/.ssh -wget --no-check-certificate \ - 'https://github.com/mitchellh/vagrant/raw/master/keys/vagrant.pub' \ - -O /home/vagrant/.ssh/authorized_keys -chown -R vagrant /home/vagrant/.ssh -chmod -R go-rwsx /home/vagrant/.ssh diff --git a/templates/centos-5.5/template.json b/templates/centos-5.5/template.json deleted file mode 100644 index ca16eb9ec..000000000 --- a/templates/centos-5.5/template.json +++ /dev/null @@ -1,88 +0,0 @@ -{ - "provisioners": [ - { - "type": "shell", - "scripts": [ - "scripts/vagrant.sh", - "scripts/sshd.sh", - "scripts/cleanup.sh", - "scripts/minimize.sh" - ], - "override": { - "virtualbox": { - "execute_command": "echo 'vagrant'|sudo -S sh '{{.Path}}'" - }, - "vmware": { - "execute_command": "echo 'vagrant'|sudo -S sh '{{.Path}}'" - } - } - } - ], - "builders": [ - { - "type": "virtualbox", - "boot_command": [ - "linux text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/ks.cfg<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": 40960, - "guest_os_type": "RedHat_64", - "http_directory": "http", - "iso_checksum": "ac177a5476e3b255b89b659e5b10ba03", - "iso_checksum_type": "md5", - "iso_url": "http://mirror.teklinks.com/centos/5.5/isos/x86_64/CentOS-5.5-x86_64-bin-DVD-1of2.iso", - "ssh_username": "vagrant", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_wait_timeout": "10000s", - "shutdown_command": "echo '/sbin/halt -h -p' > shutdown.sh; echo 'vagrant'|sudo -S sh 'shutdown.sh'", - "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", - "virtualbox_version_file": ".vbox_version", - "vboxmanage": [ - [ - "modifyvm", - "{{.Name}}", - "--memory", - "384" - ], - [ - "modifyvm", - "{{.Name}}", - "--cpus", - "1" - ] - ], - "iso_md5": "ac177a5476e3b255b89b659e5b10ba03" - }, - { - "type": "vmware", - "boot_command": [ - "linux text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/ks.cfg<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": 40960, - "guest_os_type": "centos-64", - "http_directory": "http", - "iso_checksum": "ac177a5476e3b255b89b659e5b10ba03", - "iso_checksum_type": "md5", - "iso_url": "http://mirror.teklinks.com/centos/5.5/isos/x86_64/CentOS-5.5-x86_64-bin-DVD-1of2.iso", - "ssh_username": "vagrant", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_wait_timeout": "10000s", - "shutdown_command": "echo '/sbin/halt -h -p' > shutdown.sh; echo 'vagrant'|sudo -S sh 'shutdown.sh'", - "vmx_data": { - "memsize": "384", - "numvcpus": "1", - "cpuid.coresPerSocket": "1" - }, - "iso_md5": "ac177a5476e3b255b89b659e5b10ba03" - } - ], - "post-provisioner": [ - { - "type": "vagrant", - "output": "centos-5.5-{{.Provisioner}}.box" - } - ] -} \ No newline at end of file diff --git a/templates/centos-5.6/http/ks.cfg b/templates/centos-5.6/http/ks.cfg deleted file mode 100644 index e00fd5a2a..000000000 --- a/templates/centos-5.6/http/ks.cfg +++ /dev/null @@ -1,39 +0,0 @@ -install -cdrom -lang en_US.UTF-8 -keyboard us -network --bootproto=dhcp -rootpw --iscrypted $1$damlkd,f$UC/u5pUts5QiU3ow.CSso/ -firewall --disabled -authconfig --enableshadow --passalgo=sha512 -selinux --disabled -timezone UTC -bootloader --location=mbr -text -skipx -zerombr -clearpart --all --initlabel -autopart -auth --useshadow --enablemd5 -firstboot --disabled -reboot - -%packages --ignoremissing -@Base -@Core -@Development Tools -openssl-devel -readline-devel -zlib-devel -kernel-devel - -%post -# update root certs -wget -O/etc/pki/tls/certs/ca-bundle.crt http://curl.haxx.se/ca/cacert.pem -# vagrant -groupadd vagrant -g 999 -useradd vagrant -g vagrant -G wheel -u 900 -echo "vagrant" | passwd --stdin vagrant -# sudo -echo "vagrant ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers -sed -i "s/^.*requiretty/#Defaults requiretty/" /etc/sudoers diff --git a/templates/centos-5.6/scripts/cleanup.sh b/templates/centos-5.6/scripts/cleanup.sh deleted file mode 100644 index 922c3d6b5..000000000 --- a/templates/centos-5.6/scripts/cleanup.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/bash -eux -yum -y erase gtk2 libX11 hicolor-icon-theme avahi freetype bitstream-vera-fonts -yum -y clean all -rm -rf VBoxGuestAdditions_*.iso VBoxGuestAdditions_*.iso.? -rm -f /tmp/chef*rpm diff --git a/templates/centos-5.6/scripts/minimize.sh b/templates/centos-5.6/scripts/minimize.sh deleted file mode 100644 index 3846a1d65..000000000 --- a/templates/centos-5.6/scripts/minimize.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash -eux - -dd if=/dev/zero of=/EMPTY bs=1M -rm -f /EMPTY diff --git a/templates/centos-5.6/scripts/sshd.sh b/templates/centos-5.6/scripts/sshd.sh deleted file mode 100644 index c6e4f20a6..000000000 --- a/templates/centos-5.6/scripts/sshd.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash -eux - -echo "UseDNS no" >> /etc/ssh/sshd_config diff --git a/templates/centos-5.6/scripts/vagrant.sh b/templates/centos-5.6/scripts/vagrant.sh deleted file mode 100644 index 72dd2f444..000000000 --- a/templates/centos-5.6/scripts/vagrant.sh +++ /dev/null @@ -1,33 +0,0 @@ -#!/bin/bash -eux - -if [ -f /home/vagrant/.vbox_version ]; then - mkdir /tmp/vbox - VER=$(cat /home/vagrant/.vbox_version) - mount -o loop VBoxGuestAdditions_$VER.iso /tmp/vbox - sh /tmp/vbox/VBoxLinuxAdditions.run - umount /tmp/vbox - rmdir /tmp/vbox - rm *.iso -fi - -if [ -f /home/vagrant/.vmfusion_version ]; then - #Set Linux-specific paths and ISO filename - home_dir="/home/vagrant" - iso_name="linux.iso" - mount_point="/tmp/vmware-tools" - #Run install, unmount ISO and remove it - mkdir ${mount_point} - cd ${home_dir} - /bin/mount -o loop ${iso_name} ${mount_point} - tar zxf ${mount_point}/*.tar.gz && cd vmware-tools-distrib && ./vmware-install.pl --default - /bin/umount ${mount_point} - /bin/rm -rf ${home_dir}/${iso_name} ${home_dir}/vmware-tools-distrib - rmdir ${mount_point} -fi - -mkdir /home/vagrant/.ssh -wget --no-check-certificate \ - 'https://github.com/mitchellh/vagrant/raw/master/keys/vagrant.pub' \ - -O /home/vagrant/.ssh/authorized_keys -chown -R vagrant /home/vagrant/.ssh -chmod -R go-rwsx /home/vagrant/.ssh diff --git a/templates/centos-5.6/template.json b/templates/centos-5.6/template.json deleted file mode 100644 index b03dc17af..000000000 --- a/templates/centos-5.6/template.json +++ /dev/null @@ -1,88 +0,0 @@ -{ - "provisioners": [ - { - "type": "shell", - "scripts": [ - "scripts/vagrant.sh", - "scripts/sshd.sh", - "scripts/cleanup.sh", - "scripts/minimize.sh" - ], - "override": { - "virtualbox": { - "execute_command": "echo 'vagrant'|sudo -S sh '{{.Path}}'" - }, - "vmware": { - "execute_command": "echo 'vagrant'|sudo -S sh '{{.Path}}'" - } - } - } - ], - "builders": [ - { - "type": "virtualbox", - "boot_command": [ - "linux text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/ks.cfg<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": 40960, - "guest_os_type": "RedHat_64", - "http_directory": "http", - "iso_checksum": "b37209879c0fb158fac25045527241ee", - "iso_checksum_type": "md5", - "iso_url": "http://mirror.teklinks.com/centos/5.6/isos/x86_64/CentOS-5.6-x86_64-bin-DVD-1of2.iso", - "ssh_username": "vagrant", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_wait_timeout": "10000s", - "shutdown_command": "echo '/sbin/halt -h -p' > shutdown.sh; echo 'vagrant'|sudo -S sh 'shutdown.sh'", - "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", - "virtualbox_version_file": ".vbox_version", - "vboxmanage": [ - [ - "modifyvm", - "{{.Name}}", - "--memory", - "384" - ], - [ - "modifyvm", - "{{.Name}}", - "--cpus", - "1" - ] - ], - "iso_md5": "b37209879c0fb158fac25045527241ee" - }, - { - "type": "vmware", - "boot_command": [ - "linux text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/ks.cfg<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": 40960, - "guest_os_type": "centos-64", - "http_directory": "http", - "iso_checksum": "b37209879c0fb158fac25045527241ee", - "iso_checksum_type": "md5", - "iso_url": "http://mirror.teklinks.com/centos/5.6/isos/x86_64/CentOS-5.6-x86_64-bin-DVD-1of2.iso", - "ssh_username": "vagrant", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_wait_timeout": "10000s", - "shutdown_command": "echo '/sbin/halt -h -p' > shutdown.sh; echo 'vagrant'|sudo -S sh 'shutdown.sh'", - "vmx_data": { - "memsize": "384", - "numvcpus": "1", - "cpuid.coresPerSocket": "1" - }, - "iso_md5": "b37209879c0fb158fac25045527241ee" - } - ], - "post-provisioner": [ - { - "type": "vagrant", - "output": "centos-5.6-{{.Provisioner}}.box" - } - ] -} \ No newline at end of file diff --git a/templates/centos-5.7/http/ks.cfg b/templates/centos-5.7/http/ks.cfg deleted file mode 100644 index e00fd5a2a..000000000 --- a/templates/centos-5.7/http/ks.cfg +++ /dev/null @@ -1,39 +0,0 @@ -install -cdrom -lang en_US.UTF-8 -keyboard us -network --bootproto=dhcp -rootpw --iscrypted $1$damlkd,f$UC/u5pUts5QiU3ow.CSso/ -firewall --disabled -authconfig --enableshadow --passalgo=sha512 -selinux --disabled -timezone UTC -bootloader --location=mbr -text -skipx -zerombr -clearpart --all --initlabel -autopart -auth --useshadow --enablemd5 -firstboot --disabled -reboot - -%packages --ignoremissing -@Base -@Core -@Development Tools -openssl-devel -readline-devel -zlib-devel -kernel-devel - -%post -# update root certs -wget -O/etc/pki/tls/certs/ca-bundle.crt http://curl.haxx.se/ca/cacert.pem -# vagrant -groupadd vagrant -g 999 -useradd vagrant -g vagrant -G wheel -u 900 -echo "vagrant" | passwd --stdin vagrant -# sudo -echo "vagrant ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers -sed -i "s/^.*requiretty/#Defaults requiretty/" /etc/sudoers diff --git a/templates/centos-5.7/scripts/cleanup.sh b/templates/centos-5.7/scripts/cleanup.sh deleted file mode 100644 index 922c3d6b5..000000000 --- a/templates/centos-5.7/scripts/cleanup.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/bash -eux -yum -y erase gtk2 libX11 hicolor-icon-theme avahi freetype bitstream-vera-fonts -yum -y clean all -rm -rf VBoxGuestAdditions_*.iso VBoxGuestAdditions_*.iso.? -rm -f /tmp/chef*rpm diff --git a/templates/centos-5.7/scripts/minimize.sh b/templates/centos-5.7/scripts/minimize.sh deleted file mode 100644 index 3846a1d65..000000000 --- a/templates/centos-5.7/scripts/minimize.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash -eux - -dd if=/dev/zero of=/EMPTY bs=1M -rm -f /EMPTY diff --git a/templates/centos-5.7/scripts/sshd.sh b/templates/centos-5.7/scripts/sshd.sh deleted file mode 100644 index c6e4f20a6..000000000 --- a/templates/centos-5.7/scripts/sshd.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash -eux - -echo "UseDNS no" >> /etc/ssh/sshd_config diff --git a/templates/centos-5.7/scripts/vagrant.sh b/templates/centos-5.7/scripts/vagrant.sh deleted file mode 100644 index 72dd2f444..000000000 --- a/templates/centos-5.7/scripts/vagrant.sh +++ /dev/null @@ -1,33 +0,0 @@ -#!/bin/bash -eux - -if [ -f /home/vagrant/.vbox_version ]; then - mkdir /tmp/vbox - VER=$(cat /home/vagrant/.vbox_version) - mount -o loop VBoxGuestAdditions_$VER.iso /tmp/vbox - sh /tmp/vbox/VBoxLinuxAdditions.run - umount /tmp/vbox - rmdir /tmp/vbox - rm *.iso -fi - -if [ -f /home/vagrant/.vmfusion_version ]; then - #Set Linux-specific paths and ISO filename - home_dir="/home/vagrant" - iso_name="linux.iso" - mount_point="/tmp/vmware-tools" - #Run install, unmount ISO and remove it - mkdir ${mount_point} - cd ${home_dir} - /bin/mount -o loop ${iso_name} ${mount_point} - tar zxf ${mount_point}/*.tar.gz && cd vmware-tools-distrib && ./vmware-install.pl --default - /bin/umount ${mount_point} - /bin/rm -rf ${home_dir}/${iso_name} ${home_dir}/vmware-tools-distrib - rmdir ${mount_point} -fi - -mkdir /home/vagrant/.ssh -wget --no-check-certificate \ - 'https://github.com/mitchellh/vagrant/raw/master/keys/vagrant.pub' \ - -O /home/vagrant/.ssh/authorized_keys -chown -R vagrant /home/vagrant/.ssh -chmod -R go-rwsx /home/vagrant/.ssh diff --git a/templates/centos-5.7/template.json b/templates/centos-5.7/template.json deleted file mode 100644 index d17efb965..000000000 --- a/templates/centos-5.7/template.json +++ /dev/null @@ -1,88 +0,0 @@ -{ - "provisioners": [ - { - "type": "shell", - "scripts": [ - "scripts/vagrant.sh", - "scripts/sshd.sh", - "scripts/cleanup.sh", - "scripts/minimize.sh" - ], - "override": { - "virtualbox": { - "execute_command": "echo 'vagrant'|sudo -S sh '{{.Path}}'" - }, - "vmware": { - "execute_command": "echo 'vagrant'|sudo -S sh '{{.Path}}'" - } - } - } - ], - "builders": [ - { - "type": "virtualbox", - "boot_command": [ - "linux text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/ks.cfg<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": 40960, - "guest_os_type": "RedHat_64", - "http_directory": "http", - "iso_checksum": "55eadec0a6e87c5f2883f734d43fdb58", - "iso_checksum_type": "md5", - "iso_url": "http://vault.centos.org/5.7/isos/x86_64/CentOS-5.7-x86_64-bin-DVD-1of2.iso", - "ssh_username": "vagrant", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_wait_timeout": "10000s", - "shutdown_command": "echo '/sbin/halt -h -p' > shutdown.sh; echo 'vagrant'|sudo -S sh 'shutdown.sh'", - "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", - "virtualbox_version_file": ".vbox_version", - "vboxmanage": [ - [ - "modifyvm", - "{{.Name}}", - "--memory", - "384" - ], - [ - "modifyvm", - "{{.Name}}", - "--cpus", - "1" - ] - ], - "iso_md5": "55eadec0a6e87c5f2883f734d43fdb58" - }, - { - "type": "vmware", - "boot_command": [ - "linux text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/ks.cfg<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": 40960, - "guest_os_type": "centos-64", - "http_directory": "http", - "iso_checksum": "55eadec0a6e87c5f2883f734d43fdb58", - "iso_checksum_type": "md5", - "iso_url": "http://vault.centos.org/5.7/isos/x86_64/CentOS-5.7-x86_64-bin-DVD-1of2.iso", - "ssh_username": "vagrant", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_wait_timeout": "10000s", - "shutdown_command": "echo '/sbin/halt -h -p' > shutdown.sh; echo 'vagrant'|sudo -S sh 'shutdown.sh'", - "vmx_data": { - "memsize": "384", - "numvcpus": "1", - "cpuid.coresPerSocket": "1" - }, - "iso_md5": "55eadec0a6e87c5f2883f734d43fdb58" - } - ], - "post-provisioner": [ - { - "type": "vagrant", - "output": "centos-5.7-{{.Provisioner}}.box" - } - ] -} \ No newline at end of file diff --git a/templates/centos-5.8-i386/http/ks.cfg b/templates/centos-5.8-i386/http/ks.cfg deleted file mode 100644 index e00fd5a2a..000000000 --- a/templates/centos-5.8-i386/http/ks.cfg +++ /dev/null @@ -1,39 +0,0 @@ -install -cdrom -lang en_US.UTF-8 -keyboard us -network --bootproto=dhcp -rootpw --iscrypted $1$damlkd,f$UC/u5pUts5QiU3ow.CSso/ -firewall --disabled -authconfig --enableshadow --passalgo=sha512 -selinux --disabled -timezone UTC -bootloader --location=mbr -text -skipx -zerombr -clearpart --all --initlabel -autopart -auth --useshadow --enablemd5 -firstboot --disabled -reboot - -%packages --ignoremissing -@Base -@Core -@Development Tools -openssl-devel -readline-devel -zlib-devel -kernel-devel - -%post -# update root certs -wget -O/etc/pki/tls/certs/ca-bundle.crt http://curl.haxx.se/ca/cacert.pem -# vagrant -groupadd vagrant -g 999 -useradd vagrant -g vagrant -G wheel -u 900 -echo "vagrant" | passwd --stdin vagrant -# sudo -echo "vagrant ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers -sed -i "s/^.*requiretty/#Defaults requiretty/" /etc/sudoers diff --git a/templates/centos-5.8-i386/scripts/cleanup.sh b/templates/centos-5.8-i386/scripts/cleanup.sh deleted file mode 100644 index 922c3d6b5..000000000 --- a/templates/centos-5.8-i386/scripts/cleanup.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/bash -eux -yum -y erase gtk2 libX11 hicolor-icon-theme avahi freetype bitstream-vera-fonts -yum -y clean all -rm -rf VBoxGuestAdditions_*.iso VBoxGuestAdditions_*.iso.? -rm -f /tmp/chef*rpm diff --git a/templates/centos-5.8-i386/scripts/minimize.sh b/templates/centos-5.8-i386/scripts/minimize.sh deleted file mode 100644 index 3846a1d65..000000000 --- a/templates/centos-5.8-i386/scripts/minimize.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash -eux - -dd if=/dev/zero of=/EMPTY bs=1M -rm -f /EMPTY diff --git a/templates/centos-5.8-i386/scripts/sshd.sh b/templates/centos-5.8-i386/scripts/sshd.sh deleted file mode 100644 index c6e4f20a6..000000000 --- a/templates/centos-5.8-i386/scripts/sshd.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash -eux - -echo "UseDNS no" >> /etc/ssh/sshd_config diff --git a/templates/centos-5.8-i386/scripts/vagrant.sh b/templates/centos-5.8-i386/scripts/vagrant.sh deleted file mode 100644 index 72dd2f444..000000000 --- a/templates/centos-5.8-i386/scripts/vagrant.sh +++ /dev/null @@ -1,33 +0,0 @@ -#!/bin/bash -eux - -if [ -f /home/vagrant/.vbox_version ]; then - mkdir /tmp/vbox - VER=$(cat /home/vagrant/.vbox_version) - mount -o loop VBoxGuestAdditions_$VER.iso /tmp/vbox - sh /tmp/vbox/VBoxLinuxAdditions.run - umount /tmp/vbox - rmdir /tmp/vbox - rm *.iso -fi - -if [ -f /home/vagrant/.vmfusion_version ]; then - #Set Linux-specific paths and ISO filename - home_dir="/home/vagrant" - iso_name="linux.iso" - mount_point="/tmp/vmware-tools" - #Run install, unmount ISO and remove it - mkdir ${mount_point} - cd ${home_dir} - /bin/mount -o loop ${iso_name} ${mount_point} - tar zxf ${mount_point}/*.tar.gz && cd vmware-tools-distrib && ./vmware-install.pl --default - /bin/umount ${mount_point} - /bin/rm -rf ${home_dir}/${iso_name} ${home_dir}/vmware-tools-distrib - rmdir ${mount_point} -fi - -mkdir /home/vagrant/.ssh -wget --no-check-certificate \ - 'https://github.com/mitchellh/vagrant/raw/master/keys/vagrant.pub' \ - -O /home/vagrant/.ssh/authorized_keys -chown -R vagrant /home/vagrant/.ssh -chmod -R go-rwsx /home/vagrant/.ssh diff --git a/templates/centos-5.8-i386/template.json b/templates/centos-5.8-i386/template.json deleted file mode 100644 index 1fe4a9fff..000000000 --- a/templates/centos-5.8-i386/template.json +++ /dev/null @@ -1,88 +0,0 @@ -{ - "provisioners": [ - { - "type": "shell", - "scripts": [ - "scripts/vagrant.sh", - "scripts/sshd.sh", - "scripts/cleanup.sh", - "scripts/minimize.sh" - ], - "override": { - "virtualbox": { - "execute_command": "echo 'vagrant'|sudo -S sh '{{.Path}}'" - }, - "vmware": { - "execute_command": "echo 'vagrant'|sudo -S sh '{{.Path}}'" - } - } - } - ], - "builders": [ - { - "type": "virtualbox", - "boot_command": [ - "linux text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/ks.cfg<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": 40960, - "guest_os_type": "RedHat", - "http_directory": "http", - "iso_checksum": "0fdd45c43b5d8fb9e05f4255c5855f9c", - "iso_checksum_type": "md5", - "iso_url": "http://vault.centos.org/5.8/isos/i386/CentOS-5.8-i386-bin-DVD-1of2.iso", - "ssh_username": "vagrant", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_wait_timeout": "10000s", - "shutdown_command": "echo '/sbin/halt -h -p' > shutdown.sh; echo 'vagrant'|sudo -S sh 'shutdown.sh'", - "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", - "virtualbox_version_file": ".vbox_version", - "vboxmanage": [ - [ - "modifyvm", - "{{.Name}}", - "--memory", - "384" - ], - [ - "modifyvm", - "{{.Name}}", - "--cpus", - "1" - ] - ], - "iso_md5": "0fdd45c43b5d8fb9e05f4255c5855f9c" - }, - { - "type": "vmware", - "boot_command": [ - "linux text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/ks.cfg<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": 40960, - "guest_os_type": "centos", - "http_directory": "http", - "iso_checksum": "0fdd45c43b5d8fb9e05f4255c5855f9c", - "iso_checksum_type": "md5", - "iso_url": "http://vault.centos.org/5.8/isos/i386/CentOS-5.8-i386-bin-DVD-1of2.iso", - "ssh_username": "vagrant", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_wait_timeout": "10000s", - "shutdown_command": "echo '/sbin/halt -h -p' > shutdown.sh; echo 'vagrant'|sudo -S sh 'shutdown.sh'", - "vmx_data": { - "memsize": "384", - "numvcpus": "1", - "cpuid.coresPerSocket": "1" - }, - "iso_md5": "0fdd45c43b5d8fb9e05f4255c5855f9c" - } - ], - "post-provisioner": [ - { - "type": "vagrant", - "output": "centos-5.8-i386-{{.Provisioner}}.box" - } - ] -} \ No newline at end of file diff --git a/templates/centos-5.8/http/ks.cfg b/templates/centos-5.8/http/ks.cfg deleted file mode 100644 index e00fd5a2a..000000000 --- a/templates/centos-5.8/http/ks.cfg +++ /dev/null @@ -1,39 +0,0 @@ -install -cdrom -lang en_US.UTF-8 -keyboard us -network --bootproto=dhcp -rootpw --iscrypted $1$damlkd,f$UC/u5pUts5QiU3ow.CSso/ -firewall --disabled -authconfig --enableshadow --passalgo=sha512 -selinux --disabled -timezone UTC -bootloader --location=mbr -text -skipx -zerombr -clearpart --all --initlabel -autopart -auth --useshadow --enablemd5 -firstboot --disabled -reboot - -%packages --ignoremissing -@Base -@Core -@Development Tools -openssl-devel -readline-devel -zlib-devel -kernel-devel - -%post -# update root certs -wget -O/etc/pki/tls/certs/ca-bundle.crt http://curl.haxx.se/ca/cacert.pem -# vagrant -groupadd vagrant -g 999 -useradd vagrant -g vagrant -G wheel -u 900 -echo "vagrant" | passwd --stdin vagrant -# sudo -echo "vagrant ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers -sed -i "s/^.*requiretty/#Defaults requiretty/" /etc/sudoers diff --git a/templates/centos-5.8/scripts/cleanup.sh b/templates/centos-5.8/scripts/cleanup.sh deleted file mode 100644 index 922c3d6b5..000000000 --- a/templates/centos-5.8/scripts/cleanup.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/bash -eux -yum -y erase gtk2 libX11 hicolor-icon-theme avahi freetype bitstream-vera-fonts -yum -y clean all -rm -rf VBoxGuestAdditions_*.iso VBoxGuestAdditions_*.iso.? -rm -f /tmp/chef*rpm diff --git a/templates/centos-5.8/scripts/minimize.sh b/templates/centos-5.8/scripts/minimize.sh deleted file mode 100644 index 3846a1d65..000000000 --- a/templates/centos-5.8/scripts/minimize.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash -eux - -dd if=/dev/zero of=/EMPTY bs=1M -rm -f /EMPTY diff --git a/templates/centos-5.8/scripts/sshd.sh b/templates/centos-5.8/scripts/sshd.sh deleted file mode 100644 index c6e4f20a6..000000000 --- a/templates/centos-5.8/scripts/sshd.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash -eux - -echo "UseDNS no" >> /etc/ssh/sshd_config diff --git a/templates/centos-5.8/scripts/vagrant.sh b/templates/centos-5.8/scripts/vagrant.sh deleted file mode 100644 index 72dd2f444..000000000 --- a/templates/centos-5.8/scripts/vagrant.sh +++ /dev/null @@ -1,33 +0,0 @@ -#!/bin/bash -eux - -if [ -f /home/vagrant/.vbox_version ]; then - mkdir /tmp/vbox - VER=$(cat /home/vagrant/.vbox_version) - mount -o loop VBoxGuestAdditions_$VER.iso /tmp/vbox - sh /tmp/vbox/VBoxLinuxAdditions.run - umount /tmp/vbox - rmdir /tmp/vbox - rm *.iso -fi - -if [ -f /home/vagrant/.vmfusion_version ]; then - #Set Linux-specific paths and ISO filename - home_dir="/home/vagrant" - iso_name="linux.iso" - mount_point="/tmp/vmware-tools" - #Run install, unmount ISO and remove it - mkdir ${mount_point} - cd ${home_dir} - /bin/mount -o loop ${iso_name} ${mount_point} - tar zxf ${mount_point}/*.tar.gz && cd vmware-tools-distrib && ./vmware-install.pl --default - /bin/umount ${mount_point} - /bin/rm -rf ${home_dir}/${iso_name} ${home_dir}/vmware-tools-distrib - rmdir ${mount_point} -fi - -mkdir /home/vagrant/.ssh -wget --no-check-certificate \ - 'https://github.com/mitchellh/vagrant/raw/master/keys/vagrant.pub' \ - -O /home/vagrant/.ssh/authorized_keys -chown -R vagrant /home/vagrant/.ssh -chmod -R go-rwsx /home/vagrant/.ssh diff --git a/templates/centos-5.8/template.json b/templates/centos-5.8/template.json deleted file mode 100644 index e36ed397e..000000000 --- a/templates/centos-5.8/template.json +++ /dev/null @@ -1,88 +0,0 @@ -{ - "provisioners": [ - { - "type": "shell", - "scripts": [ - "scripts/vagrant.sh", - "scripts/sshd.sh", - "scripts/cleanup.sh", - "scripts/minimize.sh" - ], - "override": { - "virtualbox": { - "execute_command": "echo 'vagrant'|sudo -S sh '{{.Path}}'" - }, - "vmware": { - "execute_command": "echo 'vagrant'|sudo -S sh '{{.Path}}'" - } - } - } - ], - "builders": [ - { - "type": "virtualbox", - "boot_command": [ - "linux text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/ks.cfg<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": 40960, - "guest_os_type": "RedHat_64", - "http_directory": "http", - "iso_checksum": "8a3bf0030f192022943f83fe6b2cf373", - "iso_checksum_type": "md5", - "iso_url": "http://vault.centos.org/5.8/isos/x86_64/CentOS-5.8-x86_64-bin-DVD-1of2.iso", - "ssh_username": "vagrant", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_wait_timeout": "10000s", - "shutdown_command": "echo '/sbin/halt -h -p' > shutdown.sh; echo 'vagrant'|sudo -S sh 'shutdown.sh'", - "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", - "virtualbox_version_file": ".vbox_version", - "vboxmanage": [ - [ - "modifyvm", - "{{.Name}}", - "--memory", - "384" - ], - [ - "modifyvm", - "{{.Name}}", - "--cpus", - "1" - ] - ], - "iso_md5": "8a3bf0030f192022943f83fe6b2cf373" - }, - { - "type": "vmware", - "boot_command": [ - "linux text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/ks.cfg<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": 40960, - "guest_os_type": "centos-64", - "http_directory": "http", - "iso_checksum": "8a3bf0030f192022943f83fe6b2cf373", - "iso_checksum_type": "md5", - "iso_url": "http://vault.centos.org/5.8/isos/x86_64/CentOS-5.8-x86_64-bin-DVD-1of2.iso", - "ssh_username": "vagrant", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_wait_timeout": "10000s", - "shutdown_command": "echo '/sbin/halt -h -p' > shutdown.sh; echo 'vagrant'|sudo -S sh 'shutdown.sh'", - "vmx_data": { - "memsize": "384", - "numvcpus": "1", - "cpuid.coresPerSocket": "1" - }, - "iso_md5": "8a3bf0030f192022943f83fe6b2cf373" - } - ], - "post-provisioner": [ - { - "type": "vagrant", - "output": "centos-5.8-{{.Provisioner}}.box" - } - ] -} \ No newline at end of file diff --git a/templates/centos-5.9-i386/http/ks.cfg b/templates/centos-5.9-i386/http/ks.cfg deleted file mode 100644 index e00fd5a2a..000000000 --- a/templates/centos-5.9-i386/http/ks.cfg +++ /dev/null @@ -1,39 +0,0 @@ -install -cdrom -lang en_US.UTF-8 -keyboard us -network --bootproto=dhcp -rootpw --iscrypted $1$damlkd,f$UC/u5pUts5QiU3ow.CSso/ -firewall --disabled -authconfig --enableshadow --passalgo=sha512 -selinux --disabled -timezone UTC -bootloader --location=mbr -text -skipx -zerombr -clearpart --all --initlabel -autopart -auth --useshadow --enablemd5 -firstboot --disabled -reboot - -%packages --ignoremissing -@Base -@Core -@Development Tools -openssl-devel -readline-devel -zlib-devel -kernel-devel - -%post -# update root certs -wget -O/etc/pki/tls/certs/ca-bundle.crt http://curl.haxx.se/ca/cacert.pem -# vagrant -groupadd vagrant -g 999 -useradd vagrant -g vagrant -G wheel -u 900 -echo "vagrant" | passwd --stdin vagrant -# sudo -echo "vagrant ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers -sed -i "s/^.*requiretty/#Defaults requiretty/" /etc/sudoers diff --git a/templates/centos-5.9-i386/scripts/cleanup.sh b/templates/centos-5.9-i386/scripts/cleanup.sh deleted file mode 100644 index 922c3d6b5..000000000 --- a/templates/centos-5.9-i386/scripts/cleanup.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/bash -eux -yum -y erase gtk2 libX11 hicolor-icon-theme avahi freetype bitstream-vera-fonts -yum -y clean all -rm -rf VBoxGuestAdditions_*.iso VBoxGuestAdditions_*.iso.? -rm -f /tmp/chef*rpm diff --git a/templates/centos-5.9-i386/scripts/minimize.sh b/templates/centos-5.9-i386/scripts/minimize.sh deleted file mode 100644 index 3846a1d65..000000000 --- a/templates/centos-5.9-i386/scripts/minimize.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash -eux - -dd if=/dev/zero of=/EMPTY bs=1M -rm -f /EMPTY diff --git a/templates/centos-5.9-i386/scripts/sshd.sh b/templates/centos-5.9-i386/scripts/sshd.sh deleted file mode 100644 index c6e4f20a6..000000000 --- a/templates/centos-5.9-i386/scripts/sshd.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash -eux - -echo "UseDNS no" >> /etc/ssh/sshd_config diff --git a/templates/centos-5.9-i386/scripts/vagrant.sh b/templates/centos-5.9-i386/scripts/vagrant.sh deleted file mode 100644 index 9368ef636..000000000 --- a/templates/centos-5.9-i386/scripts/vagrant.sh +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/bash -eux - -mkdir /tmp/vbox -VER=$(cat /home/vagrant/.vbox_version) -wget http://download.virtualbox.org/virtualbox/$VER/VBoxGuestAdditions_$VER.iso -mount -o loop VBoxGuestAdditions_$VER.iso /tmp/vbox -sh /tmp/vbox/VBoxLinuxAdditions.run -umount /tmp/vbox -rmdir /tmp/vbox -rm *.iso - -mkdir /home/vagrant/.ssh -wget --no-check-certificate \ - 'http://github.com/mitchellh/vagrant/raw/master/keys/vagrant.pub' \ - -O /home/vagrant/.ssh/authorized_keys -chown -R vagrant /home/vagrant/.ssh -chmod -R go-rwsx /home/vagrant/.ssh diff --git a/templates/centos-5.9-i386/template.json b/templates/centos-5.9-i386/template.json deleted file mode 100644 index 0f6d07bad..000000000 --- a/templates/centos-5.9-i386/template.json +++ /dev/null @@ -1,88 +0,0 @@ -{ - "provisioners": [ - { - "type": "shell", - "scripts": [ - "scripts/vagrant.sh", - "scripts/sshd.sh", - "scripts/cleanup.sh", - "scripts/minimize.sh" - ], - "override": { - "virtualbox": { - "execute_command": "echo 'vagrant'|sudo -S sh '{{.Path}}'" - }, - "vmware": { - "execute_command": "echo 'vagrant'|sudo -S sh '{{.Path}}'" - } - } - } - ], - "builders": [ - { - "type": "virtualbox", - "boot_command": [ - "linux text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/ks.cfg<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": 40960, - "guest_os_type": "RedHat", - "http_directory": "http", - "iso_checksum": "c8caaa18400dfde2065d8ef58eb9e9bf", - "iso_checksum_type": "md5", - "iso_url": "http://mirror.stanford.edu/yum/pub/centos/5.9/isos/i386/CentOS-5.9-i386-bin-DVD-1of2.iso", - "ssh_username": "vagrant", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_wait_timeout": "10000s", - "shutdown_command": "echo '/sbin/halt -h -p' > shutdown.sh; echo 'vagrant'|sudo -S sh 'shutdown.sh'", - "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", - "virtualbox_version_file": ".vbox_version", - "vboxmanage": [ - [ - "modifyvm", - "{{.Name}}", - "--memory", - "384" - ], - [ - "modifyvm", - "{{.Name}}", - "--cpus", - "1" - ] - ], - "iso_md5": "c8caaa18400dfde2065d8ef58eb9e9bf" - }, - { - "type": "vmware", - "boot_command": [ - "linux text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/ks.cfg<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": 40960, - "guest_os_type": "RedHat", - "http_directory": "http", - "iso_checksum": "c8caaa18400dfde2065d8ef58eb9e9bf", - "iso_checksum_type": "md5", - "iso_url": "http://mirror.stanford.edu/yum/pub/centos/5.9/isos/i386/CentOS-5.9-i386-bin-DVD-1of2.iso", - "ssh_username": "vagrant", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_wait_timeout": "10000s", - "shutdown_command": "echo '/sbin/halt -h -p' > shutdown.sh; echo 'vagrant'|sudo -S sh 'shutdown.sh'", - "vmx_data": { - "memsize": "384", - "numvcpus": "1", - "cpuid.coresPerSocket": "1" - }, - "iso_md5": "c8caaa18400dfde2065d8ef58eb9e9bf" - } - ], - "post-provisioner": [ - { - "type": "vagrant", - "output": "centos-5.9-i386-{{.Provisioner}}.box" - } - ] -} \ No newline at end of file diff --git a/templates/centos-5.9/http/ks.cfg b/templates/centos-5.9/http/ks.cfg deleted file mode 100644 index e00fd5a2a..000000000 --- a/templates/centos-5.9/http/ks.cfg +++ /dev/null @@ -1,39 +0,0 @@ -install -cdrom -lang en_US.UTF-8 -keyboard us -network --bootproto=dhcp -rootpw --iscrypted $1$damlkd,f$UC/u5pUts5QiU3ow.CSso/ -firewall --disabled -authconfig --enableshadow --passalgo=sha512 -selinux --disabled -timezone UTC -bootloader --location=mbr -text -skipx -zerombr -clearpart --all --initlabel -autopart -auth --useshadow --enablemd5 -firstboot --disabled -reboot - -%packages --ignoremissing -@Base -@Core -@Development Tools -openssl-devel -readline-devel -zlib-devel -kernel-devel - -%post -# update root certs -wget -O/etc/pki/tls/certs/ca-bundle.crt http://curl.haxx.se/ca/cacert.pem -# vagrant -groupadd vagrant -g 999 -useradd vagrant -g vagrant -G wheel -u 900 -echo "vagrant" | passwd --stdin vagrant -# sudo -echo "vagrant ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers -sed -i "s/^.*requiretty/#Defaults requiretty/" /etc/sudoers diff --git a/templates/centos-5.9/scripts/cleanup.sh b/templates/centos-5.9/scripts/cleanup.sh deleted file mode 100644 index 922c3d6b5..000000000 --- a/templates/centos-5.9/scripts/cleanup.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/bash -eux -yum -y erase gtk2 libX11 hicolor-icon-theme avahi freetype bitstream-vera-fonts -yum -y clean all -rm -rf VBoxGuestAdditions_*.iso VBoxGuestAdditions_*.iso.? -rm -f /tmp/chef*rpm diff --git a/templates/centos-5.9/scripts/minimize.sh b/templates/centos-5.9/scripts/minimize.sh deleted file mode 100644 index 3846a1d65..000000000 --- a/templates/centos-5.9/scripts/minimize.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash -eux - -dd if=/dev/zero of=/EMPTY bs=1M -rm -f /EMPTY diff --git a/templates/centos-5.9/scripts/sshd.sh b/templates/centos-5.9/scripts/sshd.sh deleted file mode 100644 index c6e4f20a6..000000000 --- a/templates/centos-5.9/scripts/sshd.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash -eux - -echo "UseDNS no" >> /etc/ssh/sshd_config diff --git a/templates/centos-5.9/scripts/vagrant.sh b/templates/centos-5.9/scripts/vagrant.sh deleted file mode 100644 index 9368ef636..000000000 --- a/templates/centos-5.9/scripts/vagrant.sh +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/bash -eux - -mkdir /tmp/vbox -VER=$(cat /home/vagrant/.vbox_version) -wget http://download.virtualbox.org/virtualbox/$VER/VBoxGuestAdditions_$VER.iso -mount -o loop VBoxGuestAdditions_$VER.iso /tmp/vbox -sh /tmp/vbox/VBoxLinuxAdditions.run -umount /tmp/vbox -rmdir /tmp/vbox -rm *.iso - -mkdir /home/vagrant/.ssh -wget --no-check-certificate \ - 'http://github.com/mitchellh/vagrant/raw/master/keys/vagrant.pub' \ - -O /home/vagrant/.ssh/authorized_keys -chown -R vagrant /home/vagrant/.ssh -chmod -R go-rwsx /home/vagrant/.ssh diff --git a/templates/centos-5.9/template.json b/templates/centos-5.9/template.json deleted file mode 100644 index 9ad8411c8..000000000 --- a/templates/centos-5.9/template.json +++ /dev/null @@ -1,88 +0,0 @@ -{ - "provisioners": [ - { - "type": "shell", - "scripts": [ - "scripts/vagrant.sh", - "scripts/sshd.sh", - "scripts/cleanup.sh", - "scripts/minimize.sh" - ], - "override": { - "virtualbox": { - "execute_command": "echo 'vagrant'|sudo -S sh '{{.Path}}'" - }, - "vmware": { - "execute_command": "echo 'vagrant'|sudo -S sh '{{.Path}}'" - } - } - } - ], - "builders": [ - { - "type": "virtualbox", - "boot_command": [ - "linux text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/ks.cfg<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": 40960, - "guest_os_type": "RedHat_64", - "http_directory": "http", - "iso_checksum": "bb795391846e76a7071893cbdf6163c3", - "iso_checksum_type": "md5", - "iso_url": "http://mirror.stanford.edu/yum/pub/centos/5.9/isos/x86_64/CentOS-5.9-x86_64-bin-DVD-1of2.iso", - "ssh_username": "vagrant", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_wait_timeout": "10000s", - "shutdown_command": "echo '/sbin/halt -h -p' > shutdown.sh; echo 'vagrant'|sudo -S sh 'shutdown.sh'", - "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", - "virtualbox_version_file": ".vbox_version", - "vboxmanage": [ - [ - "modifyvm", - "{{.Name}}", - "--memory", - "384" - ], - [ - "modifyvm", - "{{.Name}}", - "--cpus", - "1" - ] - ], - "iso_md5": "bb795391846e76a7071893cbdf6163c3" - }, - { - "type": "vmware", - "boot_command": [ - "linux text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/ks.cfg<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": 40960, - "guest_os_type": "RedHat_64", - "http_directory": "http", - "iso_checksum": "bb795391846e76a7071893cbdf6163c3", - "iso_checksum_type": "md5", - "iso_url": "http://mirror.stanford.edu/yum/pub/centos/5.9/isos/x86_64/CentOS-5.9-x86_64-bin-DVD-1of2.iso", - "ssh_username": "vagrant", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_wait_timeout": "10000s", - "shutdown_command": "echo '/sbin/halt -h -p' > shutdown.sh; echo 'vagrant'|sudo -S sh 'shutdown.sh'", - "vmx_data": { - "memsize": "384", - "numvcpus": "1", - "cpuid.coresPerSocket": "1" - }, - "iso_md5": "bb795391846e76a7071893cbdf6163c3" - } - ], - "post-provisioner": [ - { - "type": "vagrant", - "output": "centos-5.9-{{.Provisioner}}.box" - } - ] -} \ No newline at end of file diff --git a/templates/centos-6.0/http/ks.cfg b/templates/centos-6.0/http/ks.cfg deleted file mode 100644 index e00fd5a2a..000000000 --- a/templates/centos-6.0/http/ks.cfg +++ /dev/null @@ -1,39 +0,0 @@ -install -cdrom -lang en_US.UTF-8 -keyboard us -network --bootproto=dhcp -rootpw --iscrypted $1$damlkd,f$UC/u5pUts5QiU3ow.CSso/ -firewall --disabled -authconfig --enableshadow --passalgo=sha512 -selinux --disabled -timezone UTC -bootloader --location=mbr -text -skipx -zerombr -clearpart --all --initlabel -autopart -auth --useshadow --enablemd5 -firstboot --disabled -reboot - -%packages --ignoremissing -@Base -@Core -@Development Tools -openssl-devel -readline-devel -zlib-devel -kernel-devel - -%post -# update root certs -wget -O/etc/pki/tls/certs/ca-bundle.crt http://curl.haxx.se/ca/cacert.pem -# vagrant -groupadd vagrant -g 999 -useradd vagrant -g vagrant -G wheel -u 900 -echo "vagrant" | passwd --stdin vagrant -# sudo -echo "vagrant ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers -sed -i "s/^.*requiretty/#Defaults requiretty/" /etc/sudoers diff --git a/templates/centos-6.0/scripts/cleanup.sh b/templates/centos-6.0/scripts/cleanup.sh deleted file mode 100644 index 922c3d6b5..000000000 --- a/templates/centos-6.0/scripts/cleanup.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/bash -eux -yum -y erase gtk2 libX11 hicolor-icon-theme avahi freetype bitstream-vera-fonts -yum -y clean all -rm -rf VBoxGuestAdditions_*.iso VBoxGuestAdditions_*.iso.? -rm -f /tmp/chef*rpm diff --git a/templates/centos-6.0/scripts/minimize.sh b/templates/centos-6.0/scripts/minimize.sh deleted file mode 100644 index 3846a1d65..000000000 --- a/templates/centos-6.0/scripts/minimize.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash -eux - -dd if=/dev/zero of=/EMPTY bs=1M -rm -f /EMPTY diff --git a/templates/centos-6.0/scripts/sshd.sh b/templates/centos-6.0/scripts/sshd.sh deleted file mode 100644 index c6e4f20a6..000000000 --- a/templates/centos-6.0/scripts/sshd.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash -eux - -echo "UseDNS no" >> /etc/ssh/sshd_config diff --git a/templates/centos-6.0/scripts/vagrant.sh b/templates/centos-6.0/scripts/vagrant.sh deleted file mode 100644 index 72dd2f444..000000000 --- a/templates/centos-6.0/scripts/vagrant.sh +++ /dev/null @@ -1,33 +0,0 @@ -#!/bin/bash -eux - -if [ -f /home/vagrant/.vbox_version ]; then - mkdir /tmp/vbox - VER=$(cat /home/vagrant/.vbox_version) - mount -o loop VBoxGuestAdditions_$VER.iso /tmp/vbox - sh /tmp/vbox/VBoxLinuxAdditions.run - umount /tmp/vbox - rmdir /tmp/vbox - rm *.iso -fi - -if [ -f /home/vagrant/.vmfusion_version ]; then - #Set Linux-specific paths and ISO filename - home_dir="/home/vagrant" - iso_name="linux.iso" - mount_point="/tmp/vmware-tools" - #Run install, unmount ISO and remove it - mkdir ${mount_point} - cd ${home_dir} - /bin/mount -o loop ${iso_name} ${mount_point} - tar zxf ${mount_point}/*.tar.gz && cd vmware-tools-distrib && ./vmware-install.pl --default - /bin/umount ${mount_point} - /bin/rm -rf ${home_dir}/${iso_name} ${home_dir}/vmware-tools-distrib - rmdir ${mount_point} -fi - -mkdir /home/vagrant/.ssh -wget --no-check-certificate \ - 'https://github.com/mitchellh/vagrant/raw/master/keys/vagrant.pub' \ - -O /home/vagrant/.ssh/authorized_keys -chown -R vagrant /home/vagrant/.ssh -chmod -R go-rwsx /home/vagrant/.ssh diff --git a/templates/centos-6.0/template.json b/templates/centos-6.0/template.json deleted file mode 100644 index 8400917c8..000000000 --- a/templates/centos-6.0/template.json +++ /dev/null @@ -1,88 +0,0 @@ -{ - "provisioners": [ - { - "type": "shell", - "scripts": [ - "scripts/vagrant.sh", - "scripts/sshd.sh", - "scripts/cleanup.sh", - "scripts/minimize.sh" - ], - "override": { - "virtualbox": { - "execute_command": "echo 'vagrant'|sudo -S sh '{{.Path}}'" - }, - "vmware": { - "execute_command": "echo 'vagrant'|sudo -S sh '{{.Path}}'" - } - } - } - ], - "builders": [ - { - "type": "virtualbox", - "boot_command": [ - "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/ks.cfg<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": 40960, - "guest_os_type": "RedHat_64", - "http_directory": "http", - "iso_checksum": "7c148e0a1b330186adef66ee3e2d433d", - "iso_checksum_type": "md5", - "iso_url": "http://vault.centos.org/6.0/isos/x86_64/CentOS-6.0-x86_64-bin-DVD1.iso", - "ssh_username": "vagrant", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_wait_timeout": "10000s", - "shutdown_command": "echo '/sbin/halt -h -p' > shutdown.sh; echo 'vagrant'|sudo -S sh 'shutdown.sh'", - "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", - "virtualbox_version_file": ".vbox_version", - "vboxmanage": [ - [ - "modifyvm", - "{{.Name}}", - "--memory", - "384" - ], - [ - "modifyvm", - "{{.Name}}", - "--cpus", - "1" - ] - ], - "iso_md5": "7c148e0a1b330186adef66ee3e2d433d" - }, - { - "type": "vmware", - "boot_command": [ - "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/ks.cfg<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": 40960, - "guest_os_type": "centos-64", - "http_directory": "http", - "iso_checksum": "7c148e0a1b330186adef66ee3e2d433d", - "iso_checksum_type": "md5", - "iso_url": "http://vault.centos.org/6.0/isos/x86_64/CentOS-6.0-x86_64-bin-DVD1.iso", - "ssh_username": "vagrant", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_wait_timeout": "10000s", - "shutdown_command": "echo '/sbin/halt -h -p' > shutdown.sh; echo 'vagrant'|sudo -S sh 'shutdown.sh'", - "vmx_data": { - "memsize": "384", - "numvcpus": "1", - "cpuid.coresPerSocket": "1" - }, - "iso_md5": "7c148e0a1b330186adef66ee3e2d433d" - } - ], - "post-provisioner": [ - { - "type": "vagrant", - "output": "centos-6.0-{{.Provisioner}}.box" - } - ] -} \ No newline at end of file diff --git a/templates/centos-6.2-i386/http/ks.cfg b/templates/centos-6.2-i386/http/ks.cfg deleted file mode 100644 index e00fd5a2a..000000000 --- a/templates/centos-6.2-i386/http/ks.cfg +++ /dev/null @@ -1,39 +0,0 @@ -install -cdrom -lang en_US.UTF-8 -keyboard us -network --bootproto=dhcp -rootpw --iscrypted $1$damlkd,f$UC/u5pUts5QiU3ow.CSso/ -firewall --disabled -authconfig --enableshadow --passalgo=sha512 -selinux --disabled -timezone UTC -bootloader --location=mbr -text -skipx -zerombr -clearpart --all --initlabel -autopart -auth --useshadow --enablemd5 -firstboot --disabled -reboot - -%packages --ignoremissing -@Base -@Core -@Development Tools -openssl-devel -readline-devel -zlib-devel -kernel-devel - -%post -# update root certs -wget -O/etc/pki/tls/certs/ca-bundle.crt http://curl.haxx.se/ca/cacert.pem -# vagrant -groupadd vagrant -g 999 -useradd vagrant -g vagrant -G wheel -u 900 -echo "vagrant" | passwd --stdin vagrant -# sudo -echo "vagrant ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers -sed -i "s/^.*requiretty/#Defaults requiretty/" /etc/sudoers diff --git a/templates/centos-6.2-i386/scripts/cleanup.sh b/templates/centos-6.2-i386/scripts/cleanup.sh deleted file mode 100644 index 922c3d6b5..000000000 --- a/templates/centos-6.2-i386/scripts/cleanup.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/bash -eux -yum -y erase gtk2 libX11 hicolor-icon-theme avahi freetype bitstream-vera-fonts -yum -y clean all -rm -rf VBoxGuestAdditions_*.iso VBoxGuestAdditions_*.iso.? -rm -f /tmp/chef*rpm diff --git a/templates/centos-6.2-i386/scripts/minimize.sh b/templates/centos-6.2-i386/scripts/minimize.sh deleted file mode 100644 index 3846a1d65..000000000 --- a/templates/centos-6.2-i386/scripts/minimize.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash -eux - -dd if=/dev/zero of=/EMPTY bs=1M -rm -f /EMPTY diff --git a/templates/centos-6.2-i386/scripts/sshd.sh b/templates/centos-6.2-i386/scripts/sshd.sh deleted file mode 100644 index c6e4f20a6..000000000 --- a/templates/centos-6.2-i386/scripts/sshd.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash -eux - -echo "UseDNS no" >> /etc/ssh/sshd_config diff --git a/templates/centos-6.2-i386/scripts/vagrant.sh b/templates/centos-6.2-i386/scripts/vagrant.sh deleted file mode 100644 index 72dd2f444..000000000 --- a/templates/centos-6.2-i386/scripts/vagrant.sh +++ /dev/null @@ -1,33 +0,0 @@ -#!/bin/bash -eux - -if [ -f /home/vagrant/.vbox_version ]; then - mkdir /tmp/vbox - VER=$(cat /home/vagrant/.vbox_version) - mount -o loop VBoxGuestAdditions_$VER.iso /tmp/vbox - sh /tmp/vbox/VBoxLinuxAdditions.run - umount /tmp/vbox - rmdir /tmp/vbox - rm *.iso -fi - -if [ -f /home/vagrant/.vmfusion_version ]; then - #Set Linux-specific paths and ISO filename - home_dir="/home/vagrant" - iso_name="linux.iso" - mount_point="/tmp/vmware-tools" - #Run install, unmount ISO and remove it - mkdir ${mount_point} - cd ${home_dir} - /bin/mount -o loop ${iso_name} ${mount_point} - tar zxf ${mount_point}/*.tar.gz && cd vmware-tools-distrib && ./vmware-install.pl --default - /bin/umount ${mount_point} - /bin/rm -rf ${home_dir}/${iso_name} ${home_dir}/vmware-tools-distrib - rmdir ${mount_point} -fi - -mkdir /home/vagrant/.ssh -wget --no-check-certificate \ - 'https://github.com/mitchellh/vagrant/raw/master/keys/vagrant.pub' \ - -O /home/vagrant/.ssh/authorized_keys -chown -R vagrant /home/vagrant/.ssh -chmod -R go-rwsx /home/vagrant/.ssh diff --git a/templates/centos-6.2-i386/template.json b/templates/centos-6.2-i386/template.json deleted file mode 100644 index 2e29da1ab..000000000 --- a/templates/centos-6.2-i386/template.json +++ /dev/null @@ -1,88 +0,0 @@ -{ - "provisioners": [ - { - "type": "shell", - "scripts": [ - "scripts/vagrant.sh", - "scripts/sshd.sh", - "scripts/cleanup.sh", - "scripts/minimize.sh" - ], - "override": { - "virtualbox": { - "execute_command": "echo 'vagrant'|sudo -S sh '{{.Path}}'" - }, - "vmware": { - "execute_command": "echo 'vagrant'|sudo -S sh '{{.Path}}'" - } - } - } - ], - "builders": [ - { - "type": "virtualbox", - "boot_command": [ - "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/ks.cfg<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": 40960, - "guest_os_type": "RedHat", - "http_directory": "http", - "iso_checksum": "8c976288ed53dc97439f7ab5854f2648", - "iso_checksum_type": "md5", - "iso_url": "http://vault.centos.org/6.2/isos/i386/CentOS-6.2-i386-bin-DVD1.iso", - "ssh_username": "vagrant", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_wait_timeout": "10000s", - "shutdown_command": "echo '/sbin/halt -h -p' > shutdown.sh; echo 'vagrant'|sudo -S sh 'shutdown.sh'", - "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", - "virtualbox_version_file": ".vbox_version", - "vboxmanage": [ - [ - "modifyvm", - "{{.Name}}", - "--memory", - "480" - ], - [ - "modifyvm", - "{{.Name}}", - "--cpus", - "1" - ] - ], - "iso_md5": "8c976288ed53dc97439f7ab5854f2648" - }, - { - "type": "vmware", - "boot_command": [ - "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/ks.cfg<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": 40960, - "guest_os_type": "centos", - "http_directory": "http", - "iso_checksum": "8c976288ed53dc97439f7ab5854f2648", - "iso_checksum_type": "md5", - "iso_url": "http://vault.centos.org/6.2/isos/i386/CentOS-6.2-i386-bin-DVD1.iso", - "ssh_username": "vagrant", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_wait_timeout": "10000s", - "shutdown_command": "echo '/sbin/halt -h -p' > shutdown.sh; echo 'vagrant'|sudo -S sh 'shutdown.sh'", - "vmx_data": { - "memsize": "480", - "numvcpus": "1", - "cpuid.coresPerSocket": "1" - }, - "iso_md5": "8c976288ed53dc97439f7ab5854f2648" - } - ], - "post-provisioner": [ - { - "type": "vagrant", - "output": "centos-6.2-i386-{{.Provisioner}}.box" - } - ] -} \ No newline at end of file diff --git a/templates/centos-6.2/http/ks.cfg b/templates/centos-6.2/http/ks.cfg deleted file mode 100644 index e00fd5a2a..000000000 --- a/templates/centos-6.2/http/ks.cfg +++ /dev/null @@ -1,39 +0,0 @@ -install -cdrom -lang en_US.UTF-8 -keyboard us -network --bootproto=dhcp -rootpw --iscrypted $1$damlkd,f$UC/u5pUts5QiU3ow.CSso/ -firewall --disabled -authconfig --enableshadow --passalgo=sha512 -selinux --disabled -timezone UTC -bootloader --location=mbr -text -skipx -zerombr -clearpart --all --initlabel -autopart -auth --useshadow --enablemd5 -firstboot --disabled -reboot - -%packages --ignoremissing -@Base -@Core -@Development Tools -openssl-devel -readline-devel -zlib-devel -kernel-devel - -%post -# update root certs -wget -O/etc/pki/tls/certs/ca-bundle.crt http://curl.haxx.se/ca/cacert.pem -# vagrant -groupadd vagrant -g 999 -useradd vagrant -g vagrant -G wheel -u 900 -echo "vagrant" | passwd --stdin vagrant -# sudo -echo "vagrant ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers -sed -i "s/^.*requiretty/#Defaults requiretty/" /etc/sudoers diff --git a/templates/centos-6.2/scripts/cleanup.sh b/templates/centos-6.2/scripts/cleanup.sh deleted file mode 100644 index 922c3d6b5..000000000 --- a/templates/centos-6.2/scripts/cleanup.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/bash -eux -yum -y erase gtk2 libX11 hicolor-icon-theme avahi freetype bitstream-vera-fonts -yum -y clean all -rm -rf VBoxGuestAdditions_*.iso VBoxGuestAdditions_*.iso.? -rm -f /tmp/chef*rpm diff --git a/templates/centos-6.2/scripts/minimize.sh b/templates/centos-6.2/scripts/minimize.sh deleted file mode 100644 index 3846a1d65..000000000 --- a/templates/centos-6.2/scripts/minimize.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash -eux - -dd if=/dev/zero of=/EMPTY bs=1M -rm -f /EMPTY diff --git a/templates/centos-6.2/scripts/sshd.sh b/templates/centos-6.2/scripts/sshd.sh deleted file mode 100644 index c6e4f20a6..000000000 --- a/templates/centos-6.2/scripts/sshd.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash -eux - -echo "UseDNS no" >> /etc/ssh/sshd_config diff --git a/templates/centos-6.2/scripts/vagrant.sh b/templates/centos-6.2/scripts/vagrant.sh deleted file mode 100644 index 72dd2f444..000000000 --- a/templates/centos-6.2/scripts/vagrant.sh +++ /dev/null @@ -1,33 +0,0 @@ -#!/bin/bash -eux - -if [ -f /home/vagrant/.vbox_version ]; then - mkdir /tmp/vbox - VER=$(cat /home/vagrant/.vbox_version) - mount -o loop VBoxGuestAdditions_$VER.iso /tmp/vbox - sh /tmp/vbox/VBoxLinuxAdditions.run - umount /tmp/vbox - rmdir /tmp/vbox - rm *.iso -fi - -if [ -f /home/vagrant/.vmfusion_version ]; then - #Set Linux-specific paths and ISO filename - home_dir="/home/vagrant" - iso_name="linux.iso" - mount_point="/tmp/vmware-tools" - #Run install, unmount ISO and remove it - mkdir ${mount_point} - cd ${home_dir} - /bin/mount -o loop ${iso_name} ${mount_point} - tar zxf ${mount_point}/*.tar.gz && cd vmware-tools-distrib && ./vmware-install.pl --default - /bin/umount ${mount_point} - /bin/rm -rf ${home_dir}/${iso_name} ${home_dir}/vmware-tools-distrib - rmdir ${mount_point} -fi - -mkdir /home/vagrant/.ssh -wget --no-check-certificate \ - 'https://github.com/mitchellh/vagrant/raw/master/keys/vagrant.pub' \ - -O /home/vagrant/.ssh/authorized_keys -chown -R vagrant /home/vagrant/.ssh -chmod -R go-rwsx /home/vagrant/.ssh diff --git a/templates/centos-6.2/template.json b/templates/centos-6.2/template.json deleted file mode 100644 index d26f0be6a..000000000 --- a/templates/centos-6.2/template.json +++ /dev/null @@ -1,88 +0,0 @@ -{ - "provisioners": [ - { - "type": "shell", - "scripts": [ - "scripts/vagrant.sh", - "scripts/sshd.sh", - "scripts/cleanup.sh", - "scripts/minimize.sh" - ], - "override": { - "virtualbox": { - "execute_command": "echo 'vagrant'|sudo -S sh '{{.Path}}'" - }, - "vmware": { - "execute_command": "echo 'vagrant'|sudo -S sh '{{.Path}}'" - } - } - } - ], - "builders": [ - { - "type": "virtualbox", - "boot_command": [ - "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/ks.cfg<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": 40960, - "guest_os_type": "RedHat_64", - "http_directory": "http", - "iso_checksum": "26fdf8c5a787a674f3219a3554b131ca", - "iso_checksum_type": "md5", - "iso_url": "http://vault.centos.org/6.2/isos/x86_64/CentOS-6.2-x86_64-bin-DVD1.iso", - "ssh_username": "vagrant", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_wait_timeout": "10000s", - "shutdown_command": "echo '/sbin/halt -h -p' > shutdown.sh; echo 'vagrant'|sudo -S sh 'shutdown.sh'", - "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", - "virtualbox_version_file": ".vbox_version", - "vboxmanage": [ - [ - "modifyvm", - "{{.Name}}", - "--memory", - "480" - ], - [ - "modifyvm", - "{{.Name}}", - "--cpus", - "1" - ] - ], - "iso_md5": "26fdf8c5a787a674f3219a3554b131ca" - }, - { - "type": "vmware", - "boot_command": [ - "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/ks.cfg<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": 40960, - "guest_os_type": "centos-64", - "http_directory": "http", - "iso_checksum": "26fdf8c5a787a674f3219a3554b131ca", - "iso_checksum_type": "md5", - "iso_url": "http://vault.centos.org/6.2/isos/x86_64/CentOS-6.2-x86_64-bin-DVD1.iso", - "ssh_username": "vagrant", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_wait_timeout": "10000s", - "shutdown_command": "echo '/sbin/halt -h -p' > shutdown.sh; echo 'vagrant'|sudo -S sh 'shutdown.sh'", - "vmx_data": { - "memsize": "480", - "numvcpus": "1", - "cpuid.coresPerSocket": "1" - }, - "iso_md5": "26fdf8c5a787a674f3219a3554b131ca" - } - ], - "post-provisioner": [ - { - "type": "vagrant", - "output": "centos-6.2-{{.Provisioner}}.box" - } - ] -} \ No newline at end of file diff --git a/templates/centos-6.3-i386/http/ks.cfg b/templates/centos-6.3-i386/http/ks.cfg deleted file mode 100644 index e00fd5a2a..000000000 --- a/templates/centos-6.3-i386/http/ks.cfg +++ /dev/null @@ -1,39 +0,0 @@ -install -cdrom -lang en_US.UTF-8 -keyboard us -network --bootproto=dhcp -rootpw --iscrypted $1$damlkd,f$UC/u5pUts5QiU3ow.CSso/ -firewall --disabled -authconfig --enableshadow --passalgo=sha512 -selinux --disabled -timezone UTC -bootloader --location=mbr -text -skipx -zerombr -clearpart --all --initlabel -autopart -auth --useshadow --enablemd5 -firstboot --disabled -reboot - -%packages --ignoremissing -@Base -@Core -@Development Tools -openssl-devel -readline-devel -zlib-devel -kernel-devel - -%post -# update root certs -wget -O/etc/pki/tls/certs/ca-bundle.crt http://curl.haxx.se/ca/cacert.pem -# vagrant -groupadd vagrant -g 999 -useradd vagrant -g vagrant -G wheel -u 900 -echo "vagrant" | passwd --stdin vagrant -# sudo -echo "vagrant ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers -sed -i "s/^.*requiretty/#Defaults requiretty/" /etc/sudoers diff --git a/templates/centos-6.3-i386/scripts/cleanup.sh b/templates/centos-6.3-i386/scripts/cleanup.sh deleted file mode 100644 index 922c3d6b5..000000000 --- a/templates/centos-6.3-i386/scripts/cleanup.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/bash -eux -yum -y erase gtk2 libX11 hicolor-icon-theme avahi freetype bitstream-vera-fonts -yum -y clean all -rm -rf VBoxGuestAdditions_*.iso VBoxGuestAdditions_*.iso.? -rm -f /tmp/chef*rpm diff --git a/templates/centos-6.3-i386/scripts/minimize.sh b/templates/centos-6.3-i386/scripts/minimize.sh deleted file mode 100644 index 3846a1d65..000000000 --- a/templates/centos-6.3-i386/scripts/minimize.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash -eux - -dd if=/dev/zero of=/EMPTY bs=1M -rm -f /EMPTY diff --git a/templates/centos-6.3-i386/scripts/sshd.sh b/templates/centos-6.3-i386/scripts/sshd.sh deleted file mode 100644 index c6e4f20a6..000000000 --- a/templates/centos-6.3-i386/scripts/sshd.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash -eux - -echo "UseDNS no" >> /etc/ssh/sshd_config diff --git a/templates/centos-6.3-i386/scripts/vagrant.sh b/templates/centos-6.3-i386/scripts/vagrant.sh deleted file mode 100644 index 72dd2f444..000000000 --- a/templates/centos-6.3-i386/scripts/vagrant.sh +++ /dev/null @@ -1,33 +0,0 @@ -#!/bin/bash -eux - -if [ -f /home/vagrant/.vbox_version ]; then - mkdir /tmp/vbox - VER=$(cat /home/vagrant/.vbox_version) - mount -o loop VBoxGuestAdditions_$VER.iso /tmp/vbox - sh /tmp/vbox/VBoxLinuxAdditions.run - umount /tmp/vbox - rmdir /tmp/vbox - rm *.iso -fi - -if [ -f /home/vagrant/.vmfusion_version ]; then - #Set Linux-specific paths and ISO filename - home_dir="/home/vagrant" - iso_name="linux.iso" - mount_point="/tmp/vmware-tools" - #Run install, unmount ISO and remove it - mkdir ${mount_point} - cd ${home_dir} - /bin/mount -o loop ${iso_name} ${mount_point} - tar zxf ${mount_point}/*.tar.gz && cd vmware-tools-distrib && ./vmware-install.pl --default - /bin/umount ${mount_point} - /bin/rm -rf ${home_dir}/${iso_name} ${home_dir}/vmware-tools-distrib - rmdir ${mount_point} -fi - -mkdir /home/vagrant/.ssh -wget --no-check-certificate \ - 'https://github.com/mitchellh/vagrant/raw/master/keys/vagrant.pub' \ - -O /home/vagrant/.ssh/authorized_keys -chown -R vagrant /home/vagrant/.ssh -chmod -R go-rwsx /home/vagrant/.ssh diff --git a/templates/centos-6.3-i386/template.json b/templates/centos-6.3-i386/template.json deleted file mode 100644 index 438b27c8e..000000000 --- a/templates/centos-6.3-i386/template.json +++ /dev/null @@ -1,88 +0,0 @@ -{ - "provisioners": [ - { - "type": "shell", - "scripts": [ - "scripts/vagrant.sh", - "scripts/sshd.sh", - "scripts/cleanup.sh", - "scripts/minimize.sh" - ], - "override": { - "virtualbox": { - "execute_command": "echo 'vagrant'|sudo -S sh '{{.Path}}'" - }, - "vmware": { - "execute_command": "echo 'vagrant'|sudo -S sh '{{.Path}}'" - } - } - } - ], - "builders": [ - { - "type": "virtualbox", - "boot_command": [ - "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/ks.cfg<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": 40960, - "guest_os_type": "RedHat", - "http_directory": "http", - "iso_checksum": "0285160d8ba3cfc720ea55e98e464eac", - "iso_checksum_type": "md5", - "iso_url": "http://mirrors.kernel.org/centos/6.3/isos/i386/CentOS-6.3-i386-bin-DVD1.iso", - "ssh_username": "vagrant", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_wait_timeout": "10000s", - "shutdown_command": "echo '/sbin/halt -h -p' > shutdown.sh; echo 'vagrant'|sudo -S sh 'shutdown.sh'", - "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", - "virtualbox_version_file": ".vbox_version", - "vboxmanage": [ - [ - "modifyvm", - "{{.Name}}", - "--memory", - "480" - ], - [ - "modifyvm", - "{{.Name}}", - "--cpus", - "1" - ] - ], - "iso_md5": "0285160d8ba3cfc720ea55e98e464eac" - }, - { - "type": "vmware", - "boot_command": [ - "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/ks.cfg<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": 40960, - "guest_os_type": "centos", - "http_directory": "http", - "iso_checksum": "0285160d8ba3cfc720ea55e98e464eac", - "iso_checksum_type": "md5", - "iso_url": "http://mirrors.kernel.org/centos/6.3/isos/i386/CentOS-6.3-i386-bin-DVD1.iso", - "ssh_username": "vagrant", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_wait_timeout": "10000s", - "shutdown_command": "echo '/sbin/halt -h -p' > shutdown.sh; echo 'vagrant'|sudo -S sh 'shutdown.sh'", - "vmx_data": { - "memsize": "480", - "numvcpus": "1", - "cpuid.coresPerSocket": "1" - }, - "iso_md5": "0285160d8ba3cfc720ea55e98e464eac" - } - ], - "post-provisioner": [ - { - "type": "vagrant", - "output": "centos-6.3-i386-{{.Provisioner}}.box" - } - ] -} \ No newline at end of file diff --git a/templates/centos-6.3/http/ks.cfg b/templates/centos-6.3/http/ks.cfg deleted file mode 100644 index e00fd5a2a..000000000 --- a/templates/centos-6.3/http/ks.cfg +++ /dev/null @@ -1,39 +0,0 @@ -install -cdrom -lang en_US.UTF-8 -keyboard us -network --bootproto=dhcp -rootpw --iscrypted $1$damlkd,f$UC/u5pUts5QiU3ow.CSso/ -firewall --disabled -authconfig --enableshadow --passalgo=sha512 -selinux --disabled -timezone UTC -bootloader --location=mbr -text -skipx -zerombr -clearpart --all --initlabel -autopart -auth --useshadow --enablemd5 -firstboot --disabled -reboot - -%packages --ignoremissing -@Base -@Core -@Development Tools -openssl-devel -readline-devel -zlib-devel -kernel-devel - -%post -# update root certs -wget -O/etc/pki/tls/certs/ca-bundle.crt http://curl.haxx.se/ca/cacert.pem -# vagrant -groupadd vagrant -g 999 -useradd vagrant -g vagrant -G wheel -u 900 -echo "vagrant" | passwd --stdin vagrant -# sudo -echo "vagrant ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers -sed -i "s/^.*requiretty/#Defaults requiretty/" /etc/sudoers diff --git a/templates/centos-6.3/scripts/cleanup.sh b/templates/centos-6.3/scripts/cleanup.sh deleted file mode 100644 index 922c3d6b5..000000000 --- a/templates/centos-6.3/scripts/cleanup.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/bash -eux -yum -y erase gtk2 libX11 hicolor-icon-theme avahi freetype bitstream-vera-fonts -yum -y clean all -rm -rf VBoxGuestAdditions_*.iso VBoxGuestAdditions_*.iso.? -rm -f /tmp/chef*rpm diff --git a/templates/centos-6.3/scripts/minimize.sh b/templates/centos-6.3/scripts/minimize.sh deleted file mode 100644 index 3846a1d65..000000000 --- a/templates/centos-6.3/scripts/minimize.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash -eux - -dd if=/dev/zero of=/EMPTY bs=1M -rm -f /EMPTY diff --git a/templates/centos-6.3/scripts/sshd.sh b/templates/centos-6.3/scripts/sshd.sh deleted file mode 100644 index c6e4f20a6..000000000 --- a/templates/centos-6.3/scripts/sshd.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash -eux - -echo "UseDNS no" >> /etc/ssh/sshd_config diff --git a/templates/centos-6.3/scripts/vagrant.sh b/templates/centos-6.3/scripts/vagrant.sh deleted file mode 100644 index 72dd2f444..000000000 --- a/templates/centos-6.3/scripts/vagrant.sh +++ /dev/null @@ -1,33 +0,0 @@ -#!/bin/bash -eux - -if [ -f /home/vagrant/.vbox_version ]; then - mkdir /tmp/vbox - VER=$(cat /home/vagrant/.vbox_version) - mount -o loop VBoxGuestAdditions_$VER.iso /tmp/vbox - sh /tmp/vbox/VBoxLinuxAdditions.run - umount /tmp/vbox - rmdir /tmp/vbox - rm *.iso -fi - -if [ -f /home/vagrant/.vmfusion_version ]; then - #Set Linux-specific paths and ISO filename - home_dir="/home/vagrant" - iso_name="linux.iso" - mount_point="/tmp/vmware-tools" - #Run install, unmount ISO and remove it - mkdir ${mount_point} - cd ${home_dir} - /bin/mount -o loop ${iso_name} ${mount_point} - tar zxf ${mount_point}/*.tar.gz && cd vmware-tools-distrib && ./vmware-install.pl --default - /bin/umount ${mount_point} - /bin/rm -rf ${home_dir}/${iso_name} ${home_dir}/vmware-tools-distrib - rmdir ${mount_point} -fi - -mkdir /home/vagrant/.ssh -wget --no-check-certificate \ - 'https://github.com/mitchellh/vagrant/raw/master/keys/vagrant.pub' \ - -O /home/vagrant/.ssh/authorized_keys -chown -R vagrant /home/vagrant/.ssh -chmod -R go-rwsx /home/vagrant/.ssh diff --git a/templates/centos-6.3/template.json b/templates/centos-6.3/template.json deleted file mode 100644 index e1fd6a247..000000000 --- a/templates/centos-6.3/template.json +++ /dev/null @@ -1,88 +0,0 @@ -{ - "provisioners": [ - { - "type": "shell", - "scripts": [ - "scripts/vagrant.sh", - "scripts/sshd.sh", - "scripts/cleanup.sh", - "scripts/minimize.sh" - ], - "override": { - "virtualbox": { - "execute_command": "echo 'vagrant'|sudo -S sh '{{.Path}}'" - }, - "vmware": { - "execute_command": "echo 'vagrant'|sudo -S sh '{{.Path}}'" - } - } - } - ], - "builders": [ - { - "type": "virtualbox", - "boot_command": [ - "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/ks.cfg<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": 40960, - "guest_os_type": "RedHat_64", - "http_directory": "http", - "iso_checksum": "a991defc0a602d04f064c43290df0131", - "iso_checksum_type": "md5", - "iso_url": "http://mirrors.kernel.org/centos/6.3/isos/x86_64/CentOS-6.3-x86_64-bin-DVD1.iso", - "ssh_username": "vagrant", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_wait_timeout": "10000s", - "shutdown_command": "echo '/sbin/halt -h -p' > shutdown.sh; echo 'vagrant'|sudo -S sh 'shutdown.sh'", - "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", - "virtualbox_version_file": ".vbox_version", - "vboxmanage": [ - [ - "modifyvm", - "{{.Name}}", - "--memory", - "480" - ], - [ - "modifyvm", - "{{.Name}}", - "--cpus", - "1" - ] - ], - "iso_md5": "a991defc0a602d04f064c43290df0131" - }, - { - "type": "vmware", - "boot_command": [ - "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/ks.cfg<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": 40960, - "guest_os_type": "centos-64", - "http_directory": "http", - "iso_checksum": "a991defc0a602d04f064c43290df0131", - "iso_checksum_type": "md5", - "iso_url": "http://mirrors.kernel.org/centos/6.3/isos/x86_64/CentOS-6.3-x86_64-bin-DVD1.iso", - "ssh_username": "vagrant", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_wait_timeout": "10000s", - "shutdown_command": "echo '/sbin/halt -h -p' > shutdown.sh; echo 'vagrant'|sudo -S sh 'shutdown.sh'", - "vmx_data": { - "memsize": "480", - "numvcpus": "1", - "cpuid.coresPerSocket": "1" - }, - "iso_md5": "a991defc0a602d04f064c43290df0131" - } - ], - "post-provisioner": [ - { - "type": "vagrant", - "output": "centos-6.3-{{.Provisioner}}.box" - } - ] -} \ No newline at end of file diff --git a/templates/centos-6.4-i386/http/ks.cfg b/templates/centos-6.4-i386/http/ks.cfg deleted file mode 100644 index e00fd5a2a..000000000 --- a/templates/centos-6.4-i386/http/ks.cfg +++ /dev/null @@ -1,39 +0,0 @@ -install -cdrom -lang en_US.UTF-8 -keyboard us -network --bootproto=dhcp -rootpw --iscrypted $1$damlkd,f$UC/u5pUts5QiU3ow.CSso/ -firewall --disabled -authconfig --enableshadow --passalgo=sha512 -selinux --disabled -timezone UTC -bootloader --location=mbr -text -skipx -zerombr -clearpart --all --initlabel -autopart -auth --useshadow --enablemd5 -firstboot --disabled -reboot - -%packages --ignoremissing -@Base -@Core -@Development Tools -openssl-devel -readline-devel -zlib-devel -kernel-devel - -%post -# update root certs -wget -O/etc/pki/tls/certs/ca-bundle.crt http://curl.haxx.se/ca/cacert.pem -# vagrant -groupadd vagrant -g 999 -useradd vagrant -g vagrant -G wheel -u 900 -echo "vagrant" | passwd --stdin vagrant -# sudo -echo "vagrant ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers -sed -i "s/^.*requiretty/#Defaults requiretty/" /etc/sudoers diff --git a/templates/centos-6.4-i386/scripts/cleanup.sh b/templates/centos-6.4-i386/scripts/cleanup.sh deleted file mode 100644 index 922c3d6b5..000000000 --- a/templates/centos-6.4-i386/scripts/cleanup.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/bash -eux -yum -y erase gtk2 libX11 hicolor-icon-theme avahi freetype bitstream-vera-fonts -yum -y clean all -rm -rf VBoxGuestAdditions_*.iso VBoxGuestAdditions_*.iso.? -rm -f /tmp/chef*rpm diff --git a/templates/centos-6.4-i386/scripts/minimize.sh b/templates/centos-6.4-i386/scripts/minimize.sh deleted file mode 100644 index 3846a1d65..000000000 --- a/templates/centos-6.4-i386/scripts/minimize.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash -eux - -dd if=/dev/zero of=/EMPTY bs=1M -rm -f /EMPTY diff --git a/templates/centos-6.4-i386/scripts/sshd.sh b/templates/centos-6.4-i386/scripts/sshd.sh deleted file mode 100644 index c6e4f20a6..000000000 --- a/templates/centos-6.4-i386/scripts/sshd.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash -eux - -echo "UseDNS no" >> /etc/ssh/sshd_config diff --git a/templates/centos-6.4-i386/scripts/vagrant.sh b/templates/centos-6.4-i386/scripts/vagrant.sh deleted file mode 100644 index 72dd2f444..000000000 --- a/templates/centos-6.4-i386/scripts/vagrant.sh +++ /dev/null @@ -1,33 +0,0 @@ -#!/bin/bash -eux - -if [ -f /home/vagrant/.vbox_version ]; then - mkdir /tmp/vbox - VER=$(cat /home/vagrant/.vbox_version) - mount -o loop VBoxGuestAdditions_$VER.iso /tmp/vbox - sh /tmp/vbox/VBoxLinuxAdditions.run - umount /tmp/vbox - rmdir /tmp/vbox - rm *.iso -fi - -if [ -f /home/vagrant/.vmfusion_version ]; then - #Set Linux-specific paths and ISO filename - home_dir="/home/vagrant" - iso_name="linux.iso" - mount_point="/tmp/vmware-tools" - #Run install, unmount ISO and remove it - mkdir ${mount_point} - cd ${home_dir} - /bin/mount -o loop ${iso_name} ${mount_point} - tar zxf ${mount_point}/*.tar.gz && cd vmware-tools-distrib && ./vmware-install.pl --default - /bin/umount ${mount_point} - /bin/rm -rf ${home_dir}/${iso_name} ${home_dir}/vmware-tools-distrib - rmdir ${mount_point} -fi - -mkdir /home/vagrant/.ssh -wget --no-check-certificate \ - 'https://github.com/mitchellh/vagrant/raw/master/keys/vagrant.pub' \ - -O /home/vagrant/.ssh/authorized_keys -chown -R vagrant /home/vagrant/.ssh -chmod -R go-rwsx /home/vagrant/.ssh diff --git a/templates/centos-6.4-i386/template.json b/templates/centos-6.4-i386/template.json deleted file mode 100644 index fbfca6086..000000000 --- a/templates/centos-6.4-i386/template.json +++ /dev/null @@ -1,88 +0,0 @@ -{ - "provisioners": [ - { - "type": "shell", - "scripts": [ - "scripts/vagrant.sh", - "scripts/sshd.sh", - "scripts/cleanup.sh", - "scripts/minimize.sh" - ], - "override": { - "virtualbox": { - "execute_command": "echo 'vagrant'|sudo -S sh '{{.Path}}'" - }, - "vmware": { - "execute_command": "echo 'vagrant'|sudo -S sh '{{.Path}}'" - } - } - } - ], - "builders": [ - { - "type": "virtualbox", - "boot_command": [ - "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/ks.cfg<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": 40960, - "guest_os_type": "RedHat", - "http_directory": "http", - "iso_checksum": "a6049df141579169b217cbb625da4c6d", - "iso_checksum_type": "md5", - "iso_url": "http://mirrors.kernel.org/centos/6.4/isos/i386/CentOS-6.4-i386-bin-DVD1.iso", - "ssh_username": "vagrant", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_wait_timeout": "10000s", - "shutdown_command": "echo '/sbin/halt -h -p' > shutdown.sh; echo 'vagrant'|sudo -S sh 'shutdown.sh'", - "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", - "virtualbox_version_file": ".vbox_version", - "vboxmanage": [ - [ - "modifyvm", - "{{.Name}}", - "--memory", - "480" - ], - [ - "modifyvm", - "{{.Name}}", - "--cpus", - "1" - ] - ], - "iso_md5": "a6049df141579169b217cbb625da4c6d" - }, - { - "type": "vmware", - "boot_command": [ - "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/ks.cfg<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": 40960, - "guest_os_type": "RedHat", - "http_directory": "http", - "iso_checksum": "a6049df141579169b217cbb625da4c6d", - "iso_checksum_type": "md5", - "iso_url": "http://mirrors.kernel.org/centos/6.4/isos/i386/CentOS-6.4-i386-bin-DVD1.iso", - "ssh_username": "vagrant", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_wait_timeout": "10000s", - "shutdown_command": "echo '/sbin/halt -h -p' > shutdown.sh; echo 'vagrant'|sudo -S sh 'shutdown.sh'", - "vmx_data": { - "memsize": "480", - "numvcpus": "1", - "cpuid.coresPerSocket": "1" - }, - "iso_md5": "a6049df141579169b217cbb625da4c6d" - } - ], - "post-provisioner": [ - { - "type": "vagrant", - "output": "centos-6.4-i386-{{.Provisioner}}.box" - } - ] -} \ No newline at end of file diff --git a/templates/centos-6.4/http/ks.cfg b/templates/centos-6.4/http/ks.cfg deleted file mode 100644 index e00fd5a2a..000000000 --- a/templates/centos-6.4/http/ks.cfg +++ /dev/null @@ -1,39 +0,0 @@ -install -cdrom -lang en_US.UTF-8 -keyboard us -network --bootproto=dhcp -rootpw --iscrypted $1$damlkd,f$UC/u5pUts5QiU3ow.CSso/ -firewall --disabled -authconfig --enableshadow --passalgo=sha512 -selinux --disabled -timezone UTC -bootloader --location=mbr -text -skipx -zerombr -clearpart --all --initlabel -autopart -auth --useshadow --enablemd5 -firstboot --disabled -reboot - -%packages --ignoremissing -@Base -@Core -@Development Tools -openssl-devel -readline-devel -zlib-devel -kernel-devel - -%post -# update root certs -wget -O/etc/pki/tls/certs/ca-bundle.crt http://curl.haxx.se/ca/cacert.pem -# vagrant -groupadd vagrant -g 999 -useradd vagrant -g vagrant -G wheel -u 900 -echo "vagrant" | passwd --stdin vagrant -# sudo -echo "vagrant ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers -sed -i "s/^.*requiretty/#Defaults requiretty/" /etc/sudoers diff --git a/templates/centos-6.4/scripts/cleanup.sh b/templates/centos-6.4/scripts/cleanup.sh deleted file mode 100644 index 922c3d6b5..000000000 --- a/templates/centos-6.4/scripts/cleanup.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/bash -eux -yum -y erase gtk2 libX11 hicolor-icon-theme avahi freetype bitstream-vera-fonts -yum -y clean all -rm -rf VBoxGuestAdditions_*.iso VBoxGuestAdditions_*.iso.? -rm -f /tmp/chef*rpm diff --git a/templates/centos-6.4/scripts/minimize.sh b/templates/centos-6.4/scripts/minimize.sh deleted file mode 100644 index 3846a1d65..000000000 --- a/templates/centos-6.4/scripts/minimize.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash -eux - -dd if=/dev/zero of=/EMPTY bs=1M -rm -f /EMPTY diff --git a/templates/centos-6.4/scripts/sshd.sh b/templates/centos-6.4/scripts/sshd.sh deleted file mode 100644 index c6e4f20a6..000000000 --- a/templates/centos-6.4/scripts/sshd.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash -eux - -echo "UseDNS no" >> /etc/ssh/sshd_config diff --git a/templates/centos-6.4/scripts/vagrant.sh b/templates/centos-6.4/scripts/vagrant.sh deleted file mode 100644 index 72dd2f444..000000000 --- a/templates/centos-6.4/scripts/vagrant.sh +++ /dev/null @@ -1,33 +0,0 @@ -#!/bin/bash -eux - -if [ -f /home/vagrant/.vbox_version ]; then - mkdir /tmp/vbox - VER=$(cat /home/vagrant/.vbox_version) - mount -o loop VBoxGuestAdditions_$VER.iso /tmp/vbox - sh /tmp/vbox/VBoxLinuxAdditions.run - umount /tmp/vbox - rmdir /tmp/vbox - rm *.iso -fi - -if [ -f /home/vagrant/.vmfusion_version ]; then - #Set Linux-specific paths and ISO filename - home_dir="/home/vagrant" - iso_name="linux.iso" - mount_point="/tmp/vmware-tools" - #Run install, unmount ISO and remove it - mkdir ${mount_point} - cd ${home_dir} - /bin/mount -o loop ${iso_name} ${mount_point} - tar zxf ${mount_point}/*.tar.gz && cd vmware-tools-distrib && ./vmware-install.pl --default - /bin/umount ${mount_point} - /bin/rm -rf ${home_dir}/${iso_name} ${home_dir}/vmware-tools-distrib - rmdir ${mount_point} -fi - -mkdir /home/vagrant/.ssh -wget --no-check-certificate \ - 'https://github.com/mitchellh/vagrant/raw/master/keys/vagrant.pub' \ - -O /home/vagrant/.ssh/authorized_keys -chown -R vagrant /home/vagrant/.ssh -chmod -R go-rwsx /home/vagrant/.ssh diff --git a/templates/centos-6.4/template.json b/templates/centos-6.4/template.json deleted file mode 100644 index 24debf9b9..000000000 --- a/templates/centos-6.4/template.json +++ /dev/null @@ -1,88 +0,0 @@ -{ - "provisioners": [ - { - "type": "shell", - "scripts": [ - "scripts/vagrant.sh", - "scripts/sshd.sh", - "scripts/cleanup.sh", - "scripts/minimize.sh" - ], - "override": { - "virtualbox": { - "execute_command": "echo 'vagrant'|sudo -S sh '{{.Path}}'" - }, - "vmware": { - "execute_command": "echo 'vagrant'|sudo -S sh '{{.Path}}'" - } - } - } - ], - "builders": [ - { - "type": "virtualbox", - "boot_command": [ - "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/ks.cfg<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": 40960, - "guest_os_type": "RedHat_64", - "http_directory": "http", - "iso_checksum": "0128cfc7c86072b13ee80dd013e0e5d7", - "iso_checksum_type": "md5", - "iso_url": "http://mirrors.kernel.org/centos/6.4/isos/x86_64/CentOS-6.4-x86_64-bin-DVD1.iso", - "ssh_username": "vagrant", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_wait_timeout": "10000s", - "shutdown_command": "echo '/sbin/halt -h -p' > shutdown.sh; echo 'vagrant'|sudo -S sh 'shutdown.sh'", - "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", - "virtualbox_version_file": ".vbox_version", - "vboxmanage": [ - [ - "modifyvm", - "{{.Name}}", - "--memory", - "480" - ], - [ - "modifyvm", - "{{.Name}}", - "--cpus", - "1" - ] - ], - "iso_md5": "0128cfc7c86072b13ee80dd013e0e5d7" - }, - { - "type": "vmware", - "boot_command": [ - "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/ks.cfg<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": 40960, - "guest_os_type": "centos-64", - "http_directory": "http", - "iso_checksum": "0128cfc7c86072b13ee80dd013e0e5d7", - "iso_checksum_type": "md5", - "iso_url": "http://mirrors.kernel.org/centos/6.4/isos/x86_64/CentOS-6.4-x86_64-bin-DVD1.iso", - "ssh_username": "vagrant", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_wait_timeout": "10000s", - "shutdown_command": "echo '/sbin/halt -h -p' > shutdown.sh; echo 'vagrant'|sudo -S sh 'shutdown.sh'", - "vmx_data": { - "memsize": "480", - "numvcpus": "1", - "cpuid.coresPerSocket": "1" - }, - "iso_md5": "0128cfc7c86072b13ee80dd013e0e5d7" - } - ], - "post-provisioner": [ - { - "type": "vagrant", - "output": "centos-6.4-{{.Provisioner}}.box" - } - ] -} \ No newline at end of file diff --git a/templates/debian-6.0.7-i386/http/preseed.cfg b/templates/debian-6.0.7-i386/http/preseed.cfg deleted file mode 100644 index 820f090c5..000000000 --- a/templates/debian-6.0.7-i386/http/preseed.cfg +++ /dev/null @@ -1,47 +0,0 @@ -choose-mirror-bin mirror/http/proxy string -d-i apt-setup/use_mirror boolean true -d-i base-installer/kernel/override-image string linux-server -d-i clock-setup/utc boolean true -d-i clock-setup/utc-auto boolean true -d-i finish-install/reboot_in_progress note -d-i grub-installer/only_debian boolean true -d-i grub-installer/with_other_os boolean true -d-i keymap select us -d-i mirror/country string manual -d-i mirror/http/directory string /debian -d-i mirror/http/hostname string mirrors.kernel.org -d-i mirror/http/proxy string -d-i partman-auto-lvm/guided_size string max -d-i partman-auto/choose_recipe select atomic -d-i partman-auto/method string lvm -d-i partman-lvm/confirm boolean true -d-i partman-lvm/confirm boolean true -d-i partman-lvm/confirm_nooverwrite boolean true -d-i partman-lvm/device_remove_lvm boolean true -d-i partman/choose_partition select finish -d-i partman/confirm boolean true -d-i partman/confirm_nooverwrite boolean true -d-i partman/confirm_write_new_label boolean true -d-i passwd/root-login boolean false -d-i passwd/root-password-again password vagrant -d-i passwd/root-password password vagrant -d-i passwd/user-fullname string vagrant -d-i passwd/user-uid string 900 -d-i passwd/user-password password vagrant -d-i passwd/user-password-again password vagrant -d-i passwd/username string vagrant -d-i pkgsel/include string openssh-server sudo bzip2 acpid cryptsetup zlib1g-dev wget curl dkms make -d-i pkgsel/install-language-support boolean false -d-i pkgsel/update-policy select unattended-upgrades -d-i pkgsel/upgrade select full-upgrade -# Prevent packaged version of VirtualBox Guest Additions being installed: -d-i preseed/early_command string sed -i \ - '/in-target/idiscover(){/sbin/discover|grep -v VirtualBox;}' \ - /usr/lib/pre-pkgsel.d/20install-hwpackages -d-i time/zone string UTC -d-i user-setup/allow-password-weak boolean true -d-i user-setup/encrypt-home boolean false -apt-cdrom-setup apt-setup/cdrom/set-first boolean false -apt-mirror-setup apt-setup/use_mirror boolean true -popularity-contest popularity-contest/participate boolean false -tasksel tasksel/first multiselect standard, ubuntu-server diff --git a/templates/debian-6.0.7-i386/scripts/cleanup.sh b/templates/debian-6.0.7-i386/scripts/cleanup.sh deleted file mode 100644 index 6c7f703d6..000000000 --- a/templates/debian-6.0.7-i386/scripts/cleanup.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/bash -eux - -apt-get -y autoremove -apt-get -y clean -rm -rf VBoxGuestAdditions_*.iso VBoxGuestAdditions_*.iso.? -rm -f /tmp/chef*deb diff --git a/templates/debian-6.0.7-i386/scripts/minimize.sh b/templates/debian-6.0.7-i386/scripts/minimize.sh deleted file mode 100644 index 3846a1d65..000000000 --- a/templates/debian-6.0.7-i386/scripts/minimize.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash -eux - -dd if=/dev/zero of=/EMPTY bs=1M -rm -f /EMPTY diff --git a/templates/debian-6.0.7-i386/scripts/networking.sh b/templates/debian-6.0.7-i386/scripts/networking.sh deleted file mode 100644 index de3269a58..000000000 --- a/templates/debian-6.0.7-i386/scripts/networking.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/bash -eux - -rm /etc/udev/rules.d/70-persistent-net.rules -mkdir /etc/udev/rules.d/70-persistent-net.rules -rm /lib/udev/rules.d/75-persistent-net-generator.rules -rm -rf /dev/.udev/ /var/lib/dhcp3/* -echo "pre-up sleep 2" >> /etc/network/interfaces diff --git a/templates/debian-6.0.7-i386/scripts/sshd.sh b/templates/debian-6.0.7-i386/scripts/sshd.sh deleted file mode 100644 index c6e4f20a6..000000000 --- a/templates/debian-6.0.7-i386/scripts/sshd.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash -eux - -echo "UseDNS no" >> /etc/ssh/sshd_config diff --git a/templates/debian-6.0.7-i386/scripts/sudoers.sh b/templates/debian-6.0.7-i386/scripts/sudoers.sh deleted file mode 100644 index e7673ae00..000000000 --- a/templates/debian-6.0.7-i386/scripts/sudoers.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash -eux - -sed -i -e '/Defaults\s\+env_reset/a Defaults\texempt_group=sudo' /etc/sudoers -sed -i -e 's/%sudo ALL=(ALL) ALL/%sudo ALL=NOPASSWD:ALL/g' /etc/sudoers diff --git a/templates/debian-6.0.7-i386/scripts/update.sh b/templates/debian-6.0.7-i386/scripts/update.sh deleted file mode 100644 index a4cc91499..000000000 --- a/templates/debian-6.0.7-i386/scripts/update.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash -eux - -apt-get update -apt-get -y upgrade diff --git a/templates/debian-6.0.7-i386/scripts/vagrant.sh b/templates/debian-6.0.7-i386/scripts/vagrant.sh deleted file mode 100644 index 72dd2f444..000000000 --- a/templates/debian-6.0.7-i386/scripts/vagrant.sh +++ /dev/null @@ -1,33 +0,0 @@ -#!/bin/bash -eux - -if [ -f /home/vagrant/.vbox_version ]; then - mkdir /tmp/vbox - VER=$(cat /home/vagrant/.vbox_version) - mount -o loop VBoxGuestAdditions_$VER.iso /tmp/vbox - sh /tmp/vbox/VBoxLinuxAdditions.run - umount /tmp/vbox - rmdir /tmp/vbox - rm *.iso -fi - -if [ -f /home/vagrant/.vmfusion_version ]; then - #Set Linux-specific paths and ISO filename - home_dir="/home/vagrant" - iso_name="linux.iso" - mount_point="/tmp/vmware-tools" - #Run install, unmount ISO and remove it - mkdir ${mount_point} - cd ${home_dir} - /bin/mount -o loop ${iso_name} ${mount_point} - tar zxf ${mount_point}/*.tar.gz && cd vmware-tools-distrib && ./vmware-install.pl --default - /bin/umount ${mount_point} - /bin/rm -rf ${home_dir}/${iso_name} ${home_dir}/vmware-tools-distrib - rmdir ${mount_point} -fi - -mkdir /home/vagrant/.ssh -wget --no-check-certificate \ - 'https://github.com/mitchellh/vagrant/raw/master/keys/vagrant.pub' \ - -O /home/vagrant/.ssh/authorized_keys -chown -R vagrant /home/vagrant/.ssh -chmod -R go-rwsx /home/vagrant/.ssh diff --git a/templates/debian-6.0.7-i386/template.json b/templates/debian-6.0.7-i386/template.json deleted file mode 100644 index 09515f5b2..000000000 --- a/templates/debian-6.0.7-i386/template.json +++ /dev/null @@ -1,119 +0,0 @@ -{ - "provisioners": [ - { - "type": "shell", - "scripts": [ - "scripts/update.sh", - "scripts/vagrant.sh", - "scripts/sshd.sh", - "scripts/networking.sh", - "scripts/sudoers.sh", - "scripts/cleanup.sh", - "scripts/minimize.sh" - ], - "override": { - "virtualbox": { - "execute_command": "echo 'vagrant'|sudo -S sh '{{.Path}}'" - }, - "vmware": { - "execute_command": "echo 'vagrant'|sudo -S sh '{{.Path}}'" - } - } - } - ], - "builders": [ - { - "type": "virtualbox", - "boot_command": [ - "<esc><wait>", - "install <wait>", - "preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/preseed.cfg <wait>", - "debian-installer=en_US <wait>", - "auto <wait>", - "locale=en_US <wait>", - "kbd-chooser/method=us <wait>", - "keyboard-configuration/xkb-keymap=us <wait>", - "netcfg/get_hostname={{ .Name }} <wait>", - "netcfg/get_domain=vagrantup.com <wait>", - "fb=false <wait>", - "debconf/frontend=noninteractive <wait>", - "console-setup/ask_detect=false <wait>", - "console-keymaps-at/keymap=us <wait>", - "<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": 40960, - "guest_os_type": "Debian", - "http_directory": "http", - "iso_checksum": "4480eeae60213eb92e1fce15ebf2faf4", - "iso_checksum_type": "md5", - "iso_url": "http://cdimage.debian.org/cdimage/archive/6.0.7/i386/iso-cd/debian-6.0.7-i386-CD-1.iso", - "ssh_username": "vagrant", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_wait_timeout": "10000s", - "shutdown_command": "echo '/sbin/shutdown -h -P now' > shutdown.sh; echo 'vagrant'|sudo -S sh 'shutdown.sh'", - "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", - "virtualbox_version_file": ".vbox_version", - "vboxmanage": [ - [ - "modifyvm", - "{{.Name}}", - "--memory", - "384" - ], - [ - "modifyvm", - "{{.Name}}", - "--cpus", - "1" - ] - ], - "iso_md5": "4480eeae60213eb92e1fce15ebf2faf4" - }, - { - "type": "vmware", - "boot_command": [ - "<esc><wait>", - "install <wait>", - "preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/preseed.cfg <wait>", - "debian-installer=en_US <wait>", - "auto <wait>", - "locale=en_US <wait>", - "kbd-chooser/method=us <wait>", - "keyboard-configuration/xkb-keymap=us <wait>", - "netcfg/get_hostname={{ .Name }} <wait>", - "netcfg/get_domain=vagrantup.com <wait>", - "fb=false <wait>", - "debconf/frontend=noninteractive <wait>", - "console-setup/ask_detect=false <wait>", - "console-keymaps-at/keymap=us <wait>", - "<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": 40960, - "guest_os_type": "debian5", - "http_directory": "http", - "iso_checksum": "4480eeae60213eb92e1fce15ebf2faf4", - "iso_checksum_type": "md5", - "iso_url": "http://cdimage.debian.org/cdimage/archive/6.0.7/i386/iso-cd/debian-6.0.7-i386-CD-1.iso", - "ssh_username": "vagrant", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_wait_timeout": "10000s", - "shutdown_command": "echo '/sbin/shutdown -h -P now' > shutdown.sh; echo 'vagrant'|sudo -S sh 'shutdown.sh'", - "vmx_data": { - "memsize": "384", - "numvcpus": "1", - "cpuid.coresPerSocket": "1" - }, - "iso_md5": "4480eeae60213eb92e1fce15ebf2faf4" - } - ], - "post-provisioner": [ - { - "type": "vagrant", - "output": "debian-6.0.7-i386-{{.Provisioner}}.box" - } - ] -} \ No newline at end of file diff --git a/templates/debian-6.0.7/http/preseed.cfg b/templates/debian-6.0.7/http/preseed.cfg deleted file mode 100644 index 820f090c5..000000000 --- a/templates/debian-6.0.7/http/preseed.cfg +++ /dev/null @@ -1,47 +0,0 @@ -choose-mirror-bin mirror/http/proxy string -d-i apt-setup/use_mirror boolean true -d-i base-installer/kernel/override-image string linux-server -d-i clock-setup/utc boolean true -d-i clock-setup/utc-auto boolean true -d-i finish-install/reboot_in_progress note -d-i grub-installer/only_debian boolean true -d-i grub-installer/with_other_os boolean true -d-i keymap select us -d-i mirror/country string manual -d-i mirror/http/directory string /debian -d-i mirror/http/hostname string mirrors.kernel.org -d-i mirror/http/proxy string -d-i partman-auto-lvm/guided_size string max -d-i partman-auto/choose_recipe select atomic -d-i partman-auto/method string lvm -d-i partman-lvm/confirm boolean true -d-i partman-lvm/confirm boolean true -d-i partman-lvm/confirm_nooverwrite boolean true -d-i partman-lvm/device_remove_lvm boolean true -d-i partman/choose_partition select finish -d-i partman/confirm boolean true -d-i partman/confirm_nooverwrite boolean true -d-i partman/confirm_write_new_label boolean true -d-i passwd/root-login boolean false -d-i passwd/root-password-again password vagrant -d-i passwd/root-password password vagrant -d-i passwd/user-fullname string vagrant -d-i passwd/user-uid string 900 -d-i passwd/user-password password vagrant -d-i passwd/user-password-again password vagrant -d-i passwd/username string vagrant -d-i pkgsel/include string openssh-server sudo bzip2 acpid cryptsetup zlib1g-dev wget curl dkms make -d-i pkgsel/install-language-support boolean false -d-i pkgsel/update-policy select unattended-upgrades -d-i pkgsel/upgrade select full-upgrade -# Prevent packaged version of VirtualBox Guest Additions being installed: -d-i preseed/early_command string sed -i \ - '/in-target/idiscover(){/sbin/discover|grep -v VirtualBox;}' \ - /usr/lib/pre-pkgsel.d/20install-hwpackages -d-i time/zone string UTC -d-i user-setup/allow-password-weak boolean true -d-i user-setup/encrypt-home boolean false -apt-cdrom-setup apt-setup/cdrom/set-first boolean false -apt-mirror-setup apt-setup/use_mirror boolean true -popularity-contest popularity-contest/participate boolean false -tasksel tasksel/first multiselect standard, ubuntu-server diff --git a/templates/debian-6.0.7/scripts/cleanup.sh b/templates/debian-6.0.7/scripts/cleanup.sh deleted file mode 100644 index 6c7f703d6..000000000 --- a/templates/debian-6.0.7/scripts/cleanup.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/bash -eux - -apt-get -y autoremove -apt-get -y clean -rm -rf VBoxGuestAdditions_*.iso VBoxGuestAdditions_*.iso.? -rm -f /tmp/chef*deb diff --git a/templates/debian-6.0.7/scripts/minimize.sh b/templates/debian-6.0.7/scripts/minimize.sh deleted file mode 100644 index 3846a1d65..000000000 --- a/templates/debian-6.0.7/scripts/minimize.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash -eux - -dd if=/dev/zero of=/EMPTY bs=1M -rm -f /EMPTY diff --git a/templates/debian-6.0.7/scripts/networking.sh b/templates/debian-6.0.7/scripts/networking.sh deleted file mode 100644 index de3269a58..000000000 --- a/templates/debian-6.0.7/scripts/networking.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/bash -eux - -rm /etc/udev/rules.d/70-persistent-net.rules -mkdir /etc/udev/rules.d/70-persistent-net.rules -rm /lib/udev/rules.d/75-persistent-net-generator.rules -rm -rf /dev/.udev/ /var/lib/dhcp3/* -echo "pre-up sleep 2" >> /etc/network/interfaces diff --git a/templates/debian-6.0.7/scripts/sshd.sh b/templates/debian-6.0.7/scripts/sshd.sh deleted file mode 100644 index c6e4f20a6..000000000 --- a/templates/debian-6.0.7/scripts/sshd.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash -eux - -echo "UseDNS no" >> /etc/ssh/sshd_config diff --git a/templates/debian-6.0.7/scripts/sudoers.sh b/templates/debian-6.0.7/scripts/sudoers.sh deleted file mode 100644 index e7673ae00..000000000 --- a/templates/debian-6.0.7/scripts/sudoers.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash -eux - -sed -i -e '/Defaults\s\+env_reset/a Defaults\texempt_group=sudo' /etc/sudoers -sed -i -e 's/%sudo ALL=(ALL) ALL/%sudo ALL=NOPASSWD:ALL/g' /etc/sudoers diff --git a/templates/debian-6.0.7/scripts/update.sh b/templates/debian-6.0.7/scripts/update.sh deleted file mode 100644 index a4cc91499..000000000 --- a/templates/debian-6.0.7/scripts/update.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash -eux - -apt-get update -apt-get -y upgrade diff --git a/templates/debian-6.0.7/scripts/vagrant.sh b/templates/debian-6.0.7/scripts/vagrant.sh deleted file mode 100644 index 72dd2f444..000000000 --- a/templates/debian-6.0.7/scripts/vagrant.sh +++ /dev/null @@ -1,33 +0,0 @@ -#!/bin/bash -eux - -if [ -f /home/vagrant/.vbox_version ]; then - mkdir /tmp/vbox - VER=$(cat /home/vagrant/.vbox_version) - mount -o loop VBoxGuestAdditions_$VER.iso /tmp/vbox - sh /tmp/vbox/VBoxLinuxAdditions.run - umount /tmp/vbox - rmdir /tmp/vbox - rm *.iso -fi - -if [ -f /home/vagrant/.vmfusion_version ]; then - #Set Linux-specific paths and ISO filename - home_dir="/home/vagrant" - iso_name="linux.iso" - mount_point="/tmp/vmware-tools" - #Run install, unmount ISO and remove it - mkdir ${mount_point} - cd ${home_dir} - /bin/mount -o loop ${iso_name} ${mount_point} - tar zxf ${mount_point}/*.tar.gz && cd vmware-tools-distrib && ./vmware-install.pl --default - /bin/umount ${mount_point} - /bin/rm -rf ${home_dir}/${iso_name} ${home_dir}/vmware-tools-distrib - rmdir ${mount_point} -fi - -mkdir /home/vagrant/.ssh -wget --no-check-certificate \ - 'https://github.com/mitchellh/vagrant/raw/master/keys/vagrant.pub' \ - -O /home/vagrant/.ssh/authorized_keys -chown -R vagrant /home/vagrant/.ssh -chmod -R go-rwsx /home/vagrant/.ssh diff --git a/templates/debian-6.0.7/template.json b/templates/debian-6.0.7/template.json deleted file mode 100644 index 8d35430f8..000000000 --- a/templates/debian-6.0.7/template.json +++ /dev/null @@ -1,119 +0,0 @@ -{ - "provisioners": [ - { - "type": "shell", - "scripts": [ - "scripts/update.sh", - "scripts/vagrant.sh", - "scripts/sshd.sh", - "scripts/networking.sh", - "scripts/sudoers.sh", - "scripts/cleanup.sh", - "scripts/minimize.sh" - ], - "override": { - "virtualbox": { - "execute_command": "echo 'vagrant'|sudo -S sh '{{.Path}}'" - }, - "vmware": { - "execute_command": "echo 'vagrant'|sudo -S sh '{{.Path}}'" - } - } - } - ], - "builders": [ - { - "type": "virtualbox", - "boot_command": [ - "<esc><wait>", - "install <wait>", - "preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/preseed.cfg <wait>", - "debian-installer=en_US <wait>", - "auto <wait>", - "locale=en_US <wait>", - "kbd-chooser/method=us <wait>", - "keyboard-configuration/xkb-keymap=us <wait>", - "netcfg/get_hostname={{ .Name }} <wait>", - "netcfg/get_domain=vagrantup.com <wait>", - "fb=false <wait>", - "debconf/frontend=noninteractive <wait>", - "console-setup/ask_detect=false <wait>", - "console-keymaps-at/keymap=us <wait>", - "<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": 40960, - "guest_os_type": "Debian_64", - "http_directory": "http", - "iso_checksum": "8f0e86d19bc90768da08cdafb4f9edbb", - "iso_checksum_type": "md5", - "iso_url": "http://cdimage.debian.org/cdimage/archive/6.0.7/amd64/iso-cd/debian-6.0.7-amd64-CD-1.iso", - "ssh_username": "vagrant", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_wait_timeout": "10000s", - "shutdown_command": "echo '/sbin/shutdown -h -P now' > shutdown.sh; echo 'vagrant'|sudo -S sh 'shutdown.sh'", - "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", - "virtualbox_version_file": ".vbox_version", - "vboxmanage": [ - [ - "modifyvm", - "{{.Name}}", - "--memory", - "384" - ], - [ - "modifyvm", - "{{.Name}}", - "--cpus", - "1" - ] - ], - "iso_md5": "8f0e86d19bc90768da08cdafb4f9edbb" - }, - { - "type": "vmware", - "boot_command": [ - "<esc><wait>", - "install <wait>", - "preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/preseed.cfg <wait>", - "debian-installer=en_US <wait>", - "auto <wait>", - "locale=en_US <wait>", - "kbd-chooser/method=us <wait>", - "keyboard-configuration/xkb-keymap=us <wait>", - "netcfg/get_hostname={{ .Name }} <wait>", - "netcfg/get_domain=vagrantup.com <wait>", - "fb=false <wait>", - "debconf/frontend=noninteractive <wait>", - "console-setup/ask_detect=false <wait>", - "console-keymaps-at/keymap=us <wait>", - "<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": 40960, - "guest_os_type": "debian5-64", - "http_directory": "http", - "iso_checksum": "8f0e86d19bc90768da08cdafb4f9edbb", - "iso_checksum_type": "md5", - "iso_url": "http://cdimage.debian.org/cdimage/archive/6.0.7/amd64/iso-cd/debian-6.0.7-amd64-CD-1.iso", - "ssh_username": "vagrant", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_wait_timeout": "10000s", - "shutdown_command": "echo '/sbin/shutdown -h -P now' > shutdown.sh; echo 'vagrant'|sudo -S sh 'shutdown.sh'", - "vmx_data": { - "memsize": "384", - "numvcpus": "1", - "cpuid.coresPerSocket": "1" - }, - "iso_md5": "8f0e86d19bc90768da08cdafb4f9edbb" - } - ], - "post-provisioner": [ - { - "type": "vagrant", - "output": "debian-6.0.7-{{.Provisioner}}.box" - } - ] -} \ No newline at end of file diff --git a/templates/debian-7.1.0-i386/http/preseed.cfg b/templates/debian-7.1.0-i386/http/preseed.cfg deleted file mode 100644 index 820f090c5..000000000 --- a/templates/debian-7.1.0-i386/http/preseed.cfg +++ /dev/null @@ -1,47 +0,0 @@ -choose-mirror-bin mirror/http/proxy string -d-i apt-setup/use_mirror boolean true -d-i base-installer/kernel/override-image string linux-server -d-i clock-setup/utc boolean true -d-i clock-setup/utc-auto boolean true -d-i finish-install/reboot_in_progress note -d-i grub-installer/only_debian boolean true -d-i grub-installer/with_other_os boolean true -d-i keymap select us -d-i mirror/country string manual -d-i mirror/http/directory string /debian -d-i mirror/http/hostname string mirrors.kernel.org -d-i mirror/http/proxy string -d-i partman-auto-lvm/guided_size string max -d-i partman-auto/choose_recipe select atomic -d-i partman-auto/method string lvm -d-i partman-lvm/confirm boolean true -d-i partman-lvm/confirm boolean true -d-i partman-lvm/confirm_nooverwrite boolean true -d-i partman-lvm/device_remove_lvm boolean true -d-i partman/choose_partition select finish -d-i partman/confirm boolean true -d-i partman/confirm_nooverwrite boolean true -d-i partman/confirm_write_new_label boolean true -d-i passwd/root-login boolean false -d-i passwd/root-password-again password vagrant -d-i passwd/root-password password vagrant -d-i passwd/user-fullname string vagrant -d-i passwd/user-uid string 900 -d-i passwd/user-password password vagrant -d-i passwd/user-password-again password vagrant -d-i passwd/username string vagrant -d-i pkgsel/include string openssh-server sudo bzip2 acpid cryptsetup zlib1g-dev wget curl dkms make -d-i pkgsel/install-language-support boolean false -d-i pkgsel/update-policy select unattended-upgrades -d-i pkgsel/upgrade select full-upgrade -# Prevent packaged version of VirtualBox Guest Additions being installed: -d-i preseed/early_command string sed -i \ - '/in-target/idiscover(){/sbin/discover|grep -v VirtualBox;}' \ - /usr/lib/pre-pkgsel.d/20install-hwpackages -d-i time/zone string UTC -d-i user-setup/allow-password-weak boolean true -d-i user-setup/encrypt-home boolean false -apt-cdrom-setup apt-setup/cdrom/set-first boolean false -apt-mirror-setup apt-setup/use_mirror boolean true -popularity-contest popularity-contest/participate boolean false -tasksel tasksel/first multiselect standard, ubuntu-server diff --git a/templates/debian-7.1.0-i386/scripts/cleanup.sh b/templates/debian-7.1.0-i386/scripts/cleanup.sh deleted file mode 100644 index 6c7f703d6..000000000 --- a/templates/debian-7.1.0-i386/scripts/cleanup.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/bash -eux - -apt-get -y autoremove -apt-get -y clean -rm -rf VBoxGuestAdditions_*.iso VBoxGuestAdditions_*.iso.? -rm -f /tmp/chef*deb diff --git a/templates/debian-7.1.0-i386/scripts/minimize.sh b/templates/debian-7.1.0-i386/scripts/minimize.sh deleted file mode 100644 index 3846a1d65..000000000 --- a/templates/debian-7.1.0-i386/scripts/minimize.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash -eux - -dd if=/dev/zero of=/EMPTY bs=1M -rm -f /EMPTY diff --git a/templates/debian-7.1.0-i386/scripts/networking.sh b/templates/debian-7.1.0-i386/scripts/networking.sh deleted file mode 100644 index de3269a58..000000000 --- a/templates/debian-7.1.0-i386/scripts/networking.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/bash -eux - -rm /etc/udev/rules.d/70-persistent-net.rules -mkdir /etc/udev/rules.d/70-persistent-net.rules -rm /lib/udev/rules.d/75-persistent-net-generator.rules -rm -rf /dev/.udev/ /var/lib/dhcp3/* -echo "pre-up sleep 2" >> /etc/network/interfaces diff --git a/templates/debian-7.1.0-i386/scripts/sshd.sh b/templates/debian-7.1.0-i386/scripts/sshd.sh deleted file mode 100644 index c6e4f20a6..000000000 --- a/templates/debian-7.1.0-i386/scripts/sshd.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash -eux - -echo "UseDNS no" >> /etc/ssh/sshd_config diff --git a/templates/debian-7.1.0-i386/scripts/sudoers.sh b/templates/debian-7.1.0-i386/scripts/sudoers.sh deleted file mode 100644 index e7673ae00..000000000 --- a/templates/debian-7.1.0-i386/scripts/sudoers.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash -eux - -sed -i -e '/Defaults\s\+env_reset/a Defaults\texempt_group=sudo' /etc/sudoers -sed -i -e 's/%sudo ALL=(ALL) ALL/%sudo ALL=NOPASSWD:ALL/g' /etc/sudoers diff --git a/templates/debian-7.1.0-i386/scripts/update.sh b/templates/debian-7.1.0-i386/scripts/update.sh deleted file mode 100644 index a4cc91499..000000000 --- a/templates/debian-7.1.0-i386/scripts/update.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash -eux - -apt-get update -apt-get -y upgrade diff --git a/templates/debian-7.1.0-i386/scripts/vagrant.sh b/templates/debian-7.1.0-i386/scripts/vagrant.sh deleted file mode 100644 index 72dd2f444..000000000 --- a/templates/debian-7.1.0-i386/scripts/vagrant.sh +++ /dev/null @@ -1,33 +0,0 @@ -#!/bin/bash -eux - -if [ -f /home/vagrant/.vbox_version ]; then - mkdir /tmp/vbox - VER=$(cat /home/vagrant/.vbox_version) - mount -o loop VBoxGuestAdditions_$VER.iso /tmp/vbox - sh /tmp/vbox/VBoxLinuxAdditions.run - umount /tmp/vbox - rmdir /tmp/vbox - rm *.iso -fi - -if [ -f /home/vagrant/.vmfusion_version ]; then - #Set Linux-specific paths and ISO filename - home_dir="/home/vagrant" - iso_name="linux.iso" - mount_point="/tmp/vmware-tools" - #Run install, unmount ISO and remove it - mkdir ${mount_point} - cd ${home_dir} - /bin/mount -o loop ${iso_name} ${mount_point} - tar zxf ${mount_point}/*.tar.gz && cd vmware-tools-distrib && ./vmware-install.pl --default - /bin/umount ${mount_point} - /bin/rm -rf ${home_dir}/${iso_name} ${home_dir}/vmware-tools-distrib - rmdir ${mount_point} -fi - -mkdir /home/vagrant/.ssh -wget --no-check-certificate \ - 'https://github.com/mitchellh/vagrant/raw/master/keys/vagrant.pub' \ - -O /home/vagrant/.ssh/authorized_keys -chown -R vagrant /home/vagrant/.ssh -chmod -R go-rwsx /home/vagrant/.ssh diff --git a/templates/debian-7.1.0-i386/template.json b/templates/debian-7.1.0-i386/template.json deleted file mode 100644 index fd01e8b18..000000000 --- a/templates/debian-7.1.0-i386/template.json +++ /dev/null @@ -1,119 +0,0 @@ -{ - "provisioners": [ - { - "type": "shell", - "scripts": [ - "scripts/update.sh", - "scripts/vagrant.sh", - "scripts/sshd.sh", - "scripts/networking.sh", - "scripts/sudoers.sh", - "scripts/cleanup.sh", - "scripts/minimize.sh" - ], - "override": { - "virtualbox": { - "execute_command": "echo 'vagrant'|sudo -S sh '{{.Path}}'" - }, - "vmware": { - "execute_command": "echo 'vagrant'|sudo -S sh '{{.Path}}'" - } - } - } - ], - "builders": [ - { - "type": "virtualbox", - "boot_command": [ - "<esc><wait>", - "install <wait>", - "preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/preseed.cfg <wait>", - "debian-installer=en_US <wait>", - "auto <wait>", - "locale=en_US <wait>", - "kbd-chooser/method=us <wait>", - "keyboard-configuration/xkb-keymap=us <wait>", - "netcfg/get_hostname={{ .Name }} <wait>", - "netcfg/get_domain=vagrantup.com <wait>", - "fb=false <wait>", - "debconf/frontend=noninteractive <wait>", - "console-setup/ask_detect=false <wait>", - "console-keymaps-at/keymap=us <wait>", - "<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": 40960, - "guest_os_type": "Debian", - "http_directory": "http", - "iso_checksum": "c29ec2db6754dadd341b9763164aca9a", - "iso_checksum_type": "md5", - "iso_url": "http://cdimage.debian.org/debian-cd/7.1.0/i386/iso-cd/debian-7.1.0-i386-CD-1.iso", - "ssh_username": "vagrant", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_wait_timeout": "10000s", - "shutdown_command": "echo '/sbin/shutdown -h -P now' > shutdown.sh; echo 'vagrant'|sudo -S sh 'shutdown.sh'", - "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", - "virtualbox_version_file": ".vbox_version", - "vboxmanage": [ - [ - "modifyvm", - "{{.Name}}", - "--memory", - "384" - ], - [ - "modifyvm", - "{{.Name}}", - "--cpus", - "1" - ] - ], - "iso_md5": "c29ec2db6754dadd341b9763164aca9a" - }, - { - "type": "vmware", - "boot_command": [ - "<esc><wait>", - "install <wait>", - "preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/preseed.cfg <wait>", - "debian-installer=en_US <wait>", - "auto <wait>", - "locale=en_US <wait>", - "kbd-chooser/method=us <wait>", - "keyboard-configuration/xkb-keymap=us <wait>", - "netcfg/get_hostname={{ .Name }} <wait>", - "netcfg/get_domain=vagrantup.com <wait>", - "fb=false <wait>", - "debconf/frontend=noninteractive <wait>", - "console-setup/ask_detect=false <wait>", - "console-keymaps-at/keymap=us <wait>", - "<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": 40960, - "guest_os_type": "debian5", - "http_directory": "http", - "iso_checksum": "c29ec2db6754dadd341b9763164aca9a", - "iso_checksum_type": "md5", - "iso_url": "http://cdimage.debian.org/debian-cd/7.1.0/i386/iso-cd/debian-7.1.0-i386-CD-1.iso", - "ssh_username": "vagrant", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_wait_timeout": "10000s", - "shutdown_command": "echo '/sbin/shutdown -h -P now' > shutdown.sh; echo 'vagrant'|sudo -S sh 'shutdown.sh'", - "vmx_data": { - "memsize": "384", - "numvcpus": "1", - "cpuid.coresPerSocket": "1" - }, - "iso_md5": "c29ec2db6754dadd341b9763164aca9a" - } - ], - "post-provisioner": [ - { - "type": "vagrant", - "output": "debian-7.1.0-i386-{{.Provisioner}}.box" - } - ] -} \ No newline at end of file diff --git a/templates/debian-7.1.0/http/preseed.cfg b/templates/debian-7.1.0/http/preseed.cfg deleted file mode 100644 index 820f090c5..000000000 --- a/templates/debian-7.1.0/http/preseed.cfg +++ /dev/null @@ -1,47 +0,0 @@ -choose-mirror-bin mirror/http/proxy string -d-i apt-setup/use_mirror boolean true -d-i base-installer/kernel/override-image string linux-server -d-i clock-setup/utc boolean true -d-i clock-setup/utc-auto boolean true -d-i finish-install/reboot_in_progress note -d-i grub-installer/only_debian boolean true -d-i grub-installer/with_other_os boolean true -d-i keymap select us -d-i mirror/country string manual -d-i mirror/http/directory string /debian -d-i mirror/http/hostname string mirrors.kernel.org -d-i mirror/http/proxy string -d-i partman-auto-lvm/guided_size string max -d-i partman-auto/choose_recipe select atomic -d-i partman-auto/method string lvm -d-i partman-lvm/confirm boolean true -d-i partman-lvm/confirm boolean true -d-i partman-lvm/confirm_nooverwrite boolean true -d-i partman-lvm/device_remove_lvm boolean true -d-i partman/choose_partition select finish -d-i partman/confirm boolean true -d-i partman/confirm_nooverwrite boolean true -d-i partman/confirm_write_new_label boolean true -d-i passwd/root-login boolean false -d-i passwd/root-password-again password vagrant -d-i passwd/root-password password vagrant -d-i passwd/user-fullname string vagrant -d-i passwd/user-uid string 900 -d-i passwd/user-password password vagrant -d-i passwd/user-password-again password vagrant -d-i passwd/username string vagrant -d-i pkgsel/include string openssh-server sudo bzip2 acpid cryptsetup zlib1g-dev wget curl dkms make -d-i pkgsel/install-language-support boolean false -d-i pkgsel/update-policy select unattended-upgrades -d-i pkgsel/upgrade select full-upgrade -# Prevent packaged version of VirtualBox Guest Additions being installed: -d-i preseed/early_command string sed -i \ - '/in-target/idiscover(){/sbin/discover|grep -v VirtualBox;}' \ - /usr/lib/pre-pkgsel.d/20install-hwpackages -d-i time/zone string UTC -d-i user-setup/allow-password-weak boolean true -d-i user-setup/encrypt-home boolean false -apt-cdrom-setup apt-setup/cdrom/set-first boolean false -apt-mirror-setup apt-setup/use_mirror boolean true -popularity-contest popularity-contest/participate boolean false -tasksel tasksel/first multiselect standard, ubuntu-server diff --git a/templates/debian-7.1.0/scripts/cleanup.sh b/templates/debian-7.1.0/scripts/cleanup.sh deleted file mode 100644 index 6c7f703d6..000000000 --- a/templates/debian-7.1.0/scripts/cleanup.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/bash -eux - -apt-get -y autoremove -apt-get -y clean -rm -rf VBoxGuestAdditions_*.iso VBoxGuestAdditions_*.iso.? -rm -f /tmp/chef*deb diff --git a/templates/debian-7.1.0/scripts/minimize.sh b/templates/debian-7.1.0/scripts/minimize.sh deleted file mode 100644 index 3846a1d65..000000000 --- a/templates/debian-7.1.0/scripts/minimize.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash -eux - -dd if=/dev/zero of=/EMPTY bs=1M -rm -f /EMPTY diff --git a/templates/debian-7.1.0/scripts/networking.sh b/templates/debian-7.1.0/scripts/networking.sh deleted file mode 100644 index de3269a58..000000000 --- a/templates/debian-7.1.0/scripts/networking.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/bash -eux - -rm /etc/udev/rules.d/70-persistent-net.rules -mkdir /etc/udev/rules.d/70-persistent-net.rules -rm /lib/udev/rules.d/75-persistent-net-generator.rules -rm -rf /dev/.udev/ /var/lib/dhcp3/* -echo "pre-up sleep 2" >> /etc/network/interfaces diff --git a/templates/debian-7.1.0/scripts/sshd.sh b/templates/debian-7.1.0/scripts/sshd.sh deleted file mode 100644 index c6e4f20a6..000000000 --- a/templates/debian-7.1.0/scripts/sshd.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash -eux - -echo "UseDNS no" >> /etc/ssh/sshd_config diff --git a/templates/debian-7.1.0/scripts/sudoers.sh b/templates/debian-7.1.0/scripts/sudoers.sh deleted file mode 100644 index e7673ae00..000000000 --- a/templates/debian-7.1.0/scripts/sudoers.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash -eux - -sed -i -e '/Defaults\s\+env_reset/a Defaults\texempt_group=sudo' /etc/sudoers -sed -i -e 's/%sudo ALL=(ALL) ALL/%sudo ALL=NOPASSWD:ALL/g' /etc/sudoers diff --git a/templates/debian-7.1.0/scripts/update.sh b/templates/debian-7.1.0/scripts/update.sh deleted file mode 100644 index a4cc91499..000000000 --- a/templates/debian-7.1.0/scripts/update.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash -eux - -apt-get update -apt-get -y upgrade diff --git a/templates/debian-7.1.0/scripts/vagrant.sh b/templates/debian-7.1.0/scripts/vagrant.sh deleted file mode 100644 index 72dd2f444..000000000 --- a/templates/debian-7.1.0/scripts/vagrant.sh +++ /dev/null @@ -1,33 +0,0 @@ -#!/bin/bash -eux - -if [ -f /home/vagrant/.vbox_version ]; then - mkdir /tmp/vbox - VER=$(cat /home/vagrant/.vbox_version) - mount -o loop VBoxGuestAdditions_$VER.iso /tmp/vbox - sh /tmp/vbox/VBoxLinuxAdditions.run - umount /tmp/vbox - rmdir /tmp/vbox - rm *.iso -fi - -if [ -f /home/vagrant/.vmfusion_version ]; then - #Set Linux-specific paths and ISO filename - home_dir="/home/vagrant" - iso_name="linux.iso" - mount_point="/tmp/vmware-tools" - #Run install, unmount ISO and remove it - mkdir ${mount_point} - cd ${home_dir} - /bin/mount -o loop ${iso_name} ${mount_point} - tar zxf ${mount_point}/*.tar.gz && cd vmware-tools-distrib && ./vmware-install.pl --default - /bin/umount ${mount_point} - /bin/rm -rf ${home_dir}/${iso_name} ${home_dir}/vmware-tools-distrib - rmdir ${mount_point} -fi - -mkdir /home/vagrant/.ssh -wget --no-check-certificate \ - 'https://github.com/mitchellh/vagrant/raw/master/keys/vagrant.pub' \ - -O /home/vagrant/.ssh/authorized_keys -chown -R vagrant /home/vagrant/.ssh -chmod -R go-rwsx /home/vagrant/.ssh diff --git a/templates/debian-7.1.0/template.json b/templates/debian-7.1.0/template.json deleted file mode 100644 index 34dfa4b01..000000000 --- a/templates/debian-7.1.0/template.json +++ /dev/null @@ -1,119 +0,0 @@ -{ - "provisioners": [ - { - "type": "shell", - "scripts": [ - "scripts/update.sh", - "scripts/vagrant.sh", - "scripts/sshd.sh", - "scripts/networking.sh", - "scripts/sudoers.sh", - "scripts/cleanup.sh", - "scripts/minimize.sh" - ], - "override": { - "virtualbox": { - "execute_command": "echo 'vagrant'|sudo -S sh '{{.Path}}'" - }, - "vmware": { - "execute_command": "echo 'vagrant'|sudo -S sh '{{.Path}}'" - } - } - } - ], - "builders": [ - { - "type": "virtualbox", - "boot_command": [ - "<esc><wait>", - "install <wait>", - "preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/preseed.cfg <wait>", - "debian-installer=en_US <wait>", - "auto <wait>", - "locale=en_US <wait>", - "kbd-chooser/method=us <wait>", - "keyboard-configuration/xkb-keymap=us <wait>", - "netcfg/get_hostname={{ .Name }} <wait>", - "netcfg/get_domain=vagrantup.com <wait>", - "fb=false <wait>", - "debconf/frontend=noninteractive <wait>", - "console-setup/ask_detect=false <wait>", - "console-keymaps-at/keymap=us <wait>", - "<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": 40960, - "guest_os_type": "Debian_64", - "http_directory": "http", - "iso_checksum": "6813af64cc9487099210afed14a080e0", - "iso_checksum_type": "md5", - "iso_url": "http://cdimage.debian.org/debian-cd/7.1.0/amd64/iso-cd/debian-7.1.0-amd64-CD-1.iso", - "ssh_username": "vagrant", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_wait_timeout": "10000s", - "shutdown_command": "echo '/sbin/shutdown -h -P now' > shutdown.sh; echo 'vagrant'|sudo -S sh 'shutdown.sh'", - "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", - "virtualbox_version_file": ".vbox_version", - "vboxmanage": [ - [ - "modifyvm", - "{{.Name}}", - "--memory", - "384" - ], - [ - "modifyvm", - "{{.Name}}", - "--cpus", - "1" - ] - ], - "iso_md5": "6813af64cc9487099210afed14a080e0" - }, - { - "type": "vmware", - "boot_command": [ - "<esc><wait>", - "install <wait>", - "preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/preseed.cfg <wait>", - "debian-installer=en_US <wait>", - "auto <wait>", - "locale=en_US <wait>", - "kbd-chooser/method=us <wait>", - "keyboard-configuration/xkb-keymap=us <wait>", - "netcfg/get_hostname={{ .Name }} <wait>", - "netcfg/get_domain=vagrantup.com <wait>", - "fb=false <wait>", - "debconf/frontend=noninteractive <wait>", - "console-setup/ask_detect=false <wait>", - "console-keymaps-at/keymap=us <wait>", - "<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": 40960, - "guest_os_type": "debian5-64", - "http_directory": "http", - "iso_checksum": "6813af64cc9487099210afed14a080e0", - "iso_checksum_type": "md5", - "iso_url": "http://cdimage.debian.org/debian-cd/7.1.0/amd64/iso-cd/debian-7.1.0-amd64-CD-1.iso", - "ssh_username": "vagrant", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_wait_timeout": "10000s", - "shutdown_command": "echo '/sbin/shutdown -h -P now' > shutdown.sh; echo 'vagrant'|sudo -S sh 'shutdown.sh'", - "vmx_data": { - "memsize": "384", - "numvcpus": "1", - "cpuid.coresPerSocket": "1" - }, - "iso_md5": "6813af64cc9487099210afed14a080e0" - } - ], - "post-provisioner": [ - { - "type": "vagrant", - "output": "debian-7.1.0-{{.Provisioner}}.box" - } - ] -} \ No newline at end of file diff --git a/templates/fedora-18/http/ks.cfg b/templates/fedora-18/http/ks.cfg deleted file mode 100644 index c89695e03..000000000 --- a/templates/fedora-18/http/ks.cfg +++ /dev/null @@ -1,50 +0,0 @@ -install -cdrom -lang en_US.UTF-8 -keyboard us -network --bootproto=dhcp -rootpw --iscrypted $1$damlkd,f$UC/u5pUts5QiU3ow.CSso/ -firewall --disabled -authconfig --enableshadow --passalgo=sha512 -selinux --disabled -timezone UTC -bootloader --location=mbr -text -skipx -zerombr -clearpart --all --initlabel -part /boot --fstype=ext4 --size=500 -part pv.2 --grow --size=500 -volgroup vg_vagrant --pesize=32768 pv.2 -logvol / --fstype=ext4 --name=lv_root --vgname=vg_vagrant --size=1024 --grow -logvol swap --fstype=swap --name=lv_swap --vgname=vg_vagrant --size=528 --grow --maxsize=1056 -bootloader --location=mbr --append="norhgb biosdevname=0" -auth --useshadow --enablemd5 -firstboot --disabled -reboot - -%packages -@Core -bzip2 -gcc -kernel-devel -kernel-headers -openssl-devel -readline-devel -tar -wget -zlib-devel -%end - -%post -# update root certs -wget -O/etc/pki/tls/certs/ca-bundle.crt http://curl.haxx.se/ca/cacert.pem -# vagrant -groupadd vagrant -useradd vagrant -g vagrant -G wheel -u 900 -echo "vagrant" | passwd --stdin vagrant -# sudo -echo 'Defaults:vagrant !requiretty' > /etc/sudoers.d/vagrant -echo '%vagrant ALL=(ALL) NOPASSWD: ALL' >> /etc/sudoers.d/vagrant -chmod 440 /etc/sudoers.d/vagrant -%end diff --git a/templates/fedora-18/scripts/cleanup.sh b/templates/fedora-18/scripts/cleanup.sh deleted file mode 100644 index a4d82c900..000000000 --- a/templates/fedora-18/scripts/cleanup.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash -eux -yum -y erase gtk2 libX11 hicolor-icon-theme freetype -yum -y clean all -rm -f /tmp/chef*rpm diff --git a/templates/fedora-18/scripts/minimize.sh b/templates/fedora-18/scripts/minimize.sh deleted file mode 100644 index 3846a1d65..000000000 --- a/templates/fedora-18/scripts/minimize.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash -eux - -dd if=/dev/zero of=/EMPTY bs=1M -rm -f /EMPTY diff --git a/templates/fedora-18/scripts/sshd.sh b/templates/fedora-18/scripts/sshd.sh deleted file mode 100644 index c6e4f20a6..000000000 --- a/templates/fedora-18/scripts/sshd.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash -eux - -echo "UseDNS no" >> /etc/ssh/sshd_config diff --git a/templates/fedora-18/scripts/vagrant.sh b/templates/fedora-18/scripts/vagrant.sh deleted file mode 100644 index 72dd2f444..000000000 --- a/templates/fedora-18/scripts/vagrant.sh +++ /dev/null @@ -1,33 +0,0 @@ -#!/bin/bash -eux - -if [ -f /home/vagrant/.vbox_version ]; then - mkdir /tmp/vbox - VER=$(cat /home/vagrant/.vbox_version) - mount -o loop VBoxGuestAdditions_$VER.iso /tmp/vbox - sh /tmp/vbox/VBoxLinuxAdditions.run - umount /tmp/vbox - rmdir /tmp/vbox - rm *.iso -fi - -if [ -f /home/vagrant/.vmfusion_version ]; then - #Set Linux-specific paths and ISO filename - home_dir="/home/vagrant" - iso_name="linux.iso" - mount_point="/tmp/vmware-tools" - #Run install, unmount ISO and remove it - mkdir ${mount_point} - cd ${home_dir} - /bin/mount -o loop ${iso_name} ${mount_point} - tar zxf ${mount_point}/*.tar.gz && cd vmware-tools-distrib && ./vmware-install.pl --default - /bin/umount ${mount_point} - /bin/rm -rf ${home_dir}/${iso_name} ${home_dir}/vmware-tools-distrib - rmdir ${mount_point} -fi - -mkdir /home/vagrant/.ssh -wget --no-check-certificate \ - 'https://github.com/mitchellh/vagrant/raw/master/keys/vagrant.pub' \ - -O /home/vagrant/.ssh/authorized_keys -chown -R vagrant /home/vagrant/.ssh -chmod -R go-rwsx /home/vagrant/.ssh diff --git a/templates/fedora-18/template.json b/templates/fedora-18/template.json deleted file mode 100644 index 5b57e6f02..000000000 --- a/templates/fedora-18/template.json +++ /dev/null @@ -1,88 +0,0 @@ -{ - "provisioners": [ - { - "type": "shell", - "scripts": [ - "scripts/vagrant.sh", - "scripts/sshd.sh", - "scripts/cleanup.sh", - "scripts/minimize.sh" - ], - "override": { - "virtualbox": { - "execute_command": "echo 'vagrant'|sudo -S sh '{{.Path}}'" - }, - "vmware": { - "execute_command": "echo 'vagrant'|sudo -S sh '{{.Path}}'" - } - } - } - ], - "builders": [ - { - "type": "virtualbox", - "boot_command": [ - "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/ks.cfg<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": 40960, - "guest_os_type": "Fedora_64", - "http_directory": "http", - "iso_checksum": "17d5c860bf9dc83e035882a7b33ffc77", - "iso_checksum_type": "md5", - "iso_url": "http://mirrors.kernel.org/fedora/releases/18/Fedora/x86_64/iso/Fedora-18-x86_64-DVD.iso", - "ssh_username": "vagrant", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_wait_timeout": "10000s", - "shutdown_command": "echo '/sbin/halt -h -p' > shutdown.sh; echo 'vagrant'|sudo -S sh 'shutdown.sh'", - "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", - "virtualbox_version_file": ".vbox_version", - "vboxmanage": [ - [ - "modifyvm", - "{{.Name}}", - "--memory", - "512" - ], - [ - "modifyvm", - "{{.Name}}", - "--cpus", - "1" - ] - ], - "iso_md5": "17d5c860bf9dc83e035882a7b33ffc77" - }, - { - "type": "vmware", - "boot_command": [ - "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/ks.cfg<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": 40960, - "guest_os_type": "fedora-64", - "http_directory": "http", - "iso_checksum": "17d5c860bf9dc83e035882a7b33ffc77", - "iso_checksum_type": "md5", - "iso_url": "http://mirrors.kernel.org/fedora/releases/18/Fedora/x86_64/iso/Fedora-18-x86_64-DVD.iso", - "ssh_username": "vagrant", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_wait_timeout": "10000s", - "shutdown_command": "echo '/sbin/halt -h -p' > shutdown.sh; echo 'vagrant'|sudo -S sh 'shutdown.sh'", - "vmx_data": { - "memsize": "512", - "numvcpus": "1", - "cpuid.coresPerSocket": "1" - }, - "iso_md5": "17d5c860bf9dc83e035882a7b33ffc77" - } - ], - "post-provisioner": [ - { - "type": "vagrant", - "output": "fedora-18-{{.Provisioner}}.box" - } - ] -} \ No newline at end of file diff --git a/templates/fedora-19/http/ks.cfg b/templates/fedora-19/http/ks.cfg deleted file mode 100644 index c89695e03..000000000 --- a/templates/fedora-19/http/ks.cfg +++ /dev/null @@ -1,50 +0,0 @@ -install -cdrom -lang en_US.UTF-8 -keyboard us -network --bootproto=dhcp -rootpw --iscrypted $1$damlkd,f$UC/u5pUts5QiU3ow.CSso/ -firewall --disabled -authconfig --enableshadow --passalgo=sha512 -selinux --disabled -timezone UTC -bootloader --location=mbr -text -skipx -zerombr -clearpart --all --initlabel -part /boot --fstype=ext4 --size=500 -part pv.2 --grow --size=500 -volgroup vg_vagrant --pesize=32768 pv.2 -logvol / --fstype=ext4 --name=lv_root --vgname=vg_vagrant --size=1024 --grow -logvol swap --fstype=swap --name=lv_swap --vgname=vg_vagrant --size=528 --grow --maxsize=1056 -bootloader --location=mbr --append="norhgb biosdevname=0" -auth --useshadow --enablemd5 -firstboot --disabled -reboot - -%packages -@Core -bzip2 -gcc -kernel-devel -kernel-headers -openssl-devel -readline-devel -tar -wget -zlib-devel -%end - -%post -# update root certs -wget -O/etc/pki/tls/certs/ca-bundle.crt http://curl.haxx.se/ca/cacert.pem -# vagrant -groupadd vagrant -useradd vagrant -g vagrant -G wheel -u 900 -echo "vagrant" | passwd --stdin vagrant -# sudo -echo 'Defaults:vagrant !requiretty' > /etc/sudoers.d/vagrant -echo '%vagrant ALL=(ALL) NOPASSWD: ALL' >> /etc/sudoers.d/vagrant -chmod 440 /etc/sudoers.d/vagrant -%end diff --git a/templates/fedora-19/scripts/cleanup.sh b/templates/fedora-19/scripts/cleanup.sh deleted file mode 100644 index a4d82c900..000000000 --- a/templates/fedora-19/scripts/cleanup.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash -eux -yum -y erase gtk2 libX11 hicolor-icon-theme freetype -yum -y clean all -rm -f /tmp/chef*rpm diff --git a/templates/fedora-19/scripts/minimize.sh b/templates/fedora-19/scripts/minimize.sh deleted file mode 100644 index 3846a1d65..000000000 --- a/templates/fedora-19/scripts/minimize.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash -eux - -dd if=/dev/zero of=/EMPTY bs=1M -rm -f /EMPTY diff --git a/templates/fedora-19/scripts/sshd.sh b/templates/fedora-19/scripts/sshd.sh deleted file mode 100644 index c6e4f20a6..000000000 --- a/templates/fedora-19/scripts/sshd.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash -eux - -echo "UseDNS no" >> /etc/ssh/sshd_config diff --git a/templates/fedora-19/scripts/vagrant.sh b/templates/fedora-19/scripts/vagrant.sh deleted file mode 100644 index 72dd2f444..000000000 --- a/templates/fedora-19/scripts/vagrant.sh +++ /dev/null @@ -1,33 +0,0 @@ -#!/bin/bash -eux - -if [ -f /home/vagrant/.vbox_version ]; then - mkdir /tmp/vbox - VER=$(cat /home/vagrant/.vbox_version) - mount -o loop VBoxGuestAdditions_$VER.iso /tmp/vbox - sh /tmp/vbox/VBoxLinuxAdditions.run - umount /tmp/vbox - rmdir /tmp/vbox - rm *.iso -fi - -if [ -f /home/vagrant/.vmfusion_version ]; then - #Set Linux-specific paths and ISO filename - home_dir="/home/vagrant" - iso_name="linux.iso" - mount_point="/tmp/vmware-tools" - #Run install, unmount ISO and remove it - mkdir ${mount_point} - cd ${home_dir} - /bin/mount -o loop ${iso_name} ${mount_point} - tar zxf ${mount_point}/*.tar.gz && cd vmware-tools-distrib && ./vmware-install.pl --default - /bin/umount ${mount_point} - /bin/rm -rf ${home_dir}/${iso_name} ${home_dir}/vmware-tools-distrib - rmdir ${mount_point} -fi - -mkdir /home/vagrant/.ssh -wget --no-check-certificate \ - 'https://github.com/mitchellh/vagrant/raw/master/keys/vagrant.pub' \ - -O /home/vagrant/.ssh/authorized_keys -chown -R vagrant /home/vagrant/.ssh -chmod -R go-rwsx /home/vagrant/.ssh diff --git a/templates/fedora-19/template.json b/templates/fedora-19/template.json deleted file mode 100644 index 47b080612..000000000 --- a/templates/fedora-19/template.json +++ /dev/null @@ -1,88 +0,0 @@ -{ - "provisioners": [ - { - "type": "shell", - "scripts": [ - "scripts/vagrant.sh", - "scripts/sshd.sh", - "scripts/cleanup.sh", - "scripts/minimize.sh" - ], - "override": { - "virtualbox": { - "execute_command": "echo 'vagrant'|sudo -S sh '{{.Path}}'" - }, - "vmware": { - "execute_command": "echo 'vagrant'|sudo -S sh '{{.Path}}'" - } - } - } - ], - "builders": [ - { - "type": "virtualbox", - "boot_command": [ - "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/ks.cfg<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": 40960, - "guest_os_type": "Fedora_64", - "http_directory": "http", - "iso_checksum": "638d69c23621d5befc714bcd66b0611e", - "iso_checksum_type": "md5", - "iso_url": "http://mirrors.kernel.org/fedora/releases/19/Fedora/x86_64/iso/Fedora-19-x86_64-DVD.iso", - "ssh_username": "vagrant", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_wait_timeout": "10000s", - "shutdown_command": "echo '/sbin/halt -h -p' > shutdown.sh; echo 'vagrant'|sudo -S sh 'shutdown.sh'", - "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", - "virtualbox_version_file": ".vbox_version", - "vboxmanage": [ - [ - "modifyvm", - "{{.Name}}", - "--memory", - "512" - ], - [ - "modifyvm", - "{{.Name}}", - "--cpus", - "1" - ] - ], - "iso_md5": "638d69c23621d5befc714bcd66b0611e" - }, - { - "type": "vmware", - "boot_command": [ - "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/ks.cfg<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": 40960, - "guest_os_type": "fedora-64", - "http_directory": "http", - "iso_checksum": "638d69c23621d5befc714bcd66b0611e", - "iso_checksum_type": "md5", - "iso_url": "http://mirrors.kernel.org/fedora/releases/19/Fedora/x86_64/iso/Fedora-19-x86_64-DVD.iso", - "ssh_username": "vagrant", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_wait_timeout": "10000s", - "shutdown_command": "echo '/sbin/halt -h -p' > shutdown.sh; echo 'vagrant'|sudo -S sh 'shutdown.sh'", - "vmx_data": { - "memsize": "512", - "numvcpus": "1", - "cpuid.coresPerSocket": "1" - }, - "iso_md5": "638d69c23621d5befc714bcd66b0611e" - } - ], - "post-provisioner": [ - { - "type": "vagrant", - "output": "fedora-19-{{.Provisioner}}.box" - } - ] -} \ No newline at end of file diff --git a/templates/sles-11-sp2-i386/http/autoinst.xml b/templates/sles-11-sp2-i386/http/autoinst.xml deleted file mode 100644 index 8773e8fb6..000000000 --- a/templates/sles-11-sp2-i386/http/autoinst.xml +++ /dev/null @@ -1,2569 +0,0 @@ -<?xml version="1.0"?> -<!DOCTYPE profile> -<profile xmlns="http://www.suse.com/1.0/yast2ns" xmlns:config="http://www.suse.com/1.0/configns"> - <add-on> - <add_on_products config:type="list"> - <listentry> - <media_url><![CDATA[http://demeter.uni-regensburg.de/SLE11SP2-SDK-x86/DVD1/]]></media_url> - <product>sle-sdk</product> - <product_dir>/</product_dir> - </listentry> - </add_on_products> - </add-on> - <bootloader> - <device_map config:type="list"> - <device_map_entry> - <firmware>hd0</firmware> - <linux>/dev/sda</linux> - </device_map_entry> - </device_map> - <global> - <activate>true</activate> - <boot_root>true</boot_root> - <default>SUSE Linux Enterprise Server 11 SP2 - 3.0.13-0.27</default> - <generic_mbr>true</generic_mbr> - <gfxmenu>/boot/message</gfxmenu> - <lines_cache_id>2</lines_cache_id> - <timeout config:type="integer">8</timeout> - </global> - <initrd_modules config:type="list"> - <initrd_module> - <module>ahci</module> - </initrd_module> - <initrd_module> - <module>ata_piix</module> - </initrd_module> - <initrd_module> - <module>ata_generic</module> - </initrd_module> - <initrd_module> - <module>jbd</module> - </initrd_module> - <initrd_module> - <module>mbcache</module> - </initrd_module> - <initrd_module> - <module>ext3</module> - </initrd_module> - </initrd_modules> - <loader_type>grub</loader_type> - <sections config:type="list"> - <section> - <append>resume=/dev/sda1 splash=silent crashkernel=128M-:64M showopts</append> - <image>(hd0,1)/boot/vmlinuz-3.0.13-0.27-default</image> - <initial>1</initial> - <initrd>(hd0,1)/boot/initrd-3.0.13-0.27-default</initrd> - <lines_cache_id>0</lines_cache_id> - <name>SUSE Linux Enterprise Server 11 SP2 - 3.0.13-0.27</name> - <original_name>linux</original_name> - <root>/dev/sda2</root> - <type>image</type> - <vgamode>0x314</vgamode> - </section> - <section> - <append>showopts ide=nodma apm=off noresume edd=off powersaved=off nohz=off highres=off processor.max_cstate=1 nomodeset x11failsafe</append> - <image>(hd0,1)/boot/vmlinuz-3.0.13-0.27-default</image> - <initrd>(hd0,1)/boot/initrd-3.0.13-0.27-default</initrd> - <lines_cache_id>1</lines_cache_id> - <name>Failsafe -- SUSE Linux Enterprise Server 11 SP2 - 3.0.13-0.27</name> - <original_name>failsafe</original_name> - <root>/dev/sda2</root> - <type>image</type> - <vgamode>0x314</vgamode> - </section> - </sections> - </bootloader> - <ca_mgm> - <CAName>YaST_Default_CA</CAName> - <ca_commonName>YaST Default CA (vagrant-sles-11sp2-x86)</ca_commonName> - <country>US</country> - <locality></locality> - <organisation></organisation> - <organisationUnit></organisationUnit> - <password>ENTER PASSWORD HERE</password> - <server_commonName>vagrant-sles-11sp2-x86.vagrantup.com</server_commonName> - <server_email>postmaster@vagrantup.com</server_email> - <state></state> - <takeLocalServerName config:type="boolean">false</takeLocalServerName> - </ca_mgm> - <deploy_image> - <image_installation config:type="boolean">false</image_installation> - </deploy_image> - <general> - <ask-list config:type="list"/> - <mode> - <confirm config:type="boolean">false</confirm> - </mode> - <mouse> - <id>none</id> - </mouse> - <proposals config:type="list"/> - <signature-handling> - <accept_file_without_checksum config:type="boolean">true</accept_file_without_checksum> - <accept_non_trusted_gpg_key config:type="boolean">true</accept_non_trusted_gpg_key> - <accept_unknown_gpg_key config:type="boolean">true</accept_unknown_gpg_key> - <accept_unsigned_file config:type="boolean">true</accept_unsigned_file> - <accept_verification_failed config:type="boolean">false</accept_verification_failed> - <import_gpg_key config:type="boolean">true</import_gpg_key> - </signature-handling> - <storage/> - </general> - <groups config:type="list"> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>100</gid> - <group_password>x</group_password> - <groupname>users</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>19</gid> - <group_password>x</group_password> - <groupname>floppy</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>1</gid> - <group_password>x</group_password> - <groupname>bin</groupname> - <userlist>daemon</userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>41</gid> - <group_password>x</group_password> - <groupname>xok</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>65533</gid> - <group_password>x</group_password> - <groupname>nobody</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>43</gid> - <group_password>x</group_password> - <groupname>modem</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>5</gid> - <group_password>x</group_password> - <groupname>tty</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>7</gid> - <group_password>x</group_password> - <groupname>lp</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>104</gid> - <group_password>!</group_password> - <groupname>uuidd</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>51</gid> - <group_password>!</group_password> - <groupname>postfix</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>112</gid> - <group_password>!</group_password> - <groupname>gdm</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>65534</gid> - <group_password>x</group_password> - <groupname>nogroup</groupname> - <userlist>nobody</userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>101</gid> - <group_password>!</group_password> - <groupname>messagebus</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>59</gid> - <group_password>!</group_password> - <groupname>maildrop</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>33</gid> - <group_password>x</group_password> - <groupname>video</groupname> - <userlist>vagrant</userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>3</gid> - <group_password>x</group_password> - <groupname>sys</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>15</gid> - <group_password>x</group_password> - <groupname>shadow</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>20</gid> - <group_password>x</group_password> - <groupname>cdrom</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>21</gid> - <group_password>x</group_password> - <groupname>console</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>42</gid> - <group_password>x</group_password> - <groupname>trusted</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>102</gid> - <group_password>!</group_password> - <groupname>haldaemon</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>106</gid> - <group_password>!</group_password> - <groupname>puppet</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>16</gid> - <group_password>x</group_password> - <groupname>dialout</groupname> - <userlist>vagrant</userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>107</gid> - <group_password>!</group_password> - <groupname>polkituser</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>10</gid> - <group_password>x</group_password> - <groupname>wheel</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>109</gid> - <group_password>!</group_password> - <groupname>pulse</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>8</gid> - <group_password>x</group_password> - <groupname>www</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>40</gid> - <group_password>x</group_password> - <groupname>games</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>6</gid> - <group_password>x</group_password> - <groupname>disk</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>17</gid> - <group_password>x</group_password> - <groupname>audio</groupname> - <userlist>pulse</userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>111</gid> - <group_password>!</group_password> - <groupname>suse-ncc</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>49</gid> - <group_password>x</group_password> - <groupname>ftp</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>103</gid> - <group_password>!</group_password> - <groupname>tape</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>25</gid> - <group_password>!</group_password> - <groupname>at</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>9</gid> - <group_password>x</group_password> - <groupname>kmem</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>32</gid> - <group_password>x</group_password> - <groupname>public</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>12</gid> - <group_password>x</group_password> - <groupname>mail</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>0</gid> - <group_password>x</group_password> - <groupname>root</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>2</gid> - <group_password>x</group_password> - <groupname>daemon</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>105</gid> - <group_password>!</group_password> - <groupname>sfcb</groupname> - <userlist>root</userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>108</gid> - <group_password>!</group_password> - <groupname>ntp</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>14</gid> - <group_password>x</group_password> - <groupname>uucp</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>110</gid> - <group_password>!</group_password> - <groupname>pulse-access</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>71</gid> - <group_password>!</group_password> - <groupname>ntadmin</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>62</gid> - <group_password>x</group_password> - <groupname>man</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>22</gid> - <group_password>x</group_password> - <groupname>utmp</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>13</gid> - <group_password>x</group_password> - <groupname>news</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>65</gid> - <group_password>!</group_password> - <groupname>sshd</groupname> - <userlist></userlist> - </group> - </groups> - <host> - <hosts config:type="list"> - <hosts_entry> - <host_address>127.0.0.1</host_address> - <names config:type="list"> - <name>localhost</name> - </names> - </hosts_entry> - <hosts_entry> - <host_address>::1</host_address> - <names config:type="list"> - <name>localhost ipv6-localhost ipv6-loopback</name> - </names> - </hosts_entry> - <hosts_entry> - <host_address>fe00::0</host_address> - <names config:type="list"> - <name>ipv6-localnet</name> - </names> - </hosts_entry> - <hosts_entry> - <host_address>ff00::0</host_address> - <names config:type="list"> - <name>ipv6-mcastprefix</name> - </names> - </hosts_entry> - <hosts_entry> - <host_address>ff02::1</host_address> - <names config:type="list"> - <name>ipv6-allnodes</name> - </names> - </hosts_entry> - <hosts_entry> - <host_address>ff02::2</host_address> - <names config:type="list"> - <name>ipv6-allrouters</name> - </names> - </hosts_entry> - <hosts_entry> - <host_address>ff02::3</host_address> - <names config:type="list"> - <name>ipv6-allhosts</name> - </names> - </hosts_entry> - </hosts> - </host> - <login_settings/> - <networking> - <dhcp_options> - <dhclient_client_id></dhclient_client_id> - <dhclient_hostname_option>AUTO</dhclient_hostname_option> - </dhcp_options> - <dns> - <dhcp_hostname config:type="boolean">false</dhcp_hostname> - <domain>vagrantup.com</domain> - <hostname>vagrant-sles-11sp2-x86</hostname> - <resolv_conf_policy>auto</resolv_conf_policy> - <searchlist config:type="list"> - <search>vagrantup.com</search> - </searchlist> - <write_hostname config:type="boolean">true</write_hostname> - </dns> - <interfaces config:type="list"> - <interface> - <bootproto>dhcp</bootproto> - <device>eth0</device> - <name>82540EM Gigabit Ethernet Controller</name> - <startmode>auto</startmode> - <usercontrol>no</usercontrol> - </interface> - </interfaces> - <managed config:type="boolean">false</managed> - <net-udev config:type="list"> - <rule> - <name>eth0</name> - <rule>KERNELS</rule> - <value>0000:00:03.0</value> - </rule> - </net-udev> - <routing> - <ip_forward config:type="boolean">false</ip_forward> - </routing> - </networking> - <partitioning config:type="list"> - <drive> - <device>/dev/sda</device> - <initialize config:type="boolean">true</initialize> - <partitions config:type="list"> - <partition> - <create config:type="boolean">true</create> - <crypt_fs config:type="boolean">false</crypt_fs> - <filesystem config:type="symbol">swap</filesystem> - <format config:type="boolean">true</format> - <fstopt>defaults</fstopt> - <loop_fs config:type="boolean">false</loop_fs> - <mount>swap</mount> - <mountby config:type="symbol">device</mountby> - <partition_id config:type="integer">130</partition_id> - <partition_nr config:type="integer">1</partition_nr> - <raid_options/> - <resize config:type="boolean">false</resize> - <size>1561492992</size> - </partition> - <partition> - <create config:type="boolean">true</create> - <crypt_fs config:type="boolean">false</crypt_fs> - <filesystem config:type="symbol">ext3</filesystem> - <format config:type="boolean">true</format> - <fstopt>acl,user_xattr</fstopt> - <loop_fs config:type="boolean">false</loop_fs> - <mount>/</mount> - <mountby config:type="symbol">device</mountby> - <partition_id config:type="integer">131</partition_id> - <partition_nr config:type="integer">2</partition_nr> - <raid_options/> - <resize config:type="boolean">false</resize> - <size>19895844352</size> - </partition> - </partitions> - <pesize></pesize> - <type config:type="symbol">CT_DISK</type> - <use>all</use> - </drive> - </partitioning> - <report> - <errors> - <log config:type="boolean">true</log> - <show config:type="boolean">true</show> - <timeout config:type="integer">0</timeout> - </errors> - <messages> - <log config:type="boolean">true</log> - <show config:type="boolean">true</show> - <timeout config:type="integer">0</timeout> - </messages> - <warnings> - <log config:type="boolean">true</log> - <show config:type="boolean">true</show> - <timeout config:type="integer">0</timeout> - </warnings> - <yesno_messages> - <log config:type="boolean">true</log> - <show config:type="boolean">true</show> - <timeout config:type="integer">0</timeout> - </yesno_messages> - </report> - <software> - - <packages config:type="list"> - <package>desktop-translations</package> - <package>gconf2-branding-SLES</package> - <package>libproxy0-config-gnome</package> - <package>sle-sdk-release</package> - <package>sle-sdk-release-SDK</package> - <package>sles-manuals_en</package> - <package>yast2-trans-en_US</package> - </packages> - <patterns config:type="list"> - <pattern>Basis-Devel</pattern> - <pattern>Minimal</pattern> - <pattern>apparmor</pattern> - <pattern>base</pattern> - <pattern>sdk_kernel</pattern> - </patterns> - <remove-packages config:type="list"> - <package>3ddiag</package> - <package>CASA</package> - <package>CASA-devel</package> - <package>CASA_auth_token_client</package> - <package>CASA_auth_token_client-devel</package> - <package>ConsoleKit-devel</package> - <package>ConsoleKit-x11</package> - <package>DirectFB-devel</package> - <package>FastCGI</package> - <package>IlmBase</package> - <package>IlmBase-devel</package> - <package>ImageMagick</package> - <package>ImageMagick-devel</package> - <package>LibVNCServer</package> - <package>LibVNCServer-devel</package> - <package>Mesa</package> - <package>Mesa-devel</package> - <package>ModemManager</package> - <package>Modules</package> - <package>NetworkManager</package> - <package>NetworkManager-devel</package> - <package>NetworkManager-glib</package> - <package>NetworkManager-gnome</package> - <package>NetworkManager-kde4</package> - <package>NetworkManager-kde4-lang</package> - <package>NetworkManager-kde4-libs</package> - <package>OpenEXR</package> - <package>OpenEXR-devel</package> - <package>OpenIPMI-devel</package> - <package>PackageKit</package> - <package>PackageKit-devel</package> - <package>PackageKit-lang</package> - <package>PolicyKit-devel</package> - <package>PolicyKit-gnome</package> - <package>PolicyKit-gnome-devel</package> - <package>PolicyKit-gnome-libs</package> - <package>SDL-devel</package> - <package>SDL_net</package> - <package>SDL_net-devel</package> - <package>TeX-Guy</package> - <package>TeX-Guy-devel</package> - <package>VFlib3</package> - <package>VFlib3-devel</package> - <package>WindowMaker</package> - <package>WindowMaker-devel</package> - <package>a2ps</package> - <package>aalib</package> - <package>aalib-devel</package> - <package>akonadi-runtime</package> - <package>akregator</package> - <package>alsa-devel</package> - <package>alsa-firmware</package> - <package>alsa-plugins-pulse</package> - <package>alsa-tools</package> - <package>alsa-tools-devel</package> - <package>anthy</package> - <package>anthy-devel</package> - <package>antlr</package> - <package>apache2</package> - <package>apache2-devel</package> - <package>apache2-mod_perl</package> - <package>apache2-mod_perl-devel</package> - <package>apache2-prefork</package> - <package>apache2-utils</package> - <package>apache2-worker</package> - <package>apparmor-profile-editor</package> - <package>art-sharp2</package> - <package>arts</package> - <package>arts-devel</package> - <package>aspell-devel</package> - <package>at-spi</package> - <package>at-spi-devel</package> - <package>at-spi-lang</package> - <package>atk-devel</package> - <package>audiofile</package> - <package>audiofile-devel</package> - <package>audit-devel</package> - <package>augeas-lenses</package> - <package>automoc4</package> - <package>avahi</package> - <package>avahi-compat-howl-devel</package> - <package>avahi-compat-mDNSResponder-devel</package> - <package>avahi-lang</package> - <package>babl-0_0</package> - <package>banshee-1</package> - <package>banshee-1-backend-engine-gstreamer</package> - <package>banshee-1-backend-platform-gnome</package> - <package>banshee-1-backend-platform-unix</package> - <package>banshee-1-devel</package> - <package>banshee-1-extensions-default</package> - <package>banshee-1-lang</package> - <package>beagle-devel</package> - <package>bind-devel</package> - <package>binutils-devel</package> - <package>bluez</package> - <package>bluez-devel</package> - <package>boo</package> - <package>boo-devel</package> - <package>boost-devel</package> - <package>bootsplash-branding-SLED</package> - <package>cairo-devel</package> - <package>cairomm</package> - <package>cairomm-devel</package> - <package>canna</package> - <package>canna-devel</package> - <package>canna-libs</package> - <package>cannadic</package> - <package>capi4linux</package> - <package>capi4linux-devel</package> - <package>cdk</package> - <package>cdk-devel</package> - <package>cdrdao</package> - <package>chasen</package> - <package>chasen-devel</package> - <package>check</package> - <package>check-devel</package> - <package>chmlib</package> - <package>chmlib-devel</package> - <package>cim-schema</package> - <package>clucene-core</package> - <package>clucene-core-devel</package> - <package>cmake</package> - <package>compiz</package> - <package>compiz-branding-SLE</package> - <package>compiz-devel</package> - <package>compiz-gnome</package> - <package>coolkey-devel</package> - <package>cracklib-devel</package> - <package>crash-devel</package> - <package>crimson</package> - <package>cscope</package> - <package>cups</package> - <package>cups-devel</package> - <package>cvsps</package> - <package>cyrus-imapd-devel</package> - <package>cyrus-sasl-crammd5</package> - <package>cyrus-sasl-devel</package> - <package>dante</package> - <package>dante-devel</package> - <package>db1</package> - <package>db1-devel</package> - <package>db43</package> - <package>db43-devel</package> - <package>dbus-1-devel</package> - <package>dbus-1-glib-devel</package> - <package>dbus-1-python-devel</package> - <package>dbus-1-qt3</package> - <package>dbus-1-qt3-devel</package> - <package>dbus-1-x11</package> - <package>dejagnu</package> - <package>dejavu</package> - <package>desktop-data-openSUSE</package> - <package>desktop-file-utils</package> - <package>devhelp</package> - <package>devhelp-devel</package> - <package>devhelp-lang</package> - <package>device-mapper-devel</package> - <package>dhcp</package> - <package>dhcp-client</package> - <package>dhcp-devel</package> - <package>diffstat</package> - <package>dmapi-devel</package> - <package>dnsmasq</package> - <package>docbook-xsl-stylesheets</package> - <package>docbook_4</package> - <package>doxygen</package> - <package>dvd+rw-tools</package> - <package>e2fsprogs-devel</package> - <package>emacs</package> - <package>emacs-nox</package> - <package>emacs-x11</package> - <package>enchant</package> - <package>enchant-devel</package> - <package>enscript</package> - <package>eog</package> - <package>eog-devel</package> - <package>eog-lang</package> - <package>espeak</package> - <package>evince</package> - <package>evince-devel</package> - <package>evince-lang</package> - <package>evoldap2-devel</package> - <package>evolution</package> - <package>evolution-data-server</package> - <package>evolution-data-server-devel</package> - <package>evolution-data-server-lang</package> - <package>evolution-devel</package> - <package>evolution-lang</package> - <package>expect-devel</package> - <package>facter</package> - <package>fam</package> - <package>fam-devel</package> - <package>farsight</package> - <package>farsight-devel</package> - <package>festival</package> - <package>festival-devel</package> - <package>fftw</package> - <package>fftw-devel</package> - <package>fftw-mpi</package> - <package>fftw-mpi-devel</package> - <package>fftw-threads</package> - <package>fftw-threads-devel</package> - <package>fftw3</package> - <package>fftw3-devel</package> - <package>fftw3-threads</package> - <package>fftw3-threads-devel</package> - <package>file-devel</package> - <package>fileshareset</package> - <package>finch</package> - <package>finch-devel</package> - <package>flac-devel</package> - <package>fltk</package> - <package>fltk-devel</package> - <package>fontconfig-devel</package> - <package>fonts-config</package> - <package>foomatic-filters</package> - <package>freeglut</package> - <package>freeglut-devel</package> - <package>freeradius-client-devel</package> - <package>freeradius-client-libs</package> - <package>freeradius-server-devel</package> - <package>freeradius-server-libs</package> - <package>freetype</package> - <package>freetype2-devel</package> - <package>fribidi</package> - <package>fribidi-devel</package> - <package>ft2demos</package> - <package>fuse-devel</package> - <package>fwnn-devel</package> - <package>fxload</package> - <package>gcc-gij</package> - <package>gcc-java</package> - <package>gcc43-gij</package> - <package>gcc43-java</package> - <package>gconf-sharp2</package> - <package>gconf2-devel</package> - <package>gconfmm</package> - <package>gconfmm-devel</package> - <package>gd</package> - <package>gd-devel</package> - <package>gdbm-32bit</package> - <package>gdk-pixbuf</package> - <package>gdk-pixbuf-devel</package> - <package>gegl-0_0</package> - <package>gettext-tools</package> - <package>gfxboot-branding-SLED</package> - <package>gfxboot-devel</package> - <package>ggz</package> - <package>ggz-client-libs</package> - <package>ggz-client-libs-devel</package> - <package>ggz-client-libs-lang</package> - <package>ghex</package> - <package>ghex-devel</package> - <package>ghex-lang</package> - <package>ghostscript-devel</package> - <package>ghostscript-fonts-other</package> - <package>ghostscript-fonts-std</package> - <package>ghostscript-ijs-devel</package> - <package>ghostscript-library</package> - <package>ghostscript-omni</package> - <package>ghostscript-x11</package> - <package>giflib-devel</package> - <package>gimp</package> - <package>gimp-branding-SLED</package> - <package>gimp-devel</package> - <package>gimp-lang</package> - <package>gimp-plugins-python</package> - <package>git</package> - <package>git-arch</package> - <package>git-core</package> - <package>git-cvs</package> - <package>git-daemon</package> - <package>git-email</package> - <package>git-gui</package> - <package>git-svn</package> - <package>git-web</package> - <package>gitk</package> - <package>gjdoc</package> - <package>glade-sharp2</package> - <package>glade3</package> - <package>glade3-lang</package> - <package>glib</package> - <package>glib-devel</package> - <package>glib-sharp2</package> - <package>glib2-devel</package> - <package>glibmm2</package> - <package>glibmm2-devel</package> - <package>glitz</package> - <package>glitz-devel</package> - <package>gltt</package> - <package>gltt-devel</package> - <package>gmime-2_4-devel</package> - <package>gmime-devel</package> - <package>gmp-devel</package> - <package>gnet</package> - <package>gnet-devel</package> - <package>gnokii</package> - <package>gnokii-devel</package> - <package>gnokii-smsd</package> - <package>gnome-certauth-devel</package> - <package>gnome-control-center</package> - <package>gnome-control-center-devel</package> - <package>gnome-control-center-lang</package> - <package>gnome-desktop</package> - <package>gnome-desktop-devel</package> - <package>gnome-desktop-lang</package> - <package>gnome-doc-utils</package> - <package>gnome-doc-utils-devel</package> - <package>gnome-doc-utils-lang</package> - <package>gnome-keyring-devel</package> - <package>gnome-keyring-sharp</package> - <package>gnome-keyring-sharp-devel</package> - <package>gnome-libs</package> - <package>gnome-libs-devel</package> - <package>gnome-mag</package> - <package>gnome-mag-devel</package> - <package>gnome-mag-lang</package> - <package>gnome-main-menu</package> - <package>gnome-main-menu-lang</package> - <package>gnome-media</package> - <package>gnome-media-devel</package> - <package>gnome-media-lang</package> - <package>gnome-menus</package> - <package>gnome-menus-branding-SLED</package> - <package>gnome-menus-devel</package> - <package>gnome-menus-lang</package> - <package>gnome-mount</package> - <package>gnome-mount-lang</package> - <package>gnome-panel</package> - <package>gnome-panel-devel</package> - <package>gnome-panel-lang</package> - <package>gnome-pilot</package> - <package>gnome-pilot-devel</package> - <package>gnome-pilot-lang</package> - <package>gnome-settings-daemon</package> - <package>gnome-settings-daemon-devel</package> - <package>gnome-settings-daemon-lang</package> - <package>gnome-sharp2</package> - <package>gnome-speech</package> - <package>gnome-speech-devel</package> - <package>gnome-themes</package> - <package>gnome-utils</package> - <package>gnome-utils-devel</package> - <package>gnome-utils-lang</package> - <package>gnome-vfs-sharp2</package> - <package>gnome-vfs2</package> - <package>gnome-vfs2-devel</package> - <package>gnome-vfs2-lang</package> - <package>gnome-vfsmm</package> - <package>gnome-vfsmm-devel</package> - <package>gnopernicus</package> - <package>gnopernicus-devel</package> - <package>gnopernicus-lang</package> - <package>gnutls</package> - <package>goffice</package> - <package>goffice-devel</package> - <package>goffice-lang</package> - <package>goocanvas</package> - <package>goocanvas-devel</package> - <package>goocanvas-lang</package> - <package>goom2k4</package> - <package>goom2k4-devel</package> - <package>graphviz</package> - <package>graphviz-devel</package> - <package>graphviz-gd</package> - <package>graphviz-gnome</package> - <package>gstreamer-0_10</package> - <package>gstreamer-0_10-devel</package> - <package>gstreamer-0_10-lang</package> - <package>gstreamer-0_10-plugins-base</package> - <package>gstreamer-0_10-plugins-base-devel</package> - <package>gstreamer-0_10-plugins-base-lang</package> - <package>gstreamer-0_10-plugins-good</package> - <package>gstreamer-0_10-plugins-good-lang</package> - <package>gstreamer-0_10-utils</package> - <package>gstreamer-utils</package> - <package>gtk</package> - <package>gtk-devel</package> - <package>gtk-lang</package> - <package>gtk-sharp2</package> - <package>gtk-vnc-devel</package> - <package>gtk2-devel</package> - <package>gtkglext</package> - <package>gtkglext-devel</package> - <package>gtkhtml2</package> - <package>gtkhtml2-devel</package> - <package>gtkhtml2-lang</package> - <package>gtkhtml314-sharp</package> - <package>gtkmm2</package> - <package>gtkmm2-devel</package> - <package>gtksourceview-devel</package> - <package>gtksourceview-lang</package> - <package>gtksourceview18</package> - <package>gtksourceview18-devel</package> - <package>gtkspell</package> - <package>gtkspell-devel</package> - <package>gtkspell-lang</package> - <package>gucharmap</package> - <package>gucharmap-devel</package> - <package>gucharmap-lang</package> - <package>guile</package> - <package>guile-devel</package> - <package>gutenprint</package> - <package>gutenprint-devel</package> - <package>gvfs-devel</package> - <package>gxmhtml</package> - <package>hal-devel</package> - <package>hal-palm</package> - <package>htdig</package> - <package>htdig-devel</package> - <package>hunspell</package> - <package>hunspell-devel</package> - <package>hunspell-tools</package> - <package>hwinfo-devel</package> - <package>i4l-base</package> - <package>icewm</package> - <package>icewm-lite</package> - <package>id3lib</package> - <package>id3lib-devel</package> - <package>imap-devel</package> - <package>imap-lib</package> - <package>imlib</package> - <package>imlib-devel</package> - <package>imlib2</package> - <package>imlib2-devel</package> - <package>indent</package> - <package>info2html</package> - <package>inn</package> - <package>inn-devel</package> - <package>intltool</package> - <package>ipadic</package> - <package>iptables-devel</package> - <package>iso-codes</package> - <package>iso-codes-devel</package> - <package>iso_ent</package> - <package>ispell</package> - <package>ispell-american</package> - <package>ispell-brazilian</package> - <package>ispell-british</package> - <package>ispell-czech</package> - <package>ispell-danish</package> - <package>ispell-finnish</package> - <package>ispell-french</package> - <package>ispell-german</package> - <package>ispell-hungarian</package> - <package>ispell-italian</package> - <package>ispell-ngerman</package> - <package>ispell-norsk</package> - <package>ispell-polish</package> - <package>ispell-portuguese</package> - <package>ispell-russian</package> - <package>ispell-slovak</package> - <package>ispell-spanish</package> - <package>ispell-swedish</package> - <package>itcl-devel</package> - <package>java-1_4_2-ibm</package> - <package>java-1_4_2-ibm-devel</package> - <package>java-1_5_0-gcj-compat</package> - <package>java-1_5_0-gcj-compat-devel</package> - <package>java-1_6_0-ibm</package> - <package>java-1_6_0-ibm-devel</package> - <package>joe</package> - <package>jpackage-utils</package> - <package>k3b</package> - <package>k3b-devel</package> - <package>k3b-lang</package> - <package>kaddressbook</package> - <package>kalarm</package> - <package>kde-susetranslations</package> - <package>kde4-filesystem</package> - <package>kde4-kgreeter-plugins</package> - <package>kdebase3</package> - <package>kdebase3-devel</package> - <package>kdebase3-runtime</package> - <package>kdebase4-SLED</package> - <package>kdebase4-SLED-lang</package> - <package>kdebase4-runtime</package> - <package>kdebase4-runtime-branding-SLED</package> - <package>kdebase4-workspace</package> - <package>kdebase4-workspace-branding-SLED</package> - <package>kdebase4-workspace-devel</package> - <package>kdebase4-workspace-ksysguardd</package> - <package>kdelibs3</package> - <package>kdelibs3-arts</package> - <package>kdelibs3-default-style</package> - <package>kdelibs3-devel</package> - <package>kdelibs3-doc</package> - <package>kdelibs4</package> - <package>kdelibs4-branding-SLED</package> - <package>kdelibs4-core</package> - <package>kdelibs4-doc</package> - <package>kdemultimedia3-arts</package> - <package>kdepim3</package> - <package>kdepim4</package> - <package>kdepim4-devel</package> - <package>kdepimlibs4</package> - <package>kdialog</package> - <package>kdm</package> - <package>kdm-branding-SLED</package> - <package>kernel-docs</package> - <package>kernel-syms</package> - <package>kernel-trace-devel</package> - <package>kernel-xen-devel</package> - <package>keyutils-devel</package> - <package>kio_sysinfo</package> - <package>kio_sysinfo-branding-SLED</package> - <package>kmail</package> - <package>knode</package> - <package>kontact</package> - <package>korganizer</package> - <package>kpilot</package> - <package>krb5-devel</package> - <package>ksh-devel</package> - <package>ktorrent</package> - <package>ktorrent-devel</package> - <package>ktorrent-lang</package> - <package>kwin</package> - <package>ladspa-devel</package> - <package>lib3ds-1-3</package> - <package>lib3ds-devel</package> - <package>libFLAC++6</package> - <package>libFLAC8</package> - <package>libHX-devel</package> - <package>libMagick++-devel</package> - <package>libMagick++1</package> - <package>libMagickWand1</package> - <package>libQtWebKit-devel</package> - <package>libQtWebKit4</package> - <package>libXerces-c-devel</package> - <package>libXerces-c28</package> - <package>libXiterm</package> - <package>libXiterm-devel</package> - <package>libacl-devel</package> - <package>libadns-devel</package> - <package>libadns1</package> - <package>libakode</package> - <package>libakode-devel</package> - <package>libakonadi4</package> - <package>libakonadiprotocolinternals-devel</package> - <package>libakonadiprotocolinternals1</package> - <package>libao</package> - <package>libao-devel</package> - <package>libapparmor-devel</package> - <package>libapr-util1</package> - <package>libapr-util1-devel</package> - <package>libapr1</package> - <package>libapr1-devel</package> - <package>libarchive-devel</package> - <package>libart_lgpl</package> - <package>libart_lgpl-devel</package> - <package>libassuan-devel</package> - <package>libatomic-ops-devel</package> - <package>libattr-devel</package> - <package>libavahi-core5</package> - <package>libavahi-devel</package> - <package>libavahi-glib-devel</package> - <package>libavahi-gobject-devel</package> - <package>libavahi-gobject0</package> - <package>libavahi-ui0</package> - <package>libavc1394-0</package> - <package>libavc1394-devel</package> - <package>libbabl-0_0-0</package> - <package>libbeagle-devel</package> - <package>libbeagle-python</package> - <package>libbeagle1</package> - <package>libbitmask-devel</package> - <package>libbitmask1</package> - <package>libblkid-devel</package> - <package>libblocxx-devel</package> - <package>libbonobo</package> - <package>libbonobo-devel</package> - <package>libbonobo-lang</package> - <package>libbonoboui</package> - <package>libbonoboui-devel</package> - <package>libbonoboui-lang</package> - <package>libboost_date_time1_36_0</package> - <package>libboost_filesystem1_36_0</package> - <package>libboost_graph1_36_0</package> - <package>libboost_iostreams1_36_0</package> - <package>libboost_math1_36_0</package> - <package>libboost_mpi1_36_0</package> - <package>libboost_program_options1_36_0</package> - <package>libboost_python1_36_0</package> - <package>libboost_serialization1_36_0</package> - <package>libboost_signals1_36_0</package> - <package>libboost_system1_36_0</package> - <package>libboost_test1_36_0</package> - <package>libboost_thread1_36_0</package> - <package>libboost_wave1_36_0</package> - <package>libbotan-1_6_4</package> - <package>libbotan-devel</package> - <package>libbtctl</package> - <package>libbtctl-devel</package> - <package>libbtctl-lang</package> - <package>libbtctl4</package> - <package>libbz2-devel</package> - <package>libcaca</package> - <package>libcaca-devel</package> - <package>libcanberra-gtk</package> - <package>libcanberra-gtk0</package> - <package>libcanberra0</package> - <package>libcap-devel</package> - <package>libcap-ng0</package> - <package>libcdda_interface0</package> - <package>libcdda_paranoia0</package> - <package>libcddb-devel</package> - <package>libcddb2</package> - <package>libcdio++0</package> - <package>libcdio-devel</package> - <package>libcgroup-devel</package> - <package>libcgroup1</package> - <package>libchewing</package> - <package>libchewing-devel</package> - <package>libcmpiutil</package> - <package>libcmpiutil-devel</package> - <package>libcolorblind0</package> - <package>libcom_err-devel</package> - <package>libcompizconfig</package> - <package>libcompizconfig-devel</package> - <package>libcppunit-1_12-0</package> - <package>libcppunit-devel</package> - <package>libcpuset-devel</package> - <package>libcpuset1</package> - <package>libcroco</package> - <package>libcroco-0_6-3</package> - <package>libcroco-devel</package> - <package>libcryptsetup-devel</package> - <package>libcsync-devel</package> - <package>libcsync0</package> - <package>libcurl-devel</package> - <package>libdaemon-devel</package> - <package>libdaemon0</package> - <package>libdatrie-devel</package> - <package>libdatrie0</package> - <package>libdb-4_5-32bit</package> - <package>libdb-4_5-devel</package> - <package>libdbus-1-qt3-0</package> - <package>libdbus-1-qt3-0-devel</package> - <package>libdc1394-22</package> - <package>libdc1394-devel</package> - <package>libdc1394_control12</package> - <package>libdc1394_control12-devel</package> - <package>libdhcp6client-1_0-2</package> - <package>libdhcp6client-devel</package> - <package>libdigikam-devel</package> - <package>libdiscid1</package> - <package>libdjvulibre-devel</package> - <package>libdjvulibre21</package> - <package>libdmxview-devel</package> - <package>libdmxview0</package> - <package>libdnet-devel</package> - <package>libdnet1</package> - <package>libdns_sd</package> - <package>libdrm</package> - <package>libdrm-devel</package> - <package>libdv-devel</package> - <package>libdv4</package> - <package>libdvdread4</package> - <package>libdw-devel</package> - <package>libebl-devel</package> - <package>libedit-devel</package> - <package>libedit0</package> - <package>libelf-devel</package> - <package>libenchant1</package> - <package>libesd-devel</package> - <package>libesd0</package> - <package>libesmtp-devel</package> - <package>libevoldap-2_4-2</package> - <package>libevtlog-devel</package> - <package>libevtlog0</package> - <package>libexempi-devel</package> - <package>libexempi3</package> - <package>libexif-devel</package> - <package>libexiv2-4</package> - <package>libexiv2-devel</package> - <package>libexpat-devel</package> - <package>libext2fs-devel</package> - <package>libfarsight-0_1-3</package> - <package>libffi-devel</package> - <package>libffi43</package> - <package>libffi43-devel</package> - <package>libflaim-devel</package> - <package>libfprint-devel</package> - <package>libfreebl3</package> - <package>libfreebob</package> - <package>libfreebob-devel</package> - <package>libgadu</package> - <package>libgadu-devel</package> - <package>libgail-gnome</package> - <package>libgail-gnome-devel</package> - <package>libgcj-devel</package> - <package>libgcj43</package> - <package>libgcj43-devel</package> - <package>libgcj43-jar</package> - <package>libgcj_bc43</package> - <package>libgcrypt-devel</package> - <package>libgda-3_0-3</package> - <package>libgda-3_0-devel</package> - <package>libgdiplus0</package> - <package>libgegl-0_0-0</package> - <package>libgeoclue0</package> - <package>libgfortran46</package> - <package>libggz2</package> - <package>libggz2-devel</package> - <package>libgimpprint</package> - <package>libgimpprint-devel</package> - <package>libglade2</package> - <package>libglade2-devel</package> - <package>libglademm</package> - <package>libglademm-2_4-1</package> - <package>libglademm-devel</package> - <package>libgladeui-1-9</package> - <package>libgladeui-1_0-devel</package> - <package>libgmime-2_0-3</package> - <package>libgmime-2_4-2</package> - <package>libgmm++-devel</package> - <package>libgnome</package> - <package>libgnome-certauth0</package> - <package>libgnome-desktop-2-11</package> - <package>libgnome-devel</package> - <package>libgnome-lang</package> - <package>libgnome-menu2</package> - <package>libgnome-window-settings1</package> - <package>libgnomecanvas</package> - <package>libgnomecanvas-devel</package> - <package>libgnomecanvas-lang</package> - <package>libgnomecanvasmm</package> - <package>libgnomecanvasmm-devel</package> - <package>libgnomecups</package> - <package>libgnomecups-devel</package> - <package>libgnomecups-lang</package> - <package>libgnomedb</package> - <package>libgnomedb-devel</package> - <package>libgnomedb-lang</package> - <package>libgnomekbd</package> - <package>libgnomekbd-devel</package> - <package>libgnomekbd-lang</package> - <package>libgnomeprint</package> - <package>libgnomeprint-devel</package> - <package>libgnomeprint-lang</package> - <package>libgnomeprintui</package> - <package>libgnomeprintui-devel</package> - <package>libgnomeprintui-lang</package> - <package>libgnomesu</package> - <package>libgnomesu-devel</package> - <package>libgnomesu-lang</package> - <package>libgnomesu0</package> - <package>libgnomeui</package> - <package>libgnomeui-devel</package> - <package>libgnomeui-lang</package> - <package>libgnomevfsmm-2_6-1</package> - <package>libgnutls-devel</package> - <package>libgnutls-extra-devel</package> - <package>libgnutls-extra26</package> - <package>libgoocanvas3</package> - <package>libgpg-error-devel</package> - <package>libgpgme-devel</package> - <package>libgphoto2-devel</package> - <package>libgpod-devel</package> - <package>libgsf</package> - <package>libgsf-1-114</package> - <package>libgsf-devel</package> - <package>libgsf-gnome</package> - <package>libgsm-devel</package> - <package>libgsm1</package> - <package>libgssglue-devel</package> - <package>libgstapp-0_10-0</package> - <package>libgstinterfaces-0_10-0</package> - <package>libgstreamer-0_10-0</package> - <package>libgtk-vnc-1_0-0</package> - <package>libgtkhtml</package> - <package>libgtkhtml-devel</package> - <package>libgtksourceview-2_0-0</package> - <package>libgtop</package> - <package>libgtop-2_0-7</package> - <package>libgtop-devel</package> - <package>libgtop-lang</package> - <package>libgudev-1_0-0</package> - <package>libgweather</package> - <package>libgweather-devel</package> - <package>libgweather-lang</package> - <package>libgweather1</package> - <package>libhangul</package> - <package>libhangul-devel</package> - <package>libhowl0</package> - <package>libical-devel</package> - <package>libical0</package> - <package>libicu-devel</package> - <package>libid3tag</package> - <package>libid3tag-devel</package> - <package>libidl-devel</package> - <package>libidn-devel</package> - <package>libiec61883</package> - <package>libiec61883-devel</package> - <package>libieee1284</package> - <package>libiniparser-devel</package> - <package>libiniparser0</package> - <package>libiptcdata</package> - <package>libiptcdata-devel</package> - <package>libiptcdata0</package> - <package>libiso9660-5</package> - <package>libiterm</package> - <package>libiterm-devel</package> - <package>libjack-devel</package> - <package>libjack0</package> - <package>libjasper</package> - <package>libjasper-devel</package> - <package>libjingle-0_3-0</package> - <package>libjingle-devel</package> - <package>libjpeg-devel</package> - <package>libkcal</package> - <package>libkcal-devel</package> - <package>libkcal2</package> - <package>libkcddb4</package> - <package>libkcddb4-devel</package> - <package>libkcompactdisc4</package> - <package>libkcompactdisc4-devel</package> - <package>libkdcraw3</package> - <package>libkdcraw3-devel</package> - <package>libkdcraw3-lang</package> - <package>libkde4</package> - <package>libkde4-devel</package> - <package>libkdecore4</package> - <package>libkdecore4-devel</package> - <package>libkdepim4</package> - <package>libkdepim4-devel</package> - <package>libkdepimlibs4</package> - <package>libkdepimlibs4-devel</package> - <package>libkexiv2-3</package> - <package>libkexiv2-3-devel</package> - <package>libkexiv2-7</package> - <package>libkipi-devel</package> - <package>libkipi6</package> - <package>libkmime-devel</package> - <package>libkmime2</package> - <package>libknotificationitem-1-1</package> - <package>libkonq-devel</package> - <package>libkonq5</package> - <package>libksba-devel</package> - <package>libktnef-devel</package> - <package>libktnef1</package> - <package>liblazy-devel</package> - <package>liblazy1</package> - <package>liblcms-devel</package> - <package>libldapcpp-devel</package> - <package>liblog4c-devel</package> - <package>liblog4c3</package> - <package>libloudmouth-1-0</package> - <package>liblpsolve55</package> - <package>liblua5_1</package> - <package>libmalaga-devel</package> - <package>libmalaga7</package> - <package>libmcrypt</package> - <package>libmcrypt-devel</package> - <package>libmikmod</package> - <package>libmikmod-devel</package> - <package>libmm-devel</package> - <package>libmm14</package> - <package>libmng-devel</package> - <package>libmpcdec-devel</package> - <package>libmpcdec5</package> - <package>libmspack-devel</package> - <package>libmtp-devel</package> - <package>libmtp8</package> - <package>libmusicbrainz-devel</package> - <package>libmusicbrainz3-6</package> - <package>libmusicbrainz3-devel</package> - <package>libmusicbrainz4</package> - <package>libmysqlclient-devel</package> - <package>libmysqlclient15</package> - <package>libmysqlclient_r15</package> - <package>libneon-devel</package> - <package>libneon27</package> - <package>libnetapi-devel</package> - <package>libnetapi0</package> - <package>libnetcontrol0</package> - <package>libnetpbm-devel</package> - <package>libnetpbm10</package> - <package>libnewt0_52</package> - <package>libnjb</package> - <package>libnjb-devel</package> - <package>libnjb5</package> - <package>libnl-devel</package> - <package>libnotify</package> - <package>libnotify-devel</package> - <package>libnotify1</package> - <package>libnscd-devel</package> - <package>libnsssharedhelper0</package> - <package>libnuma-devel</package> - <package>libofa-devel</package> - <package>libofa0</package> - <package>libogg-devel</package> - <package>libogg0</package> - <package>liboil</package> - <package>liboil-devel</package> - <package>libopenbabel-devel</package> - <package>libopenbabel3</package> - <package>libopencdk-devel</package> - <package>libopencdk10</package> - <package>libopenraw-devel</package> - <package>libopenraw1</package> - <package>libopenssl-devel</package> - <package>libopensync</package> - <package>libopensync-devel</package> - <package>libopensync-plugin-evolution2</package> - <package>libopensync-plugin-evolution2-devel</package> - <package>libopensync-plugin-palm</package> - <package>libopensync-plugin-palm-devel</package> - <package>liborc-0_4-0</package> - <package>libosip2</package> - <package>libosip2-devel</package> - <package>libotf</package> - <package>libotf-devel</package> - <package>libotr-devel</package> - <package>libotr2</package> - <package>libp11-1</package> - <package>libp11-devel</package> - <package>libpackagekit-glib10</package> - <package>libpackagekit-glib10-devel</package> - <package>libpangomm-1_4-1</package> - <package>libpcap-devel</package> - <package>libpciaccess0</package> - <package>libpciaccess0-devel</package> - <package>libphonon4</package> - <package>libpisock-devel</package> - <package>libpisock9</package> - <package>libpisync-devel</package> - <package>libpisync1</package> - <package>libpixman-1-0-devel</package> - <package>libpkcs11-helper1</package> - <package>libpng-devel</package> - <package>libpolkit-qt0</package> - <package>libpoppler-devel</package> - <package>libpoppler-glib-devel</package> - <package>libpoppler-glib4</package> - <package>libpoppler-qt2</package> - <package>libpoppler-qt3-devel</package> - <package>libpoppler-qt4-3</package> - <package>libpoppler-qt4-devel</package> - <package>libpoppler5</package> - <package>libpst4</package> - <package>libpt2</package> - <package>libpt2-devel</package> - <package>libpulse-browse0</package> - <package>libpulse-devel</package> - <package>libpulse-mainloop-glib0</package> - <package>libpulse0</package> - <package>libpurple</package> - <package>libpurple-devel</package> - <package>libpurple-lang</package> - <package>libqca2</package> - <package>libqca2-devel</package> - <package>libqdialogsolver1</package> - <package>libqdialogsolver1-devel</package> - <package>libqimageblitz-devel</package> - <package>libqimageblitz4</package> - <package>libqscintilla-devel</package> - <package>libqscintilla2-5</package> - <package>libqt4</package> - <package>libqt4-devel</package> - <package>libqt4-qt3support</package> - <package>libqt4-sql</package> - <package>libqt4-sql-mysql</package> - <package>libqt4-sql-postgresql</package> - <package>libqt4-sql-sqlite</package> - <package>libqt4-sql-unixODBC</package> - <package>libqt4-x11</package> - <package>libqtpod-devel</package> - <package>libqtpod0</package> - <package>libquadmath46</package> - <package>libquicktime</package> - <package>libquicktime-devel</package> - <package>libraptor-devel</package> - <package>libraptor1</package> - <package>librasqal-devel</package> - <package>librasqal1</package> - <package>libraw1394-11</package> - <package>libraw1394-8</package> - <package>libraw1394-devel</package> - <package>libredland-devel</package> - <package>libredland0</package> - <package>libreiserfs-devel</package> - <package>libreoffice</package> - <package>libreoffice-base</package> - <package>libreoffice-branding-SLED</package> - <package>libreoffice-branding-upstream</package> - <package>libreoffice-calc</package> - <package>libreoffice-icon-themes</package> - <package>libreoffice-impress</package> - <package>libreoffice-sdk</package> - <package>libreoffice-writer</package> - <package>librsvg</package> - <package>librsvg-devel</package> - <package>libsamplerate</package> - <package>libsamplerate-devel</package> - <package>libsatsolver-devel</package> - <package>libsblim-cmpiutil1</package> - <package>libselinux-devel</package> - <package>libsemanage-devel</package> - <package>libsemanage1</package> - <package>libsensors3-devel</package> - <package>libsensors4</package> - <package>libsepol-devel</package> - <package>libsexy</package> - <package>libsexy-devel</package> - <package>libshout-devel</package> - <package>libshout3</package> - <package>libsidplay1</package> - <package>libsidplay1-devel</package> - <package>libsigc++2</package> - <package>libsigc++2-devel</package> - <package>libslab-lang</package> - <package>libslab0</package> - <package>libsmbclient-devel</package> - <package>libsmbios-devel</package> - <package>libsmbsharemodes-devel</package> - <package>libsmbsharemodes0</package> - <package>libsndfile</package> - <package>libsndfile-devel</package> - <package>libsoprano-devel</package> - <package>libsoprano4</package> - <package>libsoup-devel</package> - <package>libspectre-devel</package> - <package>libspectre1</package> - <package>libspeex</package> - <package>libssh2-devel</package> - <package>libstrigi0</package> - <package>libstroke</package> - <package>libstroke-devel</package> - <package>libsyncml-devel</package> - <package>libsyncml0</package> - <package>libtalloc-devel</package> - <package>libtasn1-devel</package> - <package>libtdb-devel</package> - <package>libtelepathy</package> - <package>libtelepathy-devel</package> - <package>libtelepathy-glib0</package> - <package>libtheora-devel</package> - <package>libtheora0</package> - <package>libtidy</package> - <package>libtidy-devel</package> - <package>libtiff-devel</package> - <package>libtirpc-devel</package> - <package>libtomoe-gtk0</package> - <package>libtspi1</package> - <package>libtunepimp</package> - <package>libtunepimp-devel</package> - <package>libtunepimp5</package> - <package>libudev-devel</package> - <package>libudf0</package> - <package>libunique-1_0-0</package> - <package>libunwind</package> - <package>libunwind-devel</package> - <package>libupsclient1</package> - <package>libusb-devel</package> - <package>libusbpp-0_1-4</package> - <package>libustr-1_0-1</package> - <package>libustr-devel</package> - <package>libuuid-devel</package> - <package>libvirt-client</package> - <package>libvirt-devel</package> - <package>libvisual</package> - <package>libvisual-devel</package> - <package>libvoikko-devel</package> - <package>libvoikko1</package> - <package>libvorbis</package> - <package>libvorbis-devel</package> - <package>libwavpack1</package> - <package>libwbclient-devel</package> - <package>libwbxml2-0</package> - <package>libwbxml2-devel</package> - <package>libwebkit-1_0-1</package> - <package>libwebkit-1_0-2</package> - <package>libwebkit-devel</package> - <package>libwebkit-lang</package> - <package>libwmf</package> - <package>libwmf-devel</package> - <package>libwmf-gnome</package> - <package>libwnck</package> - <package>libwnck-1-22</package> - <package>libwnck-devel</package> - <package>libwnck-lang</package> - <package>libwpd-0_8-8</package> - <package>libwpd-devel</package> - <package>libwpg-0_1-1</package> - <package>libwpg-devel</package> - <package>libwps-0_1-1</package> - <package>libwps-devel</package> - <package>libwsman-devel</package> - <package>libwsman1</package> - <package>libxcrypt-devel</package> - <package>libxine-devel</package> - <package>libxine1</package> - <package>libxklavier-devel</package> - <package>libxklavier15</package> - <package>libxml2-devel</package> - <package>libxslt-devel</package> - <package>libyajl1</package> - <package>libzio-devel</package> - <package>libzip-devel</package> - <package>libzip1</package> - <package>libzvbi0</package> - <package>libzypp-devel</package> - <package>limal-apparmor-notifications</package> - <package>limal-apparmor-notifications-devel</package> - <package>limal-ca-mgm-devel</package> - <package>limal-devel</package> - <package>limal-devtools</package> - <package>limal-nfs-server-devel</package> - <package>linux-atm-devel</package> - <package>linux-atm-lib</package> - <package>lksctp-tools</package> - <package>lksctp-tools-devel</package> - <package>loudmouth-devel</package> - <package>lua</package> - <package>lua-devel</package> - <package>lzo-devel</package> - <package>m17n-db</package> - <package>m17n-lib</package> - <package>m17n-lib-devel</package> - <package>malaga-suomi</package> - <package>meanwhile</package> - <package>meanwhile-devel</package> - <package>metacity</package> - <package>metacity-devel</package> - <package>metacity-lang</package> - <package>mhash</package> - <package>mhash-devel</package> - <package>misc-console-font</package> - <package>mono-addins</package> - <package>mono-basic</package> - <package>mono-core</package> - <package>mono-data</package> - <package>mono-data-oracle</package> - <package>mono-data-sqlite</package> - <package>mono-devel</package> - <package>mono-extras</package> - <package>mono-jscript</package> - <package>mono-tools</package> - <package>mono-wcf</package> - <package>mono-web</package> - <package>mono-winforms</package> - <package>mono-zeroconf</package> - <package>mono-zeroconf-provider-avahi</package> - <package>monodevelop</package> - <package>monodoc-core</package> - <package>mozilla-nspr</package> - <package>mozilla-nspr-devel</package> - <package>mozilla-nss</package> - <package>mozilla-nss-devel</package> - <package>mozilla-xulrunner192</package> - <package>mozilla-xulrunner192-gnome</package> - <package>mpfr-devel</package> - <package>mpi-selector</package> - <package>mpich</package> - <package>mpich-devel</package> - <package>mysql</package> - <package>mysql-client</package> - <package>nagios</package> - <package>nagios-devel</package> - <package>nagios-www</package> - <package>nant</package> - <package>nautilus</package> - <package>nautilus-cd-burner</package> - <package>nautilus-cd-burner-devel</package> - <package>nautilus-cd-burner-lang</package> - <package>nautilus-devel</package> - <package>nautilus-lang</package> - <package>ndesk-dbus</package> - <package>ndesk-dbus-glib</package> - <package>ndesk-dbus-glib-devel</package> - <package>net-snmp</package> - <package>net-snmp-devel</package> - <package>netatalk</package> - <package>netatalk-devel</package> - <package>netcat-openbsd</package> - <package>newt</package> - <package>newt-devel</package> - <package>newt-static</package> - <package>nfsidmap-devel</package> - <package>notification-daemon</package> - <package>notification-daemon-lang</package> - <package>notify-sharp</package> - <package>nss-mdns</package> - <package>nss-shared-helper-devel</package> - <package>nut</package> - <package>nut-classic</package> - <package>nut-devel</package> - <package>opal</package> - <package>opal-devel</package> - <package>openCryptoki</package> - <package>openCryptoki-64bit</package> - <package>openCryptoki-devel</package> - <package>openct-devel</package> - <package>openhpi</package> - <package>openhpi-daemon</package> - <package>openhpi-devel</package> - <package>openjade</package> - <package>openjade-devel</package> - <package>openldap2-devel</package> - <package>openmotif-devel</package> - <package>openmotif-libs</package> - <package>openmpi</package> - <package>openobex-devel</package> - <package>openobex-glib-devel</package> - <package>opensc-devel</package> - <package>openslp-devel</package> - <package>opensp</package> - <package>opensp-devel</package> - <package>openwsman-client</package> - <package>openwsman-server</package> - <package>orbit</package> - <package>orbit-devel</package> - <package>orbit2-devel</package> - <package>oxygen-icon-theme</package> - <package>oxygen-icon-theme-scalable</package> - <package>ozerocdoff</package> - <package>pam-devel</package> - <package>pango-devel</package> - <package>pangomm-devel</package> - <package>parted-devel</package> - <package>patchutils</package> - <package>pciutils-devel</package> - <package>pcre-devel</package> - <package>pcsc-acr38</package> - <package>pcsc-acr38-devel</package> - <package>pcsc-lite-devel</package> - <package>perl-32bit</package> - <package>perl-Crypt-OpenSSL-RSA</package> - <package>perl-Mail-DKIM</package> - <package>perl-MailTools</package> - <package>perl-Net-DNS</package> - <package>perl-Net-IP</package> - <package>perl-NetAddr-IP</package> - <package>perl-SNMP</package> - <package>perl-Tie-IxHash</package> - <package>perl-Tk</package> - <package>perl-Tk-devel</package> - <package>perl-spamassassin</package> - <package>phonon</package> - <package>phonon-backend-gstreamer-0_10</package> - <package>phonon-devel</package> - <package>php5</package> - <package>php5-ctype</package> - <package>php5-devel</package> - <package>php5-dom</package> - <package>php5-hash</package> - <package>php5-iconv</package> - <package>php5-json</package> - <package>php5-pdo</package> - <package>php5-sqlite</package> - <package>php5-suhosin</package> - <package>php5-tokenizer</package> - <package>php5-xmlreader</package> - <package>php5-xmlwriter</package> - <package>php53</package> - <package>php53-ctype</package> - <package>php53-dom</package> - <package>php53-iconv</package> - <package>php53-json</package> - <package>php53-tokenizer</package> - <package>php53-xmlreader</package> - <package>php53-xmlwriter</package> - <package>pidgin</package> - <package>pidgin-devel</package> - <package>pilot-link</package> - <package>pkcs11-helper</package> - <package>pkcs11-helper-devel</package> - <package>planner</package> - <package>planner-devel</package> - <package>planner-lang</package> - <package>plasma-addons</package> - <package>plasma-theme-aya</package> - <package>plasmoid-networkmanagement</package> - <package>plasmoid-quickaccess</package> - <package>plotutils</package> - <package>poppler-data</package> - <package>poppler-tools</package> - <package>popt-devel</package> - <package>portmap</package> - <package>postfix-devel</package> - <package>postgresql-devel</package> - <package>postgresql-libs</package> - <package>ppp-devel</package> - <package>ppp-userpass</package> - <package>pstoedit</package> - <package>pstoedit-devel</package> - <package>pulseaudio</package> - <package>pulseaudio-esound-compat</package> - <package>pulseaudio-lang</package> - <package>puppet</package> - <package>python-cairo</package> - <package>python-cairo-devel</package> - <package>python-devel</package> - <package>python-gnome</package> - <package>python-gnome-devel</package> - <package>python-gobject2</package> - <package>python-gobject2-devel</package> - <package>python-gtk</package> - <package>python-gtk-devel</package> - <package>python-gtkglext</package> - <package>python-gtkglext-devel</package> - <package>python-gtksourceview</package> - <package>python-gtksourceview-devel</package> - <package>python-numeric</package> - <package>python-numpy</package> - <package>python-orbit</package> - <package>python-orbit-devel</package> - <package>pyxml</package> - <package>qt3</package> - <package>qt3-devel</package> - <package>quagga</package> - <package>quagga-devel</package> - <package>quilt</package> - <package>raptor</package> - <package>rarian</package> - <package>rarian-devel</package> - <package>re2c</package> - <package>readline-devel</package> - <package>recode-devel</package> - <package>rpm-devel</package> - <package>rrdtool</package> - <package>rrdtool-devel</package> - <package>rsyslog</package> - <package>ruby</package> - <package>rubygems</package> - <package>ruby-devel</package> - <package>ruby-doc-html</package> - <package>ruby-doc-ri</package> - <package>ruby-examples</package> - <package>ruby-fcgi</package> - <package>ruby-mysql</package> - <package>ruby-selinux</package> - <package>ruby-test-suite</package> - <package>ruby-tk</package> - <package>sablot</package> - <package>sablot-devel</package> - <package>samba-devel</package> - <package>sane-backends</package> - <package>sane-frontends</package> - <package>sax2-libsax</package> - <package>sax2-libsax-devel</package> - <package>sax2-libsax-perl</package> - <package>sax2-tools</package> - <package>sblim-cmpi-base</package> - <package>sblim-cmpi-base-devel</package> - <package>sblim-cmpi-devel</package> - <package>sblim-cmpiutil-devel</package> - <package>sblim-indication_helper</package> - <package>sblim-sfcb</package> - <package>sblim-sfcc</package> - <package>sblim-sfcc-devel</package> - <package>scim</package> - <package>scim-devel</package> - <package>scpm-devel</package> - <package>scrollkeeper</package> - <package>scrollkeeper-lang</package> - <package>seahorse</package> - <package>seahorse-devel</package> - <package>seahorse-lang</package> - <package>sendmail</package> - <package>sendmail-devel</package> - <package>sg3_utils-devel</package> - <package>sgml-skel</package> - <package>shared-mime-info</package> - <package>silc-toolkit</package> - <package>silc-toolkit-devel</package> - <package>slang</package> - <package>slang-devel</package> - <package>soprano</package> - <package>soprano-backend-redland</package> - <package>spamassassin</package> - <package>speex-devel</package> - <package>splashy-devel</package> - <package>sqlite2</package> - <package>sqlite3-devel</package> - <package>startup-notification</package> - <package>startup-notification-devel</package> - <package>strigi</package> - <package>strigi-devel</package> - <package>subversion</package> - <package>subversion-perl</package> - <package>susehelp</package> - <package>susehelp_cz</package> - <package>susehelp_de</package> - <package>susehelp_en</package> - <package>susehelp_es</package> - <package>susehelp_fr</package> - <package>susehelp_hu</package> - <package>susehelp_it</package> - <package>swig</package> - <package>syslogd</package> - <package>t1lib</package> - <package>t1lib-devel</package> - <package>taglib</package> - <package>taglib-devel</package> - <package>taglib-sharp</package> - <package>tango-icon-theme</package> - <package>tcl-devel</package> - <package>tcpd-devel</package> - <package>telepathy-glib-devel</package> - <package>telepathy-mission-control</package> - <package>telepathy-mission-control-devel</package> - <package>texlive-bin-devel</package> - <package>texlive-devel</package> - <package>tk-devel</package> - <package>tla</package> - <package>tn5250</package> - <package>tn5250-devel</package> - <package>tomoe</package> - <package>tomoe-devel</package> - <package>tomoe-gtk</package> - <package>tomoe-gtk-devel</package> - <package>tomoe-gtk-lang</package> - <package>totem-pl-parser</package> - <package>totem-pl-parser-devel</package> - <package>totem-pl-parser-lang</package> - <package>trousers</package> - <package>trousers-devel</package> - <package>tsclient</package> - <package>tsclient-devel</package> - <package>tsclient-lang</package> - <package>uim</package> - <package>uim-devel</package> - <package>unixODBC</package> - <package>unixODBC-devel</package> - <package>unsermake</package> - <package>update-desktop-files</package> - <package>usb_modeswitch</package> - <package>usb_modeswitch-data</package> - <package>valgrind</package> - <package>valgrind-devel</package> - <package>vte</package> - <package>vte-devel</package> - <package>vte-lang</package> - <package>wdiff</package> - <package>webkit-sharp</package> - <package>wireshark</package> - <package>wireshark-devel</package> - <package>wodim-devel</package> - <package>wordcut</package> - <package>wordcut-devel</package> - <package>words</package> - <package>wpa_supplicant</package> - <package>wvstreams</package> - <package>wvstreams-devel</package> - <package>wxGTK-compat</package> - <package>wxGTK-devel</package> - <package>wxGTK-gl</package> - <package>x11-input-wacom</package> - <package>x11-input-wacom-devel</package> - <package>x11-input-wacom-tools</package> - <package>xalan-j2</package> - <package>xaw3d-devel</package> - <package>xbase</package> - <package>xbase-devel</package> - <package>xdelta</package> - <package>xdelta-devel</package> - <package>xdg-menu</package> - <package>xen-devel</package> - <package>xen-libs</package> - <package>xerces-j2</package> - <package>xerces-j2-bootstrap</package> - <package>xerces-j2-xml-apis</package> - <package>xfsprogs-devel</package> - <package>xml-commons-apis-bootstrap</package> - <package>xml-commons-resolver-bootstrap</package> - <package>xml-commons-which-bootstrap</package> - <package>xmlcharent</package> - <package>xorg-x11</package> - <package>xorg-x11-devel</package> - <package>xorg-x11-fonts</package> - <package>xorg-x11-fonts-core</package> - <package>xorg-x11-fonts-devel</package> - <package>xorg-x11-libICE-devel</package> - <package>xorg-x11-libSM-devel</package> - <package>xorg-x11-libX11-devel</package> - <package>xorg-x11-libXau-devel</package> - <package>xorg-x11-libXdmcp-devel</package> - <package>xorg-x11-libXext-devel</package> - <package>xorg-x11-libXfixes-devel</package> - <package>xorg-x11-libXmu-devel</package> - <package>xorg-x11-libXp-devel</package> - <package>xorg-x11-libXpm-devel</package> - <package>xorg-x11-libXprintUtil-devel</package> - <package>xorg-x11-libXrender-devel</package> - <package>xorg-x11-libXt-devel</package> - <package>xorg-x11-libXv-devel</package> - <package>xorg-x11-libfontenc-devel</package> - <package>xorg-x11-libxcb-devel</package> - <package>xorg-x11-libxkbfile-devel</package> - <package>xorg-x11-proto-devel</package> - <package>xorg-x11-server</package> - <package>xorg-x11-util-devel</package> - <package>xorg-x11-xauth</package> - <package>xorg-x11-xtrans-devel</package> - <package>xosd</package> - <package>xosd-devel</package> - <package>xsp</package> - <package>xterm</package> - <package>xz-devel</package> - <package>yast2-core-devel</package> - <package>yast2-devtools</package> - <package>yast2-gtk</package> - <package>yast2-libyui-devel</package> - <package>yast2-ncurses-devel</package> - <package>yast2-qt</package> - <package>yast2-qt-devel</package> - <package>yast2-qt-pkg</package> - <package>yast2-storage-devel</package> - <package>yast2-ycp-ui-bindings-devel</package> - <package>yelp</package> - <package>yelp-lang</package> - <package>zenity</package> - <package>zenity-lang</package> - <package>zlib-devel</package> - <package>zsh</package> - <package>zvbi-devel</package> - </remove-packages> - - </software> - <user_defaults> - <expire></expire> - <group>100</group> - <groups>video,dialout</groups> - <home>/home</home> - <inactive>-1</inactive> - <shell>/bin/bash</shell> - <skel>/etc/skel</skel> - <umask>022</umask> - </user_defaults> - <users config:type="list"> - <user> - <encrypted config:type="boolean">true</encrypted> - <fullname>vagrant</fullname> - <gid>100</gid> - <home>/home/vagrant</home> - <password_settings> - <expire></expire> - <flag></flag> - <inact></inact> - <max>99999</max> - <min>0</min> - <warn>7</warn> - </password_settings> - <shell>/bin/bash</shell> - <uid>1000</uid> - <user_password>$2y$05$NA1Li9ZKJOLRW5mMTXm6/e5r8dltWS5RpDZpvHrI82aLE00V51tdi</user_password> - <username>vagrant</username> - </user> - <user> - <encrypted config:type="boolean">true</encrypted> - <fullname>Games account</fullname> - <gid>100</gid> - <home>/var/games</home> - <password_settings> - <expire></expire> - <flag></flag> - <inact></inact> - <max></max> - <min></min> - <warn></warn> - </password_settings> - <shell>/bin/bash</shell> - <uid>12</uid> - <user_password>*</user_password> - <username>games</username> - </user> - <user> - <encrypted config:type="boolean">true</encrypted> - <fullname>bin</fullname> - <gid>1</gid> - <home>/bin</home> - <password_settings> - <expire></expire> - <flag></flag> - <inact></inact> - <max></max> - <min></min> - <warn></warn> - </password_settings> - <shell>/bin/bash</shell> - <uid>1</uid> - <user_password>*</user_password> - <username>bin</username> - </user> - <user> - <encrypted config:type="boolean">true</encrypted> - <fullname>nobody</fullname> - <gid>65533</gid> - <home>/var/lib/nobody</home> - <password_settings> - <expire></expire> - <flag></flag> - <inact></inact> - <max></max> - <min></min> - <warn></warn> - </password_settings> - <shell>/bin/bash</shell> - <uid>65534</uid> - <user_password>*</user_password> - <username>nobody</username> - </user> - <user> - <encrypted config:type="boolean">true</encrypted> - <fullname>Printing daemon</fullname> - <gid>7</gid> - <home>/var/spool/lpd</home> - <password_settings> - <expire></expire> - <flag></flag> - <inact></inact> - <max></max> - <min></min> - <warn></warn> - </password_settings> - <shell>/bin/bash</shell> - <uid>4</uid> - <user_password>*</user_password> - <username>lp</username> - </user> - <user> - <encrypted config:type="boolean">true</encrypted> - <fullname>User for uuidd</fullname> - <gid>104</gid> - <home>/var/run/uuidd</home> - <password_settings> - <expire></expire> - <flag></flag> - <inact></inact> - <max>99999</max> - <min>0</min> - <warn>7</warn> - </password_settings> - <shell>/bin/false</shell> - <uid>102</uid> - <user_password>*</user_password> - <username>uuidd</username> - </user> - <user> - <encrypted config:type="boolean">true</encrypted> - <fullname>Postfix Daemon</fullname> - <gid>51</gid> - <home>/var/spool/postfix</home> - <password_settings> - <expire></expire> - <flag></flag> - <inact></inact> - <max>99999</max> - <min>0</min> - <warn>7</warn> - </password_settings> - <shell>/bin/false</shell> - <uid>51</uid> - <user_password>*</user_password> - <username>postfix</username> - </user> - <user> - <encrypted config:type="boolean">true</encrypted> - <fullname>Novell Customer Center User</fullname> - <gid>111</gid> - <home>/var/lib/YaST2/suse-ncc-fakehome</home> - <password_settings> - <expire></expire> - <flag></flag> - <inact></inact> - <max>99999</max> - <min>0</min> - <warn>7</warn> - </password_settings> - <shell>/bin/bash</shell> - <uid>106</uid> - <user_password>*</user_password> - <username>suse-ncc</username> - </user> - <user> - <encrypted config:type="boolean">true</encrypted> - <fullname>FTP account</fullname> - <gid>49</gid> - <home>/srv/ftp</home> - <password_settings> - <expire></expire> - <flag></flag> - <inact></inact> - <max></max> - <min></min> - <warn></warn> - </password_settings> - <shell>/bin/bash</shell> - <uid>40</uid> - <user_password>*</user_password> - <username>ftp</username> - </user> - <user> - <encrypted config:type="boolean">true</encrypted> - <fullname>Gnome Display Manager daemon</fullname> - <gid>112</gid> - <home>/var/lib/gdm</home> - <password_settings> - <expire></expire> - <flag></flag> - <inact></inact> - <max>99999</max> - <min>0</min> - <warn>7</warn> - </password_settings> - <shell>/bin/false</shell> - <uid>107</uid> - <user_password>*</user_password> - <username>gdm</username> - </user> - <user> - <encrypted config:type="boolean">true</encrypted> - <fullname>Batch jobs daemon</fullname> - <gid>25</gid> - <home>/var/spool/atjobs</home> - <password_settings> - <expire></expire> - <flag></flag> - <inact></inact> - <max>99999</max> - <min>0</min> - <warn>7</warn> - </password_settings> - <shell>/bin/bash</shell> - <uid>25</uid> - <user_password>*</user_password> - <username>at</username> - </user> - <user> - <encrypted config:type="boolean">true</encrypted> - <fullname>root</fullname> - <gid>0</gid> - <home>/root</home> - <password_settings> - <expire></expire> - <flag></flag> - <inact></inact> - <max></max> - <min></min> - <warn></warn> - </password_settings> - <shell>/bin/bash</shell> - <uid>0</uid> - <user_password>$2y$05$NA1Li9ZKJOLRW5mMTXm6/e5r8dltWS5RpDZpvHrI82aLE00V51tdi</user_password> - <username>root</username> - </user> - <user> - <encrypted config:type="boolean">true</encrypted> - <fullname>Mailer daemon</fullname> - <gid>12</gid> - <home>/var/spool/clientmqueue</home> - <password_settings> - <expire></expire> - <flag></flag> - <inact></inact> - <max></max> - <min></min> - <warn></warn> - </password_settings> - <shell>/bin/false</shell> - <uid>8</uid> - <user_password>*</user_password> - <username>mail</username> - </user> - <user> - <encrypted config:type="boolean">true</encrypted> - <fullname>Daemon</fullname> - <gid>2</gid> - <home>/sbin</home> - <password_settings> - <expire></expire> - <flag></flag> - <inact></inact> - <max></max> - <min></min> - <warn></warn> - </password_settings> - <shell>/bin/bash</shell> - <uid>2</uid> - <user_password>*</user_password> - <username>daemon</username> - </user> - <user> - <encrypted config:type="boolean">true</encrypted> - <fullname>NTP daemon</fullname> - <gid>108</gid> - <home>/var/lib/ntp</home> - <password_settings> - <expire></expire> - <flag></flag> - <inact></inact> - <max>99999</max> - <min>0</min> - <warn>7</warn> - </password_settings> - <shell>/bin/false</shell> - <uid>74</uid> - <user_password>*</user_password> - <username>ntp</username> - </user> - <user> - <encrypted config:type="boolean">true</encrypted> - <fullname>Unix-to-Unix CoPy system</fullname> - <gid>14</gid> - <home>/etc/uucp</home> - <password_settings> - <expire></expire> - <flag></flag> - <inact></inact> - <max></max> - <min></min> - <warn></warn> - </password_settings> - <shell>/bin/bash</shell> - <uid>10</uid> - <user_password>*</user_password> - <username>uucp</username> - </user> - <user> - <encrypted config:type="boolean">true</encrypted> - <fullname>User for D-Bus</fullname> - <gid>101</gid> - <home>/var/run/dbus</home> - <password_settings> - <expire></expire> - <flag></flag> - <inact></inact> - <max></max> - <min>0</min> - <warn>7</warn> - </password_settings> - <shell>/bin/false</shell> - <uid>100</uid> - <user_password>*</user_password> - <username>messagebus</username> - </user> - <user> - <encrypted config:type="boolean">true</encrypted> - <fullname>User for haldaemon</fullname> - <gid>102</gid> - <home>/var/run/hald</home> - <password_settings> - <expire></expire> - <flag></flag> - <inact></inact> - <max></max> - <min>0</min> - <warn>7</warn> - </password_settings> - <shell>/bin/false</shell> - <uid>101</uid> - <user_password>*</user_password> - <username>haldaemon</username> - </user> - <user> - <encrypted config:type="boolean">true</encrypted> - <fullname>WWW daemon apache</fullname> - <gid>8</gid> - <home>/var/lib/wwwrun</home> - <password_settings> - <expire></expire> - <flag></flag> - <inact></inact> - <max></max> - <min></min> - <warn></warn> - </password_settings> - <shell>/bin/false</shell> - <uid>30</uid> - <user_password>*</user_password> - <username>wwwrun</username> - </user> - <user> - <encrypted config:type="boolean">true</encrypted> - <fullname>Manual pages viewer</fullname> - <gid>62</gid> - <home>/var/cache/man</home> - <password_settings> - <expire></expire> - <flag></flag> - <inact></inact> - <max></max> - <min></min> - <warn></warn> - </password_settings> - <shell>/bin/bash</shell> - <uid>13</uid> - <user_password>*</user_password> - <username>man</username> - </user> - <user> - <encrypted config:type="boolean">true</encrypted> - <fullname>PolicyKit</fullname> - <gid>107</gid> - <home>/var/run/PolicyKit</home> - <password_settings> - <expire></expire> - <flag></flag> - <inact></inact> - <max>99999</max> - <min>0</min> - <warn>7</warn> - </password_settings> - <shell>/bin/false</shell> - <uid>104</uid> - <user_password>*</user_password> - <username>polkituser</username> - </user> - <user> - <encrypted config:type="boolean">true</encrypted> - <fullname>News system</fullname> - <gid>13</gid> - <home>/etc/news</home> - <password_settings> - <expire></expire> - <flag></flag> - <inact></inact> - <max></max> - <min></min> - <warn></warn> - </password_settings> - <shell>/bin/bash</shell> - <uid>9</uid> - <user_password>*</user_password> - <username>news</username> - </user> - <user> - <fullname>SSH daemon</fullname> - <gid>65</gid> - <home>/var/lib/sshd</home> - <shell>/bin/false</shell> - <uid>71</uid> - <username>sshd</username> - </user> - <user> - <encrypted config:type="boolean">true</encrypted> - <fullname>PulseAudio daemon</fullname> - <gid>109</gid> - <home>/var/lib/pulseaudio</home> - <password_settings> - <expire></expire> - <flag></flag> - <inact></inact> - <max>99999</max> - <min>0</min> - <warn>7</warn> - </password_settings> - <shell>/bin/false</shell> - <uid>105</uid> - <user_password>*</user_password> - <username>pulse</username> - </user> - </users> -</profile> diff --git a/templates/sles-11-sp2-i386/scripts/cleanup.sh b/templates/sles-11-sp2-i386/scripts/cleanup.sh deleted file mode 100644 index dcb1d72bc..000000000 --- a/templates/sles-11-sp2-i386/scripts/cleanup.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/bash -eux - -# remove zypper locks on removed packages to avoid later dependency problems -zypper --non-interactive rl \* -# zypper --non-interactive remove `rpm -qa virtualbox-guest-*` >/dev/null 2>&1 -# Add an online copy of the SLES DVD1 as a software repository, instead of the mounted DVD -zypper removerepo 'SUSE-Linux-Enterprise-Server-11-SP2 11.2.2-1.234' -zypper addrepo 'http://demeter.uni-regensburg.de/SLES11SP2-x86/DVD1/' 'SLES11SP2-x86 DVD1 Online' -zypper refresh diff --git a/templates/sles-11-sp2-i386/scripts/minimize.sh b/templates/sles-11-sp2-i386/scripts/minimize.sh deleted file mode 100644 index 3846a1d65..000000000 --- a/templates/sles-11-sp2-i386/scripts/minimize.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash -eux - -dd if=/dev/zero of=/EMPTY bs=1M -rm -f /EMPTY diff --git a/templates/sles-11-sp2-i386/scripts/sshd.sh b/templates/sles-11-sp2-i386/scripts/sshd.sh deleted file mode 100644 index c6e4f20a6..000000000 --- a/templates/sles-11-sp2-i386/scripts/sshd.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash -eux - -echo "UseDNS no" >> /etc/ssh/sshd_config diff --git a/templates/sles-11-sp2-i386/scripts/sudoers.sh b/templates/sles-11-sp2-i386/scripts/sudoers.sh deleted file mode 100644 index eb80f3f88..000000000 --- a/templates/sles-11-sp2-i386/scripts/sudoers.sh +++ /dev/null @@ -1,3 +0,0 @@ -# update sudoers - can't do this in autoinst.xml -echo -e "\nupdate sudoers ..." -echo -e "vagrant ALL=(ALL) NOPASSWD: ALL\n" >> /etc/sudoers diff --git a/templates/sles-11-sp2-i386/scripts/vagrant.sh b/templates/sles-11-sp2-i386/scripts/vagrant.sh deleted file mode 100644 index 72dd2f444..000000000 --- a/templates/sles-11-sp2-i386/scripts/vagrant.sh +++ /dev/null @@ -1,33 +0,0 @@ -#!/bin/bash -eux - -if [ -f /home/vagrant/.vbox_version ]; then - mkdir /tmp/vbox - VER=$(cat /home/vagrant/.vbox_version) - mount -o loop VBoxGuestAdditions_$VER.iso /tmp/vbox - sh /tmp/vbox/VBoxLinuxAdditions.run - umount /tmp/vbox - rmdir /tmp/vbox - rm *.iso -fi - -if [ -f /home/vagrant/.vmfusion_version ]; then - #Set Linux-specific paths and ISO filename - home_dir="/home/vagrant" - iso_name="linux.iso" - mount_point="/tmp/vmware-tools" - #Run install, unmount ISO and remove it - mkdir ${mount_point} - cd ${home_dir} - /bin/mount -o loop ${iso_name} ${mount_point} - tar zxf ${mount_point}/*.tar.gz && cd vmware-tools-distrib && ./vmware-install.pl --default - /bin/umount ${mount_point} - /bin/rm -rf ${home_dir}/${iso_name} ${home_dir}/vmware-tools-distrib - rmdir ${mount_point} -fi - -mkdir /home/vagrant/.ssh -wget --no-check-certificate \ - 'https://github.com/mitchellh/vagrant/raw/master/keys/vagrant.pub' \ - -O /home/vagrant/.ssh/authorized_keys -chown -R vagrant /home/vagrant/.ssh -chmod -R go-rwsx /home/vagrant/.ssh diff --git a/templates/sles-11-sp2-i386/template.json b/templates/sles-11-sp2-i386/template.json deleted file mode 100644 index f15163ca6..000000000 --- a/templates/sles-11-sp2-i386/template.json +++ /dev/null @@ -1,97 +0,0 @@ -{ - "provisioners": [ - { - "type": "shell", - "scripts": [ - "scripts/vagrant.sh", - "scripts/sshd.sh", - "scripts/sudoers.sh", - "scripts/cleanup.sh", - "scripts/minimize.sh" - ], - "override": { - "virtualbox": { - "execute_command": "echo 'vagrant'|sudo -S sh '{{.Path}}'" - }, - "vmware": { - "execute_command": "echo 'vagrant'|sudo -S sh '{{.Path}}'" - } - } - } - ], - "builders": [ - { - "type": "virtualbox", - "boot_command": [ - "<esc><enter><wait>", - "linux netdevice=eth0 netsetup=dhcp install=cd:/<wait>", - " lang=en_US autoyast=http://{{ .HTTPIP }}:{{ .HTTPPort }}/autoinst.xml<wait>", - " textmode=1<wait>", - "<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": 40960, - "guest_os_type": "OpenSUSE_64", - "http_directory": "http", - "iso_checksum": "a0b34f6237b2b2a6b2174c82b40ed326", - "iso_checksum_type": "md5", - "iso_url": "", - "ssh_username": "vagrant", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_wait_timeout": "10000s", - "shutdown_command": "echo '/sbin/halt -h -p' > shutdown.sh; echo 'vagrant'|sudo -S sh 'shutdown.sh'", - "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", - "virtualbox_version_file": ".vbox_version", - "vboxmanage": [ - [ - "modifyvm", - "{{.Name}}", - "--memory", - "480" - ], - [ - "modifyvm", - "{{.Name}}", - "--cpus", - "1" - ] - ], - "iso_md5": "a0b34f6237b2b2a6b2174c82b40ed326" - }, - { - "type": "vmware", - "boot_command": [ - "<esc><enter><wait>", - "linux netdevice=eth0 netsetup=dhcp install=cd:/<wait>", - " lang=en_US autoyast=http://{{ .HTTPIP }}:{{ .HTTPPort }}/autoinst.xml<wait>", - " textmode=1<wait>", - "<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": 40960, - "guest_os_type": "opensuse-64", - "http_directory": "http", - "iso_checksum": "a0b34f6237b2b2a6b2174c82b40ed326", - "iso_checksum_type": "md5", - "iso_url": "", - "ssh_username": "vagrant", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_wait_timeout": "10000s", - "shutdown_command": "echo '/sbin/halt -h -p' > shutdown.sh; echo 'vagrant'|sudo -S sh 'shutdown.sh'", - "vmx_data": { - "memsize": "480", - "numvcpus": "1", - "cpuid.coresPerSocket": "1" - }, - "iso_md5": "a0b34f6237b2b2a6b2174c82b40ed326" - } - ], - "post-provisioner": [ - { - "type": "vagrant", - "output": "sles-11-sp2-i386-{{.Provisioner}}.box" - } - ] -} \ No newline at end of file diff --git a/templates/sles-11-sp2/http/autoinst.xml b/templates/sles-11-sp2/http/autoinst.xml deleted file mode 100644 index 5b2647b26..000000000 --- a/templates/sles-11-sp2/http/autoinst.xml +++ /dev/null @@ -1,2569 +0,0 @@ -<?xml version="1.0"?> -<!DOCTYPE profile> -<profile xmlns="http://www.suse.com/1.0/yast2ns" xmlns:config="http://www.suse.com/1.0/configns"> - <add-on> - <add_on_products config:type="list"> - <listentry> - <media_url><![CDATA[http://demeter.uni-regensburg.de/SLE11SP2-SDK-x64/DVD1/]]></media_url> - <product>sle-sdk</product> - <product_dir>/</product_dir> - </listentry> - </add_on_products> - </add-on> - <bootloader> - <device_map config:type="list"> - <device_map_entry> - <firmware>hd0</firmware> - <linux>/dev/sda</linux> - </device_map_entry> - </device_map> - <global> - <activate>true</activate> - <boot_root>true</boot_root> - <default>SUSE Linux Enterprise Server 11 SP2 - 3.0.13-0.27</default> - <generic_mbr>true</generic_mbr> - <gfxmenu>/boot/message</gfxmenu> - <lines_cache_id>2</lines_cache_id> - <timeout config:type="integer">8</timeout> - </global> - <initrd_modules config:type="list"> - <initrd_module> - <module>ahci</module> - </initrd_module> - <initrd_module> - <module>ata_piix</module> - </initrd_module> - <initrd_module> - <module>ata_generic</module> - </initrd_module> - <initrd_module> - <module>jbd</module> - </initrd_module> - <initrd_module> - <module>mbcache</module> - </initrd_module> - <initrd_module> - <module>ext3</module> - </initrd_module> - </initrd_modules> - <loader_type>grub</loader_type> - <sections config:type="list"> - <section> - <append>resume=/dev/sda1 splash=silent crashkernel=128M-:64M showopts</append> - <image>(hd0,1)/boot/vmlinuz-3.0.13-0.27-default</image> - <initial>1</initial> - <initrd>(hd0,1)/boot/initrd-3.0.13-0.27-default</initrd> - <lines_cache_id>0</lines_cache_id> - <name>SUSE Linux Enterprise Server 11 SP2 - 3.0.13-0.27</name> - <original_name>linux</original_name> - <root>/dev/sda2</root> - <type>image</type> - <vgamode>0x314</vgamode> - </section> - <section> - <append>showopts ide=nodma apm=off noresume edd=off powersaved=off nohz=off highres=off processor.max_cstate=1 nomodeset x11failsafe</append> - <image>(hd0,1)/boot/vmlinuz-3.0.13-0.27-default</image> - <initrd>(hd0,1)/boot/initrd-3.0.13-0.27-default</initrd> - <lines_cache_id>1</lines_cache_id> - <name>Failsafe -- SUSE Linux Enterprise Server 11 SP2 - 3.0.13-0.27</name> - <original_name>failsafe</original_name> - <root>/dev/sda2</root> - <type>image</type> - <vgamode>0x314</vgamode> - </section> - </sections> - </bootloader> - <ca_mgm> - <CAName>YaST_Default_CA</CAName> - <ca_commonName>YaST Default CA (vagrant-sles-11sp2-x64)</ca_commonName> - <country>US</country> - <locality></locality> - <organisation></organisation> - <organisationUnit></organisationUnit> - <password>ENTER PASSWORD HERE</password> - <server_commonName>vagrant-sles-11sp2-x64.vagrantup.com</server_commonName> - <server_email>postmaster@vagrantup.com</server_email> - <state></state> - <takeLocalServerName config:type="boolean">false</takeLocalServerName> - </ca_mgm> - <deploy_image> - <image_installation config:type="boolean">false</image_installation> - </deploy_image> - <general> - <ask-list config:type="list"/> - <mode> - <confirm config:type="boolean">false</confirm> - </mode> - <mouse> - <id>none</id> - </mouse> - <proposals config:type="list"/> - <signature-handling> - <accept_file_without_checksum config:type="boolean">true</accept_file_without_checksum> - <accept_non_trusted_gpg_key config:type="boolean">true</accept_non_trusted_gpg_key> - <accept_unknown_gpg_key config:type="boolean">true</accept_unknown_gpg_key> - <accept_unsigned_file config:type="boolean">true</accept_unsigned_file> - <accept_verification_failed config:type="boolean">false</accept_verification_failed> - <import_gpg_key config:type="boolean">true</import_gpg_key> - </signature-handling> - <storage/> - </general> - <groups config:type="list"> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>100</gid> - <group_password>x</group_password> - <groupname>users</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>19</gid> - <group_password>x</group_password> - <groupname>floppy</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>1</gid> - <group_password>x</group_password> - <groupname>bin</groupname> - <userlist>daemon</userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>41</gid> - <group_password>x</group_password> - <groupname>xok</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>65533</gid> - <group_password>x</group_password> - <groupname>nobody</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>43</gid> - <group_password>x</group_password> - <groupname>modem</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>5</gid> - <group_password>x</group_password> - <groupname>tty</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>7</gid> - <group_password>x</group_password> - <groupname>lp</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>104</gid> - <group_password>!</group_password> - <groupname>uuidd</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>51</gid> - <group_password>!</group_password> - <groupname>postfix</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>112</gid> - <group_password>!</group_password> - <groupname>gdm</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>65534</gid> - <group_password>x</group_password> - <groupname>nogroup</groupname> - <userlist>nobody</userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>101</gid> - <group_password>!</group_password> - <groupname>messagebus</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>59</gid> - <group_password>!</group_password> - <groupname>maildrop</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>33</gid> - <group_password>x</group_password> - <groupname>video</groupname> - <userlist>vagrant</userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>3</gid> - <group_password>x</group_password> - <groupname>sys</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>15</gid> - <group_password>x</group_password> - <groupname>shadow</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>20</gid> - <group_password>x</group_password> - <groupname>cdrom</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>21</gid> - <group_password>x</group_password> - <groupname>console</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>42</gid> - <group_password>x</group_password> - <groupname>trusted</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>102</gid> - <group_password>!</group_password> - <groupname>haldaemon</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>106</gid> - <group_password>!</group_password> - <groupname>puppet</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>16</gid> - <group_password>x</group_password> - <groupname>dialout</groupname> - <userlist>vagrant</userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>107</gid> - <group_password>!</group_password> - <groupname>polkituser</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>10</gid> - <group_password>x</group_password> - <groupname>wheel</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>109</gid> - <group_password>!</group_password> - <groupname>pulse</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>8</gid> - <group_password>x</group_password> - <groupname>www</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>40</gid> - <group_password>x</group_password> - <groupname>games</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>6</gid> - <group_password>x</group_password> - <groupname>disk</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>17</gid> - <group_password>x</group_password> - <groupname>audio</groupname> - <userlist>pulse</userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>111</gid> - <group_password>!</group_password> - <groupname>suse-ncc</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>49</gid> - <group_password>x</group_password> - <groupname>ftp</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>103</gid> - <group_password>!</group_password> - <groupname>tape</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>25</gid> - <group_password>!</group_password> - <groupname>at</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>9</gid> - <group_password>x</group_password> - <groupname>kmem</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>32</gid> - <group_password>x</group_password> - <groupname>public</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>12</gid> - <group_password>x</group_password> - <groupname>mail</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>0</gid> - <group_password>x</group_password> - <groupname>root</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>2</gid> - <group_password>x</group_password> - <groupname>daemon</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>105</gid> - <group_password>!</group_password> - <groupname>sfcb</groupname> - <userlist>root</userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>108</gid> - <group_password>!</group_password> - <groupname>ntp</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>14</gid> - <group_password>x</group_password> - <groupname>uucp</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>110</gid> - <group_password>!</group_password> - <groupname>pulse-access</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>71</gid> - <group_password>!</group_password> - <groupname>ntadmin</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>62</gid> - <group_password>x</group_password> - <groupname>man</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>22</gid> - <group_password>x</group_password> - <groupname>utmp</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>13</gid> - <group_password>x</group_password> - <groupname>news</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>65</gid> - <group_password>!</group_password> - <groupname>sshd</groupname> - <userlist></userlist> - </group> - </groups> - <host> - <hosts config:type="list"> - <hosts_entry> - <host_address>127.0.0.1</host_address> - <names config:type="list"> - <name>localhost</name> - </names> - </hosts_entry> - <hosts_entry> - <host_address>::1</host_address> - <names config:type="list"> - <name>localhost ipv6-localhost ipv6-loopback</name> - </names> - </hosts_entry> - <hosts_entry> - <host_address>fe00::0</host_address> - <names config:type="list"> - <name>ipv6-localnet</name> - </names> - </hosts_entry> - <hosts_entry> - <host_address>ff00::0</host_address> - <names config:type="list"> - <name>ipv6-mcastprefix</name> - </names> - </hosts_entry> - <hosts_entry> - <host_address>ff02::1</host_address> - <names config:type="list"> - <name>ipv6-allnodes</name> - </names> - </hosts_entry> - <hosts_entry> - <host_address>ff02::2</host_address> - <names config:type="list"> - <name>ipv6-allrouters</name> - </names> - </hosts_entry> - <hosts_entry> - <host_address>ff02::3</host_address> - <names config:type="list"> - <name>ipv6-allhosts</name> - </names> - </hosts_entry> - </hosts> - </host> - <login_settings/> - <networking> - <dhcp_options> - <dhclient_client_id></dhclient_client_id> - <dhclient_hostname_option>AUTO</dhclient_hostname_option> - </dhcp_options> - <dns> - <dhcp_hostname config:type="boolean">false</dhcp_hostname> - <domain>vagrantup.com</domain> - <hostname>vagrant-sles-11sp2-x64</hostname> - <resolv_conf_policy>auto</resolv_conf_policy> - <searchlist config:type="list"> - <search>vagrantup.com</search> - </searchlist> - <write_hostname config:type="boolean">true</write_hostname> - </dns> - <interfaces config:type="list"> - <interface> - <bootproto>dhcp</bootproto> - <device>eth0</device> - <name>82540EM Gigabit Ethernet Controller</name> - <startmode>auto</startmode> - <usercontrol>no</usercontrol> - </interface> - </interfaces> - <managed config:type="boolean">false</managed> - <net-udev config:type="list"> - <rule> - <name>eth0</name> - <rule>KERNELS</rule> - <value>0000:00:03.0</value> - </rule> - </net-udev> - <routing> - <ip_forward config:type="boolean">false</ip_forward> - </routing> - </networking> - <partitioning config:type="list"> - <drive> - <device>/dev/sda</device> - <initialize config:type="boolean">true</initialize> - <partitions config:type="list"> - <partition> - <create config:type="boolean">true</create> - <crypt_fs config:type="boolean">false</crypt_fs> - <filesystem config:type="symbol">swap</filesystem> - <format config:type="boolean">true</format> - <fstopt>defaults</fstopt> - <loop_fs config:type="boolean">false</loop_fs> - <mount>swap</mount> - <mountby config:type="symbol">device</mountby> - <partition_id config:type="integer">130</partition_id> - <partition_nr config:type="integer">1</partition_nr> - <raid_options/> - <resize config:type="boolean">false</resize> - <size>1561492992</size> - </partition> - <partition> - <create config:type="boolean">true</create> - <crypt_fs config:type="boolean">false</crypt_fs> - <filesystem config:type="symbol">ext3</filesystem> - <format config:type="boolean">true</format> - <fstopt>acl,user_xattr</fstopt> - <loop_fs config:type="boolean">false</loop_fs> - <mount>/</mount> - <mountby config:type="symbol">device</mountby> - <partition_id config:type="integer">131</partition_id> - <partition_nr config:type="integer">2</partition_nr> - <raid_options/> - <resize config:type="boolean">false</resize> - <size>19895844352</size> - </partition> - </partitions> - <pesize></pesize> - <type config:type="symbol">CT_DISK</type> - <use>all</use> - </drive> - </partitioning> - <report> - <errors> - <log config:type="boolean">true</log> - <show config:type="boolean">true</show> - <timeout config:type="integer">0</timeout> - </errors> - <messages> - <log config:type="boolean">true</log> - <show config:type="boolean">true</show> - <timeout config:type="integer">0</timeout> - </messages> - <warnings> - <log config:type="boolean">true</log> - <show config:type="boolean">true</show> - <timeout config:type="integer">0</timeout> - </warnings> - <yesno_messages> - <log config:type="boolean">true</log> - <show config:type="boolean">true</show> - <timeout config:type="integer">0</timeout> - </yesno_messages> - </report> - <software> - - <packages config:type="list"> - <package>desktop-translations</package> - <package>gconf2-branding-SLES</package> - <package>libproxy0-config-gnome</package> - <package>sle-sdk-release</package> - <package>sle-sdk-release-SDK</package> - <package>sles-manuals_en</package> - <package>yast2-trans-en_US</package> - </packages> - <patterns config:type="list"> - <pattern>Basis-Devel</pattern> - <pattern>Minimal</pattern> - <pattern>apparmor</pattern> - <pattern>base</pattern> - <pattern>sdk_kernel</pattern> - </patterns> - <remove-packages config:type="list"> - <package>3ddiag</package> - <package>CASA</package> - <package>CASA-devel</package> - <package>CASA_auth_token_client</package> - <package>CASA_auth_token_client-devel</package> - <package>ConsoleKit-devel</package> - <package>ConsoleKit-x11</package> - <package>DirectFB-devel</package> - <package>FastCGI</package> - <package>IlmBase</package> - <package>IlmBase-devel</package> - <package>ImageMagick</package> - <package>ImageMagick-devel</package> - <package>LibVNCServer</package> - <package>LibVNCServer-devel</package> - <package>Mesa</package> - <package>Mesa-devel</package> - <package>ModemManager</package> - <package>Modules</package> - <package>NetworkManager</package> - <package>NetworkManager-devel</package> - <package>NetworkManager-glib</package> - <package>NetworkManager-gnome</package> - <package>NetworkManager-kde4</package> - <package>NetworkManager-kde4-lang</package> - <package>NetworkManager-kde4-libs</package> - <package>OpenEXR</package> - <package>OpenEXR-devel</package> - <package>OpenIPMI-devel</package> - <package>PackageKit</package> - <package>PackageKit-devel</package> - <package>PackageKit-lang</package> - <package>PolicyKit-devel</package> - <package>PolicyKit-gnome</package> - <package>PolicyKit-gnome-devel</package> - <package>PolicyKit-gnome-libs</package> - <package>SDL-devel</package> - <package>SDL_net</package> - <package>SDL_net-devel</package> - <package>TeX-Guy</package> - <package>TeX-Guy-devel</package> - <package>VFlib3</package> - <package>VFlib3-devel</package> - <package>WindowMaker</package> - <package>WindowMaker-devel</package> - <package>a2ps</package> - <package>aalib</package> - <package>aalib-devel</package> - <package>akonadi-runtime</package> - <package>akregator</package> - <package>alsa-devel</package> - <package>alsa-firmware</package> - <package>alsa-plugins-pulse</package> - <package>alsa-tools</package> - <package>alsa-tools-devel</package> - <package>anthy</package> - <package>anthy-devel</package> - <package>antlr</package> - <package>apache2</package> - <package>apache2-devel</package> - <package>apache2-mod_perl</package> - <package>apache2-mod_perl-devel</package> - <package>apache2-prefork</package> - <package>apache2-utils</package> - <package>apache2-worker</package> - <package>apparmor-profile-editor</package> - <package>art-sharp2</package> - <package>arts</package> - <package>arts-devel</package> - <package>aspell-devel</package> - <package>at-spi</package> - <package>at-spi-devel</package> - <package>at-spi-lang</package> - <package>atk-devel</package> - <package>audiofile</package> - <package>audiofile-devel</package> - <package>audit-devel</package> - <package>augeas-lenses</package> - <package>automoc4</package> - <package>avahi</package> - <package>avahi-compat-howl-devel</package> - <package>avahi-compat-mDNSResponder-devel</package> - <package>avahi-lang</package> - <package>babl-0_0</package> - <package>banshee-1</package> - <package>banshee-1-backend-engine-gstreamer</package> - <package>banshee-1-backend-platform-gnome</package> - <package>banshee-1-backend-platform-unix</package> - <package>banshee-1-devel</package> - <package>banshee-1-extensions-default</package> - <package>banshee-1-lang</package> - <package>beagle-devel</package> - <package>bind-devel</package> - <package>binutils-devel</package> - <package>bluez</package> - <package>bluez-devel</package> - <package>boo</package> - <package>boo-devel</package> - <package>boost-devel</package> - <package>bootsplash-branding-SLED</package> - <package>cairo-devel</package> - <package>cairomm</package> - <package>cairomm-devel</package> - <package>canna</package> - <package>canna-devel</package> - <package>canna-libs</package> - <package>cannadic</package> - <package>capi4linux</package> - <package>capi4linux-devel</package> - <package>cdk</package> - <package>cdk-devel</package> - <package>cdrdao</package> - <package>chasen</package> - <package>chasen-devel</package> - <package>check</package> - <package>check-devel</package> - <package>chmlib</package> - <package>chmlib-devel</package> - <package>cim-schema</package> - <package>clucene-core</package> - <package>clucene-core-devel</package> - <package>cmake</package> - <package>compiz</package> - <package>compiz-branding-SLE</package> - <package>compiz-devel</package> - <package>compiz-gnome</package> - <package>coolkey-devel</package> - <package>cracklib-devel</package> - <package>crash-devel</package> - <package>crimson</package> - <package>cscope</package> - <package>cups</package> - <package>cups-devel</package> - <package>cvsps</package> - <package>cyrus-imapd-devel</package> - <package>cyrus-sasl-crammd5</package> - <package>cyrus-sasl-devel</package> - <package>dante</package> - <package>dante-devel</package> - <package>db1</package> - <package>db1-devel</package> - <package>db43</package> - <package>db43-devel</package> - <package>dbus-1-devel</package> - <package>dbus-1-glib-devel</package> - <package>dbus-1-python-devel</package> - <package>dbus-1-qt3</package> - <package>dbus-1-qt3-devel</package> - <package>dbus-1-x11</package> - <package>dejagnu</package> - <package>dejavu</package> - <package>desktop-data-openSUSE</package> - <package>desktop-file-utils</package> - <package>devhelp</package> - <package>devhelp-devel</package> - <package>devhelp-lang</package> - <package>device-mapper-devel</package> - <package>dhcp</package> - <package>dhcp-client</package> - <package>dhcp-devel</package> - <package>diffstat</package> - <package>dmapi-devel</package> - <package>dnsmasq</package> - <package>docbook-xsl-stylesheets</package> - <package>docbook_4</package> - <package>doxygen</package> - <package>dvd+rw-tools</package> - <package>e2fsprogs-devel</package> - <package>emacs</package> - <package>emacs-nox</package> - <package>emacs-x11</package> - <package>enchant</package> - <package>enchant-devel</package> - <package>enscript</package> - <package>eog</package> - <package>eog-devel</package> - <package>eog-lang</package> - <package>espeak</package> - <package>evince</package> - <package>evince-devel</package> - <package>evince-lang</package> - <package>evoldap2-devel</package> - <package>evolution</package> - <package>evolution-data-server</package> - <package>evolution-data-server-devel</package> - <package>evolution-data-server-lang</package> - <package>evolution-devel</package> - <package>evolution-lang</package> - <package>expect-devel</package> - <package>facter</package> - <package>fam</package> - <package>fam-devel</package> - <package>farsight</package> - <package>farsight-devel</package> - <package>festival</package> - <package>festival-devel</package> - <package>fftw</package> - <package>fftw-devel</package> - <package>fftw-mpi</package> - <package>fftw-mpi-devel</package> - <package>fftw-threads</package> - <package>fftw-threads-devel</package> - <package>fftw3</package> - <package>fftw3-devel</package> - <package>fftw3-threads</package> - <package>fftw3-threads-devel</package> - <package>file-devel</package> - <package>fileshareset</package> - <package>finch</package> - <package>finch-devel</package> - <package>flac-devel</package> - <package>fltk</package> - <package>fltk-devel</package> - <package>fontconfig-devel</package> - <package>fonts-config</package> - <package>foomatic-filters</package> - <package>freeglut</package> - <package>freeglut-devel</package> - <package>freeradius-client-devel</package> - <package>freeradius-client-libs</package> - <package>freeradius-server-devel</package> - <package>freeradius-server-libs</package> - <package>freetype</package> - <package>freetype2-devel</package> - <package>fribidi</package> - <package>fribidi-devel</package> - <package>ft2demos</package> - <package>fuse-devel</package> - <package>fwnn-devel</package> - <package>fxload</package> - <package>gcc-gij</package> - <package>gcc-java</package> - <package>gcc43-gij</package> - <package>gcc43-java</package> - <package>gconf-sharp2</package> - <package>gconf2-devel</package> - <package>gconfmm</package> - <package>gconfmm-devel</package> - <package>gd</package> - <package>gd-devel</package> - <package>gdbm-32bit</package> - <package>gdk-pixbuf</package> - <package>gdk-pixbuf-devel</package> - <package>gegl-0_0</package> - <package>gettext-tools</package> - <package>gfxboot-branding-SLED</package> - <package>gfxboot-devel</package> - <package>ggz</package> - <package>ggz-client-libs</package> - <package>ggz-client-libs-devel</package> - <package>ggz-client-libs-lang</package> - <package>ghex</package> - <package>ghex-devel</package> - <package>ghex-lang</package> - <package>ghostscript-devel</package> - <package>ghostscript-fonts-other</package> - <package>ghostscript-fonts-std</package> - <package>ghostscript-ijs-devel</package> - <package>ghostscript-library</package> - <package>ghostscript-omni</package> - <package>ghostscript-x11</package> - <package>giflib-devel</package> - <package>gimp</package> - <package>gimp-branding-SLED</package> - <package>gimp-devel</package> - <package>gimp-lang</package> - <package>gimp-plugins-python</package> - <package>git</package> - <package>git-arch</package> - <package>git-core</package> - <package>git-cvs</package> - <package>git-daemon</package> - <package>git-email</package> - <package>git-gui</package> - <package>git-svn</package> - <package>git-web</package> - <package>gitk</package> - <package>gjdoc</package> - <package>glade-sharp2</package> - <package>glade3</package> - <package>glade3-lang</package> - <package>glib</package> - <package>glib-devel</package> - <package>glib-sharp2</package> - <package>glib2-devel</package> - <package>glibmm2</package> - <package>glibmm2-devel</package> - <package>glitz</package> - <package>glitz-devel</package> - <package>gltt</package> - <package>gltt-devel</package> - <package>gmime-2_4-devel</package> - <package>gmime-devel</package> - <package>gmp-devel</package> - <package>gnet</package> - <package>gnet-devel</package> - <package>gnokii</package> - <package>gnokii-devel</package> - <package>gnokii-smsd</package> - <package>gnome-certauth-devel</package> - <package>gnome-control-center</package> - <package>gnome-control-center-devel</package> - <package>gnome-control-center-lang</package> - <package>gnome-desktop</package> - <package>gnome-desktop-devel</package> - <package>gnome-desktop-lang</package> - <package>gnome-doc-utils</package> - <package>gnome-doc-utils-devel</package> - <package>gnome-doc-utils-lang</package> - <package>gnome-keyring-devel</package> - <package>gnome-keyring-sharp</package> - <package>gnome-keyring-sharp-devel</package> - <package>gnome-libs</package> - <package>gnome-libs-devel</package> - <package>gnome-mag</package> - <package>gnome-mag-devel</package> - <package>gnome-mag-lang</package> - <package>gnome-main-menu</package> - <package>gnome-main-menu-lang</package> - <package>gnome-media</package> - <package>gnome-media-devel</package> - <package>gnome-media-lang</package> - <package>gnome-menus</package> - <package>gnome-menus-branding-SLED</package> - <package>gnome-menus-devel</package> - <package>gnome-menus-lang</package> - <package>gnome-mount</package> - <package>gnome-mount-lang</package> - <package>gnome-panel</package> - <package>gnome-panel-devel</package> - <package>gnome-panel-lang</package> - <package>gnome-pilot</package> - <package>gnome-pilot-devel</package> - <package>gnome-pilot-lang</package> - <package>gnome-settings-daemon</package> - <package>gnome-settings-daemon-devel</package> - <package>gnome-settings-daemon-lang</package> - <package>gnome-sharp2</package> - <package>gnome-speech</package> - <package>gnome-speech-devel</package> - <package>gnome-themes</package> - <package>gnome-utils</package> - <package>gnome-utils-devel</package> - <package>gnome-utils-lang</package> - <package>gnome-vfs-sharp2</package> - <package>gnome-vfs2</package> - <package>gnome-vfs2-devel</package> - <package>gnome-vfs2-lang</package> - <package>gnome-vfsmm</package> - <package>gnome-vfsmm-devel</package> - <package>gnopernicus</package> - <package>gnopernicus-devel</package> - <package>gnopernicus-lang</package> - <package>gnutls</package> - <package>goffice</package> - <package>goffice-devel</package> - <package>goffice-lang</package> - <package>goocanvas</package> - <package>goocanvas-devel</package> - <package>goocanvas-lang</package> - <package>goom2k4</package> - <package>goom2k4-devel</package> - <package>graphviz</package> - <package>graphviz-devel</package> - <package>graphviz-gd</package> - <package>graphviz-gnome</package> - <package>gstreamer-0_10</package> - <package>gstreamer-0_10-devel</package> - <package>gstreamer-0_10-lang</package> - <package>gstreamer-0_10-plugins-base</package> - <package>gstreamer-0_10-plugins-base-devel</package> - <package>gstreamer-0_10-plugins-base-lang</package> - <package>gstreamer-0_10-plugins-good</package> - <package>gstreamer-0_10-plugins-good-lang</package> - <package>gstreamer-0_10-utils</package> - <package>gstreamer-utils</package> - <package>gtk</package> - <package>gtk-devel</package> - <package>gtk-lang</package> - <package>gtk-sharp2</package> - <package>gtk-vnc-devel</package> - <package>gtk2-devel</package> - <package>gtkglext</package> - <package>gtkglext-devel</package> - <package>gtkhtml2</package> - <package>gtkhtml2-devel</package> - <package>gtkhtml2-lang</package> - <package>gtkhtml314-sharp</package> - <package>gtkmm2</package> - <package>gtkmm2-devel</package> - <package>gtksourceview-devel</package> - <package>gtksourceview-lang</package> - <package>gtksourceview18</package> - <package>gtksourceview18-devel</package> - <package>gtkspell</package> - <package>gtkspell-devel</package> - <package>gtkspell-lang</package> - <package>gucharmap</package> - <package>gucharmap-devel</package> - <package>gucharmap-lang</package> - <package>guile</package> - <package>guile-devel</package> - <package>gutenprint</package> - <package>gutenprint-devel</package> - <package>gvfs-devel</package> - <package>gxmhtml</package> - <package>hal-devel</package> - <package>hal-palm</package> - <package>htdig</package> - <package>htdig-devel</package> - <package>hunspell</package> - <package>hunspell-devel</package> - <package>hunspell-tools</package> - <package>hwinfo-devel</package> - <package>i4l-base</package> - <package>icewm</package> - <package>icewm-lite</package> - <package>id3lib</package> - <package>id3lib-devel</package> - <package>imap-devel</package> - <package>imap-lib</package> - <package>imlib</package> - <package>imlib-devel</package> - <package>imlib2</package> - <package>imlib2-devel</package> - <package>indent</package> - <package>info2html</package> - <package>inn</package> - <package>inn-devel</package> - <package>intltool</package> - <package>ipadic</package> - <package>iptables-devel</package> - <package>iso-codes</package> - <package>iso-codes-devel</package> - <package>iso_ent</package> - <package>ispell</package> - <package>ispell-american</package> - <package>ispell-brazilian</package> - <package>ispell-british</package> - <package>ispell-czech</package> - <package>ispell-danish</package> - <package>ispell-finnish</package> - <package>ispell-french</package> - <package>ispell-german</package> - <package>ispell-hungarian</package> - <package>ispell-italian</package> - <package>ispell-ngerman</package> - <package>ispell-norsk</package> - <package>ispell-polish</package> - <package>ispell-portuguese</package> - <package>ispell-russian</package> - <package>ispell-slovak</package> - <package>ispell-spanish</package> - <package>ispell-swedish</package> - <package>itcl-devel</package> - <package>java-1_4_2-ibm</package> - <package>java-1_4_2-ibm-devel</package> - <package>java-1_5_0-gcj-compat</package> - <package>java-1_5_0-gcj-compat-devel</package> - <package>java-1_6_0-ibm</package> - <package>java-1_6_0-ibm-devel</package> - <package>joe</package> - <package>jpackage-utils</package> - <package>k3b</package> - <package>k3b-devel</package> - <package>k3b-lang</package> - <package>kaddressbook</package> - <package>kalarm</package> - <package>kde-susetranslations</package> - <package>kde4-filesystem</package> - <package>kde4-kgreeter-plugins</package> - <package>kdebase3</package> - <package>kdebase3-devel</package> - <package>kdebase3-runtime</package> - <package>kdebase4-SLED</package> - <package>kdebase4-SLED-lang</package> - <package>kdebase4-runtime</package> - <package>kdebase4-runtime-branding-SLED</package> - <package>kdebase4-workspace</package> - <package>kdebase4-workspace-branding-SLED</package> - <package>kdebase4-workspace-devel</package> - <package>kdebase4-workspace-ksysguardd</package> - <package>kdelibs3</package> - <package>kdelibs3-arts</package> - <package>kdelibs3-default-style</package> - <package>kdelibs3-devel</package> - <package>kdelibs3-doc</package> - <package>kdelibs4</package> - <package>kdelibs4-branding-SLED</package> - <package>kdelibs4-core</package> - <package>kdelibs4-doc</package> - <package>kdemultimedia3-arts</package> - <package>kdepim3</package> - <package>kdepim4</package> - <package>kdepim4-devel</package> - <package>kdepimlibs4</package> - <package>kdialog</package> - <package>kdm</package> - <package>kdm-branding-SLED</package> - <package>kernel-docs</package> - <package>kernel-syms</package> - <package>kernel-trace-devel</package> - <package>kernel-xen-devel</package> - <package>keyutils-devel</package> - <package>kio_sysinfo</package> - <package>kio_sysinfo-branding-SLED</package> - <package>kmail</package> - <package>knode</package> - <package>kontact</package> - <package>korganizer</package> - <package>kpilot</package> - <package>krb5-devel</package> - <package>ksh-devel</package> - <package>ktorrent</package> - <package>ktorrent-devel</package> - <package>ktorrent-lang</package> - <package>kwin</package> - <package>ladspa-devel</package> - <package>lib3ds-1-3</package> - <package>lib3ds-devel</package> - <package>libFLAC++6</package> - <package>libFLAC8</package> - <package>libHX-devel</package> - <package>libMagick++-devel</package> - <package>libMagick++1</package> - <package>libMagickWand1</package> - <package>libQtWebKit-devel</package> - <package>libQtWebKit4</package> - <package>libXerces-c-devel</package> - <package>libXerces-c28</package> - <package>libXiterm</package> - <package>libXiterm-devel</package> - <package>libacl-devel</package> - <package>libadns-devel</package> - <package>libadns1</package> - <package>libakode</package> - <package>libakode-devel</package> - <package>libakonadi4</package> - <package>libakonadiprotocolinternals-devel</package> - <package>libakonadiprotocolinternals1</package> - <package>libao</package> - <package>libao-devel</package> - <package>libapparmor-devel</package> - <package>libapr-util1</package> - <package>libapr-util1-devel</package> - <package>libapr1</package> - <package>libapr1-devel</package> - <package>libarchive-devel</package> - <package>libart_lgpl</package> - <package>libart_lgpl-devel</package> - <package>libassuan-devel</package> - <package>libatomic-ops-devel</package> - <package>libattr-devel</package> - <package>libavahi-core5</package> - <package>libavahi-devel</package> - <package>libavahi-glib-devel</package> - <package>libavahi-gobject-devel</package> - <package>libavahi-gobject0</package> - <package>libavahi-ui0</package> - <package>libavc1394-0</package> - <package>libavc1394-devel</package> - <package>libbabl-0_0-0</package> - <package>libbeagle-devel</package> - <package>libbeagle-python</package> - <package>libbeagle1</package> - <package>libbitmask-devel</package> - <package>libbitmask1</package> - <package>libblkid-devel</package> - <package>libblocxx-devel</package> - <package>libbonobo</package> - <package>libbonobo-devel</package> - <package>libbonobo-lang</package> - <package>libbonoboui</package> - <package>libbonoboui-devel</package> - <package>libbonoboui-lang</package> - <package>libboost_date_time1_36_0</package> - <package>libboost_filesystem1_36_0</package> - <package>libboost_graph1_36_0</package> - <package>libboost_iostreams1_36_0</package> - <package>libboost_math1_36_0</package> - <package>libboost_mpi1_36_0</package> - <package>libboost_program_options1_36_0</package> - <package>libboost_python1_36_0</package> - <package>libboost_serialization1_36_0</package> - <package>libboost_signals1_36_0</package> - <package>libboost_system1_36_0</package> - <package>libboost_test1_36_0</package> - <package>libboost_thread1_36_0</package> - <package>libboost_wave1_36_0</package> - <package>libbotan-1_6_4</package> - <package>libbotan-devel</package> - <package>libbtctl</package> - <package>libbtctl-devel</package> - <package>libbtctl-lang</package> - <package>libbtctl4</package> - <package>libbz2-devel</package> - <package>libcaca</package> - <package>libcaca-devel</package> - <package>libcanberra-gtk</package> - <package>libcanberra-gtk0</package> - <package>libcanberra0</package> - <package>libcap-devel</package> - <package>libcap-ng0</package> - <package>libcdda_interface0</package> - <package>libcdda_paranoia0</package> - <package>libcddb-devel</package> - <package>libcddb2</package> - <package>libcdio++0</package> - <package>libcdio-devel</package> - <package>libcgroup-devel</package> - <package>libcgroup1</package> - <package>libchewing</package> - <package>libchewing-devel</package> - <package>libcmpiutil</package> - <package>libcmpiutil-devel</package> - <package>libcolorblind0</package> - <package>libcom_err-devel</package> - <package>libcompizconfig</package> - <package>libcompizconfig-devel</package> - <package>libcppunit-1_12-0</package> - <package>libcppunit-devel</package> - <package>libcpuset-devel</package> - <package>libcpuset1</package> - <package>libcroco</package> - <package>libcroco-0_6-3</package> - <package>libcroco-devel</package> - <package>libcryptsetup-devel</package> - <package>libcsync-devel</package> - <package>libcsync0</package> - <package>libcurl-devel</package> - <package>libdaemon-devel</package> - <package>libdaemon0</package> - <package>libdatrie-devel</package> - <package>libdatrie0</package> - <package>libdb-4_5-32bit</package> - <package>libdb-4_5-devel</package> - <package>libdbus-1-qt3-0</package> - <package>libdbus-1-qt3-0-devel</package> - <package>libdc1394-22</package> - <package>libdc1394-devel</package> - <package>libdc1394_control12</package> - <package>libdc1394_control12-devel</package> - <package>libdhcp6client-1_0-2</package> - <package>libdhcp6client-devel</package> - <package>libdigikam-devel</package> - <package>libdiscid1</package> - <package>libdjvulibre-devel</package> - <package>libdjvulibre21</package> - <package>libdmxview-devel</package> - <package>libdmxview0</package> - <package>libdnet-devel</package> - <package>libdnet1</package> - <package>libdns_sd</package> - <package>libdrm</package> - <package>libdrm-devel</package> - <package>libdv-devel</package> - <package>libdv4</package> - <package>libdvdread4</package> - <package>libdw-devel</package> - <package>libebl-devel</package> - <package>libedit-devel</package> - <package>libedit0</package> - <package>libelf-devel</package> - <package>libenchant1</package> - <package>libesd-devel</package> - <package>libesd0</package> - <package>libesmtp-devel</package> - <package>libevoldap-2_4-2</package> - <package>libevtlog-devel</package> - <package>libevtlog0</package> - <package>libexempi-devel</package> - <package>libexempi3</package> - <package>libexif-devel</package> - <package>libexiv2-4</package> - <package>libexiv2-devel</package> - <package>libexpat-devel</package> - <package>libext2fs-devel</package> - <package>libfarsight-0_1-3</package> - <package>libffi-devel</package> - <package>libffi43</package> - <package>libffi43-devel</package> - <package>libflaim-devel</package> - <package>libfprint-devel</package> - <package>libfreebl3</package> - <package>libfreebob</package> - <package>libfreebob-devel</package> - <package>libgadu</package> - <package>libgadu-devel</package> - <package>libgail-gnome</package> - <package>libgail-gnome-devel</package> - <package>libgcj-devel</package> - <package>libgcj43</package> - <package>libgcj43-devel</package> - <package>libgcj43-jar</package> - <package>libgcj_bc43</package> - <package>libgcrypt-devel</package> - <package>libgda-3_0-3</package> - <package>libgda-3_0-devel</package> - <package>libgdiplus0</package> - <package>libgegl-0_0-0</package> - <package>libgeoclue0</package> - <package>libgfortran46</package> - <package>libggz2</package> - <package>libggz2-devel</package> - <package>libgimpprint</package> - <package>libgimpprint-devel</package> - <package>libglade2</package> - <package>libglade2-devel</package> - <package>libglademm</package> - <package>libglademm-2_4-1</package> - <package>libglademm-devel</package> - <package>libgladeui-1-9</package> - <package>libgladeui-1_0-devel</package> - <package>libgmime-2_0-3</package> - <package>libgmime-2_4-2</package> - <package>libgmm++-devel</package> - <package>libgnome</package> - <package>libgnome-certauth0</package> - <package>libgnome-desktop-2-11</package> - <package>libgnome-devel</package> - <package>libgnome-lang</package> - <package>libgnome-menu2</package> - <package>libgnome-window-settings1</package> - <package>libgnomecanvas</package> - <package>libgnomecanvas-devel</package> - <package>libgnomecanvas-lang</package> - <package>libgnomecanvasmm</package> - <package>libgnomecanvasmm-devel</package> - <package>libgnomecups</package> - <package>libgnomecups-devel</package> - <package>libgnomecups-lang</package> - <package>libgnomedb</package> - <package>libgnomedb-devel</package> - <package>libgnomedb-lang</package> - <package>libgnomekbd</package> - <package>libgnomekbd-devel</package> - <package>libgnomekbd-lang</package> - <package>libgnomeprint</package> - <package>libgnomeprint-devel</package> - <package>libgnomeprint-lang</package> - <package>libgnomeprintui</package> - <package>libgnomeprintui-devel</package> - <package>libgnomeprintui-lang</package> - <package>libgnomesu</package> - <package>libgnomesu-devel</package> - <package>libgnomesu-lang</package> - <package>libgnomesu0</package> - <package>libgnomeui</package> - <package>libgnomeui-devel</package> - <package>libgnomeui-lang</package> - <package>libgnomevfsmm-2_6-1</package> - <package>libgnutls-devel</package> - <package>libgnutls-extra-devel</package> - <package>libgnutls-extra26</package> - <package>libgoocanvas3</package> - <package>libgpg-error-devel</package> - <package>libgpgme-devel</package> - <package>libgphoto2-devel</package> - <package>libgpod-devel</package> - <package>libgsf</package> - <package>libgsf-1-114</package> - <package>libgsf-devel</package> - <package>libgsf-gnome</package> - <package>libgsm-devel</package> - <package>libgsm1</package> - <package>libgssglue-devel</package> - <package>libgstapp-0_10-0</package> - <package>libgstinterfaces-0_10-0</package> - <package>libgstreamer-0_10-0</package> - <package>libgtk-vnc-1_0-0</package> - <package>libgtkhtml</package> - <package>libgtkhtml-devel</package> - <package>libgtksourceview-2_0-0</package> - <package>libgtop</package> - <package>libgtop-2_0-7</package> - <package>libgtop-devel</package> - <package>libgtop-lang</package> - <package>libgudev-1_0-0</package> - <package>libgweather</package> - <package>libgweather-devel</package> - <package>libgweather-lang</package> - <package>libgweather1</package> - <package>libhangul</package> - <package>libhangul-devel</package> - <package>libhowl0</package> - <package>libical-devel</package> - <package>libical0</package> - <package>libicu-devel</package> - <package>libid3tag</package> - <package>libid3tag-devel</package> - <package>libidl-devel</package> - <package>libidn-devel</package> - <package>libiec61883</package> - <package>libiec61883-devel</package> - <package>libieee1284</package> - <package>libiniparser-devel</package> - <package>libiniparser0</package> - <package>libiptcdata</package> - <package>libiptcdata-devel</package> - <package>libiptcdata0</package> - <package>libiso9660-5</package> - <package>libiterm</package> - <package>libiterm-devel</package> - <package>libjack-devel</package> - <package>libjack0</package> - <package>libjasper</package> - <package>libjasper-devel</package> - <package>libjingle-0_3-0</package> - <package>libjingle-devel</package> - <package>libjpeg-devel</package> - <package>libkcal</package> - <package>libkcal-devel</package> - <package>libkcal2</package> - <package>libkcddb4</package> - <package>libkcddb4-devel</package> - <package>libkcompactdisc4</package> - <package>libkcompactdisc4-devel</package> - <package>libkdcraw3</package> - <package>libkdcraw3-devel</package> - <package>libkdcraw3-lang</package> - <package>libkde4</package> - <package>libkde4-devel</package> - <package>libkdecore4</package> - <package>libkdecore4-devel</package> - <package>libkdepim4</package> - <package>libkdepim4-devel</package> - <package>libkdepimlibs4</package> - <package>libkdepimlibs4-devel</package> - <package>libkexiv2-3</package> - <package>libkexiv2-3-devel</package> - <package>libkexiv2-7</package> - <package>libkipi-devel</package> - <package>libkipi6</package> - <package>libkmime-devel</package> - <package>libkmime2</package> - <package>libknotificationitem-1-1</package> - <package>libkonq-devel</package> - <package>libkonq5</package> - <package>libksba-devel</package> - <package>libktnef-devel</package> - <package>libktnef1</package> - <package>liblazy-devel</package> - <package>liblazy1</package> - <package>liblcms-devel</package> - <package>libldapcpp-devel</package> - <package>liblog4c-devel</package> - <package>liblog4c3</package> - <package>libloudmouth-1-0</package> - <package>liblpsolve55</package> - <package>liblua5_1</package> - <package>libmalaga-devel</package> - <package>libmalaga7</package> - <package>libmcrypt</package> - <package>libmcrypt-devel</package> - <package>libmikmod</package> - <package>libmikmod-devel</package> - <package>libmm-devel</package> - <package>libmm14</package> - <package>libmng-devel</package> - <package>libmpcdec-devel</package> - <package>libmpcdec5</package> - <package>libmspack-devel</package> - <package>libmtp-devel</package> - <package>libmtp8</package> - <package>libmusicbrainz-devel</package> - <package>libmusicbrainz3-6</package> - <package>libmusicbrainz3-devel</package> - <package>libmusicbrainz4</package> - <package>libmysqlclient-devel</package> - <package>libmysqlclient15</package> - <package>libmysqlclient_r15</package> - <package>libneon-devel</package> - <package>libneon27</package> - <package>libnetapi-devel</package> - <package>libnetapi0</package> - <package>libnetcontrol0</package> - <package>libnetpbm-devel</package> - <package>libnetpbm10</package> - <package>libnewt0_52</package> - <package>libnjb</package> - <package>libnjb-devel</package> - <package>libnjb5</package> - <package>libnl-devel</package> - <package>libnotify</package> - <package>libnotify-devel</package> - <package>libnotify1</package> - <package>libnscd-devel</package> - <package>libnsssharedhelper0</package> - <package>libnuma-devel</package> - <package>libofa-devel</package> - <package>libofa0</package> - <package>libogg-devel</package> - <package>libogg0</package> - <package>liboil</package> - <package>liboil-devel</package> - <package>libopenbabel-devel</package> - <package>libopenbabel3</package> - <package>libopencdk-devel</package> - <package>libopencdk10</package> - <package>libopenraw-devel</package> - <package>libopenraw1</package> - <package>libopenssl-devel</package> - <package>libopensync</package> - <package>libopensync-devel</package> - <package>libopensync-plugin-evolution2</package> - <package>libopensync-plugin-evolution2-devel</package> - <package>libopensync-plugin-palm</package> - <package>libopensync-plugin-palm-devel</package> - <package>liborc-0_4-0</package> - <package>libosip2</package> - <package>libosip2-devel</package> - <package>libotf</package> - <package>libotf-devel</package> - <package>libotr-devel</package> - <package>libotr2</package> - <package>libp11-1</package> - <package>libp11-devel</package> - <package>libpackagekit-glib10</package> - <package>libpackagekit-glib10-devel</package> - <package>libpangomm-1_4-1</package> - <package>libpcap-devel</package> - <package>libpciaccess0</package> - <package>libpciaccess0-devel</package> - <package>libphonon4</package> - <package>libpisock-devel</package> - <package>libpisock9</package> - <package>libpisync-devel</package> - <package>libpisync1</package> - <package>libpixman-1-0-devel</package> - <package>libpkcs11-helper1</package> - <package>libpng-devel</package> - <package>libpolkit-qt0</package> - <package>libpoppler-devel</package> - <package>libpoppler-glib-devel</package> - <package>libpoppler-glib4</package> - <package>libpoppler-qt2</package> - <package>libpoppler-qt3-devel</package> - <package>libpoppler-qt4-3</package> - <package>libpoppler-qt4-devel</package> - <package>libpoppler5</package> - <package>libpst4</package> - <package>libpt2</package> - <package>libpt2-devel</package> - <package>libpulse-browse0</package> - <package>libpulse-devel</package> - <package>libpulse-mainloop-glib0</package> - <package>libpulse0</package> - <package>libpurple</package> - <package>libpurple-devel</package> - <package>libpurple-lang</package> - <package>libqca2</package> - <package>libqca2-devel</package> - <package>libqdialogsolver1</package> - <package>libqdialogsolver1-devel</package> - <package>libqimageblitz-devel</package> - <package>libqimageblitz4</package> - <package>libqscintilla-devel</package> - <package>libqscintilla2-5</package> - <package>libqt4</package> - <package>libqt4-devel</package> - <package>libqt4-qt3support</package> - <package>libqt4-sql</package> - <package>libqt4-sql-mysql</package> - <package>libqt4-sql-postgresql</package> - <package>libqt4-sql-sqlite</package> - <package>libqt4-sql-unixODBC</package> - <package>libqt4-x11</package> - <package>libqtpod-devel</package> - <package>libqtpod0</package> - <package>libquadmath46</package> - <package>libquicktime</package> - <package>libquicktime-devel</package> - <package>libraptor-devel</package> - <package>libraptor1</package> - <package>librasqal-devel</package> - <package>librasqal1</package> - <package>libraw1394-11</package> - <package>libraw1394-8</package> - <package>libraw1394-devel</package> - <package>libredland-devel</package> - <package>libredland0</package> - <package>libreiserfs-devel</package> - <package>libreoffice</package> - <package>libreoffice-base</package> - <package>libreoffice-branding-SLED</package> - <package>libreoffice-branding-upstream</package> - <package>libreoffice-calc</package> - <package>libreoffice-icon-themes</package> - <package>libreoffice-impress</package> - <package>libreoffice-sdk</package> - <package>libreoffice-writer</package> - <package>librsvg</package> - <package>librsvg-devel</package> - <package>libsamplerate</package> - <package>libsamplerate-devel</package> - <package>libsatsolver-devel</package> - <package>libsblim-cmpiutil1</package> - <package>libselinux-devel</package> - <package>libsemanage-devel</package> - <package>libsemanage1</package> - <package>libsensors3-devel</package> - <package>libsensors4</package> - <package>libsepol-devel</package> - <package>libsexy</package> - <package>libsexy-devel</package> - <package>libshout-devel</package> - <package>libshout3</package> - <package>libsidplay1</package> - <package>libsidplay1-devel</package> - <package>libsigc++2</package> - <package>libsigc++2-devel</package> - <package>libslab-lang</package> - <package>libslab0</package> - <package>libsmbclient-devel</package> - <package>libsmbios-devel</package> - <package>libsmbsharemodes-devel</package> - <package>libsmbsharemodes0</package> - <package>libsndfile</package> - <package>libsndfile-devel</package> - <package>libsoprano-devel</package> - <package>libsoprano4</package> - <package>libsoup-devel</package> - <package>libspectre-devel</package> - <package>libspectre1</package> - <package>libspeex</package> - <package>libssh2-devel</package> - <package>libstrigi0</package> - <package>libstroke</package> - <package>libstroke-devel</package> - <package>libsyncml-devel</package> - <package>libsyncml0</package> - <package>libtalloc-devel</package> - <package>libtasn1-devel</package> - <package>libtdb-devel</package> - <package>libtelepathy</package> - <package>libtelepathy-devel</package> - <package>libtelepathy-glib0</package> - <package>libtheora-devel</package> - <package>libtheora0</package> - <package>libtidy</package> - <package>libtidy-devel</package> - <package>libtiff-devel</package> - <package>libtirpc-devel</package> - <package>libtomoe-gtk0</package> - <package>libtspi1</package> - <package>libtunepimp</package> - <package>libtunepimp-devel</package> - <package>libtunepimp5</package> - <package>libudev-devel</package> - <package>libudf0</package> - <package>libunique-1_0-0</package> - <package>libunwind</package> - <package>libunwind-devel</package> - <package>libupsclient1</package> - <package>libusb-devel</package> - <package>libusbpp-0_1-4</package> - <package>libustr-1_0-1</package> - <package>libustr-devel</package> - <package>libuuid-devel</package> - <package>libvirt-client</package> - <package>libvirt-devel</package> - <package>libvisual</package> - <package>libvisual-devel</package> - <package>libvoikko-devel</package> - <package>libvoikko1</package> - <package>libvorbis</package> - <package>libvorbis-devel</package> - <package>libwavpack1</package> - <package>libwbclient-devel</package> - <package>libwbxml2-0</package> - <package>libwbxml2-devel</package> - <package>libwebkit-1_0-1</package> - <package>libwebkit-1_0-2</package> - <package>libwebkit-devel</package> - <package>libwebkit-lang</package> - <package>libwmf</package> - <package>libwmf-devel</package> - <package>libwmf-gnome</package> - <package>libwnck</package> - <package>libwnck-1-22</package> - <package>libwnck-devel</package> - <package>libwnck-lang</package> - <package>libwpd-0_8-8</package> - <package>libwpd-devel</package> - <package>libwpg-0_1-1</package> - <package>libwpg-devel</package> - <package>libwps-0_1-1</package> - <package>libwps-devel</package> - <package>libwsman-devel</package> - <package>libwsman1</package> - <package>libxcrypt-devel</package> - <package>libxine-devel</package> - <package>libxine1</package> - <package>libxklavier-devel</package> - <package>libxklavier15</package> - <package>libxml2-devel</package> - <package>libxslt-devel</package> - <package>libyajl1</package> - <package>libzio-devel</package> - <package>libzip-devel</package> - <package>libzip1</package> - <package>libzvbi0</package> - <package>libzypp-devel</package> - <package>limal-apparmor-notifications</package> - <package>limal-apparmor-notifications-devel</package> - <package>limal-ca-mgm-devel</package> - <package>limal-devel</package> - <package>limal-devtools</package> - <package>limal-nfs-server-devel</package> - <package>linux-atm-devel</package> - <package>linux-atm-lib</package> - <package>lksctp-tools</package> - <package>lksctp-tools-devel</package> - <package>loudmouth-devel</package> - <package>lua</package> - <package>lua-devel</package> - <package>lzo-devel</package> - <package>m17n-db</package> - <package>m17n-lib</package> - <package>m17n-lib-devel</package> - <package>malaga-suomi</package> - <package>meanwhile</package> - <package>meanwhile-devel</package> - <package>metacity</package> - <package>metacity-devel</package> - <package>metacity-lang</package> - <package>mhash</package> - <package>mhash-devel</package> - <package>misc-console-font</package> - <package>mono-addins</package> - <package>mono-basic</package> - <package>mono-core</package> - <package>mono-data</package> - <package>mono-data-oracle</package> - <package>mono-data-sqlite</package> - <package>mono-devel</package> - <package>mono-extras</package> - <package>mono-jscript</package> - <package>mono-tools</package> - <package>mono-wcf</package> - <package>mono-web</package> - <package>mono-winforms</package> - <package>mono-zeroconf</package> - <package>mono-zeroconf-provider-avahi</package> - <package>monodevelop</package> - <package>monodoc-core</package> - <package>mozilla-nspr</package> - <package>mozilla-nspr-devel</package> - <package>mozilla-nss</package> - <package>mozilla-nss-devel</package> - <package>mozilla-xulrunner192</package> - <package>mozilla-xulrunner192-gnome</package> - <package>mpfr-devel</package> - <package>mpi-selector</package> - <package>mpich</package> - <package>mpich-devel</package> - <package>mysql</package> - <package>mysql-client</package> - <package>nagios</package> - <package>nagios-devel</package> - <package>nagios-www</package> - <package>nant</package> - <package>nautilus</package> - <package>nautilus-cd-burner</package> - <package>nautilus-cd-burner-devel</package> - <package>nautilus-cd-burner-lang</package> - <package>nautilus-devel</package> - <package>nautilus-lang</package> - <package>ndesk-dbus</package> - <package>ndesk-dbus-glib</package> - <package>ndesk-dbus-glib-devel</package> - <package>net-snmp</package> - <package>net-snmp-devel</package> - <package>netatalk</package> - <package>netatalk-devel</package> - <package>netcat-openbsd</package> - <package>newt</package> - <package>newt-devel</package> - <package>newt-static</package> - <package>nfsidmap-devel</package> - <package>notification-daemon</package> - <package>notification-daemon-lang</package> - <package>notify-sharp</package> - <package>nss-mdns</package> - <package>nss-shared-helper-devel</package> - <package>nut</package> - <package>nut-classic</package> - <package>nut-devel</package> - <package>opal</package> - <package>opal-devel</package> - <package>openCryptoki</package> - <package>openCryptoki-64bit</package> - <package>openCryptoki-devel</package> - <package>openct-devel</package> - <package>openhpi</package> - <package>openhpi-daemon</package> - <package>openhpi-devel</package> - <package>openjade</package> - <package>openjade-devel</package> - <package>openldap2-devel</package> - <package>openmotif-devel</package> - <package>openmotif-libs</package> - <package>openmpi</package> - <package>openobex-devel</package> - <package>openobex-glib-devel</package> - <package>opensc-devel</package> - <package>openslp-devel</package> - <package>opensp</package> - <package>opensp-devel</package> - <package>openwsman-client</package> - <package>openwsman-server</package> - <package>orbit</package> - <package>orbit-devel</package> - <package>orbit2-devel</package> - <package>oxygen-icon-theme</package> - <package>oxygen-icon-theme-scalable</package> - <package>ozerocdoff</package> - <package>pam-devel</package> - <package>pango-devel</package> - <package>pangomm-devel</package> - <package>parted-devel</package> - <package>patchutils</package> - <package>pciutils-devel</package> - <package>pcre-devel</package> - <package>pcsc-acr38</package> - <package>pcsc-acr38-devel</package> - <package>pcsc-lite-devel</package> - <package>perl-32bit</package> - <package>perl-Crypt-OpenSSL-RSA</package> - <package>perl-Mail-DKIM</package> - <package>perl-MailTools</package> - <package>perl-Net-DNS</package> - <package>perl-Net-IP</package> - <package>perl-NetAddr-IP</package> - <package>perl-SNMP</package> - <package>perl-Tie-IxHash</package> - <package>perl-Tk</package> - <package>perl-Tk-devel</package> - <package>perl-spamassassin</package> - <package>phonon</package> - <package>phonon-backend-gstreamer-0_10</package> - <package>phonon-devel</package> - <package>php5</package> - <package>php5-ctype</package> - <package>php5-devel</package> - <package>php5-dom</package> - <package>php5-hash</package> - <package>php5-iconv</package> - <package>php5-json</package> - <package>php5-pdo</package> - <package>php5-sqlite</package> - <package>php5-suhosin</package> - <package>php5-tokenizer</package> - <package>php5-xmlreader</package> - <package>php5-xmlwriter</package> - <package>php53</package> - <package>php53-ctype</package> - <package>php53-dom</package> - <package>php53-iconv</package> - <package>php53-json</package> - <package>php53-tokenizer</package> - <package>php53-xmlreader</package> - <package>php53-xmlwriter</package> - <package>pidgin</package> - <package>pidgin-devel</package> - <package>pilot-link</package> - <package>pkcs11-helper</package> - <package>pkcs11-helper-devel</package> - <package>planner</package> - <package>planner-devel</package> - <package>planner-lang</package> - <package>plasma-addons</package> - <package>plasma-theme-aya</package> - <package>plasmoid-networkmanagement</package> - <package>plasmoid-quickaccess</package> - <package>plotutils</package> - <package>poppler-data</package> - <package>poppler-tools</package> - <package>popt-devel</package> - <package>portmap</package> - <package>postfix-devel</package> - <package>postgresql-devel</package> - <package>postgresql-libs</package> - <package>ppp-devel</package> - <package>ppp-userpass</package> - <package>pstoedit</package> - <package>pstoedit-devel</package> - <package>pulseaudio</package> - <package>pulseaudio-esound-compat</package> - <package>pulseaudio-lang</package> - <package>puppet</package> - <package>python-cairo</package> - <package>python-cairo-devel</package> - <package>python-devel</package> - <package>python-gnome</package> - <package>python-gnome-devel</package> - <package>python-gobject2</package> - <package>python-gobject2-devel</package> - <package>python-gtk</package> - <package>python-gtk-devel</package> - <package>python-gtkglext</package> - <package>python-gtkglext-devel</package> - <package>python-gtksourceview</package> - <package>python-gtksourceview-devel</package> - <package>python-numeric</package> - <package>python-numpy</package> - <package>python-orbit</package> - <package>python-orbit-devel</package> - <package>pyxml</package> - <package>qt3</package> - <package>qt3-devel</package> - <package>quagga</package> - <package>quagga-devel</package> - <package>quilt</package> - <package>raptor</package> - <package>rarian</package> - <package>rarian-devel</package> - <package>re2c</package> - <package>readline-devel</package> - <package>recode-devel</package> - <package>rpm-devel</package> - <package>rrdtool</package> - <package>rrdtool-devel</package> - <package>rsyslog</package> - <package>ruby</package> - <package>rubygems</package> - <package>ruby-devel</package> - <package>ruby-doc-html</package> - <package>ruby-doc-ri</package> - <package>ruby-examples</package> - <package>ruby-fcgi</package> - <package>ruby-mysql</package> - <package>ruby-selinux</package> - <package>ruby-test-suite</package> - <package>ruby-tk</package> - <package>sablot</package> - <package>sablot-devel</package> - <package>samba-devel</package> - <package>sane-backends</package> - <package>sane-frontends</package> - <package>sax2-libsax</package> - <package>sax2-libsax-devel</package> - <package>sax2-libsax-perl</package> - <package>sax2-tools</package> - <package>sblim-cmpi-base</package> - <package>sblim-cmpi-base-devel</package> - <package>sblim-cmpi-devel</package> - <package>sblim-cmpiutil-devel</package> - <package>sblim-indication_helper</package> - <package>sblim-sfcb</package> - <package>sblim-sfcc</package> - <package>sblim-sfcc-devel</package> - <package>scim</package> - <package>scim-devel</package> - <package>scpm-devel</package> - <package>scrollkeeper</package> - <package>scrollkeeper-lang</package> - <package>seahorse</package> - <package>seahorse-devel</package> - <package>seahorse-lang</package> - <package>sendmail</package> - <package>sendmail-devel</package> - <package>sg3_utils-devel</package> - <package>sgml-skel</package> - <package>shared-mime-info</package> - <package>silc-toolkit</package> - <package>silc-toolkit-devel</package> - <package>slang</package> - <package>slang-devel</package> - <package>soprano</package> - <package>soprano-backend-redland</package> - <package>spamassassin</package> - <package>speex-devel</package> - <package>splashy-devel</package> - <package>sqlite2</package> - <package>sqlite3-devel</package> - <package>startup-notification</package> - <package>startup-notification-devel</package> - <package>strigi</package> - <package>strigi-devel</package> - <package>subversion</package> - <package>subversion-perl</package> - <package>susehelp</package> - <package>susehelp_cz</package> - <package>susehelp_de</package> - <package>susehelp_en</package> - <package>susehelp_es</package> - <package>susehelp_fr</package> - <package>susehelp_hu</package> - <package>susehelp_it</package> - <package>swig</package> - <package>syslogd</package> - <package>t1lib</package> - <package>t1lib-devel</package> - <package>taglib</package> - <package>taglib-devel</package> - <package>taglib-sharp</package> - <package>tango-icon-theme</package> - <package>tcl-devel</package> - <package>tcpd-devel</package> - <package>telepathy-glib-devel</package> - <package>telepathy-mission-control</package> - <package>telepathy-mission-control-devel</package> - <package>texlive-bin-devel</package> - <package>texlive-devel</package> - <package>tk-devel</package> - <package>tla</package> - <package>tn5250</package> - <package>tn5250-devel</package> - <package>tomoe</package> - <package>tomoe-devel</package> - <package>tomoe-gtk</package> - <package>tomoe-gtk-devel</package> - <package>tomoe-gtk-lang</package> - <package>totem-pl-parser</package> - <package>totem-pl-parser-devel</package> - <package>totem-pl-parser-lang</package> - <package>trousers</package> - <package>trousers-devel</package> - <package>tsclient</package> - <package>tsclient-devel</package> - <package>tsclient-lang</package> - <package>uim</package> - <package>uim-devel</package> - <package>unixODBC</package> - <package>unixODBC-devel</package> - <package>unsermake</package> - <package>update-desktop-files</package> - <package>usb_modeswitch</package> - <package>usb_modeswitch-data</package> - <package>valgrind</package> - <package>valgrind-devel</package> - <package>vte</package> - <package>vte-devel</package> - <package>vte-lang</package> - <package>wdiff</package> - <package>webkit-sharp</package> - <package>wireshark</package> - <package>wireshark-devel</package> - <package>wodim-devel</package> - <package>wordcut</package> - <package>wordcut-devel</package> - <package>words</package> - <package>wpa_supplicant</package> - <package>wvstreams</package> - <package>wvstreams-devel</package> - <package>wxGTK-compat</package> - <package>wxGTK-devel</package> - <package>wxGTK-gl</package> - <package>x11-input-wacom</package> - <package>x11-input-wacom-devel</package> - <package>x11-input-wacom-tools</package> - <package>xalan-j2</package> - <package>xaw3d-devel</package> - <package>xbase</package> - <package>xbase-devel</package> - <package>xdelta</package> - <package>xdelta-devel</package> - <package>xdg-menu</package> - <package>xen-devel</package> - <package>xen-libs</package> - <package>xerces-j2</package> - <package>xerces-j2-bootstrap</package> - <package>xerces-j2-xml-apis</package> - <package>xfsprogs-devel</package> - <package>xml-commons-apis-bootstrap</package> - <package>xml-commons-resolver-bootstrap</package> - <package>xml-commons-which-bootstrap</package> - <package>xmlcharent</package> - <package>xorg-x11</package> - <package>xorg-x11-devel</package> - <package>xorg-x11-fonts</package> - <package>xorg-x11-fonts-core</package> - <package>xorg-x11-fonts-devel</package> - <package>xorg-x11-libICE-devel</package> - <package>xorg-x11-libSM-devel</package> - <package>xorg-x11-libX11-devel</package> - <package>xorg-x11-libXau-devel</package> - <package>xorg-x11-libXdmcp-devel</package> - <package>xorg-x11-libXext-devel</package> - <package>xorg-x11-libXfixes-devel</package> - <package>xorg-x11-libXmu-devel</package> - <package>xorg-x11-libXp-devel</package> - <package>xorg-x11-libXpm-devel</package> - <package>xorg-x11-libXprintUtil-devel</package> - <package>xorg-x11-libXrender-devel</package> - <package>xorg-x11-libXt-devel</package> - <package>xorg-x11-libXv-devel</package> - <package>xorg-x11-libfontenc-devel</package> - <package>xorg-x11-libxcb-devel</package> - <package>xorg-x11-libxkbfile-devel</package> - <package>xorg-x11-proto-devel</package> - <package>xorg-x11-server</package> - <package>xorg-x11-util-devel</package> - <package>xorg-x11-xauth</package> - <package>xorg-x11-xtrans-devel</package> - <package>xosd</package> - <package>xosd-devel</package> - <package>xsp</package> - <package>xterm</package> - <package>xz-devel</package> - <package>yast2-core-devel</package> - <package>yast2-devtools</package> - <package>yast2-gtk</package> - <package>yast2-libyui-devel</package> - <package>yast2-ncurses-devel</package> - <package>yast2-qt</package> - <package>yast2-qt-devel</package> - <package>yast2-qt-pkg</package> - <package>yast2-storage-devel</package> - <package>yast2-ycp-ui-bindings-devel</package> - <package>yelp</package> - <package>yelp-lang</package> - <package>zenity</package> - <package>zenity-lang</package> - <package>zlib-devel</package> - <package>zsh</package> - <package>zvbi-devel</package> - </remove-packages> - - </software> - <user_defaults> - <expire></expire> - <group>100</group> - <groups>video,dialout</groups> - <home>/home</home> - <inactive>-1</inactive> - <shell>/bin/bash</shell> - <skel>/etc/skel</skel> - <umask>022</umask> - </user_defaults> - <users config:type="list"> - <user> - <encrypted config:type="boolean">true</encrypted> - <fullname>vagrant</fullname> - <gid>100</gid> - <home>/home/vagrant</home> - <password_settings> - <expire></expire> - <flag></flag> - <inact></inact> - <max>99999</max> - <min>0</min> - <warn>7</warn> - </password_settings> - <shell>/bin/bash</shell> - <uid>1000</uid> - <user_password>$2y$05$NA1Li9ZKJOLRW5mMTXm6/e5r8dltWS5RpDZpvHrI82aLE00V51tdi</user_password> - <username>vagrant</username> - </user> - <user> - <encrypted config:type="boolean">true</encrypted> - <fullname>Games account</fullname> - <gid>100</gid> - <home>/var/games</home> - <password_settings> - <expire></expire> - <flag></flag> - <inact></inact> - <max></max> - <min></min> - <warn></warn> - </password_settings> - <shell>/bin/bash</shell> - <uid>12</uid> - <user_password>*</user_password> - <username>games</username> - </user> - <user> - <encrypted config:type="boolean">true</encrypted> - <fullname>bin</fullname> - <gid>1</gid> - <home>/bin</home> - <password_settings> - <expire></expire> - <flag></flag> - <inact></inact> - <max></max> - <min></min> - <warn></warn> - </password_settings> - <shell>/bin/bash</shell> - <uid>1</uid> - <user_password>*</user_password> - <username>bin</username> - </user> - <user> - <encrypted config:type="boolean">true</encrypted> - <fullname>nobody</fullname> - <gid>65533</gid> - <home>/var/lib/nobody</home> - <password_settings> - <expire></expire> - <flag></flag> - <inact></inact> - <max></max> - <min></min> - <warn></warn> - </password_settings> - <shell>/bin/bash</shell> - <uid>65534</uid> - <user_password>*</user_password> - <username>nobody</username> - </user> - <user> - <encrypted config:type="boolean">true</encrypted> - <fullname>Printing daemon</fullname> - <gid>7</gid> - <home>/var/spool/lpd</home> - <password_settings> - <expire></expire> - <flag></flag> - <inact></inact> - <max></max> - <min></min> - <warn></warn> - </password_settings> - <shell>/bin/bash</shell> - <uid>4</uid> - <user_password>*</user_password> - <username>lp</username> - </user> - <user> - <encrypted config:type="boolean">true</encrypted> - <fullname>User for uuidd</fullname> - <gid>104</gid> - <home>/var/run/uuidd</home> - <password_settings> - <expire></expire> - <flag></flag> - <inact></inact> - <max>99999</max> - <min>0</min> - <warn>7</warn> - </password_settings> - <shell>/bin/false</shell> - <uid>102</uid> - <user_password>*</user_password> - <username>uuidd</username> - </user> - <user> - <encrypted config:type="boolean">true</encrypted> - <fullname>Postfix Daemon</fullname> - <gid>51</gid> - <home>/var/spool/postfix</home> - <password_settings> - <expire></expire> - <flag></flag> - <inact></inact> - <max>99999</max> - <min>0</min> - <warn>7</warn> - </password_settings> - <shell>/bin/false</shell> - <uid>51</uid> - <user_password>*</user_password> - <username>postfix</username> - </user> - <user> - <encrypted config:type="boolean">true</encrypted> - <fullname>Novell Customer Center User</fullname> - <gid>111</gid> - <home>/var/lib/YaST2/suse-ncc-fakehome</home> - <password_settings> - <expire></expire> - <flag></flag> - <inact></inact> - <max>99999</max> - <min>0</min> - <warn>7</warn> - </password_settings> - <shell>/bin/bash</shell> - <uid>106</uid> - <user_password>*</user_password> - <username>suse-ncc</username> - </user> - <user> - <encrypted config:type="boolean">true</encrypted> - <fullname>FTP account</fullname> - <gid>49</gid> - <home>/srv/ftp</home> - <password_settings> - <expire></expire> - <flag></flag> - <inact></inact> - <max></max> - <min></min> - <warn></warn> - </password_settings> - <shell>/bin/bash</shell> - <uid>40</uid> - <user_password>*</user_password> - <username>ftp</username> - </user> - <user> - <encrypted config:type="boolean">true</encrypted> - <fullname>Gnome Display Manager daemon</fullname> - <gid>112</gid> - <home>/var/lib/gdm</home> - <password_settings> - <expire></expire> - <flag></flag> - <inact></inact> - <max>99999</max> - <min>0</min> - <warn>7</warn> - </password_settings> - <shell>/bin/false</shell> - <uid>107</uid> - <user_password>*</user_password> - <username>gdm</username> - </user> - <user> - <encrypted config:type="boolean">true</encrypted> - <fullname>Batch jobs daemon</fullname> - <gid>25</gid> - <home>/var/spool/atjobs</home> - <password_settings> - <expire></expire> - <flag></flag> - <inact></inact> - <max>99999</max> - <min>0</min> - <warn>7</warn> - </password_settings> - <shell>/bin/bash</shell> - <uid>25</uid> - <user_password>*</user_password> - <username>at</username> - </user> - <user> - <encrypted config:type="boolean">true</encrypted> - <fullname>root</fullname> - <gid>0</gid> - <home>/root</home> - <password_settings> - <expire></expire> - <flag></flag> - <inact></inact> - <max></max> - <min></min> - <warn></warn> - </password_settings> - <shell>/bin/bash</shell> - <uid>0</uid> - <user_password>$2y$05$NA1Li9ZKJOLRW5mMTXm6/e5r8dltWS5RpDZpvHrI82aLE00V51tdi</user_password> - <username>root</username> - </user> - <user> - <encrypted config:type="boolean">true</encrypted> - <fullname>Mailer daemon</fullname> - <gid>12</gid> - <home>/var/spool/clientmqueue</home> - <password_settings> - <expire></expire> - <flag></flag> - <inact></inact> - <max></max> - <min></min> - <warn></warn> - </password_settings> - <shell>/bin/false</shell> - <uid>8</uid> - <user_password>*</user_password> - <username>mail</username> - </user> - <user> - <encrypted config:type="boolean">true</encrypted> - <fullname>Daemon</fullname> - <gid>2</gid> - <home>/sbin</home> - <password_settings> - <expire></expire> - <flag></flag> - <inact></inact> - <max></max> - <min></min> - <warn></warn> - </password_settings> - <shell>/bin/bash</shell> - <uid>2</uid> - <user_password>*</user_password> - <username>daemon</username> - </user> - <user> - <encrypted config:type="boolean">true</encrypted> - <fullname>NTP daemon</fullname> - <gid>108</gid> - <home>/var/lib/ntp</home> - <password_settings> - <expire></expire> - <flag></flag> - <inact></inact> - <max>99999</max> - <min>0</min> - <warn>7</warn> - </password_settings> - <shell>/bin/false</shell> - <uid>74</uid> - <user_password>*</user_password> - <username>ntp</username> - </user> - <user> - <encrypted config:type="boolean">true</encrypted> - <fullname>Unix-to-Unix CoPy system</fullname> - <gid>14</gid> - <home>/etc/uucp</home> - <password_settings> - <expire></expire> - <flag></flag> - <inact></inact> - <max></max> - <min></min> - <warn></warn> - </password_settings> - <shell>/bin/bash</shell> - <uid>10</uid> - <user_password>*</user_password> - <username>uucp</username> - </user> - <user> - <encrypted config:type="boolean">true</encrypted> - <fullname>User for D-Bus</fullname> - <gid>101</gid> - <home>/var/run/dbus</home> - <password_settings> - <expire></expire> - <flag></flag> - <inact></inact> - <max></max> - <min>0</min> - <warn>7</warn> - </password_settings> - <shell>/bin/false</shell> - <uid>100</uid> - <user_password>*</user_password> - <username>messagebus</username> - </user> - <user> - <encrypted config:type="boolean">true</encrypted> - <fullname>User for haldaemon</fullname> - <gid>102</gid> - <home>/var/run/hald</home> - <password_settings> - <expire></expire> - <flag></flag> - <inact></inact> - <max></max> - <min>0</min> - <warn>7</warn> - </password_settings> - <shell>/bin/false</shell> - <uid>101</uid> - <user_password>*</user_password> - <username>haldaemon</username> - </user> - <user> - <encrypted config:type="boolean">true</encrypted> - <fullname>WWW daemon apache</fullname> - <gid>8</gid> - <home>/var/lib/wwwrun</home> - <password_settings> - <expire></expire> - <flag></flag> - <inact></inact> - <max></max> - <min></min> - <warn></warn> - </password_settings> - <shell>/bin/false</shell> - <uid>30</uid> - <user_password>*</user_password> - <username>wwwrun</username> - </user> - <user> - <encrypted config:type="boolean">true</encrypted> - <fullname>Manual pages viewer</fullname> - <gid>62</gid> - <home>/var/cache/man</home> - <password_settings> - <expire></expire> - <flag></flag> - <inact></inact> - <max></max> - <min></min> - <warn></warn> - </password_settings> - <shell>/bin/bash</shell> - <uid>13</uid> - <user_password>*</user_password> - <username>man</username> - </user> - <user> - <encrypted config:type="boolean">true</encrypted> - <fullname>PolicyKit</fullname> - <gid>107</gid> - <home>/var/run/PolicyKit</home> - <password_settings> - <expire></expire> - <flag></flag> - <inact></inact> - <max>99999</max> - <min>0</min> - <warn>7</warn> - </password_settings> - <shell>/bin/false</shell> - <uid>104</uid> - <user_password>*</user_password> - <username>polkituser</username> - </user> - <user> - <encrypted config:type="boolean">true</encrypted> - <fullname>News system</fullname> - <gid>13</gid> - <home>/etc/news</home> - <password_settings> - <expire></expire> - <flag></flag> - <inact></inact> - <max></max> - <min></min> - <warn></warn> - </password_settings> - <shell>/bin/bash</shell> - <uid>9</uid> - <user_password>*</user_password> - <username>news</username> - </user> - <user> - <fullname>SSH daemon</fullname> - <gid>65</gid> - <home>/var/lib/sshd</home> - <shell>/bin/false</shell> - <uid>71</uid> - <username>sshd</username> - </user> - <user> - <encrypted config:type="boolean">true</encrypted> - <fullname>PulseAudio daemon</fullname> - <gid>109</gid> - <home>/var/lib/pulseaudio</home> - <password_settings> - <expire></expire> - <flag></flag> - <inact></inact> - <max>99999</max> - <min>0</min> - <warn>7</warn> - </password_settings> - <shell>/bin/false</shell> - <uid>105</uid> - <user_password>*</user_password> - <username>pulse</username> - </user> - </users> -</profile> diff --git a/templates/sles-11-sp2/scripts/cleanup.sh b/templates/sles-11-sp2/scripts/cleanup.sh deleted file mode 100644 index 02bc7e322..000000000 --- a/templates/sles-11-sp2/scripts/cleanup.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/bash -eux - -# remove zypper locks on removed packages to avoid later dependency problems -zypper --non-interactive rl \* -# zypper --non-interactive remove `rpm -qa virtualbox-guest-*` >/dev/null 2>&1 -# Add an online copy of the SLES DVD1 as a software repository, instead of the mounted DVD -zypper removerepo 'SUSE-Linux-Enterprise-Server-11-SP2 11.2.2-1.234' -zypper addrepo 'http://demeter.uni-regensburg.de/SLES11SP2-x64/DVD1/' 'SLES11SP2-x64 DVD1 Online' -zypper refresh diff --git a/templates/sles-11-sp2/scripts/minimize.sh b/templates/sles-11-sp2/scripts/minimize.sh deleted file mode 100644 index 3846a1d65..000000000 --- a/templates/sles-11-sp2/scripts/minimize.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash -eux - -dd if=/dev/zero of=/EMPTY bs=1M -rm -f /EMPTY diff --git a/templates/sles-11-sp2/scripts/sshd.sh b/templates/sles-11-sp2/scripts/sshd.sh deleted file mode 100644 index c6e4f20a6..000000000 --- a/templates/sles-11-sp2/scripts/sshd.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash -eux - -echo "UseDNS no" >> /etc/ssh/sshd_config diff --git a/templates/sles-11-sp2/scripts/sudoers.sh b/templates/sles-11-sp2/scripts/sudoers.sh deleted file mode 100644 index eb80f3f88..000000000 --- a/templates/sles-11-sp2/scripts/sudoers.sh +++ /dev/null @@ -1,3 +0,0 @@ -# update sudoers - can't do this in autoinst.xml -echo -e "\nupdate sudoers ..." -echo -e "vagrant ALL=(ALL) NOPASSWD: ALL\n" >> /etc/sudoers diff --git a/templates/sles-11-sp2/scripts/vagrant.sh b/templates/sles-11-sp2/scripts/vagrant.sh deleted file mode 100644 index 72dd2f444..000000000 --- a/templates/sles-11-sp2/scripts/vagrant.sh +++ /dev/null @@ -1,33 +0,0 @@ -#!/bin/bash -eux - -if [ -f /home/vagrant/.vbox_version ]; then - mkdir /tmp/vbox - VER=$(cat /home/vagrant/.vbox_version) - mount -o loop VBoxGuestAdditions_$VER.iso /tmp/vbox - sh /tmp/vbox/VBoxLinuxAdditions.run - umount /tmp/vbox - rmdir /tmp/vbox - rm *.iso -fi - -if [ -f /home/vagrant/.vmfusion_version ]; then - #Set Linux-specific paths and ISO filename - home_dir="/home/vagrant" - iso_name="linux.iso" - mount_point="/tmp/vmware-tools" - #Run install, unmount ISO and remove it - mkdir ${mount_point} - cd ${home_dir} - /bin/mount -o loop ${iso_name} ${mount_point} - tar zxf ${mount_point}/*.tar.gz && cd vmware-tools-distrib && ./vmware-install.pl --default - /bin/umount ${mount_point} - /bin/rm -rf ${home_dir}/${iso_name} ${home_dir}/vmware-tools-distrib - rmdir ${mount_point} -fi - -mkdir /home/vagrant/.ssh -wget --no-check-certificate \ - 'https://github.com/mitchellh/vagrant/raw/master/keys/vagrant.pub' \ - -O /home/vagrant/.ssh/authorized_keys -chown -R vagrant /home/vagrant/.ssh -chmod -R go-rwsx /home/vagrant/.ssh diff --git a/templates/sles-11-sp2/template.json b/templates/sles-11-sp2/template.json deleted file mode 100644 index 983b4a8f7..000000000 --- a/templates/sles-11-sp2/template.json +++ /dev/null @@ -1,97 +0,0 @@ -{ - "provisioners": [ - { - "type": "shell", - "scripts": [ - "scripts/vagrant.sh", - "scripts/sshd.sh", - "scripts/sudoers.sh", - "scripts/cleanup.sh", - "scripts/minimize.sh" - ], - "override": { - "virtualbox": { - "execute_command": "echo 'vagrant'|sudo -S sh '{{.Path}}'" - }, - "vmware": { - "execute_command": "echo 'vagrant'|sudo -S sh '{{.Path}}'" - } - } - } - ], - "builders": [ - { - "type": "virtualbox", - "boot_command": [ - "<esc><enter><wait>", - "linux netdevice=eth0 netsetup=dhcp install=cd:/<wait>", - " lang=en_US autoyast=http://{{ .HTTPIP }}:{{ .HTTPPort }}/autoinst.xml<wait>", - " textmode=1<wait>", - "<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": 40960, - "guest_os_type": "OpenSUSE_64", - "http_directory": "http", - "iso_checksum": "461d82ae6e15062b0807c1338f040497", - "iso_checksum_type": "md5", - "iso_url": "", - "ssh_username": "vagrant", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_wait_timeout": "10000s", - "shutdown_command": "echo '/sbin/halt -h -p' > shutdown.sh; echo 'vagrant'|sudo -S sh 'shutdown.sh'", - "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", - "virtualbox_version_file": ".vbox_version", - "vboxmanage": [ - [ - "modifyvm", - "{{.Name}}", - "--memory", - "480" - ], - [ - "modifyvm", - "{{.Name}}", - "--cpus", - "1" - ] - ], - "iso_md5": "461d82ae6e15062b0807c1338f040497" - }, - { - "type": "vmware", - "boot_command": [ - "<esc><enter><wait>", - "linux netdevice=eth0 netsetup=dhcp install=cd:/<wait>", - " lang=en_US autoyast=http://{{ .HTTPIP }}:{{ .HTTPPort }}/autoinst.xml<wait>", - " textmode=1<wait>", - "<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": 40960, - "guest_os_type": "opensuse-64", - "http_directory": "http", - "iso_checksum": "461d82ae6e15062b0807c1338f040497", - "iso_checksum_type": "md5", - "iso_url": "", - "ssh_username": "vagrant", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_wait_timeout": "10000s", - "shutdown_command": "echo '/sbin/halt -h -p' > shutdown.sh; echo 'vagrant'|sudo -S sh 'shutdown.sh'", - "vmx_data": { - "memsize": "480", - "numvcpus": "1", - "cpuid.coresPerSocket": "1" - }, - "iso_md5": "461d82ae6e15062b0807c1338f040497" - } - ], - "post-provisioner": [ - { - "type": "vagrant", - "output": "sles-11-sp2-{{.Provisioner}}.box" - } - ] -} \ No newline at end of file diff --git a/templates/sles-11-sp3-i386/http/autoinst.xml b/templates/sles-11-sp3-i386/http/autoinst.xml deleted file mode 100644 index 1277f42a7..000000000 --- a/templates/sles-11-sp3-i386/http/autoinst.xml +++ /dev/null @@ -1,2569 +0,0 @@ -<?xml version="1.0"?> -<!DOCTYPE profile> -<profile xmlns="http://www.suse.com/1.0/yast2ns" xmlns:config="http://www.suse.com/1.0/configns"> - <add-on> - <add_on_products config:type="list"> - <listentry> - <media_url><![CDATA[http://demeter.uni-regensburg.de/SLE11SP3-SDK-x86/DVD1/]]></media_url> - <product>sle-sdk</product> - <product_dir>/</product_dir> - </listentry> - </add_on_products> - </add-on> - <bootloader> - <device_map config:type="list"> - <device_map_entry> - <firmware>hd0</firmware> - <linux>/dev/sda</linux> - </device_map_entry> - </device_map> - <global> - <activate>true</activate> - <boot_root>true</boot_root> - <default>SUSE Linux Enterprise Server 11 SP3 - 3.0.76-0.11</default> - <generic_mbr>true</generic_mbr> - <gfxmenu>/boot/message</gfxmenu> - <lines_cache_id>2</lines_cache_id> - <timeout config:type="integer">8</timeout> - </global> - <initrd_modules config:type="list"> - <initrd_module> - <module>ahci</module> - </initrd_module> - <initrd_module> - <module>ata_piix</module> - </initrd_module> - <initrd_module> - <module>ata_generic</module> - </initrd_module> - <initrd_module> - <module>jbd</module> - </initrd_module> - <initrd_module> - <module>mbcache</module> - </initrd_module> - <initrd_module> - <module>ext3</module> - </initrd_module> - </initrd_modules> - <loader_type>grub</loader_type> - <sections config:type="list"> - <section> - <append>resume=/dev/sda1 splash=silent crashkernel=128M-:64M showopts</append> - <image>(hd0,1)/boot/vmlinuz-3.0.76-0.11-default</image> - <initial>1</initial> - <initrd>(hd0,1)/boot/initrd-3.0.76-0.11-default</initrd> - <lines_cache_id>0</lines_cache_id> - <name>SUSE Linux Enterprise Server 11 SP3 - 3.0.76-0.11</name> - <original_name>linux</original_name> - <root>/dev/sda2</root> - <type>image</type> - <vgamode>0x314</vgamode> - </section> - <section> - <append>showopts ide=nodma apm=off noresume edd=off powersaved=off nohz=off highres=off processor.max_cstate=1 nomodeset x11failsafe</append> - <image>(hd0,1)/boot/vmlinuz-3.0.76-0.11-default</image> - <initrd>(hd0,1)/boot/initrd-3.0.76-0.11-default</initrd> - <lines_cache_id>1</lines_cache_id> - <name>Failsafe -- SUSE Linux Enterprise Server 11 SP3 - 3.0.76-0.11</name> - <original_name>failsafe</original_name> - <root>/dev/sda2</root> - <type>image</type> - <vgamode>0x314</vgamode> - </section> - </sections> - </bootloader> - <ca_mgm> - <CAName>YaST_Default_CA</CAName> - <ca_commonName>YaST Default CA (vagrant-sles-11sp3-x86)</ca_commonName> - <country>US</country> - <locality></locality> - <organisation></organisation> - <organisationUnit></organisationUnit> - <password>ENTER PASSWORD HERE</password> - <server_commonName>vagrant-sles-11sp3-x86.vagrantup.com</server_commonName> - <server_email>postmaster@vagrantup.com</server_email> - <state></state> - <takeLocalServerName config:type="boolean">false</takeLocalServerName> - </ca_mgm> - <deploy_image> - <image_installation config:type="boolean">false</image_installation> - </deploy_image> - <general> - <ask-list config:type="list"/> - <mode> - <confirm config:type="boolean">false</confirm> - </mode> - <mouse> - <id>none</id> - </mouse> - <proposals config:type="list"/> - <signature-handling> - <accept_file_without_checksum config:type="boolean">true</accept_file_without_checksum> - <accept_non_trusted_gpg_key config:type="boolean">true</accept_non_trusted_gpg_key> - <accept_unknown_gpg_key config:type="boolean">true</accept_unknown_gpg_key> - <accept_unsigned_file config:type="boolean">true</accept_unsigned_file> - <accept_verification_failed config:type="boolean">false</accept_verification_failed> - <import_gpg_key config:type="boolean">true</import_gpg_key> - </signature-handling> - <storage/> - </general> - <groups config:type="list"> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>100</gid> - <group_password>x</group_password> - <groupname>users</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>19</gid> - <group_password>x</group_password> - <groupname>floppy</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>1</gid> - <group_password>x</group_password> - <groupname>bin</groupname> - <userlist>daemon</userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>41</gid> - <group_password>x</group_password> - <groupname>xok</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>65533</gid> - <group_password>x</group_password> - <groupname>nobody</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>43</gid> - <group_password>x</group_password> - <groupname>modem</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>5</gid> - <group_password>x</group_password> - <groupname>tty</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>7</gid> - <group_password>x</group_password> - <groupname>lp</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>104</gid> - <group_password>!</group_password> - <groupname>uuidd</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>51</gid> - <group_password>!</group_password> - <groupname>postfix</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>112</gid> - <group_password>!</group_password> - <groupname>gdm</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>65534</gid> - <group_password>x</group_password> - <groupname>nogroup</groupname> - <userlist>nobody</userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>101</gid> - <group_password>!</group_password> - <groupname>messagebus</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>59</gid> - <group_password>!</group_password> - <groupname>maildrop</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>33</gid> - <group_password>x</group_password> - <groupname>video</groupname> - <userlist>vagrant</userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>3</gid> - <group_password>x</group_password> - <groupname>sys</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>15</gid> - <group_password>x</group_password> - <groupname>shadow</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>20</gid> - <group_password>x</group_password> - <groupname>cdrom</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>21</gid> - <group_password>x</group_password> - <groupname>console</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>42</gid> - <group_password>x</group_password> - <groupname>trusted</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>102</gid> - <group_password>!</group_password> - <groupname>haldaemon</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>106</gid> - <group_password>!</group_password> - <groupname>puppet</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>16</gid> - <group_password>x</group_password> - <groupname>dialout</groupname> - <userlist>vagrant</userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>107</gid> - <group_password>!</group_password> - <groupname>polkituser</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>10</gid> - <group_password>x</group_password> - <groupname>wheel</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>109</gid> - <group_password>!</group_password> - <groupname>pulse</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>8</gid> - <group_password>x</group_password> - <groupname>www</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>40</gid> - <group_password>x</group_password> - <groupname>games</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>6</gid> - <group_password>x</group_password> - <groupname>disk</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>17</gid> - <group_password>x</group_password> - <groupname>audio</groupname> - <userlist>pulse</userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>111</gid> - <group_password>!</group_password> - <groupname>suse-ncc</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>49</gid> - <group_password>x</group_password> - <groupname>ftp</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>103</gid> - <group_password>!</group_password> - <groupname>tape</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>25</gid> - <group_password>!</group_password> - <groupname>at</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>9</gid> - <group_password>x</group_password> - <groupname>kmem</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>32</gid> - <group_password>x</group_password> - <groupname>public</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>12</gid> - <group_password>x</group_password> - <groupname>mail</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>0</gid> - <group_password>x</group_password> - <groupname>root</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>2</gid> - <group_password>x</group_password> - <groupname>daemon</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>105</gid> - <group_password>!</group_password> - <groupname>sfcb</groupname> - <userlist>root</userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>108</gid> - <group_password>!</group_password> - <groupname>ntp</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>14</gid> - <group_password>x</group_password> - <groupname>uucp</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>110</gid> - <group_password>!</group_password> - <groupname>pulse-access</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>71</gid> - <group_password>!</group_password> - <groupname>ntadmin</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>62</gid> - <group_password>x</group_password> - <groupname>man</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>22</gid> - <group_password>x</group_password> - <groupname>utmp</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>13</gid> - <group_password>x</group_password> - <groupname>news</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>65</gid> - <group_password>!</group_password> - <groupname>sshd</groupname> - <userlist></userlist> - </group> - </groups> - <host> - <hosts config:type="list"> - <hosts_entry> - <host_address>127.0.0.1</host_address> - <names config:type="list"> - <name>localhost</name> - </names> - </hosts_entry> - <hosts_entry> - <host_address>::1</host_address> - <names config:type="list"> - <name>localhost ipv6-localhost ipv6-loopback</name> - </names> - </hosts_entry> - <hosts_entry> - <host_address>fe00::0</host_address> - <names config:type="list"> - <name>ipv6-localnet</name> - </names> - </hosts_entry> - <hosts_entry> - <host_address>ff00::0</host_address> - <names config:type="list"> - <name>ipv6-mcastprefix</name> - </names> - </hosts_entry> - <hosts_entry> - <host_address>ff02::1</host_address> - <names config:type="list"> - <name>ipv6-allnodes</name> - </names> - </hosts_entry> - <hosts_entry> - <host_address>ff02::2</host_address> - <names config:type="list"> - <name>ipv6-allrouters</name> - </names> - </hosts_entry> - <hosts_entry> - <host_address>ff02::3</host_address> - <names config:type="list"> - <name>ipv6-allhosts</name> - </names> - </hosts_entry> - </hosts> - </host> - <login_settings/> - <networking> - <dhcp_options> - <dhclient_client_id></dhclient_client_id> - <dhclient_hostname_option>AUTO</dhclient_hostname_option> - </dhcp_options> - <dns> - <dhcp_hostname config:type="boolean">false</dhcp_hostname> - <domain>vagrantup.com</domain> - <hostname>vagrant-sles-11sp3-x86</hostname> - <resolv_conf_policy>auto</resolv_conf_policy> - <searchlist config:type="list"> - <search>vagrantup.com</search> - </searchlist> - <write_hostname config:type="boolean">true</write_hostname> - </dns> - <interfaces config:type="list"> - <interface> - <bootproto>dhcp</bootproto> - <device>eth0</device> - <name>82540EM Gigabit Ethernet Controller</name> - <startmode>auto</startmode> - <usercontrol>no</usercontrol> - </interface> - </interfaces> - <managed config:type="boolean">false</managed> - <net-udev config:type="list"> - <rule> - <name>eth0</name> - <rule>KERNELS</rule> - <value>0000:00:03.0</value> - </rule> - </net-udev> - <routing> - <ip_forward config:type="boolean">false</ip_forward> - </routing> - </networking> - <partitioning config:type="list"> - <drive> - <device>/dev/sda</device> - <initialize config:type="boolean">true</initialize> - <partitions config:type="list"> - <partition> - <create config:type="boolean">true</create> - <crypt_fs config:type="boolean">false</crypt_fs> - <filesystem config:type="symbol">swap</filesystem> - <format config:type="boolean">true</format> - <fstopt>defaults</fstopt> - <loop_fs config:type="boolean">false</loop_fs> - <mount>swap</mount> - <mountby config:type="symbol">device</mountby> - <partition_id config:type="integer">130</partition_id> - <partition_nr config:type="integer">1</partition_nr> - <raid_options/> - <resize config:type="boolean">false</resize> - <size>1561492992</size> - </partition> - <partition> - <create config:type="boolean">true</create> - <crypt_fs config:type="boolean">false</crypt_fs> - <filesystem config:type="symbol">ext3</filesystem> - <format config:type="boolean">true</format> - <fstopt>acl,user_xattr</fstopt> - <loop_fs config:type="boolean">false</loop_fs> - <mount>/</mount> - <mountby config:type="symbol">device</mountby> - <partition_id config:type="integer">131</partition_id> - <partition_nr config:type="integer">2</partition_nr> - <raid_options/> - <resize config:type="boolean">false</resize> - <size>19895844352</size> - </partition> - </partitions> - <pesize></pesize> - <type config:type="symbol">CT_DISK</type> - <use>all</use> - </drive> - </partitioning> - <report> - <errors> - <log config:type="boolean">true</log> - <show config:type="boolean">true</show> - <timeout config:type="integer">0</timeout> - </errors> - <messages> - <log config:type="boolean">true</log> - <show config:type="boolean">true</show> - <timeout config:type="integer">0</timeout> - </messages> - <warnings> - <log config:type="boolean">true</log> - <show config:type="boolean">true</show> - <timeout config:type="integer">0</timeout> - </warnings> - <yesno_messages> - <log config:type="boolean">true</log> - <show config:type="boolean">true</show> - <timeout config:type="integer">0</timeout> - </yesno_messages> - </report> - <software> - - <packages config:type="list"> - <package>desktop-translations</package> - <package>gconf2-branding-SLES</package> - <package>libproxy0-config-gnome</package> - <package>sle-sdk-release</package> - <package>sle-sdk-release-SDK</package> - <package>sles-manuals_en</package> - <package>yast2-trans-en_US</package> - </packages> - <patterns config:type="list"> - <pattern>Basis-Devel</pattern> - <pattern>Minimal</pattern> - <pattern>apparmor</pattern> - <pattern>base</pattern> - <pattern>sdk_kernel</pattern> - </patterns> - <remove-packages config:type="list"> - <package>3ddiag</package> - <package>CASA</package> - <package>CASA-devel</package> - <package>CASA_auth_token_client</package> - <package>CASA_auth_token_client-devel</package> - <package>ConsoleKit-devel</package> - <package>ConsoleKit-x11</package> - <package>DirectFB-devel</package> - <package>FastCGI</package> - <package>IlmBase</package> - <package>IlmBase-devel</package> - <package>ImageMagick</package> - <package>ImageMagick-devel</package> - <package>LibVNCServer</package> - <package>LibVNCServer-devel</package> - <package>Mesa</package> - <package>Mesa-devel</package> - <package>ModemManager</package> - <package>Modules</package> - <package>NetworkManager</package> - <package>NetworkManager-devel</package> - <package>NetworkManager-glib</package> - <package>NetworkManager-gnome</package> - <package>NetworkManager-kde4</package> - <package>NetworkManager-kde4-lang</package> - <package>NetworkManager-kde4-libs</package> - <package>OpenEXR</package> - <package>OpenEXR-devel</package> - <package>OpenIPMI-devel</package> - <package>PackageKit</package> - <package>PackageKit-devel</package> - <package>PackageKit-lang</package> - <package>PolicyKit-devel</package> - <package>PolicyKit-gnome</package> - <package>PolicyKit-gnome-devel</package> - <package>PolicyKit-gnome-libs</package> - <package>SDL-devel</package> - <package>SDL_net</package> - <package>SDL_net-devel</package> - <package>TeX-Guy</package> - <package>TeX-Guy-devel</package> - <package>VFlib3</package> - <package>VFlib3-devel</package> - <package>WindowMaker</package> - <package>WindowMaker-devel</package> - <package>a2ps</package> - <package>aalib</package> - <package>aalib-devel</package> - <package>akonadi-runtime</package> - <package>akregator</package> - <package>alsa-devel</package> - <package>alsa-firmware</package> - <package>alsa-plugins-pulse</package> - <package>alsa-tools</package> - <package>alsa-tools-devel</package> - <package>anthy</package> - <package>anthy-devel</package> - <package>antlr</package> - <package>apache2</package> - <package>apache2-devel</package> - <package>apache2-mod_perl</package> - <package>apache2-mod_perl-devel</package> - <package>apache2-prefork</package> - <package>apache2-utils</package> - <package>apache2-worker</package> - <package>apparmor-profile-editor</package> - <package>art-sharp2</package> - <package>arts</package> - <package>arts-devel</package> - <package>aspell-devel</package> - <package>at-spi</package> - <package>at-spi-devel</package> - <package>at-spi-lang</package> - <package>atk-devel</package> - <package>audiofile</package> - <package>audiofile-devel</package> - <package>audit-devel</package> - <package>augeas-lenses</package> - <package>automoc4</package> - <package>avahi</package> - <package>avahi-compat-howl-devel</package> - <package>avahi-compat-mDNSResponder-devel</package> - <package>avahi-lang</package> - <package>babl-0_0</package> - <package>banshee-1</package> - <package>banshee-1-backend-engine-gstreamer</package> - <package>banshee-1-backend-platform-gnome</package> - <package>banshee-1-backend-platform-unix</package> - <package>banshee-1-devel</package> - <package>banshee-1-extensions-default</package> - <package>banshee-1-lang</package> - <package>beagle-devel</package> - <package>bind-devel</package> - <package>binutils-devel</package> - <package>bluez</package> - <package>bluez-devel</package> - <package>boo</package> - <package>boo-devel</package> - <package>boost-devel</package> - <package>bootsplash-branding-SLED</package> - <package>cairo-devel</package> - <package>cairomm</package> - <package>cairomm-devel</package> - <package>canna</package> - <package>canna-devel</package> - <package>canna-libs</package> - <package>cannadic</package> - <package>capi4linux</package> - <package>capi4linux-devel</package> - <package>cdk</package> - <package>cdk-devel</package> - <package>cdrdao</package> - <package>chasen</package> - <package>chasen-devel</package> - <package>check</package> - <package>check-devel</package> - <package>chmlib</package> - <package>chmlib-devel</package> - <package>cim-schema</package> - <package>clucene-core</package> - <package>clucene-core-devel</package> - <package>cmake</package> - <package>compiz</package> - <package>compiz-branding-SLE</package> - <package>compiz-devel</package> - <package>compiz-gnome</package> - <package>coolkey-devel</package> - <package>cracklib-devel</package> - <package>crash-devel</package> - <package>crimson</package> - <package>cscope</package> - <package>cups</package> - <package>cups-devel</package> - <package>cvsps</package> - <package>cyrus-imapd-devel</package> - <package>cyrus-sasl-crammd5</package> - <package>cyrus-sasl-devel</package> - <package>dante</package> - <package>dante-devel</package> - <package>db1</package> - <package>db1-devel</package> - <package>db43</package> - <package>db43-devel</package> - <package>dbus-1-devel</package> - <package>dbus-1-glib-devel</package> - <package>dbus-1-python-devel</package> - <package>dbus-1-qt3</package> - <package>dbus-1-qt3-devel</package> - <package>dbus-1-x11</package> - <package>dejagnu</package> - <package>dejavu</package> - <package>desktop-data-openSUSE</package> - <package>desktop-file-utils</package> - <package>devhelp</package> - <package>devhelp-devel</package> - <package>devhelp-lang</package> - <package>device-mapper-devel</package> - <package>dhcp</package> - <package>dhcp-client</package> - <package>dhcp-devel</package> - <package>diffstat</package> - <package>dmapi-devel</package> - <package>dnsmasq</package> - <package>docbook-xsl-stylesheets</package> - <package>docbook_4</package> - <package>doxygen</package> - <package>dvd+rw-tools</package> - <package>e2fsprogs-devel</package> - <package>emacs</package> - <package>emacs-nox</package> - <package>emacs-x11</package> - <package>enchant</package> - <package>enchant-devel</package> - <package>enscript</package> - <package>eog</package> - <package>eog-devel</package> - <package>eog-lang</package> - <package>espeak</package> - <package>evince</package> - <package>evince-devel</package> - <package>evince-lang</package> - <package>evoldap2-devel</package> - <package>evolution</package> - <package>evolution-data-server</package> - <package>evolution-data-server-devel</package> - <package>evolution-data-server-lang</package> - <package>evolution-devel</package> - <package>evolution-lang</package> - <package>expect-devel</package> - <package>facter</package> - <package>fam</package> - <package>fam-devel</package> - <package>farsight</package> - <package>farsight-devel</package> - <package>festival</package> - <package>festival-devel</package> - <package>fftw</package> - <package>fftw-devel</package> - <package>fftw-mpi</package> - <package>fftw-mpi-devel</package> - <package>fftw-threads</package> - <package>fftw-threads-devel</package> - <package>fftw3</package> - <package>fftw3-devel</package> - <package>fftw3-threads</package> - <package>fftw3-threads-devel</package> - <package>file-devel</package> - <package>fileshareset</package> - <package>finch</package> - <package>finch-devel</package> - <package>flac-devel</package> - <package>fltk</package> - <package>fltk-devel</package> - <package>fontconfig-devel</package> - <package>fonts-config</package> - <package>foomatic-filters</package> - <package>freeglut</package> - <package>freeglut-devel</package> - <package>freeradius-client-devel</package> - <package>freeradius-client-libs</package> - <package>freeradius-server-devel</package> - <package>freeradius-server-libs</package> - <package>freetype</package> - <package>freetype2-devel</package> - <package>fribidi</package> - <package>fribidi-devel</package> - <package>ft2demos</package> - <package>fuse-devel</package> - <package>fwnn-devel</package> - <package>fxload</package> - <package>gcc-gij</package> - <package>gcc-java</package> - <package>gcc43-gij</package> - <package>gcc43-java</package> - <package>gconf-sharp2</package> - <package>gconf2-devel</package> - <package>gconfmm</package> - <package>gconfmm-devel</package> - <package>gd</package> - <package>gd-devel</package> - <package>gdbm-32bit</package> - <package>gdk-pixbuf</package> - <package>gdk-pixbuf-devel</package> - <package>gegl-0_0</package> - <package>gettext-tools</package> - <package>gfxboot-branding-SLED</package> - <package>gfxboot-devel</package> - <package>ggz</package> - <package>ggz-client-libs</package> - <package>ggz-client-libs-devel</package> - <package>ggz-client-libs-lang</package> - <package>ghex</package> - <package>ghex-devel</package> - <package>ghex-lang</package> - <package>ghostscript-devel</package> - <package>ghostscript-fonts-other</package> - <package>ghostscript-fonts-std</package> - <package>ghostscript-ijs-devel</package> - <package>ghostscript-library</package> - <package>ghostscript-omni</package> - <package>ghostscript-x11</package> - <package>giflib-devel</package> - <package>gimp</package> - <package>gimp-branding-SLED</package> - <package>gimp-devel</package> - <package>gimp-lang</package> - <package>gimp-plugins-python</package> - <package>git</package> - <package>git-arch</package> - <package>git-core</package> - <package>git-cvs</package> - <package>git-daemon</package> - <package>git-email</package> - <package>git-gui</package> - <package>git-svn</package> - <package>git-web</package> - <package>gitk</package> - <package>gjdoc</package> - <package>glade-sharp2</package> - <package>glade3</package> - <package>glade3-lang</package> - <package>glib</package> - <package>glib-devel</package> - <package>glib-sharp2</package> - <package>glib2-devel</package> - <package>glibmm2</package> - <package>glibmm2-devel</package> - <package>glitz</package> - <package>glitz-devel</package> - <package>gltt</package> - <package>gltt-devel</package> - <package>gmime-2_4-devel</package> - <package>gmime-devel</package> - <package>gmp-devel</package> - <package>gnet</package> - <package>gnet-devel</package> - <package>gnokii</package> - <package>gnokii-devel</package> - <package>gnokii-smsd</package> - <package>gnome-certauth-devel</package> - <package>gnome-control-center</package> - <package>gnome-control-center-devel</package> - <package>gnome-control-center-lang</package> - <package>gnome-desktop</package> - <package>gnome-desktop-devel</package> - <package>gnome-desktop-lang</package> - <package>gnome-doc-utils</package> - <package>gnome-doc-utils-devel</package> - <package>gnome-doc-utils-lang</package> - <package>gnome-keyring-devel</package> - <package>gnome-keyring-sharp</package> - <package>gnome-keyring-sharp-devel</package> - <package>gnome-libs</package> - <package>gnome-libs-devel</package> - <package>gnome-mag</package> - <package>gnome-mag-devel</package> - <package>gnome-mag-lang</package> - <package>gnome-main-menu</package> - <package>gnome-main-menu-lang</package> - <package>gnome-media</package> - <package>gnome-media-devel</package> - <package>gnome-media-lang</package> - <package>gnome-menus</package> - <package>gnome-menus-branding-SLED</package> - <package>gnome-menus-devel</package> - <package>gnome-menus-lang</package> - <package>gnome-mount</package> - <package>gnome-mount-lang</package> - <package>gnome-panel</package> - <package>gnome-panel-devel</package> - <package>gnome-panel-lang</package> - <package>gnome-pilot</package> - <package>gnome-pilot-devel</package> - <package>gnome-pilot-lang</package> - <package>gnome-settings-daemon</package> - <package>gnome-settings-daemon-devel</package> - <package>gnome-settings-daemon-lang</package> - <package>gnome-sharp2</package> - <package>gnome-speech</package> - <package>gnome-speech-devel</package> - <package>gnome-themes</package> - <package>gnome-utils</package> - <package>gnome-utils-devel</package> - <package>gnome-utils-lang</package> - <package>gnome-vfs-sharp2</package> - <package>gnome-vfs2</package> - <package>gnome-vfs2-devel</package> - <package>gnome-vfs2-lang</package> - <package>gnome-vfsmm</package> - <package>gnome-vfsmm-devel</package> - <package>gnopernicus</package> - <package>gnopernicus-devel</package> - <package>gnopernicus-lang</package> - <package>gnutls</package> - <package>goffice</package> - <package>goffice-devel</package> - <package>goffice-lang</package> - <package>goocanvas</package> - <package>goocanvas-devel</package> - <package>goocanvas-lang</package> - <package>goom2k4</package> - <package>goom2k4-devel</package> - <package>graphviz</package> - <package>graphviz-devel</package> - <package>graphviz-gd</package> - <package>graphviz-gnome</package> - <package>gstreamer-0_10</package> - <package>gstreamer-0_10-devel</package> - <package>gstreamer-0_10-lang</package> - <package>gstreamer-0_10-plugins-base</package> - <package>gstreamer-0_10-plugins-base-devel</package> - <package>gstreamer-0_10-plugins-base-lang</package> - <package>gstreamer-0_10-plugins-good</package> - <package>gstreamer-0_10-plugins-good-lang</package> - <package>gstreamer-0_10-utils</package> - <package>gstreamer-utils</package> - <package>gtk</package> - <package>gtk-devel</package> - <package>gtk-lang</package> - <package>gtk-sharp2</package> - <package>gtk-vnc-devel</package> - <package>gtk2-devel</package> - <package>gtkglext</package> - <package>gtkglext-devel</package> - <package>gtkhtml2</package> - <package>gtkhtml2-devel</package> - <package>gtkhtml2-lang</package> - <package>gtkhtml314-sharp</package> - <package>gtkmm2</package> - <package>gtkmm2-devel</package> - <package>gtksourceview-devel</package> - <package>gtksourceview-lang</package> - <package>gtksourceview18</package> - <package>gtksourceview18-devel</package> - <package>gtkspell</package> - <package>gtkspell-devel</package> - <package>gtkspell-lang</package> - <package>gucharmap</package> - <package>gucharmap-devel</package> - <package>gucharmap-lang</package> - <package>guile</package> - <package>guile-devel</package> - <package>gutenprint</package> - <package>gutenprint-devel</package> - <package>gvfs-devel</package> - <package>gxmhtml</package> - <package>hal-devel</package> - <package>hal-palm</package> - <package>htdig</package> - <package>htdig-devel</package> - <package>hunspell</package> - <package>hunspell-devel</package> - <package>hunspell-tools</package> - <package>hwinfo-devel</package> - <package>i4l-base</package> - <package>icewm</package> - <package>icewm-lite</package> - <package>id3lib</package> - <package>id3lib-devel</package> - <package>imap-devel</package> - <package>imap-lib</package> - <package>imlib</package> - <package>imlib-devel</package> - <package>imlib2</package> - <package>imlib2-devel</package> - <package>indent</package> - <package>info2html</package> - <package>inn</package> - <package>inn-devel</package> - <package>intltool</package> - <package>ipadic</package> - <package>iptables-devel</package> - <package>iso-codes</package> - <package>iso-codes-devel</package> - <package>iso_ent</package> - <package>ispell</package> - <package>ispell-american</package> - <package>ispell-brazilian</package> - <package>ispell-british</package> - <package>ispell-czech</package> - <package>ispell-danish</package> - <package>ispell-finnish</package> - <package>ispell-french</package> - <package>ispell-german</package> - <package>ispell-hungarian</package> - <package>ispell-italian</package> - <package>ispell-ngerman</package> - <package>ispell-norsk</package> - <package>ispell-polish</package> - <package>ispell-portuguese</package> - <package>ispell-russian</package> - <package>ispell-slovak</package> - <package>ispell-spanish</package> - <package>ispell-swedish</package> - <package>itcl-devel</package> - <package>java-1_4_2-ibm</package> - <package>java-1_4_2-ibm-devel</package> - <package>java-1_5_0-gcj-compat</package> - <package>java-1_5_0-gcj-compat-devel</package> - <package>java-1_6_0-ibm</package> - <package>java-1_6_0-ibm-devel</package> - <package>joe</package> - <package>jpackage-utils</package> - <package>k3b</package> - <package>k3b-devel</package> - <package>k3b-lang</package> - <package>kaddressbook</package> - <package>kalarm</package> - <package>kde-susetranslations</package> - <package>kde4-filesystem</package> - <package>kde4-kgreeter-plugins</package> - <package>kdebase3</package> - <package>kdebase3-devel</package> - <package>kdebase3-runtime</package> - <package>kdebase4-SLED</package> - <package>kdebase4-SLED-lang</package> - <package>kdebase4-runtime</package> - <package>kdebase4-runtime-branding-SLED</package> - <package>kdebase4-workspace</package> - <package>kdebase4-workspace-branding-SLED</package> - <package>kdebase4-workspace-devel</package> - <package>kdebase4-workspace-ksysguardd</package> - <package>kdelibs3</package> - <package>kdelibs3-arts</package> - <package>kdelibs3-default-style</package> - <package>kdelibs3-devel</package> - <package>kdelibs3-doc</package> - <package>kdelibs4</package> - <package>kdelibs4-branding-SLED</package> - <package>kdelibs4-core</package> - <package>kdelibs4-doc</package> - <package>kdemultimedia3-arts</package> - <package>kdepim3</package> - <package>kdepim4</package> - <package>kdepim4-devel</package> - <package>kdepimlibs4</package> - <package>kdialog</package> - <package>kdm</package> - <package>kdm-branding-SLED</package> - <package>kernel-docs</package> - <package>kernel-syms</package> - <package>kernel-trace-devel</package> - <package>kernel-xen-devel</package> - <package>keyutils-devel</package> - <package>kio_sysinfo</package> - <package>kio_sysinfo-branding-SLED</package> - <package>kmail</package> - <package>knode</package> - <package>kontact</package> - <package>korganizer</package> - <package>kpilot</package> - <package>krb5-devel</package> - <package>ksh-devel</package> - <package>ktorrent</package> - <package>ktorrent-devel</package> - <package>ktorrent-lang</package> - <package>kwin</package> - <package>ladspa-devel</package> - <package>lib3ds-1-3</package> - <package>lib3ds-devel</package> - <package>libFLAC++6</package> - <package>libFLAC8</package> - <package>libHX-devel</package> - <package>libMagick++-devel</package> - <package>libMagick++1</package> - <package>libMagickWand1</package> - <package>libQtWebKit-devel</package> - <package>libQtWebKit4</package> - <package>libXerces-c-devel</package> - <package>libXerces-c28</package> - <package>libXiterm</package> - <package>libXiterm-devel</package> - <package>libacl-devel</package> - <package>libadns-devel</package> - <package>libadns1</package> - <package>libakode</package> - <package>libakode-devel</package> - <package>libakonadi4</package> - <package>libakonadiprotocolinternals-devel</package> - <package>libakonadiprotocolinternals1</package> - <package>libao</package> - <package>libao-devel</package> - <package>libapparmor-devel</package> - <package>libapr-util1</package> - <package>libapr-util1-devel</package> - <package>libapr1</package> - <package>libapr1-devel</package> - <package>libarchive-devel</package> - <package>libart_lgpl</package> - <package>libart_lgpl-devel</package> - <package>libassuan-devel</package> - <package>libatomic-ops-devel</package> - <package>libattr-devel</package> - <package>libavahi-core5</package> - <package>libavahi-devel</package> - <package>libavahi-glib-devel</package> - <package>libavahi-gobject-devel</package> - <package>libavahi-gobject0</package> - <package>libavahi-ui0</package> - <package>libavc1394-0</package> - <package>libavc1394-devel</package> - <package>libbabl-0_0-0</package> - <package>libbeagle-devel</package> - <package>libbeagle-python</package> - <package>libbeagle1</package> - <package>libbitmask-devel</package> - <package>libbitmask1</package> - <package>libblkid-devel</package> - <package>libblocxx-devel</package> - <package>libbonobo</package> - <package>libbonobo-devel</package> - <package>libbonobo-lang</package> - <package>libbonoboui</package> - <package>libbonoboui-devel</package> - <package>libbonoboui-lang</package> - <package>libboost_date_time1_36_0</package> - <package>libboost_filesystem1_36_0</package> - <package>libboost_graph1_36_0</package> - <package>libboost_iostreams1_36_0</package> - <package>libboost_math1_36_0</package> - <package>libboost_mpi1_36_0</package> - <package>libboost_program_options1_36_0</package> - <package>libboost_python1_36_0</package> - <package>libboost_serialization1_36_0</package> - <package>libboost_signals1_36_0</package> - <package>libboost_system1_36_0</package> - <package>libboost_test1_36_0</package> - <package>libboost_thread1_36_0</package> - <package>libboost_wave1_36_0</package> - <package>libbotan-1_6_4</package> - <package>libbotan-devel</package> - <package>libbtctl</package> - <package>libbtctl-devel</package> - <package>libbtctl-lang</package> - <package>libbtctl4</package> - <package>libbz2-devel</package> - <package>libcaca</package> - <package>libcaca-devel</package> - <package>libcanberra-gtk</package> - <package>libcanberra-gtk0</package> - <package>libcanberra0</package> - <package>libcap-devel</package> - <package>libcap-ng0</package> - <package>libcdda_interface0</package> - <package>libcdda_paranoia0</package> - <package>libcddb-devel</package> - <package>libcddb2</package> - <package>libcdio++0</package> - <package>libcdio-devel</package> - <package>libcgroup-devel</package> - <package>libcgroup1</package> - <package>libchewing</package> - <package>libchewing-devel</package> - <package>libcmpiutil</package> - <package>libcmpiutil-devel</package> - <package>libcolorblind0</package> - <package>libcom_err-devel</package> - <package>libcompizconfig</package> - <package>libcompizconfig-devel</package> - <package>libcppunit-1_12-0</package> - <package>libcppunit-devel</package> - <package>libcpuset-devel</package> - <package>libcpuset1</package> - <package>libcroco</package> - <package>libcroco-0_6-3</package> - <package>libcroco-devel</package> - <package>libcryptsetup-devel</package> - <package>libcsync-devel</package> - <package>libcsync0</package> - <package>libcurl-devel</package> - <package>libdaemon-devel</package> - <package>libdaemon0</package> - <package>libdatrie-devel</package> - <package>libdatrie0</package> - <package>libdb-4_5-32bit</package> - <package>libdb-4_5-devel</package> - <package>libdbus-1-qt3-0</package> - <package>libdbus-1-qt3-0-devel</package> - <package>libdc1394-22</package> - <package>libdc1394-devel</package> - <package>libdc1394_control12</package> - <package>libdc1394_control12-devel</package> - <package>libdhcp6client-1_0-2</package> - <package>libdhcp6client-devel</package> - <package>libdigikam-devel</package> - <package>libdiscid1</package> - <package>libdjvulibre-devel</package> - <package>libdjvulibre21</package> - <package>libdmxview-devel</package> - <package>libdmxview0</package> - <package>libdnet-devel</package> - <package>libdnet1</package> - <package>libdns_sd</package> - <package>libdrm</package> - <package>libdrm-devel</package> - <package>libdv-devel</package> - <package>libdv4</package> - <package>libdvdread4</package> - <package>libdw-devel</package> - <package>libebl-devel</package> - <package>libedit-devel</package> - <package>libedit0</package> - <package>libelf-devel</package> - <package>libenchant1</package> - <package>libesd-devel</package> - <package>libesd0</package> - <package>libesmtp-devel</package> - <package>libevoldap-2_4-2</package> - <package>libevtlog-devel</package> - <package>libevtlog0</package> - <package>libexempi-devel</package> - <package>libexempi3</package> - <package>libexif-devel</package> - <package>libexiv2-4</package> - <package>libexiv2-devel</package> - <package>libexpat-devel</package> - <package>libext2fs-devel</package> - <package>libfarsight-0_1-3</package> - <package>libffi-devel</package> - <package>libffi43</package> - <package>libffi43-devel</package> - <package>libflaim-devel</package> - <package>libfprint-devel</package> - <package>libfreebl3</package> - <package>libfreebob</package> - <package>libfreebob-devel</package> - <package>libgadu</package> - <package>libgadu-devel</package> - <package>libgail-gnome</package> - <package>libgail-gnome-devel</package> - <package>libgcj-devel</package> - <package>libgcj43</package> - <package>libgcj43-devel</package> - <package>libgcj43-jar</package> - <package>libgcj_bc43</package> - <package>libgcrypt-devel</package> - <package>libgda-3_0-3</package> - <package>libgda-3_0-devel</package> - <package>libgdiplus0</package> - <package>libgegl-0_0-0</package> - <package>libgeoclue0</package> - <package>libgfortran46</package> - <package>libggz2</package> - <package>libggz2-devel</package> - <package>libgimpprint</package> - <package>libgimpprint-devel</package> - <package>libglade2</package> - <package>libglade2-devel</package> - <package>libglademm</package> - <package>libglademm-2_4-1</package> - <package>libglademm-devel</package> - <package>libgladeui-1-9</package> - <package>libgladeui-1_0-devel</package> - <package>libgmime-2_0-3</package> - <package>libgmime-2_4-2</package> - <package>libgmm++-devel</package> - <package>libgnome</package> - <package>libgnome-certauth0</package> - <package>libgnome-desktop-2-11</package> - <package>libgnome-devel</package> - <package>libgnome-lang</package> - <package>libgnome-menu2</package> - <package>libgnome-window-settings1</package> - <package>libgnomecanvas</package> - <package>libgnomecanvas-devel</package> - <package>libgnomecanvas-lang</package> - <package>libgnomecanvasmm</package> - <package>libgnomecanvasmm-devel</package> - <package>libgnomecups</package> - <package>libgnomecups-devel</package> - <package>libgnomecups-lang</package> - <package>libgnomedb</package> - <package>libgnomedb-devel</package> - <package>libgnomedb-lang</package> - <package>libgnomekbd</package> - <package>libgnomekbd-devel</package> - <package>libgnomekbd-lang</package> - <package>libgnomeprint</package> - <package>libgnomeprint-devel</package> - <package>libgnomeprint-lang</package> - <package>libgnomeprintui</package> - <package>libgnomeprintui-devel</package> - <package>libgnomeprintui-lang</package> - <package>libgnomesu</package> - <package>libgnomesu-devel</package> - <package>libgnomesu-lang</package> - <package>libgnomesu0</package> - <package>libgnomeui</package> - <package>libgnomeui-devel</package> - <package>libgnomeui-lang</package> - <package>libgnomevfsmm-2_6-1</package> - <package>libgnutls-devel</package> - <package>libgnutls-extra-devel</package> - <package>libgnutls-extra26</package> - <package>libgoocanvas3</package> - <package>libgpg-error-devel</package> - <package>libgpgme-devel</package> - <package>libgphoto2-devel</package> - <package>libgpod-devel</package> - <package>libgsf</package> - <package>libgsf-1-114</package> - <package>libgsf-devel</package> - <package>libgsf-gnome</package> - <package>libgsm-devel</package> - <package>libgsm1</package> - <package>libgssglue-devel</package> - <package>libgstapp-0_10-0</package> - <package>libgstinterfaces-0_10-0</package> - <package>libgstreamer-0_10-0</package> - <package>libgtk-vnc-1_0-0</package> - <package>libgtkhtml</package> - <package>libgtkhtml-devel</package> - <package>libgtksourceview-2_0-0</package> - <package>libgtop</package> - <package>libgtop-2_0-7</package> - <package>libgtop-devel</package> - <package>libgtop-lang</package> - <package>libgudev-1_0-0</package> - <package>libgweather</package> - <package>libgweather-devel</package> - <package>libgweather-lang</package> - <package>libgweather1</package> - <package>libhangul</package> - <package>libhangul-devel</package> - <package>libhowl0</package> - <package>libical-devel</package> - <package>libical0</package> - <package>libicu-devel</package> - <package>libid3tag</package> - <package>libid3tag-devel</package> - <package>libidl-devel</package> - <package>libidn-devel</package> - <package>libiec61883</package> - <package>libiec61883-devel</package> - <package>libieee1284</package> - <package>libiniparser-devel</package> - <package>libiniparser0</package> - <package>libiptcdata</package> - <package>libiptcdata-devel</package> - <package>libiptcdata0</package> - <package>libiso9660-5</package> - <package>libiterm</package> - <package>libiterm-devel</package> - <package>libjack-devel</package> - <package>libjack0</package> - <package>libjasper</package> - <package>libjasper-devel</package> - <package>libjingle-0_3-0</package> - <package>libjingle-devel</package> - <package>libjpeg-devel</package> - <package>libkcal</package> - <package>libkcal-devel</package> - <package>libkcal2</package> - <package>libkcddb4</package> - <package>libkcddb4-devel</package> - <package>libkcompactdisc4</package> - <package>libkcompactdisc4-devel</package> - <package>libkdcraw3</package> - <package>libkdcraw3-devel</package> - <package>libkdcraw3-lang</package> - <package>libkde4</package> - <package>libkde4-devel</package> - <package>libkdecore4</package> - <package>libkdecore4-devel</package> - <package>libkdepim4</package> - <package>libkdepim4-devel</package> - <package>libkdepimlibs4</package> - <package>libkdepimlibs4-devel</package> - <package>libkexiv2-3</package> - <package>libkexiv2-3-devel</package> - <package>libkexiv2-7</package> - <package>libkipi-devel</package> - <package>libkipi6</package> - <package>libkmime-devel</package> - <package>libkmime2</package> - <package>libknotificationitem-1-1</package> - <package>libkonq-devel</package> - <package>libkonq5</package> - <package>libksba-devel</package> - <package>libktnef-devel</package> - <package>libktnef1</package> - <package>liblazy-devel</package> - <package>liblazy1</package> - <package>liblcms-devel</package> - <package>libldapcpp-devel</package> - <package>liblog4c-devel</package> - <package>liblog4c3</package> - <package>libloudmouth-1-0</package> - <package>liblpsolve55</package> - <package>liblua5_1</package> - <package>libmalaga-devel</package> - <package>libmalaga7</package> - <package>libmcrypt</package> - <package>libmcrypt-devel</package> - <package>libmikmod</package> - <package>libmikmod-devel</package> - <package>libmm-devel</package> - <package>libmm14</package> - <package>libmng-devel</package> - <package>libmpcdec-devel</package> - <package>libmpcdec5</package> - <package>libmspack-devel</package> - <package>libmtp-devel</package> - <package>libmtp8</package> - <package>libmusicbrainz-devel</package> - <package>libmusicbrainz3-6</package> - <package>libmusicbrainz3-devel</package> - <package>libmusicbrainz4</package> - <package>libmysqlclient-devel</package> - <package>libmysqlclient15</package> - <package>libmysqlclient_r15</package> - <package>libneon-devel</package> - <package>libneon27</package> - <package>libnetapi-devel</package> - <package>libnetapi0</package> - <package>libnetcontrol0</package> - <package>libnetpbm-devel</package> - <package>libnetpbm10</package> - <package>libnewt0_52</package> - <package>libnjb</package> - <package>libnjb-devel</package> - <package>libnjb5</package> - <package>libnl-devel</package> - <package>libnotify</package> - <package>libnotify-devel</package> - <package>libnotify1</package> - <package>libnscd-devel</package> - <package>libnsssharedhelper0</package> - <package>libnuma-devel</package> - <package>libofa-devel</package> - <package>libofa0</package> - <package>libogg-devel</package> - <package>libogg0</package> - <package>liboil</package> - <package>liboil-devel</package> - <package>libopenbabel-devel</package> - <package>libopenbabel3</package> - <package>libopencdk-devel</package> - <package>libopencdk10</package> - <package>libopenraw-devel</package> - <package>libopenraw1</package> - <package>libopenssl-devel</package> - <package>libopensync</package> - <package>libopensync-devel</package> - <package>libopensync-plugin-evolution2</package> - <package>libopensync-plugin-evolution2-devel</package> - <package>libopensync-plugin-palm</package> - <package>libopensync-plugin-palm-devel</package> - <package>liborc-0_4-0</package> - <package>libosip2</package> - <package>libosip2-devel</package> - <package>libotf</package> - <package>libotf-devel</package> - <package>libotr-devel</package> - <package>libotr2</package> - <package>libp11-1</package> - <package>libp11-devel</package> - <package>libpackagekit-glib10</package> - <package>libpackagekit-glib10-devel</package> - <package>libpangomm-1_4-1</package> - <package>libpcap-devel</package> - <package>libpciaccess0</package> - <package>libpciaccess0-devel</package> - <package>libphonon4</package> - <package>libpisock-devel</package> - <package>libpisock9</package> - <package>libpisync-devel</package> - <package>libpisync1</package> - <package>libpixman-1-0-devel</package> - <package>libpkcs11-helper1</package> - <package>libpng-devel</package> - <package>libpolkit-qt0</package> - <package>libpoppler-devel</package> - <package>libpoppler-glib-devel</package> - <package>libpoppler-glib4</package> - <package>libpoppler-qt2</package> - <package>libpoppler-qt3-devel</package> - <package>libpoppler-qt4-3</package> - <package>libpoppler-qt4-devel</package> - <package>libpoppler5</package> - <package>libpst4</package> - <package>libpt2</package> - <package>libpt2-devel</package> - <package>libpulse-browse0</package> - <package>libpulse-devel</package> - <package>libpulse-mainloop-glib0</package> - <package>libpulse0</package> - <package>libpurple</package> - <package>libpurple-devel</package> - <package>libpurple-lang</package> - <package>libqca2</package> - <package>libqca2-devel</package> - <package>libqdialogsolver1</package> - <package>libqdialogsolver1-devel</package> - <package>libqimageblitz-devel</package> - <package>libqimageblitz4</package> - <package>libqscintilla-devel</package> - <package>libqscintilla2-5</package> - <package>libqt4</package> - <package>libqt4-devel</package> - <package>libqt4-qt3support</package> - <package>libqt4-sql</package> - <package>libqt4-sql-mysql</package> - <package>libqt4-sql-postgresql</package> - <package>libqt4-sql-sqlite</package> - <package>libqt4-sql-unixODBC</package> - <package>libqt4-x11</package> - <package>libqtpod-devel</package> - <package>libqtpod0</package> - <package>libquadmath46</package> - <package>libquicktime</package> - <package>libquicktime-devel</package> - <package>libraptor-devel</package> - <package>libraptor1</package> - <package>librasqal-devel</package> - <package>librasqal1</package> - <package>libraw1394-11</package> - <package>libraw1394-8</package> - <package>libraw1394-devel</package> - <package>libredland-devel</package> - <package>libredland0</package> - <package>libreiserfs-devel</package> - <package>libreoffice</package> - <package>libreoffice-base</package> - <package>libreoffice-branding-SLED</package> - <package>libreoffice-branding-upstream</package> - <package>libreoffice-calc</package> - <package>libreoffice-icon-themes</package> - <package>libreoffice-impress</package> - <package>libreoffice-sdk</package> - <package>libreoffice-writer</package> - <package>librsvg</package> - <package>librsvg-devel</package> - <package>libsamplerate</package> - <package>libsamplerate-devel</package> - <package>libsatsolver-devel</package> - <package>libsblim-cmpiutil1</package> - <package>libselinux-devel</package> - <package>libsemanage-devel</package> - <package>libsemanage1</package> - <package>libsensors3-devel</package> - <package>libsensors4</package> - <package>libsepol-devel</package> - <package>libsexy</package> - <package>libsexy-devel</package> - <package>libshout-devel</package> - <package>libshout3</package> - <package>libsidplay1</package> - <package>libsidplay1-devel</package> - <package>libsigc++2</package> - <package>libsigc++2-devel</package> - <package>libslab-lang</package> - <package>libslab0</package> - <package>libsmbclient-devel</package> - <package>libsmbios-devel</package> - <package>libsmbsharemodes-devel</package> - <package>libsmbsharemodes0</package> - <package>libsndfile</package> - <package>libsndfile-devel</package> - <package>libsoprano-devel</package> - <package>libsoprano4</package> - <package>libsoup-devel</package> - <package>libspectre-devel</package> - <package>libspectre1</package> - <package>libspeex</package> - <package>libssh2-devel</package> - <package>libstrigi0</package> - <package>libstroke</package> - <package>libstroke-devel</package> - <package>libsyncml-devel</package> - <package>libsyncml0</package> - <package>libtalloc-devel</package> - <package>libtasn1-devel</package> - <package>libtdb-devel</package> - <package>libtelepathy</package> - <package>libtelepathy-devel</package> - <package>libtelepathy-glib0</package> - <package>libtheora-devel</package> - <package>libtheora0</package> - <package>libtidy</package> - <package>libtidy-devel</package> - <package>libtiff-devel</package> - <package>libtirpc-devel</package> - <package>libtomoe-gtk0</package> - <package>libtspi1</package> - <package>libtunepimp</package> - <package>libtunepimp-devel</package> - <package>libtunepimp5</package> - <package>libudev-devel</package> - <package>libudf0</package> - <package>libunique-1_0-0</package> - <package>libunwind</package> - <package>libunwind-devel</package> - <package>libupsclient1</package> - <package>libusb-devel</package> - <package>libusbpp-0_1-4</package> - <package>libustr-1_0-1</package> - <package>libustr-devel</package> - <package>libuuid-devel</package> - <package>libvirt-client</package> - <package>libvirt-devel</package> - <package>libvisual</package> - <package>libvisual-devel</package> - <package>libvoikko-devel</package> - <package>libvoikko1</package> - <package>libvorbis</package> - <package>libvorbis-devel</package> - <package>libwavpack1</package> - <package>libwbclient-devel</package> - <package>libwbxml2-0</package> - <package>libwbxml2-devel</package> - <package>libwebkit-1_0-1</package> - <package>libwebkit-1_0-2</package> - <package>libwebkit-devel</package> - <package>libwebkit-lang</package> - <package>libwmf</package> - <package>libwmf-devel</package> - <package>libwmf-gnome</package> - <package>libwnck</package> - <package>libwnck-1-22</package> - <package>libwnck-devel</package> - <package>libwnck-lang</package> - <package>libwpd-0_8-8</package> - <package>libwpd-devel</package> - <package>libwpg-0_1-1</package> - <package>libwpg-devel</package> - <package>libwps-0_1-1</package> - <package>libwps-devel</package> - <package>libwsman-devel</package> - <package>libwsman1</package> - <package>libxcrypt-devel</package> - <package>libxine-devel</package> - <package>libxine1</package> - <package>libxklavier-devel</package> - <package>libxklavier15</package> - <package>libxml2-devel</package> - <package>libxslt-devel</package> - <package>libyajl1</package> - <package>libzio-devel</package> - <package>libzip-devel</package> - <package>libzip1</package> - <package>libzvbi0</package> - <package>libzypp-devel</package> - <package>limal-apparmor-notifications</package> - <package>limal-apparmor-notifications-devel</package> - <package>limal-ca-mgm-devel</package> - <package>limal-devel</package> - <package>limal-devtools</package> - <package>limal-nfs-server-devel</package> - <package>linux-atm-devel</package> - <package>linux-atm-lib</package> - <package>lksctp-tools</package> - <package>lksctp-tools-devel</package> - <package>loudmouth-devel</package> - <package>lua</package> - <package>lua-devel</package> - <package>lzo-devel</package> - <package>m17n-db</package> - <package>m17n-lib</package> - <package>m17n-lib-devel</package> - <package>malaga-suomi</package> - <package>meanwhile</package> - <package>meanwhile-devel</package> - <package>metacity</package> - <package>metacity-devel</package> - <package>metacity-lang</package> - <package>mhash</package> - <package>mhash-devel</package> - <package>misc-console-font</package> - <package>mono-addins</package> - <package>mono-basic</package> - <package>mono-core</package> - <package>mono-data</package> - <package>mono-data-oracle</package> - <package>mono-data-sqlite</package> - <package>mono-devel</package> - <package>mono-extras</package> - <package>mono-jscript</package> - <package>mono-tools</package> - <package>mono-wcf</package> - <package>mono-web</package> - <package>mono-winforms</package> - <package>mono-zeroconf</package> - <package>mono-zeroconf-provider-avahi</package> - <package>monodevelop</package> - <package>monodoc-core</package> - <package>mozilla-nspr</package> - <package>mozilla-nspr-devel</package> - <package>mozilla-nss</package> - <package>mozilla-nss-devel</package> - <package>mozilla-xulrunner192</package> - <package>mozilla-xulrunner192-gnome</package> - <package>mpfr-devel</package> - <package>mpi-selector</package> - <package>mpich</package> - <package>mpich-devel</package> - <package>mysql</package> - <package>mysql-client</package> - <package>nagios</package> - <package>nagios-devel</package> - <package>nagios-www</package> - <package>nant</package> - <package>nautilus</package> - <package>nautilus-cd-burner</package> - <package>nautilus-cd-burner-devel</package> - <package>nautilus-cd-burner-lang</package> - <package>nautilus-devel</package> - <package>nautilus-lang</package> - <package>ndesk-dbus</package> - <package>ndesk-dbus-glib</package> - <package>ndesk-dbus-glib-devel</package> - <package>net-snmp</package> - <package>net-snmp-devel</package> - <package>netatalk</package> - <package>netatalk-devel</package> - <package>netcat-openbsd</package> - <package>newt</package> - <package>newt-devel</package> - <package>newt-static</package> - <package>nfsidmap-devel</package> - <package>notification-daemon</package> - <package>notification-daemon-lang</package> - <package>notify-sharp</package> - <package>nss-mdns</package> - <package>nss-shared-helper-devel</package> - <package>nut</package> - <package>nut-classic</package> - <package>nut-devel</package> - <package>opal</package> - <package>opal-devel</package> - <package>openCryptoki</package> - <package>openCryptoki-64bit</package> - <package>openCryptoki-devel</package> - <package>openct-devel</package> - <package>openhpi</package> - <package>openhpi-daemon</package> - <package>openhpi-devel</package> - <package>openjade</package> - <package>openjade-devel</package> - <package>openldap2-devel</package> - <package>openmotif-devel</package> - <package>openmotif-libs</package> - <package>openmpi</package> - <package>openobex-devel</package> - <package>openobex-glib-devel</package> - <package>opensc-devel</package> - <package>openslp-devel</package> - <package>opensp</package> - <package>opensp-devel</package> - <package>openwsman-client</package> - <package>openwsman-server</package> - <package>orbit</package> - <package>orbit-devel</package> - <package>orbit2-devel</package> - <package>oxygen-icon-theme</package> - <package>oxygen-icon-theme-scalable</package> - <package>ozerocdoff</package> - <package>pam-devel</package> - <package>pango-devel</package> - <package>pangomm-devel</package> - <package>parted-devel</package> - <package>patchutils</package> - <package>pciutils-devel</package> - <package>pcre-devel</package> - <package>pcsc-acr38</package> - <package>pcsc-acr38-devel</package> - <package>pcsc-lite-devel</package> - <package>perl-32bit</package> - <package>perl-Crypt-OpenSSL-RSA</package> - <package>perl-Mail-DKIM</package> - <package>perl-MailTools</package> - <package>perl-Net-DNS</package> - <package>perl-Net-IP</package> - <package>perl-NetAddr-IP</package> - <package>perl-SNMP</package> - <package>perl-Tie-IxHash</package> - <package>perl-Tk</package> - <package>perl-Tk-devel</package> - <package>perl-spamassassin</package> - <package>phonon</package> - <package>phonon-backend-gstreamer-0_10</package> - <package>phonon-devel</package> - <package>php5</package> - <package>php5-ctype</package> - <package>php5-devel</package> - <package>php5-dom</package> - <package>php5-hash</package> - <package>php5-iconv</package> - <package>php5-json</package> - <package>php5-pdo</package> - <package>php5-sqlite</package> - <package>php5-suhosin</package> - <package>php5-tokenizer</package> - <package>php5-xmlreader</package> - <package>php5-xmlwriter</package> - <package>php53</package> - <package>php53-ctype</package> - <package>php53-dom</package> - <package>php53-iconv</package> - <package>php53-json</package> - <package>php53-tokenizer</package> - <package>php53-xmlreader</package> - <package>php53-xmlwriter</package> - <package>pidgin</package> - <package>pidgin-devel</package> - <package>pilot-link</package> - <package>pkcs11-helper</package> - <package>pkcs11-helper-devel</package> - <package>planner</package> - <package>planner-devel</package> - <package>planner-lang</package> - <package>plasma-addons</package> - <package>plasma-theme-aya</package> - <package>plasmoid-networkmanagement</package> - <package>plasmoid-quickaccess</package> - <package>plotutils</package> - <package>poppler-data</package> - <package>poppler-tools</package> - <package>popt-devel</package> - <package>portmap</package> - <package>postfix-devel</package> - <package>postgresql-devel</package> - <package>postgresql-libs</package> - <package>ppp-devel</package> - <package>ppp-userpass</package> - <package>pstoedit</package> - <package>pstoedit-devel</package> - <package>pulseaudio</package> - <package>pulseaudio-esound-compat</package> - <package>pulseaudio-lang</package> - <package>puppet</package> - <package>python-cairo</package> - <package>python-cairo-devel</package> - <package>python-devel</package> - <package>python-gnome</package> - <package>python-gnome-devel</package> - <package>python-gobject2</package> - <package>python-gobject2-devel</package> - <package>python-gtk</package> - <package>python-gtk-devel</package> - <package>python-gtkglext</package> - <package>python-gtkglext-devel</package> - <package>python-gtksourceview</package> - <package>python-gtksourceview-devel</package> - <package>python-numeric</package> - <package>python-numpy</package> - <package>python-orbit</package> - <package>python-orbit-devel</package> - <package>pyxml</package> - <package>qt3</package> - <package>qt3-devel</package> - <package>quagga</package> - <package>quagga-devel</package> - <package>quilt</package> - <package>raptor</package> - <package>rarian</package> - <package>rarian-devel</package> - <package>re2c</package> - <package>readline-devel</package> - <package>recode-devel</package> - <package>rpm-devel</package> - <package>rrdtool</package> - <package>rrdtool-devel</package> - <package>rsyslog</package> - <package>ruby</package> - <package>rubygems</package> - <package>ruby-devel</package> - <package>ruby-doc-html</package> - <package>ruby-doc-ri</package> - <package>ruby-examples</package> - <package>ruby-fcgi</package> - <package>ruby-mysql</package> - <package>ruby-selinux</package> - <package>ruby-test-suite</package> - <package>ruby-tk</package> - <package>sablot</package> - <package>sablot-devel</package> - <package>samba-devel</package> - <package>sane-backends</package> - <package>sane-frontends</package> - <package>sax2-libsax</package> - <package>sax2-libsax-devel</package> - <package>sax2-libsax-perl</package> - <package>sax2-tools</package> - <package>sblim-cmpi-base</package> - <package>sblim-cmpi-base-devel</package> - <package>sblim-cmpi-devel</package> - <package>sblim-cmpiutil-devel</package> - <package>sblim-indication_helper</package> - <package>sblim-sfcb</package> - <package>sblim-sfcc</package> - <package>sblim-sfcc-devel</package> - <package>scim</package> - <package>scim-devel</package> - <package>scpm-devel</package> - <package>scrollkeeper</package> - <package>scrollkeeper-lang</package> - <package>seahorse</package> - <package>seahorse-devel</package> - <package>seahorse-lang</package> - <package>sendmail</package> - <package>sendmail-devel</package> - <package>sg3_utils-devel</package> - <package>sgml-skel</package> - <package>shared-mime-info</package> - <package>silc-toolkit</package> - <package>silc-toolkit-devel</package> - <package>slang</package> - <package>slang-devel</package> - <package>soprano</package> - <package>soprano-backend-redland</package> - <package>spamassassin</package> - <package>speex-devel</package> - <package>splashy-devel</package> - <package>sqlite2</package> - <package>sqlite3-devel</package> - <package>startup-notification</package> - <package>startup-notification-devel</package> - <package>strigi</package> - <package>strigi-devel</package> - <package>subversion</package> - <package>subversion-perl</package> - <package>susehelp</package> - <package>susehelp_cz</package> - <package>susehelp_de</package> - <package>susehelp_en</package> - <package>susehelp_es</package> - <package>susehelp_fr</package> - <package>susehelp_hu</package> - <package>susehelp_it</package> - <package>swig</package> - <package>syslogd</package> - <package>t1lib</package> - <package>t1lib-devel</package> - <package>taglib</package> - <package>taglib-devel</package> - <package>taglib-sharp</package> - <package>tango-icon-theme</package> - <package>tcl-devel</package> - <package>tcpd-devel</package> - <package>telepathy-glib-devel</package> - <package>telepathy-mission-control</package> - <package>telepathy-mission-control-devel</package> - <package>texlive-bin-devel</package> - <package>texlive-devel</package> - <package>tk-devel</package> - <package>tla</package> - <package>tn5250</package> - <package>tn5250-devel</package> - <package>tomoe</package> - <package>tomoe-devel</package> - <package>tomoe-gtk</package> - <package>tomoe-gtk-devel</package> - <package>tomoe-gtk-lang</package> - <package>totem-pl-parser</package> - <package>totem-pl-parser-devel</package> - <package>totem-pl-parser-lang</package> - <package>trousers</package> - <package>trousers-devel</package> - <package>tsclient</package> - <package>tsclient-devel</package> - <package>tsclient-lang</package> - <package>uim</package> - <package>uim-devel</package> - <package>unixODBC</package> - <package>unixODBC-devel</package> - <package>unsermake</package> - <package>update-desktop-files</package> - <package>usb_modeswitch</package> - <package>usb_modeswitch-data</package> - <package>valgrind</package> - <package>valgrind-devel</package> - <package>vte</package> - <package>vte-devel</package> - <package>vte-lang</package> - <package>wdiff</package> - <package>webkit-sharp</package> - <package>wireshark</package> - <package>wireshark-devel</package> - <package>wodim-devel</package> - <package>wordcut</package> - <package>wordcut-devel</package> - <package>words</package> - <package>wpa_supplicant</package> - <package>wvstreams</package> - <package>wvstreams-devel</package> - <package>wxGTK-compat</package> - <package>wxGTK-devel</package> - <package>wxGTK-gl</package> - <package>x11-input-wacom</package> - <package>x11-input-wacom-devel</package> - <package>x11-input-wacom-tools</package> - <package>xalan-j2</package> - <package>xaw3d-devel</package> - <package>xbase</package> - <package>xbase-devel</package> - <package>xdelta</package> - <package>xdelta-devel</package> - <package>xdg-menu</package> - <package>xen-devel</package> - <package>xen-libs</package> - <package>xerces-j2</package> - <package>xerces-j2-bootstrap</package> - <package>xerces-j2-xml-apis</package> - <package>xfsprogs-devel</package> - <package>xml-commons-apis-bootstrap</package> - <package>xml-commons-resolver-bootstrap</package> - <package>xml-commons-which-bootstrap</package> - <package>xmlcharent</package> - <package>xorg-x11</package> - <package>xorg-x11-devel</package> - <package>xorg-x11-fonts</package> - <package>xorg-x11-fonts-core</package> - <package>xorg-x11-fonts-devel</package> - <package>xorg-x11-libICE-devel</package> - <package>xorg-x11-libSM-devel</package> - <package>xorg-x11-libX11-devel</package> - <package>xorg-x11-libXau-devel</package> - <package>xorg-x11-libXdmcp-devel</package> - <package>xorg-x11-libXext-devel</package> - <package>xorg-x11-libXfixes-devel</package> - <package>xorg-x11-libXmu-devel</package> - <package>xorg-x11-libXp-devel</package> - <package>xorg-x11-libXpm-devel</package> - <package>xorg-x11-libXprintUtil-devel</package> - <package>xorg-x11-libXrender-devel</package> - <package>xorg-x11-libXt-devel</package> - <package>xorg-x11-libXv-devel</package> - <package>xorg-x11-libfontenc-devel</package> - <package>xorg-x11-libxcb-devel</package> - <package>xorg-x11-libxkbfile-devel</package> - <package>xorg-x11-proto-devel</package> - <package>xorg-x11-server</package> - <package>xorg-x11-util-devel</package> - <package>xorg-x11-xauth</package> - <package>xorg-x11-xtrans-devel</package> - <package>xosd</package> - <package>xosd-devel</package> - <package>xsp</package> - <package>xterm</package> - <package>xz-devel</package> - <package>yast2-core-devel</package> - <package>yast2-devtools</package> - <package>yast2-gtk</package> - <package>yast2-libyui-devel</package> - <package>yast2-ncurses-devel</package> - <package>yast2-qt</package> - <package>yast2-qt-devel</package> - <package>yast2-qt-pkg</package> - <package>yast2-storage-devel</package> - <package>yast2-ycp-ui-bindings-devel</package> - <package>yelp</package> - <package>yelp-lang</package> - <package>zenity</package> - <package>zenity-lang</package> - <package>zlib-devel</package> - <package>zsh</package> - <package>zvbi-devel</package> - </remove-packages> - - </software> - <user_defaults> - <expire></expire> - <group>100</group> - <groups>video,dialout</groups> - <home>/home</home> - <inactive>-1</inactive> - <shell>/bin/bash</shell> - <skel>/etc/skel</skel> - <umask>022</umask> - </user_defaults> - <users config:type="list"> - <user> - <encrypted config:type="boolean">true</encrypted> - <fullname>vagrant</fullname> - <gid>100</gid> - <home>/home/vagrant</home> - <password_settings> - <expire></expire> - <flag></flag> - <inact></inact> - <max>99999</max> - <min>0</min> - <warn>7</warn> - </password_settings> - <shell>/bin/bash</shell> - <uid>1000</uid> - <user_password>$2y$05$NA1Li9ZKJOLRW5mMTXm6/e5r8dltWS5RpDZpvHrI82aLE00V51tdi</user_password> - <username>vagrant</username> - </user> - <user> - <encrypted config:type="boolean">true</encrypted> - <fullname>Games account</fullname> - <gid>100</gid> - <home>/var/games</home> - <password_settings> - <expire></expire> - <flag></flag> - <inact></inact> - <max></max> - <min></min> - <warn></warn> - </password_settings> - <shell>/bin/bash</shell> - <uid>12</uid> - <user_password>*</user_password> - <username>games</username> - </user> - <user> - <encrypted config:type="boolean">true</encrypted> - <fullname>bin</fullname> - <gid>1</gid> - <home>/bin</home> - <password_settings> - <expire></expire> - <flag></flag> - <inact></inact> - <max></max> - <min></min> - <warn></warn> - </password_settings> - <shell>/bin/bash</shell> - <uid>1</uid> - <user_password>*</user_password> - <username>bin</username> - </user> - <user> - <encrypted config:type="boolean">true</encrypted> - <fullname>nobody</fullname> - <gid>65533</gid> - <home>/var/lib/nobody</home> - <password_settings> - <expire></expire> - <flag></flag> - <inact></inact> - <max></max> - <min></min> - <warn></warn> - </password_settings> - <shell>/bin/bash</shell> - <uid>65534</uid> - <user_password>*</user_password> - <username>nobody</username> - </user> - <user> - <encrypted config:type="boolean">true</encrypted> - <fullname>Printing daemon</fullname> - <gid>7</gid> - <home>/var/spool/lpd</home> - <password_settings> - <expire></expire> - <flag></flag> - <inact></inact> - <max></max> - <min></min> - <warn></warn> - </password_settings> - <shell>/bin/bash</shell> - <uid>4</uid> - <user_password>*</user_password> - <username>lp</username> - </user> - <user> - <encrypted config:type="boolean">true</encrypted> - <fullname>User for uuidd</fullname> - <gid>104</gid> - <home>/var/run/uuidd</home> - <password_settings> - <expire></expire> - <flag></flag> - <inact></inact> - <max>99999</max> - <min>0</min> - <warn>7</warn> - </password_settings> - <shell>/bin/false</shell> - <uid>102</uid> - <user_password>*</user_password> - <username>uuidd</username> - </user> - <user> - <encrypted config:type="boolean">true</encrypted> - <fullname>Postfix Daemon</fullname> - <gid>51</gid> - <home>/var/spool/postfix</home> - <password_settings> - <expire></expire> - <flag></flag> - <inact></inact> - <max>99999</max> - <min>0</min> - <warn>7</warn> - </password_settings> - <shell>/bin/false</shell> - <uid>51</uid> - <user_password>*</user_password> - <username>postfix</username> - </user> - <user> - <encrypted config:type="boolean">true</encrypted> - <fullname>Novell Customer Center User</fullname> - <gid>111</gid> - <home>/var/lib/YaST2/suse-ncc-fakehome</home> - <password_settings> - <expire></expire> - <flag></flag> - <inact></inact> - <max>99999</max> - <min>0</min> - <warn>7</warn> - </password_settings> - <shell>/bin/bash</shell> - <uid>106</uid> - <user_password>*</user_password> - <username>suse-ncc</username> - </user> - <user> - <encrypted config:type="boolean">true</encrypted> - <fullname>FTP account</fullname> - <gid>49</gid> - <home>/srv/ftp</home> - <password_settings> - <expire></expire> - <flag></flag> - <inact></inact> - <max></max> - <min></min> - <warn></warn> - </password_settings> - <shell>/bin/bash</shell> - <uid>40</uid> - <user_password>*</user_password> - <username>ftp</username> - </user> - <user> - <encrypted config:type="boolean">true</encrypted> - <fullname>Gnome Display Manager daemon</fullname> - <gid>112</gid> - <home>/var/lib/gdm</home> - <password_settings> - <expire></expire> - <flag></flag> - <inact></inact> - <max>99999</max> - <min>0</min> - <warn>7</warn> - </password_settings> - <shell>/bin/false</shell> - <uid>107</uid> - <user_password>*</user_password> - <username>gdm</username> - </user> - <user> - <encrypted config:type="boolean">true</encrypted> - <fullname>Batch jobs daemon</fullname> - <gid>25</gid> - <home>/var/spool/atjobs</home> - <password_settings> - <expire></expire> - <flag></flag> - <inact></inact> - <max>99999</max> - <min>0</min> - <warn>7</warn> - </password_settings> - <shell>/bin/bash</shell> - <uid>25</uid> - <user_password>*</user_password> - <username>at</username> - </user> - <user> - <encrypted config:type="boolean">true</encrypted> - <fullname>root</fullname> - <gid>0</gid> - <home>/root</home> - <password_settings> - <expire></expire> - <flag></flag> - <inact></inact> - <max></max> - <min></min> - <warn></warn> - </password_settings> - <shell>/bin/bash</shell> - <uid>0</uid> - <user_password>$2y$05$NA1Li9ZKJOLRW5mMTXm6/e5r8dltWS5RpDZpvHrI82aLE00V51tdi</user_password> - <username>root</username> - </user> - <user> - <encrypted config:type="boolean">true</encrypted> - <fullname>Mailer daemon</fullname> - <gid>12</gid> - <home>/var/spool/clientmqueue</home> - <password_settings> - <expire></expire> - <flag></flag> - <inact></inact> - <max></max> - <min></min> - <warn></warn> - </password_settings> - <shell>/bin/false</shell> - <uid>8</uid> - <user_password>*</user_password> - <username>mail</username> - </user> - <user> - <encrypted config:type="boolean">true</encrypted> - <fullname>Daemon</fullname> - <gid>2</gid> - <home>/sbin</home> - <password_settings> - <expire></expire> - <flag></flag> - <inact></inact> - <max></max> - <min></min> - <warn></warn> - </password_settings> - <shell>/bin/bash</shell> - <uid>2</uid> - <user_password>*</user_password> - <username>daemon</username> - </user> - <user> - <encrypted config:type="boolean">true</encrypted> - <fullname>NTP daemon</fullname> - <gid>108</gid> - <home>/var/lib/ntp</home> - <password_settings> - <expire></expire> - <flag></flag> - <inact></inact> - <max>99999</max> - <min>0</min> - <warn>7</warn> - </password_settings> - <shell>/bin/false</shell> - <uid>74</uid> - <user_password>*</user_password> - <username>ntp</username> - </user> - <user> - <encrypted config:type="boolean">true</encrypted> - <fullname>Unix-to-Unix CoPy system</fullname> - <gid>14</gid> - <home>/etc/uucp</home> - <password_settings> - <expire></expire> - <flag></flag> - <inact></inact> - <max></max> - <min></min> - <warn></warn> - </password_settings> - <shell>/bin/bash</shell> - <uid>10</uid> - <user_password>*</user_password> - <username>uucp</username> - </user> - <user> - <encrypted config:type="boolean">true</encrypted> - <fullname>User for D-Bus</fullname> - <gid>101</gid> - <home>/var/run/dbus</home> - <password_settings> - <expire></expire> - <flag></flag> - <inact></inact> - <max></max> - <min>0</min> - <warn>7</warn> - </password_settings> - <shell>/bin/false</shell> - <uid>100</uid> - <user_password>*</user_password> - <username>messagebus</username> - </user> - <user> - <encrypted config:type="boolean">true</encrypted> - <fullname>User for haldaemon</fullname> - <gid>102</gid> - <home>/var/run/hald</home> - <password_settings> - <expire></expire> - <flag></flag> - <inact></inact> - <max></max> - <min>0</min> - <warn>7</warn> - </password_settings> - <shell>/bin/false</shell> - <uid>101</uid> - <user_password>*</user_password> - <username>haldaemon</username> - </user> - <user> - <encrypted config:type="boolean">true</encrypted> - <fullname>WWW daemon apache</fullname> - <gid>8</gid> - <home>/var/lib/wwwrun</home> - <password_settings> - <expire></expire> - <flag></flag> - <inact></inact> - <max></max> - <min></min> - <warn></warn> - </password_settings> - <shell>/bin/false</shell> - <uid>30</uid> - <user_password>*</user_password> - <username>wwwrun</username> - </user> - <user> - <encrypted config:type="boolean">true</encrypted> - <fullname>Manual pages viewer</fullname> - <gid>62</gid> - <home>/var/cache/man</home> - <password_settings> - <expire></expire> - <flag></flag> - <inact></inact> - <max></max> - <min></min> - <warn></warn> - </password_settings> - <shell>/bin/bash</shell> - <uid>13</uid> - <user_password>*</user_password> - <username>man</username> - </user> - <user> - <encrypted config:type="boolean">true</encrypted> - <fullname>PolicyKit</fullname> - <gid>107</gid> - <home>/var/run/PolicyKit</home> - <password_settings> - <expire></expire> - <flag></flag> - <inact></inact> - <max>99999</max> - <min>0</min> - <warn>7</warn> - </password_settings> - <shell>/bin/false</shell> - <uid>104</uid> - <user_password>*</user_password> - <username>polkituser</username> - </user> - <user> - <encrypted config:type="boolean">true</encrypted> - <fullname>News system</fullname> - <gid>13</gid> - <home>/etc/news</home> - <password_settings> - <expire></expire> - <flag></flag> - <inact></inact> - <max></max> - <min></min> - <warn></warn> - </password_settings> - <shell>/bin/bash</shell> - <uid>9</uid> - <user_password>*</user_password> - <username>news</username> - </user> - <user> - <fullname>SSH daemon</fullname> - <gid>65</gid> - <home>/var/lib/sshd</home> - <shell>/bin/false</shell> - <uid>71</uid> - <username>sshd</username> - </user> - <user> - <encrypted config:type="boolean">true</encrypted> - <fullname>PulseAudio daemon</fullname> - <gid>109</gid> - <home>/var/lib/pulseaudio</home> - <password_settings> - <expire></expire> - <flag></flag> - <inact></inact> - <max>99999</max> - <min>0</min> - <warn>7</warn> - </password_settings> - <shell>/bin/false</shell> - <uid>105</uid> - <user_password>*</user_password> - <username>pulse</username> - </user> - </users> -</profile> diff --git a/templates/sles-11-sp3-i386/scripts/cleanup.sh b/templates/sles-11-sp3-i386/scripts/cleanup.sh deleted file mode 100644 index 6b6548a6d..000000000 --- a/templates/sles-11-sp3-i386/scripts/cleanup.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/bash -eux - -# remove zypper locks on removed packages to avoid later dependency problems -zypper --non-interactive rl \* -# zypper --non-interactive remove `rpm -qa virtualbox-guest-*` >/dev/null 2>&1 -# Add an online copy of the SLES DVD1 as a software repository, instead of the mounted DVD -zypper removerepo 'SUSE-Linux-Enterprise-Server-11-SP3 11.3.3-1.138' -zypper addrepo 'http://demeter.uni-regensburg.de/SLES11SP3-x86/DVD1/' 'SLES11SP3-x86 DVD1 Online' -zypper refresh diff --git a/templates/sles-11-sp3-i386/scripts/minimize.sh b/templates/sles-11-sp3-i386/scripts/minimize.sh deleted file mode 100644 index 3846a1d65..000000000 --- a/templates/sles-11-sp3-i386/scripts/minimize.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash -eux - -dd if=/dev/zero of=/EMPTY bs=1M -rm -f /EMPTY diff --git a/templates/sles-11-sp3-i386/scripts/sshd.sh b/templates/sles-11-sp3-i386/scripts/sshd.sh deleted file mode 100644 index c6e4f20a6..000000000 --- a/templates/sles-11-sp3-i386/scripts/sshd.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash -eux - -echo "UseDNS no" >> /etc/ssh/sshd_config diff --git a/templates/sles-11-sp3-i386/scripts/sudoers.sh b/templates/sles-11-sp3-i386/scripts/sudoers.sh deleted file mode 100644 index eb80f3f88..000000000 --- a/templates/sles-11-sp3-i386/scripts/sudoers.sh +++ /dev/null @@ -1,3 +0,0 @@ -# update sudoers - can't do this in autoinst.xml -echo -e "\nupdate sudoers ..." -echo -e "vagrant ALL=(ALL) NOPASSWD: ALL\n" >> /etc/sudoers diff --git a/templates/sles-11-sp3-i386/scripts/vagrant.sh b/templates/sles-11-sp3-i386/scripts/vagrant.sh deleted file mode 100644 index 72dd2f444..000000000 --- a/templates/sles-11-sp3-i386/scripts/vagrant.sh +++ /dev/null @@ -1,33 +0,0 @@ -#!/bin/bash -eux - -if [ -f /home/vagrant/.vbox_version ]; then - mkdir /tmp/vbox - VER=$(cat /home/vagrant/.vbox_version) - mount -o loop VBoxGuestAdditions_$VER.iso /tmp/vbox - sh /tmp/vbox/VBoxLinuxAdditions.run - umount /tmp/vbox - rmdir /tmp/vbox - rm *.iso -fi - -if [ -f /home/vagrant/.vmfusion_version ]; then - #Set Linux-specific paths and ISO filename - home_dir="/home/vagrant" - iso_name="linux.iso" - mount_point="/tmp/vmware-tools" - #Run install, unmount ISO and remove it - mkdir ${mount_point} - cd ${home_dir} - /bin/mount -o loop ${iso_name} ${mount_point} - tar zxf ${mount_point}/*.tar.gz && cd vmware-tools-distrib && ./vmware-install.pl --default - /bin/umount ${mount_point} - /bin/rm -rf ${home_dir}/${iso_name} ${home_dir}/vmware-tools-distrib - rmdir ${mount_point} -fi - -mkdir /home/vagrant/.ssh -wget --no-check-certificate \ - 'https://github.com/mitchellh/vagrant/raw/master/keys/vagrant.pub' \ - -O /home/vagrant/.ssh/authorized_keys -chown -R vagrant /home/vagrant/.ssh -chmod -R go-rwsx /home/vagrant/.ssh diff --git a/templates/sles-11-sp3-i386/template.json b/templates/sles-11-sp3-i386/template.json deleted file mode 100644 index 1a982d11d..000000000 --- a/templates/sles-11-sp3-i386/template.json +++ /dev/null @@ -1,97 +0,0 @@ -{ - "provisioners": [ - { - "type": "shell", - "scripts": [ - "scripts/vagrant.sh", - "scripts/sshd.sh", - "scripts/sudoers.sh", - "scripts/cleanup.sh", - "scripts/minimize.sh" - ], - "override": { - "virtualbox": { - "execute_command": "echo 'vagrant'|sudo -S sh '{{.Path}}'" - }, - "vmware": { - "execute_command": "echo 'vagrant'|sudo -S sh '{{.Path}}'" - } - } - } - ], - "builders": [ - { - "type": "virtualbox", - "boot_command": [ - "<esc><enter><wait>", - "linux netdevice=eth0 netsetup=dhcp install=cd:/<wait>", - " lang=en_US autoyast=http://{{ .HTTPIP }}:{{ .HTTPPort }}/autoinst.xml<wait>", - " textmode=1<wait>", - "<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": 40960, - "guest_os_type": "OpenSUSE_64", - "http_directory": "http", - "iso_checksum": "5c30a409fc8fb3343b4dc90d93ff2c89", - "iso_checksum_type": "md5", - "iso_url": "", - "ssh_username": "vagrant", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_wait_timeout": "10000s", - "shutdown_command": "echo '/sbin/halt -h -p' > shutdown.sh; echo 'vagrant'|sudo -S sh 'shutdown.sh'", - "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", - "virtualbox_version_file": ".vbox_version", - "vboxmanage": [ - [ - "modifyvm", - "{{.Name}}", - "--memory", - "480" - ], - [ - "modifyvm", - "{{.Name}}", - "--cpus", - "1" - ] - ], - "iso_md5": "5c30a409fc8fb3343b4dc90d93ff2c89" - }, - { - "type": "vmware", - "boot_command": [ - "<esc><enter><wait>", - "linux netdevice=eth0 netsetup=dhcp install=cd:/<wait>", - " lang=en_US autoyast=http://{{ .HTTPIP }}:{{ .HTTPPort }}/autoinst.xml<wait>", - " textmode=1<wait>", - "<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": 40960, - "guest_os_type": "opensuse-64", - "http_directory": "http", - "iso_checksum": "5c30a409fc8fb3343b4dc90d93ff2c89", - "iso_checksum_type": "md5", - "iso_url": "", - "ssh_username": "vagrant", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_wait_timeout": "10000s", - "shutdown_command": "echo '/sbin/halt -h -p' > shutdown.sh; echo 'vagrant'|sudo -S sh 'shutdown.sh'", - "vmx_data": { - "memsize": "480", - "numvcpus": "1", - "cpuid.coresPerSocket": "1" - }, - "iso_md5": "5c30a409fc8fb3343b4dc90d93ff2c89" - } - ], - "post-provisioner": [ - { - "type": "vagrant", - "output": "sles-11-sp3-i386-{{.Provisioner}}.box" - } - ] -} \ No newline at end of file diff --git a/templates/sles-11-sp3/http/autoinst.xml b/templates/sles-11-sp3/http/autoinst.xml deleted file mode 100644 index 9eca2bea0..000000000 --- a/templates/sles-11-sp3/http/autoinst.xml +++ /dev/null @@ -1,2569 +0,0 @@ -<?xml version="1.0"?> -<!DOCTYPE profile> -<profile xmlns="http://www.suse.com/1.0/yast2ns" xmlns:config="http://www.suse.com/1.0/configns"> - <add-on> - <add_on_products config:type="list"> - <listentry> - <media_url><![CDATA[http://demeter.uni-regensburg.de/SLE11SP3-SDK-x64/DVD1/]]></media_url> - <product>sle-sdk</product> - <product_dir>/</product_dir> - </listentry> - </add_on_products> - </add-on> - <bootloader> - <device_map config:type="list"> - <device_map_entry> - <firmware>hd0</firmware> - <linux>/dev/sda</linux> - </device_map_entry> - </device_map> - <global> - <activate>true</activate> - <boot_root>true</boot_root> - <default>SUSE Linux Enterprise Server 11 SP3 - 3.0.76-0.11</default> - <generic_mbr>true</generic_mbr> - <gfxmenu>/boot/message</gfxmenu> - <lines_cache_id>2</lines_cache_id> - <timeout config:type="integer">8</timeout> - </global> - <initrd_modules config:type="list"> - <initrd_module> - <module>ahci</module> - </initrd_module> - <initrd_module> - <module>ata_piix</module> - </initrd_module> - <initrd_module> - <module>ata_generic</module> - </initrd_module> - <initrd_module> - <module>jbd</module> - </initrd_module> - <initrd_module> - <module>mbcache</module> - </initrd_module> - <initrd_module> - <module>ext3</module> - </initrd_module> - </initrd_modules> - <loader_type>grub</loader_type> - <sections config:type="list"> - <section> - <append>resume=/dev/sda1 splash=silent crashkernel=128M-:64M showopts</append> - <image>(hd0,1)/boot/vmlinuz-3.0.76-0.11-default</image> - <initial>1</initial> - <initrd>(hd0,1)/boot/initrd-3.0.76-0.11-default</initrd> - <lines_cache_id>0</lines_cache_id> - <name>SUSE Linux Enterprise Server 11 SP3 - 3.0.76-0.11</name> - <original_name>linux</original_name> - <root>/dev/sda2</root> - <type>image</type> - <vgamode>0x314</vgamode> - </section> - <section> - <append>showopts ide=nodma apm=off noresume edd=off powersaved=off nohz=off highres=off processor.max_cstate=1 nomodeset x11failsafe</append> - <image>(hd0,1)/boot/vmlinuz-3.0.76-0.11-default</image> - <initrd>(hd0,1)/boot/initrd-3.0.76-0.11-default</initrd> - <lines_cache_id>1</lines_cache_id> - <name>Failsafe -- SUSE Linux Enterprise Server 11 SP3 - 3.0.76-0.11</name> - <original_name>failsafe</original_name> - <root>/dev/sda2</root> - <type>image</type> - <vgamode>0x314</vgamode> - </section> - </sections> - </bootloader> - <ca_mgm> - <CAName>YaST_Default_CA</CAName> - <ca_commonName>YaST Default CA (vagrant-sles-11sp3-x64)</ca_commonName> - <country>US</country> - <locality></locality> - <organisation></organisation> - <organisationUnit></organisationUnit> - <password>ENTER PASSWORD HERE</password> - <server_commonName>vagrant-sles-11sp3-x64.vagrantup.com</server_commonName> - <server_email>postmaster@vagrantup.com</server_email> - <state></state> - <takeLocalServerName config:type="boolean">false</takeLocalServerName> - </ca_mgm> - <deploy_image> - <image_installation config:type="boolean">false</image_installation> - </deploy_image> - <general> - <ask-list config:type="list"/> - <mode> - <confirm config:type="boolean">false</confirm> - </mode> - <mouse> - <id>none</id> - </mouse> - <proposals config:type="list"/> - <signature-handling> - <accept_file_without_checksum config:type="boolean">true</accept_file_without_checksum> - <accept_non_trusted_gpg_key config:type="boolean">true</accept_non_trusted_gpg_key> - <accept_unknown_gpg_key config:type="boolean">true</accept_unknown_gpg_key> - <accept_unsigned_file config:type="boolean">true</accept_unsigned_file> - <accept_verification_failed config:type="boolean">false</accept_verification_failed> - <import_gpg_key config:type="boolean">true</import_gpg_key> - </signature-handling> - <storage/> - </general> - <groups config:type="list"> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>100</gid> - <group_password>x</group_password> - <groupname>users</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>19</gid> - <group_password>x</group_password> - <groupname>floppy</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>1</gid> - <group_password>x</group_password> - <groupname>bin</groupname> - <userlist>daemon</userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>41</gid> - <group_password>x</group_password> - <groupname>xok</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>65533</gid> - <group_password>x</group_password> - <groupname>nobody</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>43</gid> - <group_password>x</group_password> - <groupname>modem</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>5</gid> - <group_password>x</group_password> - <groupname>tty</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>7</gid> - <group_password>x</group_password> - <groupname>lp</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>104</gid> - <group_password>!</group_password> - <groupname>uuidd</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>51</gid> - <group_password>!</group_password> - <groupname>postfix</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>112</gid> - <group_password>!</group_password> - <groupname>gdm</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>65534</gid> - <group_password>x</group_password> - <groupname>nogroup</groupname> - <userlist>nobody</userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>101</gid> - <group_password>!</group_password> - <groupname>messagebus</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>59</gid> - <group_password>!</group_password> - <groupname>maildrop</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>33</gid> - <group_password>x</group_password> - <groupname>video</groupname> - <userlist>vagrant</userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>3</gid> - <group_password>x</group_password> - <groupname>sys</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>15</gid> - <group_password>x</group_password> - <groupname>shadow</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>20</gid> - <group_password>x</group_password> - <groupname>cdrom</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>21</gid> - <group_password>x</group_password> - <groupname>console</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>42</gid> - <group_password>x</group_password> - <groupname>trusted</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>102</gid> - <group_password>!</group_password> - <groupname>haldaemon</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>106</gid> - <group_password>!</group_password> - <groupname>puppet</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>16</gid> - <group_password>x</group_password> - <groupname>dialout</groupname> - <userlist>vagrant</userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>107</gid> - <group_password>!</group_password> - <groupname>polkituser</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>10</gid> - <group_password>x</group_password> - <groupname>wheel</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>109</gid> - <group_password>!</group_password> - <groupname>pulse</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>8</gid> - <group_password>x</group_password> - <groupname>www</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>40</gid> - <group_password>x</group_password> - <groupname>games</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>6</gid> - <group_password>x</group_password> - <groupname>disk</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>17</gid> - <group_password>x</group_password> - <groupname>audio</groupname> - <userlist>pulse</userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>111</gid> - <group_password>!</group_password> - <groupname>suse-ncc</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>49</gid> - <group_password>x</group_password> - <groupname>ftp</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>103</gid> - <group_password>!</group_password> - <groupname>tape</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>25</gid> - <group_password>!</group_password> - <groupname>at</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>9</gid> - <group_password>x</group_password> - <groupname>kmem</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>32</gid> - <group_password>x</group_password> - <groupname>public</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>12</gid> - <group_password>x</group_password> - <groupname>mail</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>0</gid> - <group_password>x</group_password> - <groupname>root</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>2</gid> - <group_password>x</group_password> - <groupname>daemon</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>105</gid> - <group_password>!</group_password> - <groupname>sfcb</groupname> - <userlist>root</userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>108</gid> - <group_password>!</group_password> - <groupname>ntp</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>14</gid> - <group_password>x</group_password> - <groupname>uucp</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>110</gid> - <group_password>!</group_password> - <groupname>pulse-access</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>71</gid> - <group_password>!</group_password> - <groupname>ntadmin</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>62</gid> - <group_password>x</group_password> - <groupname>man</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>22</gid> - <group_password>x</group_password> - <groupname>utmp</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>13</gid> - <group_password>x</group_password> - <groupname>news</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>65</gid> - <group_password>!</group_password> - <groupname>sshd</groupname> - <userlist></userlist> - </group> - </groups> - <host> - <hosts config:type="list"> - <hosts_entry> - <host_address>127.0.0.1</host_address> - <names config:type="list"> - <name>localhost</name> - </names> - </hosts_entry> - <hosts_entry> - <host_address>::1</host_address> - <names config:type="list"> - <name>localhost ipv6-localhost ipv6-loopback</name> - </names> - </hosts_entry> - <hosts_entry> - <host_address>fe00::0</host_address> - <names config:type="list"> - <name>ipv6-localnet</name> - </names> - </hosts_entry> - <hosts_entry> - <host_address>ff00::0</host_address> - <names config:type="list"> - <name>ipv6-mcastprefix</name> - </names> - </hosts_entry> - <hosts_entry> - <host_address>ff02::1</host_address> - <names config:type="list"> - <name>ipv6-allnodes</name> - </names> - </hosts_entry> - <hosts_entry> - <host_address>ff02::2</host_address> - <names config:type="list"> - <name>ipv6-allrouters</name> - </names> - </hosts_entry> - <hosts_entry> - <host_address>ff02::3</host_address> - <names config:type="list"> - <name>ipv6-allhosts</name> - </names> - </hosts_entry> - </hosts> - </host> - <login_settings/> - <networking> - <dhcp_options> - <dhclient_client_id></dhclient_client_id> - <dhclient_hostname_option>AUTO</dhclient_hostname_option> - </dhcp_options> - <dns> - <dhcp_hostname config:type="boolean">false</dhcp_hostname> - <domain>vagrantup.com</domain> - <hostname>vagrant-sles-11sp3-x64</hostname> - <resolv_conf_policy>auto</resolv_conf_policy> - <searchlist config:type="list"> - <search>vagrantup.com</search> - </searchlist> - <write_hostname config:type="boolean">true</write_hostname> - </dns> - <interfaces config:type="list"> - <interface> - <bootproto>dhcp</bootproto> - <device>eth0</device> - <name>82540EM Gigabit Ethernet Controller</name> - <startmode>auto</startmode> - <usercontrol>no</usercontrol> - </interface> - </interfaces> - <managed config:type="boolean">false</managed> - <net-udev config:type="list"> - <rule> - <name>eth0</name> - <rule>KERNELS</rule> - <value>0000:00:03.0</value> - </rule> - </net-udev> - <routing> - <ip_forward config:type="boolean">false</ip_forward> - </routing> - </networking> - <partitioning config:type="list"> - <drive> - <device>/dev/sda</device> - <initialize config:type="boolean">true</initialize> - <partitions config:type="list"> - <partition> - <create config:type="boolean">true</create> - <crypt_fs config:type="boolean">false</crypt_fs> - <filesystem config:type="symbol">swap</filesystem> - <format config:type="boolean">true</format> - <fstopt>defaults</fstopt> - <loop_fs config:type="boolean">false</loop_fs> - <mount>swap</mount> - <mountby config:type="symbol">device</mountby> - <partition_id config:type="integer">130</partition_id> - <partition_nr config:type="integer">1</partition_nr> - <raid_options/> - <resize config:type="boolean">false</resize> - <size>1561492992</size> - </partition> - <partition> - <create config:type="boolean">true</create> - <crypt_fs config:type="boolean">false</crypt_fs> - <filesystem config:type="symbol">ext3</filesystem> - <format config:type="boolean">true</format> - <fstopt>acl,user_xattr</fstopt> - <loop_fs config:type="boolean">false</loop_fs> - <mount>/</mount> - <mountby config:type="symbol">device</mountby> - <partition_id config:type="integer">131</partition_id> - <partition_nr config:type="integer">2</partition_nr> - <raid_options/> - <resize config:type="boolean">false</resize> - <size>19895844352</size> - </partition> - </partitions> - <pesize></pesize> - <type config:type="symbol">CT_DISK</type> - <use>all</use> - </drive> - </partitioning> - <report> - <errors> - <log config:type="boolean">true</log> - <show config:type="boolean">true</show> - <timeout config:type="integer">0</timeout> - </errors> - <messages> - <log config:type="boolean">true</log> - <show config:type="boolean">true</show> - <timeout config:type="integer">0</timeout> - </messages> - <warnings> - <log config:type="boolean">true</log> - <show config:type="boolean">true</show> - <timeout config:type="integer">0</timeout> - </warnings> - <yesno_messages> - <log config:type="boolean">true</log> - <show config:type="boolean">true</show> - <timeout config:type="integer">0</timeout> - </yesno_messages> - </report> - <software> - - <packages config:type="list"> - <package>desktop-translations</package> - <package>gconf2-branding-SLES</package> - <package>libproxy0-config-gnome</package> - <package>sle-sdk-release</package> - <package>sle-sdk-release-SDK</package> - <package>sles-manuals_en</package> - <package>yast2-trans-en_US</package> - </packages> - <patterns config:type="list"> - <pattern>Basis-Devel</pattern> - <pattern>Minimal</pattern> - <pattern>apparmor</pattern> - <pattern>base</pattern> - <pattern>sdk_kernel</pattern> - </patterns> - <remove-packages config:type="list"> - <package>3ddiag</package> - <package>CASA</package> - <package>CASA-devel</package> - <package>CASA_auth_token_client</package> - <package>CASA_auth_token_client-devel</package> - <package>ConsoleKit-devel</package> - <package>ConsoleKit-x11</package> - <package>DirectFB-devel</package> - <package>FastCGI</package> - <package>IlmBase</package> - <package>IlmBase-devel</package> - <package>ImageMagick</package> - <package>ImageMagick-devel</package> - <package>LibVNCServer</package> - <package>LibVNCServer-devel</package> - <package>Mesa</package> - <package>Mesa-devel</package> - <package>ModemManager</package> - <package>Modules</package> - <package>NetworkManager</package> - <package>NetworkManager-devel</package> - <package>NetworkManager-glib</package> - <package>NetworkManager-gnome</package> - <package>NetworkManager-kde4</package> - <package>NetworkManager-kde4-lang</package> - <package>NetworkManager-kde4-libs</package> - <package>OpenEXR</package> - <package>OpenEXR-devel</package> - <package>OpenIPMI-devel</package> - <package>PackageKit</package> - <package>PackageKit-devel</package> - <package>PackageKit-lang</package> - <package>PolicyKit-devel</package> - <package>PolicyKit-gnome</package> - <package>PolicyKit-gnome-devel</package> - <package>PolicyKit-gnome-libs</package> - <package>SDL-devel</package> - <package>SDL_net</package> - <package>SDL_net-devel</package> - <package>TeX-Guy</package> - <package>TeX-Guy-devel</package> - <package>VFlib3</package> - <package>VFlib3-devel</package> - <package>WindowMaker</package> - <package>WindowMaker-devel</package> - <package>a2ps</package> - <package>aalib</package> - <package>aalib-devel</package> - <package>akonadi-runtime</package> - <package>akregator</package> - <package>alsa-devel</package> - <package>alsa-firmware</package> - <package>alsa-plugins-pulse</package> - <package>alsa-tools</package> - <package>alsa-tools-devel</package> - <package>anthy</package> - <package>anthy-devel</package> - <package>antlr</package> - <package>apache2</package> - <package>apache2-devel</package> - <package>apache2-mod_perl</package> - <package>apache2-mod_perl-devel</package> - <package>apache2-prefork</package> - <package>apache2-utils</package> - <package>apache2-worker</package> - <package>apparmor-profile-editor</package> - <package>art-sharp2</package> - <package>arts</package> - <package>arts-devel</package> - <package>aspell-devel</package> - <package>at-spi</package> - <package>at-spi-devel</package> - <package>at-spi-lang</package> - <package>atk-devel</package> - <package>audiofile</package> - <package>audiofile-devel</package> - <package>audit-devel</package> - <package>augeas-lenses</package> - <package>automoc4</package> - <package>avahi</package> - <package>avahi-compat-howl-devel</package> - <package>avahi-compat-mDNSResponder-devel</package> - <package>avahi-lang</package> - <package>babl-0_0</package> - <package>banshee-1</package> - <package>banshee-1-backend-engine-gstreamer</package> - <package>banshee-1-backend-platform-gnome</package> - <package>banshee-1-backend-platform-unix</package> - <package>banshee-1-devel</package> - <package>banshee-1-extensions-default</package> - <package>banshee-1-lang</package> - <package>beagle-devel</package> - <package>bind-devel</package> - <package>binutils-devel</package> - <package>bluez</package> - <package>bluez-devel</package> - <package>boo</package> - <package>boo-devel</package> - <package>boost-devel</package> - <package>bootsplash-branding-SLED</package> - <package>cairo-devel</package> - <package>cairomm</package> - <package>cairomm-devel</package> - <package>canna</package> - <package>canna-devel</package> - <package>canna-libs</package> - <package>cannadic</package> - <package>capi4linux</package> - <package>capi4linux-devel</package> - <package>cdk</package> - <package>cdk-devel</package> - <package>cdrdao</package> - <package>chasen</package> - <package>chasen-devel</package> - <package>check</package> - <package>check-devel</package> - <package>chmlib</package> - <package>chmlib-devel</package> - <package>cim-schema</package> - <package>clucene-core</package> - <package>clucene-core-devel</package> - <package>cmake</package> - <package>compiz</package> - <package>compiz-branding-SLE</package> - <package>compiz-devel</package> - <package>compiz-gnome</package> - <package>coolkey-devel</package> - <package>cracklib-devel</package> - <package>crash-devel</package> - <package>crimson</package> - <package>cscope</package> - <package>cups</package> - <package>cups-devel</package> - <package>cvsps</package> - <package>cyrus-imapd-devel</package> - <package>cyrus-sasl-crammd5</package> - <package>cyrus-sasl-devel</package> - <package>dante</package> - <package>dante-devel</package> - <package>db1</package> - <package>db1-devel</package> - <package>db43</package> - <package>db43-devel</package> - <package>dbus-1-devel</package> - <package>dbus-1-glib-devel</package> - <package>dbus-1-python-devel</package> - <package>dbus-1-qt3</package> - <package>dbus-1-qt3-devel</package> - <package>dbus-1-x11</package> - <package>dejagnu</package> - <package>dejavu</package> - <package>desktop-data-openSUSE</package> - <package>desktop-file-utils</package> - <package>devhelp</package> - <package>devhelp-devel</package> - <package>devhelp-lang</package> - <package>device-mapper-devel</package> - <package>dhcp</package> - <package>dhcp-client</package> - <package>dhcp-devel</package> - <package>diffstat</package> - <package>dmapi-devel</package> - <package>dnsmasq</package> - <package>docbook-xsl-stylesheets</package> - <package>docbook_4</package> - <package>doxygen</package> - <package>dvd+rw-tools</package> - <package>e2fsprogs-devel</package> - <package>emacs</package> - <package>emacs-nox</package> - <package>emacs-x11</package> - <package>enchant</package> - <package>enchant-devel</package> - <package>enscript</package> - <package>eog</package> - <package>eog-devel</package> - <package>eog-lang</package> - <package>espeak</package> - <package>evince</package> - <package>evince-devel</package> - <package>evince-lang</package> - <package>evoldap2-devel</package> - <package>evolution</package> - <package>evolution-data-server</package> - <package>evolution-data-server-devel</package> - <package>evolution-data-server-lang</package> - <package>evolution-devel</package> - <package>evolution-lang</package> - <package>expect-devel</package> - <package>facter</package> - <package>fam</package> - <package>fam-devel</package> - <package>farsight</package> - <package>farsight-devel</package> - <package>festival</package> - <package>festival-devel</package> - <package>fftw</package> - <package>fftw-devel</package> - <package>fftw-mpi</package> - <package>fftw-mpi-devel</package> - <package>fftw-threads</package> - <package>fftw-threads-devel</package> - <package>fftw3</package> - <package>fftw3-devel</package> - <package>fftw3-threads</package> - <package>fftw3-threads-devel</package> - <package>file-devel</package> - <package>fileshareset</package> - <package>finch</package> - <package>finch-devel</package> - <package>flac-devel</package> - <package>fltk</package> - <package>fltk-devel</package> - <package>fontconfig-devel</package> - <package>fonts-config</package> - <package>foomatic-filters</package> - <package>freeglut</package> - <package>freeglut-devel</package> - <package>freeradius-client-devel</package> - <package>freeradius-client-libs</package> - <package>freeradius-server-devel</package> - <package>freeradius-server-libs</package> - <package>freetype</package> - <package>freetype2-devel</package> - <package>fribidi</package> - <package>fribidi-devel</package> - <package>ft2demos</package> - <package>fuse-devel</package> - <package>fwnn-devel</package> - <package>fxload</package> - <package>gcc-gij</package> - <package>gcc-java</package> - <package>gcc43-gij</package> - <package>gcc43-java</package> - <package>gconf-sharp2</package> - <package>gconf2-devel</package> - <package>gconfmm</package> - <package>gconfmm-devel</package> - <package>gd</package> - <package>gd-devel</package> - <package>gdbm-32bit</package> - <package>gdk-pixbuf</package> - <package>gdk-pixbuf-devel</package> - <package>gegl-0_0</package> - <package>gettext-tools</package> - <package>gfxboot-branding-SLED</package> - <package>gfxboot-devel</package> - <package>ggz</package> - <package>ggz-client-libs</package> - <package>ggz-client-libs-devel</package> - <package>ggz-client-libs-lang</package> - <package>ghex</package> - <package>ghex-devel</package> - <package>ghex-lang</package> - <package>ghostscript-devel</package> - <package>ghostscript-fonts-other</package> - <package>ghostscript-fonts-std</package> - <package>ghostscript-ijs-devel</package> - <package>ghostscript-library</package> - <package>ghostscript-omni</package> - <package>ghostscript-x11</package> - <package>giflib-devel</package> - <package>gimp</package> - <package>gimp-branding-SLED</package> - <package>gimp-devel</package> - <package>gimp-lang</package> - <package>gimp-plugins-python</package> - <package>git</package> - <package>git-arch</package> - <package>git-core</package> - <package>git-cvs</package> - <package>git-daemon</package> - <package>git-email</package> - <package>git-gui</package> - <package>git-svn</package> - <package>git-web</package> - <package>gitk</package> - <package>gjdoc</package> - <package>glade-sharp2</package> - <package>glade3</package> - <package>glade3-lang</package> - <package>glib</package> - <package>glib-devel</package> - <package>glib-sharp2</package> - <package>glib2-devel</package> - <package>glibmm2</package> - <package>glibmm2-devel</package> - <package>glitz</package> - <package>glitz-devel</package> - <package>gltt</package> - <package>gltt-devel</package> - <package>gmime-2_4-devel</package> - <package>gmime-devel</package> - <package>gmp-devel</package> - <package>gnet</package> - <package>gnet-devel</package> - <package>gnokii</package> - <package>gnokii-devel</package> - <package>gnokii-smsd</package> - <package>gnome-certauth-devel</package> - <package>gnome-control-center</package> - <package>gnome-control-center-devel</package> - <package>gnome-control-center-lang</package> - <package>gnome-desktop</package> - <package>gnome-desktop-devel</package> - <package>gnome-desktop-lang</package> - <package>gnome-doc-utils</package> - <package>gnome-doc-utils-devel</package> - <package>gnome-doc-utils-lang</package> - <package>gnome-keyring-devel</package> - <package>gnome-keyring-sharp</package> - <package>gnome-keyring-sharp-devel</package> - <package>gnome-libs</package> - <package>gnome-libs-devel</package> - <package>gnome-mag</package> - <package>gnome-mag-devel</package> - <package>gnome-mag-lang</package> - <package>gnome-main-menu</package> - <package>gnome-main-menu-lang</package> - <package>gnome-media</package> - <package>gnome-media-devel</package> - <package>gnome-media-lang</package> - <package>gnome-menus</package> - <package>gnome-menus-branding-SLED</package> - <package>gnome-menus-devel</package> - <package>gnome-menus-lang</package> - <package>gnome-mount</package> - <package>gnome-mount-lang</package> - <package>gnome-panel</package> - <package>gnome-panel-devel</package> - <package>gnome-panel-lang</package> - <package>gnome-pilot</package> - <package>gnome-pilot-devel</package> - <package>gnome-pilot-lang</package> - <package>gnome-settings-daemon</package> - <package>gnome-settings-daemon-devel</package> - <package>gnome-settings-daemon-lang</package> - <package>gnome-sharp2</package> - <package>gnome-speech</package> - <package>gnome-speech-devel</package> - <package>gnome-themes</package> - <package>gnome-utils</package> - <package>gnome-utils-devel</package> - <package>gnome-utils-lang</package> - <package>gnome-vfs-sharp2</package> - <package>gnome-vfs2</package> - <package>gnome-vfs2-devel</package> - <package>gnome-vfs2-lang</package> - <package>gnome-vfsmm</package> - <package>gnome-vfsmm-devel</package> - <package>gnopernicus</package> - <package>gnopernicus-devel</package> - <package>gnopernicus-lang</package> - <package>gnutls</package> - <package>goffice</package> - <package>goffice-devel</package> - <package>goffice-lang</package> - <package>goocanvas</package> - <package>goocanvas-devel</package> - <package>goocanvas-lang</package> - <package>goom2k4</package> - <package>goom2k4-devel</package> - <package>graphviz</package> - <package>graphviz-devel</package> - <package>graphviz-gd</package> - <package>graphviz-gnome</package> - <package>gstreamer-0_10</package> - <package>gstreamer-0_10-devel</package> - <package>gstreamer-0_10-lang</package> - <package>gstreamer-0_10-plugins-base</package> - <package>gstreamer-0_10-plugins-base-devel</package> - <package>gstreamer-0_10-plugins-base-lang</package> - <package>gstreamer-0_10-plugins-good</package> - <package>gstreamer-0_10-plugins-good-lang</package> - <package>gstreamer-0_10-utils</package> - <package>gstreamer-utils</package> - <package>gtk</package> - <package>gtk-devel</package> - <package>gtk-lang</package> - <package>gtk-sharp2</package> - <package>gtk-vnc-devel</package> - <package>gtk2-devel</package> - <package>gtkglext</package> - <package>gtkglext-devel</package> - <package>gtkhtml2</package> - <package>gtkhtml2-devel</package> - <package>gtkhtml2-lang</package> - <package>gtkhtml314-sharp</package> - <package>gtkmm2</package> - <package>gtkmm2-devel</package> - <package>gtksourceview-devel</package> - <package>gtksourceview-lang</package> - <package>gtksourceview18</package> - <package>gtksourceview18-devel</package> - <package>gtkspell</package> - <package>gtkspell-devel</package> - <package>gtkspell-lang</package> - <package>gucharmap</package> - <package>gucharmap-devel</package> - <package>gucharmap-lang</package> - <package>guile</package> - <package>guile-devel</package> - <package>gutenprint</package> - <package>gutenprint-devel</package> - <package>gvfs-devel</package> - <package>gxmhtml</package> - <package>hal-devel</package> - <package>hal-palm</package> - <package>htdig</package> - <package>htdig-devel</package> - <package>hunspell</package> - <package>hunspell-devel</package> - <package>hunspell-tools</package> - <package>hwinfo-devel</package> - <package>i4l-base</package> - <package>icewm</package> - <package>icewm-lite</package> - <package>id3lib</package> - <package>id3lib-devel</package> - <package>imap-devel</package> - <package>imap-lib</package> - <package>imlib</package> - <package>imlib-devel</package> - <package>imlib2</package> - <package>imlib2-devel</package> - <package>indent</package> - <package>info2html</package> - <package>inn</package> - <package>inn-devel</package> - <package>intltool</package> - <package>ipadic</package> - <package>iptables-devel</package> - <package>iso-codes</package> - <package>iso-codes-devel</package> - <package>iso_ent</package> - <package>ispell</package> - <package>ispell-american</package> - <package>ispell-brazilian</package> - <package>ispell-british</package> - <package>ispell-czech</package> - <package>ispell-danish</package> - <package>ispell-finnish</package> - <package>ispell-french</package> - <package>ispell-german</package> - <package>ispell-hungarian</package> - <package>ispell-italian</package> - <package>ispell-ngerman</package> - <package>ispell-norsk</package> - <package>ispell-polish</package> - <package>ispell-portuguese</package> - <package>ispell-russian</package> - <package>ispell-slovak</package> - <package>ispell-spanish</package> - <package>ispell-swedish</package> - <package>itcl-devel</package> - <package>java-1_4_2-ibm</package> - <package>java-1_4_2-ibm-devel</package> - <package>java-1_5_0-gcj-compat</package> - <package>java-1_5_0-gcj-compat-devel</package> - <package>java-1_6_0-ibm</package> - <package>java-1_6_0-ibm-devel</package> - <package>joe</package> - <package>jpackage-utils</package> - <package>k3b</package> - <package>k3b-devel</package> - <package>k3b-lang</package> - <package>kaddressbook</package> - <package>kalarm</package> - <package>kde-susetranslations</package> - <package>kde4-filesystem</package> - <package>kde4-kgreeter-plugins</package> - <package>kdebase3</package> - <package>kdebase3-devel</package> - <package>kdebase3-runtime</package> - <package>kdebase4-SLED</package> - <package>kdebase4-SLED-lang</package> - <package>kdebase4-runtime</package> - <package>kdebase4-runtime-branding-SLED</package> - <package>kdebase4-workspace</package> - <package>kdebase4-workspace-branding-SLED</package> - <package>kdebase4-workspace-devel</package> - <package>kdebase4-workspace-ksysguardd</package> - <package>kdelibs3</package> - <package>kdelibs3-arts</package> - <package>kdelibs3-default-style</package> - <package>kdelibs3-devel</package> - <package>kdelibs3-doc</package> - <package>kdelibs4</package> - <package>kdelibs4-branding-SLED</package> - <package>kdelibs4-core</package> - <package>kdelibs4-doc</package> - <package>kdemultimedia3-arts</package> - <package>kdepim3</package> - <package>kdepim4</package> - <package>kdepim4-devel</package> - <package>kdepimlibs4</package> - <package>kdialog</package> - <package>kdm</package> - <package>kdm-branding-SLED</package> - <package>kernel-docs</package> - <package>kernel-syms</package> - <package>kernel-trace-devel</package> - <package>kernel-xen-devel</package> - <package>keyutils-devel</package> - <package>kio_sysinfo</package> - <package>kio_sysinfo-branding-SLED</package> - <package>kmail</package> - <package>knode</package> - <package>kontact</package> - <package>korganizer</package> - <package>kpilot</package> - <package>krb5-devel</package> - <package>ksh-devel</package> - <package>ktorrent</package> - <package>ktorrent-devel</package> - <package>ktorrent-lang</package> - <package>kwin</package> - <package>ladspa-devel</package> - <package>lib3ds-1-3</package> - <package>lib3ds-devel</package> - <package>libFLAC++6</package> - <package>libFLAC8</package> - <package>libHX-devel</package> - <package>libMagick++-devel</package> - <package>libMagick++1</package> - <package>libMagickWand1</package> - <package>libQtWebKit-devel</package> - <package>libQtWebKit4</package> - <package>libXerces-c-devel</package> - <package>libXerces-c28</package> - <package>libXiterm</package> - <package>libXiterm-devel</package> - <package>libacl-devel</package> - <package>libadns-devel</package> - <package>libadns1</package> - <package>libakode</package> - <package>libakode-devel</package> - <package>libakonadi4</package> - <package>libakonadiprotocolinternals-devel</package> - <package>libakonadiprotocolinternals1</package> - <package>libao</package> - <package>libao-devel</package> - <package>libapparmor-devel</package> - <package>libapr-util1</package> - <package>libapr-util1-devel</package> - <package>libapr1</package> - <package>libapr1-devel</package> - <package>libarchive-devel</package> - <package>libart_lgpl</package> - <package>libart_lgpl-devel</package> - <package>libassuan-devel</package> - <package>libatomic-ops-devel</package> - <package>libattr-devel</package> - <package>libavahi-core5</package> - <package>libavahi-devel</package> - <package>libavahi-glib-devel</package> - <package>libavahi-gobject-devel</package> - <package>libavahi-gobject0</package> - <package>libavahi-ui0</package> - <package>libavc1394-0</package> - <package>libavc1394-devel</package> - <package>libbabl-0_0-0</package> - <package>libbeagle-devel</package> - <package>libbeagle-python</package> - <package>libbeagle1</package> - <package>libbitmask-devel</package> - <package>libbitmask1</package> - <package>libblkid-devel</package> - <package>libblocxx-devel</package> - <package>libbonobo</package> - <package>libbonobo-devel</package> - <package>libbonobo-lang</package> - <package>libbonoboui</package> - <package>libbonoboui-devel</package> - <package>libbonoboui-lang</package> - <package>libboost_date_time1_36_0</package> - <package>libboost_filesystem1_36_0</package> - <package>libboost_graph1_36_0</package> - <package>libboost_iostreams1_36_0</package> - <package>libboost_math1_36_0</package> - <package>libboost_mpi1_36_0</package> - <package>libboost_program_options1_36_0</package> - <package>libboost_python1_36_0</package> - <package>libboost_serialization1_36_0</package> - <package>libboost_signals1_36_0</package> - <package>libboost_system1_36_0</package> - <package>libboost_test1_36_0</package> - <package>libboost_thread1_36_0</package> - <package>libboost_wave1_36_0</package> - <package>libbotan-1_6_4</package> - <package>libbotan-devel</package> - <package>libbtctl</package> - <package>libbtctl-devel</package> - <package>libbtctl-lang</package> - <package>libbtctl4</package> - <package>libbz2-devel</package> - <package>libcaca</package> - <package>libcaca-devel</package> - <package>libcanberra-gtk</package> - <package>libcanberra-gtk0</package> - <package>libcanberra0</package> - <package>libcap-devel</package> - <package>libcap-ng0</package> - <package>libcdda_interface0</package> - <package>libcdda_paranoia0</package> - <package>libcddb-devel</package> - <package>libcddb2</package> - <package>libcdio++0</package> - <package>libcdio-devel</package> - <package>libcgroup-devel</package> - <package>libcgroup1</package> - <package>libchewing</package> - <package>libchewing-devel</package> - <package>libcmpiutil</package> - <package>libcmpiutil-devel</package> - <package>libcolorblind0</package> - <package>libcom_err-devel</package> - <package>libcompizconfig</package> - <package>libcompizconfig-devel</package> - <package>libcppunit-1_12-0</package> - <package>libcppunit-devel</package> - <package>libcpuset-devel</package> - <package>libcpuset1</package> - <package>libcroco</package> - <package>libcroco-0_6-3</package> - <package>libcroco-devel</package> - <package>libcryptsetup-devel</package> - <package>libcsync-devel</package> - <package>libcsync0</package> - <package>libcurl-devel</package> - <package>libdaemon-devel</package> - <package>libdaemon0</package> - <package>libdatrie-devel</package> - <package>libdatrie0</package> - <package>libdb-4_5-32bit</package> - <package>libdb-4_5-devel</package> - <package>libdbus-1-qt3-0</package> - <package>libdbus-1-qt3-0-devel</package> - <package>libdc1394-22</package> - <package>libdc1394-devel</package> - <package>libdc1394_control12</package> - <package>libdc1394_control12-devel</package> - <package>libdhcp6client-1_0-2</package> - <package>libdhcp6client-devel</package> - <package>libdigikam-devel</package> - <package>libdiscid1</package> - <package>libdjvulibre-devel</package> - <package>libdjvulibre21</package> - <package>libdmxview-devel</package> - <package>libdmxview0</package> - <package>libdnet-devel</package> - <package>libdnet1</package> - <package>libdns_sd</package> - <package>libdrm</package> - <package>libdrm-devel</package> - <package>libdv-devel</package> - <package>libdv4</package> - <package>libdvdread4</package> - <package>libdw-devel</package> - <package>libebl-devel</package> - <package>libedit-devel</package> - <package>libedit0</package> - <package>libelf-devel</package> - <package>libenchant1</package> - <package>libesd-devel</package> - <package>libesd0</package> - <package>libesmtp-devel</package> - <package>libevoldap-2_4-2</package> - <package>libevtlog-devel</package> - <package>libevtlog0</package> - <package>libexempi-devel</package> - <package>libexempi3</package> - <package>libexif-devel</package> - <package>libexiv2-4</package> - <package>libexiv2-devel</package> - <package>libexpat-devel</package> - <package>libext2fs-devel</package> - <package>libfarsight-0_1-3</package> - <package>libffi-devel</package> - <package>libffi43</package> - <package>libffi43-devel</package> - <package>libflaim-devel</package> - <package>libfprint-devel</package> - <package>libfreebl3</package> - <package>libfreebob</package> - <package>libfreebob-devel</package> - <package>libgadu</package> - <package>libgadu-devel</package> - <package>libgail-gnome</package> - <package>libgail-gnome-devel</package> - <package>libgcj-devel</package> - <package>libgcj43</package> - <package>libgcj43-devel</package> - <package>libgcj43-jar</package> - <package>libgcj_bc43</package> - <package>libgcrypt-devel</package> - <package>libgda-3_0-3</package> - <package>libgda-3_0-devel</package> - <package>libgdiplus0</package> - <package>libgegl-0_0-0</package> - <package>libgeoclue0</package> - <package>libgfortran46</package> - <package>libggz2</package> - <package>libggz2-devel</package> - <package>libgimpprint</package> - <package>libgimpprint-devel</package> - <package>libglade2</package> - <package>libglade2-devel</package> - <package>libglademm</package> - <package>libglademm-2_4-1</package> - <package>libglademm-devel</package> - <package>libgladeui-1-9</package> - <package>libgladeui-1_0-devel</package> - <package>libgmime-2_0-3</package> - <package>libgmime-2_4-2</package> - <package>libgmm++-devel</package> - <package>libgnome</package> - <package>libgnome-certauth0</package> - <package>libgnome-desktop-2-11</package> - <package>libgnome-devel</package> - <package>libgnome-lang</package> - <package>libgnome-menu2</package> - <package>libgnome-window-settings1</package> - <package>libgnomecanvas</package> - <package>libgnomecanvas-devel</package> - <package>libgnomecanvas-lang</package> - <package>libgnomecanvasmm</package> - <package>libgnomecanvasmm-devel</package> - <package>libgnomecups</package> - <package>libgnomecups-devel</package> - <package>libgnomecups-lang</package> - <package>libgnomedb</package> - <package>libgnomedb-devel</package> - <package>libgnomedb-lang</package> - <package>libgnomekbd</package> - <package>libgnomekbd-devel</package> - <package>libgnomekbd-lang</package> - <package>libgnomeprint</package> - <package>libgnomeprint-devel</package> - <package>libgnomeprint-lang</package> - <package>libgnomeprintui</package> - <package>libgnomeprintui-devel</package> - <package>libgnomeprintui-lang</package> - <package>libgnomesu</package> - <package>libgnomesu-devel</package> - <package>libgnomesu-lang</package> - <package>libgnomesu0</package> - <package>libgnomeui</package> - <package>libgnomeui-devel</package> - <package>libgnomeui-lang</package> - <package>libgnomevfsmm-2_6-1</package> - <package>libgnutls-devel</package> - <package>libgnutls-extra-devel</package> - <package>libgnutls-extra26</package> - <package>libgoocanvas3</package> - <package>libgpg-error-devel</package> - <package>libgpgme-devel</package> - <package>libgphoto2-devel</package> - <package>libgpod-devel</package> - <package>libgsf</package> - <package>libgsf-1-114</package> - <package>libgsf-devel</package> - <package>libgsf-gnome</package> - <package>libgsm-devel</package> - <package>libgsm1</package> - <package>libgssglue-devel</package> - <package>libgstapp-0_10-0</package> - <package>libgstinterfaces-0_10-0</package> - <package>libgstreamer-0_10-0</package> - <package>libgtk-vnc-1_0-0</package> - <package>libgtkhtml</package> - <package>libgtkhtml-devel</package> - <package>libgtksourceview-2_0-0</package> - <package>libgtop</package> - <package>libgtop-2_0-7</package> - <package>libgtop-devel</package> - <package>libgtop-lang</package> - <package>libgudev-1_0-0</package> - <package>libgweather</package> - <package>libgweather-devel</package> - <package>libgweather-lang</package> - <package>libgweather1</package> - <package>libhangul</package> - <package>libhangul-devel</package> - <package>libhowl0</package> - <package>libical-devel</package> - <package>libical0</package> - <package>libicu-devel</package> - <package>libid3tag</package> - <package>libid3tag-devel</package> - <package>libidl-devel</package> - <package>libidn-devel</package> - <package>libiec61883</package> - <package>libiec61883-devel</package> - <package>libieee1284</package> - <package>libiniparser-devel</package> - <package>libiniparser0</package> - <package>libiptcdata</package> - <package>libiptcdata-devel</package> - <package>libiptcdata0</package> - <package>libiso9660-5</package> - <package>libiterm</package> - <package>libiterm-devel</package> - <package>libjack-devel</package> - <package>libjack0</package> - <package>libjasper</package> - <package>libjasper-devel</package> - <package>libjingle-0_3-0</package> - <package>libjingle-devel</package> - <package>libjpeg-devel</package> - <package>libkcal</package> - <package>libkcal-devel</package> - <package>libkcal2</package> - <package>libkcddb4</package> - <package>libkcddb4-devel</package> - <package>libkcompactdisc4</package> - <package>libkcompactdisc4-devel</package> - <package>libkdcraw3</package> - <package>libkdcraw3-devel</package> - <package>libkdcraw3-lang</package> - <package>libkde4</package> - <package>libkde4-devel</package> - <package>libkdecore4</package> - <package>libkdecore4-devel</package> - <package>libkdepim4</package> - <package>libkdepim4-devel</package> - <package>libkdepimlibs4</package> - <package>libkdepimlibs4-devel</package> - <package>libkexiv2-3</package> - <package>libkexiv2-3-devel</package> - <package>libkexiv2-7</package> - <package>libkipi-devel</package> - <package>libkipi6</package> - <package>libkmime-devel</package> - <package>libkmime2</package> - <package>libknotificationitem-1-1</package> - <package>libkonq-devel</package> - <package>libkonq5</package> - <package>libksba-devel</package> - <package>libktnef-devel</package> - <package>libktnef1</package> - <package>liblazy-devel</package> - <package>liblazy1</package> - <package>liblcms-devel</package> - <package>libldapcpp-devel</package> - <package>liblog4c-devel</package> - <package>liblog4c3</package> - <package>libloudmouth-1-0</package> - <package>liblpsolve55</package> - <package>liblua5_1</package> - <package>libmalaga-devel</package> - <package>libmalaga7</package> - <package>libmcrypt</package> - <package>libmcrypt-devel</package> - <package>libmikmod</package> - <package>libmikmod-devel</package> - <package>libmm-devel</package> - <package>libmm14</package> - <package>libmng-devel</package> - <package>libmpcdec-devel</package> - <package>libmpcdec5</package> - <package>libmspack-devel</package> - <package>libmtp-devel</package> - <package>libmtp8</package> - <package>libmusicbrainz-devel</package> - <package>libmusicbrainz3-6</package> - <package>libmusicbrainz3-devel</package> - <package>libmusicbrainz4</package> - <package>libmysqlclient-devel</package> - <package>libmysqlclient15</package> - <package>libmysqlclient_r15</package> - <package>libneon-devel</package> - <package>libneon27</package> - <package>libnetapi-devel</package> - <package>libnetapi0</package> - <package>libnetcontrol0</package> - <package>libnetpbm-devel</package> - <package>libnetpbm10</package> - <package>libnewt0_52</package> - <package>libnjb</package> - <package>libnjb-devel</package> - <package>libnjb5</package> - <package>libnl-devel</package> - <package>libnotify</package> - <package>libnotify-devel</package> - <package>libnotify1</package> - <package>libnscd-devel</package> - <package>libnsssharedhelper0</package> - <package>libnuma-devel</package> - <package>libofa-devel</package> - <package>libofa0</package> - <package>libogg-devel</package> - <package>libogg0</package> - <package>liboil</package> - <package>liboil-devel</package> - <package>libopenbabel-devel</package> - <package>libopenbabel3</package> - <package>libopencdk-devel</package> - <package>libopencdk10</package> - <package>libopenraw-devel</package> - <package>libopenraw1</package> - <package>libopenssl-devel</package> - <package>libopensync</package> - <package>libopensync-devel</package> - <package>libopensync-plugin-evolution2</package> - <package>libopensync-plugin-evolution2-devel</package> - <package>libopensync-plugin-palm</package> - <package>libopensync-plugin-palm-devel</package> - <package>liborc-0_4-0</package> - <package>libosip2</package> - <package>libosip2-devel</package> - <package>libotf</package> - <package>libotf-devel</package> - <package>libotr-devel</package> - <package>libotr2</package> - <package>libp11-1</package> - <package>libp11-devel</package> - <package>libpackagekit-glib10</package> - <package>libpackagekit-glib10-devel</package> - <package>libpangomm-1_4-1</package> - <package>libpcap-devel</package> - <package>libpciaccess0</package> - <package>libpciaccess0-devel</package> - <package>libphonon4</package> - <package>libpisock-devel</package> - <package>libpisock9</package> - <package>libpisync-devel</package> - <package>libpisync1</package> - <package>libpixman-1-0-devel</package> - <package>libpkcs11-helper1</package> - <package>libpng-devel</package> - <package>libpolkit-qt0</package> - <package>libpoppler-devel</package> - <package>libpoppler-glib-devel</package> - <package>libpoppler-glib4</package> - <package>libpoppler-qt2</package> - <package>libpoppler-qt3-devel</package> - <package>libpoppler-qt4-3</package> - <package>libpoppler-qt4-devel</package> - <package>libpoppler5</package> - <package>libpst4</package> - <package>libpt2</package> - <package>libpt2-devel</package> - <package>libpulse-browse0</package> - <package>libpulse-devel</package> - <package>libpulse-mainloop-glib0</package> - <package>libpulse0</package> - <package>libpurple</package> - <package>libpurple-devel</package> - <package>libpurple-lang</package> - <package>libqca2</package> - <package>libqca2-devel</package> - <package>libqdialogsolver1</package> - <package>libqdialogsolver1-devel</package> - <package>libqimageblitz-devel</package> - <package>libqimageblitz4</package> - <package>libqscintilla-devel</package> - <package>libqscintilla2-5</package> - <package>libqt4</package> - <package>libqt4-devel</package> - <package>libqt4-qt3support</package> - <package>libqt4-sql</package> - <package>libqt4-sql-mysql</package> - <package>libqt4-sql-postgresql</package> - <package>libqt4-sql-sqlite</package> - <package>libqt4-sql-unixODBC</package> - <package>libqt4-x11</package> - <package>libqtpod-devel</package> - <package>libqtpod0</package> - <package>libquadmath46</package> - <package>libquicktime</package> - <package>libquicktime-devel</package> - <package>libraptor-devel</package> - <package>libraptor1</package> - <package>librasqal-devel</package> - <package>librasqal1</package> - <package>libraw1394-11</package> - <package>libraw1394-8</package> - <package>libraw1394-devel</package> - <package>libredland-devel</package> - <package>libredland0</package> - <package>libreiserfs-devel</package> - <package>libreoffice</package> - <package>libreoffice-base</package> - <package>libreoffice-branding-SLED</package> - <package>libreoffice-branding-upstream</package> - <package>libreoffice-calc</package> - <package>libreoffice-icon-themes</package> - <package>libreoffice-impress</package> - <package>libreoffice-sdk</package> - <package>libreoffice-writer</package> - <package>librsvg</package> - <package>librsvg-devel</package> - <package>libsamplerate</package> - <package>libsamplerate-devel</package> - <package>libsatsolver-devel</package> - <package>libsblim-cmpiutil1</package> - <package>libselinux-devel</package> - <package>libsemanage-devel</package> - <package>libsemanage1</package> - <package>libsensors3-devel</package> - <package>libsensors4</package> - <package>libsepol-devel</package> - <package>libsexy</package> - <package>libsexy-devel</package> - <package>libshout-devel</package> - <package>libshout3</package> - <package>libsidplay1</package> - <package>libsidplay1-devel</package> - <package>libsigc++2</package> - <package>libsigc++2-devel</package> - <package>libslab-lang</package> - <package>libslab0</package> - <package>libsmbclient-devel</package> - <package>libsmbios-devel</package> - <package>libsmbsharemodes-devel</package> - <package>libsmbsharemodes0</package> - <package>libsndfile</package> - <package>libsndfile-devel</package> - <package>libsoprano-devel</package> - <package>libsoprano4</package> - <package>libsoup-devel</package> - <package>libspectre-devel</package> - <package>libspectre1</package> - <package>libspeex</package> - <package>libssh2-devel</package> - <package>libstrigi0</package> - <package>libstroke</package> - <package>libstroke-devel</package> - <package>libsyncml-devel</package> - <package>libsyncml0</package> - <package>libtalloc-devel</package> - <package>libtasn1-devel</package> - <package>libtdb-devel</package> - <package>libtelepathy</package> - <package>libtelepathy-devel</package> - <package>libtelepathy-glib0</package> - <package>libtheora-devel</package> - <package>libtheora0</package> - <package>libtidy</package> - <package>libtidy-devel</package> - <package>libtiff-devel</package> - <package>libtirpc-devel</package> - <package>libtomoe-gtk0</package> - <package>libtspi1</package> - <package>libtunepimp</package> - <package>libtunepimp-devel</package> - <package>libtunepimp5</package> - <package>libudev-devel</package> - <package>libudf0</package> - <package>libunique-1_0-0</package> - <package>libunwind</package> - <package>libunwind-devel</package> - <package>libupsclient1</package> - <package>libusb-devel</package> - <package>libusbpp-0_1-4</package> - <package>libustr-1_0-1</package> - <package>libustr-devel</package> - <package>libuuid-devel</package> - <package>libvirt-client</package> - <package>libvirt-devel</package> - <package>libvisual</package> - <package>libvisual-devel</package> - <package>libvoikko-devel</package> - <package>libvoikko1</package> - <package>libvorbis</package> - <package>libvorbis-devel</package> - <package>libwavpack1</package> - <package>libwbclient-devel</package> - <package>libwbxml2-0</package> - <package>libwbxml2-devel</package> - <package>libwebkit-1_0-1</package> - <package>libwebkit-1_0-2</package> - <package>libwebkit-devel</package> - <package>libwebkit-lang</package> - <package>libwmf</package> - <package>libwmf-devel</package> - <package>libwmf-gnome</package> - <package>libwnck</package> - <package>libwnck-1-22</package> - <package>libwnck-devel</package> - <package>libwnck-lang</package> - <package>libwpd-0_8-8</package> - <package>libwpd-devel</package> - <package>libwpg-0_1-1</package> - <package>libwpg-devel</package> - <package>libwps-0_1-1</package> - <package>libwps-devel</package> - <package>libwsman-devel</package> - <package>libwsman1</package> - <package>libxcrypt-devel</package> - <package>libxine-devel</package> - <package>libxine1</package> - <package>libxklavier-devel</package> - <package>libxklavier15</package> - <package>libxml2-devel</package> - <package>libxslt-devel</package> - <package>libyajl1</package> - <package>libzio-devel</package> - <package>libzip-devel</package> - <package>libzip1</package> - <package>libzvbi0</package> - <package>libzypp-devel</package> - <package>limal-apparmor-notifications</package> - <package>limal-apparmor-notifications-devel</package> - <package>limal-ca-mgm-devel</package> - <package>limal-devel</package> - <package>limal-devtools</package> - <package>limal-nfs-server-devel</package> - <package>linux-atm-devel</package> - <package>linux-atm-lib</package> - <package>lksctp-tools</package> - <package>lksctp-tools-devel</package> - <package>loudmouth-devel</package> - <package>lua</package> - <package>lua-devel</package> - <package>lzo-devel</package> - <package>m17n-db</package> - <package>m17n-lib</package> - <package>m17n-lib-devel</package> - <package>malaga-suomi</package> - <package>meanwhile</package> - <package>meanwhile-devel</package> - <package>metacity</package> - <package>metacity-devel</package> - <package>metacity-lang</package> - <package>mhash</package> - <package>mhash-devel</package> - <package>misc-console-font</package> - <package>mono-addins</package> - <package>mono-basic</package> - <package>mono-core</package> - <package>mono-data</package> - <package>mono-data-oracle</package> - <package>mono-data-sqlite</package> - <package>mono-devel</package> - <package>mono-extras</package> - <package>mono-jscript</package> - <package>mono-tools</package> - <package>mono-wcf</package> - <package>mono-web</package> - <package>mono-winforms</package> - <package>mono-zeroconf</package> - <package>mono-zeroconf-provider-avahi</package> - <package>monodevelop</package> - <package>monodoc-core</package> - <package>mozilla-nspr</package> - <package>mozilla-nspr-devel</package> - <package>mozilla-nss</package> - <package>mozilla-nss-devel</package> - <package>mozilla-xulrunner192</package> - <package>mozilla-xulrunner192-gnome</package> - <package>mpfr-devel</package> - <package>mpi-selector</package> - <package>mpich</package> - <package>mpich-devel</package> - <package>mysql</package> - <package>mysql-client</package> - <package>nagios</package> - <package>nagios-devel</package> - <package>nagios-www</package> - <package>nant</package> - <package>nautilus</package> - <package>nautilus-cd-burner</package> - <package>nautilus-cd-burner-devel</package> - <package>nautilus-cd-burner-lang</package> - <package>nautilus-devel</package> - <package>nautilus-lang</package> - <package>ndesk-dbus</package> - <package>ndesk-dbus-glib</package> - <package>ndesk-dbus-glib-devel</package> - <package>net-snmp</package> - <package>net-snmp-devel</package> - <package>netatalk</package> - <package>netatalk-devel</package> - <package>netcat-openbsd</package> - <package>newt</package> - <package>newt-devel</package> - <package>newt-static</package> - <package>nfsidmap-devel</package> - <package>notification-daemon</package> - <package>notification-daemon-lang</package> - <package>notify-sharp</package> - <package>nss-mdns</package> - <package>nss-shared-helper-devel</package> - <package>nut</package> - <package>nut-classic</package> - <package>nut-devel</package> - <package>opal</package> - <package>opal-devel</package> - <package>openCryptoki</package> - <package>openCryptoki-64bit</package> - <package>openCryptoki-devel</package> - <package>openct-devel</package> - <package>openhpi</package> - <package>openhpi-daemon</package> - <package>openhpi-devel</package> - <package>openjade</package> - <package>openjade-devel</package> - <package>openldap2-devel</package> - <package>openmotif-devel</package> - <package>openmotif-libs</package> - <package>openmpi</package> - <package>openobex-devel</package> - <package>openobex-glib-devel</package> - <package>opensc-devel</package> - <package>openslp-devel</package> - <package>opensp</package> - <package>opensp-devel</package> - <package>openwsman-client</package> - <package>openwsman-server</package> - <package>orbit</package> - <package>orbit-devel</package> - <package>orbit2-devel</package> - <package>oxygen-icon-theme</package> - <package>oxygen-icon-theme-scalable</package> - <package>ozerocdoff</package> - <package>pam-devel</package> - <package>pango-devel</package> - <package>pangomm-devel</package> - <package>parted-devel</package> - <package>patchutils</package> - <package>pciutils-devel</package> - <package>pcre-devel</package> - <package>pcsc-acr38</package> - <package>pcsc-acr38-devel</package> - <package>pcsc-lite-devel</package> - <package>perl-32bit</package> - <package>perl-Crypt-OpenSSL-RSA</package> - <package>perl-Mail-DKIM</package> - <package>perl-MailTools</package> - <package>perl-Net-DNS</package> - <package>perl-Net-IP</package> - <package>perl-NetAddr-IP</package> - <package>perl-SNMP</package> - <package>perl-Tie-IxHash</package> - <package>perl-Tk</package> - <package>perl-Tk-devel</package> - <package>perl-spamassassin</package> - <package>phonon</package> - <package>phonon-backend-gstreamer-0_10</package> - <package>phonon-devel</package> - <package>php5</package> - <package>php5-ctype</package> - <package>php5-devel</package> - <package>php5-dom</package> - <package>php5-hash</package> - <package>php5-iconv</package> - <package>php5-json</package> - <package>php5-pdo</package> - <package>php5-sqlite</package> - <package>php5-suhosin</package> - <package>php5-tokenizer</package> - <package>php5-xmlreader</package> - <package>php5-xmlwriter</package> - <package>php53</package> - <package>php53-ctype</package> - <package>php53-dom</package> - <package>php53-iconv</package> - <package>php53-json</package> - <package>php53-tokenizer</package> - <package>php53-xmlreader</package> - <package>php53-xmlwriter</package> - <package>pidgin</package> - <package>pidgin-devel</package> - <package>pilot-link</package> - <package>pkcs11-helper</package> - <package>pkcs11-helper-devel</package> - <package>planner</package> - <package>planner-devel</package> - <package>planner-lang</package> - <package>plasma-addons</package> - <package>plasma-theme-aya</package> - <package>plasmoid-networkmanagement</package> - <package>plasmoid-quickaccess</package> - <package>plotutils</package> - <package>poppler-data</package> - <package>poppler-tools</package> - <package>popt-devel</package> - <package>portmap</package> - <package>postfix-devel</package> - <package>postgresql-devel</package> - <package>postgresql-libs</package> - <package>ppp-devel</package> - <package>ppp-userpass</package> - <package>pstoedit</package> - <package>pstoedit-devel</package> - <package>pulseaudio</package> - <package>pulseaudio-esound-compat</package> - <package>pulseaudio-lang</package> - <package>puppet</package> - <package>python-cairo</package> - <package>python-cairo-devel</package> - <package>python-devel</package> - <package>python-gnome</package> - <package>python-gnome-devel</package> - <package>python-gobject2</package> - <package>python-gobject2-devel</package> - <package>python-gtk</package> - <package>python-gtk-devel</package> - <package>python-gtkglext</package> - <package>python-gtkglext-devel</package> - <package>python-gtksourceview</package> - <package>python-gtksourceview-devel</package> - <package>python-numeric</package> - <package>python-numpy</package> - <package>python-orbit</package> - <package>python-orbit-devel</package> - <package>pyxml</package> - <package>qt3</package> - <package>qt3-devel</package> - <package>quagga</package> - <package>quagga-devel</package> - <package>quilt</package> - <package>raptor</package> - <package>rarian</package> - <package>rarian-devel</package> - <package>re2c</package> - <package>readline-devel</package> - <package>recode-devel</package> - <package>rpm-devel</package> - <package>rrdtool</package> - <package>rrdtool-devel</package> - <package>rsyslog</package> - <package>ruby</package> - <package>rubygems</package> - <package>ruby-devel</package> - <package>ruby-doc-html</package> - <package>ruby-doc-ri</package> - <package>ruby-examples</package> - <package>ruby-fcgi</package> - <package>ruby-mysql</package> - <package>ruby-selinux</package> - <package>ruby-test-suite</package> - <package>ruby-tk</package> - <package>sablot</package> - <package>sablot-devel</package> - <package>samba-devel</package> - <package>sane-backends</package> - <package>sane-frontends</package> - <package>sax2-libsax</package> - <package>sax2-libsax-devel</package> - <package>sax2-libsax-perl</package> - <package>sax2-tools</package> - <package>sblim-cmpi-base</package> - <package>sblim-cmpi-base-devel</package> - <package>sblim-cmpi-devel</package> - <package>sblim-cmpiutil-devel</package> - <package>sblim-indication_helper</package> - <package>sblim-sfcb</package> - <package>sblim-sfcc</package> - <package>sblim-sfcc-devel</package> - <package>scim</package> - <package>scim-devel</package> - <package>scpm-devel</package> - <package>scrollkeeper</package> - <package>scrollkeeper-lang</package> - <package>seahorse</package> - <package>seahorse-devel</package> - <package>seahorse-lang</package> - <package>sendmail</package> - <package>sendmail-devel</package> - <package>sg3_utils-devel</package> - <package>sgml-skel</package> - <package>shared-mime-info</package> - <package>silc-toolkit</package> - <package>silc-toolkit-devel</package> - <package>slang</package> - <package>slang-devel</package> - <package>soprano</package> - <package>soprano-backend-redland</package> - <package>spamassassin</package> - <package>speex-devel</package> - <package>splashy-devel</package> - <package>sqlite2</package> - <package>sqlite3-devel</package> - <package>startup-notification</package> - <package>startup-notification-devel</package> - <package>strigi</package> - <package>strigi-devel</package> - <package>subversion</package> - <package>subversion-perl</package> - <package>susehelp</package> - <package>susehelp_cz</package> - <package>susehelp_de</package> - <package>susehelp_en</package> - <package>susehelp_es</package> - <package>susehelp_fr</package> - <package>susehelp_hu</package> - <package>susehelp_it</package> - <package>swig</package> - <package>syslogd</package> - <package>t1lib</package> - <package>t1lib-devel</package> - <package>taglib</package> - <package>taglib-devel</package> - <package>taglib-sharp</package> - <package>tango-icon-theme</package> - <package>tcl-devel</package> - <package>tcpd-devel</package> - <package>telepathy-glib-devel</package> - <package>telepathy-mission-control</package> - <package>telepathy-mission-control-devel</package> - <package>texlive-bin-devel</package> - <package>texlive-devel</package> - <package>tk-devel</package> - <package>tla</package> - <package>tn5250</package> - <package>tn5250-devel</package> - <package>tomoe</package> - <package>tomoe-devel</package> - <package>tomoe-gtk</package> - <package>tomoe-gtk-devel</package> - <package>tomoe-gtk-lang</package> - <package>totem-pl-parser</package> - <package>totem-pl-parser-devel</package> - <package>totem-pl-parser-lang</package> - <package>trousers</package> - <package>trousers-devel</package> - <package>tsclient</package> - <package>tsclient-devel</package> - <package>tsclient-lang</package> - <package>uim</package> - <package>uim-devel</package> - <package>unixODBC</package> - <package>unixODBC-devel</package> - <package>unsermake</package> - <package>update-desktop-files</package> - <package>usb_modeswitch</package> - <package>usb_modeswitch-data</package> - <package>valgrind</package> - <package>valgrind-devel</package> - <package>vte</package> - <package>vte-devel</package> - <package>vte-lang</package> - <package>wdiff</package> - <package>webkit-sharp</package> - <package>wireshark</package> - <package>wireshark-devel</package> - <package>wodim-devel</package> - <package>wordcut</package> - <package>wordcut-devel</package> - <package>words</package> - <package>wpa_supplicant</package> - <package>wvstreams</package> - <package>wvstreams-devel</package> - <package>wxGTK-compat</package> - <package>wxGTK-devel</package> - <package>wxGTK-gl</package> - <package>x11-input-wacom</package> - <package>x11-input-wacom-devel</package> - <package>x11-input-wacom-tools</package> - <package>xalan-j2</package> - <package>xaw3d-devel</package> - <package>xbase</package> - <package>xbase-devel</package> - <package>xdelta</package> - <package>xdelta-devel</package> - <package>xdg-menu</package> - <package>xen-devel</package> - <package>xen-libs</package> - <package>xerces-j2</package> - <package>xerces-j2-bootstrap</package> - <package>xerces-j2-xml-apis</package> - <package>xfsprogs-devel</package> - <package>xml-commons-apis-bootstrap</package> - <package>xml-commons-resolver-bootstrap</package> - <package>xml-commons-which-bootstrap</package> - <package>xmlcharent</package> - <package>xorg-x11</package> - <package>xorg-x11-devel</package> - <package>xorg-x11-fonts</package> - <package>xorg-x11-fonts-core</package> - <package>xorg-x11-fonts-devel</package> - <package>xorg-x11-libICE-devel</package> - <package>xorg-x11-libSM-devel</package> - <package>xorg-x11-libX11-devel</package> - <package>xorg-x11-libXau-devel</package> - <package>xorg-x11-libXdmcp-devel</package> - <package>xorg-x11-libXext-devel</package> - <package>xorg-x11-libXfixes-devel</package> - <package>xorg-x11-libXmu-devel</package> - <package>xorg-x11-libXp-devel</package> - <package>xorg-x11-libXpm-devel</package> - <package>xorg-x11-libXprintUtil-devel</package> - <package>xorg-x11-libXrender-devel</package> - <package>xorg-x11-libXt-devel</package> - <package>xorg-x11-libXv-devel</package> - <package>xorg-x11-libfontenc-devel</package> - <package>xorg-x11-libxcb-devel</package> - <package>xorg-x11-libxkbfile-devel</package> - <package>xorg-x11-proto-devel</package> - <package>xorg-x11-server</package> - <package>xorg-x11-util-devel</package> - <package>xorg-x11-xauth</package> - <package>xorg-x11-xtrans-devel</package> - <package>xosd</package> - <package>xosd-devel</package> - <package>xsp</package> - <package>xterm</package> - <package>xz-devel</package> - <package>yast2-core-devel</package> - <package>yast2-devtools</package> - <package>yast2-gtk</package> - <package>yast2-libyui-devel</package> - <package>yast2-ncurses-devel</package> - <package>yast2-qt</package> - <package>yast2-qt-devel</package> - <package>yast2-qt-pkg</package> - <package>yast2-storage-devel</package> - <package>yast2-ycp-ui-bindings-devel</package> - <package>yelp</package> - <package>yelp-lang</package> - <package>zenity</package> - <package>zenity-lang</package> - <package>zlib-devel</package> - <package>zsh</package> - <package>zvbi-devel</package> - </remove-packages> - - </software> - <user_defaults> - <expire></expire> - <group>100</group> - <groups>video,dialout</groups> - <home>/home</home> - <inactive>-1</inactive> - <shell>/bin/bash</shell> - <skel>/etc/skel</skel> - <umask>022</umask> - </user_defaults> - <users config:type="list"> - <user> - <encrypted config:type="boolean">true</encrypted> - <fullname>vagrant</fullname> - <gid>100</gid> - <home>/home/vagrant</home> - <password_settings> - <expire></expire> - <flag></flag> - <inact></inact> - <max>99999</max> - <min>0</min> - <warn>7</warn> - </password_settings> - <shell>/bin/bash</shell> - <uid>1000</uid> - <user_password>$2y$05$NA1Li9ZKJOLRW5mMTXm6/e5r8dltWS5RpDZpvHrI82aLE00V51tdi</user_password> - <username>vagrant</username> - </user> - <user> - <encrypted config:type="boolean">true</encrypted> - <fullname>Games account</fullname> - <gid>100</gid> - <home>/var/games</home> - <password_settings> - <expire></expire> - <flag></flag> - <inact></inact> - <max></max> - <min></min> - <warn></warn> - </password_settings> - <shell>/bin/bash</shell> - <uid>12</uid> - <user_password>*</user_password> - <username>games</username> - </user> - <user> - <encrypted config:type="boolean">true</encrypted> - <fullname>bin</fullname> - <gid>1</gid> - <home>/bin</home> - <password_settings> - <expire></expire> - <flag></flag> - <inact></inact> - <max></max> - <min></min> - <warn></warn> - </password_settings> - <shell>/bin/bash</shell> - <uid>1</uid> - <user_password>*</user_password> - <username>bin</username> - </user> - <user> - <encrypted config:type="boolean">true</encrypted> - <fullname>nobody</fullname> - <gid>65533</gid> - <home>/var/lib/nobody</home> - <password_settings> - <expire></expire> - <flag></flag> - <inact></inact> - <max></max> - <min></min> - <warn></warn> - </password_settings> - <shell>/bin/bash</shell> - <uid>65534</uid> - <user_password>*</user_password> - <username>nobody</username> - </user> - <user> - <encrypted config:type="boolean">true</encrypted> - <fullname>Printing daemon</fullname> - <gid>7</gid> - <home>/var/spool/lpd</home> - <password_settings> - <expire></expire> - <flag></flag> - <inact></inact> - <max></max> - <min></min> - <warn></warn> - </password_settings> - <shell>/bin/bash</shell> - <uid>4</uid> - <user_password>*</user_password> - <username>lp</username> - </user> - <user> - <encrypted config:type="boolean">true</encrypted> - <fullname>User for uuidd</fullname> - <gid>104</gid> - <home>/var/run/uuidd</home> - <password_settings> - <expire></expire> - <flag></flag> - <inact></inact> - <max>99999</max> - <min>0</min> - <warn>7</warn> - </password_settings> - <shell>/bin/false</shell> - <uid>102</uid> - <user_password>*</user_password> - <username>uuidd</username> - </user> - <user> - <encrypted config:type="boolean">true</encrypted> - <fullname>Postfix Daemon</fullname> - <gid>51</gid> - <home>/var/spool/postfix</home> - <password_settings> - <expire></expire> - <flag></flag> - <inact></inact> - <max>99999</max> - <min>0</min> - <warn>7</warn> - </password_settings> - <shell>/bin/false</shell> - <uid>51</uid> - <user_password>*</user_password> - <username>postfix</username> - </user> - <user> - <encrypted config:type="boolean">true</encrypted> - <fullname>Novell Customer Center User</fullname> - <gid>111</gid> - <home>/var/lib/YaST2/suse-ncc-fakehome</home> - <password_settings> - <expire></expire> - <flag></flag> - <inact></inact> - <max>99999</max> - <min>0</min> - <warn>7</warn> - </password_settings> - <shell>/bin/bash</shell> - <uid>106</uid> - <user_password>*</user_password> - <username>suse-ncc</username> - </user> - <user> - <encrypted config:type="boolean">true</encrypted> - <fullname>FTP account</fullname> - <gid>49</gid> - <home>/srv/ftp</home> - <password_settings> - <expire></expire> - <flag></flag> - <inact></inact> - <max></max> - <min></min> - <warn></warn> - </password_settings> - <shell>/bin/bash</shell> - <uid>40</uid> - <user_password>*</user_password> - <username>ftp</username> - </user> - <user> - <encrypted config:type="boolean">true</encrypted> - <fullname>Gnome Display Manager daemon</fullname> - <gid>112</gid> - <home>/var/lib/gdm</home> - <password_settings> - <expire></expire> - <flag></flag> - <inact></inact> - <max>99999</max> - <min>0</min> - <warn>7</warn> - </password_settings> - <shell>/bin/false</shell> - <uid>107</uid> - <user_password>*</user_password> - <username>gdm</username> - </user> - <user> - <encrypted config:type="boolean">true</encrypted> - <fullname>Batch jobs daemon</fullname> - <gid>25</gid> - <home>/var/spool/atjobs</home> - <password_settings> - <expire></expire> - <flag></flag> - <inact></inact> - <max>99999</max> - <min>0</min> - <warn>7</warn> - </password_settings> - <shell>/bin/bash</shell> - <uid>25</uid> - <user_password>*</user_password> - <username>at</username> - </user> - <user> - <encrypted config:type="boolean">true</encrypted> - <fullname>root</fullname> - <gid>0</gid> - <home>/root</home> - <password_settings> - <expire></expire> - <flag></flag> - <inact></inact> - <max></max> - <min></min> - <warn></warn> - </password_settings> - <shell>/bin/bash</shell> - <uid>0</uid> - <user_password>$2y$05$NA1Li9ZKJOLRW5mMTXm6/e5r8dltWS5RpDZpvHrI82aLE00V51tdi</user_password> - <username>root</username> - </user> - <user> - <encrypted config:type="boolean">true</encrypted> - <fullname>Mailer daemon</fullname> - <gid>12</gid> - <home>/var/spool/clientmqueue</home> - <password_settings> - <expire></expire> - <flag></flag> - <inact></inact> - <max></max> - <min></min> - <warn></warn> - </password_settings> - <shell>/bin/false</shell> - <uid>8</uid> - <user_password>*</user_password> - <username>mail</username> - </user> - <user> - <encrypted config:type="boolean">true</encrypted> - <fullname>Daemon</fullname> - <gid>2</gid> - <home>/sbin</home> - <password_settings> - <expire></expire> - <flag></flag> - <inact></inact> - <max></max> - <min></min> - <warn></warn> - </password_settings> - <shell>/bin/bash</shell> - <uid>2</uid> - <user_password>*</user_password> - <username>daemon</username> - </user> - <user> - <encrypted config:type="boolean">true</encrypted> - <fullname>NTP daemon</fullname> - <gid>108</gid> - <home>/var/lib/ntp</home> - <password_settings> - <expire></expire> - <flag></flag> - <inact></inact> - <max>99999</max> - <min>0</min> - <warn>7</warn> - </password_settings> - <shell>/bin/false</shell> - <uid>74</uid> - <user_password>*</user_password> - <username>ntp</username> - </user> - <user> - <encrypted config:type="boolean">true</encrypted> - <fullname>Unix-to-Unix CoPy system</fullname> - <gid>14</gid> - <home>/etc/uucp</home> - <password_settings> - <expire></expire> - <flag></flag> - <inact></inact> - <max></max> - <min></min> - <warn></warn> - </password_settings> - <shell>/bin/bash</shell> - <uid>10</uid> - <user_password>*</user_password> - <username>uucp</username> - </user> - <user> - <encrypted config:type="boolean">true</encrypted> - <fullname>User for D-Bus</fullname> - <gid>101</gid> - <home>/var/run/dbus</home> - <password_settings> - <expire></expire> - <flag></flag> - <inact></inact> - <max></max> - <min>0</min> - <warn>7</warn> - </password_settings> - <shell>/bin/false</shell> - <uid>100</uid> - <user_password>*</user_password> - <username>messagebus</username> - </user> - <user> - <encrypted config:type="boolean">true</encrypted> - <fullname>User for haldaemon</fullname> - <gid>102</gid> - <home>/var/run/hald</home> - <password_settings> - <expire></expire> - <flag></flag> - <inact></inact> - <max></max> - <min>0</min> - <warn>7</warn> - </password_settings> - <shell>/bin/false</shell> - <uid>101</uid> - <user_password>*</user_password> - <username>haldaemon</username> - </user> - <user> - <encrypted config:type="boolean">true</encrypted> - <fullname>WWW daemon apache</fullname> - <gid>8</gid> - <home>/var/lib/wwwrun</home> - <password_settings> - <expire></expire> - <flag></flag> - <inact></inact> - <max></max> - <min></min> - <warn></warn> - </password_settings> - <shell>/bin/false</shell> - <uid>30</uid> - <user_password>*</user_password> - <username>wwwrun</username> - </user> - <user> - <encrypted config:type="boolean">true</encrypted> - <fullname>Manual pages viewer</fullname> - <gid>62</gid> - <home>/var/cache/man</home> - <password_settings> - <expire></expire> - <flag></flag> - <inact></inact> - <max></max> - <min></min> - <warn></warn> - </password_settings> - <shell>/bin/bash</shell> - <uid>13</uid> - <user_password>*</user_password> - <username>man</username> - </user> - <user> - <encrypted config:type="boolean">true</encrypted> - <fullname>PolicyKit</fullname> - <gid>107</gid> - <home>/var/run/PolicyKit</home> - <password_settings> - <expire></expire> - <flag></flag> - <inact></inact> - <max>99999</max> - <min>0</min> - <warn>7</warn> - </password_settings> - <shell>/bin/false</shell> - <uid>104</uid> - <user_password>*</user_password> - <username>polkituser</username> - </user> - <user> - <encrypted config:type="boolean">true</encrypted> - <fullname>News system</fullname> - <gid>13</gid> - <home>/etc/news</home> - <password_settings> - <expire></expire> - <flag></flag> - <inact></inact> - <max></max> - <min></min> - <warn></warn> - </password_settings> - <shell>/bin/bash</shell> - <uid>9</uid> - <user_password>*</user_password> - <username>news</username> - </user> - <user> - <fullname>SSH daemon</fullname> - <gid>65</gid> - <home>/var/lib/sshd</home> - <shell>/bin/false</shell> - <uid>71</uid> - <username>sshd</username> - </user> - <user> - <encrypted config:type="boolean">true</encrypted> - <fullname>PulseAudio daemon</fullname> - <gid>109</gid> - <home>/var/lib/pulseaudio</home> - <password_settings> - <expire></expire> - <flag></flag> - <inact></inact> - <max>99999</max> - <min>0</min> - <warn>7</warn> - </password_settings> - <shell>/bin/false</shell> - <uid>105</uid> - <user_password>*</user_password> - <username>pulse</username> - </user> - </users> -</profile> diff --git a/templates/sles-11-sp3/scripts/cleanup.sh b/templates/sles-11-sp3/scripts/cleanup.sh deleted file mode 100644 index 0870a61a1..000000000 --- a/templates/sles-11-sp3/scripts/cleanup.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/bash -eux - -# remove zypper locks on removed packages to avoid later dependency problems -zypper --non-interactive rl \* -# zypper --non-interactive remove `rpm -qa virtualbox-guest-*` >/dev/null 2>&1 -# Add an online copy of the SLES DVD1 as a software repository, instead of the mounted DVD -zypper removerepo 'SUSE-Linux-Enterprise-Server-11-SP3 11.3.3-1.138' -zypper addrepo 'http://demeter.uni-regensburg.de/SLES11SP3-x64/DVD1/' 'SLES11SP3-x64 DVD1 Online' -zypper refresh diff --git a/templates/sles-11-sp3/scripts/minimize.sh b/templates/sles-11-sp3/scripts/minimize.sh deleted file mode 100644 index 3846a1d65..000000000 --- a/templates/sles-11-sp3/scripts/minimize.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash -eux - -dd if=/dev/zero of=/EMPTY bs=1M -rm -f /EMPTY diff --git a/templates/sles-11-sp3/scripts/sshd.sh b/templates/sles-11-sp3/scripts/sshd.sh deleted file mode 100644 index c6e4f20a6..000000000 --- a/templates/sles-11-sp3/scripts/sshd.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash -eux - -echo "UseDNS no" >> /etc/ssh/sshd_config diff --git a/templates/sles-11-sp3/scripts/sudoers.sh b/templates/sles-11-sp3/scripts/sudoers.sh deleted file mode 100644 index eb80f3f88..000000000 --- a/templates/sles-11-sp3/scripts/sudoers.sh +++ /dev/null @@ -1,3 +0,0 @@ -# update sudoers - can't do this in autoinst.xml -echo -e "\nupdate sudoers ..." -echo -e "vagrant ALL=(ALL) NOPASSWD: ALL\n" >> /etc/sudoers diff --git a/templates/sles-11-sp3/scripts/vagrant.sh b/templates/sles-11-sp3/scripts/vagrant.sh deleted file mode 100644 index 72dd2f444..000000000 --- a/templates/sles-11-sp3/scripts/vagrant.sh +++ /dev/null @@ -1,33 +0,0 @@ -#!/bin/bash -eux - -if [ -f /home/vagrant/.vbox_version ]; then - mkdir /tmp/vbox - VER=$(cat /home/vagrant/.vbox_version) - mount -o loop VBoxGuestAdditions_$VER.iso /tmp/vbox - sh /tmp/vbox/VBoxLinuxAdditions.run - umount /tmp/vbox - rmdir /tmp/vbox - rm *.iso -fi - -if [ -f /home/vagrant/.vmfusion_version ]; then - #Set Linux-specific paths and ISO filename - home_dir="/home/vagrant" - iso_name="linux.iso" - mount_point="/tmp/vmware-tools" - #Run install, unmount ISO and remove it - mkdir ${mount_point} - cd ${home_dir} - /bin/mount -o loop ${iso_name} ${mount_point} - tar zxf ${mount_point}/*.tar.gz && cd vmware-tools-distrib && ./vmware-install.pl --default - /bin/umount ${mount_point} - /bin/rm -rf ${home_dir}/${iso_name} ${home_dir}/vmware-tools-distrib - rmdir ${mount_point} -fi - -mkdir /home/vagrant/.ssh -wget --no-check-certificate \ - 'https://github.com/mitchellh/vagrant/raw/master/keys/vagrant.pub' \ - -O /home/vagrant/.ssh/authorized_keys -chown -R vagrant /home/vagrant/.ssh -chmod -R go-rwsx /home/vagrant/.ssh diff --git a/templates/sles-11-sp3/template.json b/templates/sles-11-sp3/template.json deleted file mode 100644 index ede834b1a..000000000 --- a/templates/sles-11-sp3/template.json +++ /dev/null @@ -1,97 +0,0 @@ -{ - "provisioners": [ - { - "type": "shell", - "scripts": [ - "scripts/vagrant.sh", - "scripts/sshd.sh", - "scripts/sudoers.sh", - "scripts/cleanup.sh", - "scripts/minimize.sh" - ], - "override": { - "virtualbox": { - "execute_command": "echo 'vagrant'|sudo -S sh '{{.Path}}'" - }, - "vmware": { - "execute_command": "echo 'vagrant'|sudo -S sh '{{.Path}}'" - } - } - } - ], - "builders": [ - { - "type": "virtualbox", - "boot_command": [ - "<esc><enter><wait>", - "linux netdevice=eth0 netsetup=dhcp install=cd:/<wait>", - " lang=en_US autoyast=http://{{ .HTTPIP }}:{{ .HTTPPort }}/autoinst.xml<wait>", - " textmode=1<wait>", - "<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": 40960, - "guest_os_type": "OpenSUSE_64", - "http_directory": "http", - "iso_checksum": "480b70d50cbb538382dc2b9325221e1b", - "iso_checksum_type": "md5", - "iso_url": "", - "ssh_username": "vagrant", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_wait_timeout": "10000s", - "shutdown_command": "echo '/sbin/halt -h -p' > shutdown.sh; echo 'vagrant'|sudo -S sh 'shutdown.sh'", - "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", - "virtualbox_version_file": ".vbox_version", - "vboxmanage": [ - [ - "modifyvm", - "{{.Name}}", - "--memory", - "480" - ], - [ - "modifyvm", - "{{.Name}}", - "--cpus", - "1" - ] - ], - "iso_md5": "480b70d50cbb538382dc2b9325221e1b" - }, - { - "type": "vmware", - "boot_command": [ - "<esc><enter><wait>", - "linux netdevice=eth0 netsetup=dhcp install=cd:/<wait>", - " lang=en_US autoyast=http://{{ .HTTPIP }}:{{ .HTTPPort }}/autoinst.xml<wait>", - " textmode=1<wait>", - "<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": 40960, - "guest_os_type": "opensuse-64", - "http_directory": "http", - "iso_checksum": "480b70d50cbb538382dc2b9325221e1b", - "iso_checksum_type": "md5", - "iso_url": "", - "ssh_username": "vagrant", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_wait_timeout": "10000s", - "shutdown_command": "echo '/sbin/halt -h -p' > shutdown.sh; echo 'vagrant'|sudo -S sh 'shutdown.sh'", - "vmx_data": { - "memsize": "480", - "numvcpus": "1", - "cpuid.coresPerSocket": "1" - }, - "iso_md5": "480b70d50cbb538382dc2b9325221e1b" - } - ], - "post-provisioner": [ - { - "type": "vagrant", - "output": "sles-11-sp3-{{.Provisioner}}.box" - } - ] -} \ No newline at end of file diff --git a/templates/ubuntu-10.04-i386/http/preseed.cfg b/templates/ubuntu-10.04-i386/http/preseed.cfg deleted file mode 100644 index 903f2e14b..000000000 --- a/templates/ubuntu-10.04-i386/http/preseed.cfg +++ /dev/null @@ -1,31 +0,0 @@ -choose-mirror-bin mirror/http/proxy string -d-i base-installer/kernel/override-image string linux-server -d-i clock-setup/utc boolean true -d-i clock-setup/utc-auto boolean true -d-i finish-install/reboot_in_progress note -d-i grub-installer/only_debian boolean true -d-i grub-installer/with_other_os boolean true -d-i partman-auto-lvm/guided_size string max -d-i partman-auto/choose_recipe select atomic -d-i partman-auto/method string lvm -d-i partman-lvm/confirm boolean true -d-i partman-lvm/confirm boolean true -d-i partman-lvm/confirm_nooverwrite boolean true -d-i partman-lvm/device_remove_lvm boolean true -d-i partman/choose_partition select finish -d-i partman/confirm boolean true -d-i partman/confirm_nooverwrite boolean true -d-i partman/confirm_write_new_label boolean true -d-i passwd/user-fullname string vagrant -d-i passwd/user-uid string 900 -d-i passwd/user-password password vagrant -d-i passwd/user-password-again password vagrant -d-i passwd/username string vagrant -d-i pkgsel/include string openssh-server cryptsetup build-essential libssl-dev libreadline-dev zlib1g-dev linux-source dkms -d-i pkgsel/install-language-support boolean false -d-i pkgsel/update-policy select unattended-upgrades -d-i pkgsel/upgrade select full-upgrade -d-i time/zone string UTC -d-i user-setup/allow-password-weak boolean true -d-i user-setup/encrypt-home boolean false -tasksel tasksel/first multiselect standard, ubuntu-server diff --git a/templates/ubuntu-10.04-i386/scripts/cleanup.sh b/templates/ubuntu-10.04-i386/scripts/cleanup.sh deleted file mode 100644 index 6c7f703d6..000000000 --- a/templates/ubuntu-10.04-i386/scripts/cleanup.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/bash -eux - -apt-get -y autoremove -apt-get -y clean -rm -rf VBoxGuestAdditions_*.iso VBoxGuestAdditions_*.iso.? -rm -f /tmp/chef*deb diff --git a/templates/ubuntu-10.04-i386/scripts/minimize.sh b/templates/ubuntu-10.04-i386/scripts/minimize.sh deleted file mode 100644 index 3846a1d65..000000000 --- a/templates/ubuntu-10.04-i386/scripts/minimize.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash -eux - -dd if=/dev/zero of=/EMPTY bs=1M -rm -f /EMPTY diff --git a/templates/ubuntu-10.04-i386/scripts/networking.sh b/templates/ubuntu-10.04-i386/scripts/networking.sh deleted file mode 100644 index de3269a58..000000000 --- a/templates/ubuntu-10.04-i386/scripts/networking.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/bash -eux - -rm /etc/udev/rules.d/70-persistent-net.rules -mkdir /etc/udev/rules.d/70-persistent-net.rules -rm /lib/udev/rules.d/75-persistent-net-generator.rules -rm -rf /dev/.udev/ /var/lib/dhcp3/* -echo "pre-up sleep 2" >> /etc/network/interfaces diff --git a/templates/ubuntu-10.04-i386/scripts/sshd.sh b/templates/ubuntu-10.04-i386/scripts/sshd.sh deleted file mode 100644 index c6e4f20a6..000000000 --- a/templates/ubuntu-10.04-i386/scripts/sshd.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash -eux - -echo "UseDNS no" >> /etc/ssh/sshd_config diff --git a/templates/ubuntu-10.04-i386/scripts/sudoers.sh b/templates/ubuntu-10.04-i386/scripts/sudoers.sh deleted file mode 100644 index ce45b7611..000000000 --- a/templates/ubuntu-10.04-i386/scripts/sudoers.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash -eux - -sed -i -e '/Defaults\s\+env_reset/a Defaults\texempt_group=admin' /etc/sudoers -sed -i -e 's/%admin ALL=(ALL) ALL/%admin ALL=NOPASSWD:ALL/g' /etc/sudoers diff --git a/templates/ubuntu-10.04-i386/scripts/update.sh b/templates/ubuntu-10.04-i386/scripts/update.sh deleted file mode 100644 index 80e8dd3f9..000000000 --- a/templates/ubuntu-10.04-i386/scripts/update.sh +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/bash -eux - -apt-get update -apt-get -y upgrade - -# ensure the correct kernel headers are installed -apt-get -y install linux-headers-$(uname -r) - -# update package index on boot -cat <<EOF > /etc/init/refresh-apt.conf -description "update package index" -start on networking -task -exec /usr/bin/apt-get update -EOF diff --git a/templates/ubuntu-10.04-i386/scripts/vagrant.sh b/templates/ubuntu-10.04-i386/scripts/vagrant.sh deleted file mode 100644 index 72dd2f444..000000000 --- a/templates/ubuntu-10.04-i386/scripts/vagrant.sh +++ /dev/null @@ -1,33 +0,0 @@ -#!/bin/bash -eux - -if [ -f /home/vagrant/.vbox_version ]; then - mkdir /tmp/vbox - VER=$(cat /home/vagrant/.vbox_version) - mount -o loop VBoxGuestAdditions_$VER.iso /tmp/vbox - sh /tmp/vbox/VBoxLinuxAdditions.run - umount /tmp/vbox - rmdir /tmp/vbox - rm *.iso -fi - -if [ -f /home/vagrant/.vmfusion_version ]; then - #Set Linux-specific paths and ISO filename - home_dir="/home/vagrant" - iso_name="linux.iso" - mount_point="/tmp/vmware-tools" - #Run install, unmount ISO and remove it - mkdir ${mount_point} - cd ${home_dir} - /bin/mount -o loop ${iso_name} ${mount_point} - tar zxf ${mount_point}/*.tar.gz && cd vmware-tools-distrib && ./vmware-install.pl --default - /bin/umount ${mount_point} - /bin/rm -rf ${home_dir}/${iso_name} ${home_dir}/vmware-tools-distrib - rmdir ${mount_point} -fi - -mkdir /home/vagrant/.ssh -wget --no-check-certificate \ - 'https://github.com/mitchellh/vagrant/raw/master/keys/vagrant.pub' \ - -O /home/vagrant/.ssh/authorized_keys -chown -R vagrant /home/vagrant/.ssh -chmod -R go-rwsx /home/vagrant/.ssh diff --git a/templates/ubuntu-10.04-i386/template.json b/templates/ubuntu-10.04-i386/template.json deleted file mode 100644 index d43c889e8..000000000 --- a/templates/ubuntu-10.04-i386/template.json +++ /dev/null @@ -1,133 +0,0 @@ -{ - "provisioners": [ - { - "type": "shell", - "scripts": [ - "scripts/update.sh", - "scripts/vagrant.sh", - "scripts/sshd.sh", - "scripts/networking.sh", - "scripts/sudoers.sh", - "scripts/cleanup.sh", - "scripts/minimize.sh" - ], - "override": { - "virtualbox": { - "execute_command": "echo 'vagrant'|sudo -S sh '{{.Path}}'" - }, - "vmware": { - "execute_command": "echo 'vagrant'|sudo -S sh '{{.Path}}'" - } - } - } - ], - "builders": [ - { - "type": "virtualbox", - "boot_command": [ - "<esc><wait>", - "<esc><wait>", - "<enter><wait>", - "/install/vmlinuz<wait>", - " auto<wait>", - " console-setup/ask_detect=false<wait>", - " console-setup/layoutcode=us<wait>", - " console-setup/modelcode=pc105<wait>", - " debconf/frontend=noninteractive<wait>", - " debian-installer=en_US<wait>", - " fb=false<wait>", - " initrd=/install/initrd.gz<wait>", - " kbd-chooser/method=us<wait>", - " keyboard-configuration/layout=USA<wait>", - " keyboard-configuration/variant=USA<wait>", - " locale=en_US<wait>", - " netcfg/get_domain=vm<wait>", - " netcfg/get_hostname=vagrant<wait>", - " noapic<wait>", - " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/preseed.cfg<wait>", - " -- <wait>", - "<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": 40960, - "guest_os_type": "Ubuntu", - "http_directory": "http", - "iso_checksum": "fc08a01e78348e3918180ea91a6883bb", - "iso_checksum_type": "md5", - "iso_url": "http://releases.ubuntu.com/10.04.4/ubuntu-10.04.4-server-i386.iso", - "ssh_username": "vagrant", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_wait_timeout": "10000s", - "shutdown_command": "echo 'shutdown -P now' > shutdown.sh; echo 'vagrant'|sudo -S sh 'shutdown.sh'", - "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", - "virtualbox_version_file": ".vbox_version", - "vboxmanage": [ - [ - "modifyvm", - "{{.Name}}", - "--memory", - "384" - ], - [ - "modifyvm", - "{{.Name}}", - "--cpus", - "1" - ] - ], - "iso_md5": "fc08a01e78348e3918180ea91a6883bb" - }, - { - "type": "vmware", - "boot_command": [ - "<esc><wait>", - "<esc><wait>", - "<enter><wait>", - "/install/vmlinuz<wait>", - " auto<wait>", - " console-setup/ask_detect=false<wait>", - " console-setup/layoutcode=us<wait>", - " console-setup/modelcode=pc105<wait>", - " debconf/frontend=noninteractive<wait>", - " debian-installer=en_US<wait>", - " fb=false<wait>", - " initrd=/install/initrd.gz<wait>", - " kbd-chooser/method=us<wait>", - " keyboard-configuration/layout=USA<wait>", - " keyboard-configuration/variant=USA<wait>", - " locale=en_US<wait>", - " netcfg/get_domain=vm<wait>", - " netcfg/get_hostname=vagrant<wait>", - " noapic<wait>", - " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/preseed.cfg<wait>", - " -- <wait>", - "<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": 40960, - "guest_os_type": "ubuntu", - "http_directory": "http", - "iso_checksum": "fc08a01e78348e3918180ea91a6883bb", - "iso_checksum_type": "md5", - "iso_url": "http://releases.ubuntu.com/10.04.4/ubuntu-10.04.4-server-i386.iso", - "ssh_username": "vagrant", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_wait_timeout": "10000s", - "shutdown_command": "echo 'shutdown -P now' > shutdown.sh; echo 'vagrant'|sudo -S sh 'shutdown.sh'", - "vmx_data": { - "memsize": "384", - "numvcpus": "1", - "cpuid.coresPerSocket": "1" - }, - "iso_md5": "fc08a01e78348e3918180ea91a6883bb" - } - ], - "post-provisioner": [ - { - "type": "vagrant", - "output": "ubuntu-10.04-i386-{{.Provisioner}}.box" - } - ] -} \ No newline at end of file diff --git a/templates/ubuntu-10.04/http/preseed.cfg b/templates/ubuntu-10.04/http/preseed.cfg deleted file mode 100644 index 903f2e14b..000000000 --- a/templates/ubuntu-10.04/http/preseed.cfg +++ /dev/null @@ -1,31 +0,0 @@ -choose-mirror-bin mirror/http/proxy string -d-i base-installer/kernel/override-image string linux-server -d-i clock-setup/utc boolean true -d-i clock-setup/utc-auto boolean true -d-i finish-install/reboot_in_progress note -d-i grub-installer/only_debian boolean true -d-i grub-installer/with_other_os boolean true -d-i partman-auto-lvm/guided_size string max -d-i partman-auto/choose_recipe select atomic -d-i partman-auto/method string lvm -d-i partman-lvm/confirm boolean true -d-i partman-lvm/confirm boolean true -d-i partman-lvm/confirm_nooverwrite boolean true -d-i partman-lvm/device_remove_lvm boolean true -d-i partman/choose_partition select finish -d-i partman/confirm boolean true -d-i partman/confirm_nooverwrite boolean true -d-i partman/confirm_write_new_label boolean true -d-i passwd/user-fullname string vagrant -d-i passwd/user-uid string 900 -d-i passwd/user-password password vagrant -d-i passwd/user-password-again password vagrant -d-i passwd/username string vagrant -d-i pkgsel/include string openssh-server cryptsetup build-essential libssl-dev libreadline-dev zlib1g-dev linux-source dkms -d-i pkgsel/install-language-support boolean false -d-i pkgsel/update-policy select unattended-upgrades -d-i pkgsel/upgrade select full-upgrade -d-i time/zone string UTC -d-i user-setup/allow-password-weak boolean true -d-i user-setup/encrypt-home boolean false -tasksel tasksel/first multiselect standard, ubuntu-server diff --git a/templates/ubuntu-10.04/scripts/cleanup.sh b/templates/ubuntu-10.04/scripts/cleanup.sh deleted file mode 100644 index 6c7f703d6..000000000 --- a/templates/ubuntu-10.04/scripts/cleanup.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/bash -eux - -apt-get -y autoremove -apt-get -y clean -rm -rf VBoxGuestAdditions_*.iso VBoxGuestAdditions_*.iso.? -rm -f /tmp/chef*deb diff --git a/templates/ubuntu-10.04/scripts/minimize.sh b/templates/ubuntu-10.04/scripts/minimize.sh deleted file mode 100644 index 3846a1d65..000000000 --- a/templates/ubuntu-10.04/scripts/minimize.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash -eux - -dd if=/dev/zero of=/EMPTY bs=1M -rm -f /EMPTY diff --git a/templates/ubuntu-10.04/scripts/networking.sh b/templates/ubuntu-10.04/scripts/networking.sh deleted file mode 100644 index de3269a58..000000000 --- a/templates/ubuntu-10.04/scripts/networking.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/bash -eux - -rm /etc/udev/rules.d/70-persistent-net.rules -mkdir /etc/udev/rules.d/70-persistent-net.rules -rm /lib/udev/rules.d/75-persistent-net-generator.rules -rm -rf /dev/.udev/ /var/lib/dhcp3/* -echo "pre-up sleep 2" >> /etc/network/interfaces diff --git a/templates/ubuntu-10.04/scripts/sshd.sh b/templates/ubuntu-10.04/scripts/sshd.sh deleted file mode 100644 index c6e4f20a6..000000000 --- a/templates/ubuntu-10.04/scripts/sshd.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash -eux - -echo "UseDNS no" >> /etc/ssh/sshd_config diff --git a/templates/ubuntu-10.04/scripts/sudoers.sh b/templates/ubuntu-10.04/scripts/sudoers.sh deleted file mode 100644 index ce45b7611..000000000 --- a/templates/ubuntu-10.04/scripts/sudoers.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash -eux - -sed -i -e '/Defaults\s\+env_reset/a Defaults\texempt_group=admin' /etc/sudoers -sed -i -e 's/%admin ALL=(ALL) ALL/%admin ALL=NOPASSWD:ALL/g' /etc/sudoers diff --git a/templates/ubuntu-10.04/scripts/update.sh b/templates/ubuntu-10.04/scripts/update.sh deleted file mode 100644 index 80e8dd3f9..000000000 --- a/templates/ubuntu-10.04/scripts/update.sh +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/bash -eux - -apt-get update -apt-get -y upgrade - -# ensure the correct kernel headers are installed -apt-get -y install linux-headers-$(uname -r) - -# update package index on boot -cat <<EOF > /etc/init/refresh-apt.conf -description "update package index" -start on networking -task -exec /usr/bin/apt-get update -EOF diff --git a/templates/ubuntu-10.04/scripts/vagrant.sh b/templates/ubuntu-10.04/scripts/vagrant.sh deleted file mode 100644 index 72dd2f444..000000000 --- a/templates/ubuntu-10.04/scripts/vagrant.sh +++ /dev/null @@ -1,33 +0,0 @@ -#!/bin/bash -eux - -if [ -f /home/vagrant/.vbox_version ]; then - mkdir /tmp/vbox - VER=$(cat /home/vagrant/.vbox_version) - mount -o loop VBoxGuestAdditions_$VER.iso /tmp/vbox - sh /tmp/vbox/VBoxLinuxAdditions.run - umount /tmp/vbox - rmdir /tmp/vbox - rm *.iso -fi - -if [ -f /home/vagrant/.vmfusion_version ]; then - #Set Linux-specific paths and ISO filename - home_dir="/home/vagrant" - iso_name="linux.iso" - mount_point="/tmp/vmware-tools" - #Run install, unmount ISO and remove it - mkdir ${mount_point} - cd ${home_dir} - /bin/mount -o loop ${iso_name} ${mount_point} - tar zxf ${mount_point}/*.tar.gz && cd vmware-tools-distrib && ./vmware-install.pl --default - /bin/umount ${mount_point} - /bin/rm -rf ${home_dir}/${iso_name} ${home_dir}/vmware-tools-distrib - rmdir ${mount_point} -fi - -mkdir /home/vagrant/.ssh -wget --no-check-certificate \ - 'https://github.com/mitchellh/vagrant/raw/master/keys/vagrant.pub' \ - -O /home/vagrant/.ssh/authorized_keys -chown -R vagrant /home/vagrant/.ssh -chmod -R go-rwsx /home/vagrant/.ssh diff --git a/templates/ubuntu-10.04/template.json b/templates/ubuntu-10.04/template.json deleted file mode 100644 index ba4203c41..000000000 --- a/templates/ubuntu-10.04/template.json +++ /dev/null @@ -1,194 +0,0 @@ -{ - "provisioners": [ - { - "type": "shell", - "scripts": [ - "scripts/update.sh", - "scripts/vagrant.sh", - "scripts/sshd.sh", - "scripts/networking.sh", - "scripts/sudoers.sh", - "scripts/cleanup.sh", - "scripts/minimize.sh" - ], - "override": { - "virtualbox-with-chef": { - "execute_command": "echo 'vagrant'|sudo -S sh '{{.Path}}'; curl https://opscode.com/chef/install.sh | sudo bash" - - }, - "virtualbox": { - "execute_command": "echo 'vagrant'|sudo -S sh '{{.Path}}'" - }, - "vmware": { - "execute_command": "echo 'vagrant'|sudo -S sh '{{.Path}}'" - } - } - } - ], - "builders": [ - { - "name": "virtualbox-with-chef", - "type": "virtualbox", - "boot_command": [ - "<esc><wait>", - "<esc><wait>", - "<enter><wait>", - "/install/vmlinuz<wait>", - " auto<wait>", - " console-setup/ask_detect=false<wait>", - " console-setup/layoutcode=us<wait>", - " console-setup/modelcode=pc105<wait>", - " debconf/frontend=noninteractive<wait>", - " debian-installer=en_US<wait>", - " fb=false<wait>", - " initrd=/install/initrd.gz<wait>", - " kbd-chooser/method=us<wait>", - " keyboard-configuration/layout=USA<wait>", - " keyboard-configuration/variant=USA<wait>", - " locale=en_US<wait>", - " netcfg/get_domain=vm<wait>", - " netcfg/get_hostname=vagrant<wait>", - " noapic<wait>", - " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/preseed.cfg<wait>", - " -- <wait>", - "<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": 40960, - "guest_os_type": "Ubuntu_64", - "http_directory": "http", - "iso_checksum": "9b218654cdcdf9722171648c52f8a088", - "iso_checksum_type": "md5", - "iso_url": "http://releases.ubuntu.com/10.04.4/ubuntu-10.04.4-server-amd64.iso", - "ssh_username": "vagrant", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_wait_timeout": "10000s", - "shutdown_command": "echo 'shutdown -P now' > shutdown.sh; echo 'vagrant'|sudo -S sh 'shutdown.sh'", - "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", - "virtualbox_version_file": ".vbox_version", - "vboxmanage": [ - [ - "modifyvm", - "{{.Name}}", - "--memory", - "384" - ], - [ - "modifyvm", - "{{.Name}}", - "--cpus", - "1" - ] - ], - "iso_md5": "9b218654cdcdf9722171648c52f8a088" - }, - { - "type": "virtualbox", - "boot_command": [ - "<esc><wait>", - "<esc><wait>", - "<enter><wait>", - "/install/vmlinuz<wait>", - " auto<wait>", - " console-setup/ask_detect=false<wait>", - " console-setup/layoutcode=us<wait>", - " console-setup/modelcode=pc105<wait>", - " debconf/frontend=noninteractive<wait>", - " debian-installer=en_US<wait>", - " fb=false<wait>", - " initrd=/install/initrd.gz<wait>", - " kbd-chooser/method=us<wait>", - " keyboard-configuration/layout=USA<wait>", - " keyboard-configuration/variant=USA<wait>", - " locale=en_US<wait>", - " netcfg/get_domain=vm<wait>", - " netcfg/get_hostname=vagrant<wait>", - " noapic<wait>", - " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/preseed.cfg<wait>", - " -- <wait>", - "<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": 40960, - "guest_os_type": "Ubuntu_64", - "http_directory": "http", - "iso_checksum": "9b218654cdcdf9722171648c52f8a088", - "iso_checksum_type": "md5", - "iso_url": "http://releases.ubuntu.com/10.04.4/ubuntu-10.04.4-server-amd64.iso", - "ssh_username": "vagrant", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_wait_timeout": "10000s", - "shutdown_command": "echo 'shutdown -P now' > shutdown.sh; echo 'vagrant'|sudo -S sh 'shutdown.sh'", - "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", - "virtualbox_version_file": ".vbox_version", - "vboxmanage": [ - [ - "modifyvm", - "{{.Name}}", - "--memory", - "384" - ], - [ - "modifyvm", - "{{.Name}}", - "--cpus", - "1" - ] - ], - "iso_md5": "9b218654cdcdf9722171648c52f8a088" - }, - { - "type": "vmware", - "boot_command": [ - "<esc><wait>", - "<esc><wait>", - "<enter><wait>", - "/install/vmlinuz<wait>", - " auto<wait>", - " console-setup/ask_detect=false<wait>", - " console-setup/layoutcode=us<wait>", - " console-setup/modelcode=pc105<wait>", - " debconf/frontend=noninteractive<wait>", - " debian-installer=en_US<wait>", - " fb=false<wait>", - " initrd=/install/initrd.gz<wait>", - " kbd-chooser/method=us<wait>", - " keyboard-configuration/layout=USA<wait>", - " keyboard-configuration/variant=USA<wait>", - " locale=en_US<wait>", - " netcfg/get_domain=vm<wait>", - " netcfg/get_hostname=vagrant<wait>", - " noapic<wait>", - " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/preseed.cfg<wait>", - " -- <wait>", - "<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": 40960, - "guest_os_type": "ubuntu-64", - "http_directory": "http", - "iso_checksum": "9b218654cdcdf9722171648c52f8a088", - "iso_checksum_type": "md5", - "iso_url": "http://releases.ubuntu.com/10.04.4/ubuntu-10.04.4-server-amd64.iso", - "ssh_username": "vagrant", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_wait_timeout": "10000s", - "shutdown_command": "echo 'shutdown -P now' > shutdown.sh; echo 'vagrant'|sudo -S sh 'shutdown.sh'", - "vmx_data": { - "memsize": "384", - "numvcpus": "1", - "cpuid.coresPerSocket": "1" - }, - "iso_md5": "9b218654cdcdf9722171648c52f8a088" - } - ], - "post-provisioner": [ - { - "type": "vagrant", - "output": "ubuntu-10.04-{{.Provisioner}}.box" - } - ] -} diff --git a/templates/ubuntu-10.10/http/preseed.cfg b/templates/ubuntu-10.10/http/preseed.cfg deleted file mode 100644 index 903f2e14b..000000000 --- a/templates/ubuntu-10.10/http/preseed.cfg +++ /dev/null @@ -1,31 +0,0 @@ -choose-mirror-bin mirror/http/proxy string -d-i base-installer/kernel/override-image string linux-server -d-i clock-setup/utc boolean true -d-i clock-setup/utc-auto boolean true -d-i finish-install/reboot_in_progress note -d-i grub-installer/only_debian boolean true -d-i grub-installer/with_other_os boolean true -d-i partman-auto-lvm/guided_size string max -d-i partman-auto/choose_recipe select atomic -d-i partman-auto/method string lvm -d-i partman-lvm/confirm boolean true -d-i partman-lvm/confirm boolean true -d-i partman-lvm/confirm_nooverwrite boolean true -d-i partman-lvm/device_remove_lvm boolean true -d-i partman/choose_partition select finish -d-i partman/confirm boolean true -d-i partman/confirm_nooverwrite boolean true -d-i partman/confirm_write_new_label boolean true -d-i passwd/user-fullname string vagrant -d-i passwd/user-uid string 900 -d-i passwd/user-password password vagrant -d-i passwd/user-password-again password vagrant -d-i passwd/username string vagrant -d-i pkgsel/include string openssh-server cryptsetup build-essential libssl-dev libreadline-dev zlib1g-dev linux-source dkms -d-i pkgsel/install-language-support boolean false -d-i pkgsel/update-policy select unattended-upgrades -d-i pkgsel/upgrade select full-upgrade -d-i time/zone string UTC -d-i user-setup/allow-password-weak boolean true -d-i user-setup/encrypt-home boolean false -tasksel tasksel/first multiselect standard, ubuntu-server diff --git a/templates/ubuntu-10.10/scripts/cleanup.sh b/templates/ubuntu-10.10/scripts/cleanup.sh deleted file mode 100644 index 6c7f703d6..000000000 --- a/templates/ubuntu-10.10/scripts/cleanup.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/bash -eux - -apt-get -y autoremove -apt-get -y clean -rm -rf VBoxGuestAdditions_*.iso VBoxGuestAdditions_*.iso.? -rm -f /tmp/chef*deb diff --git a/templates/ubuntu-10.10/scripts/minimize.sh b/templates/ubuntu-10.10/scripts/minimize.sh deleted file mode 100644 index 3846a1d65..000000000 --- a/templates/ubuntu-10.10/scripts/minimize.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash -eux - -dd if=/dev/zero of=/EMPTY bs=1M -rm -f /EMPTY diff --git a/templates/ubuntu-10.10/scripts/networking.sh b/templates/ubuntu-10.10/scripts/networking.sh deleted file mode 100644 index de3269a58..000000000 --- a/templates/ubuntu-10.10/scripts/networking.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/bash -eux - -rm /etc/udev/rules.d/70-persistent-net.rules -mkdir /etc/udev/rules.d/70-persistent-net.rules -rm /lib/udev/rules.d/75-persistent-net-generator.rules -rm -rf /dev/.udev/ /var/lib/dhcp3/* -echo "pre-up sleep 2" >> /etc/network/interfaces diff --git a/templates/ubuntu-10.10/scripts/sshd.sh b/templates/ubuntu-10.10/scripts/sshd.sh deleted file mode 100644 index c6e4f20a6..000000000 --- a/templates/ubuntu-10.10/scripts/sshd.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash -eux - -echo "UseDNS no" >> /etc/ssh/sshd_config diff --git a/templates/ubuntu-10.10/scripts/sudoers.sh b/templates/ubuntu-10.10/scripts/sudoers.sh deleted file mode 100644 index ce45b7611..000000000 --- a/templates/ubuntu-10.10/scripts/sudoers.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash -eux - -sed -i -e '/Defaults\s\+env_reset/a Defaults\texempt_group=admin' /etc/sudoers -sed -i -e 's/%admin ALL=(ALL) ALL/%admin ALL=NOPASSWD:ALL/g' /etc/sudoers diff --git a/templates/ubuntu-10.10/scripts/update.sh b/templates/ubuntu-10.10/scripts/update.sh deleted file mode 100644 index 80e8dd3f9..000000000 --- a/templates/ubuntu-10.10/scripts/update.sh +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/bash -eux - -apt-get update -apt-get -y upgrade - -# ensure the correct kernel headers are installed -apt-get -y install linux-headers-$(uname -r) - -# update package index on boot -cat <<EOF > /etc/init/refresh-apt.conf -description "update package index" -start on networking -task -exec /usr/bin/apt-get update -EOF diff --git a/templates/ubuntu-10.10/scripts/vagrant.sh b/templates/ubuntu-10.10/scripts/vagrant.sh deleted file mode 100644 index 72dd2f444..000000000 --- a/templates/ubuntu-10.10/scripts/vagrant.sh +++ /dev/null @@ -1,33 +0,0 @@ -#!/bin/bash -eux - -if [ -f /home/vagrant/.vbox_version ]; then - mkdir /tmp/vbox - VER=$(cat /home/vagrant/.vbox_version) - mount -o loop VBoxGuestAdditions_$VER.iso /tmp/vbox - sh /tmp/vbox/VBoxLinuxAdditions.run - umount /tmp/vbox - rmdir /tmp/vbox - rm *.iso -fi - -if [ -f /home/vagrant/.vmfusion_version ]; then - #Set Linux-specific paths and ISO filename - home_dir="/home/vagrant" - iso_name="linux.iso" - mount_point="/tmp/vmware-tools" - #Run install, unmount ISO and remove it - mkdir ${mount_point} - cd ${home_dir} - /bin/mount -o loop ${iso_name} ${mount_point} - tar zxf ${mount_point}/*.tar.gz && cd vmware-tools-distrib && ./vmware-install.pl --default - /bin/umount ${mount_point} - /bin/rm -rf ${home_dir}/${iso_name} ${home_dir}/vmware-tools-distrib - rmdir ${mount_point} -fi - -mkdir /home/vagrant/.ssh -wget --no-check-certificate \ - 'https://github.com/mitchellh/vagrant/raw/master/keys/vagrant.pub' \ - -O /home/vagrant/.ssh/authorized_keys -chown -R vagrant /home/vagrant/.ssh -chmod -R go-rwsx /home/vagrant/.ssh diff --git a/templates/ubuntu-10.10/template.json b/templates/ubuntu-10.10/template.json deleted file mode 100644 index 716827697..000000000 --- a/templates/ubuntu-10.10/template.json +++ /dev/null @@ -1,133 +0,0 @@ -{ - "provisioners": [ - { - "type": "shell", - "scripts": [ - "scripts/update.sh", - "scripts/vagrant.sh", - "scripts/sshd.sh", - "scripts/networking.sh", - "scripts/sudoers.sh", - "scripts/cleanup.sh", - "scripts/minimize.sh" - ], - "override": { - "virtualbox": { - "execute_command": "echo 'vagrant'|sudo -S sh '{{.Path}}'" - }, - "vmware": { - "execute_command": "echo 'vagrant'|sudo -S sh '{{.Path}}'" - } - } - } - ], - "builders": [ - { - "type": "virtualbox", - "boot_command": [ - "<esc><wait>", - "<esc><wait>", - "<enter><wait>", - "/install/vmlinuz<wait>", - " auto<wait>", - " console-setup/ask_detect=false<wait>", - " console-setup/layoutcode=us<wait>", - " console-setup/modelcode=pc105<wait>", - " debconf/frontend=noninteractive<wait>", - " debian-installer=en_US<wait>", - " fb=false<wait>", - " initrd=/install/initrd.gz<wait>", - " kbd-chooser/method=us<wait>", - " keyboard-configuration/layout=USA<wait>", - " keyboard-configuration/variant=USA<wait>", - " locale=en_US<wait>", - " netcfg/get_domain=vm<wait>", - " netcfg/get_hostname=vagrant<wait>", - " noapic<wait>", - " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/preseed.cfg<wait>", - " -- <wait>", - "<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": 40960, - "guest_os_type": "Ubuntu_64", - "http_directory": "http", - "iso_checksum": "ab66a1d59a8d78e9ea8ef9b021d6574a", - "iso_checksum_type": "md5", - "iso_url": "http://releases.ubuntu.com/10.10/ubuntu-10.10-server-amd64.iso", - "ssh_username": "vagrant", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_wait_timeout": "10000s", - "shutdown_command": "echo 'shutdown -P now' > shutdown.sh; echo 'vagrant'|sudo -S sh 'shutdown.sh'", - "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", - "virtualbox_version_file": ".vbox_version", - "vboxmanage": [ - [ - "modifyvm", - "{{.Name}}", - "--memory", - "384" - ], - [ - "modifyvm", - "{{.Name}}", - "--cpus", - "1" - ] - ], - "iso_md5": "ab66a1d59a8d78e9ea8ef9b021d6574a" - }, - { - "type": "vmware", - "boot_command": [ - "<esc><wait>", - "<esc><wait>", - "<enter><wait>", - "/install/vmlinuz<wait>", - " auto<wait>", - " console-setup/ask_detect=false<wait>", - " console-setup/layoutcode=us<wait>", - " console-setup/modelcode=pc105<wait>", - " debconf/frontend=noninteractive<wait>", - " debian-installer=en_US<wait>", - " fb=false<wait>", - " initrd=/install/initrd.gz<wait>", - " kbd-chooser/method=us<wait>", - " keyboard-configuration/layout=USA<wait>", - " keyboard-configuration/variant=USA<wait>", - " locale=en_US<wait>", - " netcfg/get_domain=vm<wait>", - " netcfg/get_hostname=vagrant<wait>", - " noapic<wait>", - " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/preseed.cfg<wait>", - " -- <wait>", - "<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": 40960, - "guest_os_type": "ubuntu-64", - "http_directory": "http", - "iso_checksum": "ab66a1d59a8d78e9ea8ef9b021d6574a", - "iso_checksum_type": "md5", - "iso_url": "http://releases.ubuntu.com/10.10/ubuntu-10.10-server-amd64.iso", - "ssh_username": "vagrant", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_wait_timeout": "10000s", - "shutdown_command": "echo 'shutdown -P now' > shutdown.sh; echo 'vagrant'|sudo -S sh 'shutdown.sh'", - "vmx_data": { - "memsize": "384", - "numvcpus": "1", - "cpuid.coresPerSocket": "1" - }, - "iso_md5": "ab66a1d59a8d78e9ea8ef9b021d6574a" - } - ], - "post-provisioner": [ - { - "type": "vagrant", - "output": "ubuntu-10.10-{{.Provisioner}}.box" - } - ] -} \ No newline at end of file diff --git a/templates/ubuntu-11.04/http/preseed.cfg b/templates/ubuntu-11.04/http/preseed.cfg deleted file mode 100644 index 903f2e14b..000000000 --- a/templates/ubuntu-11.04/http/preseed.cfg +++ /dev/null @@ -1,31 +0,0 @@ -choose-mirror-bin mirror/http/proxy string -d-i base-installer/kernel/override-image string linux-server -d-i clock-setup/utc boolean true -d-i clock-setup/utc-auto boolean true -d-i finish-install/reboot_in_progress note -d-i grub-installer/only_debian boolean true -d-i grub-installer/with_other_os boolean true -d-i partman-auto-lvm/guided_size string max -d-i partman-auto/choose_recipe select atomic -d-i partman-auto/method string lvm -d-i partman-lvm/confirm boolean true -d-i partman-lvm/confirm boolean true -d-i partman-lvm/confirm_nooverwrite boolean true -d-i partman-lvm/device_remove_lvm boolean true -d-i partman/choose_partition select finish -d-i partman/confirm boolean true -d-i partman/confirm_nooverwrite boolean true -d-i partman/confirm_write_new_label boolean true -d-i passwd/user-fullname string vagrant -d-i passwd/user-uid string 900 -d-i passwd/user-password password vagrant -d-i passwd/user-password-again password vagrant -d-i passwd/username string vagrant -d-i pkgsel/include string openssh-server cryptsetup build-essential libssl-dev libreadline-dev zlib1g-dev linux-source dkms -d-i pkgsel/install-language-support boolean false -d-i pkgsel/update-policy select unattended-upgrades -d-i pkgsel/upgrade select full-upgrade -d-i time/zone string UTC -d-i user-setup/allow-password-weak boolean true -d-i user-setup/encrypt-home boolean false -tasksel tasksel/first multiselect standard, ubuntu-server diff --git a/templates/ubuntu-11.04/scripts/cleanup.sh b/templates/ubuntu-11.04/scripts/cleanup.sh deleted file mode 100644 index 6c7f703d6..000000000 --- a/templates/ubuntu-11.04/scripts/cleanup.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/bash -eux - -apt-get -y autoremove -apt-get -y clean -rm -rf VBoxGuestAdditions_*.iso VBoxGuestAdditions_*.iso.? -rm -f /tmp/chef*deb diff --git a/templates/ubuntu-11.04/scripts/minimize.sh b/templates/ubuntu-11.04/scripts/minimize.sh deleted file mode 100644 index 3846a1d65..000000000 --- a/templates/ubuntu-11.04/scripts/minimize.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash -eux - -dd if=/dev/zero of=/EMPTY bs=1M -rm -f /EMPTY diff --git a/templates/ubuntu-11.04/scripts/networking.sh b/templates/ubuntu-11.04/scripts/networking.sh deleted file mode 100644 index de3269a58..000000000 --- a/templates/ubuntu-11.04/scripts/networking.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/bash -eux - -rm /etc/udev/rules.d/70-persistent-net.rules -mkdir /etc/udev/rules.d/70-persistent-net.rules -rm /lib/udev/rules.d/75-persistent-net-generator.rules -rm -rf /dev/.udev/ /var/lib/dhcp3/* -echo "pre-up sleep 2" >> /etc/network/interfaces diff --git a/templates/ubuntu-11.04/scripts/sshd.sh b/templates/ubuntu-11.04/scripts/sshd.sh deleted file mode 100644 index c6e4f20a6..000000000 --- a/templates/ubuntu-11.04/scripts/sshd.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash -eux - -echo "UseDNS no" >> /etc/ssh/sshd_config diff --git a/templates/ubuntu-11.04/scripts/sudoers.sh b/templates/ubuntu-11.04/scripts/sudoers.sh deleted file mode 100644 index ce45b7611..000000000 --- a/templates/ubuntu-11.04/scripts/sudoers.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash -eux - -sed -i -e '/Defaults\s\+env_reset/a Defaults\texempt_group=admin' /etc/sudoers -sed -i -e 's/%admin ALL=(ALL) ALL/%admin ALL=NOPASSWD:ALL/g' /etc/sudoers diff --git a/templates/ubuntu-11.04/scripts/update.sh b/templates/ubuntu-11.04/scripts/update.sh deleted file mode 100644 index 80e8dd3f9..000000000 --- a/templates/ubuntu-11.04/scripts/update.sh +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/bash -eux - -apt-get update -apt-get -y upgrade - -# ensure the correct kernel headers are installed -apt-get -y install linux-headers-$(uname -r) - -# update package index on boot -cat <<EOF > /etc/init/refresh-apt.conf -description "update package index" -start on networking -task -exec /usr/bin/apt-get update -EOF diff --git a/templates/ubuntu-11.04/scripts/vagrant.sh b/templates/ubuntu-11.04/scripts/vagrant.sh deleted file mode 100644 index 72dd2f444..000000000 --- a/templates/ubuntu-11.04/scripts/vagrant.sh +++ /dev/null @@ -1,33 +0,0 @@ -#!/bin/bash -eux - -if [ -f /home/vagrant/.vbox_version ]; then - mkdir /tmp/vbox - VER=$(cat /home/vagrant/.vbox_version) - mount -o loop VBoxGuestAdditions_$VER.iso /tmp/vbox - sh /tmp/vbox/VBoxLinuxAdditions.run - umount /tmp/vbox - rmdir /tmp/vbox - rm *.iso -fi - -if [ -f /home/vagrant/.vmfusion_version ]; then - #Set Linux-specific paths and ISO filename - home_dir="/home/vagrant" - iso_name="linux.iso" - mount_point="/tmp/vmware-tools" - #Run install, unmount ISO and remove it - mkdir ${mount_point} - cd ${home_dir} - /bin/mount -o loop ${iso_name} ${mount_point} - tar zxf ${mount_point}/*.tar.gz && cd vmware-tools-distrib && ./vmware-install.pl --default - /bin/umount ${mount_point} - /bin/rm -rf ${home_dir}/${iso_name} ${home_dir}/vmware-tools-distrib - rmdir ${mount_point} -fi - -mkdir /home/vagrant/.ssh -wget --no-check-certificate \ - 'https://github.com/mitchellh/vagrant/raw/master/keys/vagrant.pub' \ - -O /home/vagrant/.ssh/authorized_keys -chown -R vagrant /home/vagrant/.ssh -chmod -R go-rwsx /home/vagrant/.ssh diff --git a/templates/ubuntu-11.04/template.json b/templates/ubuntu-11.04/template.json deleted file mode 100644 index 91427bf9f..000000000 --- a/templates/ubuntu-11.04/template.json +++ /dev/null @@ -1,133 +0,0 @@ -{ - "provisioners": [ - { - "type": "shell", - "scripts": [ - "scripts/update.sh", - "scripts/vagrant.sh", - "scripts/sshd.sh", - "scripts/networking.sh", - "scripts/sudoers.sh", - "scripts/cleanup.sh", - "scripts/minimize.sh" - ], - "override": { - "virtualbox": { - "execute_command": "echo 'vagrant'|sudo -S sh '{{.Path}}'" - }, - "vmware": { - "execute_command": "echo 'vagrant'|sudo -S sh '{{.Path}}'" - } - } - } - ], - "builders": [ - { - "type": "virtualbox", - "boot_command": [ - "<esc><wait>", - "<esc><wait>", - "<enter><wait>", - "/install/vmlinuz<wait>", - " auto<wait>", - " console-setup/ask_detect=false<wait>", - " console-setup/layoutcode=us<wait>", - " console-setup/modelcode=pc105<wait>", - " debconf/frontend=noninteractive<wait>", - " debian-installer=en_US<wait>", - " fb=false<wait>", - " initrd=/install/initrd.gz<wait>", - " kbd-chooser/method=us<wait>", - " keyboard-configuration/layout=USA<wait>", - " keyboard-configuration/variant=USA<wait>", - " locale=en_US<wait>", - " netcfg/get_domain=vm<wait>", - " netcfg/get_hostname=vagrant<wait>", - " noapic<wait>", - " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/preseed.cfg<wait>", - " -- <wait>", - "<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": 40960, - "guest_os_type": "Ubuntu_64", - "http_directory": "http", - "iso_checksum": "355ca2417522cb4a77e0295bf45c5cd5", - "iso_checksum_type": "md5", - "iso_url": "http://releases.ubuntu.com/11.04/ubuntu-11.04-server-amd64.iso", - "ssh_username": "vagrant", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_wait_timeout": "10000s", - "shutdown_command": "echo 'shutdown -P now' > shutdown.sh; echo 'vagrant'|sudo -S sh 'shutdown.sh'", - "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", - "virtualbox_version_file": ".vbox_version", - "vboxmanage": [ - [ - "modifyvm", - "{{.Name}}", - "--memory", - "384" - ], - [ - "modifyvm", - "{{.Name}}", - "--cpus", - "1" - ] - ], - "iso_md5": "355ca2417522cb4a77e0295bf45c5cd5" - }, - { - "type": "vmware", - "boot_command": [ - "<esc><wait>", - "<esc><wait>", - "<enter><wait>", - "/install/vmlinuz<wait>", - " auto<wait>", - " console-setup/ask_detect=false<wait>", - " console-setup/layoutcode=us<wait>", - " console-setup/modelcode=pc105<wait>", - " debconf/frontend=noninteractive<wait>", - " debian-installer=en_US<wait>", - " fb=false<wait>", - " initrd=/install/initrd.gz<wait>", - " kbd-chooser/method=us<wait>", - " keyboard-configuration/layout=USA<wait>", - " keyboard-configuration/variant=USA<wait>", - " locale=en_US<wait>", - " netcfg/get_domain=vm<wait>", - " netcfg/get_hostname=vagrant<wait>", - " noapic<wait>", - " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/preseed.cfg<wait>", - " -- <wait>", - "<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": 40960, - "guest_os_type": "ubuntu-64", - "http_directory": "http", - "iso_checksum": "355ca2417522cb4a77e0295bf45c5cd5", - "iso_checksum_type": "md5", - "iso_url": "http://releases.ubuntu.com/11.04/ubuntu-11.04-server-amd64.iso", - "ssh_username": "vagrant", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_wait_timeout": "10000s", - "shutdown_command": "echo 'shutdown -P now' > shutdown.sh; echo 'vagrant'|sudo -S sh 'shutdown.sh'", - "vmx_data": { - "memsize": "384", - "numvcpus": "1", - "cpuid.coresPerSocket": "1" - }, - "iso_md5": "355ca2417522cb4a77e0295bf45c5cd5" - } - ], - "post-provisioner": [ - { - "type": "vagrant", - "output": "ubuntu-11.04-{{.Provisioner}}.box" - } - ] -} \ No newline at end of file diff --git a/templates/ubuntu-11.10/http/preseed.cfg b/templates/ubuntu-11.10/http/preseed.cfg deleted file mode 100644 index 903f2e14b..000000000 --- a/templates/ubuntu-11.10/http/preseed.cfg +++ /dev/null @@ -1,31 +0,0 @@ -choose-mirror-bin mirror/http/proxy string -d-i base-installer/kernel/override-image string linux-server -d-i clock-setup/utc boolean true -d-i clock-setup/utc-auto boolean true -d-i finish-install/reboot_in_progress note -d-i grub-installer/only_debian boolean true -d-i grub-installer/with_other_os boolean true -d-i partman-auto-lvm/guided_size string max -d-i partman-auto/choose_recipe select atomic -d-i partman-auto/method string lvm -d-i partman-lvm/confirm boolean true -d-i partman-lvm/confirm boolean true -d-i partman-lvm/confirm_nooverwrite boolean true -d-i partman-lvm/device_remove_lvm boolean true -d-i partman/choose_partition select finish -d-i partman/confirm boolean true -d-i partman/confirm_nooverwrite boolean true -d-i partman/confirm_write_new_label boolean true -d-i passwd/user-fullname string vagrant -d-i passwd/user-uid string 900 -d-i passwd/user-password password vagrant -d-i passwd/user-password-again password vagrant -d-i passwd/username string vagrant -d-i pkgsel/include string openssh-server cryptsetup build-essential libssl-dev libreadline-dev zlib1g-dev linux-source dkms -d-i pkgsel/install-language-support boolean false -d-i pkgsel/update-policy select unattended-upgrades -d-i pkgsel/upgrade select full-upgrade -d-i time/zone string UTC -d-i user-setup/allow-password-weak boolean true -d-i user-setup/encrypt-home boolean false -tasksel tasksel/first multiselect standard, ubuntu-server diff --git a/templates/ubuntu-11.10/scripts/cleanup.sh b/templates/ubuntu-11.10/scripts/cleanup.sh deleted file mode 100644 index 6c7f703d6..000000000 --- a/templates/ubuntu-11.10/scripts/cleanup.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/bash -eux - -apt-get -y autoremove -apt-get -y clean -rm -rf VBoxGuestAdditions_*.iso VBoxGuestAdditions_*.iso.? -rm -f /tmp/chef*deb diff --git a/templates/ubuntu-11.10/scripts/minimize.sh b/templates/ubuntu-11.10/scripts/minimize.sh deleted file mode 100644 index 3846a1d65..000000000 --- a/templates/ubuntu-11.10/scripts/minimize.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash -eux - -dd if=/dev/zero of=/EMPTY bs=1M -rm -f /EMPTY diff --git a/templates/ubuntu-11.10/scripts/networking.sh b/templates/ubuntu-11.10/scripts/networking.sh deleted file mode 100644 index de3269a58..000000000 --- a/templates/ubuntu-11.10/scripts/networking.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/bash -eux - -rm /etc/udev/rules.d/70-persistent-net.rules -mkdir /etc/udev/rules.d/70-persistent-net.rules -rm /lib/udev/rules.d/75-persistent-net-generator.rules -rm -rf /dev/.udev/ /var/lib/dhcp3/* -echo "pre-up sleep 2" >> /etc/network/interfaces diff --git a/templates/ubuntu-11.10/scripts/sshd.sh b/templates/ubuntu-11.10/scripts/sshd.sh deleted file mode 100644 index c6e4f20a6..000000000 --- a/templates/ubuntu-11.10/scripts/sshd.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash -eux - -echo "UseDNS no" >> /etc/ssh/sshd_config diff --git a/templates/ubuntu-11.10/scripts/sudoers.sh b/templates/ubuntu-11.10/scripts/sudoers.sh deleted file mode 100644 index ce45b7611..000000000 --- a/templates/ubuntu-11.10/scripts/sudoers.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash -eux - -sed -i -e '/Defaults\s\+env_reset/a Defaults\texempt_group=admin' /etc/sudoers -sed -i -e 's/%admin ALL=(ALL) ALL/%admin ALL=NOPASSWD:ALL/g' /etc/sudoers diff --git a/templates/ubuntu-11.10/scripts/update.sh b/templates/ubuntu-11.10/scripts/update.sh deleted file mode 100644 index 80e8dd3f9..000000000 --- a/templates/ubuntu-11.10/scripts/update.sh +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/bash -eux - -apt-get update -apt-get -y upgrade - -# ensure the correct kernel headers are installed -apt-get -y install linux-headers-$(uname -r) - -# update package index on boot -cat <<EOF > /etc/init/refresh-apt.conf -description "update package index" -start on networking -task -exec /usr/bin/apt-get update -EOF diff --git a/templates/ubuntu-11.10/scripts/vagrant.sh b/templates/ubuntu-11.10/scripts/vagrant.sh deleted file mode 100644 index 72dd2f444..000000000 --- a/templates/ubuntu-11.10/scripts/vagrant.sh +++ /dev/null @@ -1,33 +0,0 @@ -#!/bin/bash -eux - -if [ -f /home/vagrant/.vbox_version ]; then - mkdir /tmp/vbox - VER=$(cat /home/vagrant/.vbox_version) - mount -o loop VBoxGuestAdditions_$VER.iso /tmp/vbox - sh /tmp/vbox/VBoxLinuxAdditions.run - umount /tmp/vbox - rmdir /tmp/vbox - rm *.iso -fi - -if [ -f /home/vagrant/.vmfusion_version ]; then - #Set Linux-specific paths and ISO filename - home_dir="/home/vagrant" - iso_name="linux.iso" - mount_point="/tmp/vmware-tools" - #Run install, unmount ISO and remove it - mkdir ${mount_point} - cd ${home_dir} - /bin/mount -o loop ${iso_name} ${mount_point} - tar zxf ${mount_point}/*.tar.gz && cd vmware-tools-distrib && ./vmware-install.pl --default - /bin/umount ${mount_point} - /bin/rm -rf ${home_dir}/${iso_name} ${home_dir}/vmware-tools-distrib - rmdir ${mount_point} -fi - -mkdir /home/vagrant/.ssh -wget --no-check-certificate \ - 'https://github.com/mitchellh/vagrant/raw/master/keys/vagrant.pub' \ - -O /home/vagrant/.ssh/authorized_keys -chown -R vagrant /home/vagrant/.ssh -chmod -R go-rwsx /home/vagrant/.ssh diff --git a/templates/ubuntu-11.10/template.json b/templates/ubuntu-11.10/template.json deleted file mode 100644 index 3d2bb19ef..000000000 --- a/templates/ubuntu-11.10/template.json +++ /dev/null @@ -1,133 +0,0 @@ -{ - "provisioners": [ - { - "type": "shell", - "scripts": [ - "scripts/update.sh", - "scripts/vagrant.sh", - "scripts/sshd.sh", - "scripts/networking.sh", - "scripts/sudoers.sh", - "scripts/cleanup.sh", - "scripts/minimize.sh" - ], - "override": { - "virtualbox": { - "execute_command": "echo 'vagrant'|sudo -S sh '{{.Path}}'" - }, - "vmware": { - "execute_command": "echo 'vagrant'|sudo -S sh '{{.Path}}'" - } - } - } - ], - "builders": [ - { - "type": "virtualbox", - "boot_command": [ - "<esc><wait>", - "<esc><wait>", - "<enter><wait>", - "/install/vmlinuz<wait>", - " auto<wait>", - " console-setup/ask_detect=false<wait>", - " console-setup/layoutcode=us<wait>", - " console-setup/modelcode=pc105<wait>", - " debconf/frontend=noninteractive<wait>", - " debian-installer=en_US<wait>", - " fb=false<wait>", - " initrd=/install/initrd.gz<wait>", - " kbd-chooser/method=us<wait>", - " keyboard-configuration/layout=USA<wait>", - " keyboard-configuration/variant=USA<wait>", - " locale=en_US<wait>", - " netcfg/get_domain=vm<wait>", - " netcfg/get_hostname=vagrant<wait>", - " noapic<wait>", - " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/preseed.cfg<wait>", - " -- <wait>", - "<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": 40960, - "guest_os_type": "Ubuntu_64", - "http_directory": "http", - "iso_checksum": "f8a0112b7cb5dcd6d564dbe59f18c35f", - "iso_checksum_type": "md5", - "iso_url": "http://releases.ubuntu.com/11.10/ubuntu-11.10-server-amd64.iso", - "ssh_username": "vagrant", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_wait_timeout": "10000s", - "shutdown_command": "echo 'shutdown -P now' > shutdown.sh; echo 'vagrant'|sudo -S sh 'shutdown.sh'", - "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", - "virtualbox_version_file": ".vbox_version", - "vboxmanage": [ - [ - "modifyvm", - "{{.Name}}", - "--memory", - "384" - ], - [ - "modifyvm", - "{{.Name}}", - "--cpus", - "1" - ] - ], - "iso_md5": "f8a0112b7cb5dcd6d564dbe59f18c35f" - }, - { - "type": "vmware", - "boot_command": [ - "<esc><wait>", - "<esc><wait>", - "<enter><wait>", - "/install/vmlinuz<wait>", - " auto<wait>", - " console-setup/ask_detect=false<wait>", - " console-setup/layoutcode=us<wait>", - " console-setup/modelcode=pc105<wait>", - " debconf/frontend=noninteractive<wait>", - " debian-installer=en_US<wait>", - " fb=false<wait>", - " initrd=/install/initrd.gz<wait>", - " kbd-chooser/method=us<wait>", - " keyboard-configuration/layout=USA<wait>", - " keyboard-configuration/variant=USA<wait>", - " locale=en_US<wait>", - " netcfg/get_domain=vm<wait>", - " netcfg/get_hostname=vagrant<wait>", - " noapic<wait>", - " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/preseed.cfg<wait>", - " -- <wait>", - "<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": 40960, - "guest_os_type": "ubuntu-64", - "http_directory": "http", - "iso_checksum": "f8a0112b7cb5dcd6d564dbe59f18c35f", - "iso_checksum_type": "md5", - "iso_url": "http://releases.ubuntu.com/11.10/ubuntu-11.10-server-amd64.iso", - "ssh_username": "vagrant", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_wait_timeout": "10000s", - "shutdown_command": "echo 'shutdown -P now' > shutdown.sh; echo 'vagrant'|sudo -S sh 'shutdown.sh'", - "vmx_data": { - "memsize": "384", - "numvcpus": "1", - "cpuid.coresPerSocket": "1" - }, - "iso_md5": "f8a0112b7cb5dcd6d564dbe59f18c35f" - } - ], - "post-provisioner": [ - { - "type": "vagrant", - "output": "ubuntu-11.10-{{.Provisioner}}.box" - } - ] -} \ No newline at end of file diff --git a/templates/ubuntu-12.04-i386/http/preseed.cfg b/templates/ubuntu-12.04-i386/http/preseed.cfg deleted file mode 100644 index 903f2e14b..000000000 --- a/templates/ubuntu-12.04-i386/http/preseed.cfg +++ /dev/null @@ -1,31 +0,0 @@ -choose-mirror-bin mirror/http/proxy string -d-i base-installer/kernel/override-image string linux-server -d-i clock-setup/utc boolean true -d-i clock-setup/utc-auto boolean true -d-i finish-install/reboot_in_progress note -d-i grub-installer/only_debian boolean true -d-i grub-installer/with_other_os boolean true -d-i partman-auto-lvm/guided_size string max -d-i partman-auto/choose_recipe select atomic -d-i partman-auto/method string lvm -d-i partman-lvm/confirm boolean true -d-i partman-lvm/confirm boolean true -d-i partman-lvm/confirm_nooverwrite boolean true -d-i partman-lvm/device_remove_lvm boolean true -d-i partman/choose_partition select finish -d-i partman/confirm boolean true -d-i partman/confirm_nooverwrite boolean true -d-i partman/confirm_write_new_label boolean true -d-i passwd/user-fullname string vagrant -d-i passwd/user-uid string 900 -d-i passwd/user-password password vagrant -d-i passwd/user-password-again password vagrant -d-i passwd/username string vagrant -d-i pkgsel/include string openssh-server cryptsetup build-essential libssl-dev libreadline-dev zlib1g-dev linux-source dkms -d-i pkgsel/install-language-support boolean false -d-i pkgsel/update-policy select unattended-upgrades -d-i pkgsel/upgrade select full-upgrade -d-i time/zone string UTC -d-i user-setup/allow-password-weak boolean true -d-i user-setup/encrypt-home boolean false -tasksel tasksel/first multiselect standard, ubuntu-server diff --git a/templates/ubuntu-12.04-i386/scripts/cleanup.sh b/templates/ubuntu-12.04-i386/scripts/cleanup.sh deleted file mode 100644 index 6c7f703d6..000000000 --- a/templates/ubuntu-12.04-i386/scripts/cleanup.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/bash -eux - -apt-get -y autoremove -apt-get -y clean -rm -rf VBoxGuestAdditions_*.iso VBoxGuestAdditions_*.iso.? -rm -f /tmp/chef*deb diff --git a/templates/ubuntu-12.04-i386/scripts/minimize.sh b/templates/ubuntu-12.04-i386/scripts/minimize.sh deleted file mode 100644 index 3846a1d65..000000000 --- a/templates/ubuntu-12.04-i386/scripts/minimize.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash -eux - -dd if=/dev/zero of=/EMPTY bs=1M -rm -f /EMPTY diff --git a/templates/ubuntu-12.04-i386/scripts/networking.sh b/templates/ubuntu-12.04-i386/scripts/networking.sh deleted file mode 100644 index de3269a58..000000000 --- a/templates/ubuntu-12.04-i386/scripts/networking.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/bash -eux - -rm /etc/udev/rules.d/70-persistent-net.rules -mkdir /etc/udev/rules.d/70-persistent-net.rules -rm /lib/udev/rules.d/75-persistent-net-generator.rules -rm -rf /dev/.udev/ /var/lib/dhcp3/* -echo "pre-up sleep 2" >> /etc/network/interfaces diff --git a/templates/ubuntu-12.04-i386/scripts/sshd.sh b/templates/ubuntu-12.04-i386/scripts/sshd.sh deleted file mode 100644 index c6e4f20a6..000000000 --- a/templates/ubuntu-12.04-i386/scripts/sshd.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash -eux - -echo "UseDNS no" >> /etc/ssh/sshd_config diff --git a/templates/ubuntu-12.04-i386/scripts/sudoers.sh b/templates/ubuntu-12.04-i386/scripts/sudoers.sh deleted file mode 100644 index 5fce3dd2c..000000000 --- a/templates/ubuntu-12.04-i386/scripts/sudoers.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash -eux - -sed -i -e '/Defaults\s\+env_reset/a Defaults\texempt_group=sudo' /etc/sudoers -sed -i -e 's/%sudo ALL=(ALL:ALL) ALL/%sudo ALL=NOPASSWD:ALL/g' /etc/sudoers diff --git a/templates/ubuntu-12.04-i386/scripts/update.sh b/templates/ubuntu-12.04-i386/scripts/update.sh deleted file mode 100644 index 80e8dd3f9..000000000 --- a/templates/ubuntu-12.04-i386/scripts/update.sh +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/bash -eux - -apt-get update -apt-get -y upgrade - -# ensure the correct kernel headers are installed -apt-get -y install linux-headers-$(uname -r) - -# update package index on boot -cat <<EOF > /etc/init/refresh-apt.conf -description "update package index" -start on networking -task -exec /usr/bin/apt-get update -EOF diff --git a/templates/ubuntu-12.04-i386/scripts/vagrant.sh b/templates/ubuntu-12.04-i386/scripts/vagrant.sh deleted file mode 100644 index 72dd2f444..000000000 --- a/templates/ubuntu-12.04-i386/scripts/vagrant.sh +++ /dev/null @@ -1,33 +0,0 @@ -#!/bin/bash -eux - -if [ -f /home/vagrant/.vbox_version ]; then - mkdir /tmp/vbox - VER=$(cat /home/vagrant/.vbox_version) - mount -o loop VBoxGuestAdditions_$VER.iso /tmp/vbox - sh /tmp/vbox/VBoxLinuxAdditions.run - umount /tmp/vbox - rmdir /tmp/vbox - rm *.iso -fi - -if [ -f /home/vagrant/.vmfusion_version ]; then - #Set Linux-specific paths and ISO filename - home_dir="/home/vagrant" - iso_name="linux.iso" - mount_point="/tmp/vmware-tools" - #Run install, unmount ISO and remove it - mkdir ${mount_point} - cd ${home_dir} - /bin/mount -o loop ${iso_name} ${mount_point} - tar zxf ${mount_point}/*.tar.gz && cd vmware-tools-distrib && ./vmware-install.pl --default - /bin/umount ${mount_point} - /bin/rm -rf ${home_dir}/${iso_name} ${home_dir}/vmware-tools-distrib - rmdir ${mount_point} -fi - -mkdir /home/vagrant/.ssh -wget --no-check-certificate \ - 'https://github.com/mitchellh/vagrant/raw/master/keys/vagrant.pub' \ - -O /home/vagrant/.ssh/authorized_keys -chown -R vagrant /home/vagrant/.ssh -chmod -R go-rwsx /home/vagrant/.ssh diff --git a/templates/ubuntu-12.04-i386/template.json b/templates/ubuntu-12.04-i386/template.json deleted file mode 100644 index 20468d887..000000000 --- a/templates/ubuntu-12.04-i386/template.json +++ /dev/null @@ -1,133 +0,0 @@ -{ - "provisioners": [ - { - "type": "shell", - "scripts": [ - "scripts/update.sh", - "scripts/vagrant.sh", - "scripts/sshd.sh", - "scripts/networking.sh", - "scripts/sudoers.sh", - "scripts/cleanup.sh", - "scripts/minimize.sh" - ], - "override": { - "virtualbox": { - "execute_command": "echo 'vagrant'|sudo -S sh '{{.Path}}'" - }, - "vmware": { - "execute_command": "echo 'vagrant'|sudo -S sh '{{.Path}}'" - } - } - } - ], - "builders": [ - { - "type": "virtualbox", - "boot_command": [ - "<esc><wait>", - "<esc><wait>", - "<enter><wait>", - "/install/vmlinuz<wait>", - " auto<wait>", - " console-setup/ask_detect=false<wait>", - " console-setup/layoutcode=us<wait>", - " console-setup/modelcode=pc105<wait>", - " debconf/frontend=noninteractive<wait>", - " debian-installer=en_US<wait>", - " fb=false<wait>", - " initrd=/install/initrd.gz<wait>", - " kbd-chooser/method=us<wait>", - " keyboard-configuration/layout=USA<wait>", - " keyboard-configuration/variant=USA<wait>", - " locale=en_US<wait>", - " netcfg/get_domain=vm<wait>", - " netcfg/get_hostname=vagrant<wait>", - " noapic<wait>", - " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/preseed.cfg<wait>", - " -- <wait>", - "<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": 40960, - "guest_os_type": "Ubuntu", - "http_directory": "http", - "iso_checksum": "7d186655efe871ea1a1492faf635beee", - "iso_checksum_type": "md5", - "iso_url": "http://releases.ubuntu.com/12.04/ubuntu-12.04.2-server-i386.iso", - "ssh_username": "vagrant", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_wait_timeout": "10000s", - "shutdown_command": "echo 'shutdown -P now' > shutdown.sh; echo 'vagrant'|sudo -S sh 'shutdown.sh'", - "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", - "virtualbox_version_file": ".vbox_version", - "vboxmanage": [ - [ - "modifyvm", - "{{.Name}}", - "--memory", - "384" - ], - [ - "modifyvm", - "{{.Name}}", - "--cpus", - "1" - ] - ], - "iso_md5": "7d186655efe871ea1a1492faf635beee" - }, - { - "type": "vmware", - "boot_command": [ - "<esc><wait>", - "<esc><wait>", - "<enter><wait>", - "/install/vmlinuz<wait>", - " auto<wait>", - " console-setup/ask_detect=false<wait>", - " console-setup/layoutcode=us<wait>", - " console-setup/modelcode=pc105<wait>", - " debconf/frontend=noninteractive<wait>", - " debian-installer=en_US<wait>", - " fb=false<wait>", - " initrd=/install/initrd.gz<wait>", - " kbd-chooser/method=us<wait>", - " keyboard-configuration/layout=USA<wait>", - " keyboard-configuration/variant=USA<wait>", - " locale=en_US<wait>", - " netcfg/get_domain=vm<wait>", - " netcfg/get_hostname=vagrant<wait>", - " noapic<wait>", - " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/preseed.cfg<wait>", - " -- <wait>", - "<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": 40960, - "guest_os_type": "ubuntu", - "http_directory": "http", - "iso_checksum": "7d186655efe871ea1a1492faf635beee", - "iso_checksum_type": "md5", - "iso_url": "http://releases.ubuntu.com/12.04/ubuntu-12.04.2-server-i386.iso", - "ssh_username": "vagrant", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_wait_timeout": "10000s", - "shutdown_command": "echo 'shutdown -P now' > shutdown.sh; echo 'vagrant'|sudo -S sh 'shutdown.sh'", - "vmx_data": { - "memsize": "384", - "numvcpus": "1", - "cpuid.coresPerSocket": "1" - }, - "iso_md5": "7d186655efe871ea1a1492faf635beee" - } - ], - "post-provisioner": [ - { - "type": "vagrant", - "output": "ubuntu-12.04-i386-{{.Provisioner}}.box" - } - ] -} \ No newline at end of file diff --git a/templates/ubuntu-12.04/http/preseed.cfg b/templates/ubuntu-12.04/http/preseed.cfg deleted file mode 100644 index 903f2e14b..000000000 --- a/templates/ubuntu-12.04/http/preseed.cfg +++ /dev/null @@ -1,31 +0,0 @@ -choose-mirror-bin mirror/http/proxy string -d-i base-installer/kernel/override-image string linux-server -d-i clock-setup/utc boolean true -d-i clock-setup/utc-auto boolean true -d-i finish-install/reboot_in_progress note -d-i grub-installer/only_debian boolean true -d-i grub-installer/with_other_os boolean true -d-i partman-auto-lvm/guided_size string max -d-i partman-auto/choose_recipe select atomic -d-i partman-auto/method string lvm -d-i partman-lvm/confirm boolean true -d-i partman-lvm/confirm boolean true -d-i partman-lvm/confirm_nooverwrite boolean true -d-i partman-lvm/device_remove_lvm boolean true -d-i partman/choose_partition select finish -d-i partman/confirm boolean true -d-i partman/confirm_nooverwrite boolean true -d-i partman/confirm_write_new_label boolean true -d-i passwd/user-fullname string vagrant -d-i passwd/user-uid string 900 -d-i passwd/user-password password vagrant -d-i passwd/user-password-again password vagrant -d-i passwd/username string vagrant -d-i pkgsel/include string openssh-server cryptsetup build-essential libssl-dev libreadline-dev zlib1g-dev linux-source dkms -d-i pkgsel/install-language-support boolean false -d-i pkgsel/update-policy select unattended-upgrades -d-i pkgsel/upgrade select full-upgrade -d-i time/zone string UTC -d-i user-setup/allow-password-weak boolean true -d-i user-setup/encrypt-home boolean false -tasksel tasksel/first multiselect standard, ubuntu-server diff --git a/templates/ubuntu-12.04/new.json b/templates/ubuntu-12.04/new.json deleted file mode 100644 index 1c636c285..000000000 --- a/templates/ubuntu-12.04/new.json +++ /dev/null @@ -1,77 +0,0 @@ -{ - "builders": [ - { - "boot_command": [ - "<esc><wait>", - "<esc><wait>", - "<enter><wait>", - "/install/vmlinuz<wait>", - " auto<wait>", - " console-setup/ask_detect=false<wait>", - " console-setup/layoutcode=us<wait>", - " console-setup/modelcode=pc105<wait>", - " debconf/frontend=noninteractive<wait>", - " debian-installer=en_US<wait>", - " fb=false<wait>", - " initrd=/install/initrd.gz<wait>", - " kbd-chooser/method=us<wait>", - " keyboard-configuration/layout=USA<wait>", - " keyboard-configuration/variant=USA<wait>", - " locale=en_US<wait>", - " netcfg/get_domain=vm<wait>", - " netcfg/get_hostname=vagrant<wait>", - " noapic<wait>", - " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/preseed.cfg<wait>", - " -- <wait>", - "<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": 40960, - "guest_os_type": "ubuntu-64", - "http_directory": "http", - "iso_checksum": "af5f788aee1b32c4b2634734309cc9e9", - "iso_checksum_type": "md5", - "iso_url": "http://releases.ubuntu.com/12.04/ubuntu-12.04.2-server-amd64.iso", - "shutdown_command": "echo 'shutdown -P now' > shutdown.sh; echo 'vagrant'|sudo -S sh 'shutdown.sh'", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "tools_upload_flavor": "linux", - "tools_upload_path": "/home/vagrant/vmware_tools.iso", - "type": "vmware", - "vmx_data": { - "cpuid.coresPerSocket": "1", - "memsize": "384", - "numvcpus": "1" - } - } - ], - "post-processors": [ - { - "type": "vagrant", - "output": "ubuntu-12.04-{{.Provider}}.box" - } - ], - "provisioners": [ - { - "override": { - "vmware": { - "execute_command": "echo 'vagrant' | sudo -S bash '{{.Path}}'" - } - }, - "scripts": [ - "../.ubuntu/update.sh", - "../.common/sshd.sh", - "../.ubuntu/networking.sh", - "../.common/sudoers.sh", - "../.ubuntu/cleanup.sh", - "../.common/vagrant.sh", - "../.common/minimize.sh", - "../.common/chef_omnibus.sh" - ], - "type": "shell" - } - ] -} - diff --git a/templates/ubuntu-12.04/scripts/sudoers.sh b/templates/ubuntu-12.04/scripts/sudoers.sh deleted file mode 100644 index 5fce3dd2c..000000000 --- a/templates/ubuntu-12.04/scripts/sudoers.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash -eux - -sed -i -e '/Defaults\s\+env_reset/a Defaults\texempt_group=sudo' /etc/sudoers -sed -i -e 's/%sudo ALL=(ALL:ALL) ALL/%sudo ALL=NOPASSWD:ALL/g' /etc/sudoers diff --git a/templates/ubuntu-12.04/template.json b/templates/ubuntu-12.04/template.json deleted file mode 100644 index 6da6fa33f..000000000 --- a/templates/ubuntu-12.04/template.json +++ /dev/null @@ -1,135 +0,0 @@ -{ - "provisioners": [ - { - "type": "shell", - "scripts": [ - "scripts/update.sh", - "scripts/vagrant.sh", - "scripts/sshd.sh", - "scripts/networking.sh", - "scripts/sudoers.sh", - "scripts/cleanup.sh", - "scripts/minimize.sh" - ], - "override": { - "virtualbox": { - "execute_command": "echo 'vagrant'|sudo -S sh '{{.Path}}'" - }, - "vmware": { - "execute_command": "echo 'vagrant'|sudo -S sh '{{.Path}}'; curl https://opscode.com/chef/install.sh | sudo bash" - } - } - } - ], - "builders": [ - { - "type": "virtualbox", - "boot_command": [ - "<esc><wait>", - "<esc><wait>", - "<enter><wait>", - "/install/vmlinuz<wait>", - " auto<wait>", - " console-setup/ask_detect=false<wait>", - " console-setup/layoutcode=us<wait>", - " console-setup/modelcode=pc105<wait>", - " debconf/frontend=noninteractive<wait>", - " debian-installer=en_US<wait>", - " fb=false<wait>", - " initrd=/install/initrd.gz<wait>", - " kbd-chooser/method=us<wait>", - " keyboard-configuration/layout=USA<wait>", - " keyboard-configuration/variant=USA<wait>", - " locale=en_US<wait>", - " netcfg/get_domain=vm<wait>", - " netcfg/get_hostname=vagrant<wait>", - " noapic<wait>", - " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/preseed.cfg<wait>", - " -- <wait>", - "<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": 40960, - "guest_os_type": "Ubuntu_64", - "http_directory": "http", - "iso_checksum": "af5f788aee1b32c4b2634734309cc9e9", - "iso_checksum_type": "md5", - "iso_url": "http://releases.ubuntu.com/12.04/ubuntu-12.04.2-server-amd64.iso", - "ssh_username": "vagrant", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_wait_timeout": "10000s", - "shutdown_command": "echo 'shutdown -P now' > shutdown.sh; echo 'vagrant'|sudo -S sh 'shutdown.sh'", - "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", - "virtualbox_version_file": ".vbox_version", - "vboxmanage": [ - [ - "modifyvm", - "{{.Name}}", - "--memory", - "384" - ], - [ - "modifyvm", - "{{.Name}}", - "--cpus", - "1" - ] - ], - "iso_md5": "af5f788aee1b32c4b2634734309cc9e9" - }, - { - "type": "vmware", - "boot_command": [ - "<esc><wait>", - "<esc><wait>", - "<enter><wait>", - "/install/vmlinuz<wait>", - " auto<wait>", - " console-setup/ask_detect=false<wait>", - " console-setup/layoutcode=us<wait>", - " console-setup/modelcode=pc105<wait>", - " debconf/frontend=noninteractive<wait>", - " debian-installer=en_US<wait>", - " fb=false<wait>", - " initrd=/install/initrd.gz<wait>", - " kbd-chooser/method=us<wait>", - " keyboard-configuration/layout=USA<wait>", - " keyboard-configuration/variant=USA<wait>", - " locale=en_US<wait>", - " netcfg/get_domain=vm<wait>", - " netcfg/get_hostname=vagrant<wait>", - " noapic<wait>", - " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/preseed.cfg<wait>", - " -- <wait>", - "<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": 40960, - "tools_upload_flavor": "darwin", - "tools_upload_path": "../.common/{{.Flavor}}.iso", - "guest_os_type": "ubuntu-64", - "http_directory": "http", - "iso_checksum": "af5f788aee1b32c4b2634734309cc9e9", - "iso_checksum_type": "md5", - "iso_url": "http://releases.ubuntu.com/12.04/ubuntu-12.04.2-server-amd64.iso", - "ssh_username": "vagrant", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_wait_timeout": "10000s", - "shutdown_command": "echo 'shutdown -P now' > shutdown.sh; echo 'vagrant'|sudo -S sh 'shutdown.sh'", - "vmx_data": { - "memsize": "384", - "numvcpus": "1", - "cpuid.coresPerSocket": "1" - }, - "iso_md5": "af5f788aee1b32c4b2634734309cc9e9" - } - ], - "post-processors": [ - { - "type": "vagrant", - "output": "ubuntu-12.04-{{.Provider}}.box" - } - ] -} diff --git a/templates/ubuntu-12.10-i386/http/preseed.cfg b/templates/ubuntu-12.10-i386/http/preseed.cfg deleted file mode 100644 index 903f2e14b..000000000 --- a/templates/ubuntu-12.10-i386/http/preseed.cfg +++ /dev/null @@ -1,31 +0,0 @@ -choose-mirror-bin mirror/http/proxy string -d-i base-installer/kernel/override-image string linux-server -d-i clock-setup/utc boolean true -d-i clock-setup/utc-auto boolean true -d-i finish-install/reboot_in_progress note -d-i grub-installer/only_debian boolean true -d-i grub-installer/with_other_os boolean true -d-i partman-auto-lvm/guided_size string max -d-i partman-auto/choose_recipe select atomic -d-i partman-auto/method string lvm -d-i partman-lvm/confirm boolean true -d-i partman-lvm/confirm boolean true -d-i partman-lvm/confirm_nooverwrite boolean true -d-i partman-lvm/device_remove_lvm boolean true -d-i partman/choose_partition select finish -d-i partman/confirm boolean true -d-i partman/confirm_nooverwrite boolean true -d-i partman/confirm_write_new_label boolean true -d-i passwd/user-fullname string vagrant -d-i passwd/user-uid string 900 -d-i passwd/user-password password vagrant -d-i passwd/user-password-again password vagrant -d-i passwd/username string vagrant -d-i pkgsel/include string openssh-server cryptsetup build-essential libssl-dev libreadline-dev zlib1g-dev linux-source dkms -d-i pkgsel/install-language-support boolean false -d-i pkgsel/update-policy select unattended-upgrades -d-i pkgsel/upgrade select full-upgrade -d-i time/zone string UTC -d-i user-setup/allow-password-weak boolean true -d-i user-setup/encrypt-home boolean false -tasksel tasksel/first multiselect standard, ubuntu-server diff --git a/templates/ubuntu-12.10-i386/scripts/cleanup.sh b/templates/ubuntu-12.10-i386/scripts/cleanup.sh deleted file mode 100644 index 6c7f703d6..000000000 --- a/templates/ubuntu-12.10-i386/scripts/cleanup.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/bash -eux - -apt-get -y autoremove -apt-get -y clean -rm -rf VBoxGuestAdditions_*.iso VBoxGuestAdditions_*.iso.? -rm -f /tmp/chef*deb diff --git a/templates/ubuntu-12.10-i386/scripts/minimize.sh b/templates/ubuntu-12.10-i386/scripts/minimize.sh deleted file mode 100644 index 3846a1d65..000000000 --- a/templates/ubuntu-12.10-i386/scripts/minimize.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash -eux - -dd if=/dev/zero of=/EMPTY bs=1M -rm -f /EMPTY diff --git a/templates/ubuntu-12.10-i386/scripts/networking.sh b/templates/ubuntu-12.10-i386/scripts/networking.sh deleted file mode 100644 index de3269a58..000000000 --- a/templates/ubuntu-12.10-i386/scripts/networking.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/bash -eux - -rm /etc/udev/rules.d/70-persistent-net.rules -mkdir /etc/udev/rules.d/70-persistent-net.rules -rm /lib/udev/rules.d/75-persistent-net-generator.rules -rm -rf /dev/.udev/ /var/lib/dhcp3/* -echo "pre-up sleep 2" >> /etc/network/interfaces diff --git a/templates/ubuntu-12.10-i386/scripts/sshd.sh b/templates/ubuntu-12.10-i386/scripts/sshd.sh deleted file mode 100644 index c6e4f20a6..000000000 --- a/templates/ubuntu-12.10-i386/scripts/sshd.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash -eux - -echo "UseDNS no" >> /etc/ssh/sshd_config diff --git a/templates/ubuntu-12.10-i386/scripts/sudoers.sh b/templates/ubuntu-12.10-i386/scripts/sudoers.sh deleted file mode 100644 index 5fce3dd2c..000000000 --- a/templates/ubuntu-12.10-i386/scripts/sudoers.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash -eux - -sed -i -e '/Defaults\s\+env_reset/a Defaults\texempt_group=sudo' /etc/sudoers -sed -i -e 's/%sudo ALL=(ALL:ALL) ALL/%sudo ALL=NOPASSWD:ALL/g' /etc/sudoers diff --git a/templates/ubuntu-12.10-i386/scripts/update.sh b/templates/ubuntu-12.10-i386/scripts/update.sh deleted file mode 100644 index 80e8dd3f9..000000000 --- a/templates/ubuntu-12.10-i386/scripts/update.sh +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/bash -eux - -apt-get update -apt-get -y upgrade - -# ensure the correct kernel headers are installed -apt-get -y install linux-headers-$(uname -r) - -# update package index on boot -cat <<EOF > /etc/init/refresh-apt.conf -description "update package index" -start on networking -task -exec /usr/bin/apt-get update -EOF diff --git a/templates/ubuntu-12.10-i386/scripts/vagrant.sh b/templates/ubuntu-12.10-i386/scripts/vagrant.sh deleted file mode 100644 index 72dd2f444..000000000 --- a/templates/ubuntu-12.10-i386/scripts/vagrant.sh +++ /dev/null @@ -1,33 +0,0 @@ -#!/bin/bash -eux - -if [ -f /home/vagrant/.vbox_version ]; then - mkdir /tmp/vbox - VER=$(cat /home/vagrant/.vbox_version) - mount -o loop VBoxGuestAdditions_$VER.iso /tmp/vbox - sh /tmp/vbox/VBoxLinuxAdditions.run - umount /tmp/vbox - rmdir /tmp/vbox - rm *.iso -fi - -if [ -f /home/vagrant/.vmfusion_version ]; then - #Set Linux-specific paths and ISO filename - home_dir="/home/vagrant" - iso_name="linux.iso" - mount_point="/tmp/vmware-tools" - #Run install, unmount ISO and remove it - mkdir ${mount_point} - cd ${home_dir} - /bin/mount -o loop ${iso_name} ${mount_point} - tar zxf ${mount_point}/*.tar.gz && cd vmware-tools-distrib && ./vmware-install.pl --default - /bin/umount ${mount_point} - /bin/rm -rf ${home_dir}/${iso_name} ${home_dir}/vmware-tools-distrib - rmdir ${mount_point} -fi - -mkdir /home/vagrant/.ssh -wget --no-check-certificate \ - 'https://github.com/mitchellh/vagrant/raw/master/keys/vagrant.pub' \ - -O /home/vagrant/.ssh/authorized_keys -chown -R vagrant /home/vagrant/.ssh -chmod -R go-rwsx /home/vagrant/.ssh diff --git a/templates/ubuntu-12.10-i386/template.json b/templates/ubuntu-12.10-i386/template.json deleted file mode 100644 index 782409383..000000000 --- a/templates/ubuntu-12.10-i386/template.json +++ /dev/null @@ -1,133 +0,0 @@ -{ - "provisioners": [ - { - "type": "shell", - "scripts": [ - "scripts/update.sh", - "scripts/vagrant.sh", - "scripts/sshd.sh", - "scripts/networking.sh", - "scripts/sudoers.sh", - "scripts/cleanup.sh", - "scripts/minimize.sh" - ], - "override": { - "virtualbox": { - "execute_command": "echo 'vagrant'|sudo -S sh '{{.Path}}'" - }, - "vmware": { - "execute_command": "echo 'vagrant'|sudo -S sh '{{.Path}}'" - } - } - } - ], - "builders": [ - { - "type": "virtualbox", - "boot_command": [ - "<esc><wait>", - "<esc><wait>", - "<enter><wait>", - "/install/vmlinuz<wait>", - " auto<wait>", - " console-setup/ask_detect=false<wait>", - " console-setup/layoutcode=us<wait>", - " console-setup/modelcode=pc105<wait>", - " debconf/frontend=noninteractive<wait>", - " debian-installer=en_US<wait>", - " fb=false<wait>", - " initrd=/install/initrd.gz<wait>", - " kbd-chooser/method=us<wait>", - " keyboard-configuration/layout=USA<wait>", - " keyboard-configuration/variant=USA<wait>", - " locale=en_US<wait>", - " netcfg/get_domain=vm<wait>", - " netcfg/get_hostname=vagrant<wait>", - " noapic<wait>", - " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/preseed.cfg<wait>", - " -- <wait>", - "<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": 40960, - "guest_os_type": "Ubuntu", - "http_directory": "http", - "iso_checksum": "b3d4d4edfc8f291af0b83f8a2ba19a2f", - "iso_checksum_type": "md5", - "iso_url": "http://releases.ubuntu.com/12.10/ubuntu-12.10-server-i386.iso", - "ssh_username": "vagrant", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_wait_timeout": "10000s", - "shutdown_command": "echo 'shutdown -P now' > shutdown.sh; echo 'vagrant'|sudo -S sh 'shutdown.sh'", - "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", - "virtualbox_version_file": ".vbox_version", - "vboxmanage": [ - [ - "modifyvm", - "{{.Name}}", - "--memory", - "384" - ], - [ - "modifyvm", - "{{.Name}}", - "--cpus", - "1" - ] - ], - "iso_md5": "b3d4d4edfc8f291af0b83f8a2ba19a2f" - }, - { - "type": "vmware", - "boot_command": [ - "<esc><wait>", - "<esc><wait>", - "<enter><wait>", - "/install/vmlinuz<wait>", - " auto<wait>", - " console-setup/ask_detect=false<wait>", - " console-setup/layoutcode=us<wait>", - " console-setup/modelcode=pc105<wait>", - " debconf/frontend=noninteractive<wait>", - " debian-installer=en_US<wait>", - " fb=false<wait>", - " initrd=/install/initrd.gz<wait>", - " kbd-chooser/method=us<wait>", - " keyboard-configuration/layout=USA<wait>", - " keyboard-configuration/variant=USA<wait>", - " locale=en_US<wait>", - " netcfg/get_domain=vm<wait>", - " netcfg/get_hostname=vagrant<wait>", - " noapic<wait>", - " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/preseed.cfg<wait>", - " -- <wait>", - "<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": 40960, - "guest_os_type": "ubuntu", - "http_directory": "http", - "iso_checksum": "b3d4d4edfc8f291af0b83f8a2ba19a2f", - "iso_checksum_type": "md5", - "iso_url": "http://releases.ubuntu.com/12.10/ubuntu-12.10-server-i386.iso", - "ssh_username": "vagrant", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_wait_timeout": "10000s", - "shutdown_command": "echo 'shutdown -P now' > shutdown.sh; echo 'vagrant'|sudo -S sh 'shutdown.sh'", - "vmx_data": { - "memsize": "384", - "numvcpus": "1", - "cpuid.coresPerSocket": "1" - }, - "iso_md5": "b3d4d4edfc8f291af0b83f8a2ba19a2f" - } - ], - "post-provisioner": [ - { - "type": "vagrant", - "output": "ubuntu-12.10-i386-{{.Provisioner}}.box" - } - ] -} \ No newline at end of file diff --git a/templates/ubuntu-12.10/http/preseed.cfg b/templates/ubuntu-12.10/http/preseed.cfg deleted file mode 100644 index 903f2e14b..000000000 --- a/templates/ubuntu-12.10/http/preseed.cfg +++ /dev/null @@ -1,31 +0,0 @@ -choose-mirror-bin mirror/http/proxy string -d-i base-installer/kernel/override-image string linux-server -d-i clock-setup/utc boolean true -d-i clock-setup/utc-auto boolean true -d-i finish-install/reboot_in_progress note -d-i grub-installer/only_debian boolean true -d-i grub-installer/with_other_os boolean true -d-i partman-auto-lvm/guided_size string max -d-i partman-auto/choose_recipe select atomic -d-i partman-auto/method string lvm -d-i partman-lvm/confirm boolean true -d-i partman-lvm/confirm boolean true -d-i partman-lvm/confirm_nooverwrite boolean true -d-i partman-lvm/device_remove_lvm boolean true -d-i partman/choose_partition select finish -d-i partman/confirm boolean true -d-i partman/confirm_nooverwrite boolean true -d-i partman/confirm_write_new_label boolean true -d-i passwd/user-fullname string vagrant -d-i passwd/user-uid string 900 -d-i passwd/user-password password vagrant -d-i passwd/user-password-again password vagrant -d-i passwd/username string vagrant -d-i pkgsel/include string openssh-server cryptsetup build-essential libssl-dev libreadline-dev zlib1g-dev linux-source dkms -d-i pkgsel/install-language-support boolean false -d-i pkgsel/update-policy select unattended-upgrades -d-i pkgsel/upgrade select full-upgrade -d-i time/zone string UTC -d-i user-setup/allow-password-weak boolean true -d-i user-setup/encrypt-home boolean false -tasksel tasksel/first multiselect standard, ubuntu-server diff --git a/templates/ubuntu-12.10/scripts/cleanup.sh b/templates/ubuntu-12.10/scripts/cleanup.sh deleted file mode 100644 index 6c7f703d6..000000000 --- a/templates/ubuntu-12.10/scripts/cleanup.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/bash -eux - -apt-get -y autoremove -apt-get -y clean -rm -rf VBoxGuestAdditions_*.iso VBoxGuestAdditions_*.iso.? -rm -f /tmp/chef*deb diff --git a/templates/ubuntu-12.10/scripts/minimize.sh b/templates/ubuntu-12.10/scripts/minimize.sh deleted file mode 100644 index 3846a1d65..000000000 --- a/templates/ubuntu-12.10/scripts/minimize.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash -eux - -dd if=/dev/zero of=/EMPTY bs=1M -rm -f /EMPTY diff --git a/templates/ubuntu-12.10/scripts/networking.sh b/templates/ubuntu-12.10/scripts/networking.sh deleted file mode 100644 index de3269a58..000000000 --- a/templates/ubuntu-12.10/scripts/networking.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/bash -eux - -rm /etc/udev/rules.d/70-persistent-net.rules -mkdir /etc/udev/rules.d/70-persistent-net.rules -rm /lib/udev/rules.d/75-persistent-net-generator.rules -rm -rf /dev/.udev/ /var/lib/dhcp3/* -echo "pre-up sleep 2" >> /etc/network/interfaces diff --git a/templates/ubuntu-12.10/scripts/sshd.sh b/templates/ubuntu-12.10/scripts/sshd.sh deleted file mode 100644 index c6e4f20a6..000000000 --- a/templates/ubuntu-12.10/scripts/sshd.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash -eux - -echo "UseDNS no" >> /etc/ssh/sshd_config diff --git a/templates/ubuntu-12.10/scripts/sudoers.sh b/templates/ubuntu-12.10/scripts/sudoers.sh deleted file mode 100644 index 5fce3dd2c..000000000 --- a/templates/ubuntu-12.10/scripts/sudoers.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash -eux - -sed -i -e '/Defaults\s\+env_reset/a Defaults\texempt_group=sudo' /etc/sudoers -sed -i -e 's/%sudo ALL=(ALL:ALL) ALL/%sudo ALL=NOPASSWD:ALL/g' /etc/sudoers diff --git a/templates/ubuntu-12.10/scripts/update.sh b/templates/ubuntu-12.10/scripts/update.sh deleted file mode 100644 index 80e8dd3f9..000000000 --- a/templates/ubuntu-12.10/scripts/update.sh +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/bash -eux - -apt-get update -apt-get -y upgrade - -# ensure the correct kernel headers are installed -apt-get -y install linux-headers-$(uname -r) - -# update package index on boot -cat <<EOF > /etc/init/refresh-apt.conf -description "update package index" -start on networking -task -exec /usr/bin/apt-get update -EOF diff --git a/templates/ubuntu-12.10/scripts/vagrant.sh b/templates/ubuntu-12.10/scripts/vagrant.sh deleted file mode 100644 index 72dd2f444..000000000 --- a/templates/ubuntu-12.10/scripts/vagrant.sh +++ /dev/null @@ -1,33 +0,0 @@ -#!/bin/bash -eux - -if [ -f /home/vagrant/.vbox_version ]; then - mkdir /tmp/vbox - VER=$(cat /home/vagrant/.vbox_version) - mount -o loop VBoxGuestAdditions_$VER.iso /tmp/vbox - sh /tmp/vbox/VBoxLinuxAdditions.run - umount /tmp/vbox - rmdir /tmp/vbox - rm *.iso -fi - -if [ -f /home/vagrant/.vmfusion_version ]; then - #Set Linux-specific paths and ISO filename - home_dir="/home/vagrant" - iso_name="linux.iso" - mount_point="/tmp/vmware-tools" - #Run install, unmount ISO and remove it - mkdir ${mount_point} - cd ${home_dir} - /bin/mount -o loop ${iso_name} ${mount_point} - tar zxf ${mount_point}/*.tar.gz && cd vmware-tools-distrib && ./vmware-install.pl --default - /bin/umount ${mount_point} - /bin/rm -rf ${home_dir}/${iso_name} ${home_dir}/vmware-tools-distrib - rmdir ${mount_point} -fi - -mkdir /home/vagrant/.ssh -wget --no-check-certificate \ - 'https://github.com/mitchellh/vagrant/raw/master/keys/vagrant.pub' \ - -O /home/vagrant/.ssh/authorized_keys -chown -R vagrant /home/vagrant/.ssh -chmod -R go-rwsx /home/vagrant/.ssh diff --git a/templates/ubuntu-12.10/template.json b/templates/ubuntu-12.10/template.json deleted file mode 100644 index ac8c456a4..000000000 --- a/templates/ubuntu-12.10/template.json +++ /dev/null @@ -1,133 +0,0 @@ -{ - "provisioners": [ - { - "type": "shell", - "scripts": [ - "scripts/update.sh", - "scripts/vagrant.sh", - "scripts/sshd.sh", - "scripts/networking.sh", - "scripts/sudoers.sh", - "scripts/cleanup.sh", - "scripts/minimize.sh" - ], - "override": { - "virtualbox": { - "execute_command": "echo 'vagrant'|sudo -S sh '{{.Path}}'" - }, - "vmware": { - "execute_command": "echo 'vagrant'|sudo -S sh '{{.Path}}'" - } - } - } - ], - "builders": [ - { - "type": "virtualbox", - "boot_command": [ - "<esc><wait>", - "<esc><wait>", - "<enter><wait>", - "/install/vmlinuz<wait>", - " auto<wait>", - " console-setup/ask_detect=false<wait>", - " console-setup/layoutcode=us<wait>", - " console-setup/modelcode=pc105<wait>", - " debconf/frontend=noninteractive<wait>", - " debian-installer=en_US<wait>", - " fb=false<wait>", - " initrd=/install/initrd.gz<wait>", - " kbd-chooser/method=us<wait>", - " keyboard-configuration/layout=USA<wait>", - " keyboard-configuration/variant=USA<wait>", - " locale=en_US<wait>", - " netcfg/get_domain=vm<wait>", - " netcfg/get_hostname=vagrant<wait>", - " noapic<wait>", - " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/preseed.cfg<wait>", - " -- <wait>", - "<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": 40960, - "guest_os_type": "Ubuntu", - "http_directory": "http", - "iso_checksum": "4bd3270bde86d7e4e017e3847a4af485", - "iso_checksum_type": "md5", - "iso_url": "http://releases.ubuntu.com/12.10/ubuntu-12.10-server-amd64.iso", - "ssh_username": "vagrant", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_wait_timeout": "10000s", - "shutdown_command": "echo 'shutdown -P now' > shutdown.sh; echo 'vagrant'|sudo -S sh 'shutdown.sh'", - "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", - "virtualbox_version_file": ".vbox_version", - "vboxmanage": [ - [ - "modifyvm", - "{{.Name}}", - "--memory", - "384" - ], - [ - "modifyvm", - "{{.Name}}", - "--cpus", - "1" - ] - ], - "iso_md5": "4bd3270bde86d7e4e017e3847a4af485" - }, - { - "type": "vmware", - "boot_command": [ - "<esc><wait>", - "<esc><wait>", - "<enter><wait>", - "/install/vmlinuz<wait>", - " auto<wait>", - " console-setup/ask_detect=false<wait>", - " console-setup/layoutcode=us<wait>", - " console-setup/modelcode=pc105<wait>", - " debconf/frontend=noninteractive<wait>", - " debian-installer=en_US<wait>", - " fb=false<wait>", - " initrd=/install/initrd.gz<wait>", - " kbd-chooser/method=us<wait>", - " keyboard-configuration/layout=USA<wait>", - " keyboard-configuration/variant=USA<wait>", - " locale=en_US<wait>", - " netcfg/get_domain=vm<wait>", - " netcfg/get_hostname=vagrant<wait>", - " noapic<wait>", - " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/preseed.cfg<wait>", - " -- <wait>", - "<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": 40960, - "guest_os_type": "ubuntu", - "http_directory": "http", - "iso_checksum": "4bd3270bde86d7e4e017e3847a4af485", - "iso_checksum_type": "md5", - "iso_url": "http://releases.ubuntu.com/12.10/ubuntu-12.10-server-amd64.iso", - "ssh_username": "vagrant", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_wait_timeout": "10000s", - "shutdown_command": "echo 'shutdown -P now' > shutdown.sh; echo 'vagrant'|sudo -S sh 'shutdown.sh'", - "vmx_data": { - "memsize": "384", - "numvcpus": "1", - "cpuid.coresPerSocket": "1" - }, - "iso_md5": "4bd3270bde86d7e4e017e3847a4af485" - } - ], - "post-provisioner": [ - { - "type": "vagrant", - "output": "ubuntu-12.10-{{.Provisioner}}.box" - } - ] -} \ No newline at end of file diff --git a/templates/ubuntu-13.04-i386/http/preseed.cfg b/templates/ubuntu-13.04-i386/http/preseed.cfg deleted file mode 100644 index 903f2e14b..000000000 --- a/templates/ubuntu-13.04-i386/http/preseed.cfg +++ /dev/null @@ -1,31 +0,0 @@ -choose-mirror-bin mirror/http/proxy string -d-i base-installer/kernel/override-image string linux-server -d-i clock-setup/utc boolean true -d-i clock-setup/utc-auto boolean true -d-i finish-install/reboot_in_progress note -d-i grub-installer/only_debian boolean true -d-i grub-installer/with_other_os boolean true -d-i partman-auto-lvm/guided_size string max -d-i partman-auto/choose_recipe select atomic -d-i partman-auto/method string lvm -d-i partman-lvm/confirm boolean true -d-i partman-lvm/confirm boolean true -d-i partman-lvm/confirm_nooverwrite boolean true -d-i partman-lvm/device_remove_lvm boolean true -d-i partman/choose_partition select finish -d-i partman/confirm boolean true -d-i partman/confirm_nooverwrite boolean true -d-i partman/confirm_write_new_label boolean true -d-i passwd/user-fullname string vagrant -d-i passwd/user-uid string 900 -d-i passwd/user-password password vagrant -d-i passwd/user-password-again password vagrant -d-i passwd/username string vagrant -d-i pkgsel/include string openssh-server cryptsetup build-essential libssl-dev libreadline-dev zlib1g-dev linux-source dkms -d-i pkgsel/install-language-support boolean false -d-i pkgsel/update-policy select unattended-upgrades -d-i pkgsel/upgrade select full-upgrade -d-i time/zone string UTC -d-i user-setup/allow-password-weak boolean true -d-i user-setup/encrypt-home boolean false -tasksel tasksel/first multiselect standard, ubuntu-server diff --git a/templates/ubuntu-13.04-i386/scripts/cleanup.sh b/templates/ubuntu-13.04-i386/scripts/cleanup.sh deleted file mode 100644 index 6c7f703d6..000000000 --- a/templates/ubuntu-13.04-i386/scripts/cleanup.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/bash -eux - -apt-get -y autoremove -apt-get -y clean -rm -rf VBoxGuestAdditions_*.iso VBoxGuestAdditions_*.iso.? -rm -f /tmp/chef*deb diff --git a/templates/ubuntu-13.04-i386/scripts/minimize.sh b/templates/ubuntu-13.04-i386/scripts/minimize.sh deleted file mode 100644 index 3846a1d65..000000000 --- a/templates/ubuntu-13.04-i386/scripts/minimize.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash -eux - -dd if=/dev/zero of=/EMPTY bs=1M -rm -f /EMPTY diff --git a/templates/ubuntu-13.04-i386/scripts/networking.sh b/templates/ubuntu-13.04-i386/scripts/networking.sh deleted file mode 100644 index de3269a58..000000000 --- a/templates/ubuntu-13.04-i386/scripts/networking.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/bash -eux - -rm /etc/udev/rules.d/70-persistent-net.rules -mkdir /etc/udev/rules.d/70-persistent-net.rules -rm /lib/udev/rules.d/75-persistent-net-generator.rules -rm -rf /dev/.udev/ /var/lib/dhcp3/* -echo "pre-up sleep 2" >> /etc/network/interfaces diff --git a/templates/ubuntu-13.04-i386/scripts/sshd.sh b/templates/ubuntu-13.04-i386/scripts/sshd.sh deleted file mode 100644 index c6e4f20a6..000000000 --- a/templates/ubuntu-13.04-i386/scripts/sshd.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash -eux - -echo "UseDNS no" >> /etc/ssh/sshd_config diff --git a/templates/ubuntu-13.04-i386/scripts/sudoers.sh b/templates/ubuntu-13.04-i386/scripts/sudoers.sh deleted file mode 100644 index 5fce3dd2c..000000000 --- a/templates/ubuntu-13.04-i386/scripts/sudoers.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash -eux - -sed -i -e '/Defaults\s\+env_reset/a Defaults\texempt_group=sudo' /etc/sudoers -sed -i -e 's/%sudo ALL=(ALL:ALL) ALL/%sudo ALL=NOPASSWD:ALL/g' /etc/sudoers diff --git a/templates/ubuntu-13.04-i386/scripts/update.sh b/templates/ubuntu-13.04-i386/scripts/update.sh deleted file mode 100644 index 80e8dd3f9..000000000 --- a/templates/ubuntu-13.04-i386/scripts/update.sh +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/bash -eux - -apt-get update -apt-get -y upgrade - -# ensure the correct kernel headers are installed -apt-get -y install linux-headers-$(uname -r) - -# update package index on boot -cat <<EOF > /etc/init/refresh-apt.conf -description "update package index" -start on networking -task -exec /usr/bin/apt-get update -EOF diff --git a/templates/ubuntu-13.04-i386/scripts/vagrant.sh b/templates/ubuntu-13.04-i386/scripts/vagrant.sh deleted file mode 100644 index 72dd2f444..000000000 --- a/templates/ubuntu-13.04-i386/scripts/vagrant.sh +++ /dev/null @@ -1,33 +0,0 @@ -#!/bin/bash -eux - -if [ -f /home/vagrant/.vbox_version ]; then - mkdir /tmp/vbox - VER=$(cat /home/vagrant/.vbox_version) - mount -o loop VBoxGuestAdditions_$VER.iso /tmp/vbox - sh /tmp/vbox/VBoxLinuxAdditions.run - umount /tmp/vbox - rmdir /tmp/vbox - rm *.iso -fi - -if [ -f /home/vagrant/.vmfusion_version ]; then - #Set Linux-specific paths and ISO filename - home_dir="/home/vagrant" - iso_name="linux.iso" - mount_point="/tmp/vmware-tools" - #Run install, unmount ISO and remove it - mkdir ${mount_point} - cd ${home_dir} - /bin/mount -o loop ${iso_name} ${mount_point} - tar zxf ${mount_point}/*.tar.gz && cd vmware-tools-distrib && ./vmware-install.pl --default - /bin/umount ${mount_point} - /bin/rm -rf ${home_dir}/${iso_name} ${home_dir}/vmware-tools-distrib - rmdir ${mount_point} -fi - -mkdir /home/vagrant/.ssh -wget --no-check-certificate \ - 'https://github.com/mitchellh/vagrant/raw/master/keys/vagrant.pub' \ - -O /home/vagrant/.ssh/authorized_keys -chown -R vagrant /home/vagrant/.ssh -chmod -R go-rwsx /home/vagrant/.ssh diff --git a/templates/ubuntu-13.04-i386/template.json b/templates/ubuntu-13.04-i386/template.json deleted file mode 100644 index 46f137a61..000000000 --- a/templates/ubuntu-13.04-i386/template.json +++ /dev/null @@ -1,133 +0,0 @@ -{ - "provisioners": [ - { - "type": "shell", - "scripts": [ - "scripts/update.sh", - "scripts/vagrant.sh", - "scripts/sshd.sh", - "scripts/networking.sh", - "scripts/sudoers.sh", - "scripts/cleanup.sh", - "scripts/minimize.sh" - ], - "override": { - "virtualbox": { - "execute_command": "echo 'vagrant'|sudo -S sh '{{.Path}}'" - }, - "vmware": { - "execute_command": "echo 'vagrant'|sudo -S sh '{{.Path}}'" - } - } - } - ], - "builders": [ - { - "type": "virtualbox", - "boot_command": [ - "<esc><wait>", - "<esc><wait>", - "<enter><wait>", - "/install/vmlinuz<wait>", - " auto<wait>", - " console-setup/ask_detect=false<wait>", - " console-setup/layoutcode=us<wait>", - " console-setup/modelcode=pc105<wait>", - " debconf/frontend=noninteractive<wait>", - " debian-installer=en_US<wait>", - " fb=false<wait>", - " initrd=/install/initrd.gz<wait>", - " kbd-chooser/method=us<wait>", - " keyboard-configuration/layout=USA<wait>", - " keyboard-configuration/variant=USA<wait>", - " locale=en_US<wait>", - " netcfg/get_domain=vm<wait>", - " netcfg/get_hostname=vagrant<wait>", - " noapic<wait>", - " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/preseed.cfg<wait>", - " -- <wait>", - "<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": 40960, - "guest_os_type": "Ubuntu", - "http_directory": "http", - "iso_checksum": "73d595b804149fca9547ed94db8ff44f", - "iso_checksum_type": "md5", - "iso_url": "http://releases.ubuntu.com/13.04/ubuntu-13.04-server-i386.iso", - "ssh_username": "vagrant", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_wait_timeout": "10000s", - "shutdown_command": "echo 'shutdown -P now' > shutdown.sh; echo 'vagrant'|sudo -S sh 'shutdown.sh'", - "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", - "virtualbox_version_file": ".vbox_version", - "vboxmanage": [ - [ - "modifyvm", - "{{.Name}}", - "--memory", - "384" - ], - [ - "modifyvm", - "{{.Name}}", - "--cpus", - "1" - ] - ], - "iso_md5": "73d595b804149fca9547ed94db8ff44f" - }, - { - "type": "vmware", - "boot_command": [ - "<esc><wait>", - "<esc><wait>", - "<enter><wait>", - "/install/vmlinuz<wait>", - " auto<wait>", - " console-setup/ask_detect=false<wait>", - " console-setup/layoutcode=us<wait>", - " console-setup/modelcode=pc105<wait>", - " debconf/frontend=noninteractive<wait>", - " debian-installer=en_US<wait>", - " fb=false<wait>", - " initrd=/install/initrd.gz<wait>", - " kbd-chooser/method=us<wait>", - " keyboard-configuration/layout=USA<wait>", - " keyboard-configuration/variant=USA<wait>", - " locale=en_US<wait>", - " netcfg/get_domain=vm<wait>", - " netcfg/get_hostname=vagrant<wait>", - " noapic<wait>", - " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/preseed.cfg<wait>", - " -- <wait>", - "<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": 40960, - "guest_os_type": "ubuntu", - "http_directory": "http", - "iso_checksum": "73d595b804149fca9547ed94db8ff44f", - "iso_checksum_type": "md5", - "iso_url": "http://releases.ubuntu.com/13.04/ubuntu-13.04-server-i386.iso", - "ssh_username": "vagrant", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_wait_timeout": "10000s", - "shutdown_command": "echo 'shutdown -P now' > shutdown.sh; echo 'vagrant'|sudo -S sh 'shutdown.sh'", - "vmx_data": { - "memsize": "384", - "numvcpus": "1", - "cpuid.coresPerSocket": "1" - }, - "iso_md5": "73d595b804149fca9547ed94db8ff44f" - } - ], - "post-provisioner": [ - { - "type": "vagrant", - "output": "ubuntu-13.04-i386-{{.Provisioner}}.box" - } - ] -} \ No newline at end of file diff --git a/templates/ubuntu-13.04/http/preseed.cfg b/templates/ubuntu-13.04/http/preseed.cfg deleted file mode 100644 index 903f2e14b..000000000 --- a/templates/ubuntu-13.04/http/preseed.cfg +++ /dev/null @@ -1,31 +0,0 @@ -choose-mirror-bin mirror/http/proxy string -d-i base-installer/kernel/override-image string linux-server -d-i clock-setup/utc boolean true -d-i clock-setup/utc-auto boolean true -d-i finish-install/reboot_in_progress note -d-i grub-installer/only_debian boolean true -d-i grub-installer/with_other_os boolean true -d-i partman-auto-lvm/guided_size string max -d-i partman-auto/choose_recipe select atomic -d-i partman-auto/method string lvm -d-i partman-lvm/confirm boolean true -d-i partman-lvm/confirm boolean true -d-i partman-lvm/confirm_nooverwrite boolean true -d-i partman-lvm/device_remove_lvm boolean true -d-i partman/choose_partition select finish -d-i partman/confirm boolean true -d-i partman/confirm_nooverwrite boolean true -d-i partman/confirm_write_new_label boolean true -d-i passwd/user-fullname string vagrant -d-i passwd/user-uid string 900 -d-i passwd/user-password password vagrant -d-i passwd/user-password-again password vagrant -d-i passwd/username string vagrant -d-i pkgsel/include string openssh-server cryptsetup build-essential libssl-dev libreadline-dev zlib1g-dev linux-source dkms -d-i pkgsel/install-language-support boolean false -d-i pkgsel/update-policy select unattended-upgrades -d-i pkgsel/upgrade select full-upgrade -d-i time/zone string UTC -d-i user-setup/allow-password-weak boolean true -d-i user-setup/encrypt-home boolean false -tasksel tasksel/first multiselect standard, ubuntu-server diff --git a/templates/ubuntu-13.04/new.json b/templates/ubuntu-13.04/new.json deleted file mode 100644 index fe90ae035..000000000 --- a/templates/ubuntu-13.04/new.json +++ /dev/null @@ -1,135 +0,0 @@ -{ - "builders": [ - { - "boot_command": [ - "<esc><wait>", - "<esc><wait>", - "<enter><wait>", - "/install/vmlinuz<wait>", - " auto<wait>", - " console-setup/ask_detect=false<wait>", - " console-setup/layoutcode=us<wait>", - " console-setup/modelcode=pc105<wait>", - " debconf/frontend=noninteractive<wait>", - " debian-installer=en_US<wait>", - " fb=false<wait>", - " initrd=/install/initrd.gz<wait>", - " kbd-chooser/method=us<wait>", - " keyboard-configuration/layout=USA<wait>", - " keyboard-configuration/variant=USA<wait>", - " locale=en_US<wait>", - " netcfg/get_domain=vm<wait>", - " netcfg/get_hostname=vagrant<wait>", - " noapic<wait>", - " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/preseed.cfg<wait>", - " -- <wait>", - "<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": 40960, - "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", - "guest_os_type": "Ubuntu_64", - "http_directory": "http", - "iso_checksum": "7d335ca541fc4945b674459cde7bffb9", - "iso_checksum_type": "md5", - "iso_url": "http://releases.ubuntu.com/13.04/ubuntu-13.04-server-amd64.iso", - "shutdown_command": "echo 'shutdown -P now' > shutdown.sh; echo 'vagrant'|sudo -S sh 'shutdown.sh'", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "virtualbox", - "vboxmanage": [ - [ - "modifyvm", - "{{.Name}}", - "--memory", - "384" - ], - [ - "modifyvm", - "{{.Name}}", - "--cpus", - "1" - ] - ], - "virtualbox_version_file": ".vbox_version" - }, - { - "boot_command": [ - "<esc><wait>", - "<esc><wait>", - "<enter><wait>", - "/install/vmlinuz<wait>", - " auto<wait>", - " console-setup/ask_detect=false<wait>", - " console-setup/layoutcode=us<wait>", - " console-setup/modelcode=pc105<wait>", - " debconf/frontend=noninteractive<wait>", - " debian-installer=en_US<wait>", - " fb=false<wait>", - " initrd=/install/initrd.gz<wait>", - " kbd-chooser/method=us<wait>", - " keyboard-configuration/layout=USA<wait>", - " keyboard-configuration/variant=USA<wait>", - " locale=en_US<wait>", - " netcfg/get_domain=vm<wait>", - " netcfg/get_hostname=vagrant<wait>", - " noapic<wait>", - " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/preseed.cfg<wait>", - " -- <wait>", - "<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": 40960, - "guest_os_type": "ubuntu-64", - "headless": true, - "http_directory": "http", - "iso_checksum": "7d335ca541fc4945b674459cde7bffb9", - "iso_checksum_type": "md5", - "iso_url": "http://releases.ubuntu.com/13.04/ubuntu-13.04-server-amd64.iso", - "shutdown_command": "echo 'shutdown -P now' > shutdown.sh; echo 'vagrant'|sudo -S sh 'shutdown.sh'", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "tools_upload_flavor": "darwin", - "tools_upload_path": "./common/{{.Flavor}}.iso", - "type": "vmware", - "vmx_data": { - "cpuid.coresPerSocket": "1", - "memsize": "384", - "numvcpus": "1" - } - } - ], - "post-provisioner": [ - { - "output": "ubuntu-13.04-{{.Provisioner}}.box", - "type": "vagrant" - } - ], - "provisioners": [ - { - "override": { - "virtualbox": { - "execute_command": "echo 'vagrant'|sudo -S sh '{{.Path}}'" - }, - "vmware": { - "execute_command": "echo 'vagrant'|sudo -S sh '{{.Path}}'" - } - }, - "scripts": [ - "scripts/update.sh", - "scripts/vagrant.sh", - "scripts/sshd.sh", - "scripts/networking.sh", - "scripts/sudoers.sh", - "scripts/cleanup.sh", - "scripts/minimize.sh" - ], - "type": "shell" - } - ] -} - diff --git a/templates/ubuntu-13.04/scripts/cleanup.sh b/templates/ubuntu-13.04/scripts/cleanup.sh deleted file mode 100644 index 6c7f703d6..000000000 --- a/templates/ubuntu-13.04/scripts/cleanup.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/bash -eux - -apt-get -y autoremove -apt-get -y clean -rm -rf VBoxGuestAdditions_*.iso VBoxGuestAdditions_*.iso.? -rm -f /tmp/chef*deb diff --git a/templates/ubuntu-13.04/scripts/minimize.sh b/templates/ubuntu-13.04/scripts/minimize.sh deleted file mode 100644 index 3846a1d65..000000000 --- a/templates/ubuntu-13.04/scripts/minimize.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash -eux - -dd if=/dev/zero of=/EMPTY bs=1M -rm -f /EMPTY diff --git a/templates/ubuntu-13.04/scripts/networking.sh b/templates/ubuntu-13.04/scripts/networking.sh deleted file mode 100644 index de3269a58..000000000 --- a/templates/ubuntu-13.04/scripts/networking.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/bash -eux - -rm /etc/udev/rules.d/70-persistent-net.rules -mkdir /etc/udev/rules.d/70-persistent-net.rules -rm /lib/udev/rules.d/75-persistent-net-generator.rules -rm -rf /dev/.udev/ /var/lib/dhcp3/* -echo "pre-up sleep 2" >> /etc/network/interfaces diff --git a/templates/ubuntu-13.04/scripts/sshd.sh b/templates/ubuntu-13.04/scripts/sshd.sh deleted file mode 100644 index c6e4f20a6..000000000 --- a/templates/ubuntu-13.04/scripts/sshd.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash -eux - -echo "UseDNS no" >> /etc/ssh/sshd_config diff --git a/templates/ubuntu-13.04/scripts/sudoers.sh b/templates/ubuntu-13.04/scripts/sudoers.sh deleted file mode 100644 index 5fce3dd2c..000000000 --- a/templates/ubuntu-13.04/scripts/sudoers.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash -eux - -sed -i -e '/Defaults\s\+env_reset/a Defaults\texempt_group=sudo' /etc/sudoers -sed -i -e 's/%sudo ALL=(ALL:ALL) ALL/%sudo ALL=NOPASSWD:ALL/g' /etc/sudoers diff --git a/templates/ubuntu-13.04/scripts/update.sh b/templates/ubuntu-13.04/scripts/update.sh deleted file mode 100644 index 80e8dd3f9..000000000 --- a/templates/ubuntu-13.04/scripts/update.sh +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/bash -eux - -apt-get update -apt-get -y upgrade - -# ensure the correct kernel headers are installed -apt-get -y install linux-headers-$(uname -r) - -# update package index on boot -cat <<EOF > /etc/init/refresh-apt.conf -description "update package index" -start on networking -task -exec /usr/bin/apt-get update -EOF diff --git a/templates/ubuntu-13.04/scripts/vagrant.sh b/templates/ubuntu-13.04/scripts/vagrant.sh deleted file mode 100644 index 72dd2f444..000000000 --- a/templates/ubuntu-13.04/scripts/vagrant.sh +++ /dev/null @@ -1,33 +0,0 @@ -#!/bin/bash -eux - -if [ -f /home/vagrant/.vbox_version ]; then - mkdir /tmp/vbox - VER=$(cat /home/vagrant/.vbox_version) - mount -o loop VBoxGuestAdditions_$VER.iso /tmp/vbox - sh /tmp/vbox/VBoxLinuxAdditions.run - umount /tmp/vbox - rmdir /tmp/vbox - rm *.iso -fi - -if [ -f /home/vagrant/.vmfusion_version ]; then - #Set Linux-specific paths and ISO filename - home_dir="/home/vagrant" - iso_name="linux.iso" - mount_point="/tmp/vmware-tools" - #Run install, unmount ISO and remove it - mkdir ${mount_point} - cd ${home_dir} - /bin/mount -o loop ${iso_name} ${mount_point} - tar zxf ${mount_point}/*.tar.gz && cd vmware-tools-distrib && ./vmware-install.pl --default - /bin/umount ${mount_point} - /bin/rm -rf ${home_dir}/${iso_name} ${home_dir}/vmware-tools-distrib - rmdir ${mount_point} -fi - -mkdir /home/vagrant/.ssh -wget --no-check-certificate \ - 'https://github.com/mitchellh/vagrant/raw/master/keys/vagrant.pub' \ - -O /home/vagrant/.ssh/authorized_keys -chown -R vagrant /home/vagrant/.ssh -chmod -R go-rwsx /home/vagrant/.ssh diff --git a/templates/ubuntu-13.04/template.json b/templates/ubuntu-13.04/template.json deleted file mode 100644 index c87744a70..000000000 --- a/templates/ubuntu-13.04/template.json +++ /dev/null @@ -1,136 +0,0 @@ -{ - "provisioners": [ - { - "type": "shell", - "scripts": [ - "scripts/update.sh", - "scripts/vagrant.sh", - "scripts/sshd.sh", - "scripts/networking.sh", - "scripts/sudoers.sh", - "scripts/cleanup.sh", - "scripts/minimize.sh" - ], - "override": { - "virtualbox": { - "execute_command": "echo 'vagrant'|sudo -S sh '{{.Path}}'" - }, - "vmware": { - "execute_command": "echo 'vagrant'|sudo -S sh '{{.Path}}'" - } - } - } - ], - "builders": [ - { - "type": "virtualbox", - "boot_command": [ - "<esc><wait>", - "<esc><wait>", - "<enter><wait>", - "/install/vmlinuz<wait>", - " auto<wait>", - " console-setup/ask_detect=false<wait>", - " console-setup/layoutcode=us<wait>", - " console-setup/modelcode=pc105<wait>", - " debconf/frontend=noninteractive<wait>", - " debian-installer=en_US<wait>", - " fb=false<wait>", - " initrd=/install/initrd.gz<wait>", - " kbd-chooser/method=us<wait>", - " keyboard-configuration/layout=USA<wait>", - " keyboard-configuration/variant=USA<wait>", - " locale=en_US<wait>", - " netcfg/get_domain=vm<wait>", - " netcfg/get_hostname=vagrant<wait>", - " noapic<wait>", - " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/preseed.cfg<wait>", - " -- <wait>", - "<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": 40960, - "guest_os_type": "Ubuntu_64", - "http_directory": "http", - "iso_checksum": "7d335ca541fc4945b674459cde7bffb9", - "iso_checksum_type": "md5", - "iso_url": "http://releases.ubuntu.com/13.04/ubuntu-13.04-server-amd64.iso", - "ssh_username": "vagrant", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_wait_timeout": "10000s", - "shutdown_command": "echo 'shutdown -P now' > shutdown.sh; echo 'vagrant'|sudo -S sh 'shutdown.sh'", - "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", - "virtualbox_version_file": ".vbox_version", - "vboxmanage": [ - [ - "modifyvm", - "{{.Name}}", - "--memory", - "384" - ], - [ - "modifyvm", - "{{.Name}}", - "--cpus", - "1" - ] - ], - "iso_md5": "7d335ca541fc4945b674459cde7bffb9" - }, - { - "type": "vmware", - "boot_command": [ - "<esc><wait>", - "<esc><wait>", - "<enter><wait>", - "/install/vmlinuz<wait>", - " auto<wait>", - " console-setup/ask_detect=false<wait>", - " console-setup/layoutcode=us<wait>", - " console-setup/modelcode=pc105<wait>", - " debconf/frontend=noninteractive<wait>", - " debian-installer=en_US<wait>", - " fb=false<wait>", - " initrd=/install/initrd.gz<wait>", - " kbd-chooser/method=us<wait>", - " keyboard-configuration/layout=USA<wait>", - " keyboard-configuration/variant=USA<wait>", - " locale=en_US<wait>", - " netcfg/get_domain=vm<wait>", - " netcfg/get_hostname=vagrant<wait>", - " noapic<wait>", - " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/preseed.cfg<wait>", - " -- <wait>", - "<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": 40960, - "headless": true, - "tools_upload_flavor": "darwin", - "tools_upload_path": "./common/{{.Flavor}}.iso", - "guest_os_type": "ubuntu-64", - "http_directory": "http", - "iso_checksum": "7d335ca541fc4945b674459cde7bffb9", - "iso_checksum_type": "md5", - "iso_url": "http://releases.ubuntu.com/13.04/ubuntu-13.04-server-amd64.iso", - "ssh_username": "vagrant", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_wait_timeout": "10000s", - "shutdown_command": "echo 'shutdown -P now' > shutdown.sh; echo 'vagrant'|sudo -S sh 'shutdown.sh'", - "vmx_data": { - "memsize": "384", - "numvcpus": "1", - "cpuid.coresPerSocket": "1" - }, - "iso_md5": "7d335ca541fc4945b674459cde7bffb9" - } - ], - "post-provisioner": [ - { - "type": "vagrant", - "output": "ubuntu-13.04-{{.Provisioner}}.box" - } - ] -} From b98410fcda419ce1f645f7d21cf6522aa2d1c6db Mon Sep 17 00:00:00 2001 From: "Julian C. Dunn" <jdunn@opscode.com> Date: Sun, 1 Dec 2013 18:37:58 -0500 Subject: [PATCH 0137/1622] Remove legacy Veewee templates, leaving only the Windows ones that we still build with veewee. --- definitions/centos-5.5-i386/cleanup.sh | 1 - definitions/centos-5.5-i386/definition.rb | 11 - definitions/centos-5.5-i386/ks.cfg | 1 - definitions/centos-5.5-i386/minimize.sh | 1 - definitions/centos-5.5-i386/sshd.sh | 1 - definitions/centos-5.5-i386/vagrant.sh | 1 - definitions/centos-5.5/cleanup.sh | 1 - definitions/centos-5.5/definition.rb | 10 - definitions/centos-5.5/ks.cfg | 1 - definitions/centos-5.5/minimize.sh | 1 - definitions/centos-5.5/sshd.sh | 1 - definitions/centos-5.5/vagrant.sh | 1 - definitions/centos-5.6/cleanup.sh | 1 - definitions/centos-5.6/definition.rb | 10 - definitions/centos-5.6/ks.cfg | 1 - definitions/centos-5.6/minimize.sh | 1 - definitions/centos-5.6/sshd.sh | 1 - definitions/centos-5.6/vagrant.sh | 1 - definitions/centos-5.7/cleanup.sh | 1 - definitions/centos-5.7/definition.rb | 10 - definitions/centos-5.7/ks.cfg | 1 - definitions/centos-5.7/minimize.sh | 1 - definitions/centos-5.7/sshd.sh | 1 - definitions/centos-5.7/vagrant.sh | 1 - definitions/centos-5.8-i386/cleanup.sh | 1 - definitions/centos-5.8-i386/definition.rb | 11 - definitions/centos-5.8-i386/ks.cfg | 1 - definitions/centos-5.8-i386/minimize.sh | 1 - definitions/centos-5.8-i386/sshd.sh | 1 - definitions/centos-5.8-i386/vagrant.sh | 1 - definitions/centos-5.8/cleanup.sh | 1 - definitions/centos-5.8/definition.rb | 10 - definitions/centos-5.8/ks.cfg | 1 - definitions/centos-5.8/minimize.sh | 1 - definitions/centos-5.8/sshd.sh | 1 - definitions/centos-5.8/vagrant.sh | 1 - definitions/centos-5.9-i386/chef-client.sh | 3 - definitions/centos-5.9-i386/cleanup.sh | 1 - definitions/centos-5.9-i386/definition.rb | 11 - definitions/centos-5.9-i386/ks.cfg | 39 - definitions/centos-5.9-i386/minimize.sh | 4 - definitions/centos-5.9-i386/sshd.sh | 1 - definitions/centos-5.9-i386/vagrant.sh | 17 - definitions/centos-5.9/chef-client.sh | 3 - definitions/centos-5.9/cleanup.sh | 1 - definitions/centos-5.9/definition.rb | 11 - definitions/centos-5.9/ks.cfg | 39 - definitions/centos-5.9/minimize.sh | 4 - definitions/centos-5.9/sshd.sh | 1 - definitions/centos-5.9/vagrant.sh | 17 - definitions/centos-6.0/cleanup.sh | 1 - definitions/centos-6.0/definition.rb | 12 - definitions/centos-6.0/ks.cfg | 1 - definitions/centos-6.0/minimize.sh | 1 - definitions/centos-6.0/sshd.sh | 1 - definitions/centos-6.0/vagrant.sh | 1 - definitions/centos-6.2-i386/cleanup.sh | 1 - definitions/centos-6.2-i386/definition.rb | 14 - definitions/centos-6.2-i386/ks.cfg | 1 - definitions/centos-6.2-i386/minimize.sh | 1 - definitions/centos-6.2-i386/sshd.sh | 1 - definitions/centos-6.2-i386/vagrant.sh | 1 - definitions/centos-6.2/cleanup.sh | 1 - definitions/centos-6.2/definition.rb | 13 - definitions/centos-6.2/ks.cfg | 1 - definitions/centos-6.2/minimize.sh | 1 - definitions/centos-6.2/sshd.sh | 1 - definitions/centos-6.2/vagrant.sh | 1 - definitions/centos-6.3-i386/cleanup.sh | 1 - definitions/centos-6.3-i386/definition.rb | 14 - definitions/centos-6.3-i386/ks.cfg | 1 - definitions/centos-6.3-i386/minimize.sh | 1 - definitions/centos-6.3-i386/sshd.sh | 1 - definitions/centos-6.3-i386/vagrant.sh | 1 - definitions/centos-6.3/cleanup.sh | 1 - definitions/centos-6.3/definition.rb | 13 - definitions/centos-6.3/ks.cfg | 1 - definitions/centos-6.3/minimize.sh | 1 - definitions/centos-6.3/sshd.sh | 1 - definitions/centos-6.3/vagrant.sh | 1 - definitions/centos-6.4-i386/cleanup.sh | 1 - definitions/centos-6.4-i386/definition.rb | 14 - definitions/centos-6.4-i386/ks.cfg | 1 - definitions/centos-6.4-i386/minimize.sh | 1 - definitions/centos-6.4-i386/sshd.sh | 1 - definitions/centos-6.4-i386/vagrant.sh | 1 - definitions/centos-6.4/cleanup.sh | 1 - definitions/centos-6.4/definition.rb | 13 - definitions/centos-6.4/ks.cfg | 1 - definitions/centos-6.4/minimize.sh | 1 - definitions/centos-6.4/sshd.sh | 1 - definitions/centos-6.4/vagrant.sh | 1 - definitions/convert-to-packer-templates.rb | 31 - definitions/debian-6.0.7-i386/cleanup.sh | 1 - definitions/debian-6.0.7-i386/definition.rb | 11 - definitions/debian-6.0.7-i386/minimize.sh | 1 - definitions/debian-6.0.7-i386/networking.sh | 1 - definitions/debian-6.0.7-i386/preseed.cfg | 1 - definitions/debian-6.0.7-i386/sshd.sh | 1 - definitions/debian-6.0.7-i386/sudoers.sh | 1 - definitions/debian-6.0.7-i386/update.sh | 1 - definitions/debian-6.0.7-i386/vagrant.sh | 1 - definitions/debian-6.0.7/cleanup.sh | 1 - definitions/debian-6.0.7/definition.rb | 10 - definitions/debian-6.0.7/minimize.sh | 1 - definitions/debian-6.0.7/networking.sh | 1 - definitions/debian-6.0.7/preseed.cfg | 1 - definitions/debian-6.0.7/sshd.sh | 1 - definitions/debian-6.0.7/sudoers.sh | 1 - definitions/debian-6.0.7/update.sh | 1 - definitions/debian-6.0.7/vagrant.sh | 1 - definitions/debian-7.1.0-i386/cleanup.sh | 1 - definitions/debian-7.1.0-i386/definition.rb | 11 - definitions/debian-7.1.0-i386/minimize.sh | 1 - definitions/debian-7.1.0-i386/networking.sh | 1 - definitions/debian-7.1.0-i386/preseed.cfg | 48 - definitions/debian-7.1.0-i386/sshd.sh | 1 - definitions/debian-7.1.0-i386/sudoers.sh | 1 - definitions/debian-7.1.0-i386/update.sh | 1 - definitions/debian-7.1.0-i386/vagrant.sh | 1 - definitions/debian-7.1.0/cleanup.sh | 1 - definitions/debian-7.1.0/definition.rb | 10 - definitions/debian-7.1.0/minimize.sh | 1 - definitions/debian-7.1.0/networking.sh | 1 - definitions/debian-7.1.0/preseed.cfg | 48 - definitions/debian-7.1.0/sshd.sh | 1 - definitions/debian-7.1.0/sudoers.sh | 4 - definitions/debian-7.1.0/update.sh | 1 - definitions/debian-7.1.0/vagrant.sh | 1 - definitions/fedora-18/cleanup.sh | 1 - definitions/fedora-18/definition.rb | 11 - definitions/fedora-18/ks.cfg | 1 - definitions/fedora-18/minimize.sh | 1 - definitions/fedora-18/sshd.sh | 1 - definitions/fedora-18/vagrant.sh | 1 - definitions/fedora-19/cleanup.sh | 1 - definitions/fedora-19/definition.rb | 11 - definitions/fedora-19/ks.cfg | 1 - definitions/fedora-19/minimize.sh | 1 - definitions/fedora-19/sshd.sh | 1 - definitions/fedora-19/vagrant.sh | 1 - definitions/sles-11-sp2-i386/autoinst.xml | 2569 ------------------- definitions/sles-11-sp2-i386/cleanup.sh | 9 - definitions/sles-11-sp2-i386/definition.rb | 12 - definitions/sles-11-sp2-i386/minimize.sh | 1 - definitions/sles-11-sp2-i386/sshd.sh | 1 - definitions/sles-11-sp2-i386/sudoers.sh | 1 - definitions/sles-11-sp2-i386/vagrant.sh | 1 - definitions/sles-11-sp2/autoinst.xml | 2569 ------------------- definitions/sles-11-sp2/cleanup.sh | 9 - definitions/sles-11-sp2/definition.rb | 12 - definitions/sles-11-sp2/minimize.sh | 1 - definitions/sles-11-sp2/sshd.sh | 1 - definitions/sles-11-sp2/sudoers.sh | 1 - definitions/sles-11-sp2/vagrant.sh | 1 - definitions/sles-11-sp3-i386/autoinst.xml | 2569 ------------------- definitions/sles-11-sp3-i386/cleanup.sh | 9 - definitions/sles-11-sp3-i386/definition.rb | 12 - definitions/sles-11-sp3-i386/minimize.sh | 1 - definitions/sles-11-sp3-i386/sshd.sh | 1 - definitions/sles-11-sp3-i386/sudoers.sh | 1 - definitions/sles-11-sp3-i386/vagrant.sh | 1 - definitions/sles-11-sp3/autoinst.xml | 2569 ------------------- definitions/sles-11-sp3/cleanup.sh | 9 - definitions/sles-11-sp3/definition.rb | 12 - definitions/sles-11-sp3/minimize.sh | 1 - definitions/sles-11-sp3/sshd.sh | 1 - definitions/sles-11-sp3/sudoers.sh | 1 - definitions/sles-11-sp3/vagrant.sh | 1 - definitions/ubuntu-10.04-i386/cleanup.sh | 1 - definitions/ubuntu-10.04-i386/definition.rb | 11 - definitions/ubuntu-10.04-i386/minimize.sh | 1 - definitions/ubuntu-10.04-i386/networking.sh | 1 - definitions/ubuntu-10.04-i386/preseed.cfg | 1 - definitions/ubuntu-10.04-i386/sshd.sh | 1 - definitions/ubuntu-10.04-i386/sudoers.sh | 1 - definitions/ubuntu-10.04-i386/update.sh | 1 - definitions/ubuntu-10.04-i386/vagrant.sh | 1 - definitions/ubuntu-10.04/cleanup.sh | 1 - definitions/ubuntu-10.04/definition.rb | 10 - definitions/ubuntu-10.04/minimize.sh | 1 - definitions/ubuntu-10.04/networking.sh | 1 - definitions/ubuntu-10.04/preseed.cfg | 1 - definitions/ubuntu-10.04/sshd.sh | 1 - definitions/ubuntu-10.04/sudoers.sh | 1 - definitions/ubuntu-10.04/update.sh | 1 - definitions/ubuntu-10.04/vagrant.sh | 1 - definitions/ubuntu-10.10/cleanup.sh | 1 - definitions/ubuntu-10.10/definition.rb | 10 - definitions/ubuntu-10.10/minimize.sh | 1 - definitions/ubuntu-10.10/networking.sh | 1 - definitions/ubuntu-10.10/preseed.cfg | 1 - definitions/ubuntu-10.10/sshd.sh | 1 - definitions/ubuntu-10.10/sudoers.sh | 1 - definitions/ubuntu-10.10/update.sh | 1 - definitions/ubuntu-10.10/vagrant.sh | 1 - definitions/ubuntu-11.04/cleanup.sh | 1 - definitions/ubuntu-11.04/definition.rb | 10 - definitions/ubuntu-11.04/minimize.sh | 1 - definitions/ubuntu-11.04/networking.sh | 1 - definitions/ubuntu-11.04/preseed.cfg | 1 - definitions/ubuntu-11.04/sshd.sh | 1 - definitions/ubuntu-11.04/sudoers.sh | 1 - definitions/ubuntu-11.04/update.sh | 1 - definitions/ubuntu-11.04/vagrant.sh | 1 - definitions/ubuntu-11.10/cleanup.sh | 1 - definitions/ubuntu-11.10/definition.rb | 10 - definitions/ubuntu-11.10/minimize.sh | 1 - definitions/ubuntu-11.10/networking.sh | 1 - definitions/ubuntu-11.10/preseed.cfg | 1 - definitions/ubuntu-11.10/sshd.sh | 1 - definitions/ubuntu-11.10/sudoers.sh | 1 - definitions/ubuntu-11.10/update.sh | 1 - definitions/ubuntu-11.10/vagrant.sh | 1 - definitions/ubuntu-12.04-i386/cleanup.sh | 1 - definitions/ubuntu-12.04-i386/definition.rb | 11 - definitions/ubuntu-12.04-i386/minimize.sh | 1 - definitions/ubuntu-12.04-i386/networking.sh | 1 - definitions/ubuntu-12.04-i386/preseed.cfg | 1 - definitions/ubuntu-12.04-i386/sshd.sh | 1 - definitions/ubuntu-12.04-i386/sudoers.sh | 4 - definitions/ubuntu-12.04-i386/update.sh | 1 - definitions/ubuntu-12.04-i386/vagrant.sh | 1 - definitions/ubuntu-12.04/cleanup.sh | 1 - definitions/ubuntu-12.04/definition.rb | 10 - definitions/ubuntu-12.04/minimize.sh | 1 - definitions/ubuntu-12.04/networking.sh | 1 - definitions/ubuntu-12.04/preseed.cfg | 1 - definitions/ubuntu-12.04/sshd.sh | 1 - definitions/ubuntu-12.04/sudoers.sh | 4 - definitions/ubuntu-12.04/update.sh | 1 - definitions/ubuntu-12.04/vagrant.sh | 1 - definitions/ubuntu-12.10-i386/cleanup.sh | 1 - definitions/ubuntu-12.10-i386/definition.rb | 11 - definitions/ubuntu-12.10-i386/minimize.sh | 1 - definitions/ubuntu-12.10-i386/networking.sh | 1 - definitions/ubuntu-12.10-i386/preseed.cfg | 1 - definitions/ubuntu-12.10-i386/sshd.sh | 1 - definitions/ubuntu-12.10-i386/sudoers.sh | 4 - definitions/ubuntu-12.10-i386/update.sh | 1 - definitions/ubuntu-12.10-i386/vagrant.sh | 1 - definitions/ubuntu-12.10/cleanup.sh | 1 - definitions/ubuntu-12.10/definition.rb | 11 - definitions/ubuntu-12.10/minimize.sh | 1 - definitions/ubuntu-12.10/networking.sh | 1 - definitions/ubuntu-12.10/preseed.cfg | 1 - definitions/ubuntu-12.10/sshd.sh | 1 - definitions/ubuntu-12.10/sudoers.sh | 4 - definitions/ubuntu-12.10/update.sh | 1 - definitions/ubuntu-12.10/vagrant.sh | 1 - definitions/ubuntu-13.04-i386/cleanup.sh | 1 - definitions/ubuntu-13.04-i386/definition.rb | 11 - definitions/ubuntu-13.04-i386/minimize.sh | 1 - definitions/ubuntu-13.04-i386/networking.sh | 1 - definitions/ubuntu-13.04-i386/preseed.cfg | 1 - definitions/ubuntu-13.04-i386/sshd.sh | 1 - definitions/ubuntu-13.04-i386/sudoers.sh | 4 - definitions/ubuntu-13.04-i386/update.sh | 1 - definitions/ubuntu-13.04-i386/vagrant.sh | 1 - definitions/ubuntu-13.04/cleanup.sh | 1 - definitions/ubuntu-13.04/definition.rb | 10 - definitions/ubuntu-13.04/minimize.sh | 1 - definitions/ubuntu-13.04/networking.sh | 1 - definitions/ubuntu-13.04/preseed.cfg | 1 - definitions/ubuntu-13.04/sshd.sh | 1 - definitions/ubuntu-13.04/sudoers.sh | 4 - definitions/ubuntu-13.04/update.sh | 1 - definitions/ubuntu-13.04/vagrant.sh | 1 - 268 files changed, 11203 deletions(-) delete mode 120000 definitions/centos-5.5-i386/cleanup.sh delete mode 100644 definitions/centos-5.5-i386/definition.rb delete mode 120000 definitions/centos-5.5-i386/ks.cfg delete mode 120000 definitions/centos-5.5-i386/minimize.sh delete mode 120000 definitions/centos-5.5-i386/sshd.sh delete mode 120000 definitions/centos-5.5-i386/vagrant.sh delete mode 120000 definitions/centos-5.5/cleanup.sh delete mode 100644 definitions/centos-5.5/definition.rb delete mode 120000 definitions/centos-5.5/ks.cfg delete mode 120000 definitions/centos-5.5/minimize.sh delete mode 120000 definitions/centos-5.5/sshd.sh delete mode 120000 definitions/centos-5.5/vagrant.sh delete mode 120000 definitions/centos-5.6/cleanup.sh delete mode 100644 definitions/centos-5.6/definition.rb delete mode 120000 definitions/centos-5.6/ks.cfg delete mode 120000 definitions/centos-5.6/minimize.sh delete mode 120000 definitions/centos-5.6/sshd.sh delete mode 120000 definitions/centos-5.6/vagrant.sh delete mode 120000 definitions/centos-5.7/cleanup.sh delete mode 100644 definitions/centos-5.7/definition.rb delete mode 120000 definitions/centos-5.7/ks.cfg delete mode 120000 definitions/centos-5.7/minimize.sh delete mode 120000 definitions/centos-5.7/sshd.sh delete mode 120000 definitions/centos-5.7/vagrant.sh delete mode 120000 definitions/centos-5.8-i386/cleanup.sh delete mode 100644 definitions/centos-5.8-i386/definition.rb delete mode 120000 definitions/centos-5.8-i386/ks.cfg delete mode 120000 definitions/centos-5.8-i386/minimize.sh delete mode 120000 definitions/centos-5.8-i386/sshd.sh delete mode 120000 definitions/centos-5.8-i386/vagrant.sh delete mode 120000 definitions/centos-5.8/cleanup.sh delete mode 100644 definitions/centos-5.8/definition.rb delete mode 120000 definitions/centos-5.8/ks.cfg delete mode 120000 definitions/centos-5.8/minimize.sh delete mode 120000 definitions/centos-5.8/sshd.sh delete mode 120000 definitions/centos-5.8/vagrant.sh delete mode 100644 definitions/centos-5.9-i386/chef-client.sh delete mode 120000 definitions/centos-5.9-i386/cleanup.sh delete mode 100644 definitions/centos-5.9-i386/definition.rb delete mode 100644 definitions/centos-5.9-i386/ks.cfg delete mode 100644 definitions/centos-5.9-i386/minimize.sh delete mode 120000 definitions/centos-5.9-i386/sshd.sh delete mode 100644 definitions/centos-5.9-i386/vagrant.sh delete mode 100644 definitions/centos-5.9/chef-client.sh delete mode 120000 definitions/centos-5.9/cleanup.sh delete mode 100644 definitions/centos-5.9/definition.rb delete mode 100644 definitions/centos-5.9/ks.cfg delete mode 100644 definitions/centos-5.9/minimize.sh delete mode 120000 definitions/centos-5.9/sshd.sh delete mode 100644 definitions/centos-5.9/vagrant.sh delete mode 120000 definitions/centos-6.0/cleanup.sh delete mode 100644 definitions/centos-6.0/definition.rb delete mode 120000 definitions/centos-6.0/ks.cfg delete mode 120000 definitions/centos-6.0/minimize.sh delete mode 120000 definitions/centos-6.0/sshd.sh delete mode 120000 definitions/centos-6.0/vagrant.sh delete mode 120000 definitions/centos-6.2-i386/cleanup.sh delete mode 100644 definitions/centos-6.2-i386/definition.rb delete mode 120000 definitions/centos-6.2-i386/ks.cfg delete mode 120000 definitions/centos-6.2-i386/minimize.sh delete mode 120000 definitions/centos-6.2-i386/sshd.sh delete mode 120000 definitions/centos-6.2-i386/vagrant.sh delete mode 120000 definitions/centos-6.2/cleanup.sh delete mode 100644 definitions/centos-6.2/definition.rb delete mode 120000 definitions/centos-6.2/ks.cfg delete mode 120000 definitions/centos-6.2/minimize.sh delete mode 120000 definitions/centos-6.2/sshd.sh delete mode 120000 definitions/centos-6.2/vagrant.sh delete mode 120000 definitions/centos-6.3-i386/cleanup.sh delete mode 100644 definitions/centos-6.3-i386/definition.rb delete mode 120000 definitions/centos-6.3-i386/ks.cfg delete mode 120000 definitions/centos-6.3-i386/minimize.sh delete mode 120000 definitions/centos-6.3-i386/sshd.sh delete mode 120000 definitions/centos-6.3-i386/vagrant.sh delete mode 120000 definitions/centos-6.3/cleanup.sh delete mode 100644 definitions/centos-6.3/definition.rb delete mode 120000 definitions/centos-6.3/ks.cfg delete mode 120000 definitions/centos-6.3/minimize.sh delete mode 120000 definitions/centos-6.3/sshd.sh delete mode 120000 definitions/centos-6.3/vagrant.sh delete mode 120000 definitions/centos-6.4-i386/cleanup.sh delete mode 100644 definitions/centos-6.4-i386/definition.rb delete mode 120000 definitions/centos-6.4-i386/ks.cfg delete mode 120000 definitions/centos-6.4-i386/minimize.sh delete mode 120000 definitions/centos-6.4-i386/sshd.sh delete mode 120000 definitions/centos-6.4-i386/vagrant.sh delete mode 120000 definitions/centos-6.4/cleanup.sh delete mode 100644 definitions/centos-6.4/definition.rb delete mode 120000 definitions/centos-6.4/ks.cfg delete mode 120000 definitions/centos-6.4/minimize.sh delete mode 120000 definitions/centos-6.4/sshd.sh delete mode 120000 definitions/centos-6.4/vagrant.sh delete mode 100755 definitions/convert-to-packer-templates.rb delete mode 120000 definitions/debian-6.0.7-i386/cleanup.sh delete mode 100644 definitions/debian-6.0.7-i386/definition.rb delete mode 120000 definitions/debian-6.0.7-i386/minimize.sh delete mode 120000 definitions/debian-6.0.7-i386/networking.sh delete mode 120000 definitions/debian-6.0.7-i386/preseed.cfg delete mode 120000 definitions/debian-6.0.7-i386/sshd.sh delete mode 120000 definitions/debian-6.0.7-i386/sudoers.sh delete mode 120000 definitions/debian-6.0.7-i386/update.sh delete mode 120000 definitions/debian-6.0.7-i386/vagrant.sh delete mode 120000 definitions/debian-6.0.7/cleanup.sh delete mode 100644 definitions/debian-6.0.7/definition.rb delete mode 120000 definitions/debian-6.0.7/minimize.sh delete mode 120000 definitions/debian-6.0.7/networking.sh delete mode 120000 definitions/debian-6.0.7/preseed.cfg delete mode 120000 definitions/debian-6.0.7/sshd.sh delete mode 120000 definitions/debian-6.0.7/sudoers.sh delete mode 120000 definitions/debian-6.0.7/update.sh delete mode 120000 definitions/debian-6.0.7/vagrant.sh delete mode 120000 definitions/debian-7.1.0-i386/cleanup.sh delete mode 100644 definitions/debian-7.1.0-i386/definition.rb delete mode 120000 definitions/debian-7.1.0-i386/minimize.sh delete mode 120000 definitions/debian-7.1.0-i386/networking.sh delete mode 100644 definitions/debian-7.1.0-i386/preseed.cfg delete mode 120000 definitions/debian-7.1.0-i386/sshd.sh delete mode 120000 definitions/debian-7.1.0-i386/sudoers.sh delete mode 120000 definitions/debian-7.1.0-i386/update.sh delete mode 120000 definitions/debian-7.1.0-i386/vagrant.sh delete mode 120000 definitions/debian-7.1.0/cleanup.sh delete mode 100644 definitions/debian-7.1.0/definition.rb delete mode 120000 definitions/debian-7.1.0/minimize.sh delete mode 120000 definitions/debian-7.1.0/networking.sh delete mode 100644 definitions/debian-7.1.0/preseed.cfg delete mode 120000 definitions/debian-7.1.0/sshd.sh delete mode 100644 definitions/debian-7.1.0/sudoers.sh delete mode 120000 definitions/debian-7.1.0/update.sh delete mode 120000 definitions/debian-7.1.0/vagrant.sh delete mode 120000 definitions/fedora-18/cleanup.sh delete mode 100644 definitions/fedora-18/definition.rb delete mode 120000 definitions/fedora-18/ks.cfg delete mode 120000 definitions/fedora-18/minimize.sh delete mode 120000 definitions/fedora-18/sshd.sh delete mode 120000 definitions/fedora-18/vagrant.sh delete mode 120000 definitions/fedora-19/cleanup.sh delete mode 100644 definitions/fedora-19/definition.rb delete mode 120000 definitions/fedora-19/ks.cfg delete mode 120000 definitions/fedora-19/minimize.sh delete mode 120000 definitions/fedora-19/sshd.sh delete mode 120000 definitions/fedora-19/vagrant.sh delete mode 100644 definitions/sles-11-sp2-i386/autoinst.xml delete mode 100644 definitions/sles-11-sp2-i386/cleanup.sh delete mode 100644 definitions/sles-11-sp2-i386/definition.rb delete mode 120000 definitions/sles-11-sp2-i386/minimize.sh delete mode 120000 definitions/sles-11-sp2-i386/sshd.sh delete mode 120000 definitions/sles-11-sp2-i386/sudoers.sh delete mode 120000 definitions/sles-11-sp2-i386/vagrant.sh delete mode 100644 definitions/sles-11-sp2/autoinst.xml delete mode 100644 definitions/sles-11-sp2/cleanup.sh delete mode 100644 definitions/sles-11-sp2/definition.rb delete mode 120000 definitions/sles-11-sp2/minimize.sh delete mode 120000 definitions/sles-11-sp2/sshd.sh delete mode 120000 definitions/sles-11-sp2/sudoers.sh delete mode 120000 definitions/sles-11-sp2/vagrant.sh delete mode 100644 definitions/sles-11-sp3-i386/autoinst.xml delete mode 100644 definitions/sles-11-sp3-i386/cleanup.sh delete mode 100644 definitions/sles-11-sp3-i386/definition.rb delete mode 120000 definitions/sles-11-sp3-i386/minimize.sh delete mode 120000 definitions/sles-11-sp3-i386/sshd.sh delete mode 120000 definitions/sles-11-sp3-i386/sudoers.sh delete mode 120000 definitions/sles-11-sp3-i386/vagrant.sh delete mode 100644 definitions/sles-11-sp3/autoinst.xml delete mode 100644 definitions/sles-11-sp3/cleanup.sh delete mode 100644 definitions/sles-11-sp3/definition.rb delete mode 120000 definitions/sles-11-sp3/minimize.sh delete mode 120000 definitions/sles-11-sp3/sshd.sh delete mode 120000 definitions/sles-11-sp3/sudoers.sh delete mode 120000 definitions/sles-11-sp3/vagrant.sh delete mode 120000 definitions/ubuntu-10.04-i386/cleanup.sh delete mode 100644 definitions/ubuntu-10.04-i386/definition.rb delete mode 120000 definitions/ubuntu-10.04-i386/minimize.sh delete mode 120000 definitions/ubuntu-10.04-i386/networking.sh delete mode 120000 definitions/ubuntu-10.04-i386/preseed.cfg delete mode 120000 definitions/ubuntu-10.04-i386/sshd.sh delete mode 120000 definitions/ubuntu-10.04-i386/sudoers.sh delete mode 120000 definitions/ubuntu-10.04-i386/update.sh delete mode 120000 definitions/ubuntu-10.04-i386/vagrant.sh delete mode 120000 definitions/ubuntu-10.04/cleanup.sh delete mode 100644 definitions/ubuntu-10.04/definition.rb delete mode 120000 definitions/ubuntu-10.04/minimize.sh delete mode 120000 definitions/ubuntu-10.04/networking.sh delete mode 120000 definitions/ubuntu-10.04/preseed.cfg delete mode 120000 definitions/ubuntu-10.04/sshd.sh delete mode 120000 definitions/ubuntu-10.04/sudoers.sh delete mode 120000 definitions/ubuntu-10.04/update.sh delete mode 120000 definitions/ubuntu-10.04/vagrant.sh delete mode 120000 definitions/ubuntu-10.10/cleanup.sh delete mode 100644 definitions/ubuntu-10.10/definition.rb delete mode 120000 definitions/ubuntu-10.10/minimize.sh delete mode 120000 definitions/ubuntu-10.10/networking.sh delete mode 120000 definitions/ubuntu-10.10/preseed.cfg delete mode 120000 definitions/ubuntu-10.10/sshd.sh delete mode 120000 definitions/ubuntu-10.10/sudoers.sh delete mode 120000 definitions/ubuntu-10.10/update.sh delete mode 120000 definitions/ubuntu-10.10/vagrant.sh delete mode 120000 definitions/ubuntu-11.04/cleanup.sh delete mode 100644 definitions/ubuntu-11.04/definition.rb delete mode 120000 definitions/ubuntu-11.04/minimize.sh delete mode 120000 definitions/ubuntu-11.04/networking.sh delete mode 120000 definitions/ubuntu-11.04/preseed.cfg delete mode 120000 definitions/ubuntu-11.04/sshd.sh delete mode 120000 definitions/ubuntu-11.04/sudoers.sh delete mode 120000 definitions/ubuntu-11.04/update.sh delete mode 120000 definitions/ubuntu-11.04/vagrant.sh delete mode 120000 definitions/ubuntu-11.10/cleanup.sh delete mode 100644 definitions/ubuntu-11.10/definition.rb delete mode 120000 definitions/ubuntu-11.10/minimize.sh delete mode 120000 definitions/ubuntu-11.10/networking.sh delete mode 120000 definitions/ubuntu-11.10/preseed.cfg delete mode 120000 definitions/ubuntu-11.10/sshd.sh delete mode 120000 definitions/ubuntu-11.10/sudoers.sh delete mode 120000 definitions/ubuntu-11.10/update.sh delete mode 120000 definitions/ubuntu-11.10/vagrant.sh delete mode 120000 definitions/ubuntu-12.04-i386/cleanup.sh delete mode 100644 definitions/ubuntu-12.04-i386/definition.rb delete mode 120000 definitions/ubuntu-12.04-i386/minimize.sh delete mode 120000 definitions/ubuntu-12.04-i386/networking.sh delete mode 120000 definitions/ubuntu-12.04-i386/preseed.cfg delete mode 120000 definitions/ubuntu-12.04-i386/sshd.sh delete mode 100644 definitions/ubuntu-12.04-i386/sudoers.sh delete mode 120000 definitions/ubuntu-12.04-i386/update.sh delete mode 120000 definitions/ubuntu-12.04-i386/vagrant.sh delete mode 120000 definitions/ubuntu-12.04/cleanup.sh delete mode 100644 definitions/ubuntu-12.04/definition.rb delete mode 120000 definitions/ubuntu-12.04/minimize.sh delete mode 120000 definitions/ubuntu-12.04/networking.sh delete mode 120000 definitions/ubuntu-12.04/preseed.cfg delete mode 120000 definitions/ubuntu-12.04/sshd.sh delete mode 100644 definitions/ubuntu-12.04/sudoers.sh delete mode 120000 definitions/ubuntu-12.04/update.sh delete mode 120000 definitions/ubuntu-12.04/vagrant.sh delete mode 120000 definitions/ubuntu-12.10-i386/cleanup.sh delete mode 100644 definitions/ubuntu-12.10-i386/definition.rb delete mode 120000 definitions/ubuntu-12.10-i386/minimize.sh delete mode 120000 definitions/ubuntu-12.10-i386/networking.sh delete mode 120000 definitions/ubuntu-12.10-i386/preseed.cfg delete mode 120000 definitions/ubuntu-12.10-i386/sshd.sh delete mode 100644 definitions/ubuntu-12.10-i386/sudoers.sh delete mode 120000 definitions/ubuntu-12.10-i386/update.sh delete mode 120000 definitions/ubuntu-12.10-i386/vagrant.sh delete mode 120000 definitions/ubuntu-12.10/cleanup.sh delete mode 100644 definitions/ubuntu-12.10/definition.rb delete mode 120000 definitions/ubuntu-12.10/minimize.sh delete mode 120000 definitions/ubuntu-12.10/networking.sh delete mode 120000 definitions/ubuntu-12.10/preseed.cfg delete mode 120000 definitions/ubuntu-12.10/sshd.sh delete mode 100644 definitions/ubuntu-12.10/sudoers.sh delete mode 120000 definitions/ubuntu-12.10/update.sh delete mode 120000 definitions/ubuntu-12.10/vagrant.sh delete mode 120000 definitions/ubuntu-13.04-i386/cleanup.sh delete mode 100644 definitions/ubuntu-13.04-i386/definition.rb delete mode 120000 definitions/ubuntu-13.04-i386/minimize.sh delete mode 120000 definitions/ubuntu-13.04-i386/networking.sh delete mode 120000 definitions/ubuntu-13.04-i386/preseed.cfg delete mode 120000 definitions/ubuntu-13.04-i386/sshd.sh delete mode 100644 definitions/ubuntu-13.04-i386/sudoers.sh delete mode 120000 definitions/ubuntu-13.04-i386/update.sh delete mode 120000 definitions/ubuntu-13.04-i386/vagrant.sh delete mode 120000 definitions/ubuntu-13.04/cleanup.sh delete mode 100644 definitions/ubuntu-13.04/definition.rb delete mode 120000 definitions/ubuntu-13.04/minimize.sh delete mode 120000 definitions/ubuntu-13.04/networking.sh delete mode 120000 definitions/ubuntu-13.04/preseed.cfg delete mode 120000 definitions/ubuntu-13.04/sshd.sh delete mode 100644 definitions/ubuntu-13.04/sudoers.sh delete mode 120000 definitions/ubuntu-13.04/update.sh delete mode 120000 definitions/ubuntu-13.04/vagrant.sh diff --git a/definitions/centos-5.5-i386/cleanup.sh b/definitions/centos-5.5-i386/cleanup.sh deleted file mode 120000 index 4658a8585..000000000 --- a/definitions/centos-5.5-i386/cleanup.sh +++ /dev/null @@ -1 +0,0 @@ -../.centos/cleanup.sh \ No newline at end of file diff --git a/definitions/centos-5.5-i386/definition.rb b/definitions/centos-5.5-i386/definition.rb deleted file mode 100644 index 120e68fc5..000000000 --- a/definitions/centos-5.5-i386/definition.rb +++ /dev/null @@ -1,11 +0,0 @@ -require File.dirname(__FILE__) + "/../.centos/session.rb" - -iso = "CentOS-5.5-i386-bin-DVD.iso" - -session = - CENTOS_SESSION.merge({ :os_type_id => 'Centos', - :iso_file => iso, - :iso_md5 => "75c92246479df172de41b14c9b966344", - :iso_src => "http://mirror.teklinks.com/centos/5.5/isos/i386/#{iso}" }) - -Veewee::Session.declare session diff --git a/definitions/centos-5.5-i386/ks.cfg b/definitions/centos-5.5-i386/ks.cfg deleted file mode 120000 index 24af87031..000000000 --- a/definitions/centos-5.5-i386/ks.cfg +++ /dev/null @@ -1 +0,0 @@ -../.centos/ks.cfg \ No newline at end of file diff --git a/definitions/centos-5.5-i386/minimize.sh b/definitions/centos-5.5-i386/minimize.sh deleted file mode 120000 index b3632ccbc..000000000 --- a/definitions/centos-5.5-i386/minimize.sh +++ /dev/null @@ -1 +0,0 @@ -../.common/minimize.sh \ No newline at end of file diff --git a/definitions/centos-5.5-i386/sshd.sh b/definitions/centos-5.5-i386/sshd.sh deleted file mode 120000 index f353f2d00..000000000 --- a/definitions/centos-5.5-i386/sshd.sh +++ /dev/null @@ -1 +0,0 @@ -../.common/sshd.sh \ No newline at end of file diff --git a/definitions/centos-5.5-i386/vagrant.sh b/definitions/centos-5.5-i386/vagrant.sh deleted file mode 120000 index 702949639..000000000 --- a/definitions/centos-5.5-i386/vagrant.sh +++ /dev/null @@ -1 +0,0 @@ -../.common/vagrant.sh \ No newline at end of file diff --git a/definitions/centos-5.5/cleanup.sh b/definitions/centos-5.5/cleanup.sh deleted file mode 120000 index 4658a8585..000000000 --- a/definitions/centos-5.5/cleanup.sh +++ /dev/null @@ -1 +0,0 @@ -../.centos/cleanup.sh \ No newline at end of file diff --git a/definitions/centos-5.5/definition.rb b/definitions/centos-5.5/definition.rb deleted file mode 100644 index 9fa67c549..000000000 --- a/definitions/centos-5.5/definition.rb +++ /dev/null @@ -1,10 +0,0 @@ -require File.dirname(__FILE__) + "/../.centos/session.rb" - -iso = "CentOS-5.5-x86_64-bin-DVD-1of2.iso" - -session = - CENTOS_SESSION.merge({ :iso_file => iso, - :iso_md5 => "ac177a5476e3b255b89b659e5b10ba03", - :iso_src => "http://mirror.teklinks.com/centos/5.5/isos/x86_64/#{iso}" }) - -Veewee::Session.declare session diff --git a/definitions/centos-5.5/ks.cfg b/definitions/centos-5.5/ks.cfg deleted file mode 120000 index 24af87031..000000000 --- a/definitions/centos-5.5/ks.cfg +++ /dev/null @@ -1 +0,0 @@ -../.centos/ks.cfg \ No newline at end of file diff --git a/definitions/centos-5.5/minimize.sh b/definitions/centos-5.5/minimize.sh deleted file mode 120000 index b3632ccbc..000000000 --- a/definitions/centos-5.5/minimize.sh +++ /dev/null @@ -1 +0,0 @@ -../.common/minimize.sh \ No newline at end of file diff --git a/definitions/centos-5.5/sshd.sh b/definitions/centos-5.5/sshd.sh deleted file mode 120000 index f353f2d00..000000000 --- a/definitions/centos-5.5/sshd.sh +++ /dev/null @@ -1 +0,0 @@ -../.common/sshd.sh \ No newline at end of file diff --git a/definitions/centos-5.5/vagrant.sh b/definitions/centos-5.5/vagrant.sh deleted file mode 120000 index 702949639..000000000 --- a/definitions/centos-5.5/vagrant.sh +++ /dev/null @@ -1 +0,0 @@ -../.common/vagrant.sh \ No newline at end of file diff --git a/definitions/centos-5.6/cleanup.sh b/definitions/centos-5.6/cleanup.sh deleted file mode 120000 index 4658a8585..000000000 --- a/definitions/centos-5.6/cleanup.sh +++ /dev/null @@ -1 +0,0 @@ -../.centos/cleanup.sh \ No newline at end of file diff --git a/definitions/centos-5.6/definition.rb b/definitions/centos-5.6/definition.rb deleted file mode 100644 index 6ab607860..000000000 --- a/definitions/centos-5.6/definition.rb +++ /dev/null @@ -1,10 +0,0 @@ -require File.dirname(__FILE__) + "/../.centos/session.rb" - -iso = "CentOS-5.6-x86_64-bin-DVD-1of2.iso" - -session = - CENTOS_SESSION.merge({ :iso_file => iso, - :iso_md5 => "b37209879c0fb158fac25045527241ee", - :iso_src => "http://mirror.teklinks.com/centos/5.6/isos/x86_64/#{iso}" }) - -Veewee::Session.declare session diff --git a/definitions/centos-5.6/ks.cfg b/definitions/centos-5.6/ks.cfg deleted file mode 120000 index 24af87031..000000000 --- a/definitions/centos-5.6/ks.cfg +++ /dev/null @@ -1 +0,0 @@ -../.centos/ks.cfg \ No newline at end of file diff --git a/definitions/centos-5.6/minimize.sh b/definitions/centos-5.6/minimize.sh deleted file mode 120000 index b3632ccbc..000000000 --- a/definitions/centos-5.6/minimize.sh +++ /dev/null @@ -1 +0,0 @@ -../.common/minimize.sh \ No newline at end of file diff --git a/definitions/centos-5.6/sshd.sh b/definitions/centos-5.6/sshd.sh deleted file mode 120000 index f353f2d00..000000000 --- a/definitions/centos-5.6/sshd.sh +++ /dev/null @@ -1 +0,0 @@ -../.common/sshd.sh \ No newline at end of file diff --git a/definitions/centos-5.6/vagrant.sh b/definitions/centos-5.6/vagrant.sh deleted file mode 120000 index 702949639..000000000 --- a/definitions/centos-5.6/vagrant.sh +++ /dev/null @@ -1 +0,0 @@ -../.common/vagrant.sh \ No newline at end of file diff --git a/definitions/centos-5.7/cleanup.sh b/definitions/centos-5.7/cleanup.sh deleted file mode 120000 index 4658a8585..000000000 --- a/definitions/centos-5.7/cleanup.sh +++ /dev/null @@ -1 +0,0 @@ -../.centos/cleanup.sh \ No newline at end of file diff --git a/definitions/centos-5.7/definition.rb b/definitions/centos-5.7/definition.rb deleted file mode 100644 index 6fdcfd706..000000000 --- a/definitions/centos-5.7/definition.rb +++ /dev/null @@ -1,10 +0,0 @@ -require File.dirname(__FILE__) + "/../.centos/session.rb" - -iso = "CentOS-5.7-x86_64-bin-DVD-1of2.iso" - -session = - CENTOS_SESSION.merge({ :iso_file => iso, - :iso_md5 => "55eadec0a6e87c5f2883f734d43fdb58", - :iso_src => "http://vault.centos.org/5.7/isos/x86_64/#{iso}" }) - -Veewee::Session.declare session diff --git a/definitions/centos-5.7/ks.cfg b/definitions/centos-5.7/ks.cfg deleted file mode 120000 index 24af87031..000000000 --- a/definitions/centos-5.7/ks.cfg +++ /dev/null @@ -1 +0,0 @@ -../.centos/ks.cfg \ No newline at end of file diff --git a/definitions/centos-5.7/minimize.sh b/definitions/centos-5.7/minimize.sh deleted file mode 120000 index b3632ccbc..000000000 --- a/definitions/centos-5.7/minimize.sh +++ /dev/null @@ -1 +0,0 @@ -../.common/minimize.sh \ No newline at end of file diff --git a/definitions/centos-5.7/sshd.sh b/definitions/centos-5.7/sshd.sh deleted file mode 120000 index f353f2d00..000000000 --- a/definitions/centos-5.7/sshd.sh +++ /dev/null @@ -1 +0,0 @@ -../.common/sshd.sh \ No newline at end of file diff --git a/definitions/centos-5.7/vagrant.sh b/definitions/centos-5.7/vagrant.sh deleted file mode 120000 index 702949639..000000000 --- a/definitions/centos-5.7/vagrant.sh +++ /dev/null @@ -1 +0,0 @@ -../.common/vagrant.sh \ No newline at end of file diff --git a/definitions/centos-5.8-i386/cleanup.sh b/definitions/centos-5.8-i386/cleanup.sh deleted file mode 120000 index 4658a8585..000000000 --- a/definitions/centos-5.8-i386/cleanup.sh +++ /dev/null @@ -1 +0,0 @@ -../.centos/cleanup.sh \ No newline at end of file diff --git a/definitions/centos-5.8-i386/definition.rb b/definitions/centos-5.8-i386/definition.rb deleted file mode 100644 index 6eb7161e8..000000000 --- a/definitions/centos-5.8-i386/definition.rb +++ /dev/null @@ -1,11 +0,0 @@ -require File.dirname(__FILE__) + "/../.centos/session.rb" - -iso = "CentOS-5.8-i386-bin-DVD-1of2.iso" - -session = - CENTOS_SESSION.merge({ :os_type_id => 'Centos', - :iso_file => iso, - :iso_md5 => "0fdd45c43b5d8fb9e05f4255c5855f9c", - :iso_src => "http://vault.centos.org/5.8/isos/i386/#{iso}" }) - -Veewee::Session.declare session diff --git a/definitions/centos-5.8-i386/ks.cfg b/definitions/centos-5.8-i386/ks.cfg deleted file mode 120000 index 24af87031..000000000 --- a/definitions/centos-5.8-i386/ks.cfg +++ /dev/null @@ -1 +0,0 @@ -../.centos/ks.cfg \ No newline at end of file diff --git a/definitions/centos-5.8-i386/minimize.sh b/definitions/centos-5.8-i386/minimize.sh deleted file mode 120000 index b3632ccbc..000000000 --- a/definitions/centos-5.8-i386/minimize.sh +++ /dev/null @@ -1 +0,0 @@ -../.common/minimize.sh \ No newline at end of file diff --git a/definitions/centos-5.8-i386/sshd.sh b/definitions/centos-5.8-i386/sshd.sh deleted file mode 120000 index f353f2d00..000000000 --- a/definitions/centos-5.8-i386/sshd.sh +++ /dev/null @@ -1 +0,0 @@ -../.common/sshd.sh \ No newline at end of file diff --git a/definitions/centos-5.8-i386/vagrant.sh b/definitions/centos-5.8-i386/vagrant.sh deleted file mode 120000 index 702949639..000000000 --- a/definitions/centos-5.8-i386/vagrant.sh +++ /dev/null @@ -1 +0,0 @@ -../.common/vagrant.sh \ No newline at end of file diff --git a/definitions/centos-5.8/cleanup.sh b/definitions/centos-5.8/cleanup.sh deleted file mode 120000 index 4658a8585..000000000 --- a/definitions/centos-5.8/cleanup.sh +++ /dev/null @@ -1 +0,0 @@ -../.centos/cleanup.sh \ No newline at end of file diff --git a/definitions/centos-5.8/definition.rb b/definitions/centos-5.8/definition.rb deleted file mode 100644 index d8ad63d63..000000000 --- a/definitions/centos-5.8/definition.rb +++ /dev/null @@ -1,10 +0,0 @@ -require File.dirname(__FILE__) + "/../.centos/session.rb" - -iso = "CentOS-5.8-x86_64-bin-DVD-1of2.iso" - -session = - CENTOS_SESSION.merge({ :iso_file => iso, - :iso_md5 => "8a3bf0030f192022943f83fe6b2cf373", - :iso_src => "http://vault.centos.org/5.8/isos/x86_64/#{iso}" }) - -Veewee::Session.declare session diff --git a/definitions/centos-5.8/ks.cfg b/definitions/centos-5.8/ks.cfg deleted file mode 120000 index 24af87031..000000000 --- a/definitions/centos-5.8/ks.cfg +++ /dev/null @@ -1 +0,0 @@ -../.centos/ks.cfg \ No newline at end of file diff --git a/definitions/centos-5.8/minimize.sh b/definitions/centos-5.8/minimize.sh deleted file mode 120000 index b3632ccbc..000000000 --- a/definitions/centos-5.8/minimize.sh +++ /dev/null @@ -1 +0,0 @@ -../.common/minimize.sh \ No newline at end of file diff --git a/definitions/centos-5.8/sshd.sh b/definitions/centos-5.8/sshd.sh deleted file mode 120000 index f353f2d00..000000000 --- a/definitions/centos-5.8/sshd.sh +++ /dev/null @@ -1 +0,0 @@ -../.common/sshd.sh \ No newline at end of file diff --git a/definitions/centos-5.8/vagrant.sh b/definitions/centos-5.8/vagrant.sh deleted file mode 120000 index 702949639..000000000 --- a/definitions/centos-5.8/vagrant.sh +++ /dev/null @@ -1 +0,0 @@ -../.common/vagrant.sh \ No newline at end of file diff --git a/definitions/centos-5.9-i386/chef-client.sh b/definitions/centos-5.9-i386/chef-client.sh deleted file mode 100644 index f1f28d4d2..000000000 --- a/definitions/centos-5.9-i386/chef-client.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash -eux - -wget -O - http://opscode.com/chef/install.sh | sudo bash diff --git a/definitions/centos-5.9-i386/cleanup.sh b/definitions/centos-5.9-i386/cleanup.sh deleted file mode 120000 index 4658a8585..000000000 --- a/definitions/centos-5.9-i386/cleanup.sh +++ /dev/null @@ -1 +0,0 @@ -../.centos/cleanup.sh \ No newline at end of file diff --git a/definitions/centos-5.9-i386/definition.rb b/definitions/centos-5.9-i386/definition.rb deleted file mode 100644 index 4dfd46d3f..000000000 --- a/definitions/centos-5.9-i386/definition.rb +++ /dev/null @@ -1,11 +0,0 @@ -require File.dirname(__FILE__) + "/../.centos/session.rb" - -iso = "CentOS-5.9-i386-bin-DVD-1of2.iso" - -session = - CENTOS_SESSION.merge({ :os_type_id => 'RedHat', - :iso_file => iso, - :iso_md5 => "c8caaa18400dfde2065d8ef58eb9e9bf", - :iso_src => "http://mirror.stanford.edu/yum/pub/centos/5.9/isos/i386/#{iso}" }) - -Veewee::Session.declare session diff --git a/definitions/centos-5.9-i386/ks.cfg b/definitions/centos-5.9-i386/ks.cfg deleted file mode 100644 index e00fd5a2a..000000000 --- a/definitions/centos-5.9-i386/ks.cfg +++ /dev/null @@ -1,39 +0,0 @@ -install -cdrom -lang en_US.UTF-8 -keyboard us -network --bootproto=dhcp -rootpw --iscrypted $1$damlkd,f$UC/u5pUts5QiU3ow.CSso/ -firewall --disabled -authconfig --enableshadow --passalgo=sha512 -selinux --disabled -timezone UTC -bootloader --location=mbr -text -skipx -zerombr -clearpart --all --initlabel -autopart -auth --useshadow --enablemd5 -firstboot --disabled -reboot - -%packages --ignoremissing -@Base -@Core -@Development Tools -openssl-devel -readline-devel -zlib-devel -kernel-devel - -%post -# update root certs -wget -O/etc/pki/tls/certs/ca-bundle.crt http://curl.haxx.se/ca/cacert.pem -# vagrant -groupadd vagrant -g 999 -useradd vagrant -g vagrant -G wheel -u 900 -echo "vagrant" | passwd --stdin vagrant -# sudo -echo "vagrant ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers -sed -i "s/^.*requiretty/#Defaults requiretty/" /etc/sudoers diff --git a/definitions/centos-5.9-i386/minimize.sh b/definitions/centos-5.9-i386/minimize.sh deleted file mode 100644 index 3846a1d65..000000000 --- a/definitions/centos-5.9-i386/minimize.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash -eux - -dd if=/dev/zero of=/EMPTY bs=1M -rm -f /EMPTY diff --git a/definitions/centos-5.9-i386/sshd.sh b/definitions/centos-5.9-i386/sshd.sh deleted file mode 120000 index f353f2d00..000000000 --- a/definitions/centos-5.9-i386/sshd.sh +++ /dev/null @@ -1 +0,0 @@ -../.common/sshd.sh \ No newline at end of file diff --git a/definitions/centos-5.9-i386/vagrant.sh b/definitions/centos-5.9-i386/vagrant.sh deleted file mode 100644 index 9368ef636..000000000 --- a/definitions/centos-5.9-i386/vagrant.sh +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/bash -eux - -mkdir /tmp/vbox -VER=$(cat /home/vagrant/.vbox_version) -wget http://download.virtualbox.org/virtualbox/$VER/VBoxGuestAdditions_$VER.iso -mount -o loop VBoxGuestAdditions_$VER.iso /tmp/vbox -sh /tmp/vbox/VBoxLinuxAdditions.run -umount /tmp/vbox -rmdir /tmp/vbox -rm *.iso - -mkdir /home/vagrant/.ssh -wget --no-check-certificate \ - 'http://github.com/mitchellh/vagrant/raw/master/keys/vagrant.pub' \ - -O /home/vagrant/.ssh/authorized_keys -chown -R vagrant /home/vagrant/.ssh -chmod -R go-rwsx /home/vagrant/.ssh diff --git a/definitions/centos-5.9/chef-client.sh b/definitions/centos-5.9/chef-client.sh deleted file mode 100644 index f1f28d4d2..000000000 --- a/definitions/centos-5.9/chef-client.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash -eux - -wget -O - http://opscode.com/chef/install.sh | sudo bash diff --git a/definitions/centos-5.9/cleanup.sh b/definitions/centos-5.9/cleanup.sh deleted file mode 120000 index 4658a8585..000000000 --- a/definitions/centos-5.9/cleanup.sh +++ /dev/null @@ -1 +0,0 @@ -../.centos/cleanup.sh \ No newline at end of file diff --git a/definitions/centos-5.9/definition.rb b/definitions/centos-5.9/definition.rb deleted file mode 100644 index 7dbecf7ab..000000000 --- a/definitions/centos-5.9/definition.rb +++ /dev/null @@ -1,11 +0,0 @@ -require File.dirname(__FILE__) + "/../.centos/session.rb" - -iso = "CentOS-5.9-x86_64-bin-DVD-1of2.iso" - -session = - CENTOS_SESSION.merge({ :os_type_id => 'RedHat_64', - :iso_file => iso, - :iso_md5 => "bb795391846e76a7071893cbdf6163c3", - :iso_src => "http://mirror.stanford.edu/yum/pub/centos/5.9/isos/x86_64/#{iso}" }) - -Veewee::Session.declare session diff --git a/definitions/centos-5.9/ks.cfg b/definitions/centos-5.9/ks.cfg deleted file mode 100644 index e00fd5a2a..000000000 --- a/definitions/centos-5.9/ks.cfg +++ /dev/null @@ -1,39 +0,0 @@ -install -cdrom -lang en_US.UTF-8 -keyboard us -network --bootproto=dhcp -rootpw --iscrypted $1$damlkd,f$UC/u5pUts5QiU3ow.CSso/ -firewall --disabled -authconfig --enableshadow --passalgo=sha512 -selinux --disabled -timezone UTC -bootloader --location=mbr -text -skipx -zerombr -clearpart --all --initlabel -autopart -auth --useshadow --enablemd5 -firstboot --disabled -reboot - -%packages --ignoremissing -@Base -@Core -@Development Tools -openssl-devel -readline-devel -zlib-devel -kernel-devel - -%post -# update root certs -wget -O/etc/pki/tls/certs/ca-bundle.crt http://curl.haxx.se/ca/cacert.pem -# vagrant -groupadd vagrant -g 999 -useradd vagrant -g vagrant -G wheel -u 900 -echo "vagrant" | passwd --stdin vagrant -# sudo -echo "vagrant ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers -sed -i "s/^.*requiretty/#Defaults requiretty/" /etc/sudoers diff --git a/definitions/centos-5.9/minimize.sh b/definitions/centos-5.9/minimize.sh deleted file mode 100644 index 3846a1d65..000000000 --- a/definitions/centos-5.9/minimize.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash -eux - -dd if=/dev/zero of=/EMPTY bs=1M -rm -f /EMPTY diff --git a/definitions/centos-5.9/sshd.sh b/definitions/centos-5.9/sshd.sh deleted file mode 120000 index f353f2d00..000000000 --- a/definitions/centos-5.9/sshd.sh +++ /dev/null @@ -1 +0,0 @@ -../.common/sshd.sh \ No newline at end of file diff --git a/definitions/centos-5.9/vagrant.sh b/definitions/centos-5.9/vagrant.sh deleted file mode 100644 index 9368ef636..000000000 --- a/definitions/centos-5.9/vagrant.sh +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/bash -eux - -mkdir /tmp/vbox -VER=$(cat /home/vagrant/.vbox_version) -wget http://download.virtualbox.org/virtualbox/$VER/VBoxGuestAdditions_$VER.iso -mount -o loop VBoxGuestAdditions_$VER.iso /tmp/vbox -sh /tmp/vbox/VBoxLinuxAdditions.run -umount /tmp/vbox -rmdir /tmp/vbox -rm *.iso - -mkdir /home/vagrant/.ssh -wget --no-check-certificate \ - 'http://github.com/mitchellh/vagrant/raw/master/keys/vagrant.pub' \ - -O /home/vagrant/.ssh/authorized_keys -chown -R vagrant /home/vagrant/.ssh -chmod -R go-rwsx /home/vagrant/.ssh diff --git a/definitions/centos-6.0/cleanup.sh b/definitions/centos-6.0/cleanup.sh deleted file mode 120000 index 4658a8585..000000000 --- a/definitions/centos-6.0/cleanup.sh +++ /dev/null @@ -1 +0,0 @@ -../.centos/cleanup.sh \ No newline at end of file diff --git a/definitions/centos-6.0/definition.rb b/definitions/centos-6.0/definition.rb deleted file mode 100644 index 1325e2706..000000000 --- a/definitions/centos-6.0/definition.rb +++ /dev/null @@ -1,12 +0,0 @@ -require File.dirname(__FILE__) + "/../.centos/session.rb" - -iso = "CentOS-6.0-x86_64-bin-DVD1.iso" - -session = - CENTOS_SESSION.merge( :boot_cmd_sequence => - [ '<Tab> text ks=http://%IP%:%PORT%/ks.cfg<Enter>' ], - :iso_file => iso, - :iso_md5 => "7c148e0a1b330186adef66ee3e2d433d", - :iso_src => "http://vault.centos.org/6.0/isos/x86_64/#{iso}" ) - -Veewee::Session.declare session diff --git a/definitions/centos-6.0/ks.cfg b/definitions/centos-6.0/ks.cfg deleted file mode 120000 index 24af87031..000000000 --- a/definitions/centos-6.0/ks.cfg +++ /dev/null @@ -1 +0,0 @@ -../.centos/ks.cfg \ No newline at end of file diff --git a/definitions/centos-6.0/minimize.sh b/definitions/centos-6.0/minimize.sh deleted file mode 120000 index b3632ccbc..000000000 --- a/definitions/centos-6.0/minimize.sh +++ /dev/null @@ -1 +0,0 @@ -../.common/minimize.sh \ No newline at end of file diff --git a/definitions/centos-6.0/sshd.sh b/definitions/centos-6.0/sshd.sh deleted file mode 120000 index f353f2d00..000000000 --- a/definitions/centos-6.0/sshd.sh +++ /dev/null @@ -1 +0,0 @@ -../.common/sshd.sh \ No newline at end of file diff --git a/definitions/centos-6.0/vagrant.sh b/definitions/centos-6.0/vagrant.sh deleted file mode 120000 index 702949639..000000000 --- a/definitions/centos-6.0/vagrant.sh +++ /dev/null @@ -1 +0,0 @@ -../.common/vagrant.sh \ No newline at end of file diff --git a/definitions/centos-6.2-i386/cleanup.sh b/definitions/centos-6.2-i386/cleanup.sh deleted file mode 120000 index 4658a8585..000000000 --- a/definitions/centos-6.2-i386/cleanup.sh +++ /dev/null @@ -1 +0,0 @@ -../.centos/cleanup.sh \ No newline at end of file diff --git a/definitions/centos-6.2-i386/definition.rb b/definitions/centos-6.2-i386/definition.rb deleted file mode 100644 index f00fa7cdf..000000000 --- a/definitions/centos-6.2-i386/definition.rb +++ /dev/null @@ -1,14 +0,0 @@ -require File.dirname(__FILE__) + "/../.centos/session.rb" - -iso = "CentOS-6.2-i386-bin-DVD1.iso" - -session = - CENTOS_SESSION.merge( :boot_cmd_sequence => - [ '<Tab> text ks=http://%IP%:%PORT%/ks.cfg<Enter>' ], - :memory_size=> '480', - :os_type_id => 'Centos', - :iso_file => iso, - :iso_md5 => "8c976288ed53dc97439f7ab5854f2648", - :iso_src => "http://vault.centos.org/6.2/isos/i386/#{iso}" ) - -Veewee::Session.declare session diff --git a/definitions/centos-6.2-i386/ks.cfg b/definitions/centos-6.2-i386/ks.cfg deleted file mode 120000 index 24af87031..000000000 --- a/definitions/centos-6.2-i386/ks.cfg +++ /dev/null @@ -1 +0,0 @@ -../.centos/ks.cfg \ No newline at end of file diff --git a/definitions/centos-6.2-i386/minimize.sh b/definitions/centos-6.2-i386/minimize.sh deleted file mode 120000 index b3632ccbc..000000000 --- a/definitions/centos-6.2-i386/minimize.sh +++ /dev/null @@ -1 +0,0 @@ -../.common/minimize.sh \ No newline at end of file diff --git a/definitions/centos-6.2-i386/sshd.sh b/definitions/centos-6.2-i386/sshd.sh deleted file mode 120000 index f353f2d00..000000000 --- a/definitions/centos-6.2-i386/sshd.sh +++ /dev/null @@ -1 +0,0 @@ -../.common/sshd.sh \ No newline at end of file diff --git a/definitions/centos-6.2-i386/vagrant.sh b/definitions/centos-6.2-i386/vagrant.sh deleted file mode 120000 index 702949639..000000000 --- a/definitions/centos-6.2-i386/vagrant.sh +++ /dev/null @@ -1 +0,0 @@ -../.common/vagrant.sh \ No newline at end of file diff --git a/definitions/centos-6.2/cleanup.sh b/definitions/centos-6.2/cleanup.sh deleted file mode 120000 index 4658a8585..000000000 --- a/definitions/centos-6.2/cleanup.sh +++ /dev/null @@ -1 +0,0 @@ -../.centos/cleanup.sh \ No newline at end of file diff --git a/definitions/centos-6.2/definition.rb b/definitions/centos-6.2/definition.rb deleted file mode 100644 index 91ca9e35c..000000000 --- a/definitions/centos-6.2/definition.rb +++ /dev/null @@ -1,13 +0,0 @@ -require File.dirname(__FILE__) + "/../.centos/session.rb" - -iso = "CentOS-6.2-x86_64-bin-DVD1.iso" - -session = - CENTOS_SESSION.merge( :boot_cmd_sequence => - [ '<Tab> text ks=http://%IP%:%PORT%/ks.cfg<Enter>' ], - :memory_size=> '480', - :iso_file => iso, - :iso_md5 => "26fdf8c5a787a674f3219a3554b131ca", - :iso_src => "http://vault.centos.org/6.2/isos/x86_64/#{iso}" ) - -Veewee::Session.declare session diff --git a/definitions/centos-6.2/ks.cfg b/definitions/centos-6.2/ks.cfg deleted file mode 120000 index 24af87031..000000000 --- a/definitions/centos-6.2/ks.cfg +++ /dev/null @@ -1 +0,0 @@ -../.centos/ks.cfg \ No newline at end of file diff --git a/definitions/centos-6.2/minimize.sh b/definitions/centos-6.2/minimize.sh deleted file mode 120000 index b3632ccbc..000000000 --- a/definitions/centos-6.2/minimize.sh +++ /dev/null @@ -1 +0,0 @@ -../.common/minimize.sh \ No newline at end of file diff --git a/definitions/centos-6.2/sshd.sh b/definitions/centos-6.2/sshd.sh deleted file mode 120000 index f353f2d00..000000000 --- a/definitions/centos-6.2/sshd.sh +++ /dev/null @@ -1 +0,0 @@ -../.common/sshd.sh \ No newline at end of file diff --git a/definitions/centos-6.2/vagrant.sh b/definitions/centos-6.2/vagrant.sh deleted file mode 120000 index 702949639..000000000 --- a/definitions/centos-6.2/vagrant.sh +++ /dev/null @@ -1 +0,0 @@ -../.common/vagrant.sh \ No newline at end of file diff --git a/definitions/centos-6.3-i386/cleanup.sh b/definitions/centos-6.3-i386/cleanup.sh deleted file mode 120000 index 4658a8585..000000000 --- a/definitions/centos-6.3-i386/cleanup.sh +++ /dev/null @@ -1 +0,0 @@ -../.centos/cleanup.sh \ No newline at end of file diff --git a/definitions/centos-6.3-i386/definition.rb b/definitions/centos-6.3-i386/definition.rb deleted file mode 100644 index cd56f11df..000000000 --- a/definitions/centos-6.3-i386/definition.rb +++ /dev/null @@ -1,14 +0,0 @@ -require File.dirname(__FILE__) + "/../.centos/session.rb" - -iso = "CentOS-6.3-i386-bin-DVD1.iso" - -session = - CENTOS_SESSION.merge( :boot_cmd_sequence => - [ '<Tab> text ks=http://%IP%:%PORT%/ks.cfg<Enter>' ], - :memory_size=> '480', - :os_type_id => 'Centos', - :iso_file => iso, - :iso_md5 => "0285160d8ba3cfc720ea55e98e464eac", - :iso_src => "http://mirrors.kernel.org/centos/6.3/isos/i386/#{iso}" ) - -Veewee::Session.declare session diff --git a/definitions/centos-6.3-i386/ks.cfg b/definitions/centos-6.3-i386/ks.cfg deleted file mode 120000 index 24af87031..000000000 --- a/definitions/centos-6.3-i386/ks.cfg +++ /dev/null @@ -1 +0,0 @@ -../.centos/ks.cfg \ No newline at end of file diff --git a/definitions/centos-6.3-i386/minimize.sh b/definitions/centos-6.3-i386/minimize.sh deleted file mode 120000 index b3632ccbc..000000000 --- a/definitions/centos-6.3-i386/minimize.sh +++ /dev/null @@ -1 +0,0 @@ -../.common/minimize.sh \ No newline at end of file diff --git a/definitions/centos-6.3-i386/sshd.sh b/definitions/centos-6.3-i386/sshd.sh deleted file mode 120000 index f353f2d00..000000000 --- a/definitions/centos-6.3-i386/sshd.sh +++ /dev/null @@ -1 +0,0 @@ -../.common/sshd.sh \ No newline at end of file diff --git a/definitions/centos-6.3-i386/vagrant.sh b/definitions/centos-6.3-i386/vagrant.sh deleted file mode 120000 index 702949639..000000000 --- a/definitions/centos-6.3-i386/vagrant.sh +++ /dev/null @@ -1 +0,0 @@ -../.common/vagrant.sh \ No newline at end of file diff --git a/definitions/centos-6.3/cleanup.sh b/definitions/centos-6.3/cleanup.sh deleted file mode 120000 index 4658a8585..000000000 --- a/definitions/centos-6.3/cleanup.sh +++ /dev/null @@ -1 +0,0 @@ -../.centos/cleanup.sh \ No newline at end of file diff --git a/definitions/centos-6.3/definition.rb b/definitions/centos-6.3/definition.rb deleted file mode 100644 index 165711e87..000000000 --- a/definitions/centos-6.3/definition.rb +++ /dev/null @@ -1,13 +0,0 @@ -require File.dirname(__FILE__) + "/../.centos/session.rb" - -iso = "CentOS-6.3-x86_64-bin-DVD1.iso" - -session = - CENTOS_SESSION.merge( :boot_cmd_sequence => - [ '<Tab> text ks=http://%IP%:%PORT%/ks.cfg<Enter>' ], - :memory_size=> '480', - :iso_file => iso, - :iso_md5 => "a991defc0a602d04f064c43290df0131", - :iso_src => "http://mirrors.kernel.org/centos/6.3/isos/x86_64/#{iso}" ) - -Veewee::Session.declare session diff --git a/definitions/centos-6.3/ks.cfg b/definitions/centos-6.3/ks.cfg deleted file mode 120000 index 24af87031..000000000 --- a/definitions/centos-6.3/ks.cfg +++ /dev/null @@ -1 +0,0 @@ -../.centos/ks.cfg \ No newline at end of file diff --git a/definitions/centos-6.3/minimize.sh b/definitions/centos-6.3/minimize.sh deleted file mode 120000 index b3632ccbc..000000000 --- a/definitions/centos-6.3/minimize.sh +++ /dev/null @@ -1 +0,0 @@ -../.common/minimize.sh \ No newline at end of file diff --git a/definitions/centos-6.3/sshd.sh b/definitions/centos-6.3/sshd.sh deleted file mode 120000 index f353f2d00..000000000 --- a/definitions/centos-6.3/sshd.sh +++ /dev/null @@ -1 +0,0 @@ -../.common/sshd.sh \ No newline at end of file diff --git a/definitions/centos-6.3/vagrant.sh b/definitions/centos-6.3/vagrant.sh deleted file mode 120000 index 702949639..000000000 --- a/definitions/centos-6.3/vagrant.sh +++ /dev/null @@ -1 +0,0 @@ -../.common/vagrant.sh \ No newline at end of file diff --git a/definitions/centos-6.4-i386/cleanup.sh b/definitions/centos-6.4-i386/cleanup.sh deleted file mode 120000 index 4658a8585..000000000 --- a/definitions/centos-6.4-i386/cleanup.sh +++ /dev/null @@ -1 +0,0 @@ -../.centos/cleanup.sh \ No newline at end of file diff --git a/definitions/centos-6.4-i386/definition.rb b/definitions/centos-6.4-i386/definition.rb deleted file mode 100644 index dd6a26fb2..000000000 --- a/definitions/centos-6.4-i386/definition.rb +++ /dev/null @@ -1,14 +0,0 @@ -require File.dirname(__FILE__) + "/../.centos/session.rb" - -iso = "CentOS-6.4-i386-bin-DVD1.iso" - -session = - CENTOS_SESSION.merge( :boot_cmd_sequence => - [ '<Tab> text ks=http://%IP%:%PORT%/ks.cfg<Enter>' ], - :memory_size=> '480', - :os_type_id => 'RedHat', - :iso_file => iso, - :iso_md5 => "a6049df141579169b217cbb625da4c6d", - :iso_src => "http://mirrors.kernel.org/centos/6.4/isos/i386/#{iso}" ) - -Veewee::Session.declare session diff --git a/definitions/centos-6.4-i386/ks.cfg b/definitions/centos-6.4-i386/ks.cfg deleted file mode 120000 index 24af87031..000000000 --- a/definitions/centos-6.4-i386/ks.cfg +++ /dev/null @@ -1 +0,0 @@ -../.centos/ks.cfg \ No newline at end of file diff --git a/definitions/centos-6.4-i386/minimize.sh b/definitions/centos-6.4-i386/minimize.sh deleted file mode 120000 index b3632ccbc..000000000 --- a/definitions/centos-6.4-i386/minimize.sh +++ /dev/null @@ -1 +0,0 @@ -../.common/minimize.sh \ No newline at end of file diff --git a/definitions/centos-6.4-i386/sshd.sh b/definitions/centos-6.4-i386/sshd.sh deleted file mode 120000 index f353f2d00..000000000 --- a/definitions/centos-6.4-i386/sshd.sh +++ /dev/null @@ -1 +0,0 @@ -../.common/sshd.sh \ No newline at end of file diff --git a/definitions/centos-6.4-i386/vagrant.sh b/definitions/centos-6.4-i386/vagrant.sh deleted file mode 120000 index 702949639..000000000 --- a/definitions/centos-6.4-i386/vagrant.sh +++ /dev/null @@ -1 +0,0 @@ -../.common/vagrant.sh \ No newline at end of file diff --git a/definitions/centos-6.4/cleanup.sh b/definitions/centos-6.4/cleanup.sh deleted file mode 120000 index 4658a8585..000000000 --- a/definitions/centos-6.4/cleanup.sh +++ /dev/null @@ -1 +0,0 @@ -../.centos/cleanup.sh \ No newline at end of file diff --git a/definitions/centos-6.4/definition.rb b/definitions/centos-6.4/definition.rb deleted file mode 100644 index da83564ab..000000000 --- a/definitions/centos-6.4/definition.rb +++ /dev/null @@ -1,13 +0,0 @@ -require File.dirname(__FILE__) + "/../.centos/session.rb" - -iso = "CentOS-6.4-x86_64-bin-DVD1.iso" - -session = - CENTOS_SESSION.merge( :boot_cmd_sequence => - [ '<Tab> text ks=http://%IP%:%PORT%/ks.cfg<Enter>' ], - :memory_size=> '480', - :iso_file => iso, - :iso_md5 => "0128cfc7c86072b13ee80dd013e0e5d7", - :iso_src => "http://mirrors.kernel.org/centos/6.4/isos/x86_64/#{iso}" ) - -Veewee::Session.declare session diff --git a/definitions/centos-6.4/ks.cfg b/definitions/centos-6.4/ks.cfg deleted file mode 120000 index 24af87031..000000000 --- a/definitions/centos-6.4/ks.cfg +++ /dev/null @@ -1 +0,0 @@ -../.centos/ks.cfg \ No newline at end of file diff --git a/definitions/centos-6.4/minimize.sh b/definitions/centos-6.4/minimize.sh deleted file mode 120000 index b3632ccbc..000000000 --- a/definitions/centos-6.4/minimize.sh +++ /dev/null @@ -1 +0,0 @@ -../.common/minimize.sh \ No newline at end of file diff --git a/definitions/centos-6.4/sshd.sh b/definitions/centos-6.4/sshd.sh deleted file mode 120000 index f353f2d00..000000000 --- a/definitions/centos-6.4/sshd.sh +++ /dev/null @@ -1 +0,0 @@ -../.common/sshd.sh \ No newline at end of file diff --git a/definitions/centos-6.4/vagrant.sh b/definitions/centos-6.4/vagrant.sh deleted file mode 120000 index 702949639..000000000 --- a/definitions/centos-6.4/vagrant.sh +++ /dev/null @@ -1 +0,0 @@ -../.common/vagrant.sh \ No newline at end of file diff --git a/definitions/convert-to-packer-templates.rb b/definitions/convert-to-packer-templates.rb deleted file mode 100755 index ffe9d048b..000000000 --- a/definitions/convert-to-packer-templates.rb +++ /dev/null @@ -1,31 +0,0 @@ -require 'json' - -# Create Vanilla Image Templates -Dir.glob("*").each { |os| - unless os == "convert.rb" || os == "packer_cache" - - puts "Converting #{os}" - `veewee-to-packer ./#{os}/definition.rb -o ../templates/#{os}` - - template = JSON.parse(File.read("../templates/#{os}/template.json")) - - # Save Provisionless Template - template["post-processors"] = [ { "type" => "vagrant", "output" => "#{os}-{{.Provider}}.box"} ] - - vanilla_image = File.open("../templates/#{os}/vanilla.json", "w") - file.write(JSON.pretty_generate(template)) - file.close - - # Save Chef-Provisioned Template - template["provisioners"].each { |provisioner| - provisioner["override"].each { |provider| - template[provisioner][provider]["execute_command"] = "echo 'vagrant'|sudo -S sh '{{.Path}}'; curl https://opscode.com/chef/install.sh | sudo bash" - } - } - template["post-processors"] = [ { "type" => "vagrant", "output" => "#{os}-{{.Provider}}-with-chef.box"} ] - - chef_image = File.open("../templates/#{os}/chef.json", "w") - file.write(JSON.pretty_generate(template)) - file.close - end -} diff --git a/definitions/debian-6.0.7-i386/cleanup.sh b/definitions/debian-6.0.7-i386/cleanup.sh deleted file mode 120000 index ce0b1c87e..000000000 --- a/definitions/debian-6.0.7-i386/cleanup.sh +++ /dev/null @@ -1 +0,0 @@ -../.debian/cleanup.sh \ No newline at end of file diff --git a/definitions/debian-6.0.7-i386/definition.rb b/definitions/debian-6.0.7-i386/definition.rb deleted file mode 100644 index 54637aa0b..000000000 --- a/definitions/debian-6.0.7-i386/definition.rb +++ /dev/null @@ -1,11 +0,0 @@ -require File.dirname(__FILE__) + "/../.debian/session.rb" - -iso = "debian-6.0.7-i386-CD-1.iso" - -session = - DEBIAN_SESSION.merge( :os_type_id => 'Debian', - :iso_file => iso, - :iso_md5 => "4480eeae60213eb92e1fce15ebf2faf4", - :iso_src => "http://cdimage.debian.org/cdimage/archive/6.0.7/i386/iso-cd/#{iso}") - -Veewee::Session.declare session diff --git a/definitions/debian-6.0.7-i386/minimize.sh b/definitions/debian-6.0.7-i386/minimize.sh deleted file mode 120000 index b3632ccbc..000000000 --- a/definitions/debian-6.0.7-i386/minimize.sh +++ /dev/null @@ -1 +0,0 @@ -../.common/minimize.sh \ No newline at end of file diff --git a/definitions/debian-6.0.7-i386/networking.sh b/definitions/debian-6.0.7-i386/networking.sh deleted file mode 120000 index 614c95017..000000000 --- a/definitions/debian-6.0.7-i386/networking.sh +++ /dev/null @@ -1 +0,0 @@ -../.debian/networking.sh \ No newline at end of file diff --git a/definitions/debian-6.0.7-i386/preseed.cfg b/definitions/debian-6.0.7-i386/preseed.cfg deleted file mode 120000 index 29478e94f..000000000 --- a/definitions/debian-6.0.7-i386/preseed.cfg +++ /dev/null @@ -1 +0,0 @@ -../.debian/preseed.cfg \ No newline at end of file diff --git a/definitions/debian-6.0.7-i386/sshd.sh b/definitions/debian-6.0.7-i386/sshd.sh deleted file mode 120000 index f353f2d00..000000000 --- a/definitions/debian-6.0.7-i386/sshd.sh +++ /dev/null @@ -1 +0,0 @@ -../.common/sshd.sh \ No newline at end of file diff --git a/definitions/debian-6.0.7-i386/sudoers.sh b/definitions/debian-6.0.7-i386/sudoers.sh deleted file mode 120000 index 70234a7ff..000000000 --- a/definitions/debian-6.0.7-i386/sudoers.sh +++ /dev/null @@ -1 +0,0 @@ -../.debian/sudoers.sh \ No newline at end of file diff --git a/definitions/debian-6.0.7-i386/update.sh b/definitions/debian-6.0.7-i386/update.sh deleted file mode 120000 index bb97dfccb..000000000 --- a/definitions/debian-6.0.7-i386/update.sh +++ /dev/null @@ -1 +0,0 @@ -../.debian/update.sh \ No newline at end of file diff --git a/definitions/debian-6.0.7-i386/vagrant.sh b/definitions/debian-6.0.7-i386/vagrant.sh deleted file mode 120000 index 702949639..000000000 --- a/definitions/debian-6.0.7-i386/vagrant.sh +++ /dev/null @@ -1 +0,0 @@ -../.common/vagrant.sh \ No newline at end of file diff --git a/definitions/debian-6.0.7/cleanup.sh b/definitions/debian-6.0.7/cleanup.sh deleted file mode 120000 index ce0b1c87e..000000000 --- a/definitions/debian-6.0.7/cleanup.sh +++ /dev/null @@ -1 +0,0 @@ -../.debian/cleanup.sh \ No newline at end of file diff --git a/definitions/debian-6.0.7/definition.rb b/definitions/debian-6.0.7/definition.rb deleted file mode 100644 index 6aeb3f69b..000000000 --- a/definitions/debian-6.0.7/definition.rb +++ /dev/null @@ -1,10 +0,0 @@ -require File.dirname(__FILE__) + "/../.debian/session.rb" - -iso = "debian-6.0.7-amd64-CD-1.iso" - -session = - DEBIAN_SESSION.merge( :iso_file => iso, - :iso_md5 => "8f0e86d19bc90768da08cdafb4f9edbb", - :iso_src => "http://cdimage.debian.org/cdimage/archive/6.0.7/amd64/iso-cd/#{iso}") - -Veewee::Session.declare session diff --git a/definitions/debian-6.0.7/minimize.sh b/definitions/debian-6.0.7/minimize.sh deleted file mode 120000 index b3632ccbc..000000000 --- a/definitions/debian-6.0.7/minimize.sh +++ /dev/null @@ -1 +0,0 @@ -../.common/minimize.sh \ No newline at end of file diff --git a/definitions/debian-6.0.7/networking.sh b/definitions/debian-6.0.7/networking.sh deleted file mode 120000 index 614c95017..000000000 --- a/definitions/debian-6.0.7/networking.sh +++ /dev/null @@ -1 +0,0 @@ -../.debian/networking.sh \ No newline at end of file diff --git a/definitions/debian-6.0.7/preseed.cfg b/definitions/debian-6.0.7/preseed.cfg deleted file mode 120000 index 29478e94f..000000000 --- a/definitions/debian-6.0.7/preseed.cfg +++ /dev/null @@ -1 +0,0 @@ -../.debian/preseed.cfg \ No newline at end of file diff --git a/definitions/debian-6.0.7/sshd.sh b/definitions/debian-6.0.7/sshd.sh deleted file mode 120000 index f353f2d00..000000000 --- a/definitions/debian-6.0.7/sshd.sh +++ /dev/null @@ -1 +0,0 @@ -../.common/sshd.sh \ No newline at end of file diff --git a/definitions/debian-6.0.7/sudoers.sh b/definitions/debian-6.0.7/sudoers.sh deleted file mode 120000 index 70234a7ff..000000000 --- a/definitions/debian-6.0.7/sudoers.sh +++ /dev/null @@ -1 +0,0 @@ -../.debian/sudoers.sh \ No newline at end of file diff --git a/definitions/debian-6.0.7/update.sh b/definitions/debian-6.0.7/update.sh deleted file mode 120000 index bb97dfccb..000000000 --- a/definitions/debian-6.0.7/update.sh +++ /dev/null @@ -1 +0,0 @@ -../.debian/update.sh \ No newline at end of file diff --git a/definitions/debian-6.0.7/vagrant.sh b/definitions/debian-6.0.7/vagrant.sh deleted file mode 120000 index 702949639..000000000 --- a/definitions/debian-6.0.7/vagrant.sh +++ /dev/null @@ -1 +0,0 @@ -../.common/vagrant.sh \ No newline at end of file diff --git a/definitions/debian-7.1.0-i386/cleanup.sh b/definitions/debian-7.1.0-i386/cleanup.sh deleted file mode 120000 index ce0b1c87e..000000000 --- a/definitions/debian-7.1.0-i386/cleanup.sh +++ /dev/null @@ -1 +0,0 @@ -../.debian/cleanup.sh \ No newline at end of file diff --git a/definitions/debian-7.1.0-i386/definition.rb b/definitions/debian-7.1.0-i386/definition.rb deleted file mode 100644 index 02702cf48..000000000 --- a/definitions/debian-7.1.0-i386/definition.rb +++ /dev/null @@ -1,11 +0,0 @@ -require File.dirname(__FILE__) + "/../.debian/session.rb" - -iso = "debian-7.1.0-i386-CD-1.iso" - -session = - DEBIAN_SESSION.merge( :os_type_id => 'Debian', - :iso_file => iso, - :iso_md5 => "c29ec2db6754dadd341b9763164aca9a", - :iso_src => "http://cdimage.debian.org/debian-cd/7.1.0/i386/iso-cd/#{iso}") - -Veewee::Session.declare session diff --git a/definitions/debian-7.1.0-i386/minimize.sh b/definitions/debian-7.1.0-i386/minimize.sh deleted file mode 120000 index b3632ccbc..000000000 --- a/definitions/debian-7.1.0-i386/minimize.sh +++ /dev/null @@ -1 +0,0 @@ -../.common/minimize.sh \ No newline at end of file diff --git a/definitions/debian-7.1.0-i386/networking.sh b/definitions/debian-7.1.0-i386/networking.sh deleted file mode 120000 index 614c95017..000000000 --- a/definitions/debian-7.1.0-i386/networking.sh +++ /dev/null @@ -1 +0,0 @@ -../.debian/networking.sh \ No newline at end of file diff --git a/definitions/debian-7.1.0-i386/preseed.cfg b/definitions/debian-7.1.0-i386/preseed.cfg deleted file mode 100644 index 12257db86..000000000 --- a/definitions/debian-7.1.0-i386/preseed.cfg +++ /dev/null @@ -1,48 +0,0 @@ -choose-mirror-bin mirror/http/proxy string -d-i apt-setup/use_mirror boolean true -d-i base-installer/kernel/override-image string linux-server -d-i clock-setup/utc boolean true -d-i clock-setup/utc-auto boolean true -d-i finish-install/reboot_in_progress note -d-i grub-installer/only_debian boolean true -d-i grub-installer/with_other_os boolean true -d-i keymap select us -d-i mirror/country string manual -d-i mirror/http/directory string /debian -d-i mirror/http/hostname string mirrors.kernel.org -d-i mirror/http/proxy string -d-i partman-auto-lvm/guided_size string max -d-i partman-auto/choose_recipe select atomic -d-i partman-auto/method string lvm -d-i partman-lvm/confirm boolean true -d-i partman-lvm/confirm boolean true -d-i partman-lvm/confirm_nooverwrite boolean true -d-i partman-lvm/device_remove_lvm boolean true -d-i partman/choose_partition select finish -d-i partman/confirm boolean true -d-i partman/confirm_nooverwrite boolean true -d-i partman/confirm_write_new_label boolean true -d-i passwd/root-login boolean false -d-i passwd/root-password-again password vagrant -d-i passwd/root-password password vagrant -d-i passwd/user-fullname string vagrant -d-i passwd/user-uid string 900 -d-i passwd/user-password password vagrant -d-i passwd/user-password-again password vagrant -d-i passwd/username string vagrant -d-i pkgsel/include string openssh-server sudo bzip2 acpid cryptsetup zlib1g-dev wget curl dkms make -d-i pkgsel/install-language-support boolean false -d-i pkgsel/update-policy select unattended-upgrades -d-i pkgsel/upgrade select full-upgrade -# Prevent packaged version of VirtualBox Guest Additions being installed: -d-i preseed/early_command string sed -i \ - '/in-target/idiscover(){/sbin/discover|grep -v VirtualBox;}' \ - /usr/lib/pre-pkgsel.d/20install-hwpackages -d-i time/zone string UTC -d-i user-setup/allow-password-weak boolean true -d-i user-setup/encrypt-home boolean false -d-i preseed/late_command string sed -i '/^deb cdrom:/s/^/#/' /target/etc/apt/sources.list -apt-cdrom-setup apt-setup/cdrom/set-first boolean false -apt-mirror-setup apt-setup/use_mirror boolean true -popularity-contest popularity-contest/participate boolean false -tasksel tasksel/first multiselect standard, ubuntu-server diff --git a/definitions/debian-7.1.0-i386/sshd.sh b/definitions/debian-7.1.0-i386/sshd.sh deleted file mode 120000 index f353f2d00..000000000 --- a/definitions/debian-7.1.0-i386/sshd.sh +++ /dev/null @@ -1 +0,0 @@ -../.common/sshd.sh \ No newline at end of file diff --git a/definitions/debian-7.1.0-i386/sudoers.sh b/definitions/debian-7.1.0-i386/sudoers.sh deleted file mode 120000 index 70234a7ff..000000000 --- a/definitions/debian-7.1.0-i386/sudoers.sh +++ /dev/null @@ -1 +0,0 @@ -../.debian/sudoers.sh \ No newline at end of file diff --git a/definitions/debian-7.1.0-i386/update.sh b/definitions/debian-7.1.0-i386/update.sh deleted file mode 120000 index bb97dfccb..000000000 --- a/definitions/debian-7.1.0-i386/update.sh +++ /dev/null @@ -1 +0,0 @@ -../.debian/update.sh \ No newline at end of file diff --git a/definitions/debian-7.1.0-i386/vagrant.sh b/definitions/debian-7.1.0-i386/vagrant.sh deleted file mode 120000 index 702949639..000000000 --- a/definitions/debian-7.1.0-i386/vagrant.sh +++ /dev/null @@ -1 +0,0 @@ -../.common/vagrant.sh \ No newline at end of file diff --git a/definitions/debian-7.1.0/cleanup.sh b/definitions/debian-7.1.0/cleanup.sh deleted file mode 120000 index ce0b1c87e..000000000 --- a/definitions/debian-7.1.0/cleanup.sh +++ /dev/null @@ -1 +0,0 @@ -../.debian/cleanup.sh \ No newline at end of file diff --git a/definitions/debian-7.1.0/definition.rb b/definitions/debian-7.1.0/definition.rb deleted file mode 100644 index 97d9b0175..000000000 --- a/definitions/debian-7.1.0/definition.rb +++ /dev/null @@ -1,10 +0,0 @@ -require File.dirname(__FILE__) + "/../.debian/session.rb" - -iso = "debian-7.1.0-amd64-CD-1.iso" - -session = - DEBIAN_SESSION.merge( :iso_file => iso, - :iso_md5 => "6813af64cc9487099210afed14a080e0", - :iso_src => "http://cdimage.debian.org/debian-cd/7.1.0/amd64/iso-cd/#{iso}") - -Veewee::Session.declare session diff --git a/definitions/debian-7.1.0/minimize.sh b/definitions/debian-7.1.0/minimize.sh deleted file mode 120000 index b3632ccbc..000000000 --- a/definitions/debian-7.1.0/minimize.sh +++ /dev/null @@ -1 +0,0 @@ -../.common/minimize.sh \ No newline at end of file diff --git a/definitions/debian-7.1.0/networking.sh b/definitions/debian-7.1.0/networking.sh deleted file mode 120000 index 614c95017..000000000 --- a/definitions/debian-7.1.0/networking.sh +++ /dev/null @@ -1 +0,0 @@ -../.debian/networking.sh \ No newline at end of file diff --git a/definitions/debian-7.1.0/preseed.cfg b/definitions/debian-7.1.0/preseed.cfg deleted file mode 100644 index bffb74bfe..000000000 --- a/definitions/debian-7.1.0/preseed.cfg +++ /dev/null @@ -1,48 +0,0 @@ -choose-mirror-bin mirror/http/proxy string -d-i apt-setup/use_mirror boolean true -d-i base-installer/kernel/override-image string linux-server -d-i clock-setup/utc boolean true -d-i clock-setup/utc-auto boolean true -d-i finish-install/reboot_in_progress note -d-i grub-installer/only_debian boolean true -d-i grub-installer/with_other_os boolean true -d-i keymap select us -d-i mirror/country string manual -d-i mirror/http/directory string /debian -d-i mirror/http/hostname string mirrors.kernel.org -d-i mirror/http/proxy string -d-i partman-auto-lvm/guided_size string max -d-i partman-auto/choose_recipe select atomic -d-i partman-auto/method string lvm -d-i partman-lvm/confirm boolean true -d-i partman-lvm/confirm boolean true -d-i partman-lvm/confirm_nooverwrite boolean true -d-i partman-lvm/device_remove_lvm boolean true -d-i partman/choose_partition select finish -d-i partman/confirm boolean true -d-i partman/confirm_nooverwrite boolean true -d-i partman/confirm_write_new_label boolean true -d-i passwd/root-login boolean false -d-i passwd/root-password-again password vagrant -d-i passwd/root-password password vagrant -d-i passwd/user-fullname string vagrant -d-i passwd/user-uid string 900 -d-i passwd/user-password password vagrant -d-i passwd/user-password-again password vagrant -d-i passwd/username string vagrant -d-i pkgsel/include string openssh-server sudo bzip2 acpid cryptsetup zlib1g-dev wget curl dkms make -d-i pkgsel/install-language-support boolean false -d-i pkgsel/update-policy select unattended-upgrades -d-i pkgsel/upgrade select full-upgrade -# Prevent packaged version of VirtualBox Guest Additions being installed: -d-i preseed/early_command string sed -i \ - '/in-target/idiscover(){/sbin/discover|grep -v VirtualBox;}' \ - /usr/lib/pre-pkgsel.d/20install-hwpackages -d-i time/zone string UTC -d-i user-setup/allow-password-weak boolean true -d-i user-setup/encrypt-home boolean false -d-i preseed/late_command string sed -i '/^deb cdrom:/s/^/#/' /target/etc/apt/sources.list -apt-cdrom-setup apt-setup/cdrom/set-first boolean false -apt-mirror-setup apt-setup/use_mirror boolean true -popularity-contest popularity-contest/participate boolean false -tasksel tasksel/first multiselect standard, ubuntu-server diff --git a/definitions/debian-7.1.0/sshd.sh b/definitions/debian-7.1.0/sshd.sh deleted file mode 120000 index f353f2d00..000000000 --- a/definitions/debian-7.1.0/sshd.sh +++ /dev/null @@ -1 +0,0 @@ -../.common/sshd.sh \ No newline at end of file diff --git a/definitions/debian-7.1.0/sudoers.sh b/definitions/debian-7.1.0/sudoers.sh deleted file mode 100644 index 36862e097..000000000 --- a/definitions/debian-7.1.0/sudoers.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash -eux - -sed -i -e '/Defaults\s\+env_reset/a Defaults\tsecure_path="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"' /etc/sudoers -sed -i -e 's/%sudo\tALL=(ALL:ALL) ALL/%sudo\tALL=(ALL:ALL) NOPASSWD: ALL/' /etc/sudoers diff --git a/definitions/debian-7.1.0/update.sh b/definitions/debian-7.1.0/update.sh deleted file mode 120000 index bb97dfccb..000000000 --- a/definitions/debian-7.1.0/update.sh +++ /dev/null @@ -1 +0,0 @@ -../.debian/update.sh \ No newline at end of file diff --git a/definitions/debian-7.1.0/vagrant.sh b/definitions/debian-7.1.0/vagrant.sh deleted file mode 120000 index 702949639..000000000 --- a/definitions/debian-7.1.0/vagrant.sh +++ /dev/null @@ -1 +0,0 @@ -../.common/vagrant.sh \ No newline at end of file diff --git a/definitions/fedora-18/cleanup.sh b/definitions/fedora-18/cleanup.sh deleted file mode 120000 index 1cf83b27e..000000000 --- a/definitions/fedora-18/cleanup.sh +++ /dev/null @@ -1 +0,0 @@ -../.fedora/cleanup.sh \ No newline at end of file diff --git a/definitions/fedora-18/definition.rb b/definitions/fedora-18/definition.rb deleted file mode 100644 index cb2d82dde..000000000 --- a/definitions/fedora-18/definition.rb +++ /dev/null @@ -1,11 +0,0 @@ -require File.dirname(__FILE__) + "/../.fedora/session.rb" - -iso = "Fedora-18-x86_64-DVD.iso" - -session = - FEDORA_SESSION.merge( :iso_file => iso, - :iso_md5 => "17d5c860bf9dc83e035882a7b33ffc77", - :iso_src => "http://mirrors.kernel.org/fedora/releases/18/Fedora/x86_64/iso/#{iso}" -) - -Veewee::Session.declare session diff --git a/definitions/fedora-18/ks.cfg b/definitions/fedora-18/ks.cfg deleted file mode 120000 index 15c8071a4..000000000 --- a/definitions/fedora-18/ks.cfg +++ /dev/null @@ -1 +0,0 @@ -../.fedora/ks.cfg \ No newline at end of file diff --git a/definitions/fedora-18/minimize.sh b/definitions/fedora-18/minimize.sh deleted file mode 120000 index b3632ccbc..000000000 --- a/definitions/fedora-18/minimize.sh +++ /dev/null @@ -1 +0,0 @@ -../.common/minimize.sh \ No newline at end of file diff --git a/definitions/fedora-18/sshd.sh b/definitions/fedora-18/sshd.sh deleted file mode 120000 index f353f2d00..000000000 --- a/definitions/fedora-18/sshd.sh +++ /dev/null @@ -1 +0,0 @@ -../.common/sshd.sh \ No newline at end of file diff --git a/definitions/fedora-18/vagrant.sh b/definitions/fedora-18/vagrant.sh deleted file mode 120000 index 702949639..000000000 --- a/definitions/fedora-18/vagrant.sh +++ /dev/null @@ -1 +0,0 @@ -../.common/vagrant.sh \ No newline at end of file diff --git a/definitions/fedora-19/cleanup.sh b/definitions/fedora-19/cleanup.sh deleted file mode 120000 index 1cf83b27e..000000000 --- a/definitions/fedora-19/cleanup.sh +++ /dev/null @@ -1 +0,0 @@ -../.fedora/cleanup.sh \ No newline at end of file diff --git a/definitions/fedora-19/definition.rb b/definitions/fedora-19/definition.rb deleted file mode 100644 index b39a8b485..000000000 --- a/definitions/fedora-19/definition.rb +++ /dev/null @@ -1,11 +0,0 @@ -require File.dirname(__FILE__) + "/../.fedora/session.rb" - -iso = "Fedora-19-x86_64-DVD.iso" - -session = - FEDORA_SESSION.merge( :iso_file => iso, - :iso_md5 => "638d69c23621d5befc714bcd66b0611e", - :iso_src => "http://mirrors.kernel.org/fedora/releases/19/Fedora/x86_64/iso/#{iso}" -) - -Veewee::Session.declare session diff --git a/definitions/fedora-19/ks.cfg b/definitions/fedora-19/ks.cfg deleted file mode 120000 index 15c8071a4..000000000 --- a/definitions/fedora-19/ks.cfg +++ /dev/null @@ -1 +0,0 @@ -../.fedora/ks.cfg \ No newline at end of file diff --git a/definitions/fedora-19/minimize.sh b/definitions/fedora-19/minimize.sh deleted file mode 120000 index b3632ccbc..000000000 --- a/definitions/fedora-19/minimize.sh +++ /dev/null @@ -1 +0,0 @@ -../.common/minimize.sh \ No newline at end of file diff --git a/definitions/fedora-19/sshd.sh b/definitions/fedora-19/sshd.sh deleted file mode 120000 index f353f2d00..000000000 --- a/definitions/fedora-19/sshd.sh +++ /dev/null @@ -1 +0,0 @@ -../.common/sshd.sh \ No newline at end of file diff --git a/definitions/fedora-19/vagrant.sh b/definitions/fedora-19/vagrant.sh deleted file mode 120000 index 702949639..000000000 --- a/definitions/fedora-19/vagrant.sh +++ /dev/null @@ -1 +0,0 @@ -../.common/vagrant.sh \ No newline at end of file diff --git a/definitions/sles-11-sp2-i386/autoinst.xml b/definitions/sles-11-sp2-i386/autoinst.xml deleted file mode 100644 index 8773e8fb6..000000000 --- a/definitions/sles-11-sp2-i386/autoinst.xml +++ /dev/null @@ -1,2569 +0,0 @@ -<?xml version="1.0"?> -<!DOCTYPE profile> -<profile xmlns="http://www.suse.com/1.0/yast2ns" xmlns:config="http://www.suse.com/1.0/configns"> - <add-on> - <add_on_products config:type="list"> - <listentry> - <media_url><![CDATA[http://demeter.uni-regensburg.de/SLE11SP2-SDK-x86/DVD1/]]></media_url> - <product>sle-sdk</product> - <product_dir>/</product_dir> - </listentry> - </add_on_products> - </add-on> - <bootloader> - <device_map config:type="list"> - <device_map_entry> - <firmware>hd0</firmware> - <linux>/dev/sda</linux> - </device_map_entry> - </device_map> - <global> - <activate>true</activate> - <boot_root>true</boot_root> - <default>SUSE Linux Enterprise Server 11 SP2 - 3.0.13-0.27</default> - <generic_mbr>true</generic_mbr> - <gfxmenu>/boot/message</gfxmenu> - <lines_cache_id>2</lines_cache_id> - <timeout config:type="integer">8</timeout> - </global> - <initrd_modules config:type="list"> - <initrd_module> - <module>ahci</module> - </initrd_module> - <initrd_module> - <module>ata_piix</module> - </initrd_module> - <initrd_module> - <module>ata_generic</module> - </initrd_module> - <initrd_module> - <module>jbd</module> - </initrd_module> - <initrd_module> - <module>mbcache</module> - </initrd_module> - <initrd_module> - <module>ext3</module> - </initrd_module> - </initrd_modules> - <loader_type>grub</loader_type> - <sections config:type="list"> - <section> - <append>resume=/dev/sda1 splash=silent crashkernel=128M-:64M showopts</append> - <image>(hd0,1)/boot/vmlinuz-3.0.13-0.27-default</image> - <initial>1</initial> - <initrd>(hd0,1)/boot/initrd-3.0.13-0.27-default</initrd> - <lines_cache_id>0</lines_cache_id> - <name>SUSE Linux Enterprise Server 11 SP2 - 3.0.13-0.27</name> - <original_name>linux</original_name> - <root>/dev/sda2</root> - <type>image</type> - <vgamode>0x314</vgamode> - </section> - <section> - <append>showopts ide=nodma apm=off noresume edd=off powersaved=off nohz=off highres=off processor.max_cstate=1 nomodeset x11failsafe</append> - <image>(hd0,1)/boot/vmlinuz-3.0.13-0.27-default</image> - <initrd>(hd0,1)/boot/initrd-3.0.13-0.27-default</initrd> - <lines_cache_id>1</lines_cache_id> - <name>Failsafe -- SUSE Linux Enterprise Server 11 SP2 - 3.0.13-0.27</name> - <original_name>failsafe</original_name> - <root>/dev/sda2</root> - <type>image</type> - <vgamode>0x314</vgamode> - </section> - </sections> - </bootloader> - <ca_mgm> - <CAName>YaST_Default_CA</CAName> - <ca_commonName>YaST Default CA (vagrant-sles-11sp2-x86)</ca_commonName> - <country>US</country> - <locality></locality> - <organisation></organisation> - <organisationUnit></organisationUnit> - <password>ENTER PASSWORD HERE</password> - <server_commonName>vagrant-sles-11sp2-x86.vagrantup.com</server_commonName> - <server_email>postmaster@vagrantup.com</server_email> - <state></state> - <takeLocalServerName config:type="boolean">false</takeLocalServerName> - </ca_mgm> - <deploy_image> - <image_installation config:type="boolean">false</image_installation> - </deploy_image> - <general> - <ask-list config:type="list"/> - <mode> - <confirm config:type="boolean">false</confirm> - </mode> - <mouse> - <id>none</id> - </mouse> - <proposals config:type="list"/> - <signature-handling> - <accept_file_without_checksum config:type="boolean">true</accept_file_without_checksum> - <accept_non_trusted_gpg_key config:type="boolean">true</accept_non_trusted_gpg_key> - <accept_unknown_gpg_key config:type="boolean">true</accept_unknown_gpg_key> - <accept_unsigned_file config:type="boolean">true</accept_unsigned_file> - <accept_verification_failed config:type="boolean">false</accept_verification_failed> - <import_gpg_key config:type="boolean">true</import_gpg_key> - </signature-handling> - <storage/> - </general> - <groups config:type="list"> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>100</gid> - <group_password>x</group_password> - <groupname>users</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>19</gid> - <group_password>x</group_password> - <groupname>floppy</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>1</gid> - <group_password>x</group_password> - <groupname>bin</groupname> - <userlist>daemon</userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>41</gid> - <group_password>x</group_password> - <groupname>xok</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>65533</gid> - <group_password>x</group_password> - <groupname>nobody</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>43</gid> - <group_password>x</group_password> - <groupname>modem</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>5</gid> - <group_password>x</group_password> - <groupname>tty</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>7</gid> - <group_password>x</group_password> - <groupname>lp</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>104</gid> - <group_password>!</group_password> - <groupname>uuidd</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>51</gid> - <group_password>!</group_password> - <groupname>postfix</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>112</gid> - <group_password>!</group_password> - <groupname>gdm</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>65534</gid> - <group_password>x</group_password> - <groupname>nogroup</groupname> - <userlist>nobody</userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>101</gid> - <group_password>!</group_password> - <groupname>messagebus</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>59</gid> - <group_password>!</group_password> - <groupname>maildrop</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>33</gid> - <group_password>x</group_password> - <groupname>video</groupname> - <userlist>vagrant</userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>3</gid> - <group_password>x</group_password> - <groupname>sys</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>15</gid> - <group_password>x</group_password> - <groupname>shadow</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>20</gid> - <group_password>x</group_password> - <groupname>cdrom</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>21</gid> - <group_password>x</group_password> - <groupname>console</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>42</gid> - <group_password>x</group_password> - <groupname>trusted</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>102</gid> - <group_password>!</group_password> - <groupname>haldaemon</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>106</gid> - <group_password>!</group_password> - <groupname>puppet</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>16</gid> - <group_password>x</group_password> - <groupname>dialout</groupname> - <userlist>vagrant</userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>107</gid> - <group_password>!</group_password> - <groupname>polkituser</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>10</gid> - <group_password>x</group_password> - <groupname>wheel</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>109</gid> - <group_password>!</group_password> - <groupname>pulse</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>8</gid> - <group_password>x</group_password> - <groupname>www</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>40</gid> - <group_password>x</group_password> - <groupname>games</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>6</gid> - <group_password>x</group_password> - <groupname>disk</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>17</gid> - <group_password>x</group_password> - <groupname>audio</groupname> - <userlist>pulse</userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>111</gid> - <group_password>!</group_password> - <groupname>suse-ncc</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>49</gid> - <group_password>x</group_password> - <groupname>ftp</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>103</gid> - <group_password>!</group_password> - <groupname>tape</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>25</gid> - <group_password>!</group_password> - <groupname>at</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>9</gid> - <group_password>x</group_password> - <groupname>kmem</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>32</gid> - <group_password>x</group_password> - <groupname>public</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>12</gid> - <group_password>x</group_password> - <groupname>mail</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>0</gid> - <group_password>x</group_password> - <groupname>root</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>2</gid> - <group_password>x</group_password> - <groupname>daemon</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>105</gid> - <group_password>!</group_password> - <groupname>sfcb</groupname> - <userlist>root</userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>108</gid> - <group_password>!</group_password> - <groupname>ntp</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>14</gid> - <group_password>x</group_password> - <groupname>uucp</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>110</gid> - <group_password>!</group_password> - <groupname>pulse-access</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>71</gid> - <group_password>!</group_password> - <groupname>ntadmin</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>62</gid> - <group_password>x</group_password> - <groupname>man</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>22</gid> - <group_password>x</group_password> - <groupname>utmp</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>13</gid> - <group_password>x</group_password> - <groupname>news</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>65</gid> - <group_password>!</group_password> - <groupname>sshd</groupname> - <userlist></userlist> - </group> - </groups> - <host> - <hosts config:type="list"> - <hosts_entry> - <host_address>127.0.0.1</host_address> - <names config:type="list"> - <name>localhost</name> - </names> - </hosts_entry> - <hosts_entry> - <host_address>::1</host_address> - <names config:type="list"> - <name>localhost ipv6-localhost ipv6-loopback</name> - </names> - </hosts_entry> - <hosts_entry> - <host_address>fe00::0</host_address> - <names config:type="list"> - <name>ipv6-localnet</name> - </names> - </hosts_entry> - <hosts_entry> - <host_address>ff00::0</host_address> - <names config:type="list"> - <name>ipv6-mcastprefix</name> - </names> - </hosts_entry> - <hosts_entry> - <host_address>ff02::1</host_address> - <names config:type="list"> - <name>ipv6-allnodes</name> - </names> - </hosts_entry> - <hosts_entry> - <host_address>ff02::2</host_address> - <names config:type="list"> - <name>ipv6-allrouters</name> - </names> - </hosts_entry> - <hosts_entry> - <host_address>ff02::3</host_address> - <names config:type="list"> - <name>ipv6-allhosts</name> - </names> - </hosts_entry> - </hosts> - </host> - <login_settings/> - <networking> - <dhcp_options> - <dhclient_client_id></dhclient_client_id> - <dhclient_hostname_option>AUTO</dhclient_hostname_option> - </dhcp_options> - <dns> - <dhcp_hostname config:type="boolean">false</dhcp_hostname> - <domain>vagrantup.com</domain> - <hostname>vagrant-sles-11sp2-x86</hostname> - <resolv_conf_policy>auto</resolv_conf_policy> - <searchlist config:type="list"> - <search>vagrantup.com</search> - </searchlist> - <write_hostname config:type="boolean">true</write_hostname> - </dns> - <interfaces config:type="list"> - <interface> - <bootproto>dhcp</bootproto> - <device>eth0</device> - <name>82540EM Gigabit Ethernet Controller</name> - <startmode>auto</startmode> - <usercontrol>no</usercontrol> - </interface> - </interfaces> - <managed config:type="boolean">false</managed> - <net-udev config:type="list"> - <rule> - <name>eth0</name> - <rule>KERNELS</rule> - <value>0000:00:03.0</value> - </rule> - </net-udev> - <routing> - <ip_forward config:type="boolean">false</ip_forward> - </routing> - </networking> - <partitioning config:type="list"> - <drive> - <device>/dev/sda</device> - <initialize config:type="boolean">true</initialize> - <partitions config:type="list"> - <partition> - <create config:type="boolean">true</create> - <crypt_fs config:type="boolean">false</crypt_fs> - <filesystem config:type="symbol">swap</filesystem> - <format config:type="boolean">true</format> - <fstopt>defaults</fstopt> - <loop_fs config:type="boolean">false</loop_fs> - <mount>swap</mount> - <mountby config:type="symbol">device</mountby> - <partition_id config:type="integer">130</partition_id> - <partition_nr config:type="integer">1</partition_nr> - <raid_options/> - <resize config:type="boolean">false</resize> - <size>1561492992</size> - </partition> - <partition> - <create config:type="boolean">true</create> - <crypt_fs config:type="boolean">false</crypt_fs> - <filesystem config:type="symbol">ext3</filesystem> - <format config:type="boolean">true</format> - <fstopt>acl,user_xattr</fstopt> - <loop_fs config:type="boolean">false</loop_fs> - <mount>/</mount> - <mountby config:type="symbol">device</mountby> - <partition_id config:type="integer">131</partition_id> - <partition_nr config:type="integer">2</partition_nr> - <raid_options/> - <resize config:type="boolean">false</resize> - <size>19895844352</size> - </partition> - </partitions> - <pesize></pesize> - <type config:type="symbol">CT_DISK</type> - <use>all</use> - </drive> - </partitioning> - <report> - <errors> - <log config:type="boolean">true</log> - <show config:type="boolean">true</show> - <timeout config:type="integer">0</timeout> - </errors> - <messages> - <log config:type="boolean">true</log> - <show config:type="boolean">true</show> - <timeout config:type="integer">0</timeout> - </messages> - <warnings> - <log config:type="boolean">true</log> - <show config:type="boolean">true</show> - <timeout config:type="integer">0</timeout> - </warnings> - <yesno_messages> - <log config:type="boolean">true</log> - <show config:type="boolean">true</show> - <timeout config:type="integer">0</timeout> - </yesno_messages> - </report> - <software> - - <packages config:type="list"> - <package>desktop-translations</package> - <package>gconf2-branding-SLES</package> - <package>libproxy0-config-gnome</package> - <package>sle-sdk-release</package> - <package>sle-sdk-release-SDK</package> - <package>sles-manuals_en</package> - <package>yast2-trans-en_US</package> - </packages> - <patterns config:type="list"> - <pattern>Basis-Devel</pattern> - <pattern>Minimal</pattern> - <pattern>apparmor</pattern> - <pattern>base</pattern> - <pattern>sdk_kernel</pattern> - </patterns> - <remove-packages config:type="list"> - <package>3ddiag</package> - <package>CASA</package> - <package>CASA-devel</package> - <package>CASA_auth_token_client</package> - <package>CASA_auth_token_client-devel</package> - <package>ConsoleKit-devel</package> - <package>ConsoleKit-x11</package> - <package>DirectFB-devel</package> - <package>FastCGI</package> - <package>IlmBase</package> - <package>IlmBase-devel</package> - <package>ImageMagick</package> - <package>ImageMagick-devel</package> - <package>LibVNCServer</package> - <package>LibVNCServer-devel</package> - <package>Mesa</package> - <package>Mesa-devel</package> - <package>ModemManager</package> - <package>Modules</package> - <package>NetworkManager</package> - <package>NetworkManager-devel</package> - <package>NetworkManager-glib</package> - <package>NetworkManager-gnome</package> - <package>NetworkManager-kde4</package> - <package>NetworkManager-kde4-lang</package> - <package>NetworkManager-kde4-libs</package> - <package>OpenEXR</package> - <package>OpenEXR-devel</package> - <package>OpenIPMI-devel</package> - <package>PackageKit</package> - <package>PackageKit-devel</package> - <package>PackageKit-lang</package> - <package>PolicyKit-devel</package> - <package>PolicyKit-gnome</package> - <package>PolicyKit-gnome-devel</package> - <package>PolicyKit-gnome-libs</package> - <package>SDL-devel</package> - <package>SDL_net</package> - <package>SDL_net-devel</package> - <package>TeX-Guy</package> - <package>TeX-Guy-devel</package> - <package>VFlib3</package> - <package>VFlib3-devel</package> - <package>WindowMaker</package> - <package>WindowMaker-devel</package> - <package>a2ps</package> - <package>aalib</package> - <package>aalib-devel</package> - <package>akonadi-runtime</package> - <package>akregator</package> - <package>alsa-devel</package> - <package>alsa-firmware</package> - <package>alsa-plugins-pulse</package> - <package>alsa-tools</package> - <package>alsa-tools-devel</package> - <package>anthy</package> - <package>anthy-devel</package> - <package>antlr</package> - <package>apache2</package> - <package>apache2-devel</package> - <package>apache2-mod_perl</package> - <package>apache2-mod_perl-devel</package> - <package>apache2-prefork</package> - <package>apache2-utils</package> - <package>apache2-worker</package> - <package>apparmor-profile-editor</package> - <package>art-sharp2</package> - <package>arts</package> - <package>arts-devel</package> - <package>aspell-devel</package> - <package>at-spi</package> - <package>at-spi-devel</package> - <package>at-spi-lang</package> - <package>atk-devel</package> - <package>audiofile</package> - <package>audiofile-devel</package> - <package>audit-devel</package> - <package>augeas-lenses</package> - <package>automoc4</package> - <package>avahi</package> - <package>avahi-compat-howl-devel</package> - <package>avahi-compat-mDNSResponder-devel</package> - <package>avahi-lang</package> - <package>babl-0_0</package> - <package>banshee-1</package> - <package>banshee-1-backend-engine-gstreamer</package> - <package>banshee-1-backend-platform-gnome</package> - <package>banshee-1-backend-platform-unix</package> - <package>banshee-1-devel</package> - <package>banshee-1-extensions-default</package> - <package>banshee-1-lang</package> - <package>beagle-devel</package> - <package>bind-devel</package> - <package>binutils-devel</package> - <package>bluez</package> - <package>bluez-devel</package> - <package>boo</package> - <package>boo-devel</package> - <package>boost-devel</package> - <package>bootsplash-branding-SLED</package> - <package>cairo-devel</package> - <package>cairomm</package> - <package>cairomm-devel</package> - <package>canna</package> - <package>canna-devel</package> - <package>canna-libs</package> - <package>cannadic</package> - <package>capi4linux</package> - <package>capi4linux-devel</package> - <package>cdk</package> - <package>cdk-devel</package> - <package>cdrdao</package> - <package>chasen</package> - <package>chasen-devel</package> - <package>check</package> - <package>check-devel</package> - <package>chmlib</package> - <package>chmlib-devel</package> - <package>cim-schema</package> - <package>clucene-core</package> - <package>clucene-core-devel</package> - <package>cmake</package> - <package>compiz</package> - <package>compiz-branding-SLE</package> - <package>compiz-devel</package> - <package>compiz-gnome</package> - <package>coolkey-devel</package> - <package>cracklib-devel</package> - <package>crash-devel</package> - <package>crimson</package> - <package>cscope</package> - <package>cups</package> - <package>cups-devel</package> - <package>cvsps</package> - <package>cyrus-imapd-devel</package> - <package>cyrus-sasl-crammd5</package> - <package>cyrus-sasl-devel</package> - <package>dante</package> - <package>dante-devel</package> - <package>db1</package> - <package>db1-devel</package> - <package>db43</package> - <package>db43-devel</package> - <package>dbus-1-devel</package> - <package>dbus-1-glib-devel</package> - <package>dbus-1-python-devel</package> - <package>dbus-1-qt3</package> - <package>dbus-1-qt3-devel</package> - <package>dbus-1-x11</package> - <package>dejagnu</package> - <package>dejavu</package> - <package>desktop-data-openSUSE</package> - <package>desktop-file-utils</package> - <package>devhelp</package> - <package>devhelp-devel</package> - <package>devhelp-lang</package> - <package>device-mapper-devel</package> - <package>dhcp</package> - <package>dhcp-client</package> - <package>dhcp-devel</package> - <package>diffstat</package> - <package>dmapi-devel</package> - <package>dnsmasq</package> - <package>docbook-xsl-stylesheets</package> - <package>docbook_4</package> - <package>doxygen</package> - <package>dvd+rw-tools</package> - <package>e2fsprogs-devel</package> - <package>emacs</package> - <package>emacs-nox</package> - <package>emacs-x11</package> - <package>enchant</package> - <package>enchant-devel</package> - <package>enscript</package> - <package>eog</package> - <package>eog-devel</package> - <package>eog-lang</package> - <package>espeak</package> - <package>evince</package> - <package>evince-devel</package> - <package>evince-lang</package> - <package>evoldap2-devel</package> - <package>evolution</package> - <package>evolution-data-server</package> - <package>evolution-data-server-devel</package> - <package>evolution-data-server-lang</package> - <package>evolution-devel</package> - <package>evolution-lang</package> - <package>expect-devel</package> - <package>facter</package> - <package>fam</package> - <package>fam-devel</package> - <package>farsight</package> - <package>farsight-devel</package> - <package>festival</package> - <package>festival-devel</package> - <package>fftw</package> - <package>fftw-devel</package> - <package>fftw-mpi</package> - <package>fftw-mpi-devel</package> - <package>fftw-threads</package> - <package>fftw-threads-devel</package> - <package>fftw3</package> - <package>fftw3-devel</package> - <package>fftw3-threads</package> - <package>fftw3-threads-devel</package> - <package>file-devel</package> - <package>fileshareset</package> - <package>finch</package> - <package>finch-devel</package> - <package>flac-devel</package> - <package>fltk</package> - <package>fltk-devel</package> - <package>fontconfig-devel</package> - <package>fonts-config</package> - <package>foomatic-filters</package> - <package>freeglut</package> - <package>freeglut-devel</package> - <package>freeradius-client-devel</package> - <package>freeradius-client-libs</package> - <package>freeradius-server-devel</package> - <package>freeradius-server-libs</package> - <package>freetype</package> - <package>freetype2-devel</package> - <package>fribidi</package> - <package>fribidi-devel</package> - <package>ft2demos</package> - <package>fuse-devel</package> - <package>fwnn-devel</package> - <package>fxload</package> - <package>gcc-gij</package> - <package>gcc-java</package> - <package>gcc43-gij</package> - <package>gcc43-java</package> - <package>gconf-sharp2</package> - <package>gconf2-devel</package> - <package>gconfmm</package> - <package>gconfmm-devel</package> - <package>gd</package> - <package>gd-devel</package> - <package>gdbm-32bit</package> - <package>gdk-pixbuf</package> - <package>gdk-pixbuf-devel</package> - <package>gegl-0_0</package> - <package>gettext-tools</package> - <package>gfxboot-branding-SLED</package> - <package>gfxboot-devel</package> - <package>ggz</package> - <package>ggz-client-libs</package> - <package>ggz-client-libs-devel</package> - <package>ggz-client-libs-lang</package> - <package>ghex</package> - <package>ghex-devel</package> - <package>ghex-lang</package> - <package>ghostscript-devel</package> - <package>ghostscript-fonts-other</package> - <package>ghostscript-fonts-std</package> - <package>ghostscript-ijs-devel</package> - <package>ghostscript-library</package> - <package>ghostscript-omni</package> - <package>ghostscript-x11</package> - <package>giflib-devel</package> - <package>gimp</package> - <package>gimp-branding-SLED</package> - <package>gimp-devel</package> - <package>gimp-lang</package> - <package>gimp-plugins-python</package> - <package>git</package> - <package>git-arch</package> - <package>git-core</package> - <package>git-cvs</package> - <package>git-daemon</package> - <package>git-email</package> - <package>git-gui</package> - <package>git-svn</package> - <package>git-web</package> - <package>gitk</package> - <package>gjdoc</package> - <package>glade-sharp2</package> - <package>glade3</package> - <package>glade3-lang</package> - <package>glib</package> - <package>glib-devel</package> - <package>glib-sharp2</package> - <package>glib2-devel</package> - <package>glibmm2</package> - <package>glibmm2-devel</package> - <package>glitz</package> - <package>glitz-devel</package> - <package>gltt</package> - <package>gltt-devel</package> - <package>gmime-2_4-devel</package> - <package>gmime-devel</package> - <package>gmp-devel</package> - <package>gnet</package> - <package>gnet-devel</package> - <package>gnokii</package> - <package>gnokii-devel</package> - <package>gnokii-smsd</package> - <package>gnome-certauth-devel</package> - <package>gnome-control-center</package> - <package>gnome-control-center-devel</package> - <package>gnome-control-center-lang</package> - <package>gnome-desktop</package> - <package>gnome-desktop-devel</package> - <package>gnome-desktop-lang</package> - <package>gnome-doc-utils</package> - <package>gnome-doc-utils-devel</package> - <package>gnome-doc-utils-lang</package> - <package>gnome-keyring-devel</package> - <package>gnome-keyring-sharp</package> - <package>gnome-keyring-sharp-devel</package> - <package>gnome-libs</package> - <package>gnome-libs-devel</package> - <package>gnome-mag</package> - <package>gnome-mag-devel</package> - <package>gnome-mag-lang</package> - <package>gnome-main-menu</package> - <package>gnome-main-menu-lang</package> - <package>gnome-media</package> - <package>gnome-media-devel</package> - <package>gnome-media-lang</package> - <package>gnome-menus</package> - <package>gnome-menus-branding-SLED</package> - <package>gnome-menus-devel</package> - <package>gnome-menus-lang</package> - <package>gnome-mount</package> - <package>gnome-mount-lang</package> - <package>gnome-panel</package> - <package>gnome-panel-devel</package> - <package>gnome-panel-lang</package> - <package>gnome-pilot</package> - <package>gnome-pilot-devel</package> - <package>gnome-pilot-lang</package> - <package>gnome-settings-daemon</package> - <package>gnome-settings-daemon-devel</package> - <package>gnome-settings-daemon-lang</package> - <package>gnome-sharp2</package> - <package>gnome-speech</package> - <package>gnome-speech-devel</package> - <package>gnome-themes</package> - <package>gnome-utils</package> - <package>gnome-utils-devel</package> - <package>gnome-utils-lang</package> - <package>gnome-vfs-sharp2</package> - <package>gnome-vfs2</package> - <package>gnome-vfs2-devel</package> - <package>gnome-vfs2-lang</package> - <package>gnome-vfsmm</package> - <package>gnome-vfsmm-devel</package> - <package>gnopernicus</package> - <package>gnopernicus-devel</package> - <package>gnopernicus-lang</package> - <package>gnutls</package> - <package>goffice</package> - <package>goffice-devel</package> - <package>goffice-lang</package> - <package>goocanvas</package> - <package>goocanvas-devel</package> - <package>goocanvas-lang</package> - <package>goom2k4</package> - <package>goom2k4-devel</package> - <package>graphviz</package> - <package>graphviz-devel</package> - <package>graphviz-gd</package> - <package>graphviz-gnome</package> - <package>gstreamer-0_10</package> - <package>gstreamer-0_10-devel</package> - <package>gstreamer-0_10-lang</package> - <package>gstreamer-0_10-plugins-base</package> - <package>gstreamer-0_10-plugins-base-devel</package> - <package>gstreamer-0_10-plugins-base-lang</package> - <package>gstreamer-0_10-plugins-good</package> - <package>gstreamer-0_10-plugins-good-lang</package> - <package>gstreamer-0_10-utils</package> - <package>gstreamer-utils</package> - <package>gtk</package> - <package>gtk-devel</package> - <package>gtk-lang</package> - <package>gtk-sharp2</package> - <package>gtk-vnc-devel</package> - <package>gtk2-devel</package> - <package>gtkglext</package> - <package>gtkglext-devel</package> - <package>gtkhtml2</package> - <package>gtkhtml2-devel</package> - <package>gtkhtml2-lang</package> - <package>gtkhtml314-sharp</package> - <package>gtkmm2</package> - <package>gtkmm2-devel</package> - <package>gtksourceview-devel</package> - <package>gtksourceview-lang</package> - <package>gtksourceview18</package> - <package>gtksourceview18-devel</package> - <package>gtkspell</package> - <package>gtkspell-devel</package> - <package>gtkspell-lang</package> - <package>gucharmap</package> - <package>gucharmap-devel</package> - <package>gucharmap-lang</package> - <package>guile</package> - <package>guile-devel</package> - <package>gutenprint</package> - <package>gutenprint-devel</package> - <package>gvfs-devel</package> - <package>gxmhtml</package> - <package>hal-devel</package> - <package>hal-palm</package> - <package>htdig</package> - <package>htdig-devel</package> - <package>hunspell</package> - <package>hunspell-devel</package> - <package>hunspell-tools</package> - <package>hwinfo-devel</package> - <package>i4l-base</package> - <package>icewm</package> - <package>icewm-lite</package> - <package>id3lib</package> - <package>id3lib-devel</package> - <package>imap-devel</package> - <package>imap-lib</package> - <package>imlib</package> - <package>imlib-devel</package> - <package>imlib2</package> - <package>imlib2-devel</package> - <package>indent</package> - <package>info2html</package> - <package>inn</package> - <package>inn-devel</package> - <package>intltool</package> - <package>ipadic</package> - <package>iptables-devel</package> - <package>iso-codes</package> - <package>iso-codes-devel</package> - <package>iso_ent</package> - <package>ispell</package> - <package>ispell-american</package> - <package>ispell-brazilian</package> - <package>ispell-british</package> - <package>ispell-czech</package> - <package>ispell-danish</package> - <package>ispell-finnish</package> - <package>ispell-french</package> - <package>ispell-german</package> - <package>ispell-hungarian</package> - <package>ispell-italian</package> - <package>ispell-ngerman</package> - <package>ispell-norsk</package> - <package>ispell-polish</package> - <package>ispell-portuguese</package> - <package>ispell-russian</package> - <package>ispell-slovak</package> - <package>ispell-spanish</package> - <package>ispell-swedish</package> - <package>itcl-devel</package> - <package>java-1_4_2-ibm</package> - <package>java-1_4_2-ibm-devel</package> - <package>java-1_5_0-gcj-compat</package> - <package>java-1_5_0-gcj-compat-devel</package> - <package>java-1_6_0-ibm</package> - <package>java-1_6_0-ibm-devel</package> - <package>joe</package> - <package>jpackage-utils</package> - <package>k3b</package> - <package>k3b-devel</package> - <package>k3b-lang</package> - <package>kaddressbook</package> - <package>kalarm</package> - <package>kde-susetranslations</package> - <package>kde4-filesystem</package> - <package>kde4-kgreeter-plugins</package> - <package>kdebase3</package> - <package>kdebase3-devel</package> - <package>kdebase3-runtime</package> - <package>kdebase4-SLED</package> - <package>kdebase4-SLED-lang</package> - <package>kdebase4-runtime</package> - <package>kdebase4-runtime-branding-SLED</package> - <package>kdebase4-workspace</package> - <package>kdebase4-workspace-branding-SLED</package> - <package>kdebase4-workspace-devel</package> - <package>kdebase4-workspace-ksysguardd</package> - <package>kdelibs3</package> - <package>kdelibs3-arts</package> - <package>kdelibs3-default-style</package> - <package>kdelibs3-devel</package> - <package>kdelibs3-doc</package> - <package>kdelibs4</package> - <package>kdelibs4-branding-SLED</package> - <package>kdelibs4-core</package> - <package>kdelibs4-doc</package> - <package>kdemultimedia3-arts</package> - <package>kdepim3</package> - <package>kdepim4</package> - <package>kdepim4-devel</package> - <package>kdepimlibs4</package> - <package>kdialog</package> - <package>kdm</package> - <package>kdm-branding-SLED</package> - <package>kernel-docs</package> - <package>kernel-syms</package> - <package>kernel-trace-devel</package> - <package>kernel-xen-devel</package> - <package>keyutils-devel</package> - <package>kio_sysinfo</package> - <package>kio_sysinfo-branding-SLED</package> - <package>kmail</package> - <package>knode</package> - <package>kontact</package> - <package>korganizer</package> - <package>kpilot</package> - <package>krb5-devel</package> - <package>ksh-devel</package> - <package>ktorrent</package> - <package>ktorrent-devel</package> - <package>ktorrent-lang</package> - <package>kwin</package> - <package>ladspa-devel</package> - <package>lib3ds-1-3</package> - <package>lib3ds-devel</package> - <package>libFLAC++6</package> - <package>libFLAC8</package> - <package>libHX-devel</package> - <package>libMagick++-devel</package> - <package>libMagick++1</package> - <package>libMagickWand1</package> - <package>libQtWebKit-devel</package> - <package>libQtWebKit4</package> - <package>libXerces-c-devel</package> - <package>libXerces-c28</package> - <package>libXiterm</package> - <package>libXiterm-devel</package> - <package>libacl-devel</package> - <package>libadns-devel</package> - <package>libadns1</package> - <package>libakode</package> - <package>libakode-devel</package> - <package>libakonadi4</package> - <package>libakonadiprotocolinternals-devel</package> - <package>libakonadiprotocolinternals1</package> - <package>libao</package> - <package>libao-devel</package> - <package>libapparmor-devel</package> - <package>libapr-util1</package> - <package>libapr-util1-devel</package> - <package>libapr1</package> - <package>libapr1-devel</package> - <package>libarchive-devel</package> - <package>libart_lgpl</package> - <package>libart_lgpl-devel</package> - <package>libassuan-devel</package> - <package>libatomic-ops-devel</package> - <package>libattr-devel</package> - <package>libavahi-core5</package> - <package>libavahi-devel</package> - <package>libavahi-glib-devel</package> - <package>libavahi-gobject-devel</package> - <package>libavahi-gobject0</package> - <package>libavahi-ui0</package> - <package>libavc1394-0</package> - <package>libavc1394-devel</package> - <package>libbabl-0_0-0</package> - <package>libbeagle-devel</package> - <package>libbeagle-python</package> - <package>libbeagle1</package> - <package>libbitmask-devel</package> - <package>libbitmask1</package> - <package>libblkid-devel</package> - <package>libblocxx-devel</package> - <package>libbonobo</package> - <package>libbonobo-devel</package> - <package>libbonobo-lang</package> - <package>libbonoboui</package> - <package>libbonoboui-devel</package> - <package>libbonoboui-lang</package> - <package>libboost_date_time1_36_0</package> - <package>libboost_filesystem1_36_0</package> - <package>libboost_graph1_36_0</package> - <package>libboost_iostreams1_36_0</package> - <package>libboost_math1_36_0</package> - <package>libboost_mpi1_36_0</package> - <package>libboost_program_options1_36_0</package> - <package>libboost_python1_36_0</package> - <package>libboost_serialization1_36_0</package> - <package>libboost_signals1_36_0</package> - <package>libboost_system1_36_0</package> - <package>libboost_test1_36_0</package> - <package>libboost_thread1_36_0</package> - <package>libboost_wave1_36_0</package> - <package>libbotan-1_6_4</package> - <package>libbotan-devel</package> - <package>libbtctl</package> - <package>libbtctl-devel</package> - <package>libbtctl-lang</package> - <package>libbtctl4</package> - <package>libbz2-devel</package> - <package>libcaca</package> - <package>libcaca-devel</package> - <package>libcanberra-gtk</package> - <package>libcanberra-gtk0</package> - <package>libcanberra0</package> - <package>libcap-devel</package> - <package>libcap-ng0</package> - <package>libcdda_interface0</package> - <package>libcdda_paranoia0</package> - <package>libcddb-devel</package> - <package>libcddb2</package> - <package>libcdio++0</package> - <package>libcdio-devel</package> - <package>libcgroup-devel</package> - <package>libcgroup1</package> - <package>libchewing</package> - <package>libchewing-devel</package> - <package>libcmpiutil</package> - <package>libcmpiutil-devel</package> - <package>libcolorblind0</package> - <package>libcom_err-devel</package> - <package>libcompizconfig</package> - <package>libcompizconfig-devel</package> - <package>libcppunit-1_12-0</package> - <package>libcppunit-devel</package> - <package>libcpuset-devel</package> - <package>libcpuset1</package> - <package>libcroco</package> - <package>libcroco-0_6-3</package> - <package>libcroco-devel</package> - <package>libcryptsetup-devel</package> - <package>libcsync-devel</package> - <package>libcsync0</package> - <package>libcurl-devel</package> - <package>libdaemon-devel</package> - <package>libdaemon0</package> - <package>libdatrie-devel</package> - <package>libdatrie0</package> - <package>libdb-4_5-32bit</package> - <package>libdb-4_5-devel</package> - <package>libdbus-1-qt3-0</package> - <package>libdbus-1-qt3-0-devel</package> - <package>libdc1394-22</package> - <package>libdc1394-devel</package> - <package>libdc1394_control12</package> - <package>libdc1394_control12-devel</package> - <package>libdhcp6client-1_0-2</package> - <package>libdhcp6client-devel</package> - <package>libdigikam-devel</package> - <package>libdiscid1</package> - <package>libdjvulibre-devel</package> - <package>libdjvulibre21</package> - <package>libdmxview-devel</package> - <package>libdmxview0</package> - <package>libdnet-devel</package> - <package>libdnet1</package> - <package>libdns_sd</package> - <package>libdrm</package> - <package>libdrm-devel</package> - <package>libdv-devel</package> - <package>libdv4</package> - <package>libdvdread4</package> - <package>libdw-devel</package> - <package>libebl-devel</package> - <package>libedit-devel</package> - <package>libedit0</package> - <package>libelf-devel</package> - <package>libenchant1</package> - <package>libesd-devel</package> - <package>libesd0</package> - <package>libesmtp-devel</package> - <package>libevoldap-2_4-2</package> - <package>libevtlog-devel</package> - <package>libevtlog0</package> - <package>libexempi-devel</package> - <package>libexempi3</package> - <package>libexif-devel</package> - <package>libexiv2-4</package> - <package>libexiv2-devel</package> - <package>libexpat-devel</package> - <package>libext2fs-devel</package> - <package>libfarsight-0_1-3</package> - <package>libffi-devel</package> - <package>libffi43</package> - <package>libffi43-devel</package> - <package>libflaim-devel</package> - <package>libfprint-devel</package> - <package>libfreebl3</package> - <package>libfreebob</package> - <package>libfreebob-devel</package> - <package>libgadu</package> - <package>libgadu-devel</package> - <package>libgail-gnome</package> - <package>libgail-gnome-devel</package> - <package>libgcj-devel</package> - <package>libgcj43</package> - <package>libgcj43-devel</package> - <package>libgcj43-jar</package> - <package>libgcj_bc43</package> - <package>libgcrypt-devel</package> - <package>libgda-3_0-3</package> - <package>libgda-3_0-devel</package> - <package>libgdiplus0</package> - <package>libgegl-0_0-0</package> - <package>libgeoclue0</package> - <package>libgfortran46</package> - <package>libggz2</package> - <package>libggz2-devel</package> - <package>libgimpprint</package> - <package>libgimpprint-devel</package> - <package>libglade2</package> - <package>libglade2-devel</package> - <package>libglademm</package> - <package>libglademm-2_4-1</package> - <package>libglademm-devel</package> - <package>libgladeui-1-9</package> - <package>libgladeui-1_0-devel</package> - <package>libgmime-2_0-3</package> - <package>libgmime-2_4-2</package> - <package>libgmm++-devel</package> - <package>libgnome</package> - <package>libgnome-certauth0</package> - <package>libgnome-desktop-2-11</package> - <package>libgnome-devel</package> - <package>libgnome-lang</package> - <package>libgnome-menu2</package> - <package>libgnome-window-settings1</package> - <package>libgnomecanvas</package> - <package>libgnomecanvas-devel</package> - <package>libgnomecanvas-lang</package> - <package>libgnomecanvasmm</package> - <package>libgnomecanvasmm-devel</package> - <package>libgnomecups</package> - <package>libgnomecups-devel</package> - <package>libgnomecups-lang</package> - <package>libgnomedb</package> - <package>libgnomedb-devel</package> - <package>libgnomedb-lang</package> - <package>libgnomekbd</package> - <package>libgnomekbd-devel</package> - <package>libgnomekbd-lang</package> - <package>libgnomeprint</package> - <package>libgnomeprint-devel</package> - <package>libgnomeprint-lang</package> - <package>libgnomeprintui</package> - <package>libgnomeprintui-devel</package> - <package>libgnomeprintui-lang</package> - <package>libgnomesu</package> - <package>libgnomesu-devel</package> - <package>libgnomesu-lang</package> - <package>libgnomesu0</package> - <package>libgnomeui</package> - <package>libgnomeui-devel</package> - <package>libgnomeui-lang</package> - <package>libgnomevfsmm-2_6-1</package> - <package>libgnutls-devel</package> - <package>libgnutls-extra-devel</package> - <package>libgnutls-extra26</package> - <package>libgoocanvas3</package> - <package>libgpg-error-devel</package> - <package>libgpgme-devel</package> - <package>libgphoto2-devel</package> - <package>libgpod-devel</package> - <package>libgsf</package> - <package>libgsf-1-114</package> - <package>libgsf-devel</package> - <package>libgsf-gnome</package> - <package>libgsm-devel</package> - <package>libgsm1</package> - <package>libgssglue-devel</package> - <package>libgstapp-0_10-0</package> - <package>libgstinterfaces-0_10-0</package> - <package>libgstreamer-0_10-0</package> - <package>libgtk-vnc-1_0-0</package> - <package>libgtkhtml</package> - <package>libgtkhtml-devel</package> - <package>libgtksourceview-2_0-0</package> - <package>libgtop</package> - <package>libgtop-2_0-7</package> - <package>libgtop-devel</package> - <package>libgtop-lang</package> - <package>libgudev-1_0-0</package> - <package>libgweather</package> - <package>libgweather-devel</package> - <package>libgweather-lang</package> - <package>libgweather1</package> - <package>libhangul</package> - <package>libhangul-devel</package> - <package>libhowl0</package> - <package>libical-devel</package> - <package>libical0</package> - <package>libicu-devel</package> - <package>libid3tag</package> - <package>libid3tag-devel</package> - <package>libidl-devel</package> - <package>libidn-devel</package> - <package>libiec61883</package> - <package>libiec61883-devel</package> - <package>libieee1284</package> - <package>libiniparser-devel</package> - <package>libiniparser0</package> - <package>libiptcdata</package> - <package>libiptcdata-devel</package> - <package>libiptcdata0</package> - <package>libiso9660-5</package> - <package>libiterm</package> - <package>libiterm-devel</package> - <package>libjack-devel</package> - <package>libjack0</package> - <package>libjasper</package> - <package>libjasper-devel</package> - <package>libjingle-0_3-0</package> - <package>libjingle-devel</package> - <package>libjpeg-devel</package> - <package>libkcal</package> - <package>libkcal-devel</package> - <package>libkcal2</package> - <package>libkcddb4</package> - <package>libkcddb4-devel</package> - <package>libkcompactdisc4</package> - <package>libkcompactdisc4-devel</package> - <package>libkdcraw3</package> - <package>libkdcraw3-devel</package> - <package>libkdcraw3-lang</package> - <package>libkde4</package> - <package>libkde4-devel</package> - <package>libkdecore4</package> - <package>libkdecore4-devel</package> - <package>libkdepim4</package> - <package>libkdepim4-devel</package> - <package>libkdepimlibs4</package> - <package>libkdepimlibs4-devel</package> - <package>libkexiv2-3</package> - <package>libkexiv2-3-devel</package> - <package>libkexiv2-7</package> - <package>libkipi-devel</package> - <package>libkipi6</package> - <package>libkmime-devel</package> - <package>libkmime2</package> - <package>libknotificationitem-1-1</package> - <package>libkonq-devel</package> - <package>libkonq5</package> - <package>libksba-devel</package> - <package>libktnef-devel</package> - <package>libktnef1</package> - <package>liblazy-devel</package> - <package>liblazy1</package> - <package>liblcms-devel</package> - <package>libldapcpp-devel</package> - <package>liblog4c-devel</package> - <package>liblog4c3</package> - <package>libloudmouth-1-0</package> - <package>liblpsolve55</package> - <package>liblua5_1</package> - <package>libmalaga-devel</package> - <package>libmalaga7</package> - <package>libmcrypt</package> - <package>libmcrypt-devel</package> - <package>libmikmod</package> - <package>libmikmod-devel</package> - <package>libmm-devel</package> - <package>libmm14</package> - <package>libmng-devel</package> - <package>libmpcdec-devel</package> - <package>libmpcdec5</package> - <package>libmspack-devel</package> - <package>libmtp-devel</package> - <package>libmtp8</package> - <package>libmusicbrainz-devel</package> - <package>libmusicbrainz3-6</package> - <package>libmusicbrainz3-devel</package> - <package>libmusicbrainz4</package> - <package>libmysqlclient-devel</package> - <package>libmysqlclient15</package> - <package>libmysqlclient_r15</package> - <package>libneon-devel</package> - <package>libneon27</package> - <package>libnetapi-devel</package> - <package>libnetapi0</package> - <package>libnetcontrol0</package> - <package>libnetpbm-devel</package> - <package>libnetpbm10</package> - <package>libnewt0_52</package> - <package>libnjb</package> - <package>libnjb-devel</package> - <package>libnjb5</package> - <package>libnl-devel</package> - <package>libnotify</package> - <package>libnotify-devel</package> - <package>libnotify1</package> - <package>libnscd-devel</package> - <package>libnsssharedhelper0</package> - <package>libnuma-devel</package> - <package>libofa-devel</package> - <package>libofa0</package> - <package>libogg-devel</package> - <package>libogg0</package> - <package>liboil</package> - <package>liboil-devel</package> - <package>libopenbabel-devel</package> - <package>libopenbabel3</package> - <package>libopencdk-devel</package> - <package>libopencdk10</package> - <package>libopenraw-devel</package> - <package>libopenraw1</package> - <package>libopenssl-devel</package> - <package>libopensync</package> - <package>libopensync-devel</package> - <package>libopensync-plugin-evolution2</package> - <package>libopensync-plugin-evolution2-devel</package> - <package>libopensync-plugin-palm</package> - <package>libopensync-plugin-palm-devel</package> - <package>liborc-0_4-0</package> - <package>libosip2</package> - <package>libosip2-devel</package> - <package>libotf</package> - <package>libotf-devel</package> - <package>libotr-devel</package> - <package>libotr2</package> - <package>libp11-1</package> - <package>libp11-devel</package> - <package>libpackagekit-glib10</package> - <package>libpackagekit-glib10-devel</package> - <package>libpangomm-1_4-1</package> - <package>libpcap-devel</package> - <package>libpciaccess0</package> - <package>libpciaccess0-devel</package> - <package>libphonon4</package> - <package>libpisock-devel</package> - <package>libpisock9</package> - <package>libpisync-devel</package> - <package>libpisync1</package> - <package>libpixman-1-0-devel</package> - <package>libpkcs11-helper1</package> - <package>libpng-devel</package> - <package>libpolkit-qt0</package> - <package>libpoppler-devel</package> - <package>libpoppler-glib-devel</package> - <package>libpoppler-glib4</package> - <package>libpoppler-qt2</package> - <package>libpoppler-qt3-devel</package> - <package>libpoppler-qt4-3</package> - <package>libpoppler-qt4-devel</package> - <package>libpoppler5</package> - <package>libpst4</package> - <package>libpt2</package> - <package>libpt2-devel</package> - <package>libpulse-browse0</package> - <package>libpulse-devel</package> - <package>libpulse-mainloop-glib0</package> - <package>libpulse0</package> - <package>libpurple</package> - <package>libpurple-devel</package> - <package>libpurple-lang</package> - <package>libqca2</package> - <package>libqca2-devel</package> - <package>libqdialogsolver1</package> - <package>libqdialogsolver1-devel</package> - <package>libqimageblitz-devel</package> - <package>libqimageblitz4</package> - <package>libqscintilla-devel</package> - <package>libqscintilla2-5</package> - <package>libqt4</package> - <package>libqt4-devel</package> - <package>libqt4-qt3support</package> - <package>libqt4-sql</package> - <package>libqt4-sql-mysql</package> - <package>libqt4-sql-postgresql</package> - <package>libqt4-sql-sqlite</package> - <package>libqt4-sql-unixODBC</package> - <package>libqt4-x11</package> - <package>libqtpod-devel</package> - <package>libqtpod0</package> - <package>libquadmath46</package> - <package>libquicktime</package> - <package>libquicktime-devel</package> - <package>libraptor-devel</package> - <package>libraptor1</package> - <package>librasqal-devel</package> - <package>librasqal1</package> - <package>libraw1394-11</package> - <package>libraw1394-8</package> - <package>libraw1394-devel</package> - <package>libredland-devel</package> - <package>libredland0</package> - <package>libreiserfs-devel</package> - <package>libreoffice</package> - <package>libreoffice-base</package> - <package>libreoffice-branding-SLED</package> - <package>libreoffice-branding-upstream</package> - <package>libreoffice-calc</package> - <package>libreoffice-icon-themes</package> - <package>libreoffice-impress</package> - <package>libreoffice-sdk</package> - <package>libreoffice-writer</package> - <package>librsvg</package> - <package>librsvg-devel</package> - <package>libsamplerate</package> - <package>libsamplerate-devel</package> - <package>libsatsolver-devel</package> - <package>libsblim-cmpiutil1</package> - <package>libselinux-devel</package> - <package>libsemanage-devel</package> - <package>libsemanage1</package> - <package>libsensors3-devel</package> - <package>libsensors4</package> - <package>libsepol-devel</package> - <package>libsexy</package> - <package>libsexy-devel</package> - <package>libshout-devel</package> - <package>libshout3</package> - <package>libsidplay1</package> - <package>libsidplay1-devel</package> - <package>libsigc++2</package> - <package>libsigc++2-devel</package> - <package>libslab-lang</package> - <package>libslab0</package> - <package>libsmbclient-devel</package> - <package>libsmbios-devel</package> - <package>libsmbsharemodes-devel</package> - <package>libsmbsharemodes0</package> - <package>libsndfile</package> - <package>libsndfile-devel</package> - <package>libsoprano-devel</package> - <package>libsoprano4</package> - <package>libsoup-devel</package> - <package>libspectre-devel</package> - <package>libspectre1</package> - <package>libspeex</package> - <package>libssh2-devel</package> - <package>libstrigi0</package> - <package>libstroke</package> - <package>libstroke-devel</package> - <package>libsyncml-devel</package> - <package>libsyncml0</package> - <package>libtalloc-devel</package> - <package>libtasn1-devel</package> - <package>libtdb-devel</package> - <package>libtelepathy</package> - <package>libtelepathy-devel</package> - <package>libtelepathy-glib0</package> - <package>libtheora-devel</package> - <package>libtheora0</package> - <package>libtidy</package> - <package>libtidy-devel</package> - <package>libtiff-devel</package> - <package>libtirpc-devel</package> - <package>libtomoe-gtk0</package> - <package>libtspi1</package> - <package>libtunepimp</package> - <package>libtunepimp-devel</package> - <package>libtunepimp5</package> - <package>libudev-devel</package> - <package>libudf0</package> - <package>libunique-1_0-0</package> - <package>libunwind</package> - <package>libunwind-devel</package> - <package>libupsclient1</package> - <package>libusb-devel</package> - <package>libusbpp-0_1-4</package> - <package>libustr-1_0-1</package> - <package>libustr-devel</package> - <package>libuuid-devel</package> - <package>libvirt-client</package> - <package>libvirt-devel</package> - <package>libvisual</package> - <package>libvisual-devel</package> - <package>libvoikko-devel</package> - <package>libvoikko1</package> - <package>libvorbis</package> - <package>libvorbis-devel</package> - <package>libwavpack1</package> - <package>libwbclient-devel</package> - <package>libwbxml2-0</package> - <package>libwbxml2-devel</package> - <package>libwebkit-1_0-1</package> - <package>libwebkit-1_0-2</package> - <package>libwebkit-devel</package> - <package>libwebkit-lang</package> - <package>libwmf</package> - <package>libwmf-devel</package> - <package>libwmf-gnome</package> - <package>libwnck</package> - <package>libwnck-1-22</package> - <package>libwnck-devel</package> - <package>libwnck-lang</package> - <package>libwpd-0_8-8</package> - <package>libwpd-devel</package> - <package>libwpg-0_1-1</package> - <package>libwpg-devel</package> - <package>libwps-0_1-1</package> - <package>libwps-devel</package> - <package>libwsman-devel</package> - <package>libwsman1</package> - <package>libxcrypt-devel</package> - <package>libxine-devel</package> - <package>libxine1</package> - <package>libxklavier-devel</package> - <package>libxklavier15</package> - <package>libxml2-devel</package> - <package>libxslt-devel</package> - <package>libyajl1</package> - <package>libzio-devel</package> - <package>libzip-devel</package> - <package>libzip1</package> - <package>libzvbi0</package> - <package>libzypp-devel</package> - <package>limal-apparmor-notifications</package> - <package>limal-apparmor-notifications-devel</package> - <package>limal-ca-mgm-devel</package> - <package>limal-devel</package> - <package>limal-devtools</package> - <package>limal-nfs-server-devel</package> - <package>linux-atm-devel</package> - <package>linux-atm-lib</package> - <package>lksctp-tools</package> - <package>lksctp-tools-devel</package> - <package>loudmouth-devel</package> - <package>lua</package> - <package>lua-devel</package> - <package>lzo-devel</package> - <package>m17n-db</package> - <package>m17n-lib</package> - <package>m17n-lib-devel</package> - <package>malaga-suomi</package> - <package>meanwhile</package> - <package>meanwhile-devel</package> - <package>metacity</package> - <package>metacity-devel</package> - <package>metacity-lang</package> - <package>mhash</package> - <package>mhash-devel</package> - <package>misc-console-font</package> - <package>mono-addins</package> - <package>mono-basic</package> - <package>mono-core</package> - <package>mono-data</package> - <package>mono-data-oracle</package> - <package>mono-data-sqlite</package> - <package>mono-devel</package> - <package>mono-extras</package> - <package>mono-jscript</package> - <package>mono-tools</package> - <package>mono-wcf</package> - <package>mono-web</package> - <package>mono-winforms</package> - <package>mono-zeroconf</package> - <package>mono-zeroconf-provider-avahi</package> - <package>monodevelop</package> - <package>monodoc-core</package> - <package>mozilla-nspr</package> - <package>mozilla-nspr-devel</package> - <package>mozilla-nss</package> - <package>mozilla-nss-devel</package> - <package>mozilla-xulrunner192</package> - <package>mozilla-xulrunner192-gnome</package> - <package>mpfr-devel</package> - <package>mpi-selector</package> - <package>mpich</package> - <package>mpich-devel</package> - <package>mysql</package> - <package>mysql-client</package> - <package>nagios</package> - <package>nagios-devel</package> - <package>nagios-www</package> - <package>nant</package> - <package>nautilus</package> - <package>nautilus-cd-burner</package> - <package>nautilus-cd-burner-devel</package> - <package>nautilus-cd-burner-lang</package> - <package>nautilus-devel</package> - <package>nautilus-lang</package> - <package>ndesk-dbus</package> - <package>ndesk-dbus-glib</package> - <package>ndesk-dbus-glib-devel</package> - <package>net-snmp</package> - <package>net-snmp-devel</package> - <package>netatalk</package> - <package>netatalk-devel</package> - <package>netcat-openbsd</package> - <package>newt</package> - <package>newt-devel</package> - <package>newt-static</package> - <package>nfsidmap-devel</package> - <package>notification-daemon</package> - <package>notification-daemon-lang</package> - <package>notify-sharp</package> - <package>nss-mdns</package> - <package>nss-shared-helper-devel</package> - <package>nut</package> - <package>nut-classic</package> - <package>nut-devel</package> - <package>opal</package> - <package>opal-devel</package> - <package>openCryptoki</package> - <package>openCryptoki-64bit</package> - <package>openCryptoki-devel</package> - <package>openct-devel</package> - <package>openhpi</package> - <package>openhpi-daemon</package> - <package>openhpi-devel</package> - <package>openjade</package> - <package>openjade-devel</package> - <package>openldap2-devel</package> - <package>openmotif-devel</package> - <package>openmotif-libs</package> - <package>openmpi</package> - <package>openobex-devel</package> - <package>openobex-glib-devel</package> - <package>opensc-devel</package> - <package>openslp-devel</package> - <package>opensp</package> - <package>opensp-devel</package> - <package>openwsman-client</package> - <package>openwsman-server</package> - <package>orbit</package> - <package>orbit-devel</package> - <package>orbit2-devel</package> - <package>oxygen-icon-theme</package> - <package>oxygen-icon-theme-scalable</package> - <package>ozerocdoff</package> - <package>pam-devel</package> - <package>pango-devel</package> - <package>pangomm-devel</package> - <package>parted-devel</package> - <package>patchutils</package> - <package>pciutils-devel</package> - <package>pcre-devel</package> - <package>pcsc-acr38</package> - <package>pcsc-acr38-devel</package> - <package>pcsc-lite-devel</package> - <package>perl-32bit</package> - <package>perl-Crypt-OpenSSL-RSA</package> - <package>perl-Mail-DKIM</package> - <package>perl-MailTools</package> - <package>perl-Net-DNS</package> - <package>perl-Net-IP</package> - <package>perl-NetAddr-IP</package> - <package>perl-SNMP</package> - <package>perl-Tie-IxHash</package> - <package>perl-Tk</package> - <package>perl-Tk-devel</package> - <package>perl-spamassassin</package> - <package>phonon</package> - <package>phonon-backend-gstreamer-0_10</package> - <package>phonon-devel</package> - <package>php5</package> - <package>php5-ctype</package> - <package>php5-devel</package> - <package>php5-dom</package> - <package>php5-hash</package> - <package>php5-iconv</package> - <package>php5-json</package> - <package>php5-pdo</package> - <package>php5-sqlite</package> - <package>php5-suhosin</package> - <package>php5-tokenizer</package> - <package>php5-xmlreader</package> - <package>php5-xmlwriter</package> - <package>php53</package> - <package>php53-ctype</package> - <package>php53-dom</package> - <package>php53-iconv</package> - <package>php53-json</package> - <package>php53-tokenizer</package> - <package>php53-xmlreader</package> - <package>php53-xmlwriter</package> - <package>pidgin</package> - <package>pidgin-devel</package> - <package>pilot-link</package> - <package>pkcs11-helper</package> - <package>pkcs11-helper-devel</package> - <package>planner</package> - <package>planner-devel</package> - <package>planner-lang</package> - <package>plasma-addons</package> - <package>plasma-theme-aya</package> - <package>plasmoid-networkmanagement</package> - <package>plasmoid-quickaccess</package> - <package>plotutils</package> - <package>poppler-data</package> - <package>poppler-tools</package> - <package>popt-devel</package> - <package>portmap</package> - <package>postfix-devel</package> - <package>postgresql-devel</package> - <package>postgresql-libs</package> - <package>ppp-devel</package> - <package>ppp-userpass</package> - <package>pstoedit</package> - <package>pstoedit-devel</package> - <package>pulseaudio</package> - <package>pulseaudio-esound-compat</package> - <package>pulseaudio-lang</package> - <package>puppet</package> - <package>python-cairo</package> - <package>python-cairo-devel</package> - <package>python-devel</package> - <package>python-gnome</package> - <package>python-gnome-devel</package> - <package>python-gobject2</package> - <package>python-gobject2-devel</package> - <package>python-gtk</package> - <package>python-gtk-devel</package> - <package>python-gtkglext</package> - <package>python-gtkglext-devel</package> - <package>python-gtksourceview</package> - <package>python-gtksourceview-devel</package> - <package>python-numeric</package> - <package>python-numpy</package> - <package>python-orbit</package> - <package>python-orbit-devel</package> - <package>pyxml</package> - <package>qt3</package> - <package>qt3-devel</package> - <package>quagga</package> - <package>quagga-devel</package> - <package>quilt</package> - <package>raptor</package> - <package>rarian</package> - <package>rarian-devel</package> - <package>re2c</package> - <package>readline-devel</package> - <package>recode-devel</package> - <package>rpm-devel</package> - <package>rrdtool</package> - <package>rrdtool-devel</package> - <package>rsyslog</package> - <package>ruby</package> - <package>rubygems</package> - <package>ruby-devel</package> - <package>ruby-doc-html</package> - <package>ruby-doc-ri</package> - <package>ruby-examples</package> - <package>ruby-fcgi</package> - <package>ruby-mysql</package> - <package>ruby-selinux</package> - <package>ruby-test-suite</package> - <package>ruby-tk</package> - <package>sablot</package> - <package>sablot-devel</package> - <package>samba-devel</package> - <package>sane-backends</package> - <package>sane-frontends</package> - <package>sax2-libsax</package> - <package>sax2-libsax-devel</package> - <package>sax2-libsax-perl</package> - <package>sax2-tools</package> - <package>sblim-cmpi-base</package> - <package>sblim-cmpi-base-devel</package> - <package>sblim-cmpi-devel</package> - <package>sblim-cmpiutil-devel</package> - <package>sblim-indication_helper</package> - <package>sblim-sfcb</package> - <package>sblim-sfcc</package> - <package>sblim-sfcc-devel</package> - <package>scim</package> - <package>scim-devel</package> - <package>scpm-devel</package> - <package>scrollkeeper</package> - <package>scrollkeeper-lang</package> - <package>seahorse</package> - <package>seahorse-devel</package> - <package>seahorse-lang</package> - <package>sendmail</package> - <package>sendmail-devel</package> - <package>sg3_utils-devel</package> - <package>sgml-skel</package> - <package>shared-mime-info</package> - <package>silc-toolkit</package> - <package>silc-toolkit-devel</package> - <package>slang</package> - <package>slang-devel</package> - <package>soprano</package> - <package>soprano-backend-redland</package> - <package>spamassassin</package> - <package>speex-devel</package> - <package>splashy-devel</package> - <package>sqlite2</package> - <package>sqlite3-devel</package> - <package>startup-notification</package> - <package>startup-notification-devel</package> - <package>strigi</package> - <package>strigi-devel</package> - <package>subversion</package> - <package>subversion-perl</package> - <package>susehelp</package> - <package>susehelp_cz</package> - <package>susehelp_de</package> - <package>susehelp_en</package> - <package>susehelp_es</package> - <package>susehelp_fr</package> - <package>susehelp_hu</package> - <package>susehelp_it</package> - <package>swig</package> - <package>syslogd</package> - <package>t1lib</package> - <package>t1lib-devel</package> - <package>taglib</package> - <package>taglib-devel</package> - <package>taglib-sharp</package> - <package>tango-icon-theme</package> - <package>tcl-devel</package> - <package>tcpd-devel</package> - <package>telepathy-glib-devel</package> - <package>telepathy-mission-control</package> - <package>telepathy-mission-control-devel</package> - <package>texlive-bin-devel</package> - <package>texlive-devel</package> - <package>tk-devel</package> - <package>tla</package> - <package>tn5250</package> - <package>tn5250-devel</package> - <package>tomoe</package> - <package>tomoe-devel</package> - <package>tomoe-gtk</package> - <package>tomoe-gtk-devel</package> - <package>tomoe-gtk-lang</package> - <package>totem-pl-parser</package> - <package>totem-pl-parser-devel</package> - <package>totem-pl-parser-lang</package> - <package>trousers</package> - <package>trousers-devel</package> - <package>tsclient</package> - <package>tsclient-devel</package> - <package>tsclient-lang</package> - <package>uim</package> - <package>uim-devel</package> - <package>unixODBC</package> - <package>unixODBC-devel</package> - <package>unsermake</package> - <package>update-desktop-files</package> - <package>usb_modeswitch</package> - <package>usb_modeswitch-data</package> - <package>valgrind</package> - <package>valgrind-devel</package> - <package>vte</package> - <package>vte-devel</package> - <package>vte-lang</package> - <package>wdiff</package> - <package>webkit-sharp</package> - <package>wireshark</package> - <package>wireshark-devel</package> - <package>wodim-devel</package> - <package>wordcut</package> - <package>wordcut-devel</package> - <package>words</package> - <package>wpa_supplicant</package> - <package>wvstreams</package> - <package>wvstreams-devel</package> - <package>wxGTK-compat</package> - <package>wxGTK-devel</package> - <package>wxGTK-gl</package> - <package>x11-input-wacom</package> - <package>x11-input-wacom-devel</package> - <package>x11-input-wacom-tools</package> - <package>xalan-j2</package> - <package>xaw3d-devel</package> - <package>xbase</package> - <package>xbase-devel</package> - <package>xdelta</package> - <package>xdelta-devel</package> - <package>xdg-menu</package> - <package>xen-devel</package> - <package>xen-libs</package> - <package>xerces-j2</package> - <package>xerces-j2-bootstrap</package> - <package>xerces-j2-xml-apis</package> - <package>xfsprogs-devel</package> - <package>xml-commons-apis-bootstrap</package> - <package>xml-commons-resolver-bootstrap</package> - <package>xml-commons-which-bootstrap</package> - <package>xmlcharent</package> - <package>xorg-x11</package> - <package>xorg-x11-devel</package> - <package>xorg-x11-fonts</package> - <package>xorg-x11-fonts-core</package> - <package>xorg-x11-fonts-devel</package> - <package>xorg-x11-libICE-devel</package> - <package>xorg-x11-libSM-devel</package> - <package>xorg-x11-libX11-devel</package> - <package>xorg-x11-libXau-devel</package> - <package>xorg-x11-libXdmcp-devel</package> - <package>xorg-x11-libXext-devel</package> - <package>xorg-x11-libXfixes-devel</package> - <package>xorg-x11-libXmu-devel</package> - <package>xorg-x11-libXp-devel</package> - <package>xorg-x11-libXpm-devel</package> - <package>xorg-x11-libXprintUtil-devel</package> - <package>xorg-x11-libXrender-devel</package> - <package>xorg-x11-libXt-devel</package> - <package>xorg-x11-libXv-devel</package> - <package>xorg-x11-libfontenc-devel</package> - <package>xorg-x11-libxcb-devel</package> - <package>xorg-x11-libxkbfile-devel</package> - <package>xorg-x11-proto-devel</package> - <package>xorg-x11-server</package> - <package>xorg-x11-util-devel</package> - <package>xorg-x11-xauth</package> - <package>xorg-x11-xtrans-devel</package> - <package>xosd</package> - <package>xosd-devel</package> - <package>xsp</package> - <package>xterm</package> - <package>xz-devel</package> - <package>yast2-core-devel</package> - <package>yast2-devtools</package> - <package>yast2-gtk</package> - <package>yast2-libyui-devel</package> - <package>yast2-ncurses-devel</package> - <package>yast2-qt</package> - <package>yast2-qt-devel</package> - <package>yast2-qt-pkg</package> - <package>yast2-storage-devel</package> - <package>yast2-ycp-ui-bindings-devel</package> - <package>yelp</package> - <package>yelp-lang</package> - <package>zenity</package> - <package>zenity-lang</package> - <package>zlib-devel</package> - <package>zsh</package> - <package>zvbi-devel</package> - </remove-packages> - - </software> - <user_defaults> - <expire></expire> - <group>100</group> - <groups>video,dialout</groups> - <home>/home</home> - <inactive>-1</inactive> - <shell>/bin/bash</shell> - <skel>/etc/skel</skel> - <umask>022</umask> - </user_defaults> - <users config:type="list"> - <user> - <encrypted config:type="boolean">true</encrypted> - <fullname>vagrant</fullname> - <gid>100</gid> - <home>/home/vagrant</home> - <password_settings> - <expire></expire> - <flag></flag> - <inact></inact> - <max>99999</max> - <min>0</min> - <warn>7</warn> - </password_settings> - <shell>/bin/bash</shell> - <uid>1000</uid> - <user_password>$2y$05$NA1Li9ZKJOLRW5mMTXm6/e5r8dltWS5RpDZpvHrI82aLE00V51tdi</user_password> - <username>vagrant</username> - </user> - <user> - <encrypted config:type="boolean">true</encrypted> - <fullname>Games account</fullname> - <gid>100</gid> - <home>/var/games</home> - <password_settings> - <expire></expire> - <flag></flag> - <inact></inact> - <max></max> - <min></min> - <warn></warn> - </password_settings> - <shell>/bin/bash</shell> - <uid>12</uid> - <user_password>*</user_password> - <username>games</username> - </user> - <user> - <encrypted config:type="boolean">true</encrypted> - <fullname>bin</fullname> - <gid>1</gid> - <home>/bin</home> - <password_settings> - <expire></expire> - <flag></flag> - <inact></inact> - <max></max> - <min></min> - <warn></warn> - </password_settings> - <shell>/bin/bash</shell> - <uid>1</uid> - <user_password>*</user_password> - <username>bin</username> - </user> - <user> - <encrypted config:type="boolean">true</encrypted> - <fullname>nobody</fullname> - <gid>65533</gid> - <home>/var/lib/nobody</home> - <password_settings> - <expire></expire> - <flag></flag> - <inact></inact> - <max></max> - <min></min> - <warn></warn> - </password_settings> - <shell>/bin/bash</shell> - <uid>65534</uid> - <user_password>*</user_password> - <username>nobody</username> - </user> - <user> - <encrypted config:type="boolean">true</encrypted> - <fullname>Printing daemon</fullname> - <gid>7</gid> - <home>/var/spool/lpd</home> - <password_settings> - <expire></expire> - <flag></flag> - <inact></inact> - <max></max> - <min></min> - <warn></warn> - </password_settings> - <shell>/bin/bash</shell> - <uid>4</uid> - <user_password>*</user_password> - <username>lp</username> - </user> - <user> - <encrypted config:type="boolean">true</encrypted> - <fullname>User for uuidd</fullname> - <gid>104</gid> - <home>/var/run/uuidd</home> - <password_settings> - <expire></expire> - <flag></flag> - <inact></inact> - <max>99999</max> - <min>0</min> - <warn>7</warn> - </password_settings> - <shell>/bin/false</shell> - <uid>102</uid> - <user_password>*</user_password> - <username>uuidd</username> - </user> - <user> - <encrypted config:type="boolean">true</encrypted> - <fullname>Postfix Daemon</fullname> - <gid>51</gid> - <home>/var/spool/postfix</home> - <password_settings> - <expire></expire> - <flag></flag> - <inact></inact> - <max>99999</max> - <min>0</min> - <warn>7</warn> - </password_settings> - <shell>/bin/false</shell> - <uid>51</uid> - <user_password>*</user_password> - <username>postfix</username> - </user> - <user> - <encrypted config:type="boolean">true</encrypted> - <fullname>Novell Customer Center User</fullname> - <gid>111</gid> - <home>/var/lib/YaST2/suse-ncc-fakehome</home> - <password_settings> - <expire></expire> - <flag></flag> - <inact></inact> - <max>99999</max> - <min>0</min> - <warn>7</warn> - </password_settings> - <shell>/bin/bash</shell> - <uid>106</uid> - <user_password>*</user_password> - <username>suse-ncc</username> - </user> - <user> - <encrypted config:type="boolean">true</encrypted> - <fullname>FTP account</fullname> - <gid>49</gid> - <home>/srv/ftp</home> - <password_settings> - <expire></expire> - <flag></flag> - <inact></inact> - <max></max> - <min></min> - <warn></warn> - </password_settings> - <shell>/bin/bash</shell> - <uid>40</uid> - <user_password>*</user_password> - <username>ftp</username> - </user> - <user> - <encrypted config:type="boolean">true</encrypted> - <fullname>Gnome Display Manager daemon</fullname> - <gid>112</gid> - <home>/var/lib/gdm</home> - <password_settings> - <expire></expire> - <flag></flag> - <inact></inact> - <max>99999</max> - <min>0</min> - <warn>7</warn> - </password_settings> - <shell>/bin/false</shell> - <uid>107</uid> - <user_password>*</user_password> - <username>gdm</username> - </user> - <user> - <encrypted config:type="boolean">true</encrypted> - <fullname>Batch jobs daemon</fullname> - <gid>25</gid> - <home>/var/spool/atjobs</home> - <password_settings> - <expire></expire> - <flag></flag> - <inact></inact> - <max>99999</max> - <min>0</min> - <warn>7</warn> - </password_settings> - <shell>/bin/bash</shell> - <uid>25</uid> - <user_password>*</user_password> - <username>at</username> - </user> - <user> - <encrypted config:type="boolean">true</encrypted> - <fullname>root</fullname> - <gid>0</gid> - <home>/root</home> - <password_settings> - <expire></expire> - <flag></flag> - <inact></inact> - <max></max> - <min></min> - <warn></warn> - </password_settings> - <shell>/bin/bash</shell> - <uid>0</uid> - <user_password>$2y$05$NA1Li9ZKJOLRW5mMTXm6/e5r8dltWS5RpDZpvHrI82aLE00V51tdi</user_password> - <username>root</username> - </user> - <user> - <encrypted config:type="boolean">true</encrypted> - <fullname>Mailer daemon</fullname> - <gid>12</gid> - <home>/var/spool/clientmqueue</home> - <password_settings> - <expire></expire> - <flag></flag> - <inact></inact> - <max></max> - <min></min> - <warn></warn> - </password_settings> - <shell>/bin/false</shell> - <uid>8</uid> - <user_password>*</user_password> - <username>mail</username> - </user> - <user> - <encrypted config:type="boolean">true</encrypted> - <fullname>Daemon</fullname> - <gid>2</gid> - <home>/sbin</home> - <password_settings> - <expire></expire> - <flag></flag> - <inact></inact> - <max></max> - <min></min> - <warn></warn> - </password_settings> - <shell>/bin/bash</shell> - <uid>2</uid> - <user_password>*</user_password> - <username>daemon</username> - </user> - <user> - <encrypted config:type="boolean">true</encrypted> - <fullname>NTP daemon</fullname> - <gid>108</gid> - <home>/var/lib/ntp</home> - <password_settings> - <expire></expire> - <flag></flag> - <inact></inact> - <max>99999</max> - <min>0</min> - <warn>7</warn> - </password_settings> - <shell>/bin/false</shell> - <uid>74</uid> - <user_password>*</user_password> - <username>ntp</username> - </user> - <user> - <encrypted config:type="boolean">true</encrypted> - <fullname>Unix-to-Unix CoPy system</fullname> - <gid>14</gid> - <home>/etc/uucp</home> - <password_settings> - <expire></expire> - <flag></flag> - <inact></inact> - <max></max> - <min></min> - <warn></warn> - </password_settings> - <shell>/bin/bash</shell> - <uid>10</uid> - <user_password>*</user_password> - <username>uucp</username> - </user> - <user> - <encrypted config:type="boolean">true</encrypted> - <fullname>User for D-Bus</fullname> - <gid>101</gid> - <home>/var/run/dbus</home> - <password_settings> - <expire></expire> - <flag></flag> - <inact></inact> - <max></max> - <min>0</min> - <warn>7</warn> - </password_settings> - <shell>/bin/false</shell> - <uid>100</uid> - <user_password>*</user_password> - <username>messagebus</username> - </user> - <user> - <encrypted config:type="boolean">true</encrypted> - <fullname>User for haldaemon</fullname> - <gid>102</gid> - <home>/var/run/hald</home> - <password_settings> - <expire></expire> - <flag></flag> - <inact></inact> - <max></max> - <min>0</min> - <warn>7</warn> - </password_settings> - <shell>/bin/false</shell> - <uid>101</uid> - <user_password>*</user_password> - <username>haldaemon</username> - </user> - <user> - <encrypted config:type="boolean">true</encrypted> - <fullname>WWW daemon apache</fullname> - <gid>8</gid> - <home>/var/lib/wwwrun</home> - <password_settings> - <expire></expire> - <flag></flag> - <inact></inact> - <max></max> - <min></min> - <warn></warn> - </password_settings> - <shell>/bin/false</shell> - <uid>30</uid> - <user_password>*</user_password> - <username>wwwrun</username> - </user> - <user> - <encrypted config:type="boolean">true</encrypted> - <fullname>Manual pages viewer</fullname> - <gid>62</gid> - <home>/var/cache/man</home> - <password_settings> - <expire></expire> - <flag></flag> - <inact></inact> - <max></max> - <min></min> - <warn></warn> - </password_settings> - <shell>/bin/bash</shell> - <uid>13</uid> - <user_password>*</user_password> - <username>man</username> - </user> - <user> - <encrypted config:type="boolean">true</encrypted> - <fullname>PolicyKit</fullname> - <gid>107</gid> - <home>/var/run/PolicyKit</home> - <password_settings> - <expire></expire> - <flag></flag> - <inact></inact> - <max>99999</max> - <min>0</min> - <warn>7</warn> - </password_settings> - <shell>/bin/false</shell> - <uid>104</uid> - <user_password>*</user_password> - <username>polkituser</username> - </user> - <user> - <encrypted config:type="boolean">true</encrypted> - <fullname>News system</fullname> - <gid>13</gid> - <home>/etc/news</home> - <password_settings> - <expire></expire> - <flag></flag> - <inact></inact> - <max></max> - <min></min> - <warn></warn> - </password_settings> - <shell>/bin/bash</shell> - <uid>9</uid> - <user_password>*</user_password> - <username>news</username> - </user> - <user> - <fullname>SSH daemon</fullname> - <gid>65</gid> - <home>/var/lib/sshd</home> - <shell>/bin/false</shell> - <uid>71</uid> - <username>sshd</username> - </user> - <user> - <encrypted config:type="boolean">true</encrypted> - <fullname>PulseAudio daemon</fullname> - <gid>109</gid> - <home>/var/lib/pulseaudio</home> - <password_settings> - <expire></expire> - <flag></flag> - <inact></inact> - <max>99999</max> - <min>0</min> - <warn>7</warn> - </password_settings> - <shell>/bin/false</shell> - <uid>105</uid> - <user_password>*</user_password> - <username>pulse</username> - </user> - </users> -</profile> diff --git a/definitions/sles-11-sp2-i386/cleanup.sh b/definitions/sles-11-sp2-i386/cleanup.sh deleted file mode 100644 index dcb1d72bc..000000000 --- a/definitions/sles-11-sp2-i386/cleanup.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/bash -eux - -# remove zypper locks on removed packages to avoid later dependency problems -zypper --non-interactive rl \* -# zypper --non-interactive remove `rpm -qa virtualbox-guest-*` >/dev/null 2>&1 -# Add an online copy of the SLES DVD1 as a software repository, instead of the mounted DVD -zypper removerepo 'SUSE-Linux-Enterprise-Server-11-SP2 11.2.2-1.234' -zypper addrepo 'http://demeter.uni-regensburg.de/SLES11SP2-x86/DVD1/' 'SLES11SP2-x86 DVD1 Online' -zypper refresh diff --git a/definitions/sles-11-sp2-i386/definition.rb b/definitions/sles-11-sp2-i386/definition.rb deleted file mode 100644 index 0ee06e5b4..000000000 --- a/definitions/sles-11-sp2-i386/definition.rb +++ /dev/null @@ -1,12 +0,0 @@ -require File.dirname(__FILE__) + "/../.suse/session.rb" - -iso = "SLES-11-SP2-DVD-i586-GM-DVD1.iso" - -session = - SUSE_SESSION.merge( :memory_size=> '480', - :iso_download_instructions => "Download evaluation version from http://download.novell.com/Download?buildid=FkjGyLMMiss~", - :iso_file => iso, - :iso_md5 => "a0b34f6237b2b2a6b2174c82b40ed326", - :iso_src => "") - -Veewee::Session.declare session diff --git a/definitions/sles-11-sp2-i386/minimize.sh b/definitions/sles-11-sp2-i386/minimize.sh deleted file mode 120000 index b3632ccbc..000000000 --- a/definitions/sles-11-sp2-i386/minimize.sh +++ /dev/null @@ -1 +0,0 @@ -../.common/minimize.sh \ No newline at end of file diff --git a/definitions/sles-11-sp2-i386/sshd.sh b/definitions/sles-11-sp2-i386/sshd.sh deleted file mode 120000 index f353f2d00..000000000 --- a/definitions/sles-11-sp2-i386/sshd.sh +++ /dev/null @@ -1 +0,0 @@ -../.common/sshd.sh \ No newline at end of file diff --git a/definitions/sles-11-sp2-i386/sudoers.sh b/definitions/sles-11-sp2-i386/sudoers.sh deleted file mode 120000 index 18d9cf04d..000000000 --- a/definitions/sles-11-sp2-i386/sudoers.sh +++ /dev/null @@ -1 +0,0 @@ -../.suse/sudoers.sh \ No newline at end of file diff --git a/definitions/sles-11-sp2-i386/vagrant.sh b/definitions/sles-11-sp2-i386/vagrant.sh deleted file mode 120000 index 702949639..000000000 --- a/definitions/sles-11-sp2-i386/vagrant.sh +++ /dev/null @@ -1 +0,0 @@ -../.common/vagrant.sh \ No newline at end of file diff --git a/definitions/sles-11-sp2/autoinst.xml b/definitions/sles-11-sp2/autoinst.xml deleted file mode 100644 index 5b2647b26..000000000 --- a/definitions/sles-11-sp2/autoinst.xml +++ /dev/null @@ -1,2569 +0,0 @@ -<?xml version="1.0"?> -<!DOCTYPE profile> -<profile xmlns="http://www.suse.com/1.0/yast2ns" xmlns:config="http://www.suse.com/1.0/configns"> - <add-on> - <add_on_products config:type="list"> - <listentry> - <media_url><![CDATA[http://demeter.uni-regensburg.de/SLE11SP2-SDK-x64/DVD1/]]></media_url> - <product>sle-sdk</product> - <product_dir>/</product_dir> - </listentry> - </add_on_products> - </add-on> - <bootloader> - <device_map config:type="list"> - <device_map_entry> - <firmware>hd0</firmware> - <linux>/dev/sda</linux> - </device_map_entry> - </device_map> - <global> - <activate>true</activate> - <boot_root>true</boot_root> - <default>SUSE Linux Enterprise Server 11 SP2 - 3.0.13-0.27</default> - <generic_mbr>true</generic_mbr> - <gfxmenu>/boot/message</gfxmenu> - <lines_cache_id>2</lines_cache_id> - <timeout config:type="integer">8</timeout> - </global> - <initrd_modules config:type="list"> - <initrd_module> - <module>ahci</module> - </initrd_module> - <initrd_module> - <module>ata_piix</module> - </initrd_module> - <initrd_module> - <module>ata_generic</module> - </initrd_module> - <initrd_module> - <module>jbd</module> - </initrd_module> - <initrd_module> - <module>mbcache</module> - </initrd_module> - <initrd_module> - <module>ext3</module> - </initrd_module> - </initrd_modules> - <loader_type>grub</loader_type> - <sections config:type="list"> - <section> - <append>resume=/dev/sda1 splash=silent crashkernel=128M-:64M showopts</append> - <image>(hd0,1)/boot/vmlinuz-3.0.13-0.27-default</image> - <initial>1</initial> - <initrd>(hd0,1)/boot/initrd-3.0.13-0.27-default</initrd> - <lines_cache_id>0</lines_cache_id> - <name>SUSE Linux Enterprise Server 11 SP2 - 3.0.13-0.27</name> - <original_name>linux</original_name> - <root>/dev/sda2</root> - <type>image</type> - <vgamode>0x314</vgamode> - </section> - <section> - <append>showopts ide=nodma apm=off noresume edd=off powersaved=off nohz=off highres=off processor.max_cstate=1 nomodeset x11failsafe</append> - <image>(hd0,1)/boot/vmlinuz-3.0.13-0.27-default</image> - <initrd>(hd0,1)/boot/initrd-3.0.13-0.27-default</initrd> - <lines_cache_id>1</lines_cache_id> - <name>Failsafe -- SUSE Linux Enterprise Server 11 SP2 - 3.0.13-0.27</name> - <original_name>failsafe</original_name> - <root>/dev/sda2</root> - <type>image</type> - <vgamode>0x314</vgamode> - </section> - </sections> - </bootloader> - <ca_mgm> - <CAName>YaST_Default_CA</CAName> - <ca_commonName>YaST Default CA (vagrant-sles-11sp2-x64)</ca_commonName> - <country>US</country> - <locality></locality> - <organisation></organisation> - <organisationUnit></organisationUnit> - <password>ENTER PASSWORD HERE</password> - <server_commonName>vagrant-sles-11sp2-x64.vagrantup.com</server_commonName> - <server_email>postmaster@vagrantup.com</server_email> - <state></state> - <takeLocalServerName config:type="boolean">false</takeLocalServerName> - </ca_mgm> - <deploy_image> - <image_installation config:type="boolean">false</image_installation> - </deploy_image> - <general> - <ask-list config:type="list"/> - <mode> - <confirm config:type="boolean">false</confirm> - </mode> - <mouse> - <id>none</id> - </mouse> - <proposals config:type="list"/> - <signature-handling> - <accept_file_without_checksum config:type="boolean">true</accept_file_without_checksum> - <accept_non_trusted_gpg_key config:type="boolean">true</accept_non_trusted_gpg_key> - <accept_unknown_gpg_key config:type="boolean">true</accept_unknown_gpg_key> - <accept_unsigned_file config:type="boolean">true</accept_unsigned_file> - <accept_verification_failed config:type="boolean">false</accept_verification_failed> - <import_gpg_key config:type="boolean">true</import_gpg_key> - </signature-handling> - <storage/> - </general> - <groups config:type="list"> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>100</gid> - <group_password>x</group_password> - <groupname>users</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>19</gid> - <group_password>x</group_password> - <groupname>floppy</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>1</gid> - <group_password>x</group_password> - <groupname>bin</groupname> - <userlist>daemon</userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>41</gid> - <group_password>x</group_password> - <groupname>xok</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>65533</gid> - <group_password>x</group_password> - <groupname>nobody</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>43</gid> - <group_password>x</group_password> - <groupname>modem</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>5</gid> - <group_password>x</group_password> - <groupname>tty</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>7</gid> - <group_password>x</group_password> - <groupname>lp</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>104</gid> - <group_password>!</group_password> - <groupname>uuidd</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>51</gid> - <group_password>!</group_password> - <groupname>postfix</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>112</gid> - <group_password>!</group_password> - <groupname>gdm</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>65534</gid> - <group_password>x</group_password> - <groupname>nogroup</groupname> - <userlist>nobody</userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>101</gid> - <group_password>!</group_password> - <groupname>messagebus</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>59</gid> - <group_password>!</group_password> - <groupname>maildrop</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>33</gid> - <group_password>x</group_password> - <groupname>video</groupname> - <userlist>vagrant</userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>3</gid> - <group_password>x</group_password> - <groupname>sys</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>15</gid> - <group_password>x</group_password> - <groupname>shadow</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>20</gid> - <group_password>x</group_password> - <groupname>cdrom</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>21</gid> - <group_password>x</group_password> - <groupname>console</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>42</gid> - <group_password>x</group_password> - <groupname>trusted</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>102</gid> - <group_password>!</group_password> - <groupname>haldaemon</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>106</gid> - <group_password>!</group_password> - <groupname>puppet</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>16</gid> - <group_password>x</group_password> - <groupname>dialout</groupname> - <userlist>vagrant</userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>107</gid> - <group_password>!</group_password> - <groupname>polkituser</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>10</gid> - <group_password>x</group_password> - <groupname>wheel</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>109</gid> - <group_password>!</group_password> - <groupname>pulse</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>8</gid> - <group_password>x</group_password> - <groupname>www</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>40</gid> - <group_password>x</group_password> - <groupname>games</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>6</gid> - <group_password>x</group_password> - <groupname>disk</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>17</gid> - <group_password>x</group_password> - <groupname>audio</groupname> - <userlist>pulse</userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>111</gid> - <group_password>!</group_password> - <groupname>suse-ncc</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>49</gid> - <group_password>x</group_password> - <groupname>ftp</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>103</gid> - <group_password>!</group_password> - <groupname>tape</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>25</gid> - <group_password>!</group_password> - <groupname>at</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>9</gid> - <group_password>x</group_password> - <groupname>kmem</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>32</gid> - <group_password>x</group_password> - <groupname>public</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>12</gid> - <group_password>x</group_password> - <groupname>mail</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>0</gid> - <group_password>x</group_password> - <groupname>root</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>2</gid> - <group_password>x</group_password> - <groupname>daemon</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>105</gid> - <group_password>!</group_password> - <groupname>sfcb</groupname> - <userlist>root</userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>108</gid> - <group_password>!</group_password> - <groupname>ntp</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>14</gid> - <group_password>x</group_password> - <groupname>uucp</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>110</gid> - <group_password>!</group_password> - <groupname>pulse-access</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>71</gid> - <group_password>!</group_password> - <groupname>ntadmin</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>62</gid> - <group_password>x</group_password> - <groupname>man</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>22</gid> - <group_password>x</group_password> - <groupname>utmp</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>13</gid> - <group_password>x</group_password> - <groupname>news</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>65</gid> - <group_password>!</group_password> - <groupname>sshd</groupname> - <userlist></userlist> - </group> - </groups> - <host> - <hosts config:type="list"> - <hosts_entry> - <host_address>127.0.0.1</host_address> - <names config:type="list"> - <name>localhost</name> - </names> - </hosts_entry> - <hosts_entry> - <host_address>::1</host_address> - <names config:type="list"> - <name>localhost ipv6-localhost ipv6-loopback</name> - </names> - </hosts_entry> - <hosts_entry> - <host_address>fe00::0</host_address> - <names config:type="list"> - <name>ipv6-localnet</name> - </names> - </hosts_entry> - <hosts_entry> - <host_address>ff00::0</host_address> - <names config:type="list"> - <name>ipv6-mcastprefix</name> - </names> - </hosts_entry> - <hosts_entry> - <host_address>ff02::1</host_address> - <names config:type="list"> - <name>ipv6-allnodes</name> - </names> - </hosts_entry> - <hosts_entry> - <host_address>ff02::2</host_address> - <names config:type="list"> - <name>ipv6-allrouters</name> - </names> - </hosts_entry> - <hosts_entry> - <host_address>ff02::3</host_address> - <names config:type="list"> - <name>ipv6-allhosts</name> - </names> - </hosts_entry> - </hosts> - </host> - <login_settings/> - <networking> - <dhcp_options> - <dhclient_client_id></dhclient_client_id> - <dhclient_hostname_option>AUTO</dhclient_hostname_option> - </dhcp_options> - <dns> - <dhcp_hostname config:type="boolean">false</dhcp_hostname> - <domain>vagrantup.com</domain> - <hostname>vagrant-sles-11sp2-x64</hostname> - <resolv_conf_policy>auto</resolv_conf_policy> - <searchlist config:type="list"> - <search>vagrantup.com</search> - </searchlist> - <write_hostname config:type="boolean">true</write_hostname> - </dns> - <interfaces config:type="list"> - <interface> - <bootproto>dhcp</bootproto> - <device>eth0</device> - <name>82540EM Gigabit Ethernet Controller</name> - <startmode>auto</startmode> - <usercontrol>no</usercontrol> - </interface> - </interfaces> - <managed config:type="boolean">false</managed> - <net-udev config:type="list"> - <rule> - <name>eth0</name> - <rule>KERNELS</rule> - <value>0000:00:03.0</value> - </rule> - </net-udev> - <routing> - <ip_forward config:type="boolean">false</ip_forward> - </routing> - </networking> - <partitioning config:type="list"> - <drive> - <device>/dev/sda</device> - <initialize config:type="boolean">true</initialize> - <partitions config:type="list"> - <partition> - <create config:type="boolean">true</create> - <crypt_fs config:type="boolean">false</crypt_fs> - <filesystem config:type="symbol">swap</filesystem> - <format config:type="boolean">true</format> - <fstopt>defaults</fstopt> - <loop_fs config:type="boolean">false</loop_fs> - <mount>swap</mount> - <mountby config:type="symbol">device</mountby> - <partition_id config:type="integer">130</partition_id> - <partition_nr config:type="integer">1</partition_nr> - <raid_options/> - <resize config:type="boolean">false</resize> - <size>1561492992</size> - </partition> - <partition> - <create config:type="boolean">true</create> - <crypt_fs config:type="boolean">false</crypt_fs> - <filesystem config:type="symbol">ext3</filesystem> - <format config:type="boolean">true</format> - <fstopt>acl,user_xattr</fstopt> - <loop_fs config:type="boolean">false</loop_fs> - <mount>/</mount> - <mountby config:type="symbol">device</mountby> - <partition_id config:type="integer">131</partition_id> - <partition_nr config:type="integer">2</partition_nr> - <raid_options/> - <resize config:type="boolean">false</resize> - <size>19895844352</size> - </partition> - </partitions> - <pesize></pesize> - <type config:type="symbol">CT_DISK</type> - <use>all</use> - </drive> - </partitioning> - <report> - <errors> - <log config:type="boolean">true</log> - <show config:type="boolean">true</show> - <timeout config:type="integer">0</timeout> - </errors> - <messages> - <log config:type="boolean">true</log> - <show config:type="boolean">true</show> - <timeout config:type="integer">0</timeout> - </messages> - <warnings> - <log config:type="boolean">true</log> - <show config:type="boolean">true</show> - <timeout config:type="integer">0</timeout> - </warnings> - <yesno_messages> - <log config:type="boolean">true</log> - <show config:type="boolean">true</show> - <timeout config:type="integer">0</timeout> - </yesno_messages> - </report> - <software> - - <packages config:type="list"> - <package>desktop-translations</package> - <package>gconf2-branding-SLES</package> - <package>libproxy0-config-gnome</package> - <package>sle-sdk-release</package> - <package>sle-sdk-release-SDK</package> - <package>sles-manuals_en</package> - <package>yast2-trans-en_US</package> - </packages> - <patterns config:type="list"> - <pattern>Basis-Devel</pattern> - <pattern>Minimal</pattern> - <pattern>apparmor</pattern> - <pattern>base</pattern> - <pattern>sdk_kernel</pattern> - </patterns> - <remove-packages config:type="list"> - <package>3ddiag</package> - <package>CASA</package> - <package>CASA-devel</package> - <package>CASA_auth_token_client</package> - <package>CASA_auth_token_client-devel</package> - <package>ConsoleKit-devel</package> - <package>ConsoleKit-x11</package> - <package>DirectFB-devel</package> - <package>FastCGI</package> - <package>IlmBase</package> - <package>IlmBase-devel</package> - <package>ImageMagick</package> - <package>ImageMagick-devel</package> - <package>LibVNCServer</package> - <package>LibVNCServer-devel</package> - <package>Mesa</package> - <package>Mesa-devel</package> - <package>ModemManager</package> - <package>Modules</package> - <package>NetworkManager</package> - <package>NetworkManager-devel</package> - <package>NetworkManager-glib</package> - <package>NetworkManager-gnome</package> - <package>NetworkManager-kde4</package> - <package>NetworkManager-kde4-lang</package> - <package>NetworkManager-kde4-libs</package> - <package>OpenEXR</package> - <package>OpenEXR-devel</package> - <package>OpenIPMI-devel</package> - <package>PackageKit</package> - <package>PackageKit-devel</package> - <package>PackageKit-lang</package> - <package>PolicyKit-devel</package> - <package>PolicyKit-gnome</package> - <package>PolicyKit-gnome-devel</package> - <package>PolicyKit-gnome-libs</package> - <package>SDL-devel</package> - <package>SDL_net</package> - <package>SDL_net-devel</package> - <package>TeX-Guy</package> - <package>TeX-Guy-devel</package> - <package>VFlib3</package> - <package>VFlib3-devel</package> - <package>WindowMaker</package> - <package>WindowMaker-devel</package> - <package>a2ps</package> - <package>aalib</package> - <package>aalib-devel</package> - <package>akonadi-runtime</package> - <package>akregator</package> - <package>alsa-devel</package> - <package>alsa-firmware</package> - <package>alsa-plugins-pulse</package> - <package>alsa-tools</package> - <package>alsa-tools-devel</package> - <package>anthy</package> - <package>anthy-devel</package> - <package>antlr</package> - <package>apache2</package> - <package>apache2-devel</package> - <package>apache2-mod_perl</package> - <package>apache2-mod_perl-devel</package> - <package>apache2-prefork</package> - <package>apache2-utils</package> - <package>apache2-worker</package> - <package>apparmor-profile-editor</package> - <package>art-sharp2</package> - <package>arts</package> - <package>arts-devel</package> - <package>aspell-devel</package> - <package>at-spi</package> - <package>at-spi-devel</package> - <package>at-spi-lang</package> - <package>atk-devel</package> - <package>audiofile</package> - <package>audiofile-devel</package> - <package>audit-devel</package> - <package>augeas-lenses</package> - <package>automoc4</package> - <package>avahi</package> - <package>avahi-compat-howl-devel</package> - <package>avahi-compat-mDNSResponder-devel</package> - <package>avahi-lang</package> - <package>babl-0_0</package> - <package>banshee-1</package> - <package>banshee-1-backend-engine-gstreamer</package> - <package>banshee-1-backend-platform-gnome</package> - <package>banshee-1-backend-platform-unix</package> - <package>banshee-1-devel</package> - <package>banshee-1-extensions-default</package> - <package>banshee-1-lang</package> - <package>beagle-devel</package> - <package>bind-devel</package> - <package>binutils-devel</package> - <package>bluez</package> - <package>bluez-devel</package> - <package>boo</package> - <package>boo-devel</package> - <package>boost-devel</package> - <package>bootsplash-branding-SLED</package> - <package>cairo-devel</package> - <package>cairomm</package> - <package>cairomm-devel</package> - <package>canna</package> - <package>canna-devel</package> - <package>canna-libs</package> - <package>cannadic</package> - <package>capi4linux</package> - <package>capi4linux-devel</package> - <package>cdk</package> - <package>cdk-devel</package> - <package>cdrdao</package> - <package>chasen</package> - <package>chasen-devel</package> - <package>check</package> - <package>check-devel</package> - <package>chmlib</package> - <package>chmlib-devel</package> - <package>cim-schema</package> - <package>clucene-core</package> - <package>clucene-core-devel</package> - <package>cmake</package> - <package>compiz</package> - <package>compiz-branding-SLE</package> - <package>compiz-devel</package> - <package>compiz-gnome</package> - <package>coolkey-devel</package> - <package>cracklib-devel</package> - <package>crash-devel</package> - <package>crimson</package> - <package>cscope</package> - <package>cups</package> - <package>cups-devel</package> - <package>cvsps</package> - <package>cyrus-imapd-devel</package> - <package>cyrus-sasl-crammd5</package> - <package>cyrus-sasl-devel</package> - <package>dante</package> - <package>dante-devel</package> - <package>db1</package> - <package>db1-devel</package> - <package>db43</package> - <package>db43-devel</package> - <package>dbus-1-devel</package> - <package>dbus-1-glib-devel</package> - <package>dbus-1-python-devel</package> - <package>dbus-1-qt3</package> - <package>dbus-1-qt3-devel</package> - <package>dbus-1-x11</package> - <package>dejagnu</package> - <package>dejavu</package> - <package>desktop-data-openSUSE</package> - <package>desktop-file-utils</package> - <package>devhelp</package> - <package>devhelp-devel</package> - <package>devhelp-lang</package> - <package>device-mapper-devel</package> - <package>dhcp</package> - <package>dhcp-client</package> - <package>dhcp-devel</package> - <package>diffstat</package> - <package>dmapi-devel</package> - <package>dnsmasq</package> - <package>docbook-xsl-stylesheets</package> - <package>docbook_4</package> - <package>doxygen</package> - <package>dvd+rw-tools</package> - <package>e2fsprogs-devel</package> - <package>emacs</package> - <package>emacs-nox</package> - <package>emacs-x11</package> - <package>enchant</package> - <package>enchant-devel</package> - <package>enscript</package> - <package>eog</package> - <package>eog-devel</package> - <package>eog-lang</package> - <package>espeak</package> - <package>evince</package> - <package>evince-devel</package> - <package>evince-lang</package> - <package>evoldap2-devel</package> - <package>evolution</package> - <package>evolution-data-server</package> - <package>evolution-data-server-devel</package> - <package>evolution-data-server-lang</package> - <package>evolution-devel</package> - <package>evolution-lang</package> - <package>expect-devel</package> - <package>facter</package> - <package>fam</package> - <package>fam-devel</package> - <package>farsight</package> - <package>farsight-devel</package> - <package>festival</package> - <package>festival-devel</package> - <package>fftw</package> - <package>fftw-devel</package> - <package>fftw-mpi</package> - <package>fftw-mpi-devel</package> - <package>fftw-threads</package> - <package>fftw-threads-devel</package> - <package>fftw3</package> - <package>fftw3-devel</package> - <package>fftw3-threads</package> - <package>fftw3-threads-devel</package> - <package>file-devel</package> - <package>fileshareset</package> - <package>finch</package> - <package>finch-devel</package> - <package>flac-devel</package> - <package>fltk</package> - <package>fltk-devel</package> - <package>fontconfig-devel</package> - <package>fonts-config</package> - <package>foomatic-filters</package> - <package>freeglut</package> - <package>freeglut-devel</package> - <package>freeradius-client-devel</package> - <package>freeradius-client-libs</package> - <package>freeradius-server-devel</package> - <package>freeradius-server-libs</package> - <package>freetype</package> - <package>freetype2-devel</package> - <package>fribidi</package> - <package>fribidi-devel</package> - <package>ft2demos</package> - <package>fuse-devel</package> - <package>fwnn-devel</package> - <package>fxload</package> - <package>gcc-gij</package> - <package>gcc-java</package> - <package>gcc43-gij</package> - <package>gcc43-java</package> - <package>gconf-sharp2</package> - <package>gconf2-devel</package> - <package>gconfmm</package> - <package>gconfmm-devel</package> - <package>gd</package> - <package>gd-devel</package> - <package>gdbm-32bit</package> - <package>gdk-pixbuf</package> - <package>gdk-pixbuf-devel</package> - <package>gegl-0_0</package> - <package>gettext-tools</package> - <package>gfxboot-branding-SLED</package> - <package>gfxboot-devel</package> - <package>ggz</package> - <package>ggz-client-libs</package> - <package>ggz-client-libs-devel</package> - <package>ggz-client-libs-lang</package> - <package>ghex</package> - <package>ghex-devel</package> - <package>ghex-lang</package> - <package>ghostscript-devel</package> - <package>ghostscript-fonts-other</package> - <package>ghostscript-fonts-std</package> - <package>ghostscript-ijs-devel</package> - <package>ghostscript-library</package> - <package>ghostscript-omni</package> - <package>ghostscript-x11</package> - <package>giflib-devel</package> - <package>gimp</package> - <package>gimp-branding-SLED</package> - <package>gimp-devel</package> - <package>gimp-lang</package> - <package>gimp-plugins-python</package> - <package>git</package> - <package>git-arch</package> - <package>git-core</package> - <package>git-cvs</package> - <package>git-daemon</package> - <package>git-email</package> - <package>git-gui</package> - <package>git-svn</package> - <package>git-web</package> - <package>gitk</package> - <package>gjdoc</package> - <package>glade-sharp2</package> - <package>glade3</package> - <package>glade3-lang</package> - <package>glib</package> - <package>glib-devel</package> - <package>glib-sharp2</package> - <package>glib2-devel</package> - <package>glibmm2</package> - <package>glibmm2-devel</package> - <package>glitz</package> - <package>glitz-devel</package> - <package>gltt</package> - <package>gltt-devel</package> - <package>gmime-2_4-devel</package> - <package>gmime-devel</package> - <package>gmp-devel</package> - <package>gnet</package> - <package>gnet-devel</package> - <package>gnokii</package> - <package>gnokii-devel</package> - <package>gnokii-smsd</package> - <package>gnome-certauth-devel</package> - <package>gnome-control-center</package> - <package>gnome-control-center-devel</package> - <package>gnome-control-center-lang</package> - <package>gnome-desktop</package> - <package>gnome-desktop-devel</package> - <package>gnome-desktop-lang</package> - <package>gnome-doc-utils</package> - <package>gnome-doc-utils-devel</package> - <package>gnome-doc-utils-lang</package> - <package>gnome-keyring-devel</package> - <package>gnome-keyring-sharp</package> - <package>gnome-keyring-sharp-devel</package> - <package>gnome-libs</package> - <package>gnome-libs-devel</package> - <package>gnome-mag</package> - <package>gnome-mag-devel</package> - <package>gnome-mag-lang</package> - <package>gnome-main-menu</package> - <package>gnome-main-menu-lang</package> - <package>gnome-media</package> - <package>gnome-media-devel</package> - <package>gnome-media-lang</package> - <package>gnome-menus</package> - <package>gnome-menus-branding-SLED</package> - <package>gnome-menus-devel</package> - <package>gnome-menus-lang</package> - <package>gnome-mount</package> - <package>gnome-mount-lang</package> - <package>gnome-panel</package> - <package>gnome-panel-devel</package> - <package>gnome-panel-lang</package> - <package>gnome-pilot</package> - <package>gnome-pilot-devel</package> - <package>gnome-pilot-lang</package> - <package>gnome-settings-daemon</package> - <package>gnome-settings-daemon-devel</package> - <package>gnome-settings-daemon-lang</package> - <package>gnome-sharp2</package> - <package>gnome-speech</package> - <package>gnome-speech-devel</package> - <package>gnome-themes</package> - <package>gnome-utils</package> - <package>gnome-utils-devel</package> - <package>gnome-utils-lang</package> - <package>gnome-vfs-sharp2</package> - <package>gnome-vfs2</package> - <package>gnome-vfs2-devel</package> - <package>gnome-vfs2-lang</package> - <package>gnome-vfsmm</package> - <package>gnome-vfsmm-devel</package> - <package>gnopernicus</package> - <package>gnopernicus-devel</package> - <package>gnopernicus-lang</package> - <package>gnutls</package> - <package>goffice</package> - <package>goffice-devel</package> - <package>goffice-lang</package> - <package>goocanvas</package> - <package>goocanvas-devel</package> - <package>goocanvas-lang</package> - <package>goom2k4</package> - <package>goom2k4-devel</package> - <package>graphviz</package> - <package>graphviz-devel</package> - <package>graphviz-gd</package> - <package>graphviz-gnome</package> - <package>gstreamer-0_10</package> - <package>gstreamer-0_10-devel</package> - <package>gstreamer-0_10-lang</package> - <package>gstreamer-0_10-plugins-base</package> - <package>gstreamer-0_10-plugins-base-devel</package> - <package>gstreamer-0_10-plugins-base-lang</package> - <package>gstreamer-0_10-plugins-good</package> - <package>gstreamer-0_10-plugins-good-lang</package> - <package>gstreamer-0_10-utils</package> - <package>gstreamer-utils</package> - <package>gtk</package> - <package>gtk-devel</package> - <package>gtk-lang</package> - <package>gtk-sharp2</package> - <package>gtk-vnc-devel</package> - <package>gtk2-devel</package> - <package>gtkglext</package> - <package>gtkglext-devel</package> - <package>gtkhtml2</package> - <package>gtkhtml2-devel</package> - <package>gtkhtml2-lang</package> - <package>gtkhtml314-sharp</package> - <package>gtkmm2</package> - <package>gtkmm2-devel</package> - <package>gtksourceview-devel</package> - <package>gtksourceview-lang</package> - <package>gtksourceview18</package> - <package>gtksourceview18-devel</package> - <package>gtkspell</package> - <package>gtkspell-devel</package> - <package>gtkspell-lang</package> - <package>gucharmap</package> - <package>gucharmap-devel</package> - <package>gucharmap-lang</package> - <package>guile</package> - <package>guile-devel</package> - <package>gutenprint</package> - <package>gutenprint-devel</package> - <package>gvfs-devel</package> - <package>gxmhtml</package> - <package>hal-devel</package> - <package>hal-palm</package> - <package>htdig</package> - <package>htdig-devel</package> - <package>hunspell</package> - <package>hunspell-devel</package> - <package>hunspell-tools</package> - <package>hwinfo-devel</package> - <package>i4l-base</package> - <package>icewm</package> - <package>icewm-lite</package> - <package>id3lib</package> - <package>id3lib-devel</package> - <package>imap-devel</package> - <package>imap-lib</package> - <package>imlib</package> - <package>imlib-devel</package> - <package>imlib2</package> - <package>imlib2-devel</package> - <package>indent</package> - <package>info2html</package> - <package>inn</package> - <package>inn-devel</package> - <package>intltool</package> - <package>ipadic</package> - <package>iptables-devel</package> - <package>iso-codes</package> - <package>iso-codes-devel</package> - <package>iso_ent</package> - <package>ispell</package> - <package>ispell-american</package> - <package>ispell-brazilian</package> - <package>ispell-british</package> - <package>ispell-czech</package> - <package>ispell-danish</package> - <package>ispell-finnish</package> - <package>ispell-french</package> - <package>ispell-german</package> - <package>ispell-hungarian</package> - <package>ispell-italian</package> - <package>ispell-ngerman</package> - <package>ispell-norsk</package> - <package>ispell-polish</package> - <package>ispell-portuguese</package> - <package>ispell-russian</package> - <package>ispell-slovak</package> - <package>ispell-spanish</package> - <package>ispell-swedish</package> - <package>itcl-devel</package> - <package>java-1_4_2-ibm</package> - <package>java-1_4_2-ibm-devel</package> - <package>java-1_5_0-gcj-compat</package> - <package>java-1_5_0-gcj-compat-devel</package> - <package>java-1_6_0-ibm</package> - <package>java-1_6_0-ibm-devel</package> - <package>joe</package> - <package>jpackage-utils</package> - <package>k3b</package> - <package>k3b-devel</package> - <package>k3b-lang</package> - <package>kaddressbook</package> - <package>kalarm</package> - <package>kde-susetranslations</package> - <package>kde4-filesystem</package> - <package>kde4-kgreeter-plugins</package> - <package>kdebase3</package> - <package>kdebase3-devel</package> - <package>kdebase3-runtime</package> - <package>kdebase4-SLED</package> - <package>kdebase4-SLED-lang</package> - <package>kdebase4-runtime</package> - <package>kdebase4-runtime-branding-SLED</package> - <package>kdebase4-workspace</package> - <package>kdebase4-workspace-branding-SLED</package> - <package>kdebase4-workspace-devel</package> - <package>kdebase4-workspace-ksysguardd</package> - <package>kdelibs3</package> - <package>kdelibs3-arts</package> - <package>kdelibs3-default-style</package> - <package>kdelibs3-devel</package> - <package>kdelibs3-doc</package> - <package>kdelibs4</package> - <package>kdelibs4-branding-SLED</package> - <package>kdelibs4-core</package> - <package>kdelibs4-doc</package> - <package>kdemultimedia3-arts</package> - <package>kdepim3</package> - <package>kdepim4</package> - <package>kdepim4-devel</package> - <package>kdepimlibs4</package> - <package>kdialog</package> - <package>kdm</package> - <package>kdm-branding-SLED</package> - <package>kernel-docs</package> - <package>kernel-syms</package> - <package>kernel-trace-devel</package> - <package>kernel-xen-devel</package> - <package>keyutils-devel</package> - <package>kio_sysinfo</package> - <package>kio_sysinfo-branding-SLED</package> - <package>kmail</package> - <package>knode</package> - <package>kontact</package> - <package>korganizer</package> - <package>kpilot</package> - <package>krb5-devel</package> - <package>ksh-devel</package> - <package>ktorrent</package> - <package>ktorrent-devel</package> - <package>ktorrent-lang</package> - <package>kwin</package> - <package>ladspa-devel</package> - <package>lib3ds-1-3</package> - <package>lib3ds-devel</package> - <package>libFLAC++6</package> - <package>libFLAC8</package> - <package>libHX-devel</package> - <package>libMagick++-devel</package> - <package>libMagick++1</package> - <package>libMagickWand1</package> - <package>libQtWebKit-devel</package> - <package>libQtWebKit4</package> - <package>libXerces-c-devel</package> - <package>libXerces-c28</package> - <package>libXiterm</package> - <package>libXiterm-devel</package> - <package>libacl-devel</package> - <package>libadns-devel</package> - <package>libadns1</package> - <package>libakode</package> - <package>libakode-devel</package> - <package>libakonadi4</package> - <package>libakonadiprotocolinternals-devel</package> - <package>libakonadiprotocolinternals1</package> - <package>libao</package> - <package>libao-devel</package> - <package>libapparmor-devel</package> - <package>libapr-util1</package> - <package>libapr-util1-devel</package> - <package>libapr1</package> - <package>libapr1-devel</package> - <package>libarchive-devel</package> - <package>libart_lgpl</package> - <package>libart_lgpl-devel</package> - <package>libassuan-devel</package> - <package>libatomic-ops-devel</package> - <package>libattr-devel</package> - <package>libavahi-core5</package> - <package>libavahi-devel</package> - <package>libavahi-glib-devel</package> - <package>libavahi-gobject-devel</package> - <package>libavahi-gobject0</package> - <package>libavahi-ui0</package> - <package>libavc1394-0</package> - <package>libavc1394-devel</package> - <package>libbabl-0_0-0</package> - <package>libbeagle-devel</package> - <package>libbeagle-python</package> - <package>libbeagle1</package> - <package>libbitmask-devel</package> - <package>libbitmask1</package> - <package>libblkid-devel</package> - <package>libblocxx-devel</package> - <package>libbonobo</package> - <package>libbonobo-devel</package> - <package>libbonobo-lang</package> - <package>libbonoboui</package> - <package>libbonoboui-devel</package> - <package>libbonoboui-lang</package> - <package>libboost_date_time1_36_0</package> - <package>libboost_filesystem1_36_0</package> - <package>libboost_graph1_36_0</package> - <package>libboost_iostreams1_36_0</package> - <package>libboost_math1_36_0</package> - <package>libboost_mpi1_36_0</package> - <package>libboost_program_options1_36_0</package> - <package>libboost_python1_36_0</package> - <package>libboost_serialization1_36_0</package> - <package>libboost_signals1_36_0</package> - <package>libboost_system1_36_0</package> - <package>libboost_test1_36_0</package> - <package>libboost_thread1_36_0</package> - <package>libboost_wave1_36_0</package> - <package>libbotan-1_6_4</package> - <package>libbotan-devel</package> - <package>libbtctl</package> - <package>libbtctl-devel</package> - <package>libbtctl-lang</package> - <package>libbtctl4</package> - <package>libbz2-devel</package> - <package>libcaca</package> - <package>libcaca-devel</package> - <package>libcanberra-gtk</package> - <package>libcanberra-gtk0</package> - <package>libcanberra0</package> - <package>libcap-devel</package> - <package>libcap-ng0</package> - <package>libcdda_interface0</package> - <package>libcdda_paranoia0</package> - <package>libcddb-devel</package> - <package>libcddb2</package> - <package>libcdio++0</package> - <package>libcdio-devel</package> - <package>libcgroup-devel</package> - <package>libcgroup1</package> - <package>libchewing</package> - <package>libchewing-devel</package> - <package>libcmpiutil</package> - <package>libcmpiutil-devel</package> - <package>libcolorblind0</package> - <package>libcom_err-devel</package> - <package>libcompizconfig</package> - <package>libcompizconfig-devel</package> - <package>libcppunit-1_12-0</package> - <package>libcppunit-devel</package> - <package>libcpuset-devel</package> - <package>libcpuset1</package> - <package>libcroco</package> - <package>libcroco-0_6-3</package> - <package>libcroco-devel</package> - <package>libcryptsetup-devel</package> - <package>libcsync-devel</package> - <package>libcsync0</package> - <package>libcurl-devel</package> - <package>libdaemon-devel</package> - <package>libdaemon0</package> - <package>libdatrie-devel</package> - <package>libdatrie0</package> - <package>libdb-4_5-32bit</package> - <package>libdb-4_5-devel</package> - <package>libdbus-1-qt3-0</package> - <package>libdbus-1-qt3-0-devel</package> - <package>libdc1394-22</package> - <package>libdc1394-devel</package> - <package>libdc1394_control12</package> - <package>libdc1394_control12-devel</package> - <package>libdhcp6client-1_0-2</package> - <package>libdhcp6client-devel</package> - <package>libdigikam-devel</package> - <package>libdiscid1</package> - <package>libdjvulibre-devel</package> - <package>libdjvulibre21</package> - <package>libdmxview-devel</package> - <package>libdmxview0</package> - <package>libdnet-devel</package> - <package>libdnet1</package> - <package>libdns_sd</package> - <package>libdrm</package> - <package>libdrm-devel</package> - <package>libdv-devel</package> - <package>libdv4</package> - <package>libdvdread4</package> - <package>libdw-devel</package> - <package>libebl-devel</package> - <package>libedit-devel</package> - <package>libedit0</package> - <package>libelf-devel</package> - <package>libenchant1</package> - <package>libesd-devel</package> - <package>libesd0</package> - <package>libesmtp-devel</package> - <package>libevoldap-2_4-2</package> - <package>libevtlog-devel</package> - <package>libevtlog0</package> - <package>libexempi-devel</package> - <package>libexempi3</package> - <package>libexif-devel</package> - <package>libexiv2-4</package> - <package>libexiv2-devel</package> - <package>libexpat-devel</package> - <package>libext2fs-devel</package> - <package>libfarsight-0_1-3</package> - <package>libffi-devel</package> - <package>libffi43</package> - <package>libffi43-devel</package> - <package>libflaim-devel</package> - <package>libfprint-devel</package> - <package>libfreebl3</package> - <package>libfreebob</package> - <package>libfreebob-devel</package> - <package>libgadu</package> - <package>libgadu-devel</package> - <package>libgail-gnome</package> - <package>libgail-gnome-devel</package> - <package>libgcj-devel</package> - <package>libgcj43</package> - <package>libgcj43-devel</package> - <package>libgcj43-jar</package> - <package>libgcj_bc43</package> - <package>libgcrypt-devel</package> - <package>libgda-3_0-3</package> - <package>libgda-3_0-devel</package> - <package>libgdiplus0</package> - <package>libgegl-0_0-0</package> - <package>libgeoclue0</package> - <package>libgfortran46</package> - <package>libggz2</package> - <package>libggz2-devel</package> - <package>libgimpprint</package> - <package>libgimpprint-devel</package> - <package>libglade2</package> - <package>libglade2-devel</package> - <package>libglademm</package> - <package>libglademm-2_4-1</package> - <package>libglademm-devel</package> - <package>libgladeui-1-9</package> - <package>libgladeui-1_0-devel</package> - <package>libgmime-2_0-3</package> - <package>libgmime-2_4-2</package> - <package>libgmm++-devel</package> - <package>libgnome</package> - <package>libgnome-certauth0</package> - <package>libgnome-desktop-2-11</package> - <package>libgnome-devel</package> - <package>libgnome-lang</package> - <package>libgnome-menu2</package> - <package>libgnome-window-settings1</package> - <package>libgnomecanvas</package> - <package>libgnomecanvas-devel</package> - <package>libgnomecanvas-lang</package> - <package>libgnomecanvasmm</package> - <package>libgnomecanvasmm-devel</package> - <package>libgnomecups</package> - <package>libgnomecups-devel</package> - <package>libgnomecups-lang</package> - <package>libgnomedb</package> - <package>libgnomedb-devel</package> - <package>libgnomedb-lang</package> - <package>libgnomekbd</package> - <package>libgnomekbd-devel</package> - <package>libgnomekbd-lang</package> - <package>libgnomeprint</package> - <package>libgnomeprint-devel</package> - <package>libgnomeprint-lang</package> - <package>libgnomeprintui</package> - <package>libgnomeprintui-devel</package> - <package>libgnomeprintui-lang</package> - <package>libgnomesu</package> - <package>libgnomesu-devel</package> - <package>libgnomesu-lang</package> - <package>libgnomesu0</package> - <package>libgnomeui</package> - <package>libgnomeui-devel</package> - <package>libgnomeui-lang</package> - <package>libgnomevfsmm-2_6-1</package> - <package>libgnutls-devel</package> - <package>libgnutls-extra-devel</package> - <package>libgnutls-extra26</package> - <package>libgoocanvas3</package> - <package>libgpg-error-devel</package> - <package>libgpgme-devel</package> - <package>libgphoto2-devel</package> - <package>libgpod-devel</package> - <package>libgsf</package> - <package>libgsf-1-114</package> - <package>libgsf-devel</package> - <package>libgsf-gnome</package> - <package>libgsm-devel</package> - <package>libgsm1</package> - <package>libgssglue-devel</package> - <package>libgstapp-0_10-0</package> - <package>libgstinterfaces-0_10-0</package> - <package>libgstreamer-0_10-0</package> - <package>libgtk-vnc-1_0-0</package> - <package>libgtkhtml</package> - <package>libgtkhtml-devel</package> - <package>libgtksourceview-2_0-0</package> - <package>libgtop</package> - <package>libgtop-2_0-7</package> - <package>libgtop-devel</package> - <package>libgtop-lang</package> - <package>libgudev-1_0-0</package> - <package>libgweather</package> - <package>libgweather-devel</package> - <package>libgweather-lang</package> - <package>libgweather1</package> - <package>libhangul</package> - <package>libhangul-devel</package> - <package>libhowl0</package> - <package>libical-devel</package> - <package>libical0</package> - <package>libicu-devel</package> - <package>libid3tag</package> - <package>libid3tag-devel</package> - <package>libidl-devel</package> - <package>libidn-devel</package> - <package>libiec61883</package> - <package>libiec61883-devel</package> - <package>libieee1284</package> - <package>libiniparser-devel</package> - <package>libiniparser0</package> - <package>libiptcdata</package> - <package>libiptcdata-devel</package> - <package>libiptcdata0</package> - <package>libiso9660-5</package> - <package>libiterm</package> - <package>libiterm-devel</package> - <package>libjack-devel</package> - <package>libjack0</package> - <package>libjasper</package> - <package>libjasper-devel</package> - <package>libjingle-0_3-0</package> - <package>libjingle-devel</package> - <package>libjpeg-devel</package> - <package>libkcal</package> - <package>libkcal-devel</package> - <package>libkcal2</package> - <package>libkcddb4</package> - <package>libkcddb4-devel</package> - <package>libkcompactdisc4</package> - <package>libkcompactdisc4-devel</package> - <package>libkdcraw3</package> - <package>libkdcraw3-devel</package> - <package>libkdcraw3-lang</package> - <package>libkde4</package> - <package>libkde4-devel</package> - <package>libkdecore4</package> - <package>libkdecore4-devel</package> - <package>libkdepim4</package> - <package>libkdepim4-devel</package> - <package>libkdepimlibs4</package> - <package>libkdepimlibs4-devel</package> - <package>libkexiv2-3</package> - <package>libkexiv2-3-devel</package> - <package>libkexiv2-7</package> - <package>libkipi-devel</package> - <package>libkipi6</package> - <package>libkmime-devel</package> - <package>libkmime2</package> - <package>libknotificationitem-1-1</package> - <package>libkonq-devel</package> - <package>libkonq5</package> - <package>libksba-devel</package> - <package>libktnef-devel</package> - <package>libktnef1</package> - <package>liblazy-devel</package> - <package>liblazy1</package> - <package>liblcms-devel</package> - <package>libldapcpp-devel</package> - <package>liblog4c-devel</package> - <package>liblog4c3</package> - <package>libloudmouth-1-0</package> - <package>liblpsolve55</package> - <package>liblua5_1</package> - <package>libmalaga-devel</package> - <package>libmalaga7</package> - <package>libmcrypt</package> - <package>libmcrypt-devel</package> - <package>libmikmod</package> - <package>libmikmod-devel</package> - <package>libmm-devel</package> - <package>libmm14</package> - <package>libmng-devel</package> - <package>libmpcdec-devel</package> - <package>libmpcdec5</package> - <package>libmspack-devel</package> - <package>libmtp-devel</package> - <package>libmtp8</package> - <package>libmusicbrainz-devel</package> - <package>libmusicbrainz3-6</package> - <package>libmusicbrainz3-devel</package> - <package>libmusicbrainz4</package> - <package>libmysqlclient-devel</package> - <package>libmysqlclient15</package> - <package>libmysqlclient_r15</package> - <package>libneon-devel</package> - <package>libneon27</package> - <package>libnetapi-devel</package> - <package>libnetapi0</package> - <package>libnetcontrol0</package> - <package>libnetpbm-devel</package> - <package>libnetpbm10</package> - <package>libnewt0_52</package> - <package>libnjb</package> - <package>libnjb-devel</package> - <package>libnjb5</package> - <package>libnl-devel</package> - <package>libnotify</package> - <package>libnotify-devel</package> - <package>libnotify1</package> - <package>libnscd-devel</package> - <package>libnsssharedhelper0</package> - <package>libnuma-devel</package> - <package>libofa-devel</package> - <package>libofa0</package> - <package>libogg-devel</package> - <package>libogg0</package> - <package>liboil</package> - <package>liboil-devel</package> - <package>libopenbabel-devel</package> - <package>libopenbabel3</package> - <package>libopencdk-devel</package> - <package>libopencdk10</package> - <package>libopenraw-devel</package> - <package>libopenraw1</package> - <package>libopenssl-devel</package> - <package>libopensync</package> - <package>libopensync-devel</package> - <package>libopensync-plugin-evolution2</package> - <package>libopensync-plugin-evolution2-devel</package> - <package>libopensync-plugin-palm</package> - <package>libopensync-plugin-palm-devel</package> - <package>liborc-0_4-0</package> - <package>libosip2</package> - <package>libosip2-devel</package> - <package>libotf</package> - <package>libotf-devel</package> - <package>libotr-devel</package> - <package>libotr2</package> - <package>libp11-1</package> - <package>libp11-devel</package> - <package>libpackagekit-glib10</package> - <package>libpackagekit-glib10-devel</package> - <package>libpangomm-1_4-1</package> - <package>libpcap-devel</package> - <package>libpciaccess0</package> - <package>libpciaccess0-devel</package> - <package>libphonon4</package> - <package>libpisock-devel</package> - <package>libpisock9</package> - <package>libpisync-devel</package> - <package>libpisync1</package> - <package>libpixman-1-0-devel</package> - <package>libpkcs11-helper1</package> - <package>libpng-devel</package> - <package>libpolkit-qt0</package> - <package>libpoppler-devel</package> - <package>libpoppler-glib-devel</package> - <package>libpoppler-glib4</package> - <package>libpoppler-qt2</package> - <package>libpoppler-qt3-devel</package> - <package>libpoppler-qt4-3</package> - <package>libpoppler-qt4-devel</package> - <package>libpoppler5</package> - <package>libpst4</package> - <package>libpt2</package> - <package>libpt2-devel</package> - <package>libpulse-browse0</package> - <package>libpulse-devel</package> - <package>libpulse-mainloop-glib0</package> - <package>libpulse0</package> - <package>libpurple</package> - <package>libpurple-devel</package> - <package>libpurple-lang</package> - <package>libqca2</package> - <package>libqca2-devel</package> - <package>libqdialogsolver1</package> - <package>libqdialogsolver1-devel</package> - <package>libqimageblitz-devel</package> - <package>libqimageblitz4</package> - <package>libqscintilla-devel</package> - <package>libqscintilla2-5</package> - <package>libqt4</package> - <package>libqt4-devel</package> - <package>libqt4-qt3support</package> - <package>libqt4-sql</package> - <package>libqt4-sql-mysql</package> - <package>libqt4-sql-postgresql</package> - <package>libqt4-sql-sqlite</package> - <package>libqt4-sql-unixODBC</package> - <package>libqt4-x11</package> - <package>libqtpod-devel</package> - <package>libqtpod0</package> - <package>libquadmath46</package> - <package>libquicktime</package> - <package>libquicktime-devel</package> - <package>libraptor-devel</package> - <package>libraptor1</package> - <package>librasqal-devel</package> - <package>librasqal1</package> - <package>libraw1394-11</package> - <package>libraw1394-8</package> - <package>libraw1394-devel</package> - <package>libredland-devel</package> - <package>libredland0</package> - <package>libreiserfs-devel</package> - <package>libreoffice</package> - <package>libreoffice-base</package> - <package>libreoffice-branding-SLED</package> - <package>libreoffice-branding-upstream</package> - <package>libreoffice-calc</package> - <package>libreoffice-icon-themes</package> - <package>libreoffice-impress</package> - <package>libreoffice-sdk</package> - <package>libreoffice-writer</package> - <package>librsvg</package> - <package>librsvg-devel</package> - <package>libsamplerate</package> - <package>libsamplerate-devel</package> - <package>libsatsolver-devel</package> - <package>libsblim-cmpiutil1</package> - <package>libselinux-devel</package> - <package>libsemanage-devel</package> - <package>libsemanage1</package> - <package>libsensors3-devel</package> - <package>libsensors4</package> - <package>libsepol-devel</package> - <package>libsexy</package> - <package>libsexy-devel</package> - <package>libshout-devel</package> - <package>libshout3</package> - <package>libsidplay1</package> - <package>libsidplay1-devel</package> - <package>libsigc++2</package> - <package>libsigc++2-devel</package> - <package>libslab-lang</package> - <package>libslab0</package> - <package>libsmbclient-devel</package> - <package>libsmbios-devel</package> - <package>libsmbsharemodes-devel</package> - <package>libsmbsharemodes0</package> - <package>libsndfile</package> - <package>libsndfile-devel</package> - <package>libsoprano-devel</package> - <package>libsoprano4</package> - <package>libsoup-devel</package> - <package>libspectre-devel</package> - <package>libspectre1</package> - <package>libspeex</package> - <package>libssh2-devel</package> - <package>libstrigi0</package> - <package>libstroke</package> - <package>libstroke-devel</package> - <package>libsyncml-devel</package> - <package>libsyncml0</package> - <package>libtalloc-devel</package> - <package>libtasn1-devel</package> - <package>libtdb-devel</package> - <package>libtelepathy</package> - <package>libtelepathy-devel</package> - <package>libtelepathy-glib0</package> - <package>libtheora-devel</package> - <package>libtheora0</package> - <package>libtidy</package> - <package>libtidy-devel</package> - <package>libtiff-devel</package> - <package>libtirpc-devel</package> - <package>libtomoe-gtk0</package> - <package>libtspi1</package> - <package>libtunepimp</package> - <package>libtunepimp-devel</package> - <package>libtunepimp5</package> - <package>libudev-devel</package> - <package>libudf0</package> - <package>libunique-1_0-0</package> - <package>libunwind</package> - <package>libunwind-devel</package> - <package>libupsclient1</package> - <package>libusb-devel</package> - <package>libusbpp-0_1-4</package> - <package>libustr-1_0-1</package> - <package>libustr-devel</package> - <package>libuuid-devel</package> - <package>libvirt-client</package> - <package>libvirt-devel</package> - <package>libvisual</package> - <package>libvisual-devel</package> - <package>libvoikko-devel</package> - <package>libvoikko1</package> - <package>libvorbis</package> - <package>libvorbis-devel</package> - <package>libwavpack1</package> - <package>libwbclient-devel</package> - <package>libwbxml2-0</package> - <package>libwbxml2-devel</package> - <package>libwebkit-1_0-1</package> - <package>libwebkit-1_0-2</package> - <package>libwebkit-devel</package> - <package>libwebkit-lang</package> - <package>libwmf</package> - <package>libwmf-devel</package> - <package>libwmf-gnome</package> - <package>libwnck</package> - <package>libwnck-1-22</package> - <package>libwnck-devel</package> - <package>libwnck-lang</package> - <package>libwpd-0_8-8</package> - <package>libwpd-devel</package> - <package>libwpg-0_1-1</package> - <package>libwpg-devel</package> - <package>libwps-0_1-1</package> - <package>libwps-devel</package> - <package>libwsman-devel</package> - <package>libwsman1</package> - <package>libxcrypt-devel</package> - <package>libxine-devel</package> - <package>libxine1</package> - <package>libxklavier-devel</package> - <package>libxklavier15</package> - <package>libxml2-devel</package> - <package>libxslt-devel</package> - <package>libyajl1</package> - <package>libzio-devel</package> - <package>libzip-devel</package> - <package>libzip1</package> - <package>libzvbi0</package> - <package>libzypp-devel</package> - <package>limal-apparmor-notifications</package> - <package>limal-apparmor-notifications-devel</package> - <package>limal-ca-mgm-devel</package> - <package>limal-devel</package> - <package>limal-devtools</package> - <package>limal-nfs-server-devel</package> - <package>linux-atm-devel</package> - <package>linux-atm-lib</package> - <package>lksctp-tools</package> - <package>lksctp-tools-devel</package> - <package>loudmouth-devel</package> - <package>lua</package> - <package>lua-devel</package> - <package>lzo-devel</package> - <package>m17n-db</package> - <package>m17n-lib</package> - <package>m17n-lib-devel</package> - <package>malaga-suomi</package> - <package>meanwhile</package> - <package>meanwhile-devel</package> - <package>metacity</package> - <package>metacity-devel</package> - <package>metacity-lang</package> - <package>mhash</package> - <package>mhash-devel</package> - <package>misc-console-font</package> - <package>mono-addins</package> - <package>mono-basic</package> - <package>mono-core</package> - <package>mono-data</package> - <package>mono-data-oracle</package> - <package>mono-data-sqlite</package> - <package>mono-devel</package> - <package>mono-extras</package> - <package>mono-jscript</package> - <package>mono-tools</package> - <package>mono-wcf</package> - <package>mono-web</package> - <package>mono-winforms</package> - <package>mono-zeroconf</package> - <package>mono-zeroconf-provider-avahi</package> - <package>monodevelop</package> - <package>monodoc-core</package> - <package>mozilla-nspr</package> - <package>mozilla-nspr-devel</package> - <package>mozilla-nss</package> - <package>mozilla-nss-devel</package> - <package>mozilla-xulrunner192</package> - <package>mozilla-xulrunner192-gnome</package> - <package>mpfr-devel</package> - <package>mpi-selector</package> - <package>mpich</package> - <package>mpich-devel</package> - <package>mysql</package> - <package>mysql-client</package> - <package>nagios</package> - <package>nagios-devel</package> - <package>nagios-www</package> - <package>nant</package> - <package>nautilus</package> - <package>nautilus-cd-burner</package> - <package>nautilus-cd-burner-devel</package> - <package>nautilus-cd-burner-lang</package> - <package>nautilus-devel</package> - <package>nautilus-lang</package> - <package>ndesk-dbus</package> - <package>ndesk-dbus-glib</package> - <package>ndesk-dbus-glib-devel</package> - <package>net-snmp</package> - <package>net-snmp-devel</package> - <package>netatalk</package> - <package>netatalk-devel</package> - <package>netcat-openbsd</package> - <package>newt</package> - <package>newt-devel</package> - <package>newt-static</package> - <package>nfsidmap-devel</package> - <package>notification-daemon</package> - <package>notification-daemon-lang</package> - <package>notify-sharp</package> - <package>nss-mdns</package> - <package>nss-shared-helper-devel</package> - <package>nut</package> - <package>nut-classic</package> - <package>nut-devel</package> - <package>opal</package> - <package>opal-devel</package> - <package>openCryptoki</package> - <package>openCryptoki-64bit</package> - <package>openCryptoki-devel</package> - <package>openct-devel</package> - <package>openhpi</package> - <package>openhpi-daemon</package> - <package>openhpi-devel</package> - <package>openjade</package> - <package>openjade-devel</package> - <package>openldap2-devel</package> - <package>openmotif-devel</package> - <package>openmotif-libs</package> - <package>openmpi</package> - <package>openobex-devel</package> - <package>openobex-glib-devel</package> - <package>opensc-devel</package> - <package>openslp-devel</package> - <package>opensp</package> - <package>opensp-devel</package> - <package>openwsman-client</package> - <package>openwsman-server</package> - <package>orbit</package> - <package>orbit-devel</package> - <package>orbit2-devel</package> - <package>oxygen-icon-theme</package> - <package>oxygen-icon-theme-scalable</package> - <package>ozerocdoff</package> - <package>pam-devel</package> - <package>pango-devel</package> - <package>pangomm-devel</package> - <package>parted-devel</package> - <package>patchutils</package> - <package>pciutils-devel</package> - <package>pcre-devel</package> - <package>pcsc-acr38</package> - <package>pcsc-acr38-devel</package> - <package>pcsc-lite-devel</package> - <package>perl-32bit</package> - <package>perl-Crypt-OpenSSL-RSA</package> - <package>perl-Mail-DKIM</package> - <package>perl-MailTools</package> - <package>perl-Net-DNS</package> - <package>perl-Net-IP</package> - <package>perl-NetAddr-IP</package> - <package>perl-SNMP</package> - <package>perl-Tie-IxHash</package> - <package>perl-Tk</package> - <package>perl-Tk-devel</package> - <package>perl-spamassassin</package> - <package>phonon</package> - <package>phonon-backend-gstreamer-0_10</package> - <package>phonon-devel</package> - <package>php5</package> - <package>php5-ctype</package> - <package>php5-devel</package> - <package>php5-dom</package> - <package>php5-hash</package> - <package>php5-iconv</package> - <package>php5-json</package> - <package>php5-pdo</package> - <package>php5-sqlite</package> - <package>php5-suhosin</package> - <package>php5-tokenizer</package> - <package>php5-xmlreader</package> - <package>php5-xmlwriter</package> - <package>php53</package> - <package>php53-ctype</package> - <package>php53-dom</package> - <package>php53-iconv</package> - <package>php53-json</package> - <package>php53-tokenizer</package> - <package>php53-xmlreader</package> - <package>php53-xmlwriter</package> - <package>pidgin</package> - <package>pidgin-devel</package> - <package>pilot-link</package> - <package>pkcs11-helper</package> - <package>pkcs11-helper-devel</package> - <package>planner</package> - <package>planner-devel</package> - <package>planner-lang</package> - <package>plasma-addons</package> - <package>plasma-theme-aya</package> - <package>plasmoid-networkmanagement</package> - <package>plasmoid-quickaccess</package> - <package>plotutils</package> - <package>poppler-data</package> - <package>poppler-tools</package> - <package>popt-devel</package> - <package>portmap</package> - <package>postfix-devel</package> - <package>postgresql-devel</package> - <package>postgresql-libs</package> - <package>ppp-devel</package> - <package>ppp-userpass</package> - <package>pstoedit</package> - <package>pstoedit-devel</package> - <package>pulseaudio</package> - <package>pulseaudio-esound-compat</package> - <package>pulseaudio-lang</package> - <package>puppet</package> - <package>python-cairo</package> - <package>python-cairo-devel</package> - <package>python-devel</package> - <package>python-gnome</package> - <package>python-gnome-devel</package> - <package>python-gobject2</package> - <package>python-gobject2-devel</package> - <package>python-gtk</package> - <package>python-gtk-devel</package> - <package>python-gtkglext</package> - <package>python-gtkglext-devel</package> - <package>python-gtksourceview</package> - <package>python-gtksourceview-devel</package> - <package>python-numeric</package> - <package>python-numpy</package> - <package>python-orbit</package> - <package>python-orbit-devel</package> - <package>pyxml</package> - <package>qt3</package> - <package>qt3-devel</package> - <package>quagga</package> - <package>quagga-devel</package> - <package>quilt</package> - <package>raptor</package> - <package>rarian</package> - <package>rarian-devel</package> - <package>re2c</package> - <package>readline-devel</package> - <package>recode-devel</package> - <package>rpm-devel</package> - <package>rrdtool</package> - <package>rrdtool-devel</package> - <package>rsyslog</package> - <package>ruby</package> - <package>rubygems</package> - <package>ruby-devel</package> - <package>ruby-doc-html</package> - <package>ruby-doc-ri</package> - <package>ruby-examples</package> - <package>ruby-fcgi</package> - <package>ruby-mysql</package> - <package>ruby-selinux</package> - <package>ruby-test-suite</package> - <package>ruby-tk</package> - <package>sablot</package> - <package>sablot-devel</package> - <package>samba-devel</package> - <package>sane-backends</package> - <package>sane-frontends</package> - <package>sax2-libsax</package> - <package>sax2-libsax-devel</package> - <package>sax2-libsax-perl</package> - <package>sax2-tools</package> - <package>sblim-cmpi-base</package> - <package>sblim-cmpi-base-devel</package> - <package>sblim-cmpi-devel</package> - <package>sblim-cmpiutil-devel</package> - <package>sblim-indication_helper</package> - <package>sblim-sfcb</package> - <package>sblim-sfcc</package> - <package>sblim-sfcc-devel</package> - <package>scim</package> - <package>scim-devel</package> - <package>scpm-devel</package> - <package>scrollkeeper</package> - <package>scrollkeeper-lang</package> - <package>seahorse</package> - <package>seahorse-devel</package> - <package>seahorse-lang</package> - <package>sendmail</package> - <package>sendmail-devel</package> - <package>sg3_utils-devel</package> - <package>sgml-skel</package> - <package>shared-mime-info</package> - <package>silc-toolkit</package> - <package>silc-toolkit-devel</package> - <package>slang</package> - <package>slang-devel</package> - <package>soprano</package> - <package>soprano-backend-redland</package> - <package>spamassassin</package> - <package>speex-devel</package> - <package>splashy-devel</package> - <package>sqlite2</package> - <package>sqlite3-devel</package> - <package>startup-notification</package> - <package>startup-notification-devel</package> - <package>strigi</package> - <package>strigi-devel</package> - <package>subversion</package> - <package>subversion-perl</package> - <package>susehelp</package> - <package>susehelp_cz</package> - <package>susehelp_de</package> - <package>susehelp_en</package> - <package>susehelp_es</package> - <package>susehelp_fr</package> - <package>susehelp_hu</package> - <package>susehelp_it</package> - <package>swig</package> - <package>syslogd</package> - <package>t1lib</package> - <package>t1lib-devel</package> - <package>taglib</package> - <package>taglib-devel</package> - <package>taglib-sharp</package> - <package>tango-icon-theme</package> - <package>tcl-devel</package> - <package>tcpd-devel</package> - <package>telepathy-glib-devel</package> - <package>telepathy-mission-control</package> - <package>telepathy-mission-control-devel</package> - <package>texlive-bin-devel</package> - <package>texlive-devel</package> - <package>tk-devel</package> - <package>tla</package> - <package>tn5250</package> - <package>tn5250-devel</package> - <package>tomoe</package> - <package>tomoe-devel</package> - <package>tomoe-gtk</package> - <package>tomoe-gtk-devel</package> - <package>tomoe-gtk-lang</package> - <package>totem-pl-parser</package> - <package>totem-pl-parser-devel</package> - <package>totem-pl-parser-lang</package> - <package>trousers</package> - <package>trousers-devel</package> - <package>tsclient</package> - <package>tsclient-devel</package> - <package>tsclient-lang</package> - <package>uim</package> - <package>uim-devel</package> - <package>unixODBC</package> - <package>unixODBC-devel</package> - <package>unsermake</package> - <package>update-desktop-files</package> - <package>usb_modeswitch</package> - <package>usb_modeswitch-data</package> - <package>valgrind</package> - <package>valgrind-devel</package> - <package>vte</package> - <package>vte-devel</package> - <package>vte-lang</package> - <package>wdiff</package> - <package>webkit-sharp</package> - <package>wireshark</package> - <package>wireshark-devel</package> - <package>wodim-devel</package> - <package>wordcut</package> - <package>wordcut-devel</package> - <package>words</package> - <package>wpa_supplicant</package> - <package>wvstreams</package> - <package>wvstreams-devel</package> - <package>wxGTK-compat</package> - <package>wxGTK-devel</package> - <package>wxGTK-gl</package> - <package>x11-input-wacom</package> - <package>x11-input-wacom-devel</package> - <package>x11-input-wacom-tools</package> - <package>xalan-j2</package> - <package>xaw3d-devel</package> - <package>xbase</package> - <package>xbase-devel</package> - <package>xdelta</package> - <package>xdelta-devel</package> - <package>xdg-menu</package> - <package>xen-devel</package> - <package>xen-libs</package> - <package>xerces-j2</package> - <package>xerces-j2-bootstrap</package> - <package>xerces-j2-xml-apis</package> - <package>xfsprogs-devel</package> - <package>xml-commons-apis-bootstrap</package> - <package>xml-commons-resolver-bootstrap</package> - <package>xml-commons-which-bootstrap</package> - <package>xmlcharent</package> - <package>xorg-x11</package> - <package>xorg-x11-devel</package> - <package>xorg-x11-fonts</package> - <package>xorg-x11-fonts-core</package> - <package>xorg-x11-fonts-devel</package> - <package>xorg-x11-libICE-devel</package> - <package>xorg-x11-libSM-devel</package> - <package>xorg-x11-libX11-devel</package> - <package>xorg-x11-libXau-devel</package> - <package>xorg-x11-libXdmcp-devel</package> - <package>xorg-x11-libXext-devel</package> - <package>xorg-x11-libXfixes-devel</package> - <package>xorg-x11-libXmu-devel</package> - <package>xorg-x11-libXp-devel</package> - <package>xorg-x11-libXpm-devel</package> - <package>xorg-x11-libXprintUtil-devel</package> - <package>xorg-x11-libXrender-devel</package> - <package>xorg-x11-libXt-devel</package> - <package>xorg-x11-libXv-devel</package> - <package>xorg-x11-libfontenc-devel</package> - <package>xorg-x11-libxcb-devel</package> - <package>xorg-x11-libxkbfile-devel</package> - <package>xorg-x11-proto-devel</package> - <package>xorg-x11-server</package> - <package>xorg-x11-util-devel</package> - <package>xorg-x11-xauth</package> - <package>xorg-x11-xtrans-devel</package> - <package>xosd</package> - <package>xosd-devel</package> - <package>xsp</package> - <package>xterm</package> - <package>xz-devel</package> - <package>yast2-core-devel</package> - <package>yast2-devtools</package> - <package>yast2-gtk</package> - <package>yast2-libyui-devel</package> - <package>yast2-ncurses-devel</package> - <package>yast2-qt</package> - <package>yast2-qt-devel</package> - <package>yast2-qt-pkg</package> - <package>yast2-storage-devel</package> - <package>yast2-ycp-ui-bindings-devel</package> - <package>yelp</package> - <package>yelp-lang</package> - <package>zenity</package> - <package>zenity-lang</package> - <package>zlib-devel</package> - <package>zsh</package> - <package>zvbi-devel</package> - </remove-packages> - - </software> - <user_defaults> - <expire></expire> - <group>100</group> - <groups>video,dialout</groups> - <home>/home</home> - <inactive>-1</inactive> - <shell>/bin/bash</shell> - <skel>/etc/skel</skel> - <umask>022</umask> - </user_defaults> - <users config:type="list"> - <user> - <encrypted config:type="boolean">true</encrypted> - <fullname>vagrant</fullname> - <gid>100</gid> - <home>/home/vagrant</home> - <password_settings> - <expire></expire> - <flag></flag> - <inact></inact> - <max>99999</max> - <min>0</min> - <warn>7</warn> - </password_settings> - <shell>/bin/bash</shell> - <uid>1000</uid> - <user_password>$2y$05$NA1Li9ZKJOLRW5mMTXm6/e5r8dltWS5RpDZpvHrI82aLE00V51tdi</user_password> - <username>vagrant</username> - </user> - <user> - <encrypted config:type="boolean">true</encrypted> - <fullname>Games account</fullname> - <gid>100</gid> - <home>/var/games</home> - <password_settings> - <expire></expire> - <flag></flag> - <inact></inact> - <max></max> - <min></min> - <warn></warn> - </password_settings> - <shell>/bin/bash</shell> - <uid>12</uid> - <user_password>*</user_password> - <username>games</username> - </user> - <user> - <encrypted config:type="boolean">true</encrypted> - <fullname>bin</fullname> - <gid>1</gid> - <home>/bin</home> - <password_settings> - <expire></expire> - <flag></flag> - <inact></inact> - <max></max> - <min></min> - <warn></warn> - </password_settings> - <shell>/bin/bash</shell> - <uid>1</uid> - <user_password>*</user_password> - <username>bin</username> - </user> - <user> - <encrypted config:type="boolean">true</encrypted> - <fullname>nobody</fullname> - <gid>65533</gid> - <home>/var/lib/nobody</home> - <password_settings> - <expire></expire> - <flag></flag> - <inact></inact> - <max></max> - <min></min> - <warn></warn> - </password_settings> - <shell>/bin/bash</shell> - <uid>65534</uid> - <user_password>*</user_password> - <username>nobody</username> - </user> - <user> - <encrypted config:type="boolean">true</encrypted> - <fullname>Printing daemon</fullname> - <gid>7</gid> - <home>/var/spool/lpd</home> - <password_settings> - <expire></expire> - <flag></flag> - <inact></inact> - <max></max> - <min></min> - <warn></warn> - </password_settings> - <shell>/bin/bash</shell> - <uid>4</uid> - <user_password>*</user_password> - <username>lp</username> - </user> - <user> - <encrypted config:type="boolean">true</encrypted> - <fullname>User for uuidd</fullname> - <gid>104</gid> - <home>/var/run/uuidd</home> - <password_settings> - <expire></expire> - <flag></flag> - <inact></inact> - <max>99999</max> - <min>0</min> - <warn>7</warn> - </password_settings> - <shell>/bin/false</shell> - <uid>102</uid> - <user_password>*</user_password> - <username>uuidd</username> - </user> - <user> - <encrypted config:type="boolean">true</encrypted> - <fullname>Postfix Daemon</fullname> - <gid>51</gid> - <home>/var/spool/postfix</home> - <password_settings> - <expire></expire> - <flag></flag> - <inact></inact> - <max>99999</max> - <min>0</min> - <warn>7</warn> - </password_settings> - <shell>/bin/false</shell> - <uid>51</uid> - <user_password>*</user_password> - <username>postfix</username> - </user> - <user> - <encrypted config:type="boolean">true</encrypted> - <fullname>Novell Customer Center User</fullname> - <gid>111</gid> - <home>/var/lib/YaST2/suse-ncc-fakehome</home> - <password_settings> - <expire></expire> - <flag></flag> - <inact></inact> - <max>99999</max> - <min>0</min> - <warn>7</warn> - </password_settings> - <shell>/bin/bash</shell> - <uid>106</uid> - <user_password>*</user_password> - <username>suse-ncc</username> - </user> - <user> - <encrypted config:type="boolean">true</encrypted> - <fullname>FTP account</fullname> - <gid>49</gid> - <home>/srv/ftp</home> - <password_settings> - <expire></expire> - <flag></flag> - <inact></inact> - <max></max> - <min></min> - <warn></warn> - </password_settings> - <shell>/bin/bash</shell> - <uid>40</uid> - <user_password>*</user_password> - <username>ftp</username> - </user> - <user> - <encrypted config:type="boolean">true</encrypted> - <fullname>Gnome Display Manager daemon</fullname> - <gid>112</gid> - <home>/var/lib/gdm</home> - <password_settings> - <expire></expire> - <flag></flag> - <inact></inact> - <max>99999</max> - <min>0</min> - <warn>7</warn> - </password_settings> - <shell>/bin/false</shell> - <uid>107</uid> - <user_password>*</user_password> - <username>gdm</username> - </user> - <user> - <encrypted config:type="boolean">true</encrypted> - <fullname>Batch jobs daemon</fullname> - <gid>25</gid> - <home>/var/spool/atjobs</home> - <password_settings> - <expire></expire> - <flag></flag> - <inact></inact> - <max>99999</max> - <min>0</min> - <warn>7</warn> - </password_settings> - <shell>/bin/bash</shell> - <uid>25</uid> - <user_password>*</user_password> - <username>at</username> - </user> - <user> - <encrypted config:type="boolean">true</encrypted> - <fullname>root</fullname> - <gid>0</gid> - <home>/root</home> - <password_settings> - <expire></expire> - <flag></flag> - <inact></inact> - <max></max> - <min></min> - <warn></warn> - </password_settings> - <shell>/bin/bash</shell> - <uid>0</uid> - <user_password>$2y$05$NA1Li9ZKJOLRW5mMTXm6/e5r8dltWS5RpDZpvHrI82aLE00V51tdi</user_password> - <username>root</username> - </user> - <user> - <encrypted config:type="boolean">true</encrypted> - <fullname>Mailer daemon</fullname> - <gid>12</gid> - <home>/var/spool/clientmqueue</home> - <password_settings> - <expire></expire> - <flag></flag> - <inact></inact> - <max></max> - <min></min> - <warn></warn> - </password_settings> - <shell>/bin/false</shell> - <uid>8</uid> - <user_password>*</user_password> - <username>mail</username> - </user> - <user> - <encrypted config:type="boolean">true</encrypted> - <fullname>Daemon</fullname> - <gid>2</gid> - <home>/sbin</home> - <password_settings> - <expire></expire> - <flag></flag> - <inact></inact> - <max></max> - <min></min> - <warn></warn> - </password_settings> - <shell>/bin/bash</shell> - <uid>2</uid> - <user_password>*</user_password> - <username>daemon</username> - </user> - <user> - <encrypted config:type="boolean">true</encrypted> - <fullname>NTP daemon</fullname> - <gid>108</gid> - <home>/var/lib/ntp</home> - <password_settings> - <expire></expire> - <flag></flag> - <inact></inact> - <max>99999</max> - <min>0</min> - <warn>7</warn> - </password_settings> - <shell>/bin/false</shell> - <uid>74</uid> - <user_password>*</user_password> - <username>ntp</username> - </user> - <user> - <encrypted config:type="boolean">true</encrypted> - <fullname>Unix-to-Unix CoPy system</fullname> - <gid>14</gid> - <home>/etc/uucp</home> - <password_settings> - <expire></expire> - <flag></flag> - <inact></inact> - <max></max> - <min></min> - <warn></warn> - </password_settings> - <shell>/bin/bash</shell> - <uid>10</uid> - <user_password>*</user_password> - <username>uucp</username> - </user> - <user> - <encrypted config:type="boolean">true</encrypted> - <fullname>User for D-Bus</fullname> - <gid>101</gid> - <home>/var/run/dbus</home> - <password_settings> - <expire></expire> - <flag></flag> - <inact></inact> - <max></max> - <min>0</min> - <warn>7</warn> - </password_settings> - <shell>/bin/false</shell> - <uid>100</uid> - <user_password>*</user_password> - <username>messagebus</username> - </user> - <user> - <encrypted config:type="boolean">true</encrypted> - <fullname>User for haldaemon</fullname> - <gid>102</gid> - <home>/var/run/hald</home> - <password_settings> - <expire></expire> - <flag></flag> - <inact></inact> - <max></max> - <min>0</min> - <warn>7</warn> - </password_settings> - <shell>/bin/false</shell> - <uid>101</uid> - <user_password>*</user_password> - <username>haldaemon</username> - </user> - <user> - <encrypted config:type="boolean">true</encrypted> - <fullname>WWW daemon apache</fullname> - <gid>8</gid> - <home>/var/lib/wwwrun</home> - <password_settings> - <expire></expire> - <flag></flag> - <inact></inact> - <max></max> - <min></min> - <warn></warn> - </password_settings> - <shell>/bin/false</shell> - <uid>30</uid> - <user_password>*</user_password> - <username>wwwrun</username> - </user> - <user> - <encrypted config:type="boolean">true</encrypted> - <fullname>Manual pages viewer</fullname> - <gid>62</gid> - <home>/var/cache/man</home> - <password_settings> - <expire></expire> - <flag></flag> - <inact></inact> - <max></max> - <min></min> - <warn></warn> - </password_settings> - <shell>/bin/bash</shell> - <uid>13</uid> - <user_password>*</user_password> - <username>man</username> - </user> - <user> - <encrypted config:type="boolean">true</encrypted> - <fullname>PolicyKit</fullname> - <gid>107</gid> - <home>/var/run/PolicyKit</home> - <password_settings> - <expire></expire> - <flag></flag> - <inact></inact> - <max>99999</max> - <min>0</min> - <warn>7</warn> - </password_settings> - <shell>/bin/false</shell> - <uid>104</uid> - <user_password>*</user_password> - <username>polkituser</username> - </user> - <user> - <encrypted config:type="boolean">true</encrypted> - <fullname>News system</fullname> - <gid>13</gid> - <home>/etc/news</home> - <password_settings> - <expire></expire> - <flag></flag> - <inact></inact> - <max></max> - <min></min> - <warn></warn> - </password_settings> - <shell>/bin/bash</shell> - <uid>9</uid> - <user_password>*</user_password> - <username>news</username> - </user> - <user> - <fullname>SSH daemon</fullname> - <gid>65</gid> - <home>/var/lib/sshd</home> - <shell>/bin/false</shell> - <uid>71</uid> - <username>sshd</username> - </user> - <user> - <encrypted config:type="boolean">true</encrypted> - <fullname>PulseAudio daemon</fullname> - <gid>109</gid> - <home>/var/lib/pulseaudio</home> - <password_settings> - <expire></expire> - <flag></flag> - <inact></inact> - <max>99999</max> - <min>0</min> - <warn>7</warn> - </password_settings> - <shell>/bin/false</shell> - <uid>105</uid> - <user_password>*</user_password> - <username>pulse</username> - </user> - </users> -</profile> diff --git a/definitions/sles-11-sp2/cleanup.sh b/definitions/sles-11-sp2/cleanup.sh deleted file mode 100644 index 02bc7e322..000000000 --- a/definitions/sles-11-sp2/cleanup.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/bash -eux - -# remove zypper locks on removed packages to avoid later dependency problems -zypper --non-interactive rl \* -# zypper --non-interactive remove `rpm -qa virtualbox-guest-*` >/dev/null 2>&1 -# Add an online copy of the SLES DVD1 as a software repository, instead of the mounted DVD -zypper removerepo 'SUSE-Linux-Enterprise-Server-11-SP2 11.2.2-1.234' -zypper addrepo 'http://demeter.uni-regensburg.de/SLES11SP2-x64/DVD1/' 'SLES11SP2-x64 DVD1 Online' -zypper refresh diff --git a/definitions/sles-11-sp2/definition.rb b/definitions/sles-11-sp2/definition.rb deleted file mode 100644 index 413e26e73..000000000 --- a/definitions/sles-11-sp2/definition.rb +++ /dev/null @@ -1,12 +0,0 @@ -require File.dirname(__FILE__) + "/../.suse/session.rb" - -iso = "SLES-11-SP2-DVD-x86_64-GM-DVD1.iso" - -session = - SUSE_SESSION.merge( :memory_size=> '480', - :iso_download_instructions => "Download evaluation version from http://download.novell.com/SummaryFree.jsp?buildid=h0AOp5AT-18~", - :iso_file => iso, - :iso_md5 => "461d82ae6e15062b0807c1338f040497", - :iso_src => "") - -Veewee::Session.declare session diff --git a/definitions/sles-11-sp2/minimize.sh b/definitions/sles-11-sp2/minimize.sh deleted file mode 120000 index b3632ccbc..000000000 --- a/definitions/sles-11-sp2/minimize.sh +++ /dev/null @@ -1 +0,0 @@ -../.common/minimize.sh \ No newline at end of file diff --git a/definitions/sles-11-sp2/sshd.sh b/definitions/sles-11-sp2/sshd.sh deleted file mode 120000 index f353f2d00..000000000 --- a/definitions/sles-11-sp2/sshd.sh +++ /dev/null @@ -1 +0,0 @@ -../.common/sshd.sh \ No newline at end of file diff --git a/definitions/sles-11-sp2/sudoers.sh b/definitions/sles-11-sp2/sudoers.sh deleted file mode 120000 index 18d9cf04d..000000000 --- a/definitions/sles-11-sp2/sudoers.sh +++ /dev/null @@ -1 +0,0 @@ -../.suse/sudoers.sh \ No newline at end of file diff --git a/definitions/sles-11-sp2/vagrant.sh b/definitions/sles-11-sp2/vagrant.sh deleted file mode 120000 index 702949639..000000000 --- a/definitions/sles-11-sp2/vagrant.sh +++ /dev/null @@ -1 +0,0 @@ -../.common/vagrant.sh \ No newline at end of file diff --git a/definitions/sles-11-sp3-i386/autoinst.xml b/definitions/sles-11-sp3-i386/autoinst.xml deleted file mode 100644 index 1277f42a7..000000000 --- a/definitions/sles-11-sp3-i386/autoinst.xml +++ /dev/null @@ -1,2569 +0,0 @@ -<?xml version="1.0"?> -<!DOCTYPE profile> -<profile xmlns="http://www.suse.com/1.0/yast2ns" xmlns:config="http://www.suse.com/1.0/configns"> - <add-on> - <add_on_products config:type="list"> - <listentry> - <media_url><![CDATA[http://demeter.uni-regensburg.de/SLE11SP3-SDK-x86/DVD1/]]></media_url> - <product>sle-sdk</product> - <product_dir>/</product_dir> - </listentry> - </add_on_products> - </add-on> - <bootloader> - <device_map config:type="list"> - <device_map_entry> - <firmware>hd0</firmware> - <linux>/dev/sda</linux> - </device_map_entry> - </device_map> - <global> - <activate>true</activate> - <boot_root>true</boot_root> - <default>SUSE Linux Enterprise Server 11 SP3 - 3.0.76-0.11</default> - <generic_mbr>true</generic_mbr> - <gfxmenu>/boot/message</gfxmenu> - <lines_cache_id>2</lines_cache_id> - <timeout config:type="integer">8</timeout> - </global> - <initrd_modules config:type="list"> - <initrd_module> - <module>ahci</module> - </initrd_module> - <initrd_module> - <module>ata_piix</module> - </initrd_module> - <initrd_module> - <module>ata_generic</module> - </initrd_module> - <initrd_module> - <module>jbd</module> - </initrd_module> - <initrd_module> - <module>mbcache</module> - </initrd_module> - <initrd_module> - <module>ext3</module> - </initrd_module> - </initrd_modules> - <loader_type>grub</loader_type> - <sections config:type="list"> - <section> - <append>resume=/dev/sda1 splash=silent crashkernel=128M-:64M showopts</append> - <image>(hd0,1)/boot/vmlinuz-3.0.76-0.11-default</image> - <initial>1</initial> - <initrd>(hd0,1)/boot/initrd-3.0.76-0.11-default</initrd> - <lines_cache_id>0</lines_cache_id> - <name>SUSE Linux Enterprise Server 11 SP3 - 3.0.76-0.11</name> - <original_name>linux</original_name> - <root>/dev/sda2</root> - <type>image</type> - <vgamode>0x314</vgamode> - </section> - <section> - <append>showopts ide=nodma apm=off noresume edd=off powersaved=off nohz=off highres=off processor.max_cstate=1 nomodeset x11failsafe</append> - <image>(hd0,1)/boot/vmlinuz-3.0.76-0.11-default</image> - <initrd>(hd0,1)/boot/initrd-3.0.76-0.11-default</initrd> - <lines_cache_id>1</lines_cache_id> - <name>Failsafe -- SUSE Linux Enterprise Server 11 SP3 - 3.0.76-0.11</name> - <original_name>failsafe</original_name> - <root>/dev/sda2</root> - <type>image</type> - <vgamode>0x314</vgamode> - </section> - </sections> - </bootloader> - <ca_mgm> - <CAName>YaST_Default_CA</CAName> - <ca_commonName>YaST Default CA (vagrant-sles-11sp3-x86)</ca_commonName> - <country>US</country> - <locality></locality> - <organisation></organisation> - <organisationUnit></organisationUnit> - <password>ENTER PASSWORD HERE</password> - <server_commonName>vagrant-sles-11sp3-x86.vagrantup.com</server_commonName> - <server_email>postmaster@vagrantup.com</server_email> - <state></state> - <takeLocalServerName config:type="boolean">false</takeLocalServerName> - </ca_mgm> - <deploy_image> - <image_installation config:type="boolean">false</image_installation> - </deploy_image> - <general> - <ask-list config:type="list"/> - <mode> - <confirm config:type="boolean">false</confirm> - </mode> - <mouse> - <id>none</id> - </mouse> - <proposals config:type="list"/> - <signature-handling> - <accept_file_without_checksum config:type="boolean">true</accept_file_without_checksum> - <accept_non_trusted_gpg_key config:type="boolean">true</accept_non_trusted_gpg_key> - <accept_unknown_gpg_key config:type="boolean">true</accept_unknown_gpg_key> - <accept_unsigned_file config:type="boolean">true</accept_unsigned_file> - <accept_verification_failed config:type="boolean">false</accept_verification_failed> - <import_gpg_key config:type="boolean">true</import_gpg_key> - </signature-handling> - <storage/> - </general> - <groups config:type="list"> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>100</gid> - <group_password>x</group_password> - <groupname>users</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>19</gid> - <group_password>x</group_password> - <groupname>floppy</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>1</gid> - <group_password>x</group_password> - <groupname>bin</groupname> - <userlist>daemon</userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>41</gid> - <group_password>x</group_password> - <groupname>xok</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>65533</gid> - <group_password>x</group_password> - <groupname>nobody</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>43</gid> - <group_password>x</group_password> - <groupname>modem</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>5</gid> - <group_password>x</group_password> - <groupname>tty</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>7</gid> - <group_password>x</group_password> - <groupname>lp</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>104</gid> - <group_password>!</group_password> - <groupname>uuidd</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>51</gid> - <group_password>!</group_password> - <groupname>postfix</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>112</gid> - <group_password>!</group_password> - <groupname>gdm</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>65534</gid> - <group_password>x</group_password> - <groupname>nogroup</groupname> - <userlist>nobody</userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>101</gid> - <group_password>!</group_password> - <groupname>messagebus</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>59</gid> - <group_password>!</group_password> - <groupname>maildrop</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>33</gid> - <group_password>x</group_password> - <groupname>video</groupname> - <userlist>vagrant</userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>3</gid> - <group_password>x</group_password> - <groupname>sys</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>15</gid> - <group_password>x</group_password> - <groupname>shadow</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>20</gid> - <group_password>x</group_password> - <groupname>cdrom</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>21</gid> - <group_password>x</group_password> - <groupname>console</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>42</gid> - <group_password>x</group_password> - <groupname>trusted</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>102</gid> - <group_password>!</group_password> - <groupname>haldaemon</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>106</gid> - <group_password>!</group_password> - <groupname>puppet</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>16</gid> - <group_password>x</group_password> - <groupname>dialout</groupname> - <userlist>vagrant</userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>107</gid> - <group_password>!</group_password> - <groupname>polkituser</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>10</gid> - <group_password>x</group_password> - <groupname>wheel</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>109</gid> - <group_password>!</group_password> - <groupname>pulse</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>8</gid> - <group_password>x</group_password> - <groupname>www</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>40</gid> - <group_password>x</group_password> - <groupname>games</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>6</gid> - <group_password>x</group_password> - <groupname>disk</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>17</gid> - <group_password>x</group_password> - <groupname>audio</groupname> - <userlist>pulse</userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>111</gid> - <group_password>!</group_password> - <groupname>suse-ncc</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>49</gid> - <group_password>x</group_password> - <groupname>ftp</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>103</gid> - <group_password>!</group_password> - <groupname>tape</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>25</gid> - <group_password>!</group_password> - <groupname>at</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>9</gid> - <group_password>x</group_password> - <groupname>kmem</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>32</gid> - <group_password>x</group_password> - <groupname>public</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>12</gid> - <group_password>x</group_password> - <groupname>mail</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>0</gid> - <group_password>x</group_password> - <groupname>root</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>2</gid> - <group_password>x</group_password> - <groupname>daemon</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>105</gid> - <group_password>!</group_password> - <groupname>sfcb</groupname> - <userlist>root</userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>108</gid> - <group_password>!</group_password> - <groupname>ntp</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>14</gid> - <group_password>x</group_password> - <groupname>uucp</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>110</gid> - <group_password>!</group_password> - <groupname>pulse-access</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>71</gid> - <group_password>!</group_password> - <groupname>ntadmin</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>62</gid> - <group_password>x</group_password> - <groupname>man</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>22</gid> - <group_password>x</group_password> - <groupname>utmp</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>13</gid> - <group_password>x</group_password> - <groupname>news</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>65</gid> - <group_password>!</group_password> - <groupname>sshd</groupname> - <userlist></userlist> - </group> - </groups> - <host> - <hosts config:type="list"> - <hosts_entry> - <host_address>127.0.0.1</host_address> - <names config:type="list"> - <name>localhost</name> - </names> - </hosts_entry> - <hosts_entry> - <host_address>::1</host_address> - <names config:type="list"> - <name>localhost ipv6-localhost ipv6-loopback</name> - </names> - </hosts_entry> - <hosts_entry> - <host_address>fe00::0</host_address> - <names config:type="list"> - <name>ipv6-localnet</name> - </names> - </hosts_entry> - <hosts_entry> - <host_address>ff00::0</host_address> - <names config:type="list"> - <name>ipv6-mcastprefix</name> - </names> - </hosts_entry> - <hosts_entry> - <host_address>ff02::1</host_address> - <names config:type="list"> - <name>ipv6-allnodes</name> - </names> - </hosts_entry> - <hosts_entry> - <host_address>ff02::2</host_address> - <names config:type="list"> - <name>ipv6-allrouters</name> - </names> - </hosts_entry> - <hosts_entry> - <host_address>ff02::3</host_address> - <names config:type="list"> - <name>ipv6-allhosts</name> - </names> - </hosts_entry> - </hosts> - </host> - <login_settings/> - <networking> - <dhcp_options> - <dhclient_client_id></dhclient_client_id> - <dhclient_hostname_option>AUTO</dhclient_hostname_option> - </dhcp_options> - <dns> - <dhcp_hostname config:type="boolean">false</dhcp_hostname> - <domain>vagrantup.com</domain> - <hostname>vagrant-sles-11sp3-x86</hostname> - <resolv_conf_policy>auto</resolv_conf_policy> - <searchlist config:type="list"> - <search>vagrantup.com</search> - </searchlist> - <write_hostname config:type="boolean">true</write_hostname> - </dns> - <interfaces config:type="list"> - <interface> - <bootproto>dhcp</bootproto> - <device>eth0</device> - <name>82540EM Gigabit Ethernet Controller</name> - <startmode>auto</startmode> - <usercontrol>no</usercontrol> - </interface> - </interfaces> - <managed config:type="boolean">false</managed> - <net-udev config:type="list"> - <rule> - <name>eth0</name> - <rule>KERNELS</rule> - <value>0000:00:03.0</value> - </rule> - </net-udev> - <routing> - <ip_forward config:type="boolean">false</ip_forward> - </routing> - </networking> - <partitioning config:type="list"> - <drive> - <device>/dev/sda</device> - <initialize config:type="boolean">true</initialize> - <partitions config:type="list"> - <partition> - <create config:type="boolean">true</create> - <crypt_fs config:type="boolean">false</crypt_fs> - <filesystem config:type="symbol">swap</filesystem> - <format config:type="boolean">true</format> - <fstopt>defaults</fstopt> - <loop_fs config:type="boolean">false</loop_fs> - <mount>swap</mount> - <mountby config:type="symbol">device</mountby> - <partition_id config:type="integer">130</partition_id> - <partition_nr config:type="integer">1</partition_nr> - <raid_options/> - <resize config:type="boolean">false</resize> - <size>1561492992</size> - </partition> - <partition> - <create config:type="boolean">true</create> - <crypt_fs config:type="boolean">false</crypt_fs> - <filesystem config:type="symbol">ext3</filesystem> - <format config:type="boolean">true</format> - <fstopt>acl,user_xattr</fstopt> - <loop_fs config:type="boolean">false</loop_fs> - <mount>/</mount> - <mountby config:type="symbol">device</mountby> - <partition_id config:type="integer">131</partition_id> - <partition_nr config:type="integer">2</partition_nr> - <raid_options/> - <resize config:type="boolean">false</resize> - <size>19895844352</size> - </partition> - </partitions> - <pesize></pesize> - <type config:type="symbol">CT_DISK</type> - <use>all</use> - </drive> - </partitioning> - <report> - <errors> - <log config:type="boolean">true</log> - <show config:type="boolean">true</show> - <timeout config:type="integer">0</timeout> - </errors> - <messages> - <log config:type="boolean">true</log> - <show config:type="boolean">true</show> - <timeout config:type="integer">0</timeout> - </messages> - <warnings> - <log config:type="boolean">true</log> - <show config:type="boolean">true</show> - <timeout config:type="integer">0</timeout> - </warnings> - <yesno_messages> - <log config:type="boolean">true</log> - <show config:type="boolean">true</show> - <timeout config:type="integer">0</timeout> - </yesno_messages> - </report> - <software> - - <packages config:type="list"> - <package>desktop-translations</package> - <package>gconf2-branding-SLES</package> - <package>libproxy0-config-gnome</package> - <package>sle-sdk-release</package> - <package>sle-sdk-release-SDK</package> - <package>sles-manuals_en</package> - <package>yast2-trans-en_US</package> - </packages> - <patterns config:type="list"> - <pattern>Basis-Devel</pattern> - <pattern>Minimal</pattern> - <pattern>apparmor</pattern> - <pattern>base</pattern> - <pattern>sdk_kernel</pattern> - </patterns> - <remove-packages config:type="list"> - <package>3ddiag</package> - <package>CASA</package> - <package>CASA-devel</package> - <package>CASA_auth_token_client</package> - <package>CASA_auth_token_client-devel</package> - <package>ConsoleKit-devel</package> - <package>ConsoleKit-x11</package> - <package>DirectFB-devel</package> - <package>FastCGI</package> - <package>IlmBase</package> - <package>IlmBase-devel</package> - <package>ImageMagick</package> - <package>ImageMagick-devel</package> - <package>LibVNCServer</package> - <package>LibVNCServer-devel</package> - <package>Mesa</package> - <package>Mesa-devel</package> - <package>ModemManager</package> - <package>Modules</package> - <package>NetworkManager</package> - <package>NetworkManager-devel</package> - <package>NetworkManager-glib</package> - <package>NetworkManager-gnome</package> - <package>NetworkManager-kde4</package> - <package>NetworkManager-kde4-lang</package> - <package>NetworkManager-kde4-libs</package> - <package>OpenEXR</package> - <package>OpenEXR-devel</package> - <package>OpenIPMI-devel</package> - <package>PackageKit</package> - <package>PackageKit-devel</package> - <package>PackageKit-lang</package> - <package>PolicyKit-devel</package> - <package>PolicyKit-gnome</package> - <package>PolicyKit-gnome-devel</package> - <package>PolicyKit-gnome-libs</package> - <package>SDL-devel</package> - <package>SDL_net</package> - <package>SDL_net-devel</package> - <package>TeX-Guy</package> - <package>TeX-Guy-devel</package> - <package>VFlib3</package> - <package>VFlib3-devel</package> - <package>WindowMaker</package> - <package>WindowMaker-devel</package> - <package>a2ps</package> - <package>aalib</package> - <package>aalib-devel</package> - <package>akonadi-runtime</package> - <package>akregator</package> - <package>alsa-devel</package> - <package>alsa-firmware</package> - <package>alsa-plugins-pulse</package> - <package>alsa-tools</package> - <package>alsa-tools-devel</package> - <package>anthy</package> - <package>anthy-devel</package> - <package>antlr</package> - <package>apache2</package> - <package>apache2-devel</package> - <package>apache2-mod_perl</package> - <package>apache2-mod_perl-devel</package> - <package>apache2-prefork</package> - <package>apache2-utils</package> - <package>apache2-worker</package> - <package>apparmor-profile-editor</package> - <package>art-sharp2</package> - <package>arts</package> - <package>arts-devel</package> - <package>aspell-devel</package> - <package>at-spi</package> - <package>at-spi-devel</package> - <package>at-spi-lang</package> - <package>atk-devel</package> - <package>audiofile</package> - <package>audiofile-devel</package> - <package>audit-devel</package> - <package>augeas-lenses</package> - <package>automoc4</package> - <package>avahi</package> - <package>avahi-compat-howl-devel</package> - <package>avahi-compat-mDNSResponder-devel</package> - <package>avahi-lang</package> - <package>babl-0_0</package> - <package>banshee-1</package> - <package>banshee-1-backend-engine-gstreamer</package> - <package>banshee-1-backend-platform-gnome</package> - <package>banshee-1-backend-platform-unix</package> - <package>banshee-1-devel</package> - <package>banshee-1-extensions-default</package> - <package>banshee-1-lang</package> - <package>beagle-devel</package> - <package>bind-devel</package> - <package>binutils-devel</package> - <package>bluez</package> - <package>bluez-devel</package> - <package>boo</package> - <package>boo-devel</package> - <package>boost-devel</package> - <package>bootsplash-branding-SLED</package> - <package>cairo-devel</package> - <package>cairomm</package> - <package>cairomm-devel</package> - <package>canna</package> - <package>canna-devel</package> - <package>canna-libs</package> - <package>cannadic</package> - <package>capi4linux</package> - <package>capi4linux-devel</package> - <package>cdk</package> - <package>cdk-devel</package> - <package>cdrdao</package> - <package>chasen</package> - <package>chasen-devel</package> - <package>check</package> - <package>check-devel</package> - <package>chmlib</package> - <package>chmlib-devel</package> - <package>cim-schema</package> - <package>clucene-core</package> - <package>clucene-core-devel</package> - <package>cmake</package> - <package>compiz</package> - <package>compiz-branding-SLE</package> - <package>compiz-devel</package> - <package>compiz-gnome</package> - <package>coolkey-devel</package> - <package>cracklib-devel</package> - <package>crash-devel</package> - <package>crimson</package> - <package>cscope</package> - <package>cups</package> - <package>cups-devel</package> - <package>cvsps</package> - <package>cyrus-imapd-devel</package> - <package>cyrus-sasl-crammd5</package> - <package>cyrus-sasl-devel</package> - <package>dante</package> - <package>dante-devel</package> - <package>db1</package> - <package>db1-devel</package> - <package>db43</package> - <package>db43-devel</package> - <package>dbus-1-devel</package> - <package>dbus-1-glib-devel</package> - <package>dbus-1-python-devel</package> - <package>dbus-1-qt3</package> - <package>dbus-1-qt3-devel</package> - <package>dbus-1-x11</package> - <package>dejagnu</package> - <package>dejavu</package> - <package>desktop-data-openSUSE</package> - <package>desktop-file-utils</package> - <package>devhelp</package> - <package>devhelp-devel</package> - <package>devhelp-lang</package> - <package>device-mapper-devel</package> - <package>dhcp</package> - <package>dhcp-client</package> - <package>dhcp-devel</package> - <package>diffstat</package> - <package>dmapi-devel</package> - <package>dnsmasq</package> - <package>docbook-xsl-stylesheets</package> - <package>docbook_4</package> - <package>doxygen</package> - <package>dvd+rw-tools</package> - <package>e2fsprogs-devel</package> - <package>emacs</package> - <package>emacs-nox</package> - <package>emacs-x11</package> - <package>enchant</package> - <package>enchant-devel</package> - <package>enscript</package> - <package>eog</package> - <package>eog-devel</package> - <package>eog-lang</package> - <package>espeak</package> - <package>evince</package> - <package>evince-devel</package> - <package>evince-lang</package> - <package>evoldap2-devel</package> - <package>evolution</package> - <package>evolution-data-server</package> - <package>evolution-data-server-devel</package> - <package>evolution-data-server-lang</package> - <package>evolution-devel</package> - <package>evolution-lang</package> - <package>expect-devel</package> - <package>facter</package> - <package>fam</package> - <package>fam-devel</package> - <package>farsight</package> - <package>farsight-devel</package> - <package>festival</package> - <package>festival-devel</package> - <package>fftw</package> - <package>fftw-devel</package> - <package>fftw-mpi</package> - <package>fftw-mpi-devel</package> - <package>fftw-threads</package> - <package>fftw-threads-devel</package> - <package>fftw3</package> - <package>fftw3-devel</package> - <package>fftw3-threads</package> - <package>fftw3-threads-devel</package> - <package>file-devel</package> - <package>fileshareset</package> - <package>finch</package> - <package>finch-devel</package> - <package>flac-devel</package> - <package>fltk</package> - <package>fltk-devel</package> - <package>fontconfig-devel</package> - <package>fonts-config</package> - <package>foomatic-filters</package> - <package>freeglut</package> - <package>freeglut-devel</package> - <package>freeradius-client-devel</package> - <package>freeradius-client-libs</package> - <package>freeradius-server-devel</package> - <package>freeradius-server-libs</package> - <package>freetype</package> - <package>freetype2-devel</package> - <package>fribidi</package> - <package>fribidi-devel</package> - <package>ft2demos</package> - <package>fuse-devel</package> - <package>fwnn-devel</package> - <package>fxload</package> - <package>gcc-gij</package> - <package>gcc-java</package> - <package>gcc43-gij</package> - <package>gcc43-java</package> - <package>gconf-sharp2</package> - <package>gconf2-devel</package> - <package>gconfmm</package> - <package>gconfmm-devel</package> - <package>gd</package> - <package>gd-devel</package> - <package>gdbm-32bit</package> - <package>gdk-pixbuf</package> - <package>gdk-pixbuf-devel</package> - <package>gegl-0_0</package> - <package>gettext-tools</package> - <package>gfxboot-branding-SLED</package> - <package>gfxboot-devel</package> - <package>ggz</package> - <package>ggz-client-libs</package> - <package>ggz-client-libs-devel</package> - <package>ggz-client-libs-lang</package> - <package>ghex</package> - <package>ghex-devel</package> - <package>ghex-lang</package> - <package>ghostscript-devel</package> - <package>ghostscript-fonts-other</package> - <package>ghostscript-fonts-std</package> - <package>ghostscript-ijs-devel</package> - <package>ghostscript-library</package> - <package>ghostscript-omni</package> - <package>ghostscript-x11</package> - <package>giflib-devel</package> - <package>gimp</package> - <package>gimp-branding-SLED</package> - <package>gimp-devel</package> - <package>gimp-lang</package> - <package>gimp-plugins-python</package> - <package>git</package> - <package>git-arch</package> - <package>git-core</package> - <package>git-cvs</package> - <package>git-daemon</package> - <package>git-email</package> - <package>git-gui</package> - <package>git-svn</package> - <package>git-web</package> - <package>gitk</package> - <package>gjdoc</package> - <package>glade-sharp2</package> - <package>glade3</package> - <package>glade3-lang</package> - <package>glib</package> - <package>glib-devel</package> - <package>glib-sharp2</package> - <package>glib2-devel</package> - <package>glibmm2</package> - <package>glibmm2-devel</package> - <package>glitz</package> - <package>glitz-devel</package> - <package>gltt</package> - <package>gltt-devel</package> - <package>gmime-2_4-devel</package> - <package>gmime-devel</package> - <package>gmp-devel</package> - <package>gnet</package> - <package>gnet-devel</package> - <package>gnokii</package> - <package>gnokii-devel</package> - <package>gnokii-smsd</package> - <package>gnome-certauth-devel</package> - <package>gnome-control-center</package> - <package>gnome-control-center-devel</package> - <package>gnome-control-center-lang</package> - <package>gnome-desktop</package> - <package>gnome-desktop-devel</package> - <package>gnome-desktop-lang</package> - <package>gnome-doc-utils</package> - <package>gnome-doc-utils-devel</package> - <package>gnome-doc-utils-lang</package> - <package>gnome-keyring-devel</package> - <package>gnome-keyring-sharp</package> - <package>gnome-keyring-sharp-devel</package> - <package>gnome-libs</package> - <package>gnome-libs-devel</package> - <package>gnome-mag</package> - <package>gnome-mag-devel</package> - <package>gnome-mag-lang</package> - <package>gnome-main-menu</package> - <package>gnome-main-menu-lang</package> - <package>gnome-media</package> - <package>gnome-media-devel</package> - <package>gnome-media-lang</package> - <package>gnome-menus</package> - <package>gnome-menus-branding-SLED</package> - <package>gnome-menus-devel</package> - <package>gnome-menus-lang</package> - <package>gnome-mount</package> - <package>gnome-mount-lang</package> - <package>gnome-panel</package> - <package>gnome-panel-devel</package> - <package>gnome-panel-lang</package> - <package>gnome-pilot</package> - <package>gnome-pilot-devel</package> - <package>gnome-pilot-lang</package> - <package>gnome-settings-daemon</package> - <package>gnome-settings-daemon-devel</package> - <package>gnome-settings-daemon-lang</package> - <package>gnome-sharp2</package> - <package>gnome-speech</package> - <package>gnome-speech-devel</package> - <package>gnome-themes</package> - <package>gnome-utils</package> - <package>gnome-utils-devel</package> - <package>gnome-utils-lang</package> - <package>gnome-vfs-sharp2</package> - <package>gnome-vfs2</package> - <package>gnome-vfs2-devel</package> - <package>gnome-vfs2-lang</package> - <package>gnome-vfsmm</package> - <package>gnome-vfsmm-devel</package> - <package>gnopernicus</package> - <package>gnopernicus-devel</package> - <package>gnopernicus-lang</package> - <package>gnutls</package> - <package>goffice</package> - <package>goffice-devel</package> - <package>goffice-lang</package> - <package>goocanvas</package> - <package>goocanvas-devel</package> - <package>goocanvas-lang</package> - <package>goom2k4</package> - <package>goom2k4-devel</package> - <package>graphviz</package> - <package>graphviz-devel</package> - <package>graphviz-gd</package> - <package>graphviz-gnome</package> - <package>gstreamer-0_10</package> - <package>gstreamer-0_10-devel</package> - <package>gstreamer-0_10-lang</package> - <package>gstreamer-0_10-plugins-base</package> - <package>gstreamer-0_10-plugins-base-devel</package> - <package>gstreamer-0_10-plugins-base-lang</package> - <package>gstreamer-0_10-plugins-good</package> - <package>gstreamer-0_10-plugins-good-lang</package> - <package>gstreamer-0_10-utils</package> - <package>gstreamer-utils</package> - <package>gtk</package> - <package>gtk-devel</package> - <package>gtk-lang</package> - <package>gtk-sharp2</package> - <package>gtk-vnc-devel</package> - <package>gtk2-devel</package> - <package>gtkglext</package> - <package>gtkglext-devel</package> - <package>gtkhtml2</package> - <package>gtkhtml2-devel</package> - <package>gtkhtml2-lang</package> - <package>gtkhtml314-sharp</package> - <package>gtkmm2</package> - <package>gtkmm2-devel</package> - <package>gtksourceview-devel</package> - <package>gtksourceview-lang</package> - <package>gtksourceview18</package> - <package>gtksourceview18-devel</package> - <package>gtkspell</package> - <package>gtkspell-devel</package> - <package>gtkspell-lang</package> - <package>gucharmap</package> - <package>gucharmap-devel</package> - <package>gucharmap-lang</package> - <package>guile</package> - <package>guile-devel</package> - <package>gutenprint</package> - <package>gutenprint-devel</package> - <package>gvfs-devel</package> - <package>gxmhtml</package> - <package>hal-devel</package> - <package>hal-palm</package> - <package>htdig</package> - <package>htdig-devel</package> - <package>hunspell</package> - <package>hunspell-devel</package> - <package>hunspell-tools</package> - <package>hwinfo-devel</package> - <package>i4l-base</package> - <package>icewm</package> - <package>icewm-lite</package> - <package>id3lib</package> - <package>id3lib-devel</package> - <package>imap-devel</package> - <package>imap-lib</package> - <package>imlib</package> - <package>imlib-devel</package> - <package>imlib2</package> - <package>imlib2-devel</package> - <package>indent</package> - <package>info2html</package> - <package>inn</package> - <package>inn-devel</package> - <package>intltool</package> - <package>ipadic</package> - <package>iptables-devel</package> - <package>iso-codes</package> - <package>iso-codes-devel</package> - <package>iso_ent</package> - <package>ispell</package> - <package>ispell-american</package> - <package>ispell-brazilian</package> - <package>ispell-british</package> - <package>ispell-czech</package> - <package>ispell-danish</package> - <package>ispell-finnish</package> - <package>ispell-french</package> - <package>ispell-german</package> - <package>ispell-hungarian</package> - <package>ispell-italian</package> - <package>ispell-ngerman</package> - <package>ispell-norsk</package> - <package>ispell-polish</package> - <package>ispell-portuguese</package> - <package>ispell-russian</package> - <package>ispell-slovak</package> - <package>ispell-spanish</package> - <package>ispell-swedish</package> - <package>itcl-devel</package> - <package>java-1_4_2-ibm</package> - <package>java-1_4_2-ibm-devel</package> - <package>java-1_5_0-gcj-compat</package> - <package>java-1_5_0-gcj-compat-devel</package> - <package>java-1_6_0-ibm</package> - <package>java-1_6_0-ibm-devel</package> - <package>joe</package> - <package>jpackage-utils</package> - <package>k3b</package> - <package>k3b-devel</package> - <package>k3b-lang</package> - <package>kaddressbook</package> - <package>kalarm</package> - <package>kde-susetranslations</package> - <package>kde4-filesystem</package> - <package>kde4-kgreeter-plugins</package> - <package>kdebase3</package> - <package>kdebase3-devel</package> - <package>kdebase3-runtime</package> - <package>kdebase4-SLED</package> - <package>kdebase4-SLED-lang</package> - <package>kdebase4-runtime</package> - <package>kdebase4-runtime-branding-SLED</package> - <package>kdebase4-workspace</package> - <package>kdebase4-workspace-branding-SLED</package> - <package>kdebase4-workspace-devel</package> - <package>kdebase4-workspace-ksysguardd</package> - <package>kdelibs3</package> - <package>kdelibs3-arts</package> - <package>kdelibs3-default-style</package> - <package>kdelibs3-devel</package> - <package>kdelibs3-doc</package> - <package>kdelibs4</package> - <package>kdelibs4-branding-SLED</package> - <package>kdelibs4-core</package> - <package>kdelibs4-doc</package> - <package>kdemultimedia3-arts</package> - <package>kdepim3</package> - <package>kdepim4</package> - <package>kdepim4-devel</package> - <package>kdepimlibs4</package> - <package>kdialog</package> - <package>kdm</package> - <package>kdm-branding-SLED</package> - <package>kernel-docs</package> - <package>kernel-syms</package> - <package>kernel-trace-devel</package> - <package>kernel-xen-devel</package> - <package>keyutils-devel</package> - <package>kio_sysinfo</package> - <package>kio_sysinfo-branding-SLED</package> - <package>kmail</package> - <package>knode</package> - <package>kontact</package> - <package>korganizer</package> - <package>kpilot</package> - <package>krb5-devel</package> - <package>ksh-devel</package> - <package>ktorrent</package> - <package>ktorrent-devel</package> - <package>ktorrent-lang</package> - <package>kwin</package> - <package>ladspa-devel</package> - <package>lib3ds-1-3</package> - <package>lib3ds-devel</package> - <package>libFLAC++6</package> - <package>libFLAC8</package> - <package>libHX-devel</package> - <package>libMagick++-devel</package> - <package>libMagick++1</package> - <package>libMagickWand1</package> - <package>libQtWebKit-devel</package> - <package>libQtWebKit4</package> - <package>libXerces-c-devel</package> - <package>libXerces-c28</package> - <package>libXiterm</package> - <package>libXiterm-devel</package> - <package>libacl-devel</package> - <package>libadns-devel</package> - <package>libadns1</package> - <package>libakode</package> - <package>libakode-devel</package> - <package>libakonadi4</package> - <package>libakonadiprotocolinternals-devel</package> - <package>libakonadiprotocolinternals1</package> - <package>libao</package> - <package>libao-devel</package> - <package>libapparmor-devel</package> - <package>libapr-util1</package> - <package>libapr-util1-devel</package> - <package>libapr1</package> - <package>libapr1-devel</package> - <package>libarchive-devel</package> - <package>libart_lgpl</package> - <package>libart_lgpl-devel</package> - <package>libassuan-devel</package> - <package>libatomic-ops-devel</package> - <package>libattr-devel</package> - <package>libavahi-core5</package> - <package>libavahi-devel</package> - <package>libavahi-glib-devel</package> - <package>libavahi-gobject-devel</package> - <package>libavahi-gobject0</package> - <package>libavahi-ui0</package> - <package>libavc1394-0</package> - <package>libavc1394-devel</package> - <package>libbabl-0_0-0</package> - <package>libbeagle-devel</package> - <package>libbeagle-python</package> - <package>libbeagle1</package> - <package>libbitmask-devel</package> - <package>libbitmask1</package> - <package>libblkid-devel</package> - <package>libblocxx-devel</package> - <package>libbonobo</package> - <package>libbonobo-devel</package> - <package>libbonobo-lang</package> - <package>libbonoboui</package> - <package>libbonoboui-devel</package> - <package>libbonoboui-lang</package> - <package>libboost_date_time1_36_0</package> - <package>libboost_filesystem1_36_0</package> - <package>libboost_graph1_36_0</package> - <package>libboost_iostreams1_36_0</package> - <package>libboost_math1_36_0</package> - <package>libboost_mpi1_36_0</package> - <package>libboost_program_options1_36_0</package> - <package>libboost_python1_36_0</package> - <package>libboost_serialization1_36_0</package> - <package>libboost_signals1_36_0</package> - <package>libboost_system1_36_0</package> - <package>libboost_test1_36_0</package> - <package>libboost_thread1_36_0</package> - <package>libboost_wave1_36_0</package> - <package>libbotan-1_6_4</package> - <package>libbotan-devel</package> - <package>libbtctl</package> - <package>libbtctl-devel</package> - <package>libbtctl-lang</package> - <package>libbtctl4</package> - <package>libbz2-devel</package> - <package>libcaca</package> - <package>libcaca-devel</package> - <package>libcanberra-gtk</package> - <package>libcanberra-gtk0</package> - <package>libcanberra0</package> - <package>libcap-devel</package> - <package>libcap-ng0</package> - <package>libcdda_interface0</package> - <package>libcdda_paranoia0</package> - <package>libcddb-devel</package> - <package>libcddb2</package> - <package>libcdio++0</package> - <package>libcdio-devel</package> - <package>libcgroup-devel</package> - <package>libcgroup1</package> - <package>libchewing</package> - <package>libchewing-devel</package> - <package>libcmpiutil</package> - <package>libcmpiutil-devel</package> - <package>libcolorblind0</package> - <package>libcom_err-devel</package> - <package>libcompizconfig</package> - <package>libcompizconfig-devel</package> - <package>libcppunit-1_12-0</package> - <package>libcppunit-devel</package> - <package>libcpuset-devel</package> - <package>libcpuset1</package> - <package>libcroco</package> - <package>libcroco-0_6-3</package> - <package>libcroco-devel</package> - <package>libcryptsetup-devel</package> - <package>libcsync-devel</package> - <package>libcsync0</package> - <package>libcurl-devel</package> - <package>libdaemon-devel</package> - <package>libdaemon0</package> - <package>libdatrie-devel</package> - <package>libdatrie0</package> - <package>libdb-4_5-32bit</package> - <package>libdb-4_5-devel</package> - <package>libdbus-1-qt3-0</package> - <package>libdbus-1-qt3-0-devel</package> - <package>libdc1394-22</package> - <package>libdc1394-devel</package> - <package>libdc1394_control12</package> - <package>libdc1394_control12-devel</package> - <package>libdhcp6client-1_0-2</package> - <package>libdhcp6client-devel</package> - <package>libdigikam-devel</package> - <package>libdiscid1</package> - <package>libdjvulibre-devel</package> - <package>libdjvulibre21</package> - <package>libdmxview-devel</package> - <package>libdmxview0</package> - <package>libdnet-devel</package> - <package>libdnet1</package> - <package>libdns_sd</package> - <package>libdrm</package> - <package>libdrm-devel</package> - <package>libdv-devel</package> - <package>libdv4</package> - <package>libdvdread4</package> - <package>libdw-devel</package> - <package>libebl-devel</package> - <package>libedit-devel</package> - <package>libedit0</package> - <package>libelf-devel</package> - <package>libenchant1</package> - <package>libesd-devel</package> - <package>libesd0</package> - <package>libesmtp-devel</package> - <package>libevoldap-2_4-2</package> - <package>libevtlog-devel</package> - <package>libevtlog0</package> - <package>libexempi-devel</package> - <package>libexempi3</package> - <package>libexif-devel</package> - <package>libexiv2-4</package> - <package>libexiv2-devel</package> - <package>libexpat-devel</package> - <package>libext2fs-devel</package> - <package>libfarsight-0_1-3</package> - <package>libffi-devel</package> - <package>libffi43</package> - <package>libffi43-devel</package> - <package>libflaim-devel</package> - <package>libfprint-devel</package> - <package>libfreebl3</package> - <package>libfreebob</package> - <package>libfreebob-devel</package> - <package>libgadu</package> - <package>libgadu-devel</package> - <package>libgail-gnome</package> - <package>libgail-gnome-devel</package> - <package>libgcj-devel</package> - <package>libgcj43</package> - <package>libgcj43-devel</package> - <package>libgcj43-jar</package> - <package>libgcj_bc43</package> - <package>libgcrypt-devel</package> - <package>libgda-3_0-3</package> - <package>libgda-3_0-devel</package> - <package>libgdiplus0</package> - <package>libgegl-0_0-0</package> - <package>libgeoclue0</package> - <package>libgfortran46</package> - <package>libggz2</package> - <package>libggz2-devel</package> - <package>libgimpprint</package> - <package>libgimpprint-devel</package> - <package>libglade2</package> - <package>libglade2-devel</package> - <package>libglademm</package> - <package>libglademm-2_4-1</package> - <package>libglademm-devel</package> - <package>libgladeui-1-9</package> - <package>libgladeui-1_0-devel</package> - <package>libgmime-2_0-3</package> - <package>libgmime-2_4-2</package> - <package>libgmm++-devel</package> - <package>libgnome</package> - <package>libgnome-certauth0</package> - <package>libgnome-desktop-2-11</package> - <package>libgnome-devel</package> - <package>libgnome-lang</package> - <package>libgnome-menu2</package> - <package>libgnome-window-settings1</package> - <package>libgnomecanvas</package> - <package>libgnomecanvas-devel</package> - <package>libgnomecanvas-lang</package> - <package>libgnomecanvasmm</package> - <package>libgnomecanvasmm-devel</package> - <package>libgnomecups</package> - <package>libgnomecups-devel</package> - <package>libgnomecups-lang</package> - <package>libgnomedb</package> - <package>libgnomedb-devel</package> - <package>libgnomedb-lang</package> - <package>libgnomekbd</package> - <package>libgnomekbd-devel</package> - <package>libgnomekbd-lang</package> - <package>libgnomeprint</package> - <package>libgnomeprint-devel</package> - <package>libgnomeprint-lang</package> - <package>libgnomeprintui</package> - <package>libgnomeprintui-devel</package> - <package>libgnomeprintui-lang</package> - <package>libgnomesu</package> - <package>libgnomesu-devel</package> - <package>libgnomesu-lang</package> - <package>libgnomesu0</package> - <package>libgnomeui</package> - <package>libgnomeui-devel</package> - <package>libgnomeui-lang</package> - <package>libgnomevfsmm-2_6-1</package> - <package>libgnutls-devel</package> - <package>libgnutls-extra-devel</package> - <package>libgnutls-extra26</package> - <package>libgoocanvas3</package> - <package>libgpg-error-devel</package> - <package>libgpgme-devel</package> - <package>libgphoto2-devel</package> - <package>libgpod-devel</package> - <package>libgsf</package> - <package>libgsf-1-114</package> - <package>libgsf-devel</package> - <package>libgsf-gnome</package> - <package>libgsm-devel</package> - <package>libgsm1</package> - <package>libgssglue-devel</package> - <package>libgstapp-0_10-0</package> - <package>libgstinterfaces-0_10-0</package> - <package>libgstreamer-0_10-0</package> - <package>libgtk-vnc-1_0-0</package> - <package>libgtkhtml</package> - <package>libgtkhtml-devel</package> - <package>libgtksourceview-2_0-0</package> - <package>libgtop</package> - <package>libgtop-2_0-7</package> - <package>libgtop-devel</package> - <package>libgtop-lang</package> - <package>libgudev-1_0-0</package> - <package>libgweather</package> - <package>libgweather-devel</package> - <package>libgweather-lang</package> - <package>libgweather1</package> - <package>libhangul</package> - <package>libhangul-devel</package> - <package>libhowl0</package> - <package>libical-devel</package> - <package>libical0</package> - <package>libicu-devel</package> - <package>libid3tag</package> - <package>libid3tag-devel</package> - <package>libidl-devel</package> - <package>libidn-devel</package> - <package>libiec61883</package> - <package>libiec61883-devel</package> - <package>libieee1284</package> - <package>libiniparser-devel</package> - <package>libiniparser0</package> - <package>libiptcdata</package> - <package>libiptcdata-devel</package> - <package>libiptcdata0</package> - <package>libiso9660-5</package> - <package>libiterm</package> - <package>libiterm-devel</package> - <package>libjack-devel</package> - <package>libjack0</package> - <package>libjasper</package> - <package>libjasper-devel</package> - <package>libjingle-0_3-0</package> - <package>libjingle-devel</package> - <package>libjpeg-devel</package> - <package>libkcal</package> - <package>libkcal-devel</package> - <package>libkcal2</package> - <package>libkcddb4</package> - <package>libkcddb4-devel</package> - <package>libkcompactdisc4</package> - <package>libkcompactdisc4-devel</package> - <package>libkdcraw3</package> - <package>libkdcraw3-devel</package> - <package>libkdcraw3-lang</package> - <package>libkde4</package> - <package>libkde4-devel</package> - <package>libkdecore4</package> - <package>libkdecore4-devel</package> - <package>libkdepim4</package> - <package>libkdepim4-devel</package> - <package>libkdepimlibs4</package> - <package>libkdepimlibs4-devel</package> - <package>libkexiv2-3</package> - <package>libkexiv2-3-devel</package> - <package>libkexiv2-7</package> - <package>libkipi-devel</package> - <package>libkipi6</package> - <package>libkmime-devel</package> - <package>libkmime2</package> - <package>libknotificationitem-1-1</package> - <package>libkonq-devel</package> - <package>libkonq5</package> - <package>libksba-devel</package> - <package>libktnef-devel</package> - <package>libktnef1</package> - <package>liblazy-devel</package> - <package>liblazy1</package> - <package>liblcms-devel</package> - <package>libldapcpp-devel</package> - <package>liblog4c-devel</package> - <package>liblog4c3</package> - <package>libloudmouth-1-0</package> - <package>liblpsolve55</package> - <package>liblua5_1</package> - <package>libmalaga-devel</package> - <package>libmalaga7</package> - <package>libmcrypt</package> - <package>libmcrypt-devel</package> - <package>libmikmod</package> - <package>libmikmod-devel</package> - <package>libmm-devel</package> - <package>libmm14</package> - <package>libmng-devel</package> - <package>libmpcdec-devel</package> - <package>libmpcdec5</package> - <package>libmspack-devel</package> - <package>libmtp-devel</package> - <package>libmtp8</package> - <package>libmusicbrainz-devel</package> - <package>libmusicbrainz3-6</package> - <package>libmusicbrainz3-devel</package> - <package>libmusicbrainz4</package> - <package>libmysqlclient-devel</package> - <package>libmysqlclient15</package> - <package>libmysqlclient_r15</package> - <package>libneon-devel</package> - <package>libneon27</package> - <package>libnetapi-devel</package> - <package>libnetapi0</package> - <package>libnetcontrol0</package> - <package>libnetpbm-devel</package> - <package>libnetpbm10</package> - <package>libnewt0_52</package> - <package>libnjb</package> - <package>libnjb-devel</package> - <package>libnjb5</package> - <package>libnl-devel</package> - <package>libnotify</package> - <package>libnotify-devel</package> - <package>libnotify1</package> - <package>libnscd-devel</package> - <package>libnsssharedhelper0</package> - <package>libnuma-devel</package> - <package>libofa-devel</package> - <package>libofa0</package> - <package>libogg-devel</package> - <package>libogg0</package> - <package>liboil</package> - <package>liboil-devel</package> - <package>libopenbabel-devel</package> - <package>libopenbabel3</package> - <package>libopencdk-devel</package> - <package>libopencdk10</package> - <package>libopenraw-devel</package> - <package>libopenraw1</package> - <package>libopenssl-devel</package> - <package>libopensync</package> - <package>libopensync-devel</package> - <package>libopensync-plugin-evolution2</package> - <package>libopensync-plugin-evolution2-devel</package> - <package>libopensync-plugin-palm</package> - <package>libopensync-plugin-palm-devel</package> - <package>liborc-0_4-0</package> - <package>libosip2</package> - <package>libosip2-devel</package> - <package>libotf</package> - <package>libotf-devel</package> - <package>libotr-devel</package> - <package>libotr2</package> - <package>libp11-1</package> - <package>libp11-devel</package> - <package>libpackagekit-glib10</package> - <package>libpackagekit-glib10-devel</package> - <package>libpangomm-1_4-1</package> - <package>libpcap-devel</package> - <package>libpciaccess0</package> - <package>libpciaccess0-devel</package> - <package>libphonon4</package> - <package>libpisock-devel</package> - <package>libpisock9</package> - <package>libpisync-devel</package> - <package>libpisync1</package> - <package>libpixman-1-0-devel</package> - <package>libpkcs11-helper1</package> - <package>libpng-devel</package> - <package>libpolkit-qt0</package> - <package>libpoppler-devel</package> - <package>libpoppler-glib-devel</package> - <package>libpoppler-glib4</package> - <package>libpoppler-qt2</package> - <package>libpoppler-qt3-devel</package> - <package>libpoppler-qt4-3</package> - <package>libpoppler-qt4-devel</package> - <package>libpoppler5</package> - <package>libpst4</package> - <package>libpt2</package> - <package>libpt2-devel</package> - <package>libpulse-browse0</package> - <package>libpulse-devel</package> - <package>libpulse-mainloop-glib0</package> - <package>libpulse0</package> - <package>libpurple</package> - <package>libpurple-devel</package> - <package>libpurple-lang</package> - <package>libqca2</package> - <package>libqca2-devel</package> - <package>libqdialogsolver1</package> - <package>libqdialogsolver1-devel</package> - <package>libqimageblitz-devel</package> - <package>libqimageblitz4</package> - <package>libqscintilla-devel</package> - <package>libqscintilla2-5</package> - <package>libqt4</package> - <package>libqt4-devel</package> - <package>libqt4-qt3support</package> - <package>libqt4-sql</package> - <package>libqt4-sql-mysql</package> - <package>libqt4-sql-postgresql</package> - <package>libqt4-sql-sqlite</package> - <package>libqt4-sql-unixODBC</package> - <package>libqt4-x11</package> - <package>libqtpod-devel</package> - <package>libqtpod0</package> - <package>libquadmath46</package> - <package>libquicktime</package> - <package>libquicktime-devel</package> - <package>libraptor-devel</package> - <package>libraptor1</package> - <package>librasqal-devel</package> - <package>librasqal1</package> - <package>libraw1394-11</package> - <package>libraw1394-8</package> - <package>libraw1394-devel</package> - <package>libredland-devel</package> - <package>libredland0</package> - <package>libreiserfs-devel</package> - <package>libreoffice</package> - <package>libreoffice-base</package> - <package>libreoffice-branding-SLED</package> - <package>libreoffice-branding-upstream</package> - <package>libreoffice-calc</package> - <package>libreoffice-icon-themes</package> - <package>libreoffice-impress</package> - <package>libreoffice-sdk</package> - <package>libreoffice-writer</package> - <package>librsvg</package> - <package>librsvg-devel</package> - <package>libsamplerate</package> - <package>libsamplerate-devel</package> - <package>libsatsolver-devel</package> - <package>libsblim-cmpiutil1</package> - <package>libselinux-devel</package> - <package>libsemanage-devel</package> - <package>libsemanage1</package> - <package>libsensors3-devel</package> - <package>libsensors4</package> - <package>libsepol-devel</package> - <package>libsexy</package> - <package>libsexy-devel</package> - <package>libshout-devel</package> - <package>libshout3</package> - <package>libsidplay1</package> - <package>libsidplay1-devel</package> - <package>libsigc++2</package> - <package>libsigc++2-devel</package> - <package>libslab-lang</package> - <package>libslab0</package> - <package>libsmbclient-devel</package> - <package>libsmbios-devel</package> - <package>libsmbsharemodes-devel</package> - <package>libsmbsharemodes0</package> - <package>libsndfile</package> - <package>libsndfile-devel</package> - <package>libsoprano-devel</package> - <package>libsoprano4</package> - <package>libsoup-devel</package> - <package>libspectre-devel</package> - <package>libspectre1</package> - <package>libspeex</package> - <package>libssh2-devel</package> - <package>libstrigi0</package> - <package>libstroke</package> - <package>libstroke-devel</package> - <package>libsyncml-devel</package> - <package>libsyncml0</package> - <package>libtalloc-devel</package> - <package>libtasn1-devel</package> - <package>libtdb-devel</package> - <package>libtelepathy</package> - <package>libtelepathy-devel</package> - <package>libtelepathy-glib0</package> - <package>libtheora-devel</package> - <package>libtheora0</package> - <package>libtidy</package> - <package>libtidy-devel</package> - <package>libtiff-devel</package> - <package>libtirpc-devel</package> - <package>libtomoe-gtk0</package> - <package>libtspi1</package> - <package>libtunepimp</package> - <package>libtunepimp-devel</package> - <package>libtunepimp5</package> - <package>libudev-devel</package> - <package>libudf0</package> - <package>libunique-1_0-0</package> - <package>libunwind</package> - <package>libunwind-devel</package> - <package>libupsclient1</package> - <package>libusb-devel</package> - <package>libusbpp-0_1-4</package> - <package>libustr-1_0-1</package> - <package>libustr-devel</package> - <package>libuuid-devel</package> - <package>libvirt-client</package> - <package>libvirt-devel</package> - <package>libvisual</package> - <package>libvisual-devel</package> - <package>libvoikko-devel</package> - <package>libvoikko1</package> - <package>libvorbis</package> - <package>libvorbis-devel</package> - <package>libwavpack1</package> - <package>libwbclient-devel</package> - <package>libwbxml2-0</package> - <package>libwbxml2-devel</package> - <package>libwebkit-1_0-1</package> - <package>libwebkit-1_0-2</package> - <package>libwebkit-devel</package> - <package>libwebkit-lang</package> - <package>libwmf</package> - <package>libwmf-devel</package> - <package>libwmf-gnome</package> - <package>libwnck</package> - <package>libwnck-1-22</package> - <package>libwnck-devel</package> - <package>libwnck-lang</package> - <package>libwpd-0_8-8</package> - <package>libwpd-devel</package> - <package>libwpg-0_1-1</package> - <package>libwpg-devel</package> - <package>libwps-0_1-1</package> - <package>libwps-devel</package> - <package>libwsman-devel</package> - <package>libwsman1</package> - <package>libxcrypt-devel</package> - <package>libxine-devel</package> - <package>libxine1</package> - <package>libxklavier-devel</package> - <package>libxklavier15</package> - <package>libxml2-devel</package> - <package>libxslt-devel</package> - <package>libyajl1</package> - <package>libzio-devel</package> - <package>libzip-devel</package> - <package>libzip1</package> - <package>libzvbi0</package> - <package>libzypp-devel</package> - <package>limal-apparmor-notifications</package> - <package>limal-apparmor-notifications-devel</package> - <package>limal-ca-mgm-devel</package> - <package>limal-devel</package> - <package>limal-devtools</package> - <package>limal-nfs-server-devel</package> - <package>linux-atm-devel</package> - <package>linux-atm-lib</package> - <package>lksctp-tools</package> - <package>lksctp-tools-devel</package> - <package>loudmouth-devel</package> - <package>lua</package> - <package>lua-devel</package> - <package>lzo-devel</package> - <package>m17n-db</package> - <package>m17n-lib</package> - <package>m17n-lib-devel</package> - <package>malaga-suomi</package> - <package>meanwhile</package> - <package>meanwhile-devel</package> - <package>metacity</package> - <package>metacity-devel</package> - <package>metacity-lang</package> - <package>mhash</package> - <package>mhash-devel</package> - <package>misc-console-font</package> - <package>mono-addins</package> - <package>mono-basic</package> - <package>mono-core</package> - <package>mono-data</package> - <package>mono-data-oracle</package> - <package>mono-data-sqlite</package> - <package>mono-devel</package> - <package>mono-extras</package> - <package>mono-jscript</package> - <package>mono-tools</package> - <package>mono-wcf</package> - <package>mono-web</package> - <package>mono-winforms</package> - <package>mono-zeroconf</package> - <package>mono-zeroconf-provider-avahi</package> - <package>monodevelop</package> - <package>monodoc-core</package> - <package>mozilla-nspr</package> - <package>mozilla-nspr-devel</package> - <package>mozilla-nss</package> - <package>mozilla-nss-devel</package> - <package>mozilla-xulrunner192</package> - <package>mozilla-xulrunner192-gnome</package> - <package>mpfr-devel</package> - <package>mpi-selector</package> - <package>mpich</package> - <package>mpich-devel</package> - <package>mysql</package> - <package>mysql-client</package> - <package>nagios</package> - <package>nagios-devel</package> - <package>nagios-www</package> - <package>nant</package> - <package>nautilus</package> - <package>nautilus-cd-burner</package> - <package>nautilus-cd-burner-devel</package> - <package>nautilus-cd-burner-lang</package> - <package>nautilus-devel</package> - <package>nautilus-lang</package> - <package>ndesk-dbus</package> - <package>ndesk-dbus-glib</package> - <package>ndesk-dbus-glib-devel</package> - <package>net-snmp</package> - <package>net-snmp-devel</package> - <package>netatalk</package> - <package>netatalk-devel</package> - <package>netcat-openbsd</package> - <package>newt</package> - <package>newt-devel</package> - <package>newt-static</package> - <package>nfsidmap-devel</package> - <package>notification-daemon</package> - <package>notification-daemon-lang</package> - <package>notify-sharp</package> - <package>nss-mdns</package> - <package>nss-shared-helper-devel</package> - <package>nut</package> - <package>nut-classic</package> - <package>nut-devel</package> - <package>opal</package> - <package>opal-devel</package> - <package>openCryptoki</package> - <package>openCryptoki-64bit</package> - <package>openCryptoki-devel</package> - <package>openct-devel</package> - <package>openhpi</package> - <package>openhpi-daemon</package> - <package>openhpi-devel</package> - <package>openjade</package> - <package>openjade-devel</package> - <package>openldap2-devel</package> - <package>openmotif-devel</package> - <package>openmotif-libs</package> - <package>openmpi</package> - <package>openobex-devel</package> - <package>openobex-glib-devel</package> - <package>opensc-devel</package> - <package>openslp-devel</package> - <package>opensp</package> - <package>opensp-devel</package> - <package>openwsman-client</package> - <package>openwsman-server</package> - <package>orbit</package> - <package>orbit-devel</package> - <package>orbit2-devel</package> - <package>oxygen-icon-theme</package> - <package>oxygen-icon-theme-scalable</package> - <package>ozerocdoff</package> - <package>pam-devel</package> - <package>pango-devel</package> - <package>pangomm-devel</package> - <package>parted-devel</package> - <package>patchutils</package> - <package>pciutils-devel</package> - <package>pcre-devel</package> - <package>pcsc-acr38</package> - <package>pcsc-acr38-devel</package> - <package>pcsc-lite-devel</package> - <package>perl-32bit</package> - <package>perl-Crypt-OpenSSL-RSA</package> - <package>perl-Mail-DKIM</package> - <package>perl-MailTools</package> - <package>perl-Net-DNS</package> - <package>perl-Net-IP</package> - <package>perl-NetAddr-IP</package> - <package>perl-SNMP</package> - <package>perl-Tie-IxHash</package> - <package>perl-Tk</package> - <package>perl-Tk-devel</package> - <package>perl-spamassassin</package> - <package>phonon</package> - <package>phonon-backend-gstreamer-0_10</package> - <package>phonon-devel</package> - <package>php5</package> - <package>php5-ctype</package> - <package>php5-devel</package> - <package>php5-dom</package> - <package>php5-hash</package> - <package>php5-iconv</package> - <package>php5-json</package> - <package>php5-pdo</package> - <package>php5-sqlite</package> - <package>php5-suhosin</package> - <package>php5-tokenizer</package> - <package>php5-xmlreader</package> - <package>php5-xmlwriter</package> - <package>php53</package> - <package>php53-ctype</package> - <package>php53-dom</package> - <package>php53-iconv</package> - <package>php53-json</package> - <package>php53-tokenizer</package> - <package>php53-xmlreader</package> - <package>php53-xmlwriter</package> - <package>pidgin</package> - <package>pidgin-devel</package> - <package>pilot-link</package> - <package>pkcs11-helper</package> - <package>pkcs11-helper-devel</package> - <package>planner</package> - <package>planner-devel</package> - <package>planner-lang</package> - <package>plasma-addons</package> - <package>plasma-theme-aya</package> - <package>plasmoid-networkmanagement</package> - <package>plasmoid-quickaccess</package> - <package>plotutils</package> - <package>poppler-data</package> - <package>poppler-tools</package> - <package>popt-devel</package> - <package>portmap</package> - <package>postfix-devel</package> - <package>postgresql-devel</package> - <package>postgresql-libs</package> - <package>ppp-devel</package> - <package>ppp-userpass</package> - <package>pstoedit</package> - <package>pstoedit-devel</package> - <package>pulseaudio</package> - <package>pulseaudio-esound-compat</package> - <package>pulseaudio-lang</package> - <package>puppet</package> - <package>python-cairo</package> - <package>python-cairo-devel</package> - <package>python-devel</package> - <package>python-gnome</package> - <package>python-gnome-devel</package> - <package>python-gobject2</package> - <package>python-gobject2-devel</package> - <package>python-gtk</package> - <package>python-gtk-devel</package> - <package>python-gtkglext</package> - <package>python-gtkglext-devel</package> - <package>python-gtksourceview</package> - <package>python-gtksourceview-devel</package> - <package>python-numeric</package> - <package>python-numpy</package> - <package>python-orbit</package> - <package>python-orbit-devel</package> - <package>pyxml</package> - <package>qt3</package> - <package>qt3-devel</package> - <package>quagga</package> - <package>quagga-devel</package> - <package>quilt</package> - <package>raptor</package> - <package>rarian</package> - <package>rarian-devel</package> - <package>re2c</package> - <package>readline-devel</package> - <package>recode-devel</package> - <package>rpm-devel</package> - <package>rrdtool</package> - <package>rrdtool-devel</package> - <package>rsyslog</package> - <package>ruby</package> - <package>rubygems</package> - <package>ruby-devel</package> - <package>ruby-doc-html</package> - <package>ruby-doc-ri</package> - <package>ruby-examples</package> - <package>ruby-fcgi</package> - <package>ruby-mysql</package> - <package>ruby-selinux</package> - <package>ruby-test-suite</package> - <package>ruby-tk</package> - <package>sablot</package> - <package>sablot-devel</package> - <package>samba-devel</package> - <package>sane-backends</package> - <package>sane-frontends</package> - <package>sax2-libsax</package> - <package>sax2-libsax-devel</package> - <package>sax2-libsax-perl</package> - <package>sax2-tools</package> - <package>sblim-cmpi-base</package> - <package>sblim-cmpi-base-devel</package> - <package>sblim-cmpi-devel</package> - <package>sblim-cmpiutil-devel</package> - <package>sblim-indication_helper</package> - <package>sblim-sfcb</package> - <package>sblim-sfcc</package> - <package>sblim-sfcc-devel</package> - <package>scim</package> - <package>scim-devel</package> - <package>scpm-devel</package> - <package>scrollkeeper</package> - <package>scrollkeeper-lang</package> - <package>seahorse</package> - <package>seahorse-devel</package> - <package>seahorse-lang</package> - <package>sendmail</package> - <package>sendmail-devel</package> - <package>sg3_utils-devel</package> - <package>sgml-skel</package> - <package>shared-mime-info</package> - <package>silc-toolkit</package> - <package>silc-toolkit-devel</package> - <package>slang</package> - <package>slang-devel</package> - <package>soprano</package> - <package>soprano-backend-redland</package> - <package>spamassassin</package> - <package>speex-devel</package> - <package>splashy-devel</package> - <package>sqlite2</package> - <package>sqlite3-devel</package> - <package>startup-notification</package> - <package>startup-notification-devel</package> - <package>strigi</package> - <package>strigi-devel</package> - <package>subversion</package> - <package>subversion-perl</package> - <package>susehelp</package> - <package>susehelp_cz</package> - <package>susehelp_de</package> - <package>susehelp_en</package> - <package>susehelp_es</package> - <package>susehelp_fr</package> - <package>susehelp_hu</package> - <package>susehelp_it</package> - <package>swig</package> - <package>syslogd</package> - <package>t1lib</package> - <package>t1lib-devel</package> - <package>taglib</package> - <package>taglib-devel</package> - <package>taglib-sharp</package> - <package>tango-icon-theme</package> - <package>tcl-devel</package> - <package>tcpd-devel</package> - <package>telepathy-glib-devel</package> - <package>telepathy-mission-control</package> - <package>telepathy-mission-control-devel</package> - <package>texlive-bin-devel</package> - <package>texlive-devel</package> - <package>tk-devel</package> - <package>tla</package> - <package>tn5250</package> - <package>tn5250-devel</package> - <package>tomoe</package> - <package>tomoe-devel</package> - <package>tomoe-gtk</package> - <package>tomoe-gtk-devel</package> - <package>tomoe-gtk-lang</package> - <package>totem-pl-parser</package> - <package>totem-pl-parser-devel</package> - <package>totem-pl-parser-lang</package> - <package>trousers</package> - <package>trousers-devel</package> - <package>tsclient</package> - <package>tsclient-devel</package> - <package>tsclient-lang</package> - <package>uim</package> - <package>uim-devel</package> - <package>unixODBC</package> - <package>unixODBC-devel</package> - <package>unsermake</package> - <package>update-desktop-files</package> - <package>usb_modeswitch</package> - <package>usb_modeswitch-data</package> - <package>valgrind</package> - <package>valgrind-devel</package> - <package>vte</package> - <package>vte-devel</package> - <package>vte-lang</package> - <package>wdiff</package> - <package>webkit-sharp</package> - <package>wireshark</package> - <package>wireshark-devel</package> - <package>wodim-devel</package> - <package>wordcut</package> - <package>wordcut-devel</package> - <package>words</package> - <package>wpa_supplicant</package> - <package>wvstreams</package> - <package>wvstreams-devel</package> - <package>wxGTK-compat</package> - <package>wxGTK-devel</package> - <package>wxGTK-gl</package> - <package>x11-input-wacom</package> - <package>x11-input-wacom-devel</package> - <package>x11-input-wacom-tools</package> - <package>xalan-j2</package> - <package>xaw3d-devel</package> - <package>xbase</package> - <package>xbase-devel</package> - <package>xdelta</package> - <package>xdelta-devel</package> - <package>xdg-menu</package> - <package>xen-devel</package> - <package>xen-libs</package> - <package>xerces-j2</package> - <package>xerces-j2-bootstrap</package> - <package>xerces-j2-xml-apis</package> - <package>xfsprogs-devel</package> - <package>xml-commons-apis-bootstrap</package> - <package>xml-commons-resolver-bootstrap</package> - <package>xml-commons-which-bootstrap</package> - <package>xmlcharent</package> - <package>xorg-x11</package> - <package>xorg-x11-devel</package> - <package>xorg-x11-fonts</package> - <package>xorg-x11-fonts-core</package> - <package>xorg-x11-fonts-devel</package> - <package>xorg-x11-libICE-devel</package> - <package>xorg-x11-libSM-devel</package> - <package>xorg-x11-libX11-devel</package> - <package>xorg-x11-libXau-devel</package> - <package>xorg-x11-libXdmcp-devel</package> - <package>xorg-x11-libXext-devel</package> - <package>xorg-x11-libXfixes-devel</package> - <package>xorg-x11-libXmu-devel</package> - <package>xorg-x11-libXp-devel</package> - <package>xorg-x11-libXpm-devel</package> - <package>xorg-x11-libXprintUtil-devel</package> - <package>xorg-x11-libXrender-devel</package> - <package>xorg-x11-libXt-devel</package> - <package>xorg-x11-libXv-devel</package> - <package>xorg-x11-libfontenc-devel</package> - <package>xorg-x11-libxcb-devel</package> - <package>xorg-x11-libxkbfile-devel</package> - <package>xorg-x11-proto-devel</package> - <package>xorg-x11-server</package> - <package>xorg-x11-util-devel</package> - <package>xorg-x11-xauth</package> - <package>xorg-x11-xtrans-devel</package> - <package>xosd</package> - <package>xosd-devel</package> - <package>xsp</package> - <package>xterm</package> - <package>xz-devel</package> - <package>yast2-core-devel</package> - <package>yast2-devtools</package> - <package>yast2-gtk</package> - <package>yast2-libyui-devel</package> - <package>yast2-ncurses-devel</package> - <package>yast2-qt</package> - <package>yast2-qt-devel</package> - <package>yast2-qt-pkg</package> - <package>yast2-storage-devel</package> - <package>yast2-ycp-ui-bindings-devel</package> - <package>yelp</package> - <package>yelp-lang</package> - <package>zenity</package> - <package>zenity-lang</package> - <package>zlib-devel</package> - <package>zsh</package> - <package>zvbi-devel</package> - </remove-packages> - - </software> - <user_defaults> - <expire></expire> - <group>100</group> - <groups>video,dialout</groups> - <home>/home</home> - <inactive>-1</inactive> - <shell>/bin/bash</shell> - <skel>/etc/skel</skel> - <umask>022</umask> - </user_defaults> - <users config:type="list"> - <user> - <encrypted config:type="boolean">true</encrypted> - <fullname>vagrant</fullname> - <gid>100</gid> - <home>/home/vagrant</home> - <password_settings> - <expire></expire> - <flag></flag> - <inact></inact> - <max>99999</max> - <min>0</min> - <warn>7</warn> - </password_settings> - <shell>/bin/bash</shell> - <uid>1000</uid> - <user_password>$2y$05$NA1Li9ZKJOLRW5mMTXm6/e5r8dltWS5RpDZpvHrI82aLE00V51tdi</user_password> - <username>vagrant</username> - </user> - <user> - <encrypted config:type="boolean">true</encrypted> - <fullname>Games account</fullname> - <gid>100</gid> - <home>/var/games</home> - <password_settings> - <expire></expire> - <flag></flag> - <inact></inact> - <max></max> - <min></min> - <warn></warn> - </password_settings> - <shell>/bin/bash</shell> - <uid>12</uid> - <user_password>*</user_password> - <username>games</username> - </user> - <user> - <encrypted config:type="boolean">true</encrypted> - <fullname>bin</fullname> - <gid>1</gid> - <home>/bin</home> - <password_settings> - <expire></expire> - <flag></flag> - <inact></inact> - <max></max> - <min></min> - <warn></warn> - </password_settings> - <shell>/bin/bash</shell> - <uid>1</uid> - <user_password>*</user_password> - <username>bin</username> - </user> - <user> - <encrypted config:type="boolean">true</encrypted> - <fullname>nobody</fullname> - <gid>65533</gid> - <home>/var/lib/nobody</home> - <password_settings> - <expire></expire> - <flag></flag> - <inact></inact> - <max></max> - <min></min> - <warn></warn> - </password_settings> - <shell>/bin/bash</shell> - <uid>65534</uid> - <user_password>*</user_password> - <username>nobody</username> - </user> - <user> - <encrypted config:type="boolean">true</encrypted> - <fullname>Printing daemon</fullname> - <gid>7</gid> - <home>/var/spool/lpd</home> - <password_settings> - <expire></expire> - <flag></flag> - <inact></inact> - <max></max> - <min></min> - <warn></warn> - </password_settings> - <shell>/bin/bash</shell> - <uid>4</uid> - <user_password>*</user_password> - <username>lp</username> - </user> - <user> - <encrypted config:type="boolean">true</encrypted> - <fullname>User for uuidd</fullname> - <gid>104</gid> - <home>/var/run/uuidd</home> - <password_settings> - <expire></expire> - <flag></flag> - <inact></inact> - <max>99999</max> - <min>0</min> - <warn>7</warn> - </password_settings> - <shell>/bin/false</shell> - <uid>102</uid> - <user_password>*</user_password> - <username>uuidd</username> - </user> - <user> - <encrypted config:type="boolean">true</encrypted> - <fullname>Postfix Daemon</fullname> - <gid>51</gid> - <home>/var/spool/postfix</home> - <password_settings> - <expire></expire> - <flag></flag> - <inact></inact> - <max>99999</max> - <min>0</min> - <warn>7</warn> - </password_settings> - <shell>/bin/false</shell> - <uid>51</uid> - <user_password>*</user_password> - <username>postfix</username> - </user> - <user> - <encrypted config:type="boolean">true</encrypted> - <fullname>Novell Customer Center User</fullname> - <gid>111</gid> - <home>/var/lib/YaST2/suse-ncc-fakehome</home> - <password_settings> - <expire></expire> - <flag></flag> - <inact></inact> - <max>99999</max> - <min>0</min> - <warn>7</warn> - </password_settings> - <shell>/bin/bash</shell> - <uid>106</uid> - <user_password>*</user_password> - <username>suse-ncc</username> - </user> - <user> - <encrypted config:type="boolean">true</encrypted> - <fullname>FTP account</fullname> - <gid>49</gid> - <home>/srv/ftp</home> - <password_settings> - <expire></expire> - <flag></flag> - <inact></inact> - <max></max> - <min></min> - <warn></warn> - </password_settings> - <shell>/bin/bash</shell> - <uid>40</uid> - <user_password>*</user_password> - <username>ftp</username> - </user> - <user> - <encrypted config:type="boolean">true</encrypted> - <fullname>Gnome Display Manager daemon</fullname> - <gid>112</gid> - <home>/var/lib/gdm</home> - <password_settings> - <expire></expire> - <flag></flag> - <inact></inact> - <max>99999</max> - <min>0</min> - <warn>7</warn> - </password_settings> - <shell>/bin/false</shell> - <uid>107</uid> - <user_password>*</user_password> - <username>gdm</username> - </user> - <user> - <encrypted config:type="boolean">true</encrypted> - <fullname>Batch jobs daemon</fullname> - <gid>25</gid> - <home>/var/spool/atjobs</home> - <password_settings> - <expire></expire> - <flag></flag> - <inact></inact> - <max>99999</max> - <min>0</min> - <warn>7</warn> - </password_settings> - <shell>/bin/bash</shell> - <uid>25</uid> - <user_password>*</user_password> - <username>at</username> - </user> - <user> - <encrypted config:type="boolean">true</encrypted> - <fullname>root</fullname> - <gid>0</gid> - <home>/root</home> - <password_settings> - <expire></expire> - <flag></flag> - <inact></inact> - <max></max> - <min></min> - <warn></warn> - </password_settings> - <shell>/bin/bash</shell> - <uid>0</uid> - <user_password>$2y$05$NA1Li9ZKJOLRW5mMTXm6/e5r8dltWS5RpDZpvHrI82aLE00V51tdi</user_password> - <username>root</username> - </user> - <user> - <encrypted config:type="boolean">true</encrypted> - <fullname>Mailer daemon</fullname> - <gid>12</gid> - <home>/var/spool/clientmqueue</home> - <password_settings> - <expire></expire> - <flag></flag> - <inact></inact> - <max></max> - <min></min> - <warn></warn> - </password_settings> - <shell>/bin/false</shell> - <uid>8</uid> - <user_password>*</user_password> - <username>mail</username> - </user> - <user> - <encrypted config:type="boolean">true</encrypted> - <fullname>Daemon</fullname> - <gid>2</gid> - <home>/sbin</home> - <password_settings> - <expire></expire> - <flag></flag> - <inact></inact> - <max></max> - <min></min> - <warn></warn> - </password_settings> - <shell>/bin/bash</shell> - <uid>2</uid> - <user_password>*</user_password> - <username>daemon</username> - </user> - <user> - <encrypted config:type="boolean">true</encrypted> - <fullname>NTP daemon</fullname> - <gid>108</gid> - <home>/var/lib/ntp</home> - <password_settings> - <expire></expire> - <flag></flag> - <inact></inact> - <max>99999</max> - <min>0</min> - <warn>7</warn> - </password_settings> - <shell>/bin/false</shell> - <uid>74</uid> - <user_password>*</user_password> - <username>ntp</username> - </user> - <user> - <encrypted config:type="boolean">true</encrypted> - <fullname>Unix-to-Unix CoPy system</fullname> - <gid>14</gid> - <home>/etc/uucp</home> - <password_settings> - <expire></expire> - <flag></flag> - <inact></inact> - <max></max> - <min></min> - <warn></warn> - </password_settings> - <shell>/bin/bash</shell> - <uid>10</uid> - <user_password>*</user_password> - <username>uucp</username> - </user> - <user> - <encrypted config:type="boolean">true</encrypted> - <fullname>User for D-Bus</fullname> - <gid>101</gid> - <home>/var/run/dbus</home> - <password_settings> - <expire></expire> - <flag></flag> - <inact></inact> - <max></max> - <min>0</min> - <warn>7</warn> - </password_settings> - <shell>/bin/false</shell> - <uid>100</uid> - <user_password>*</user_password> - <username>messagebus</username> - </user> - <user> - <encrypted config:type="boolean">true</encrypted> - <fullname>User for haldaemon</fullname> - <gid>102</gid> - <home>/var/run/hald</home> - <password_settings> - <expire></expire> - <flag></flag> - <inact></inact> - <max></max> - <min>0</min> - <warn>7</warn> - </password_settings> - <shell>/bin/false</shell> - <uid>101</uid> - <user_password>*</user_password> - <username>haldaemon</username> - </user> - <user> - <encrypted config:type="boolean">true</encrypted> - <fullname>WWW daemon apache</fullname> - <gid>8</gid> - <home>/var/lib/wwwrun</home> - <password_settings> - <expire></expire> - <flag></flag> - <inact></inact> - <max></max> - <min></min> - <warn></warn> - </password_settings> - <shell>/bin/false</shell> - <uid>30</uid> - <user_password>*</user_password> - <username>wwwrun</username> - </user> - <user> - <encrypted config:type="boolean">true</encrypted> - <fullname>Manual pages viewer</fullname> - <gid>62</gid> - <home>/var/cache/man</home> - <password_settings> - <expire></expire> - <flag></flag> - <inact></inact> - <max></max> - <min></min> - <warn></warn> - </password_settings> - <shell>/bin/bash</shell> - <uid>13</uid> - <user_password>*</user_password> - <username>man</username> - </user> - <user> - <encrypted config:type="boolean">true</encrypted> - <fullname>PolicyKit</fullname> - <gid>107</gid> - <home>/var/run/PolicyKit</home> - <password_settings> - <expire></expire> - <flag></flag> - <inact></inact> - <max>99999</max> - <min>0</min> - <warn>7</warn> - </password_settings> - <shell>/bin/false</shell> - <uid>104</uid> - <user_password>*</user_password> - <username>polkituser</username> - </user> - <user> - <encrypted config:type="boolean">true</encrypted> - <fullname>News system</fullname> - <gid>13</gid> - <home>/etc/news</home> - <password_settings> - <expire></expire> - <flag></flag> - <inact></inact> - <max></max> - <min></min> - <warn></warn> - </password_settings> - <shell>/bin/bash</shell> - <uid>9</uid> - <user_password>*</user_password> - <username>news</username> - </user> - <user> - <fullname>SSH daemon</fullname> - <gid>65</gid> - <home>/var/lib/sshd</home> - <shell>/bin/false</shell> - <uid>71</uid> - <username>sshd</username> - </user> - <user> - <encrypted config:type="boolean">true</encrypted> - <fullname>PulseAudio daemon</fullname> - <gid>109</gid> - <home>/var/lib/pulseaudio</home> - <password_settings> - <expire></expire> - <flag></flag> - <inact></inact> - <max>99999</max> - <min>0</min> - <warn>7</warn> - </password_settings> - <shell>/bin/false</shell> - <uid>105</uid> - <user_password>*</user_password> - <username>pulse</username> - </user> - </users> -</profile> diff --git a/definitions/sles-11-sp3-i386/cleanup.sh b/definitions/sles-11-sp3-i386/cleanup.sh deleted file mode 100644 index 6b6548a6d..000000000 --- a/definitions/sles-11-sp3-i386/cleanup.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/bash -eux - -# remove zypper locks on removed packages to avoid later dependency problems -zypper --non-interactive rl \* -# zypper --non-interactive remove `rpm -qa virtualbox-guest-*` >/dev/null 2>&1 -# Add an online copy of the SLES DVD1 as a software repository, instead of the mounted DVD -zypper removerepo 'SUSE-Linux-Enterprise-Server-11-SP3 11.3.3-1.138' -zypper addrepo 'http://demeter.uni-regensburg.de/SLES11SP3-x86/DVD1/' 'SLES11SP3-x86 DVD1 Online' -zypper refresh diff --git a/definitions/sles-11-sp3-i386/definition.rb b/definitions/sles-11-sp3-i386/definition.rb deleted file mode 100644 index 42d8f71a0..000000000 --- a/definitions/sles-11-sp3-i386/definition.rb +++ /dev/null @@ -1,12 +0,0 @@ -require File.dirname(__FILE__) + "/../.suse/session.rb" - -iso = "SLES-11-SP3-DVD-i586-GM-DVD1.iso" - -session = - SUSE_SESSION.merge( :memory_size=> '480', - :iso_download_instructions => "Download 60-day evaluation from http://download.novell.com/protected/Summary.jsp?buildid=4uiuDMzX0ck~", - :iso_file => iso, - :iso_md5 => "5c30a409fc8fb3343b4dc90d93ff2c89", - :iso_src => "") - -Veewee::Session.declare session diff --git a/definitions/sles-11-sp3-i386/minimize.sh b/definitions/sles-11-sp3-i386/minimize.sh deleted file mode 120000 index b3632ccbc..000000000 --- a/definitions/sles-11-sp3-i386/minimize.sh +++ /dev/null @@ -1 +0,0 @@ -../.common/minimize.sh \ No newline at end of file diff --git a/definitions/sles-11-sp3-i386/sshd.sh b/definitions/sles-11-sp3-i386/sshd.sh deleted file mode 120000 index f353f2d00..000000000 --- a/definitions/sles-11-sp3-i386/sshd.sh +++ /dev/null @@ -1 +0,0 @@ -../.common/sshd.sh \ No newline at end of file diff --git a/definitions/sles-11-sp3-i386/sudoers.sh b/definitions/sles-11-sp3-i386/sudoers.sh deleted file mode 120000 index 18d9cf04d..000000000 --- a/definitions/sles-11-sp3-i386/sudoers.sh +++ /dev/null @@ -1 +0,0 @@ -../.suse/sudoers.sh \ No newline at end of file diff --git a/definitions/sles-11-sp3-i386/vagrant.sh b/definitions/sles-11-sp3-i386/vagrant.sh deleted file mode 120000 index 702949639..000000000 --- a/definitions/sles-11-sp3-i386/vagrant.sh +++ /dev/null @@ -1 +0,0 @@ -../.common/vagrant.sh \ No newline at end of file diff --git a/definitions/sles-11-sp3/autoinst.xml b/definitions/sles-11-sp3/autoinst.xml deleted file mode 100644 index 9eca2bea0..000000000 --- a/definitions/sles-11-sp3/autoinst.xml +++ /dev/null @@ -1,2569 +0,0 @@ -<?xml version="1.0"?> -<!DOCTYPE profile> -<profile xmlns="http://www.suse.com/1.0/yast2ns" xmlns:config="http://www.suse.com/1.0/configns"> - <add-on> - <add_on_products config:type="list"> - <listentry> - <media_url><![CDATA[http://demeter.uni-regensburg.de/SLE11SP3-SDK-x64/DVD1/]]></media_url> - <product>sle-sdk</product> - <product_dir>/</product_dir> - </listentry> - </add_on_products> - </add-on> - <bootloader> - <device_map config:type="list"> - <device_map_entry> - <firmware>hd0</firmware> - <linux>/dev/sda</linux> - </device_map_entry> - </device_map> - <global> - <activate>true</activate> - <boot_root>true</boot_root> - <default>SUSE Linux Enterprise Server 11 SP3 - 3.0.76-0.11</default> - <generic_mbr>true</generic_mbr> - <gfxmenu>/boot/message</gfxmenu> - <lines_cache_id>2</lines_cache_id> - <timeout config:type="integer">8</timeout> - </global> - <initrd_modules config:type="list"> - <initrd_module> - <module>ahci</module> - </initrd_module> - <initrd_module> - <module>ata_piix</module> - </initrd_module> - <initrd_module> - <module>ata_generic</module> - </initrd_module> - <initrd_module> - <module>jbd</module> - </initrd_module> - <initrd_module> - <module>mbcache</module> - </initrd_module> - <initrd_module> - <module>ext3</module> - </initrd_module> - </initrd_modules> - <loader_type>grub</loader_type> - <sections config:type="list"> - <section> - <append>resume=/dev/sda1 splash=silent crashkernel=128M-:64M showopts</append> - <image>(hd0,1)/boot/vmlinuz-3.0.76-0.11-default</image> - <initial>1</initial> - <initrd>(hd0,1)/boot/initrd-3.0.76-0.11-default</initrd> - <lines_cache_id>0</lines_cache_id> - <name>SUSE Linux Enterprise Server 11 SP3 - 3.0.76-0.11</name> - <original_name>linux</original_name> - <root>/dev/sda2</root> - <type>image</type> - <vgamode>0x314</vgamode> - </section> - <section> - <append>showopts ide=nodma apm=off noresume edd=off powersaved=off nohz=off highres=off processor.max_cstate=1 nomodeset x11failsafe</append> - <image>(hd0,1)/boot/vmlinuz-3.0.76-0.11-default</image> - <initrd>(hd0,1)/boot/initrd-3.0.76-0.11-default</initrd> - <lines_cache_id>1</lines_cache_id> - <name>Failsafe -- SUSE Linux Enterprise Server 11 SP3 - 3.0.76-0.11</name> - <original_name>failsafe</original_name> - <root>/dev/sda2</root> - <type>image</type> - <vgamode>0x314</vgamode> - </section> - </sections> - </bootloader> - <ca_mgm> - <CAName>YaST_Default_CA</CAName> - <ca_commonName>YaST Default CA (vagrant-sles-11sp3-x64)</ca_commonName> - <country>US</country> - <locality></locality> - <organisation></organisation> - <organisationUnit></organisationUnit> - <password>ENTER PASSWORD HERE</password> - <server_commonName>vagrant-sles-11sp3-x64.vagrantup.com</server_commonName> - <server_email>postmaster@vagrantup.com</server_email> - <state></state> - <takeLocalServerName config:type="boolean">false</takeLocalServerName> - </ca_mgm> - <deploy_image> - <image_installation config:type="boolean">false</image_installation> - </deploy_image> - <general> - <ask-list config:type="list"/> - <mode> - <confirm config:type="boolean">false</confirm> - </mode> - <mouse> - <id>none</id> - </mouse> - <proposals config:type="list"/> - <signature-handling> - <accept_file_without_checksum config:type="boolean">true</accept_file_without_checksum> - <accept_non_trusted_gpg_key config:type="boolean">true</accept_non_trusted_gpg_key> - <accept_unknown_gpg_key config:type="boolean">true</accept_unknown_gpg_key> - <accept_unsigned_file config:type="boolean">true</accept_unsigned_file> - <accept_verification_failed config:type="boolean">false</accept_verification_failed> - <import_gpg_key config:type="boolean">true</import_gpg_key> - </signature-handling> - <storage/> - </general> - <groups config:type="list"> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>100</gid> - <group_password>x</group_password> - <groupname>users</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>19</gid> - <group_password>x</group_password> - <groupname>floppy</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>1</gid> - <group_password>x</group_password> - <groupname>bin</groupname> - <userlist>daemon</userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>41</gid> - <group_password>x</group_password> - <groupname>xok</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>65533</gid> - <group_password>x</group_password> - <groupname>nobody</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>43</gid> - <group_password>x</group_password> - <groupname>modem</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>5</gid> - <group_password>x</group_password> - <groupname>tty</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>7</gid> - <group_password>x</group_password> - <groupname>lp</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>104</gid> - <group_password>!</group_password> - <groupname>uuidd</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>51</gid> - <group_password>!</group_password> - <groupname>postfix</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>112</gid> - <group_password>!</group_password> - <groupname>gdm</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>65534</gid> - <group_password>x</group_password> - <groupname>nogroup</groupname> - <userlist>nobody</userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>101</gid> - <group_password>!</group_password> - <groupname>messagebus</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>59</gid> - <group_password>!</group_password> - <groupname>maildrop</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>33</gid> - <group_password>x</group_password> - <groupname>video</groupname> - <userlist>vagrant</userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>3</gid> - <group_password>x</group_password> - <groupname>sys</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>15</gid> - <group_password>x</group_password> - <groupname>shadow</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>20</gid> - <group_password>x</group_password> - <groupname>cdrom</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>21</gid> - <group_password>x</group_password> - <groupname>console</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>42</gid> - <group_password>x</group_password> - <groupname>trusted</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>102</gid> - <group_password>!</group_password> - <groupname>haldaemon</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>106</gid> - <group_password>!</group_password> - <groupname>puppet</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>16</gid> - <group_password>x</group_password> - <groupname>dialout</groupname> - <userlist>vagrant</userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>107</gid> - <group_password>!</group_password> - <groupname>polkituser</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>10</gid> - <group_password>x</group_password> - <groupname>wheel</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>109</gid> - <group_password>!</group_password> - <groupname>pulse</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>8</gid> - <group_password>x</group_password> - <groupname>www</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>40</gid> - <group_password>x</group_password> - <groupname>games</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>6</gid> - <group_password>x</group_password> - <groupname>disk</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>17</gid> - <group_password>x</group_password> - <groupname>audio</groupname> - <userlist>pulse</userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>111</gid> - <group_password>!</group_password> - <groupname>suse-ncc</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>49</gid> - <group_password>x</group_password> - <groupname>ftp</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>103</gid> - <group_password>!</group_password> - <groupname>tape</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>25</gid> - <group_password>!</group_password> - <groupname>at</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>9</gid> - <group_password>x</group_password> - <groupname>kmem</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>32</gid> - <group_password>x</group_password> - <groupname>public</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>12</gid> - <group_password>x</group_password> - <groupname>mail</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>0</gid> - <group_password>x</group_password> - <groupname>root</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>2</gid> - <group_password>x</group_password> - <groupname>daemon</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>105</gid> - <group_password>!</group_password> - <groupname>sfcb</groupname> - <userlist>root</userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>108</gid> - <group_password>!</group_password> - <groupname>ntp</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>14</gid> - <group_password>x</group_password> - <groupname>uucp</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>110</gid> - <group_password>!</group_password> - <groupname>pulse-access</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>71</gid> - <group_password>!</group_password> - <groupname>ntadmin</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>62</gid> - <group_password>x</group_password> - <groupname>man</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>22</gid> - <group_password>x</group_password> - <groupname>utmp</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>13</gid> - <group_password>x</group_password> - <groupname>news</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>65</gid> - <group_password>!</group_password> - <groupname>sshd</groupname> - <userlist></userlist> - </group> - </groups> - <host> - <hosts config:type="list"> - <hosts_entry> - <host_address>127.0.0.1</host_address> - <names config:type="list"> - <name>localhost</name> - </names> - </hosts_entry> - <hosts_entry> - <host_address>::1</host_address> - <names config:type="list"> - <name>localhost ipv6-localhost ipv6-loopback</name> - </names> - </hosts_entry> - <hosts_entry> - <host_address>fe00::0</host_address> - <names config:type="list"> - <name>ipv6-localnet</name> - </names> - </hosts_entry> - <hosts_entry> - <host_address>ff00::0</host_address> - <names config:type="list"> - <name>ipv6-mcastprefix</name> - </names> - </hosts_entry> - <hosts_entry> - <host_address>ff02::1</host_address> - <names config:type="list"> - <name>ipv6-allnodes</name> - </names> - </hosts_entry> - <hosts_entry> - <host_address>ff02::2</host_address> - <names config:type="list"> - <name>ipv6-allrouters</name> - </names> - </hosts_entry> - <hosts_entry> - <host_address>ff02::3</host_address> - <names config:type="list"> - <name>ipv6-allhosts</name> - </names> - </hosts_entry> - </hosts> - </host> - <login_settings/> - <networking> - <dhcp_options> - <dhclient_client_id></dhclient_client_id> - <dhclient_hostname_option>AUTO</dhclient_hostname_option> - </dhcp_options> - <dns> - <dhcp_hostname config:type="boolean">false</dhcp_hostname> - <domain>vagrantup.com</domain> - <hostname>vagrant-sles-11sp3-x64</hostname> - <resolv_conf_policy>auto</resolv_conf_policy> - <searchlist config:type="list"> - <search>vagrantup.com</search> - </searchlist> - <write_hostname config:type="boolean">true</write_hostname> - </dns> - <interfaces config:type="list"> - <interface> - <bootproto>dhcp</bootproto> - <device>eth0</device> - <name>82540EM Gigabit Ethernet Controller</name> - <startmode>auto</startmode> - <usercontrol>no</usercontrol> - </interface> - </interfaces> - <managed config:type="boolean">false</managed> - <net-udev config:type="list"> - <rule> - <name>eth0</name> - <rule>KERNELS</rule> - <value>0000:00:03.0</value> - </rule> - </net-udev> - <routing> - <ip_forward config:type="boolean">false</ip_forward> - </routing> - </networking> - <partitioning config:type="list"> - <drive> - <device>/dev/sda</device> - <initialize config:type="boolean">true</initialize> - <partitions config:type="list"> - <partition> - <create config:type="boolean">true</create> - <crypt_fs config:type="boolean">false</crypt_fs> - <filesystem config:type="symbol">swap</filesystem> - <format config:type="boolean">true</format> - <fstopt>defaults</fstopt> - <loop_fs config:type="boolean">false</loop_fs> - <mount>swap</mount> - <mountby config:type="symbol">device</mountby> - <partition_id config:type="integer">130</partition_id> - <partition_nr config:type="integer">1</partition_nr> - <raid_options/> - <resize config:type="boolean">false</resize> - <size>1561492992</size> - </partition> - <partition> - <create config:type="boolean">true</create> - <crypt_fs config:type="boolean">false</crypt_fs> - <filesystem config:type="symbol">ext3</filesystem> - <format config:type="boolean">true</format> - <fstopt>acl,user_xattr</fstopt> - <loop_fs config:type="boolean">false</loop_fs> - <mount>/</mount> - <mountby config:type="symbol">device</mountby> - <partition_id config:type="integer">131</partition_id> - <partition_nr config:type="integer">2</partition_nr> - <raid_options/> - <resize config:type="boolean">false</resize> - <size>19895844352</size> - </partition> - </partitions> - <pesize></pesize> - <type config:type="symbol">CT_DISK</type> - <use>all</use> - </drive> - </partitioning> - <report> - <errors> - <log config:type="boolean">true</log> - <show config:type="boolean">true</show> - <timeout config:type="integer">0</timeout> - </errors> - <messages> - <log config:type="boolean">true</log> - <show config:type="boolean">true</show> - <timeout config:type="integer">0</timeout> - </messages> - <warnings> - <log config:type="boolean">true</log> - <show config:type="boolean">true</show> - <timeout config:type="integer">0</timeout> - </warnings> - <yesno_messages> - <log config:type="boolean">true</log> - <show config:type="boolean">true</show> - <timeout config:type="integer">0</timeout> - </yesno_messages> - </report> - <software> - - <packages config:type="list"> - <package>desktop-translations</package> - <package>gconf2-branding-SLES</package> - <package>libproxy0-config-gnome</package> - <package>sle-sdk-release</package> - <package>sle-sdk-release-SDK</package> - <package>sles-manuals_en</package> - <package>yast2-trans-en_US</package> - </packages> - <patterns config:type="list"> - <pattern>Basis-Devel</pattern> - <pattern>Minimal</pattern> - <pattern>apparmor</pattern> - <pattern>base</pattern> - <pattern>sdk_kernel</pattern> - </patterns> - <remove-packages config:type="list"> - <package>3ddiag</package> - <package>CASA</package> - <package>CASA-devel</package> - <package>CASA_auth_token_client</package> - <package>CASA_auth_token_client-devel</package> - <package>ConsoleKit-devel</package> - <package>ConsoleKit-x11</package> - <package>DirectFB-devel</package> - <package>FastCGI</package> - <package>IlmBase</package> - <package>IlmBase-devel</package> - <package>ImageMagick</package> - <package>ImageMagick-devel</package> - <package>LibVNCServer</package> - <package>LibVNCServer-devel</package> - <package>Mesa</package> - <package>Mesa-devel</package> - <package>ModemManager</package> - <package>Modules</package> - <package>NetworkManager</package> - <package>NetworkManager-devel</package> - <package>NetworkManager-glib</package> - <package>NetworkManager-gnome</package> - <package>NetworkManager-kde4</package> - <package>NetworkManager-kde4-lang</package> - <package>NetworkManager-kde4-libs</package> - <package>OpenEXR</package> - <package>OpenEXR-devel</package> - <package>OpenIPMI-devel</package> - <package>PackageKit</package> - <package>PackageKit-devel</package> - <package>PackageKit-lang</package> - <package>PolicyKit-devel</package> - <package>PolicyKit-gnome</package> - <package>PolicyKit-gnome-devel</package> - <package>PolicyKit-gnome-libs</package> - <package>SDL-devel</package> - <package>SDL_net</package> - <package>SDL_net-devel</package> - <package>TeX-Guy</package> - <package>TeX-Guy-devel</package> - <package>VFlib3</package> - <package>VFlib3-devel</package> - <package>WindowMaker</package> - <package>WindowMaker-devel</package> - <package>a2ps</package> - <package>aalib</package> - <package>aalib-devel</package> - <package>akonadi-runtime</package> - <package>akregator</package> - <package>alsa-devel</package> - <package>alsa-firmware</package> - <package>alsa-plugins-pulse</package> - <package>alsa-tools</package> - <package>alsa-tools-devel</package> - <package>anthy</package> - <package>anthy-devel</package> - <package>antlr</package> - <package>apache2</package> - <package>apache2-devel</package> - <package>apache2-mod_perl</package> - <package>apache2-mod_perl-devel</package> - <package>apache2-prefork</package> - <package>apache2-utils</package> - <package>apache2-worker</package> - <package>apparmor-profile-editor</package> - <package>art-sharp2</package> - <package>arts</package> - <package>arts-devel</package> - <package>aspell-devel</package> - <package>at-spi</package> - <package>at-spi-devel</package> - <package>at-spi-lang</package> - <package>atk-devel</package> - <package>audiofile</package> - <package>audiofile-devel</package> - <package>audit-devel</package> - <package>augeas-lenses</package> - <package>automoc4</package> - <package>avahi</package> - <package>avahi-compat-howl-devel</package> - <package>avahi-compat-mDNSResponder-devel</package> - <package>avahi-lang</package> - <package>babl-0_0</package> - <package>banshee-1</package> - <package>banshee-1-backend-engine-gstreamer</package> - <package>banshee-1-backend-platform-gnome</package> - <package>banshee-1-backend-platform-unix</package> - <package>banshee-1-devel</package> - <package>banshee-1-extensions-default</package> - <package>banshee-1-lang</package> - <package>beagle-devel</package> - <package>bind-devel</package> - <package>binutils-devel</package> - <package>bluez</package> - <package>bluez-devel</package> - <package>boo</package> - <package>boo-devel</package> - <package>boost-devel</package> - <package>bootsplash-branding-SLED</package> - <package>cairo-devel</package> - <package>cairomm</package> - <package>cairomm-devel</package> - <package>canna</package> - <package>canna-devel</package> - <package>canna-libs</package> - <package>cannadic</package> - <package>capi4linux</package> - <package>capi4linux-devel</package> - <package>cdk</package> - <package>cdk-devel</package> - <package>cdrdao</package> - <package>chasen</package> - <package>chasen-devel</package> - <package>check</package> - <package>check-devel</package> - <package>chmlib</package> - <package>chmlib-devel</package> - <package>cim-schema</package> - <package>clucene-core</package> - <package>clucene-core-devel</package> - <package>cmake</package> - <package>compiz</package> - <package>compiz-branding-SLE</package> - <package>compiz-devel</package> - <package>compiz-gnome</package> - <package>coolkey-devel</package> - <package>cracklib-devel</package> - <package>crash-devel</package> - <package>crimson</package> - <package>cscope</package> - <package>cups</package> - <package>cups-devel</package> - <package>cvsps</package> - <package>cyrus-imapd-devel</package> - <package>cyrus-sasl-crammd5</package> - <package>cyrus-sasl-devel</package> - <package>dante</package> - <package>dante-devel</package> - <package>db1</package> - <package>db1-devel</package> - <package>db43</package> - <package>db43-devel</package> - <package>dbus-1-devel</package> - <package>dbus-1-glib-devel</package> - <package>dbus-1-python-devel</package> - <package>dbus-1-qt3</package> - <package>dbus-1-qt3-devel</package> - <package>dbus-1-x11</package> - <package>dejagnu</package> - <package>dejavu</package> - <package>desktop-data-openSUSE</package> - <package>desktop-file-utils</package> - <package>devhelp</package> - <package>devhelp-devel</package> - <package>devhelp-lang</package> - <package>device-mapper-devel</package> - <package>dhcp</package> - <package>dhcp-client</package> - <package>dhcp-devel</package> - <package>diffstat</package> - <package>dmapi-devel</package> - <package>dnsmasq</package> - <package>docbook-xsl-stylesheets</package> - <package>docbook_4</package> - <package>doxygen</package> - <package>dvd+rw-tools</package> - <package>e2fsprogs-devel</package> - <package>emacs</package> - <package>emacs-nox</package> - <package>emacs-x11</package> - <package>enchant</package> - <package>enchant-devel</package> - <package>enscript</package> - <package>eog</package> - <package>eog-devel</package> - <package>eog-lang</package> - <package>espeak</package> - <package>evince</package> - <package>evince-devel</package> - <package>evince-lang</package> - <package>evoldap2-devel</package> - <package>evolution</package> - <package>evolution-data-server</package> - <package>evolution-data-server-devel</package> - <package>evolution-data-server-lang</package> - <package>evolution-devel</package> - <package>evolution-lang</package> - <package>expect-devel</package> - <package>facter</package> - <package>fam</package> - <package>fam-devel</package> - <package>farsight</package> - <package>farsight-devel</package> - <package>festival</package> - <package>festival-devel</package> - <package>fftw</package> - <package>fftw-devel</package> - <package>fftw-mpi</package> - <package>fftw-mpi-devel</package> - <package>fftw-threads</package> - <package>fftw-threads-devel</package> - <package>fftw3</package> - <package>fftw3-devel</package> - <package>fftw3-threads</package> - <package>fftw3-threads-devel</package> - <package>file-devel</package> - <package>fileshareset</package> - <package>finch</package> - <package>finch-devel</package> - <package>flac-devel</package> - <package>fltk</package> - <package>fltk-devel</package> - <package>fontconfig-devel</package> - <package>fonts-config</package> - <package>foomatic-filters</package> - <package>freeglut</package> - <package>freeglut-devel</package> - <package>freeradius-client-devel</package> - <package>freeradius-client-libs</package> - <package>freeradius-server-devel</package> - <package>freeradius-server-libs</package> - <package>freetype</package> - <package>freetype2-devel</package> - <package>fribidi</package> - <package>fribidi-devel</package> - <package>ft2demos</package> - <package>fuse-devel</package> - <package>fwnn-devel</package> - <package>fxload</package> - <package>gcc-gij</package> - <package>gcc-java</package> - <package>gcc43-gij</package> - <package>gcc43-java</package> - <package>gconf-sharp2</package> - <package>gconf2-devel</package> - <package>gconfmm</package> - <package>gconfmm-devel</package> - <package>gd</package> - <package>gd-devel</package> - <package>gdbm-32bit</package> - <package>gdk-pixbuf</package> - <package>gdk-pixbuf-devel</package> - <package>gegl-0_0</package> - <package>gettext-tools</package> - <package>gfxboot-branding-SLED</package> - <package>gfxboot-devel</package> - <package>ggz</package> - <package>ggz-client-libs</package> - <package>ggz-client-libs-devel</package> - <package>ggz-client-libs-lang</package> - <package>ghex</package> - <package>ghex-devel</package> - <package>ghex-lang</package> - <package>ghostscript-devel</package> - <package>ghostscript-fonts-other</package> - <package>ghostscript-fonts-std</package> - <package>ghostscript-ijs-devel</package> - <package>ghostscript-library</package> - <package>ghostscript-omni</package> - <package>ghostscript-x11</package> - <package>giflib-devel</package> - <package>gimp</package> - <package>gimp-branding-SLED</package> - <package>gimp-devel</package> - <package>gimp-lang</package> - <package>gimp-plugins-python</package> - <package>git</package> - <package>git-arch</package> - <package>git-core</package> - <package>git-cvs</package> - <package>git-daemon</package> - <package>git-email</package> - <package>git-gui</package> - <package>git-svn</package> - <package>git-web</package> - <package>gitk</package> - <package>gjdoc</package> - <package>glade-sharp2</package> - <package>glade3</package> - <package>glade3-lang</package> - <package>glib</package> - <package>glib-devel</package> - <package>glib-sharp2</package> - <package>glib2-devel</package> - <package>glibmm2</package> - <package>glibmm2-devel</package> - <package>glitz</package> - <package>glitz-devel</package> - <package>gltt</package> - <package>gltt-devel</package> - <package>gmime-2_4-devel</package> - <package>gmime-devel</package> - <package>gmp-devel</package> - <package>gnet</package> - <package>gnet-devel</package> - <package>gnokii</package> - <package>gnokii-devel</package> - <package>gnokii-smsd</package> - <package>gnome-certauth-devel</package> - <package>gnome-control-center</package> - <package>gnome-control-center-devel</package> - <package>gnome-control-center-lang</package> - <package>gnome-desktop</package> - <package>gnome-desktop-devel</package> - <package>gnome-desktop-lang</package> - <package>gnome-doc-utils</package> - <package>gnome-doc-utils-devel</package> - <package>gnome-doc-utils-lang</package> - <package>gnome-keyring-devel</package> - <package>gnome-keyring-sharp</package> - <package>gnome-keyring-sharp-devel</package> - <package>gnome-libs</package> - <package>gnome-libs-devel</package> - <package>gnome-mag</package> - <package>gnome-mag-devel</package> - <package>gnome-mag-lang</package> - <package>gnome-main-menu</package> - <package>gnome-main-menu-lang</package> - <package>gnome-media</package> - <package>gnome-media-devel</package> - <package>gnome-media-lang</package> - <package>gnome-menus</package> - <package>gnome-menus-branding-SLED</package> - <package>gnome-menus-devel</package> - <package>gnome-menus-lang</package> - <package>gnome-mount</package> - <package>gnome-mount-lang</package> - <package>gnome-panel</package> - <package>gnome-panel-devel</package> - <package>gnome-panel-lang</package> - <package>gnome-pilot</package> - <package>gnome-pilot-devel</package> - <package>gnome-pilot-lang</package> - <package>gnome-settings-daemon</package> - <package>gnome-settings-daemon-devel</package> - <package>gnome-settings-daemon-lang</package> - <package>gnome-sharp2</package> - <package>gnome-speech</package> - <package>gnome-speech-devel</package> - <package>gnome-themes</package> - <package>gnome-utils</package> - <package>gnome-utils-devel</package> - <package>gnome-utils-lang</package> - <package>gnome-vfs-sharp2</package> - <package>gnome-vfs2</package> - <package>gnome-vfs2-devel</package> - <package>gnome-vfs2-lang</package> - <package>gnome-vfsmm</package> - <package>gnome-vfsmm-devel</package> - <package>gnopernicus</package> - <package>gnopernicus-devel</package> - <package>gnopernicus-lang</package> - <package>gnutls</package> - <package>goffice</package> - <package>goffice-devel</package> - <package>goffice-lang</package> - <package>goocanvas</package> - <package>goocanvas-devel</package> - <package>goocanvas-lang</package> - <package>goom2k4</package> - <package>goom2k4-devel</package> - <package>graphviz</package> - <package>graphviz-devel</package> - <package>graphviz-gd</package> - <package>graphviz-gnome</package> - <package>gstreamer-0_10</package> - <package>gstreamer-0_10-devel</package> - <package>gstreamer-0_10-lang</package> - <package>gstreamer-0_10-plugins-base</package> - <package>gstreamer-0_10-plugins-base-devel</package> - <package>gstreamer-0_10-plugins-base-lang</package> - <package>gstreamer-0_10-plugins-good</package> - <package>gstreamer-0_10-plugins-good-lang</package> - <package>gstreamer-0_10-utils</package> - <package>gstreamer-utils</package> - <package>gtk</package> - <package>gtk-devel</package> - <package>gtk-lang</package> - <package>gtk-sharp2</package> - <package>gtk-vnc-devel</package> - <package>gtk2-devel</package> - <package>gtkglext</package> - <package>gtkglext-devel</package> - <package>gtkhtml2</package> - <package>gtkhtml2-devel</package> - <package>gtkhtml2-lang</package> - <package>gtkhtml314-sharp</package> - <package>gtkmm2</package> - <package>gtkmm2-devel</package> - <package>gtksourceview-devel</package> - <package>gtksourceview-lang</package> - <package>gtksourceview18</package> - <package>gtksourceview18-devel</package> - <package>gtkspell</package> - <package>gtkspell-devel</package> - <package>gtkspell-lang</package> - <package>gucharmap</package> - <package>gucharmap-devel</package> - <package>gucharmap-lang</package> - <package>guile</package> - <package>guile-devel</package> - <package>gutenprint</package> - <package>gutenprint-devel</package> - <package>gvfs-devel</package> - <package>gxmhtml</package> - <package>hal-devel</package> - <package>hal-palm</package> - <package>htdig</package> - <package>htdig-devel</package> - <package>hunspell</package> - <package>hunspell-devel</package> - <package>hunspell-tools</package> - <package>hwinfo-devel</package> - <package>i4l-base</package> - <package>icewm</package> - <package>icewm-lite</package> - <package>id3lib</package> - <package>id3lib-devel</package> - <package>imap-devel</package> - <package>imap-lib</package> - <package>imlib</package> - <package>imlib-devel</package> - <package>imlib2</package> - <package>imlib2-devel</package> - <package>indent</package> - <package>info2html</package> - <package>inn</package> - <package>inn-devel</package> - <package>intltool</package> - <package>ipadic</package> - <package>iptables-devel</package> - <package>iso-codes</package> - <package>iso-codes-devel</package> - <package>iso_ent</package> - <package>ispell</package> - <package>ispell-american</package> - <package>ispell-brazilian</package> - <package>ispell-british</package> - <package>ispell-czech</package> - <package>ispell-danish</package> - <package>ispell-finnish</package> - <package>ispell-french</package> - <package>ispell-german</package> - <package>ispell-hungarian</package> - <package>ispell-italian</package> - <package>ispell-ngerman</package> - <package>ispell-norsk</package> - <package>ispell-polish</package> - <package>ispell-portuguese</package> - <package>ispell-russian</package> - <package>ispell-slovak</package> - <package>ispell-spanish</package> - <package>ispell-swedish</package> - <package>itcl-devel</package> - <package>java-1_4_2-ibm</package> - <package>java-1_4_2-ibm-devel</package> - <package>java-1_5_0-gcj-compat</package> - <package>java-1_5_0-gcj-compat-devel</package> - <package>java-1_6_0-ibm</package> - <package>java-1_6_0-ibm-devel</package> - <package>joe</package> - <package>jpackage-utils</package> - <package>k3b</package> - <package>k3b-devel</package> - <package>k3b-lang</package> - <package>kaddressbook</package> - <package>kalarm</package> - <package>kde-susetranslations</package> - <package>kde4-filesystem</package> - <package>kde4-kgreeter-plugins</package> - <package>kdebase3</package> - <package>kdebase3-devel</package> - <package>kdebase3-runtime</package> - <package>kdebase4-SLED</package> - <package>kdebase4-SLED-lang</package> - <package>kdebase4-runtime</package> - <package>kdebase4-runtime-branding-SLED</package> - <package>kdebase4-workspace</package> - <package>kdebase4-workspace-branding-SLED</package> - <package>kdebase4-workspace-devel</package> - <package>kdebase4-workspace-ksysguardd</package> - <package>kdelibs3</package> - <package>kdelibs3-arts</package> - <package>kdelibs3-default-style</package> - <package>kdelibs3-devel</package> - <package>kdelibs3-doc</package> - <package>kdelibs4</package> - <package>kdelibs4-branding-SLED</package> - <package>kdelibs4-core</package> - <package>kdelibs4-doc</package> - <package>kdemultimedia3-arts</package> - <package>kdepim3</package> - <package>kdepim4</package> - <package>kdepim4-devel</package> - <package>kdepimlibs4</package> - <package>kdialog</package> - <package>kdm</package> - <package>kdm-branding-SLED</package> - <package>kernel-docs</package> - <package>kernel-syms</package> - <package>kernel-trace-devel</package> - <package>kernel-xen-devel</package> - <package>keyutils-devel</package> - <package>kio_sysinfo</package> - <package>kio_sysinfo-branding-SLED</package> - <package>kmail</package> - <package>knode</package> - <package>kontact</package> - <package>korganizer</package> - <package>kpilot</package> - <package>krb5-devel</package> - <package>ksh-devel</package> - <package>ktorrent</package> - <package>ktorrent-devel</package> - <package>ktorrent-lang</package> - <package>kwin</package> - <package>ladspa-devel</package> - <package>lib3ds-1-3</package> - <package>lib3ds-devel</package> - <package>libFLAC++6</package> - <package>libFLAC8</package> - <package>libHX-devel</package> - <package>libMagick++-devel</package> - <package>libMagick++1</package> - <package>libMagickWand1</package> - <package>libQtWebKit-devel</package> - <package>libQtWebKit4</package> - <package>libXerces-c-devel</package> - <package>libXerces-c28</package> - <package>libXiterm</package> - <package>libXiterm-devel</package> - <package>libacl-devel</package> - <package>libadns-devel</package> - <package>libadns1</package> - <package>libakode</package> - <package>libakode-devel</package> - <package>libakonadi4</package> - <package>libakonadiprotocolinternals-devel</package> - <package>libakonadiprotocolinternals1</package> - <package>libao</package> - <package>libao-devel</package> - <package>libapparmor-devel</package> - <package>libapr-util1</package> - <package>libapr-util1-devel</package> - <package>libapr1</package> - <package>libapr1-devel</package> - <package>libarchive-devel</package> - <package>libart_lgpl</package> - <package>libart_lgpl-devel</package> - <package>libassuan-devel</package> - <package>libatomic-ops-devel</package> - <package>libattr-devel</package> - <package>libavahi-core5</package> - <package>libavahi-devel</package> - <package>libavahi-glib-devel</package> - <package>libavahi-gobject-devel</package> - <package>libavahi-gobject0</package> - <package>libavahi-ui0</package> - <package>libavc1394-0</package> - <package>libavc1394-devel</package> - <package>libbabl-0_0-0</package> - <package>libbeagle-devel</package> - <package>libbeagle-python</package> - <package>libbeagle1</package> - <package>libbitmask-devel</package> - <package>libbitmask1</package> - <package>libblkid-devel</package> - <package>libblocxx-devel</package> - <package>libbonobo</package> - <package>libbonobo-devel</package> - <package>libbonobo-lang</package> - <package>libbonoboui</package> - <package>libbonoboui-devel</package> - <package>libbonoboui-lang</package> - <package>libboost_date_time1_36_0</package> - <package>libboost_filesystem1_36_0</package> - <package>libboost_graph1_36_0</package> - <package>libboost_iostreams1_36_0</package> - <package>libboost_math1_36_0</package> - <package>libboost_mpi1_36_0</package> - <package>libboost_program_options1_36_0</package> - <package>libboost_python1_36_0</package> - <package>libboost_serialization1_36_0</package> - <package>libboost_signals1_36_0</package> - <package>libboost_system1_36_0</package> - <package>libboost_test1_36_0</package> - <package>libboost_thread1_36_0</package> - <package>libboost_wave1_36_0</package> - <package>libbotan-1_6_4</package> - <package>libbotan-devel</package> - <package>libbtctl</package> - <package>libbtctl-devel</package> - <package>libbtctl-lang</package> - <package>libbtctl4</package> - <package>libbz2-devel</package> - <package>libcaca</package> - <package>libcaca-devel</package> - <package>libcanberra-gtk</package> - <package>libcanberra-gtk0</package> - <package>libcanberra0</package> - <package>libcap-devel</package> - <package>libcap-ng0</package> - <package>libcdda_interface0</package> - <package>libcdda_paranoia0</package> - <package>libcddb-devel</package> - <package>libcddb2</package> - <package>libcdio++0</package> - <package>libcdio-devel</package> - <package>libcgroup-devel</package> - <package>libcgroup1</package> - <package>libchewing</package> - <package>libchewing-devel</package> - <package>libcmpiutil</package> - <package>libcmpiutil-devel</package> - <package>libcolorblind0</package> - <package>libcom_err-devel</package> - <package>libcompizconfig</package> - <package>libcompizconfig-devel</package> - <package>libcppunit-1_12-0</package> - <package>libcppunit-devel</package> - <package>libcpuset-devel</package> - <package>libcpuset1</package> - <package>libcroco</package> - <package>libcroco-0_6-3</package> - <package>libcroco-devel</package> - <package>libcryptsetup-devel</package> - <package>libcsync-devel</package> - <package>libcsync0</package> - <package>libcurl-devel</package> - <package>libdaemon-devel</package> - <package>libdaemon0</package> - <package>libdatrie-devel</package> - <package>libdatrie0</package> - <package>libdb-4_5-32bit</package> - <package>libdb-4_5-devel</package> - <package>libdbus-1-qt3-0</package> - <package>libdbus-1-qt3-0-devel</package> - <package>libdc1394-22</package> - <package>libdc1394-devel</package> - <package>libdc1394_control12</package> - <package>libdc1394_control12-devel</package> - <package>libdhcp6client-1_0-2</package> - <package>libdhcp6client-devel</package> - <package>libdigikam-devel</package> - <package>libdiscid1</package> - <package>libdjvulibre-devel</package> - <package>libdjvulibre21</package> - <package>libdmxview-devel</package> - <package>libdmxview0</package> - <package>libdnet-devel</package> - <package>libdnet1</package> - <package>libdns_sd</package> - <package>libdrm</package> - <package>libdrm-devel</package> - <package>libdv-devel</package> - <package>libdv4</package> - <package>libdvdread4</package> - <package>libdw-devel</package> - <package>libebl-devel</package> - <package>libedit-devel</package> - <package>libedit0</package> - <package>libelf-devel</package> - <package>libenchant1</package> - <package>libesd-devel</package> - <package>libesd0</package> - <package>libesmtp-devel</package> - <package>libevoldap-2_4-2</package> - <package>libevtlog-devel</package> - <package>libevtlog0</package> - <package>libexempi-devel</package> - <package>libexempi3</package> - <package>libexif-devel</package> - <package>libexiv2-4</package> - <package>libexiv2-devel</package> - <package>libexpat-devel</package> - <package>libext2fs-devel</package> - <package>libfarsight-0_1-3</package> - <package>libffi-devel</package> - <package>libffi43</package> - <package>libffi43-devel</package> - <package>libflaim-devel</package> - <package>libfprint-devel</package> - <package>libfreebl3</package> - <package>libfreebob</package> - <package>libfreebob-devel</package> - <package>libgadu</package> - <package>libgadu-devel</package> - <package>libgail-gnome</package> - <package>libgail-gnome-devel</package> - <package>libgcj-devel</package> - <package>libgcj43</package> - <package>libgcj43-devel</package> - <package>libgcj43-jar</package> - <package>libgcj_bc43</package> - <package>libgcrypt-devel</package> - <package>libgda-3_0-3</package> - <package>libgda-3_0-devel</package> - <package>libgdiplus0</package> - <package>libgegl-0_0-0</package> - <package>libgeoclue0</package> - <package>libgfortran46</package> - <package>libggz2</package> - <package>libggz2-devel</package> - <package>libgimpprint</package> - <package>libgimpprint-devel</package> - <package>libglade2</package> - <package>libglade2-devel</package> - <package>libglademm</package> - <package>libglademm-2_4-1</package> - <package>libglademm-devel</package> - <package>libgladeui-1-9</package> - <package>libgladeui-1_0-devel</package> - <package>libgmime-2_0-3</package> - <package>libgmime-2_4-2</package> - <package>libgmm++-devel</package> - <package>libgnome</package> - <package>libgnome-certauth0</package> - <package>libgnome-desktop-2-11</package> - <package>libgnome-devel</package> - <package>libgnome-lang</package> - <package>libgnome-menu2</package> - <package>libgnome-window-settings1</package> - <package>libgnomecanvas</package> - <package>libgnomecanvas-devel</package> - <package>libgnomecanvas-lang</package> - <package>libgnomecanvasmm</package> - <package>libgnomecanvasmm-devel</package> - <package>libgnomecups</package> - <package>libgnomecups-devel</package> - <package>libgnomecups-lang</package> - <package>libgnomedb</package> - <package>libgnomedb-devel</package> - <package>libgnomedb-lang</package> - <package>libgnomekbd</package> - <package>libgnomekbd-devel</package> - <package>libgnomekbd-lang</package> - <package>libgnomeprint</package> - <package>libgnomeprint-devel</package> - <package>libgnomeprint-lang</package> - <package>libgnomeprintui</package> - <package>libgnomeprintui-devel</package> - <package>libgnomeprintui-lang</package> - <package>libgnomesu</package> - <package>libgnomesu-devel</package> - <package>libgnomesu-lang</package> - <package>libgnomesu0</package> - <package>libgnomeui</package> - <package>libgnomeui-devel</package> - <package>libgnomeui-lang</package> - <package>libgnomevfsmm-2_6-1</package> - <package>libgnutls-devel</package> - <package>libgnutls-extra-devel</package> - <package>libgnutls-extra26</package> - <package>libgoocanvas3</package> - <package>libgpg-error-devel</package> - <package>libgpgme-devel</package> - <package>libgphoto2-devel</package> - <package>libgpod-devel</package> - <package>libgsf</package> - <package>libgsf-1-114</package> - <package>libgsf-devel</package> - <package>libgsf-gnome</package> - <package>libgsm-devel</package> - <package>libgsm1</package> - <package>libgssglue-devel</package> - <package>libgstapp-0_10-0</package> - <package>libgstinterfaces-0_10-0</package> - <package>libgstreamer-0_10-0</package> - <package>libgtk-vnc-1_0-0</package> - <package>libgtkhtml</package> - <package>libgtkhtml-devel</package> - <package>libgtksourceview-2_0-0</package> - <package>libgtop</package> - <package>libgtop-2_0-7</package> - <package>libgtop-devel</package> - <package>libgtop-lang</package> - <package>libgudev-1_0-0</package> - <package>libgweather</package> - <package>libgweather-devel</package> - <package>libgweather-lang</package> - <package>libgweather1</package> - <package>libhangul</package> - <package>libhangul-devel</package> - <package>libhowl0</package> - <package>libical-devel</package> - <package>libical0</package> - <package>libicu-devel</package> - <package>libid3tag</package> - <package>libid3tag-devel</package> - <package>libidl-devel</package> - <package>libidn-devel</package> - <package>libiec61883</package> - <package>libiec61883-devel</package> - <package>libieee1284</package> - <package>libiniparser-devel</package> - <package>libiniparser0</package> - <package>libiptcdata</package> - <package>libiptcdata-devel</package> - <package>libiptcdata0</package> - <package>libiso9660-5</package> - <package>libiterm</package> - <package>libiterm-devel</package> - <package>libjack-devel</package> - <package>libjack0</package> - <package>libjasper</package> - <package>libjasper-devel</package> - <package>libjingle-0_3-0</package> - <package>libjingle-devel</package> - <package>libjpeg-devel</package> - <package>libkcal</package> - <package>libkcal-devel</package> - <package>libkcal2</package> - <package>libkcddb4</package> - <package>libkcddb4-devel</package> - <package>libkcompactdisc4</package> - <package>libkcompactdisc4-devel</package> - <package>libkdcraw3</package> - <package>libkdcraw3-devel</package> - <package>libkdcraw3-lang</package> - <package>libkde4</package> - <package>libkde4-devel</package> - <package>libkdecore4</package> - <package>libkdecore4-devel</package> - <package>libkdepim4</package> - <package>libkdepim4-devel</package> - <package>libkdepimlibs4</package> - <package>libkdepimlibs4-devel</package> - <package>libkexiv2-3</package> - <package>libkexiv2-3-devel</package> - <package>libkexiv2-7</package> - <package>libkipi-devel</package> - <package>libkipi6</package> - <package>libkmime-devel</package> - <package>libkmime2</package> - <package>libknotificationitem-1-1</package> - <package>libkonq-devel</package> - <package>libkonq5</package> - <package>libksba-devel</package> - <package>libktnef-devel</package> - <package>libktnef1</package> - <package>liblazy-devel</package> - <package>liblazy1</package> - <package>liblcms-devel</package> - <package>libldapcpp-devel</package> - <package>liblog4c-devel</package> - <package>liblog4c3</package> - <package>libloudmouth-1-0</package> - <package>liblpsolve55</package> - <package>liblua5_1</package> - <package>libmalaga-devel</package> - <package>libmalaga7</package> - <package>libmcrypt</package> - <package>libmcrypt-devel</package> - <package>libmikmod</package> - <package>libmikmod-devel</package> - <package>libmm-devel</package> - <package>libmm14</package> - <package>libmng-devel</package> - <package>libmpcdec-devel</package> - <package>libmpcdec5</package> - <package>libmspack-devel</package> - <package>libmtp-devel</package> - <package>libmtp8</package> - <package>libmusicbrainz-devel</package> - <package>libmusicbrainz3-6</package> - <package>libmusicbrainz3-devel</package> - <package>libmusicbrainz4</package> - <package>libmysqlclient-devel</package> - <package>libmysqlclient15</package> - <package>libmysqlclient_r15</package> - <package>libneon-devel</package> - <package>libneon27</package> - <package>libnetapi-devel</package> - <package>libnetapi0</package> - <package>libnetcontrol0</package> - <package>libnetpbm-devel</package> - <package>libnetpbm10</package> - <package>libnewt0_52</package> - <package>libnjb</package> - <package>libnjb-devel</package> - <package>libnjb5</package> - <package>libnl-devel</package> - <package>libnotify</package> - <package>libnotify-devel</package> - <package>libnotify1</package> - <package>libnscd-devel</package> - <package>libnsssharedhelper0</package> - <package>libnuma-devel</package> - <package>libofa-devel</package> - <package>libofa0</package> - <package>libogg-devel</package> - <package>libogg0</package> - <package>liboil</package> - <package>liboil-devel</package> - <package>libopenbabel-devel</package> - <package>libopenbabel3</package> - <package>libopencdk-devel</package> - <package>libopencdk10</package> - <package>libopenraw-devel</package> - <package>libopenraw1</package> - <package>libopenssl-devel</package> - <package>libopensync</package> - <package>libopensync-devel</package> - <package>libopensync-plugin-evolution2</package> - <package>libopensync-plugin-evolution2-devel</package> - <package>libopensync-plugin-palm</package> - <package>libopensync-plugin-palm-devel</package> - <package>liborc-0_4-0</package> - <package>libosip2</package> - <package>libosip2-devel</package> - <package>libotf</package> - <package>libotf-devel</package> - <package>libotr-devel</package> - <package>libotr2</package> - <package>libp11-1</package> - <package>libp11-devel</package> - <package>libpackagekit-glib10</package> - <package>libpackagekit-glib10-devel</package> - <package>libpangomm-1_4-1</package> - <package>libpcap-devel</package> - <package>libpciaccess0</package> - <package>libpciaccess0-devel</package> - <package>libphonon4</package> - <package>libpisock-devel</package> - <package>libpisock9</package> - <package>libpisync-devel</package> - <package>libpisync1</package> - <package>libpixman-1-0-devel</package> - <package>libpkcs11-helper1</package> - <package>libpng-devel</package> - <package>libpolkit-qt0</package> - <package>libpoppler-devel</package> - <package>libpoppler-glib-devel</package> - <package>libpoppler-glib4</package> - <package>libpoppler-qt2</package> - <package>libpoppler-qt3-devel</package> - <package>libpoppler-qt4-3</package> - <package>libpoppler-qt4-devel</package> - <package>libpoppler5</package> - <package>libpst4</package> - <package>libpt2</package> - <package>libpt2-devel</package> - <package>libpulse-browse0</package> - <package>libpulse-devel</package> - <package>libpulse-mainloop-glib0</package> - <package>libpulse0</package> - <package>libpurple</package> - <package>libpurple-devel</package> - <package>libpurple-lang</package> - <package>libqca2</package> - <package>libqca2-devel</package> - <package>libqdialogsolver1</package> - <package>libqdialogsolver1-devel</package> - <package>libqimageblitz-devel</package> - <package>libqimageblitz4</package> - <package>libqscintilla-devel</package> - <package>libqscintilla2-5</package> - <package>libqt4</package> - <package>libqt4-devel</package> - <package>libqt4-qt3support</package> - <package>libqt4-sql</package> - <package>libqt4-sql-mysql</package> - <package>libqt4-sql-postgresql</package> - <package>libqt4-sql-sqlite</package> - <package>libqt4-sql-unixODBC</package> - <package>libqt4-x11</package> - <package>libqtpod-devel</package> - <package>libqtpod0</package> - <package>libquadmath46</package> - <package>libquicktime</package> - <package>libquicktime-devel</package> - <package>libraptor-devel</package> - <package>libraptor1</package> - <package>librasqal-devel</package> - <package>librasqal1</package> - <package>libraw1394-11</package> - <package>libraw1394-8</package> - <package>libraw1394-devel</package> - <package>libredland-devel</package> - <package>libredland0</package> - <package>libreiserfs-devel</package> - <package>libreoffice</package> - <package>libreoffice-base</package> - <package>libreoffice-branding-SLED</package> - <package>libreoffice-branding-upstream</package> - <package>libreoffice-calc</package> - <package>libreoffice-icon-themes</package> - <package>libreoffice-impress</package> - <package>libreoffice-sdk</package> - <package>libreoffice-writer</package> - <package>librsvg</package> - <package>librsvg-devel</package> - <package>libsamplerate</package> - <package>libsamplerate-devel</package> - <package>libsatsolver-devel</package> - <package>libsblim-cmpiutil1</package> - <package>libselinux-devel</package> - <package>libsemanage-devel</package> - <package>libsemanage1</package> - <package>libsensors3-devel</package> - <package>libsensors4</package> - <package>libsepol-devel</package> - <package>libsexy</package> - <package>libsexy-devel</package> - <package>libshout-devel</package> - <package>libshout3</package> - <package>libsidplay1</package> - <package>libsidplay1-devel</package> - <package>libsigc++2</package> - <package>libsigc++2-devel</package> - <package>libslab-lang</package> - <package>libslab0</package> - <package>libsmbclient-devel</package> - <package>libsmbios-devel</package> - <package>libsmbsharemodes-devel</package> - <package>libsmbsharemodes0</package> - <package>libsndfile</package> - <package>libsndfile-devel</package> - <package>libsoprano-devel</package> - <package>libsoprano4</package> - <package>libsoup-devel</package> - <package>libspectre-devel</package> - <package>libspectre1</package> - <package>libspeex</package> - <package>libssh2-devel</package> - <package>libstrigi0</package> - <package>libstroke</package> - <package>libstroke-devel</package> - <package>libsyncml-devel</package> - <package>libsyncml0</package> - <package>libtalloc-devel</package> - <package>libtasn1-devel</package> - <package>libtdb-devel</package> - <package>libtelepathy</package> - <package>libtelepathy-devel</package> - <package>libtelepathy-glib0</package> - <package>libtheora-devel</package> - <package>libtheora0</package> - <package>libtidy</package> - <package>libtidy-devel</package> - <package>libtiff-devel</package> - <package>libtirpc-devel</package> - <package>libtomoe-gtk0</package> - <package>libtspi1</package> - <package>libtunepimp</package> - <package>libtunepimp-devel</package> - <package>libtunepimp5</package> - <package>libudev-devel</package> - <package>libudf0</package> - <package>libunique-1_0-0</package> - <package>libunwind</package> - <package>libunwind-devel</package> - <package>libupsclient1</package> - <package>libusb-devel</package> - <package>libusbpp-0_1-4</package> - <package>libustr-1_0-1</package> - <package>libustr-devel</package> - <package>libuuid-devel</package> - <package>libvirt-client</package> - <package>libvirt-devel</package> - <package>libvisual</package> - <package>libvisual-devel</package> - <package>libvoikko-devel</package> - <package>libvoikko1</package> - <package>libvorbis</package> - <package>libvorbis-devel</package> - <package>libwavpack1</package> - <package>libwbclient-devel</package> - <package>libwbxml2-0</package> - <package>libwbxml2-devel</package> - <package>libwebkit-1_0-1</package> - <package>libwebkit-1_0-2</package> - <package>libwebkit-devel</package> - <package>libwebkit-lang</package> - <package>libwmf</package> - <package>libwmf-devel</package> - <package>libwmf-gnome</package> - <package>libwnck</package> - <package>libwnck-1-22</package> - <package>libwnck-devel</package> - <package>libwnck-lang</package> - <package>libwpd-0_8-8</package> - <package>libwpd-devel</package> - <package>libwpg-0_1-1</package> - <package>libwpg-devel</package> - <package>libwps-0_1-1</package> - <package>libwps-devel</package> - <package>libwsman-devel</package> - <package>libwsman1</package> - <package>libxcrypt-devel</package> - <package>libxine-devel</package> - <package>libxine1</package> - <package>libxklavier-devel</package> - <package>libxklavier15</package> - <package>libxml2-devel</package> - <package>libxslt-devel</package> - <package>libyajl1</package> - <package>libzio-devel</package> - <package>libzip-devel</package> - <package>libzip1</package> - <package>libzvbi0</package> - <package>libzypp-devel</package> - <package>limal-apparmor-notifications</package> - <package>limal-apparmor-notifications-devel</package> - <package>limal-ca-mgm-devel</package> - <package>limal-devel</package> - <package>limal-devtools</package> - <package>limal-nfs-server-devel</package> - <package>linux-atm-devel</package> - <package>linux-atm-lib</package> - <package>lksctp-tools</package> - <package>lksctp-tools-devel</package> - <package>loudmouth-devel</package> - <package>lua</package> - <package>lua-devel</package> - <package>lzo-devel</package> - <package>m17n-db</package> - <package>m17n-lib</package> - <package>m17n-lib-devel</package> - <package>malaga-suomi</package> - <package>meanwhile</package> - <package>meanwhile-devel</package> - <package>metacity</package> - <package>metacity-devel</package> - <package>metacity-lang</package> - <package>mhash</package> - <package>mhash-devel</package> - <package>misc-console-font</package> - <package>mono-addins</package> - <package>mono-basic</package> - <package>mono-core</package> - <package>mono-data</package> - <package>mono-data-oracle</package> - <package>mono-data-sqlite</package> - <package>mono-devel</package> - <package>mono-extras</package> - <package>mono-jscript</package> - <package>mono-tools</package> - <package>mono-wcf</package> - <package>mono-web</package> - <package>mono-winforms</package> - <package>mono-zeroconf</package> - <package>mono-zeroconf-provider-avahi</package> - <package>monodevelop</package> - <package>monodoc-core</package> - <package>mozilla-nspr</package> - <package>mozilla-nspr-devel</package> - <package>mozilla-nss</package> - <package>mozilla-nss-devel</package> - <package>mozilla-xulrunner192</package> - <package>mozilla-xulrunner192-gnome</package> - <package>mpfr-devel</package> - <package>mpi-selector</package> - <package>mpich</package> - <package>mpich-devel</package> - <package>mysql</package> - <package>mysql-client</package> - <package>nagios</package> - <package>nagios-devel</package> - <package>nagios-www</package> - <package>nant</package> - <package>nautilus</package> - <package>nautilus-cd-burner</package> - <package>nautilus-cd-burner-devel</package> - <package>nautilus-cd-burner-lang</package> - <package>nautilus-devel</package> - <package>nautilus-lang</package> - <package>ndesk-dbus</package> - <package>ndesk-dbus-glib</package> - <package>ndesk-dbus-glib-devel</package> - <package>net-snmp</package> - <package>net-snmp-devel</package> - <package>netatalk</package> - <package>netatalk-devel</package> - <package>netcat-openbsd</package> - <package>newt</package> - <package>newt-devel</package> - <package>newt-static</package> - <package>nfsidmap-devel</package> - <package>notification-daemon</package> - <package>notification-daemon-lang</package> - <package>notify-sharp</package> - <package>nss-mdns</package> - <package>nss-shared-helper-devel</package> - <package>nut</package> - <package>nut-classic</package> - <package>nut-devel</package> - <package>opal</package> - <package>opal-devel</package> - <package>openCryptoki</package> - <package>openCryptoki-64bit</package> - <package>openCryptoki-devel</package> - <package>openct-devel</package> - <package>openhpi</package> - <package>openhpi-daemon</package> - <package>openhpi-devel</package> - <package>openjade</package> - <package>openjade-devel</package> - <package>openldap2-devel</package> - <package>openmotif-devel</package> - <package>openmotif-libs</package> - <package>openmpi</package> - <package>openobex-devel</package> - <package>openobex-glib-devel</package> - <package>opensc-devel</package> - <package>openslp-devel</package> - <package>opensp</package> - <package>opensp-devel</package> - <package>openwsman-client</package> - <package>openwsman-server</package> - <package>orbit</package> - <package>orbit-devel</package> - <package>orbit2-devel</package> - <package>oxygen-icon-theme</package> - <package>oxygen-icon-theme-scalable</package> - <package>ozerocdoff</package> - <package>pam-devel</package> - <package>pango-devel</package> - <package>pangomm-devel</package> - <package>parted-devel</package> - <package>patchutils</package> - <package>pciutils-devel</package> - <package>pcre-devel</package> - <package>pcsc-acr38</package> - <package>pcsc-acr38-devel</package> - <package>pcsc-lite-devel</package> - <package>perl-32bit</package> - <package>perl-Crypt-OpenSSL-RSA</package> - <package>perl-Mail-DKIM</package> - <package>perl-MailTools</package> - <package>perl-Net-DNS</package> - <package>perl-Net-IP</package> - <package>perl-NetAddr-IP</package> - <package>perl-SNMP</package> - <package>perl-Tie-IxHash</package> - <package>perl-Tk</package> - <package>perl-Tk-devel</package> - <package>perl-spamassassin</package> - <package>phonon</package> - <package>phonon-backend-gstreamer-0_10</package> - <package>phonon-devel</package> - <package>php5</package> - <package>php5-ctype</package> - <package>php5-devel</package> - <package>php5-dom</package> - <package>php5-hash</package> - <package>php5-iconv</package> - <package>php5-json</package> - <package>php5-pdo</package> - <package>php5-sqlite</package> - <package>php5-suhosin</package> - <package>php5-tokenizer</package> - <package>php5-xmlreader</package> - <package>php5-xmlwriter</package> - <package>php53</package> - <package>php53-ctype</package> - <package>php53-dom</package> - <package>php53-iconv</package> - <package>php53-json</package> - <package>php53-tokenizer</package> - <package>php53-xmlreader</package> - <package>php53-xmlwriter</package> - <package>pidgin</package> - <package>pidgin-devel</package> - <package>pilot-link</package> - <package>pkcs11-helper</package> - <package>pkcs11-helper-devel</package> - <package>planner</package> - <package>planner-devel</package> - <package>planner-lang</package> - <package>plasma-addons</package> - <package>plasma-theme-aya</package> - <package>plasmoid-networkmanagement</package> - <package>plasmoid-quickaccess</package> - <package>plotutils</package> - <package>poppler-data</package> - <package>poppler-tools</package> - <package>popt-devel</package> - <package>portmap</package> - <package>postfix-devel</package> - <package>postgresql-devel</package> - <package>postgresql-libs</package> - <package>ppp-devel</package> - <package>ppp-userpass</package> - <package>pstoedit</package> - <package>pstoedit-devel</package> - <package>pulseaudio</package> - <package>pulseaudio-esound-compat</package> - <package>pulseaudio-lang</package> - <package>puppet</package> - <package>python-cairo</package> - <package>python-cairo-devel</package> - <package>python-devel</package> - <package>python-gnome</package> - <package>python-gnome-devel</package> - <package>python-gobject2</package> - <package>python-gobject2-devel</package> - <package>python-gtk</package> - <package>python-gtk-devel</package> - <package>python-gtkglext</package> - <package>python-gtkglext-devel</package> - <package>python-gtksourceview</package> - <package>python-gtksourceview-devel</package> - <package>python-numeric</package> - <package>python-numpy</package> - <package>python-orbit</package> - <package>python-orbit-devel</package> - <package>pyxml</package> - <package>qt3</package> - <package>qt3-devel</package> - <package>quagga</package> - <package>quagga-devel</package> - <package>quilt</package> - <package>raptor</package> - <package>rarian</package> - <package>rarian-devel</package> - <package>re2c</package> - <package>readline-devel</package> - <package>recode-devel</package> - <package>rpm-devel</package> - <package>rrdtool</package> - <package>rrdtool-devel</package> - <package>rsyslog</package> - <package>ruby</package> - <package>rubygems</package> - <package>ruby-devel</package> - <package>ruby-doc-html</package> - <package>ruby-doc-ri</package> - <package>ruby-examples</package> - <package>ruby-fcgi</package> - <package>ruby-mysql</package> - <package>ruby-selinux</package> - <package>ruby-test-suite</package> - <package>ruby-tk</package> - <package>sablot</package> - <package>sablot-devel</package> - <package>samba-devel</package> - <package>sane-backends</package> - <package>sane-frontends</package> - <package>sax2-libsax</package> - <package>sax2-libsax-devel</package> - <package>sax2-libsax-perl</package> - <package>sax2-tools</package> - <package>sblim-cmpi-base</package> - <package>sblim-cmpi-base-devel</package> - <package>sblim-cmpi-devel</package> - <package>sblim-cmpiutil-devel</package> - <package>sblim-indication_helper</package> - <package>sblim-sfcb</package> - <package>sblim-sfcc</package> - <package>sblim-sfcc-devel</package> - <package>scim</package> - <package>scim-devel</package> - <package>scpm-devel</package> - <package>scrollkeeper</package> - <package>scrollkeeper-lang</package> - <package>seahorse</package> - <package>seahorse-devel</package> - <package>seahorse-lang</package> - <package>sendmail</package> - <package>sendmail-devel</package> - <package>sg3_utils-devel</package> - <package>sgml-skel</package> - <package>shared-mime-info</package> - <package>silc-toolkit</package> - <package>silc-toolkit-devel</package> - <package>slang</package> - <package>slang-devel</package> - <package>soprano</package> - <package>soprano-backend-redland</package> - <package>spamassassin</package> - <package>speex-devel</package> - <package>splashy-devel</package> - <package>sqlite2</package> - <package>sqlite3-devel</package> - <package>startup-notification</package> - <package>startup-notification-devel</package> - <package>strigi</package> - <package>strigi-devel</package> - <package>subversion</package> - <package>subversion-perl</package> - <package>susehelp</package> - <package>susehelp_cz</package> - <package>susehelp_de</package> - <package>susehelp_en</package> - <package>susehelp_es</package> - <package>susehelp_fr</package> - <package>susehelp_hu</package> - <package>susehelp_it</package> - <package>swig</package> - <package>syslogd</package> - <package>t1lib</package> - <package>t1lib-devel</package> - <package>taglib</package> - <package>taglib-devel</package> - <package>taglib-sharp</package> - <package>tango-icon-theme</package> - <package>tcl-devel</package> - <package>tcpd-devel</package> - <package>telepathy-glib-devel</package> - <package>telepathy-mission-control</package> - <package>telepathy-mission-control-devel</package> - <package>texlive-bin-devel</package> - <package>texlive-devel</package> - <package>tk-devel</package> - <package>tla</package> - <package>tn5250</package> - <package>tn5250-devel</package> - <package>tomoe</package> - <package>tomoe-devel</package> - <package>tomoe-gtk</package> - <package>tomoe-gtk-devel</package> - <package>tomoe-gtk-lang</package> - <package>totem-pl-parser</package> - <package>totem-pl-parser-devel</package> - <package>totem-pl-parser-lang</package> - <package>trousers</package> - <package>trousers-devel</package> - <package>tsclient</package> - <package>tsclient-devel</package> - <package>tsclient-lang</package> - <package>uim</package> - <package>uim-devel</package> - <package>unixODBC</package> - <package>unixODBC-devel</package> - <package>unsermake</package> - <package>update-desktop-files</package> - <package>usb_modeswitch</package> - <package>usb_modeswitch-data</package> - <package>valgrind</package> - <package>valgrind-devel</package> - <package>vte</package> - <package>vte-devel</package> - <package>vte-lang</package> - <package>wdiff</package> - <package>webkit-sharp</package> - <package>wireshark</package> - <package>wireshark-devel</package> - <package>wodim-devel</package> - <package>wordcut</package> - <package>wordcut-devel</package> - <package>words</package> - <package>wpa_supplicant</package> - <package>wvstreams</package> - <package>wvstreams-devel</package> - <package>wxGTK-compat</package> - <package>wxGTK-devel</package> - <package>wxGTK-gl</package> - <package>x11-input-wacom</package> - <package>x11-input-wacom-devel</package> - <package>x11-input-wacom-tools</package> - <package>xalan-j2</package> - <package>xaw3d-devel</package> - <package>xbase</package> - <package>xbase-devel</package> - <package>xdelta</package> - <package>xdelta-devel</package> - <package>xdg-menu</package> - <package>xen-devel</package> - <package>xen-libs</package> - <package>xerces-j2</package> - <package>xerces-j2-bootstrap</package> - <package>xerces-j2-xml-apis</package> - <package>xfsprogs-devel</package> - <package>xml-commons-apis-bootstrap</package> - <package>xml-commons-resolver-bootstrap</package> - <package>xml-commons-which-bootstrap</package> - <package>xmlcharent</package> - <package>xorg-x11</package> - <package>xorg-x11-devel</package> - <package>xorg-x11-fonts</package> - <package>xorg-x11-fonts-core</package> - <package>xorg-x11-fonts-devel</package> - <package>xorg-x11-libICE-devel</package> - <package>xorg-x11-libSM-devel</package> - <package>xorg-x11-libX11-devel</package> - <package>xorg-x11-libXau-devel</package> - <package>xorg-x11-libXdmcp-devel</package> - <package>xorg-x11-libXext-devel</package> - <package>xorg-x11-libXfixes-devel</package> - <package>xorg-x11-libXmu-devel</package> - <package>xorg-x11-libXp-devel</package> - <package>xorg-x11-libXpm-devel</package> - <package>xorg-x11-libXprintUtil-devel</package> - <package>xorg-x11-libXrender-devel</package> - <package>xorg-x11-libXt-devel</package> - <package>xorg-x11-libXv-devel</package> - <package>xorg-x11-libfontenc-devel</package> - <package>xorg-x11-libxcb-devel</package> - <package>xorg-x11-libxkbfile-devel</package> - <package>xorg-x11-proto-devel</package> - <package>xorg-x11-server</package> - <package>xorg-x11-util-devel</package> - <package>xorg-x11-xauth</package> - <package>xorg-x11-xtrans-devel</package> - <package>xosd</package> - <package>xosd-devel</package> - <package>xsp</package> - <package>xterm</package> - <package>xz-devel</package> - <package>yast2-core-devel</package> - <package>yast2-devtools</package> - <package>yast2-gtk</package> - <package>yast2-libyui-devel</package> - <package>yast2-ncurses-devel</package> - <package>yast2-qt</package> - <package>yast2-qt-devel</package> - <package>yast2-qt-pkg</package> - <package>yast2-storage-devel</package> - <package>yast2-ycp-ui-bindings-devel</package> - <package>yelp</package> - <package>yelp-lang</package> - <package>zenity</package> - <package>zenity-lang</package> - <package>zlib-devel</package> - <package>zsh</package> - <package>zvbi-devel</package> - </remove-packages> - - </software> - <user_defaults> - <expire></expire> - <group>100</group> - <groups>video,dialout</groups> - <home>/home</home> - <inactive>-1</inactive> - <shell>/bin/bash</shell> - <skel>/etc/skel</skel> - <umask>022</umask> - </user_defaults> - <users config:type="list"> - <user> - <encrypted config:type="boolean">true</encrypted> - <fullname>vagrant</fullname> - <gid>100</gid> - <home>/home/vagrant</home> - <password_settings> - <expire></expire> - <flag></flag> - <inact></inact> - <max>99999</max> - <min>0</min> - <warn>7</warn> - </password_settings> - <shell>/bin/bash</shell> - <uid>1000</uid> - <user_password>$2y$05$NA1Li9ZKJOLRW5mMTXm6/e5r8dltWS5RpDZpvHrI82aLE00V51tdi</user_password> - <username>vagrant</username> - </user> - <user> - <encrypted config:type="boolean">true</encrypted> - <fullname>Games account</fullname> - <gid>100</gid> - <home>/var/games</home> - <password_settings> - <expire></expire> - <flag></flag> - <inact></inact> - <max></max> - <min></min> - <warn></warn> - </password_settings> - <shell>/bin/bash</shell> - <uid>12</uid> - <user_password>*</user_password> - <username>games</username> - </user> - <user> - <encrypted config:type="boolean">true</encrypted> - <fullname>bin</fullname> - <gid>1</gid> - <home>/bin</home> - <password_settings> - <expire></expire> - <flag></flag> - <inact></inact> - <max></max> - <min></min> - <warn></warn> - </password_settings> - <shell>/bin/bash</shell> - <uid>1</uid> - <user_password>*</user_password> - <username>bin</username> - </user> - <user> - <encrypted config:type="boolean">true</encrypted> - <fullname>nobody</fullname> - <gid>65533</gid> - <home>/var/lib/nobody</home> - <password_settings> - <expire></expire> - <flag></flag> - <inact></inact> - <max></max> - <min></min> - <warn></warn> - </password_settings> - <shell>/bin/bash</shell> - <uid>65534</uid> - <user_password>*</user_password> - <username>nobody</username> - </user> - <user> - <encrypted config:type="boolean">true</encrypted> - <fullname>Printing daemon</fullname> - <gid>7</gid> - <home>/var/spool/lpd</home> - <password_settings> - <expire></expire> - <flag></flag> - <inact></inact> - <max></max> - <min></min> - <warn></warn> - </password_settings> - <shell>/bin/bash</shell> - <uid>4</uid> - <user_password>*</user_password> - <username>lp</username> - </user> - <user> - <encrypted config:type="boolean">true</encrypted> - <fullname>User for uuidd</fullname> - <gid>104</gid> - <home>/var/run/uuidd</home> - <password_settings> - <expire></expire> - <flag></flag> - <inact></inact> - <max>99999</max> - <min>0</min> - <warn>7</warn> - </password_settings> - <shell>/bin/false</shell> - <uid>102</uid> - <user_password>*</user_password> - <username>uuidd</username> - </user> - <user> - <encrypted config:type="boolean">true</encrypted> - <fullname>Postfix Daemon</fullname> - <gid>51</gid> - <home>/var/spool/postfix</home> - <password_settings> - <expire></expire> - <flag></flag> - <inact></inact> - <max>99999</max> - <min>0</min> - <warn>7</warn> - </password_settings> - <shell>/bin/false</shell> - <uid>51</uid> - <user_password>*</user_password> - <username>postfix</username> - </user> - <user> - <encrypted config:type="boolean">true</encrypted> - <fullname>Novell Customer Center User</fullname> - <gid>111</gid> - <home>/var/lib/YaST2/suse-ncc-fakehome</home> - <password_settings> - <expire></expire> - <flag></flag> - <inact></inact> - <max>99999</max> - <min>0</min> - <warn>7</warn> - </password_settings> - <shell>/bin/bash</shell> - <uid>106</uid> - <user_password>*</user_password> - <username>suse-ncc</username> - </user> - <user> - <encrypted config:type="boolean">true</encrypted> - <fullname>FTP account</fullname> - <gid>49</gid> - <home>/srv/ftp</home> - <password_settings> - <expire></expire> - <flag></flag> - <inact></inact> - <max></max> - <min></min> - <warn></warn> - </password_settings> - <shell>/bin/bash</shell> - <uid>40</uid> - <user_password>*</user_password> - <username>ftp</username> - </user> - <user> - <encrypted config:type="boolean">true</encrypted> - <fullname>Gnome Display Manager daemon</fullname> - <gid>112</gid> - <home>/var/lib/gdm</home> - <password_settings> - <expire></expire> - <flag></flag> - <inact></inact> - <max>99999</max> - <min>0</min> - <warn>7</warn> - </password_settings> - <shell>/bin/false</shell> - <uid>107</uid> - <user_password>*</user_password> - <username>gdm</username> - </user> - <user> - <encrypted config:type="boolean">true</encrypted> - <fullname>Batch jobs daemon</fullname> - <gid>25</gid> - <home>/var/spool/atjobs</home> - <password_settings> - <expire></expire> - <flag></flag> - <inact></inact> - <max>99999</max> - <min>0</min> - <warn>7</warn> - </password_settings> - <shell>/bin/bash</shell> - <uid>25</uid> - <user_password>*</user_password> - <username>at</username> - </user> - <user> - <encrypted config:type="boolean">true</encrypted> - <fullname>root</fullname> - <gid>0</gid> - <home>/root</home> - <password_settings> - <expire></expire> - <flag></flag> - <inact></inact> - <max></max> - <min></min> - <warn></warn> - </password_settings> - <shell>/bin/bash</shell> - <uid>0</uid> - <user_password>$2y$05$NA1Li9ZKJOLRW5mMTXm6/e5r8dltWS5RpDZpvHrI82aLE00V51tdi</user_password> - <username>root</username> - </user> - <user> - <encrypted config:type="boolean">true</encrypted> - <fullname>Mailer daemon</fullname> - <gid>12</gid> - <home>/var/spool/clientmqueue</home> - <password_settings> - <expire></expire> - <flag></flag> - <inact></inact> - <max></max> - <min></min> - <warn></warn> - </password_settings> - <shell>/bin/false</shell> - <uid>8</uid> - <user_password>*</user_password> - <username>mail</username> - </user> - <user> - <encrypted config:type="boolean">true</encrypted> - <fullname>Daemon</fullname> - <gid>2</gid> - <home>/sbin</home> - <password_settings> - <expire></expire> - <flag></flag> - <inact></inact> - <max></max> - <min></min> - <warn></warn> - </password_settings> - <shell>/bin/bash</shell> - <uid>2</uid> - <user_password>*</user_password> - <username>daemon</username> - </user> - <user> - <encrypted config:type="boolean">true</encrypted> - <fullname>NTP daemon</fullname> - <gid>108</gid> - <home>/var/lib/ntp</home> - <password_settings> - <expire></expire> - <flag></flag> - <inact></inact> - <max>99999</max> - <min>0</min> - <warn>7</warn> - </password_settings> - <shell>/bin/false</shell> - <uid>74</uid> - <user_password>*</user_password> - <username>ntp</username> - </user> - <user> - <encrypted config:type="boolean">true</encrypted> - <fullname>Unix-to-Unix CoPy system</fullname> - <gid>14</gid> - <home>/etc/uucp</home> - <password_settings> - <expire></expire> - <flag></flag> - <inact></inact> - <max></max> - <min></min> - <warn></warn> - </password_settings> - <shell>/bin/bash</shell> - <uid>10</uid> - <user_password>*</user_password> - <username>uucp</username> - </user> - <user> - <encrypted config:type="boolean">true</encrypted> - <fullname>User for D-Bus</fullname> - <gid>101</gid> - <home>/var/run/dbus</home> - <password_settings> - <expire></expire> - <flag></flag> - <inact></inact> - <max></max> - <min>0</min> - <warn>7</warn> - </password_settings> - <shell>/bin/false</shell> - <uid>100</uid> - <user_password>*</user_password> - <username>messagebus</username> - </user> - <user> - <encrypted config:type="boolean">true</encrypted> - <fullname>User for haldaemon</fullname> - <gid>102</gid> - <home>/var/run/hald</home> - <password_settings> - <expire></expire> - <flag></flag> - <inact></inact> - <max></max> - <min>0</min> - <warn>7</warn> - </password_settings> - <shell>/bin/false</shell> - <uid>101</uid> - <user_password>*</user_password> - <username>haldaemon</username> - </user> - <user> - <encrypted config:type="boolean">true</encrypted> - <fullname>WWW daemon apache</fullname> - <gid>8</gid> - <home>/var/lib/wwwrun</home> - <password_settings> - <expire></expire> - <flag></flag> - <inact></inact> - <max></max> - <min></min> - <warn></warn> - </password_settings> - <shell>/bin/false</shell> - <uid>30</uid> - <user_password>*</user_password> - <username>wwwrun</username> - </user> - <user> - <encrypted config:type="boolean">true</encrypted> - <fullname>Manual pages viewer</fullname> - <gid>62</gid> - <home>/var/cache/man</home> - <password_settings> - <expire></expire> - <flag></flag> - <inact></inact> - <max></max> - <min></min> - <warn></warn> - </password_settings> - <shell>/bin/bash</shell> - <uid>13</uid> - <user_password>*</user_password> - <username>man</username> - </user> - <user> - <encrypted config:type="boolean">true</encrypted> - <fullname>PolicyKit</fullname> - <gid>107</gid> - <home>/var/run/PolicyKit</home> - <password_settings> - <expire></expire> - <flag></flag> - <inact></inact> - <max>99999</max> - <min>0</min> - <warn>7</warn> - </password_settings> - <shell>/bin/false</shell> - <uid>104</uid> - <user_password>*</user_password> - <username>polkituser</username> - </user> - <user> - <encrypted config:type="boolean">true</encrypted> - <fullname>News system</fullname> - <gid>13</gid> - <home>/etc/news</home> - <password_settings> - <expire></expire> - <flag></flag> - <inact></inact> - <max></max> - <min></min> - <warn></warn> - </password_settings> - <shell>/bin/bash</shell> - <uid>9</uid> - <user_password>*</user_password> - <username>news</username> - </user> - <user> - <fullname>SSH daemon</fullname> - <gid>65</gid> - <home>/var/lib/sshd</home> - <shell>/bin/false</shell> - <uid>71</uid> - <username>sshd</username> - </user> - <user> - <encrypted config:type="boolean">true</encrypted> - <fullname>PulseAudio daemon</fullname> - <gid>109</gid> - <home>/var/lib/pulseaudio</home> - <password_settings> - <expire></expire> - <flag></flag> - <inact></inact> - <max>99999</max> - <min>0</min> - <warn>7</warn> - </password_settings> - <shell>/bin/false</shell> - <uid>105</uid> - <user_password>*</user_password> - <username>pulse</username> - </user> - </users> -</profile> diff --git a/definitions/sles-11-sp3/cleanup.sh b/definitions/sles-11-sp3/cleanup.sh deleted file mode 100644 index 0870a61a1..000000000 --- a/definitions/sles-11-sp3/cleanup.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/bash -eux - -# remove zypper locks on removed packages to avoid later dependency problems -zypper --non-interactive rl \* -# zypper --non-interactive remove `rpm -qa virtualbox-guest-*` >/dev/null 2>&1 -# Add an online copy of the SLES DVD1 as a software repository, instead of the mounted DVD -zypper removerepo 'SUSE-Linux-Enterprise-Server-11-SP3 11.3.3-1.138' -zypper addrepo 'http://demeter.uni-regensburg.de/SLES11SP3-x64/DVD1/' 'SLES11SP3-x64 DVD1 Online' -zypper refresh diff --git a/definitions/sles-11-sp3/definition.rb b/definitions/sles-11-sp3/definition.rb deleted file mode 100644 index 0a7e688ff..000000000 --- a/definitions/sles-11-sp3/definition.rb +++ /dev/null @@ -1,12 +0,0 @@ -require File.dirname(__FILE__) + "/../.suse/session.rb" - -iso = "SLES-11-SP3-DVD-x86_64-GM-DVD1.iso" - -session = - SUSE_SESSION.merge( :memory_size=> '480', - :iso_download_instructions => "Download evaluation version from http://download.novell.com/protected/Summary.jsp?buildid=Q_VbW21BiB4~", - :iso_file => iso, - :iso_md5 => "480b70d50cbb538382dc2b9325221e1b", - :iso_src => "") - -Veewee::Session.declare session diff --git a/definitions/sles-11-sp3/minimize.sh b/definitions/sles-11-sp3/minimize.sh deleted file mode 120000 index b3632ccbc..000000000 --- a/definitions/sles-11-sp3/minimize.sh +++ /dev/null @@ -1 +0,0 @@ -../.common/minimize.sh \ No newline at end of file diff --git a/definitions/sles-11-sp3/sshd.sh b/definitions/sles-11-sp3/sshd.sh deleted file mode 120000 index f353f2d00..000000000 --- a/definitions/sles-11-sp3/sshd.sh +++ /dev/null @@ -1 +0,0 @@ -../.common/sshd.sh \ No newline at end of file diff --git a/definitions/sles-11-sp3/sudoers.sh b/definitions/sles-11-sp3/sudoers.sh deleted file mode 120000 index 18d9cf04d..000000000 --- a/definitions/sles-11-sp3/sudoers.sh +++ /dev/null @@ -1 +0,0 @@ -../.suse/sudoers.sh \ No newline at end of file diff --git a/definitions/sles-11-sp3/vagrant.sh b/definitions/sles-11-sp3/vagrant.sh deleted file mode 120000 index 702949639..000000000 --- a/definitions/sles-11-sp3/vagrant.sh +++ /dev/null @@ -1 +0,0 @@ -../.common/vagrant.sh \ No newline at end of file diff --git a/definitions/ubuntu-10.04-i386/cleanup.sh b/definitions/ubuntu-10.04-i386/cleanup.sh deleted file mode 120000 index e5858f10d..000000000 --- a/definitions/ubuntu-10.04-i386/cleanup.sh +++ /dev/null @@ -1 +0,0 @@ -../.ubuntu/cleanup.sh \ No newline at end of file diff --git a/definitions/ubuntu-10.04-i386/definition.rb b/definitions/ubuntu-10.04-i386/definition.rb deleted file mode 100644 index eed32da31..000000000 --- a/definitions/ubuntu-10.04-i386/definition.rb +++ /dev/null @@ -1,11 +0,0 @@ -require File.dirname(__FILE__) + "/../.ubuntu/session.rb" - -iso = "ubuntu-10.04.4-server-i386.iso" - -session = - UBUNTU_SESSION.merge( :os_type_id => 'Ubuntu', - :iso_file => iso, - :iso_md5 => "fc08a01e78348e3918180ea91a6883bb", - :iso_src => "http://releases.ubuntu.com/10.04.4/#{iso}" ) - -Veewee::Session.declare session diff --git a/definitions/ubuntu-10.04-i386/minimize.sh b/definitions/ubuntu-10.04-i386/minimize.sh deleted file mode 120000 index b3632ccbc..000000000 --- a/definitions/ubuntu-10.04-i386/minimize.sh +++ /dev/null @@ -1 +0,0 @@ -../.common/minimize.sh \ No newline at end of file diff --git a/definitions/ubuntu-10.04-i386/networking.sh b/definitions/ubuntu-10.04-i386/networking.sh deleted file mode 120000 index 8b49862eb..000000000 --- a/definitions/ubuntu-10.04-i386/networking.sh +++ /dev/null @@ -1 +0,0 @@ -../.ubuntu/networking.sh \ No newline at end of file diff --git a/definitions/ubuntu-10.04-i386/preseed.cfg b/definitions/ubuntu-10.04-i386/preseed.cfg deleted file mode 120000 index 0aca6daae..000000000 --- a/definitions/ubuntu-10.04-i386/preseed.cfg +++ /dev/null @@ -1 +0,0 @@ -../.ubuntu/preseed.cfg \ No newline at end of file diff --git a/definitions/ubuntu-10.04-i386/sshd.sh b/definitions/ubuntu-10.04-i386/sshd.sh deleted file mode 120000 index f353f2d00..000000000 --- a/definitions/ubuntu-10.04-i386/sshd.sh +++ /dev/null @@ -1 +0,0 @@ -../.common/sshd.sh \ No newline at end of file diff --git a/definitions/ubuntu-10.04-i386/sudoers.sh b/definitions/ubuntu-10.04-i386/sudoers.sh deleted file mode 120000 index 1480db551..000000000 --- a/definitions/ubuntu-10.04-i386/sudoers.sh +++ /dev/null @@ -1 +0,0 @@ -../.ubuntu/sudoers.sh \ No newline at end of file diff --git a/definitions/ubuntu-10.04-i386/update.sh b/definitions/ubuntu-10.04-i386/update.sh deleted file mode 120000 index 20b3a9ab6..000000000 --- a/definitions/ubuntu-10.04-i386/update.sh +++ /dev/null @@ -1 +0,0 @@ -../.ubuntu/update.sh \ No newline at end of file diff --git a/definitions/ubuntu-10.04-i386/vagrant.sh b/definitions/ubuntu-10.04-i386/vagrant.sh deleted file mode 120000 index 702949639..000000000 --- a/definitions/ubuntu-10.04-i386/vagrant.sh +++ /dev/null @@ -1 +0,0 @@ -../.common/vagrant.sh \ No newline at end of file diff --git a/definitions/ubuntu-10.04/cleanup.sh b/definitions/ubuntu-10.04/cleanup.sh deleted file mode 120000 index e5858f10d..000000000 --- a/definitions/ubuntu-10.04/cleanup.sh +++ /dev/null @@ -1 +0,0 @@ -../.ubuntu/cleanup.sh \ No newline at end of file diff --git a/definitions/ubuntu-10.04/definition.rb b/definitions/ubuntu-10.04/definition.rb deleted file mode 100644 index 58cc2d190..000000000 --- a/definitions/ubuntu-10.04/definition.rb +++ /dev/null @@ -1,10 +0,0 @@ -require File.dirname(__FILE__) + "/../.ubuntu/session.rb" - -iso = "ubuntu-10.04.4-server-amd64.iso" - -session = - UBUNTU_SESSION.merge( :iso_file => iso, - :iso_md5 => "9b218654cdcdf9722171648c52f8a088", - :iso_src => "http://releases.ubuntu.com/10.04.4/#{iso}" ) - -Veewee::Session.declare session diff --git a/definitions/ubuntu-10.04/minimize.sh b/definitions/ubuntu-10.04/minimize.sh deleted file mode 120000 index b3632ccbc..000000000 --- a/definitions/ubuntu-10.04/minimize.sh +++ /dev/null @@ -1 +0,0 @@ -../.common/minimize.sh \ No newline at end of file diff --git a/definitions/ubuntu-10.04/networking.sh b/definitions/ubuntu-10.04/networking.sh deleted file mode 120000 index 8b49862eb..000000000 --- a/definitions/ubuntu-10.04/networking.sh +++ /dev/null @@ -1 +0,0 @@ -../.ubuntu/networking.sh \ No newline at end of file diff --git a/definitions/ubuntu-10.04/preseed.cfg b/definitions/ubuntu-10.04/preseed.cfg deleted file mode 120000 index 0aca6daae..000000000 --- a/definitions/ubuntu-10.04/preseed.cfg +++ /dev/null @@ -1 +0,0 @@ -../.ubuntu/preseed.cfg \ No newline at end of file diff --git a/definitions/ubuntu-10.04/sshd.sh b/definitions/ubuntu-10.04/sshd.sh deleted file mode 120000 index f353f2d00..000000000 --- a/definitions/ubuntu-10.04/sshd.sh +++ /dev/null @@ -1 +0,0 @@ -../.common/sshd.sh \ No newline at end of file diff --git a/definitions/ubuntu-10.04/sudoers.sh b/definitions/ubuntu-10.04/sudoers.sh deleted file mode 120000 index 1480db551..000000000 --- a/definitions/ubuntu-10.04/sudoers.sh +++ /dev/null @@ -1 +0,0 @@ -../.ubuntu/sudoers.sh \ No newline at end of file diff --git a/definitions/ubuntu-10.04/update.sh b/definitions/ubuntu-10.04/update.sh deleted file mode 120000 index 20b3a9ab6..000000000 --- a/definitions/ubuntu-10.04/update.sh +++ /dev/null @@ -1 +0,0 @@ -../.ubuntu/update.sh \ No newline at end of file diff --git a/definitions/ubuntu-10.04/vagrant.sh b/definitions/ubuntu-10.04/vagrant.sh deleted file mode 120000 index 702949639..000000000 --- a/definitions/ubuntu-10.04/vagrant.sh +++ /dev/null @@ -1 +0,0 @@ -../.common/vagrant.sh \ No newline at end of file diff --git a/definitions/ubuntu-10.10/cleanup.sh b/definitions/ubuntu-10.10/cleanup.sh deleted file mode 120000 index e5858f10d..000000000 --- a/definitions/ubuntu-10.10/cleanup.sh +++ /dev/null @@ -1 +0,0 @@ -../.ubuntu/cleanup.sh \ No newline at end of file diff --git a/definitions/ubuntu-10.10/definition.rb b/definitions/ubuntu-10.10/definition.rb deleted file mode 100644 index c1b793daa..000000000 --- a/definitions/ubuntu-10.10/definition.rb +++ /dev/null @@ -1,10 +0,0 @@ -require File.dirname(__FILE__) + "/../.ubuntu/session.rb" - -iso = "ubuntu-10.10-server-amd64.iso" - -session = - UBUNTU_SESSION.merge( :iso_file => iso, - :iso_md5 => "ab66a1d59a8d78e9ea8ef9b021d6574a", - :iso_src => "http://releases.ubuntu.com/10.10/#{iso}" ) - -Veewee::Session.declare session diff --git a/definitions/ubuntu-10.10/minimize.sh b/definitions/ubuntu-10.10/minimize.sh deleted file mode 120000 index b3632ccbc..000000000 --- a/definitions/ubuntu-10.10/minimize.sh +++ /dev/null @@ -1 +0,0 @@ -../.common/minimize.sh \ No newline at end of file diff --git a/definitions/ubuntu-10.10/networking.sh b/definitions/ubuntu-10.10/networking.sh deleted file mode 120000 index 8b49862eb..000000000 --- a/definitions/ubuntu-10.10/networking.sh +++ /dev/null @@ -1 +0,0 @@ -../.ubuntu/networking.sh \ No newline at end of file diff --git a/definitions/ubuntu-10.10/preseed.cfg b/definitions/ubuntu-10.10/preseed.cfg deleted file mode 120000 index 0aca6daae..000000000 --- a/definitions/ubuntu-10.10/preseed.cfg +++ /dev/null @@ -1 +0,0 @@ -../.ubuntu/preseed.cfg \ No newline at end of file diff --git a/definitions/ubuntu-10.10/sshd.sh b/definitions/ubuntu-10.10/sshd.sh deleted file mode 120000 index f353f2d00..000000000 --- a/definitions/ubuntu-10.10/sshd.sh +++ /dev/null @@ -1 +0,0 @@ -../.common/sshd.sh \ No newline at end of file diff --git a/definitions/ubuntu-10.10/sudoers.sh b/definitions/ubuntu-10.10/sudoers.sh deleted file mode 120000 index 1480db551..000000000 --- a/definitions/ubuntu-10.10/sudoers.sh +++ /dev/null @@ -1 +0,0 @@ -../.ubuntu/sudoers.sh \ No newline at end of file diff --git a/definitions/ubuntu-10.10/update.sh b/definitions/ubuntu-10.10/update.sh deleted file mode 120000 index 20b3a9ab6..000000000 --- a/definitions/ubuntu-10.10/update.sh +++ /dev/null @@ -1 +0,0 @@ -../.ubuntu/update.sh \ No newline at end of file diff --git a/definitions/ubuntu-10.10/vagrant.sh b/definitions/ubuntu-10.10/vagrant.sh deleted file mode 120000 index 702949639..000000000 --- a/definitions/ubuntu-10.10/vagrant.sh +++ /dev/null @@ -1 +0,0 @@ -../.common/vagrant.sh \ No newline at end of file diff --git a/definitions/ubuntu-11.04/cleanup.sh b/definitions/ubuntu-11.04/cleanup.sh deleted file mode 120000 index e5858f10d..000000000 --- a/definitions/ubuntu-11.04/cleanup.sh +++ /dev/null @@ -1 +0,0 @@ -../.ubuntu/cleanup.sh \ No newline at end of file diff --git a/definitions/ubuntu-11.04/definition.rb b/definitions/ubuntu-11.04/definition.rb deleted file mode 100644 index 830f30dea..000000000 --- a/definitions/ubuntu-11.04/definition.rb +++ /dev/null @@ -1,10 +0,0 @@ -require File.dirname(__FILE__) + "/../.ubuntu/session.rb" - -iso = "ubuntu-11.04-server-amd64.iso" - -session = - UBUNTU_SESSION.merge( :iso_file => iso, - :iso_md5 => "355ca2417522cb4a77e0295bf45c5cd5", - :iso_src => "http://releases.ubuntu.com/11.04/#{iso}" ) - -Veewee::Session.declare session diff --git a/definitions/ubuntu-11.04/minimize.sh b/definitions/ubuntu-11.04/minimize.sh deleted file mode 120000 index b3632ccbc..000000000 --- a/definitions/ubuntu-11.04/minimize.sh +++ /dev/null @@ -1 +0,0 @@ -../.common/minimize.sh \ No newline at end of file diff --git a/definitions/ubuntu-11.04/networking.sh b/definitions/ubuntu-11.04/networking.sh deleted file mode 120000 index 8b49862eb..000000000 --- a/definitions/ubuntu-11.04/networking.sh +++ /dev/null @@ -1 +0,0 @@ -../.ubuntu/networking.sh \ No newline at end of file diff --git a/definitions/ubuntu-11.04/preseed.cfg b/definitions/ubuntu-11.04/preseed.cfg deleted file mode 120000 index 0aca6daae..000000000 --- a/definitions/ubuntu-11.04/preseed.cfg +++ /dev/null @@ -1 +0,0 @@ -../.ubuntu/preseed.cfg \ No newline at end of file diff --git a/definitions/ubuntu-11.04/sshd.sh b/definitions/ubuntu-11.04/sshd.sh deleted file mode 120000 index f353f2d00..000000000 --- a/definitions/ubuntu-11.04/sshd.sh +++ /dev/null @@ -1 +0,0 @@ -../.common/sshd.sh \ No newline at end of file diff --git a/definitions/ubuntu-11.04/sudoers.sh b/definitions/ubuntu-11.04/sudoers.sh deleted file mode 120000 index 1480db551..000000000 --- a/definitions/ubuntu-11.04/sudoers.sh +++ /dev/null @@ -1 +0,0 @@ -../.ubuntu/sudoers.sh \ No newline at end of file diff --git a/definitions/ubuntu-11.04/update.sh b/definitions/ubuntu-11.04/update.sh deleted file mode 120000 index 20b3a9ab6..000000000 --- a/definitions/ubuntu-11.04/update.sh +++ /dev/null @@ -1 +0,0 @@ -../.ubuntu/update.sh \ No newline at end of file diff --git a/definitions/ubuntu-11.04/vagrant.sh b/definitions/ubuntu-11.04/vagrant.sh deleted file mode 120000 index 702949639..000000000 --- a/definitions/ubuntu-11.04/vagrant.sh +++ /dev/null @@ -1 +0,0 @@ -../.common/vagrant.sh \ No newline at end of file diff --git a/definitions/ubuntu-11.10/cleanup.sh b/definitions/ubuntu-11.10/cleanup.sh deleted file mode 120000 index e5858f10d..000000000 --- a/definitions/ubuntu-11.10/cleanup.sh +++ /dev/null @@ -1 +0,0 @@ -../.ubuntu/cleanup.sh \ No newline at end of file diff --git a/definitions/ubuntu-11.10/definition.rb b/definitions/ubuntu-11.10/definition.rb deleted file mode 100644 index 500293027..000000000 --- a/definitions/ubuntu-11.10/definition.rb +++ /dev/null @@ -1,10 +0,0 @@ -require File.dirname(__FILE__) + "/../.ubuntu/session.rb" - -iso = "ubuntu-11.10-server-amd64.iso" - -session = - UBUNTU_SESSION.merge( :iso_file => iso, - :iso_md5 => "f8a0112b7cb5dcd6d564dbe59f18c35f", - :iso_src => "http://releases.ubuntu.com/11.10/#{iso}" ) - -Veewee::Session.declare session diff --git a/definitions/ubuntu-11.10/minimize.sh b/definitions/ubuntu-11.10/minimize.sh deleted file mode 120000 index b3632ccbc..000000000 --- a/definitions/ubuntu-11.10/minimize.sh +++ /dev/null @@ -1 +0,0 @@ -../.common/minimize.sh \ No newline at end of file diff --git a/definitions/ubuntu-11.10/networking.sh b/definitions/ubuntu-11.10/networking.sh deleted file mode 120000 index 8b49862eb..000000000 --- a/definitions/ubuntu-11.10/networking.sh +++ /dev/null @@ -1 +0,0 @@ -../.ubuntu/networking.sh \ No newline at end of file diff --git a/definitions/ubuntu-11.10/preseed.cfg b/definitions/ubuntu-11.10/preseed.cfg deleted file mode 120000 index 0aca6daae..000000000 --- a/definitions/ubuntu-11.10/preseed.cfg +++ /dev/null @@ -1 +0,0 @@ -../.ubuntu/preseed.cfg \ No newline at end of file diff --git a/definitions/ubuntu-11.10/sshd.sh b/definitions/ubuntu-11.10/sshd.sh deleted file mode 120000 index f353f2d00..000000000 --- a/definitions/ubuntu-11.10/sshd.sh +++ /dev/null @@ -1 +0,0 @@ -../.common/sshd.sh \ No newline at end of file diff --git a/definitions/ubuntu-11.10/sudoers.sh b/definitions/ubuntu-11.10/sudoers.sh deleted file mode 120000 index 1480db551..000000000 --- a/definitions/ubuntu-11.10/sudoers.sh +++ /dev/null @@ -1 +0,0 @@ -../.ubuntu/sudoers.sh \ No newline at end of file diff --git a/definitions/ubuntu-11.10/update.sh b/definitions/ubuntu-11.10/update.sh deleted file mode 120000 index 20b3a9ab6..000000000 --- a/definitions/ubuntu-11.10/update.sh +++ /dev/null @@ -1 +0,0 @@ -../.ubuntu/update.sh \ No newline at end of file diff --git a/definitions/ubuntu-11.10/vagrant.sh b/definitions/ubuntu-11.10/vagrant.sh deleted file mode 120000 index 702949639..000000000 --- a/definitions/ubuntu-11.10/vagrant.sh +++ /dev/null @@ -1 +0,0 @@ -../.common/vagrant.sh \ No newline at end of file diff --git a/definitions/ubuntu-12.04-i386/cleanup.sh b/definitions/ubuntu-12.04-i386/cleanup.sh deleted file mode 120000 index e5858f10d..000000000 --- a/definitions/ubuntu-12.04-i386/cleanup.sh +++ /dev/null @@ -1 +0,0 @@ -../.ubuntu/cleanup.sh \ No newline at end of file diff --git a/definitions/ubuntu-12.04-i386/definition.rb b/definitions/ubuntu-12.04-i386/definition.rb deleted file mode 100644 index 23ededc85..000000000 --- a/definitions/ubuntu-12.04-i386/definition.rb +++ /dev/null @@ -1,11 +0,0 @@ -require File.dirname(__FILE__) + "/../.ubuntu/session.rb" - -iso = "ubuntu-12.04.3-server-i386.iso" - -session = - UBUNTU_SESSION.merge( :os_type_id => 'Ubuntu', - :iso_file => iso, - :iso_md5 => "e7917ff0543d8248d00ffb166def849e", - :iso_src => "http://releases.ubuntu.com/12.04/#{iso}" ) - -Veewee::Session.declare session diff --git a/definitions/ubuntu-12.04-i386/minimize.sh b/definitions/ubuntu-12.04-i386/minimize.sh deleted file mode 120000 index b3632ccbc..000000000 --- a/definitions/ubuntu-12.04-i386/minimize.sh +++ /dev/null @@ -1 +0,0 @@ -../.common/minimize.sh \ No newline at end of file diff --git a/definitions/ubuntu-12.04-i386/networking.sh b/definitions/ubuntu-12.04-i386/networking.sh deleted file mode 120000 index 8b49862eb..000000000 --- a/definitions/ubuntu-12.04-i386/networking.sh +++ /dev/null @@ -1 +0,0 @@ -../.ubuntu/networking.sh \ No newline at end of file diff --git a/definitions/ubuntu-12.04-i386/preseed.cfg b/definitions/ubuntu-12.04-i386/preseed.cfg deleted file mode 120000 index 0aca6daae..000000000 --- a/definitions/ubuntu-12.04-i386/preseed.cfg +++ /dev/null @@ -1 +0,0 @@ -../.ubuntu/preseed.cfg \ No newline at end of file diff --git a/definitions/ubuntu-12.04-i386/sshd.sh b/definitions/ubuntu-12.04-i386/sshd.sh deleted file mode 120000 index f353f2d00..000000000 --- a/definitions/ubuntu-12.04-i386/sshd.sh +++ /dev/null @@ -1 +0,0 @@ -../.common/sshd.sh \ No newline at end of file diff --git a/definitions/ubuntu-12.04-i386/sudoers.sh b/definitions/ubuntu-12.04-i386/sudoers.sh deleted file mode 100644 index 5fce3dd2c..000000000 --- a/definitions/ubuntu-12.04-i386/sudoers.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash -eux - -sed -i -e '/Defaults\s\+env_reset/a Defaults\texempt_group=sudo' /etc/sudoers -sed -i -e 's/%sudo ALL=(ALL:ALL) ALL/%sudo ALL=NOPASSWD:ALL/g' /etc/sudoers diff --git a/definitions/ubuntu-12.04-i386/update.sh b/definitions/ubuntu-12.04-i386/update.sh deleted file mode 120000 index 20b3a9ab6..000000000 --- a/definitions/ubuntu-12.04-i386/update.sh +++ /dev/null @@ -1 +0,0 @@ -../.ubuntu/update.sh \ No newline at end of file diff --git a/definitions/ubuntu-12.04-i386/vagrant.sh b/definitions/ubuntu-12.04-i386/vagrant.sh deleted file mode 120000 index 702949639..000000000 --- a/definitions/ubuntu-12.04-i386/vagrant.sh +++ /dev/null @@ -1 +0,0 @@ -../.common/vagrant.sh \ No newline at end of file diff --git a/definitions/ubuntu-12.04/cleanup.sh b/definitions/ubuntu-12.04/cleanup.sh deleted file mode 120000 index e5858f10d..000000000 --- a/definitions/ubuntu-12.04/cleanup.sh +++ /dev/null @@ -1 +0,0 @@ -../.ubuntu/cleanup.sh \ No newline at end of file diff --git a/definitions/ubuntu-12.04/definition.rb b/definitions/ubuntu-12.04/definition.rb deleted file mode 100644 index 32e3229ec..000000000 --- a/definitions/ubuntu-12.04/definition.rb +++ /dev/null @@ -1,10 +0,0 @@ -require File.dirname(__FILE__) + "/../.ubuntu/session.rb" - -iso = "ubuntu-12.04.3-server-amd64.iso" - -session = - UBUNTU_SESSION.merge( :iso_file => iso, - :iso_md5 => "2cbe868812a871242cdcdd8f2fd6feb9", - :iso_src => "http://releases.ubuntu.com/12.04/#{iso}" ) - -Veewee::Session.declare session diff --git a/definitions/ubuntu-12.04/minimize.sh b/definitions/ubuntu-12.04/minimize.sh deleted file mode 120000 index b3632ccbc..000000000 --- a/definitions/ubuntu-12.04/minimize.sh +++ /dev/null @@ -1 +0,0 @@ -../.common/minimize.sh \ No newline at end of file diff --git a/definitions/ubuntu-12.04/networking.sh b/definitions/ubuntu-12.04/networking.sh deleted file mode 120000 index 8b49862eb..000000000 --- a/definitions/ubuntu-12.04/networking.sh +++ /dev/null @@ -1 +0,0 @@ -../.ubuntu/networking.sh \ No newline at end of file diff --git a/definitions/ubuntu-12.04/preseed.cfg b/definitions/ubuntu-12.04/preseed.cfg deleted file mode 120000 index 0aca6daae..000000000 --- a/definitions/ubuntu-12.04/preseed.cfg +++ /dev/null @@ -1 +0,0 @@ -../.ubuntu/preseed.cfg \ No newline at end of file diff --git a/definitions/ubuntu-12.04/sshd.sh b/definitions/ubuntu-12.04/sshd.sh deleted file mode 120000 index f353f2d00..000000000 --- a/definitions/ubuntu-12.04/sshd.sh +++ /dev/null @@ -1 +0,0 @@ -../.common/sshd.sh \ No newline at end of file diff --git a/definitions/ubuntu-12.04/sudoers.sh b/definitions/ubuntu-12.04/sudoers.sh deleted file mode 100644 index 5fce3dd2c..000000000 --- a/definitions/ubuntu-12.04/sudoers.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash -eux - -sed -i -e '/Defaults\s\+env_reset/a Defaults\texempt_group=sudo' /etc/sudoers -sed -i -e 's/%sudo ALL=(ALL:ALL) ALL/%sudo ALL=NOPASSWD:ALL/g' /etc/sudoers diff --git a/definitions/ubuntu-12.04/update.sh b/definitions/ubuntu-12.04/update.sh deleted file mode 120000 index 20b3a9ab6..000000000 --- a/definitions/ubuntu-12.04/update.sh +++ /dev/null @@ -1 +0,0 @@ -../.ubuntu/update.sh \ No newline at end of file diff --git a/definitions/ubuntu-12.04/vagrant.sh b/definitions/ubuntu-12.04/vagrant.sh deleted file mode 120000 index 702949639..000000000 --- a/definitions/ubuntu-12.04/vagrant.sh +++ /dev/null @@ -1 +0,0 @@ -../.common/vagrant.sh \ No newline at end of file diff --git a/definitions/ubuntu-12.10-i386/cleanup.sh b/definitions/ubuntu-12.10-i386/cleanup.sh deleted file mode 120000 index e5858f10d..000000000 --- a/definitions/ubuntu-12.10-i386/cleanup.sh +++ /dev/null @@ -1 +0,0 @@ -../.ubuntu/cleanup.sh \ No newline at end of file diff --git a/definitions/ubuntu-12.10-i386/definition.rb b/definitions/ubuntu-12.10-i386/definition.rb deleted file mode 100644 index 2241e89c5..000000000 --- a/definitions/ubuntu-12.10-i386/definition.rb +++ /dev/null @@ -1,11 +0,0 @@ -require File.dirname(__FILE__) + "/../.ubuntu/session.rb" - -iso = "ubuntu-12.10-server-i386.iso" - -session = - UBUNTU_SESSION.merge( :os_type_id => 'Ubuntu', - :iso_file => iso, - :iso_md5 => "b3d4d4edfc8f291af0b83f8a2ba19a2f", - :iso_src => "http://releases.ubuntu.com/12.10/#{iso}" ) - -Veewee::Session.declare session diff --git a/definitions/ubuntu-12.10-i386/minimize.sh b/definitions/ubuntu-12.10-i386/minimize.sh deleted file mode 120000 index b3632ccbc..000000000 --- a/definitions/ubuntu-12.10-i386/minimize.sh +++ /dev/null @@ -1 +0,0 @@ -../.common/minimize.sh \ No newline at end of file diff --git a/definitions/ubuntu-12.10-i386/networking.sh b/definitions/ubuntu-12.10-i386/networking.sh deleted file mode 120000 index 8b49862eb..000000000 --- a/definitions/ubuntu-12.10-i386/networking.sh +++ /dev/null @@ -1 +0,0 @@ -../.ubuntu/networking.sh \ No newline at end of file diff --git a/definitions/ubuntu-12.10-i386/preseed.cfg b/definitions/ubuntu-12.10-i386/preseed.cfg deleted file mode 120000 index 0aca6daae..000000000 --- a/definitions/ubuntu-12.10-i386/preseed.cfg +++ /dev/null @@ -1 +0,0 @@ -../.ubuntu/preseed.cfg \ No newline at end of file diff --git a/definitions/ubuntu-12.10-i386/sshd.sh b/definitions/ubuntu-12.10-i386/sshd.sh deleted file mode 120000 index f353f2d00..000000000 --- a/definitions/ubuntu-12.10-i386/sshd.sh +++ /dev/null @@ -1 +0,0 @@ -../.common/sshd.sh \ No newline at end of file diff --git a/definitions/ubuntu-12.10-i386/sudoers.sh b/definitions/ubuntu-12.10-i386/sudoers.sh deleted file mode 100644 index 5fce3dd2c..000000000 --- a/definitions/ubuntu-12.10-i386/sudoers.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash -eux - -sed -i -e '/Defaults\s\+env_reset/a Defaults\texempt_group=sudo' /etc/sudoers -sed -i -e 's/%sudo ALL=(ALL:ALL) ALL/%sudo ALL=NOPASSWD:ALL/g' /etc/sudoers diff --git a/definitions/ubuntu-12.10-i386/update.sh b/definitions/ubuntu-12.10-i386/update.sh deleted file mode 120000 index 20b3a9ab6..000000000 --- a/definitions/ubuntu-12.10-i386/update.sh +++ /dev/null @@ -1 +0,0 @@ -../.ubuntu/update.sh \ No newline at end of file diff --git a/definitions/ubuntu-12.10-i386/vagrant.sh b/definitions/ubuntu-12.10-i386/vagrant.sh deleted file mode 120000 index 702949639..000000000 --- a/definitions/ubuntu-12.10-i386/vagrant.sh +++ /dev/null @@ -1 +0,0 @@ -../.common/vagrant.sh \ No newline at end of file diff --git a/definitions/ubuntu-12.10/cleanup.sh b/definitions/ubuntu-12.10/cleanup.sh deleted file mode 120000 index e5858f10d..000000000 --- a/definitions/ubuntu-12.10/cleanup.sh +++ /dev/null @@ -1 +0,0 @@ -../.ubuntu/cleanup.sh \ No newline at end of file diff --git a/definitions/ubuntu-12.10/definition.rb b/definitions/ubuntu-12.10/definition.rb deleted file mode 100644 index c5a31277d..000000000 --- a/definitions/ubuntu-12.10/definition.rb +++ /dev/null @@ -1,11 +0,0 @@ -require File.dirname(__FILE__) + "/../.ubuntu/session.rb" - -iso = "ubuntu-12.10-server-amd64.iso" - -session = - UBUNTU_SESSION.merge( :os_type_id => 'Ubuntu', - :iso_file => iso, - :iso_md5 => "4bd3270bde86d7e4e017e3847a4af485", - :iso_src => "http://releases.ubuntu.com/12.10/#{iso}" ) - -Veewee::Session.declare session diff --git a/definitions/ubuntu-12.10/minimize.sh b/definitions/ubuntu-12.10/minimize.sh deleted file mode 120000 index b3632ccbc..000000000 --- a/definitions/ubuntu-12.10/minimize.sh +++ /dev/null @@ -1 +0,0 @@ -../.common/minimize.sh \ No newline at end of file diff --git a/definitions/ubuntu-12.10/networking.sh b/definitions/ubuntu-12.10/networking.sh deleted file mode 120000 index 8b49862eb..000000000 --- a/definitions/ubuntu-12.10/networking.sh +++ /dev/null @@ -1 +0,0 @@ -../.ubuntu/networking.sh \ No newline at end of file diff --git a/definitions/ubuntu-12.10/preseed.cfg b/definitions/ubuntu-12.10/preseed.cfg deleted file mode 120000 index 0aca6daae..000000000 --- a/definitions/ubuntu-12.10/preseed.cfg +++ /dev/null @@ -1 +0,0 @@ -../.ubuntu/preseed.cfg \ No newline at end of file diff --git a/definitions/ubuntu-12.10/sshd.sh b/definitions/ubuntu-12.10/sshd.sh deleted file mode 120000 index f353f2d00..000000000 --- a/definitions/ubuntu-12.10/sshd.sh +++ /dev/null @@ -1 +0,0 @@ -../.common/sshd.sh \ No newline at end of file diff --git a/definitions/ubuntu-12.10/sudoers.sh b/definitions/ubuntu-12.10/sudoers.sh deleted file mode 100644 index 5fce3dd2c..000000000 --- a/definitions/ubuntu-12.10/sudoers.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash -eux - -sed -i -e '/Defaults\s\+env_reset/a Defaults\texempt_group=sudo' /etc/sudoers -sed -i -e 's/%sudo ALL=(ALL:ALL) ALL/%sudo ALL=NOPASSWD:ALL/g' /etc/sudoers diff --git a/definitions/ubuntu-12.10/update.sh b/definitions/ubuntu-12.10/update.sh deleted file mode 120000 index 20b3a9ab6..000000000 --- a/definitions/ubuntu-12.10/update.sh +++ /dev/null @@ -1 +0,0 @@ -../.ubuntu/update.sh \ No newline at end of file diff --git a/definitions/ubuntu-12.10/vagrant.sh b/definitions/ubuntu-12.10/vagrant.sh deleted file mode 120000 index 702949639..000000000 --- a/definitions/ubuntu-12.10/vagrant.sh +++ /dev/null @@ -1 +0,0 @@ -../.common/vagrant.sh \ No newline at end of file diff --git a/definitions/ubuntu-13.04-i386/cleanup.sh b/definitions/ubuntu-13.04-i386/cleanup.sh deleted file mode 120000 index e5858f10d..000000000 --- a/definitions/ubuntu-13.04-i386/cleanup.sh +++ /dev/null @@ -1 +0,0 @@ -../.ubuntu/cleanup.sh \ No newline at end of file diff --git a/definitions/ubuntu-13.04-i386/definition.rb b/definitions/ubuntu-13.04-i386/definition.rb deleted file mode 100644 index 03ef96224..000000000 --- a/definitions/ubuntu-13.04-i386/definition.rb +++ /dev/null @@ -1,11 +0,0 @@ -require File.dirname(__FILE__) + "/../.ubuntu/session.rb" - -iso = "ubuntu-13.04-server-i386.iso" - -session = - UBUNTU_SESSION.merge( :os_type_id => 'Ubuntu', - :iso_file => iso, - :iso_md5 => "73d595b804149fca9547ed94db8ff44f", - :iso_src => "http://releases.ubuntu.com/13.04/#{iso}" ) - -Veewee::Session.declare session diff --git a/definitions/ubuntu-13.04-i386/minimize.sh b/definitions/ubuntu-13.04-i386/minimize.sh deleted file mode 120000 index b3632ccbc..000000000 --- a/definitions/ubuntu-13.04-i386/minimize.sh +++ /dev/null @@ -1 +0,0 @@ -../.common/minimize.sh \ No newline at end of file diff --git a/definitions/ubuntu-13.04-i386/networking.sh b/definitions/ubuntu-13.04-i386/networking.sh deleted file mode 120000 index 8b49862eb..000000000 --- a/definitions/ubuntu-13.04-i386/networking.sh +++ /dev/null @@ -1 +0,0 @@ -../.ubuntu/networking.sh \ No newline at end of file diff --git a/definitions/ubuntu-13.04-i386/preseed.cfg b/definitions/ubuntu-13.04-i386/preseed.cfg deleted file mode 120000 index 0aca6daae..000000000 --- a/definitions/ubuntu-13.04-i386/preseed.cfg +++ /dev/null @@ -1 +0,0 @@ -../.ubuntu/preseed.cfg \ No newline at end of file diff --git a/definitions/ubuntu-13.04-i386/sshd.sh b/definitions/ubuntu-13.04-i386/sshd.sh deleted file mode 120000 index f353f2d00..000000000 --- a/definitions/ubuntu-13.04-i386/sshd.sh +++ /dev/null @@ -1 +0,0 @@ -../.common/sshd.sh \ No newline at end of file diff --git a/definitions/ubuntu-13.04-i386/sudoers.sh b/definitions/ubuntu-13.04-i386/sudoers.sh deleted file mode 100644 index 5fce3dd2c..000000000 --- a/definitions/ubuntu-13.04-i386/sudoers.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash -eux - -sed -i -e '/Defaults\s\+env_reset/a Defaults\texempt_group=sudo' /etc/sudoers -sed -i -e 's/%sudo ALL=(ALL:ALL) ALL/%sudo ALL=NOPASSWD:ALL/g' /etc/sudoers diff --git a/definitions/ubuntu-13.04-i386/update.sh b/definitions/ubuntu-13.04-i386/update.sh deleted file mode 120000 index 20b3a9ab6..000000000 --- a/definitions/ubuntu-13.04-i386/update.sh +++ /dev/null @@ -1 +0,0 @@ -../.ubuntu/update.sh \ No newline at end of file diff --git a/definitions/ubuntu-13.04-i386/vagrant.sh b/definitions/ubuntu-13.04-i386/vagrant.sh deleted file mode 120000 index 702949639..000000000 --- a/definitions/ubuntu-13.04-i386/vagrant.sh +++ /dev/null @@ -1 +0,0 @@ -../.common/vagrant.sh \ No newline at end of file diff --git a/definitions/ubuntu-13.04/cleanup.sh b/definitions/ubuntu-13.04/cleanup.sh deleted file mode 120000 index e5858f10d..000000000 --- a/definitions/ubuntu-13.04/cleanup.sh +++ /dev/null @@ -1 +0,0 @@ -../.ubuntu/cleanup.sh \ No newline at end of file diff --git a/definitions/ubuntu-13.04/definition.rb b/definitions/ubuntu-13.04/definition.rb deleted file mode 100644 index 1bffb1e39..000000000 --- a/definitions/ubuntu-13.04/definition.rb +++ /dev/null @@ -1,10 +0,0 @@ -require File.dirname(__FILE__) + "/../.ubuntu/session.rb" - -iso = "ubuntu-13.04-server-amd64.iso" - -session = - UBUNTU_SESSION.merge( :iso_file => iso, - :iso_md5 => "7d335ca541fc4945b674459cde7bffb9", - :iso_src => "http://releases.ubuntu.com/13.04/#{iso}" ) - -Veewee::Session.declare session diff --git a/definitions/ubuntu-13.04/minimize.sh b/definitions/ubuntu-13.04/minimize.sh deleted file mode 120000 index b3632ccbc..000000000 --- a/definitions/ubuntu-13.04/minimize.sh +++ /dev/null @@ -1 +0,0 @@ -../.common/minimize.sh \ No newline at end of file diff --git a/definitions/ubuntu-13.04/networking.sh b/definitions/ubuntu-13.04/networking.sh deleted file mode 120000 index 8b49862eb..000000000 --- a/definitions/ubuntu-13.04/networking.sh +++ /dev/null @@ -1 +0,0 @@ -../.ubuntu/networking.sh \ No newline at end of file diff --git a/definitions/ubuntu-13.04/preseed.cfg b/definitions/ubuntu-13.04/preseed.cfg deleted file mode 120000 index 0aca6daae..000000000 --- a/definitions/ubuntu-13.04/preseed.cfg +++ /dev/null @@ -1 +0,0 @@ -../.ubuntu/preseed.cfg \ No newline at end of file diff --git a/definitions/ubuntu-13.04/sshd.sh b/definitions/ubuntu-13.04/sshd.sh deleted file mode 120000 index f353f2d00..000000000 --- a/definitions/ubuntu-13.04/sshd.sh +++ /dev/null @@ -1 +0,0 @@ -../.common/sshd.sh \ No newline at end of file diff --git a/definitions/ubuntu-13.04/sudoers.sh b/definitions/ubuntu-13.04/sudoers.sh deleted file mode 100644 index 5fce3dd2c..000000000 --- a/definitions/ubuntu-13.04/sudoers.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash -eux - -sed -i -e '/Defaults\s\+env_reset/a Defaults\texempt_group=sudo' /etc/sudoers -sed -i -e 's/%sudo ALL=(ALL:ALL) ALL/%sudo ALL=NOPASSWD:ALL/g' /etc/sudoers diff --git a/definitions/ubuntu-13.04/update.sh b/definitions/ubuntu-13.04/update.sh deleted file mode 120000 index 20b3a9ab6..000000000 --- a/definitions/ubuntu-13.04/update.sh +++ /dev/null @@ -1 +0,0 @@ -../.ubuntu/update.sh \ No newline at end of file diff --git a/definitions/ubuntu-13.04/vagrant.sh b/definitions/ubuntu-13.04/vagrant.sh deleted file mode 120000 index 702949639..000000000 --- a/definitions/ubuntu-13.04/vagrant.sh +++ /dev/null @@ -1 +0,0 @@ -../.common/vagrant.sh \ No newline at end of file From 443b0d6ebd0f4342d1213d015eb9670126e31f4d Mon Sep 17 00:00:00 2001 From: "Julian C. Dunn" <jdunn@opscode.com> Date: Sun, 1 Dec 2013 18:39:05 -0500 Subject: [PATCH 0138/1622] Remove old gitmodules --- .gitmodules | 0 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 .gitmodules diff --git a/.gitmodules b/.gitmodules deleted file mode 100644 index e69de29bb..000000000 From 034b838ef401a56ddffbe8fe835d4ad3ac6b7056 Mon Sep 17 00:00:00 2001 From: "Julian C. Dunn" <jdunn@opscode.com> Date: Sun, 1 Dec 2013 23:20:26 -0500 Subject: [PATCH 0139/1622] Reduce memory usage of FreeBSD box to 512M now that we use the swapspace right away. This is already in the amd64 definition. --- packer/freebsd-9.2-i386.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packer/freebsd-9.2-i386.json b/packer/freebsd-9.2-i386.json index 32340d89a..a093ea8b5 100644 --- a/packer/freebsd-9.2-i386.json +++ b/packer/freebsd-9.2-i386.json @@ -49,7 +49,7 @@ "vm_name": "packer-freebsd-9.2-i386", "output_directory": "packer-freebsd-9.2-i386", "vboxmanage": [ - [ "modifyvm", "{{.Name}}", "--memory", "768" ], + [ "modifyvm", "{{.Name}}", "--memory", "512" ], [ "modifyvm", "{{.Name}}", "--cpus", "1" ] ] }, @@ -86,7 +86,7 @@ "vm_name": "packer-freebsd-9.2-i386", "output_directory": "packer-freebsd-9.2-i386", "vmx_data": { - "memsize": "768", + "memsize": "512", "numvcpus": "1", "cpuid.coresPerSocket": "1" } From 29e75109531ee21702c2fab8ec9b33363683f13d Mon Sep 17 00:00:00 2001 From: "Julian C. Dunn" <jdunn@opscode.com> Date: Mon, 2 Dec 2013 00:28:36 -0500 Subject: [PATCH 0140/1622] Update README with links to new packer-format baseboxes. Also clean up README: rename the 'getting started' section. --- README.md | 114 ++++++++++++++++++++++++++++++++++++++---------------- 1 file changed, 80 insertions(+), 34 deletions(-) diff --git a/README.md b/README.md index a5864b83e..62ce62f5d 100644 --- a/README.md +++ b/README.md @@ -2,38 +2,78 @@ Bento is a project that encapsulates [Packer](http://packer.io) templates for building [Vagrant](http://vagrantup.com) baseboxes. We use these boxes internally at Opscode for -testing Hosted Enterprise Chef, Private Enterprise Chef and our open source [cookbooks](http://community.opscode.com/users/Opscode) via [test-kitchen](http://github.com/opscode/test-kitchen). - -These basebox templates were converted from [veewee](https://github.com/jedi4ever/veewee) -definitions originally based on -[work done by Tim Dysinger](https://github.com/dysinger/basebox) to -make "Don't Repeat Yourself" (DRY) modular baseboxes. Thanks Tim! +testing Hosted Enterprise Chef, Private Enterprise Chef and our open source [cookbooks](http://community.opscode.com/users/Opscode) +via [test-kitchen](http://github.com/opscode/test-kitchen). ## Current Baseboxes The following baseboxes are publicly available and were built using -this project. Note that our baseboxes no longer include Chef Client. +this project. Note that our baseboxes do not include Chef Client. Vagrant can be instructed to install Chef at runtime using the [vagrant-omnibus](https://github.com/schisamo/vagrant-omnibus) plugin. -64-bit boxes: - -* [opscode-centos-5.9](https://opscode-vm-bento.s3.amazonaws.com/vagrant/opscode_centos-5.9_provisionerless.box) -* [opscode-centos-6.4](https://opscode-vm-bento.s3.amazonaws.com/vagrant/opscode_centos-6.4_provisionerless.box) -* [opscode-debian-7.1.0](https://opscode-vm-bento.s3.amazonaws.com/vagrant/opscode_debian-7.1.0_provisionerless.box) -* [opscode-fedora-18](https://opscode-vm-bento.s3.amazonaws.com/vagrant/opscode-fedora-18_provisionerless.box) -* [opscode-fedora-19](https://opscode-vm-bento.s3.amazonaws.com/vagrant/opscode-fedora-19_provisionerless.box) -* [opscode-ubuntu-10.04](https://opscode-vm-bento.s3.amazonaws.com/vagrant/opscode_ubuntu-10.04_provisionerless.box) -* [opscode-ubuntu-12.04](https://opscode-vm-bento.s3.amazonaws.com/vagrant/opscode_ubuntu-12.04_provisionerless.box) -* [opscode-ubuntu-13.04](https://opscode-vm-bento.s3.amazonaws.com/vagrant/opscode_ubuntu-13.04_provisionerless.box) - -32-bit boxes: - -* [opscode-centos-5.9-i386](https://opscode-vm-bento.s3.amazonaws.com/vagrant/opscode_centos-5.9-i386_provisionerless.box) -* [opscode-centos-6.4-i386](https://opscode-vm-bento.s3.amazonaws.com/vagrant/opscode_centos-6.4-i386_provisionerless.box) -* [opscode-debian-7.1.0-i386](https://opscode-vm-bento.s3.amazonaws.com/vagrant/opscode_debian-7.1.0-i386_provisionerless.box) -* [opscode-ubuntu-10.04-i386](https://opscode-vm-bento.s3.amazonaws.com/vagrant/opscode_ubuntu-10.04-i386_provisionerless.box) -* [opscode-ubuntu-12.04-i386](https://opscode-vm-bento.s3.amazonaws.com/vagrant/opscode_ubuntu-12.04-i386_provisionerless.box) +### VirtualBox + +These baseboxes were all built using a Mac OS X host running VirtualBox 4.3.2, and have that format of Guest Extensions. + +* [opscode-centos-5.10-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_centos-5.10-i386_chef-provisionerless.box) +* [opscode-centos-5.10](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_centos-5.10_chef-provisionerless.box) +* [opscode-centos-6.4-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_centos-6.4-i386_chef-provisionerless.box) +* [opscode-centos-6.4](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_centos-6.4_chef-provisionerless.box) +* [opscode-debian-6.0.8-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_debian-6.0.8-i386_chef-provisionerless.box) +* [opscode-debian-6.0.8](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_debian-6.0.8_chef-provisionerless.box) +* [opscode-debian-7.2.0-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_debian-7.2.0-i386_chef-provisionerless.box) +* [opscode-debian-7.2.0](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_debian-7.2.0_chef-provisionerless.box) +* [opscode-fedora-18-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_fedora-18-i386_chef-provisionerless.box) +* [opscode-fedora-18](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_fedora-18_chef-provisionerless.box) +* [opscode-fedora-19-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_fedora-19-i386_chef-provisionerless.box) +* [opscode-fedora-19](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_fedora-19_chef-provisionerless.box) +* [opscode-fedora-20-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_fedora-20-i386_chef-provisionerless.box) +* [opscode-fedora-20](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_fedora-20_chef-provisionerless.box) +* [opscode-freebsd-9.2-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_freebsd-9.2-i386_chef-provisionerless.box) +* [opscode-freebsd-9.2](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_freebsd-9.2_chef-provisionerless.box) +* [opscode-ubuntu-10.04-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_ubuntu-10.04-i386_chef-provisionerless.box) +* [opscode-ubuntu-10.04](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_ubuntu-10.04_chef-provisionerless.box) +* [opscode-ubuntu-12.04-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_ubuntu-12.04-i386_chef-provisionerless.box) +* [opscode-ubuntu-12.04](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_ubuntu-12.04_chef-provisionerless.box) +* [opscode-ubuntu-12.10-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_ubuntu-12.10-i386_chef-provisionerless.box) +* [opscode-ubuntu-12.10](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_ubuntu-12.10_chef-provisionerless.box) +* [opscode-ubuntu-13.04-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_ubuntu-13.04-i386_chef-provisionerless.box) +* [opscode-ubuntu-13.04](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_ubuntu-13.04_chef-provisionerless.box) +* [opscode-ubuntu-13.10-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_ubuntu-13.10-i386_chef-provisionerless.box) +* [opscode-ubuntu-13.10](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_ubuntu-13.10_chef-provisionerless.box) + +### VMWare + +These baseboxes were all built using a Mac OS X host running VMWare Fusion 6.0.3, and have that version of VMWare Tools. +The boxes should work unchanged in VMWare Workstation for Windows or Linux. + +* [opscode-centos-5.10-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_centos-5.10-i386_chef-provisionerless.box) +* [opscode-centos-5.10](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_centos-5.10_chef-provisionerless.box) +* [opscode-centos-6.4-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_centos-6.4-i386_chef-provisionerless.box) +* [opscode-centos-6.4](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_centos-6.4_chef-provisionerless.box) +* [opscode-debian-6.0.8-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_debian-6.0.8-i386_chef-provisionerless.box) +* [opscode-debian-6.0.8](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_debian-6.0.8_chef-provisionerless.box) +* [opscode-debian-7.2.0-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_debian-7.2.0-i386_chef-provisionerless.box) +* [opscode-debian-7.2.0](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_debian-7.2.0_chef-provisionerless.box) +* [opscode-fedora-18-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_fedora-18-i386_chef-provisionerless.box) +* [opscode-fedora-18](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_fedora-18_chef-provisionerless.box) +* [opscode-fedora-19-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_fedora-19-i386_chef-provisionerless.box) +* [opscode-fedora-19](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_fedora-19_chef-provisionerless.box) +* [opscode-fedora-20-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_fedora-20-i386_chef-provisionerless.box) +* [opscode-fedora-20](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_fedora-20_chef-provisionerless.box) +* [opscode-freebsd-9.2-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_freebsd-9.2-i386_chef-provisionerless.box) +* [opscode-freebsd-9.2](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_freebsd-9.2_chef-provisionerless.box) +* [opscode-ubuntu-10.04-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_ubuntu-10.04-i386_chef-provisionerless.box) +* [opscode-ubuntu-10.04](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_ubuntu-10.04_chef-provisionerless.box) +* [opscode-ubuntu-12.04-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_ubuntu-12.04-i386_chef-provisionerless.box) +* [opscode-ubuntu-12.04](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_ubuntu-12.04_chef-provisionerless.box) +* [opscode-ubuntu-12.10-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_ubuntu-12.10-i386_chef-provisionerless.box) +* [opscode-ubuntu-12.10](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_ubuntu-12.10_chef-provisionerless.box) +* [opscode-ubuntu-13.04-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_ubuntu-13.04-i386_chef-provisionerless.box) +* [opscode-ubuntu-13.04](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_ubuntu-13.04_chef-provisionerless.box) +* [opscode-ubuntu-13.10-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_ubuntu-13.10-i386_chef-provisionerless.box) +* [opscode-ubuntu-13.10](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_ubuntu-13.10_chef-provisionerless.box) ## Older Baseboxes @@ -100,7 +140,7 @@ The following base boxes were built with Chef 10.14.4. * [opscode-ubuntu-12.04](https://opscode-vm-bento.s3.amazonaws.com/vagrant/boxes/opscode-ubuntu-12.04.box) * [opscode-ubuntu-12.04-i386](https://opscode-vm-bento.s3.amazonaws.com/vagrant/boxes/opscode-ubuntu-12.04-i386.box) -# Getting Started +# Build Your Own Boxes First, install [Packer](http://packer.io) and then clone this project. @@ -117,14 +157,12 @@ If you only have VMware or VirtualBox available, you may also tell Packer to bui $ packer build -only=virtualbox debian-7.2.0-i386.json -Congratulations! You now have `./debian-7.2.0-i386-virtualbox.box` and `./debian-7.2.0-i386-vmware.box`, fully-functional -baseboxes that you can then add to Vagrant and start testing cookbooks. +Congratulations! You now have box(es) in the ../builds directory that you can then add to Vagrant and start testing cookbooks. # Veewee Definitions -The legacy veewee definitions are still in the "definitions" directory. These are unsupported and will be removed in the future. - -Packer does not yet support Windows, so the veewee definitions are still used for building those boxes. You must build these boxes yourself due to licensing constraints. You can build these as follows: +Packer does not yet support Windows, so the veewee definitions are still used for building those boxes. You must build these +boxes yourself due to licensing constraints. You can build these as follows: $ bundle install $ bundle exec veewee vbox build [definition-name] @@ -141,8 +179,13 @@ Contributing [How to contribute to Opscode open source software projects](http://wiki.opscode.com/display/chef/How+to+Contribute) -License and Authors -=================== +Authors and Contributors +======================== + +These basebox templates were converted from [veewee](https://github.com/jedi4ever/veewee) +definitions originally based on +[work done by Tim Dysinger](https://github.com/dysinger/basebox) to +make "Don't Repeat Yourself" (DRY) modular baseboxes. Thanks Tim! - Author:: Seth Chisamore (<schisamo@opscode.com>) - Author:: Stephen Delano (<stephen@opscode.com>) @@ -153,7 +196,10 @@ License and Authors - Author:: Tom Duffield (<tom@opscode.com>) - Author:: Ross Timson (<ross@rosstimson.com>) -* Copyright:: 2012-2013, Opscode, Inc (<legal@opscode.com>) +License and Copyright +===================== + +* Copyright:: 2012-2013, Opscode, Inc. (<legal@opscode.com>) * Copyright:: 2011-2012, Tim Dysinger (<tim@dysinger.net>) Licensed under the Apache License, Version 2.0 (the "License"); From 3ce93bd5c35450aa38c40cb4ebb034e73d0a1061 Mon Sep 17 00:00:00 2001 From: Seth Vargo <sethvargo@gmail.com> Date: Mon, 2 Dec 2013 13:42:49 -0500 Subject: [PATCH 0141/1622] Update README format, move old boxes into their own file. --- NOTICE.txt => NOTICE.md | 0 OLD-BOXES.md | 60 +++++++++++++++++++ README.md | 124 ++++++++++------------------------------ 3 files changed, 90 insertions(+), 94 deletions(-) rename NOTICE.txt => NOTICE.md (100%) create mode 100644 OLD-BOXES.md diff --git a/NOTICE.txt b/NOTICE.md similarity index 100% rename from NOTICE.txt rename to NOTICE.md diff --git a/OLD-BOXES.md b/OLD-BOXES.md new file mode 100644 index 000000000..18ea145da --- /dev/null +++ b/OLD-BOXES.md @@ -0,0 +1,60 @@ +Bento Old Boxes +=============== + +Chef 11.4.4 +----------- + +### 64-bit +* [opscode-centos-5.9](https://opscode-vm-bento.s3.amazonaws.com/vagrant/opscode_centos-5.9_chef-11.4.4.box) +* [opscode-centos-6.4](https://opscode-vm-bento.s3.amazonaws.com/vagrant/opscode_centos-6.4_chef-11.4.4.box) +* [opscode-ubuntu-10.04](https://opscode-vm-bento.s3.amazonaws.com/vagrant/opscode_ubuntu-10.04_chef-11.4.4.box) +* [opscode-ubuntu-12.04](https://opscode-vm-bento.s3.amazonaws.com/vagrant/opscode_ubuntu-12.04_chef-11.4.4.box) + +### 32-bit +* [opscode-centos-5.9-i386](https://opscode-vm-bento.s3.amazonaws.com/vagrant/opscode_centos-5.9-i386_chef-11.4.4.box) +* [opscode-centos-6.4-i386](https://opscode-vm-bento.s3.amazonaws.com/vagrant/opscode_centos-6.4-i386_chef-11.4.4.box) +* [opscode-ubuntu-10.04-i386](https://opscode-vm-bento.s3.amazonaws.com/vagrant/opscode_ubuntu-10.04-i386_chef-11.4.4.box) +* [opscode-ubuntu-12.04-i386](https://opscode-vm-bento.s3.amazonaws.com/vagrant/opscode_ubuntu-12.04-i386_chef-11.4.4.box) + +Chef 11.4.0 +----------- +### 64-bit +* [opscode-centos-5.9](https://opscode-vm-bento.s3.amazonaws.com/vagrant/opscode_centos-5.9_chef-11.4.0.box) +* [opscode-centos-6.4](https://opscode-vm-bento.s3.amazonaws.com/vagrant/opscode_centos-6.4_chef-11.4.0.box) +* [opscode-ubuntu-10.04](https://opscode-vm-bento.s3.amazonaws.com/vagrant/opscode_ubuntu-10.04_chef-11.4.0.box) +* [opscode-ubuntu-12.04](https://opscode-vm-bento.s3.amazonaws.com/vagrant/opscode_ubuntu-12.04_chef-11.4.0.box) + +### 32-bit +* [opscode-centos-5.9-i386](https://opscode-vm-bento.s3.amazonaws.com/vagrant/opscode_centos-5.9-i386_chef-11.4.0.box) +* [opscode-centos-6.4-i386](https://opscode-vm-bento.s3.amazonaws.com/vagrant/opscode_centos-6.4-i386_chef-11.4.0.box) +* [opscode-ubuntu-10.04-i386](https://opscode-vm-bento.s3.amazonaws.com/vagrant/opscode_ubuntu-10.04-i386_chef-11.4.0.box) +* [opscode-ubuntu-12.04-i386](https://opscode-vm-bento.s3.amazonaws.com/vagrant/opscode_ubuntu-12.04-i386_chef-11.4.0.box) + +Chef 11.2.0 +----------- +* [opscode-centos-5.8](https://opscode-vm-bento.s3.amazonaws.com/vagrant/opscode_centos-5.8_chef-11.2.0.box) +* [opscode-centos-6.3](https://opscode-vm-bento.s3.amazonaws.com/vagrant/opscode_centos-6.3_chef-11.2.0.box) +* [opscode-ubuntu-10.04](https://opscode-vm-bento.s3.amazonaws.com/vagrant/opscode_ubuntu-10.04_chef-11.2.0.box) +* [opscode-ubuntu-12.04](https://opscode-vm-bento.s3.amazonaws.com/vagrant/opscode_ubuntu-12.04_chef-11.2.0.box) + +Chef 10.18.2 +------------ +* [opscode-centos-5.8-i386](https://opscode-vm-bento.s3.amazonaws.com/vagrant/opscode_centos-5.8-i386_chef-10.18.2.box) +* [opscode-centos-5.8](https://opscode-vm-bento.s3.amazonaws.com/vagrant/opscode_centos-5.8_chef-10.18.2.box) +* [opscode-centos-6.3-i386](https://opscode-vm-bento.s3.amazonaws.com/vagrant/opscode_centos-6.3-i386_chef-10.18.2.box) +* [opscode-centos-6.3](https://opscode-vm-bento.s3.amazonaws.com/vagrant/opscode_centos-6.3_chef-10.18.2.box) +* [opscode-ubuntu-10.04-i386](https://opscode-vm-bento.s3.amazonaws.com/vagrant/opscode_ubuntu-10.04-i386_chef-10.18.2.box) +* [opscode-ubuntu-10.04](https://opscode-vm-bento.s3.amazonaws.com/vagrant/opscode_ubuntu-10.04_chef-10.18.2.box) +* [opscode-ubuntu-12.04-i386](https://opscode-vm-bento.s3.amazonaws.com/vagrant/opscode_ubuntu-12.04-i386_chef-10.18.2.box) +* [opscode-ubuntu-12.04](https://opscode-vm-bento.s3.amazonaws.com/vagrant/opscode_ubuntu-12.04_chef-10.18.2.box) + +Chef 10.14.4 +------------ +* [opscode-centos-5.8-i386](https://opscode-vm-bento.s3.amazonaws.com/vagrant/boxes/opscode-centos-5.8-i386.box) +* [opscode-centos-5.8](https://opscode-vm-bento.s3.amazonaws.com/vagrant/boxes/opscode-centos-5.8.box) +* [opscode-centos-6.3-i386](https://opscode-vm-bento.s3.amazonaws.com/vagrant/boxes/opscode-centos-6.3-i386.box) +* [opscode-centos-6.3](https://opscode-vm-bento.s3.amazonaws.com/vagrant/boxes/opscode-centos-6.3.box) +* [opscode-ubuntu-10.04](https://opscode-vm-bento.s3.amazonaws.com/vagrant/boxes/opscode-ubuntu-10.04.box) +* [opscode-ubuntu-10.04-i386](https://opscode-vm-bento.s3.amazonaws.com/vagrant/boxes/opscode-ubuntu-10.04-i386.box) +* [opscode-ubuntu-12.04](https://opscode-vm-bento.s3.amazonaws.com/vagrant/boxes/opscode-ubuntu-12.04.box) +* [opscode-ubuntu-12.04-i386](https://opscode-vm-bento.s3.amazonaws.com/vagrant/boxes/opscode-ubuntu-12.04-i386.box) diff --git a/README.md b/README.md index 62ce62f5d..8b04ae913 100644 --- a/README.md +++ b/README.md @@ -1,12 +1,13 @@ -# Bento +Bento +===== Bento is a project that encapsulates [Packer](http://packer.io) templates for building [Vagrant](http://vagrantup.com) baseboxes. We use these boxes internally at Opscode for testing Hosted Enterprise Chef, Private Enterprise Chef and our open source [cookbooks](http://community.opscode.com/users/Opscode) via [test-kitchen](http://github.com/opscode/test-kitchen). -## Current Baseboxes - +Current Baseboxes +----------------- The following baseboxes are publicly available and were built using this project. Note that our baseboxes do not include Chef Client. Vagrant can be instructed to install Chef at runtime using the @@ -75,76 +76,16 @@ The boxes should work unchanged in VMWare Workstation for Windows or Linux. * [opscode-ubuntu-13.10-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_ubuntu-13.10-i386_chef-provisionerless.box) * [opscode-ubuntu-13.10](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_ubuntu-13.10_chef-provisionerless.box) -## Older Baseboxes - -Older baseboxes include Chef. - -The following base boxes were built with Chef 11.4.4. - -64-bit boxes: - -* [opscode-centos-5.9](https://opscode-vm-bento.s3.amazonaws.com/vagrant/opscode_centos-5.9_chef-11.4.4.box) -* [opscode-centos-6.4](https://opscode-vm-bento.s3.amazonaws.com/vagrant/opscode_centos-6.4_chef-11.4.4.box) -* [opscode-ubuntu-10.04](https://opscode-vm-bento.s3.amazonaws.com/vagrant/opscode_ubuntu-10.04_chef-11.4.4.box) -* [opscode-ubuntu-12.04](https://opscode-vm-bento.s3.amazonaws.com/vagrant/opscode_ubuntu-12.04_chef-11.4.4.box) - -32-bit boxes: - -* [opscode-centos-5.9-i386](https://opscode-vm-bento.s3.amazonaws.com/vagrant/opscode_centos-5.9-i386_chef-11.4.4.box) -* [opscode-centos-6.4-i386](https://opscode-vm-bento.s3.amazonaws.com/vagrant/opscode_centos-6.4-i386_chef-11.4.4.box) -* [opscode-ubuntu-10.04-i386](https://opscode-vm-bento.s3.amazonaws.com/vagrant/opscode_ubuntu-10.04-i386_chef-11.4.4.box) -* [opscode-ubuntu-12.04-i386](https://opscode-vm-bento.s3.amazonaws.com/vagrant/opscode_ubuntu-12.04-i386_chef-11.4.4.box) - -The following base boxes were built with Chef 11.4.0. - -64-bit boxes: - -* [opscode-centos-5.9](https://opscode-vm-bento.s3.amazonaws.com/vagrant/opscode_centos-5.9_chef-11.4.0.box) -* [opscode-centos-6.4](https://opscode-vm-bento.s3.amazonaws.com/vagrant/opscode_centos-6.4_chef-11.4.0.box) -* [opscode-ubuntu-10.04](https://opscode-vm-bento.s3.amazonaws.com/vagrant/opscode_ubuntu-10.04_chef-11.4.0.box) -* [opscode-ubuntu-12.04](https://opscode-vm-bento.s3.amazonaws.com/vagrant/opscode_ubuntu-12.04_chef-11.4.0.box) - -32-bit boxes: - -* [opscode-centos-5.9-i386](https://opscode-vm-bento.s3.amazonaws.com/vagrant/opscode_centos-5.9-i386_chef-11.4.0.box) -* [opscode-centos-6.4-i386](https://opscode-vm-bento.s3.amazonaws.com/vagrant/opscode_centos-6.4-i386_chef-11.4.0.box) -* [opscode-ubuntu-10.04-i386](https://opscode-vm-bento.s3.amazonaws.com/vagrant/opscode_ubuntu-10.04-i386_chef-11.4.0.box) -* [opscode-ubuntu-12.04-i386](https://opscode-vm-bento.s3.amazonaws.com/vagrant/opscode_ubuntu-12.04-i386_chef-11.4.0.box) - -The following base boxes were built with Chef 11.2.0. (No 32-bit boxes were built for Chef 11.2.0.) - -* [opscode-centos-5.8](https://opscode-vm-bento.s3.amazonaws.com/vagrant/opscode_centos-5.8_chef-11.2.0.box) -* [opscode-centos-6.3](https://opscode-vm-bento.s3.amazonaws.com/vagrant/opscode_centos-6.3_chef-11.2.0.box) -* [opscode-ubuntu-10.04](https://opscode-vm-bento.s3.amazonaws.com/vagrant/opscode_ubuntu-10.04_chef-11.2.0.box) -* [opscode-ubuntu-12.04](https://opscode-vm-bento.s3.amazonaws.com/vagrant/opscode_ubuntu-12.04_chef-11.2.0.box) - -The following base boxes were built with Chef 10.18.2. - -* [opscode-centos-5.8-i386](https://opscode-vm-bento.s3.amazonaws.com/vagrant/opscode_centos-5.8-i386_chef-10.18.2.box) -* [opscode-centos-5.8](https://opscode-vm-bento.s3.amazonaws.com/vagrant/opscode_centos-5.8_chef-10.18.2.box) -* [opscode-centos-6.3-i386](https://opscode-vm-bento.s3.amazonaws.com/vagrant/opscode_centos-6.3-i386_chef-10.18.2.box) -* [opscode-centos-6.3](https://opscode-vm-bento.s3.amazonaws.com/vagrant/opscode_centos-6.3_chef-10.18.2.box) -* [opscode-ubuntu-10.04-i386](https://opscode-vm-bento.s3.amazonaws.com/vagrant/opscode_ubuntu-10.04-i386_chef-10.18.2.box) -* [opscode-ubuntu-10.04](https://opscode-vm-bento.s3.amazonaws.com/vagrant/opscode_ubuntu-10.04_chef-10.18.2.box) -* [opscode-ubuntu-12.04-i386](https://opscode-vm-bento.s3.amazonaws.com/vagrant/opscode_ubuntu-12.04-i386_chef-10.18.2.box) -* [opscode-ubuntu-12.04](https://opscode-vm-bento.s3.amazonaws.com/vagrant/opscode_ubuntu-12.04_chef-10.18.2.box) - -The following base boxes were built with Chef 10.14.4. - -* [opscode-centos-5.8-i386](https://opscode-vm-bento.s3.amazonaws.com/vagrant/boxes/opscode-centos-5.8-i386.box) -* [opscode-centos-5.8](https://opscode-vm-bento.s3.amazonaws.com/vagrant/boxes/opscode-centos-5.8.box) -* [opscode-centos-6.3-i386](https://opscode-vm-bento.s3.amazonaws.com/vagrant/boxes/opscode-centos-6.3-i386.box) -* [opscode-centos-6.3](https://opscode-vm-bento.s3.amazonaws.com/vagrant/boxes/opscode-centos-6.3.box) -* [opscode-ubuntu-10.04](https://opscode-vm-bento.s3.amazonaws.com/vagrant/boxes/opscode-ubuntu-10.04.box) -* [opscode-ubuntu-10.04-i386](https://opscode-vm-bento.s3.amazonaws.com/vagrant/boxes/opscode-ubuntu-10.04-i386.box) -* [opscode-ubuntu-12.04](https://opscode-vm-bento.s3.amazonaws.com/vagrant/boxes/opscode-ubuntu-12.04.box) -* [opscode-ubuntu-12.04-i386](https://opscode-vm-bento.s3.amazonaws.com/vagrant/boxes/opscode-ubuntu-12.04-i386.box) - -# Build Your Own Boxes +Older Baseboxes +--------------- +Older baseboxes include Chef and therefore are not compatible with some +new plugins. The full list of old boxes are available in the [old boxes file](https://github.com/opscode/bento/blob/master/OLD-BOXES.md). +Build Your Own Boxes +-------------------- First, install [Packer](http://packer.io) and then clone this project. -Inside the ``packer`` directory, a JSON file describes each box that can be built. You can use ``packer build`` to build the +Inside the `packer` directory, a JSON file describes each box that can be built. You can use `packer build` to build the boxes. $ packer build debian-7.2.0-i386.json @@ -159,7 +100,7 @@ If you only have VMware or VirtualBox available, you may also tell Packer to bui Congratulations! You now have box(es) in the ../builds directory that you can then add to Vagrant and start testing cookbooks. -# Veewee Definitions +### Veewee Definitions Packer does not yet support Windows, so the veewee definitions are still used for building those boxes. You must build these boxes yourself due to licensing constraints. You can build these as follows: @@ -168,39 +109,33 @@ boxes yourself due to licensing constraints. You can build these as follows: $ bundle exec veewee vbox build [definition-name] Bugs and Issues -=============== - -Use the -[issue tracker](http://tickets.opscode.com/browse/BENTO) to -report bugs, features or other issues. +--------------- +Use the [issue tracker](http://tickets.opscode.com/browse/BENTO) to report +bugs, features or other issues. Contributing -============ - +------------ [How to contribute to Opscode open source software projects](http://wiki.opscode.com/display/chef/How+to+Contribute) -Authors and Contributors -======================== - +License & Authors +----------------- These basebox templates were converted from [veewee](https://github.com/jedi4ever/veewee) definitions originally based on [work done by Tim Dysinger](https://github.com/dysinger/basebox) to make "Don't Repeat Yourself" (DRY) modular baseboxes. Thanks Tim! -- Author:: Seth Chisamore (<schisamo@opscode.com>) -- Author:: Stephen Delano (<stephen@opscode.com>) -- Author:: Joshua Timberman (<joshua@opscode.com>) -- Author:: Tim Dysinger (<tim@dysinger.net>) -- Author:: Chris McClimans (<chris@hippiehacker.org>) -- Author:: Julian Dunn (<jdunn@opscode.com>) -- Author:: Tom Duffield (<tom@opscode.com>) -- Author:: Ross Timson (<ross@rosstimson.com>) - -License and Copyright -===================== +- Author: Seth Chisamore (<schisamo@opscode.com>) +- Author: Stephen Delano (<stephen@opscode.com>) +- Author: Joshua Timberman (<joshua@opscode.com>) +- Author: Tim Dysinger (<tim@dysinger.net>) +- Author: Chris McClimans (<chris@hippiehacker.org>) +- Author: Julian Dunn (<jdunn@opscode.com>) +- Author: Tom Duffield (<tom@opscode.com>) +- Author: Ross Timson (<ross@rosstimson.com>) -* Copyright:: 2012-2013, Opscode, Inc. (<legal@opscode.com>) -* Copyright:: 2011-2012, Tim Dysinger (<tim@dysinger.net>) +```text +Copyright 2012-2013, Opscode, Inc. (<legal@opscode.com>) +Copyright 2011-2012, Tim Dysinger (<tim@dysinger.net>) Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -213,3 +148,4 @@ distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. +``` From b12fd2b2e15630c65da9ee7e71998a2d850c5a82 Mon Sep 17 00:00:00 2001 From: "Julian C. Dunn" <jdunn@opscode.com> Date: Tue, 3 Dec 2013 15:35:14 -0500 Subject: [PATCH 0142/1622] [BENTO-83] Add working templates for SuSE Linux Enterprise Server 11. --- .../sles-11/sles-11-sp2-i386-autoinst.xml | 2562 +++++++++++++++++ .../sles-11/sles-11-sp2-x86_64-autoinst.xml | 2562 +++++++++++++++++ .../sles-11/sles-11-sp3-i386-autoinst.xml | 2562 +++++++++++++++++ .../sles-11/sles-11-sp3-x86_64-autoinst.xml | 2562 +++++++++++++++++ packer/scripts/sles/remove-dvd-source.sh | 21 + packer/scripts/{suse => sles}/sudoers.sh | 0 packer/scripts/sles/zypper-locks.sh | 4 + packer/sles-11-sp2-i386.json | 101 + packer/sles-11-sp2-x86_64.json | 101 + packer/sles-11-sp3-i386.json | 101 + packer/sles-11-sp3-x86_64.json | 101 + 11 files changed, 10677 insertions(+) create mode 100644 packer/http/sles-11/sles-11-sp2-i386-autoinst.xml create mode 100644 packer/http/sles-11/sles-11-sp2-x86_64-autoinst.xml create mode 100644 packer/http/sles-11/sles-11-sp3-i386-autoinst.xml create mode 100644 packer/http/sles-11/sles-11-sp3-x86_64-autoinst.xml create mode 100644 packer/scripts/sles/remove-dvd-source.sh rename packer/scripts/{suse => sles}/sudoers.sh (100%) create mode 100644 packer/scripts/sles/zypper-locks.sh create mode 100644 packer/sles-11-sp2-i386.json create mode 100644 packer/sles-11-sp2-x86_64.json create mode 100644 packer/sles-11-sp3-i386.json create mode 100644 packer/sles-11-sp3-x86_64.json diff --git a/packer/http/sles-11/sles-11-sp2-i386-autoinst.xml b/packer/http/sles-11/sles-11-sp2-i386-autoinst.xml new file mode 100644 index 000000000..ae4fa2c44 --- /dev/null +++ b/packer/http/sles-11/sles-11-sp2-i386-autoinst.xml @@ -0,0 +1,2562 @@ +<?xml version="1.0"?> +<!DOCTYPE profile> +<profile xmlns="http://www.suse.com/1.0/yast2ns" xmlns:config="http://www.suse.com/1.0/configns"> + <add-on> + <add_on_products config:type="list"> + <listentry> + <media_url><![CDATA[http://demeter.uni-regensburg.de/SLE11SP2-SDK-x86/DVD1/]]></media_url> + <product>sle-sdk</product> + <product_dir>/</product_dir> + </listentry> + </add_on_products> + </add-on> + <bootloader> + <device_map config:type="list"> + <device_map_entry> + <firmware>hd0</firmware> + <linux>/dev/sda</linux> + </device_map_entry> + </device_map> + <global> + <activate>true</activate> + <boot_root>true</boot_root> + <default>SUSE Linux Enterprise Server 11 SP2 - 3.0.13-0.27</default> + <generic_mbr>true</generic_mbr> + <gfxmenu>/boot/message</gfxmenu> + <lines_cache_id>2</lines_cache_id> + <timeout config:type="integer">8</timeout> + </global> + <initrd_modules config:type="list"> + <initrd_module> + <module>ahci</module> + </initrd_module> + <initrd_module> + <module>ata_piix</module> + </initrd_module> + <initrd_module> + <module>ata_generic</module> + </initrd_module> + <initrd_module> + <module>jbd</module> + </initrd_module> + <initrd_module> + <module>mbcache</module> + </initrd_module> + <initrd_module> + <module>ext3</module> + </initrd_module> + </initrd_modules> + <loader_type>grub</loader_type> + <sections config:type="list"> + <section> + <append>resume=/dev/sda1 splash=silent crashkernel=128M-:64M showopts</append> + <image>(hd0,1)/boot/vmlinuz-3.0.13-0.27-default</image> + <initial>1</initial> + <initrd>(hd0,1)/boot/initrd-3.0.13-0.27-default</initrd> + <lines_cache_id>0</lines_cache_id> + <name>SUSE Linux Enterprise Server 11 SP2 - 3.0.13-0.27</name> + <original_name>linux</original_name> + <root>/dev/sda2</root> + <type>image</type> + <vgamode>0x314</vgamode> + </section> + <section> + <append>showopts ide=nodma apm=off noresume edd=off powersaved=off nohz=off highres=off processor.max_cstate=1 nomodeset x11failsafe</append> + <image>(hd0,1)/boot/vmlinuz-3.0.13-0.27-default</image> + <initrd>(hd0,1)/boot/initrd-3.0.13-0.27-default</initrd> + <lines_cache_id>1</lines_cache_id> + <name>Failsafe -- SUSE Linux Enterprise Server 11 SP2 - 3.0.13-0.27</name> + <original_name>failsafe</original_name> + <root>/dev/sda2</root> + <type>image</type> + <vgamode>0x314</vgamode> + </section> + </sections> + </bootloader> + <ca_mgm> + <CAName>YaST_Default_CA</CAName> + <ca_commonName>YaST Default CA (vagrant-sles-11sp2-x86)</ca_commonName> + <country>US</country> + <locality></locality> + <organisation></organisation> + <organisationUnit></organisationUnit> + <password>ENTER PASSWORD HERE</password> + <server_commonName>vagrant-sles-11sp2-x86.vagrantup.com</server_commonName> + <server_email>postmaster@vagrantup.com</server_email> + <state></state> + <takeLocalServerName config:type="boolean">false</takeLocalServerName> + </ca_mgm> + <deploy_image> + <image_installation config:type="boolean">false</image_installation> + </deploy_image> + <general> + <ask-list config:type="list"/> + <mode> + <confirm config:type="boolean">false</confirm> + </mode> + <mouse> + <id>none</id> + </mouse> + <proposals config:type="list"/> + <signature-handling> + <accept_file_without_checksum config:type="boolean">true</accept_file_without_checksum> + <accept_non_trusted_gpg_key config:type="boolean">true</accept_non_trusted_gpg_key> + <accept_unknown_gpg_key config:type="boolean">true</accept_unknown_gpg_key> + <accept_unsigned_file config:type="boolean">true</accept_unsigned_file> + <accept_verification_failed config:type="boolean">false</accept_verification_failed> + <import_gpg_key config:type="boolean">true</import_gpg_key> + </signature-handling> + <storage/> + </general> + <groups config:type="list"> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>100</gid> + <group_password>x</group_password> + <groupname>users</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>19</gid> + <group_password>x</group_password> + <groupname>floppy</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>1</gid> + <group_password>x</group_password> + <groupname>bin</groupname> + <userlist>daemon</userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>41</gid> + <group_password>x</group_password> + <groupname>xok</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>65533</gid> + <group_password>x</group_password> + <groupname>nobody</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>43</gid> + <group_password>x</group_password> + <groupname>modem</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>5</gid> + <group_password>x</group_password> + <groupname>tty</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>7</gid> + <group_password>x</group_password> + <groupname>lp</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>104</gid> + <group_password>!</group_password> + <groupname>uuidd</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>51</gid> + <group_password>!</group_password> + <groupname>postfix</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>112</gid> + <group_password>!</group_password> + <groupname>gdm</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>65534</gid> + <group_password>x</group_password> + <groupname>nogroup</groupname> + <userlist>nobody</userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>101</gid> + <group_password>!</group_password> + <groupname>messagebus</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>59</gid> + <group_password>!</group_password> + <groupname>maildrop</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>33</gid> + <group_password>x</group_password> + <groupname>video</groupname> + <userlist>vagrant</userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>3</gid> + <group_password>x</group_password> + <groupname>sys</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>15</gid> + <group_password>x</group_password> + <groupname>shadow</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>20</gid> + <group_password>x</group_password> + <groupname>cdrom</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>21</gid> + <group_password>x</group_password> + <groupname>console</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>42</gid> + <group_password>x</group_password> + <groupname>trusted</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>102</gid> + <group_password>!</group_password> + <groupname>haldaemon</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>106</gid> + <group_password>!</group_password> + <groupname>puppet</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>16</gid> + <group_password>x</group_password> + <groupname>dialout</groupname> + <userlist>vagrant</userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>107</gid> + <group_password>!</group_password> + <groupname>polkituser</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>10</gid> + <group_password>x</group_password> + <groupname>wheel</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>109</gid> + <group_password>!</group_password> + <groupname>pulse</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>8</gid> + <group_password>x</group_password> + <groupname>www</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>40</gid> + <group_password>x</group_password> + <groupname>games</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>6</gid> + <group_password>x</group_password> + <groupname>disk</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>17</gid> + <group_password>x</group_password> + <groupname>audio</groupname> + <userlist>pulse</userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>111</gid> + <group_password>!</group_password> + <groupname>suse-ncc</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>49</gid> + <group_password>x</group_password> + <groupname>ftp</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>103</gid> + <group_password>!</group_password> + <groupname>tape</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>25</gid> + <group_password>!</group_password> + <groupname>at</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>9</gid> + <group_password>x</group_password> + <groupname>kmem</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>32</gid> + <group_password>x</group_password> + <groupname>public</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>12</gid> + <group_password>x</group_password> + <groupname>mail</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>0</gid> + <group_password>x</group_password> + <groupname>root</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>2</gid> + <group_password>x</group_password> + <groupname>daemon</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>105</gid> + <group_password>!</group_password> + <groupname>sfcb</groupname> + <userlist>root</userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>108</gid> + <group_password>!</group_password> + <groupname>ntp</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>14</gid> + <group_password>x</group_password> + <groupname>uucp</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>110</gid> + <group_password>!</group_password> + <groupname>pulse-access</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>71</gid> + <group_password>!</group_password> + <groupname>ntadmin</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>62</gid> + <group_password>x</group_password> + <groupname>man</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>22</gid> + <group_password>x</group_password> + <groupname>utmp</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>13</gid> + <group_password>x</group_password> + <groupname>news</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>65</gid> + <group_password>!</group_password> + <groupname>sshd</groupname> + <userlist></userlist> + </group> + </groups> + <host> + <hosts config:type="list"> + <hosts_entry> + <host_address>127.0.0.1</host_address> + <names config:type="list"> + <name>localhost</name> + </names> + </hosts_entry> + <hosts_entry> + <host_address>::1</host_address> + <names config:type="list"> + <name>localhost ipv6-localhost ipv6-loopback</name> + </names> + </hosts_entry> + <hosts_entry> + <host_address>fe00::0</host_address> + <names config:type="list"> + <name>ipv6-localnet</name> + </names> + </hosts_entry> + <hosts_entry> + <host_address>ff00::0</host_address> + <names config:type="list"> + <name>ipv6-mcastprefix</name> + </names> + </hosts_entry> + <hosts_entry> + <host_address>ff02::1</host_address> + <names config:type="list"> + <name>ipv6-allnodes</name> + </names> + </hosts_entry> + <hosts_entry> + <host_address>ff02::2</host_address> + <names config:type="list"> + <name>ipv6-allrouters</name> + </names> + </hosts_entry> + <hosts_entry> + <host_address>ff02::3</host_address> + <names config:type="list"> + <name>ipv6-allhosts</name> + </names> + </hosts_entry> + </hosts> + </host> + <login_settings/> + <networking> + <dhcp_options> + <dhclient_client_id></dhclient_client_id> + <dhclient_hostname_option>AUTO</dhclient_hostname_option> + </dhcp_options> + <dns> + <dhcp_hostname config:type="boolean">false</dhcp_hostname> + <domain>vagrantup.com</domain> + <hostname>vagrant-sles-11sp2-x86</hostname> + <resolv_conf_policy>auto</resolv_conf_policy> + <searchlist config:type="list"> + <search>vagrantup.com</search> + </searchlist> + <write_hostname config:type="boolean">true</write_hostname> + </dns> + <interfaces config:type="list"> + <interface> + <bootproto>dhcp</bootproto> + <device>eth0</device> + <startmode>auto</startmode> + <usercontrol>no</usercontrol> + </interface> + </interfaces> + <keep_install_network config:type="boolean">true</keep_install_network> + <managed config:type="boolean">false</managed> + <routing> + <ip_forward config:type="boolean">false</ip_forward> + </routing> + </networking> + <partitioning config:type="list"> + <drive> + <device>/dev/sda</device> + <initialize config:type="boolean">true</initialize> + <partitions config:type="list"> + <partition> + <create config:type="boolean">true</create> + <crypt_fs config:type="boolean">false</crypt_fs> + <filesystem config:type="symbol">swap</filesystem> + <format config:type="boolean">true</format> + <fstopt>defaults</fstopt> + <loop_fs config:type="boolean">false</loop_fs> + <mount>swap</mount> + <mountby config:type="symbol">device</mountby> + <partition_id config:type="integer">130</partition_id> + <partition_nr config:type="integer">1</partition_nr> + <raid_options/> + <resize config:type="boolean">false</resize> + <size>1561492992</size> + </partition> + <partition> + <create config:type="boolean">true</create> + <crypt_fs config:type="boolean">false</crypt_fs> + <filesystem config:type="symbol">ext3</filesystem> + <format config:type="boolean">true</format> + <fstopt>acl,user_xattr</fstopt> + <loop_fs config:type="boolean">false</loop_fs> + <mount>/</mount> + <mountby config:type="symbol">device</mountby> + <partition_id config:type="integer">131</partition_id> + <partition_nr config:type="integer">2</partition_nr> + <raid_options/> + <resize config:type="boolean">false</resize> + <size>19895844352</size> + </partition> + </partitions> + <pesize></pesize> + <type config:type="symbol">CT_DISK</type> + <use>all</use> + </drive> + </partitioning> + <report> + <errors> + <log config:type="boolean">true</log> + <show config:type="boolean">true</show> + <timeout config:type="integer">0</timeout> + </errors> + <messages> + <log config:type="boolean">true</log> + <show config:type="boolean">true</show> + <timeout config:type="integer">0</timeout> + </messages> + <warnings> + <log config:type="boolean">true</log> + <show config:type="boolean">true</show> + <timeout config:type="integer">0</timeout> + </warnings> + <yesno_messages> + <log config:type="boolean">true</log> + <show config:type="boolean">true</show> + <timeout config:type="integer">0</timeout> + </yesno_messages> + </report> + <software> + + <packages config:type="list"> + <package>desktop-translations</package> + <package>gconf2-branding-SLES</package> + <package>libproxy0-config-gnome</package> + <package>sle-sdk-release</package> + <package>sle-sdk-release-SDK</package> + <package>sles-manuals_en</package> + <package>yast2-trans-en_US</package> + </packages> + <patterns config:type="list"> + <pattern>Basis-Devel</pattern> + <pattern>Minimal</pattern> + <pattern>apparmor</pattern> + <pattern>base</pattern> + <pattern>sdk_kernel</pattern> + </patterns> + <remove-packages config:type="list"> + <package>3ddiag</package> + <package>CASA</package> + <package>CASA-devel</package> + <package>CASA_auth_token_client</package> + <package>CASA_auth_token_client-devel</package> + <package>ConsoleKit-devel</package> + <package>ConsoleKit-x11</package> + <package>DirectFB-devel</package> + <package>FastCGI</package> + <package>IlmBase</package> + <package>IlmBase-devel</package> + <package>ImageMagick</package> + <package>ImageMagick-devel</package> + <package>LibVNCServer</package> + <package>LibVNCServer-devel</package> + <package>Mesa</package> + <package>Mesa-devel</package> + <package>ModemManager</package> + <package>Modules</package> + <package>NetworkManager</package> + <package>NetworkManager-devel</package> + <package>NetworkManager-glib</package> + <package>NetworkManager-gnome</package> + <package>NetworkManager-kde4</package> + <package>NetworkManager-kde4-lang</package> + <package>NetworkManager-kde4-libs</package> + <package>OpenEXR</package> + <package>OpenEXR-devel</package> + <package>OpenIPMI-devel</package> + <package>PackageKit</package> + <package>PackageKit-devel</package> + <package>PackageKit-lang</package> + <package>PolicyKit-devel</package> + <package>PolicyKit-gnome</package> + <package>PolicyKit-gnome-devel</package> + <package>PolicyKit-gnome-libs</package> + <package>SDL-devel</package> + <package>SDL_net</package> + <package>SDL_net-devel</package> + <package>TeX-Guy</package> + <package>TeX-Guy-devel</package> + <package>VFlib3</package> + <package>VFlib3-devel</package> + <package>WindowMaker</package> + <package>WindowMaker-devel</package> + <package>a2ps</package> + <package>aalib</package> + <package>aalib-devel</package> + <package>akonadi-runtime</package> + <package>akregator</package> + <package>alsa-devel</package> + <package>alsa-firmware</package> + <package>alsa-plugins-pulse</package> + <package>alsa-tools</package> + <package>alsa-tools-devel</package> + <package>anthy</package> + <package>anthy-devel</package> + <package>antlr</package> + <package>apache2</package> + <package>apache2-devel</package> + <package>apache2-mod_perl</package> + <package>apache2-mod_perl-devel</package> + <package>apache2-prefork</package> + <package>apache2-utils</package> + <package>apache2-worker</package> + <package>apparmor-profile-editor</package> + <package>art-sharp2</package> + <package>arts</package> + <package>arts-devel</package> + <package>aspell-devel</package> + <package>at-spi</package> + <package>at-spi-devel</package> + <package>at-spi-lang</package> + <package>atk-devel</package> + <package>audiofile</package> + <package>audiofile-devel</package> + <package>audit-devel</package> + <package>augeas-lenses</package> + <package>automoc4</package> + <package>avahi</package> + <package>avahi-compat-howl-devel</package> + <package>avahi-compat-mDNSResponder-devel</package> + <package>avahi-lang</package> + <package>babl-0_0</package> + <package>banshee-1</package> + <package>banshee-1-backend-engine-gstreamer</package> + <package>banshee-1-backend-platform-gnome</package> + <package>banshee-1-backend-platform-unix</package> + <package>banshee-1-devel</package> + <package>banshee-1-extensions-default</package> + <package>banshee-1-lang</package> + <package>beagle-devel</package> + <package>bind-devel</package> + <package>binutils-devel</package> + <package>bluez</package> + <package>bluez-devel</package> + <package>boo</package> + <package>boo-devel</package> + <package>boost-devel</package> + <package>bootsplash-branding-SLED</package> + <package>cairo-devel</package> + <package>cairomm</package> + <package>cairomm-devel</package> + <package>canna</package> + <package>canna-devel</package> + <package>canna-libs</package> + <package>cannadic</package> + <package>capi4linux</package> + <package>capi4linux-devel</package> + <package>cdk</package> + <package>cdk-devel</package> + <package>cdrdao</package> + <package>chasen</package> + <package>chasen-devel</package> + <package>check</package> + <package>check-devel</package> + <package>chmlib</package> + <package>chmlib-devel</package> + <package>cim-schema</package> + <package>clucene-core</package> + <package>clucene-core-devel</package> + <package>cmake</package> + <package>compiz</package> + <package>compiz-branding-SLE</package> + <package>compiz-devel</package> + <package>compiz-gnome</package> + <package>coolkey-devel</package> + <package>cracklib-devel</package> + <package>crash-devel</package> + <package>crimson</package> + <package>cscope</package> + <package>cups</package> + <package>cups-devel</package> + <package>cvsps</package> + <package>cyrus-imapd-devel</package> + <package>cyrus-sasl-crammd5</package> + <package>cyrus-sasl-devel</package> + <package>dante</package> + <package>dante-devel</package> + <package>db1</package> + <package>db1-devel</package> + <package>db43</package> + <package>db43-devel</package> + <package>dbus-1-devel</package> + <package>dbus-1-glib-devel</package> + <package>dbus-1-python-devel</package> + <package>dbus-1-qt3</package> + <package>dbus-1-qt3-devel</package> + <package>dbus-1-x11</package> + <package>dejagnu</package> + <package>dejavu</package> + <package>desktop-data-openSUSE</package> + <package>desktop-file-utils</package> + <package>devhelp</package> + <package>devhelp-devel</package> + <package>devhelp-lang</package> + <package>device-mapper-devel</package> + <package>dhcp</package> + <package>dhcp-client</package> + <package>dhcp-devel</package> + <package>diffstat</package> + <package>dmapi-devel</package> + <package>dnsmasq</package> + <package>docbook-xsl-stylesheets</package> + <package>docbook_4</package> + <package>doxygen</package> + <package>dvd+rw-tools</package> + <package>e2fsprogs-devel</package> + <package>emacs</package> + <package>emacs-nox</package> + <package>emacs-x11</package> + <package>enchant</package> + <package>enchant-devel</package> + <package>enscript</package> + <package>eog</package> + <package>eog-devel</package> + <package>eog-lang</package> + <package>espeak</package> + <package>evince</package> + <package>evince-devel</package> + <package>evince-lang</package> + <package>evoldap2-devel</package> + <package>evolution</package> + <package>evolution-data-server</package> + <package>evolution-data-server-devel</package> + <package>evolution-data-server-lang</package> + <package>evolution-devel</package> + <package>evolution-lang</package> + <package>expect-devel</package> + <package>facter</package> + <package>fam</package> + <package>fam-devel</package> + <package>farsight</package> + <package>farsight-devel</package> + <package>festival</package> + <package>festival-devel</package> + <package>fftw</package> + <package>fftw-devel</package> + <package>fftw-mpi</package> + <package>fftw-mpi-devel</package> + <package>fftw-threads</package> + <package>fftw-threads-devel</package> + <package>fftw3</package> + <package>fftw3-devel</package> + <package>fftw3-threads</package> + <package>fftw3-threads-devel</package> + <package>file-devel</package> + <package>fileshareset</package> + <package>finch</package> + <package>finch-devel</package> + <package>flac-devel</package> + <package>fltk</package> + <package>fltk-devel</package> + <package>fontconfig-devel</package> + <package>fonts-config</package> + <package>foomatic-filters</package> + <package>freeglut</package> + <package>freeglut-devel</package> + <package>freeradius-client-devel</package> + <package>freeradius-client-libs</package> + <package>freeradius-server-devel</package> + <package>freeradius-server-libs</package> + <package>freetype</package> + <package>freetype2-devel</package> + <package>fribidi</package> + <package>fribidi-devel</package> + <package>ft2demos</package> + <package>fuse-devel</package> + <package>fwnn-devel</package> + <package>fxload</package> + <package>gcc-gij</package> + <package>gcc-java</package> + <package>gcc43-gij</package> + <package>gcc43-java</package> + <package>gconf-sharp2</package> + <package>gconf2-devel</package> + <package>gconfmm</package> + <package>gconfmm-devel</package> + <package>gd</package> + <package>gd-devel</package> + <package>gdbm-32bit</package> + <package>gdk-pixbuf</package> + <package>gdk-pixbuf-devel</package> + <package>gegl-0_0</package> + <package>gettext-tools</package> + <package>gfxboot-branding-SLED</package> + <package>gfxboot-devel</package> + <package>ggz</package> + <package>ggz-client-libs</package> + <package>ggz-client-libs-devel</package> + <package>ggz-client-libs-lang</package> + <package>ghex</package> + <package>ghex-devel</package> + <package>ghex-lang</package> + <package>ghostscript-devel</package> + <package>ghostscript-fonts-other</package> + <package>ghostscript-fonts-std</package> + <package>ghostscript-ijs-devel</package> + <package>ghostscript-library</package> + <package>ghostscript-omni</package> + <package>ghostscript-x11</package> + <package>giflib-devel</package> + <package>gimp</package> + <package>gimp-branding-SLED</package> + <package>gimp-devel</package> + <package>gimp-lang</package> + <package>gimp-plugins-python</package> + <package>git</package> + <package>git-arch</package> + <package>git-core</package> + <package>git-cvs</package> + <package>git-daemon</package> + <package>git-email</package> + <package>git-gui</package> + <package>git-svn</package> + <package>git-web</package> + <package>gitk</package> + <package>gjdoc</package> + <package>glade-sharp2</package> + <package>glade3</package> + <package>glade3-lang</package> + <package>glib</package> + <package>glib-devel</package> + <package>glib-sharp2</package> + <package>glib2-devel</package> + <package>glibmm2</package> + <package>glibmm2-devel</package> + <package>glitz</package> + <package>glitz-devel</package> + <package>gltt</package> + <package>gltt-devel</package> + <package>gmime-2_4-devel</package> + <package>gmime-devel</package> + <package>gmp-devel</package> + <package>gnet</package> + <package>gnet-devel</package> + <package>gnokii</package> + <package>gnokii-devel</package> + <package>gnokii-smsd</package> + <package>gnome-certauth-devel</package> + <package>gnome-control-center</package> + <package>gnome-control-center-devel</package> + <package>gnome-control-center-lang</package> + <package>gnome-desktop</package> + <package>gnome-desktop-devel</package> + <package>gnome-desktop-lang</package> + <package>gnome-doc-utils</package> + <package>gnome-doc-utils-devel</package> + <package>gnome-doc-utils-lang</package> + <package>gnome-keyring-devel</package> + <package>gnome-keyring-sharp</package> + <package>gnome-keyring-sharp-devel</package> + <package>gnome-libs</package> + <package>gnome-libs-devel</package> + <package>gnome-mag</package> + <package>gnome-mag-devel</package> + <package>gnome-mag-lang</package> + <package>gnome-main-menu</package> + <package>gnome-main-menu-lang</package> + <package>gnome-media</package> + <package>gnome-media-devel</package> + <package>gnome-media-lang</package> + <package>gnome-menus</package> + <package>gnome-menus-branding-SLED</package> + <package>gnome-menus-devel</package> + <package>gnome-menus-lang</package> + <package>gnome-mount</package> + <package>gnome-mount-lang</package> + <package>gnome-panel</package> + <package>gnome-panel-devel</package> + <package>gnome-panel-lang</package> + <package>gnome-pilot</package> + <package>gnome-pilot-devel</package> + <package>gnome-pilot-lang</package> + <package>gnome-settings-daemon</package> + <package>gnome-settings-daemon-devel</package> + <package>gnome-settings-daemon-lang</package> + <package>gnome-sharp2</package> + <package>gnome-speech</package> + <package>gnome-speech-devel</package> + <package>gnome-themes</package> + <package>gnome-utils</package> + <package>gnome-utils-devel</package> + <package>gnome-utils-lang</package> + <package>gnome-vfs-sharp2</package> + <package>gnome-vfs2</package> + <package>gnome-vfs2-devel</package> + <package>gnome-vfs2-lang</package> + <package>gnome-vfsmm</package> + <package>gnome-vfsmm-devel</package> + <package>gnopernicus</package> + <package>gnopernicus-devel</package> + <package>gnopernicus-lang</package> + <package>gnutls</package> + <package>goffice</package> + <package>goffice-devel</package> + <package>goffice-lang</package> + <package>goocanvas</package> + <package>goocanvas-devel</package> + <package>goocanvas-lang</package> + <package>goom2k4</package> + <package>goom2k4-devel</package> + <package>graphviz</package> + <package>graphviz-devel</package> + <package>graphviz-gd</package> + <package>graphviz-gnome</package> + <package>gstreamer-0_10</package> + <package>gstreamer-0_10-devel</package> + <package>gstreamer-0_10-lang</package> + <package>gstreamer-0_10-plugins-base</package> + <package>gstreamer-0_10-plugins-base-devel</package> + <package>gstreamer-0_10-plugins-base-lang</package> + <package>gstreamer-0_10-plugins-good</package> + <package>gstreamer-0_10-plugins-good-lang</package> + <package>gstreamer-0_10-utils</package> + <package>gstreamer-utils</package> + <package>gtk</package> + <package>gtk-devel</package> + <package>gtk-lang</package> + <package>gtk-sharp2</package> + <package>gtk-vnc-devel</package> + <package>gtk2-devel</package> + <package>gtkglext</package> + <package>gtkglext-devel</package> + <package>gtkhtml2</package> + <package>gtkhtml2-devel</package> + <package>gtkhtml2-lang</package> + <package>gtkhtml314-sharp</package> + <package>gtkmm2</package> + <package>gtkmm2-devel</package> + <package>gtksourceview-devel</package> + <package>gtksourceview-lang</package> + <package>gtksourceview18</package> + <package>gtksourceview18-devel</package> + <package>gtkspell</package> + <package>gtkspell-devel</package> + <package>gtkspell-lang</package> + <package>gucharmap</package> + <package>gucharmap-devel</package> + <package>gucharmap-lang</package> + <package>guile</package> + <package>guile-devel</package> + <package>gutenprint</package> + <package>gutenprint-devel</package> + <package>gvfs-devel</package> + <package>gxmhtml</package> + <package>hal-devel</package> + <package>hal-palm</package> + <package>htdig</package> + <package>htdig-devel</package> + <package>hunspell</package> + <package>hunspell-devel</package> + <package>hunspell-tools</package> + <package>hwinfo-devel</package> + <package>i4l-base</package> + <package>icewm</package> + <package>icewm-lite</package> + <package>id3lib</package> + <package>id3lib-devel</package> + <package>imap-devel</package> + <package>imap-lib</package> + <package>imlib</package> + <package>imlib-devel</package> + <package>imlib2</package> + <package>imlib2-devel</package> + <package>indent</package> + <package>info2html</package> + <package>inn</package> + <package>inn-devel</package> + <package>intltool</package> + <package>ipadic</package> + <package>iptables-devel</package> + <package>iso-codes</package> + <package>iso-codes-devel</package> + <package>iso_ent</package> + <package>ispell</package> + <package>ispell-american</package> + <package>ispell-brazilian</package> + <package>ispell-british</package> + <package>ispell-czech</package> + <package>ispell-danish</package> + <package>ispell-finnish</package> + <package>ispell-french</package> + <package>ispell-german</package> + <package>ispell-hungarian</package> + <package>ispell-italian</package> + <package>ispell-ngerman</package> + <package>ispell-norsk</package> + <package>ispell-polish</package> + <package>ispell-portuguese</package> + <package>ispell-russian</package> + <package>ispell-slovak</package> + <package>ispell-spanish</package> + <package>ispell-swedish</package> + <package>itcl-devel</package> + <package>java-1_4_2-ibm</package> + <package>java-1_4_2-ibm-devel</package> + <package>java-1_5_0-gcj-compat</package> + <package>java-1_5_0-gcj-compat-devel</package> + <package>java-1_6_0-ibm</package> + <package>java-1_6_0-ibm-devel</package> + <package>joe</package> + <package>jpackage-utils</package> + <package>k3b</package> + <package>k3b-devel</package> + <package>k3b-lang</package> + <package>kaddressbook</package> + <package>kalarm</package> + <package>kde-susetranslations</package> + <package>kde4-filesystem</package> + <package>kde4-kgreeter-plugins</package> + <package>kdebase3</package> + <package>kdebase3-devel</package> + <package>kdebase3-runtime</package> + <package>kdebase4-SLED</package> + <package>kdebase4-SLED-lang</package> + <package>kdebase4-runtime</package> + <package>kdebase4-runtime-branding-SLED</package> + <package>kdebase4-workspace</package> + <package>kdebase4-workspace-branding-SLED</package> + <package>kdebase4-workspace-devel</package> + <package>kdebase4-workspace-ksysguardd</package> + <package>kdelibs3</package> + <package>kdelibs3-arts</package> + <package>kdelibs3-default-style</package> + <package>kdelibs3-devel</package> + <package>kdelibs3-doc</package> + <package>kdelibs4</package> + <package>kdelibs4-branding-SLED</package> + <package>kdelibs4-core</package> + <package>kdelibs4-doc</package> + <package>kdemultimedia3-arts</package> + <package>kdepim3</package> + <package>kdepim4</package> + <package>kdepim4-devel</package> + <package>kdepimlibs4</package> + <package>kdialog</package> + <package>kdm</package> + <package>kdm-branding-SLED</package> + <package>kernel-docs</package> + <package>kernel-syms</package> + <package>kernel-trace-devel</package> + <package>kernel-xen-devel</package> + <package>keyutils-devel</package> + <package>kio_sysinfo</package> + <package>kio_sysinfo-branding-SLED</package> + <package>kmail</package> + <package>knode</package> + <package>kontact</package> + <package>korganizer</package> + <package>kpilot</package> + <package>krb5-devel</package> + <package>ksh-devel</package> + <package>ktorrent</package> + <package>ktorrent-devel</package> + <package>ktorrent-lang</package> + <package>kwin</package> + <package>ladspa-devel</package> + <package>lib3ds-1-3</package> + <package>lib3ds-devel</package> + <package>libFLAC++6</package> + <package>libFLAC8</package> + <package>libHX-devel</package> + <package>libMagick++-devel</package> + <package>libMagick++1</package> + <package>libMagickWand1</package> + <package>libQtWebKit-devel</package> + <package>libQtWebKit4</package> + <package>libXerces-c-devel</package> + <package>libXerces-c28</package> + <package>libXiterm</package> + <package>libXiterm-devel</package> + <package>libacl-devel</package> + <package>libadns-devel</package> + <package>libadns1</package> + <package>libakode</package> + <package>libakode-devel</package> + <package>libakonadi4</package> + <package>libakonadiprotocolinternals-devel</package> + <package>libakonadiprotocolinternals1</package> + <package>libao</package> + <package>libao-devel</package> + <package>libapparmor-devel</package> + <package>libapr-util1</package> + <package>libapr-util1-devel</package> + <package>libapr1</package> + <package>libapr1-devel</package> + <package>libarchive-devel</package> + <package>libart_lgpl</package> + <package>libart_lgpl-devel</package> + <package>libassuan-devel</package> + <package>libatomic-ops-devel</package> + <package>libattr-devel</package> + <package>libavahi-core5</package> + <package>libavahi-devel</package> + <package>libavahi-glib-devel</package> + <package>libavahi-gobject-devel</package> + <package>libavahi-gobject0</package> + <package>libavahi-ui0</package> + <package>libavc1394-0</package> + <package>libavc1394-devel</package> + <package>libbabl-0_0-0</package> + <package>libbeagle-devel</package> + <package>libbeagle-python</package> + <package>libbeagle1</package> + <package>libbitmask-devel</package> + <package>libbitmask1</package> + <package>libblkid-devel</package> + <package>libblocxx-devel</package> + <package>libbonobo</package> + <package>libbonobo-devel</package> + <package>libbonobo-lang</package> + <package>libbonoboui</package> + <package>libbonoboui-devel</package> + <package>libbonoboui-lang</package> + <package>libboost_date_time1_36_0</package> + <package>libboost_filesystem1_36_0</package> + <package>libboost_graph1_36_0</package> + <package>libboost_iostreams1_36_0</package> + <package>libboost_math1_36_0</package> + <package>libboost_mpi1_36_0</package> + <package>libboost_program_options1_36_0</package> + <package>libboost_python1_36_0</package> + <package>libboost_serialization1_36_0</package> + <package>libboost_signals1_36_0</package> + <package>libboost_system1_36_0</package> + <package>libboost_test1_36_0</package> + <package>libboost_thread1_36_0</package> + <package>libboost_wave1_36_0</package> + <package>libbotan-1_6_4</package> + <package>libbotan-devel</package> + <package>libbtctl</package> + <package>libbtctl-devel</package> + <package>libbtctl-lang</package> + <package>libbtctl4</package> + <package>libbz2-devel</package> + <package>libcaca</package> + <package>libcaca-devel</package> + <package>libcanberra-gtk</package> + <package>libcanberra-gtk0</package> + <package>libcanberra0</package> + <package>libcap-devel</package> + <package>libcap-ng0</package> + <package>libcdda_interface0</package> + <package>libcdda_paranoia0</package> + <package>libcddb-devel</package> + <package>libcddb2</package> + <package>libcdio++0</package> + <package>libcdio-devel</package> + <package>libcgroup-devel</package> + <package>libcgroup1</package> + <package>libchewing</package> + <package>libchewing-devel</package> + <package>libcmpiutil</package> + <package>libcmpiutil-devel</package> + <package>libcolorblind0</package> + <package>libcom_err-devel</package> + <package>libcompizconfig</package> + <package>libcompizconfig-devel</package> + <package>libcppunit-1_12-0</package> + <package>libcppunit-devel</package> + <package>libcpuset-devel</package> + <package>libcpuset1</package> + <package>libcroco</package> + <package>libcroco-0_6-3</package> + <package>libcroco-devel</package> + <package>libcryptsetup-devel</package> + <package>libcsync-devel</package> + <package>libcsync0</package> + <package>libcurl-devel</package> + <package>libdaemon-devel</package> + <package>libdaemon0</package> + <package>libdatrie-devel</package> + <package>libdatrie0</package> + <package>libdb-4_5-32bit</package> + <package>libdb-4_5-devel</package> + <package>libdbus-1-qt3-0</package> + <package>libdbus-1-qt3-0-devel</package> + <package>libdc1394-22</package> + <package>libdc1394-devel</package> + <package>libdc1394_control12</package> + <package>libdc1394_control12-devel</package> + <package>libdhcp6client-1_0-2</package> + <package>libdhcp6client-devel</package> + <package>libdigikam-devel</package> + <package>libdiscid1</package> + <package>libdjvulibre-devel</package> + <package>libdjvulibre21</package> + <package>libdmxview-devel</package> + <package>libdmxview0</package> + <package>libdnet-devel</package> + <package>libdnet1</package> + <package>libdns_sd</package> + <package>libdrm</package> + <package>libdrm-devel</package> + <package>libdv-devel</package> + <package>libdv4</package> + <package>libdvdread4</package> + <package>libdw-devel</package> + <package>libebl-devel</package> + <package>libedit-devel</package> + <package>libedit0</package> + <package>libelf-devel</package> + <package>libenchant1</package> + <package>libesd-devel</package> + <package>libesd0</package> + <package>libesmtp-devel</package> + <package>libevoldap-2_4-2</package> + <package>libevtlog-devel</package> + <package>libevtlog0</package> + <package>libexempi-devel</package> + <package>libexempi3</package> + <package>libexif-devel</package> + <package>libexiv2-4</package> + <package>libexiv2-devel</package> + <package>libexpat-devel</package> + <package>libext2fs-devel</package> + <package>libfarsight-0_1-3</package> + <package>libffi-devel</package> + <package>libffi43</package> + <package>libffi43-devel</package> + <package>libflaim-devel</package> + <package>libfprint-devel</package> + <package>libfreebl3</package> + <package>libfreebob</package> + <package>libfreebob-devel</package> + <package>libgadu</package> + <package>libgadu-devel</package> + <package>libgail-gnome</package> + <package>libgail-gnome-devel</package> + <package>libgcj-devel</package> + <package>libgcj43</package> + <package>libgcj43-devel</package> + <package>libgcj43-jar</package> + <package>libgcj_bc43</package> + <package>libgcrypt-devel</package> + <package>libgda-3_0-3</package> + <package>libgda-3_0-devel</package> + <package>libgdiplus0</package> + <package>libgegl-0_0-0</package> + <package>libgeoclue0</package> + <package>libgfortran46</package> + <package>libggz2</package> + <package>libggz2-devel</package> + <package>libgimpprint</package> + <package>libgimpprint-devel</package> + <package>libglade2</package> + <package>libglade2-devel</package> + <package>libglademm</package> + <package>libglademm-2_4-1</package> + <package>libglademm-devel</package> + <package>libgladeui-1-9</package> + <package>libgladeui-1_0-devel</package> + <package>libgmime-2_0-3</package> + <package>libgmime-2_4-2</package> + <package>libgmm++-devel</package> + <package>libgnome</package> + <package>libgnome-certauth0</package> + <package>libgnome-desktop-2-11</package> + <package>libgnome-devel</package> + <package>libgnome-lang</package> + <package>libgnome-menu2</package> + <package>libgnome-window-settings1</package> + <package>libgnomecanvas</package> + <package>libgnomecanvas-devel</package> + <package>libgnomecanvas-lang</package> + <package>libgnomecanvasmm</package> + <package>libgnomecanvasmm-devel</package> + <package>libgnomecups</package> + <package>libgnomecups-devel</package> + <package>libgnomecups-lang</package> + <package>libgnomedb</package> + <package>libgnomedb-devel</package> + <package>libgnomedb-lang</package> + <package>libgnomekbd</package> + <package>libgnomekbd-devel</package> + <package>libgnomekbd-lang</package> + <package>libgnomeprint</package> + <package>libgnomeprint-devel</package> + <package>libgnomeprint-lang</package> + <package>libgnomeprintui</package> + <package>libgnomeprintui-devel</package> + <package>libgnomeprintui-lang</package> + <package>libgnomesu</package> + <package>libgnomesu-devel</package> + <package>libgnomesu-lang</package> + <package>libgnomesu0</package> + <package>libgnomeui</package> + <package>libgnomeui-devel</package> + <package>libgnomeui-lang</package> + <package>libgnomevfsmm-2_6-1</package> + <package>libgnutls-devel</package> + <package>libgnutls-extra-devel</package> + <package>libgnutls-extra26</package> + <package>libgoocanvas3</package> + <package>libgpg-error-devel</package> + <package>libgpgme-devel</package> + <package>libgphoto2-devel</package> + <package>libgpod-devel</package> + <package>libgsf</package> + <package>libgsf-1-114</package> + <package>libgsf-devel</package> + <package>libgsf-gnome</package> + <package>libgsm-devel</package> + <package>libgsm1</package> + <package>libgssglue-devel</package> + <package>libgstapp-0_10-0</package> + <package>libgstinterfaces-0_10-0</package> + <package>libgstreamer-0_10-0</package> + <package>libgtk-vnc-1_0-0</package> + <package>libgtkhtml</package> + <package>libgtkhtml-devel</package> + <package>libgtksourceview-2_0-0</package> + <package>libgtop</package> + <package>libgtop-2_0-7</package> + <package>libgtop-devel</package> + <package>libgtop-lang</package> + <package>libgudev-1_0-0</package> + <package>libgweather</package> + <package>libgweather-devel</package> + <package>libgweather-lang</package> + <package>libgweather1</package> + <package>libhangul</package> + <package>libhangul-devel</package> + <package>libhowl0</package> + <package>libical-devel</package> + <package>libical0</package> + <package>libicu-devel</package> + <package>libid3tag</package> + <package>libid3tag-devel</package> + <package>libidl-devel</package> + <package>libidn-devel</package> + <package>libiec61883</package> + <package>libiec61883-devel</package> + <package>libieee1284</package> + <package>libiniparser-devel</package> + <package>libiniparser0</package> + <package>libiptcdata</package> + <package>libiptcdata-devel</package> + <package>libiptcdata0</package> + <package>libiso9660-5</package> + <package>libiterm</package> + <package>libiterm-devel</package> + <package>libjack-devel</package> + <package>libjack0</package> + <package>libjasper</package> + <package>libjasper-devel</package> + <package>libjingle-0_3-0</package> + <package>libjingle-devel</package> + <package>libjpeg-devel</package> + <package>libkcal</package> + <package>libkcal-devel</package> + <package>libkcal2</package> + <package>libkcddb4</package> + <package>libkcddb4-devel</package> + <package>libkcompactdisc4</package> + <package>libkcompactdisc4-devel</package> + <package>libkdcraw3</package> + <package>libkdcraw3-devel</package> + <package>libkdcraw3-lang</package> + <package>libkde4</package> + <package>libkde4-devel</package> + <package>libkdecore4</package> + <package>libkdecore4-devel</package> + <package>libkdepim4</package> + <package>libkdepim4-devel</package> + <package>libkdepimlibs4</package> + <package>libkdepimlibs4-devel</package> + <package>libkexiv2-3</package> + <package>libkexiv2-3-devel</package> + <package>libkexiv2-7</package> + <package>libkipi-devel</package> + <package>libkipi6</package> + <package>libkmime-devel</package> + <package>libkmime2</package> + <package>libknotificationitem-1-1</package> + <package>libkonq-devel</package> + <package>libkonq5</package> + <package>libksba-devel</package> + <package>libktnef-devel</package> + <package>libktnef1</package> + <package>liblazy-devel</package> + <package>liblazy1</package> + <package>liblcms-devel</package> + <package>libldapcpp-devel</package> + <package>liblog4c-devel</package> + <package>liblog4c3</package> + <package>libloudmouth-1-0</package> + <package>liblpsolve55</package> + <package>liblua5_1</package> + <package>libmalaga-devel</package> + <package>libmalaga7</package> + <package>libmcrypt</package> + <package>libmcrypt-devel</package> + <package>libmikmod</package> + <package>libmikmod-devel</package> + <package>libmm-devel</package> + <package>libmm14</package> + <package>libmng-devel</package> + <package>libmpcdec-devel</package> + <package>libmpcdec5</package> + <package>libmspack-devel</package> + <package>libmtp-devel</package> + <package>libmtp8</package> + <package>libmusicbrainz-devel</package> + <package>libmusicbrainz3-6</package> + <package>libmusicbrainz3-devel</package> + <package>libmusicbrainz4</package> + <package>libmysqlclient-devel</package> + <package>libmysqlclient15</package> + <package>libmysqlclient_r15</package> + <package>libneon-devel</package> + <package>libneon27</package> + <package>libnetapi-devel</package> + <package>libnetapi0</package> + <package>libnetcontrol0</package> + <package>libnetpbm-devel</package> + <package>libnetpbm10</package> + <package>libnewt0_52</package> + <package>libnjb</package> + <package>libnjb-devel</package> + <package>libnjb5</package> + <package>libnl-devel</package> + <package>libnotify</package> + <package>libnotify-devel</package> + <package>libnotify1</package> + <package>libnscd-devel</package> + <package>libnsssharedhelper0</package> + <package>libnuma-devel</package> + <package>libofa-devel</package> + <package>libofa0</package> + <package>libogg-devel</package> + <package>libogg0</package> + <package>liboil</package> + <package>liboil-devel</package> + <package>libopenbabel-devel</package> + <package>libopenbabel3</package> + <package>libopencdk-devel</package> + <package>libopencdk10</package> + <package>libopenraw-devel</package> + <package>libopenraw1</package> + <package>libopenssl-devel</package> + <package>libopensync</package> + <package>libopensync-devel</package> + <package>libopensync-plugin-evolution2</package> + <package>libopensync-plugin-evolution2-devel</package> + <package>libopensync-plugin-palm</package> + <package>libopensync-plugin-palm-devel</package> + <package>liborc-0_4-0</package> + <package>libosip2</package> + <package>libosip2-devel</package> + <package>libotf</package> + <package>libotf-devel</package> + <package>libotr-devel</package> + <package>libotr2</package> + <package>libp11-1</package> + <package>libp11-devel</package> + <package>libpackagekit-glib10</package> + <package>libpackagekit-glib10-devel</package> + <package>libpangomm-1_4-1</package> + <package>libpcap-devel</package> + <package>libpciaccess0</package> + <package>libpciaccess0-devel</package> + <package>libphonon4</package> + <package>libpisock-devel</package> + <package>libpisock9</package> + <package>libpisync-devel</package> + <package>libpisync1</package> + <package>libpixman-1-0-devel</package> + <package>libpkcs11-helper1</package> + <package>libpng-devel</package> + <package>libpolkit-qt0</package> + <package>libpoppler-devel</package> + <package>libpoppler-glib-devel</package> + <package>libpoppler-glib4</package> + <package>libpoppler-qt2</package> + <package>libpoppler-qt3-devel</package> + <package>libpoppler-qt4-3</package> + <package>libpoppler-qt4-devel</package> + <package>libpoppler5</package> + <package>libpst4</package> + <package>libpt2</package> + <package>libpt2-devel</package> + <package>libpulse-browse0</package> + <package>libpulse-devel</package> + <package>libpulse-mainloop-glib0</package> + <package>libpulse0</package> + <package>libpurple</package> + <package>libpurple-devel</package> + <package>libpurple-lang</package> + <package>libqca2</package> + <package>libqca2-devel</package> + <package>libqdialogsolver1</package> + <package>libqdialogsolver1-devel</package> + <package>libqimageblitz-devel</package> + <package>libqimageblitz4</package> + <package>libqscintilla-devel</package> + <package>libqscintilla2-5</package> + <package>libqt4</package> + <package>libqt4-devel</package> + <package>libqt4-qt3support</package> + <package>libqt4-sql</package> + <package>libqt4-sql-mysql</package> + <package>libqt4-sql-postgresql</package> + <package>libqt4-sql-sqlite</package> + <package>libqt4-sql-unixODBC</package> + <package>libqt4-x11</package> + <package>libqtpod-devel</package> + <package>libqtpod0</package> + <package>libquadmath46</package> + <package>libquicktime</package> + <package>libquicktime-devel</package> + <package>libraptor-devel</package> + <package>libraptor1</package> + <package>librasqal-devel</package> + <package>librasqal1</package> + <package>libraw1394-11</package> + <package>libraw1394-8</package> + <package>libraw1394-devel</package> + <package>libredland-devel</package> + <package>libredland0</package> + <package>libreiserfs-devel</package> + <package>libreoffice</package> + <package>libreoffice-base</package> + <package>libreoffice-branding-SLED</package> + <package>libreoffice-branding-upstream</package> + <package>libreoffice-calc</package> + <package>libreoffice-icon-themes</package> + <package>libreoffice-impress</package> + <package>libreoffice-sdk</package> + <package>libreoffice-writer</package> + <package>librsvg</package> + <package>librsvg-devel</package> + <package>libsamplerate</package> + <package>libsamplerate-devel</package> + <package>libsatsolver-devel</package> + <package>libsblim-cmpiutil1</package> + <package>libselinux-devel</package> + <package>libsemanage-devel</package> + <package>libsemanage1</package> + <package>libsensors3-devel</package> + <package>libsensors4</package> + <package>libsepol-devel</package> + <package>libsexy</package> + <package>libsexy-devel</package> + <package>libshout-devel</package> + <package>libshout3</package> + <package>libsidplay1</package> + <package>libsidplay1-devel</package> + <package>libsigc++2</package> + <package>libsigc++2-devel</package> + <package>libslab-lang</package> + <package>libslab0</package> + <package>libsmbclient-devel</package> + <package>libsmbios-devel</package> + <package>libsmbsharemodes-devel</package> + <package>libsmbsharemodes0</package> + <package>libsndfile</package> + <package>libsndfile-devel</package> + <package>libsoprano-devel</package> + <package>libsoprano4</package> + <package>libsoup-devel</package> + <package>libspectre-devel</package> + <package>libspectre1</package> + <package>libspeex</package> + <package>libssh2-devel</package> + <package>libstrigi0</package> + <package>libstroke</package> + <package>libstroke-devel</package> + <package>libsyncml-devel</package> + <package>libsyncml0</package> + <package>libtalloc-devel</package> + <package>libtasn1-devel</package> + <package>libtdb-devel</package> + <package>libtelepathy</package> + <package>libtelepathy-devel</package> + <package>libtelepathy-glib0</package> + <package>libtheora-devel</package> + <package>libtheora0</package> + <package>libtidy</package> + <package>libtidy-devel</package> + <package>libtiff-devel</package> + <package>libtirpc-devel</package> + <package>libtomoe-gtk0</package> + <package>libtspi1</package> + <package>libtunepimp</package> + <package>libtunepimp-devel</package> + <package>libtunepimp5</package> + <package>libudev-devel</package> + <package>libudf0</package> + <package>libunique-1_0-0</package> + <package>libunwind</package> + <package>libunwind-devel</package> + <package>libupsclient1</package> + <package>libusb-devel</package> + <package>libusbpp-0_1-4</package> + <package>libustr-1_0-1</package> + <package>libustr-devel</package> + <package>libuuid-devel</package> + <package>libvirt-client</package> + <package>libvirt-devel</package> + <package>libvisual</package> + <package>libvisual-devel</package> + <package>libvoikko-devel</package> + <package>libvoikko1</package> + <package>libvorbis</package> + <package>libvorbis-devel</package> + <package>libwavpack1</package> + <package>libwbclient-devel</package> + <package>libwbxml2-0</package> + <package>libwbxml2-devel</package> + <package>libwebkit-1_0-1</package> + <package>libwebkit-1_0-2</package> + <package>libwebkit-devel</package> + <package>libwebkit-lang</package> + <package>libwmf</package> + <package>libwmf-devel</package> + <package>libwmf-gnome</package> + <package>libwnck</package> + <package>libwnck-1-22</package> + <package>libwnck-devel</package> + <package>libwnck-lang</package> + <package>libwpd-0_8-8</package> + <package>libwpd-devel</package> + <package>libwpg-0_1-1</package> + <package>libwpg-devel</package> + <package>libwps-0_1-1</package> + <package>libwps-devel</package> + <package>libwsman-devel</package> + <package>libwsman1</package> + <package>libxcrypt-devel</package> + <package>libxine-devel</package> + <package>libxine1</package> + <package>libxklavier-devel</package> + <package>libxklavier15</package> + <package>libxml2-devel</package> + <package>libxslt-devel</package> + <package>libyajl1</package> + <package>libzio-devel</package> + <package>libzip-devel</package> + <package>libzip1</package> + <package>libzvbi0</package> + <package>libzypp-devel</package> + <package>limal-apparmor-notifications</package> + <package>limal-apparmor-notifications-devel</package> + <package>limal-ca-mgm-devel</package> + <package>limal-devel</package> + <package>limal-devtools</package> + <package>limal-nfs-server-devel</package> + <package>linux-atm-devel</package> + <package>linux-atm-lib</package> + <package>lksctp-tools</package> + <package>lksctp-tools-devel</package> + <package>loudmouth-devel</package> + <package>lua</package> + <package>lua-devel</package> + <package>lzo-devel</package> + <package>m17n-db</package> + <package>m17n-lib</package> + <package>m17n-lib-devel</package> + <package>malaga-suomi</package> + <package>meanwhile</package> + <package>meanwhile-devel</package> + <package>metacity</package> + <package>metacity-devel</package> + <package>metacity-lang</package> + <package>mhash</package> + <package>mhash-devel</package> + <package>misc-console-font</package> + <package>mono-addins</package> + <package>mono-basic</package> + <package>mono-core</package> + <package>mono-data</package> + <package>mono-data-oracle</package> + <package>mono-data-sqlite</package> + <package>mono-devel</package> + <package>mono-extras</package> + <package>mono-jscript</package> + <package>mono-tools</package> + <package>mono-wcf</package> + <package>mono-web</package> + <package>mono-winforms</package> + <package>mono-zeroconf</package> + <package>mono-zeroconf-provider-avahi</package> + <package>monodevelop</package> + <package>monodoc-core</package> + <package>mozilla-nspr</package> + <package>mozilla-nspr-devel</package> + <package>mozilla-nss</package> + <package>mozilla-nss-devel</package> + <package>mozilla-xulrunner192</package> + <package>mozilla-xulrunner192-gnome</package> + <package>mpfr-devel</package> + <package>mpi-selector</package> + <package>mpich</package> + <package>mpich-devel</package> + <package>mysql</package> + <package>mysql-client</package> + <package>nagios</package> + <package>nagios-devel</package> + <package>nagios-www</package> + <package>nant</package> + <package>nautilus</package> + <package>nautilus-cd-burner</package> + <package>nautilus-cd-burner-devel</package> + <package>nautilus-cd-burner-lang</package> + <package>nautilus-devel</package> + <package>nautilus-lang</package> + <package>ndesk-dbus</package> + <package>ndesk-dbus-glib</package> + <package>ndesk-dbus-glib-devel</package> + <package>net-snmp</package> + <package>net-snmp-devel</package> + <package>netatalk</package> + <package>netatalk-devel</package> + <package>netcat-openbsd</package> + <package>newt</package> + <package>newt-devel</package> + <package>newt-static</package> + <package>nfsidmap-devel</package> + <package>notification-daemon</package> + <package>notification-daemon-lang</package> + <package>notify-sharp</package> + <package>nss-mdns</package> + <package>nss-shared-helper-devel</package> + <package>nut</package> + <package>nut-classic</package> + <package>nut-devel</package> + <package>opal</package> + <package>opal-devel</package> + <package>openCryptoki</package> + <package>openCryptoki-64bit</package> + <package>openCryptoki-devel</package> + <package>openct-devel</package> + <package>openhpi</package> + <package>openhpi-daemon</package> + <package>openhpi-devel</package> + <package>openjade</package> + <package>openjade-devel</package> + <package>openldap2-devel</package> + <package>openmotif-devel</package> + <package>openmotif-libs</package> + <package>openmpi</package> + <package>openobex-devel</package> + <package>openobex-glib-devel</package> + <package>opensc-devel</package> + <package>openslp-devel</package> + <package>opensp</package> + <package>opensp-devel</package> + <package>openwsman-client</package> + <package>openwsman-server</package> + <package>orbit</package> + <package>orbit-devel</package> + <package>orbit2-devel</package> + <package>oxygen-icon-theme</package> + <package>oxygen-icon-theme-scalable</package> + <package>ozerocdoff</package> + <package>pam-devel</package> + <package>pango-devel</package> + <package>pangomm-devel</package> + <package>parted-devel</package> + <package>patchutils</package> + <package>pciutils-devel</package> + <package>pcre-devel</package> + <package>pcsc-acr38</package> + <package>pcsc-acr38-devel</package> + <package>pcsc-lite-devel</package> + <package>perl-32bit</package> + <package>perl-Crypt-OpenSSL-RSA</package> + <package>perl-Mail-DKIM</package> + <package>perl-MailTools</package> + <package>perl-Net-DNS</package> + <package>perl-Net-IP</package> + <package>perl-NetAddr-IP</package> + <package>perl-SNMP</package> + <package>perl-Tie-IxHash</package> + <package>perl-Tk</package> + <package>perl-Tk-devel</package> + <package>perl-spamassassin</package> + <package>phonon</package> + <package>phonon-backend-gstreamer-0_10</package> + <package>phonon-devel</package> + <package>php5</package> + <package>php5-ctype</package> + <package>php5-devel</package> + <package>php5-dom</package> + <package>php5-hash</package> + <package>php5-iconv</package> + <package>php5-json</package> + <package>php5-pdo</package> + <package>php5-sqlite</package> + <package>php5-suhosin</package> + <package>php5-tokenizer</package> + <package>php5-xmlreader</package> + <package>php5-xmlwriter</package> + <package>php53</package> + <package>php53-ctype</package> + <package>php53-dom</package> + <package>php53-iconv</package> + <package>php53-json</package> + <package>php53-tokenizer</package> + <package>php53-xmlreader</package> + <package>php53-xmlwriter</package> + <package>pidgin</package> + <package>pidgin-devel</package> + <package>pilot-link</package> + <package>pkcs11-helper</package> + <package>pkcs11-helper-devel</package> + <package>planner</package> + <package>planner-devel</package> + <package>planner-lang</package> + <package>plasma-addons</package> + <package>plasma-theme-aya</package> + <package>plasmoid-networkmanagement</package> + <package>plasmoid-quickaccess</package> + <package>plotutils</package> + <package>poppler-data</package> + <package>poppler-tools</package> + <package>popt-devel</package> + <package>portmap</package> + <package>postfix-devel</package> + <package>postgresql-devel</package> + <package>postgresql-libs</package> + <package>ppp-devel</package> + <package>ppp-userpass</package> + <package>pstoedit</package> + <package>pstoedit-devel</package> + <package>pulseaudio</package> + <package>pulseaudio-esound-compat</package> + <package>pulseaudio-lang</package> + <package>puppet</package> + <package>python-cairo</package> + <package>python-cairo-devel</package> + <package>python-devel</package> + <package>python-gnome</package> + <package>python-gnome-devel</package> + <package>python-gobject2</package> + <package>python-gobject2-devel</package> + <package>python-gtk</package> + <package>python-gtk-devel</package> + <package>python-gtkglext</package> + <package>python-gtkglext-devel</package> + <package>python-gtksourceview</package> + <package>python-gtksourceview-devel</package> + <package>python-numeric</package> + <package>python-numpy</package> + <package>python-orbit</package> + <package>python-orbit-devel</package> + <package>pyxml</package> + <package>qt3</package> + <package>qt3-devel</package> + <package>quagga</package> + <package>quagga-devel</package> + <package>quilt</package> + <package>raptor</package> + <package>rarian</package> + <package>rarian-devel</package> + <package>re2c</package> + <package>readline-devel</package> + <package>recode-devel</package> + <package>rpm-devel</package> + <package>rrdtool</package> + <package>rrdtool-devel</package> + <package>rsyslog</package> + <package>ruby</package> + <package>rubygems</package> + <package>ruby-devel</package> + <package>ruby-doc-html</package> + <package>ruby-doc-ri</package> + <package>ruby-examples</package> + <package>ruby-fcgi</package> + <package>ruby-mysql</package> + <package>ruby-selinux</package> + <package>ruby-test-suite</package> + <package>ruby-tk</package> + <package>sablot</package> + <package>sablot-devel</package> + <package>samba-devel</package> + <package>sane-backends</package> + <package>sane-frontends</package> + <package>sax2-libsax</package> + <package>sax2-libsax-devel</package> + <package>sax2-libsax-perl</package> + <package>sax2-tools</package> + <package>sblim-cmpi-base</package> + <package>sblim-cmpi-base-devel</package> + <package>sblim-cmpi-devel</package> + <package>sblim-cmpiutil-devel</package> + <package>sblim-indication_helper</package> + <package>sblim-sfcb</package> + <package>sblim-sfcc</package> + <package>sblim-sfcc-devel</package> + <package>scim</package> + <package>scim-devel</package> + <package>scpm-devel</package> + <package>scrollkeeper</package> + <package>scrollkeeper-lang</package> + <package>seahorse</package> + <package>seahorse-devel</package> + <package>seahorse-lang</package> + <package>sendmail</package> + <package>sendmail-devel</package> + <package>sg3_utils-devel</package> + <package>sgml-skel</package> + <package>shared-mime-info</package> + <package>silc-toolkit</package> + <package>silc-toolkit-devel</package> + <package>slang</package> + <package>slang-devel</package> + <package>soprano</package> + <package>soprano-backend-redland</package> + <package>spamassassin</package> + <package>speex-devel</package> + <package>splashy-devel</package> + <package>sqlite2</package> + <package>sqlite3-devel</package> + <package>startup-notification</package> + <package>startup-notification-devel</package> + <package>strigi</package> + <package>strigi-devel</package> + <package>subversion</package> + <package>subversion-perl</package> + <package>susehelp</package> + <package>susehelp_cz</package> + <package>susehelp_de</package> + <package>susehelp_en</package> + <package>susehelp_es</package> + <package>susehelp_fr</package> + <package>susehelp_hu</package> + <package>susehelp_it</package> + <package>swig</package> + <package>syslogd</package> + <package>t1lib</package> + <package>t1lib-devel</package> + <package>taglib</package> + <package>taglib-devel</package> + <package>taglib-sharp</package> + <package>tango-icon-theme</package> + <package>tcl-devel</package> + <package>tcpd-devel</package> + <package>telepathy-glib-devel</package> + <package>telepathy-mission-control</package> + <package>telepathy-mission-control-devel</package> + <package>texlive-bin-devel</package> + <package>texlive-devel</package> + <package>tk-devel</package> + <package>tla</package> + <package>tn5250</package> + <package>tn5250-devel</package> + <package>tomoe</package> + <package>tomoe-devel</package> + <package>tomoe-gtk</package> + <package>tomoe-gtk-devel</package> + <package>tomoe-gtk-lang</package> + <package>totem-pl-parser</package> + <package>totem-pl-parser-devel</package> + <package>totem-pl-parser-lang</package> + <package>trousers</package> + <package>trousers-devel</package> + <package>tsclient</package> + <package>tsclient-devel</package> + <package>tsclient-lang</package> + <package>uim</package> + <package>uim-devel</package> + <package>unixODBC</package> + <package>unixODBC-devel</package> + <package>unsermake</package> + <package>update-desktop-files</package> + <package>usb_modeswitch</package> + <package>usb_modeswitch-data</package> + <package>valgrind</package> + <package>valgrind-devel</package> + <package>vte</package> + <package>vte-devel</package> + <package>vte-lang</package> + <package>wdiff</package> + <package>webkit-sharp</package> + <package>wireshark</package> + <package>wireshark-devel</package> + <package>wodim-devel</package> + <package>wordcut</package> + <package>wordcut-devel</package> + <package>words</package> + <package>wpa_supplicant</package> + <package>wvstreams</package> + <package>wvstreams-devel</package> + <package>wxGTK-compat</package> + <package>wxGTK-devel</package> + <package>wxGTK-gl</package> + <package>x11-input-wacom</package> + <package>x11-input-wacom-devel</package> + <package>x11-input-wacom-tools</package> + <package>xalan-j2</package> + <package>xaw3d-devel</package> + <package>xbase</package> + <package>xbase-devel</package> + <package>xdelta</package> + <package>xdelta-devel</package> + <package>xdg-menu</package> + <package>xen-devel</package> + <package>xen-libs</package> + <package>xerces-j2</package> + <package>xerces-j2-bootstrap</package> + <package>xerces-j2-xml-apis</package> + <package>xfsprogs-devel</package> + <package>xml-commons-apis-bootstrap</package> + <package>xml-commons-resolver-bootstrap</package> + <package>xml-commons-which-bootstrap</package> + <package>xmlcharent</package> + <package>xorg-x11</package> + <package>xorg-x11-devel</package> + <package>xorg-x11-fonts</package> + <package>xorg-x11-fonts-core</package> + <package>xorg-x11-fonts-devel</package> + <package>xorg-x11-libICE-devel</package> + <package>xorg-x11-libSM-devel</package> + <package>xorg-x11-libX11-devel</package> + <package>xorg-x11-libXau-devel</package> + <package>xorg-x11-libXdmcp-devel</package> + <package>xorg-x11-libXext-devel</package> + <package>xorg-x11-libXfixes-devel</package> + <package>xorg-x11-libXmu-devel</package> + <package>xorg-x11-libXp-devel</package> + <package>xorg-x11-libXpm-devel</package> + <package>xorg-x11-libXprintUtil-devel</package> + <package>xorg-x11-libXrender-devel</package> + <package>xorg-x11-libXt-devel</package> + <package>xorg-x11-libXv-devel</package> + <package>xorg-x11-libfontenc-devel</package> + <package>xorg-x11-libxcb-devel</package> + <package>xorg-x11-libxkbfile-devel</package> + <package>xorg-x11-proto-devel</package> + <package>xorg-x11-server</package> + <package>xorg-x11-util-devel</package> + <package>xorg-x11-xauth</package> + <package>xorg-x11-xtrans-devel</package> + <package>xosd</package> + <package>xosd-devel</package> + <package>xsp</package> + <package>xterm</package> + <package>xz-devel</package> + <package>yast2-core-devel</package> + <package>yast2-devtools</package> + <package>yast2-gtk</package> + <package>yast2-libyui-devel</package> + <package>yast2-ncurses-devel</package> + <package>yast2-qt</package> + <package>yast2-qt-devel</package> + <package>yast2-qt-pkg</package> + <package>yast2-storage-devel</package> + <package>yast2-ycp-ui-bindings-devel</package> + <package>yelp</package> + <package>yelp-lang</package> + <package>zenity</package> + <package>zenity-lang</package> + <package>zlib-devel</package> + <package>zsh</package> + <package>zvbi-devel</package> + </remove-packages> + + </software> + <user_defaults> + <expire></expire> + <group>100</group> + <groups>video,dialout</groups> + <home>/home</home> + <inactive>-1</inactive> + <shell>/bin/bash</shell> + <skel>/etc/skel</skel> + <umask>022</umask> + </user_defaults> + <users config:type="list"> + <user> + <encrypted config:type="boolean">true</encrypted> + <fullname>vagrant</fullname> + <gid>100</gid> + <home>/home/vagrant</home> + <password_settings> + <expire></expire> + <flag></flag> + <inact></inact> + <max>99999</max> + <min>0</min> + <warn>7</warn> + </password_settings> + <shell>/bin/bash</shell> + <uid>1000</uid> + <user_password>$2y$05$NA1Li9ZKJOLRW5mMTXm6/e5r8dltWS5RpDZpvHrI82aLE00V51tdi</user_password> + <username>vagrant</username> + </user> + <user> + <encrypted config:type="boolean">true</encrypted> + <fullname>Games account</fullname> + <gid>100</gid> + <home>/var/games</home> + <password_settings> + <expire></expire> + <flag></flag> + <inact></inact> + <max></max> + <min></min> + <warn></warn> + </password_settings> + <shell>/bin/bash</shell> + <uid>12</uid> + <user_password>*</user_password> + <username>games</username> + </user> + <user> + <encrypted config:type="boolean">true</encrypted> + <fullname>bin</fullname> + <gid>1</gid> + <home>/bin</home> + <password_settings> + <expire></expire> + <flag></flag> + <inact></inact> + <max></max> + <min></min> + <warn></warn> + </password_settings> + <shell>/bin/bash</shell> + <uid>1</uid> + <user_password>*</user_password> + <username>bin</username> + </user> + <user> + <encrypted config:type="boolean">true</encrypted> + <fullname>nobody</fullname> + <gid>65533</gid> + <home>/var/lib/nobody</home> + <password_settings> + <expire></expire> + <flag></flag> + <inact></inact> + <max></max> + <min></min> + <warn></warn> + </password_settings> + <shell>/bin/bash</shell> + <uid>65534</uid> + <user_password>*</user_password> + <username>nobody</username> + </user> + <user> + <encrypted config:type="boolean">true</encrypted> + <fullname>Printing daemon</fullname> + <gid>7</gid> + <home>/var/spool/lpd</home> + <password_settings> + <expire></expire> + <flag></flag> + <inact></inact> + <max></max> + <min></min> + <warn></warn> + </password_settings> + <shell>/bin/bash</shell> + <uid>4</uid> + <user_password>*</user_password> + <username>lp</username> + </user> + <user> + <encrypted config:type="boolean">true</encrypted> + <fullname>User for uuidd</fullname> + <gid>104</gid> + <home>/var/run/uuidd</home> + <password_settings> + <expire></expire> + <flag></flag> + <inact></inact> + <max>99999</max> + <min>0</min> + <warn>7</warn> + </password_settings> + <shell>/bin/false</shell> + <uid>102</uid> + <user_password>*</user_password> + <username>uuidd</username> + </user> + <user> + <encrypted config:type="boolean">true</encrypted> + <fullname>Postfix Daemon</fullname> + <gid>51</gid> + <home>/var/spool/postfix</home> + <password_settings> + <expire></expire> + <flag></flag> + <inact></inact> + <max>99999</max> + <min>0</min> + <warn>7</warn> + </password_settings> + <shell>/bin/false</shell> + <uid>51</uid> + <user_password>*</user_password> + <username>postfix</username> + </user> + <user> + <encrypted config:type="boolean">true</encrypted> + <fullname>Novell Customer Center User</fullname> + <gid>111</gid> + <home>/var/lib/YaST2/suse-ncc-fakehome</home> + <password_settings> + <expire></expire> + <flag></flag> + <inact></inact> + <max>99999</max> + <min>0</min> + <warn>7</warn> + </password_settings> + <shell>/bin/bash</shell> + <uid>106</uid> + <user_password>*</user_password> + <username>suse-ncc</username> + </user> + <user> + <encrypted config:type="boolean">true</encrypted> + <fullname>FTP account</fullname> + <gid>49</gid> + <home>/srv/ftp</home> + <password_settings> + <expire></expire> + <flag></flag> + <inact></inact> + <max></max> + <min></min> + <warn></warn> + </password_settings> + <shell>/bin/bash</shell> + <uid>40</uid> + <user_password>*</user_password> + <username>ftp</username> + </user> + <user> + <encrypted config:type="boolean">true</encrypted> + <fullname>Gnome Display Manager daemon</fullname> + <gid>112</gid> + <home>/var/lib/gdm</home> + <password_settings> + <expire></expire> + <flag></flag> + <inact></inact> + <max>99999</max> + <min>0</min> + <warn>7</warn> + </password_settings> + <shell>/bin/false</shell> + <uid>107</uid> + <user_password>*</user_password> + <username>gdm</username> + </user> + <user> + <encrypted config:type="boolean">true</encrypted> + <fullname>Batch jobs daemon</fullname> + <gid>25</gid> + <home>/var/spool/atjobs</home> + <password_settings> + <expire></expire> + <flag></flag> + <inact></inact> + <max>99999</max> + <min>0</min> + <warn>7</warn> + </password_settings> + <shell>/bin/bash</shell> + <uid>25</uid> + <user_password>*</user_password> + <username>at</username> + </user> + <user> + <encrypted config:type="boolean">true</encrypted> + <fullname>root</fullname> + <gid>0</gid> + <home>/root</home> + <password_settings> + <expire></expire> + <flag></flag> + <inact></inact> + <max></max> + <min></min> + <warn></warn> + </password_settings> + <shell>/bin/bash</shell> + <uid>0</uid> + <user_password>$2y$05$NA1Li9ZKJOLRW5mMTXm6/e5r8dltWS5RpDZpvHrI82aLE00V51tdi</user_password> + <username>root</username> + </user> + <user> + <encrypted config:type="boolean">true</encrypted> + <fullname>Mailer daemon</fullname> + <gid>12</gid> + <home>/var/spool/clientmqueue</home> + <password_settings> + <expire></expire> + <flag></flag> + <inact></inact> + <max></max> + <min></min> + <warn></warn> + </password_settings> + <shell>/bin/false</shell> + <uid>8</uid> + <user_password>*</user_password> + <username>mail</username> + </user> + <user> + <encrypted config:type="boolean">true</encrypted> + <fullname>Daemon</fullname> + <gid>2</gid> + <home>/sbin</home> + <password_settings> + <expire></expire> + <flag></flag> + <inact></inact> + <max></max> + <min></min> + <warn></warn> + </password_settings> + <shell>/bin/bash</shell> + <uid>2</uid> + <user_password>*</user_password> + <username>daemon</username> + </user> + <user> + <encrypted config:type="boolean">true</encrypted> + <fullname>NTP daemon</fullname> + <gid>108</gid> + <home>/var/lib/ntp</home> + <password_settings> + <expire></expire> + <flag></flag> + <inact></inact> + <max>99999</max> + <min>0</min> + <warn>7</warn> + </password_settings> + <shell>/bin/false</shell> + <uid>74</uid> + <user_password>*</user_password> + <username>ntp</username> + </user> + <user> + <encrypted config:type="boolean">true</encrypted> + <fullname>Unix-to-Unix CoPy system</fullname> + <gid>14</gid> + <home>/etc/uucp</home> + <password_settings> + <expire></expire> + <flag></flag> + <inact></inact> + <max></max> + <min></min> + <warn></warn> + </password_settings> + <shell>/bin/bash</shell> + <uid>10</uid> + <user_password>*</user_password> + <username>uucp</username> + </user> + <user> + <encrypted config:type="boolean">true</encrypted> + <fullname>User for D-Bus</fullname> + <gid>101</gid> + <home>/var/run/dbus</home> + <password_settings> + <expire></expire> + <flag></flag> + <inact></inact> + <max></max> + <min>0</min> + <warn>7</warn> + </password_settings> + <shell>/bin/false</shell> + <uid>100</uid> + <user_password>*</user_password> + <username>messagebus</username> + </user> + <user> + <encrypted config:type="boolean">true</encrypted> + <fullname>User for haldaemon</fullname> + <gid>102</gid> + <home>/var/run/hald</home> + <password_settings> + <expire></expire> + <flag></flag> + <inact></inact> + <max></max> + <min>0</min> + <warn>7</warn> + </password_settings> + <shell>/bin/false</shell> + <uid>101</uid> + <user_password>*</user_password> + <username>haldaemon</username> + </user> + <user> + <encrypted config:type="boolean">true</encrypted> + <fullname>WWW daemon apache</fullname> + <gid>8</gid> + <home>/var/lib/wwwrun</home> + <password_settings> + <expire></expire> + <flag></flag> + <inact></inact> + <max></max> + <min></min> + <warn></warn> + </password_settings> + <shell>/bin/false</shell> + <uid>30</uid> + <user_password>*</user_password> + <username>wwwrun</username> + </user> + <user> + <encrypted config:type="boolean">true</encrypted> + <fullname>Manual pages viewer</fullname> + <gid>62</gid> + <home>/var/cache/man</home> + <password_settings> + <expire></expire> + <flag></flag> + <inact></inact> + <max></max> + <min></min> + <warn></warn> + </password_settings> + <shell>/bin/bash</shell> + <uid>13</uid> + <user_password>*</user_password> + <username>man</username> + </user> + <user> + <encrypted config:type="boolean">true</encrypted> + <fullname>PolicyKit</fullname> + <gid>107</gid> + <home>/var/run/PolicyKit</home> + <password_settings> + <expire></expire> + <flag></flag> + <inact></inact> + <max>99999</max> + <min>0</min> + <warn>7</warn> + </password_settings> + <shell>/bin/false</shell> + <uid>104</uid> + <user_password>*</user_password> + <username>polkituser</username> + </user> + <user> + <encrypted config:type="boolean">true</encrypted> + <fullname>News system</fullname> + <gid>13</gid> + <home>/etc/news</home> + <password_settings> + <expire></expire> + <flag></flag> + <inact></inact> + <max></max> + <min></min> + <warn></warn> + </password_settings> + <shell>/bin/bash</shell> + <uid>9</uid> + <user_password>*</user_password> + <username>news</username> + </user> + <user> + <fullname>SSH daemon</fullname> + <gid>65</gid> + <home>/var/lib/sshd</home> + <shell>/bin/false</shell> + <uid>71</uid> + <username>sshd</username> + </user> + <user> + <encrypted config:type="boolean">true</encrypted> + <fullname>PulseAudio daemon</fullname> + <gid>109</gid> + <home>/var/lib/pulseaudio</home> + <password_settings> + <expire></expire> + <flag></flag> + <inact></inact> + <max>99999</max> + <min>0</min> + <warn>7</warn> + </password_settings> + <shell>/bin/false</shell> + <uid>105</uid> + <user_password>*</user_password> + <username>pulse</username> + </user> + </users> +</profile> diff --git a/packer/http/sles-11/sles-11-sp2-x86_64-autoinst.xml b/packer/http/sles-11/sles-11-sp2-x86_64-autoinst.xml new file mode 100644 index 000000000..152f6d02c --- /dev/null +++ b/packer/http/sles-11/sles-11-sp2-x86_64-autoinst.xml @@ -0,0 +1,2562 @@ +<?xml version="1.0"?> +<!DOCTYPE profile> +<profile xmlns="http://www.suse.com/1.0/yast2ns" xmlns:config="http://www.suse.com/1.0/configns"> + <add-on> + <add_on_products config:type="list"> + <listentry> + <media_url><![CDATA[http://demeter.uni-regensburg.de/SLE11SP2-SDK-x64/DVD1/]]></media_url> + <product>sle-sdk</product> + <product_dir>/</product_dir> + </listentry> + </add_on_products> + </add-on> + <bootloader> + <device_map config:type="list"> + <device_map_entry> + <firmware>hd0</firmware> + <linux>/dev/sda</linux> + </device_map_entry> + </device_map> + <global> + <activate>true</activate> + <boot_root>true</boot_root> + <default>SUSE Linux Enterprise Server 11 SP2 - 3.0.13-0.27</default> + <generic_mbr>true</generic_mbr> + <gfxmenu>/boot/message</gfxmenu> + <lines_cache_id>2</lines_cache_id> + <timeout config:type="integer">8</timeout> + </global> + <initrd_modules config:type="list"> + <initrd_module> + <module>ahci</module> + </initrd_module> + <initrd_module> + <module>ata_piix</module> + </initrd_module> + <initrd_module> + <module>ata_generic</module> + </initrd_module> + <initrd_module> + <module>jbd</module> + </initrd_module> + <initrd_module> + <module>mbcache</module> + </initrd_module> + <initrd_module> + <module>ext3</module> + </initrd_module> + </initrd_modules> + <loader_type>grub</loader_type> + <sections config:type="list"> + <section> + <append>resume=/dev/sda1 splash=silent crashkernel=128M-:64M showopts</append> + <image>(hd0,1)/boot/vmlinuz-3.0.13-0.27-default</image> + <initial>1</initial> + <initrd>(hd0,1)/boot/initrd-3.0.13-0.27-default</initrd> + <lines_cache_id>0</lines_cache_id> + <name>SUSE Linux Enterprise Server 11 SP2 - 3.0.13-0.27</name> + <original_name>linux</original_name> + <root>/dev/sda2</root> + <type>image</type> + <vgamode>0x314</vgamode> + </section> + <section> + <append>showopts ide=nodma apm=off noresume edd=off powersaved=off nohz=off highres=off processor.max_cstate=1 nomodeset x11failsafe</append> + <image>(hd0,1)/boot/vmlinuz-3.0.13-0.27-default</image> + <initrd>(hd0,1)/boot/initrd-3.0.13-0.27-default</initrd> + <lines_cache_id>1</lines_cache_id> + <name>Failsafe -- SUSE Linux Enterprise Server 11 SP2 - 3.0.13-0.27</name> + <original_name>failsafe</original_name> + <root>/dev/sda2</root> + <type>image</type> + <vgamode>0x314</vgamode> + </section> + </sections> + </bootloader> + <ca_mgm> + <CAName>YaST_Default_CA</CAName> + <ca_commonName>YaST Default CA (vagrant-sles-11sp2-x64)</ca_commonName> + <country>US</country> + <locality></locality> + <organisation></organisation> + <organisationUnit></organisationUnit> + <password>ENTER PASSWORD HERE</password> + <server_commonName>vagrant-sles-11sp2-x64.vagrantup.com</server_commonName> + <server_email>postmaster@vagrantup.com</server_email> + <state></state> + <takeLocalServerName config:type="boolean">false</takeLocalServerName> + </ca_mgm> + <deploy_image> + <image_installation config:type="boolean">false</image_installation> + </deploy_image> + <general> + <ask-list config:type="list"/> + <mode> + <confirm config:type="boolean">false</confirm> + </mode> + <mouse> + <id>none</id> + </mouse> + <proposals config:type="list"/> + <signature-handling> + <accept_file_without_checksum config:type="boolean">true</accept_file_without_checksum> + <accept_non_trusted_gpg_key config:type="boolean">true</accept_non_trusted_gpg_key> + <accept_unknown_gpg_key config:type="boolean">true</accept_unknown_gpg_key> + <accept_unsigned_file config:type="boolean">true</accept_unsigned_file> + <accept_verification_failed config:type="boolean">false</accept_verification_failed> + <import_gpg_key config:type="boolean">true</import_gpg_key> + </signature-handling> + <storage/> + </general> + <groups config:type="list"> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>100</gid> + <group_password>x</group_password> + <groupname>users</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>19</gid> + <group_password>x</group_password> + <groupname>floppy</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>1</gid> + <group_password>x</group_password> + <groupname>bin</groupname> + <userlist>daemon</userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>41</gid> + <group_password>x</group_password> + <groupname>xok</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>65533</gid> + <group_password>x</group_password> + <groupname>nobody</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>43</gid> + <group_password>x</group_password> + <groupname>modem</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>5</gid> + <group_password>x</group_password> + <groupname>tty</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>7</gid> + <group_password>x</group_password> + <groupname>lp</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>104</gid> + <group_password>!</group_password> + <groupname>uuidd</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>51</gid> + <group_password>!</group_password> + <groupname>postfix</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>112</gid> + <group_password>!</group_password> + <groupname>gdm</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>65534</gid> + <group_password>x</group_password> + <groupname>nogroup</groupname> + <userlist>nobody</userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>101</gid> + <group_password>!</group_password> + <groupname>messagebus</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>59</gid> + <group_password>!</group_password> + <groupname>maildrop</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>33</gid> + <group_password>x</group_password> + <groupname>video</groupname> + <userlist>vagrant</userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>3</gid> + <group_password>x</group_password> + <groupname>sys</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>15</gid> + <group_password>x</group_password> + <groupname>shadow</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>20</gid> + <group_password>x</group_password> + <groupname>cdrom</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>21</gid> + <group_password>x</group_password> + <groupname>console</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>42</gid> + <group_password>x</group_password> + <groupname>trusted</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>102</gid> + <group_password>!</group_password> + <groupname>haldaemon</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>106</gid> + <group_password>!</group_password> + <groupname>puppet</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>16</gid> + <group_password>x</group_password> + <groupname>dialout</groupname> + <userlist>vagrant</userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>107</gid> + <group_password>!</group_password> + <groupname>polkituser</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>10</gid> + <group_password>x</group_password> + <groupname>wheel</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>109</gid> + <group_password>!</group_password> + <groupname>pulse</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>8</gid> + <group_password>x</group_password> + <groupname>www</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>40</gid> + <group_password>x</group_password> + <groupname>games</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>6</gid> + <group_password>x</group_password> + <groupname>disk</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>17</gid> + <group_password>x</group_password> + <groupname>audio</groupname> + <userlist>pulse</userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>111</gid> + <group_password>!</group_password> + <groupname>suse-ncc</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>49</gid> + <group_password>x</group_password> + <groupname>ftp</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>103</gid> + <group_password>!</group_password> + <groupname>tape</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>25</gid> + <group_password>!</group_password> + <groupname>at</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>9</gid> + <group_password>x</group_password> + <groupname>kmem</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>32</gid> + <group_password>x</group_password> + <groupname>public</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>12</gid> + <group_password>x</group_password> + <groupname>mail</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>0</gid> + <group_password>x</group_password> + <groupname>root</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>2</gid> + <group_password>x</group_password> + <groupname>daemon</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>105</gid> + <group_password>!</group_password> + <groupname>sfcb</groupname> + <userlist>root</userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>108</gid> + <group_password>!</group_password> + <groupname>ntp</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>14</gid> + <group_password>x</group_password> + <groupname>uucp</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>110</gid> + <group_password>!</group_password> + <groupname>pulse-access</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>71</gid> + <group_password>!</group_password> + <groupname>ntadmin</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>62</gid> + <group_password>x</group_password> + <groupname>man</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>22</gid> + <group_password>x</group_password> + <groupname>utmp</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>13</gid> + <group_password>x</group_password> + <groupname>news</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>65</gid> + <group_password>!</group_password> + <groupname>sshd</groupname> + <userlist></userlist> + </group> + </groups> + <host> + <hosts config:type="list"> + <hosts_entry> + <host_address>127.0.0.1</host_address> + <names config:type="list"> + <name>localhost</name> + </names> + </hosts_entry> + <hosts_entry> + <host_address>::1</host_address> + <names config:type="list"> + <name>localhost ipv6-localhost ipv6-loopback</name> + </names> + </hosts_entry> + <hosts_entry> + <host_address>fe00::0</host_address> + <names config:type="list"> + <name>ipv6-localnet</name> + </names> + </hosts_entry> + <hosts_entry> + <host_address>ff00::0</host_address> + <names config:type="list"> + <name>ipv6-mcastprefix</name> + </names> + </hosts_entry> + <hosts_entry> + <host_address>ff02::1</host_address> + <names config:type="list"> + <name>ipv6-allnodes</name> + </names> + </hosts_entry> + <hosts_entry> + <host_address>ff02::2</host_address> + <names config:type="list"> + <name>ipv6-allrouters</name> + </names> + </hosts_entry> + <hosts_entry> + <host_address>ff02::3</host_address> + <names config:type="list"> + <name>ipv6-allhosts</name> + </names> + </hosts_entry> + </hosts> + </host> + <login_settings/> + <networking> + <dhcp_options> + <dhclient_client_id></dhclient_client_id> + <dhclient_hostname_option>AUTO</dhclient_hostname_option> + </dhcp_options> + <dns> + <dhcp_hostname config:type="boolean">false</dhcp_hostname> + <domain>vagrantup.com</domain> + <hostname>vagrant-sles-11sp2-x64</hostname> + <resolv_conf_policy>auto</resolv_conf_policy> + <searchlist config:type="list"> + <search>vagrantup.com</search> + </searchlist> + <write_hostname config:type="boolean">true</write_hostname> + </dns> + <interfaces config:type="list"> + <interface> + <bootproto>dhcp</bootproto> + <device>eth0</device> + <startmode>auto</startmode> + <usercontrol>no</usercontrol> + </interface> + </interfaces> + <keep_install_network config:type="boolean">true</keep_install_network> + <managed config:type="boolean">false</managed> + <routing> + <ip_forward config:type="boolean">false</ip_forward> + </routing> + </networking> + <partitioning config:type="list"> + <drive> + <device>/dev/sda</device> + <initialize config:type="boolean">true</initialize> + <partitions config:type="list"> + <partition> + <create config:type="boolean">true</create> + <crypt_fs config:type="boolean">false</crypt_fs> + <filesystem config:type="symbol">swap</filesystem> + <format config:type="boolean">true</format> + <fstopt>defaults</fstopt> + <loop_fs config:type="boolean">false</loop_fs> + <mount>swap</mount> + <mountby config:type="symbol">device</mountby> + <partition_id config:type="integer">130</partition_id> + <partition_nr config:type="integer">1</partition_nr> + <raid_options/> + <resize config:type="boolean">false</resize> + <size>1561492992</size> + </partition> + <partition> + <create config:type="boolean">true</create> + <crypt_fs config:type="boolean">false</crypt_fs> + <filesystem config:type="symbol">ext3</filesystem> + <format config:type="boolean">true</format> + <fstopt>acl,user_xattr</fstopt> + <loop_fs config:type="boolean">false</loop_fs> + <mount>/</mount> + <mountby config:type="symbol">device</mountby> + <partition_id config:type="integer">131</partition_id> + <partition_nr config:type="integer">2</partition_nr> + <raid_options/> + <resize config:type="boolean">false</resize> + <size>19895844352</size> + </partition> + </partitions> + <pesize></pesize> + <type config:type="symbol">CT_DISK</type> + <use>all</use> + </drive> + </partitioning> + <report> + <errors> + <log config:type="boolean">true</log> + <show config:type="boolean">true</show> + <timeout config:type="integer">0</timeout> + </errors> + <messages> + <log config:type="boolean">true</log> + <show config:type="boolean">true</show> + <timeout config:type="integer">0</timeout> + </messages> + <warnings> + <log config:type="boolean">true</log> + <show config:type="boolean">true</show> + <timeout config:type="integer">0</timeout> + </warnings> + <yesno_messages> + <log config:type="boolean">true</log> + <show config:type="boolean">true</show> + <timeout config:type="integer">0</timeout> + </yesno_messages> + </report> + <software> + + <packages config:type="list"> + <package>desktop-translations</package> + <package>gconf2-branding-SLES</package> + <package>libproxy0-config-gnome</package> + <package>sle-sdk-release</package> + <package>sle-sdk-release-SDK</package> + <package>sles-manuals_en</package> + <package>yast2-trans-en_US</package> + </packages> + <patterns config:type="list"> + <pattern>Basis-Devel</pattern> + <pattern>Minimal</pattern> + <pattern>apparmor</pattern> + <pattern>base</pattern> + <pattern>sdk_kernel</pattern> + </patterns> + <remove-packages config:type="list"> + <package>3ddiag</package> + <package>CASA</package> + <package>CASA-devel</package> + <package>CASA_auth_token_client</package> + <package>CASA_auth_token_client-devel</package> + <package>ConsoleKit-devel</package> + <package>ConsoleKit-x11</package> + <package>DirectFB-devel</package> + <package>FastCGI</package> + <package>IlmBase</package> + <package>IlmBase-devel</package> + <package>ImageMagick</package> + <package>ImageMagick-devel</package> + <package>LibVNCServer</package> + <package>LibVNCServer-devel</package> + <package>Mesa</package> + <package>Mesa-devel</package> + <package>ModemManager</package> + <package>Modules</package> + <package>NetworkManager</package> + <package>NetworkManager-devel</package> + <package>NetworkManager-glib</package> + <package>NetworkManager-gnome</package> + <package>NetworkManager-kde4</package> + <package>NetworkManager-kde4-lang</package> + <package>NetworkManager-kde4-libs</package> + <package>OpenEXR</package> + <package>OpenEXR-devel</package> + <package>OpenIPMI-devel</package> + <package>PackageKit</package> + <package>PackageKit-devel</package> + <package>PackageKit-lang</package> + <package>PolicyKit-devel</package> + <package>PolicyKit-gnome</package> + <package>PolicyKit-gnome-devel</package> + <package>PolicyKit-gnome-libs</package> + <package>SDL-devel</package> + <package>SDL_net</package> + <package>SDL_net-devel</package> + <package>TeX-Guy</package> + <package>TeX-Guy-devel</package> + <package>VFlib3</package> + <package>VFlib3-devel</package> + <package>WindowMaker</package> + <package>WindowMaker-devel</package> + <package>a2ps</package> + <package>aalib</package> + <package>aalib-devel</package> + <package>akonadi-runtime</package> + <package>akregator</package> + <package>alsa-devel</package> + <package>alsa-firmware</package> + <package>alsa-plugins-pulse</package> + <package>alsa-tools</package> + <package>alsa-tools-devel</package> + <package>anthy</package> + <package>anthy-devel</package> + <package>antlr</package> + <package>apache2</package> + <package>apache2-devel</package> + <package>apache2-mod_perl</package> + <package>apache2-mod_perl-devel</package> + <package>apache2-prefork</package> + <package>apache2-utils</package> + <package>apache2-worker</package> + <package>apparmor-profile-editor</package> + <package>art-sharp2</package> + <package>arts</package> + <package>arts-devel</package> + <package>aspell-devel</package> + <package>at-spi</package> + <package>at-spi-devel</package> + <package>at-spi-lang</package> + <package>atk-devel</package> + <package>audiofile</package> + <package>audiofile-devel</package> + <package>audit-devel</package> + <package>augeas-lenses</package> + <package>automoc4</package> + <package>avahi</package> + <package>avahi-compat-howl-devel</package> + <package>avahi-compat-mDNSResponder-devel</package> + <package>avahi-lang</package> + <package>babl-0_0</package> + <package>banshee-1</package> + <package>banshee-1-backend-engine-gstreamer</package> + <package>banshee-1-backend-platform-gnome</package> + <package>banshee-1-backend-platform-unix</package> + <package>banshee-1-devel</package> + <package>banshee-1-extensions-default</package> + <package>banshee-1-lang</package> + <package>beagle-devel</package> + <package>bind-devel</package> + <package>binutils-devel</package> + <package>bluez</package> + <package>bluez-devel</package> + <package>boo</package> + <package>boo-devel</package> + <package>boost-devel</package> + <package>bootsplash-branding-SLED</package> + <package>cairo-devel</package> + <package>cairomm</package> + <package>cairomm-devel</package> + <package>canna</package> + <package>canna-devel</package> + <package>canna-libs</package> + <package>cannadic</package> + <package>capi4linux</package> + <package>capi4linux-devel</package> + <package>cdk</package> + <package>cdk-devel</package> + <package>cdrdao</package> + <package>chasen</package> + <package>chasen-devel</package> + <package>check</package> + <package>check-devel</package> + <package>chmlib</package> + <package>chmlib-devel</package> + <package>cim-schema</package> + <package>clucene-core</package> + <package>clucene-core-devel</package> + <package>cmake</package> + <package>compiz</package> + <package>compiz-branding-SLE</package> + <package>compiz-devel</package> + <package>compiz-gnome</package> + <package>coolkey-devel</package> + <package>cracklib-devel</package> + <package>crash-devel</package> + <package>crimson</package> + <package>cscope</package> + <package>cups</package> + <package>cups-devel</package> + <package>cvsps</package> + <package>cyrus-imapd-devel</package> + <package>cyrus-sasl-crammd5</package> + <package>cyrus-sasl-devel</package> + <package>dante</package> + <package>dante-devel</package> + <package>db1</package> + <package>db1-devel</package> + <package>db43</package> + <package>db43-devel</package> + <package>dbus-1-devel</package> + <package>dbus-1-glib-devel</package> + <package>dbus-1-python-devel</package> + <package>dbus-1-qt3</package> + <package>dbus-1-qt3-devel</package> + <package>dbus-1-x11</package> + <package>dejagnu</package> + <package>dejavu</package> + <package>desktop-data-openSUSE</package> + <package>desktop-file-utils</package> + <package>devhelp</package> + <package>devhelp-devel</package> + <package>devhelp-lang</package> + <package>device-mapper-devel</package> + <package>dhcp</package> + <package>dhcp-client</package> + <package>dhcp-devel</package> + <package>diffstat</package> + <package>dmapi-devel</package> + <package>dnsmasq</package> + <package>docbook-xsl-stylesheets</package> + <package>docbook_4</package> + <package>doxygen</package> + <package>dvd+rw-tools</package> + <package>e2fsprogs-devel</package> + <package>emacs</package> + <package>emacs-nox</package> + <package>emacs-x11</package> + <package>enchant</package> + <package>enchant-devel</package> + <package>enscript</package> + <package>eog</package> + <package>eog-devel</package> + <package>eog-lang</package> + <package>espeak</package> + <package>evince</package> + <package>evince-devel</package> + <package>evince-lang</package> + <package>evoldap2-devel</package> + <package>evolution</package> + <package>evolution-data-server</package> + <package>evolution-data-server-devel</package> + <package>evolution-data-server-lang</package> + <package>evolution-devel</package> + <package>evolution-lang</package> + <package>expect-devel</package> + <package>facter</package> + <package>fam</package> + <package>fam-devel</package> + <package>farsight</package> + <package>farsight-devel</package> + <package>festival</package> + <package>festival-devel</package> + <package>fftw</package> + <package>fftw-devel</package> + <package>fftw-mpi</package> + <package>fftw-mpi-devel</package> + <package>fftw-threads</package> + <package>fftw-threads-devel</package> + <package>fftw3</package> + <package>fftw3-devel</package> + <package>fftw3-threads</package> + <package>fftw3-threads-devel</package> + <package>file-devel</package> + <package>fileshareset</package> + <package>finch</package> + <package>finch-devel</package> + <package>flac-devel</package> + <package>fltk</package> + <package>fltk-devel</package> + <package>fontconfig-devel</package> + <package>fonts-config</package> + <package>foomatic-filters</package> + <package>freeglut</package> + <package>freeglut-devel</package> + <package>freeradius-client-devel</package> + <package>freeradius-client-libs</package> + <package>freeradius-server-devel</package> + <package>freeradius-server-libs</package> + <package>freetype</package> + <package>freetype2-devel</package> + <package>fribidi</package> + <package>fribidi-devel</package> + <package>ft2demos</package> + <package>fuse-devel</package> + <package>fwnn-devel</package> + <package>fxload</package> + <package>gcc-gij</package> + <package>gcc-java</package> + <package>gcc43-gij</package> + <package>gcc43-java</package> + <package>gconf-sharp2</package> + <package>gconf2-devel</package> + <package>gconfmm</package> + <package>gconfmm-devel</package> + <package>gd</package> + <package>gd-devel</package> + <package>gdbm-32bit</package> + <package>gdk-pixbuf</package> + <package>gdk-pixbuf-devel</package> + <package>gegl-0_0</package> + <package>gettext-tools</package> + <package>gfxboot-branding-SLED</package> + <package>gfxboot-devel</package> + <package>ggz</package> + <package>ggz-client-libs</package> + <package>ggz-client-libs-devel</package> + <package>ggz-client-libs-lang</package> + <package>ghex</package> + <package>ghex-devel</package> + <package>ghex-lang</package> + <package>ghostscript-devel</package> + <package>ghostscript-fonts-other</package> + <package>ghostscript-fonts-std</package> + <package>ghostscript-ijs-devel</package> + <package>ghostscript-library</package> + <package>ghostscript-omni</package> + <package>ghostscript-x11</package> + <package>giflib-devel</package> + <package>gimp</package> + <package>gimp-branding-SLED</package> + <package>gimp-devel</package> + <package>gimp-lang</package> + <package>gimp-plugins-python</package> + <package>git</package> + <package>git-arch</package> + <package>git-core</package> + <package>git-cvs</package> + <package>git-daemon</package> + <package>git-email</package> + <package>git-gui</package> + <package>git-svn</package> + <package>git-web</package> + <package>gitk</package> + <package>gjdoc</package> + <package>glade-sharp2</package> + <package>glade3</package> + <package>glade3-lang</package> + <package>glib</package> + <package>glib-devel</package> + <package>glib-sharp2</package> + <package>glib2-devel</package> + <package>glibmm2</package> + <package>glibmm2-devel</package> + <package>glitz</package> + <package>glitz-devel</package> + <package>gltt</package> + <package>gltt-devel</package> + <package>gmime-2_4-devel</package> + <package>gmime-devel</package> + <package>gmp-devel</package> + <package>gnet</package> + <package>gnet-devel</package> + <package>gnokii</package> + <package>gnokii-devel</package> + <package>gnokii-smsd</package> + <package>gnome-certauth-devel</package> + <package>gnome-control-center</package> + <package>gnome-control-center-devel</package> + <package>gnome-control-center-lang</package> + <package>gnome-desktop</package> + <package>gnome-desktop-devel</package> + <package>gnome-desktop-lang</package> + <package>gnome-doc-utils</package> + <package>gnome-doc-utils-devel</package> + <package>gnome-doc-utils-lang</package> + <package>gnome-keyring-devel</package> + <package>gnome-keyring-sharp</package> + <package>gnome-keyring-sharp-devel</package> + <package>gnome-libs</package> + <package>gnome-libs-devel</package> + <package>gnome-mag</package> + <package>gnome-mag-devel</package> + <package>gnome-mag-lang</package> + <package>gnome-main-menu</package> + <package>gnome-main-menu-lang</package> + <package>gnome-media</package> + <package>gnome-media-devel</package> + <package>gnome-media-lang</package> + <package>gnome-menus</package> + <package>gnome-menus-branding-SLED</package> + <package>gnome-menus-devel</package> + <package>gnome-menus-lang</package> + <package>gnome-mount</package> + <package>gnome-mount-lang</package> + <package>gnome-panel</package> + <package>gnome-panel-devel</package> + <package>gnome-panel-lang</package> + <package>gnome-pilot</package> + <package>gnome-pilot-devel</package> + <package>gnome-pilot-lang</package> + <package>gnome-settings-daemon</package> + <package>gnome-settings-daemon-devel</package> + <package>gnome-settings-daemon-lang</package> + <package>gnome-sharp2</package> + <package>gnome-speech</package> + <package>gnome-speech-devel</package> + <package>gnome-themes</package> + <package>gnome-utils</package> + <package>gnome-utils-devel</package> + <package>gnome-utils-lang</package> + <package>gnome-vfs-sharp2</package> + <package>gnome-vfs2</package> + <package>gnome-vfs2-devel</package> + <package>gnome-vfs2-lang</package> + <package>gnome-vfsmm</package> + <package>gnome-vfsmm-devel</package> + <package>gnopernicus</package> + <package>gnopernicus-devel</package> + <package>gnopernicus-lang</package> + <package>gnutls</package> + <package>goffice</package> + <package>goffice-devel</package> + <package>goffice-lang</package> + <package>goocanvas</package> + <package>goocanvas-devel</package> + <package>goocanvas-lang</package> + <package>goom2k4</package> + <package>goom2k4-devel</package> + <package>graphviz</package> + <package>graphviz-devel</package> + <package>graphviz-gd</package> + <package>graphviz-gnome</package> + <package>gstreamer-0_10</package> + <package>gstreamer-0_10-devel</package> + <package>gstreamer-0_10-lang</package> + <package>gstreamer-0_10-plugins-base</package> + <package>gstreamer-0_10-plugins-base-devel</package> + <package>gstreamer-0_10-plugins-base-lang</package> + <package>gstreamer-0_10-plugins-good</package> + <package>gstreamer-0_10-plugins-good-lang</package> + <package>gstreamer-0_10-utils</package> + <package>gstreamer-utils</package> + <package>gtk</package> + <package>gtk-devel</package> + <package>gtk-lang</package> + <package>gtk-sharp2</package> + <package>gtk-vnc-devel</package> + <package>gtk2-devel</package> + <package>gtkglext</package> + <package>gtkglext-devel</package> + <package>gtkhtml2</package> + <package>gtkhtml2-devel</package> + <package>gtkhtml2-lang</package> + <package>gtkhtml314-sharp</package> + <package>gtkmm2</package> + <package>gtkmm2-devel</package> + <package>gtksourceview-devel</package> + <package>gtksourceview-lang</package> + <package>gtksourceview18</package> + <package>gtksourceview18-devel</package> + <package>gtkspell</package> + <package>gtkspell-devel</package> + <package>gtkspell-lang</package> + <package>gucharmap</package> + <package>gucharmap-devel</package> + <package>gucharmap-lang</package> + <package>guile</package> + <package>guile-devel</package> + <package>gutenprint</package> + <package>gutenprint-devel</package> + <package>gvfs-devel</package> + <package>gxmhtml</package> + <package>hal-devel</package> + <package>hal-palm</package> + <package>htdig</package> + <package>htdig-devel</package> + <package>hunspell</package> + <package>hunspell-devel</package> + <package>hunspell-tools</package> + <package>hwinfo-devel</package> + <package>i4l-base</package> + <package>icewm</package> + <package>icewm-lite</package> + <package>id3lib</package> + <package>id3lib-devel</package> + <package>imap-devel</package> + <package>imap-lib</package> + <package>imlib</package> + <package>imlib-devel</package> + <package>imlib2</package> + <package>imlib2-devel</package> + <package>indent</package> + <package>info2html</package> + <package>inn</package> + <package>inn-devel</package> + <package>intltool</package> + <package>ipadic</package> + <package>iptables-devel</package> + <package>iso-codes</package> + <package>iso-codes-devel</package> + <package>iso_ent</package> + <package>ispell</package> + <package>ispell-american</package> + <package>ispell-brazilian</package> + <package>ispell-british</package> + <package>ispell-czech</package> + <package>ispell-danish</package> + <package>ispell-finnish</package> + <package>ispell-french</package> + <package>ispell-german</package> + <package>ispell-hungarian</package> + <package>ispell-italian</package> + <package>ispell-ngerman</package> + <package>ispell-norsk</package> + <package>ispell-polish</package> + <package>ispell-portuguese</package> + <package>ispell-russian</package> + <package>ispell-slovak</package> + <package>ispell-spanish</package> + <package>ispell-swedish</package> + <package>itcl-devel</package> + <package>java-1_4_2-ibm</package> + <package>java-1_4_2-ibm-devel</package> + <package>java-1_5_0-gcj-compat</package> + <package>java-1_5_0-gcj-compat-devel</package> + <package>java-1_6_0-ibm</package> + <package>java-1_6_0-ibm-devel</package> + <package>joe</package> + <package>jpackage-utils</package> + <package>k3b</package> + <package>k3b-devel</package> + <package>k3b-lang</package> + <package>kaddressbook</package> + <package>kalarm</package> + <package>kde-susetranslations</package> + <package>kde4-filesystem</package> + <package>kde4-kgreeter-plugins</package> + <package>kdebase3</package> + <package>kdebase3-devel</package> + <package>kdebase3-runtime</package> + <package>kdebase4-SLED</package> + <package>kdebase4-SLED-lang</package> + <package>kdebase4-runtime</package> + <package>kdebase4-runtime-branding-SLED</package> + <package>kdebase4-workspace</package> + <package>kdebase4-workspace-branding-SLED</package> + <package>kdebase4-workspace-devel</package> + <package>kdebase4-workspace-ksysguardd</package> + <package>kdelibs3</package> + <package>kdelibs3-arts</package> + <package>kdelibs3-default-style</package> + <package>kdelibs3-devel</package> + <package>kdelibs3-doc</package> + <package>kdelibs4</package> + <package>kdelibs4-branding-SLED</package> + <package>kdelibs4-core</package> + <package>kdelibs4-doc</package> + <package>kdemultimedia3-arts</package> + <package>kdepim3</package> + <package>kdepim4</package> + <package>kdepim4-devel</package> + <package>kdepimlibs4</package> + <package>kdialog</package> + <package>kdm</package> + <package>kdm-branding-SLED</package> + <package>kernel-docs</package> + <package>kernel-syms</package> + <package>kernel-trace-devel</package> + <package>kernel-xen-devel</package> + <package>keyutils-devel</package> + <package>kio_sysinfo</package> + <package>kio_sysinfo-branding-SLED</package> + <package>kmail</package> + <package>knode</package> + <package>kontact</package> + <package>korganizer</package> + <package>kpilot</package> + <package>krb5-devel</package> + <package>ksh-devel</package> + <package>ktorrent</package> + <package>ktorrent-devel</package> + <package>ktorrent-lang</package> + <package>kwin</package> + <package>ladspa-devel</package> + <package>lib3ds-1-3</package> + <package>lib3ds-devel</package> + <package>libFLAC++6</package> + <package>libFLAC8</package> + <package>libHX-devel</package> + <package>libMagick++-devel</package> + <package>libMagick++1</package> + <package>libMagickWand1</package> + <package>libQtWebKit-devel</package> + <package>libQtWebKit4</package> + <package>libXerces-c-devel</package> + <package>libXerces-c28</package> + <package>libXiterm</package> + <package>libXiterm-devel</package> + <package>libacl-devel</package> + <package>libadns-devel</package> + <package>libadns1</package> + <package>libakode</package> + <package>libakode-devel</package> + <package>libakonadi4</package> + <package>libakonadiprotocolinternals-devel</package> + <package>libakonadiprotocolinternals1</package> + <package>libao</package> + <package>libao-devel</package> + <package>libapparmor-devel</package> + <package>libapr-util1</package> + <package>libapr-util1-devel</package> + <package>libapr1</package> + <package>libapr1-devel</package> + <package>libarchive-devel</package> + <package>libart_lgpl</package> + <package>libart_lgpl-devel</package> + <package>libassuan-devel</package> + <package>libatomic-ops-devel</package> + <package>libattr-devel</package> + <package>libavahi-core5</package> + <package>libavahi-devel</package> + <package>libavahi-glib-devel</package> + <package>libavahi-gobject-devel</package> + <package>libavahi-gobject0</package> + <package>libavahi-ui0</package> + <package>libavc1394-0</package> + <package>libavc1394-devel</package> + <package>libbabl-0_0-0</package> + <package>libbeagle-devel</package> + <package>libbeagle-python</package> + <package>libbeagle1</package> + <package>libbitmask-devel</package> + <package>libbitmask1</package> + <package>libblkid-devel</package> + <package>libblocxx-devel</package> + <package>libbonobo</package> + <package>libbonobo-devel</package> + <package>libbonobo-lang</package> + <package>libbonoboui</package> + <package>libbonoboui-devel</package> + <package>libbonoboui-lang</package> + <package>libboost_date_time1_36_0</package> + <package>libboost_filesystem1_36_0</package> + <package>libboost_graph1_36_0</package> + <package>libboost_iostreams1_36_0</package> + <package>libboost_math1_36_0</package> + <package>libboost_mpi1_36_0</package> + <package>libboost_program_options1_36_0</package> + <package>libboost_python1_36_0</package> + <package>libboost_serialization1_36_0</package> + <package>libboost_signals1_36_0</package> + <package>libboost_system1_36_0</package> + <package>libboost_test1_36_0</package> + <package>libboost_thread1_36_0</package> + <package>libboost_wave1_36_0</package> + <package>libbotan-1_6_4</package> + <package>libbotan-devel</package> + <package>libbtctl</package> + <package>libbtctl-devel</package> + <package>libbtctl-lang</package> + <package>libbtctl4</package> + <package>libbz2-devel</package> + <package>libcaca</package> + <package>libcaca-devel</package> + <package>libcanberra-gtk</package> + <package>libcanberra-gtk0</package> + <package>libcanberra0</package> + <package>libcap-devel</package> + <package>libcap-ng0</package> + <package>libcdda_interface0</package> + <package>libcdda_paranoia0</package> + <package>libcddb-devel</package> + <package>libcddb2</package> + <package>libcdio++0</package> + <package>libcdio-devel</package> + <package>libcgroup-devel</package> + <package>libcgroup1</package> + <package>libchewing</package> + <package>libchewing-devel</package> + <package>libcmpiutil</package> + <package>libcmpiutil-devel</package> + <package>libcolorblind0</package> + <package>libcom_err-devel</package> + <package>libcompizconfig</package> + <package>libcompizconfig-devel</package> + <package>libcppunit-1_12-0</package> + <package>libcppunit-devel</package> + <package>libcpuset-devel</package> + <package>libcpuset1</package> + <package>libcroco</package> + <package>libcroco-0_6-3</package> + <package>libcroco-devel</package> + <package>libcryptsetup-devel</package> + <package>libcsync-devel</package> + <package>libcsync0</package> + <package>libcurl-devel</package> + <package>libdaemon-devel</package> + <package>libdaemon0</package> + <package>libdatrie-devel</package> + <package>libdatrie0</package> + <package>libdb-4_5-32bit</package> + <package>libdb-4_5-devel</package> + <package>libdbus-1-qt3-0</package> + <package>libdbus-1-qt3-0-devel</package> + <package>libdc1394-22</package> + <package>libdc1394-devel</package> + <package>libdc1394_control12</package> + <package>libdc1394_control12-devel</package> + <package>libdhcp6client-1_0-2</package> + <package>libdhcp6client-devel</package> + <package>libdigikam-devel</package> + <package>libdiscid1</package> + <package>libdjvulibre-devel</package> + <package>libdjvulibre21</package> + <package>libdmxview-devel</package> + <package>libdmxview0</package> + <package>libdnet-devel</package> + <package>libdnet1</package> + <package>libdns_sd</package> + <package>libdrm</package> + <package>libdrm-devel</package> + <package>libdv-devel</package> + <package>libdv4</package> + <package>libdvdread4</package> + <package>libdw-devel</package> + <package>libebl-devel</package> + <package>libedit-devel</package> + <package>libedit0</package> + <package>libelf-devel</package> + <package>libenchant1</package> + <package>libesd-devel</package> + <package>libesd0</package> + <package>libesmtp-devel</package> + <package>libevoldap-2_4-2</package> + <package>libevtlog-devel</package> + <package>libevtlog0</package> + <package>libexempi-devel</package> + <package>libexempi3</package> + <package>libexif-devel</package> + <package>libexiv2-4</package> + <package>libexiv2-devel</package> + <package>libexpat-devel</package> + <package>libext2fs-devel</package> + <package>libfarsight-0_1-3</package> + <package>libffi-devel</package> + <package>libffi43</package> + <package>libffi43-devel</package> + <package>libflaim-devel</package> + <package>libfprint-devel</package> + <package>libfreebl3</package> + <package>libfreebob</package> + <package>libfreebob-devel</package> + <package>libgadu</package> + <package>libgadu-devel</package> + <package>libgail-gnome</package> + <package>libgail-gnome-devel</package> + <package>libgcj-devel</package> + <package>libgcj43</package> + <package>libgcj43-devel</package> + <package>libgcj43-jar</package> + <package>libgcj_bc43</package> + <package>libgcrypt-devel</package> + <package>libgda-3_0-3</package> + <package>libgda-3_0-devel</package> + <package>libgdiplus0</package> + <package>libgegl-0_0-0</package> + <package>libgeoclue0</package> + <package>libgfortran46</package> + <package>libggz2</package> + <package>libggz2-devel</package> + <package>libgimpprint</package> + <package>libgimpprint-devel</package> + <package>libglade2</package> + <package>libglade2-devel</package> + <package>libglademm</package> + <package>libglademm-2_4-1</package> + <package>libglademm-devel</package> + <package>libgladeui-1-9</package> + <package>libgladeui-1_0-devel</package> + <package>libgmime-2_0-3</package> + <package>libgmime-2_4-2</package> + <package>libgmm++-devel</package> + <package>libgnome</package> + <package>libgnome-certauth0</package> + <package>libgnome-desktop-2-11</package> + <package>libgnome-devel</package> + <package>libgnome-lang</package> + <package>libgnome-menu2</package> + <package>libgnome-window-settings1</package> + <package>libgnomecanvas</package> + <package>libgnomecanvas-devel</package> + <package>libgnomecanvas-lang</package> + <package>libgnomecanvasmm</package> + <package>libgnomecanvasmm-devel</package> + <package>libgnomecups</package> + <package>libgnomecups-devel</package> + <package>libgnomecups-lang</package> + <package>libgnomedb</package> + <package>libgnomedb-devel</package> + <package>libgnomedb-lang</package> + <package>libgnomekbd</package> + <package>libgnomekbd-devel</package> + <package>libgnomekbd-lang</package> + <package>libgnomeprint</package> + <package>libgnomeprint-devel</package> + <package>libgnomeprint-lang</package> + <package>libgnomeprintui</package> + <package>libgnomeprintui-devel</package> + <package>libgnomeprintui-lang</package> + <package>libgnomesu</package> + <package>libgnomesu-devel</package> + <package>libgnomesu-lang</package> + <package>libgnomesu0</package> + <package>libgnomeui</package> + <package>libgnomeui-devel</package> + <package>libgnomeui-lang</package> + <package>libgnomevfsmm-2_6-1</package> + <package>libgnutls-devel</package> + <package>libgnutls-extra-devel</package> + <package>libgnutls-extra26</package> + <package>libgoocanvas3</package> + <package>libgpg-error-devel</package> + <package>libgpgme-devel</package> + <package>libgphoto2-devel</package> + <package>libgpod-devel</package> + <package>libgsf</package> + <package>libgsf-1-114</package> + <package>libgsf-devel</package> + <package>libgsf-gnome</package> + <package>libgsm-devel</package> + <package>libgsm1</package> + <package>libgssglue-devel</package> + <package>libgstapp-0_10-0</package> + <package>libgstinterfaces-0_10-0</package> + <package>libgstreamer-0_10-0</package> + <package>libgtk-vnc-1_0-0</package> + <package>libgtkhtml</package> + <package>libgtkhtml-devel</package> + <package>libgtksourceview-2_0-0</package> + <package>libgtop</package> + <package>libgtop-2_0-7</package> + <package>libgtop-devel</package> + <package>libgtop-lang</package> + <package>libgudev-1_0-0</package> + <package>libgweather</package> + <package>libgweather-devel</package> + <package>libgweather-lang</package> + <package>libgweather1</package> + <package>libhangul</package> + <package>libhangul-devel</package> + <package>libhowl0</package> + <package>libical-devel</package> + <package>libical0</package> + <package>libicu-devel</package> + <package>libid3tag</package> + <package>libid3tag-devel</package> + <package>libidl-devel</package> + <package>libidn-devel</package> + <package>libiec61883</package> + <package>libiec61883-devel</package> + <package>libieee1284</package> + <package>libiniparser-devel</package> + <package>libiniparser0</package> + <package>libiptcdata</package> + <package>libiptcdata-devel</package> + <package>libiptcdata0</package> + <package>libiso9660-5</package> + <package>libiterm</package> + <package>libiterm-devel</package> + <package>libjack-devel</package> + <package>libjack0</package> + <package>libjasper</package> + <package>libjasper-devel</package> + <package>libjingle-0_3-0</package> + <package>libjingle-devel</package> + <package>libjpeg-devel</package> + <package>libkcal</package> + <package>libkcal-devel</package> + <package>libkcal2</package> + <package>libkcddb4</package> + <package>libkcddb4-devel</package> + <package>libkcompactdisc4</package> + <package>libkcompactdisc4-devel</package> + <package>libkdcraw3</package> + <package>libkdcraw3-devel</package> + <package>libkdcraw3-lang</package> + <package>libkde4</package> + <package>libkde4-devel</package> + <package>libkdecore4</package> + <package>libkdecore4-devel</package> + <package>libkdepim4</package> + <package>libkdepim4-devel</package> + <package>libkdepimlibs4</package> + <package>libkdepimlibs4-devel</package> + <package>libkexiv2-3</package> + <package>libkexiv2-3-devel</package> + <package>libkexiv2-7</package> + <package>libkipi-devel</package> + <package>libkipi6</package> + <package>libkmime-devel</package> + <package>libkmime2</package> + <package>libknotificationitem-1-1</package> + <package>libkonq-devel</package> + <package>libkonq5</package> + <package>libksba-devel</package> + <package>libktnef-devel</package> + <package>libktnef1</package> + <package>liblazy-devel</package> + <package>liblazy1</package> + <package>liblcms-devel</package> + <package>libldapcpp-devel</package> + <package>liblog4c-devel</package> + <package>liblog4c3</package> + <package>libloudmouth-1-0</package> + <package>liblpsolve55</package> + <package>liblua5_1</package> + <package>libmalaga-devel</package> + <package>libmalaga7</package> + <package>libmcrypt</package> + <package>libmcrypt-devel</package> + <package>libmikmod</package> + <package>libmikmod-devel</package> + <package>libmm-devel</package> + <package>libmm14</package> + <package>libmng-devel</package> + <package>libmpcdec-devel</package> + <package>libmpcdec5</package> + <package>libmspack-devel</package> + <package>libmtp-devel</package> + <package>libmtp8</package> + <package>libmusicbrainz-devel</package> + <package>libmusicbrainz3-6</package> + <package>libmusicbrainz3-devel</package> + <package>libmusicbrainz4</package> + <package>libmysqlclient-devel</package> + <package>libmysqlclient15</package> + <package>libmysqlclient_r15</package> + <package>libneon-devel</package> + <package>libneon27</package> + <package>libnetapi-devel</package> + <package>libnetapi0</package> + <package>libnetcontrol0</package> + <package>libnetpbm-devel</package> + <package>libnetpbm10</package> + <package>libnewt0_52</package> + <package>libnjb</package> + <package>libnjb-devel</package> + <package>libnjb5</package> + <package>libnl-devel</package> + <package>libnotify</package> + <package>libnotify-devel</package> + <package>libnotify1</package> + <package>libnscd-devel</package> + <package>libnsssharedhelper0</package> + <package>libnuma-devel</package> + <package>libofa-devel</package> + <package>libofa0</package> + <package>libogg-devel</package> + <package>libogg0</package> + <package>liboil</package> + <package>liboil-devel</package> + <package>libopenbabel-devel</package> + <package>libopenbabel3</package> + <package>libopencdk-devel</package> + <package>libopencdk10</package> + <package>libopenraw-devel</package> + <package>libopenraw1</package> + <package>libopenssl-devel</package> + <package>libopensync</package> + <package>libopensync-devel</package> + <package>libopensync-plugin-evolution2</package> + <package>libopensync-plugin-evolution2-devel</package> + <package>libopensync-plugin-palm</package> + <package>libopensync-plugin-palm-devel</package> + <package>liborc-0_4-0</package> + <package>libosip2</package> + <package>libosip2-devel</package> + <package>libotf</package> + <package>libotf-devel</package> + <package>libotr-devel</package> + <package>libotr2</package> + <package>libp11-1</package> + <package>libp11-devel</package> + <package>libpackagekit-glib10</package> + <package>libpackagekit-glib10-devel</package> + <package>libpangomm-1_4-1</package> + <package>libpcap-devel</package> + <package>libpciaccess0</package> + <package>libpciaccess0-devel</package> + <package>libphonon4</package> + <package>libpisock-devel</package> + <package>libpisock9</package> + <package>libpisync-devel</package> + <package>libpisync1</package> + <package>libpixman-1-0-devel</package> + <package>libpkcs11-helper1</package> + <package>libpng-devel</package> + <package>libpolkit-qt0</package> + <package>libpoppler-devel</package> + <package>libpoppler-glib-devel</package> + <package>libpoppler-glib4</package> + <package>libpoppler-qt2</package> + <package>libpoppler-qt3-devel</package> + <package>libpoppler-qt4-3</package> + <package>libpoppler-qt4-devel</package> + <package>libpoppler5</package> + <package>libpst4</package> + <package>libpt2</package> + <package>libpt2-devel</package> + <package>libpulse-browse0</package> + <package>libpulse-devel</package> + <package>libpulse-mainloop-glib0</package> + <package>libpulse0</package> + <package>libpurple</package> + <package>libpurple-devel</package> + <package>libpurple-lang</package> + <package>libqca2</package> + <package>libqca2-devel</package> + <package>libqdialogsolver1</package> + <package>libqdialogsolver1-devel</package> + <package>libqimageblitz-devel</package> + <package>libqimageblitz4</package> + <package>libqscintilla-devel</package> + <package>libqscintilla2-5</package> + <package>libqt4</package> + <package>libqt4-devel</package> + <package>libqt4-qt3support</package> + <package>libqt4-sql</package> + <package>libqt4-sql-mysql</package> + <package>libqt4-sql-postgresql</package> + <package>libqt4-sql-sqlite</package> + <package>libqt4-sql-unixODBC</package> + <package>libqt4-x11</package> + <package>libqtpod-devel</package> + <package>libqtpod0</package> + <package>libquadmath46</package> + <package>libquicktime</package> + <package>libquicktime-devel</package> + <package>libraptor-devel</package> + <package>libraptor1</package> + <package>librasqal-devel</package> + <package>librasqal1</package> + <package>libraw1394-11</package> + <package>libraw1394-8</package> + <package>libraw1394-devel</package> + <package>libredland-devel</package> + <package>libredland0</package> + <package>libreiserfs-devel</package> + <package>libreoffice</package> + <package>libreoffice-base</package> + <package>libreoffice-branding-SLED</package> + <package>libreoffice-branding-upstream</package> + <package>libreoffice-calc</package> + <package>libreoffice-icon-themes</package> + <package>libreoffice-impress</package> + <package>libreoffice-sdk</package> + <package>libreoffice-writer</package> + <package>librsvg</package> + <package>librsvg-devel</package> + <package>libsamplerate</package> + <package>libsamplerate-devel</package> + <package>libsatsolver-devel</package> + <package>libsblim-cmpiutil1</package> + <package>libselinux-devel</package> + <package>libsemanage-devel</package> + <package>libsemanage1</package> + <package>libsensors3-devel</package> + <package>libsensors4</package> + <package>libsepol-devel</package> + <package>libsexy</package> + <package>libsexy-devel</package> + <package>libshout-devel</package> + <package>libshout3</package> + <package>libsidplay1</package> + <package>libsidplay1-devel</package> + <package>libsigc++2</package> + <package>libsigc++2-devel</package> + <package>libslab-lang</package> + <package>libslab0</package> + <package>libsmbclient-devel</package> + <package>libsmbios-devel</package> + <package>libsmbsharemodes-devel</package> + <package>libsmbsharemodes0</package> + <package>libsndfile</package> + <package>libsndfile-devel</package> + <package>libsoprano-devel</package> + <package>libsoprano4</package> + <package>libsoup-devel</package> + <package>libspectre-devel</package> + <package>libspectre1</package> + <package>libspeex</package> + <package>libssh2-devel</package> + <package>libstrigi0</package> + <package>libstroke</package> + <package>libstroke-devel</package> + <package>libsyncml-devel</package> + <package>libsyncml0</package> + <package>libtalloc-devel</package> + <package>libtasn1-devel</package> + <package>libtdb-devel</package> + <package>libtelepathy</package> + <package>libtelepathy-devel</package> + <package>libtelepathy-glib0</package> + <package>libtheora-devel</package> + <package>libtheora0</package> + <package>libtidy</package> + <package>libtidy-devel</package> + <package>libtiff-devel</package> + <package>libtirpc-devel</package> + <package>libtomoe-gtk0</package> + <package>libtspi1</package> + <package>libtunepimp</package> + <package>libtunepimp-devel</package> + <package>libtunepimp5</package> + <package>libudev-devel</package> + <package>libudf0</package> + <package>libunique-1_0-0</package> + <package>libunwind</package> + <package>libunwind-devel</package> + <package>libupsclient1</package> + <package>libusb-devel</package> + <package>libusbpp-0_1-4</package> + <package>libustr-1_0-1</package> + <package>libustr-devel</package> + <package>libuuid-devel</package> + <package>libvirt-client</package> + <package>libvirt-devel</package> + <package>libvisual</package> + <package>libvisual-devel</package> + <package>libvoikko-devel</package> + <package>libvoikko1</package> + <package>libvorbis</package> + <package>libvorbis-devel</package> + <package>libwavpack1</package> + <package>libwbclient-devel</package> + <package>libwbxml2-0</package> + <package>libwbxml2-devel</package> + <package>libwebkit-1_0-1</package> + <package>libwebkit-1_0-2</package> + <package>libwebkit-devel</package> + <package>libwebkit-lang</package> + <package>libwmf</package> + <package>libwmf-devel</package> + <package>libwmf-gnome</package> + <package>libwnck</package> + <package>libwnck-1-22</package> + <package>libwnck-devel</package> + <package>libwnck-lang</package> + <package>libwpd-0_8-8</package> + <package>libwpd-devel</package> + <package>libwpg-0_1-1</package> + <package>libwpg-devel</package> + <package>libwps-0_1-1</package> + <package>libwps-devel</package> + <package>libwsman-devel</package> + <package>libwsman1</package> + <package>libxcrypt-devel</package> + <package>libxine-devel</package> + <package>libxine1</package> + <package>libxklavier-devel</package> + <package>libxklavier15</package> + <package>libxml2-devel</package> + <package>libxslt-devel</package> + <package>libyajl1</package> + <package>libzio-devel</package> + <package>libzip-devel</package> + <package>libzip1</package> + <package>libzvbi0</package> + <package>libzypp-devel</package> + <package>limal-apparmor-notifications</package> + <package>limal-apparmor-notifications-devel</package> + <package>limal-ca-mgm-devel</package> + <package>limal-devel</package> + <package>limal-devtools</package> + <package>limal-nfs-server-devel</package> + <package>linux-atm-devel</package> + <package>linux-atm-lib</package> + <package>lksctp-tools</package> + <package>lksctp-tools-devel</package> + <package>loudmouth-devel</package> + <package>lua</package> + <package>lua-devel</package> + <package>lzo-devel</package> + <package>m17n-db</package> + <package>m17n-lib</package> + <package>m17n-lib-devel</package> + <package>malaga-suomi</package> + <package>meanwhile</package> + <package>meanwhile-devel</package> + <package>metacity</package> + <package>metacity-devel</package> + <package>metacity-lang</package> + <package>mhash</package> + <package>mhash-devel</package> + <package>misc-console-font</package> + <package>mono-addins</package> + <package>mono-basic</package> + <package>mono-core</package> + <package>mono-data</package> + <package>mono-data-oracle</package> + <package>mono-data-sqlite</package> + <package>mono-devel</package> + <package>mono-extras</package> + <package>mono-jscript</package> + <package>mono-tools</package> + <package>mono-wcf</package> + <package>mono-web</package> + <package>mono-winforms</package> + <package>mono-zeroconf</package> + <package>mono-zeroconf-provider-avahi</package> + <package>monodevelop</package> + <package>monodoc-core</package> + <package>mozilla-nspr</package> + <package>mozilla-nspr-devel</package> + <package>mozilla-nss</package> + <package>mozilla-nss-devel</package> + <package>mozilla-xulrunner192</package> + <package>mozilla-xulrunner192-gnome</package> + <package>mpfr-devel</package> + <package>mpi-selector</package> + <package>mpich</package> + <package>mpich-devel</package> + <package>mysql</package> + <package>mysql-client</package> + <package>nagios</package> + <package>nagios-devel</package> + <package>nagios-www</package> + <package>nant</package> + <package>nautilus</package> + <package>nautilus-cd-burner</package> + <package>nautilus-cd-burner-devel</package> + <package>nautilus-cd-burner-lang</package> + <package>nautilus-devel</package> + <package>nautilus-lang</package> + <package>ndesk-dbus</package> + <package>ndesk-dbus-glib</package> + <package>ndesk-dbus-glib-devel</package> + <package>net-snmp</package> + <package>net-snmp-devel</package> + <package>netatalk</package> + <package>netatalk-devel</package> + <package>netcat-openbsd</package> + <package>newt</package> + <package>newt-devel</package> + <package>newt-static</package> + <package>nfsidmap-devel</package> + <package>notification-daemon</package> + <package>notification-daemon-lang</package> + <package>notify-sharp</package> + <package>nss-mdns</package> + <package>nss-shared-helper-devel</package> + <package>nut</package> + <package>nut-classic</package> + <package>nut-devel</package> + <package>opal</package> + <package>opal-devel</package> + <package>openCryptoki</package> + <package>openCryptoki-64bit</package> + <package>openCryptoki-devel</package> + <package>openct-devel</package> + <package>openhpi</package> + <package>openhpi-daemon</package> + <package>openhpi-devel</package> + <package>openjade</package> + <package>openjade-devel</package> + <package>openldap2-devel</package> + <package>openmotif-devel</package> + <package>openmotif-libs</package> + <package>openmpi</package> + <package>openobex-devel</package> + <package>openobex-glib-devel</package> + <package>opensc-devel</package> + <package>openslp-devel</package> + <package>opensp</package> + <package>opensp-devel</package> + <package>openwsman-client</package> + <package>openwsman-server</package> + <package>orbit</package> + <package>orbit-devel</package> + <package>orbit2-devel</package> + <package>oxygen-icon-theme</package> + <package>oxygen-icon-theme-scalable</package> + <package>ozerocdoff</package> + <package>pam-devel</package> + <package>pango-devel</package> + <package>pangomm-devel</package> + <package>parted-devel</package> + <package>patchutils</package> + <package>pciutils-devel</package> + <package>pcre-devel</package> + <package>pcsc-acr38</package> + <package>pcsc-acr38-devel</package> + <package>pcsc-lite-devel</package> + <package>perl-32bit</package> + <package>perl-Crypt-OpenSSL-RSA</package> + <package>perl-Mail-DKIM</package> + <package>perl-MailTools</package> + <package>perl-Net-DNS</package> + <package>perl-Net-IP</package> + <package>perl-NetAddr-IP</package> + <package>perl-SNMP</package> + <package>perl-Tie-IxHash</package> + <package>perl-Tk</package> + <package>perl-Tk-devel</package> + <package>perl-spamassassin</package> + <package>phonon</package> + <package>phonon-backend-gstreamer-0_10</package> + <package>phonon-devel</package> + <package>php5</package> + <package>php5-ctype</package> + <package>php5-devel</package> + <package>php5-dom</package> + <package>php5-hash</package> + <package>php5-iconv</package> + <package>php5-json</package> + <package>php5-pdo</package> + <package>php5-sqlite</package> + <package>php5-suhosin</package> + <package>php5-tokenizer</package> + <package>php5-xmlreader</package> + <package>php5-xmlwriter</package> + <package>php53</package> + <package>php53-ctype</package> + <package>php53-dom</package> + <package>php53-iconv</package> + <package>php53-json</package> + <package>php53-tokenizer</package> + <package>php53-xmlreader</package> + <package>php53-xmlwriter</package> + <package>pidgin</package> + <package>pidgin-devel</package> + <package>pilot-link</package> + <package>pkcs11-helper</package> + <package>pkcs11-helper-devel</package> + <package>planner</package> + <package>planner-devel</package> + <package>planner-lang</package> + <package>plasma-addons</package> + <package>plasma-theme-aya</package> + <package>plasmoid-networkmanagement</package> + <package>plasmoid-quickaccess</package> + <package>plotutils</package> + <package>poppler-data</package> + <package>poppler-tools</package> + <package>popt-devel</package> + <package>portmap</package> + <package>postfix-devel</package> + <package>postgresql-devel</package> + <package>postgresql-libs</package> + <package>ppp-devel</package> + <package>ppp-userpass</package> + <package>pstoedit</package> + <package>pstoedit-devel</package> + <package>pulseaudio</package> + <package>pulseaudio-esound-compat</package> + <package>pulseaudio-lang</package> + <package>puppet</package> + <package>python-cairo</package> + <package>python-cairo-devel</package> + <package>python-devel</package> + <package>python-gnome</package> + <package>python-gnome-devel</package> + <package>python-gobject2</package> + <package>python-gobject2-devel</package> + <package>python-gtk</package> + <package>python-gtk-devel</package> + <package>python-gtkglext</package> + <package>python-gtkglext-devel</package> + <package>python-gtksourceview</package> + <package>python-gtksourceview-devel</package> + <package>python-numeric</package> + <package>python-numpy</package> + <package>python-orbit</package> + <package>python-orbit-devel</package> + <package>pyxml</package> + <package>qt3</package> + <package>qt3-devel</package> + <package>quagga</package> + <package>quagga-devel</package> + <package>quilt</package> + <package>raptor</package> + <package>rarian</package> + <package>rarian-devel</package> + <package>re2c</package> + <package>readline-devel</package> + <package>recode-devel</package> + <package>rpm-devel</package> + <package>rrdtool</package> + <package>rrdtool-devel</package> + <package>rsyslog</package> + <package>ruby</package> + <package>rubygems</package> + <package>ruby-devel</package> + <package>ruby-doc-html</package> + <package>ruby-doc-ri</package> + <package>ruby-examples</package> + <package>ruby-fcgi</package> + <package>ruby-mysql</package> + <package>ruby-selinux</package> + <package>ruby-test-suite</package> + <package>ruby-tk</package> + <package>sablot</package> + <package>sablot-devel</package> + <package>samba-devel</package> + <package>sane-backends</package> + <package>sane-frontends</package> + <package>sax2-libsax</package> + <package>sax2-libsax-devel</package> + <package>sax2-libsax-perl</package> + <package>sax2-tools</package> + <package>sblim-cmpi-base</package> + <package>sblim-cmpi-base-devel</package> + <package>sblim-cmpi-devel</package> + <package>sblim-cmpiutil-devel</package> + <package>sblim-indication_helper</package> + <package>sblim-sfcb</package> + <package>sblim-sfcc</package> + <package>sblim-sfcc-devel</package> + <package>scim</package> + <package>scim-devel</package> + <package>scpm-devel</package> + <package>scrollkeeper</package> + <package>scrollkeeper-lang</package> + <package>seahorse</package> + <package>seahorse-devel</package> + <package>seahorse-lang</package> + <package>sendmail</package> + <package>sendmail-devel</package> + <package>sg3_utils-devel</package> + <package>sgml-skel</package> + <package>shared-mime-info</package> + <package>silc-toolkit</package> + <package>silc-toolkit-devel</package> + <package>slang</package> + <package>slang-devel</package> + <package>soprano</package> + <package>soprano-backend-redland</package> + <package>spamassassin</package> + <package>speex-devel</package> + <package>splashy-devel</package> + <package>sqlite2</package> + <package>sqlite3-devel</package> + <package>startup-notification</package> + <package>startup-notification-devel</package> + <package>strigi</package> + <package>strigi-devel</package> + <package>subversion</package> + <package>subversion-perl</package> + <package>susehelp</package> + <package>susehelp_cz</package> + <package>susehelp_de</package> + <package>susehelp_en</package> + <package>susehelp_es</package> + <package>susehelp_fr</package> + <package>susehelp_hu</package> + <package>susehelp_it</package> + <package>swig</package> + <package>syslogd</package> + <package>t1lib</package> + <package>t1lib-devel</package> + <package>taglib</package> + <package>taglib-devel</package> + <package>taglib-sharp</package> + <package>tango-icon-theme</package> + <package>tcl-devel</package> + <package>tcpd-devel</package> + <package>telepathy-glib-devel</package> + <package>telepathy-mission-control</package> + <package>telepathy-mission-control-devel</package> + <package>texlive-bin-devel</package> + <package>texlive-devel</package> + <package>tk-devel</package> + <package>tla</package> + <package>tn5250</package> + <package>tn5250-devel</package> + <package>tomoe</package> + <package>tomoe-devel</package> + <package>tomoe-gtk</package> + <package>tomoe-gtk-devel</package> + <package>tomoe-gtk-lang</package> + <package>totem-pl-parser</package> + <package>totem-pl-parser-devel</package> + <package>totem-pl-parser-lang</package> + <package>trousers</package> + <package>trousers-devel</package> + <package>tsclient</package> + <package>tsclient-devel</package> + <package>tsclient-lang</package> + <package>uim</package> + <package>uim-devel</package> + <package>unixODBC</package> + <package>unixODBC-devel</package> + <package>unsermake</package> + <package>update-desktop-files</package> + <package>usb_modeswitch</package> + <package>usb_modeswitch-data</package> + <package>valgrind</package> + <package>valgrind-devel</package> + <package>vte</package> + <package>vte-devel</package> + <package>vte-lang</package> + <package>wdiff</package> + <package>webkit-sharp</package> + <package>wireshark</package> + <package>wireshark-devel</package> + <package>wodim-devel</package> + <package>wordcut</package> + <package>wordcut-devel</package> + <package>words</package> + <package>wpa_supplicant</package> + <package>wvstreams</package> + <package>wvstreams-devel</package> + <package>wxGTK-compat</package> + <package>wxGTK-devel</package> + <package>wxGTK-gl</package> + <package>x11-input-wacom</package> + <package>x11-input-wacom-devel</package> + <package>x11-input-wacom-tools</package> + <package>xalan-j2</package> + <package>xaw3d-devel</package> + <package>xbase</package> + <package>xbase-devel</package> + <package>xdelta</package> + <package>xdelta-devel</package> + <package>xdg-menu</package> + <package>xen-devel</package> + <package>xen-libs</package> + <package>xerces-j2</package> + <package>xerces-j2-bootstrap</package> + <package>xerces-j2-xml-apis</package> + <package>xfsprogs-devel</package> + <package>xml-commons-apis-bootstrap</package> + <package>xml-commons-resolver-bootstrap</package> + <package>xml-commons-which-bootstrap</package> + <package>xmlcharent</package> + <package>xorg-x11</package> + <package>xorg-x11-devel</package> + <package>xorg-x11-fonts</package> + <package>xorg-x11-fonts-core</package> + <package>xorg-x11-fonts-devel</package> + <package>xorg-x11-libICE-devel</package> + <package>xorg-x11-libSM-devel</package> + <package>xorg-x11-libX11-devel</package> + <package>xorg-x11-libXau-devel</package> + <package>xorg-x11-libXdmcp-devel</package> + <package>xorg-x11-libXext-devel</package> + <package>xorg-x11-libXfixes-devel</package> + <package>xorg-x11-libXmu-devel</package> + <package>xorg-x11-libXp-devel</package> + <package>xorg-x11-libXpm-devel</package> + <package>xorg-x11-libXprintUtil-devel</package> + <package>xorg-x11-libXrender-devel</package> + <package>xorg-x11-libXt-devel</package> + <package>xorg-x11-libXv-devel</package> + <package>xorg-x11-libfontenc-devel</package> + <package>xorg-x11-libxcb-devel</package> + <package>xorg-x11-libxkbfile-devel</package> + <package>xorg-x11-proto-devel</package> + <package>xorg-x11-server</package> + <package>xorg-x11-util-devel</package> + <package>xorg-x11-xauth</package> + <package>xorg-x11-xtrans-devel</package> + <package>xosd</package> + <package>xosd-devel</package> + <package>xsp</package> + <package>xterm</package> + <package>xz-devel</package> + <package>yast2-core-devel</package> + <package>yast2-devtools</package> + <package>yast2-gtk</package> + <package>yast2-libyui-devel</package> + <package>yast2-ncurses-devel</package> + <package>yast2-qt</package> + <package>yast2-qt-devel</package> + <package>yast2-qt-pkg</package> + <package>yast2-storage-devel</package> + <package>yast2-ycp-ui-bindings-devel</package> + <package>yelp</package> + <package>yelp-lang</package> + <package>zenity</package> + <package>zenity-lang</package> + <package>zlib-devel</package> + <package>zsh</package> + <package>zvbi-devel</package> + </remove-packages> + + </software> + <user_defaults> + <expire></expire> + <group>100</group> + <groups>video,dialout</groups> + <home>/home</home> + <inactive>-1</inactive> + <shell>/bin/bash</shell> + <skel>/etc/skel</skel> + <umask>022</umask> + </user_defaults> + <users config:type="list"> + <user> + <encrypted config:type="boolean">true</encrypted> + <fullname>vagrant</fullname> + <gid>100</gid> + <home>/home/vagrant</home> + <password_settings> + <expire></expire> + <flag></flag> + <inact></inact> + <max>99999</max> + <min>0</min> + <warn>7</warn> + </password_settings> + <shell>/bin/bash</shell> + <uid>1000</uid> + <user_password>$2y$05$NA1Li9ZKJOLRW5mMTXm6/e5r8dltWS5RpDZpvHrI82aLE00V51tdi</user_password> + <username>vagrant</username> + </user> + <user> + <encrypted config:type="boolean">true</encrypted> + <fullname>Games account</fullname> + <gid>100</gid> + <home>/var/games</home> + <password_settings> + <expire></expire> + <flag></flag> + <inact></inact> + <max></max> + <min></min> + <warn></warn> + </password_settings> + <shell>/bin/bash</shell> + <uid>12</uid> + <user_password>*</user_password> + <username>games</username> + </user> + <user> + <encrypted config:type="boolean">true</encrypted> + <fullname>bin</fullname> + <gid>1</gid> + <home>/bin</home> + <password_settings> + <expire></expire> + <flag></flag> + <inact></inact> + <max></max> + <min></min> + <warn></warn> + </password_settings> + <shell>/bin/bash</shell> + <uid>1</uid> + <user_password>*</user_password> + <username>bin</username> + </user> + <user> + <encrypted config:type="boolean">true</encrypted> + <fullname>nobody</fullname> + <gid>65533</gid> + <home>/var/lib/nobody</home> + <password_settings> + <expire></expire> + <flag></flag> + <inact></inact> + <max></max> + <min></min> + <warn></warn> + </password_settings> + <shell>/bin/bash</shell> + <uid>65534</uid> + <user_password>*</user_password> + <username>nobody</username> + </user> + <user> + <encrypted config:type="boolean">true</encrypted> + <fullname>Printing daemon</fullname> + <gid>7</gid> + <home>/var/spool/lpd</home> + <password_settings> + <expire></expire> + <flag></flag> + <inact></inact> + <max></max> + <min></min> + <warn></warn> + </password_settings> + <shell>/bin/bash</shell> + <uid>4</uid> + <user_password>*</user_password> + <username>lp</username> + </user> + <user> + <encrypted config:type="boolean">true</encrypted> + <fullname>User for uuidd</fullname> + <gid>104</gid> + <home>/var/run/uuidd</home> + <password_settings> + <expire></expire> + <flag></flag> + <inact></inact> + <max>99999</max> + <min>0</min> + <warn>7</warn> + </password_settings> + <shell>/bin/false</shell> + <uid>102</uid> + <user_password>*</user_password> + <username>uuidd</username> + </user> + <user> + <encrypted config:type="boolean">true</encrypted> + <fullname>Postfix Daemon</fullname> + <gid>51</gid> + <home>/var/spool/postfix</home> + <password_settings> + <expire></expire> + <flag></flag> + <inact></inact> + <max>99999</max> + <min>0</min> + <warn>7</warn> + </password_settings> + <shell>/bin/false</shell> + <uid>51</uid> + <user_password>*</user_password> + <username>postfix</username> + </user> + <user> + <encrypted config:type="boolean">true</encrypted> + <fullname>Novell Customer Center User</fullname> + <gid>111</gid> + <home>/var/lib/YaST2/suse-ncc-fakehome</home> + <password_settings> + <expire></expire> + <flag></flag> + <inact></inact> + <max>99999</max> + <min>0</min> + <warn>7</warn> + </password_settings> + <shell>/bin/bash</shell> + <uid>106</uid> + <user_password>*</user_password> + <username>suse-ncc</username> + </user> + <user> + <encrypted config:type="boolean">true</encrypted> + <fullname>FTP account</fullname> + <gid>49</gid> + <home>/srv/ftp</home> + <password_settings> + <expire></expire> + <flag></flag> + <inact></inact> + <max></max> + <min></min> + <warn></warn> + </password_settings> + <shell>/bin/bash</shell> + <uid>40</uid> + <user_password>*</user_password> + <username>ftp</username> + </user> + <user> + <encrypted config:type="boolean">true</encrypted> + <fullname>Gnome Display Manager daemon</fullname> + <gid>112</gid> + <home>/var/lib/gdm</home> + <password_settings> + <expire></expire> + <flag></flag> + <inact></inact> + <max>99999</max> + <min>0</min> + <warn>7</warn> + </password_settings> + <shell>/bin/false</shell> + <uid>107</uid> + <user_password>*</user_password> + <username>gdm</username> + </user> + <user> + <encrypted config:type="boolean">true</encrypted> + <fullname>Batch jobs daemon</fullname> + <gid>25</gid> + <home>/var/spool/atjobs</home> + <password_settings> + <expire></expire> + <flag></flag> + <inact></inact> + <max>99999</max> + <min>0</min> + <warn>7</warn> + </password_settings> + <shell>/bin/bash</shell> + <uid>25</uid> + <user_password>*</user_password> + <username>at</username> + </user> + <user> + <encrypted config:type="boolean">true</encrypted> + <fullname>root</fullname> + <gid>0</gid> + <home>/root</home> + <password_settings> + <expire></expire> + <flag></flag> + <inact></inact> + <max></max> + <min></min> + <warn></warn> + </password_settings> + <shell>/bin/bash</shell> + <uid>0</uid> + <user_password>$2y$05$NA1Li9ZKJOLRW5mMTXm6/e5r8dltWS5RpDZpvHrI82aLE00V51tdi</user_password> + <username>root</username> + </user> + <user> + <encrypted config:type="boolean">true</encrypted> + <fullname>Mailer daemon</fullname> + <gid>12</gid> + <home>/var/spool/clientmqueue</home> + <password_settings> + <expire></expire> + <flag></flag> + <inact></inact> + <max></max> + <min></min> + <warn></warn> + </password_settings> + <shell>/bin/false</shell> + <uid>8</uid> + <user_password>*</user_password> + <username>mail</username> + </user> + <user> + <encrypted config:type="boolean">true</encrypted> + <fullname>Daemon</fullname> + <gid>2</gid> + <home>/sbin</home> + <password_settings> + <expire></expire> + <flag></flag> + <inact></inact> + <max></max> + <min></min> + <warn></warn> + </password_settings> + <shell>/bin/bash</shell> + <uid>2</uid> + <user_password>*</user_password> + <username>daemon</username> + </user> + <user> + <encrypted config:type="boolean">true</encrypted> + <fullname>NTP daemon</fullname> + <gid>108</gid> + <home>/var/lib/ntp</home> + <password_settings> + <expire></expire> + <flag></flag> + <inact></inact> + <max>99999</max> + <min>0</min> + <warn>7</warn> + </password_settings> + <shell>/bin/false</shell> + <uid>74</uid> + <user_password>*</user_password> + <username>ntp</username> + </user> + <user> + <encrypted config:type="boolean">true</encrypted> + <fullname>Unix-to-Unix CoPy system</fullname> + <gid>14</gid> + <home>/etc/uucp</home> + <password_settings> + <expire></expire> + <flag></flag> + <inact></inact> + <max></max> + <min></min> + <warn></warn> + </password_settings> + <shell>/bin/bash</shell> + <uid>10</uid> + <user_password>*</user_password> + <username>uucp</username> + </user> + <user> + <encrypted config:type="boolean">true</encrypted> + <fullname>User for D-Bus</fullname> + <gid>101</gid> + <home>/var/run/dbus</home> + <password_settings> + <expire></expire> + <flag></flag> + <inact></inact> + <max></max> + <min>0</min> + <warn>7</warn> + </password_settings> + <shell>/bin/false</shell> + <uid>100</uid> + <user_password>*</user_password> + <username>messagebus</username> + </user> + <user> + <encrypted config:type="boolean">true</encrypted> + <fullname>User for haldaemon</fullname> + <gid>102</gid> + <home>/var/run/hald</home> + <password_settings> + <expire></expire> + <flag></flag> + <inact></inact> + <max></max> + <min>0</min> + <warn>7</warn> + </password_settings> + <shell>/bin/false</shell> + <uid>101</uid> + <user_password>*</user_password> + <username>haldaemon</username> + </user> + <user> + <encrypted config:type="boolean">true</encrypted> + <fullname>WWW daemon apache</fullname> + <gid>8</gid> + <home>/var/lib/wwwrun</home> + <password_settings> + <expire></expire> + <flag></flag> + <inact></inact> + <max></max> + <min></min> + <warn></warn> + </password_settings> + <shell>/bin/false</shell> + <uid>30</uid> + <user_password>*</user_password> + <username>wwwrun</username> + </user> + <user> + <encrypted config:type="boolean">true</encrypted> + <fullname>Manual pages viewer</fullname> + <gid>62</gid> + <home>/var/cache/man</home> + <password_settings> + <expire></expire> + <flag></flag> + <inact></inact> + <max></max> + <min></min> + <warn></warn> + </password_settings> + <shell>/bin/bash</shell> + <uid>13</uid> + <user_password>*</user_password> + <username>man</username> + </user> + <user> + <encrypted config:type="boolean">true</encrypted> + <fullname>PolicyKit</fullname> + <gid>107</gid> + <home>/var/run/PolicyKit</home> + <password_settings> + <expire></expire> + <flag></flag> + <inact></inact> + <max>99999</max> + <min>0</min> + <warn>7</warn> + </password_settings> + <shell>/bin/false</shell> + <uid>104</uid> + <user_password>*</user_password> + <username>polkituser</username> + </user> + <user> + <encrypted config:type="boolean">true</encrypted> + <fullname>News system</fullname> + <gid>13</gid> + <home>/etc/news</home> + <password_settings> + <expire></expire> + <flag></flag> + <inact></inact> + <max></max> + <min></min> + <warn></warn> + </password_settings> + <shell>/bin/bash</shell> + <uid>9</uid> + <user_password>*</user_password> + <username>news</username> + </user> + <user> + <fullname>SSH daemon</fullname> + <gid>65</gid> + <home>/var/lib/sshd</home> + <shell>/bin/false</shell> + <uid>71</uid> + <username>sshd</username> + </user> + <user> + <encrypted config:type="boolean">true</encrypted> + <fullname>PulseAudio daemon</fullname> + <gid>109</gid> + <home>/var/lib/pulseaudio</home> + <password_settings> + <expire></expire> + <flag></flag> + <inact></inact> + <max>99999</max> + <min>0</min> + <warn>7</warn> + </password_settings> + <shell>/bin/false</shell> + <uid>105</uid> + <user_password>*</user_password> + <username>pulse</username> + </user> + </users> +</profile> diff --git a/packer/http/sles-11/sles-11-sp3-i386-autoinst.xml b/packer/http/sles-11/sles-11-sp3-i386-autoinst.xml new file mode 100644 index 000000000..2cd9ab95a --- /dev/null +++ b/packer/http/sles-11/sles-11-sp3-i386-autoinst.xml @@ -0,0 +1,2562 @@ +<?xml version="1.0"?> +<!DOCTYPE profile> +<profile xmlns="http://www.suse.com/1.0/yast2ns" xmlns:config="http://www.suse.com/1.0/configns"> + <add-on> + <add_on_products config:type="list"> + <listentry> + <media_url><![CDATA[http://demeter.uni-regensburg.de/SLE11SP3-SDK-x86/DVD1/]]></media_url> + <product>sle-sdk</product> + <product_dir>/</product_dir> + </listentry> + </add_on_products> + </add-on> + <bootloader> + <device_map config:type="list"> + <device_map_entry> + <firmware>hd0</firmware> + <linux>/dev/sda</linux> + </device_map_entry> + </device_map> + <global> + <activate>true</activate> + <boot_root>true</boot_root> + <default>SUSE Linux Enterprise Server 11 SP3 - 3.0.76-0.11</default> + <generic_mbr>true</generic_mbr> + <gfxmenu>/boot/message</gfxmenu> + <lines_cache_id>2</lines_cache_id> + <timeout config:type="integer">8</timeout> + </global> + <initrd_modules config:type="list"> + <initrd_module> + <module>ahci</module> + </initrd_module> + <initrd_module> + <module>ata_piix</module> + </initrd_module> + <initrd_module> + <module>ata_generic</module> + </initrd_module> + <initrd_module> + <module>jbd</module> + </initrd_module> + <initrd_module> + <module>mbcache</module> + </initrd_module> + <initrd_module> + <module>ext3</module> + </initrd_module> + </initrd_modules> + <loader_type>grub</loader_type> + <sections config:type="list"> + <section> + <append>resume=/dev/sda1 splash=silent crashkernel=128M-:64M showopts</append> + <image>(hd0,1)/boot/vmlinuz-3.0.76-0.11-default</image> + <initial>1</initial> + <initrd>(hd0,1)/boot/initrd-3.0.76-0.11-default</initrd> + <lines_cache_id>0</lines_cache_id> + <name>SUSE Linux Enterprise Server 11 SP3 - 3.0.76-0.11</name> + <original_name>linux</original_name> + <root>/dev/sda2</root> + <type>image</type> + <vgamode>0x314</vgamode> + </section> + <section> + <append>showopts ide=nodma apm=off noresume edd=off powersaved=off nohz=off highres=off processor.max_cstate=1 nomodeset x11failsafe</append> + <image>(hd0,1)/boot/vmlinuz-3.0.76-0.11-default</image> + <initrd>(hd0,1)/boot/initrd-3.0.76-0.11-default</initrd> + <lines_cache_id>1</lines_cache_id> + <name>Failsafe -- SUSE Linux Enterprise Server 11 SP3 - 3.0.76-0.11</name> + <original_name>failsafe</original_name> + <root>/dev/sda2</root> + <type>image</type> + <vgamode>0x314</vgamode> + </section> + </sections> + </bootloader> + <ca_mgm> + <CAName>YaST_Default_CA</CAName> + <ca_commonName>YaST Default CA (vagrant-sles-11sp3-x86)</ca_commonName> + <country>US</country> + <locality></locality> + <organisation></organisation> + <organisationUnit></organisationUnit> + <password>ENTER PASSWORD HERE</password> + <server_commonName>vagrant-sles-11sp3-x86.vagrantup.com</server_commonName> + <server_email>postmaster@vagrantup.com</server_email> + <state></state> + <takeLocalServerName config:type="boolean">false</takeLocalServerName> + </ca_mgm> + <deploy_image> + <image_installation config:type="boolean">false</image_installation> + </deploy_image> + <general> + <ask-list config:type="list"/> + <mode> + <confirm config:type="boolean">false</confirm> + </mode> + <mouse> + <id>none</id> + </mouse> + <proposals config:type="list"/> + <signature-handling> + <accept_file_without_checksum config:type="boolean">true</accept_file_without_checksum> + <accept_non_trusted_gpg_key config:type="boolean">true</accept_non_trusted_gpg_key> + <accept_unknown_gpg_key config:type="boolean">true</accept_unknown_gpg_key> + <accept_unsigned_file config:type="boolean">true</accept_unsigned_file> + <accept_verification_failed config:type="boolean">false</accept_verification_failed> + <import_gpg_key config:type="boolean">true</import_gpg_key> + </signature-handling> + <storage/> + </general> + <groups config:type="list"> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>100</gid> + <group_password>x</group_password> + <groupname>users</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>19</gid> + <group_password>x</group_password> + <groupname>floppy</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>1</gid> + <group_password>x</group_password> + <groupname>bin</groupname> + <userlist>daemon</userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>41</gid> + <group_password>x</group_password> + <groupname>xok</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>65533</gid> + <group_password>x</group_password> + <groupname>nobody</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>43</gid> + <group_password>x</group_password> + <groupname>modem</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>5</gid> + <group_password>x</group_password> + <groupname>tty</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>7</gid> + <group_password>x</group_password> + <groupname>lp</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>104</gid> + <group_password>!</group_password> + <groupname>uuidd</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>51</gid> + <group_password>!</group_password> + <groupname>postfix</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>112</gid> + <group_password>!</group_password> + <groupname>gdm</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>65534</gid> + <group_password>x</group_password> + <groupname>nogroup</groupname> + <userlist>nobody</userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>101</gid> + <group_password>!</group_password> + <groupname>messagebus</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>59</gid> + <group_password>!</group_password> + <groupname>maildrop</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>33</gid> + <group_password>x</group_password> + <groupname>video</groupname> + <userlist>vagrant</userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>3</gid> + <group_password>x</group_password> + <groupname>sys</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>15</gid> + <group_password>x</group_password> + <groupname>shadow</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>20</gid> + <group_password>x</group_password> + <groupname>cdrom</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>21</gid> + <group_password>x</group_password> + <groupname>console</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>42</gid> + <group_password>x</group_password> + <groupname>trusted</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>102</gid> + <group_password>!</group_password> + <groupname>haldaemon</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>106</gid> + <group_password>!</group_password> + <groupname>puppet</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>16</gid> + <group_password>x</group_password> + <groupname>dialout</groupname> + <userlist>vagrant</userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>107</gid> + <group_password>!</group_password> + <groupname>polkituser</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>10</gid> + <group_password>x</group_password> + <groupname>wheel</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>109</gid> + <group_password>!</group_password> + <groupname>pulse</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>8</gid> + <group_password>x</group_password> + <groupname>www</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>40</gid> + <group_password>x</group_password> + <groupname>games</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>6</gid> + <group_password>x</group_password> + <groupname>disk</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>17</gid> + <group_password>x</group_password> + <groupname>audio</groupname> + <userlist>pulse</userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>111</gid> + <group_password>!</group_password> + <groupname>suse-ncc</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>49</gid> + <group_password>x</group_password> + <groupname>ftp</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>103</gid> + <group_password>!</group_password> + <groupname>tape</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>25</gid> + <group_password>!</group_password> + <groupname>at</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>9</gid> + <group_password>x</group_password> + <groupname>kmem</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>32</gid> + <group_password>x</group_password> + <groupname>public</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>12</gid> + <group_password>x</group_password> + <groupname>mail</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>0</gid> + <group_password>x</group_password> + <groupname>root</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>2</gid> + <group_password>x</group_password> + <groupname>daemon</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>105</gid> + <group_password>!</group_password> + <groupname>sfcb</groupname> + <userlist>root</userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>108</gid> + <group_password>!</group_password> + <groupname>ntp</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>14</gid> + <group_password>x</group_password> + <groupname>uucp</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>110</gid> + <group_password>!</group_password> + <groupname>pulse-access</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>71</gid> + <group_password>!</group_password> + <groupname>ntadmin</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>62</gid> + <group_password>x</group_password> + <groupname>man</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>22</gid> + <group_password>x</group_password> + <groupname>utmp</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>13</gid> + <group_password>x</group_password> + <groupname>news</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>65</gid> + <group_password>!</group_password> + <groupname>sshd</groupname> + <userlist></userlist> + </group> + </groups> + <host> + <hosts config:type="list"> + <hosts_entry> + <host_address>127.0.0.1</host_address> + <names config:type="list"> + <name>localhost</name> + </names> + </hosts_entry> + <hosts_entry> + <host_address>::1</host_address> + <names config:type="list"> + <name>localhost ipv6-localhost ipv6-loopback</name> + </names> + </hosts_entry> + <hosts_entry> + <host_address>fe00::0</host_address> + <names config:type="list"> + <name>ipv6-localnet</name> + </names> + </hosts_entry> + <hosts_entry> + <host_address>ff00::0</host_address> + <names config:type="list"> + <name>ipv6-mcastprefix</name> + </names> + </hosts_entry> + <hosts_entry> + <host_address>ff02::1</host_address> + <names config:type="list"> + <name>ipv6-allnodes</name> + </names> + </hosts_entry> + <hosts_entry> + <host_address>ff02::2</host_address> + <names config:type="list"> + <name>ipv6-allrouters</name> + </names> + </hosts_entry> + <hosts_entry> + <host_address>ff02::3</host_address> + <names config:type="list"> + <name>ipv6-allhosts</name> + </names> + </hosts_entry> + </hosts> + </host> + <login_settings/> + <networking> + <dhcp_options> + <dhclient_client_id></dhclient_client_id> + <dhclient_hostname_option>AUTO</dhclient_hostname_option> + </dhcp_options> + <dns> + <dhcp_hostname config:type="boolean">false</dhcp_hostname> + <domain>vagrantup.com</domain> + <hostname>vagrant-sles-11sp3-x86</hostname> + <resolv_conf_policy>auto</resolv_conf_policy> + <searchlist config:type="list"> + <search>vagrantup.com</search> + </searchlist> + <write_hostname config:type="boolean">true</write_hostname> + </dns> + <interfaces config:type="list"> + <interface> + <bootproto>dhcp</bootproto> + <device>eth0</device> + <startmode>auto</startmode> + <usercontrol>no</usercontrol> + </interface> + </interfaces> + <keep_install_network config:type="boolean">true</keep_install_network> + <managed config:type="boolean">false</managed> + <routing> + <ip_forward config:type="boolean">false</ip_forward> + </routing> + </networking> + <partitioning config:type="list"> + <drive> + <device>/dev/sda</device> + <initialize config:type="boolean">true</initialize> + <partitions config:type="list"> + <partition> + <create config:type="boolean">true</create> + <crypt_fs config:type="boolean">false</crypt_fs> + <filesystem config:type="symbol">swap</filesystem> + <format config:type="boolean">true</format> + <fstopt>defaults</fstopt> + <loop_fs config:type="boolean">false</loop_fs> + <mount>swap</mount> + <mountby config:type="symbol">device</mountby> + <partition_id config:type="integer">130</partition_id> + <partition_nr config:type="integer">1</partition_nr> + <raid_options/> + <resize config:type="boolean">false</resize> + <size>1561492992</size> + </partition> + <partition> + <create config:type="boolean">true</create> + <crypt_fs config:type="boolean">false</crypt_fs> + <filesystem config:type="symbol">ext3</filesystem> + <format config:type="boolean">true</format> + <fstopt>acl,user_xattr</fstopt> + <loop_fs config:type="boolean">false</loop_fs> + <mount>/</mount> + <mountby config:type="symbol">device</mountby> + <partition_id config:type="integer">131</partition_id> + <partition_nr config:type="integer">2</partition_nr> + <raid_options/> + <resize config:type="boolean">false</resize> + <size>19895844352</size> + </partition> + </partitions> + <pesize></pesize> + <type config:type="symbol">CT_DISK</type> + <use>all</use> + </drive> + </partitioning> + <report> + <errors> + <log config:type="boolean">true</log> + <show config:type="boolean">true</show> + <timeout config:type="integer">0</timeout> + </errors> + <messages> + <log config:type="boolean">true</log> + <show config:type="boolean">true</show> + <timeout config:type="integer">0</timeout> + </messages> + <warnings> + <log config:type="boolean">true</log> + <show config:type="boolean">true</show> + <timeout config:type="integer">0</timeout> + </warnings> + <yesno_messages> + <log config:type="boolean">true</log> + <show config:type="boolean">true</show> + <timeout config:type="integer">0</timeout> + </yesno_messages> + </report> + <software> + + <packages config:type="list"> + <package>desktop-translations</package> + <package>gconf2-branding-SLES</package> + <package>libproxy0-config-gnome</package> + <package>sle-sdk-release</package> + <package>sle-sdk-release-SDK</package> + <package>sles-manuals_en</package> + <package>yast2-trans-en_US</package> + </packages> + <patterns config:type="list"> + <pattern>Basis-Devel</pattern> + <pattern>Minimal</pattern> + <pattern>apparmor</pattern> + <pattern>base</pattern> + <pattern>sdk_kernel</pattern> + </patterns> + <remove-packages config:type="list"> + <package>3ddiag</package> + <package>CASA</package> + <package>CASA-devel</package> + <package>CASA_auth_token_client</package> + <package>CASA_auth_token_client-devel</package> + <package>ConsoleKit-devel</package> + <package>ConsoleKit-x11</package> + <package>DirectFB-devel</package> + <package>FastCGI</package> + <package>IlmBase</package> + <package>IlmBase-devel</package> + <package>ImageMagick</package> + <package>ImageMagick-devel</package> + <package>LibVNCServer</package> + <package>LibVNCServer-devel</package> + <package>Mesa</package> + <package>Mesa-devel</package> + <package>ModemManager</package> + <package>Modules</package> + <package>NetworkManager</package> + <package>NetworkManager-devel</package> + <package>NetworkManager-glib</package> + <package>NetworkManager-gnome</package> + <package>NetworkManager-kde4</package> + <package>NetworkManager-kde4-lang</package> + <package>NetworkManager-kde4-libs</package> + <package>OpenEXR</package> + <package>OpenEXR-devel</package> + <package>OpenIPMI-devel</package> + <package>PackageKit</package> + <package>PackageKit-devel</package> + <package>PackageKit-lang</package> + <package>PolicyKit-devel</package> + <package>PolicyKit-gnome</package> + <package>PolicyKit-gnome-devel</package> + <package>PolicyKit-gnome-libs</package> + <package>SDL-devel</package> + <package>SDL_net</package> + <package>SDL_net-devel</package> + <package>TeX-Guy</package> + <package>TeX-Guy-devel</package> + <package>VFlib3</package> + <package>VFlib3-devel</package> + <package>WindowMaker</package> + <package>WindowMaker-devel</package> + <package>a2ps</package> + <package>aalib</package> + <package>aalib-devel</package> + <package>akonadi-runtime</package> + <package>akregator</package> + <package>alsa-devel</package> + <package>alsa-firmware</package> + <package>alsa-plugins-pulse</package> + <package>alsa-tools</package> + <package>alsa-tools-devel</package> + <package>anthy</package> + <package>anthy-devel</package> + <package>antlr</package> + <package>apache2</package> + <package>apache2-devel</package> + <package>apache2-mod_perl</package> + <package>apache2-mod_perl-devel</package> + <package>apache2-prefork</package> + <package>apache2-utils</package> + <package>apache2-worker</package> + <package>apparmor-profile-editor</package> + <package>art-sharp2</package> + <package>arts</package> + <package>arts-devel</package> + <package>aspell-devel</package> + <package>at-spi</package> + <package>at-spi-devel</package> + <package>at-spi-lang</package> + <package>atk-devel</package> + <package>audiofile</package> + <package>audiofile-devel</package> + <package>audit-devel</package> + <package>augeas-lenses</package> + <package>automoc4</package> + <package>avahi</package> + <package>avahi-compat-howl-devel</package> + <package>avahi-compat-mDNSResponder-devel</package> + <package>avahi-lang</package> + <package>babl-0_0</package> + <package>banshee-1</package> + <package>banshee-1-backend-engine-gstreamer</package> + <package>banshee-1-backend-platform-gnome</package> + <package>banshee-1-backend-platform-unix</package> + <package>banshee-1-devel</package> + <package>banshee-1-extensions-default</package> + <package>banshee-1-lang</package> + <package>beagle-devel</package> + <package>bind-devel</package> + <package>binutils-devel</package> + <package>bluez</package> + <package>bluez-devel</package> + <package>boo</package> + <package>boo-devel</package> + <package>boost-devel</package> + <package>bootsplash-branding-SLED</package> + <package>cairo-devel</package> + <package>cairomm</package> + <package>cairomm-devel</package> + <package>canna</package> + <package>canna-devel</package> + <package>canna-libs</package> + <package>cannadic</package> + <package>capi4linux</package> + <package>capi4linux-devel</package> + <package>cdk</package> + <package>cdk-devel</package> + <package>cdrdao</package> + <package>chasen</package> + <package>chasen-devel</package> + <package>check</package> + <package>check-devel</package> + <package>chmlib</package> + <package>chmlib-devel</package> + <package>cim-schema</package> + <package>clucene-core</package> + <package>clucene-core-devel</package> + <package>cmake</package> + <package>compiz</package> + <package>compiz-branding-SLE</package> + <package>compiz-devel</package> + <package>compiz-gnome</package> + <package>coolkey-devel</package> + <package>cracklib-devel</package> + <package>crash-devel</package> + <package>crimson</package> + <package>cscope</package> + <package>cups</package> + <package>cups-devel</package> + <package>cvsps</package> + <package>cyrus-imapd-devel</package> + <package>cyrus-sasl-crammd5</package> + <package>cyrus-sasl-devel</package> + <package>dante</package> + <package>dante-devel</package> + <package>db1</package> + <package>db1-devel</package> + <package>db43</package> + <package>db43-devel</package> + <package>dbus-1-devel</package> + <package>dbus-1-glib-devel</package> + <package>dbus-1-python-devel</package> + <package>dbus-1-qt3</package> + <package>dbus-1-qt3-devel</package> + <package>dbus-1-x11</package> + <package>dejagnu</package> + <package>dejavu</package> + <package>desktop-data-openSUSE</package> + <package>desktop-file-utils</package> + <package>devhelp</package> + <package>devhelp-devel</package> + <package>devhelp-lang</package> + <package>device-mapper-devel</package> + <package>dhcp</package> + <package>dhcp-client</package> + <package>dhcp-devel</package> + <package>diffstat</package> + <package>dmapi-devel</package> + <package>dnsmasq</package> + <package>docbook-xsl-stylesheets</package> + <package>docbook_4</package> + <package>doxygen</package> + <package>dvd+rw-tools</package> + <package>e2fsprogs-devel</package> + <package>emacs</package> + <package>emacs-nox</package> + <package>emacs-x11</package> + <package>enchant</package> + <package>enchant-devel</package> + <package>enscript</package> + <package>eog</package> + <package>eog-devel</package> + <package>eog-lang</package> + <package>espeak</package> + <package>evince</package> + <package>evince-devel</package> + <package>evince-lang</package> + <package>evoldap2-devel</package> + <package>evolution</package> + <package>evolution-data-server</package> + <package>evolution-data-server-devel</package> + <package>evolution-data-server-lang</package> + <package>evolution-devel</package> + <package>evolution-lang</package> + <package>expect-devel</package> + <package>facter</package> + <package>fam</package> + <package>fam-devel</package> + <package>farsight</package> + <package>farsight-devel</package> + <package>festival</package> + <package>festival-devel</package> + <package>fftw</package> + <package>fftw-devel</package> + <package>fftw-mpi</package> + <package>fftw-mpi-devel</package> + <package>fftw-threads</package> + <package>fftw-threads-devel</package> + <package>fftw3</package> + <package>fftw3-devel</package> + <package>fftw3-threads</package> + <package>fftw3-threads-devel</package> + <package>file-devel</package> + <package>fileshareset</package> + <package>finch</package> + <package>finch-devel</package> + <package>flac-devel</package> + <package>fltk</package> + <package>fltk-devel</package> + <package>fontconfig-devel</package> + <package>fonts-config</package> + <package>foomatic-filters</package> + <package>freeglut</package> + <package>freeglut-devel</package> + <package>freeradius-client-devel</package> + <package>freeradius-client-libs</package> + <package>freeradius-server-devel</package> + <package>freeradius-server-libs</package> + <package>freetype</package> + <package>freetype2-devel</package> + <package>fribidi</package> + <package>fribidi-devel</package> + <package>ft2demos</package> + <package>fuse-devel</package> + <package>fwnn-devel</package> + <package>fxload</package> + <package>gcc-gij</package> + <package>gcc-java</package> + <package>gcc43-gij</package> + <package>gcc43-java</package> + <package>gconf-sharp2</package> + <package>gconf2-devel</package> + <package>gconfmm</package> + <package>gconfmm-devel</package> + <package>gd</package> + <package>gd-devel</package> + <package>gdbm-32bit</package> + <package>gdk-pixbuf</package> + <package>gdk-pixbuf-devel</package> + <package>gegl-0_0</package> + <package>gettext-tools</package> + <package>gfxboot-branding-SLED</package> + <package>gfxboot-devel</package> + <package>ggz</package> + <package>ggz-client-libs</package> + <package>ggz-client-libs-devel</package> + <package>ggz-client-libs-lang</package> + <package>ghex</package> + <package>ghex-devel</package> + <package>ghex-lang</package> + <package>ghostscript-devel</package> + <package>ghostscript-fonts-other</package> + <package>ghostscript-fonts-std</package> + <package>ghostscript-ijs-devel</package> + <package>ghostscript-library</package> + <package>ghostscript-omni</package> + <package>ghostscript-x11</package> + <package>giflib-devel</package> + <package>gimp</package> + <package>gimp-branding-SLED</package> + <package>gimp-devel</package> + <package>gimp-lang</package> + <package>gimp-plugins-python</package> + <package>git</package> + <package>git-arch</package> + <package>git-core</package> + <package>git-cvs</package> + <package>git-daemon</package> + <package>git-email</package> + <package>git-gui</package> + <package>git-svn</package> + <package>git-web</package> + <package>gitk</package> + <package>gjdoc</package> + <package>glade-sharp2</package> + <package>glade3</package> + <package>glade3-lang</package> + <package>glib</package> + <package>glib-devel</package> + <package>glib-sharp2</package> + <package>glib2-devel</package> + <package>glibmm2</package> + <package>glibmm2-devel</package> + <package>glitz</package> + <package>glitz-devel</package> + <package>gltt</package> + <package>gltt-devel</package> + <package>gmime-2_4-devel</package> + <package>gmime-devel</package> + <package>gmp-devel</package> + <package>gnet</package> + <package>gnet-devel</package> + <package>gnokii</package> + <package>gnokii-devel</package> + <package>gnokii-smsd</package> + <package>gnome-certauth-devel</package> + <package>gnome-control-center</package> + <package>gnome-control-center-devel</package> + <package>gnome-control-center-lang</package> + <package>gnome-desktop</package> + <package>gnome-desktop-devel</package> + <package>gnome-desktop-lang</package> + <package>gnome-doc-utils</package> + <package>gnome-doc-utils-devel</package> + <package>gnome-doc-utils-lang</package> + <package>gnome-keyring-devel</package> + <package>gnome-keyring-sharp</package> + <package>gnome-keyring-sharp-devel</package> + <package>gnome-libs</package> + <package>gnome-libs-devel</package> + <package>gnome-mag</package> + <package>gnome-mag-devel</package> + <package>gnome-mag-lang</package> + <package>gnome-main-menu</package> + <package>gnome-main-menu-lang</package> + <package>gnome-media</package> + <package>gnome-media-devel</package> + <package>gnome-media-lang</package> + <package>gnome-menus</package> + <package>gnome-menus-branding-SLED</package> + <package>gnome-menus-devel</package> + <package>gnome-menus-lang</package> + <package>gnome-mount</package> + <package>gnome-mount-lang</package> + <package>gnome-panel</package> + <package>gnome-panel-devel</package> + <package>gnome-panel-lang</package> + <package>gnome-pilot</package> + <package>gnome-pilot-devel</package> + <package>gnome-pilot-lang</package> + <package>gnome-settings-daemon</package> + <package>gnome-settings-daemon-devel</package> + <package>gnome-settings-daemon-lang</package> + <package>gnome-sharp2</package> + <package>gnome-speech</package> + <package>gnome-speech-devel</package> + <package>gnome-themes</package> + <package>gnome-utils</package> + <package>gnome-utils-devel</package> + <package>gnome-utils-lang</package> + <package>gnome-vfs-sharp2</package> + <package>gnome-vfs2</package> + <package>gnome-vfs2-devel</package> + <package>gnome-vfs2-lang</package> + <package>gnome-vfsmm</package> + <package>gnome-vfsmm-devel</package> + <package>gnopernicus</package> + <package>gnopernicus-devel</package> + <package>gnopernicus-lang</package> + <package>gnutls</package> + <package>goffice</package> + <package>goffice-devel</package> + <package>goffice-lang</package> + <package>goocanvas</package> + <package>goocanvas-devel</package> + <package>goocanvas-lang</package> + <package>goom2k4</package> + <package>goom2k4-devel</package> + <package>graphviz</package> + <package>graphviz-devel</package> + <package>graphviz-gd</package> + <package>graphviz-gnome</package> + <package>gstreamer-0_10</package> + <package>gstreamer-0_10-devel</package> + <package>gstreamer-0_10-lang</package> + <package>gstreamer-0_10-plugins-base</package> + <package>gstreamer-0_10-plugins-base-devel</package> + <package>gstreamer-0_10-plugins-base-lang</package> + <package>gstreamer-0_10-plugins-good</package> + <package>gstreamer-0_10-plugins-good-lang</package> + <package>gstreamer-0_10-utils</package> + <package>gstreamer-utils</package> + <package>gtk</package> + <package>gtk-devel</package> + <package>gtk-lang</package> + <package>gtk-sharp2</package> + <package>gtk-vnc-devel</package> + <package>gtk2-devel</package> + <package>gtkglext</package> + <package>gtkglext-devel</package> + <package>gtkhtml2</package> + <package>gtkhtml2-devel</package> + <package>gtkhtml2-lang</package> + <package>gtkhtml314-sharp</package> + <package>gtkmm2</package> + <package>gtkmm2-devel</package> + <package>gtksourceview-devel</package> + <package>gtksourceview-lang</package> + <package>gtksourceview18</package> + <package>gtksourceview18-devel</package> + <package>gtkspell</package> + <package>gtkspell-devel</package> + <package>gtkspell-lang</package> + <package>gucharmap</package> + <package>gucharmap-devel</package> + <package>gucharmap-lang</package> + <package>guile</package> + <package>guile-devel</package> + <package>gutenprint</package> + <package>gutenprint-devel</package> + <package>gvfs-devel</package> + <package>gxmhtml</package> + <package>hal-devel</package> + <package>hal-palm</package> + <package>htdig</package> + <package>htdig-devel</package> + <package>hunspell</package> + <package>hunspell-devel</package> + <package>hunspell-tools</package> + <package>hwinfo-devel</package> + <package>i4l-base</package> + <package>icewm</package> + <package>icewm-lite</package> + <package>id3lib</package> + <package>id3lib-devel</package> + <package>imap-devel</package> + <package>imap-lib</package> + <package>imlib</package> + <package>imlib-devel</package> + <package>imlib2</package> + <package>imlib2-devel</package> + <package>indent</package> + <package>info2html</package> + <package>inn</package> + <package>inn-devel</package> + <package>intltool</package> + <package>ipadic</package> + <package>iptables-devel</package> + <package>iso-codes</package> + <package>iso-codes-devel</package> + <package>iso_ent</package> + <package>ispell</package> + <package>ispell-american</package> + <package>ispell-brazilian</package> + <package>ispell-british</package> + <package>ispell-czech</package> + <package>ispell-danish</package> + <package>ispell-finnish</package> + <package>ispell-french</package> + <package>ispell-german</package> + <package>ispell-hungarian</package> + <package>ispell-italian</package> + <package>ispell-ngerman</package> + <package>ispell-norsk</package> + <package>ispell-polish</package> + <package>ispell-portuguese</package> + <package>ispell-russian</package> + <package>ispell-slovak</package> + <package>ispell-spanish</package> + <package>ispell-swedish</package> + <package>itcl-devel</package> + <package>java-1_4_2-ibm</package> + <package>java-1_4_2-ibm-devel</package> + <package>java-1_5_0-gcj-compat</package> + <package>java-1_5_0-gcj-compat-devel</package> + <package>java-1_6_0-ibm</package> + <package>java-1_6_0-ibm-devel</package> + <package>joe</package> + <package>jpackage-utils</package> + <package>k3b</package> + <package>k3b-devel</package> + <package>k3b-lang</package> + <package>kaddressbook</package> + <package>kalarm</package> + <package>kde-susetranslations</package> + <package>kde4-filesystem</package> + <package>kde4-kgreeter-plugins</package> + <package>kdebase3</package> + <package>kdebase3-devel</package> + <package>kdebase3-runtime</package> + <package>kdebase4-SLED</package> + <package>kdebase4-SLED-lang</package> + <package>kdebase4-runtime</package> + <package>kdebase4-runtime-branding-SLED</package> + <package>kdebase4-workspace</package> + <package>kdebase4-workspace-branding-SLED</package> + <package>kdebase4-workspace-devel</package> + <package>kdebase4-workspace-ksysguardd</package> + <package>kdelibs3</package> + <package>kdelibs3-arts</package> + <package>kdelibs3-default-style</package> + <package>kdelibs3-devel</package> + <package>kdelibs3-doc</package> + <package>kdelibs4</package> + <package>kdelibs4-branding-SLED</package> + <package>kdelibs4-core</package> + <package>kdelibs4-doc</package> + <package>kdemultimedia3-arts</package> + <package>kdepim3</package> + <package>kdepim4</package> + <package>kdepim4-devel</package> + <package>kdepimlibs4</package> + <package>kdialog</package> + <package>kdm</package> + <package>kdm-branding-SLED</package> + <package>kernel-docs</package> + <package>kernel-syms</package> + <package>kernel-trace-devel</package> + <package>kernel-xen-devel</package> + <package>keyutils-devel</package> + <package>kio_sysinfo</package> + <package>kio_sysinfo-branding-SLED</package> + <package>kmail</package> + <package>knode</package> + <package>kontact</package> + <package>korganizer</package> + <package>kpilot</package> + <package>krb5-devel</package> + <package>ksh-devel</package> + <package>ktorrent</package> + <package>ktorrent-devel</package> + <package>ktorrent-lang</package> + <package>kwin</package> + <package>ladspa-devel</package> + <package>lib3ds-1-3</package> + <package>lib3ds-devel</package> + <package>libFLAC++6</package> + <package>libFLAC8</package> + <package>libHX-devel</package> + <package>libMagick++-devel</package> + <package>libMagick++1</package> + <package>libMagickWand1</package> + <package>libQtWebKit-devel</package> + <package>libQtWebKit4</package> + <package>libXerces-c-devel</package> + <package>libXerces-c28</package> + <package>libXiterm</package> + <package>libXiterm-devel</package> + <package>libacl-devel</package> + <package>libadns-devel</package> + <package>libadns1</package> + <package>libakode</package> + <package>libakode-devel</package> + <package>libakonadi4</package> + <package>libakonadiprotocolinternals-devel</package> + <package>libakonadiprotocolinternals1</package> + <package>libao</package> + <package>libao-devel</package> + <package>libapparmor-devel</package> + <package>libapr-util1</package> + <package>libapr-util1-devel</package> + <package>libapr1</package> + <package>libapr1-devel</package> + <package>libarchive-devel</package> + <package>libart_lgpl</package> + <package>libart_lgpl-devel</package> + <package>libassuan-devel</package> + <package>libatomic-ops-devel</package> + <package>libattr-devel</package> + <package>libavahi-core5</package> + <package>libavahi-devel</package> + <package>libavahi-glib-devel</package> + <package>libavahi-gobject-devel</package> + <package>libavahi-gobject0</package> + <package>libavahi-ui0</package> + <package>libavc1394-0</package> + <package>libavc1394-devel</package> + <package>libbabl-0_0-0</package> + <package>libbeagle-devel</package> + <package>libbeagle-python</package> + <package>libbeagle1</package> + <package>libbitmask-devel</package> + <package>libbitmask1</package> + <package>libblkid-devel</package> + <package>libblocxx-devel</package> + <package>libbonobo</package> + <package>libbonobo-devel</package> + <package>libbonobo-lang</package> + <package>libbonoboui</package> + <package>libbonoboui-devel</package> + <package>libbonoboui-lang</package> + <package>libboost_date_time1_36_0</package> + <package>libboost_filesystem1_36_0</package> + <package>libboost_graph1_36_0</package> + <package>libboost_iostreams1_36_0</package> + <package>libboost_math1_36_0</package> + <package>libboost_mpi1_36_0</package> + <package>libboost_program_options1_36_0</package> + <package>libboost_python1_36_0</package> + <package>libboost_serialization1_36_0</package> + <package>libboost_signals1_36_0</package> + <package>libboost_system1_36_0</package> + <package>libboost_test1_36_0</package> + <package>libboost_thread1_36_0</package> + <package>libboost_wave1_36_0</package> + <package>libbotan-1_6_4</package> + <package>libbotan-devel</package> + <package>libbtctl</package> + <package>libbtctl-devel</package> + <package>libbtctl-lang</package> + <package>libbtctl4</package> + <package>libbz2-devel</package> + <package>libcaca</package> + <package>libcaca-devel</package> + <package>libcanberra-gtk</package> + <package>libcanberra-gtk0</package> + <package>libcanberra0</package> + <package>libcap-devel</package> + <package>libcap-ng0</package> + <package>libcdda_interface0</package> + <package>libcdda_paranoia0</package> + <package>libcddb-devel</package> + <package>libcddb2</package> + <package>libcdio++0</package> + <package>libcdio-devel</package> + <package>libcgroup-devel</package> + <package>libcgroup1</package> + <package>libchewing</package> + <package>libchewing-devel</package> + <package>libcmpiutil</package> + <package>libcmpiutil-devel</package> + <package>libcolorblind0</package> + <package>libcom_err-devel</package> + <package>libcompizconfig</package> + <package>libcompizconfig-devel</package> + <package>libcppunit-1_12-0</package> + <package>libcppunit-devel</package> + <package>libcpuset-devel</package> + <package>libcpuset1</package> + <package>libcroco</package> + <package>libcroco-0_6-3</package> + <package>libcroco-devel</package> + <package>libcryptsetup-devel</package> + <package>libcsync-devel</package> + <package>libcsync0</package> + <package>libcurl-devel</package> + <package>libdaemon-devel</package> + <package>libdaemon0</package> + <package>libdatrie-devel</package> + <package>libdatrie0</package> + <package>libdb-4_5-32bit</package> + <package>libdb-4_5-devel</package> + <package>libdbus-1-qt3-0</package> + <package>libdbus-1-qt3-0-devel</package> + <package>libdc1394-22</package> + <package>libdc1394-devel</package> + <package>libdc1394_control12</package> + <package>libdc1394_control12-devel</package> + <package>libdhcp6client-1_0-2</package> + <package>libdhcp6client-devel</package> + <package>libdigikam-devel</package> + <package>libdiscid1</package> + <package>libdjvulibre-devel</package> + <package>libdjvulibre21</package> + <package>libdmxview-devel</package> + <package>libdmxview0</package> + <package>libdnet-devel</package> + <package>libdnet1</package> + <package>libdns_sd</package> + <package>libdrm</package> + <package>libdrm-devel</package> + <package>libdv-devel</package> + <package>libdv4</package> + <package>libdvdread4</package> + <package>libdw-devel</package> + <package>libebl-devel</package> + <package>libedit-devel</package> + <package>libedit0</package> + <package>libelf-devel</package> + <package>libenchant1</package> + <package>libesd-devel</package> + <package>libesd0</package> + <package>libesmtp-devel</package> + <package>libevoldap-2_4-2</package> + <package>libevtlog-devel</package> + <package>libevtlog0</package> + <package>libexempi-devel</package> + <package>libexempi3</package> + <package>libexif-devel</package> + <package>libexiv2-4</package> + <package>libexiv2-devel</package> + <package>libexpat-devel</package> + <package>libext2fs-devel</package> + <package>libfarsight-0_1-3</package> + <package>libffi-devel</package> + <package>libffi43</package> + <package>libffi43-devel</package> + <package>libflaim-devel</package> + <package>libfprint-devel</package> + <package>libfreebl3</package> + <package>libfreebob</package> + <package>libfreebob-devel</package> + <package>libgadu</package> + <package>libgadu-devel</package> + <package>libgail-gnome</package> + <package>libgail-gnome-devel</package> + <package>libgcj-devel</package> + <package>libgcj43</package> + <package>libgcj43-devel</package> + <package>libgcj43-jar</package> + <package>libgcj_bc43</package> + <package>libgcrypt-devel</package> + <package>libgda-3_0-3</package> + <package>libgda-3_0-devel</package> + <package>libgdiplus0</package> + <package>libgegl-0_0-0</package> + <package>libgeoclue0</package> + <package>libgfortran46</package> + <package>libggz2</package> + <package>libggz2-devel</package> + <package>libgimpprint</package> + <package>libgimpprint-devel</package> + <package>libglade2</package> + <package>libglade2-devel</package> + <package>libglademm</package> + <package>libglademm-2_4-1</package> + <package>libglademm-devel</package> + <package>libgladeui-1-9</package> + <package>libgladeui-1_0-devel</package> + <package>libgmime-2_0-3</package> + <package>libgmime-2_4-2</package> + <package>libgmm++-devel</package> + <package>libgnome</package> + <package>libgnome-certauth0</package> + <package>libgnome-desktop-2-11</package> + <package>libgnome-devel</package> + <package>libgnome-lang</package> + <package>libgnome-menu2</package> + <package>libgnome-window-settings1</package> + <package>libgnomecanvas</package> + <package>libgnomecanvas-devel</package> + <package>libgnomecanvas-lang</package> + <package>libgnomecanvasmm</package> + <package>libgnomecanvasmm-devel</package> + <package>libgnomecups</package> + <package>libgnomecups-devel</package> + <package>libgnomecups-lang</package> + <package>libgnomedb</package> + <package>libgnomedb-devel</package> + <package>libgnomedb-lang</package> + <package>libgnomekbd</package> + <package>libgnomekbd-devel</package> + <package>libgnomekbd-lang</package> + <package>libgnomeprint</package> + <package>libgnomeprint-devel</package> + <package>libgnomeprint-lang</package> + <package>libgnomeprintui</package> + <package>libgnomeprintui-devel</package> + <package>libgnomeprintui-lang</package> + <package>libgnomesu</package> + <package>libgnomesu-devel</package> + <package>libgnomesu-lang</package> + <package>libgnomesu0</package> + <package>libgnomeui</package> + <package>libgnomeui-devel</package> + <package>libgnomeui-lang</package> + <package>libgnomevfsmm-2_6-1</package> + <package>libgnutls-devel</package> + <package>libgnutls-extra-devel</package> + <package>libgnutls-extra26</package> + <package>libgoocanvas3</package> + <package>libgpg-error-devel</package> + <package>libgpgme-devel</package> + <package>libgphoto2-devel</package> + <package>libgpod-devel</package> + <package>libgsf</package> + <package>libgsf-1-114</package> + <package>libgsf-devel</package> + <package>libgsf-gnome</package> + <package>libgsm-devel</package> + <package>libgsm1</package> + <package>libgssglue-devel</package> + <package>libgstapp-0_10-0</package> + <package>libgstinterfaces-0_10-0</package> + <package>libgstreamer-0_10-0</package> + <package>libgtk-vnc-1_0-0</package> + <package>libgtkhtml</package> + <package>libgtkhtml-devel</package> + <package>libgtksourceview-2_0-0</package> + <package>libgtop</package> + <package>libgtop-2_0-7</package> + <package>libgtop-devel</package> + <package>libgtop-lang</package> + <package>libgudev-1_0-0</package> + <package>libgweather</package> + <package>libgweather-devel</package> + <package>libgweather-lang</package> + <package>libgweather1</package> + <package>libhangul</package> + <package>libhangul-devel</package> + <package>libhowl0</package> + <package>libical-devel</package> + <package>libical0</package> + <package>libicu-devel</package> + <package>libid3tag</package> + <package>libid3tag-devel</package> + <package>libidl-devel</package> + <package>libidn-devel</package> + <package>libiec61883</package> + <package>libiec61883-devel</package> + <package>libieee1284</package> + <package>libiniparser-devel</package> + <package>libiniparser0</package> + <package>libiptcdata</package> + <package>libiptcdata-devel</package> + <package>libiptcdata0</package> + <package>libiso9660-5</package> + <package>libiterm</package> + <package>libiterm-devel</package> + <package>libjack-devel</package> + <package>libjack0</package> + <package>libjasper</package> + <package>libjasper-devel</package> + <package>libjingle-0_3-0</package> + <package>libjingle-devel</package> + <package>libjpeg-devel</package> + <package>libkcal</package> + <package>libkcal-devel</package> + <package>libkcal2</package> + <package>libkcddb4</package> + <package>libkcddb4-devel</package> + <package>libkcompactdisc4</package> + <package>libkcompactdisc4-devel</package> + <package>libkdcraw3</package> + <package>libkdcraw3-devel</package> + <package>libkdcraw3-lang</package> + <package>libkde4</package> + <package>libkde4-devel</package> + <package>libkdecore4</package> + <package>libkdecore4-devel</package> + <package>libkdepim4</package> + <package>libkdepim4-devel</package> + <package>libkdepimlibs4</package> + <package>libkdepimlibs4-devel</package> + <package>libkexiv2-3</package> + <package>libkexiv2-3-devel</package> + <package>libkexiv2-7</package> + <package>libkipi-devel</package> + <package>libkipi6</package> + <package>libkmime-devel</package> + <package>libkmime2</package> + <package>libknotificationitem-1-1</package> + <package>libkonq-devel</package> + <package>libkonq5</package> + <package>libksba-devel</package> + <package>libktnef-devel</package> + <package>libktnef1</package> + <package>liblazy-devel</package> + <package>liblazy1</package> + <package>liblcms-devel</package> + <package>libldapcpp-devel</package> + <package>liblog4c-devel</package> + <package>liblog4c3</package> + <package>libloudmouth-1-0</package> + <package>liblpsolve55</package> + <package>liblua5_1</package> + <package>libmalaga-devel</package> + <package>libmalaga7</package> + <package>libmcrypt</package> + <package>libmcrypt-devel</package> + <package>libmikmod</package> + <package>libmikmod-devel</package> + <package>libmm-devel</package> + <package>libmm14</package> + <package>libmng-devel</package> + <package>libmpcdec-devel</package> + <package>libmpcdec5</package> + <package>libmspack-devel</package> + <package>libmtp-devel</package> + <package>libmtp8</package> + <package>libmusicbrainz-devel</package> + <package>libmusicbrainz3-6</package> + <package>libmusicbrainz3-devel</package> + <package>libmusicbrainz4</package> + <package>libmysqlclient-devel</package> + <package>libmysqlclient15</package> + <package>libmysqlclient_r15</package> + <package>libneon-devel</package> + <package>libneon27</package> + <package>libnetapi-devel</package> + <package>libnetapi0</package> + <package>libnetcontrol0</package> + <package>libnetpbm-devel</package> + <package>libnetpbm10</package> + <package>libnewt0_52</package> + <package>libnjb</package> + <package>libnjb-devel</package> + <package>libnjb5</package> + <package>libnl-devel</package> + <package>libnotify</package> + <package>libnotify-devel</package> + <package>libnotify1</package> + <package>libnscd-devel</package> + <package>libnsssharedhelper0</package> + <package>libnuma-devel</package> + <package>libofa-devel</package> + <package>libofa0</package> + <package>libogg-devel</package> + <package>libogg0</package> + <package>liboil</package> + <package>liboil-devel</package> + <package>libopenbabel-devel</package> + <package>libopenbabel3</package> + <package>libopencdk-devel</package> + <package>libopencdk10</package> + <package>libopenraw-devel</package> + <package>libopenraw1</package> + <package>libopenssl-devel</package> + <package>libopensync</package> + <package>libopensync-devel</package> + <package>libopensync-plugin-evolution2</package> + <package>libopensync-plugin-evolution2-devel</package> + <package>libopensync-plugin-palm</package> + <package>libopensync-plugin-palm-devel</package> + <package>liborc-0_4-0</package> + <package>libosip2</package> + <package>libosip2-devel</package> + <package>libotf</package> + <package>libotf-devel</package> + <package>libotr-devel</package> + <package>libotr2</package> + <package>libp11-1</package> + <package>libp11-devel</package> + <package>libpackagekit-glib10</package> + <package>libpackagekit-glib10-devel</package> + <package>libpangomm-1_4-1</package> + <package>libpcap-devel</package> + <package>libpciaccess0</package> + <package>libpciaccess0-devel</package> + <package>libphonon4</package> + <package>libpisock-devel</package> + <package>libpisock9</package> + <package>libpisync-devel</package> + <package>libpisync1</package> + <package>libpixman-1-0-devel</package> + <package>libpkcs11-helper1</package> + <package>libpng-devel</package> + <package>libpolkit-qt0</package> + <package>libpoppler-devel</package> + <package>libpoppler-glib-devel</package> + <package>libpoppler-glib4</package> + <package>libpoppler-qt2</package> + <package>libpoppler-qt3-devel</package> + <package>libpoppler-qt4-3</package> + <package>libpoppler-qt4-devel</package> + <package>libpoppler5</package> + <package>libpst4</package> + <package>libpt2</package> + <package>libpt2-devel</package> + <package>libpulse-browse0</package> + <package>libpulse-devel</package> + <package>libpulse-mainloop-glib0</package> + <package>libpulse0</package> + <package>libpurple</package> + <package>libpurple-devel</package> + <package>libpurple-lang</package> + <package>libqca2</package> + <package>libqca2-devel</package> + <package>libqdialogsolver1</package> + <package>libqdialogsolver1-devel</package> + <package>libqimageblitz-devel</package> + <package>libqimageblitz4</package> + <package>libqscintilla-devel</package> + <package>libqscintilla2-5</package> + <package>libqt4</package> + <package>libqt4-devel</package> + <package>libqt4-qt3support</package> + <package>libqt4-sql</package> + <package>libqt4-sql-mysql</package> + <package>libqt4-sql-postgresql</package> + <package>libqt4-sql-sqlite</package> + <package>libqt4-sql-unixODBC</package> + <package>libqt4-x11</package> + <package>libqtpod-devel</package> + <package>libqtpod0</package> + <package>libquadmath46</package> + <package>libquicktime</package> + <package>libquicktime-devel</package> + <package>libraptor-devel</package> + <package>libraptor1</package> + <package>librasqal-devel</package> + <package>librasqal1</package> + <package>libraw1394-11</package> + <package>libraw1394-8</package> + <package>libraw1394-devel</package> + <package>libredland-devel</package> + <package>libredland0</package> + <package>libreiserfs-devel</package> + <package>libreoffice</package> + <package>libreoffice-base</package> + <package>libreoffice-branding-SLED</package> + <package>libreoffice-branding-upstream</package> + <package>libreoffice-calc</package> + <package>libreoffice-icon-themes</package> + <package>libreoffice-impress</package> + <package>libreoffice-sdk</package> + <package>libreoffice-writer</package> + <package>librsvg</package> + <package>librsvg-devel</package> + <package>libsamplerate</package> + <package>libsamplerate-devel</package> + <package>libsatsolver-devel</package> + <package>libsblim-cmpiutil1</package> + <package>libselinux-devel</package> + <package>libsemanage-devel</package> + <package>libsemanage1</package> + <package>libsensors3-devel</package> + <package>libsensors4</package> + <package>libsepol-devel</package> + <package>libsexy</package> + <package>libsexy-devel</package> + <package>libshout-devel</package> + <package>libshout3</package> + <package>libsidplay1</package> + <package>libsidplay1-devel</package> + <package>libsigc++2</package> + <package>libsigc++2-devel</package> + <package>libslab-lang</package> + <package>libslab0</package> + <package>libsmbclient-devel</package> + <package>libsmbios-devel</package> + <package>libsmbsharemodes-devel</package> + <package>libsmbsharemodes0</package> + <package>libsndfile</package> + <package>libsndfile-devel</package> + <package>libsoprano-devel</package> + <package>libsoprano4</package> + <package>libsoup-devel</package> + <package>libspectre-devel</package> + <package>libspectre1</package> + <package>libspeex</package> + <package>libssh2-devel</package> + <package>libstrigi0</package> + <package>libstroke</package> + <package>libstroke-devel</package> + <package>libsyncml-devel</package> + <package>libsyncml0</package> + <package>libtalloc-devel</package> + <package>libtasn1-devel</package> + <package>libtdb-devel</package> + <package>libtelepathy</package> + <package>libtelepathy-devel</package> + <package>libtelepathy-glib0</package> + <package>libtheora-devel</package> + <package>libtheora0</package> + <package>libtidy</package> + <package>libtidy-devel</package> + <package>libtiff-devel</package> + <package>libtirpc-devel</package> + <package>libtomoe-gtk0</package> + <package>libtspi1</package> + <package>libtunepimp</package> + <package>libtunepimp-devel</package> + <package>libtunepimp5</package> + <package>libudev-devel</package> + <package>libudf0</package> + <package>libunique-1_0-0</package> + <package>libunwind</package> + <package>libunwind-devel</package> + <package>libupsclient1</package> + <package>libusb-devel</package> + <package>libusbpp-0_1-4</package> + <package>libustr-1_0-1</package> + <package>libustr-devel</package> + <package>libuuid-devel</package> + <package>libvirt-client</package> + <package>libvirt-devel</package> + <package>libvisual</package> + <package>libvisual-devel</package> + <package>libvoikko-devel</package> + <package>libvoikko1</package> + <package>libvorbis</package> + <package>libvorbis-devel</package> + <package>libwavpack1</package> + <package>libwbclient-devel</package> + <package>libwbxml2-0</package> + <package>libwbxml2-devel</package> + <package>libwebkit-1_0-1</package> + <package>libwebkit-1_0-2</package> + <package>libwebkit-devel</package> + <package>libwebkit-lang</package> + <package>libwmf</package> + <package>libwmf-devel</package> + <package>libwmf-gnome</package> + <package>libwnck</package> + <package>libwnck-1-22</package> + <package>libwnck-devel</package> + <package>libwnck-lang</package> + <package>libwpd-0_8-8</package> + <package>libwpd-devel</package> + <package>libwpg-0_1-1</package> + <package>libwpg-devel</package> + <package>libwps-0_1-1</package> + <package>libwps-devel</package> + <package>libwsman-devel</package> + <package>libwsman1</package> + <package>libxcrypt-devel</package> + <package>libxine-devel</package> + <package>libxine1</package> + <package>libxklavier-devel</package> + <package>libxklavier15</package> + <package>libxml2-devel</package> + <package>libxslt-devel</package> + <package>libyajl1</package> + <package>libzio-devel</package> + <package>libzip-devel</package> + <package>libzip1</package> + <package>libzvbi0</package> + <package>libzypp-devel</package> + <package>limal-apparmor-notifications</package> + <package>limal-apparmor-notifications-devel</package> + <package>limal-ca-mgm-devel</package> + <package>limal-devel</package> + <package>limal-devtools</package> + <package>limal-nfs-server-devel</package> + <package>linux-atm-devel</package> + <package>linux-atm-lib</package> + <package>lksctp-tools</package> + <package>lksctp-tools-devel</package> + <package>loudmouth-devel</package> + <package>lua</package> + <package>lua-devel</package> + <package>lzo-devel</package> + <package>m17n-db</package> + <package>m17n-lib</package> + <package>m17n-lib-devel</package> + <package>malaga-suomi</package> + <package>meanwhile</package> + <package>meanwhile-devel</package> + <package>metacity</package> + <package>metacity-devel</package> + <package>metacity-lang</package> + <package>mhash</package> + <package>mhash-devel</package> + <package>misc-console-font</package> + <package>mono-addins</package> + <package>mono-basic</package> + <package>mono-core</package> + <package>mono-data</package> + <package>mono-data-oracle</package> + <package>mono-data-sqlite</package> + <package>mono-devel</package> + <package>mono-extras</package> + <package>mono-jscript</package> + <package>mono-tools</package> + <package>mono-wcf</package> + <package>mono-web</package> + <package>mono-winforms</package> + <package>mono-zeroconf</package> + <package>mono-zeroconf-provider-avahi</package> + <package>monodevelop</package> + <package>monodoc-core</package> + <package>mozilla-nspr</package> + <package>mozilla-nspr-devel</package> + <package>mozilla-nss</package> + <package>mozilla-nss-devel</package> + <package>mozilla-xulrunner192</package> + <package>mozilla-xulrunner192-gnome</package> + <package>mpfr-devel</package> + <package>mpi-selector</package> + <package>mpich</package> + <package>mpich-devel</package> + <package>mysql</package> + <package>mysql-client</package> + <package>nagios</package> + <package>nagios-devel</package> + <package>nagios-www</package> + <package>nant</package> + <package>nautilus</package> + <package>nautilus-cd-burner</package> + <package>nautilus-cd-burner-devel</package> + <package>nautilus-cd-burner-lang</package> + <package>nautilus-devel</package> + <package>nautilus-lang</package> + <package>ndesk-dbus</package> + <package>ndesk-dbus-glib</package> + <package>ndesk-dbus-glib-devel</package> + <package>net-snmp</package> + <package>net-snmp-devel</package> + <package>netatalk</package> + <package>netatalk-devel</package> + <package>netcat-openbsd</package> + <package>newt</package> + <package>newt-devel</package> + <package>newt-static</package> + <package>nfsidmap-devel</package> + <package>notification-daemon</package> + <package>notification-daemon-lang</package> + <package>notify-sharp</package> + <package>nss-mdns</package> + <package>nss-shared-helper-devel</package> + <package>nut</package> + <package>nut-classic</package> + <package>nut-devel</package> + <package>opal</package> + <package>opal-devel</package> + <package>openCryptoki</package> + <package>openCryptoki-64bit</package> + <package>openCryptoki-devel</package> + <package>openct-devel</package> + <package>openhpi</package> + <package>openhpi-daemon</package> + <package>openhpi-devel</package> + <package>openjade</package> + <package>openjade-devel</package> + <package>openldap2-devel</package> + <package>openmotif-devel</package> + <package>openmotif-libs</package> + <package>openmpi</package> + <package>openobex-devel</package> + <package>openobex-glib-devel</package> + <package>opensc-devel</package> + <package>openslp-devel</package> + <package>opensp</package> + <package>opensp-devel</package> + <package>openwsman-client</package> + <package>openwsman-server</package> + <package>orbit</package> + <package>orbit-devel</package> + <package>orbit2-devel</package> + <package>oxygen-icon-theme</package> + <package>oxygen-icon-theme-scalable</package> + <package>ozerocdoff</package> + <package>pam-devel</package> + <package>pango-devel</package> + <package>pangomm-devel</package> + <package>parted-devel</package> + <package>patchutils</package> + <package>pciutils-devel</package> + <package>pcre-devel</package> + <package>pcsc-acr38</package> + <package>pcsc-acr38-devel</package> + <package>pcsc-lite-devel</package> + <package>perl-32bit</package> + <package>perl-Crypt-OpenSSL-RSA</package> + <package>perl-Mail-DKIM</package> + <package>perl-MailTools</package> + <package>perl-Net-DNS</package> + <package>perl-Net-IP</package> + <package>perl-NetAddr-IP</package> + <package>perl-SNMP</package> + <package>perl-Tie-IxHash</package> + <package>perl-Tk</package> + <package>perl-Tk-devel</package> + <package>perl-spamassassin</package> + <package>phonon</package> + <package>phonon-backend-gstreamer-0_10</package> + <package>phonon-devel</package> + <package>php5</package> + <package>php5-ctype</package> + <package>php5-devel</package> + <package>php5-dom</package> + <package>php5-hash</package> + <package>php5-iconv</package> + <package>php5-json</package> + <package>php5-pdo</package> + <package>php5-sqlite</package> + <package>php5-suhosin</package> + <package>php5-tokenizer</package> + <package>php5-xmlreader</package> + <package>php5-xmlwriter</package> + <package>php53</package> + <package>php53-ctype</package> + <package>php53-dom</package> + <package>php53-iconv</package> + <package>php53-json</package> + <package>php53-tokenizer</package> + <package>php53-xmlreader</package> + <package>php53-xmlwriter</package> + <package>pidgin</package> + <package>pidgin-devel</package> + <package>pilot-link</package> + <package>pkcs11-helper</package> + <package>pkcs11-helper-devel</package> + <package>planner</package> + <package>planner-devel</package> + <package>planner-lang</package> + <package>plasma-addons</package> + <package>plasma-theme-aya</package> + <package>plasmoid-networkmanagement</package> + <package>plasmoid-quickaccess</package> + <package>plotutils</package> + <package>poppler-data</package> + <package>poppler-tools</package> + <package>popt-devel</package> + <package>portmap</package> + <package>postfix-devel</package> + <package>postgresql-devel</package> + <package>postgresql-libs</package> + <package>ppp-devel</package> + <package>ppp-userpass</package> + <package>pstoedit</package> + <package>pstoedit-devel</package> + <package>pulseaudio</package> + <package>pulseaudio-esound-compat</package> + <package>pulseaudio-lang</package> + <package>puppet</package> + <package>python-cairo</package> + <package>python-cairo-devel</package> + <package>python-devel</package> + <package>python-gnome</package> + <package>python-gnome-devel</package> + <package>python-gobject2</package> + <package>python-gobject2-devel</package> + <package>python-gtk</package> + <package>python-gtk-devel</package> + <package>python-gtkglext</package> + <package>python-gtkglext-devel</package> + <package>python-gtksourceview</package> + <package>python-gtksourceview-devel</package> + <package>python-numeric</package> + <package>python-numpy</package> + <package>python-orbit</package> + <package>python-orbit-devel</package> + <package>pyxml</package> + <package>qt3</package> + <package>qt3-devel</package> + <package>quagga</package> + <package>quagga-devel</package> + <package>quilt</package> + <package>raptor</package> + <package>rarian</package> + <package>rarian-devel</package> + <package>re2c</package> + <package>readline-devel</package> + <package>recode-devel</package> + <package>rpm-devel</package> + <package>rrdtool</package> + <package>rrdtool-devel</package> + <package>rsyslog</package> + <package>ruby</package> + <package>rubygems</package> + <package>ruby-devel</package> + <package>ruby-doc-html</package> + <package>ruby-doc-ri</package> + <package>ruby-examples</package> + <package>ruby-fcgi</package> + <package>ruby-mysql</package> + <package>ruby-selinux</package> + <package>ruby-test-suite</package> + <package>ruby-tk</package> + <package>sablot</package> + <package>sablot-devel</package> + <package>samba-devel</package> + <package>sane-backends</package> + <package>sane-frontends</package> + <package>sax2-libsax</package> + <package>sax2-libsax-devel</package> + <package>sax2-libsax-perl</package> + <package>sax2-tools</package> + <package>sblim-cmpi-base</package> + <package>sblim-cmpi-base-devel</package> + <package>sblim-cmpi-devel</package> + <package>sblim-cmpiutil-devel</package> + <package>sblim-indication_helper</package> + <package>sblim-sfcb</package> + <package>sblim-sfcc</package> + <package>sblim-sfcc-devel</package> + <package>scim</package> + <package>scim-devel</package> + <package>scpm-devel</package> + <package>scrollkeeper</package> + <package>scrollkeeper-lang</package> + <package>seahorse</package> + <package>seahorse-devel</package> + <package>seahorse-lang</package> + <package>sendmail</package> + <package>sendmail-devel</package> + <package>sg3_utils-devel</package> + <package>sgml-skel</package> + <package>shared-mime-info</package> + <package>silc-toolkit</package> + <package>silc-toolkit-devel</package> + <package>slang</package> + <package>slang-devel</package> + <package>soprano</package> + <package>soprano-backend-redland</package> + <package>spamassassin</package> + <package>speex-devel</package> + <package>splashy-devel</package> + <package>sqlite2</package> + <package>sqlite3-devel</package> + <package>startup-notification</package> + <package>startup-notification-devel</package> + <package>strigi</package> + <package>strigi-devel</package> + <package>subversion</package> + <package>subversion-perl</package> + <package>susehelp</package> + <package>susehelp_cz</package> + <package>susehelp_de</package> + <package>susehelp_en</package> + <package>susehelp_es</package> + <package>susehelp_fr</package> + <package>susehelp_hu</package> + <package>susehelp_it</package> + <package>swig</package> + <package>syslogd</package> + <package>t1lib</package> + <package>t1lib-devel</package> + <package>taglib</package> + <package>taglib-devel</package> + <package>taglib-sharp</package> + <package>tango-icon-theme</package> + <package>tcl-devel</package> + <package>tcpd-devel</package> + <package>telepathy-glib-devel</package> + <package>telepathy-mission-control</package> + <package>telepathy-mission-control-devel</package> + <package>texlive-bin-devel</package> + <package>texlive-devel</package> + <package>tk-devel</package> + <package>tla</package> + <package>tn5250</package> + <package>tn5250-devel</package> + <package>tomoe</package> + <package>tomoe-devel</package> + <package>tomoe-gtk</package> + <package>tomoe-gtk-devel</package> + <package>tomoe-gtk-lang</package> + <package>totem-pl-parser</package> + <package>totem-pl-parser-devel</package> + <package>totem-pl-parser-lang</package> + <package>trousers</package> + <package>trousers-devel</package> + <package>tsclient</package> + <package>tsclient-devel</package> + <package>tsclient-lang</package> + <package>uim</package> + <package>uim-devel</package> + <package>unixODBC</package> + <package>unixODBC-devel</package> + <package>unsermake</package> + <package>update-desktop-files</package> + <package>usb_modeswitch</package> + <package>usb_modeswitch-data</package> + <package>valgrind</package> + <package>valgrind-devel</package> + <package>vte</package> + <package>vte-devel</package> + <package>vte-lang</package> + <package>wdiff</package> + <package>webkit-sharp</package> + <package>wireshark</package> + <package>wireshark-devel</package> + <package>wodim-devel</package> + <package>wordcut</package> + <package>wordcut-devel</package> + <package>words</package> + <package>wpa_supplicant</package> + <package>wvstreams</package> + <package>wvstreams-devel</package> + <package>wxGTK-compat</package> + <package>wxGTK-devel</package> + <package>wxGTK-gl</package> + <package>x11-input-wacom</package> + <package>x11-input-wacom-devel</package> + <package>x11-input-wacom-tools</package> + <package>xalan-j2</package> + <package>xaw3d-devel</package> + <package>xbase</package> + <package>xbase-devel</package> + <package>xdelta</package> + <package>xdelta-devel</package> + <package>xdg-menu</package> + <package>xen-devel</package> + <package>xen-libs</package> + <package>xerces-j2</package> + <package>xerces-j2-bootstrap</package> + <package>xerces-j2-xml-apis</package> + <package>xfsprogs-devel</package> + <package>xml-commons-apis-bootstrap</package> + <package>xml-commons-resolver-bootstrap</package> + <package>xml-commons-which-bootstrap</package> + <package>xmlcharent</package> + <package>xorg-x11</package> + <package>xorg-x11-devel</package> + <package>xorg-x11-fonts</package> + <package>xorg-x11-fonts-core</package> + <package>xorg-x11-fonts-devel</package> + <package>xorg-x11-libICE-devel</package> + <package>xorg-x11-libSM-devel</package> + <package>xorg-x11-libX11-devel</package> + <package>xorg-x11-libXau-devel</package> + <package>xorg-x11-libXdmcp-devel</package> + <package>xorg-x11-libXext-devel</package> + <package>xorg-x11-libXfixes-devel</package> + <package>xorg-x11-libXmu-devel</package> + <package>xorg-x11-libXp-devel</package> + <package>xorg-x11-libXpm-devel</package> + <package>xorg-x11-libXprintUtil-devel</package> + <package>xorg-x11-libXrender-devel</package> + <package>xorg-x11-libXt-devel</package> + <package>xorg-x11-libXv-devel</package> + <package>xorg-x11-libfontenc-devel</package> + <package>xorg-x11-libxcb-devel</package> + <package>xorg-x11-libxkbfile-devel</package> + <package>xorg-x11-proto-devel</package> + <package>xorg-x11-server</package> + <package>xorg-x11-util-devel</package> + <package>xorg-x11-xauth</package> + <package>xorg-x11-xtrans-devel</package> + <package>xosd</package> + <package>xosd-devel</package> + <package>xsp</package> + <package>xterm</package> + <package>xz-devel</package> + <package>yast2-core-devel</package> + <package>yast2-devtools</package> + <package>yast2-gtk</package> + <package>yast2-libyui-devel</package> + <package>yast2-ncurses-devel</package> + <package>yast2-qt</package> + <package>yast2-qt-devel</package> + <package>yast2-qt-pkg</package> + <package>yast2-storage-devel</package> + <package>yast2-ycp-ui-bindings-devel</package> + <package>yelp</package> + <package>yelp-lang</package> + <package>zenity</package> + <package>zenity-lang</package> + <package>zlib-devel</package> + <package>zsh</package> + <package>zvbi-devel</package> + </remove-packages> + + </software> + <user_defaults> + <expire></expire> + <group>100</group> + <groups>video,dialout</groups> + <home>/home</home> + <inactive>-1</inactive> + <shell>/bin/bash</shell> + <skel>/etc/skel</skel> + <umask>022</umask> + </user_defaults> + <users config:type="list"> + <user> + <encrypted config:type="boolean">true</encrypted> + <fullname>vagrant</fullname> + <gid>100</gid> + <home>/home/vagrant</home> + <password_settings> + <expire></expire> + <flag></flag> + <inact></inact> + <max>99999</max> + <min>0</min> + <warn>7</warn> + </password_settings> + <shell>/bin/bash</shell> + <uid>1000</uid> + <user_password>$2y$05$NA1Li9ZKJOLRW5mMTXm6/e5r8dltWS5RpDZpvHrI82aLE00V51tdi</user_password> + <username>vagrant</username> + </user> + <user> + <encrypted config:type="boolean">true</encrypted> + <fullname>Games account</fullname> + <gid>100</gid> + <home>/var/games</home> + <password_settings> + <expire></expire> + <flag></flag> + <inact></inact> + <max></max> + <min></min> + <warn></warn> + </password_settings> + <shell>/bin/bash</shell> + <uid>12</uid> + <user_password>*</user_password> + <username>games</username> + </user> + <user> + <encrypted config:type="boolean">true</encrypted> + <fullname>bin</fullname> + <gid>1</gid> + <home>/bin</home> + <password_settings> + <expire></expire> + <flag></flag> + <inact></inact> + <max></max> + <min></min> + <warn></warn> + </password_settings> + <shell>/bin/bash</shell> + <uid>1</uid> + <user_password>*</user_password> + <username>bin</username> + </user> + <user> + <encrypted config:type="boolean">true</encrypted> + <fullname>nobody</fullname> + <gid>65533</gid> + <home>/var/lib/nobody</home> + <password_settings> + <expire></expire> + <flag></flag> + <inact></inact> + <max></max> + <min></min> + <warn></warn> + </password_settings> + <shell>/bin/bash</shell> + <uid>65534</uid> + <user_password>*</user_password> + <username>nobody</username> + </user> + <user> + <encrypted config:type="boolean">true</encrypted> + <fullname>Printing daemon</fullname> + <gid>7</gid> + <home>/var/spool/lpd</home> + <password_settings> + <expire></expire> + <flag></flag> + <inact></inact> + <max></max> + <min></min> + <warn></warn> + </password_settings> + <shell>/bin/bash</shell> + <uid>4</uid> + <user_password>*</user_password> + <username>lp</username> + </user> + <user> + <encrypted config:type="boolean">true</encrypted> + <fullname>User for uuidd</fullname> + <gid>104</gid> + <home>/var/run/uuidd</home> + <password_settings> + <expire></expire> + <flag></flag> + <inact></inact> + <max>99999</max> + <min>0</min> + <warn>7</warn> + </password_settings> + <shell>/bin/false</shell> + <uid>102</uid> + <user_password>*</user_password> + <username>uuidd</username> + </user> + <user> + <encrypted config:type="boolean">true</encrypted> + <fullname>Postfix Daemon</fullname> + <gid>51</gid> + <home>/var/spool/postfix</home> + <password_settings> + <expire></expire> + <flag></flag> + <inact></inact> + <max>99999</max> + <min>0</min> + <warn>7</warn> + </password_settings> + <shell>/bin/false</shell> + <uid>51</uid> + <user_password>*</user_password> + <username>postfix</username> + </user> + <user> + <encrypted config:type="boolean">true</encrypted> + <fullname>Novell Customer Center User</fullname> + <gid>111</gid> + <home>/var/lib/YaST2/suse-ncc-fakehome</home> + <password_settings> + <expire></expire> + <flag></flag> + <inact></inact> + <max>99999</max> + <min>0</min> + <warn>7</warn> + </password_settings> + <shell>/bin/bash</shell> + <uid>106</uid> + <user_password>*</user_password> + <username>suse-ncc</username> + </user> + <user> + <encrypted config:type="boolean">true</encrypted> + <fullname>FTP account</fullname> + <gid>49</gid> + <home>/srv/ftp</home> + <password_settings> + <expire></expire> + <flag></flag> + <inact></inact> + <max></max> + <min></min> + <warn></warn> + </password_settings> + <shell>/bin/bash</shell> + <uid>40</uid> + <user_password>*</user_password> + <username>ftp</username> + </user> + <user> + <encrypted config:type="boolean">true</encrypted> + <fullname>Gnome Display Manager daemon</fullname> + <gid>112</gid> + <home>/var/lib/gdm</home> + <password_settings> + <expire></expire> + <flag></flag> + <inact></inact> + <max>99999</max> + <min>0</min> + <warn>7</warn> + </password_settings> + <shell>/bin/false</shell> + <uid>107</uid> + <user_password>*</user_password> + <username>gdm</username> + </user> + <user> + <encrypted config:type="boolean">true</encrypted> + <fullname>Batch jobs daemon</fullname> + <gid>25</gid> + <home>/var/spool/atjobs</home> + <password_settings> + <expire></expire> + <flag></flag> + <inact></inact> + <max>99999</max> + <min>0</min> + <warn>7</warn> + </password_settings> + <shell>/bin/bash</shell> + <uid>25</uid> + <user_password>*</user_password> + <username>at</username> + </user> + <user> + <encrypted config:type="boolean">true</encrypted> + <fullname>root</fullname> + <gid>0</gid> + <home>/root</home> + <password_settings> + <expire></expire> + <flag></flag> + <inact></inact> + <max></max> + <min></min> + <warn></warn> + </password_settings> + <shell>/bin/bash</shell> + <uid>0</uid> + <user_password>$2y$05$NA1Li9ZKJOLRW5mMTXm6/e5r8dltWS5RpDZpvHrI82aLE00V51tdi</user_password> + <username>root</username> + </user> + <user> + <encrypted config:type="boolean">true</encrypted> + <fullname>Mailer daemon</fullname> + <gid>12</gid> + <home>/var/spool/clientmqueue</home> + <password_settings> + <expire></expire> + <flag></flag> + <inact></inact> + <max></max> + <min></min> + <warn></warn> + </password_settings> + <shell>/bin/false</shell> + <uid>8</uid> + <user_password>*</user_password> + <username>mail</username> + </user> + <user> + <encrypted config:type="boolean">true</encrypted> + <fullname>Daemon</fullname> + <gid>2</gid> + <home>/sbin</home> + <password_settings> + <expire></expire> + <flag></flag> + <inact></inact> + <max></max> + <min></min> + <warn></warn> + </password_settings> + <shell>/bin/bash</shell> + <uid>2</uid> + <user_password>*</user_password> + <username>daemon</username> + </user> + <user> + <encrypted config:type="boolean">true</encrypted> + <fullname>NTP daemon</fullname> + <gid>108</gid> + <home>/var/lib/ntp</home> + <password_settings> + <expire></expire> + <flag></flag> + <inact></inact> + <max>99999</max> + <min>0</min> + <warn>7</warn> + </password_settings> + <shell>/bin/false</shell> + <uid>74</uid> + <user_password>*</user_password> + <username>ntp</username> + </user> + <user> + <encrypted config:type="boolean">true</encrypted> + <fullname>Unix-to-Unix CoPy system</fullname> + <gid>14</gid> + <home>/etc/uucp</home> + <password_settings> + <expire></expire> + <flag></flag> + <inact></inact> + <max></max> + <min></min> + <warn></warn> + </password_settings> + <shell>/bin/bash</shell> + <uid>10</uid> + <user_password>*</user_password> + <username>uucp</username> + </user> + <user> + <encrypted config:type="boolean">true</encrypted> + <fullname>User for D-Bus</fullname> + <gid>101</gid> + <home>/var/run/dbus</home> + <password_settings> + <expire></expire> + <flag></flag> + <inact></inact> + <max></max> + <min>0</min> + <warn>7</warn> + </password_settings> + <shell>/bin/false</shell> + <uid>100</uid> + <user_password>*</user_password> + <username>messagebus</username> + </user> + <user> + <encrypted config:type="boolean">true</encrypted> + <fullname>User for haldaemon</fullname> + <gid>102</gid> + <home>/var/run/hald</home> + <password_settings> + <expire></expire> + <flag></flag> + <inact></inact> + <max></max> + <min>0</min> + <warn>7</warn> + </password_settings> + <shell>/bin/false</shell> + <uid>101</uid> + <user_password>*</user_password> + <username>haldaemon</username> + </user> + <user> + <encrypted config:type="boolean">true</encrypted> + <fullname>WWW daemon apache</fullname> + <gid>8</gid> + <home>/var/lib/wwwrun</home> + <password_settings> + <expire></expire> + <flag></flag> + <inact></inact> + <max></max> + <min></min> + <warn></warn> + </password_settings> + <shell>/bin/false</shell> + <uid>30</uid> + <user_password>*</user_password> + <username>wwwrun</username> + </user> + <user> + <encrypted config:type="boolean">true</encrypted> + <fullname>Manual pages viewer</fullname> + <gid>62</gid> + <home>/var/cache/man</home> + <password_settings> + <expire></expire> + <flag></flag> + <inact></inact> + <max></max> + <min></min> + <warn></warn> + </password_settings> + <shell>/bin/bash</shell> + <uid>13</uid> + <user_password>*</user_password> + <username>man</username> + </user> + <user> + <encrypted config:type="boolean">true</encrypted> + <fullname>PolicyKit</fullname> + <gid>107</gid> + <home>/var/run/PolicyKit</home> + <password_settings> + <expire></expire> + <flag></flag> + <inact></inact> + <max>99999</max> + <min>0</min> + <warn>7</warn> + </password_settings> + <shell>/bin/false</shell> + <uid>104</uid> + <user_password>*</user_password> + <username>polkituser</username> + </user> + <user> + <encrypted config:type="boolean">true</encrypted> + <fullname>News system</fullname> + <gid>13</gid> + <home>/etc/news</home> + <password_settings> + <expire></expire> + <flag></flag> + <inact></inact> + <max></max> + <min></min> + <warn></warn> + </password_settings> + <shell>/bin/bash</shell> + <uid>9</uid> + <user_password>*</user_password> + <username>news</username> + </user> + <user> + <fullname>SSH daemon</fullname> + <gid>65</gid> + <home>/var/lib/sshd</home> + <shell>/bin/false</shell> + <uid>71</uid> + <username>sshd</username> + </user> + <user> + <encrypted config:type="boolean">true</encrypted> + <fullname>PulseAudio daemon</fullname> + <gid>109</gid> + <home>/var/lib/pulseaudio</home> + <password_settings> + <expire></expire> + <flag></flag> + <inact></inact> + <max>99999</max> + <min>0</min> + <warn>7</warn> + </password_settings> + <shell>/bin/false</shell> + <uid>105</uid> + <user_password>*</user_password> + <username>pulse</username> + </user> + </users> +</profile> diff --git a/packer/http/sles-11/sles-11-sp3-x86_64-autoinst.xml b/packer/http/sles-11/sles-11-sp3-x86_64-autoinst.xml new file mode 100644 index 000000000..db505ac8b --- /dev/null +++ b/packer/http/sles-11/sles-11-sp3-x86_64-autoinst.xml @@ -0,0 +1,2562 @@ +<?xml version="1.0"?> +<!DOCTYPE profile> +<profile xmlns="http://www.suse.com/1.0/yast2ns" xmlns:config="http://www.suse.com/1.0/configns"> + <add-on> + <add_on_products config:type="list"> + <listentry> + <media_url><![CDATA[http://demeter.uni-regensburg.de/SLE11SP3-SDK-x64/DVD1/]]></media_url> + <product>sle-sdk</product> + <product_dir>/</product_dir> + </listentry> + </add_on_products> + </add-on> + <bootloader> + <device_map config:type="list"> + <device_map_entry> + <firmware>hd0</firmware> + <linux>/dev/sda</linux> + </device_map_entry> + </device_map> + <global> + <activate>true</activate> + <boot_root>true</boot_root> + <default>SUSE Linux Enterprise Server 11 SP3 - 3.0.76-0.11</default> + <generic_mbr>true</generic_mbr> + <gfxmenu>/boot/message</gfxmenu> + <lines_cache_id>2</lines_cache_id> + <timeout config:type="integer">8</timeout> + </global> + <initrd_modules config:type="list"> + <initrd_module> + <module>ahci</module> + </initrd_module> + <initrd_module> + <module>ata_piix</module> + </initrd_module> + <initrd_module> + <module>ata_generic</module> + </initrd_module> + <initrd_module> + <module>jbd</module> + </initrd_module> + <initrd_module> + <module>mbcache</module> + </initrd_module> + <initrd_module> + <module>ext3</module> + </initrd_module> + </initrd_modules> + <loader_type>grub</loader_type> + <sections config:type="list"> + <section> + <append>resume=/dev/sda1 splash=silent crashkernel=128M-:64M showopts</append> + <image>(hd0,1)/boot/vmlinuz-3.0.76-0.11-default</image> + <initial>1</initial> + <initrd>(hd0,1)/boot/initrd-3.0.76-0.11-default</initrd> + <lines_cache_id>0</lines_cache_id> + <name>SUSE Linux Enterprise Server 11 SP3 - 3.0.76-0.11</name> + <original_name>linux</original_name> + <root>/dev/sda2</root> + <type>image</type> + <vgamode>0x314</vgamode> + </section> + <section> + <append>showopts ide=nodma apm=off noresume edd=off powersaved=off nohz=off highres=off processor.max_cstate=1 nomodeset x11failsafe</append> + <image>(hd0,1)/boot/vmlinuz-3.0.76-0.11-default</image> + <initrd>(hd0,1)/boot/initrd-3.0.76-0.11-default</initrd> + <lines_cache_id>1</lines_cache_id> + <name>Failsafe -- SUSE Linux Enterprise Server 11 SP3 - 3.0.76-0.11</name> + <original_name>failsafe</original_name> + <root>/dev/sda2</root> + <type>image</type> + <vgamode>0x314</vgamode> + </section> + </sections> + </bootloader> + <ca_mgm> + <CAName>YaST_Default_CA</CAName> + <ca_commonName>YaST Default CA (vagrant-sles-11sp3-x64)</ca_commonName> + <country>US</country> + <locality></locality> + <organisation></organisation> + <organisationUnit></organisationUnit> + <password>ENTER PASSWORD HERE</password> + <server_commonName>vagrant-sles-11sp3-x64.vagrantup.com</server_commonName> + <server_email>postmaster@vagrantup.com</server_email> + <state></state> + <takeLocalServerName config:type="boolean">false</takeLocalServerName> + </ca_mgm> + <deploy_image> + <image_installation config:type="boolean">false</image_installation> + </deploy_image> + <general> + <ask-list config:type="list"/> + <mode> + <confirm config:type="boolean">false</confirm> + </mode> + <mouse> + <id>none</id> + </mouse> + <proposals config:type="list"/> + <signature-handling> + <accept_file_without_checksum config:type="boolean">true</accept_file_without_checksum> + <accept_non_trusted_gpg_key config:type="boolean">true</accept_non_trusted_gpg_key> + <accept_unknown_gpg_key config:type="boolean">true</accept_unknown_gpg_key> + <accept_unsigned_file config:type="boolean">true</accept_unsigned_file> + <accept_verification_failed config:type="boolean">false</accept_verification_failed> + <import_gpg_key config:type="boolean">true</import_gpg_key> + </signature-handling> + <storage/> + </general> + <groups config:type="list"> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>100</gid> + <group_password>x</group_password> + <groupname>users</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>19</gid> + <group_password>x</group_password> + <groupname>floppy</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>1</gid> + <group_password>x</group_password> + <groupname>bin</groupname> + <userlist>daemon</userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>41</gid> + <group_password>x</group_password> + <groupname>xok</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>65533</gid> + <group_password>x</group_password> + <groupname>nobody</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>43</gid> + <group_password>x</group_password> + <groupname>modem</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>5</gid> + <group_password>x</group_password> + <groupname>tty</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>7</gid> + <group_password>x</group_password> + <groupname>lp</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>104</gid> + <group_password>!</group_password> + <groupname>uuidd</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>51</gid> + <group_password>!</group_password> + <groupname>postfix</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>112</gid> + <group_password>!</group_password> + <groupname>gdm</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>65534</gid> + <group_password>x</group_password> + <groupname>nogroup</groupname> + <userlist>nobody</userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>101</gid> + <group_password>!</group_password> + <groupname>messagebus</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>59</gid> + <group_password>!</group_password> + <groupname>maildrop</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>33</gid> + <group_password>x</group_password> + <groupname>video</groupname> + <userlist>vagrant</userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>3</gid> + <group_password>x</group_password> + <groupname>sys</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>15</gid> + <group_password>x</group_password> + <groupname>shadow</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>20</gid> + <group_password>x</group_password> + <groupname>cdrom</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>21</gid> + <group_password>x</group_password> + <groupname>console</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>42</gid> + <group_password>x</group_password> + <groupname>trusted</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>102</gid> + <group_password>!</group_password> + <groupname>haldaemon</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>106</gid> + <group_password>!</group_password> + <groupname>puppet</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>16</gid> + <group_password>x</group_password> + <groupname>dialout</groupname> + <userlist>vagrant</userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>107</gid> + <group_password>!</group_password> + <groupname>polkituser</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>10</gid> + <group_password>x</group_password> + <groupname>wheel</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>109</gid> + <group_password>!</group_password> + <groupname>pulse</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>8</gid> + <group_password>x</group_password> + <groupname>www</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>40</gid> + <group_password>x</group_password> + <groupname>games</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>6</gid> + <group_password>x</group_password> + <groupname>disk</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>17</gid> + <group_password>x</group_password> + <groupname>audio</groupname> + <userlist>pulse</userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>111</gid> + <group_password>!</group_password> + <groupname>suse-ncc</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>49</gid> + <group_password>x</group_password> + <groupname>ftp</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>103</gid> + <group_password>!</group_password> + <groupname>tape</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>25</gid> + <group_password>!</group_password> + <groupname>at</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>9</gid> + <group_password>x</group_password> + <groupname>kmem</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>32</gid> + <group_password>x</group_password> + <groupname>public</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>12</gid> + <group_password>x</group_password> + <groupname>mail</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>0</gid> + <group_password>x</group_password> + <groupname>root</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>2</gid> + <group_password>x</group_password> + <groupname>daemon</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>105</gid> + <group_password>!</group_password> + <groupname>sfcb</groupname> + <userlist>root</userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>108</gid> + <group_password>!</group_password> + <groupname>ntp</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>14</gid> + <group_password>x</group_password> + <groupname>uucp</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>110</gid> + <group_password>!</group_password> + <groupname>pulse-access</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>71</gid> + <group_password>!</group_password> + <groupname>ntadmin</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>62</gid> + <group_password>x</group_password> + <groupname>man</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>22</gid> + <group_password>x</group_password> + <groupname>utmp</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>13</gid> + <group_password>x</group_password> + <groupname>news</groupname> + <userlist></userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>65</gid> + <group_password>!</group_password> + <groupname>sshd</groupname> + <userlist></userlist> + </group> + </groups> + <host> + <hosts config:type="list"> + <hosts_entry> + <host_address>127.0.0.1</host_address> + <names config:type="list"> + <name>localhost</name> + </names> + </hosts_entry> + <hosts_entry> + <host_address>::1</host_address> + <names config:type="list"> + <name>localhost ipv6-localhost ipv6-loopback</name> + </names> + </hosts_entry> + <hosts_entry> + <host_address>fe00::0</host_address> + <names config:type="list"> + <name>ipv6-localnet</name> + </names> + </hosts_entry> + <hosts_entry> + <host_address>ff00::0</host_address> + <names config:type="list"> + <name>ipv6-mcastprefix</name> + </names> + </hosts_entry> + <hosts_entry> + <host_address>ff02::1</host_address> + <names config:type="list"> + <name>ipv6-allnodes</name> + </names> + </hosts_entry> + <hosts_entry> + <host_address>ff02::2</host_address> + <names config:type="list"> + <name>ipv6-allrouters</name> + </names> + </hosts_entry> + <hosts_entry> + <host_address>ff02::3</host_address> + <names config:type="list"> + <name>ipv6-allhosts</name> + </names> + </hosts_entry> + </hosts> + </host> + <login_settings/> + <networking> + <dhcp_options> + <dhclient_client_id></dhclient_client_id> + <dhclient_hostname_option>AUTO</dhclient_hostname_option> + </dhcp_options> + <dns> + <dhcp_hostname config:type="boolean">false</dhcp_hostname> + <domain>vagrantup.com</domain> + <hostname>vagrant-sles-11sp3-x64</hostname> + <resolv_conf_policy>auto</resolv_conf_policy> + <searchlist config:type="list"> + <search>vagrantup.com</search> + </searchlist> + <write_hostname config:type="boolean">true</write_hostname> + </dns> + <interfaces config:type="list"> + <interface> + <bootproto>dhcp</bootproto> + <device>eth0</device> + <startmode>auto</startmode> + <usercontrol>no</usercontrol> + </interface> + </interfaces> + <keep_install_network config:type="boolean">true</keep_install_network> + <managed config:type="boolean">false</managed> + <routing> + <ip_forward config:type="boolean">false</ip_forward> + </routing> + </networking> + <partitioning config:type="list"> + <drive> + <device>/dev/sda</device> + <initialize config:type="boolean">true</initialize> + <partitions config:type="list"> + <partition> + <create config:type="boolean">true</create> + <crypt_fs config:type="boolean">false</crypt_fs> + <filesystem config:type="symbol">swap</filesystem> + <format config:type="boolean">true</format> + <fstopt>defaults</fstopt> + <loop_fs config:type="boolean">false</loop_fs> + <mount>swap</mount> + <mountby config:type="symbol">device</mountby> + <partition_id config:type="integer">130</partition_id> + <partition_nr config:type="integer">1</partition_nr> + <raid_options/> + <resize config:type="boolean">false</resize> + <size>1561492992</size> + </partition> + <partition> + <create config:type="boolean">true</create> + <crypt_fs config:type="boolean">false</crypt_fs> + <filesystem config:type="symbol">ext3</filesystem> + <format config:type="boolean">true</format> + <fstopt>acl,user_xattr</fstopt> + <loop_fs config:type="boolean">false</loop_fs> + <mount>/</mount> + <mountby config:type="symbol">device</mountby> + <partition_id config:type="integer">131</partition_id> + <partition_nr config:type="integer">2</partition_nr> + <raid_options/> + <resize config:type="boolean">false</resize> + <size>19895844352</size> + </partition> + </partitions> + <pesize></pesize> + <type config:type="symbol">CT_DISK</type> + <use>all</use> + </drive> + </partitioning> + <report> + <errors> + <log config:type="boolean">true</log> + <show config:type="boolean">true</show> + <timeout config:type="integer">0</timeout> + </errors> + <messages> + <log config:type="boolean">true</log> + <show config:type="boolean">true</show> + <timeout config:type="integer">0</timeout> + </messages> + <warnings> + <log config:type="boolean">true</log> + <show config:type="boolean">true</show> + <timeout config:type="integer">0</timeout> + </warnings> + <yesno_messages> + <log config:type="boolean">true</log> + <show config:type="boolean">true</show> + <timeout config:type="integer">0</timeout> + </yesno_messages> + </report> + <software> + + <packages config:type="list"> + <package>desktop-translations</package> + <package>gconf2-branding-SLES</package> + <package>libproxy0-config-gnome</package> + <package>sle-sdk-release</package> + <package>sle-sdk-release-SDK</package> + <package>sles-manuals_en</package> + <package>yast2-trans-en_US</package> + </packages> + <patterns config:type="list"> + <pattern>Basis-Devel</pattern> + <pattern>Minimal</pattern> + <pattern>apparmor</pattern> + <pattern>base</pattern> + <pattern>sdk_kernel</pattern> + </patterns> + <remove-packages config:type="list"> + <package>3ddiag</package> + <package>CASA</package> + <package>CASA-devel</package> + <package>CASA_auth_token_client</package> + <package>CASA_auth_token_client-devel</package> + <package>ConsoleKit-devel</package> + <package>ConsoleKit-x11</package> + <package>DirectFB-devel</package> + <package>FastCGI</package> + <package>IlmBase</package> + <package>IlmBase-devel</package> + <package>ImageMagick</package> + <package>ImageMagick-devel</package> + <package>LibVNCServer</package> + <package>LibVNCServer-devel</package> + <package>Mesa</package> + <package>Mesa-devel</package> + <package>ModemManager</package> + <package>Modules</package> + <package>NetworkManager</package> + <package>NetworkManager-devel</package> + <package>NetworkManager-glib</package> + <package>NetworkManager-gnome</package> + <package>NetworkManager-kde4</package> + <package>NetworkManager-kde4-lang</package> + <package>NetworkManager-kde4-libs</package> + <package>OpenEXR</package> + <package>OpenEXR-devel</package> + <package>OpenIPMI-devel</package> + <package>PackageKit</package> + <package>PackageKit-devel</package> + <package>PackageKit-lang</package> + <package>PolicyKit-devel</package> + <package>PolicyKit-gnome</package> + <package>PolicyKit-gnome-devel</package> + <package>PolicyKit-gnome-libs</package> + <package>SDL-devel</package> + <package>SDL_net</package> + <package>SDL_net-devel</package> + <package>TeX-Guy</package> + <package>TeX-Guy-devel</package> + <package>VFlib3</package> + <package>VFlib3-devel</package> + <package>WindowMaker</package> + <package>WindowMaker-devel</package> + <package>a2ps</package> + <package>aalib</package> + <package>aalib-devel</package> + <package>akonadi-runtime</package> + <package>akregator</package> + <package>alsa-devel</package> + <package>alsa-firmware</package> + <package>alsa-plugins-pulse</package> + <package>alsa-tools</package> + <package>alsa-tools-devel</package> + <package>anthy</package> + <package>anthy-devel</package> + <package>antlr</package> + <package>apache2</package> + <package>apache2-devel</package> + <package>apache2-mod_perl</package> + <package>apache2-mod_perl-devel</package> + <package>apache2-prefork</package> + <package>apache2-utils</package> + <package>apache2-worker</package> + <package>apparmor-profile-editor</package> + <package>art-sharp2</package> + <package>arts</package> + <package>arts-devel</package> + <package>aspell-devel</package> + <package>at-spi</package> + <package>at-spi-devel</package> + <package>at-spi-lang</package> + <package>atk-devel</package> + <package>audiofile</package> + <package>audiofile-devel</package> + <package>audit-devel</package> + <package>augeas-lenses</package> + <package>automoc4</package> + <package>avahi</package> + <package>avahi-compat-howl-devel</package> + <package>avahi-compat-mDNSResponder-devel</package> + <package>avahi-lang</package> + <package>babl-0_0</package> + <package>banshee-1</package> + <package>banshee-1-backend-engine-gstreamer</package> + <package>banshee-1-backend-platform-gnome</package> + <package>banshee-1-backend-platform-unix</package> + <package>banshee-1-devel</package> + <package>banshee-1-extensions-default</package> + <package>banshee-1-lang</package> + <package>beagle-devel</package> + <package>bind-devel</package> + <package>binutils-devel</package> + <package>bluez</package> + <package>bluez-devel</package> + <package>boo</package> + <package>boo-devel</package> + <package>boost-devel</package> + <package>bootsplash-branding-SLED</package> + <package>cairo-devel</package> + <package>cairomm</package> + <package>cairomm-devel</package> + <package>canna</package> + <package>canna-devel</package> + <package>canna-libs</package> + <package>cannadic</package> + <package>capi4linux</package> + <package>capi4linux-devel</package> + <package>cdk</package> + <package>cdk-devel</package> + <package>cdrdao</package> + <package>chasen</package> + <package>chasen-devel</package> + <package>check</package> + <package>check-devel</package> + <package>chmlib</package> + <package>chmlib-devel</package> + <package>cim-schema</package> + <package>clucene-core</package> + <package>clucene-core-devel</package> + <package>cmake</package> + <package>compiz</package> + <package>compiz-branding-SLE</package> + <package>compiz-devel</package> + <package>compiz-gnome</package> + <package>coolkey-devel</package> + <package>cracklib-devel</package> + <package>crash-devel</package> + <package>crimson</package> + <package>cscope</package> + <package>cups</package> + <package>cups-devel</package> + <package>cvsps</package> + <package>cyrus-imapd-devel</package> + <package>cyrus-sasl-crammd5</package> + <package>cyrus-sasl-devel</package> + <package>dante</package> + <package>dante-devel</package> + <package>db1</package> + <package>db1-devel</package> + <package>db43</package> + <package>db43-devel</package> + <package>dbus-1-devel</package> + <package>dbus-1-glib-devel</package> + <package>dbus-1-python-devel</package> + <package>dbus-1-qt3</package> + <package>dbus-1-qt3-devel</package> + <package>dbus-1-x11</package> + <package>dejagnu</package> + <package>dejavu</package> + <package>desktop-data-openSUSE</package> + <package>desktop-file-utils</package> + <package>devhelp</package> + <package>devhelp-devel</package> + <package>devhelp-lang</package> + <package>device-mapper-devel</package> + <package>dhcp</package> + <package>dhcp-client</package> + <package>dhcp-devel</package> + <package>diffstat</package> + <package>dmapi-devel</package> + <package>dnsmasq</package> + <package>docbook-xsl-stylesheets</package> + <package>docbook_4</package> + <package>doxygen</package> + <package>dvd+rw-tools</package> + <package>e2fsprogs-devel</package> + <package>emacs</package> + <package>emacs-nox</package> + <package>emacs-x11</package> + <package>enchant</package> + <package>enchant-devel</package> + <package>enscript</package> + <package>eog</package> + <package>eog-devel</package> + <package>eog-lang</package> + <package>espeak</package> + <package>evince</package> + <package>evince-devel</package> + <package>evince-lang</package> + <package>evoldap2-devel</package> + <package>evolution</package> + <package>evolution-data-server</package> + <package>evolution-data-server-devel</package> + <package>evolution-data-server-lang</package> + <package>evolution-devel</package> + <package>evolution-lang</package> + <package>expect-devel</package> + <package>facter</package> + <package>fam</package> + <package>fam-devel</package> + <package>farsight</package> + <package>farsight-devel</package> + <package>festival</package> + <package>festival-devel</package> + <package>fftw</package> + <package>fftw-devel</package> + <package>fftw-mpi</package> + <package>fftw-mpi-devel</package> + <package>fftw-threads</package> + <package>fftw-threads-devel</package> + <package>fftw3</package> + <package>fftw3-devel</package> + <package>fftw3-threads</package> + <package>fftw3-threads-devel</package> + <package>file-devel</package> + <package>fileshareset</package> + <package>finch</package> + <package>finch-devel</package> + <package>flac-devel</package> + <package>fltk</package> + <package>fltk-devel</package> + <package>fontconfig-devel</package> + <package>fonts-config</package> + <package>foomatic-filters</package> + <package>freeglut</package> + <package>freeglut-devel</package> + <package>freeradius-client-devel</package> + <package>freeradius-client-libs</package> + <package>freeradius-server-devel</package> + <package>freeradius-server-libs</package> + <package>freetype</package> + <package>freetype2-devel</package> + <package>fribidi</package> + <package>fribidi-devel</package> + <package>ft2demos</package> + <package>fuse-devel</package> + <package>fwnn-devel</package> + <package>fxload</package> + <package>gcc-gij</package> + <package>gcc-java</package> + <package>gcc43-gij</package> + <package>gcc43-java</package> + <package>gconf-sharp2</package> + <package>gconf2-devel</package> + <package>gconfmm</package> + <package>gconfmm-devel</package> + <package>gd</package> + <package>gd-devel</package> + <package>gdbm-32bit</package> + <package>gdk-pixbuf</package> + <package>gdk-pixbuf-devel</package> + <package>gegl-0_0</package> + <package>gettext-tools</package> + <package>gfxboot-branding-SLED</package> + <package>gfxboot-devel</package> + <package>ggz</package> + <package>ggz-client-libs</package> + <package>ggz-client-libs-devel</package> + <package>ggz-client-libs-lang</package> + <package>ghex</package> + <package>ghex-devel</package> + <package>ghex-lang</package> + <package>ghostscript-devel</package> + <package>ghostscript-fonts-other</package> + <package>ghostscript-fonts-std</package> + <package>ghostscript-ijs-devel</package> + <package>ghostscript-library</package> + <package>ghostscript-omni</package> + <package>ghostscript-x11</package> + <package>giflib-devel</package> + <package>gimp</package> + <package>gimp-branding-SLED</package> + <package>gimp-devel</package> + <package>gimp-lang</package> + <package>gimp-plugins-python</package> + <package>git</package> + <package>git-arch</package> + <package>git-core</package> + <package>git-cvs</package> + <package>git-daemon</package> + <package>git-email</package> + <package>git-gui</package> + <package>git-svn</package> + <package>git-web</package> + <package>gitk</package> + <package>gjdoc</package> + <package>glade-sharp2</package> + <package>glade3</package> + <package>glade3-lang</package> + <package>glib</package> + <package>glib-devel</package> + <package>glib-sharp2</package> + <package>glib2-devel</package> + <package>glibmm2</package> + <package>glibmm2-devel</package> + <package>glitz</package> + <package>glitz-devel</package> + <package>gltt</package> + <package>gltt-devel</package> + <package>gmime-2_4-devel</package> + <package>gmime-devel</package> + <package>gmp-devel</package> + <package>gnet</package> + <package>gnet-devel</package> + <package>gnokii</package> + <package>gnokii-devel</package> + <package>gnokii-smsd</package> + <package>gnome-certauth-devel</package> + <package>gnome-control-center</package> + <package>gnome-control-center-devel</package> + <package>gnome-control-center-lang</package> + <package>gnome-desktop</package> + <package>gnome-desktop-devel</package> + <package>gnome-desktop-lang</package> + <package>gnome-doc-utils</package> + <package>gnome-doc-utils-devel</package> + <package>gnome-doc-utils-lang</package> + <package>gnome-keyring-devel</package> + <package>gnome-keyring-sharp</package> + <package>gnome-keyring-sharp-devel</package> + <package>gnome-libs</package> + <package>gnome-libs-devel</package> + <package>gnome-mag</package> + <package>gnome-mag-devel</package> + <package>gnome-mag-lang</package> + <package>gnome-main-menu</package> + <package>gnome-main-menu-lang</package> + <package>gnome-media</package> + <package>gnome-media-devel</package> + <package>gnome-media-lang</package> + <package>gnome-menus</package> + <package>gnome-menus-branding-SLED</package> + <package>gnome-menus-devel</package> + <package>gnome-menus-lang</package> + <package>gnome-mount</package> + <package>gnome-mount-lang</package> + <package>gnome-panel</package> + <package>gnome-panel-devel</package> + <package>gnome-panel-lang</package> + <package>gnome-pilot</package> + <package>gnome-pilot-devel</package> + <package>gnome-pilot-lang</package> + <package>gnome-settings-daemon</package> + <package>gnome-settings-daemon-devel</package> + <package>gnome-settings-daemon-lang</package> + <package>gnome-sharp2</package> + <package>gnome-speech</package> + <package>gnome-speech-devel</package> + <package>gnome-themes</package> + <package>gnome-utils</package> + <package>gnome-utils-devel</package> + <package>gnome-utils-lang</package> + <package>gnome-vfs-sharp2</package> + <package>gnome-vfs2</package> + <package>gnome-vfs2-devel</package> + <package>gnome-vfs2-lang</package> + <package>gnome-vfsmm</package> + <package>gnome-vfsmm-devel</package> + <package>gnopernicus</package> + <package>gnopernicus-devel</package> + <package>gnopernicus-lang</package> + <package>gnutls</package> + <package>goffice</package> + <package>goffice-devel</package> + <package>goffice-lang</package> + <package>goocanvas</package> + <package>goocanvas-devel</package> + <package>goocanvas-lang</package> + <package>goom2k4</package> + <package>goom2k4-devel</package> + <package>graphviz</package> + <package>graphviz-devel</package> + <package>graphviz-gd</package> + <package>graphviz-gnome</package> + <package>gstreamer-0_10</package> + <package>gstreamer-0_10-devel</package> + <package>gstreamer-0_10-lang</package> + <package>gstreamer-0_10-plugins-base</package> + <package>gstreamer-0_10-plugins-base-devel</package> + <package>gstreamer-0_10-plugins-base-lang</package> + <package>gstreamer-0_10-plugins-good</package> + <package>gstreamer-0_10-plugins-good-lang</package> + <package>gstreamer-0_10-utils</package> + <package>gstreamer-utils</package> + <package>gtk</package> + <package>gtk-devel</package> + <package>gtk-lang</package> + <package>gtk-sharp2</package> + <package>gtk-vnc-devel</package> + <package>gtk2-devel</package> + <package>gtkglext</package> + <package>gtkglext-devel</package> + <package>gtkhtml2</package> + <package>gtkhtml2-devel</package> + <package>gtkhtml2-lang</package> + <package>gtkhtml314-sharp</package> + <package>gtkmm2</package> + <package>gtkmm2-devel</package> + <package>gtksourceview-devel</package> + <package>gtksourceview-lang</package> + <package>gtksourceview18</package> + <package>gtksourceview18-devel</package> + <package>gtkspell</package> + <package>gtkspell-devel</package> + <package>gtkspell-lang</package> + <package>gucharmap</package> + <package>gucharmap-devel</package> + <package>gucharmap-lang</package> + <package>guile</package> + <package>guile-devel</package> + <package>gutenprint</package> + <package>gutenprint-devel</package> + <package>gvfs-devel</package> + <package>gxmhtml</package> + <package>hal-devel</package> + <package>hal-palm</package> + <package>htdig</package> + <package>htdig-devel</package> + <package>hunspell</package> + <package>hunspell-devel</package> + <package>hunspell-tools</package> + <package>hwinfo-devel</package> + <package>i4l-base</package> + <package>icewm</package> + <package>icewm-lite</package> + <package>id3lib</package> + <package>id3lib-devel</package> + <package>imap-devel</package> + <package>imap-lib</package> + <package>imlib</package> + <package>imlib-devel</package> + <package>imlib2</package> + <package>imlib2-devel</package> + <package>indent</package> + <package>info2html</package> + <package>inn</package> + <package>inn-devel</package> + <package>intltool</package> + <package>ipadic</package> + <package>iptables-devel</package> + <package>iso-codes</package> + <package>iso-codes-devel</package> + <package>iso_ent</package> + <package>ispell</package> + <package>ispell-american</package> + <package>ispell-brazilian</package> + <package>ispell-british</package> + <package>ispell-czech</package> + <package>ispell-danish</package> + <package>ispell-finnish</package> + <package>ispell-french</package> + <package>ispell-german</package> + <package>ispell-hungarian</package> + <package>ispell-italian</package> + <package>ispell-ngerman</package> + <package>ispell-norsk</package> + <package>ispell-polish</package> + <package>ispell-portuguese</package> + <package>ispell-russian</package> + <package>ispell-slovak</package> + <package>ispell-spanish</package> + <package>ispell-swedish</package> + <package>itcl-devel</package> + <package>java-1_4_2-ibm</package> + <package>java-1_4_2-ibm-devel</package> + <package>java-1_5_0-gcj-compat</package> + <package>java-1_5_0-gcj-compat-devel</package> + <package>java-1_6_0-ibm</package> + <package>java-1_6_0-ibm-devel</package> + <package>joe</package> + <package>jpackage-utils</package> + <package>k3b</package> + <package>k3b-devel</package> + <package>k3b-lang</package> + <package>kaddressbook</package> + <package>kalarm</package> + <package>kde-susetranslations</package> + <package>kde4-filesystem</package> + <package>kde4-kgreeter-plugins</package> + <package>kdebase3</package> + <package>kdebase3-devel</package> + <package>kdebase3-runtime</package> + <package>kdebase4-SLED</package> + <package>kdebase4-SLED-lang</package> + <package>kdebase4-runtime</package> + <package>kdebase4-runtime-branding-SLED</package> + <package>kdebase4-workspace</package> + <package>kdebase4-workspace-branding-SLED</package> + <package>kdebase4-workspace-devel</package> + <package>kdebase4-workspace-ksysguardd</package> + <package>kdelibs3</package> + <package>kdelibs3-arts</package> + <package>kdelibs3-default-style</package> + <package>kdelibs3-devel</package> + <package>kdelibs3-doc</package> + <package>kdelibs4</package> + <package>kdelibs4-branding-SLED</package> + <package>kdelibs4-core</package> + <package>kdelibs4-doc</package> + <package>kdemultimedia3-arts</package> + <package>kdepim3</package> + <package>kdepim4</package> + <package>kdepim4-devel</package> + <package>kdepimlibs4</package> + <package>kdialog</package> + <package>kdm</package> + <package>kdm-branding-SLED</package> + <package>kernel-docs</package> + <package>kernel-syms</package> + <package>kernel-trace-devel</package> + <package>kernel-xen-devel</package> + <package>keyutils-devel</package> + <package>kio_sysinfo</package> + <package>kio_sysinfo-branding-SLED</package> + <package>kmail</package> + <package>knode</package> + <package>kontact</package> + <package>korganizer</package> + <package>kpilot</package> + <package>krb5-devel</package> + <package>ksh-devel</package> + <package>ktorrent</package> + <package>ktorrent-devel</package> + <package>ktorrent-lang</package> + <package>kwin</package> + <package>ladspa-devel</package> + <package>lib3ds-1-3</package> + <package>lib3ds-devel</package> + <package>libFLAC++6</package> + <package>libFLAC8</package> + <package>libHX-devel</package> + <package>libMagick++-devel</package> + <package>libMagick++1</package> + <package>libMagickWand1</package> + <package>libQtWebKit-devel</package> + <package>libQtWebKit4</package> + <package>libXerces-c-devel</package> + <package>libXerces-c28</package> + <package>libXiterm</package> + <package>libXiterm-devel</package> + <package>libacl-devel</package> + <package>libadns-devel</package> + <package>libadns1</package> + <package>libakode</package> + <package>libakode-devel</package> + <package>libakonadi4</package> + <package>libakonadiprotocolinternals-devel</package> + <package>libakonadiprotocolinternals1</package> + <package>libao</package> + <package>libao-devel</package> + <package>libapparmor-devel</package> + <package>libapr-util1</package> + <package>libapr-util1-devel</package> + <package>libapr1</package> + <package>libapr1-devel</package> + <package>libarchive-devel</package> + <package>libart_lgpl</package> + <package>libart_lgpl-devel</package> + <package>libassuan-devel</package> + <package>libatomic-ops-devel</package> + <package>libattr-devel</package> + <package>libavahi-core5</package> + <package>libavahi-devel</package> + <package>libavahi-glib-devel</package> + <package>libavahi-gobject-devel</package> + <package>libavahi-gobject0</package> + <package>libavahi-ui0</package> + <package>libavc1394-0</package> + <package>libavc1394-devel</package> + <package>libbabl-0_0-0</package> + <package>libbeagle-devel</package> + <package>libbeagle-python</package> + <package>libbeagle1</package> + <package>libbitmask-devel</package> + <package>libbitmask1</package> + <package>libblkid-devel</package> + <package>libblocxx-devel</package> + <package>libbonobo</package> + <package>libbonobo-devel</package> + <package>libbonobo-lang</package> + <package>libbonoboui</package> + <package>libbonoboui-devel</package> + <package>libbonoboui-lang</package> + <package>libboost_date_time1_36_0</package> + <package>libboost_filesystem1_36_0</package> + <package>libboost_graph1_36_0</package> + <package>libboost_iostreams1_36_0</package> + <package>libboost_math1_36_0</package> + <package>libboost_mpi1_36_0</package> + <package>libboost_program_options1_36_0</package> + <package>libboost_python1_36_0</package> + <package>libboost_serialization1_36_0</package> + <package>libboost_signals1_36_0</package> + <package>libboost_system1_36_0</package> + <package>libboost_test1_36_0</package> + <package>libboost_thread1_36_0</package> + <package>libboost_wave1_36_0</package> + <package>libbotan-1_6_4</package> + <package>libbotan-devel</package> + <package>libbtctl</package> + <package>libbtctl-devel</package> + <package>libbtctl-lang</package> + <package>libbtctl4</package> + <package>libbz2-devel</package> + <package>libcaca</package> + <package>libcaca-devel</package> + <package>libcanberra-gtk</package> + <package>libcanberra-gtk0</package> + <package>libcanberra0</package> + <package>libcap-devel</package> + <package>libcap-ng0</package> + <package>libcdda_interface0</package> + <package>libcdda_paranoia0</package> + <package>libcddb-devel</package> + <package>libcddb2</package> + <package>libcdio++0</package> + <package>libcdio-devel</package> + <package>libcgroup-devel</package> + <package>libcgroup1</package> + <package>libchewing</package> + <package>libchewing-devel</package> + <package>libcmpiutil</package> + <package>libcmpiutil-devel</package> + <package>libcolorblind0</package> + <package>libcom_err-devel</package> + <package>libcompizconfig</package> + <package>libcompizconfig-devel</package> + <package>libcppunit-1_12-0</package> + <package>libcppunit-devel</package> + <package>libcpuset-devel</package> + <package>libcpuset1</package> + <package>libcroco</package> + <package>libcroco-0_6-3</package> + <package>libcroco-devel</package> + <package>libcryptsetup-devel</package> + <package>libcsync-devel</package> + <package>libcsync0</package> + <package>libcurl-devel</package> + <package>libdaemon-devel</package> + <package>libdaemon0</package> + <package>libdatrie-devel</package> + <package>libdatrie0</package> + <package>libdb-4_5-32bit</package> + <package>libdb-4_5-devel</package> + <package>libdbus-1-qt3-0</package> + <package>libdbus-1-qt3-0-devel</package> + <package>libdc1394-22</package> + <package>libdc1394-devel</package> + <package>libdc1394_control12</package> + <package>libdc1394_control12-devel</package> + <package>libdhcp6client-1_0-2</package> + <package>libdhcp6client-devel</package> + <package>libdigikam-devel</package> + <package>libdiscid1</package> + <package>libdjvulibre-devel</package> + <package>libdjvulibre21</package> + <package>libdmxview-devel</package> + <package>libdmxview0</package> + <package>libdnet-devel</package> + <package>libdnet1</package> + <package>libdns_sd</package> + <package>libdrm</package> + <package>libdrm-devel</package> + <package>libdv-devel</package> + <package>libdv4</package> + <package>libdvdread4</package> + <package>libdw-devel</package> + <package>libebl-devel</package> + <package>libedit-devel</package> + <package>libedit0</package> + <package>libelf-devel</package> + <package>libenchant1</package> + <package>libesd-devel</package> + <package>libesd0</package> + <package>libesmtp-devel</package> + <package>libevoldap-2_4-2</package> + <package>libevtlog-devel</package> + <package>libevtlog0</package> + <package>libexempi-devel</package> + <package>libexempi3</package> + <package>libexif-devel</package> + <package>libexiv2-4</package> + <package>libexiv2-devel</package> + <package>libexpat-devel</package> + <package>libext2fs-devel</package> + <package>libfarsight-0_1-3</package> + <package>libffi-devel</package> + <package>libffi43</package> + <package>libffi43-devel</package> + <package>libflaim-devel</package> + <package>libfprint-devel</package> + <package>libfreebl3</package> + <package>libfreebob</package> + <package>libfreebob-devel</package> + <package>libgadu</package> + <package>libgadu-devel</package> + <package>libgail-gnome</package> + <package>libgail-gnome-devel</package> + <package>libgcj-devel</package> + <package>libgcj43</package> + <package>libgcj43-devel</package> + <package>libgcj43-jar</package> + <package>libgcj_bc43</package> + <package>libgcrypt-devel</package> + <package>libgda-3_0-3</package> + <package>libgda-3_0-devel</package> + <package>libgdiplus0</package> + <package>libgegl-0_0-0</package> + <package>libgeoclue0</package> + <package>libgfortran46</package> + <package>libggz2</package> + <package>libggz2-devel</package> + <package>libgimpprint</package> + <package>libgimpprint-devel</package> + <package>libglade2</package> + <package>libglade2-devel</package> + <package>libglademm</package> + <package>libglademm-2_4-1</package> + <package>libglademm-devel</package> + <package>libgladeui-1-9</package> + <package>libgladeui-1_0-devel</package> + <package>libgmime-2_0-3</package> + <package>libgmime-2_4-2</package> + <package>libgmm++-devel</package> + <package>libgnome</package> + <package>libgnome-certauth0</package> + <package>libgnome-desktop-2-11</package> + <package>libgnome-devel</package> + <package>libgnome-lang</package> + <package>libgnome-menu2</package> + <package>libgnome-window-settings1</package> + <package>libgnomecanvas</package> + <package>libgnomecanvas-devel</package> + <package>libgnomecanvas-lang</package> + <package>libgnomecanvasmm</package> + <package>libgnomecanvasmm-devel</package> + <package>libgnomecups</package> + <package>libgnomecups-devel</package> + <package>libgnomecups-lang</package> + <package>libgnomedb</package> + <package>libgnomedb-devel</package> + <package>libgnomedb-lang</package> + <package>libgnomekbd</package> + <package>libgnomekbd-devel</package> + <package>libgnomekbd-lang</package> + <package>libgnomeprint</package> + <package>libgnomeprint-devel</package> + <package>libgnomeprint-lang</package> + <package>libgnomeprintui</package> + <package>libgnomeprintui-devel</package> + <package>libgnomeprintui-lang</package> + <package>libgnomesu</package> + <package>libgnomesu-devel</package> + <package>libgnomesu-lang</package> + <package>libgnomesu0</package> + <package>libgnomeui</package> + <package>libgnomeui-devel</package> + <package>libgnomeui-lang</package> + <package>libgnomevfsmm-2_6-1</package> + <package>libgnutls-devel</package> + <package>libgnutls-extra-devel</package> + <package>libgnutls-extra26</package> + <package>libgoocanvas3</package> + <package>libgpg-error-devel</package> + <package>libgpgme-devel</package> + <package>libgphoto2-devel</package> + <package>libgpod-devel</package> + <package>libgsf</package> + <package>libgsf-1-114</package> + <package>libgsf-devel</package> + <package>libgsf-gnome</package> + <package>libgsm-devel</package> + <package>libgsm1</package> + <package>libgssglue-devel</package> + <package>libgstapp-0_10-0</package> + <package>libgstinterfaces-0_10-0</package> + <package>libgstreamer-0_10-0</package> + <package>libgtk-vnc-1_0-0</package> + <package>libgtkhtml</package> + <package>libgtkhtml-devel</package> + <package>libgtksourceview-2_0-0</package> + <package>libgtop</package> + <package>libgtop-2_0-7</package> + <package>libgtop-devel</package> + <package>libgtop-lang</package> + <package>libgudev-1_0-0</package> + <package>libgweather</package> + <package>libgweather-devel</package> + <package>libgweather-lang</package> + <package>libgweather1</package> + <package>libhangul</package> + <package>libhangul-devel</package> + <package>libhowl0</package> + <package>libical-devel</package> + <package>libical0</package> + <package>libicu-devel</package> + <package>libid3tag</package> + <package>libid3tag-devel</package> + <package>libidl-devel</package> + <package>libidn-devel</package> + <package>libiec61883</package> + <package>libiec61883-devel</package> + <package>libieee1284</package> + <package>libiniparser-devel</package> + <package>libiniparser0</package> + <package>libiptcdata</package> + <package>libiptcdata-devel</package> + <package>libiptcdata0</package> + <package>libiso9660-5</package> + <package>libiterm</package> + <package>libiterm-devel</package> + <package>libjack-devel</package> + <package>libjack0</package> + <package>libjasper</package> + <package>libjasper-devel</package> + <package>libjingle-0_3-0</package> + <package>libjingle-devel</package> + <package>libjpeg-devel</package> + <package>libkcal</package> + <package>libkcal-devel</package> + <package>libkcal2</package> + <package>libkcddb4</package> + <package>libkcddb4-devel</package> + <package>libkcompactdisc4</package> + <package>libkcompactdisc4-devel</package> + <package>libkdcraw3</package> + <package>libkdcraw3-devel</package> + <package>libkdcraw3-lang</package> + <package>libkde4</package> + <package>libkde4-devel</package> + <package>libkdecore4</package> + <package>libkdecore4-devel</package> + <package>libkdepim4</package> + <package>libkdepim4-devel</package> + <package>libkdepimlibs4</package> + <package>libkdepimlibs4-devel</package> + <package>libkexiv2-3</package> + <package>libkexiv2-3-devel</package> + <package>libkexiv2-7</package> + <package>libkipi-devel</package> + <package>libkipi6</package> + <package>libkmime-devel</package> + <package>libkmime2</package> + <package>libknotificationitem-1-1</package> + <package>libkonq-devel</package> + <package>libkonq5</package> + <package>libksba-devel</package> + <package>libktnef-devel</package> + <package>libktnef1</package> + <package>liblazy-devel</package> + <package>liblazy1</package> + <package>liblcms-devel</package> + <package>libldapcpp-devel</package> + <package>liblog4c-devel</package> + <package>liblog4c3</package> + <package>libloudmouth-1-0</package> + <package>liblpsolve55</package> + <package>liblua5_1</package> + <package>libmalaga-devel</package> + <package>libmalaga7</package> + <package>libmcrypt</package> + <package>libmcrypt-devel</package> + <package>libmikmod</package> + <package>libmikmod-devel</package> + <package>libmm-devel</package> + <package>libmm14</package> + <package>libmng-devel</package> + <package>libmpcdec-devel</package> + <package>libmpcdec5</package> + <package>libmspack-devel</package> + <package>libmtp-devel</package> + <package>libmtp8</package> + <package>libmusicbrainz-devel</package> + <package>libmusicbrainz3-6</package> + <package>libmusicbrainz3-devel</package> + <package>libmusicbrainz4</package> + <package>libmysqlclient-devel</package> + <package>libmysqlclient15</package> + <package>libmysqlclient_r15</package> + <package>libneon-devel</package> + <package>libneon27</package> + <package>libnetapi-devel</package> + <package>libnetapi0</package> + <package>libnetcontrol0</package> + <package>libnetpbm-devel</package> + <package>libnetpbm10</package> + <package>libnewt0_52</package> + <package>libnjb</package> + <package>libnjb-devel</package> + <package>libnjb5</package> + <package>libnl-devel</package> + <package>libnotify</package> + <package>libnotify-devel</package> + <package>libnotify1</package> + <package>libnscd-devel</package> + <package>libnsssharedhelper0</package> + <package>libnuma-devel</package> + <package>libofa-devel</package> + <package>libofa0</package> + <package>libogg-devel</package> + <package>libogg0</package> + <package>liboil</package> + <package>liboil-devel</package> + <package>libopenbabel-devel</package> + <package>libopenbabel3</package> + <package>libopencdk-devel</package> + <package>libopencdk10</package> + <package>libopenraw-devel</package> + <package>libopenraw1</package> + <package>libopenssl-devel</package> + <package>libopensync</package> + <package>libopensync-devel</package> + <package>libopensync-plugin-evolution2</package> + <package>libopensync-plugin-evolution2-devel</package> + <package>libopensync-plugin-palm</package> + <package>libopensync-plugin-palm-devel</package> + <package>liborc-0_4-0</package> + <package>libosip2</package> + <package>libosip2-devel</package> + <package>libotf</package> + <package>libotf-devel</package> + <package>libotr-devel</package> + <package>libotr2</package> + <package>libp11-1</package> + <package>libp11-devel</package> + <package>libpackagekit-glib10</package> + <package>libpackagekit-glib10-devel</package> + <package>libpangomm-1_4-1</package> + <package>libpcap-devel</package> + <package>libpciaccess0</package> + <package>libpciaccess0-devel</package> + <package>libphonon4</package> + <package>libpisock-devel</package> + <package>libpisock9</package> + <package>libpisync-devel</package> + <package>libpisync1</package> + <package>libpixman-1-0-devel</package> + <package>libpkcs11-helper1</package> + <package>libpng-devel</package> + <package>libpolkit-qt0</package> + <package>libpoppler-devel</package> + <package>libpoppler-glib-devel</package> + <package>libpoppler-glib4</package> + <package>libpoppler-qt2</package> + <package>libpoppler-qt3-devel</package> + <package>libpoppler-qt4-3</package> + <package>libpoppler-qt4-devel</package> + <package>libpoppler5</package> + <package>libpst4</package> + <package>libpt2</package> + <package>libpt2-devel</package> + <package>libpulse-browse0</package> + <package>libpulse-devel</package> + <package>libpulse-mainloop-glib0</package> + <package>libpulse0</package> + <package>libpurple</package> + <package>libpurple-devel</package> + <package>libpurple-lang</package> + <package>libqca2</package> + <package>libqca2-devel</package> + <package>libqdialogsolver1</package> + <package>libqdialogsolver1-devel</package> + <package>libqimageblitz-devel</package> + <package>libqimageblitz4</package> + <package>libqscintilla-devel</package> + <package>libqscintilla2-5</package> + <package>libqt4</package> + <package>libqt4-devel</package> + <package>libqt4-qt3support</package> + <package>libqt4-sql</package> + <package>libqt4-sql-mysql</package> + <package>libqt4-sql-postgresql</package> + <package>libqt4-sql-sqlite</package> + <package>libqt4-sql-unixODBC</package> + <package>libqt4-x11</package> + <package>libqtpod-devel</package> + <package>libqtpod0</package> + <package>libquadmath46</package> + <package>libquicktime</package> + <package>libquicktime-devel</package> + <package>libraptor-devel</package> + <package>libraptor1</package> + <package>librasqal-devel</package> + <package>librasqal1</package> + <package>libraw1394-11</package> + <package>libraw1394-8</package> + <package>libraw1394-devel</package> + <package>libredland-devel</package> + <package>libredland0</package> + <package>libreiserfs-devel</package> + <package>libreoffice</package> + <package>libreoffice-base</package> + <package>libreoffice-branding-SLED</package> + <package>libreoffice-branding-upstream</package> + <package>libreoffice-calc</package> + <package>libreoffice-icon-themes</package> + <package>libreoffice-impress</package> + <package>libreoffice-sdk</package> + <package>libreoffice-writer</package> + <package>librsvg</package> + <package>librsvg-devel</package> + <package>libsamplerate</package> + <package>libsamplerate-devel</package> + <package>libsatsolver-devel</package> + <package>libsblim-cmpiutil1</package> + <package>libselinux-devel</package> + <package>libsemanage-devel</package> + <package>libsemanage1</package> + <package>libsensors3-devel</package> + <package>libsensors4</package> + <package>libsepol-devel</package> + <package>libsexy</package> + <package>libsexy-devel</package> + <package>libshout-devel</package> + <package>libshout3</package> + <package>libsidplay1</package> + <package>libsidplay1-devel</package> + <package>libsigc++2</package> + <package>libsigc++2-devel</package> + <package>libslab-lang</package> + <package>libslab0</package> + <package>libsmbclient-devel</package> + <package>libsmbios-devel</package> + <package>libsmbsharemodes-devel</package> + <package>libsmbsharemodes0</package> + <package>libsndfile</package> + <package>libsndfile-devel</package> + <package>libsoprano-devel</package> + <package>libsoprano4</package> + <package>libsoup-devel</package> + <package>libspectre-devel</package> + <package>libspectre1</package> + <package>libspeex</package> + <package>libssh2-devel</package> + <package>libstrigi0</package> + <package>libstroke</package> + <package>libstroke-devel</package> + <package>libsyncml-devel</package> + <package>libsyncml0</package> + <package>libtalloc-devel</package> + <package>libtasn1-devel</package> + <package>libtdb-devel</package> + <package>libtelepathy</package> + <package>libtelepathy-devel</package> + <package>libtelepathy-glib0</package> + <package>libtheora-devel</package> + <package>libtheora0</package> + <package>libtidy</package> + <package>libtidy-devel</package> + <package>libtiff-devel</package> + <package>libtirpc-devel</package> + <package>libtomoe-gtk0</package> + <package>libtspi1</package> + <package>libtunepimp</package> + <package>libtunepimp-devel</package> + <package>libtunepimp5</package> + <package>libudev-devel</package> + <package>libudf0</package> + <package>libunique-1_0-0</package> + <package>libunwind</package> + <package>libunwind-devel</package> + <package>libupsclient1</package> + <package>libusb-devel</package> + <package>libusbpp-0_1-4</package> + <package>libustr-1_0-1</package> + <package>libustr-devel</package> + <package>libuuid-devel</package> + <package>libvirt-client</package> + <package>libvirt-devel</package> + <package>libvisual</package> + <package>libvisual-devel</package> + <package>libvoikko-devel</package> + <package>libvoikko1</package> + <package>libvorbis</package> + <package>libvorbis-devel</package> + <package>libwavpack1</package> + <package>libwbclient-devel</package> + <package>libwbxml2-0</package> + <package>libwbxml2-devel</package> + <package>libwebkit-1_0-1</package> + <package>libwebkit-1_0-2</package> + <package>libwebkit-devel</package> + <package>libwebkit-lang</package> + <package>libwmf</package> + <package>libwmf-devel</package> + <package>libwmf-gnome</package> + <package>libwnck</package> + <package>libwnck-1-22</package> + <package>libwnck-devel</package> + <package>libwnck-lang</package> + <package>libwpd-0_8-8</package> + <package>libwpd-devel</package> + <package>libwpg-0_1-1</package> + <package>libwpg-devel</package> + <package>libwps-0_1-1</package> + <package>libwps-devel</package> + <package>libwsman-devel</package> + <package>libwsman1</package> + <package>libxcrypt-devel</package> + <package>libxine-devel</package> + <package>libxine1</package> + <package>libxklavier-devel</package> + <package>libxklavier15</package> + <package>libxml2-devel</package> + <package>libxslt-devel</package> + <package>libyajl1</package> + <package>libzio-devel</package> + <package>libzip-devel</package> + <package>libzip1</package> + <package>libzvbi0</package> + <package>libzypp-devel</package> + <package>limal-apparmor-notifications</package> + <package>limal-apparmor-notifications-devel</package> + <package>limal-ca-mgm-devel</package> + <package>limal-devel</package> + <package>limal-devtools</package> + <package>limal-nfs-server-devel</package> + <package>linux-atm-devel</package> + <package>linux-atm-lib</package> + <package>lksctp-tools</package> + <package>lksctp-tools-devel</package> + <package>loudmouth-devel</package> + <package>lua</package> + <package>lua-devel</package> + <package>lzo-devel</package> + <package>m17n-db</package> + <package>m17n-lib</package> + <package>m17n-lib-devel</package> + <package>malaga-suomi</package> + <package>meanwhile</package> + <package>meanwhile-devel</package> + <package>metacity</package> + <package>metacity-devel</package> + <package>metacity-lang</package> + <package>mhash</package> + <package>mhash-devel</package> + <package>misc-console-font</package> + <package>mono-addins</package> + <package>mono-basic</package> + <package>mono-core</package> + <package>mono-data</package> + <package>mono-data-oracle</package> + <package>mono-data-sqlite</package> + <package>mono-devel</package> + <package>mono-extras</package> + <package>mono-jscript</package> + <package>mono-tools</package> + <package>mono-wcf</package> + <package>mono-web</package> + <package>mono-winforms</package> + <package>mono-zeroconf</package> + <package>mono-zeroconf-provider-avahi</package> + <package>monodevelop</package> + <package>monodoc-core</package> + <package>mozilla-nspr</package> + <package>mozilla-nspr-devel</package> + <package>mozilla-nss</package> + <package>mozilla-nss-devel</package> + <package>mozilla-xulrunner192</package> + <package>mozilla-xulrunner192-gnome</package> + <package>mpfr-devel</package> + <package>mpi-selector</package> + <package>mpich</package> + <package>mpich-devel</package> + <package>mysql</package> + <package>mysql-client</package> + <package>nagios</package> + <package>nagios-devel</package> + <package>nagios-www</package> + <package>nant</package> + <package>nautilus</package> + <package>nautilus-cd-burner</package> + <package>nautilus-cd-burner-devel</package> + <package>nautilus-cd-burner-lang</package> + <package>nautilus-devel</package> + <package>nautilus-lang</package> + <package>ndesk-dbus</package> + <package>ndesk-dbus-glib</package> + <package>ndesk-dbus-glib-devel</package> + <package>net-snmp</package> + <package>net-snmp-devel</package> + <package>netatalk</package> + <package>netatalk-devel</package> + <package>netcat-openbsd</package> + <package>newt</package> + <package>newt-devel</package> + <package>newt-static</package> + <package>nfsidmap-devel</package> + <package>notification-daemon</package> + <package>notification-daemon-lang</package> + <package>notify-sharp</package> + <package>nss-mdns</package> + <package>nss-shared-helper-devel</package> + <package>nut</package> + <package>nut-classic</package> + <package>nut-devel</package> + <package>opal</package> + <package>opal-devel</package> + <package>openCryptoki</package> + <package>openCryptoki-64bit</package> + <package>openCryptoki-devel</package> + <package>openct-devel</package> + <package>openhpi</package> + <package>openhpi-daemon</package> + <package>openhpi-devel</package> + <package>openjade</package> + <package>openjade-devel</package> + <package>openldap2-devel</package> + <package>openmotif-devel</package> + <package>openmotif-libs</package> + <package>openmpi</package> + <package>openobex-devel</package> + <package>openobex-glib-devel</package> + <package>opensc-devel</package> + <package>openslp-devel</package> + <package>opensp</package> + <package>opensp-devel</package> + <package>openwsman-client</package> + <package>openwsman-server</package> + <package>orbit</package> + <package>orbit-devel</package> + <package>orbit2-devel</package> + <package>oxygen-icon-theme</package> + <package>oxygen-icon-theme-scalable</package> + <package>ozerocdoff</package> + <package>pam-devel</package> + <package>pango-devel</package> + <package>pangomm-devel</package> + <package>parted-devel</package> + <package>patchutils</package> + <package>pciutils-devel</package> + <package>pcre-devel</package> + <package>pcsc-acr38</package> + <package>pcsc-acr38-devel</package> + <package>pcsc-lite-devel</package> + <package>perl-32bit</package> + <package>perl-Crypt-OpenSSL-RSA</package> + <package>perl-Mail-DKIM</package> + <package>perl-MailTools</package> + <package>perl-Net-DNS</package> + <package>perl-Net-IP</package> + <package>perl-NetAddr-IP</package> + <package>perl-SNMP</package> + <package>perl-Tie-IxHash</package> + <package>perl-Tk</package> + <package>perl-Tk-devel</package> + <package>perl-spamassassin</package> + <package>phonon</package> + <package>phonon-backend-gstreamer-0_10</package> + <package>phonon-devel</package> + <package>php5</package> + <package>php5-ctype</package> + <package>php5-devel</package> + <package>php5-dom</package> + <package>php5-hash</package> + <package>php5-iconv</package> + <package>php5-json</package> + <package>php5-pdo</package> + <package>php5-sqlite</package> + <package>php5-suhosin</package> + <package>php5-tokenizer</package> + <package>php5-xmlreader</package> + <package>php5-xmlwriter</package> + <package>php53</package> + <package>php53-ctype</package> + <package>php53-dom</package> + <package>php53-iconv</package> + <package>php53-json</package> + <package>php53-tokenizer</package> + <package>php53-xmlreader</package> + <package>php53-xmlwriter</package> + <package>pidgin</package> + <package>pidgin-devel</package> + <package>pilot-link</package> + <package>pkcs11-helper</package> + <package>pkcs11-helper-devel</package> + <package>planner</package> + <package>planner-devel</package> + <package>planner-lang</package> + <package>plasma-addons</package> + <package>plasma-theme-aya</package> + <package>plasmoid-networkmanagement</package> + <package>plasmoid-quickaccess</package> + <package>plotutils</package> + <package>poppler-data</package> + <package>poppler-tools</package> + <package>popt-devel</package> + <package>portmap</package> + <package>postfix-devel</package> + <package>postgresql-devel</package> + <package>postgresql-libs</package> + <package>ppp-devel</package> + <package>ppp-userpass</package> + <package>pstoedit</package> + <package>pstoedit-devel</package> + <package>pulseaudio</package> + <package>pulseaudio-esound-compat</package> + <package>pulseaudio-lang</package> + <package>puppet</package> + <package>python-cairo</package> + <package>python-cairo-devel</package> + <package>python-devel</package> + <package>python-gnome</package> + <package>python-gnome-devel</package> + <package>python-gobject2</package> + <package>python-gobject2-devel</package> + <package>python-gtk</package> + <package>python-gtk-devel</package> + <package>python-gtkglext</package> + <package>python-gtkglext-devel</package> + <package>python-gtksourceview</package> + <package>python-gtksourceview-devel</package> + <package>python-numeric</package> + <package>python-numpy</package> + <package>python-orbit</package> + <package>python-orbit-devel</package> + <package>pyxml</package> + <package>qt3</package> + <package>qt3-devel</package> + <package>quagga</package> + <package>quagga-devel</package> + <package>quilt</package> + <package>raptor</package> + <package>rarian</package> + <package>rarian-devel</package> + <package>re2c</package> + <package>readline-devel</package> + <package>recode-devel</package> + <package>rpm-devel</package> + <package>rrdtool</package> + <package>rrdtool-devel</package> + <package>rsyslog</package> + <package>ruby</package> + <package>rubygems</package> + <package>ruby-devel</package> + <package>ruby-doc-html</package> + <package>ruby-doc-ri</package> + <package>ruby-examples</package> + <package>ruby-fcgi</package> + <package>ruby-mysql</package> + <package>ruby-selinux</package> + <package>ruby-test-suite</package> + <package>ruby-tk</package> + <package>sablot</package> + <package>sablot-devel</package> + <package>samba-devel</package> + <package>sane-backends</package> + <package>sane-frontends</package> + <package>sax2-libsax</package> + <package>sax2-libsax-devel</package> + <package>sax2-libsax-perl</package> + <package>sax2-tools</package> + <package>sblim-cmpi-base</package> + <package>sblim-cmpi-base-devel</package> + <package>sblim-cmpi-devel</package> + <package>sblim-cmpiutil-devel</package> + <package>sblim-indication_helper</package> + <package>sblim-sfcb</package> + <package>sblim-sfcc</package> + <package>sblim-sfcc-devel</package> + <package>scim</package> + <package>scim-devel</package> + <package>scpm-devel</package> + <package>scrollkeeper</package> + <package>scrollkeeper-lang</package> + <package>seahorse</package> + <package>seahorse-devel</package> + <package>seahorse-lang</package> + <package>sendmail</package> + <package>sendmail-devel</package> + <package>sg3_utils-devel</package> + <package>sgml-skel</package> + <package>shared-mime-info</package> + <package>silc-toolkit</package> + <package>silc-toolkit-devel</package> + <package>slang</package> + <package>slang-devel</package> + <package>soprano</package> + <package>soprano-backend-redland</package> + <package>spamassassin</package> + <package>speex-devel</package> + <package>splashy-devel</package> + <package>sqlite2</package> + <package>sqlite3-devel</package> + <package>startup-notification</package> + <package>startup-notification-devel</package> + <package>strigi</package> + <package>strigi-devel</package> + <package>subversion</package> + <package>subversion-perl</package> + <package>susehelp</package> + <package>susehelp_cz</package> + <package>susehelp_de</package> + <package>susehelp_en</package> + <package>susehelp_es</package> + <package>susehelp_fr</package> + <package>susehelp_hu</package> + <package>susehelp_it</package> + <package>swig</package> + <package>syslogd</package> + <package>t1lib</package> + <package>t1lib-devel</package> + <package>taglib</package> + <package>taglib-devel</package> + <package>taglib-sharp</package> + <package>tango-icon-theme</package> + <package>tcl-devel</package> + <package>tcpd-devel</package> + <package>telepathy-glib-devel</package> + <package>telepathy-mission-control</package> + <package>telepathy-mission-control-devel</package> + <package>texlive-bin-devel</package> + <package>texlive-devel</package> + <package>tk-devel</package> + <package>tla</package> + <package>tn5250</package> + <package>tn5250-devel</package> + <package>tomoe</package> + <package>tomoe-devel</package> + <package>tomoe-gtk</package> + <package>tomoe-gtk-devel</package> + <package>tomoe-gtk-lang</package> + <package>totem-pl-parser</package> + <package>totem-pl-parser-devel</package> + <package>totem-pl-parser-lang</package> + <package>trousers</package> + <package>trousers-devel</package> + <package>tsclient</package> + <package>tsclient-devel</package> + <package>tsclient-lang</package> + <package>uim</package> + <package>uim-devel</package> + <package>unixODBC</package> + <package>unixODBC-devel</package> + <package>unsermake</package> + <package>update-desktop-files</package> + <package>usb_modeswitch</package> + <package>usb_modeswitch-data</package> + <package>valgrind</package> + <package>valgrind-devel</package> + <package>vte</package> + <package>vte-devel</package> + <package>vte-lang</package> + <package>wdiff</package> + <package>webkit-sharp</package> + <package>wireshark</package> + <package>wireshark-devel</package> + <package>wodim-devel</package> + <package>wordcut</package> + <package>wordcut-devel</package> + <package>words</package> + <package>wpa_supplicant</package> + <package>wvstreams</package> + <package>wvstreams-devel</package> + <package>wxGTK-compat</package> + <package>wxGTK-devel</package> + <package>wxGTK-gl</package> + <package>x11-input-wacom</package> + <package>x11-input-wacom-devel</package> + <package>x11-input-wacom-tools</package> + <package>xalan-j2</package> + <package>xaw3d-devel</package> + <package>xbase</package> + <package>xbase-devel</package> + <package>xdelta</package> + <package>xdelta-devel</package> + <package>xdg-menu</package> + <package>xen-devel</package> + <package>xen-libs</package> + <package>xerces-j2</package> + <package>xerces-j2-bootstrap</package> + <package>xerces-j2-xml-apis</package> + <package>xfsprogs-devel</package> + <package>xml-commons-apis-bootstrap</package> + <package>xml-commons-resolver-bootstrap</package> + <package>xml-commons-which-bootstrap</package> + <package>xmlcharent</package> + <package>xorg-x11</package> + <package>xorg-x11-devel</package> + <package>xorg-x11-fonts</package> + <package>xorg-x11-fonts-core</package> + <package>xorg-x11-fonts-devel</package> + <package>xorg-x11-libICE-devel</package> + <package>xorg-x11-libSM-devel</package> + <package>xorg-x11-libX11-devel</package> + <package>xorg-x11-libXau-devel</package> + <package>xorg-x11-libXdmcp-devel</package> + <package>xorg-x11-libXext-devel</package> + <package>xorg-x11-libXfixes-devel</package> + <package>xorg-x11-libXmu-devel</package> + <package>xorg-x11-libXp-devel</package> + <package>xorg-x11-libXpm-devel</package> + <package>xorg-x11-libXprintUtil-devel</package> + <package>xorg-x11-libXrender-devel</package> + <package>xorg-x11-libXt-devel</package> + <package>xorg-x11-libXv-devel</package> + <package>xorg-x11-libfontenc-devel</package> + <package>xorg-x11-libxcb-devel</package> + <package>xorg-x11-libxkbfile-devel</package> + <package>xorg-x11-proto-devel</package> + <package>xorg-x11-server</package> + <package>xorg-x11-util-devel</package> + <package>xorg-x11-xauth</package> + <package>xorg-x11-xtrans-devel</package> + <package>xosd</package> + <package>xosd-devel</package> + <package>xsp</package> + <package>xterm</package> + <package>xz-devel</package> + <package>yast2-core-devel</package> + <package>yast2-devtools</package> + <package>yast2-gtk</package> + <package>yast2-libyui-devel</package> + <package>yast2-ncurses-devel</package> + <package>yast2-qt</package> + <package>yast2-qt-devel</package> + <package>yast2-qt-pkg</package> + <package>yast2-storage-devel</package> + <package>yast2-ycp-ui-bindings-devel</package> + <package>yelp</package> + <package>yelp-lang</package> + <package>zenity</package> + <package>zenity-lang</package> + <package>zlib-devel</package> + <package>zsh</package> + <package>zvbi-devel</package> + </remove-packages> + + </software> + <user_defaults> + <expire></expire> + <group>100</group> + <groups>video,dialout</groups> + <home>/home</home> + <inactive>-1</inactive> + <shell>/bin/bash</shell> + <skel>/etc/skel</skel> + <umask>022</umask> + </user_defaults> + <users config:type="list"> + <user> + <encrypted config:type="boolean">true</encrypted> + <fullname>vagrant</fullname> + <gid>100</gid> + <home>/home/vagrant</home> + <password_settings> + <expire></expire> + <flag></flag> + <inact></inact> + <max>99999</max> + <min>0</min> + <warn>7</warn> + </password_settings> + <shell>/bin/bash</shell> + <uid>1000</uid> + <user_password>$2y$05$NA1Li9ZKJOLRW5mMTXm6/e5r8dltWS5RpDZpvHrI82aLE00V51tdi</user_password> + <username>vagrant</username> + </user> + <user> + <encrypted config:type="boolean">true</encrypted> + <fullname>Games account</fullname> + <gid>100</gid> + <home>/var/games</home> + <password_settings> + <expire></expire> + <flag></flag> + <inact></inact> + <max></max> + <min></min> + <warn></warn> + </password_settings> + <shell>/bin/bash</shell> + <uid>12</uid> + <user_password>*</user_password> + <username>games</username> + </user> + <user> + <encrypted config:type="boolean">true</encrypted> + <fullname>bin</fullname> + <gid>1</gid> + <home>/bin</home> + <password_settings> + <expire></expire> + <flag></flag> + <inact></inact> + <max></max> + <min></min> + <warn></warn> + </password_settings> + <shell>/bin/bash</shell> + <uid>1</uid> + <user_password>*</user_password> + <username>bin</username> + </user> + <user> + <encrypted config:type="boolean">true</encrypted> + <fullname>nobody</fullname> + <gid>65533</gid> + <home>/var/lib/nobody</home> + <password_settings> + <expire></expire> + <flag></flag> + <inact></inact> + <max></max> + <min></min> + <warn></warn> + </password_settings> + <shell>/bin/bash</shell> + <uid>65534</uid> + <user_password>*</user_password> + <username>nobody</username> + </user> + <user> + <encrypted config:type="boolean">true</encrypted> + <fullname>Printing daemon</fullname> + <gid>7</gid> + <home>/var/spool/lpd</home> + <password_settings> + <expire></expire> + <flag></flag> + <inact></inact> + <max></max> + <min></min> + <warn></warn> + </password_settings> + <shell>/bin/bash</shell> + <uid>4</uid> + <user_password>*</user_password> + <username>lp</username> + </user> + <user> + <encrypted config:type="boolean">true</encrypted> + <fullname>User for uuidd</fullname> + <gid>104</gid> + <home>/var/run/uuidd</home> + <password_settings> + <expire></expire> + <flag></flag> + <inact></inact> + <max>99999</max> + <min>0</min> + <warn>7</warn> + </password_settings> + <shell>/bin/false</shell> + <uid>102</uid> + <user_password>*</user_password> + <username>uuidd</username> + </user> + <user> + <encrypted config:type="boolean">true</encrypted> + <fullname>Postfix Daemon</fullname> + <gid>51</gid> + <home>/var/spool/postfix</home> + <password_settings> + <expire></expire> + <flag></flag> + <inact></inact> + <max>99999</max> + <min>0</min> + <warn>7</warn> + </password_settings> + <shell>/bin/false</shell> + <uid>51</uid> + <user_password>*</user_password> + <username>postfix</username> + </user> + <user> + <encrypted config:type="boolean">true</encrypted> + <fullname>Novell Customer Center User</fullname> + <gid>111</gid> + <home>/var/lib/YaST2/suse-ncc-fakehome</home> + <password_settings> + <expire></expire> + <flag></flag> + <inact></inact> + <max>99999</max> + <min>0</min> + <warn>7</warn> + </password_settings> + <shell>/bin/bash</shell> + <uid>106</uid> + <user_password>*</user_password> + <username>suse-ncc</username> + </user> + <user> + <encrypted config:type="boolean">true</encrypted> + <fullname>FTP account</fullname> + <gid>49</gid> + <home>/srv/ftp</home> + <password_settings> + <expire></expire> + <flag></flag> + <inact></inact> + <max></max> + <min></min> + <warn></warn> + </password_settings> + <shell>/bin/bash</shell> + <uid>40</uid> + <user_password>*</user_password> + <username>ftp</username> + </user> + <user> + <encrypted config:type="boolean">true</encrypted> + <fullname>Gnome Display Manager daemon</fullname> + <gid>112</gid> + <home>/var/lib/gdm</home> + <password_settings> + <expire></expire> + <flag></flag> + <inact></inact> + <max>99999</max> + <min>0</min> + <warn>7</warn> + </password_settings> + <shell>/bin/false</shell> + <uid>107</uid> + <user_password>*</user_password> + <username>gdm</username> + </user> + <user> + <encrypted config:type="boolean">true</encrypted> + <fullname>Batch jobs daemon</fullname> + <gid>25</gid> + <home>/var/spool/atjobs</home> + <password_settings> + <expire></expire> + <flag></flag> + <inact></inact> + <max>99999</max> + <min>0</min> + <warn>7</warn> + </password_settings> + <shell>/bin/bash</shell> + <uid>25</uid> + <user_password>*</user_password> + <username>at</username> + </user> + <user> + <encrypted config:type="boolean">true</encrypted> + <fullname>root</fullname> + <gid>0</gid> + <home>/root</home> + <password_settings> + <expire></expire> + <flag></flag> + <inact></inact> + <max></max> + <min></min> + <warn></warn> + </password_settings> + <shell>/bin/bash</shell> + <uid>0</uid> + <user_password>$2y$05$NA1Li9ZKJOLRW5mMTXm6/e5r8dltWS5RpDZpvHrI82aLE00V51tdi</user_password> + <username>root</username> + </user> + <user> + <encrypted config:type="boolean">true</encrypted> + <fullname>Mailer daemon</fullname> + <gid>12</gid> + <home>/var/spool/clientmqueue</home> + <password_settings> + <expire></expire> + <flag></flag> + <inact></inact> + <max></max> + <min></min> + <warn></warn> + </password_settings> + <shell>/bin/false</shell> + <uid>8</uid> + <user_password>*</user_password> + <username>mail</username> + </user> + <user> + <encrypted config:type="boolean">true</encrypted> + <fullname>Daemon</fullname> + <gid>2</gid> + <home>/sbin</home> + <password_settings> + <expire></expire> + <flag></flag> + <inact></inact> + <max></max> + <min></min> + <warn></warn> + </password_settings> + <shell>/bin/bash</shell> + <uid>2</uid> + <user_password>*</user_password> + <username>daemon</username> + </user> + <user> + <encrypted config:type="boolean">true</encrypted> + <fullname>NTP daemon</fullname> + <gid>108</gid> + <home>/var/lib/ntp</home> + <password_settings> + <expire></expire> + <flag></flag> + <inact></inact> + <max>99999</max> + <min>0</min> + <warn>7</warn> + </password_settings> + <shell>/bin/false</shell> + <uid>74</uid> + <user_password>*</user_password> + <username>ntp</username> + </user> + <user> + <encrypted config:type="boolean">true</encrypted> + <fullname>Unix-to-Unix CoPy system</fullname> + <gid>14</gid> + <home>/etc/uucp</home> + <password_settings> + <expire></expire> + <flag></flag> + <inact></inact> + <max></max> + <min></min> + <warn></warn> + </password_settings> + <shell>/bin/bash</shell> + <uid>10</uid> + <user_password>*</user_password> + <username>uucp</username> + </user> + <user> + <encrypted config:type="boolean">true</encrypted> + <fullname>User for D-Bus</fullname> + <gid>101</gid> + <home>/var/run/dbus</home> + <password_settings> + <expire></expire> + <flag></flag> + <inact></inact> + <max></max> + <min>0</min> + <warn>7</warn> + </password_settings> + <shell>/bin/false</shell> + <uid>100</uid> + <user_password>*</user_password> + <username>messagebus</username> + </user> + <user> + <encrypted config:type="boolean">true</encrypted> + <fullname>User for haldaemon</fullname> + <gid>102</gid> + <home>/var/run/hald</home> + <password_settings> + <expire></expire> + <flag></flag> + <inact></inact> + <max></max> + <min>0</min> + <warn>7</warn> + </password_settings> + <shell>/bin/false</shell> + <uid>101</uid> + <user_password>*</user_password> + <username>haldaemon</username> + </user> + <user> + <encrypted config:type="boolean">true</encrypted> + <fullname>WWW daemon apache</fullname> + <gid>8</gid> + <home>/var/lib/wwwrun</home> + <password_settings> + <expire></expire> + <flag></flag> + <inact></inact> + <max></max> + <min></min> + <warn></warn> + </password_settings> + <shell>/bin/false</shell> + <uid>30</uid> + <user_password>*</user_password> + <username>wwwrun</username> + </user> + <user> + <encrypted config:type="boolean">true</encrypted> + <fullname>Manual pages viewer</fullname> + <gid>62</gid> + <home>/var/cache/man</home> + <password_settings> + <expire></expire> + <flag></flag> + <inact></inact> + <max></max> + <min></min> + <warn></warn> + </password_settings> + <shell>/bin/bash</shell> + <uid>13</uid> + <user_password>*</user_password> + <username>man</username> + </user> + <user> + <encrypted config:type="boolean">true</encrypted> + <fullname>PolicyKit</fullname> + <gid>107</gid> + <home>/var/run/PolicyKit</home> + <password_settings> + <expire></expire> + <flag></flag> + <inact></inact> + <max>99999</max> + <min>0</min> + <warn>7</warn> + </password_settings> + <shell>/bin/false</shell> + <uid>104</uid> + <user_password>*</user_password> + <username>polkituser</username> + </user> + <user> + <encrypted config:type="boolean">true</encrypted> + <fullname>News system</fullname> + <gid>13</gid> + <home>/etc/news</home> + <password_settings> + <expire></expire> + <flag></flag> + <inact></inact> + <max></max> + <min></min> + <warn></warn> + </password_settings> + <shell>/bin/bash</shell> + <uid>9</uid> + <user_password>*</user_password> + <username>news</username> + </user> + <user> + <fullname>SSH daemon</fullname> + <gid>65</gid> + <home>/var/lib/sshd</home> + <shell>/bin/false</shell> + <uid>71</uid> + <username>sshd</username> + </user> + <user> + <encrypted config:type="boolean">true</encrypted> + <fullname>PulseAudio daemon</fullname> + <gid>109</gid> + <home>/var/lib/pulseaudio</home> + <password_settings> + <expire></expire> + <flag></flag> + <inact></inact> + <max>99999</max> + <min>0</min> + <warn>7</warn> + </password_settings> + <shell>/bin/false</shell> + <uid>105</uid> + <user_password>*</user_password> + <username>pulse</username> + </user> + </users> +</profile> diff --git a/packer/scripts/sles/remove-dvd-source.sh b/packer/scripts/sles/remove-dvd-source.sh new file mode 100644 index 000000000..5724930d1 --- /dev/null +++ b/packer/scripts/sles/remove-dvd-source.sh @@ -0,0 +1,21 @@ +#!/bin/sh -eux + +if [ 'x86_64' == `uname -m` ]; then + arch_suffix=x64 +else + arch_suffix=x86 +fi + +patchlevel=`grep PATCHLEVEL /etc/SuSE-release | awk '{ print $3 }'` +if [ $patchlevel == '2' ]; then + repo_ver="11.2.2-1.234" +elif [ $patchlevel == '3']; then + repo_ver="11.3.3-1.138" +else + echo "Failed to remove DVD source; don't know how to deal with patchlevel $patchlevel" + exit 1 +fi + +zypper removerepo "SUSE-Linux-Enterprise-Server-11-SP$patchlevel $repo_ver" +zypper addrepo "http://demeter.uni-regensburg.de/SLES11SP$patchlevel-$arch_suffix/DVD1/" "SLES11SP$patchlevel-$arch_suffix DVD1 Online" +zypper refresh diff --git a/packer/scripts/suse/sudoers.sh b/packer/scripts/sles/sudoers.sh similarity index 100% rename from packer/scripts/suse/sudoers.sh rename to packer/scripts/sles/sudoers.sh diff --git a/packer/scripts/sles/zypper-locks.sh b/packer/scripts/sles/zypper-locks.sh new file mode 100644 index 000000000..5ac5e7d15 --- /dev/null +++ b/packer/scripts/sles/zypper-locks.sh @@ -0,0 +1,4 @@ +#!/bin/sh -eux + +# remove zypper locks on removed packages to avoid later dependency problems +zypper --non-interactive rl \* diff --git a/packer/sles-11-sp2-i386.json b/packer/sles-11-sp2-i386.json new file mode 100644 index 000000000..39b17e12e --- /dev/null +++ b/packer/sles-11-sp2-i386.json @@ -0,0 +1,101 @@ +{ + "variables": { + "chef_version": "provisionerless", + "mirror": "http://cdn2.novell.com/prot/FkjGyLMMiss~" + }, + "builders": [ + { + "type": "virtualbox", + "boot_command": [ + "<esc><enter><wait>", + "linux netdevice=eth0 netsetup=dhcp install=cd:/<wait>", + " lang=en_US autoyast=http://{{ .HTTPIP }}:{{ .HTTPPort }}/sles-11/sles-11-sp2-i386-autoinst.xml<wait>", + " textmode=1<wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 20480, + "guest_os_type": "OpenSUSE", + "http_directory": "http", + "iso_checksum": "a0b34f6237b2b2a6b2174c82b40ed326", + "iso_checksum_type": "md5", + "iso_url": "{{user `mirror`}}/SLES-11-SP2-DVD-i586-GM-DVD1.iso", + "ssh_username": "vagrant", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_wait_timeout": "10000s", + "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", + "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "virtualbox_version_file": ".vbox_version", + "vm_name": "packer-sles-11-sp2-x86_64", + "output_directory": "packer-sles-11-sp2-x86_64", + "vboxmanage": [ + [ + "modifyvm", + "{{.Name}}", + "--memory", + "480" + ], + [ + "modifyvm", + "{{.Name}}", + "--cpus", + "1" + ] + ] + }, + { + "type": "vmware", + "boot_command": [ + "<esc><enter><wait>", + "linux netdevice=eth0 netsetup=dhcp install=cd:/<wait>", + " lang=en_US autoyast=http://{{ .HTTPIP }}:{{ .HTTPPort }}/sles-11/sles-11-sp2-i386-autoinst.xml", + " textmode=1<wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 20480, + "guest_os_type": "sles11", + "http_directory": "http", + "iso_checksum": "a0b34f6237b2b2a6b2174c82b40ed326", + "iso_checksum_type": "md5", + "iso_url": "{{user `mirror`}}/SLES-11-SP2-DVD-i586-GM-DVD1.iso", + "ssh_username": "vagrant", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_wait_timeout": "10000s", + "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", + "tools_upload_flavor": "linux", + "vmx_data": { + "memsize": "480", + "numvcpus": "1", + "cpuid.coresPerSocket": "1" + }, + "vm_name": "packer-sles11sp2-x86_64", + "output_directory": "packer-sles11sp2-x86_64" + } + ], + "post-processors": [ + { + "output": "../builds/{{.Provider}}/opscode_sles-11sp2-i386_chef-{{user `chef_version`}}.box", + "type": "vagrant" + } + ], + "provisioners": [ + { + "type": "shell", + "environment_vars": [ "CHEF_VERSION={{user `chef_version`}}" ], + "scripts": [ + "scripts/common/sshd.sh", + "scripts/common/vagrant.sh", + "scripts/common/vmtools.sh", + "scripts/common/chef.sh", + "scripts/sles/sudoers.sh", + "scripts/sles/zypper-locks.sh", + "scripts/sles/remove-dvd-source.sh", + "scripts/common/minimize.sh" + ], + "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh '{{.Path}}'" + } + ] +} diff --git a/packer/sles-11-sp2-x86_64.json b/packer/sles-11-sp2-x86_64.json new file mode 100644 index 000000000..f980f71dd --- /dev/null +++ b/packer/sles-11-sp2-x86_64.json @@ -0,0 +1,101 @@ +{ + "variables": { + "chef_version": "provisionerless", + "mirror": "http://cdn2.novell.com/free/h0AOp5AT-18~" + }, + "builders": [ + { + "type": "virtualbox", + "boot_command": [ + "<esc><enter><wait>", + "linux netdevice=eth0 netsetup=dhcp install=cd:/<wait>", + " lang=en_US autoyast=http://{{ .HTTPIP }}:{{ .HTTPPort }}/sles-11/sles-11-sp2-x86_64-autoinst.xml<wait>", + " textmode=1<wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 20480, + "guest_os_type": "OpenSUSE_64", + "http_directory": "http", + "iso_checksum": "461d82ae6e15062b0807c1338f040497", + "iso_checksum_type": "md5", + "iso_url": "{{user `mirror`}}/SLES-11-SP2-DVD-x86_64-GM-DVD1.iso", + "ssh_username": "vagrant", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_wait_timeout": "10000s", + "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", + "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "virtualbox_version_file": ".vbox_version", + "vm_name": "packer-sles-11-sp2-x86_64", + "output_directory": "packer-sles-11-sp2-x86_64", + "vboxmanage": [ + [ + "modifyvm", + "{{.Name}}", + "--memory", + "480" + ], + [ + "modifyvm", + "{{.Name}}", + "--cpus", + "1" + ] + ] + }, + { + "type": "vmware", + "boot_command": [ + "<esc><enter><wait>", + "linux netdevice=eth0 netsetup=dhcp install=cd:/<wait>", + " lang=en_US autoyast=http://{{ .HTTPIP }}:{{ .HTTPPort }}/sles-11/sles-11-sp2-x86_64-autoinst.xml", + " textmode=1<wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 20480, + "guest_os_type": "sles11-64", + "http_directory": "http", + "iso_checksum": "461d82ae6e15062b0807c1338f040497", + "iso_checksum_type": "md5", + "iso_url": "{{user `mirror`}}/SLES-11-SP2-DVD-x86_64-GM-DVD1.iso", + "ssh_username": "vagrant", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_wait_timeout": "10000s", + "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", + "tools_upload_flavor": "linux", + "vmx_data": { + "memsize": "480", + "numvcpus": "1", + "cpuid.coresPerSocket": "1" + }, + "vm_name": "packer-sles11sp2-x86_64", + "output_directory": "packer-sles11sp2-x86_64" + } + ], + "post-processors": [ + { + "output": "../builds/{{.Provider}}/opscode_sles-11sp2_chef-{{user `chef_version`}}.box", + "type": "vagrant" + } + ], + "provisioners": [ + { + "type": "shell", + "environment_vars": [ "CHEF_VERSION={{user `chef_version`}}" ], + "scripts": [ + "scripts/common/sshd.sh", + "scripts/common/vagrant.sh", + "scripts/common/vmtools.sh", + "scripts/common/chef.sh", + "scripts/sles/sudoers.sh", + "scripts/sles/zypper-locks.sh", + "scripts/sles/remove-dvd-source.sh", + "scripts/common/minimize.sh" + ], + "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh '{{.Path}}'" + } + ] +} diff --git a/packer/sles-11-sp3-i386.json b/packer/sles-11-sp3-i386.json new file mode 100644 index 000000000..4ced6c7c2 --- /dev/null +++ b/packer/sles-11-sp3-i386.json @@ -0,0 +1,101 @@ +{ + "variables": { + "chef_version": "provisionerless", + "mirror": "http://cdn2.novell.com/prot/4uiuDMzX0ck~" + }, + "builders": [ + { + "type": "virtualbox", + "boot_command": [ + "<esc><enter><wait>", + "linux netdevice=eth0 netsetup=dhcp install=cd:/<wait>", + " lang=en_US autoyast=http://{{ .HTTPIP }}:{{ .HTTPPort }}/sles-11/sles-11-sp3-i386-autoinst.xml<wait>", + " textmode=1<wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 20480, + "guest_os_type": "OpenSUSE", + "http_directory": "http", + "iso_checksum": "5c30a409fc8fb3343b4dc90d93ff2c89", + "iso_checksum_type": "md5", + "iso_url": "{{user `mirror`}}/SLES-11-SP3-DVD-i586-GM-DVD1.iso", + "ssh_username": "vagrant", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_wait_timeout": "10000s", + "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", + "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "virtualbox_version_file": ".vbox_version", + "vm_name": "packer-sles-11-sp3-x86_64", + "output_directory": "packer-sles-11-sp3-x86_64", + "vboxmanage": [ + [ + "modifyvm", + "{{.Name}}", + "--memory", + "480" + ], + [ + "modifyvm", + "{{.Name}}", + "--cpus", + "1" + ] + ] + }, + { + "type": "vmware", + "boot_command": [ + "<esc><enter><wait>", + "linux netdevice=eth0 netsetup=dhcp install=cd:/<wait>", + " lang=en_US autoyast=http://{{ .HTTPIP }}:{{ .HTTPPort }}/sles-11/sles-11-sp3-i386-autoinst.xml", + " textmode=1<wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 20480, + "guest_os_type": "sles11", + "http_directory": "http", + "iso_checksum": "5c30a409fc8fb3343b4dc90d93ff2c89", + "iso_checksum_type": "md5", + "iso_url": "{{user `mirror`}}/SLES-11-SP3-DVD-i586-GM-DVD1.iso", + "ssh_username": "vagrant", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_wait_timeout": "10000s", + "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", + "tools_upload_flavor": "linux", + "vmx_data": { + "memsize": "480", + "numvcpus": "1", + "cpuid.coresPerSocket": "1" + }, + "vm_name": "packer-sles11sp2-x86_64", + "output_directory": "packer-sles11sp2-x86_64" + } + ], + "post-processors": [ + { + "output": "../builds/{{.Provider}}/opscode_sles-11sp3-i386_chef-{{user `chef_version`}}.box", + "type": "vagrant" + } + ], + "provisioners": [ + { + "type": "shell", + "environment_vars": [ "CHEF_VERSION={{user `chef_version`}}" ], + "scripts": [ + "scripts/common/sshd.sh", + "scripts/common/vagrant.sh", + "scripts/common/vmtools.sh", + "scripts/common/chef.sh", + "scripts/sles/sudoers.sh", + "scripts/sles/zypper-locks.sh", + "scripts/sles/remove-dvd-source.sh", + "scripts/common/minimize.sh" + ], + "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh '{{.Path}}'" + } + ] +} diff --git a/packer/sles-11-sp3-x86_64.json b/packer/sles-11-sp3-x86_64.json new file mode 100644 index 000000000..174a5c92f --- /dev/null +++ b/packer/sles-11-sp3-x86_64.json @@ -0,0 +1,101 @@ +{ + "variables": { + "chef_version": "provisionerless", + "mirror": "http://cdn2.novell.com/prot/Q_VbW21BiB4~" + }, + "builders": [ + { + "type": "virtualbox", + "boot_command": [ + "<esc><enter><wait>", + "linux netdevice=eth0 netsetup=dhcp install=cd:/<wait>", + " lang=en_US autoyast=http://{{ .HTTPIP }}:{{ .HTTPPort }}/sles-11/sles-11-sp3-x86_64-autoinst.xml<wait>", + " textmode=1<wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 20480, + "guest_os_type": "OpenSUSE_64", + "http_directory": "http", + "iso_checksum": "480b70d50cbb538382dc2b9325221e1b", + "iso_checksum_type": "md5", + "iso_url": "{{user `mirror`}}/SLES-11-SP3-DVD-x86_64-GM-DVD1.iso", + "ssh_username": "vagrant", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_wait_timeout": "10000s", + "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", + "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "virtualbox_version_file": ".vbox_version", + "vm_name": "packer-sles-11-sp3-x86_64", + "output_directory": "packer-sles-11-sp3-x86_64", + "vboxmanage": [ + [ + "modifyvm", + "{{.Name}}", + "--memory", + "480" + ], + [ + "modifyvm", + "{{.Name}}", + "--cpus", + "1" + ] + ] + }, + { + "type": "vmware", + "boot_command": [ + "<esc><enter><wait>", + "linux netdevice=eth0 netsetup=dhcp install=cd:/<wait>", + " lang=en_US autoyast=http://{{ .HTTPIP }}:{{ .HTTPPort }}/sles-11/sles-11-sp3-x86_64-autoinst.xml", + " textmode=1<wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 20480, + "guest_os_type": "sles11-64", + "http_directory": "http", + "iso_checksum": "480b70d50cbb538382dc2b9325221e1b", + "iso_checksum_type": "md5", + "iso_url": "{{user `mirror`}}/SLES-11-SP3-DVD-x86_64-GM-DVD1.iso", + "ssh_username": "vagrant", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_wait_timeout": "10000s", + "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", + "tools_upload_flavor": "linux", + "vmx_data": { + "memsize": "480", + "numvcpus": "1", + "cpuid.coresPerSocket": "1" + }, + "vm_name": "packer-sles11sp3-x86_64", + "output_directory": "packer-sles11sp3-x86_64" + } + ], + "post-processors": [ + { + "output": "../builds/{{.Provider}}/opscode_sles-11sp3_chef-{{user `chef_version`}}.box", + "type": "vagrant" + } + ], + "provisioners": [ + { + "type": "shell", + "environment_vars": [ "CHEF_VERSION={{user `chef_version`}}" ], + "scripts": [ + "scripts/common/sshd.sh", + "scripts/common/vagrant.sh", + "scripts/common/vmtools.sh", + "scripts/common/chef.sh", + "scripts/sles/sudoers.sh", + "scripts/sles/zypper-locks.sh", + "scripts/sles/remove-dvd-source.sh", + "scripts/common/minimize.sh" + ], + "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh '{{.Path}}'" + } + ] +} From 078ec12fcea1cbf5b7374d2cde24d6e47546531e Mon Sep 17 00:00:00 2001 From: "Julian C. Dunn" <jdunn@opscode.com> Date: Wed, 4 Dec 2013 00:17:43 -0500 Subject: [PATCH 0143/1622] [BENTO-83] Add special note about proprietary boxes and how the URLs are bogus. Reformat readme using atx headers rather than setext, so we get more levels. --- README.md | 35 +++++++++++++++++++---------------- 1 file changed, 19 insertions(+), 16 deletions(-) diff --git a/README.md b/README.md index 8b04ae913..5c8ba96f0 100644 --- a/README.md +++ b/README.md @@ -1,13 +1,12 @@ -Bento -===== +# Bento Bento is a project that encapsulates [Packer](http://packer.io) templates for building [Vagrant](http://vagrantup.com) baseboxes. We use these boxes internally at Opscode for testing Hosted Enterprise Chef, Private Enterprise Chef and our open source [cookbooks](http://community.opscode.com/users/Opscode) via [test-kitchen](http://github.com/opscode/test-kitchen). -Current Baseboxes ------------------ +## Current Baseboxes + The following baseboxes are publicly available and were built using this project. Note that our baseboxes do not include Chef Client. Vagrant can be instructed to install Chef at runtime using the @@ -46,7 +45,7 @@ These baseboxes were all built using a Mac OS X host running VirtualBox 4.3.2, a ### VMWare -These baseboxes were all built using a Mac OS X host running VMWare Fusion 6.0.3, and have that version of VMWare Tools. +These baseboxes were all built using a Mac OS X host running VMWare Fusion 6.0.2, and have that version of VMWare Tools. The boxes should work unchanged in VMWare Workstation for Windows or Linux. * [opscode-centos-5.10-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_centos-5.10-i386_chef-provisionerless.box) @@ -76,13 +75,13 @@ The boxes should work unchanged in VMWare Workstation for Windows or Linux. * [opscode-ubuntu-13.10-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_ubuntu-13.10-i386_chef-provisionerless.box) * [opscode-ubuntu-13.10](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_ubuntu-13.10_chef-provisionerless.box) -Older Baseboxes ---------------- +## Older Baseboxes + Older baseboxes include Chef and therefore are not compatible with some new plugins. The full list of old boxes are available in the [old boxes file](https://github.com/opscode/bento/blob/master/OLD-BOXES.md). -Build Your Own Boxes --------------------- +## Build Your Own Boxes + First, install [Packer](http://packer.io) and then clone this project. Inside the `packer` directory, a JSON file describes each box that can be built. You can use `packer build` to build the @@ -100,25 +99,29 @@ If you only have VMware or VirtualBox available, you may also tell Packer to bui Congratulations! You now have box(es) in the ../builds directory that you can then add to Vagrant and start testing cookbooks. +### Proprietary Boxes + +Red Hat Enterprise Linux and SUSE Linux Enterprise Server templates are provided; however, their ISOs are not publicly retrievable. The URLs in those templates are bogus; you should substitute your server where you host the ISOs, using the mirror variable as above. + ### Veewee Definitions -Packer does not yet support Windows, so the veewee definitions are still used for building those boxes. You must build these +Packer does not yet support Windows, so veewee definitions are still used for building those boxes. You must build these boxes yourself due to licensing constraints. You can build these as follows: $ bundle install $ bundle exec veewee vbox build [definition-name] -Bugs and Issues ---------------- +## Bugs and Issues + Use the [issue tracker](http://tickets.opscode.com/browse/BENTO) to report bugs, features or other issues. -Contributing ------------- +## Contributing + [How to contribute to Opscode open source software projects](http://wiki.opscode.com/display/chef/How+to+Contribute) -License & Authors ------------------ +## License & Authors + These basebox templates were converted from [veewee](https://github.com/jedi4ever/veewee) definitions originally based on [work done by Tim Dysinger](https://github.com/dysinger/basebox) to From e8b01044ac4c76ead4d546473c7d367860767d98 Mon Sep 17 00:00:00 2001 From: Mark Cornick <mark@cornick.io> Date: Wed, 4 Dec 2013 16:07:14 -0500 Subject: [PATCH 0144/1622] BENTO-101: trivial syntax error in scripts/sles/remove-dvd-source.sh --- packer/scripts/sles/remove-dvd-source.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packer/scripts/sles/remove-dvd-source.sh b/packer/scripts/sles/remove-dvd-source.sh index 5724930d1..ba16b68e9 100644 --- a/packer/scripts/sles/remove-dvd-source.sh +++ b/packer/scripts/sles/remove-dvd-source.sh @@ -9,7 +9,7 @@ fi patchlevel=`grep PATCHLEVEL /etc/SuSE-release | awk '{ print $3 }'` if [ $patchlevel == '2' ]; then repo_ver="11.2.2-1.234" -elif [ $patchlevel == '3']; then +elif [ $patchlevel == '3' ]; then repo_ver="11.3.3-1.138" else echo "Failed to remove DVD source; don't know how to deal with patchlevel $patchlevel" From 2fd3170ec5d899e9c688ac0f29cae4ff10fad90e Mon Sep 17 00:00:00 2001 From: Douglas Mendizabal <douglas.mendizabal@rackspace.com> Date: Tue, 3 Dec 2013 12:13:31 -0600 Subject: [PATCH 0145/1622] Upgrade CentOS 6.4 templates to 6.5 templates. --- ...tos-6.4-i386.json => centos-6.5-i386.json} | 22 +++++++++---------- ...6.4-x86_64.json => centos-6.5-x86_64.json} | 22 +++++++++---------- packer/http/{centos-6.4 => centos-6.5}/ks.cfg | 0 3 files changed, 22 insertions(+), 22 deletions(-) rename packer/{centos-6.4-i386.json => centos-6.5-i386.json} (77%) rename packer/{centos-6.4-x86_64.json => centos-6.5-x86_64.json} (77%) rename packer/http/{centos-6.4 => centos-6.5}/ks.cfg (100%) diff --git a/packer/centos-6.4-i386.json b/packer/centos-6.5-i386.json similarity index 77% rename from packer/centos-6.4-i386.json rename to packer/centos-6.5-i386.json index 9e5097308..40175ec21 100644 --- a/packer/centos-6.4-i386.json +++ b/packer/centos-6.5-i386.json @@ -7,16 +7,16 @@ { "type": "virtualbox", "boot_command": [ - "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/centos-6.4/ks.cfg<enter><wait>" + "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/centos-6.5/ks.cfg<enter><wait>" ], "boot_wait": "10s", "disk_size": 40960, "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "guest_os_type": "RedHat", "http_directory": "http", - "iso_checksum": "4bd3a1de6f6dfcd7a2199487abf5a9304d696cae", + "iso_checksum": "67ea68068ae53d1f23431072ec0288b3e1abfe4d" "iso_checksum_type": "sha1", - "iso_url": "{{user `mirror`}}/6.4/isos/i386/CentOS-6.4-i386-bin-DVD1.iso", + "iso_url": "{{user `mirror`}}/6.5/isos/i386/CentOS-6.5-i386-bin-DVD1.iso", "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, @@ -27,29 +27,29 @@ [ "modifyvm", "{{.Name}}", "--cpus", "1" ] ], "virtualbox_version_file": ".vbox_version", - "vm_name": "packer-centos-6.4-i386", - "output_directory": "packer-centos-6.4-i386" + "vm_name": "packer-centos-6.5-i386", + "output_directory": "packer-centos-6.5-i386" }, { "type": "vmware", "boot_command": [ - "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/centos-6.4/ks.cfg<enter><wait>" + "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/centos-6.5/ks.cfg<enter><wait>" ], "boot_wait": "10s", "disk_size": 40960, "guest_os_type": "centos", "http_directory": "http", - "iso_checksum": "4bd3a1de6f6dfcd7a2199487abf5a9304d696cae", + "iso_checksum": "67ea68068ae53d1f23431072ec0288b3e1abfe4d", "iso_checksum_type": "sha1", - "iso_url": "http://mirrors.kernel.org/centos/6.4/isos/i386/CentOS-6.4-i386-bin-DVD1.iso", + "iso_url": "http://mirrors.kernel.org/centos/6.5/isos/i386/CentOS-6.5-i386-bin-DVD1.iso", "tools_upload_flavor": "linux", "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", - "vm_name": "packer-centos-6.4-i386", - "output_directory": "packer-centos-6.4-i386", + "vm_name": "packer-centos-6.5-i386", + "output_directory": "packer-centos-6.5-i386", "vmx_data": { "cpuid.coresPerSocket": "1", "memsize": "480", @@ -59,7 +59,7 @@ ], "post-processors": [ { - "output": "../builds/{{.Provider}}/opscode_centos-6.4-i386_chef-{{user `chef_version`}}.box", + "output": "../builds/{{.Provider}}/opscode_centos-6.5-i386_chef-{{user `chef_version`}}.box", "type": "vagrant" } ], diff --git a/packer/centos-6.4-x86_64.json b/packer/centos-6.5-x86_64.json similarity index 77% rename from packer/centos-6.4-x86_64.json rename to packer/centos-6.5-x86_64.json index ca4a556b0..6751ba56c 100644 --- a/packer/centos-6.4-x86_64.json +++ b/packer/centos-6.5-x86_64.json @@ -7,16 +7,16 @@ { "type": "virtualbox", "boot_command": [ - "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/centos-6.4/ks.cfg<enter><wait>" + "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/centos-6.5/ks.cfg<enter><wait>" ], "boot_wait": "10s", "disk_size": 40960, "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "guest_os_type": "RedHat_64", "http_directory": "http", - "iso_checksum": "8672dc087f1b0eda60b9efaa41b82f034f185e24", + "iso_checksum": "32c7695b97f7dcd1f59a77a71f64f2957dddf738", "iso_checksum_type": "sha1", - "iso_url": "{{user `mirror`}}/6.4/isos/x86_64/CentOS-6.4-x86_64-bin-DVD1.iso", + "iso_url": "{{user `mirror`}}/6.5/isos/x86_64/CentOS-6.5-x86_64-bin-DVD1.iso", "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, @@ -27,29 +27,29 @@ [ "modifyvm", "{{.Name}}", "--cpus", "1" ] ], "virtualbox_version_file": ".vbox_version", - "vm_name": "packer-centos-6.4-x86_64", - "output_directory": "packer-centos-6.4-x86_64" + "vm_name": "packer-centos-6.5-x86_64", + "output_directory": "packer-centos-6.5-x86_64" }, { "type": "vmware", "boot_command": [ - "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/centos-6.4/ks.cfg<enter><wait>" + "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/centos-6.5/ks.cfg<enter><wait>" ], "boot_wait": "10s", "disk_size": 40960, "guest_os_type": "centos-64", "http_directory": "http", - "iso_checksum": "8672dc087f1b0eda60b9efaa41b82f034f185e24", + "iso_checksum": "32c7695b97f7dcd1f59a77a71f64f2957dddf738", "iso_checksum_type": "sha1", - "iso_url": "http://mirrors.kernel.org/centos/6.4/isos/x86_64/CentOS-6.4-x86_64-bin-DVD1.iso", + "iso_url": "http://mirrors.kernel.org/centos/6.5/isos/x86_64/CentOS-6.5-x86_64-bin-DVD1.iso", "tools_upload_flavor": "linux", "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", - "vm_name": "packer-centos-6.4-x86_64", - "output_directory": "packer-centos-6.4-x86_64", + "vm_name": "packer-centos-6.5-x86_64", + "output_directory": "packer-centos-6.5-x86_64", "vmx_data": { "cpuid.coresPerSocket": "1", "memsize": "480", @@ -59,7 +59,7 @@ ], "post-processors": [ { - "output": "../builds/{{.Provider}}/opscode_centos-6.4_chef-{{user `chef_version`}}.box", + "output": "../builds/{{.Provider}}/opscode_centos-6.5_chef-{{user `chef_version`}}.box", "type": "vagrant" } ], diff --git a/packer/http/centos-6.4/ks.cfg b/packer/http/centos-6.5/ks.cfg similarity index 100% rename from packer/http/centos-6.4/ks.cfg rename to packer/http/centos-6.5/ks.cfg From f01f56420c5dddfd13a486590e353b94050f6274 Mon Sep 17 00:00:00 2001 From: "Julian C. Dunn" <jdunn@opscode.com> Date: Wed, 4 Dec 2013 21:51:36 -0500 Subject: [PATCH 0146/1622] Migrate ks.cfgs for RHEL to centos-6.5. Also correct box naming. --- packer/rhel-6.5-i386.json | 12 ++++++------ packer/rhel-6.5-x86_64.json | 12 ++++++------ 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/packer/rhel-6.5-i386.json b/packer/rhel-6.5-i386.json index 2af6e32a8..84cf373db 100644 --- a/packer/rhel-6.5-i386.json +++ b/packer/rhel-6.5-i386.json @@ -6,7 +6,7 @@ { "type": "virtualbox", "boot_command": [ - "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/centos-6.4/ks.cfg<enter><wait>" + "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/centos-6.5/ks.cfg<enter><wait>" ], "boot_wait": "10s", "disk_size": 40960, @@ -26,13 +26,13 @@ [ "modifyvm", "{{.Name}}", "--cpus", "1" ] ], "virtualbox_version_file": ".vbox_version", - "vm_name": "packer-rhel-6.4-i386", - "output_directory": "packer-rhel-6.4-i386" + "vm_name": "packer-rhel-6.5-i386", + "output_directory": "packer-rhel-6.5-i386" }, { "type": "vmware", "boot_command": [ - "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/centos-6.4/ks.cfg<enter><wait>" + "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/centos-6.5/ks.cfg<enter><wait>" ], "boot_wait": "10s", "disk_size": 40960, @@ -47,8 +47,8 @@ "ssh_port": 22, "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", - "vm_name": "packer-rhel-6.4-i386", - "output_directory": "packer-rhel-6.4-i386", + "vm_name": "packer-rhel-6.5-i386", + "output_directory": "packer-rhel-6.5-i386", "vmx_data": { "cpuid.coresPerSocket": "1", "memsize": "480", diff --git a/packer/rhel-6.5-x86_64.json b/packer/rhel-6.5-x86_64.json index 44608b4d7..b06a5b76a 100644 --- a/packer/rhel-6.5-x86_64.json +++ b/packer/rhel-6.5-x86_64.json @@ -6,7 +6,7 @@ { "type": "virtualbox", "boot_command": [ - "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/centos-6.4/ks.cfg<enter><wait>" + "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/centos-6.5/ks.cfg<enter><wait>" ], "boot_wait": "10s", "disk_size": 40960, @@ -26,13 +26,13 @@ [ "modifyvm", "{{.Name}}", "--cpus", "1" ] ], "virtualbox_version_file": ".vbox_version", - "vm_name": "packer-rhel-6.4-x86_64", - "output_directory": "packer-rhel-6.4-x86_64" + "vm_name": "packer-rhel-6.5-x86_64", + "output_directory": "packer-rhel-6.5-x86_64" }, { "type": "vmware", "boot_command": [ - "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/centos-6.4/ks.cfg<enter><wait>" + "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/centos-6.5/ks.cfg<enter><wait>" ], "boot_wait": "10s", "disk_size": 40960, @@ -48,8 +48,8 @@ "ssh_port": 22, "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", - "vm_name": "packer-rhel-6.4-x86_64", - "output_directory": "packer-rhel-6.4-x86_64", + "vm_name": "packer-rhel-6.5-x86_64", + "output_directory": "packer-rhel-6.5-x86_64", "vmx_data": { "cpuid.coresPerSocket": "1", "memsize": "480", From 7a7ae248a9f5ba4fd8a815738fb684bb4833c99b Mon Sep 17 00:00:00 2001 From: "Julian C. Dunn" <jdunn@opscode.com> Date: Wed, 4 Dec 2013 21:59:17 -0500 Subject: [PATCH 0147/1622] Convert RHEL templates to use a user-configurable mirror. Since the URLs in there are bogus, this is the only way a user can build these boxes after hosting the ISOs on his/her own server. --- packer/rhel-5.10-i386.json | 7 ++++--- packer/rhel-5.10-x86_64.json | 7 ++++--- packer/rhel-6.5-i386.json | 7 ++++--- packer/rhel-6.5-x86_64.json | 7 ++++--- 4 files changed, 16 insertions(+), 12 deletions(-) diff --git a/packer/rhel-5.10-i386.json b/packer/rhel-5.10-i386.json index 4adbeea98..e488b0101 100644 --- a/packer/rhel-5.10-i386.json +++ b/packer/rhel-5.10-i386.json @@ -1,6 +1,7 @@ { "variables": { - "chef_version": "provisionerless" + "chef_version": "provisionerless", + "mirror": "https://content-web.rhn.redhat.com/rhn/isos/rhel-5.10/md5sum/1ab756241a4a209b8d39abe6bace84a9" }, "builders": [ { @@ -15,7 +16,7 @@ "http_directory": "http", "iso_checksum": "3a4db78ab70d866057c5285e0064d78125e1b8fd9dcaefea28818f6604b3515d", "iso_checksum_type": "sha256", - "iso_url": "https://content-web.rhn.redhat.com/rhn/isos/rhel-5.10/md5sum/1ab756241a4a209b8d39abe6bace84a9/rhel-server-5.10-i386-dvd.iso", + "iso_url": "{{user `mirror`}}/rhel-server-5.10-i386-dvd.iso", "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, @@ -40,7 +41,7 @@ "http_directory": "http", "iso_checksum": "3a4db78ab70d866057c5285e0064d78125e1b8fd9dcaefea28818f6604b3515d", "iso_checksum_type": "sha256", - "iso_url": "https://content-web.rhn.redhat.com/rhn/isos/rhel-5.10/md5sum/1ab756241a4a209b8d39abe6bace84a9/rhel-server-5.10-i386-dvd.iso", + "iso_url": "{{user `mirror`}}/rhel-server-5.10-i386-dvd.iso", "tools_upload_flavor": "linux", "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", diff --git a/packer/rhel-5.10-x86_64.json b/packer/rhel-5.10-x86_64.json index d871a5663..21ddeaea0 100644 --- a/packer/rhel-5.10-x86_64.json +++ b/packer/rhel-5.10-x86_64.json @@ -1,6 +1,7 @@ { "variables": { - "chef_version": "provisionerless" + "chef_version": "provisionerless", + "mirror": "https://content-web.rhn.redhat.com/rhn/isos/rhel-5.10/md5sum/86cc2d5548ee2ff9c8d3e2b4db3e6001" }, "builders": [ { @@ -15,7 +16,7 @@ "http_directory": "http", "iso_checksum": "8b38e74b0993d478aad9c950f51a3e3441199639a3422e06fc3beca1f8825bf2", "iso_checksum_type": "sha256", - "iso_url": "https://content-web.rhn.redhat.com/rhn/isos/rhel-5.10/md5sum/86cc2d5548ee2ff9c8d3e2b4db3e6001/rhel-server-5.10-x86_64-dvd.iso", + "iso_url": "{{user `mirror`}}/rhel-server-5.10-x86_64-dvd.iso", "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, @@ -40,7 +41,7 @@ "http_directory": "http", "iso_checksum": "8b38e74b0993d478aad9c950f51a3e3441199639a3422e06fc3beca1f8825bf2", "iso_checksum_type": "sha256", - "iso_url": "https://content-web.rhn.redhat.com/rhn/isos/rhel-5.10/md5sum/86cc2d5548ee2ff9c8d3e2b4db3e6001/rhel-server-5.10-x86_64-dvd.iso", + "iso_url": "{{user `mirror`}}/rhel-server-5.10-x86_64-dvd.iso", "tools_upload_flavor": "linux", "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", diff --git a/packer/rhel-6.5-i386.json b/packer/rhel-6.5-i386.json index 84cf373db..9bc53fd22 100644 --- a/packer/rhel-6.5-i386.json +++ b/packer/rhel-6.5-i386.json @@ -1,6 +1,7 @@ { "variables": { - "chef_version": "provisionerless" + "chef_version": "provisionerless", + "mirror": "https://content-web.rhn.redhat.com/rhn/isos/rhel-6.5/md5sum/04a1fa06a6b7e70cd586535eea83c0ef" }, "builders": [ { @@ -15,7 +16,7 @@ "http_directory": "http", "iso_checksum": "eec692b436193ba9fc365cafe2b8f85323d98192dc99b23b02ae75045667fe4a", "iso_checksum_type": "sha256", - "iso_url": "https://content-web.rhn.redhat.com/rhn/isos/rhel-6.5/md5sum/04a1fa06a6b7e70cd586535eea83c0ef/rhel-server-6.5-i386-dvd.iso", + "iso_url": "{{user `mirror`}}/rhel-server-6.5-i386-dvd.iso", "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, @@ -40,7 +41,7 @@ "http_directory": "http", "iso_checksum": "eec692b436193ba9fc365cafe2b8f85323d98192dc99b23b02ae75045667fe4a", "iso_checksum_type": "sha256", - "iso_url": "https://content-web.rhn.redhat.com/rhn/isos/rhel-6.5/md5sum/04a1fa06a6b7e70cd586535eea83c0ef/rhel-server-6.5-i386-dvd.iso", + "iso_url": "{{user `mirror`}}/rhel-server-6.5-i386-dvd.iso", "tools_upload_flavor": "linux", "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", diff --git a/packer/rhel-6.5-x86_64.json b/packer/rhel-6.5-x86_64.json index b06a5b76a..7e4f5fb1c 100644 --- a/packer/rhel-6.5-x86_64.json +++ b/packer/rhel-6.5-x86_64.json @@ -1,6 +1,7 @@ { "variables": { - "chef_version": "provisionerless" + "chef_version": "provisionerless", + "mirror": "https://content-web.rhn.redhat.com/rhn/isos/rhel-6.5/md5sum/a84d4d9eddb36fb417832166cd10a4c2" }, "builders": [ { @@ -15,7 +16,7 @@ "http_directory": "http", "iso_checksum": "a51b90f3dd4585781293ea08adde60eeb9cfa94670943bd99e9c07f13a259539", "iso_checksum_type": "sha256", - "iso_url": "https://content-web.rhn.redhat.com/rhn/isos/rhel-6.5/md5sum/a84d4d9eddb36fb417832166cd10a4c2/rhel-server-6.5-x86_64-dvd.iso", + "iso_url": "{{user `mirror`}}/rhel-server-6.5-x86_64-dvd.iso", "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, @@ -41,7 +42,7 @@ "iso_checksum": "a51b90f3dd4585781293ea08adde60eeb9cfa94670943bd99e9c07f13a259539" , "iso_checksum_type": "sha256", - "iso_url": "https://content-web.rhn.redhat.com/rhn/isos/rhel-6.5/md5sum/a84d4d9eddb36fb417832166cd10a4c2/rhel-server-6.5-x86_64-dvd.iso", + "iso_url": "{{user `mirror`}}/rhel-server-6.5-x86_64-dvd.iso", "tools_upload_flavor": "linux", "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", From 6f8003ef30cbd75552e322527c6668d840f51894 Mon Sep 17 00:00:00 2001 From: "Julian C. Dunn" <jdunn@opscode.com> Date: Wed, 4 Dec 2013 22:01:28 -0500 Subject: [PATCH 0148/1622] Added Travis badge, fix URL to test-kitchen --- README.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 5c8ba96f0..04f211246 100644 --- a/README.md +++ b/README.md @@ -1,9 +1,11 @@ # Bento +[![Build Status](https://travis-ci.org/opscode/bento.png)](https://travis-ci.org/opscode/bento) + Bento is a project that encapsulates [Packer](http://packer.io) templates for building [Vagrant](http://vagrantup.com) baseboxes. We use these boxes internally at Opscode for testing Hosted Enterprise Chef, Private Enterprise Chef and our open source [cookbooks](http://community.opscode.com/users/Opscode) -via [test-kitchen](http://github.com/opscode/test-kitchen). +via [test-kitchen](http://kitchen.ci/). ## Current Baseboxes From 480bc073ecf5992eae85d01aebf56620137737cd Mon Sep 17 00:00:00 2001 From: "Julian C. Dunn" <jdunn@opscode.com> Date: Thu, 5 Dec 2013 00:53:33 -0500 Subject: [PATCH 0149/1622] Fix broken CentOS 6.5 i386 template --- packer/centos-6.5-i386.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packer/centos-6.5-i386.json b/packer/centos-6.5-i386.json index 40175ec21..ac67870a4 100644 --- a/packer/centos-6.5-i386.json +++ b/packer/centos-6.5-i386.json @@ -14,7 +14,7 @@ "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "guest_os_type": "RedHat", "http_directory": "http", - "iso_checksum": "67ea68068ae53d1f23431072ec0288b3e1abfe4d" + "iso_checksum": "67ea68068ae53d1f23431072ec0288b3e1abfe4d", "iso_checksum_type": "sha1", "iso_url": "{{user `mirror`}}/6.5/isos/i386/CentOS-6.5-i386-bin-DVD1.iso", "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", From a4a3599753f795486ff657059601f02d22bc8676 Mon Sep 17 00:00:00 2001 From: "Julian C. Dunn" <jdunn@opscode.com> Date: Thu, 5 Dec 2013 01:02:15 -0500 Subject: [PATCH 0150/1622] Make Thor actually exit non-zero when a validation error occurs. --- Thorfile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Thorfile b/Thorfile index c823f1b68..e4e35efde 100644 --- a/Thorfile +++ b/Thorfile @@ -13,7 +13,9 @@ class Packer < Thor templates = Dir.glob("*.json") templates.each do |template| puts "#{template}" - system "packer validate #{template}" + unless system "packer validate #{template}" + fail "Validation failed!" + end puts "\n" end end From 00aceaae3d17f4ca85dc1e4e3aff22ae5a9fad92 Mon Sep 17 00:00:00 2001 From: "Julian C. Dunn" <jdunn@opscode.com> Date: Thu, 5 Dec 2013 11:50:44 -0500 Subject: [PATCH 0151/1622] Update readme for CentOS 6.5 --- OLD-BOXES.md | 17 ++++++++++++++++- README.md | 8 ++++---- 2 files changed, 20 insertions(+), 5 deletions(-) diff --git a/OLD-BOXES.md b/OLD-BOXES.md index 18ea145da..39ba569b3 100644 --- a/OLD-BOXES.md +++ b/OLD-BOXES.md @@ -1,6 +1,21 @@ -Bento Old Boxes +Old Bento Boxes =============== +Provisionerless +--------------- + +Boxes for obsolete operating systems will be placed here. + +### VirtualBox + +* [opscode-centos-6.4-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_centos-6.4-i386_chef-provisionerless.box) +* [opscode-centos-6.4](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_centos-6.4_chef-provisionerless.box) + +### VMWare + +* [opscode-centos-6.4-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_centos-6.4-i386_chef-provisionerless.box) +* [opscode-centos-6.4](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_centos-6.4_chef-provisionerless.box) + Chef 11.4.4 ----------- diff --git a/README.md b/README.md index 04f211246..2fd6f80cd 100644 --- a/README.md +++ b/README.md @@ -20,8 +20,8 @@ These baseboxes were all built using a Mac OS X host running VirtualBox 4.3.2, a * [opscode-centos-5.10-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_centos-5.10-i386_chef-provisionerless.box) * [opscode-centos-5.10](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_centos-5.10_chef-provisionerless.box) -* [opscode-centos-6.4-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_centos-6.4-i386_chef-provisionerless.box) -* [opscode-centos-6.4](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_centos-6.4_chef-provisionerless.box) +* [opscode-centos-6.5-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_centos-6.5-i386_chef-provisionerless.box) +* [opscode-centos-6.5](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_centos-6.5_chef-provisionerless.box) * [opscode-debian-6.0.8-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_debian-6.0.8-i386_chef-provisionerless.box) * [opscode-debian-6.0.8](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_debian-6.0.8_chef-provisionerless.box) * [opscode-debian-7.2.0-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_debian-7.2.0-i386_chef-provisionerless.box) @@ -52,8 +52,8 @@ The boxes should work unchanged in VMWare Workstation for Windows or Linux. * [opscode-centos-5.10-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_centos-5.10-i386_chef-provisionerless.box) * [opscode-centos-5.10](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_centos-5.10_chef-provisionerless.box) -* [opscode-centos-6.4-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_centos-6.4-i386_chef-provisionerless.box) -* [opscode-centos-6.4](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_centos-6.4_chef-provisionerless.box) +* [opscode-centos-6.5-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_centos-6.5-i386_chef-provisionerless.box) +* [opscode-centos-6.5](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_centos-6.5_chef-provisionerless.box) * [opscode-debian-6.0.8-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_debian-6.0.8-i386_chef-provisionerless.box) * [opscode-debian-6.0.8](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_debian-6.0.8_chef-provisionerless.box) * [opscode-debian-7.2.0-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_debian-7.2.0-i386_chef-provisionerless.box) From 79bcb70edea6f20fad9509e1b85ae0f8182aa5e8 Mon Sep 17 00:00:00 2001 From: "Julian C. Dunn" <jdunn@opscode.com> Date: Fri, 6 Dec 2013 13:41:35 -0500 Subject: [PATCH 0152/1622] [BENTO-105] CD-ROM apt source exists in Debian 6.0.8 images --- packer/http/debian-6.0.8/preseed.cfg | 1 + 1 file changed, 1 insertion(+) diff --git a/packer/http/debian-6.0.8/preseed.cfg b/packer/http/debian-6.0.8/preseed.cfg index f9ae0023b..ced8699d2 100644 --- a/packer/http/debian-6.0.8/preseed.cfg +++ b/packer/http/debian-6.0.8/preseed.cfg @@ -41,6 +41,7 @@ d-i preseed/early_command string sed -i \ d-i time/zone string UTC d-i user-setup/allow-password-weak boolean true d-i user-setup/encrypt-home boolean false +d-i preseed/late_command string sed -i '/^deb cdrom:/s/^/#/' /target/etc/apt/sources.list apt-cdrom-setup apt-setup/cdrom/set-first boolean false apt-mirror-setup apt-setup/use_mirror boolean true popularity-contest popularity-contest/participate boolean false From a562f0d19fdaa6410b3d2da1f2e054fe28cea06f Mon Sep 17 00:00:00 2001 From: "Julian C. Dunn" <jdunn@opscode.com> Date: Fri, 6 Dec 2013 01:18:11 -0500 Subject: [PATCH 0153/1622] [BENTO-100] Make provisioner work on FreeBSD by converting all scripts to Bourne shell and using a different execute_command. Note that this still depends on Chef's omnitruck install.sh being converted to understand Bourne shell and fetch. --- packer/freebsd-9.2-amd64.json | 5 +++-- packer/freebsd-9.2-i386.json | 2 +- packer/http/freebsd-9.2/install.sh | 2 +- packer/scripts/freebsd/cleanup.sh | 11 +++++------ .../freebsd/{postinstall.csh => postinstall.sh} | 13 +++++++------ 5 files changed, 17 insertions(+), 16 deletions(-) rename packer/scripts/freebsd/{postinstall.csh => postinstall.sh} (88%) diff --git a/packer/freebsd-9.2-amd64.json b/packer/freebsd-9.2-amd64.json index adfa8e2d3..0fed3672d 100644 --- a/packer/freebsd-9.2-amd64.json +++ b/packer/freebsd-9.2-amd64.json @@ -8,11 +8,12 @@ "environment_vars": [ "CHEF_VERSION={{user `chef_version`}}" ], "type": "shell", "scripts": [ - "scripts/freebsd/postinstall.csh", + "scripts/freebsd/postinstall.sh", + "scripts/common/chef.sh", "scripts/freebsd/cleanup.sh", "scripts/common/minimize.sh" ], - "execute_command": "cat '{{.Path}}' | su -" + "execute_command": "export {{.Vars}} && cat {{.Path}} | su -m" } ], "builders": [ diff --git a/packer/freebsd-9.2-i386.json b/packer/freebsd-9.2-i386.json index a093ea8b5..a3468fe8b 100644 --- a/packer/freebsd-9.2-i386.json +++ b/packer/freebsd-9.2-i386.json @@ -7,7 +7,7 @@ { "type": "shell", "scripts": [ - "scripts/freebsd/postinstall.csh", + "scripts/freebsd/postinstall.sh", "scripts/freebsd/cleanup.sh", "scripts/common/minimize.sh" ], diff --git a/packer/http/freebsd-9.2/install.sh b/packer/http/freebsd-9.2/install.sh index 5922b434a..4e9c4b5c4 100644 --- a/packer/http/freebsd-9.2/install.sh +++ b/packer/http/freebsd-9.2/install.sh @@ -88,7 +88,7 @@ touch /mnt/zroot/etc/fstab # Set up user accounts zfs create zroot/usr/home/vagrant -echo "vagrant" | pw -V /mnt/zroot/etc useradd vagrant -h 0 -s csh -G wheel -d /home/vagrant -c "Vagrant User" +echo "vagrant" | pw -V /mnt/zroot/etc useradd vagrant -h 0 -s /bin/sh -G wheel -d /home/vagrant -c "Vagrant User" echo "vagrant" | pw -V /mnt/zroot/etc usermod root chown 1001:1001 /mnt/zroot/home/vagrant diff --git a/packer/scripts/freebsd/cleanup.sh b/packer/scripts/freebsd/cleanup.sh index 42d61ab0c..614a5b5c0 100644 --- a/packer/scripts/freebsd/cleanup.sh +++ b/packer/scripts/freebsd/cleanup.sh @@ -1,15 +1,14 @@ -#!/bin/sh -eux +#!/bin/sh # Purge files we don't need any longer -rm -rf /tmp/chef* -rm -rf /home/vagrant/VBox*.iso -rm -rf /usr/ports/distfiles/* +rm -f /tmp/chef* +rm -f /home/vagrant/*.iso rm -rf /var/db/freebsd-update/files mkdir /var/db/freebsd-update/files -rm -rf /var/db/freebsd-update/*-rollback +rm -f /var/db/freebsd-update/*-rollback rm -rf /var/db/freebsd-update/install.* rm -rf /boot/kernel.old rm -rf /usr/src/* -rm -rf /*.core +rm -f /*.core exit diff --git a/packer/scripts/freebsd/postinstall.csh b/packer/scripts/freebsd/postinstall.sh similarity index 88% rename from packer/scripts/freebsd/postinstall.csh rename to packer/scripts/freebsd/postinstall.sh index 6b3cb70bd..82b916a87 100644 --- a/packer/scripts/freebsd/postinstall.csh +++ b/packer/scripts/freebsd/postinstall.sh @@ -1,5 +1,4 @@ -#!/bin/csh -x -# NB: at the point when this script is run, vagrant's shell is csh +#!/bin/sh -x set echo @@ -16,8 +15,12 @@ chmod +x /tmp/freebsd-update env PAGER=/bin/cat /tmp/freebsd-update fetch env PAGER=/bin/cat /tmp/freebsd-update install -#Install sudo and bash and curl -pkg_add -r sudo curl +#Install sudo, curl and ca_root_nss +pkg_add -r sudo curl ca_root_nss + +# Emulate the ETCSYMLINK behavior of ca_root_nss; this is for FreeBSD 10, where fetch(1) was +# massively refactored and doesn't come with SSL CAcerts anymore +ln -sf /usr/local/share/certs/ca-root-nss.crt /etc/ssl/cert.pem #Installing vagrant keys mkdir /home/vagrant/.ssh @@ -36,8 +39,6 @@ echo 'mountd_flags="-r"' >> /etc/rc.conf # Enable passwordless sudo echo "vagrant ALL=(ALL) NOPASSWD: ALL" >> /usr/local/etc/sudoers -# Restore correct su permissions -# I'll leave that up to the reader :) # disable X11 because vagrants are (usually) headless cat >> /etc/make.conf << EOT From af71f9023edb9f77ad5803f1a6f3450904bcf189 Mon Sep 17 00:00:00 2001 From: "Julian C. Dunn" <jdunn@getchef.com> Date: Thu, 12 Dec 2013 13:21:47 -0500 Subject: [PATCH 0154/1622] [BENTO-108] Install VMWare tools, not VirtualBox tools, on VMware boxes. --- packer/freebsd-9.2-amd64.json | 2 ++ packer/freebsd-9.2-i386.json | 3 +++ packer/scripts/freebsd/cleanup.sh | 1 - packer/scripts/freebsd/postinstall.sh | 26 ------------------ packer/scripts/freebsd/vmtools.sh | 38 +++++++++++++++++++++++++++ 5 files changed, 43 insertions(+), 27 deletions(-) create mode 100644 packer/scripts/freebsd/vmtools.sh diff --git a/packer/freebsd-9.2-amd64.json b/packer/freebsd-9.2-amd64.json index 0fed3672d..69ba4bbf7 100644 --- a/packer/freebsd-9.2-amd64.json +++ b/packer/freebsd-9.2-amd64.json @@ -9,6 +9,7 @@ "type": "shell", "scripts": [ "scripts/freebsd/postinstall.sh", + "scripts/freebsd/vmtools.sh", "scripts/common/chef.sh", "scripts/freebsd/cleanup.sh", "scripts/common/minimize.sh" @@ -80,6 +81,7 @@ "iso_checksum": "a8c1751b83646530148766618a89a97009e7500e7057a5cbe3afd74ef480c915", "iso_checksum_type": "sha256", "iso_url": "{{user `mirror`}}/releases/amd64/amd64/ISO-IMAGES/9.2/FreeBSD-9.2-RELEASE-amd64-disc1.iso", + "tools_upload_flavor": "freebsd", "ssh_username": "vagrant", "ssh_password": "vagrant", "ssh_port": 22, diff --git a/packer/freebsd-9.2-i386.json b/packer/freebsd-9.2-i386.json index a3468fe8b..b3e0e14e3 100644 --- a/packer/freebsd-9.2-i386.json +++ b/packer/freebsd-9.2-i386.json @@ -8,6 +8,8 @@ "type": "shell", "scripts": [ "scripts/freebsd/postinstall.sh", + "scripts/freebsd/vmtools.sh", + "scripts/common/chef.sh", "scripts/freebsd/cleanup.sh", "scripts/common/minimize.sh" ], @@ -78,6 +80,7 @@ "iso_checksum": "76093c27288f0ab939a5de14b621ec8eb1420d96343132c2b7c382747d35b67c", "iso_checksum_type": "sha256", "iso_url": "{{user `mirror`}}/releases/i386/ISO-IMAGES/9.2/FreeBSD-9.2-RELEASE-i386-disc1.iso", + "tools_upload_flavor": "freebsd", "ssh_username": "vagrant", "ssh_password": "vagrant", "ssh_port": 22, diff --git a/packer/scripts/freebsd/cleanup.sh b/packer/scripts/freebsd/cleanup.sh index 614a5b5c0..b3e92c1d5 100644 --- a/packer/scripts/freebsd/cleanup.sh +++ b/packer/scripts/freebsd/cleanup.sh @@ -2,7 +2,6 @@ # Purge files we don't need any longer rm -f /tmp/chef* -rm -f /home/vagrant/*.iso rm -rf /var/db/freebsd-update/files mkdir /var/db/freebsd-update/files rm -f /var/db/freebsd-update/*-rollback diff --git a/packer/scripts/freebsd/postinstall.sh b/packer/scripts/freebsd/postinstall.sh index 82b916a87..a00acedc7 100644 --- a/packer/scripts/freebsd/postinstall.sh +++ b/packer/scripts/freebsd/postinstall.sh @@ -1,7 +1,5 @@ #!/bin/sh -x -set echo - #Set the time correctly ntpdate -v -b in.pool.ntp.org @@ -45,30 +43,6 @@ cat >> /etc/make.conf << EOT WITHOUT_X11="YES" EOT -pkg_add -r virtualbox-ose-additions virtio-kmod - -# undo our customizations -sed -i '' -e '/^REFUSE /d' /etc/portsnap.conf - -echo 'vboxdrv_load="YES"' >> /boot/loader.conf -echo 'vboxnet_enable="YES"' >> /etc/rc.conf -echo 'vboxguest_enable="YES"' >> /etc/rc.conf -echo 'vboxservice_enable="YES"' >> /etc/rc.conf - -cat >> /boot/loader.conf << EOT -virtio_load="YES" -virtio_pci_load="YES" -virtio_blk_load="YES" -if_vtnet_load="YES" -virtio_balloon_load="YES" -EOT - -# sed -i.bak -Ee 's|/dev/ada?|/dev/vtbd|' /etc/fstab -echo 'ifconfig_vtnet0_name="em0"' >> /etc/rc.conf -echo 'ifconfig_vtnet1_name="em1"' >> /etc/rc.conf -echo 'ifconfig_vtnet2_name="em2"' >> /etc/rc.conf -echo 'ifconfig_vtnet3_name="em3"' >> /etc/rc.conf - pw groupadd vboxusers pw groupmod vboxusers -m vagrant diff --git a/packer/scripts/freebsd/vmtools.sh b/packer/scripts/freebsd/vmtools.sh new file mode 100644 index 000000000..a85667b4e --- /dev/null +++ b/packer/scripts/freebsd/vmtools.sh @@ -0,0 +1,38 @@ +#!/bin/sh + +if [ $PACKER_BUILDER_TYPE == 'virtualbox' ]; then + # disable X11 because vagrants are (usually) headless + echo 'WITHOUT_X11="YES"' >> /etc/make.conf + + pkg_add -r virtualbox-ose-additions + + echo 'vboxdrv_load="YES"' >> /boot/loader.conf + echo 'vboxnet_enable="YES"' >> /etc/rc.conf + echo 'vboxguest_enable="YES"' >> /etc/rc.conf + echo 'vboxservice_enable="YES"' >> /etc/rc.conf + + echo 'if_vtnet_load="YES"' >> /boot/loader.conf + + echo 'ifconfig_vtnet0_name="em0"' >> /etc/rc.conf + echo 'ifconfig_vtnet1_name="em1"' >> /etc/rc.conf + echo 'ifconfig_vtnet2_name="em2"' >> /etc/rc.conf + echo 'ifconfig_vtnet3_name="em3"' >> /etc/rc.conf +fi + +if [ $PACKER_BUILDER_TYPE == 'vmware' ]; then + mkdir /tmp/vmfusion + mkdir /tmp/vmfusion-archive + mdconfig -a -t vnode -f /home/vagrant/freebsd.iso -u 0 + mount -t cd9660 /dev/md0 /tmp/vmfusion + tar xzf /tmp/vmfusion/vmware-freebsd-tools.tar.gz -C /tmp/vmfusion-archive + pkg_add -r perl + # Welcome to 2005. Have you heard of this "YouTube" thing? + pkg_add -r compat6x-`uname -m` + /tmp/vmfusion-archive/vmware-tools-distrib/vmware-install.pl --default + + echo 'ifconfig_vxn0="dhcp"' >> /etc/rc.conf + umount /tmp/vmfusion + rmdir /tmp/vmfusion + rm -rf /tmp/vmfusion-archive + rm /home/vagrant/freebsd.iso +fi From 126ef9f442ec2d6c5d28f5e9f645766193f68dfa Mon Sep 17 00:00:00 2001 From: "Julian C. Dunn" <jdunn@getchef.com> Date: Thu, 12 Dec 2013 15:39:47 -0500 Subject: [PATCH 0155/1622] No need to use bundler to execute Thor --- Thorfile | 1 - 1 file changed, 1 deletion(-) diff --git a/Thorfile b/Thorfile index e4e35efde..c01fa3e80 100644 --- a/Thorfile +++ b/Thorfile @@ -1,6 +1,5 @@ # vi: ft=ruby -require 'bundler' require 'thor' require 'fileutils' require 'timeout' From d779cd93f172bcefa6e2f03391bdbd625cd38332 Mon Sep 17 00:00:00 2001 From: "Julian C. Dunn" <jdunn@getchef.com> Date: Thu, 12 Dec 2013 21:55:26 -0500 Subject: [PATCH 0156/1622] Fix FreeBSD i386 not passing env vars through properly --- packer/freebsd-9.2-i386.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packer/freebsd-9.2-i386.json b/packer/freebsd-9.2-i386.json index b3e0e14e3..7a8ecbeb1 100644 --- a/packer/freebsd-9.2-i386.json +++ b/packer/freebsd-9.2-i386.json @@ -13,7 +13,7 @@ "scripts/freebsd/cleanup.sh", "scripts/common/minimize.sh" ], - "execute_command": "cat '{{.Path}}' | su -" + "execute_command": "export {{.Vars}} && cat {{.Path}} | su -m" } ], "builders": [ From 703f28735f31367ef83176ca8d9214b83fd27289 Mon Sep 17 00:00:00 2001 From: "Julian C. Dunn" <jdunn@getchef.com> Date: Sun, 15 Dec 2013 01:05:03 -0500 Subject: [PATCH 0157/1622] [BENTO-102] Rename output_directory so that it conforms with the provider name. Otherwise this causes a conflict if both providers are exporting at the same time. --- packer/centos-5.10-i386.json | 4 ++-- packer/centos-5.10-x86_64.json | 4 ++-- packer/centos-6.5-i386.json | 4 ++-- packer/centos-6.5-x86_64.json | 4 ++-- packer/debian-6.0.8-amd64.json | 4 ++-- packer/debian-6.0.8-i386.json | 4 ++-- packer/debian-7.2.0-amd64.json | 4 ++-- packer/debian-7.2.0-i386.json | 4 ++-- packer/fedora-18-i386.json | 4 ++-- packer/fedora-18-x86_64.json | 4 ++-- packer/fedora-19-i386.json | 4 ++-- packer/fedora-19-x86_64.json | 4 ++-- packer/fedora-20-i386.json | 4 ++-- packer/fedora-20-x86_64.json | 4 ++-- packer/freebsd-9.2-amd64.json | 4 ++-- packer/freebsd-9.2-i386.json | 4 ++-- packer/rhel-5.10-i386.json | 4 ++-- packer/rhel-5.10-x86_64.json | 4 ++-- packer/rhel-6.5-i386.json | 4 ++-- packer/rhel-6.5-x86_64.json | 4 ++-- packer/sles-11-sp2-i386.json | 4 ++-- packer/sles-11-sp2-x86_64.json | 4 ++-- packer/sles-11-sp3-i386.json | 4 ++-- packer/sles-11-sp3-x86_64.json | 4 ++-- packer/ubuntu-10.04-amd64.json | 4 ++-- packer/ubuntu-10.04-i386.json | 4 ++-- packer/ubuntu-12.04-amd64.json | 4 ++-- packer/ubuntu-12.04-i386.json | 4 ++-- packer/ubuntu-12.10-amd64.json | 4 ++-- packer/ubuntu-12.10-i386.json | 4 ++-- packer/ubuntu-13.04-amd64.json | 4 ++-- packer/ubuntu-13.04-i386.json | 4 ++-- packer/ubuntu-13.10-amd64.json | 4 ++-- packer/ubuntu-13.10-i386.json | 4 ++-- 34 files changed, 68 insertions(+), 68 deletions(-) diff --git a/packer/centos-5.10-i386.json b/packer/centos-5.10-i386.json index 75f9697e8..c92326314 100644 --- a/packer/centos-5.10-i386.json +++ b/packer/centos-5.10-i386.json @@ -28,7 +28,7 @@ ], "virtualbox_version_file": ".vbox_version", "vm_name": "packer-centos-5.10-i386", - "output_directory": "packer-centos-5.10-i386" + "output_directory": "packer-centos-5.10-i386-virtualbox" }, { "type": "vmware", @@ -49,7 +49,7 @@ "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", "vm_name": "packer-centos-5.10-i386", - "output_directory": "packer-centos-5.10-i386", + "output_directory": "packer-centos-5.10-i386-vmware", "vmx_data": { "cpuid.coresPerSocket": "1", "memsize": "384", diff --git a/packer/centos-5.10-x86_64.json b/packer/centos-5.10-x86_64.json index 6f59eae31..7088f445a 100644 --- a/packer/centos-5.10-x86_64.json +++ b/packer/centos-5.10-x86_64.json @@ -28,7 +28,7 @@ ], "virtualbox_version_file": ".vbox_version", "vm_name": "packer-centos-5.10-x86_64", - "output_directory": "packer-centos-5.10-x86_64" + "output_directory": "packer-centos-5.10-x86_64-virtualbox" }, { "type": "vmware", @@ -49,7 +49,7 @@ "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", "vm_name": "packer-centos-5.10-x86_64", - "output_directory": "packer-centos-5.10-x86_64", + "output_directory": "packer-centos-5.10-x86_64-vmware", "vmx_data": { "cpuid.coresPerSocket": "1", "memsize": "384", diff --git a/packer/centos-6.5-i386.json b/packer/centos-6.5-i386.json index ac67870a4..99bb7d541 100644 --- a/packer/centos-6.5-i386.json +++ b/packer/centos-6.5-i386.json @@ -28,7 +28,7 @@ ], "virtualbox_version_file": ".vbox_version", "vm_name": "packer-centos-6.5-i386", - "output_directory": "packer-centos-6.5-i386" + "output_directory": "packer-centos-6.5-i386-virtualbox" }, { "type": "vmware", @@ -49,7 +49,7 @@ "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", "vm_name": "packer-centos-6.5-i386", - "output_directory": "packer-centos-6.5-i386", + "output_directory": "packer-centos-6.5-i386-vmware", "vmx_data": { "cpuid.coresPerSocket": "1", "memsize": "480", diff --git a/packer/centos-6.5-x86_64.json b/packer/centos-6.5-x86_64.json index 6751ba56c..fa97de138 100644 --- a/packer/centos-6.5-x86_64.json +++ b/packer/centos-6.5-x86_64.json @@ -28,7 +28,7 @@ ], "virtualbox_version_file": ".vbox_version", "vm_name": "packer-centos-6.5-x86_64", - "output_directory": "packer-centos-6.5-x86_64" + "output_directory": "packer-centos-6.5-x86_64-virtualbox" }, { "type": "vmware", @@ -49,7 +49,7 @@ "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", "vm_name": "packer-centos-6.5-x86_64", - "output_directory": "packer-centos-6.5-x86_64", + "output_directory": "packer-centos-6.5-x86_64-vmware", "vmx_data": { "cpuid.coresPerSocket": "1", "memsize": "480", diff --git a/packer/debian-6.0.8-amd64.json b/packer/debian-6.0.8-amd64.json index f112b9215..9661a18c1 100644 --- a/packer/debian-6.0.8-amd64.json +++ b/packer/debian-6.0.8-amd64.json @@ -38,7 +38,7 @@ "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "virtualbox_version_file": ".vbox_version", "vm_name": "packer-debian-6.0.8-amd64", - "output_directory": "packer-debian-6.0.8-amd64", + "output_directory": "packer-debian-6.0.8-amd64-virtualbox", "vboxmanage": [ [ "modifyvm", "{{.Name}}", "--memory", "384" ], [ "modifyvm", "{{.Name}}", "--cpus", "1" ] @@ -77,7 +77,7 @@ "shutdown_command": "echo 'vagrant'|sudo -S /sbin/shutdown -hP now", "tools_upload_flavor": "linux", "vm_name": "packer-debian-6.0.8-amd64", - "output_directory": "packer-debian-6.0.8-amd64", + "output_directory": "packer-debian-6.0.8-amd64-vmware", "vmx_data": { "memsize": "384", "numvcpus": "1", diff --git a/packer/debian-6.0.8-i386.json b/packer/debian-6.0.8-i386.json index 6c8d71557..f2b1f23a3 100644 --- a/packer/debian-6.0.8-i386.json +++ b/packer/debian-6.0.8-i386.json @@ -38,7 +38,7 @@ "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "virtualbox_version_file": ".vbox_version", "vm_name": "packer-debian-6.0.8-i386", - "output_directory": "packer-debian-6.0.8-i386", + "output_directory": "packer-debian-6.0.8-i386-virtualbox", "vboxmanage": [ [ "modifyvm", "{{.Name}}", "--memory", "384" ], [ "modifyvm", "{{.Name}}", "--cpus", "1" ] @@ -77,7 +77,7 @@ "shutdown_command": "echo 'vagrant'|sudo -S /sbin/shutdown -hP now", "tools_upload_flavor": "linux", "vm_name": "packer-debian-6.0.8-i386", - "output_directory": "packer-debian-6.0.8-i386", + "output_directory": "packer-debian-6.0.8-i386-vmware", "vmx_data": { "memsize": "384", "numvcpus": "1", diff --git a/packer/debian-7.2.0-amd64.json b/packer/debian-7.2.0-amd64.json index 752eb142d..4b83e62a5 100644 --- a/packer/debian-7.2.0-amd64.json +++ b/packer/debian-7.2.0-amd64.json @@ -38,7 +38,7 @@ "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "virtualbox_version_file": ".vbox_version", "vm_name": "packer-debian-7.2.0-amd64", - "output_directory": "packer-debian-7.2.0-amd64", + "output_directory": "packer-debian-7.2.0-amd64-virtualbox", "vboxmanage": [ [ "modifyvm", "{{.Name}}", "--memory", "384" ], [ "modifyvm", "{{.Name}}", "--cpus", "1" ] @@ -77,7 +77,7 @@ "shutdown_command": "echo 'vagrant'|sudo -S /sbin/shutdown -hP now", "tools_upload_flavor": "linux", "vm_name": "packer-debian-7.2.0-amd64", - "output_directory": "packer-debian-7.2.0-amd64", + "output_directory": "packer-debian-7.2.0-amd64-vmware", "vmx_data": { "memsize": "384", "numvcpus": "1", diff --git a/packer/debian-7.2.0-i386.json b/packer/debian-7.2.0-i386.json index 7f3b9b305..72c01d3a5 100644 --- a/packer/debian-7.2.0-i386.json +++ b/packer/debian-7.2.0-i386.json @@ -38,7 +38,7 @@ "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "virtualbox_version_file": ".vbox_version", "vm_name": "packer-debian-7.2.0-i386", - "output_directory": "packer-debian-7.2.0-i386", + "output_directory": "packer-debian-7.2.0-i386-virtualbox", "vboxmanage": [ [ "modifyvm", "{{.Name}}", "--memory", "384" ], [ "modifyvm", "{{.Name}}", "--cpus", "1" ] @@ -77,7 +77,7 @@ "shutdown_command": "echo 'vagrant'|sudo -S /sbin/shutdown -hP now", "tools_upload_flavor": "linux", "vm_name": "packer-debian-7.2.0-i386", - "output_directory": "packer-debian-7.2.0-i386", + "output_directory": "packer-debian-7.2.0-i386-vmware", "vmx_data": { "memsize": "384", "numvcpus": "1", diff --git a/packer/fedora-18-i386.json b/packer/fedora-18-i386.json index 11d9ad701..ec6864ec4 100644 --- a/packer/fedora-18-i386.json +++ b/packer/fedora-18-i386.json @@ -28,7 +28,7 @@ ], "virtualbox_version_file": ".vbox_version", "vm_name": "packer-fedora-18-i386", - "output_directory": "packer-fedora-18-i386" + "output_directory": "packer-fedora-18-i386-virtualbox" }, { "type": "vmware", @@ -49,7 +49,7 @@ "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", "vm_name": "packer-fedora-18-i386", - "output_directory": "packer-fedora-18-i386", + "output_directory": "packer-fedora-18-i386-vmware", "vmx_data": { "cpuid.coresPerSocket": "1", "memsize": "512", diff --git a/packer/fedora-18-x86_64.json b/packer/fedora-18-x86_64.json index 34ed58f4b..0abe42c4d 100644 --- a/packer/fedora-18-x86_64.json +++ b/packer/fedora-18-x86_64.json @@ -28,7 +28,7 @@ ], "virtualbox_version_file": ".vbox_version", "vm_name": "packer-fedora-18-x86_64", - "output_directory": "packer-fedora-18-x86_64" + "output_directory": "packer-fedora-18-x86_64-virtualbox" }, { "type": "vmware", @@ -49,7 +49,7 @@ "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", "vm_name": "packer-fedora-18-x86_64", - "output_directory": "packer-fedora-18-x86_64", + "output_directory": "packer-fedora-18-x86_64-vmware", "vmx_data": { "cpuid.coresPerSocket": "1", "memsize": "512", diff --git a/packer/fedora-19-i386.json b/packer/fedora-19-i386.json index eac0b2b37..e49fb448b 100644 --- a/packer/fedora-19-i386.json +++ b/packer/fedora-19-i386.json @@ -28,7 +28,7 @@ ], "virtualbox_version_file": ".vbox_version", "vm_name": "packer-fedora-19-i386", - "output_directory": "packer-fedora-19-i386" + "output_directory": "packer-fedora-19-i386-virtualbox" }, { "type": "vmware", @@ -49,7 +49,7 @@ "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", "vm_name": "packer-fedora-19-i386", - "output_directory": "packer-fedora-19-i386", + "output_directory": "packer-fedora-19-i386-vmware", "vmx_data": { "cpuid.coresPerSocket": "1", "memsize": "512", diff --git a/packer/fedora-19-x86_64.json b/packer/fedora-19-x86_64.json index 2b48c15ae..5685d69bb 100644 --- a/packer/fedora-19-x86_64.json +++ b/packer/fedora-19-x86_64.json @@ -28,7 +28,7 @@ ], "virtualbox_version_file": ".vbox_version", "vm_name": "packer-fedora-19-x86_64", - "output_directory": "packer-fedora-19-x86_64" + "output_directory": "packer-fedora-19-x86_64-virtualbox" }, { "type": "vmware", @@ -49,7 +49,7 @@ "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", "vm_name": "packer-fedora-19-x86_64", - "output_directory": "packer-fedora-19-x86_64", + "output_directory": "packer-fedora-19-x86_64-vmware", "vmx_data": { "cpuid.coresPerSocket": "1", "memsize": "512", diff --git a/packer/fedora-20-i386.json b/packer/fedora-20-i386.json index 726e23c1c..d12c38450 100644 --- a/packer/fedora-20-i386.json +++ b/packer/fedora-20-i386.json @@ -28,7 +28,7 @@ ], "virtualbox_version_file": ".vbox_version", "vm_name": "packer-fedora-20-i386", - "output_directory": "packer-fedora-20-i386" + "output_directory": "packer-fedora-20-i386-virtualbox" }, { "type": "vmware", @@ -49,7 +49,7 @@ "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", "vm_name": "packer-fedora-20-i386", - "output_directory": "packer-fedora-20-i386", + "output_directory": "packer-fedora-20-i386-vmware", "vmx_data": { "cpuid.coresPerSocket": "1", "memsize": "512", diff --git a/packer/fedora-20-x86_64.json b/packer/fedora-20-x86_64.json index 3e056eeab..82a29f9c9 100644 --- a/packer/fedora-20-x86_64.json +++ b/packer/fedora-20-x86_64.json @@ -28,7 +28,7 @@ ], "virtualbox_version_file": ".vbox_version", "vm_name": "packer-fedora-20-x86_64", - "output_directory": "packer-fedora-20-x86_64" + "output_directory": "packer-fedora-20-x86_64-virtualbox" }, { "type": "vmware", @@ -49,7 +49,7 @@ "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", "vm_name": "packer-fedora-20-x86_64", - "output_directory": "packer-fedora-20-x86_64", + "output_directory": "packer-fedora-20-x86_64-vmware", "vmx_data": { "cpuid.coresPerSocket": "1", "memsize": "512", diff --git a/packer/freebsd-9.2-amd64.json b/packer/freebsd-9.2-amd64.json index 69ba4bbf7..735d9af52 100644 --- a/packer/freebsd-9.2-amd64.json +++ b/packer/freebsd-9.2-amd64.json @@ -50,7 +50,7 @@ "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "virtualbox_version_file": ".vbox_version", "vm_name": "packer-freebsd-9.2-amd64", - "output_directory": "packer-freebsd-9.2-amd64", + "output_directory": "packer-freebsd-9.2-amd64-virtualbox", "vboxmanage": [ [ "modifyvm", "{{.Name}}", "--memory", "512" ], [ "modifyvm", "{{.Name}}", "--cpus", "1" ] @@ -88,7 +88,7 @@ "ssh_wait_timeout": "10000s", "shutdown_command": "echo 'shutdown -p now' > shutdown.sh; cat 'shutdown.sh' | su -", "vm_name": "packer-freebsd-9.2-amd64", - "output_directory": "packer-freebsd-9.2-amd64", + "output_directory": "packer-freebsd-9.2-amd64-vmware", "vmx_data": { "memsize": "512", "numvcpus": "1", diff --git a/packer/freebsd-9.2-i386.json b/packer/freebsd-9.2-i386.json index 7a8ecbeb1..d1d901d3a 100644 --- a/packer/freebsd-9.2-i386.json +++ b/packer/freebsd-9.2-i386.json @@ -49,7 +49,7 @@ "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "virtualbox_version_file": ".vbox_version", "vm_name": "packer-freebsd-9.2-i386", - "output_directory": "packer-freebsd-9.2-i386", + "output_directory": "packer-freebsd-9.2-i386-virtualbox", "vboxmanage": [ [ "modifyvm", "{{.Name}}", "--memory", "512" ], [ "modifyvm", "{{.Name}}", "--cpus", "1" ] @@ -87,7 +87,7 @@ "ssh_wait_timeout": "10000s", "shutdown_command": "echo 'shutdown -p now' > shutdown.sh; cat 'shutdown.sh' | su -", "vm_name": "packer-freebsd-9.2-i386", - "output_directory": "packer-freebsd-9.2-i386", + "output_directory": "packer-freebsd-9.2-i386-vmware", "vmx_data": { "memsize": "512", "numvcpus": "1", diff --git a/packer/rhel-5.10-i386.json b/packer/rhel-5.10-i386.json index e488b0101..e0a757788 100644 --- a/packer/rhel-5.10-i386.json +++ b/packer/rhel-5.10-i386.json @@ -28,7 +28,7 @@ ], "virtualbox_version_file": ".vbox_version", "vm_name": "packer-rhel-5.10-i386", - "output_directory": "packer-rhel-5.10-i386" + "output_directory": "packer-rhel-5.10-i386-virtualbox" }, { "type": "vmware", @@ -49,7 +49,7 @@ "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", "vm_name": "packer-rhel-5.10-i386", - "output_directory": "packer-rhel-5.10-i386", + "output_directory": "packer-rhel-5.10-i386-vmware", "vmx_data": { "cpuid.coresPerSocket": "1", "memsize": "384", diff --git a/packer/rhel-5.10-x86_64.json b/packer/rhel-5.10-x86_64.json index 21ddeaea0..765dd4c44 100644 --- a/packer/rhel-5.10-x86_64.json +++ b/packer/rhel-5.10-x86_64.json @@ -28,7 +28,7 @@ ], "virtualbox_version_file": ".vbox_version", "vm_name": "packer-rhel-5.10-x86_64", - "output_directory": "packer-rhel-5.10-x86_64" + "output_directory": "packer-rhel-5.10-x86_64-virtualbox" }, { "type": "vmware", @@ -49,7 +49,7 @@ "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", "vm_name": "packer-rhel-5.10-x86_64", - "output_directory": "packer-rhel-5.10-x86_64", + "output_directory": "packer-rhel-5.10-x86_64-vmware", "vmx_data": { "cpuid.coresPerSocket": "1", "memsize": "384", diff --git a/packer/rhel-6.5-i386.json b/packer/rhel-6.5-i386.json index 9bc53fd22..1f1e25948 100644 --- a/packer/rhel-6.5-i386.json +++ b/packer/rhel-6.5-i386.json @@ -28,7 +28,7 @@ ], "virtualbox_version_file": ".vbox_version", "vm_name": "packer-rhel-6.5-i386", - "output_directory": "packer-rhel-6.5-i386" + "output_directory": "packer-rhel-6.5-i386-virtualbox" }, { "type": "vmware", @@ -49,7 +49,7 @@ "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", "vm_name": "packer-rhel-6.5-i386", - "output_directory": "packer-rhel-6.5-i386", + "output_directory": "packer-rhel-6.5-i386-vmware", "vmx_data": { "cpuid.coresPerSocket": "1", "memsize": "480", diff --git a/packer/rhel-6.5-x86_64.json b/packer/rhel-6.5-x86_64.json index 7e4f5fb1c..060447e53 100644 --- a/packer/rhel-6.5-x86_64.json +++ b/packer/rhel-6.5-x86_64.json @@ -28,7 +28,7 @@ ], "virtualbox_version_file": ".vbox_version", "vm_name": "packer-rhel-6.5-x86_64", - "output_directory": "packer-rhel-6.5-x86_64" + "output_directory": "packer-rhel-6.5-x86_64-virtualbox" }, { "type": "vmware", @@ -50,7 +50,7 @@ "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", "vm_name": "packer-rhel-6.5-x86_64", - "output_directory": "packer-rhel-6.5-x86_64", + "output_directory": "packer-rhel-6.5-x86_64-vmware", "vmx_data": { "cpuid.coresPerSocket": "1", "memsize": "480", diff --git a/packer/sles-11-sp2-i386.json b/packer/sles-11-sp2-i386.json index 39b17e12e..7894450c7 100644 --- a/packer/sles-11-sp2-i386.json +++ b/packer/sles-11-sp2-i386.json @@ -28,7 +28,7 @@ "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "virtualbox_version_file": ".vbox_version", "vm_name": "packer-sles-11-sp2-x86_64", - "output_directory": "packer-sles-11-sp2-x86_64", + "output_directory": "packer-sles-11-sp2-x86_64-virtualbox", "vboxmanage": [ [ "modifyvm", @@ -72,7 +72,7 @@ "cpuid.coresPerSocket": "1" }, "vm_name": "packer-sles11sp2-x86_64", - "output_directory": "packer-sles11sp2-x86_64" + "output_directory": "packer-sles11sp2-x86_64-vmware" } ], "post-processors": [ diff --git a/packer/sles-11-sp2-x86_64.json b/packer/sles-11-sp2-x86_64.json index f980f71dd..140df54b0 100644 --- a/packer/sles-11-sp2-x86_64.json +++ b/packer/sles-11-sp2-x86_64.json @@ -28,7 +28,7 @@ "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "virtualbox_version_file": ".vbox_version", "vm_name": "packer-sles-11-sp2-x86_64", - "output_directory": "packer-sles-11-sp2-x86_64", + "output_directory": "packer-sles-11-sp2-x86_64-virtualbox", "vboxmanage": [ [ "modifyvm", @@ -72,7 +72,7 @@ "cpuid.coresPerSocket": "1" }, "vm_name": "packer-sles11sp2-x86_64", - "output_directory": "packer-sles11sp2-x86_64" + "output_directory": "packer-sles11sp2-x86_64-vmware" } ], "post-processors": [ diff --git a/packer/sles-11-sp3-i386.json b/packer/sles-11-sp3-i386.json index 4ced6c7c2..5cda5994f 100644 --- a/packer/sles-11-sp3-i386.json +++ b/packer/sles-11-sp3-i386.json @@ -28,7 +28,7 @@ "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "virtualbox_version_file": ".vbox_version", "vm_name": "packer-sles-11-sp3-x86_64", - "output_directory": "packer-sles-11-sp3-x86_64", + "output_directory": "packer-sles-11-sp3-x86_64-virtualbox", "vboxmanage": [ [ "modifyvm", @@ -72,7 +72,7 @@ "cpuid.coresPerSocket": "1" }, "vm_name": "packer-sles11sp2-x86_64", - "output_directory": "packer-sles11sp2-x86_64" + "output_directory": "packer-sles11sp2-x86_64-vmware" } ], "post-processors": [ diff --git a/packer/sles-11-sp3-x86_64.json b/packer/sles-11-sp3-x86_64.json index 174a5c92f..a080ce4aa 100644 --- a/packer/sles-11-sp3-x86_64.json +++ b/packer/sles-11-sp3-x86_64.json @@ -28,7 +28,7 @@ "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "virtualbox_version_file": ".vbox_version", "vm_name": "packer-sles-11-sp3-x86_64", - "output_directory": "packer-sles-11-sp3-x86_64", + "output_directory": "packer-sles-11-sp3-x86_64-virtualbox", "vboxmanage": [ [ "modifyvm", @@ -72,7 +72,7 @@ "cpuid.coresPerSocket": "1" }, "vm_name": "packer-sles11sp3-x86_64", - "output_directory": "packer-sles11sp3-x86_64" + "output_directory": "packer-sles11sp3-x86_64-vmware" } ], "post-processors": [ diff --git a/packer/ubuntu-10.04-amd64.json b/packer/ubuntu-10.04-amd64.json index 3e103b1ae..306604011 100644 --- a/packer/ubuntu-10.04-amd64.json +++ b/packer/ubuntu-10.04-amd64.json @@ -49,7 +49,7 @@ ], "virtualbox_version_file": ".vbox_version", "vm_name": "packer-ubuntu-10.04-amd64", - "output_directory": "packer-ubuntu-10.04-amd64" + "output_directory": "packer-ubuntu-10.04-amd64-virtualbox" }, { "type": "vmware", @@ -91,7 +91,7 @@ "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", "vm_name": "packer-ubuntu-10.04-amd64", - "output_directory": "packer-ubuntu-10.04-amd64", + "output_directory": "packer-ubuntu-10.04-amd64-vmware", "vmx_data": { "cpuid.coresPerSocket": "1", "memsize": "384", diff --git a/packer/ubuntu-10.04-i386.json b/packer/ubuntu-10.04-i386.json index 120b1fdec..d6df84e72 100644 --- a/packer/ubuntu-10.04-i386.json +++ b/packer/ubuntu-10.04-i386.json @@ -49,7 +49,7 @@ ], "virtualbox_version_file": ".vbox_version", "vm_name": "packer-ubuntu-10.04-i386", - "output_directory": "packer-ubuntu-10.04-i386" + "output_directory": "packer-ubuntu-10.04-i386-virtualbox" }, { "type": "vmware", @@ -91,7 +91,7 @@ "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", "vm_name": "packer-ubuntu-10.04-i386", - "output_directory": "packer-ubuntu-10.04-i386", + "output_directory": "packer-ubuntu-10.04-i386-vmware", "vmx_data": { "cpuid.coresPerSocket": "1", "memsize": "384", diff --git a/packer/ubuntu-12.04-amd64.json b/packer/ubuntu-12.04-amd64.json index 53805a262..95e2281b9 100644 --- a/packer/ubuntu-12.04-amd64.json +++ b/packer/ubuntu-12.04-amd64.json @@ -45,7 +45,7 @@ "guest_additions_path": "VBoxGuestAdditions_{{ .Version }}.iso", "virtualbox_version_file": ".vbox_version", "vm_name": "packer-ubuntu-12.04-amd64", - "output_directory": "packer-ubuntu-12.04-amd64", + "output_directory": "packer-ubuntu-12.04-amd64-virtualbox", "vboxmanage": [ [ "modifyvm", "{{.Name}}", "--memory", "384" ], [ "modifyvm", "{{.Name}}", "--cpus", "1" ] @@ -91,7 +91,7 @@ "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", "vm_name": "packer-ubuntu-12.04-amd64", - "output_directory": "packer-ubuntu-12.04-amd64", + "output_directory": "packer-ubuntu-12.04-amd64-vmware", "vmx_data": { "cpuid.coresPerSocket": "1", "memsize": "384", diff --git a/packer/ubuntu-12.04-i386.json b/packer/ubuntu-12.04-i386.json index bd5e27534..e53c11cff 100644 --- a/packer/ubuntu-12.04-i386.json +++ b/packer/ubuntu-12.04-i386.json @@ -49,7 +49,7 @@ ], "virtualbox_version_file": ".vbox_version", "vm_name": "packer-ubuntu-12.04-i386", - "output_directory": "packer-ubuntu-12.04-i386" + "output_directory": "packer-ubuntu-12.04-i386-virtualbox" }, { "type": "vmware", @@ -91,7 +91,7 @@ "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", "vm_name": "packer-ubuntu-12.04-i386", - "output_directory": "packer-ubuntu-12.04-i386", + "output_directory": "packer-ubuntu-12.04-i386-vmware", "vmx_data": { "cpuid.coresPerSocket": "1", "memsize": "384", diff --git a/packer/ubuntu-12.10-amd64.json b/packer/ubuntu-12.10-amd64.json index e622e3cbf..783a1a041 100644 --- a/packer/ubuntu-12.10-amd64.json +++ b/packer/ubuntu-12.10-amd64.json @@ -49,7 +49,7 @@ ], "virtualbox_version_file": ".vbox_version", "vm_name": "packer-ubuntu-12.10-amd64", - "output_directory": "packer-ubuntu-12.10-amd64" + "output_directory": "packer-ubuntu-12.10-amd64-virtualbox" }, { "type": "vmware", @@ -91,7 +91,7 @@ "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", "vm_name": "packer-ubuntu-12.10-amd64", - "output_directory": "packer-ubuntu-12.10-amd64", + "output_directory": "packer-ubuntu-12.10-amd64-vmware", "vmx_data": { "cpuid.coresPerSocket": "1", "memsize": "384", diff --git a/packer/ubuntu-12.10-i386.json b/packer/ubuntu-12.10-i386.json index 49d173018..237a65c7f 100644 --- a/packer/ubuntu-12.10-i386.json +++ b/packer/ubuntu-12.10-i386.json @@ -49,7 +49,7 @@ ], "virtualbox_version_file": ".vbox_version", "vm_name": "packer-ubuntu-12.10-i386", - "output_directory": "packer-ubuntu-12.10-i386" + "output_directory": "packer-ubuntu-12.10-i386-virtualbox" }, { "boot_command": [ @@ -90,7 +90,7 @@ "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", "vm_name": "packer-ubuntu-12.10-i386", - "output_directory": "packer-ubuntu-12.10-i386", + "output_directory": "packer-ubuntu-12.10-i386-vmware", "type": "vmware", "vmx_data": { "cpuid.coresPerSocket": "1", diff --git a/packer/ubuntu-13.04-amd64.json b/packer/ubuntu-13.04-amd64.json index 0ed4ca3be..620364c2e 100644 --- a/packer/ubuntu-13.04-amd64.json +++ b/packer/ubuntu-13.04-amd64.json @@ -49,7 +49,7 @@ ], "virtualbox_version_file": ".vbox_version", "vm_name": "packer-ubuntu-13.04-amd64", - "output_directory": "packer-ubuntu-13.04-amd64" + "output_directory": "packer-ubuntu-13.04-amd64-virtualbox" }, { "type": "vmware", @@ -92,7 +92,7 @@ "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", "vm_name": "packer-ubuntu-13.04-amd64", - "output_directory": "packer-ubuntu-13.04-amd64", + "output_directory": "packer-ubuntu-13.04-amd64-vmware", "vmx_data": { "cpuid.coresPerSocket": "1", "memsize": "384", diff --git a/packer/ubuntu-13.04-i386.json b/packer/ubuntu-13.04-i386.json index 0145018c6..3158848a7 100644 --- a/packer/ubuntu-13.04-i386.json +++ b/packer/ubuntu-13.04-i386.json @@ -49,7 +49,7 @@ ], "virtualbox_version_file": ".vbox_version", "vm_name": "packer-ubuntu-13.04-i386", - "output_directory": "packer-ubuntu-13.04-i386" + "output_directory": "packer-ubuntu-13.04-i386-virtualbox" }, { "type": "vmware", @@ -91,7 +91,7 @@ "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", "vm_name": "packer-ubuntu-13.04-i386", - "output_directory": "packer-ubuntu-13.04-i386", + "output_directory": "packer-ubuntu-13.04-i386-vmware", "vmx_data": { "cpuid.coresPerSocket": "1", "memsize": "384", diff --git a/packer/ubuntu-13.10-amd64.json b/packer/ubuntu-13.10-amd64.json index 7aa408d88..794d7d88f 100644 --- a/packer/ubuntu-13.10-amd64.json +++ b/packer/ubuntu-13.10-amd64.json @@ -49,7 +49,7 @@ ], "virtualbox_version_file": ".vbox_version", "vm_name": "packer-ubuntu-13.10-amd64", - "output_directory": "packer-ubuntu-13.10-amd64" + "output_directory": "packer-ubuntu-13.10-amd64-virtualbox" }, { "type": "vmware", @@ -92,7 +92,7 @@ "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", "vm_name": "packer-ubuntu-13.10-amd64", - "output_directory": "packer-ubuntu-13.10-amd64", + "output_directory": "packer-ubuntu-13.10-amd64-vmware", "vmx_data": { "cpuid.coresPerSocket": "1", "memsize": "384", diff --git a/packer/ubuntu-13.10-i386.json b/packer/ubuntu-13.10-i386.json index 42670ace7..af1a5d621 100644 --- a/packer/ubuntu-13.10-i386.json +++ b/packer/ubuntu-13.10-i386.json @@ -49,7 +49,7 @@ ], "virtualbox_version_file": ".vbox_version", "vm_name": "packer-ubuntu-13.10-i386", - "output_directory": "packer-ubuntu-13.10-i386" + "output_directory": "packer-ubuntu-13.10-i386-virtualbox" }, { "type": "vmware", @@ -91,7 +91,7 @@ "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", "vm_name": "packer-ubuntu-13.10-i386", - "output_directory": "packer-ubuntu-13.10-i386", + "output_directory": "packer-ubuntu-13.10-i386-vmware", "vmx_data": { "cpuid.coresPerSocket": "1", "memsize": "384", From 4676d0f601eb62df861166457ad89bfb4d84a10d Mon Sep 17 00:00:00 2001 From: "Julian C. Dunn" <jdunn@getchef.com> Date: Sat, 14 Dec 2013 22:21:01 -0500 Subject: [PATCH 0158/1622] Import OmniOS r151008f template. Based on templates found here: http://omnios.omniti.com/wiki.php/VagrantBaseboxes Note that OmniOS needs a floppy to start under VMware Fusion. http://thewayeye.net/2012/june/1/installing-omnios-under-vmware-fusionworkstation Also note that OmniOS currently kernel panics on shutting down under VMWare Fusion: http://lists.omniti.com/pipermail/omnios-discuss/2013-December/001956.html --- packer/floppy/omnios/README.TXT | 1 + packer/omnios-r151008f.json | 125 +++++++++++++++++++++++++++ packer/scripts/omnios/postinstall.sh | 54 ++++++++++++ packer/scripts/omnios/vmtools.sh | 30 +++++++ 4 files changed, 210 insertions(+) create mode 100644 packer/floppy/omnios/README.TXT create mode 100644 packer/omnios-r151008f.json create mode 100644 packer/scripts/omnios/postinstall.sh create mode 100644 packer/scripts/omnios/vmtools.sh diff --git a/packer/floppy/omnios/README.TXT b/packer/floppy/omnios/README.TXT new file mode 100644 index 000000000..4249186cf --- /dev/null +++ b/packer/floppy/omnios/README.TXT @@ -0,0 +1 @@ +A floppy is needed to install under VMware. See: http://omnios.omniti.com/wiki.php/VMwareNotes diff --git a/packer/omnios-r151008f.json b/packer/omnios-r151008f.json new file mode 100644 index 000000000..869f841dc --- /dev/null +++ b/packer/omnios-r151008f.json @@ -0,0 +1,125 @@ +{ + "variables": { + "chef_version": "provisionerless", + "mirror": "http://omnios.omniti.com/media" + }, + "provisioners": [ + { + "type": "shell", + "scripts": [ + "scripts/omnios/vmtools.sh", + "scripts/omnios/postinstall.sh" + ], + "execute_command": "{{.Vars}} sh '{{.Path}}'" + } + ], + "post-processors": [ + { + "type": "vagrant", + "compression_level": 9, + "output": "../builds/{{.Provider}}/opscode_omnios-r151008f_chef-{{user `chef_version`}}.box" + } + ], + "builders": [ + { + "type": "virtualbox", + "guest_os_type": "OpenSolaris_64", + "iso_url": "{{user `mirror`}}/OmniOS_Text_r151008f.iso", + "iso_checksum": "d64d206c1e5aeeb61c5b579dd39ed11a86ef5737", + "iso_checksum_type": "sha1", + "ssh_username": "root", + "ssh_password": "vagrant", + "shutdown_command": "/usr/sbin/shutdown -g 0 -y -i 5", + "boot_wait": "30s", + "disk_size": 40960, + "ssh_port": 22, + "vboxmanage": [ + ["modifyvm", "{{.Name}}", "--memory", "1024"], + ["modifyvm", "{{.Name}}", "--cpus", "1"] + ], + "virtualbox_version_file": ".vbox_version", + "vm_name": "packer-omnios-r151008f", + "output_directory": "packer-omnios-r151008f-virtualbox", + "boot_command": [ + "<enter><wait10><wait5>", + "1<enter><wait10>", + "<wait10>", + "<f2><wait>", + "<f2><wait>", + "<f2><wait>", + "<bs><bs><bs><bs><bs><bs><bs>omnios-vagrant", + "<f2><wait>", + "<f2><wait>", + "<f2><wait>", + "<wait10><wait10><wait10><wait10><wait10><wait10>", + "<wait10><wait10><wait10><wait10><wait10><wait10>", + "<wait10><wait10><wait10><wait10><wait10><wait10>", + "<wait10><wait10><wait10><wait10><wait10><wait10>", + "<f8><wait>", + "<wait10><wait10><wait10><wait10><wait10><wait10>", + "<wait10><wait10><wait10><wait10><wait10><wait10>", + "root<enter><wait><enter><wait5>", + "passwd<enter><wait>", + "vagrant<enter><wait>", + "vagrant<enter><wait>", + "ipadm create-if e1000g0<enter><wait>", + "ipadm create-addr -T dhcp e1000g0/v4<enter><wait>", + "echo 'nameserver 8.8.8.8' > /etc/resolv.conf<enter><wait>", + "cp /etc/nsswitch.dns /etc/nsswitch.conf<enter><wait>", + "sed -i -e 's/PermitRootLogin no/PermitRootLogin yes/' /etc/ssh/sshd_config<enter><wait>", + "svcadm restart ssh<enter><wait>" + ] + }, + { + "type": "vmware", + "guest_os_type": "solaris11-64", + "iso_url": "{{user `mirror`}}/OmniOS_Text_r151008f.iso", + "iso_checksum": "d64d206c1e5aeeb61c5b579dd39ed11a86ef5737", + "iso_checksum_type": "sha1", + "ssh_username": "root", + "ssh_password": "vagrant", + "shutdown_command": "/usr/sbin/shutdown -g 0 -y -i 5", + "boot_wait": "30s", + "disk_size": 40960, + "ssh_port": 22, + "floppy_files": [ "floppy/omnios/README.TXT" ], + "tools_upload_flavor": "solaris", + "vmx_data": { + "cpuid.coresPerSocket": "1", + "memsize": "1024", + "numvcpus": "1" + }, + "vm_name": "packer-omnios-r151008f", + "output_directory": "packer-omnios-r151008f-vmware", + "boot_command": [ + "<enter><wait10><wait5>", + "1<enter><wait10>", + "<wait10>", + "<f2><wait>", + "<f2><wait>", + "<f2><wait>", + "<bs><bs><bs><bs><bs><bs><bs>omnios-vagrant", + "<f2><wait>", + "<f2><wait>", + "<f2><wait>", + "<wait10><wait10><wait10><wait10><wait10><wait10>", + "<wait10><wait10><wait10><wait10><wait10><wait10>", + "<wait10><wait10><wait10><wait10><wait10><wait10>", + "<wait10><wait10><wait10><wait10><wait10><wait10>", + "<f8><wait>", + "<wait10><wait10><wait10><wait10><wait10><wait10>", + "<wait10><wait10><wait10><wait10><wait10><wait10>", + "root<enter><wait><enter><wait5>", + "passwd<enter><wait>", + "vagrant<enter><wait>", + "vagrant<enter><wait>", + "ipadm create-if e1000g0<enter><wait>", + "ipadm create-addr -T dhcp e1000g0/v4<enter><wait>", + "echo 'nameserver 8.8.8.8' > /etc/resolv.conf<enter><wait>", + "cp /etc/nsswitch.dns /etc/nsswitch.conf<enter><wait>", + "sed -i -e 's/PermitRootLogin no/PermitRootLogin yes/' /etc/ssh/sshd_config<enter><wait>", + "svcadm restart ssh<enter><wait>" + ] + } + ] +} diff --git a/packer/scripts/omnios/postinstall.sh b/packer/scripts/omnios/postinstall.sh new file mode 100644 index 000000000..07fe0c488 --- /dev/null +++ b/packer/scripts/omnios/postinstall.sh @@ -0,0 +1,54 @@ +#!/bin/sh + +echo "Creating vagrant user" +useradd -m -k /etc/skel/ -b /export/home -s /usr/bin/bash vagrant +passwd -N vagrant + +echo "Adding Vagrant user to sudoers" +echo "vagrant ALL=(ALL) NOPASSWD: ALL" > /etc/sudoers +echo 'Defaults env_keep += "SSH_AUTH_SOCK"' >> /etc/sudoers +chmod 0440 /etc/sudoers + +# add paths and other options to vagrant user's shell +echo "Setting Vagrant user's and root's environment" +echo "export PATH=\$PATH:/opt/omni/bin" >> /export/home/vagrant/.profile +echo "export PATH=\$PATH:/opt/omni/bin" >> /root/.profile + +# move /usr/gnu/bin to end of PATH for root and vagrant, since its presence at +# the front breaks vagrant 1.1+ +echo "Moving GNU path in Vagrant user's and root's environment" +sed -i -e 's/PATH=\/usr\/gnu\/bin:\(.*\)/PATH=\1:\/usr\/gnu\/bin/' \ + /export/home/vagrant/.profile +sed -i -e 's/PATH=\/usr\/gnu\/bin:\(.*\)/PATH=\1:\/usr\/gnu\/bin/' \ + /root/.profile + +# setup the vagrant key +# you can replace this key-pair with your own generated ssh key-pair +echo "Setting the vagrant ssh pub key" +mkdir /export/home/vagrant/.ssh +chmod 700 /export/home/vagrant/.ssh +chown vagrant:root /export/home/vagrant/.ssh +touch /export/home/vagrant/.ssh/authorized_keys +curl -sL http://github.com/mitchellh/vagrant/raw/master/keys/vagrant.pub > \ + /export/home/vagrant/.ssh/authorized_keys +chmod 600 /export/home/vagrant/.ssh/authorized_keys +chown vagrant:root /export/home/vagrant/.ssh/authorized_keys + +# formally add omniti-ms publisher +echo "Adding omniti-ms publisher" +pkg set-publisher -g http://pkg.omniti.com/omniti-ms/ ms.omniti.com + +# remove root login from sshd +echo "Removing root login over SSH" +sed -i -e "s/PermitRootLogin yes/PermitRootLogin no/" /etc/ssh/sshd_config +svcadm restart ssh + +# update grub menu to lower timeout and remove unnecessary second entry +echo "Updating Grub boot menu" +sed -i -e 's/^timeout.*$/timeout 5/' -e "/^title omniosvar/,`wc -l /rpool/boot/grub/menu.lst | awk '{ print $1 }'` d" /rpool/boot/grub/menu.lst + +# Reset resolv.conf +echo "Resetting resolv.conf" +echo "nameserver 8.8.8.8" > /etc/resolv.conf + +echo "Post-install done" diff --git a/packer/scripts/omnios/vmtools.sh b/packer/scripts/omnios/vmtools.sh new file mode 100644 index 000000000..577783485 --- /dev/null +++ b/packer/scripts/omnios/vmtools.sh @@ -0,0 +1,30 @@ +#!/bin/sh + +if [ $PACKER_BUILDER_TYPE == 'virtualbox' ]; then + echo "Installing VirtualBox Guest Additions" + echo "mail=\ninstance=overwrite\npartial=quit" > /tmp/noask.admin + echo "runlevel=nocheck\nidepend=quit\nrdepend=quit" >> /tmp/noask.admin + echo "space=quit\nsetuid=nocheck\nconflict=nocheck" >> /tmp/noask.admin + echo "action=nocheck\nbasedir=default" >> /tmp/noask.admin + mkdir /mnt/vbga + VBGADEV=`lofiadm -a VBoxGuestAdditions.iso` + mount -o ro -F hsfs $VBGADEV /mnt/vbga + pkgadd -a /tmp/noask.admin -G -d /mnt/vbga/VBoxSolarisAdditions.pkg all + umount /mnt/vbga + lofiadm -d $VBGADEV + rm -f VBoxGuestAdditions.iso +fi + +if [ $PACKER_BUILDER_TYPE == 'vmware' ]; then + mkdir /mnt/vmtools + VMTOOLSDEV=`lofiadm -a solaris.iso` + mount -o ro -F hsfs $VMTOOLSDEV /mnt/vmtools + mkdir /tmp/vmfusion-archive + tar zxvf /mnt/vmtools/vmware-solaris-tools.tar.gz -C /tmp/vmfusion-archive + /tmp/vmfusion-archive/vmware-tools-distrib/vmware-install.pl --default + umount /mnt/vmtools + lofiadm -d $VMTOOLSDEV + rmdir /mnt/vmtools + rm -rf /tmp/vmfusion-archive + rm -f solaris.iso +fi From eee6d4035eefe3e9ec777110310544ef7c0671e4 Mon Sep 17 00:00:00 2001 From: "Julian C. Dunn" <jdunn@getchef.com> Date: Sun, 15 Dec 2013 22:34:09 -0500 Subject: [PATCH 0159/1622] VMWare needs more time to inspect the system disks --- packer/omnios-r151008f.json | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/packer/omnios-r151008f.json b/packer/omnios-r151008f.json index 869f841dc..5b372be9d 100644 --- a/packer/omnios-r151008f.json +++ b/packer/omnios-r151008f.json @@ -95,7 +95,9 @@ "<enter><wait10><wait5>", "1<enter><wait10>", "<wait10>", - "<f2><wait>", + "<f2><wait10>", + "<wait10><wait10><wait10><wait10><wait10><wait10>", + "<wait10><wait10><wait10><wait10><wait10><wait10>", "<f2><wait>", "<f2><wait>", "<bs><bs><bs><bs><bs><bs><bs>omnios-vagrant", From 2740402e360099c392918c72fb6a5d030dcda1b1 Mon Sep 17 00:00:00 2001 From: "Julian C. Dunn" <jdunn@getchef.com> Date: Sat, 14 Dec 2013 22:58:18 -0500 Subject: [PATCH 0160/1622] Rewrite chef.sh to be more cross-platform. --- packer/scripts/common/chef.sh | 195 ++++++++++++++++++++++++++++++---- 1 file changed, 177 insertions(+), 18 deletions(-) diff --git a/packer/scripts/common/chef.sh b/packer/scripts/common/chef.sh index 9503ea682..a2682cc51 100644 --- a/packer/scripts/common/chef.sh +++ b/packer/scripts/common/chef.sh @@ -1,12 +1,42 @@ -#!/bin/sh -eux +#!/bin/sh +# WARNING: REQUIRES /bin/sh +# +# - must run on /bin/sh on solaris 9 +# - must run on /bin/sh on AIX 6.x +# - if you think you are a bash wizard, you probably do not understand +# this programming language. do not touch. +# - if you are under 40, get peer review from your elders. +# +# Author:: Julian C. Dunn (<jdunn@getchef.com>) +# Cribbed Code From:: Lamont Granquist, Seth Chisamore, Stephen Delano & Tyler Cloke +# Copyright:: Copyright (c) 2013, Chef Software, Inc. +# License:: Apache License, Version 2.0 +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# # Set $CHEF_VERSION inside Packer's template. Valid options are: # 'provisionerless' -- build a box without Chef # 'x.y.z' -- build a box with version x.y.z of Chef # 'latest' -- build a box with the latest version of Chef +# 'prerelease' -- build a box with a prerelease version of Chef +chef_installer="/tmp/install-chef.sh" +chef_installer_url="https://www.getchef.com/chef/install.sh" + +# Check whether a command exists - returns 0 if it does, 1 if it does not exists() { - if command -v $1 &>/dev/null + if command -v $1 >/dev/null 2>&1 then return 0 else @@ -14,26 +44,155 @@ exists() { fi } +unable_to_retrieve_package() { + echo "Unable to retrieve install.sh!" + if test "x$stderr_results" != "x"; then + echo "\nDEBUG OUTPUT FOLLOWS:\n$stderr_results" + fi + exit 1 +} + +capture_tmp_stderr() { + # spool up /tmp/stderr from all the commands we called + if test -f "/tmp/stderr"; then + output=`cat /tmp/stderr` + stderr_results="${stderr_results}\nSTDERR from $1:\n\n$output\n" + rm /tmp/stderr + fi +} + +# do_wget URL FILENAME +do_wget() { + echo "trying wget..." + wget -O "$2" "$1" 2>/tmp/stderr + rc=$? + # check for 404 + grep "ERROR 404" /tmp/stderr 2>&1 >/dev/null + if test $? -eq 0; then + echo "ERROR 404" + unable_to_retrieve_package + fi + + # check for bad return status or empty output + if test $rc -ne 0 || test ! -s "$2"; then + capture_tmp_stderr "wget" + return 1 + fi + + return 0 +} + +# do_curl URL FILENAME +do_curl() { + echo "trying curl..." + curl -sL -D /tmp/stderr "$1" > "$2" + rc=$? + # check for 404 + grep "404 Not Found" /tmp/stderr 2>&1 >/dev/null + if test $? -eq 0; then + echo "ERROR 404" + unable_to_retrieve_package + fi + + # check for bad return status or empty output + if test $rc -ne 0 || test ! -s "$2"; then + capture_tmp_stderr "curl" + return 1 + fi + + return 0 +} + +# do_fetch URL FILENAME +do_fetch() { + echo "trying fetch..." + fetch -o "$2" "$1" 2>/tmp/stderr + # check for bad return status + test $? -ne 0 && return 1 + return 0 +} + +# do_curl URL FILENAME +do_perl() { + echo "trying perl..." + perl -e 'use LWP::Simple; getprint($ARGV[0]);' "$1" > "$2" 2>/tmp/stderr + rc=$? + # check for 404 + grep "404 Not Found" /tmp/stderr 2>&1 >/dev/null + if test $? -eq 0; then + echo "ERROR 404" + unable_to_retrieve_package + fi + + # check for bad return status or empty output + if test $rc -ne 0 || test ! -s "$2"; then + capture_tmp_stderr "perl" + return 1 + fi + + return 0 +} + +# do_curl URL FILENAME +do_python() { + echo "trying python..." + python -c "import sys,urllib2 ; sys.stdout.write(urllib2.urlopen(sys.argv[1]).read())" "$1" > "$2" 2>/tmp/stderr + rc=$? + # check for 404 + grep "HTTP Error 404" /tmp/stderr 2>&1 >/dev/null + if test $? -eq 0; then + echo "ERROR 404" + unable_to_retrieve_package + fi + + # check for bad return status or empty output + if test $rc -ne 0 || test ! -s "$2"; then + capture_tmp_stderr "python" + return 1 + fi + return 0 +} + +do_download() { + echo "downloading $1" + echo " to file $2" + + # we try all of these until we get success. + # perl, in particular may be present but LWP::Simple may not be installed + + if exists wget; then + do_wget $1 $2 && return 0 + fi + + if exists curl; then + do_curl $1 $2 && return 0 + fi + + if exists fetch; then + do_fetch $1 $2 && return 0 + fi + + if exists perl; then + do_perl $1 $2 && return 0 + fi + + if exists python; then + do_python $1 $2 && return 0 + fi + + unable_to_retrieve_package +} + if [ x$CHEF_VERSION != x'provisionerless' ]; then + do_download "$chef_installer_url" "$chef_installer" if [ x$CHEF_VERSION == x'latest' ]; then - echo "Installing latest Chef version" - if exists wget; then - wget https://www.opscode.com/chef/install.sh -O - | sh - else - if exists curl; then - curl -L https://www.opscode.com/chef/install.sh | sh - fi - fi + sh "$chef_installer" + elif [ x$CHEF_VERSION == x'prerelease' ]; then + sh "$chef_installer" -p else - echo "Installing Chef version $CHEF_VERSION" - if exists wget; then - wget https://www.opscode.com/chef/install.sh -O - | sh -s -- -v $CHEF_VERSION - else - if exists curl; then - curl -L https://www.opscode.com/chef/install.sh | sh -s -- -v $CHEF_VERSION - fi - fi + sh "$chef_installer" -v $CHEF_VERSION fi + rm -f "$chef_installer" else echo "Building a box without Chef" fi From 623380578bdc80ad31719c6174bc2df5d4f5b103 Mon Sep 17 00:00:00 2001 From: "Julian C. Dunn" <jdunn@getchef.com> Date: Fri, 20 Dec 2013 00:56:45 -0500 Subject: [PATCH 0161/1622] Allow building provisionered OmniOS boxes. Make chef.sh more reliable by not shelling so much... just chmod +x the downloaded script. --- packer/omnios-r151008f.json | 4 +++- packer/scripts/common/chef.sh | 9 +++++---- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/packer/omnios-r151008f.json b/packer/omnios-r151008f.json index 5b372be9d..edcd5349b 100644 --- a/packer/omnios-r151008f.json +++ b/packer/omnios-r151008f.json @@ -8,9 +8,11 @@ "type": "shell", "scripts": [ "scripts/omnios/vmtools.sh", + "scripts/common/chef.sh", "scripts/omnios/postinstall.sh" ], - "execute_command": "{{.Vars}} sh '{{.Path}}'" + "execute_command": "export {{.Vars}} && sh '{{.Path}}'", + "environment_vars": [ "CHEF_VERSION={{user `chef_version`}}" ] } ], "post-processors": [ diff --git a/packer/scripts/common/chef.sh b/packer/scripts/common/chef.sh index a2682cc51..0c3f86bbf 100644 --- a/packer/scripts/common/chef.sh +++ b/packer/scripts/common/chef.sh @@ -185,14 +185,15 @@ do_download() { if [ x$CHEF_VERSION != x'provisionerless' ]; then do_download "$chef_installer_url" "$chef_installer" + chmod +x $chef_installer if [ x$CHEF_VERSION == x'latest' ]; then - sh "$chef_installer" + $chef_installer elif [ x$CHEF_VERSION == x'prerelease' ]; then - sh "$chef_installer" -p + $chef_installer -p else - sh "$chef_installer" -v $CHEF_VERSION + $chef_installer -v $CHEF_VERSION fi - rm -f "$chef_installer" + rm -f $chef_installer else echo "Building a box without Chef" fi From 3af39a3079437c7841e5021fbaeb05ec8ffa0e99 Mon Sep 17 00:00:00 2001 From: "Julian C. Dunn" <jdunn@getchef.com> Date: Thu, 12 Dec 2013 23:24:56 -0500 Subject: [PATCH 0162/1622] Update to packer 0.4.1. No need to run integration on 2 Rubies, one is enough. --- .travis.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index c07ce8790..35309f054 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,8 +1,7 @@ rvm: - - 1.9.3 - 2.0.0 -before_install: wget --no-check-certificate https://dl.bintray.com/mitchellh/packer/0.4.0_linux_amd64.zip && unzip -d packer 0.4.0_linux_amd64.zip +before_install: wget --no-check-certificate https://dl.bintray.com/mitchellh/packer/0.4.1_linux_amd64.zip && unzip -d packer 0.4.1_linux_amd64.zip before_script: export PATH=$PATH:$PWD/packer script: bundle exec thor packer:validate From 69c73ffac7c4b5441f6d6db6347e6eca3b9b2823 Mon Sep 17 00:00:00 2001 From: "Julian C. Dunn" <jdunn@getchef.com> Date: Fri, 20 Dec 2013 01:02:24 -0500 Subject: [PATCH 0163/1622] [GH#147] Updated templates with Fedora 20 final release ISOs. --- packer/fedora-20-i386.json | 10 +++++----- packer/fedora-20-x86_64.json | 8 ++++---- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/packer/fedora-20-i386.json b/packer/fedora-20-i386.json index d12c38450..f0e2288f4 100644 --- a/packer/fedora-20-i386.json +++ b/packer/fedora-20-i386.json @@ -1,7 +1,7 @@ { "variables": { "chef_version": "provisionerless", - "mirror": "http://mirrors.kernel.org/fedora" + "mirror": "http://download.fedoraproject.org/pub/fedora/linux" }, "builders": [ { @@ -14,9 +14,9 @@ "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "guest_os_type": "Fedora", "http_directory": "http", - "iso_checksum": "d98caa59fa72c4817e040060149ca3951aef6c16ccf485522527e7efa3ebbd74", + "iso_checksum": "284ea30ddd50db1b30cd5cd9fae7495dad8714ef1e4428d69a8c8ce80e03b6a9", "iso_checksum_type": "sha256", - "iso_url": "{{user `mirror`}}/releases/test/20-Beta/Fedora/i386/iso/Fedora-20-Beta-i386-DVD.iso", + "iso_url": "{{user `mirror`}}/releases/20/Fedora/i386/iso/Fedora-20-i386-DVD.iso", "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", "ssh_password": "vagrant", "ssh_port": 22, @@ -39,9 +39,9 @@ "disk_size": 40960, "guest_os_type": "fedora", "http_directory": "http", - "iso_checksum": "d98caa59fa72c4817e040060149ca3951aef6c16ccf485522527e7efa3ebbd74", + "iso_checksum": "284ea30ddd50db1b30cd5cd9fae7495dad8714ef1e4428d69a8c8ce80e03b6a9", "iso_checksum_type": "sha256", - "iso_url": "{{user `mirror`}}/releases/test/20-Beta/Fedora/i386/iso/Fedora-20-Beta-i386-DVD.iso", + "iso_url": "{{user `mirror`}}/releases/20/Fedora/i386/iso/Fedora-20-i386-DVD.iso", "tools_upload_flavor": "linux", "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", "ssh_password": "vagrant", diff --git a/packer/fedora-20-x86_64.json b/packer/fedora-20-x86_64.json index 82a29f9c9..9485c9041 100644 --- a/packer/fedora-20-x86_64.json +++ b/packer/fedora-20-x86_64.json @@ -14,9 +14,9 @@ "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "guest_os_type": "Fedora_64", "http_directory": "http", - "iso_checksum": "04e76a36eb97d6fcdc35e6a2ecdb7b7631a4d220cf70cfbffd0f17db000ae3ac", + "iso_checksum": "f2eeed5102b8890e9e6f4b9053717fe73031e699c4b76dc7028749ab66e7f917", "iso_checksum_type": "sha256", - "iso_url": "{{user `mirror`}}/releases/test/20-Beta/Fedora/x86_64/iso/Fedora-20-Beta-x86_64-DVD.iso", + "iso_url": "{{user `mirror`}}/releases/20/Fedora/x86_64/iso/Fedora-20-x86_64-DVD.iso", "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", "ssh_password": "vagrant", "ssh_port": 22, @@ -39,9 +39,9 @@ "disk_size": 40960, "guest_os_type": "fedora-64", "http_directory": "http", - "iso_checksum": "04e76a36eb97d6fcdc35e6a2ecdb7b7631a4d220cf70cfbffd0f17db000ae3ac", + "iso_checksum": "f2eeed5102b8890e9e6f4b9053717fe73031e699c4b76dc7028749ab66e7f917", "iso_checksum_type": "sha256", - "iso_url": "{{user `mirror`}}/releases/test/20-Beta/Fedora/x86_64/iso/Fedora-20-Beta-x86_64-DVD.iso", + "iso_url": "{{user `mirror`}}/releases/20/Fedora/x86_64/iso/Fedora-20-x86_64-DVD.iso", "tools_upload_flavor": "linux", "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", "ssh_password": "vagrant", From d19514882bfa05632777a03853b47512d4eb5bbe Mon Sep 17 00:00:00 2001 From: sc0ttruss <scott.russell@inetmedia.co.uk> Date: Sat, 28 Dec 2013 05:53:59 +0200 Subject: [PATCH 0164/1622] Update sshd.sh Update to prevent centos and redhat delay during login of around 20 seconds on initial startup. Does not happen if you already have the GSSAPI infrastructure setup correctly but most folks don't, and those who do will be able to re-configure this easily. In other words, GSSAPI disabled by default. --- packer/scripts/common/sshd.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/packer/scripts/common/sshd.sh b/packer/scripts/common/sshd.sh index c6e4f20a6..fb25b5cc5 100644 --- a/packer/scripts/common/sshd.sh +++ b/packer/scripts/common/sshd.sh @@ -1,3 +1,4 @@ #!/bin/bash -eux echo "UseDNS no" >> /etc/ssh/sshd_config +echo "GSSAPIAuthentication no" >> /etc/ssh/sshd_config From cfea16ba1140fee572fa009e4b93c7e09674aa74 Mon Sep 17 00:00:00 2001 From: Lothar Wieske <Lothar@Cloudgate-10.local> Date: Fri, 3 Jan 2014 10:52:40 +0100 Subject: [PATCH 0165/1622] Update to packer 0.5.1 packer fix on packer/*.json 0.4.1=>0.5.1 in .travis.yml --- .travis.yml | 2 +- packer/centos-5.10-i386.json | 41 ++++++---- packer/centos-5.10-x86_64.json | 41 ++++++---- packer/centos-6.5-i386.json | 40 ++++++---- packer/centos-6.5-x86_64.json | 41 ++++++---- packer/debian-6.0.8-amd64.json | 65 +++++++++------ packer/debian-6.0.8-i386.json | 63 +++++++++------ packer/debian-7.2.0-amd64.json | 63 +++++++++------ packer/debian-7.2.0-i386.json | 63 +++++++++------ packer/fedora-18-i386.json | 40 ++++++---- packer/fedora-18-x86_64.json | 40 ++++++---- packer/fedora-19-i386.json | 40 ++++++---- packer/fedora-19-x86_64.json | 40 ++++++---- packer/fedora-20-i386.json | 40 ++++++---- packer/fedora-20-x86_64.json | 40 ++++++---- packer/freebsd-9.2-amd64.json | 89 ++++++++++++--------- packer/freebsd-9.2-i386.json | 85 +++++++++++--------- packer/omnios-r151008f.json | 139 ++++++++++++++++++--------------- packer/rhel-5.10-i386.json | 41 ++++++---- packer/rhel-5.10-x86_64.json | 41 ++++++---- packer/rhel-6.5-i386.json | 40 ++++++---- packer/rhel-6.5-x86_64.json | 44 +++++++---- packer/sles-11-sp2-i386.json | 51 ++++++------ packer/sles-11-sp2-x86_64.json | 51 ++++++------ packer/sles-11-sp3-i386.json | 51 ++++++------ packer/sles-11-sp3-x86_64.json | 51 ++++++------ packer/ubuntu-10.04-amd64.json | 41 ++++++---- packer/ubuntu-10.04-i386.json | 41 ++++++---- packer/ubuntu-12.04-amd64.json | 55 ++++++++----- packer/ubuntu-12.04-i386.json | 40 ++++++---- packer/ubuntu-12.10-amd64.json | 40 ++++++---- packer/ubuntu-12.10-i386.json | 40 ++++++---- packer/ubuntu-13.04-amd64.json | 40 ++++++---- packer/ubuntu-13.04-i386.json | 44 +++++++---- packer/ubuntu-13.10-amd64.json | 41 ++++++---- packer/ubuntu-13.10-i386.json | 45 +++++++---- 36 files changed, 1085 insertions(+), 684 deletions(-) diff --git a/.travis.yml b/.travis.yml index 35309f054..742e87797 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,7 @@ rvm: - 2.0.0 -before_install: wget --no-check-certificate https://dl.bintray.com/mitchellh/packer/0.4.1_linux_amd64.zip && unzip -d packer 0.4.1_linux_amd64.zip +before_install: wget --no-check-certificate https://dl.bintray.com/mitchellh/packer/0.5.1_linux_amd64.zip && unzip -d packer 0.5.1_linux_amd64.zip before_script: export PATH=$PATH:$PWD/packer script: bundle exec thor packer:validate diff --git a/packer/centos-5.10-i386.json b/packer/centos-5.10-i386.json index c92326314..fbc41a6a4 100644 --- a/packer/centos-5.10-i386.json +++ b/packer/centos-5.10-i386.json @@ -1,11 +1,6 @@ { - "variables": { - "chef_version": "provisionerless", - "mirror": "http://mirrors.kernel.org/centos" - }, "builders": [ { - "type": "virtualbox", "boot_command": [ "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/centos-5.10/ks.cfg<enter><wait>" ], @@ -17,21 +12,31 @@ "iso_checksum": "bb4e61210e1c0389fdf55c59bd2dd7bc957dd400", "iso_checksum_type": "sha1", "iso_url": "{{user `mirror`}}/5.10/isos/i386/CentOS-5.10-i386-bin-DVD-1of2.iso", + "output_directory": "packer-centos-5.10-i386-virtualbox", "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", + "type": "virtualbox-iso", "vboxmanage": [ - [ "modifyvm", "{{.Name}}", "--memory", "384" ], - [ "modifyvm", "{{.Name}}", "--cpus", "1" ] + [ + "modifyvm", + "{{.Name}}", + "--memory", + "384" + ], + [ + "modifyvm", + "{{.Name}}", + "--cpus", + "1" + ] ], "virtualbox_version_file": ".vbox_version", - "vm_name": "packer-centos-5.10-i386", - "output_directory": "packer-centos-5.10-i386-virtualbox" + "vm_name": "packer-centos-5.10-i386" }, { - "type": "vmware", "boot_command": [ "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/centos-5.10/ks.cfg<enter><wait>" ], @@ -42,14 +47,15 @@ "iso_checksum": "bb4e61210e1c0389fdf55c59bd2dd7bc957dd400", "iso_checksum_type": "sha1", "iso_url": "http://mirrors.kernel.org/centos/5.10/isos/i386/CentOS-5.10-i386-bin-DVD-1of2.iso", - "tools_upload_flavor": "linux", + "output_directory": "packer-centos-5.10-i386-vmware", "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", + "tools_upload_flavor": "linux", + "type": "vmware-iso", "vm_name": "packer-centos-5.10-i386", - "output_directory": "packer-centos-5.10-i386-vmware", "vmx_data": { "cpuid.coresPerSocket": "1", "memsize": "384", @@ -65,7 +71,9 @@ ], "provisioners": [ { - "environment_vars": [ "CHEF_VERSION={{user `chef_version`}}" ], + "environment_vars": [ + "CHEF_VERSION={{user `chef_version`}}" + ], "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E bash '{{.Path}}'", "scripts": [ "scripts/common/vagrant.sh", @@ -77,5 +85,10 @@ ], "type": "shell" } - ] + ], + "variables": { + "chef_version": "provisionerless", + "mirror": "http://mirrors.kernel.org/centos" + } } + diff --git a/packer/centos-5.10-x86_64.json b/packer/centos-5.10-x86_64.json index 7088f445a..29848e98b 100644 --- a/packer/centos-5.10-x86_64.json +++ b/packer/centos-5.10-x86_64.json @@ -1,11 +1,6 @@ { - "variables": { - "chef_version": "provisionerless", - "mirror": "http://mirrors.kernel.org/centos" - }, "builders": [ { - "type": "virtualbox", "boot_command": [ "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/centos-5.10/ks.cfg<enter><wait>" ], @@ -17,21 +12,31 @@ "iso_checksum": "d8403b3fe4972eda3e147ee76d682a4a3beae1e1", "iso_checksum_type": "sha1", "iso_url": "{{user `mirror`}}/5.10/isos/x86_64/CentOS-5.10-x86_64-bin-DVD-1of2.iso", + "output_directory": "packer-centos-5.10-x86_64-virtualbox", "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", + "type": "virtualbox-iso", "vboxmanage": [ - [ "modifyvm", "{{.Name}}", "--memory", "384" ], - [ "modifyvm", "{{.Name}}", "--cpus", "1" ] + [ + "modifyvm", + "{{.Name}}", + "--memory", + "384" + ], + [ + "modifyvm", + "{{.Name}}", + "--cpus", + "1" + ] ], "virtualbox_version_file": ".vbox_version", - "vm_name": "packer-centos-5.10-x86_64", - "output_directory": "packer-centos-5.10-x86_64-virtualbox" + "vm_name": "packer-centos-5.10-x86_64" }, { - "type": "vmware", "boot_command": [ "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/centos-5.10/ks.cfg<enter><wait>" ], @@ -42,14 +47,15 @@ "iso_checksum": "d8403b3fe4972eda3e147ee76d682a4a3beae1e1", "iso_checksum_type": "sha1", "iso_url": "http://mirrors.kernel.org/centos/5.10/isos/x86_64/CentOS-5.10-x86_64-bin-DVD-1of2.iso", - "tools_upload_flavor": "linux", + "output_directory": "packer-centos-5.10-x86_64-vmware", "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", + "tools_upload_flavor": "linux", + "type": "vmware-iso", "vm_name": "packer-centos-5.10-x86_64", - "output_directory": "packer-centos-5.10-x86_64-vmware", "vmx_data": { "cpuid.coresPerSocket": "1", "memsize": "384", @@ -65,7 +71,9 @@ ], "provisioners": [ { - "environment_vars": [ "CHEF_VERSION={{user `chef_version`}}" ], + "environment_vars": [ + "CHEF_VERSION={{user `chef_version`}}" + ], "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E bash '{{.Path}}'", "scripts": [ "scripts/common/vagrant.sh", @@ -77,5 +85,10 @@ ], "type": "shell" } - ] + ], + "variables": { + "chef_version": "provisionerless", + "mirror": "http://mirrors.kernel.org/centos" + } } + diff --git a/packer/centos-6.5-i386.json b/packer/centos-6.5-i386.json index 99bb7d541..abf9a707b 100644 --- a/packer/centos-6.5-i386.json +++ b/packer/centos-6.5-i386.json @@ -1,11 +1,6 @@ { - "variables": { - "chef_version": "provisionerless", - "mirror": "http://mirrors.kernel.org/centos" - }, "builders": [ { - "type": "virtualbox", "boot_command": [ "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/centos-6.5/ks.cfg<enter><wait>" ], @@ -17,21 +12,31 @@ "iso_checksum": "67ea68068ae53d1f23431072ec0288b3e1abfe4d", "iso_checksum_type": "sha1", "iso_url": "{{user `mirror`}}/6.5/isos/i386/CentOS-6.5-i386-bin-DVD1.iso", + "output_directory": "packer-centos-6.5-i386-virtualbox", "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", + "type": "virtualbox-iso", "vboxmanage": [ - [ "modifyvm", "{{.Name}}", "--memory", "480" ], - [ "modifyvm", "{{.Name}}", "--cpus", "1" ] + [ + "modifyvm", + "{{.Name}}", + "--memory", + "480" + ], + [ + "modifyvm", + "{{.Name}}", + "--cpus", + "1" + ] ], "virtualbox_version_file": ".vbox_version", - "vm_name": "packer-centos-6.5-i386", - "output_directory": "packer-centos-6.5-i386-virtualbox" + "vm_name": "packer-centos-6.5-i386" }, { - "type": "vmware", "boot_command": [ "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/centos-6.5/ks.cfg<enter><wait>" ], @@ -42,14 +47,15 @@ "iso_checksum": "67ea68068ae53d1f23431072ec0288b3e1abfe4d", "iso_checksum_type": "sha1", "iso_url": "http://mirrors.kernel.org/centos/6.5/isos/i386/CentOS-6.5-i386-bin-DVD1.iso", - "tools_upload_flavor": "linux", + "output_directory": "packer-centos-6.5-i386-vmware", "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", + "tools_upload_flavor": "linux", + "type": "vmware-iso", "vm_name": "packer-centos-6.5-i386", - "output_directory": "packer-centos-6.5-i386-vmware", "vmx_data": { "cpuid.coresPerSocket": "1", "memsize": "480", @@ -65,7 +71,9 @@ ], "provisioners": [ { - "environment_vars": [ "CHEF_VERSION={{user `chef_version`}}" ], + "environment_vars": [ + "CHEF_VERSION={{user `chef_version`}}" + ], "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E bash '{{.Path}}'", "scripts": [ "scripts/common/sshd.sh", @@ -77,6 +85,10 @@ ], "type": "shell" } - ] + ], + "variables": { + "chef_version": "provisionerless", + "mirror": "http://mirrors.kernel.org/centos" + } } diff --git a/packer/centos-6.5-x86_64.json b/packer/centos-6.5-x86_64.json index fa97de138..d70b59915 100644 --- a/packer/centos-6.5-x86_64.json +++ b/packer/centos-6.5-x86_64.json @@ -1,11 +1,6 @@ { - "variables": { - "chef_version": "provisionerless", - "mirror": "http://mirrors.kernel.org/centos" - }, "builders": [ { - "type": "virtualbox", "boot_command": [ "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/centos-6.5/ks.cfg<enter><wait>" ], @@ -17,21 +12,31 @@ "iso_checksum": "32c7695b97f7dcd1f59a77a71f64f2957dddf738", "iso_checksum_type": "sha1", "iso_url": "{{user `mirror`}}/6.5/isos/x86_64/CentOS-6.5-x86_64-bin-DVD1.iso", + "output_directory": "packer-centos-6.5-x86_64-virtualbox", "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", + "type": "virtualbox-iso", "vboxmanage": [ - [ "modifyvm", "{{.Name}}", "--memory", "480" ], - [ "modifyvm", "{{.Name}}", "--cpus", "1" ] + [ + "modifyvm", + "{{.Name}}", + "--memory", + "480" + ], + [ + "modifyvm", + "{{.Name}}", + "--cpus", + "1" + ] ], "virtualbox_version_file": ".vbox_version", - "vm_name": "packer-centos-6.5-x86_64", - "output_directory": "packer-centos-6.5-x86_64-virtualbox" + "vm_name": "packer-centos-6.5-x86_64" }, { - "type": "vmware", "boot_command": [ "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/centos-6.5/ks.cfg<enter><wait>" ], @@ -42,14 +47,15 @@ "iso_checksum": "32c7695b97f7dcd1f59a77a71f64f2957dddf738", "iso_checksum_type": "sha1", "iso_url": "http://mirrors.kernel.org/centos/6.5/isos/x86_64/CentOS-6.5-x86_64-bin-DVD1.iso", - "tools_upload_flavor": "linux", + "output_directory": "packer-centos-6.5-x86_64-vmware", "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", + "tools_upload_flavor": "linux", + "type": "vmware-iso", "vm_name": "packer-centos-6.5-x86_64", - "output_directory": "packer-centos-6.5-x86_64-vmware", "vmx_data": { "cpuid.coresPerSocket": "1", "memsize": "480", @@ -65,7 +71,9 @@ ], "provisioners": [ { - "environment_vars": [ "CHEF_VERSION={{user `chef_version`}}" ], + "environment_vars": [ + "CHEF_VERSION={{user `chef_version`}}" + ], "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E bash '{{.Path}}'", "scripts": [ "scripts/common/sshd.sh", @@ -77,5 +85,10 @@ ], "type": "shell" } - ] + ], + "variables": { + "chef_version": "provisionerless", + "mirror": "http://mirrors.kernel.org/centos" + } } + diff --git a/packer/debian-6.0.8-amd64.json b/packer/debian-6.0.8-amd64.json index 9661a18c1..e435b9fdb 100644 --- a/packer/debian-6.0.8-amd64.json +++ b/packer/debian-6.0.8-amd64.json @@ -1,11 +1,6 @@ { - "variables": { - "chef_version": "provisionerless", - "mirror": "http://cdimage.debian.org/cdimage/archive" - }, "builders": [ { - "type": "virtualbox", "boot_command": [ "<esc><wait>", "install <wait>", @@ -25,27 +20,37 @@ ], "boot_wait": "10s", "disk_size": 40960, + "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "guest_os_type": "Debian_64", "http_directory": "http", "iso_checksum": "d0ec1c64c00ff601995139dbacfb54109a23788f", "iso_checksum_type": "sha1", "iso_url": "{{user `mirror`}}/6.0.8/amd64/iso-cd/debian-6.0.8-amd64-CD-1.iso", - "ssh_username": "vagrant", + "output_directory": "packer-debian-6.0.8-amd64-virtualbox", + "shutdown_command": "echo 'vagrant'|sudo -S /sbin/shutdown -hP now", "ssh_password": "vagrant", "ssh_port": 22, + "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", - "shutdown_command": "echo 'vagrant'|sudo -S /sbin/shutdown -hP now", - "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", - "virtualbox_version_file": ".vbox_version", - "vm_name": "packer-debian-6.0.8-amd64", - "output_directory": "packer-debian-6.0.8-amd64-virtualbox", + "type": "virtualbox-iso", "vboxmanage": [ - [ "modifyvm", "{{.Name}}", "--memory", "384" ], - [ "modifyvm", "{{.Name}}", "--cpus", "1" ] - ] + [ + "modifyvm", + "{{.Name}}", + "--memory", + "384" + ], + [ + "modifyvm", + "{{.Name}}", + "--cpus", + "1" + ] + ], + "virtualbox_version_file": ".vbox_version", + "vm_name": "packer-debian-6.0.8-amd64" }, { - "type": "vmware", "boot_command": [ "<esc><wait>", "install <wait>", @@ -70,30 +75,34 @@ "iso_checksum": "d0ec1c64c00ff601995139dbacfb54109a23788f", "iso_checksum_type": "sha1", "iso_url": "{{user `mirror`}}/6.0.8/amd64/iso-cd/debian-6.0.8-amd64-CD-1.iso", - "ssh_username": "vagrant", + "output_directory": "packer-debian-6.0.8-amd64-vmware", + "shutdown_command": "echo 'vagrant'|sudo -S /sbin/shutdown -hP now", "ssh_password": "vagrant", "ssh_port": 22, + "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", - "shutdown_command": "echo 'vagrant'|sudo -S /sbin/shutdown -hP now", "tools_upload_flavor": "linux", + "type": "vmware-iso", "vm_name": "packer-debian-6.0.8-amd64", - "output_directory": "packer-debian-6.0.8-amd64-vmware", "vmx_data": { + "cpuid.coresPerSocket": "1", "memsize": "384", - "numvcpus": "1", - "cpuid.coresPerSocket": "1" + "numvcpus": "1" } } ], "post-processors": [ { - "type": "vagrant", - "output": "../builds/{{.Provider}}/opscode_debian-6.0.8_chef-{{user `chef_version`}}.box" + "output": "../builds/{{.Provider}}/opscode_debian-6.0.8_chef-{{user `chef_version`}}.box", + "type": "vagrant" } ], "provisioners": [ { - "type": "shell", + "environment_vars": [ + "CHEF_VERSION={{user `chef_version`}}" + ], + "execute_command": "echo 'vagrant'|{{.Vars}} sudo -S -E bash '{{.Path}}'", "scripts": [ "scripts/debian/update.sh", "scripts/common/sshd.sh", @@ -105,8 +114,12 @@ "scripts/debian/cleanup.sh", "scripts/common/minimize.sh" ], - "environment_vars": [ "CHEF_VERSION={{user `chef_version`}}" ], - "execute_command": "echo 'vagrant'|{{.Vars}} sudo -S -E bash '{{.Path}}'" + "type": "shell" } - ] + ], + "variables": { + "chef_version": "provisionerless", + "mirror": "http://cdimage.debian.org/cdimage/archive" + } } + diff --git a/packer/debian-6.0.8-i386.json b/packer/debian-6.0.8-i386.json index f2b1f23a3..41c245a56 100644 --- a/packer/debian-6.0.8-i386.json +++ b/packer/debian-6.0.8-i386.json @@ -1,11 +1,6 @@ { - "variables": { - "chef_version": "provisionerless", - "mirror": "http://cdimage.debian.org/cdimage/archive" - }, "builders": [ { - "type": "virtualbox", "boot_command": [ "<esc><wait>", "install <wait>", @@ -25,27 +20,37 @@ ], "boot_wait": "10s", "disk_size": 40960, + "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "guest_os_type": "Debian", "http_directory": "http", "iso_checksum": "144194cea77f0e527fd07bd6aa28d1ab50cb5a95", "iso_checksum_type": "sha1", "iso_url": "{{user `mirror`}}/6.0.8/i386/iso-cd/debian-6.0.8-i386-CD-1.iso", - "ssh_username": "vagrant", + "output_directory": "packer-debian-6.0.8-i386-virtualbox", + "shutdown_command": "echo 'vagrant'|sudo -S /sbin/shutdown -hP now", "ssh_password": "vagrant", "ssh_port": 22, + "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", - "shutdown_command": "echo 'vagrant'|sudo -S /sbin/shutdown -hP now", - "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", - "virtualbox_version_file": ".vbox_version", - "vm_name": "packer-debian-6.0.8-i386", - "output_directory": "packer-debian-6.0.8-i386-virtualbox", + "type": "virtualbox-iso", "vboxmanage": [ - [ "modifyvm", "{{.Name}}", "--memory", "384" ], - [ "modifyvm", "{{.Name}}", "--cpus", "1" ] - ] + [ + "modifyvm", + "{{.Name}}", + "--memory", + "384" + ], + [ + "modifyvm", + "{{.Name}}", + "--cpus", + "1" + ] + ], + "virtualbox_version_file": ".vbox_version", + "vm_name": "packer-debian-6.0.8-i386" }, { - "type": "vmware", "boot_command": [ "<esc><wait>", "install <wait>", @@ -70,29 +75,33 @@ "iso_checksum": "144194cea77f0e527fd07bd6aa28d1ab50cb5a95", "iso_checksum_type": "sha1", "iso_url": "{{user `mirror`}}/6.0.8/i386/iso-cd/debian-6.0.8-i386-CD-1.iso", - "ssh_username": "vagrant", + "output_directory": "packer-debian-6.0.8-i386-vmware", + "shutdown_command": "echo 'vagrant'|sudo -S /sbin/shutdown -hP now", "ssh_password": "vagrant", "ssh_port": 22, + "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", - "shutdown_command": "echo 'vagrant'|sudo -S /sbin/shutdown -hP now", "tools_upload_flavor": "linux", + "type": "vmware-iso", "vm_name": "packer-debian-6.0.8-i386", - "output_directory": "packer-debian-6.0.8-i386-vmware", "vmx_data": { + "cpuid.coresPerSocket": "1", "memsize": "384", - "numvcpus": "1", - "cpuid.coresPerSocket": "1" + "numvcpus": "1" } } ], "post-processors": [ { - "type": "vagrant", - "output": "../builds/{{.Provider}}/opscode_debian-6.0.8-i386_chef-{{user `chef_version`}}.box" + "output": "../builds/{{.Provider}}/opscode_debian-6.0.8-i386_chef-{{user `chef_version`}}.box", + "type": "vagrant" } ], "provisioners": [ { + "environment_vars": [ + "CHEF_VERSION={{user `chef_version`}}" + ], "execute_command": "echo 'vagrant' | {{.Vars}} sudo -E -S bash '{{.Path}}'", "scripts": [ "scripts/debian/update.sh", @@ -105,8 +114,12 @@ "scripts/debian/cleanup.sh", "scripts/common/minimize.sh" ], - "type": "shell", - "environment_vars": [ "CHEF_VERSION={{user `chef_version`}}" ] + "type": "shell" } - ] + ], + "variables": { + "chef_version": "provisionerless", + "mirror": "http://cdimage.debian.org/cdimage/archive" + } } + diff --git a/packer/debian-7.2.0-amd64.json b/packer/debian-7.2.0-amd64.json index 4b83e62a5..e398380ec 100644 --- a/packer/debian-7.2.0-amd64.json +++ b/packer/debian-7.2.0-amd64.json @@ -1,11 +1,6 @@ { - "variables": { - "chef_version": "provisionerless", - "mirror": "http://cdimage.debian.org/debian-cd" - }, "builders": [ { - "type": "virtualbox", "boot_command": [ "<esc><wait>", "install <wait>", @@ -25,27 +20,37 @@ ], "boot_wait": "10s", "disk_size": 40960, + "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "guest_os_type": "Debian_64", "http_directory": "http", "iso_checksum": "c7c1e2bf7ec4760b9fecf77fefa6062b73330359", "iso_checksum_type": "sha1", "iso_url": "{{user `mirror`}}/7.2.0/amd64/iso-cd/debian-7.2.0-amd64-CD-1.iso", - "ssh_username": "vagrant", + "output_directory": "packer-debian-7.2.0-amd64-virtualbox", + "shutdown_command": "echo 'vagrant'|sudo -S /sbin/shutdown -hP now", "ssh_password": "vagrant", "ssh_port": 22, + "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", - "shutdown_command": "echo 'vagrant'|sudo -S /sbin/shutdown -hP now", - "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", - "virtualbox_version_file": ".vbox_version", - "vm_name": "packer-debian-7.2.0-amd64", - "output_directory": "packer-debian-7.2.0-amd64-virtualbox", + "type": "virtualbox-iso", "vboxmanage": [ - [ "modifyvm", "{{.Name}}", "--memory", "384" ], - [ "modifyvm", "{{.Name}}", "--cpus", "1" ] - ] + [ + "modifyvm", + "{{.Name}}", + "--memory", + "384" + ], + [ + "modifyvm", + "{{.Name}}", + "--cpus", + "1" + ] + ], + "virtualbox_version_file": ".vbox_version", + "vm_name": "packer-debian-7.2.0-amd64" }, { - "type": "vmware", "boot_command": [ "<esc><wait>", "install <wait>", @@ -70,29 +75,33 @@ "iso_checksum": "c7c1e2bf7ec4760b9fecf77fefa6062b73330359", "iso_checksum_type": "sha1", "iso_url": "{{user `mirror`}}/7.2.0/amd64/iso-cd/debian-7.2.0-amd64-CD-1.iso", - "ssh_username": "vagrant", + "output_directory": "packer-debian-7.2.0-amd64-vmware", + "shutdown_command": "echo 'vagrant'|sudo -S /sbin/shutdown -hP now", "ssh_password": "vagrant", "ssh_port": 22, + "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", - "shutdown_command": "echo 'vagrant'|sudo -S /sbin/shutdown -hP now", "tools_upload_flavor": "linux", + "type": "vmware-iso", "vm_name": "packer-debian-7.2.0-amd64", - "output_directory": "packer-debian-7.2.0-amd64-vmware", "vmx_data": { + "cpuid.coresPerSocket": "1", "memsize": "384", - "numvcpus": "1", - "cpuid.coresPerSocket": "1" + "numvcpus": "1" } } ], "post-processors": [ { - "type": "vagrant", - "output": "../builds/{{.Provider}}/opscode_debian-7.2.0_chef-{{user `chef_version`}}.box" + "output": "../builds/{{.Provider}}/opscode_debian-7.2.0_chef-{{user `chef_version`}}.box", + "type": "vagrant" } ], "provisioners": [ { + "environment_vars": [ + "CHEF_VERSION={{user `chef_version`}}" + ], "execute_command": "echo 'vagrant' | {{.Vars}} sudo -E -S bash '{{.Path}}'", "scripts": [ "scripts/debian/update.sh", @@ -105,8 +114,12 @@ "scripts/debian/cleanup.sh", "scripts/common/minimize.sh" ], - "type": "shell", - "environment_vars": [ "CHEF_VERSION={{user `chef_version`}}" ] + "type": "shell" } - ] + ], + "variables": { + "chef_version": "provisionerless", + "mirror": "http://cdimage.debian.org/debian-cd" + } } + diff --git a/packer/debian-7.2.0-i386.json b/packer/debian-7.2.0-i386.json index 72c01d3a5..e4617d110 100644 --- a/packer/debian-7.2.0-i386.json +++ b/packer/debian-7.2.0-i386.json @@ -1,11 +1,6 @@ { - "variables": { - "chef_version": "provisionerless", - "mirror": "http://cdimage.debian.org/debian-cd" - }, "builders": [ { - "type": "virtualbox", "boot_command": [ "<esc><wait>", "install <wait>", @@ -25,27 +20,37 @@ ], "boot_wait": "10s", "disk_size": 40960, + "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "guest_os_type": "Debian", "http_directory": "http", "iso_checksum": "011d42505fdafeb9be2bd0379a12d4042f24cfd5", "iso_checksum_type": "sha1", "iso_url": "{{user `mirror`}}/7.2.0/i386/iso-cd/debian-7.2.0-i386-CD-1.iso", - "ssh_username": "vagrant", + "output_directory": "packer-debian-7.2.0-i386-virtualbox", + "shutdown_command": "echo 'vagrant'|sudo -S /sbin/shutdown -hP now", "ssh_password": "vagrant", "ssh_port": 22, + "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", - "shutdown_command": "echo 'vagrant'|sudo -S /sbin/shutdown -hP now", - "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", - "virtualbox_version_file": ".vbox_version", - "vm_name": "packer-debian-7.2.0-i386", - "output_directory": "packer-debian-7.2.0-i386-virtualbox", + "type": "virtualbox-iso", "vboxmanage": [ - [ "modifyvm", "{{.Name}}", "--memory", "384" ], - [ "modifyvm", "{{.Name}}", "--cpus", "1" ] - ] + [ + "modifyvm", + "{{.Name}}", + "--memory", + "384" + ], + [ + "modifyvm", + "{{.Name}}", + "--cpus", + "1" + ] + ], + "virtualbox_version_file": ".vbox_version", + "vm_name": "packer-debian-7.2.0-i386" }, { - "type": "vmware", "boot_command": [ "<esc><wait>", "install <wait>", @@ -70,29 +75,33 @@ "iso_checksum": "011d42505fdafeb9be2bd0379a12d4042f24cfd5", "iso_checksum_type": "sha1", "iso_url": "{{user `mirror`}}/7.2.0/i386/iso-cd/debian-7.2.0-i386-CD-1.iso", - "ssh_username": "vagrant", + "output_directory": "packer-debian-7.2.0-i386-vmware", + "shutdown_command": "echo 'vagrant'|sudo -S /sbin/shutdown -hP now", "ssh_password": "vagrant", "ssh_port": 22, + "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", - "shutdown_command": "echo 'vagrant'|sudo -S /sbin/shutdown -hP now", "tools_upload_flavor": "linux", + "type": "vmware-iso", "vm_name": "packer-debian-7.2.0-i386", - "output_directory": "packer-debian-7.2.0-i386-vmware", "vmx_data": { + "cpuid.coresPerSocket": "1", "memsize": "384", - "numvcpus": "1", - "cpuid.coresPerSocket": "1" + "numvcpus": "1" } } ], "post-processors": [ { - "type": "vagrant", - "output": "../builds/{{.Provider}}/opscode_debian-7.2.0-i386_chef-{{user `chef_version`}}.box" + "output": "../builds/{{.Provider}}/opscode_debian-7.2.0-i386_chef-{{user `chef_version`}}.box", + "type": "vagrant" } ], "provisioners": [ { + "environment_vars": [ + "CHEF_VERSION={{user `chef_version`}}" + ], "execute_command": "echo 'vagrant' | {{.Vars}} sudo -E -S bash '{{.Path}}'", "scripts": [ "scripts/debian/update.sh", @@ -105,8 +114,12 @@ "scripts/debian/cleanup.sh", "scripts/common/minimize.sh" ], - "type": "shell", - "environment_vars": [ "CHEF_VERSION={{user `chef_version`}}" ] + "type": "shell" } - ] + ], + "variables": { + "chef_version": "provisionerless", + "mirror": "http://cdimage.debian.org/debian-cd" + } } + diff --git a/packer/fedora-18-i386.json b/packer/fedora-18-i386.json index ec6864ec4..85913798c 100644 --- a/packer/fedora-18-i386.json +++ b/packer/fedora-18-i386.json @@ -1,11 +1,6 @@ { - "variables": { - "chef_version": "provisionerless", - "mirror": "http://mirrors.kernel.org/fedora" - }, "builders": [ { - "type": "virtualbox", "boot_command": [ "<tab> linux ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/fedora-18/ks.cfg<enter><wait>" ], @@ -17,21 +12,31 @@ "iso_checksum": "a22e6ab7b0e5e93397e4a1d8d994693d0afb9ad46b1f47a4fe10bfbbc2e7f354", "iso_checksum_type": "sha256", "iso_url": "{{user `mirror`}}/releases/18/Fedora/i386/iso/Fedora-18-i386-DVD.iso", + "output_directory": "packer-fedora-18-i386-virtualbox", "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", + "type": "virtualbox-iso", "vboxmanage": [ - [ "modifyvm", "{{.Name}}", "--memory", "512" ], - [ "modifyvm", "{{.Name}}", "--cpus", "1" ] + [ + "modifyvm", + "{{.Name}}", + "--memory", + "512" + ], + [ + "modifyvm", + "{{.Name}}", + "--cpus", + "1" + ] ], "virtualbox_version_file": ".vbox_version", - "vm_name": "packer-fedora-18-i386", - "output_directory": "packer-fedora-18-i386-virtualbox" + "vm_name": "packer-fedora-18-i386" }, { - "type": "vmware", "boot_command": [ "<tab> linux ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/fedora-18/ks.cfg<enter><wait>" ], @@ -42,14 +47,15 @@ "iso_checksum": "a22e6ab7b0e5e93397e4a1d8d994693d0afb9ad46b1f47a4fe10bfbbc2e7f354", "iso_checksum_type": "sha256", "iso_url": "{{user `mirror`}}/releases/18/Fedora/i386/iso/Fedora-18-i386-DVD.iso", - "tools_upload_flavor": "linux", + "output_directory": "packer-fedora-18-i386-vmware", "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", + "tools_upload_flavor": "linux", + "type": "vmware-iso", "vm_name": "packer-fedora-18-i386", - "output_directory": "packer-fedora-18-i386-vmware", "vmx_data": { "cpuid.coresPerSocket": "1", "memsize": "512", @@ -65,7 +71,9 @@ ], "provisioners": [ { - "environment_vars": [ "CHEF_VERSION={{user `chef_version`}}" ], + "environment_vars": [ + "CHEF_VERSION={{user `chef_version`}}" + ], "execute_command": "echo 'vagrant' | {{.Vars}} sudo -E -S bash '{{.Path}}'", "scripts": [ "scripts/common/sshd.sh", @@ -77,6 +85,10 @@ ], "type": "shell" } - ] + ], + "variables": { + "chef_version": "provisionerless", + "mirror": "http://mirrors.kernel.org/fedora" + } } diff --git a/packer/fedora-18-x86_64.json b/packer/fedora-18-x86_64.json index 0abe42c4d..f9a2f145a 100644 --- a/packer/fedora-18-x86_64.json +++ b/packer/fedora-18-x86_64.json @@ -1,11 +1,6 @@ { - "variables": { - "chef_version": "provisionerless", - "mirror": "http://mirrors.kernel.org/fedora" - }, "builders": [ { - "type": "virtualbox", "boot_command": [ "<tab> linux ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/fedora-18/ks.cfg<enter><wait>" ], @@ -17,21 +12,31 @@ "iso_checksum": "91c5f0aca391acf76a047e284144f90d66d3d5f5dcd26b01f368a43236832c03", "iso_checksum_type": "sha256", "iso_url": "{{user `mirror`}}/releases/18/Fedora/x86_64/iso/Fedora-18-x86_64-DVD.iso", + "output_directory": "packer-fedora-18-x86_64-virtualbox", "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", + "type": "virtualbox-iso", "vboxmanage": [ - [ "modifyvm", "{{.Name}}", "--memory", "512" ], - [ "modifyvm", "{{.Name}}", "--cpus", "1" ] + [ + "modifyvm", + "{{.Name}}", + "--memory", + "512" + ], + [ + "modifyvm", + "{{.Name}}", + "--cpus", + "1" + ] ], "virtualbox_version_file": ".vbox_version", - "vm_name": "packer-fedora-18-x86_64", - "output_directory": "packer-fedora-18-x86_64-virtualbox" + "vm_name": "packer-fedora-18-x86_64" }, { - "type": "vmware", "boot_command": [ "<tab> linux ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/fedora-18/ks.cfg<enter><wait>" ], @@ -42,14 +47,15 @@ "iso_checksum": "91c5f0aca391acf76a047e284144f90d66d3d5f5dcd26b01f368a43236832c03", "iso_checksum_type": "sha256", "iso_url": "{{user `mirror`}}/releases/18/Fedora/x86_64/iso/Fedora-18-x86_64-DVD.iso", - "tools_upload_flavor": "linux", + "output_directory": "packer-fedora-18-x86_64-vmware", "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", + "tools_upload_flavor": "linux", + "type": "vmware-iso", "vm_name": "packer-fedora-18-x86_64", - "output_directory": "packer-fedora-18-x86_64-vmware", "vmx_data": { "cpuid.coresPerSocket": "1", "memsize": "512", @@ -65,7 +71,9 @@ ], "provisioners": [ { - "environment_vars": [ "CHEF_VERSION={{user `chef_version`}}" ], + "environment_vars": [ + "CHEF_VERSION={{user `chef_version`}}" + ], "execute_command": "echo 'vagrant' | {{.Vars}} sudo -E -S bash '{{.Path}}'", "scripts": [ "scripts/common/sshd.sh", @@ -77,6 +85,10 @@ ], "type": "shell" } - ] + ], + "variables": { + "chef_version": "provisionerless", + "mirror": "http://mirrors.kernel.org/fedora" + } } diff --git a/packer/fedora-19-i386.json b/packer/fedora-19-i386.json index e49fb448b..bdb2df603 100644 --- a/packer/fedora-19-i386.json +++ b/packer/fedora-19-i386.json @@ -1,11 +1,6 @@ { - "variables": { - "chef_version": "provisionerless", - "mirror": "http://mirrors.kernel.org/fedora" - }, "builders": [ { - "type": "virtualbox", "boot_command": [ "<tab> linux ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/fedora-19/ks.cfg<enter><wait>" ], @@ -17,21 +12,31 @@ "iso_checksum": "0da29695c4f503e2b27350406c1ceb7a4e5b9b699ea722774368fd16ab277bce", "iso_checksum_type": "sha256", "iso_url": "{{user `mirror`}}/releases/19/Fedora/i386/iso/Fedora-19-i386-DVD.iso", + "output_directory": "packer-fedora-19-i386-virtualbox", "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", + "type": "virtualbox-iso", "vboxmanage": [ - [ "modifyvm", "{{.Name}}", "--memory", "512" ], - [ "modifyvm", "{{.Name}}", "--cpus", "1" ] + [ + "modifyvm", + "{{.Name}}", + "--memory", + "512" + ], + [ + "modifyvm", + "{{.Name}}", + "--cpus", + "1" + ] ], "virtualbox_version_file": ".vbox_version", - "vm_name": "packer-fedora-19-i386", - "output_directory": "packer-fedora-19-i386-virtualbox" + "vm_name": "packer-fedora-19-i386" }, { - "type": "vmware", "boot_command": [ "<tab> linux ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/fedora-19/ks.cfg<enter><wait>" ], @@ -42,14 +47,15 @@ "iso_checksum": "0da29695c4f503e2b27350406c1ceb7a4e5b9b699ea722774368fd16ab277bce", "iso_checksum_type": "sha256", "iso_url": "{{user `mirror`}}/releases/19/Fedora/i386/iso/Fedora-19-i386-DVD.iso", - "tools_upload_flavor": "linux", + "output_directory": "packer-fedora-19-i386-vmware", "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", + "tools_upload_flavor": "linux", + "type": "vmware-iso", "vm_name": "packer-fedora-19-i386", - "output_directory": "packer-fedora-19-i386-vmware", "vmx_data": { "cpuid.coresPerSocket": "1", "memsize": "512", @@ -65,7 +71,9 @@ ], "provisioners": [ { - "environment_vars": [ "CHEF_VERSION={{user `chef_version`}}" ], + "environment_vars": [ + "CHEF_VERSION={{user `chef_version`}}" + ], "execute_command": "echo 'vagrant' | {{.Vars}} sudo -E -S bash '{{.Path}}'", "scripts": [ "scripts/common/sshd.sh", @@ -77,6 +85,10 @@ ], "type": "shell" } - ] + ], + "variables": { + "chef_version": "provisionerless", + "mirror": "http://mirrors.kernel.org/fedora" + } } diff --git a/packer/fedora-19-x86_64.json b/packer/fedora-19-x86_64.json index 5685d69bb..88a4f0026 100644 --- a/packer/fedora-19-x86_64.json +++ b/packer/fedora-19-x86_64.json @@ -1,11 +1,6 @@ { - "variables": { - "chef_version": "provisionerless", - "mirror": "http://mirrors.kernel.org/fedora" - }, "builders": [ { - "type": "virtualbox", "boot_command": [ "<tab> linux ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/fedora-19/ks.cfg<enter><wait>" ], @@ -17,21 +12,31 @@ "iso_checksum": "6e7e263e607cfcadc90ea2ef5668aa3945d9eca596485a7a1f8a9f2478cc7084", "iso_checksum_type": "sha256", "iso_url": "{{user `mirror`}}/releases/19/Fedora/x86_64/iso/Fedora-19-x86_64-DVD.iso", + "output_directory": "packer-fedora-19-x86_64-virtualbox", "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", + "type": "virtualbox-iso", "vboxmanage": [ - [ "modifyvm", "{{.Name}}", "--memory", "512" ], - [ "modifyvm", "{{.Name}}", "--cpus", "1" ] + [ + "modifyvm", + "{{.Name}}", + "--memory", + "512" + ], + [ + "modifyvm", + "{{.Name}}", + "--cpus", + "1" + ] ], "virtualbox_version_file": ".vbox_version", - "vm_name": "packer-fedora-19-x86_64", - "output_directory": "packer-fedora-19-x86_64-virtualbox" + "vm_name": "packer-fedora-19-x86_64" }, { - "type": "vmware", "boot_command": [ "<tab> linux ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/fedora-19/ks.cfg<enter><wait>" ], @@ -42,14 +47,15 @@ "iso_checksum": "6e7e263e607cfcadc90ea2ef5668aa3945d9eca596485a7a1f8a9f2478cc7084", "iso_checksum_type": "sha256", "iso_url": "{{user `mirror`}}/releases/19/Fedora/x86_64/iso/Fedora-19-x86_64-DVD.iso", - "tools_upload_flavor": "linux", + "output_directory": "packer-fedora-19-x86_64-vmware", "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", + "tools_upload_flavor": "linux", + "type": "vmware-iso", "vm_name": "packer-fedora-19-x86_64", - "output_directory": "packer-fedora-19-x86_64-vmware", "vmx_data": { "cpuid.coresPerSocket": "1", "memsize": "512", @@ -65,7 +71,9 @@ ], "provisioners": [ { - "environment_vars": [ "CHEF_VERSION={{user `chef_version`}}" ], + "environment_vars": [ + "CHEF_VERSION={{user `chef_version`}}" + ], "execute_command": "echo 'vagrant' | {{.Vars}} sudo -E -S bash '{{.Path}}'", "scripts": [ "scripts/common/sshd.sh", @@ -77,6 +85,10 @@ ], "type": "shell" } - ] + ], + "variables": { + "chef_version": "provisionerless", + "mirror": "http://mirrors.kernel.org/fedora" + } } diff --git a/packer/fedora-20-i386.json b/packer/fedora-20-i386.json index f0e2288f4..ffe5835bb 100644 --- a/packer/fedora-20-i386.json +++ b/packer/fedora-20-i386.json @@ -1,11 +1,6 @@ { - "variables": { - "chef_version": "provisionerless", - "mirror": "http://download.fedoraproject.org/pub/fedora/linux" - }, "builders": [ { - "type": "virtualbox", "boot_command": [ "<tab> linux ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/fedora-20/ks.cfg<enter><wait>" ], @@ -17,21 +12,31 @@ "iso_checksum": "284ea30ddd50db1b30cd5cd9fae7495dad8714ef1e4428d69a8c8ce80e03b6a9", "iso_checksum_type": "sha256", "iso_url": "{{user `mirror`}}/releases/20/Fedora/i386/iso/Fedora-20-i386-DVD.iso", + "output_directory": "packer-fedora-20-i386-virtualbox", "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", + "type": "virtualbox-iso", "vboxmanage": [ - [ "modifyvm", "{{.Name}}", "--memory", "512" ], - [ "modifyvm", "{{.Name}}", "--cpus", "1" ] + [ + "modifyvm", + "{{.Name}}", + "--memory", + "512" + ], + [ + "modifyvm", + "{{.Name}}", + "--cpus", + "1" + ] ], "virtualbox_version_file": ".vbox_version", - "vm_name": "packer-fedora-20-i386", - "output_directory": "packer-fedora-20-i386-virtualbox" + "vm_name": "packer-fedora-20-i386" }, { - "type": "vmware", "boot_command": [ "<tab> linux ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/fedora-20/ks.cfg<enter><wait>" ], @@ -42,14 +47,15 @@ "iso_checksum": "284ea30ddd50db1b30cd5cd9fae7495dad8714ef1e4428d69a8c8ce80e03b6a9", "iso_checksum_type": "sha256", "iso_url": "{{user `mirror`}}/releases/20/Fedora/i386/iso/Fedora-20-i386-DVD.iso", - "tools_upload_flavor": "linux", + "output_directory": "packer-fedora-20-i386-vmware", "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", + "tools_upload_flavor": "linux", + "type": "vmware-iso", "vm_name": "packer-fedora-20-i386", - "output_directory": "packer-fedora-20-i386-vmware", "vmx_data": { "cpuid.coresPerSocket": "1", "memsize": "512", @@ -65,7 +71,9 @@ ], "provisioners": [ { - "environment_vars": [ "CHEF_VERSION={{user `chef_version`}}" ], + "environment_vars": [ + "CHEF_VERSION={{user `chef_version`}}" + ], "execute_command": "echo 'vagrant' | {{.Vars}} sudo -E -S bash '{{.Path}}'", "scripts": [ "scripts/common/sshd.sh", @@ -77,6 +85,10 @@ ], "type": "shell" } - ] + ], + "variables": { + "chef_version": "provisionerless", + "mirror": "http://download.fedoraproject.org/pub/fedora/linux" + } } diff --git a/packer/fedora-20-x86_64.json b/packer/fedora-20-x86_64.json index 9485c9041..23a53c28c 100644 --- a/packer/fedora-20-x86_64.json +++ b/packer/fedora-20-x86_64.json @@ -1,11 +1,6 @@ { - "variables": { - "chef_version": "provisionerless", - "mirror": "http://download.fedoraproject.org/pub/fedora/linux" - }, "builders": [ { - "type": "virtualbox", "boot_command": [ "<tab> linux ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/fedora-20/ks.cfg<enter><wait>" ], @@ -17,21 +12,31 @@ "iso_checksum": "f2eeed5102b8890e9e6f4b9053717fe73031e699c4b76dc7028749ab66e7f917", "iso_checksum_type": "sha256", "iso_url": "{{user `mirror`}}/releases/20/Fedora/x86_64/iso/Fedora-20-x86_64-DVD.iso", + "output_directory": "packer-fedora-20-x86_64-virtualbox", "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", + "type": "virtualbox-iso", "vboxmanage": [ - [ "modifyvm", "{{.Name}}", "--memory", "512" ], - [ "modifyvm", "{{.Name}}", "--cpus", "1" ] + [ + "modifyvm", + "{{.Name}}", + "--memory", + "512" + ], + [ + "modifyvm", + "{{.Name}}", + "--cpus", + "1" + ] ], "virtualbox_version_file": ".vbox_version", - "vm_name": "packer-fedora-20-x86_64", - "output_directory": "packer-fedora-20-x86_64-virtualbox" + "vm_name": "packer-fedora-20-x86_64" }, { - "type": "vmware", "boot_command": [ "<tab> linux ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/fedora-20/ks.cfg<enter><wait>" ], @@ -42,14 +47,15 @@ "iso_checksum": "f2eeed5102b8890e9e6f4b9053717fe73031e699c4b76dc7028749ab66e7f917", "iso_checksum_type": "sha256", "iso_url": "{{user `mirror`}}/releases/20/Fedora/x86_64/iso/Fedora-20-x86_64-DVD.iso", - "tools_upload_flavor": "linux", + "output_directory": "packer-fedora-20-x86_64-vmware", "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", + "tools_upload_flavor": "linux", + "type": "vmware-iso", "vm_name": "packer-fedora-20-x86_64", - "output_directory": "packer-fedora-20-x86_64-vmware", "vmx_data": { "cpuid.coresPerSocket": "1", "memsize": "512", @@ -65,7 +71,9 @@ ], "provisioners": [ { - "environment_vars": [ "CHEF_VERSION={{user `chef_version`}}" ], + "environment_vars": [ + "CHEF_VERSION={{user `chef_version`}}" + ], "execute_command": "echo 'vagrant' | {{.Vars}} sudo -E -S bash '{{.Path}}'", "scripts": [ "scripts/common/sshd.sh", @@ -77,6 +85,10 @@ ], "type": "shell" } - ] + ], + "variables": { + "chef_version": "provisionerless", + "mirror": "http://download.fedoraproject.org/pub/fedora/linux" + } } diff --git a/packer/freebsd-9.2-amd64.json b/packer/freebsd-9.2-amd64.json index 735d9af52..8c6ae8766 100644 --- a/packer/freebsd-9.2-amd64.json +++ b/packer/freebsd-9.2-amd64.json @@ -1,25 +1,6 @@ { - "variables": { - "chef_version": "provisionerless", - "mirror": "http://ftp.freebsd.org/pub/FreeBSD" - }, - "provisioners": [ - { - "environment_vars": [ "CHEF_VERSION={{user `chef_version`}}" ], - "type": "shell", - "scripts": [ - "scripts/freebsd/postinstall.sh", - "scripts/freebsd/vmtools.sh", - "scripts/common/chef.sh", - "scripts/freebsd/cleanup.sh", - "scripts/common/minimize.sh" - ], - "execute_command": "export {{.Vars}} && cat {{.Path}} | su -m" - } - ], "builders": [ { - "type": "virtualbox", "boot_command": [ "<esc><wait>", "load geom_mbr<wait>", @@ -33,31 +14,41 @@ "mdmfs -s 100m md1 /tmp<enter><wait>", "mdmfs -s 100m md2 /mnt<enter><wait>", "dhclient -l /tmp/dhclient.lease.em0 em0<enter><wait>", - "fetch -o /tmp/install.sh http://{{ .HTTPIP }}:{{ .HTTPPort }}/freebsd-9.2/install.sh && chmod +x /tmp/install.sh && /tmp/install.sh {{ .Name }}<enter><wait>" + "fetch -o /tmp/install.sh http://{{ .HTTPIP }}:{{ .HTTPPort }}/freebsd-9.2/install.sh \u0026\u0026 chmod +x /tmp/install.sh \u0026\u0026 /tmp/install.sh {{ .Name }}<enter><wait>" ], "boot_wait": "10s", "disk_size": 10140, + "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "guest_os_type": "FreeBSD_64", "http_directory": "http", "iso_checksum": "a8c1751b83646530148766618a89a97009e7500e7057a5cbe3afd74ef480c915", "iso_checksum_type": "sha256", "iso_url": "{{user `mirror`}}/releases/amd64/amd64/ISO-IMAGES/9.2/FreeBSD-9.2-RELEASE-amd64-disc1.iso", - "ssh_username": "vagrant", + "output_directory": "packer-freebsd-9.2-amd64-virtualbox", + "shutdown_command": "echo 'shutdown -p now' > shutdown.sh; cat 'shutdown.sh' | su -", "ssh_password": "vagrant", "ssh_port": 22, + "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", - "shutdown_command": "echo 'shutdown -p now' > shutdown.sh; cat 'shutdown.sh' | su -", - "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", - "virtualbox_version_file": ".vbox_version", - "vm_name": "packer-freebsd-9.2-amd64", - "output_directory": "packer-freebsd-9.2-amd64-virtualbox", + "type": "virtualbox-iso", "vboxmanage": [ - [ "modifyvm", "{{.Name}}", "--memory", "512" ], - [ "modifyvm", "{{.Name}}", "--cpus", "1" ] - ] + [ + "modifyvm", + "{{.Name}}", + "--memory", + "512" + ], + [ + "modifyvm", + "{{.Name}}", + "--cpus", + "1" + ] + ], + "virtualbox_version_file": ".vbox_version", + "vm_name": "packer-freebsd-9.2-amd64" }, { - "type": "vmware", "boot_command": [ "<esc><wait>", "load geom_mbr<wait>", @@ -72,7 +63,7 @@ "mdmfs -s 100m md2 /mnt<enter><wait>", "dhclient -l /tmp/dhclient.lease.em0 em0<enter><wait>", "<wait5>", - "fetch -o /tmp/install.sh http://{{ .HTTPIP }}:{{ .HTTPPort }}/freebsd-9.2/install.sh && chmod +x /tmp/install.sh && /tmp/install.sh {{ .Name }}<enter><wait>" + "fetch -o /tmp/install.sh http://{{ .HTTPIP }}:{{ .HTTPPort }}/freebsd-9.2/install.sh \u0026\u0026 chmod +x /tmp/install.sh \u0026\u0026 /tmp/install.sh {{ .Name }}<enter><wait>" ], "boot_wait": "10s", "disk_size": 10140, @@ -81,18 +72,19 @@ "iso_checksum": "a8c1751b83646530148766618a89a97009e7500e7057a5cbe3afd74ef480c915", "iso_checksum_type": "sha256", "iso_url": "{{user `mirror`}}/releases/amd64/amd64/ISO-IMAGES/9.2/FreeBSD-9.2-RELEASE-amd64-disc1.iso", - "tools_upload_flavor": "freebsd", - "ssh_username": "vagrant", + "output_directory": "packer-freebsd-9.2-amd64-vmware", + "shutdown_command": "echo 'shutdown -p now' > shutdown.sh; cat 'shutdown.sh' | su -", "ssh_password": "vagrant", "ssh_port": 22, + "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", - "shutdown_command": "echo 'shutdown -p now' > shutdown.sh; cat 'shutdown.sh' | su -", + "tools_upload_flavor": "freebsd", + "type": "vmware-iso", "vm_name": "packer-freebsd-9.2-amd64", - "output_directory": "packer-freebsd-9.2-amd64-vmware", "vmx_data": { + "cpuid.coresPerSocket": "1", "memsize": "512", - "numvcpus": "1", - "cpuid.coresPerSocket": "1" + "numvcpus": "1" } } ], @@ -101,5 +93,26 @@ "output": "../builds/{{.Provider}}/opscode_freebsd-9.2_chef-{{user `chef_version`}}.box", "type": "vagrant" } - ] + ], + "provisioners": [ + { + "environment_vars": [ + "CHEF_VERSION={{user `chef_version`}}" + ], + "execute_command": "export {{.Vars}} \u0026\u0026 cat {{.Path}} | su -m", + "scripts": [ + "scripts/freebsd/postinstall.sh", + "scripts/freebsd/vmtools.sh", + "scripts/common/chef.sh", + "scripts/freebsd/cleanup.sh", + "scripts/common/minimize.sh" + ], + "type": "shell" + } + ], + "variables": { + "chef_version": "provisionerless", + "mirror": "http://ftp.freebsd.org/pub/FreeBSD" + } } + diff --git a/packer/freebsd-9.2-i386.json b/packer/freebsd-9.2-i386.json index d1d901d3a..5b65ff4da 100644 --- a/packer/freebsd-9.2-i386.json +++ b/packer/freebsd-9.2-i386.json @@ -1,24 +1,6 @@ { - "variables": { - "chef_version": "provisionerless", - "mirror": "http://ftp.freebsd.org/pub/FreeBSD" - }, - "provisioners": [ - { - "type": "shell", - "scripts": [ - "scripts/freebsd/postinstall.sh", - "scripts/freebsd/vmtools.sh", - "scripts/common/chef.sh", - "scripts/freebsd/cleanup.sh", - "scripts/common/minimize.sh" - ], - "execute_command": "export {{.Vars}} && cat {{.Path}} | su -m" - } - ], "builders": [ { - "type": "virtualbox", "boot_command": [ "<esc><wait>", "load geom_mbr<wait>", @@ -32,31 +14,41 @@ "mdmfs -s 100m md1 /tmp<enter><wait>", "mdmfs -s 100m md2 /mnt<enter><wait>", "dhclient -l /tmp/dhclient.lease.em0 em0<enter><wait>", - "fetch -o /tmp/install.sh http://{{ .HTTPIP }}:{{ .HTTPPort }}/freebsd-9.2/install.sh && chmod +x /tmp/install.sh && /tmp/install.sh {{ .Name }}<enter><wait>" + "fetch -o /tmp/install.sh http://{{ .HTTPIP }}:{{ .HTTPPort }}/freebsd-9.2/install.sh \u0026\u0026 chmod +x /tmp/install.sh \u0026\u0026 /tmp/install.sh {{ .Name }}<enter><wait>" ], "boot_wait": "10s", "disk_size": 10140, + "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "guest_os_type": "FreeBSD", "http_directory": "http", "iso_checksum": "76093c27288f0ab939a5de14b621ec8eb1420d96343132c2b7c382747d35b67c", "iso_checksum_type": "sha256", "iso_url": "{{user `mirror`}}/releases/i386/ISO-IMAGES/9.2/FreeBSD-9.2-RELEASE-i386-disc1.iso", - "ssh_username": "vagrant", + "output_directory": "packer-freebsd-9.2-i386-virtualbox", + "shutdown_command": "echo 'shutdown -p now' > shutdown.sh; cat 'shutdown.sh' | su -", "ssh_password": "vagrant", "ssh_port": 22, + "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", - "shutdown_command": "echo 'shutdown -p now' > shutdown.sh; cat 'shutdown.sh' | su -", - "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", - "virtualbox_version_file": ".vbox_version", - "vm_name": "packer-freebsd-9.2-i386", - "output_directory": "packer-freebsd-9.2-i386-virtualbox", + "type": "virtualbox-iso", "vboxmanage": [ - [ "modifyvm", "{{.Name}}", "--memory", "512" ], - [ "modifyvm", "{{.Name}}", "--cpus", "1" ] - ] + [ + "modifyvm", + "{{.Name}}", + "--memory", + "512" + ], + [ + "modifyvm", + "{{.Name}}", + "--cpus", + "1" + ] + ], + "virtualbox_version_file": ".vbox_version", + "vm_name": "packer-freebsd-9.2-i386" }, { - "type": "vmware", "boot_command": [ "<esc><wait>", "load geom_mbr<wait>", @@ -71,7 +63,7 @@ "mdmfs -s 100m md2 /mnt<enter><wait>", "dhclient -l /tmp/dhclient.lease.em0 em0<enter><wait>", "<wait5>", - "fetch -o /tmp/install.sh http://{{ .HTTPIP }}:{{ .HTTPPort }}/freebsd-9.2/install.sh && chmod +x /tmp/install.sh && /tmp/install.sh {{ .Name }}<enter><wait>" + "fetch -o /tmp/install.sh http://{{ .HTTPIP }}:{{ .HTTPPort }}/freebsd-9.2/install.sh \u0026\u0026 chmod +x /tmp/install.sh \u0026\u0026 /tmp/install.sh {{ .Name }}<enter><wait>" ], "boot_wait": "10s", "disk_size": 10140, @@ -80,18 +72,19 @@ "iso_checksum": "76093c27288f0ab939a5de14b621ec8eb1420d96343132c2b7c382747d35b67c", "iso_checksum_type": "sha256", "iso_url": "{{user `mirror`}}/releases/i386/ISO-IMAGES/9.2/FreeBSD-9.2-RELEASE-i386-disc1.iso", - "tools_upload_flavor": "freebsd", - "ssh_username": "vagrant", + "output_directory": "packer-freebsd-9.2-i386-vmware", + "shutdown_command": "echo 'shutdown -p now' > shutdown.sh; cat 'shutdown.sh' | su -", "ssh_password": "vagrant", "ssh_port": 22, + "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", - "shutdown_command": "echo 'shutdown -p now' > shutdown.sh; cat 'shutdown.sh' | su -", + "tools_upload_flavor": "freebsd", + "type": "vmware-iso", "vm_name": "packer-freebsd-9.2-i386", - "output_directory": "packer-freebsd-9.2-i386-vmware", "vmx_data": { + "cpuid.coresPerSocket": "1", "memsize": "512", - "numvcpus": "1", - "cpuid.coresPerSocket": "1" + "numvcpus": "1" } } ], @@ -100,5 +93,23 @@ "output": "../builds/{{.Provider}}/opscode_freebsd-9.2-i386_chef-{{user `chef_version`}}.box", "type": "vagrant" } - ] + ], + "provisioners": [ + { + "execute_command": "export {{.Vars}} \u0026\u0026 cat {{.Path}} | su -m", + "scripts": [ + "scripts/freebsd/postinstall.sh", + "scripts/freebsd/vmtools.sh", + "scripts/common/chef.sh", + "scripts/freebsd/cleanup.sh", + "scripts/common/minimize.sh" + ], + "type": "shell" + } + ], + "variables": { + "chef_version": "provisionerless", + "mirror": "http://ftp.freebsd.org/pub/FreeBSD" + } } + diff --git a/packer/omnios-r151008f.json b/packer/omnios-r151008f.json index edcd5349b..cb9450cb2 100644 --- a/packer/omnios-r151008f.json +++ b/packer/omnios-r151008f.json @@ -1,47 +1,6 @@ { - "variables": { - "chef_version": "provisionerless", - "mirror": "http://omnios.omniti.com/media" - }, - "provisioners": [ - { - "type": "shell", - "scripts": [ - "scripts/omnios/vmtools.sh", - "scripts/common/chef.sh", - "scripts/omnios/postinstall.sh" - ], - "execute_command": "export {{.Vars}} && sh '{{.Path}}'", - "environment_vars": [ "CHEF_VERSION={{user `chef_version`}}" ] - } - ], - "post-processors": [ - { - "type": "vagrant", - "compression_level": 9, - "output": "../builds/{{.Provider}}/opscode_omnios-r151008f_chef-{{user `chef_version`}}.box" - } - ], "builders": [ { - "type": "virtualbox", - "guest_os_type": "OpenSolaris_64", - "iso_url": "{{user `mirror`}}/OmniOS_Text_r151008f.iso", - "iso_checksum": "d64d206c1e5aeeb61c5b579dd39ed11a86ef5737", - "iso_checksum_type": "sha1", - "ssh_username": "root", - "ssh_password": "vagrant", - "shutdown_command": "/usr/sbin/shutdown -g 0 -y -i 5", - "boot_wait": "30s", - "disk_size": 40960, - "ssh_port": 22, - "vboxmanage": [ - ["modifyvm", "{{.Name}}", "--memory", "1024"], - ["modifyvm", "{{.Name}}", "--cpus", "1"] - ], - "virtualbox_version_file": ".vbox_version", - "vm_name": "packer-omnios-r151008f", - "output_directory": "packer-omnios-r151008f-virtualbox", "boot_command": [ "<enter><wait10><wait5>", "1<enter><wait10>", @@ -70,29 +29,37 @@ "cp /etc/nsswitch.dns /etc/nsswitch.conf<enter><wait>", "sed -i -e 's/PermitRootLogin no/PermitRootLogin yes/' /etc/ssh/sshd_config<enter><wait>", "svcadm restart ssh<enter><wait>" - ] - }, - { - "type": "vmware", - "guest_os_type": "solaris11-64", - "iso_url": "{{user `mirror`}}/OmniOS_Text_r151008f.iso", + ], + "boot_wait": "30s", + "disk_size": 40960, + "guest_os_type": "OpenSolaris_64", "iso_checksum": "d64d206c1e5aeeb61c5b579dd39ed11a86ef5737", "iso_checksum_type": "sha1", - "ssh_username": "root", - "ssh_password": "vagrant", + "iso_url": "{{user `mirror`}}/OmniOS_Text_r151008f.iso", + "output_directory": "packer-omnios-r151008f-virtualbox", "shutdown_command": "/usr/sbin/shutdown -g 0 -y -i 5", - "boot_wait": "30s", - "disk_size": 40960, + "ssh_password": "vagrant", "ssh_port": 22, - "floppy_files": [ "floppy/omnios/README.TXT" ], - "tools_upload_flavor": "solaris", - "vmx_data": { - "cpuid.coresPerSocket": "1", - "memsize": "1024", - "numvcpus": "1" - }, - "vm_name": "packer-omnios-r151008f", - "output_directory": "packer-omnios-r151008f-vmware", + "ssh_username": "root", + "type": "virtualbox-iso", + "vboxmanage": [ + [ + "modifyvm", + "{{.Name}}", + "--memory", + "1024" + ], + [ + "modifyvm", + "{{.Name}}", + "--cpus", + "1" + ] + ], + "virtualbox_version_file": ".vbox_version", + "vm_name": "packer-omnios-r151008f" + }, + { "boot_command": [ "<enter><wait10><wait5>", "1<enter><wait10>", @@ -123,7 +90,55 @@ "cp /etc/nsswitch.dns /etc/nsswitch.conf<enter><wait>", "sed -i -e 's/PermitRootLogin no/PermitRootLogin yes/' /etc/ssh/sshd_config<enter><wait>", "svcadm restart ssh<enter><wait>" - ] + ], + "boot_wait": "30s", + "disk_size": 40960, + "floppy_files": [ + "floppy/omnios/README.TXT" + ], + "guest_os_type": "solaris11-64", + "iso_checksum": "d64d206c1e5aeeb61c5b579dd39ed11a86ef5737", + "iso_checksum_type": "sha1", + "iso_url": "{{user `mirror`}}/OmniOS_Text_r151008f.iso", + "output_directory": "packer-omnios-r151008f-vmware", + "shutdown_command": "/usr/sbin/shutdown -g 0 -y -i 5", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "root", + "tools_upload_flavor": "solaris", + "type": "vmware-iso", + "vm_name": "packer-omnios-r151008f", + "vmx_data": { + "cpuid.coresPerSocket": "1", + "memsize": "1024", + "numvcpus": "1" + } + } + ], + "post-processors": [ + { + "compression_level": 9, + "output": "../builds/{{.Provider}}/opscode_omnios-r151008f_chef-{{user `chef_version`}}.box", + "type": "vagrant" + } + ], + "provisioners": [ + { + "environment_vars": [ + "CHEF_VERSION={{user `chef_version`}}" + ], + "execute_command": "export {{.Vars}} \u0026\u0026 sh '{{.Path}}'", + "scripts": [ + "scripts/omnios/vmtools.sh", + "scripts/common/chef.sh", + "scripts/omnios/postinstall.sh" + ], + "type": "shell" } - ] + ], + "variables": { + "chef_version": "provisionerless", + "mirror": "http://omnios.omniti.com/media" + } } + diff --git a/packer/rhel-5.10-i386.json b/packer/rhel-5.10-i386.json index e0a757788..21178fc4f 100644 --- a/packer/rhel-5.10-i386.json +++ b/packer/rhel-5.10-i386.json @@ -1,11 +1,6 @@ { - "variables": { - "chef_version": "provisionerless", - "mirror": "https://content-web.rhn.redhat.com/rhn/isos/rhel-5.10/md5sum/1ab756241a4a209b8d39abe6bace84a9" - }, "builders": [ { - "type": "virtualbox", "boot_command": [ "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/centos-5.10/ks.cfg<enter><wait>" ], @@ -17,21 +12,31 @@ "iso_checksum": "3a4db78ab70d866057c5285e0064d78125e1b8fd9dcaefea28818f6604b3515d", "iso_checksum_type": "sha256", "iso_url": "{{user `mirror`}}/rhel-server-5.10-i386-dvd.iso", + "output_directory": "packer-rhel-5.10-i386-virtualbox", "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", + "type": "virtualbox-iso", "vboxmanage": [ - [ "modifyvm", "{{.Name}}", "--memory", "384" ], - [ "modifyvm", "{{.Name}}", "--cpus", "1" ] + [ + "modifyvm", + "{{.Name}}", + "--memory", + "384" + ], + [ + "modifyvm", + "{{.Name}}", + "--cpus", + "1" + ] ], "virtualbox_version_file": ".vbox_version", - "vm_name": "packer-rhel-5.10-i386", - "output_directory": "packer-rhel-5.10-i386-virtualbox" + "vm_name": "packer-rhel-5.10-i386" }, { - "type": "vmware", "boot_command": [ "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/centos-5.10/ks.cfg<enter><wait>" ], @@ -42,14 +47,15 @@ "iso_checksum": "3a4db78ab70d866057c5285e0064d78125e1b8fd9dcaefea28818f6604b3515d", "iso_checksum_type": "sha256", "iso_url": "{{user `mirror`}}/rhel-server-5.10-i386-dvd.iso", - "tools_upload_flavor": "linux", + "output_directory": "packer-rhel-5.10-i386-vmware", "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", + "tools_upload_flavor": "linux", + "type": "vmware-iso", "vm_name": "packer-rhel-5.10-i386", - "output_directory": "packer-rhel-5.10-i386-vmware", "vmx_data": { "cpuid.coresPerSocket": "1", "memsize": "384", @@ -65,7 +71,9 @@ ], "provisioners": [ { - "environment_vars": [ "CHEF_VERSION={{user `chef_version`}}" ], + "environment_vars": [ + "CHEF_VERSION={{user `chef_version`}}" + ], "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E bash '{{.Path}}'", "scripts": [ "scripts/common/vagrant.sh", @@ -77,5 +85,10 @@ ], "type": "shell" } - ] + ], + "variables": { + "chef_version": "provisionerless", + "mirror": "https://content-web.rhn.redhat.com/rhn/isos/rhel-5.10/md5sum/1ab756241a4a209b8d39abe6bace84a9" + } } + diff --git a/packer/rhel-5.10-x86_64.json b/packer/rhel-5.10-x86_64.json index 765dd4c44..80f01874f 100644 --- a/packer/rhel-5.10-x86_64.json +++ b/packer/rhel-5.10-x86_64.json @@ -1,11 +1,6 @@ { - "variables": { - "chef_version": "provisionerless", - "mirror": "https://content-web.rhn.redhat.com/rhn/isos/rhel-5.10/md5sum/86cc2d5548ee2ff9c8d3e2b4db3e6001" - }, "builders": [ { - "type": "virtualbox", "boot_command": [ "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/centos-5.10/ks.cfg<enter><wait>" ], @@ -17,21 +12,31 @@ "iso_checksum": "8b38e74b0993d478aad9c950f51a3e3441199639a3422e06fc3beca1f8825bf2", "iso_checksum_type": "sha256", "iso_url": "{{user `mirror`}}/rhel-server-5.10-x86_64-dvd.iso", + "output_directory": "packer-rhel-5.10-x86_64-virtualbox", "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", + "type": "virtualbox-iso", "vboxmanage": [ - [ "modifyvm", "{{.Name}}", "--memory", "384" ], - [ "modifyvm", "{{.Name}}", "--cpus", "1" ] + [ + "modifyvm", + "{{.Name}}", + "--memory", + "384" + ], + [ + "modifyvm", + "{{.Name}}", + "--cpus", + "1" + ] ], "virtualbox_version_file": ".vbox_version", - "vm_name": "packer-rhel-5.10-x86_64", - "output_directory": "packer-rhel-5.10-x86_64-virtualbox" + "vm_name": "packer-rhel-5.10-x86_64" }, { - "type": "vmware", "boot_command": [ "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/centos-5.10/ks.cfg<enter><wait>" ], @@ -42,14 +47,15 @@ "iso_checksum": "8b38e74b0993d478aad9c950f51a3e3441199639a3422e06fc3beca1f8825bf2", "iso_checksum_type": "sha256", "iso_url": "{{user `mirror`}}/rhel-server-5.10-x86_64-dvd.iso", - "tools_upload_flavor": "linux", + "output_directory": "packer-rhel-5.10-x86_64-vmware", "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", + "tools_upload_flavor": "linux", + "type": "vmware-iso", "vm_name": "packer-rhel-5.10-x86_64", - "output_directory": "packer-rhel-5.10-x86_64-vmware", "vmx_data": { "cpuid.coresPerSocket": "1", "memsize": "384", @@ -65,7 +71,9 @@ ], "provisioners": [ { - "environment_vars": [ "CHEF_VERSION={{user `chef_version`}}" ], + "environment_vars": [ + "CHEF_VERSION={{user `chef_version`}}" + ], "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E bash '{{.Path}}'", "scripts": [ "scripts/common/vagrant.sh", @@ -77,5 +85,10 @@ ], "type": "shell" } - ] + ], + "variables": { + "chef_version": "provisionerless", + "mirror": "https://content-web.rhn.redhat.com/rhn/isos/rhel-5.10/md5sum/86cc2d5548ee2ff9c8d3e2b4db3e6001" + } } + diff --git a/packer/rhel-6.5-i386.json b/packer/rhel-6.5-i386.json index 1f1e25948..ebc34d82a 100644 --- a/packer/rhel-6.5-i386.json +++ b/packer/rhel-6.5-i386.json @@ -1,11 +1,6 @@ { - "variables": { - "chef_version": "provisionerless", - "mirror": "https://content-web.rhn.redhat.com/rhn/isos/rhel-6.5/md5sum/04a1fa06a6b7e70cd586535eea83c0ef" - }, "builders": [ { - "type": "virtualbox", "boot_command": [ "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/centos-6.5/ks.cfg<enter><wait>" ], @@ -17,21 +12,31 @@ "iso_checksum": "eec692b436193ba9fc365cafe2b8f85323d98192dc99b23b02ae75045667fe4a", "iso_checksum_type": "sha256", "iso_url": "{{user `mirror`}}/rhel-server-6.5-i386-dvd.iso", + "output_directory": "packer-rhel-6.5-i386-virtualbox", "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", + "type": "virtualbox-iso", "vboxmanage": [ - [ "modifyvm", "{{.Name}}", "--memory", "480" ], - [ "modifyvm", "{{.Name}}", "--cpus", "1" ] + [ + "modifyvm", + "{{.Name}}", + "--memory", + "480" + ], + [ + "modifyvm", + "{{.Name}}", + "--cpus", + "1" + ] ], "virtualbox_version_file": ".vbox_version", - "vm_name": "packer-rhel-6.5-i386", - "output_directory": "packer-rhel-6.5-i386-virtualbox" + "vm_name": "packer-rhel-6.5-i386" }, { - "type": "vmware", "boot_command": [ "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/centos-6.5/ks.cfg<enter><wait>" ], @@ -42,14 +47,15 @@ "iso_checksum": "eec692b436193ba9fc365cafe2b8f85323d98192dc99b23b02ae75045667fe4a", "iso_checksum_type": "sha256", "iso_url": "{{user `mirror`}}/rhel-server-6.5-i386-dvd.iso", - "tools_upload_flavor": "linux", + "output_directory": "packer-rhel-6.5-i386-vmware", "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", + "tools_upload_flavor": "linux", + "type": "vmware-iso", "vm_name": "packer-rhel-6.5-i386", - "output_directory": "packer-rhel-6.5-i386-vmware", "vmx_data": { "cpuid.coresPerSocket": "1", "memsize": "480", @@ -65,7 +71,9 @@ ], "provisioners": [ { - "environment_vars": [ "CHEF_VERSION={{user `chef_version`}}" ], + "environment_vars": [ + "CHEF_VERSION={{user `chef_version`}}" + ], "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E bash '{{.Path}}'", "scripts": [ "scripts/common/sshd.sh", @@ -77,6 +85,10 @@ ], "type": "shell" } - ] + ], + "variables": { + "chef_version": "provisionerless", + "mirror": "https://content-web.rhn.redhat.com/rhn/isos/rhel-6.5/md5sum/04a1fa06a6b7e70cd586535eea83c0ef" + } } diff --git a/packer/rhel-6.5-x86_64.json b/packer/rhel-6.5-x86_64.json index 060447e53..d8006b8cf 100644 --- a/packer/rhel-6.5-x86_64.json +++ b/packer/rhel-6.5-x86_64.json @@ -1,11 +1,6 @@ { - "variables": { - "chef_version": "provisionerless", - "mirror": "https://content-web.rhn.redhat.com/rhn/isos/rhel-6.5/md5sum/a84d4d9eddb36fb417832166cd10a4c2" - }, "builders": [ { - "type": "virtualbox", "boot_command": [ "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/centos-6.5/ks.cfg<enter><wait>" ], @@ -17,21 +12,31 @@ "iso_checksum": "a51b90f3dd4585781293ea08adde60eeb9cfa94670943bd99e9c07f13a259539", "iso_checksum_type": "sha256", "iso_url": "{{user `mirror`}}/rhel-server-6.5-x86_64-dvd.iso", + "output_directory": "packer-rhel-6.5-x86_64-virtualbox", "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", + "type": "virtualbox-iso", "vboxmanage": [ - [ "modifyvm", "{{.Name}}", "--memory", "480" ], - [ "modifyvm", "{{.Name}}", "--cpus", "1" ] + [ + "modifyvm", + "{{.Name}}", + "--memory", + "480" + ], + [ + "modifyvm", + "{{.Name}}", + "--cpus", + "1" + ] ], "virtualbox_version_file": ".vbox_version", - "vm_name": "packer-rhel-6.5-x86_64", - "output_directory": "packer-rhel-6.5-x86_64-virtualbox" + "vm_name": "packer-rhel-6.5-x86_64" }, { - "type": "vmware", "boot_command": [ "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/centos-6.5/ks.cfg<enter><wait>" ], @@ -39,18 +44,18 @@ "disk_size": 40960, "guest_os_type": "rhel6-64", "http_directory": "http", - "iso_checksum": "a51b90f3dd4585781293ea08adde60eeb9cfa94670943bd99e9c07f13a259539" -, + "iso_checksum": "a51b90f3dd4585781293ea08adde60eeb9cfa94670943bd99e9c07f13a259539", "iso_checksum_type": "sha256", "iso_url": "{{user `mirror`}}/rhel-server-6.5-x86_64-dvd.iso", - "tools_upload_flavor": "linux", + "output_directory": "packer-rhel-6.5-x86_64-vmware", "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", + "tools_upload_flavor": "linux", + "type": "vmware-iso", "vm_name": "packer-rhel-6.5-x86_64", - "output_directory": "packer-rhel-6.5-x86_64-vmware", "vmx_data": { "cpuid.coresPerSocket": "1", "memsize": "480", @@ -66,7 +71,9 @@ ], "provisioners": [ { - "environment_vars": [ "CHEF_VERSION={{user `chef_version`}}" ], + "environment_vars": [ + "CHEF_VERSION={{user `chef_version`}}" + ], "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E bash '{{.Path}}'", "scripts": [ "scripts/common/sshd.sh", @@ -78,5 +85,10 @@ ], "type": "shell" } - ] + ], + "variables": { + "chef_version": "provisionerless", + "mirror": "https://content-web.rhn.redhat.com/rhn/isos/rhel-6.5/md5sum/a84d4d9eddb36fb417832166cd10a4c2" + } } + diff --git a/packer/sles-11-sp2-i386.json b/packer/sles-11-sp2-i386.json index 7894450c7..3d9bec122 100644 --- a/packer/sles-11-sp2-i386.json +++ b/packer/sles-11-sp2-i386.json @@ -1,11 +1,6 @@ { - "variables": { - "chef_version": "provisionerless", - "mirror": "http://cdn2.novell.com/prot/FkjGyLMMiss~" - }, "builders": [ { - "type": "virtualbox", "boot_command": [ "<esc><enter><wait>", "linux netdevice=eth0 netsetup=dhcp install=cd:/<wait>", @@ -15,20 +10,19 @@ ], "boot_wait": "10s", "disk_size": 20480, + "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "guest_os_type": "OpenSUSE", "http_directory": "http", "iso_checksum": "a0b34f6237b2b2a6b2174c82b40ed326", "iso_checksum_type": "md5", "iso_url": "{{user `mirror`}}/SLES-11-SP2-DVD-i586-GM-DVD1.iso", - "ssh_username": "vagrant", + "output_directory": "packer-sles-11-sp2-x86_64-virtualbox", + "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, + "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", - "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", - "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", - "virtualbox_version_file": ".vbox_version", - "vm_name": "packer-sles-11-sp2-x86_64", - "output_directory": "packer-sles-11-sp2-x86_64-virtualbox", + "type": "virtualbox-iso", "vboxmanage": [ [ "modifyvm", @@ -42,10 +36,11 @@ "--cpus", "1" ] - ] + ], + "virtualbox_version_file": ".vbox_version", + "vm_name": "packer-sles-11-sp2-x86_64" }, { - "type": "vmware", "boot_command": [ "<esc><enter><wait>", "linux netdevice=eth0 netsetup=dhcp install=cd:/<wait>", @@ -60,19 +55,20 @@ "iso_checksum": "a0b34f6237b2b2a6b2174c82b40ed326", "iso_checksum_type": "md5", "iso_url": "{{user `mirror`}}/SLES-11-SP2-DVD-i586-GM-DVD1.iso", - "ssh_username": "vagrant", + "output_directory": "packer-sles11sp2-x86_64-vmware", + "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, + "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", - "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", "tools_upload_flavor": "linux", + "type": "vmware-iso", + "vm_name": "packer-sles11sp2-x86_64", "vmx_data": { + "cpuid.coresPerSocket": "1", "memsize": "480", - "numvcpus": "1", - "cpuid.coresPerSocket": "1" - }, - "vm_name": "packer-sles11sp2-x86_64", - "output_directory": "packer-sles11sp2-x86_64-vmware" + "numvcpus": "1" + } } ], "post-processors": [ @@ -83,8 +79,10 @@ ], "provisioners": [ { - "type": "shell", - "environment_vars": [ "CHEF_VERSION={{user `chef_version`}}" ], + "environment_vars": [ + "CHEF_VERSION={{user `chef_version`}}" + ], + "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh '{{.Path}}'", "scripts": [ "scripts/common/sshd.sh", "scripts/common/vagrant.sh", @@ -95,7 +93,12 @@ "scripts/sles/remove-dvd-source.sh", "scripts/common/minimize.sh" ], - "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh '{{.Path}}'" + "type": "shell" } - ] + ], + "variables": { + "chef_version": "provisionerless", + "mirror": "http://cdn2.novell.com/prot/FkjGyLMMiss~" + } } + diff --git a/packer/sles-11-sp2-x86_64.json b/packer/sles-11-sp2-x86_64.json index 140df54b0..0f4fa8c1e 100644 --- a/packer/sles-11-sp2-x86_64.json +++ b/packer/sles-11-sp2-x86_64.json @@ -1,11 +1,6 @@ { - "variables": { - "chef_version": "provisionerless", - "mirror": "http://cdn2.novell.com/free/h0AOp5AT-18~" - }, "builders": [ { - "type": "virtualbox", "boot_command": [ "<esc><enter><wait>", "linux netdevice=eth0 netsetup=dhcp install=cd:/<wait>", @@ -15,20 +10,19 @@ ], "boot_wait": "10s", "disk_size": 20480, + "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "guest_os_type": "OpenSUSE_64", "http_directory": "http", "iso_checksum": "461d82ae6e15062b0807c1338f040497", "iso_checksum_type": "md5", "iso_url": "{{user `mirror`}}/SLES-11-SP2-DVD-x86_64-GM-DVD1.iso", - "ssh_username": "vagrant", + "output_directory": "packer-sles-11-sp2-x86_64-virtualbox", + "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, + "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", - "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", - "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", - "virtualbox_version_file": ".vbox_version", - "vm_name": "packer-sles-11-sp2-x86_64", - "output_directory": "packer-sles-11-sp2-x86_64-virtualbox", + "type": "virtualbox-iso", "vboxmanage": [ [ "modifyvm", @@ -42,10 +36,11 @@ "--cpus", "1" ] - ] + ], + "virtualbox_version_file": ".vbox_version", + "vm_name": "packer-sles-11-sp2-x86_64" }, { - "type": "vmware", "boot_command": [ "<esc><enter><wait>", "linux netdevice=eth0 netsetup=dhcp install=cd:/<wait>", @@ -60,19 +55,20 @@ "iso_checksum": "461d82ae6e15062b0807c1338f040497", "iso_checksum_type": "md5", "iso_url": "{{user `mirror`}}/SLES-11-SP2-DVD-x86_64-GM-DVD1.iso", - "ssh_username": "vagrant", + "output_directory": "packer-sles11sp2-x86_64-vmware", + "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, + "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", - "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", "tools_upload_flavor": "linux", + "type": "vmware-iso", + "vm_name": "packer-sles11sp2-x86_64", "vmx_data": { + "cpuid.coresPerSocket": "1", "memsize": "480", - "numvcpus": "1", - "cpuid.coresPerSocket": "1" - }, - "vm_name": "packer-sles11sp2-x86_64", - "output_directory": "packer-sles11sp2-x86_64-vmware" + "numvcpus": "1" + } } ], "post-processors": [ @@ -83,8 +79,10 @@ ], "provisioners": [ { - "type": "shell", - "environment_vars": [ "CHEF_VERSION={{user `chef_version`}}" ], + "environment_vars": [ + "CHEF_VERSION={{user `chef_version`}}" + ], + "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh '{{.Path}}'", "scripts": [ "scripts/common/sshd.sh", "scripts/common/vagrant.sh", @@ -95,7 +93,12 @@ "scripts/sles/remove-dvd-source.sh", "scripts/common/minimize.sh" ], - "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh '{{.Path}}'" + "type": "shell" } - ] + ], + "variables": { + "chef_version": "provisionerless", + "mirror": "http://cdn2.novell.com/free/h0AOp5AT-18~" + } } + diff --git a/packer/sles-11-sp3-i386.json b/packer/sles-11-sp3-i386.json index 5cda5994f..66f447bd2 100644 --- a/packer/sles-11-sp3-i386.json +++ b/packer/sles-11-sp3-i386.json @@ -1,11 +1,6 @@ { - "variables": { - "chef_version": "provisionerless", - "mirror": "http://cdn2.novell.com/prot/4uiuDMzX0ck~" - }, "builders": [ { - "type": "virtualbox", "boot_command": [ "<esc><enter><wait>", "linux netdevice=eth0 netsetup=dhcp install=cd:/<wait>", @@ -15,20 +10,19 @@ ], "boot_wait": "10s", "disk_size": 20480, + "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "guest_os_type": "OpenSUSE", "http_directory": "http", "iso_checksum": "5c30a409fc8fb3343b4dc90d93ff2c89", "iso_checksum_type": "md5", "iso_url": "{{user `mirror`}}/SLES-11-SP3-DVD-i586-GM-DVD1.iso", - "ssh_username": "vagrant", + "output_directory": "packer-sles-11-sp3-x86_64-virtualbox", + "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, + "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", - "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", - "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", - "virtualbox_version_file": ".vbox_version", - "vm_name": "packer-sles-11-sp3-x86_64", - "output_directory": "packer-sles-11-sp3-x86_64-virtualbox", + "type": "virtualbox-iso", "vboxmanage": [ [ "modifyvm", @@ -42,10 +36,11 @@ "--cpus", "1" ] - ] + ], + "virtualbox_version_file": ".vbox_version", + "vm_name": "packer-sles-11-sp3-x86_64" }, { - "type": "vmware", "boot_command": [ "<esc><enter><wait>", "linux netdevice=eth0 netsetup=dhcp install=cd:/<wait>", @@ -60,19 +55,20 @@ "iso_checksum": "5c30a409fc8fb3343b4dc90d93ff2c89", "iso_checksum_type": "md5", "iso_url": "{{user `mirror`}}/SLES-11-SP3-DVD-i586-GM-DVD1.iso", - "ssh_username": "vagrant", + "output_directory": "packer-sles11sp2-x86_64-vmware", + "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, + "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", - "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", "tools_upload_flavor": "linux", + "type": "vmware-iso", + "vm_name": "packer-sles11sp2-x86_64", "vmx_data": { + "cpuid.coresPerSocket": "1", "memsize": "480", - "numvcpus": "1", - "cpuid.coresPerSocket": "1" - }, - "vm_name": "packer-sles11sp2-x86_64", - "output_directory": "packer-sles11sp2-x86_64-vmware" + "numvcpus": "1" + } } ], "post-processors": [ @@ -83,8 +79,10 @@ ], "provisioners": [ { - "type": "shell", - "environment_vars": [ "CHEF_VERSION={{user `chef_version`}}" ], + "environment_vars": [ + "CHEF_VERSION={{user `chef_version`}}" + ], + "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh '{{.Path}}'", "scripts": [ "scripts/common/sshd.sh", "scripts/common/vagrant.sh", @@ -95,7 +93,12 @@ "scripts/sles/remove-dvd-source.sh", "scripts/common/minimize.sh" ], - "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh '{{.Path}}'" + "type": "shell" } - ] + ], + "variables": { + "chef_version": "provisionerless", + "mirror": "http://cdn2.novell.com/prot/4uiuDMzX0ck~" + } } + diff --git a/packer/sles-11-sp3-x86_64.json b/packer/sles-11-sp3-x86_64.json index a080ce4aa..0f2b8c8f2 100644 --- a/packer/sles-11-sp3-x86_64.json +++ b/packer/sles-11-sp3-x86_64.json @@ -1,11 +1,6 @@ { - "variables": { - "chef_version": "provisionerless", - "mirror": "http://cdn2.novell.com/prot/Q_VbW21BiB4~" - }, "builders": [ { - "type": "virtualbox", "boot_command": [ "<esc><enter><wait>", "linux netdevice=eth0 netsetup=dhcp install=cd:/<wait>", @@ -15,20 +10,19 @@ ], "boot_wait": "10s", "disk_size": 20480, + "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "guest_os_type": "OpenSUSE_64", "http_directory": "http", "iso_checksum": "480b70d50cbb538382dc2b9325221e1b", "iso_checksum_type": "md5", "iso_url": "{{user `mirror`}}/SLES-11-SP3-DVD-x86_64-GM-DVD1.iso", - "ssh_username": "vagrant", + "output_directory": "packer-sles-11-sp3-x86_64-virtualbox", + "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, + "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", - "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", - "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", - "virtualbox_version_file": ".vbox_version", - "vm_name": "packer-sles-11-sp3-x86_64", - "output_directory": "packer-sles-11-sp3-x86_64-virtualbox", + "type": "virtualbox-iso", "vboxmanage": [ [ "modifyvm", @@ -42,10 +36,11 @@ "--cpus", "1" ] - ] + ], + "virtualbox_version_file": ".vbox_version", + "vm_name": "packer-sles-11-sp3-x86_64" }, { - "type": "vmware", "boot_command": [ "<esc><enter><wait>", "linux netdevice=eth0 netsetup=dhcp install=cd:/<wait>", @@ -60,19 +55,20 @@ "iso_checksum": "480b70d50cbb538382dc2b9325221e1b", "iso_checksum_type": "md5", "iso_url": "{{user `mirror`}}/SLES-11-SP3-DVD-x86_64-GM-DVD1.iso", - "ssh_username": "vagrant", + "output_directory": "packer-sles11sp3-x86_64-vmware", + "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, + "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", - "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", "tools_upload_flavor": "linux", + "type": "vmware-iso", + "vm_name": "packer-sles11sp3-x86_64", "vmx_data": { + "cpuid.coresPerSocket": "1", "memsize": "480", - "numvcpus": "1", - "cpuid.coresPerSocket": "1" - }, - "vm_name": "packer-sles11sp3-x86_64", - "output_directory": "packer-sles11sp3-x86_64-vmware" + "numvcpus": "1" + } } ], "post-processors": [ @@ -83,8 +79,10 @@ ], "provisioners": [ { - "type": "shell", - "environment_vars": [ "CHEF_VERSION={{user `chef_version`}}" ], + "environment_vars": [ + "CHEF_VERSION={{user `chef_version`}}" + ], + "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh '{{.Path}}'", "scripts": [ "scripts/common/sshd.sh", "scripts/common/vagrant.sh", @@ -95,7 +93,12 @@ "scripts/sles/remove-dvd-source.sh", "scripts/common/minimize.sh" ], - "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh '{{.Path}}'" + "type": "shell" } - ] + ], + "variables": { + "chef_version": "provisionerless", + "mirror": "http://cdn2.novell.com/prot/Q_VbW21BiB4~" + } } + diff --git a/packer/ubuntu-10.04-amd64.json b/packer/ubuntu-10.04-amd64.json index 306604011..f8488996c 100644 --- a/packer/ubuntu-10.04-amd64.json +++ b/packer/ubuntu-10.04-amd64.json @@ -1,11 +1,6 @@ { - "variables": { - "chef_version": "provisionerless", - "mirror": "http://releases.ubuntu.com" - }, "builders": [ { - "type": "virtualbox", "boot_command": [ "<esc><wait>", "<esc><wait>", @@ -38,21 +33,31 @@ "iso_checksum": "796e80702d65f2ee96e88874a1ab437e24df9cd6", "iso_checksum_type": "sha1", "iso_url": "{{user `mirror`}}/10.04.4/ubuntu-10.04.4-server-amd64.iso", + "output_directory": "packer-ubuntu-10.04-amd64-virtualbox", "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", + "type": "virtualbox-iso", "vboxmanage": [ - [ "modifyvm", "{{.Name}}", "--memory", "384" ], - [ "modifyvm", "{{.Name}}", "--cpus", "1" ] + [ + "modifyvm", + "{{.Name}}", + "--memory", + "384" + ], + [ + "modifyvm", + "{{.Name}}", + "--cpus", + "1" + ] ], "virtualbox_version_file": ".vbox_version", - "vm_name": "packer-ubuntu-10.04-amd64", - "output_directory": "packer-ubuntu-10.04-amd64-virtualbox" + "vm_name": "packer-ubuntu-10.04-amd64" }, { - "type": "vmware", "boot_command": [ "<esc><wait>", "<esc><wait>", @@ -84,14 +89,15 @@ "iso_checksum": "796e80702d65f2ee96e88874a1ab437e24df9cd6", "iso_checksum_type": "sha1", "iso_url": "{{user `mirror`}}/10.04.4/ubuntu-10.04.4-server-amd64.iso", - "tools_upload_flavor": "linux", + "output_directory": "packer-ubuntu-10.04-amd64-vmware", "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", + "tools_upload_flavor": "linux", + "type": "vmware-iso", "vm_name": "packer-ubuntu-10.04-amd64", - "output_directory": "packer-ubuntu-10.04-amd64-vmware", "vmx_data": { "cpuid.coresPerSocket": "1", "memsize": "384", @@ -107,7 +113,9 @@ ], "provisioners": [ { - "environment_vars": [ "CHEF_VERSION={{user `chef_version`}}" ], + "environment_vars": [ + "CHEF_VERSION={{user `chef_version`}}" + ], "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E bash '{{.Path}}'", "scripts": [ "scripts/ubuntu/update.sh", @@ -122,5 +130,10 @@ ], "type": "shell" } - ] + ], + "variables": { + "chef_version": "provisionerless", + "mirror": "http://releases.ubuntu.com" + } } + diff --git a/packer/ubuntu-10.04-i386.json b/packer/ubuntu-10.04-i386.json index d6df84e72..7e02e6959 100644 --- a/packer/ubuntu-10.04-i386.json +++ b/packer/ubuntu-10.04-i386.json @@ -1,11 +1,6 @@ { - "variables": { - "chef_version": "provisionerless", - "mirror": "http://releases.ubuntu.com" - }, "builders": [ { - "type": "virtualbox", "boot_command": [ "<esc><wait>", "<esc><wait>", @@ -38,21 +33,31 @@ "iso_checksum": "5695d8b6b914269d1374ac8d4c3dd3786e92d3fe", "iso_checksum_type": "sha1", "iso_url": "{{user `mirror`}}/10.04.4/ubuntu-10.04.4-server-i386.iso", + "output_directory": "packer-ubuntu-10.04-i386-virtualbox", "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", + "type": "virtualbox-iso", "vboxmanage": [ - [ "modifyvm", "{{.Name}}", "--memory", "384" ], - [ "modifyvm", "{{.Name}}", "--cpus", "1" ] + [ + "modifyvm", + "{{.Name}}", + "--memory", + "384" + ], + [ + "modifyvm", + "{{.Name}}", + "--cpus", + "1" + ] ], "virtualbox_version_file": ".vbox_version", - "vm_name": "packer-ubuntu-10.04-i386", - "output_directory": "packer-ubuntu-10.04-i386-virtualbox" + "vm_name": "packer-ubuntu-10.04-i386" }, { - "type": "vmware", "boot_command": [ "<esc><wait>", "<esc><wait>", @@ -84,14 +89,15 @@ "iso_checksum": "5695d8b6b914269d1374ac8d4c3dd3786e92d3fe", "iso_checksum_type": "sha1", "iso_url": "{{user `mirror`}}/10.04.4/ubuntu-10.04.4-server-i386.iso", - "tools_upload_flavor": "linux", + "output_directory": "packer-ubuntu-10.04-i386-vmware", "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", + "tools_upload_flavor": "linux", + "type": "vmware-iso", "vm_name": "packer-ubuntu-10.04-i386", - "output_directory": "packer-ubuntu-10.04-i386-vmware", "vmx_data": { "cpuid.coresPerSocket": "1", "memsize": "384", @@ -107,7 +113,9 @@ ], "provisioners": [ { - "environment_vars": [ "CHEF_VERSION={{user `chef_version`}}" ], + "environment_vars": [ + "CHEF_VERSION={{user `chef_version`}}" + ], "execute_command": "echo 'vagrant'|{{.Vars}} sudo -S -E bash '{{.Path}}'", "scripts": [ "scripts/ubuntu/update.sh", @@ -122,5 +130,10 @@ ], "type": "shell" } - ] + ], + "variables": { + "chef_version": "provisionerless", + "mirror": "http://releases.ubuntu.com" + } } + diff --git a/packer/ubuntu-12.04-amd64.json b/packer/ubuntu-12.04-amd64.json index 95e2281b9..e8652e1a0 100644 --- a/packer/ubuntu-12.04-amd64.json +++ b/packer/ubuntu-12.04-amd64.json @@ -1,11 +1,6 @@ { - "variables": { - "chef_version": "provisionerless", - "mirror": "http://releases.ubuntu.com" - }, "builders": [ { - "type": "virtualbox", "boot_command": [ "<esc><wait>", "<esc><wait>", @@ -32,27 +27,37 @@ ], "boot_wait": "10s", "disk_size": 40960, + "guest_additions_path": "VBoxGuestAdditions_{{ .Version }}.iso", "guest_os_type": "Ubuntu_64", "http_directory": "http", "iso_checksum": "4e36c272dde245cfadf14ff8895566571a38f4d2", "iso_checksum_type": "sha1", "iso_url": "{{user `mirror`}}/12.04/ubuntu-12.04.3-server-amd64.iso", - "ssh_username": "vagrant", + "output_directory": "packer-ubuntu-12.04-amd64-virtualbox", + "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", "ssh_password": "vagrant", "ssh_port": 22, + "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", - "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", - "guest_additions_path": "VBoxGuestAdditions_{{ .Version }}.iso", - "virtualbox_version_file": ".vbox_version", - "vm_name": "packer-ubuntu-12.04-amd64", - "output_directory": "packer-ubuntu-12.04-amd64-virtualbox", + "type": "virtualbox-iso", "vboxmanage": [ - [ "modifyvm", "{{.Name}}", "--memory", "384" ], - [ "modifyvm", "{{.Name}}", "--cpus", "1" ] - ] + [ + "modifyvm", + "{{.Name}}", + "--memory", + "384" + ], + [ + "modifyvm", + "{{.Name}}", + "--cpus", + "1" + ] + ], + "virtualbox_version_file": ".vbox_version", + "vm_name": "packer-ubuntu-12.04-amd64" }, { - "type": "vmware", "boot_command": [ "<esc><wait>", "<esc><wait>", @@ -84,14 +89,15 @@ "iso_checksum": "4e36c272dde245cfadf14ff8895566571a38f4d2", "iso_checksum_type": "sha1", "iso_url": "{{user `mirror`}}/12.04/ubuntu-12.04.3-server-amd64.iso", - "tools_upload_flavor": "linux", + "output_directory": "packer-ubuntu-12.04-amd64-vmware", "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", + "tools_upload_flavor": "linux", + "type": "vmware-iso", "vm_name": "packer-ubuntu-12.04-amd64", - "output_directory": "packer-ubuntu-12.04-amd64-vmware", "vmx_data": { "cpuid.coresPerSocket": "1", "memsize": "384", @@ -101,13 +107,15 @@ ], "post-processors": [ { - "type": "vagrant", - "output": "../builds/{{.Provider}}/opscode_ubuntu-12.04_chef-{{user `chef_version`}}.box" + "output": "../builds/{{.Provider}}/opscode_ubuntu-12.04_chef-{{user `chef_version`}}.box", + "type": "vagrant" } ], "provisioners": [ { - "environment_vars": [ "CHEF_VERSION={{user `chef_version`}}" ], + "environment_vars": [ + "CHEF_VERSION={{user `chef_version`}}" + ], "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E bash '{{.Path}}'", "scripts": [ "scripts/ubuntu/update.sh", @@ -122,5 +130,10 @@ ], "type": "shell" } - ] + ], + "variables": { + "chef_version": "provisionerless", + "mirror": "http://releases.ubuntu.com" + } } + diff --git a/packer/ubuntu-12.04-i386.json b/packer/ubuntu-12.04-i386.json index e53c11cff..51e5de130 100644 --- a/packer/ubuntu-12.04-i386.json +++ b/packer/ubuntu-12.04-i386.json @@ -1,11 +1,6 @@ { - "variables": { - "chef_version": "provisionerless", - "mirror": "http://releases.ubuntu.com" - }, "builders": [ { - "type": "virtualbox", "boot_command": [ "<esc><wait>", "<esc><wait>", @@ -38,21 +33,31 @@ "iso_checksum": "2ec0e913959f6c2ba7a558e8bfa361428bb00e56", "iso_checksum_type": "sha1", "iso_url": "{{user `mirror`}}/12.04/ubuntu-12.04.3-server-i386.iso", + "output_directory": "packer-ubuntu-12.04-i386-virtualbox", "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", + "type": "virtualbox-iso", "vboxmanage": [ - [ "modifyvm", "{{.Name}}", "--memory", "384" ], - [ "modifyvm", "{{.Name}}", "--cpus", "1" ] + [ + "modifyvm", + "{{.Name}}", + "--memory", + "384" + ], + [ + "modifyvm", + "{{.Name}}", + "--cpus", + "1" + ] ], "virtualbox_version_file": ".vbox_version", - "vm_name": "packer-ubuntu-12.04-i386", - "output_directory": "packer-ubuntu-12.04-i386-virtualbox" + "vm_name": "packer-ubuntu-12.04-i386" }, { - "type": "vmware", "boot_command": [ "<esc><wait>", "<esc><wait>", @@ -84,14 +89,15 @@ "iso_checksum": "2ec0e913959f6c2ba7a558e8bfa361428bb00e56", "iso_checksum_type": "sha1", "iso_url": "{{user `mirror`}}/12.04/ubuntu-12.04.3-server-i386.iso", - "tools_upload_flavor": "linux", + "output_directory": "packer-ubuntu-12.04-i386-vmware", "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", + "tools_upload_flavor": "linux", + "type": "vmware-iso", "vm_name": "packer-ubuntu-12.04-i386", - "output_directory": "packer-ubuntu-12.04-i386-vmware", "vmx_data": { "cpuid.coresPerSocket": "1", "memsize": "384", @@ -107,7 +113,9 @@ ], "provisioners": [ { - "environment_vars": [ "CHEF_VERSION={{user `chef_version`}}" ], + "environment_vars": [ + "CHEF_VERSION={{user `chef_version`}}" + ], "execute_command": "echo 'vagrant'|{{.Vars}} sudo -S -E bash '{{.Path}}'", "scripts": [ "scripts/ubuntu/update.sh", @@ -122,6 +130,10 @@ ], "type": "shell" } - ] + ], + "variables": { + "chef_version": "provisionerless", + "mirror": "http://releases.ubuntu.com" + } } diff --git a/packer/ubuntu-12.10-amd64.json b/packer/ubuntu-12.10-amd64.json index 783a1a041..20eee9fce 100644 --- a/packer/ubuntu-12.10-amd64.json +++ b/packer/ubuntu-12.10-amd64.json @@ -1,11 +1,6 @@ { - "variables": { - "chef_version": "provisionerless", - "mirror": "http://releases.ubuntu.com" - }, "builders": [ { - "type": "virtualbox", "boot_command": [ "<esc><wait>", "<esc><wait>", @@ -38,21 +33,31 @@ "iso_checksum": "e2a48af008ff3c4db6a8235151a1e90ea600fceb", "iso_checksum_type": "sha1", "iso_url": "{{user `mirror`}}/12.10/ubuntu-12.10-server-amd64.iso", + "output_directory": "packer-ubuntu-12.10-amd64-virtualbox", "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", + "type": "virtualbox-iso", "vboxmanage": [ - [ "modifyvm", "{{.Name}}", "--memory", "384" ], - [ "modifyvm", "{{.Name}}", "--cpus", "1" ] + [ + "modifyvm", + "{{.Name}}", + "--memory", + "384" + ], + [ + "modifyvm", + "{{.Name}}", + "--cpus", + "1" + ] ], "virtualbox_version_file": ".vbox_version", - "vm_name": "packer-ubuntu-12.10-amd64", - "output_directory": "packer-ubuntu-12.10-amd64-virtualbox" + "vm_name": "packer-ubuntu-12.10-amd64" }, { - "type": "vmware", "boot_command": [ "<esc><wait>", "<esc><wait>", @@ -84,14 +89,15 @@ "iso_checksum": "e2a48af008ff3c4db6a8235151a1e90ea600fceb", "iso_checksum_type": "sha1", "iso_url": "{{user `mirror`}}/12.10/ubuntu-12.10-server-amd64.iso", - "tools_upload_flavor": "linux", + "output_directory": "packer-ubuntu-12.10-amd64-vmware", "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", + "tools_upload_flavor": "linux", + "type": "vmware-iso", "vm_name": "packer-ubuntu-12.10-amd64", - "output_directory": "packer-ubuntu-12.10-amd64-vmware", "vmx_data": { "cpuid.coresPerSocket": "1", "memsize": "384", @@ -107,7 +113,9 @@ ], "provisioners": [ { - "environment_vars": [ "CHEF_VERSION={{user `chef_version`}}" ], + "environment_vars": [ + "CHEF_VERSION={{user `chef_version`}}" + ], "execute_command": "echo 'vagrant'|{{.Vars}} sudo -S -E bash '{{.Path}}'", "scripts": [ "scripts/ubuntu/update.sh", @@ -122,6 +130,10 @@ ], "type": "shell" } - ] + ], + "variables": { + "chef_version": "provisionerless", + "mirror": "http://releases.ubuntu.com" + } } diff --git a/packer/ubuntu-12.10-i386.json b/packer/ubuntu-12.10-i386.json index 237a65c7f..b9f982596 100644 --- a/packer/ubuntu-12.10-i386.json +++ b/packer/ubuntu-12.10-i386.json @@ -1,8 +1,4 @@ { - "variables": { - "chef_version": "provisionerless", - "mirror": "http://releases.ubuntu.com" - }, "builders": [ { "boot_command": [ @@ -37,19 +33,29 @@ "iso_checksum": "e0e48be7ae21003cf0b25591d71d8cdbee7063e7", "iso_checksum_type": "sha1", "iso_url": "{{user `mirror`}}/12.10/ubuntu-12.10-server-i386.iso", + "output_directory": "packer-ubuntu-12.10-i386-virtualbox", "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", - "type": "virtualbox", + "type": "virtualbox-iso", "vboxmanage": [ - [ "modifyvm", "{{.Name}}", "--memory", "384" ], - [ "modifyvm", "{{.Name}}", "--cpus", "1" ] + [ + "modifyvm", + "{{.Name}}", + "--memory", + "384" + ], + [ + "modifyvm", + "{{.Name}}", + "--cpus", + "1" + ] ], "virtualbox_version_file": ".vbox_version", - "vm_name": "packer-ubuntu-12.10-i386", - "output_directory": "packer-ubuntu-12.10-i386-virtualbox" + "vm_name": "packer-ubuntu-12.10-i386" }, { "boot_command": [ @@ -83,15 +89,15 @@ "iso_checksum": "e0e48be7ae21003cf0b25591d71d8cdbee7063e7", "iso_checksum_type": "sha1", "iso_url": "{{user `mirror`}}/12.10/ubuntu-12.10-server-i386.iso", - "tools_upload_flavor": "linux", + "output_directory": "packer-ubuntu-12.10-i386-vmware", "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", + "tools_upload_flavor": "linux", + "type": "vmware-iso", "vm_name": "packer-ubuntu-12.10-i386", - "output_directory": "packer-ubuntu-12.10-i386-vmware", - "type": "vmware", "vmx_data": { "cpuid.coresPerSocket": "1", "memsize": "384", @@ -107,7 +113,9 @@ ], "provisioners": [ { - "environment_vars": [ "CHEF_VERSION={{user `chef_version`}}" ], + "environment_vars": [ + "CHEF_VERSION={{user `chef_version`}}" + ], "execute_command": "echo 'vagrant'|{{.Vars}} sudo -S -E bash '{{.Path}}'", "scripts": [ "scripts/ubuntu/update.sh", @@ -122,6 +130,10 @@ ], "type": "shell" } - ] + ], + "variables": { + "chef_version": "provisionerless", + "mirror": "http://releases.ubuntu.com" + } } diff --git a/packer/ubuntu-13.04-amd64.json b/packer/ubuntu-13.04-amd64.json index 620364c2e..cdf5411e1 100644 --- a/packer/ubuntu-13.04-amd64.json +++ b/packer/ubuntu-13.04-amd64.json @@ -1,11 +1,6 @@ { - "variables": { - "chef_version": "provisionerless", - "mirror": "http://releases.ubuntu.com" - }, "builders": [ { - "type": "virtualbox", "boot_command": [ "<esc><wait>", "<esc><wait>", @@ -38,21 +33,31 @@ "iso_checksum": "2af1c223f586f59237212bb9c06ad774673c8952", "iso_checksum_type": "sha1", "iso_url": "{{user `mirror`}}/13.04/ubuntu-13.04-server-amd64.iso", + "output_directory": "packer-ubuntu-13.04-amd64-virtualbox", "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", + "type": "virtualbox-iso", "vboxmanage": [ - [ "modifyvm", "{{.Name}}", "--memory", "384" ], - [ "modifyvm", "{{.Name}}", "--cpus", "1" ] + [ + "modifyvm", + "{{.Name}}", + "--memory", + "384" + ], + [ + "modifyvm", + "{{.Name}}", + "--cpus", + "1" + ] ], "virtualbox_version_file": ".vbox_version", - "vm_name": "packer-ubuntu-13.04-amd64", - "output_directory": "packer-ubuntu-13.04-amd64-virtualbox" + "vm_name": "packer-ubuntu-13.04-amd64" }, { - "type": "vmware", "boot_command": [ "<esc><wait>", "<esc><wait>", @@ -85,14 +90,15 @@ "iso_checksum": "2af1c223f586f59237212bb9c06ad774673c8952", "iso_checksum_type": "sha1", "iso_url": "{{user `mirror`}}/13.04/ubuntu-13.04-server-amd64.iso", - "tools_upload_flavor": "linux", + "output_directory": "packer-ubuntu-13.04-amd64-vmware", "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", + "tools_upload_flavor": "linux", + "type": "vmware-iso", "vm_name": "packer-ubuntu-13.04-amd64", - "output_directory": "packer-ubuntu-13.04-amd64-vmware", "vmx_data": { "cpuid.coresPerSocket": "1", "memsize": "384", @@ -108,7 +114,9 @@ ], "provisioners": [ { - "environment_vars": [ "CHEF_VERSION={{user `chef_version`}}" ], + "environment_vars": [ + "CHEF_VERSION={{user `chef_version`}}" + ], "execute_command": "echo 'vagrant'|{{.Vars}} sudo -S -E bash '{{.Path}}'", "scripts": [ "scripts/ubuntu/update.sh", @@ -123,6 +131,10 @@ ], "type": "shell" } - ] + ], + "variables": { + "chef_version": "provisionerless", + "mirror": "http://releases.ubuntu.com" + } } diff --git a/packer/ubuntu-13.04-i386.json b/packer/ubuntu-13.04-i386.json index 3158848a7..f38a8e24d 100644 --- a/packer/ubuntu-13.04-i386.json +++ b/packer/ubuntu-13.04-i386.json @@ -1,11 +1,6 @@ { - "variables": { - "chef_version": "provisionerless", - "mirror": "http://releases.ubuntu.com" - }, "builders": [ { - "type": "virtualbox", "boot_command": [ "<esc><wait>", "<esc><wait>", @@ -38,21 +33,31 @@ "iso_checksum": "27bbe172d66d4ce634d10fd655e840f72fe56130", "iso_checksum_type": "sha1", "iso_url": "{{user `mirror`}}/13.04/ubuntu-13.04-server-i386.iso", + "output_directory": "packer-ubuntu-13.04-i386-virtualbox", "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", + "type": "virtualbox-iso", "vboxmanage": [ - [ "modifyvm", "{{.Name}}", "--memory", "384" ], - [ "modifyvm", "{{.Name}}", "--cpus", "1" ] + [ + "modifyvm", + "{{.Name}}", + "--memory", + "384" + ], + [ + "modifyvm", + "{{.Name}}", + "--cpus", + "1" + ] ], "virtualbox_version_file": ".vbox_version", - "vm_name": "packer-ubuntu-13.04-i386", - "output_directory": "packer-ubuntu-13.04-i386-virtualbox" + "vm_name": "packer-ubuntu-13.04-i386" }, { - "type": "vmware", "boot_command": [ "<esc><wait>", "<esc><wait>", @@ -84,14 +89,15 @@ "iso_checksum": "27bbe172d66d4ce634d10fd655e840f72fe56130", "iso_checksum_type": "sha1", "iso_url": "{{user `mirror`}}/13.04/ubuntu-13.04-server-i386.iso", - "tools_upload_flavor": "linux", + "output_directory": "packer-ubuntu-13.04-i386-vmware", "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", + "tools_upload_flavor": "linux", + "type": "vmware-iso", "vm_name": "packer-ubuntu-13.04-i386", - "output_directory": "packer-ubuntu-13.04-i386-vmware", "vmx_data": { "cpuid.coresPerSocket": "1", "memsize": "384", @@ -107,12 +113,14 @@ ], "provisioners": [ { - "type": "file", + "destination": "/tmp/shutdown.sh", "source": "scripts/common/shutdown.sh", - "destination": "/tmp/shutdown.sh" + "type": "file" }, { - "environment_vars": [ "CHEF_VERSION={{user `chef_version`}}" ], + "environment_vars": [ + "CHEF_VERSION={{user `chef_version`}}" + ], "execute_command": "echo 'vagrant'|{{.Vars}} sudo -S -E bash '{{.Path}}'", "scripts": [ "scripts/ubuntu/update.sh", @@ -127,6 +135,10 @@ ], "type": "shell" } - ] + ], + "variables": { + "chef_version": "provisionerless", + "mirror": "http://releases.ubuntu.com" + } } diff --git a/packer/ubuntu-13.10-amd64.json b/packer/ubuntu-13.10-amd64.json index 794d7d88f..fd8987b98 100644 --- a/packer/ubuntu-13.10-amd64.json +++ b/packer/ubuntu-13.10-amd64.json @@ -1,11 +1,6 @@ { - "variables": { - "chef_version": "provisionerless", - "mirror": "http://releases.ubuntu.com" - }, "builders": [ { - "type": "virtualbox", "boot_command": [ "<esc><wait>", "<esc><wait>", @@ -38,21 +33,31 @@ "iso_checksum": "5dd72c694c3a7e06a3b4dd651ca26cfc70985004", "iso_checksum_type": "sha1", "iso_url": "{{user `mirror`}}/13.10/ubuntu-13.10-server-amd64.iso", + "output_directory": "packer-ubuntu-13.10-amd64-virtualbox", "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", + "type": "virtualbox-iso", "vboxmanage": [ - [ "modifyvm", "{{.Name}}", "--memory", "384" ], - [ "modifyvm", "{{.Name}}", "--cpus", "1" ] + [ + "modifyvm", + "{{.Name}}", + "--memory", + "384" + ], + [ + "modifyvm", + "{{.Name}}", + "--cpus", + "1" + ] ], "virtualbox_version_file": ".vbox_version", - "vm_name": "packer-ubuntu-13.10-amd64", - "output_directory": "packer-ubuntu-13.10-amd64-virtualbox" + "vm_name": "packer-ubuntu-13.10-amd64" }, { - "type": "vmware", "boot_command": [ "<esc><wait>", "<esc><wait>", @@ -85,14 +90,15 @@ "iso_checksum": "5dd72c694c3a7e06a3b4dd651ca26cfc70985004", "iso_checksum_type": "sha1", "iso_url": "{{user `mirror`}}/13.10/ubuntu-13.10-server-amd64.iso", - "tools_upload_flavor": "linux", + "output_directory": "packer-ubuntu-13.10-amd64-vmware", "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", + "tools_upload_flavor": "linux", + "type": "vmware-iso", "vm_name": "packer-ubuntu-13.10-amd64", - "output_directory": "packer-ubuntu-13.10-amd64-vmware", "vmx_data": { "cpuid.coresPerSocket": "1", "memsize": "384", @@ -108,7 +114,9 @@ ], "provisioners": [ { - "environment_vars": [ "CHEF_VERSION={{user `chef_version`}}" ], + "environment_vars": [ + "CHEF_VERSION={{user `chef_version`}}" + ], "execute_command": "echo 'vagrant'|{{.Vars}} sudo -S -E bash '{{.Path}}'", "scripts": [ "scripts/ubuntu/update.sh", @@ -123,5 +131,10 @@ ], "type": "shell" } - ] + ], + "variables": { + "chef_version": "provisionerless", + "mirror": "http://releases.ubuntu.com" + } } + diff --git a/packer/ubuntu-13.10-i386.json b/packer/ubuntu-13.10-i386.json index af1a5d621..283eafc05 100644 --- a/packer/ubuntu-13.10-i386.json +++ b/packer/ubuntu-13.10-i386.json @@ -1,11 +1,6 @@ { - "variables": { - "chef_version": "provisionerless", - "mirror": "http://releases.ubuntu.com" - }, "builders": [ { - "type": "virtualbox", "boot_command": [ "<esc><wait>", "<esc><wait>", @@ -38,21 +33,31 @@ "iso_checksum": "2dda06d01d3ad495b53f7c03a4313b4af76a1c96", "iso_checksum_type": "sha1", "iso_url": "{{user `mirror`}}/13.10/ubuntu-13.10-server-i386.iso", + "output_directory": "packer-ubuntu-13.10-i386-virtualbox", "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", + "type": "virtualbox-iso", "vboxmanage": [ - [ "modifyvm", "{{.Name}}", "--memory", "384" ], - [ "modifyvm", "{{.Name}}", "--cpus", "1" ] + [ + "modifyvm", + "{{.Name}}", + "--memory", + "384" + ], + [ + "modifyvm", + "{{.Name}}", + "--cpus", + "1" + ] ], "virtualbox_version_file": ".vbox_version", - "vm_name": "packer-ubuntu-13.10-i386", - "output_directory": "packer-ubuntu-13.10-i386-virtualbox" + "vm_name": "packer-ubuntu-13.10-i386" }, { - "type": "vmware", "boot_command": [ "<esc><wait>", "<esc><wait>", @@ -84,14 +89,15 @@ "iso_checksum": "2dda06d01d3ad495b53f7c03a4313b4af76a1c96", "iso_checksum_type": "sha1", "iso_url": "{{user `mirror`}}/13.10/ubuntu-13.10-server-i386.iso", - "tools_upload_flavor": "linux", + "output_directory": "packer-ubuntu-13.10-i386-vmware", "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", + "tools_upload_flavor": "linux", + "type": "vmware-iso", "vm_name": "packer-ubuntu-13.10-i386", - "output_directory": "packer-ubuntu-13.10-i386-vmware", "vmx_data": { "cpuid.coresPerSocket": "1", "memsize": "384", @@ -107,12 +113,14 @@ ], "provisioners": [ { - "type": "file", + "destination": "/tmp/shutdown.sh", "source": "scripts/common/shutdown.sh", - "destination": "/tmp/shutdown.sh" + "type": "file" }, { - "environment_vars": [ "CHEF_VERSION={{user `chef_version`}}" ], + "environment_vars": [ + "CHEF_VERSION={{user `chef_version`}}" + ], "execute_command": "echo 'vagrant'|{{.Vars}} sudo -S -E bash '{{.Path}}'", "scripts": [ "scripts/ubuntu/update.sh", @@ -127,5 +135,10 @@ ], "type": "shell" } - ] + ], + "variables": { + "chef_version": "provisionerless", + "mirror": "http://releases.ubuntu.com" + } } + From 24afa22af3df55a06fb37bb36f2a1c658d1353b3 Mon Sep 17 00:00:00 2001 From: "Julian C. Dunn" <jdunn@getchef.com> Date: Fri, 3 Jan 2014 11:43:02 -0500 Subject: [PATCH 0166/1622] Repair FreeBSD definitions after they got corrupted by a Packer bug. (https://github.com/mitchellh/packer/issues/784) --- packer/freebsd-9.2-amd64.json | 6 +++--- packer/freebsd-9.2-i386.json | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/packer/freebsd-9.2-amd64.json b/packer/freebsd-9.2-amd64.json index 8c6ae8766..e48f7ed55 100644 --- a/packer/freebsd-9.2-amd64.json +++ b/packer/freebsd-9.2-amd64.json @@ -14,7 +14,7 @@ "mdmfs -s 100m md1 /tmp<enter><wait>", "mdmfs -s 100m md2 /mnt<enter><wait>", "dhclient -l /tmp/dhclient.lease.em0 em0<enter><wait>", - "fetch -o /tmp/install.sh http://{{ .HTTPIP }}:{{ .HTTPPort }}/freebsd-9.2/install.sh \u0026\u0026 chmod +x /tmp/install.sh \u0026\u0026 /tmp/install.sh {{ .Name }}<enter><wait>" + "fetch -o /tmp/install.sh http://{{ .HTTPIP }}:{{ .HTTPPort }}/freebsd-9.2/install.sh && chmod +x /tmp/install.sh && /tmp/install.sh {{ .Name }}<enter><wait>" ], "boot_wait": "10s", "disk_size": 10140, @@ -63,7 +63,7 @@ "mdmfs -s 100m md2 /mnt<enter><wait>", "dhclient -l /tmp/dhclient.lease.em0 em0<enter><wait>", "<wait5>", - "fetch -o /tmp/install.sh http://{{ .HTTPIP }}:{{ .HTTPPort }}/freebsd-9.2/install.sh \u0026\u0026 chmod +x /tmp/install.sh \u0026\u0026 /tmp/install.sh {{ .Name }}<enter><wait>" + "fetch -o /tmp/install.sh http://{{ .HTTPIP }}:{{ .HTTPPort }}/freebsd-9.2/install.sh && chmod +x /tmp/install.sh && /tmp/install.sh {{ .Name }}<enter><wait>" ], "boot_wait": "10s", "disk_size": 10140, @@ -99,7 +99,7 @@ "environment_vars": [ "CHEF_VERSION={{user `chef_version`}}" ], - "execute_command": "export {{.Vars}} \u0026\u0026 cat {{.Path}} | su -m", + "execute_command": "export {{.Vars}} && cat {{.Path}} | su -m", "scripts": [ "scripts/freebsd/postinstall.sh", "scripts/freebsd/vmtools.sh", diff --git a/packer/freebsd-9.2-i386.json b/packer/freebsd-9.2-i386.json index 5b65ff4da..020be35ab 100644 --- a/packer/freebsd-9.2-i386.json +++ b/packer/freebsd-9.2-i386.json @@ -14,7 +14,7 @@ "mdmfs -s 100m md1 /tmp<enter><wait>", "mdmfs -s 100m md2 /mnt<enter><wait>", "dhclient -l /tmp/dhclient.lease.em0 em0<enter><wait>", - "fetch -o /tmp/install.sh http://{{ .HTTPIP }}:{{ .HTTPPort }}/freebsd-9.2/install.sh \u0026\u0026 chmod +x /tmp/install.sh \u0026\u0026 /tmp/install.sh {{ .Name }}<enter><wait>" + "fetch -o /tmp/install.sh http://{{ .HTTPIP }}:{{ .HTTPPort }}/freebsd-9.2/install.sh && chmod +x /tmp/install.sh && /tmp/install.sh {{ .Name }}<enter><wait>" ], "boot_wait": "10s", "disk_size": 10140, @@ -63,7 +63,7 @@ "mdmfs -s 100m md2 /mnt<enter><wait>", "dhclient -l /tmp/dhclient.lease.em0 em0<enter><wait>", "<wait5>", - "fetch -o /tmp/install.sh http://{{ .HTTPIP }}:{{ .HTTPPort }}/freebsd-9.2/install.sh \u0026\u0026 chmod +x /tmp/install.sh \u0026\u0026 /tmp/install.sh {{ .Name }}<enter><wait>" + "fetch -o /tmp/install.sh http://{{ .HTTPIP }}:{{ .HTTPPort }}/freebsd-9.2/install.sh && chmod +x /tmp/install.sh && /tmp/install.sh {{ .Name }}<enter><wait>" ], "boot_wait": "10s", "disk_size": 10140, @@ -96,7 +96,7 @@ ], "provisioners": [ { - "execute_command": "export {{.Vars}} \u0026\u0026 cat {{.Path}} | su -m", + "execute_command": "export {{.Vars}} && cat {{.Path}} | su -m", "scripts": [ "scripts/freebsd/postinstall.sh", "scripts/freebsd/vmtools.sh", From d5f61e9c85e4dd8b894b511f80684116848f4ef0 Mon Sep 17 00:00:00 2001 From: Lothar Wieske <Lothar@Cloudgate-10.local> Date: Fri, 3 Jan 2014 18:47:21 +0100 Subject: [PATCH 0167/1622] Update vmtools branch logic to reflect new providers in packer 0.5.1- MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit New providers in packer 0.5.1 are - virtualbox-iso/ovf and - vmware-iso/ovf instead of the former „naked“ virtualbox and vmware. --- packer/scripts/common/vmtools.sh | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/packer/scripts/common/vmtools.sh b/packer/scripts/common/vmtools.sh index 2ab74c8ff..3f980317b 100644 --- a/packer/scripts/common/vmtools.sh +++ b/packer/scripts/common/vmtools.sh @@ -1,6 +1,8 @@ #!/bin/bash -if [ $PACKER_BUILDER_TYPE == 'virtualbox' ]; then +case "$PACKER_BUILDER_TYPE" in + +virtualbox-iso|virtualbox-ovf) mkdir /tmp/vbox VER=$(cat /home/vagrant/.vbox_version) mount -o loop /home/vagrant/VBoxGuestAdditions_$VER.iso /tmp/vbox @@ -8,9 +10,9 @@ if [ $PACKER_BUILDER_TYPE == 'virtualbox' ]; then umount /tmp/vbox rmdir /tmp/vbox rm /home/vagrant/*.iso -fi + ;; -if [ $PACKER_BUILDER_TYPE == 'vmware' ]; then +vmware-iso|vmware-ovf) mkdir /tmp/vmfusion mkdir /tmp/vmfusion-archive mount -o loop /home/vagrant/linux.iso /tmp/vmfusion @@ -20,4 +22,11 @@ if [ $PACKER_BUILDER_TYPE == 'vmware' ]; then rm -rf /tmp/vmfusion rm -rf /tmp/vmfusion-archive rm /home/vagrant/*.iso -fi + ;; + +*) + echo "Unknown Packer Builder Type >>$PACKER_BUILDER_TYPE<< selected." + echo "Known are virtualbox-iso|virtualbox-ovf|vmware-iso|vmware-ovf." + ;; + +esac From 8ce3c7cc309bb4674ef765335f7ef6ea42af57ec Mon Sep 17 00:00:00 2001 From: "Julian C. Dunn" <jdunn@getchef.com> Date: Thu, 12 Dec 2013 22:45:45 -0500 Subject: [PATCH 0168/1622] FreeBSD 10.0-RC4 support. --- packer/freebsd-10.0-amd64.json | 104 ++++++++++++++++++++++++++ packer/freebsd-10.0-i386.json | 104 ++++++++++++++++++++++++++ packer/http/freebsd-10.0/install.sh | 103 +++++++++++++++++++++++++ packer/scripts/freebsd/postinstall.sh | 14 +++- packer/scripts/freebsd/vmtools.sh | 15 +++- 5 files changed, 336 insertions(+), 4 deletions(-) create mode 100644 packer/freebsd-10.0-amd64.json create mode 100644 packer/freebsd-10.0-i386.json create mode 100644 packer/http/freebsd-10.0/install.sh diff --git a/packer/freebsd-10.0-amd64.json b/packer/freebsd-10.0-amd64.json new file mode 100644 index 000000000..0f5f0aec9 --- /dev/null +++ b/packer/freebsd-10.0-amd64.json @@ -0,0 +1,104 @@ +{ + "variables": { + "chef_version": "provisionerless", + "mirror": "http://ftp.freebsd.org/pub/FreeBSD" + }, + "provisioners": [ + { + "environment_vars": [ "CHEF_VERSION={{user `chef_version`}}" ], + "type": "shell", + "scripts": [ + "scripts/freebsd/postinstall.sh", + "scripts/common/chef.sh", + "scripts/freebsd/cleanup.sh", + "scripts/freebsd/vmtools.sh", + "scripts/common/minimize.sh" + ], + "execute_command": "export {{.Vars}} && cat {{.Path}} | su -m" + } + ], + "builders": [ + { + "type": "virtualbox-iso", + "boot_command": [ + "<esc><wait>", + "load geom_mbr<wait>", + "<enter><wait>", + "load zfs<wait>", + "<enter><wait>", + "boot -s<wait>", + "<enter><wait>", + "<wait10><wait10>", + "/bin/sh<enter><wait>", + "mdmfs -s 100m md1 /tmp<enter><wait>", + "mdmfs -s 100m md2 /mnt<enter><wait>", + "dhclient -l /tmp/dhclient.lease.em0 em0<enter><wait>", + "fetch -o /tmp/install.sh http://{{ .HTTPIP }}:{{ .HTTPPort }}/freebsd-10.0/install.sh && chmod +x /tmp/install.sh && /tmp/install.sh {{ .Name }}<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 10140, + "guest_os_type": "FreeBSD_64", + "http_directory": "http", + "iso_checksum": "5f231601641cabb518d6d3e6c608400bd2d865fe08c79dc6cdfbc9f48c532b94", + "iso_checksum_type": "sha256", + "iso_url": "{{user `mirror`}}/releases/amd64/amd64/ISO-IMAGES/10.0/FreeBSD-10.0-RC4-amd64-disc1.iso", + "ssh_username": "vagrant", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_wait_timeout": "10000s", + "shutdown_command": "echo 'shutdown -p now' > shutdown.sh; cat 'shutdown.sh' | su -", + "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "virtualbox_version_file": ".vbox_version", + "vm_name": "packer-freebsd-10.0-amd64", + "output_directory": "packer-freebsd-10.0-amd64-virtualbox", + "vboxmanage": [ + [ "modifyvm", "{{.Name}}", "--memory", "512" ], + [ "modifyvm", "{{.Name}}", "--cpus", "1" ] + ] + }, + { + "type": "vmware-iso", + "boot_command": [ + "<esc><wait>", + "load geom_mbr<wait>", + "<enter><wait>", + "load zfs<wait>", + "<enter><wait>", + "boot -s<wait>", + "<enter><wait>", + "<wait10><wait10>", + "/bin/sh<enter><wait>", + "mdmfs -s 100m md1 /tmp<enter><wait>", + "mdmfs -s 100m md2 /mnt<enter><wait>", + "dhclient -l /tmp/dhclient.lease.em0 em0<enter><wait>", + "<wait5>", + "fetch -o /tmp/install.sh http://{{ .HTTPIP }}:{{ .HTTPPort }}/freebsd-10.0/install.sh && chmod +x /tmp/install.sh && /tmp/install.sh {{ .Name }}<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 10140, + "guest_os_type": "freebsd-64", + "http_directory": "http", + "iso_checksum": "5f231601641cabb518d6d3e6c608400bd2d865fe08c79dc6cdfbc9f48c532b94", + "iso_checksum_type": "sha256", + "iso_url": "{{user `mirror`}}/releases/amd64/amd64/ISO-IMAGES/10.0/FreeBSD-10.0-RC4-amd64-disc1.iso", + "ssh_username": "vagrant", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_wait_timeout": "10000s", + "shutdown_command": "echo 'shutdown -p now' > shutdown.sh; cat 'shutdown.sh' | su -", + "vm_name": "packer-freebsd-10.0-amd64", + "output_directory": "packer-freebsd-10.0-amd64-vmware", + "vmx_data": { + "memsize": "512", + "numvcpus": "1", + "cpuid.coresPerSocket": "1" + } + } + ], + "post-processors": [ + { + "output": "../builds/{{.Provider}}/opscode_freebsd-10.0_chef-{{user `chef_version`}}.box", + "type": "vagrant" + } + ] +} diff --git a/packer/freebsd-10.0-i386.json b/packer/freebsd-10.0-i386.json new file mode 100644 index 000000000..5a182ef6c --- /dev/null +++ b/packer/freebsd-10.0-i386.json @@ -0,0 +1,104 @@ +{ + "variables": { + "chef_version": "provisionerless", + "mirror": "http://ftp.freebsd.org/pub/FreeBSD" + }, + "provisioners": [ + { + "environment_vars": [ "CHEF_VERSION={{user `chef_version`}}" ], + "type": "shell", + "scripts": [ + "scripts/freebsd/postinstall.sh", + "scripts/common/chef.sh", + "scripts/freebsd/cleanup.sh", + "scripts/freebsd/vmtools.sh", + "scripts/common/minimize.sh" + ], + "execute_command": "export {{.Vars}} && cat {{.Path}} | su -m" + } + ], + "builders": [ + { + "type": "virtualbox-iso", + "boot_command": [ + "<esc><wait>", + "load geom_mbr<wait>", + "<enter><wait>", + "load zfs<wait>", + "<enter><wait>", + "boot -s<wait>", + "<enter><wait>", + "<wait10><wait10>", + "/bin/sh<enter><wait>", + "mdmfs -s 100m md1 /tmp<enter><wait>", + "mdmfs -s 100m md2 /mnt<enter><wait>", + "dhclient -l /tmp/dhclient.lease.em0 em0<enter><wait>", + "fetch -o /tmp/install.sh http://{{ .HTTPIP }}:{{ .HTTPPort }}/freebsd-10.0/install.sh && chmod +x /tmp/install.sh && /tmp/install.sh {{ .Name }}<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 10140, + "guest_os_type": "FreeBSD", + "http_directory": "http", + "iso_checksum": "0cfebb47d4930b093790a7b488f6ca503032386f9b0716f88404b9640cdd9423", + "iso_checksum_type": "sha256", + "iso_url": "{{user `mirror`}}/releases/i386/i386/ISO-IMAGES/10.0/FreeBSD-10.0-RC4-i386-disc1.iso", + "ssh_username": "vagrant", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_wait_timeout": "10000s", + "shutdown_command": "echo 'shutdown -p now' > shutdown.sh; cat 'shutdown.sh' | su -", + "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "virtualbox_version_file": ".vbox_version", + "vm_name": "packer-freebsd-10.0-i386", + "output_directory": "packer-freebsd-10.0-i386-virtualbox", + "vboxmanage": [ + [ "modifyvm", "{{.Name}}", "--memory", "512" ], + [ "modifyvm", "{{.Name}}", "--cpus", "1" ] + ] + }, + { + "type": "vmware-iso", + "boot_command": [ + "<esc><wait>", + "load geom_mbr<wait>", + "<enter><wait>", + "load zfs<wait>", + "<enter><wait>", + "boot -s<wait>", + "<enter><wait>", + "<wait10><wait10>", + "/bin/sh<enter><wait>", + "mdmfs -s 100m md1 /tmp<enter><wait>", + "mdmfs -s 100m md2 /mnt<enter><wait>", + "dhclient -l /tmp/dhclient.lease.em0 em0<enter><wait>", + "<wait5>", + "fetch -o /tmp/install.sh http://{{ .HTTPIP }}:{{ .HTTPPort }}/freebsd-10.0/install.sh && chmod +x /tmp/install.sh && /tmp/install.sh {{ .Name }}<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 10140, + "guest_os_type": "freebsd", + "http_directory": "http", + "iso_checksum": "0cfebb47d4930b093790a7b488f6ca503032386f9b0716f88404b9640cdd9423", + "iso_checksum_type": "sha256", + "iso_url": "{{user `mirror`}}/releases/i386/i386/ISO-IMAGES/10.0/FreeBSD-10.0-RC4-i386-disc1.iso", + "ssh_username": "vagrant", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_wait_timeout": "10000s", + "shutdown_command": "echo 'shutdown -p now' > shutdown.sh; cat 'shutdown.sh' | su -", + "vm_name": "packer-freebsd-10.0-i386", + "output_directory": "packer-freebsd-10.0-i386-vmware", + "vmx_data": { + "memsize": "512", + "numvcpus": "1", + "cpuid.coresPerSocket": "1" + } + } + ], + "post-processors": [ + { + "output": "../builds/{{.Provider}}/opscode_freebsd-10.0_chef-{{user `chef_version`}}.box", + "type": "vagrant" + } + ] +} diff --git a/packer/http/freebsd-10.0/install.sh b/packer/http/freebsd-10.0/install.sh new file mode 100644 index 000000000..4e9c4b5c4 --- /dev/null +++ b/packer/http/freebsd-10.0/install.sh @@ -0,0 +1,103 @@ +#!/bin/sh -x + +# Credit: http://www.aisecure.net/2011/05/01/root-on-zfs-freebsd-current/ +# +# Heavily re-adapted from https://wiki.freebsd.org/RootOnZFS/GPTZFSBoot +# by Julian Dunn (jdunn@opscode.com) to remove legacy junk + +NAME=$1 + +# create disks +# for variations in the root disk device name between VMware and Virtualbox +if [ -e /dev/ada0 ]; then + DISKSLICE=ada0 +else + DISKSLICE=da0 +fi + +gpart create -s gpt $DISKSLICE +gpart add -b 34 -s 94 -t freebsd-boot $DISKSLICE +gpart add -t freebsd-zfs -l disk0 $DISKSLICE +gpart bootcode -b /boot/pmbr -p /boot/gptzfsboot -i 1 $DISKSLICE + +zpool create -o altroot=/mnt -o cachefile=/tmp/zpool.cache zroot /dev/gpt/disk0 +zpool set bootfs=zroot zroot + +zfs set checksum=fletcher4 zroot + +# set up zfs pools +zfs create zroot/usr +zfs create zroot/usr/home +zfs create zroot/var +zfs create -o compression=on -o exec=on -o setuid=off zroot/tmp +zfs create -o compression=lzjb -o setuid=off zroot/usr/ports +zfs create -o compression=off -o exec=off -o setuid=off zroot/usr/ports/distfiles +zfs create -o compression=off -o exec=off -o setuid=off zroot/usr/ports/packages +zfs create -o compression=lzjb -o exec=off -o setuid=off zroot/usr/src +zfs create -o compression=lzjb -o exec=off -o setuid=off zroot/var/crash +zfs create -o exec=off -o setuid=off zroot/var/db +zfs create -o compression=lzjb -o exec=on -o setuid=off zroot/var/db/pkg +zfs create -o exec=off -o setuid=off zroot/var/empty +zfs create -o compression=lzjb -o exec=off -o setuid=off zroot/var/log +zfs create -o compression=gzip -o exec=off -o setuid=off zroot/var/mail +zfs create -o exec=off -o setuid=off zroot/var/run +zfs create -o compression=lzjb -o exec=on -o setuid=off zroot/var/tmp + +# fixup +chmod 1777 /mnt/zroot/tmp +cd /mnt/zroot ; ln -s usr/home home +chmod 1777 /mnt/zroot/var/tmp + +# set up swap +zfs create -V 2G zroot/swap +zfs set org.freebsd:swap=on zroot/swap +zfs set checksum=off zroot/swap +swapon /dev/zvol/zroot/swap + +# Install the OS +cd /usr/freebsd-dist +cat base.txz | tar --unlink -xpJf - -C /mnt/zroot +cat lib32.txz | tar --unlink -xpJf - -C /mnt/zroot +cat kernel.txz | tar --unlink -xpJf - -C /mnt/zroot +cat src.txz | tar --unlink -xpJf - -C /mnt/zroot + +cp /tmp/zpool.cache /mnt/zroot/boot/zfs/zpool.cache + +zfs set readonly=on zroot/var/empty + +# Enable required services +cat >> /mnt/zroot/etc/rc.conf << EOT +zfs_enable="YES" +hostname="${NAME}" +ifconfig_em0="dhcp" +sshd_enable="YES" +EOT + +# Tune and boot from zfs +cat >> /mnt/zroot/boot/loader.conf << EOT +zfs_load="YES" +vfs.root.mountfrom="zfs:zroot" +vm.kmem_size="200M" +vm.kmem_size_max="200M" +vfs.zfs.arc_max="40M" +vfs.zfs.vdev.cache.size="5M" +EOT + +# zfs doesn't use an fstab, but some rc scripts expect one +touch /mnt/zroot/etc/fstab + +# Set up user accounts +zfs create zroot/usr/home/vagrant +echo "vagrant" | pw -V /mnt/zroot/etc useradd vagrant -h 0 -s /bin/sh -G wheel -d /home/vagrant -c "Vagrant User" +echo "vagrant" | pw -V /mnt/zroot/etc usermod root + +chown 1001:1001 /mnt/zroot/home/vagrant + +zfs unmount -a +zfs set mountpoint=legacy zroot +zfs set mountpoint=/tmp zroot/tmp +zfs set mountpoint=/usr zroot/usr +zfs set mountpoint=/var zroot/var + +# Reboot +reboot diff --git a/packer/scripts/freebsd/postinstall.sh b/packer/scripts/freebsd/postinstall.sh index a00acedc7..5b3768db4 100644 --- a/packer/scripts/freebsd/postinstall.sh +++ b/packer/scripts/freebsd/postinstall.sh @@ -1,5 +1,7 @@ #!/bin/sh -x +freebsd_major=`uname -r | awk -F. '{ print $1 }'` + #Set the time correctly ntpdate -v -b in.pool.ntp.org @@ -14,7 +16,17 @@ env PAGER=/bin/cat /tmp/freebsd-update fetch env PAGER=/bin/cat /tmp/freebsd-update install #Install sudo, curl and ca_root_nss -pkg_add -r sudo curl ca_root_nss +if [ $freebsd_major -gt 9 ]; then + # Use pkgng + env ASSUME_ALWAYS_YES=1 pkg bootstrap + pkg update + pkg install -y sudo + pkg install -y curl + pkg install -y ca_root_nss +else + # Use old pkg + pkg_add -r sudo curl ca_root_nss +fi # Emulate the ETCSYMLINK behavior of ca_root_nss; this is for FreeBSD 10, where fetch(1) was # massively refactored and doesn't come with SSL CAcerts anymore diff --git a/packer/scripts/freebsd/vmtools.sh b/packer/scripts/freebsd/vmtools.sh index a85667b4e..bac55c579 100644 --- a/packer/scripts/freebsd/vmtools.sh +++ b/packer/scripts/freebsd/vmtools.sh @@ -1,10 +1,19 @@ #!/bin/sh +freebsd_major=`uname -r | awk -F. '{ print $1 }'` +if [ $freebsd_major -gt 9 ]; then + pkg_command="pkg install -y" + perl_pkg="perl5" +else + pkg_command="pkg_add -r" + perl_pkg="perl" +fi + if [ $PACKER_BUILDER_TYPE == 'virtualbox' ]; then # disable X11 because vagrants are (usually) headless echo 'WITHOUT_X11="YES"' >> /etc/make.conf - pkg_add -r virtualbox-ose-additions + $pkg_command virtualbox-ose-additions echo 'vboxdrv_load="YES"' >> /boot/loader.conf echo 'vboxnet_enable="YES"' >> /etc/rc.conf @@ -25,9 +34,9 @@ if [ $PACKER_BUILDER_TYPE == 'vmware' ]; then mdconfig -a -t vnode -f /home/vagrant/freebsd.iso -u 0 mount -t cd9660 /dev/md0 /tmp/vmfusion tar xzf /tmp/vmfusion/vmware-freebsd-tools.tar.gz -C /tmp/vmfusion-archive - pkg_add -r perl + $pkg_command $perl_pkg # Welcome to 2005. Have you heard of this "YouTube" thing? - pkg_add -r compat6x-`uname -m` + $pkg_command compat6x-`uname -m` /tmp/vmfusion-archive/vmware-tools-distrib/vmware-install.pl --default echo 'ifconfig_vxn0="dhcp"' >> /etc/rc.conf From 709d1e79a1407b5b434288ecf206f2307411ec67 Mon Sep 17 00:00:00 2001 From: "Julian C. Dunn" <jdunn@getchef.com> Date: Fri, 3 Jan 2014 14:39:00 -0500 Subject: [PATCH 0169/1622] Don't "exit" at the end of the postinstall cleanup script. --- packer/scripts/freebsd/cleanup.sh | 2 -- 1 file changed, 2 deletions(-) diff --git a/packer/scripts/freebsd/cleanup.sh b/packer/scripts/freebsd/cleanup.sh index b3e92c1d5..dd8479794 100644 --- a/packer/scripts/freebsd/cleanup.sh +++ b/packer/scripts/freebsd/cleanup.sh @@ -9,5 +9,3 @@ rm -rf /var/db/freebsd-update/install.* rm -rf /boot/kernel.old rm -rf /usr/src/* rm -f /*.core - -exit From b46de53d8e6aee9800289f752d284501e6377b7d Mon Sep 17 00:00:00 2001 From: Adrian Petrescu <apetresc@gmail.com> Date: Mon, 13 Jan 2014 17:55:10 -0500 Subject: [PATCH 0170/1622] Fixing outdated command in README As of cfea16ba, the box type is 'virtualbox-iso' and 'vmware-iso' instead of the old 'virtualbox'/'vmware'. Updating the README to reflect that. --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 2fd6f80cd..c0aa7f3e0 100644 --- a/README.md +++ b/README.md @@ -97,7 +97,7 @@ If you want to use a another mirror site, use mirror variable. If you only have VMware or VirtualBox available, you may also tell Packer to build only that box. - $ packer build -only=virtualbox debian-7.2.0-i386.json + $ packer build -only=virtualbox-iso debian-7.2.0-i386.json Congratulations! You now have box(es) in the ../builds directory that you can then add to Vagrant and start testing cookbooks. From 09134c8946ef9173d09317079431245882f2e00b Mon Sep 17 00:00:00 2001 From: "Julian C. Dunn" <jdunn@getchef.com> Date: Mon, 13 Jan 2014 23:43:29 -0500 Subject: [PATCH 0171/1622] Don't disable selinux on Fedora; just make it Permissive. --- packer/http/fedora-18/ks.cfg | 2 +- packer/http/fedora-19/ks.cfg | 2 +- packer/http/fedora-20/ks.cfg | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packer/http/fedora-18/ks.cfg b/packer/http/fedora-18/ks.cfg index fa3928b25..936809d36 100644 --- a/packer/http/fedora-18/ks.cfg +++ b/packer/http/fedora-18/ks.cfg @@ -6,7 +6,7 @@ network --bootproto=dhcp rootpw --iscrypted $1$damlkd,f$UC/u5pUts5QiU3ow.CSso/ firewall --disabled authconfig --enableshadow --passalgo=sha512 -selinux --disabled +selinux --permissive timezone UTC bootloader --location=mbr text diff --git a/packer/http/fedora-19/ks.cfg b/packer/http/fedora-19/ks.cfg index fa3928b25..936809d36 100644 --- a/packer/http/fedora-19/ks.cfg +++ b/packer/http/fedora-19/ks.cfg @@ -6,7 +6,7 @@ network --bootproto=dhcp rootpw --iscrypted $1$damlkd,f$UC/u5pUts5QiU3ow.CSso/ firewall --disabled authconfig --enableshadow --passalgo=sha512 -selinux --disabled +selinux --permissive timezone UTC bootloader --location=mbr text diff --git a/packer/http/fedora-20/ks.cfg b/packer/http/fedora-20/ks.cfg index fa3928b25..936809d36 100644 --- a/packer/http/fedora-20/ks.cfg +++ b/packer/http/fedora-20/ks.cfg @@ -6,7 +6,7 @@ network --bootproto=dhcp rootpw --iscrypted $1$damlkd,f$UC/u5pUts5QiU3ow.CSso/ firewall --disabled authconfig --enableshadow --passalgo=sha512 -selinux --disabled +selinux --permissive timezone UTC bootloader --location=mbr text From 2346974ceac91cf7055b71df342f2a40f277ccc7 Mon Sep 17 00:00:00 2001 From: Matthieu Vachon <matthieu.ouellette-vachon@nuecho.com> Date: Fri, 17 Jan 2014 15:05:11 -0500 Subject: [PATCH 0172/1622] [BENTO-111] Added a .gitattributes and a note in README about Windows hosts * A .gitattributes was added to the repository to ensure ks.cfg, preseed.cfg and *.sh files have correct LF line endings and *.bat files have correct CRLF line endings. * Added a note about this in the README so people packaging boxes from Windows Hosts can fix the problem if they encounter it. --- .gitattributes | 14 ++++++++++++++ README.md | 22 ++++++++++++++++++++++ 2 files changed, 36 insertions(+) create mode 100644 .gitattributes diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 000000000..19600fd86 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,14 @@ +# Detect text files automatically +* text=auto + +# Force LF line ending on these files +*.sh eol=lf + +ks.cfg eol=lf +preseed.cfg eol=lf + +# Force CRLF line ending on these files +*.bat eol=crlf + +# Force binary on these files +*.cer binary diff --git a/README.md b/README.md index c0aa7f3e0..3dd2fc47e 100644 --- a/README.md +++ b/README.md @@ -113,6 +113,28 @@ boxes yourself due to licensing constraints. You can build these as follows: $ bundle install $ bundle exec veewee vbox build [definition-name] +### Windows Hosts + +When building boxes from a Windows host system, you must ensure that kickstart configuration files (`ks.cfg` for RHEL +based systems) and preseed files (`preseed.cfg` for Debian based systems) have Unix line endings (i.e. lines end with +LF character only). Moreover, it's also a good idea to have `*.sh` scripts with Unix line endings too. + +When these files have Windows line endings, the group creation can fail in the pre-seed phase and in turn, prevents the +user `vagrant` to be created correctly. This ultimately results in Packer not being able to connect to the newly booted +up machine with an error message that looks like this: + +``` +==> virtualbox-iso: Waiting for SSH to become available... +==> virtualbox-iso: Error waiting for SSH: handshake failed: ssh: unable to authenticate, attempted methods [none password], no support +``` + +Since Packer tries to log in with user `vagrant` but it was not created successfully in the pre-seed phase, it is unable +to connect to the machine and the packaging process stops. + +By default, when cloning this repository, git should normalized `ks.cfg`, `preseed.cfg` and `*.sh` to Unix line endings +and `*.bat` to Windows line endings, thanks to the [.gitattributes](.gitattributes) file in the repository. However, if +it's not the case, convert the offending files so they have the correct line endings. + ## Bugs and Issues Use the [issue tracker](http://tickets.opscode.com/browse/BENTO) to report From eba840aa45ba74c890a3d947835b433c642c208d Mon Sep 17 00:00:00 2001 From: "Julian C. Dunn" <jdunn@getchef.com> Date: Fri, 17 Jan 2014 15:53:35 -0500 Subject: [PATCH 0173/1622] Tidy up some text in #111 --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 3dd2fc47e..dda4c8c3e 100644 --- a/README.md +++ b/README.md @@ -113,7 +113,7 @@ boxes yourself due to licensing constraints. You can build these as follows: $ bundle install $ bundle exec veewee vbox build [definition-name] -### Windows Hosts +### Special Note About Building from Windows Hosts When building boxes from a Windows host system, you must ensure that kickstart configuration files (`ks.cfg` for RHEL based systems) and preseed files (`preseed.cfg` for Debian based systems) have Unix line endings (i.e. lines end with @@ -131,9 +131,9 @@ up machine with an error message that looks like this: Since Packer tries to log in with user `vagrant` but it was not created successfully in the pre-seed phase, it is unable to connect to the machine and the packaging process stops. -By default, when cloning this repository, git should normalized `ks.cfg`, `preseed.cfg` and `*.sh` to Unix line endings +By default, when cloning this repository, git should normalize `ks.cfg`, `preseed.cfg` and `*.sh` to Unix line endings and `*.bat` to Windows line endings, thanks to the [.gitattributes](.gitattributes) file in the repository. However, if -it's not the case, convert the offending files so they have the correct line endings. +it's not the case because you have overridden line-ending conversion in your own git configuration, convert the offending files so they have the correct line endings. ## Bugs and Issues From 745340f5fbb8383a09bf36a56da6de92d553b018 Mon Sep 17 00:00:00 2001 From: Mike Adler <mike.adler@huffingtonpost.com> Date: Tue, 28 Jan 2014 10:59:54 -0500 Subject: [PATCH 0174/1622] support mirror variable for iso_url in all centos/vmware builders --- packer/centos-5.10-i386.json | 2 +- packer/centos-5.10-x86_64.json | 2 +- packer/centos-6.5-i386.json | 2 +- packer/centos-6.5-x86_64.json | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/packer/centos-5.10-i386.json b/packer/centos-5.10-i386.json index fbc41a6a4..5fad853a6 100644 --- a/packer/centos-5.10-i386.json +++ b/packer/centos-5.10-i386.json @@ -46,7 +46,7 @@ "http_directory": "http", "iso_checksum": "bb4e61210e1c0389fdf55c59bd2dd7bc957dd400", "iso_checksum_type": "sha1", - "iso_url": "http://mirrors.kernel.org/centos/5.10/isos/i386/CentOS-5.10-i386-bin-DVD-1of2.iso", + "iso_url": "{{user `mirror`}}/5.10/isos/i386/CentOS-5.10-i386-bin-DVD-1of2.iso", "output_directory": "packer-centos-5.10-i386-vmware", "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", diff --git a/packer/centos-5.10-x86_64.json b/packer/centos-5.10-x86_64.json index 29848e98b..a60d60c63 100644 --- a/packer/centos-5.10-x86_64.json +++ b/packer/centos-5.10-x86_64.json @@ -46,7 +46,7 @@ "http_directory": "http", "iso_checksum": "d8403b3fe4972eda3e147ee76d682a4a3beae1e1", "iso_checksum_type": "sha1", - "iso_url": "http://mirrors.kernel.org/centos/5.10/isos/x86_64/CentOS-5.10-x86_64-bin-DVD-1of2.iso", + "iso_url": "{{user `mirror`}}/5.10/isos/x86_64/CentOS-5.10-x86_64-bin-DVD-1of2.iso", "output_directory": "packer-centos-5.10-x86_64-vmware", "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", diff --git a/packer/centos-6.5-i386.json b/packer/centos-6.5-i386.json index abf9a707b..2f0e13bde 100644 --- a/packer/centos-6.5-i386.json +++ b/packer/centos-6.5-i386.json @@ -46,7 +46,7 @@ "http_directory": "http", "iso_checksum": "67ea68068ae53d1f23431072ec0288b3e1abfe4d", "iso_checksum_type": "sha1", - "iso_url": "http://mirrors.kernel.org/centos/6.5/isos/i386/CentOS-6.5-i386-bin-DVD1.iso", + "iso_url": "{{user `mirror`}}/6.5/isos/i386/CentOS-6.5-i386-bin-DVD1.iso", "output_directory": "packer-centos-6.5-i386-vmware", "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", diff --git a/packer/centos-6.5-x86_64.json b/packer/centos-6.5-x86_64.json index d70b59915..f72d76610 100644 --- a/packer/centos-6.5-x86_64.json +++ b/packer/centos-6.5-x86_64.json @@ -46,7 +46,7 @@ "http_directory": "http", "iso_checksum": "32c7695b97f7dcd1f59a77a71f64f2957dddf738", "iso_checksum_type": "sha1", - "iso_url": "http://mirrors.kernel.org/centos/6.5/isos/x86_64/CentOS-6.5-x86_64-bin-DVD1.iso", + "iso_url": "{{user `mirror`}}/6.5/isos/x86_64/CentOS-6.5-x86_64-bin-DVD1.iso", "output_directory": "packer-centos-6.5-x86_64-vmware", "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", From 3ee6c9a399e8788caa10a8d2814073ff1eea00fe Mon Sep 17 00:00:00 2001 From: "Julian C. Dunn" <jdunn@getchef.com> Date: Sat, 1 Feb 2014 14:54:05 +0100 Subject: [PATCH 0175/1622] Updated to RELEASE from RC4. --- packer/freebsd-10.0-amd64.json | 8 ++++---- packer/freebsd-10.0-i386.json | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/packer/freebsd-10.0-amd64.json b/packer/freebsd-10.0-amd64.json index 0f5f0aec9..8e115f1c3 100644 --- a/packer/freebsd-10.0-amd64.json +++ b/packer/freebsd-10.0-amd64.json @@ -39,9 +39,9 @@ "disk_size": 10140, "guest_os_type": "FreeBSD_64", "http_directory": "http", - "iso_checksum": "5f231601641cabb518d6d3e6c608400bd2d865fe08c79dc6cdfbc9f48c532b94", + "iso_checksum": "9c377b4a4e63443c0b210080694de26133e6a276eddb07c7e00e1c9aebd84109", "iso_checksum_type": "sha256", - "iso_url": "{{user `mirror`}}/releases/amd64/amd64/ISO-IMAGES/10.0/FreeBSD-10.0-RC4-amd64-disc1.iso", + "iso_url": "{{user `mirror`}}/releases/amd64/amd64/ISO-IMAGES/10.0/FreeBSD-10.0-RELEASE-amd64-disc1.iso", "ssh_username": "vagrant", "ssh_password": "vagrant", "ssh_port": 22, @@ -78,9 +78,9 @@ "disk_size": 10140, "guest_os_type": "freebsd-64", "http_directory": "http", - "iso_checksum": "5f231601641cabb518d6d3e6c608400bd2d865fe08c79dc6cdfbc9f48c532b94", + "iso_checksum": "9c377b4a4e63443c0b210080694de26133e6a276eddb07c7e00e1c9aebd84109", "iso_checksum_type": "sha256", - "iso_url": "{{user `mirror`}}/releases/amd64/amd64/ISO-IMAGES/10.0/FreeBSD-10.0-RC4-amd64-disc1.iso", + "iso_url": "{{user `mirror`}}/releases/amd64/amd64/ISO-IMAGES/10.0/FreeBSD-10.0-RELEASE-amd64-disc1.iso", "ssh_username": "vagrant", "ssh_password": "vagrant", "ssh_port": 22, diff --git a/packer/freebsd-10.0-i386.json b/packer/freebsd-10.0-i386.json index 5a182ef6c..084bb22a1 100644 --- a/packer/freebsd-10.0-i386.json +++ b/packer/freebsd-10.0-i386.json @@ -39,9 +39,9 @@ "disk_size": 10140, "guest_os_type": "FreeBSD", "http_directory": "http", - "iso_checksum": "0cfebb47d4930b093790a7b488f6ca503032386f9b0716f88404b9640cdd9423", + "iso_checksum": "2c09643b3f79c703e424c03408882369025cec655c24a6d81ee073081ee75ebc", "iso_checksum_type": "sha256", - "iso_url": "{{user `mirror`}}/releases/i386/i386/ISO-IMAGES/10.0/FreeBSD-10.0-RC4-i386-disc1.iso", + "iso_url": "{{user `mirror`}}/releases/i386/i386/ISO-IMAGES/10.0/FreeBSD-10.0-RELEASE-i386-disc1.iso", "ssh_username": "vagrant", "ssh_password": "vagrant", "ssh_port": 22, @@ -78,9 +78,9 @@ "disk_size": 10140, "guest_os_type": "freebsd", "http_directory": "http", - "iso_checksum": "0cfebb47d4930b093790a7b488f6ca503032386f9b0716f88404b9640cdd9423", + "iso_checksum": "2c09643b3f79c703e424c03408882369025cec655c24a6d81ee073081ee75ebc", "iso_checksum_type": "sha256", - "iso_url": "{{user `mirror`}}/releases/i386/i386/ISO-IMAGES/10.0/FreeBSD-10.0-RC4-i386-disc1.iso", + "iso_url": "{{user `mirror`}}/releases/i386/i386/ISO-IMAGES/10.0/FreeBSD-10.0-RELEASE-i386-disc1.iso", "ssh_username": "vagrant", "ssh_password": "vagrant", "ssh_port": 22, From eb3991cd3171701840522a999b9f6b37ed5074df Mon Sep 17 00:00:00 2001 From: "Julian C. Dunn" <jdunn@getchef.com> Date: Sat, 1 Feb 2014 15:00:45 +0100 Subject: [PATCH 0176/1622] Install all virtio kernel modules --- packer/scripts/freebsd/vmtools.sh | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/packer/scripts/freebsd/vmtools.sh b/packer/scripts/freebsd/vmtools.sh index bac55c579..9a2f34e9b 100644 --- a/packer/scripts/freebsd/vmtools.sh +++ b/packer/scripts/freebsd/vmtools.sh @@ -20,6 +20,12 @@ if [ $PACKER_BUILDER_TYPE == 'virtualbox' ]; then echo 'vboxguest_enable="YES"' >> /etc/rc.conf echo 'vboxservice_enable="YES"' >> /etc/rc.conf + echo 'virtio_blk_load="YES"' >> /boot/loader.conf + if [ $freebsd_major -gt 9 ]; then + # Appeared in FreeBSD 10 + echo 'virtio_scsi_load="YES"' >> /boot/loader.conf + fi + echo 'virtio_balloon_load="YES"' >> /boot/loader.conf echo 'if_vtnet_load="YES"' >> /boot/loader.conf echo 'ifconfig_vtnet0_name="em0"' >> /etc/rc.conf From 09e5609c76ef7b7da77ef79ac25dd14e04c7c6ff Mon Sep 17 00:00:00 2001 From: Tristan Helmich <tristan.helmich@gmail.com> Date: Sat, 1 Feb 2014 16:18:28 +0100 Subject: [PATCH 0177/1622] Debian 7.3.0 support * updated iso url and checksum * Use new {virtualbox,vmware}-iso builder names (packer 0.5.0 change) --- packer/debian-7.3.0-amd64.json | 112 +++++++++++++++++++++++++++ packer/debian-7.3.0-i386.json | 112 +++++++++++++++++++++++++++ packer/http/debian-7.3.0/preseed.cfg | 48 ++++++++++++ 3 files changed, 272 insertions(+) create mode 100644 packer/debian-7.3.0-amd64.json create mode 100644 packer/debian-7.3.0-i386.json create mode 100644 packer/http/debian-7.3.0/preseed.cfg diff --git a/packer/debian-7.3.0-amd64.json b/packer/debian-7.3.0-amd64.json new file mode 100644 index 000000000..1b7c87094 --- /dev/null +++ b/packer/debian-7.3.0-amd64.json @@ -0,0 +1,112 @@ +{ + "variables": { + "chef_version": "provisionerless", + "mirror": "http://cdimage.debian.org/debian-cd" + }, + "builders": [ + { + "type": "virtualbox-iso", + "boot_command": [ + "<esc><wait>", + "install <wait>", + "preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/debian-7.3.0/preseed.cfg <wait>", + "debian-installer=en_US <wait>", + "auto <wait>", + "locale=en_US <wait>", + "kbd-chooser/method=us <wait>", + "keyboard-configuration/xkb-keymap=us <wait>", + "netcfg/get_hostname={{ .Name }} <wait>", + "netcfg/get_domain=vagrantup.com <wait>", + "fb=false <wait>", + "debconf/frontend=noninteractive <wait>", + "console-setup/ask_detect=false <wait>", + "console-keymaps-at/keymap=us <wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "guest_os_type": "Debian_64", + "http_directory": "http", + "iso_checksum": "5efcbf9f1b7b38915e86ff79be2157989e4e70e7", + "iso_checksum_type": "sha1", + "iso_url": "{{user `mirror`}}/7.3.0/amd64/iso-cd/debian-7.3.0-amd64-CD-1.iso", + "ssh_username": "vagrant", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_wait_timeout": "10000s", + "shutdown_command": "echo 'vagrant'|sudo -S /sbin/shutdown -hP now", + "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "virtualbox_version_file": ".vbox_version", + "vm_name": "packer-debian-7.3.0-amd64", + "output_directory": "packer-debian-7.3.0-amd64", + "vboxmanage": [ + [ "modifyvm", "{{.Name}}", "--memory", "384" ], + [ "modifyvm", "{{.Name}}", "--cpus", "1" ] + ] + }, + { + "type": "vmware-iso", + "boot_command": [ + "<esc><wait>", + "install <wait>", + "preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/debian-7.3.0/preseed.cfg <wait>", + "debian-installer=en_US <wait>", + "auto <wait>", + "locale=en_US <wait>", + "kbd-chooser/method=us <wait>", + "keyboard-configuration/xkb-keymap=us <wait>", + "netcfg/get_hostname={{ .Name }} <wait>", + "netcfg/get_domain=vagrantup.com <wait>", + "fb=false <wait>", + "debconf/frontend=noninteractive <wait>", + "console-setup/ask_detect=false <wait>", + "console-keymaps-at/keymap=us <wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "guest_os_type": "debian5-64", + "http_directory": "http", + "iso_checksum": "5efcbf9f1b7b38915e86ff79be2157989e4e70e7", + "iso_checksum_type": "sha1", + "iso_url": "{{user `mirror`}}/7.3.0/amd64/iso-cd/debian-7.3.0-amd64-CD-1.iso", + "ssh_username": "vagrant", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_wait_timeout": "10000s", + "shutdown_command": "echo 'vagrant'|sudo -S /sbin/shutdown -hP now", + "tools_upload_flavor": "linux", + "vm_name": "packer-debian-7.3.0-amd64", + "output_directory": "packer-debian-7.3.0-amd64", + "vmx_data": { + "memsize": "384", + "numvcpus": "1", + "cpuid.coresPerSocket": "1" + } + } + ], + "post-processors": [ + { + "type": "vagrant", + "output": "../builds/{{.Provider}}/opscode_debian-7.3.0_chef-{{user `chef_version`}}.box" + } + ], + "provisioners": [ + { + "execute_command": "echo 'vagrant' | {{.Vars}} sudo -E -S bash '{{.Path}}'", + "scripts": [ + "scripts/debian/update.sh", + "scripts/common/sshd.sh", + "scripts/debian/networking.sh", + "scripts/debian/sudoers.sh", + "scripts/common/vagrant.sh", + "scripts/common/vmtools.sh", + "scripts/common/chef.sh", + "scripts/debian/cleanup.sh", + "scripts/common/minimize.sh" + ], + "type": "shell", + "environment_vars": [ "CHEF_VERSION={{user `chef_version`}}" ] + } + ] +} diff --git a/packer/debian-7.3.0-i386.json b/packer/debian-7.3.0-i386.json new file mode 100644 index 000000000..0593c5faf --- /dev/null +++ b/packer/debian-7.3.0-i386.json @@ -0,0 +1,112 @@ +{ + "variables": { + "chef_version": "provisionerless", + "mirror": "http://cdimage.debian.org/debian-cd" + }, + "builders": [ + { + "type": "virtualbox-iso", + "boot_command": [ + "<esc><wait>", + "install <wait>", + "preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/debian-7.3.0/preseed.cfg <wait>", + "debian-installer=en_US <wait>", + "auto <wait>", + "locale=en_US <wait>", + "kbd-chooser/method=us <wait>", + "keyboard-configuration/xkb-keymap=us <wait>", + "netcfg/get_hostname={{ .Name }} <wait>", + "netcfg/get_domain=vagrantup.com <wait>", + "fb=false <wait>", + "debconf/frontend=noninteractive <wait>", + "console-setup/ask_detect=false <wait>", + "console-keymaps-at/keymap=us <wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "guest_os_type": "Debian", + "http_directory": "http", + "iso_checksum": "ed2d36bcf660f8f6d6ca7318f58ed2ba2f75160a", + "iso_checksum_type": "sha1", + "iso_url": "{{user `mirror`}}/7.3.0/i386/iso-cd/debian-7.3.0-i386-CD-1.iso", + "ssh_username": "vagrant", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_wait_timeout": "10000s", + "shutdown_command": "echo 'vagrant'|sudo -S /sbin/shutdown -hP now", + "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "virtualbox_version_file": ".vbox_version", + "vm_name": "packer-debian-7.3.0-i386", + "output_directory": "packer-debian-7.3.0-i386", + "vboxmanage": [ + [ "modifyvm", "{{.Name}}", "--memory", "384" ], + [ "modifyvm", "{{.Name}}", "--cpus", "1" ] + ] + }, + { + "type": "vmware-iso", + "boot_command": [ + "<esc><wait>", + "install <wait>", + "preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/debian-7.3.0/preseed.cfg <wait>", + "debian-installer=en_US <wait>", + "auto <wait>", + "locale=en_US <wait>", + "kbd-chooser/method=us <wait>", + "keyboard-configuration/xkb-keymap=us <wait>", + "netcfg/get_hostname={{ .Name }} <wait>", + "netcfg/get_domain=vagrantup.com <wait>", + "fb=false <wait>", + "debconf/frontend=noninteractive <wait>", + "console-setup/ask_detect=false <wait>", + "console-keymaps-at/keymap=us <wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "guest_os_type": "debian5", + "http_directory": "http", + "iso_checksum": "ed2d36bcf660f8f6d6ca7318f58ed2ba2f75160a", + "iso_checksum_type": "sha1", + "iso_url": "{{user `mirror`}}/7.3.0/i386/iso-cd/debian-7.3.0-i386-CD-1.iso", + "ssh_username": "vagrant", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_wait_timeout": "10000s", + "shutdown_command": "echo 'vagrant'|sudo -S /sbin/shutdown -hP now", + "tools_upload_flavor": "linux", + "vm_name": "packer-debian-7.3.0-i386", + "output_directory": "packer-debian-7.3.0-i386", + "vmx_data": { + "memsize": "384", + "numvcpus": "1", + "cpuid.coresPerSocket": "1" + } + } + ], + "post-processors": [ + { + "type": "vagrant", + "output": "../builds/{{.Provider}}/opscode_debian-7.3.0-i386_chef-{{user `chef_version`}}.box" + } + ], + "provisioners": [ + { + "execute_command": "echo 'vagrant' | {{.Vars}} sudo -E -S bash '{{.Path}}'", + "scripts": [ + "scripts/debian/update.sh", + "scripts/common/sshd.sh", + "scripts/debian/networking.sh", + "scripts/debian/sudoers.sh", + "scripts/common/vagrant.sh", + "scripts/common/vmtools.sh", + "scripts/common/chef.sh", + "scripts/debian/cleanup.sh", + "scripts/common/minimize.sh" + ], + "type": "shell", + "environment_vars": [ "CHEF_VERSION={{user `chef_version`}}" ] + } + ] +} diff --git a/packer/http/debian-7.3.0/preseed.cfg b/packer/http/debian-7.3.0/preseed.cfg new file mode 100644 index 000000000..ced8699d2 --- /dev/null +++ b/packer/http/debian-7.3.0/preseed.cfg @@ -0,0 +1,48 @@ +choose-mirror-bin mirror/http/proxy string +d-i apt-setup/use_mirror boolean true +d-i base-installer/kernel/override-image string linux-server +d-i clock-setup/utc boolean true +d-i clock-setup/utc-auto boolean true +d-i finish-install/reboot_in_progress note +d-i grub-installer/only_debian boolean true +d-i grub-installer/with_other_os boolean true +d-i keymap select us +d-i mirror/country string manual +d-i mirror/http/directory string /debian +d-i mirror/http/hostname string mirrors.kernel.org +d-i mirror/http/proxy string +d-i partman-auto-lvm/guided_size string max +d-i partman-auto/choose_recipe select atomic +d-i partman-auto/method string lvm +d-i partman-lvm/confirm boolean true +d-i partman-lvm/confirm boolean true +d-i partman-lvm/confirm_nooverwrite boolean true +d-i partman-lvm/device_remove_lvm boolean true +d-i partman/choose_partition select finish +d-i partman/confirm boolean true +d-i partman/confirm_nooverwrite boolean true +d-i partman/confirm_write_new_label boolean true +d-i passwd/root-login boolean false +d-i passwd/root-password-again password vagrant +d-i passwd/root-password password vagrant +d-i passwd/user-fullname string vagrant +d-i passwd/user-uid string 900 +d-i passwd/user-password password vagrant +d-i passwd/user-password-again password vagrant +d-i passwd/username string vagrant +d-i pkgsel/include string openssh-server sudo bzip2 acpid cryptsetup zlib1g-dev wget curl dkms make nfs-common +d-i pkgsel/install-language-support boolean false +d-i pkgsel/update-policy select unattended-upgrades +d-i pkgsel/upgrade select full-upgrade +# Prevent packaged version of VirtualBox Guest Additions being installed: +d-i preseed/early_command string sed -i \ + '/in-target/idiscover(){/sbin/discover|grep -v VirtualBox;}' \ + /usr/lib/pre-pkgsel.d/20install-hwpackages +d-i time/zone string UTC +d-i user-setup/allow-password-weak boolean true +d-i user-setup/encrypt-home boolean false +d-i preseed/late_command string sed -i '/^deb cdrom:/s/^/#/' /target/etc/apt/sources.list +apt-cdrom-setup apt-setup/cdrom/set-first boolean false +apt-mirror-setup apt-setup/use_mirror boolean true +popularity-contest popularity-contest/participate boolean false +tasksel tasksel/first multiselect standard, ubuntu-server From 8e6253635bd3c32d53e25aab19d8a69f10c3bcc3 Mon Sep 17 00:00:00 2001 From: Teemu Matilainen <teemu.matilainen@iki.fi> Date: Sat, 1 Feb 2014 13:29:47 -0300 Subject: [PATCH 0178/1622] Allow `packer_cache` to be symlink The trailing slash ignores only directories. --- .gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 39d25a216..557bfda4f 100644 --- a/.gitignore +++ b/.gitignore @@ -3,6 +3,6 @@ bin/ iso *.box virtualfloppy.vfd -packer_cache/ +packer_cache packer.log .DS_Store From bc90a3f60517d802c778726f072f0d1ec6f52e7d Mon Sep 17 00:00:00 2001 From: Teemu Matilainen <teemu.matilainen@iki.fi> Date: Sun, 9 Feb 2014 22:23:31 -0300 Subject: [PATCH 0179/1622] Use same preseed file for all Debian 7 releases The files were and most probably always should be identical. --- packer/debian-7.2.0-amd64.json | 4 +- packer/debian-7.2.0-i386.json | 4 +- packer/debian-7.3.0-amd64.json | 4 +- packer/debian-7.3.0-i386.json | 4 +- packer/http/debian-7.3.0/preseed.cfg | 48 ------------------- .../{debian-7.2.0 => debian-7}/preseed.cfg | 0 6 files changed, 8 insertions(+), 56 deletions(-) delete mode 100644 packer/http/debian-7.3.0/preseed.cfg rename packer/http/{debian-7.2.0 => debian-7}/preseed.cfg (100%) diff --git a/packer/debian-7.2.0-amd64.json b/packer/debian-7.2.0-amd64.json index e398380ec..5567a6980 100644 --- a/packer/debian-7.2.0-amd64.json +++ b/packer/debian-7.2.0-amd64.json @@ -4,7 +4,7 @@ "boot_command": [ "<esc><wait>", "install <wait>", - "preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/debian-7.2.0/preseed.cfg <wait>", + "preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/debian-7/preseed.cfg <wait>", "debian-installer=en_US <wait>", "auto <wait>", "locale=en_US <wait>", @@ -54,7 +54,7 @@ "boot_command": [ "<esc><wait>", "install <wait>", - "preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/debian-7.2.0/preseed.cfg <wait>", + "preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/debian-7/preseed.cfg <wait>", "debian-installer=en_US <wait>", "auto <wait>", "locale=en_US <wait>", diff --git a/packer/debian-7.2.0-i386.json b/packer/debian-7.2.0-i386.json index e4617d110..41ec55f63 100644 --- a/packer/debian-7.2.0-i386.json +++ b/packer/debian-7.2.0-i386.json @@ -4,7 +4,7 @@ "boot_command": [ "<esc><wait>", "install <wait>", - "preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/debian-7.2.0/preseed.cfg <wait>", + "preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/debian-7/preseed.cfg <wait>", "debian-installer=en_US <wait>", "auto <wait>", "locale=en_US <wait>", @@ -54,7 +54,7 @@ "boot_command": [ "<esc><wait>", "install <wait>", - "preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/debian-7.2.0/preseed.cfg <wait>", + "preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/debian-7/preseed.cfg <wait>", "debian-installer=en_US <wait>", "auto <wait>", "locale=en_US <wait>", diff --git a/packer/debian-7.3.0-amd64.json b/packer/debian-7.3.0-amd64.json index 1b7c87094..54b189b97 100644 --- a/packer/debian-7.3.0-amd64.json +++ b/packer/debian-7.3.0-amd64.json @@ -9,7 +9,7 @@ "boot_command": [ "<esc><wait>", "install <wait>", - "preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/debian-7.3.0/preseed.cfg <wait>", + "preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/debian-7/preseed.cfg <wait>", "debian-installer=en_US <wait>", "auto <wait>", "locale=en_US <wait>", @@ -49,7 +49,7 @@ "boot_command": [ "<esc><wait>", "install <wait>", - "preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/debian-7.3.0/preseed.cfg <wait>", + "preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/debian-7/preseed.cfg <wait>", "debian-installer=en_US <wait>", "auto <wait>", "locale=en_US <wait>", diff --git a/packer/debian-7.3.0-i386.json b/packer/debian-7.3.0-i386.json index 0593c5faf..2fc8cc1a6 100644 --- a/packer/debian-7.3.0-i386.json +++ b/packer/debian-7.3.0-i386.json @@ -9,7 +9,7 @@ "boot_command": [ "<esc><wait>", "install <wait>", - "preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/debian-7.3.0/preseed.cfg <wait>", + "preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/debian-7/preseed.cfg <wait>", "debian-installer=en_US <wait>", "auto <wait>", "locale=en_US <wait>", @@ -49,7 +49,7 @@ "boot_command": [ "<esc><wait>", "install <wait>", - "preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/debian-7.3.0/preseed.cfg <wait>", + "preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/debian-7/preseed.cfg <wait>", "debian-installer=en_US <wait>", "auto <wait>", "locale=en_US <wait>", diff --git a/packer/http/debian-7.3.0/preseed.cfg b/packer/http/debian-7.3.0/preseed.cfg deleted file mode 100644 index ced8699d2..000000000 --- a/packer/http/debian-7.3.0/preseed.cfg +++ /dev/null @@ -1,48 +0,0 @@ -choose-mirror-bin mirror/http/proxy string -d-i apt-setup/use_mirror boolean true -d-i base-installer/kernel/override-image string linux-server -d-i clock-setup/utc boolean true -d-i clock-setup/utc-auto boolean true -d-i finish-install/reboot_in_progress note -d-i grub-installer/only_debian boolean true -d-i grub-installer/with_other_os boolean true -d-i keymap select us -d-i mirror/country string manual -d-i mirror/http/directory string /debian -d-i mirror/http/hostname string mirrors.kernel.org -d-i mirror/http/proxy string -d-i partman-auto-lvm/guided_size string max -d-i partman-auto/choose_recipe select atomic -d-i partman-auto/method string lvm -d-i partman-lvm/confirm boolean true -d-i partman-lvm/confirm boolean true -d-i partman-lvm/confirm_nooverwrite boolean true -d-i partman-lvm/device_remove_lvm boolean true -d-i partman/choose_partition select finish -d-i partman/confirm boolean true -d-i partman/confirm_nooverwrite boolean true -d-i partman/confirm_write_new_label boolean true -d-i passwd/root-login boolean false -d-i passwd/root-password-again password vagrant -d-i passwd/root-password password vagrant -d-i passwd/user-fullname string vagrant -d-i passwd/user-uid string 900 -d-i passwd/user-password password vagrant -d-i passwd/user-password-again password vagrant -d-i passwd/username string vagrant -d-i pkgsel/include string openssh-server sudo bzip2 acpid cryptsetup zlib1g-dev wget curl dkms make nfs-common -d-i pkgsel/install-language-support boolean false -d-i pkgsel/update-policy select unattended-upgrades -d-i pkgsel/upgrade select full-upgrade -# Prevent packaged version of VirtualBox Guest Additions being installed: -d-i preseed/early_command string sed -i \ - '/in-target/idiscover(){/sbin/discover|grep -v VirtualBox;}' \ - /usr/lib/pre-pkgsel.d/20install-hwpackages -d-i time/zone string UTC -d-i user-setup/allow-password-weak boolean true -d-i user-setup/encrypt-home boolean false -d-i preseed/late_command string sed -i '/^deb cdrom:/s/^/#/' /target/etc/apt/sources.list -apt-cdrom-setup apt-setup/cdrom/set-first boolean false -apt-mirror-setup apt-setup/use_mirror boolean true -popularity-contest popularity-contest/participate boolean false -tasksel tasksel/first multiselect standard, ubuntu-server diff --git a/packer/http/debian-7.2.0/preseed.cfg b/packer/http/debian-7/preseed.cfg similarity index 100% rename from packer/http/debian-7.2.0/preseed.cfg rename to packer/http/debian-7/preseed.cfg From d58fe824107560f4c0f68f53fc44004cf1b2a7e0 Mon Sep 17 00:00:00 2001 From: Teemu Matilainen <teemu.matilainen@iki.fi> Date: Sun, 9 Feb 2014 22:02:21 -0300 Subject: [PATCH 0180/1622] Add packer templates for Debian 7.4 --- packer/debian-7.4.0-amd64.json | 112 +++++++++++++++++++++++++++++++++ packer/debian-7.4.0-i386.json | 112 +++++++++++++++++++++++++++++++++ 2 files changed, 224 insertions(+) create mode 100644 packer/debian-7.4.0-amd64.json create mode 100644 packer/debian-7.4.0-i386.json diff --git a/packer/debian-7.4.0-amd64.json b/packer/debian-7.4.0-amd64.json new file mode 100644 index 000000000..0fdb59263 --- /dev/null +++ b/packer/debian-7.4.0-amd64.json @@ -0,0 +1,112 @@ +{ + "variables": { + "chef_version": "provisionerless", + "mirror": "http://cdimage.debian.org/debian-cd" + }, + "builders": [ + { + "type": "virtualbox-iso", + "boot_command": [ + "<esc><wait>", + "install <wait>", + "preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/debian-7/preseed.cfg <wait>", + "debian-installer=en_US <wait>", + "auto <wait>", + "locale=en_US <wait>", + "kbd-chooser/method=us <wait>", + "keyboard-configuration/xkb-keymap=us <wait>", + "netcfg/get_hostname={{ .Name }} <wait>", + "netcfg/get_domain=vagrantup.com <wait>", + "fb=false <wait>", + "debconf/frontend=noninteractive <wait>", + "console-setup/ask_detect=false <wait>", + "console-keymaps-at/keymap=us <wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "guest_os_type": "Debian_64", + "http_directory": "http", + "iso_checksum": "d68c40dfdca601f912c0f1ae991cdb439d1c572e", + "iso_checksum_type": "sha1", + "iso_url": "{{user `mirror`}}/7.4.0/amd64/iso-cd/debian-7.4.0-amd64-CD-1.iso", + "ssh_username": "vagrant", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_wait_timeout": "10000s", + "shutdown_command": "echo 'vagrant'|sudo -S /sbin/shutdown -hP now", + "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "virtualbox_version_file": ".vbox_version", + "vm_name": "packer-debian-7.4.0-amd64", + "output_directory": "packer-debian-7.4.0-amd64", + "vboxmanage": [ + [ "modifyvm", "{{.Name}}", "--memory", "384" ], + [ "modifyvm", "{{.Name}}", "--cpus", "1" ] + ] + }, + { + "type": "vmware-iso", + "boot_command": [ + "<esc><wait>", + "install <wait>", + "preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/debian-7/preseed.cfg <wait>", + "debian-installer=en_US <wait>", + "auto <wait>", + "locale=en_US <wait>", + "kbd-chooser/method=us <wait>", + "keyboard-configuration/xkb-keymap=us <wait>", + "netcfg/get_hostname={{ .Name }} <wait>", + "netcfg/get_domain=vagrantup.com <wait>", + "fb=false <wait>", + "debconf/frontend=noninteractive <wait>", + "console-setup/ask_detect=false <wait>", + "console-keymaps-at/keymap=us <wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "guest_os_type": "debian5-64", + "http_directory": "http", + "iso_checksum": "d68c40dfdca601f912c0f1ae991cdb439d1c572e", + "iso_checksum_type": "sha1", + "iso_url": "{{user `mirror`}}/7.4.0/amd64/iso-cd/debian-7.4.0-amd64-CD-1.iso", + "ssh_username": "vagrant", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_wait_timeout": "10000s", + "shutdown_command": "echo 'vagrant'|sudo -S /sbin/shutdown -hP now", + "tools_upload_flavor": "linux", + "vm_name": "packer-debian-7.4.0-amd64", + "output_directory": "packer-debian-7.4.0-amd64", + "vmx_data": { + "memsize": "384", + "numvcpus": "1", + "cpuid.coresPerSocket": "1" + } + } + ], + "post-processors": [ + { + "type": "vagrant", + "output": "../builds/{{.Provider}}/opscode_debian-7.4.0_chef-{{user `chef_version`}}.box" + } + ], + "provisioners": [ + { + "execute_command": "echo 'vagrant' | {{.Vars}} sudo -E -S bash '{{.Path}}'", + "scripts": [ + "scripts/debian/update.sh", + "scripts/common/sshd.sh", + "scripts/debian/networking.sh", + "scripts/debian/sudoers.sh", + "scripts/common/vagrant.sh", + "scripts/common/vmtools.sh", + "scripts/common/chef.sh", + "scripts/debian/cleanup.sh", + "scripts/common/minimize.sh" + ], + "type": "shell", + "environment_vars": [ "CHEF_VERSION={{user `chef_version`}}" ] + } + ] +} diff --git a/packer/debian-7.4.0-i386.json b/packer/debian-7.4.0-i386.json new file mode 100644 index 000000000..60c1712ca --- /dev/null +++ b/packer/debian-7.4.0-i386.json @@ -0,0 +1,112 @@ +{ + "variables": { + "chef_version": "provisionerless", + "mirror": "http://cdimage.debian.org/debian-cd" + }, + "builders": [ + { + "type": "virtualbox-iso", + "boot_command": [ + "<esc><wait>", + "install <wait>", + "preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/debian-7/preseed.cfg <wait>", + "debian-installer=en_US <wait>", + "auto <wait>", + "locale=en_US <wait>", + "kbd-chooser/method=us <wait>", + "keyboard-configuration/xkb-keymap=us <wait>", + "netcfg/get_hostname={{ .Name }} <wait>", + "netcfg/get_domain=vagrantup.com <wait>", + "fb=false <wait>", + "debconf/frontend=noninteractive <wait>", + "console-setup/ask_detect=false <wait>", + "console-keymaps-at/keymap=us <wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "guest_os_type": "Debian", + "http_directory": "http", + "iso_checksum": "b6daf1584bf9e7748ebd160b09745984c244c3bb", + "iso_checksum_type": "sha1", + "iso_url": "{{user `mirror`}}/7.4.0/i386/iso-cd/debian-7.4.0-i386-CD-1.iso", + "ssh_username": "vagrant", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_wait_timeout": "10000s", + "shutdown_command": "echo 'vagrant'|sudo -S /sbin/shutdown -hP now", + "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "virtualbox_version_file": ".vbox_version", + "vm_name": "packer-debian-7.4.0-i386", + "output_directory": "packer-debian-7.4.0-i386", + "vboxmanage": [ + [ "modifyvm", "{{.Name}}", "--memory", "384" ], + [ "modifyvm", "{{.Name}}", "--cpus", "1" ] + ] + }, + { + "type": "vmware-iso", + "boot_command": [ + "<esc><wait>", + "install <wait>", + "preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/debian-7/preseed.cfg <wait>", + "debian-installer=en_US <wait>", + "auto <wait>", + "locale=en_US <wait>", + "kbd-chooser/method=us <wait>", + "keyboard-configuration/xkb-keymap=us <wait>", + "netcfg/get_hostname={{ .Name }} <wait>", + "netcfg/get_domain=vagrantup.com <wait>", + "fb=false <wait>", + "debconf/frontend=noninteractive <wait>", + "console-setup/ask_detect=false <wait>", + "console-keymaps-at/keymap=us <wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "guest_os_type": "debian5", + "http_directory": "http", + "iso_checksum": "b6daf1584bf9e7748ebd160b09745984c244c3bb", + "iso_checksum_type": "sha1", + "iso_url": "{{user `mirror`}}/7.4.0/i386/iso-cd/debian-7.4.0-i386-CD-1.iso", + "ssh_username": "vagrant", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_wait_timeout": "10000s", + "shutdown_command": "echo 'vagrant'|sudo -S /sbin/shutdown -hP now", + "tools_upload_flavor": "linux", + "vm_name": "packer-debian-7.4.0-i386", + "output_directory": "packer-debian-7.4.0-i386", + "vmx_data": { + "memsize": "384", + "numvcpus": "1", + "cpuid.coresPerSocket": "1" + } + } + ], + "post-processors": [ + { + "type": "vagrant", + "output": "../builds/{{.Provider}}/opscode_debian-7.4.0-i386_chef-{{user `chef_version`}}.box" + } + ], + "provisioners": [ + { + "execute_command": "echo 'vagrant' | {{.Vars}} sudo -E -S bash '{{.Path}}'", + "scripts": [ + "scripts/debian/update.sh", + "scripts/common/sshd.sh", + "scripts/debian/networking.sh", + "scripts/debian/sudoers.sh", + "scripts/common/vagrant.sh", + "scripts/common/vmtools.sh", + "scripts/common/chef.sh", + "scripts/debian/cleanup.sh", + "scripts/common/minimize.sh" + ], + "type": "shell", + "environment_vars": [ "CHEF_VERSION={{user `chef_version`}}" ] + } + ] +} From c28b4266af9be730ba506ac2c70e19c52e8b9bc9 Mon Sep 17 00:00:00 2001 From: Teemu Matilainen <teemu.matilainen@iki.fi> Date: Sun, 9 Feb 2014 22:11:37 -0300 Subject: [PATCH 0181/1622] Update Debian 7.2 and 7.3 default mirror URLs They are now archived after Debian 7.4 release. --- packer/debian-7.2.0-amd64.json | 2 +- packer/debian-7.2.0-i386.json | 2 +- packer/debian-7.3.0-amd64.json | 2 +- packer/debian-7.3.0-i386.json | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/packer/debian-7.2.0-amd64.json b/packer/debian-7.2.0-amd64.json index 5567a6980..888af6956 100644 --- a/packer/debian-7.2.0-amd64.json +++ b/packer/debian-7.2.0-amd64.json @@ -119,7 +119,7 @@ ], "variables": { "chef_version": "provisionerless", - "mirror": "http://cdimage.debian.org/debian-cd" + "mirror": "http://cdimage.debian.org/cdimage/archive" } } diff --git a/packer/debian-7.2.0-i386.json b/packer/debian-7.2.0-i386.json index 41ec55f63..fa4dc0c75 100644 --- a/packer/debian-7.2.0-i386.json +++ b/packer/debian-7.2.0-i386.json @@ -119,7 +119,7 @@ ], "variables": { "chef_version": "provisionerless", - "mirror": "http://cdimage.debian.org/debian-cd" + "mirror": "http://cdimage.debian.org/cdimage/archive" } } diff --git a/packer/debian-7.3.0-amd64.json b/packer/debian-7.3.0-amd64.json index 54b189b97..36bc9cc47 100644 --- a/packer/debian-7.3.0-amd64.json +++ b/packer/debian-7.3.0-amd64.json @@ -1,7 +1,7 @@ { "variables": { "chef_version": "provisionerless", - "mirror": "http://cdimage.debian.org/debian-cd" + "mirror": "http://cdimage.debian.org/cdimage/archive" }, "builders": [ { diff --git a/packer/debian-7.3.0-i386.json b/packer/debian-7.3.0-i386.json index 2fc8cc1a6..3276c5540 100644 --- a/packer/debian-7.3.0-i386.json +++ b/packer/debian-7.3.0-i386.json @@ -1,7 +1,7 @@ { "variables": { "chef_version": "provisionerless", - "mirror": "http://cdimage.debian.org/debian-cd" + "mirror": "http://cdimage.debian.org/cdimage/archive" }, "builders": [ { From e294adf702e3ad1e8d9a75b8418e437305fa8e96 Mon Sep 17 00:00:00 2001 From: Teemu Matilainen <teemu.matilainen@iki.fi> Date: Sun, 9 Feb 2014 22:40:10 -0300 Subject: [PATCH 0182/1622] Fix DHCP lease directory name in Debian Both Debian 6.0 and 7 use /var/lib/dhcp instead of dhcp3. --- packer/scripts/debian/networking.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packer/scripts/debian/networking.sh b/packer/scripts/debian/networking.sh index de3269a58..caa4be08f 100644 --- a/packer/scripts/debian/networking.sh +++ b/packer/scripts/debian/networking.sh @@ -3,5 +3,5 @@ rm /etc/udev/rules.d/70-persistent-net.rules mkdir /etc/udev/rules.d/70-persistent-net.rules rm /lib/udev/rules.d/75-persistent-net-generator.rules -rm -rf /dev/.udev/ /var/lib/dhcp3/* +rm -rf /dev/.udev/ /var/lib/dhcp/* echo "pre-up sleep 2" >> /etc/network/interfaces From 7d1716b82f42b9ef2cb40c612606bbb9de1b4b14 Mon Sep 17 00:00:00 2001 From: Teemu Matilainen <teemu.matilainen@iki.fi> Date: Sun, 9 Feb 2014 22:57:11 -0300 Subject: [PATCH 0183/1622] Use sudoers.d in Debian Debian 6.0+ have sudoers.d enabled by default. Use it so that the provisioners (like Chef) don't need to agree on using "sudo" group, or know anything about "vagrant" user if it manages the /etc/sudoers file. --- packer/scripts/debian/sudoers.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/packer/scripts/debian/sudoers.sh b/packer/scripts/debian/sudoers.sh index 3fdfb5418..38d767088 100644 --- a/packer/scripts/debian/sudoers.sh +++ b/packer/scripts/debian/sudoers.sh @@ -1,7 +1,9 @@ #!/bin/bash -eux -# Only add the secure path line if it is not already present - Debian 7.1.0 +# Only add the secure path line if it is not already present - Debian 7 # includes it by default. grep -q 'secure_path' /etc/sudoers || sed -i -e '/Defaults\s\+env_reset/a Defaults\tsecure_path="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"' /etc/sudoers -sed -i -e 's/^%sudo.*/%sudo ALL=(ALL) NOPASSWD: ALL/' /etc/sudoers +# Set up password-less sudo for the vagrant user +echo 'vagrant ALL=(ALL) NOPASSWD:ALL' > /etc/sudoers.d/99_vagrant +chmod 440 /etc/sudoers.d/99_vagrant From 1da291b41088d9c8e74103a8e86f2981ead10e51 Mon Sep 17 00:00:00 2001 From: Teemu Matilainen <teemu.matilainen@iki.fi> Date: Mon, 10 Feb 2014 01:12:25 -0300 Subject: [PATCH 0184/1622] Use builder specific output directories also for Debian 7.3 and 7.4 --- packer/debian-7.3.0-amd64.json | 4 ++-- packer/debian-7.3.0-i386.json | 4 ++-- packer/debian-7.4.0-amd64.json | 4 ++-- packer/debian-7.4.0-i386.json | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/packer/debian-7.3.0-amd64.json b/packer/debian-7.3.0-amd64.json index 36bc9cc47..600481fe5 100644 --- a/packer/debian-7.3.0-amd64.json +++ b/packer/debian-7.3.0-amd64.json @@ -38,7 +38,7 @@ "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "virtualbox_version_file": ".vbox_version", "vm_name": "packer-debian-7.3.0-amd64", - "output_directory": "packer-debian-7.3.0-amd64", + "output_directory": "packer-debian-7.3.0-amd64-virtualbox", "vboxmanage": [ [ "modifyvm", "{{.Name}}", "--memory", "384" ], [ "modifyvm", "{{.Name}}", "--cpus", "1" ] @@ -77,7 +77,7 @@ "shutdown_command": "echo 'vagrant'|sudo -S /sbin/shutdown -hP now", "tools_upload_flavor": "linux", "vm_name": "packer-debian-7.3.0-amd64", - "output_directory": "packer-debian-7.3.0-amd64", + "output_directory": "packer-debian-7.3.0-amd64-vmware", "vmx_data": { "memsize": "384", "numvcpus": "1", diff --git a/packer/debian-7.3.0-i386.json b/packer/debian-7.3.0-i386.json index 3276c5540..d12e99630 100644 --- a/packer/debian-7.3.0-i386.json +++ b/packer/debian-7.3.0-i386.json @@ -38,7 +38,7 @@ "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "virtualbox_version_file": ".vbox_version", "vm_name": "packer-debian-7.3.0-i386", - "output_directory": "packer-debian-7.3.0-i386", + "output_directory": "packer-debian-7.3.0-i386-virtualbox", "vboxmanage": [ [ "modifyvm", "{{.Name}}", "--memory", "384" ], [ "modifyvm", "{{.Name}}", "--cpus", "1" ] @@ -77,7 +77,7 @@ "shutdown_command": "echo 'vagrant'|sudo -S /sbin/shutdown -hP now", "tools_upload_flavor": "linux", "vm_name": "packer-debian-7.3.0-i386", - "output_directory": "packer-debian-7.3.0-i386", + "output_directory": "packer-debian-7.3.0-i386-vmware", "vmx_data": { "memsize": "384", "numvcpus": "1", diff --git a/packer/debian-7.4.0-amd64.json b/packer/debian-7.4.0-amd64.json index 0fdb59263..8174501ec 100644 --- a/packer/debian-7.4.0-amd64.json +++ b/packer/debian-7.4.0-amd64.json @@ -38,7 +38,7 @@ "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "virtualbox_version_file": ".vbox_version", "vm_name": "packer-debian-7.4.0-amd64", - "output_directory": "packer-debian-7.4.0-amd64", + "output_directory": "packer-debian-7.4.0-amd64-virtualbox", "vboxmanage": [ [ "modifyvm", "{{.Name}}", "--memory", "384" ], [ "modifyvm", "{{.Name}}", "--cpus", "1" ] @@ -77,7 +77,7 @@ "shutdown_command": "echo 'vagrant'|sudo -S /sbin/shutdown -hP now", "tools_upload_flavor": "linux", "vm_name": "packer-debian-7.4.0-amd64", - "output_directory": "packer-debian-7.4.0-amd64", + "output_directory": "packer-debian-7.4.0-amd64-vmware", "vmx_data": { "memsize": "384", "numvcpus": "1", diff --git a/packer/debian-7.4.0-i386.json b/packer/debian-7.4.0-i386.json index 60c1712ca..4d7092a45 100644 --- a/packer/debian-7.4.0-i386.json +++ b/packer/debian-7.4.0-i386.json @@ -38,7 +38,7 @@ "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "virtualbox_version_file": ".vbox_version", "vm_name": "packer-debian-7.4.0-i386", - "output_directory": "packer-debian-7.4.0-i386", + "output_directory": "packer-debian-7.4.0-i386-virtualbox", "vboxmanage": [ [ "modifyvm", "{{.Name}}", "--memory", "384" ], [ "modifyvm", "{{.Name}}", "--cpus", "1" ] @@ -77,7 +77,7 @@ "shutdown_command": "echo 'vagrant'|sudo -S /sbin/shutdown -hP now", "tools_upload_flavor": "linux", "vm_name": "packer-debian-7.4.0-i386", - "output_directory": "packer-debian-7.4.0-i386", + "output_directory": "packer-debian-7.4.0-i386-vmware", "vmx_data": { "memsize": "384", "numvcpus": "1", From b30526e71099acbbbe9e462ceefee6531c5fea35 Mon Sep 17 00:00:00 2001 From: Robert Coleman <github@robert.net.nz> Date: Mon, 10 Feb 2014 18:06:34 +1300 Subject: [PATCH 0185/1622] BENTO-112 add single-request-reopen to resolv.conf --- packer/scripts/centos/ks.cfg | 1 + 1 file changed, 1 insertion(+) diff --git a/packer/scripts/centos/ks.cfg b/packer/scripts/centos/ks.cfg index 8945775ba..81c9f2f98 100644 --- a/packer/scripts/centos/ks.cfg +++ b/packer/scripts/centos/ks.cfg @@ -39,3 +39,4 @@ echo "vagrant" | passwd --stdin vagrant # sudo echo "vagrant ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers sed -i "s/^.*requiretty/#Defaults requiretty/" /etc/sudoers +echo "options single-request-reopen" >> /etc/resolv.conf From 3440f08acc799011f50e58db8d58927327bc5f9f Mon Sep 17 00:00:00 2001 From: Teemu Matilainen <teemu.matilainen@iki.fi> Date: Mon, 10 Feb 2014 19:24:10 -0300 Subject: [PATCH 0186/1622] Remove old Debian 7 update releases --- packer/debian-7.2.0-amd64.json | 125 --------------------------------- packer/debian-7.2.0-i386.json | 125 --------------------------------- packer/debian-7.3.0-amd64.json | 112 ----------------------------- packer/debian-7.3.0-i386.json | 112 ----------------------------- 4 files changed, 474 deletions(-) delete mode 100644 packer/debian-7.2.0-amd64.json delete mode 100644 packer/debian-7.2.0-i386.json delete mode 100644 packer/debian-7.3.0-amd64.json delete mode 100644 packer/debian-7.3.0-i386.json diff --git a/packer/debian-7.2.0-amd64.json b/packer/debian-7.2.0-amd64.json deleted file mode 100644 index 888af6956..000000000 --- a/packer/debian-7.2.0-amd64.json +++ /dev/null @@ -1,125 +0,0 @@ -{ - "builders": [ - { - "boot_command": [ - "<esc><wait>", - "install <wait>", - "preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/debian-7/preseed.cfg <wait>", - "debian-installer=en_US <wait>", - "auto <wait>", - "locale=en_US <wait>", - "kbd-chooser/method=us <wait>", - "keyboard-configuration/xkb-keymap=us <wait>", - "netcfg/get_hostname={{ .Name }} <wait>", - "netcfg/get_domain=vagrantup.com <wait>", - "fb=false <wait>", - "debconf/frontend=noninteractive <wait>", - "console-setup/ask_detect=false <wait>", - "console-keymaps-at/keymap=us <wait>", - "<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": 40960, - "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", - "guest_os_type": "Debian_64", - "http_directory": "http", - "iso_checksum": "c7c1e2bf7ec4760b9fecf77fefa6062b73330359", - "iso_checksum_type": "sha1", - "iso_url": "{{user `mirror`}}/7.2.0/amd64/iso-cd/debian-7.2.0-amd64-CD-1.iso", - "output_directory": "packer-debian-7.2.0-amd64-virtualbox", - "shutdown_command": "echo 'vagrant'|sudo -S /sbin/shutdown -hP now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "virtualbox-iso", - "vboxmanage": [ - [ - "modifyvm", - "{{.Name}}", - "--memory", - "384" - ], - [ - "modifyvm", - "{{.Name}}", - "--cpus", - "1" - ] - ], - "virtualbox_version_file": ".vbox_version", - "vm_name": "packer-debian-7.2.0-amd64" - }, - { - "boot_command": [ - "<esc><wait>", - "install <wait>", - "preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/debian-7/preseed.cfg <wait>", - "debian-installer=en_US <wait>", - "auto <wait>", - "locale=en_US <wait>", - "kbd-chooser/method=us <wait>", - "keyboard-configuration/xkb-keymap=us <wait>", - "netcfg/get_hostname={{ .Name }} <wait>", - "netcfg/get_domain=vagrantup.com <wait>", - "fb=false <wait>", - "debconf/frontend=noninteractive <wait>", - "console-setup/ask_detect=false <wait>", - "console-keymaps-at/keymap=us <wait>", - "<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": 40960, - "guest_os_type": "debian5-64", - "http_directory": "http", - "iso_checksum": "c7c1e2bf7ec4760b9fecf77fefa6062b73330359", - "iso_checksum_type": "sha1", - "iso_url": "{{user `mirror`}}/7.2.0/amd64/iso-cd/debian-7.2.0-amd64-CD-1.iso", - "output_directory": "packer-debian-7.2.0-amd64-vmware", - "shutdown_command": "echo 'vagrant'|sudo -S /sbin/shutdown -hP now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "tools_upload_flavor": "linux", - "type": "vmware-iso", - "vm_name": "packer-debian-7.2.0-amd64", - "vmx_data": { - "cpuid.coresPerSocket": "1", - "memsize": "384", - "numvcpus": "1" - } - } - ], - "post-processors": [ - { - "output": "../builds/{{.Provider}}/opscode_debian-7.2.0_chef-{{user `chef_version`}}.box", - "type": "vagrant" - } - ], - "provisioners": [ - { - "environment_vars": [ - "CHEF_VERSION={{user `chef_version`}}" - ], - "execute_command": "echo 'vagrant' | {{.Vars}} sudo -E -S bash '{{.Path}}'", - "scripts": [ - "scripts/debian/update.sh", - "scripts/common/sshd.sh", - "scripts/debian/networking.sh", - "scripts/debian/sudoers.sh", - "scripts/common/vagrant.sh", - "scripts/common/vmtools.sh", - "scripts/common/chef.sh", - "scripts/debian/cleanup.sh", - "scripts/common/minimize.sh" - ], - "type": "shell" - } - ], - "variables": { - "chef_version": "provisionerless", - "mirror": "http://cdimage.debian.org/cdimage/archive" - } -} - diff --git a/packer/debian-7.2.0-i386.json b/packer/debian-7.2.0-i386.json deleted file mode 100644 index fa4dc0c75..000000000 --- a/packer/debian-7.2.0-i386.json +++ /dev/null @@ -1,125 +0,0 @@ -{ - "builders": [ - { - "boot_command": [ - "<esc><wait>", - "install <wait>", - "preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/debian-7/preseed.cfg <wait>", - "debian-installer=en_US <wait>", - "auto <wait>", - "locale=en_US <wait>", - "kbd-chooser/method=us <wait>", - "keyboard-configuration/xkb-keymap=us <wait>", - "netcfg/get_hostname={{ .Name }} <wait>", - "netcfg/get_domain=vagrantup.com <wait>", - "fb=false <wait>", - "debconf/frontend=noninteractive <wait>", - "console-setup/ask_detect=false <wait>", - "console-keymaps-at/keymap=us <wait>", - "<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": 40960, - "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", - "guest_os_type": "Debian", - "http_directory": "http", - "iso_checksum": "011d42505fdafeb9be2bd0379a12d4042f24cfd5", - "iso_checksum_type": "sha1", - "iso_url": "{{user `mirror`}}/7.2.0/i386/iso-cd/debian-7.2.0-i386-CD-1.iso", - "output_directory": "packer-debian-7.2.0-i386-virtualbox", - "shutdown_command": "echo 'vagrant'|sudo -S /sbin/shutdown -hP now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "virtualbox-iso", - "vboxmanage": [ - [ - "modifyvm", - "{{.Name}}", - "--memory", - "384" - ], - [ - "modifyvm", - "{{.Name}}", - "--cpus", - "1" - ] - ], - "virtualbox_version_file": ".vbox_version", - "vm_name": "packer-debian-7.2.0-i386" - }, - { - "boot_command": [ - "<esc><wait>", - "install <wait>", - "preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/debian-7/preseed.cfg <wait>", - "debian-installer=en_US <wait>", - "auto <wait>", - "locale=en_US <wait>", - "kbd-chooser/method=us <wait>", - "keyboard-configuration/xkb-keymap=us <wait>", - "netcfg/get_hostname={{ .Name }} <wait>", - "netcfg/get_domain=vagrantup.com <wait>", - "fb=false <wait>", - "debconf/frontend=noninteractive <wait>", - "console-setup/ask_detect=false <wait>", - "console-keymaps-at/keymap=us <wait>", - "<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": 40960, - "guest_os_type": "debian5", - "http_directory": "http", - "iso_checksum": "011d42505fdafeb9be2bd0379a12d4042f24cfd5", - "iso_checksum_type": "sha1", - "iso_url": "{{user `mirror`}}/7.2.0/i386/iso-cd/debian-7.2.0-i386-CD-1.iso", - "output_directory": "packer-debian-7.2.0-i386-vmware", - "shutdown_command": "echo 'vagrant'|sudo -S /sbin/shutdown -hP now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "tools_upload_flavor": "linux", - "type": "vmware-iso", - "vm_name": "packer-debian-7.2.0-i386", - "vmx_data": { - "cpuid.coresPerSocket": "1", - "memsize": "384", - "numvcpus": "1" - } - } - ], - "post-processors": [ - { - "output": "../builds/{{.Provider}}/opscode_debian-7.2.0-i386_chef-{{user `chef_version`}}.box", - "type": "vagrant" - } - ], - "provisioners": [ - { - "environment_vars": [ - "CHEF_VERSION={{user `chef_version`}}" - ], - "execute_command": "echo 'vagrant' | {{.Vars}} sudo -E -S bash '{{.Path}}'", - "scripts": [ - "scripts/debian/update.sh", - "scripts/common/sshd.sh", - "scripts/debian/networking.sh", - "scripts/debian/sudoers.sh", - "scripts/common/vagrant.sh", - "scripts/common/vmtools.sh", - "scripts/common/chef.sh", - "scripts/debian/cleanup.sh", - "scripts/common/minimize.sh" - ], - "type": "shell" - } - ], - "variables": { - "chef_version": "provisionerless", - "mirror": "http://cdimage.debian.org/cdimage/archive" - } -} - diff --git a/packer/debian-7.3.0-amd64.json b/packer/debian-7.3.0-amd64.json deleted file mode 100644 index 600481fe5..000000000 --- a/packer/debian-7.3.0-amd64.json +++ /dev/null @@ -1,112 +0,0 @@ -{ - "variables": { - "chef_version": "provisionerless", - "mirror": "http://cdimage.debian.org/cdimage/archive" - }, - "builders": [ - { - "type": "virtualbox-iso", - "boot_command": [ - "<esc><wait>", - "install <wait>", - "preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/debian-7/preseed.cfg <wait>", - "debian-installer=en_US <wait>", - "auto <wait>", - "locale=en_US <wait>", - "kbd-chooser/method=us <wait>", - "keyboard-configuration/xkb-keymap=us <wait>", - "netcfg/get_hostname={{ .Name }} <wait>", - "netcfg/get_domain=vagrantup.com <wait>", - "fb=false <wait>", - "debconf/frontend=noninteractive <wait>", - "console-setup/ask_detect=false <wait>", - "console-keymaps-at/keymap=us <wait>", - "<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": 40960, - "guest_os_type": "Debian_64", - "http_directory": "http", - "iso_checksum": "5efcbf9f1b7b38915e86ff79be2157989e4e70e7", - "iso_checksum_type": "sha1", - "iso_url": "{{user `mirror`}}/7.3.0/amd64/iso-cd/debian-7.3.0-amd64-CD-1.iso", - "ssh_username": "vagrant", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_wait_timeout": "10000s", - "shutdown_command": "echo 'vagrant'|sudo -S /sbin/shutdown -hP now", - "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", - "virtualbox_version_file": ".vbox_version", - "vm_name": "packer-debian-7.3.0-amd64", - "output_directory": "packer-debian-7.3.0-amd64-virtualbox", - "vboxmanage": [ - [ "modifyvm", "{{.Name}}", "--memory", "384" ], - [ "modifyvm", "{{.Name}}", "--cpus", "1" ] - ] - }, - { - "type": "vmware-iso", - "boot_command": [ - "<esc><wait>", - "install <wait>", - "preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/debian-7/preseed.cfg <wait>", - "debian-installer=en_US <wait>", - "auto <wait>", - "locale=en_US <wait>", - "kbd-chooser/method=us <wait>", - "keyboard-configuration/xkb-keymap=us <wait>", - "netcfg/get_hostname={{ .Name }} <wait>", - "netcfg/get_domain=vagrantup.com <wait>", - "fb=false <wait>", - "debconf/frontend=noninteractive <wait>", - "console-setup/ask_detect=false <wait>", - "console-keymaps-at/keymap=us <wait>", - "<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": 40960, - "guest_os_type": "debian5-64", - "http_directory": "http", - "iso_checksum": "5efcbf9f1b7b38915e86ff79be2157989e4e70e7", - "iso_checksum_type": "sha1", - "iso_url": "{{user `mirror`}}/7.3.0/amd64/iso-cd/debian-7.3.0-amd64-CD-1.iso", - "ssh_username": "vagrant", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_wait_timeout": "10000s", - "shutdown_command": "echo 'vagrant'|sudo -S /sbin/shutdown -hP now", - "tools_upload_flavor": "linux", - "vm_name": "packer-debian-7.3.0-amd64", - "output_directory": "packer-debian-7.3.0-amd64-vmware", - "vmx_data": { - "memsize": "384", - "numvcpus": "1", - "cpuid.coresPerSocket": "1" - } - } - ], - "post-processors": [ - { - "type": "vagrant", - "output": "../builds/{{.Provider}}/opscode_debian-7.3.0_chef-{{user `chef_version`}}.box" - } - ], - "provisioners": [ - { - "execute_command": "echo 'vagrant' | {{.Vars}} sudo -E -S bash '{{.Path}}'", - "scripts": [ - "scripts/debian/update.sh", - "scripts/common/sshd.sh", - "scripts/debian/networking.sh", - "scripts/debian/sudoers.sh", - "scripts/common/vagrant.sh", - "scripts/common/vmtools.sh", - "scripts/common/chef.sh", - "scripts/debian/cleanup.sh", - "scripts/common/minimize.sh" - ], - "type": "shell", - "environment_vars": [ "CHEF_VERSION={{user `chef_version`}}" ] - } - ] -} diff --git a/packer/debian-7.3.0-i386.json b/packer/debian-7.3.0-i386.json deleted file mode 100644 index d12e99630..000000000 --- a/packer/debian-7.3.0-i386.json +++ /dev/null @@ -1,112 +0,0 @@ -{ - "variables": { - "chef_version": "provisionerless", - "mirror": "http://cdimage.debian.org/cdimage/archive" - }, - "builders": [ - { - "type": "virtualbox-iso", - "boot_command": [ - "<esc><wait>", - "install <wait>", - "preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/debian-7/preseed.cfg <wait>", - "debian-installer=en_US <wait>", - "auto <wait>", - "locale=en_US <wait>", - "kbd-chooser/method=us <wait>", - "keyboard-configuration/xkb-keymap=us <wait>", - "netcfg/get_hostname={{ .Name }} <wait>", - "netcfg/get_domain=vagrantup.com <wait>", - "fb=false <wait>", - "debconf/frontend=noninteractive <wait>", - "console-setup/ask_detect=false <wait>", - "console-keymaps-at/keymap=us <wait>", - "<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": 40960, - "guest_os_type": "Debian", - "http_directory": "http", - "iso_checksum": "ed2d36bcf660f8f6d6ca7318f58ed2ba2f75160a", - "iso_checksum_type": "sha1", - "iso_url": "{{user `mirror`}}/7.3.0/i386/iso-cd/debian-7.3.0-i386-CD-1.iso", - "ssh_username": "vagrant", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_wait_timeout": "10000s", - "shutdown_command": "echo 'vagrant'|sudo -S /sbin/shutdown -hP now", - "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", - "virtualbox_version_file": ".vbox_version", - "vm_name": "packer-debian-7.3.0-i386", - "output_directory": "packer-debian-7.3.0-i386-virtualbox", - "vboxmanage": [ - [ "modifyvm", "{{.Name}}", "--memory", "384" ], - [ "modifyvm", "{{.Name}}", "--cpus", "1" ] - ] - }, - { - "type": "vmware-iso", - "boot_command": [ - "<esc><wait>", - "install <wait>", - "preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/debian-7/preseed.cfg <wait>", - "debian-installer=en_US <wait>", - "auto <wait>", - "locale=en_US <wait>", - "kbd-chooser/method=us <wait>", - "keyboard-configuration/xkb-keymap=us <wait>", - "netcfg/get_hostname={{ .Name }} <wait>", - "netcfg/get_domain=vagrantup.com <wait>", - "fb=false <wait>", - "debconf/frontend=noninteractive <wait>", - "console-setup/ask_detect=false <wait>", - "console-keymaps-at/keymap=us <wait>", - "<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": 40960, - "guest_os_type": "debian5", - "http_directory": "http", - "iso_checksum": "ed2d36bcf660f8f6d6ca7318f58ed2ba2f75160a", - "iso_checksum_type": "sha1", - "iso_url": "{{user `mirror`}}/7.3.0/i386/iso-cd/debian-7.3.0-i386-CD-1.iso", - "ssh_username": "vagrant", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_wait_timeout": "10000s", - "shutdown_command": "echo 'vagrant'|sudo -S /sbin/shutdown -hP now", - "tools_upload_flavor": "linux", - "vm_name": "packer-debian-7.3.0-i386", - "output_directory": "packer-debian-7.3.0-i386-vmware", - "vmx_data": { - "memsize": "384", - "numvcpus": "1", - "cpuid.coresPerSocket": "1" - } - } - ], - "post-processors": [ - { - "type": "vagrant", - "output": "../builds/{{.Provider}}/opscode_debian-7.3.0-i386_chef-{{user `chef_version`}}.box" - } - ], - "provisioners": [ - { - "execute_command": "echo 'vagrant' | {{.Vars}} sudo -E -S bash '{{.Path}}'", - "scripts": [ - "scripts/debian/update.sh", - "scripts/common/sshd.sh", - "scripts/debian/networking.sh", - "scripts/debian/sudoers.sh", - "scripts/common/vagrant.sh", - "scripts/common/vmtools.sh", - "scripts/common/chef.sh", - "scripts/debian/cleanup.sh", - "scripts/common/minimize.sh" - ], - "type": "shell", - "environment_vars": [ "CHEF_VERSION={{user `chef_version`}}" ] - } - ] -} From fe632965df41e0a1e20e1524c978b2dde1313f28 Mon Sep 17 00:00:00 2001 From: Teemu Matilainen <teemu.matilainen@iki.fi> Date: Mon, 10 Feb 2014 19:27:59 -0300 Subject: [PATCH 0187/1622] Rename Debian 7.4.0 to Debian 7.4 The official version is "7.4" even though the download URL uses the extra digit. --- .../{debian-7.4.0-amd64.json => debian-7.4-amd64.json} | 10 +++++----- .../{debian-7.4.0-i386.json => debian-7.4-i386.json} | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) rename packer/{debian-7.4.0-amd64.json => debian-7.4-amd64.json} (91%) rename packer/{debian-7.4.0-i386.json => debian-7.4-i386.json} (91%) diff --git a/packer/debian-7.4.0-amd64.json b/packer/debian-7.4-amd64.json similarity index 91% rename from packer/debian-7.4.0-amd64.json rename to packer/debian-7.4-amd64.json index 8174501ec..5fce3b87c 100644 --- a/packer/debian-7.4.0-amd64.json +++ b/packer/debian-7.4-amd64.json @@ -37,8 +37,8 @@ "shutdown_command": "echo 'vagrant'|sudo -S /sbin/shutdown -hP now", "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "virtualbox_version_file": ".vbox_version", - "vm_name": "packer-debian-7.4.0-amd64", - "output_directory": "packer-debian-7.4.0-amd64-virtualbox", + "vm_name": "packer-debian-7.4-amd64", + "output_directory": "packer-debian-7.4-amd64-virtualbox", "vboxmanage": [ [ "modifyvm", "{{.Name}}", "--memory", "384" ], [ "modifyvm", "{{.Name}}", "--cpus", "1" ] @@ -76,8 +76,8 @@ "ssh_wait_timeout": "10000s", "shutdown_command": "echo 'vagrant'|sudo -S /sbin/shutdown -hP now", "tools_upload_flavor": "linux", - "vm_name": "packer-debian-7.4.0-amd64", - "output_directory": "packer-debian-7.4.0-amd64-vmware", + "vm_name": "packer-debian-7.4-amd64", + "output_directory": "packer-debian-7.4-amd64-vmware", "vmx_data": { "memsize": "384", "numvcpus": "1", @@ -88,7 +88,7 @@ "post-processors": [ { "type": "vagrant", - "output": "../builds/{{.Provider}}/opscode_debian-7.4.0_chef-{{user `chef_version`}}.box" + "output": "../builds/{{.Provider}}/opscode_debian-7.4_chef-{{user `chef_version`}}.box" } ], "provisioners": [ diff --git a/packer/debian-7.4.0-i386.json b/packer/debian-7.4-i386.json similarity index 91% rename from packer/debian-7.4.0-i386.json rename to packer/debian-7.4-i386.json index 4d7092a45..7e80b00e5 100644 --- a/packer/debian-7.4.0-i386.json +++ b/packer/debian-7.4-i386.json @@ -37,8 +37,8 @@ "shutdown_command": "echo 'vagrant'|sudo -S /sbin/shutdown -hP now", "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "virtualbox_version_file": ".vbox_version", - "vm_name": "packer-debian-7.4.0-i386", - "output_directory": "packer-debian-7.4.0-i386-virtualbox", + "vm_name": "packer-debian-7.4-i386", + "output_directory": "packer-debian-7.4-i386-virtualbox", "vboxmanage": [ [ "modifyvm", "{{.Name}}", "--memory", "384" ], [ "modifyvm", "{{.Name}}", "--cpus", "1" ] @@ -76,8 +76,8 @@ "ssh_wait_timeout": "10000s", "shutdown_command": "echo 'vagrant'|sudo -S /sbin/shutdown -hP now", "tools_upload_flavor": "linux", - "vm_name": "packer-debian-7.4.0-i386", - "output_directory": "packer-debian-7.4.0-i386-vmware", + "vm_name": "packer-debian-7.4-i386", + "output_directory": "packer-debian-7.4-i386-vmware", "vmx_data": { "memsize": "384", "numvcpus": "1", @@ -88,7 +88,7 @@ "post-processors": [ { "type": "vagrant", - "output": "../builds/{{.Provider}}/opscode_debian-7.4.0-i386_chef-{{user `chef_version`}}.box" + "output": "../builds/{{.Provider}}/opscode_debian-7.4-i386_chef-{{user `chef_version`}}.box" } ], "provisioners": [ From ba7c1f1518116b5654f10ec8df57aa1778e657d2 Mon Sep 17 00:00:00 2001 From: "Julian C. Dunn" <jdunn@getchef.com> Date: Sun, 16 Feb 2014 23:31:39 -0500 Subject: [PATCH 0188/1622] Fedora 18 is End-of-Life. https://lists.fedoraproject.org/pipermail/announce/2014-January/003194.html --- packer/fedora-18-i386.json | 94 ------------------------------------ packer/fedora-18-x86_64.json | 94 ------------------------------------ 2 files changed, 188 deletions(-) delete mode 100644 packer/fedora-18-i386.json delete mode 100644 packer/fedora-18-x86_64.json diff --git a/packer/fedora-18-i386.json b/packer/fedora-18-i386.json deleted file mode 100644 index 85913798c..000000000 --- a/packer/fedora-18-i386.json +++ /dev/null @@ -1,94 +0,0 @@ -{ - "builders": [ - { - "boot_command": [ - "<tab> linux ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/fedora-18/ks.cfg<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": 40960, - "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", - "guest_os_type": "Fedora", - "http_directory": "http", - "iso_checksum": "a22e6ab7b0e5e93397e4a1d8d994693d0afb9ad46b1f47a4fe10bfbbc2e7f354", - "iso_checksum_type": "sha256", - "iso_url": "{{user `mirror`}}/releases/18/Fedora/i386/iso/Fedora-18-i386-DVD.iso", - "output_directory": "packer-fedora-18-i386-virtualbox", - "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "virtualbox-iso", - "vboxmanage": [ - [ - "modifyvm", - "{{.Name}}", - "--memory", - "512" - ], - [ - "modifyvm", - "{{.Name}}", - "--cpus", - "1" - ] - ], - "virtualbox_version_file": ".vbox_version", - "vm_name": "packer-fedora-18-i386" - }, - { - "boot_command": [ - "<tab> linux ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/fedora-18/ks.cfg<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": 40960, - "guest_os_type": "fedora", - "http_directory": "http", - "iso_checksum": "a22e6ab7b0e5e93397e4a1d8d994693d0afb9ad46b1f47a4fe10bfbbc2e7f354", - "iso_checksum_type": "sha256", - "iso_url": "{{user `mirror`}}/releases/18/Fedora/i386/iso/Fedora-18-i386-DVD.iso", - "output_directory": "packer-fedora-18-i386-vmware", - "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "tools_upload_flavor": "linux", - "type": "vmware-iso", - "vm_name": "packer-fedora-18-i386", - "vmx_data": { - "cpuid.coresPerSocket": "1", - "memsize": "512", - "numvcpus": "1" - } - } - ], - "post-processors": [ - { - "output": "../builds/{{.Provider}}/opscode_fedora-18-i386_chef-{{user `chef_version`}}.box", - "type": "vagrant" - } - ], - "provisioners": [ - { - "environment_vars": [ - "CHEF_VERSION={{user `chef_version`}}" - ], - "execute_command": "echo 'vagrant' | {{.Vars}} sudo -E -S bash '{{.Path}}'", - "scripts": [ - "scripts/common/sshd.sh", - "scripts/common/vmtools.sh", - "scripts/common/chef.sh", - "scripts/common/vagrant.sh", - "scripts/fedora/cleanup.sh", - "scripts/common/minimize.sh" - ], - "type": "shell" - } - ], - "variables": { - "chef_version": "provisionerless", - "mirror": "http://mirrors.kernel.org/fedora" - } -} - diff --git a/packer/fedora-18-x86_64.json b/packer/fedora-18-x86_64.json deleted file mode 100644 index f9a2f145a..000000000 --- a/packer/fedora-18-x86_64.json +++ /dev/null @@ -1,94 +0,0 @@ -{ - "builders": [ - { - "boot_command": [ - "<tab> linux ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/fedora-18/ks.cfg<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": 40960, - "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", - "guest_os_type": "Fedora_64", - "http_directory": "http", - "iso_checksum": "91c5f0aca391acf76a047e284144f90d66d3d5f5dcd26b01f368a43236832c03", - "iso_checksum_type": "sha256", - "iso_url": "{{user `mirror`}}/releases/18/Fedora/x86_64/iso/Fedora-18-x86_64-DVD.iso", - "output_directory": "packer-fedora-18-x86_64-virtualbox", - "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "virtualbox-iso", - "vboxmanage": [ - [ - "modifyvm", - "{{.Name}}", - "--memory", - "512" - ], - [ - "modifyvm", - "{{.Name}}", - "--cpus", - "1" - ] - ], - "virtualbox_version_file": ".vbox_version", - "vm_name": "packer-fedora-18-x86_64" - }, - { - "boot_command": [ - "<tab> linux ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/fedora-18/ks.cfg<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": 40960, - "guest_os_type": "fedora-64", - "http_directory": "http", - "iso_checksum": "91c5f0aca391acf76a047e284144f90d66d3d5f5dcd26b01f368a43236832c03", - "iso_checksum_type": "sha256", - "iso_url": "{{user `mirror`}}/releases/18/Fedora/x86_64/iso/Fedora-18-x86_64-DVD.iso", - "output_directory": "packer-fedora-18-x86_64-vmware", - "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "tools_upload_flavor": "linux", - "type": "vmware-iso", - "vm_name": "packer-fedora-18-x86_64", - "vmx_data": { - "cpuid.coresPerSocket": "1", - "memsize": "512", - "numvcpus": "1" - } - } - ], - "post-processors": [ - { - "output": "../builds/{{.Provider}}/opscode_fedora-18_chef-{{user `chef_version`}}.box", - "type": "vagrant" - } - ], - "provisioners": [ - { - "environment_vars": [ - "CHEF_VERSION={{user `chef_version`}}" - ], - "execute_command": "echo 'vagrant' | {{.Vars}} sudo -E -S bash '{{.Path}}'", - "scripts": [ - "scripts/common/sshd.sh", - "scripts/common/vmtools.sh", - "scripts/common/chef.sh", - "scripts/common/vagrant.sh", - "scripts/fedora/cleanup.sh", - "scripts/common/minimize.sh" - ], - "type": "shell" - } - ], - "variables": { - "chef_version": "provisionerless", - "mirror": "http://mirrors.kernel.org/fedora" - } -} - From 11692f13be4b02c54e2f64036842b50e98983a14 Mon Sep 17 00:00:00 2001 From: "Julian C. Dunn" <jdunn@getchef.com> Date: Sun, 16 Feb 2014 23:34:13 -0500 Subject: [PATCH 0189/1622] Moved Fedora 18 and Debian 7.2 to EOL list --- OLD-BOXES.md | 8 ++++++++ README.md | 12 ++++-------- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/OLD-BOXES.md b/OLD-BOXES.md index 39ba569b3..a93285882 100644 --- a/OLD-BOXES.md +++ b/OLD-BOXES.md @@ -10,11 +10,19 @@ Boxes for obsolete operating systems will be placed here. * [opscode-centos-6.4-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_centos-6.4-i386_chef-provisionerless.box) * [opscode-centos-6.4](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_centos-6.4_chef-provisionerless.box) +* [opscode-debian-7.2.0-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_debian-7.2.0-i386_chef-provisionerless.box) +* [opscode-debian-7.2.0](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_debian-7.2.0_chef-provisionerless.box) +* [opscode-fedora-18-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_fedora-18-i386_chef-provisionerless.box) +* [opscode-fedora-18](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_fedora-18_chef-provisionerless.box) ### VMWare * [opscode-centos-6.4-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_centos-6.4-i386_chef-provisionerless.box) * [opscode-centos-6.4](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_centos-6.4_chef-provisionerless.box) +* [opscode-debian-7.2.0-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_debian-7.2.0-i386_chef-provisionerless.box) +* [opscode-debian-7.2.0](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_debian-7.2.0_chef-provisionerless.box) +* [opscode-fedora-18-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_fedora-18-i386_chef-provisionerless.box) +* [opscode-fedora-18](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_fedora-18_chef-provisionerless.box) Chef 11.4.4 ----------- diff --git a/README.md b/README.md index dda4c8c3e..943fcd408 100644 --- a/README.md +++ b/README.md @@ -24,10 +24,8 @@ These baseboxes were all built using a Mac OS X host running VirtualBox 4.3.2, a * [opscode-centos-6.5](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_centos-6.5_chef-provisionerless.box) * [opscode-debian-6.0.8-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_debian-6.0.8-i386_chef-provisionerless.box) * [opscode-debian-6.0.8](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_debian-6.0.8_chef-provisionerless.box) -* [opscode-debian-7.2.0-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_debian-7.2.0-i386_chef-provisionerless.box) -* [opscode-debian-7.2.0](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_debian-7.2.0_chef-provisionerless.box) -* [opscode-fedora-18-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_fedora-18-i386_chef-provisionerless.box) -* [opscode-fedora-18](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_fedora-18_chef-provisionerless.box) +* [opscode-debian-7.4-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_debian-7.4-i386_chef-provisionerless.box) +* [opscode-debian-7.4](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_debian-7.4_chef-provisionerless.box) * [opscode-fedora-19-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_fedora-19-i386_chef-provisionerless.box) * [opscode-fedora-19](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_fedora-19_chef-provisionerless.box) * [opscode-fedora-20-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_fedora-20-i386_chef-provisionerless.box) @@ -56,10 +54,8 @@ The boxes should work unchanged in VMWare Workstation for Windows or Linux. * [opscode-centos-6.5](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_centos-6.5_chef-provisionerless.box) * [opscode-debian-6.0.8-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_debian-6.0.8-i386_chef-provisionerless.box) * [opscode-debian-6.0.8](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_debian-6.0.8_chef-provisionerless.box) -* [opscode-debian-7.2.0-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_debian-7.2.0-i386_chef-provisionerless.box) -* [opscode-debian-7.2.0](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_debian-7.2.0_chef-provisionerless.box) -* [opscode-fedora-18-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_fedora-18-i386_chef-provisionerless.box) -* [opscode-fedora-18](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_fedora-18_chef-provisionerless.box) +* [opscode-debian-7.4-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_debian-7.4-i386_chef-provisionerless.box) +* [opscode-debian-7.4](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_debian-7.4_chef-provisionerless.box) * [opscode-fedora-19-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_fedora-19-i386_chef-provisionerless.box) * [opscode-fedora-19](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_fedora-19_chef-provisionerless.box) * [opscode-fedora-20-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_fedora-20-i386_chef-provisionerless.box) From 18784cd40db3cd54a480ab33b20a6ad2ca00d7ba Mon Sep 17 00:00:00 2001 From: "Julian C. Dunn" <jdunn@getchef.com> Date: Sun, 16 Feb 2014 23:52:09 -0500 Subject: [PATCH 0190/1622] Updated to OmniOS r151008j --- ...nios-r151008f.json => omnios-r151008j.json} | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) rename packer/{omnios-r151008f.json => omnios-r151008j.json} (89%) diff --git a/packer/omnios-r151008f.json b/packer/omnios-r151008j.json similarity index 89% rename from packer/omnios-r151008f.json rename to packer/omnios-r151008j.json index cb9450cb2..dc06d6ab8 100644 --- a/packer/omnios-r151008f.json +++ b/packer/omnios-r151008j.json @@ -33,10 +33,10 @@ "boot_wait": "30s", "disk_size": 40960, "guest_os_type": "OpenSolaris_64", - "iso_checksum": "d64d206c1e5aeeb61c5b579dd39ed11a86ef5737", + "iso_checksum": "9929337d9c9f9e33862f19f41c2777225fa14a03", "iso_checksum_type": "sha1", - "iso_url": "{{user `mirror`}}/OmniOS_Text_r151008f.iso", - "output_directory": "packer-omnios-r151008f-virtualbox", + "iso_url": "{{user `mirror`}}/OmniOS_Text_r151008j.iso", + "output_directory": "packer-omnios-r151008j-virtualbox", "shutdown_command": "/usr/sbin/shutdown -g 0 -y -i 5", "ssh_password": "vagrant", "ssh_port": 22, @@ -57,7 +57,7 @@ ] ], "virtualbox_version_file": ".vbox_version", - "vm_name": "packer-omnios-r151008f" + "vm_name": "packer-omnios-r151008j" }, { "boot_command": [ @@ -97,17 +97,17 @@ "floppy/omnios/README.TXT" ], "guest_os_type": "solaris11-64", - "iso_checksum": "d64d206c1e5aeeb61c5b579dd39ed11a86ef5737", + "iso_checksum": "9929337d9c9f9e33862f19f41c2777225fa14a03", "iso_checksum_type": "sha1", - "iso_url": "{{user `mirror`}}/OmniOS_Text_r151008f.iso", - "output_directory": "packer-omnios-r151008f-vmware", + "iso_url": "{{user `mirror`}}/OmniOS_Text_r151008j.iso", + "output_directory": "packer-omnios-r151008j-vmware", "shutdown_command": "/usr/sbin/shutdown -g 0 -y -i 5", "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "root", "tools_upload_flavor": "solaris", "type": "vmware-iso", - "vm_name": "packer-omnios-r151008f", + "vm_name": "packer-omnios-r151008j", "vmx_data": { "cpuid.coresPerSocket": "1", "memsize": "1024", @@ -118,7 +118,7 @@ "post-processors": [ { "compression_level": 9, - "output": "../builds/{{.Provider}}/opscode_omnios-r151008f_chef-{{user `chef_version`}}.box", + "output": "../builds/{{.Provider}}/opscode_omnios-r151008j_chef-{{user `chef_version`}}.box", "type": "vagrant" } ], From 17c00b0929b57099cfe7eef6fe8077d7ddbea62b Mon Sep 17 00:00:00 2001 From: Teemu Matilainen <teemu.matilainen@iki.fi> Date: Mon, 17 Feb 2014 12:09:30 -0300 Subject: [PATCH 0191/1622] Update Debian 6.0.8 to 6.0.9 --- ...0.8-amd64.json => debian-6.0.9-amd64.json} | 63 ++++++++----------- ...6.0.8-i386.json => debian-6.0.9-i386.json} | 61 +++++++----------- .../{debian-6.0.8 => debian-6.0}/preseed.cfg | 0 3 files changed, 49 insertions(+), 75 deletions(-) rename packer/{debian-6.0.8-amd64.json => debian-6.0.9-amd64.json} (72%) rename packer/{debian-6.0.8-i386.json => debian-6.0.9-i386.json} (74%) rename packer/http/{debian-6.0.8 => debian-6.0}/preseed.cfg (100%) diff --git a/packer/debian-6.0.8-amd64.json b/packer/debian-6.0.9-amd64.json similarity index 72% rename from packer/debian-6.0.8-amd64.json rename to packer/debian-6.0.9-amd64.json index e435b9fdb..45b675c5b 100644 --- a/packer/debian-6.0.8-amd64.json +++ b/packer/debian-6.0.9-amd64.json @@ -1,10 +1,15 @@ { + "variables": { + "chef_version": "provisionerless", + "mirror": "http://cdimage.debian.org/cdimage/archive" + }, "builders": [ { + "type": "virtualbox-iso", "boot_command": [ "<esc><wait>", "install <wait>", - "preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/debian-6.0.8/preseed.cfg <wait>", + "preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/debian-6.0/preseed.cfg <wait>", "debian-installer=en_US <wait>", "auto <wait>", "locale=en_US <wait>", @@ -23,38 +28,28 @@ "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "guest_os_type": "Debian_64", "http_directory": "http", - "iso_checksum": "d0ec1c64c00ff601995139dbacfb54109a23788f", + "iso_checksum": "3f3ec3e1adb4c2904a1234799f4775c10cf47cce", "iso_checksum_type": "sha1", - "iso_url": "{{user `mirror`}}/6.0.8/amd64/iso-cd/debian-6.0.8-amd64-CD-1.iso", - "output_directory": "packer-debian-6.0.8-amd64-virtualbox", + "iso_url": "{{user `mirror`}}/6.0.9/amd64/iso-cd/debian-6.0.9-amd64-CD-1.iso", + "output_directory": "packer-debian-6.0.9-amd64-virtualbox", "shutdown_command": "echo 'vagrant'|sudo -S /sbin/shutdown -hP now", "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", - "type": "virtualbox-iso", "vboxmanage": [ - [ - "modifyvm", - "{{.Name}}", - "--memory", - "384" - ], - [ - "modifyvm", - "{{.Name}}", - "--cpus", - "1" - ] + [ "modifyvm", "{{.Name}}", "--memory", "384" ], + [ "modifyvm", "{{.Name}}", "--cpus", "1" ] ], "virtualbox_version_file": ".vbox_version", - "vm_name": "packer-debian-6.0.8-amd64" + "vm_name": "packer-debian-6.0.9-amd64" }, { + "type": "vmware-iso", "boot_command": [ "<esc><wait>", "install <wait>", - "preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/debian-6.0.8/preseed.cfg <wait>", + "preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/debian-6.0/preseed.cfg <wait>", "debian-installer=en_US <wait>", "auto <wait>", "locale=en_US <wait>", @@ -72,18 +67,17 @@ "disk_size": 40960, "guest_os_type": "debian5-64", "http_directory": "http", - "iso_checksum": "d0ec1c64c00ff601995139dbacfb54109a23788f", + "iso_checksum": "3f3ec3e1adb4c2904a1234799f4775c10cf47cce", "iso_checksum_type": "sha1", - "iso_url": "{{user `mirror`}}/6.0.8/amd64/iso-cd/debian-6.0.8-amd64-CD-1.iso", - "output_directory": "packer-debian-6.0.8-amd64-vmware", + "iso_url": "{{user `mirror`}}/6.0.9/amd64/iso-cd/debian-6.0.9-amd64-CD-1.iso", + "output_directory": "packer-debian-6.0.9-amd64-vmware", "shutdown_command": "echo 'vagrant'|sudo -S /sbin/shutdown -hP now", "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", "tools_upload_flavor": "linux", - "type": "vmware-iso", - "vm_name": "packer-debian-6.0.8-amd64", + "vm_name": "packer-debian-6.0.9-amd64", "vmx_data": { "cpuid.coresPerSocket": "1", "memsize": "384", @@ -93,16 +87,15 @@ ], "post-processors": [ { - "output": "../builds/{{.Provider}}/opscode_debian-6.0.8_chef-{{user `chef_version`}}.box", - "type": "vagrant" + "type": "vagrant", + "output": "../builds/{{.Provider}}/opscode_debian-6.0.9_chef-{{user `chef_version`}}.box" } ], "provisioners": [ { - "environment_vars": [ - "CHEF_VERSION={{user `chef_version`}}" - ], - "execute_command": "echo 'vagrant'|{{.Vars}} sudo -S -E bash '{{.Path}}'", + "type": "shell", + "environment_vars": [ "CHEF_VERSION={{user `chef_version`}}" ], + "execute_command": "echo 'vagrant' | {{.Vars}} sudo -E -S bash '{{.Path}}'", "scripts": [ "scripts/debian/update.sh", "scripts/common/sshd.sh", @@ -113,13 +106,7 @@ "scripts/common/chef.sh", "scripts/debian/cleanup.sh", "scripts/common/minimize.sh" - ], - "type": "shell" + ] } - ], - "variables": { - "chef_version": "provisionerless", - "mirror": "http://cdimage.debian.org/cdimage/archive" - } + ] } - diff --git a/packer/debian-6.0.8-i386.json b/packer/debian-6.0.9-i386.json similarity index 74% rename from packer/debian-6.0.8-i386.json rename to packer/debian-6.0.9-i386.json index 41c245a56..0aeb38341 100644 --- a/packer/debian-6.0.8-i386.json +++ b/packer/debian-6.0.9-i386.json @@ -1,10 +1,15 @@ { + "variables": { + "chef_version": "provisionerless", + "mirror": "http://cdimage.debian.org/cdimage/archive" + }, "builders": [ { + "type": "virtualbox-iso", "boot_command": [ "<esc><wait>", "install <wait>", - "preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/debian-6.0.8/preseed.cfg <wait>", + "preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/debian-6.0/preseed.cfg <wait>", "debian-installer=en_US <wait>", "auto <wait>", "locale=en_US <wait>", @@ -23,38 +28,28 @@ "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "guest_os_type": "Debian", "http_directory": "http", - "iso_checksum": "144194cea77f0e527fd07bd6aa28d1ab50cb5a95", + "iso_checksum": "bc2886211bce0e9c54bdf779f21a35d5e5a122fd", "iso_checksum_type": "sha1", - "iso_url": "{{user `mirror`}}/6.0.8/i386/iso-cd/debian-6.0.8-i386-CD-1.iso", - "output_directory": "packer-debian-6.0.8-i386-virtualbox", + "iso_url": "{{user `mirror`}}/6.0.9/i386/iso-cd/debian-6.0.9-i386-CD-1.iso", + "output_directory": "packer-debian-6.0.9-i386-virtualbox", "shutdown_command": "echo 'vagrant'|sudo -S /sbin/shutdown -hP now", "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", - "type": "virtualbox-iso", "vboxmanage": [ - [ - "modifyvm", - "{{.Name}}", - "--memory", - "384" - ], - [ - "modifyvm", - "{{.Name}}", - "--cpus", - "1" - ] + [ "modifyvm", "{{.Name}}", "--memory", "384" ], + [ "modifyvm", "{{.Name}}", "--cpus", "1" ] ], "virtualbox_version_file": ".vbox_version", - "vm_name": "packer-debian-6.0.8-i386" + "vm_name": "packer-debian-6.0.9-i386" }, { + "type": "vmware-iso", "boot_command": [ "<esc><wait>", "install <wait>", - "preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/debian-6.0.8/preseed.cfg <wait>", + "preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/debian-6.0/preseed.cfg <wait>", "debian-installer=en_US <wait>", "auto <wait>", "locale=en_US <wait>", @@ -72,18 +67,17 @@ "disk_size": 40960, "guest_os_type": "debian5", "http_directory": "http", - "iso_checksum": "144194cea77f0e527fd07bd6aa28d1ab50cb5a95", + "iso_checksum": "bc2886211bce0e9c54bdf779f21a35d5e5a122fd", "iso_checksum_type": "sha1", - "iso_url": "{{user `mirror`}}/6.0.8/i386/iso-cd/debian-6.0.8-i386-CD-1.iso", - "output_directory": "packer-debian-6.0.8-i386-vmware", + "iso_url": "{{user `mirror`}}/6.0.9/i386/iso-cd/debian-6.0.9-i386-CD-1.iso", + "output_directory": "packer-debian-6.0.9-i386-vmware", "shutdown_command": "echo 'vagrant'|sudo -S /sbin/shutdown -hP now", "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", "tools_upload_flavor": "linux", - "type": "vmware-iso", - "vm_name": "packer-debian-6.0.8-i386", + "vm_name": "packer-debian-6.0.9-i386", "vmx_data": { "cpuid.coresPerSocket": "1", "memsize": "384", @@ -93,15 +87,14 @@ ], "post-processors": [ { - "output": "../builds/{{.Provider}}/opscode_debian-6.0.8-i386_chef-{{user `chef_version`}}.box", - "type": "vagrant" + "type": "vagrant", + "output": "../builds/{{.Provider}}/opscode_debian-6.0.9-i386_chef-{{user `chef_version`}}.box" } ], "provisioners": [ { - "environment_vars": [ - "CHEF_VERSION={{user `chef_version`}}" - ], + "type": "shell", + "environment_vars": [ "CHEF_VERSION={{user `chef_version`}}" ], "execute_command": "echo 'vagrant' | {{.Vars}} sudo -E -S bash '{{.Path}}'", "scripts": [ "scripts/debian/update.sh", @@ -113,13 +106,7 @@ "scripts/common/chef.sh", "scripts/debian/cleanup.sh", "scripts/common/minimize.sh" - ], - "type": "shell" + ] } - ], - "variables": { - "chef_version": "provisionerless", - "mirror": "http://cdimage.debian.org/cdimage/archive" - } + ] } - diff --git a/packer/http/debian-6.0.8/preseed.cfg b/packer/http/debian-6.0/preseed.cfg similarity index 100% rename from packer/http/debian-6.0.8/preseed.cfg rename to packer/http/debian-6.0/preseed.cfg From e236d14e27bdfd7b7ced7bd2d68bc62e6f622a05 Mon Sep 17 00:00:00 2001 From: Robert Coleman <github@robert.net.nz> Date: Sun, 23 Feb 2014 09:06:09 +1300 Subject: [PATCH 0192/1622] Move single-request-reopen into OS specific scripts * Ensure that it will be added to /etc/resolv.conf when it's generated * handle Fedora 19 NetworkManager bug --- packer/centos-6.5-i386.json | 1 + packer/centos-6.5-x86_64.json | 1 + packer/fedora-19-i386.json | 1 + packer/fedora-19-x86_64.json | 1 + packer/fedora-20-i386.json | 1 + packer/fedora-20-x86_64.json | 1 + packer/rhel-6.5-i386.json | 1 + packer/rhel-6.5-x86_64.json | 1 + packer/scripts/centos/fix-slow-dns.sh | 11 +++++++++++ packer/scripts/centos/ks.cfg | 3 +-- packer/scripts/fedora/fix-slow-dns.sh | 21 +++++++++++++++++++++ 11 files changed, 41 insertions(+), 2 deletions(-) create mode 100644 packer/scripts/centos/fix-slow-dns.sh create mode 100644 packer/scripts/fedora/fix-slow-dns.sh diff --git a/packer/centos-6.5-i386.json b/packer/centos-6.5-i386.json index 2f0e13bde..0aab4d0f3 100644 --- a/packer/centos-6.5-i386.json +++ b/packer/centos-6.5-i386.json @@ -76,6 +76,7 @@ ], "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E bash '{{.Path}}'", "scripts": [ + "scripts/centos/fix-slow-dns.sh", "scripts/common/sshd.sh", "scripts/common/vagrant.sh", "scripts/common/vmtools.sh", diff --git a/packer/centos-6.5-x86_64.json b/packer/centos-6.5-x86_64.json index f72d76610..9b4c8de91 100644 --- a/packer/centos-6.5-x86_64.json +++ b/packer/centos-6.5-x86_64.json @@ -76,6 +76,7 @@ ], "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E bash '{{.Path}}'", "scripts": [ + "scripts/centos/fix-slow-dns.sh", "scripts/common/sshd.sh", "scripts/common/vagrant.sh", "scripts/common/vmtools.sh", diff --git a/packer/fedora-19-i386.json b/packer/fedora-19-i386.json index bdb2df603..f2a6906b9 100644 --- a/packer/fedora-19-i386.json +++ b/packer/fedora-19-i386.json @@ -76,6 +76,7 @@ ], "execute_command": "echo 'vagrant' | {{.Vars}} sudo -E -S bash '{{.Path}}'", "scripts": [ + "scripts/fedora/fix-slow-dns.sh", "scripts/common/sshd.sh", "scripts/common/vmtools.sh", "scripts/common/chef.sh", diff --git a/packer/fedora-19-x86_64.json b/packer/fedora-19-x86_64.json index 88a4f0026..987641301 100644 --- a/packer/fedora-19-x86_64.json +++ b/packer/fedora-19-x86_64.json @@ -76,6 +76,7 @@ ], "execute_command": "echo 'vagrant' | {{.Vars}} sudo -E -S bash '{{.Path}}'", "scripts": [ + "scripts/fedora/fix-slow-dns.sh", "scripts/common/sshd.sh", "scripts/common/vmtools.sh", "scripts/common/chef.sh", diff --git a/packer/fedora-20-i386.json b/packer/fedora-20-i386.json index ffe5835bb..0cf915805 100644 --- a/packer/fedora-20-i386.json +++ b/packer/fedora-20-i386.json @@ -76,6 +76,7 @@ ], "execute_command": "echo 'vagrant' | {{.Vars}} sudo -E -S bash '{{.Path}}'", "scripts": [ + "scripts/fedora/fix-slow-dns.sh", "scripts/common/sshd.sh", "scripts/common/vmtools.sh", "scripts/common/chef.sh", diff --git a/packer/fedora-20-x86_64.json b/packer/fedora-20-x86_64.json index 23a53c28c..a040ea835 100644 --- a/packer/fedora-20-x86_64.json +++ b/packer/fedora-20-x86_64.json @@ -76,6 +76,7 @@ ], "execute_command": "echo 'vagrant' | {{.Vars}} sudo -E -S bash '{{.Path}}'", "scripts": [ + "scripts/fedora/fix-slow-dns.sh", "scripts/common/sshd.sh", "scripts/common/vmtools.sh", "scripts/common/chef.sh", diff --git a/packer/rhel-6.5-i386.json b/packer/rhel-6.5-i386.json index ebc34d82a..e83301826 100644 --- a/packer/rhel-6.5-i386.json +++ b/packer/rhel-6.5-i386.json @@ -76,6 +76,7 @@ ], "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E bash '{{.Path}}'", "scripts": [ + "scripts/centos/fix-slow-dns.sh", "scripts/common/sshd.sh", "scripts/common/vagrant.sh", "scripts/common/vmtools.sh", diff --git a/packer/rhel-6.5-x86_64.json b/packer/rhel-6.5-x86_64.json index d8006b8cf..874287ff1 100644 --- a/packer/rhel-6.5-x86_64.json +++ b/packer/rhel-6.5-x86_64.json @@ -76,6 +76,7 @@ ], "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E bash '{{.Path}}'", "scripts": [ + "scripts/centos/fix-slow-dns.sh", "scripts/common/sshd.sh", "scripts/common/vagrant.sh", "scripts/common/vmtools.sh", diff --git a/packer/scripts/centos/fix-slow-dns.sh b/packer/scripts/centos/fix-slow-dns.sh new file mode 100644 index 000000000..70fc8d38b --- /dev/null +++ b/packer/scripts/centos/fix-slow-dns.sh @@ -0,0 +1,11 @@ +#!/bin/bash -eux + +if [[ "$PACKER_BUILDER_TYPE" == virtualbox* ]]; then + ## https://access.redhat.com/site/solutions/58625 (subscription required) + # add 'single-request-reopen' so it is included when /etc/resolv.conf is generated + echo 'RES_OPTIONS="single-request-reopen"' >> /etc/sysconfig/network + service network restart + echo 'Slow DNS fix applied (single-request-reopen)' +else + echo 'Slow DNS fix not required for this platform, skipping' +fi diff --git a/packer/scripts/centos/ks.cfg b/packer/scripts/centos/ks.cfg index 81c9f2f98..86268a4bf 100644 --- a/packer/scripts/centos/ks.cfg +++ b/packer/scripts/centos/ks.cfg @@ -12,7 +12,7 @@ text skipx zerombr clearpart --all --initlabel -autopart +autopart auth --enableshadow --passalgo=sha512 --kickstart firstboot --disabled reboot @@ -39,4 +39,3 @@ echo "vagrant" | passwd --stdin vagrant # sudo echo "vagrant ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers sed -i "s/^.*requiretty/#Defaults requiretty/" /etc/sudoers -echo "options single-request-reopen" >> /etc/resolv.conf diff --git a/packer/scripts/fedora/fix-slow-dns.sh b/packer/scripts/fedora/fix-slow-dns.sh new file mode 100644 index 000000000..cd9ef8458 --- /dev/null +++ b/packer/scripts/fedora/fix-slow-dns.sh @@ -0,0 +1,21 @@ +#!/bin/bash -eux + +if [[ "$PACKER_BUILDER_TYPE" == virtualbox* ]]; then + # fix bug to enable nm-dispatcher on Fedora 19 https://bugzilla.redhat.com/show_bug.cgi?id=974811 + if [[ $(rpm -q --queryformat '%{VERSION}\n' fedora-release) == 19 ]]; then + yum -y upgrade NetworkManager + systemctl enable NetworkManager-dispatcher.service + fi + + ## https://access.redhat.com/site/solutions/58625 (subscription required) + # add 'single-request-reopen' so it is included when /etc/resolv.conf is generated + cat >> /etc/NetworkManager/dispatcher.d/fix-slow-dns <<EOF +#!/bin/bash +echo "options single-request-reopen" >> /etc/resolv.conf +EOF + chmod +x /etc/NetworkManager/dispatcher.d/fix-slow-dns + service NetworkManager restart + echo 'Slow DNS fix applied (single-request-reopen)' +else + echo 'Slow DNS fix not required for this platform, skipping' +fi From 2be6880a1812fd513b4872faa7210156cf28247a Mon Sep 17 00:00:00 2001 From: "Julian C. Dunn" <jdunn@getchef.com> Date: Sat, 22 Feb 2014 23:43:05 -0500 Subject: [PATCH 0193/1622] Force CRLF on Autounattend files for Windows --- .gitattributes | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitattributes b/.gitattributes index 19600fd86..d7448ebe2 100644 --- a/.gitattributes +++ b/.gitattributes @@ -9,6 +9,7 @@ preseed.cfg eol=lf # Force CRLF line ending on these files *.bat eol=crlf +Autounattend.xml eol=crlf # Force binary on these files *.cer binary From 76554a9780d2573570cc8c6f5b4a4616eda4ce0c Mon Sep 17 00:00:00 2001 From: "Julian C. Dunn" <jdunn@getchef.com> Date: Sun, 23 Feb 2014 16:46:06 -0500 Subject: [PATCH 0194/1622] Force CRLF on Autounattend.xml --- .../windows-2008r2-standard/Autounattend.xml | 460 ++++++++--------- .../windows-2012-standard/Autounattend.xml | 326 ++++++------ .../windows-2012r2-standard/Autounattend.xml | 328 ++++++------ .../windows-7-enterprise/Autounattend.xml | 466 ++++++++--------- .../windows-8-enterprise/Autounattend.xml | 470 +++++++++--------- 5 files changed, 1025 insertions(+), 1025 deletions(-) diff --git a/definitions/windows-2008r2-standard/Autounattend.xml b/definitions/windows-2008r2-standard/Autounattend.xml index 3f3d0ef9f..4cfb84bd6 100644 --- a/definitions/windows-2008r2-standard/Autounattend.xml +++ b/definitions/windows-2008r2-standard/Autounattend.xml @@ -1,230 +1,230 @@ -<?xml version="1.0" encoding="utf-8"?> -<unattend xmlns="urn:schemas-microsoft-com:unattend"> - <servicing></servicing> - - <settings pass="windowsPE"> - - <component name="Microsoft-Windows-Setup" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - - <DiskConfiguration> - <Disk wcm:action="add"> - - <CreatePartitions> - <CreatePartition wcm:action="add"> - <Order>1</Order> - <Type>Primary</Type> - <Size>20000</Size> - </CreatePartition> - </CreatePartitions> - - <ModifyPartitions> - <ModifyPartition wcm:action="add"> - <Extend>false</Extend> - <Format>NTFS</Format> - <Letter>C</Letter> - <Order>1</Order> - <PartitionID>1</PartitionID> - <Label>Windows 2008R2</Label> - </ModifyPartition> - </ModifyPartitions> - - <DiskID>0</DiskID> - <WillWipeDisk>true</WillWipeDisk> - - </Disk> - <WillShowUI>OnError</WillShowUI> - </DiskConfiguration> - - <UserData> - <!-- Product Key from http://technet.microsoft.com/en-us/library/ff793406.aspx --> - <ProductKey>YC6KT-GKW9T-YTKYR-T4X34-R7VHC - <WillShowUI>Never</WillShowUI> - </ProductKey> - - <AcceptEula>true</AcceptEula> - <FullName>Vagrant Fullname</FullName> - <Organization>Vagrant Inc</Organization> - </UserData> - - <ImageInstall> - <OSImage> - <InstallTo> - <DiskID>0</DiskID> - <PartitionID>1</PartitionID> - </InstallTo> - <WillShowUI>OnError</WillShowUI> - <InstallToAvailablePartition>false</InstallToAvailablePartition> - <InstallFrom> - <MetaData wcm:action="add"> - <Key>/IMAGE/NAME</Key> - <Value>Windows Server 2008 R2 SERVERSTANDARD</Value> - </MetaData> - </InstallFrom> - </OSImage> - </ImageInstall> - - </component> - - <component name="Microsoft-Windows-International-Core-WinPE" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - <SetupUILanguage> - <UILanguage>en-US</UILanguage> - </SetupUILanguage> - <InputLocale>en-US</InputLocale> - <SystemLocale>en-US</SystemLocale> - <UILanguage>en-US</UILanguage> - <UILanguageFallback>en-US</UILanguageFallback> - <UserLocale>en-US</UserLocale> - </component> - </settings> - - - <settings pass="oobeSystem"> - <component name="Microsoft-Windows-Shell-Setup" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - <UserAccounts> - <AdministratorPassword> - <Value>vagrant</Value> - <PlainText>true</PlainText> - </AdministratorPassword> - <LocalAccounts> - <LocalAccount wcm:action="add"> - <Password> - <Value>vagrant</Value> - <PlainText>true</PlainText> - </Password> - <Description>Vagrant User</Description> - <DisplayName>vagrant</DisplayName> - <Group>administrators</Group> - <Name>vagrant</Name> - </LocalAccount> - </LocalAccounts> - </UserAccounts> - <OOBE> - <HideEULAPage>true</HideEULAPage> - <HideWirelessSetupInOOBE>true</HideWirelessSetupInOOBE> - <NetworkLocation>Home</NetworkLocation> - </OOBE> - <AutoLogon> - <Password> - <Value>vagrant</Value> - <PlainText>true</PlainText> - </Password> - <Username>administrator</Username> - <Enabled>true</Enabled> - </AutoLogon> - <FirstLogonCommands> - <!-- <SynchronousCommand wcm:action="add"> --> - <!-- <CommandLine>cmd.exe /c a:install-cygwin-sshd.bat</CommandLine> --> - <!-- <Description>Install Cygwin SSH</Description> --> - <!-- <Order>1</Order> --> - <!-- <RequiresUserInput>true</RequiresUserInput> --> - <!-- </SynchronousCommand> --> - <!-- <SynchronousCommand wcm:action="add"> --> - <!-- <CommandLine>cmd.exe /c a:install-winrm.bat</CommandLine> --> - <!-- <Description>Install Win RM</Description> --> - <!-- <Order>2</Order> --> - <!-- <RequiresUserInput>true</RequiresUserInput> --> - <!-- </SynchronousCommand> --> - <SynchronousCommand wcm:action="add"> - <CommandLine>cmd.exe /c winrm quickconfig -q</CommandLine> - <Description>winrm quickconfig -q</Description> - <Order>1</Order> - <RequiresUserInput>true</RequiresUserInput> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <CommandLine>cmd.exe /c winrm quickconfig -transport:http</CommandLine> - <Description>winrm quickconfig -transport:http</Description> - <Order>2</Order> - <RequiresUserInput>true</RequiresUserInput> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <CommandLine>cmd.exe /c winrm set winrm/config @{MaxTimeoutms="1800000"}</CommandLine> - <Description>Win RM MaxTimoutms</Description> - <Order>3</Order> - <RequiresUserInput>true</RequiresUserInput> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <CommandLine>cmd.exe /c winrm set winrm/config/winrs @{MaxMemoryPerShellMB="300"}</CommandLine> - <Description>Win RM MaxMemoryPerShellMB</Description> - <Order>4</Order> - <RequiresUserInput>true</RequiresUserInput> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <CommandLine>cmd.exe /c winrm set winrm/config/service @{AllowUnencrypted="true"}</CommandLine> - <Description>Win RM AllowUnencrypted</Description> - <Order>5</Order> - <RequiresUserInput>true</RequiresUserInput> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <CommandLine>cmd.exe /c winrm set winrm/config/service/auth @{Basic="true"}</CommandLine> - <Description>Win RM auth Basic</Description> - <Order>6</Order> - <RequiresUserInput>true</RequiresUserInput> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <CommandLine>cmd.exe /c winrm set winrm/config/client/auth @{Basic="true"}</CommandLine> - <Description>Win RM auth Basic</Description> - <Order>7</Order> - <RequiresUserInput>true</RequiresUserInput> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <CommandLine>cmd.exe /c winrm set winrm/config/listener?Address=*+Transport=HTTP @{Port="5985"} </CommandLine> - <Description>Win RM listener Address/Port</Description> - <Order>8</Order> - <RequiresUserInput>true</RequiresUserInput> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <CommandLine>cmd.exe /c netsh advfirewall firewall set rule group="remote administration" new enable=yes </CommandLine> - <Description>Win RM adv firewall enable</Description> - <Order>9</Order> - <RequiresUserInput>true</RequiresUserInput> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <CommandLine>cmd.exe /c netsh firewall add portopening TCP 5985 "Port 5985" </CommandLine> - <Description>Win RM port open</Description> - <Order>10</Order> - <RequiresUserInput>true</RequiresUserInput> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <CommandLine>cmd.exe /c net stop winrm </CommandLine> - <Description>Stop Win RM Service </Description> - <Order>11</Order> - <RequiresUserInput>true</RequiresUserInput> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <CommandLine>cmd.exe /c sc config winrm start= auto</CommandLine> - <Description>Win RM Autostart</Description> - <Order>12</Order> - <RequiresUserInput>true</RequiresUserInput> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <CommandLine>cmd.exe /c net start winrm </CommandLine> - <Description>Start Win RM Service</Description> - <Order>13</Order> - <RequiresUserInput>true</RequiresUserInput> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <CommandLine>powershell -Command "Set-ExecutionPolicy -ExecutionPolicy RemoteSigned -Force"</CommandLine> - <Description>Start Win RM Service</Description> - <Order>14</Order> - <RequiresUserInput>true</RequiresUserInput> - </SynchronousCommand> - </FirstLogonCommands> - <ShowWindowsLive>false</ShowWindowsLive> - </component> - </settings> - <settings pass="specialize"> - <component name="Microsoft-Windows-Shell-Setup" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" > - <OEMInformation> - <HelpCustomized>false</HelpCustomized> - </OEMInformation> - <!-- Rename computer here. --> - <ComputerName>vagrant-2008R2</ComputerName> - <TimeZone>Pacific Standard Time</TimeZone> - <RegisteredOwner></RegisteredOwner> - </component> - <component name="Microsoft-Windows-Security-SPP-UX" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - <SkipAutoActivation>true</SkipAutoActivation> - </component> - </settings> - <cpi:offlineImage cpi:source="catalog:d:/sources/install_windows server 2008 r2 serverdatacenter.clg" xmlns:cpi="urn:schemas-microsoft-com:cpi" /> -</unattend> +<?xml version="1.0" encoding="utf-8"?> +<unattend xmlns="urn:schemas-microsoft-com:unattend"> + <servicing></servicing> + + <settings pass="windowsPE"> + + <component name="Microsoft-Windows-Setup" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + + <DiskConfiguration> + <Disk wcm:action="add"> + + <CreatePartitions> + <CreatePartition wcm:action="add"> + <Order>1</Order> + <Type>Primary</Type> + <Size>20000</Size> + </CreatePartition> + </CreatePartitions> + + <ModifyPartitions> + <ModifyPartition wcm:action="add"> + <Extend>false</Extend> + <Format>NTFS</Format> + <Letter>C</Letter> + <Order>1</Order> + <PartitionID>1</PartitionID> + <Label>Windows 2008R2</Label> + </ModifyPartition> + </ModifyPartitions> + + <DiskID>0</DiskID> + <WillWipeDisk>true</WillWipeDisk> + + </Disk> + <WillShowUI>OnError</WillShowUI> + </DiskConfiguration> + + <UserData> + <!-- Product Key from http://technet.microsoft.com/en-us/library/ff793406.aspx --> + <ProductKey>YC6KT-GKW9T-YTKYR-T4X34-R7VHC + <WillShowUI>Never</WillShowUI> + </ProductKey> + + <AcceptEula>true</AcceptEula> + <FullName>Vagrant Fullname</FullName> + <Organization>Vagrant Inc</Organization> + </UserData> + + <ImageInstall> + <OSImage> + <InstallTo> + <DiskID>0</DiskID> + <PartitionID>1</PartitionID> + </InstallTo> + <WillShowUI>OnError</WillShowUI> + <InstallToAvailablePartition>false</InstallToAvailablePartition> + <InstallFrom> + <MetaData wcm:action="add"> + <Key>/IMAGE/NAME</Key> + <Value>Windows Server 2008 R2 SERVERSTANDARD</Value> + </MetaData> + </InstallFrom> + </OSImage> + </ImageInstall> + + </component> + + <component name="Microsoft-Windows-International-Core-WinPE" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <SetupUILanguage> + <UILanguage>en-US</UILanguage> + </SetupUILanguage> + <InputLocale>en-US</InputLocale> + <SystemLocale>en-US</SystemLocale> + <UILanguage>en-US</UILanguage> + <UILanguageFallback>en-US</UILanguageFallback> + <UserLocale>en-US</UserLocale> + </component> + </settings> + + + <settings pass="oobeSystem"> + <component name="Microsoft-Windows-Shell-Setup" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <UserAccounts> + <AdministratorPassword> + <Value>vagrant</Value> + <PlainText>true</PlainText> + </AdministratorPassword> + <LocalAccounts> + <LocalAccount wcm:action="add"> + <Password> + <Value>vagrant</Value> + <PlainText>true</PlainText> + </Password> + <Description>Vagrant User</Description> + <DisplayName>vagrant</DisplayName> + <Group>administrators</Group> + <Name>vagrant</Name> + </LocalAccount> + </LocalAccounts> + </UserAccounts> + <OOBE> + <HideEULAPage>true</HideEULAPage> + <HideWirelessSetupInOOBE>true</HideWirelessSetupInOOBE> + <NetworkLocation>Home</NetworkLocation> + </OOBE> + <AutoLogon> + <Password> + <Value>vagrant</Value> + <PlainText>true</PlainText> + </Password> + <Username>administrator</Username> + <Enabled>true</Enabled> + </AutoLogon> + <FirstLogonCommands> + <!-- <SynchronousCommand wcm:action="add"> --> + <!-- <CommandLine>cmd.exe /c a:install-cygwin-sshd.bat</CommandLine> --> + <!-- <Description>Install Cygwin SSH</Description> --> + <!-- <Order>1</Order> --> + <!-- <RequiresUserInput>true</RequiresUserInput> --> + <!-- </SynchronousCommand> --> + <!-- <SynchronousCommand wcm:action="add"> --> + <!-- <CommandLine>cmd.exe /c a:install-winrm.bat</CommandLine> --> + <!-- <Description>Install Win RM</Description> --> + <!-- <Order>2</Order> --> + <!-- <RequiresUserInput>true</RequiresUserInput> --> + <!-- </SynchronousCommand> --> + <SynchronousCommand wcm:action="add"> + <CommandLine>cmd.exe /c winrm quickconfig -q</CommandLine> + <Description>winrm quickconfig -q</Description> + <Order>1</Order> + <RequiresUserInput>true</RequiresUserInput> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <CommandLine>cmd.exe /c winrm quickconfig -transport:http</CommandLine> + <Description>winrm quickconfig -transport:http</Description> + <Order>2</Order> + <RequiresUserInput>true</RequiresUserInput> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <CommandLine>cmd.exe /c winrm set winrm/config @{MaxTimeoutms="1800000"}</CommandLine> + <Description>Win RM MaxTimoutms</Description> + <Order>3</Order> + <RequiresUserInput>true</RequiresUserInput> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <CommandLine>cmd.exe /c winrm set winrm/config/winrs @{MaxMemoryPerShellMB="300"}</CommandLine> + <Description>Win RM MaxMemoryPerShellMB</Description> + <Order>4</Order> + <RequiresUserInput>true</RequiresUserInput> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <CommandLine>cmd.exe /c winrm set winrm/config/service @{AllowUnencrypted="true"}</CommandLine> + <Description>Win RM AllowUnencrypted</Description> + <Order>5</Order> + <RequiresUserInput>true</RequiresUserInput> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <CommandLine>cmd.exe /c winrm set winrm/config/service/auth @{Basic="true"}</CommandLine> + <Description>Win RM auth Basic</Description> + <Order>6</Order> + <RequiresUserInput>true</RequiresUserInput> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <CommandLine>cmd.exe /c winrm set winrm/config/client/auth @{Basic="true"}</CommandLine> + <Description>Win RM auth Basic</Description> + <Order>7</Order> + <RequiresUserInput>true</RequiresUserInput> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <CommandLine>cmd.exe /c winrm set winrm/config/listener?Address=*+Transport=HTTP @{Port="5985"} </CommandLine> + <Description>Win RM listener Address/Port</Description> + <Order>8</Order> + <RequiresUserInput>true</RequiresUserInput> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <CommandLine>cmd.exe /c netsh advfirewall firewall set rule group="remote administration" new enable=yes </CommandLine> + <Description>Win RM adv firewall enable</Description> + <Order>9</Order> + <RequiresUserInput>true</RequiresUserInput> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <CommandLine>cmd.exe /c netsh firewall add portopening TCP 5985 "Port 5985" </CommandLine> + <Description>Win RM port open</Description> + <Order>10</Order> + <RequiresUserInput>true</RequiresUserInput> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <CommandLine>cmd.exe /c net stop winrm </CommandLine> + <Description>Stop Win RM Service </Description> + <Order>11</Order> + <RequiresUserInput>true</RequiresUserInput> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <CommandLine>cmd.exe /c sc config winrm start= auto</CommandLine> + <Description>Win RM Autostart</Description> + <Order>12</Order> + <RequiresUserInput>true</RequiresUserInput> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <CommandLine>cmd.exe /c net start winrm </CommandLine> + <Description>Start Win RM Service</Description> + <Order>13</Order> + <RequiresUserInput>true</RequiresUserInput> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <CommandLine>powershell -Command "Set-ExecutionPolicy -ExecutionPolicy RemoteSigned -Force"</CommandLine> + <Description>Start Win RM Service</Description> + <Order>14</Order> + <RequiresUserInput>true</RequiresUserInput> + </SynchronousCommand> + </FirstLogonCommands> + <ShowWindowsLive>false</ShowWindowsLive> + </component> + </settings> + <settings pass="specialize"> + <component name="Microsoft-Windows-Shell-Setup" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" > + <OEMInformation> + <HelpCustomized>false</HelpCustomized> + </OEMInformation> + <!-- Rename computer here. --> + <ComputerName>vagrant-2008R2</ComputerName> + <TimeZone>Pacific Standard Time</TimeZone> + <RegisteredOwner></RegisteredOwner> + </component> + <component name="Microsoft-Windows-Security-SPP-UX" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <SkipAutoActivation>true</SkipAutoActivation> + </component> + </settings> + <cpi:offlineImage cpi:source="catalog:d:/sources/install_windows server 2008 r2 serverdatacenter.clg" xmlns:cpi="urn:schemas-microsoft-com:cpi" /> +</unattend> diff --git a/definitions/windows-2012-standard/Autounattend.xml b/definitions/windows-2012-standard/Autounattend.xml index 9f0ed42f4..0c28830b8 100644 --- a/definitions/windows-2012-standard/Autounattend.xml +++ b/definitions/windows-2012-standard/Autounattend.xml @@ -1,163 +1,163 @@ -<?xml version="1.0" encoding="utf-8"?> -<unattend xmlns="urn:schemas-microsoft-com:unattend"> - <settings pass="windowsPE"> - <component name="Microsoft-Windows-International-Core-WinPE" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - <SetupUILanguage> - <UILanguage>en-US</UILanguage> - </SetupUILanguage> - <InputLocale>en-US</InputLocale> - <SystemLocale>en-US</SystemLocale> - <UILanguage>en-US</UILanguage> - <UserLocale>en-US</UserLocale> - </component> - <component name="Microsoft-Windows-Setup" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - <DiskConfiguration> - <Disk wcm:action="add"> - <CreatePartitions> - <CreatePartition wcm:action="add"> - <Order>1</Order> - <Size>20000</Size> - <Type>Primary</Type> - </CreatePartition> - </CreatePartitions> - <ModifyPartitions> - <ModifyPartition wcm:action="add"> - <Extend>false</Extend> - <Format>NTFS</Format> - <Label>Windows 2012</Label> - <Letter>C</Letter> - <Order>1</Order> - <PartitionID>1</PartitionID> - </ModifyPartition> - </ModifyPartitions> - <DiskID>0</DiskID> - <WillWipeDisk>true</WillWipeDisk> - </Disk> - </DiskConfiguration> - <ImageInstall> - <OSImage> - <InstallFrom> - <MetaData wcm:action="add"> - <Key>/IMAGE/NAME</Key> - <Value>Windows Server 2012 SERVERSTANDARD</Value> - </MetaData> - </InstallFrom> - <InstallTo> - <DiskID>0</DiskID> - <PartitionID>1</PartitionID> - </InstallTo> - </OSImage> - </ImageInstall> - <UserData> - <AcceptEula>true</AcceptEula> - <FullName>Vagrant</FullName> - <Organization>Vagrant</Organization> - </UserData> - </component> - </settings> - <settings pass="specialize"> - <component name="Microsoft-Windows-Shell-Setup" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - <AutoLogon> - <Password> - <Value>dgBhAGcAcgBhAG4AdABQAGEAcwBzAHcAbwByAGQA</Value> - <PlainText>false</PlainText> - </Password> - <Enabled>true</Enabled> - <Username>Administrator</Username> - </AutoLogon> - <ComputerName>vagrant-2012</ComputerName> - <RegisteredOrganization>Vagrant</RegisteredOrganization> - <RegisteredOwner>Vagrant</RegisteredOwner> - <TimeZone>UTC</TimeZone> - <ProductKey>XC9B7-NBPP2-83J2H-RHMBY-92BT4</ProductKey> - </component> - <component name="Microsoft-Windows-Security-SPP-UX" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - <SkipAutoActivation>true</SkipAutoActivation> - </component> - </settings> - <settings pass="oobeSystem"> - <component name="Microsoft-Windows-Shell-Setup" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - <AutoLogon> - <Password> - <Value>dgBhAGcAcgBhAG4AdABQAGEAcwBzAHcAbwByAGQA</Value> - <PlainText>false</PlainText> - </Password> - <Enabled>true</Enabled> - <Username>Administrator</Username> - </AutoLogon> - <FirstLogonCommands> - <SynchronousCommand wcm:action="add"> - <Order>1</Order> - <RequiresUserInput>true</RequiresUserInput> - <CommandLine>cmd.exe /c winrm quickconfig -q</CommandLine> - <Description>winrm quickconfig -q</Description> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <Order>2</Order> - <CommandLine>cmd.exe /c winrm set winrm/config/winrs @{MaxMemoryPerShellMB="300"}</CommandLine> - <RequiresUserInput>true</RequiresUserInput> - <Description>winrm memory</Description> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <CommandLine>cmd.exe /c winrm set winrm/config @{MaxTimeoutms="1800000"}</CommandLine> - <Description>winrm timeout</Description> - <Order>3</Order> - <RequiresUserInput>true</RequiresUserInput> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <CommandLine>cmd.exe /c winrm set winrm/config/service @{AllowUnencrypted="true"}</CommandLine> - <Description>winrm encryption</Description> - <Order>4</Order> - <RequiresUserInput>true</RequiresUserInput> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <CommandLine>winrm set winrm/config/service/auth @{Basic="true"}</CommandLine> - <Description>winrm basic auth</Description> - <Order>5</Order> - <RequiresUserInput>true</RequiresUserInput> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <CommandLine>cmd.exe /c netsh advfirewall firewall set rule name="Windows Remote Management (HTTP-In)" profile=public protocol=tcp localport=5985 remoteip=localsubnet new remoteip=any</CommandLine> - <Description>winrm firewall</Description> - <Order>6</Order> - <RequiresUserInput>true</RequiresUserInput> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <CommandLine>powershell -Command "Set-ExecutionPolicy -ExecutionPolicy RemoteSigned -Force"</CommandLine> - <Description>fix powershell remote exec policy</Description> - <Order>7</Order> - <RequiresUserInput>true</RequiresUserInput> - </SynchronousCommand> - </FirstLogonCommands> - <OOBE> - <HideEULAPage>true</HideEULAPage> - <HideWirelessSetupInOOBE>true</HideWirelessSetupInOOBE> - <NetworkLocation>Home</NetworkLocation> - <ProtectYourPC>1</ProtectYourPC> - <HideOnlineAccountScreens>true</HideOnlineAccountScreens> - <HideOEMRegistrationScreen>true</HideOEMRegistrationScreen> - <HideLocalAccountScreen>true</HideLocalAccountScreen> - </OOBE> - <UserAccounts> - <AdministratorPassword> - <Value>dgBhAGcAcgBhAG4AdABBAGQAbQBpAG4AaQBzAHQAcgBhAHQAbwByAFAAYQBzAHMAdwBvAHIAZAA=</Value> - <PlainText>false</PlainText> - </AdministratorPassword> - <LocalAccounts> - <LocalAccount wcm:action="add"> - <Password> - <Value>dgBhAGcAcgBhAG4AdABQAGEAcwBzAHcAbwByAGQA</Value> - <PlainText>false</PlainText> - </Password> - <Description>Vagrant User</Description> - <DisplayName>vagrant</DisplayName> - <Group>Administrators</Group> - <Name>vagrant</Name> - </LocalAccount> - </LocalAccounts> - </UserAccounts> - <ShowWindowsLive>false</ShowWindowsLive> - </component> - </settings> - <cpi:offlineImage cpi:source="wim:c:/users/administrator/documents/install.wim#Windows Server 2012 SERVERSTANDARD" xmlns:cpi="urn:schemas-microsoft-com:cpi" /> -</unattend> +<?xml version="1.0" encoding="utf-8"?> +<unattend xmlns="urn:schemas-microsoft-com:unattend"> + <settings pass="windowsPE"> + <component name="Microsoft-Windows-International-Core-WinPE" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <SetupUILanguage> + <UILanguage>en-US</UILanguage> + </SetupUILanguage> + <InputLocale>en-US</InputLocale> + <SystemLocale>en-US</SystemLocale> + <UILanguage>en-US</UILanguage> + <UserLocale>en-US</UserLocale> + </component> + <component name="Microsoft-Windows-Setup" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <DiskConfiguration> + <Disk wcm:action="add"> + <CreatePartitions> + <CreatePartition wcm:action="add"> + <Order>1</Order> + <Size>20000</Size> + <Type>Primary</Type> + </CreatePartition> + </CreatePartitions> + <ModifyPartitions> + <ModifyPartition wcm:action="add"> + <Extend>false</Extend> + <Format>NTFS</Format> + <Label>Windows 2012</Label> + <Letter>C</Letter> + <Order>1</Order> + <PartitionID>1</PartitionID> + </ModifyPartition> + </ModifyPartitions> + <DiskID>0</DiskID> + <WillWipeDisk>true</WillWipeDisk> + </Disk> + </DiskConfiguration> + <ImageInstall> + <OSImage> + <InstallFrom> + <MetaData wcm:action="add"> + <Key>/IMAGE/NAME</Key> + <Value>Windows Server 2012 SERVERSTANDARD</Value> + </MetaData> + </InstallFrom> + <InstallTo> + <DiskID>0</DiskID> + <PartitionID>1</PartitionID> + </InstallTo> + </OSImage> + </ImageInstall> + <UserData> + <AcceptEula>true</AcceptEula> + <FullName>Vagrant</FullName> + <Organization>Vagrant</Organization> + </UserData> + </component> + </settings> + <settings pass="specialize"> + <component name="Microsoft-Windows-Shell-Setup" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <AutoLogon> + <Password> + <Value>dgBhAGcAcgBhAG4AdABQAGEAcwBzAHcAbwByAGQA</Value> + <PlainText>false</PlainText> + </Password> + <Enabled>true</Enabled> + <Username>Administrator</Username> + </AutoLogon> + <ComputerName>vagrant-2012</ComputerName> + <RegisteredOrganization>Vagrant</RegisteredOrganization> + <RegisteredOwner>Vagrant</RegisteredOwner> + <TimeZone>UTC</TimeZone> + <ProductKey>XC9B7-NBPP2-83J2H-RHMBY-92BT4</ProductKey> + </component> + <component name="Microsoft-Windows-Security-SPP-UX" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <SkipAutoActivation>true</SkipAutoActivation> + </component> + </settings> + <settings pass="oobeSystem"> + <component name="Microsoft-Windows-Shell-Setup" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <AutoLogon> + <Password> + <Value>dgBhAGcAcgBhAG4AdABQAGEAcwBzAHcAbwByAGQA</Value> + <PlainText>false</PlainText> + </Password> + <Enabled>true</Enabled> + <Username>Administrator</Username> + </AutoLogon> + <FirstLogonCommands> + <SynchronousCommand wcm:action="add"> + <Order>1</Order> + <RequiresUserInput>true</RequiresUserInput> + <CommandLine>cmd.exe /c winrm quickconfig -q</CommandLine> + <Description>winrm quickconfig -q</Description> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <Order>2</Order> + <CommandLine>cmd.exe /c winrm set winrm/config/winrs @{MaxMemoryPerShellMB="300"}</CommandLine> + <RequiresUserInput>true</RequiresUserInput> + <Description>winrm memory</Description> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <CommandLine>cmd.exe /c winrm set winrm/config @{MaxTimeoutms="1800000"}</CommandLine> + <Description>winrm timeout</Description> + <Order>3</Order> + <RequiresUserInput>true</RequiresUserInput> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <CommandLine>cmd.exe /c winrm set winrm/config/service @{AllowUnencrypted="true"}</CommandLine> + <Description>winrm encryption</Description> + <Order>4</Order> + <RequiresUserInput>true</RequiresUserInput> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <CommandLine>winrm set winrm/config/service/auth @{Basic="true"}</CommandLine> + <Description>winrm basic auth</Description> + <Order>5</Order> + <RequiresUserInput>true</RequiresUserInput> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <CommandLine>cmd.exe /c netsh advfirewall firewall set rule name="Windows Remote Management (HTTP-In)" profile=public protocol=tcp localport=5985 remoteip=localsubnet new remoteip=any</CommandLine> + <Description>winrm firewall</Description> + <Order>6</Order> + <RequiresUserInput>true</RequiresUserInput> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <CommandLine>powershell -Command "Set-ExecutionPolicy -ExecutionPolicy RemoteSigned -Force"</CommandLine> + <Description>fix powershell remote exec policy</Description> + <Order>7</Order> + <RequiresUserInput>true</RequiresUserInput> + </SynchronousCommand> + </FirstLogonCommands> + <OOBE> + <HideEULAPage>true</HideEULAPage> + <HideWirelessSetupInOOBE>true</HideWirelessSetupInOOBE> + <NetworkLocation>Home</NetworkLocation> + <ProtectYourPC>1</ProtectYourPC> + <HideOnlineAccountScreens>true</HideOnlineAccountScreens> + <HideOEMRegistrationScreen>true</HideOEMRegistrationScreen> + <HideLocalAccountScreen>true</HideLocalAccountScreen> + </OOBE> + <UserAccounts> + <AdministratorPassword> + <Value>dgBhAGcAcgBhAG4AdABBAGQAbQBpAG4AaQBzAHQAcgBhAHQAbwByAFAAYQBzAHMAdwBvAHIAZAA=</Value> + <PlainText>false</PlainText> + </AdministratorPassword> + <LocalAccounts> + <LocalAccount wcm:action="add"> + <Password> + <Value>dgBhAGcAcgBhAG4AdABQAGEAcwBzAHcAbwByAGQA</Value> + <PlainText>false</PlainText> + </Password> + <Description>Vagrant User</Description> + <DisplayName>vagrant</DisplayName> + <Group>Administrators</Group> + <Name>vagrant</Name> + </LocalAccount> + </LocalAccounts> + </UserAccounts> + <ShowWindowsLive>false</ShowWindowsLive> + </component> + </settings> + <cpi:offlineImage cpi:source="wim:c:/users/administrator/documents/install.wim#Windows Server 2012 SERVERSTANDARD" xmlns:cpi="urn:schemas-microsoft-com:cpi" /> +</unattend> diff --git a/definitions/windows-2012r2-standard/Autounattend.xml b/definitions/windows-2012r2-standard/Autounattend.xml index 23f68051c..868aba776 100644 --- a/definitions/windows-2012r2-standard/Autounattend.xml +++ b/definitions/windows-2012r2-standard/Autounattend.xml @@ -1,164 +1,164 @@ -<?xml version="1.0" encoding="utf-8"?> -<unattend xmlns="urn:schemas-microsoft-com:unattend"> - <servicing></servicing> - <settings pass="windowsPE"> - <component name="Microsoft-Windows-International-Core-WinPE" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - <SetupUILanguage> - <UILanguage>en-US</UILanguage> - </SetupUILanguage> - <InputLocale>en-US</InputLocale> - <SystemLocale>en-US</SystemLocale> - <UILanguage>en-US</UILanguage> - <UserLocale>en-US</UserLocale> - </component> - <component name="Microsoft-Windows-Setup" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - <DiskConfiguration> - <Disk wcm:action="add"> - <CreatePartitions> - <CreatePartition wcm:action="add"> - <Order>1</Order> - <Size>20000</Size> - <Type>Primary</Type> - </CreatePartition> - </CreatePartitions> - <ModifyPartitions> - <ModifyPartition wcm:action="add"> - <Extend>false</Extend> - <Format>NTFS</Format> - <Label>Windows 2012R2</Label> - <Letter>C</Letter> - <Order>1</Order> - <PartitionID>1</PartitionID> - </ModifyPartition> - </ModifyPartitions> - <DiskID>0</DiskID> - <WillWipeDisk>true</WillWipeDisk> - </Disk> - </DiskConfiguration> - <ImageInstall> - <OSImage> - <InstallFrom> - <MetaData wcm:action="add"> - <Key>/IMAGE/NAME</Key> - <Value>Windows Server 2012 R2 SERVERSTANDARD</Value> - </MetaData> - </InstallFrom> - <InstallTo> - <DiskID>0</DiskID> - <PartitionID>1</PartitionID> - </InstallTo> - </OSImage> - </ImageInstall> - <UserData> - <AcceptEula>true</AcceptEula> - <FullName>Vagrant</FullName> - <Organization>Vagrant</Organization> - </UserData> - </component> - </settings> - <settings pass="specialize"> - <component name="Microsoft-Windows-Shell-Setup" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - <AutoLogon> - <Password> - <Value>dgBhAGcAcgBhAG4AdABQAGEAcwBzAHcAbwByAGQA</Value> - <PlainText>false</PlainText> - </Password> - <Enabled>true</Enabled> - <Username>Administrator</Username> - </AutoLogon> - <ComputerName>vagrant-2012</ComputerName> - <RegisteredOrganization>Vagrant</RegisteredOrganization> - <RegisteredOwner>Vagrant</RegisteredOwner> - <TimeZone>UTC</TimeZone> - <ProductKey>W3GGN-FT8W3-Y4M27-J84CP-Q3VJ9</ProductKey> - </component> - <component name="Microsoft-Windows-Security-SPP-UX" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - <SkipAutoActivation>true</SkipAutoActivation> - </component> - </settings> - <settings pass="oobeSystem"> - <component name="Microsoft-Windows-Shell-Setup" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - <AutoLogon> - <Password> - <Value>dgBhAGcAcgBhAG4AdABQAGEAcwBzAHcAbwByAGQA</Value> - <PlainText>false</PlainText> - </Password> - <Enabled>true</Enabled> - <Username>Administrator</Username> - </AutoLogon> - <FirstLogonCommands> - <SynchronousCommand wcm:action="add"> - <Order>1</Order> - <RequiresUserInput>true</RequiresUserInput> - <CommandLine>cmd.exe /c winrm quickconfig -q</CommandLine> - <Description>winrm quickconfig -q</Description> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <Order>2</Order> - <CommandLine>cmd.exe /c winrm set winrm/config/winrs @{MaxMemoryPerShellMB="300"}</CommandLine> - <RequiresUserInput>true</RequiresUserInput> - <Description>winrm memory</Description> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <CommandLine>cmd.exe /c winrm set winrm/config @{MaxTimeoutms="1800000"}</CommandLine> - <Description>winrm timeout</Description> - <Order>3</Order> - <RequiresUserInput>true</RequiresUserInput> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <CommandLine>cmd.exe /c winrm set winrm/config/service @{AllowUnencrypted="true"}</CommandLine> - <Description>winrm encryption</Description> - <Order>4</Order> - <RequiresUserInput>true</RequiresUserInput> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <CommandLine>winrm set winrm/config/service/auth @{Basic="true"}</CommandLine> - <Description>winrm basic auth</Description> - <Order>5</Order> - <RequiresUserInput>true</RequiresUserInput> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <CommandLine>cmd.exe /c netsh advfirewall firewall set rule name="Windows Remote Management (HTTP-In)" profile=public protocol=tcp localport=5985 remoteip=localsubnet new remoteip=any</CommandLine> - <Description>winrm firewall</Description> - <Order>6</Order> - <RequiresUserInput>true</RequiresUserInput> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <CommandLine>powershell -Command "Set-ExecutionPolicy -ExecutionPolicy RemoteSigned -Force"</CommandLine> - <Description>fix powershell remote exec policy</Description> - <Order>7</Order> - <RequiresUserInput>true</RequiresUserInput> - </SynchronousCommand> - </FirstLogonCommands> - <OOBE> - <HideEULAPage>true</HideEULAPage> - <HideWirelessSetupInOOBE>true</HideWirelessSetupInOOBE> - <NetworkLocation>Home</NetworkLocation> - <ProtectYourPC>1</ProtectYourPC> - <HideOnlineAccountScreens>true</HideOnlineAccountScreens> - <HideOEMRegistrationScreen>true</HideOEMRegistrationScreen> - <HideLocalAccountScreen>true</HideLocalAccountScreen> - </OOBE> - <UserAccounts> - <AdministratorPassword> - <Value>dgBhAGcAcgBhAG4AdABBAGQAbQBpAG4AaQBzAHQAcgBhAHQAbwByAFAAYQBzAHMAdwBvAHIAZAA=</Value> - <PlainText>false</PlainText> - </AdministratorPassword> - <LocalAccounts> - <LocalAccount wcm:action="add"> - <Password> - <Value>dgBhAGcAcgBhAG4AdABQAGEAcwBzAHcAbwByAGQA</Value> - <PlainText>false</PlainText> - </Password> - <Description>Vagrant User</Description> - <DisplayName>vagrant</DisplayName> - <Group>Administrators</Group> - <Name>vagrant</Name> - </LocalAccount> - </LocalAccounts> - </UserAccounts> - <ShowWindowsLive>false</ShowWindowsLive> - </component> - </settings> - <cpi:offlineImage cpi:source="wim:c:/users/administrator/documents/install.wim#Windows Server 2012R2 SERVERSTANDARD" xmlns:cpi="urn:schemas-microsoft-com:cpi" /> -</unattend> +<?xml version="1.0" encoding="utf-8"?> +<unattend xmlns="urn:schemas-microsoft-com:unattend"> + <servicing></servicing> + <settings pass="windowsPE"> + <component name="Microsoft-Windows-International-Core-WinPE" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <SetupUILanguage> + <UILanguage>en-US</UILanguage> + </SetupUILanguage> + <InputLocale>en-US</InputLocale> + <SystemLocale>en-US</SystemLocale> + <UILanguage>en-US</UILanguage> + <UserLocale>en-US</UserLocale> + </component> + <component name="Microsoft-Windows-Setup" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <DiskConfiguration> + <Disk wcm:action="add"> + <CreatePartitions> + <CreatePartition wcm:action="add"> + <Order>1</Order> + <Size>20000</Size> + <Type>Primary</Type> + </CreatePartition> + </CreatePartitions> + <ModifyPartitions> + <ModifyPartition wcm:action="add"> + <Extend>false</Extend> + <Format>NTFS</Format> + <Label>Windows 2012R2</Label> + <Letter>C</Letter> + <Order>1</Order> + <PartitionID>1</PartitionID> + </ModifyPartition> + </ModifyPartitions> + <DiskID>0</DiskID> + <WillWipeDisk>true</WillWipeDisk> + </Disk> + </DiskConfiguration> + <ImageInstall> + <OSImage> + <InstallFrom> + <MetaData wcm:action="add"> + <Key>/IMAGE/NAME</Key> + <Value>Windows Server 2012 R2 SERVERSTANDARD</Value> + </MetaData> + </InstallFrom> + <InstallTo> + <DiskID>0</DiskID> + <PartitionID>1</PartitionID> + </InstallTo> + </OSImage> + </ImageInstall> + <UserData> + <AcceptEula>true</AcceptEula> + <FullName>Vagrant</FullName> + <Organization>Vagrant</Organization> + </UserData> + </component> + </settings> + <settings pass="specialize"> + <component name="Microsoft-Windows-Shell-Setup" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <AutoLogon> + <Password> + <Value>dgBhAGcAcgBhAG4AdABQAGEAcwBzAHcAbwByAGQA</Value> + <PlainText>false</PlainText> + </Password> + <Enabled>true</Enabled> + <Username>Administrator</Username> + </AutoLogon> + <ComputerName>vagrant-2012</ComputerName> + <RegisteredOrganization>Vagrant</RegisteredOrganization> + <RegisteredOwner>Vagrant</RegisteredOwner> + <TimeZone>UTC</TimeZone> + <ProductKey>W3GGN-FT8W3-Y4M27-J84CP-Q3VJ9</ProductKey> + </component> + <component name="Microsoft-Windows-Security-SPP-UX" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <SkipAutoActivation>true</SkipAutoActivation> + </component> + </settings> + <settings pass="oobeSystem"> + <component name="Microsoft-Windows-Shell-Setup" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <AutoLogon> + <Password> + <Value>dgBhAGcAcgBhAG4AdABQAGEAcwBzAHcAbwByAGQA</Value> + <PlainText>false</PlainText> + </Password> + <Enabled>true</Enabled> + <Username>Administrator</Username> + </AutoLogon> + <FirstLogonCommands> + <SynchronousCommand wcm:action="add"> + <Order>1</Order> + <RequiresUserInput>true</RequiresUserInput> + <CommandLine>cmd.exe /c winrm quickconfig -q</CommandLine> + <Description>winrm quickconfig -q</Description> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <Order>2</Order> + <CommandLine>cmd.exe /c winrm set winrm/config/winrs @{MaxMemoryPerShellMB="300"}</CommandLine> + <RequiresUserInput>true</RequiresUserInput> + <Description>winrm memory</Description> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <CommandLine>cmd.exe /c winrm set winrm/config @{MaxTimeoutms="1800000"}</CommandLine> + <Description>winrm timeout</Description> + <Order>3</Order> + <RequiresUserInput>true</RequiresUserInput> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <CommandLine>cmd.exe /c winrm set winrm/config/service @{AllowUnencrypted="true"}</CommandLine> + <Description>winrm encryption</Description> + <Order>4</Order> + <RequiresUserInput>true</RequiresUserInput> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <CommandLine>winrm set winrm/config/service/auth @{Basic="true"}</CommandLine> + <Description>winrm basic auth</Description> + <Order>5</Order> + <RequiresUserInput>true</RequiresUserInput> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <CommandLine>cmd.exe /c netsh advfirewall firewall set rule name="Windows Remote Management (HTTP-In)" profile=public protocol=tcp localport=5985 remoteip=localsubnet new remoteip=any</CommandLine> + <Description>winrm firewall</Description> + <Order>6</Order> + <RequiresUserInput>true</RequiresUserInput> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <CommandLine>powershell -Command "Set-ExecutionPolicy -ExecutionPolicy RemoteSigned -Force"</CommandLine> + <Description>fix powershell remote exec policy</Description> + <Order>7</Order> + <RequiresUserInput>true</RequiresUserInput> + </SynchronousCommand> + </FirstLogonCommands> + <OOBE> + <HideEULAPage>true</HideEULAPage> + <HideWirelessSetupInOOBE>true</HideWirelessSetupInOOBE> + <NetworkLocation>Home</NetworkLocation> + <ProtectYourPC>1</ProtectYourPC> + <HideOnlineAccountScreens>true</HideOnlineAccountScreens> + <HideOEMRegistrationScreen>true</HideOEMRegistrationScreen> + <HideLocalAccountScreen>true</HideLocalAccountScreen> + </OOBE> + <UserAccounts> + <AdministratorPassword> + <Value>dgBhAGcAcgBhAG4AdABBAGQAbQBpAG4AaQBzAHQAcgBhAHQAbwByAFAAYQBzAHMAdwBvAHIAZAA=</Value> + <PlainText>false</PlainText> + </AdministratorPassword> + <LocalAccounts> + <LocalAccount wcm:action="add"> + <Password> + <Value>dgBhAGcAcgBhAG4AdABQAGEAcwBzAHcAbwByAGQA</Value> + <PlainText>false</PlainText> + </Password> + <Description>Vagrant User</Description> + <DisplayName>vagrant</DisplayName> + <Group>Administrators</Group> + <Name>vagrant</Name> + </LocalAccount> + </LocalAccounts> + </UserAccounts> + <ShowWindowsLive>false</ShowWindowsLive> + </component> + </settings> + <cpi:offlineImage cpi:source="wim:c:/users/administrator/documents/install.wim#Windows Server 2012R2 SERVERSTANDARD" xmlns:cpi="urn:schemas-microsoft-com:cpi" /> +</unattend> diff --git a/definitions/windows-7-enterprise/Autounattend.xml b/definitions/windows-7-enterprise/Autounattend.xml index 12a9793cb..4ec08daba 100644 --- a/definitions/windows-7-enterprise/Autounattend.xml +++ b/definitions/windows-7-enterprise/Autounattend.xml @@ -1,233 +1,233 @@ -<?xml version="1.0" encoding="utf-8"?> -<unattend xmlns="urn:schemas-microsoft-com:unattend"> - <servicing></servicing> - <settings pass="windowsPE"> - <component name="Microsoft-Windows-Setup" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - <DiskConfiguration> - <Disk wcm:action="add"> - <CreatePartitions> - <CreatePartition wcm:action="add"> - <Order>1</Order> - <Type>Primary</Type> - <Size>20000</Size> - </CreatePartition> - </CreatePartitions> - <ModifyPartitions> - <ModifyPartition wcm:action="add"> - <Extend>false</Extend> - <Format>NTFS</Format> - <Letter>C</Letter> - <Order>1</Order> - <PartitionID>1</PartitionID> - <Label>Windows 7 Enterprise</Label> - </ModifyPartition> - </ModifyPartitions> - <DiskID>0</DiskID> - <WillWipeDisk>true</WillWipeDisk> - </Disk> - <WillShowUI>OnError</WillShowUI> - </DiskConfiguration> - <UserData> - <ProductKey> - <WillShowUI>Never</WillShowUI> - </ProductKey> - <AcceptEula>true</AcceptEula> - <FullName>Vagrant Fullname</FullName> - <Organization>Vagrant Inc</Organization> - </UserData> - <ImageInstall> - <OSImage> - <InstallTo> - <DiskID>0</DiskID> - <PartitionID>1</PartitionID> - </InstallTo> - <WillShowUI>OnError</WillShowUI> - <InstallToAvailablePartition>false</InstallToAvailablePartition> - <InstallFrom> - <MetaData wcm:action="add"> - <Key>/IMAGE/NAME</Key> - <Value>Windows 7 ENTERPRISE</Value> - </MetaData> - </InstallFrom> - </OSImage> - </ImageInstall> - </component> - <component name="Microsoft-Windows-International-Core-WinPE" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - <SetupUILanguage> - <UILanguage>en-US</UILanguage> - </SetupUILanguage> - <InputLocale>en-US</InputLocale> - <SystemLocale>en-US</SystemLocale> - <UILanguage>en-US</UILanguage> - <UILanguageFallback>en-US</UILanguageFallback> - <UserLocale>en-US</UserLocale> - </component> - </settings> - <settings pass="oobeSystem"> - <component name="Microsoft-Windows-Shell-Setup" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - <UserAccounts> - <AdministratorPassword> - <Value>vagrant</Value> - <PlainText>true</PlainText> - </AdministratorPassword> - <LocalAccounts> - <LocalAccount wcm:action="add"> - <Password> - <Value>vagrant</Value> - <PlainText>true</PlainText> - </Password> - <Description>Vagrant User</Description> - <DisplayName>vagrant</DisplayName> - <Group>administrators</Group> - <Name>vagrant</Name> - </LocalAccount> - </LocalAccounts> - </UserAccounts> - <OOBE> - <HideEULAPage>true</HideEULAPage> - <HideWirelessSetupInOOBE>true</HideWirelessSetupInOOBE> - <NetworkLocation>Work</NetworkLocation> - <ProtectYourPC>3</ProtectYourPC> - </OOBE> - <AutoLogon> - <Password> - <Value>vagrant</Value> - <PlainText>true</PlainText> - </Password> - <Username>vagrant</Username> - <Enabled>true</Enabled> - </AutoLogon> - <FirstLogonCommands> - <!-- <SynchronousCommand wcm:action="add"> --> - <!-- <CommandLine>cmd.exe /c a:install-cygwin-sshd.bat</CommandLine> --> - <!-- <Description>Install Cygwin SSH</Description> --> - <!-- <Order>1</Order> --> - <!-- <RequiresUserInput>true</RequiresUserInput> --> - <!-- </SynchronousCommand> --> - <!-- <SynchronousCommand wcm:action="add"> --> - <!-- <CommandLine>cmd.exe /c a:install-vbox-guest.bat</CommandLine> --> - <!-- <Description>Install Win RM</Description> --> - <!-- <Order>1</Order> --> - <!-- <RequiresUserInput>true</RequiresUserInput> --> - <!-- </SynchronousCommand> --> - <SynchronousCommand wcm:action="add"> - <CommandLine>cmd.exe /c winrm quickconfig -q</CommandLine> - <Description>winrm quickconfig -q</Description> - <Order>1</Order> - <RequiresUserInput>true</RequiresUserInput> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <CommandLine>cmd.exe /c winrm quickconfig -transport:http</CommandLine> - <Description>winrm quickconfig -transport:http</Description> - <Order>2</Order> - <RequiresUserInput>true</RequiresUserInput> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <CommandLine>cmd.exe /c winrm set winrm/config @{MaxTimeoutms="1800000"}</CommandLine> - <Description>Win RM MaxTimoutms</Description> - <Order>3</Order> - <RequiresUserInput>true</RequiresUserInput> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <CommandLine>cmd.exe /c winrm set winrm/config/winrs @{MaxMemoryPerShellMB="300"}</CommandLine> - <Description>Win RM MaxMemoryPerShellMB</Description> - <Order>4</Order> - <RequiresUserInput>true</RequiresUserInput> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <CommandLine>cmd.exe /c winrm set winrm/config/service @{AllowUnencrypted="true"}</CommandLine> - <Description>Win RM AllowUnencrypted</Description> - <Order>5</Order> - <RequiresUserInput>true</RequiresUserInput> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <CommandLine>cmd.exe /c winrm set winrm/config/service/auth @{Basic="true"}</CommandLine> - <Description>Win RM auth Basic</Description> - <Order>6</Order> - <RequiresUserInput>true</RequiresUserInput> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <CommandLine>cmd.exe /c winrm set winrm/config/client/auth @{Basic="true"}</CommandLine> - <Description>Win RM auth Basic</Description> - <Order>7</Order> - <RequiresUserInput>true</RequiresUserInput> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <CommandLine>cmd.exe /c winrm set winrm/config/listener?Address=*+Transport=HTTP @{Port="5985"} </CommandLine> - <Description>Win RM listener Address/Port</Description> - <Order>8</Order> - <RequiresUserInput>true</RequiresUserInput> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <CommandLine>cmd.exe /c netsh advfirewall firewall set rule group="remote administration" new enable=yes </CommandLine> - <Description>Win RM adv firewall enable</Description> - <Order>9</Order> - <RequiresUserInput>true</RequiresUserInput> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <CommandLine>cmd.exe /c netsh firewall add portopening TCP 5985 "Port 5985" </CommandLine> - <Description>Win RM port open</Description> - <Order>10</Order> - <RequiresUserInput>true</RequiresUserInput> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <CommandLine>cmd.exe /c net stop winrm </CommandLine> - <Description>Stop Win RM Service </Description> - <Order>11</Order> - <RequiresUserInput>true</RequiresUserInput> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <CommandLine>cmd.exe /c sc config winrm start= auto</CommandLine> - <Description>Win RM Autostart</Description> - <Order>12</Order> - <RequiresUserInput>true</RequiresUserInput> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <CommandLine>cmd.exe /c net start winrm </CommandLine> - <Description>Start Win RM Service</Description> - <Order>13</Order> - <RequiresUserInput>true</RequiresUserInput> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <CommandLine>powershell -Command "Set-ExecutionPolicy -ExecutionPolicy RemoteSigned -Force"</CommandLine> - <Description>Start Win RM Service</Description> - <Order>14</Order> - <RequiresUserInput>true</RequiresUserInput> - </SynchronousCommand> - </FirstLogonCommands> - <ShowWindowsLive>false</ShowWindowsLive> - </component> - </settings> - <settings pass="specialize"> - <component name="Microsoft-Windows-Shell-Setup" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> - <OEMInformation> - <HelpCustomized>false</HelpCustomized> - </OEMInformation> - <!-- Rename computer here. --> - <ComputerName>vagrant-win7ent</ComputerName> - <TimeZone>Pacific Standard Time</TimeZone> - <RegisteredOwner>Vagrant</RegisteredOwner> - <ShowWindowsLive>false</ShowWindowsLive> - </component> - <component name="Microsoft-Windows-Security-SPP-UX" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - <SkipAutoActivation>true</SkipAutoActivation> - </component> - <component name="Security-Malware-Windows-Defender" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - <DisableAntiSpyware>true</DisableAntiSpyware> - </component> - <component name="Microsoft-Windows-SystemRestore-Main" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - <DisableSR>1</DisableSR> - </component> - </settings> - <settings pass="generalize"> - <component name="Microsoft-Windows-Security-SPP" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - <SkipRearm>1</SkipRearm> - </component> - </settings> - <settings pass="offlineServicing"> - <component name="Microsoft-Windows-LUA-Settings" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - <EnableLUA>false</EnableLUA> - </component> - </settings> - <cpi:offlineImage cpi:source="catalog:d:/sources/install_windows 7 enterprise.clg" xmlns:cpi="urn:schemas-microsoft-com:cpi" /> -</unattend> +<?xml version="1.0" encoding="utf-8"?> +<unattend xmlns="urn:schemas-microsoft-com:unattend"> + <servicing></servicing> + <settings pass="windowsPE"> + <component name="Microsoft-Windows-Setup" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <DiskConfiguration> + <Disk wcm:action="add"> + <CreatePartitions> + <CreatePartition wcm:action="add"> + <Order>1</Order> + <Type>Primary</Type> + <Size>20000</Size> + </CreatePartition> + </CreatePartitions> + <ModifyPartitions> + <ModifyPartition wcm:action="add"> + <Extend>false</Extend> + <Format>NTFS</Format> + <Letter>C</Letter> + <Order>1</Order> + <PartitionID>1</PartitionID> + <Label>Windows 7 Enterprise</Label> + </ModifyPartition> + </ModifyPartitions> + <DiskID>0</DiskID> + <WillWipeDisk>true</WillWipeDisk> + </Disk> + <WillShowUI>OnError</WillShowUI> + </DiskConfiguration> + <UserData> + <ProductKey> + <WillShowUI>Never</WillShowUI> + </ProductKey> + <AcceptEula>true</AcceptEula> + <FullName>Vagrant Fullname</FullName> + <Organization>Vagrant Inc</Organization> + </UserData> + <ImageInstall> + <OSImage> + <InstallTo> + <DiskID>0</DiskID> + <PartitionID>1</PartitionID> + </InstallTo> + <WillShowUI>OnError</WillShowUI> + <InstallToAvailablePartition>false</InstallToAvailablePartition> + <InstallFrom> + <MetaData wcm:action="add"> + <Key>/IMAGE/NAME</Key> + <Value>Windows 7 ENTERPRISE</Value> + </MetaData> + </InstallFrom> + </OSImage> + </ImageInstall> + </component> + <component name="Microsoft-Windows-International-Core-WinPE" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <SetupUILanguage> + <UILanguage>en-US</UILanguage> + </SetupUILanguage> + <InputLocale>en-US</InputLocale> + <SystemLocale>en-US</SystemLocale> + <UILanguage>en-US</UILanguage> + <UILanguageFallback>en-US</UILanguageFallback> + <UserLocale>en-US</UserLocale> + </component> + </settings> + <settings pass="oobeSystem"> + <component name="Microsoft-Windows-Shell-Setup" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <UserAccounts> + <AdministratorPassword> + <Value>vagrant</Value> + <PlainText>true</PlainText> + </AdministratorPassword> + <LocalAccounts> + <LocalAccount wcm:action="add"> + <Password> + <Value>vagrant</Value> + <PlainText>true</PlainText> + </Password> + <Description>Vagrant User</Description> + <DisplayName>vagrant</DisplayName> + <Group>administrators</Group> + <Name>vagrant</Name> + </LocalAccount> + </LocalAccounts> + </UserAccounts> + <OOBE> + <HideEULAPage>true</HideEULAPage> + <HideWirelessSetupInOOBE>true</HideWirelessSetupInOOBE> + <NetworkLocation>Work</NetworkLocation> + <ProtectYourPC>3</ProtectYourPC> + </OOBE> + <AutoLogon> + <Password> + <Value>vagrant</Value> + <PlainText>true</PlainText> + </Password> + <Username>vagrant</Username> + <Enabled>true</Enabled> + </AutoLogon> + <FirstLogonCommands> + <!-- <SynchronousCommand wcm:action="add"> --> + <!-- <CommandLine>cmd.exe /c a:install-cygwin-sshd.bat</CommandLine> --> + <!-- <Description>Install Cygwin SSH</Description> --> + <!-- <Order>1</Order> --> + <!-- <RequiresUserInput>true</RequiresUserInput> --> + <!-- </SynchronousCommand> --> + <!-- <SynchronousCommand wcm:action="add"> --> + <!-- <CommandLine>cmd.exe /c a:install-vbox-guest.bat</CommandLine> --> + <!-- <Description>Install Win RM</Description> --> + <!-- <Order>1</Order> --> + <!-- <RequiresUserInput>true</RequiresUserInput> --> + <!-- </SynchronousCommand> --> + <SynchronousCommand wcm:action="add"> + <CommandLine>cmd.exe /c winrm quickconfig -q</CommandLine> + <Description>winrm quickconfig -q</Description> + <Order>1</Order> + <RequiresUserInput>true</RequiresUserInput> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <CommandLine>cmd.exe /c winrm quickconfig -transport:http</CommandLine> + <Description>winrm quickconfig -transport:http</Description> + <Order>2</Order> + <RequiresUserInput>true</RequiresUserInput> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <CommandLine>cmd.exe /c winrm set winrm/config @{MaxTimeoutms="1800000"}</CommandLine> + <Description>Win RM MaxTimoutms</Description> + <Order>3</Order> + <RequiresUserInput>true</RequiresUserInput> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <CommandLine>cmd.exe /c winrm set winrm/config/winrs @{MaxMemoryPerShellMB="300"}</CommandLine> + <Description>Win RM MaxMemoryPerShellMB</Description> + <Order>4</Order> + <RequiresUserInput>true</RequiresUserInput> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <CommandLine>cmd.exe /c winrm set winrm/config/service @{AllowUnencrypted="true"}</CommandLine> + <Description>Win RM AllowUnencrypted</Description> + <Order>5</Order> + <RequiresUserInput>true</RequiresUserInput> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <CommandLine>cmd.exe /c winrm set winrm/config/service/auth @{Basic="true"}</CommandLine> + <Description>Win RM auth Basic</Description> + <Order>6</Order> + <RequiresUserInput>true</RequiresUserInput> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <CommandLine>cmd.exe /c winrm set winrm/config/client/auth @{Basic="true"}</CommandLine> + <Description>Win RM auth Basic</Description> + <Order>7</Order> + <RequiresUserInput>true</RequiresUserInput> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <CommandLine>cmd.exe /c winrm set winrm/config/listener?Address=*+Transport=HTTP @{Port="5985"} </CommandLine> + <Description>Win RM listener Address/Port</Description> + <Order>8</Order> + <RequiresUserInput>true</RequiresUserInput> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <CommandLine>cmd.exe /c netsh advfirewall firewall set rule group="remote administration" new enable=yes </CommandLine> + <Description>Win RM adv firewall enable</Description> + <Order>9</Order> + <RequiresUserInput>true</RequiresUserInput> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <CommandLine>cmd.exe /c netsh firewall add portopening TCP 5985 "Port 5985" </CommandLine> + <Description>Win RM port open</Description> + <Order>10</Order> + <RequiresUserInput>true</RequiresUserInput> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <CommandLine>cmd.exe /c net stop winrm </CommandLine> + <Description>Stop Win RM Service </Description> + <Order>11</Order> + <RequiresUserInput>true</RequiresUserInput> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <CommandLine>cmd.exe /c sc config winrm start= auto</CommandLine> + <Description>Win RM Autostart</Description> + <Order>12</Order> + <RequiresUserInput>true</RequiresUserInput> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <CommandLine>cmd.exe /c net start winrm </CommandLine> + <Description>Start Win RM Service</Description> + <Order>13</Order> + <RequiresUserInput>true</RequiresUserInput> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <CommandLine>powershell -Command "Set-ExecutionPolicy -ExecutionPolicy RemoteSigned -Force"</CommandLine> + <Description>Start Win RM Service</Description> + <Order>14</Order> + <RequiresUserInput>true</RequiresUserInput> + </SynchronousCommand> + </FirstLogonCommands> + <ShowWindowsLive>false</ShowWindowsLive> + </component> + </settings> + <settings pass="specialize"> + <component name="Microsoft-Windows-Shell-Setup" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> + <OEMInformation> + <HelpCustomized>false</HelpCustomized> + </OEMInformation> + <!-- Rename computer here. --> + <ComputerName>vagrant-win7ent</ComputerName> + <TimeZone>Pacific Standard Time</TimeZone> + <RegisteredOwner>Vagrant</RegisteredOwner> + <ShowWindowsLive>false</ShowWindowsLive> + </component> + <component name="Microsoft-Windows-Security-SPP-UX" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <SkipAutoActivation>true</SkipAutoActivation> + </component> + <component name="Security-Malware-Windows-Defender" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <DisableAntiSpyware>true</DisableAntiSpyware> + </component> + <component name="Microsoft-Windows-SystemRestore-Main" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <DisableSR>1</DisableSR> + </component> + </settings> + <settings pass="generalize"> + <component name="Microsoft-Windows-Security-SPP" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <SkipRearm>1</SkipRearm> + </component> + </settings> + <settings pass="offlineServicing"> + <component name="Microsoft-Windows-LUA-Settings" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <EnableLUA>false</EnableLUA> + </component> + </settings> + <cpi:offlineImage cpi:source="catalog:d:/sources/install_windows 7 enterprise.clg" xmlns:cpi="urn:schemas-microsoft-com:cpi" /> +</unattend> diff --git a/definitions/windows-8-enterprise/Autounattend.xml b/definitions/windows-8-enterprise/Autounattend.xml index 793830739..3a15757d6 100644 --- a/definitions/windows-8-enterprise/Autounattend.xml +++ b/definitions/windows-8-enterprise/Autounattend.xml @@ -1,235 +1,235 @@ -<?xml version="1.0" encoding="utf-8"?> -<unattend xmlns="urn:schemas-microsoft-com:unattend"> - <servicing></servicing> - - <settings pass="windowsPE"> - - <component name="Microsoft-Windows-Setup" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - - <DiskConfiguration> - <Disk wcm:action="add"> - - <CreatePartitions> - <CreatePartition wcm:action="add"> - <Order>1</Order> - <Type>Primary</Type> - <Size>20000</Size> - </CreatePartition> - </CreatePartitions> - - <ModifyPartitions> - <ModifyPartition wcm:action="add"> - <Extend>false</Extend> - <Format>NTFS</Format> - <Letter>C</Letter> - <Order>1</Order> - <PartitionID>1</PartitionID> - <Label>Windows 8</Label> - </ModifyPartition> - </ModifyPartitions> - - <DiskID>0</DiskID> - <WillWipeDisk>true</WillWipeDisk> - - </Disk> - <WillShowUI>OnError</WillShowUI> - </DiskConfiguration> - - <UserData> - <!-- Product Key from http://technet.microsoft.com/en-us/library/jj612867.aspx --> - <ProductKey>32JNW-9KQ84-P47T8-D8GGY-CWCK7 - <WillShowUI>Never</WillShowUI> - </ProductKey> - - <AcceptEula>true</AcceptEula> - <FullName>Vagrant Fullname</FullName> - <Organization>Vagrant Inc</Organization> - </UserData> - - <ImageInstall> - <OSImage> - <InstallTo> - <DiskID>0</DiskID> - <PartitionID>1</PartitionID> - </InstallTo> - <WillShowUI>OnError</WillShowUI> - <InstallToAvailablePartition>false</InstallToAvailablePartition> - <InstallFrom> - <MetaData wcm:action="add"> - <Key>/IMAGE/NAME</Key> - <Value>Windows 8 Enterprise Evaluation</Value> - </MetaData> - </InstallFrom> - </OSImage> - </ImageInstall> - - </component> - - <component name="Microsoft-Windows-International-Core-WinPE" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - <SetupUILanguage> - <UILanguage>en-US</UILanguage> - </SetupUILanguage> - <InputLocale>en-US</InputLocale> - <SystemLocale>en-US</SystemLocale> - <UILanguage>en-US</UILanguage> - <UILanguageFallback>en-US</UILanguageFallback> - <UserLocale>en-US</UserLocale> - </component> - </settings> - - - <settings pass="oobeSystem"> - <component name="Microsoft-Windows-Shell-Setup" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - <UserAccounts> - <AdministratorPassword> - <Value>vagrant</Value> - <PlainText>true</PlainText> - </AdministratorPassword> - <LocalAccounts> - <LocalAccount wcm:action="add"> - <Password> - <Value>vagrant</Value> - <PlainText>true</PlainText> - </Password> - <Description>Vagrant User</Description> - <DisplayName>vagrant</DisplayName> - <Group>administrators</Group> - <Name>vagrant</Name> - </LocalAccount> - </LocalAccounts> - </UserAccounts> - <OOBE> - <HideEULAPage>true</HideEULAPage> - <HideWirelessSetupInOOBE>true</HideWirelessSetupInOOBE> - <NetworkLocation>Home</NetworkLocation> - <ProtectYourPC>1</ProtectYourPC> - <HideOnlineAccountScreens>true</HideOnlineAccountScreens> - <HideLocalAccountScreen>true</HideLocalAccountScreen> - <SkipUserOOBE>true</SkipUserOOBE> - <HideOEMRegistrationScreen>true</HideOEMRegistrationScreen> - </OOBE> - <AutoLogon> - <Password> - <Value>vagrant</Value> - <PlainText>true</PlainText> - </Password> - <Username>administrator</Username> - <Enabled>true</Enabled> - </AutoLogon> - <FirstLogonCommands> - <!-- <SynchronousCommand wcm:action="add"> --> - <!-- <CommandLine>cmd.exe /c a:install-cygwin-sshd.bat</CommandLine> --> - <!-- <Description>Install Cygwin SSH</Description> --> - <!-- <Order>1</Order> --> - <!-- <RequiresUserInput>true</RequiresUserInput> --> - <!-- </SynchronousCommand> --> - <!-- <SynchronousCommand wcm:action="add"> --> - <!-- <CommandLine>cmd.exe /c a:install-winrm.bat</CommandLine> --> - <!-- <Description>Install Win RM</Description> --> - <!-- <Order>2</Order> --> - <!-- <RequiresUserInput>true</RequiresUserInput> --> - <!-- </SynchronousCommand> --> - <SynchronousCommand wcm:action="add"> - <CommandLine>cmd.exe /c winrm quickconfig -q</CommandLine> - <Description>winrm quickconfig -q</Description> - <Order>1</Order> - <RequiresUserInput>true</RequiresUserInput> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <CommandLine>cmd.exe /c winrm quickconfig -transport:http</CommandLine> - <Description>winrm quickconfig -transport:http</Description> - <Order>2</Order> - <RequiresUserInput>true</RequiresUserInput> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <CommandLine>cmd.exe /c winrm set winrm/config @{MaxTimeoutms="1800000"}</CommandLine> - <Description>Win RM MaxTimoutms</Description> - <Order>3</Order> - <RequiresUserInput>true</RequiresUserInput> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <CommandLine>cmd.exe /c winrm set winrm/config/winrs @{MaxMemoryPerShellMB="300"}</CommandLine> - <Description>Win RM MaxMemoryPerShellMB</Description> - <Order>4</Order> - <RequiresUserInput>true</RequiresUserInput> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <CommandLine>cmd.exe /c winrm set winrm/config/service @{AllowUnencrypted="true"}</CommandLine> - <Description>Win RM AllowUnencrypted</Description> - <Order>5</Order> - <RequiresUserInput>true</RequiresUserInput> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <CommandLine>cmd.exe /c winrm set winrm/config/service/auth @{Basic="true"}</CommandLine> - <Description>Win RM auth Basic</Description> - <Order>6</Order> - <RequiresUserInput>true</RequiresUserInput> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <CommandLine>cmd.exe /c winrm set winrm/config/client/auth @{Basic="true"}</CommandLine> - <Description>Win RM auth Basic</Description> - <Order>7</Order> - <RequiresUserInput>true</RequiresUserInput> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <CommandLine>cmd.exe /c winrm set winrm/config/listener?Address=*+Transport=HTTP @{Port="5985"} </CommandLine> - <Description>Win RM listener Address/Port</Description> - <Order>8</Order> - <RequiresUserInput>true</RequiresUserInput> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <CommandLine>cmd.exe /c netsh advfirewall firewall set rule group="remote administration" new enable=yes </CommandLine> - <Description>Win RM adv firewall enable</Description> - <Order>9</Order> - <RequiresUserInput>true</RequiresUserInput> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <CommandLine>cmd.exe /c netsh firewall add portopening TCP 5985 "Port 5985" </CommandLine> - <Description>Win RM port open</Description> - <Order>10</Order> - <RequiresUserInput>true</RequiresUserInput> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <CommandLine>cmd.exe /c net stop winrm </CommandLine> - <Description>Stop Win RM Service </Description> - <Order>11</Order> - <RequiresUserInput>true</RequiresUserInput> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <CommandLine>cmd.exe /c sc config winrm start= auto</CommandLine> - <Description>Win RM Autostart</Description> - <Order>12</Order> - <RequiresUserInput>true</RequiresUserInput> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <CommandLine>cmd.exe /c net start winrm </CommandLine> - <Description>Start Win RM Service</Description> - <Order>13</Order> - <RequiresUserInput>true</RequiresUserInput> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <CommandLine>powershell -Command "Set-ExecutionPolicy -ExecutionPolicy RemoteSigned -Force"</CommandLine> - <Description>Start Win RM Service</Description> - <Order>14</Order> - <RequiresUserInput>true</RequiresUserInput> - </SynchronousCommand> - </FirstLogonCommands> - <ShowWindowsLive>false</ShowWindowsLive> - </component> - </settings> - <settings pass="specialize"> - <component name="Microsoft-Windows-Shell-Setup" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" > - <OEMInformation> - <HelpCustomized>false</HelpCustomized> - </OEMInformation> - <!-- Rename computer here. --> - <ComputerName>vagrant-8</ComputerName> - <TimeZone>Pacific Standard Time</TimeZone> - <RegisteredOwner></RegisteredOwner> - </component> - <component name="Microsoft-Windows-Security-SPP-UX" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - <SkipAutoActivation>true</SkipAutoActivation> - </component> - </settings> - <cpi:offlineImage cpi:source="catalog:d:/sources/install_windows server 2008 r2 serverdatacenter.clg" xmlns:cpi="urn:schemas-microsoft-com:cpi" /> -</unattend> +<?xml version="1.0" encoding="utf-8"?> +<unattend xmlns="urn:schemas-microsoft-com:unattend"> + <servicing></servicing> + + <settings pass="windowsPE"> + + <component name="Microsoft-Windows-Setup" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + + <DiskConfiguration> + <Disk wcm:action="add"> + + <CreatePartitions> + <CreatePartition wcm:action="add"> + <Order>1</Order> + <Type>Primary</Type> + <Size>20000</Size> + </CreatePartition> + </CreatePartitions> + + <ModifyPartitions> + <ModifyPartition wcm:action="add"> + <Extend>false</Extend> + <Format>NTFS</Format> + <Letter>C</Letter> + <Order>1</Order> + <PartitionID>1</PartitionID> + <Label>Windows 8</Label> + </ModifyPartition> + </ModifyPartitions> + + <DiskID>0</DiskID> + <WillWipeDisk>true</WillWipeDisk> + + </Disk> + <WillShowUI>OnError</WillShowUI> + </DiskConfiguration> + + <UserData> + <!-- Product Key from http://technet.microsoft.com/en-us/library/jj612867.aspx --> + <ProductKey>32JNW-9KQ84-P47T8-D8GGY-CWCK7 + <WillShowUI>Never</WillShowUI> + </ProductKey> + + <AcceptEula>true</AcceptEula> + <FullName>Vagrant Fullname</FullName> + <Organization>Vagrant Inc</Organization> + </UserData> + + <ImageInstall> + <OSImage> + <InstallTo> + <DiskID>0</DiskID> + <PartitionID>1</PartitionID> + </InstallTo> + <WillShowUI>OnError</WillShowUI> + <InstallToAvailablePartition>false</InstallToAvailablePartition> + <InstallFrom> + <MetaData wcm:action="add"> + <Key>/IMAGE/NAME</Key> + <Value>Windows 8 Enterprise Evaluation</Value> + </MetaData> + </InstallFrom> + </OSImage> + </ImageInstall> + + </component> + + <component name="Microsoft-Windows-International-Core-WinPE" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <SetupUILanguage> + <UILanguage>en-US</UILanguage> + </SetupUILanguage> + <InputLocale>en-US</InputLocale> + <SystemLocale>en-US</SystemLocale> + <UILanguage>en-US</UILanguage> + <UILanguageFallback>en-US</UILanguageFallback> + <UserLocale>en-US</UserLocale> + </component> + </settings> + + + <settings pass="oobeSystem"> + <component name="Microsoft-Windows-Shell-Setup" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <UserAccounts> + <AdministratorPassword> + <Value>vagrant</Value> + <PlainText>true</PlainText> + </AdministratorPassword> + <LocalAccounts> + <LocalAccount wcm:action="add"> + <Password> + <Value>vagrant</Value> + <PlainText>true</PlainText> + </Password> + <Description>Vagrant User</Description> + <DisplayName>vagrant</DisplayName> + <Group>administrators</Group> + <Name>vagrant</Name> + </LocalAccount> + </LocalAccounts> + </UserAccounts> + <OOBE> + <HideEULAPage>true</HideEULAPage> + <HideWirelessSetupInOOBE>true</HideWirelessSetupInOOBE> + <NetworkLocation>Home</NetworkLocation> + <ProtectYourPC>1</ProtectYourPC> + <HideOnlineAccountScreens>true</HideOnlineAccountScreens> + <HideLocalAccountScreen>true</HideLocalAccountScreen> + <SkipUserOOBE>true</SkipUserOOBE> + <HideOEMRegistrationScreen>true</HideOEMRegistrationScreen> + </OOBE> + <AutoLogon> + <Password> + <Value>vagrant</Value> + <PlainText>true</PlainText> + </Password> + <Username>administrator</Username> + <Enabled>true</Enabled> + </AutoLogon> + <FirstLogonCommands> + <!-- <SynchronousCommand wcm:action="add"> --> + <!-- <CommandLine>cmd.exe /c a:install-cygwin-sshd.bat</CommandLine> --> + <!-- <Description>Install Cygwin SSH</Description> --> + <!-- <Order>1</Order> --> + <!-- <RequiresUserInput>true</RequiresUserInput> --> + <!-- </SynchronousCommand> --> + <!-- <SynchronousCommand wcm:action="add"> --> + <!-- <CommandLine>cmd.exe /c a:install-winrm.bat</CommandLine> --> + <!-- <Description>Install Win RM</Description> --> + <!-- <Order>2</Order> --> + <!-- <RequiresUserInput>true</RequiresUserInput> --> + <!-- </SynchronousCommand> --> + <SynchronousCommand wcm:action="add"> + <CommandLine>cmd.exe /c winrm quickconfig -q</CommandLine> + <Description>winrm quickconfig -q</Description> + <Order>1</Order> + <RequiresUserInput>true</RequiresUserInput> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <CommandLine>cmd.exe /c winrm quickconfig -transport:http</CommandLine> + <Description>winrm quickconfig -transport:http</Description> + <Order>2</Order> + <RequiresUserInput>true</RequiresUserInput> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <CommandLine>cmd.exe /c winrm set winrm/config @{MaxTimeoutms="1800000"}</CommandLine> + <Description>Win RM MaxTimoutms</Description> + <Order>3</Order> + <RequiresUserInput>true</RequiresUserInput> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <CommandLine>cmd.exe /c winrm set winrm/config/winrs @{MaxMemoryPerShellMB="300"}</CommandLine> + <Description>Win RM MaxMemoryPerShellMB</Description> + <Order>4</Order> + <RequiresUserInput>true</RequiresUserInput> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <CommandLine>cmd.exe /c winrm set winrm/config/service @{AllowUnencrypted="true"}</CommandLine> + <Description>Win RM AllowUnencrypted</Description> + <Order>5</Order> + <RequiresUserInput>true</RequiresUserInput> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <CommandLine>cmd.exe /c winrm set winrm/config/service/auth @{Basic="true"}</CommandLine> + <Description>Win RM auth Basic</Description> + <Order>6</Order> + <RequiresUserInput>true</RequiresUserInput> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <CommandLine>cmd.exe /c winrm set winrm/config/client/auth @{Basic="true"}</CommandLine> + <Description>Win RM auth Basic</Description> + <Order>7</Order> + <RequiresUserInput>true</RequiresUserInput> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <CommandLine>cmd.exe /c winrm set winrm/config/listener?Address=*+Transport=HTTP @{Port="5985"} </CommandLine> + <Description>Win RM listener Address/Port</Description> + <Order>8</Order> + <RequiresUserInput>true</RequiresUserInput> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <CommandLine>cmd.exe /c netsh advfirewall firewall set rule group="remote administration" new enable=yes </CommandLine> + <Description>Win RM adv firewall enable</Description> + <Order>9</Order> + <RequiresUserInput>true</RequiresUserInput> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <CommandLine>cmd.exe /c netsh firewall add portopening TCP 5985 "Port 5985" </CommandLine> + <Description>Win RM port open</Description> + <Order>10</Order> + <RequiresUserInput>true</RequiresUserInput> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <CommandLine>cmd.exe /c net stop winrm </CommandLine> + <Description>Stop Win RM Service </Description> + <Order>11</Order> + <RequiresUserInput>true</RequiresUserInput> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <CommandLine>cmd.exe /c sc config winrm start= auto</CommandLine> + <Description>Win RM Autostart</Description> + <Order>12</Order> + <RequiresUserInput>true</RequiresUserInput> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <CommandLine>cmd.exe /c net start winrm </CommandLine> + <Description>Start Win RM Service</Description> + <Order>13</Order> + <RequiresUserInput>true</RequiresUserInput> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <CommandLine>powershell -Command "Set-ExecutionPolicy -ExecutionPolicy RemoteSigned -Force"</CommandLine> + <Description>Start Win RM Service</Description> + <Order>14</Order> + <RequiresUserInput>true</RequiresUserInput> + </SynchronousCommand> + </FirstLogonCommands> + <ShowWindowsLive>false</ShowWindowsLive> + </component> + </settings> + <settings pass="specialize"> + <component name="Microsoft-Windows-Shell-Setup" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" > + <OEMInformation> + <HelpCustomized>false</HelpCustomized> + </OEMInformation> + <!-- Rename computer here. --> + <ComputerName>vagrant-8</ComputerName> + <TimeZone>Pacific Standard Time</TimeZone> + <RegisteredOwner></RegisteredOwner> + </component> + <component name="Microsoft-Windows-Security-SPP-UX" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <SkipAutoActivation>true</SkipAutoActivation> + </component> + </settings> + <cpi:offlineImage cpi:source="catalog:d:/sources/install_windows server 2008 r2 serverdatacenter.clg" xmlns:cpi="urn:schemas-microsoft-com:cpi" /> +</unattend> From c38d3c2674bd96868a2387c6a88a81cfc1750b88 Mon Sep 17 00:00:00 2001 From: "Julian C. Dunn" <jdunn@getchef.com> Date: Mon, 3 Mar 2014 10:52:46 -0500 Subject: [PATCH 0195/1622] Slim down box builds by removing unnecessary firmware and docs. Also make sure kludgezu isn't installed on any boxes. This causes the host-only networking problems indicated in BENTO-52. --- packer/http/centos-5.10/ks.cfg | 56 ++++++++++++++++++++++++-------- packer/http/centos-6.5/ks.cfg | 52 ++++++++++++++++++++++------- packer/scripts/centos/cleanup.sh | 2 ++ packer/scripts/centos/ks.cfg | 41 ----------------------- 4 files changed, 85 insertions(+), 66 deletions(-) delete mode 100644 packer/scripts/centos/ks.cfg diff --git a/packer/http/centos-5.10/ks.cfg b/packer/http/centos-5.10/ks.cfg index 7f3e3d8dc..69f49e3af 100644 --- a/packer/http/centos-5.10/ks.cfg +++ b/packer/http/centos-5.10/ks.cfg @@ -3,10 +3,10 @@ cdrom lang en_US.UTF-8 keyboard us network --bootproto=dhcp -rootpw --iscrypted $1$damlkd,f$UC/u5pUts5QiU3ow.CSso/ +rootpw vagrant firewall --disabled authconfig --enableshadow --passalgo=sha512 -selinux --disabled +selinux --permissive timezone UTC bootloader --location=mbr text @@ -17,28 +17,58 @@ autopart auth --useshadow --enablemd5 firstboot --disabled reboot +user --name=vagrant --password vagrant -%packages --ignoremissing -@Base -@Core -@Development Tools +%packages --nobase --ignoremissing --excludedocs +# vagrant needs this to copy initial files via scp +openssh-clients +sudo +kernel-headers kernel-devel +gcc +make +perl +curl +wget +bzip2 nfs-utils -openssl-devel -readline-devel -zlib-devel +-fprintd-pam +-intltool -avahi -bluez-utils -dogtail -kudzu +# unnecessary firmware +-aic94xx-firmware +-atmel-firmware +-b43-openfwwf +-bfa-firmware +-ipw2100-firmware +-ipw2200-firmware +-ivtv-firmware +-iwl100-firmware +-iwl1000-firmware +-iwl3945-firmware +-iwl4965-firmware +-iwl5000-firmware +-iwl5150-firmware +-iwl6000-firmware +-iwl6000g2a-firmware +-iwl6050-firmware +-libertas-usb8388-firmware +-ql2100-firmware +-ql2200-firmware +-ql23xx-firmware +-ql2400-firmware +-ql2500-firmware +-rt61pci-firmware +-rt73usb-firmware +-xorg-x11-drv-ati-firmware +-zd1211-firmware %post # update root certs wget -O/etc/pki/tls/certs/ca-bundle.crt http://curl.haxx.se/ca/cacert.pem -# vagrant -groupadd vagrant -g 999 -useradd vagrant -g vagrant -G wheel -u 900 -echo "vagrant" | passwd --stdin vagrant # sudo echo "vagrant ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers sed -i "s/^.*requiretty/#Defaults requiretty/" /etc/sudoers diff --git a/packer/http/centos-6.5/ks.cfg b/packer/http/centos-6.5/ks.cfg index 86268a4bf..0028b13ce 100644 --- a/packer/http/centos-6.5/ks.cfg +++ b/packer/http/centos-6.5/ks.cfg @@ -3,7 +3,7 @@ cdrom lang en_US.UTF-8 keyboard us network --bootproto=dhcp -rootpw --iscrypted $1$damlkd,f$UC/u5pUts5QiU3ow.CSso/ +rootpw vagrant firewall --disabled selinux --permissive timezone UTC @@ -16,26 +16,54 @@ autopart auth --enableshadow --passalgo=sha512 --kickstart firstboot --disabled reboot +user --name=vagrant --plaintext --password vagrant -%packages --ignoremissing -@Base -@Core -@Development Tools +%packages --nobase --ignoremissing --excludedocs +# vagrant needs this to copy initial files via scp +openssh-clients +sudo +kernel-headers kernel-devel +gcc +make +perl +curl +wget nfs-utils -openssl-devel -readline-devel -zlib-devel -fprintd-pam -intltool +# unnecessary firmware +-aic94xx-firmware +-atmel-firmware +-b43-openfwwf +-bfa-firmware +-ipw2100-firmware +-ipw2200-firmware +-ivtv-firmware +-iwl100-firmware +-iwl1000-firmware +-iwl3945-firmware +-iwl4965-firmware +-iwl5000-firmware +-iwl5150-firmware +-iwl6000-firmware +-iwl6000g2a-firmware +-iwl6050-firmware +-libertas-usb8388-firmware +-ql2100-firmware +-ql2200-firmware +-ql23xx-firmware +-ql2400-firmware +-ql2500-firmware +-rt61pci-firmware +-rt73usb-firmware +-xorg-x11-drv-ati-firmware +-zd1211-firmware + %post # update root certs wget -O/etc/pki/tls/certs/ca-bundle.crt http://curl.haxx.se/ca/cacert.pem -# vagrant -groupadd vagrant -g 999 -useradd vagrant -g vagrant -G wheel -u 900 -echo "vagrant" | passwd --stdin vagrant # sudo echo "vagrant ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers sed -i "s/^.*requiretty/#Defaults requiretty/" /etc/sudoers diff --git a/packer/scripts/centos/cleanup.sh b/packer/scripts/centos/cleanup.sh index 9b3e37da5..4dfe958bc 100644 --- a/packer/scripts/centos/cleanup.sh +++ b/packer/scripts/centos/cleanup.sh @@ -1,4 +1,6 @@ #!/bin/bash -eux +# These were only needed for building VMware/Virtualbox extensions: +yum -y remove gcc cpp kernel-devel kernel-headers perl yum -y clean all rm -rf VBoxGuestAdditions_*.iso VBoxGuestAdditions_*.iso.? rm -f /tmp/chef*rpm diff --git a/packer/scripts/centos/ks.cfg b/packer/scripts/centos/ks.cfg deleted file mode 100644 index 86268a4bf..000000000 --- a/packer/scripts/centos/ks.cfg +++ /dev/null @@ -1,41 +0,0 @@ -install -cdrom -lang en_US.UTF-8 -keyboard us -network --bootproto=dhcp -rootpw --iscrypted $1$damlkd,f$UC/u5pUts5QiU3ow.CSso/ -firewall --disabled -selinux --permissive -timezone UTC -bootloader --location=mbr -text -skipx -zerombr -clearpart --all --initlabel -autopart -auth --enableshadow --passalgo=sha512 --kickstart -firstboot --disabled -reboot - -%packages --ignoremissing -@Base -@Core -@Development Tools -kernel-devel -nfs-utils -openssl-devel -readline-devel -zlib-devel --fprintd-pam --intltool - -%post -# update root certs -wget -O/etc/pki/tls/certs/ca-bundle.crt http://curl.haxx.se/ca/cacert.pem -# vagrant -groupadd vagrant -g 999 -useradd vagrant -g vagrant -G wheel -u 900 -echo "vagrant" | passwd --stdin vagrant -# sudo -echo "vagrant ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers -sed -i "s/^.*requiretty/#Defaults requiretty/" /etc/sudoers From f8d1ad9a683e9a32a9935067a60fa2e19dba52d7 Mon Sep 17 00:00:00 2001 From: Peter Eisentraut <peter@eisentraut.org> Date: Fri, 28 Feb 2014 13:47:07 -0500 Subject: [PATCH 0196/1622] Put vagrant sudo configuration in a separate file Put vagrant sudo configuration in /etc/sudoers.d/vagrant rather than /etc/sudoers, so that if, say, Chef writes out a new /etc/sudoers, sudo from vagrant continues to work. --- packer/http/centos-6.5/ks.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packer/http/centos-6.5/ks.cfg b/packer/http/centos-6.5/ks.cfg index 0028b13ce..c87dc7c7e 100644 --- a/packer/http/centos-6.5/ks.cfg +++ b/packer/http/centos-6.5/ks.cfg @@ -65,5 +65,5 @@ nfs-utils # update root certs wget -O/etc/pki/tls/certs/ca-bundle.crt http://curl.haxx.se/ca/cacert.pem # sudo -echo "vagrant ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers +echo "%vagrant ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers.d/vagrant sed -i "s/^.*requiretty/#Defaults requiretty/" /etc/sudoers From ccff97f39337afa836b17baf735c6446d9930172 Mon Sep 17 00:00:00 2001 From: Yvonne Lam <yvonne@opscode.com> Date: Fri, 28 Feb 2014 16:50:22 -0800 Subject: [PATCH 0197/1622] Add templates for Mac OS X 10.7, 10.8, 10.9. --- README.md | 15 ++++- packer/macosx-10.7.json | 75 ++++++++++++++++++++++++ packer/macosx-10.8.json | 75 ++++++++++++++++++++++++ packer/macosx-10.9.json | 75 ++++++++++++++++++++++++ packer/scripts/macosx/builder.sh | 9 +++ packer/scripts/macosx/cleanup.sh | 4 ++ packer/scripts/macosx/hostname.sh | 10 ++++ packer/scripts/macosx/support/kcpassword | 1 + packer/scripts/macosx/update.sh | 3 + packer/scripts/macosx/vagrant.sh | 38 ++++++++++++ 10 files changed, 304 insertions(+), 1 deletion(-) create mode 100644 packer/macosx-10.7.json create mode 100644 packer/macosx-10.8.json create mode 100644 packer/macosx-10.9.json create mode 100644 packer/scripts/macosx/builder.sh create mode 100644 packer/scripts/macosx/cleanup.sh create mode 100644 packer/scripts/macosx/hostname.sh create mode 100644 packer/scripts/macosx/support/kcpassword create mode 100644 packer/scripts/macosx/update.sh create mode 100644 packer/scripts/macosx/vagrant.sh diff --git a/README.md b/README.md index 943fcd408..9ad64e391 100644 --- a/README.md +++ b/README.md @@ -99,7 +99,17 @@ Congratulations! You now have box(es) in the ../builds directory that you can th ### Proprietary Boxes -Red Hat Enterprise Linux and SUSE Linux Enterprise Server templates are provided; however, their ISOs are not publicly retrievable. The URLs in those templates are bogus; you should substitute your server where you host the ISOs, using the mirror variable as above. +** Mac OS X (10.7, 10.8, and 10.9), Red Hat Enterprise Linux, and SUSE Linux Enterprise Server templates are provided; however, their ISOs are not publicly retrievable. The URLs in those templates are bogus. ** For RHEL and SLES, you should substitute your server where you host the ISOs, using the mirror variable as above. + +#### Mac OS X Boxes + +Mac OS X builds are supported for VMware only. We would welcome a contribution to add VirtualBox support. + +To build a Mac OS X box, you will need to start with an installer for your desired version of OS X. You will then need to use [Tim Sutton's osx-vm-templates](https://github.com/timsutton/osx-vm-templates)/) to modify that installer for use by packer. The output of that build will include the location of the ISO and its checksum, which you can substitute into your `packer build` command, e.g.: + + $ packer build -var 'iso_checksum=<checksum>' -var 'iso_url=<iso_url>' macosx-10.9.json + +There is a known issue where test-kitchen starts a Mac OS X box correctly, but `vagrant up` fails due to the absence of the HGFS kernel module. This is due to a silent failure during the VMware tools installation and can be corrected by installing the VMware tools on the Mac OS X box manually. ### Veewee Definitions @@ -147,6 +157,8 @@ definitions originally based on [work done by Tim Dysinger](https://github.com/dysinger/basebox) to make "Don't Repeat Yourself" (DRY) modular baseboxes. Thanks Tim! +Mac OS X templates were adopted wholesale from [Fletcher Nichol's packer templates](https://github.com/fnichol/packer-templates). + - Author: Seth Chisamore (<schisamo@opscode.com>) - Author: Stephen Delano (<stephen@opscode.com>) - Author: Joshua Timberman (<joshua@opscode.com>) @@ -155,6 +167,7 @@ make "Don't Repeat Yourself" (DRY) modular baseboxes. Thanks Tim! - Author: Julian Dunn (<jdunn@opscode.com>) - Author: Tom Duffield (<tom@opscode.com>) - Author: Ross Timson (<ross@rosstimson.com>) +- Author: Fletcher Nichol (<fnichol@nichol.ca>) ```text Copyright 2012-2013, Opscode, Inc. (<legal@opscode.com>) diff --git a/packer/macosx-10.7.json b/packer/macosx-10.7.json new file mode 100644 index 000000000..47ecb0f48 --- /dev/null +++ b/packer/macosx-10.7.json @@ -0,0 +1,75 @@ +{ + "variables": { + "autologin_vagrant_user": "", + "iso_url": "http://fakeurl/OSX_InstallESD_10.7.5_11G63.dmg", + "iso_checksum": "e2a48af008ff3c4db6a8235151a1e90ea600fceb", + "chef_version": "provisionerless" + }, + "provisioners": [ + { + "type": "file", + "destination": "/private/tmp/kcpassword", + "source": "scripts/macosx/support/kcpassword" + }, + { + "type": "shell", + "scripts": [ + "scripts/macosx/hostname.sh", + "scripts/macosx/builder.sh", + "scripts/macosx/update.sh", + "scripts/macosx/vagrant.sh", + "scripts/macosx/cleanup.sh" + ], + "execute_command": "echo 'vagrant'| {{.Vars}} sudo -E -S sh '{{.Path}}'" + }, + { + "type": "shell", + "inline": [ + "[ -z \"{{user `autologin_vagrant_user`}}\" ] && exit", + "echo \"Enabling automatic GUI login for the 'vagrant' user..\"", + "cp /private/tmp/kcpassword /private/etc/kcpassword", + "/usr/bin/defaults write /Library/Preferences/com.apple.loginwindow autoLoginUser vagrant" + ], + "execute_command": "echo 'vagrant'| {{.Vars}} sudo -E -S sh '{{.Path}}'" + } + ], + "builders": [ + { + "boot_wait": "2s", + "disk_size": 20480, + "guest_os_type": "darwin12-64", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "md5", + "iso_url": "{{user `iso_url`}}", + "output_directory": "packer-macosx-10.7-vmware", + "shutdown_command": "echo 'vagrant'|sudo -S shutdown -h now", + "skip_compaction": true, + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "tools_upload_flavor": "darwin", + "tools_upload_path": "/Users/vagrant/{{.Flavor}}.iso", + "type": "vmware-iso", + "vm_name": "packer-macosx-10.7-vmware", + "vmx_data": { + "cpuid.coresPerSocket": "1", + "memsize": "2048", + "numvcpus": "1", + "firmware": "efi", + "keyboardAndMouseProfile": "macProfile", + "smc.present": "TRUE", + "hpet0.present": "TRUE", + "ich7m.present": "TRUE", + "ehci.present": "TRUE", + "usb.present": "TRUE" + } + } + ], + "post-processors": [ + { + "type": "vagrant", + "output": "../builds/{{.Provider}}/opscode_macosx-10.7_chef-{{user `chef_version`}}.box" + } + ] +} diff --git a/packer/macosx-10.8.json b/packer/macosx-10.8.json new file mode 100644 index 000000000..1b6a50d5a --- /dev/null +++ b/packer/macosx-10.8.json @@ -0,0 +1,75 @@ +{ + "variables": { + "autologin_vagrant_user": "", + "iso_url": "http://fakeurl/OSX_InstallESD_10.8.5_12F45.dmg", + "iso_checksum": "e2a48af008ff3c4db6a8235151a1e90ea600fceb", + "chef_version": "provisionerless" + }, + "provisioners": [ + { + "type": "file", + "destination": "/private/tmp/kcpassword", + "source": "scripts/macosx/support/kcpassword" + }, + { + "type": "shell", + "scripts": [ + "scripts/macosx/hostname.sh", + "scripts/macosx/builder.sh", + "scripts/macosx/update.sh", + "scripts/macosx/vagrant.sh", + "scripts/macosx/cleanup.sh" + ], + "execute_command": "echo 'vagrant'| {{.Vars}} sudo -E -S sh '{{.Path}}'" + }, + { + "type": "shell", + "inline": [ + "[ -z \"{{user `autologin_vagrant_user`}}\" ] && exit", + "echo \"Enabling automatic GUI login for the 'vagrant' user..\"", + "cp /private/tmp/kcpassword /private/etc/kcpassword", + "/usr/bin/defaults write /Library/Preferences/com.apple.loginwindow autoLoginUser vagrant" + ], + "execute_command": "echo 'vagrant'| {{.Vars}} sudo -E -S sh '{{.Path}}'" + } + ], + "builders": [ + { + "boot_wait": "2s", + "disk_size": 20480, + "guest_os_type": "darwin12-64", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "md5", + "iso_url": "{{user `iso_url`}}", + "output_directory": "packer-macosx-10.8-vmware", + "shutdown_command": "echo 'vagrant'|sudo -S shutdown -h now", + "skip_compaction": true, + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "tools_upload_flavor": "darwin", + "tools_upload_path": "/Users/vagrant/{{.Flavor}}.iso", + "type": "vmware-iso", + "vm_name": "packer-macosx-10.8-vmware", + "vmx_data": { + "cpuid.coresPerSocket": "1", + "memsize": "2048", + "numvcpus": "1", + "firmware": "efi", + "keyboardAndMouseProfile": "macProfile", + "smc.present": "TRUE", + "hpet0.present": "TRUE", + "ich7m.present": "TRUE", + "ehci.present": "TRUE", + "usb.present": "TRUE" + } + } + ], + "post-processors": [ + { + "type": "vagrant", + "output": "../builds/{{.Provider}}/opscode_macosx-10.8_chef-{{user `chef_version`}}.box" + } + ] +} diff --git a/packer/macosx-10.9.json b/packer/macosx-10.9.json new file mode 100644 index 000000000..079c41ba1 --- /dev/null +++ b/packer/macosx-10.9.json @@ -0,0 +1,75 @@ +{ + "variables": { + "autologin_vagrant_user": "", + "iso_url": "http://fakeurl/OSX_InstallESD_10.9.1_13B42.dmg", + "iso_checksum": "e2a48af008ff3c4db6a8235151a1e90ea600fceb", + "chef_version": "provisionerless" + }, + "provisioners": [ + { + "type": "file", + "destination": "/private/tmp/kcpassword", + "source": "scripts/macosx/support/kcpassword" + }, + { + "type": "shell", + "scripts": [ + "scripts/macosx/hostname.sh", + "scripts/macosx/builder.sh", + "scripts/macosx/update.sh", + "scripts/macosx/vagrant.sh", + "scripts/macosx/cleanup.sh" + ], + "execute_command": "echo 'vagrant'| {{.Vars}} sudo -E -S sh '{{.Path}}'" + }, + { + "type": "shell", + "inline": [ + "[ -z \"{{user `autologin_vagrant_user`}}\" ] && exit", + "echo \"Enabling automatic GUI login for the 'vagrant' user..\"", + "cp /private/tmp/kcpassword /private/etc/kcpassword", + "/usr/bin/defaults write /Library/Preferences/com.apple.loginwindow autoLoginUser vagrant" + ], + "execute_command": "echo 'vagrant'| {{.Vars}} sudo -E -S sh '{{.Path}}'" + } + ], + "builders": [ + { + "boot_wait": "2s", + "disk_size": 20480, + "guest_os_type": "darwin12-64", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "md5", + "iso_url": "{{user `iso_url`}}", + "output_directory": "packer-macosx-10.9-vmware", + "shutdown_command": "echo 'vagrant'|sudo -S shutdown -h now", + "skip_compaction": true, + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "tools_upload_flavor": "darwin", + "tools_upload_path": "/Users/vagrant/{{.Flavor}}.iso", + "type": "vmware-iso", + "vm_name": "packer-macosx-10.9-vmware", + "vmx_data": { + "cpuid.coresPerSocket": "1", + "memsize": "2048", + "numvcpus": "1", + "firmware": "efi", + "keyboardAndMouseProfile": "macProfile", + "smc.present": "TRUE", + "hpet0.present": "TRUE", + "ich7m.present": "TRUE", + "ehci.present": "TRUE", + "usb.present": "TRUE" + } + } + ], + "post-processors": [ + { + "type": "vagrant", + "output": "../builds/{{.Provider}}/opscode_macosx-10.9_chef-{{user `chef_version`}}.box" + } + ] +} diff --git a/packer/scripts/macosx/builder.sh b/packer/scripts/macosx/builder.sh new file mode 100644 index 000000000..135720a19 --- /dev/null +++ b/packer/scripts/macosx/builder.sh @@ -0,0 +1,9 @@ +#!/bin/bash -eux + +home_dir="$(python -c 'import pwd; print pwd.getpwnam("vagrant").pw_dir')" + +if [ "$PACKER_BUILDER_TYPE" = "vmware" ]; then + version_file="$home_dir/.vmfusion_version" + mkdir -p $(dirname $version_file) + touch $version_file +fi diff --git a/packer/scripts/macosx/cleanup.sh b/packer/scripts/macosx/cleanup.sh new file mode 100644 index 000000000..77765d5e4 --- /dev/null +++ b/packer/scripts/macosx/cleanup.sh @@ -0,0 +1,4 @@ +#!/bin/bash -eux + +# eject installer disc +drutil eject diff --git a/packer/scripts/macosx/hostname.sh b/packer/scripts/macosx/hostname.sh new file mode 100644 index 000000000..7bd4d8a97 --- /dev/null +++ b/packer/scripts/macosx/hostname.sh @@ -0,0 +1,10 @@ +#!/bin/bash -eux +# Major thanks to @timsutton's osx-vm-templates: +# https://github.com/timsutton/osx-vm-templates + +osx_minor_version=$(sw_vers -productVersion | awk -F "." '{print $2}') + +# Set computer/hostname +computer_name=macosx-10-${osx_minor_version} +scutil --set ComputerName $computer_name +scutil --set HostName ${computer_name}.vagrantup.com diff --git a/packer/scripts/macosx/support/kcpassword b/packer/scripts/macosx/support/kcpassword new file mode 100644 index 000000000..c818c0c5b --- /dev/null +++ b/packer/scripts/macosx/support/kcpassword @@ -0,0 +1 @@ + è5Q³Ò©êG« \ No newline at end of file diff --git a/packer/scripts/macosx/update.sh b/packer/scripts/macosx/update.sh new file mode 100644 index 000000000..20da6eea7 --- /dev/null +++ b/packer/scripts/macosx/update.sh @@ -0,0 +1,3 @@ +#!/bin/bash -eux + +softwareupdate --install --all diff --git a/packer/scripts/macosx/vagrant.sh b/packer/scripts/macosx/vagrant.sh new file mode 100644 index 000000000..d86740ae4 --- /dev/null +++ b/packer/scripts/macosx/vagrant.sh @@ -0,0 +1,38 @@ +#!/bin/bash -eux + +home_dir="$(python -c 'import pwd; print pwd.getpwnam("vagrant").pw_dir')" + +if [ -f $home_dir/.vbox_version ]; then + echo "VirtualBox not currently supported, sadface" +fi + +if [ -f $home_dir/.vmfusion_version ]; then + iso_name="$(uname | tr [[:upper:]] [[:lower:]]).iso" + mount_point="$(mktemp -d /tmp/vmware-tools.XXXX)" + #Run install, unmount ISO and remove it + cd $home_dir + hdiutil attach $iso_name -mountpoint "$mount_point" + installer -pkg "$mount_point/Install VMware Tools.app/Contents/Resources/VMware Tools.pkg" -target / + # This usually fails + hdiutil detach "$mount_point" || true + rm -rf $home_dir/$iso_name + rmdir $mount_point + + # Point Linux shared folder root to that used by OS X guests, + # useful for the Hashicorp vmware_fusion Vagrant provider plugin + mkdir /mnt + ln -sf /Volumes/VMware\ Shared\ Folders /mnt/hgfs +fi + +pubkey_url='https://github.com/mitchellh/vagrant/raw/master/keys/vagrant.pub' +mkdir $home_dir/.ssh +if command -v wget >/dev/null ; then + wget --no-check-certificate "$pubkey_url" -O $home_dir/.ssh/authorized_keys +elif command -v curl >/dev/null ; then + curl --insecure --location "$pubkey_url" > $home_dir/.ssh/authorized_keys +else + echo "Cannot download vagrant public key" + exit 1 +fi +chown -R vagrant $home_dir/.ssh +chmod -R go-rwsx $home_dir/.ssh From 8cc92f643823ecd9b6ad5270421c0db372a9090e Mon Sep 17 00:00:00 2001 From: "Julian C. Dunn" <jdunn@getchef.com> Date: Wed, 5 Mar 2014 22:48:48 -0500 Subject: [PATCH 0198/1622] Ubuntu 13.04 EOL as of January 27, 2014 - see https://wiki.ubuntu.com/Releases --- OLD-BOXES.md | 4 + README.md | 2 - packer/http/ubuntu-13.04/preseed.cfg | 31 ------ packer/ubuntu-13.04-amd64.json | 140 -------------------------- packer/ubuntu-13.04-i386.json | 144 --------------------------- 5 files changed, 4 insertions(+), 317 deletions(-) delete mode 100644 packer/http/ubuntu-13.04/preseed.cfg delete mode 100644 packer/ubuntu-13.04-amd64.json delete mode 100644 packer/ubuntu-13.04-i386.json diff --git a/OLD-BOXES.md b/OLD-BOXES.md index a93285882..c2f7bbe0f 100644 --- a/OLD-BOXES.md +++ b/OLD-BOXES.md @@ -14,6 +14,8 @@ Boxes for obsolete operating systems will be placed here. * [opscode-debian-7.2.0](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_debian-7.2.0_chef-provisionerless.box) * [opscode-fedora-18-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_fedora-18-i386_chef-provisionerless.box) * [opscode-fedora-18](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_fedora-18_chef-provisionerless.box) +* [opscode-ubuntu-13.04-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_ubuntu-13.04-i386_chef-provisionerless.box) +* [opscode-ubuntu-13.04](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_ubuntu-13.04_chef-provisionerless.box) ### VMWare @@ -23,6 +25,8 @@ Boxes for obsolete operating systems will be placed here. * [opscode-debian-7.2.0](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_debian-7.2.0_chef-provisionerless.box) * [opscode-fedora-18-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_fedora-18-i386_chef-provisionerless.box) * [opscode-fedora-18](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_fedora-18_chef-provisionerless.box) +* [opscode-ubuntu-13.04-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_ubuntu-13.04-i386_chef-provisionerless.box) +* [opscode-ubuntu-13.04](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_ubuntu-13.04_chef-provisionerless.box) Chef 11.4.4 ----------- diff --git a/README.md b/README.md index 9ad64e391..bc6da2f8e 100644 --- a/README.md +++ b/README.md @@ -38,8 +38,6 @@ These baseboxes were all built using a Mac OS X host running VirtualBox 4.3.2, a * [opscode-ubuntu-12.04](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_ubuntu-12.04_chef-provisionerless.box) * [opscode-ubuntu-12.10-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_ubuntu-12.10-i386_chef-provisionerless.box) * [opscode-ubuntu-12.10](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_ubuntu-12.10_chef-provisionerless.box) -* [opscode-ubuntu-13.04-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_ubuntu-13.04-i386_chef-provisionerless.box) -* [opscode-ubuntu-13.04](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_ubuntu-13.04_chef-provisionerless.box) * [opscode-ubuntu-13.10-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_ubuntu-13.10-i386_chef-provisionerless.box) * [opscode-ubuntu-13.10](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_ubuntu-13.10_chef-provisionerless.box) diff --git a/packer/http/ubuntu-13.04/preseed.cfg b/packer/http/ubuntu-13.04/preseed.cfg deleted file mode 100644 index 0a4d4939b..000000000 --- a/packer/http/ubuntu-13.04/preseed.cfg +++ /dev/null @@ -1,31 +0,0 @@ -choose-mirror-bin mirror/http/proxy string -d-i base-installer/kernel/override-image string linux-server -d-i clock-setup/utc boolean true -d-i clock-setup/utc-auto boolean true -d-i finish-install/reboot_in_progress note -d-i grub-installer/only_debian boolean true -d-i grub-installer/with_other_os boolean true -d-i partman-auto-lvm/guided_size string max -d-i partman-auto/choose_recipe select atomic -d-i partman-auto/method string lvm -d-i partman-lvm/confirm boolean true -d-i partman-lvm/confirm boolean true -d-i partman-lvm/confirm_nooverwrite boolean true -d-i partman-lvm/device_remove_lvm boolean true -d-i partman/choose_partition select finish -d-i partman/confirm boolean true -d-i partman/confirm_nooverwrite boolean true -d-i partman/confirm_write_new_label boolean true -d-i passwd/user-fullname string vagrant -d-i passwd/user-uid string 900 -d-i passwd/user-password password vagrant -d-i passwd/user-password-again password vagrant -d-i passwd/username string vagrant -d-i pkgsel/include string openssh-server cryptsetup build-essential libssl-dev libreadline-dev zlib1g-dev linux-source dkms nfs-common -d-i pkgsel/install-language-support boolean false -d-i pkgsel/update-policy select unattended-upgrades -d-i pkgsel/upgrade select full-upgrade -d-i time/zone string UTC -d-i user-setup/allow-password-weak boolean true -d-i user-setup/encrypt-home boolean false -tasksel tasksel/first multiselect standard, ubuntu-server diff --git a/packer/ubuntu-13.04-amd64.json b/packer/ubuntu-13.04-amd64.json deleted file mode 100644 index cdf5411e1..000000000 --- a/packer/ubuntu-13.04-amd64.json +++ /dev/null @@ -1,140 +0,0 @@ -{ - "builders": [ - { - "boot_command": [ - "<esc><wait>", - "<esc><wait>", - "<enter><wait>", - "/install/vmlinuz<wait>", - " auto<wait>", - " console-setup/ask_detect=false<wait>", - " console-setup/layoutcode=us<wait>", - " console-setup/modelcode=pc105<wait>", - " debconf/frontend=noninteractive<wait>", - " debian-installer=en_US<wait>", - " fb=false<wait>", - " initrd=/install/initrd.gz<wait>", - " kbd-chooser/method=us<wait>", - " keyboard-configuration/layout=USA<wait>", - " keyboard-configuration/variant=USA<wait>", - " locale=en_US<wait>", - " netcfg/get_domain=vm<wait>", - " netcfg/get_hostname=vagrant<wait>", - " noapic<wait>", - " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/ubuntu-13.04/preseed.cfg<wait>", - " -- <wait>", - "<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": 40960, - "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", - "guest_os_type": "Ubuntu_64", - "http_directory": "http", - "iso_checksum": "2af1c223f586f59237212bb9c06ad774673c8952", - "iso_checksum_type": "sha1", - "iso_url": "{{user `mirror`}}/13.04/ubuntu-13.04-server-amd64.iso", - "output_directory": "packer-ubuntu-13.04-amd64-virtualbox", - "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "virtualbox-iso", - "vboxmanage": [ - [ - "modifyvm", - "{{.Name}}", - "--memory", - "384" - ], - [ - "modifyvm", - "{{.Name}}", - "--cpus", - "1" - ] - ], - "virtualbox_version_file": ".vbox_version", - "vm_name": "packer-ubuntu-13.04-amd64" - }, - { - "boot_command": [ - "<esc><wait>", - "<esc><wait>", - "<enter><wait>", - "/install/vmlinuz<wait>", - " auto<wait>", - " console-setup/ask_detect=false<wait>", - " console-setup/layoutcode=us<wait>", - " console-setup/modelcode=pc105<wait>", - " debconf/frontend=noninteractive<wait>", - " debian-installer=en_US<wait>", - " fb=false<wait>", - " initrd=/install/initrd.gz<wait>", - " kbd-chooser/method=us<wait>", - " keyboard-configuration/layout=USA<wait>", - " keyboard-configuration/variant=USA<wait>", - " locale=en_US<wait>", - " netcfg/get_domain=vm<wait>", - " netcfg/get_hostname=vagrant<wait>", - " noapic<wait>", - " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/ubuntu-13.04/preseed.cfg<wait>", - " -- <wait>", - "<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": 40960, - "guest_os_type": "ubuntu-64", - "headless": true, - "http_directory": "http", - "iso_checksum": "2af1c223f586f59237212bb9c06ad774673c8952", - "iso_checksum_type": "sha1", - "iso_url": "{{user `mirror`}}/13.04/ubuntu-13.04-server-amd64.iso", - "output_directory": "packer-ubuntu-13.04-amd64-vmware", - "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "tools_upload_flavor": "linux", - "type": "vmware-iso", - "vm_name": "packer-ubuntu-13.04-amd64", - "vmx_data": { - "cpuid.coresPerSocket": "1", - "memsize": "384", - "numvcpus": "1" - } - } - ], - "post-processors": [ - { - "output": "../builds/{{.Provider}}/opscode_ubuntu-13.04_chef-{{user `chef_version`}}.box", - "type": "vagrant" - } - ], - "provisioners": [ - { - "environment_vars": [ - "CHEF_VERSION={{user `chef_version`}}" - ], - "execute_command": "echo 'vagrant'|{{.Vars}} sudo -S -E bash '{{.Path}}'", - "scripts": [ - "scripts/ubuntu/update.sh", - "scripts/common/sshd.sh", - "scripts/ubuntu/networking.sh", - "scripts/ubuntu/sudoers.sh", - "scripts/common/vagrant.sh", - "scripts/common/vmtools.sh", - "scripts/common/chef.sh", - "scripts/ubuntu/cleanup.sh", - "scripts/common/minimize.sh" - ], - "type": "shell" - } - ], - "variables": { - "chef_version": "provisionerless", - "mirror": "http://releases.ubuntu.com" - } -} - diff --git a/packer/ubuntu-13.04-i386.json b/packer/ubuntu-13.04-i386.json deleted file mode 100644 index f38a8e24d..000000000 --- a/packer/ubuntu-13.04-i386.json +++ /dev/null @@ -1,144 +0,0 @@ -{ - "builders": [ - { - "boot_command": [ - "<esc><wait>", - "<esc><wait>", - "<enter><wait>", - "/install/vmlinuz<wait>", - " auto<wait>", - " console-setup/ask_detect=false<wait>", - " console-setup/layoutcode=us<wait>", - " console-setup/modelcode=pc105<wait>", - " debconf/frontend=noninteractive<wait>", - " debian-installer=en_US<wait>", - " fb=false<wait>", - " initrd=/install/initrd.gz<wait>", - " kbd-chooser/method=us<wait>", - " keyboard-configuration/layout=USA<wait>", - " keyboard-configuration/variant=USA<wait>", - " locale=en_US<wait>", - " netcfg/get_domain=vm<wait>", - " netcfg/get_hostname=vagrant<wait>", - " noapic<wait>", - " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/ubuntu-13.04/preseed.cfg<wait>", - " -- <wait>", - "<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": 40960, - "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", - "guest_os_type": "Ubuntu", - "http_directory": "http", - "iso_checksum": "27bbe172d66d4ce634d10fd655e840f72fe56130", - "iso_checksum_type": "sha1", - "iso_url": "{{user `mirror`}}/13.04/ubuntu-13.04-server-i386.iso", - "output_directory": "packer-ubuntu-13.04-i386-virtualbox", - "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "virtualbox-iso", - "vboxmanage": [ - [ - "modifyvm", - "{{.Name}}", - "--memory", - "384" - ], - [ - "modifyvm", - "{{.Name}}", - "--cpus", - "1" - ] - ], - "virtualbox_version_file": ".vbox_version", - "vm_name": "packer-ubuntu-13.04-i386" - }, - { - "boot_command": [ - "<esc><wait>", - "<esc><wait>", - "<enter><wait>", - "/install/vmlinuz<wait>", - " auto<wait>", - " console-setup/ask_detect=false<wait>", - " console-setup/layoutcode=us<wait>", - " console-setup/modelcode=pc105<wait>", - " debconf/frontend=noninteractive<wait>", - " debian-installer=en_US<wait>", - " fb=false<wait>", - " initrd=/install/initrd.gz<wait>", - " kbd-chooser/method=us<wait>", - " keyboard-configuration/layout=USA<wait>", - " keyboard-configuration/variant=USA<wait>", - " locale=en_US<wait>", - " netcfg/get_domain=vm<wait>", - " netcfg/get_hostname=vagrant<wait>", - " noapic<wait>", - " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/ubuntu-13.04/preseed.cfg<wait>", - " -- <wait>", - "<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": 40960, - "guest_os_type": "ubuntu", - "http_directory": "http", - "iso_checksum": "27bbe172d66d4ce634d10fd655e840f72fe56130", - "iso_checksum_type": "sha1", - "iso_url": "{{user `mirror`}}/13.04/ubuntu-13.04-server-i386.iso", - "output_directory": "packer-ubuntu-13.04-i386-vmware", - "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "tools_upload_flavor": "linux", - "type": "vmware-iso", - "vm_name": "packer-ubuntu-13.04-i386", - "vmx_data": { - "cpuid.coresPerSocket": "1", - "memsize": "384", - "numvcpus": "1" - } - } - ], - "post-processors": [ - { - "output": "../builds/{{.Provider}}/opscode_ubuntu-13.04-i386_chef-{{user `chef_version`}}.box", - "type": "vagrant" - } - ], - "provisioners": [ - { - "destination": "/tmp/shutdown.sh", - "source": "scripts/common/shutdown.sh", - "type": "file" - }, - { - "environment_vars": [ - "CHEF_VERSION={{user `chef_version`}}" - ], - "execute_command": "echo 'vagrant'|{{.Vars}} sudo -S -E bash '{{.Path}}'", - "scripts": [ - "scripts/ubuntu/update.sh", - "scripts/common/sshd.sh", - "scripts/ubuntu/networking.sh", - "scripts/ubuntu/sudoers.sh", - "scripts/common/vagrant.sh", - "scripts/common/vmtools.sh", - "scripts/common/chef.sh", - "scripts/ubuntu/cleanup.sh", - "scripts/common/minimize.sh" - ], - "type": "shell" - } - ], - "variables": { - "chef_version": "provisionerless", - "mirror": "http://releases.ubuntu.com" - } -} - From 22eadfcfd2f957f374e9189060b2edf646da2a9d Mon Sep 17 00:00:00 2001 From: "Julian C. Dunn" <jdunn@getchef.com> Date: Wed, 26 Feb 2014 12:36:05 -0500 Subject: [PATCH 0199/1622] Add templates for Oracle 5.x, 6.x --- README.md | 4 +- packer/oracle-5.10-i386.json | 94 ++++++++++++++++++++++++++++++++++ packer/oracle-5.10-x86_64.json | 94 ++++++++++++++++++++++++++++++++++ packer/oracle-6.5-i386.json | 94 ++++++++++++++++++++++++++++++++++ packer/oracle-6.5-x86_64.json | 94 ++++++++++++++++++++++++++++++++++ 5 files changed, 378 insertions(+), 2 deletions(-) create mode 100644 packer/oracle-5.10-i386.json create mode 100644 packer/oracle-5.10-x86_64.json create mode 100644 packer/oracle-6.5-i386.json create mode 100644 packer/oracle-6.5-x86_64.json diff --git a/README.md b/README.md index bc6da2f8e..78821248a 100644 --- a/README.md +++ b/README.md @@ -97,7 +97,7 @@ Congratulations! You now have box(es) in the ../builds directory that you can th ### Proprietary Boxes -** Mac OS X (10.7, 10.8, and 10.9), Red Hat Enterprise Linux, and SUSE Linux Enterprise Server templates are provided; however, their ISOs are not publicly retrievable. The URLs in those templates are bogus. ** For RHEL and SLES, you should substitute your server where you host the ISOs, using the mirror variable as above. +Mac OS X (10.7, 10.8, and 10.9), Red Hat Enterprise Linux, and SUSE Linux Enterprise Server templates are provided. However, their ISOs are not publicly retrievable and as such, the URLs in those templates are bogus. For RHEL and SLES, you should substitute your server where you host the ISOs, using the mirror variable as above. #### Mac OS X Boxes @@ -107,7 +107,7 @@ To build a Mac OS X box, you will need to start with an installer for your desir $ packer build -var 'iso_checksum=<checksum>' -var 'iso_url=<iso_url>' macosx-10.9.json -There is a known issue where test-kitchen starts a Mac OS X box correctly, but `vagrant up` fails due to the absence of the HGFS kernel module. This is due to a silent failure during the VMware tools installation and can be corrected by installing the VMware tools on the Mac OS X box manually. +There is a known issue where [test-kitchen](http://kitchen.ci/) starts a Mac OS X box correctly, but `vagrant up` fails due to the absence of the HGFS kernel module. This is due to a silent failure during the VMware tools installation and can be corrected by installing the VMware tools on the Mac OS X box manually. ### Veewee Definitions diff --git a/packer/oracle-5.10-i386.json b/packer/oracle-5.10-i386.json new file mode 100644 index 000000000..2bd2eac31 --- /dev/null +++ b/packer/oracle-5.10-i386.json @@ -0,0 +1,94 @@ +{ + "builders": [ + { + "boot_command": [ + "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/centos-5.10/ks.cfg<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "guest_os_type": "Oracle", + "http_directory": "http", + "iso_checksum": "5a9216dd69f17b9dd8f64ed539629741", + "iso_checksum_type": "md5", + "iso_url": "{{user `mirror`}}/Enterprise-R5-U10-Server-i386-dvd.iso", + "output_directory": "packer-oracle-5.10-i386-virtualbox", + "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "virtualbox-iso", + "vboxmanage": [ + [ + "modifyvm", + "{{.Name}}", + "--memory", + "384" + ], + [ + "modifyvm", + "{{.Name}}", + "--cpus", + "1" + ] + ], + "virtualbox_version_file": ".vbox_version", + "vm_name": "packer-oracle-5.10-i386" + }, + { + "boot_command": [ + "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/centos-5.10/ks.cfg<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "guest_os_type": "oraclelinux", + "http_directory": "http", + "iso_checksum": "5a9216dd69f17b9dd8f64ed539629741", + "iso_checksum_type": "md5", + "iso_url": "{{user `mirror`}}/Enterprise-R5-U10-Server-i386-dvd.iso", + "output_directory": "packer-oracle-5.10-i386-vmware", + "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "tools_upload_flavor": "linux", + "type": "vmware-iso", + "vm_name": "packer-oracle-5.10-i386", + "vmx_data": { + "cpuid.coresPerSocket": "1", + "memsize": "384", + "numvcpus": "1" + } + } + ], + "post-processors": [ + { + "output": "../builds/{{.Provider}}/opscode_oracle-5.10-i386_chef-{{user `chef_version`}}.box", + "type": "vagrant" + } + ], + "provisioners": [ + { + "environment_vars": [ + "CHEF_VERSION={{user `chef_version`}}" + ], + "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E bash '{{.Path}}'", + "scripts": [ + "scripts/common/vagrant.sh", + "scripts/common/sshd.sh", + "scripts/common/vmtools.sh", + "scripts/common/chef.sh", + "scripts/centos/cleanup.sh", + "scripts/common/minimize.sh" + ], + "type": "shell" + } + ], + "variables": { + "chef_version": "provisionerless", + "mirror": "http://mirrors.dotsrc.org/oracle-linux/EL5/U10/i386" + } +} + diff --git a/packer/oracle-5.10-x86_64.json b/packer/oracle-5.10-x86_64.json new file mode 100644 index 000000000..a953ff6fd --- /dev/null +++ b/packer/oracle-5.10-x86_64.json @@ -0,0 +1,94 @@ +{ + "builders": [ + { + "boot_command": [ + "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/centos-5.10/ks.cfg<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "guest_os_type": "Oracle_64", + "http_directory": "http", + "iso_checksum": "1aa0a1246b1a55108abf20aa2bcac00e", + "iso_checksum_type": "md5", + "iso_url": "{{user `mirror`}}/Enterprise-R5-U10-Server-x86_64-dvd.iso", + "output_directory": "packer-oracle-5.10-x86_64-virtualbox", + "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "virtualbox-iso", + "vboxmanage": [ + [ + "modifyvm", + "{{.Name}}", + "--memory", + "384" + ], + [ + "modifyvm", + "{{.Name}}", + "--cpus", + "1" + ] + ], + "virtualbox_version_file": ".vbox_version", + "vm_name": "packer-oracle-5.10-x86_64" + }, + { + "boot_command": [ + "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/centos-5.10/ks.cfg<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "guest_os_type": "oraclelinux-64", + "http_directory": "http", + "iso_checksum": "1aa0a1246b1a55108abf20aa2bcac00e", + "iso_checksum_type": "md5", + "iso_url": "{{user `mirror`}}/Enterprise-R5-U10-Server-x86_64-dvd.iso", + "output_directory": "packer-oracle-5.10-x86_64-vmware", + "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "tools_upload_flavor": "linux", + "type": "vmware-iso", + "vm_name": "packer-oracle-5.10-x86_64", + "vmx_data": { + "cpuid.coresPerSocket": "1", + "memsize": "384", + "numvcpus": "1" + } + } + ], + "post-processors": [ + { + "output": "../builds/{{.Provider}}/opscode_oracle-5.10_chef-{{user `chef_version`}}.box", + "type": "vagrant" + } + ], + "provisioners": [ + { + "environment_vars": [ + "CHEF_VERSION={{user `chef_version`}}" + ], + "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E bash '{{.Path}}'", + "scripts": [ + "scripts/common/vagrant.sh", + "scripts/common/sshd.sh", + "scripts/common/vmtools.sh", + "scripts/common/chef.sh", + "scripts/centos/cleanup.sh", + "scripts/common/minimize.sh" + ], + "type": "shell" + } + ], + "variables": { + "chef_version": "provisionerless", + "mirror": "http://mirrors.dotsrc.org/oracle-linux/EL5/U10/x86_64" + } +} + diff --git a/packer/oracle-6.5-i386.json b/packer/oracle-6.5-i386.json new file mode 100644 index 000000000..9ff3c5f81 --- /dev/null +++ b/packer/oracle-6.5-i386.json @@ -0,0 +1,94 @@ +{ + "builders": [ + { + "boot_command": [ + "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/centos-6.5/ks.cfg<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "guest_os_type": "Oracle", + "http_directory": "http", + "iso_url": "{{user `mirror`}}/OracleLinux-R6-U5-Server-i386-dvd.iso", + "iso_checksum": "5bd0a06295a4e50907da16d99a2f6cff54596b30", + "iso_checksum_type": "sha1", + "output_directory": "packer-oracle-6.5-i386-virtualbox", + "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "virtualbox-iso", + "vboxmanage": [ + [ + "modifyvm", + "{{.Name}}", + "--memory", + "480" + ], + [ + "modifyvm", + "{{.Name}}", + "--cpus", + "1" + ] + ], + "virtualbox_version_file": ".vbox_version", + "vm_name": "packer-oracle-6.5-i386" + }, + { + "boot_command": [ + "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/centos-6.5/ks.cfg<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "guest_os_type": "oraclelinux", + "http_directory": "http", + "iso_url": "{{user `mirror`}}/OracleLinux-R6-U5-Server-i386-dvd.iso", + "iso_checksum": "5bd0a06295a4e50907da16d99a2f6cff54596b30", + "iso_checksum_type": "sha1", + "output_directory": "packer-oracle-6.5-i386-vmware", + "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "tools_upload_flavor": "linux", + "type": "vmware-iso", + "vm_name": "packer-oracle-6.5-i386", + "vmx_data": { + "cpuid.coresPerSocket": "1", + "memsize": "480", + "numvcpus": "1" + } + } + ], + "post-processors": [ + { + "output": "../builds/{{.Provider}}/opscode_oracle-6.5-i386_chef-{{user `chef_version`}}.box", + "type": "vagrant" + } + ], + "provisioners": [ + { + "environment_vars": [ + "CHEF_VERSION={{user `chef_version`}}" + ], + "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E bash '{{.Path}}'", + "scripts": [ + "scripts/centos/fix-slow-dns.sh", + "scripts/common/sshd.sh", + "scripts/common/vagrant.sh", + "scripts/common/vmtools.sh", + "scripts/common/chef.sh", + "scripts/centos/cleanup.sh", + "scripts/common/minimize.sh" + ], + "type": "shell" + } + ], + "variables": { + "chef_version": "provisionerless", + "mirror": "http://mirrors.dotsrc.org/oracle-linux/OL6/U5/i386" + } +} diff --git a/packer/oracle-6.5-x86_64.json b/packer/oracle-6.5-x86_64.json new file mode 100644 index 000000000..c2e2e7571 --- /dev/null +++ b/packer/oracle-6.5-x86_64.json @@ -0,0 +1,94 @@ +{ + "builders": [ + { + "boot_command": [ + "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/centos-6.5/ks.cfg<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "guest_os_type": "Oracle_64", + "http_directory": "http", + "iso_checksum": "a65041fbe0ba67e3ff6f5f93804a8f47d5b5f132", + "iso_checksum_type": "sha1", + "iso_url": "{{user `mirror`}}/OracleLinux-R6-U5-Server-x86_64-dvd.iso", + "output_directory": "packer-oracle-6.5-x86_64-virtualbox", + "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "virtualbox-iso", + "vboxmanage": [ + [ + "modifyvm", + "{{.Name}}", + "--memory", + "480" + ], + [ + "modifyvm", + "{{.Name}}", + "--cpus", + "1" + ] + ], + "virtualbox_version_file": ".vbox_version", + "vm_name": "packer-oracle-6.5-x86_64" + }, + { + "boot_command": [ + "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/centos-6.5/ks.cfg<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "guest_os_type": "oraclelinux-64", + "http_directory": "http", + "iso_checksum": "a65041fbe0ba67e3ff6f5f93804a8f47d5b5f132", + "iso_checksum_type": "sha1", + "iso_url": "{{user `mirror`}}/OracleLinux-R6-U5-Server-x86_64-dvd.iso", + "output_directory": "packer-oracle-6.5-x86_64-vmware", + "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "tools_upload_flavor": "linux", + "type": "vmware-iso", + "vm_name": "packer-oracle-6.5-x86_64", + "vmx_data": { + "cpuid.coresPerSocket": "1", + "memsize": "480", + "numvcpus": "1" + } + } + ], + "post-processors": [ + { + "output": "../builds/{{.Provider}}/opscode_oracle-6.5_chef-{{user `chef_version`}}.box", + "type": "vagrant" + } + ], + "provisioners": [ + { + "environment_vars": [ + "CHEF_VERSION={{user `chef_version`}}" + ], + "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E bash '{{.Path}}'", + "scripts": [ + "scripts/centos/fix-slow-dns.sh", + "scripts/common/sshd.sh", + "scripts/common/vagrant.sh", + "scripts/common/vmtools.sh", + "scripts/common/chef.sh", + "scripts/centos/cleanup.sh", + "scripts/common/minimize.sh" + ], + "type": "shell" + } + ], + "variables": { + "chef_version": "provisionerless", + "mirror": "http://mirrors.dotsrc.org/oracle-linux/OL6/U5/x86_64" + } +} From 54a5fe6bbdc9cade787298a1aa7e5ae615f315cb Mon Sep 17 00:00:00 2001 From: "Julian C. Dunn" <jdunn@getchef.com> Date: Thu, 6 Mar 2014 13:57:17 -0500 Subject: [PATCH 0200/1622] Removed too much from the ks.cfg to the point where the system is unusable on CentOS 5; oops --- packer/http/centos-5.10/ks.cfg | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/packer/http/centos-5.10/ks.cfg b/packer/http/centos-5.10/ks.cfg index 69f49e3af..2fee57a84 100644 --- a/packer/http/centos-5.10/ks.cfg +++ b/packer/http/centos-5.10/ks.cfg @@ -22,16 +22,19 @@ user --name=vagrant --password vagrant %packages --nobase --ignoremissing --excludedocs # vagrant needs this to copy initial files via scp openssh-clients -sudo -kernel-headers -kernel-devel +openssh-server +bzip2 +curl +dhclient gcc +kernel-devel +kernel-headers make +nfs-utils perl -curl +sudo wget -bzip2 -nfs-utils +yum -fprintd-pam -intltool -avahi From ff367ab08f0b01db1d356c56ced80a19fee5ba89 Mon Sep 17 00:00:00 2001 From: "Julian C. Dunn" <jdunn@getchef.com> Date: Fri, 7 Mar 2014 23:44:05 -0500 Subject: [PATCH 0201/1622] Remove Fedora 18; it's EOL --- packer/http/fedora-18/ks.cfg | 52 ------------------------------------ 1 file changed, 52 deletions(-) delete mode 100644 packer/http/fedora-18/ks.cfg diff --git a/packer/http/fedora-18/ks.cfg b/packer/http/fedora-18/ks.cfg deleted file mode 100644 index 936809d36..000000000 --- a/packer/http/fedora-18/ks.cfg +++ /dev/null @@ -1,52 +0,0 @@ -install -cdrom -lang en_US.UTF-8 -keyboard us -network --bootproto=dhcp -rootpw --iscrypted $1$damlkd,f$UC/u5pUts5QiU3ow.CSso/ -firewall --disabled -authconfig --enableshadow --passalgo=sha512 -selinux --permissive -timezone UTC -bootloader --location=mbr -text -skipx -zerombr -clearpart --all --initlabel -part /boot --fstype=ext4 --size=500 -part pv.2 --grow --size=500 -volgroup vg_vagrant --pesize=32768 pv.2 -logvol / --fstype=ext4 --name=lv_root --vgname=vg_vagrant --size=1024 --grow -logvol swap --fstype=swap --name=lv_swap --vgname=vg_vagrant --size=528 --grow --maxsize=1056 -bootloader --location=mbr --append="norhgb biosdevname=0" -auth --useshadow --enablemd5 -firstboot --disabled -reboot - -%packages -@Core -bzip2 -gcc -kernel-devel -kernel-headers -openssl-devel -readline-devel -tar -wget -net-tools -zlib-devel -nfs-utils -%end - -%post -# update root certs -wget -O/etc/pki/tls/certs/ca-bundle.crt http://curl.haxx.se/ca/cacert.pem -# vagrant -groupadd vagrant -useradd vagrant -g vagrant -G wheel -u 900 -echo "vagrant" | passwd --stdin vagrant -# sudo -echo 'Defaults:vagrant !requiretty' > /etc/sudoers.d/vagrant -echo '%vagrant ALL=(ALL) NOPASSWD: ALL' >> /etc/sudoers.d/vagrant -chmod 440 /etc/sudoers.d/vagrant -%end From 0f32c400840e1bd5e849e6bd9a104e4b523388be Mon Sep 17 00:00:00 2001 From: "Julian C. Dunn" <jdunn@getchef.com> Date: Sat, 8 Mar 2014 18:21:47 -0500 Subject: [PATCH 0202/1622] Reduce size of Fedora boxes by adopting similar fixes from CentOS 5/6 ks.cfg's. --- packer/http/fedora-19/ks.cfg | 17 ++++++----------- packer/http/fedora-20/ks.cfg | 17 ++++++----------- packer/scripts/fedora/cleanup.sh | 3 ++- 3 files changed, 14 insertions(+), 23 deletions(-) diff --git a/packer/http/fedora-19/ks.cfg b/packer/http/fedora-19/ks.cfg index 936809d36..23be39dc6 100644 --- a/packer/http/fedora-19/ks.cfg +++ b/packer/http/fedora-19/ks.cfg @@ -3,7 +3,7 @@ cdrom lang en_US.UTF-8 keyboard us network --bootproto=dhcp -rootpw --iscrypted $1$damlkd,f$UC/u5pUts5QiU3ow.CSso/ +rootpw vagrant firewall --disabled authconfig --enableshadow --passalgo=sha512 selinux --permissive @@ -22,29 +22,24 @@ bootloader --location=mbr --append="norhgb biosdevname=0" auth --useshadow --enablemd5 firstboot --disabled reboot +user --name=vagrant --plaintext --password vagrant -%packages -@Core +%packages --nobase --ignoremissing --excludedocs bzip2 gcc kernel-devel kernel-headers -openssl-devel -readline-devel tar wget -net-tools -zlib-devel nfs-utils +-linux-firmware +-plymouth +-plymouth-core-libs %end %post # update root certs wget -O/etc/pki/tls/certs/ca-bundle.crt http://curl.haxx.se/ca/cacert.pem -# vagrant -groupadd vagrant -useradd vagrant -g vagrant -G wheel -u 900 -echo "vagrant" | passwd --stdin vagrant # sudo echo 'Defaults:vagrant !requiretty' > /etc/sudoers.d/vagrant echo '%vagrant ALL=(ALL) NOPASSWD: ALL' >> /etc/sudoers.d/vagrant diff --git a/packer/http/fedora-20/ks.cfg b/packer/http/fedora-20/ks.cfg index 936809d36..23be39dc6 100644 --- a/packer/http/fedora-20/ks.cfg +++ b/packer/http/fedora-20/ks.cfg @@ -3,7 +3,7 @@ cdrom lang en_US.UTF-8 keyboard us network --bootproto=dhcp -rootpw --iscrypted $1$damlkd,f$UC/u5pUts5QiU3ow.CSso/ +rootpw vagrant firewall --disabled authconfig --enableshadow --passalgo=sha512 selinux --permissive @@ -22,29 +22,24 @@ bootloader --location=mbr --append="norhgb biosdevname=0" auth --useshadow --enablemd5 firstboot --disabled reboot +user --name=vagrant --plaintext --password vagrant -%packages -@Core +%packages --nobase --ignoremissing --excludedocs bzip2 gcc kernel-devel kernel-headers -openssl-devel -readline-devel tar wget -net-tools -zlib-devel nfs-utils +-linux-firmware +-plymouth +-plymouth-core-libs %end %post # update root certs wget -O/etc/pki/tls/certs/ca-bundle.crt http://curl.haxx.se/ca/cacert.pem -# vagrant -groupadd vagrant -useradd vagrant -g vagrant -G wheel -u 900 -echo "vagrant" | passwd --stdin vagrant # sudo echo 'Defaults:vagrant !requiretty' > /etc/sudoers.d/vagrant echo '%vagrant ALL=(ALL) NOPASSWD: ALL' >> /etc/sudoers.d/vagrant diff --git a/packer/scripts/fedora/cleanup.sh b/packer/scripts/fedora/cleanup.sh index a4d82c900..13f3111e2 100644 --- a/packer/scripts/fedora/cleanup.sh +++ b/packer/scripts/fedora/cleanup.sh @@ -1,4 +1,5 @@ #!/bin/bash -eux -yum -y erase gtk2 libX11 hicolor-icon-theme freetype +yum -y remove gcc cpp kernel-devel kernel-headers perl yum -y clean all +rm -rf VBoxGuestAdditions_*.iso VBoxGuestAdditions_*.iso.? rm -f /tmp/chef*rpm From 113db96f44f8b99c604951b989ce33b831ec8b06 Mon Sep 17 00:00:00 2001 From: "Julian C. Dunn" <jdunn@getchef.com> Date: Sun, 9 Mar 2014 22:51:50 -0400 Subject: [PATCH 0203/1622] Boxes are now built using VirtualBox 4.3.8; remove ubuntu-13.04 from VMware section --- README.md | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/README.md b/README.md index 78821248a..5dfde213b 100644 --- a/README.md +++ b/README.md @@ -16,7 +16,7 @@ Vagrant can be instructed to install Chef at runtime using the ### VirtualBox -These baseboxes were all built using a Mac OS X host running VirtualBox 4.3.2, and have that format of Guest Extensions. +These baseboxes were all built using a Mac OS X host running VirtualBox 4.3.8, and have that format of Guest Extensions. * [opscode-centos-5.10-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_centos-5.10-i386_chef-provisionerless.box) * [opscode-centos-5.10](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_centos-5.10_chef-provisionerless.box) @@ -66,8 +66,6 @@ The boxes should work unchanged in VMWare Workstation for Windows or Linux. * [opscode-ubuntu-12.04](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_ubuntu-12.04_chef-provisionerless.box) * [opscode-ubuntu-12.10-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_ubuntu-12.10-i386_chef-provisionerless.box) * [opscode-ubuntu-12.10](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_ubuntu-12.10_chef-provisionerless.box) -* [opscode-ubuntu-13.04-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_ubuntu-13.04-i386_chef-provisionerless.box) -* [opscode-ubuntu-13.04](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_ubuntu-13.04_chef-provisionerless.box) * [opscode-ubuntu-13.10-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_ubuntu-13.10-i386_chef-provisionerless.box) * [opscode-ubuntu-13.10](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_ubuntu-13.10_chef-provisionerless.box) From e1d41cd4d750c45deee3821e98de821130c560f0 Mon Sep 17 00:00:00 2001 From: "Julian C. Dunn" <jdunn@getchef.com> Date: Thu, 13 Mar 2014 09:58:59 -0400 Subject: [PATCH 0204/1622] Bugfixes for FreeBSD 10: tools_upload_flavor went missing from VMWare templates, and builder names changed in Packer. --- packer/freebsd-10.0-amd64.json | 1 + packer/freebsd-10.0-i386.json | 1 + packer/scripts/freebsd/vmtools.sh | 4 ++-- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/packer/freebsd-10.0-amd64.json b/packer/freebsd-10.0-amd64.json index 8e115f1c3..e49fa913d 100644 --- a/packer/freebsd-10.0-amd64.json +++ b/packer/freebsd-10.0-amd64.json @@ -88,6 +88,7 @@ "shutdown_command": "echo 'shutdown -p now' > shutdown.sh; cat 'shutdown.sh' | su -", "vm_name": "packer-freebsd-10.0-amd64", "output_directory": "packer-freebsd-10.0-amd64-vmware", + "tools_upload_flavor": "freebsd", "vmx_data": { "memsize": "512", "numvcpus": "1", diff --git a/packer/freebsd-10.0-i386.json b/packer/freebsd-10.0-i386.json index 084bb22a1..c8686a81c 100644 --- a/packer/freebsd-10.0-i386.json +++ b/packer/freebsd-10.0-i386.json @@ -88,6 +88,7 @@ "shutdown_command": "echo 'shutdown -p now' > shutdown.sh; cat 'shutdown.sh' | su -", "vm_name": "packer-freebsd-10.0-i386", "output_directory": "packer-freebsd-10.0-i386-vmware", + "tools_upload_flavor": "freebsd", "vmx_data": { "memsize": "512", "numvcpus": "1", diff --git a/packer/scripts/freebsd/vmtools.sh b/packer/scripts/freebsd/vmtools.sh index 9a2f34e9b..1d7b9a5b8 100644 --- a/packer/scripts/freebsd/vmtools.sh +++ b/packer/scripts/freebsd/vmtools.sh @@ -9,7 +9,7 @@ else perl_pkg="perl" fi -if [ $PACKER_BUILDER_TYPE == 'virtualbox' ]; then +if [ $PACKER_BUILDER_TYPE == 'virtualbox-iso' ]; then # disable X11 because vagrants are (usually) headless echo 'WITHOUT_X11="YES"' >> /etc/make.conf @@ -34,7 +34,7 @@ if [ $PACKER_BUILDER_TYPE == 'virtualbox' ]; then echo 'ifconfig_vtnet3_name="em3"' >> /etc/rc.conf fi -if [ $PACKER_BUILDER_TYPE == 'vmware' ]; then +if [ $PACKER_BUILDER_TYPE == 'vmware-iso' ]; then mkdir /tmp/vmfusion mkdir /tmp/vmfusion-archive mdconfig -a -t vnode -f /home/vagrant/freebsd.iso -u 0 From 961ddda63f4f9583bcd704e42a0e083fec8fb8d7 Mon Sep 17 00:00:00 2001 From: Nick Galbreath <nickg@client9.com> Date: Fri, 14 Mar 2014 11:34:05 +0900 Subject: [PATCH 0205/1622] BENTO-116: use ISO for Ubuntu 12.04.04, not 12.04.03 --- packer/ubuntu-12.04-amd64.json | 4 ++-- packer/ubuntu-12.04-i386.json | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/packer/ubuntu-12.04-amd64.json b/packer/ubuntu-12.04-amd64.json index e8652e1a0..4b03f88ce 100644 --- a/packer/ubuntu-12.04-amd64.json +++ b/packer/ubuntu-12.04-amd64.json @@ -30,9 +30,9 @@ "guest_additions_path": "VBoxGuestAdditions_{{ .Version }}.iso", "guest_os_type": "Ubuntu_64", "http_directory": "http", - "iso_checksum": "4e36c272dde245cfadf14ff8895566571a38f4d2", + "iso_checksum": "b802bb065df98c0530d782eb94778c2da19e10d6", "iso_checksum_type": "sha1", - "iso_url": "{{user `mirror`}}/12.04/ubuntu-12.04.3-server-amd64.iso", + "iso_url": "{{user `mirror`}}/12.04/ubuntu-12.04.4-server-amd64.iso", "output_directory": "packer-ubuntu-12.04-amd64-virtualbox", "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", "ssh_password": "vagrant", diff --git a/packer/ubuntu-12.04-i386.json b/packer/ubuntu-12.04-i386.json index 51e5de130..59d07c67c 100644 --- a/packer/ubuntu-12.04-i386.json +++ b/packer/ubuntu-12.04-i386.json @@ -30,9 +30,9 @@ "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "guest_os_type": "Ubuntu", "http_directory": "http", - "iso_checksum": "2ec0e913959f6c2ba7a558e8bfa361428bb00e56", + "iso_checksum": "3bae12e315c89d42d7bf571e4e35efce585c7624", "iso_checksum_type": "sha1", - "iso_url": "{{user `mirror`}}/12.04/ubuntu-12.04.3-server-i386.iso", + "iso_url": "{{user `mirror`}}/12.04/ubuntu-12.04.4-server-i386.iso", "output_directory": "packer-ubuntu-12.04-i386-virtualbox", "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", "ssh_password": "vagrant", From d727284503286a60b8f133d801a010be3da5cd88 Mon Sep 17 00:00:00 2001 From: "Julian C. Dunn" <jdunn@getchef.com> Date: Thu, 13 Mar 2014 23:33:10 -0400 Subject: [PATCH 0206/1622] Make sure to update checksums and ISOs for vmware-iso builder too. --- packer/ubuntu-12.04-amd64.json | 4 ++-- packer/ubuntu-12.04-i386.json | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/packer/ubuntu-12.04-amd64.json b/packer/ubuntu-12.04-amd64.json index 4b03f88ce..241efd3b1 100644 --- a/packer/ubuntu-12.04-amd64.json +++ b/packer/ubuntu-12.04-amd64.json @@ -86,9 +86,9 @@ "disk_size": 40960, "guest_os_type": "ubuntu-64", "http_directory": "http", - "iso_checksum": "4e36c272dde245cfadf14ff8895566571a38f4d2", + "iso_checksum": "b802bb065df98c0530d782eb94778c2da19e10d6", "iso_checksum_type": "sha1", - "iso_url": "{{user `mirror`}}/12.04/ubuntu-12.04.3-server-amd64.iso", + "iso_url": "{{user `mirror`}}/12.04/ubuntu-12.04.4-server-amd64.iso", "output_directory": "packer-ubuntu-12.04-amd64-vmware", "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", "ssh_password": "vagrant", diff --git a/packer/ubuntu-12.04-i386.json b/packer/ubuntu-12.04-i386.json index 59d07c67c..5d1aba656 100644 --- a/packer/ubuntu-12.04-i386.json +++ b/packer/ubuntu-12.04-i386.json @@ -86,9 +86,9 @@ "disk_size": 40960, "guest_os_type": "ubuntu", "http_directory": "http", - "iso_checksum": "2ec0e913959f6c2ba7a558e8bfa361428bb00e56", + "iso_checksum": "3bae12e315c89d42d7bf571e4e35efce585c7624", "iso_checksum_type": "sha1", - "iso_url": "{{user `mirror`}}/12.04/ubuntu-12.04.3-server-i386.iso", + "iso_url": "{{user `mirror`}}/12.04/ubuntu-12.04.4-server-i386.iso", "output_directory": "packer-ubuntu-12.04-i386-vmware", "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", "ssh_password": "vagrant", From 0d050c1c35f84dc7509566932830b481398d0aa8 Mon Sep 17 00:00:00 2001 From: Nick Galbreath <nickg@client9.com> Date: Fri, 14 Mar 2014 20:32:08 +0900 Subject: [PATCH 0207/1622] [BENTO-116] Save 100+MB for ubuntu box images --- packer/scripts/ubuntu/cleanup.sh | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/packer/scripts/ubuntu/cleanup.sh b/packer/scripts/ubuntu/cleanup.sh index 6c7f703d6..176774a17 100644 --- a/packer/scripts/ubuntu/cleanup.sh +++ b/packer/scripts/ubuntu/cleanup.sh @@ -1,4 +1,32 @@ #!/bin/bash -eux +# +# this removes specific linux kernels, such as +# linux-image-3.11.0-15-generic but +# * keeps the current kernel +# * does not touch the virtual packages, e.g.'linux-image-generic', etc. +# +dpkg --list | awk '{ print $2 }' | grep 'linux-image-3.*-generic' | grep -v `uname -r` | xargs apt-get -y purge + +# delete all linux headers +dpkg --list | awk '{ print $2 }' | grep linux-headers | xargs apt-get -y purge + +# delete linux source +dpkg --list | awk '{ print $2 }' | grep linux-source | xargs apt-get -y purge + +# delete development packages +dpkg --list | awk '{ print $2 }' | grep -- '-dev$' | xargs apt-get -y purge + +# delete compilers and other development tools +apt-get -y purge cpp gcc g++ + +# delete X11 libraries +apt-get -y purge libx11-data xauth libxmuu1 libxcb1 libx11-6 libxext6 + +# delete obsolete networking +apt-get -y purge ppp pppconfig pppoeconf + +# delete oddities +apt-get -y purge popularity-contest apt-get -y autoremove apt-get -y clean From 517917b05224deed26882727c18dbafd56fbebfd Mon Sep 17 00:00:00 2001 From: Nick Galbreath <nickg@client9.com> Date: Mon, 17 Mar 2014 11:55:37 +0900 Subject: [PATCH 0208/1622] [BENTO-118]: ignore unsupported hardware on newer macs, on virtualbox --- packer/http/centos-6.5/ks.cfg | 1 + 1 file changed, 1 insertion(+) diff --git a/packer/http/centos-6.5/ks.cfg b/packer/http/centos-6.5/ks.cfg index c87dc7c7e..a7a9888a4 100644 --- a/packer/http/centos-6.5/ks.cfg +++ b/packer/http/centos-6.5/ks.cfg @@ -7,6 +7,7 @@ rootpw vagrant firewall --disabled selinux --permissive timezone UTC +unsupported_hardware bootloader --location=mbr text skipx From 49cb3e0901f123021ff6660d7b514ee4d87b2c79 Mon Sep 17 00:00:00 2001 From: "Julian C. Dunn" <jdunn@aquezada.com> Date: Sun, 23 Mar 2014 18:22:49 -0400 Subject: [PATCH 0209/1622] Added links to FreeBSD 10 boxes --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 5dfde213b..6c5c35fb6 100644 --- a/README.md +++ b/README.md @@ -32,6 +32,7 @@ These baseboxes were all built using a Mac OS X host running VirtualBox 4.3.8, a * [opscode-fedora-20](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_fedora-20_chef-provisionerless.box) * [opscode-freebsd-9.2-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_freebsd-9.2-i386_chef-provisionerless.box) * [opscode-freebsd-9.2](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_freebsd-9.2_chef-provisionerless.box) +* [opscode-freebsd-10](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_freebsd-10_chef-provisionerless.box) * [opscode-ubuntu-10.04-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_ubuntu-10.04-i386_chef-provisionerless.box) * [opscode-ubuntu-10.04](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_ubuntu-10.04_chef-provisionerless.box) * [opscode-ubuntu-12.04-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_ubuntu-12.04-i386_chef-provisionerless.box) @@ -60,6 +61,7 @@ The boxes should work unchanged in VMWare Workstation for Windows or Linux. * [opscode-fedora-20](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_fedora-20_chef-provisionerless.box) * [opscode-freebsd-9.2-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_freebsd-9.2-i386_chef-provisionerless.box) * [opscode-freebsd-9.2](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_freebsd-9.2_chef-provisionerless.box) +* [opscode-freebsd-10](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_freebsd-10_chef-provisionerless.box) * [opscode-ubuntu-10.04-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_ubuntu-10.04-i386_chef-provisionerless.box) * [opscode-ubuntu-10.04](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_ubuntu-10.04_chef-provisionerless.box) * [opscode-ubuntu-12.04-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_ubuntu-12.04-i386_chef-provisionerless.box) From defca974d25401e173f05927fba7749448f32f26 Mon Sep 17 00:00:00 2001 From: "Julian C. Dunn" <jdunn@getchef.com> Date: Fri, 28 Mar 2014 21:35:33 -0400 Subject: [PATCH 0210/1622] Fix #197: wrong URL on FreeBSD 10 boxes --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 6c5c35fb6..f75b3c21f 100644 --- a/README.md +++ b/README.md @@ -32,7 +32,7 @@ These baseboxes were all built using a Mac OS X host running VirtualBox 4.3.8, a * [opscode-fedora-20](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_fedora-20_chef-provisionerless.box) * [opscode-freebsd-9.2-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_freebsd-9.2-i386_chef-provisionerless.box) * [opscode-freebsd-9.2](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_freebsd-9.2_chef-provisionerless.box) -* [opscode-freebsd-10](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_freebsd-10_chef-provisionerless.box) +* [opscode-freebsd-10](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_freebsd-10.0_chef-provisionerless.box) * [opscode-ubuntu-10.04-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_ubuntu-10.04-i386_chef-provisionerless.box) * [opscode-ubuntu-10.04](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_ubuntu-10.04_chef-provisionerless.box) * [opscode-ubuntu-12.04-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_ubuntu-12.04-i386_chef-provisionerless.box) @@ -61,7 +61,7 @@ The boxes should work unchanged in VMWare Workstation for Windows or Linux. * [opscode-fedora-20](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_fedora-20_chef-provisionerless.box) * [opscode-freebsd-9.2-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_freebsd-9.2-i386_chef-provisionerless.box) * [opscode-freebsd-9.2](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_freebsd-9.2_chef-provisionerless.box) -* [opscode-freebsd-10](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_freebsd-10_chef-provisionerless.box) +* [opscode-freebsd-10](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_freebsd-10.0_chef-provisionerless.box) * [opscode-ubuntu-10.04-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_ubuntu-10.04-i386_chef-provisionerless.box) * [opscode-ubuntu-10.04](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_ubuntu-10.04_chef-provisionerless.box) * [opscode-ubuntu-12.04-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_ubuntu-12.04-i386_chef-provisionerless.box) From a96d1b9cd9823d83846c1c13bfea66f9150fee70 Mon Sep 17 00:00:00 2001 From: Dung Quang <nxqd.inbox+rhacker@gmail.com> Date: Sun, 30 Mar 2014 10:19:06 +0700 Subject: [PATCH 0211/1622] The wget failed in Debian distro In debian 7.4, it has broken wget due to this thread http://forums.debian.net/viewtopic.php?f=5&t=112704 . curl will work fine . --- packer/scripts/common/vagrant.sh | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/packer/scripts/common/vagrant.sh b/packer/scripts/common/vagrant.sh index de5925554..60de57ee7 100644 --- a/packer/scripts/common/vagrant.sh +++ b/packer/scripts/common/vagrant.sh @@ -1,8 +1,7 @@ #!/bin/bash mkdir /home/vagrant/.ssh -wget --no-check-certificate \ - 'https://github.com/mitchellh/vagrant/raw/master/keys/vagrant.pub' \ - -O /home/vagrant/.ssh/authorized_keys +curl -o /home/vagrant/.ssh/authorized_keys -L \ + 'https://github.com/mitchellh/vagrant/raw/master/keys/vagrant.pub' chown -R vagrant /home/vagrant/.ssh chmod -R go-rwsx /home/vagrant/.ssh From 435b9e4cb50ac2640ec162b5aa44b311b7307128 Mon Sep 17 00:00:00 2001 From: "Julian C. Dunn" <jdunn@getchef.com> Date: Wed, 9 Apr 2014 10:52:27 -0400 Subject: [PATCH 0212/1622] Updated README for: * Copyright and company name * Windows box documentation * Issue tracker --- README.md | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/README.md b/README.md index f75b3c21f..601553bd3 100644 --- a/README.md +++ b/README.md @@ -109,7 +109,7 @@ To build a Mac OS X box, you will need to start with an installer for your desir There is a known issue where [test-kitchen](http://kitchen.ci/) starts a Mac OS X box correctly, but `vagrant up` fails due to the absence of the HGFS kernel module. This is due to a silent failure during the VMware tools installation and can be corrected by installing the VMware tools on the Mac OS X box manually. -### Veewee Definitions +### Windows Boxes Packer does not yet support Windows, so veewee definitions are still used for building those boxes. You must build these boxes yourself due to licensing constraints. You can build these as follows: @@ -117,6 +117,12 @@ boxes yourself due to licensing constraints. You can build these as follows: $ bundle install $ bundle exec veewee vbox build [definition-name] +These veewee definitions are lightly maintained. For other approaches to building Windows boxes, please see the following +community projects: + +* [Mischa Taylor's basebox project](https://github.com/misheska/basebox-packer/) +* [Vagrant Windows Boxes and Puppet](https://github.com/ferventcoder/vagrant-windows-puppet/tree/master/baseboxes) + ### Special Note About Building from Windows Hosts When building boxes from a Windows host system, you must ensure that kickstart configuration files (`ks.cfg` for RHEL @@ -141,12 +147,8 @@ it's not the case because you have overridden line-ending conversion in your own ## Bugs and Issues -Use the [issue tracker](http://tickets.opscode.com/browse/BENTO) to report -bugs, features or other issues. - -## Contributing - -[How to contribute to Opscode open source software projects](http://wiki.opscode.com/display/chef/How+to+Contribute) +Please use GitHub issues to report bugs, features, or other problems. Please note: +the [JIRA issue tracker](http://tickets.opscode.com/browse/BENTO) is no longer being used. ## License & Authors @@ -157,18 +159,18 @@ make "Don't Repeat Yourself" (DRY) modular baseboxes. Thanks Tim! Mac OS X templates were adopted wholesale from [Fletcher Nichol's packer templates](https://github.com/fnichol/packer-templates). -- Author: Seth Chisamore (<schisamo@opscode.com>) -- Author: Stephen Delano (<stephen@opscode.com>) -- Author: Joshua Timberman (<joshua@opscode.com>) +- Author: Seth Chisamore (<schisamo@getchef.com>) +- Author: Stephen Delano (<stephen@getchef.com>) +- Author: Joshua Timberman (<joshua@getchef.com>) - Author: Tim Dysinger (<tim@dysinger.net>) - Author: Chris McClimans (<chris@hippiehacker.org>) -- Author: Julian Dunn (<jdunn@opscode.com>) -- Author: Tom Duffield (<tom@opscode.com>) +- Author: Julian Dunn (<jdunn@getchef.com>) +- Author: Tom Duffield (<tom@getchef.com>) - Author: Ross Timson (<ross@rosstimson.com>) - Author: Fletcher Nichol (<fnichol@nichol.ca>) ```text -Copyright 2012-2013, Opscode, Inc. (<legal@opscode.com>) +Copyright 2012-2014, Chef Software, Inc. (<legal@getchef.com>) Copyright 2011-2012, Tim Dysinger (<tim@dysinger.net>) Licensed under the Apache License, Version 2.0 (the "License"); From 3d2f0ad70f1b00799f8c48eb06804a28770bbbdb Mon Sep 17 00:00:00 2001 From: Scott Barber <scottwbarber@gmail.com> Date: Wed, 9 Apr 2014 21:59:38 -0600 Subject: [PATCH 0213/1622] Update vagrant.sh Switch back to wget (ubuntu doesn't come with curl) and use the direct URL instead (wget in debian 7.4 was broken. See: https://github.com/opscode/bento/pull/203#issuecomment-40037333 and https://github.com/opscode/bento/commit/a96d1b9 --- packer/scripts/common/vagrant.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/packer/scripts/common/vagrant.sh b/packer/scripts/common/vagrant.sh index 60de57ee7..cfb0ff2d6 100644 --- a/packer/scripts/common/vagrant.sh +++ b/packer/scripts/common/vagrant.sh @@ -1,7 +1,8 @@ #!/bin/bash mkdir /home/vagrant/.ssh -curl -o /home/vagrant/.ssh/authorized_keys -L \ - 'https://github.com/mitchellh/vagrant/raw/master/keys/vagrant.pub' +wget --no-check-certificate \ + 'https://raw.githubusercontent.com/mitchellh/vagrant/master/keys/vagrant.pub' \ + -O /home/vagrant/.ssh/authorized_keys chown -R vagrant /home/vagrant/.ssh chmod -R go-rwsx /home/vagrant/.ssh From f37173e13318f58d9df5a1311c099a5302c172e7 Mon Sep 17 00:00:00 2001 From: Seth Vargo <sethvargo@gmail.com> Date: Thu, 10 Apr 2014 17:10:21 -0400 Subject: [PATCH 0214/1622] Update README badge to SVG [ci skip] --- README.md | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 601553bd3..bc6d4b2d6 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,8 @@ # Bento -[![Build Status](https://travis-ci.org/opscode/bento.png)](https://travis-ci.org/opscode/bento) +[![Build Status](http://img.shields.io/travis/opscode/bento.svg)][travis] + +[travis]: https://travis-ci.org/opscode/bento Bento is a project that encapsulates [Packer](http://packer.io) templates for building [Vagrant](http://vagrantup.com) baseboxes. We use these boxes internally at Opscode for @@ -103,11 +105,11 @@ Mac OS X (10.7, 10.8, and 10.9), Red Hat Enterprise Linux, and SUSE Linux Enterp Mac OS X builds are supported for VMware only. We would welcome a contribution to add VirtualBox support. -To build a Mac OS X box, you will need to start with an installer for your desired version of OS X. You will then need to use [Tim Sutton's osx-vm-templates](https://github.com/timsutton/osx-vm-templates)/) to modify that installer for use by packer. The output of that build will include the location of the ISO and its checksum, which you can substitute into your `packer build` command, e.g.: +To build a Mac OS X box, you will need to start with an installer for your desired version of OS X. You will then need to use [Tim Sutton's osx-vm-templates](https://github.com/timsutton/osx-vm-templates)/) to modify that installer for use by packer. The output of that build will include the location of the ISO and its checksum, which you can substitute into your `packer build` command, e.g.: $ packer build -var 'iso_checksum=<checksum>' -var 'iso_url=<iso_url>' macosx-10.9.json -There is a known issue where [test-kitchen](http://kitchen.ci/) starts a Mac OS X box correctly, but `vagrant up` fails due to the absence of the HGFS kernel module. This is due to a silent failure during the VMware tools installation and can be corrected by installing the VMware tools on the Mac OS X box manually. +There is a known issue where [test-kitchen](http://kitchen.ci/) starts a Mac OS X box correctly, but `vagrant up` fails due to the absence of the HGFS kernel module. This is due to a silent failure during the VMware tools installation and can be corrected by installing the VMware tools on the Mac OS X box manually. ### Windows Boxes From aa397fcd1075bd7e38211793f0432b164faca878 Mon Sep 17 00:00:00 2001 From: Robert Coleman <github@robert.net.nz> Date: Fri, 18 Apr 2014 14:43:26 +1200 Subject: [PATCH 0215/1622] add templates for Ubuntu 14.04 --- packer/http/ubuntu-14.04/preseed.cfg | 31 ++++++ packer/ubuntu-14.04-amd64.json | 139 ++++++++++++++++++++++++++ packer/ubuntu-14.04-i386.json | 143 +++++++++++++++++++++++++++ 3 files changed, 313 insertions(+) create mode 100644 packer/http/ubuntu-14.04/preseed.cfg create mode 100644 packer/ubuntu-14.04-amd64.json create mode 100644 packer/ubuntu-14.04-i386.json diff --git a/packer/http/ubuntu-14.04/preseed.cfg b/packer/http/ubuntu-14.04/preseed.cfg new file mode 100644 index 000000000..0a4d4939b --- /dev/null +++ b/packer/http/ubuntu-14.04/preseed.cfg @@ -0,0 +1,31 @@ +choose-mirror-bin mirror/http/proxy string +d-i base-installer/kernel/override-image string linux-server +d-i clock-setup/utc boolean true +d-i clock-setup/utc-auto boolean true +d-i finish-install/reboot_in_progress note +d-i grub-installer/only_debian boolean true +d-i grub-installer/with_other_os boolean true +d-i partman-auto-lvm/guided_size string max +d-i partman-auto/choose_recipe select atomic +d-i partman-auto/method string lvm +d-i partman-lvm/confirm boolean true +d-i partman-lvm/confirm boolean true +d-i partman-lvm/confirm_nooverwrite boolean true +d-i partman-lvm/device_remove_lvm boolean true +d-i partman/choose_partition select finish +d-i partman/confirm boolean true +d-i partman/confirm_nooverwrite boolean true +d-i partman/confirm_write_new_label boolean true +d-i passwd/user-fullname string vagrant +d-i passwd/user-uid string 900 +d-i passwd/user-password password vagrant +d-i passwd/user-password-again password vagrant +d-i passwd/username string vagrant +d-i pkgsel/include string openssh-server cryptsetup build-essential libssl-dev libreadline-dev zlib1g-dev linux-source dkms nfs-common +d-i pkgsel/install-language-support boolean false +d-i pkgsel/update-policy select unattended-upgrades +d-i pkgsel/upgrade select full-upgrade +d-i time/zone string UTC +d-i user-setup/allow-password-weak boolean true +d-i user-setup/encrypt-home boolean false +tasksel tasksel/first multiselect standard, ubuntu-server diff --git a/packer/ubuntu-14.04-amd64.json b/packer/ubuntu-14.04-amd64.json new file mode 100644 index 000000000..149dfc671 --- /dev/null +++ b/packer/ubuntu-14.04-amd64.json @@ -0,0 +1,139 @@ +{ + "builders": [ + { + "boot_command": [ + "<esc><wait>", + "<esc><wait>", + "<enter><wait>", + "/install/vmlinuz<wait>", + " auto<wait>", + " console-setup/ask_detect=false<wait>", + " console-setup/layoutcode=us<wait>", + " console-setup/modelcode=pc105<wait>", + " debconf/frontend=noninteractive<wait>", + " debian-installer=en_US<wait>", + " fb=false<wait>", + " initrd=/install/initrd.gz<wait>", + " kbd-chooser/method=us<wait>", + " keyboard-configuration/layout=USA<wait>", + " keyboard-configuration/variant=USA<wait>", + " locale=en_US<wait>", + " netcfg/get_domain=vm<wait>", + " netcfg/get_hostname=vagrant<wait>", + " noapic<wait>", + " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/ubuntu-14.04/preseed.cfg<wait>", + " -- <wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "guest_os_type": "Ubuntu_64", + "http_directory": "http", + "iso_checksum": "4d94f6111b8fe47da94396180ce499d8c0bb44f3", + "iso_checksum_type": "sha1", + "iso_url": "{{user `mirror`}}/14.04/ubuntu-14.04-server-amd64.iso", + "output_directory": "packer-ubuntu-14.04-amd64-virtualbox", + "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "virtualbox-iso", + "vboxmanage": [ + [ + "modifyvm", + "{{.Name}}", + "--memory", + "384" + ], + [ + "modifyvm", + "{{.Name}}", + "--cpus", + "1" + ] + ], + "virtualbox_version_file": ".vbox_version", + "vm_name": "packer-ubuntu-14.04-amd64" + }, + { + "boot_command": [ + "<esc><wait>", + "<esc><wait>", + "<enter><wait>", + "/install/vmlinuz<wait>", + " auto<wait>", + " console-setup/ask_detect=false<wait>", + " console-setup/layoutcode=us<wait>", + " console-setup/modelcode=pc105<wait>", + " debconf/frontend=noninteractive<wait>", + " debian-installer=en_US<wait>", + " fb=false<wait>", + " initrd=/install/initrd.gz<wait>", + " kbd-chooser/method=us<wait>", + " keyboard-configuration/layout=USA<wait>", + " keyboard-configuration/variant=USA<wait>", + " locale=en_US<wait>", + " netcfg/get_domain=vm<wait>", + " netcfg/get_hostname=vagrant<wait>", + " noapic<wait>", + " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/ubuntu-14.04/preseed.cfg<wait>", + " -- <wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "guest_os_type": "ubuntu-64", + "headless": true, + "http_directory": "http", + "iso_checksum": "4d94f6111b8fe47da94396180ce499d8c0bb44f3", + "iso_checksum_type": "sha1", + "iso_url": "{{user `mirror`}}/14.04/ubuntu-14.04-server-amd64.iso", + "output_directory": "packer-ubuntu-14.04-amd64-vmware", + "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "tools_upload_flavor": "linux", + "type": "vmware-iso", + "vm_name": "packer-ubuntu-14.04-amd64", + "vmx_data": { + "cpuid.coresPerSocket": "1", + "memsize": "384", + "numvcpus": "1" + } + } + ], + "post-processors": [ + { + "output": "../builds/{{.Provider}}/opscode_ubuntu-14.04_chef-{{user `chef_version`}}.box", + "type": "vagrant" + } + ], + "provisioners": [ + { + "environment_vars": [ + "CHEF_VERSION={{user `chef_version`}}" + ], + "execute_command": "echo 'vagrant'|{{.Vars}} sudo -S -E bash '{{.Path}}'", + "scripts": [ + "scripts/ubuntu/update.sh", + "scripts/common/sshd.sh", + "scripts/ubuntu/networking.sh", + "scripts/ubuntu/sudoers.sh", + "scripts/common/vagrant.sh", + "scripts/common/vmtools.sh", + "scripts/common/chef.sh", + "scripts/ubuntu/cleanup.sh", + "scripts/common/minimize.sh" + ], + "type": "shell" + } + ], + "variables": { + "chef_version": "provisionerless", + "mirror": "http://releases.ubuntu.com" + } +} diff --git a/packer/ubuntu-14.04-i386.json b/packer/ubuntu-14.04-i386.json new file mode 100644 index 000000000..ec36dcb58 --- /dev/null +++ b/packer/ubuntu-14.04-i386.json @@ -0,0 +1,143 @@ +{ + "builders": [ + { + "boot_command": [ + "<esc><wait>", + "<esc><wait>", + "<enter><wait>", + "/install/vmlinuz<wait>", + " auto<wait>", + " console-setup/ask_detect=false<wait>", + " console-setup/layoutcode=us<wait>", + " console-setup/modelcode=pc105<wait>", + " debconf/frontend=noninteractive<wait>", + " debian-installer=en_US<wait>", + " fb=false<wait>", + " initrd=/install/initrd.gz<wait>", + " kbd-chooser/method=us<wait>", + " keyboard-configuration/layout=USA<wait>", + " keyboard-configuration/variant=USA<wait>", + " locale=en_US<wait>", + " netcfg/get_domain=vm<wait>", + " netcfg/get_hostname=vagrant<wait>", + " noapic<wait>", + " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/ubuntu-14.04/preseed.cfg<wait>", + " -- <wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "guest_os_type": "Ubuntu", + "http_directory": "http", + "iso_checksum": "33eb2ad62940aabe99f776f3c35ce90eaad6e2d2", + "iso_checksum_type": "sha1", + "iso_url": "{{user `mirror`}}/14.04/ubuntu-14.04-server-i386.iso", + "output_directory": "packer-ubuntu-14.04-i386-virtualbox", + "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "virtualbox-iso", + "vboxmanage": [ + [ + "modifyvm", + "{{.Name}}", + "--memory", + "384" + ], + [ + "modifyvm", + "{{.Name}}", + "--cpus", + "1" + ] + ], + "virtualbox_version_file": ".vbox_version", + "vm_name": "packer-ubuntu-14.04-i386" + }, + { + "boot_command": [ + "<esc><wait>", + "<esc><wait>", + "<enter><wait>", + "/install/vmlinuz<wait>", + " auto<wait>", + " console-setup/ask_detect=false<wait>", + " console-setup/layoutcode=us<wait>", + " console-setup/modelcode=pc105<wait>", + " debconf/frontend=noninteractive<wait>", + " debian-installer=en_US<wait>", + " fb=false<wait>", + " initrd=/install/initrd.gz<wait>", + " kbd-chooser/method=us<wait>", + " keyboard-configuration/layout=USA<wait>", + " keyboard-configuration/variant=USA<wait>", + " locale=en_US<wait>", + " netcfg/get_domain=vm<wait>", + " netcfg/get_hostname=vagrant<wait>", + " noapic<wait>", + " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/ubuntu-14.04/preseed.cfg<wait>", + " -- <wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "guest_os_type": "ubuntu", + "http_directory": "http", + "iso_checksum": "33eb2ad62940aabe99f776f3c35ce90eaad6e2d2", + "iso_checksum_type": "sha1", + "iso_url": "{{user `mirror`}}/14.04/ubuntu-14.04-server-i386.iso", + "output_directory": "packer-ubuntu-14.04-i386-vmware", + "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "tools_upload_flavor": "linux", + "type": "vmware-iso", + "vm_name": "packer-ubuntu-14.04-i386", + "vmx_data": { + "cpuid.coresPerSocket": "1", + "memsize": "384", + "numvcpus": "1" + } + } + ], + "post-processors": [ + { + "output": "../builds/{{.Provider}}/opscode_ubuntu-14.04-i386_chef-{{user `chef_version`}}.box", + "type": "vagrant" + } + ], + "provisioners": [ + { + "destination": "/tmp/shutdown.sh", + "source": "scripts/common/shutdown.sh", + "type": "file" + }, + { + "environment_vars": [ + "CHEF_VERSION={{user `chef_version`}}" + ], + "execute_command": "echo 'vagrant'|{{.Vars}} sudo -S -E bash '{{.Path}}'", + "scripts": [ + "scripts/ubuntu/update.sh", + "scripts/common/sshd.sh", + "scripts/ubuntu/networking.sh", + "scripts/ubuntu/sudoers.sh", + "scripts/common/vagrant.sh", + "scripts/common/vmtools.sh", + "scripts/common/chef.sh", + "scripts/ubuntu/cleanup.sh", + "scripts/common/minimize.sh" + ], + "type": "shell" + } + ], + "variables": { + "chef_version": "provisionerless", + "mirror": "http://releases.ubuntu.com" + } +} From 3cea4a1ddbd06ab11481b769c5908fdc72c25650 Mon Sep 17 00:00:00 2001 From: "Julian C. Dunn" <jdunn@getchef.com> Date: Sat, 19 Apr 2014 13:16:51 -0400 Subject: [PATCH 0216/1622] Cleanup inconsistencies in Ubuntu templates. * Build all templates non-headless so we can see error output * Remove extraneous provisioner --- packer/ubuntu-13.10-amd64.json | 1 - packer/ubuntu-13.10-i386.json | 5 ----- packer/ubuntu-14.04-amd64.json | 1 - packer/ubuntu-14.04-i386.json | 5 ----- 4 files changed, 12 deletions(-) diff --git a/packer/ubuntu-13.10-amd64.json b/packer/ubuntu-13.10-amd64.json index fd8987b98..b90e5148c 100644 --- a/packer/ubuntu-13.10-amd64.json +++ b/packer/ubuntu-13.10-amd64.json @@ -85,7 +85,6 @@ "boot_wait": "10s", "disk_size": 40960, "guest_os_type": "ubuntu-64", - "headless": true, "http_directory": "http", "iso_checksum": "5dd72c694c3a7e06a3b4dd651ca26cfc70985004", "iso_checksum_type": "sha1", diff --git a/packer/ubuntu-13.10-i386.json b/packer/ubuntu-13.10-i386.json index 283eafc05..d3d3246f2 100644 --- a/packer/ubuntu-13.10-i386.json +++ b/packer/ubuntu-13.10-i386.json @@ -112,11 +112,6 @@ } ], "provisioners": [ - { - "destination": "/tmp/shutdown.sh", - "source": "scripts/common/shutdown.sh", - "type": "file" - }, { "environment_vars": [ "CHEF_VERSION={{user `chef_version`}}" diff --git a/packer/ubuntu-14.04-amd64.json b/packer/ubuntu-14.04-amd64.json index 149dfc671..7cde373cc 100644 --- a/packer/ubuntu-14.04-amd64.json +++ b/packer/ubuntu-14.04-amd64.json @@ -85,7 +85,6 @@ "boot_wait": "10s", "disk_size": 40960, "guest_os_type": "ubuntu-64", - "headless": true, "http_directory": "http", "iso_checksum": "4d94f6111b8fe47da94396180ce499d8c0bb44f3", "iso_checksum_type": "sha1", diff --git a/packer/ubuntu-14.04-i386.json b/packer/ubuntu-14.04-i386.json index ec36dcb58..b97948c1d 100644 --- a/packer/ubuntu-14.04-i386.json +++ b/packer/ubuntu-14.04-i386.json @@ -112,11 +112,6 @@ } ], "provisioners": [ - { - "destination": "/tmp/shutdown.sh", - "source": "scripts/common/shutdown.sh", - "type": "file" - }, { "environment_vars": [ "CHEF_VERSION={{user `chef_version`}}" From f744d3bd67905fe1892a8d5172e58471cbb231f6 Mon Sep 17 00:00:00 2001 From: Maks <github.maks3w@virtualplanets.net> Date: Tue, 22 Apr 2014 19:32:44 +0200 Subject: [PATCH 0217/1622] Add links to new ubuntu images --- README.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/README.md b/README.md index bc6d4b2d6..17cc087db 100644 --- a/README.md +++ b/README.md @@ -43,6 +43,8 @@ These baseboxes were all built using a Mac OS X host running VirtualBox 4.3.8, a * [opscode-ubuntu-12.10](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_ubuntu-12.10_chef-provisionerless.box) * [opscode-ubuntu-13.10-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_ubuntu-13.10-i386_chef-provisionerless.box) * [opscode-ubuntu-13.10](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_ubuntu-13.10_chef-provisionerless.box) +* [opscode-ubuntu-14.04-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_ubuntu-14.04-i386_chef-provisionerless.box) +* [opscode-ubuntu-14.04](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_ubuntu-14.04_chef-provisionerless.box) ### VMWare @@ -72,6 +74,8 @@ The boxes should work unchanged in VMWare Workstation for Windows or Linux. * [opscode-ubuntu-12.10](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_ubuntu-12.10_chef-provisionerless.box) * [opscode-ubuntu-13.10-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_ubuntu-13.10-i386_chef-provisionerless.box) * [opscode-ubuntu-13.10](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_ubuntu-13.10_chef-provisionerless.box) +* [opscode-ubuntu-14.04-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_ubuntu-14.04-i386_chef-provisionerless.box) +* [opscode-ubuntu-14.04](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_ubuntu-14.04_chef-provisionerless.box) ## Older Baseboxes From 84fb194cf01e1499652b975582b1d31554680d95 Mon Sep 17 00:00:00 2001 From: "Julian C. Dunn" <jdunn@getchef.com> Date: Thu, 3 Apr 2014 00:14:17 -0400 Subject: [PATCH 0218/1622] Support Red Hat Enterprise Linux 7 Release Candidate. --- packer/http/centos-7.0/ks.cfg | 73 ++++++++++++++++++++++++ packer/rhel-7.0-x86_64.json | 95 ++++++++++++++++++++++++++++++++ packer/scripts/centos/cleanup.sh | 6 +- 3 files changed, 172 insertions(+), 2 deletions(-) create mode 100644 packer/http/centos-7.0/ks.cfg create mode 100644 packer/rhel-7.0-x86_64.json diff --git a/packer/http/centos-7.0/ks.cfg b/packer/http/centos-7.0/ks.cfg new file mode 100644 index 000000000..f69a26f70 --- /dev/null +++ b/packer/http/centos-7.0/ks.cfg @@ -0,0 +1,73 @@ +install +cdrom +lang en_US.UTF-8 +keyboard us +network --bootproto=dhcp +rootpw vagrant +firewall --disabled +selinux --permissive +timezone UTC +unsupported_hardware +bootloader --location=mbr +text +skipx +zerombr +clearpart --all --initlabel +autopart +auth --enableshadow --passalgo=sha512 --kickstart +firstboot --disabled +reboot +user --name=vagrant --plaintext --password vagrant + +%packages --nobase --ignoremissing --excludedocs +# vagrant needs this to copy initial files via scp +openssh-clients +sudo +kernel-headers +kernel-devel +gcc +make +perl +curl +wget +nfs-utils +bzip2 +-fprintd-pam +-intltool + +# unnecessary firmware +-aic94xx-firmware +-atmel-firmware +-b43-openfwwf +-bfa-firmware +-ipw2100-firmware +-ipw2200-firmware +-ivtv-firmware +-iwl100-firmware +-iwl1000-firmware +-iwl3945-firmware +-iwl4965-firmware +-iwl5000-firmware +-iwl5150-firmware +-iwl6000-firmware +-iwl6000g2a-firmware +-iwl6050-firmware +-libertas-usb8388-firmware +-ql2100-firmware +-ql2200-firmware +-ql23xx-firmware +-ql2400-firmware +-ql2500-firmware +-rt61pci-firmware +-rt73usb-firmware +-xorg-x11-drv-ati-firmware +-zd1211-firmware +%end + +%post +# update root certs +wget -O/etc/pki/tls/certs/ca-bundle.crt http://curl.haxx.se/ca/cacert.pem +# sudo +echo "%vagrant ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers.d/vagrant +sed -i "s/^.*requiretty/#Defaults requiretty/" /etc/sudoers +%end diff --git a/packer/rhel-7.0-x86_64.json b/packer/rhel-7.0-x86_64.json new file mode 100644 index 000000000..fc7cba27d --- /dev/null +++ b/packer/rhel-7.0-x86_64.json @@ -0,0 +1,95 @@ +{ + "builders": [ + { + "boot_command": [ + "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/centos-7.0/ks.cfg<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "guest_os_type": "RedHat_64", + "http_directory": "http", + "iso_checksum": "bea5e951342a7ab0233219c3deb3b3acff023ea5dc67a9a4564a97a89364f192", + "iso_checksum_type": "sha256", + "iso_url": "{{user `mirror`}}/rc/7/Server/x86_64/iso/rhel-server-7.0-x86_64-dvd.iso", + "output_directory": "packer-rhel-7.0-x86_64-virtualbox", + "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "virtualbox-iso", + "vboxmanage": [ + [ + "modifyvm", + "{{.Name}}", + "--memory", + "480" + ], + [ + "modifyvm", + "{{.Name}}", + "--cpus", + "1" + ] + ], + "virtualbox_version_file": ".vbox_version", + "vm_name": "packer-centos-7.0-x86_64" + }, + { + "boot_command": [ + "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/rhel-7.0/ks.cfg<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "guest_os_type": "redhat-64", + "http_directory": "http", + "iso_checksum": "bea5e951342a7ab0233219c3deb3b3acff023ea5dc67a9a4564a97a89364f192", + "iso_checksum_type": "sha256", + "iso_url": "{{user `mirror`}}/rc/7/Server/x86_64/iso/rhel-server-7.0-x86_64-dvd.iso", + "output_directory": "packer-rhel-7.0-x86_64-vmware", + "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "tools_upload_flavor": "linux", + "type": "vmware-iso", + "vm_name": "packer-centos-7.0-x86_64", + "vmx_data": { + "cpuid.coresPerSocket": "1", + "memsize": "480", + "numvcpus": "1" + } + } + ], + "post-processors": [ + { + "output": "../builds/{{.Provider}}/opscode_rhel-7.0_chef-{{user `chef_version`}}.box", + "type": "vagrant" + } + ], + "provisioners": [ + { + "environment_vars": [ + "CHEF_VERSION={{user `chef_version`}}" + ], + "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E bash '{{.Path}}'", + "scripts": [ + "scripts/centos/fix-slow-dns.sh", + "scripts/common/sshd.sh", + "scripts/common/vagrant.sh", + "scripts/common/vmtools.sh", + "scripts/common/chef.sh", + "scripts/centos/cleanup.sh", + "scripts/common/minimize.sh" + ], + "type": "shell" + } + ], + "variables": { + "chef_version": "provisionerless", + "mirror": "http://ftp.redhat.com/redhat/rhel" + } +} + diff --git a/packer/scripts/centos/cleanup.sh b/packer/scripts/centos/cleanup.sh index 4dfe958bc..63374115d 100644 --- a/packer/scripts/centos/cleanup.sh +++ b/packer/scripts/centos/cleanup.sh @@ -7,5 +7,7 @@ rm -f /tmp/chef*rpm # clean up redhat interface persistence rm -f /etc/udev/rules.d/70-persistent-net.rules -sed -i 's/^HWADDR.*$//' /etc/sysconfig/network-scripts/ifcfg-eth0 -sed -i 's/^UUID.*$//' /etc/sysconfig/network-scripts/ifcfg-eth0 +if [ -r /etc/sysconfig/network-scripts/ifcfg-eth0 ]; then + sed -i 's/^HWADDR.*$//' /etc/sysconfig/network-scripts/ifcfg-eth0 + sed -i 's/^UUID.*$//' /etc/sysconfig/network-scripts/ifcfg-eth0 +fi From 78bdd8629a074eda006590d13c2a4fab1b2e2b40 Mon Sep 17 00:00:00 2001 From: "Julian C. Dunn" <jdunn@getchef.com> Date: Wed, 23 Apr 2014 20:09:48 -0400 Subject: [PATCH 0219/1622] Fix company name in README --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 17cc087db..60a98852f 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ [travis]: https://travis-ci.org/opscode/bento Bento is a project that encapsulates [Packer](http://packer.io) templates for building -[Vagrant](http://vagrantup.com) baseboxes. We use these boxes internally at Opscode for +[Vagrant](http://vagrantup.com) baseboxes. We use these boxes internally at Chef Software, Inc. for testing Hosted Enterprise Chef, Private Enterprise Chef and our open source [cookbooks](http://community.opscode.com/users/Opscode) via [test-kitchen](http://kitchen.ci/). From b9bf2d8fe11f2014eaf1401a04354b6faa33d41d Mon Sep 17 00:00:00 2001 From: "Julian C. Dunn" <jdunn@getchef.com> Date: Wed, 23 Apr 2014 23:18:13 -0400 Subject: [PATCH 0220/1622] Update to OmniOS r151008t --- ...nios-r151008j.json => omnios-r151008t.json} | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) rename packer/{omnios-r151008j.json => omnios-r151008t.json} (89%) diff --git a/packer/omnios-r151008j.json b/packer/omnios-r151008t.json similarity index 89% rename from packer/omnios-r151008j.json rename to packer/omnios-r151008t.json index dc06d6ab8..b49ae5900 100644 --- a/packer/omnios-r151008j.json +++ b/packer/omnios-r151008t.json @@ -33,10 +33,10 @@ "boot_wait": "30s", "disk_size": 40960, "guest_os_type": "OpenSolaris_64", - "iso_checksum": "9929337d9c9f9e33862f19f41c2777225fa14a03", + "iso_checksum": "a20aefc31640732087ea235dd027ab23b39c2ea1", "iso_checksum_type": "sha1", - "iso_url": "{{user `mirror`}}/OmniOS_Text_r151008j.iso", - "output_directory": "packer-omnios-r151008j-virtualbox", + "iso_url": "{{user `mirror`}}/OmniOS_Text_r151008t.iso", + "output_directory": "packer-omnios-r151008t-virtualbox", "shutdown_command": "/usr/sbin/shutdown -g 0 -y -i 5", "ssh_password": "vagrant", "ssh_port": 22, @@ -57,7 +57,7 @@ ] ], "virtualbox_version_file": ".vbox_version", - "vm_name": "packer-omnios-r151008j" + "vm_name": "packer-omnios-r151008t" }, { "boot_command": [ @@ -97,17 +97,17 @@ "floppy/omnios/README.TXT" ], "guest_os_type": "solaris11-64", - "iso_checksum": "9929337d9c9f9e33862f19f41c2777225fa14a03", + "iso_checksum": "a20aefc31640732087ea235dd027ab23b39c2ea1", "iso_checksum_type": "sha1", - "iso_url": "{{user `mirror`}}/OmniOS_Text_r151008j.iso", - "output_directory": "packer-omnios-r151008j-vmware", + "iso_url": "{{user `mirror`}}/OmniOS_Text_r151008t.iso", + "output_directory": "packer-omnios-r151008t-vmware", "shutdown_command": "/usr/sbin/shutdown -g 0 -y -i 5", "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "root", "tools_upload_flavor": "solaris", "type": "vmware-iso", - "vm_name": "packer-omnios-r151008j", + "vm_name": "packer-omnios-r151008t", "vmx_data": { "cpuid.coresPerSocket": "1", "memsize": "1024", @@ -118,7 +118,7 @@ "post-processors": [ { "compression_level": 9, - "output": "../builds/{{.Provider}}/opscode_omnios-r151008j_chef-{{user `chef_version`}}.box", + "output": "../builds/{{.Provider}}/opscode_omnios-r151008t_chef-{{user `chef_version`}}.box", "type": "vagrant" } ], From 1ff341d655f68fc2a461c238d5fab00d07c37c97 Mon Sep 17 00:00:00 2001 From: Teemu Matilainen <teemu.matilainen@iki.fi> Date: Tue, 29 Apr 2014 11:11:49 +0300 Subject: [PATCH 0221/1622] Update Debian Wheezy to 7.5 --- ...an-7.4-amd64.json => debian-7.5-amd64.json} | 18 +++++++++--------- ...bian-7.4-i386.json => debian-7.5-i386.json} | 18 +++++++++--------- 2 files changed, 18 insertions(+), 18 deletions(-) rename packer/{debian-7.4-amd64.json => debian-7.5-amd64.json} (85%) rename packer/{debian-7.4-i386.json => debian-7.5-i386.json} (86%) diff --git a/packer/debian-7.4-amd64.json b/packer/debian-7.5-amd64.json similarity index 85% rename from packer/debian-7.4-amd64.json rename to packer/debian-7.5-amd64.json index 5fce3b87c..a6e0c0182 100644 --- a/packer/debian-7.4-amd64.json +++ b/packer/debian-7.5-amd64.json @@ -27,9 +27,9 @@ "disk_size": 40960, "guest_os_type": "Debian_64", "http_directory": "http", - "iso_checksum": "d68c40dfdca601f912c0f1ae991cdb439d1c572e", + "iso_checksum": "200948e5885da3b67730293a1426845f90239c62", "iso_checksum_type": "sha1", - "iso_url": "{{user `mirror`}}/7.4.0/amd64/iso-cd/debian-7.4.0-amd64-CD-1.iso", + "iso_url": "{{user `mirror`}}/7.5.0/amd64/iso-cd/debian-7.5.0-amd64-CD-1.iso", "ssh_username": "vagrant", "ssh_password": "vagrant", "ssh_port": 22, @@ -37,8 +37,8 @@ "shutdown_command": "echo 'vagrant'|sudo -S /sbin/shutdown -hP now", "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "virtualbox_version_file": ".vbox_version", - "vm_name": "packer-debian-7.4-amd64", - "output_directory": "packer-debian-7.4-amd64-virtualbox", + "vm_name": "packer-debian-7.5-amd64", + "output_directory": "packer-debian-7.5-amd64-virtualbox", "vboxmanage": [ [ "modifyvm", "{{.Name}}", "--memory", "384" ], [ "modifyvm", "{{.Name}}", "--cpus", "1" ] @@ -67,17 +67,17 @@ "disk_size": 40960, "guest_os_type": "debian5-64", "http_directory": "http", - "iso_checksum": "d68c40dfdca601f912c0f1ae991cdb439d1c572e", + "iso_checksum": "200948e5885da3b67730293a1426845f90239c62", "iso_checksum_type": "sha1", - "iso_url": "{{user `mirror`}}/7.4.0/amd64/iso-cd/debian-7.4.0-amd64-CD-1.iso", + "iso_url": "{{user `mirror`}}/7.5.0/amd64/iso-cd/debian-7.5.0-amd64-CD-1.iso", "ssh_username": "vagrant", "ssh_password": "vagrant", "ssh_port": 22, "ssh_wait_timeout": "10000s", "shutdown_command": "echo 'vagrant'|sudo -S /sbin/shutdown -hP now", "tools_upload_flavor": "linux", - "vm_name": "packer-debian-7.4-amd64", - "output_directory": "packer-debian-7.4-amd64-vmware", + "vm_name": "packer-debian-7.5-amd64", + "output_directory": "packer-debian-7.5-amd64-vmware", "vmx_data": { "memsize": "384", "numvcpus": "1", @@ -88,7 +88,7 @@ "post-processors": [ { "type": "vagrant", - "output": "../builds/{{.Provider}}/opscode_debian-7.4_chef-{{user `chef_version`}}.box" + "output": "../builds/{{.Provider}}/opscode_debian-7.5_chef-{{user `chef_version`}}.box" } ], "provisioners": [ diff --git a/packer/debian-7.4-i386.json b/packer/debian-7.5-i386.json similarity index 86% rename from packer/debian-7.4-i386.json rename to packer/debian-7.5-i386.json index 7e80b00e5..9e29f8c00 100644 --- a/packer/debian-7.4-i386.json +++ b/packer/debian-7.5-i386.json @@ -27,9 +27,9 @@ "disk_size": 40960, "guest_os_type": "Debian", "http_directory": "http", - "iso_checksum": "b6daf1584bf9e7748ebd160b09745984c244c3bb", + "iso_checksum": "24e8e0ac74a12848e2601f3bb1821c52fc9049c5", "iso_checksum_type": "sha1", - "iso_url": "{{user `mirror`}}/7.4.0/i386/iso-cd/debian-7.4.0-i386-CD-1.iso", + "iso_url": "{{user `mirror`}}/7.5.0/i386/iso-cd/debian-7.5.0-i386-CD-1.iso", "ssh_username": "vagrant", "ssh_password": "vagrant", "ssh_port": 22, @@ -37,8 +37,8 @@ "shutdown_command": "echo 'vagrant'|sudo -S /sbin/shutdown -hP now", "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "virtualbox_version_file": ".vbox_version", - "vm_name": "packer-debian-7.4-i386", - "output_directory": "packer-debian-7.4-i386-virtualbox", + "vm_name": "packer-debian-7.5-i386", + "output_directory": "packer-debian-7.5-i386-virtualbox", "vboxmanage": [ [ "modifyvm", "{{.Name}}", "--memory", "384" ], [ "modifyvm", "{{.Name}}", "--cpus", "1" ] @@ -67,17 +67,17 @@ "disk_size": 40960, "guest_os_type": "debian5", "http_directory": "http", - "iso_checksum": "b6daf1584bf9e7748ebd160b09745984c244c3bb", + "iso_checksum": "24e8e0ac74a12848e2601f3bb1821c52fc9049c5", "iso_checksum_type": "sha1", - "iso_url": "{{user `mirror`}}/7.4.0/i386/iso-cd/debian-7.4.0-i386-CD-1.iso", + "iso_url": "{{user `mirror`}}/7.5.0/i386/iso-cd/debian-7.5.0-i386-CD-1.iso", "ssh_username": "vagrant", "ssh_password": "vagrant", "ssh_port": 22, "ssh_wait_timeout": "10000s", "shutdown_command": "echo 'vagrant'|sudo -S /sbin/shutdown -hP now", "tools_upload_flavor": "linux", - "vm_name": "packer-debian-7.4-i386", - "output_directory": "packer-debian-7.4-i386-vmware", + "vm_name": "packer-debian-7.5-i386", + "output_directory": "packer-debian-7.5-i386-vmware", "vmx_data": { "memsize": "384", "numvcpus": "1", @@ -88,7 +88,7 @@ "post-processors": [ { "type": "vagrant", - "output": "../builds/{{.Provider}}/opscode_debian-7.4-i386_chef-{{user `chef_version`}}.box" + "output": "../builds/{{.Provider}}/opscode_debian-7.5-i386_chef-{{user `chef_version`}}.box" } ], "provisioners": [ From ecbd6657faa3752cb33eaaf6780604b3ec7c3a58 Mon Sep 17 00:00:00 2001 From: Brian Dwyer <bdwyer@ieee.org> Date: Tue, 29 Apr 2014 19:01:44 -0400 Subject: [PATCH 0222/1622] Dependency Fix VMware Tools seems to be dependent upon ifconfig being present. package 'net-tools' provides ifconfig, as well as others. https://admin.fedoraproject.org/pkgdb/acls/name/net-tools --- packer/http/fedora-20/ks.cfg | 1 + 1 file changed, 1 insertion(+) diff --git a/packer/http/fedora-20/ks.cfg b/packer/http/fedora-20/ks.cfg index 23be39dc6..4e3db2946 100644 --- a/packer/http/fedora-20/ks.cfg +++ b/packer/http/fedora-20/ks.cfg @@ -32,6 +32,7 @@ kernel-headers tar wget nfs-utils +net-tools -linux-firmware -plymouth -plymouth-core-libs From 2e4a870f32f63bff8639b92c30d5cc06b299c67d Mon Sep 17 00:00:00 2001 From: "Julian C. Dunn" <jdunn@aquezada.com> Date: Wed, 30 Apr 2014 00:52:02 -0400 Subject: [PATCH 0223/1622] Update to Packer 0.5.2 --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 742e87797..35c51b3c1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,7 @@ rvm: - 2.0.0 -before_install: wget --no-check-certificate https://dl.bintray.com/mitchellh/packer/0.5.1_linux_amd64.zip && unzip -d packer 0.5.1_linux_amd64.zip +before_install: wget --no-check-certificate https://dl.bintray.com/mitchellh/packer/0.5.2_linux_amd64.zip && unzip -d packer 0.5.2_linux_amd64.zip before_script: export PATH=$PATH:$PWD/packer script: bundle exec thor packer:validate From f1937dbc09c2c2a72e3bf15adfb70b7b8c21f0cd Mon Sep 17 00:00:00 2001 From: "Julian C. Dunn" <jdunn@aquezada.com> Date: Wed, 30 Apr 2014 00:52:23 -0400 Subject: [PATCH 0224/1622] Remove ancient "hidden" files --- definitions/.centos/cleanup.sh | 5 ---- definitions/.centos/ks.cfg | 39 ------------------------ definitions/.centos/session.rb | 12 -------- definitions/.debian/cleanup.sh | 6 ---- definitions/.debian/networking.sh | 7 ----- definitions/.debian/preseed.cfg | 47 ----------------------------- definitions/.debian/session.rb | 31 ------------------- definitions/.debian/sudoers.sh | 4 --- definitions/.debian/update.sh | 4 --- definitions/.fedora/cleanup.sh | 4 --- definitions/.fedora/ks.cfg | 50 ------------------------------- definitions/.fedora/session.rb | 13 -------- definitions/.suse/session.rb | 19 ------------ definitions/.suse/sudoers.sh | 3 -- definitions/.ubuntu/cleanup.sh | 6 ---- definitions/.ubuntu/networking.sh | 7 ----- definitions/.ubuntu/preseed.cfg | 31 ------------------- definitions/.ubuntu/session.rb | 38 ----------------------- definitions/.ubuntu/sudoers.sh | 4 --- definitions/.ubuntu/update.sh | 15 ---------- 20 files changed, 345 deletions(-) delete mode 100644 definitions/.centos/cleanup.sh delete mode 100644 definitions/.centos/ks.cfg delete mode 100644 definitions/.centos/session.rb delete mode 100644 definitions/.debian/cleanup.sh delete mode 100644 definitions/.debian/networking.sh delete mode 100644 definitions/.debian/preseed.cfg delete mode 100644 definitions/.debian/session.rb delete mode 100644 definitions/.debian/sudoers.sh delete mode 100644 definitions/.debian/update.sh delete mode 100644 definitions/.fedora/cleanup.sh delete mode 100644 definitions/.fedora/ks.cfg delete mode 100644 definitions/.fedora/session.rb delete mode 100644 definitions/.suse/session.rb delete mode 100644 definitions/.suse/sudoers.sh delete mode 100644 definitions/.ubuntu/cleanup.sh delete mode 100644 definitions/.ubuntu/networking.sh delete mode 100644 definitions/.ubuntu/preseed.cfg delete mode 100644 definitions/.ubuntu/session.rb delete mode 100644 definitions/.ubuntu/sudoers.sh delete mode 100644 definitions/.ubuntu/update.sh diff --git a/definitions/.centos/cleanup.sh b/definitions/.centos/cleanup.sh deleted file mode 100644 index 19e473a9f..000000000 --- a/definitions/.centos/cleanup.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/bash -eux -yum -y erase gtk2 libX11 hicolor-icon-theme avahi freetype bitstream-vera-fonts kudzu -yum -y clean all -rm -rf VBoxGuestAdditions_*.iso VBoxGuestAdditions_*.iso.? -rm -f /tmp/chef*rpm diff --git a/definitions/.centos/ks.cfg b/definitions/.centos/ks.cfg deleted file mode 100644 index 3f71306d4..000000000 --- a/definitions/.centos/ks.cfg +++ /dev/null @@ -1,39 +0,0 @@ -install -cdrom -lang en_US.UTF-8 -keyboard us -network --bootproto=dhcp -rootpw --iscrypted $1$damlkd,f$UC/u5pUts5QiU3ow.CSso/ -firewall --disabled -authconfig --enableshadow --passalgo=sha512 -selinux --permissive -timezone UTC -bootloader --location=mbr -text -skipx -zerombr -clearpart --all --initlabel -autopart -auth --useshadow --enablemd5 -firstboot --disabled -reboot - -%packages --ignoremissing -@Base -@Core -@Development Tools -openssl-devel -readline-devel -zlib-devel -kernel-devel - -%post -# update root certs -wget -O/etc/pki/tls/certs/ca-bundle.crt http://curl.haxx.se/ca/cacert.pem -# vagrant -groupadd vagrant -g 999 -useradd vagrant -g vagrant -G wheel -u 900 -echo "vagrant" | passwd --stdin vagrant -# sudo -echo "vagrant ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers -sed -i "s/^.*requiretty/#Defaults requiretty/" /etc/sudoers diff --git a/definitions/.centos/session.rb b/definitions/.centos/session.rb deleted file mode 100644 index 431e1eaf2..000000000 --- a/definitions/.centos/session.rb +++ /dev/null @@ -1,12 +0,0 @@ -require File.dirname(__FILE__) + "/../.common/session.rb" - -CENTOS_SESSION = - COMMON_SESSION.merge({ :boot_cmd_sequence => - [ 'linux text ks=http://%IP%:%PORT%/ks.cfg<Enter>' ], - :kickstart_file => "ks.cfg", - :os_type_id => 'Centos_64', - :postinstall_files => [ "vagrant.sh", - "sshd.sh", - "cleanup.sh", - "minimize.sh" ], - :shutdown_cmd => "/sbin/halt -h -p" }) diff --git a/definitions/.debian/cleanup.sh b/definitions/.debian/cleanup.sh deleted file mode 100644 index 6c7f703d6..000000000 --- a/definitions/.debian/cleanup.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/bash -eux - -apt-get -y autoremove -apt-get -y clean -rm -rf VBoxGuestAdditions_*.iso VBoxGuestAdditions_*.iso.? -rm -f /tmp/chef*deb diff --git a/definitions/.debian/networking.sh b/definitions/.debian/networking.sh deleted file mode 100644 index de3269a58..000000000 --- a/definitions/.debian/networking.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/bash -eux - -rm /etc/udev/rules.d/70-persistent-net.rules -mkdir /etc/udev/rules.d/70-persistent-net.rules -rm /lib/udev/rules.d/75-persistent-net-generator.rules -rm -rf /dev/.udev/ /var/lib/dhcp3/* -echo "pre-up sleep 2" >> /etc/network/interfaces diff --git a/definitions/.debian/preseed.cfg b/definitions/.debian/preseed.cfg deleted file mode 100644 index 820f090c5..000000000 --- a/definitions/.debian/preseed.cfg +++ /dev/null @@ -1,47 +0,0 @@ -choose-mirror-bin mirror/http/proxy string -d-i apt-setup/use_mirror boolean true -d-i base-installer/kernel/override-image string linux-server -d-i clock-setup/utc boolean true -d-i clock-setup/utc-auto boolean true -d-i finish-install/reboot_in_progress note -d-i grub-installer/only_debian boolean true -d-i grub-installer/with_other_os boolean true -d-i keymap select us -d-i mirror/country string manual -d-i mirror/http/directory string /debian -d-i mirror/http/hostname string mirrors.kernel.org -d-i mirror/http/proxy string -d-i partman-auto-lvm/guided_size string max -d-i partman-auto/choose_recipe select atomic -d-i partman-auto/method string lvm -d-i partman-lvm/confirm boolean true -d-i partman-lvm/confirm boolean true -d-i partman-lvm/confirm_nooverwrite boolean true -d-i partman-lvm/device_remove_lvm boolean true -d-i partman/choose_partition select finish -d-i partman/confirm boolean true -d-i partman/confirm_nooverwrite boolean true -d-i partman/confirm_write_new_label boolean true -d-i passwd/root-login boolean false -d-i passwd/root-password-again password vagrant -d-i passwd/root-password password vagrant -d-i passwd/user-fullname string vagrant -d-i passwd/user-uid string 900 -d-i passwd/user-password password vagrant -d-i passwd/user-password-again password vagrant -d-i passwd/username string vagrant -d-i pkgsel/include string openssh-server sudo bzip2 acpid cryptsetup zlib1g-dev wget curl dkms make -d-i pkgsel/install-language-support boolean false -d-i pkgsel/update-policy select unattended-upgrades -d-i pkgsel/upgrade select full-upgrade -# Prevent packaged version of VirtualBox Guest Additions being installed: -d-i preseed/early_command string sed -i \ - '/in-target/idiscover(){/sbin/discover|grep -v VirtualBox;}' \ - /usr/lib/pre-pkgsel.d/20install-hwpackages -d-i time/zone string UTC -d-i user-setup/allow-password-weak boolean true -d-i user-setup/encrypt-home boolean false -apt-cdrom-setup apt-setup/cdrom/set-first boolean false -apt-mirror-setup apt-setup/use_mirror boolean true -popularity-contest popularity-contest/participate boolean false -tasksel tasksel/first multiselect standard, ubuntu-server diff --git a/definitions/.debian/session.rb b/definitions/.debian/session.rb deleted file mode 100644 index 3ea5ac0e7..000000000 --- a/definitions/.debian/session.rb +++ /dev/null @@ -1,31 +0,0 @@ -require File.dirname(__FILE__) + "/../.common/session.rb" - -DEBIAN_SESSION = - COMMON_SESSION.merge({ :boot_cmd_sequence => - [ - '<Esc>', - 'install ', - 'preseed/url=http://%IP%:%PORT%/preseed.cfg ', - 'debian-installer=en_US ', - 'auto ', - 'locale=en_US ', - 'kbd-chooser/method=us ', - 'keyboard-configuration/xkb-keymap=us ', - 'netcfg/get_hostname=%NAME% ', - 'netcfg/get_domain=vagrantup.com ', - 'fb=false ', - 'debconf/frontend=noninteractive ', - 'console-setup/ask_detect=false ', - 'console-keymaps-at/keymap=us ', - '<Enter>' - ], - :os_type_id => 'Debian_64', - :postinstall_files => [ "update.sh", - "vagrant.sh", - "sshd.sh", - "networking.sh", - "sudoers.sh", - "cleanup.sh", - "minimize.sh" ], - :kickstart_file => "preseed.cfg", - :shutdown_cmd => "/sbin/shutdown -h -P now" }) diff --git a/definitions/.debian/sudoers.sh b/definitions/.debian/sudoers.sh deleted file mode 100644 index 36862e097..000000000 --- a/definitions/.debian/sudoers.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash -eux - -sed -i -e '/Defaults\s\+env_reset/a Defaults\tsecure_path="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"' /etc/sudoers -sed -i -e 's/%sudo\tALL=(ALL:ALL) ALL/%sudo\tALL=(ALL:ALL) NOPASSWD: ALL/' /etc/sudoers diff --git a/definitions/.debian/update.sh b/definitions/.debian/update.sh deleted file mode 100644 index a4cc91499..000000000 --- a/definitions/.debian/update.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash -eux - -apt-get update -apt-get -y upgrade diff --git a/definitions/.fedora/cleanup.sh b/definitions/.fedora/cleanup.sh deleted file mode 100644 index a4d82c900..000000000 --- a/definitions/.fedora/cleanup.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash -eux -yum -y erase gtk2 libX11 hicolor-icon-theme freetype -yum -y clean all -rm -f /tmp/chef*rpm diff --git a/definitions/.fedora/ks.cfg b/definitions/.fedora/ks.cfg deleted file mode 100644 index c89695e03..000000000 --- a/definitions/.fedora/ks.cfg +++ /dev/null @@ -1,50 +0,0 @@ -install -cdrom -lang en_US.UTF-8 -keyboard us -network --bootproto=dhcp -rootpw --iscrypted $1$damlkd,f$UC/u5pUts5QiU3ow.CSso/ -firewall --disabled -authconfig --enableshadow --passalgo=sha512 -selinux --disabled -timezone UTC -bootloader --location=mbr -text -skipx -zerombr -clearpart --all --initlabel -part /boot --fstype=ext4 --size=500 -part pv.2 --grow --size=500 -volgroup vg_vagrant --pesize=32768 pv.2 -logvol / --fstype=ext4 --name=lv_root --vgname=vg_vagrant --size=1024 --grow -logvol swap --fstype=swap --name=lv_swap --vgname=vg_vagrant --size=528 --grow --maxsize=1056 -bootloader --location=mbr --append="norhgb biosdevname=0" -auth --useshadow --enablemd5 -firstboot --disabled -reboot - -%packages -@Core -bzip2 -gcc -kernel-devel -kernel-headers -openssl-devel -readline-devel -tar -wget -zlib-devel -%end - -%post -# update root certs -wget -O/etc/pki/tls/certs/ca-bundle.crt http://curl.haxx.se/ca/cacert.pem -# vagrant -groupadd vagrant -useradd vagrant -g vagrant -G wheel -u 900 -echo "vagrant" | passwd --stdin vagrant -# sudo -echo 'Defaults:vagrant !requiretty' > /etc/sudoers.d/vagrant -echo '%vagrant ALL=(ALL) NOPASSWD: ALL' >> /etc/sudoers.d/vagrant -chmod 440 /etc/sudoers.d/vagrant -%end diff --git a/definitions/.fedora/session.rb b/definitions/.fedora/session.rb deleted file mode 100644 index 8fae74a1e..000000000 --- a/definitions/.fedora/session.rb +++ /dev/null @@ -1,13 +0,0 @@ -require File.dirname(__FILE__) + "/../.common/session.rb" - -FEDORA_SESSION = - COMMON_SESSION.merge({ :boot_cmd_sequence => - [ '<Tab> text ks=http://%IP%:%PORT%/ks.cfg<Enter>' ], - :kickstart_file => "ks.cfg", - :os_type_id => 'Fedora_64', - :memory_size=> "512", - :postinstall_files => [ "vagrant.sh", - "sshd.sh", - "cleanup.sh", - "minimize.sh" ], - :shutdown_cmd => "/sbin/halt -h -p" }) diff --git a/definitions/.suse/session.rb b/definitions/.suse/session.rb deleted file mode 100644 index c1b3e1762..000000000 --- a/definitions/.suse/session.rb +++ /dev/null @@ -1,19 +0,0 @@ -require File.dirname(__FILE__) + "/../.common/session.rb" - -SUSE_SESSION = - COMMON_SESSION.merge({ :boot_cmd_sequence => [ - '<Esc><Enter>', - 'linux netdevice=eth0 netsetup=dhcp install=cd:/', - ' lang=en_US autoyast=http://%IP%:%PORT%/autoinst.xml', - ' textmode=1', - '<Enter>' - ], - # in here twice for a reason - YaST2 requests it twice - :kickstart_file => ["autoinst.xml", "autoinst.xml"], - :os_type_id => 'OpenSUSE_64', - :postinstall_files => [ "vagrant.sh", - "sshd.sh", - "sudoers.sh", - "cleanup.sh", - "minimize.sh" ], - :shutdown_cmd => "/sbin/halt -h -p" }) diff --git a/definitions/.suse/sudoers.sh b/definitions/.suse/sudoers.sh deleted file mode 100644 index eb80f3f88..000000000 --- a/definitions/.suse/sudoers.sh +++ /dev/null @@ -1,3 +0,0 @@ -# update sudoers - can't do this in autoinst.xml -echo -e "\nupdate sudoers ..." -echo -e "vagrant ALL=(ALL) NOPASSWD: ALL\n" >> /etc/sudoers diff --git a/definitions/.ubuntu/cleanup.sh b/definitions/.ubuntu/cleanup.sh deleted file mode 100644 index 6c7f703d6..000000000 --- a/definitions/.ubuntu/cleanup.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/bash -eux - -apt-get -y autoremove -apt-get -y clean -rm -rf VBoxGuestAdditions_*.iso VBoxGuestAdditions_*.iso.? -rm -f /tmp/chef*deb diff --git a/definitions/.ubuntu/networking.sh b/definitions/.ubuntu/networking.sh deleted file mode 100644 index de3269a58..000000000 --- a/definitions/.ubuntu/networking.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/bash -eux - -rm /etc/udev/rules.d/70-persistent-net.rules -mkdir /etc/udev/rules.d/70-persistent-net.rules -rm /lib/udev/rules.d/75-persistent-net-generator.rules -rm -rf /dev/.udev/ /var/lib/dhcp3/* -echo "pre-up sleep 2" >> /etc/network/interfaces diff --git a/definitions/.ubuntu/preseed.cfg b/definitions/.ubuntu/preseed.cfg deleted file mode 100644 index 903f2e14b..000000000 --- a/definitions/.ubuntu/preseed.cfg +++ /dev/null @@ -1,31 +0,0 @@ -choose-mirror-bin mirror/http/proxy string -d-i base-installer/kernel/override-image string linux-server -d-i clock-setup/utc boolean true -d-i clock-setup/utc-auto boolean true -d-i finish-install/reboot_in_progress note -d-i grub-installer/only_debian boolean true -d-i grub-installer/with_other_os boolean true -d-i partman-auto-lvm/guided_size string max -d-i partman-auto/choose_recipe select atomic -d-i partman-auto/method string lvm -d-i partman-lvm/confirm boolean true -d-i partman-lvm/confirm boolean true -d-i partman-lvm/confirm_nooverwrite boolean true -d-i partman-lvm/device_remove_lvm boolean true -d-i partman/choose_partition select finish -d-i partman/confirm boolean true -d-i partman/confirm_nooverwrite boolean true -d-i partman/confirm_write_new_label boolean true -d-i passwd/user-fullname string vagrant -d-i passwd/user-uid string 900 -d-i passwd/user-password password vagrant -d-i passwd/user-password-again password vagrant -d-i passwd/username string vagrant -d-i pkgsel/include string openssh-server cryptsetup build-essential libssl-dev libreadline-dev zlib1g-dev linux-source dkms -d-i pkgsel/install-language-support boolean false -d-i pkgsel/update-policy select unattended-upgrades -d-i pkgsel/upgrade select full-upgrade -d-i time/zone string UTC -d-i user-setup/allow-password-weak boolean true -d-i user-setup/encrypt-home boolean false -tasksel tasksel/first multiselect standard, ubuntu-server diff --git a/definitions/.ubuntu/session.rb b/definitions/.ubuntu/session.rb deleted file mode 100644 index ddf0e3fe0..000000000 --- a/definitions/.ubuntu/session.rb +++ /dev/null @@ -1,38 +0,0 @@ -require File.dirname(__FILE__) + "/../.common/session.rb" - -UBUNTU_SESSION = - COMMON_SESSION.merge({ :boot_cmd_sequence => - [ - "<Esc>", - "<Esc>", - "<Enter>", - "/install/vmlinuz" , - " auto", - " console-setup/ask_detect=false", - " console-setup/layoutcode=us", - " console-setup/modelcode=pc105", - " debconf/frontend=noninteractive", - " debian-installer=en_US", - " fb=false", - " initrd=/install/initrd.gz", - " kbd-chooser/method=us", - " keyboard-configuration/layout=USA", - " keyboard-configuration/variant=USA", - " locale=en_US", - " netcfg/get_domain=vm", - " netcfg/get_hostname=vagrant", - " noapic" , - " preseed/url=http://%IP%:%PORT%/preseed.cfg", - " -- ", - "<Enter>" - ], - :os_type_id => 'Ubuntu_64', - :postinstall_files => [ "update.sh", - "vagrant.sh", - "sshd.sh", - "networking.sh", - "sudoers.sh", - "cleanup.sh", - "minimize.sh" ], - :kickstart_file => "preseed.cfg", - :shutdown_cmd => "shutdown -P now" }) diff --git a/definitions/.ubuntu/sudoers.sh b/definitions/.ubuntu/sudoers.sh deleted file mode 100644 index ce45b7611..000000000 --- a/definitions/.ubuntu/sudoers.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash -eux - -sed -i -e '/Defaults\s\+env_reset/a Defaults\texempt_group=admin' /etc/sudoers -sed -i -e 's/%admin ALL=(ALL) ALL/%admin ALL=NOPASSWD:ALL/g' /etc/sudoers diff --git a/definitions/.ubuntu/update.sh b/definitions/.ubuntu/update.sh deleted file mode 100644 index 80e8dd3f9..000000000 --- a/definitions/.ubuntu/update.sh +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/bash -eux - -apt-get update -apt-get -y upgrade - -# ensure the correct kernel headers are installed -apt-get -y install linux-headers-$(uname -r) - -# update package index on boot -cat <<EOF > /etc/init/refresh-apt.conf -description "update package index" -start on networking -task -exec /usr/bin/apt-get update -EOF From fd837290541dea79f58eae4c0489c371f9bdfaff Mon Sep 17 00:00:00 2001 From: Seth Vargo <sethvargo@gmail.com> Date: Wed, 30 Apr 2014 13:17:50 -0400 Subject: [PATCH 0225/1622] Bring under the Release Engineering umbrella --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 60a98852f..d554ad52f 100644 --- a/README.md +++ b/README.md @@ -9,6 +9,8 @@ Bento is a project that encapsulates [Packer](http://packer.io) templates for bu testing Hosted Enterprise Chef, Private Enterprise Chef and our open source [cookbooks](http://community.opscode.com/users/Opscode) via [test-kitchen](http://kitchen.ci/). +This project is managed by the CHEF Release Engineering team. For more information on the Release Engineering team's contribution, triage, and release process, please consult the [CHEF Release Engineering OSS Management Guide](https://docs.google.com/a/opscode.com/document/d/1oJB0vZb_3bl7_ZU2YMDBkMFdL-EWplW1BJv_FXTUOzg/edit). + ## Current Baseboxes The following baseboxes are publicly available and were built using From ad1f5a4b54df4cee42ed305f59131cb611563c89 Mon Sep 17 00:00:00 2001 From: Rickard von Essen <rickard.von.essen@gmail.com> Date: Sat, 10 May 2014 22:28:07 +0200 Subject: [PATCH 0226/1622] Corrected some copy paste errors in SLES configuration. - Corrected vm_name and output_dir regarding version and architecture. - Made the syntax for vm_name uniform between VirtualBox and VMWare. --- packer/sles-11-sp2-i386.json | 8 ++++---- packer/sles-11-sp2-x86_64.json | 4 ++-- packer/sles-11-sp3-i386.json | 8 ++++---- packer/sles-11-sp3-x86_64.json | 4 ++-- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/packer/sles-11-sp2-i386.json b/packer/sles-11-sp2-i386.json index 3d9bec122..90f5b721c 100644 --- a/packer/sles-11-sp2-i386.json +++ b/packer/sles-11-sp2-i386.json @@ -16,7 +16,7 @@ "iso_checksum": "a0b34f6237b2b2a6b2174c82b40ed326", "iso_checksum_type": "md5", "iso_url": "{{user `mirror`}}/SLES-11-SP2-DVD-i586-GM-DVD1.iso", - "output_directory": "packer-sles-11-sp2-x86_64-virtualbox", + "output_directory": "packer-sles-11-sp2-i386-virtualbox", "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, @@ -38,7 +38,7 @@ ] ], "virtualbox_version_file": ".vbox_version", - "vm_name": "packer-sles-11-sp2-x86_64" + "vm_name": "packer-sles-11-sp2-i386" }, { "boot_command": [ @@ -55,7 +55,7 @@ "iso_checksum": "a0b34f6237b2b2a6b2174c82b40ed326", "iso_checksum_type": "md5", "iso_url": "{{user `mirror`}}/SLES-11-SP2-DVD-i586-GM-DVD1.iso", - "output_directory": "packer-sles11sp2-x86_64-vmware", + "output_directory": "packer-sles-11-sp2-i386-vmware", "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, @@ -63,7 +63,7 @@ "ssh_wait_timeout": "10000s", "tools_upload_flavor": "linux", "type": "vmware-iso", - "vm_name": "packer-sles11sp2-x86_64", + "vm_name": "packer-sles-11-sp2-i386", "vmx_data": { "cpuid.coresPerSocket": "1", "memsize": "480", diff --git a/packer/sles-11-sp2-x86_64.json b/packer/sles-11-sp2-x86_64.json index 0f4fa8c1e..456ffc766 100644 --- a/packer/sles-11-sp2-x86_64.json +++ b/packer/sles-11-sp2-x86_64.json @@ -55,7 +55,7 @@ "iso_checksum": "461d82ae6e15062b0807c1338f040497", "iso_checksum_type": "md5", "iso_url": "{{user `mirror`}}/SLES-11-SP2-DVD-x86_64-GM-DVD1.iso", - "output_directory": "packer-sles11sp2-x86_64-vmware", + "output_directory": "packer-sles-11-sp2-x86_64-vmware", "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, @@ -63,7 +63,7 @@ "ssh_wait_timeout": "10000s", "tools_upload_flavor": "linux", "type": "vmware-iso", - "vm_name": "packer-sles11sp2-x86_64", + "vm_name": "packer-sles-11-sp2-x86_64", "vmx_data": { "cpuid.coresPerSocket": "1", "memsize": "480", diff --git a/packer/sles-11-sp3-i386.json b/packer/sles-11-sp3-i386.json index 66f447bd2..6b8d409f7 100644 --- a/packer/sles-11-sp3-i386.json +++ b/packer/sles-11-sp3-i386.json @@ -16,7 +16,7 @@ "iso_checksum": "5c30a409fc8fb3343b4dc90d93ff2c89", "iso_checksum_type": "md5", "iso_url": "{{user `mirror`}}/SLES-11-SP3-DVD-i586-GM-DVD1.iso", - "output_directory": "packer-sles-11-sp3-x86_64-virtualbox", + "output_directory": "packer-sles-11-sp3-i386-virtualbox", "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, @@ -38,7 +38,7 @@ ] ], "virtualbox_version_file": ".vbox_version", - "vm_name": "packer-sles-11-sp3-x86_64" + "vm_name": "packer-sles-11-sp3-i386" }, { "boot_command": [ @@ -55,7 +55,7 @@ "iso_checksum": "5c30a409fc8fb3343b4dc90d93ff2c89", "iso_checksum_type": "md5", "iso_url": "{{user `mirror`}}/SLES-11-SP3-DVD-i586-GM-DVD1.iso", - "output_directory": "packer-sles11sp2-x86_64-vmware", + "output_directory": "packer-sles-11-sp3-i386-vmware", "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, @@ -63,7 +63,7 @@ "ssh_wait_timeout": "10000s", "tools_upload_flavor": "linux", "type": "vmware-iso", - "vm_name": "packer-sles11sp2-x86_64", + "vm_name": "packer-sles-11-sp3-i386", "vmx_data": { "cpuid.coresPerSocket": "1", "memsize": "480", diff --git a/packer/sles-11-sp3-x86_64.json b/packer/sles-11-sp3-x86_64.json index 0f2b8c8f2..734c88fc7 100644 --- a/packer/sles-11-sp3-x86_64.json +++ b/packer/sles-11-sp3-x86_64.json @@ -55,7 +55,7 @@ "iso_checksum": "480b70d50cbb538382dc2b9325221e1b", "iso_checksum_type": "md5", "iso_url": "{{user `mirror`}}/SLES-11-SP3-DVD-x86_64-GM-DVD1.iso", - "output_directory": "packer-sles11sp3-x86_64-vmware", + "output_directory": "packer-sles-11-sp3-x86_64-vmware", "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, @@ -63,7 +63,7 @@ "ssh_wait_timeout": "10000s", "tools_upload_flavor": "linux", "type": "vmware-iso", - "vm_name": "packer-sles11sp3-x86_64", + "vm_name": "packer-sles-11-sp3-x86_64", "vmx_data": { "cpuid.coresPerSocket": "1", "memsize": "480", From fa82c3816a82896e5b701464cf25f8b0d9a3d6d6 Mon Sep 17 00:00:00 2001 From: Robert Coleman <github@robert.net.nz> Date: Sat, 14 Jun 2014 13:42:28 +1200 Subject: [PATCH 0227/1622] fix vmware-vmx tools install --- packer/scripts/common/vmtools.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/packer/scripts/common/vmtools.sh b/packer/scripts/common/vmtools.sh index 3f980317b..8983b60d6 100644 --- a/packer/scripts/common/vmtools.sh +++ b/packer/scripts/common/vmtools.sh @@ -1,18 +1,18 @@ #!/bin/bash -case "$PACKER_BUILDER_TYPE" in +case "$PACKER_BUILDER_TYPE" in -virtualbox-iso|virtualbox-ovf) +virtualbox-iso|virtualbox-ovf) mkdir /tmp/vbox VER=$(cat /home/vagrant/.vbox_version) - mount -o loop /home/vagrant/VBoxGuestAdditions_$VER.iso /tmp/vbox + mount -o loop /home/vagrant/VBoxGuestAdditions_$VER.iso /tmp/vbox sh /tmp/vbox/VBoxLinuxAdditions.run umount /tmp/vbox rmdir /tmp/vbox rm /home/vagrant/*.iso ;; -vmware-iso|vmware-ovf) +vmware-iso|vmware-vmx) mkdir /tmp/vmfusion mkdir /tmp/vmfusion-archive mount -o loop /home/vagrant/linux.iso /tmp/vmfusion From ad6643942bf4cf0aceac2d256547dba566f24531 Mon Sep 17 00:00:00 2001 From: "Julian C. Dunn" <jdunn@getchef.com> Date: Wed, 25 Jun 2014 13:12:03 -0400 Subject: [PATCH 0228/1622] Updated checksum and mirror to GA release --- packer/rhel-7.0-x86_64.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/packer/rhel-7.0-x86_64.json b/packer/rhel-7.0-x86_64.json index fc7cba27d..35d1dc726 100644 --- a/packer/rhel-7.0-x86_64.json +++ b/packer/rhel-7.0-x86_64.json @@ -9,9 +9,9 @@ "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "guest_os_type": "RedHat_64", "http_directory": "http", - "iso_checksum": "bea5e951342a7ab0233219c3deb3b3acff023ea5dc67a9a4564a97a89364f192", + "iso_checksum": "85a9fedc2bf0fc825cc7817056aa00b3ea87d7e111e0cf8de77d3ba643f8646c", "iso_checksum_type": "sha256", - "iso_url": "{{user `mirror`}}/rc/7/Server/x86_64/iso/rhel-server-7.0-x86_64-dvd.iso", + "iso_url": "{{user `mirror`}}/rhel-server-7.0-x86_64-dvd.iso", "output_directory": "packer-rhel-7.0-x86_64-virtualbox", "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", @@ -44,9 +44,9 @@ "disk_size": 40960, "guest_os_type": "redhat-64", "http_directory": "http", - "iso_checksum": "bea5e951342a7ab0233219c3deb3b3acff023ea5dc67a9a4564a97a89364f192", + "iso_checksum": "85a9fedc2bf0fc825cc7817056aa00b3ea87d7e111e0cf8de77d3ba643f8646c", "iso_checksum_type": "sha256", - "iso_url": "{{user `mirror`}}/rc/7/Server/x86_64/iso/rhel-server-7.0-x86_64-dvd.iso", + "iso_url": "{{user `mirror`}}/rhel-server-7.0-x86_64-dvd.iso", "output_directory": "packer-rhel-7.0-x86_64-vmware", "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", @@ -89,7 +89,7 @@ ], "variables": { "chef_version": "provisionerless", - "mirror": "http://ftp.redhat.com/redhat/rhel" + "mirror": "http://put-your-mirror-here/" } } From b993f4ec6ba38f003d6a19d3331572eb4f7968ea Mon Sep 17 00:00:00 2001 From: "Julian C. Dunn" <jdunn@getchef.com> Date: Mon, 7 Jul 2014 11:03:26 -0400 Subject: [PATCH 0229/1622] Added Solaris 11 support. Closes #213 --- packer/http/solaris-11/default.xml | 66 ++++++++++++++ packer/http/solaris-11/profile.xml | 87 ++++++++++++++++++ packer/scripts/solaris/minimize.sh | 7 ++ packer/scripts/solaris/update.sh | 4 + packer/scripts/solaris/vmtools.sh | 26 ++++++ packer/solaris-11-x86.json | 142 +++++++++++++++++++++++++++++ 6 files changed, 332 insertions(+) create mode 100644 packer/http/solaris-11/default.xml create mode 100644 packer/http/solaris-11/profile.xml create mode 100644 packer/scripts/solaris/minimize.sh create mode 100644 packer/scripts/solaris/update.sh create mode 100644 packer/scripts/solaris/vmtools.sh create mode 100644 packer/solaris-11-x86.json diff --git a/packer/http/solaris-11/default.xml b/packer/http/solaris-11/default.xml new file mode 100644 index 000000000..077d8defb --- /dev/null +++ b/packer/http/solaris-11/default.xml @@ -0,0 +1,66 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + CDDL HEADER START + + The contents of this file are subject to the terms of the + Common Development and Distribution License (the "License"). + You may not use this file except in compliance with the License. + + You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE + or http://www.opensolaris.org/os/licensing. + See the License for the specific language governing permissions + and limitations under the License. + + When distributing Covered Code, include this CDDL HEADER in each + file and include the License file at usr/src/OPENSOLARIS.LICENSE. + If applicable, add the following below this CDDL HEADER, with the + fields enclosed by brackets "[]" replaced with your own identifying + information: Portions Copyright [yyyy] [name of copyright owner] + + CDDL HEADER END + + Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved. + +--> +<!DOCTYPE auto_install SYSTEM "file:///usr/share/install/ai.dtd.1"> +<auto_install> + <ai_instance name="default"> + <target> + <logical> + <zpool name="rpool" is_root="true"> + <filesystem name="export" mountpoint="/export"/> + <filesystem name="export/home"/> + <be name="solaris"/> + </zpool> + </logical> + </target> + <software> + <source> + <publisher name="solaris"> + <origin name="http://pkg.oracle.com/solaris/release"/> + </publisher> + </source> + <!-- + By default the latest build available, in the specified IPS + repository, is installed. If another build is required, the + build number has to be appended to the 'entire' package in following + form: + + <name>pkg:/entire@0.5.11-0.build#</name> + --> + <software_data action="install"> + <name>pkg:/server_install</name> + </software_data> + <!-- + babel_install and slim_install are group packages used to + define the default installation. They are removed here so + that they do not inhibit removal of other packages on the + installed system. + --> + <software_data action="uninstall"> + <name>pkg:/server_install</name> + </software_data> + + </software> + </ai_instance> +</auto_install> diff --git a/packer/http/solaris-11/profile.xml b/packer/http/solaris-11/profile.xml new file mode 100644 index 000000000..51af5b941 --- /dev/null +++ b/packer/http/solaris-11/profile.xml @@ -0,0 +1,87 @@ +<!-- +CDDL HEADER START + +The contents of this file are subject to the terms of the +Common Development and Distribution License (the "License"). +You may not use this file except in compliance with the License. + +You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE +or http://www.opensolaris.org/os/licensing. +See the License for the specific language governing permissions +and limitations under the License. + +When distributing Covered Code, include this CDDL HEADER in each +file and include the License file at usr/src/OPENSOLARIS.LICENSE. +If applicable, add the following below this CDDL HEADER, with the +fields enclosed by brackets "[]" replaced with your own identifying +information: Portions Copyright [yyyy] [name of copyright owner] + +CDDL HEADER END + +Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. +--> + +<!DOCTYPE service_bundle SYSTEM "/usr/share/lib/xml/dtd/service_bundle.dtd.1"> +<service_bundle type="profile" name="system configuration"> + <service name="system/config-user" version="1"> + <instance name="default" enabled="true"> + <property_group name="user_account"> + <propval name="login" value="vagrant"/> + <propval name="password" value="$5$JsTLqHcZ$nAJVjxQ48k8YyIFaAo4.L0980WHDeDJbYt2caVuRw34"/> + <propval name="description" value="default_user"/> + <propval name="shell" value="/usr/bin/bash"/> + <propval name="uid" value="101"/> + <propval name="gid" value="10"/> + <propval name="type" value="normal"/> + <propval name="roles" value="root"/> + <propval name="profiles" value="System Administrator"/> + </property_group> + <property_group name="root_account"> + <propval name="password" value="$5$JsTLqHcZ$nAJVjxQ48k8YyIFaAo4.L0980WHDeDJbYt2caVuRw34"/> + <propval name="type" value="role"/> + </property_group> + </instance> + </service> + <service version="1" name="system/identity"> + <instance enabled="true" name="node"> + <property_group name="config"> + <propval name="nodename" value="vagrant-solaris"/> + </property_group> + </instance> + </service> + <service name="system/console-login" version="1"> + <instance enabled="true" name="default"> + <property_group name="ttymon"> + <propval name="terminal_type" value="sun-color"/> + </property_group> + </instance> + </service> + <service version="1" name="system/timezone"> + <instance enabled="true" name="default"> + <property_group name="timezone"> + <propval name="localtime" value="UTC"/> + </property_group> + </instance> + </service> + <service version="1" name="system/environment"> + <instance enabled="true" name="init"> + <property_group name="environment"> + <propval name="LANG" value="C"/> + </property_group> + </instance> + </service> + <service version="1" name="system/keymap"> + <instance enabled="true" name="default"> + <property_group name="keymap"> + <propval name="layout" value="US-English"/> + </property_group> + </instance> + </service> + <service version="1" name="network/physical"> + <instance enabled="true" name="default"> + <property_group type="application" name="netcfg"> + <propval name="active_ncp" value="Automatic"/> + </property_group> + </instance> + </service> +</service_bundle> diff --git a/packer/scripts/solaris/minimize.sh b/packer/scripts/solaris/minimize.sh new file mode 100644 index 000000000..01cb69341 --- /dev/null +++ b/packer/scripts/solaris/minimize.sh @@ -0,0 +1,7 @@ +#!/bin/sh -ux + +dd if=/dev/zero of=/EMPTY bs=1048576 +rm -f /EMPTY +# Block until the empty file has been removed, otherwise, Packer +# will try to kill the box while the disk is still full and that's bad +sync diff --git a/packer/scripts/solaris/update.sh b/packer/scripts/solaris/update.sh new file mode 100644 index 000000000..c70aff831 --- /dev/null +++ b/packer/scripts/solaris/update.sh @@ -0,0 +1,4 @@ +#!/bin/bash -eux + +pkg update pkg:/package/pkg || true +pkg update --accept || true diff --git a/packer/scripts/solaris/vmtools.sh b/packer/scripts/solaris/vmtools.sh new file mode 100644 index 000000000..cefaffb28 --- /dev/null +++ b/packer/scripts/solaris/vmtools.sh @@ -0,0 +1,26 @@ +#!/bin/bash -eux + +# Add pkgadd auto-answer file +sudo mkdir -p /tmp +sudo chmod 777 /tmp +echo "mail=" > /tmp/nocheck +echo "instance=overwrite" >> /tmp/nocheck +echo "partial=nocheck" >> /tmp/nocheck +echo "runlevel=nocheck" >> /tmp/nocheck +echo "idepend=nocheck" >> /tmp/nocheck +echo "rdepend=nocheck" >> /tmp/nocheck +echo "space=nocheck" >> /tmp/nocheck +echo "setuid=nocheck" >> /tmp/nocheck +echo "conflict=nocheck" >> /tmp/nocheck +echo "action=nocheck" >> /tmp/nocheck +echo "basedir=default" >> /tmp/nocheck + +echo "all" > /tmp/allfiles + +if [ -f /home/vagrant/.vbox_version ]; then + mkdir /tmp/vbox + VER=$(cat /home/vagrant/.vbox_version) + ls + sudo -i pkgadd -a /tmp/nocheck -d /media/VBOXADDITIONS_*/VBoxSolarisAdditions.pkg < /tmp/allfiles +fi + diff --git a/packer/solaris-11-x86.json b/packer/solaris-11-x86.json new file mode 100644 index 000000000..0a2223dfa --- /dev/null +++ b/packer/solaris-11-x86.json @@ -0,0 +1,142 @@ +{ + "variables": { + "README": "You must download the automated installer iso from the following page, and then place it somewhere that packer can fetch it", + "DOWNLOAD_SITE": "http://www.oracle.com/technetwork/server-storage/solaris11/downloads/index.html", + "mirror": "http://myserver OR ./packer_cache", + "chef_version": "provisionerless" + }, + "provisioners": [ + { + "type": "shell", + "environment_vars": [ + "CHEF_VERSION={{user `chef_version`}}" + ], + "scripts": [ + "scripts/solaris/update.sh", + "scripts/solaris/vmtools.sh", + "scripts/common/vagrant.sh", + "scripts/solaris/minimize.sh" + ], + "execute_command": "echo 'vagrant'|sudo -S bash {{.Path}}" + } + ], + "builders": [ + { + "type": "virtualbox-iso", + "boot_command": [ + "e<wait>", + "<down><down><down><down><down><wait>", + "<end><wait>", + "<bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><wait>", + "false<wait>", + "<f10><wait>", + "<wait10><wait10><wait10><wait10><wait10><wait10>", + "<wait10><wait10><wait10><wait10><wait10><wait10>", + "<wait10><wait10><wait10><wait10><wait10><wait10>", + "root<enter><wait><wait>", + "solaris<enter><wait><wait>", + "<wait10>", + "while (true); do sleep 5; test -f /a/etc/sudoers && grep -v \"vagrant\" \"/a/etc/sudoers\" 2> /dev/null<wait>", + " && echo \"vagrant ALL=(ALL) NOPASSWD: ALL\" >> /a/etc/sudoers && break ; done &<enter><wait>", + "<enter>while (true); do grep \"You may wish to reboot\" \"/var/svc/log/application-auto-installer:default.log\" 2> /dev/null<wait>", + " && reboot; sleep 10; done &<enter><wait>", + "sleep 5; curl http://{{ .HTTPIP }}:{{ .HTTPPort }}/default.xml -o default.xml;<wait>", + "curl http://{{ .HTTPIP }}:{{ .HTTPPort }}/profile.xml -o profile.xml;<wait>", + "cp default.xml /system/volatile/ai.xml;<wait>", + "mkdir /system/volatile/profile;<wait>", + "cp profile.xml /system/volatile/profile/profile.xml;<wait>", + "svcadm enable svc:/application/auto-installer:default;<wait>", + "<enter><wait10><wait><wait>", + "<enter><wait>", + "tail -f /var/svc/log/application-auto-installer\\:default.log<enter><wait>" + ], + "boot_wait": "5s", + "disk_size": 15360, + "guest_os_type": "Solaris11_64", + "http_directory": "http/solaris-11", + "iso_checksum": "f697fe5bc9cc4c901a52ce43229ab0d6", + "iso_checksum_type": "md5", + "iso_url": "{{user `mirror`}}/sol-11_1-ai-x86.iso", + "ssh_username": "vagrant", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_wait_timeout": "10000s", + "shutdown_command": "echo 'vagrant'|sudo -i init 5", + "shutdown_timeout": "10m", + "guest_additions_mode": "attach", + "virtualbox_version_file": ".vbox_version", + "vm_name": "packer-solaris-11.1-x86_64", + "output_directory": "packer-solaris-11.1-x86_64-virtualbox", + "vboxmanage": [ + [ + "modifyvm", + "{{.Name}}", + "--memory", + "768" + ], + [ + "modifyvm", + "{{.Name}}", + "--cpus", + "1" + ] + ] + }, + { + "type": "vmware-iso", + "boot_command": [ + "e<wait>", + "<down><down><down><down><down><wait>", + "<end><wait>", + "<bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><wait>", + "false<wait>", + "<f10><wait>", + "<wait10><wait10><wait10><wait10><wait10><wait10>", + "<wait10><wait10><wait10><wait10><wait10><wait10>", + "<wait10><wait10><wait10><wait10><wait10><wait10>", + "root<enter><wait><wait>", + "solaris<enter><wait><wait>", + "<wait10>", + "while (true); do sleep 5; test -f /a/etc/sudoers && grep -v \"vagrant\" \"/a/etc/sudoers\" 2> /dev/null<wait>", + " && echo \"vagrant ALL=(ALL) NOPASSWD: ALL\" >> /a/etc/sudoers && break ; done &<enter><wait>", + "<enter>while (true); do grep \"You may wish to reboot\" \"/var/svc/log/application-auto-installer:default.log\" 2> /dev/null<wait>", + " && reboot; sleep 10; done &<enter><wait>", + "sleep 5; curl http://{{ .HTTPIP }}:{{ .HTTPPort }}/default.xml -o default.xml;<wait>", + "curl http://{{ .HTTPIP }}:{{ .HTTPPort }}/profile.xml -o profile.xml;<wait>", + "cp default.xml /system/volatile/ai.xml;<wait>", + "mkdir /system/volatile/profile;<wait>", + "cp profile.xml /system/volatile/profile/profile.xml;<wait>", + "svcadm enable svc:/application/auto-installer:default;<wait>", + "<enter><wait10><wait><wait>", + "<enter><wait>", + "tail -f /var/svc/log/application-auto-installer\\:default.log<enter><wait>" + ], + "boot_wait": "5s", + "disk_size": 15360, + "guest_os_type": "solaris11-64", + "http_directory": "http/solaris-11", + "iso_checksum": "f697fe5bc9cc4c901a52ce43229ab0d6", + "iso_checksum_type": "md5", + "iso_url": "{{user `mirror`}}/sol-11_1-ai-x86.iso", + "ssh_username": "vagrant", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_wait_timeout": "10000s", + "shutdown_command": "echo 'vagrant'|sudo -i init 5", + "shutdown_timeout": "10m", + "vm_name": "packer-solaris-11.1-x86_64", + "output_directory": "packer-solaris-11.1-x86_64-vmware", + "vmx_data": { + "memsize": "768", + "cpuid.coresPerSocket": "1", + "numvcpus": "1" + } + } + ], + "post-processors": [ + { + "output": "../builds/{{.Provider}}/opscode_solaris-11.1_chef-{{user `chef_version`}}.box", + "type": "vagrant" + } + ] +} From 201f2885ac560514267c7cf99d4b3b83056b85c2 Mon Sep 17 00:00:00 2001 From: Andy Thompson <me@andytson.com> Date: Wed, 9 Jul 2014 22:30:39 +0100 Subject: [PATCH 0230/1622] Support CentOS 7.0 --- packer/centos-7.0-x86_64.json | 95 +++++++++++++++++++++++++++++++++++ 1 file changed, 95 insertions(+) create mode 100644 packer/centos-7.0-x86_64.json diff --git a/packer/centos-7.0-x86_64.json b/packer/centos-7.0-x86_64.json new file mode 100644 index 000000000..5614d8dfb --- /dev/null +++ b/packer/centos-7.0-x86_64.json @@ -0,0 +1,95 @@ +{ + "builders": [ + { + "boot_command": [ + "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/centos-7.0/ks.cfg<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "guest_os_type": "RedHat_64", + "http_directory": "http", + "iso_checksum": "ee505335bcd4943ffc7e6e6e55e5aaa8da09710b6ceecda82a5619342f1d24d9", + "iso_checksum_type": "sha256", + "iso_url": "{{user `mirror`}}/7.0.1406/isos/x86_64/CentOS-7.0-1406-x86_64-DVD.iso", + "output_directory": "packer-centos-7.0-x86_64-virtualbox", + "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "virtualbox-iso", + "vboxmanage": [ + [ + "modifyvm", + "{{.Name}}", + "--memory", + "480" + ], + [ + "modifyvm", + "{{.Name}}", + "--cpus", + "1" + ] + ], + "virtualbox_version_file": ".vbox_version", + "vm_name": "packer-centos-7.0-x86_64" + }, + { + "boot_command": [ + "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/centos-7.0/ks.cfg<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "guest_os_type": "centos-64", + "http_directory": "http", + "iso_checksum": "ee505335bcd4943ffc7e6e6e55e5aaa8da09710b6ceecda82a5619342f1d24d9", + "iso_checksum_type": "sha256", + "iso_url": "{{user `mirror`}}/7.0.1406/isos/x86_64/CentOS-7.0-1406-x86_64-DVD.iso", + "output_directory": "packer-centos-7.0-x86_64-vmware", + "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "tools_upload_flavor": "linux", + "type": "vmware-iso", + "vm_name": "packer-centos-7.0-x86_64", + "vmx_data": { + "cpuid.coresPerSocket": "1", + "memsize": "480", + "numvcpus": "1" + } + } + ], + "post-processors": [ + { + "output": "../builds/{{.Provider}}/opscode_centos-7.0_chef-{{user `chef_version`}}.box", + "type": "vagrant" + } + ], + "provisioners": [ + { + "environment_vars": [ + "CHEF_VERSION={{user `chef_version`}}" + ], + "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E bash '{{.Path}}'", + "scripts": [ + "scripts/centos/fix-slow-dns.sh", + "scripts/common/sshd.sh", + "scripts/common/vagrant.sh", + "scripts/common/vmtools.sh", + "scripts/common/chef.sh", + "scripts/centos/cleanup.sh", + "scripts/common/minimize.sh" + ], + "type": "shell" + } + ], + "variables": { + "chef_version": "provisionerless", + "mirror": "http://mirrors.kernel.org/centos" + } +} + From 6a292639e59002ab526d429dac0bcd63b6dfbea0 Mon Sep 17 00:00:00 2001 From: Tristan Helmich <tristan.helmich@mayflower.de> Date: Mon, 14 Jul 2014 14:02:57 +0200 Subject: [PATCH 0231/1622] Debian 7.5 -> 7.6 updated names, URLs and checksums --- ...an-7.5-amd64.json => debian-7.6-amd64.json} | 18 +++++++++--------- ...bian-7.5-i386.json => debian-7.6-i386.json} | 18 +++++++++--------- 2 files changed, 18 insertions(+), 18 deletions(-) rename packer/{debian-7.5-amd64.json => debian-7.6-amd64.json} (85%) rename packer/{debian-7.5-i386.json => debian-7.6-i386.json} (86%) diff --git a/packer/debian-7.5-amd64.json b/packer/debian-7.6-amd64.json similarity index 85% rename from packer/debian-7.5-amd64.json rename to packer/debian-7.6-amd64.json index a6e0c0182..91993fa41 100644 --- a/packer/debian-7.5-amd64.json +++ b/packer/debian-7.6-amd64.json @@ -27,9 +27,9 @@ "disk_size": 40960, "guest_os_type": "Debian_64", "http_directory": "http", - "iso_checksum": "200948e5885da3b67730293a1426845f90239c62", + "iso_checksum": "ba6f8194b5970be964a5de86522423135358908a", "iso_checksum_type": "sha1", - "iso_url": "{{user `mirror`}}/7.5.0/amd64/iso-cd/debian-7.5.0-amd64-CD-1.iso", + "iso_url": "{{user `mirror`}}/7.6.0/amd64/iso-cd/debian-7.6.0-amd64-CD-1.iso", "ssh_username": "vagrant", "ssh_password": "vagrant", "ssh_port": 22, @@ -37,8 +37,8 @@ "shutdown_command": "echo 'vagrant'|sudo -S /sbin/shutdown -hP now", "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "virtualbox_version_file": ".vbox_version", - "vm_name": "packer-debian-7.5-amd64", - "output_directory": "packer-debian-7.5-amd64-virtualbox", + "vm_name": "packer-debian-7.6-amd64", + "output_directory": "packer-debian-7.6-amd64-virtualbox", "vboxmanage": [ [ "modifyvm", "{{.Name}}", "--memory", "384" ], [ "modifyvm", "{{.Name}}", "--cpus", "1" ] @@ -67,17 +67,17 @@ "disk_size": 40960, "guest_os_type": "debian5-64", "http_directory": "http", - "iso_checksum": "200948e5885da3b67730293a1426845f90239c62", + "iso_checksum": "ba6f8194b5970be964a5de86522423135358908a", "iso_checksum_type": "sha1", - "iso_url": "{{user `mirror`}}/7.5.0/amd64/iso-cd/debian-7.5.0-amd64-CD-1.iso", + "iso_url": "{{user `mirror`}}/7.6.0/amd64/iso-cd/debian-7.6.0-amd64-CD-1.iso", "ssh_username": "vagrant", "ssh_password": "vagrant", "ssh_port": 22, "ssh_wait_timeout": "10000s", "shutdown_command": "echo 'vagrant'|sudo -S /sbin/shutdown -hP now", "tools_upload_flavor": "linux", - "vm_name": "packer-debian-7.5-amd64", - "output_directory": "packer-debian-7.5-amd64-vmware", + "vm_name": "packer-debian-7.6-amd64", + "output_directory": "packer-debian-7.6-amd64-vmware", "vmx_data": { "memsize": "384", "numvcpus": "1", @@ -88,7 +88,7 @@ "post-processors": [ { "type": "vagrant", - "output": "../builds/{{.Provider}}/opscode_debian-7.5_chef-{{user `chef_version`}}.box" + "output": "../builds/{{.Provider}}/opscode_debian-7.6_chef-{{user `chef_version`}}.box" } ], "provisioners": [ diff --git a/packer/debian-7.5-i386.json b/packer/debian-7.6-i386.json similarity index 86% rename from packer/debian-7.5-i386.json rename to packer/debian-7.6-i386.json index 9e29f8c00..1d04d8904 100644 --- a/packer/debian-7.5-i386.json +++ b/packer/debian-7.6-i386.json @@ -27,9 +27,9 @@ "disk_size": 40960, "guest_os_type": "Debian", "http_directory": "http", - "iso_checksum": "24e8e0ac74a12848e2601f3bb1821c52fc9049c5", + "iso_checksum": "ac7abf86a6077a242ac367aef3d4f18a8232098b", "iso_checksum_type": "sha1", - "iso_url": "{{user `mirror`}}/7.5.0/i386/iso-cd/debian-7.5.0-i386-CD-1.iso", + "iso_url": "{{user `mirror`}}/7.6.0/i386/iso-cd/debian-7.6.0-i386-CD-1.iso", "ssh_username": "vagrant", "ssh_password": "vagrant", "ssh_port": 22, @@ -37,8 +37,8 @@ "shutdown_command": "echo 'vagrant'|sudo -S /sbin/shutdown -hP now", "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "virtualbox_version_file": ".vbox_version", - "vm_name": "packer-debian-7.5-i386", - "output_directory": "packer-debian-7.5-i386-virtualbox", + "vm_name": "packer-debian-7.6-i386", + "output_directory": "packer-debian-7.6-i386-virtualbox", "vboxmanage": [ [ "modifyvm", "{{.Name}}", "--memory", "384" ], [ "modifyvm", "{{.Name}}", "--cpus", "1" ] @@ -67,17 +67,17 @@ "disk_size": 40960, "guest_os_type": "debian5", "http_directory": "http", - "iso_checksum": "24e8e0ac74a12848e2601f3bb1821c52fc9049c5", + "iso_checksum": "ac7abf86a6077a242ac367aef3d4f18a8232098b", "iso_checksum_type": "sha1", - "iso_url": "{{user `mirror`}}/7.5.0/i386/iso-cd/debian-7.5.0-i386-CD-1.iso", + "iso_url": "{{user `mirror`}}/7.6.0/i386/iso-cd/debian-7.6.0-i386-CD-1.iso", "ssh_username": "vagrant", "ssh_password": "vagrant", "ssh_port": 22, "ssh_wait_timeout": "10000s", "shutdown_command": "echo 'vagrant'|sudo -S /sbin/shutdown -hP now", "tools_upload_flavor": "linux", - "vm_name": "packer-debian-7.5-i386", - "output_directory": "packer-debian-7.5-i386-vmware", + "vm_name": "packer-debian-7.6-i386", + "output_directory": "packer-debian-7.6-i386-vmware", "vmx_data": { "memsize": "384", "numvcpus": "1", @@ -88,7 +88,7 @@ "post-processors": [ { "type": "vagrant", - "output": "../builds/{{.Provider}}/opscode_debian-7.5-i386_chef-{{user `chef_version`}}.box" + "output": "../builds/{{.Provider}}/opscode_debian-7.6-i386_chef-{{user `chef_version`}}.box" } ], "provisioners": [ From 84b12a7c475b21ebface66ceaff1cc80ea070a88 Mon Sep 17 00:00:00 2001 From: "Julian C. Dunn" <jdunn@getchef.com> Date: Sun, 20 Jul 2014 22:59:04 -0400 Subject: [PATCH 0232/1622] Add net-tools to all Fedora boxes as well as CentOS 7 --- packer/http/centos-7.0/ks.cfg | 1 + packer/http/fedora-19/ks.cfg | 1 + 2 files changed, 2 insertions(+) diff --git a/packer/http/centos-7.0/ks.cfg b/packer/http/centos-7.0/ks.cfg index f69a26f70..a67206044 100644 --- a/packer/http/centos-7.0/ks.cfg +++ b/packer/http/centos-7.0/ks.cfg @@ -31,6 +31,7 @@ perl curl wget nfs-utils +net-tools bzip2 -fprintd-pam -intltool diff --git a/packer/http/fedora-19/ks.cfg b/packer/http/fedora-19/ks.cfg index 23be39dc6..4e3db2946 100644 --- a/packer/http/fedora-19/ks.cfg +++ b/packer/http/fedora-19/ks.cfg @@ -32,6 +32,7 @@ kernel-headers tar wget nfs-utils +net-tools -linux-firmware -plymouth -plymouth-core-libs From 651fd4649509847bec9e4a44126cbea12d7c444f Mon Sep 17 00:00:00 2001 From: "Julian C. Dunn" <jdunn@getchef.com> Date: Mon, 21 Jul 2014 15:54:12 -0400 Subject: [PATCH 0233/1622] Fix bugs on building VMWare box --- packer/rhel-7.0-x86_64.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/packer/rhel-7.0-x86_64.json b/packer/rhel-7.0-x86_64.json index 35d1dc726..e8e84f83f 100644 --- a/packer/rhel-7.0-x86_64.json +++ b/packer/rhel-7.0-x86_64.json @@ -34,15 +34,15 @@ ] ], "virtualbox_version_file": ".vbox_version", - "vm_name": "packer-centos-7.0-x86_64" + "vm_name": "packer-rhel-7.0-x86_64" }, { "boot_command": [ - "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/rhel-7.0/ks.cfg<enter><wait>" + "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/centos-7.0/ks.cfg<enter><wait>" ], "boot_wait": "10s", "disk_size": 40960, - "guest_os_type": "redhat-64", + "guest_os_type": "rhel7-64", "http_directory": "http", "iso_checksum": "85a9fedc2bf0fc825cc7817056aa00b3ea87d7e111e0cf8de77d3ba643f8646c", "iso_checksum_type": "sha256", @@ -55,7 +55,7 @@ "ssh_wait_timeout": "10000s", "tools_upload_flavor": "linux", "type": "vmware-iso", - "vm_name": "packer-centos-7.0-x86_64", + "vm_name": "packer-rhel-7.0-x86_64", "vmx_data": { "cpuid.coresPerSocket": "1", "memsize": "480", From 5a133c92d32fc9f56102e680ffcb1d20c7d213fd Mon Sep 17 00:00:00 2001 From: "Julian C. Dunn" <jdunn@getchef.com> Date: Wed, 23 Jul 2014 15:11:10 -0400 Subject: [PATCH 0234/1622] Upgrade to OmniOS r151010j --- ...nios-r151008t.json => omnios-r151010j.json} | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) rename packer/{omnios-r151008t.json => omnios-r151010j.json} (89%) diff --git a/packer/omnios-r151008t.json b/packer/omnios-r151010j.json similarity index 89% rename from packer/omnios-r151008t.json rename to packer/omnios-r151010j.json index b49ae5900..1ca6f495a 100644 --- a/packer/omnios-r151008t.json +++ b/packer/omnios-r151010j.json @@ -33,10 +33,10 @@ "boot_wait": "30s", "disk_size": 40960, "guest_os_type": "OpenSolaris_64", - "iso_checksum": "a20aefc31640732087ea235dd027ab23b39c2ea1", + "iso_checksum": "bc3f4c0d29a5da75174de62da00294e5ef826b5e", "iso_checksum_type": "sha1", - "iso_url": "{{user `mirror`}}/OmniOS_Text_r151008t.iso", - "output_directory": "packer-omnios-r151008t-virtualbox", + "iso_url": "{{user `mirror`}}/OmniOS_Text_r151010j.iso", + "output_directory": "packer-omnios-r151010j-virtualbox", "shutdown_command": "/usr/sbin/shutdown -g 0 -y -i 5", "ssh_password": "vagrant", "ssh_port": 22, @@ -57,7 +57,7 @@ ] ], "virtualbox_version_file": ".vbox_version", - "vm_name": "packer-omnios-r151008t" + "vm_name": "packer-omnios-r151010j" }, { "boot_command": [ @@ -97,17 +97,17 @@ "floppy/omnios/README.TXT" ], "guest_os_type": "solaris11-64", - "iso_checksum": "a20aefc31640732087ea235dd027ab23b39c2ea1", + "iso_checksum": "bc3f4c0d29a5da75174de62da00294e5ef826b5e", "iso_checksum_type": "sha1", - "iso_url": "{{user `mirror`}}/OmniOS_Text_r151008t.iso", - "output_directory": "packer-omnios-r151008t-vmware", + "iso_url": "{{user `mirror`}}/OmniOS_Text_r151010j.iso", + "output_directory": "packer-omnios-r151010j-vmware", "shutdown_command": "/usr/sbin/shutdown -g 0 -y -i 5", "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "root", "tools_upload_flavor": "solaris", "type": "vmware-iso", - "vm_name": "packer-omnios-r151008t", + "vm_name": "packer-omnios-r151010j", "vmx_data": { "cpuid.coresPerSocket": "1", "memsize": "1024", @@ -118,7 +118,7 @@ "post-processors": [ { "compression_level": 9, - "output": "../builds/{{.Provider}}/opscode_omnios-r151008t_chef-{{user `chef_version`}}.box", + "output": "../builds/{{.Provider}}/opscode_omnios-r151010j_chef-{{user `chef_version`}}.box", "type": "vagrant" } ], From 6825f157eb2434b15e34fa0d3724d3c27e3e1f15 Mon Sep 17 00:00:00 2001 From: Alexander Simonov <alex@simonov.me> Date: Wed, 16 Jul 2014 23:13:57 +0300 Subject: [PATCH 0235/1622] OpenSUSE 13.1 support --- packer/http/opensuse-13.1/autoinst.xml | 243 +++++++++++++++++++ packer/opensuse-13.1-i386.json | 105 ++++++++ packer/opensuse-13.1-x86_64.json | 106 ++++++++ packer/scripts/opensuse/cleanup.sh | 7 + packer/scripts/opensuse/remove-dvd-source.sh | 11 + packer/scripts/opensuse/services.sh | 5 + packer/scripts/opensuse/sudoers.sh | 5 + packer/scripts/opensuse/zypper-locks.sh | 4 + 8 files changed, 486 insertions(+) create mode 100644 packer/http/opensuse-13.1/autoinst.xml create mode 100644 packer/opensuse-13.1-i386.json create mode 100644 packer/opensuse-13.1-x86_64.json create mode 100644 packer/scripts/opensuse/cleanup.sh create mode 100644 packer/scripts/opensuse/remove-dvd-source.sh create mode 100644 packer/scripts/opensuse/services.sh create mode 100644 packer/scripts/opensuse/sudoers.sh create mode 100644 packer/scripts/opensuse/zypper-locks.sh diff --git a/packer/http/opensuse-13.1/autoinst.xml b/packer/http/opensuse-13.1/autoinst.xml new file mode 100644 index 000000000..27243fe0a --- /dev/null +++ b/packer/http/opensuse-13.1/autoinst.xml @@ -0,0 +1,243 @@ +<?xml version="1.0"?> +<!DOCTYPE profile> + +<!-- http://doc.opensuse.org/projects/autoyast/configuration.html --> + +<profile xmlns="http://www.suse.com/1.0/yast2ns" xmlns:config="http://www.suse.com/1.0/configns"> + <general> + <mode> + <confirm config:type="boolean">false</confirm> + <forceboot config:type="boolean">true</forceboot> + <final_reboot config:type="boolean">false</final_reboot> + </mode> + </general> + <report> + <messages> + <show config:type="boolean">false</show> + <timeout config:type="integer">10</timeout> + <log config:type="boolean">true</log> + </messages> + <warnings> + <show config:type="boolean">false</show> + <timeout config:type="integer">10</timeout> + <log config:type="boolean">true</log> + </warnings> + <errors> + <show config:type="boolean">false</show> + <timeout config:type="integer">10</timeout> + <log config:type="boolean">true</log> + </errors> + </report> + + <keyboard> + <keymap>english-us</keymap> + </keyboard> + <language> + <language>en_US</language> + <languages>en_US</languages> + </language> + <timezone> + <hwclock>UTC</hwclock> + <timezone>Etc/UTC</timezone> + </timezone> + + <partitioning config:type="list"> + <drive> + <initialize config:type="boolean">true</initialize> + <partitions config:type="list"> + <partition> + <create config:type="boolean">true</create> + <crypt_fs config:type="boolean">false</crypt_fs> + <filesystem config:type="symbol">ext4</filesystem> + <filesystem_id config:type="integer">131</filesystem_id> + <format config:type="boolean">true</format> + <fstopt>defaults</fstopt> + <loop_fs config:type="boolean">false</loop_fs> + <mount>/boot</mount> + <mountby config:type="symbol">device</mountby> + <partition_id config:type="integer">131</partition_id> + <partition_nr config:type="integer">1</partition_nr> + <resize config:type="boolean">false</resize> + <size>512M</size> + </partition> + <partition> + <create config:type="boolean">true</create> + <crypt_fs config:type="boolean">false</crypt_fs> + <filesystem config:type="symbol">ext4</filesystem> + <filesystem_id config:type="integer">131</filesystem_id> + <format config:type="boolean">true</format> + <fstopt>defaults</fstopt> + <loop_fs config:type="boolean">false</loop_fs> + <mount>/</mount> + <mountby config:type="symbol">device</mountby> + <partition_id config:type="integer">131</partition_id> + <partition_nr config:type="integer">2</partition_nr> + <resize config:type="boolean">false</resize> + <size>max</size> + </partition> + <partition> + <create config:type="boolean">true</create> + <crypt_fs config:type="boolean">false</crypt_fs> + <filesystem config:type="symbol">swap</filesystem> + <filesystem_id config:type="integer">130</filesystem_id> + <format config:type="boolean">true</format> + <fstopt>defaults</fstopt> + <loop_fs config:type="boolean">false</loop_fs> + <mount>swap</mount> + <mountby config:type="symbol">device</mountby> + <partition_id config:type="integer">130</partition_id> + <partition_nr config:type="integer">3</partition_nr> + <resize config:type="boolean">false</resize> + <size>512M</size> + </partition> + </partitions> + <type config:type="symbol">CT_DISK</type> + <use>all</use> + </drive> + </partitioning> + + <bootloader> + <loader_type>grub2</loader_type> + </bootloader> + + <networking> + <ipv6 config:type="boolean">false</ipv6> + <keep_install_network config:type="boolean">true</keep_install_network> + <dns> + <dhcp_hostname config:type="boolean">true</dhcp_hostname> + <dhcp_resolv config:type="boolean">true</dhcp_resolv> + <domain>local</domain> + <hostname>linux</hostname> + </dns> + <interfaces config:type="list"> + <interface> + <bootproto>dhcp</bootproto> + <device>enp0s3</device> + <startmode>onboot</startmode> + </interface> + <interface> + <bootproto>dhcp</bootproto> + <device>ens33</device> + <startmode>onboot</startmode> + </interface> + </interfaces> + </networking> + + <firewall> + <enable_firewall config:type="boolean">false</enable_firewall> + <start_firewall config:type="boolean">false</start_firewall> + </firewall> + + <software> + <image/> + <instsource/> + <packages config:type="list"> + <package>grub2</package> + <package>glibc-locale</package> + <package>iputils</package> + <package>kernel-default</package> + <package>kernel-default-devel</package> + <package>gcc</package> + <package>make</package> + <package>less</package> + <package>vim</package> + <package>sudo</package> + <package>screen</package> + <package>yast2</package> + <package>yast2-firstboot</package> + <package>zypper</package> + <package>yast2-trans-en_US</package> + <package>wget</package> + <package>curl</package> + <package>iproute2</package> + <package>ifplugd</package> + <package>kexec-tools</package> + <package>libdaemon0</package> + <package>libnl1</package> + <package>libxslt-tools</package> + <package>cryptsetup-mkinitrd</package> + <package>grub2-branding-openSUSE</package> + <package>rsyslog</package> + </packages> + <patterns config:type="list"> + <pattern>sw_management</pattern> + <pattern>yast2_install_wf</pattern> + <pattern>base</pattern> + </patterns> + <remove-packages config:type="list"> + <package>virtualbox-guest-kmp-default</package> + <package>virtualbox-guest-tools</package> + </remove-packages> + </software> + + <runlevel> + <services config:type="list"> + <service> + <service_name>sshd</service_name> + <service_start>3 5</service_start> + </service> + </services> + </runlevel> + + <scripts> + <init-scripts config:type="list"> + <script> + <debug config:type="boolean">true</debug> + <filename>restart_sshd.sh</filename> + <interpreter>shell</interpreter> + <source><![CDATA[#!/bin/bash +systemctl restart sshd +systemctl enable rsyslog +systemctl start rsyslog +]]></source> + </script> + </init-scripts> + </scripts> + + <groups config:type="list"> + <group> + <gid>100</gid> + <groupname>users</groupname> + <userlist/> + </group> + </groups> + + <user_defaults> + <expire/> + <group>100</group> + <groups/> + <home>/home</home> + <inactive>-1</inactive> + <no_groups config:type="boolean">true</no_groups> + <shell>/bin/bash</shell> + <skel>/etc/skel</skel> + <umask>022</umask> + </user_defaults> + + <users config:type="list"> + <user> + <user_password>vagrant</user_password> + <username>root</username> + </user> + <user> + <fullname>vagrant</fullname> + <gid>100</gid> + <home>/home/vagrant</home> + <password_settings> + <expire/> + <flag/> + <inact>-1</inact> + <max>99999</max> + <min>0</min> + <warn>7</warn> + </password_settings> + <shell>/bin/bash</shell> + <uid>1000</uid> + <user_password>vagrant</user_password> + <username>vagrant</username> + </user> + </users> + <kdump> + <add_crash_kernel config:type="boolean">false</add_crash_kernel> + </kdump> +</profile> diff --git a/packer/opensuse-13.1-i386.json b/packer/opensuse-13.1-i386.json new file mode 100644 index 000000000..48e718c0e --- /dev/null +++ b/packer/opensuse-13.1-i386.json @@ -0,0 +1,105 @@ +{ + "builders": [ + { + "boot_command": [ + "<esc><enter><wait>", + "linux netsetup=dhcp install=cd:/<wait>", + " lang=en_US autoyast=http://{{ .HTTPIP }}:{{ .HTTPPort }}/opensuse-13.1/autoinst.xml<wait>", + " textmode=1<wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 20480, + "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "guest_os_type": "OpenSUSE", + "http_directory": "http", + "iso_checksum": "1bd6223430910f6d5a168d4e19171462", + "iso_checksum_type": "md5", + "iso_url": "{{user `mirror`}}/13.1/iso/openSUSE-13.1-DVD-i586.iso", + "output_directory": "packer-opensuse-13.1-i386-virtualbox", + "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "virtualbox-iso", + "vboxmanage": [ + [ + "modifyvm", + "{{.Name}}", + "--memory", + "480" + ], + [ + "modifyvm", + "{{.Name}}", + "--cpus", + "1" + ] + ], + "virtualbox_version_file": ".vbox_version", + "vm_name": "packer-opensuse-13.1-i386" + }, + { + "boot_command": [ + "<esc><enter><wait>", + "linux netsetup=dhcp install=cd:/<wait>", + " lang=en_US autoyast=http://{{ .HTTPIP }}:{{ .HTTPPort }}/opensuse-13.1/autoinst.xml<wait>", + " textmode=1<wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 20480, + "guest_os_type": "opensuse", + "http_directory": "http", + "iso_checksum": "1bd6223430910f6d5a168d4e19171462", + "iso_checksum_type": "md5", + "iso_url": "{{user `mirror`}}/13.1/iso/openSUSE-13.1-DVD-i586.iso", + "output_directory": "packer-opensuse-13.1-i386-vmware", + "shutdown_command": "echo 'vagrant'|sudo -S /sbin/shutdown -h 1", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "tools_upload_flavor": "linux", + "type": "vmware-iso", + "vm_name": "packer-opensuse-13.1-i386", + "vmx_data": { + "cpuid.coresPerSocket": "1", + "memsize": "480", + "numvcpus": "1" + } + } + ], + "post-processors": [ + { + "output": "../builds/{{.Provider}}/opscode_opensuse-13.1-i386_chef-{{user `chef_version`}}.box", + "type": "vagrant" + } + ], + "provisioners": [ + { + "environment_vars": [ + "CHEF_VERSION={{user `chef_version`}}" + ], + "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh '{{.Path}}'", + "scripts": [ + "scripts/common/sshd.sh", + "scripts/common/vagrant.sh", + "scripts/common/vmtools.sh", + "scripts/common/chef.sh", + "scripts/opensuse/services.sh", + "scripts/opensuse/sudoers.sh", + "scripts/opensuse/zypper-locks.sh", + "scripts/opensuse/remove-dvd-source.sh", + "scripts/opensuse/cleanup.sh", + "scripts/common/minimize.sh" + ], + "type": "shell" + } + ], + "variables": { + "chef_version": "provisionerless", + "mirror": "http://download.opensuse.org/distribution" + } +} diff --git a/packer/opensuse-13.1-x86_64.json b/packer/opensuse-13.1-x86_64.json new file mode 100644 index 000000000..f2aa800b0 --- /dev/null +++ b/packer/opensuse-13.1-x86_64.json @@ -0,0 +1,106 @@ +{ + "builders": [ + { + "boot_command": [ + "<esc><enter><wait>", + "linux netsetup=dhcp install=cd:/<wait>", + " lang=en_US autoyast=http://{{ .HTTPIP }}:{{ .HTTPPort }}/opensuse-13.1/autoinst.xml<wait>", + " textmode=1<wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 20480, + "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "guest_os_type": "OpenSUSE_64", + "http_directory": "http", + "iso_checksum": "1096c9c67fc8a67a94a32d04a15e909d", + "iso_checksum_type": "md5", + "iso_url": "{{user `mirror`}}/13.1/iso/openSUSE-13.1-DVD-x86_64.iso", + "output_directory": "packer-opensuse-13.1-x86_64-virtualbox", + "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "virtualbox-iso", + "vboxmanage": [ + [ + "modifyvm", + "{{.Name}}", + "--memory", + "480" + ], + [ + "modifyvm", + "{{.Name}}", + "--cpus", + "1" + ] + ], + "virtualbox_version_file": ".vbox_version", + "vm_name": "packer-opensuse-13.1-x86_64" + }, + { + "boot_command": [ + "<esc><enter><wait>", + "linux netsetup=dhcp install=cd:/<wait>", + " lang=en_US autoyast=http://{{ .HTTPIP }}:{{ .HTTPPort }}/opensuse-13.1/autoinst.xml<wait>", + " textmode=1<wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 20480, + "guest_os_type": "opensuse-64", + "http_directory": "http", + "iso_checksum": "1096c9c67fc8a67a94a32d04a15e909d", + "iso_checksum_type": "md5", + "iso_url": "{{user `mirror`}}/13.1/iso/openSUSE-13.1-DVD-x86_64.iso", + "output_directory": "packer-opensuse-13.1-x86_64-vmware", + "shutdown_command": "echo 'vagrant'|sudo -S /sbin/shutdown -h 1", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "tools_upload_flavor": "linux", + "type": "vmware-iso", + "vm_name": "packer-opensuse-13.1-x86_64", + "vmx_data": { + "cpuid.coresPerSocket": "1", + "memsize": "480", + "numvcpus": "1" + } + } + ], + "post-processors": [ + { + "output": "../builds/{{.Provider}}/opscode_opensuse-13.1-x86_64_chef-{{user `chef_version`}}.box", + "type": "vagrant" + } + ], + "provisioners": [ + { + "environment_vars": [ + "CHEF_VERSION={{user `chef_version`}}" + ], + "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh '{{.Path}}'", + "scripts": [ + "scripts/common/sshd.sh", + "scripts/common/vagrant.sh", + "scripts/common/vmtools.sh", + "scripts/common/chef.sh", + "scripts/opensuse/services.sh", + "scripts/opensuse/sudoers.sh", + "scripts/opensuse/zypper-locks.sh", + "scripts/opensuse/remove-dvd-source.sh", + "scripts/opensuse/cleanup.sh", + "scripts/common/minimize.sh" + ], + "type": "shell" + } + ], + "variables": { + "chef_version": "provisionerless", + "mirror": "http://download.opensuse.org/distribution" + } +} + diff --git a/packer/scripts/opensuse/cleanup.sh b/packer/scripts/opensuse/cleanup.sh new file mode 100644 index 000000000..2e466416d --- /dev/null +++ b/packer/scripts/opensuse/cleanup.sh @@ -0,0 +1,7 @@ +#!/bin/bash -eux +# These were only needed for building VMware/Virtualbox extensions: +zypper -n rm -u binutils gcc make site-config patterns-openSUSE-yast2_install_wf +# backlist i2c_piix4 - VirtualBox has no smbus +echo "blacklist i2c_piix4" > /etc/modprobe.d/100-blacklist-i2c_piix4.conf +# remove all kernels except current running +rpm -qa | grep kernel-default | grep -v `uname -r | awk -F"-" '{print $1"-"$2}'` | xargs rpm -ehv diff --git a/packer/scripts/opensuse/remove-dvd-source.sh b/packer/scripts/opensuse/remove-dvd-source.sh new file mode 100644 index 000000000..adbf70616 --- /dev/null +++ b/packer/scripts/opensuse/remove-dvd-source.sh @@ -0,0 +1,11 @@ +#!/bin/sh -eux + +zypper removerepo "openSUSE-13.1-1.10" +rpm --import http://download.opensuse.org/distribution/13.1/repo/oss/gpg-pubkey-3dbdc284-4be1884d.asc +rpm --import http://download.opensuse.org/distribution/13.1/repo/oss/gpg-pubkey-307e3d54-4be01a65.asc +zypper ar http://download.opensuse.org/distribution/13.1/repo/oss/ opensuse-13.1-oss +zypper ar http://download.opensuse.org/distribution/13.1/repo/non-oss/ opensuse-13.1-non-oss +zypper ar http://download.opensuse.org/update/13.1/ opensuse-13.1-update +zypper ar http://download.opensuse.org/update/13.1-non-oss/ opensuse-13.1-update-non-oss +zypper refresh +zypper update -y diff --git a/packer/scripts/opensuse/services.sh b/packer/scripts/opensuse/services.sh new file mode 100644 index 000000000..51891328b --- /dev/null +++ b/packer/scripts/opensuse/services.sh @@ -0,0 +1,5 @@ +#!/bin/sh -eux + +systemctl enable sshd +systemctl enable network +systemctl enable rsyslog \ No newline at end of file diff --git a/packer/scripts/opensuse/sudoers.sh b/packer/scripts/opensuse/sudoers.sh new file mode 100644 index 000000000..a80d47031 --- /dev/null +++ b/packer/scripts/opensuse/sudoers.sh @@ -0,0 +1,5 @@ +#!/bin/sh -eux + +# update sudoers - can't do this in autoinst.xml +echo -e "\nupdate sudoers ..." +echo -e "vagrant ALL=(ALL) NOPASSWD: ALL\n" >> /etc/sudoers diff --git a/packer/scripts/opensuse/zypper-locks.sh b/packer/scripts/opensuse/zypper-locks.sh new file mode 100644 index 000000000..a9e4e4ffb --- /dev/null +++ b/packer/scripts/opensuse/zypper-locks.sh @@ -0,0 +1,4 @@ +#!/bin/sh -eux + +# remove zypper locks on removed packages to avoid later dependency problems +zypper --non-interactive rl \* From ed086b9685aa62541c15476237992a96e5a2a0f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rene=CC=81=20Oelke?= <rene.oelke@gmail.com> Date: Tue, 1 Jul 2014 14:41:14 +0200 Subject: [PATCH 0236/1622] Added kernel and kernel headers to apt-get upgrade command. --- packer/scripts/ubuntu/cleanup.sh | 8 ++++---- packer/scripts/ubuntu/update.sh | 5 ++++- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/packer/scripts/ubuntu/cleanup.sh b/packer/scripts/ubuntu/cleanup.sh index 176774a17..08c4f2b43 100644 --- a/packer/scripts/ubuntu/cleanup.sh +++ b/packer/scripts/ubuntu/cleanup.sh @@ -1,5 +1,8 @@ #!/bin/bash -eux -# + +# delete all linux headers +dpkg --list | awk '{ print $2 }' | grep linux-headers | xargs apt-get -y purge + # this removes specific linux kernels, such as # linux-image-3.11.0-15-generic but # * keeps the current kernel @@ -7,9 +10,6 @@ # dpkg --list | awk '{ print $2 }' | grep 'linux-image-3.*-generic' | grep -v `uname -r` | xargs apt-get -y purge -# delete all linux headers -dpkg --list | awk '{ print $2 }' | grep linux-headers | xargs apt-get -y purge - # delete linux source dpkg --list | awk '{ print $2 }' | grep linux-source | xargs apt-get -y purge diff --git a/packer/scripts/ubuntu/update.sh b/packer/scripts/ubuntu/update.sh index 80e8dd3f9..06efcf5c1 100644 --- a/packer/scripts/ubuntu/update.sh +++ b/packer/scripts/ubuntu/update.sh @@ -1,7 +1,10 @@ #!/bin/bash -eux +# Update the package list apt-get update -apt-get -y upgrade + +# Upgrade all installed packages incl. kernel and kernel headers +apt-get -y upgrade linux-server linux-headers-server # ensure the correct kernel headers are installed apt-get -y install linux-headers-$(uname -r) From a4adf27476e561076f85aa6e712f54b18d92ee54 Mon Sep 17 00:00:00 2001 From: "Julian C. Dunn" <jdunn@getchef.com> Date: Thu, 31 Jul 2014 20:09:07 -0400 Subject: [PATCH 0237/1622] Remove Ubuntu 13.10 as it is EOL as of July 17, 2014. https://lists.ubuntu.com/archives/ubuntu-announce/2014-June/000185.html Also removed dangling preseed.cfgs from previously EOL'd releases. --- packer/http/ubuntu-10.10/preseed.cfg | 31 ------ packer/http/ubuntu-12.10/preseed.cfg | 31 ------ packer/http/ubuntu-13.10/preseed.cfg | 31 ------ packer/ubuntu-13.10-amd64.json | 139 --------------------------- packer/ubuntu-13.10-i386.json | 139 --------------------------- 5 files changed, 371 deletions(-) delete mode 100644 packer/http/ubuntu-10.10/preseed.cfg delete mode 100644 packer/http/ubuntu-12.10/preseed.cfg delete mode 100644 packer/http/ubuntu-13.10/preseed.cfg delete mode 100644 packer/ubuntu-13.10-amd64.json delete mode 100644 packer/ubuntu-13.10-i386.json diff --git a/packer/http/ubuntu-10.10/preseed.cfg b/packer/http/ubuntu-10.10/preseed.cfg deleted file mode 100644 index 1744c4d16..000000000 --- a/packer/http/ubuntu-10.10/preseed.cfg +++ /dev/null @@ -1,31 +0,0 @@ -choose-mirror-bin mirror/http/proxy string -d-i base-installer/kernel/override-image string linux-server -d-i clock-setup/utc boolean true -d-i clock-setup/utc-auto boolean true -d-i finish-install/reboot_in_progress note -d-i grub-installer/only_debian boolean true -d-i grub-installer/with_other_os boolean true -d-i netcfg/wireless_wep string -d-i partman-auto-lvm/guided_size string max -d-i partman-auto/choose_recipe select atomic -d-i partman-auto/method string lvm -d-i partman-lvm/confirm boolean true -d-i partman-lvm/confirm_nooverwrite boolean true -d-i partman-lvm/device_remove_lvm boolean true -d-i partman/choose_partition select finish -d-i partman/confirm boolean true -d-i partman/confirm_nooverwrite boolean true -d-i partman/confirm_write_new_label boolean true -d-i passwd/user-fullname string vagrant -d-i passwd/user-uid string 900 -d-i passwd/user-password password vagrant -d-i passwd/user-password-again password vagrant -d-i passwd/username string vagrant -d-i pkgsel/include string openssh-server cryptsetup build-essential libssl-dev libreadline-dev zlib1g-dev linux-source dkms nfs-common -d-i pkgsel/install-language-support boolean false -d-i pkgsel/update-policy select none -d-i pkgsel/upgrade select full-upgrade -d-i time/zone string UTC -d-i user-setup/allow-password-weak boolean true -d-i user-setup/encrypt-home boolean false -tasksel tasksel/first multiselect standard, ubuntu-server diff --git a/packer/http/ubuntu-12.10/preseed.cfg b/packer/http/ubuntu-12.10/preseed.cfg deleted file mode 100644 index 0a4d4939b..000000000 --- a/packer/http/ubuntu-12.10/preseed.cfg +++ /dev/null @@ -1,31 +0,0 @@ -choose-mirror-bin mirror/http/proxy string -d-i base-installer/kernel/override-image string linux-server -d-i clock-setup/utc boolean true -d-i clock-setup/utc-auto boolean true -d-i finish-install/reboot_in_progress note -d-i grub-installer/only_debian boolean true -d-i grub-installer/with_other_os boolean true -d-i partman-auto-lvm/guided_size string max -d-i partman-auto/choose_recipe select atomic -d-i partman-auto/method string lvm -d-i partman-lvm/confirm boolean true -d-i partman-lvm/confirm boolean true -d-i partman-lvm/confirm_nooverwrite boolean true -d-i partman-lvm/device_remove_lvm boolean true -d-i partman/choose_partition select finish -d-i partman/confirm boolean true -d-i partman/confirm_nooverwrite boolean true -d-i partman/confirm_write_new_label boolean true -d-i passwd/user-fullname string vagrant -d-i passwd/user-uid string 900 -d-i passwd/user-password password vagrant -d-i passwd/user-password-again password vagrant -d-i passwd/username string vagrant -d-i pkgsel/include string openssh-server cryptsetup build-essential libssl-dev libreadline-dev zlib1g-dev linux-source dkms nfs-common -d-i pkgsel/install-language-support boolean false -d-i pkgsel/update-policy select unattended-upgrades -d-i pkgsel/upgrade select full-upgrade -d-i time/zone string UTC -d-i user-setup/allow-password-weak boolean true -d-i user-setup/encrypt-home boolean false -tasksel tasksel/first multiselect standard, ubuntu-server diff --git a/packer/http/ubuntu-13.10/preseed.cfg b/packer/http/ubuntu-13.10/preseed.cfg deleted file mode 100644 index 0a4d4939b..000000000 --- a/packer/http/ubuntu-13.10/preseed.cfg +++ /dev/null @@ -1,31 +0,0 @@ -choose-mirror-bin mirror/http/proxy string -d-i base-installer/kernel/override-image string linux-server -d-i clock-setup/utc boolean true -d-i clock-setup/utc-auto boolean true -d-i finish-install/reboot_in_progress note -d-i grub-installer/only_debian boolean true -d-i grub-installer/with_other_os boolean true -d-i partman-auto-lvm/guided_size string max -d-i partman-auto/choose_recipe select atomic -d-i partman-auto/method string lvm -d-i partman-lvm/confirm boolean true -d-i partman-lvm/confirm boolean true -d-i partman-lvm/confirm_nooverwrite boolean true -d-i partman-lvm/device_remove_lvm boolean true -d-i partman/choose_partition select finish -d-i partman/confirm boolean true -d-i partman/confirm_nooverwrite boolean true -d-i partman/confirm_write_new_label boolean true -d-i passwd/user-fullname string vagrant -d-i passwd/user-uid string 900 -d-i passwd/user-password password vagrant -d-i passwd/user-password-again password vagrant -d-i passwd/username string vagrant -d-i pkgsel/include string openssh-server cryptsetup build-essential libssl-dev libreadline-dev zlib1g-dev linux-source dkms nfs-common -d-i pkgsel/install-language-support boolean false -d-i pkgsel/update-policy select unattended-upgrades -d-i pkgsel/upgrade select full-upgrade -d-i time/zone string UTC -d-i user-setup/allow-password-weak boolean true -d-i user-setup/encrypt-home boolean false -tasksel tasksel/first multiselect standard, ubuntu-server diff --git a/packer/ubuntu-13.10-amd64.json b/packer/ubuntu-13.10-amd64.json deleted file mode 100644 index b90e5148c..000000000 --- a/packer/ubuntu-13.10-amd64.json +++ /dev/null @@ -1,139 +0,0 @@ -{ - "builders": [ - { - "boot_command": [ - "<esc><wait>", - "<esc><wait>", - "<enter><wait>", - "/install/vmlinuz<wait>", - " auto<wait>", - " console-setup/ask_detect=false<wait>", - " console-setup/layoutcode=us<wait>", - " console-setup/modelcode=pc105<wait>", - " debconf/frontend=noninteractive<wait>", - " debian-installer=en_US<wait>", - " fb=false<wait>", - " initrd=/install/initrd.gz<wait>", - " kbd-chooser/method=us<wait>", - " keyboard-configuration/layout=USA<wait>", - " keyboard-configuration/variant=USA<wait>", - " locale=en_US<wait>", - " netcfg/get_domain=vm<wait>", - " netcfg/get_hostname=vagrant<wait>", - " noapic<wait>", - " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/ubuntu-13.10/preseed.cfg<wait>", - " -- <wait>", - "<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": 40960, - "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", - "guest_os_type": "Ubuntu_64", - "http_directory": "http", - "iso_checksum": "5dd72c694c3a7e06a3b4dd651ca26cfc70985004", - "iso_checksum_type": "sha1", - "iso_url": "{{user `mirror`}}/13.10/ubuntu-13.10-server-amd64.iso", - "output_directory": "packer-ubuntu-13.10-amd64-virtualbox", - "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "virtualbox-iso", - "vboxmanage": [ - [ - "modifyvm", - "{{.Name}}", - "--memory", - "384" - ], - [ - "modifyvm", - "{{.Name}}", - "--cpus", - "1" - ] - ], - "virtualbox_version_file": ".vbox_version", - "vm_name": "packer-ubuntu-13.10-amd64" - }, - { - "boot_command": [ - "<esc><wait>", - "<esc><wait>", - "<enter><wait>", - "/install/vmlinuz<wait>", - " auto<wait>", - " console-setup/ask_detect=false<wait>", - " console-setup/layoutcode=us<wait>", - " console-setup/modelcode=pc105<wait>", - " debconf/frontend=noninteractive<wait>", - " debian-installer=en_US<wait>", - " fb=false<wait>", - " initrd=/install/initrd.gz<wait>", - " kbd-chooser/method=us<wait>", - " keyboard-configuration/layout=USA<wait>", - " keyboard-configuration/variant=USA<wait>", - " locale=en_US<wait>", - " netcfg/get_domain=vm<wait>", - " netcfg/get_hostname=vagrant<wait>", - " noapic<wait>", - " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/ubuntu-13.10/preseed.cfg<wait>", - " -- <wait>", - "<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": 40960, - "guest_os_type": "ubuntu-64", - "http_directory": "http", - "iso_checksum": "5dd72c694c3a7e06a3b4dd651ca26cfc70985004", - "iso_checksum_type": "sha1", - "iso_url": "{{user `mirror`}}/13.10/ubuntu-13.10-server-amd64.iso", - "output_directory": "packer-ubuntu-13.10-amd64-vmware", - "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "tools_upload_flavor": "linux", - "type": "vmware-iso", - "vm_name": "packer-ubuntu-13.10-amd64", - "vmx_data": { - "cpuid.coresPerSocket": "1", - "memsize": "384", - "numvcpus": "1" - } - } - ], - "post-processors": [ - { - "output": "../builds/{{.Provider}}/opscode_ubuntu-13.10_chef-{{user `chef_version`}}.box", - "type": "vagrant" - } - ], - "provisioners": [ - { - "environment_vars": [ - "CHEF_VERSION={{user `chef_version`}}" - ], - "execute_command": "echo 'vagrant'|{{.Vars}} sudo -S -E bash '{{.Path}}'", - "scripts": [ - "scripts/ubuntu/update.sh", - "scripts/common/sshd.sh", - "scripts/ubuntu/networking.sh", - "scripts/ubuntu/sudoers.sh", - "scripts/common/vagrant.sh", - "scripts/common/vmtools.sh", - "scripts/common/chef.sh", - "scripts/ubuntu/cleanup.sh", - "scripts/common/minimize.sh" - ], - "type": "shell" - } - ], - "variables": { - "chef_version": "provisionerless", - "mirror": "http://releases.ubuntu.com" - } -} - diff --git a/packer/ubuntu-13.10-i386.json b/packer/ubuntu-13.10-i386.json deleted file mode 100644 index d3d3246f2..000000000 --- a/packer/ubuntu-13.10-i386.json +++ /dev/null @@ -1,139 +0,0 @@ -{ - "builders": [ - { - "boot_command": [ - "<esc><wait>", - "<esc><wait>", - "<enter><wait>", - "/install/vmlinuz<wait>", - " auto<wait>", - " console-setup/ask_detect=false<wait>", - " console-setup/layoutcode=us<wait>", - " console-setup/modelcode=pc105<wait>", - " debconf/frontend=noninteractive<wait>", - " debian-installer=en_US<wait>", - " fb=false<wait>", - " initrd=/install/initrd.gz<wait>", - " kbd-chooser/method=us<wait>", - " keyboard-configuration/layout=USA<wait>", - " keyboard-configuration/variant=USA<wait>", - " locale=en_US<wait>", - " netcfg/get_domain=vm<wait>", - " netcfg/get_hostname=vagrant<wait>", - " noapic<wait>", - " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/ubuntu-13.10/preseed.cfg<wait>", - " -- <wait>", - "<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": 40960, - "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", - "guest_os_type": "Ubuntu", - "http_directory": "http", - "iso_checksum": "2dda06d01d3ad495b53f7c03a4313b4af76a1c96", - "iso_checksum_type": "sha1", - "iso_url": "{{user `mirror`}}/13.10/ubuntu-13.10-server-i386.iso", - "output_directory": "packer-ubuntu-13.10-i386-virtualbox", - "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "virtualbox-iso", - "vboxmanage": [ - [ - "modifyvm", - "{{.Name}}", - "--memory", - "384" - ], - [ - "modifyvm", - "{{.Name}}", - "--cpus", - "1" - ] - ], - "virtualbox_version_file": ".vbox_version", - "vm_name": "packer-ubuntu-13.10-i386" - }, - { - "boot_command": [ - "<esc><wait>", - "<esc><wait>", - "<enter><wait>", - "/install/vmlinuz<wait>", - " auto<wait>", - " console-setup/ask_detect=false<wait>", - " console-setup/layoutcode=us<wait>", - " console-setup/modelcode=pc105<wait>", - " debconf/frontend=noninteractive<wait>", - " debian-installer=en_US<wait>", - " fb=false<wait>", - " initrd=/install/initrd.gz<wait>", - " kbd-chooser/method=us<wait>", - " keyboard-configuration/layout=USA<wait>", - " keyboard-configuration/variant=USA<wait>", - " locale=en_US<wait>", - " netcfg/get_domain=vm<wait>", - " netcfg/get_hostname=vagrant<wait>", - " noapic<wait>", - " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/ubuntu-13.10/preseed.cfg<wait>", - " -- <wait>", - "<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": 40960, - "guest_os_type": "ubuntu", - "http_directory": "http", - "iso_checksum": "2dda06d01d3ad495b53f7c03a4313b4af76a1c96", - "iso_checksum_type": "sha1", - "iso_url": "{{user `mirror`}}/13.10/ubuntu-13.10-server-i386.iso", - "output_directory": "packer-ubuntu-13.10-i386-vmware", - "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "tools_upload_flavor": "linux", - "type": "vmware-iso", - "vm_name": "packer-ubuntu-13.10-i386", - "vmx_data": { - "cpuid.coresPerSocket": "1", - "memsize": "384", - "numvcpus": "1" - } - } - ], - "post-processors": [ - { - "output": "../builds/{{.Provider}}/opscode_ubuntu-13.10-i386_chef-{{user `chef_version`}}.box", - "type": "vagrant" - } - ], - "provisioners": [ - { - "environment_vars": [ - "CHEF_VERSION={{user `chef_version`}}" - ], - "execute_command": "echo 'vagrant'|{{.Vars}} sudo -S -E bash '{{.Path}}'", - "scripts": [ - "scripts/ubuntu/update.sh", - "scripts/common/sshd.sh", - "scripts/ubuntu/networking.sh", - "scripts/ubuntu/sudoers.sh", - "scripts/common/vagrant.sh", - "scripts/common/vmtools.sh", - "scripts/common/chef.sh", - "scripts/ubuntu/cleanup.sh", - "scripts/common/minimize.sh" - ], - "type": "shell" - } - ], - "variables": { - "chef_version": "provisionerless", - "mirror": "http://releases.ubuntu.com" - } -} - From eff6c0eeff094decf773bee646f14c6155227878 Mon Sep 17 00:00:00 2001 From: "Julian C. Dunn" <jdunn@getchef.com> Date: Fri, 1 Aug 2014 12:35:30 -0400 Subject: [PATCH 0238/1622] Move EOL Ubuntu boxes to OLD-BOXES --- OLD-BOXES.md | 4 ++++ README.md | 4 ---- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/OLD-BOXES.md b/OLD-BOXES.md index c2f7bbe0f..f0785c6d9 100644 --- a/OLD-BOXES.md +++ b/OLD-BOXES.md @@ -16,6 +16,8 @@ Boxes for obsolete operating systems will be placed here. * [opscode-fedora-18](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_fedora-18_chef-provisionerless.box) * [opscode-ubuntu-13.04-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_ubuntu-13.04-i386_chef-provisionerless.box) * [opscode-ubuntu-13.04](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_ubuntu-13.04_chef-provisionerless.box) +* [opscode-ubuntu-13.10-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_ubuntu-13.10-i386_chef-provisionerless.box) +* [opscode-ubuntu-13.10](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_ubuntu-13.10_chef-provisionerless.box) ### VMWare @@ -27,6 +29,8 @@ Boxes for obsolete operating systems will be placed here. * [opscode-fedora-18](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_fedora-18_chef-provisionerless.box) * [opscode-ubuntu-13.04-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_ubuntu-13.04-i386_chef-provisionerless.box) * [opscode-ubuntu-13.04](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_ubuntu-13.04_chef-provisionerless.box) +* [opscode-ubuntu-13.10-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_ubuntu-13.10-i386_chef-provisionerless.box) +* [opscode-ubuntu-13.10](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_ubuntu-13.10_chef-provisionerless.box) Chef 11.4.4 ----------- diff --git a/README.md b/README.md index d554ad52f..f9bddd509 100644 --- a/README.md +++ b/README.md @@ -43,8 +43,6 @@ These baseboxes were all built using a Mac OS X host running VirtualBox 4.3.8, a * [opscode-ubuntu-12.04](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_ubuntu-12.04_chef-provisionerless.box) * [opscode-ubuntu-12.10-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_ubuntu-12.10-i386_chef-provisionerless.box) * [opscode-ubuntu-12.10](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_ubuntu-12.10_chef-provisionerless.box) -* [opscode-ubuntu-13.10-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_ubuntu-13.10-i386_chef-provisionerless.box) -* [opscode-ubuntu-13.10](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_ubuntu-13.10_chef-provisionerless.box) * [opscode-ubuntu-14.04-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_ubuntu-14.04-i386_chef-provisionerless.box) * [opscode-ubuntu-14.04](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_ubuntu-14.04_chef-provisionerless.box) @@ -74,8 +72,6 @@ The boxes should work unchanged in VMWare Workstation for Windows or Linux. * [opscode-ubuntu-12.04](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_ubuntu-12.04_chef-provisionerless.box) * [opscode-ubuntu-12.10-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_ubuntu-12.10-i386_chef-provisionerless.box) * [opscode-ubuntu-12.10](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_ubuntu-12.10_chef-provisionerless.box) -* [opscode-ubuntu-13.10-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_ubuntu-13.10-i386_chef-provisionerless.box) -* [opscode-ubuntu-13.10](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_ubuntu-13.10_chef-provisionerless.box) * [opscode-ubuntu-14.04-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_ubuntu-14.04-i386_chef-provisionerless.box) * [opscode-ubuntu-14.04](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_ubuntu-14.04_chef-provisionerless.box) From a85729c5f968079463bb0c7901418f9fe4ecfb68 Mon Sep 17 00:00:00 2001 From: "Julian C. Dunn" <jdunn@getchef.com> Date: Fri, 1 Aug 2014 12:37:35 -0400 Subject: [PATCH 0239/1622] Added OpenSuSE boxes to documentation. --- README.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/README.md b/README.md index f9bddd509..4e83c1a48 100644 --- a/README.md +++ b/README.md @@ -37,6 +37,8 @@ These baseboxes were all built using a Mac OS X host running VirtualBox 4.3.8, a * [opscode-freebsd-9.2-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_freebsd-9.2-i386_chef-provisionerless.box) * [opscode-freebsd-9.2](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_freebsd-9.2_chef-provisionerless.box) * [opscode-freebsd-10](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_freebsd-10.0_chef-provisionerless.box) +* [opscode-opensuse-13.1-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_opensuse-13.1-i386_chef-provisionerless.box) +* [opscode-opensuse-13.1](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_opensuse-13.1-x86_64_chef-provisionerless.box) * [opscode-ubuntu-10.04-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_ubuntu-10.04-i386_chef-provisionerless.box) * [opscode-ubuntu-10.04](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_ubuntu-10.04_chef-provisionerless.box) * [opscode-ubuntu-12.04-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_ubuntu-12.04-i386_chef-provisionerless.box) @@ -66,6 +68,8 @@ The boxes should work unchanged in VMWare Workstation for Windows or Linux. * [opscode-freebsd-9.2-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_freebsd-9.2-i386_chef-provisionerless.box) * [opscode-freebsd-9.2](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_freebsd-9.2_chef-provisionerless.box) * [opscode-freebsd-10](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_freebsd-10.0_chef-provisionerless.box) +* [opscode-opensuse-13.1-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_opensuse-13.1-i386_chef-provisionerless.box) +* [opscode-opensuse-13.1](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_opensuse-13.1-x86_64_chef-provisionerless.box) * [opscode-ubuntu-10.04-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_ubuntu-10.04-i386_chef-provisionerless.box) * [opscode-ubuntu-10.04](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_ubuntu-10.04_chef-provisionerless.box) * [opscode-ubuntu-12.04-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_ubuntu-12.04-i386_chef-provisionerless.box) From 82752ec38b0b7ff9f289a528e217a2b306ac3d0e Mon Sep 17 00:00:00 2001 From: Scott Hain <shain@getchef.com> Date: Thu, 31 Jul 2014 14:45:18 -0700 Subject: [PATCH 0240/1622] Implement Solaris 10 support. --- packer/floppy/solaris10/S99startup.sh | 53 ++++++++++ packer/floppy/solaris10/awesome_prof | 13 +++ packer/floppy/solaris10/finish.sh | 32 ++++++ packer/floppy/solaris10/rules.ok | 2 + packer/floppy/solaris10/sysidcfg | 10 ++ packer/scripts/solaris10/minimize.sh | 7 ++ packer/scripts/solaris10/post_install.sh | 4 + packer/scripts/solaris10/vmtools.sh | 40 ++++++++ packer/solaris-10-x86.json | 118 +++++++++++++++++++++++ 9 files changed, 279 insertions(+) create mode 100644 packer/floppy/solaris10/S99startup.sh create mode 100644 packer/floppy/solaris10/awesome_prof create mode 100644 packer/floppy/solaris10/finish.sh create mode 100644 packer/floppy/solaris10/rules.ok create mode 100644 packer/floppy/solaris10/sysidcfg create mode 100644 packer/scripts/solaris10/minimize.sh create mode 100644 packer/scripts/solaris10/post_install.sh create mode 100644 packer/scripts/solaris10/vmtools.sh create mode 100644 packer/solaris-10-x86.json diff --git a/packer/floppy/solaris10/S99startup.sh b/packer/floppy/solaris10/S99startup.sh new file mode 100644 index 000000000..24ecadc01 --- /dev/null +++ b/packer/floppy/solaris10/S99startup.sh @@ -0,0 +1,53 @@ +#!/bin/sh + +# BE VERY CAREFUL IN HERE +# IF ANY COMMAND FAILS, IT WILL NOT REPORT, NOR WILL IT CONTINUE EXECUTION + +# disable sshd so we wait for the rc script to aaaaaalmost finish before we +# try to connect via ssh +svcadm disable network/ssh + +# setup a home directory +mkdir /home + +# create user +groupadd vagrant +useradd -m -s /usr/bin/bash -d /home/vagrant -G vagrant vagrant + +# set password - there is no way to set a password non-interactively +perl -pi -e 's/vagrant:UP/vagrant:VrvarmJYR3SHs/g' /etc/shadow + +# set up ssh +mkdir /home/vagrant/.ssh +/usr/sfw/bin/wget --no-check-certificate 'https://raw.githubusercontent.com/mitchellh/vagrant/master/keys/vagrant.pub' -O /home/vagrant/.ssh/authorized_keys +chown -R vagrant /home/vagrant/.ssh +chmod -R go-rwsx /home/vagrant/.ssh + +# set up some ssh defaults +echo GSSAPIAuthentication no >> /etc/ssh/sshd_config +echo LookupClientHostnames no >> /etc/ssh/sshd_config + +# install pkgutil because yay +/usr/sfw/bin/wget --no-check-certificate 'http://get.opencsw.org/now' -O /tmp/pkgutil.pkg +echo "mail=\ninstance=overwrite\npartial=nocheck\nrunlevel=nocheck\nidepend=nocheck\nrdepend=nocheck\nspace=nocheck\nsetuid=nocheck\nconflict=nocheck\naction=nocheck\nbasedir=default" > /tmp/noask +pkgadd -a /tmp/noask -d /tmp/pkgutil.pkg all +rm -f /tmp/pkgutil.pkg + +# install sudo so that packer functions correctly +/opt/csw/bin/pkgutil -U +/opt/csw/bin/pkgutil -y -i sudo +echo "vagrant ALL=(ALL) NOPASSWD: ALL" >> /etc/opt/csw/sudoers +echo "Defaults secure_path=/opt/csw/bin:/usr/sfw/bin:/usr/bin:/usr/sbin:/bin:/sbin" +ln -s /opt/csw/bin/sudo /usr/bin/sudo + +# install scp so packer can copy stuff +/opt/csw/bin/pkgutil -y -i openssh_client + +# add the /opt/csw/lib libraries to the library path the nice way +crle -u -l /lib:/usr/lib:/opt/csw/lib + +# reenable ssh because we should be good to go now +svcadm enable network/ssh + +# delete ourself! +rm /etc/rc2.d/S99startup.sh diff --git a/packer/floppy/solaris10/awesome_prof b/packer/floppy/solaris10/awesome_prof new file mode 100644 index 000000000..583913ed8 --- /dev/null +++ b/packer/floppy/solaris10/awesome_prof @@ -0,0 +1,13 @@ +install_type initial_install +system_type standalone +cluster SUNWCrnet add +package SUNWwgetr add +package SUNWwgetu add +package SUNWsshdr add +package SUNWsshdu add +package SUNWsshcu add +package SUNWPython add +package SUNWgcmn add +package SUNWuiu8 add +package SUNWbash add +package SUNWtoo add diff --git a/packer/floppy/solaris10/finish.sh b/packer/floppy/solaris10/finish.sh new file mode 100644 index 000000000..e907eb9a5 --- /dev/null +++ b/packer/floppy/solaris10/finish.sh @@ -0,0 +1,32 @@ +#!/bin/sh -x + +BASE=/a + +# copy our postinstall rc script +cp /tmp/install_config/s99startup.sh /a/etc/rc2.d/S99startup.sh +chmod +x /a/etc/rc2.d/S99startup.sh + +# set up some paths for root (yeah some of these don't exist yet, but that's ok) +echo "if [ -f /etc/profile ]; then" >> /a/etc/skel/.bashrc +echo " . /etc/profile" >> /a/etc/skel/.bashrc +echo "fi" >> /a/etc/skel/.bashrc + +echo "if [ \"\$PS1\" ]; then" >> /a/etc/profile +echo " if [ \"\$BASH\" ]; then" >> /a/etc/profile +echo " PS1='\\u@\\h:\w\$ '" >> /a/etc/profile +echo " if [ -f /etc/bash.bashrc ]; then" >> /a/etc/profile +echo " . /etc/bash.bashrc" >> /a/etc/profile +echo " fi" >> /a/etc/profile +echo " else" >> /a/etc/profile +echo " if [ \"\`id -u\`\" -eq 0 ]; then" >> /a/etc/profile +echo " PS1='# '" >> /a/etc/profile +echo " else" >> /a/etc/profile +echo " PS1='\$ '" >> /a/etc/profile +echo " fi" >> /a/etc/profile +echo " fi" >> /a/etc/profile +echo "fi" >> /a/etc/profile +echo "PATH=/opt/csw/bin:/usr/local/bin:/usr/sfw/bin:/usr/sbin:/usr/bin:\$PATH" >> /a/etc/profile +echo "export PATH" >> /a/etc/profile + +echo "PATH=/opt/csw/bin:/usr/local/bin:/usr/sfw/bin:/usr/sbin:/usr/bin" >> /a/etc/default/login +echo "SUPATH=/opt/csw/bin:/usr/local/bin:/usr/sfw/bin:/usr/sbin:/usr/bin" >> /a/etc/default/login diff --git a/packer/floppy/solaris10/rules.ok b/packer/floppy/solaris10/rules.ok new file mode 100644 index 000000000..0748e7cb9 --- /dev/null +++ b/packer/floppy/solaris10/rules.ok @@ -0,0 +1,2 @@ +any - - awesome_prof finish.sh +# version=2 checksum=453256326 diff --git a/packer/floppy/solaris10/sysidcfg b/packer/floppy/solaris10/sysidcfg new file mode 100644 index 000000000..633c6dda1 --- /dev/null +++ b/packer/floppy/solaris10/sysidcfg @@ -0,0 +1,10 @@ +keyboard=US-English +timezone=UTC +auto_reg=disable +network_interface=PRIMARY + {dhcp protocol_ipv6=yes} +nfs4_domain=dynamic +root_password=$1$MrZPBLgm$Gj2Ofw3ca2eKiIVB72zeL/ +system_locale=en_US +security_policy=NONE +name_service=NONE diff --git a/packer/scripts/solaris10/minimize.sh b/packer/scripts/solaris10/minimize.sh new file mode 100644 index 000000000..5c0f7d394 --- /dev/null +++ b/packer/scripts/solaris10/minimize.sh @@ -0,0 +1,7 @@ +#!/bin/sh -ux + +dd if=/dev/zero of=/EMPTY bs=344064 +rm -f /EMPTY +# Block until the empty file has been removed, otherwise, Packer +# will try to kill the box while the disk is still full and that's bad +sync diff --git a/packer/scripts/solaris10/post_install.sh b/packer/scripts/solaris10/post_install.sh new file mode 100644 index 000000000..09f0c8139 --- /dev/null +++ b/packer/scripts/solaris10/post_install.sh @@ -0,0 +1,4 @@ +#!/bin/bash -eux + +# we're going to need gtar since solaris default tar is less than full featured +pkgutil -y -i gtar diff --git a/packer/scripts/solaris10/vmtools.sh b/packer/scripts/solaris10/vmtools.sh new file mode 100644 index 000000000..cb84f57cb --- /dev/null +++ b/packer/scripts/solaris10/vmtools.sh @@ -0,0 +1,40 @@ +#!/bin/bash -eux + +# Add pkgadd auto-answer file +echo "mail=" > /tmp/nocheck +echo "instance=overwrite" >> /tmp/nocheck +echo "partial=nocheck" >> /tmp/nocheck +echo "runlevel=nocheck" >> /tmp/nocheck +echo "idepend=nocheck" >> /tmp/nocheck +echo "rdepend=nocheck" >> /tmp/nocheck +echo "space=nocheck" >> /tmp/nocheck +echo "setuid=nocheck" >> /tmp/nocheck +echo "conflict=nocheck" >> /tmp/nocheck +echo "action=nocheck" >> /tmp/nocheck +echo "basedir=default" >> /tmp/nocheck + +echo "all" > /tmp/allfiles + +if [ -f /home/vagrant/.vbox_version ]; then + mkdir /tmp/vbox + VER=$(cat /home/vagrant/.vbox_version) + mkdir /cdrom + VBGADEV=`lofiadm -a /home/vagrant/VBoxGuestAdditions.iso` + mount -o ro -F hsfs $VBGADEV /cdrom + pkgadd -a /tmp/nocheck -d /cdrom/VBoxSolarisAdditions.pkg < /tmp/allfiles + umount /cdrom + lofiadm -d $VBGADEV + rm -f /home/vagrant/VBoxGuestAdditions.iso +else + VMTOOLSDEV=`/usr/sbin/lofiadm -a /home/vagrant/solaris.iso` + mkdir /cdrom + mount -o ro -F hsfs $VMTOOLSDEV /cdrom + mkdir /tmp/vmfusion-archive + gtar zxvf /cdrom/vmware-solaris-tools.tar.gz -C /tmp/vmfusion-archive + /tmp/vmfusion-archive/vmware-tools-distrib/vmware-install.pl --default + umount /cdrom + lofiadm -d $VMTOOLSDEV + rm -rf /mnt/vmtools + rm -rf /tmp/vmfusion-archive + rm -f /home/vagrant/solaris.iso +fi diff --git a/packer/solaris-10-x86.json b/packer/solaris-10-x86.json new file mode 100644 index 000000000..99b9a895a --- /dev/null +++ b/packer/solaris-10-x86.json @@ -0,0 +1,118 @@ +{ + "variables": { + "README": "You must download the automated installer iso from the following page, and then place it somewhere that packer can fetch it", + "DOWNLOAD_SITE": "http://www.oracle.com/technetwork/server-storage/solaris10/downloads/index.html", + "mirror": "./packer_cache", + "chef_version": "provisionerless" + }, + "provisioners": [ + { + "type": "shell", + "execute_command": "/opt/csw/bin/sudo {{.Path}}", + "scripts": [ + "scripts/solaris10/post_install.sh", + "scripts/solaris10/vmtools.sh", + "scripts/solaris10/minimize.sh" + ] + } + ], + "builders": [ + { + "type": "virtualbox-iso", + "boot_command": [ + "e", + "e", + "<left><left><left><left><left><left><left><left><left><left>", + "<left><left><left><left><left><left><left><left><left><left>", + "<left><left><left>", + " - install<enter>", + "b" + ], + "floppy_files": [ + "floppy/solaris10/sysidcfg", + "floppy/solaris10/awesome_prof", + "floppy/solaris10/rules.ok", + "floppy/solaris10/S99startup.sh", + "floppy/solaris10/finish.sh" + ], + "boot_wait": "5s", + "disk_size": 15360, + "guest_os_type": "Solaris_64", + "http_directory": "http/solaris-10", + "iso_checksum": "aae1452bb3d56baa3dcb8866ce7e4a08", + "iso_checksum_type": "md5", + "iso_url": "{{user `mirror`}}/sol-10-u11-ga-x86-dvd.iso", + "ssh_username": "vagrant", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_wait_timeout": "50000s", + "shutdown_command": "/opt/csw/bin/sudo /usr/sbin/init 5", + "shutdown_timeout": "10m", + "guest_additions_mode": "upload", + "virtualbox_version_file": ".vbox_version", + "vm_name": "packer-solaris-10u11-x86_64", + "output_directory": "packer-solaris-10u11-x86_64-virtualbox", + "vboxmanage": [ + [ + "modifyvm", + "{{.Name}}", + "--memory", + "1536" + ], + [ + "modifyvm", + "{{.Name}}", + "--cpus", + "1" + ] + ] + }, + { + "type": "vmware-iso", + "boot_command": [ + "e", + "e", + "<left><left><left><left><left><left><left><left><left><left>", + "<left><left><left><left><left><left><left><left><left><left>", + "<left><left><left>", + " - install<enter>", + "b" + ], + "floppy_files": [ + "floppy/solaris10/sysidcfg", + "floppy/solaris10/awesome_prof", + "floppy/solaris10/rules.ok", + "floppy/solaris10/S99startup.sh", + "floppy/solaris10/finish.sh" + ], + "boot_wait": "5s", + "disk_size": 15360, + "guest_os_type": "solaris10-64", + "http_directory": "http/solaris-10", + "iso_checksum": "aae1452bb3d56baa3dcb8866ce7e4a08", + "iso_checksum_type": "md5", + "iso_url": "{{user `mirror`}}/sol-10-u11-ga-x86-dvd.iso", + "ssh_username": "vagrant", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_wait_timeout": "50000s", + "shutdown_command": "/opt/csw/bin/sudo /usr/sbin/init 5", + "shutdown_timeout": "10m", + "vm_name": "packer-solaris-10u11-x86_64", + "output_directory": "packer-solaris-10u11-x86_64-virtualbox", + "tools_upload_flavor": "solaris", + "tools_upload_path": "/home/vagrant/solaris.iso", + "vmx_data": { + "cpuid.coresPerSocket": "1", + "memsize": "1536", + "numvcpus": "1" + } + } + ], + "post-processors": [ + { + "output": "../builds/{{.Provider}}/opscode_solaris-10.11_chef-{{user `chef_version`}}.box", + "type": "vagrant" + } + ] +} From 598bbd349ba3c67202992227440879e39be408e0 Mon Sep 17 00:00:00 2001 From: Jonathan Hartman <j@p4nt5.com> Date: Tue, 5 Aug 2014 21:58:16 -0700 Subject: [PATCH 0241/1622] Add OS X VirtualBox builders --- README.md | 4 +- packer/macosx-10.7.json | 55 ++++++++++++++++++++++++++ packer/macosx-10.8.json | 55 ++++++++++++++++++++++++++ packer/macosx-10.9.json | 55 ++++++++++++++++++++++++++ packer/vagrantfile_templates/macosx.rb | 5 +++ 5 files changed, 172 insertions(+), 2 deletions(-) create mode 100644 packer/vagrantfile_templates/macosx.rb diff --git a/README.md b/README.md index 4e83c1a48..25f209bf5 100644 --- a/README.md +++ b/README.md @@ -109,14 +109,14 @@ Mac OS X (10.7, 10.8, and 10.9), Red Hat Enterprise Linux, and SUSE Linux Enterp #### Mac OS X Boxes -Mac OS X builds are supported for VMware only. We would welcome a contribution to add VirtualBox support. - To build a Mac OS X box, you will need to start with an installer for your desired version of OS X. You will then need to use [Tim Sutton's osx-vm-templates](https://github.com/timsutton/osx-vm-templates)/) to modify that installer for use by packer. The output of that build will include the location of the ISO and its checksum, which you can substitute into your `packer build` command, e.g.: $ packer build -var 'iso_checksum=<checksum>' -var 'iso_url=<iso_url>' macosx-10.9.json There is a known issue where [test-kitchen](http://kitchen.ci/) starts a Mac OS X box correctly, but `vagrant up` fails due to the absence of the HGFS kernel module. This is due to a silent failure during the VMware tools installation and can be corrected by installing the VMware tools on the Mac OS X box manually. +Note that, while it is possible to build OS X boxes for VirtualBox, it may not be ideal. VirtualBox provides no "guest additions" for OS X. Boxes consequently have limited networking configurability and must rely on rsync for folder syncing. VMWare, when available, is generally preferred. + ### Windows Boxes Packer does not yet support Windows, so veewee definitions are still used for building those boxes. You must build these diff --git a/packer/macosx-10.7.json b/packer/macosx-10.7.json index 47ecb0f48..462cb6ecd 100644 --- a/packer/macosx-10.7.json +++ b/packer/macosx-10.7.json @@ -1,4 +1,5 @@ { + "min_packer_version": "0.6.0", "variables": { "autologin_vagrant_user": "", "iso_url": "http://fakeurl/OSX_InstallESD_10.7.5_11G63.dmg", @@ -64,11 +65,65 @@ "ehci.present": "TRUE", "usb.present": "TRUE" } + }, + { + "boot_wait": "2s", + "disk_size": 20480, + "guest_additions_mode": "disable", + "guest_os_type": "MacOS107_64", + "hard_drive_interface": "sata", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "md5", + "iso_url": "{{user `iso_url`}}", + "output_directory": "packer-macosx-10.7-virtualbox", + "shutdown_command": "echo 'vagrant'|sudo -S shutdown -h now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "virtualbox-iso", + "vm_name": "packer-macosx-10.7-virtualbox", + "vboxmanage": [ + ["modifyvm", "{{.Name}}", "--audiocontroller", "hda"], + ["modifyvm", "{{.Name}}", "--boot1", "dvd"], + ["modifyvm", "{{.Name}}", "--boot2", "disk"], + ["modifyvm", "{{.Name}}", "--chipset", "ich9"], + ["modifyvm", "{{.Name}}", "--cpus", "1"], + ["modifyvm", "{{.Name}}", "--firmware", "efi"], + ["modifyvm", "{{.Name}}", "--hpet", "on"], + ["modifyvm", "{{.Name}}", "--keyboard", "usb"], + ["modifyvm", "{{.Name}}", "--memory", "2048"], + ["modifyvm", "{{.Name}}", "--mouse", "usbtablet"], + ["modifyvm", "{{.Name}}", "--vram", "9"], + [ + "storageattach", "{{.Name}}", + "--storagectl", "SATA Controller", + "--port", "1", + "--type", "dvddrive", + "--medium", "{{user `iso_url`}}" + ] + ], + "vboxmanage_post": [ + [ + "storageattach", "{{.Name}}", + "--storagectl", "SATA Controller", + "--port", "1", + "--type", "dvddrive", + "--medium", "none" + ], + [ + "storagectl", "{{.Name}}", + "--name", "IDE Controller", + "--remove" + ] + ], + "virtualbox_version_file": ".vbox_version" } ], "post-processors": [ { "type": "vagrant", + "vagrantfile_template": "vagrantfile_templates/macosx.rb", "output": "../builds/{{.Provider}}/opscode_macosx-10.7_chef-{{user `chef_version`}}.box" } ] diff --git a/packer/macosx-10.8.json b/packer/macosx-10.8.json index 1b6a50d5a..32c4ccc5f 100644 --- a/packer/macosx-10.8.json +++ b/packer/macosx-10.8.json @@ -1,4 +1,5 @@ { + "min_packer_version": "0.6.0", "variables": { "autologin_vagrant_user": "", "iso_url": "http://fakeurl/OSX_InstallESD_10.8.5_12F45.dmg", @@ -64,11 +65,65 @@ "ehci.present": "TRUE", "usb.present": "TRUE" } + }, + { + "boot_wait": "2s", + "disk_size": 20480, + "guest_additions_mode": "disable", + "guest_os_type": "MacOS108_64", + "hard_drive_interface": "sata", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "md5", + "iso_url": "{{user `iso_url`}}", + "output_directory": "packer-macosx-10.8-virtualbox", + "shutdown_command": "echo 'vagrant'|sudo -S shutdown -h now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "virtualbox-iso", + "vm_name": "packer-macosx-10.8-virtualbox", + "vboxmanage": [ + ["modifyvm", "{{.Name}}", "--audiocontroller", "hda"], + ["modifyvm", "{{.Name}}", "--boot1", "dvd"], + ["modifyvm", "{{.Name}}", "--boot2", "disk"], + ["modifyvm", "{{.Name}}", "--chipset", "ich9"], + ["modifyvm", "{{.Name}}", "--cpus", "1"], + ["modifyvm", "{{.Name}}", "--firmware", "efi"], + ["modifyvm", "{{.Name}}", "--hpet", "on"], + ["modifyvm", "{{.Name}}", "--keyboard", "usb"], + ["modifyvm", "{{.Name}}", "--memory", "2048"], + ["modifyvm", "{{.Name}}", "--mouse", "usbtablet"], + ["modifyvm", "{{.Name}}", "--vram", "9"], + [ + "storageattach", "{{.Name}}", + "--storagectl", "SATA Controller", + "--port", "1", + "--type", "dvddrive", + "--medium", "{{user `iso_url`}}" + ] + ], + "vboxmanage_post": [ + [ + "storageattach", "{{.Name}}", + "--storagectl", "SATA Controller", + "--port", "1", + "--type", "dvddrive", + "--medium", "none" + ], + [ + "storagectl", "{{.Name}}", + "--name", "IDE Controller", + "--remove" + ] + ], + "virtualbox_version_file": ".vbox_version" } ], "post-processors": [ { "type": "vagrant", + "vagrantfile_template": "vagrantfile_templates/macosx.rb", "output": "../builds/{{.Provider}}/opscode_macosx-10.8_chef-{{user `chef_version`}}.box" } ] diff --git a/packer/macosx-10.9.json b/packer/macosx-10.9.json index 079c41ba1..55db87257 100644 --- a/packer/macosx-10.9.json +++ b/packer/macosx-10.9.json @@ -1,4 +1,5 @@ { + "min_packer_version": "0.6.0", "variables": { "autologin_vagrant_user": "", "iso_url": "http://fakeurl/OSX_InstallESD_10.9.1_13B42.dmg", @@ -64,11 +65,65 @@ "ehci.present": "TRUE", "usb.present": "TRUE" } + }, + { + "boot_wait": "2s", + "disk_size": 20480, + "guest_additions_mode": "disable", + "guest_os_type": "MacOS109_64", + "hard_drive_interface": "sata", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "md5", + "iso_url": "{{user `iso_url`}}", + "output_directory": "packer-macosx-10.9-virtualbox", + "shutdown_command": "echo 'vagrant'|sudo -S shutdown -h now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "virtualbox-iso", + "vm_name": "packer-macosx-10.9-virtualbox", + "vboxmanage": [ + ["modifyvm", "{{.Name}}", "--audiocontroller", "hda"], + ["modifyvm", "{{.Name}}", "--boot1", "dvd"], + ["modifyvm", "{{.Name}}", "--boot2", "disk"], + ["modifyvm", "{{.Name}}", "--chipset", "ich9"], + ["modifyvm", "{{.Name}}", "--cpus", "1"], + ["modifyvm", "{{.Name}}", "--firmware", "efi"], + ["modifyvm", "{{.Name}}", "--hpet", "on"], + ["modifyvm", "{{.Name}}", "--keyboard", "usb"], + ["modifyvm", "{{.Name}}", "--memory", "2048"], + ["modifyvm", "{{.Name}}", "--mouse", "usbtablet"], + ["modifyvm", "{{.Name}}", "--vram", "9"], + [ + "storageattach", "{{.Name}}", + "--storagectl", "SATA Controller", + "--port", "1", + "--type", "dvddrive", + "--medium", "{{user `iso_url`}}" + ] + ], + "vboxmanage_post": [ + [ + "storageattach", "{{.Name}}", + "--storagectl", "SATA Controller", + "--port", "1", + "--type", "dvddrive", + "--medium", "none" + ], + [ + "storagectl", "{{.Name}}", + "--name", "IDE Controller", + "--remove" + ] + ], + "virtualbox_version_file": ".vbox_version" } ], "post-processors": [ { "type": "vagrant", + "vagrantfile_template": "vagrantfile_templates/macosx.rb", "output": "../builds/{{.Provider}}/opscode_macosx-10.9_chef-{{user `chef_version`}}.box" } ] diff --git a/packer/vagrantfile_templates/macosx.rb b/packer/vagrantfile_templates/macosx.rb new file mode 100644 index 000000000..9bf0fc693 --- /dev/null +++ b/packer/vagrantfile_templates/macosx.rb @@ -0,0 +1,5 @@ +Vagrant.configure('2') do |config| + config.vm.provider 'virtualbox' do |_, override| + override.vm.synced_folder '.', '/vagrant', type: 'rsync' + end +end From c9e6118500ae0fecff6fd4296e8cf0a266177b03 Mon Sep 17 00:00:00 2001 From: Jonathan Hartman <j@p4nt5.com> Date: Wed, 6 Aug 2014 15:19:40 -0700 Subject: [PATCH 0242/1622] Update version of Packer used by Travis --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 35c51b3c1..1bb68ec43 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,7 @@ rvm: - 2.0.0 -before_install: wget --no-check-certificate https://dl.bintray.com/mitchellh/packer/0.5.2_linux_amd64.zip && unzip -d packer 0.5.2_linux_amd64.zip +before_install: wget --no-check-certificate https://dl.bintray.com/mitchellh/packer/0.6.1_linux_amd64.zip && unzip -d packer 0.6.1_linux_amd64.zip before_script: export PATH=$PATH:$PWD/packer script: bundle exec thor packer:validate From 550bb586b58fd49603c5ac85e9da43c25eb50b3a Mon Sep 17 00:00:00 2001 From: "Eric G. Wolfe" <eric.wolfe@gmail.com> Date: Mon, 4 Aug 2014 12:02:15 -0400 Subject: [PATCH 0243/1622] update SLES url --- packer/sles-11-sp2-x86_64.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/packer/sles-11-sp2-x86_64.json b/packer/sles-11-sp2-x86_64.json index 456ffc766..7336429b5 100644 --- a/packer/sles-11-sp2-x86_64.json +++ b/packer/sles-11-sp2-x86_64.json @@ -89,7 +89,6 @@ "scripts/common/vmtools.sh", "scripts/common/chef.sh", "scripts/sles/sudoers.sh", - "scripts/sles/zypper-locks.sh", "scripts/sles/remove-dvd-source.sh", "scripts/common/minimize.sh" ], @@ -98,7 +97,7 @@ ], "variables": { "chef_version": "provisionerless", - "mirror": "http://cdn2.novell.com/free/h0AOp5AT-18~" + "mirror": "http://cdn.novell.com/free/h0AOp5AT-18~" } } From c9dafcdf5c1f2c1d1d2d41ad9f5fab419e8049cf Mon Sep 17 00:00:00 2001 From: "Julian C. Dunn" <jdunn@getchef.com> Date: Thu, 21 Aug 2014 11:35:24 -0400 Subject: [PATCH 0244/1622] Update Debian 6.0.9 to 6.0.10 --- ...0.9-amd64.json => debian-6.0.10-amd64.json} | 18 +++++++++--------- ...6.0.9-i386.json => debian-6.0.10-i386.json} | 18 +++++++++--------- 2 files changed, 18 insertions(+), 18 deletions(-) rename packer/{debian-6.0.9-amd64.json => debian-6.0.10-amd64.json} (84%) rename packer/{debian-6.0.9-i386.json => debian-6.0.10-i386.json} (84%) diff --git a/packer/debian-6.0.9-amd64.json b/packer/debian-6.0.10-amd64.json similarity index 84% rename from packer/debian-6.0.9-amd64.json rename to packer/debian-6.0.10-amd64.json index 45b675c5b..17b51d812 100644 --- a/packer/debian-6.0.9-amd64.json +++ b/packer/debian-6.0.10-amd64.json @@ -28,10 +28,10 @@ "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "guest_os_type": "Debian_64", "http_directory": "http", - "iso_checksum": "3f3ec3e1adb4c2904a1234799f4775c10cf47cce", + "iso_checksum": "f3e70528664f174a121b26491c59cd66daaf8274", "iso_checksum_type": "sha1", - "iso_url": "{{user `mirror`}}/6.0.9/amd64/iso-cd/debian-6.0.9-amd64-CD-1.iso", - "output_directory": "packer-debian-6.0.9-amd64-virtualbox", + "iso_url": "{{user `mirror`}}/6.0.10/amd64/iso-cd/debian-6.0.10-amd64-CD-1.iso", + "output_directory": "packer-debian-6.0.10-amd64-virtualbox", "shutdown_command": "echo 'vagrant'|sudo -S /sbin/shutdown -hP now", "ssh_password": "vagrant", "ssh_port": 22, @@ -42,7 +42,7 @@ [ "modifyvm", "{{.Name}}", "--cpus", "1" ] ], "virtualbox_version_file": ".vbox_version", - "vm_name": "packer-debian-6.0.9-amd64" + "vm_name": "packer-debian-6.0.10-amd64" }, { "type": "vmware-iso", @@ -67,17 +67,17 @@ "disk_size": 40960, "guest_os_type": "debian5-64", "http_directory": "http", - "iso_checksum": "3f3ec3e1adb4c2904a1234799f4775c10cf47cce", + "iso_checksum": "f3e70528664f174a121b26491c59cd66daaf8274", "iso_checksum_type": "sha1", - "iso_url": "{{user `mirror`}}/6.0.9/amd64/iso-cd/debian-6.0.9-amd64-CD-1.iso", - "output_directory": "packer-debian-6.0.9-amd64-vmware", + "iso_url": "{{user `mirror`}}/6.0.10/amd64/iso-cd/debian-6.0.10-amd64-CD-1.iso", + "output_directory": "packer-debian-6.0.10-amd64-vmware", "shutdown_command": "echo 'vagrant'|sudo -S /sbin/shutdown -hP now", "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", "tools_upload_flavor": "linux", - "vm_name": "packer-debian-6.0.9-amd64", + "vm_name": "packer-debian-6.0.10-amd64", "vmx_data": { "cpuid.coresPerSocket": "1", "memsize": "384", @@ -88,7 +88,7 @@ "post-processors": [ { "type": "vagrant", - "output": "../builds/{{.Provider}}/opscode_debian-6.0.9_chef-{{user `chef_version`}}.box" + "output": "../builds/{{.Provider}}/opscode_debian-6.0.10_chef-{{user `chef_version`}}.box" } ], "provisioners": [ diff --git a/packer/debian-6.0.9-i386.json b/packer/debian-6.0.10-i386.json similarity index 84% rename from packer/debian-6.0.9-i386.json rename to packer/debian-6.0.10-i386.json index 0aeb38341..9db2dc748 100644 --- a/packer/debian-6.0.9-i386.json +++ b/packer/debian-6.0.10-i386.json @@ -28,10 +28,10 @@ "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "guest_os_type": "Debian", "http_directory": "http", - "iso_checksum": "bc2886211bce0e9c54bdf779f21a35d5e5a122fd", + "iso_checksum": "e8f77720e30f669e731fe3166ad6c3d2da33d93a", "iso_checksum_type": "sha1", - "iso_url": "{{user `mirror`}}/6.0.9/i386/iso-cd/debian-6.0.9-i386-CD-1.iso", - "output_directory": "packer-debian-6.0.9-i386-virtualbox", + "iso_url": "{{user `mirror`}}/6.0.10/i386/iso-cd/debian-6.0.10-i386-CD-1.iso", + "output_directory": "packer-debian-6.0.10-i386-virtualbox", "shutdown_command": "echo 'vagrant'|sudo -S /sbin/shutdown -hP now", "ssh_password": "vagrant", "ssh_port": 22, @@ -42,7 +42,7 @@ [ "modifyvm", "{{.Name}}", "--cpus", "1" ] ], "virtualbox_version_file": ".vbox_version", - "vm_name": "packer-debian-6.0.9-i386" + "vm_name": "packer-debian-6.0.10-i386" }, { "type": "vmware-iso", @@ -67,17 +67,17 @@ "disk_size": 40960, "guest_os_type": "debian5", "http_directory": "http", - "iso_checksum": "bc2886211bce0e9c54bdf779f21a35d5e5a122fd", + "iso_checksum": "e8f77720e30f669e731fe3166ad6c3d2da33d93a", "iso_checksum_type": "sha1", - "iso_url": "{{user `mirror`}}/6.0.9/i386/iso-cd/debian-6.0.9-i386-CD-1.iso", - "output_directory": "packer-debian-6.0.9-i386-vmware", + "iso_url": "{{user `mirror`}}/6.0.10/i386/iso-cd/debian-6.0.10-i386-CD-1.iso", + "output_directory": "packer-debian-6.0.10-i386-vmware", "shutdown_command": "echo 'vagrant'|sudo -S /sbin/shutdown -hP now", "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", "tools_upload_flavor": "linux", - "vm_name": "packer-debian-6.0.9-i386", + "vm_name": "packer-debian-6.0.10-i386", "vmx_data": { "cpuid.coresPerSocket": "1", "memsize": "384", @@ -88,7 +88,7 @@ "post-processors": [ { "type": "vagrant", - "output": "../builds/{{.Provider}}/opscode_debian-6.0.9-i386_chef-{{user `chef_version`}}.box" + "output": "../builds/{{.Provider}}/opscode_debian-6.0.10-i386_chef-{{user `chef_version`}}.box" } ], "provisioners": [ From ce9806be1947773c8e375e7338b5c05559deb0cc Mon Sep 17 00:00:00 2001 From: "Julian C. Dunn" <jdunn@getchef.com> Date: Fri, 22 Aug 2014 18:31:16 -0400 Subject: [PATCH 0245/1622] Updated to Ubuntu 12.04.5 LTS. --- packer/ubuntu-12.04-amd64.json | 8 ++++---- packer/ubuntu-12.04-i386.json | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/packer/ubuntu-12.04-amd64.json b/packer/ubuntu-12.04-amd64.json index 241efd3b1..b2313f9b4 100644 --- a/packer/ubuntu-12.04-amd64.json +++ b/packer/ubuntu-12.04-amd64.json @@ -30,9 +30,9 @@ "guest_additions_path": "VBoxGuestAdditions_{{ .Version }}.iso", "guest_os_type": "Ubuntu_64", "http_directory": "http", - "iso_checksum": "b802bb065df98c0530d782eb94778c2da19e10d6", + "iso_checksum": "7540ace2d6cdee264432f5ed987236d32edef798", "iso_checksum_type": "sha1", - "iso_url": "{{user `mirror`}}/12.04/ubuntu-12.04.4-server-amd64.iso", + "iso_url": "{{user `mirror`}}/12.04/ubuntu-12.04.5-server-amd64.iso", "output_directory": "packer-ubuntu-12.04-amd64-virtualbox", "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", "ssh_password": "vagrant", @@ -86,9 +86,9 @@ "disk_size": 40960, "guest_os_type": "ubuntu-64", "http_directory": "http", - "iso_checksum": "b802bb065df98c0530d782eb94778c2da19e10d6", + "iso_checksum": "7540ace2d6cdee264432f5ed987236d32edef798", "iso_checksum_type": "sha1", - "iso_url": "{{user `mirror`}}/12.04/ubuntu-12.04.4-server-amd64.iso", + "iso_url": "{{user `mirror`}}/12.04/ubuntu-12.04.5-server-amd64.iso", "output_directory": "packer-ubuntu-12.04-amd64-vmware", "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", "ssh_password": "vagrant", diff --git a/packer/ubuntu-12.04-i386.json b/packer/ubuntu-12.04-i386.json index 5d1aba656..5e40a41f5 100644 --- a/packer/ubuntu-12.04-i386.json +++ b/packer/ubuntu-12.04-i386.json @@ -30,9 +30,9 @@ "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "guest_os_type": "Ubuntu", "http_directory": "http", - "iso_checksum": "3bae12e315c89d42d7bf571e4e35efce585c7624", + "iso_checksum": "a34c224b7fe72a2f5c768be5afee5c53817743fd", "iso_checksum_type": "sha1", - "iso_url": "{{user `mirror`}}/12.04/ubuntu-12.04.4-server-i386.iso", + "iso_url": "{{user `mirror`}}/12.04/ubuntu-12.04.5-server-i386.iso", "output_directory": "packer-ubuntu-12.04-i386-virtualbox", "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", "ssh_password": "vagrant", @@ -86,9 +86,9 @@ "disk_size": 40960, "guest_os_type": "ubuntu", "http_directory": "http", - "iso_checksum": "3bae12e315c89d42d7bf571e4e35efce585c7624", + "iso_checksum": "a34c224b7fe72a2f5c768be5afee5c53817743fd", "iso_checksum_type": "sha1", - "iso_url": "{{user `mirror`}}/12.04/ubuntu-12.04.4-server-i386.iso", + "iso_url": "{{user `mirror`}}/12.04/ubuntu-12.04.5-server-i386.iso", "output_directory": "packer-ubuntu-12.04-i386-vmware", "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", "ssh_password": "vagrant", From d528f4e8744e9a669721a829d059ed09e92477c7 Mon Sep 17 00:00:00 2001 From: "Julian C. Dunn" <jdunn@getchef.com> Date: Fri, 22 Aug 2014 18:37:45 -0400 Subject: [PATCH 0246/1622] Ubuntu 12.10 is end-of-life as of May 16, 2014: https://wiki.ubuntu.com/Releases --- OLD-BOXES.md | 4 ++++ README.md | 8 ++------ 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/OLD-BOXES.md b/OLD-BOXES.md index f0785c6d9..810628bd3 100644 --- a/OLD-BOXES.md +++ b/OLD-BOXES.md @@ -14,6 +14,8 @@ Boxes for obsolete operating systems will be placed here. * [opscode-debian-7.2.0](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_debian-7.2.0_chef-provisionerless.box) * [opscode-fedora-18-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_fedora-18-i386_chef-provisionerless.box) * [opscode-fedora-18](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_fedora-18_chef-provisionerless.box) +* [opscode-ubuntu-12.10-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_ubuntu-12.10-i386_chef-provisionerless.box) +* [opscode-ubuntu-12.10](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_ubuntu-12.10_chef-provisionerless.box) * [opscode-ubuntu-13.04-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_ubuntu-13.04-i386_chef-provisionerless.box) * [opscode-ubuntu-13.04](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_ubuntu-13.04_chef-provisionerless.box) * [opscode-ubuntu-13.10-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_ubuntu-13.10-i386_chef-provisionerless.box) @@ -27,6 +29,8 @@ Boxes for obsolete operating systems will be placed here. * [opscode-debian-7.2.0](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_debian-7.2.0_chef-provisionerless.box) * [opscode-fedora-18-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_fedora-18-i386_chef-provisionerless.box) * [opscode-fedora-18](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_fedora-18_chef-provisionerless.box) +* [opscode-ubuntu-12.10-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_ubuntu-12.10-i386_chef-provisionerless.box) +* [opscode-ubuntu-12.10](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_ubuntu-12.10_chef-provisionerless.box) * [opscode-ubuntu-13.04-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_ubuntu-13.04-i386_chef-provisionerless.box) * [opscode-ubuntu-13.04](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_ubuntu-13.04_chef-provisionerless.box) * [opscode-ubuntu-13.10-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_ubuntu-13.10-i386_chef-provisionerless.box) diff --git a/README.md b/README.md index 25f209bf5..2286f2a8a 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ Bento is a project that encapsulates [Packer](http://packer.io) templates for building [Vagrant](http://vagrantup.com) baseboxes. We use these boxes internally at Chef Software, Inc. for -testing Hosted Enterprise Chef, Private Enterprise Chef and our open source [cookbooks](http://community.opscode.com/users/Opscode) +testing Hosted Enterprise Chef, Private Enterprise Chef and our open source [cookbooks](https://supermarket.getchef.com/users/chef) via [test-kitchen](http://kitchen.ci/). This project is managed by the CHEF Release Engineering team. For more information on the Release Engineering team's contribution, triage, and release process, please consult the [CHEF Release Engineering OSS Management Guide](https://docs.google.com/a/opscode.com/document/d/1oJB0vZb_3bl7_ZU2YMDBkMFdL-EWplW1BJv_FXTUOzg/edit). @@ -20,7 +20,7 @@ Vagrant can be instructed to install Chef at runtime using the ### VirtualBox -These baseboxes were all built using a Mac OS X host running VirtualBox 4.3.8, and have that format of Guest Extensions. +These baseboxes were all built using a Mac OS X host running VirtualBox 4.3.14, and have that format of Guest Extensions. * [opscode-centos-5.10-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_centos-5.10-i386_chef-provisionerless.box) * [opscode-centos-5.10](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_centos-5.10_chef-provisionerless.box) @@ -43,8 +43,6 @@ These baseboxes were all built using a Mac OS X host running VirtualBox 4.3.8, a * [opscode-ubuntu-10.04](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_ubuntu-10.04_chef-provisionerless.box) * [opscode-ubuntu-12.04-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_ubuntu-12.04-i386_chef-provisionerless.box) * [opscode-ubuntu-12.04](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_ubuntu-12.04_chef-provisionerless.box) -* [opscode-ubuntu-12.10-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_ubuntu-12.10-i386_chef-provisionerless.box) -* [opscode-ubuntu-12.10](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_ubuntu-12.10_chef-provisionerless.box) * [opscode-ubuntu-14.04-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_ubuntu-14.04-i386_chef-provisionerless.box) * [opscode-ubuntu-14.04](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_ubuntu-14.04_chef-provisionerless.box) @@ -74,8 +72,6 @@ The boxes should work unchanged in VMWare Workstation for Windows or Linux. * [opscode-ubuntu-10.04](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_ubuntu-10.04_chef-provisionerless.box) * [opscode-ubuntu-12.04-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_ubuntu-12.04-i386_chef-provisionerless.box) * [opscode-ubuntu-12.04](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_ubuntu-12.04_chef-provisionerless.box) -* [opscode-ubuntu-12.10-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_ubuntu-12.10-i386_chef-provisionerless.box) -* [opscode-ubuntu-12.10](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_ubuntu-12.10_chef-provisionerless.box) * [opscode-ubuntu-14.04-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_ubuntu-14.04-i386_chef-provisionerless.box) * [opscode-ubuntu-14.04](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_ubuntu-14.04_chef-provisionerless.box) From b7bffc4a9b594bacc4aebf7756b244a33eb9a53a Mon Sep 17 00:00:00 2001 From: "Julian C. Dunn" <jdunn@getchef.com> Date: Sat, 23 Aug 2014 00:01:17 -0400 Subject: [PATCH 0247/1622] Updated links for Debian 6 and 7 --- README.md | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index 2286f2a8a..11c7f2f42 100644 --- a/README.md +++ b/README.md @@ -26,10 +26,10 @@ These baseboxes were all built using a Mac OS X host running VirtualBox 4.3.14, * [opscode-centos-5.10](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_centos-5.10_chef-provisionerless.box) * [opscode-centos-6.5-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_centos-6.5-i386_chef-provisionerless.box) * [opscode-centos-6.5](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_centos-6.5_chef-provisionerless.box) -* [opscode-debian-6.0.8-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_debian-6.0.8-i386_chef-provisionerless.box) -* [opscode-debian-6.0.8](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_debian-6.0.8_chef-provisionerless.box) -* [opscode-debian-7.4-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_debian-7.4-i386_chef-provisionerless.box) -* [opscode-debian-7.4](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_debian-7.4_chef-provisionerless.box) +* [opscode-debian-6.0.10-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_debian-6.0.10-i386_chef-provisionerless.box) +* [opscode-debian-6.0.10](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_debian-6.0.10_chef-provisionerless.box) +* [opscode-debian-7.6-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_debian-7.6-i386_chef-provisionerless.box) +* [opscode-debian-7.6](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_debian-7.6_chef-provisionerless.box) * [opscode-fedora-19-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_fedora-19-i386_chef-provisionerless.box) * [opscode-fedora-19](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_fedora-19_chef-provisionerless.box) * [opscode-fedora-20-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_fedora-20-i386_chef-provisionerless.box) @@ -55,10 +55,10 @@ The boxes should work unchanged in VMWare Workstation for Windows or Linux. * [opscode-centos-5.10](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_centos-5.10_chef-provisionerless.box) * [opscode-centos-6.5-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_centos-6.5-i386_chef-provisionerless.box) * [opscode-centos-6.5](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_centos-6.5_chef-provisionerless.box) -* [opscode-debian-6.0.8-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_debian-6.0.8-i386_chef-provisionerless.box) -* [opscode-debian-6.0.8](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_debian-6.0.8_chef-provisionerless.box) -* [opscode-debian-7.4-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_debian-7.4-i386_chef-provisionerless.box) -* [opscode-debian-7.4](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_debian-7.4_chef-provisionerless.box) +* [opscode-debian-6.0.10-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_debian-6.0.10-i386_chef-provisionerless.box) +* [opscode-debian-6.0.10](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_debian-6.0.10_chef-provisionerless.box) +* [opscode-debian-7.6-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_debian-7.6-i386_chef-provisionerless.box) +* [opscode-debian-7.6](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_debian-7.6_chef-provisionerless.box) * [opscode-fedora-19-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_fedora-19-i386_chef-provisionerless.box) * [opscode-fedora-19](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_fedora-19_chef-provisionerless.box) * [opscode-fedora-20-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_fedora-20-i386_chef-provisionerless.box) From a425382e44ad2ae39b69a70edc973528afdd8ac8 Mon Sep 17 00:00:00 2001 From: "Julian C. Dunn" <jdunn@getchef.com> Date: Sat, 23 Aug 2014 00:14:25 -0400 Subject: [PATCH 0248/1622] Updated FreeBSD 9.2 to 9.3. --- ...-9.2-amd64.json => freebsd-9.3-amd64.json} | 22 +++++++++---------- ...sd-9.2-i386.json => freebsd-9.3-i386.json} | 22 +++++++++---------- 2 files changed, 22 insertions(+), 22 deletions(-) rename packer/{freebsd-9.2-amd64.json => freebsd-9.3-amd64.json} (82%) rename packer/{freebsd-9.2-i386.json => freebsd-9.3-i386.json} (79%) diff --git a/packer/freebsd-9.2-amd64.json b/packer/freebsd-9.3-amd64.json similarity index 82% rename from packer/freebsd-9.2-amd64.json rename to packer/freebsd-9.3-amd64.json index e48f7ed55..1f01eddb4 100644 --- a/packer/freebsd-9.2-amd64.json +++ b/packer/freebsd-9.3-amd64.json @@ -14,17 +14,17 @@ "mdmfs -s 100m md1 /tmp<enter><wait>", "mdmfs -s 100m md2 /mnt<enter><wait>", "dhclient -l /tmp/dhclient.lease.em0 em0<enter><wait>", - "fetch -o /tmp/install.sh http://{{ .HTTPIP }}:{{ .HTTPPort }}/freebsd-9.2/install.sh && chmod +x /tmp/install.sh && /tmp/install.sh {{ .Name }}<enter><wait>" + "fetch -o /tmp/install.sh http://{{ .HTTPIP }}:{{ .HTTPPort }}/freebsd-9.3/install.sh && chmod +x /tmp/install.sh && /tmp/install.sh {{ .Name }}<enter><wait>" ], "boot_wait": "10s", "disk_size": 10140, "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "guest_os_type": "FreeBSD_64", "http_directory": "http", - "iso_checksum": "a8c1751b83646530148766618a89a97009e7500e7057a5cbe3afd74ef480c915", + "iso_checksum": "5a3c82653d77bba7d7ded8bd7efbedc09d52cf4045d98ce52a82c9e0f8fa9b0e", "iso_checksum_type": "sha256", - "iso_url": "{{user `mirror`}}/releases/amd64/amd64/ISO-IMAGES/9.2/FreeBSD-9.2-RELEASE-amd64-disc1.iso", - "output_directory": "packer-freebsd-9.2-amd64-virtualbox", + "iso_url": "{{user `mirror`}}/releases/amd64/amd64/ISO-IMAGES/9.3/FreeBSD-9.3-RELEASE-amd64-disc1.iso", + "output_directory": "packer-freebsd-9.3-amd64-virtualbox", "shutdown_command": "echo 'shutdown -p now' > shutdown.sh; cat 'shutdown.sh' | su -", "ssh_password": "vagrant", "ssh_port": 22, @@ -46,7 +46,7 @@ ] ], "virtualbox_version_file": ".vbox_version", - "vm_name": "packer-freebsd-9.2-amd64" + "vm_name": "packer-freebsd-9.3-amd64" }, { "boot_command": [ @@ -63,16 +63,16 @@ "mdmfs -s 100m md2 /mnt<enter><wait>", "dhclient -l /tmp/dhclient.lease.em0 em0<enter><wait>", "<wait5>", - "fetch -o /tmp/install.sh http://{{ .HTTPIP }}:{{ .HTTPPort }}/freebsd-9.2/install.sh && chmod +x /tmp/install.sh && /tmp/install.sh {{ .Name }}<enter><wait>" + "fetch -o /tmp/install.sh http://{{ .HTTPIP }}:{{ .HTTPPort }}/freebsd-9.3/install.sh && chmod +x /tmp/install.sh && /tmp/install.sh {{ .Name }}<enter><wait>" ], "boot_wait": "10s", "disk_size": 10140, "guest_os_type": "freebsd-64", "http_directory": "http", - "iso_checksum": "a8c1751b83646530148766618a89a97009e7500e7057a5cbe3afd74ef480c915", + "iso_checksum": "5a3c82653d77bba7d7ded8bd7efbedc09d52cf4045d98ce52a82c9e0f8fa9b0e", "iso_checksum_type": "sha256", - "iso_url": "{{user `mirror`}}/releases/amd64/amd64/ISO-IMAGES/9.2/FreeBSD-9.2-RELEASE-amd64-disc1.iso", - "output_directory": "packer-freebsd-9.2-amd64-vmware", + "iso_url": "{{user `mirror`}}/releases/amd64/amd64/ISO-IMAGES/9.3/FreeBSD-9.3-RELEASE-amd64-disc1.iso", + "output_directory": "packer-freebsd-9.3-amd64-vmware", "shutdown_command": "echo 'shutdown -p now' > shutdown.sh; cat 'shutdown.sh' | su -", "ssh_password": "vagrant", "ssh_port": 22, @@ -80,7 +80,7 @@ "ssh_wait_timeout": "10000s", "tools_upload_flavor": "freebsd", "type": "vmware-iso", - "vm_name": "packer-freebsd-9.2-amd64", + "vm_name": "packer-freebsd-9.3-amd64", "vmx_data": { "cpuid.coresPerSocket": "1", "memsize": "512", @@ -90,7 +90,7 @@ ], "post-processors": [ { - "output": "../builds/{{.Provider}}/opscode_freebsd-9.2_chef-{{user `chef_version`}}.box", + "output": "../builds/{{.Provider}}/opscode_freebsd-9.3_chef-{{user `chef_version`}}.box", "type": "vagrant" } ], diff --git a/packer/freebsd-9.2-i386.json b/packer/freebsd-9.3-i386.json similarity index 79% rename from packer/freebsd-9.2-i386.json rename to packer/freebsd-9.3-i386.json index 020be35ab..eea78839f 100644 --- a/packer/freebsd-9.2-i386.json +++ b/packer/freebsd-9.3-i386.json @@ -14,17 +14,17 @@ "mdmfs -s 100m md1 /tmp<enter><wait>", "mdmfs -s 100m md2 /mnt<enter><wait>", "dhclient -l /tmp/dhclient.lease.em0 em0<enter><wait>", - "fetch -o /tmp/install.sh http://{{ .HTTPIP }}:{{ .HTTPPort }}/freebsd-9.2/install.sh && chmod +x /tmp/install.sh && /tmp/install.sh {{ .Name }}<enter><wait>" + "fetch -o /tmp/install.sh http://{{ .HTTPIP }}:{{ .HTTPPort }}/freebsd-9.3/install.sh && chmod +x /tmp/install.sh && /tmp/install.sh {{ .Name }}<enter><wait>" ], "boot_wait": "10s", "disk_size": 10140, "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "guest_os_type": "FreeBSD", "http_directory": "http", - "iso_checksum": "76093c27288f0ab939a5de14b621ec8eb1420d96343132c2b7c382747d35b67c", + "iso_checksum": "cab6aad9c3d5ea6a3fb4059f808225c67f1edaea730c555a86a9707ac41ba75d", "iso_checksum_type": "sha256", - "iso_url": "{{user `mirror`}}/releases/i386/ISO-IMAGES/9.2/FreeBSD-9.2-RELEASE-i386-disc1.iso", - "output_directory": "packer-freebsd-9.2-i386-virtualbox", + "iso_url": "{{user `mirror`}}/releases/i386/ISO-IMAGES/9.3/FreeBSD-9.3-RELEASE-i386-disc1.iso", + "output_directory": "packer-freebsd-9.3-i386-virtualbox", "shutdown_command": "echo 'shutdown -p now' > shutdown.sh; cat 'shutdown.sh' | su -", "ssh_password": "vagrant", "ssh_port": 22, @@ -46,7 +46,7 @@ ] ], "virtualbox_version_file": ".vbox_version", - "vm_name": "packer-freebsd-9.2-i386" + "vm_name": "packer-freebsd-9.3-i386" }, { "boot_command": [ @@ -63,16 +63,16 @@ "mdmfs -s 100m md2 /mnt<enter><wait>", "dhclient -l /tmp/dhclient.lease.em0 em0<enter><wait>", "<wait5>", - "fetch -o /tmp/install.sh http://{{ .HTTPIP }}:{{ .HTTPPort }}/freebsd-9.2/install.sh && chmod +x /tmp/install.sh && /tmp/install.sh {{ .Name }}<enter><wait>" + "fetch -o /tmp/install.sh http://{{ .HTTPIP }}:{{ .HTTPPort }}/freebsd-9.3/install.sh && chmod +x /tmp/install.sh && /tmp/install.sh {{ .Name }}<enter><wait>" ], "boot_wait": "10s", "disk_size": 10140, "guest_os_type": "freebsd", "http_directory": "http", - "iso_checksum": "76093c27288f0ab939a5de14b621ec8eb1420d96343132c2b7c382747d35b67c", + "iso_checksum": "cab6aad9c3d5ea6a3fb4059f808225c67f1edaea730c555a86a9707ac41ba75d", "iso_checksum_type": "sha256", - "iso_url": "{{user `mirror`}}/releases/i386/ISO-IMAGES/9.2/FreeBSD-9.2-RELEASE-i386-disc1.iso", - "output_directory": "packer-freebsd-9.2-i386-vmware", + "iso_url": "{{user `mirror`}}/releases/i386/ISO-IMAGES/9.3/FreeBSD-9.3-RELEASE-i386-disc1.iso", + "output_directory": "packer-freebsd-9.3-i386-vmware", "shutdown_command": "echo 'shutdown -p now' > shutdown.sh; cat 'shutdown.sh' | su -", "ssh_password": "vagrant", "ssh_port": 22, @@ -80,7 +80,7 @@ "ssh_wait_timeout": "10000s", "tools_upload_flavor": "freebsd", "type": "vmware-iso", - "vm_name": "packer-freebsd-9.2-i386", + "vm_name": "packer-freebsd-9.3-i386", "vmx_data": { "cpuid.coresPerSocket": "1", "memsize": "512", @@ -90,7 +90,7 @@ ], "post-processors": [ { - "output": "../builds/{{.Provider}}/opscode_freebsd-9.2-i386_chef-{{user `chef_version`}}.box", + "output": "../builds/{{.Provider}}/opscode_freebsd-9.3-i386_chef-{{user `chef_version`}}.box", "type": "vagrant" } ], From 13277a4a1ffe07108a4d2a8c38fb315bc90ee77a Mon Sep 17 00:00:00 2001 From: "Julian C. Dunn" <jdunn@getchef.com> Date: Sat, 23 Aug 2014 00:18:29 -0400 Subject: [PATCH 0249/1622] Move install.sh to correct directory --- packer/http/{freebsd-9.2 => freebsd-9.3}/install.sh | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename packer/http/{freebsd-9.2 => freebsd-9.3}/install.sh (100%) diff --git a/packer/http/freebsd-9.2/install.sh b/packer/http/freebsd-9.3/install.sh similarity index 100% rename from packer/http/freebsd-9.2/install.sh rename to packer/http/freebsd-9.3/install.sh From e79d33aeabd6157299e42512e9be12a70984022b Mon Sep 17 00:00:00 2001 From: "Julian C. Dunn" <jdunn@getchef.com> Date: Mon, 25 Aug 2014 17:57:27 -0400 Subject: [PATCH 0250/1622] Updated ISO url for FreeBSD 9.3 --- packer/freebsd-9.3-i386.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packer/freebsd-9.3-i386.json b/packer/freebsd-9.3-i386.json index eea78839f..061006f41 100644 --- a/packer/freebsd-9.3-i386.json +++ b/packer/freebsd-9.3-i386.json @@ -23,7 +23,7 @@ "http_directory": "http", "iso_checksum": "cab6aad9c3d5ea6a3fb4059f808225c67f1edaea730c555a86a9707ac41ba75d", "iso_checksum_type": "sha256", - "iso_url": "{{user `mirror`}}/releases/i386/ISO-IMAGES/9.3/FreeBSD-9.3-RELEASE-i386-disc1.iso", + "iso_url": "{{user `mirror`}}/releases/i386/i386/ISO-IMAGES/9.3/FreeBSD-9.3-RELEASE-i386-disc1.iso", "output_directory": "packer-freebsd-9.3-i386-virtualbox", "shutdown_command": "echo 'shutdown -p now' > shutdown.sh; cat 'shutdown.sh' | su -", "ssh_password": "vagrant", @@ -71,7 +71,7 @@ "http_directory": "http", "iso_checksum": "cab6aad9c3d5ea6a3fb4059f808225c67f1edaea730c555a86a9707ac41ba75d", "iso_checksum_type": "sha256", - "iso_url": "{{user `mirror`}}/releases/i386/ISO-IMAGES/9.3/FreeBSD-9.3-RELEASE-i386-disc1.iso", + "iso_url": "{{user `mirror`}}/releases/i386/i386/ISO-IMAGES/9.3/FreeBSD-9.3-RELEASE-i386-disc1.iso", "output_directory": "packer-freebsd-9.3-i386-vmware", "shutdown_command": "echo 'shutdown -p now' > shutdown.sh; cat 'shutdown.sh' | su -", "ssh_password": "vagrant", From 543d4ae39b8a72d4893a4a7f381c9b7803d22402 Mon Sep 17 00:00:00 2001 From: "Julian C. Dunn" <jdunn@getchef.com> Date: Fri, 22 Aug 2014 18:31:16 -0400 Subject: [PATCH 0251/1622] Updated to Ubuntu 12.04.5 LTS. --- packer/ubuntu-12.04-amd64.json | 8 ++++---- packer/ubuntu-12.04-i386.json | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/packer/ubuntu-12.04-amd64.json b/packer/ubuntu-12.04-amd64.json index 241efd3b1..b2313f9b4 100644 --- a/packer/ubuntu-12.04-amd64.json +++ b/packer/ubuntu-12.04-amd64.json @@ -30,9 +30,9 @@ "guest_additions_path": "VBoxGuestAdditions_{{ .Version }}.iso", "guest_os_type": "Ubuntu_64", "http_directory": "http", - "iso_checksum": "b802bb065df98c0530d782eb94778c2da19e10d6", + "iso_checksum": "7540ace2d6cdee264432f5ed987236d32edef798", "iso_checksum_type": "sha1", - "iso_url": "{{user `mirror`}}/12.04/ubuntu-12.04.4-server-amd64.iso", + "iso_url": "{{user `mirror`}}/12.04/ubuntu-12.04.5-server-amd64.iso", "output_directory": "packer-ubuntu-12.04-amd64-virtualbox", "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", "ssh_password": "vagrant", @@ -86,9 +86,9 @@ "disk_size": 40960, "guest_os_type": "ubuntu-64", "http_directory": "http", - "iso_checksum": "b802bb065df98c0530d782eb94778c2da19e10d6", + "iso_checksum": "7540ace2d6cdee264432f5ed987236d32edef798", "iso_checksum_type": "sha1", - "iso_url": "{{user `mirror`}}/12.04/ubuntu-12.04.4-server-amd64.iso", + "iso_url": "{{user `mirror`}}/12.04/ubuntu-12.04.5-server-amd64.iso", "output_directory": "packer-ubuntu-12.04-amd64-vmware", "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", "ssh_password": "vagrant", diff --git a/packer/ubuntu-12.04-i386.json b/packer/ubuntu-12.04-i386.json index 5d1aba656..5e40a41f5 100644 --- a/packer/ubuntu-12.04-i386.json +++ b/packer/ubuntu-12.04-i386.json @@ -30,9 +30,9 @@ "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "guest_os_type": "Ubuntu", "http_directory": "http", - "iso_checksum": "3bae12e315c89d42d7bf571e4e35efce585c7624", + "iso_checksum": "a34c224b7fe72a2f5c768be5afee5c53817743fd", "iso_checksum_type": "sha1", - "iso_url": "{{user `mirror`}}/12.04/ubuntu-12.04.4-server-i386.iso", + "iso_url": "{{user `mirror`}}/12.04/ubuntu-12.04.5-server-i386.iso", "output_directory": "packer-ubuntu-12.04-i386-virtualbox", "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", "ssh_password": "vagrant", @@ -86,9 +86,9 @@ "disk_size": 40960, "guest_os_type": "ubuntu", "http_directory": "http", - "iso_checksum": "3bae12e315c89d42d7bf571e4e35efce585c7624", + "iso_checksum": "a34c224b7fe72a2f5c768be5afee5c53817743fd", "iso_checksum_type": "sha1", - "iso_url": "{{user `mirror`}}/12.04/ubuntu-12.04.4-server-i386.iso", + "iso_url": "{{user `mirror`}}/12.04/ubuntu-12.04.5-server-i386.iso", "output_directory": "packer-ubuntu-12.04-i386-vmware", "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", "ssh_password": "vagrant", From 77ca40300f491d5fa783654ca12badcf612aec65 Mon Sep 17 00:00:00 2001 From: "Julian C. Dunn" <jdunn@getchef.com> Date: Sat, 23 Aug 2014 00:14:25 -0400 Subject: [PATCH 0252/1622] Updated FreeBSD 9.2 to 9.3. --- ...-9.2-amd64.json => freebsd-9.3-amd64.json} | 22 +++++++++---------- ...sd-9.2-i386.json => freebsd-9.3-i386.json} | 22 +++++++++---------- .../{freebsd-9.2 => freebsd-9.3}/install.sh | 0 3 files changed, 22 insertions(+), 22 deletions(-) rename packer/{freebsd-9.2-amd64.json => freebsd-9.3-amd64.json} (82%) rename packer/{freebsd-9.2-i386.json => freebsd-9.3-i386.json} (79%) rename packer/http/{freebsd-9.2 => freebsd-9.3}/install.sh (100%) diff --git a/packer/freebsd-9.2-amd64.json b/packer/freebsd-9.3-amd64.json similarity index 82% rename from packer/freebsd-9.2-amd64.json rename to packer/freebsd-9.3-amd64.json index e48f7ed55..1f01eddb4 100644 --- a/packer/freebsd-9.2-amd64.json +++ b/packer/freebsd-9.3-amd64.json @@ -14,17 +14,17 @@ "mdmfs -s 100m md1 /tmp<enter><wait>", "mdmfs -s 100m md2 /mnt<enter><wait>", "dhclient -l /tmp/dhclient.lease.em0 em0<enter><wait>", - "fetch -o /tmp/install.sh http://{{ .HTTPIP }}:{{ .HTTPPort }}/freebsd-9.2/install.sh && chmod +x /tmp/install.sh && /tmp/install.sh {{ .Name }}<enter><wait>" + "fetch -o /tmp/install.sh http://{{ .HTTPIP }}:{{ .HTTPPort }}/freebsd-9.3/install.sh && chmod +x /tmp/install.sh && /tmp/install.sh {{ .Name }}<enter><wait>" ], "boot_wait": "10s", "disk_size": 10140, "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "guest_os_type": "FreeBSD_64", "http_directory": "http", - "iso_checksum": "a8c1751b83646530148766618a89a97009e7500e7057a5cbe3afd74ef480c915", + "iso_checksum": "5a3c82653d77bba7d7ded8bd7efbedc09d52cf4045d98ce52a82c9e0f8fa9b0e", "iso_checksum_type": "sha256", - "iso_url": "{{user `mirror`}}/releases/amd64/amd64/ISO-IMAGES/9.2/FreeBSD-9.2-RELEASE-amd64-disc1.iso", - "output_directory": "packer-freebsd-9.2-amd64-virtualbox", + "iso_url": "{{user `mirror`}}/releases/amd64/amd64/ISO-IMAGES/9.3/FreeBSD-9.3-RELEASE-amd64-disc1.iso", + "output_directory": "packer-freebsd-9.3-amd64-virtualbox", "shutdown_command": "echo 'shutdown -p now' > shutdown.sh; cat 'shutdown.sh' | su -", "ssh_password": "vagrant", "ssh_port": 22, @@ -46,7 +46,7 @@ ] ], "virtualbox_version_file": ".vbox_version", - "vm_name": "packer-freebsd-9.2-amd64" + "vm_name": "packer-freebsd-9.3-amd64" }, { "boot_command": [ @@ -63,16 +63,16 @@ "mdmfs -s 100m md2 /mnt<enter><wait>", "dhclient -l /tmp/dhclient.lease.em0 em0<enter><wait>", "<wait5>", - "fetch -o /tmp/install.sh http://{{ .HTTPIP }}:{{ .HTTPPort }}/freebsd-9.2/install.sh && chmod +x /tmp/install.sh && /tmp/install.sh {{ .Name }}<enter><wait>" + "fetch -o /tmp/install.sh http://{{ .HTTPIP }}:{{ .HTTPPort }}/freebsd-9.3/install.sh && chmod +x /tmp/install.sh && /tmp/install.sh {{ .Name }}<enter><wait>" ], "boot_wait": "10s", "disk_size": 10140, "guest_os_type": "freebsd-64", "http_directory": "http", - "iso_checksum": "a8c1751b83646530148766618a89a97009e7500e7057a5cbe3afd74ef480c915", + "iso_checksum": "5a3c82653d77bba7d7ded8bd7efbedc09d52cf4045d98ce52a82c9e0f8fa9b0e", "iso_checksum_type": "sha256", - "iso_url": "{{user `mirror`}}/releases/amd64/amd64/ISO-IMAGES/9.2/FreeBSD-9.2-RELEASE-amd64-disc1.iso", - "output_directory": "packer-freebsd-9.2-amd64-vmware", + "iso_url": "{{user `mirror`}}/releases/amd64/amd64/ISO-IMAGES/9.3/FreeBSD-9.3-RELEASE-amd64-disc1.iso", + "output_directory": "packer-freebsd-9.3-amd64-vmware", "shutdown_command": "echo 'shutdown -p now' > shutdown.sh; cat 'shutdown.sh' | su -", "ssh_password": "vagrant", "ssh_port": 22, @@ -80,7 +80,7 @@ "ssh_wait_timeout": "10000s", "tools_upload_flavor": "freebsd", "type": "vmware-iso", - "vm_name": "packer-freebsd-9.2-amd64", + "vm_name": "packer-freebsd-9.3-amd64", "vmx_data": { "cpuid.coresPerSocket": "1", "memsize": "512", @@ -90,7 +90,7 @@ ], "post-processors": [ { - "output": "../builds/{{.Provider}}/opscode_freebsd-9.2_chef-{{user `chef_version`}}.box", + "output": "../builds/{{.Provider}}/opscode_freebsd-9.3_chef-{{user `chef_version`}}.box", "type": "vagrant" } ], diff --git a/packer/freebsd-9.2-i386.json b/packer/freebsd-9.3-i386.json similarity index 79% rename from packer/freebsd-9.2-i386.json rename to packer/freebsd-9.3-i386.json index 020be35ab..061006f41 100644 --- a/packer/freebsd-9.2-i386.json +++ b/packer/freebsd-9.3-i386.json @@ -14,17 +14,17 @@ "mdmfs -s 100m md1 /tmp<enter><wait>", "mdmfs -s 100m md2 /mnt<enter><wait>", "dhclient -l /tmp/dhclient.lease.em0 em0<enter><wait>", - "fetch -o /tmp/install.sh http://{{ .HTTPIP }}:{{ .HTTPPort }}/freebsd-9.2/install.sh && chmod +x /tmp/install.sh && /tmp/install.sh {{ .Name }}<enter><wait>" + "fetch -o /tmp/install.sh http://{{ .HTTPIP }}:{{ .HTTPPort }}/freebsd-9.3/install.sh && chmod +x /tmp/install.sh && /tmp/install.sh {{ .Name }}<enter><wait>" ], "boot_wait": "10s", "disk_size": 10140, "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "guest_os_type": "FreeBSD", "http_directory": "http", - "iso_checksum": "76093c27288f0ab939a5de14b621ec8eb1420d96343132c2b7c382747d35b67c", + "iso_checksum": "cab6aad9c3d5ea6a3fb4059f808225c67f1edaea730c555a86a9707ac41ba75d", "iso_checksum_type": "sha256", - "iso_url": "{{user `mirror`}}/releases/i386/ISO-IMAGES/9.2/FreeBSD-9.2-RELEASE-i386-disc1.iso", - "output_directory": "packer-freebsd-9.2-i386-virtualbox", + "iso_url": "{{user `mirror`}}/releases/i386/i386/ISO-IMAGES/9.3/FreeBSD-9.3-RELEASE-i386-disc1.iso", + "output_directory": "packer-freebsd-9.3-i386-virtualbox", "shutdown_command": "echo 'shutdown -p now' > shutdown.sh; cat 'shutdown.sh' | su -", "ssh_password": "vagrant", "ssh_port": 22, @@ -46,7 +46,7 @@ ] ], "virtualbox_version_file": ".vbox_version", - "vm_name": "packer-freebsd-9.2-i386" + "vm_name": "packer-freebsd-9.3-i386" }, { "boot_command": [ @@ -63,16 +63,16 @@ "mdmfs -s 100m md2 /mnt<enter><wait>", "dhclient -l /tmp/dhclient.lease.em0 em0<enter><wait>", "<wait5>", - "fetch -o /tmp/install.sh http://{{ .HTTPIP }}:{{ .HTTPPort }}/freebsd-9.2/install.sh && chmod +x /tmp/install.sh && /tmp/install.sh {{ .Name }}<enter><wait>" + "fetch -o /tmp/install.sh http://{{ .HTTPIP }}:{{ .HTTPPort }}/freebsd-9.3/install.sh && chmod +x /tmp/install.sh && /tmp/install.sh {{ .Name }}<enter><wait>" ], "boot_wait": "10s", "disk_size": 10140, "guest_os_type": "freebsd", "http_directory": "http", - "iso_checksum": "76093c27288f0ab939a5de14b621ec8eb1420d96343132c2b7c382747d35b67c", + "iso_checksum": "cab6aad9c3d5ea6a3fb4059f808225c67f1edaea730c555a86a9707ac41ba75d", "iso_checksum_type": "sha256", - "iso_url": "{{user `mirror`}}/releases/i386/ISO-IMAGES/9.2/FreeBSD-9.2-RELEASE-i386-disc1.iso", - "output_directory": "packer-freebsd-9.2-i386-vmware", + "iso_url": "{{user `mirror`}}/releases/i386/i386/ISO-IMAGES/9.3/FreeBSD-9.3-RELEASE-i386-disc1.iso", + "output_directory": "packer-freebsd-9.3-i386-vmware", "shutdown_command": "echo 'shutdown -p now' > shutdown.sh; cat 'shutdown.sh' | su -", "ssh_password": "vagrant", "ssh_port": 22, @@ -80,7 +80,7 @@ "ssh_wait_timeout": "10000s", "tools_upload_flavor": "freebsd", "type": "vmware-iso", - "vm_name": "packer-freebsd-9.2-i386", + "vm_name": "packer-freebsd-9.3-i386", "vmx_data": { "cpuid.coresPerSocket": "1", "memsize": "512", @@ -90,7 +90,7 @@ ], "post-processors": [ { - "output": "../builds/{{.Provider}}/opscode_freebsd-9.2-i386_chef-{{user `chef_version`}}.box", + "output": "../builds/{{.Provider}}/opscode_freebsd-9.3-i386_chef-{{user `chef_version`}}.box", "type": "vagrant" } ], diff --git a/packer/http/freebsd-9.2/install.sh b/packer/http/freebsd-9.3/install.sh similarity index 100% rename from packer/http/freebsd-9.2/install.sh rename to packer/http/freebsd-9.3/install.sh From 549befe6a297927949218646033bec37b60ded94 Mon Sep 17 00:00:00 2001 From: "Julian C. Dunn" <jdunn@getchef.com> Date: Fri, 5 Sep 2014 18:27:56 -0400 Subject: [PATCH 0253/1622] Document CentOS 7.0 box. Fixes #260. --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 11c7f2f42..54e46af73 100644 --- a/README.md +++ b/README.md @@ -26,6 +26,7 @@ These baseboxes were all built using a Mac OS X host running VirtualBox 4.3.14, * [opscode-centos-5.10](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_centos-5.10_chef-provisionerless.box) * [opscode-centos-6.5-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_centos-6.5-i386_chef-provisionerless.box) * [opscode-centos-6.5](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_centos-6.5_chef-provisionerless.box) +* [opscode-centos-7.0](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_centos-7.0_chef-provisionerless.box) * [opscode-debian-6.0.10-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_debian-6.0.10-i386_chef-provisionerless.box) * [opscode-debian-6.0.10](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_debian-6.0.10_chef-provisionerless.box) * [opscode-debian-7.6-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_debian-7.6-i386_chef-provisionerless.box) @@ -55,6 +56,7 @@ The boxes should work unchanged in VMWare Workstation for Windows or Linux. * [opscode-centos-5.10](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_centos-5.10_chef-provisionerless.box) * [opscode-centos-6.5-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_centos-6.5-i386_chef-provisionerless.box) * [opscode-centos-6.5](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_centos-6.5_chef-provisionerless.box) +* [opscode-centos-7.0](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_centos-7.0_chef-provisionerless.box) * [opscode-debian-6.0.10-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_debian-6.0.10-i386_chef-provisionerless.box) * [opscode-debian-6.0.10](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_debian-6.0.10_chef-provisionerless.box) * [opscode-debian-7.6-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_debian-7.6-i386_chef-provisionerless.box) From 8c6eb601ccb65a3fddd924dd4dc5fa7e22691751 Mon Sep 17 00:00:00 2001 From: Eric Shamow <eric.shamow@gmail.com> Date: Thu, 11 Sep 2014 10:52:46 -0700 Subject: [PATCH 0254/1622] Update 12.04 logic to handle outdated apt cache on distro --- packer/http/ubuntu-12.04/preseed.cfg | 2 +- packer/scripts/ubuntu/update.sh | 12 ++++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/packer/http/ubuntu-12.04/preseed.cfg b/packer/http/ubuntu-12.04/preseed.cfg index 0a4d4939b..5282b5811 100644 --- a/packer/http/ubuntu-12.04/preseed.cfg +++ b/packer/http/ubuntu-12.04/preseed.cfg @@ -21,7 +21,7 @@ d-i passwd/user-uid string 900 d-i passwd/user-password password vagrant d-i passwd/user-password-again password vagrant d-i passwd/username string vagrant -d-i pkgsel/include string openssh-server cryptsetup build-essential libssl-dev libreadline-dev zlib1g-dev linux-source dkms nfs-common +d-i pkgsel/include string openssh-server cryptsetup build-essential libssl-dev zlib1g-dev linux-source nfs-common d-i pkgsel/install-language-support boolean false d-i pkgsel/update-policy select unattended-upgrades d-i pkgsel/upgrade select full-upgrade diff --git a/packer/scripts/ubuntu/update.sh b/packer/scripts/ubuntu/update.sh index 06efcf5c1..91fc0c523 100644 --- a/packer/scripts/ubuntu/update.sh +++ b/packer/scripts/ubuntu/update.sh @@ -1,5 +1,12 @@ #!/bin/bash -eux +UBUNTU_VERSION=`lsb_release -r | awk '{print $2}'` +# on 12.04 work around bad cached lists +if [[ "$UBUNTU_VERSION" == '12.04' ]]; then + apt-get clean + rm -rf /var/lib/apt/lists +fi + # Update the package list apt-get update @@ -16,3 +23,8 @@ start on networking task exec /usr/bin/apt-get update EOF + +# on 12.04 manage broken indexes on distro disc 12.04.5 +if [[ $UBUNTU_VERSION == '12.04' ]]; then + apt-get -y install libreadline-dev dpkg +fi From e7d0fd064d0e5f4dcd851c7718ee40b8b907017d Mon Sep 17 00:00:00 2001 From: Eric Shamow <eric.shamow@gmail.com> Date: Thu, 11 Sep 2014 10:59:33 -0700 Subject: [PATCH 0255/1622] Remove EOL Ubuntu 12.10 --- packer/ubuntu-12.10-amd64.json | 139 --------------------------------- packer/ubuntu-12.10-i386.json | 139 --------------------------------- 2 files changed, 278 deletions(-) delete mode 100644 packer/ubuntu-12.10-amd64.json delete mode 100644 packer/ubuntu-12.10-i386.json diff --git a/packer/ubuntu-12.10-amd64.json b/packer/ubuntu-12.10-amd64.json deleted file mode 100644 index 20eee9fce..000000000 --- a/packer/ubuntu-12.10-amd64.json +++ /dev/null @@ -1,139 +0,0 @@ -{ - "builders": [ - { - "boot_command": [ - "<esc><wait>", - "<esc><wait>", - "<enter><wait>", - "/install/vmlinuz<wait>", - " auto<wait>", - " console-setup/ask_detect=false<wait>", - " console-setup/layoutcode=us<wait>", - " console-setup/modelcode=pc105<wait>", - " debconf/frontend=noninteractive<wait>", - " debian-installer=en_US<wait>", - " fb=false<wait>", - " initrd=/install/initrd.gz<wait>", - " kbd-chooser/method=us<wait>", - " keyboard-configuration/layout=USA<wait>", - " keyboard-configuration/variant=USA<wait>", - " locale=en_US<wait>", - " netcfg/get_domain=vm<wait>", - " netcfg/get_hostname=vagrant<wait>", - " noapic<wait>", - " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/ubuntu-12.10/preseed.cfg<wait>", - " -- <wait>", - "<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": 40960, - "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", - "guest_os_type": "Ubuntu_64", - "http_directory": "http", - "iso_checksum": "e2a48af008ff3c4db6a8235151a1e90ea600fceb", - "iso_checksum_type": "sha1", - "iso_url": "{{user `mirror`}}/12.10/ubuntu-12.10-server-amd64.iso", - "output_directory": "packer-ubuntu-12.10-amd64-virtualbox", - "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "virtualbox-iso", - "vboxmanage": [ - [ - "modifyvm", - "{{.Name}}", - "--memory", - "384" - ], - [ - "modifyvm", - "{{.Name}}", - "--cpus", - "1" - ] - ], - "virtualbox_version_file": ".vbox_version", - "vm_name": "packer-ubuntu-12.10-amd64" - }, - { - "boot_command": [ - "<esc><wait>", - "<esc><wait>", - "<enter><wait>", - "/install/vmlinuz<wait>", - " auto<wait>", - " console-setup/ask_detect=false<wait>", - " console-setup/layoutcode=us<wait>", - " console-setup/modelcode=pc105<wait>", - " debconf/frontend=noninteractive<wait>", - " debian-installer=en_US<wait>", - " fb=false<wait>", - " initrd=/install/initrd.gz<wait>", - " kbd-chooser/method=us<wait>", - " keyboard-configuration/layout=USA<wait>", - " keyboard-configuration/variant=USA<wait>", - " locale=en_US<wait>", - " netcfg/get_domain=vm<wait>", - " netcfg/get_hostname=vagrant<wait>", - " noapic<wait>", - " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/ubuntu-12.10/preseed.cfg<wait>", - " -- <wait>", - "<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": 40960, - "guest_os_type": "ubuntu-64", - "http_directory": "http", - "iso_checksum": "e2a48af008ff3c4db6a8235151a1e90ea600fceb", - "iso_checksum_type": "sha1", - "iso_url": "{{user `mirror`}}/12.10/ubuntu-12.10-server-amd64.iso", - "output_directory": "packer-ubuntu-12.10-amd64-vmware", - "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "tools_upload_flavor": "linux", - "type": "vmware-iso", - "vm_name": "packer-ubuntu-12.10-amd64", - "vmx_data": { - "cpuid.coresPerSocket": "1", - "memsize": "384", - "numvcpus": "1" - } - } - ], - "post-processors": [ - { - "output": "../builds/{{.Provider}}/opscode_ubuntu-12.10_chef-{{user `chef_version`}}.box", - "type": "vagrant" - } - ], - "provisioners": [ - { - "environment_vars": [ - "CHEF_VERSION={{user `chef_version`}}" - ], - "execute_command": "echo 'vagrant'|{{.Vars}} sudo -S -E bash '{{.Path}}'", - "scripts": [ - "scripts/ubuntu/update.sh", - "scripts/common/sshd.sh", - "scripts/ubuntu/networking.sh", - "scripts/ubuntu/sudoers.sh", - "scripts/common/vagrant.sh", - "scripts/common/vmtools.sh", - "scripts/common/chef.sh", - "scripts/ubuntu/cleanup.sh", - "scripts/common/minimize.sh" - ], - "type": "shell" - } - ], - "variables": { - "chef_version": "provisionerless", - "mirror": "http://releases.ubuntu.com" - } -} - diff --git a/packer/ubuntu-12.10-i386.json b/packer/ubuntu-12.10-i386.json deleted file mode 100644 index b9f982596..000000000 --- a/packer/ubuntu-12.10-i386.json +++ /dev/null @@ -1,139 +0,0 @@ -{ - "builders": [ - { - "boot_command": [ - "<esc><wait>", - "<esc><wait>", - "<enter><wait>", - "/install/vmlinuz<wait>", - " auto<wait>", - " console-setup/ask_detect=false<wait>", - " console-setup/layoutcode=us<wait>", - " console-setup/modelcode=pc105<wait>", - " debconf/frontend=noninteractive<wait>", - " debian-installer=en_US<wait>", - " fb=false<wait>", - " initrd=/install/initrd.gz<wait>", - " kbd-chooser/method=us<wait>", - " keyboard-configuration/layout=USA<wait>", - " keyboard-configuration/variant=USA<wait>", - " locale=en_US<wait>", - " netcfg/get_domain=vm<wait>", - " netcfg/get_hostname=vagrant<wait>", - " noapic<wait>", - " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/ubuntu-12.10/preseed.cfg<wait>", - " -- <wait>", - "<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": 40960, - "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", - "guest_os_type": "Ubuntu", - "http_directory": "http", - "iso_checksum": "e0e48be7ae21003cf0b25591d71d8cdbee7063e7", - "iso_checksum_type": "sha1", - "iso_url": "{{user `mirror`}}/12.10/ubuntu-12.10-server-i386.iso", - "output_directory": "packer-ubuntu-12.10-i386-virtualbox", - "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "virtualbox-iso", - "vboxmanage": [ - [ - "modifyvm", - "{{.Name}}", - "--memory", - "384" - ], - [ - "modifyvm", - "{{.Name}}", - "--cpus", - "1" - ] - ], - "virtualbox_version_file": ".vbox_version", - "vm_name": "packer-ubuntu-12.10-i386" - }, - { - "boot_command": [ - "<esc><wait>", - "<esc><wait>", - "<enter><wait>", - "/install/vmlinuz<wait>", - " auto<wait>", - " console-setup/ask_detect=false<wait>", - " console-setup/layoutcode=us<wait>", - " console-setup/modelcode=pc105<wait>", - " debconf/frontend=noninteractive<wait>", - " debian-installer=en_US<wait>", - " fb=false<wait>", - " initrd=/install/initrd.gz<wait>", - " kbd-chooser/method=us<wait>", - " keyboard-configuration/layout=USA<wait>", - " keyboard-configuration/variant=USA<wait>", - " locale=en_US<wait>", - " netcfg/get_domain=vm<wait>", - " netcfg/get_hostname=vagrant<wait>", - " noapic<wait>", - " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/ubuntu-12.10/preseed.cfg<wait>", - " -- <wait>", - "<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": 40960, - "guest_os_type": "ubuntu", - "http_directory": "http", - "iso_checksum": "e0e48be7ae21003cf0b25591d71d8cdbee7063e7", - "iso_checksum_type": "sha1", - "iso_url": "{{user `mirror`}}/12.10/ubuntu-12.10-server-i386.iso", - "output_directory": "packer-ubuntu-12.10-i386-vmware", - "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "tools_upload_flavor": "linux", - "type": "vmware-iso", - "vm_name": "packer-ubuntu-12.10-i386", - "vmx_data": { - "cpuid.coresPerSocket": "1", - "memsize": "384", - "numvcpus": "1" - } - } - ], - "post-processors": [ - { - "output": "../builds/{{.Provider}}/opscode_ubuntu-12.10-i386_chef-{{user `chef_version`}}.box", - "type": "vagrant" - } - ], - "provisioners": [ - { - "environment_vars": [ - "CHEF_VERSION={{user `chef_version`}}" - ], - "execute_command": "echo 'vagrant'|{{.Vars}} sudo -S -E bash '{{.Path}}'", - "scripts": [ - "scripts/ubuntu/update.sh", - "scripts/common/sshd.sh", - "scripts/ubuntu/networking.sh", - "scripts/ubuntu/sudoers.sh", - "scripts/common/vagrant.sh", - "scripts/common/vmtools.sh", - "scripts/common/chef.sh", - "scripts/ubuntu/cleanup.sh", - "scripts/common/minimize.sh" - ], - "type": "shell" - } - ], - "variables": { - "chef_version": "provisionerless", - "mirror": "http://releases.ubuntu.com" - } -} - From ad9955bba5075af70ecd9fdfe7e00726ec8ac945 Mon Sep 17 00:00:00 2001 From: Rickard von Essen <rickard.von.essen@gmail.com> Date: Mon, 5 May 2014 00:38:47 +0200 Subject: [PATCH 0256/1622] Added builds for Parallels Desktop for Mac. --- packer/centos-5.10-i386.json | 37 ++++++++++++++++++++ packer/centos-5.10-x86_64.json | 38 +++++++++++++++++++++ packer/centos-6.5-i386.json | 36 ++++++++++++++++++++ packer/centos-6.5-x86_64.json | 37 ++++++++++++++++++++ packer/centos-7.0-x86_64.json | 36 ++++++++++++++++++++ packer/debian-6.0.10-amd64.json | 41 ++++++++++++++++++++++ packer/debian-6.0.10-i386.json | 41 ++++++++++++++++++++++ packer/debian-7.6-amd64.json | 40 ++++++++++++++++++++++ packer/debian-7.6-i386.json | 41 ++++++++++++++++++++++ packer/fedora-19-i386.json | 37 ++++++++++++++++++++ packer/fedora-19-x86_64.json | 37 ++++++++++++++++++++ packer/fedora-20-i386.json | 37 ++++++++++++++++++++ packer/fedora-20-x86_64.json | 36 ++++++++++++++++++++ packer/opensuse-13.1-i386.json | 40 ++++++++++++++++++++++ packer/opensuse-13.1-x86_64.json | 40 ++++++++++++++++++++++ packer/oracle-5.10-i386.json | 37 ++++++++++++++++++++ packer/oracle-5.10-x86_64.json | 37 ++++++++++++++++++++ packer/oracle-6.5-i386.json | 37 ++++++++++++++++++++ packer/oracle-6.5-x86_64.json | 36 ++++++++++++++++++++ packer/rhel-5.10-i386.json | 37 ++++++++++++++++++++ packer/rhel-5.10-x86_64.json | 37 ++++++++++++++++++++ packer/rhel-6.5-i386.json | 37 ++++++++++++++++++++ packer/rhel-6.5-x86_64.json | 36 ++++++++++++++++++++ packer/rhel-7.0-x86_64.json | 37 ++++++++++++++++++++ packer/scripts/common/vmtools.sh | 13 +++++-- packer/sles-11-sp2-i386.json | 38 +++++++++++++++++++++ packer/sles-11-sp2-x86_64.json | 41 ++++++++++++++++++++++ packer/sles-11-sp3-i386.json | 41 ++++++++++++++++++++++ packer/sles-11-sp3-x86_64.json | 40 ++++++++++++++++++++++ packer/ubuntu-10.04-amd64.json | 58 ++++++++++++++++++++++++++++++++ packer/ubuntu-10.04-i386.json | 58 ++++++++++++++++++++++++++++++++ packer/ubuntu-12.04-amd64.json | 58 ++++++++++++++++++++++++++++++++ packer/ubuntu-12.04-i386.json | 58 ++++++++++++++++++++++++++++++++ packer/ubuntu-12.10-amd64.json | 58 ++++++++++++++++++++++++++++++++ packer/ubuntu-12.10-i386.json | 58 ++++++++++++++++++++++++++++++++ packer/ubuntu-14.04-amd64.json | 58 ++++++++++++++++++++++++++++++++ packer/ubuntu-14.04-i386.json | 58 ++++++++++++++++++++++++++++++++ 37 files changed, 1540 insertions(+), 2 deletions(-) diff --git a/packer/centos-5.10-i386.json b/packer/centos-5.10-i386.json index 5fad853a6..e84b9db4c 100644 --- a/packer/centos-5.10-i386.json +++ b/packer/centos-5.10-i386.json @@ -61,7 +61,44 @@ "memsize": "384", "numvcpus": "1" } + }, + { + "boot_command": [ + "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/centos-5.10/ks.cfg<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "parallels_tools_flavor": "lin", + "guest_os_type": "centos", + "http_directory": "http", + "iso_checksum": "bb4e61210e1c0389fdf55c59bd2dd7bc957dd400", + "iso_checksum_type": "sha1", + "iso_url": "{{user `mirror`}}/5.10/isos/i386/CentOS-5.10-i386-bin-DVD-1of2.iso", + "output_directory": "packer-centos-5.10-i386-parallels", + "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "parallels-iso", + "prlctl": [ + [ + "set", + "{{.Name}}", + "--memsize", + "384" + ], + [ + "set", + "{{.Name}}", + "--cpus", + "1" + ] + ], + "prlctl_version_file": ".prlctl_version", + "vm_name": "packer-centos-5.10-i386" } + ], "post-processors": [ { diff --git a/packer/centos-5.10-x86_64.json b/packer/centos-5.10-x86_64.json index a60d60c63..97b7c3cd5 100644 --- a/packer/centos-5.10-x86_64.json +++ b/packer/centos-5.10-x86_64.json @@ -61,7 +61,45 @@ "memsize": "384", "numvcpus": "1" } + }, + { + "boot_command": [ + "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/centos-5.10/ks.cfg<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "parallels_tools_flavor": "lin", + "guest_os_type": "centos", + "http_directory": "http", + "iso_checksum": "d8403b3fe4972eda3e147ee76d682a4a3beae1e1", + "iso_checksum_type": "sha1", + "iso_url": "{{user `mirror`}}/5.10/isos/x86_64/CentOS-5.10-x86_64-bin-DVD-1of2.iso", + "output_directory": "packer-centos-5.10-x86_64-parallels", + "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "parallels-iso", + "prlctl": [ + [ + "set", + "{{.Name}}", + "--memsize", + "384" + ], + [ + "set", + "{{.Name}}", + "--cpus", + "1" + ] + ], + "prlctl_version_file": ".prlctl_version", + "vm_name": "packer-centos-5.10-x86_64" } + + ], "post-processors": [ { diff --git a/packer/centos-6.5-i386.json b/packer/centos-6.5-i386.json index 0aab4d0f3..311c4071e 100644 --- a/packer/centos-6.5-i386.json +++ b/packer/centos-6.5-i386.json @@ -61,6 +61,42 @@ "memsize": "480", "numvcpus": "1" } + }, + { + "boot_command": [ + "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/centos-6.5/ks.cfg<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "parallels_tools_flavor": "lin", + "guest_os_type": "centos", + "http_directory": "http", + "iso_checksum": "67ea68068ae53d1f23431072ec0288b3e1abfe4d", + "iso_checksum_type": "sha1", + "iso_url": "{{user `mirror`}}/6.5/isos/x86_64/CentOS-6.5-i386-bin-DVD1.iso", + "output_directory": "packer-centos-6.5-i386-parallels", + "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "parallels-iso", + "prlctl": [ + [ + "set", + "{{.Name}}", + "--memsize", + "480" + ], + [ + "set", + "{{.Name}}", + "--cpus", + "1" + ] + ], + "prlctl_version_file": ".prlctl_version", + "vm_name": "packer-centos-6.5-i386" } ], "post-processors": [ diff --git a/packer/centos-6.5-x86_64.json b/packer/centos-6.5-x86_64.json index 9b4c8de91..1473462d7 100644 --- a/packer/centos-6.5-x86_64.json +++ b/packer/centos-6.5-x86_64.json @@ -61,7 +61,44 @@ "memsize": "480", "numvcpus": "1" } + }, + { + "boot_command": [ + "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/centos-6.5/ks.cfg<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "parallels_tools_flavor": "lin", + "guest_os_type": "centos", + "http_directory": "http", + "iso_checksum": "32c7695b97f7dcd1f59a77a71f64f2957dddf738", + "iso_checksum_type": "sha1", + "iso_url": "{{user `mirror`}}/6.5/isos/x86_64/CentOS-6.5-x86_64-bin-DVD1.iso", + "output_directory": "packer-centos-6.5-x86_64-parallels", + "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "parallels-iso", + "prlctl": [ + [ + "set", + "{{.Name}}", + "--memsize", + "480" + ], + [ + "set", + "{{.Name}}", + "--cpus", + "1" + ] + ], + "prlctl_version_file": ".prlctl_version", + "vm_name": "packer-centos-6.5-x86_64" } + ], "post-processors": [ { diff --git a/packer/centos-7.0-x86_64.json b/packer/centos-7.0-x86_64.json index 5614d8dfb..541d11d14 100644 --- a/packer/centos-7.0-x86_64.json +++ b/packer/centos-7.0-x86_64.json @@ -61,6 +61,42 @@ "memsize": "480", "numvcpus": "1" } + }, + { + "boot_command": [ + "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/centos-7.0/ks.cfg<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "parallels_tools_flavor": "lin", + "guest_os_type": "centos", + "http_directory": "http", + "iso_checksum": "ee505335bcd4943ffc7e6e6e55e5aaa8da09710b6ceecda82a5619342f1d24d9", + "iso_checksum_type": "sha256", + "iso_url": "{{user `mirror`}}/7.0.1406/isos/x86_64/CentOS-7.0-1406-x86_64-DVD.iso", + "output_directory": "packer-centos-7.0-x86_64-parallels", + "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "parallels-iso", + "prlctl": [ + [ + "set", + "{{.Name}}", + "--memsize", + "480" + ], + [ + "set", + "{{.Name}}", + "--cpus", + "1" + ] + ], + "prlctl_version_file": ".prlctl_version", + "vm_name": "packer-centos-7.0-x86_64" } ], "post-processors": [ diff --git a/packer/debian-6.0.10-amd64.json b/packer/debian-6.0.10-amd64.json index 17b51d812..ee4686c8b 100644 --- a/packer/debian-6.0.10-amd64.json +++ b/packer/debian-6.0.10-amd64.json @@ -83,7 +83,48 @@ "memsize": "384", "numvcpus": "1" } + }, + { + "type": "parallels-iso", + "boot_command": [ + "<esc><wait>", + "install <wait>", + "preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/debian-6.0/preseed.cfg <wait>", + "debian-installer=en_US <wait>", + "auto <wait>", + "locale=en_US <wait>", + "kbd-chooser/method=us <wait>", + "keyboard-configuration/xkb-keymap=us <wait>", + "netcfg/get_hostname={{ .Name }} <wait>", + "netcfg/get_domain=vagrantup.com <wait>", + "fb=false <wait>", + "debconf/frontend=noninteractive <wait>", + "console-setup/ask_detect=false <wait>", + "console-keymaps-at/keymap=us <wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "guest_os_type": "debian", + "http_directory": "http", + "iso_checksum": "3f3ec3e1adb4c2904a1234799f4775c10cf47cce", + "iso_checksum_type": "sha1", + "iso_url": "{{user `mirror`}}/6.0.9/amd64/iso-cd/debian-6.0.9-amd64-CD-1.iso", + "ssh_username": "vagrant", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_wait_timeout": "10000s", + "shutdown_command": "echo 'vagrant'|sudo -S /sbin/shutdown -hP now", + "parallels_tools_flavor": "lin", + "prlctl_version_file": ".prlctl_version", + "vm_name": "packer-debian-6.0.9-amd64", + "output_directory": "packer-debian-6.0.9-amd64-parallels", + "prlctl": [ + [ "set", "{{.Name}}", "--memsize", "384" ], + [ "set", "{{.Name}}", "--cpus", "1" ] + ] } + ], "post-processors": [ { diff --git a/packer/debian-6.0.10-i386.json b/packer/debian-6.0.10-i386.json index 9db2dc748..2975158d8 100644 --- a/packer/debian-6.0.10-i386.json +++ b/packer/debian-6.0.10-i386.json @@ -83,7 +83,48 @@ "memsize": "384", "numvcpus": "1" } + }, + { + "type": "parallels-iso", + "boot_command": [ + "<esc><wait>", + "install <wait>", + "preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/debian-6.0/preseed.cfg <wait>", + "debian-installer=en_US <wait>", + "auto <wait>", + "locale=en_US <wait>", + "kbd-chooser/method=us <wait>", + "keyboard-configuration/xkb-keymap=us <wait>", + "netcfg/get_hostname={{ .Name }} <wait>", + "netcfg/get_domain=vagrantup.com <wait>", + "fb=false <wait>", + "debconf/frontend=noninteractive <wait>", + "console-setup/ask_detect=false <wait>", + "console-keymaps-at/keymap=us <wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "guest_os_type": "debian", + "http_directory": "http", + "iso_checksum": "bc2886211bce0e9c54bdf779f21a35d5e5a122fd", + "iso_checksum_type": "sha1", + "iso_url": "{{user `mirror`}}/6.0.9/i386/iso-cd/debian-6.0.9-i386-CD-1.iso", + "ssh_username": "vagrant", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_wait_timeout": "10000s", + "shutdown_command": "echo 'vagrant'|sudo -S /sbin/shutdown -hP now", + "parallels_tools_flavor": "lin", + "prlctl_version_file": ".prlctl_version", + "vm_name": "packer-debian-6.0.9-i386", + "output_directory": "packer-debian-6.0.9-i386-parallels", + "prlctl": [ + [ "set", "{{.Name}}", "--memsize", "384" ], + [ "set", "{{.Name}}", "--cpus", "1" ] + ] } + ], "post-processors": [ { diff --git a/packer/debian-7.6-amd64.json b/packer/debian-7.6-amd64.json index 91993fa41..f36778ec2 100644 --- a/packer/debian-7.6-amd64.json +++ b/packer/debian-7.6-amd64.json @@ -83,6 +83,46 @@ "numvcpus": "1", "cpuid.coresPerSocket": "1" } + }, + { + "type": "parallels-iso", + "boot_command": [ + "<esc><wait>", + "install <wait>", + "preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/debian-7/preseed.cfg <wait>", + "debian-installer=en_US <wait>", + "auto <wait>", + "locale=en_US <wait>", + "kbd-chooser/method=us <wait>", + "keyboard-configuration/xkb-keymap=us <wait>", + "netcfg/get_hostname={{ .Name }} <wait>", + "netcfg/get_domain=vagrantup.com <wait>", + "fb=false <wait>", + "debconf/frontend=noninteractive <wait>", + "console-setup/ask_detect=false <wait>", + "console-keymaps-at/keymap=us <wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "guest_os_type": "debian", + "http_directory": "http", + "iso_checksum": "ba6f8194b5970be964a5de86522423135358908a", + "iso_checksum_type": "sha1", + "iso_url": "{{user `mirror`}}/7.6.0/amd64/iso-cd/debian-7.6.0-amd64-CD-1.iso", + "ssh_username": "vagrant", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_wait_timeout": "10000s", + "shutdown_command": "echo 'vagrant'|sudo -S /sbin/shutdown -hP now", + "parallels_tools_flavor": "lin", + "prlctl_version_file": ".prlctl_version", + "vm_name": "packer-debian-7.6-amd64", + "output_directory": "packer-debian-7.6-amd64-parallels", + "prlctl": [ + [ "set", "{{.Name}}", "--memsize", "384" ], + [ "set", "{{.Name}}", "--cpus", "1" ] + ] } ], "post-processors": [ diff --git a/packer/debian-7.6-i386.json b/packer/debian-7.6-i386.json index 1d04d8904..8a19d39ab 100644 --- a/packer/debian-7.6-i386.json +++ b/packer/debian-7.6-i386.json @@ -83,7 +83,48 @@ "numvcpus": "1", "cpuid.coresPerSocket": "1" } + }, + { + "type": "parallels-iso", + "boot_command": [ + "<esc><wait>", + "install <wait>", + "preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/debian-7/preseed.cfg <wait>", + "debian-installer=en_US <wait>", + "auto <wait>", + "locale=en_US <wait>", + "kbd-chooser/method=us <wait>", + "keyboard-configuration/xkb-keymap=us <wait>", + "netcfg/get_hostname={{ .Name }} <wait>", + "netcfg/get_domain=vagrantup.com <wait>", + "fb=false <wait>", + "debconf/frontend=noninteractive <wait>", + "console-setup/ask_detect=false <wait>", + "console-keymaps-at/keymap=us <wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "guest_os_type": "debian", + "http_directory": "http", + "iso_checksum": "24e8e0ac74a12848e2601f3bb1821c52fc9049c5", + "iso_checksum_type": "sha1", + "iso_url": "{{user `mirror`}}/7.5.0/i386/iso-cd/debian-7.5.0-i386-CD-1.iso", + "ssh_username": "vagrant", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_wait_timeout": "10000s", + "shutdown_command": "echo 'vagrant'|sudo -S /sbin/shutdown -hP now", + "parallels_tools_flavor": "lin", + "prlctl_version_file": ".prlctl_version", + "vm_name": "packer-debian-7.5-i386", + "output_directory": "packer-debian-7.5-i386-parallels", + "prlctl": [ + [ "set", "{{.Name}}", "--memsize", "384" ], + [ "set", "{{.Name}}", "--cpus", "1" ] + ] } + ], "post-processors": [ { diff --git a/packer/fedora-19-i386.json b/packer/fedora-19-i386.json index f2a6906b9..f5e85ac96 100644 --- a/packer/fedora-19-i386.json +++ b/packer/fedora-19-i386.json @@ -61,7 +61,44 @@ "memsize": "512", "numvcpus": "1" } + }, + { + "boot_command": [ + "<tab> linux ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/fedora-19/ks.cfg<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "parallels_tools_flavor": "lin", + "guest_os_type": "fedora-core", + "http_directory": "http", + "iso_checksum": "0da29695c4f503e2b27350406c1ceb7a4e5b9b699ea722774368fd16ab277bce", + "iso_checksum_type": "sha256", + "iso_url": "{{user `mirror`}}/releases/19/Fedora/i386/iso/Fedora-19-i386-DVD.iso", + "output_directory": "packer-fedora-19-i386-parallels", + "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "parallels-iso", + "prlctl": [ + [ + "set", + "{{.Name}}", + "--memsize", + "512" + ], + [ + "set", + "{{.Name}}", + "--cpus", + "1" + ] + ], + "prlctl_version_file": ".prlctl_version", + "vm_name": "packer-fedora-19-i386" } + ], "post-processors": [ { diff --git a/packer/fedora-19-x86_64.json b/packer/fedora-19-x86_64.json index 987641301..fe2ce4272 100644 --- a/packer/fedora-19-x86_64.json +++ b/packer/fedora-19-x86_64.json @@ -61,7 +61,44 @@ "memsize": "512", "numvcpus": "1" } + }, + { + "boot_command": [ + "<tab> linux ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/fedora-19/ks.cfg<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "parallels_tools_flavor": "lin", + "guest_os_type": "fedora-core", + "http_directory": "http", + "iso_checksum": "6e7e263e607cfcadc90ea2ef5668aa3945d9eca596485a7a1f8a9f2478cc7084", + "iso_checksum_type": "sha256", + "iso_url": "{{user `mirror`}}/releases/19/Fedora/x86_64/iso/Fedora-19-x86_64-DVD.iso", + "output_directory": "packer-fedora-19-x86_64-parallels", + "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "parallels-iso", + "prlctl": [ + [ + "set", + "{{.Name}}", + "--memsize", + "512" + ], + [ + "set", + "{{.Name}}", + "--cpus", + "1" + ] + ], + "prlctl_version_file": ".prlctl_version", + "vm_name": "packer-fedora-19-x86_64" } + ], "post-processors": [ { diff --git a/packer/fedora-20-i386.json b/packer/fedora-20-i386.json index 0cf915805..385e872bd 100644 --- a/packer/fedora-20-i386.json +++ b/packer/fedora-20-i386.json @@ -61,7 +61,44 @@ "memsize": "512", "numvcpus": "1" } + }, + { + "boot_command": [ + "<tab> linux ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/fedora-20/ks.cfg<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "parallels_tools_flavor": "lin", + "guest_os_type": "fedora-core", + "http_directory": "http", + "iso_checksum": "284ea30ddd50db1b30cd5cd9fae7495dad8714ef1e4428d69a8c8ce80e03b6a9", + "iso_checksum_type": "sha256", + "iso_url": "{{user `mirror`}}/releases/20/Fedora/i386/iso/Fedora-20-i386-DVD.iso", + "output_directory": "packer-fedora-20-i386-parallels", + "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "parallels-iso", + "prlctl": [ + [ + "set", + "{{.Name}}", + "--memsize", + "512" + ], + [ + "set", + "{{.Name}}", + "--cpus", + "1" + ] + ], + "prlctl_version_file": ".prlctl_version", + "vm_name": "packer-fedora-20-i386" } + ], "post-processors": [ { diff --git a/packer/fedora-20-x86_64.json b/packer/fedora-20-x86_64.json index a040ea835..9ab3f8836 100644 --- a/packer/fedora-20-x86_64.json +++ b/packer/fedora-20-x86_64.json @@ -61,6 +61,42 @@ "memsize": "512", "numvcpus": "1" } + }, + { + "boot_command": [ + "<tab> linux ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/fedora-20/ks.cfg<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "parallels_tools_flavor": "lin", + "guest_os_type": "fedora-core", + "http_directory": "http", + "iso_checksum": "f2eeed5102b8890e9e6f4b9053717fe73031e699c4b76dc7028749ab66e7f917", + "iso_checksum_type": "sha256", + "iso_url": "{{user `mirror`}}/releases/20/Fedora/x86_64/iso/Fedora-20-x86_64-DVD.iso", + "output_directory": "packer-fedora-20-x86_64-parallels", + "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "parallels-iso", + "prlctl": [ + [ + "set", + "{{.Name}}", + "--memsize", + "512" + ], + [ + "set", + "{{.Name}}", + "--cpus", + "1" + ] + ], + "prlctl_version_file": ".prlctl_version", + "vm_name": "packer-fedora-20-x86_64" } ], "post-processors": [ diff --git a/packer/opensuse-13.1-i386.json b/packer/opensuse-13.1-i386.json index 48e718c0e..f0a72f200 100644 --- a/packer/opensuse-13.1-i386.json +++ b/packer/opensuse-13.1-i386.json @@ -69,6 +69,46 @@ "memsize": "480", "numvcpus": "1" } + }, + { + "boot_command": [ + "<esc><enter><wait>", + "linux netsetup=dhcp install=cd:/<wait>", + " lang=en_US autoyast=http://{{ .HTTPIP }}:{{ .HTTPPort }}/opensuse-13.1/autoinst.xml<wait>", + " textmode=1<wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 20480, + "guest_os_type": "opensuse", + "http_directory": "http", + "iso_checksum": "1bd6223430910f6d5a168d4e19171462", + "iso_checksum_type": "md5", + "iso_url": "{{user `mirror`}}/13.1/iso/openSUSE-13.1-DVD-i586.iso", + "output_directory": "packer-opensuse-13.1-i386-parallels", + "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "parallels-iso", + "parallels_tools_flavor": "lin", + "prlctl": [ + [ + "set", + "{{.Name}}", + "--memsize", + "480" + ], + [ + "set", + "{{.Name}}", + "--cpus", + "1" + ] + ], + "prlctl_version_file": ".prlctl_version", + "vm_name": "packer-opensuse-13.1-i386" } ], "post-processors": [ diff --git a/packer/opensuse-13.1-x86_64.json b/packer/opensuse-13.1-x86_64.json index f2aa800b0..bb2b4faec 100644 --- a/packer/opensuse-13.1-x86_64.json +++ b/packer/opensuse-13.1-x86_64.json @@ -69,6 +69,46 @@ "memsize": "480", "numvcpus": "1" } + }, + { + "boot_command": [ + "<esc><enter><wait>", + "linux netsetup=dhcp install=cd:/<wait>", + " lang=en_US autoyast=http://{{ .HTTPIP }}:{{ .HTTPPort }}/opensuse-13.1/autoinst.xml<wait>", + " textmode=1<wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 20480, + "guest_os_type": "opensuse", + "http_directory": "http", + "iso_checksum": "1096c9c67fc8a67a94a32d04a15e909d", + "iso_checksum_type": "md5", + "iso_url": "{{user `mirror`}}/13.1/iso/openSUSE-13.1-DVD-x86_64.iso", + "output_directory": "packer-opensuse-13.1-x86_64-parallels", + "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "parallels-iso", + "parallels_tools_flavor": "lin", + "prlctl": [ + [ + "set", + "{{.Name}}", + "--memsize", + "480" + ], + [ + "set", + "{{.Name}}", + "--cpus", + "1" + ] + ], + "prlctl_version_file": ".prlctl_version", + "vm_name": "packer-opensuse-13.1-x86_64" } ], "post-processors": [ diff --git a/packer/oracle-5.10-i386.json b/packer/oracle-5.10-i386.json index 2bd2eac31..37ae851f3 100644 --- a/packer/oracle-5.10-i386.json +++ b/packer/oracle-5.10-i386.json @@ -61,7 +61,44 @@ "memsize": "384", "numvcpus": "1" } + }, + { + "boot_command": [ + "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/centos-5.10/ks.cfg<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "parallels_tools_flavor": "lin", + "guest_os_type": "centos", + "http_directory": "http", + "iso_checksum": "5a9216dd69f17b9dd8f64ed539629741", + "iso_checksum_type": "md5", + "iso_url": "{{user `mirror`}}/Enterprise-R5-U10-Server-i386-dvd.iso", + "output_directory": "packer-oracle-5.10-i386-parallels", + "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "parallels-iso", + "prlctl": [ + [ + "set", + "{{.Name}}", + "--memsize", + "384" + ], + [ + "set", + "{{.Name}}", + "--cpus", + "1" + ] + ], + "prlctl_version_file": ".prlctl_version", + "vm_name": "packer-oracle-5.10-i386" } + ], "post-processors": [ { diff --git a/packer/oracle-5.10-x86_64.json b/packer/oracle-5.10-x86_64.json index a953ff6fd..ebb0f3637 100644 --- a/packer/oracle-5.10-x86_64.json +++ b/packer/oracle-5.10-x86_64.json @@ -61,7 +61,44 @@ "memsize": "384", "numvcpus": "1" } + }, + { + "boot_command": [ + "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/centos-5.10/ks.cfg<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "parallels_tools_flavor": "lin", + "guest_os_type": "centos", + "http_directory": "http", + "iso_checksum": "1aa0a1246b1a55108abf20aa2bcac00e", + "iso_checksum_type": "md5", + "iso_url": "{{user `mirror`}}/Enterprise-R5-U10-Server-x86_64-dvd.iso", + "output_directory": "packer-oracle-5.10-x86_64-parallels", + "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "parallels-iso", + "prlctl": [ + [ + "set", + "{{.Name}}", + "--memsize", + "384" + ], + [ + "set", + "{{.Name}}", + "--cpus", + "1" + ] + ], + "prlctl_version_file": ".prlctl_version", + "vm_name": "packer-oracle-5.10-x86_64" } + ], "post-processors": [ { diff --git a/packer/oracle-6.5-i386.json b/packer/oracle-6.5-i386.json index 9ff3c5f81..397ef2b86 100644 --- a/packer/oracle-6.5-i386.json +++ b/packer/oracle-6.5-i386.json @@ -61,7 +61,44 @@ "memsize": "480", "numvcpus": "1" } + }, + { + "boot_command": [ + "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/centos-6.5/ks.cfg<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "parallels_tools_flavor": "lin", + "guest_os_flavor": "centos", + "http_directory": "http", + "iso_url": "{{user `mirror`}}/OracleLinux-R6-U5-Server-i386-dvd.iso", + "iso_checksum": "5bd0a06295a4e50907da16d99a2f6cff54596b30", + "iso_checksum_type": "sha1", + "output_directory": "packer-oracle-6.5-i386-parallels", + "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "parallels-iso", + "prlctl": [ + [ + "set", + "{{.Name}}", + "--memsize", + "480" + ], + [ + "set", + "{{.Name}}", + "--cpus", + "1" + ] + ], + "prlctl_version_file": ".prlctl_version", + "vm_name": "packer-oracle-6.5-i386" } + ], "post-processors": [ { diff --git a/packer/oracle-6.5-x86_64.json b/packer/oracle-6.5-x86_64.json index c2e2e7571..b176a7e85 100644 --- a/packer/oracle-6.5-x86_64.json +++ b/packer/oracle-6.5-x86_64.json @@ -61,6 +61,42 @@ "memsize": "480", "numvcpus": "1" } + }, + { + "boot_command": [ + "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/centos-6.5/ks.cfg<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "parallels_tools_flavor": "lin", + "guest_os_type": "centos", + "http_directory": "http", + "iso_checksum": "a65041fbe0ba67e3ff6f5f93804a8f47d5b5f132", + "iso_checksum_type": "sha1", + "iso_url": "{{user `mirror`}}/OracleLinux-R6-U5-Server-x86_64-dvd.iso", + "output_directory": "packer-oracle-6.5-x86_64-parallels", + "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "parallels-iso", + "prlctl": [ + [ + "set", + "{{.Name}}", + "--memsize", + "480" + ], + [ + "set", + "{{.Name}}", + "--cpus", + "1" + ] + ], + "prlctl_version_file": ".prlctl_version", + "vm_name": "packer-oracle-6.5-x86_64" } ], "post-processors": [ diff --git a/packer/rhel-5.10-i386.json b/packer/rhel-5.10-i386.json index 21178fc4f..435bdb603 100644 --- a/packer/rhel-5.10-i386.json +++ b/packer/rhel-5.10-i386.json @@ -61,7 +61,44 @@ "memsize": "384", "numvcpus": "1" } + }, + { + "boot_command": [ + "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/centos-5.10/ks.cfg<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "parallels_tools_flavor": "lin", + "guest_os_type": "rhel", + "http_directory": "http", + "iso_checksum": "3a4db78ab70d866057c5285e0064d78125e1b8fd9dcaefea28818f6604b3515d", + "iso_checksum_type": "sha256", + "iso_url": "{{user `mirror`}}/rhel-server-5.10-i386-dvd.iso", + "output_directory": "packer-rhel-5.10-i386-parallels", + "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "parallels-iso", + "prlctl": [ + [ + "set", + "{{.Name}}", + "--memsize", + "384" + ], + [ + "set", + "{{.Name}}", + "--cpus", + "1" + ] + ], + "prlctl_version_file": ".prlctl_version", + "vm_name": "packer-rhel-5.10-i386" } + ], "post-processors": [ { diff --git a/packer/rhel-5.10-x86_64.json b/packer/rhel-5.10-x86_64.json index 80f01874f..263400af6 100644 --- a/packer/rhel-5.10-x86_64.json +++ b/packer/rhel-5.10-x86_64.json @@ -61,7 +61,44 @@ "memsize": "384", "numvcpus": "1" } + }, + { + "boot_command": [ + "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/centos-5.10/ks.cfg<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "parallels_tools_flavor": "lin", + "guest_os_type": "rhel", + "http_directory": "http", + "iso_checksum": "8b38e74b0993d478aad9c950f51a3e3441199639a3422e06fc3beca1f8825bf2", + "iso_checksum_type": "sha256", + "iso_url": "{{user `mirror`}}/rhel-server-5.10-x86_64-dvd.iso", + "output_directory": "packer-rhel-5.10-x86_64-parallels", + "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "parallels-iso", + "prlctl": [ + [ + "set", + "{{.Name}}", + "--memsize", + "384" + ], + [ + "set", + "{{.Name}}", + "--cpus", + "1" + ] + ], + "prlctl_version_file": ".prlctl_version", + "vm_name": "packer-rhel-5.10-x86_64" } + ], "post-processors": [ { diff --git a/packer/rhel-6.5-i386.json b/packer/rhel-6.5-i386.json index e83301826..c519a6133 100644 --- a/packer/rhel-6.5-i386.json +++ b/packer/rhel-6.5-i386.json @@ -61,7 +61,44 @@ "memsize": "480", "numvcpus": "1" } + }, + { + "boot_command": [ + "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/centos-6.5/ks.cfg<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "parallels_tools_flavor": "lin", + "guest_os_type": "rhel", + "http_directory": "http", + "iso_checksum": "eec692b436193ba9fc365cafe2b8f85323d98192dc99b23b02ae75045667fe4a", + "iso_checksum_type": "sha256", + "iso_url": "{{user `mirror`}}/rhel-server-6.5-i386-dvd.iso", + "output_directory": "packer-rhel-6.5-i386-parallels", + "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "parallels-iso", + "prlctl": [ + [ + "set", + "{{.Name}}", + "--memsize", + "480" + ], + [ + "set", + "{{.Name}}", + "--cpus", + "1" + ] + ], + "prlctl_version_file": ".prlctl_version", + "vm_name": "packer-rhel-6.5-i386" } + ], "post-processors": [ { diff --git a/packer/rhel-6.5-x86_64.json b/packer/rhel-6.5-x86_64.json index 874287ff1..e998357db 100644 --- a/packer/rhel-6.5-x86_64.json +++ b/packer/rhel-6.5-x86_64.json @@ -61,6 +61,42 @@ "memsize": "480", "numvcpus": "1" } + }, + { + "boot_command": [ + "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/centos-6.5/ks.cfg<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "parallels_tools_flavor": "lin", + "guest_os_type": "rhel", + "http_directory": "http", + "iso_checksum": "a51b90f3dd4585781293ea08adde60eeb9cfa94670943bd99e9c07f13a259539", + "iso_checksum_type": "sha256", + "iso_url": "{{user `mirror`}}/rhel-server-6.5-x86_64-dvd.iso", + "output_directory": "packer-rhel-6.5-x86_64-parallels", + "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "parallels-iso", + "prlctl": [ + [ + "set", + "{{.Name}}", + "--memsize", + "480" + ], + [ + "set", + "{{.Name}}", + "--cpus", + "1" + ] + ], + "prlctl_version_file": ".prlctl_version", + "vm_name": "packer-rhel-6.5-x86_64" } ], "post-processors": [ diff --git a/packer/rhel-7.0-x86_64.json b/packer/rhel-7.0-x86_64.json index e8e84f83f..4f34cd1f3 100644 --- a/packer/rhel-7.0-x86_64.json +++ b/packer/rhel-7.0-x86_64.json @@ -61,7 +61,44 @@ "memsize": "480", "numvcpus": "1" } + }, + { + "boot_command": [ + "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/centos-7.0/ks.cfg<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "parallels_tools_flavor": "lin", + "guest_os_type": "rhel", + "http_directory": "http", + "iso_checksum": "85a9fedc2bf0fc825cc7817056aa00b3ea87d7e111e0cf8de77d3ba643f8646c", + "iso_checksum_type": "sha256", + "iso_url": "{{user `mirror`}}/rhel-server-7.0-x86_64-dvd.iso", + "output_directory": "packer-rhel-7.0-x86_64-parallels", + "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "parallels-iso", + "prlctl": [ + [ + "set", + "{{.Name}}", + "--memsize", + "480" + ], + [ + "set", + "{{.Name}}", + "--cpus", + "1" + ] + ], + "prlctl_version_file": ".prlctl_version", + "vm_name": "packer-rhel-7.0-x86_64" } + ], "post-processors": [ { diff --git a/packer/scripts/common/vmtools.sh b/packer/scripts/common/vmtools.sh index 8983b60d6..d2439ea39 100644 --- a/packer/scripts/common/vmtools.sh +++ b/packer/scripts/common/vmtools.sh @@ -12,7 +12,7 @@ virtualbox-iso|virtualbox-ovf) rm /home/vagrant/*.iso ;; -vmware-iso|vmware-vmx) +vmware-iso|vmware-vmx) mkdir /tmp/vmfusion mkdir /tmp/vmfusion-archive mount -o loop /home/vagrant/linux.iso /tmp/vmfusion @@ -24,9 +24,18 @@ vmware-iso|vmware-vmx) rm /home/vagrant/*.iso ;; +parallels-iso|parallels-pvm) + mkdir /tmp/parallels + mount -o loop /home/vagrant/prl-tools-lin.iso /tmp/parallels + /tmp/parallels/install --install-unattended-with-deps + umount /tmp/parallels + rmdir /tmp/parallels + rm /home/vagrant/*.iso + ;; + *) echo "Unknown Packer Builder Type >>$PACKER_BUILDER_TYPE<< selected." - echo "Known are virtualbox-iso|virtualbox-ovf|vmware-iso|vmware-ovf." + echo "Known are virtualbox-iso|virtualbox-ovf|vmware-iso|vmware-vmx|parallels-iso|parallels-pvm." ;; esac diff --git a/packer/sles-11-sp2-i386.json b/packer/sles-11-sp2-i386.json index 90f5b721c..75a8a60aa 100644 --- a/packer/sles-11-sp2-i386.json +++ b/packer/sles-11-sp2-i386.json @@ -69,7 +69,45 @@ "memsize": "480", "numvcpus": "1" } + }, + { + "boot_command": [ + "<esc><enter><wait>", + "linux netdevice=eth0 netsetup=dhcp install=cd:/<wait>", + " lang=en_US autoyast=http://{{ .HTTPIP }}:{{ .HTTPPort }}/sles-11/sles-11-sp2-i386-autoinst.xml<wait>", + " textmode=1<wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 20480, + "parallels_tools_flavor": "lin", + "guest_os_type": "suse", + "http_directory": "http", + "output_directory": "packer-sles-11-sp2-i386-parallels", + "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "parallels-iso", + "prlctl": [ + [ + "set", + "{{.Name}}", + "--memsize", + "480" + ], + [ + "set", + "{{.Name}}", + "--cpus", + "1" + ] + ], + "prlctl_version_file": ".prlctl_version", + "vm_name": "packer-sles-11-sp2-i386" } + ], "post-processors": [ { diff --git a/packer/sles-11-sp2-x86_64.json b/packer/sles-11-sp2-x86_64.json index 7336429b5..dd603bbcc 100644 --- a/packer/sles-11-sp2-x86_64.json +++ b/packer/sles-11-sp2-x86_64.json @@ -69,7 +69,48 @@ "memsize": "480", "numvcpus": "1" } + }, + { + "boot_command": [ + "<esc><enter><wait>", + "linux netdevice=eth0 netsetup=dhcp install=cd:/<wait>", + " lang=en_US autoyast=http://{{ .HTTPIP }}:{{ .HTTPPort }}/sles-11/sles-11-sp2-x86_64-autoinst.xml<wait>", + " textmode=1<wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 20480, + "parallels_tools_flavor": "lin", + "guest_os_type": "suse", + "http_directory": "http", + "iso_checksum": "461d82ae6e15062b0807c1338f040497", + "iso_checksum_type": "md5", + "iso_url": "{{user `mirror`}}/SLES-11-SP2-DVD-x86_64-GM-DVD1.iso", + "output_directory": "packer-sles-11-sp2-x86_64-parallels", + "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "parallels-iso", + "prlctl": [ + [ + "set", + "{{.Name}}", + "--memsize", + "480" + ], + [ + "set", + "{{.Name}}", + "--cpus", + "1" + ] + ], + "prlctl_version_file": ".prlctl_version", + "vm_name": "packer-sles-11-sp2-x86_64" } + ], "post-processors": [ { diff --git a/packer/sles-11-sp3-i386.json b/packer/sles-11-sp3-i386.json index 6b8d409f7..2e96807a1 100644 --- a/packer/sles-11-sp3-i386.json +++ b/packer/sles-11-sp3-i386.json @@ -69,7 +69,48 @@ "memsize": "480", "numvcpus": "1" } + }, + { + "boot_command": [ + "<esc><enter><wait>", + "linux netdevice=eth0 netsetup=dhcp install=cd:/<wait>", + " lang=en_US autoyast=http://{{ .HTTPIP }}:{{ .HTTPPort }}/sles-11/sles-11-sp3-i386-autoinst.xml<wait>", + " textmode=1<wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 20480, + "parallels_tools_flavor": "lin", + "guest_os_type": "suse", + "http_directory": "http", + "iso_checksum": "5c30a409fc8fb3343b4dc90d93ff2c89", + "iso_checksum_type": "md5", + "iso_url": "{{user `mirror`}}/SLES-11-SP3-DVD-i586-GM-DVD1.iso", + "output_directory": "packer-sles-11-sp3-i386-parallels", + "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "parallels-iso", + "prlctl": [ + [ + "set", + "{{.Name}}", + "--memsize", + "480" + ], + [ + "set", + "{{.Name}}", + "--cpus", + "1" + ] + ], + "prlctl_version_file": ".prlctl_version", + "vm_name": "packer-sles-11-sp3-i386" } + ], "post-processors": [ { diff --git a/packer/sles-11-sp3-x86_64.json b/packer/sles-11-sp3-x86_64.json index 734c88fc7..3841cfa93 100644 --- a/packer/sles-11-sp3-x86_64.json +++ b/packer/sles-11-sp3-x86_64.json @@ -69,6 +69,46 @@ "memsize": "480", "numvcpus": "1" } + }, + { + "boot_command": [ + "<esc><enter><wait>", + "linux netdevice=eth0 netsetup=dhcp install=cd:/<wait>", + " lang=en_US autoyast=http://{{ .HTTPIP }}:{{ .HTTPPort }}/sles-11/sles-11-sp3-x86_64-autoinst.xml<wait>", + " textmode=1<wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 20480, + "parallels_tools_flavor": "lin", + "guest_os_type": "suse", + "http_directory": "http", + "iso_checksum": "480b70d50cbb538382dc2b9325221e1b", + "iso_checksum_type": "md5", + "iso_url": "{{user `mirror`}}/SLES-11-SP3-DVD-x86_64-GM-DVD1.iso", + "output_directory": "packer-sles-11-sp3-x86_64-parallels", + "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "parallels-iso", + "prlctl": [ + [ + "set", + "{{.Name}}", + "--memsize", + "480" + ], + [ + "set", + "{{.Name}}", + "--cpus", + "1" + ] + ], + "prlctl_version_file": ".prlctl_version", + "vm_name": "packer-sles-11-sp3-x86_64" } ], "post-processors": [ diff --git a/packer/ubuntu-10.04-amd64.json b/packer/ubuntu-10.04-amd64.json index f8488996c..73a3efd19 100644 --- a/packer/ubuntu-10.04-amd64.json +++ b/packer/ubuntu-10.04-amd64.json @@ -103,7 +103,65 @@ "memsize": "384", "numvcpus": "1" } + }, + { + "boot_command": [ + "<esc><wait>", + "<esc><wait>", + "<enter><wait>", + "/install/vmlinuz<wait>", + " auto<wait>", + " console-setup/ask_detect=false<wait>", + " console-setup/layoutcode=us<wait>", + " console-setup/modelcode=pc105<wait>", + " debconf/frontend=noninteractive<wait>", + " debian-installer=en_US<wait>", + " fb=false<wait>", + " initrd=/install/initrd.gz<wait>", + " kbd-chooser/method=us<wait>", + " keyboard-configuration/layout=USA<wait>", + " keyboard-configuration/variant=USA<wait>", + " locale=en_US<wait>", + " netcfg/get_domain=vm<wait>", + " netcfg/get_hostname=vagrant<wait>", + " noapic<wait>", + " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/ubuntu-10.04/preseed.cfg<wait>", + " -- <wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "parallels_tools_flavor": "lin", + "guest_os_type": "ubuntu", + "http_directory": "http", + "iso_checksum": "796e80702d65f2ee96e88874a1ab437e24df9cd6", + "iso_checksum_type": "sha1", + "iso_url": "{{user `mirror`}}/10.04.4/ubuntu-10.04.4-server-amd64.iso", + "output_directory": "packer-ubuntu-10.04-amd64-parallels", + "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "parallels-iso", + "prlctl": [ + [ + "set", + "{{.Name}}", + "--memsize", + "384" + ], + [ + "set", + "{{.Name}}", + "--cpus", + "1" + ] + ], + "prlctl_version_file": ".prlctl_version", + "vm_name": "packer-ubuntu-10.04-amd64" } + ], "post-processors": [ { diff --git a/packer/ubuntu-10.04-i386.json b/packer/ubuntu-10.04-i386.json index 7e02e6959..1f9008e17 100644 --- a/packer/ubuntu-10.04-i386.json +++ b/packer/ubuntu-10.04-i386.json @@ -103,7 +103,65 @@ "memsize": "384", "numvcpus": "1" } + }, + { + "boot_command": [ + "<esc><wait>", + "<esc><wait>", + "<enter><wait>", + "/install/vmlinuz<wait>", + " auto<wait>", + " console-setup/ask_detect=false<wait>", + " console-setup/layoutcode=us<wait>", + " console-setup/modelcode=pc105<wait>", + " debconf/frontend=noninteractive<wait>", + " debian-installer=en_US<wait>", + " fb=false<wait>", + " initrd=/install/initrd.gz<wait>", + " kbd-chooser/method=us<wait>", + " keyboard-configuration/layout=USA<wait>", + " keyboard-configuration/variant=USA<wait>", + " locale=en_US<wait>", + " netcfg/get_domain=vm<wait>", + " netcfg/get_hostname=vagrant<wait>", + " noapic<wait>", + " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/ubuntu-10.04/preseed.cfg<wait>", + " -- <wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "parallels_tools_flavor": "lin", + "guest_os_type": "ubuntu", + "http_directory": "http", + "iso_checksum": "5695d8b6b914269d1374ac8d4c3dd3786e92d3fe", + "iso_checksum_type": "sha1", + "iso_url": "{{user `mirror`}}/10.04.4/ubuntu-10.04.4-server-i386.iso", + "output_directory": "packer-ubuntu-10.04-i386-parallels", + "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "parallels-iso", + "prlctl": [ + [ + "set", + "{{.Name}}", + "--memsize", + "384" + ], + [ + "set", + "{{.Name}}", + "--cpus", + "1" + ] + ], + "prlctl_version_file": ".prlctl_version", + "vm_name": "packer-ubuntu-10.04-i386" } + ], "post-processors": [ { diff --git a/packer/ubuntu-12.04-amd64.json b/packer/ubuntu-12.04-amd64.json index b2313f9b4..52997a902 100644 --- a/packer/ubuntu-12.04-amd64.json +++ b/packer/ubuntu-12.04-amd64.json @@ -103,7 +103,65 @@ "memsize": "384", "numvcpus": "1" } + }, + { + "boot_command": [ + "<esc><wait>", + "<esc><wait>", + "<enter><wait>", + "/install/vmlinuz<wait>", + " auto<wait>", + " console-setup/ask_detect=false<wait>", + " console-setup/layoutcode=us<wait>", + " console-setup/modelcode=pc105<wait>", + " debconf/frontend=noninteractive<wait>", + " debian-installer=en_US<wait>", + " fb=false<wait>", + " initrd=/install/initrd.gz<wait>", + " kbd-chooser/method=us<wait>", + " keyboard-configuration/layout=USA<wait>", + " keyboard-configuration/variant=USA<wait>", + " locale=en_US<wait>", + " netcfg/get_domain=vm<wait>", + " netcfg/get_hostname=vagrant<wait>", + " noapic<wait>", + " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/ubuntu-12.04/preseed.cfg<wait>", + " -- <wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "parallels_tools_flavor": "lin", + "guest_os_type": "ubuntu", + "http_directory": "http", + "iso_checksum": "7540ace2d6cdee264432f5ed987236d32edef798", + "iso_checksum_type": "sha1", + "iso_url": "{{user `mirror`}}/12.04/ubuntu-12.04.5-server-amd64.iso", + "output_directory": "packer-ubuntu-12.04-amd64-parallels", + "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "parallels-iso", + "prlctl": [ + [ + "set", + "{{.Name}}", + "--memsize", + "384" + ], + [ + "set", + "{{.Name}}", + "--cpus", + "1" + ] + ], + "prlctl_version_file": ".prlctl_version", + "vm_name": "packer-ubuntu-12.04-amd64" } + ], "post-processors": [ { diff --git a/packer/ubuntu-12.04-i386.json b/packer/ubuntu-12.04-i386.json index 5e40a41f5..9ad0acb76 100644 --- a/packer/ubuntu-12.04-i386.json +++ b/packer/ubuntu-12.04-i386.json @@ -103,7 +103,65 @@ "memsize": "384", "numvcpus": "1" } + }, + { + "boot_command": [ + "<esc><wait>", + "<esc><wait>", + "<enter><wait>", + "/install/vmlinuz<wait>", + " auto<wait>", + " console-setup/ask_detect=false<wait>", + " console-setup/layoutcode=us<wait>", + " console-setup/modelcode=pc105<wait>", + " debconf/frontend=noninteractive<wait>", + " debian-installer=en_US<wait>", + " fb=false<wait>", + " initrd=/install/initrd.gz<wait>", + " kbd-chooser/method=us<wait>", + " keyboard-configuration/layout=USA<wait>", + " keyboard-configuration/variant=USA<wait>", + " locale=en_US<wait>", + " netcfg/get_domain=vm<wait>", + " netcfg/get_hostname=vagrant<wait>", + " noapic<wait>", + " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/ubuntu-12.04/preseed.cfg<wait>", + " -- <wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "parallels_tools_flavor": "lin", + "guest_os_type": "ubuntu", + "http_directory": "http", + "iso_checksum": "3bae12e315c89d42d7bf571e4e35efce585c7624", + "iso_checksum_type": "sha1", + "iso_url": "{{user `mirror`}}/12.04/ubuntu-12.04.4-server-i386.iso", + "output_directory": "packer-ubuntu-12.04-i386-parallels", + "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "parallels-iso", + "prlctl": [ + [ + "set", + "{{.Name}}", + "--memsize", + "384" + ], + [ + "set", + "{{.Name}}", + "--cpus", + "1" + ] + ], + "prlctl_version_file": ".prlctl_version", + "vm_name": "packer-ubuntu-12.04-i386" } + ], "post-processors": [ { diff --git a/packer/ubuntu-12.10-amd64.json b/packer/ubuntu-12.10-amd64.json index 20eee9fce..3a3982da3 100644 --- a/packer/ubuntu-12.10-amd64.json +++ b/packer/ubuntu-12.10-amd64.json @@ -103,7 +103,65 @@ "memsize": "384", "numvcpus": "1" } + }, + { + "boot_command": [ + "<esc><wait>", + "<esc><wait>", + "<enter><wait>", + "/install/vmlinuz<wait>", + " auto<wait>", + " console-setup/ask_detect=false<wait>", + " console-setup/layoutcode=us<wait>", + " console-setup/modelcode=pc105<wait>", + " debconf/frontend=noninteractive<wait>", + " debian-installer=en_US<wait>", + " fb=false<wait>", + " initrd=/install/initrd.gz<wait>", + " kbd-chooser/method=us<wait>", + " keyboard-configuration/layout=USA<wait>", + " keyboard-configuration/variant=USA<wait>", + " locale=en_US<wait>", + " netcfg/get_domain=vm<wait>", + " netcfg/get_hostname=vagrant<wait>", + " noapic<wait>", + " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/ubuntu-12.10/preseed.cfg<wait>", + " -- <wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "parallels_tools_flavor": "lin", + "guest_os_type": "ubuntu", + "http_directory": "http", + "iso_checksum": "e2a48af008ff3c4db6a8235151a1e90ea600fceb", + "iso_checksum_type": "sha1", + "iso_url": "{{user `mirror`}}/12.10/ubuntu-12.10-server-amd64.iso", + "output_directory": "packer-ubuntu-12.10-amd64-parallels", + "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "parallels-iso", + "prlctl": [ + [ + "set", + "{{.Name}}", + "--memsize", + "384" + ], + [ + "set", + "{{.Name}}", + "--cpus", + "1" + ] + ], + "prlctl_version_file": ".prlctl_version", + "vm_name": "packer-ubuntu-12.10-amd64" } + ], "post-processors": [ { diff --git a/packer/ubuntu-12.10-i386.json b/packer/ubuntu-12.10-i386.json index b9f982596..8305afab9 100644 --- a/packer/ubuntu-12.10-i386.json +++ b/packer/ubuntu-12.10-i386.json @@ -103,7 +103,65 @@ "memsize": "384", "numvcpus": "1" } + }, + { + "boot_command": [ + "<esc><wait>", + "<esc><wait>", + "<enter><wait>", + "/install/vmlinuz<wait>", + " auto<wait>", + " console-setup/ask_detect=false<wait>", + " console-setup/layoutcode=us<wait>", + " console-setup/modelcode=pc105<wait>", + " debconf/frontend=noninteractive<wait>", + " debian-installer=en_US<wait>", + " fb=false<wait>", + " initrd=/install/initrd.gz<wait>", + " kbd-chooser/method=us<wait>", + " keyboard-configuration/layout=USA<wait>", + " keyboard-configuration/variant=USA<wait>", + " locale=en_US<wait>", + " netcfg/get_domain=vm<wait>", + " netcfg/get_hostname=vagrant<wait>", + " noapic<wait>", + " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/ubuntu-12.10/preseed.cfg<wait>", + " -- <wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "parallels_tools_flavor": "lin", + "guest_os_type": "ubuntu", + "http_directory": "http", + "iso_checksum": "e0e48be7ae21003cf0b25591d71d8cdbee7063e7", + "iso_checksum_type": "sha1", + "iso_url": "{{user `mirror`}}/12.10/ubuntu-12.10-server-i386.iso", + "output_directory": "packer-ubuntu-12.10-i386-parallels", + "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "parallels-iso", + "prlctl": [ + [ + "set", + "{{.Name}}", + "--memsize", + "384" + ], + [ + "set", + "{{.Name}}", + "--cpus", + "1" + ] + ], + "prlctl_version_file": ".prlctl_version", + "vm_name": "packer-ubuntu-12.10-i386" } + ], "post-processors": [ { diff --git a/packer/ubuntu-14.04-amd64.json b/packer/ubuntu-14.04-amd64.json index 7cde373cc..0522db478 100644 --- a/packer/ubuntu-14.04-amd64.json +++ b/packer/ubuntu-14.04-amd64.json @@ -103,7 +103,65 @@ "memsize": "384", "numvcpus": "1" } + }, + { + "boot_command": [ + "<esc><wait>", + "<esc><wait>", + "<enter><wait>", + "/install/vmlinuz<wait>", + " auto<wait>", + " console-setup/ask_detect=false<wait>", + " console-setup/layoutcode=us<wait>", + " console-setup/modelcode=pc105<wait>", + " debconf/frontend=noninteractive<wait>", + " debian-installer=en_US<wait>", + " fb=false<wait>", + " initrd=/install/initrd.gz<wait>", + " kbd-chooser/method=us<wait>", + " keyboard-configuration/layout=USA<wait>", + " keyboard-configuration/variant=USA<wait>", + " locale=en_US<wait>", + " netcfg/get_domain=vm<wait>", + " netcfg/get_hostname=vagrant<wait>", + " noapic<wait>", + " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/ubuntu-14.04/preseed.cfg<wait>", + " -- <wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "parallels_tools_flavor": "lin", + "guest_os_type": "ubuntu", + "http_directory": "http", + "iso_checksum": "4d94f6111b8fe47da94396180ce499d8c0bb44f3", + "iso_checksum_type": "sha1", + "iso_url": "{{user `mirror`}}/14.04/ubuntu-14.04-server-amd64.iso", + "output_directory": "packer-ubuntu-14.04-amd64-parallels", + "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "parallels-iso", + "prlctl": [ + [ + "set", + "{{.Name}}", + "--memsize", + "384" + ], + [ + "set", + "{{.Name}}", + "--cpus", + "1" + ] + ], + "prlctl_version_file": ".prlctl_version", + "vm_name": "packer-ubuntu-14.04-amd64" } + ], "post-processors": [ { diff --git a/packer/ubuntu-14.04-i386.json b/packer/ubuntu-14.04-i386.json index b97948c1d..da187176f 100644 --- a/packer/ubuntu-14.04-i386.json +++ b/packer/ubuntu-14.04-i386.json @@ -103,7 +103,65 @@ "memsize": "384", "numvcpus": "1" } + }, + { + "boot_command": [ + "<esc><wait>", + "<esc><wait>", + "<enter><wait>", + "/install/vmlinuz<wait>", + " auto<wait>", + " console-setup/ask_detect=false<wait>", + " console-setup/layoutcode=us<wait>", + " console-setup/modelcode=pc105<wait>", + " debconf/frontend=noninteractive<wait>", + " debian-installer=en_US<wait>", + " fb=false<wait>", + " initrd=/install/initrd.gz<wait>", + " kbd-chooser/method=us<wait>", + " keyboard-configuration/layout=USA<wait>", + " keyboard-configuration/variant=USA<wait>", + " locale=en_US<wait>", + " netcfg/get_domain=vm<wait>", + " netcfg/get_hostname=vagrant<wait>", + " noapic<wait>", + " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/ubuntu-14.04/preseed.cfg<wait>", + " -- <wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "parallels_tools_flavor": "lin", + "guest_os_type": "ubuntu", + "http_directory": "http", + "iso_checksum": "33eb2ad62940aabe99f776f3c35ce90eaad6e2d2", + "iso_checksum_type": "sha1", + "iso_url": "{{user `mirror`}}/14.04/ubuntu-14.04-server-i386.iso", + "output_directory": "packer-ubuntu-14.04-i386-parallels", + "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "parallels-iso", + "prlctl": [ + [ + "set", + "{{.Name}}", + "--memsize", + "384" + ], + [ + "set", + "{{.Name}}", + "--cpus", + "1" + ] + ], + "prlctl_version_file": ".prlctl_version", + "vm_name": "packer-ubuntu-14.04-i386" } + ], "post-processors": [ { From 9c7f2d7d46dd1ae84595ee38a70394a6eb83c9bd Mon Sep 17 00:00:00 2001 From: "Julian C. Dunn" <jdunn@getchef.com> Date: Fri, 12 Sep 2014 00:32:14 -0400 Subject: [PATCH 0257/1622] Update Travis build to Packer 0.7.1, so the Parallels desktop builds pass. --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 1bb68ec43..ac7198ef4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,7 @@ rvm: - - 2.0.0 + - 2.1.2 -before_install: wget --no-check-certificate https://dl.bintray.com/mitchellh/packer/0.6.1_linux_amd64.zip && unzip -d packer 0.6.1_linux_amd64.zip +before_install: wget --no-check-certificate https://dl.bintray.com/mitchellh/packer/packer_0.7.1_linux_amd64.zip && unzip -d packer packer_0.7.1_linux_amd64.zip before_script: export PATH=$PATH:$PWD/packer script: bundle exec thor packer:validate From cf33012be1375f65500901e0fa1dbb57d4f167a3 Mon Sep 17 00:00:00 2001 From: Eric Shamow <eric.shamow@gmail.com> Date: Fri, 12 Sep 2014 02:13:22 -0700 Subject: [PATCH 0258/1622] Fix erroneous virtualbox output directory for vmware-iso build --- packer/solaris-10-x86.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packer/solaris-10-x86.json b/packer/solaris-10-x86.json index 99b9a895a..c0c024f5d 100644 --- a/packer/solaris-10-x86.json +++ b/packer/solaris-10-x86.json @@ -99,7 +99,7 @@ "shutdown_command": "/opt/csw/bin/sudo /usr/sbin/init 5", "shutdown_timeout": "10m", "vm_name": "packer-solaris-10u11-x86_64", - "output_directory": "packer-solaris-10u11-x86_64-virtualbox", + "output_directory": "packer-solaris-10u11-x86_64-vmware", "tools_upload_flavor": "solaris", "tools_upload_path": "/home/vagrant/solaris.iso", "vmx_data": { From 6ace8900976c3e3b52fb78f5eb207f65c1268657 Mon Sep 17 00:00:00 2001 From: "Julian C. Dunn" <jdunn@getchef.com> Date: Fri, 12 Sep 2014 23:25:10 -0400 Subject: [PATCH 0259/1622] Fix packer validation failures. --- packer/oracle-6.5-i386.json | 2 +- packer/sles-11-sp2-i386.json | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/packer/oracle-6.5-i386.json b/packer/oracle-6.5-i386.json index 397ef2b86..074b6f5f9 100644 --- a/packer/oracle-6.5-i386.json +++ b/packer/oracle-6.5-i386.json @@ -69,7 +69,7 @@ "boot_wait": "10s", "disk_size": 40960, "parallels_tools_flavor": "lin", - "guest_os_flavor": "centos", + "guest_os_type": "centos", "http_directory": "http", "iso_url": "{{user `mirror`}}/OracleLinux-R6-U5-Server-i386-dvd.iso", "iso_checksum": "5bd0a06295a4e50907da16d99a2f6cff54596b30", diff --git a/packer/sles-11-sp2-i386.json b/packer/sles-11-sp2-i386.json index 75a8a60aa..4a31b0008 100644 --- a/packer/sles-11-sp2-i386.json +++ b/packer/sles-11-sp2-i386.json @@ -83,6 +83,9 @@ "parallels_tools_flavor": "lin", "guest_os_type": "suse", "http_directory": "http", + "iso_checksum": "a0b34f6237b2b2a6b2174c82b40ed326", + "iso_checksum_type": "md5", + "iso_url": "{{user `mirror`}}/SLES-11-SP2-DVD-i586-GM-DVD1.iso", "output_directory": "packer-sles-11-sp2-i386-parallels", "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", From 636d43120cd53833e414cf1b085d7d76e0cfa8e0 Mon Sep 17 00:00:00 2001 From: Eric Shamow <eric.shamow@gmail.com> Date: Fri, 12 Sep 2014 13:08:06 -0700 Subject: [PATCH 0260/1622] Bump version from 11.1 to 11.2. Increase memory to meet minimum requirements. Use ~vagrant instead of hardcoded /home/vagrant to deal with peculiarities of OSes like Solaris for where the home directories are placed by default (/export/home versus /home) --- packer/scripts/common/vagrant.sh | 8 ++++---- packer/solaris-11-x86.json | 26 +++++++++++++------------- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/packer/scripts/common/vagrant.sh b/packer/scripts/common/vagrant.sh index cfb0ff2d6..f703c60de 100644 --- a/packer/scripts/common/vagrant.sh +++ b/packer/scripts/common/vagrant.sh @@ -1,8 +1,8 @@ #!/bin/bash -mkdir /home/vagrant/.ssh +mkdir ~vagrant/.ssh wget --no-check-certificate \ 'https://raw.githubusercontent.com/mitchellh/vagrant/master/keys/vagrant.pub' \ - -O /home/vagrant/.ssh/authorized_keys -chown -R vagrant /home/vagrant/.ssh -chmod -R go-rwsx /home/vagrant/.ssh + -O ~vagrant/.ssh/authorized_keys +chown -R vagrant ~vagrant/.ssh +chmod -R go-rwsx ~vagrant/.ssh diff --git a/packer/solaris-11-x86.json b/packer/solaris-11-x86.json index 0a2223dfa..b4b572a44 100644 --- a/packer/solaris-11-x86.json +++ b/packer/solaris-11-x86.json @@ -51,12 +51,12 @@ "tail -f /var/svc/log/application-auto-installer\\:default.log<enter><wait>" ], "boot_wait": "5s", - "disk_size": 15360, + "disk_size": 10360, "guest_os_type": "Solaris11_64", "http_directory": "http/solaris-11", - "iso_checksum": "f697fe5bc9cc4c901a52ce43229ab0d6", + "iso_checksum": "2b3859bb7532cfe42214349dff9fcc23", "iso_checksum_type": "md5", - "iso_url": "{{user `mirror`}}/sol-11_1-ai-x86.iso", + "iso_url": "{{user `mirror`}}/sol-11_2-ai-x86.iso", "ssh_username": "vagrant", "ssh_password": "vagrant", "ssh_port": 22, @@ -65,14 +65,14 @@ "shutdown_timeout": "10m", "guest_additions_mode": "attach", "virtualbox_version_file": ".vbox_version", - "vm_name": "packer-solaris-11.1-x86_64", - "output_directory": "packer-solaris-11.1-x86_64-virtualbox", + "vm_name": "packer-solaris-11.2-x86_64", + "output_directory": "packer-solaris-11.2-x86_64-virtualbox", "vboxmanage": [ [ "modifyvm", "{{.Name}}", "--memory", - "768" + "2048" ], [ "modifyvm", @@ -112,22 +112,22 @@ "tail -f /var/svc/log/application-auto-installer\\:default.log<enter><wait>" ], "boot_wait": "5s", - "disk_size": 15360, + "disk_size": 10360, "guest_os_type": "solaris11-64", "http_directory": "http/solaris-11", - "iso_checksum": "f697fe5bc9cc4c901a52ce43229ab0d6", + "iso_checksum": "2b3859bb7532cfe42214349dff9fcc23", "iso_checksum_type": "md5", - "iso_url": "{{user `mirror`}}/sol-11_1-ai-x86.iso", + "iso_url": "{{user `mirror`}}/sol-11_2-ai-x86.iso", "ssh_username": "vagrant", "ssh_password": "vagrant", "ssh_port": 22, "ssh_wait_timeout": "10000s", "shutdown_command": "echo 'vagrant'|sudo -i init 5", "shutdown_timeout": "10m", - "vm_name": "packer-solaris-11.1-x86_64", - "output_directory": "packer-solaris-11.1-x86_64-vmware", + "vm_name": "packer-solaris-11.2-x86_64", + "output_directory": "packer-solaris-11.2-x86_64-vmware", "vmx_data": { - "memsize": "768", + "memsize": "2048", "cpuid.coresPerSocket": "1", "numvcpus": "1" } @@ -135,7 +135,7 @@ ], "post-processors": [ { - "output": "../builds/{{.Provider}}/opscode_solaris-11.1_chef-{{user `chef_version`}}.box", + "output": "../builds/{{.Provider}}/opscode_solaris-11.2_chef-{{user `chef_version`}}.box", "type": "vagrant" } ] From 5d805d9e5442a4e9e32d5bec96026259325e3766 Mon Sep 17 00:00:00 2001 From: jevonearth <ebjorsell@gmail.com> Date: Fri, 19 Sep 2014 17:39:41 -0700 Subject: [PATCH 0261/1622] Fix syntax and typo share_folder -> synced_folder of console message. --- packer/scripts/freebsd/postinstall.sh | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/packer/scripts/freebsd/postinstall.sh b/packer/scripts/freebsd/postinstall.sh index 5b3768db4..b18744af3 100644 --- a/packer/scripts/freebsd/postinstall.sh +++ b/packer/scripts/freebsd/postinstall.sh @@ -62,9 +62,8 @@ echo "========================================================================== echo "NOTE: FreeBSD - Vagrant" echo "When using this basebox you need to do some special stuff in your Vagrantfile" echo "1) Enable HostOnly network" -echo " config.vm.network ...." +echo ' config.vm.network "private_network", ip: "192.168.33.10"' echo "2) Use nfs instead of shared folders" -echo ' config.vm.share_folder("v-root", "/vagrant", ".", :nfs => true)' +echo ' config.vm.synced_folder "v-root", "/vagrant", :nfs => true' echo "=============================================================================" - exit From 4011ba9b910f66f9ba8e2cab3120a56a47a92198 Mon Sep 17 00:00:00 2001 From: Eric Shamow <eric.shamow@gmail.com> Date: Mon, 29 Sep 2014 15:12:08 -0700 Subject: [PATCH 0262/1622] Upgrade CentOS 5 to 5.11 --- ...s-5.10-i386.json => centos-5.11-i386.json} | 32 +++++++++---------- ...10-x86_64.json => centos-5.11-x86_64.json} | 32 +++++++++---------- .../http/{centos-5.10 => centos-5.11}/ks.cfg | 0 3 files changed, 32 insertions(+), 32 deletions(-) rename packer/{centos-5.10-i386.json => centos-5.11-i386.json} (78%) rename packer/{centos-5.10-x86_64.json => centos-5.11-x86_64.json} (78%) rename packer/http/{centos-5.10 => centos-5.11}/ks.cfg (100%) diff --git a/packer/centos-5.10-i386.json b/packer/centos-5.11-i386.json similarity index 78% rename from packer/centos-5.10-i386.json rename to packer/centos-5.11-i386.json index e84b9db4c..a4f2209d3 100644 --- a/packer/centos-5.10-i386.json +++ b/packer/centos-5.11-i386.json @@ -2,17 +2,17 @@ "builders": [ { "boot_command": [ - "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/centos-5.10/ks.cfg<enter><wait>" + "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/centos-5.11/ks.cfg<enter><wait>" ], "boot_wait": "10s", "disk_size": 40960, "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "guest_os_type": "RedHat", "http_directory": "http", - "iso_checksum": "bb4e61210e1c0389fdf55c59bd2dd7bc957dd400", + "iso_checksum": "ec3a89b4edc8e391d13c1ecce4e6ce3917719e39", "iso_checksum_type": "sha1", - "iso_url": "{{user `mirror`}}/5.10/isos/i386/CentOS-5.10-i386-bin-DVD-1of2.iso", - "output_directory": "packer-centos-5.10-i386-virtualbox", + "iso_url": "{{user `mirror`}}/5.11/isos/i386/CentOS-5.11-i386-bin-DVD-1of2.iso", + "output_directory": "packer-centos-5.11-i386-virtualbox", "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, @@ -34,20 +34,20 @@ ] ], "virtualbox_version_file": ".vbox_version", - "vm_name": "packer-centos-5.10-i386" + "vm_name": "packer-centos-5.11-i386" }, { "boot_command": [ - "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/centos-5.10/ks.cfg<enter><wait>" + "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/centos-5.11/ks.cfg<enter><wait>" ], "boot_wait": "10s", "disk_size": 40960, "guest_os_type": "centos", "http_directory": "http", - "iso_checksum": "bb4e61210e1c0389fdf55c59bd2dd7bc957dd400", + "iso_checksum": "ec3a89b4edc8e391d13c1ecce4e6ce3917719e39", "iso_checksum_type": "sha1", - "iso_url": "{{user `mirror`}}/5.10/isos/i386/CentOS-5.10-i386-bin-DVD-1of2.iso", - "output_directory": "packer-centos-5.10-i386-vmware", + "iso_url": "{{user `mirror`}}/5.11/isos/i386/CentOS-5.11-i386-bin-DVD-1of2.iso", + "output_directory": "packer-centos-5.11-i386-vmware", "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, @@ -55,7 +55,7 @@ "ssh_wait_timeout": "10000s", "tools_upload_flavor": "linux", "type": "vmware-iso", - "vm_name": "packer-centos-5.10-i386", + "vm_name": "packer-centos-5.11-i386", "vmx_data": { "cpuid.coresPerSocket": "1", "memsize": "384", @@ -64,17 +64,17 @@ }, { "boot_command": [ - "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/centos-5.10/ks.cfg<enter><wait>" + "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/centos-5.11/ks.cfg<enter><wait>" ], "boot_wait": "10s", "disk_size": 40960, "parallels_tools_flavor": "lin", "guest_os_type": "centos", "http_directory": "http", - "iso_checksum": "bb4e61210e1c0389fdf55c59bd2dd7bc957dd400", + "iso_checksum": "ec3a89b4edc8e391d13c1ecce4e6ce3917719e39", "iso_checksum_type": "sha1", - "iso_url": "{{user `mirror`}}/5.10/isos/i386/CentOS-5.10-i386-bin-DVD-1of2.iso", - "output_directory": "packer-centos-5.10-i386-parallels", + "iso_url": "{{user `mirror`}}/5.11/isos/i386/CentOS-5.11-i386-bin-DVD-1of2.iso", + "output_directory": "packer-centos-5.11-i386-parallels", "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, @@ -96,13 +96,13 @@ ] ], "prlctl_version_file": ".prlctl_version", - "vm_name": "packer-centos-5.10-i386" + "vm_name": "packer-centos-5.11-i386" } ], "post-processors": [ { - "output": "../builds/{{.Provider}}/opscode_centos-5.10-i386_chef-{{user `chef_version`}}.box", + "output": "../builds/{{.Provider}}/opscode_centos-5.11-i386_chef-{{user `chef_version`}}.box", "type": "vagrant" } ], diff --git a/packer/centos-5.10-x86_64.json b/packer/centos-5.11-x86_64.json similarity index 78% rename from packer/centos-5.10-x86_64.json rename to packer/centos-5.11-x86_64.json index 97b7c3cd5..9f997d4da 100644 --- a/packer/centos-5.10-x86_64.json +++ b/packer/centos-5.11-x86_64.json @@ -2,17 +2,17 @@ "builders": [ { "boot_command": [ - "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/centos-5.10/ks.cfg<enter><wait>" + "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/centos-5.11/ks.cfg<enter><wait>" ], "boot_wait": "10s", "disk_size": 40960, "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "guest_os_type": "RedHat_64", "http_directory": "http", - "iso_checksum": "d8403b3fe4972eda3e147ee76d682a4a3beae1e1", + "iso_checksum": "ebd77f2fdfac8da04f31c508905cf52aa62937cc", "iso_checksum_type": "sha1", - "iso_url": "{{user `mirror`}}/5.10/isos/x86_64/CentOS-5.10-x86_64-bin-DVD-1of2.iso", - "output_directory": "packer-centos-5.10-x86_64-virtualbox", + "iso_url": "{{user `mirror`}}/5.11/isos/x86_64/CentOS-5.11-x86_64-bin-DVD-1of2.iso", + "output_directory": "packer-centos-5.11-x86_64-virtualbox", "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, @@ -34,20 +34,20 @@ ] ], "virtualbox_version_file": ".vbox_version", - "vm_name": "packer-centos-5.10-x86_64" + "vm_name": "packer-centos-5.11-x86_64" }, { "boot_command": [ - "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/centos-5.10/ks.cfg<enter><wait>" + "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/centos-5.11/ks.cfg<enter><wait>" ], "boot_wait": "10s", "disk_size": 40960, "guest_os_type": "centos-64", "http_directory": "http", - "iso_checksum": "d8403b3fe4972eda3e147ee76d682a4a3beae1e1", + "iso_checksum": "ebd77f2fdfac8da04f31c508905cf52aa62937cc", "iso_checksum_type": "sha1", - "iso_url": "{{user `mirror`}}/5.10/isos/x86_64/CentOS-5.10-x86_64-bin-DVD-1of2.iso", - "output_directory": "packer-centos-5.10-x86_64-vmware", + "iso_url": "{{user `mirror`}}/5.11/isos/x86_64/CentOS-5.11-x86_64-bin-DVD-1of2.iso", + "output_directory": "packer-centos-5.11-x86_64-vmware", "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, @@ -55,7 +55,7 @@ "ssh_wait_timeout": "10000s", "tools_upload_flavor": "linux", "type": "vmware-iso", - "vm_name": "packer-centos-5.10-x86_64", + "vm_name": "packer-centos-5.11-x86_64", "vmx_data": { "cpuid.coresPerSocket": "1", "memsize": "384", @@ -64,17 +64,17 @@ }, { "boot_command": [ - "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/centos-5.10/ks.cfg<enter><wait>" + "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/centos-5.11/ks.cfg<enter><wait>" ], "boot_wait": "10s", "disk_size": 40960, "parallels_tools_flavor": "lin", "guest_os_type": "centos", "http_directory": "http", - "iso_checksum": "d8403b3fe4972eda3e147ee76d682a4a3beae1e1", + "iso_checksum": "ebd77f2fdfac8da04f31c508905cf52aa62937cc", "iso_checksum_type": "sha1", - "iso_url": "{{user `mirror`}}/5.10/isos/x86_64/CentOS-5.10-x86_64-bin-DVD-1of2.iso", - "output_directory": "packer-centos-5.10-x86_64-parallels", + "iso_url": "{{user `mirror`}}/5.11/isos/x86_64/CentOS-5.11-x86_64-bin-DVD-1of2.iso", + "output_directory": "packer-centos-5.11-x86_64-parallels", "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, @@ -96,14 +96,14 @@ ] ], "prlctl_version_file": ".prlctl_version", - "vm_name": "packer-centos-5.10-x86_64" + "vm_name": "packer-centos-5.11-x86_64" } ], "post-processors": [ { - "output": "../builds/{{.Provider}}/opscode_centos-5.10_chef-{{user `chef_version`}}.box", + "output": "../builds/{{.Provider}}/opscode_centos-5.11_chef-{{user `chef_version`}}.box", "type": "vagrant" } ], diff --git a/packer/http/centos-5.10/ks.cfg b/packer/http/centos-5.11/ks.cfg similarity index 100% rename from packer/http/centos-5.10/ks.cfg rename to packer/http/centos-5.11/ks.cfg From 183fb081274d27cceb1b8c7773f01d5f5b34b605 Mon Sep 17 00:00:00 2001 From: "Julian C. Dunn" <jdunn@getchef.com> Date: Mon, 29 Sep 2014 21:55:02 -0700 Subject: [PATCH 0263/1622] Updated Oracle Enterprise Linux definitions to 5.11 --- ...e-5.10-i386.json => oracle-5.11-i386.json} | 34 +++++++++---------- ...10-x86_64.json => oracle-5.11-x86_64.json} | 34 +++++++++---------- 2 files changed, 34 insertions(+), 34 deletions(-) rename packer/{oracle-5.10-i386.json => oracle-5.11-i386.json} (76%) rename packer/{oracle-5.10-x86_64.json => oracle-5.11-x86_64.json} (76%) diff --git a/packer/oracle-5.10-i386.json b/packer/oracle-5.11-i386.json similarity index 76% rename from packer/oracle-5.10-i386.json rename to packer/oracle-5.11-i386.json index 37ae851f3..d0ca92e61 100644 --- a/packer/oracle-5.10-i386.json +++ b/packer/oracle-5.11-i386.json @@ -2,17 +2,17 @@ "builders": [ { "boot_command": [ - "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/centos-5.10/ks.cfg<enter><wait>" + "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/centos-5.11/ks.cfg<enter><wait>" ], "boot_wait": "10s", "disk_size": 40960, "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "guest_os_type": "Oracle", "http_directory": "http", - "iso_checksum": "5a9216dd69f17b9dd8f64ed539629741", + "iso_checksum": "f4ef2b868a0cccb736664136eca798ec", "iso_checksum_type": "md5", - "iso_url": "{{user `mirror`}}/Enterprise-R5-U10-Server-i386-dvd.iso", - "output_directory": "packer-oracle-5.10-i386-virtualbox", + "iso_url": "{{user `mirror`}}/Enterprise-R5-U11-Server-i386-dvd.iso", + "output_directory": "packer-oracle-5.11-i386-virtualbox", "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, @@ -34,20 +34,20 @@ ] ], "virtualbox_version_file": ".vbox_version", - "vm_name": "packer-oracle-5.10-i386" + "vm_name": "packer-oracle-5.11-i386" }, { "boot_command": [ - "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/centos-5.10/ks.cfg<enter><wait>" + "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/centos-5.11/ks.cfg<enter><wait>" ], "boot_wait": "10s", "disk_size": 40960, "guest_os_type": "oraclelinux", "http_directory": "http", - "iso_checksum": "5a9216dd69f17b9dd8f64ed539629741", + "iso_checksum": "f4ef2b868a0cccb736664136eca798ec", "iso_checksum_type": "md5", - "iso_url": "{{user `mirror`}}/Enterprise-R5-U10-Server-i386-dvd.iso", - "output_directory": "packer-oracle-5.10-i386-vmware", + "iso_url": "{{user `mirror`}}/Enterprise-R5-U11-Server-i386-dvd.iso", + "output_directory": "packer-oracle-5.11-i386-vmware", "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, @@ -55,7 +55,7 @@ "ssh_wait_timeout": "10000s", "tools_upload_flavor": "linux", "type": "vmware-iso", - "vm_name": "packer-oracle-5.10-i386", + "vm_name": "packer-oracle-5.11-i386", "vmx_data": { "cpuid.coresPerSocket": "1", "memsize": "384", @@ -64,17 +64,17 @@ }, { "boot_command": [ - "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/centos-5.10/ks.cfg<enter><wait>" + "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/centos-5.11/ks.cfg<enter><wait>" ], "boot_wait": "10s", "disk_size": 40960, "parallels_tools_flavor": "lin", "guest_os_type": "centos", "http_directory": "http", - "iso_checksum": "5a9216dd69f17b9dd8f64ed539629741", + "iso_checksum": "f4ef2b868a0cccb736664136eca798ec", "iso_checksum_type": "md5", - "iso_url": "{{user `mirror`}}/Enterprise-R5-U10-Server-i386-dvd.iso", - "output_directory": "packer-oracle-5.10-i386-parallels", + "iso_url": "{{user `mirror`}}/Enterprise-R5-U11-Server-i386-dvd.iso", + "output_directory": "packer-oracle-5.11-i386-parallels", "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, @@ -96,13 +96,13 @@ ] ], "prlctl_version_file": ".prlctl_version", - "vm_name": "packer-oracle-5.10-i386" + "vm_name": "packer-oracle-5.11-i386" } ], "post-processors": [ { - "output": "../builds/{{.Provider}}/opscode_oracle-5.10-i386_chef-{{user `chef_version`}}.box", + "output": "../builds/{{.Provider}}/opscode_oracle-5.11-i386_chef-{{user `chef_version`}}.box", "type": "vagrant" } ], @@ -125,7 +125,7 @@ ], "variables": { "chef_version": "provisionerless", - "mirror": "http://mirrors.dotsrc.org/oracle-linux/EL5/U10/i386" + "mirror": "http://mirrors.dotsrc.org/oracle-linux/EL5/U11/i386" } } diff --git a/packer/oracle-5.10-x86_64.json b/packer/oracle-5.11-x86_64.json similarity index 76% rename from packer/oracle-5.10-x86_64.json rename to packer/oracle-5.11-x86_64.json index ebb0f3637..2a0d74733 100644 --- a/packer/oracle-5.10-x86_64.json +++ b/packer/oracle-5.11-x86_64.json @@ -2,17 +2,17 @@ "builders": [ { "boot_command": [ - "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/centos-5.10/ks.cfg<enter><wait>" + "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/centos-5.11/ks.cfg<enter><wait>" ], "boot_wait": "10s", "disk_size": 40960, "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "guest_os_type": "Oracle_64", "http_directory": "http", - "iso_checksum": "1aa0a1246b1a55108abf20aa2bcac00e", + "iso_checksum": "8af2121088c7e6f5ebdb6d5900403240", "iso_checksum_type": "md5", - "iso_url": "{{user `mirror`}}/Enterprise-R5-U10-Server-x86_64-dvd.iso", - "output_directory": "packer-oracle-5.10-x86_64-virtualbox", + "iso_url": "{{user `mirror`}}/Enterprise-R5-U11-Server-x86_64-dvd.iso", + "output_directory": "packer-oracle-5.11-x86_64-virtualbox", "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, @@ -34,20 +34,20 @@ ] ], "virtualbox_version_file": ".vbox_version", - "vm_name": "packer-oracle-5.10-x86_64" + "vm_name": "packer-oracle-5.11-x86_64" }, { "boot_command": [ - "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/centos-5.10/ks.cfg<enter><wait>" + "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/centos-5.11/ks.cfg<enter><wait>" ], "boot_wait": "10s", "disk_size": 40960, "guest_os_type": "oraclelinux-64", "http_directory": "http", - "iso_checksum": "1aa0a1246b1a55108abf20aa2bcac00e", + "iso_checksum": "8af2121088c7e6f5ebdb6d5900403240", "iso_checksum_type": "md5", - "iso_url": "{{user `mirror`}}/Enterprise-R5-U10-Server-x86_64-dvd.iso", - "output_directory": "packer-oracle-5.10-x86_64-vmware", + "iso_url": "{{user `mirror`}}/Enterprise-R5-U11-Server-x86_64-dvd.iso", + "output_directory": "packer-oracle-5.11-x86_64-vmware", "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, @@ -55,7 +55,7 @@ "ssh_wait_timeout": "10000s", "tools_upload_flavor": "linux", "type": "vmware-iso", - "vm_name": "packer-oracle-5.10-x86_64", + "vm_name": "packer-oracle-5.11-x86_64", "vmx_data": { "cpuid.coresPerSocket": "1", "memsize": "384", @@ -64,17 +64,17 @@ }, { "boot_command": [ - "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/centos-5.10/ks.cfg<enter><wait>" + "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/centos-5.11/ks.cfg<enter><wait>" ], "boot_wait": "10s", "disk_size": 40960, "parallels_tools_flavor": "lin", "guest_os_type": "centos", "http_directory": "http", - "iso_checksum": "1aa0a1246b1a55108abf20aa2bcac00e", + "iso_checksum": "8af2121088c7e6f5ebdb6d5900403240", "iso_checksum_type": "md5", - "iso_url": "{{user `mirror`}}/Enterprise-R5-U10-Server-x86_64-dvd.iso", - "output_directory": "packer-oracle-5.10-x86_64-parallels", + "iso_url": "{{user `mirror`}}/Enterprise-R5-U11-Server-x86_64-dvd.iso", + "output_directory": "packer-oracle-5.11-x86_64-parallels", "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, @@ -96,13 +96,13 @@ ] ], "prlctl_version_file": ".prlctl_version", - "vm_name": "packer-oracle-5.10-x86_64" + "vm_name": "packer-oracle-5.11-x86_64" } ], "post-processors": [ { - "output": "../builds/{{.Provider}}/opscode_oracle-5.10_chef-{{user `chef_version`}}.box", + "output": "../builds/{{.Provider}}/opscode_oracle-5.11_chef-{{user `chef_version`}}.box", "type": "vagrant" } ], @@ -125,7 +125,7 @@ ], "variables": { "chef_version": "provisionerless", - "mirror": "http://mirrors.dotsrc.org/oracle-linux/EL5/U10/x86_64" + "mirror": "http://mirrors.dotsrc.org/oracle-linux/EL5/U11/x86_64" } } From 736ed10af84aeb1bf52d3fe28f1fc73c8a3aff15 Mon Sep 17 00:00:00 2001 From: "Julian C. Dunn" <jdunn@getchef.com> Date: Tue, 30 Sep 2014 23:06:31 -0700 Subject: [PATCH 0264/1622] Updated RHEL to 5.11. --- ...hel-5.10-i386.json => rhel-5.11-i386.json} | 34 +++++++++---------- ...5.10-x86_64.json => rhel-5.11-x86_64.json} | 34 +++++++++---------- 2 files changed, 34 insertions(+), 34 deletions(-) rename packer/{rhel-5.10-i386.json => rhel-5.11-i386.json} (75%) rename packer/{rhel-5.10-x86_64.json => rhel-5.11-x86_64.json} (75%) diff --git a/packer/rhel-5.10-i386.json b/packer/rhel-5.11-i386.json similarity index 75% rename from packer/rhel-5.10-i386.json rename to packer/rhel-5.11-i386.json index 435bdb603..d8932c31f 100644 --- a/packer/rhel-5.10-i386.json +++ b/packer/rhel-5.11-i386.json @@ -2,17 +2,17 @@ "builders": [ { "boot_command": [ - "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/centos-5.10/ks.cfg<enter><wait>" + "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/centos-5.11/ks.cfg<enter><wait>" ], "boot_wait": "10s", "disk_size": 40960, "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "guest_os_type": "RedHat", "http_directory": "http", - "iso_checksum": "3a4db78ab70d866057c5285e0064d78125e1b8fd9dcaefea28818f6604b3515d", + "iso_checksum": "4e38e4ed06d83efb10446e7db19d96761715cdbdbf0bbfacb978b44ce368bbe2", "iso_checksum_type": "sha256", - "iso_url": "{{user `mirror`}}/rhel-server-5.10-i386-dvd.iso", - "output_directory": "packer-rhel-5.10-i386-virtualbox", + "iso_url": "{{user `mirror`}}/rhel-server-5.11-i386-dvd.iso", + "output_directory": "packer-rhel-5.11-i386-virtualbox", "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, @@ -34,20 +34,20 @@ ] ], "virtualbox_version_file": ".vbox_version", - "vm_name": "packer-rhel-5.10-i386" + "vm_name": "packer-rhel-5.11-i386" }, { "boot_command": [ - "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/centos-5.10/ks.cfg<enter><wait>" + "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/centos-5.11/ks.cfg<enter><wait>" ], "boot_wait": "10s", "disk_size": 40960, "guest_os_type": "redhat", "http_directory": "http", - "iso_checksum": "3a4db78ab70d866057c5285e0064d78125e1b8fd9dcaefea28818f6604b3515d", + "iso_checksum": "4e38e4ed06d83efb10446e7db19d96761715cdbdbf0bbfacb978b44ce368bbe2", "iso_checksum_type": "sha256", - "iso_url": "{{user `mirror`}}/rhel-server-5.10-i386-dvd.iso", - "output_directory": "packer-rhel-5.10-i386-vmware", + "iso_url": "{{user `mirror`}}/rhel-server-5.11-i386-dvd.iso", + "output_directory": "packer-rhel-5.11-i386-vmware", "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, @@ -55,7 +55,7 @@ "ssh_wait_timeout": "10000s", "tools_upload_flavor": "linux", "type": "vmware-iso", - "vm_name": "packer-rhel-5.10-i386", + "vm_name": "packer-rhel-5.11-i386", "vmx_data": { "cpuid.coresPerSocket": "1", "memsize": "384", @@ -64,17 +64,17 @@ }, { "boot_command": [ - "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/centos-5.10/ks.cfg<enter><wait>" + "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/centos-5.11/ks.cfg<enter><wait>" ], "boot_wait": "10s", "disk_size": 40960, "parallels_tools_flavor": "lin", "guest_os_type": "rhel", "http_directory": "http", - "iso_checksum": "3a4db78ab70d866057c5285e0064d78125e1b8fd9dcaefea28818f6604b3515d", + "iso_checksum": "4e38e4ed06d83efb10446e7db19d96761715cdbdbf0bbfacb978b44ce368bbe2", "iso_checksum_type": "sha256", - "iso_url": "{{user `mirror`}}/rhel-server-5.10-i386-dvd.iso", - "output_directory": "packer-rhel-5.10-i386-parallels", + "iso_url": "{{user `mirror`}}/rhel-server-5.11-i386-dvd.iso", + "output_directory": "packer-rhel-5.11-i386-parallels", "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, @@ -96,13 +96,13 @@ ] ], "prlctl_version_file": ".prlctl_version", - "vm_name": "packer-rhel-5.10-i386" + "vm_name": "packer-rhel-5.11-i386" } ], "post-processors": [ { - "output": "../builds/{{.Provider}}/opscode_rhel-5.10-i386_chef-{{user `chef_version`}}.box", + "output": "../builds/{{.Provider}}/opscode_rhel-5.11-i386_chef-{{user `chef_version`}}.box", "type": "vagrant" } ], @@ -125,7 +125,7 @@ ], "variables": { "chef_version": "provisionerless", - "mirror": "https://content-web.rhn.redhat.com/rhn/isos/rhel-5.10/md5sum/1ab756241a4a209b8d39abe6bace84a9" + "mirror": "https://content-web.rhn.redhat.com/rhn/isos/rhel-5.11/md5sum/1ab756241a4a209b8d39abe6bace84a9" } } diff --git a/packer/rhel-5.10-x86_64.json b/packer/rhel-5.11-x86_64.json similarity index 75% rename from packer/rhel-5.10-x86_64.json rename to packer/rhel-5.11-x86_64.json index 263400af6..afe80175b 100644 --- a/packer/rhel-5.10-x86_64.json +++ b/packer/rhel-5.11-x86_64.json @@ -2,17 +2,17 @@ "builders": [ { "boot_command": [ - "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/centos-5.10/ks.cfg<enter><wait>" + "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/centos-5.11/ks.cfg<enter><wait>" ], "boot_wait": "10s", "disk_size": 40960, "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "guest_os_type": "RedHat_64", "http_directory": "http", - "iso_checksum": "8b38e74b0993d478aad9c950f51a3e3441199639a3422e06fc3beca1f8825bf2", + "iso_checksum": "36565fe0c8a97207d63234d10123daeedb29d509576dbd7b34e71958ac2f9050", "iso_checksum_type": "sha256", - "iso_url": "{{user `mirror`}}/rhel-server-5.10-x86_64-dvd.iso", - "output_directory": "packer-rhel-5.10-x86_64-virtualbox", + "iso_url": "{{user `mirror`}}/rhel-server-5.11-x86_64-dvd.iso", + "output_directory": "packer-rhel-5.11-x86_64-virtualbox", "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, @@ -34,20 +34,20 @@ ] ], "virtualbox_version_file": ".vbox_version", - "vm_name": "packer-rhel-5.10-x86_64" + "vm_name": "packer-rhel-5.11-x86_64" }, { "boot_command": [ - "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/centos-5.10/ks.cfg<enter><wait>" + "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/centos-5.11/ks.cfg<enter><wait>" ], "boot_wait": "10s", "disk_size": 40960, "guest_os_type": "rhel5-64", "http_directory": "http", - "iso_checksum": "8b38e74b0993d478aad9c950f51a3e3441199639a3422e06fc3beca1f8825bf2", + "iso_checksum": "36565fe0c8a97207d63234d10123daeedb29d509576dbd7b34e71958ac2f9050", "iso_checksum_type": "sha256", - "iso_url": "{{user `mirror`}}/rhel-server-5.10-x86_64-dvd.iso", - "output_directory": "packer-rhel-5.10-x86_64-vmware", + "iso_url": "{{user `mirror`}}/rhel-server-5.11-x86_64-dvd.iso", + "output_directory": "packer-rhel-5.11-x86_64-vmware", "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, @@ -55,7 +55,7 @@ "ssh_wait_timeout": "10000s", "tools_upload_flavor": "linux", "type": "vmware-iso", - "vm_name": "packer-rhel-5.10-x86_64", + "vm_name": "packer-rhel-5.11-x86_64", "vmx_data": { "cpuid.coresPerSocket": "1", "memsize": "384", @@ -64,17 +64,17 @@ }, { "boot_command": [ - "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/centos-5.10/ks.cfg<enter><wait>" + "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/centos-5.11/ks.cfg<enter><wait>" ], "boot_wait": "10s", "disk_size": 40960, "parallels_tools_flavor": "lin", "guest_os_type": "rhel", "http_directory": "http", - "iso_checksum": "8b38e74b0993d478aad9c950f51a3e3441199639a3422e06fc3beca1f8825bf2", + "iso_checksum": "36565fe0c8a97207d63234d10123daeedb29d509576dbd7b34e71958ac2f9050", "iso_checksum_type": "sha256", - "iso_url": "{{user `mirror`}}/rhel-server-5.10-x86_64-dvd.iso", - "output_directory": "packer-rhel-5.10-x86_64-parallels", + "iso_url": "{{user `mirror`}}/rhel-server-5.11-x86_64-dvd.iso", + "output_directory": "packer-rhel-5.11-x86_64-parallels", "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, @@ -96,13 +96,13 @@ ] ], "prlctl_version_file": ".prlctl_version", - "vm_name": "packer-rhel-5.10-x86_64" + "vm_name": "packer-rhel-5.11-x86_64" } ], "post-processors": [ { - "output": "../builds/{{.Provider}}/opscode_rhel-5.10_chef-{{user `chef_version`}}.box", + "output": "../builds/{{.Provider}}/opscode_rhel-5.11_chef-{{user `chef_version`}}.box", "type": "vagrant" } ], @@ -125,7 +125,7 @@ ], "variables": { "chef_version": "provisionerless", - "mirror": "https://content-web.rhn.redhat.com/rhn/isos/rhel-5.10/md5sum/86cc2d5548ee2ff9c8d3e2b4db3e6001" + "mirror": "https://content-web.rhn.redhat.com/rhn/isos/rhel-5.11/md5sum/86cc2d5548ee2ff9c8d3e2b4db3e6001" } } From cd2c829204258c5e95807a13f901e02feedc40ba Mon Sep 17 00:00:00 2001 From: ceetav <ceetav@gmail.com> Date: Thu, 16 Oct 2014 23:18:25 +0400 Subject: [PATCH 0265/1622] Reduce Linux box size by not packing a swap partition * Whiteout swap partition for CentOS, Debian, Fedora, OpenSUSE, Oracle, RHEL, SLES, Ubuntu * FreeBSD has no support for blkid, left it as is --- packer/freebsd-10.0-amd64.json | 2 +- packer/freebsd-10.0-i386.json | 2 +- packer/freebsd-9.3-amd64.json | 2 +- packer/freebsd-9.3-i386.json | 2 +- packer/scripts/common/minimize.sh | 8 ++++++++ packer/scripts/freebsd/minimize.sh | 7 +++++++ 6 files changed, 19 insertions(+), 4 deletions(-) create mode 100644 packer/scripts/freebsd/minimize.sh diff --git a/packer/freebsd-10.0-amd64.json b/packer/freebsd-10.0-amd64.json index e49fa913d..f5733c801 100644 --- a/packer/freebsd-10.0-amd64.json +++ b/packer/freebsd-10.0-amd64.json @@ -12,7 +12,7 @@ "scripts/common/chef.sh", "scripts/freebsd/cleanup.sh", "scripts/freebsd/vmtools.sh", - "scripts/common/minimize.sh" + "scripts/freebsd/minimize.sh" ], "execute_command": "export {{.Vars}} && cat {{.Path}} | su -m" } diff --git a/packer/freebsd-10.0-i386.json b/packer/freebsd-10.0-i386.json index c8686a81c..e56646e37 100644 --- a/packer/freebsd-10.0-i386.json +++ b/packer/freebsd-10.0-i386.json @@ -12,7 +12,7 @@ "scripts/common/chef.sh", "scripts/freebsd/cleanup.sh", "scripts/freebsd/vmtools.sh", - "scripts/common/minimize.sh" + "scripts/freebsd/minimize.sh" ], "execute_command": "export {{.Vars}} && cat {{.Path}} | su -m" } diff --git a/packer/freebsd-9.3-amd64.json b/packer/freebsd-9.3-amd64.json index 1f01eddb4..5739808f0 100644 --- a/packer/freebsd-9.3-amd64.json +++ b/packer/freebsd-9.3-amd64.json @@ -105,7 +105,7 @@ "scripts/freebsd/vmtools.sh", "scripts/common/chef.sh", "scripts/freebsd/cleanup.sh", - "scripts/common/minimize.sh" + "scripts/freebsd/minimize.sh" ], "type": "shell" } diff --git a/packer/freebsd-9.3-i386.json b/packer/freebsd-9.3-i386.json index 061006f41..971b076e8 100644 --- a/packer/freebsd-9.3-i386.json +++ b/packer/freebsd-9.3-i386.json @@ -102,7 +102,7 @@ "scripts/freebsd/vmtools.sh", "scripts/common/chef.sh", "scripts/freebsd/cleanup.sh", - "scripts/common/minimize.sh" + "scripts/freebsd/minimize.sh" ], "type": "shell" } diff --git a/packer/scripts/common/minimize.sh b/packer/scripts/common/minimize.sh index 9a014d87f..564710e2d 100644 --- a/packer/scripts/common/minimize.sh +++ b/packer/scripts/common/minimize.sh @@ -1,5 +1,13 @@ #!/bin/sh -eux +# Whiteout the swap partition to reduce box size +# Swap is disabled till reboot +readonly swapuuid=$(/sbin/blkid -o value -l -s UUID -t TYPE=swap) +readonly swappart=$(readlink -f /dev/disk/by-uuid/"$swapuuid") +/sbin/swapoff "$swappart" +dd if=/dev/zero of="$swappart" bs=1M || echo "dd exit code $? is suppressed" +/sbin/mkswap -U "$swapuuid" "$swappart" + dd if=/dev/zero of=/EMPTY bs=1M rm -f /EMPTY # Block until the empty file has been removed, otherwise, Packer diff --git a/packer/scripts/freebsd/minimize.sh b/packer/scripts/freebsd/minimize.sh new file mode 100644 index 000000000..9a014d87f --- /dev/null +++ b/packer/scripts/freebsd/minimize.sh @@ -0,0 +1,7 @@ +#!/bin/sh -eux + +dd if=/dev/zero of=/EMPTY bs=1M +rm -f /EMPTY +# Block until the empty file has been removed, otherwise, Packer +# will try to kill the box while the disk is still full and that's bad +sync From ed28371d52e523688556f2d830f9986e1d72e32e Mon Sep 17 00:00:00 2001 From: Nathan L Smith <smith@getchef.com> Date: Thu, 23 Oct 2014 10:59:19 -0500 Subject: [PATCH 0266/1622] add note in readme about vmware fusion provider --- README.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/README.md b/README.md index 54e46af73..a904ce966 100644 --- a/README.md +++ b/README.md @@ -52,6 +52,10 @@ These baseboxes were all built using a Mac OS X host running VirtualBox 4.3.14, These baseboxes were all built using a Mac OS X host running VMWare Fusion 6.0.2, and have that version of VMWare Tools. The boxes should work unchanged in VMWare Workstation for Windows or Linux. +If you're using the [Vagrant VMWare Fusion](https://www.vagrantup.com/vmware) +provider, using `vagrant box add --provider vmware_desktop ...` will work for +these boxes. Using `--provider vmware_fusion`, will not. + * [opscode-centos-5.10-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_centos-5.10-i386_chef-provisionerless.box) * [opscode-centos-5.10](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_centos-5.10_chef-provisionerless.box) * [opscode-centos-6.5-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_centos-6.5-i386_chef-provisionerless.box) From 74bf9b2bc43e9db2ceb2de3484bb0326a697c4d6 Mon Sep 17 00:00:00 2001 From: Vincent AUBERT <vincentaubert88@gmail.com> Date: Sat, 25 Oct 2014 22:23:01 +0200 Subject: [PATCH 0267/1622] update debian to 7.7 --- ...n-7.6-amd64.json => debian-7.7-amd64.json} | 26 +++++++++---------- ...ian-7.6-i386.json => debian-7.7-i386.json} | 26 +++++++++---------- 2 files changed, 26 insertions(+), 26 deletions(-) rename packer/{debian-7.6-amd64.json => debian-7.7-amd64.json} (84%) rename packer/{debian-7.6-i386.json => debian-7.7-i386.json} (85%) diff --git a/packer/debian-7.6-amd64.json b/packer/debian-7.7-amd64.json similarity index 84% rename from packer/debian-7.6-amd64.json rename to packer/debian-7.7-amd64.json index f36778ec2..9674b5dc7 100644 --- a/packer/debian-7.6-amd64.json +++ b/packer/debian-7.7-amd64.json @@ -27,9 +27,9 @@ "disk_size": 40960, "guest_os_type": "Debian_64", "http_directory": "http", - "iso_checksum": "ba6f8194b5970be964a5de86522423135358908a", + "iso_checksum": "df60b786ddd22710574ecb51d0a6e7f579cdd14a", "iso_checksum_type": "sha1", - "iso_url": "{{user `mirror`}}/7.6.0/amd64/iso-cd/debian-7.6.0-amd64-CD-1.iso", + "iso_url": "{{user `mirror`}}/7.7.0/amd64/iso-cd/debian-7.7.0-amd64-CD-1.iso", "ssh_username": "vagrant", "ssh_password": "vagrant", "ssh_port": 22, @@ -37,8 +37,8 @@ "shutdown_command": "echo 'vagrant'|sudo -S /sbin/shutdown -hP now", "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "virtualbox_version_file": ".vbox_version", - "vm_name": "packer-debian-7.6-amd64", - "output_directory": "packer-debian-7.6-amd64-virtualbox", + "vm_name": "packer-debian-7.7-amd64", + "output_directory": "packer-debian-7.7-amd64-virtualbox", "vboxmanage": [ [ "modifyvm", "{{.Name}}", "--memory", "384" ], [ "modifyvm", "{{.Name}}", "--cpus", "1" ] @@ -67,17 +67,17 @@ "disk_size": 40960, "guest_os_type": "debian5-64", "http_directory": "http", - "iso_checksum": "ba6f8194b5970be964a5de86522423135358908a", + "iso_checksum": "df60b786ddd22710574ecb51d0a6e7f579cdd14a", "iso_checksum_type": "sha1", - "iso_url": "{{user `mirror`}}/7.6.0/amd64/iso-cd/debian-7.6.0-amd64-CD-1.iso", + "iso_url": "{{user `mirror`}}/7.7.0/amd64/iso-cd/debian-7.7.0-amd64-CD-1.iso", "ssh_username": "vagrant", "ssh_password": "vagrant", "ssh_port": 22, "ssh_wait_timeout": "10000s", "shutdown_command": "echo 'vagrant'|sudo -S /sbin/shutdown -hP now", "tools_upload_flavor": "linux", - "vm_name": "packer-debian-7.6-amd64", - "output_directory": "packer-debian-7.6-amd64-vmware", + "vm_name": "packer-debian-7.7-amd64", + "output_directory": "packer-debian-7.7-amd64-vmware", "vmx_data": { "memsize": "384", "numvcpus": "1", @@ -107,9 +107,9 @@ "disk_size": 40960, "guest_os_type": "debian", "http_directory": "http", - "iso_checksum": "ba6f8194b5970be964a5de86522423135358908a", + "iso_checksum": "df60b786ddd22710574ecb51d0a6e7f579cdd14a", "iso_checksum_type": "sha1", - "iso_url": "{{user `mirror`}}/7.6.0/amd64/iso-cd/debian-7.6.0-amd64-CD-1.iso", + "iso_url": "{{user `mirror`}}/7.7.0/amd64/iso-cd/debian-7.7.0-amd64-CD-1.iso", "ssh_username": "vagrant", "ssh_password": "vagrant", "ssh_port": 22, @@ -117,8 +117,8 @@ "shutdown_command": "echo 'vagrant'|sudo -S /sbin/shutdown -hP now", "parallels_tools_flavor": "lin", "prlctl_version_file": ".prlctl_version", - "vm_name": "packer-debian-7.6-amd64", - "output_directory": "packer-debian-7.6-amd64-parallels", + "vm_name": "packer-debian-7.7-amd64", + "output_directory": "packer-debian-7.7-amd64-parallels", "prlctl": [ [ "set", "{{.Name}}", "--memsize", "384" ], [ "set", "{{.Name}}", "--cpus", "1" ] @@ -128,7 +128,7 @@ "post-processors": [ { "type": "vagrant", - "output": "../builds/{{.Provider}}/opscode_debian-7.6_chef-{{user `chef_version`}}.box" + "output": "../builds/{{.Provider}}/opscode_debian-7.7_chef-{{user `chef_version`}}.box" } ], "provisioners": [ diff --git a/packer/debian-7.6-i386.json b/packer/debian-7.7-i386.json similarity index 85% rename from packer/debian-7.6-i386.json rename to packer/debian-7.7-i386.json index 8a19d39ab..f46a56759 100644 --- a/packer/debian-7.6-i386.json +++ b/packer/debian-7.7-i386.json @@ -27,9 +27,9 @@ "disk_size": 40960, "guest_os_type": "Debian", "http_directory": "http", - "iso_checksum": "ac7abf86a6077a242ac367aef3d4f18a8232098b", + "iso_checksum": "ca22b069189ab6b7a1f931ee64c7a2a81ac73c99", "iso_checksum_type": "sha1", - "iso_url": "{{user `mirror`}}/7.6.0/i386/iso-cd/debian-7.6.0-i386-CD-1.iso", + "iso_url": "{{user `mirror`}}/7.7.0/i386/iso-cd/debian-7.7.0-i386-CD-1.iso", "ssh_username": "vagrant", "ssh_password": "vagrant", "ssh_port": 22, @@ -37,8 +37,8 @@ "shutdown_command": "echo 'vagrant'|sudo -S /sbin/shutdown -hP now", "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "virtualbox_version_file": ".vbox_version", - "vm_name": "packer-debian-7.6-i386", - "output_directory": "packer-debian-7.6-i386-virtualbox", + "vm_name": "packer-debian-7.7-i386", + "output_directory": "packer-debian-7.7-i386-virtualbox", "vboxmanage": [ [ "modifyvm", "{{.Name}}", "--memory", "384" ], [ "modifyvm", "{{.Name}}", "--cpus", "1" ] @@ -67,17 +67,17 @@ "disk_size": 40960, "guest_os_type": "debian5", "http_directory": "http", - "iso_checksum": "ac7abf86a6077a242ac367aef3d4f18a8232098b", + "iso_checksum": "ca22b069189ab6b7a1f931ee64c7a2a81ac73c99", "iso_checksum_type": "sha1", - "iso_url": "{{user `mirror`}}/7.6.0/i386/iso-cd/debian-7.6.0-i386-CD-1.iso", + "iso_url": "{{user `mirror`}}/7.7.0/i386/iso-cd/debian-7.7.0-i386-CD-1.iso", "ssh_username": "vagrant", "ssh_password": "vagrant", "ssh_port": 22, "ssh_wait_timeout": "10000s", "shutdown_command": "echo 'vagrant'|sudo -S /sbin/shutdown -hP now", "tools_upload_flavor": "linux", - "vm_name": "packer-debian-7.6-i386", - "output_directory": "packer-debian-7.6-i386-vmware", + "vm_name": "packer-debian-7.7-i386", + "output_directory": "packer-debian-7.7-i386-vmware", "vmx_data": { "memsize": "384", "numvcpus": "1", @@ -107,9 +107,9 @@ "disk_size": 40960, "guest_os_type": "debian", "http_directory": "http", - "iso_checksum": "24e8e0ac74a12848e2601f3bb1821c52fc9049c5", + "iso_checksum": "ca22b069189ab6b7a1f931ee64c7a2a81ac73c99", "iso_checksum_type": "sha1", - "iso_url": "{{user `mirror`}}/7.5.0/i386/iso-cd/debian-7.5.0-i386-CD-1.iso", + "iso_url": "{{user `mirror`}}/7.7.0/i386/iso-cd/debian-7.7.0-i386-CD-1.iso", "ssh_username": "vagrant", "ssh_password": "vagrant", "ssh_port": 22, @@ -117,8 +117,8 @@ "shutdown_command": "echo 'vagrant'|sudo -S /sbin/shutdown -hP now", "parallels_tools_flavor": "lin", "prlctl_version_file": ".prlctl_version", - "vm_name": "packer-debian-7.5-i386", - "output_directory": "packer-debian-7.5-i386-parallels", + "vm_name": "packer-debian-7.7-i386", + "output_directory": "packer-debian-7.7-i386-parallels", "prlctl": [ [ "set", "{{.Name}}", "--memsize", "384" ], [ "set", "{{.Name}}", "--cpus", "1" ] @@ -129,7 +129,7 @@ "post-processors": [ { "type": "vagrant", - "output": "../builds/{{.Provider}}/opscode_debian-7.6-i386_chef-{{user `chef_version`}}.box" + "output": "../builds/{{.Provider}}/opscode_debian-7.7-i386_chef-{{user `chef_version`}}.box" } ], "provisioners": [ From fd8abf8ebd705fcdab79c35bc3b13121f11b6893 Mon Sep 17 00:00:00 2001 From: "Julian C. Dunn" <jdunn@getchef.com> Date: Sat, 25 Oct 2014 22:38:08 -0400 Subject: [PATCH 0268/1622] Moved CentOS 5.10 to old boxes. Added links for CentOS 5.11. --- OLD-BOXES.md | 4 ++++ README.md | 10 +++++----- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/OLD-BOXES.md b/OLD-BOXES.md index 810628bd3..b6744662f 100644 --- a/OLD-BOXES.md +++ b/OLD-BOXES.md @@ -8,6 +8,8 @@ Boxes for obsolete operating systems will be placed here. ### VirtualBox +* [opscode-centos-5.10-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_centos-5.10-i386_chef-provisionerless.box) +* [opscode-centos-5.10](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_centos-5.10_chef-provisionerless.box) * [opscode-centos-6.4-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_centos-6.4-i386_chef-provisionerless.box) * [opscode-centos-6.4](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_centos-6.4_chef-provisionerless.box) * [opscode-debian-7.2.0-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_debian-7.2.0-i386_chef-provisionerless.box) @@ -23,6 +25,8 @@ Boxes for obsolete operating systems will be placed here. ### VMWare +* [opscode-centos-5.10-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_centos-5.10-i386_chef-provisionerless.box) +* [opscode-centos-5.10](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_centos-5.10_chef-provisionerless.box) * [opscode-centos-6.4-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_centos-6.4-i386_chef-provisionerless.box) * [opscode-centos-6.4](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_centos-6.4_chef-provisionerless.box) * [opscode-debian-7.2.0-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_debian-7.2.0-i386_chef-provisionerless.box) diff --git a/README.md b/README.md index 54e46af73..098ccd31b 100644 --- a/README.md +++ b/README.md @@ -20,10 +20,10 @@ Vagrant can be instructed to install Chef at runtime using the ### VirtualBox -These baseboxes were all built using a Mac OS X host running VirtualBox 4.3.14, and have that format of Guest Extensions. +These baseboxes were all built using a Mac OS X host running VirtualBox 4.3.16, and have that format of Guest Extensions. -* [opscode-centos-5.10-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_centos-5.10-i386_chef-provisionerless.box) -* [opscode-centos-5.10](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_centos-5.10_chef-provisionerless.box) +* [opscode-centos-5.11-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_centos-5.11-i386_chef-provisionerless.box) +* [opscode-centos-5.11](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_centos-5.11_chef-provisionerless.box) * [opscode-centos-6.5-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_centos-6.5-i386_chef-provisionerless.box) * [opscode-centos-6.5](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_centos-6.5_chef-provisionerless.box) * [opscode-centos-7.0](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_centos-7.0_chef-provisionerless.box) @@ -52,8 +52,8 @@ These baseboxes were all built using a Mac OS X host running VirtualBox 4.3.14, These baseboxes were all built using a Mac OS X host running VMWare Fusion 6.0.2, and have that version of VMWare Tools. The boxes should work unchanged in VMWare Workstation for Windows or Linux. -* [opscode-centos-5.10-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_centos-5.10-i386_chef-provisionerless.box) -* [opscode-centos-5.10](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_centos-5.10_chef-provisionerless.box) +* [opscode-centos-5.11-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_centos-5.11-i386_chef-provisionerless.box) +* [opscode-centos-5.11](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_centos-5.11_chef-provisionerless.box) * [opscode-centos-6.5-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_centos-6.5-i386_chef-provisionerless.box) * [opscode-centos-6.5](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_centos-6.5_chef-provisionerless.box) * [opscode-centos-7.0](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_centos-7.0_chef-provisionerless.box) From 66fbb692bb65f4a628cf067d8833b30759c25612 Mon Sep 17 00:00:00 2001 From: "Julian C. Dunn" <jdunn@getchef.com> Date: Sat, 25 Oct 2014 23:37:02 -0400 Subject: [PATCH 0269/1622] Updated to Debian 7.7 --- OLD-BOXES.md | 4 ++++ README.md | 8 ++++---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/OLD-BOXES.md b/OLD-BOXES.md index b6744662f..28a359414 100644 --- a/OLD-BOXES.md +++ b/OLD-BOXES.md @@ -14,6 +14,8 @@ Boxes for obsolete operating systems will be placed here. * [opscode-centos-6.4](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_centos-6.4_chef-provisionerless.box) * [opscode-debian-7.2.0-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_debian-7.2.0-i386_chef-provisionerless.box) * [opscode-debian-7.2.0](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_debian-7.2.0_chef-provisionerless.box) +* [opscode-debian-7.6-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_debian-7.6-i386_chef-provisionerless.box) +* [opscode-debian-7.6](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_debian-7.6_chef-provisionerless.box) * [opscode-fedora-18-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_fedora-18-i386_chef-provisionerless.box) * [opscode-fedora-18](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_fedora-18_chef-provisionerless.box) * [opscode-ubuntu-12.10-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_ubuntu-12.10-i386_chef-provisionerless.box) @@ -31,6 +33,8 @@ Boxes for obsolete operating systems will be placed here. * [opscode-centos-6.4](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_centos-6.4_chef-provisionerless.box) * [opscode-debian-7.2.0-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_debian-7.2.0-i386_chef-provisionerless.box) * [opscode-debian-7.2.0](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_debian-7.2.0_chef-provisionerless.box) +* [opscode-debian-7.6-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_debian-7.6-i386_chef-provisionerless.box) +* [opscode-debian-7.6](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_debian-7.6_chef-provisionerless.box) * [opscode-fedora-18-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_fedora-18-i386_chef-provisionerless.box) * [opscode-fedora-18](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_fedora-18_chef-provisionerless.box) * [opscode-ubuntu-12.10-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_ubuntu-12.10-i386_chef-provisionerless.box) diff --git a/README.md b/README.md index 424eb9d0f..a0b291e7b 100644 --- a/README.md +++ b/README.md @@ -29,8 +29,8 @@ These baseboxes were all built using a Mac OS X host running VirtualBox 4.3.16, * [opscode-centos-7.0](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_centos-7.0_chef-provisionerless.box) * [opscode-debian-6.0.10-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_debian-6.0.10-i386_chef-provisionerless.box) * [opscode-debian-6.0.10](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_debian-6.0.10_chef-provisionerless.box) -* [opscode-debian-7.6-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_debian-7.6-i386_chef-provisionerless.box) -* [opscode-debian-7.6](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_debian-7.6_chef-provisionerless.box) +* [opscode-debian-7.7-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_debian-7.7-i386_chef-provisionerless.box) +* [opscode-debian-7.7](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_debian-7.7_chef-provisionerless.box) * [opscode-fedora-19-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_fedora-19-i386_chef-provisionerless.box) * [opscode-fedora-19](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_fedora-19_chef-provisionerless.box) * [opscode-fedora-20-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_fedora-20-i386_chef-provisionerless.box) @@ -63,8 +63,8 @@ these boxes. Using `--provider vmware_fusion`, will not. * [opscode-centos-7.0](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_centos-7.0_chef-provisionerless.box) * [opscode-debian-6.0.10-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_debian-6.0.10-i386_chef-provisionerless.box) * [opscode-debian-6.0.10](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_debian-6.0.10_chef-provisionerless.box) -* [opscode-debian-7.6-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_debian-7.6-i386_chef-provisionerless.box) -* [opscode-debian-7.6](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_debian-7.6_chef-provisionerless.box) +* [opscode-debian-7.7-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_debian-7.7-i386_chef-provisionerless.box) +* [opscode-debian-7.7](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_debian-7.7_chef-provisionerless.box) * [opscode-fedora-19-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_fedora-19-i386_chef-provisionerless.box) * [opscode-fedora-19](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_fedora-19_chef-provisionerless.box) * [opscode-fedora-20-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_fedora-20-i386_chef-provisionerless.box) From b6829a4dc3ea40a3ce557ee76cdb8316575e2b62 Mon Sep 17 00:00:00 2001 From: Vincent AUBERT <vincentaubert88@gmail.com> Date: Sun, 26 Oct 2014 18:37:35 +0100 Subject: [PATCH 0270/1622] adds ubuntu 14.10 configuration --- README.md | 4 + packer/http/ubuntu-14.10/preseed.cfg | 31 +++++ packer/ubuntu-14.10-amd64.json | 196 +++++++++++++++++++++++++++ packer/ubuntu-14.10-i386.json | 196 +++++++++++++++++++++++++++ 4 files changed, 427 insertions(+) create mode 100644 packer/http/ubuntu-14.10/preseed.cfg create mode 100644 packer/ubuntu-14.10-amd64.json create mode 100644 packer/ubuntu-14.10-i386.json diff --git a/README.md b/README.md index a0b291e7b..5bac973f8 100644 --- a/README.md +++ b/README.md @@ -46,6 +46,8 @@ These baseboxes were all built using a Mac OS X host running VirtualBox 4.3.16, * [opscode-ubuntu-12.04](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_ubuntu-12.04_chef-provisionerless.box) * [opscode-ubuntu-14.04-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_ubuntu-14.04-i386_chef-provisionerless.box) * [opscode-ubuntu-14.04](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_ubuntu-14.04_chef-provisionerless.box) +* [opscode-ubuntu-14.10-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_ubuntu-14.10-i386_chef-provisionerless.box) +* [opscode-ubuntu-14.10](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_ubuntu-14.10_chef-provisionerless.box) ### VMWare @@ -80,6 +82,8 @@ these boxes. Using `--provider vmware_fusion`, will not. * [opscode-ubuntu-12.04](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_ubuntu-12.04_chef-provisionerless.box) * [opscode-ubuntu-14.04-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_ubuntu-14.04-i386_chef-provisionerless.box) * [opscode-ubuntu-14.04](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_ubuntu-14.04_chef-provisionerless.box) +* [opscode-ubuntu-14.10-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_ubuntu-14.10-i386_chef-provisionerless.box) +* [opscode-ubuntu-14.10](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_ubuntu-14.10_chef-provisionerless.box) ## Older Baseboxes diff --git a/packer/http/ubuntu-14.10/preseed.cfg b/packer/http/ubuntu-14.10/preseed.cfg new file mode 100644 index 000000000..0a4d4939b --- /dev/null +++ b/packer/http/ubuntu-14.10/preseed.cfg @@ -0,0 +1,31 @@ +choose-mirror-bin mirror/http/proxy string +d-i base-installer/kernel/override-image string linux-server +d-i clock-setup/utc boolean true +d-i clock-setup/utc-auto boolean true +d-i finish-install/reboot_in_progress note +d-i grub-installer/only_debian boolean true +d-i grub-installer/with_other_os boolean true +d-i partman-auto-lvm/guided_size string max +d-i partman-auto/choose_recipe select atomic +d-i partman-auto/method string lvm +d-i partman-lvm/confirm boolean true +d-i partman-lvm/confirm boolean true +d-i partman-lvm/confirm_nooverwrite boolean true +d-i partman-lvm/device_remove_lvm boolean true +d-i partman/choose_partition select finish +d-i partman/confirm boolean true +d-i partman/confirm_nooverwrite boolean true +d-i partman/confirm_write_new_label boolean true +d-i passwd/user-fullname string vagrant +d-i passwd/user-uid string 900 +d-i passwd/user-password password vagrant +d-i passwd/user-password-again password vagrant +d-i passwd/username string vagrant +d-i pkgsel/include string openssh-server cryptsetup build-essential libssl-dev libreadline-dev zlib1g-dev linux-source dkms nfs-common +d-i pkgsel/install-language-support boolean false +d-i pkgsel/update-policy select unattended-upgrades +d-i pkgsel/upgrade select full-upgrade +d-i time/zone string UTC +d-i user-setup/allow-password-weak boolean true +d-i user-setup/encrypt-home boolean false +tasksel tasksel/first multiselect standard, ubuntu-server diff --git a/packer/ubuntu-14.10-amd64.json b/packer/ubuntu-14.10-amd64.json new file mode 100644 index 000000000..e70f4f64a --- /dev/null +++ b/packer/ubuntu-14.10-amd64.json @@ -0,0 +1,196 @@ +{ + "builders": [ + { + "boot_command": [ + "<esc><wait>", + "<esc><wait>", + "<enter><wait>", + "/install/vmlinuz<wait>", + " auto<wait>", + " console-setup/ask_detect=false<wait>", + " console-setup/layoutcode=us<wait>", + " console-setup/modelcode=pc105<wait>", + " debconf/frontend=noninteractive<wait>", + " debian-installer=en_US<wait>", + " fb=false<wait>", + " initrd=/install/initrd.gz<wait>", + " kbd-chooser/method=us<wait>", + " keyboard-configuration/layout=USA<wait>", + " keyboard-configuration/variant=USA<wait>", + " locale=en_US<wait>", + " netcfg/get_domain=vm<wait>", + " netcfg/get_hostname=vagrant<wait>", + " noapic<wait>", + " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/ubuntu-14.10/preseed.cfg<wait>", + " -- <wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "guest_os_type": "Ubuntu_64", + "http_directory": "http", + "iso_checksum": "0c1ebea31c3523cfe9a4ffed8bcf6c7d23dfb97b", + "iso_checksum_type": "sha1", + "iso_url": "{{user `mirror`}}/14.10/ubuntu-14.10-server-amd64.iso", + "output_directory": "packer-ubuntu-14.10-amd64-virtualbox", + "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "virtualbox-iso", + "vboxmanage": [ + [ + "modifyvm", + "{{.Name}}", + "--memory", + "384" + ], + [ + "modifyvm", + "{{.Name}}", + "--cpus", + "1" + ] + ], + "virtualbox_version_file": ".vbox_version", + "vm_name": "packer-ubuntu-14.10-amd64" + }, + { + "boot_command": [ + "<esc><wait>", + "<esc><wait>", + "<enter><wait>", + "/install/vmlinuz<wait>", + " auto<wait>", + " console-setup/ask_detect=false<wait>", + " console-setup/layoutcode=us<wait>", + " console-setup/modelcode=pc105<wait>", + " debconf/frontend=noninteractive<wait>", + " debian-installer=en_US<wait>", + " fb=false<wait>", + " initrd=/install/initrd.gz<wait>", + " kbd-chooser/method=us<wait>", + " keyboard-configuration/layout=USA<wait>", + " keyboard-configuration/variant=USA<wait>", + " locale=en_US<wait>", + " netcfg/get_domain=vm<wait>", + " netcfg/get_hostname=vagrant<wait>", + " noapic<wait>", + " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/ubuntu-14.10/preseed.cfg<wait>", + " -- <wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "guest_os_type": "ubuntu-64", + "http_directory": "http", + "iso_checksum": "0c1ebea31c3523cfe9a4ffed8bcf6c7d23dfb97b", + "iso_checksum_type": "sha1", + "iso_url": "{{user `mirror`}}/14.10/ubuntu-14.10-server-amd64.iso", + "output_directory": "packer-ubuntu-14.10-amd64-vmware", + "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "tools_upload_flavor": "linux", + "type": "vmware-iso", + "vm_name": "packer-ubuntu-14.10-amd64", + "vmx_data": { + "cpuid.coresPerSocket": "1", + "memsize": "384", + "numvcpus": "1" + } + }, + { + "boot_command": [ + "<esc><wait>", + "<esc><wait>", + "<enter><wait>", + "/install/vmlinuz<wait>", + " auto<wait>", + " console-setup/ask_detect=false<wait>", + " console-setup/layoutcode=us<wait>", + " console-setup/modelcode=pc105<wait>", + " debconf/frontend=noninteractive<wait>", + " debian-installer=en_US<wait>", + " fb=false<wait>", + " initrd=/install/initrd.gz<wait>", + " kbd-chooser/method=us<wait>", + " keyboard-configuration/layout=USA<wait>", + " keyboard-configuration/variant=USA<wait>", + " locale=en_US<wait>", + " netcfg/get_domain=vm<wait>", + " netcfg/get_hostname=vagrant<wait>", + " noapic<wait>", + " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/ubuntu-14.10/preseed.cfg<wait>", + " -- <wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "parallels_tools_flavor": "lin", + "guest_os_type": "ubuntu", + "http_directory": "http", + "iso_checksum": "0c1ebea31c3523cfe9a4ffed8bcf6c7d23dfb97b", + "iso_checksum_type": "sha1", + "iso_url": "{{user `mirror`}}/14.10/ubuntu-14.10-server-amd64.iso", + "output_directory": "packer-ubuntu-14.10-amd64-parallels", + "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "parallels-iso", + "prlctl": [ + [ + "set", + "{{.Name}}", + "--memsize", + "384" + ], + [ + "set", + "{{.Name}}", + "--cpus", + "1" + ] + ], + "prlctl_version_file": ".prlctl_version", + "vm_name": "packer-ubuntu-14.10-amd64" + } + + ], + "post-processors": [ + { + "output": "../builds/{{.Provider}}/opscode_ubuntu-14.10_chef-{{user `chef_version`}}.box", + "type": "vagrant" + } + ], + "provisioners": [ + { + "environment_vars": [ + "CHEF_VERSION={{user `chef_version`}}" + ], + "execute_command": "echo 'vagrant'|{{.Vars}} sudo -S -E bash '{{.Path}}'", + "scripts": [ + "scripts/ubuntu/update.sh", + "scripts/common/sshd.sh", + "scripts/ubuntu/networking.sh", + "scripts/ubuntu/sudoers.sh", + "scripts/common/vagrant.sh", + "scripts/common/vmtools.sh", + "scripts/common/chef.sh", + "scripts/ubuntu/cleanup.sh", + "scripts/common/minimize.sh" + ], + "type": "shell" + } + ], + "variables": { + "chef_version": "provisionerless", + "mirror": "http://releases.ubuntu.com" + } +} diff --git a/packer/ubuntu-14.10-i386.json b/packer/ubuntu-14.10-i386.json new file mode 100644 index 000000000..5d43b2fd6 --- /dev/null +++ b/packer/ubuntu-14.10-i386.json @@ -0,0 +1,196 @@ +{ + "builders": [ + { + "boot_command": [ + "<esc><wait>", + "<esc><wait>", + "<enter><wait>", + "/install/vmlinuz<wait>", + " auto<wait>", + " console-setup/ask_detect=false<wait>", + " console-setup/layoutcode=us<wait>", + " console-setup/modelcode=pc105<wait>", + " debconf/frontend=noninteractive<wait>", + " debian-installer=en_US<wait>", + " fb=false<wait>", + " initrd=/install/initrd.gz<wait>", + " kbd-chooser/method=us<wait>", + " keyboard-configuration/layout=USA<wait>", + " keyboard-configuration/variant=USA<wait>", + " locale=en_US<wait>", + " netcfg/get_domain=vm<wait>", + " netcfg/get_hostname=vagrant<wait>", + " noapic<wait>", + " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/ubuntu-14.10/preseed.cfg<wait>", + " -- <wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "guest_os_type": "Ubuntu", + "http_directory": "http", + "iso_checksum": "26faf47df2162f4ff83e38e6831dd169da6db95f", + "iso_checksum_type": "sha1", + "iso_url": "{{user `mirror`}}/14.10/ubuntu-14.10-server-i386.iso", + "output_directory": "packer-ubuntu-14.10-i386-virtualbox", + "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "virtualbox-iso", + "vboxmanage": [ + [ + "modifyvm", + "{{.Name}}", + "--memory", + "384" + ], + [ + "modifyvm", + "{{.Name}}", + "--cpus", + "1" + ] + ], + "virtualbox_version_file": ".vbox_version", + "vm_name": "packer-ubuntu-14.10-i386" + }, + { + "boot_command": [ + "<esc><wait>", + "<esc><wait>", + "<enter><wait>", + "/install/vmlinuz<wait>", + " auto<wait>", + " console-setup/ask_detect=false<wait>", + " console-setup/layoutcode=us<wait>", + " console-setup/modelcode=pc105<wait>", + " debconf/frontend=noninteractive<wait>", + " debian-installer=en_US<wait>", + " fb=false<wait>", + " initrd=/install/initrd.gz<wait>", + " kbd-chooser/method=us<wait>", + " keyboard-configuration/layout=USA<wait>", + " keyboard-configuration/variant=USA<wait>", + " locale=en_US<wait>", + " netcfg/get_domain=vm<wait>", + " netcfg/get_hostname=vagrant<wait>", + " noapic<wait>", + " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/ubuntu-14.10/preseed.cfg<wait>", + " -- <wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "guest_os_type": "ubuntu", + "http_directory": "http", + "iso_checksum": "26faf47df2162f4ff83e38e6831dd169da6db95f", + "iso_checksum_type": "sha1", + "iso_url": "{{user `mirror`}}/14.10/ubuntu-14.10-server-i386.iso", + "output_directory": "packer-ubuntu-14.10-i386-vmware", + "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "tools_upload_flavor": "linux", + "type": "vmware-iso", + "vm_name": "packer-ubuntu-14.10-i386", + "vmx_data": { + "cpuid.coresPerSocket": "1", + "memsize": "384", + "numvcpus": "1" + } + }, + { + "boot_command": [ + "<esc><wait>", + "<esc><wait>", + "<enter><wait>", + "/install/vmlinuz<wait>", + " auto<wait>", + " console-setup/ask_detect=false<wait>", + " console-setup/layoutcode=us<wait>", + " console-setup/modelcode=pc105<wait>", + " debconf/frontend=noninteractive<wait>", + " debian-installer=en_US<wait>", + " fb=false<wait>", + " initrd=/install/initrd.gz<wait>", + " kbd-chooser/method=us<wait>", + " keyboard-configuration/layout=USA<wait>", + " keyboard-configuration/variant=USA<wait>", + " locale=en_US<wait>", + " netcfg/get_domain=vm<wait>", + " netcfg/get_hostname=vagrant<wait>", + " noapic<wait>", + " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/ubuntu-14.10/preseed.cfg<wait>", + " -- <wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "parallels_tools_flavor": "lin", + "guest_os_type": "ubuntu", + "http_directory": "http", + "iso_checksum": "26faf47df2162f4ff83e38e6831dd169da6db95f", + "iso_checksum_type": "sha1", + "iso_url": "{{user `mirror`}}/14.10/ubuntu-14.10-server-i386.iso", + "output_directory": "packer-ubuntu-14.10-i386-parallels", + "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "parallels-iso", + "prlctl": [ + [ + "set", + "{{.Name}}", + "--memsize", + "384" + ], + [ + "set", + "{{.Name}}", + "--cpus", + "1" + ] + ], + "prlctl_version_file": ".prlctl_version", + "vm_name": "packer-ubuntu-14.10-i386" + } + + ], + "post-processors": [ + { + "output": "../builds/{{.Provider}}/opscode_ubuntu-14.10-i386_chef-{{user `chef_version`}}.box", + "type": "vagrant" + } + ], + "provisioners": [ + { + "environment_vars": [ + "CHEF_VERSION={{user `chef_version`}}" + ], + "execute_command": "echo 'vagrant'|{{.Vars}} sudo -S -E bash '{{.Path}}'", + "scripts": [ + "scripts/ubuntu/update.sh", + "scripts/common/sshd.sh", + "scripts/ubuntu/networking.sh", + "scripts/ubuntu/sudoers.sh", + "scripts/common/vagrant.sh", + "scripts/common/vmtools.sh", + "scripts/common/chef.sh", + "scripts/ubuntu/cleanup.sh", + "scripts/common/minimize.sh" + ], + "type": "shell" + } + ], + "variables": { + "chef_version": "provisionerless", + "mirror": "http://releases.ubuntu.com" + } +} From b0436ac7357de201212d9c28d62d6f2ce4d597ae Mon Sep 17 00:00:00 2001 From: "Julian C. Dunn" <jdunn@getchef.com> Date: Mon, 27 Oct 2014 16:04:34 -0400 Subject: [PATCH 0271/1622] Published FreeBSD 9.3 boxes. --- OLD-BOXES.md | 5 +++++ README.md | 8 ++++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/OLD-BOXES.md b/OLD-BOXES.md index 28a359414..d8edd2e93 100644 --- a/OLD-BOXES.md +++ b/OLD-BOXES.md @@ -18,6 +18,8 @@ Boxes for obsolete operating systems will be placed here. * [opscode-debian-7.6](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_debian-7.6_chef-provisionerless.box) * [opscode-fedora-18-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_fedora-18-i386_chef-provisionerless.box) * [opscode-fedora-18](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_fedora-18_chef-provisionerless.box) +* [opscode-freebsd-9.2-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_freebsd-9.2-i386_chef-provisionerless.box) +* [opscode-freebsd-9.2](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_freebsd-9.2_chef-provisionerless.box) * [opscode-ubuntu-12.10-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_ubuntu-12.10-i386_chef-provisionerless.box) * [opscode-ubuntu-12.10](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_ubuntu-12.10_chef-provisionerless.box) * [opscode-ubuntu-13.04-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_ubuntu-13.04-i386_chef-provisionerless.box) @@ -37,6 +39,9 @@ Boxes for obsolete operating systems will be placed here. * [opscode-debian-7.6](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_debian-7.6_chef-provisionerless.box) * [opscode-fedora-18-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_fedora-18-i386_chef-provisionerless.box) * [opscode-fedora-18](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_fedora-18_chef-provisionerless.box) +* [opscode-freebsd-9.2-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_freebsd-9.2-i386_chef-provisionerless.box) +* [opscode-freebsd-9.2](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_freebsd-9.2_chef-provisionerless.box) + * [opscode-ubuntu-12.10-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_ubuntu-12.10-i386_chef-provisionerless.box) * [opscode-ubuntu-12.10](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_ubuntu-12.10_chef-provisionerless.box) * [opscode-ubuntu-13.04-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_ubuntu-13.04-i386_chef-provisionerless.box) diff --git a/README.md b/README.md index a0b291e7b..e477833ea 100644 --- a/README.md +++ b/README.md @@ -35,8 +35,8 @@ These baseboxes were all built using a Mac OS X host running VirtualBox 4.3.16, * [opscode-fedora-19](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_fedora-19_chef-provisionerless.box) * [opscode-fedora-20-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_fedora-20-i386_chef-provisionerless.box) * [opscode-fedora-20](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_fedora-20_chef-provisionerless.box) -* [opscode-freebsd-9.2-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_freebsd-9.2-i386_chef-provisionerless.box) -* [opscode-freebsd-9.2](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_freebsd-9.2_chef-provisionerless.box) +* [opscode-freebsd-9.3-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_freebsd-9.3-i386_chef-provisionerless.box) +* [opscode-freebsd-9.3](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_freebsd-9.3_chef-provisionerless.box) * [opscode-freebsd-10](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_freebsd-10.0_chef-provisionerless.box) * [opscode-opensuse-13.1-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_opensuse-13.1-i386_chef-provisionerless.box) * [opscode-opensuse-13.1](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_opensuse-13.1-x86_64_chef-provisionerless.box) @@ -69,8 +69,8 @@ these boxes. Using `--provider vmware_fusion`, will not. * [opscode-fedora-19](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_fedora-19_chef-provisionerless.box) * [opscode-fedora-20-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_fedora-20-i386_chef-provisionerless.box) * [opscode-fedora-20](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_fedora-20_chef-provisionerless.box) -* [opscode-freebsd-9.2-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_freebsd-9.2-i386_chef-provisionerless.box) -* [opscode-freebsd-9.2](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_freebsd-9.2_chef-provisionerless.box) +* [opscode-freebsd-9.3-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_freebsd-9.3-i386_chef-provisionerless.box) +* [opscode-freebsd-9.3](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_freebsd-9.3_chef-provisionerless.box) * [opscode-freebsd-10](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_freebsd-10.0_chef-provisionerless.box) * [opscode-opensuse-13.1-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_opensuse-13.1-i386_chef-provisionerless.box) * [opscode-opensuse-13.1](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_opensuse-13.1-x86_64_chef-provisionerless.box) From d5bf9ea5c18a8722183ddb65865cfa4c204331c2 Mon Sep 17 00:00:00 2001 From: Rickard von Essen <rickard.von.essen@gmail.com> Date: Sat, 18 Oct 2014 16:58:22 +0200 Subject: [PATCH 0272/1622] Updated RedHat Enterprise Linux (RHEL), CentOS and Oracle Enterprise Linux (OEL) to 6.6 --- ...tos-6.5-i386.json => centos-6.6-i386.json} | 32 ++++++++--------- ...6.5-x86_64.json => centos-6.6-x86_64.json} | 32 ++++++++--------- packer/http/{centos-6.5 => centos-6.6}/ks.cfg | 0 ...cle-6.5-i386.json => oracle-6.6-i386.json} | 34 +++++++++---------- ...6.5-x86_64.json => oracle-6.6-x86_64.json} | 34 +++++++++---------- ...{rhel-6.5-i386.json => rhel-6.6-i386.json} | 34 +++++++++---------- ...l-6.5-x86_64.json => rhel-6.6-x86_64.json} | 34 +++++++++---------- 7 files changed, 100 insertions(+), 100 deletions(-) rename packer/{centos-6.5-i386.json => centos-6.6-i386.json} (77%) rename packer/{centos-6.5-x86_64.json => centos-6.6-x86_64.json} (78%) rename packer/http/{centos-6.5 => centos-6.6}/ks.cfg (100%) rename packer/{oracle-6.5-i386.json => oracle-6.6-i386.json} (76%) rename packer/{oracle-6.5-x86_64.json => oracle-6.6-x86_64.json} (76%) rename packer/{rhel-6.5-i386.json => rhel-6.6-i386.json} (76%) rename packer/{rhel-6.5-x86_64.json => rhel-6.6-x86_64.json} (75%) diff --git a/packer/centos-6.5-i386.json b/packer/centos-6.6-i386.json similarity index 77% rename from packer/centos-6.5-i386.json rename to packer/centos-6.6-i386.json index 311c4071e..ea9bbbdee 100644 --- a/packer/centos-6.5-i386.json +++ b/packer/centos-6.6-i386.json @@ -2,17 +2,17 @@ "builders": [ { "boot_command": [ - "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/centos-6.5/ks.cfg<enter><wait>" + "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/centos-6.6/ks.cfg<enter><wait>" ], "boot_wait": "10s", "disk_size": 40960, "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "guest_os_type": "RedHat", "http_directory": "http", - "iso_checksum": "67ea68068ae53d1f23431072ec0288b3e1abfe4d", + "iso_checksum": "d16aa4a8e6f71fb01fcc26d8ae0e3443ed514c8e", "iso_checksum_type": "sha1", - "iso_url": "{{user `mirror`}}/6.5/isos/i386/CentOS-6.5-i386-bin-DVD1.iso", - "output_directory": "packer-centos-6.5-i386-virtualbox", + "iso_url": "{{user `mirror`}}/6.6/isos/i386/CentOS-6.6-i386-bin-DVD1.iso", + "output_directory": "packer-centos-6.6-i386-virtualbox", "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, @@ -34,20 +34,20 @@ ] ], "virtualbox_version_file": ".vbox_version", - "vm_name": "packer-centos-6.5-i386" + "vm_name": "packer-centos-6.6-i386" }, { "boot_command": [ - "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/centos-6.5/ks.cfg<enter><wait>" + "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/centos-6.6/ks.cfg<enter><wait>" ], "boot_wait": "10s", "disk_size": 40960, "guest_os_type": "centos", "http_directory": "http", - "iso_checksum": "67ea68068ae53d1f23431072ec0288b3e1abfe4d", + "iso_checksum": "d16aa4a8e6f71fb01fcc26d8ae0e3443ed514c8e", "iso_checksum_type": "sha1", - "iso_url": "{{user `mirror`}}/6.5/isos/i386/CentOS-6.5-i386-bin-DVD1.iso", - "output_directory": "packer-centos-6.5-i386-vmware", + "iso_url": "{{user `mirror`}}/6.6/isos/i386/CentOS-6.6-i386-bin-DVD1.iso", + "output_directory": "packer-centos-6.6-i386-vmware", "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, @@ -55,7 +55,7 @@ "ssh_wait_timeout": "10000s", "tools_upload_flavor": "linux", "type": "vmware-iso", - "vm_name": "packer-centos-6.5-i386", + "vm_name": "packer-centos-6.6-i386", "vmx_data": { "cpuid.coresPerSocket": "1", "memsize": "480", @@ -64,17 +64,17 @@ }, { "boot_command": [ - "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/centos-6.5/ks.cfg<enter><wait>" + "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/centos-6.6/ks.cfg<enter><wait>" ], "boot_wait": "10s", "disk_size": 40960, "parallels_tools_flavor": "lin", "guest_os_type": "centos", "http_directory": "http", - "iso_checksum": "67ea68068ae53d1f23431072ec0288b3e1abfe4d", + "iso_checksum": "d16aa4a8e6f71fb01fcc26d8ae0e3443ed514c8e", "iso_checksum_type": "sha1", - "iso_url": "{{user `mirror`}}/6.5/isos/x86_64/CentOS-6.5-i386-bin-DVD1.iso", - "output_directory": "packer-centos-6.5-i386-parallels", + "iso_url": "{{user `mirror`}}/6.6/isos/i386/CentOS-6.6-i386-bin-DVD1.iso", + "output_directory": "packer-centos-6.6-i386-parallels", "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, @@ -96,12 +96,12 @@ ] ], "prlctl_version_file": ".prlctl_version", - "vm_name": "packer-centos-6.5-i386" + "vm_name": "packer-centos-6.6-i386" } ], "post-processors": [ { - "output": "../builds/{{.Provider}}/opscode_centos-6.5-i386_chef-{{user `chef_version`}}.box", + "output": "../builds/{{.Provider}}/opscode_centos-6.6-i386_chef-{{user `chef_version`}}.box", "type": "vagrant" } ], diff --git a/packer/centos-6.5-x86_64.json b/packer/centos-6.6-x86_64.json similarity index 78% rename from packer/centos-6.5-x86_64.json rename to packer/centos-6.6-x86_64.json index 1473462d7..24d837e7b 100644 --- a/packer/centos-6.5-x86_64.json +++ b/packer/centos-6.6-x86_64.json @@ -2,17 +2,17 @@ "builders": [ { "boot_command": [ - "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/centos-6.5/ks.cfg<enter><wait>" + "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/centos-6.6/ks.cfg<enter><wait>" ], "boot_wait": "10s", "disk_size": 40960, "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "guest_os_type": "RedHat_64", "http_directory": "http", - "iso_checksum": "32c7695b97f7dcd1f59a77a71f64f2957dddf738", + "iso_checksum": "08be09fd7276822bd3468af8f96198279ffc41f0", "iso_checksum_type": "sha1", - "iso_url": "{{user `mirror`}}/6.5/isos/x86_64/CentOS-6.5-x86_64-bin-DVD1.iso", - "output_directory": "packer-centos-6.5-x86_64-virtualbox", + "iso_url": "{{user `mirror`}}/6.6/isos/x86_64/CentOS-6.6-x86_64-bin-DVD1.iso", + "output_directory": "packer-centos-6.6-x86_64-virtualbox", "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, @@ -34,20 +34,20 @@ ] ], "virtualbox_version_file": ".vbox_version", - "vm_name": "packer-centos-6.5-x86_64" + "vm_name": "packer-centos-6.6-x86_64" }, { "boot_command": [ - "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/centos-6.5/ks.cfg<enter><wait>" + "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/centos-6.6/ks.cfg<enter><wait>" ], "boot_wait": "10s", "disk_size": 40960, "guest_os_type": "centos-64", "http_directory": "http", - "iso_checksum": "32c7695b97f7dcd1f59a77a71f64f2957dddf738", + "iso_checksum": "08be09fd7276822bd3468af8f96198279ffc41f0", "iso_checksum_type": "sha1", - "iso_url": "{{user `mirror`}}/6.5/isos/x86_64/CentOS-6.5-x86_64-bin-DVD1.iso", - "output_directory": "packer-centos-6.5-x86_64-vmware", + "iso_url": "{{user `mirror`}}/6.6/isos/x86_64/CentOS-6.6-x86_64-bin-DVD1.iso", + "output_directory": "packer-centos-6.6-x86_64-vmware", "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, @@ -55,7 +55,7 @@ "ssh_wait_timeout": "10000s", "tools_upload_flavor": "linux", "type": "vmware-iso", - "vm_name": "packer-centos-6.5-x86_64", + "vm_name": "packer-centos-6.6-x86_64", "vmx_data": { "cpuid.coresPerSocket": "1", "memsize": "480", @@ -64,17 +64,17 @@ }, { "boot_command": [ - "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/centos-6.5/ks.cfg<enter><wait>" + "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/centos-6.6/ks.cfg<enter><wait>" ], "boot_wait": "10s", "disk_size": 40960, "parallels_tools_flavor": "lin", "guest_os_type": "centos", "http_directory": "http", - "iso_checksum": "32c7695b97f7dcd1f59a77a71f64f2957dddf738", + "iso_checksum": "08be09fd7276822bd3468af8f96198279ffc41f0", "iso_checksum_type": "sha1", - "iso_url": "{{user `mirror`}}/6.5/isos/x86_64/CentOS-6.5-x86_64-bin-DVD1.iso", - "output_directory": "packer-centos-6.5-x86_64-parallels", + "iso_url": "{{user `mirror`}}/6.6/isos/x86_64/CentOS-6.6-x86_64-bin-DVD1.iso", + "output_directory": "packer-centos-6.6-x86_64-parallels", "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, @@ -96,13 +96,13 @@ ] ], "prlctl_version_file": ".prlctl_version", - "vm_name": "packer-centos-6.5-x86_64" + "vm_name": "packer-centos-6.6-x86_64" } ], "post-processors": [ { - "output": "../builds/{{.Provider}}/opscode_centos-6.5_chef-{{user `chef_version`}}.box", + "output": "../builds/{{.Provider}}/opscode_centos-6.6_chef-{{user `chef_version`}}.box", "type": "vagrant" } ], diff --git a/packer/http/centos-6.5/ks.cfg b/packer/http/centos-6.6/ks.cfg similarity index 100% rename from packer/http/centos-6.5/ks.cfg rename to packer/http/centos-6.6/ks.cfg diff --git a/packer/oracle-6.5-i386.json b/packer/oracle-6.6-i386.json similarity index 76% rename from packer/oracle-6.5-i386.json rename to packer/oracle-6.6-i386.json index 074b6f5f9..a280c85c1 100644 --- a/packer/oracle-6.5-i386.json +++ b/packer/oracle-6.6-i386.json @@ -2,17 +2,17 @@ "builders": [ { "boot_command": [ - "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/centos-6.5/ks.cfg<enter><wait>" + "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/centos-6.6/ks.cfg<enter><wait>" ], "boot_wait": "10s", "disk_size": 40960, "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "guest_os_type": "Oracle", "http_directory": "http", - "iso_url": "{{user `mirror`}}/OracleLinux-R6-U5-Server-i386-dvd.iso", - "iso_checksum": "5bd0a06295a4e50907da16d99a2f6cff54596b30", + "iso_url": "{{user `mirror`}}/OracleLinux-R6-U6-Server-i386-dvd.iso", + "iso_checksum": "81f0c85217f40763dea5053ec5594e4958498bbc", "iso_checksum_type": "sha1", - "output_directory": "packer-oracle-6.5-i386-virtualbox", + "output_directory": "packer-oracle-6.6-i386-virtualbox", "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, @@ -34,20 +34,20 @@ ] ], "virtualbox_version_file": ".vbox_version", - "vm_name": "packer-oracle-6.5-i386" + "vm_name": "packer-oracle-6.6-i386" }, { "boot_command": [ - "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/centos-6.5/ks.cfg<enter><wait>" + "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/centos-6.6/ks.cfg<enter><wait>" ], "boot_wait": "10s", "disk_size": 40960, "guest_os_type": "oraclelinux", "http_directory": "http", - "iso_url": "{{user `mirror`}}/OracleLinux-R6-U5-Server-i386-dvd.iso", - "iso_checksum": "5bd0a06295a4e50907da16d99a2f6cff54596b30", + "iso_url": "{{user `mirror`}}/OracleLinux-R6-U6-Server-i386-dvd.iso", + "iso_checksum": "81f0c85217f40763dea5053ec5594e4958498bbc", "iso_checksum_type": "sha1", - "output_directory": "packer-oracle-6.5-i386-vmware", + "output_directory": "packer-oracle-6.6-i386-vmware", "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, @@ -55,7 +55,7 @@ "ssh_wait_timeout": "10000s", "tools_upload_flavor": "linux", "type": "vmware-iso", - "vm_name": "packer-oracle-6.5-i386", + "vm_name": "packer-oracle-6.6-i386", "vmx_data": { "cpuid.coresPerSocket": "1", "memsize": "480", @@ -64,17 +64,17 @@ }, { "boot_command": [ - "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/centos-6.5/ks.cfg<enter><wait>" + "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/centos-6.6/ks.cfg<enter><wait>" ], "boot_wait": "10s", "disk_size": 40960, "parallels_tools_flavor": "lin", "guest_os_type": "centos", "http_directory": "http", - "iso_url": "{{user `mirror`}}/OracleLinux-R6-U5-Server-i386-dvd.iso", - "iso_checksum": "5bd0a06295a4e50907da16d99a2f6cff54596b30", + "iso_url": "{{user `mirror`}}/OracleLinux-R6-U6-Server-i386-dvd.iso", + "iso_checksum": "81f0c85217f40763dea5053ec5594e4958498bbc", "iso_checksum_type": "sha1", - "output_directory": "packer-oracle-6.5-i386-parallels", + "output_directory": "packer-oracle-6.6-i386-parallels", "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, @@ -96,13 +96,13 @@ ] ], "prlctl_version_file": ".prlctl_version", - "vm_name": "packer-oracle-6.5-i386" + "vm_name": "packer-oracle-6.6-i386" } ], "post-processors": [ { - "output": "../builds/{{.Provider}}/opscode_oracle-6.5-i386_chef-{{user `chef_version`}}.box", + "output": "../builds/{{.Provider}}/opscode_oracle-6.6-i386_chef-{{user `chef_version`}}.box", "type": "vagrant" } ], @@ -126,6 +126,6 @@ ], "variables": { "chef_version": "provisionerless", - "mirror": "http://mirrors.dotsrc.org/oracle-linux/OL6/U5/i386" + "mirror": "http://mirrors.dotsrc.org/oracle-linux/OL6/U6/i386" } } diff --git a/packer/oracle-6.5-x86_64.json b/packer/oracle-6.6-x86_64.json similarity index 76% rename from packer/oracle-6.5-x86_64.json rename to packer/oracle-6.6-x86_64.json index b176a7e85..57f8c9959 100644 --- a/packer/oracle-6.5-x86_64.json +++ b/packer/oracle-6.6-x86_64.json @@ -2,17 +2,17 @@ "builders": [ { "boot_command": [ - "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/centos-6.5/ks.cfg<enter><wait>" + "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/centos-6.6/ks.cfg<enter><wait>" ], "boot_wait": "10s", "disk_size": 40960, "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "guest_os_type": "Oracle_64", "http_directory": "http", - "iso_checksum": "a65041fbe0ba67e3ff6f5f93804a8f47d5b5f132", + "iso_checksum": "5738f10a506d3630edfd297ef179b553091c6a48", "iso_checksum_type": "sha1", - "iso_url": "{{user `mirror`}}/OracleLinux-R6-U5-Server-x86_64-dvd.iso", - "output_directory": "packer-oracle-6.5-x86_64-virtualbox", + "iso_url": "{{user `mirror`}}/OracleLinux-R6-U6-Server-x86_64-dvd.iso", + "output_directory": "packer-oracle-6.6-x86_64-virtualbox", "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, @@ -34,20 +34,20 @@ ] ], "virtualbox_version_file": ".vbox_version", - "vm_name": "packer-oracle-6.5-x86_64" + "vm_name": "packer-oracle-6.6-x86_64" }, { "boot_command": [ - "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/centos-6.5/ks.cfg<enter><wait>" + "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/centos-6.6/ks.cfg<enter><wait>" ], "boot_wait": "10s", "disk_size": 40960, "guest_os_type": "oraclelinux-64", "http_directory": "http", - "iso_checksum": "a65041fbe0ba67e3ff6f5f93804a8f47d5b5f132", + "iso_checksum": "5738f10a506d3630edfd297ef179b553091c6a48", "iso_checksum_type": "sha1", - "iso_url": "{{user `mirror`}}/OracleLinux-R6-U5-Server-x86_64-dvd.iso", - "output_directory": "packer-oracle-6.5-x86_64-vmware", + "iso_url": "{{user `mirror`}}/OracleLinux-R6-U6-Server-x86_64-dvd.iso", + "output_directory": "packer-oracle-6.6-x86_64-vmware", "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, @@ -55,7 +55,7 @@ "ssh_wait_timeout": "10000s", "tools_upload_flavor": "linux", "type": "vmware-iso", - "vm_name": "packer-oracle-6.5-x86_64", + "vm_name": "packer-oracle-6.6-x86_64", "vmx_data": { "cpuid.coresPerSocket": "1", "memsize": "480", @@ -64,17 +64,17 @@ }, { "boot_command": [ - "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/centos-6.5/ks.cfg<enter><wait>" + "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/centos-6.6/ks.cfg<enter><wait>" ], "boot_wait": "10s", "disk_size": 40960, "parallels_tools_flavor": "lin", "guest_os_type": "centos", "http_directory": "http", - "iso_checksum": "a65041fbe0ba67e3ff6f5f93804a8f47d5b5f132", + "iso_checksum": "5738f10a506d3630edfd297ef179b553091c6a48", "iso_checksum_type": "sha1", - "iso_url": "{{user `mirror`}}/OracleLinux-R6-U5-Server-x86_64-dvd.iso", - "output_directory": "packer-oracle-6.5-x86_64-parallels", + "iso_url": "{{user `mirror`}}/OracleLinux-R6-U6-Server-x86_64-dvd.iso", + "output_directory": "packer-oracle-6.6-x86_64-parallels", "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, @@ -96,12 +96,12 @@ ] ], "prlctl_version_file": ".prlctl_version", - "vm_name": "packer-oracle-6.5-x86_64" + "vm_name": "packer-oracle-6.6-x86_64" } ], "post-processors": [ { - "output": "../builds/{{.Provider}}/opscode_oracle-6.5_chef-{{user `chef_version`}}.box", + "output": "../builds/{{.Provider}}/opscode_oracle-6.6_chef-{{user `chef_version`}}.box", "type": "vagrant" } ], @@ -125,6 +125,6 @@ ], "variables": { "chef_version": "provisionerless", - "mirror": "http://mirrors.dotsrc.org/oracle-linux/OL6/U5/x86_64" + "mirror": "http://mirrors.dotsrc.org/oracle-linux/OL6/U6/x86_64" } } diff --git a/packer/rhel-6.5-i386.json b/packer/rhel-6.6-i386.json similarity index 76% rename from packer/rhel-6.5-i386.json rename to packer/rhel-6.6-i386.json index c519a6133..481772695 100644 --- a/packer/rhel-6.5-i386.json +++ b/packer/rhel-6.6-i386.json @@ -2,17 +2,17 @@ "builders": [ { "boot_command": [ - "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/centos-6.5/ks.cfg<enter><wait>" + "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/centos-6.6/ks.cfg<enter><wait>" ], "boot_wait": "10s", "disk_size": 40960, "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "guest_os_type": "RedHat", "http_directory": "http", - "iso_checksum": "eec692b436193ba9fc365cafe2b8f85323d98192dc99b23b02ae75045667fe4a", + "iso_checksum": "0a14ed1f7d7ea7b831739ed8e71719d9cb7c294bf801e8db39358651768547ad", "iso_checksum_type": "sha256", - "iso_url": "{{user `mirror`}}/rhel-server-6.5-i386-dvd.iso", - "output_directory": "packer-rhel-6.5-i386-virtualbox", + "iso_url": "{{user `mirror`}}/rhel-server-6.6-i386-dvd.iso", + "output_directory": "packer-rhel-6.6-i386-virtualbox", "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, @@ -34,20 +34,20 @@ ] ], "virtualbox_version_file": ".vbox_version", - "vm_name": "packer-rhel-6.5-i386" + "vm_name": "packer-rhel-6.6-i386" }, { "boot_command": [ - "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/centos-6.5/ks.cfg<enter><wait>" + "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/centos-6.6/ks.cfg<enter><wait>" ], "boot_wait": "10s", "disk_size": 40960, "guest_os_type": "redhat", "http_directory": "http", - "iso_checksum": "eec692b436193ba9fc365cafe2b8f85323d98192dc99b23b02ae75045667fe4a", + "iso_checksum": "0a14ed1f7d7ea7b831739ed8e71719d9cb7c294bf801e8db39358651768547ad", "iso_checksum_type": "sha256", - "iso_url": "{{user `mirror`}}/rhel-server-6.5-i386-dvd.iso", - "output_directory": "packer-rhel-6.5-i386-vmware", + "iso_url": "{{user `mirror`}}/rhel-server-6.6-i386-dvd.iso", + "output_directory": "packer-rhel-6.6-i386-vmware", "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, @@ -55,7 +55,7 @@ "ssh_wait_timeout": "10000s", "tools_upload_flavor": "linux", "type": "vmware-iso", - "vm_name": "packer-rhel-6.5-i386", + "vm_name": "packer-rhel-6.6-i386", "vmx_data": { "cpuid.coresPerSocket": "1", "memsize": "480", @@ -64,17 +64,17 @@ }, { "boot_command": [ - "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/centos-6.5/ks.cfg<enter><wait>" + "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/centos-6.6/ks.cfg<enter><wait>" ], "boot_wait": "10s", "disk_size": 40960, "parallels_tools_flavor": "lin", "guest_os_type": "rhel", "http_directory": "http", - "iso_checksum": "eec692b436193ba9fc365cafe2b8f85323d98192dc99b23b02ae75045667fe4a", + "iso_checksum": "0a14ed1f7d7ea7b831739ed8e71719d9cb7c294bf801e8db39358651768547ad", "iso_checksum_type": "sha256", - "iso_url": "{{user `mirror`}}/rhel-server-6.5-i386-dvd.iso", - "output_directory": "packer-rhel-6.5-i386-parallels", + "iso_url": "{{user `mirror`}}/rhel-server-6.6-i386-dvd.iso", + "output_directory": "packer-rhel-6.6-i386-parallels", "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, @@ -96,13 +96,13 @@ ] ], "prlctl_version_file": ".prlctl_version", - "vm_name": "packer-rhel-6.5-i386" + "vm_name": "packer-rhel-6.6-i386" } ], "post-processors": [ { - "output": "../builds/{{.Provider}}/opscode_rhel-6.5-i386_chef-{{user `chef_version`}}.box", + "output": "../builds/{{.Provider}}/opscode_rhel-6.6-i386_chef-{{user `chef_version`}}.box", "type": "vagrant" } ], @@ -126,7 +126,7 @@ ], "variables": { "chef_version": "provisionerless", - "mirror": "https://content-web.rhn.redhat.com/rhn/isos/rhel-6.5/md5sum/04a1fa06a6b7e70cd586535eea83c0ef" + "mirror": "https://content-web.rhn.redhat.com/rhn/isos/rhel-6.6/md5sum/64e687f958db92feccc3f7701a8771f8" } } diff --git a/packer/rhel-6.5-x86_64.json b/packer/rhel-6.6-x86_64.json similarity index 75% rename from packer/rhel-6.5-x86_64.json rename to packer/rhel-6.6-x86_64.json index e998357db..42901f174 100644 --- a/packer/rhel-6.5-x86_64.json +++ b/packer/rhel-6.6-x86_64.json @@ -2,17 +2,17 @@ "builders": [ { "boot_command": [ - "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/centos-6.5/ks.cfg<enter><wait>" + "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/centos-6.6/ks.cfg<enter><wait>" ], "boot_wait": "10s", "disk_size": 40960, "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "guest_os_type": "RedHat_64", "http_directory": "http", - "iso_checksum": "a51b90f3dd4585781293ea08adde60eeb9cfa94670943bd99e9c07f13a259539", + "iso_checksum": "16044cb7264f4bc0150f5b6f3f66936ccf2d36e0a4152c00d9236fb7dcae5f32", "iso_checksum_type": "sha256", - "iso_url": "{{user `mirror`}}/rhel-server-6.5-x86_64-dvd.iso", - "output_directory": "packer-rhel-6.5-x86_64-virtualbox", + "iso_url": "{{user `mirror`}}/rhel-server-6.6-x86_64-dvd.iso", + "output_directory": "packer-rhel-6.6-x86_64-virtualbox", "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, @@ -34,20 +34,20 @@ ] ], "virtualbox_version_file": ".vbox_version", - "vm_name": "packer-rhel-6.5-x86_64" + "vm_name": "packer-rhel-6.6-x86_64" }, { "boot_command": [ - "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/centos-6.5/ks.cfg<enter><wait>" + "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/centos-6.6/ks.cfg<enter><wait>" ], "boot_wait": "10s", "disk_size": 40960, "guest_os_type": "rhel6-64", "http_directory": "http", - "iso_checksum": "a51b90f3dd4585781293ea08adde60eeb9cfa94670943bd99e9c07f13a259539", + "iso_checksum": "16044cb7264f4bc0150f5b6f3f66936ccf2d36e0a4152c00d9236fb7dcae5f32", "iso_checksum_type": "sha256", - "iso_url": "{{user `mirror`}}/rhel-server-6.5-x86_64-dvd.iso", - "output_directory": "packer-rhel-6.5-x86_64-vmware", + "iso_url": "{{user `mirror`}}/rhel-server-6.6-x86_64-dvd.iso", + "output_directory": "packer-rhel-6.6-x86_64-vmware", "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, @@ -55,7 +55,7 @@ "ssh_wait_timeout": "10000s", "tools_upload_flavor": "linux", "type": "vmware-iso", - "vm_name": "packer-rhel-6.5-x86_64", + "vm_name": "packer-rhel-6.6-x86_64", "vmx_data": { "cpuid.coresPerSocket": "1", "memsize": "480", @@ -64,17 +64,17 @@ }, { "boot_command": [ - "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/centos-6.5/ks.cfg<enter><wait>" + "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/centos-6.6/ks.cfg<enter><wait>" ], "boot_wait": "10s", "disk_size": 40960, "parallels_tools_flavor": "lin", "guest_os_type": "rhel", "http_directory": "http", - "iso_checksum": "a51b90f3dd4585781293ea08adde60eeb9cfa94670943bd99e9c07f13a259539", + "iso_checksum": "16044cb7264f4bc0150f5b6f3f66936ccf2d36e0a4152c00d9236fb7dcae5f32", "iso_checksum_type": "sha256", - "iso_url": "{{user `mirror`}}/rhel-server-6.5-x86_64-dvd.iso", - "output_directory": "packer-rhel-6.5-x86_64-parallels", + "iso_url": "{{user `mirror`}}/rhel-server-6.6-x86_64-dvd.iso", + "output_directory": "packer-rhel-6.6-x86_64-parallels", "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, @@ -96,12 +96,12 @@ ] ], "prlctl_version_file": ".prlctl_version", - "vm_name": "packer-rhel-6.5-x86_64" + "vm_name": "packer-rhel-6.6-x86_64" } ], "post-processors": [ { - "output": "../builds/{{.Provider}}/opscode_rhel-6.5_chef-{{user `chef_version`}}.box", + "output": "../builds/{{.Provider}}/opscode_rhel-6.6_chef-{{user `chef_version`}}.box", "type": "vagrant" } ], @@ -125,7 +125,7 @@ ], "variables": { "chef_version": "provisionerless", - "mirror": "https://content-web.rhn.redhat.com/rhn/isos/rhel-6.5/md5sum/a84d4d9eddb36fb417832166cd10a4c2" + "mirror": "https://content-web.rhn.redhat.com/rhn/isos/rhel-6.6/md5sum/ef031b0ae8458d6489eb277ba1dcb5de" } } From a4acd6fa2944457a3bd42ba4a38825642fe085de Mon Sep 17 00:00:00 2001 From: "Julian C. Dunn" <jdunn@getchef.com> Date: Wed, 29 Oct 2014 23:54:08 -0400 Subject: [PATCH 0273/1622] Remove curl from CentOS boxes from here on in. Related to #280. --- packer/http/centos-5.11/ks.cfg | 1 - packer/http/centos-6.6/ks.cfg | 1 - packer/http/centos-7.0/ks.cfg | 1 - 3 files changed, 3 deletions(-) diff --git a/packer/http/centos-5.11/ks.cfg b/packer/http/centos-5.11/ks.cfg index 2fee57a84..90df3c584 100644 --- a/packer/http/centos-5.11/ks.cfg +++ b/packer/http/centos-5.11/ks.cfg @@ -24,7 +24,6 @@ user --name=vagrant --password vagrant openssh-clients openssh-server bzip2 -curl dhclient gcc kernel-devel diff --git a/packer/http/centos-6.6/ks.cfg b/packer/http/centos-6.6/ks.cfg index a7a9888a4..7594ba586 100644 --- a/packer/http/centos-6.6/ks.cfg +++ b/packer/http/centos-6.6/ks.cfg @@ -28,7 +28,6 @@ kernel-devel gcc make perl -curl wget nfs-utils -fprintd-pam diff --git a/packer/http/centos-7.0/ks.cfg b/packer/http/centos-7.0/ks.cfg index a67206044..23fb4f5f3 100644 --- a/packer/http/centos-7.0/ks.cfg +++ b/packer/http/centos-7.0/ks.cfg @@ -28,7 +28,6 @@ kernel-devel gcc make perl -curl wget nfs-utils net-tools From c1004c03aa5714346e0dbd656a8e57fe0be6fe65 Mon Sep 17 00:00:00 2001 From: "Julian C. Dunn" <jdunn@getchef.com> Date: Thu, 30 Oct 2014 00:02:51 -0400 Subject: [PATCH 0274/1622] Moved CentOS 6.5 boxes to OLD-BOXES and added CentOS 6.6 boxes. --- OLD-BOXES.md | 4 ++++ README.md | 8 ++++---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/OLD-BOXES.md b/OLD-BOXES.md index d8edd2e93..0c19ab029 100644 --- a/OLD-BOXES.md +++ b/OLD-BOXES.md @@ -12,6 +12,8 @@ Boxes for obsolete operating systems will be placed here. * [opscode-centos-5.10](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_centos-5.10_chef-provisionerless.box) * [opscode-centos-6.4-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_centos-6.4-i386_chef-provisionerless.box) * [opscode-centos-6.4](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_centos-6.4_chef-provisionerless.box) +* [opscode-centos-6.5-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_centos-6.5-i386_chef-provisionerless.box) +* [opscode-centos-6.5](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_centos-6.5_chef-provisionerless.box) * [opscode-debian-7.2.0-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_debian-7.2.0-i386_chef-provisionerless.box) * [opscode-debian-7.2.0](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_debian-7.2.0_chef-provisionerless.box) * [opscode-debian-7.6-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_debian-7.6-i386_chef-provisionerless.box) @@ -33,6 +35,8 @@ Boxes for obsolete operating systems will be placed here. * [opscode-centos-5.10](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_centos-5.10_chef-provisionerless.box) * [opscode-centos-6.4-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_centos-6.4-i386_chef-provisionerless.box) * [opscode-centos-6.4](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_centos-6.4_chef-provisionerless.box) +* [opscode-centos-6.5-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_centos-6.5-i386_chef-provisionerless.box) +* [opscode-centos-6.5](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_centos-6.5_chef-provisionerless.box) * [opscode-debian-7.2.0-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_debian-7.2.0-i386_chef-provisionerless.box) * [opscode-debian-7.2.0](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_debian-7.2.0_chef-provisionerless.box) * [opscode-debian-7.6-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_debian-7.6-i386_chef-provisionerless.box) diff --git a/README.md b/README.md index e23922a38..1d5301e1b 100644 --- a/README.md +++ b/README.md @@ -24,8 +24,8 @@ These baseboxes were all built using a Mac OS X host running VirtualBox 4.3.16, * [opscode-centos-5.11-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_centos-5.11-i386_chef-provisionerless.box) * [opscode-centos-5.11](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_centos-5.11_chef-provisionerless.box) -* [opscode-centos-6.5-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_centos-6.5-i386_chef-provisionerless.box) -* [opscode-centos-6.5](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_centos-6.5_chef-provisionerless.box) +* [opscode-centos-6.6-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_centos-6.6-i386_chef-provisionerless.box) +* [opscode-centos-6.6](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_centos-6.6_chef-provisionerless.box) * [opscode-centos-7.0](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_centos-7.0_chef-provisionerless.box) * [opscode-debian-6.0.10-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_debian-6.0.10-i386_chef-provisionerless.box) * [opscode-debian-6.0.10](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_debian-6.0.10_chef-provisionerless.box) @@ -60,8 +60,8 @@ these boxes. Using `--provider vmware_fusion`, will not. * [opscode-centos-5.11-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_centos-5.11-i386_chef-provisionerless.box) * [opscode-centos-5.11](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_centos-5.11_chef-provisionerless.box) -* [opscode-centos-6.5-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_centos-6.5-i386_chef-provisionerless.box) -* [opscode-centos-6.5](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_centos-6.5_chef-provisionerless.box) +* [opscode-centos-6.6-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_centos-6.6-i386_chef-provisionerless.box) +* [opscode-centos-6.6](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_centos-6.6_chef-provisionerless.box) * [opscode-centos-7.0](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_centos-7.0_chef-provisionerless.box) * [opscode-debian-6.0.10-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_debian-6.0.10-i386_chef-provisionerless.box) * [opscode-debian-6.0.10](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_debian-6.0.10_chef-provisionerless.box) From 8c86ac0b3d946af5c8d2103a1b21b1f6610efa06 Mon Sep 17 00:00:00 2001 From: Mikhail Zholobov <mzholobov@parallels.com> Date: Wed, 1 Oct 2014 00:48:56 +0400 Subject: [PATCH 0275/1622] Added Parallels support to OmniOS template --- packer/omnios-r151010j.json | 58 ++++++++++++++++++- .../vagrantfile_templates/parallels/omnios.rb | 15 +++++ 2 files changed, 72 insertions(+), 1 deletion(-) create mode 100644 packer/vagrantfile_templates/parallels/omnios.rb diff --git a/packer/omnios-r151010j.json b/packer/omnios-r151010j.json index 1ca6f495a..2f17212ab 100644 --- a/packer/omnios-r151010j.json +++ b/packer/omnios-r151010j.json @@ -113,12 +113,69 @@ "memsize": "1024", "numvcpus": "1" } + }, + { + "boot_command": [ + "<enter><wait10><wait5>", + "1<enter><wait10>", + "<wait10>", + "<f2><wait10>", + "<wait10><wait10><wait10><wait10><wait10><wait10>", + "<wait10><wait10><wait10><wait10><wait10><wait10>", + "<f2><wait>", + "<f2><wait>", + "<bs><bs><bs><bs><bs><bs><bs>omnios-vagrant", + "<f2><wait>", + "<f2><wait>", + "<f2><wait>", + "<wait10><wait10><wait10><wait10><wait10><wait10>", + "<wait10><wait10><wait10><wait10><wait10><wait10>", + "<wait10><wait10><wait10><wait10><wait10><wait10>", + "<wait10><wait10><wait10><wait10><wait10><wait10>", + "<f8><wait>", + "<wait10><wait10><wait10><wait10><wait10><wait10>", + "<wait10><wait10><wait10><wait10><wait10><wait10>", + "root<enter><wait><enter><wait5>", + "passwd<enter><wait>", + "vagrant<enter><wait>", + "vagrant<enter><wait>", + "ipadm create-if e1000g0<enter><wait>", + "ipadm create-addr -T dhcp e1000g0/v4<enter><wait>", + "echo 'nameserver 8.8.8.8' > /etc/resolv.conf<enter><wait>", + "cp /etc/nsswitch.dns /etc/nsswitch.conf<enter><wait>", + "sed -i -e 's/PermitRootLogin no/PermitRootLogin yes/' /etc/ssh/sshd_config<enter><wait>", + "svcadm restart ssh<enter><wait>" + ], + "boot_wait": "30s", + "disk_size": 40960, + "hard_drive_interface": "ide", + "guest_os_type": "opensolaris", + "iso_checksum": "bc3f4c0d29a5da75174de62da00294e5ef826b5e", + "iso_checksum_type": "sha1", + "iso_url": "{{user `mirror`}}/OmniOS_Text_r151010j.iso", + "output_directory": "packer-omnios-r151010j-parallels", + "shutdown_command": "/usr/sbin/shutdown -g 0 -y -i 5", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "root", + "parallels_tools_mode": "disable", + "type": "parallels-iso", + "vm_name": "packer-omnios-r151010j", + "prlctl": [ + [ "set", "{{.Name}}", "--memsize", "512" ], + [ "set", "{{.Name}}", "--cpus", "1" ] + ] } ], "post-processors": [ { "compression_level": 9, "output": "../builds/{{.Provider}}/opscode_omnios-r151010j_chef-{{user `chef_version`}}.box", + "override": { + "parallels": { + "vagrantfile_template": "vagrantfile_templates/parallels/omnios.rb" + } + }, "type": "vagrant" } ], @@ -141,4 +198,3 @@ "mirror": "http://omnios.omniti.com/media" } } - diff --git a/packer/vagrantfile_templates/parallels/omnios.rb b/packer/vagrantfile_templates/parallels/omnios.rb new file mode 100644 index 000000000..3ae4c28e9 --- /dev/null +++ b/packer/vagrantfile_templates/parallels/omnios.rb @@ -0,0 +1,15 @@ +# -*- mode: ruby -*- +# # vi: set ft=ruby : + +Vagrant.require_version ">= 1.1.0" + +Vagrant.configure("2") do |config| + # Disable the base shared folder, Guest Tools are unavailable. + config.vm.synced_folder ".", "/vagrant", disabled: true + + config.vm.provider :parallels do |prl| + # Guest Tools are unavailable. + prl.check_guest_tools = false + prl.functional_psf = false + end +end From e16605da16cc4ec324afb358e69ad19a854e261b Mon Sep 17 00:00:00 2001 From: Mikhail Zholobov <mzholobov@parallels.com> Date: Wed, 1 Oct 2014 10:13:52 +0400 Subject: [PATCH 0276/1622] Added Parallels support to FreeBSD templates --- packer/freebsd-10.0-amd64.json | 46 +++++++++++++++++++ packer/freebsd-10.0-i386.json | 46 +++++++++++++++++++ packer/freebsd-9.3-amd64.json | 46 +++++++++++++++++++ packer/freebsd-9.3-i386.json | 45 ++++++++++++++++++ .../parallels/freebsd.rb | 17 +++++++ 5 files changed, 200 insertions(+) create mode 100644 packer/vagrantfile_templates/parallels/freebsd.rb diff --git a/packer/freebsd-10.0-amd64.json b/packer/freebsd-10.0-amd64.json index f5733c801..371712997 100644 --- a/packer/freebsd-10.0-amd64.json +++ b/packer/freebsd-10.0-amd64.json @@ -94,11 +94,57 @@ "numvcpus": "1", "cpuid.coresPerSocket": "1" } + }, + { + "type": "parallels-iso", + "boot_command": [ + "<esc><wait>", + "load geom_mbr<wait>", + "<enter><wait>", + "load zfs<wait>", + "<enter><wait>", + "boot -s<wait>", + "<enter><wait>", + "<wait10><wait10>", + "/bin/sh<enter><wait>", + "mdmfs -s 100m md1 /tmp<enter><wait>", + "mdmfs -s 100m md2 /mnt<enter><wait>", + "dhclient -l /tmp/dhclient.lease.em0 em0<enter><wait>", + "fetch -o /tmp/install.sh http://{{ .HTTPIP }}:{{ .HTTPPort }}/freebsd-10.0/install.sh && chmod +x /tmp/install.sh && /tmp/install.sh {{ .Name }}<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 10140, + "guest_os_type": "freebsd", + "http_directory": "http", + "iso_checksum": "9c377b4a4e63443c0b210080694de26133e6a276eddb07c7e00e1c9aebd84109", + "iso_checksum_type": "sha256", + "iso_url": "{{user `mirror`}}/releases/amd64/amd64/ISO-IMAGES/10.0/FreeBSD-10.0-RELEASE-amd64-disc1.iso", + "ssh_username": "vagrant", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_wait_timeout": "10000s", + "shutdown_command": "echo 'shutdown -p now' > shutdown.sh; cat 'shutdown.sh' | su -", + "parallels_tools_mode": "disable", + "prlctl_version_file": ".prlctl_version", + "vm_name": "packer-freebsd-10.0-amd64", + "output_directory": "packer-freebsd-10.0-amd64-parallels", + "prlctl": [ + [ "set", "{{.Name}}", "--memsize", "512" ], + [ "set", "{{.Name}}", "--cpus", "1" ], + [ "set", "{{.Name}}", "--device-set", "cdrom0", "--iface", "ide" ], + [ "set", "{{.Name}}", "--device-del", "fdd0" ], + [ "set", "{{.Name}}", "--device-del", "parallel0" ] + ] } ], "post-processors": [ { "output": "../builds/{{.Provider}}/opscode_freebsd-10.0_chef-{{user `chef_version`}}.box", + "override": { + "parallels": { + "vagrantfile_template": "vagrantfile_templates/parallels/freebsd.rb" + } + }, "type": "vagrant" } ] diff --git a/packer/freebsd-10.0-i386.json b/packer/freebsd-10.0-i386.json index e56646e37..9f9c14b51 100644 --- a/packer/freebsd-10.0-i386.json +++ b/packer/freebsd-10.0-i386.json @@ -94,11 +94,57 @@ "numvcpus": "1", "cpuid.coresPerSocket": "1" } + }, + { + "type": "parallels-iso", + "boot_command": [ + "<esc><wait>", + "load geom_mbr<wait>", + "<enter><wait>", + "load zfs<wait>", + "<enter><wait>", + "boot -s<wait>", + "<enter><wait>", + "<wait10><wait10>", + "/bin/sh<enter><wait>", + "mdmfs -s 100m md1 /tmp<enter><wait>", + "mdmfs -s 100m md2 /mnt<enter><wait>", + "dhclient -l /tmp/dhclient.lease.em0 em0<enter><wait>", + "fetch -o /tmp/install.sh http://{{ .HTTPIP }}:{{ .HTTPPort }}/freebsd-10.0/install.sh && chmod +x /tmp/install.sh && /tmp/install.sh {{ .Name }}<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 10140, + "guest_os_type": "freebsd", + "http_directory": "http", + "iso_checksum": "2c09643b3f79c703e424c03408882369025cec655c24a6d81ee073081ee75ebc", + "iso_checksum_type": "sha256", + "iso_url": "{{user `mirror`}}/releases/i386/i386/ISO-IMAGES/10.0/FreeBSD-10.0-RELEASE-i386-disc1.iso", + "ssh_username": "vagrant", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_wait_timeout": "10000s", + "shutdown_command": "echo 'shutdown -p now' > shutdown.sh; cat 'shutdown.sh' | su -", + "parallels_tools_mode": "disable", + "prlctl_version_file": ".prlctl_version", + "vm_name": "packer-freebsd-10.0-amd64", + "output_directory": "packer-freebsd-10.0-i386-parallels", + "prlctl": [ + [ "set", "{{.Name}}", "--memsize", "512" ], + [ "set", "{{.Name}}", "--cpus", "1" ], + [ "set", "{{.Name}}", "--device-set", "cdrom0", "--iface", "ide" ], + [ "set", "{{.Name}}", "--device-del", "fdd0" ], + [ "set", "{{.Name}}", "--device-del", "parallel0" ] + ] } ], "post-processors": [ { "output": "../builds/{{.Provider}}/opscode_freebsd-10.0_chef-{{user `chef_version`}}.box", + "override": { + "parallels": { + "vagrantfile_template": "vagrantfile_templates/parallels/freebsd.rb" + } + }, "type": "vagrant" } ] diff --git a/packer/freebsd-9.3-amd64.json b/packer/freebsd-9.3-amd64.json index 5739808f0..379fd4cfb 100644 --- a/packer/freebsd-9.3-amd64.json +++ b/packer/freebsd-9.3-amd64.json @@ -86,11 +86,57 @@ "memsize": "512", "numvcpus": "1" } + }, + { + "boot_command": [ + "<esc><wait>", + "load geom_mbr<wait>", + "<enter><wait>", + "load zfs<wait>", + "<enter><wait>", + "boot -s<wait>", + "<enter><wait>", + "<wait10><wait10>", + "/bin/sh<enter><wait>", + "mdmfs -s 100m md1 /tmp<enter><wait>", + "mdmfs -s 100m md2 /mnt<enter><wait>", + "dhclient -l /tmp/dhclient.lease.em0 em0<enter><wait>", + "fetch -o /tmp/install.sh http://{{ .HTTPIP }}:{{ .HTTPPort }}/freebsd-9.3/install.sh && chmod +x /tmp/install.sh && /tmp/install.sh {{ .Name }}<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 10140, + "guest_os_type": "freebsd", + "http_directory": "http", + "iso_checksum": "5a3c82653d77bba7d7ded8bd7efbedc09d52cf4045d98ce52a82c9e0f8fa9b0e", + "iso_checksum_type": "sha256", + "iso_url": "{{user `mirror`}}/releases/amd64/amd64/ISO-IMAGES/9.3/FreeBSD-9.3-RELEASE-amd64-disc1.iso", + "output_directory": "packer-freebsd-9.3-amd64-parallels", + "shutdown_command": "echo 'shutdown -p now' > shutdown.sh; cat 'shutdown.sh' | su -", + "parallels_tools_mode": "disable", + "prlctl": [ + [ "set", "{{.Name}}", "--memsize", "512" ], + [ "set", "{{.Name}}", "--cpus", "1" ], + [ "set", "{{.Name}}", "--device-set", "cdrom0", "--iface", "ide" ], + [ "set", "{{.Name}}", "--device-del", "fdd0" ], + [ "set", "{{.Name}}", "--device-del", "parallel0" ] + ], + "prlctl_version_file": ".prlctl_version", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "parallels-iso", + "vm_name": "packer-freebsd-9.3-amd64" } ], "post-processors": [ { "output": "../builds/{{.Provider}}/opscode_freebsd-9.3_chef-{{user `chef_version`}}.box", + "override": { + "parallels": { + "vagrantfile_template": "vagrantfile_templates/parallels/freebsd.rb" + } + }, "type": "vagrant" } ], diff --git a/packer/freebsd-9.3-i386.json b/packer/freebsd-9.3-i386.json index 971b076e8..f3204fc46 100644 --- a/packer/freebsd-9.3-i386.json +++ b/packer/freebsd-9.3-i386.json @@ -86,11 +86,56 @@ "memsize": "512", "numvcpus": "1" } + }, + { + "boot_command": [ + "<esc><wait>", + "load geom_mbr<wait>", + "<enter><wait>", + "load zfs<wait>", + "<enter><wait>", + "boot -s<wait>", + "<enter><wait>", + "<wait10><wait10>", + "/bin/sh<enter><wait>", + "mdmfs -s 100m md1 /tmp<enter><wait>", + "mdmfs -s 100m md2 /mnt<enter><wait>", + "dhclient -l /tmp/dhclient.lease.em0 em0<enter><wait>", + "fetch -o /tmp/install.sh http://{{ .HTTPIP }}:{{ .HTTPPort }}/freebsd-9.3/install.sh && chmod +x /tmp/install.sh && /tmp/install.sh {{ .Name }}<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 10140, + "http_directory": "http", + "iso_checksum": "cab6aad9c3d5ea6a3fb4059f808225c67f1edaea730c555a86a9707ac41ba75d", + "iso_checksum_type": "sha256", + "iso_url": "{{user `mirror`}}/releases/i386/i386/ISO-IMAGES/9.3/FreeBSD-9.3-RELEASE-i386-disc1.iso", + "output_directory": "packer-freebsd-9.3-i386-parallels", + "prlctl": [ + [ "set", "{{.Name}}", "--memsize", "512" ], + [ "set", "{{.Name}}", "--cpus", "1" ], + [ "set", "{{.Name}}", "--device-set", "cdrom0", "--iface", "ide" ], + [ "set", "{{.Name}}", "--device-del", "fdd0" ], + [ "set", "{{.Name}}", "--device-del", "parallel0" ] + ], + "prlctl_version_file": ".prlctl_version", + "parallels_tools_mode": "disable", + "shutdown_command": "echo 'shutdown -p now' > shutdown.sh; cat 'shutdown.sh' | su -", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "parallels-iso", + "vm_name": "packer-freebsd-9.3-i386" } ], "post-processors": [ { "output": "../builds/{{.Provider}}/opscode_freebsd-9.3-i386_chef-{{user `chef_version`}}.box", + "override": { + "parallels": { + "vagrantfile_template": "vagrantfile_templates/parallels/freebsd.rb" + } + }, "type": "vagrant" } ], diff --git a/packer/vagrantfile_templates/parallels/freebsd.rb b/packer/vagrantfile_templates/parallels/freebsd.rb new file mode 100644 index 000000000..1f795a8c4 --- /dev/null +++ b/packer/vagrantfile_templates/parallels/freebsd.rb @@ -0,0 +1,17 @@ +# -*- mode: ruby -*- +# # vi: set ft=ruby : + +Vagrant.require_version ">= 1.1.0" + +Vagrant.configure("2") do |config| + config.ssh.shell = "sh" + + # Disable the base shared folder, Guest Tools are unavailable. + config.vm.synced_folder ".", "/vagrant", disabled: true + + config.vm.provider :parallels do |prl| + # Guest Tools are unavailable. + prl.check_guest_tools = false + prl.functional_psf = false + end +end From f06c6863115832757ca210006076c04d4cf0eac8 Mon Sep 17 00:00:00 2001 From: Mikhail Zholobov <mzholobov@parallels.com> Date: Mon, 20 Oct 2014 15:23:53 +0400 Subject: [PATCH 0277/1622] Added "builds/parallels" directory --- builds/parallels/.gitignore | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 builds/parallels/.gitignore diff --git a/builds/parallels/.gitignore b/builds/parallels/.gitignore new file mode 100644 index 000000000..86d0cb272 --- /dev/null +++ b/builds/parallels/.gitignore @@ -0,0 +1,4 @@ +# Ignore everything in this directory +* +# Except this file +!.gitignore \ No newline at end of file From 103a835267fa18f69c464cf11e4fd8ec8af3d669 Mon Sep 17 00:00:00 2001 From: "Julian C. Dunn" <jdunn@getchef.com> Date: Thu, 30 Oct 2014 09:17:46 -0400 Subject: [PATCH 0278/1622] Update travis to use newest Packer --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index ac7198ef4..145d632d2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,7 @@ rvm: - 2.1.2 -before_install: wget --no-check-certificate https://dl.bintray.com/mitchellh/packer/packer_0.7.1_linux_amd64.zip && unzip -d packer packer_0.7.1_linux_amd64.zip +before_install: wget --no-check-certificate https://dl.bintray.com/mitchellh/packer/packer_0.7.2_linux_amd64.zip && unzip -d packer packer_0.7.2_linux_amd64.zip before_script: export PATH=$PATH:$PWD/packer script: bundle exec thor packer:validate From 3653fdacbd4cb419d0510333d4065b618aacfb7f Mon Sep 17 00:00:00 2001 From: Scott Hain <shain@getchef.com> Date: Wed, 5 Nov 2014 11:01:21 -0500 Subject: [PATCH 0279/1622] Updated solaris 10 defs for u5 and u11 --- packer/floppy/solaris10/S99startup.sh | 2 + packer/floppy/solaris10/awesome_prof | 5 + ...ris-10-x86.json => solaris-10.11-x86.json} | 0 packer/solaris-10.5-x86.json | 118 ++++++++++++++++++ 4 files changed, 125 insertions(+) rename packer/{solaris-10-x86.json => solaris-10.11-x86.json} (100%) create mode 100644 packer/solaris-10.5-x86.json diff --git a/packer/floppy/solaris10/S99startup.sh b/packer/floppy/solaris10/S99startup.sh index 24ecadc01..f0cc9f711 100644 --- a/packer/floppy/solaris10/S99startup.sh +++ b/packer/floppy/solaris10/S99startup.sh @@ -16,6 +16,8 @@ useradd -m -s /usr/bin/bash -d /home/vagrant -G vagrant vagrant # set password - there is no way to set a password non-interactively perl -pi -e 's/vagrant:UP/vagrant:VrvarmJYR3SHs/g' /etc/shadow +# defaults to a locked account, unlock it +passwd -u vagrant # set up ssh mkdir /home/vagrant/.ssh diff --git a/packer/floppy/solaris10/awesome_prof b/packer/floppy/solaris10/awesome_prof index 583913ed8..bc5afc1f5 100644 --- a/packer/floppy/solaris10/awesome_prof +++ b/packer/floppy/solaris10/awesome_prof @@ -1,8 +1,13 @@ install_type initial_install system_type standalone +filesys any 5000 / +filesys any 5000 /opt cluster SUNWCrnet add package SUNWwgetr add package SUNWwgetu add +package SUNWgss add +package SUNWgssk add +package SUNWgssc add package SUNWsshdr add package SUNWsshdu add package SUNWsshcu add diff --git a/packer/solaris-10-x86.json b/packer/solaris-10.11-x86.json similarity index 100% rename from packer/solaris-10-x86.json rename to packer/solaris-10.11-x86.json diff --git a/packer/solaris-10.5-x86.json b/packer/solaris-10.5-x86.json new file mode 100644 index 000000000..6aaace6fb --- /dev/null +++ b/packer/solaris-10.5-x86.json @@ -0,0 +1,118 @@ +{ + "variables": { + "README": "You must download the automated installer iso from the following page, and then place it somewhere that packer can fetch it", + "DOWNLOAD_SITE": "http://www.oracle.com/technetwork/server-storage/solaris10/downloads/index.html", + "mirror": "./packer_cache", + "chef_version": "provisionerless" + }, + "provisioners": [ + { + "type": "shell", + "execute_command": "/opt/csw/bin/sudo {{.Path}}", + "scripts": [ + "scripts/solaris10/post_install.sh", + "scripts/solaris10/vmtools.sh", + "scripts/solaris10/minimize.sh" + ] + } + ], + "builders": [ + { + "type": "virtualbox-iso", + "boot_command": [ + "e", + "e", + "<left><left><left><left><left><left><left><left><left><left>", + "<left><left><left><left><left><left><left><left><left><left>", + "<left><left><left>", + " - install<enter>", + "b" + ], + "floppy_files": [ + "floppy/solaris10/sysidcfg", + "floppy/solaris10/awesome_prof", + "floppy/solaris10/rules.ok", + "floppy/solaris10/S99startup.sh", + "floppy/solaris10/finish.sh" + ], + "boot_wait": "5s", + "disk_size": 15360, + "guest_os_type": "Solaris_64", + "http_directory": "http/solaris-10", + "iso_checksum": "c810e1bc5dc96c93004a98665c2f5834", + "iso_checksum_type": "md5", + "iso_url": "{{user `mirror`}}/sol-10-u5-ga-x86-dvd.iso", + "ssh_username": "vagrant", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_wait_timeout": "50000s", + "shutdown_command": "/opt/csw/bin/sudo /usr/sbin/init 5", + "shutdown_timeout": "10m", + "guest_additions_mode": "upload", + "virtualbox_version_file": ".vbox_version", + "vm_name": "packer-solaris-10u5-x86_64", + "output_directory": "packer-solaris-10u5-x86_64-virtualbox", + "vboxmanage": [ + [ + "modifyvm", + "{{.Name}}", + "--memory", + "1536" + ], + [ + "modifyvm", + "{{.Name}}", + "--cpus", + "1" + ] + ] + }, + { + "type": "vmware-iso", + "boot_command": [ + "e", + "e", + "<left><left><left><left><left><left><left><left><left><left>", + "<left><left><left><left><left><left><left><left><left><left>", + "<left><left><left>", + " - install<enter>", + "b" + ], + "floppy_files": [ + "floppy/solaris10/sysidcfg", + "floppy/solaris10/awesome_prof", + "floppy/solaris10/rules.ok", + "floppy/solaris10/S99startup.sh", + "floppy/solaris10/finish.sh" + ], + "boot_wait": "5s", + "disk_size": 15360, + "guest_os_type": "solaris10-64", + "http_directory": "http/solaris-10", + "iso_checksum": "c810e1bc5dc96c93004a98665c2f5834", + "iso_checksum_type": "md5", + "iso_url": "{{user `mirror`}}/sol-10-u5-ga-x86-dvd.iso", + "ssh_username": "vagrant", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_wait_timeout": "50000s", + "shutdown_command": "/opt/csw/bin/sudo /usr/sbin/init 5", + "shutdown_timeout": "10m", + "vm_name": "packer-solaris-10u5-x86_64", + "output_directory": "packer-solaris-10u5-x86_64-vmware", + "tools_upload_flavor": "solaris", + "tools_upload_path": "/home/vagrant/solaris.iso", + "vmx_data": { + "cpuid.coresPerSocket": "1", + "memsize": "1536", + "numvcpus": "1" + } + } + ], + "post-processors": [ + { + "output": "../builds/{{.Provider}}/solaris-10.5-x86-{{user `chef_version`}}.box", + "type": "vagrant" + } + ] +} From f3c91c6d2cc2ef8b7c0b213b5bb09be02dc5e46d Mon Sep 17 00:00:00 2001 From: Yvonne Lam <yvonne@opscode.com> Date: Thu, 13 Nov 2014 12:46:22 -0800 Subject: [PATCH 0280/1622] Minimal support for a compilation environment. --- packer/floppy/solaris10/awesome_prof | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/packer/floppy/solaris10/awesome_prof b/packer/floppy/solaris10/awesome_prof index bc5afc1f5..4d758ad6c 100644 --- a/packer/floppy/solaris10/awesome_prof +++ b/packer/floppy/solaris10/awesome_prof @@ -16,3 +16,8 @@ package SUNWgcmn add package SUNWuiu8 add package SUNWbash add package SUNWtoo add +# minimal support for build environment +package SUNWarc add +package SUNWhea add +package SUNWlibm add +package SUNWscpu add From c13283e364b43241604ae7c94768c16e498ef962 Mon Sep 17 00:00:00 2001 From: "Julian C. Dunn" <jdunn@getchef.com> Date: Fri, 14 Nov 2014 13:55:06 -0800 Subject: [PATCH 0281/1622] Update to FreeBSD 10.1. Closes #292. Also, newer FreeBSDs don't need to load geom_mbr and zfs explicitly; it's already built into the kernel. ASSUME_ALWAYS_YES takes a boolean, not an integer now --- ...0.0-amd64.json => freebsd-10.1-amd64.json} | 44 +++++++------------ ...-10.0-i386.json => freebsd-10.1-i386.json} | 44 +++++++------------ .../{freebsd-10.0 => freebsd-10.1}/install.sh | 0 packer/scripts/freebsd/postinstall.sh | 11 +---- 4 files changed, 33 insertions(+), 66 deletions(-) rename packer/{freebsd-10.0-amd64.json => freebsd-10.1-amd64.json} (76%) rename packer/{freebsd-10.0-i386.json => freebsd-10.1-i386.json} (76%) rename packer/http/{freebsd-10.0 => freebsd-10.1}/install.sh (100%) diff --git a/packer/freebsd-10.0-amd64.json b/packer/freebsd-10.1-amd64.json similarity index 76% rename from packer/freebsd-10.0-amd64.json rename to packer/freebsd-10.1-amd64.json index 371712997..7fe1ff679 100644 --- a/packer/freebsd-10.0-amd64.json +++ b/packer/freebsd-10.1-amd64.json @@ -22,10 +22,6 @@ "type": "virtualbox-iso", "boot_command": [ "<esc><wait>", - "load geom_mbr<wait>", - "<enter><wait>", - "load zfs<wait>", - "<enter><wait>", "boot -s<wait>", "<enter><wait>", "<wait10><wait10>", @@ -33,15 +29,15 @@ "mdmfs -s 100m md1 /tmp<enter><wait>", "mdmfs -s 100m md2 /mnt<enter><wait>", "dhclient -l /tmp/dhclient.lease.em0 em0<enter><wait>", - "fetch -o /tmp/install.sh http://{{ .HTTPIP }}:{{ .HTTPPort }}/freebsd-10.0/install.sh && chmod +x /tmp/install.sh && /tmp/install.sh {{ .Name }}<enter><wait>" + "fetch -o /tmp/install.sh http://{{ .HTTPIP }}:{{ .HTTPPort }}/freebsd-10.1/install.sh && chmod +x /tmp/install.sh && /tmp/install.sh {{ .Name }}<enter><wait>" ], "boot_wait": "10s", "disk_size": 10140, "guest_os_type": "FreeBSD_64", "http_directory": "http", - "iso_checksum": "9c377b4a4e63443c0b210080694de26133e6a276eddb07c7e00e1c9aebd84109", + "iso_checksum": "0c3d64ce48c3ef761761d0fea07e1935e296f8c045c249118bc91a7faf053a6b", "iso_checksum_type": "sha256", - "iso_url": "{{user `mirror`}}/releases/amd64/amd64/ISO-IMAGES/10.0/FreeBSD-10.0-RELEASE-amd64-disc1.iso", + "iso_url": "{{user `mirror`}}/releases/amd64/amd64/ISO-IMAGES/10.1/FreeBSD-10.1-RELEASE-amd64-disc1.iso", "ssh_username": "vagrant", "ssh_password": "vagrant", "ssh_port": 22, @@ -49,8 +45,8 @@ "shutdown_command": "echo 'shutdown -p now' > shutdown.sh; cat 'shutdown.sh' | su -", "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "virtualbox_version_file": ".vbox_version", - "vm_name": "packer-freebsd-10.0-amd64", - "output_directory": "packer-freebsd-10.0-amd64-virtualbox", + "vm_name": "packer-freebsd-10.1-amd64", + "output_directory": "packer-freebsd-10.1-amd64-virtualbox", "vboxmanage": [ [ "modifyvm", "{{.Name}}", "--memory", "512" ], [ "modifyvm", "{{.Name}}", "--cpus", "1" ] @@ -60,10 +56,6 @@ "type": "vmware-iso", "boot_command": [ "<esc><wait>", - "load geom_mbr<wait>", - "<enter><wait>", - "load zfs<wait>", - "<enter><wait>", "boot -s<wait>", "<enter><wait>", "<wait10><wait10>", @@ -72,22 +64,22 @@ "mdmfs -s 100m md2 /mnt<enter><wait>", "dhclient -l /tmp/dhclient.lease.em0 em0<enter><wait>", "<wait5>", - "fetch -o /tmp/install.sh http://{{ .HTTPIP }}:{{ .HTTPPort }}/freebsd-10.0/install.sh && chmod +x /tmp/install.sh && /tmp/install.sh {{ .Name }}<enter><wait>" + "fetch -o /tmp/install.sh http://{{ .HTTPIP }}:{{ .HTTPPort }}/freebsd-10.1/install.sh && chmod +x /tmp/install.sh && /tmp/install.sh {{ .Name }}<enter><wait>" ], "boot_wait": "10s", "disk_size": 10140, "guest_os_type": "freebsd-64", "http_directory": "http", - "iso_checksum": "9c377b4a4e63443c0b210080694de26133e6a276eddb07c7e00e1c9aebd84109", + "iso_checksum": "0c3d64ce48c3ef761761d0fea07e1935e296f8c045c249118bc91a7faf053a6b", "iso_checksum_type": "sha256", - "iso_url": "{{user `mirror`}}/releases/amd64/amd64/ISO-IMAGES/10.0/FreeBSD-10.0-RELEASE-amd64-disc1.iso", + "iso_url": "{{user `mirror`}}/releases/amd64/amd64/ISO-IMAGES/10.1/FreeBSD-10.1-RELEASE-amd64-disc1.iso", "ssh_username": "vagrant", "ssh_password": "vagrant", "ssh_port": 22, "ssh_wait_timeout": "10000s", "shutdown_command": "echo 'shutdown -p now' > shutdown.sh; cat 'shutdown.sh' | su -", - "vm_name": "packer-freebsd-10.0-amd64", - "output_directory": "packer-freebsd-10.0-amd64-vmware", + "vm_name": "packer-freebsd-10.1-amd64", + "output_directory": "packer-freebsd-10.1-amd64-vmware", "tools_upload_flavor": "freebsd", "vmx_data": { "memsize": "512", @@ -99,10 +91,6 @@ "type": "parallels-iso", "boot_command": [ "<esc><wait>", - "load geom_mbr<wait>", - "<enter><wait>", - "load zfs<wait>", - "<enter><wait>", "boot -s<wait>", "<enter><wait>", "<wait10><wait10>", @@ -110,15 +98,15 @@ "mdmfs -s 100m md1 /tmp<enter><wait>", "mdmfs -s 100m md2 /mnt<enter><wait>", "dhclient -l /tmp/dhclient.lease.em0 em0<enter><wait>", - "fetch -o /tmp/install.sh http://{{ .HTTPIP }}:{{ .HTTPPort }}/freebsd-10.0/install.sh && chmod +x /tmp/install.sh && /tmp/install.sh {{ .Name }}<enter><wait>" + "fetch -o /tmp/install.sh http://{{ .HTTPIP }}:{{ .HTTPPort }}/freebsd-10.1/install.sh && chmod +x /tmp/install.sh && /tmp/install.sh {{ .Name }}<enter><wait>" ], "boot_wait": "10s", "disk_size": 10140, "guest_os_type": "freebsd", "http_directory": "http", - "iso_checksum": "9c377b4a4e63443c0b210080694de26133e6a276eddb07c7e00e1c9aebd84109", + "iso_checksum": "0c3d64ce48c3ef761761d0fea07e1935e296f8c045c249118bc91a7faf053a6b", "iso_checksum_type": "sha256", - "iso_url": "{{user `mirror`}}/releases/amd64/amd64/ISO-IMAGES/10.0/FreeBSD-10.0-RELEASE-amd64-disc1.iso", + "iso_url": "{{user `mirror`}}/releases/amd64/amd64/ISO-IMAGES/10.1/FreeBSD-10.1-RELEASE-amd64-disc1.iso", "ssh_username": "vagrant", "ssh_password": "vagrant", "ssh_port": 22, @@ -126,8 +114,8 @@ "shutdown_command": "echo 'shutdown -p now' > shutdown.sh; cat 'shutdown.sh' | su -", "parallels_tools_mode": "disable", "prlctl_version_file": ".prlctl_version", - "vm_name": "packer-freebsd-10.0-amd64", - "output_directory": "packer-freebsd-10.0-amd64-parallels", + "vm_name": "packer-freebsd-10.1-amd64", + "output_directory": "packer-freebsd-10.1-amd64-parallels", "prlctl": [ [ "set", "{{.Name}}", "--memsize", "512" ], [ "set", "{{.Name}}", "--cpus", "1" ], @@ -139,7 +127,7 @@ ], "post-processors": [ { - "output": "../builds/{{.Provider}}/opscode_freebsd-10.0_chef-{{user `chef_version`}}.box", + "output": "../builds/{{.Provider}}/opscode_freebsd-10.1_chef-{{user `chef_version`}}.box", "override": { "parallels": { "vagrantfile_template": "vagrantfile_templates/parallels/freebsd.rb" diff --git a/packer/freebsd-10.0-i386.json b/packer/freebsd-10.1-i386.json similarity index 76% rename from packer/freebsd-10.0-i386.json rename to packer/freebsd-10.1-i386.json index 9f9c14b51..e02514985 100644 --- a/packer/freebsd-10.0-i386.json +++ b/packer/freebsd-10.1-i386.json @@ -22,10 +22,6 @@ "type": "virtualbox-iso", "boot_command": [ "<esc><wait>", - "load geom_mbr<wait>", - "<enter><wait>", - "load zfs<wait>", - "<enter><wait>", "boot -s<wait>", "<enter><wait>", "<wait10><wait10>", @@ -33,15 +29,15 @@ "mdmfs -s 100m md1 /tmp<enter><wait>", "mdmfs -s 100m md2 /mnt<enter><wait>", "dhclient -l /tmp/dhclient.lease.em0 em0<enter><wait>", - "fetch -o /tmp/install.sh http://{{ .HTTPIP }}:{{ .HTTPPort }}/freebsd-10.0/install.sh && chmod +x /tmp/install.sh && /tmp/install.sh {{ .Name }}<enter><wait>" + "fetch -o /tmp/install.sh http://{{ .HTTPIP }}:{{ .HTTPPort }}/freebsd-10.1/install.sh && chmod +x /tmp/install.sh && /tmp/install.sh {{ .Name }}<enter><wait>" ], "boot_wait": "10s", "disk_size": 10140, "guest_os_type": "FreeBSD", "http_directory": "http", - "iso_checksum": "2c09643b3f79c703e424c03408882369025cec655c24a6d81ee073081ee75ebc", + "iso_checksum": "fe31790b762b01c99791d33e7fd9ab97323654785ce21f588116c8b4eb381cd0", "iso_checksum_type": "sha256", - "iso_url": "{{user `mirror`}}/releases/i386/i386/ISO-IMAGES/10.0/FreeBSD-10.0-RELEASE-i386-disc1.iso", + "iso_url": "{{user `mirror`}}/releases/i386/i386/ISO-IMAGES/10.1/FreeBSD-10.1-RELEASE-i386-disc1.iso", "ssh_username": "vagrant", "ssh_password": "vagrant", "ssh_port": 22, @@ -49,8 +45,8 @@ "shutdown_command": "echo 'shutdown -p now' > shutdown.sh; cat 'shutdown.sh' | su -", "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "virtualbox_version_file": ".vbox_version", - "vm_name": "packer-freebsd-10.0-i386", - "output_directory": "packer-freebsd-10.0-i386-virtualbox", + "vm_name": "packer-freebsd-10.1-i386", + "output_directory": "packer-freebsd-10.1-i386-virtualbox", "vboxmanage": [ [ "modifyvm", "{{.Name}}", "--memory", "512" ], [ "modifyvm", "{{.Name}}", "--cpus", "1" ] @@ -60,10 +56,6 @@ "type": "vmware-iso", "boot_command": [ "<esc><wait>", - "load geom_mbr<wait>", - "<enter><wait>", - "load zfs<wait>", - "<enter><wait>", "boot -s<wait>", "<enter><wait>", "<wait10><wait10>", @@ -72,22 +64,22 @@ "mdmfs -s 100m md2 /mnt<enter><wait>", "dhclient -l /tmp/dhclient.lease.em0 em0<enter><wait>", "<wait5>", - "fetch -o /tmp/install.sh http://{{ .HTTPIP }}:{{ .HTTPPort }}/freebsd-10.0/install.sh && chmod +x /tmp/install.sh && /tmp/install.sh {{ .Name }}<enter><wait>" + "fetch -o /tmp/install.sh http://{{ .HTTPIP }}:{{ .HTTPPort }}/freebsd-10.1/install.sh && chmod +x /tmp/install.sh && /tmp/install.sh {{ .Name }}<enter><wait>" ], "boot_wait": "10s", "disk_size": 10140, "guest_os_type": "freebsd", "http_directory": "http", - "iso_checksum": "2c09643b3f79c703e424c03408882369025cec655c24a6d81ee073081ee75ebc", + "iso_checksum": "fe31790b762b01c99791d33e7fd9ab97323654785ce21f588116c8b4eb381cd0", "iso_checksum_type": "sha256", - "iso_url": "{{user `mirror`}}/releases/i386/i386/ISO-IMAGES/10.0/FreeBSD-10.0-RELEASE-i386-disc1.iso", + "iso_url": "{{user `mirror`}}/releases/i386/i386/ISO-IMAGES/10.1/FreeBSD-10.1-RELEASE-i386-disc1.iso", "ssh_username": "vagrant", "ssh_password": "vagrant", "ssh_port": 22, "ssh_wait_timeout": "10000s", "shutdown_command": "echo 'shutdown -p now' > shutdown.sh; cat 'shutdown.sh' | su -", - "vm_name": "packer-freebsd-10.0-i386", - "output_directory": "packer-freebsd-10.0-i386-vmware", + "vm_name": "packer-freebsd-10.1-i386", + "output_directory": "packer-freebsd-10.1-i386-vmware", "tools_upload_flavor": "freebsd", "vmx_data": { "memsize": "512", @@ -99,10 +91,6 @@ "type": "parallels-iso", "boot_command": [ "<esc><wait>", - "load geom_mbr<wait>", - "<enter><wait>", - "load zfs<wait>", - "<enter><wait>", "boot -s<wait>", "<enter><wait>", "<wait10><wait10>", @@ -110,15 +98,15 @@ "mdmfs -s 100m md1 /tmp<enter><wait>", "mdmfs -s 100m md2 /mnt<enter><wait>", "dhclient -l /tmp/dhclient.lease.em0 em0<enter><wait>", - "fetch -o /tmp/install.sh http://{{ .HTTPIP }}:{{ .HTTPPort }}/freebsd-10.0/install.sh && chmod +x /tmp/install.sh && /tmp/install.sh {{ .Name }}<enter><wait>" + "fetch -o /tmp/install.sh http://{{ .HTTPIP }}:{{ .HTTPPort }}/freebsd-10.1/install.sh && chmod +x /tmp/install.sh && /tmp/install.sh {{ .Name }}<enter><wait>" ], "boot_wait": "10s", "disk_size": 10140, "guest_os_type": "freebsd", "http_directory": "http", - "iso_checksum": "2c09643b3f79c703e424c03408882369025cec655c24a6d81ee073081ee75ebc", + "iso_checksum": "fe31790b762b01c99791d33e7fd9ab97323654785ce21f588116c8b4eb381cd0", "iso_checksum_type": "sha256", - "iso_url": "{{user `mirror`}}/releases/i386/i386/ISO-IMAGES/10.0/FreeBSD-10.0-RELEASE-i386-disc1.iso", + "iso_url": "{{user `mirror`}}/releases/i386/i386/ISO-IMAGES/10.1/FreeBSD-10.1-RELEASE-i386-disc1.iso", "ssh_username": "vagrant", "ssh_password": "vagrant", "ssh_port": 22, @@ -126,8 +114,8 @@ "shutdown_command": "echo 'shutdown -p now' > shutdown.sh; cat 'shutdown.sh' | su -", "parallels_tools_mode": "disable", "prlctl_version_file": ".prlctl_version", - "vm_name": "packer-freebsd-10.0-amd64", - "output_directory": "packer-freebsd-10.0-i386-parallels", + "vm_name": "packer-freebsd-10.1-amd64", + "output_directory": "packer-freebsd-10.1-i386-parallels", "prlctl": [ [ "set", "{{.Name}}", "--memsize", "512" ], [ "set", "{{.Name}}", "--cpus", "1" ], @@ -139,7 +127,7 @@ ], "post-processors": [ { - "output": "../builds/{{.Provider}}/opscode_freebsd-10.0_chef-{{user `chef_version`}}.box", + "output": "../builds/{{.Provider}}/opscode_freebsd-10.1_chef-{{user `chef_version`}}.box", "override": { "parallels": { "vagrantfile_template": "vagrantfile_templates/parallels/freebsd.rb" diff --git a/packer/http/freebsd-10.0/install.sh b/packer/http/freebsd-10.1/install.sh similarity index 100% rename from packer/http/freebsd-10.0/install.sh rename to packer/http/freebsd-10.1/install.sh diff --git a/packer/scripts/freebsd/postinstall.sh b/packer/scripts/freebsd/postinstall.sh index b18744af3..195bcedff 100644 --- a/packer/scripts/freebsd/postinstall.sh +++ b/packer/scripts/freebsd/postinstall.sh @@ -18,7 +18,7 @@ env PAGER=/bin/cat /tmp/freebsd-update install #Install sudo, curl and ca_root_nss if [ $freebsd_major -gt 9 ]; then # Use pkgng - env ASSUME_ALWAYS_YES=1 pkg bootstrap + env ASSUME_ALWAYS_YES=true pkg bootstrap pkg update pkg install -y sudo pkg install -y curl @@ -58,12 +58,3 @@ EOT pw groupadd vboxusers pw groupmod vboxusers -m vagrant -echo "==============================================================================" -echo "NOTE: FreeBSD - Vagrant" -echo "When using this basebox you need to do some special stuff in your Vagrantfile" -echo "1) Enable HostOnly network" -echo ' config.vm.network "private_network", ip: "192.168.33.10"' -echo "2) Use nfs instead of shared folders" -echo ' config.vm.synced_folder "v-root", "/vagrant", :nfs => true' -echo "=============================================================================" -exit From 85d83ef945411a418c80621bec2bbb2d6249c1b4 Mon Sep 17 00:00:00 2001 From: "Julian C. Dunn" <jdunn@getchef.com> Date: Sun, 16 Nov 2014 10:03:19 -0800 Subject: [PATCH 0282/1622] Fixed incorrect output filename. --- packer/freebsd-10.1-i386.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packer/freebsd-10.1-i386.json b/packer/freebsd-10.1-i386.json index e02514985..409ab32a6 100644 --- a/packer/freebsd-10.1-i386.json +++ b/packer/freebsd-10.1-i386.json @@ -127,7 +127,7 @@ ], "post-processors": [ { - "output": "../builds/{{.Provider}}/opscode_freebsd-10.1_chef-{{user `chef_version`}}.box", + "output": "../builds/{{.Provider}}/opscode_freebsd-10.1-i386_chef-{{user `chef_version`}}.box", "override": { "parallels": { "vagrantfile_template": "vagrantfile_templates/parallels/freebsd.rb" From ceb3c7afa261103700c6da892edb6a17333f4f33 Mon Sep 17 00:00:00 2001 From: "Julian C. Dunn" <jdunn@getchef.com> Date: Mon, 17 Nov 2014 21:58:22 -0500 Subject: [PATCH 0283/1622] Updated FreeBSD boxes to 10.1 in README. Also, i386 boxes are now available. --- README.md | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 1d5301e1b..41765931e 100644 --- a/README.md +++ b/README.md @@ -37,7 +37,8 @@ These baseboxes were all built using a Mac OS X host running VirtualBox 4.3.16, * [opscode-fedora-20](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_fedora-20_chef-provisionerless.box) * [opscode-freebsd-9.3-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_freebsd-9.3-i386_chef-provisionerless.box) * [opscode-freebsd-9.3](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_freebsd-9.3_chef-provisionerless.box) -* [opscode-freebsd-10](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_freebsd-10.0_chef-provisionerless.box) +* [opscode-freebsd-10.1](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_freebsd-10.1_chef-provisionerless.box) +* [opscode-freebsd-10.1-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_freebsd-10.1-i386_chef-provisionerless.box) * [opscode-opensuse-13.1-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_opensuse-13.1-i386_chef-provisionerless.box) * [opscode-opensuse-13.1](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_opensuse-13.1-x86_64_chef-provisionerless.box) * [opscode-ubuntu-10.04-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_ubuntu-10.04-i386_chef-provisionerless.box) @@ -73,7 +74,8 @@ these boxes. Using `--provider vmware_fusion`, will not. * [opscode-fedora-20](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_fedora-20_chef-provisionerless.box) * [opscode-freebsd-9.3-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_freebsd-9.3-i386_chef-provisionerless.box) * [opscode-freebsd-9.3](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_freebsd-9.3_chef-provisionerless.box) -* [opscode-freebsd-10](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_freebsd-10.0_chef-provisionerless.box) +* [opscode-freebsd-10.1](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_freebsd-10.1_chef-provisionerless.box) +* [opscode-freebsd-10.1-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_freebsd-10.1-i386_chef-provisionerless.box) * [opscode-opensuse-13.1-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_opensuse-13.1-i386_chef-provisionerless.box) * [opscode-opensuse-13.1](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_opensuse-13.1-x86_64_chef-provisionerless.box) * [opscode-ubuntu-10.04-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_ubuntu-10.04-i386_chef-provisionerless.box) From f8a00145db4f0564c4466ce7c3e1bac8feeb736f Mon Sep 17 00:00:00 2001 From: "Julian C. Dunn" <jdunn@getchef.com> Date: Thu, 20 Nov 2014 11:24:37 -0500 Subject: [PATCH 0284/1622] Implement support for SLES 12. Closes #294. --- .../http/sles-12/sles-12-x86_64-autoinst.xml | 984 ++++++++++++++++++ packer/scripts/sles/cleanup.sh | 6 + packer/scripts/sles/remove-dvd-source.sh | 26 +- packer/scripts/sles/unsupported-modules.sh | 4 + packer/sles-12-x86_64.json | 146 +++ 5 files changed, 1157 insertions(+), 9 deletions(-) create mode 100644 packer/http/sles-12/sles-12-x86_64-autoinst.xml create mode 100644 packer/scripts/sles/cleanup.sh create mode 100644 packer/scripts/sles/unsupported-modules.sh create mode 100644 packer/sles-12-x86_64.json diff --git a/packer/http/sles-12/sles-12-x86_64-autoinst.xml b/packer/http/sles-12/sles-12-x86_64-autoinst.xml new file mode 100644 index 000000000..b4287770f --- /dev/null +++ b/packer/http/sles-12/sles-12-x86_64-autoinst.xml @@ -0,0 +1,984 @@ +<?xml version="1.0"?> +<!DOCTYPE profile> +<profile xmlns="http://www.suse.com/1.0/yast2ns" xmlns:config="http://www.suse.com/1.0/configns"> + <add-on> + <add_on_products config:type="list"/> + </add-on> + <bootloader> + <device_map config:type="list"> + <device_map_entry> + <firmware>hd0</firmware> + <linux>/dev/sda</linux> + </device_map_entry> + </device_map> + <global> + <activate>true</activate> + <append> resume=/dev/sda1 splash=silent quiet showopts</append> + <append_failsafe>showopts apm=off noresume edd=off powersaved=off nohz=off highres=off processor.max_cstate=1 nomodeset x11failsafe</append_failsafe> + <boot_boot>false</boot_boot> + <boot_extended>false</boot_extended> + <boot_mbr>false</boot_mbr> + <boot_root>true</boot_root> + <default>0</default> + <distributor>SLES12</distributor> + <generic_mbr>true</generic_mbr> + <gfxmode>auto</gfxmode> + <os_prober>false</os_prober> + <timeout config:type="integer">8</timeout> + </global> + <initrd_modules config:type="list"> + <initrd_module> + <module>ahci</module> + </initrd_module> + <initrd_module> + <module>ata_piix</module> + </initrd_module> + <initrd_module> + <module>ata_generic</module> + </initrd_module> + <initrd_module> + <module>jbd</module> + </initrd_module> + <initrd_module> + <module>mbcache</module> + </initrd_module> + </initrd_modules> + <loader_type>grub2</loader_type> + <sections config:type="list"/> + </bootloader> + <ca_mgm> + <CAName>YaST_Default_CA</CAName> + <ca_commonName>YaST Default CA (vagrant-sles-12-x64)</ca_commonName> + <country>US</country> + <locality/> + <organisation/> + <organisationUnit/> + <password>ENTER PASSWORD HERE</password> + <server_commonName>vagrant-sles-12-x64.vagrantup.com</server_commonName> + <server_email>postmaster@vagrantup.com</server_email> + <state/> + <takeLocalServerName config:type="boolean">false</takeLocalServerName> + </ca_mgm> + <deploy_image> + <image_installation config:type="boolean">false</image_installation> + </deploy_image> + <firewall> + <FW_ALLOW_FW_BROADCAST_DMZ>no</FW_ALLOW_FW_BROADCAST_DMZ> + <FW_ALLOW_FW_BROADCAST_EXT>no</FW_ALLOW_FW_BROADCAST_EXT> + <FW_ALLOW_FW_BROADCAST_INT>no</FW_ALLOW_FW_BROADCAST_INT> + <FW_CONFIGURATIONS_DMZ/> + <FW_CONFIGURATIONS_EXT/> + <FW_CONFIGURATIONS_INT/> + <FW_DEV_DMZ/> + <FW_DEV_EXT/> + <FW_DEV_INT/> + <FW_FORWARD_ALWAYS_INOUT_DEV/> + <FW_FORWARD_MASQ/> + <FW_IGNORE_FW_BROADCAST_DMZ>no</FW_IGNORE_FW_BROADCAST_DMZ> + <FW_IGNORE_FW_BROADCAST_EXT>yes</FW_IGNORE_FW_BROADCAST_EXT> + <FW_IGNORE_FW_BROADCAST_INT>no</FW_IGNORE_FW_BROADCAST_INT> + <FW_IPSEC_TRUST>no</FW_IPSEC_TRUST> + <FW_LOAD_MODULES/> + <FW_LOG_ACCEPT_ALL>no</FW_LOG_ACCEPT_ALL> + <FW_LOG_ACCEPT_CRIT>yes</FW_LOG_ACCEPT_CRIT> + <FW_LOG_DROP_ALL>no</FW_LOG_DROP_ALL> + <FW_LOG_DROP_CRIT>yes</FW_LOG_DROP_CRIT> + <FW_MASQUERADE>no</FW_MASQUERADE> + <FW_PROTECT_FROM_INT>no</FW_PROTECT_FROM_INT> + <FW_ROUTE>no</FW_ROUTE> + <FW_SERVICES_ACCEPT_DMZ/> + <FW_SERVICES_ACCEPT_EXT/> + <FW_SERVICES_ACCEPT_INT/> + <FW_SERVICES_ACCEPT_RELATED_DMZ/> + <FW_SERVICES_ACCEPT_RELATED_EXT/> + <FW_SERVICES_ACCEPT_RELATED_INT/> + <FW_SERVICES_DMZ_IP/> + <FW_SERVICES_DMZ_RPC/> + <FW_SERVICES_DMZ_TCP/> + <FW_SERVICES_DMZ_UDP/> + <FW_SERVICES_EXT_IP/> + <FW_SERVICES_EXT_RPC/> + <FW_SERVICES_EXT_TCP/> + <FW_SERVICES_EXT_UDP/> + <FW_SERVICES_INT_IP/> + <FW_SERVICES_INT_RPC/> + <FW_SERVICES_INT_TCP/> + <FW_SERVICES_INT_UDP/> + <enable_firewall config:type="boolean">true</enable_firewall> + <start_firewall config:type="boolean">true</start_firewall> + </firewall> + <general> + <ask-list config:type="list"/> + <mode> + <confirm config:type="boolean">false</confirm> + </mode> + <mouse> + <id>none</id> + </mouse> + <proposals config:type="list"/> + <signature-handling> + <accept_file_without_checksum config:type="boolean">true</accept_file_without_checksum> + <accept_non_trusted_gpg_key config:type="boolean">true</accept_non_trusted_gpg_key> + <accept_unknown_gpg_key config:type="boolean">true</accept_unknown_gpg_key> + <accept_unsigned_file config:type="boolean">true</accept_unsigned_file> + <accept_verification_failed config:type="boolean">false</accept_verification_failed> + <import_gpg_key config:type="boolean">true</import_gpg_key> + </signature-handling> + <storage/> + </general> + <groups config:type="list"> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>100</gid> + <group_password>x</group_password> + <groupname>users</groupname> + <userlist/> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>32</gid> + <group_password>x</group_password> + <groupname>public</groupname> + <userlist/> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>42</gid> + <group_password>x</group_password> + <groupname>trusted</groupname> + <userlist/> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>7</gid> + <group_password>x</group_password> + <groupname>lp</groupname> + <userlist/> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>498</gid> + <group_password>x</group_password> + <groupname>sshd</groupname> + <userlist/> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>54</gid> + <group_password>x</group_password> + <groupname>lock</groupname> + <userlist/> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>20</gid> + <group_password>x</group_password> + <groupname>cdrom</groupname> + <userlist/> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>65534</gid> + <group_password>x</group_password> + <groupname>nogroup</groupname> + <userlist>nobody</userlist> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>6</gid> + <group_password>x</group_password> + <groupname>disk</groupname> + <userlist/> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>499</gid> + <group_password>x</group_password> + <groupname>messagebus</groupname> + <userlist/> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>40</gid> + <group_password>x</group_password> + <groupname>games</groupname> + <userlist/> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>62</gid> + <group_password>x</group_password> + <groupname>man</groupname> + <userlist/> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>496</gid> + <group_password>x</group_password> + <groupname>polkitd</groupname> + <userlist/> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>5</gid> + <group_password>x</group_password> + <groupname>tty</groupname> + <userlist/> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>9</gid> + <group_password>x</group_password> + <groupname>kmem</groupname> + <userlist/> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>19</gid> + <group_password>x</group_password> + <groupname>floppy</groupname> + <userlist/> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>17</gid> + <group_password>x</group_password> + <groupname>audio</groupname> + <userlist/> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>10</gid> + <group_password>x</group_password> + <groupname>wheel</groupname> + <userlist/> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>0</gid> + <group_password>x</group_password> + <groupname>root</groupname> + <userlist/> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>65533</gid> + <group_password>x</group_password> + <groupname>nobody</groupname> + <userlist/> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>8</gid> + <group_password>x</group_password> + <groupname>www</groupname> + <userlist/> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>15</gid> + <group_password>x</group_password> + <groupname>shadow</groupname> + <userlist/> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>22</gid> + <group_password>x</group_password> + <groupname>utmp</groupname> + <userlist/> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>3</gid> + <group_password>x</group_password> + <groupname>sys</groupname> + <userlist/> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>14</gid> + <group_password>x</group_password> + <groupname>uucp</groupname> + <userlist/> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>495</gid> + <group_password>x</group_password> + <groupname>nscd</groupname> + <userlist/> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>497</gid> + <group_password>x</group_password> + <groupname>tape</groupname> + <userlist/> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>2</gid> + <group_password>x</group_password> + <groupname>daemon</groupname> + <userlist/> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>43</gid> + <group_password>x</group_password> + <groupname>modem</groupname> + <userlist/> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>49</gid> + <group_password>x</group_password> + <groupname>ftp</groupname> + <userlist/> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>21</gid> + <group_password>x</group_password> + <groupname>console</groupname> + <userlist/> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>12</gid> + <group_password>x</group_password> + <groupname>mail</groupname> + <userlist/> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>13</gid> + <group_password>x</group_password> + <groupname>news</groupname> + <userlist/> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>41</gid> + <group_password>x</group_password> + <groupname>xok</groupname> + <userlist/> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>33</gid> + <group_password>x</group_password> + <groupname>video</groupname> + <userlist/> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>16</gid> + <group_password>x</group_password> + <groupname>dialout</groupname> + <userlist/> + </group> + <group> + <encrypted config:type="boolean">true</encrypted> + <gid>1</gid> + <group_password>x</group_password> + <groupname>bin</groupname> + <userlist>daemon</userlist> + </group> + </groups> + <host> + <hosts config:type="list"> + <hosts_entry> + <host_address>127.0.0.1</host_address> + <names config:type="list"> + <name>localhost</name> + </names> + </hosts_entry> + <hosts_entry> + <host_address>::1</host_address> + <names config:type="list"> + <name>localhost ipv6-localhost ipv6-loopback</name> + </names> + </hosts_entry> + <hosts_entry> + <host_address>fe00::0</host_address> + <names config:type="list"> + <name>ipv6-localnet</name> + </names> + </hosts_entry> + <hosts_entry> + <host_address>ff00::0</host_address> + <names config:type="list"> + <name>ipv6-mcastprefix</name> + </names> + </hosts_entry> + <hosts_entry> + <host_address>ff02::1</host_address> + <names config:type="list"> + <name>ipv6-allnodes</name> + </names> + </hosts_entry> + <hosts_entry> + <host_address>ff02::2</host_address> + <names config:type="list"> + <name>ipv6-allrouters</name> + </names> + </hosts_entry> + <hosts_entry> + <host_address>ff02::3</host_address> + <names config:type="list"> + <name>ipv6-allhosts</name> + </names> + </hosts_entry> + </hosts> + </host> + <kdump> + <add_crash_kernel config:type="boolean">false</add_crash_kernel> + <crash_kernel>208M-:104M</crash_kernel> + <general> + <KDUMP_COMMANDLINE/> + <KDUMP_COMMANDLINE_APPEND/> + <KDUMP_COPY_KERNEL>yes</KDUMP_COPY_KERNEL> + <KDUMP_DUMPFORMAT>lzo</KDUMP_DUMPFORMAT> + <KDUMP_DUMPLEVEL>31</KDUMP_DUMPLEVEL> + <KDUMP_FREE_DISK_SIZE>64</KDUMP_FREE_DISK_SIZE> + <KDUMP_IMMEDIATE_REBOOT>yes</KDUMP_IMMEDIATE_REBOOT> + <KDUMP_KEEP_OLD_DUMPS>5</KDUMP_KEEP_OLD_DUMPS> + <KDUMP_KERNELVER/> + <KDUMP_NOTIFICATION_CC/> + <KDUMP_NOTIFICATION_TO/> + <KDUMP_SAVEDIR>file:///var/crash</KDUMP_SAVEDIR> + <KDUMP_SMTP_PASSWORD/> + <KDUMP_SMTP_SERVER/> + <KDUMP_SMTP_USER/> + <KDUMP_TRANSFER/> + <KDUMP_VERBOSE>3</KDUMP_VERBOSE> + <KEXEC_OPTIONS/> + </general> + </kdump> + <login_settings/> + <networking> + <dhcp_options> + <dhclient_client_id/> + <dhclient_hostname_option>AUTO</dhclient_hostname_option> + </dhcp_options> + <dns> + <dhcp_hostname config:type="boolean">false</dhcp_hostname> + <domain>vagrantup.com</domain> + <hostname>vagrant-sles-12-x64</hostname> + <resolv_conf_policy>auto</resolv_conf_policy> + <searchlist config:type="list"> + <search>vagrantup.com</search> + </searchlist> + <write_hostname config:type="boolean">true</write_hostname> + </dns> + <interfaces config:type="list"> + <interface> + <bootproto>dhcp</bootproto> + <device>eth0</device> + <dhclient_set_default_route>yes</dhclient_set_default_route> + <startmode>auto</startmode> + <usercontrol>no</usercontrol> + </interface> + </interfaces> + <keep_install_network config:type="boolean">true</keep_install_network> + <managed config:type="boolean">false</managed> + <routing> + <ipv4_forward config:type="boolean">false</ipv4_forward> + <ipv6_forward config:type="boolean">false</ipv6_forward> + </routing> + </networking> + <partitioning config:type="list"> + <drive> + <device>/dev/sda</device> + <initialize config:type="boolean">true</initialize> + <partitions config:type="list"> + <partition> + <create config:type="boolean">true</create> + <crypt_fs config:type="boolean">false</crypt_fs> + <filesystem config:type="symbol">swap</filesystem> + <format config:type="boolean">true</format> + <fstopt>defaults</fstopt> + <loop_fs config:type="boolean">false</loop_fs> + <mount>swap</mount> + <mountby config:type="symbol">device</mountby> + <partition_id config:type="integer">130</partition_id> + <partition_nr config:type="integer">1</partition_nr> + <raid_options/> + <resize config:type="boolean">false</resize> + <size>1561492992</size> + </partition> + <partition> + <create config:type="boolean">true</create> + <crypt_fs config:type="boolean">false</crypt_fs> + <filesystem config:type="symbol">btrfs</filesystem> + <format config:type="boolean">true</format> + <loop_fs config:type="boolean">false</loop_fs> + <mount>/</mount> + <mountby config:type="symbol">device</mountby> + <partition_id config:type="integer">131</partition_id> + <partition_nr config:type="integer">2</partition_nr> + <raid_options/> + <resize config:type="boolean">false</resize> + <size>19895844352</size> + <subvolumes config:type="list"> + <listentry>boot/grub2/i386-pc</listentry> + <listentry>boot/grub2/x86_64-efi</listentry> + <listentry>home</listentry> + <listentry>opt</listentry> + <listentry>srv</listentry> + <listentry>tmp</listentry> + <listentry>usr/local</listentry> + <listentry>var/crash</listentry> + <listentry>var/lib/mailman</listentry> + <listentry>var/lib/named</listentry> + <listentry>var/lib/pgsql</listentry> + <listentry>var/log</listentry> + <listentry>var/opt</listentry> + <listentry>var/spool</listentry> + <listentry>var/tmp</listentry> + </subvolumes> + </partition> + </partitions> + <pesize/> + <type config:type="symbol">CT_DISK</type> + <use>all</use> + </drive> + </partitioning> + <proxy> + <enabled config:type="boolean">false</enabled> + <ftp_proxy/> + <http_proxy/> + <https_proxy/> + <no_proxy>localhost, 127.0.0.1</no_proxy> + <proxy_password/> + <proxy_user/> + </proxy> + <report> + <errors> + <log config:type="boolean">true</log> + <show config:type="boolean">true</show> + <timeout config:type="integer">0</timeout> + </errors> + <messages> + <log config:type="boolean">true</log> + <show config:type="boolean">true</show> + <timeout config:type="integer">0</timeout> + </messages> + <warnings> + <log config:type="boolean">true</log> + <show config:type="boolean">true</show> + <timeout config:type="integer">0</timeout> + </warnings> + <yesno_messages> + <log config:type="boolean">true</log> + <show config:type="boolean">true</show> + <timeout config:type="integer">0</timeout> + </yesno_messages> + </report> + <services-manager> + <default_target>graphical</default_target> + <services> + <disable config:type="list"/> + <enable config:type="list"> + <service>sshd</service> + </enable> + </services> + </services-manager> + <software> + <packages config:type="list"> + <package>glibc</package> + <package>openssh</package> + <package>grub2</package> + <package>syslinux</package> + <package>snapper</package> + <package>sles-release</package> + <package>SuSEfirewall2</package> + <package>kexec-tools</package> + <package>perl-Bootloader-YAML</package> + <package>kernel-default-devel</package> + <package>sudo</package> + <package>gcc</package> + <package>wget</package> + <package>perl</package> + <package>make</package> + </packages> + <patterns config:type="list"> + <pattern>Minimal</pattern> + <pattern>apparmor</pattern> + </patterns> + <remove-packages config:type="list"> + <package>adaptec-firmware</package> + <package>atmel-firmware</package> + <package>augeas-lenses</package> + <package>bash-completion</package> + <package>bash-doc</package> + <package>cifs-utils</package> + <package>cups-libs</package> + <package>ipw-firmware</package> + <package>mpt-firmware</package> + <package>postfix</package> + <package>samba-libs</package> + <package>ucode-intel</package> + </remove-packages> + </software> + <timezone> + <hwclock>UTC</hwclock> + <timezone>UTC</timezone> + </timezone> + <user_defaults> + <expire/> + <group>100</group> + <groups>video,dialout</groups> + <home>/home</home> + <inactive>-1</inactive> + <shell>/bin/bash</shell> + <skel>/etc/skel</skel> + <umask>022</umask> + </user_defaults> + <users config:type="list"> + <user> + <encrypted config:type="boolean">true</encrypted> + <fullname>vagrant</fullname> + <gid>100</gid> + <home>/home/vagrant</home> + <password_settings> + <expire/> + <flag/> + <inact/> + <max>99999</max> + <min>0</min> + <warn>7</warn> + </password_settings> + <shell>/bin/bash</shell> + <uid>1000</uid> + <user_password>$2y$05$NA1Li9ZKJOLRW5mMTXm6/e5r8dltWS5RpDZpvHrI82aLE00V51tdi</user_password> + <username>vagrant</username> + </user> + <user> + <encrypted config:type="boolean">true</encrypted> + <fullname>News system</fullname> + <gid>13</gid> + <home>/etc/news</home> + <password_settings> + <expire/> + <flag/> + <inact/> + <max/> + <min/> + <warn/> + </password_settings> + <shell>/bin/bash</shell> + <uid>9</uid> + <user_password>*</user_password> + <username>news</username> + </user> + <user> + <encrypted config:type="boolean">true</encrypted> + <fullname>bin</fullname> + <gid>1</gid> + <home>/bin</home> + <password_settings> + <expire/> + <flag/> + <inact/> + <max/> + <min/> + <warn/> + </password_settings> + <shell>/bin/bash</shell> + <uid>1</uid> + <user_password>*</user_password> + <username>bin</username> + </user> + <user> + <encrypted config:type="boolean">true</encrypted> + <fullname>FTP account</fullname> + <gid>49</gid> + <home>/srv/ftp</home> + <password_settings> + <expire/> + <flag/> + <inact/> + <max/> + <min/> + <warn/> + </password_settings> + <shell>/bin/bash</shell> + <uid>40</uid> + <user_password>*</user_password> + <username>ftp</username> + </user> + <user> + <encrypted config:type="boolean">true</encrypted> + <fullname>WWW daemon apache</fullname> + <gid>8</gid> + <home>/var/lib/wwwrun</home> + <password_settings> + <expire/> + <flag/> + <inact/> + <max/> + <min/> + <warn/> + </password_settings> + <shell>/bin/false</shell> + <uid>30</uid> + <user_password>*</user_password> + <username>wwwrun</username> + </user> + <user> + <encrypted config:type="boolean">true</encrypted> + <fullname>User for polkitd</fullname> + <gid>496</gid> + <home>/var/lib/polkit</home> + <password_settings> + <expire/> + <flag/> + <inact/> + <max/> + <min/> + <warn/> + </password_settings> + <shell>/sbin/nologin</shell> + <uid>497</uid> + <user_password>!</user_password> + <username>polkitd</username> + </user> + <user> + <encrypted config:type="boolean">true</encrypted> + <fullname>Manual pages viewer</fullname> + <gid>62</gid> + <home>/var/cache/man</home> + <password_settings> + <expire/> + <flag/> + <inact/> + <max/> + <min/> + <warn/> + </password_settings> + <shell>/bin/bash</shell> + <uid>13</uid> + <user_password>*</user_password> + <username>man</username> + </user> + <user> + <encrypted config:type="boolean">true</encrypted> + <fullname>Daemon</fullname> + <gid>2</gid> + <home>/sbin</home> + <password_settings> + <expire/> + <flag/> + <inact/> + <max/> + <min/> + <warn/> + </password_settings> + <shell>/bin/bash</shell> + <uid>2</uid> + <user_password>*</user_password> + <username>daemon</username> + </user> + <user> + <encrypted config:type="boolean">true</encrypted> + <fullname>root</fullname> + <gid>0</gid> + <home>/root</home> + <password_settings> + <expire/> + <flag/> + <inact/> + <max/> + <min/> + <warn/> + </password_settings> + <shell>/bin/bash</shell> + <uid>0</uid> + <user_password>$6$UgKtUD0AUMIA$VWLyc2Uvl0Lk6xxfTuoRb0/jrhZ9IJG/Gtx/DkZUEWZm.JYO1Q1fvPo6gDxQAHp38kQ1DG1vNGRgu2T/z/vih.</user_password> + <username>root</username> + </user> + <user> + <encrypted config:type="boolean">true</encrypted> + <fullname>nobody</fullname> + <gid>65533</gid> + <home>/var/lib/nobody</home> + <password_settings> + <expire/> + <flag/> + <inact/> + <max/> + <min/> + <warn/> + </password_settings> + <shell>/bin/bash</shell> + <uid>65534</uid> + <user_password>*</user_password> + <username>nobody</username> + </user> + <user> + <encrypted config:type="boolean">true</encrypted> + <fullname>Mailer daemon</fullname> + <gid>12</gid> + <home>/var/spool/clientmqueue</home> + <password_settings> + <expire/> + <flag/> + <inact/> + <max/> + <min/> + <warn/> + </password_settings> + <shell>/bin/false</shell> + <uid>8</uid> + <user_password>*</user_password> + <username>mail</username> + </user> + <user> + <encrypted config:type="boolean">true</encrypted> + <fullname>openslp daemon</fullname> + <gid>2</gid> + <home>/var/lib/empty</home> + <password_settings> + <expire/> + <flag/> + <inact/> + <max/> + <min/> + <warn/> + </password_settings> + <shell>/sbin/nologin</shell> + <uid>494</uid> + <user_password>!</user_password> + <username>openslp</username> + </user> + <user> + <encrypted config:type="boolean">true</encrypted> + <fullname>User for D-Bus</fullname> + <gid>499</gid> + <home>/var/run/dbus</home> + <password_settings> + <expire/> + <flag/> + <inact/> + <max/> + <min/> + <warn/> + </password_settings> + <shell>/bin/false</shell> + <uid>499</uid> + <user_password>!</user_password> + <username>messagebus</username> + </user> + <user> + <encrypted config:type="boolean">true</encrypted> + <fullname>User for nscd</fullname> + <gid>495</gid> + <home>/run/nscd</home> + <password_settings> + <expire/> + <flag/> + <inact/> + <max/> + <min/> + <warn/> + </password_settings> + <shell>/sbin/nologin</shell> + <uid>496</uid> + <user_password>!</user_password> + <username>nscd</username> + </user> + <user> + <encrypted config:type="boolean">true</encrypted> + <fullname>user for rpcbind</fullname> + <gid>65534</gid> + <home>/var/lib/empty</home> + <password_settings> + <expire/> + <flag/> + <inact/> + <max/> + <min/> + <warn/> + </password_settings> + <shell>/sbin/nologin</shell> + <uid>495</uid> + <user_password>!</user_password> + <username>rpc</username> + </user> + <user> + <encrypted config:type="boolean">true</encrypted> + <fullname>Games account</fullname> + <gid>100</gid> + <home>/var/games</home> + <password_settings> + <expire/> + <flag/> + <inact/> + <max/> + <min/> + <warn/> + </password_settings> + <shell>/bin/bash</shell> + <uid>12</uid> + <user_password>*</user_password> + <username>games</username> + </user> + <user> + <encrypted config:type="boolean">true</encrypted> + <fullname>SSH daemon</fullname> + <gid>498</gid> + <home>/var/lib/sshd</home> + <password_settings> + <expire/> + <flag/> + <inact/> + <max/> + <min/> + <warn/> + </password_settings> + <shell>/bin/false</shell> + <uid>498</uid> + <user_password>!</user_password> + <username>sshd</username> + </user> + <user> + <encrypted config:type="boolean">true</encrypted> + <fullname>Unix-to-Unix CoPy system</fullname> + <gid>14</gid> + <home>/etc/uucp</home> + <password_settings> + <expire/> + <flag/> + <inact/> + <max/> + <min/> + <warn/> + </password_settings> + <shell>/bin/bash</shell> + <uid>10</uid> + <user_password>*</user_password> + <username>uucp</username> + </user> + <user> + <encrypted config:type="boolean">true</encrypted> + <fullname>Printing daemon</fullname> + <gid>7</gid> + <home>/var/spool/lpd</home> + <password_settings> + <expire/> + <flag/> + <inact/> + <max/> + <min/> + <warn/> + </password_settings> + <shell>/bin/bash</shell> + <uid>4</uid> + <user_password>*</user_password> + <username>lp</username> + </user> + </users> +</profile> diff --git a/packer/scripts/sles/cleanup.sh b/packer/scripts/sles/cleanup.sh new file mode 100644 index 000000000..9bc9f828c --- /dev/null +++ b/packer/scripts/sles/cleanup.sh @@ -0,0 +1,6 @@ +#!/bin/sh +# These were only needed for building VMware/Virtualbox extensions: +zypper --non-interactive rm --clean-deps gcc kernel-default-devel +zypper clean +rm -rf VBoxGuestAdditions_*.iso VBoxGuestAdditions_*.iso.? +rm -f /tmp/chef*rpm diff --git a/packer/scripts/sles/remove-dvd-source.sh b/packer/scripts/sles/remove-dvd-source.sh index ba16b68e9..632fa6cbc 100644 --- a/packer/scripts/sles/remove-dvd-source.sh +++ b/packer/scripts/sles/remove-dvd-source.sh @@ -6,16 +6,24 @@ else arch_suffix=x86 fi +oslevel=`grep VERSION /etc/SuSE-release | awk '{ print $3 }'` patchlevel=`grep PATCHLEVEL /etc/SuSE-release | awk '{ print $3 }'` -if [ $patchlevel == '2' ]; then - repo_ver="11.2.2-1.234" -elif [ $patchlevel == '3' ]; then - repo_ver="11.3.3-1.138" -else - echo "Failed to remove DVD source; don't know how to deal with patchlevel $patchlevel" - exit 1 + +if [ $oslevel == '11' ]; then + if [ $patchlevel == '2' ]; then + repo_ver="11.2.2-1.234" + elif [ $patchlevel == '3' ]; then + repo_ver="11.3.3-1.138" + else + echo "Failed to remove DVD source; don't know how to deal with patchlevel $patchlevel" + exit 1 + fi + zypper removerepo "SUSE-Linux-Enterprise-Server-11-SP$patchlevel $repo_ver" + zypper addrepo "http://demeter.uni-regensburg.de/SLES11SP$patchlevel-$arch_suffix/DVD1/" "SLES11SP$patchlevel-$arch_suffix DVD1 Online" +elif [ $oslevel == '12' ]; then + zypper removerepo "SLES12-12-$patchlevel" + zypper addrepo "http://demeter.uni-regensburg.de/SLES12-$arch_suffix/DVD1/" "SLES12-12-$patchlevel-$arch_suffix DVD1 Online" + zypper addrepo "http://demeter.uni-regensburg.de/SLES12-$arch_suffix/DVD2/" "SLES12-12-$patchlevel-$arch_suffix DVD2 Online" fi -zypper removerepo "SUSE-Linux-Enterprise-Server-11-SP$patchlevel $repo_ver" -zypper addrepo "http://demeter.uni-regensburg.de/SLES11SP$patchlevel-$arch_suffix/DVD1/" "SLES11SP$patchlevel-$arch_suffix DVD1 Online" zypper refresh diff --git a/packer/scripts/sles/unsupported-modules.sh b/packer/scripts/sles/unsupported-modules.sh new file mode 100644 index 000000000..8fa7e032b --- /dev/null +++ b/packer/scripts/sles/unsupported-modules.sh @@ -0,0 +1,4 @@ +#!/bin/sh + +# Enable unsupported kernel modules, so vboxguest can install +sed -i -e 's#^allow_unsupported_modules 0#allow_unsupported_modules 1#' /etc/modprobe.d/10-unsupported-modules.conf diff --git a/packer/sles-12-x86_64.json b/packer/sles-12-x86_64.json new file mode 100644 index 000000000..a269997d0 --- /dev/null +++ b/packer/sles-12-x86_64.json @@ -0,0 +1,146 @@ +{ + "builders": [ + { + "boot_command": [ + "<esc><enter><wait>", + "linux netdevice=eth0 netsetup=dhcp install=cd:/<wait>", + " lang=en_US autoyast=http://{{ .HTTPIP }}:{{ .HTTPPort }}/sles-12/sles-12-x86_64-autoinst.xml<wait>", + " textmode=1<wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 20480, + "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "guest_os_type": "OpenSUSE_64", + "http_directory": "http", + "iso_checksum": "58086fca0441b1d44c7a51c5ee64e1bd4365466fcee48ec92c4f39d07739aeed", + "iso_checksum_type": "sha256", + "iso_url": "{{user `mirror`}}/SLE-12-Server-DVD-x86_64-GM-DVD1.iso", + "output_directory": "packer-sles-12-x86_64-virtualbox", + "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "virtualbox-iso", + "vboxmanage": [ + [ + "modifyvm", + "{{.Name}}", + "--memory", + "480" + ], + [ + "modifyvm", + "{{.Name}}", + "--cpus", + "1" + ] + ], + "virtualbox_version_file": ".vbox_version", + "vm_name": "packer-sles-12-x86_64" + }, + { + "boot_command": [ + "<esc><enter><wait>", + "linux netdevice=eth0 netsetup=dhcp install=cd:/<wait>", + " lang=en_US autoyast=http://{{ .HTTPIP }}:{{ .HTTPPort }}/sles-12/sles-12-x86_64-autoinst.xml", + " textmode=1<wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 20480, + "guest_os_type": "sles11-64", + "http_directory": "http", + "iso_checksum": "58086fca0441b1d44c7a51c5ee64e1bd4365466fcee48ec92c4f39d07739aeed", + "iso_checksum_type": "sha256", + "iso_url": "{{user `mirror`}}/SLE-12-Server-DVD-x86_64-GM-DVD1.iso", + "output_directory": "packer-sles-12-sp3-x86_64-vmware", + "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "tools_upload_flavor": "linux", + "type": "vmware-iso", + "vm_name": "packer-sles-12-sp3-x86_64", + "vmx_data": { + "cpuid.coresPerSocket": "1", + "memsize": "480", + "numvcpus": "1" + } + }, + { + "boot_command": [ + "<esc><enter><wait>", + "linux netdevice=eth0 netsetup=dhcp install=cd:/<wait>", + " lang=en_US autoyast=http://{{ .HTTPIP }}:{{ .HTTPPort }}/sles-12/sles-12-x86_64-autoinst.xml<wait>", + " textmode=1<wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 20480, + "parallels_tools_flavor": "lin", + "guest_os_type": "suse", + "http_directory": "http", + "iso_checksum": "58086fca0441b1d44c7a51c5ee64e1bd4365466fcee48ec92c4f39d07739aeed", + "iso_checksum_type": "sha256", + "iso_url": "{{user `mirror`}}/SLE-12-Server-DVD-x86_64-GM-DVD1.iso", + "output_directory": "packer-sles-12-x86_64-parallels", + "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "parallels-iso", + "prlctl": [ + [ + "set", + "{{.Name}}", + "--memsize", + "480" + ], + [ + "set", + "{{.Name}}", + "--cpus", + "1" + ] + ], + "prlctl_version_file": ".prlctl_version", + "vm_name": "packer-sles-12-x86_64" + } + ], + "post-processors": [ + { + "output": "../builds/{{.Provider}}/opscode_sles-12_chef-{{user `chef_version`}}.box", + "type": "vagrant" + } + ], + "provisioners": [ + { + "environment_vars": [ + "CHEF_VERSION={{user `chef_version`}}" + ], + "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh '{{.Path}}'", + "scripts": [ + "scripts/common/sshd.sh", + "scripts/common/vagrant.sh", + "scripts/sles/unsupported-modules.sh", + "scripts/common/vmtools.sh", + "scripts/common/chef.sh", + "scripts/sles/sudoers.sh", + "scripts/sles/zypper-locks.sh", + "scripts/sles/remove-dvd-source.sh", + "scripts/sles/cleanup.sh", + "scripts/common/minimize.sh" + ], + "type": "shell" + } + ], + "variables": { + "chef_version": "provisionerless", + "mirror": "http://cdn2.novell.com/prot/Q_VbW21BiB4~" + } +} + From 1b961b46464996fa3a9011f054b1aaffb58b1ab8 Mon Sep 17 00:00:00 2001 From: "Julian C. Dunn" <jdunn@getchef.com> Date: Tue, 25 Nov 2014 18:18:31 -0500 Subject: [PATCH 0285/1622] Convert FreeBSD 9 to use pkgng. Closes #296. --- packer/scripts/freebsd/postinstall.sh | 21 ++++++++++----------- packer/scripts/freebsd/vmtools.sh | 3 +-- 2 files changed, 11 insertions(+), 13 deletions(-) diff --git a/packer/scripts/freebsd/postinstall.sh b/packer/scripts/freebsd/postinstall.sh index 195bcedff..d741ad298 100644 --- a/packer/scripts/freebsd/postinstall.sh +++ b/packer/scripts/freebsd/postinstall.sh @@ -15,19 +15,18 @@ chmod +x /tmp/freebsd-update env PAGER=/bin/cat /tmp/freebsd-update fetch env PAGER=/bin/cat /tmp/freebsd-update install -#Install sudo, curl and ca_root_nss -if [ $freebsd_major -gt 9 ]; then - # Use pkgng - env ASSUME_ALWAYS_YES=true pkg bootstrap - pkg update - pkg install -y sudo - pkg install -y curl - pkg install -y ca_root_nss -else - # Use old pkg - pkg_add -r sudo curl ca_root_nss +# always use pkgng - pkg_add is EOL as of 1 September 2014 +env ASSUME_ALWAYS_YES=true pkg bootstrap +if [ $freebsd_major -lt 10 ]; then + echo WITH_PKGNG=yes >> /etc/make.conf fi +#Install sudo, curl and ca_root_nss +pkg update +pkg install -y sudo +pkg install -y curl +pkg install -y ca_root_nss + # Emulate the ETCSYMLINK behavior of ca_root_nss; this is for FreeBSD 10, where fetch(1) was # massively refactored and doesn't come with SSL CAcerts anymore ln -sf /usr/local/share/certs/ca-root-nss.crt /etc/ssl/cert.pem diff --git a/packer/scripts/freebsd/vmtools.sh b/packer/scripts/freebsd/vmtools.sh index 1d7b9a5b8..9927f1760 100644 --- a/packer/scripts/freebsd/vmtools.sh +++ b/packer/scripts/freebsd/vmtools.sh @@ -1,11 +1,10 @@ #!/bin/sh freebsd_major=`uname -r | awk -F. '{ print $1 }'` +pkg_command="pkg install -y" if [ $freebsd_major -gt 9 ]; then - pkg_command="pkg install -y" perl_pkg="perl5" else - pkg_command="pkg_add -r" perl_pkg="perl" fi From 4370586c5b310114e45d7f65c4399d6ffff2a4de Mon Sep 17 00:00:00 2001 From: "Julian C. Dunn" <jdunn@getchef.com> Date: Wed, 26 Nov 2014 22:55:13 -0500 Subject: [PATCH 0286/1622] Update to OpenSuSE 13.2. Closes #298 --- .../autoinst.xml | 104 +++++++----------- ...13.1-i386.json => opensuse-13.2-i386.json} | 39 ++++--- ...-x86_64.json => opensuse-13.2-x86_64.json} | 39 ++++--- packer/scripts/opensuse/cleanup.sh | 6 +- packer/scripts/opensuse/remove-dvd-source.sh | 13 +-- packer/scripts/opensuse/services.sh | 5 - 6 files changed, 84 insertions(+), 122 deletions(-) rename packer/http/{opensuse-13.1 => opensuse-13.2}/autoinst.xml (72%) rename packer/{opensuse-13.1-i386.json => opensuse-13.2-i386.json} (77%) rename packer/{opensuse-13.1-x86_64.json => opensuse-13.2-x86_64.json} (77%) delete mode 100644 packer/scripts/opensuse/services.sh diff --git a/packer/http/opensuse-13.1/autoinst.xml b/packer/http/opensuse-13.2/autoinst.xml similarity index 72% rename from packer/http/opensuse-13.1/autoinst.xml rename to packer/http/opensuse-13.2/autoinst.xml index 27243fe0a..1f16ef216 100644 --- a/packer/http/opensuse-13.1/autoinst.xml +++ b/packer/http/opensuse-13.2/autoinst.xml @@ -40,57 +40,59 @@ <hwclock>UTC</hwclock> <timezone>Etc/UTC</timezone> </timezone> - <partitioning config:type="list"> <drive> + <device>/dev/sda</device> <initialize config:type="boolean">true</initialize> <partitions config:type="list"> <partition> <create config:type="boolean">true</create> <crypt_fs config:type="boolean">false</crypt_fs> - <filesystem config:type="symbol">ext4</filesystem> - <filesystem_id config:type="integer">131</filesystem_id> + <filesystem config:type="symbol">swap</filesystem> <format config:type="boolean">true</format> <fstopt>defaults</fstopt> <loop_fs config:type="boolean">false</loop_fs> - <mount>/boot</mount> + <mount>swap</mount> <mountby config:type="symbol">device</mountby> - <partition_id config:type="integer">131</partition_id> + <partition_id config:type="integer">130</partition_id> <partition_nr config:type="integer">1</partition_nr> + <raid_options/> <resize config:type="boolean">false</resize> <size>512M</size> </partition> <partition> <create config:type="boolean">true</create> <crypt_fs config:type="boolean">false</crypt_fs> - <filesystem config:type="symbol">ext4</filesystem> - <filesystem_id config:type="integer">131</filesystem_id> + <filesystem config:type="symbol">btrfs</filesystem> <format config:type="boolean">true</format> - <fstopt>defaults</fstopt> <loop_fs config:type="boolean">false</loop_fs> <mount>/</mount> <mountby config:type="symbol">device</mountby> <partition_id config:type="integer">131</partition_id> <partition_nr config:type="integer">2</partition_nr> + <raid_options/> <resize config:type="boolean">false</resize> <size>max</size> - </partition> - <partition> - <create config:type="boolean">true</create> - <crypt_fs config:type="boolean">false</crypt_fs> - <filesystem config:type="symbol">swap</filesystem> - <filesystem_id config:type="integer">130</filesystem_id> - <format config:type="boolean">true</format> - <fstopt>defaults</fstopt> - <loop_fs config:type="boolean">false</loop_fs> - <mount>swap</mount> - <mountby config:type="symbol">device</mountby> - <partition_id config:type="integer">130</partition_id> - <partition_nr config:type="integer">3</partition_nr> - <resize config:type="boolean">false</resize> - <size>512M</size> + <subvolumes config:type="list"> + <listentry>boot/grub2/i386-pc</listentry> + <listentry>boot/grub2/x86_64-efi</listentry> + <listentry>home</listentry> + <listentry>opt</listentry> + <listentry>srv</listentry> + <listentry>tmp</listentry> + <listentry>usr/local</listentry> + <listentry>var/crash</listentry> + <listentry>var/lib/mailman</listentry> + <listentry>var/lib/named</listentry> + <listentry>var/lib/pgsql</listentry> + <listentry>var/log</listentry> + <listentry>var/opt</listentry> + <listentry>var/spool</listentry> + <listentry>var/tmp</listentry> + </subvolumes> </partition> </partitions> + <pesize/> <type config:type="symbol">CT_DISK</type> <use>all</use> </drive> @@ -106,8 +108,8 @@ <dns> <dhcp_hostname config:type="boolean">true</dhcp_hostname> <dhcp_resolv config:type="boolean">true</dhcp_resolv> - <domain>local</domain> - <hostname>linux</hostname> + <domain>vagrantup.com</domain> + <hostname>opensuse-13.2-x64</hostname> </dns> <interfaces config:type="list"> <interface> @@ -124,8 +126,8 @@ </networking> <firewall> - <enable_firewall config:type="boolean">false</enable_firewall> - <start_firewall config:type="boolean">false</start_firewall> + <enable_firewall config:type="boolean">true</enable_firewall> + <start_firewall config:type="boolean">true</start_firewall> </firewall> <software> @@ -139,61 +141,36 @@ <package>kernel-default-devel</package> <package>gcc</package> <package>make</package> - <package>less</package> - <package>vim</package> <package>sudo</package> - <package>screen</package> <package>yast2</package> <package>yast2-firstboot</package> <package>zypper</package> <package>yast2-trans-en_US</package> <package>wget</package> <package>curl</package> - <package>iproute2</package> - <package>ifplugd</package> - <package>kexec-tools</package> - <package>libdaemon0</package> - <package>libnl1</package> - <package>libxslt-tools</package> - <package>cryptsetup-mkinitrd</package> <package>grub2-branding-openSUSE</package> - <package>rsyslog</package> </packages> <patterns config:type="list"> <pattern>sw_management</pattern> <pattern>yast2_install_wf</pattern> - <pattern>base</pattern> + <pattern>minimal_base</pattern> </patterns> <remove-packages config:type="list"> + <package>bash-completion</package> + <package>telnet</package> <package>virtualbox-guest-kmp-default</package> <package>virtualbox-guest-tools</package> </remove-packages> </software> - - <runlevel> - <services config:type="list"> - <service> - <service_name>sshd</service_name> - <service_start>3 5</service_start> - </service> + <services-manager> + <default_target>graphical</default_target> + <services> + <disable config:type="list"/> + <enable config:type="list"> + <service>sshd</service> + </enable> </services> - </runlevel> - - <scripts> - <init-scripts config:type="list"> - <script> - <debug config:type="boolean">true</debug> - <filename>restart_sshd.sh</filename> - <interpreter>shell</interpreter> - <source><![CDATA[#!/bin/bash -systemctl restart sshd -systemctl enable rsyslog -systemctl start rsyslog -]]></source> - </script> - </init-scripts> - </scripts> - + </services-manager> <groups config:type="list"> <group> <gid>100</gid> @@ -201,7 +178,6 @@ systemctl start rsyslog <userlist/> </group> </groups> - <user_defaults> <expire/> <group>100</group> diff --git a/packer/opensuse-13.1-i386.json b/packer/opensuse-13.2-i386.json similarity index 77% rename from packer/opensuse-13.1-i386.json rename to packer/opensuse-13.2-i386.json index f0a72f200..c31586bf4 100644 --- a/packer/opensuse-13.1-i386.json +++ b/packer/opensuse-13.2-i386.json @@ -4,7 +4,7 @@ "boot_command": [ "<esc><enter><wait>", "linux netsetup=dhcp install=cd:/<wait>", - " lang=en_US autoyast=http://{{ .HTTPIP }}:{{ .HTTPPort }}/opensuse-13.1/autoinst.xml<wait>", + " lang=en_US autoyast=http://{{ .HTTPIP }}:{{ .HTTPPort }}/opensuse-13.2/autoinst.xml<wait>", " textmode=1<wait>", "<enter><wait>" ], @@ -13,10 +13,10 @@ "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "guest_os_type": "OpenSUSE", "http_directory": "http", - "iso_checksum": "1bd6223430910f6d5a168d4e19171462", - "iso_checksum_type": "md5", - "iso_url": "{{user `mirror`}}/13.1/iso/openSUSE-13.1-DVD-i586.iso", - "output_directory": "packer-opensuse-13.1-i386-virtualbox", + "iso_checksum": "2ec28606829d6408efc5a79b70d1da738fdc09de", + "iso_checksum_type": "sha1", + "iso_url": "{{user `mirror`}}/13.2/iso/openSUSE-13.2-DVD-i586.iso", + "output_directory": "packer-opensuse-13.2-i386-virtualbox", "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, @@ -38,13 +38,13 @@ ] ], "virtualbox_version_file": ".vbox_version", - "vm_name": "packer-opensuse-13.1-i386" + "vm_name": "packer-opensuse-13.2-i386" }, { "boot_command": [ "<esc><enter><wait>", "linux netsetup=dhcp install=cd:/<wait>", - " lang=en_US autoyast=http://{{ .HTTPIP }}:{{ .HTTPPort }}/opensuse-13.1/autoinst.xml<wait>", + " lang=en_US autoyast=http://{{ .HTTPIP }}:{{ .HTTPPort }}/opensuse-13.2/autoinst.xml<wait>", " textmode=1<wait>", "<enter><wait>" ], @@ -52,10 +52,10 @@ "disk_size": 20480, "guest_os_type": "opensuse", "http_directory": "http", - "iso_checksum": "1bd6223430910f6d5a168d4e19171462", - "iso_checksum_type": "md5", - "iso_url": "{{user `mirror`}}/13.1/iso/openSUSE-13.1-DVD-i586.iso", - "output_directory": "packer-opensuse-13.1-i386-vmware", + "iso_checksum": "2ec28606829d6408efc5a79b70d1da738fdc09de", + "iso_checksum_type": "sha1", + "iso_url": "{{user `mirror`}}/13.2/iso/openSUSE-13.2-DVD-i586.iso", + "output_directory": "packer-opensuse-13.2-i386-vmware", "shutdown_command": "echo 'vagrant'|sudo -S /sbin/shutdown -h 1", "ssh_password": "vagrant", "ssh_port": 22, @@ -63,7 +63,7 @@ "ssh_wait_timeout": "10000s", "tools_upload_flavor": "linux", "type": "vmware-iso", - "vm_name": "packer-opensuse-13.1-i386", + "vm_name": "packer-opensuse-13.2-i386", "vmx_data": { "cpuid.coresPerSocket": "1", "memsize": "480", @@ -74,7 +74,7 @@ "boot_command": [ "<esc><enter><wait>", "linux netsetup=dhcp install=cd:/<wait>", - " lang=en_US autoyast=http://{{ .HTTPIP }}:{{ .HTTPPort }}/opensuse-13.1/autoinst.xml<wait>", + " lang=en_US autoyast=http://{{ .HTTPIP }}:{{ .HTTPPort }}/opensuse-13.2/autoinst.xml<wait>", " textmode=1<wait>", "<enter><wait>" ], @@ -82,10 +82,10 @@ "disk_size": 20480, "guest_os_type": "opensuse", "http_directory": "http", - "iso_checksum": "1bd6223430910f6d5a168d4e19171462", - "iso_checksum_type": "md5", - "iso_url": "{{user `mirror`}}/13.1/iso/openSUSE-13.1-DVD-i586.iso", - "output_directory": "packer-opensuse-13.1-i386-parallels", + "iso_checksum": "2ec28606829d6408efc5a79b70d1da738fdc09de", + "iso_checksum_type": "sha1", + "iso_url": "{{user `mirror`}}/13.2/iso/openSUSE-13.2-DVD-i586.iso", + "output_directory": "packer-opensuse-13.2-i386-parallels", "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, @@ -108,12 +108,12 @@ ] ], "prlctl_version_file": ".prlctl_version", - "vm_name": "packer-opensuse-13.1-i386" + "vm_name": "packer-opensuse-13.2-i386" } ], "post-processors": [ { - "output": "../builds/{{.Provider}}/opscode_opensuse-13.1-i386_chef-{{user `chef_version`}}.box", + "output": "../builds/{{.Provider}}/opscode_opensuse-13.2-i386_chef-{{user `chef_version`}}.box", "type": "vagrant" } ], @@ -128,7 +128,6 @@ "scripts/common/vagrant.sh", "scripts/common/vmtools.sh", "scripts/common/chef.sh", - "scripts/opensuse/services.sh", "scripts/opensuse/sudoers.sh", "scripts/opensuse/zypper-locks.sh", "scripts/opensuse/remove-dvd-source.sh", diff --git a/packer/opensuse-13.1-x86_64.json b/packer/opensuse-13.2-x86_64.json similarity index 77% rename from packer/opensuse-13.1-x86_64.json rename to packer/opensuse-13.2-x86_64.json index bb2b4faec..09421722c 100644 --- a/packer/opensuse-13.1-x86_64.json +++ b/packer/opensuse-13.2-x86_64.json @@ -4,7 +4,7 @@ "boot_command": [ "<esc><enter><wait>", "linux netsetup=dhcp install=cd:/<wait>", - " lang=en_US autoyast=http://{{ .HTTPIP }}:{{ .HTTPPort }}/opensuse-13.1/autoinst.xml<wait>", + " lang=en_US autoyast=http://{{ .HTTPIP }}:{{ .HTTPPort }}/opensuse-13.2/autoinst.xml<wait>", " textmode=1<wait>", "<enter><wait>" ], @@ -13,10 +13,10 @@ "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "guest_os_type": "OpenSUSE_64", "http_directory": "http", - "iso_checksum": "1096c9c67fc8a67a94a32d04a15e909d", - "iso_checksum_type": "md5", - "iso_url": "{{user `mirror`}}/13.1/iso/openSUSE-13.1-DVD-x86_64.iso", - "output_directory": "packer-opensuse-13.1-x86_64-virtualbox", + "iso_checksum": "a1bd237ccfb07939953a9681607c99c00bc78d5d", + "iso_checksum_type": "sha1", + "iso_url": "{{user `mirror`}}/13.2/iso/openSUSE-13.2-DVD-x86_64.iso", + "output_directory": "packer-opensuse-13.2-x86_64-virtualbox", "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, @@ -38,13 +38,13 @@ ] ], "virtualbox_version_file": ".vbox_version", - "vm_name": "packer-opensuse-13.1-x86_64" + "vm_name": "packer-opensuse-13.2-x86_64" }, { "boot_command": [ "<esc><enter><wait>", "linux netsetup=dhcp install=cd:/<wait>", - " lang=en_US autoyast=http://{{ .HTTPIP }}:{{ .HTTPPort }}/opensuse-13.1/autoinst.xml<wait>", + " lang=en_US autoyast=http://{{ .HTTPIP }}:{{ .HTTPPort }}/opensuse-13.2/autoinst.xml<wait>", " textmode=1<wait>", "<enter><wait>" ], @@ -52,10 +52,10 @@ "disk_size": 20480, "guest_os_type": "opensuse-64", "http_directory": "http", - "iso_checksum": "1096c9c67fc8a67a94a32d04a15e909d", - "iso_checksum_type": "md5", - "iso_url": "{{user `mirror`}}/13.1/iso/openSUSE-13.1-DVD-x86_64.iso", - "output_directory": "packer-opensuse-13.1-x86_64-vmware", + "iso_checksum": "a1bd237ccfb07939953a9681607c99c00bc78d5d", + "iso_checksum_type": "sha1", + "iso_url": "{{user `mirror`}}/13.2/iso/openSUSE-13.2-DVD-x86_64.iso", + "output_directory": "packer-opensuse-13.2-x86_64-vmware", "shutdown_command": "echo 'vagrant'|sudo -S /sbin/shutdown -h 1", "ssh_password": "vagrant", "ssh_port": 22, @@ -63,7 +63,7 @@ "ssh_wait_timeout": "10000s", "tools_upload_flavor": "linux", "type": "vmware-iso", - "vm_name": "packer-opensuse-13.1-x86_64", + "vm_name": "packer-opensuse-13.2-x86_64", "vmx_data": { "cpuid.coresPerSocket": "1", "memsize": "480", @@ -74,7 +74,7 @@ "boot_command": [ "<esc><enter><wait>", "linux netsetup=dhcp install=cd:/<wait>", - " lang=en_US autoyast=http://{{ .HTTPIP }}:{{ .HTTPPort }}/opensuse-13.1/autoinst.xml<wait>", + " lang=en_US autoyast=http://{{ .HTTPIP }}:{{ .HTTPPort }}/opensuse-13.2/autoinst.xml<wait>", " textmode=1<wait>", "<enter><wait>" ], @@ -82,10 +82,10 @@ "disk_size": 20480, "guest_os_type": "opensuse", "http_directory": "http", - "iso_checksum": "1096c9c67fc8a67a94a32d04a15e909d", - "iso_checksum_type": "md5", - "iso_url": "{{user `mirror`}}/13.1/iso/openSUSE-13.1-DVD-x86_64.iso", - "output_directory": "packer-opensuse-13.1-x86_64-parallels", + "iso_checksum": "a1bd237ccfb07939953a9681607c99c00bc78d5d", + "iso_checksum_type": "sha1", + "iso_url": "{{user `mirror`}}/13.2/iso/openSUSE-13.2-DVD-x86_64.iso", + "output_directory": "packer-opensuse-13.2-x86_64-parallels", "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, @@ -108,12 +108,12 @@ ] ], "prlctl_version_file": ".prlctl_version", - "vm_name": "packer-opensuse-13.1-x86_64" + "vm_name": "packer-opensuse-13.2-x86_64" } ], "post-processors": [ { - "output": "../builds/{{.Provider}}/opscode_opensuse-13.1-x86_64_chef-{{user `chef_version`}}.box", + "output": "../builds/{{.Provider}}/opscode_opensuse-13.2-x86_64_chef-{{user `chef_version`}}.box", "type": "vagrant" } ], @@ -128,7 +128,6 @@ "scripts/common/vagrant.sh", "scripts/common/vmtools.sh", "scripts/common/chef.sh", - "scripts/opensuse/services.sh", "scripts/opensuse/sudoers.sh", "scripts/opensuse/zypper-locks.sh", "scripts/opensuse/remove-dvd-source.sh", diff --git a/packer/scripts/opensuse/cleanup.sh b/packer/scripts/opensuse/cleanup.sh index 2e466416d..f83c0b645 100644 --- a/packer/scripts/opensuse/cleanup.sh +++ b/packer/scripts/opensuse/cleanup.sh @@ -1,7 +1,3 @@ #!/bin/bash -eux # These were only needed for building VMware/Virtualbox extensions: -zypper -n rm -u binutils gcc make site-config patterns-openSUSE-yast2_install_wf -# backlist i2c_piix4 - VirtualBox has no smbus -echo "blacklist i2c_piix4" > /etc/modprobe.d/100-blacklist-i2c_piix4.conf -# remove all kernels except current running -rpm -qa | grep kernel-default | grep -v `uname -r | awk -F"-" '{print $1"-"$2}'` | xargs rpm -ehv +zypper -n rm -u binutils gcc make perl ruby kernel-default-devel kernel-devel diff --git a/packer/scripts/opensuse/remove-dvd-source.sh b/packer/scripts/opensuse/remove-dvd-source.sh index adbf70616..f851a3e14 100644 --- a/packer/scripts/opensuse/remove-dvd-source.sh +++ b/packer/scripts/opensuse/remove-dvd-source.sh @@ -1,11 +1,8 @@ #!/bin/sh -eux -zypper removerepo "openSUSE-13.1-1.10" -rpm --import http://download.opensuse.org/distribution/13.1/repo/oss/gpg-pubkey-3dbdc284-4be1884d.asc -rpm --import http://download.opensuse.org/distribution/13.1/repo/oss/gpg-pubkey-307e3d54-4be01a65.asc -zypper ar http://download.opensuse.org/distribution/13.1/repo/oss/ opensuse-13.1-oss -zypper ar http://download.opensuse.org/distribution/13.1/repo/non-oss/ opensuse-13.1-non-oss -zypper ar http://download.opensuse.org/update/13.1/ opensuse-13.1-update -zypper ar http://download.opensuse.org/update/13.1-non-oss/ opensuse-13.1-update-non-oss +zypper removerepo "openSUSE-13.2-0" +zypper ar http://download.opensuse.org/distribution/13.2/repo/oss/ openSUSE-13.2-Oss +zypper ar http://download.opensuse.org/distribution/13.2/repo/non-oss/ openSUSE-13.2-Non-Oss +zypper ar http://download.opensuse.org/update/13.2/ openSUSE-13.2-Update +zypper ar http://download.opensuse.org/update/13.2-non-oss/ openSUSE-13.2-Update-Non-Oss zypper refresh -zypper update -y diff --git a/packer/scripts/opensuse/services.sh b/packer/scripts/opensuse/services.sh deleted file mode 100644 index 51891328b..000000000 --- a/packer/scripts/opensuse/services.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/sh -eux - -systemctl enable sshd -systemctl enable network -systemctl enable rsyslog \ No newline at end of file From ce22ae91cc7511ebcd96b8576f8dd010cbe176ed Mon Sep 17 00:00:00 2001 From: Rickard von Essen <rickard.von.essen@gmail.com> Date: Thu, 27 Nov 2014 13:26:04 +0100 Subject: [PATCH 0287/1622] #299 OpenSUSE 13.2 should specify netdevice=eth0 --- packer/opensuse-13.2-i386.json | 2 +- packer/opensuse-13.2-x86_64.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packer/opensuse-13.2-i386.json b/packer/opensuse-13.2-i386.json index c31586bf4..38739e592 100644 --- a/packer/opensuse-13.2-i386.json +++ b/packer/opensuse-13.2-i386.json @@ -73,7 +73,7 @@ { "boot_command": [ "<esc><enter><wait>", - "linux netsetup=dhcp install=cd:/<wait>", + "linux netsetup=dhcp netdevice=eth0 install=cd:/<wait>", " lang=en_US autoyast=http://{{ .HTTPIP }}:{{ .HTTPPort }}/opensuse-13.2/autoinst.xml<wait>", " textmode=1<wait>", "<enter><wait>" diff --git a/packer/opensuse-13.2-x86_64.json b/packer/opensuse-13.2-x86_64.json index 09421722c..f5f0f4900 100644 --- a/packer/opensuse-13.2-x86_64.json +++ b/packer/opensuse-13.2-x86_64.json @@ -73,7 +73,7 @@ { "boot_command": [ "<esc><enter><wait>", - "linux netsetup=dhcp install=cd:/<wait>", + "linux netsetup=dhcp netdevice=eth0 install=cd:/<wait>", " lang=en_US autoyast=http://{{ .HTTPIP }}:{{ .HTTPPort }}/opensuse-13.2/autoinst.xml<wait>", " textmode=1<wait>", "<enter><wait>" From 1d520d4744149d215e5f1903bfbf41cb8dfc075f Mon Sep 17 00:00:00 2001 From: Yves Vogl <yves.vogl@dock42.com> Date: Mon, 15 Dec 2014 17:34:46 +0100 Subject: [PATCH 0288/1622] Removed some more unnecessary firmware packages --- packer/http/centos-7.0/ks.cfg | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/packer/http/centos-7.0/ks.cfg b/packer/http/centos-7.0/ks.cfg index 23fb4f5f3..55763e889 100644 --- a/packer/http/centos-7.0/ks.cfg +++ b/packer/http/centos-7.0/ks.cfg @@ -44,15 +44,24 @@ bzip2 -ipw2200-firmware -ivtv-firmware -iwl100-firmware +-iwl105-firmware +-iwl135-firmware -iwl1000-firmware +-iwl2000-firmware +-iwl2030-firmware +-iwl3160-firmware -iwl3945-firmware -iwl4965-firmware -iwl5000-firmware -iwl5150-firmware -iwl6000-firmware -iwl6000g2a-firmware +-iwl6000g2b-firmware -iwl6050-firmware +-iwl7260-firmware -libertas-usb8388-firmware +-libertas-sd8686-firmware +-libertas-sd8787-firmware -ql2100-firmware -ql2200-firmware -ql23xx-firmware From 3e586130b2b77c1fcbb438a2ae4e4d857d629946 Mon Sep 17 00:00:00 2001 From: "Julian C. Dunn" <jdunn@getchef.com> Date: Thu, 18 Dec 2014 10:55:57 -0500 Subject: [PATCH 0289/1622] Added Fedora 21 x86_64 --- packer/fedora-21-x86_64.json | 131 +++++++++++++++++++++++++++++++++++ packer/http/fedora-21/ks.cfg | 48 +++++++++++++ 2 files changed, 179 insertions(+) create mode 100644 packer/fedora-21-x86_64.json create mode 100644 packer/http/fedora-21/ks.cfg diff --git a/packer/fedora-21-x86_64.json b/packer/fedora-21-x86_64.json new file mode 100644 index 000000000..cbf1198e1 --- /dev/null +++ b/packer/fedora-21-x86_64.json @@ -0,0 +1,131 @@ +{ + "builders": [ + { + "boot_command": [ + "<tab> linux ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/fedora-21/ks.cfg<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "guest_os_type": "Fedora_64", + "http_directory": "http", + "iso_checksum": "a6a2e83bb409d6b8ee3072ad07faac0a54d79c9ecbe3a40af91b773e2d843d8e", + "iso_checksum_type": "sha256", + "iso_url": "{{user `mirror`}}/releases/21/Server/x86_64/iso/Fedora-Server-DVD-x86_64-21.iso", + "output_directory": "packer-fedora-21-x86_64-virtualbox", + "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "virtualbox-iso", + "vboxmanage": [ + [ + "modifyvm", + "{{.Name}}", + "--memory", + "512" + ], + [ + "modifyvm", + "{{.Name}}", + "--cpus", + "1" + ] + ], + "virtualbox_version_file": ".vbox_version", + "vm_name": "packer-fedora-21-x86_64" + }, + { + "boot_command": [ + "<tab> linux ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/fedora-21/ks.cfg<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "guest_os_type": "fedora-64", + "http_directory": "http", + "iso_checksum": "a6a2e83bb409d6b8ee3072ad07faac0a54d79c9ecbe3a40af91b773e2d843d8e", + "iso_checksum_type": "sha256", + "iso_url": "{{user `mirror`}}/releases/21/Server/x86_64/iso/Fedora-Server-DVD-x86_64-21.iso", + "output_directory": "packer-fedora-21-x86_64-vmware", + "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "tools_upload_flavor": "linux", + "type": "vmware-iso", + "vm_name": "packer-fedora-21-x86_64", + "vmx_data": { + "cpuid.coresPerSocket": "1", + "memsize": "512", + "numvcpus": "1" + } + }, + { + "boot_command": [ + "<tab> linux ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/fedora-21/ks.cfg<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "parallels_tools_flavor": "lin", + "guest_os_type": "fedora-core", + "http_directory": "http", + "iso_checksum": "a6a2e83bb409d6b8ee3072ad07faac0a54d79c9ecbe3a40af91b773e2d843d8e", + "iso_checksum_type": "sha256", + "iso_url": "{{user `mirror`}}/releases/21/Server/x86_64/iso/Fedora-Server-DVD-x86_64-21.iso", + "output_directory": "packer-fedora-21-x86_64-parallels", + "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "parallels-iso", + "prlctl": [ + [ + "set", + "{{.Name}}", + "--memsize", + "512" + ], + [ + "set", + "{{.Name}}", + "--cpus", + "1" + ] + ], + "prlctl_version_file": ".prlctl_version", + "vm_name": "packer-fedora-21-x86_64" + } + ], + "post-processors": [ + { + "output": "../builds/{{.Provider}}/opscode_fedora-21_chef-{{user `chef_version`}}.box", + "type": "vagrant" + } + ], + "provisioners": [ + { + "environment_vars": [ + "CHEF_VERSION={{user `chef_version`}}" + ], + "execute_command": "echo 'vagrant' | {{.Vars}} sudo -E -S bash '{{.Path}}'", + "scripts": [ + "scripts/fedora/fix-slow-dns.sh", + "scripts/common/sshd.sh", + "scripts/common/vmtools.sh", + "scripts/common/chef.sh", + "scripts/common/vagrant.sh", + "scripts/fedora/cleanup.sh", + "scripts/common/minimize.sh" + ], + "type": "shell" + } + ], + "variables": { + "chef_version": "provisionerless", + "mirror": "http://download.fedoraproject.org/pub/fedora/linux" + } +} + diff --git a/packer/http/fedora-21/ks.cfg b/packer/http/fedora-21/ks.cfg new file mode 100644 index 000000000..4e3db2946 --- /dev/null +++ b/packer/http/fedora-21/ks.cfg @@ -0,0 +1,48 @@ +install +cdrom +lang en_US.UTF-8 +keyboard us +network --bootproto=dhcp +rootpw vagrant +firewall --disabled +authconfig --enableshadow --passalgo=sha512 +selinux --permissive +timezone UTC +bootloader --location=mbr +text +skipx +zerombr +clearpart --all --initlabel +part /boot --fstype=ext4 --size=500 +part pv.2 --grow --size=500 +volgroup vg_vagrant --pesize=32768 pv.2 +logvol / --fstype=ext4 --name=lv_root --vgname=vg_vagrant --size=1024 --grow +logvol swap --fstype=swap --name=lv_swap --vgname=vg_vagrant --size=528 --grow --maxsize=1056 +bootloader --location=mbr --append="norhgb biosdevname=0" +auth --useshadow --enablemd5 +firstboot --disabled +reboot +user --name=vagrant --plaintext --password vagrant + +%packages --nobase --ignoremissing --excludedocs +bzip2 +gcc +kernel-devel +kernel-headers +tar +wget +nfs-utils +net-tools +-linux-firmware +-plymouth +-plymouth-core-libs +%end + +%post +# update root certs +wget -O/etc/pki/tls/certs/ca-bundle.crt http://curl.haxx.se/ca/cacert.pem +# sudo +echo 'Defaults:vagrant !requiretty' > /etc/sudoers.d/vagrant +echo '%vagrant ALL=(ALL) NOPASSWD: ALL' >> /etc/sudoers.d/vagrant +chmod 440 /etc/sudoers.d/vagrant +%end From e8eaea86555e1a0a9a2003955b92e408af92cee3 Mon Sep 17 00:00:00 2001 From: "Julian C. Dunn" <jdunn@getchef.com> Date: Fri, 19 Dec 2014 15:26:20 -0500 Subject: [PATCH 0290/1622] Added Fedora 21 i386 template. --- packer/fedora-21-i386.json | 132 +++++++++++++++++++++++++++++++++++++ 1 file changed, 132 insertions(+) create mode 100644 packer/fedora-21-i386.json diff --git a/packer/fedora-21-i386.json b/packer/fedora-21-i386.json new file mode 100644 index 000000000..ac2657346 --- /dev/null +++ b/packer/fedora-21-i386.json @@ -0,0 +1,132 @@ +{ + "builders": [ + { + "boot_command": [ + "<tab> linux ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/fedora-21/ks.cfg<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "guest_os_type": "Fedora", + "http_directory": "http", + "iso_checksum": "85e50a8a938996522bf1605b3578a2d6680362c1aa963d0560d59c2e4fc795ef", + "iso_checksum_type": "sha256", + "iso_url": "{{user `mirror`}}/releases/21/Server/i386/iso/Fedora-Server-DVD-i386-21.iso", + "output_directory": "packer-fedora-21-i386-virtualbox", + "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "virtualbox-iso", + "vboxmanage": [ + [ + "modifyvm", + "{{.Name}}", + "--memory", + "512" + ], + [ + "modifyvm", + "{{.Name}}", + "--cpus", + "1" + ] + ], + "virtualbox_version_file": ".vbox_version", + "vm_name": "packer-fedora-21-i386" + }, + { + "boot_command": [ + "<tab> linux ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/fedora-21/ks.cfg<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "guest_os_type": "fedora", + "http_directory": "http", + "iso_checksum": "85e50a8a938996522bf1605b3578a2d6680362c1aa963d0560d59c2e4fc795ef", + "iso_checksum_type": "sha256", + "iso_url": "{{user `mirror`}}/releases/21/Server/i386/iso/Fedora-Server-DVD-i386-21.iso", + "output_directory": "packer-fedora-21-i386-vmware", + "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "tools_upload_flavor": "linux", + "type": "vmware-iso", + "vm_name": "packer-fedora-21-i386", + "vmx_data": { + "cpuid.coresPerSocket": "1", + "memsize": "512", + "numvcpus": "1" + } + }, + { + "boot_command": [ + "<tab> linux ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/fedora-21/ks.cfg<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "parallels_tools_flavor": "lin", + "guest_os_type": "fedora-core", + "http_directory": "http", + "iso_checksum": "85e50a8a938996522bf1605b3578a2d6680362c1aa963d0560d59c2e4fc795ef", + "iso_checksum_type": "sha256", + "iso_url": "{{user `mirror`}}/releases/21/Server/i386/iso/Fedora-Server-DVD-i386-21.iso", + "output_directory": "packer-fedora-21-i386-parallels", + "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "parallels-iso", + "prlctl": [ + [ + "set", + "{{.Name}}", + "--memsize", + "512" + ], + [ + "set", + "{{.Name}}", + "--cpus", + "1" + ] + ], + "prlctl_version_file": ".prlctl_version", + "vm_name": "packer-fedora-21-i386" + } + + ], + "post-processors": [ + { + "output": "../builds/{{.Provider}}/opscode_fedora-21-i386_chef-{{user `chef_version`}}.box", + "type": "vagrant" + } + ], + "provisioners": [ + { + "environment_vars": [ + "CHEF_VERSION={{user `chef_version`}}" + ], + "execute_command": "echo 'vagrant' | {{.Vars}} sudo -E -S bash '{{.Path}}'", + "scripts": [ + "scripts/fedora/fix-slow-dns.sh", + "scripts/common/sshd.sh", + "scripts/common/vmtools.sh", + "scripts/common/chef.sh", + "scripts/common/vagrant.sh", + "scripts/fedora/cleanup.sh", + "scripts/common/minimize.sh" + ], + "type": "shell" + } + ], + "variables": { + "chef_version": "provisionerless", + "mirror": "http://download.fedoraproject.org/pub/fedora/linux" + } +} + From 1da76931d0aacbf20bf21033ee10f7e4a7e7d882 Mon Sep 17 00:00:00 2001 From: Mikhail Zholobov <mzholobov@parallels.com> Date: Wed, 24 Dec 2014 19:40:53 +0300 Subject: [PATCH 0291/1622] centos-6.6: Force to set SELinux to a permissive mode --- packer/http/centos-6.6/ks.cfg | 2 ++ 1 file changed, 2 insertions(+) diff --git a/packer/http/centos-6.6/ks.cfg b/packer/http/centos-6.6/ks.cfg index 7594ba586..13be8109b 100644 --- a/packer/http/centos-6.6/ks.cfg +++ b/packer/http/centos-6.6/ks.cfg @@ -62,6 +62,8 @@ nfs-utils -zd1211-firmware %post +# Force to set SELinux to a permissive mode +sed -i -e 's/\(^SELINUX=\).*$/\1permissive/' /etc/selinux/config # update root certs wget -O/etc/pki/tls/certs/ca-bundle.crt http://curl.haxx.se/ca/cacert.pem # sudo From 7acd7cef1e716a984774cb57174c4f98d582ff32 Mon Sep 17 00:00:00 2001 From: Christian Berendt <berendt@b1-systems.de> Date: Wed, 14 Jan 2015 21:45:09 +0100 Subject: [PATCH 0292/1622] Make script zypper-locks.sh workable Fixes issue #309. --- packer/scripts/sles/zypper-locks.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packer/scripts/sles/zypper-locks.sh b/packer/scripts/sles/zypper-locks.sh index 5ac5e7d15..a86fa5f4a 100644 --- a/packer/scripts/sles/zypper-locks.sh +++ b/packer/scripts/sles/zypper-locks.sh @@ -1,4 +1,4 @@ #!/bin/sh -eux # remove zypper locks on removed packages to avoid later dependency problems -zypper --non-interactive rl \* +zypper --non-interactive ll | grep package | awk -F\| '{ print $2 }' | xargs -n 20 zypper --non-interactive rl From 7ad257d3247fa81c6d5abaabaca3ee4fb67f4a07 Mon Sep 17 00:00:00 2001 From: "Julian C. Dunn" <jdunn@getchef.com> Date: Thu, 15 Jan 2015 00:43:06 -0500 Subject: [PATCH 0293/1622] Fedora 19 is EOL as of January 6, 2015. https://lists.fedoraproject.org/pipermail/announce/2015-January/003248.html --- OLD-BOXES.md | 4 ++++ README.md | 4 ---- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/OLD-BOXES.md b/OLD-BOXES.md index 0c19ab029..d1a28ffc6 100644 --- a/OLD-BOXES.md +++ b/OLD-BOXES.md @@ -20,6 +20,8 @@ Boxes for obsolete operating systems will be placed here. * [opscode-debian-7.6](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_debian-7.6_chef-provisionerless.box) * [opscode-fedora-18-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_fedora-18-i386_chef-provisionerless.box) * [opscode-fedora-18](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_fedora-18_chef-provisionerless.box) +* [opscode-fedora-19-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_fedora-19-i386_chef-provisionerless.box) +* [opscode-fedora-19](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_fedora-19_chef-provisionerless.box) * [opscode-freebsd-9.2-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_freebsd-9.2-i386_chef-provisionerless.box) * [opscode-freebsd-9.2](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_freebsd-9.2_chef-provisionerless.box) * [opscode-ubuntu-12.10-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_ubuntu-12.10-i386_chef-provisionerless.box) @@ -43,6 +45,8 @@ Boxes for obsolete operating systems will be placed here. * [opscode-debian-7.6](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_debian-7.6_chef-provisionerless.box) * [opscode-fedora-18-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_fedora-18-i386_chef-provisionerless.box) * [opscode-fedora-18](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_fedora-18_chef-provisionerless.box) +* [opscode-fedora-19-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_fedora-19-i386_chef-provisionerless.box) +* [opscode-fedora-19](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_fedora-19_chef-provisionerless.box) * [opscode-freebsd-9.2-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_freebsd-9.2-i386_chef-provisionerless.box) * [opscode-freebsd-9.2](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_freebsd-9.2_chef-provisionerless.box) diff --git a/README.md b/README.md index 41765931e..2843bb0e1 100644 --- a/README.md +++ b/README.md @@ -31,8 +31,6 @@ These baseboxes were all built using a Mac OS X host running VirtualBox 4.3.16, * [opscode-debian-6.0.10](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_debian-6.0.10_chef-provisionerless.box) * [opscode-debian-7.7-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_debian-7.7-i386_chef-provisionerless.box) * [opscode-debian-7.7](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_debian-7.7_chef-provisionerless.box) -* [opscode-fedora-19-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_fedora-19-i386_chef-provisionerless.box) -* [opscode-fedora-19](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_fedora-19_chef-provisionerless.box) * [opscode-fedora-20-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_fedora-20-i386_chef-provisionerless.box) * [opscode-fedora-20](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_fedora-20_chef-provisionerless.box) * [opscode-freebsd-9.3-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_freebsd-9.3-i386_chef-provisionerless.box) @@ -68,8 +66,6 @@ these boxes. Using `--provider vmware_fusion`, will not. * [opscode-debian-6.0.10](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_debian-6.0.10_chef-provisionerless.box) * [opscode-debian-7.7-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_debian-7.7-i386_chef-provisionerless.box) * [opscode-debian-7.7](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_debian-7.7_chef-provisionerless.box) -* [opscode-fedora-19-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_fedora-19-i386_chef-provisionerless.box) -* [opscode-fedora-19](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_fedora-19_chef-provisionerless.box) * [opscode-fedora-20-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_fedora-20-i386_chef-provisionerless.box) * [opscode-fedora-20](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_fedora-20_chef-provisionerless.box) * [opscode-freebsd-9.3-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_freebsd-9.3-i386_chef-provisionerless.box) From ed3ff891bba778a4ec4e881c6287b7f51f4422ed Mon Sep 17 00:00:00 2001 From: "Julian C. Dunn" <jdunn@getchef.com> Date: Thu, 15 Jan 2015 11:09:59 -0500 Subject: [PATCH 0294/1622] Remove EOL Fedora 19 content --- packer/fedora-19-i386.json | 132 ----------------------------------- packer/fedora-19-x86_64.json | 132 ----------------------------------- packer/http/fedora-19/ks.cfg | 48 ------------- 3 files changed, 312 deletions(-) delete mode 100644 packer/fedora-19-i386.json delete mode 100644 packer/fedora-19-x86_64.json delete mode 100644 packer/http/fedora-19/ks.cfg diff --git a/packer/fedora-19-i386.json b/packer/fedora-19-i386.json deleted file mode 100644 index f5e85ac96..000000000 --- a/packer/fedora-19-i386.json +++ /dev/null @@ -1,132 +0,0 @@ -{ - "builders": [ - { - "boot_command": [ - "<tab> linux ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/fedora-19/ks.cfg<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": 40960, - "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", - "guest_os_type": "Fedora", - "http_directory": "http", - "iso_checksum": "0da29695c4f503e2b27350406c1ceb7a4e5b9b699ea722774368fd16ab277bce", - "iso_checksum_type": "sha256", - "iso_url": "{{user `mirror`}}/releases/19/Fedora/i386/iso/Fedora-19-i386-DVD.iso", - "output_directory": "packer-fedora-19-i386-virtualbox", - "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "virtualbox-iso", - "vboxmanage": [ - [ - "modifyvm", - "{{.Name}}", - "--memory", - "512" - ], - [ - "modifyvm", - "{{.Name}}", - "--cpus", - "1" - ] - ], - "virtualbox_version_file": ".vbox_version", - "vm_name": "packer-fedora-19-i386" - }, - { - "boot_command": [ - "<tab> linux ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/fedora-19/ks.cfg<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": 40960, - "guest_os_type": "fedora", - "http_directory": "http", - "iso_checksum": "0da29695c4f503e2b27350406c1ceb7a4e5b9b699ea722774368fd16ab277bce", - "iso_checksum_type": "sha256", - "iso_url": "{{user `mirror`}}/releases/19/Fedora/i386/iso/Fedora-19-i386-DVD.iso", - "output_directory": "packer-fedora-19-i386-vmware", - "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "tools_upload_flavor": "linux", - "type": "vmware-iso", - "vm_name": "packer-fedora-19-i386", - "vmx_data": { - "cpuid.coresPerSocket": "1", - "memsize": "512", - "numvcpus": "1" - } - }, - { - "boot_command": [ - "<tab> linux ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/fedora-19/ks.cfg<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": 40960, - "parallels_tools_flavor": "lin", - "guest_os_type": "fedora-core", - "http_directory": "http", - "iso_checksum": "0da29695c4f503e2b27350406c1ceb7a4e5b9b699ea722774368fd16ab277bce", - "iso_checksum_type": "sha256", - "iso_url": "{{user `mirror`}}/releases/19/Fedora/i386/iso/Fedora-19-i386-DVD.iso", - "output_directory": "packer-fedora-19-i386-parallels", - "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "parallels-iso", - "prlctl": [ - [ - "set", - "{{.Name}}", - "--memsize", - "512" - ], - [ - "set", - "{{.Name}}", - "--cpus", - "1" - ] - ], - "prlctl_version_file": ".prlctl_version", - "vm_name": "packer-fedora-19-i386" - } - - ], - "post-processors": [ - { - "output": "../builds/{{.Provider}}/opscode_fedora-19-i386_chef-{{user `chef_version`}}.box", - "type": "vagrant" - } - ], - "provisioners": [ - { - "environment_vars": [ - "CHEF_VERSION={{user `chef_version`}}" - ], - "execute_command": "echo 'vagrant' | {{.Vars}} sudo -E -S bash '{{.Path}}'", - "scripts": [ - "scripts/fedora/fix-slow-dns.sh", - "scripts/common/sshd.sh", - "scripts/common/vmtools.sh", - "scripts/common/chef.sh", - "scripts/common/vagrant.sh", - "scripts/fedora/cleanup.sh", - "scripts/common/minimize.sh" - ], - "type": "shell" - } - ], - "variables": { - "chef_version": "provisionerless", - "mirror": "http://mirrors.kernel.org/fedora" - } -} - diff --git a/packer/fedora-19-x86_64.json b/packer/fedora-19-x86_64.json deleted file mode 100644 index fe2ce4272..000000000 --- a/packer/fedora-19-x86_64.json +++ /dev/null @@ -1,132 +0,0 @@ -{ - "builders": [ - { - "boot_command": [ - "<tab> linux ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/fedora-19/ks.cfg<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": 40960, - "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", - "guest_os_type": "Fedora_64", - "http_directory": "http", - "iso_checksum": "6e7e263e607cfcadc90ea2ef5668aa3945d9eca596485a7a1f8a9f2478cc7084", - "iso_checksum_type": "sha256", - "iso_url": "{{user `mirror`}}/releases/19/Fedora/x86_64/iso/Fedora-19-x86_64-DVD.iso", - "output_directory": "packer-fedora-19-x86_64-virtualbox", - "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "virtualbox-iso", - "vboxmanage": [ - [ - "modifyvm", - "{{.Name}}", - "--memory", - "512" - ], - [ - "modifyvm", - "{{.Name}}", - "--cpus", - "1" - ] - ], - "virtualbox_version_file": ".vbox_version", - "vm_name": "packer-fedora-19-x86_64" - }, - { - "boot_command": [ - "<tab> linux ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/fedora-19/ks.cfg<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": 40960, - "guest_os_type": "fedora-64", - "http_directory": "http", - "iso_checksum": "6e7e263e607cfcadc90ea2ef5668aa3945d9eca596485a7a1f8a9f2478cc7084", - "iso_checksum_type": "sha256", - "iso_url": "{{user `mirror`}}/releases/19/Fedora/x86_64/iso/Fedora-19-x86_64-DVD.iso", - "output_directory": "packer-fedora-19-x86_64-vmware", - "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "tools_upload_flavor": "linux", - "type": "vmware-iso", - "vm_name": "packer-fedora-19-x86_64", - "vmx_data": { - "cpuid.coresPerSocket": "1", - "memsize": "512", - "numvcpus": "1" - } - }, - { - "boot_command": [ - "<tab> linux ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/fedora-19/ks.cfg<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": 40960, - "parallels_tools_flavor": "lin", - "guest_os_type": "fedora-core", - "http_directory": "http", - "iso_checksum": "6e7e263e607cfcadc90ea2ef5668aa3945d9eca596485a7a1f8a9f2478cc7084", - "iso_checksum_type": "sha256", - "iso_url": "{{user `mirror`}}/releases/19/Fedora/x86_64/iso/Fedora-19-x86_64-DVD.iso", - "output_directory": "packer-fedora-19-x86_64-parallels", - "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "parallels-iso", - "prlctl": [ - [ - "set", - "{{.Name}}", - "--memsize", - "512" - ], - [ - "set", - "{{.Name}}", - "--cpus", - "1" - ] - ], - "prlctl_version_file": ".prlctl_version", - "vm_name": "packer-fedora-19-x86_64" - } - - ], - "post-processors": [ - { - "output": "../builds/{{.Provider}}/opscode_fedora-19_chef-{{user `chef_version`}}.box", - "type": "vagrant" - } - ], - "provisioners": [ - { - "environment_vars": [ - "CHEF_VERSION={{user `chef_version`}}" - ], - "execute_command": "echo 'vagrant' | {{.Vars}} sudo -E -S bash '{{.Path}}'", - "scripts": [ - "scripts/fedora/fix-slow-dns.sh", - "scripts/common/sshd.sh", - "scripts/common/vmtools.sh", - "scripts/common/chef.sh", - "scripts/common/vagrant.sh", - "scripts/fedora/cleanup.sh", - "scripts/common/minimize.sh" - ], - "type": "shell" - } - ], - "variables": { - "chef_version": "provisionerless", - "mirror": "http://mirrors.kernel.org/fedora" - } -} - diff --git a/packer/http/fedora-19/ks.cfg b/packer/http/fedora-19/ks.cfg deleted file mode 100644 index 4e3db2946..000000000 --- a/packer/http/fedora-19/ks.cfg +++ /dev/null @@ -1,48 +0,0 @@ -install -cdrom -lang en_US.UTF-8 -keyboard us -network --bootproto=dhcp -rootpw vagrant -firewall --disabled -authconfig --enableshadow --passalgo=sha512 -selinux --permissive -timezone UTC -bootloader --location=mbr -text -skipx -zerombr -clearpart --all --initlabel -part /boot --fstype=ext4 --size=500 -part pv.2 --grow --size=500 -volgroup vg_vagrant --pesize=32768 pv.2 -logvol / --fstype=ext4 --name=lv_root --vgname=vg_vagrant --size=1024 --grow -logvol swap --fstype=swap --name=lv_swap --vgname=vg_vagrant --size=528 --grow --maxsize=1056 -bootloader --location=mbr --append="norhgb biosdevname=0" -auth --useshadow --enablemd5 -firstboot --disabled -reboot -user --name=vagrant --plaintext --password vagrant - -%packages --nobase --ignoremissing --excludedocs -bzip2 -gcc -kernel-devel -kernel-headers -tar -wget -nfs-utils -net-tools --linux-firmware --plymouth --plymouth-core-libs -%end - -%post -# update root certs -wget -O/etc/pki/tls/certs/ca-bundle.crt http://curl.haxx.se/ca/cacert.pem -# sudo -echo 'Defaults:vagrant !requiretty' > /etc/sudoers.d/vagrant -echo '%vagrant ALL=(ALL) NOPASSWD: ALL' >> /etc/sudoers.d/vagrant -chmod 440 /etc/sudoers.d/vagrant -%end From 58987d6693be1e02e73ccbe4a0ad77e296abe9d3 Mon Sep 17 00:00:00 2001 From: Daniel Farrell <dfarrell@redhat.com> Date: Fri, 16 Jan 2015 17:15:06 -0500 Subject: [PATCH 0295/1622] Added Fedora 21 VB base boxes to README - Relevant to issue #312 - May want to hold merge until more testing has been done - Didn't add VMware box links, as they aren't up (see issue) Signed-off-by: Daniel Farrell <dfarrell@redhat.com> --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 2843bb0e1..ce934be24 100644 --- a/README.md +++ b/README.md @@ -33,6 +33,8 @@ These baseboxes were all built using a Mac OS X host running VirtualBox 4.3.16, * [opscode-debian-7.7](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_debian-7.7_chef-provisionerless.box) * [opscode-fedora-20-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_fedora-20-i386_chef-provisionerless.box) * [opscode-fedora-20](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_fedora-20_chef-provisionerless.box) +* [opscode-fedora-21-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_fedora-21-i386_chef-provisionerless.box) +* [opscode-fedora-21](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_fedora-21_chef-provisionerless.box) * [opscode-freebsd-9.3-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_freebsd-9.3-i386_chef-provisionerless.box) * [opscode-freebsd-9.3](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_freebsd-9.3_chef-provisionerless.box) * [opscode-freebsd-10.1](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_freebsd-10.1_chef-provisionerless.box) From 8de5d1aeee4092ab3c33cc71a2b827d64f20f635 Mon Sep 17 00:00:00 2001 From: drag00n <cmlucian@us.ibm.com> Date: Fri, 23 Jan 2015 15:19:25 -0500 Subject: [PATCH 0296/1622] Update travis.yml for opscode to chef org rename --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 2843bb0e1..7c5d4aaf0 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,8 @@ # Bento -[![Build Status](http://img.shields.io/travis/opscode/bento.svg)][travis] +[![Build Status](http://img.shields.io/travis/chef/bento.svg)][travis] -[travis]: https://travis-ci.org/opscode/bento +[travis]: https://travis-ci.org/chef/bento Bento is a project that encapsulates [Packer](http://packer.io) templates for building [Vagrant](http://vagrantup.com) baseboxes. We use these boxes internally at Chef Software, Inc. for From d6a950b682d9784743bb65ee8a7299e4e4d4c2bd Mon Sep 17 00:00:00 2001 From: "Julian C. Dunn" <jdunn@getchef.com> Date: Fri, 23 Jan 2015 17:11:54 -0500 Subject: [PATCH 0297/1622] Change company domain name to chef.io --- README.md | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 7c5d4aaf0..28db3eb98 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ Bento is a project that encapsulates [Packer](http://packer.io) templates for building [Vagrant](http://vagrantup.com) baseboxes. We use these boxes internally at Chef Software, Inc. for -testing Hosted Enterprise Chef, Private Enterprise Chef and our open source [cookbooks](https://supermarket.getchef.com/users/chef) +testing Hosted Chef, Chef Server and our open source [cookbooks](https://supermarket.chef.io/users/chef) via [test-kitchen](http://kitchen.ci/). This project is managed by the CHEF Release Engineering team. For more information on the Release Engineering team's contribution, triage, and release process, please consult the [CHEF Release Engineering OSS Management Guide](https://docs.google.com/a/opscode.com/document/d/1oJB0vZb_3bl7_ZU2YMDBkMFdL-EWplW1BJv_FXTUOzg/edit). @@ -171,18 +171,18 @@ make "Don't Repeat Yourself" (DRY) modular baseboxes. Thanks Tim! Mac OS X templates were adopted wholesale from [Fletcher Nichol's packer templates](https://github.com/fnichol/packer-templates). -- Author: Seth Chisamore (<schisamo@getchef.com>) -- Author: Stephen Delano (<stephen@getchef.com>) -- Author: Joshua Timberman (<joshua@getchef.com>) +- Author: Seth Chisamore (<schisamo@chef.io>) +- Author: Stephen Delano (<stephen@chef.io>) +- Author: Joshua Timberman (<joshua@chef.io>) - Author: Tim Dysinger (<tim@dysinger.net>) - Author: Chris McClimans (<chris@hippiehacker.org>) -- Author: Julian Dunn (<jdunn@getchef.com>) -- Author: Tom Duffield (<tom@getchef.com>) +- Author: Julian Dunn (<jdunn@chef.io>) +- Author: Tom Duffield (<tom@chef.io>) - Author: Ross Timson (<ross@rosstimson.com>) - Author: Fletcher Nichol (<fnichol@nichol.ca>) ```text -Copyright 2012-2014, Chef Software, Inc. (<legal@getchef.com>) +Copyright 2012-2014, Chef Software, Inc. (<legal@chef.io>) Copyright 2011-2012, Tim Dysinger (<tim@dysinger.net>) Licensed under the Apache License, Version 2.0 (the "License"); From 18aafbda29202b81fd651bc13577cb6be09ed9c8 Mon Sep 17 00:00:00 2001 From: "Julian C. Dunn" <jdunn@getchef.com> Date: Fri, 23 Jan 2015 17:07:24 -0500 Subject: [PATCH 0298/1622] Update to Ubuntu 14.04.1. Fixes #290 --- packer/ubuntu-14.04-amd64.json | 18 +++++++++--------- packer/ubuntu-14.04-i386.json | 18 +++++++++--------- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/packer/ubuntu-14.04-amd64.json b/packer/ubuntu-14.04-amd64.json index 0522db478..050facdec 100644 --- a/packer/ubuntu-14.04-amd64.json +++ b/packer/ubuntu-14.04-amd64.json @@ -30,9 +30,9 @@ "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "guest_os_type": "Ubuntu_64", "http_directory": "http", - "iso_checksum": "4d94f6111b8fe47da94396180ce499d8c0bb44f3", - "iso_checksum_type": "sha1", - "iso_url": "{{user `mirror`}}/14.04/ubuntu-14.04-server-amd64.iso", + "iso_checksum": "946a6077af6f5f95a51f82fdc44051c7aa19f9cfc5f737954845a6050543d7c2", + "iso_checksum_type": "sha256", + "iso_url": "{{user `mirror`}}/14.04.1/ubuntu-14.04.1-server-amd64.iso", "output_directory": "packer-ubuntu-14.04-amd64-virtualbox", "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", "ssh_password": "vagrant", @@ -86,9 +86,9 @@ "disk_size": 40960, "guest_os_type": "ubuntu-64", "http_directory": "http", - "iso_checksum": "4d94f6111b8fe47da94396180ce499d8c0bb44f3", - "iso_checksum_type": "sha1", - "iso_url": "{{user `mirror`}}/14.04/ubuntu-14.04-server-amd64.iso", + "iso_checksum": "946a6077af6f5f95a51f82fdc44051c7aa19f9cfc5f737954845a6050543d7c2", + "iso_checksum_type": "sha256", + "iso_url": "{{user `mirror`}}/14.04.1/ubuntu-14.04.1-server-amd64.iso", "output_directory": "packer-ubuntu-14.04-amd64-vmware", "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", "ssh_password": "vagrant", @@ -134,9 +134,9 @@ "parallels_tools_flavor": "lin", "guest_os_type": "ubuntu", "http_directory": "http", - "iso_checksum": "4d94f6111b8fe47da94396180ce499d8c0bb44f3", - "iso_checksum_type": "sha1", - "iso_url": "{{user `mirror`}}/14.04/ubuntu-14.04-server-amd64.iso", + "iso_checksum": "946a6077af6f5f95a51f82fdc44051c7aa19f9cfc5f737954845a6050543d7c2", + "iso_checksum_type": "sha256", + "iso_url": "{{user `mirror`}}/14.04.1/ubuntu-14.04.1-server-amd64.iso", "output_directory": "packer-ubuntu-14.04-amd64-parallels", "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", "ssh_password": "vagrant", diff --git a/packer/ubuntu-14.04-i386.json b/packer/ubuntu-14.04-i386.json index da187176f..88018157a 100644 --- a/packer/ubuntu-14.04-i386.json +++ b/packer/ubuntu-14.04-i386.json @@ -30,9 +30,9 @@ "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "guest_os_type": "Ubuntu", "http_directory": "http", - "iso_checksum": "33eb2ad62940aabe99f776f3c35ce90eaad6e2d2", - "iso_checksum_type": "sha1", - "iso_url": "{{user `mirror`}}/14.04/ubuntu-14.04-server-i386.iso", + "iso_checksum": "976044842804eafc18390505508958b559c131211160ecae5e60694bdf171f78", + "iso_checksum_type": "sha256", + "iso_url": "{{user `mirror`}}/14.04.1/ubuntu-14.04.1-server-i386.iso", "output_directory": "packer-ubuntu-14.04-i386-virtualbox", "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", "ssh_password": "vagrant", @@ -86,9 +86,9 @@ "disk_size": 40960, "guest_os_type": "ubuntu", "http_directory": "http", - "iso_checksum": "33eb2ad62940aabe99f776f3c35ce90eaad6e2d2", - "iso_checksum_type": "sha1", - "iso_url": "{{user `mirror`}}/14.04/ubuntu-14.04-server-i386.iso", + "iso_checksum": "976044842804eafc18390505508958b559c131211160ecae5e60694bdf171f78", + "iso_checksum_type": "sha256", + "iso_url": "{{user `mirror`}}/14.04.1/ubuntu-14.04.1-server-i386.iso", "output_directory": "packer-ubuntu-14.04-i386-vmware", "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", "ssh_password": "vagrant", @@ -134,9 +134,9 @@ "parallels_tools_flavor": "lin", "guest_os_type": "ubuntu", "http_directory": "http", - "iso_checksum": "33eb2ad62940aabe99f776f3c35ce90eaad6e2d2", - "iso_checksum_type": "sha1", - "iso_url": "{{user `mirror`}}/14.04/ubuntu-14.04-server-i386.iso", + "iso_checksum": "976044842804eafc18390505508958b559c131211160ecae5e60694bdf171f78", + "iso_checksum_type": "sha256", + "iso_url": "{{user `mirror`}}/14.04.1/ubuntu-14.04.1-server-i386.iso", "output_directory": "packer-ubuntu-14.04-i386-parallels", "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", "ssh_password": "vagrant", From fe15b46ddad3f5b781806aa07b02e6cd63459687 Mon Sep 17 00:00:00 2001 From: "Julian C. Dunn" <jdunn@getchef.com> Date: Mon, 26 Jan 2015 23:43:44 -0500 Subject: [PATCH 0299/1622] Added links to Fedora 21 boxes --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index b0862b6a5..b11063aa5 100644 --- a/README.md +++ b/README.md @@ -70,6 +70,8 @@ these boxes. Using `--provider vmware_fusion`, will not. * [opscode-debian-7.7](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_debian-7.7_chef-provisionerless.box) * [opscode-fedora-20-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_fedora-20-i386_chef-provisionerless.box) * [opscode-fedora-20](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_fedora-20_chef-provisionerless.box) +* [opscode-fedora-21-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_fedora-21-i386_chef-provisionerless.box) +* [opscode-fedora-21](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_fedora-21_chef-provisionerless.box) * [opscode-freebsd-9.3-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_freebsd-9.3-i386_chef-provisionerless.box) * [opscode-freebsd-9.3](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_freebsd-9.3_chef-provisionerless.box) * [opscode-freebsd-10.1](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_freebsd-10.1_chef-provisionerless.box) From cf05c0d5baf2d88cbb5cdc1f7fd073d0087fcad2 Mon Sep 17 00:00:00 2001 From: Vincent AUBERT <vincentaubert88@gmail.com> Date: Mon, 26 Jan 2015 23:57:15 -0500 Subject: [PATCH 0300/1622] update to debian 7.8 --- OLD-BOXES.md | 4 +++ README.md | 8 +++--- ...n-7.7-amd64.json => debian-7.8-amd64.json} | 26 ++++++++--------- ...ian-7.7-i386.json => debian-7.8-i386.json} | 28 +++++++++---------- 4 files changed, 35 insertions(+), 31 deletions(-) rename packer/{debian-7.7-amd64.json => debian-7.8-amd64.json} (84%) rename packer/{debian-7.7-i386.json => debian-7.8-i386.json} (85%) diff --git a/OLD-BOXES.md b/OLD-BOXES.md index d1a28ffc6..571e73c27 100644 --- a/OLD-BOXES.md +++ b/OLD-BOXES.md @@ -18,6 +18,8 @@ Boxes for obsolete operating systems will be placed here. * [opscode-debian-7.2.0](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_debian-7.2.0_chef-provisionerless.box) * [opscode-debian-7.6-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_debian-7.6-i386_chef-provisionerless.box) * [opscode-debian-7.6](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_debian-7.6_chef-provisionerless.box) +* [opscode-debian-7.7-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_debian-7.7-i386_chef-provisionerless.box) +* [opscode-debian-7.7](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_debian-7.7_chef-provisionerless.box) * [opscode-fedora-18-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_fedora-18-i386_chef-provisionerless.box) * [opscode-fedora-18](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_fedora-18_chef-provisionerless.box) * [opscode-fedora-19-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_fedora-19-i386_chef-provisionerless.box) @@ -43,6 +45,8 @@ Boxes for obsolete operating systems will be placed here. * [opscode-debian-7.2.0](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_debian-7.2.0_chef-provisionerless.box) * [opscode-debian-7.6-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_debian-7.6-i386_chef-provisionerless.box) * [opscode-debian-7.6](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_debian-7.6_chef-provisionerless.box) +* [opscode-debian-7.7-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_debian-7.7-i386_chef-provisionerless.box) +* [opscode-debian-7.7](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_debian-7.7_chef-provisionerless.box) * [opscode-fedora-18-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_fedora-18-i386_chef-provisionerless.box) * [opscode-fedora-18](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_fedora-18_chef-provisionerless.box) * [opscode-fedora-19-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_fedora-19-i386_chef-provisionerless.box) diff --git a/README.md b/README.md index b11063aa5..df2967ce0 100644 --- a/README.md +++ b/README.md @@ -29,8 +29,8 @@ These baseboxes were all built using a Mac OS X host running VirtualBox 4.3.16, * [opscode-centos-7.0](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_centos-7.0_chef-provisionerless.box) * [opscode-debian-6.0.10-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_debian-6.0.10-i386_chef-provisionerless.box) * [opscode-debian-6.0.10](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_debian-6.0.10_chef-provisionerless.box) -* [opscode-debian-7.7-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_debian-7.7-i386_chef-provisionerless.box) -* [opscode-debian-7.7](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_debian-7.7_chef-provisionerless.box) +* [opscode-debian-7.8-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_debian-7.8-i386_chef-provisionerless.box) +* [opscode-debian-7.8](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_debian-7.8_chef-provisionerless.box) * [opscode-fedora-20-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_fedora-20-i386_chef-provisionerless.box) * [opscode-fedora-20](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_fedora-20_chef-provisionerless.box) * [opscode-fedora-21-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_fedora-21-i386_chef-provisionerless.box) @@ -66,8 +66,8 @@ these boxes. Using `--provider vmware_fusion`, will not. * [opscode-centos-7.0](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_centos-7.0_chef-provisionerless.box) * [opscode-debian-6.0.10-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_debian-6.0.10-i386_chef-provisionerless.box) * [opscode-debian-6.0.10](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_debian-6.0.10_chef-provisionerless.box) -* [opscode-debian-7.7-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_debian-7.7-i386_chef-provisionerless.box) -* [opscode-debian-7.7](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_debian-7.7_chef-provisionerless.box) +* [opscode-debian-7.8-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_debian-7.8-i386_chef-provisionerless.box) +* [opscode-debian-7.8](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_debian-7.8_chef-provisionerless.box) * [opscode-fedora-20-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_fedora-20-i386_chef-provisionerless.box) * [opscode-fedora-20](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_fedora-20_chef-provisionerless.box) * [opscode-fedora-21-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_fedora-21-i386_chef-provisionerless.box) diff --git a/packer/debian-7.7-amd64.json b/packer/debian-7.8-amd64.json similarity index 84% rename from packer/debian-7.7-amd64.json rename to packer/debian-7.8-amd64.json index 9674b5dc7..43d1adc0a 100644 --- a/packer/debian-7.7-amd64.json +++ b/packer/debian-7.8-amd64.json @@ -27,9 +27,9 @@ "disk_size": 40960, "guest_os_type": "Debian_64", "http_directory": "http", - "iso_checksum": "df60b786ddd22710574ecb51d0a6e7f579cdd14a", + "iso_checksum": "5f611b40b0803f8be1180da561cfbc159e381599", "iso_checksum_type": "sha1", - "iso_url": "{{user `mirror`}}/7.7.0/amd64/iso-cd/debian-7.7.0-amd64-CD-1.iso", + "iso_url": "{{user `mirror`}}/7.8.0/amd64/iso-cd/debian-7.8.0-amd64-CD-1.iso", "ssh_username": "vagrant", "ssh_password": "vagrant", "ssh_port": 22, @@ -37,8 +37,8 @@ "shutdown_command": "echo 'vagrant'|sudo -S /sbin/shutdown -hP now", "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "virtualbox_version_file": ".vbox_version", - "vm_name": "packer-debian-7.7-amd64", - "output_directory": "packer-debian-7.7-amd64-virtualbox", + "vm_name": "packer-debian-7.8-amd64", + "output_directory": "packer-debian-7.8-amd64-virtualbox", "vboxmanage": [ [ "modifyvm", "{{.Name}}", "--memory", "384" ], [ "modifyvm", "{{.Name}}", "--cpus", "1" ] @@ -65,11 +65,11 @@ ], "boot_wait": "10s", "disk_size": 40960, - "guest_os_type": "debian5-64", + "guest_os_type": "debian7-64", "http_directory": "http", - "iso_checksum": "df60b786ddd22710574ecb51d0a6e7f579cdd14a", + "iso_checksum": "5f611b40b0803f8be1180da561cfbc159e381599", "iso_checksum_type": "sha1", - "iso_url": "{{user `mirror`}}/7.7.0/amd64/iso-cd/debian-7.7.0-amd64-CD-1.iso", + "iso_url": "{{user `mirror`}}/7.8.0/amd64/iso-cd/debian-7.8.0-amd64-CD-1.iso", "ssh_username": "vagrant", "ssh_password": "vagrant", "ssh_port": 22, @@ -77,7 +77,7 @@ "shutdown_command": "echo 'vagrant'|sudo -S /sbin/shutdown -hP now", "tools_upload_flavor": "linux", "vm_name": "packer-debian-7.7-amd64", - "output_directory": "packer-debian-7.7-amd64-vmware", + "output_directory": "packer-debian-7.8-amd64-vmware", "vmx_data": { "memsize": "384", "numvcpus": "1", @@ -107,9 +107,9 @@ "disk_size": 40960, "guest_os_type": "debian", "http_directory": "http", - "iso_checksum": "df60b786ddd22710574ecb51d0a6e7f579cdd14a", + "iso_checksum": "5f611b40b0803f8be1180da561cfbc159e381599", "iso_checksum_type": "sha1", - "iso_url": "{{user `mirror`}}/7.7.0/amd64/iso-cd/debian-7.7.0-amd64-CD-1.iso", + "iso_url": "{{user `mirror`}}/7.8.0/amd64/iso-cd/debian-7.8.0-amd64-CD-1.iso", "ssh_username": "vagrant", "ssh_password": "vagrant", "ssh_port": 22, @@ -117,8 +117,8 @@ "shutdown_command": "echo 'vagrant'|sudo -S /sbin/shutdown -hP now", "parallels_tools_flavor": "lin", "prlctl_version_file": ".prlctl_version", - "vm_name": "packer-debian-7.7-amd64", - "output_directory": "packer-debian-7.7-amd64-parallels", + "vm_name": "packer-debian-7.8-amd64", + "output_directory": "packer-debian-7.8-amd64-parallels", "prlctl": [ [ "set", "{{.Name}}", "--memsize", "384" ], [ "set", "{{.Name}}", "--cpus", "1" ] @@ -128,7 +128,7 @@ "post-processors": [ { "type": "vagrant", - "output": "../builds/{{.Provider}}/opscode_debian-7.7_chef-{{user `chef_version`}}.box" + "output": "../builds/{{.Provider}}/opscode_debian-7.8_chef-{{user `chef_version`}}.box" } ], "provisioners": [ diff --git a/packer/debian-7.7-i386.json b/packer/debian-7.8-i386.json similarity index 85% rename from packer/debian-7.7-i386.json rename to packer/debian-7.8-i386.json index f46a56759..601eb39fb 100644 --- a/packer/debian-7.7-i386.json +++ b/packer/debian-7.8-i386.json @@ -27,9 +27,9 @@ "disk_size": 40960, "guest_os_type": "Debian", "http_directory": "http", - "iso_checksum": "ca22b069189ab6b7a1f931ee64c7a2a81ac73c99", + "iso_checksum": "d87664e590f39aba725ec9705dc58a8c75417fef", "iso_checksum_type": "sha1", - "iso_url": "{{user `mirror`}}/7.7.0/i386/iso-cd/debian-7.7.0-i386-CD-1.iso", + "iso_url": "{{user `mirror`}}/7.8.0/i386/iso-cd/debian-7.8.0-i386-CD-1.iso", "ssh_username": "vagrant", "ssh_password": "vagrant", "ssh_port": 22, @@ -37,8 +37,8 @@ "shutdown_command": "echo 'vagrant'|sudo -S /sbin/shutdown -hP now", "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "virtualbox_version_file": ".vbox_version", - "vm_name": "packer-debian-7.7-i386", - "output_directory": "packer-debian-7.7-i386-virtualbox", + "vm_name": "packer-debian-7.8-i386", + "output_directory": "packer-debian-7.8-i386-virtualbox", "vboxmanage": [ [ "modifyvm", "{{.Name}}", "--memory", "384" ], [ "modifyvm", "{{.Name}}", "--cpus", "1" ] @@ -65,19 +65,19 @@ ], "boot_wait": "10s", "disk_size": 40960, - "guest_os_type": "debian5", + "guest_os_type": "debian7", "http_directory": "http", - "iso_checksum": "ca22b069189ab6b7a1f931ee64c7a2a81ac73c99", + "iso_checksum": "d87664e590f39aba725ec9705dc58a8c75417fef", "iso_checksum_type": "sha1", - "iso_url": "{{user `mirror`}}/7.7.0/i386/iso-cd/debian-7.7.0-i386-CD-1.iso", + "iso_url": "{{user `mirror`}}/7.8.0/i386/iso-cd/debian-7.8.0-i386-CD-1.iso", "ssh_username": "vagrant", "ssh_password": "vagrant", "ssh_port": 22, "ssh_wait_timeout": "10000s", "shutdown_command": "echo 'vagrant'|sudo -S /sbin/shutdown -hP now", "tools_upload_flavor": "linux", - "vm_name": "packer-debian-7.7-i386", - "output_directory": "packer-debian-7.7-i386-vmware", + "vm_name": "packer-debian-7.8-i386", + "output_directory": "packer-debian-7.8-i386-vmware", "vmx_data": { "memsize": "384", "numvcpus": "1", @@ -107,9 +107,9 @@ "disk_size": 40960, "guest_os_type": "debian", "http_directory": "http", - "iso_checksum": "ca22b069189ab6b7a1f931ee64c7a2a81ac73c99", + "iso_checksum": "d87664e590f39aba725ec9705dc58a8c75417fef", "iso_checksum_type": "sha1", - "iso_url": "{{user `mirror`}}/7.7.0/i386/iso-cd/debian-7.7.0-i386-CD-1.iso", + "iso_url": "{{user `mirror`}}/7.8.0/i386/iso-cd/debian-7.8.0-i386-CD-1.iso", "ssh_username": "vagrant", "ssh_password": "vagrant", "ssh_port": 22, @@ -117,8 +117,8 @@ "shutdown_command": "echo 'vagrant'|sudo -S /sbin/shutdown -hP now", "parallels_tools_flavor": "lin", "prlctl_version_file": ".prlctl_version", - "vm_name": "packer-debian-7.7-i386", - "output_directory": "packer-debian-7.7-i386-parallels", + "vm_name": "packer-debian-7.8-i386", + "output_directory": "packer-debian-7.8-i386-parallels", "prlctl": [ [ "set", "{{.Name}}", "--memsize", "384" ], [ "set", "{{.Name}}", "--cpus", "1" ] @@ -129,7 +129,7 @@ "post-processors": [ { "type": "vagrant", - "output": "../builds/{{.Provider}}/opscode_debian-7.7-i386_chef-{{user `chef_version`}}.box" + "output": "../builds/{{.Provider}}/opscode_debian-7.8-i386_chef-{{user `chef_version`}}.box" } ], "provisioners": [ From d8c7ed0132437ab47297cc861fd8d877cb55c379 Mon Sep 17 00:00:00 2001 From: "Julian C. Dunn" <jdunn@getchef.com> Date: Tue, 27 Jan 2015 00:21:17 -0500 Subject: [PATCH 0301/1622] Fix minor typo in vm_name. --- packer/debian-7.8-amd64.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packer/debian-7.8-amd64.json b/packer/debian-7.8-amd64.json index 43d1adc0a..801e5cdec 100644 --- a/packer/debian-7.8-amd64.json +++ b/packer/debian-7.8-amd64.json @@ -76,7 +76,7 @@ "ssh_wait_timeout": "10000s", "shutdown_command": "echo 'vagrant'|sudo -S /sbin/shutdown -hP now", "tools_upload_flavor": "linux", - "vm_name": "packer-debian-7.7-amd64", + "vm_name": "packer-debian-7.8-amd64", "output_directory": "packer-debian-7.8-amd64-vmware", "vmx_data": { "memsize": "384", From 28d9abe5a56b9fdecf061083e8f8d8717994f2df Mon Sep 17 00:00:00 2001 From: Andreas Lappe <info@zimmer7.com> Date: Thu, 12 Feb 2015 13:40:23 +0100 Subject: [PATCH 0302/1622] Fix mac address issue for ens33 on centos 7 Before I had an issue using the box with a static ip for NFS sharing in vagrant, resulting in ``` ERROR: [/etc/sysconfig/network-scripts/ifdown-eth] Device ens33 has MAC address 00:0C:29:F8:96:74, instead of configured address 00:0C:29:59:C4:97. Ignoring. ``` While the cleanup script already fixed this for `eth0`, CentOS7 seems to have changed the device naming, therefor it's also needed for `ens33`. Instead of removing the text of the entries, I opted for deleting the whole line as there's no need for empty lines in the ifcfg-file. --- packer/scripts/centos/cleanup.sh | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/packer/scripts/centos/cleanup.sh b/packer/scripts/centos/cleanup.sh index 63374115d..47399c08f 100644 --- a/packer/scripts/centos/cleanup.sh +++ b/packer/scripts/centos/cleanup.sh @@ -8,6 +8,10 @@ rm -f /tmp/chef*rpm # clean up redhat interface persistence rm -f /etc/udev/rules.d/70-persistent-net.rules if [ -r /etc/sysconfig/network-scripts/ifcfg-eth0 ]; then - sed -i 's/^HWADDR.*$//' /etc/sysconfig/network-scripts/ifcfg-eth0 - sed -i 's/^UUID.*$//' /etc/sysconfig/network-scripts/ifcfg-eth0 + sed -i '/^HWADDR/d' /etc/sysconfig/network-scripts/ifcfg-eth0 + sed -i '/^UUID/d' /etc/sysconfig/network-scripts/ifcfg-eth0 +fi +if [ -r /etc/sysconfig/network-scripts/ifcfg-ens33 ]; then + sed -i '/^HWADDR/d' /etc/sysconfig/network-scripts/ifcfg-ens33 + sed -i '/^UUID/d' /etc/sysconfig/network-scripts/ifcfg-ens33 fi From c3601ac204bdd1bee2470c40592e43f31fc372c4 Mon Sep 17 00:00:00 2001 From: Andreas Lappe <info@zimmer7.com> Date: Thu, 12 Feb 2015 14:46:47 +0100 Subject: [PATCH 0303/1622] Remove HWADDR and UUID for every device except lo --- packer/scripts/centos/cleanup.sh | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/packer/scripts/centos/cleanup.sh b/packer/scripts/centos/cleanup.sh index 47399c08f..9e94b2e05 100644 --- a/packer/scripts/centos/cleanup.sh +++ b/packer/scripts/centos/cleanup.sh @@ -7,11 +7,10 @@ rm -f /tmp/chef*rpm # clean up redhat interface persistence rm -f /etc/udev/rules.d/70-persistent-net.rules -if [ -r /etc/sysconfig/network-scripts/ifcfg-eth0 ]; then - sed -i '/^HWADDR/d' /etc/sysconfig/network-scripts/ifcfg-eth0 - sed -i '/^UUID/d' /etc/sysconfig/network-scripts/ifcfg-eth0 -fi -if [ -r /etc/sysconfig/network-scripts/ifcfg-ens33 ]; then - sed -i '/^HWADDR/d' /etc/sysconfig/network-scripts/ifcfg-ens33 - sed -i '/^UUID/d' /etc/sysconfig/network-scripts/ifcfg-ens33 -fi + +for ndev in $(ls /etc/sysconfig/network-scripts/ifcfg-*); do + if [ "$(basename ${ndev})" != "ifcfg-lo" ]; then + sed -i '/^HWADDR/d' ${ndev} + sed -i '/^UUID/d' ${ndev} + fi +done From e1287d8c05b4fea43ad1cddfe0c28f5849e8dfea Mon Sep 17 00:00:00 2001 From: Roland Moriz <roland@moriz.de> Date: Fri, 13 Feb 2015 23:51:14 +0100 Subject: [PATCH 0304/1622] change mirror to http.debian.net, fixes #322 --- packer/http/debian-7/preseed.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packer/http/debian-7/preseed.cfg b/packer/http/debian-7/preseed.cfg index ced8699d2..015dc51eb 100644 --- a/packer/http/debian-7/preseed.cfg +++ b/packer/http/debian-7/preseed.cfg @@ -9,7 +9,7 @@ d-i grub-installer/with_other_os boolean true d-i keymap select us d-i mirror/country string manual d-i mirror/http/directory string /debian -d-i mirror/http/hostname string mirrors.kernel.org +d-i mirror/http/hostname string http.debian.net d-i mirror/http/proxy string d-i partman-auto-lvm/guided_size string max d-i partman-auto/choose_recipe select atomic From 0854e2c66051c7dae404fabacd515378b1875c5e Mon Sep 17 00:00:00 2001 From: jtimberman <joshua@chef.io> Date: Tue, 24 Feb 2015 10:46:02 -0700 Subject: [PATCH 0305/1622] Fixes #325, #318 - don't download cacert.pem This addresses both concerns of #318 and #325. We were downloading the SSL CA bundle over http because at the point in time when we wanted to even do that we might not have been in a state where the SSL certificates from curl.haxx.se could be verified. Using http is just as good at that point as using SSL without verification. However... This addresses the concern raised in #325, whereby the upstream cacert.pem removed certificates used by services such as AWS S3, causing SSL connections to those sites to fail to verify. We should rely on the ca-bundle.crt that comes with the openssl package on the platforms in question (centos/fedora). --- packer/http/centos-5.11/ks.cfg | 2 -- packer/http/centos-6.6/ks.cfg | 2 -- packer/http/centos-7.0/ks.cfg | 2 -- packer/http/fedora-20/ks.cfg | 2 -- packer/http/fedora-21/ks.cfg | 2 -- packer/scripts/fedora/ks.cfg | 2 -- 6 files changed, 12 deletions(-) diff --git a/packer/http/centos-5.11/ks.cfg b/packer/http/centos-5.11/ks.cfg index 90df3c584..c1c974fdb 100644 --- a/packer/http/centos-5.11/ks.cfg +++ b/packer/http/centos-5.11/ks.cfg @@ -69,8 +69,6 @@ yum -zd1211-firmware %post -# update root certs -wget -O/etc/pki/tls/certs/ca-bundle.crt http://curl.haxx.se/ca/cacert.pem # sudo echo "vagrant ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers sed -i "s/^.*requiretty/#Defaults requiretty/" /etc/sudoers diff --git a/packer/http/centos-6.6/ks.cfg b/packer/http/centos-6.6/ks.cfg index 13be8109b..d7215076d 100644 --- a/packer/http/centos-6.6/ks.cfg +++ b/packer/http/centos-6.6/ks.cfg @@ -64,8 +64,6 @@ nfs-utils %post # Force to set SELinux to a permissive mode sed -i -e 's/\(^SELINUX=\).*$/\1permissive/' /etc/selinux/config -# update root certs -wget -O/etc/pki/tls/certs/ca-bundle.crt http://curl.haxx.se/ca/cacert.pem # sudo echo "%vagrant ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers.d/vagrant sed -i "s/^.*requiretty/#Defaults requiretty/" /etc/sudoers diff --git a/packer/http/centos-7.0/ks.cfg b/packer/http/centos-7.0/ks.cfg index 55763e889..c5414695f 100644 --- a/packer/http/centos-7.0/ks.cfg +++ b/packer/http/centos-7.0/ks.cfg @@ -74,8 +74,6 @@ bzip2 %end %post -# update root certs -wget -O/etc/pki/tls/certs/ca-bundle.crt http://curl.haxx.se/ca/cacert.pem # sudo echo "%vagrant ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers.d/vagrant sed -i "s/^.*requiretty/#Defaults requiretty/" /etc/sudoers diff --git a/packer/http/fedora-20/ks.cfg b/packer/http/fedora-20/ks.cfg index 4e3db2946..2e3e13e55 100644 --- a/packer/http/fedora-20/ks.cfg +++ b/packer/http/fedora-20/ks.cfg @@ -39,8 +39,6 @@ net-tools %end %post -# update root certs -wget -O/etc/pki/tls/certs/ca-bundle.crt http://curl.haxx.se/ca/cacert.pem # sudo echo 'Defaults:vagrant !requiretty' > /etc/sudoers.d/vagrant echo '%vagrant ALL=(ALL) NOPASSWD: ALL' >> /etc/sudoers.d/vagrant diff --git a/packer/http/fedora-21/ks.cfg b/packer/http/fedora-21/ks.cfg index 4e3db2946..2e3e13e55 100644 --- a/packer/http/fedora-21/ks.cfg +++ b/packer/http/fedora-21/ks.cfg @@ -39,8 +39,6 @@ net-tools %end %post -# update root certs -wget -O/etc/pki/tls/certs/ca-bundle.crt http://curl.haxx.se/ca/cacert.pem # sudo echo 'Defaults:vagrant !requiretty' > /etc/sudoers.d/vagrant echo '%vagrant ALL=(ALL) NOPASSWD: ALL' >> /etc/sudoers.d/vagrant diff --git a/packer/scripts/fedora/ks.cfg b/packer/scripts/fedora/ks.cfg index aee62b7f3..3b631a377 100644 --- a/packer/scripts/fedora/ks.cfg +++ b/packer/scripts/fedora/ks.cfg @@ -38,8 +38,6 @@ nfs-utils %end %post -# update root certs -wget -O /etc/pki/tls/certs/ca-bundle.crt http://curl.haxx.se/ca/cacert.pem # vagrant groupadd vagrant useradd vagrant -g vagrant -G wheel -u 900 From 375f27f54850f3949d2e107659678fd683d6ff46 Mon Sep 17 00:00:00 2001 From: "Julian C. Dunn" <jdunn@chef.io> Date: Tue, 24 Feb 2015 23:51:32 -0500 Subject: [PATCH 0306/1622] Remove extraneous ks.cfg --- packer/scripts/fedora/ks.cfg | 49 ------------------------------------ 1 file changed, 49 deletions(-) delete mode 100644 packer/scripts/fedora/ks.cfg diff --git a/packer/scripts/fedora/ks.cfg b/packer/scripts/fedora/ks.cfg deleted file mode 100644 index 3b631a377..000000000 --- a/packer/scripts/fedora/ks.cfg +++ /dev/null @@ -1,49 +0,0 @@ -install -cdrom -lang en_US.UTF-8 -keyboard us -network --bootproto=dhcp -rootpw --iscrypted $1$damlkd,f$UC/u5pUts5QiU3ow.CSso/ -firewall --disabled -authconfig --enableshadow --passalgo=sha512 -selinux --permissive -timezone UTC -bootloader --location=mbr -text -skipx -zerombr -clearpart --all --initlabel -part /boot --fstype=ext4 --size=500 -part pv.2 --grow --size=500 -volgroup vg_vagrant --pesize=32768 pv.2 -logvol / --fstype=ext4 --name=lv_root --vgname=vg_vagrant --size=1024 --grow -logvol swap --fstype=swap --name=lv_swap --vgname=vg_vagrant --size=528 --grow --maxsize=1056 -bootloader --location=mbr --append="norhgb biosdevname=0" -auth --useshadow --enablemd5 -firstboot --disabled -reboot - -%packages -@Core -bzip2 -gcc -kernel-devel -kernel-headers -openssl-devel -readline-devel -tar -wget -zlib-devel -nfs-utils -%end - -%post -# vagrant -groupadd vagrant -useradd vagrant -g vagrant -G wheel -u 900 -echo "vagrant" | passwd --stdin vagrant -# sudo -echo 'Defaults:vagrant !requiretty' > /etc/sudoers.d/vagrant -echo '%vagrant ALL=(ALL) NOPASSWD: ALL' >> /etc/sudoers.d/vagrant -chmod 440 /etc/sudoers.d/vagrant -%end From a521242150fce74cd0a366b8672aa7dd4056e71c Mon Sep 17 00:00:00 2001 From: "Julian C. Dunn" <jdunn@chef.io> Date: Thu, 26 Feb 2015 01:14:58 -0500 Subject: [PATCH 0307/1622] Update to Ubuntu 14.04.2. --- packer/ubuntu-14.04-amd64.json | 12 ++++++------ packer/ubuntu-14.04-i386.json | 12 ++++++------ 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/packer/ubuntu-14.04-amd64.json b/packer/ubuntu-14.04-amd64.json index 050facdec..24121cc1f 100644 --- a/packer/ubuntu-14.04-amd64.json +++ b/packer/ubuntu-14.04-amd64.json @@ -30,9 +30,9 @@ "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "guest_os_type": "Ubuntu_64", "http_directory": "http", - "iso_checksum": "946a6077af6f5f95a51f82fdc44051c7aa19f9cfc5f737954845a6050543d7c2", + "iso_checksum": "8acd2f56bfcba2f7ac74a7e4a5e565ce68c024c38525c0285573e41c86ae90c0", "iso_checksum_type": "sha256", - "iso_url": "{{user `mirror`}}/14.04.1/ubuntu-14.04.1-server-amd64.iso", + "iso_url": "{{user `mirror`}}/14.04.2/ubuntu-14.04.2-server-amd64.iso", "output_directory": "packer-ubuntu-14.04-amd64-virtualbox", "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", "ssh_password": "vagrant", @@ -86,9 +86,9 @@ "disk_size": 40960, "guest_os_type": "ubuntu-64", "http_directory": "http", - "iso_checksum": "946a6077af6f5f95a51f82fdc44051c7aa19f9cfc5f737954845a6050543d7c2", + "iso_checksum": "8acd2f56bfcba2f7ac74a7e4a5e565ce68c024c38525c0285573e41c86ae90c0", "iso_checksum_type": "sha256", - "iso_url": "{{user `mirror`}}/14.04.1/ubuntu-14.04.1-server-amd64.iso", + "iso_url": "{{user `mirror`}}/14.04.2/ubuntu-14.04.2-server-amd64.iso", "output_directory": "packer-ubuntu-14.04-amd64-vmware", "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", "ssh_password": "vagrant", @@ -134,9 +134,9 @@ "parallels_tools_flavor": "lin", "guest_os_type": "ubuntu", "http_directory": "http", - "iso_checksum": "946a6077af6f5f95a51f82fdc44051c7aa19f9cfc5f737954845a6050543d7c2", + "iso_checksum": "8acd2f56bfcba2f7ac74a7e4a5e565ce68c024c38525c0285573e41c86ae90c0", "iso_checksum_type": "sha256", - "iso_url": "{{user `mirror`}}/14.04.1/ubuntu-14.04.1-server-amd64.iso", + "iso_url": "{{user `mirror`}}/14.04.2/ubuntu-14.04.2-server-amd64.iso", "output_directory": "packer-ubuntu-14.04-amd64-parallels", "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", "ssh_password": "vagrant", diff --git a/packer/ubuntu-14.04-i386.json b/packer/ubuntu-14.04-i386.json index 88018157a..63b52cefc 100644 --- a/packer/ubuntu-14.04-i386.json +++ b/packer/ubuntu-14.04-i386.json @@ -30,9 +30,9 @@ "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "guest_os_type": "Ubuntu", "http_directory": "http", - "iso_checksum": "976044842804eafc18390505508958b559c131211160ecae5e60694bdf171f78", + "iso_checksum": "76524ab9502a34b983ed56af2d5a72835ce41aec1e2b4c0cb7788ef596958ed6", "iso_checksum_type": "sha256", - "iso_url": "{{user `mirror`}}/14.04.1/ubuntu-14.04.1-server-i386.iso", + "iso_url": "{{user `mirror`}}/14.04.2/ubuntu-14.04.2-server-i386.iso", "output_directory": "packer-ubuntu-14.04-i386-virtualbox", "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", "ssh_password": "vagrant", @@ -86,9 +86,9 @@ "disk_size": 40960, "guest_os_type": "ubuntu", "http_directory": "http", - "iso_checksum": "976044842804eafc18390505508958b559c131211160ecae5e60694bdf171f78", + "iso_checksum": "76524ab9502a34b983ed56af2d5a72835ce41aec1e2b4c0cb7788ef596958ed6", "iso_checksum_type": "sha256", - "iso_url": "{{user `mirror`}}/14.04.1/ubuntu-14.04.1-server-i386.iso", + "iso_url": "{{user `mirror`}}/14.04.2/ubuntu-14.04.2-server-i386.iso", "output_directory": "packer-ubuntu-14.04-i386-vmware", "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", "ssh_password": "vagrant", @@ -134,9 +134,9 @@ "parallels_tools_flavor": "lin", "guest_os_type": "ubuntu", "http_directory": "http", - "iso_checksum": "976044842804eafc18390505508958b559c131211160ecae5e60694bdf171f78", + "iso_checksum": "76524ab9502a34b983ed56af2d5a72835ce41aec1e2b4c0cb7788ef596958ed6", "iso_checksum_type": "sha256", - "iso_url": "{{user `mirror`}}/14.04.1/ubuntu-14.04.1-server-i386.iso", + "iso_url": "{{user `mirror`}}/14.04.2/ubuntu-14.04.2-server-i386.iso", "output_directory": "packer-ubuntu-14.04-i386-parallels", "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", "ssh_password": "vagrant", From d5792d3540a652280497386068c7b68975b82221 Mon Sep 17 00:00:00 2001 From: Irving Popovetsky <irving@getchef.com> Date: Mon, 2 Mar 2015 11:46:23 -0800 Subject: [PATCH 0308/1622] Switch to SATA HDD for Linux VMs on virtualbox --- packer/centos-5.11-i386.json | 1 + packer/centos-5.11-x86_64.json | 1 + packer/centos-6.6-i386.json | 1 + packer/centos-6.6-x86_64.json | 1 + packer/centos-7.0-x86_64.json | 1 + packer/debian-6.0.10-amd64.json | 1 + packer/debian-6.0.10-i386.json | 1 + packer/debian-7.8-amd64.json | 1 + packer/debian-7.8-i386.json | 1 + packer/fedora-20-i386.json | 1 + packer/fedora-20-x86_64.json | 1 + packer/fedora-21-i386.json | 1 + packer/fedora-21-x86_64.json | 1 + packer/oracle-5.11-i386.json | 1 + packer/oracle-5.11-x86_64.json | 1 + packer/oracle-6.6-i386.json | 1 + packer/oracle-6.6-x86_64.json | 1 + packer/rhel-5.11-i386.json | 1 + packer/rhel-5.11-x86_64.json | 1 + packer/rhel-6.6-i386.json | 1 + packer/rhel-6.6-x86_64.json | 1 + packer/rhel-7.0-x86_64.json | 1 + packer/sles-11-sp2-i386.json | 1 + packer/sles-11-sp2-x86_64.json | 1 + packer/sles-11-sp3-i386.json | 1 + packer/sles-11-sp3-x86_64.json | 1 + packer/sles-12-x86_64.json | 1 + packer/ubuntu-10.04-amd64.json | 1 + packer/ubuntu-10.04-i386.json | 1 + packer/ubuntu-12.04-amd64.json | 1 + packer/ubuntu-12.04-i386.json | 1 + packer/ubuntu-14.04-amd64.json | 1 + packer/ubuntu-14.04-i386.json | 1 + packer/ubuntu-14.10-amd64.json | 1 + packer/ubuntu-14.10-i386.json | 1 + 35 files changed, 35 insertions(+) diff --git a/packer/centos-5.11-i386.json b/packer/centos-5.11-i386.json index a4f2209d3..806e0fd5d 100644 --- a/packer/centos-5.11-i386.json +++ b/packer/centos-5.11-i386.json @@ -8,6 +8,7 @@ "disk_size": 40960, "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "guest_os_type": "RedHat", + "hard_drive_interface": "sata", "http_directory": "http", "iso_checksum": "ec3a89b4edc8e391d13c1ecce4e6ce3917719e39", "iso_checksum_type": "sha1", diff --git a/packer/centos-5.11-x86_64.json b/packer/centos-5.11-x86_64.json index 9f997d4da..2b0b39637 100644 --- a/packer/centos-5.11-x86_64.json +++ b/packer/centos-5.11-x86_64.json @@ -8,6 +8,7 @@ "disk_size": 40960, "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "guest_os_type": "RedHat_64", + "hard_drive_interface": "sata", "http_directory": "http", "iso_checksum": "ebd77f2fdfac8da04f31c508905cf52aa62937cc", "iso_checksum_type": "sha1", diff --git a/packer/centos-6.6-i386.json b/packer/centos-6.6-i386.json index ea9bbbdee..d3cb03744 100644 --- a/packer/centos-6.6-i386.json +++ b/packer/centos-6.6-i386.json @@ -8,6 +8,7 @@ "disk_size": 40960, "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "guest_os_type": "RedHat", + "hard_drive_interface": "sata", "http_directory": "http", "iso_checksum": "d16aa4a8e6f71fb01fcc26d8ae0e3443ed514c8e", "iso_checksum_type": "sha1", diff --git a/packer/centos-6.6-x86_64.json b/packer/centos-6.6-x86_64.json index 24d837e7b..968976d04 100644 --- a/packer/centos-6.6-x86_64.json +++ b/packer/centos-6.6-x86_64.json @@ -8,6 +8,7 @@ "disk_size": 40960, "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "guest_os_type": "RedHat_64", + "hard_drive_interface": "sata", "http_directory": "http", "iso_checksum": "08be09fd7276822bd3468af8f96198279ffc41f0", "iso_checksum_type": "sha1", diff --git a/packer/centos-7.0-x86_64.json b/packer/centos-7.0-x86_64.json index 541d11d14..faa8678f2 100644 --- a/packer/centos-7.0-x86_64.json +++ b/packer/centos-7.0-x86_64.json @@ -8,6 +8,7 @@ "disk_size": 40960, "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "guest_os_type": "RedHat_64", + "hard_drive_interface": "sata", "http_directory": "http", "iso_checksum": "ee505335bcd4943ffc7e6e6e55e5aaa8da09710b6ceecda82a5619342f1d24d9", "iso_checksum_type": "sha256", diff --git a/packer/debian-6.0.10-amd64.json b/packer/debian-6.0.10-amd64.json index ee4686c8b..d4b6232ed 100644 --- a/packer/debian-6.0.10-amd64.json +++ b/packer/debian-6.0.10-amd64.json @@ -27,6 +27,7 @@ "disk_size": 40960, "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "guest_os_type": "Debian_64", + "hard_drive_interface": "sata", "http_directory": "http", "iso_checksum": "f3e70528664f174a121b26491c59cd66daaf8274", "iso_checksum_type": "sha1", diff --git a/packer/debian-6.0.10-i386.json b/packer/debian-6.0.10-i386.json index 2975158d8..6f22e995d 100644 --- a/packer/debian-6.0.10-i386.json +++ b/packer/debian-6.0.10-i386.json @@ -27,6 +27,7 @@ "disk_size": 40960, "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "guest_os_type": "Debian", + "hard_drive_interface": "sata", "http_directory": "http", "iso_checksum": "e8f77720e30f669e731fe3166ad6c3d2da33d93a", "iso_checksum_type": "sha1", diff --git a/packer/debian-7.8-amd64.json b/packer/debian-7.8-amd64.json index 801e5cdec..46b24a22b 100644 --- a/packer/debian-7.8-amd64.json +++ b/packer/debian-7.8-amd64.json @@ -26,6 +26,7 @@ "boot_wait": "10s", "disk_size": 40960, "guest_os_type": "Debian_64", + "hard_drive_interface": "sata", "http_directory": "http", "iso_checksum": "5f611b40b0803f8be1180da561cfbc159e381599", "iso_checksum_type": "sha1", diff --git a/packer/debian-7.8-i386.json b/packer/debian-7.8-i386.json index 601eb39fb..4b8260c90 100644 --- a/packer/debian-7.8-i386.json +++ b/packer/debian-7.8-i386.json @@ -26,6 +26,7 @@ "boot_wait": "10s", "disk_size": 40960, "guest_os_type": "Debian", + "hard_drive_interface": "sata", "http_directory": "http", "iso_checksum": "d87664e590f39aba725ec9705dc58a8c75417fef", "iso_checksum_type": "sha1", diff --git a/packer/fedora-20-i386.json b/packer/fedora-20-i386.json index 385e872bd..e8c243175 100644 --- a/packer/fedora-20-i386.json +++ b/packer/fedora-20-i386.json @@ -8,6 +8,7 @@ "disk_size": 40960, "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "guest_os_type": "Fedora", + "hard_drive_interface": "sata", "http_directory": "http", "iso_checksum": "284ea30ddd50db1b30cd5cd9fae7495dad8714ef1e4428d69a8c8ce80e03b6a9", "iso_checksum_type": "sha256", diff --git a/packer/fedora-20-x86_64.json b/packer/fedora-20-x86_64.json index 9ab3f8836..1e1499850 100644 --- a/packer/fedora-20-x86_64.json +++ b/packer/fedora-20-x86_64.json @@ -8,6 +8,7 @@ "disk_size": 40960, "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "guest_os_type": "Fedora_64", + "hard_drive_interface": "sata", "http_directory": "http", "iso_checksum": "f2eeed5102b8890e9e6f4b9053717fe73031e699c4b76dc7028749ab66e7f917", "iso_checksum_type": "sha256", diff --git a/packer/fedora-21-i386.json b/packer/fedora-21-i386.json index ac2657346..481edc45a 100644 --- a/packer/fedora-21-i386.json +++ b/packer/fedora-21-i386.json @@ -8,6 +8,7 @@ "disk_size": 40960, "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "guest_os_type": "Fedora", + "hard_drive_interface": "sata", "http_directory": "http", "iso_checksum": "85e50a8a938996522bf1605b3578a2d6680362c1aa963d0560d59c2e4fc795ef", "iso_checksum_type": "sha256", diff --git a/packer/fedora-21-x86_64.json b/packer/fedora-21-x86_64.json index cbf1198e1..557ea423d 100644 --- a/packer/fedora-21-x86_64.json +++ b/packer/fedora-21-x86_64.json @@ -8,6 +8,7 @@ "disk_size": 40960, "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "guest_os_type": "Fedora_64", + "hard_drive_interface": "sata", "http_directory": "http", "iso_checksum": "a6a2e83bb409d6b8ee3072ad07faac0a54d79c9ecbe3a40af91b773e2d843d8e", "iso_checksum_type": "sha256", diff --git a/packer/oracle-5.11-i386.json b/packer/oracle-5.11-i386.json index d0ca92e61..e3d2fe214 100644 --- a/packer/oracle-5.11-i386.json +++ b/packer/oracle-5.11-i386.json @@ -8,6 +8,7 @@ "disk_size": 40960, "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "guest_os_type": "Oracle", + "hard_drive_interface": "sata", "http_directory": "http", "iso_checksum": "f4ef2b868a0cccb736664136eca798ec", "iso_checksum_type": "md5", diff --git a/packer/oracle-5.11-x86_64.json b/packer/oracle-5.11-x86_64.json index 2a0d74733..e70d90594 100644 --- a/packer/oracle-5.11-x86_64.json +++ b/packer/oracle-5.11-x86_64.json @@ -8,6 +8,7 @@ "disk_size": 40960, "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "guest_os_type": "Oracle_64", + "hard_drive_interface": "sata", "http_directory": "http", "iso_checksum": "8af2121088c7e6f5ebdb6d5900403240", "iso_checksum_type": "md5", diff --git a/packer/oracle-6.6-i386.json b/packer/oracle-6.6-i386.json index a280c85c1..589032422 100644 --- a/packer/oracle-6.6-i386.json +++ b/packer/oracle-6.6-i386.json @@ -8,6 +8,7 @@ "disk_size": 40960, "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "guest_os_type": "Oracle", + "hard_drive_interface": "sata", "http_directory": "http", "iso_url": "{{user `mirror`}}/OracleLinux-R6-U6-Server-i386-dvd.iso", "iso_checksum": "81f0c85217f40763dea5053ec5594e4958498bbc", diff --git a/packer/oracle-6.6-x86_64.json b/packer/oracle-6.6-x86_64.json index 57f8c9959..0a6a55b89 100644 --- a/packer/oracle-6.6-x86_64.json +++ b/packer/oracle-6.6-x86_64.json @@ -8,6 +8,7 @@ "disk_size": 40960, "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "guest_os_type": "Oracle_64", + "hard_drive_interface": "sata", "http_directory": "http", "iso_checksum": "5738f10a506d3630edfd297ef179b553091c6a48", "iso_checksum_type": "sha1", diff --git a/packer/rhel-5.11-i386.json b/packer/rhel-5.11-i386.json index d8932c31f..b52df5989 100644 --- a/packer/rhel-5.11-i386.json +++ b/packer/rhel-5.11-i386.json @@ -8,6 +8,7 @@ "disk_size": 40960, "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "guest_os_type": "RedHat", + "hard_drive_interface": "sata", "http_directory": "http", "iso_checksum": "4e38e4ed06d83efb10446e7db19d96761715cdbdbf0bbfacb978b44ce368bbe2", "iso_checksum_type": "sha256", diff --git a/packer/rhel-5.11-x86_64.json b/packer/rhel-5.11-x86_64.json index afe80175b..dbddf5d16 100644 --- a/packer/rhel-5.11-x86_64.json +++ b/packer/rhel-5.11-x86_64.json @@ -8,6 +8,7 @@ "disk_size": 40960, "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "guest_os_type": "RedHat_64", + "hard_drive_interface": "sata", "http_directory": "http", "iso_checksum": "36565fe0c8a97207d63234d10123daeedb29d509576dbd7b34e71958ac2f9050", "iso_checksum_type": "sha256", diff --git a/packer/rhel-6.6-i386.json b/packer/rhel-6.6-i386.json index 481772695..0c96c240d 100644 --- a/packer/rhel-6.6-i386.json +++ b/packer/rhel-6.6-i386.json @@ -8,6 +8,7 @@ "disk_size": 40960, "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "guest_os_type": "RedHat", + "hard_drive_interface": "sata", "http_directory": "http", "iso_checksum": "0a14ed1f7d7ea7b831739ed8e71719d9cb7c294bf801e8db39358651768547ad", "iso_checksum_type": "sha256", diff --git a/packer/rhel-6.6-x86_64.json b/packer/rhel-6.6-x86_64.json index 42901f174..3f1ed947e 100644 --- a/packer/rhel-6.6-x86_64.json +++ b/packer/rhel-6.6-x86_64.json @@ -8,6 +8,7 @@ "disk_size": 40960, "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "guest_os_type": "RedHat_64", + "hard_drive_interface": "sata", "http_directory": "http", "iso_checksum": "16044cb7264f4bc0150f5b6f3f66936ccf2d36e0a4152c00d9236fb7dcae5f32", "iso_checksum_type": "sha256", diff --git a/packer/rhel-7.0-x86_64.json b/packer/rhel-7.0-x86_64.json index 4f34cd1f3..58331e7d6 100644 --- a/packer/rhel-7.0-x86_64.json +++ b/packer/rhel-7.0-x86_64.json @@ -8,6 +8,7 @@ "disk_size": 40960, "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "guest_os_type": "RedHat_64", + "hard_drive_interface": "sata", "http_directory": "http", "iso_checksum": "85a9fedc2bf0fc825cc7817056aa00b3ea87d7e111e0cf8de77d3ba643f8646c", "iso_checksum_type": "sha256", diff --git a/packer/sles-11-sp2-i386.json b/packer/sles-11-sp2-i386.json index 4a31b0008..6d54b26d7 100644 --- a/packer/sles-11-sp2-i386.json +++ b/packer/sles-11-sp2-i386.json @@ -12,6 +12,7 @@ "disk_size": 20480, "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "guest_os_type": "OpenSUSE", + "hard_drive_interface": "sata", "http_directory": "http", "iso_checksum": "a0b34f6237b2b2a6b2174c82b40ed326", "iso_checksum_type": "md5", diff --git a/packer/sles-11-sp2-x86_64.json b/packer/sles-11-sp2-x86_64.json index dd603bbcc..0ec5c279b 100644 --- a/packer/sles-11-sp2-x86_64.json +++ b/packer/sles-11-sp2-x86_64.json @@ -12,6 +12,7 @@ "disk_size": 20480, "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "guest_os_type": "OpenSUSE_64", + "hard_drive_interface": "sata", "http_directory": "http", "iso_checksum": "461d82ae6e15062b0807c1338f040497", "iso_checksum_type": "md5", diff --git a/packer/sles-11-sp3-i386.json b/packer/sles-11-sp3-i386.json index 2e96807a1..41e94620c 100644 --- a/packer/sles-11-sp3-i386.json +++ b/packer/sles-11-sp3-i386.json @@ -12,6 +12,7 @@ "disk_size": 20480, "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "guest_os_type": "OpenSUSE", + "hard_drive_interface": "sata", "http_directory": "http", "iso_checksum": "5c30a409fc8fb3343b4dc90d93ff2c89", "iso_checksum_type": "md5", diff --git a/packer/sles-11-sp3-x86_64.json b/packer/sles-11-sp3-x86_64.json index 3841cfa93..a5bf62aef 100644 --- a/packer/sles-11-sp3-x86_64.json +++ b/packer/sles-11-sp3-x86_64.json @@ -12,6 +12,7 @@ "disk_size": 20480, "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "guest_os_type": "OpenSUSE_64", + "hard_drive_interface": "sata", "http_directory": "http", "iso_checksum": "480b70d50cbb538382dc2b9325221e1b", "iso_checksum_type": "md5", diff --git a/packer/sles-12-x86_64.json b/packer/sles-12-x86_64.json index a269997d0..9f3114904 100644 --- a/packer/sles-12-x86_64.json +++ b/packer/sles-12-x86_64.json @@ -12,6 +12,7 @@ "disk_size": 20480, "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "guest_os_type": "OpenSUSE_64", + "hard_drive_interface": "sata", "http_directory": "http", "iso_checksum": "58086fca0441b1d44c7a51c5ee64e1bd4365466fcee48ec92c4f39d07739aeed", "iso_checksum_type": "sha256", diff --git a/packer/ubuntu-10.04-amd64.json b/packer/ubuntu-10.04-amd64.json index 73a3efd19..3eafd5d10 100644 --- a/packer/ubuntu-10.04-amd64.json +++ b/packer/ubuntu-10.04-amd64.json @@ -29,6 +29,7 @@ "disk_size": 40960, "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "guest_os_type": "Ubuntu_64", + "hard_drive_interface": "sata", "http_directory": "http", "iso_checksum": "796e80702d65f2ee96e88874a1ab437e24df9cd6", "iso_checksum_type": "sha1", diff --git a/packer/ubuntu-10.04-i386.json b/packer/ubuntu-10.04-i386.json index 1f9008e17..d353eb9ab 100644 --- a/packer/ubuntu-10.04-i386.json +++ b/packer/ubuntu-10.04-i386.json @@ -29,6 +29,7 @@ "disk_size": 40960, "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "guest_os_type": "Ubuntu", + "hard_drive_interface": "sata", "http_directory": "http", "iso_checksum": "5695d8b6b914269d1374ac8d4c3dd3786e92d3fe", "iso_checksum_type": "sha1", diff --git a/packer/ubuntu-12.04-amd64.json b/packer/ubuntu-12.04-amd64.json index 52997a902..fa290d159 100644 --- a/packer/ubuntu-12.04-amd64.json +++ b/packer/ubuntu-12.04-amd64.json @@ -29,6 +29,7 @@ "disk_size": 40960, "guest_additions_path": "VBoxGuestAdditions_{{ .Version }}.iso", "guest_os_type": "Ubuntu_64", + "hard_drive_interface": "sata", "http_directory": "http", "iso_checksum": "7540ace2d6cdee264432f5ed987236d32edef798", "iso_checksum_type": "sha1", diff --git a/packer/ubuntu-12.04-i386.json b/packer/ubuntu-12.04-i386.json index 9ad0acb76..a97d3bef7 100644 --- a/packer/ubuntu-12.04-i386.json +++ b/packer/ubuntu-12.04-i386.json @@ -29,6 +29,7 @@ "disk_size": 40960, "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "guest_os_type": "Ubuntu", + "hard_drive_interface": "sata", "http_directory": "http", "iso_checksum": "a34c224b7fe72a2f5c768be5afee5c53817743fd", "iso_checksum_type": "sha1", diff --git a/packer/ubuntu-14.04-amd64.json b/packer/ubuntu-14.04-amd64.json index 24121cc1f..4a62d9341 100644 --- a/packer/ubuntu-14.04-amd64.json +++ b/packer/ubuntu-14.04-amd64.json @@ -29,6 +29,7 @@ "disk_size": 40960, "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "guest_os_type": "Ubuntu_64", + "hard_drive_interface": "sata", "http_directory": "http", "iso_checksum": "8acd2f56bfcba2f7ac74a7e4a5e565ce68c024c38525c0285573e41c86ae90c0", "iso_checksum_type": "sha256", diff --git a/packer/ubuntu-14.04-i386.json b/packer/ubuntu-14.04-i386.json index 63b52cefc..c76381b7f 100644 --- a/packer/ubuntu-14.04-i386.json +++ b/packer/ubuntu-14.04-i386.json @@ -29,6 +29,7 @@ "disk_size": 40960, "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "guest_os_type": "Ubuntu", + "hard_drive_interface": "sata", "http_directory": "http", "iso_checksum": "76524ab9502a34b983ed56af2d5a72835ce41aec1e2b4c0cb7788ef596958ed6", "iso_checksum_type": "sha256", diff --git a/packer/ubuntu-14.10-amd64.json b/packer/ubuntu-14.10-amd64.json index e70f4f64a..6c745a62d 100644 --- a/packer/ubuntu-14.10-amd64.json +++ b/packer/ubuntu-14.10-amd64.json @@ -29,6 +29,7 @@ "disk_size": 40960, "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "guest_os_type": "Ubuntu_64", + "hard_drive_interface": "sata", "http_directory": "http", "iso_checksum": "0c1ebea31c3523cfe9a4ffed8bcf6c7d23dfb97b", "iso_checksum_type": "sha1", diff --git a/packer/ubuntu-14.10-i386.json b/packer/ubuntu-14.10-i386.json index 5d43b2fd6..acd1d42b5 100644 --- a/packer/ubuntu-14.10-i386.json +++ b/packer/ubuntu-14.10-i386.json @@ -29,6 +29,7 @@ "disk_size": 40960, "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "guest_os_type": "Ubuntu", + "hard_drive_interface": "sata", "http_directory": "http", "iso_checksum": "26faf47df2162f4ff83e38e6831dd169da6db95f", "iso_checksum_type": "sha1", From 3349552f2e632f735b752c93f105b7874890c927 Mon Sep 17 00:00:00 2001 From: Mikhail Zholobov <legal90@gmail.com> Date: Fri, 3 Apr 2015 09:16:59 +0300 Subject: [PATCH 0309/1622] Fix "sudoers.sh" for ubuntu --- packer/scripts/ubuntu/sudoers.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packer/scripts/ubuntu/sudoers.sh b/packer/scripts/ubuntu/sudoers.sh index 3f5877e8d..b75e92e1e 100644 --- a/packer/scripts/ubuntu/sudoers.sh +++ b/packer/scripts/ubuntu/sudoers.sh @@ -10,8 +10,8 @@ fi if [ ! -z "$major_version" -a "$major_version" -lt 12 ] then sed -i -e '/Defaults\s\+env_reset/a Defaults\texempt_group=admin' /etc/sudoers - sed -i -e 's/%admin\s*ALL=(ALL) ALL/%admin\tALL=NOPASSWD:ALL/g' /etc/sudoers + sed -i -e 's/%admin\s*ALL=(ALL) ALL/%admin\tALL=(ALL) NOPASSWD:ALL/g' /etc/sudoers else sed -i -e '/Defaults\s\+env_reset/a Defaults\texempt_group=sudo' /etc/sudoers - sed -i -e 's/%sudo\s*ALL=(ALL:ALL) ALL/%sudo\tALL=NOPASSWD:ALL/g' /etc/sudoers + sed -i -e 's/%sudo\s*ALL=(ALL:ALL) ALL/%sudo\tALL=(ALL) NOPASSWD:ALL/g' /etc/sudoers fi From 757efdd8fc9a09a83a2730e135fb01247f27d4b2 Mon Sep 17 00:00:00 2001 From: Mark Vanderwiel <vanderwl@us.ibm.com> Date: Thu, 2 Apr 2015 11:08:51 -0500 Subject: [PATCH 0310/1622] Rename centos-7.0-x86_64.json to centos-7.1-x86_64.json --- packer/centos-7.1-x86_64.json | 131 ++++++++++++++++++++++++++++++++++ packer/http/centos-7.1/ks.cfg | 80 +++++++++++++++++++++ 2 files changed, 211 insertions(+) create mode 100644 packer/centos-7.1-x86_64.json create mode 100644 packer/http/centos-7.1/ks.cfg diff --git a/packer/centos-7.1-x86_64.json b/packer/centos-7.1-x86_64.json new file mode 100644 index 000000000..d72fb6b59 --- /dev/null +++ b/packer/centos-7.1-x86_64.json @@ -0,0 +1,131 @@ +{ + "builders": [ + { + "boot_command": [ + "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/centos-7.1/ks.cfg<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "guest_os_type": "RedHat_64", + "hard_drive_interface": "sata", + "http_directory": "http", + "iso_checksum": "85bcf62462fb678adc0cec159bf8b39ab5515404bc3828c432f743a1b0b30157", + "iso_checksum_type": "sha256", + "iso_url": "{{user `mirror`}}/7.1.1503/isos/x86_64/CentOS-7-x86_64-DVD-1503-01.iso", + "output_directory": "packer-centos-7.1-x86_64-virtualbox", + "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "virtualbox-iso", + "vboxmanage": [ + [ + "modifyvm", + "{{.Name}}", + "--memory", + "480" + ], + [ + "modifyvm", + "{{.Name}}", + "--cpus", + "1" + ] + ], + "virtualbox_version_file": ".vbox_version", + "vm_name": "packer-centos-7.1-x86_64" + }, + { + "boot_command": [ + "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/centos-7.1/ks.cfg<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "guest_os_type": "centos-64", + "http_directory": "http", + "iso_checksum": "85bcf62462fb678adc0cec159bf8b39ab5515404bc3828c432f743a1b0b30157", + "iso_checksum_type": "sha256", + "iso_url": "{{user `mirror`}}/7.1.1503/isos/x86_64/CentOS-7-x86_64-DVD-1503-01.iso", + "output_directory": "packer-centos-7.1-x86_64-vmware", + "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "tools_upload_flavor": "linux", + "type": "vmware-iso", + "vm_name": "packer-centos-7.1-x86_64", + "vmx_data": { + "cpuid.coresPerSocket": "1", + "memsize": "480", + "numvcpus": "1" + } + }, + { + "boot_command": [ + "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/centos-7.1/ks.cfg<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "parallels_tools_flavor": "lin", + "guest_os_type": "centos", + "http_directory": "http", + "iso_checksum": "85bcf62462fb678adc0cec159bf8b39ab5515404bc3828c432f743a1b0b30157", + "iso_checksum_type": "sha256", + "iso_url": "{{user `mirror`}}/7.1.1503/isos/x86_64/CentOS-7-x86_64-DVD-1503-01.iso", + "output_directory": "packer-centos-7.1-x86_64-parallels", + "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "parallels-iso", + "prlctl": [ + [ + "set", + "{{.Name}}", + "--memsize", + "480" + ], + [ + "set", + "{{.Name}}", + "--cpus", + "1" + ] + ], + "prlctl_version_file": ".prlctl_version", + "vm_name": "packer-centos-7.1-x86_64" + } + ], + "post-processors": [ + { + "output": "../builds/{{.Provider}}/opscode_centos-7.1_chef-{{user `chef_version`}}.box", + "type": "vagrant" + } + ], + "provisioners": [ + { + "environment_vars": [ + "CHEF_VERSION={{user `chef_version`}}" + ], + "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E bash '{{.Path}}'", + "scripts": [ + "scripts/centos/fix-slow-dns.sh", + "scripts/common/sshd.sh", + "scripts/common/vagrant.sh", + "scripts/common/vmtools.sh", + "scripts/common/chef.sh", + "scripts/centos/cleanup.sh", + "scripts/common/minimize.sh" + ], + "type": "shell" + } + ], + "variables": { + "chef_version": "provisionerless", + "mirror": "http://mirrors.kernel.org/centos" + } +} diff --git a/packer/http/centos-7.1/ks.cfg b/packer/http/centos-7.1/ks.cfg new file mode 100644 index 000000000..c5414695f --- /dev/null +++ b/packer/http/centos-7.1/ks.cfg @@ -0,0 +1,80 @@ +install +cdrom +lang en_US.UTF-8 +keyboard us +network --bootproto=dhcp +rootpw vagrant +firewall --disabled +selinux --permissive +timezone UTC +unsupported_hardware +bootloader --location=mbr +text +skipx +zerombr +clearpart --all --initlabel +autopart +auth --enableshadow --passalgo=sha512 --kickstart +firstboot --disabled +reboot +user --name=vagrant --plaintext --password vagrant + +%packages --nobase --ignoremissing --excludedocs +# vagrant needs this to copy initial files via scp +openssh-clients +sudo +kernel-headers +kernel-devel +gcc +make +perl +wget +nfs-utils +net-tools +bzip2 +-fprintd-pam +-intltool + +# unnecessary firmware +-aic94xx-firmware +-atmel-firmware +-b43-openfwwf +-bfa-firmware +-ipw2100-firmware +-ipw2200-firmware +-ivtv-firmware +-iwl100-firmware +-iwl105-firmware +-iwl135-firmware +-iwl1000-firmware +-iwl2000-firmware +-iwl2030-firmware +-iwl3160-firmware +-iwl3945-firmware +-iwl4965-firmware +-iwl5000-firmware +-iwl5150-firmware +-iwl6000-firmware +-iwl6000g2a-firmware +-iwl6000g2b-firmware +-iwl6050-firmware +-iwl7260-firmware +-libertas-usb8388-firmware +-libertas-sd8686-firmware +-libertas-sd8787-firmware +-ql2100-firmware +-ql2200-firmware +-ql23xx-firmware +-ql2400-firmware +-ql2500-firmware +-rt61pci-firmware +-rt73usb-firmware +-xorg-x11-drv-ati-firmware +-zd1211-firmware +%end + +%post +# sudo +echo "%vagrant ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers.d/vagrant +sed -i "s/^.*requiretty/#Defaults requiretty/" /etc/sudoers +%end From f70122d720409c5fe956e4fed5a2e3c7ac0dbb9e Mon Sep 17 00:00:00 2001 From: "Julian C. Dunn" <jdunn@chef.io> Date: Sat, 4 Apr 2015 01:15:36 -0700 Subject: [PATCH 0311/1622] Remove old CentOS 7.0 --- packer/centos-7.0-x86_64.json | 132 ---------------------------------- packer/http/centos-7.0/ks.cfg | 80 --------------------- 2 files changed, 212 deletions(-) delete mode 100644 packer/centos-7.0-x86_64.json delete mode 100644 packer/http/centos-7.0/ks.cfg diff --git a/packer/centos-7.0-x86_64.json b/packer/centos-7.0-x86_64.json deleted file mode 100644 index faa8678f2..000000000 --- a/packer/centos-7.0-x86_64.json +++ /dev/null @@ -1,132 +0,0 @@ -{ - "builders": [ - { - "boot_command": [ - "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/centos-7.0/ks.cfg<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": 40960, - "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", - "guest_os_type": "RedHat_64", - "hard_drive_interface": "sata", - "http_directory": "http", - "iso_checksum": "ee505335bcd4943ffc7e6e6e55e5aaa8da09710b6ceecda82a5619342f1d24d9", - "iso_checksum_type": "sha256", - "iso_url": "{{user `mirror`}}/7.0.1406/isos/x86_64/CentOS-7.0-1406-x86_64-DVD.iso", - "output_directory": "packer-centos-7.0-x86_64-virtualbox", - "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "virtualbox-iso", - "vboxmanage": [ - [ - "modifyvm", - "{{.Name}}", - "--memory", - "480" - ], - [ - "modifyvm", - "{{.Name}}", - "--cpus", - "1" - ] - ], - "virtualbox_version_file": ".vbox_version", - "vm_name": "packer-centos-7.0-x86_64" - }, - { - "boot_command": [ - "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/centos-7.0/ks.cfg<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": 40960, - "guest_os_type": "centos-64", - "http_directory": "http", - "iso_checksum": "ee505335bcd4943ffc7e6e6e55e5aaa8da09710b6ceecda82a5619342f1d24d9", - "iso_checksum_type": "sha256", - "iso_url": "{{user `mirror`}}/7.0.1406/isos/x86_64/CentOS-7.0-1406-x86_64-DVD.iso", - "output_directory": "packer-centos-7.0-x86_64-vmware", - "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "tools_upload_flavor": "linux", - "type": "vmware-iso", - "vm_name": "packer-centos-7.0-x86_64", - "vmx_data": { - "cpuid.coresPerSocket": "1", - "memsize": "480", - "numvcpus": "1" - } - }, - { - "boot_command": [ - "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/centos-7.0/ks.cfg<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": 40960, - "parallels_tools_flavor": "lin", - "guest_os_type": "centos", - "http_directory": "http", - "iso_checksum": "ee505335bcd4943ffc7e6e6e55e5aaa8da09710b6ceecda82a5619342f1d24d9", - "iso_checksum_type": "sha256", - "iso_url": "{{user `mirror`}}/7.0.1406/isos/x86_64/CentOS-7.0-1406-x86_64-DVD.iso", - "output_directory": "packer-centos-7.0-x86_64-parallels", - "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "parallels-iso", - "prlctl": [ - [ - "set", - "{{.Name}}", - "--memsize", - "480" - ], - [ - "set", - "{{.Name}}", - "--cpus", - "1" - ] - ], - "prlctl_version_file": ".prlctl_version", - "vm_name": "packer-centos-7.0-x86_64" - } - ], - "post-processors": [ - { - "output": "../builds/{{.Provider}}/opscode_centos-7.0_chef-{{user `chef_version`}}.box", - "type": "vagrant" - } - ], - "provisioners": [ - { - "environment_vars": [ - "CHEF_VERSION={{user `chef_version`}}" - ], - "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E bash '{{.Path}}'", - "scripts": [ - "scripts/centos/fix-slow-dns.sh", - "scripts/common/sshd.sh", - "scripts/common/vagrant.sh", - "scripts/common/vmtools.sh", - "scripts/common/chef.sh", - "scripts/centos/cleanup.sh", - "scripts/common/minimize.sh" - ], - "type": "shell" - } - ], - "variables": { - "chef_version": "provisionerless", - "mirror": "http://mirrors.kernel.org/centos" - } -} - diff --git a/packer/http/centos-7.0/ks.cfg b/packer/http/centos-7.0/ks.cfg deleted file mode 100644 index c5414695f..000000000 --- a/packer/http/centos-7.0/ks.cfg +++ /dev/null @@ -1,80 +0,0 @@ -install -cdrom -lang en_US.UTF-8 -keyboard us -network --bootproto=dhcp -rootpw vagrant -firewall --disabled -selinux --permissive -timezone UTC -unsupported_hardware -bootloader --location=mbr -text -skipx -zerombr -clearpart --all --initlabel -autopart -auth --enableshadow --passalgo=sha512 --kickstart -firstboot --disabled -reboot -user --name=vagrant --plaintext --password vagrant - -%packages --nobase --ignoremissing --excludedocs -# vagrant needs this to copy initial files via scp -openssh-clients -sudo -kernel-headers -kernel-devel -gcc -make -perl -wget -nfs-utils -net-tools -bzip2 --fprintd-pam --intltool - -# unnecessary firmware --aic94xx-firmware --atmel-firmware --b43-openfwwf --bfa-firmware --ipw2100-firmware --ipw2200-firmware --ivtv-firmware --iwl100-firmware --iwl105-firmware --iwl135-firmware --iwl1000-firmware --iwl2000-firmware --iwl2030-firmware --iwl3160-firmware --iwl3945-firmware --iwl4965-firmware --iwl5000-firmware --iwl5150-firmware --iwl6000-firmware --iwl6000g2a-firmware --iwl6000g2b-firmware --iwl6050-firmware --iwl7260-firmware --libertas-usb8388-firmware --libertas-sd8686-firmware --libertas-sd8787-firmware --ql2100-firmware --ql2200-firmware --ql23xx-firmware --ql2400-firmware --ql2500-firmware --rt61pci-firmware --rt73usb-firmware --xorg-x11-drv-ati-firmware --zd1211-firmware -%end - -%post -# sudo -echo "%vagrant ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers.d/vagrant -sed -i "s/^.*requiretty/#Defaults requiretty/" /etc/sudoers -%end From 2057323a2b3e628d52352b7f86a8bd11724efa12 Mon Sep 17 00:00:00 2001 From: "Julian C. Dunn" <jdunn@chef.io> Date: Sat, 4 Apr 2015 10:43:40 -0700 Subject: [PATCH 0312/1622] Updated README with CentOS 7.1 boxes --- OLD-BOXES.md | 2 ++ README.md | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/OLD-BOXES.md b/OLD-BOXES.md index 571e73c27..f8c7c8345 100644 --- a/OLD-BOXES.md +++ b/OLD-BOXES.md @@ -14,6 +14,7 @@ Boxes for obsolete operating systems will be placed here. * [opscode-centos-6.4](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_centos-6.4_chef-provisionerless.box) * [opscode-centos-6.5-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_centos-6.5-i386_chef-provisionerless.box) * [opscode-centos-6.5](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_centos-6.5_chef-provisionerless.box) +* [opscode-centos-7.0](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_centos-7.0_chef-provisionerless.box) * [opscode-debian-7.2.0-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_debian-7.2.0-i386_chef-provisionerless.box) * [opscode-debian-7.2.0](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_debian-7.2.0_chef-provisionerless.box) * [opscode-debian-7.6-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_debian-7.6-i386_chef-provisionerless.box) @@ -41,6 +42,7 @@ Boxes for obsolete operating systems will be placed here. * [opscode-centos-6.4](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_centos-6.4_chef-provisionerless.box) * [opscode-centos-6.5-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_centos-6.5-i386_chef-provisionerless.box) * [opscode-centos-6.5](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_centos-6.5_chef-provisionerless.box) +* [opscode-centos-7.0](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_centos-7.0_chef-provisionerless.box) * [opscode-debian-7.2.0-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_debian-7.2.0-i386_chef-provisionerless.box) * [opscode-debian-7.2.0](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_debian-7.2.0_chef-provisionerless.box) * [opscode-debian-7.6-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_debian-7.6-i386_chef-provisionerless.box) diff --git a/README.md b/README.md index df2967ce0..084f83f41 100644 --- a/README.md +++ b/README.md @@ -26,7 +26,7 @@ These baseboxes were all built using a Mac OS X host running VirtualBox 4.3.16, * [opscode-centos-5.11](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_centos-5.11_chef-provisionerless.box) * [opscode-centos-6.6-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_centos-6.6-i386_chef-provisionerless.box) * [opscode-centos-6.6](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_centos-6.6_chef-provisionerless.box) -* [opscode-centos-7.0](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_centos-7.0_chef-provisionerless.box) +* [opscode-centos-7.1](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_centos-7.1_chef-provisionerless.box) * [opscode-debian-6.0.10-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_debian-6.0.10-i386_chef-provisionerless.box) * [opscode-debian-6.0.10](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_debian-6.0.10_chef-provisionerless.box) * [opscode-debian-7.8-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_debian-7.8-i386_chef-provisionerless.box) @@ -63,7 +63,7 @@ these boxes. Using `--provider vmware_fusion`, will not. * [opscode-centos-5.11](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_centos-5.11_chef-provisionerless.box) * [opscode-centos-6.6-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_centos-6.6-i386_chef-provisionerless.box) * [opscode-centos-6.6](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_centos-6.6_chef-provisionerless.box) -* [opscode-centos-7.0](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_centos-7.0_chef-provisionerless.box) +* [opscode-centos-7.1](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_centos-7.1_chef-provisionerless.box) * [opscode-debian-6.0.10-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_debian-6.0.10-i386_chef-provisionerless.box) * [opscode-debian-6.0.10](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_debian-6.0.10_chef-provisionerless.box) * [opscode-debian-7.8-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_debian-7.8-i386_chef-provisionerless.box) From 90cefd464add669b7c58e69b408d1a1ebd78df44 Mon Sep 17 00:00:00 2001 From: Scott Hain <shain@chef.io> Date: Fri, 27 Mar 2015 13:54:20 -0700 Subject: [PATCH 0313/1622] Solaris 10u11 - zfs base box Updated without build essential package --- packer/floppy/solaris10/S99startup.sh | 29 +++--- packer/floppy/solaris10/awesome_prof | 17 +++- packer/floppy/solaris10/finish.sh | 6 +- packer/scripts/solaris10/minimize.sh | 2 +- packer/scripts/solaris10/post_install.sh | 4 - packer/solaris-10.11-x86.json | 11 +-- packer/solaris-10.5-x86.json | 118 ----------------------- packer/solaris-11-x86.json | 2 +- 8 files changed, 37 insertions(+), 152 deletions(-) delete mode 100644 packer/scripts/solaris10/post_install.sh delete mode 100644 packer/solaris-10.5-x86.json diff --git a/packer/floppy/solaris10/S99startup.sh b/packer/floppy/solaris10/S99startup.sh index f0cc9f711..2dbbab37a 100644 --- a/packer/floppy/solaris10/S99startup.sh +++ b/packer/floppy/solaris10/S99startup.sh @@ -19,6 +19,8 @@ perl -pi -e 's/vagrant:UP/vagrant:VrvarmJYR3SHs/g' /etc/shadow # defaults to a locked account, unlock it passwd -u vagrant +echo "vagrant user created Installed" >> /tmp/s99log + # set up ssh mkdir /home/vagrant/.ssh /usr/sfw/bin/wget --no-check-certificate 'https://raw.githubusercontent.com/mitchellh/vagrant/master/keys/vagrant.pub' -O /home/vagrant/.ssh/authorized_keys @@ -29,27 +31,26 @@ chmod -R go-rwsx /home/vagrant/.ssh echo GSSAPIAuthentication no >> /etc/ssh/sshd_config echo LookupClientHostnames no >> /etc/ssh/sshd_config -# install pkgutil because yay -/usr/sfw/bin/wget --no-check-certificate 'http://get.opencsw.org/now' -O /tmp/pkgutil.pkg +echo "SSH Installed" >> /tmp/s99log + +# install omnibus-build-essential package +cd /tmp echo "mail=\ninstance=overwrite\npartial=nocheck\nrunlevel=nocheck\nidepend=nocheck\nrdepend=nocheck\nspace=nocheck\nsetuid=nocheck\nconflict=nocheck\naction=nocheck\nbasedir=default" > /tmp/noask -pkgadd -a /tmp/noask -d /tmp/pkgutil.pkg all -rm -f /tmp/pkgutil.pkg # install sudo so that packer functions correctly -/opt/csw/bin/pkgutil -U -/opt/csw/bin/pkgutil -y -i sudo -echo "vagrant ALL=(ALL) NOPASSWD: ALL" >> /etc/opt/csw/sudoers -echo "Defaults secure_path=/opt/csw/bin:/usr/sfw/bin:/usr/bin:/usr/sbin:/bin:/sbin" -ln -s /opt/csw/bin/sudo /usr/bin/sudo +# NOTE - LOOK HERE FIRST IF THE URL CHANGES! +/usr/sfw/bin/wget http://www.sudo.ws/sudo/dist/packages/Solaris/10/TCMsudo-1.8.13-i386.pkg.gz +gunzip TCMsudo-1.8.13-i386.pkg.gz +pkgadd -a /tmp/noask -d TCMsudo-1.8.13-i386.pkg all +echo "vagrant ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers +echo "Defaults secure_path=/usr/local/bin:/usr/sfw/bin:/usr/ccs/bin:/usr/sbin:/usr/bin:/bin:/sbin" >> /etc/sudoers -# install scp so packer can copy stuff -/opt/csw/bin/pkgutil -y -i openssh_client - -# add the /opt/csw/lib libraries to the library path the nice way -crle -u -l /lib:/usr/lib:/opt/csw/lib +echo "sudo Installed" >> /tmp/s99log # reenable ssh because we should be good to go now svcadm enable network/ssh # delete ourself! rm /etc/rc2.d/S99startup.sh + +echo "Successfully Finished" >> /tmp/s99log diff --git a/packer/floppy/solaris10/awesome_prof b/packer/floppy/solaris10/awesome_prof index 4d758ad6c..00f04c9a1 100644 --- a/packer/floppy/solaris10/awesome_prof +++ b/packer/floppy/solaris10/awesome_prof @@ -1,7 +1,6 @@ install_type initial_install system_type standalone -filesys any 5000 / -filesys any 5000 /opt +pool rpool 16g 2g 2g any cluster SUNWCrnet add package SUNWwgetr add package SUNWwgetu add @@ -11,13 +10,21 @@ package SUNWgssc add package SUNWsshdr add package SUNWsshdu add package SUNWsshcu add -package SUNWPython add +package SUNWsshr add +package SUNWsshu add package SUNWgcmn add package SUNWuiu8 add package SUNWbash add -package SUNWtoo add -# minimal support for build environment package SUNWarc add package SUNWhea add package SUNWlibm add package SUNWscpu add +package SUNWlibm +package SUNWlibmr +package SUNWlibms +package SUNWlibmsr +package SUNWggrp +package SUNWscpr +package SUNWscpu +package SUNWgcc +package SUNWgccruntime diff --git a/packer/floppy/solaris10/finish.sh b/packer/floppy/solaris10/finish.sh index e907eb9a5..9c3a60fad 100644 --- a/packer/floppy/solaris10/finish.sh +++ b/packer/floppy/solaris10/finish.sh @@ -25,8 +25,8 @@ echo " PS1='\$ '" >> /a/etc/profile echo " fi" >> /a/etc/profile echo " fi" >> /a/etc/profile echo "fi" >> /a/etc/profile -echo "PATH=/opt/csw/bin:/usr/local/bin:/usr/sfw/bin:/usr/sbin:/usr/bin:\$PATH" >> /a/etc/profile +echo "PATH=/usr/local/bin:/usr/sfw/bin:/usr/ccs/bin:/usr/sbin:/usr/bin:\$PATH" >> /a/etc/profile echo "export PATH" >> /a/etc/profile -echo "PATH=/opt/csw/bin:/usr/local/bin:/usr/sfw/bin:/usr/sbin:/usr/bin" >> /a/etc/default/login -echo "SUPATH=/opt/csw/bin:/usr/local/bin:/usr/sfw/bin:/usr/sbin:/usr/bin" >> /a/etc/default/login +echo "PATH=/usr/local/bin:/usr/sfw/bin:/usr/ccs/bin:/usr/sbin:/usr/bin" >> /a/etc/default/login +echo "SUPATH=/usr/local/bin:/usr/sfw/bin:/usr/ccs/bin:/usr/sbin:/usr/bin" >> /a/etc/default/login diff --git a/packer/scripts/solaris10/minimize.sh b/packer/scripts/solaris10/minimize.sh index 5c0f7d394..a64193ce5 100644 --- a/packer/scripts/solaris10/minimize.sh +++ b/packer/scripts/solaris10/minimize.sh @@ -1,6 +1,6 @@ #!/bin/sh -ux -dd if=/dev/zero of=/EMPTY bs=344064 +dd if=/dev/zero of=/EMPTY bs=262144 rm -f /EMPTY # Block until the empty file has been removed, otherwise, Packer # will try to kill the box while the disk is still full and that's bad diff --git a/packer/scripts/solaris10/post_install.sh b/packer/scripts/solaris10/post_install.sh deleted file mode 100644 index 09f0c8139..000000000 --- a/packer/scripts/solaris10/post_install.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash -eux - -# we're going to need gtar since solaris default tar is less than full featured -pkgutil -y -i gtar diff --git a/packer/solaris-10.11-x86.json b/packer/solaris-10.11-x86.json index c0c024f5d..f105d9d20 100644 --- a/packer/solaris-10.11-x86.json +++ b/packer/solaris-10.11-x86.json @@ -8,9 +8,8 @@ "provisioners": [ { "type": "shell", - "execute_command": "/opt/csw/bin/sudo {{.Path}}", + "execute_command": "/usr/local/bin/sudo {{.Path}}", "scripts": [ - "scripts/solaris10/post_install.sh", "scripts/solaris10/vmtools.sh", "scripts/solaris10/minimize.sh" ] @@ -36,7 +35,7 @@ "floppy/solaris10/finish.sh" ], "boot_wait": "5s", - "disk_size": 15360, + "disk_size": 20000, "guest_os_type": "Solaris_64", "http_directory": "http/solaris-10", "iso_checksum": "aae1452bb3d56baa3dcb8866ce7e4a08", @@ -46,7 +45,7 @@ "ssh_password": "vagrant", "ssh_port": 22, "ssh_wait_timeout": "50000s", - "shutdown_command": "/opt/csw/bin/sudo /usr/sbin/init 5", + "shutdown_command": "/usr/local/bin/sudo /usr/sbin/init 5", "shutdown_timeout": "10m", "guest_additions_mode": "upload", "virtualbox_version_file": ".vbox_version", @@ -86,7 +85,7 @@ "floppy/solaris10/finish.sh" ], "boot_wait": "5s", - "disk_size": 15360, + "disk_size": 20000, "guest_os_type": "solaris10-64", "http_directory": "http/solaris-10", "iso_checksum": "aae1452bb3d56baa3dcb8866ce7e4a08", @@ -96,7 +95,7 @@ "ssh_password": "vagrant", "ssh_port": 22, "ssh_wait_timeout": "50000s", - "shutdown_command": "/opt/csw/bin/sudo /usr/sbin/init 5", + "shutdown_command": "/usr/local/bin/sudo /usr/sbin/init 5", "shutdown_timeout": "10m", "vm_name": "packer-solaris-10u11-x86_64", "output_directory": "packer-solaris-10u11-x86_64-vmware", diff --git a/packer/solaris-10.5-x86.json b/packer/solaris-10.5-x86.json deleted file mode 100644 index 6aaace6fb..000000000 --- a/packer/solaris-10.5-x86.json +++ /dev/null @@ -1,118 +0,0 @@ -{ - "variables": { - "README": "You must download the automated installer iso from the following page, and then place it somewhere that packer can fetch it", - "DOWNLOAD_SITE": "http://www.oracle.com/technetwork/server-storage/solaris10/downloads/index.html", - "mirror": "./packer_cache", - "chef_version": "provisionerless" - }, - "provisioners": [ - { - "type": "shell", - "execute_command": "/opt/csw/bin/sudo {{.Path}}", - "scripts": [ - "scripts/solaris10/post_install.sh", - "scripts/solaris10/vmtools.sh", - "scripts/solaris10/minimize.sh" - ] - } - ], - "builders": [ - { - "type": "virtualbox-iso", - "boot_command": [ - "e", - "e", - "<left><left><left><left><left><left><left><left><left><left>", - "<left><left><left><left><left><left><left><left><left><left>", - "<left><left><left>", - " - install<enter>", - "b" - ], - "floppy_files": [ - "floppy/solaris10/sysidcfg", - "floppy/solaris10/awesome_prof", - "floppy/solaris10/rules.ok", - "floppy/solaris10/S99startup.sh", - "floppy/solaris10/finish.sh" - ], - "boot_wait": "5s", - "disk_size": 15360, - "guest_os_type": "Solaris_64", - "http_directory": "http/solaris-10", - "iso_checksum": "c810e1bc5dc96c93004a98665c2f5834", - "iso_checksum_type": "md5", - "iso_url": "{{user `mirror`}}/sol-10-u5-ga-x86-dvd.iso", - "ssh_username": "vagrant", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_wait_timeout": "50000s", - "shutdown_command": "/opt/csw/bin/sudo /usr/sbin/init 5", - "shutdown_timeout": "10m", - "guest_additions_mode": "upload", - "virtualbox_version_file": ".vbox_version", - "vm_name": "packer-solaris-10u5-x86_64", - "output_directory": "packer-solaris-10u5-x86_64-virtualbox", - "vboxmanage": [ - [ - "modifyvm", - "{{.Name}}", - "--memory", - "1536" - ], - [ - "modifyvm", - "{{.Name}}", - "--cpus", - "1" - ] - ] - }, - { - "type": "vmware-iso", - "boot_command": [ - "e", - "e", - "<left><left><left><left><left><left><left><left><left><left>", - "<left><left><left><left><left><left><left><left><left><left>", - "<left><left><left>", - " - install<enter>", - "b" - ], - "floppy_files": [ - "floppy/solaris10/sysidcfg", - "floppy/solaris10/awesome_prof", - "floppy/solaris10/rules.ok", - "floppy/solaris10/S99startup.sh", - "floppy/solaris10/finish.sh" - ], - "boot_wait": "5s", - "disk_size": 15360, - "guest_os_type": "solaris10-64", - "http_directory": "http/solaris-10", - "iso_checksum": "c810e1bc5dc96c93004a98665c2f5834", - "iso_checksum_type": "md5", - "iso_url": "{{user `mirror`}}/sol-10-u5-ga-x86-dvd.iso", - "ssh_username": "vagrant", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_wait_timeout": "50000s", - "shutdown_command": "/opt/csw/bin/sudo /usr/sbin/init 5", - "shutdown_timeout": "10m", - "vm_name": "packer-solaris-10u5-x86_64", - "output_directory": "packer-solaris-10u5-x86_64-vmware", - "tools_upload_flavor": "solaris", - "tools_upload_path": "/home/vagrant/solaris.iso", - "vmx_data": { - "cpuid.coresPerSocket": "1", - "memsize": "1536", - "numvcpus": "1" - } - } - ], - "post-processors": [ - { - "output": "../builds/{{.Provider}}/solaris-10.5-x86-{{user `chef_version`}}.box", - "type": "vagrant" - } - ] -} diff --git a/packer/solaris-11-x86.json b/packer/solaris-11-x86.json index b4b572a44..2f4807831 100644 --- a/packer/solaris-11-x86.json +++ b/packer/solaris-11-x86.json @@ -2,7 +2,7 @@ "variables": { "README": "You must download the automated installer iso from the following page, and then place it somewhere that packer can fetch it", "DOWNLOAD_SITE": "http://www.oracle.com/technetwork/server-storage/solaris11/downloads/index.html", - "mirror": "http://myserver OR ./packer_cache", + "mirror": "./packer_cache", "chef_version": "provisionerless" }, "provisioners": [ From c541f4c8242dbddb6a84ad190676e44d4d77b52c Mon Sep 17 00:00:00 2001 From: Scott Hain <shain@chef.io> Date: Wed, 8 Apr 2015 11:13:40 -0700 Subject: [PATCH 0314/1622] Added appropriate libraries to allow VMWare fusion --- packer/floppy/solaris10/S99startup.sh | 2 +- packer/floppy/solaris10/awesome_prof | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/packer/floppy/solaris10/S99startup.sh b/packer/floppy/solaris10/S99startup.sh index 2dbbab37a..e27326803 100644 --- a/packer/floppy/solaris10/S99startup.sh +++ b/packer/floppy/solaris10/S99startup.sh @@ -19,7 +19,7 @@ perl -pi -e 's/vagrant:UP/vagrant:VrvarmJYR3SHs/g' /etc/shadow # defaults to a locked account, unlock it passwd -u vagrant -echo "vagrant user created Installed" >> /tmp/s99log +echo "vagrant user created" >> /tmp/s99log # set up ssh mkdir /home/vagrant/.ssh diff --git a/packer/floppy/solaris10/awesome_prof b/packer/floppy/solaris10/awesome_prof index 00f04c9a1..9b0ac608b 100644 --- a/packer/floppy/solaris10/awesome_prof +++ b/packer/floppy/solaris10/awesome_prof @@ -28,3 +28,6 @@ package SUNWscpr package SUNWscpu package SUNWgcc package SUNWgccruntime +package SUNWgtar +package SUNWtoo +package SUNWgmake From 7e2858dacc3b30580f6aa255095dfba63c38f49e Mon Sep 17 00:00:00 2001 From: Lopaka Delp <lopaka@rightscale.com> Date: Thu, 9 Apr 2015 16:00:55 -0700 Subject: [PATCH 0315/1622] Add RHEL 7.1 JSON file. --- packer/rhel-7.1-x86_64.json | 133 ++++++++++++++++++++++++++++++++++++ 1 file changed, 133 insertions(+) create mode 100644 packer/rhel-7.1-x86_64.json diff --git a/packer/rhel-7.1-x86_64.json b/packer/rhel-7.1-x86_64.json new file mode 100644 index 000000000..78866ffd0 --- /dev/null +++ b/packer/rhel-7.1-x86_64.json @@ -0,0 +1,133 @@ +{ + "builders": [ + { + "boot_command": [ + "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/centos-7.1/ks.cfg<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "guest_os_type": "RedHat_64", + "hard_drive_interface": "sata", + "http_directory": "http", + "iso_checksum": "3685468ec6cdcb70dfc85ebbc164da427dc2d762644c3c2ee1520f4f661c15ce", + "iso_checksum_type": "sha256", + "iso_url": "{{user `mirror`}}/rhel-server-7.1-x86_64-dvd.iso", + "output_directory": "packer-rhel-7.1-x86_64-virtualbox", + "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "virtualbox-iso", + "vboxmanage": [ + [ + "modifyvm", + "{{.Name}}", + "--memory", + "480" + ], + [ + "modifyvm", + "{{.Name}}", + "--cpus", + "1" + ] + ], + "virtualbox_version_file": ".vbox_version", + "vm_name": "packer-rhel-7.1-x86_64" + }, + { + "boot_command": [ + "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/centos-7.1/ks.cfg<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "guest_os_type": "rhel7-64", + "http_directory": "http", + "iso_checksum": "3685468ec6cdcb70dfc85ebbc164da427dc2d762644c3c2ee1520f4f661c15ce", + "iso_checksum_type": "sha256", + "iso_url": "{{user `mirror`}}/rhel-server-7.1-x86_64-dvd.iso", + "output_directory": "packer-rhel-7.1-x86_64-vmware", + "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "tools_upload_flavor": "linux", + "type": "vmware-iso", + "vm_name": "packer-rhel-7.1-x86_64", + "vmx_data": { + "cpuid.coresPerSocket": "1", + "memsize": "480", + "numvcpus": "1" + } + }, + { + "boot_command": [ + "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/centos-7.1/ks.cfg<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "parallels_tools_flavor": "lin", + "guest_os_type": "rhel", + "http_directory": "http", + "iso_checksum": "3685468ec6cdcb70dfc85ebbc164da427dc2d762644c3c2ee1520f4f661c15ce", + "iso_checksum_type": "sha256", + "iso_url": "{{user `mirror`}}/rhel-server-7.1-x86_64-dvd.iso", + "output_directory": "packer-rhel-7.1-x86_64-parallels", + "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "parallels-iso", + "prlctl": [ + [ + "set", + "{{.Name}}", + "--memsize", + "480" + ], + [ + "set", + "{{.Name}}", + "--cpus", + "1" + ] + ], + "prlctl_version_file": ".prlctl_version", + "vm_name": "packer-rhel-7.1-x86_64" + } + + ], + "post-processors": [ + { + "output": "../builds/{{.Provider}}/opscode_rhel-7.1_chef-{{user `chef_version`}}.box", + "type": "vagrant" + } + ], + "provisioners": [ + { + "environment_vars": [ + "CHEF_VERSION={{user `chef_version`}}" + ], + "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E bash '{{.Path}}'", + "scripts": [ + "scripts/centos/fix-slow-dns.sh", + "scripts/common/sshd.sh", + "scripts/common/vagrant.sh", + "scripts/common/vmtools.sh", + "scripts/common/chef.sh", + "scripts/centos/cleanup.sh", + "scripts/common/minimize.sh" + ], + "type": "shell" + } + ], + "variables": { + "chef_version": "provisionerless", + "mirror": "http://put-your-mirror-here/" + } +} + From bd287e989a53e16bffddccf24c11a55208232290 Mon Sep 17 00:00:00 2001 From: "Julian C. Dunn" <jdunn@chef.io> Date: Thu, 9 Apr 2015 20:11:40 -0400 Subject: [PATCH 0316/1622] Remove RHEL 7.0 definition --- packer/rhel-7.0-x86_64.json | 133 ------------------------------------ 1 file changed, 133 deletions(-) delete mode 100644 packer/rhel-7.0-x86_64.json diff --git a/packer/rhel-7.0-x86_64.json b/packer/rhel-7.0-x86_64.json deleted file mode 100644 index 58331e7d6..000000000 --- a/packer/rhel-7.0-x86_64.json +++ /dev/null @@ -1,133 +0,0 @@ -{ - "builders": [ - { - "boot_command": [ - "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/centos-7.0/ks.cfg<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": 40960, - "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", - "guest_os_type": "RedHat_64", - "hard_drive_interface": "sata", - "http_directory": "http", - "iso_checksum": "85a9fedc2bf0fc825cc7817056aa00b3ea87d7e111e0cf8de77d3ba643f8646c", - "iso_checksum_type": "sha256", - "iso_url": "{{user `mirror`}}/rhel-server-7.0-x86_64-dvd.iso", - "output_directory": "packer-rhel-7.0-x86_64-virtualbox", - "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "virtualbox-iso", - "vboxmanage": [ - [ - "modifyvm", - "{{.Name}}", - "--memory", - "480" - ], - [ - "modifyvm", - "{{.Name}}", - "--cpus", - "1" - ] - ], - "virtualbox_version_file": ".vbox_version", - "vm_name": "packer-rhel-7.0-x86_64" - }, - { - "boot_command": [ - "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/centos-7.0/ks.cfg<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": 40960, - "guest_os_type": "rhel7-64", - "http_directory": "http", - "iso_checksum": "85a9fedc2bf0fc825cc7817056aa00b3ea87d7e111e0cf8de77d3ba643f8646c", - "iso_checksum_type": "sha256", - "iso_url": "{{user `mirror`}}/rhel-server-7.0-x86_64-dvd.iso", - "output_directory": "packer-rhel-7.0-x86_64-vmware", - "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "tools_upload_flavor": "linux", - "type": "vmware-iso", - "vm_name": "packer-rhel-7.0-x86_64", - "vmx_data": { - "cpuid.coresPerSocket": "1", - "memsize": "480", - "numvcpus": "1" - } - }, - { - "boot_command": [ - "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/centos-7.0/ks.cfg<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": 40960, - "parallels_tools_flavor": "lin", - "guest_os_type": "rhel", - "http_directory": "http", - "iso_checksum": "85a9fedc2bf0fc825cc7817056aa00b3ea87d7e111e0cf8de77d3ba643f8646c", - "iso_checksum_type": "sha256", - "iso_url": "{{user `mirror`}}/rhel-server-7.0-x86_64-dvd.iso", - "output_directory": "packer-rhel-7.0-x86_64-parallels", - "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "parallels-iso", - "prlctl": [ - [ - "set", - "{{.Name}}", - "--memsize", - "480" - ], - [ - "set", - "{{.Name}}", - "--cpus", - "1" - ] - ], - "prlctl_version_file": ".prlctl_version", - "vm_name": "packer-rhel-7.0-x86_64" - } - - ], - "post-processors": [ - { - "output": "../builds/{{.Provider}}/opscode_rhel-7.0_chef-{{user `chef_version`}}.box", - "type": "vagrant" - } - ], - "provisioners": [ - { - "environment_vars": [ - "CHEF_VERSION={{user `chef_version`}}" - ], - "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E bash '{{.Path}}'", - "scripts": [ - "scripts/centos/fix-slow-dns.sh", - "scripts/common/sshd.sh", - "scripts/common/vagrant.sh", - "scripts/common/vmtools.sh", - "scripts/common/chef.sh", - "scripts/centos/cleanup.sh", - "scripts/common/minimize.sh" - ], - "type": "shell" - } - ], - "variables": { - "chef_version": "provisionerless", - "mirror": "http://put-your-mirror-here/" - } -} - From fd4c88a1352893b349155dff64abec70fc2eb68d Mon Sep 17 00:00:00 2001 From: Fletcher Nichol <fnichol@nichol.ca> Date: Fri, 24 Apr 2015 16:40:50 -0600 Subject: [PATCH 0317/1622] Add MAINTAINERS.md file. --- MAINTAINERS.md | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 MAINTAINERS.md diff --git a/MAINTAINERS.md b/MAINTAINERS.md new file mode 100644 index 000000000..58bf928b6 --- /dev/null +++ b/MAINTAINERS.md @@ -0,0 +1,23 @@ +# Maintainers + +This file lists how the Bento project is maintained. When making changes to the system, this file tells you who needs to review your patch - you need a simple majority of maintainers for the relevant subsystems to provide a :+1: on your pull request. Additionally, you need to not receive a veto from a Lieutenant or the Project Lead. + +Check out [How Chef is Maintained](https://github.com/opscode/chef-rfc/blob/master/rfc030-maintenance-policy.md#how-the-project-is-maintained) for details on the process, how to become a maintainer, lieutenant, or the project lead. + +# Project Lead + +[Fletcher Nichol](http://github.com/fnichol) + +# Components + +## Core Components + +Covers the Bento project repository which is responsible for building Vagrant boxes using Packer templates. + +### Lieutenants + +* [Seth Chisamore](https://github.com/schisamo) + +### Maintainers + +* [Yvonne Lam](http://github.com/yzl) From 39b06bec0b72ae06b7864733ce35513fd0cf1006 Mon Sep 17 00:00:00 2001 From: OBrienCommaJosh <jobrien@getchef.com> Date: Wed, 13 May 2015 16:28:45 -0700 Subject: [PATCH 0318/1622] update README to point to Boxcutter intead of basebox --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 084f83f41..ab6752b05 100644 --- a/README.md +++ b/README.md @@ -136,7 +136,7 @@ boxes yourself due to licensing constraints. You can build these as follows: These veewee definitions are lightly maintained. For other approaches to building Windows boxes, please see the following community projects: -* [Mischa Taylor's basebox project](https://github.com/misheska/basebox-packer/) +* [Mischa Taylor's Boxcutter project](https://github.com/boxcutter) * [Vagrant Windows Boxes and Puppet](https://github.com/ferventcoder/vagrant-windows-puppet/tree/master/baseboxes) ### Special Note About Building from Windows Hosts From ce4cf236082b18e45c3f0229f0d505867fd76478 Mon Sep 17 00:00:00 2001 From: Fletcher Nichol <fnichol@nichol.ca> Date: Tue, 19 May 2015 16:52:57 -0600 Subject: [PATCH 0319/1622] Remove VeeWee definitions from project. The remaining VeeWee definitions were exclusively Windows based but were also suffering from age. The current state of Packer may allow for WinRM-based templates for Windows in the near future but in the meantime removing VeeWee simplifies this project's dependencies. --- .gitignore | 1 + ...os-5.11-i386.json => centos-5.11-i386.json | 2 +- ....11-x86_64.json => centos-5.11-x86_64.json | 2 +- ...ntos-6.6-i386.json => centos-6.6-i386.json | 2 +- ...-6.6-x86_64.json => centos-6.6-x86_64.json | 2 +- ...-7.1-x86_64.json => centos-7.1-x86_64.json | 2 +- ....10-amd64.json => debian-6.0.10-amd64.json | 2 +- ....0.10-i386.json => debian-6.0.10-i386.json | 2 +- ...an-7.8-amd64.json => debian-7.8-amd64.json | 2 +- ...bian-7.8-i386.json => debian-7.8-i386.json | 2 +- definitions/.common/minimize.sh | 4 - definitions/.common/session.rb | 26 -- definitions/.common/sshd.sh | 3 - definitions/.common/vagrant.sh | 33 --- definitions/.gitignore | 0 definitions/.windows/session.rb | 21 -- .../windows-2008r2-standard/Autounattend.xml | 230 ----------------- definitions/windows-2008r2-standard/README.md | 87 ------- .../windows-2008r2-standard/definition.rb | 18 -- .../windows-2008r2-standard/install-chef.bat | 1 - .../windows-2008r2-standard/install-vbox.bat | 1 - .../mount-validation.bat | 1 - .../windows-2008r2-standard/oracle-cert.cer | 1 - .../windows-2012-standard/Autounattend.xml | 163 ------------ definitions/windows-2012-standard/README.md | 58 ----- .../windows-2012-standard/definition.rb | 21 -- .../windows-2012-standard/install-chef.bat | 1 - .../windows-2012-standard/install-vbox.bat | 1 - .../mount-validation.bat | 1 - .../windows-2012-standard/oracle-cert.cer | 1 - .../windows-2012r2-standard/Autounattend.xml | 164 ------------ definitions/windows-2012r2-standard/README.md | 58 ----- .../windows-2012r2-standard/definition.rb | 20 -- .../windows-2012r2-standard/install-chef.bat | 47 ---- .../windows-2012r2-standard/install-vbox.bat | 4 - .../mount-validation.bat | 3 - .../windows-2012r2-standard/oracle-cert.cer | Bin 1398 -> 0 bytes .../windows-7-enterprise/Autounattend.xml | 233 ----------------- definitions/windows-7-enterprise/README.md | 52 ---- .../windows-7-enterprise/definition.rb | 15 -- .../windows-7-enterprise/install-chef.bat | 1 - .../windows-7-enterprise/install-vbox.bat | 1 - .../windows-7-enterprise/mount-validation.bat | 1 - .../windows-7-enterprise/oracle-cert.cer | 1 - .../windows-8-enterprise/Autounattend.xml | 235 ------------------ definitions/windows-8-enterprise/README.md | 87 ------- .../windows-8-enterprise/definition.rb | 17 -- .../windows-8-enterprise/install-chef.bat | 1 - .../windows-8-enterprise/install-vbox.bat | 1 - .../windows-8-enterprise/mount-validation.bat | 1 - .../windows-8-enterprise/oracle-cert.cer | 1 - ...fedora-20-i386.json => fedora-20-i386.json | 2 +- ...ra-20-x86_64.json => fedora-20-x86_64.json | 2 +- ...fedora-21-i386.json => fedora-21-i386.json | 2 +- ...ra-21-x86_64.json => fedora-21-x86_64.json | 2 +- {packer/floppy => floppy}/omnios/README.TXT | 0 .../floppy => floppy}/solaris10/S99startup.sh | 0 .../floppy => floppy}/solaris10/awesome_prof | 0 {packer/floppy => floppy}/solaris10/finish.sh | 0 {packer/floppy => floppy}/solaris10/rules.ok | 0 {packer/floppy => floppy}/solaris10/sysidcfg | 0 ...10.1-amd64.json => freebsd-10.1-amd64.json | 2 +- ...d-10.1-i386.json => freebsd-10.1-i386.json | 2 +- ...d-9.3-amd64.json => freebsd-9.3-amd64.json | 2 +- ...bsd-9.3-i386.json => freebsd-9.3-i386.json | 2 +- {packer/http => http}/centos-5.11/ks.cfg | 0 {packer/http => http}/centos-6.6/ks.cfg | 0 {packer/http => http}/centos-7.1/ks.cfg | 0 {packer/http => http}/debian-6.0/preseed.cfg | 0 {packer/http => http}/debian-7/preseed.cfg | 0 {packer/http => http}/fedora-20/ks.cfg | 0 {packer/http => http}/fedora-21/ks.cfg | 0 {packer/http => http}/freebsd-10.1/install.sh | 0 {packer/http => http}/freebsd-9.3/install.sh | 0 .../http => http}/opensuse-13.2/autoinst.xml | 0 .../sles-11/sles-11-sp2-i386-autoinst.xml | 0 .../sles-11/sles-11-sp2-x86_64-autoinst.xml | 0 .../sles-11/sles-11-sp3-i386-autoinst.xml | 0 .../sles-11/sles-11-sp3-x86_64-autoinst.xml | 0 .../sles-12/sles-12-x86_64-autoinst.xml | 0 {packer/http => http}/solaris-11/default.xml | 0 {packer/http => http}/solaris-11/profile.xml | 0 .../http => http}/ubuntu-10.04/preseed.cfg | 0 .../http => http}/ubuntu-12.04/preseed.cfg | 0 .../http => http}/ubuntu-14.04/preseed.cfg | 0 .../http => http}/ubuntu-14.10/preseed.cfg | 0 packer/macosx-10.7.json => macosx-10.7.json | 2 +- packer/macosx-10.8.json => macosx-10.8.json | 2 +- packer/macosx-10.9.json => macosx-10.9.json | 2 +- ...nios-r151010j.json => omnios-r151010j.json | 2 +- ...-13.2-i386.json => opensuse-13.2-i386.json | 2 +- ...2-x86_64.json => opensuse-13.2-x86_64.json | 2 +- ...le-5.11-i386.json => oracle-5.11-i386.json | 2 +- ....11-x86_64.json => oracle-5.11-x86_64.json | 2 +- ...acle-6.6-i386.json => oracle-6.6-i386.json | 2 +- ...-6.6-x86_64.json => oracle-6.6-x86_64.json | 2 +- packer/scripts/windows/install-chef.bat | 47 ---- packer/scripts/windows/install-vbox.bat | 4 - packer/scripts/windows/mount-validation.bat | 3 - packer/scripts/windows/oracle-cert.cer | Bin 1398 -> 0 bytes ...rhel-5.11-i386.json => rhel-5.11-i386.json | 2 +- ...-5.11-x86_64.json => rhel-5.11-x86_64.json | 2 +- .../rhel-6.6-i386.json => rhel-6.6-i386.json | 2 +- ...el-6.6-x86_64.json => rhel-6.6-x86_64.json | 2 +- ...el-7.1-x86_64.json => rhel-7.1-x86_64.json | 2 +- {packer/scripts => scripts}/centos/cleanup.sh | 0 .../centos/fix-slow-dns.sh | 0 {packer/scripts => scripts}/common/chef.sh | 0 .../scripts => scripts}/common/minimize.sh | 0 .../scripts => scripts}/common/shutdown.sh | 0 {packer/scripts => scripts}/common/sshd.sh | 0 {packer/scripts => scripts}/common/sudoers.sh | 0 {packer/scripts => scripts}/common/vagrant.sh | 0 {packer/scripts => scripts}/common/vmtools.sh | 0 {packer/scripts => scripts}/debian/cleanup.sh | 0 .../scripts => scripts}/debian/networking.sh | 0 .../scripts => scripts}/debian/preseed.cfg | 0 {packer/scripts => scripts}/debian/sudoers.sh | 0 {packer/scripts => scripts}/debian/update.sh | 0 {packer/scripts => scripts}/fedora/cleanup.sh | 0 .../fedora/fix-slow-dns.sh | 0 .../scripts => scripts}/fedora/shutdown.sh | 0 {packer/scripts => scripts}/fedora/sudoers.sh | 0 .../scripts => scripts}/freebsd/cleanup.sh | 0 .../scripts => scripts}/freebsd/minimize.sh | 0 .../freebsd/postinstall.sh | 0 .../scripts => scripts}/freebsd/vmtools.sh | 0 {packer/scripts => scripts}/macosx/builder.sh | 0 {packer/scripts => scripts}/macosx/cleanup.sh | 0 .../scripts => scripts}/macosx/hostname.sh | 0 .../macosx/support/kcpassword | 0 {packer/scripts => scripts}/macosx/update.sh | 0 {packer/scripts => scripts}/macosx/vagrant.sh | 0 .../scripts => scripts}/omnios/postinstall.sh | 0 {packer/scripts => scripts}/omnios/vmtools.sh | 0 .../scripts => scripts}/opensuse/cleanup.sh | 0 .../opensuse/remove-dvd-source.sh | 0 .../scripts => scripts}/opensuse/sudoers.sh | 0 .../opensuse/zypper-locks.sh | 0 {packer/scripts => scripts}/sles/cleanup.sh | 0 .../sles/remove-dvd-source.sh | 0 {packer/scripts => scripts}/sles/sudoers.sh | 0 .../sles/unsupported-modules.sh | 0 .../scripts => scripts}/sles/zypper-locks.sh | 0 .../scripts => scripts}/solaris/minimize.sh | 0 {packer/scripts => scripts}/solaris/update.sh | 0 .../scripts => scripts}/solaris/vmtools.sh | 0 .../scripts => scripts}/solaris10/minimize.sh | 0 .../scripts => scripts}/solaris10/vmtools.sh | 0 {packer/scripts => scripts}/ubuntu/cleanup.sh | 0 .../scripts => scripts}/ubuntu/networking.sh | 0 .../scripts => scripts}/ubuntu/preseed.cfg | 0 {packer/scripts => scripts}/ubuntu/sudoers.sh | 0 {packer/scripts => scripts}/ubuntu/update.sh | 0 .../windows}/install-chef.bat | 0 .../windows}/install-vbox.bat | 0 .../windows}/mount-validation.bat | 0 .../windows}/oracle-cert.cer | Bin ...-11-sp2-i386.json => sles-11-sp2-i386.json | 2 +- ...sp2-x86_64.json => sles-11-sp2-x86_64.json | 2 +- ...-11-sp3-i386.json => sles-11-sp3-i386.json | 2 +- ...sp3-x86_64.json => sles-11-sp3-x86_64.json | 2 +- ...sles-12-x86_64.json => sles-12-x86_64.json | 2 +- ...s-10.11-x86.json => solaris-10.11-x86.json | 2 +- ...solaris-11-x86.json => solaris-11-x86.json | 2 +- ...0.04-amd64.json => ubuntu-10.04-amd64.json | 2 +- ...-10.04-i386.json => ubuntu-10.04-i386.json | 2 +- ...2.04-amd64.json => ubuntu-12.04-amd64.json | 2 +- ...-12.04-i386.json => ubuntu-12.04-i386.json | 2 +- ...4.04-amd64.json => ubuntu-14.04-amd64.json | 2 +- ...-14.04-i386.json => ubuntu-14.04-i386.json | 2 +- ...4.10-amd64.json => ubuntu-14.10-amd64.json | 2 +- ...-14.10-i386.json => ubuntu-14.10-i386.json | 2 +- .../macosx.rb | 0 .../parallels/freebsd.rb | 0 .../parallels/omnios.rb | 0 176 files changed, 48 insertions(+), 1716 deletions(-) rename packer/centos-5.11-i386.json => centos-5.11-i386.json (97%) rename packer/centos-5.11-x86_64.json => centos-5.11-x86_64.json (97%) rename packer/centos-6.6-i386.json => centos-6.6-i386.json (97%) rename packer/centos-6.6-x86_64.json => centos-6.6-x86_64.json (97%) rename packer/centos-7.1-x86_64.json => centos-7.1-x86_64.json (97%) rename packer/debian-6.0.10-amd64.json => debian-6.0.10-amd64.json (98%) rename packer/debian-6.0.10-i386.json => debian-6.0.10-i386.json (98%) rename packer/debian-7.8-amd64.json => debian-7.8-amd64.json (98%) rename packer/debian-7.8-i386.json => debian-7.8-i386.json (98%) delete mode 100644 definitions/.common/minimize.sh delete mode 100644 definitions/.common/session.rb delete mode 100644 definitions/.common/sshd.sh delete mode 100644 definitions/.common/vagrant.sh delete mode 100644 definitions/.gitignore delete mode 100644 definitions/.windows/session.rb delete mode 100644 definitions/windows-2008r2-standard/Autounattend.xml delete mode 100644 definitions/windows-2008r2-standard/README.md delete mode 100644 definitions/windows-2008r2-standard/definition.rb delete mode 120000 definitions/windows-2008r2-standard/install-chef.bat delete mode 120000 definitions/windows-2008r2-standard/install-vbox.bat delete mode 120000 definitions/windows-2008r2-standard/mount-validation.bat delete mode 120000 definitions/windows-2008r2-standard/oracle-cert.cer delete mode 100644 definitions/windows-2012-standard/Autounattend.xml delete mode 100644 definitions/windows-2012-standard/README.md delete mode 100644 definitions/windows-2012-standard/definition.rb delete mode 120000 definitions/windows-2012-standard/install-chef.bat delete mode 120000 definitions/windows-2012-standard/install-vbox.bat delete mode 120000 definitions/windows-2012-standard/mount-validation.bat delete mode 120000 definitions/windows-2012-standard/oracle-cert.cer delete mode 100644 definitions/windows-2012r2-standard/Autounattend.xml delete mode 100644 definitions/windows-2012r2-standard/README.md delete mode 100644 definitions/windows-2012r2-standard/definition.rb delete mode 100644 definitions/windows-2012r2-standard/install-chef.bat delete mode 100644 definitions/windows-2012r2-standard/install-vbox.bat delete mode 100644 definitions/windows-2012r2-standard/mount-validation.bat delete mode 100644 definitions/windows-2012r2-standard/oracle-cert.cer delete mode 100644 definitions/windows-7-enterprise/Autounattend.xml delete mode 100644 definitions/windows-7-enterprise/README.md delete mode 100644 definitions/windows-7-enterprise/definition.rb delete mode 120000 definitions/windows-7-enterprise/install-chef.bat delete mode 120000 definitions/windows-7-enterprise/install-vbox.bat delete mode 120000 definitions/windows-7-enterprise/mount-validation.bat delete mode 120000 definitions/windows-7-enterprise/oracle-cert.cer delete mode 100644 definitions/windows-8-enterprise/Autounattend.xml delete mode 100644 definitions/windows-8-enterprise/README.md delete mode 100644 definitions/windows-8-enterprise/definition.rb delete mode 120000 definitions/windows-8-enterprise/install-chef.bat delete mode 120000 definitions/windows-8-enterprise/install-vbox.bat delete mode 120000 definitions/windows-8-enterprise/mount-validation.bat delete mode 120000 definitions/windows-8-enterprise/oracle-cert.cer rename packer/fedora-20-i386.json => fedora-20-i386.json (97%) rename packer/fedora-20-x86_64.json => fedora-20-x86_64.json (97%) rename packer/fedora-21-i386.json => fedora-21-i386.json (97%) rename packer/fedora-21-x86_64.json => fedora-21-x86_64.json (97%) rename {packer/floppy => floppy}/omnios/README.TXT (100%) rename {packer/floppy => floppy}/solaris10/S99startup.sh (100%) rename {packer/floppy => floppy}/solaris10/awesome_prof (100%) rename {packer/floppy => floppy}/solaris10/finish.sh (100%) rename {packer/floppy => floppy}/solaris10/rules.ok (100%) rename {packer/floppy => floppy}/solaris10/sysidcfg (100%) rename packer/freebsd-10.1-amd64.json => freebsd-10.1-amd64.json (98%) rename packer/freebsd-10.1-i386.json => freebsd-10.1-i386.json (98%) rename packer/freebsd-9.3-amd64.json => freebsd-9.3-amd64.json (98%) rename packer/freebsd-9.3-i386.json => freebsd-9.3-i386.json (98%) rename {packer/http => http}/centos-5.11/ks.cfg (100%) rename {packer/http => http}/centos-6.6/ks.cfg (100%) rename {packer/http => http}/centos-7.1/ks.cfg (100%) rename {packer/http => http}/debian-6.0/preseed.cfg (100%) rename {packer/http => http}/debian-7/preseed.cfg (100%) rename {packer/http => http}/fedora-20/ks.cfg (100%) rename {packer/http => http}/fedora-21/ks.cfg (100%) rename {packer/http => http}/freebsd-10.1/install.sh (100%) rename {packer/http => http}/freebsd-9.3/install.sh (100%) rename {packer/http => http}/opensuse-13.2/autoinst.xml (100%) rename {packer/http => http}/sles-11/sles-11-sp2-i386-autoinst.xml (100%) rename {packer/http => http}/sles-11/sles-11-sp2-x86_64-autoinst.xml (100%) rename {packer/http => http}/sles-11/sles-11-sp3-i386-autoinst.xml (100%) rename {packer/http => http}/sles-11/sles-11-sp3-x86_64-autoinst.xml (100%) rename {packer/http => http}/sles-12/sles-12-x86_64-autoinst.xml (100%) rename {packer/http => http}/solaris-11/default.xml (100%) rename {packer/http => http}/solaris-11/profile.xml (100%) rename {packer/http => http}/ubuntu-10.04/preseed.cfg (100%) rename {packer/http => http}/ubuntu-12.04/preseed.cfg (100%) rename {packer/http => http}/ubuntu-14.04/preseed.cfg (100%) rename {packer/http => http}/ubuntu-14.10/preseed.cfg (100%) rename packer/macosx-10.7.json => macosx-10.7.json (97%) rename packer/macosx-10.8.json => macosx-10.8.json (97%) rename packer/macosx-10.9.json => macosx-10.9.json (97%) rename packer/omnios-r151010j.json => omnios-r151010j.json (98%) rename packer/opensuse-13.2-i386.json => opensuse-13.2-i386.json (97%) rename packer/opensuse-13.2-x86_64.json => opensuse-13.2-x86_64.json (97%) rename packer/oracle-5.11-i386.json => oracle-5.11-i386.json (97%) rename packer/oracle-5.11-x86_64.json => oracle-5.11-x86_64.json (97%) rename packer/oracle-6.6-i386.json => oracle-6.6-i386.json (97%) rename packer/oracle-6.6-x86_64.json => oracle-6.6-x86_64.json (97%) delete mode 100644 packer/scripts/windows/install-chef.bat delete mode 100644 packer/scripts/windows/install-vbox.bat delete mode 100644 packer/scripts/windows/mount-validation.bat delete mode 100644 packer/scripts/windows/oracle-cert.cer rename packer/rhel-5.11-i386.json => rhel-5.11-i386.json (97%) rename packer/rhel-5.11-x86_64.json => rhel-5.11-x86_64.json (97%) rename packer/rhel-6.6-i386.json => rhel-6.6-i386.json (97%) rename packer/rhel-6.6-x86_64.json => rhel-6.6-x86_64.json (97%) rename packer/rhel-7.1-x86_64.json => rhel-7.1-x86_64.json (97%) rename {packer/scripts => scripts}/centos/cleanup.sh (100%) rename {packer/scripts => scripts}/centos/fix-slow-dns.sh (100%) rename {packer/scripts => scripts}/common/chef.sh (100%) rename {packer/scripts => scripts}/common/minimize.sh (100%) rename {packer/scripts => scripts}/common/shutdown.sh (100%) rename {packer/scripts => scripts}/common/sshd.sh (100%) rename {packer/scripts => scripts}/common/sudoers.sh (100%) rename {packer/scripts => scripts}/common/vagrant.sh (100%) rename {packer/scripts => scripts}/common/vmtools.sh (100%) rename {packer/scripts => scripts}/debian/cleanup.sh (100%) rename {packer/scripts => scripts}/debian/networking.sh (100%) rename {packer/scripts => scripts}/debian/preseed.cfg (100%) rename {packer/scripts => scripts}/debian/sudoers.sh (100%) rename {packer/scripts => scripts}/debian/update.sh (100%) rename {packer/scripts => scripts}/fedora/cleanup.sh (100%) rename {packer/scripts => scripts}/fedora/fix-slow-dns.sh (100%) rename {packer/scripts => scripts}/fedora/shutdown.sh (100%) rename {packer/scripts => scripts}/fedora/sudoers.sh (100%) rename {packer/scripts => scripts}/freebsd/cleanup.sh (100%) rename {packer/scripts => scripts}/freebsd/minimize.sh (100%) rename {packer/scripts => scripts}/freebsd/postinstall.sh (100%) rename {packer/scripts => scripts}/freebsd/vmtools.sh (100%) rename {packer/scripts => scripts}/macosx/builder.sh (100%) rename {packer/scripts => scripts}/macosx/cleanup.sh (100%) rename {packer/scripts => scripts}/macosx/hostname.sh (100%) rename {packer/scripts => scripts}/macosx/support/kcpassword (100%) rename {packer/scripts => scripts}/macosx/update.sh (100%) rename {packer/scripts => scripts}/macosx/vagrant.sh (100%) rename {packer/scripts => scripts}/omnios/postinstall.sh (100%) rename {packer/scripts => scripts}/omnios/vmtools.sh (100%) rename {packer/scripts => scripts}/opensuse/cleanup.sh (100%) rename {packer/scripts => scripts}/opensuse/remove-dvd-source.sh (100%) rename {packer/scripts => scripts}/opensuse/sudoers.sh (100%) rename {packer/scripts => scripts}/opensuse/zypper-locks.sh (100%) rename {packer/scripts => scripts}/sles/cleanup.sh (100%) rename {packer/scripts => scripts}/sles/remove-dvd-source.sh (100%) rename {packer/scripts => scripts}/sles/sudoers.sh (100%) rename {packer/scripts => scripts}/sles/unsupported-modules.sh (100%) rename {packer/scripts => scripts}/sles/zypper-locks.sh (100%) rename {packer/scripts => scripts}/solaris/minimize.sh (100%) rename {packer/scripts => scripts}/solaris/update.sh (100%) rename {packer/scripts => scripts}/solaris/vmtools.sh (100%) rename {packer/scripts => scripts}/solaris10/minimize.sh (100%) rename {packer/scripts => scripts}/solaris10/vmtools.sh (100%) rename {packer/scripts => scripts}/ubuntu/cleanup.sh (100%) rename {packer/scripts => scripts}/ubuntu/networking.sh (100%) rename {packer/scripts => scripts}/ubuntu/preseed.cfg (100%) rename {packer/scripts => scripts}/ubuntu/sudoers.sh (100%) rename {packer/scripts => scripts}/ubuntu/update.sh (100%) rename {definitions/.windows => scripts/windows}/install-chef.bat (100%) rename {definitions/.windows => scripts/windows}/install-vbox.bat (100%) rename {definitions/.windows => scripts/windows}/mount-validation.bat (100%) rename {definitions/.windows => scripts/windows}/oracle-cert.cer (100%) rename packer/sles-11-sp2-i386.json => sles-11-sp2-i386.json (97%) rename packer/sles-11-sp2-x86_64.json => sles-11-sp2-x86_64.json (97%) rename packer/sles-11-sp3-i386.json => sles-11-sp3-i386.json (97%) rename packer/sles-11-sp3-x86_64.json => sles-11-sp3-x86_64.json (97%) rename packer/sles-12-x86_64.json => sles-12-x86_64.json (98%) rename packer/solaris-10.11-x86.json => solaris-10.11-x86.json (97%) rename packer/solaris-11-x86.json => solaris-11-x86.json (98%) rename packer/ubuntu-10.04-amd64.json => ubuntu-10.04-amd64.json (98%) rename packer/ubuntu-10.04-i386.json => ubuntu-10.04-i386.json (98%) rename packer/ubuntu-12.04-amd64.json => ubuntu-12.04-amd64.json (98%) rename packer/ubuntu-12.04-i386.json => ubuntu-12.04-i386.json (98%) rename packer/ubuntu-14.04-amd64.json => ubuntu-14.04-amd64.json (98%) rename packer/ubuntu-14.04-i386.json => ubuntu-14.04-i386.json (98%) rename packer/ubuntu-14.10-amd64.json => ubuntu-14.10-amd64.json (98%) rename packer/ubuntu-14.10-i386.json => ubuntu-14.10-i386.json (98%) rename {packer/vagrantfile_templates => vagrantfile_templates}/macosx.rb (100%) rename {packer/vagrantfile_templates => vagrantfile_templates}/parallels/freebsd.rb (100%) rename {packer/vagrantfile_templates => vagrantfile_templates}/parallels/omnios.rb (100%) diff --git a/.gitignore b/.gitignore index 557bfda4f..82671cc5f 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ virtualfloppy.vfd packer_cache packer.log .DS_Store +/packer-*/ diff --git a/packer/centos-5.11-i386.json b/centos-5.11-i386.json similarity index 97% rename from packer/centos-5.11-i386.json rename to centos-5.11-i386.json index 806e0fd5d..d22a45b06 100644 --- a/packer/centos-5.11-i386.json +++ b/centos-5.11-i386.json @@ -103,7 +103,7 @@ ], "post-processors": [ { - "output": "../builds/{{.Provider}}/opscode_centos-5.11-i386_chef-{{user `chef_version`}}.box", + "output": "builds/{{.Provider}}/opscode_centos-5.11-i386_chef-{{user `chef_version`}}.box", "type": "vagrant" } ], diff --git a/packer/centos-5.11-x86_64.json b/centos-5.11-x86_64.json similarity index 97% rename from packer/centos-5.11-x86_64.json rename to centos-5.11-x86_64.json index 2b0b39637..74727f6d3 100644 --- a/packer/centos-5.11-x86_64.json +++ b/centos-5.11-x86_64.json @@ -104,7 +104,7 @@ ], "post-processors": [ { - "output": "../builds/{{.Provider}}/opscode_centos-5.11_chef-{{user `chef_version`}}.box", + "output": "builds/{{.Provider}}/opscode_centos-5.11_chef-{{user `chef_version`}}.box", "type": "vagrant" } ], diff --git a/packer/centos-6.6-i386.json b/centos-6.6-i386.json similarity index 97% rename from packer/centos-6.6-i386.json rename to centos-6.6-i386.json index d3cb03744..40b15051f 100644 --- a/packer/centos-6.6-i386.json +++ b/centos-6.6-i386.json @@ -102,7 +102,7 @@ ], "post-processors": [ { - "output": "../builds/{{.Provider}}/opscode_centos-6.6-i386_chef-{{user `chef_version`}}.box", + "output": "builds/{{.Provider}}/opscode_centos-6.6-i386_chef-{{user `chef_version`}}.box", "type": "vagrant" } ], diff --git a/packer/centos-6.6-x86_64.json b/centos-6.6-x86_64.json similarity index 97% rename from packer/centos-6.6-x86_64.json rename to centos-6.6-x86_64.json index 968976d04..10b93869d 100644 --- a/packer/centos-6.6-x86_64.json +++ b/centos-6.6-x86_64.json @@ -103,7 +103,7 @@ ], "post-processors": [ { - "output": "../builds/{{.Provider}}/opscode_centos-6.6_chef-{{user `chef_version`}}.box", + "output": "builds/{{.Provider}}/opscode_centos-6.6_chef-{{user `chef_version`}}.box", "type": "vagrant" } ], diff --git a/packer/centos-7.1-x86_64.json b/centos-7.1-x86_64.json similarity index 97% rename from packer/centos-7.1-x86_64.json rename to centos-7.1-x86_64.json index d72fb6b59..4e09f6b3b 100644 --- a/packer/centos-7.1-x86_64.json +++ b/centos-7.1-x86_64.json @@ -102,7 +102,7 @@ ], "post-processors": [ { - "output": "../builds/{{.Provider}}/opscode_centos-7.1_chef-{{user `chef_version`}}.box", + "output": "builds/{{.Provider}}/opscode_centos-7.1_chef-{{user `chef_version`}}.box", "type": "vagrant" } ], diff --git a/packer/debian-6.0.10-amd64.json b/debian-6.0.10-amd64.json similarity index 98% rename from packer/debian-6.0.10-amd64.json rename to debian-6.0.10-amd64.json index d4b6232ed..aaf2f35c0 100644 --- a/packer/debian-6.0.10-amd64.json +++ b/debian-6.0.10-amd64.json @@ -130,7 +130,7 @@ "post-processors": [ { "type": "vagrant", - "output": "../builds/{{.Provider}}/opscode_debian-6.0.10_chef-{{user `chef_version`}}.box" + "output": "builds/{{.Provider}}/opscode_debian-6.0.10_chef-{{user `chef_version`}}.box" } ], "provisioners": [ diff --git a/packer/debian-6.0.10-i386.json b/debian-6.0.10-i386.json similarity index 98% rename from packer/debian-6.0.10-i386.json rename to debian-6.0.10-i386.json index 6f22e995d..484dd5b2c 100644 --- a/packer/debian-6.0.10-i386.json +++ b/debian-6.0.10-i386.json @@ -130,7 +130,7 @@ "post-processors": [ { "type": "vagrant", - "output": "../builds/{{.Provider}}/opscode_debian-6.0.10-i386_chef-{{user `chef_version`}}.box" + "output": "builds/{{.Provider}}/opscode_debian-6.0.10-i386_chef-{{user `chef_version`}}.box" } ], "provisioners": [ diff --git a/packer/debian-7.8-amd64.json b/debian-7.8-amd64.json similarity index 98% rename from packer/debian-7.8-amd64.json rename to debian-7.8-amd64.json index 46b24a22b..b0843b810 100644 --- a/packer/debian-7.8-amd64.json +++ b/debian-7.8-amd64.json @@ -129,7 +129,7 @@ "post-processors": [ { "type": "vagrant", - "output": "../builds/{{.Provider}}/opscode_debian-7.8_chef-{{user `chef_version`}}.box" + "output": "builds/{{.Provider}}/opscode_debian-7.8_chef-{{user `chef_version`}}.box" } ], "provisioners": [ diff --git a/packer/debian-7.8-i386.json b/debian-7.8-i386.json similarity index 98% rename from packer/debian-7.8-i386.json rename to debian-7.8-i386.json index 4b8260c90..14af478d9 100644 --- a/packer/debian-7.8-i386.json +++ b/debian-7.8-i386.json @@ -130,7 +130,7 @@ "post-processors": [ { "type": "vagrant", - "output": "../builds/{{.Provider}}/opscode_debian-7.8-i386_chef-{{user `chef_version`}}.box" + "output": "builds/{{.Provider}}/opscode_debian-7.8-i386_chef-{{user `chef_version`}}.box" } ], "provisioners": [ diff --git a/definitions/.common/minimize.sh b/definitions/.common/minimize.sh deleted file mode 100644 index 3846a1d65..000000000 --- a/definitions/.common/minimize.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash -eux - -dd if=/dev/zero of=/EMPTY bs=1M -rm -f /EMPTY diff --git a/definitions/.common/session.rb b/definitions/.common/session.rb deleted file mode 100644 index 0b4ce90a2..000000000 --- a/definitions/.common/session.rb +++ /dev/null @@ -1,26 +0,0 @@ -COMMON_SESSION = { - :boot_wait => "10", - :cpu_count => "1", - :disk_format => "VDI", - :disk_size => "40960", - :hostiocache => "off", - :iso_download_timeout => "1000", - :kickstart_port => "7122", - :kickstart_timeout => "10000", - :memory_size=> "384", - :postinstall_timeout => "10000", - :ssh_guest_port => "22", - :ssh_host_port => "7222", - :ssh_key => "", - :ssh_login_timeout => "10000", - :ssh_password => "vagrant", - :ssh_user => "vagrant", - :sudo_cmd => "echo '%p'|sudo -S sh '%f'", - :virtualbox => { - :vm_options => { - :ioapic => "on", - :pae => "on" - } - } - -} diff --git a/definitions/.common/sshd.sh b/definitions/.common/sshd.sh deleted file mode 100644 index c6e4f20a6..000000000 --- a/definitions/.common/sshd.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash -eux - -echo "UseDNS no" >> /etc/ssh/sshd_config diff --git a/definitions/.common/vagrant.sh b/definitions/.common/vagrant.sh deleted file mode 100644 index 72dd2f444..000000000 --- a/definitions/.common/vagrant.sh +++ /dev/null @@ -1,33 +0,0 @@ -#!/bin/bash -eux - -if [ -f /home/vagrant/.vbox_version ]; then - mkdir /tmp/vbox - VER=$(cat /home/vagrant/.vbox_version) - mount -o loop VBoxGuestAdditions_$VER.iso /tmp/vbox - sh /tmp/vbox/VBoxLinuxAdditions.run - umount /tmp/vbox - rmdir /tmp/vbox - rm *.iso -fi - -if [ -f /home/vagrant/.vmfusion_version ]; then - #Set Linux-specific paths and ISO filename - home_dir="/home/vagrant" - iso_name="linux.iso" - mount_point="/tmp/vmware-tools" - #Run install, unmount ISO and remove it - mkdir ${mount_point} - cd ${home_dir} - /bin/mount -o loop ${iso_name} ${mount_point} - tar zxf ${mount_point}/*.tar.gz && cd vmware-tools-distrib && ./vmware-install.pl --default - /bin/umount ${mount_point} - /bin/rm -rf ${home_dir}/${iso_name} ${home_dir}/vmware-tools-distrib - rmdir ${mount_point} -fi - -mkdir /home/vagrant/.ssh -wget --no-check-certificate \ - 'https://github.com/mitchellh/vagrant/raw/master/keys/vagrant.pub' \ - -O /home/vagrant/.ssh/authorized_keys -chown -R vagrant /home/vagrant/.ssh -chmod -R go-rwsx /home/vagrant/.ssh diff --git a/definitions/.gitignore b/definitions/.gitignore deleted file mode 100644 index e69de29bb..000000000 diff --git a/definitions/.windows/session.rb b/definitions/.windows/session.rb deleted file mode 100644 index f639f260d..000000000 --- a/definitions/.windows/session.rb +++ /dev/null @@ -1,21 +0,0 @@ -require File.dirname(__FILE__) + "/../.common/session.rb" - -WINDOWS_SESSION = - COMMON_SESSION.merge({ :boot_wait => "1", - :boot_cmd_sequence => [''], - :winrm_user => "vagrant", - :winrm_password => "vagrant", - :floppy_files => [ - "Autounattend.xml", - "oracle-cert.cer" - ], - :postinstall_files => [ - "install-chef.bat", - "install-vbox.bat", # would be interesting to only include this on vbox - # "mount-validation.bat" # maybe test if we are within a vbox vm? - # because this will eventually run on kvm, openstack, etc etc - ], - :video_memory_size => '48', - :sudo_cmd => "%f", - :shutdown_cmd => "shutdown /s /t 10 /f /d p:4:1 /c \"Vagrant Shutdown\"" }) - diff --git a/definitions/windows-2008r2-standard/Autounattend.xml b/definitions/windows-2008r2-standard/Autounattend.xml deleted file mode 100644 index 4cfb84bd6..000000000 --- a/definitions/windows-2008r2-standard/Autounattend.xml +++ /dev/null @@ -1,230 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<unattend xmlns="urn:schemas-microsoft-com:unattend"> - <servicing></servicing> - - <settings pass="windowsPE"> - - <component name="Microsoft-Windows-Setup" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - - <DiskConfiguration> - <Disk wcm:action="add"> - - <CreatePartitions> - <CreatePartition wcm:action="add"> - <Order>1</Order> - <Type>Primary</Type> - <Size>20000</Size> - </CreatePartition> - </CreatePartitions> - - <ModifyPartitions> - <ModifyPartition wcm:action="add"> - <Extend>false</Extend> - <Format>NTFS</Format> - <Letter>C</Letter> - <Order>1</Order> - <PartitionID>1</PartitionID> - <Label>Windows 2008R2</Label> - </ModifyPartition> - </ModifyPartitions> - - <DiskID>0</DiskID> - <WillWipeDisk>true</WillWipeDisk> - - </Disk> - <WillShowUI>OnError</WillShowUI> - </DiskConfiguration> - - <UserData> - <!-- Product Key from http://technet.microsoft.com/en-us/library/ff793406.aspx --> - <ProductKey>YC6KT-GKW9T-YTKYR-T4X34-R7VHC - <WillShowUI>Never</WillShowUI> - </ProductKey> - - <AcceptEula>true</AcceptEula> - <FullName>Vagrant Fullname</FullName> - <Organization>Vagrant Inc</Organization> - </UserData> - - <ImageInstall> - <OSImage> - <InstallTo> - <DiskID>0</DiskID> - <PartitionID>1</PartitionID> - </InstallTo> - <WillShowUI>OnError</WillShowUI> - <InstallToAvailablePartition>false</InstallToAvailablePartition> - <InstallFrom> - <MetaData wcm:action="add"> - <Key>/IMAGE/NAME</Key> - <Value>Windows Server 2008 R2 SERVERSTANDARD</Value> - </MetaData> - </InstallFrom> - </OSImage> - </ImageInstall> - - </component> - - <component name="Microsoft-Windows-International-Core-WinPE" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - <SetupUILanguage> - <UILanguage>en-US</UILanguage> - </SetupUILanguage> - <InputLocale>en-US</InputLocale> - <SystemLocale>en-US</SystemLocale> - <UILanguage>en-US</UILanguage> - <UILanguageFallback>en-US</UILanguageFallback> - <UserLocale>en-US</UserLocale> - </component> - </settings> - - - <settings pass="oobeSystem"> - <component name="Microsoft-Windows-Shell-Setup" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - <UserAccounts> - <AdministratorPassword> - <Value>vagrant</Value> - <PlainText>true</PlainText> - </AdministratorPassword> - <LocalAccounts> - <LocalAccount wcm:action="add"> - <Password> - <Value>vagrant</Value> - <PlainText>true</PlainText> - </Password> - <Description>Vagrant User</Description> - <DisplayName>vagrant</DisplayName> - <Group>administrators</Group> - <Name>vagrant</Name> - </LocalAccount> - </LocalAccounts> - </UserAccounts> - <OOBE> - <HideEULAPage>true</HideEULAPage> - <HideWirelessSetupInOOBE>true</HideWirelessSetupInOOBE> - <NetworkLocation>Home</NetworkLocation> - </OOBE> - <AutoLogon> - <Password> - <Value>vagrant</Value> - <PlainText>true</PlainText> - </Password> - <Username>administrator</Username> - <Enabled>true</Enabled> - </AutoLogon> - <FirstLogonCommands> - <!-- <SynchronousCommand wcm:action="add"> --> - <!-- <CommandLine>cmd.exe /c a:install-cygwin-sshd.bat</CommandLine> --> - <!-- <Description>Install Cygwin SSH</Description> --> - <!-- <Order>1</Order> --> - <!-- <RequiresUserInput>true</RequiresUserInput> --> - <!-- </SynchronousCommand> --> - <!-- <SynchronousCommand wcm:action="add"> --> - <!-- <CommandLine>cmd.exe /c a:install-winrm.bat</CommandLine> --> - <!-- <Description>Install Win RM</Description> --> - <!-- <Order>2</Order> --> - <!-- <RequiresUserInput>true</RequiresUserInput> --> - <!-- </SynchronousCommand> --> - <SynchronousCommand wcm:action="add"> - <CommandLine>cmd.exe /c winrm quickconfig -q</CommandLine> - <Description>winrm quickconfig -q</Description> - <Order>1</Order> - <RequiresUserInput>true</RequiresUserInput> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <CommandLine>cmd.exe /c winrm quickconfig -transport:http</CommandLine> - <Description>winrm quickconfig -transport:http</Description> - <Order>2</Order> - <RequiresUserInput>true</RequiresUserInput> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <CommandLine>cmd.exe /c winrm set winrm/config @{MaxTimeoutms="1800000"}</CommandLine> - <Description>Win RM MaxTimoutms</Description> - <Order>3</Order> - <RequiresUserInput>true</RequiresUserInput> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <CommandLine>cmd.exe /c winrm set winrm/config/winrs @{MaxMemoryPerShellMB="300"}</CommandLine> - <Description>Win RM MaxMemoryPerShellMB</Description> - <Order>4</Order> - <RequiresUserInput>true</RequiresUserInput> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <CommandLine>cmd.exe /c winrm set winrm/config/service @{AllowUnencrypted="true"}</CommandLine> - <Description>Win RM AllowUnencrypted</Description> - <Order>5</Order> - <RequiresUserInput>true</RequiresUserInput> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <CommandLine>cmd.exe /c winrm set winrm/config/service/auth @{Basic="true"}</CommandLine> - <Description>Win RM auth Basic</Description> - <Order>6</Order> - <RequiresUserInput>true</RequiresUserInput> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <CommandLine>cmd.exe /c winrm set winrm/config/client/auth @{Basic="true"}</CommandLine> - <Description>Win RM auth Basic</Description> - <Order>7</Order> - <RequiresUserInput>true</RequiresUserInput> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <CommandLine>cmd.exe /c winrm set winrm/config/listener?Address=*+Transport=HTTP @{Port="5985"} </CommandLine> - <Description>Win RM listener Address/Port</Description> - <Order>8</Order> - <RequiresUserInput>true</RequiresUserInput> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <CommandLine>cmd.exe /c netsh advfirewall firewall set rule group="remote administration" new enable=yes </CommandLine> - <Description>Win RM adv firewall enable</Description> - <Order>9</Order> - <RequiresUserInput>true</RequiresUserInput> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <CommandLine>cmd.exe /c netsh firewall add portopening TCP 5985 "Port 5985" </CommandLine> - <Description>Win RM port open</Description> - <Order>10</Order> - <RequiresUserInput>true</RequiresUserInput> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <CommandLine>cmd.exe /c net stop winrm </CommandLine> - <Description>Stop Win RM Service </Description> - <Order>11</Order> - <RequiresUserInput>true</RequiresUserInput> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <CommandLine>cmd.exe /c sc config winrm start= auto</CommandLine> - <Description>Win RM Autostart</Description> - <Order>12</Order> - <RequiresUserInput>true</RequiresUserInput> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <CommandLine>cmd.exe /c net start winrm </CommandLine> - <Description>Start Win RM Service</Description> - <Order>13</Order> - <RequiresUserInput>true</RequiresUserInput> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <CommandLine>powershell -Command "Set-ExecutionPolicy -ExecutionPolicy RemoteSigned -Force"</CommandLine> - <Description>Start Win RM Service</Description> - <Order>14</Order> - <RequiresUserInput>true</RequiresUserInput> - </SynchronousCommand> - </FirstLogonCommands> - <ShowWindowsLive>false</ShowWindowsLive> - </component> - </settings> - <settings pass="specialize"> - <component name="Microsoft-Windows-Shell-Setup" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" > - <OEMInformation> - <HelpCustomized>false</HelpCustomized> - </OEMInformation> - <!-- Rename computer here. --> - <ComputerName>vagrant-2008R2</ComputerName> - <TimeZone>Pacific Standard Time</TimeZone> - <RegisteredOwner></RegisteredOwner> - </component> - <component name="Microsoft-Windows-Security-SPP-UX" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - <SkipAutoActivation>true</SkipAutoActivation> - </component> - </settings> - <cpi:offlineImage cpi:source="catalog:d:/sources/install_windows server 2008 r2 serverdatacenter.clg" xmlns:cpi="urn:schemas-microsoft-com:cpi" /> -</unattend> diff --git a/definitions/windows-2008r2-standard/README.md b/definitions/windows-2008r2-standard/README.md deleted file mode 100644 index be39b6e15..000000000 --- a/definitions/windows-2008r2-standard/README.md +++ /dev/null @@ -1,87 +0,0 @@ -You can download a free trial of Windows Server 2008 R2 with Service Pack 1 from two different locations manually: - -* url: http://technet.microsoft.com/en-us/evalcenter/dd459137.aspx -* url: http://msdn.microsoft.com/en-us/evalcenter/ee175713.aspx - -But they seem to always generate the same url of http://care.dlservice.microsoft.com//dl/download/7/5/E/75EC4E54-5B02-42D6-8879-D8D3A25FBEF7/7601.17514.101119-1850_x64fre_server_eval_en-us-GRMSXEVAL_EN_DVD.iso - -* 64bit -* filename: 7601.17514.101119-1850_x64fre_server_eval_en-us-GRMSXEVAL_EN_DVD.iso -* md5sum: 4263be2cf3c59177c45085c0a7bc6ca5 - - -The installation uses the Standard Windows Unattended installation. The XML file was created using the Windows AIK kit, but the file can also be edited by hand. - -To edit the Autounattend.xml and validate it you can download The Windows® Automated Installation Kit (AIK) for Windows® 7: - -* url: http://www.microsoft.com/download/en/details.aspx?id=5753 -* file: KB3AIK_EN.iso -* md5sum: 1e73b24a89eceab9d50585b92db5482f - -AIK also includes dism, which will allow you to choose a specific version: - -If you want to install a different version, edit Autoattended.xml and replace the /IMAGE/NAME value with -one of the names listed in the 2008r2 install.wim on the install DVD .iso - - -```xml -<InstallFrom> - <MetaData wcm:action="add"> - <Key>/IMAGE/NAME</Key> - <Value>Windows Server 2008 R2 SERVERSTANDARD</Value> - </MetaData> -</InstallFrom> -``` - - -``` -PS C:\Users\Administrator> Dism /Get-WIMInfo /WimFile:d:\sources\install.wim - -Deployment Image Servicing and Management tool -Version: 6.1.7600.16385 - -Details for image : d:\sources\install.wim - -Index : 1 -Name : Windows Server 2008 R2 SERVERSTANDARD -Description : Windows Server 2008 R2 SERVERSTANDARD -Size : 10,510,643,622 bytes - -Index : 2 -Name : Windows Server 2008 R2 SERVERSTANDARDCORE -Description : Windows Server 2008 R2 SERVERSTANDARDCORE -Size : 3,564,132,307 bytes - -Index : 3 -Name : Windows Server 2008 R2 SERVERENTERPRISE -Description : Windows Server 2008 R2 SERVERENTERPRISE -Size : 10,511,024,733 bytes - -Index : 4 -Name : Windows Server 2008 R2 SERVERENTERPRISECORE -Description : Windows Server 2008 R2 SERVERENTERPRISECORE -Size : 3,564,106,331 bytes - -Index : 5 -Name : Windows Server 2008 R2 SERVERDATACENTER -Description : Windows Server 2008 R2 SERVERDATACENTER -Size : 10,511,131,897 bytes - -Index : 6 -Name : Windows Server 2008 R2 SERVERDATACENTERCORE -Description : Windows Server 2008 R2 SERVERDATACENTERCORE -Size : 3,564,144,547 bytes - -Index : 7 -Name : Windows Server 2008 R2 SERVERWEB -Description : Windows Server 2008 R2 SERVERWEB -Size : 10,520,222,743 bytes - -Index : 8 -Name : Windows Server 2008 R2 SERVERWEBCORE -Description : Windows Server 2008 R2 SERVERWEBCORE -Size : 3,562,750,400 bytes - -The operation completed successfully. -``` - diff --git a/definitions/windows-2008r2-standard/definition.rb b/definitions/windows-2008r2-standard/definition.rb deleted file mode 100644 index 31dc7e185..000000000 --- a/definitions/windows-2008r2-standard/definition.rb +++ /dev/null @@ -1,18 +0,0 @@ -# -*- coding: utf-8 -*- -require File.dirname(__FILE__) + "/../.windows/session.rb" - -iso_src = "http://care.dlservice.microsoft.com//dl/download/7/5/E/75EC4E54-5B02-42D6-8879-D8D3A25FBEF7/7601.17514.101119-1850_x64fre_server_eval_en-us-GRMSXEVAL_EN_DVD.iso" - -session = WINDOWS_SESSION.merge({ - :os_type_id => 'Windows2008_64', - :iso_download_instructions => "Download and install full featured software for 180-day trial at http://technet.microsoft.com/en-us/evalcenter/dd459137.aspx", - :iso_src => iso_src, - :iso_file => File.basename(iso_src), - :iso_md5 => "4263be2cf3c59177c45085c0a7bc6ca5", - :kickstart_port => "7150" - - }) - -Veewee::Session.declare session - - diff --git a/definitions/windows-2008r2-standard/install-chef.bat b/definitions/windows-2008r2-standard/install-chef.bat deleted file mode 120000 index 0494fd4af..000000000 --- a/definitions/windows-2008r2-standard/install-chef.bat +++ /dev/null @@ -1 +0,0 @@ -../.windows/install-chef.bat \ No newline at end of file diff --git a/definitions/windows-2008r2-standard/install-vbox.bat b/definitions/windows-2008r2-standard/install-vbox.bat deleted file mode 120000 index 2ff5531e3..000000000 --- a/definitions/windows-2008r2-standard/install-vbox.bat +++ /dev/null @@ -1 +0,0 @@ -../.windows/install-vbox.bat \ No newline at end of file diff --git a/definitions/windows-2008r2-standard/mount-validation.bat b/definitions/windows-2008r2-standard/mount-validation.bat deleted file mode 120000 index e137688e8..000000000 --- a/definitions/windows-2008r2-standard/mount-validation.bat +++ /dev/null @@ -1 +0,0 @@ -../.windows/mount-validation.bat \ No newline at end of file diff --git a/definitions/windows-2008r2-standard/oracle-cert.cer b/definitions/windows-2008r2-standard/oracle-cert.cer deleted file mode 120000 index 5fbb0d341..000000000 --- a/definitions/windows-2008r2-standard/oracle-cert.cer +++ /dev/null @@ -1 +0,0 @@ -../.windows/oracle-cert.cer \ No newline at end of file diff --git a/definitions/windows-2012-standard/Autounattend.xml b/definitions/windows-2012-standard/Autounattend.xml deleted file mode 100644 index 0c28830b8..000000000 --- a/definitions/windows-2012-standard/Autounattend.xml +++ /dev/null @@ -1,163 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<unattend xmlns="urn:schemas-microsoft-com:unattend"> - <settings pass="windowsPE"> - <component name="Microsoft-Windows-International-Core-WinPE" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - <SetupUILanguage> - <UILanguage>en-US</UILanguage> - </SetupUILanguage> - <InputLocale>en-US</InputLocale> - <SystemLocale>en-US</SystemLocale> - <UILanguage>en-US</UILanguage> - <UserLocale>en-US</UserLocale> - </component> - <component name="Microsoft-Windows-Setup" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - <DiskConfiguration> - <Disk wcm:action="add"> - <CreatePartitions> - <CreatePartition wcm:action="add"> - <Order>1</Order> - <Size>20000</Size> - <Type>Primary</Type> - </CreatePartition> - </CreatePartitions> - <ModifyPartitions> - <ModifyPartition wcm:action="add"> - <Extend>false</Extend> - <Format>NTFS</Format> - <Label>Windows 2012</Label> - <Letter>C</Letter> - <Order>1</Order> - <PartitionID>1</PartitionID> - </ModifyPartition> - </ModifyPartitions> - <DiskID>0</DiskID> - <WillWipeDisk>true</WillWipeDisk> - </Disk> - </DiskConfiguration> - <ImageInstall> - <OSImage> - <InstallFrom> - <MetaData wcm:action="add"> - <Key>/IMAGE/NAME</Key> - <Value>Windows Server 2012 SERVERSTANDARD</Value> - </MetaData> - </InstallFrom> - <InstallTo> - <DiskID>0</DiskID> - <PartitionID>1</PartitionID> - </InstallTo> - </OSImage> - </ImageInstall> - <UserData> - <AcceptEula>true</AcceptEula> - <FullName>Vagrant</FullName> - <Organization>Vagrant</Organization> - </UserData> - </component> - </settings> - <settings pass="specialize"> - <component name="Microsoft-Windows-Shell-Setup" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - <AutoLogon> - <Password> - <Value>dgBhAGcAcgBhAG4AdABQAGEAcwBzAHcAbwByAGQA</Value> - <PlainText>false</PlainText> - </Password> - <Enabled>true</Enabled> - <Username>Administrator</Username> - </AutoLogon> - <ComputerName>vagrant-2012</ComputerName> - <RegisteredOrganization>Vagrant</RegisteredOrganization> - <RegisteredOwner>Vagrant</RegisteredOwner> - <TimeZone>UTC</TimeZone> - <ProductKey>XC9B7-NBPP2-83J2H-RHMBY-92BT4</ProductKey> - </component> - <component name="Microsoft-Windows-Security-SPP-UX" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - <SkipAutoActivation>true</SkipAutoActivation> - </component> - </settings> - <settings pass="oobeSystem"> - <component name="Microsoft-Windows-Shell-Setup" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - <AutoLogon> - <Password> - <Value>dgBhAGcAcgBhAG4AdABQAGEAcwBzAHcAbwByAGQA</Value> - <PlainText>false</PlainText> - </Password> - <Enabled>true</Enabled> - <Username>Administrator</Username> - </AutoLogon> - <FirstLogonCommands> - <SynchronousCommand wcm:action="add"> - <Order>1</Order> - <RequiresUserInput>true</RequiresUserInput> - <CommandLine>cmd.exe /c winrm quickconfig -q</CommandLine> - <Description>winrm quickconfig -q</Description> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <Order>2</Order> - <CommandLine>cmd.exe /c winrm set winrm/config/winrs @{MaxMemoryPerShellMB="300"}</CommandLine> - <RequiresUserInput>true</RequiresUserInput> - <Description>winrm memory</Description> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <CommandLine>cmd.exe /c winrm set winrm/config @{MaxTimeoutms="1800000"}</CommandLine> - <Description>winrm timeout</Description> - <Order>3</Order> - <RequiresUserInput>true</RequiresUserInput> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <CommandLine>cmd.exe /c winrm set winrm/config/service @{AllowUnencrypted="true"}</CommandLine> - <Description>winrm encryption</Description> - <Order>4</Order> - <RequiresUserInput>true</RequiresUserInput> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <CommandLine>winrm set winrm/config/service/auth @{Basic="true"}</CommandLine> - <Description>winrm basic auth</Description> - <Order>5</Order> - <RequiresUserInput>true</RequiresUserInput> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <CommandLine>cmd.exe /c netsh advfirewall firewall set rule name="Windows Remote Management (HTTP-In)" profile=public protocol=tcp localport=5985 remoteip=localsubnet new remoteip=any</CommandLine> - <Description>winrm firewall</Description> - <Order>6</Order> - <RequiresUserInput>true</RequiresUserInput> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <CommandLine>powershell -Command "Set-ExecutionPolicy -ExecutionPolicy RemoteSigned -Force"</CommandLine> - <Description>fix powershell remote exec policy</Description> - <Order>7</Order> - <RequiresUserInput>true</RequiresUserInput> - </SynchronousCommand> - </FirstLogonCommands> - <OOBE> - <HideEULAPage>true</HideEULAPage> - <HideWirelessSetupInOOBE>true</HideWirelessSetupInOOBE> - <NetworkLocation>Home</NetworkLocation> - <ProtectYourPC>1</ProtectYourPC> - <HideOnlineAccountScreens>true</HideOnlineAccountScreens> - <HideOEMRegistrationScreen>true</HideOEMRegistrationScreen> - <HideLocalAccountScreen>true</HideLocalAccountScreen> - </OOBE> - <UserAccounts> - <AdministratorPassword> - <Value>dgBhAGcAcgBhAG4AdABBAGQAbQBpAG4AaQBzAHQAcgBhAHQAbwByAFAAYQBzAHMAdwBvAHIAZAA=</Value> - <PlainText>false</PlainText> - </AdministratorPassword> - <LocalAccounts> - <LocalAccount wcm:action="add"> - <Password> - <Value>dgBhAGcAcgBhAG4AdABQAGEAcwBzAHcAbwByAGQA</Value> - <PlainText>false</PlainText> - </Password> - <Description>Vagrant User</Description> - <DisplayName>vagrant</DisplayName> - <Group>Administrators</Group> - <Name>vagrant</Name> - </LocalAccount> - </LocalAccounts> - </UserAccounts> - <ShowWindowsLive>false</ShowWindowsLive> - </component> - </settings> - <cpi:offlineImage cpi:source="wim:c:/users/administrator/documents/install.wim#Windows Server 2012 SERVERSTANDARD" xmlns:cpi="urn:schemas-microsoft-com:cpi" /> -</unattend> diff --git a/definitions/windows-2012-standard/README.md b/definitions/windows-2012-standard/README.md deleted file mode 100644 index 562c739f7..000000000 --- a/definitions/windows-2012-standard/README.md +++ /dev/null @@ -1,58 +0,0 @@ -You can download a free trial of Windows Server 2012 from Microsoft: - -* url: http://technet.microsoft.com/en-us/evalcenter/hh670538.aspx - -But they seem to always generate the same URL that's in the definition. If it ever changes, you can update the definition. - -The installation uses the Standard Windows Unattended installation. The XML file was created using the Windows AIK kit, but the file can also be edited by hand. - -To edit the Autounattend.xml and validate it you can download The Windows® Automated Deployment Kit (ADK) for Windows® 8. Windows Server 2012 is based off Windows 8. - -* url: http://www.microsoft.com/en-us/download/details.aspx?id=30652 - -ADK also includes dism, which will allow you to choose a specific version of Windows 2012 to install. - -If you want to install a different version, edit Autoattended.xml and replace the /IMAGE/NAME value with -one of the names listed in the Server 2012 install.wim on the install DVD .iso - - -```xml -<InstallFrom> - <MetaData wcm:action="add"> - <Key>/IMAGE/NAME</Key> - <Value>Windows Server 2012 SERVERSTANDARD</Value> - </MetaData> -</InstallFrom> -``` - -``` -PS C:\Users\Administrator> Dism /Get-WIMInfo /WimFile:D:\sources\install.wim - -Deployment Image Servicing and Management tool -Version: 6.2.9200.16384 - -Details for image : D:\sources\install.wim - -Index : 1 -Name : Windows Server 2012 SERVERSTANDARDCORE -Description : Windows Server 2012 SERVERSTANDARDCORE -Size : 7,182,564,199 bytes - -Index : 2 -Name : Windows Server 2012 SERVERSTANDARD -Description : Windows Server 2012 SERVERSTANDARD -Size : 12,002,145,363 bytes - -Index : 3 -Name : Windows Server 2012 SERVERDATACENTERCORE -Description : Windows Server 2012 SERVERDATACENTERCORE -Size : 7,177,138,892 bytes - -Index : 4 -Name : Windows Server 2012 SERVERDATACENTER -Description : Windows Server 2012 SERVERDATACENTER -Size : 11,997,664,663 bytes - -The operation completed successfully. -``` - diff --git a/definitions/windows-2012-standard/definition.rb b/definitions/windows-2012-standard/definition.rb deleted file mode 100644 index 8362fdaac..000000000 --- a/definitions/windows-2012-standard/definition.rb +++ /dev/null @@ -1,21 +0,0 @@ -# -*- coding: utf-8 -*- -require File.dirname(__FILE__) + "/../.windows/session.rb" - -iso_src ="http://care.dlservice.microsoft.com//dl/download/6/D/A/6DAB58BA-F939-451D-9101-7DE07DC09C03/9200.16384.WIN8_RTM.120725-1247_X64FRE_SERVER_EVAL_EN-US-HRM_SSS_X64FREE_EN-US_DV5.ISO" -#"http://care.dlservice.microsoft.com//dl/download/6/D/A/6DAB58BA-F939-451D-9101-7DE07DC09C03/9200.16384.WIN8_RTM.120725-1247_X64FRE_SERVER_EVAL_EN-US-HRM_SSS_X64FREE_EN-US_DV5.ISO?lcid=1033&cprod=winsvr2012rtmisotn" -#"http://care.dlservice.microsoft.com/download/6/D/A/6DAB58BA-F939-451D-9101-7DE07DC09C03/9200.16384.WIN8_RTM.120725-1247_X64FRE_SERVER_EVAL_EN-US-HRM_SSS_X64FREE_EN-US_DV5.ISO" - -session = WINDOWS_SESSION.merge({ - :os_type_id => 'Windows8_64', - :iso_download_instructions => "Download and install full featured software for 180-day trial at http://technet.microsoft.com/en-US/evalcenter/hh670538.aspx", - :iso_src => iso_src, - :iso_file => File.basename(iso_src), - :iso_md5 => "8503997171f731d9bd1cb0b0edc31f3d", - :kickstart_port => "7140", - :winrm_host_port => "2012", - :memory_size=> "512" - }) - -Veewee::Session.declare session - - diff --git a/definitions/windows-2012-standard/install-chef.bat b/definitions/windows-2012-standard/install-chef.bat deleted file mode 120000 index 0494fd4af..000000000 --- a/definitions/windows-2012-standard/install-chef.bat +++ /dev/null @@ -1 +0,0 @@ -../.windows/install-chef.bat \ No newline at end of file diff --git a/definitions/windows-2012-standard/install-vbox.bat b/definitions/windows-2012-standard/install-vbox.bat deleted file mode 120000 index 2ff5531e3..000000000 --- a/definitions/windows-2012-standard/install-vbox.bat +++ /dev/null @@ -1 +0,0 @@ -../.windows/install-vbox.bat \ No newline at end of file diff --git a/definitions/windows-2012-standard/mount-validation.bat b/definitions/windows-2012-standard/mount-validation.bat deleted file mode 120000 index e137688e8..000000000 --- a/definitions/windows-2012-standard/mount-validation.bat +++ /dev/null @@ -1 +0,0 @@ -../.windows/mount-validation.bat \ No newline at end of file diff --git a/definitions/windows-2012-standard/oracle-cert.cer b/definitions/windows-2012-standard/oracle-cert.cer deleted file mode 120000 index 5fbb0d341..000000000 --- a/definitions/windows-2012-standard/oracle-cert.cer +++ /dev/null @@ -1 +0,0 @@ -../.windows/oracle-cert.cer \ No newline at end of file diff --git a/definitions/windows-2012r2-standard/Autounattend.xml b/definitions/windows-2012r2-standard/Autounattend.xml deleted file mode 100644 index 868aba776..000000000 --- a/definitions/windows-2012r2-standard/Autounattend.xml +++ /dev/null @@ -1,164 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<unattend xmlns="urn:schemas-microsoft-com:unattend"> - <servicing></servicing> - <settings pass="windowsPE"> - <component name="Microsoft-Windows-International-Core-WinPE" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - <SetupUILanguage> - <UILanguage>en-US</UILanguage> - </SetupUILanguage> - <InputLocale>en-US</InputLocale> - <SystemLocale>en-US</SystemLocale> - <UILanguage>en-US</UILanguage> - <UserLocale>en-US</UserLocale> - </component> - <component name="Microsoft-Windows-Setup" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - <DiskConfiguration> - <Disk wcm:action="add"> - <CreatePartitions> - <CreatePartition wcm:action="add"> - <Order>1</Order> - <Size>20000</Size> - <Type>Primary</Type> - </CreatePartition> - </CreatePartitions> - <ModifyPartitions> - <ModifyPartition wcm:action="add"> - <Extend>false</Extend> - <Format>NTFS</Format> - <Label>Windows 2012R2</Label> - <Letter>C</Letter> - <Order>1</Order> - <PartitionID>1</PartitionID> - </ModifyPartition> - </ModifyPartitions> - <DiskID>0</DiskID> - <WillWipeDisk>true</WillWipeDisk> - </Disk> - </DiskConfiguration> - <ImageInstall> - <OSImage> - <InstallFrom> - <MetaData wcm:action="add"> - <Key>/IMAGE/NAME</Key> - <Value>Windows Server 2012 R2 SERVERSTANDARD</Value> - </MetaData> - </InstallFrom> - <InstallTo> - <DiskID>0</DiskID> - <PartitionID>1</PartitionID> - </InstallTo> - </OSImage> - </ImageInstall> - <UserData> - <AcceptEula>true</AcceptEula> - <FullName>Vagrant</FullName> - <Organization>Vagrant</Organization> - </UserData> - </component> - </settings> - <settings pass="specialize"> - <component name="Microsoft-Windows-Shell-Setup" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - <AutoLogon> - <Password> - <Value>dgBhAGcAcgBhAG4AdABQAGEAcwBzAHcAbwByAGQA</Value> - <PlainText>false</PlainText> - </Password> - <Enabled>true</Enabled> - <Username>Administrator</Username> - </AutoLogon> - <ComputerName>vagrant-2012</ComputerName> - <RegisteredOrganization>Vagrant</RegisteredOrganization> - <RegisteredOwner>Vagrant</RegisteredOwner> - <TimeZone>UTC</TimeZone> - <ProductKey>W3GGN-FT8W3-Y4M27-J84CP-Q3VJ9</ProductKey> - </component> - <component name="Microsoft-Windows-Security-SPP-UX" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - <SkipAutoActivation>true</SkipAutoActivation> - </component> - </settings> - <settings pass="oobeSystem"> - <component name="Microsoft-Windows-Shell-Setup" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - <AutoLogon> - <Password> - <Value>dgBhAGcAcgBhAG4AdABQAGEAcwBzAHcAbwByAGQA</Value> - <PlainText>false</PlainText> - </Password> - <Enabled>true</Enabled> - <Username>Administrator</Username> - </AutoLogon> - <FirstLogonCommands> - <SynchronousCommand wcm:action="add"> - <Order>1</Order> - <RequiresUserInput>true</RequiresUserInput> - <CommandLine>cmd.exe /c winrm quickconfig -q</CommandLine> - <Description>winrm quickconfig -q</Description> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <Order>2</Order> - <CommandLine>cmd.exe /c winrm set winrm/config/winrs @{MaxMemoryPerShellMB="300"}</CommandLine> - <RequiresUserInput>true</RequiresUserInput> - <Description>winrm memory</Description> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <CommandLine>cmd.exe /c winrm set winrm/config @{MaxTimeoutms="1800000"}</CommandLine> - <Description>winrm timeout</Description> - <Order>3</Order> - <RequiresUserInput>true</RequiresUserInput> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <CommandLine>cmd.exe /c winrm set winrm/config/service @{AllowUnencrypted="true"}</CommandLine> - <Description>winrm encryption</Description> - <Order>4</Order> - <RequiresUserInput>true</RequiresUserInput> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <CommandLine>winrm set winrm/config/service/auth @{Basic="true"}</CommandLine> - <Description>winrm basic auth</Description> - <Order>5</Order> - <RequiresUserInput>true</RequiresUserInput> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <CommandLine>cmd.exe /c netsh advfirewall firewall set rule name="Windows Remote Management (HTTP-In)" profile=public protocol=tcp localport=5985 remoteip=localsubnet new remoteip=any</CommandLine> - <Description>winrm firewall</Description> - <Order>6</Order> - <RequiresUserInput>true</RequiresUserInput> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <CommandLine>powershell -Command "Set-ExecutionPolicy -ExecutionPolicy RemoteSigned -Force"</CommandLine> - <Description>fix powershell remote exec policy</Description> - <Order>7</Order> - <RequiresUserInput>true</RequiresUserInput> - </SynchronousCommand> - </FirstLogonCommands> - <OOBE> - <HideEULAPage>true</HideEULAPage> - <HideWirelessSetupInOOBE>true</HideWirelessSetupInOOBE> - <NetworkLocation>Home</NetworkLocation> - <ProtectYourPC>1</ProtectYourPC> - <HideOnlineAccountScreens>true</HideOnlineAccountScreens> - <HideOEMRegistrationScreen>true</HideOEMRegistrationScreen> - <HideLocalAccountScreen>true</HideLocalAccountScreen> - </OOBE> - <UserAccounts> - <AdministratorPassword> - <Value>dgBhAGcAcgBhAG4AdABBAGQAbQBpAG4AaQBzAHQAcgBhAHQAbwByAFAAYQBzAHMAdwBvAHIAZAA=</Value> - <PlainText>false</PlainText> - </AdministratorPassword> - <LocalAccounts> - <LocalAccount wcm:action="add"> - <Password> - <Value>dgBhAGcAcgBhAG4AdABQAGEAcwBzAHcAbwByAGQA</Value> - <PlainText>false</PlainText> - </Password> - <Description>Vagrant User</Description> - <DisplayName>vagrant</DisplayName> - <Group>Administrators</Group> - <Name>vagrant</Name> - </LocalAccount> - </LocalAccounts> - </UserAccounts> - <ShowWindowsLive>false</ShowWindowsLive> - </component> - </settings> - <cpi:offlineImage cpi:source="wim:c:/users/administrator/documents/install.wim#Windows Server 2012R2 SERVERSTANDARD" xmlns:cpi="urn:schemas-microsoft-com:cpi" /> -</unattend> diff --git a/definitions/windows-2012r2-standard/README.md b/definitions/windows-2012r2-standard/README.md deleted file mode 100644 index 42ab14e6a..000000000 --- a/definitions/windows-2012r2-standard/README.md +++ /dev/null @@ -1,58 +0,0 @@ -You can download a free trial of Windows Server 2012R2 from Microsoft: - -* url: http://technet.microsoft.com/en-US/evalcenter/dn205286.aspx - -But they seem to always generate the same URL that's in the definition. If it ever changes, you can update the definition. - -The installation uses the Standard Windows Unattended installation. The XML file was created using the Windows AIK kit, but the file can also be edited by hand. - -To edit the Autounattend.xml and validate it you can download The Windows® Automated Deployment Kit (ADK) for Windows® 8.1. Windows Server 2012R2 is based off Windows 8.1. - -* url: http://www.microsoft.com/en-us/download/details.aspx?id=39982 - -ADK also includes dism, which will allow you to choose a specific version of Windows 2012R2 to install. - -If you want to install a different version, edit Autoattended.xml and replace the /IMAGE/NAME value with -one of the names listed in the Server 2012R2 install.wim on the install DVD .iso - - -```xml -<InstallFrom> - <MetaData wcm:action="add"> - <Key>/IMAGE/NAME</Key> - <Value>Windows Server 2012R2 SERVERSTANDARD</Value> - </MetaData> -</InstallFrom> -``` - -``` -PS C:\Users\Administrator> Dism /Get-WIMInfo /WimFile:D:\sources\install.wim - -Deployment Image Servicing and Management tool -Version: 6.2.9200.16384 - -Details for image : D:\sources\install.wim - -Index : 1 -Name : Windows Server 2012R2 SERVERSTANDARDCORE -Description : Windows Server 2012R2 SERVERSTANDARDCORE -Size : 7,182,564,199 bytes - -Index : 2 -Name : Windows Server 2012R2 SERVERSTANDARD -Description : Windows Server 2012R2 SERVERSTANDARD -Size : 12,002,145,363 bytes - -Index : 3 -Name : Windows Server 2012R2 SERVERDATACENTERCORE -Description : Windows Server 2012R2 SERVERDATACENTERCORE -Size : 7,177,138,892 bytes - -Index : 4 -Name : Windows Server 2012R2 SERVERDATACENTER -Description : Windows Server 2012R2 SERVERDATACENTER -Size : 11,997,664,663 bytes - -The operation completed successfully. -``` - diff --git a/definitions/windows-2012r2-standard/definition.rb b/definitions/windows-2012r2-standard/definition.rb deleted file mode 100644 index a37367dd1..000000000 --- a/definitions/windows-2012r2-standard/definition.rb +++ /dev/null @@ -1,20 +0,0 @@ -# -*- coding: utf-8 -*- -require File.dirname(__FILE__) + "/../.windows/session.rb" - -iso_src = "http://care.dlservice.microsoft.com/dl/download/6/2/A/62A76ABB-9990-4EFC-A4FE-C7D698DAEB96/9600.16384.WINBLUE_RTM.130821-1623_X64FRE_SERVER_EVAL_EN-US-IRM_SSS_X64FREE_EN-US_DV5.ISO" - -session = WINDOWS_SESSION.merge({ - :os_type_id => 'Windows8_64', - :iso_download_instructions => "Download and install full featured software for 180-day trial at http://technet.microsoft.com/en-US/evalcenter/hh670538.aspx", - :iso_src => iso_src, - :iso_file => File.basename(iso_src), - :iso_md5 => "458ff91f8abc21b75cb544744bf92e6a", - :kickstart_port => "7122", - :winrm_host_port => "2012", - :memory_size=> "512", - :virtualbox => { - :extradata => 'VBoxInternal/CPUM/CMPXCHG16B 1', - } - }) - -Veewee::Session.declare session diff --git a/definitions/windows-2012r2-standard/install-chef.bat b/definitions/windows-2012r2-standard/install-chef.bat deleted file mode 100644 index 2107a1b29..000000000 --- a/definitions/windows-2012r2-standard/install-chef.bat +++ /dev/null @@ -1,47 +0,0 @@ -@REM Loop ten times to make sure outbound networking is up -FOR /L %%n IN (1,1,10) DO ( - PING -n 1 www.opscode.com - IF %ERRORLEVEL% == 0 CALL :wget - TIMEOUT 10 -) - -:err -ECHO "Couldn't reach Opscode even after 10 retries" -GOTO :done - -:wget -@rem Install Chef using chef-client MSI installer -@setlocal - -@set REMOTE_SOURCE_MSI_URL=https://www.opscode.com/chef/install.msi -@set LOCAL_DESTINATION_MSI_PATH=%TEMP%\chef-client-latest.msi -@set FALLBACK_QUERY_STRING=?DownloadContext=PowerShell - -@set ALTERNATE_DOWNLOAD_COMMAND=$webClient=new-object System.Net.WebClient; $webClient.DownloadFile('%REMOTE_SOURCE_MSI_URL%%FALLBACK_QUERY_STRING%', '%LOCAL_DESTINATION_MSI_PATH%') - -cscript /nologo %TEMP%\wget.vbs /url:%REMOTE_SOURCE_MSI_URL% /path:"%LOCAL_DESTINATION_MSI_PATH%" - -@rem Work around issues found in Windows Server 2012 around job objects not respecting WSMAN memory quotas -@rem that cause the MSI download process to exceed the quota even when it is increased by administrators. -@rem Retry the download using a more memory-efficient mechanism that only works if PowerShell is available. -@if ERRORLEVEL 1 ( - echo Warning: Failed to download %REMOTE_SOURCE_MSI_URL% to %LOCAL_DESTINATION_MSI_PATH% - echo Warning: Retrying download with PowerShell if available - if EXIST "%LOCAL_DESTINATION_MSI_PATH%" del /f /q "%LOCAL_DESTINATION_MSI_PATH%" - echo powershell -noprofile -noninteractive -command "%ALTERNATE_DOWNLOAD_COMMAND%" - powershell -noprofile -noninteractive -command "%ALTERNATE_DOWNLOAD_COMMAND%" - if NOT ERRORLEVEL 1 ( - echo Download succeeded - ) else ( - echo Failed to download %REMOTE_SOURCE_MSI_URL% - echo Subsequent attempt to install the downloaded MSI is likely to fail - ) -) - -msiexec /qb /i "%LOCAL_DESTINATION_MSI_PATH%" - -@endlocal -EXIT - -:done -EXIT diff --git a/definitions/windows-2012r2-standard/install-vbox.bat b/definitions/windows-2012r2-standard/install-vbox.bat deleted file mode 100644 index 614c415c7..000000000 --- a/definitions/windows-2012r2-standard/install-vbox.bat +++ /dev/null @@ -1,4 +0,0 @@ -cmd /c certutil -addstore -f "TrustedPublisher" a:oracle-cert.cer -cmd /c e:\VBoxWindowsAdditions-amd64.exe /S -cmd /c shutdown.exe /r /t 5 /d p:2:4 /c "Vagrant reboot for VBoxWindowsAdditions" - diff --git a/definitions/windows-2012r2-standard/mount-validation.bat b/definitions/windows-2012r2-standard/mount-validation.bat deleted file mode 100644 index ae458c1d6..000000000 --- a/definitions/windows-2012r2-standard/mount-validation.bat +++ /dev/null @@ -1,3 +0,0 @@ -REM This is so we can pass the validation test... I don't know that it's necessary -cmd /c net use z: \\vboxsrv\veewee-validation - diff --git a/definitions/windows-2012r2-standard/oracle-cert.cer b/definitions/windows-2012r2-standard/oracle-cert.cer deleted file mode 100644 index 6f3380d48553956036650bc711ca5aed73a1224d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1398 zcmXqLVl6UgVu@P7%*4pVBoH|JX8KPK#!$sYJbaVIzH}P!vT<s)d9;1!Wn^S!WiV*m zV#sa4$;KSY!Y0fV8f++TAPVAe3G;=e7G(x!rswG>c;+SR8Oj^Tf+V<w#b6Q&Aw{Ld zB?^A2CFS`=*@o5zmJkI-A*n^V#R~ap3Z=!V3W+5O86_nJ#a8<I<>lpiWk6Glfu`yu z=jZAd6(lNXBx@QP80s15fHX4;tHMop&PgmTRxnm@&QD2I068QxFI~aNz|cU!+0j5w zoY&CMz{tSD01TplToWMI+{oC}($q4_pm8gzw}cG@LFRJ^b2%sGWTxd8<z*(q{K_uO z7nGV(o}Zth5S)=;lv->kZ6FC!%_Sn_UzC`flL~Z0Q9*uDVo7Fxo}rzA4aA?OE}7|> zC5br-o-PV7$LcEhW+oTq7w4yyC<FtE^2DN4g)pF%DPYYCWkxW=nXwse(8Q>O97Bw( z49rc8{0u;GE~X|%MuyHw?*%`8FjtXzIendtSKY3w*O-60EAjFQ2OV~w_ftDDLUzu_ z85<Wa=?S-*nejb)|0Bzi=ZAKyJXs+1{&U}<E!<r7eBtNQVs{iy`CpdM8+pV3kFKYd z;{O}R&%U~HRFb)|&*|X#58c1RGz)!dcTGuVbeeB)eCp1-hX0aX)OY`{ZrXppaE9c( z=3cQz#vO?t;*(yVb7)<pC3A9tz>SryzkP0TS}(uOwDSCq)A{l5xun*{K0kH+^Qm$< z{v9i2H}l%A36FnQYWvH^<3!H>xUK(c<{T^S(EK-X{(E*tk9{wuILuppXYONpzdIrm z6;8kD=Vfr5%TV)i?iWRwFs0(DVJoe?Co?fKGB7S~Vyp&+NI5v&$_leE888^|0pmoL zpONuD3kx$7dxL=kh%e7#X<%+(y1;mWVVgcE6#^4sa&fY;E+`r4CKu(PCP(LBXNZ&@ zP|CmsWP$>VtpO-ub0@TUFt+`0Wn>p;HqbKAVB^qc1LhxgCPpzCe97BD7-Whn3y%R8 zObau!K_QII$jFjvkZhm=;~OxxNkHA1pIlsk;yeRuxGE+rzDdkXL{YAf<eStY19^}; zlvyMU#2Q4-&s_PcTJ4MX$-e&UA6V7iKfbhlE--&^Lj33ibQCZQSp*Ek*tmecWMOPF zXJV9Q;V@tWCO}{aBPUQ`5duu0j10%my}A5s>tn4l8@-n`97fxDH}mY7!8P?YpYXXe zANBj<Zy#8B<=plhr2w0$&kh}Y;3_J_rq%O(!d;Kdh!69Qrx$0(Z#pBlLibZ#!*^ku zETe+LaLfPw_xTrys&70sPe)j1+iVq`aMSBM(lw_ziD+!<3Y)OpMqT!-=r7Lxi?JI@ z<mcTks*7urddn8t7Ob=7j{GmlCwc6O!YLD(?sT2IaC=(b)&muZ35!DO?Rt6F3ICk! zzWcisYuQ$<<p-zv%;P9Gxv*7GE-~|}O~UcDuPhm!mwENJ*Y;evpI^83&Bmf4#}q;F kZ>ww{IP}*EUbv-wBB=FaQSwz;n~wTPeHRx#@~!?40OZx*k^lez diff --git a/definitions/windows-7-enterprise/Autounattend.xml b/definitions/windows-7-enterprise/Autounattend.xml deleted file mode 100644 index 4ec08daba..000000000 --- a/definitions/windows-7-enterprise/Autounattend.xml +++ /dev/null @@ -1,233 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<unattend xmlns="urn:schemas-microsoft-com:unattend"> - <servicing></servicing> - <settings pass="windowsPE"> - <component name="Microsoft-Windows-Setup" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - <DiskConfiguration> - <Disk wcm:action="add"> - <CreatePartitions> - <CreatePartition wcm:action="add"> - <Order>1</Order> - <Type>Primary</Type> - <Size>20000</Size> - </CreatePartition> - </CreatePartitions> - <ModifyPartitions> - <ModifyPartition wcm:action="add"> - <Extend>false</Extend> - <Format>NTFS</Format> - <Letter>C</Letter> - <Order>1</Order> - <PartitionID>1</PartitionID> - <Label>Windows 7 Enterprise</Label> - </ModifyPartition> - </ModifyPartitions> - <DiskID>0</DiskID> - <WillWipeDisk>true</WillWipeDisk> - </Disk> - <WillShowUI>OnError</WillShowUI> - </DiskConfiguration> - <UserData> - <ProductKey> - <WillShowUI>Never</WillShowUI> - </ProductKey> - <AcceptEula>true</AcceptEula> - <FullName>Vagrant Fullname</FullName> - <Organization>Vagrant Inc</Organization> - </UserData> - <ImageInstall> - <OSImage> - <InstallTo> - <DiskID>0</DiskID> - <PartitionID>1</PartitionID> - </InstallTo> - <WillShowUI>OnError</WillShowUI> - <InstallToAvailablePartition>false</InstallToAvailablePartition> - <InstallFrom> - <MetaData wcm:action="add"> - <Key>/IMAGE/NAME</Key> - <Value>Windows 7 ENTERPRISE</Value> - </MetaData> - </InstallFrom> - </OSImage> - </ImageInstall> - </component> - <component name="Microsoft-Windows-International-Core-WinPE" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - <SetupUILanguage> - <UILanguage>en-US</UILanguage> - </SetupUILanguage> - <InputLocale>en-US</InputLocale> - <SystemLocale>en-US</SystemLocale> - <UILanguage>en-US</UILanguage> - <UILanguageFallback>en-US</UILanguageFallback> - <UserLocale>en-US</UserLocale> - </component> - </settings> - <settings pass="oobeSystem"> - <component name="Microsoft-Windows-Shell-Setup" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - <UserAccounts> - <AdministratorPassword> - <Value>vagrant</Value> - <PlainText>true</PlainText> - </AdministratorPassword> - <LocalAccounts> - <LocalAccount wcm:action="add"> - <Password> - <Value>vagrant</Value> - <PlainText>true</PlainText> - </Password> - <Description>Vagrant User</Description> - <DisplayName>vagrant</DisplayName> - <Group>administrators</Group> - <Name>vagrant</Name> - </LocalAccount> - </LocalAccounts> - </UserAccounts> - <OOBE> - <HideEULAPage>true</HideEULAPage> - <HideWirelessSetupInOOBE>true</HideWirelessSetupInOOBE> - <NetworkLocation>Work</NetworkLocation> - <ProtectYourPC>3</ProtectYourPC> - </OOBE> - <AutoLogon> - <Password> - <Value>vagrant</Value> - <PlainText>true</PlainText> - </Password> - <Username>vagrant</Username> - <Enabled>true</Enabled> - </AutoLogon> - <FirstLogonCommands> - <!-- <SynchronousCommand wcm:action="add"> --> - <!-- <CommandLine>cmd.exe /c a:install-cygwin-sshd.bat</CommandLine> --> - <!-- <Description>Install Cygwin SSH</Description> --> - <!-- <Order>1</Order> --> - <!-- <RequiresUserInput>true</RequiresUserInput> --> - <!-- </SynchronousCommand> --> - <!-- <SynchronousCommand wcm:action="add"> --> - <!-- <CommandLine>cmd.exe /c a:install-vbox-guest.bat</CommandLine> --> - <!-- <Description>Install Win RM</Description> --> - <!-- <Order>1</Order> --> - <!-- <RequiresUserInput>true</RequiresUserInput> --> - <!-- </SynchronousCommand> --> - <SynchronousCommand wcm:action="add"> - <CommandLine>cmd.exe /c winrm quickconfig -q</CommandLine> - <Description>winrm quickconfig -q</Description> - <Order>1</Order> - <RequiresUserInput>true</RequiresUserInput> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <CommandLine>cmd.exe /c winrm quickconfig -transport:http</CommandLine> - <Description>winrm quickconfig -transport:http</Description> - <Order>2</Order> - <RequiresUserInput>true</RequiresUserInput> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <CommandLine>cmd.exe /c winrm set winrm/config @{MaxTimeoutms="1800000"}</CommandLine> - <Description>Win RM MaxTimoutms</Description> - <Order>3</Order> - <RequiresUserInput>true</RequiresUserInput> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <CommandLine>cmd.exe /c winrm set winrm/config/winrs @{MaxMemoryPerShellMB="300"}</CommandLine> - <Description>Win RM MaxMemoryPerShellMB</Description> - <Order>4</Order> - <RequiresUserInput>true</RequiresUserInput> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <CommandLine>cmd.exe /c winrm set winrm/config/service @{AllowUnencrypted="true"}</CommandLine> - <Description>Win RM AllowUnencrypted</Description> - <Order>5</Order> - <RequiresUserInput>true</RequiresUserInput> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <CommandLine>cmd.exe /c winrm set winrm/config/service/auth @{Basic="true"}</CommandLine> - <Description>Win RM auth Basic</Description> - <Order>6</Order> - <RequiresUserInput>true</RequiresUserInput> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <CommandLine>cmd.exe /c winrm set winrm/config/client/auth @{Basic="true"}</CommandLine> - <Description>Win RM auth Basic</Description> - <Order>7</Order> - <RequiresUserInput>true</RequiresUserInput> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <CommandLine>cmd.exe /c winrm set winrm/config/listener?Address=*+Transport=HTTP @{Port="5985"} </CommandLine> - <Description>Win RM listener Address/Port</Description> - <Order>8</Order> - <RequiresUserInput>true</RequiresUserInput> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <CommandLine>cmd.exe /c netsh advfirewall firewall set rule group="remote administration" new enable=yes </CommandLine> - <Description>Win RM adv firewall enable</Description> - <Order>9</Order> - <RequiresUserInput>true</RequiresUserInput> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <CommandLine>cmd.exe /c netsh firewall add portopening TCP 5985 "Port 5985" </CommandLine> - <Description>Win RM port open</Description> - <Order>10</Order> - <RequiresUserInput>true</RequiresUserInput> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <CommandLine>cmd.exe /c net stop winrm </CommandLine> - <Description>Stop Win RM Service </Description> - <Order>11</Order> - <RequiresUserInput>true</RequiresUserInput> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <CommandLine>cmd.exe /c sc config winrm start= auto</CommandLine> - <Description>Win RM Autostart</Description> - <Order>12</Order> - <RequiresUserInput>true</RequiresUserInput> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <CommandLine>cmd.exe /c net start winrm </CommandLine> - <Description>Start Win RM Service</Description> - <Order>13</Order> - <RequiresUserInput>true</RequiresUserInput> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <CommandLine>powershell -Command "Set-ExecutionPolicy -ExecutionPolicy RemoteSigned -Force"</CommandLine> - <Description>Start Win RM Service</Description> - <Order>14</Order> - <RequiresUserInput>true</RequiresUserInput> - </SynchronousCommand> - </FirstLogonCommands> - <ShowWindowsLive>false</ShowWindowsLive> - </component> - </settings> - <settings pass="specialize"> - <component name="Microsoft-Windows-Shell-Setup" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> - <OEMInformation> - <HelpCustomized>false</HelpCustomized> - </OEMInformation> - <!-- Rename computer here. --> - <ComputerName>vagrant-win7ent</ComputerName> - <TimeZone>Pacific Standard Time</TimeZone> - <RegisteredOwner>Vagrant</RegisteredOwner> - <ShowWindowsLive>false</ShowWindowsLive> - </component> - <component name="Microsoft-Windows-Security-SPP-UX" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - <SkipAutoActivation>true</SkipAutoActivation> - </component> - <component name="Security-Malware-Windows-Defender" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - <DisableAntiSpyware>true</DisableAntiSpyware> - </component> - <component name="Microsoft-Windows-SystemRestore-Main" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - <DisableSR>1</DisableSR> - </component> - </settings> - <settings pass="generalize"> - <component name="Microsoft-Windows-Security-SPP" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - <SkipRearm>1</SkipRearm> - </component> - </settings> - <settings pass="offlineServicing"> - <component name="Microsoft-Windows-LUA-Settings" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - <EnableLUA>false</EnableLUA> - </component> - </settings> - <cpi:offlineImage cpi:source="catalog:d:/sources/install_windows 7 enterprise.clg" xmlns:cpi="urn:schemas-microsoft-com:cpi" /> -</unattend> diff --git a/definitions/windows-7-enterprise/README.md b/definitions/windows-7-enterprise/README.md deleted file mode 100644 index 596df7e89..000000000 --- a/definitions/windows-7-enterprise/README.md +++ /dev/null @@ -1,52 +0,0 @@ -You can download a free trial of Windows 7 Enterprise 90-day Trial - -url: http://technet.microsoft.com/en-us/evalcenter/cc442495.aspx -file: 7600.16385.090713-1255_x64fre_enterprise_en-us_EVAL_Eval_Enterprise-GRMCENXEVAL_EN_DVD.iso -md5sum: 1d0d239a252cb53e466d39e752b17c28 - -''' -PS C:\Users\Administrator> Dism /Get-WIMInfo /WimFile:d:\sources\install.wim - -Deployment Image Servicing and Management tool -Version: 6.1.7600.16385 - -Details for image : d:\sources\install.wim - -Index : 1 -Name : Windows 7 ENTERPRISE -Description : Windows 7 ENTERPRISE -Size : 11,913,037,777 bytes - -The operation completed successfully. -''' - -- place it in a directory called iso - -The installation uses the Standard way for Windows Unattended installation. -The XML file was created using the Windows AIK kit, but the file can also be edited by hand. - -To edit the Autounattend.xml and validate it: - -You can download The Windows® Automated Installation Kit (AIK) for Windows® 7: -url: http://www.microsoft.com/download/en/details.aspx?id=5753 -file: KB3AIK_EN.iso -md5sum: 1e73b24a89eceab9d50585b92db5482f - -- Building the machine creates a floppy that contains: - - AutoUnattend.xml (that will configure the windows) - - winrm-install.bat (activates the http and https listener + punches the firewall hole) - -AIK also includes dism, which will allow you to choose a specific version: - -If you want to install a different version, edit Autoattended.xml and replace the /IMAGE/NAME value with -one of the names listed in the sources/install.wim on the install DVD .iso - - - - # Use the Name : from 'Dism.exe /Get-WIMInfo /WimFile:d:\sources\install.wim' - # <InstallFrom> - # <MetaData wcm:action="add"> - # <Key>/IMAGE/NAME</Key> - # <Value>Windows 7 ENTERPRISE</Value> - # </MetaData> - # </InstallFrom> diff --git a/definitions/windows-7-enterprise/definition.rb b/definitions/windows-7-enterprise/definition.rb deleted file mode 100644 index 729a57d8b..000000000 --- a/definitions/windows-7-enterprise/definition.rb +++ /dev/null @@ -1,15 +0,0 @@ -# -*- coding: utf-8 -*- -require File.dirname(__FILE__) + "/../.windows/session.rb" - -iso_src = "http://wb.dlservice.microsoft.com/dl/download/release/Win7/3/b/a/3bac7d87-8ad2-4b7a-87b3-def36aee35fa/7600.16385.090713-1255_x64fre_enterprise_en-us_EVAL_Eval_Enterprise-GRMCENXEVAL_EN_DVD.iso" - -session = WINDOWS_SESSION.merge({ - :os_type_id => 'Windows7_64', - :iso_download_instructions => "Download Windows 7 Enterprise 90-day Trial at http://technet.microsoft.com/en-us/evalcenter/cc442495.aspx", - :iso_file => File.basename(iso_src), - :iso_src => iso_src, - :iso_md5 => "1d0d239a252cb53e466d39e752b17c28", - :kickstart_port => "7150" - }) - -Veewee::Session.declare session diff --git a/definitions/windows-7-enterprise/install-chef.bat b/definitions/windows-7-enterprise/install-chef.bat deleted file mode 120000 index 0494fd4af..000000000 --- a/definitions/windows-7-enterprise/install-chef.bat +++ /dev/null @@ -1 +0,0 @@ -../.windows/install-chef.bat \ No newline at end of file diff --git a/definitions/windows-7-enterprise/install-vbox.bat b/definitions/windows-7-enterprise/install-vbox.bat deleted file mode 120000 index 2ff5531e3..000000000 --- a/definitions/windows-7-enterprise/install-vbox.bat +++ /dev/null @@ -1 +0,0 @@ -../.windows/install-vbox.bat \ No newline at end of file diff --git a/definitions/windows-7-enterprise/mount-validation.bat b/definitions/windows-7-enterprise/mount-validation.bat deleted file mode 120000 index e137688e8..000000000 --- a/definitions/windows-7-enterprise/mount-validation.bat +++ /dev/null @@ -1 +0,0 @@ -../.windows/mount-validation.bat \ No newline at end of file diff --git a/definitions/windows-7-enterprise/oracle-cert.cer b/definitions/windows-7-enterprise/oracle-cert.cer deleted file mode 120000 index 5fbb0d341..000000000 --- a/definitions/windows-7-enterprise/oracle-cert.cer +++ /dev/null @@ -1 +0,0 @@ -../.windows/oracle-cert.cer \ No newline at end of file diff --git a/definitions/windows-8-enterprise/Autounattend.xml b/definitions/windows-8-enterprise/Autounattend.xml deleted file mode 100644 index 3a15757d6..000000000 --- a/definitions/windows-8-enterprise/Autounattend.xml +++ /dev/null @@ -1,235 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<unattend xmlns="urn:schemas-microsoft-com:unattend"> - <servicing></servicing> - - <settings pass="windowsPE"> - - <component name="Microsoft-Windows-Setup" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - - <DiskConfiguration> - <Disk wcm:action="add"> - - <CreatePartitions> - <CreatePartition wcm:action="add"> - <Order>1</Order> - <Type>Primary</Type> - <Size>20000</Size> - </CreatePartition> - </CreatePartitions> - - <ModifyPartitions> - <ModifyPartition wcm:action="add"> - <Extend>false</Extend> - <Format>NTFS</Format> - <Letter>C</Letter> - <Order>1</Order> - <PartitionID>1</PartitionID> - <Label>Windows 8</Label> - </ModifyPartition> - </ModifyPartitions> - - <DiskID>0</DiskID> - <WillWipeDisk>true</WillWipeDisk> - - </Disk> - <WillShowUI>OnError</WillShowUI> - </DiskConfiguration> - - <UserData> - <!-- Product Key from http://technet.microsoft.com/en-us/library/jj612867.aspx --> - <ProductKey>32JNW-9KQ84-P47T8-D8GGY-CWCK7 - <WillShowUI>Never</WillShowUI> - </ProductKey> - - <AcceptEula>true</AcceptEula> - <FullName>Vagrant Fullname</FullName> - <Organization>Vagrant Inc</Organization> - </UserData> - - <ImageInstall> - <OSImage> - <InstallTo> - <DiskID>0</DiskID> - <PartitionID>1</PartitionID> - </InstallTo> - <WillShowUI>OnError</WillShowUI> - <InstallToAvailablePartition>false</InstallToAvailablePartition> - <InstallFrom> - <MetaData wcm:action="add"> - <Key>/IMAGE/NAME</Key> - <Value>Windows 8 Enterprise Evaluation</Value> - </MetaData> - </InstallFrom> - </OSImage> - </ImageInstall> - - </component> - - <component name="Microsoft-Windows-International-Core-WinPE" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - <SetupUILanguage> - <UILanguage>en-US</UILanguage> - </SetupUILanguage> - <InputLocale>en-US</InputLocale> - <SystemLocale>en-US</SystemLocale> - <UILanguage>en-US</UILanguage> - <UILanguageFallback>en-US</UILanguageFallback> - <UserLocale>en-US</UserLocale> - </component> - </settings> - - - <settings pass="oobeSystem"> - <component name="Microsoft-Windows-Shell-Setup" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - <UserAccounts> - <AdministratorPassword> - <Value>vagrant</Value> - <PlainText>true</PlainText> - </AdministratorPassword> - <LocalAccounts> - <LocalAccount wcm:action="add"> - <Password> - <Value>vagrant</Value> - <PlainText>true</PlainText> - </Password> - <Description>Vagrant User</Description> - <DisplayName>vagrant</DisplayName> - <Group>administrators</Group> - <Name>vagrant</Name> - </LocalAccount> - </LocalAccounts> - </UserAccounts> - <OOBE> - <HideEULAPage>true</HideEULAPage> - <HideWirelessSetupInOOBE>true</HideWirelessSetupInOOBE> - <NetworkLocation>Home</NetworkLocation> - <ProtectYourPC>1</ProtectYourPC> - <HideOnlineAccountScreens>true</HideOnlineAccountScreens> - <HideLocalAccountScreen>true</HideLocalAccountScreen> - <SkipUserOOBE>true</SkipUserOOBE> - <HideOEMRegistrationScreen>true</HideOEMRegistrationScreen> - </OOBE> - <AutoLogon> - <Password> - <Value>vagrant</Value> - <PlainText>true</PlainText> - </Password> - <Username>administrator</Username> - <Enabled>true</Enabled> - </AutoLogon> - <FirstLogonCommands> - <!-- <SynchronousCommand wcm:action="add"> --> - <!-- <CommandLine>cmd.exe /c a:install-cygwin-sshd.bat</CommandLine> --> - <!-- <Description>Install Cygwin SSH</Description> --> - <!-- <Order>1</Order> --> - <!-- <RequiresUserInput>true</RequiresUserInput> --> - <!-- </SynchronousCommand> --> - <!-- <SynchronousCommand wcm:action="add"> --> - <!-- <CommandLine>cmd.exe /c a:install-winrm.bat</CommandLine> --> - <!-- <Description>Install Win RM</Description> --> - <!-- <Order>2</Order> --> - <!-- <RequiresUserInput>true</RequiresUserInput> --> - <!-- </SynchronousCommand> --> - <SynchronousCommand wcm:action="add"> - <CommandLine>cmd.exe /c winrm quickconfig -q</CommandLine> - <Description>winrm quickconfig -q</Description> - <Order>1</Order> - <RequiresUserInput>true</RequiresUserInput> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <CommandLine>cmd.exe /c winrm quickconfig -transport:http</CommandLine> - <Description>winrm quickconfig -transport:http</Description> - <Order>2</Order> - <RequiresUserInput>true</RequiresUserInput> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <CommandLine>cmd.exe /c winrm set winrm/config @{MaxTimeoutms="1800000"}</CommandLine> - <Description>Win RM MaxTimoutms</Description> - <Order>3</Order> - <RequiresUserInput>true</RequiresUserInput> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <CommandLine>cmd.exe /c winrm set winrm/config/winrs @{MaxMemoryPerShellMB="300"}</CommandLine> - <Description>Win RM MaxMemoryPerShellMB</Description> - <Order>4</Order> - <RequiresUserInput>true</RequiresUserInput> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <CommandLine>cmd.exe /c winrm set winrm/config/service @{AllowUnencrypted="true"}</CommandLine> - <Description>Win RM AllowUnencrypted</Description> - <Order>5</Order> - <RequiresUserInput>true</RequiresUserInput> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <CommandLine>cmd.exe /c winrm set winrm/config/service/auth @{Basic="true"}</CommandLine> - <Description>Win RM auth Basic</Description> - <Order>6</Order> - <RequiresUserInput>true</RequiresUserInput> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <CommandLine>cmd.exe /c winrm set winrm/config/client/auth @{Basic="true"}</CommandLine> - <Description>Win RM auth Basic</Description> - <Order>7</Order> - <RequiresUserInput>true</RequiresUserInput> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <CommandLine>cmd.exe /c winrm set winrm/config/listener?Address=*+Transport=HTTP @{Port="5985"} </CommandLine> - <Description>Win RM listener Address/Port</Description> - <Order>8</Order> - <RequiresUserInput>true</RequiresUserInput> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <CommandLine>cmd.exe /c netsh advfirewall firewall set rule group="remote administration" new enable=yes </CommandLine> - <Description>Win RM adv firewall enable</Description> - <Order>9</Order> - <RequiresUserInput>true</RequiresUserInput> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <CommandLine>cmd.exe /c netsh firewall add portopening TCP 5985 "Port 5985" </CommandLine> - <Description>Win RM port open</Description> - <Order>10</Order> - <RequiresUserInput>true</RequiresUserInput> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <CommandLine>cmd.exe /c net stop winrm </CommandLine> - <Description>Stop Win RM Service </Description> - <Order>11</Order> - <RequiresUserInput>true</RequiresUserInput> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <CommandLine>cmd.exe /c sc config winrm start= auto</CommandLine> - <Description>Win RM Autostart</Description> - <Order>12</Order> - <RequiresUserInput>true</RequiresUserInput> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <CommandLine>cmd.exe /c net start winrm </CommandLine> - <Description>Start Win RM Service</Description> - <Order>13</Order> - <RequiresUserInput>true</RequiresUserInput> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <CommandLine>powershell -Command "Set-ExecutionPolicy -ExecutionPolicy RemoteSigned -Force"</CommandLine> - <Description>Start Win RM Service</Description> - <Order>14</Order> - <RequiresUserInput>true</RequiresUserInput> - </SynchronousCommand> - </FirstLogonCommands> - <ShowWindowsLive>false</ShowWindowsLive> - </component> - </settings> - <settings pass="specialize"> - <component name="Microsoft-Windows-Shell-Setup" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" > - <OEMInformation> - <HelpCustomized>false</HelpCustomized> - </OEMInformation> - <!-- Rename computer here. --> - <ComputerName>vagrant-8</ComputerName> - <TimeZone>Pacific Standard Time</TimeZone> - <RegisteredOwner></RegisteredOwner> - </component> - <component name="Microsoft-Windows-Security-SPP-UX" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - <SkipAutoActivation>true</SkipAutoActivation> - </component> - </settings> - <cpi:offlineImage cpi:source="catalog:d:/sources/install_windows server 2008 r2 serverdatacenter.clg" xmlns:cpi="urn:schemas-microsoft-com:cpi" /> -</unattend> diff --git a/definitions/windows-8-enterprise/README.md b/definitions/windows-8-enterprise/README.md deleted file mode 100644 index be39b6e15..000000000 --- a/definitions/windows-8-enterprise/README.md +++ /dev/null @@ -1,87 +0,0 @@ -You can download a free trial of Windows Server 2008 R2 with Service Pack 1 from two different locations manually: - -* url: http://technet.microsoft.com/en-us/evalcenter/dd459137.aspx -* url: http://msdn.microsoft.com/en-us/evalcenter/ee175713.aspx - -But they seem to always generate the same url of http://care.dlservice.microsoft.com//dl/download/7/5/E/75EC4E54-5B02-42D6-8879-D8D3A25FBEF7/7601.17514.101119-1850_x64fre_server_eval_en-us-GRMSXEVAL_EN_DVD.iso - -* 64bit -* filename: 7601.17514.101119-1850_x64fre_server_eval_en-us-GRMSXEVAL_EN_DVD.iso -* md5sum: 4263be2cf3c59177c45085c0a7bc6ca5 - - -The installation uses the Standard Windows Unattended installation. The XML file was created using the Windows AIK kit, but the file can also be edited by hand. - -To edit the Autounattend.xml and validate it you can download The Windows® Automated Installation Kit (AIK) for Windows® 7: - -* url: http://www.microsoft.com/download/en/details.aspx?id=5753 -* file: KB3AIK_EN.iso -* md5sum: 1e73b24a89eceab9d50585b92db5482f - -AIK also includes dism, which will allow you to choose a specific version: - -If you want to install a different version, edit Autoattended.xml and replace the /IMAGE/NAME value with -one of the names listed in the 2008r2 install.wim on the install DVD .iso - - -```xml -<InstallFrom> - <MetaData wcm:action="add"> - <Key>/IMAGE/NAME</Key> - <Value>Windows Server 2008 R2 SERVERSTANDARD</Value> - </MetaData> -</InstallFrom> -``` - - -``` -PS C:\Users\Administrator> Dism /Get-WIMInfo /WimFile:d:\sources\install.wim - -Deployment Image Servicing and Management tool -Version: 6.1.7600.16385 - -Details for image : d:\sources\install.wim - -Index : 1 -Name : Windows Server 2008 R2 SERVERSTANDARD -Description : Windows Server 2008 R2 SERVERSTANDARD -Size : 10,510,643,622 bytes - -Index : 2 -Name : Windows Server 2008 R2 SERVERSTANDARDCORE -Description : Windows Server 2008 R2 SERVERSTANDARDCORE -Size : 3,564,132,307 bytes - -Index : 3 -Name : Windows Server 2008 R2 SERVERENTERPRISE -Description : Windows Server 2008 R2 SERVERENTERPRISE -Size : 10,511,024,733 bytes - -Index : 4 -Name : Windows Server 2008 R2 SERVERENTERPRISECORE -Description : Windows Server 2008 R2 SERVERENTERPRISECORE -Size : 3,564,106,331 bytes - -Index : 5 -Name : Windows Server 2008 R2 SERVERDATACENTER -Description : Windows Server 2008 R2 SERVERDATACENTER -Size : 10,511,131,897 bytes - -Index : 6 -Name : Windows Server 2008 R2 SERVERDATACENTERCORE -Description : Windows Server 2008 R2 SERVERDATACENTERCORE -Size : 3,564,144,547 bytes - -Index : 7 -Name : Windows Server 2008 R2 SERVERWEB -Description : Windows Server 2008 R2 SERVERWEB -Size : 10,520,222,743 bytes - -Index : 8 -Name : Windows Server 2008 R2 SERVERWEBCORE -Description : Windows Server 2008 R2 SERVERWEBCORE -Size : 3,562,750,400 bytes - -The operation completed successfully. -``` - diff --git a/definitions/windows-8-enterprise/definition.rb b/definitions/windows-8-enterprise/definition.rb deleted file mode 100644 index 6c0fc301a..000000000 --- a/definitions/windows-8-enterprise/definition.rb +++ /dev/null @@ -1,17 +0,0 @@ -# -*- coding: utf-8 -*- -require File.dirname(__FILE__) + "/../.windows/session.rb" - -iso_src = "http://care.dlservice.microsoft.com/dl/download/5/3/C/53C31ED0-886C-4F81-9A38-F58CE4CE71E8/9200.16384.WIN8_RTM.120725-1247_X64FRE_ENTERPRISE_EVAL_EN-US-HRM_CENA_X64FREE_EN-US_DV5.ISO" - -session = WINDOWS_SESSION.merge({ - :os_type_id => 'Windows8_64', - :iso_download_instructions => "Download Windows 8 Enterprise 90-day Trial at http://msdn.microsoft.com/en-us/evalcenter/jj554510.aspx", - :iso_file => File.basename(iso_src), - :iso_src => iso_src, - :iso_md5 => "6beffd994574ca89417286f0dc056108", - :winrm_host_port => "5988", - :kickstart_port => "7150", - :memory_size=> "512" - }) - -Veewee::Session.declare session diff --git a/definitions/windows-8-enterprise/install-chef.bat b/definitions/windows-8-enterprise/install-chef.bat deleted file mode 120000 index 0494fd4af..000000000 --- a/definitions/windows-8-enterprise/install-chef.bat +++ /dev/null @@ -1 +0,0 @@ -../.windows/install-chef.bat \ No newline at end of file diff --git a/definitions/windows-8-enterprise/install-vbox.bat b/definitions/windows-8-enterprise/install-vbox.bat deleted file mode 120000 index 2ff5531e3..000000000 --- a/definitions/windows-8-enterprise/install-vbox.bat +++ /dev/null @@ -1 +0,0 @@ -../.windows/install-vbox.bat \ No newline at end of file diff --git a/definitions/windows-8-enterprise/mount-validation.bat b/definitions/windows-8-enterprise/mount-validation.bat deleted file mode 120000 index e137688e8..000000000 --- a/definitions/windows-8-enterprise/mount-validation.bat +++ /dev/null @@ -1 +0,0 @@ -../.windows/mount-validation.bat \ No newline at end of file diff --git a/definitions/windows-8-enterprise/oracle-cert.cer b/definitions/windows-8-enterprise/oracle-cert.cer deleted file mode 120000 index 5fbb0d341..000000000 --- a/definitions/windows-8-enterprise/oracle-cert.cer +++ /dev/null @@ -1 +0,0 @@ -../.windows/oracle-cert.cer \ No newline at end of file diff --git a/packer/fedora-20-i386.json b/fedora-20-i386.json similarity index 97% rename from packer/fedora-20-i386.json rename to fedora-20-i386.json index e8c243175..9993d7d0b 100644 --- a/packer/fedora-20-i386.json +++ b/fedora-20-i386.json @@ -103,7 +103,7 @@ ], "post-processors": [ { - "output": "../builds/{{.Provider}}/opscode_fedora-20-i386_chef-{{user `chef_version`}}.box", + "output": "builds/{{.Provider}}/opscode_fedora-20-i386_chef-{{user `chef_version`}}.box", "type": "vagrant" } ], diff --git a/packer/fedora-20-x86_64.json b/fedora-20-x86_64.json similarity index 97% rename from packer/fedora-20-x86_64.json rename to fedora-20-x86_64.json index 1e1499850..2227e8681 100644 --- a/packer/fedora-20-x86_64.json +++ b/fedora-20-x86_64.json @@ -102,7 +102,7 @@ ], "post-processors": [ { - "output": "../builds/{{.Provider}}/opscode_fedora-20_chef-{{user `chef_version`}}.box", + "output": "builds/{{.Provider}}/opscode_fedora-20_chef-{{user `chef_version`}}.box", "type": "vagrant" } ], diff --git a/packer/fedora-21-i386.json b/fedora-21-i386.json similarity index 97% rename from packer/fedora-21-i386.json rename to fedora-21-i386.json index 481edc45a..ece141c9e 100644 --- a/packer/fedora-21-i386.json +++ b/fedora-21-i386.json @@ -103,7 +103,7 @@ ], "post-processors": [ { - "output": "../builds/{{.Provider}}/opscode_fedora-21-i386_chef-{{user `chef_version`}}.box", + "output": "builds/{{.Provider}}/opscode_fedora-21-i386_chef-{{user `chef_version`}}.box", "type": "vagrant" } ], diff --git a/packer/fedora-21-x86_64.json b/fedora-21-x86_64.json similarity index 97% rename from packer/fedora-21-x86_64.json rename to fedora-21-x86_64.json index 557ea423d..592dfda01 100644 --- a/packer/fedora-21-x86_64.json +++ b/fedora-21-x86_64.json @@ -102,7 +102,7 @@ ], "post-processors": [ { - "output": "../builds/{{.Provider}}/opscode_fedora-21_chef-{{user `chef_version`}}.box", + "output": "builds/{{.Provider}}/opscode_fedora-21_chef-{{user `chef_version`}}.box", "type": "vagrant" } ], diff --git a/packer/floppy/omnios/README.TXT b/floppy/omnios/README.TXT similarity index 100% rename from packer/floppy/omnios/README.TXT rename to floppy/omnios/README.TXT diff --git a/packer/floppy/solaris10/S99startup.sh b/floppy/solaris10/S99startup.sh similarity index 100% rename from packer/floppy/solaris10/S99startup.sh rename to floppy/solaris10/S99startup.sh diff --git a/packer/floppy/solaris10/awesome_prof b/floppy/solaris10/awesome_prof similarity index 100% rename from packer/floppy/solaris10/awesome_prof rename to floppy/solaris10/awesome_prof diff --git a/packer/floppy/solaris10/finish.sh b/floppy/solaris10/finish.sh similarity index 100% rename from packer/floppy/solaris10/finish.sh rename to floppy/solaris10/finish.sh diff --git a/packer/floppy/solaris10/rules.ok b/floppy/solaris10/rules.ok similarity index 100% rename from packer/floppy/solaris10/rules.ok rename to floppy/solaris10/rules.ok diff --git a/packer/floppy/solaris10/sysidcfg b/floppy/solaris10/sysidcfg similarity index 100% rename from packer/floppy/solaris10/sysidcfg rename to floppy/solaris10/sysidcfg diff --git a/packer/freebsd-10.1-amd64.json b/freebsd-10.1-amd64.json similarity index 98% rename from packer/freebsd-10.1-amd64.json rename to freebsd-10.1-amd64.json index 7fe1ff679..a4f724a4c 100644 --- a/packer/freebsd-10.1-amd64.json +++ b/freebsd-10.1-amd64.json @@ -127,7 +127,7 @@ ], "post-processors": [ { - "output": "../builds/{{.Provider}}/opscode_freebsd-10.1_chef-{{user `chef_version`}}.box", + "output": "builds/{{.Provider}}/opscode_freebsd-10.1_chef-{{user `chef_version`}}.box", "override": { "parallels": { "vagrantfile_template": "vagrantfile_templates/parallels/freebsd.rb" diff --git a/packer/freebsd-10.1-i386.json b/freebsd-10.1-i386.json similarity index 98% rename from packer/freebsd-10.1-i386.json rename to freebsd-10.1-i386.json index 409ab32a6..07f3fa6f7 100644 --- a/packer/freebsd-10.1-i386.json +++ b/freebsd-10.1-i386.json @@ -127,7 +127,7 @@ ], "post-processors": [ { - "output": "../builds/{{.Provider}}/opscode_freebsd-10.1-i386_chef-{{user `chef_version`}}.box", + "output": "builds/{{.Provider}}/opscode_freebsd-10.1-i386_chef-{{user `chef_version`}}.box", "override": { "parallels": { "vagrantfile_template": "vagrantfile_templates/parallels/freebsd.rb" diff --git a/packer/freebsd-9.3-amd64.json b/freebsd-9.3-amd64.json similarity index 98% rename from packer/freebsd-9.3-amd64.json rename to freebsd-9.3-amd64.json index 379fd4cfb..2c591bd03 100644 --- a/packer/freebsd-9.3-amd64.json +++ b/freebsd-9.3-amd64.json @@ -131,7 +131,7 @@ ], "post-processors": [ { - "output": "../builds/{{.Provider}}/opscode_freebsd-9.3_chef-{{user `chef_version`}}.box", + "output": "builds/{{.Provider}}/opscode_freebsd-9.3_chef-{{user `chef_version`}}.box", "override": { "parallels": { "vagrantfile_template": "vagrantfile_templates/parallels/freebsd.rb" diff --git a/packer/freebsd-9.3-i386.json b/freebsd-9.3-i386.json similarity index 98% rename from packer/freebsd-9.3-i386.json rename to freebsd-9.3-i386.json index f3204fc46..fb27ba491 100644 --- a/packer/freebsd-9.3-i386.json +++ b/freebsd-9.3-i386.json @@ -130,7 +130,7 @@ ], "post-processors": [ { - "output": "../builds/{{.Provider}}/opscode_freebsd-9.3-i386_chef-{{user `chef_version`}}.box", + "output": "builds/{{.Provider}}/opscode_freebsd-9.3-i386_chef-{{user `chef_version`}}.box", "override": { "parallels": { "vagrantfile_template": "vagrantfile_templates/parallels/freebsd.rb" diff --git a/packer/http/centos-5.11/ks.cfg b/http/centos-5.11/ks.cfg similarity index 100% rename from packer/http/centos-5.11/ks.cfg rename to http/centos-5.11/ks.cfg diff --git a/packer/http/centos-6.6/ks.cfg b/http/centos-6.6/ks.cfg similarity index 100% rename from packer/http/centos-6.6/ks.cfg rename to http/centos-6.6/ks.cfg diff --git a/packer/http/centos-7.1/ks.cfg b/http/centos-7.1/ks.cfg similarity index 100% rename from packer/http/centos-7.1/ks.cfg rename to http/centos-7.1/ks.cfg diff --git a/packer/http/debian-6.0/preseed.cfg b/http/debian-6.0/preseed.cfg similarity index 100% rename from packer/http/debian-6.0/preseed.cfg rename to http/debian-6.0/preseed.cfg diff --git a/packer/http/debian-7/preseed.cfg b/http/debian-7/preseed.cfg similarity index 100% rename from packer/http/debian-7/preseed.cfg rename to http/debian-7/preseed.cfg diff --git a/packer/http/fedora-20/ks.cfg b/http/fedora-20/ks.cfg similarity index 100% rename from packer/http/fedora-20/ks.cfg rename to http/fedora-20/ks.cfg diff --git a/packer/http/fedora-21/ks.cfg b/http/fedora-21/ks.cfg similarity index 100% rename from packer/http/fedora-21/ks.cfg rename to http/fedora-21/ks.cfg diff --git a/packer/http/freebsd-10.1/install.sh b/http/freebsd-10.1/install.sh similarity index 100% rename from packer/http/freebsd-10.1/install.sh rename to http/freebsd-10.1/install.sh diff --git a/packer/http/freebsd-9.3/install.sh b/http/freebsd-9.3/install.sh similarity index 100% rename from packer/http/freebsd-9.3/install.sh rename to http/freebsd-9.3/install.sh diff --git a/packer/http/opensuse-13.2/autoinst.xml b/http/opensuse-13.2/autoinst.xml similarity index 100% rename from packer/http/opensuse-13.2/autoinst.xml rename to http/opensuse-13.2/autoinst.xml diff --git a/packer/http/sles-11/sles-11-sp2-i386-autoinst.xml b/http/sles-11/sles-11-sp2-i386-autoinst.xml similarity index 100% rename from packer/http/sles-11/sles-11-sp2-i386-autoinst.xml rename to http/sles-11/sles-11-sp2-i386-autoinst.xml diff --git a/packer/http/sles-11/sles-11-sp2-x86_64-autoinst.xml b/http/sles-11/sles-11-sp2-x86_64-autoinst.xml similarity index 100% rename from packer/http/sles-11/sles-11-sp2-x86_64-autoinst.xml rename to http/sles-11/sles-11-sp2-x86_64-autoinst.xml diff --git a/packer/http/sles-11/sles-11-sp3-i386-autoinst.xml b/http/sles-11/sles-11-sp3-i386-autoinst.xml similarity index 100% rename from packer/http/sles-11/sles-11-sp3-i386-autoinst.xml rename to http/sles-11/sles-11-sp3-i386-autoinst.xml diff --git a/packer/http/sles-11/sles-11-sp3-x86_64-autoinst.xml b/http/sles-11/sles-11-sp3-x86_64-autoinst.xml similarity index 100% rename from packer/http/sles-11/sles-11-sp3-x86_64-autoinst.xml rename to http/sles-11/sles-11-sp3-x86_64-autoinst.xml diff --git a/packer/http/sles-12/sles-12-x86_64-autoinst.xml b/http/sles-12/sles-12-x86_64-autoinst.xml similarity index 100% rename from packer/http/sles-12/sles-12-x86_64-autoinst.xml rename to http/sles-12/sles-12-x86_64-autoinst.xml diff --git a/packer/http/solaris-11/default.xml b/http/solaris-11/default.xml similarity index 100% rename from packer/http/solaris-11/default.xml rename to http/solaris-11/default.xml diff --git a/packer/http/solaris-11/profile.xml b/http/solaris-11/profile.xml similarity index 100% rename from packer/http/solaris-11/profile.xml rename to http/solaris-11/profile.xml diff --git a/packer/http/ubuntu-10.04/preseed.cfg b/http/ubuntu-10.04/preseed.cfg similarity index 100% rename from packer/http/ubuntu-10.04/preseed.cfg rename to http/ubuntu-10.04/preseed.cfg diff --git a/packer/http/ubuntu-12.04/preseed.cfg b/http/ubuntu-12.04/preseed.cfg similarity index 100% rename from packer/http/ubuntu-12.04/preseed.cfg rename to http/ubuntu-12.04/preseed.cfg diff --git a/packer/http/ubuntu-14.04/preseed.cfg b/http/ubuntu-14.04/preseed.cfg similarity index 100% rename from packer/http/ubuntu-14.04/preseed.cfg rename to http/ubuntu-14.04/preseed.cfg diff --git a/packer/http/ubuntu-14.10/preseed.cfg b/http/ubuntu-14.10/preseed.cfg similarity index 100% rename from packer/http/ubuntu-14.10/preseed.cfg rename to http/ubuntu-14.10/preseed.cfg diff --git a/packer/macosx-10.7.json b/macosx-10.7.json similarity index 97% rename from packer/macosx-10.7.json rename to macosx-10.7.json index 462cb6ecd..3ab2d06de 100644 --- a/packer/macosx-10.7.json +++ b/macosx-10.7.json @@ -124,7 +124,7 @@ { "type": "vagrant", "vagrantfile_template": "vagrantfile_templates/macosx.rb", - "output": "../builds/{{.Provider}}/opscode_macosx-10.7_chef-{{user `chef_version`}}.box" + "output": "builds/{{.Provider}}/opscode_macosx-10.7_chef-{{user `chef_version`}}.box" } ] } diff --git a/packer/macosx-10.8.json b/macosx-10.8.json similarity index 97% rename from packer/macosx-10.8.json rename to macosx-10.8.json index 32c4ccc5f..7ff6108ad 100644 --- a/packer/macosx-10.8.json +++ b/macosx-10.8.json @@ -124,7 +124,7 @@ { "type": "vagrant", "vagrantfile_template": "vagrantfile_templates/macosx.rb", - "output": "../builds/{{.Provider}}/opscode_macosx-10.8_chef-{{user `chef_version`}}.box" + "output": "builds/{{.Provider}}/opscode_macosx-10.8_chef-{{user `chef_version`}}.box" } ] } diff --git a/packer/macosx-10.9.json b/macosx-10.9.json similarity index 97% rename from packer/macosx-10.9.json rename to macosx-10.9.json index 55db87257..0bb10a3dd 100644 --- a/packer/macosx-10.9.json +++ b/macosx-10.9.json @@ -124,7 +124,7 @@ { "type": "vagrant", "vagrantfile_template": "vagrantfile_templates/macosx.rb", - "output": "../builds/{{.Provider}}/opscode_macosx-10.9_chef-{{user `chef_version`}}.box" + "output": "builds/{{.Provider}}/opscode_macosx-10.9_chef-{{user `chef_version`}}.box" } ] } diff --git a/packer/omnios-r151010j.json b/omnios-r151010j.json similarity index 98% rename from packer/omnios-r151010j.json rename to omnios-r151010j.json index 2f17212ab..3968e15fe 100644 --- a/packer/omnios-r151010j.json +++ b/omnios-r151010j.json @@ -170,7 +170,7 @@ "post-processors": [ { "compression_level": 9, - "output": "../builds/{{.Provider}}/opscode_omnios-r151010j_chef-{{user `chef_version`}}.box", + "output": "builds/{{.Provider}}/opscode_omnios-r151010j_chef-{{user `chef_version`}}.box", "override": { "parallels": { "vagrantfile_template": "vagrantfile_templates/parallels/omnios.rb" diff --git a/packer/opensuse-13.2-i386.json b/opensuse-13.2-i386.json similarity index 97% rename from packer/opensuse-13.2-i386.json rename to opensuse-13.2-i386.json index 38739e592..7ffdd208d 100644 --- a/packer/opensuse-13.2-i386.json +++ b/opensuse-13.2-i386.json @@ -113,7 +113,7 @@ ], "post-processors": [ { - "output": "../builds/{{.Provider}}/opscode_opensuse-13.2-i386_chef-{{user `chef_version`}}.box", + "output": "builds/{{.Provider}}/opscode_opensuse-13.2-i386_chef-{{user `chef_version`}}.box", "type": "vagrant" } ], diff --git a/packer/opensuse-13.2-x86_64.json b/opensuse-13.2-x86_64.json similarity index 97% rename from packer/opensuse-13.2-x86_64.json rename to opensuse-13.2-x86_64.json index f5f0f4900..9dba30337 100644 --- a/packer/opensuse-13.2-x86_64.json +++ b/opensuse-13.2-x86_64.json @@ -113,7 +113,7 @@ ], "post-processors": [ { - "output": "../builds/{{.Provider}}/opscode_opensuse-13.2-x86_64_chef-{{user `chef_version`}}.box", + "output": "builds/{{.Provider}}/opscode_opensuse-13.2-x86_64_chef-{{user `chef_version`}}.box", "type": "vagrant" } ], diff --git a/packer/oracle-5.11-i386.json b/oracle-5.11-i386.json similarity index 97% rename from packer/oracle-5.11-i386.json rename to oracle-5.11-i386.json index e3d2fe214..e24512703 100644 --- a/packer/oracle-5.11-i386.json +++ b/oracle-5.11-i386.json @@ -103,7 +103,7 @@ ], "post-processors": [ { - "output": "../builds/{{.Provider}}/opscode_oracle-5.11-i386_chef-{{user `chef_version`}}.box", + "output": "builds/{{.Provider}}/opscode_oracle-5.11-i386_chef-{{user `chef_version`}}.box", "type": "vagrant" } ], diff --git a/packer/oracle-5.11-x86_64.json b/oracle-5.11-x86_64.json similarity index 97% rename from packer/oracle-5.11-x86_64.json rename to oracle-5.11-x86_64.json index e70d90594..f4f3a8078 100644 --- a/packer/oracle-5.11-x86_64.json +++ b/oracle-5.11-x86_64.json @@ -103,7 +103,7 @@ ], "post-processors": [ { - "output": "../builds/{{.Provider}}/opscode_oracle-5.11_chef-{{user `chef_version`}}.box", + "output": "builds/{{.Provider}}/opscode_oracle-5.11_chef-{{user `chef_version`}}.box", "type": "vagrant" } ], diff --git a/packer/oracle-6.6-i386.json b/oracle-6.6-i386.json similarity index 97% rename from packer/oracle-6.6-i386.json rename to oracle-6.6-i386.json index 589032422..55509e4e7 100644 --- a/packer/oracle-6.6-i386.json +++ b/oracle-6.6-i386.json @@ -103,7 +103,7 @@ ], "post-processors": [ { - "output": "../builds/{{.Provider}}/opscode_oracle-6.6-i386_chef-{{user `chef_version`}}.box", + "output": "builds/{{.Provider}}/opscode_oracle-6.6-i386_chef-{{user `chef_version`}}.box", "type": "vagrant" } ], diff --git a/packer/oracle-6.6-x86_64.json b/oracle-6.6-x86_64.json similarity index 97% rename from packer/oracle-6.6-x86_64.json rename to oracle-6.6-x86_64.json index 0a6a55b89..4c5e97b75 100644 --- a/packer/oracle-6.6-x86_64.json +++ b/oracle-6.6-x86_64.json @@ -102,7 +102,7 @@ ], "post-processors": [ { - "output": "../builds/{{.Provider}}/opscode_oracle-6.6_chef-{{user `chef_version`}}.box", + "output": "builds/{{.Provider}}/opscode_oracle-6.6_chef-{{user `chef_version`}}.box", "type": "vagrant" } ], diff --git a/packer/scripts/windows/install-chef.bat b/packer/scripts/windows/install-chef.bat deleted file mode 100644 index 2107a1b29..000000000 --- a/packer/scripts/windows/install-chef.bat +++ /dev/null @@ -1,47 +0,0 @@ -@REM Loop ten times to make sure outbound networking is up -FOR /L %%n IN (1,1,10) DO ( - PING -n 1 www.opscode.com - IF %ERRORLEVEL% == 0 CALL :wget - TIMEOUT 10 -) - -:err -ECHO "Couldn't reach Opscode even after 10 retries" -GOTO :done - -:wget -@rem Install Chef using chef-client MSI installer -@setlocal - -@set REMOTE_SOURCE_MSI_URL=https://www.opscode.com/chef/install.msi -@set LOCAL_DESTINATION_MSI_PATH=%TEMP%\chef-client-latest.msi -@set FALLBACK_QUERY_STRING=?DownloadContext=PowerShell - -@set ALTERNATE_DOWNLOAD_COMMAND=$webClient=new-object System.Net.WebClient; $webClient.DownloadFile('%REMOTE_SOURCE_MSI_URL%%FALLBACK_QUERY_STRING%', '%LOCAL_DESTINATION_MSI_PATH%') - -cscript /nologo %TEMP%\wget.vbs /url:%REMOTE_SOURCE_MSI_URL% /path:"%LOCAL_DESTINATION_MSI_PATH%" - -@rem Work around issues found in Windows Server 2012 around job objects not respecting WSMAN memory quotas -@rem that cause the MSI download process to exceed the quota even when it is increased by administrators. -@rem Retry the download using a more memory-efficient mechanism that only works if PowerShell is available. -@if ERRORLEVEL 1 ( - echo Warning: Failed to download %REMOTE_SOURCE_MSI_URL% to %LOCAL_DESTINATION_MSI_PATH% - echo Warning: Retrying download with PowerShell if available - if EXIST "%LOCAL_DESTINATION_MSI_PATH%" del /f /q "%LOCAL_DESTINATION_MSI_PATH%" - echo powershell -noprofile -noninteractive -command "%ALTERNATE_DOWNLOAD_COMMAND%" - powershell -noprofile -noninteractive -command "%ALTERNATE_DOWNLOAD_COMMAND%" - if NOT ERRORLEVEL 1 ( - echo Download succeeded - ) else ( - echo Failed to download %REMOTE_SOURCE_MSI_URL% - echo Subsequent attempt to install the downloaded MSI is likely to fail - ) -) - -msiexec /qb /i "%LOCAL_DESTINATION_MSI_PATH%" - -@endlocal -EXIT - -:done -EXIT diff --git a/packer/scripts/windows/install-vbox.bat b/packer/scripts/windows/install-vbox.bat deleted file mode 100644 index 614c415c7..000000000 --- a/packer/scripts/windows/install-vbox.bat +++ /dev/null @@ -1,4 +0,0 @@ -cmd /c certutil -addstore -f "TrustedPublisher" a:oracle-cert.cer -cmd /c e:\VBoxWindowsAdditions-amd64.exe /S -cmd /c shutdown.exe /r /t 5 /d p:2:4 /c "Vagrant reboot for VBoxWindowsAdditions" - diff --git a/packer/scripts/windows/mount-validation.bat b/packer/scripts/windows/mount-validation.bat deleted file mode 100644 index ae458c1d6..000000000 --- a/packer/scripts/windows/mount-validation.bat +++ /dev/null @@ -1,3 +0,0 @@ -REM This is so we can pass the validation test... I don't know that it's necessary -cmd /c net use z: \\vboxsrv\veewee-validation - diff --git a/packer/scripts/windows/oracle-cert.cer b/packer/scripts/windows/oracle-cert.cer deleted file mode 100644 index 6f3380d48553956036650bc711ca5aed73a1224d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1398 zcmXqLVl6UgVu@P7%*4pVBoH|JX8KPK#!$sYJbaVIzH}P!vT<s)d9;1!Wn^S!WiV*m zV#sa4$;KSY!Y0fV8f++TAPVAe3G;=e7G(x!rswG>c;+SR8Oj^Tf+V<w#b6Q&Aw{Ld zB?^A2CFS`=*@o5zmJkI-A*n^V#R~ap3Z=!V3W+5O86_nJ#a8<I<>lpiWk6Glfu`yu z=jZAd6(lNXBx@QP80s15fHX4;tHMop&PgmTRxnm@&QD2I068QxFI~aNz|cU!+0j5w zoY&CMz{tSD01TplToWMI+{oC}($q4_pm8gzw}cG@LFRJ^b2%sGWTxd8<z*(q{K_uO z7nGV(o}Zth5S)=;lv->kZ6FC!%_Sn_UzC`flL~Z0Q9*uDVo7Fxo}rzA4aA?OE}7|> zC5br-o-PV7$LcEhW+oTq7w4yyC<FtE^2DN4g)pF%DPYYCWkxW=nXwse(8Q>O97Bw( z49rc8{0u;GE~X|%MuyHw?*%`8FjtXzIendtSKY3w*O-60EAjFQ2OV~w_ftDDLUzu_ z85<Wa=?S-*nejb)|0Bzi=ZAKyJXs+1{&U}<E!<r7eBtNQVs{iy`CpdM8+pV3kFKYd z;{O}R&%U~HRFb)|&*|X#58c1RGz)!dcTGuVbeeB)eCp1-hX0aX)OY`{ZrXppaE9c( z=3cQz#vO?t;*(yVb7)<pC3A9tz>SryzkP0TS}(uOwDSCq)A{l5xun*{K0kH+^Qm$< z{v9i2H}l%A36FnQYWvH^<3!H>xUK(c<{T^S(EK-X{(E*tk9{wuILuppXYONpzdIrm z6;8kD=Vfr5%TV)i?iWRwFs0(DVJoe?Co?fKGB7S~Vyp&+NI5v&$_leE888^|0pmoL zpONuD3kx$7dxL=kh%e7#X<%+(y1;mWVVgcE6#^4sa&fY;E+`r4CKu(PCP(LBXNZ&@ zP|CmsWP$>VtpO-ub0@TUFt+`0Wn>p;HqbKAVB^qc1LhxgCPpzCe97BD7-Whn3y%R8 zObau!K_QII$jFjvkZhm=;~OxxNkHA1pIlsk;yeRuxGE+rzDdkXL{YAf<eStY19^}; zlvyMU#2Q4-&s_PcTJ4MX$-e&UA6V7iKfbhlE--&^Lj33ibQCZQSp*Ek*tmecWMOPF zXJV9Q;V@tWCO}{aBPUQ`5duu0j10%my}A5s>tn4l8@-n`97fxDH}mY7!8P?YpYXXe zANBj<Zy#8B<=plhr2w0$&kh}Y;3_J_rq%O(!d;Kdh!69Qrx$0(Z#pBlLibZ#!*^ku zETe+LaLfPw_xTrys&70sPe)j1+iVq`aMSBM(lw_ziD+!<3Y)OpMqT!-=r7Lxi?JI@ z<mcTks*7urddn8t7Ob=7j{GmlCwc6O!YLD(?sT2IaC=(b)&muZ35!DO?Rt6F3ICk! zzWcisYuQ$<<p-zv%;P9Gxv*7GE-~|}O~UcDuPhm!mwENJ*Y;evpI^83&Bmf4#}q;F kZ>ww{IP}*EUbv-wBB=FaQSwz;n~wTPeHRx#@~!?40OZx*k^lez diff --git a/packer/rhel-5.11-i386.json b/rhel-5.11-i386.json similarity index 97% rename from packer/rhel-5.11-i386.json rename to rhel-5.11-i386.json index b52df5989..573f3cb83 100644 --- a/packer/rhel-5.11-i386.json +++ b/rhel-5.11-i386.json @@ -103,7 +103,7 @@ ], "post-processors": [ { - "output": "../builds/{{.Provider}}/opscode_rhel-5.11-i386_chef-{{user `chef_version`}}.box", + "output": "builds/{{.Provider}}/opscode_rhel-5.11-i386_chef-{{user `chef_version`}}.box", "type": "vagrant" } ], diff --git a/packer/rhel-5.11-x86_64.json b/rhel-5.11-x86_64.json similarity index 97% rename from packer/rhel-5.11-x86_64.json rename to rhel-5.11-x86_64.json index dbddf5d16..bef621293 100644 --- a/packer/rhel-5.11-x86_64.json +++ b/rhel-5.11-x86_64.json @@ -103,7 +103,7 @@ ], "post-processors": [ { - "output": "../builds/{{.Provider}}/opscode_rhel-5.11_chef-{{user `chef_version`}}.box", + "output": "builds/{{.Provider}}/opscode_rhel-5.11_chef-{{user `chef_version`}}.box", "type": "vagrant" } ], diff --git a/packer/rhel-6.6-i386.json b/rhel-6.6-i386.json similarity index 97% rename from packer/rhel-6.6-i386.json rename to rhel-6.6-i386.json index 0c96c240d..6d897ad92 100644 --- a/packer/rhel-6.6-i386.json +++ b/rhel-6.6-i386.json @@ -103,7 +103,7 @@ ], "post-processors": [ { - "output": "../builds/{{.Provider}}/opscode_rhel-6.6-i386_chef-{{user `chef_version`}}.box", + "output": "builds/{{.Provider}}/opscode_rhel-6.6-i386_chef-{{user `chef_version`}}.box", "type": "vagrant" } ], diff --git a/packer/rhel-6.6-x86_64.json b/rhel-6.6-x86_64.json similarity index 97% rename from packer/rhel-6.6-x86_64.json rename to rhel-6.6-x86_64.json index 3f1ed947e..a8b915417 100644 --- a/packer/rhel-6.6-x86_64.json +++ b/rhel-6.6-x86_64.json @@ -102,7 +102,7 @@ ], "post-processors": [ { - "output": "../builds/{{.Provider}}/opscode_rhel-6.6_chef-{{user `chef_version`}}.box", + "output": "builds/{{.Provider}}/opscode_rhel-6.6_chef-{{user `chef_version`}}.box", "type": "vagrant" } ], diff --git a/packer/rhel-7.1-x86_64.json b/rhel-7.1-x86_64.json similarity index 97% rename from packer/rhel-7.1-x86_64.json rename to rhel-7.1-x86_64.json index 78866ffd0..4d4645864 100644 --- a/packer/rhel-7.1-x86_64.json +++ b/rhel-7.1-x86_64.json @@ -103,7 +103,7 @@ ], "post-processors": [ { - "output": "../builds/{{.Provider}}/opscode_rhel-7.1_chef-{{user `chef_version`}}.box", + "output": "builds/{{.Provider}}/opscode_rhel-7.1_chef-{{user `chef_version`}}.box", "type": "vagrant" } ], diff --git a/packer/scripts/centos/cleanup.sh b/scripts/centos/cleanup.sh similarity index 100% rename from packer/scripts/centos/cleanup.sh rename to scripts/centos/cleanup.sh diff --git a/packer/scripts/centos/fix-slow-dns.sh b/scripts/centos/fix-slow-dns.sh similarity index 100% rename from packer/scripts/centos/fix-slow-dns.sh rename to scripts/centos/fix-slow-dns.sh diff --git a/packer/scripts/common/chef.sh b/scripts/common/chef.sh similarity index 100% rename from packer/scripts/common/chef.sh rename to scripts/common/chef.sh diff --git a/packer/scripts/common/minimize.sh b/scripts/common/minimize.sh similarity index 100% rename from packer/scripts/common/minimize.sh rename to scripts/common/minimize.sh diff --git a/packer/scripts/common/shutdown.sh b/scripts/common/shutdown.sh similarity index 100% rename from packer/scripts/common/shutdown.sh rename to scripts/common/shutdown.sh diff --git a/packer/scripts/common/sshd.sh b/scripts/common/sshd.sh similarity index 100% rename from packer/scripts/common/sshd.sh rename to scripts/common/sshd.sh diff --git a/packer/scripts/common/sudoers.sh b/scripts/common/sudoers.sh similarity index 100% rename from packer/scripts/common/sudoers.sh rename to scripts/common/sudoers.sh diff --git a/packer/scripts/common/vagrant.sh b/scripts/common/vagrant.sh similarity index 100% rename from packer/scripts/common/vagrant.sh rename to scripts/common/vagrant.sh diff --git a/packer/scripts/common/vmtools.sh b/scripts/common/vmtools.sh similarity index 100% rename from packer/scripts/common/vmtools.sh rename to scripts/common/vmtools.sh diff --git a/packer/scripts/debian/cleanup.sh b/scripts/debian/cleanup.sh similarity index 100% rename from packer/scripts/debian/cleanup.sh rename to scripts/debian/cleanup.sh diff --git a/packer/scripts/debian/networking.sh b/scripts/debian/networking.sh similarity index 100% rename from packer/scripts/debian/networking.sh rename to scripts/debian/networking.sh diff --git a/packer/scripts/debian/preseed.cfg b/scripts/debian/preseed.cfg similarity index 100% rename from packer/scripts/debian/preseed.cfg rename to scripts/debian/preseed.cfg diff --git a/packer/scripts/debian/sudoers.sh b/scripts/debian/sudoers.sh similarity index 100% rename from packer/scripts/debian/sudoers.sh rename to scripts/debian/sudoers.sh diff --git a/packer/scripts/debian/update.sh b/scripts/debian/update.sh similarity index 100% rename from packer/scripts/debian/update.sh rename to scripts/debian/update.sh diff --git a/packer/scripts/fedora/cleanup.sh b/scripts/fedora/cleanup.sh similarity index 100% rename from packer/scripts/fedora/cleanup.sh rename to scripts/fedora/cleanup.sh diff --git a/packer/scripts/fedora/fix-slow-dns.sh b/scripts/fedora/fix-slow-dns.sh similarity index 100% rename from packer/scripts/fedora/fix-slow-dns.sh rename to scripts/fedora/fix-slow-dns.sh diff --git a/packer/scripts/fedora/shutdown.sh b/scripts/fedora/shutdown.sh similarity index 100% rename from packer/scripts/fedora/shutdown.sh rename to scripts/fedora/shutdown.sh diff --git a/packer/scripts/fedora/sudoers.sh b/scripts/fedora/sudoers.sh similarity index 100% rename from packer/scripts/fedora/sudoers.sh rename to scripts/fedora/sudoers.sh diff --git a/packer/scripts/freebsd/cleanup.sh b/scripts/freebsd/cleanup.sh similarity index 100% rename from packer/scripts/freebsd/cleanup.sh rename to scripts/freebsd/cleanup.sh diff --git a/packer/scripts/freebsd/minimize.sh b/scripts/freebsd/minimize.sh similarity index 100% rename from packer/scripts/freebsd/minimize.sh rename to scripts/freebsd/minimize.sh diff --git a/packer/scripts/freebsd/postinstall.sh b/scripts/freebsd/postinstall.sh similarity index 100% rename from packer/scripts/freebsd/postinstall.sh rename to scripts/freebsd/postinstall.sh diff --git a/packer/scripts/freebsd/vmtools.sh b/scripts/freebsd/vmtools.sh similarity index 100% rename from packer/scripts/freebsd/vmtools.sh rename to scripts/freebsd/vmtools.sh diff --git a/packer/scripts/macosx/builder.sh b/scripts/macosx/builder.sh similarity index 100% rename from packer/scripts/macosx/builder.sh rename to scripts/macosx/builder.sh diff --git a/packer/scripts/macosx/cleanup.sh b/scripts/macosx/cleanup.sh similarity index 100% rename from packer/scripts/macosx/cleanup.sh rename to scripts/macosx/cleanup.sh diff --git a/packer/scripts/macosx/hostname.sh b/scripts/macosx/hostname.sh similarity index 100% rename from packer/scripts/macosx/hostname.sh rename to scripts/macosx/hostname.sh diff --git a/packer/scripts/macosx/support/kcpassword b/scripts/macosx/support/kcpassword similarity index 100% rename from packer/scripts/macosx/support/kcpassword rename to scripts/macosx/support/kcpassword diff --git a/packer/scripts/macosx/update.sh b/scripts/macosx/update.sh similarity index 100% rename from packer/scripts/macosx/update.sh rename to scripts/macosx/update.sh diff --git a/packer/scripts/macosx/vagrant.sh b/scripts/macosx/vagrant.sh similarity index 100% rename from packer/scripts/macosx/vagrant.sh rename to scripts/macosx/vagrant.sh diff --git a/packer/scripts/omnios/postinstall.sh b/scripts/omnios/postinstall.sh similarity index 100% rename from packer/scripts/omnios/postinstall.sh rename to scripts/omnios/postinstall.sh diff --git a/packer/scripts/omnios/vmtools.sh b/scripts/omnios/vmtools.sh similarity index 100% rename from packer/scripts/omnios/vmtools.sh rename to scripts/omnios/vmtools.sh diff --git a/packer/scripts/opensuse/cleanup.sh b/scripts/opensuse/cleanup.sh similarity index 100% rename from packer/scripts/opensuse/cleanup.sh rename to scripts/opensuse/cleanup.sh diff --git a/packer/scripts/opensuse/remove-dvd-source.sh b/scripts/opensuse/remove-dvd-source.sh similarity index 100% rename from packer/scripts/opensuse/remove-dvd-source.sh rename to scripts/opensuse/remove-dvd-source.sh diff --git a/packer/scripts/opensuse/sudoers.sh b/scripts/opensuse/sudoers.sh similarity index 100% rename from packer/scripts/opensuse/sudoers.sh rename to scripts/opensuse/sudoers.sh diff --git a/packer/scripts/opensuse/zypper-locks.sh b/scripts/opensuse/zypper-locks.sh similarity index 100% rename from packer/scripts/opensuse/zypper-locks.sh rename to scripts/opensuse/zypper-locks.sh diff --git a/packer/scripts/sles/cleanup.sh b/scripts/sles/cleanup.sh similarity index 100% rename from packer/scripts/sles/cleanup.sh rename to scripts/sles/cleanup.sh diff --git a/packer/scripts/sles/remove-dvd-source.sh b/scripts/sles/remove-dvd-source.sh similarity index 100% rename from packer/scripts/sles/remove-dvd-source.sh rename to scripts/sles/remove-dvd-source.sh diff --git a/packer/scripts/sles/sudoers.sh b/scripts/sles/sudoers.sh similarity index 100% rename from packer/scripts/sles/sudoers.sh rename to scripts/sles/sudoers.sh diff --git a/packer/scripts/sles/unsupported-modules.sh b/scripts/sles/unsupported-modules.sh similarity index 100% rename from packer/scripts/sles/unsupported-modules.sh rename to scripts/sles/unsupported-modules.sh diff --git a/packer/scripts/sles/zypper-locks.sh b/scripts/sles/zypper-locks.sh similarity index 100% rename from packer/scripts/sles/zypper-locks.sh rename to scripts/sles/zypper-locks.sh diff --git a/packer/scripts/solaris/minimize.sh b/scripts/solaris/minimize.sh similarity index 100% rename from packer/scripts/solaris/minimize.sh rename to scripts/solaris/minimize.sh diff --git a/packer/scripts/solaris/update.sh b/scripts/solaris/update.sh similarity index 100% rename from packer/scripts/solaris/update.sh rename to scripts/solaris/update.sh diff --git a/packer/scripts/solaris/vmtools.sh b/scripts/solaris/vmtools.sh similarity index 100% rename from packer/scripts/solaris/vmtools.sh rename to scripts/solaris/vmtools.sh diff --git a/packer/scripts/solaris10/minimize.sh b/scripts/solaris10/minimize.sh similarity index 100% rename from packer/scripts/solaris10/minimize.sh rename to scripts/solaris10/minimize.sh diff --git a/packer/scripts/solaris10/vmtools.sh b/scripts/solaris10/vmtools.sh similarity index 100% rename from packer/scripts/solaris10/vmtools.sh rename to scripts/solaris10/vmtools.sh diff --git a/packer/scripts/ubuntu/cleanup.sh b/scripts/ubuntu/cleanup.sh similarity index 100% rename from packer/scripts/ubuntu/cleanup.sh rename to scripts/ubuntu/cleanup.sh diff --git a/packer/scripts/ubuntu/networking.sh b/scripts/ubuntu/networking.sh similarity index 100% rename from packer/scripts/ubuntu/networking.sh rename to scripts/ubuntu/networking.sh diff --git a/packer/scripts/ubuntu/preseed.cfg b/scripts/ubuntu/preseed.cfg similarity index 100% rename from packer/scripts/ubuntu/preseed.cfg rename to scripts/ubuntu/preseed.cfg diff --git a/packer/scripts/ubuntu/sudoers.sh b/scripts/ubuntu/sudoers.sh similarity index 100% rename from packer/scripts/ubuntu/sudoers.sh rename to scripts/ubuntu/sudoers.sh diff --git a/packer/scripts/ubuntu/update.sh b/scripts/ubuntu/update.sh similarity index 100% rename from packer/scripts/ubuntu/update.sh rename to scripts/ubuntu/update.sh diff --git a/definitions/.windows/install-chef.bat b/scripts/windows/install-chef.bat similarity index 100% rename from definitions/.windows/install-chef.bat rename to scripts/windows/install-chef.bat diff --git a/definitions/.windows/install-vbox.bat b/scripts/windows/install-vbox.bat similarity index 100% rename from definitions/.windows/install-vbox.bat rename to scripts/windows/install-vbox.bat diff --git a/definitions/.windows/mount-validation.bat b/scripts/windows/mount-validation.bat similarity index 100% rename from definitions/.windows/mount-validation.bat rename to scripts/windows/mount-validation.bat diff --git a/definitions/.windows/oracle-cert.cer b/scripts/windows/oracle-cert.cer similarity index 100% rename from definitions/.windows/oracle-cert.cer rename to scripts/windows/oracle-cert.cer diff --git a/packer/sles-11-sp2-i386.json b/sles-11-sp2-i386.json similarity index 97% rename from packer/sles-11-sp2-i386.json rename to sles-11-sp2-i386.json index 6d54b26d7..0ad760622 100644 --- a/packer/sles-11-sp2-i386.json +++ b/sles-11-sp2-i386.json @@ -115,7 +115,7 @@ ], "post-processors": [ { - "output": "../builds/{{.Provider}}/opscode_sles-11sp2-i386_chef-{{user `chef_version`}}.box", + "output": "builds/{{.Provider}}/opscode_sles-11sp2-i386_chef-{{user `chef_version`}}.box", "type": "vagrant" } ], diff --git a/packer/sles-11-sp2-x86_64.json b/sles-11-sp2-x86_64.json similarity index 97% rename from packer/sles-11-sp2-x86_64.json rename to sles-11-sp2-x86_64.json index 0ec5c279b..0973c2447 100644 --- a/packer/sles-11-sp2-x86_64.json +++ b/sles-11-sp2-x86_64.json @@ -115,7 +115,7 @@ ], "post-processors": [ { - "output": "../builds/{{.Provider}}/opscode_sles-11sp2_chef-{{user `chef_version`}}.box", + "output": "builds/{{.Provider}}/opscode_sles-11sp2_chef-{{user `chef_version`}}.box", "type": "vagrant" } ], diff --git a/packer/sles-11-sp3-i386.json b/sles-11-sp3-i386.json similarity index 97% rename from packer/sles-11-sp3-i386.json rename to sles-11-sp3-i386.json index 41e94620c..837333e71 100644 --- a/packer/sles-11-sp3-i386.json +++ b/sles-11-sp3-i386.json @@ -115,7 +115,7 @@ ], "post-processors": [ { - "output": "../builds/{{.Provider}}/opscode_sles-11sp3-i386_chef-{{user `chef_version`}}.box", + "output": "builds/{{.Provider}}/opscode_sles-11sp3-i386_chef-{{user `chef_version`}}.box", "type": "vagrant" } ], diff --git a/packer/sles-11-sp3-x86_64.json b/sles-11-sp3-x86_64.json similarity index 97% rename from packer/sles-11-sp3-x86_64.json rename to sles-11-sp3-x86_64.json index a5bf62aef..918c9d609 100644 --- a/packer/sles-11-sp3-x86_64.json +++ b/sles-11-sp3-x86_64.json @@ -114,7 +114,7 @@ ], "post-processors": [ { - "output": "../builds/{{.Provider}}/opscode_sles-11sp3_chef-{{user `chef_version`}}.box", + "output": "builds/{{.Provider}}/opscode_sles-11sp3_chef-{{user `chef_version`}}.box", "type": "vagrant" } ], diff --git a/packer/sles-12-x86_64.json b/sles-12-x86_64.json similarity index 98% rename from packer/sles-12-x86_64.json rename to sles-12-x86_64.json index 9f3114904..d2882540d 100644 --- a/packer/sles-12-x86_64.json +++ b/sles-12-x86_64.json @@ -114,7 +114,7 @@ ], "post-processors": [ { - "output": "../builds/{{.Provider}}/opscode_sles-12_chef-{{user `chef_version`}}.box", + "output": "builds/{{.Provider}}/opscode_sles-12_chef-{{user `chef_version`}}.box", "type": "vagrant" } ], diff --git a/packer/solaris-10.11-x86.json b/solaris-10.11-x86.json similarity index 97% rename from packer/solaris-10.11-x86.json rename to solaris-10.11-x86.json index f105d9d20..8f43ee7a9 100644 --- a/packer/solaris-10.11-x86.json +++ b/solaris-10.11-x86.json @@ -110,7 +110,7 @@ ], "post-processors": [ { - "output": "../builds/{{.Provider}}/opscode_solaris-10.11_chef-{{user `chef_version`}}.box", + "output": "builds/{{.Provider}}/opscode_solaris-10.11_chef-{{user `chef_version`}}.box", "type": "vagrant" } ] diff --git a/packer/solaris-11-x86.json b/solaris-11-x86.json similarity index 98% rename from packer/solaris-11-x86.json rename to solaris-11-x86.json index 2f4807831..e3ba56e25 100644 --- a/packer/solaris-11-x86.json +++ b/solaris-11-x86.json @@ -135,7 +135,7 @@ ], "post-processors": [ { - "output": "../builds/{{.Provider}}/opscode_solaris-11.2_chef-{{user `chef_version`}}.box", + "output": "builds/{{.Provider}}/opscode_solaris-11.2_chef-{{user `chef_version`}}.box", "type": "vagrant" } ] diff --git a/packer/ubuntu-10.04-amd64.json b/ubuntu-10.04-amd64.json similarity index 98% rename from packer/ubuntu-10.04-amd64.json rename to ubuntu-10.04-amd64.json index 3eafd5d10..7e233f15f 100644 --- a/packer/ubuntu-10.04-amd64.json +++ b/ubuntu-10.04-amd64.json @@ -166,7 +166,7 @@ ], "post-processors": [ { - "output": "../builds/{{.Provider}}/opscode_ubuntu-10.04_chef-{{user `chef_version`}}.box", + "output": "builds/{{.Provider}}/opscode_ubuntu-10.04_chef-{{user `chef_version`}}.box", "type": "vagrant" } ], diff --git a/packer/ubuntu-10.04-i386.json b/ubuntu-10.04-i386.json similarity index 98% rename from packer/ubuntu-10.04-i386.json rename to ubuntu-10.04-i386.json index d353eb9ab..5ad2d3247 100644 --- a/packer/ubuntu-10.04-i386.json +++ b/ubuntu-10.04-i386.json @@ -166,7 +166,7 @@ ], "post-processors": [ { - "output": "../builds/{{.Provider}}/opscode_ubuntu-10.04-i386_chef-{{user `chef_version`}}.box", + "output": "builds/{{.Provider}}/opscode_ubuntu-10.04-i386_chef-{{user `chef_version`}}.box", "type": "vagrant" } ], diff --git a/packer/ubuntu-12.04-amd64.json b/ubuntu-12.04-amd64.json similarity index 98% rename from packer/ubuntu-12.04-amd64.json rename to ubuntu-12.04-amd64.json index fa290d159..e88499f2b 100644 --- a/packer/ubuntu-12.04-amd64.json +++ b/ubuntu-12.04-amd64.json @@ -166,7 +166,7 @@ ], "post-processors": [ { - "output": "../builds/{{.Provider}}/opscode_ubuntu-12.04_chef-{{user `chef_version`}}.box", + "output": "builds/{{.Provider}}/opscode_ubuntu-12.04_chef-{{user `chef_version`}}.box", "type": "vagrant" } ], diff --git a/packer/ubuntu-12.04-i386.json b/ubuntu-12.04-i386.json similarity index 98% rename from packer/ubuntu-12.04-i386.json rename to ubuntu-12.04-i386.json index a97d3bef7..19953be3a 100644 --- a/packer/ubuntu-12.04-i386.json +++ b/ubuntu-12.04-i386.json @@ -166,7 +166,7 @@ ], "post-processors": [ { - "output": "../builds/{{.Provider}}/opscode_ubuntu-12.04-i386_chef-{{user `chef_version`}}.box", + "output": "builds/{{.Provider}}/opscode_ubuntu-12.04-i386_chef-{{user `chef_version`}}.box", "type": "vagrant" } ], diff --git a/packer/ubuntu-14.04-amd64.json b/ubuntu-14.04-amd64.json similarity index 98% rename from packer/ubuntu-14.04-amd64.json rename to ubuntu-14.04-amd64.json index 4a62d9341..2ca5040f7 100644 --- a/packer/ubuntu-14.04-amd64.json +++ b/ubuntu-14.04-amd64.json @@ -166,7 +166,7 @@ ], "post-processors": [ { - "output": "../builds/{{.Provider}}/opscode_ubuntu-14.04_chef-{{user `chef_version`}}.box", + "output": "builds/{{.Provider}}/opscode_ubuntu-14.04_chef-{{user `chef_version`}}.box", "type": "vagrant" } ], diff --git a/packer/ubuntu-14.04-i386.json b/ubuntu-14.04-i386.json similarity index 98% rename from packer/ubuntu-14.04-i386.json rename to ubuntu-14.04-i386.json index c76381b7f..f3124167a 100644 --- a/packer/ubuntu-14.04-i386.json +++ b/ubuntu-14.04-i386.json @@ -166,7 +166,7 @@ ], "post-processors": [ { - "output": "../builds/{{.Provider}}/opscode_ubuntu-14.04-i386_chef-{{user `chef_version`}}.box", + "output": "builds/{{.Provider}}/opscode_ubuntu-14.04-i386_chef-{{user `chef_version`}}.box", "type": "vagrant" } ], diff --git a/packer/ubuntu-14.10-amd64.json b/ubuntu-14.10-amd64.json similarity index 98% rename from packer/ubuntu-14.10-amd64.json rename to ubuntu-14.10-amd64.json index 6c745a62d..7b1308917 100644 --- a/packer/ubuntu-14.10-amd64.json +++ b/ubuntu-14.10-amd64.json @@ -166,7 +166,7 @@ ], "post-processors": [ { - "output": "../builds/{{.Provider}}/opscode_ubuntu-14.10_chef-{{user `chef_version`}}.box", + "output": "builds/{{.Provider}}/opscode_ubuntu-14.10_chef-{{user `chef_version`}}.box", "type": "vagrant" } ], diff --git a/packer/ubuntu-14.10-i386.json b/ubuntu-14.10-i386.json similarity index 98% rename from packer/ubuntu-14.10-i386.json rename to ubuntu-14.10-i386.json index acd1d42b5..f4fe31f1a 100644 --- a/packer/ubuntu-14.10-i386.json +++ b/ubuntu-14.10-i386.json @@ -166,7 +166,7 @@ ], "post-processors": [ { - "output": "../builds/{{.Provider}}/opscode_ubuntu-14.10-i386_chef-{{user `chef_version`}}.box", + "output": "builds/{{.Provider}}/opscode_ubuntu-14.10-i386_chef-{{user `chef_version`}}.box", "type": "vagrant" } ], diff --git a/packer/vagrantfile_templates/macosx.rb b/vagrantfile_templates/macosx.rb similarity index 100% rename from packer/vagrantfile_templates/macosx.rb rename to vagrantfile_templates/macosx.rb diff --git a/packer/vagrantfile_templates/parallels/freebsd.rb b/vagrantfile_templates/parallels/freebsd.rb similarity index 100% rename from packer/vagrantfile_templates/parallels/freebsd.rb rename to vagrantfile_templates/parallels/freebsd.rb diff --git a/packer/vagrantfile_templates/parallels/omnios.rb b/vagrantfile_templates/parallels/omnios.rb similarity index 100% rename from packer/vagrantfile_templates/parallels/omnios.rb rename to vagrantfile_templates/parallels/omnios.rb From 42c90e33168090a3f17d15d662770e36b1319d6a Mon Sep 17 00:00:00 2001 From: Fletcher Nichol <fnichol@nichol.ca> Date: Wed, 20 May 2015 14:49:28 -0600 Subject: [PATCH 0320/1622] [debian-6.0.10-*] Update parallels-iso builder ISO location. --- debian-6.0.10-amd64.json | 8 ++++---- debian-6.0.10-i386.json | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/debian-6.0.10-amd64.json b/debian-6.0.10-amd64.json index aaf2f35c0..5458eea5b 100644 --- a/debian-6.0.10-amd64.json +++ b/debian-6.0.10-amd64.json @@ -108,9 +108,9 @@ "disk_size": 40960, "guest_os_type": "debian", "http_directory": "http", - "iso_checksum": "3f3ec3e1adb4c2904a1234799f4775c10cf47cce", + "iso_checksum": "f3e70528664f174a121b26491c59cd66daaf8274", "iso_checksum_type": "sha1", - "iso_url": "{{user `mirror`}}/6.0.9/amd64/iso-cd/debian-6.0.9-amd64-CD-1.iso", + "iso_url": "{{user `mirror`}}/6.0.10/amd64/iso-cd/debian-6.0.10-amd64-CD-1.iso", "ssh_username": "vagrant", "ssh_password": "vagrant", "ssh_port": 22, @@ -118,8 +118,8 @@ "shutdown_command": "echo 'vagrant'|sudo -S /sbin/shutdown -hP now", "parallels_tools_flavor": "lin", "prlctl_version_file": ".prlctl_version", - "vm_name": "packer-debian-6.0.9-amd64", - "output_directory": "packer-debian-6.0.9-amd64-parallels", + "vm_name": "packer-debian-6.0.10-amd64", + "output_directory": "packer-debian-6.0.10-amd64-parallels", "prlctl": [ [ "set", "{{.Name}}", "--memsize", "384" ], [ "set", "{{.Name}}", "--cpus", "1" ] diff --git a/debian-6.0.10-i386.json b/debian-6.0.10-i386.json index 484dd5b2c..7626b55ff 100644 --- a/debian-6.0.10-i386.json +++ b/debian-6.0.10-i386.json @@ -108,9 +108,9 @@ "disk_size": 40960, "guest_os_type": "debian", "http_directory": "http", - "iso_checksum": "bc2886211bce0e9c54bdf779f21a35d5e5a122fd", + "iso_checksum": "e8f77720e30f669e731fe3166ad6c3d2da33d93a", "iso_checksum_type": "sha1", - "iso_url": "{{user `mirror`}}/6.0.9/i386/iso-cd/debian-6.0.9-i386-CD-1.iso", + "iso_url": "{{user `mirror`}}/6.0.10/i386/iso-cd/debian-6.0.10-i386-CD-1.iso", "ssh_username": "vagrant", "ssh_password": "vagrant", "ssh_port": 22, @@ -118,8 +118,8 @@ "shutdown_command": "echo 'vagrant'|sudo -S /sbin/shutdown -hP now", "parallels_tools_flavor": "lin", "prlctl_version_file": ".prlctl_version", - "vm_name": "packer-debian-6.0.9-i386", - "output_directory": "packer-debian-6.0.9-i386-parallels", + "vm_name": "packer-debian-6.0.10-i386", + "output_directory": "packer-debian-6.0.10-i386-parallels", "prlctl": [ [ "set", "{{.Name}}", "--memsize", "384" ], [ "set", "{{.Name}}", "--cpus", "1" ] From 29efb8ae9479529322357b2f384448d0e146210d Mon Sep 17 00:00:00 2001 From: Fletcher Nichol <fnichol@nichol.ca> Date: Wed, 20 May 2015 14:50:16 -0600 Subject: [PATCH 0321/1622] [debian-7.8-*] Update root URL location for 7.8 ISO. --- debian-7.8-amd64.json | 2 +- debian-7.8-i386.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/debian-7.8-amd64.json b/debian-7.8-amd64.json index b0843b810..21e5f9eac 100644 --- a/debian-7.8-amd64.json +++ b/debian-7.8-amd64.json @@ -1,7 +1,7 @@ { "variables": { "chef_version": "provisionerless", - "mirror": "http://cdimage.debian.org/debian-cd" + "mirror": "http://cdimage.debian.org/cdimage/archive" }, "builders": [ { diff --git a/debian-7.8-i386.json b/debian-7.8-i386.json index 14af478d9..ae00f8122 100644 --- a/debian-7.8-i386.json +++ b/debian-7.8-i386.json @@ -1,7 +1,7 @@ { "variables": { "chef_version": "provisionerless", - "mirror": "http://cdimage.debian.org/debian-cd" + "mirror": "http://cdimage.debian.org/cdimage/archive" }, "builders": [ { From ed6bfef9ada36d628d8e49d22e010212fee1e071 Mon Sep 17 00:00:00 2001 From: Fletcher Nichol <fnichol@nichol.ca> Date: Wed, 20 May 2015 15:15:06 -0600 Subject: [PATCH 0322/1622] Update Thorfile to run Packer commands in root of project. --- Thorfile | 31 ++++++++++++++----------------- 1 file changed, 14 insertions(+), 17 deletions(-) diff --git a/Thorfile b/Thorfile index c01fa3e80..8cc90a6a5 100644 --- a/Thorfile +++ b/Thorfile @@ -37,25 +37,22 @@ class Packer < Thor def build - Dir.chdir './packer' do - - if options[:bits] - processor = options[:bits] == "64" ? "{amd64,x86_64}" : "i386" - else - processor = "*" - end + if options[:bits] + processor = options[:bits] == "64" ? "{amd64,x86_64}" : "i386" + else + processor = "*" + end - templates = Dir.glob("#{options[:os]}-#{options[:ver]}-#{processor}.json") + templates = Dir.glob("#{options[:os]}-#{options[:ver]}-#{processor}.json") - if options[:only] - templates.each do |template| - name = template.chomp(".json").split("-") - system "packer build -only=#{name[0]}-#{name[1]}-#{name[2]}-#{options[:only]} #{template}" - end - else - templates.each do |template| - system "packer build #{template}" - end + if options[:only] + templates.each do |template| + name = template.chomp(".json").split("-") + system "packer build -only=#{name[0]}-#{name[1]}-#{name[2]}-#{options[:only]} #{template}" + end + else + templates.each do |template| + system "packer build #{template}" end end end From 3ca22ffcb18be902147f8f34fac78c07c03a1b13 Mon Sep 17 00:00:00 2001 From: Fletcher Nichol <fnichol@nichol.ca> Date: Tue, 19 May 2015 16:42:42 -0600 Subject: [PATCH 0323/1622] Add packer/bin/bento for building templates. This is a first-step addition of a small binary wrapper around Packer to help inject custom variables, inject metadata and re-normalize the templates using `packer fix`. In its present implementation, no external RubyGems are required in an attempt to maximize portability between platforms. --- .gitignore | 1 - bin/bento | 226 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 226 insertions(+), 1 deletion(-) create mode 100755 bin/bento diff --git a/.gitignore b/.gitignore index 82671cc5f..6450032dc 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,3 @@ -bin/ .bundle/ iso *.box diff --git a/bin/bento b/bin/bento new file mode 100755 index 000000000..10a6f43d3 --- /dev/null +++ b/bin/bento @@ -0,0 +1,226 @@ +#!/usr/bin/env ruby +# -*- encoding: utf-8 -*- + +Signal.trap("INT") { exit 1 } + +$stdout.sync = true +$stderr.sync = true + +require 'optparse' +require 'ostruct' +require 'benchmark' + +class Options + + NAME = File.basename($0).freeze + + def self.parse(args) + options = OpenStruct.new + options.templates = calculate_templates("*.json") + + ENV['PACKER_CACHE_DIR'] = "packer_cache" + + global = OptionParser.new do |opts| + opts.banner = "Usage: #{NAME} [SUBCOMMAND [options]]" + opts.separator "" + opts.separator <<-COMMANDS.gsub(/^ {8}/, "") + build : build one or more templates + fix : fix one or more templates + help : prints this help message + list : list all templates in project + COMMANDS + end + + templates_argv_proc = proc { |options| + options.templates = calculate_templates(args) unless args.empty? + + options.templates.each do |t| + if !File.exists?("#{t}.json") + $stderr.puts "File #{t}.json does not exist for template '#{t}'" + exit(1) + end + end + } + + subcommand = { + help: { + parser: OptionParser.new {}, + argv: proc { |options| + puts global + exit(0) + } + }, + build: { + class: BuildRunner, + parser: OptionParser.new { |opts| + opts.banner = "Usage: #{NAME} build [options] TEMPLATE[ TEMPLATE ...]" + + opts.on("-n", "--[no-]dry-run", "Dry run (what would happen)") do |opt| + options.dry_run = opt + end + + opts.on("-d", "--[no-]debug", "Run packer with debug output") do |opt| + options.debug = opt + end + + opts.on("-o BUILDS", "--only BUILDS", "Only build some Packer builds") do |opt| + options.builds = opt + end + }, + argv: templates_argv_proc + }, + fix: { + class: FixRunner, + parser: OptionParser.new { |opts| + opts.banner = "Usage: #{NAME} fix TEMPLATE[ TEMPLATE ...]" + }, + argv: templates_argv_proc + }, + list: { + class: ListRunner, + parser: OptionParser.new { |opts| + opts.banner = "Usage: #{NAME} list [TEMPLATE ...]" + }, + argv: templates_argv_proc + } + } + + global.order! + command = args.empty? ? :help : ARGV.shift.to_sym + subcommand.fetch(command).fetch(:parser).order! + subcommand.fetch(command).fetch(:argv).call(options) + + options.command = command + options.klass = subcommand.fetch(command).fetch(:class) + + options + end + + def self.calculate_templates(globs) + Array(globs). + map { |glob| result = Dir.glob(glob); result.empty? ? glob : result }. + flatten. + sort. + delete_if { |file| file =~ /\.variables\./ }. + map { |template| template.sub(/\.json$/, '') } + end +end + +module Common + + def banner(msg) + puts "==> #{msg}" + end + + def duration(total) + total = 0 if total.nil? + minutes = (total / 60).to_i + seconds = (total - (minutes * 60)) + format("%dm%.2fs", minutes, seconds) + end +end + +class BuildRunner + + include Common + + attr_reader :templates, :dry_run, :debug, :builds + + def initialize(opts) + @templates = opts.templates + @dry_run = opts.dry_run + @debug = opts.debug + @builds = opts.builds + end + + def start + banner("Starting build for templates: #{templates}") + time = Benchmark.measure do + templates.each { |template| packer(template) } + end + banner("Build finished in #{duration(time.real)}.") + end + + def packer(template) + cmd = packer_cmd(template) + banner("[#{template}] Running: '#{cmd.join(' ')}'") + time = Benchmark.measure do + system(*cmd) or raise "[#{template}] Error building, exited #{$?}" + end + banner("[#{template}] Finished in #{duration(time.real)}.") + end + + def packer_cmd(template) + vars = "#{template}.variables.json" + cmd = %W[packer build #{template}.json] + cmd.insert(2, "-var-file=#{vars}") if File.exist?(vars) + cmd.insert(2, "-only=#{builds}") if builds + cmd.insert(2, "-debug") if debug + cmd.insert(0, "echo") if dry_run + cmd + end + + def git_sha + %x{git rev-parse --short HEAD}.strip + end +end + +class FixRunner + + include Common + + attr_reader :templates + + def initialize(opts) + @templates = opts.templates + end + + def start + banner("Fixing for templates: #{templates}") + time = Benchmark.measure do + templates.each { |template| fix(template) } + end + banner("Fixing finished in #{duration(time.real)}.") + end + + def fix(template) + output = %x{packer fix #{template}.json} + raise "[#{template}] Error fixing, exited #{$?}" if $?.exitstatus != 0 + File.open("#{template}.json", "wb") { |file| file.write(output) } + end +end + +class ListRunner + + include Common + + attr_reader :templates + + def initialize(opts) + @templates = opts.templates + end + + def start + templates.each { |template| puts template } + end +end + +class Runner + + attr_reader :options + + def initialize(options) + @options = options + end + + def start + options.klass.new(options).start + end +end + +begin + Runner.new(Options.parse(ARGV)).start +rescue => ex + $stderr.puts ">>> #{ex.message}" + exit(($? && $?.exitstatus) || 99) +end From d4b55cec5a7f2a3f58d754c1740e6f13f7635b59 Mon Sep 17 00:00:00 2001 From: Fletcher Nichol <fnichol@nichol.ca> Date: Thu, 21 May 2015 10:24:11 -0600 Subject: [PATCH 0324/1622] Ignore *.variables.json in git. --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 6450032dc..20509881b 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ packer_cache packer.log .DS_Store /packer-*/ +*.variables.json From 43f66a2f8a3371b26c8284f3be4099264960d5ff Mon Sep 17 00:00:00 2001 From: Fletcher Nichol <fnichol@nichol.ca> Date: Mon, 25 May 2015 16:16:25 -0600 Subject: [PATCH 0325/1622] [ubuntu-12.04-*] Update URL paths to use 12.04.5. This change increases the consistency in URLs across the Ubuntu template family and makes it less likely to result in an HTTP/404 down the road. --- ubuntu-12.04-amd64.json | 6 +++--- ubuntu-12.04-i386.json | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/ubuntu-12.04-amd64.json b/ubuntu-12.04-amd64.json index e88499f2b..db32165c9 100644 --- a/ubuntu-12.04-amd64.json +++ b/ubuntu-12.04-amd64.json @@ -33,7 +33,7 @@ "http_directory": "http", "iso_checksum": "7540ace2d6cdee264432f5ed987236d32edef798", "iso_checksum_type": "sha1", - "iso_url": "{{user `mirror`}}/12.04/ubuntu-12.04.5-server-amd64.iso", + "iso_url": "{{user `mirror`}}/12.04.5/ubuntu-12.04.5-server-amd64.iso", "output_directory": "packer-ubuntu-12.04-amd64-virtualbox", "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", "ssh_password": "vagrant", @@ -89,7 +89,7 @@ "http_directory": "http", "iso_checksum": "7540ace2d6cdee264432f5ed987236d32edef798", "iso_checksum_type": "sha1", - "iso_url": "{{user `mirror`}}/12.04/ubuntu-12.04.5-server-amd64.iso", + "iso_url": "{{user `mirror`}}/12.04.5/ubuntu-12.04.5-server-amd64.iso", "output_directory": "packer-ubuntu-12.04-amd64-vmware", "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", "ssh_password": "vagrant", @@ -137,7 +137,7 @@ "http_directory": "http", "iso_checksum": "7540ace2d6cdee264432f5ed987236d32edef798", "iso_checksum_type": "sha1", - "iso_url": "{{user `mirror`}}/12.04/ubuntu-12.04.5-server-amd64.iso", + "iso_url": "{{user `mirror`}}/12.04.5/ubuntu-12.04.5-server-amd64.iso", "output_directory": "packer-ubuntu-12.04-amd64-parallels", "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", "ssh_password": "vagrant", diff --git a/ubuntu-12.04-i386.json b/ubuntu-12.04-i386.json index 19953be3a..121a6c21a 100644 --- a/ubuntu-12.04-i386.json +++ b/ubuntu-12.04-i386.json @@ -33,7 +33,7 @@ "http_directory": "http", "iso_checksum": "a34c224b7fe72a2f5c768be5afee5c53817743fd", "iso_checksum_type": "sha1", - "iso_url": "{{user `mirror`}}/12.04/ubuntu-12.04.5-server-i386.iso", + "iso_url": "{{user `mirror`}}/12.04.5/ubuntu-12.04.5-server-i386.iso", "output_directory": "packer-ubuntu-12.04-i386-virtualbox", "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", "ssh_password": "vagrant", @@ -89,7 +89,7 @@ "http_directory": "http", "iso_checksum": "a34c224b7fe72a2f5c768be5afee5c53817743fd", "iso_checksum_type": "sha1", - "iso_url": "{{user `mirror`}}/12.04/ubuntu-12.04.5-server-i386.iso", + "iso_url": "{{user `mirror`}}/12.04.5/ubuntu-12.04.5-server-i386.iso", "output_directory": "packer-ubuntu-12.04-i386-vmware", "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", "ssh_password": "vagrant", @@ -137,7 +137,7 @@ "http_directory": "http", "iso_checksum": "3bae12e315c89d42d7bf571e4e35efce585c7624", "iso_checksum_type": "sha1", - "iso_url": "{{user `mirror`}}/12.04/ubuntu-12.04.4-server-i386.iso", + "iso_url": "{{user `mirror`}}/12.04.5/ubuntu-12.04.4-server-i386.iso", "output_directory": "packer-ubuntu-12.04-i386-parallels", "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", "ssh_password": "vagrant", From 533cd5336f190a17c7ab28924e60662caae22732 Mon Sep 17 00:00:00 2001 From: Fletcher Nichol <fnichol@nichol.ca> Date: Mon, 25 May 2015 16:20:57 -0600 Subject: [PATCH 0326/1622] [TravisCI] Upgrade to Packer 0.7.5. --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 145d632d2..a3279c51d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,7 @@ rvm: - 2.1.2 -before_install: wget --no-check-certificate https://dl.bintray.com/mitchellh/packer/packer_0.7.2_linux_amd64.zip && unzip -d packer packer_0.7.2_linux_amd64.zip +before_install: wget --no-check-certificate https://dl.bintray.com/mitchellh/packer/packer_0.7.5_linux_amd64.zip && unzip -d packer packer_0.7.5_linux_amd64.zip before_script: export PATH=$PATH:$PWD/packer script: bundle exec thor packer:validate From a7f430458e60684a853e01b74378712ff0edc59b Mon Sep 17 00:00:00 2001 From: Fletcher Nichol <fnichol@nichol.ca> Date: Mon, 25 May 2015 16:21:16 -0600 Subject: [PATCH 0327/1622] [TravisCI] Upgrade to Ruby 2.2 for testing. --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index a3279c51d..7613851fd 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,5 @@ rvm: - - 2.1.2 + - 2.2 before_install: wget --no-check-certificate https://dl.bintray.com/mitchellh/packer/packer_0.7.5_linux_amd64.zip && unzip -d packer packer_0.7.5_linux_amd64.zip before_script: export PATH=$PATH:$PWD/packer From 66fe2ea0ffc6461808882a0467821506b19b7ae1 Mon Sep 17 00:00:00 2001 From: Fletcher Nichol <fnichol@nichol.ca> Date: Mon, 25 May 2015 16:23:45 -0600 Subject: [PATCH 0328/1622] [TravisCI] Route builds to new container-based infrastructure. --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index 7613851fd..466b291a3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,3 +5,5 @@ before_install: wget --no-check-certificate https://dl.bintray.com/mitchellh/pac before_script: export PATH=$PATH:$PWD/packer script: bundle exec thor packer:validate + +sudo: false From fe523886ebcf4e955951862978f303e713ba323e Mon Sep 17 00:00:00 2001 From: Fletcher Nichol <fnichol@nichol.ca> Date: Mon, 25 May 2015 16:25:55 -0600 Subject: [PATCH 0329/1622] Remove Vagrant Bundler dependencies. --- Gemfile | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/Gemfile b/Gemfile index 3c5b4fdf2..1c1f6f059 100644 --- a/Gemfile +++ b/Gemfile @@ -1,11 +1,4 @@ source "https://rubygems.org" -gem "vagrant", :git => 'https://github.com/mitchellh/vagrant.git', :tag => 'v1.3.5' -gem "veewee", "~> 0.3.12" -gem "vagrant-windows", "~> 1.2.1" -gem "em-winrm" # for windows! gem "rake" - -group :test do - gem "thor" -end +gem "thor" From 67dd763ad1cddaf45f9d803907b7de1608e00566 Mon Sep 17 00:00:00 2001 From: Fletcher Nichol <fnichol@nichol.ca> Date: Tue, 26 May 2015 10:09:54 -0600 Subject: [PATCH 0330/1622] Update bin/bento fix to normalize. The normalize subcommand does 2 things: 1. Run `packer validate` to verify the integrity of the template 2. Run `packer fix` to normalize the JSON format for a higher degree of consistency A summary of all changes templates are printed at the end of the normalize execution, making this command useful in CI. --- bin/bento | 75 +++++++++++++++++++++++++++++++++++++++++++------------ 1 file changed, 59 insertions(+), 16 deletions(-) diff --git a/bin/bento b/bin/bento index 10a6f43d3..d7b216502 100755 --- a/bin/bento +++ b/bin/bento @@ -6,9 +6,10 @@ Signal.trap("INT") { exit 1 } $stdout.sync = true $stderr.sync = true -require 'optparse' -require 'ostruct' -require 'benchmark' +require "benchmark" +require "digest" +require "optparse" +require "ostruct" class Options @@ -24,10 +25,10 @@ class Options opts.banner = "Usage: #{NAME} [SUBCOMMAND [options]]" opts.separator "" opts.separator <<-COMMANDS.gsub(/^ {8}/, "") - build : build one or more templates - fix : fix one or more templates - help : prints this help message - list : list all templates in project + build : build one or more templates + help : prints this help message + list : list all templates in project + normalize : normalize one or more templates COMMANDS end @@ -69,10 +70,10 @@ class Options }, argv: templates_argv_proc }, - fix: { - class: FixRunner, + normalize: { + class: NormalizeRunner, parser: OptionParser.new { |opts| - opts.banner = "Usage: #{NAME} fix TEMPLATE[ TEMPLATE ...]" + opts.banner = "Usage: #{NAME} normalize TEMPLATE[ TEMPLATE ...]" }, argv: templates_argv_proc }, @@ -112,6 +113,14 @@ module Common puts "==> #{msg}" end + def info(msg) + puts " #{msg}" + end + + def warn(msg) + puts ">>> #{msg}" + end + def duration(total) total = 0 if total.nil? minutes = (total / 60).to_i @@ -165,7 +174,7 @@ class BuildRunner end end -class FixRunner +class NormalizeRunner include Common @@ -173,20 +182,54 @@ class FixRunner def initialize(opts) @templates = opts.templates + @modified = [] end def start - banner("Fixing for templates: #{templates}") + banner("Normalizing for templates: #{templates}") time = Benchmark.measure do - templates.each { |template| fix(template) } + templates.each do |template| + validate(template) + fix(template) + end + end + if !@modified.empty? + info("") + info("The following templates were modified:") + @modified.sort.each { |template| info(" * #{template}")} end - banner("Fixing finished in #{duration(time.real)}.") + banner("Normalizing finished in #{duration(time.real)}.") end def fix(template) - output = %x{packer fix #{template}.json} + file = "#{template}.json" + + banner("[#{template}] Fixing") + original_checksum = checksum(file) + output = %x{packer fix #{file}} raise "[#{template}] Error fixing, exited #{$?}" if $?.exitstatus != 0 - File.open("#{template}.json", "wb") { |file| file.write(output) } + # preserve ampersands in shell commands, + # see: https://github.com/mitchellh/packer/issues/784 + output.gsub!("\\u0026", "&") + File.open(file, "wb") { |dest| dest.write(output) } + fixed_checksum = checksum(file) + + if original_checksum == fixed_checksum + puts("No changes made.") + else + warn("Template #{template} has been modified.") + @modified << template + end + end + + def validate(template) + cmd = %W[packer validate #{template}.json] + banner("[#{template}] Validating") + system(*cmd) or raise "[#{template}] Error validating, exited #{$?}" + end + + def checksum(file) + Digest::MD5.file(file).hexdigest end end From ae302d30712bbc3dbc43ebd7cd3c21fdfa4efb31 Mon Sep 17 00:00:00 2001 From: Fletcher Nichol <fnichol@nichol.ca> Date: Tue, 26 May 2015 10:27:45 -0600 Subject: [PATCH 0331/1622] Normalize templates with `bin/bento normalize`. --- centos-5.11-i386.json | 15 ++- centos-5.11-x86_64.json | 16 ++- centos-6.6-i386.json | 14 +-- centos-6.6-x86_64.json | 15 ++- centos-7.1-x86_64.json | 15 +-- debian-6.0.10-amd64.json | 74 +++++++++----- debian-6.0.10-i386.json | 74 +++++++++----- debian-7.8-amd64.json | 95 +++++++++++------- debian-7.8-i386.json | 96 +++++++++++------- fedora-20-i386.json | 15 ++- fedora-20-x86_64.json | 14 +-- fedora-21-i386.json | 15 ++- fedora-21-x86_64.json | 14 +-- freebsd-10.1-amd64.json | 140 ++++++++++++++++---------- freebsd-10.1-i386.json | 140 ++++++++++++++++---------- freebsd-9.3-amd64.json | 41 ++++++-- freebsd-9.3-i386.json | 39 ++++++-- macosx-10.7.json | 204 +++++++++++++++++++++++++------------- macosx-10.8.json | 204 +++++++++++++++++++++++++------------- macosx-10.9.json | 204 +++++++++++++++++++++++++------------- omnios-r151010j.json | 27 +++-- opensuse-13.2-i386.json | 13 +-- opensuse-13.2-x86_64.json | 12 +-- oracle-5.11-i386.json | 15 ++- oracle-5.11-x86_64.json | 15 ++- oracle-6.6-i386.json | 22 ++-- oracle-6.6-x86_64.json | 15 +-- rhel-5.11-i386.json | 15 ++- rhel-5.11-x86_64.json | 15 ++- rhel-6.6-i386.json | 15 ++- rhel-6.6-x86_64.json | 14 +-- rhel-7.1-x86_64.json | 15 ++- sles-11-sp2-i386.json | 15 ++- sles-11-sp2-x86_64.json | 15 ++- sles-11-sp3-i386.json | 15 ++- sles-11-sp3-x86_64.json | 14 +-- sles-12-x86_64.json | 14 +-- solaris-10.11-x86.json | 73 +++++++------- solaris-11-x86.json | 83 ++++++++-------- ubuntu-10.04-amd64.json | 15 ++- ubuntu-10.04-i386.json | 15 ++- ubuntu-12.04-amd64.json | 15 ++- ubuntu-12.04-i386.json | 15 ++- ubuntu-14.04-amd64.json | 16 +-- ubuntu-14.04-i386.json | 16 +-- ubuntu-14.10-amd64.json | 16 +-- ubuntu-14.10-i386.json | 16 +-- 47 files changed, 1207 insertions(+), 783 deletions(-) diff --git a/centos-5.11-i386.json b/centos-5.11-i386.json index d22a45b06..1a29baa8c 100644 --- a/centos-5.11-i386.json +++ b/centos-5.11-i386.json @@ -69,19 +69,13 @@ ], "boot_wait": "10s", "disk_size": 40960, - "parallels_tools_flavor": "lin", "guest_os_type": "centos", "http_directory": "http", "iso_checksum": "ec3a89b4edc8e391d13c1ecce4e6ce3917719e39", "iso_checksum_type": "sha1", "iso_url": "{{user `mirror`}}/5.11/isos/i386/CentOS-5.11-i386-bin-DVD-1of2.iso", "output_directory": "packer-centos-5.11-i386-parallels", - "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "parallels-iso", + "parallels_tools_flavor": "lin", "prlctl": [ [ "set", @@ -97,9 +91,14 @@ ] ], "prlctl_version_file": ".prlctl_version", + "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "parallels-iso", "vm_name": "packer-centos-5.11-i386" } - ], "post-processors": [ { diff --git a/centos-5.11-x86_64.json b/centos-5.11-x86_64.json index 74727f6d3..06096eb4b 100644 --- a/centos-5.11-x86_64.json +++ b/centos-5.11-x86_64.json @@ -69,19 +69,13 @@ ], "boot_wait": "10s", "disk_size": 40960, - "parallels_tools_flavor": "lin", "guest_os_type": "centos", "http_directory": "http", "iso_checksum": "ebd77f2fdfac8da04f31c508905cf52aa62937cc", "iso_checksum_type": "sha1", "iso_url": "{{user `mirror`}}/5.11/isos/x86_64/CentOS-5.11-x86_64-bin-DVD-1of2.iso", "output_directory": "packer-centos-5.11-x86_64-parallels", - "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "parallels-iso", + "parallels_tools_flavor": "lin", "prlctl": [ [ "set", @@ -97,10 +91,14 @@ ] ], "prlctl_version_file": ".prlctl_version", + "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "parallels-iso", "vm_name": "packer-centos-5.11-x86_64" } - - ], "post-processors": [ { diff --git a/centos-6.6-i386.json b/centos-6.6-i386.json index 40b15051f..382371c32 100644 --- a/centos-6.6-i386.json +++ b/centos-6.6-i386.json @@ -69,19 +69,13 @@ ], "boot_wait": "10s", "disk_size": 40960, - "parallels_tools_flavor": "lin", "guest_os_type": "centos", "http_directory": "http", "iso_checksum": "d16aa4a8e6f71fb01fcc26d8ae0e3443ed514c8e", "iso_checksum_type": "sha1", "iso_url": "{{user `mirror`}}/6.6/isos/i386/CentOS-6.6-i386-bin-DVD1.iso", "output_directory": "packer-centos-6.6-i386-parallels", - "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "parallels-iso", + "parallels_tools_flavor": "lin", "prlctl": [ [ "set", @@ -97,6 +91,12 @@ ] ], "prlctl_version_file": ".prlctl_version", + "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "parallels-iso", "vm_name": "packer-centos-6.6-i386" } ], diff --git a/centos-6.6-x86_64.json b/centos-6.6-x86_64.json index 10b93869d..d66fb8e7c 100644 --- a/centos-6.6-x86_64.json +++ b/centos-6.6-x86_64.json @@ -69,19 +69,13 @@ ], "boot_wait": "10s", "disk_size": 40960, - "parallels_tools_flavor": "lin", "guest_os_type": "centos", "http_directory": "http", "iso_checksum": "08be09fd7276822bd3468af8f96198279ffc41f0", "iso_checksum_type": "sha1", "iso_url": "{{user `mirror`}}/6.6/isos/x86_64/CentOS-6.6-x86_64-bin-DVD1.iso", "output_directory": "packer-centos-6.6-x86_64-parallels", - "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "parallels-iso", + "parallels_tools_flavor": "lin", "prlctl": [ [ "set", @@ -97,9 +91,14 @@ ] ], "prlctl_version_file": ".prlctl_version", + "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "parallels-iso", "vm_name": "packer-centos-6.6-x86_64" } - ], "post-processors": [ { diff --git a/centos-7.1-x86_64.json b/centos-7.1-x86_64.json index 4e09f6b3b..04b36238d 100644 --- a/centos-7.1-x86_64.json +++ b/centos-7.1-x86_64.json @@ -69,19 +69,13 @@ ], "boot_wait": "10s", "disk_size": 40960, - "parallels_tools_flavor": "lin", "guest_os_type": "centos", "http_directory": "http", "iso_checksum": "85bcf62462fb678adc0cec159bf8b39ab5515404bc3828c432f743a1b0b30157", "iso_checksum_type": "sha256", "iso_url": "{{user `mirror`}}/7.1.1503/isos/x86_64/CentOS-7-x86_64-DVD-1503-01.iso", "output_directory": "packer-centos-7.1-x86_64-parallels", - "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "parallels-iso", + "parallels_tools_flavor": "lin", "prlctl": [ [ "set", @@ -97,6 +91,12 @@ ] ], "prlctl_version_file": ".prlctl_version", + "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "parallels-iso", "vm_name": "packer-centos-7.1-x86_64" } ], @@ -129,3 +129,4 @@ "mirror": "http://mirrors.kernel.org/centos" } } + diff --git a/debian-6.0.10-amd64.json b/debian-6.0.10-amd64.json index 5458eea5b..ddc6777a7 100644 --- a/debian-6.0.10-amd64.json +++ b/debian-6.0.10-amd64.json @@ -1,11 +1,6 @@ { - "variables": { - "chef_version": "provisionerless", - "mirror": "http://cdimage.debian.org/cdimage/archive" - }, "builders": [ { - "type": "virtualbox-iso", "boot_command": [ "<esc><wait>", "install <wait>", @@ -38,15 +33,25 @@ "ssh_port": 22, "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", + "type": "virtualbox-iso", "vboxmanage": [ - [ "modifyvm", "{{.Name}}", "--memory", "384" ], - [ "modifyvm", "{{.Name}}", "--cpus", "1" ] + [ + "modifyvm", + "{{.Name}}", + "--memory", + "384" + ], + [ + "modifyvm", + "{{.Name}}", + "--cpus", + "1" + ] ], "virtualbox_version_file": ".vbox_version", "vm_name": "packer-debian-6.0.10-amd64" }, { - "type": "vmware-iso", "boot_command": [ "<esc><wait>", "install <wait>", @@ -78,6 +83,7 @@ "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", "tools_upload_flavor": "linux", + "type": "vmware-iso", "vm_name": "packer-debian-6.0.10-amd64", "vmx_data": { "cpuid.coresPerSocket": "1", @@ -86,7 +92,6 @@ } }, { - "type": "parallels-iso", "boot_command": [ "<esc><wait>", "install <wait>", @@ -111,32 +116,43 @@ "iso_checksum": "f3e70528664f174a121b26491c59cd66daaf8274", "iso_checksum_type": "sha1", "iso_url": "{{user `mirror`}}/6.0.10/amd64/iso-cd/debian-6.0.10-amd64-CD-1.iso", - "ssh_username": "vagrant", + "output_directory": "packer-debian-6.0.10-amd64-parallels", + "parallels_tools_flavor": "lin", + "prlctl": [ + [ + "set", + "{{.Name}}", + "--memsize", + "384" + ], + [ + "set", + "{{.Name}}", + "--cpus", + "1" + ] + ], + "prlctl_version_file": ".prlctl_version", + "shutdown_command": "echo 'vagrant'|sudo -S /sbin/shutdown -hP now", "ssh_password": "vagrant", "ssh_port": 22, + "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", - "shutdown_command": "echo 'vagrant'|sudo -S /sbin/shutdown -hP now", - "parallels_tools_flavor": "lin", - "prlctl_version_file": ".prlctl_version", - "vm_name": "packer-debian-6.0.10-amd64", - "output_directory": "packer-debian-6.0.10-amd64-parallels", - "prlctl": [ - [ "set", "{{.Name}}", "--memsize", "384" ], - [ "set", "{{.Name}}", "--cpus", "1" ] - ] + "type": "parallels-iso", + "vm_name": "packer-debian-6.0.10-amd64" } - ], "post-processors": [ { - "type": "vagrant", - "output": "builds/{{.Provider}}/opscode_debian-6.0.10_chef-{{user `chef_version`}}.box" + "output": "builds/{{.Provider}}/opscode_debian-6.0.10_chef-{{user `chef_version`}}.box", + "type": "vagrant" } ], "provisioners": [ { - "type": "shell", - "environment_vars": [ "CHEF_VERSION={{user `chef_version`}}" ], + "environment_vars": [ + "CHEF_VERSION={{user `chef_version`}}" + ], "execute_command": "echo 'vagrant' | {{.Vars}} sudo -E -S bash '{{.Path}}'", "scripts": [ "scripts/debian/update.sh", @@ -148,7 +164,13 @@ "scripts/common/chef.sh", "scripts/debian/cleanup.sh", "scripts/common/minimize.sh" - ] + ], + "type": "shell" } - ] + ], + "variables": { + "chef_version": "provisionerless", + "mirror": "http://cdimage.debian.org/cdimage/archive" + } } + diff --git a/debian-6.0.10-i386.json b/debian-6.0.10-i386.json index 7626b55ff..a53abdeaa 100644 --- a/debian-6.0.10-i386.json +++ b/debian-6.0.10-i386.json @@ -1,11 +1,6 @@ { - "variables": { - "chef_version": "provisionerless", - "mirror": "http://cdimage.debian.org/cdimage/archive" - }, "builders": [ { - "type": "virtualbox-iso", "boot_command": [ "<esc><wait>", "install <wait>", @@ -38,15 +33,25 @@ "ssh_port": 22, "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", + "type": "virtualbox-iso", "vboxmanage": [ - [ "modifyvm", "{{.Name}}", "--memory", "384" ], - [ "modifyvm", "{{.Name}}", "--cpus", "1" ] + [ + "modifyvm", + "{{.Name}}", + "--memory", + "384" + ], + [ + "modifyvm", + "{{.Name}}", + "--cpus", + "1" + ] ], "virtualbox_version_file": ".vbox_version", "vm_name": "packer-debian-6.0.10-i386" }, { - "type": "vmware-iso", "boot_command": [ "<esc><wait>", "install <wait>", @@ -78,6 +83,7 @@ "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", "tools_upload_flavor": "linux", + "type": "vmware-iso", "vm_name": "packer-debian-6.0.10-i386", "vmx_data": { "cpuid.coresPerSocket": "1", @@ -86,7 +92,6 @@ } }, { - "type": "parallels-iso", "boot_command": [ "<esc><wait>", "install <wait>", @@ -111,32 +116,43 @@ "iso_checksum": "e8f77720e30f669e731fe3166ad6c3d2da33d93a", "iso_checksum_type": "sha1", "iso_url": "{{user `mirror`}}/6.0.10/i386/iso-cd/debian-6.0.10-i386-CD-1.iso", - "ssh_username": "vagrant", + "output_directory": "packer-debian-6.0.10-i386-parallels", + "parallels_tools_flavor": "lin", + "prlctl": [ + [ + "set", + "{{.Name}}", + "--memsize", + "384" + ], + [ + "set", + "{{.Name}}", + "--cpus", + "1" + ] + ], + "prlctl_version_file": ".prlctl_version", + "shutdown_command": "echo 'vagrant'|sudo -S /sbin/shutdown -hP now", "ssh_password": "vagrant", "ssh_port": 22, + "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", - "shutdown_command": "echo 'vagrant'|sudo -S /sbin/shutdown -hP now", - "parallels_tools_flavor": "lin", - "prlctl_version_file": ".prlctl_version", - "vm_name": "packer-debian-6.0.10-i386", - "output_directory": "packer-debian-6.0.10-i386-parallels", - "prlctl": [ - [ "set", "{{.Name}}", "--memsize", "384" ], - [ "set", "{{.Name}}", "--cpus", "1" ] - ] + "type": "parallels-iso", + "vm_name": "packer-debian-6.0.10-i386" } - ], "post-processors": [ { - "type": "vagrant", - "output": "builds/{{.Provider}}/opscode_debian-6.0.10-i386_chef-{{user `chef_version`}}.box" + "output": "builds/{{.Provider}}/opscode_debian-6.0.10-i386_chef-{{user `chef_version`}}.box", + "type": "vagrant" } ], "provisioners": [ { - "type": "shell", - "environment_vars": [ "CHEF_VERSION={{user `chef_version`}}" ], + "environment_vars": [ + "CHEF_VERSION={{user `chef_version`}}" + ], "execute_command": "echo 'vagrant' | {{.Vars}} sudo -E -S bash '{{.Path}}'", "scripts": [ "scripts/debian/update.sh", @@ -148,7 +164,13 @@ "scripts/common/chef.sh", "scripts/debian/cleanup.sh", "scripts/common/minimize.sh" - ] + ], + "type": "shell" } - ] + ], + "variables": { + "chef_version": "provisionerless", + "mirror": "http://cdimage.debian.org/cdimage/archive" + } } + diff --git a/debian-7.8-amd64.json b/debian-7.8-amd64.json index 21e5f9eac..fb27e8184 100644 --- a/debian-7.8-amd64.json +++ b/debian-7.8-amd64.json @@ -1,11 +1,6 @@ { - "variables": { - "chef_version": "provisionerless", - "mirror": "http://cdimage.debian.org/cdimage/archive" - }, "builders": [ { - "type": "virtualbox-iso", "boot_command": [ "<esc><wait>", "install <wait>", @@ -25,28 +20,38 @@ ], "boot_wait": "10s", "disk_size": 40960, + "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "guest_os_type": "Debian_64", "hard_drive_interface": "sata", "http_directory": "http", "iso_checksum": "5f611b40b0803f8be1180da561cfbc159e381599", "iso_checksum_type": "sha1", "iso_url": "{{user `mirror`}}/7.8.0/amd64/iso-cd/debian-7.8.0-amd64-CD-1.iso", - "ssh_username": "vagrant", + "output_directory": "packer-debian-7.8-amd64-virtualbox", + "shutdown_command": "echo 'vagrant'|sudo -S /sbin/shutdown -hP now", "ssh_password": "vagrant", "ssh_port": 22, + "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", - "shutdown_command": "echo 'vagrant'|sudo -S /sbin/shutdown -hP now", - "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", - "virtualbox_version_file": ".vbox_version", - "vm_name": "packer-debian-7.8-amd64", - "output_directory": "packer-debian-7.8-amd64-virtualbox", + "type": "virtualbox-iso", "vboxmanage": [ - [ "modifyvm", "{{.Name}}", "--memory", "384" ], - [ "modifyvm", "{{.Name}}", "--cpus", "1" ] - ] + [ + "modifyvm", + "{{.Name}}", + "--memory", + "384" + ], + [ + "modifyvm", + "{{.Name}}", + "--cpus", + "1" + ] + ], + "virtualbox_version_file": ".vbox_version", + "vm_name": "packer-debian-7.8-amd64" }, { - "type": "vmware-iso", "boot_command": [ "<esc><wait>", "install <wait>", @@ -71,22 +76,22 @@ "iso_checksum": "5f611b40b0803f8be1180da561cfbc159e381599", "iso_checksum_type": "sha1", "iso_url": "{{user `mirror`}}/7.8.0/amd64/iso-cd/debian-7.8.0-amd64-CD-1.iso", - "ssh_username": "vagrant", + "output_directory": "packer-debian-7.8-amd64-vmware", + "shutdown_command": "echo 'vagrant'|sudo -S /sbin/shutdown -hP now", "ssh_password": "vagrant", "ssh_port": 22, + "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", - "shutdown_command": "echo 'vagrant'|sudo -S /sbin/shutdown -hP now", "tools_upload_flavor": "linux", + "type": "vmware-iso", "vm_name": "packer-debian-7.8-amd64", - "output_directory": "packer-debian-7.8-amd64-vmware", "vmx_data": { + "cpuid.coresPerSocket": "1", "memsize": "384", - "numvcpus": "1", - "cpuid.coresPerSocket": "1" + "numvcpus": "1" } }, { - "type": "parallels-iso", "boot_command": [ "<esc><wait>", "install <wait>", @@ -111,29 +116,43 @@ "iso_checksum": "5f611b40b0803f8be1180da561cfbc159e381599", "iso_checksum_type": "sha1", "iso_url": "{{user `mirror`}}/7.8.0/amd64/iso-cd/debian-7.8.0-amd64-CD-1.iso", - "ssh_username": "vagrant", + "output_directory": "packer-debian-7.8-amd64-parallels", + "parallels_tools_flavor": "lin", + "prlctl": [ + [ + "set", + "{{.Name}}", + "--memsize", + "384" + ], + [ + "set", + "{{.Name}}", + "--cpus", + "1" + ] + ], + "prlctl_version_file": ".prlctl_version", + "shutdown_command": "echo 'vagrant'|sudo -S /sbin/shutdown -hP now", "ssh_password": "vagrant", "ssh_port": 22, + "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", - "shutdown_command": "echo 'vagrant'|sudo -S /sbin/shutdown -hP now", - "parallels_tools_flavor": "lin", - "prlctl_version_file": ".prlctl_version", - "vm_name": "packer-debian-7.8-amd64", - "output_directory": "packer-debian-7.8-amd64-parallels", - "prlctl": [ - [ "set", "{{.Name}}", "--memsize", "384" ], - [ "set", "{{.Name}}", "--cpus", "1" ] - ] + "type": "parallels-iso", + "vm_name": "packer-debian-7.8-amd64" } ], "post-processors": [ { - "type": "vagrant", - "output": "builds/{{.Provider}}/opscode_debian-7.8_chef-{{user `chef_version`}}.box" + "output": "builds/{{.Provider}}/opscode_debian-7.8_chef-{{user `chef_version`}}.box", + "type": "vagrant" } ], "provisioners": [ { + "environment_vars": [ + "CHEF_VERSION={{user `chef_version`}}" + ], "execute_command": "echo 'vagrant' | {{.Vars}} sudo -E -S bash '{{.Path}}'", "scripts": [ "scripts/debian/update.sh", @@ -146,8 +165,12 @@ "scripts/debian/cleanup.sh", "scripts/common/minimize.sh" ], - "type": "shell", - "environment_vars": [ "CHEF_VERSION={{user `chef_version`}}" ] + "type": "shell" } - ] + ], + "variables": { + "chef_version": "provisionerless", + "mirror": "http://cdimage.debian.org/cdimage/archive" + } } + diff --git a/debian-7.8-i386.json b/debian-7.8-i386.json index ae00f8122..510b91303 100644 --- a/debian-7.8-i386.json +++ b/debian-7.8-i386.json @@ -1,11 +1,6 @@ { - "variables": { - "chef_version": "provisionerless", - "mirror": "http://cdimage.debian.org/cdimage/archive" - }, "builders": [ { - "type": "virtualbox-iso", "boot_command": [ "<esc><wait>", "install <wait>", @@ -25,28 +20,38 @@ ], "boot_wait": "10s", "disk_size": 40960, + "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "guest_os_type": "Debian", "hard_drive_interface": "sata", "http_directory": "http", "iso_checksum": "d87664e590f39aba725ec9705dc58a8c75417fef", "iso_checksum_type": "sha1", "iso_url": "{{user `mirror`}}/7.8.0/i386/iso-cd/debian-7.8.0-i386-CD-1.iso", - "ssh_username": "vagrant", + "output_directory": "packer-debian-7.8-i386-virtualbox", + "shutdown_command": "echo 'vagrant'|sudo -S /sbin/shutdown -hP now", "ssh_password": "vagrant", "ssh_port": 22, + "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", - "shutdown_command": "echo 'vagrant'|sudo -S /sbin/shutdown -hP now", - "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", - "virtualbox_version_file": ".vbox_version", - "vm_name": "packer-debian-7.8-i386", - "output_directory": "packer-debian-7.8-i386-virtualbox", + "type": "virtualbox-iso", "vboxmanage": [ - [ "modifyvm", "{{.Name}}", "--memory", "384" ], - [ "modifyvm", "{{.Name}}", "--cpus", "1" ] - ] + [ + "modifyvm", + "{{.Name}}", + "--memory", + "384" + ], + [ + "modifyvm", + "{{.Name}}", + "--cpus", + "1" + ] + ], + "virtualbox_version_file": ".vbox_version", + "vm_name": "packer-debian-7.8-i386" }, { - "type": "vmware-iso", "boot_command": [ "<esc><wait>", "install <wait>", @@ -71,22 +76,22 @@ "iso_checksum": "d87664e590f39aba725ec9705dc58a8c75417fef", "iso_checksum_type": "sha1", "iso_url": "{{user `mirror`}}/7.8.0/i386/iso-cd/debian-7.8.0-i386-CD-1.iso", - "ssh_username": "vagrant", + "output_directory": "packer-debian-7.8-i386-vmware", + "shutdown_command": "echo 'vagrant'|sudo -S /sbin/shutdown -hP now", "ssh_password": "vagrant", "ssh_port": 22, + "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", - "shutdown_command": "echo 'vagrant'|sudo -S /sbin/shutdown -hP now", "tools_upload_flavor": "linux", + "type": "vmware-iso", "vm_name": "packer-debian-7.8-i386", - "output_directory": "packer-debian-7.8-i386-vmware", "vmx_data": { + "cpuid.coresPerSocket": "1", "memsize": "384", - "numvcpus": "1", - "cpuid.coresPerSocket": "1" + "numvcpus": "1" } }, { - "type": "parallels-iso", "boot_command": [ "<esc><wait>", "install <wait>", @@ -111,30 +116,43 @@ "iso_checksum": "d87664e590f39aba725ec9705dc58a8c75417fef", "iso_checksum_type": "sha1", "iso_url": "{{user `mirror`}}/7.8.0/i386/iso-cd/debian-7.8.0-i386-CD-1.iso", - "ssh_username": "vagrant", + "output_directory": "packer-debian-7.8-i386-parallels", + "parallels_tools_flavor": "lin", + "prlctl": [ + [ + "set", + "{{.Name}}", + "--memsize", + "384" + ], + [ + "set", + "{{.Name}}", + "--cpus", + "1" + ] + ], + "prlctl_version_file": ".prlctl_version", + "shutdown_command": "echo 'vagrant'|sudo -S /sbin/shutdown -hP now", "ssh_password": "vagrant", "ssh_port": 22, + "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", - "shutdown_command": "echo 'vagrant'|sudo -S /sbin/shutdown -hP now", - "parallels_tools_flavor": "lin", - "prlctl_version_file": ".prlctl_version", - "vm_name": "packer-debian-7.8-i386", - "output_directory": "packer-debian-7.8-i386-parallels", - "prlctl": [ - [ "set", "{{.Name}}", "--memsize", "384" ], - [ "set", "{{.Name}}", "--cpus", "1" ] - ] + "type": "parallels-iso", + "vm_name": "packer-debian-7.8-i386" } - ], "post-processors": [ { - "type": "vagrant", - "output": "builds/{{.Provider}}/opscode_debian-7.8-i386_chef-{{user `chef_version`}}.box" + "output": "builds/{{.Provider}}/opscode_debian-7.8-i386_chef-{{user `chef_version`}}.box", + "type": "vagrant" } ], "provisioners": [ { + "environment_vars": [ + "CHEF_VERSION={{user `chef_version`}}" + ], "execute_command": "echo 'vagrant' | {{.Vars}} sudo -E -S bash '{{.Path}}'", "scripts": [ "scripts/debian/update.sh", @@ -147,8 +165,12 @@ "scripts/debian/cleanup.sh", "scripts/common/minimize.sh" ], - "type": "shell", - "environment_vars": [ "CHEF_VERSION={{user `chef_version`}}" ] + "type": "shell" } - ] + ], + "variables": { + "chef_version": "provisionerless", + "mirror": "http://cdimage.debian.org/cdimage/archive" + } } + diff --git a/fedora-20-i386.json b/fedora-20-i386.json index 9993d7d0b..e14f99328 100644 --- a/fedora-20-i386.json +++ b/fedora-20-i386.json @@ -69,19 +69,13 @@ ], "boot_wait": "10s", "disk_size": 40960, - "parallels_tools_flavor": "lin", "guest_os_type": "fedora-core", "http_directory": "http", "iso_checksum": "284ea30ddd50db1b30cd5cd9fae7495dad8714ef1e4428d69a8c8ce80e03b6a9", "iso_checksum_type": "sha256", "iso_url": "{{user `mirror`}}/releases/20/Fedora/i386/iso/Fedora-20-i386-DVD.iso", "output_directory": "packer-fedora-20-i386-parallels", - "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "parallels-iso", + "parallels_tools_flavor": "lin", "prlctl": [ [ "set", @@ -97,9 +91,14 @@ ] ], "prlctl_version_file": ".prlctl_version", + "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "parallels-iso", "vm_name": "packer-fedora-20-i386" } - ], "post-processors": [ { diff --git a/fedora-20-x86_64.json b/fedora-20-x86_64.json index 2227e8681..7f0e255d2 100644 --- a/fedora-20-x86_64.json +++ b/fedora-20-x86_64.json @@ -69,19 +69,13 @@ ], "boot_wait": "10s", "disk_size": 40960, - "parallels_tools_flavor": "lin", "guest_os_type": "fedora-core", "http_directory": "http", "iso_checksum": "f2eeed5102b8890e9e6f4b9053717fe73031e699c4b76dc7028749ab66e7f917", "iso_checksum_type": "sha256", "iso_url": "{{user `mirror`}}/releases/20/Fedora/x86_64/iso/Fedora-20-x86_64-DVD.iso", "output_directory": "packer-fedora-20-x86_64-parallels", - "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "parallels-iso", + "parallels_tools_flavor": "lin", "prlctl": [ [ "set", @@ -97,6 +91,12 @@ ] ], "prlctl_version_file": ".prlctl_version", + "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "parallels-iso", "vm_name": "packer-fedora-20-x86_64" } ], diff --git a/fedora-21-i386.json b/fedora-21-i386.json index ece141c9e..3ed3979e5 100644 --- a/fedora-21-i386.json +++ b/fedora-21-i386.json @@ -69,19 +69,13 @@ ], "boot_wait": "10s", "disk_size": 40960, - "parallels_tools_flavor": "lin", "guest_os_type": "fedora-core", "http_directory": "http", "iso_checksum": "85e50a8a938996522bf1605b3578a2d6680362c1aa963d0560d59c2e4fc795ef", "iso_checksum_type": "sha256", "iso_url": "{{user `mirror`}}/releases/21/Server/i386/iso/Fedora-Server-DVD-i386-21.iso", "output_directory": "packer-fedora-21-i386-parallels", - "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "parallels-iso", + "parallels_tools_flavor": "lin", "prlctl": [ [ "set", @@ -97,9 +91,14 @@ ] ], "prlctl_version_file": ".prlctl_version", + "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "parallels-iso", "vm_name": "packer-fedora-21-i386" } - ], "post-processors": [ { diff --git a/fedora-21-x86_64.json b/fedora-21-x86_64.json index 592dfda01..2320c5373 100644 --- a/fedora-21-x86_64.json +++ b/fedora-21-x86_64.json @@ -69,19 +69,13 @@ ], "boot_wait": "10s", "disk_size": 40960, - "parallels_tools_flavor": "lin", "guest_os_type": "fedora-core", "http_directory": "http", "iso_checksum": "a6a2e83bb409d6b8ee3072ad07faac0a54d79c9ecbe3a40af91b773e2d843d8e", "iso_checksum_type": "sha256", "iso_url": "{{user `mirror`}}/releases/21/Server/x86_64/iso/Fedora-Server-DVD-x86_64-21.iso", "output_directory": "packer-fedora-21-x86_64-parallels", - "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "parallels-iso", + "parallels_tools_flavor": "lin", "prlctl": [ [ "set", @@ -97,6 +91,12 @@ ] ], "prlctl_version_file": ".prlctl_version", + "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "parallels-iso", "vm_name": "packer-fedora-21-x86_64" } ], diff --git a/freebsd-10.1-amd64.json b/freebsd-10.1-amd64.json index a4f724a4c..551727d51 100644 --- a/freebsd-10.1-amd64.json +++ b/freebsd-10.1-amd64.json @@ -1,25 +1,6 @@ { - "variables": { - "chef_version": "provisionerless", - "mirror": "http://ftp.freebsd.org/pub/FreeBSD" - }, - "provisioners": [ - { - "environment_vars": [ "CHEF_VERSION={{user `chef_version`}}" ], - "type": "shell", - "scripts": [ - "scripts/freebsd/postinstall.sh", - "scripts/common/chef.sh", - "scripts/freebsd/cleanup.sh", - "scripts/freebsd/vmtools.sh", - "scripts/freebsd/minimize.sh" - ], - "execute_command": "export {{.Vars}} && cat {{.Path}} | su -m" - } - ], "builders": [ { - "type": "virtualbox-iso", "boot_command": [ "<esc><wait>", "boot -s<wait>", @@ -33,27 +14,37 @@ ], "boot_wait": "10s", "disk_size": 10140, + "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "guest_os_type": "FreeBSD_64", "http_directory": "http", "iso_checksum": "0c3d64ce48c3ef761761d0fea07e1935e296f8c045c249118bc91a7faf053a6b", "iso_checksum_type": "sha256", "iso_url": "{{user `mirror`}}/releases/amd64/amd64/ISO-IMAGES/10.1/FreeBSD-10.1-RELEASE-amd64-disc1.iso", - "ssh_username": "vagrant", + "output_directory": "packer-freebsd-10.1-amd64-virtualbox", + "shutdown_command": "echo 'shutdown -p now' > shutdown.sh; cat 'shutdown.sh' | su -", "ssh_password": "vagrant", "ssh_port": 22, + "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", - "shutdown_command": "echo 'shutdown -p now' > shutdown.sh; cat 'shutdown.sh' | su -", - "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", - "virtualbox_version_file": ".vbox_version", - "vm_name": "packer-freebsd-10.1-amd64", - "output_directory": "packer-freebsd-10.1-amd64-virtualbox", + "type": "virtualbox-iso", "vboxmanage": [ - [ "modifyvm", "{{.Name}}", "--memory", "512" ], - [ "modifyvm", "{{.Name}}", "--cpus", "1" ] - ] + [ + "modifyvm", + "{{.Name}}", + "--memory", + "512" + ], + [ + "modifyvm", + "{{.Name}}", + "--cpus", + "1" + ] + ], + "virtualbox_version_file": ".vbox_version", + "vm_name": "packer-freebsd-10.1-amd64" }, { - "type": "vmware-iso", "boot_command": [ "<esc><wait>", "boot -s<wait>", @@ -73,22 +64,22 @@ "iso_checksum": "0c3d64ce48c3ef761761d0fea07e1935e296f8c045c249118bc91a7faf053a6b", "iso_checksum_type": "sha256", "iso_url": "{{user `mirror`}}/releases/amd64/amd64/ISO-IMAGES/10.1/FreeBSD-10.1-RELEASE-amd64-disc1.iso", - "ssh_username": "vagrant", + "output_directory": "packer-freebsd-10.1-amd64-vmware", + "shutdown_command": "echo 'shutdown -p now' > shutdown.sh; cat 'shutdown.sh' | su -", "ssh_password": "vagrant", "ssh_port": 22, + "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", - "shutdown_command": "echo 'shutdown -p now' > shutdown.sh; cat 'shutdown.sh' | su -", - "vm_name": "packer-freebsd-10.1-amd64", - "output_directory": "packer-freebsd-10.1-amd64-vmware", "tools_upload_flavor": "freebsd", + "type": "vmware-iso", + "vm_name": "packer-freebsd-10.1-amd64", "vmx_data": { + "cpuid.coresPerSocket": "1", "memsize": "512", - "numvcpus": "1", - "cpuid.coresPerSocket": "1" + "numvcpus": "1" } }, { - "type": "parallels-iso", "boot_command": [ "<esc><wait>", "boot -s<wait>", @@ -107,22 +98,50 @@ "iso_checksum": "0c3d64ce48c3ef761761d0fea07e1935e296f8c045c249118bc91a7faf053a6b", "iso_checksum_type": "sha256", "iso_url": "{{user `mirror`}}/releases/amd64/amd64/ISO-IMAGES/10.1/FreeBSD-10.1-RELEASE-amd64-disc1.iso", - "ssh_username": "vagrant", + "output_directory": "packer-freebsd-10.1-amd64-parallels", + "parallels_tools_mode": "disable", + "prlctl": [ + [ + "set", + "{{.Name}}", + "--memsize", + "512" + ], + [ + "set", + "{{.Name}}", + "--cpus", + "1" + ], + [ + "set", + "{{.Name}}", + "--device-set", + "cdrom0", + "--iface", + "ide" + ], + [ + "set", + "{{.Name}}", + "--device-del", + "fdd0" + ], + [ + "set", + "{{.Name}}", + "--device-del", + "parallel0" + ] + ], + "prlctl_version_file": ".prlctl_version", + "shutdown_command": "echo 'shutdown -p now' > shutdown.sh; cat 'shutdown.sh' | su -", "ssh_password": "vagrant", "ssh_port": 22, + "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", - "shutdown_command": "echo 'shutdown -p now' > shutdown.sh; cat 'shutdown.sh' | su -", - "parallels_tools_mode": "disable", - "prlctl_version_file": ".prlctl_version", - "vm_name": "packer-freebsd-10.1-amd64", - "output_directory": "packer-freebsd-10.1-amd64-parallels", - "prlctl": [ - [ "set", "{{.Name}}", "--memsize", "512" ], - [ "set", "{{.Name}}", "--cpus", "1" ], - [ "set", "{{.Name}}", "--device-set", "cdrom0", "--iface", "ide" ], - [ "set", "{{.Name}}", "--device-del", "fdd0" ], - [ "set", "{{.Name}}", "--device-del", "parallel0" ] - ] + "type": "parallels-iso", + "vm_name": "packer-freebsd-10.1-amd64" } ], "post-processors": [ @@ -135,5 +154,26 @@ }, "type": "vagrant" } - ] + ], + "provisioners": [ + { + "environment_vars": [ + "CHEF_VERSION={{user `chef_version`}}" + ], + "execute_command": "export {{.Vars}} && cat {{.Path}} | su -m", + "scripts": [ + "scripts/freebsd/postinstall.sh", + "scripts/common/chef.sh", + "scripts/freebsd/cleanup.sh", + "scripts/freebsd/vmtools.sh", + "scripts/freebsd/minimize.sh" + ], + "type": "shell" + } + ], + "variables": { + "chef_version": "provisionerless", + "mirror": "http://ftp.freebsd.org/pub/FreeBSD" + } } + diff --git a/freebsd-10.1-i386.json b/freebsd-10.1-i386.json index 07f3fa6f7..c2b7de7e6 100644 --- a/freebsd-10.1-i386.json +++ b/freebsd-10.1-i386.json @@ -1,25 +1,6 @@ { - "variables": { - "chef_version": "provisionerless", - "mirror": "http://ftp.freebsd.org/pub/FreeBSD" - }, - "provisioners": [ - { - "environment_vars": [ "CHEF_VERSION={{user `chef_version`}}" ], - "type": "shell", - "scripts": [ - "scripts/freebsd/postinstall.sh", - "scripts/common/chef.sh", - "scripts/freebsd/cleanup.sh", - "scripts/freebsd/vmtools.sh", - "scripts/freebsd/minimize.sh" - ], - "execute_command": "export {{.Vars}} && cat {{.Path}} | su -m" - } - ], "builders": [ { - "type": "virtualbox-iso", "boot_command": [ "<esc><wait>", "boot -s<wait>", @@ -33,27 +14,37 @@ ], "boot_wait": "10s", "disk_size": 10140, + "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "guest_os_type": "FreeBSD", "http_directory": "http", "iso_checksum": "fe31790b762b01c99791d33e7fd9ab97323654785ce21f588116c8b4eb381cd0", "iso_checksum_type": "sha256", "iso_url": "{{user `mirror`}}/releases/i386/i386/ISO-IMAGES/10.1/FreeBSD-10.1-RELEASE-i386-disc1.iso", - "ssh_username": "vagrant", + "output_directory": "packer-freebsd-10.1-i386-virtualbox", + "shutdown_command": "echo 'shutdown -p now' > shutdown.sh; cat 'shutdown.sh' | su -", "ssh_password": "vagrant", "ssh_port": 22, + "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", - "shutdown_command": "echo 'shutdown -p now' > shutdown.sh; cat 'shutdown.sh' | su -", - "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", - "virtualbox_version_file": ".vbox_version", - "vm_name": "packer-freebsd-10.1-i386", - "output_directory": "packer-freebsd-10.1-i386-virtualbox", + "type": "virtualbox-iso", "vboxmanage": [ - [ "modifyvm", "{{.Name}}", "--memory", "512" ], - [ "modifyvm", "{{.Name}}", "--cpus", "1" ] - ] + [ + "modifyvm", + "{{.Name}}", + "--memory", + "512" + ], + [ + "modifyvm", + "{{.Name}}", + "--cpus", + "1" + ] + ], + "virtualbox_version_file": ".vbox_version", + "vm_name": "packer-freebsd-10.1-i386" }, { - "type": "vmware-iso", "boot_command": [ "<esc><wait>", "boot -s<wait>", @@ -73,22 +64,22 @@ "iso_checksum": "fe31790b762b01c99791d33e7fd9ab97323654785ce21f588116c8b4eb381cd0", "iso_checksum_type": "sha256", "iso_url": "{{user `mirror`}}/releases/i386/i386/ISO-IMAGES/10.1/FreeBSD-10.1-RELEASE-i386-disc1.iso", - "ssh_username": "vagrant", + "output_directory": "packer-freebsd-10.1-i386-vmware", + "shutdown_command": "echo 'shutdown -p now' > shutdown.sh; cat 'shutdown.sh' | su -", "ssh_password": "vagrant", "ssh_port": 22, + "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", - "shutdown_command": "echo 'shutdown -p now' > shutdown.sh; cat 'shutdown.sh' | su -", - "vm_name": "packer-freebsd-10.1-i386", - "output_directory": "packer-freebsd-10.1-i386-vmware", "tools_upload_flavor": "freebsd", + "type": "vmware-iso", + "vm_name": "packer-freebsd-10.1-i386", "vmx_data": { + "cpuid.coresPerSocket": "1", "memsize": "512", - "numvcpus": "1", - "cpuid.coresPerSocket": "1" + "numvcpus": "1" } }, { - "type": "parallels-iso", "boot_command": [ "<esc><wait>", "boot -s<wait>", @@ -107,22 +98,50 @@ "iso_checksum": "fe31790b762b01c99791d33e7fd9ab97323654785ce21f588116c8b4eb381cd0", "iso_checksum_type": "sha256", "iso_url": "{{user `mirror`}}/releases/i386/i386/ISO-IMAGES/10.1/FreeBSD-10.1-RELEASE-i386-disc1.iso", - "ssh_username": "vagrant", + "output_directory": "packer-freebsd-10.1-i386-parallels", + "parallels_tools_mode": "disable", + "prlctl": [ + [ + "set", + "{{.Name}}", + "--memsize", + "512" + ], + [ + "set", + "{{.Name}}", + "--cpus", + "1" + ], + [ + "set", + "{{.Name}}", + "--device-set", + "cdrom0", + "--iface", + "ide" + ], + [ + "set", + "{{.Name}}", + "--device-del", + "fdd0" + ], + [ + "set", + "{{.Name}}", + "--device-del", + "parallel0" + ] + ], + "prlctl_version_file": ".prlctl_version", + "shutdown_command": "echo 'shutdown -p now' > shutdown.sh; cat 'shutdown.sh' | su -", "ssh_password": "vagrant", "ssh_port": 22, + "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", - "shutdown_command": "echo 'shutdown -p now' > shutdown.sh; cat 'shutdown.sh' | su -", - "parallels_tools_mode": "disable", - "prlctl_version_file": ".prlctl_version", - "vm_name": "packer-freebsd-10.1-amd64", - "output_directory": "packer-freebsd-10.1-i386-parallels", - "prlctl": [ - [ "set", "{{.Name}}", "--memsize", "512" ], - [ "set", "{{.Name}}", "--cpus", "1" ], - [ "set", "{{.Name}}", "--device-set", "cdrom0", "--iface", "ide" ], - [ "set", "{{.Name}}", "--device-del", "fdd0" ], - [ "set", "{{.Name}}", "--device-del", "parallel0" ] - ] + "type": "parallels-iso", + "vm_name": "packer-freebsd-10.1-amd64" } ], "post-processors": [ @@ -135,5 +154,26 @@ }, "type": "vagrant" } - ] + ], + "provisioners": [ + { + "environment_vars": [ + "CHEF_VERSION={{user `chef_version`}}" + ], + "execute_command": "export {{.Vars}} && cat {{.Path}} | su -m", + "scripts": [ + "scripts/freebsd/postinstall.sh", + "scripts/common/chef.sh", + "scripts/freebsd/cleanup.sh", + "scripts/freebsd/vmtools.sh", + "scripts/freebsd/minimize.sh" + ], + "type": "shell" + } + ], + "variables": { + "chef_version": "provisionerless", + "mirror": "http://ftp.freebsd.org/pub/FreeBSD" + } } + diff --git a/freebsd-9.3-amd64.json b/freebsd-9.3-amd64.json index 2c591bd03..a48761353 100644 --- a/freebsd-9.3-amd64.json +++ b/freebsd-9.3-amd64.json @@ -111,16 +111,43 @@ "iso_checksum_type": "sha256", "iso_url": "{{user `mirror`}}/releases/amd64/amd64/ISO-IMAGES/9.3/FreeBSD-9.3-RELEASE-amd64-disc1.iso", "output_directory": "packer-freebsd-9.3-amd64-parallels", - "shutdown_command": "echo 'shutdown -p now' > shutdown.sh; cat 'shutdown.sh' | su -", "parallels_tools_mode": "disable", "prlctl": [ - [ "set", "{{.Name}}", "--memsize", "512" ], - [ "set", "{{.Name}}", "--cpus", "1" ], - [ "set", "{{.Name}}", "--device-set", "cdrom0", "--iface", "ide" ], - [ "set", "{{.Name}}", "--device-del", "fdd0" ], - [ "set", "{{.Name}}", "--device-del", "parallel0" ] + [ + "set", + "{{.Name}}", + "--memsize", + "512" + ], + [ + "set", + "{{.Name}}", + "--cpus", + "1" + ], + [ + "set", + "{{.Name}}", + "--device-set", + "cdrom0", + "--iface", + "ide" + ], + [ + "set", + "{{.Name}}", + "--device-del", + "fdd0" + ], + [ + "set", + "{{.Name}}", + "--device-del", + "parallel0" + ] ], - "prlctl_version_file": ".prlctl_version", + "prlctl_version_file": ".prlctl_version", + "shutdown_command": "echo 'shutdown -p now' > shutdown.sh; cat 'shutdown.sh' | su -", "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", diff --git a/freebsd-9.3-i386.json b/freebsd-9.3-i386.json index fb27ba491..9962f5746 100644 --- a/freebsd-9.3-i386.json +++ b/freebsd-9.3-i386.json @@ -110,15 +110,42 @@ "iso_checksum_type": "sha256", "iso_url": "{{user `mirror`}}/releases/i386/i386/ISO-IMAGES/9.3/FreeBSD-9.3-RELEASE-i386-disc1.iso", "output_directory": "packer-freebsd-9.3-i386-parallels", + "parallels_tools_mode": "disable", "prlctl": [ - [ "set", "{{.Name}}", "--memsize", "512" ], - [ "set", "{{.Name}}", "--cpus", "1" ], - [ "set", "{{.Name}}", "--device-set", "cdrom0", "--iface", "ide" ], - [ "set", "{{.Name}}", "--device-del", "fdd0" ], - [ "set", "{{.Name}}", "--device-del", "parallel0" ] + [ + "set", + "{{.Name}}", + "--memsize", + "512" + ], + [ + "set", + "{{.Name}}", + "--cpus", + "1" + ], + [ + "set", + "{{.Name}}", + "--device-set", + "cdrom0", + "--iface", + "ide" + ], + [ + "set", + "{{.Name}}", + "--device-del", + "fdd0" + ], + [ + "set", + "{{.Name}}", + "--device-del", + "parallel0" + ] ], "prlctl_version_file": ".prlctl_version", - "parallels_tools_mode": "disable", "shutdown_command": "echo 'shutdown -p now' > shutdown.sh; cat 'shutdown.sh' | su -", "ssh_password": "vagrant", "ssh_port": 22, diff --git a/macosx-10.7.json b/macosx-10.7.json index 3ab2d06de..975bd3ec0 100644 --- a/macosx-10.7.json +++ b/macosx-10.7.json @@ -1,39 +1,4 @@ { - "min_packer_version": "0.6.0", - "variables": { - "autologin_vagrant_user": "", - "iso_url": "http://fakeurl/OSX_InstallESD_10.7.5_11G63.dmg", - "iso_checksum": "e2a48af008ff3c4db6a8235151a1e90ea600fceb", - "chef_version": "provisionerless" - }, - "provisioners": [ - { - "type": "file", - "destination": "/private/tmp/kcpassword", - "source": "scripts/macosx/support/kcpassword" - }, - { - "type": "shell", - "scripts": [ - "scripts/macosx/hostname.sh", - "scripts/macosx/builder.sh", - "scripts/macosx/update.sh", - "scripts/macosx/vagrant.sh", - "scripts/macosx/cleanup.sh" - ], - "execute_command": "echo 'vagrant'| {{.Vars}} sudo -E -S sh '{{.Path}}'" - }, - { - "type": "shell", - "inline": [ - "[ -z \"{{user `autologin_vagrant_user`}}\" ] && exit", - "echo \"Enabling automatic GUI login for the 'vagrant' user..\"", - "cp /private/tmp/kcpassword /private/etc/kcpassword", - "/usr/bin/defaults write /Library/Preferences/com.apple.loginwindow autoLoginUser vagrant" - ], - "execute_command": "echo 'vagrant'| {{.Vars}} sudo -E -S sh '{{.Path}}'" - } - ], "builders": [ { "boot_wait": "2s", @@ -55,14 +20,14 @@ "vm_name": "packer-macosx-10.7-vmware", "vmx_data": { "cpuid.coresPerSocket": "1", - "memsize": "2048", - "numvcpus": "1", + "ehci.present": "TRUE", "firmware": "efi", - "keyboardAndMouseProfile": "macProfile", - "smc.present": "TRUE", "hpet0.present": "TRUE", "ich7m.present": "TRUE", - "ehci.present": "TRUE", + "keyboardAndMouseProfile": "macProfile", + "memsize": "2048", + "numvcpus": "1", + "smc.present": "TRUE", "usb.present": "TRUE" } }, @@ -82,49 +47,152 @@ "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", "type": "virtualbox-iso", - "vm_name": "packer-macosx-10.7-virtualbox", "vboxmanage": [ - ["modifyvm", "{{.Name}}", "--audiocontroller", "hda"], - ["modifyvm", "{{.Name}}", "--boot1", "dvd"], - ["modifyvm", "{{.Name}}", "--boot2", "disk"], - ["modifyvm", "{{.Name}}", "--chipset", "ich9"], - ["modifyvm", "{{.Name}}", "--cpus", "1"], - ["modifyvm", "{{.Name}}", "--firmware", "efi"], - ["modifyvm", "{{.Name}}", "--hpet", "on"], - ["modifyvm", "{{.Name}}", "--keyboard", "usb"], - ["modifyvm", "{{.Name}}", "--memory", "2048"], - ["modifyvm", "{{.Name}}", "--mouse", "usbtablet"], - ["modifyvm", "{{.Name}}", "--vram", "9"], [ - "storageattach", "{{.Name}}", - "--storagectl", "SATA Controller", - "--port", "1", - "--type", "dvddrive", - "--medium", "{{user `iso_url`}}" + "modifyvm", + "{{.Name}}", + "--audiocontroller", + "hda" + ], + [ + "modifyvm", + "{{.Name}}", + "--boot1", + "dvd" + ], + [ + "modifyvm", + "{{.Name}}", + "--boot2", + "disk" + ], + [ + "modifyvm", + "{{.Name}}", + "--chipset", + "ich9" + ], + [ + "modifyvm", + "{{.Name}}", + "--cpus", + "1" + ], + [ + "modifyvm", + "{{.Name}}", + "--firmware", + "efi" + ], + [ + "modifyvm", + "{{.Name}}", + "--hpet", + "on" + ], + [ + "modifyvm", + "{{.Name}}", + "--keyboard", + "usb" + ], + [ + "modifyvm", + "{{.Name}}", + "--memory", + "2048" + ], + [ + "modifyvm", + "{{.Name}}", + "--mouse", + "usbtablet" + ], + [ + "modifyvm", + "{{.Name}}", + "--vram", + "9" + ], + [ + "storageattach", + "{{.Name}}", + "--storagectl", + "SATA Controller", + "--port", + "1", + "--type", + "dvddrive", + "--medium", + "{{user `iso_url`}}" ] ], "vboxmanage_post": [ [ - "storageattach", "{{.Name}}", - "--storagectl", "SATA Controller", - "--port", "1", - "--type", "dvddrive", - "--medium", "none" + "storageattach", + "{{.Name}}", + "--storagectl", + "SATA Controller", + "--port", + "1", + "--type", + "dvddrive", + "--medium", + "none" ], [ - "storagectl", "{{.Name}}", - "--name", "IDE Controller", + "storagectl", + "{{.Name}}", + "--name", + "IDE Controller", "--remove" ] ], - "virtualbox_version_file": ".vbox_version" + "virtualbox_version_file": ".vbox_version", + "vm_name": "packer-macosx-10.7-virtualbox" } ], + "min_packer_version": "0.6.0", "post-processors": [ { + "output": "builds/{{.Provider}}/opscode_macosx-10.7_chef-{{user `chef_version`}}.box", "type": "vagrant", - "vagrantfile_template": "vagrantfile_templates/macosx.rb", - "output": "builds/{{.Provider}}/opscode_macosx-10.7_chef-{{user `chef_version`}}.box" + "vagrantfile_template": "vagrantfile_templates/macosx.rb" + } + ], + "provisioners": [ + { + "destination": "/private/tmp/kcpassword", + "source": "scripts/macosx/support/kcpassword", + "type": "file" + }, + { + "execute_command": "echo 'vagrant'| {{.Vars}} sudo -E -S sh '{{.Path}}'", + "scripts": [ + "scripts/macosx/hostname.sh", + "scripts/macosx/builder.sh", + "scripts/macosx/update.sh", + "scripts/macosx/vagrant.sh", + "scripts/macosx/cleanup.sh" + ], + "type": "shell" + }, + { + "execute_command": "echo 'vagrant'| {{.Vars}} sudo -E -S sh '{{.Path}}'", + "inline": [ + "[ -z \"{{user `autologin_vagrant_user`}}\" ] && exit", + "echo \"Enabling automatic GUI login for the 'vagrant' user..\"", + "cp /private/tmp/kcpassword /private/etc/kcpassword", + "/usr/bin/defaults write /Library/Preferences/com.apple.loginwindow autoLoginUser vagrant" + ], + "type": "shell" } - ] + ], + "variables": { + "autologin_vagrant_user": "", + "chef_version": "provisionerless", + "iso_checksum": "e2a48af008ff3c4db6a8235151a1e90ea600fceb", + "iso_url": "http://fakeurl/OSX_InstallESD_10.7.5_11G63.dmg" + } } + diff --git a/macosx-10.8.json b/macosx-10.8.json index 7ff6108ad..34fda4508 100644 --- a/macosx-10.8.json +++ b/macosx-10.8.json @@ -1,39 +1,4 @@ { - "min_packer_version": "0.6.0", - "variables": { - "autologin_vagrant_user": "", - "iso_url": "http://fakeurl/OSX_InstallESD_10.8.5_12F45.dmg", - "iso_checksum": "e2a48af008ff3c4db6a8235151a1e90ea600fceb", - "chef_version": "provisionerless" - }, - "provisioners": [ - { - "type": "file", - "destination": "/private/tmp/kcpassword", - "source": "scripts/macosx/support/kcpassword" - }, - { - "type": "shell", - "scripts": [ - "scripts/macosx/hostname.sh", - "scripts/macosx/builder.sh", - "scripts/macosx/update.sh", - "scripts/macosx/vagrant.sh", - "scripts/macosx/cleanup.sh" - ], - "execute_command": "echo 'vagrant'| {{.Vars}} sudo -E -S sh '{{.Path}}'" - }, - { - "type": "shell", - "inline": [ - "[ -z \"{{user `autologin_vagrant_user`}}\" ] && exit", - "echo \"Enabling automatic GUI login for the 'vagrant' user..\"", - "cp /private/tmp/kcpassword /private/etc/kcpassword", - "/usr/bin/defaults write /Library/Preferences/com.apple.loginwindow autoLoginUser vagrant" - ], - "execute_command": "echo 'vagrant'| {{.Vars}} sudo -E -S sh '{{.Path}}'" - } - ], "builders": [ { "boot_wait": "2s", @@ -55,14 +20,14 @@ "vm_name": "packer-macosx-10.8-vmware", "vmx_data": { "cpuid.coresPerSocket": "1", - "memsize": "2048", - "numvcpus": "1", + "ehci.present": "TRUE", "firmware": "efi", - "keyboardAndMouseProfile": "macProfile", - "smc.present": "TRUE", "hpet0.present": "TRUE", "ich7m.present": "TRUE", - "ehci.present": "TRUE", + "keyboardAndMouseProfile": "macProfile", + "memsize": "2048", + "numvcpus": "1", + "smc.present": "TRUE", "usb.present": "TRUE" } }, @@ -82,49 +47,152 @@ "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", "type": "virtualbox-iso", - "vm_name": "packer-macosx-10.8-virtualbox", "vboxmanage": [ - ["modifyvm", "{{.Name}}", "--audiocontroller", "hda"], - ["modifyvm", "{{.Name}}", "--boot1", "dvd"], - ["modifyvm", "{{.Name}}", "--boot2", "disk"], - ["modifyvm", "{{.Name}}", "--chipset", "ich9"], - ["modifyvm", "{{.Name}}", "--cpus", "1"], - ["modifyvm", "{{.Name}}", "--firmware", "efi"], - ["modifyvm", "{{.Name}}", "--hpet", "on"], - ["modifyvm", "{{.Name}}", "--keyboard", "usb"], - ["modifyvm", "{{.Name}}", "--memory", "2048"], - ["modifyvm", "{{.Name}}", "--mouse", "usbtablet"], - ["modifyvm", "{{.Name}}", "--vram", "9"], [ - "storageattach", "{{.Name}}", - "--storagectl", "SATA Controller", - "--port", "1", - "--type", "dvddrive", - "--medium", "{{user `iso_url`}}" + "modifyvm", + "{{.Name}}", + "--audiocontroller", + "hda" + ], + [ + "modifyvm", + "{{.Name}}", + "--boot1", + "dvd" + ], + [ + "modifyvm", + "{{.Name}}", + "--boot2", + "disk" + ], + [ + "modifyvm", + "{{.Name}}", + "--chipset", + "ich9" + ], + [ + "modifyvm", + "{{.Name}}", + "--cpus", + "1" + ], + [ + "modifyvm", + "{{.Name}}", + "--firmware", + "efi" + ], + [ + "modifyvm", + "{{.Name}}", + "--hpet", + "on" + ], + [ + "modifyvm", + "{{.Name}}", + "--keyboard", + "usb" + ], + [ + "modifyvm", + "{{.Name}}", + "--memory", + "2048" + ], + [ + "modifyvm", + "{{.Name}}", + "--mouse", + "usbtablet" + ], + [ + "modifyvm", + "{{.Name}}", + "--vram", + "9" + ], + [ + "storageattach", + "{{.Name}}", + "--storagectl", + "SATA Controller", + "--port", + "1", + "--type", + "dvddrive", + "--medium", + "{{user `iso_url`}}" ] ], "vboxmanage_post": [ [ - "storageattach", "{{.Name}}", - "--storagectl", "SATA Controller", - "--port", "1", - "--type", "dvddrive", - "--medium", "none" + "storageattach", + "{{.Name}}", + "--storagectl", + "SATA Controller", + "--port", + "1", + "--type", + "dvddrive", + "--medium", + "none" ], [ - "storagectl", "{{.Name}}", - "--name", "IDE Controller", + "storagectl", + "{{.Name}}", + "--name", + "IDE Controller", "--remove" ] ], - "virtualbox_version_file": ".vbox_version" + "virtualbox_version_file": ".vbox_version", + "vm_name": "packer-macosx-10.8-virtualbox" } ], + "min_packer_version": "0.6.0", "post-processors": [ { + "output": "builds/{{.Provider}}/opscode_macosx-10.8_chef-{{user `chef_version`}}.box", "type": "vagrant", - "vagrantfile_template": "vagrantfile_templates/macosx.rb", - "output": "builds/{{.Provider}}/opscode_macosx-10.8_chef-{{user `chef_version`}}.box" + "vagrantfile_template": "vagrantfile_templates/macosx.rb" + } + ], + "provisioners": [ + { + "destination": "/private/tmp/kcpassword", + "source": "scripts/macosx/support/kcpassword", + "type": "file" + }, + { + "execute_command": "echo 'vagrant'| {{.Vars}} sudo -E -S sh '{{.Path}}'", + "scripts": [ + "scripts/macosx/hostname.sh", + "scripts/macosx/builder.sh", + "scripts/macosx/update.sh", + "scripts/macosx/vagrant.sh", + "scripts/macosx/cleanup.sh" + ], + "type": "shell" + }, + { + "execute_command": "echo 'vagrant'| {{.Vars}} sudo -E -S sh '{{.Path}}'", + "inline": [ + "[ -z \"{{user `autologin_vagrant_user`}}\" ] && exit", + "echo \"Enabling automatic GUI login for the 'vagrant' user..\"", + "cp /private/tmp/kcpassword /private/etc/kcpassword", + "/usr/bin/defaults write /Library/Preferences/com.apple.loginwindow autoLoginUser vagrant" + ], + "type": "shell" } - ] + ], + "variables": { + "autologin_vagrant_user": "", + "chef_version": "provisionerless", + "iso_checksum": "e2a48af008ff3c4db6a8235151a1e90ea600fceb", + "iso_url": "http://fakeurl/OSX_InstallESD_10.8.5_12F45.dmg" + } } + diff --git a/macosx-10.9.json b/macosx-10.9.json index 0bb10a3dd..0ccb1e248 100644 --- a/macosx-10.9.json +++ b/macosx-10.9.json @@ -1,39 +1,4 @@ { - "min_packer_version": "0.6.0", - "variables": { - "autologin_vagrant_user": "", - "iso_url": "http://fakeurl/OSX_InstallESD_10.9.1_13B42.dmg", - "iso_checksum": "e2a48af008ff3c4db6a8235151a1e90ea600fceb", - "chef_version": "provisionerless" - }, - "provisioners": [ - { - "type": "file", - "destination": "/private/tmp/kcpassword", - "source": "scripts/macosx/support/kcpassword" - }, - { - "type": "shell", - "scripts": [ - "scripts/macosx/hostname.sh", - "scripts/macosx/builder.sh", - "scripts/macosx/update.sh", - "scripts/macosx/vagrant.sh", - "scripts/macosx/cleanup.sh" - ], - "execute_command": "echo 'vagrant'| {{.Vars}} sudo -E -S sh '{{.Path}}'" - }, - { - "type": "shell", - "inline": [ - "[ -z \"{{user `autologin_vagrant_user`}}\" ] && exit", - "echo \"Enabling automatic GUI login for the 'vagrant' user..\"", - "cp /private/tmp/kcpassword /private/etc/kcpassword", - "/usr/bin/defaults write /Library/Preferences/com.apple.loginwindow autoLoginUser vagrant" - ], - "execute_command": "echo 'vagrant'| {{.Vars}} sudo -E -S sh '{{.Path}}'" - } - ], "builders": [ { "boot_wait": "2s", @@ -55,14 +20,14 @@ "vm_name": "packer-macosx-10.9-vmware", "vmx_data": { "cpuid.coresPerSocket": "1", - "memsize": "2048", - "numvcpus": "1", + "ehci.present": "TRUE", "firmware": "efi", - "keyboardAndMouseProfile": "macProfile", - "smc.present": "TRUE", "hpet0.present": "TRUE", "ich7m.present": "TRUE", - "ehci.present": "TRUE", + "keyboardAndMouseProfile": "macProfile", + "memsize": "2048", + "numvcpus": "1", + "smc.present": "TRUE", "usb.present": "TRUE" } }, @@ -82,49 +47,152 @@ "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", "type": "virtualbox-iso", - "vm_name": "packer-macosx-10.9-virtualbox", "vboxmanage": [ - ["modifyvm", "{{.Name}}", "--audiocontroller", "hda"], - ["modifyvm", "{{.Name}}", "--boot1", "dvd"], - ["modifyvm", "{{.Name}}", "--boot2", "disk"], - ["modifyvm", "{{.Name}}", "--chipset", "ich9"], - ["modifyvm", "{{.Name}}", "--cpus", "1"], - ["modifyvm", "{{.Name}}", "--firmware", "efi"], - ["modifyvm", "{{.Name}}", "--hpet", "on"], - ["modifyvm", "{{.Name}}", "--keyboard", "usb"], - ["modifyvm", "{{.Name}}", "--memory", "2048"], - ["modifyvm", "{{.Name}}", "--mouse", "usbtablet"], - ["modifyvm", "{{.Name}}", "--vram", "9"], [ - "storageattach", "{{.Name}}", - "--storagectl", "SATA Controller", - "--port", "1", - "--type", "dvddrive", - "--medium", "{{user `iso_url`}}" + "modifyvm", + "{{.Name}}", + "--audiocontroller", + "hda" + ], + [ + "modifyvm", + "{{.Name}}", + "--boot1", + "dvd" + ], + [ + "modifyvm", + "{{.Name}}", + "--boot2", + "disk" + ], + [ + "modifyvm", + "{{.Name}}", + "--chipset", + "ich9" + ], + [ + "modifyvm", + "{{.Name}}", + "--cpus", + "1" + ], + [ + "modifyvm", + "{{.Name}}", + "--firmware", + "efi" + ], + [ + "modifyvm", + "{{.Name}}", + "--hpet", + "on" + ], + [ + "modifyvm", + "{{.Name}}", + "--keyboard", + "usb" + ], + [ + "modifyvm", + "{{.Name}}", + "--memory", + "2048" + ], + [ + "modifyvm", + "{{.Name}}", + "--mouse", + "usbtablet" + ], + [ + "modifyvm", + "{{.Name}}", + "--vram", + "9" + ], + [ + "storageattach", + "{{.Name}}", + "--storagectl", + "SATA Controller", + "--port", + "1", + "--type", + "dvddrive", + "--medium", + "{{user `iso_url`}}" ] ], "vboxmanage_post": [ [ - "storageattach", "{{.Name}}", - "--storagectl", "SATA Controller", - "--port", "1", - "--type", "dvddrive", - "--medium", "none" + "storageattach", + "{{.Name}}", + "--storagectl", + "SATA Controller", + "--port", + "1", + "--type", + "dvddrive", + "--medium", + "none" ], [ - "storagectl", "{{.Name}}", - "--name", "IDE Controller", + "storagectl", + "{{.Name}}", + "--name", + "IDE Controller", "--remove" ] ], - "virtualbox_version_file": ".vbox_version" + "virtualbox_version_file": ".vbox_version", + "vm_name": "packer-macosx-10.9-virtualbox" } ], + "min_packer_version": "0.6.0", "post-processors": [ { + "output": "builds/{{.Provider}}/opscode_macosx-10.9_chef-{{user `chef_version`}}.box", "type": "vagrant", - "vagrantfile_template": "vagrantfile_templates/macosx.rb", - "output": "builds/{{.Provider}}/opscode_macosx-10.9_chef-{{user `chef_version`}}.box" + "vagrantfile_template": "vagrantfile_templates/macosx.rb" + } + ], + "provisioners": [ + { + "destination": "/private/tmp/kcpassword", + "source": "scripts/macosx/support/kcpassword", + "type": "file" + }, + { + "execute_command": "echo 'vagrant'| {{.Vars}} sudo -E -S sh '{{.Path}}'", + "scripts": [ + "scripts/macosx/hostname.sh", + "scripts/macosx/builder.sh", + "scripts/macosx/update.sh", + "scripts/macosx/vagrant.sh", + "scripts/macosx/cleanup.sh" + ], + "type": "shell" + }, + { + "execute_command": "echo 'vagrant'| {{.Vars}} sudo -E -S sh '{{.Path}}'", + "inline": [ + "[ -z \"{{user `autologin_vagrant_user`}}\" ] && exit", + "echo \"Enabling automatic GUI login for the 'vagrant' user..\"", + "cp /private/tmp/kcpassword /private/etc/kcpassword", + "/usr/bin/defaults write /Library/Preferences/com.apple.loginwindow autoLoginUser vagrant" + ], + "type": "shell" } - ] + ], + "variables": { + "autologin_vagrant_user": "", + "chef_version": "provisionerless", + "iso_checksum": "e2a48af008ff3c4db6a8235151a1e90ea600fceb", + "iso_url": "http://fakeurl/OSX_InstallESD_10.9.1_13B42.dmg" + } } + diff --git a/omnios-r151010j.json b/omnios-r151010j.json index 3968e15fe..9d5c1a2a5 100644 --- a/omnios-r151010j.json +++ b/omnios-r151010j.json @@ -148,23 +148,33 @@ ], "boot_wait": "30s", "disk_size": 40960, - "hard_drive_interface": "ide", "guest_os_type": "opensolaris", + "hard_drive_interface": "ide", "iso_checksum": "bc3f4c0d29a5da75174de62da00294e5ef826b5e", "iso_checksum_type": "sha1", "iso_url": "{{user `mirror`}}/OmniOS_Text_r151010j.iso", "output_directory": "packer-omnios-r151010j-parallels", + "parallels_tools_mode": "disable", + "prlctl": [ + [ + "set", + "{{.Name}}", + "--memsize", + "512" + ], + [ + "set", + "{{.Name}}", + "--cpus", + "1" + ] + ], "shutdown_command": "/usr/sbin/shutdown -g 0 -y -i 5", "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "root", - "parallels_tools_mode": "disable", "type": "parallels-iso", - "vm_name": "packer-omnios-r151010j", - "prlctl": [ - [ "set", "{{.Name}}", "--memsize", "512" ], - [ "set", "{{.Name}}", "--cpus", "1" ] - ] + "vm_name": "packer-omnios-r151010j" } ], "post-processors": [ @@ -184,7 +194,7 @@ "environment_vars": [ "CHEF_VERSION={{user `chef_version`}}" ], - "execute_command": "export {{.Vars}} \u0026\u0026 sh '{{.Path}}'", + "execute_command": "export {{.Vars}} && sh '{{.Path}}'", "scripts": [ "scripts/omnios/vmtools.sh", "scripts/common/chef.sh", @@ -198,3 +208,4 @@ "mirror": "http://omnios.omniti.com/media" } } + diff --git a/opensuse-13.2-i386.json b/opensuse-13.2-i386.json index 7ffdd208d..d684eefd4 100644 --- a/opensuse-13.2-i386.json +++ b/opensuse-13.2-i386.json @@ -86,12 +86,6 @@ "iso_checksum_type": "sha1", "iso_url": "{{user `mirror`}}/13.2/iso/openSUSE-13.2-DVD-i586.iso", "output_directory": "packer-opensuse-13.2-i386-parallels", - "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "parallels-iso", "parallels_tools_flavor": "lin", "prlctl": [ [ @@ -108,6 +102,12 @@ ] ], "prlctl_version_file": ".prlctl_version", + "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "parallels-iso", "vm_name": "packer-opensuse-13.2-i386" } ], @@ -142,3 +142,4 @@ "mirror": "http://download.opensuse.org/distribution" } } + diff --git a/opensuse-13.2-x86_64.json b/opensuse-13.2-x86_64.json index 9dba30337..f4815a158 100644 --- a/opensuse-13.2-x86_64.json +++ b/opensuse-13.2-x86_64.json @@ -86,12 +86,6 @@ "iso_checksum_type": "sha1", "iso_url": "{{user `mirror`}}/13.2/iso/openSUSE-13.2-DVD-x86_64.iso", "output_directory": "packer-opensuse-13.2-x86_64-parallels", - "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "parallels-iso", "parallels_tools_flavor": "lin", "prlctl": [ [ @@ -108,6 +102,12 @@ ] ], "prlctl_version_file": ".prlctl_version", + "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "parallels-iso", "vm_name": "packer-opensuse-13.2-x86_64" } ], diff --git a/oracle-5.11-i386.json b/oracle-5.11-i386.json index e24512703..718704a29 100644 --- a/oracle-5.11-i386.json +++ b/oracle-5.11-i386.json @@ -69,19 +69,13 @@ ], "boot_wait": "10s", "disk_size": 40960, - "parallels_tools_flavor": "lin", "guest_os_type": "centos", "http_directory": "http", "iso_checksum": "f4ef2b868a0cccb736664136eca798ec", "iso_checksum_type": "md5", "iso_url": "{{user `mirror`}}/Enterprise-R5-U11-Server-i386-dvd.iso", "output_directory": "packer-oracle-5.11-i386-parallels", - "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "parallels-iso", + "parallels_tools_flavor": "lin", "prlctl": [ [ "set", @@ -97,9 +91,14 @@ ] ], "prlctl_version_file": ".prlctl_version", + "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "parallels-iso", "vm_name": "packer-oracle-5.11-i386" } - ], "post-processors": [ { diff --git a/oracle-5.11-x86_64.json b/oracle-5.11-x86_64.json index f4f3a8078..f92ea8d00 100644 --- a/oracle-5.11-x86_64.json +++ b/oracle-5.11-x86_64.json @@ -69,19 +69,13 @@ ], "boot_wait": "10s", "disk_size": 40960, - "parallels_tools_flavor": "lin", "guest_os_type": "centos", "http_directory": "http", "iso_checksum": "8af2121088c7e6f5ebdb6d5900403240", "iso_checksum_type": "md5", "iso_url": "{{user `mirror`}}/Enterprise-R5-U11-Server-x86_64-dvd.iso", "output_directory": "packer-oracle-5.11-x86_64-parallels", - "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "parallels-iso", + "parallels_tools_flavor": "lin", "prlctl": [ [ "set", @@ -97,9 +91,14 @@ ] ], "prlctl_version_file": ".prlctl_version", + "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "parallels-iso", "vm_name": "packer-oracle-5.11-x86_64" } - ], "post-processors": [ { diff --git a/oracle-6.6-i386.json b/oracle-6.6-i386.json index 55509e4e7..3f5ae6999 100644 --- a/oracle-6.6-i386.json +++ b/oracle-6.6-i386.json @@ -10,9 +10,9 @@ "guest_os_type": "Oracle", "hard_drive_interface": "sata", "http_directory": "http", - "iso_url": "{{user `mirror`}}/OracleLinux-R6-U6-Server-i386-dvd.iso", "iso_checksum": "81f0c85217f40763dea5053ec5594e4958498bbc", "iso_checksum_type": "sha1", + "iso_url": "{{user `mirror`}}/OracleLinux-R6-U6-Server-i386-dvd.iso", "output_directory": "packer-oracle-6.6-i386-virtualbox", "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", @@ -45,9 +45,9 @@ "disk_size": 40960, "guest_os_type": "oraclelinux", "http_directory": "http", - "iso_url": "{{user `mirror`}}/OracleLinux-R6-U6-Server-i386-dvd.iso", "iso_checksum": "81f0c85217f40763dea5053ec5594e4958498bbc", "iso_checksum_type": "sha1", + "iso_url": "{{user `mirror`}}/OracleLinux-R6-U6-Server-i386-dvd.iso", "output_directory": "packer-oracle-6.6-i386-vmware", "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", @@ -69,19 +69,13 @@ ], "boot_wait": "10s", "disk_size": 40960, - "parallels_tools_flavor": "lin", "guest_os_type": "centos", "http_directory": "http", - "iso_url": "{{user `mirror`}}/OracleLinux-R6-U6-Server-i386-dvd.iso", "iso_checksum": "81f0c85217f40763dea5053ec5594e4958498bbc", "iso_checksum_type": "sha1", + "iso_url": "{{user `mirror`}}/OracleLinux-R6-U6-Server-i386-dvd.iso", "output_directory": "packer-oracle-6.6-i386-parallels", - "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "parallels-iso", + "parallels_tools_flavor": "lin", "prlctl": [ [ "set", @@ -97,9 +91,14 @@ ] ], "prlctl_version_file": ".prlctl_version", + "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "parallels-iso", "vm_name": "packer-oracle-6.6-i386" } - ], "post-processors": [ { @@ -130,3 +129,4 @@ "mirror": "http://mirrors.dotsrc.org/oracle-linux/OL6/U6/i386" } } + diff --git a/oracle-6.6-x86_64.json b/oracle-6.6-x86_64.json index 4c5e97b75..a3efc6231 100644 --- a/oracle-6.6-x86_64.json +++ b/oracle-6.6-x86_64.json @@ -69,19 +69,13 @@ ], "boot_wait": "10s", "disk_size": 40960, - "parallels_tools_flavor": "lin", "guest_os_type": "centos", "http_directory": "http", "iso_checksum": "5738f10a506d3630edfd297ef179b553091c6a48", "iso_checksum_type": "sha1", "iso_url": "{{user `mirror`}}/OracleLinux-R6-U6-Server-x86_64-dvd.iso", "output_directory": "packer-oracle-6.6-x86_64-parallels", - "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "parallels-iso", + "parallels_tools_flavor": "lin", "prlctl": [ [ "set", @@ -97,6 +91,12 @@ ] ], "prlctl_version_file": ".prlctl_version", + "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "parallels-iso", "vm_name": "packer-oracle-6.6-x86_64" } ], @@ -129,3 +129,4 @@ "mirror": "http://mirrors.dotsrc.org/oracle-linux/OL6/U6/x86_64" } } + diff --git a/rhel-5.11-i386.json b/rhel-5.11-i386.json index 573f3cb83..cdbab7aaf 100644 --- a/rhel-5.11-i386.json +++ b/rhel-5.11-i386.json @@ -69,19 +69,13 @@ ], "boot_wait": "10s", "disk_size": 40960, - "parallels_tools_flavor": "lin", "guest_os_type": "rhel", "http_directory": "http", "iso_checksum": "4e38e4ed06d83efb10446e7db19d96761715cdbdbf0bbfacb978b44ce368bbe2", "iso_checksum_type": "sha256", "iso_url": "{{user `mirror`}}/rhel-server-5.11-i386-dvd.iso", "output_directory": "packer-rhel-5.11-i386-parallels", - "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "parallels-iso", + "parallels_tools_flavor": "lin", "prlctl": [ [ "set", @@ -97,9 +91,14 @@ ] ], "prlctl_version_file": ".prlctl_version", + "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "parallels-iso", "vm_name": "packer-rhel-5.11-i386" } - ], "post-processors": [ { diff --git a/rhel-5.11-x86_64.json b/rhel-5.11-x86_64.json index bef621293..bea539693 100644 --- a/rhel-5.11-x86_64.json +++ b/rhel-5.11-x86_64.json @@ -69,19 +69,13 @@ ], "boot_wait": "10s", "disk_size": 40960, - "parallels_tools_flavor": "lin", "guest_os_type": "rhel", "http_directory": "http", "iso_checksum": "36565fe0c8a97207d63234d10123daeedb29d509576dbd7b34e71958ac2f9050", "iso_checksum_type": "sha256", "iso_url": "{{user `mirror`}}/rhel-server-5.11-x86_64-dvd.iso", "output_directory": "packer-rhel-5.11-x86_64-parallels", - "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "parallels-iso", + "parallels_tools_flavor": "lin", "prlctl": [ [ "set", @@ -97,9 +91,14 @@ ] ], "prlctl_version_file": ".prlctl_version", + "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "parallels-iso", "vm_name": "packer-rhel-5.11-x86_64" } - ], "post-processors": [ { diff --git a/rhel-6.6-i386.json b/rhel-6.6-i386.json index 6d897ad92..f96fbe239 100644 --- a/rhel-6.6-i386.json +++ b/rhel-6.6-i386.json @@ -69,19 +69,13 @@ ], "boot_wait": "10s", "disk_size": 40960, - "parallels_tools_flavor": "lin", "guest_os_type": "rhel", "http_directory": "http", "iso_checksum": "0a14ed1f7d7ea7b831739ed8e71719d9cb7c294bf801e8db39358651768547ad", "iso_checksum_type": "sha256", "iso_url": "{{user `mirror`}}/rhel-server-6.6-i386-dvd.iso", "output_directory": "packer-rhel-6.6-i386-parallels", - "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "parallels-iso", + "parallels_tools_flavor": "lin", "prlctl": [ [ "set", @@ -97,9 +91,14 @@ ] ], "prlctl_version_file": ".prlctl_version", + "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "parallels-iso", "vm_name": "packer-rhel-6.6-i386" } - ], "post-processors": [ { diff --git a/rhel-6.6-x86_64.json b/rhel-6.6-x86_64.json index a8b915417..d85e30e5a 100644 --- a/rhel-6.6-x86_64.json +++ b/rhel-6.6-x86_64.json @@ -69,19 +69,13 @@ ], "boot_wait": "10s", "disk_size": 40960, - "parallels_tools_flavor": "lin", "guest_os_type": "rhel", "http_directory": "http", "iso_checksum": "16044cb7264f4bc0150f5b6f3f66936ccf2d36e0a4152c00d9236fb7dcae5f32", "iso_checksum_type": "sha256", "iso_url": "{{user `mirror`}}/rhel-server-6.6-x86_64-dvd.iso", "output_directory": "packer-rhel-6.6-x86_64-parallels", - "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "parallels-iso", + "parallels_tools_flavor": "lin", "prlctl": [ [ "set", @@ -97,6 +91,12 @@ ] ], "prlctl_version_file": ".prlctl_version", + "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "parallels-iso", "vm_name": "packer-rhel-6.6-x86_64" } ], diff --git a/rhel-7.1-x86_64.json b/rhel-7.1-x86_64.json index 4d4645864..c33ec5d2a 100644 --- a/rhel-7.1-x86_64.json +++ b/rhel-7.1-x86_64.json @@ -69,19 +69,13 @@ ], "boot_wait": "10s", "disk_size": 40960, - "parallels_tools_flavor": "lin", "guest_os_type": "rhel", "http_directory": "http", "iso_checksum": "3685468ec6cdcb70dfc85ebbc164da427dc2d762644c3c2ee1520f4f661c15ce", "iso_checksum_type": "sha256", "iso_url": "{{user `mirror`}}/rhel-server-7.1-x86_64-dvd.iso", "output_directory": "packer-rhel-7.1-x86_64-parallels", - "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "parallels-iso", + "parallels_tools_flavor": "lin", "prlctl": [ [ "set", @@ -97,9 +91,14 @@ ] ], "prlctl_version_file": ".prlctl_version", + "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "parallels-iso", "vm_name": "packer-rhel-7.1-x86_64" } - ], "post-processors": [ { diff --git a/sles-11-sp2-i386.json b/sles-11-sp2-i386.json index 0ad760622..59d3f887b 100644 --- a/sles-11-sp2-i386.json +++ b/sles-11-sp2-i386.json @@ -81,19 +81,13 @@ ], "boot_wait": "10s", "disk_size": 20480, - "parallels_tools_flavor": "lin", "guest_os_type": "suse", "http_directory": "http", "iso_checksum": "a0b34f6237b2b2a6b2174c82b40ed326", "iso_checksum_type": "md5", "iso_url": "{{user `mirror`}}/SLES-11-SP2-DVD-i586-GM-DVD1.iso", "output_directory": "packer-sles-11-sp2-i386-parallels", - "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "parallels-iso", + "parallels_tools_flavor": "lin", "prlctl": [ [ "set", @@ -109,9 +103,14 @@ ] ], "prlctl_version_file": ".prlctl_version", + "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "parallels-iso", "vm_name": "packer-sles-11-sp2-i386" } - ], "post-processors": [ { diff --git a/sles-11-sp2-x86_64.json b/sles-11-sp2-x86_64.json index 0973c2447..41e982ac8 100644 --- a/sles-11-sp2-x86_64.json +++ b/sles-11-sp2-x86_64.json @@ -81,19 +81,13 @@ ], "boot_wait": "10s", "disk_size": 20480, - "parallels_tools_flavor": "lin", "guest_os_type": "suse", "http_directory": "http", "iso_checksum": "461d82ae6e15062b0807c1338f040497", "iso_checksum_type": "md5", "iso_url": "{{user `mirror`}}/SLES-11-SP2-DVD-x86_64-GM-DVD1.iso", "output_directory": "packer-sles-11-sp2-x86_64-parallels", - "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "parallels-iso", + "parallels_tools_flavor": "lin", "prlctl": [ [ "set", @@ -109,9 +103,14 @@ ] ], "prlctl_version_file": ".prlctl_version", + "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "parallels-iso", "vm_name": "packer-sles-11-sp2-x86_64" } - ], "post-processors": [ { diff --git a/sles-11-sp3-i386.json b/sles-11-sp3-i386.json index 837333e71..9f5d95013 100644 --- a/sles-11-sp3-i386.json +++ b/sles-11-sp3-i386.json @@ -81,19 +81,13 @@ ], "boot_wait": "10s", "disk_size": 20480, - "parallels_tools_flavor": "lin", "guest_os_type": "suse", "http_directory": "http", "iso_checksum": "5c30a409fc8fb3343b4dc90d93ff2c89", "iso_checksum_type": "md5", "iso_url": "{{user `mirror`}}/SLES-11-SP3-DVD-i586-GM-DVD1.iso", "output_directory": "packer-sles-11-sp3-i386-parallels", - "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "parallels-iso", + "parallels_tools_flavor": "lin", "prlctl": [ [ "set", @@ -109,9 +103,14 @@ ] ], "prlctl_version_file": ".prlctl_version", + "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "parallels-iso", "vm_name": "packer-sles-11-sp3-i386" } - ], "post-processors": [ { diff --git a/sles-11-sp3-x86_64.json b/sles-11-sp3-x86_64.json index 918c9d609..e0f9531cf 100644 --- a/sles-11-sp3-x86_64.json +++ b/sles-11-sp3-x86_64.json @@ -81,19 +81,13 @@ ], "boot_wait": "10s", "disk_size": 20480, - "parallels_tools_flavor": "lin", "guest_os_type": "suse", "http_directory": "http", "iso_checksum": "480b70d50cbb538382dc2b9325221e1b", "iso_checksum_type": "md5", "iso_url": "{{user `mirror`}}/SLES-11-SP3-DVD-x86_64-GM-DVD1.iso", "output_directory": "packer-sles-11-sp3-x86_64-parallels", - "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "parallels-iso", + "parallels_tools_flavor": "lin", "prlctl": [ [ "set", @@ -109,6 +103,12 @@ ] ], "prlctl_version_file": ".prlctl_version", + "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "parallels-iso", "vm_name": "packer-sles-11-sp3-x86_64" } ], diff --git a/sles-12-x86_64.json b/sles-12-x86_64.json index d2882540d..7648b6ffc 100644 --- a/sles-12-x86_64.json +++ b/sles-12-x86_64.json @@ -81,19 +81,13 @@ ], "boot_wait": "10s", "disk_size": 20480, - "parallels_tools_flavor": "lin", "guest_os_type": "suse", "http_directory": "http", "iso_checksum": "58086fca0441b1d44c7a51c5ee64e1bd4365466fcee48ec92c4f39d07739aeed", "iso_checksum_type": "sha256", "iso_url": "{{user `mirror`}}/SLE-12-Server-DVD-x86_64-GM-DVD1.iso", "output_directory": "packer-sles-12-x86_64-parallels", - "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "parallels-iso", + "parallels_tools_flavor": "lin", "prlctl": [ [ "set", @@ -109,6 +103,12 @@ ] ], "prlctl_version_file": ".prlctl_version", + "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "parallels-iso", "vm_name": "packer-sles-12-x86_64" } ], diff --git a/solaris-10.11-x86.json b/solaris-10.11-x86.json index 8f43ee7a9..7d4391797 100644 --- a/solaris-10.11-x86.json +++ b/solaris-10.11-x86.json @@ -1,23 +1,6 @@ { - "variables": { - "README": "You must download the automated installer iso from the following page, and then place it somewhere that packer can fetch it", - "DOWNLOAD_SITE": "http://www.oracle.com/technetwork/server-storage/solaris10/downloads/index.html", - "mirror": "./packer_cache", - "chef_version": "provisionerless" - }, - "provisioners": [ - { - "type": "shell", - "execute_command": "/usr/local/bin/sudo {{.Path}}", - "scripts": [ - "scripts/solaris10/vmtools.sh", - "scripts/solaris10/minimize.sh" - ] - } - ], "builders": [ { - "type": "virtualbox-iso", "boot_command": [ "e", "e", @@ -27,6 +10,8 @@ " - install<enter>", "b" ], + "boot_wait": "5s", + "disk_size": 20000, "floppy_files": [ "floppy/solaris10/sysidcfg", "floppy/solaris10/awesome_prof", @@ -34,23 +19,20 @@ "floppy/solaris10/S99startup.sh", "floppy/solaris10/finish.sh" ], - "boot_wait": "5s", - "disk_size": 20000, + "guest_additions_mode": "upload", "guest_os_type": "Solaris_64", "http_directory": "http/solaris-10", "iso_checksum": "aae1452bb3d56baa3dcb8866ce7e4a08", "iso_checksum_type": "md5", "iso_url": "{{user `mirror`}}/sol-10-u11-ga-x86-dvd.iso", - "ssh_username": "vagrant", + "output_directory": "packer-solaris-10u11-x86_64-virtualbox", + "shutdown_command": "/usr/local/bin/sudo /usr/sbin/init 5", + "shutdown_timeout": "10m", "ssh_password": "vagrant", "ssh_port": 22, + "ssh_username": "vagrant", "ssh_wait_timeout": "50000s", - "shutdown_command": "/usr/local/bin/sudo /usr/sbin/init 5", - "shutdown_timeout": "10m", - "guest_additions_mode": "upload", - "virtualbox_version_file": ".vbox_version", - "vm_name": "packer-solaris-10u11-x86_64", - "output_directory": "packer-solaris-10u11-x86_64-virtualbox", + "type": "virtualbox-iso", "vboxmanage": [ [ "modifyvm", @@ -64,10 +46,11 @@ "--cpus", "1" ] - ] + ], + "virtualbox_version_file": ".vbox_version", + "vm_name": "packer-solaris-10u11-x86_64" }, { - "type": "vmware-iso", "boot_command": [ "e", "e", @@ -77,6 +60,8 @@ " - install<enter>", "b" ], + "boot_wait": "5s", + "disk_size": 20000, "floppy_files": [ "floppy/solaris10/sysidcfg", "floppy/solaris10/awesome_prof", @@ -84,23 +69,22 @@ "floppy/solaris10/S99startup.sh", "floppy/solaris10/finish.sh" ], - "boot_wait": "5s", - "disk_size": 20000, "guest_os_type": "solaris10-64", "http_directory": "http/solaris-10", "iso_checksum": "aae1452bb3d56baa3dcb8866ce7e4a08", "iso_checksum_type": "md5", "iso_url": "{{user `mirror`}}/sol-10-u11-ga-x86-dvd.iso", - "ssh_username": "vagrant", + "output_directory": "packer-solaris-10u11-x86_64-vmware", + "shutdown_command": "/usr/local/bin/sudo /usr/sbin/init 5", + "shutdown_timeout": "10m", "ssh_password": "vagrant", "ssh_port": 22, + "ssh_username": "vagrant", "ssh_wait_timeout": "50000s", - "shutdown_command": "/usr/local/bin/sudo /usr/sbin/init 5", - "shutdown_timeout": "10m", - "vm_name": "packer-solaris-10u11-x86_64", - "output_directory": "packer-solaris-10u11-x86_64-vmware", "tools_upload_flavor": "solaris", "tools_upload_path": "/home/vagrant/solaris.iso", + "type": "vmware-iso", + "vm_name": "packer-solaris-10u11-x86_64", "vmx_data": { "cpuid.coresPerSocket": "1", "memsize": "1536", @@ -113,5 +97,22 @@ "output": "builds/{{.Provider}}/opscode_solaris-10.11_chef-{{user `chef_version`}}.box", "type": "vagrant" } - ] + ], + "provisioners": [ + { + "execute_command": "/usr/local/bin/sudo {{.Path}}", + "scripts": [ + "scripts/solaris10/vmtools.sh", + "scripts/solaris10/minimize.sh" + ], + "type": "shell" + } + ], + "variables": { + "DOWNLOAD_SITE": "http://www.oracle.com/technetwork/server-storage/solaris10/downloads/index.html", + "README": "You must download the automated installer iso from the following page, and then place it somewhere that packer can fetch it", + "chef_version": "provisionerless", + "mirror": "./packer_cache" + } } + diff --git a/solaris-11-x86.json b/solaris-11-x86.json index e3ba56e25..c85628885 100644 --- a/solaris-11-x86.json +++ b/solaris-11-x86.json @@ -1,28 +1,6 @@ { - "variables": { - "README": "You must download the automated installer iso from the following page, and then place it somewhere that packer can fetch it", - "DOWNLOAD_SITE": "http://www.oracle.com/technetwork/server-storage/solaris11/downloads/index.html", - "mirror": "./packer_cache", - "chef_version": "provisionerless" - }, - "provisioners": [ - { - "type": "shell", - "environment_vars": [ - "CHEF_VERSION={{user `chef_version`}}" - ], - "scripts": [ - "scripts/solaris/update.sh", - "scripts/solaris/vmtools.sh", - "scripts/common/vagrant.sh", - "scripts/solaris/minimize.sh" - ], - "execute_command": "echo 'vagrant'|sudo -S bash {{.Path}}" - } - ], "builders": [ { - "type": "virtualbox-iso", "boot_command": [ "e<wait>", "<down><down><down><down><down><wait>", @@ -47,26 +25,25 @@ "cp profile.xml /system/volatile/profile/profile.xml;<wait>", "svcadm enable svc:/application/auto-installer:default;<wait>", "<enter><wait10><wait><wait>", - "<enter><wait>", + "<enter><wait>", "tail -f /var/svc/log/application-auto-installer\\:default.log<enter><wait>" ], "boot_wait": "5s", "disk_size": 10360, + "guest_additions_mode": "attach", "guest_os_type": "Solaris11_64", "http_directory": "http/solaris-11", "iso_checksum": "2b3859bb7532cfe42214349dff9fcc23", "iso_checksum_type": "md5", "iso_url": "{{user `mirror`}}/sol-11_2-ai-x86.iso", - "ssh_username": "vagrant", + "output_directory": "packer-solaris-11.2-x86_64-virtualbox", + "shutdown_command": "echo 'vagrant'|sudo -i init 5", + "shutdown_timeout": "10m", "ssh_password": "vagrant", "ssh_port": 22, + "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", - "shutdown_command": "echo 'vagrant'|sudo -i init 5", - "shutdown_timeout": "10m", - "guest_additions_mode": "attach", - "virtualbox_version_file": ".vbox_version", - "vm_name": "packer-solaris-11.2-x86_64", - "output_directory": "packer-solaris-11.2-x86_64-virtualbox", + "type": "virtualbox-iso", "vboxmanage": [ [ "modifyvm", @@ -80,10 +57,11 @@ "--cpus", "1" ] - ] + ], + "virtualbox_version_file": ".vbox_version", + "vm_name": "packer-solaris-11.2-x86_64" }, { - "type": "vmware-iso", "boot_command": [ "e<wait>", "<down><down><down><down><down><wait>", @@ -108,7 +86,7 @@ "cp profile.xml /system/volatile/profile/profile.xml;<wait>", "svcadm enable svc:/application/auto-installer:default;<wait>", "<enter><wait10><wait><wait>", - "<enter><wait>", + "<enter><wait>", "tail -f /var/svc/log/application-auto-installer\\:default.log<enter><wait>" ], "boot_wait": "5s", @@ -118,18 +96,19 @@ "iso_checksum": "2b3859bb7532cfe42214349dff9fcc23", "iso_checksum_type": "md5", "iso_url": "{{user `mirror`}}/sol-11_2-ai-x86.iso", - "ssh_username": "vagrant", + "output_directory": "packer-solaris-11.2-x86_64-vmware", + "shutdown_command": "echo 'vagrant'|sudo -i init 5", + "shutdown_timeout": "10m", "ssh_password": "vagrant", "ssh_port": 22, + "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", - "shutdown_command": "echo 'vagrant'|sudo -i init 5", - "shutdown_timeout": "10m", + "type": "vmware-iso", "vm_name": "packer-solaris-11.2-x86_64", - "output_directory": "packer-solaris-11.2-x86_64-vmware", "vmx_data": { - "memsize": "2048", - "cpuid.coresPerSocket": "1", - "numvcpus": "1" + "cpuid.coresPerSocket": "1", + "memsize": "2048", + "numvcpus": "1" } } ], @@ -138,5 +117,27 @@ "output": "builds/{{.Provider}}/opscode_solaris-11.2_chef-{{user `chef_version`}}.box", "type": "vagrant" } - ] + ], + "provisioners": [ + { + "environment_vars": [ + "CHEF_VERSION={{user `chef_version`}}" + ], + "execute_command": "echo 'vagrant'|sudo -S bash {{.Path}}", + "scripts": [ + "scripts/solaris/update.sh", + "scripts/solaris/vmtools.sh", + "scripts/common/vagrant.sh", + "scripts/solaris/minimize.sh" + ], + "type": "shell" + } + ], + "variables": { + "DOWNLOAD_SITE": "http://www.oracle.com/technetwork/server-storage/solaris11/downloads/index.html", + "README": "You must download the automated installer iso from the following page, and then place it somewhere that packer can fetch it", + "chef_version": "provisionerless", + "mirror": "./packer_cache" + } } + diff --git a/ubuntu-10.04-amd64.json b/ubuntu-10.04-amd64.json index 7e233f15f..72646aee8 100644 --- a/ubuntu-10.04-amd64.json +++ b/ubuntu-10.04-amd64.json @@ -132,19 +132,13 @@ ], "boot_wait": "10s", "disk_size": 40960, - "parallels_tools_flavor": "lin", "guest_os_type": "ubuntu", "http_directory": "http", "iso_checksum": "796e80702d65f2ee96e88874a1ab437e24df9cd6", "iso_checksum_type": "sha1", "iso_url": "{{user `mirror`}}/10.04.4/ubuntu-10.04.4-server-amd64.iso", "output_directory": "packer-ubuntu-10.04-amd64-parallels", - "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "parallels-iso", + "parallels_tools_flavor": "lin", "prlctl": [ [ "set", @@ -160,9 +154,14 @@ ] ], "prlctl_version_file": ".prlctl_version", + "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "parallels-iso", "vm_name": "packer-ubuntu-10.04-amd64" } - ], "post-processors": [ { diff --git a/ubuntu-10.04-i386.json b/ubuntu-10.04-i386.json index 5ad2d3247..5fa299bb5 100644 --- a/ubuntu-10.04-i386.json +++ b/ubuntu-10.04-i386.json @@ -132,19 +132,13 @@ ], "boot_wait": "10s", "disk_size": 40960, - "parallels_tools_flavor": "lin", "guest_os_type": "ubuntu", "http_directory": "http", "iso_checksum": "5695d8b6b914269d1374ac8d4c3dd3786e92d3fe", "iso_checksum_type": "sha1", "iso_url": "{{user `mirror`}}/10.04.4/ubuntu-10.04.4-server-i386.iso", "output_directory": "packer-ubuntu-10.04-i386-parallels", - "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "parallels-iso", + "parallels_tools_flavor": "lin", "prlctl": [ [ "set", @@ -160,9 +154,14 @@ ] ], "prlctl_version_file": ".prlctl_version", + "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "parallels-iso", "vm_name": "packer-ubuntu-10.04-i386" } - ], "post-processors": [ { diff --git a/ubuntu-12.04-amd64.json b/ubuntu-12.04-amd64.json index db32165c9..b20c8f3a8 100644 --- a/ubuntu-12.04-amd64.json +++ b/ubuntu-12.04-amd64.json @@ -132,19 +132,13 @@ ], "boot_wait": "10s", "disk_size": 40960, - "parallels_tools_flavor": "lin", "guest_os_type": "ubuntu", "http_directory": "http", "iso_checksum": "7540ace2d6cdee264432f5ed987236d32edef798", "iso_checksum_type": "sha1", "iso_url": "{{user `mirror`}}/12.04.5/ubuntu-12.04.5-server-amd64.iso", "output_directory": "packer-ubuntu-12.04-amd64-parallels", - "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "parallels-iso", + "parallels_tools_flavor": "lin", "prlctl": [ [ "set", @@ -160,9 +154,14 @@ ] ], "prlctl_version_file": ".prlctl_version", + "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "parallels-iso", "vm_name": "packer-ubuntu-12.04-amd64" } - ], "post-processors": [ { diff --git a/ubuntu-12.04-i386.json b/ubuntu-12.04-i386.json index 121a6c21a..0f7ce5e7d 100644 --- a/ubuntu-12.04-i386.json +++ b/ubuntu-12.04-i386.json @@ -132,19 +132,13 @@ ], "boot_wait": "10s", "disk_size": 40960, - "parallels_tools_flavor": "lin", "guest_os_type": "ubuntu", "http_directory": "http", "iso_checksum": "3bae12e315c89d42d7bf571e4e35efce585c7624", "iso_checksum_type": "sha1", "iso_url": "{{user `mirror`}}/12.04.5/ubuntu-12.04.4-server-i386.iso", "output_directory": "packer-ubuntu-12.04-i386-parallels", - "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "parallels-iso", + "parallels_tools_flavor": "lin", "prlctl": [ [ "set", @@ -160,9 +154,14 @@ ] ], "prlctl_version_file": ".prlctl_version", + "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "parallels-iso", "vm_name": "packer-ubuntu-12.04-i386" } - ], "post-processors": [ { diff --git a/ubuntu-14.04-amd64.json b/ubuntu-14.04-amd64.json index 2ca5040f7..6b4037318 100644 --- a/ubuntu-14.04-amd64.json +++ b/ubuntu-14.04-amd64.json @@ -132,19 +132,13 @@ ], "boot_wait": "10s", "disk_size": 40960, - "parallels_tools_flavor": "lin", "guest_os_type": "ubuntu", "http_directory": "http", "iso_checksum": "8acd2f56bfcba2f7ac74a7e4a5e565ce68c024c38525c0285573e41c86ae90c0", "iso_checksum_type": "sha256", "iso_url": "{{user `mirror`}}/14.04.2/ubuntu-14.04.2-server-amd64.iso", "output_directory": "packer-ubuntu-14.04-amd64-parallels", - "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "parallels-iso", + "parallels_tools_flavor": "lin", "prlctl": [ [ "set", @@ -160,9 +154,14 @@ ] ], "prlctl_version_file": ".prlctl_version", + "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "parallels-iso", "vm_name": "packer-ubuntu-14.04-amd64" } - ], "post-processors": [ { @@ -195,3 +194,4 @@ "mirror": "http://releases.ubuntu.com" } } + diff --git a/ubuntu-14.04-i386.json b/ubuntu-14.04-i386.json index f3124167a..f7996e91d 100644 --- a/ubuntu-14.04-i386.json +++ b/ubuntu-14.04-i386.json @@ -132,19 +132,13 @@ ], "boot_wait": "10s", "disk_size": 40960, - "parallels_tools_flavor": "lin", "guest_os_type": "ubuntu", "http_directory": "http", "iso_checksum": "76524ab9502a34b983ed56af2d5a72835ce41aec1e2b4c0cb7788ef596958ed6", "iso_checksum_type": "sha256", "iso_url": "{{user `mirror`}}/14.04.2/ubuntu-14.04.2-server-i386.iso", "output_directory": "packer-ubuntu-14.04-i386-parallels", - "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "parallels-iso", + "parallels_tools_flavor": "lin", "prlctl": [ [ "set", @@ -160,9 +154,14 @@ ] ], "prlctl_version_file": ".prlctl_version", + "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "parallels-iso", "vm_name": "packer-ubuntu-14.04-i386" } - ], "post-processors": [ { @@ -195,3 +194,4 @@ "mirror": "http://releases.ubuntu.com" } } + diff --git a/ubuntu-14.10-amd64.json b/ubuntu-14.10-amd64.json index 7b1308917..8d79fac69 100644 --- a/ubuntu-14.10-amd64.json +++ b/ubuntu-14.10-amd64.json @@ -132,19 +132,13 @@ ], "boot_wait": "10s", "disk_size": 40960, - "parallels_tools_flavor": "lin", "guest_os_type": "ubuntu", "http_directory": "http", "iso_checksum": "0c1ebea31c3523cfe9a4ffed8bcf6c7d23dfb97b", "iso_checksum_type": "sha1", "iso_url": "{{user `mirror`}}/14.10/ubuntu-14.10-server-amd64.iso", "output_directory": "packer-ubuntu-14.10-amd64-parallels", - "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "parallels-iso", + "parallels_tools_flavor": "lin", "prlctl": [ [ "set", @@ -160,9 +154,14 @@ ] ], "prlctl_version_file": ".prlctl_version", + "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "parallels-iso", "vm_name": "packer-ubuntu-14.10-amd64" } - ], "post-processors": [ { @@ -195,3 +194,4 @@ "mirror": "http://releases.ubuntu.com" } } + diff --git a/ubuntu-14.10-i386.json b/ubuntu-14.10-i386.json index f4fe31f1a..aa3e8271d 100644 --- a/ubuntu-14.10-i386.json +++ b/ubuntu-14.10-i386.json @@ -132,19 +132,13 @@ ], "boot_wait": "10s", "disk_size": 40960, - "parallels_tools_flavor": "lin", "guest_os_type": "ubuntu", "http_directory": "http", "iso_checksum": "26faf47df2162f4ff83e38e6831dd169da6db95f", "iso_checksum_type": "sha1", "iso_url": "{{user `mirror`}}/14.10/ubuntu-14.10-server-i386.iso", "output_directory": "packer-ubuntu-14.10-i386-parallels", - "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "parallels-iso", + "parallels_tools_flavor": "lin", "prlctl": [ [ "set", @@ -160,9 +154,14 @@ ] ], "prlctl_version_file": ".prlctl_version", + "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "parallels-iso", "vm_name": "packer-ubuntu-14.10-i386" } - ], "post-processors": [ { @@ -195,3 +194,4 @@ "mirror": "http://releases.ubuntu.com" } } + From e2d6c76384167b020390e9400ae6fdeb03e544ec Mon Sep 17 00:00:00 2001 From: Fletcher Nichol <fnichol@nichol.ca> Date: Tue, 26 May 2015 10:32:51 -0600 Subject: [PATCH 0332/1622] [TravisCI] Run `bin/bento normalize` in favor of Thor task. --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 466b291a3..601321a13 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,6 +4,6 @@ rvm: before_install: wget --no-check-certificate https://dl.bintray.com/mitchellh/packer/packer_0.7.5_linux_amd64.zip && unzip -d packer packer_0.7.5_linux_amd64.zip before_script: export PATH=$PATH:$PWD/packer -script: bundle exec thor packer:validate +script: ./bin/bento normalize sudo: false From 02aa8c42c18fe1932f19411ca84f5cfed4d68352 Mon Sep 17 00:00:00 2001 From: Fletcher Nichol <fnichol@nichol.ca> Date: Tue, 26 May 2015 13:46:26 -0600 Subject: [PATCH 0333/1622] Remove `chef_version` user variable & remove Chef installation option. In an effort to simplify the potential for behavior proliferation that user variables allows, the `chef_version` user variable is being dropped. The default behavior was to *not* install Chef for all Bento boxes as downstream tooling such as Test Kitchen or vagrant-omnibus can handle Chef installations at boot time. --- centos-5.11-i386.json | 8 ++------ centos-5.11-x86_64.json | 8 ++------ centos-6.6-i386.json | 8 ++------ centos-6.6-x86_64.json | 8 ++------ centos-7.1-x86_64.json | 8 ++------ debian-6.0.10-amd64.json | 8 ++------ debian-6.0.10-i386.json | 8 ++------ debian-7.8-amd64.json | 8 ++------ debian-7.8-i386.json | 8 ++------ fedora-20-i386.json | 8 ++------ fedora-20-x86_64.json | 8 ++------ fedora-21-i386.json | 8 ++------ fedora-21-x86_64.json | 8 ++------ freebsd-10.1-amd64.json | 8 ++------ freebsd-10.1-i386.json | 8 ++------ freebsd-9.3-amd64.json | 8 ++------ freebsd-9.3-i386.json | 4 +--- macosx-10.7.json | 3 +-- macosx-10.8.json | 3 +-- macosx-10.9.json | 3 +-- omnios-r151010j.json | 8 ++------ opensuse-13.2-i386.json | 8 ++------ opensuse-13.2-x86_64.json | 8 ++------ oracle-5.11-i386.json | 8 ++------ oracle-5.11-x86_64.json | 8 ++------ oracle-6.6-i386.json | 8 ++------ oracle-6.6-x86_64.json | 8 ++------ rhel-5.11-i386.json | 8 ++------ rhel-5.11-x86_64.json | 8 ++------ rhel-6.6-i386.json | 8 ++------ rhel-6.6-x86_64.json | 8 ++------ rhel-7.1-x86_64.json | 8 ++------ sles-11-sp2-i386.json | 8 ++------ sles-11-sp2-x86_64.json | 8 ++------ sles-11-sp3-i386.json | 8 ++------ sles-11-sp3-x86_64.json | 8 ++------ sles-12-x86_64.json | 8 ++------ solaris-10.11-x86.json | 3 +-- solaris-11-x86.json | 7 ++----- ubuntu-10.04-amd64.json | 8 ++------ ubuntu-10.04-i386.json | 8 ++------ ubuntu-12.04-amd64.json | 8 ++------ ubuntu-12.04-i386.json | 8 ++------ ubuntu-14.04-amd64.json | 8 ++------ ubuntu-14.04-i386.json | 8 ++------ ubuntu-14.10-amd64.json | 8 ++------ ubuntu-14.10-i386.json | 8 ++------ 47 files changed, 89 insertions(+), 262 deletions(-) diff --git a/centos-5.11-i386.json b/centos-5.11-i386.json index 1a29baa8c..fed906f00 100644 --- a/centos-5.11-i386.json +++ b/centos-5.11-i386.json @@ -102,21 +102,18 @@ ], "post-processors": [ { - "output": "builds/{{.Provider}}/opscode_centos-5.11-i386_chef-{{user `chef_version`}}.box", + "output": "builds/{{.Provider}}/opscode_centos-5.11-i386.box", "type": "vagrant" } ], "provisioners": [ { - "environment_vars": [ - "CHEF_VERSION={{user `chef_version`}}" - ], + "environment_vars": [], "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E bash '{{.Path}}'", "scripts": [ "scripts/common/vagrant.sh", "scripts/common/sshd.sh", "scripts/common/vmtools.sh", - "scripts/common/chef.sh", "scripts/centos/cleanup.sh", "scripts/common/minimize.sh" ], @@ -124,7 +121,6 @@ } ], "variables": { - "chef_version": "provisionerless", "mirror": "http://mirrors.kernel.org/centos" } } diff --git a/centos-5.11-x86_64.json b/centos-5.11-x86_64.json index 06096eb4b..1a89dd38e 100644 --- a/centos-5.11-x86_64.json +++ b/centos-5.11-x86_64.json @@ -102,21 +102,18 @@ ], "post-processors": [ { - "output": "builds/{{.Provider}}/opscode_centos-5.11_chef-{{user `chef_version`}}.box", + "output": "builds/{{.Provider}}/opscode_centos-5.11.box", "type": "vagrant" } ], "provisioners": [ { - "environment_vars": [ - "CHEF_VERSION={{user `chef_version`}}" - ], + "environment_vars": [], "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E bash '{{.Path}}'", "scripts": [ "scripts/common/vagrant.sh", "scripts/common/sshd.sh", "scripts/common/vmtools.sh", - "scripts/common/chef.sh", "scripts/centos/cleanup.sh", "scripts/common/minimize.sh" ], @@ -124,7 +121,6 @@ } ], "variables": { - "chef_version": "provisionerless", "mirror": "http://mirrors.kernel.org/centos" } } diff --git a/centos-6.6-i386.json b/centos-6.6-i386.json index 382371c32..21e7cfcd7 100644 --- a/centos-6.6-i386.json +++ b/centos-6.6-i386.json @@ -102,22 +102,19 @@ ], "post-processors": [ { - "output": "builds/{{.Provider}}/opscode_centos-6.6-i386_chef-{{user `chef_version`}}.box", + "output": "builds/{{.Provider}}/opscode_centos-6.6-i386.box", "type": "vagrant" } ], "provisioners": [ { - "environment_vars": [ - "CHEF_VERSION={{user `chef_version`}}" - ], + "environment_vars": [], "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E bash '{{.Path}}'", "scripts": [ "scripts/centos/fix-slow-dns.sh", "scripts/common/sshd.sh", "scripts/common/vagrant.sh", "scripts/common/vmtools.sh", - "scripts/common/chef.sh", "scripts/centos/cleanup.sh", "scripts/common/minimize.sh" ], @@ -125,7 +122,6 @@ } ], "variables": { - "chef_version": "provisionerless", "mirror": "http://mirrors.kernel.org/centos" } } diff --git a/centos-6.6-x86_64.json b/centos-6.6-x86_64.json index d66fb8e7c..50fb8586c 100644 --- a/centos-6.6-x86_64.json +++ b/centos-6.6-x86_64.json @@ -102,22 +102,19 @@ ], "post-processors": [ { - "output": "builds/{{.Provider}}/opscode_centos-6.6_chef-{{user `chef_version`}}.box", + "output": "builds/{{.Provider}}/opscode_centos-6.6.box", "type": "vagrant" } ], "provisioners": [ { - "environment_vars": [ - "CHEF_VERSION={{user `chef_version`}}" - ], + "environment_vars": [], "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E bash '{{.Path}}'", "scripts": [ "scripts/centos/fix-slow-dns.sh", "scripts/common/sshd.sh", "scripts/common/vagrant.sh", "scripts/common/vmtools.sh", - "scripts/common/chef.sh", "scripts/centos/cleanup.sh", "scripts/common/minimize.sh" ], @@ -125,7 +122,6 @@ } ], "variables": { - "chef_version": "provisionerless", "mirror": "http://mirrors.kernel.org/centos" } } diff --git a/centos-7.1-x86_64.json b/centos-7.1-x86_64.json index 04b36238d..205b42621 100644 --- a/centos-7.1-x86_64.json +++ b/centos-7.1-x86_64.json @@ -102,22 +102,19 @@ ], "post-processors": [ { - "output": "builds/{{.Provider}}/opscode_centos-7.1_chef-{{user `chef_version`}}.box", + "output": "builds/{{.Provider}}/opscode_centos-7.1.box", "type": "vagrant" } ], "provisioners": [ { - "environment_vars": [ - "CHEF_VERSION={{user `chef_version`}}" - ], + "environment_vars": [], "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E bash '{{.Path}}'", "scripts": [ "scripts/centos/fix-slow-dns.sh", "scripts/common/sshd.sh", "scripts/common/vagrant.sh", "scripts/common/vmtools.sh", - "scripts/common/chef.sh", "scripts/centos/cleanup.sh", "scripts/common/minimize.sh" ], @@ -125,7 +122,6 @@ } ], "variables": { - "chef_version": "provisionerless", "mirror": "http://mirrors.kernel.org/centos" } } diff --git a/debian-6.0.10-amd64.json b/debian-6.0.10-amd64.json index ddc6777a7..cceab70b0 100644 --- a/debian-6.0.10-amd64.json +++ b/debian-6.0.10-amd64.json @@ -144,15 +144,13 @@ ], "post-processors": [ { - "output": "builds/{{.Provider}}/opscode_debian-6.0.10_chef-{{user `chef_version`}}.box", + "output": "builds/{{.Provider}}/opscode_debian-6.0.10.box", "type": "vagrant" } ], "provisioners": [ { - "environment_vars": [ - "CHEF_VERSION={{user `chef_version`}}" - ], + "environment_vars": [], "execute_command": "echo 'vagrant' | {{.Vars}} sudo -E -S bash '{{.Path}}'", "scripts": [ "scripts/debian/update.sh", @@ -161,7 +159,6 @@ "scripts/debian/sudoers.sh", "scripts/common/vagrant.sh", "scripts/common/vmtools.sh", - "scripts/common/chef.sh", "scripts/debian/cleanup.sh", "scripts/common/minimize.sh" ], @@ -169,7 +166,6 @@ } ], "variables": { - "chef_version": "provisionerless", "mirror": "http://cdimage.debian.org/cdimage/archive" } } diff --git a/debian-6.0.10-i386.json b/debian-6.0.10-i386.json index a53abdeaa..b9df2ad98 100644 --- a/debian-6.0.10-i386.json +++ b/debian-6.0.10-i386.json @@ -144,15 +144,13 @@ ], "post-processors": [ { - "output": "builds/{{.Provider}}/opscode_debian-6.0.10-i386_chef-{{user `chef_version`}}.box", + "output": "builds/{{.Provider}}/opscode_debian-6.0.10-i386.box", "type": "vagrant" } ], "provisioners": [ { - "environment_vars": [ - "CHEF_VERSION={{user `chef_version`}}" - ], + "environment_vars": [], "execute_command": "echo 'vagrant' | {{.Vars}} sudo -E -S bash '{{.Path}}'", "scripts": [ "scripts/debian/update.sh", @@ -161,7 +159,6 @@ "scripts/debian/sudoers.sh", "scripts/common/vagrant.sh", "scripts/common/vmtools.sh", - "scripts/common/chef.sh", "scripts/debian/cleanup.sh", "scripts/common/minimize.sh" ], @@ -169,7 +166,6 @@ } ], "variables": { - "chef_version": "provisionerless", "mirror": "http://cdimage.debian.org/cdimage/archive" } } diff --git a/debian-7.8-amd64.json b/debian-7.8-amd64.json index fb27e8184..6933534ea 100644 --- a/debian-7.8-amd64.json +++ b/debian-7.8-amd64.json @@ -144,15 +144,13 @@ ], "post-processors": [ { - "output": "builds/{{.Provider}}/opscode_debian-7.8_chef-{{user `chef_version`}}.box", + "output": "builds/{{.Provider}}/opscode_debian-7.8.box", "type": "vagrant" } ], "provisioners": [ { - "environment_vars": [ - "CHEF_VERSION={{user `chef_version`}}" - ], + "environment_vars": [], "execute_command": "echo 'vagrant' | {{.Vars}} sudo -E -S bash '{{.Path}}'", "scripts": [ "scripts/debian/update.sh", @@ -161,7 +159,6 @@ "scripts/debian/sudoers.sh", "scripts/common/vagrant.sh", "scripts/common/vmtools.sh", - "scripts/common/chef.sh", "scripts/debian/cleanup.sh", "scripts/common/minimize.sh" ], @@ -169,7 +166,6 @@ } ], "variables": { - "chef_version": "provisionerless", "mirror": "http://cdimage.debian.org/cdimage/archive" } } diff --git a/debian-7.8-i386.json b/debian-7.8-i386.json index 510b91303..e5a6c7152 100644 --- a/debian-7.8-i386.json +++ b/debian-7.8-i386.json @@ -144,15 +144,13 @@ ], "post-processors": [ { - "output": "builds/{{.Provider}}/opscode_debian-7.8-i386_chef-{{user `chef_version`}}.box", + "output": "builds/{{.Provider}}/opscode_debian-7.8-i386.box", "type": "vagrant" } ], "provisioners": [ { - "environment_vars": [ - "CHEF_VERSION={{user `chef_version`}}" - ], + "environment_vars": [], "execute_command": "echo 'vagrant' | {{.Vars}} sudo -E -S bash '{{.Path}}'", "scripts": [ "scripts/debian/update.sh", @@ -161,7 +159,6 @@ "scripts/debian/sudoers.sh", "scripts/common/vagrant.sh", "scripts/common/vmtools.sh", - "scripts/common/chef.sh", "scripts/debian/cleanup.sh", "scripts/common/minimize.sh" ], @@ -169,7 +166,6 @@ } ], "variables": { - "chef_version": "provisionerless", "mirror": "http://cdimage.debian.org/cdimage/archive" } } diff --git a/fedora-20-i386.json b/fedora-20-i386.json index e14f99328..08ce1bcd2 100644 --- a/fedora-20-i386.json +++ b/fedora-20-i386.json @@ -102,21 +102,18 @@ ], "post-processors": [ { - "output": "builds/{{.Provider}}/opscode_fedora-20-i386_chef-{{user `chef_version`}}.box", + "output": "builds/{{.Provider}}/opscode_fedora-20-i386.box", "type": "vagrant" } ], "provisioners": [ { - "environment_vars": [ - "CHEF_VERSION={{user `chef_version`}}" - ], + "environment_vars": [], "execute_command": "echo 'vagrant' | {{.Vars}} sudo -E -S bash '{{.Path}}'", "scripts": [ "scripts/fedora/fix-slow-dns.sh", "scripts/common/sshd.sh", "scripts/common/vmtools.sh", - "scripts/common/chef.sh", "scripts/common/vagrant.sh", "scripts/fedora/cleanup.sh", "scripts/common/minimize.sh" @@ -125,7 +122,6 @@ } ], "variables": { - "chef_version": "provisionerless", "mirror": "http://download.fedoraproject.org/pub/fedora/linux" } } diff --git a/fedora-20-x86_64.json b/fedora-20-x86_64.json index 7f0e255d2..4848ab0e9 100644 --- a/fedora-20-x86_64.json +++ b/fedora-20-x86_64.json @@ -102,21 +102,18 @@ ], "post-processors": [ { - "output": "builds/{{.Provider}}/opscode_fedora-20_chef-{{user `chef_version`}}.box", + "output": "builds/{{.Provider}}/opscode_fedora-20.box", "type": "vagrant" } ], "provisioners": [ { - "environment_vars": [ - "CHEF_VERSION={{user `chef_version`}}" - ], + "environment_vars": [], "execute_command": "echo 'vagrant' | {{.Vars}} sudo -E -S bash '{{.Path}}'", "scripts": [ "scripts/fedora/fix-slow-dns.sh", "scripts/common/sshd.sh", "scripts/common/vmtools.sh", - "scripts/common/chef.sh", "scripts/common/vagrant.sh", "scripts/fedora/cleanup.sh", "scripts/common/minimize.sh" @@ -125,7 +122,6 @@ } ], "variables": { - "chef_version": "provisionerless", "mirror": "http://download.fedoraproject.org/pub/fedora/linux" } } diff --git a/fedora-21-i386.json b/fedora-21-i386.json index 3ed3979e5..c80fe4a74 100644 --- a/fedora-21-i386.json +++ b/fedora-21-i386.json @@ -102,21 +102,18 @@ ], "post-processors": [ { - "output": "builds/{{.Provider}}/opscode_fedora-21-i386_chef-{{user `chef_version`}}.box", + "output": "builds/{{.Provider}}/opscode_fedora-21-i386.box", "type": "vagrant" } ], "provisioners": [ { - "environment_vars": [ - "CHEF_VERSION={{user `chef_version`}}" - ], + "environment_vars": [], "execute_command": "echo 'vagrant' | {{.Vars}} sudo -E -S bash '{{.Path}}'", "scripts": [ "scripts/fedora/fix-slow-dns.sh", "scripts/common/sshd.sh", "scripts/common/vmtools.sh", - "scripts/common/chef.sh", "scripts/common/vagrant.sh", "scripts/fedora/cleanup.sh", "scripts/common/minimize.sh" @@ -125,7 +122,6 @@ } ], "variables": { - "chef_version": "provisionerless", "mirror": "http://download.fedoraproject.org/pub/fedora/linux" } } diff --git a/fedora-21-x86_64.json b/fedora-21-x86_64.json index 2320c5373..157715530 100644 --- a/fedora-21-x86_64.json +++ b/fedora-21-x86_64.json @@ -102,21 +102,18 @@ ], "post-processors": [ { - "output": "builds/{{.Provider}}/opscode_fedora-21_chef-{{user `chef_version`}}.box", + "output": "builds/{{.Provider}}/opscode_fedora-21.box", "type": "vagrant" } ], "provisioners": [ { - "environment_vars": [ - "CHEF_VERSION={{user `chef_version`}}" - ], + "environment_vars": [], "execute_command": "echo 'vagrant' | {{.Vars}} sudo -E -S bash '{{.Path}}'", "scripts": [ "scripts/fedora/fix-slow-dns.sh", "scripts/common/sshd.sh", "scripts/common/vmtools.sh", - "scripts/common/chef.sh", "scripts/common/vagrant.sh", "scripts/fedora/cleanup.sh", "scripts/common/minimize.sh" @@ -125,7 +122,6 @@ } ], "variables": { - "chef_version": "provisionerless", "mirror": "http://download.fedoraproject.org/pub/fedora/linux" } } diff --git a/freebsd-10.1-amd64.json b/freebsd-10.1-amd64.json index 551727d51..908655802 100644 --- a/freebsd-10.1-amd64.json +++ b/freebsd-10.1-amd64.json @@ -146,7 +146,7 @@ ], "post-processors": [ { - "output": "builds/{{.Provider}}/opscode_freebsd-10.1_chef-{{user `chef_version`}}.box", + "output": "builds/{{.Provider}}/opscode_freebsd-10.1.box", "override": { "parallels": { "vagrantfile_template": "vagrantfile_templates/parallels/freebsd.rb" @@ -157,13 +157,10 @@ ], "provisioners": [ { - "environment_vars": [ - "CHEF_VERSION={{user `chef_version`}}" - ], + "environment_vars": [], "execute_command": "export {{.Vars}} && cat {{.Path}} | su -m", "scripts": [ "scripts/freebsd/postinstall.sh", - "scripts/common/chef.sh", "scripts/freebsd/cleanup.sh", "scripts/freebsd/vmtools.sh", "scripts/freebsd/minimize.sh" @@ -172,7 +169,6 @@ } ], "variables": { - "chef_version": "provisionerless", "mirror": "http://ftp.freebsd.org/pub/FreeBSD" } } diff --git a/freebsd-10.1-i386.json b/freebsd-10.1-i386.json index c2b7de7e6..d40e7c442 100644 --- a/freebsd-10.1-i386.json +++ b/freebsd-10.1-i386.json @@ -146,7 +146,7 @@ ], "post-processors": [ { - "output": "builds/{{.Provider}}/opscode_freebsd-10.1-i386_chef-{{user `chef_version`}}.box", + "output": "builds/{{.Provider}}/opscode_freebsd-10.1-i386.box", "override": { "parallels": { "vagrantfile_template": "vagrantfile_templates/parallels/freebsd.rb" @@ -157,13 +157,10 @@ ], "provisioners": [ { - "environment_vars": [ - "CHEF_VERSION={{user `chef_version`}}" - ], + "environment_vars": [], "execute_command": "export {{.Vars}} && cat {{.Path}} | su -m", "scripts": [ "scripts/freebsd/postinstall.sh", - "scripts/common/chef.sh", "scripts/freebsd/cleanup.sh", "scripts/freebsd/vmtools.sh", "scripts/freebsd/minimize.sh" @@ -172,7 +169,6 @@ } ], "variables": { - "chef_version": "provisionerless", "mirror": "http://ftp.freebsd.org/pub/FreeBSD" } } diff --git a/freebsd-9.3-amd64.json b/freebsd-9.3-amd64.json index a48761353..e8b474b38 100644 --- a/freebsd-9.3-amd64.json +++ b/freebsd-9.3-amd64.json @@ -158,7 +158,7 @@ ], "post-processors": [ { - "output": "builds/{{.Provider}}/opscode_freebsd-9.3_chef-{{user `chef_version`}}.box", + "output": "builds/{{.Provider}}/opscode_freebsd-9.3.box", "override": { "parallels": { "vagrantfile_template": "vagrantfile_templates/parallels/freebsd.rb" @@ -169,14 +169,11 @@ ], "provisioners": [ { - "environment_vars": [ - "CHEF_VERSION={{user `chef_version`}}" - ], + "environment_vars": [], "execute_command": "export {{.Vars}} && cat {{.Path}} | su -m", "scripts": [ "scripts/freebsd/postinstall.sh", "scripts/freebsd/vmtools.sh", - "scripts/common/chef.sh", "scripts/freebsd/cleanup.sh", "scripts/freebsd/minimize.sh" ], @@ -184,7 +181,6 @@ } ], "variables": { - "chef_version": "provisionerless", "mirror": "http://ftp.freebsd.org/pub/FreeBSD" } } diff --git a/freebsd-9.3-i386.json b/freebsd-9.3-i386.json index 9962f5746..275af5b7d 100644 --- a/freebsd-9.3-i386.json +++ b/freebsd-9.3-i386.json @@ -157,7 +157,7 @@ ], "post-processors": [ { - "output": "builds/{{.Provider}}/opscode_freebsd-9.3-i386_chef-{{user `chef_version`}}.box", + "output": "builds/{{.Provider}}/opscode_freebsd-9.3-i386.box", "override": { "parallels": { "vagrantfile_template": "vagrantfile_templates/parallels/freebsd.rb" @@ -172,7 +172,6 @@ "scripts": [ "scripts/freebsd/postinstall.sh", "scripts/freebsd/vmtools.sh", - "scripts/common/chef.sh", "scripts/freebsd/cleanup.sh", "scripts/freebsd/minimize.sh" ], @@ -180,7 +179,6 @@ } ], "variables": { - "chef_version": "provisionerless", "mirror": "http://ftp.freebsd.org/pub/FreeBSD" } } diff --git a/macosx-10.7.json b/macosx-10.7.json index 975bd3ec0..2b3f643eb 100644 --- a/macosx-10.7.json +++ b/macosx-10.7.json @@ -155,7 +155,7 @@ "min_packer_version": "0.6.0", "post-processors": [ { - "output": "builds/{{.Provider}}/opscode_macosx-10.7_chef-{{user `chef_version`}}.box", + "output": "builds/{{.Provider}}/opscode_macosx-10.7.box", "type": "vagrant", "vagrantfile_template": "vagrantfile_templates/macosx.rb" } @@ -190,7 +190,6 @@ ], "variables": { "autologin_vagrant_user": "", - "chef_version": "provisionerless", "iso_checksum": "e2a48af008ff3c4db6a8235151a1e90ea600fceb", "iso_url": "http://fakeurl/OSX_InstallESD_10.7.5_11G63.dmg" } diff --git a/macosx-10.8.json b/macosx-10.8.json index 34fda4508..d5cc57756 100644 --- a/macosx-10.8.json +++ b/macosx-10.8.json @@ -155,7 +155,7 @@ "min_packer_version": "0.6.0", "post-processors": [ { - "output": "builds/{{.Provider}}/opscode_macosx-10.8_chef-{{user `chef_version`}}.box", + "output": "builds/{{.Provider}}/opscode_macosx-10.8.box", "type": "vagrant", "vagrantfile_template": "vagrantfile_templates/macosx.rb" } @@ -190,7 +190,6 @@ ], "variables": { "autologin_vagrant_user": "", - "chef_version": "provisionerless", "iso_checksum": "e2a48af008ff3c4db6a8235151a1e90ea600fceb", "iso_url": "http://fakeurl/OSX_InstallESD_10.8.5_12F45.dmg" } diff --git a/macosx-10.9.json b/macosx-10.9.json index 0ccb1e248..18c386834 100644 --- a/macosx-10.9.json +++ b/macosx-10.9.json @@ -155,7 +155,7 @@ "min_packer_version": "0.6.0", "post-processors": [ { - "output": "builds/{{.Provider}}/opscode_macosx-10.9_chef-{{user `chef_version`}}.box", + "output": "builds/{{.Provider}}/opscode_macosx-10.9.box", "type": "vagrant", "vagrantfile_template": "vagrantfile_templates/macosx.rb" } @@ -190,7 +190,6 @@ ], "variables": { "autologin_vagrant_user": "", - "chef_version": "provisionerless", "iso_checksum": "e2a48af008ff3c4db6a8235151a1e90ea600fceb", "iso_url": "http://fakeurl/OSX_InstallESD_10.9.1_13B42.dmg" } diff --git a/omnios-r151010j.json b/omnios-r151010j.json index 9d5c1a2a5..a3f1e3d00 100644 --- a/omnios-r151010j.json +++ b/omnios-r151010j.json @@ -180,7 +180,7 @@ "post-processors": [ { "compression_level": 9, - "output": "builds/{{.Provider}}/opscode_omnios-r151010j_chef-{{user `chef_version`}}.box", + "output": "builds/{{.Provider}}/opscode_omnios-r151010j.box", "override": { "parallels": { "vagrantfile_template": "vagrantfile_templates/parallels/omnios.rb" @@ -191,20 +191,16 @@ ], "provisioners": [ { - "environment_vars": [ - "CHEF_VERSION={{user `chef_version`}}" - ], + "environment_vars": [], "execute_command": "export {{.Vars}} && sh '{{.Path}}'", "scripts": [ "scripts/omnios/vmtools.sh", - "scripts/common/chef.sh", "scripts/omnios/postinstall.sh" ], "type": "shell" } ], "variables": { - "chef_version": "provisionerless", "mirror": "http://omnios.omniti.com/media" } } diff --git a/opensuse-13.2-i386.json b/opensuse-13.2-i386.json index d684eefd4..dad100d7c 100644 --- a/opensuse-13.2-i386.json +++ b/opensuse-13.2-i386.json @@ -113,21 +113,18 @@ ], "post-processors": [ { - "output": "builds/{{.Provider}}/opscode_opensuse-13.2-i386_chef-{{user `chef_version`}}.box", + "output": "builds/{{.Provider}}/opscode_opensuse-13.2-i386.box", "type": "vagrant" } ], "provisioners": [ { - "environment_vars": [ - "CHEF_VERSION={{user `chef_version`}}" - ], + "environment_vars": [], "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh '{{.Path}}'", "scripts": [ "scripts/common/sshd.sh", "scripts/common/vagrant.sh", "scripts/common/vmtools.sh", - "scripts/common/chef.sh", "scripts/opensuse/sudoers.sh", "scripts/opensuse/zypper-locks.sh", "scripts/opensuse/remove-dvd-source.sh", @@ -138,7 +135,6 @@ } ], "variables": { - "chef_version": "provisionerless", "mirror": "http://download.opensuse.org/distribution" } } diff --git a/opensuse-13.2-x86_64.json b/opensuse-13.2-x86_64.json index f4815a158..7c4e7bf0f 100644 --- a/opensuse-13.2-x86_64.json +++ b/opensuse-13.2-x86_64.json @@ -113,21 +113,18 @@ ], "post-processors": [ { - "output": "builds/{{.Provider}}/opscode_opensuse-13.2-x86_64_chef-{{user `chef_version`}}.box", + "output": "builds/{{.Provider}}/opscode_opensuse-13.2-x86_64.box", "type": "vagrant" } ], "provisioners": [ { - "environment_vars": [ - "CHEF_VERSION={{user `chef_version`}}" - ], + "environment_vars": [], "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh '{{.Path}}'", "scripts": [ "scripts/common/sshd.sh", "scripts/common/vagrant.sh", "scripts/common/vmtools.sh", - "scripts/common/chef.sh", "scripts/opensuse/sudoers.sh", "scripts/opensuse/zypper-locks.sh", "scripts/opensuse/remove-dvd-source.sh", @@ -138,7 +135,6 @@ } ], "variables": { - "chef_version": "provisionerless", "mirror": "http://download.opensuse.org/distribution" } } diff --git a/oracle-5.11-i386.json b/oracle-5.11-i386.json index 718704a29..caa98dca4 100644 --- a/oracle-5.11-i386.json +++ b/oracle-5.11-i386.json @@ -102,21 +102,18 @@ ], "post-processors": [ { - "output": "builds/{{.Provider}}/opscode_oracle-5.11-i386_chef-{{user `chef_version`}}.box", + "output": "builds/{{.Provider}}/opscode_oracle-5.11-i386.box", "type": "vagrant" } ], "provisioners": [ { - "environment_vars": [ - "CHEF_VERSION={{user `chef_version`}}" - ], + "environment_vars": [], "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E bash '{{.Path}}'", "scripts": [ "scripts/common/vagrant.sh", "scripts/common/sshd.sh", "scripts/common/vmtools.sh", - "scripts/common/chef.sh", "scripts/centos/cleanup.sh", "scripts/common/minimize.sh" ], @@ -124,7 +121,6 @@ } ], "variables": { - "chef_version": "provisionerless", "mirror": "http://mirrors.dotsrc.org/oracle-linux/EL5/U11/i386" } } diff --git a/oracle-5.11-x86_64.json b/oracle-5.11-x86_64.json index f92ea8d00..b616e027f 100644 --- a/oracle-5.11-x86_64.json +++ b/oracle-5.11-x86_64.json @@ -102,21 +102,18 @@ ], "post-processors": [ { - "output": "builds/{{.Provider}}/opscode_oracle-5.11_chef-{{user `chef_version`}}.box", + "output": "builds/{{.Provider}}/opscode_oracle-5.11.box", "type": "vagrant" } ], "provisioners": [ { - "environment_vars": [ - "CHEF_VERSION={{user `chef_version`}}" - ], + "environment_vars": [], "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E bash '{{.Path}}'", "scripts": [ "scripts/common/vagrant.sh", "scripts/common/sshd.sh", "scripts/common/vmtools.sh", - "scripts/common/chef.sh", "scripts/centos/cleanup.sh", "scripts/common/minimize.sh" ], @@ -124,7 +121,6 @@ } ], "variables": { - "chef_version": "provisionerless", "mirror": "http://mirrors.dotsrc.org/oracle-linux/EL5/U11/x86_64" } } diff --git a/oracle-6.6-i386.json b/oracle-6.6-i386.json index 3f5ae6999..abaa3d6dc 100644 --- a/oracle-6.6-i386.json +++ b/oracle-6.6-i386.json @@ -102,22 +102,19 @@ ], "post-processors": [ { - "output": "builds/{{.Provider}}/opscode_oracle-6.6-i386_chef-{{user `chef_version`}}.box", + "output": "builds/{{.Provider}}/opscode_oracle-6.6-i386.box", "type": "vagrant" } ], "provisioners": [ { - "environment_vars": [ - "CHEF_VERSION={{user `chef_version`}}" - ], + "environment_vars": [], "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E bash '{{.Path}}'", "scripts": [ "scripts/centos/fix-slow-dns.sh", "scripts/common/sshd.sh", "scripts/common/vagrant.sh", "scripts/common/vmtools.sh", - "scripts/common/chef.sh", "scripts/centos/cleanup.sh", "scripts/common/minimize.sh" ], @@ -125,7 +122,6 @@ } ], "variables": { - "chef_version": "provisionerless", "mirror": "http://mirrors.dotsrc.org/oracle-linux/OL6/U6/i386" } } diff --git a/oracle-6.6-x86_64.json b/oracle-6.6-x86_64.json index a3efc6231..607e12173 100644 --- a/oracle-6.6-x86_64.json +++ b/oracle-6.6-x86_64.json @@ -102,22 +102,19 @@ ], "post-processors": [ { - "output": "builds/{{.Provider}}/opscode_oracle-6.6_chef-{{user `chef_version`}}.box", + "output": "builds/{{.Provider}}/opscode_oracle-6.6.box", "type": "vagrant" } ], "provisioners": [ { - "environment_vars": [ - "CHEF_VERSION={{user `chef_version`}}" - ], + "environment_vars": [], "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E bash '{{.Path}}'", "scripts": [ "scripts/centos/fix-slow-dns.sh", "scripts/common/sshd.sh", "scripts/common/vagrant.sh", "scripts/common/vmtools.sh", - "scripts/common/chef.sh", "scripts/centos/cleanup.sh", "scripts/common/minimize.sh" ], @@ -125,7 +122,6 @@ } ], "variables": { - "chef_version": "provisionerless", "mirror": "http://mirrors.dotsrc.org/oracle-linux/OL6/U6/x86_64" } } diff --git a/rhel-5.11-i386.json b/rhel-5.11-i386.json index cdbab7aaf..8ab1c4243 100644 --- a/rhel-5.11-i386.json +++ b/rhel-5.11-i386.json @@ -102,21 +102,18 @@ ], "post-processors": [ { - "output": "builds/{{.Provider}}/opscode_rhel-5.11-i386_chef-{{user `chef_version`}}.box", + "output": "builds/{{.Provider}}/opscode_rhel-5.11-i386.box", "type": "vagrant" } ], "provisioners": [ { - "environment_vars": [ - "CHEF_VERSION={{user `chef_version`}}" - ], + "environment_vars": [], "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E bash '{{.Path}}'", "scripts": [ "scripts/common/vagrant.sh", "scripts/common/sshd.sh", "scripts/common/vmtools.sh", - "scripts/common/chef.sh", "scripts/centos/cleanup.sh", "scripts/common/minimize.sh" ], @@ -124,7 +121,6 @@ } ], "variables": { - "chef_version": "provisionerless", "mirror": "https://content-web.rhn.redhat.com/rhn/isos/rhel-5.11/md5sum/1ab756241a4a209b8d39abe6bace84a9" } } diff --git a/rhel-5.11-x86_64.json b/rhel-5.11-x86_64.json index bea539693..8fb7a4457 100644 --- a/rhel-5.11-x86_64.json +++ b/rhel-5.11-x86_64.json @@ -102,21 +102,18 @@ ], "post-processors": [ { - "output": "builds/{{.Provider}}/opscode_rhel-5.11_chef-{{user `chef_version`}}.box", + "output": "builds/{{.Provider}}/opscode_rhel-5.11.box", "type": "vagrant" } ], "provisioners": [ { - "environment_vars": [ - "CHEF_VERSION={{user `chef_version`}}" - ], + "environment_vars": [], "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E bash '{{.Path}}'", "scripts": [ "scripts/common/vagrant.sh", "scripts/common/sshd.sh", "scripts/common/vmtools.sh", - "scripts/common/chef.sh", "scripts/centos/cleanup.sh", "scripts/common/minimize.sh" ], @@ -124,7 +121,6 @@ } ], "variables": { - "chef_version": "provisionerless", "mirror": "https://content-web.rhn.redhat.com/rhn/isos/rhel-5.11/md5sum/86cc2d5548ee2ff9c8d3e2b4db3e6001" } } diff --git a/rhel-6.6-i386.json b/rhel-6.6-i386.json index f96fbe239..800432915 100644 --- a/rhel-6.6-i386.json +++ b/rhel-6.6-i386.json @@ -102,22 +102,19 @@ ], "post-processors": [ { - "output": "builds/{{.Provider}}/opscode_rhel-6.6-i386_chef-{{user `chef_version`}}.box", + "output": "builds/{{.Provider}}/opscode_rhel-6.6-i386.box", "type": "vagrant" } ], "provisioners": [ { - "environment_vars": [ - "CHEF_VERSION={{user `chef_version`}}" - ], + "environment_vars": [], "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E bash '{{.Path}}'", "scripts": [ "scripts/centos/fix-slow-dns.sh", "scripts/common/sshd.sh", "scripts/common/vagrant.sh", "scripts/common/vmtools.sh", - "scripts/common/chef.sh", "scripts/centos/cleanup.sh", "scripts/common/minimize.sh" ], @@ -125,7 +122,6 @@ } ], "variables": { - "chef_version": "provisionerless", "mirror": "https://content-web.rhn.redhat.com/rhn/isos/rhel-6.6/md5sum/64e687f958db92feccc3f7701a8771f8" } } diff --git a/rhel-6.6-x86_64.json b/rhel-6.6-x86_64.json index d85e30e5a..69bc3a184 100644 --- a/rhel-6.6-x86_64.json +++ b/rhel-6.6-x86_64.json @@ -102,22 +102,19 @@ ], "post-processors": [ { - "output": "builds/{{.Provider}}/opscode_rhel-6.6_chef-{{user `chef_version`}}.box", + "output": "builds/{{.Provider}}/opscode_rhel-6.6.box", "type": "vagrant" } ], "provisioners": [ { - "environment_vars": [ - "CHEF_VERSION={{user `chef_version`}}" - ], + "environment_vars": [], "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E bash '{{.Path}}'", "scripts": [ "scripts/centos/fix-slow-dns.sh", "scripts/common/sshd.sh", "scripts/common/vagrant.sh", "scripts/common/vmtools.sh", - "scripts/common/chef.sh", "scripts/centos/cleanup.sh", "scripts/common/minimize.sh" ], @@ -125,7 +122,6 @@ } ], "variables": { - "chef_version": "provisionerless", "mirror": "https://content-web.rhn.redhat.com/rhn/isos/rhel-6.6/md5sum/ef031b0ae8458d6489eb277ba1dcb5de" } } diff --git a/rhel-7.1-x86_64.json b/rhel-7.1-x86_64.json index c33ec5d2a..e4649e714 100644 --- a/rhel-7.1-x86_64.json +++ b/rhel-7.1-x86_64.json @@ -102,22 +102,19 @@ ], "post-processors": [ { - "output": "builds/{{.Provider}}/opscode_rhel-7.1_chef-{{user `chef_version`}}.box", + "output": "builds/{{.Provider}}/opscode_rhel-7.1.box", "type": "vagrant" } ], "provisioners": [ { - "environment_vars": [ - "CHEF_VERSION={{user `chef_version`}}" - ], + "environment_vars": [], "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E bash '{{.Path}}'", "scripts": [ "scripts/centos/fix-slow-dns.sh", "scripts/common/sshd.sh", "scripts/common/vagrant.sh", "scripts/common/vmtools.sh", - "scripts/common/chef.sh", "scripts/centos/cleanup.sh", "scripts/common/minimize.sh" ], @@ -125,7 +122,6 @@ } ], "variables": { - "chef_version": "provisionerless", "mirror": "http://put-your-mirror-here/" } } diff --git a/sles-11-sp2-i386.json b/sles-11-sp2-i386.json index 59d3f887b..b65a9dd74 100644 --- a/sles-11-sp2-i386.json +++ b/sles-11-sp2-i386.json @@ -114,21 +114,18 @@ ], "post-processors": [ { - "output": "builds/{{.Provider}}/opscode_sles-11sp2-i386_chef-{{user `chef_version`}}.box", + "output": "builds/{{.Provider}}/opscode_sles-11sp2-i386.box", "type": "vagrant" } ], "provisioners": [ { - "environment_vars": [ - "CHEF_VERSION={{user `chef_version`}}" - ], + "environment_vars": [], "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh '{{.Path}}'", "scripts": [ "scripts/common/sshd.sh", "scripts/common/vagrant.sh", "scripts/common/vmtools.sh", - "scripts/common/chef.sh", "scripts/sles/sudoers.sh", "scripts/sles/zypper-locks.sh", "scripts/sles/remove-dvd-source.sh", @@ -138,7 +135,6 @@ } ], "variables": { - "chef_version": "provisionerless", "mirror": "http://cdn2.novell.com/prot/FkjGyLMMiss~" } } diff --git a/sles-11-sp2-x86_64.json b/sles-11-sp2-x86_64.json index 41e982ac8..0d37148ca 100644 --- a/sles-11-sp2-x86_64.json +++ b/sles-11-sp2-x86_64.json @@ -114,21 +114,18 @@ ], "post-processors": [ { - "output": "builds/{{.Provider}}/opscode_sles-11sp2_chef-{{user `chef_version`}}.box", + "output": "builds/{{.Provider}}/opscode_sles-11sp2.box", "type": "vagrant" } ], "provisioners": [ { - "environment_vars": [ - "CHEF_VERSION={{user `chef_version`}}" - ], + "environment_vars": [], "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh '{{.Path}}'", "scripts": [ "scripts/common/sshd.sh", "scripts/common/vagrant.sh", "scripts/common/vmtools.sh", - "scripts/common/chef.sh", "scripts/sles/sudoers.sh", "scripts/sles/remove-dvd-source.sh", "scripts/common/minimize.sh" @@ -137,7 +134,6 @@ } ], "variables": { - "chef_version": "provisionerless", "mirror": "http://cdn.novell.com/free/h0AOp5AT-18~" } } diff --git a/sles-11-sp3-i386.json b/sles-11-sp3-i386.json index 9f5d95013..8b5d04ead 100644 --- a/sles-11-sp3-i386.json +++ b/sles-11-sp3-i386.json @@ -114,21 +114,18 @@ ], "post-processors": [ { - "output": "builds/{{.Provider}}/opscode_sles-11sp3-i386_chef-{{user `chef_version`}}.box", + "output": "builds/{{.Provider}}/opscode_sles-11sp3-i386.box", "type": "vagrant" } ], "provisioners": [ { - "environment_vars": [ - "CHEF_VERSION={{user `chef_version`}}" - ], + "environment_vars": [], "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh '{{.Path}}'", "scripts": [ "scripts/common/sshd.sh", "scripts/common/vagrant.sh", "scripts/common/vmtools.sh", - "scripts/common/chef.sh", "scripts/sles/sudoers.sh", "scripts/sles/zypper-locks.sh", "scripts/sles/remove-dvd-source.sh", @@ -138,7 +135,6 @@ } ], "variables": { - "chef_version": "provisionerless", "mirror": "http://cdn2.novell.com/prot/4uiuDMzX0ck~" } } diff --git a/sles-11-sp3-x86_64.json b/sles-11-sp3-x86_64.json index e0f9531cf..0b7251fc6 100644 --- a/sles-11-sp3-x86_64.json +++ b/sles-11-sp3-x86_64.json @@ -114,21 +114,18 @@ ], "post-processors": [ { - "output": "builds/{{.Provider}}/opscode_sles-11sp3_chef-{{user `chef_version`}}.box", + "output": "builds/{{.Provider}}/opscode_sles-11sp3.box", "type": "vagrant" } ], "provisioners": [ { - "environment_vars": [ - "CHEF_VERSION={{user `chef_version`}}" - ], + "environment_vars": [], "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh '{{.Path}}'", "scripts": [ "scripts/common/sshd.sh", "scripts/common/vagrant.sh", "scripts/common/vmtools.sh", - "scripts/common/chef.sh", "scripts/sles/sudoers.sh", "scripts/sles/zypper-locks.sh", "scripts/sles/remove-dvd-source.sh", @@ -138,7 +135,6 @@ } ], "variables": { - "chef_version": "provisionerless", "mirror": "http://cdn2.novell.com/prot/Q_VbW21BiB4~" } } diff --git a/sles-12-x86_64.json b/sles-12-x86_64.json index 7648b6ffc..0e88db7d7 100644 --- a/sles-12-x86_64.json +++ b/sles-12-x86_64.json @@ -114,22 +114,19 @@ ], "post-processors": [ { - "output": "builds/{{.Provider}}/opscode_sles-12_chef-{{user `chef_version`}}.box", + "output": "builds/{{.Provider}}/opscode_sles-12.box", "type": "vagrant" } ], "provisioners": [ { - "environment_vars": [ - "CHEF_VERSION={{user `chef_version`}}" - ], + "environment_vars": [], "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh '{{.Path}}'", "scripts": [ "scripts/common/sshd.sh", "scripts/common/vagrant.sh", "scripts/sles/unsupported-modules.sh", "scripts/common/vmtools.sh", - "scripts/common/chef.sh", "scripts/sles/sudoers.sh", "scripts/sles/zypper-locks.sh", "scripts/sles/remove-dvd-source.sh", @@ -140,7 +137,6 @@ } ], "variables": { - "chef_version": "provisionerless", "mirror": "http://cdn2.novell.com/prot/Q_VbW21BiB4~" } } diff --git a/solaris-10.11-x86.json b/solaris-10.11-x86.json index 7d4391797..cbaa660e9 100644 --- a/solaris-10.11-x86.json +++ b/solaris-10.11-x86.json @@ -94,7 +94,7 @@ ], "post-processors": [ { - "output": "builds/{{.Provider}}/opscode_solaris-10.11_chef-{{user `chef_version`}}.box", + "output": "builds/{{.Provider}}/opscode_solaris-10.11.box", "type": "vagrant" } ], @@ -111,7 +111,6 @@ "variables": { "DOWNLOAD_SITE": "http://www.oracle.com/technetwork/server-storage/solaris10/downloads/index.html", "README": "You must download the automated installer iso from the following page, and then place it somewhere that packer can fetch it", - "chef_version": "provisionerless", "mirror": "./packer_cache" } } diff --git a/solaris-11-x86.json b/solaris-11-x86.json index c85628885..f1f64cca5 100644 --- a/solaris-11-x86.json +++ b/solaris-11-x86.json @@ -114,15 +114,13 @@ ], "post-processors": [ { - "output": "builds/{{.Provider}}/opscode_solaris-11.2_chef-{{user `chef_version`}}.box", + "output": "builds/{{.Provider}}/opscode_solaris-11.2.box", "type": "vagrant" } ], "provisioners": [ { - "environment_vars": [ - "CHEF_VERSION={{user `chef_version`}}" - ], + "environment_vars": [], "execute_command": "echo 'vagrant'|sudo -S bash {{.Path}}", "scripts": [ "scripts/solaris/update.sh", @@ -136,7 +134,6 @@ "variables": { "DOWNLOAD_SITE": "http://www.oracle.com/technetwork/server-storage/solaris11/downloads/index.html", "README": "You must download the automated installer iso from the following page, and then place it somewhere that packer can fetch it", - "chef_version": "provisionerless", "mirror": "./packer_cache" } } diff --git a/ubuntu-10.04-amd64.json b/ubuntu-10.04-amd64.json index 72646aee8..2812c3192 100644 --- a/ubuntu-10.04-amd64.json +++ b/ubuntu-10.04-amd64.json @@ -165,15 +165,13 @@ ], "post-processors": [ { - "output": "builds/{{.Provider}}/opscode_ubuntu-10.04_chef-{{user `chef_version`}}.box", + "output": "builds/{{.Provider}}/opscode_ubuntu-10.04.box", "type": "vagrant" } ], "provisioners": [ { - "environment_vars": [ - "CHEF_VERSION={{user `chef_version`}}" - ], + "environment_vars": [], "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E bash '{{.Path}}'", "scripts": [ "scripts/ubuntu/update.sh", @@ -182,7 +180,6 @@ "scripts/ubuntu/sudoers.sh", "scripts/common/vagrant.sh", "scripts/common/vmtools.sh", - "scripts/common/chef.sh", "scripts/ubuntu/cleanup.sh", "scripts/common/minimize.sh" ], @@ -190,7 +187,6 @@ } ], "variables": { - "chef_version": "provisionerless", "mirror": "http://releases.ubuntu.com" } } diff --git a/ubuntu-10.04-i386.json b/ubuntu-10.04-i386.json index 5fa299bb5..916d93ef3 100644 --- a/ubuntu-10.04-i386.json +++ b/ubuntu-10.04-i386.json @@ -165,15 +165,13 @@ ], "post-processors": [ { - "output": "builds/{{.Provider}}/opscode_ubuntu-10.04-i386_chef-{{user `chef_version`}}.box", + "output": "builds/{{.Provider}}/opscode_ubuntu-10.04-i386.box", "type": "vagrant" } ], "provisioners": [ { - "environment_vars": [ - "CHEF_VERSION={{user `chef_version`}}" - ], + "environment_vars": [], "execute_command": "echo 'vagrant'|{{.Vars}} sudo -S -E bash '{{.Path}}'", "scripts": [ "scripts/ubuntu/update.sh", @@ -182,7 +180,6 @@ "scripts/ubuntu/sudoers.sh", "scripts/common/vagrant.sh", "scripts/common/vmtools.sh", - "scripts/common/chef.sh", "scripts/ubuntu/cleanup.sh", "scripts/common/minimize.sh" ], @@ -190,7 +187,6 @@ } ], "variables": { - "chef_version": "provisionerless", "mirror": "http://releases.ubuntu.com" } } diff --git a/ubuntu-12.04-amd64.json b/ubuntu-12.04-amd64.json index b20c8f3a8..0f42752af 100644 --- a/ubuntu-12.04-amd64.json +++ b/ubuntu-12.04-amd64.json @@ -165,15 +165,13 @@ ], "post-processors": [ { - "output": "builds/{{.Provider}}/opscode_ubuntu-12.04_chef-{{user `chef_version`}}.box", + "output": "builds/{{.Provider}}/opscode_ubuntu-12.04.box", "type": "vagrant" } ], "provisioners": [ { - "environment_vars": [ - "CHEF_VERSION={{user `chef_version`}}" - ], + "environment_vars": [], "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E bash '{{.Path}}'", "scripts": [ "scripts/ubuntu/update.sh", @@ -182,7 +180,6 @@ "scripts/ubuntu/sudoers.sh", "scripts/common/vagrant.sh", "scripts/common/vmtools.sh", - "scripts/common/chef.sh", "scripts/ubuntu/cleanup.sh", "scripts/common/minimize.sh" ], @@ -190,7 +187,6 @@ } ], "variables": { - "chef_version": "provisionerless", "mirror": "http://releases.ubuntu.com" } } diff --git a/ubuntu-12.04-i386.json b/ubuntu-12.04-i386.json index 0f7ce5e7d..3248d1731 100644 --- a/ubuntu-12.04-i386.json +++ b/ubuntu-12.04-i386.json @@ -165,15 +165,13 @@ ], "post-processors": [ { - "output": "builds/{{.Provider}}/opscode_ubuntu-12.04-i386_chef-{{user `chef_version`}}.box", + "output": "builds/{{.Provider}}/opscode_ubuntu-12.04-i386.box", "type": "vagrant" } ], "provisioners": [ { - "environment_vars": [ - "CHEF_VERSION={{user `chef_version`}}" - ], + "environment_vars": [], "execute_command": "echo 'vagrant'|{{.Vars}} sudo -S -E bash '{{.Path}}'", "scripts": [ "scripts/ubuntu/update.sh", @@ -182,7 +180,6 @@ "scripts/ubuntu/sudoers.sh", "scripts/common/vagrant.sh", "scripts/common/vmtools.sh", - "scripts/common/chef.sh", "scripts/ubuntu/cleanup.sh", "scripts/common/minimize.sh" ], @@ -190,7 +187,6 @@ } ], "variables": { - "chef_version": "provisionerless", "mirror": "http://releases.ubuntu.com" } } diff --git a/ubuntu-14.04-amd64.json b/ubuntu-14.04-amd64.json index 6b4037318..bc8fe7249 100644 --- a/ubuntu-14.04-amd64.json +++ b/ubuntu-14.04-amd64.json @@ -165,15 +165,13 @@ ], "post-processors": [ { - "output": "builds/{{.Provider}}/opscode_ubuntu-14.04_chef-{{user `chef_version`}}.box", + "output": "builds/{{.Provider}}/opscode_ubuntu-14.04.box", "type": "vagrant" } ], "provisioners": [ { - "environment_vars": [ - "CHEF_VERSION={{user `chef_version`}}" - ], + "environment_vars": [], "execute_command": "echo 'vagrant'|{{.Vars}} sudo -S -E bash '{{.Path}}'", "scripts": [ "scripts/ubuntu/update.sh", @@ -182,7 +180,6 @@ "scripts/ubuntu/sudoers.sh", "scripts/common/vagrant.sh", "scripts/common/vmtools.sh", - "scripts/common/chef.sh", "scripts/ubuntu/cleanup.sh", "scripts/common/minimize.sh" ], @@ -190,7 +187,6 @@ } ], "variables": { - "chef_version": "provisionerless", "mirror": "http://releases.ubuntu.com" } } diff --git a/ubuntu-14.04-i386.json b/ubuntu-14.04-i386.json index f7996e91d..8b77a116d 100644 --- a/ubuntu-14.04-i386.json +++ b/ubuntu-14.04-i386.json @@ -165,15 +165,13 @@ ], "post-processors": [ { - "output": "builds/{{.Provider}}/opscode_ubuntu-14.04-i386_chef-{{user `chef_version`}}.box", + "output": "builds/{{.Provider}}/opscode_ubuntu-14.04-i386.box", "type": "vagrant" } ], "provisioners": [ { - "environment_vars": [ - "CHEF_VERSION={{user `chef_version`}}" - ], + "environment_vars": [], "execute_command": "echo 'vagrant'|{{.Vars}} sudo -S -E bash '{{.Path}}'", "scripts": [ "scripts/ubuntu/update.sh", @@ -182,7 +180,6 @@ "scripts/ubuntu/sudoers.sh", "scripts/common/vagrant.sh", "scripts/common/vmtools.sh", - "scripts/common/chef.sh", "scripts/ubuntu/cleanup.sh", "scripts/common/minimize.sh" ], @@ -190,7 +187,6 @@ } ], "variables": { - "chef_version": "provisionerless", "mirror": "http://releases.ubuntu.com" } } diff --git a/ubuntu-14.10-amd64.json b/ubuntu-14.10-amd64.json index 8d79fac69..14d679680 100644 --- a/ubuntu-14.10-amd64.json +++ b/ubuntu-14.10-amd64.json @@ -165,15 +165,13 @@ ], "post-processors": [ { - "output": "builds/{{.Provider}}/opscode_ubuntu-14.10_chef-{{user `chef_version`}}.box", + "output": "builds/{{.Provider}}/opscode_ubuntu-14.10.box", "type": "vagrant" } ], "provisioners": [ { - "environment_vars": [ - "CHEF_VERSION={{user `chef_version`}}" - ], + "environment_vars": [], "execute_command": "echo 'vagrant'|{{.Vars}} sudo -S -E bash '{{.Path}}'", "scripts": [ "scripts/ubuntu/update.sh", @@ -182,7 +180,6 @@ "scripts/ubuntu/sudoers.sh", "scripts/common/vagrant.sh", "scripts/common/vmtools.sh", - "scripts/common/chef.sh", "scripts/ubuntu/cleanup.sh", "scripts/common/minimize.sh" ], @@ -190,7 +187,6 @@ } ], "variables": { - "chef_version": "provisionerless", "mirror": "http://releases.ubuntu.com" } } diff --git a/ubuntu-14.10-i386.json b/ubuntu-14.10-i386.json index aa3e8271d..2bc4d6598 100644 --- a/ubuntu-14.10-i386.json +++ b/ubuntu-14.10-i386.json @@ -165,15 +165,13 @@ ], "post-processors": [ { - "output": "builds/{{.Provider}}/opscode_ubuntu-14.10-i386_chef-{{user `chef_version`}}.box", + "output": "builds/{{.Provider}}/opscode_ubuntu-14.10-i386.box", "type": "vagrant" } ], "provisioners": [ { - "environment_vars": [ - "CHEF_VERSION={{user `chef_version`}}" - ], + "environment_vars": [], "execute_command": "echo 'vagrant'|{{.Vars}} sudo -S -E bash '{{.Path}}'", "scripts": [ "scripts/ubuntu/update.sh", @@ -182,7 +180,6 @@ "scripts/ubuntu/sudoers.sh", "scripts/common/vagrant.sh", "scripts/common/vmtools.sh", - "scripts/common/chef.sh", "scripts/ubuntu/cleanup.sh", "scripts/common/minimize.sh" ], @@ -190,7 +187,6 @@ } ], "variables": { - "chef_version": "provisionerless", "mirror": "http://releases.ubuntu.com" } } From 1f60142bb816630e1007f175ac1a445796022b1f Mon Sep 17 00:00:00 2001 From: Fletcher Nichol <fnichol@nichol.ca> Date: Tue, 26 May 2015 13:54:01 -0600 Subject: [PATCH 0334/1622] Remove scripts/common/chef.sh as it is no longer invoked. --- scripts/common/chef.sh | 199 ----------------------------------------- 1 file changed, 199 deletions(-) delete mode 100644 scripts/common/chef.sh diff --git a/scripts/common/chef.sh b/scripts/common/chef.sh deleted file mode 100644 index 0c3f86bbf..000000000 --- a/scripts/common/chef.sh +++ /dev/null @@ -1,199 +0,0 @@ -#!/bin/sh -# WARNING: REQUIRES /bin/sh -# -# - must run on /bin/sh on solaris 9 -# - must run on /bin/sh on AIX 6.x -# - if you think you are a bash wizard, you probably do not understand -# this programming language. do not touch. -# - if you are under 40, get peer review from your elders. -# -# Author:: Julian C. Dunn (<jdunn@getchef.com>) -# Cribbed Code From:: Lamont Granquist, Seth Chisamore, Stephen Delano & Tyler Cloke -# Copyright:: Copyright (c) 2013, Chef Software, Inc. -# License:: Apache License, Version 2.0 -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -# Set $CHEF_VERSION inside Packer's template. Valid options are: -# 'provisionerless' -- build a box without Chef -# 'x.y.z' -- build a box with version x.y.z of Chef -# 'latest' -- build a box with the latest version of Chef -# 'prerelease' -- build a box with a prerelease version of Chef - -chef_installer="/tmp/install-chef.sh" -chef_installer_url="https://www.getchef.com/chef/install.sh" - -# Check whether a command exists - returns 0 if it does, 1 if it does not -exists() { - if command -v $1 >/dev/null 2>&1 - then - return 0 - else - return 1 - fi -} - -unable_to_retrieve_package() { - echo "Unable to retrieve install.sh!" - if test "x$stderr_results" != "x"; then - echo "\nDEBUG OUTPUT FOLLOWS:\n$stderr_results" - fi - exit 1 -} - -capture_tmp_stderr() { - # spool up /tmp/stderr from all the commands we called - if test -f "/tmp/stderr"; then - output=`cat /tmp/stderr` - stderr_results="${stderr_results}\nSTDERR from $1:\n\n$output\n" - rm /tmp/stderr - fi -} - -# do_wget URL FILENAME -do_wget() { - echo "trying wget..." - wget -O "$2" "$1" 2>/tmp/stderr - rc=$? - # check for 404 - grep "ERROR 404" /tmp/stderr 2>&1 >/dev/null - if test $? -eq 0; then - echo "ERROR 404" - unable_to_retrieve_package - fi - - # check for bad return status or empty output - if test $rc -ne 0 || test ! -s "$2"; then - capture_tmp_stderr "wget" - return 1 - fi - - return 0 -} - -# do_curl URL FILENAME -do_curl() { - echo "trying curl..." - curl -sL -D /tmp/stderr "$1" > "$2" - rc=$? - # check for 404 - grep "404 Not Found" /tmp/stderr 2>&1 >/dev/null - if test $? -eq 0; then - echo "ERROR 404" - unable_to_retrieve_package - fi - - # check for bad return status or empty output - if test $rc -ne 0 || test ! -s "$2"; then - capture_tmp_stderr "curl" - return 1 - fi - - return 0 -} - -# do_fetch URL FILENAME -do_fetch() { - echo "trying fetch..." - fetch -o "$2" "$1" 2>/tmp/stderr - # check for bad return status - test $? -ne 0 && return 1 - return 0 -} - -# do_curl URL FILENAME -do_perl() { - echo "trying perl..." - perl -e 'use LWP::Simple; getprint($ARGV[0]);' "$1" > "$2" 2>/tmp/stderr - rc=$? - # check for 404 - grep "404 Not Found" /tmp/stderr 2>&1 >/dev/null - if test $? -eq 0; then - echo "ERROR 404" - unable_to_retrieve_package - fi - - # check for bad return status or empty output - if test $rc -ne 0 || test ! -s "$2"; then - capture_tmp_stderr "perl" - return 1 - fi - - return 0 -} - -# do_curl URL FILENAME -do_python() { - echo "trying python..." - python -c "import sys,urllib2 ; sys.stdout.write(urllib2.urlopen(sys.argv[1]).read())" "$1" > "$2" 2>/tmp/stderr - rc=$? - # check for 404 - grep "HTTP Error 404" /tmp/stderr 2>&1 >/dev/null - if test $? -eq 0; then - echo "ERROR 404" - unable_to_retrieve_package - fi - - # check for bad return status or empty output - if test $rc -ne 0 || test ! -s "$2"; then - capture_tmp_stderr "python" - return 1 - fi - return 0 -} - -do_download() { - echo "downloading $1" - echo " to file $2" - - # we try all of these until we get success. - # perl, in particular may be present but LWP::Simple may not be installed - - if exists wget; then - do_wget $1 $2 && return 0 - fi - - if exists curl; then - do_curl $1 $2 && return 0 - fi - - if exists fetch; then - do_fetch $1 $2 && return 0 - fi - - if exists perl; then - do_perl $1 $2 && return 0 - fi - - if exists python; then - do_python $1 $2 && return 0 - fi - - unable_to_retrieve_package -} - -if [ x$CHEF_VERSION != x'provisionerless' ]; then - do_download "$chef_installer_url" "$chef_installer" - chmod +x $chef_installer - if [ x$CHEF_VERSION == x'latest' ]; then - $chef_installer - elif [ x$CHEF_VERSION == x'prerelease' ]; then - $chef_installer -p - else - $chef_installer -v $CHEF_VERSION - fi - rm -f $chef_installer -else - echo "Building a box without Chef" -fi From 529bc75e7e9967e04515fde03ef71c2e6309c63d Mon Sep 17 00:00:00 2001 From: Fletcher Nichol <fnichol@nichol.ca> Date: Mon, 25 May 2015 16:16:00 -0600 Subject: [PATCH 0335/1622] Add build metadata to boxes and build artifacts. For each Packer template that is run via `bin/bento`, a JSON file of build metadata will be written to the `builds/` directory, which looks like the following (using the `ubuntu-14.100i386` template as an example): { "name": "ubuntu-14.10-i386", "version": "2.0.20150528211301", "build_timestamp": "20150528211301", "git_revision": "6b23dd8d8ff0fb9cc4473f510bc3c54f0b415d1b", "box_basename": "chef__ubuntu-14.10-i386-2.0.20150528211301.git.6b23dd8d8ff0fb9cc4473f510bc3c54f0b415d1b", "atlas_org": "chef", "arch": "32", "template": "ubuntu-14.10-i386", "md5": { "chef__ubuntu-14.10-i386-2.0.20150528211301.git.6b23dd8d8ff0fb9cc4473f510bc3c54f0b415d1b.parallels.box": "e3a18b096cddc73384f0912c3a65ebad", "chef__ubuntu-14.10-i386-2.0.20150528211301.git.6b23dd8d8ff0fb9cc4473f510bc3c54f0b415d1b.virtualbox.box": "106f2ca4e6da18663e7216a72dd62e56", "chef__ubuntu-14.10-i386-2.0.20150528211301.git.6b23dd8d8ff0fb9cc4473f510bc3c54f0b415d1b.vmware.box": "8990550bc2a0e2e7515ed3433ec54b46" }, "sha256": { "chef__ubuntu-14.10-i386-2.0.20150528211301.git.6b23dd8d8ff0fb9cc4473f510bc3c54f0b415d1b.parallels.box": "0a0e3c9369de005a456f0cd7d94ba4d4b562d7231c11d9c5af8e40ef77131d3d", "chef__ubuntu-14.10-i386-2.0.20150528211301.git.6b23dd8d8ff0fb9cc4473f510bc3c54f0b415d1b.virtualbox.box": "0c23480a99294aea8f42daea2576a41820ec3bebb99a9d0a8ab72a3de1b24137", "chef__ubuntu-14.10-i386-2.0.20150528211301.git.6b23dd8d8ff0fb9cc4473f510bc3c54f0b415d1b.vmware.box": "9128b66ef4bae323a123fcdd0be5a598bb538f822295ab6bf043e7630a49b608" } } In addition to the "sidecar" metadata file, a trimmed down version will is added to each Vagrant box in `/etc/bento-metadata.json`. Using the example above, here is what the file would look like: { "name": "ubuntu-14.10-i386", "version": "2.0.20150528211301", "build_timestamp": "20150528211301", "git_revision": "6b23dd8d8ff0fb9cc4473f510bc3c54f0b415d1b_dirty", "box_basename": "chef__ubuntu-14.10-i386-2.0.20150528211301.git.6b23dd8d8ff0fb9cc4473f510bc3c54f0b415d1b_dirty", "atlas_org": "chef", "arch": "32", "template": "ubuntu-14.10-i386" } Also note that this changes the file naming scheme of the resulting box artifacts in an effort to host multiple builds of the same templates in one directory while maintaining enough information about the box within the filename itself. Using the same example as above, the VirtualBox provider box name is: chef__ubuntu-14.10-i386-2.0.20150528211301.git.6b23dd8d8ff0fb9cc4473f510bc3c54f0b415d1b.virtualbox.box Which uses the following recipe to construct the filename: * `atlas_org` value (default: `"chef"`) * double underscore, which could be later interpreted as a slash (`/`) for an Atalas box name * `name` value which may or may not equal the name of the template (captured as the `template` value) * a dash * `version` value, which removes the last digit in a version string and replaces it with the `build_timestamp` (a Year/Month/Day/Hour/Minute/Second format in UTC timezone) * a period * the string `"git"` * a period * `git_revision` value, which will append `"_dirty"` if the current state of the git repository is not completely clean (i.e., there are uncommitted changes which happens in active development) * a period * the value of the `{{.Provider}}` Packer variable, being one of `"virtualbox"`, `"vmware"`, or `"parallels"` * finished with `".box"` Closes #364 --- .gitignore | 1 + bin/bento | 161 +++++++++++++++++++++++++++++++++++-- centos-5.11-i386.json | 18 ++++- centos-5.11-x86_64.json | 18 ++++- centos-6.6-i386.json | 18 ++++- centos-6.6-x86_64.json | 18 ++++- centos-7.1-x86_64.json | 18 ++++- debian-6.0.10-amd64.json | 18 ++++- debian-6.0.10-i386.json | 18 ++++- debian-7.8-amd64.json | 18 ++++- debian-7.8-i386.json | 18 ++++- fedora-20-i386.json | 18 ++++- fedora-20-x86_64.json | 18 ++++- fedora-21-i386.json | 18 ++++- fedora-21-x86_64.json | 18 ++++- floppy/dummy_metadata.json | 3 + freebsd-10.1-amd64.json | 18 ++++- freebsd-10.1-i386.json | 18 ++++- freebsd-9.3-amd64.json | 18 ++++- freebsd-9.3-i386.json | 18 ++++- macosx-10.7.json | 18 ++++- macosx-10.8.json | 18 ++++- macosx-10.9.json | 18 ++++- omnios-r151010j.json | 18 ++++- opensuse-13.2-i386.json | 18 ++++- opensuse-13.2-x86_64.json | 18 ++++- oracle-5.11-i386.json | 18 ++++- oracle-5.11-x86_64.json | 18 ++++- oracle-6.6-i386.json | 18 ++++- oracle-6.6-x86_64.json | 18 ++++- rhel-5.11-i386.json | 18 ++++- rhel-5.11-x86_64.json | 18 ++++- rhel-6.6-i386.json | 18 ++++- rhel-6.6-x86_64.json | 18 ++++- rhel-7.1-x86_64.json | 18 ++++- scripts/common/metadata.sh | 6 ++ sles-11-sp2-i386.json | 18 ++++- sles-11-sp2-x86_64.json | 18 ++++- sles-11-sp3-i386.json | 18 ++++- sles-11-sp3-x86_64.json | 18 ++++- sles-12-x86_64.json | 18 ++++- solaris-10.11-x86.json | 23 +++++- solaris-11-x86.json | 22 ++++- ubuntu-10.04-amd64.json | 18 ++++- ubuntu-10.04-i386.json | 18 ++++- ubuntu-12.04-amd64.json | 18 ++++- ubuntu-12.04-i386.json | 22 ++++- ubuntu-14.04-amd64.json | 18 ++++- ubuntu-14.04-i386.json | 19 ++++- ubuntu-14.10-amd64.json | 18 ++++- ubuntu-14.10-i386.json | 18 ++++- 51 files changed, 923 insertions(+), 108 deletions(-) create mode 100644 floppy/dummy_metadata.json create mode 100755 scripts/common/metadata.sh diff --git a/.gitignore b/.gitignore index 20509881b..8a63de8db 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ packer.log .DS_Store /packer-*/ *.variables.json +/builds/ diff --git a/bin/bento b/bin/bento index d7b216502..7fa86d37a 100755 --- a/bin/bento +++ b/bin/bento @@ -8,8 +8,10 @@ $stderr.sync = true require "benchmark" require "digest" +require "json" require "optparse" require "ostruct" +require "tempfile" class Options @@ -133,25 +135,37 @@ class BuildRunner include Common - attr_reader :templates, :dry_run, :debug, :builds + attr_reader :templates, :dry_run, :debug, :builds, :build_timestamp def initialize(opts) @templates = opts.templates @dry_run = opts.dry_run @debug = opts.debug @builds = opts.builds + @build_timestamp = Time.now.gmtime.strftime("%Y%m%d%H%M%S") end def start banner("Starting build for templates: #{templates}") time = Benchmark.measure do - templates.each { |template| packer(template) } + templates.each { |template| build_template(template) } end banner("Build finished in #{duration(time.real)}.") end - def packer(template) - cmd = packer_cmd(template) + def build_template(template) + Tempfile.open("#{template}-metadata.json") do |md_file| + Tempfile.open("#{template}-metadata-var-file") do |var_file| + write_box_metadata(template, md_file) + write_var_file(template, md_file.path, var_file) + packer(template, var_file.path) + write_final_metadata(template) + end + end + end + + def packer(template, var_file) + cmd = packer_cmd(template, var_file) banner("[#{template}] Running: '#{cmd.join(' ')}'") time = Benchmark.measure do system(*cmd) or raise "[#{template}] Error building, exited #{$?}" @@ -159,9 +173,9 @@ class BuildRunner banner("[#{template}] Finished in #{duration(time.real)}.") end - def packer_cmd(template) + def packer_cmd(template, var_file) vars = "#{template}.variables.json" - cmd = %W[packer build #{template}.json] + cmd = %W[packer build -var-file=#{var_file} #{template}.json] cmd.insert(2, "-var-file=#{vars}") if File.exist?(vars) cmd.insert(2, "-only=#{builds}") if builds cmd.insert(2, "-debug") if debug @@ -169,8 +183,139 @@ class BuildRunner cmd end - def git_sha - %x{git rev-parse --short HEAD}.strip + def write_box_metadata(template, io) + md = BuildMetadata.new(template, build_timestamp).read + + io.write(JSON.pretty_generate(md)) + io.close + end + + def write_final_metadata(template) + md = BuildMetadata.new(template, build_timestamp).read + path = File.join(File.dirname(__FILE__), "..", "builds") + filename = File.join(path, "#{md[:box_basename]}.metadata.json") + checksums = ChecksumMetadata.new(path, md[:box_basename]).read + + md[:md5] = checksums[:md5] + md[:sha256] = checksums[:sha256] + + File.open(filename, "wb") { |file| file.write(JSON.pretty_generate(md)) } + end + + def write_var_file(template, md_file, io) + md = BuildMetadata.new(template, build_timestamp).read + + io.write(JSON.pretty_generate({ + box_basename: md[:box_basename], + build_timestamp: md[:build_timestamp], + git_revision: md[:git_revision], + metadata: md_file, + version: md[:version] + })) + io.close + end +end + +class ChecksumMetadata + + def initialize(path, box_basename) + @base = File.join(path, box_basename) + end + + def read + { + md5: md5_checksums, + sha256: sha256_checksums + } + end + + private + + attr_reader :base + + def md5_checksums + Hash[Dir.glob("#{base}.*.box").map { |box| + [File.basename(box), Digest::MD5.file(box).hexdigest] + }] + end + + def sha256_checksums + Hash[Dir.glob("#{base}.*.box").map { |box| + [File.basename(box), Digest::SHA256.file(box).hexdigest] + }] + end +end + +class BuildMetadata + + def initialize(template, build_timestamp) + @template = template + @build_timestamp = build_timestamp + end + + def read + { + name: name, + version: version, + build_timestamp: build_timestamp, + git_revision: git_revision, + box_basename: box_basename, + atlas_org: atlas_org, + arch: template_vars.fetch("arch", UNKNOWN), + template: template_vars.fetch("template", UNKNOWN), + } + end + + private + + UNKNOWN = "__unknown__".freeze + DEFAULT_ATLAS_ORG = "chef".freeze + + attr_reader :template, :build_timestamp + + def atlas_org + merged_vars.fetch("atlas_org", DEFAULT_ATLAS_ORG) + end + + def box_basename + "#{atlas_org}__#{name}-#{version}.git.#{git_revision}" + end + + def git_revision + sha = %x{git rev-parse HEAD}.strip + + git_clean? ? sha : "#{sha}_dirty" + end + + def git_clean? + %{git status --porcelain}.strip.empty? + end + + def merged_vars + @merged_vars ||= begin + if File.exist?("#{template}.variables.json") + template_vars.merge(JSON.load(IO.read("#{template}.variables.json"))) + else + template_vars + end + end + end + + def name + merged_vars.fetch("name", template) + end + + def template_vars + @template_vars ||= JSON.load(IO.read("#{template}.json")).fetch("variables") + end + + def user_prefix + merged_vars.fetch("user_prefix", DEFAULT_USER_PREFIX) + end + + def version + merged_vars.fetch("version", "#{UNKNOWN}.TIMESTAMP"). + rpartition(".").first.concat(".#{build_timestamp}") end end diff --git a/centos-5.11-i386.json b/centos-5.11-i386.json index fed906f00..5b45afeed 100644 --- a/centos-5.11-i386.json +++ b/centos-5.11-i386.json @@ -102,15 +102,21 @@ ], "post-processors": [ { - "output": "builds/{{.Provider}}/opscode_centos-5.11-i386.box", + "output": "builds/{{user `box_basename`}}.{{.Provider}}.box", "type": "vagrant" } ], "provisioners": [ + { + "destination": "/tmp/bento-metadata.json", + "source": "{{user `metadata`}}", + "type": "file" + }, { "environment_vars": [], "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E bash '{{.Path}}'", "scripts": [ + "scripts/common/metadata.sh", "scripts/common/vagrant.sh", "scripts/common/sshd.sh", "scripts/common/vmtools.sh", @@ -121,7 +127,15 @@ } ], "variables": { - "mirror": "http://mirrors.kernel.org/centos" + "arch": "32", + "box_basename": "centos-5.11-i386", + "build_timestamp": "{{isotime \"20060102150405\"}}", + "git_revision": "__unknown_git_revision__", + "metadata": "floppy/dummy_metadata.json", + "mirror": "http://mirrors.kernel.org/centos", + "name": "centos-5.11-i386", + "template": "centos-5.11-i386", + "version": "2.0.TIMESTAMP" } } diff --git a/centos-5.11-x86_64.json b/centos-5.11-x86_64.json index 1a89dd38e..1133c4593 100644 --- a/centos-5.11-x86_64.json +++ b/centos-5.11-x86_64.json @@ -102,15 +102,21 @@ ], "post-processors": [ { - "output": "builds/{{.Provider}}/opscode_centos-5.11.box", + "output": "builds/{{user `box_basename`}}.{{.Provider}}.box", "type": "vagrant" } ], "provisioners": [ + { + "destination": "/tmp/bento-metadata.json", + "source": "{{user `metadata`}}", + "type": "file" + }, { "environment_vars": [], "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E bash '{{.Path}}'", "scripts": [ + "scripts/common/metadata.sh", "scripts/common/vagrant.sh", "scripts/common/sshd.sh", "scripts/common/vmtools.sh", @@ -121,7 +127,15 @@ } ], "variables": { - "mirror": "http://mirrors.kernel.org/centos" + "arch": "64", + "box_basename": "centos-5.11", + "build_timestamp": "{{isotime \"20060102150405\"}}", + "git_revision": "__unknown_git_revision__", + "metadata": "floppy/dummy_metadata.json", + "mirror": "http://mirrors.kernel.org/centos", + "name": "centos-5.11", + "template": "centos-5.11-x86_64", + "version": "2.0.TIMESTAMP" } } diff --git a/centos-6.6-i386.json b/centos-6.6-i386.json index 21e7cfcd7..2ee0078b8 100644 --- a/centos-6.6-i386.json +++ b/centos-6.6-i386.json @@ -102,15 +102,21 @@ ], "post-processors": [ { - "output": "builds/{{.Provider}}/opscode_centos-6.6-i386.box", + "output": "builds/{{user `box_basename`}}.{{.Provider}}.box", "type": "vagrant" } ], "provisioners": [ + { + "destination": "/tmp/bento-metadata.json", + "source": "{{user `metadata`}}", + "type": "file" + }, { "environment_vars": [], "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E bash '{{.Path}}'", "scripts": [ + "scripts/common/metadata.sh", "scripts/centos/fix-slow-dns.sh", "scripts/common/sshd.sh", "scripts/common/vagrant.sh", @@ -122,7 +128,15 @@ } ], "variables": { - "mirror": "http://mirrors.kernel.org/centos" + "arch": "32", + "box_basename": "centos-6.6-i386", + "build_timestamp": "{{isotime \"20060102150405\"}}", + "git_revision": "__unknown_git_revision__", + "metadata": "floppy/dummy_metadata.json", + "mirror": "http://mirrors.kernel.org/centos", + "name": "centos-6.6-i386", + "template": "centos-6.6-i386", + "version": "2.0.TIMESTAMP" } } diff --git a/centos-6.6-x86_64.json b/centos-6.6-x86_64.json index 50fb8586c..a69ebae1d 100644 --- a/centos-6.6-x86_64.json +++ b/centos-6.6-x86_64.json @@ -102,15 +102,21 @@ ], "post-processors": [ { - "output": "builds/{{.Provider}}/opscode_centos-6.6.box", + "output": "builds/{{user `box_basename`}}.{{.Provider}}.box", "type": "vagrant" } ], "provisioners": [ + { + "destination": "/tmp/bento-metadata.json", + "source": "{{user `metadata`}}", + "type": "file" + }, { "environment_vars": [], "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E bash '{{.Path}}'", "scripts": [ + "scripts/common/metadata.sh", "scripts/centos/fix-slow-dns.sh", "scripts/common/sshd.sh", "scripts/common/vagrant.sh", @@ -122,7 +128,15 @@ } ], "variables": { - "mirror": "http://mirrors.kernel.org/centos" + "arch": "64", + "box_basename": "centos-6.6", + "build_timestamp": "{{isotime \"20060102150405\"}}", + "git_revision": "__unknown_git_revision__", + "metadata": "floppy/dummy_metadata.json", + "mirror": "http://mirrors.kernel.org/centos", + "name": "centos-6.6", + "template": "centos-6.6-x86_64", + "version": "2.0.TIMESTAMP" } } diff --git a/centos-7.1-x86_64.json b/centos-7.1-x86_64.json index 205b42621..f909a42fe 100644 --- a/centos-7.1-x86_64.json +++ b/centos-7.1-x86_64.json @@ -102,15 +102,21 @@ ], "post-processors": [ { - "output": "builds/{{.Provider}}/opscode_centos-7.1.box", + "output": "builds/{{user `box_basename`}}.{{.Provider}}.box", "type": "vagrant" } ], "provisioners": [ + { + "destination": "/tmp/bento-metadata.json", + "source": "{{user `metadata`}}", + "type": "file" + }, { "environment_vars": [], "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E bash '{{.Path}}'", "scripts": [ + "scripts/common/metadata.sh", "scripts/centos/fix-slow-dns.sh", "scripts/common/sshd.sh", "scripts/common/vagrant.sh", @@ -122,7 +128,15 @@ } ], "variables": { - "mirror": "http://mirrors.kernel.org/centos" + "arch": "64", + "box_basename": "centos-7.1", + "build_timestamp": "{{isotime \"20060102150405\"}}", + "git_revision": "__unknown_git_revision__", + "metadata": "floppy/dummy_metadata.json", + "mirror": "http://mirrors.kernel.org/centos", + "name": "centos-7.1", + "template": "centos-7.1-x86_64", + "version": "2.0.TIMESTAMP" } } diff --git a/debian-6.0.10-amd64.json b/debian-6.0.10-amd64.json index cceab70b0..49cee79d4 100644 --- a/debian-6.0.10-amd64.json +++ b/debian-6.0.10-amd64.json @@ -144,15 +144,21 @@ ], "post-processors": [ { - "output": "builds/{{.Provider}}/opscode_debian-6.0.10.box", + "output": "builds/{{user `box_basename`}}.{{.Provider}}.box", "type": "vagrant" } ], "provisioners": [ + { + "destination": "/tmp/bento-metadata.json", + "source": "{{user `metadata`}}", + "type": "file" + }, { "environment_vars": [], "execute_command": "echo 'vagrant' | {{.Vars}} sudo -E -S bash '{{.Path}}'", "scripts": [ + "scripts/common/metadata.sh", "scripts/debian/update.sh", "scripts/common/sshd.sh", "scripts/debian/networking.sh", @@ -166,7 +172,15 @@ } ], "variables": { - "mirror": "http://cdimage.debian.org/cdimage/archive" + "arch": "64", + "box_basename": "debian-6.0.10", + "build_timestamp": "{{isotime \"20060102150405\"}}", + "git_revision": "__unknown_git_revision__", + "metadata": "floppy/dummy_metadata.json", + "mirror": "http://cdimage.debian.org/cdimage/archive", + "name": "debian-6.0.10", + "template": "debian-6.0.10-amd64", + "version": "2.0.TIMESTAMP" } } diff --git a/debian-6.0.10-i386.json b/debian-6.0.10-i386.json index b9df2ad98..fd7cd23c0 100644 --- a/debian-6.0.10-i386.json +++ b/debian-6.0.10-i386.json @@ -144,15 +144,21 @@ ], "post-processors": [ { - "output": "builds/{{.Provider}}/opscode_debian-6.0.10-i386.box", + "output": "builds/{{user `box_basename`}}.{{.Provider}}.box", "type": "vagrant" } ], "provisioners": [ + { + "destination": "/tmp/bento-metadata.json", + "source": "{{user `metadata`}}", + "type": "file" + }, { "environment_vars": [], "execute_command": "echo 'vagrant' | {{.Vars}} sudo -E -S bash '{{.Path}}'", "scripts": [ + "scripts/common/metadata.sh", "scripts/debian/update.sh", "scripts/common/sshd.sh", "scripts/debian/networking.sh", @@ -166,7 +172,15 @@ } ], "variables": { - "mirror": "http://cdimage.debian.org/cdimage/archive" + "arch": "32", + "box_basename": "debian-6.0.10-i386", + "build_timestamp": "{{isotime \"20060102150405\"}}", + "git_revision": "__unknown_git_revision__", + "metadata": "floppy/dummy_metadata.json", + "mirror": "http://cdimage.debian.org/cdimage/archive", + "name": "debian-6.0.10-i386", + "template": "debian-6.0.10-i386", + "version": "2.0.TIMESTAMP" } } diff --git a/debian-7.8-amd64.json b/debian-7.8-amd64.json index 6933534ea..03f330004 100644 --- a/debian-7.8-amd64.json +++ b/debian-7.8-amd64.json @@ -144,15 +144,21 @@ ], "post-processors": [ { - "output": "builds/{{.Provider}}/opscode_debian-7.8.box", + "output": "builds/{{user `box_basename`}}.{{.Provider}}.box", "type": "vagrant" } ], "provisioners": [ + { + "destination": "/tmp/bento-metadata.json", + "source": "{{user `metadata`}}", + "type": "file" + }, { "environment_vars": [], "execute_command": "echo 'vagrant' | {{.Vars}} sudo -E -S bash '{{.Path}}'", "scripts": [ + "scripts/common/metadata.sh", "scripts/debian/update.sh", "scripts/common/sshd.sh", "scripts/debian/networking.sh", @@ -166,7 +172,15 @@ } ], "variables": { - "mirror": "http://cdimage.debian.org/cdimage/archive" + "arch": "64", + "box_basename": "debian-7.8", + "build_timestamp": "{{isotime \"20060102150405\"}}", + "git_revision": "__unknown_git_revision__", + "metadata": "floppy/dummy_metadata.json", + "mirror": "http://cdimage.debian.org/cdimage/archive", + "name": "debian-7.8", + "template": "debian-7.8-amd64", + "version": "2.0.TIMESTAMP" } } diff --git a/debian-7.8-i386.json b/debian-7.8-i386.json index e5a6c7152..0a89c3f12 100644 --- a/debian-7.8-i386.json +++ b/debian-7.8-i386.json @@ -144,15 +144,21 @@ ], "post-processors": [ { - "output": "builds/{{.Provider}}/opscode_debian-7.8-i386.box", + "output": "builds/{{user `box_basename`}}.{{.Provider}}.box", "type": "vagrant" } ], "provisioners": [ + { + "destination": "/tmp/bento-metadata.json", + "source": "{{user `metadata`}}", + "type": "file" + }, { "environment_vars": [], "execute_command": "echo 'vagrant' | {{.Vars}} sudo -E -S bash '{{.Path}}'", "scripts": [ + "scripts/common/metadata.sh", "scripts/debian/update.sh", "scripts/common/sshd.sh", "scripts/debian/networking.sh", @@ -166,7 +172,15 @@ } ], "variables": { - "mirror": "http://cdimage.debian.org/cdimage/archive" + "arch": "32", + "box_basename": "debian-7.8-i386", + "build_timestamp": "{{isotime \"20060102150405\"}}", + "git_revision": "__unknown_git_revision__", + "metadata": "floppy/dummy_metadata.json", + "mirror": "http://cdimage.debian.org/cdimage/archive", + "name": "debian-7.8-i386", + "template": "debian-7.8-i386", + "version": "2.0.TIMESTAMP" } } diff --git a/fedora-20-i386.json b/fedora-20-i386.json index 08ce1bcd2..1f4639672 100644 --- a/fedora-20-i386.json +++ b/fedora-20-i386.json @@ -102,15 +102,21 @@ ], "post-processors": [ { - "output": "builds/{{.Provider}}/opscode_fedora-20-i386.box", + "output": "builds/{{user `box_basename`}}.{{.Provider}}.box", "type": "vagrant" } ], "provisioners": [ + { + "destination": "/tmp/bento-metadata.json", + "source": "{{user `metadata`}}", + "type": "file" + }, { "environment_vars": [], "execute_command": "echo 'vagrant' | {{.Vars}} sudo -E -S bash '{{.Path}}'", "scripts": [ + "scripts/common/metadata.sh", "scripts/fedora/fix-slow-dns.sh", "scripts/common/sshd.sh", "scripts/common/vmtools.sh", @@ -122,7 +128,15 @@ } ], "variables": { - "mirror": "http://download.fedoraproject.org/pub/fedora/linux" + "arch": "32", + "box_basename": "fedora-20-i386", + "build_timestamp": "{{isotime \"20060102150405\"}}", + "git_revision": "__unknown_git_revision__", + "metadata": "floppy/dummy_metadata.json", + "mirror": "http://download.fedoraproject.org/pub/fedora/linux", + "name": "fedora-20-i386", + "template": "fedora-20-i386", + "version": "2.0.TIMESTAMP" } } diff --git a/fedora-20-x86_64.json b/fedora-20-x86_64.json index 4848ab0e9..3ed1eeb89 100644 --- a/fedora-20-x86_64.json +++ b/fedora-20-x86_64.json @@ -102,15 +102,21 @@ ], "post-processors": [ { - "output": "builds/{{.Provider}}/opscode_fedora-20.box", + "output": "builds/{{user `box_basename`}}.{{.Provider}}.box", "type": "vagrant" } ], "provisioners": [ + { + "destination": "/tmp/bento-metadata.json", + "source": "{{user `metadata`}}", + "type": "file" + }, { "environment_vars": [], "execute_command": "echo 'vagrant' | {{.Vars}} sudo -E -S bash '{{.Path}}'", "scripts": [ + "scripts/common/metadata.sh", "scripts/fedora/fix-slow-dns.sh", "scripts/common/sshd.sh", "scripts/common/vmtools.sh", @@ -122,7 +128,15 @@ } ], "variables": { - "mirror": "http://download.fedoraproject.org/pub/fedora/linux" + "arch": "64", + "box_basename": "fedora-20", + "build_timestamp": "{{isotime \"20060102150405\"}}", + "git_revision": "__unknown_git_revision__", + "metadata": "floppy/dummy_metadata.json", + "mirror": "http://download.fedoraproject.org/pub/fedora/linux", + "name": "fedora-20", + "template": "fedora-20-x86_64", + "version": "2.0.TIMESTAMP" } } diff --git a/fedora-21-i386.json b/fedora-21-i386.json index c80fe4a74..8a28a2e6e 100644 --- a/fedora-21-i386.json +++ b/fedora-21-i386.json @@ -102,15 +102,21 @@ ], "post-processors": [ { - "output": "builds/{{.Provider}}/opscode_fedora-21-i386.box", + "output": "builds/{{user `box_basename`}}.{{.Provider}}.box", "type": "vagrant" } ], "provisioners": [ + { + "destination": "/tmp/bento-metadata.json", + "source": "{{user `metadata`}}", + "type": "file" + }, { "environment_vars": [], "execute_command": "echo 'vagrant' | {{.Vars}} sudo -E -S bash '{{.Path}}'", "scripts": [ + "scripts/common/metadata.sh", "scripts/fedora/fix-slow-dns.sh", "scripts/common/sshd.sh", "scripts/common/vmtools.sh", @@ -122,7 +128,15 @@ } ], "variables": { - "mirror": "http://download.fedoraproject.org/pub/fedora/linux" + "arch": "32", + "box_basename": "fedora-21-i386", + "build_timestamp": "{{isotime \"20060102150405\"}}", + "git_revision": "__unknown_git_revision__", + "metadata": "floppy/dummy_metadata.json", + "mirror": "http://download.fedoraproject.org/pub/fedora/linux", + "name": "fedora-21-i386", + "template": "fedora-21-i386", + "version": "2.0.TIMESTAMP" } } diff --git a/fedora-21-x86_64.json b/fedora-21-x86_64.json index 157715530..2270306c0 100644 --- a/fedora-21-x86_64.json +++ b/fedora-21-x86_64.json @@ -102,15 +102,21 @@ ], "post-processors": [ { - "output": "builds/{{.Provider}}/opscode_fedora-21.box", + "output": "builds/{{user `box_basename`}}.{{.Provider}}.box", "type": "vagrant" } ], "provisioners": [ + { + "destination": "/tmp/bento-metadata.json", + "source": "{{user `metadata`}}", + "type": "file" + }, { "environment_vars": [], "execute_command": "echo 'vagrant' | {{.Vars}} sudo -E -S bash '{{.Path}}'", "scripts": [ + "scripts/common/metadata.sh", "scripts/fedora/fix-slow-dns.sh", "scripts/common/sshd.sh", "scripts/common/vmtools.sh", @@ -122,7 +128,15 @@ } ], "variables": { - "mirror": "http://download.fedoraproject.org/pub/fedora/linux" + "arch": "64", + "box_basename": "fedora-21", + "build_timestamp": "{{isotime \"20060102150405\"}}", + "git_revision": "__unknown_git_revision__", + "metadata": "floppy/dummy_metadata.json", + "mirror": "http://download.fedoraproject.org/pub/fedora/linux", + "name": "fedora-21", + "template": "fedora-21-x86_64", + "version": "2.0.TIMESTAMP" } } diff --git a/floppy/dummy_metadata.json b/floppy/dummy_metadata.json new file mode 100644 index 000000000..5a3288a37 --- /dev/null +++ b/floppy/dummy_metadata.json @@ -0,0 +1,3 @@ +{ + "metadata": "not provided" +} diff --git a/freebsd-10.1-amd64.json b/freebsd-10.1-amd64.json index 908655802..2ca219eb7 100644 --- a/freebsd-10.1-amd64.json +++ b/freebsd-10.1-amd64.json @@ -146,7 +146,7 @@ ], "post-processors": [ { - "output": "builds/{{.Provider}}/opscode_freebsd-10.1.box", + "output": "builds/{{user `box_basename`}}.{{.Provider}}.box", "override": { "parallels": { "vagrantfile_template": "vagrantfile_templates/parallels/freebsd.rb" @@ -156,10 +156,16 @@ } ], "provisioners": [ + { + "destination": "/tmp/bento-metadata.json", + "source": "{{user `metadata`}}", + "type": "file" + }, { "environment_vars": [], "execute_command": "export {{.Vars}} && cat {{.Path}} | su -m", "scripts": [ + "scripts/common/metadata.sh", "scripts/freebsd/postinstall.sh", "scripts/freebsd/cleanup.sh", "scripts/freebsd/vmtools.sh", @@ -169,7 +175,15 @@ } ], "variables": { - "mirror": "http://ftp.freebsd.org/pub/FreeBSD" + "arch": "64", + "box_basename": "freebsd-10.1", + "build_timestamp": "{{isotime \"20060102150405\"}}", + "git_revision": "__unknown_git_revision__", + "metadata": "floppy/dummy_metadata.json", + "mirror": "http://ftp.freebsd.org/pub/FreeBSD", + "name": "freebsd-10.1", + "template": "freebsd-10.1-amd64", + "version": "2.0.TIMESTAMP" } } diff --git a/freebsd-10.1-i386.json b/freebsd-10.1-i386.json index d40e7c442..312f86f27 100644 --- a/freebsd-10.1-i386.json +++ b/freebsd-10.1-i386.json @@ -146,7 +146,7 @@ ], "post-processors": [ { - "output": "builds/{{.Provider}}/opscode_freebsd-10.1-i386.box", + "output": "builds/{{user `box_basename`}}.{{.Provider}}.box", "override": { "parallels": { "vagrantfile_template": "vagrantfile_templates/parallels/freebsd.rb" @@ -156,10 +156,16 @@ } ], "provisioners": [ + { + "destination": "/tmp/bento-metadata.json", + "source": "{{user `metadata`}}", + "type": "file" + }, { "environment_vars": [], "execute_command": "export {{.Vars}} && cat {{.Path}} | su -m", "scripts": [ + "scripts/common/metadata.sh", "scripts/freebsd/postinstall.sh", "scripts/freebsd/cleanup.sh", "scripts/freebsd/vmtools.sh", @@ -169,7 +175,15 @@ } ], "variables": { - "mirror": "http://ftp.freebsd.org/pub/FreeBSD" + "arch": "32", + "box_basename": "freebsd-10.1-i386", + "build_timestamp": "{{isotime \"20060102150405\"}}", + "git_revision": "__unknown_git_revision__", + "metadata": "floppy/dummy_metadata.json", + "mirror": "http://ftp.freebsd.org/pub/FreeBSD", + "name": "freebsd-10.1-i386", + "template": "freebsd-10.1-i386", + "version": "2.0.TIMESTAMP" } } diff --git a/freebsd-9.3-amd64.json b/freebsd-9.3-amd64.json index e8b474b38..73177411a 100644 --- a/freebsd-9.3-amd64.json +++ b/freebsd-9.3-amd64.json @@ -158,7 +158,7 @@ ], "post-processors": [ { - "output": "builds/{{.Provider}}/opscode_freebsd-9.3.box", + "output": "builds/{{user `box_basename`}}.{{.Provider}}.box", "override": { "parallels": { "vagrantfile_template": "vagrantfile_templates/parallels/freebsd.rb" @@ -168,10 +168,16 @@ } ], "provisioners": [ + { + "destination": "/tmp/bento-metadata.json", + "source": "{{user `metadata`}}", + "type": "file" + }, { "environment_vars": [], "execute_command": "export {{.Vars}} && cat {{.Path}} | su -m", "scripts": [ + "scripts/common/metadata.sh", "scripts/freebsd/postinstall.sh", "scripts/freebsd/vmtools.sh", "scripts/freebsd/cleanup.sh", @@ -181,7 +187,15 @@ } ], "variables": { - "mirror": "http://ftp.freebsd.org/pub/FreeBSD" + "arch": "64", + "box_basename": "freebsd-9.3", + "build_timestamp": "{{isotime \"20060102150405\"}}", + "git_revision": "__unknown_git_revision__", + "metadata": "floppy/dummy_metadata.json", + "mirror": "http://ftp.freebsd.org/pub/FreeBSD", + "name": "freebsd-9.3", + "template": "freebsd-9.3-amd64", + "version": "2.0.TIMESTAMP" } } diff --git a/freebsd-9.3-i386.json b/freebsd-9.3-i386.json index 275af5b7d..29e72d6a6 100644 --- a/freebsd-9.3-i386.json +++ b/freebsd-9.3-i386.json @@ -157,7 +157,7 @@ ], "post-processors": [ { - "output": "builds/{{.Provider}}/opscode_freebsd-9.3-i386.box", + "output": "builds/{{user `box_basename`}}.{{.Provider}}.box", "override": { "parallels": { "vagrantfile_template": "vagrantfile_templates/parallels/freebsd.rb" @@ -167,9 +167,15 @@ } ], "provisioners": [ + { + "destination": "/tmp/bento-metadata.json", + "source": "{{user `metadata`}}", + "type": "file" + }, { "execute_command": "export {{.Vars}} && cat {{.Path}} | su -m", "scripts": [ + "scripts/common/metadata.sh", "scripts/freebsd/postinstall.sh", "scripts/freebsd/vmtools.sh", "scripts/freebsd/cleanup.sh", @@ -179,7 +185,15 @@ } ], "variables": { - "mirror": "http://ftp.freebsd.org/pub/FreeBSD" + "arch": "32", + "box_basename": "freebsd-9.3-i386", + "build_timestamp": "{{isotime \"20060102150405\"}}", + "git_revision": "__unknown_git_revision__", + "metadata": "floppy/dummy_metadata.json", + "mirror": "http://ftp.freebsd.org/pub/FreeBSD", + "name": "freebsd-9.3-i386", + "template": "freebsd-9.3-i386", + "version": "2.0.TIMESTAMP" } } diff --git a/macosx-10.7.json b/macosx-10.7.json index 2b3f643eb..caebd083b 100644 --- a/macosx-10.7.json +++ b/macosx-10.7.json @@ -155,12 +155,17 @@ "min_packer_version": "0.6.0", "post-processors": [ { - "output": "builds/{{.Provider}}/opscode_macosx-10.7.box", + "output": "builds/{{user `box_basename`}}.{{.Provider}}.box", "type": "vagrant", "vagrantfile_template": "vagrantfile_templates/macosx.rb" } ], "provisioners": [ + { + "destination": "/tmp/bento-metadata.json", + "source": "{{user `metadata`}}", + "type": "file" + }, { "destination": "/private/tmp/kcpassword", "source": "scripts/macosx/support/kcpassword", @@ -169,6 +174,7 @@ { "execute_command": "echo 'vagrant'| {{.Vars}} sudo -E -S sh '{{.Path}}'", "scripts": [ + "scripts/common/metadata.sh", "scripts/macosx/hostname.sh", "scripts/macosx/builder.sh", "scripts/macosx/update.sh", @@ -189,9 +195,17 @@ } ], "variables": { + "arch": "64", "autologin_vagrant_user": "", + "box_basename": "macosx-10.7", + "build_timestamp": "{{isotime \"20060102150405\"}}", + "git_revision": "__unknown_git_revision__", "iso_checksum": "e2a48af008ff3c4db6a8235151a1e90ea600fceb", - "iso_url": "http://fakeurl/OSX_InstallESD_10.7.5_11G63.dmg" + "iso_url": "http://fakeurl/OSX_InstallESD_10.7.5_11G63.dmg", + "metadata": "floppy/dummy_metadata.json", + "name": "macosx-10.7", + "template": "macosx-10.7", + "version": "2.0.TIMESTAMP" } } diff --git a/macosx-10.8.json b/macosx-10.8.json index d5cc57756..666355594 100644 --- a/macosx-10.8.json +++ b/macosx-10.8.json @@ -155,12 +155,17 @@ "min_packer_version": "0.6.0", "post-processors": [ { - "output": "builds/{{.Provider}}/opscode_macosx-10.8.box", + "output": "builds/{{user `box_basename`}}.{{.Provider}}.box", "type": "vagrant", "vagrantfile_template": "vagrantfile_templates/macosx.rb" } ], "provisioners": [ + { + "destination": "/tmp/bento-metadata.json", + "source": "{{user `metadata`}}", + "type": "file" + }, { "destination": "/private/tmp/kcpassword", "source": "scripts/macosx/support/kcpassword", @@ -169,6 +174,7 @@ { "execute_command": "echo 'vagrant'| {{.Vars}} sudo -E -S sh '{{.Path}}'", "scripts": [ + "scripts/common/metadata.sh", "scripts/macosx/hostname.sh", "scripts/macosx/builder.sh", "scripts/macosx/update.sh", @@ -189,9 +195,17 @@ } ], "variables": { + "arch": "64", "autologin_vagrant_user": "", + "box_basename": "macosx-10.8", + "build_timestamp": "{{isotime \"20060102150405\"}}", + "git_revision": "__unknown_git_revision__", "iso_checksum": "e2a48af008ff3c4db6a8235151a1e90ea600fceb", - "iso_url": "http://fakeurl/OSX_InstallESD_10.8.5_12F45.dmg" + "iso_url": "http://fakeurl/OSX_InstallESD_10.8.5_12F45.dmg", + "metadata": "floppy/dummy_metadata.json", + "name": "macosx-10.8", + "template": "macosx-10.8", + "version": "2.0.TIMESTAMP" } } diff --git a/macosx-10.9.json b/macosx-10.9.json index 18c386834..9d936f22d 100644 --- a/macosx-10.9.json +++ b/macosx-10.9.json @@ -155,12 +155,17 @@ "min_packer_version": "0.6.0", "post-processors": [ { - "output": "builds/{{.Provider}}/opscode_macosx-10.9.box", + "output": "builds/{{user `box_basename`}}.{{.Provider}}.box", "type": "vagrant", "vagrantfile_template": "vagrantfile_templates/macosx.rb" } ], "provisioners": [ + { + "destination": "/tmp/bento-metadata.json", + "source": "{{user `metadata`}}", + "type": "file" + }, { "destination": "/private/tmp/kcpassword", "source": "scripts/macosx/support/kcpassword", @@ -169,6 +174,7 @@ { "execute_command": "echo 'vagrant'| {{.Vars}} sudo -E -S sh '{{.Path}}'", "scripts": [ + "scripts/common/metadata.sh", "scripts/macosx/hostname.sh", "scripts/macosx/builder.sh", "scripts/macosx/update.sh", @@ -189,9 +195,17 @@ } ], "variables": { + "arch": "64", "autologin_vagrant_user": "", + "box_basename": "macosx-10.9", + "build_timestamp": "{{isotime \"20060102150405\"}}", + "git_revision": "__unknown_git_revision__", "iso_checksum": "e2a48af008ff3c4db6a8235151a1e90ea600fceb", - "iso_url": "http://fakeurl/OSX_InstallESD_10.9.1_13B42.dmg" + "iso_url": "http://fakeurl/OSX_InstallESD_10.9.1_13B42.dmg", + "metadata": "floppy/dummy_metadata.json", + "name": "macosx-10.9", + "template": "macosx-10.9", + "version": "2.0.TIMESTAMP" } } diff --git a/omnios-r151010j.json b/omnios-r151010j.json index a3f1e3d00..684fad1c1 100644 --- a/omnios-r151010j.json +++ b/omnios-r151010j.json @@ -180,7 +180,7 @@ "post-processors": [ { "compression_level": 9, - "output": "builds/{{.Provider}}/opscode_omnios-r151010j.box", + "output": "builds/{{user `box_basename`}}.{{.Provider}}.box", "override": { "parallels": { "vagrantfile_template": "vagrantfile_templates/parallels/omnios.rb" @@ -190,10 +190,16 @@ } ], "provisioners": [ + { + "destination": "/tmp/bento-metadata.json", + "source": "{{user `metadata`}}", + "type": "file" + }, { "environment_vars": [], "execute_command": "export {{.Vars}} && sh '{{.Path}}'", "scripts": [ + "scripts/common/metadata.sh", "scripts/omnios/vmtools.sh", "scripts/omnios/postinstall.sh" ], @@ -201,7 +207,15 @@ } ], "variables": { - "mirror": "http://omnios.omniti.com/media" + "arch": "64", + "box_basename": "omnios-r151010j", + "build_timestamp": "{{isotime \"20060102150405\"}}", + "git_revision": "__unknown_git_revision__", + "metadata": "floppy/dummy_metadata.json", + "mirror": "http://omnios.omniti.com/media", + "name": "omnios-r151010j", + "template": "omnios-r151010j", + "version": "2.0.TIMESTAMP" } } diff --git a/opensuse-13.2-i386.json b/opensuse-13.2-i386.json index dad100d7c..036b4b389 100644 --- a/opensuse-13.2-i386.json +++ b/opensuse-13.2-i386.json @@ -113,15 +113,21 @@ ], "post-processors": [ { - "output": "builds/{{.Provider}}/opscode_opensuse-13.2-i386.box", + "output": "builds/{{user `box_basename`}}.{{.Provider}}.box", "type": "vagrant" } ], "provisioners": [ + { + "destination": "/tmp/bento-metadata.json", + "source": "{{user `metadata`}}", + "type": "file" + }, { "environment_vars": [], "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh '{{.Path}}'", "scripts": [ + "scripts/common/metadata.sh", "scripts/common/sshd.sh", "scripts/common/vagrant.sh", "scripts/common/vmtools.sh", @@ -135,7 +141,15 @@ } ], "variables": { - "mirror": "http://download.opensuse.org/distribution" + "arch": "32", + "box_basename": "opensuse-13.2-i386", + "build_timestamp": "{{isotime \"20060102150405\"}}", + "git_revision": "__unknown_git_revision__", + "metadata": "floppy/dummy_metadata.json", + "mirror": "http://download.opensuse.org/distribution", + "name": "opensuse-13.2-i386", + "template": "opensuse-13.2-i386", + "version": "2.0.TIMESTAMP" } } diff --git a/opensuse-13.2-x86_64.json b/opensuse-13.2-x86_64.json index 7c4e7bf0f..27e0c9173 100644 --- a/opensuse-13.2-x86_64.json +++ b/opensuse-13.2-x86_64.json @@ -113,15 +113,21 @@ ], "post-processors": [ { - "output": "builds/{{.Provider}}/opscode_opensuse-13.2-x86_64.box", + "output": "builds/{{user `box_basename`}}.{{.Provider}}.box", "type": "vagrant" } ], "provisioners": [ + { + "destination": "/tmp/bento-metadata.json", + "source": "{{user `metadata`}}", + "type": "file" + }, { "environment_vars": [], "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh '{{.Path}}'", "scripts": [ + "scripts/common/metadata.sh", "scripts/common/sshd.sh", "scripts/common/vagrant.sh", "scripts/common/vmtools.sh", @@ -135,7 +141,15 @@ } ], "variables": { - "mirror": "http://download.opensuse.org/distribution" + "arch": "64", + "box_basename": "opensuse-13.2-x86_64", + "build_timestamp": "{{isotime \"20060102150405\"}}", + "git_revision": "__unknown_git_revision__", + "metadata": "floppy/dummy_metadata.json", + "mirror": "http://download.opensuse.org/distribution", + "name": "opensuse-13.2-x86_64", + "template": "opensuse-13.2-x86_64", + "version": "2.0.TIMESTAMP" } } diff --git a/oracle-5.11-i386.json b/oracle-5.11-i386.json index caa98dca4..206a2041a 100644 --- a/oracle-5.11-i386.json +++ b/oracle-5.11-i386.json @@ -102,15 +102,21 @@ ], "post-processors": [ { - "output": "builds/{{.Provider}}/opscode_oracle-5.11-i386.box", + "output": "builds/{{user `box_basename`}}.{{.Provider}}.box", "type": "vagrant" } ], "provisioners": [ + { + "destination": "/tmp/bento-metadata.json", + "source": "{{user `metadata`}}", + "type": "file" + }, { "environment_vars": [], "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E bash '{{.Path}}'", "scripts": [ + "scripts/common/metadata.sh", "scripts/common/vagrant.sh", "scripts/common/sshd.sh", "scripts/common/vmtools.sh", @@ -121,7 +127,15 @@ } ], "variables": { - "mirror": "http://mirrors.dotsrc.org/oracle-linux/EL5/U11/i386" + "arch": "32", + "box_basename": "oracle-5.11-i386", + "build_timestamp": "{{isotime \"20060102150405\"}}", + "git_revision": "__unknown_git_revision__", + "metadata": "floppy/dummy_metadata.json", + "mirror": "http://mirrors.dotsrc.org/oracle-linux/EL5/U11/i386", + "name": "oracle-5.11-i386", + "template": "oracle-5.11-i386", + "version": "2.0.TIMESTAMP" } } diff --git a/oracle-5.11-x86_64.json b/oracle-5.11-x86_64.json index b616e027f..9596cfa3a 100644 --- a/oracle-5.11-x86_64.json +++ b/oracle-5.11-x86_64.json @@ -102,15 +102,21 @@ ], "post-processors": [ { - "output": "builds/{{.Provider}}/opscode_oracle-5.11.box", + "output": "builds/{{user `box_basename`}}.{{.Provider}}.box", "type": "vagrant" } ], "provisioners": [ + { + "destination": "/tmp/bento-metadata.json", + "source": "{{user `metadata`}}", + "type": "file" + }, { "environment_vars": [], "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E bash '{{.Path}}'", "scripts": [ + "scripts/common/metadata.sh", "scripts/common/vagrant.sh", "scripts/common/sshd.sh", "scripts/common/vmtools.sh", @@ -121,7 +127,15 @@ } ], "variables": { - "mirror": "http://mirrors.dotsrc.org/oracle-linux/EL5/U11/x86_64" + "arch": "64", + "box_basename": "oracle-5.11", + "build_timestamp": "{{isotime \"20060102150405\"}}", + "git_revision": "__unknown_git_revision__", + "metadata": "floppy/dummy_metadata.json", + "mirror": "http://mirrors.dotsrc.org/oracle-linux/EL5/U11/x86_64", + "name": "oracle-5.11", + "template": "oracle-5.11-x86_64", + "version": "2.0.TIMESTAMP" } } diff --git a/oracle-6.6-i386.json b/oracle-6.6-i386.json index abaa3d6dc..c113d7ba2 100644 --- a/oracle-6.6-i386.json +++ b/oracle-6.6-i386.json @@ -102,15 +102,21 @@ ], "post-processors": [ { - "output": "builds/{{.Provider}}/opscode_oracle-6.6-i386.box", + "output": "builds/{{user `box_basename`}}.{{.Provider}}.box", "type": "vagrant" } ], "provisioners": [ + { + "destination": "/tmp/bento-metadata.json", + "source": "{{user `metadata`}}", + "type": "file" + }, { "environment_vars": [], "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E bash '{{.Path}}'", "scripts": [ + "scripts/common/metadata.sh", "scripts/centos/fix-slow-dns.sh", "scripts/common/sshd.sh", "scripts/common/vagrant.sh", @@ -122,7 +128,15 @@ } ], "variables": { - "mirror": "http://mirrors.dotsrc.org/oracle-linux/OL6/U6/i386" + "arch": "32", + "box_basename": "oracle-6.6-i386", + "build_timestamp": "{{isotime \"20060102150405\"}}", + "git_revision": "__unknown_git_revision__", + "metadata": "floppy/dummy_metadata.json", + "mirror": "http://mirrors.dotsrc.org/oracle-linux/OL6/U6/i386", + "name": "oracle-6.6-i386", + "template": "oracle-6.6-i386", + "version": "2.0.TIMESTAMP" } } diff --git a/oracle-6.6-x86_64.json b/oracle-6.6-x86_64.json index 607e12173..d32ccbc86 100644 --- a/oracle-6.6-x86_64.json +++ b/oracle-6.6-x86_64.json @@ -102,15 +102,21 @@ ], "post-processors": [ { - "output": "builds/{{.Provider}}/opscode_oracle-6.6.box", + "output": "builds/{{user `box_basename`}}.{{.Provider}}.box", "type": "vagrant" } ], "provisioners": [ + { + "destination": "/tmp/bento-metadata.json", + "source": "{{user `metadata`}}", + "type": "file" + }, { "environment_vars": [], "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E bash '{{.Path}}'", "scripts": [ + "scripts/common/metadata.sh", "scripts/centos/fix-slow-dns.sh", "scripts/common/sshd.sh", "scripts/common/vagrant.sh", @@ -122,7 +128,15 @@ } ], "variables": { - "mirror": "http://mirrors.dotsrc.org/oracle-linux/OL6/U6/x86_64" + "arch": "64", + "box_basename": "oracle-6.6", + "build_timestamp": "{{isotime \"20060102150405\"}}", + "git_revision": "__unknown_git_revision__", + "metadata": "floppy/dummy_metadata.json", + "mirror": "http://mirrors.dotsrc.org/oracle-linux/OL6/U6/x86_64", + "name": "oracle-6.6", + "template": "oracle-6.6-x86_64", + "version": "2.0.TIMESTAMP" } } diff --git a/rhel-5.11-i386.json b/rhel-5.11-i386.json index 8ab1c4243..d1b3aa3aa 100644 --- a/rhel-5.11-i386.json +++ b/rhel-5.11-i386.json @@ -102,15 +102,21 @@ ], "post-processors": [ { - "output": "builds/{{.Provider}}/opscode_rhel-5.11-i386.box", + "output": "builds/{{user `box_basename`}}.{{.Provider}}.box", "type": "vagrant" } ], "provisioners": [ + { + "destination": "/tmp/bento-metadata.json", + "source": "{{user `metadata`}}", + "type": "file" + }, { "environment_vars": [], "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E bash '{{.Path}}'", "scripts": [ + "scripts/common/metadata.sh", "scripts/common/vagrant.sh", "scripts/common/sshd.sh", "scripts/common/vmtools.sh", @@ -121,7 +127,15 @@ } ], "variables": { - "mirror": "https://content-web.rhn.redhat.com/rhn/isos/rhel-5.11/md5sum/1ab756241a4a209b8d39abe6bace84a9" + "arch": "32", + "box_basename": "rhel-5.11-i386", + "build_timestamp": "{{isotime \"20060102150405\"}}", + "git_revision": "__unknown_git_revision__", + "metadata": "floppy/dummy_metadata.json", + "mirror": "https://content-web.rhn.redhat.com/rhn/isos/rhel-5.11/md5sum/1ab756241a4a209b8d39abe6bace84a9", + "name": "rhel-5.11-i386", + "template": "rhel-5.11-i386", + "version": "2.0.TIMESTAMP" } } diff --git a/rhel-5.11-x86_64.json b/rhel-5.11-x86_64.json index 8fb7a4457..d0d04a3d7 100644 --- a/rhel-5.11-x86_64.json +++ b/rhel-5.11-x86_64.json @@ -102,15 +102,21 @@ ], "post-processors": [ { - "output": "builds/{{.Provider}}/opscode_rhel-5.11.box", + "output": "builds/{{user `box_basename`}}.{{.Provider}}.box", "type": "vagrant" } ], "provisioners": [ + { + "destination": "/tmp/bento-metadata.json", + "source": "{{user `metadata`}}", + "type": "file" + }, { "environment_vars": [], "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E bash '{{.Path}}'", "scripts": [ + "scripts/common/metadata.sh", "scripts/common/vagrant.sh", "scripts/common/sshd.sh", "scripts/common/vmtools.sh", @@ -121,7 +127,15 @@ } ], "variables": { - "mirror": "https://content-web.rhn.redhat.com/rhn/isos/rhel-5.11/md5sum/86cc2d5548ee2ff9c8d3e2b4db3e6001" + "arch": "64", + "box_basename": "rhel-5.11", + "build_timestamp": "{{isotime \"20060102150405\"}}", + "git_revision": "__unknown_git_revision__", + "metadata": "floppy/dummy_metadata.json", + "mirror": "https://content-web.rhn.redhat.com/rhn/isos/rhel-5.11/md5sum/86cc2d5548ee2ff9c8d3e2b4db3e6001", + "name": "rhel-5.11", + "template": "rhel-5.11-x86_64", + "version": "2.0.TIMESTAMP" } } diff --git a/rhel-6.6-i386.json b/rhel-6.6-i386.json index 800432915..21fb0638e 100644 --- a/rhel-6.6-i386.json +++ b/rhel-6.6-i386.json @@ -102,15 +102,21 @@ ], "post-processors": [ { - "output": "builds/{{.Provider}}/opscode_rhel-6.6-i386.box", + "output": "builds/{{user `box_basename`}}.{{.Provider}}.box", "type": "vagrant" } ], "provisioners": [ + { + "destination": "/tmp/bento-metadata.json", + "source": "{{user `metadata`}}", + "type": "file" + }, { "environment_vars": [], "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E bash '{{.Path}}'", "scripts": [ + "scripts/common/metadata.sh", "scripts/centos/fix-slow-dns.sh", "scripts/common/sshd.sh", "scripts/common/vagrant.sh", @@ -122,7 +128,15 @@ } ], "variables": { - "mirror": "https://content-web.rhn.redhat.com/rhn/isos/rhel-6.6/md5sum/64e687f958db92feccc3f7701a8771f8" + "arch": "32", + "box_basename": "rhel-6.6-i386", + "build_timestamp": "{{isotime \"20060102150405\"}}", + "git_revision": "__unknown_git_revision__", + "metadata": "floppy/dummy_metadata.json", + "mirror": "https://content-web.rhn.redhat.com/rhn/isos/rhel-6.6/md5sum/64e687f958db92feccc3f7701a8771f8", + "name": "rhel-6.6-i386", + "template": "rhel-6.6-i386", + "version": "2.0.TIMESTAMP" } } diff --git a/rhel-6.6-x86_64.json b/rhel-6.6-x86_64.json index 69bc3a184..cbc51fe5a 100644 --- a/rhel-6.6-x86_64.json +++ b/rhel-6.6-x86_64.json @@ -102,15 +102,21 @@ ], "post-processors": [ { - "output": "builds/{{.Provider}}/opscode_rhel-6.6.box", + "output": "builds/{{user `box_basename`}}.{{.Provider}}.box", "type": "vagrant" } ], "provisioners": [ + { + "destination": "/tmp/bento-metadata.json", + "source": "{{user `metadata`}}", + "type": "file" + }, { "environment_vars": [], "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E bash '{{.Path}}'", "scripts": [ + "scripts/common/metadata.sh", "scripts/centos/fix-slow-dns.sh", "scripts/common/sshd.sh", "scripts/common/vagrant.sh", @@ -122,7 +128,15 @@ } ], "variables": { - "mirror": "https://content-web.rhn.redhat.com/rhn/isos/rhel-6.6/md5sum/ef031b0ae8458d6489eb277ba1dcb5de" + "arch": "64", + "box_basename": "rhel-6.6", + "build_timestamp": "{{isotime \"20060102150405\"}}", + "git_revision": "__unknown_git_revision__", + "metadata": "floppy/dummy_metadata.json", + "mirror": "https://content-web.rhn.redhat.com/rhn/isos/rhel-6.6/md5sum/ef031b0ae8458d6489eb277ba1dcb5de", + "name": "rhel-6.6", + "template": "rhel-6.6-x86_64", + "version": "2.0.TIMESTAMP" } } diff --git a/rhel-7.1-x86_64.json b/rhel-7.1-x86_64.json index e4649e714..817f31f9b 100644 --- a/rhel-7.1-x86_64.json +++ b/rhel-7.1-x86_64.json @@ -102,15 +102,21 @@ ], "post-processors": [ { - "output": "builds/{{.Provider}}/opscode_rhel-7.1.box", + "output": "builds/{{user `box_basename`}}.{{.Provider}}.box", "type": "vagrant" } ], "provisioners": [ + { + "destination": "/tmp/bento-metadata.json", + "source": "{{user `metadata`}}", + "type": "file" + }, { "environment_vars": [], "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E bash '{{.Path}}'", "scripts": [ + "scripts/common/metadata.sh", "scripts/centos/fix-slow-dns.sh", "scripts/common/sshd.sh", "scripts/common/vagrant.sh", @@ -122,7 +128,15 @@ } ], "variables": { - "mirror": "http://put-your-mirror-here/" + "arch": "64", + "box_basename": "rhel-7.1", + "build_timestamp": "{{isotime \"20060102150405\"}}", + "git_revision": "__unknown_git_revision__", + "metadata": "floppy/dummy_metadata.json", + "mirror": "http://put-your-mirror-here/", + "name": "rhel-7.1", + "template": "rhel-7.1-x86_64", + "version": "2.0.TIMESTAMP" } } diff --git a/scripts/common/metadata.sh b/scripts/common/metadata.sh new file mode 100755 index 000000000..500f4437f --- /dev/null +++ b/scripts/common/metadata.sh @@ -0,0 +1,6 @@ +#!/bin/sh -eux + +mkdir -p /etc +cp /tmp/bento-metadata.json /etc/bento-metadata.json +chmod 0444 /etc/bento-metadata.json +rm -f /tmp/bento-metadata.json diff --git a/sles-11-sp2-i386.json b/sles-11-sp2-i386.json index b65a9dd74..2390582a0 100644 --- a/sles-11-sp2-i386.json +++ b/sles-11-sp2-i386.json @@ -114,15 +114,21 @@ ], "post-processors": [ { - "output": "builds/{{.Provider}}/opscode_sles-11sp2-i386.box", + "output": "builds/{{user `box_basename`}}.{{.Provider}}.box", "type": "vagrant" } ], "provisioners": [ + { + "destination": "/tmp/bento-metadata.json", + "source": "{{user `metadata`}}", + "type": "file" + }, { "environment_vars": [], "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh '{{.Path}}'", "scripts": [ + "scripts/common/metadata.sh", "scripts/common/sshd.sh", "scripts/common/vagrant.sh", "scripts/common/vmtools.sh", @@ -135,7 +141,15 @@ } ], "variables": { - "mirror": "http://cdn2.novell.com/prot/FkjGyLMMiss~" + "arch": "32", + "box_basename": "sles-11-sp2-i386", + "build_timestamp": "{{isotime \"20060102150405\"}}", + "git_revision": "__unknown_git_revision__", + "metadata": "floppy/dummy_metadata.json", + "mirror": "http://cdn2.novell.com/prot/FkjGyLMMiss~", + "name": "sles-11-sp2-i386", + "template": "sles-11-sp2-i386", + "version": "2.0.TIMESTAMP" } } diff --git a/sles-11-sp2-x86_64.json b/sles-11-sp2-x86_64.json index 0d37148ca..91af54993 100644 --- a/sles-11-sp2-x86_64.json +++ b/sles-11-sp2-x86_64.json @@ -114,15 +114,21 @@ ], "post-processors": [ { - "output": "builds/{{.Provider}}/opscode_sles-11sp2.box", + "output": "builds/{{user `box_basename`}}.{{.Provider}}.box", "type": "vagrant" } ], "provisioners": [ + { + "destination": "/tmp/bento-metadata.json", + "source": "{{user `metadata`}}", + "type": "file" + }, { "environment_vars": [], "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh '{{.Path}}'", "scripts": [ + "scripts/common/metadata.sh", "scripts/common/sshd.sh", "scripts/common/vagrant.sh", "scripts/common/vmtools.sh", @@ -134,7 +140,15 @@ } ], "variables": { - "mirror": "http://cdn.novell.com/free/h0AOp5AT-18~" + "arch": "64", + "box_basename": "sles-11-sp2", + "build_timestamp": "{{isotime \"20060102150405\"}}", + "git_revision": "__unknown_git_revision__", + "metadata": "floppy/dummy_metadata.json", + "mirror": "http://cdn.novell.com/free/h0AOp5AT-18~", + "name": "sles-11-sp2", + "template": "sles-11-sp2-x86_64", + "version": "2.0.TIMESTAMP" } } diff --git a/sles-11-sp3-i386.json b/sles-11-sp3-i386.json index 8b5d04ead..9e0177fda 100644 --- a/sles-11-sp3-i386.json +++ b/sles-11-sp3-i386.json @@ -114,15 +114,21 @@ ], "post-processors": [ { - "output": "builds/{{.Provider}}/opscode_sles-11sp3-i386.box", + "output": "builds/{{user `box_basename`}}.{{.Provider}}.box", "type": "vagrant" } ], "provisioners": [ + { + "destination": "/tmp/bento-metadata.json", + "source": "{{user `metadata`}}", + "type": "file" + }, { "environment_vars": [], "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh '{{.Path}}'", "scripts": [ + "scripts/common/metadata.sh", "scripts/common/sshd.sh", "scripts/common/vagrant.sh", "scripts/common/vmtools.sh", @@ -135,7 +141,15 @@ } ], "variables": { - "mirror": "http://cdn2.novell.com/prot/4uiuDMzX0ck~" + "arch": "32", + "box_basename": "sles-11-sp3-i386", + "build_timestamp": "{{isotime \"20060102150405\"}}", + "git_revision": "__unknown_git_revision__", + "metadata": "floppy/dummy_metadata.json", + "mirror": "http://cdn2.novell.com/prot/4uiuDMzX0ck~", + "name": "sles-11-sp3-i386", + "template": "sles-11-sp3-i386", + "version": "2.0.TIMESTAMP" } } diff --git a/sles-11-sp3-x86_64.json b/sles-11-sp3-x86_64.json index 0b7251fc6..418dfc5ea 100644 --- a/sles-11-sp3-x86_64.json +++ b/sles-11-sp3-x86_64.json @@ -114,15 +114,21 @@ ], "post-processors": [ { - "output": "builds/{{.Provider}}/opscode_sles-11sp3.box", + "output": "builds/{{user `box_basename`}}.{{.Provider}}.box", "type": "vagrant" } ], "provisioners": [ + { + "destination": "/tmp/bento-metadata.json", + "source": "{{user `metadata`}}", + "type": "file" + }, { "environment_vars": [], "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh '{{.Path}}'", "scripts": [ + "scripts/common/metadata.sh", "scripts/common/sshd.sh", "scripts/common/vagrant.sh", "scripts/common/vmtools.sh", @@ -135,7 +141,15 @@ } ], "variables": { - "mirror": "http://cdn2.novell.com/prot/Q_VbW21BiB4~" + "arch": "64", + "box_basename": "sles-11-sp3", + "build_timestamp": "{{isotime \"20060102150405\"}}", + "git_revision": "__unknown_git_revision__", + "metadata": "floppy/dummy_metadata.json", + "mirror": "http://cdn2.novell.com/prot/Q_VbW21BiB4~", + "name": "sles-11-sp3", + "template": "sles-11-sp3-x86_64", + "version": "2.0.TIMESTAMP" } } diff --git a/sles-12-x86_64.json b/sles-12-x86_64.json index 0e88db7d7..2cbe098fa 100644 --- a/sles-12-x86_64.json +++ b/sles-12-x86_64.json @@ -114,15 +114,21 @@ ], "post-processors": [ { - "output": "builds/{{.Provider}}/opscode_sles-12.box", + "output": "builds/{{user `box_basename`}}.{{.Provider}}.box", "type": "vagrant" } ], "provisioners": [ + { + "destination": "/tmp/bento-metadata.json", + "source": "{{user `metadata`}}", + "type": "file" + }, { "environment_vars": [], "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh '{{.Path}}'", "scripts": [ + "scripts/common/metadata.sh", "scripts/common/sshd.sh", "scripts/common/vagrant.sh", "scripts/sles/unsupported-modules.sh", @@ -137,7 +143,15 @@ } ], "variables": { - "mirror": "http://cdn2.novell.com/prot/Q_VbW21BiB4~" + "arch": "64", + "box_basename": "sles-12", + "build_timestamp": "{{isotime \"20060102150405\"}}", + "git_revision": "__unknown_git_revision__", + "metadata": "floppy/dummy_metadata.json", + "mirror": "http://cdn2.novell.com/prot/Q_VbW21BiB4~", + "name": "sles-12", + "template": "sles-12-x86_64", + "version": "2.0.TIMESTAMP" } } diff --git a/solaris-10.11-x86.json b/solaris-10.11-x86.json index cbaa660e9..c4a322bb6 100644 --- a/solaris-10.11-x86.json +++ b/solaris-10.11-x86.json @@ -94,14 +94,21 @@ ], "post-processors": [ { - "output": "builds/{{.Provider}}/opscode_solaris-10.11.box", + "output": "builds/{{user `box_basename`}}.{{.Provider}}.box", "type": "vagrant" } ], "provisioners": [ { + "destination": "/tmp/bento-metadata.json", + "source": "{{user `metadata`}}", + "type": "file" + }, + { + "environment_vars": [], "execute_command": "/usr/local/bin/sudo {{.Path}}", "scripts": [ + "scripts/common/metadata.sh", "scripts/solaris10/vmtools.sh", "scripts/solaris10/minimize.sh" ], @@ -109,9 +116,17 @@ } ], "variables": { - "DOWNLOAD_SITE": "http://www.oracle.com/technetwork/server-storage/solaris10/downloads/index.html", - "README": "You must download the automated installer iso from the following page, and then place it somewhere that packer can fetch it", - "mirror": "./packer_cache" + "_DOWNLOAD_SITE": "http://www.oracle.com/technetwork/server-storage/solaris10/downloads/index.html", + "_README": "You must download the automated installer iso from the following page, and then place it somewhere that packer can fetch it", + "arch": "64", + "box_basename": "solaris-10.11", + "build_timestamp": "{{isotime \"20060102150405\"}}", + "git_revision": "__unknown_git_revision__", + "metadata": "floppy/dummy_metadata.json", + "mirror": "./packer_cache", + "name": "solaris-10.11", + "template": "solaris-10.11-x86", + "version": "2.0.TIMESTAMP" } } diff --git a/solaris-11-x86.json b/solaris-11-x86.json index f1f64cca5..22220f4bb 100644 --- a/solaris-11-x86.json +++ b/solaris-11-x86.json @@ -114,15 +114,21 @@ ], "post-processors": [ { - "output": "builds/{{.Provider}}/opscode_solaris-11.2.box", + "output": "builds/{{user `box_basename`}}.{{.Provider}}.box", "type": "vagrant" } ], "provisioners": [ + { + "destination": "/tmp/bento-metadata.json", + "source": "{{user `metadata`}}", + "type": "file" + }, { "environment_vars": [], "execute_command": "echo 'vagrant'|sudo -S bash {{.Path}}", "scripts": [ + "scripts/common/metadata.sh", "scripts/solaris/update.sh", "scripts/solaris/vmtools.sh", "scripts/common/vagrant.sh", @@ -132,9 +138,17 @@ } ], "variables": { - "DOWNLOAD_SITE": "http://www.oracle.com/technetwork/server-storage/solaris11/downloads/index.html", - "README": "You must download the automated installer iso from the following page, and then place it somewhere that packer can fetch it", - "mirror": "./packer_cache" + "_DOWNLOAD_SITE": "http://www.oracle.com/technetwork/server-storage/solaris11/downloads/index.html", + "_README": "You must download the automated installer iso from the following page, and then place it somewhere that packer can fetch it", + "arch": "64", + "box_basename": "solaris-11.2", + "build_timestamp": "{{isotime \"20060102150405\"}}", + "git_revision": "__unknown_git_revision__", + "metadata": "floppy/dummy_metadata.json", + "mirror": "./packer_cache", + "name": "solaris-11.2", + "template": "solaris-11.2-x86", + "version": "2.0.TIMESTAMP" } } diff --git a/ubuntu-10.04-amd64.json b/ubuntu-10.04-amd64.json index 2812c3192..4e90fbaff 100644 --- a/ubuntu-10.04-amd64.json +++ b/ubuntu-10.04-amd64.json @@ -165,15 +165,21 @@ ], "post-processors": [ { - "output": "builds/{{.Provider}}/opscode_ubuntu-10.04.box", + "output": "builds/{{user `box_basename`}}.{{.Provider}}.box", "type": "vagrant" } ], "provisioners": [ + { + "destination": "/tmp/bento-metadata.json", + "source": "{{user `metadata`}}", + "type": "file" + }, { "environment_vars": [], "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E bash '{{.Path}}'", "scripts": [ + "scripts/common/metadata.sh", "scripts/ubuntu/update.sh", "scripts/common/sshd.sh", "scripts/ubuntu/networking.sh", @@ -187,7 +193,15 @@ } ], "variables": { - "mirror": "http://releases.ubuntu.com" + "arch": "64", + "box_basename": "ubuntu-10.04", + "build_timestamp": "{{isotime \"20060102150405\"}}", + "git_revision": "__unknown_git_revision__", + "metadata": "floppy/dummy_metadata.json", + "mirror": "http://releases.ubuntu.com", + "name": "ubuntu-10.04", + "template": "ubuntu-10.04-amd64", + "version": "2.0.TIMESTAMP" } } diff --git a/ubuntu-10.04-i386.json b/ubuntu-10.04-i386.json index 916d93ef3..00b407b4b 100644 --- a/ubuntu-10.04-i386.json +++ b/ubuntu-10.04-i386.json @@ -165,15 +165,21 @@ ], "post-processors": [ { - "output": "builds/{{.Provider}}/opscode_ubuntu-10.04-i386.box", + "output": "builds/{{user `box_basename`}}.{{.Provider}}.box", "type": "vagrant" } ], "provisioners": [ + { + "destination": "/tmp/bento-metadata.json", + "source": "{{user `metadata`}}", + "type": "file" + }, { "environment_vars": [], "execute_command": "echo 'vagrant'|{{.Vars}} sudo -S -E bash '{{.Path}}'", "scripts": [ + "scripts/common/metadata.sh", "scripts/ubuntu/update.sh", "scripts/common/sshd.sh", "scripts/ubuntu/networking.sh", @@ -187,7 +193,15 @@ } ], "variables": { - "mirror": "http://releases.ubuntu.com" + "arch": "32", + "box_basename": "ubuntu-10.04-i386", + "build_timestamp": "{{isotime \"20060102150405\"}}", + "git_revision": "__unknown_git_revision__", + "metadata": "floppy/dummy_metadata.json", + "mirror": "http://releases.ubuntu.com", + "name": "ubuntu-10.04-i386", + "template": "ubuntu-10.04-i386", + "version": "2.0.TIMESTAMP" } } diff --git a/ubuntu-12.04-amd64.json b/ubuntu-12.04-amd64.json index 0f42752af..abf4b4ab8 100644 --- a/ubuntu-12.04-amd64.json +++ b/ubuntu-12.04-amd64.json @@ -165,15 +165,21 @@ ], "post-processors": [ { - "output": "builds/{{.Provider}}/opscode_ubuntu-12.04.box", + "output": "builds/{{user `box_basename`}}.{{.Provider}}.box", "type": "vagrant" } ], "provisioners": [ + { + "destination": "/tmp/bento-metadata.json", + "source": "{{user `metadata`}}", + "type": "file" + }, { "environment_vars": [], "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E bash '{{.Path}}'", "scripts": [ + "scripts/common/metadata.sh", "scripts/ubuntu/update.sh", "scripts/common/sshd.sh", "scripts/ubuntu/networking.sh", @@ -187,7 +193,15 @@ } ], "variables": { - "mirror": "http://releases.ubuntu.com" + "arch": "64", + "box_basename": "ubuntu-12.04", + "build_timestamp": "{{isotime \"20060102150405\"}}", + "git_revision": "__unknown_git_revision__", + "metadata": "floppy/dummy_metadata.json", + "mirror": "http://releases.ubuntu.com", + "name": "ubuntu-12.04", + "template": "ubuntu-12.04-amd64", + "version": "2.0.TIMESTAMP" } } diff --git a/ubuntu-12.04-i386.json b/ubuntu-12.04-i386.json index 3248d1731..dfb225379 100644 --- a/ubuntu-12.04-i386.json +++ b/ubuntu-12.04-i386.json @@ -134,9 +134,9 @@ "disk_size": 40960, "guest_os_type": "ubuntu", "http_directory": "http", - "iso_checksum": "3bae12e315c89d42d7bf571e4e35efce585c7624", + "iso_checksum": "a34c224b7fe72a2f5c768be5afee5c53817743fd", "iso_checksum_type": "sha1", - "iso_url": "{{user `mirror`}}/12.04.5/ubuntu-12.04.4-server-i386.iso", + "iso_url": "{{user `mirror`}}/12.04.5/ubuntu-12.04.5-server-i386.iso", "output_directory": "packer-ubuntu-12.04-i386-parallels", "parallels_tools_flavor": "lin", "prlctl": [ @@ -165,15 +165,21 @@ ], "post-processors": [ { - "output": "builds/{{.Provider}}/opscode_ubuntu-12.04-i386.box", + "output": "builds/{{user `box_basename`}}.{{.Provider}}.box", "type": "vagrant" } ], "provisioners": [ + { + "destination": "/tmp/bento-metadata.json", + "source": "{{user `metadata`}}", + "type": "file" + }, { "environment_vars": [], "execute_command": "echo 'vagrant'|{{.Vars}} sudo -S -E bash '{{.Path}}'", "scripts": [ + "scripts/common/metadata.sh", "scripts/ubuntu/update.sh", "scripts/common/sshd.sh", "scripts/ubuntu/networking.sh", @@ -187,7 +193,15 @@ } ], "variables": { - "mirror": "http://releases.ubuntu.com" + "arch": "32", + "box_basename": "ubuntu-12.04-i386", + "build_timestamp": "{{isotime \"20060102150405\"}}", + "git_revision": "__unknown_git_revision__", + "metadata": "floppy/dummy_metadata.json", + "mirror": "http://releases.ubuntu.com", + "name": "ubuntu-12.04-i386", + "template": "ubuntu-12.04-i386", + "version": "2.0.TIMESTAMP" } } diff --git a/ubuntu-14.04-amd64.json b/ubuntu-14.04-amd64.json index bc8fe7249..2d6eb149d 100644 --- a/ubuntu-14.04-amd64.json +++ b/ubuntu-14.04-amd64.json @@ -165,15 +165,21 @@ ], "post-processors": [ { - "output": "builds/{{.Provider}}/opscode_ubuntu-14.04.box", + "output": "builds/{{user `box_basename`}}.{{.Provider}}.box", "type": "vagrant" } ], "provisioners": [ + { + "destination": "/tmp/bento-metadata.json", + "source": "{{user `metadata`}}", + "type": "file" + }, { "environment_vars": [], "execute_command": "echo 'vagrant'|{{.Vars}} sudo -S -E bash '{{.Path}}'", "scripts": [ + "scripts/common/metadata.sh", "scripts/ubuntu/update.sh", "scripts/common/sshd.sh", "scripts/ubuntu/networking.sh", @@ -187,7 +193,15 @@ } ], "variables": { - "mirror": "http://releases.ubuntu.com" + "arch": "64", + "box_basename": "ubuntu-14.04", + "build_timestamp": "{{isotime \"20060102150405\"}}", + "git_revision": "__unknown_git_revision__", + "metadata": "floppy/dummy_metadata.json", + "mirror": "http://releases.ubuntu.com", + "name": "ubuntu-14.04", + "template": "ubuntu-14.04-amd64", + "version": "2.0.TIMESTAMP" } } diff --git a/ubuntu-14.04-i386.json b/ubuntu-14.04-i386.json index 8b77a116d..7ff01ae74 100644 --- a/ubuntu-14.04-i386.json +++ b/ubuntu-14.04-i386.json @@ -165,15 +165,21 @@ ], "post-processors": [ { - "output": "builds/{{.Provider}}/opscode_ubuntu-14.04-i386.box", + "output": "builds/{{user `box_basename`}}.{{.Provider}}.box", "type": "vagrant" } ], "provisioners": [ + { + "destination": "/tmp/bento-metadata.json", + "source": "{{user `metadata`}}", + "type": "file" + }, { "environment_vars": [], "execute_command": "echo 'vagrant'|{{.Vars}} sudo -S -E bash '{{.Path}}'", "scripts": [ + "scripts/common/metadata.sh", "scripts/ubuntu/update.sh", "scripts/common/sshd.sh", "scripts/ubuntu/networking.sh", @@ -187,7 +193,16 @@ } ], "variables": { - "mirror": "http://releases.ubuntu.com" + "arch": "32", + "box_basename": "ubuntu-14.04-i386", + "build_timestamp": "{{isotime \"20060102150405\"}}", + "chef_version": "provisionerless", + "git_revision": "__unknown_git_revision__", + "metadata": "floppy/dummy_metadata.json", + "mirror": "http://releases.ubuntu.com", + "name": "ubuntu-14.04-i386", + "template": "ubuntu-14.04-i386", + "version": "2.0.TIMESTAMP" } } diff --git a/ubuntu-14.10-amd64.json b/ubuntu-14.10-amd64.json index 14d679680..270366944 100644 --- a/ubuntu-14.10-amd64.json +++ b/ubuntu-14.10-amd64.json @@ -165,15 +165,21 @@ ], "post-processors": [ { - "output": "builds/{{.Provider}}/opscode_ubuntu-14.10.box", + "output": "builds/{{user `box_basename`}}.{{.Provider}}.box", "type": "vagrant" } ], "provisioners": [ + { + "destination": "/tmp/bento-metadata.json", + "source": "{{user `metadata`}}", + "type": "file" + }, { "environment_vars": [], "execute_command": "echo 'vagrant'|{{.Vars}} sudo -S -E bash '{{.Path}}'", "scripts": [ + "scripts/common/metadata.sh", "scripts/ubuntu/update.sh", "scripts/common/sshd.sh", "scripts/ubuntu/networking.sh", @@ -187,7 +193,15 @@ } ], "variables": { - "mirror": "http://releases.ubuntu.com" + "arch": "64", + "box_basename": "ubuntu-14.10", + "build_timestamp": "{{isotime \"20060102150405\"}}", + "git_revision": "__unknown_git_revision__", + "metadata": "floppy/dummy_metadata.json", + "mirror": "http://releases.ubuntu.com", + "name": "ubuntu-14.10", + "template": "ubuntu-14.10-amd64", + "version": "2.0.TIMESTAMP" } } diff --git a/ubuntu-14.10-i386.json b/ubuntu-14.10-i386.json index 2bc4d6598..e8592a806 100644 --- a/ubuntu-14.10-i386.json +++ b/ubuntu-14.10-i386.json @@ -165,15 +165,21 @@ ], "post-processors": [ { - "output": "builds/{{.Provider}}/opscode_ubuntu-14.10-i386.box", + "output": "builds/{{user `box_basename`}}.{{.Provider}}.box", "type": "vagrant" } ], "provisioners": [ + { + "destination": "/tmp/bento-metadata.json", + "source": "{{user `metadata`}}", + "type": "file" + }, { "environment_vars": [], "execute_command": "echo 'vagrant'|{{.Vars}} sudo -S -E bash '{{.Path}}'", "scripts": [ + "scripts/common/metadata.sh", "scripts/ubuntu/update.sh", "scripts/common/sshd.sh", "scripts/ubuntu/networking.sh", @@ -187,7 +193,15 @@ } ], "variables": { - "mirror": "http://releases.ubuntu.com" + "arch": "32", + "box_basename": "ubuntu-14.10-i386", + "build_timestamp": "{{isotime \"20060102150405\"}}", + "git_revision": "__unknown_git_revision__", + "metadata": "floppy/dummy_metadata.json", + "mirror": "http://releases.ubuntu.com", + "name": "ubuntu-14.10-i386", + "template": "ubuntu-14.10-i386", + "version": "2.0.TIMESTAMP" } } From 0fd6e2f9108b852ac9deb5169938639fc62d8e5e Mon Sep 17 00:00:00 2001 From: Mattias Giese <giese@b1-systems.de> Date: Thu, 18 Jun 2015 17:09:10 +0200 Subject: [PATCH 0336/1622] Minimized AutoYaST profiles for SLES 11.3/12 to enhance readability --- http/sles-11/sles-11-sp3-i386-autoinst.xml | 2390 +----------------- http/sles-11/sles-11-sp3-x86_64-autoinst.xml | 2390 +----------------- http/sles-12/sles-12-x86_64-autoinst.xml | 675 +---- 3 files changed, 26 insertions(+), 5429 deletions(-) diff --git a/http/sles-11/sles-11-sp3-i386-autoinst.xml b/http/sles-11/sles-11-sp3-i386-autoinst.xml index 2cd9ab95a..38f6040dd 100644 --- a/http/sles-11/sles-11-sp3-i386-autoinst.xml +++ b/http/sles-11/sles-11-sp3-i386-autoinst.xml @@ -3,92 +3,14 @@ <profile xmlns="http://www.suse.com/1.0/yast2ns" xmlns:config="http://www.suse.com/1.0/configns"> <add-on> <add_on_products config:type="list"> - <listentry> + <!-- should not be neccessary for a minimal installation --> + <!-- <listentry> <media_url><![CDATA[http://demeter.uni-regensburg.de/SLE11SP3-SDK-x86/DVD1/]]></media_url> <product>sle-sdk</product> <product_dir>/</product_dir> - </listentry> + </listentry> --> </add_on_products> </add-on> - <bootloader> - <device_map config:type="list"> - <device_map_entry> - <firmware>hd0</firmware> - <linux>/dev/sda</linux> - </device_map_entry> - </device_map> - <global> - <activate>true</activate> - <boot_root>true</boot_root> - <default>SUSE Linux Enterprise Server 11 SP3 - 3.0.76-0.11</default> - <generic_mbr>true</generic_mbr> - <gfxmenu>/boot/message</gfxmenu> - <lines_cache_id>2</lines_cache_id> - <timeout config:type="integer">8</timeout> - </global> - <initrd_modules config:type="list"> - <initrd_module> - <module>ahci</module> - </initrd_module> - <initrd_module> - <module>ata_piix</module> - </initrd_module> - <initrd_module> - <module>ata_generic</module> - </initrd_module> - <initrd_module> - <module>jbd</module> - </initrd_module> - <initrd_module> - <module>mbcache</module> - </initrd_module> - <initrd_module> - <module>ext3</module> - </initrd_module> - </initrd_modules> - <loader_type>grub</loader_type> - <sections config:type="list"> - <section> - <append>resume=/dev/sda1 splash=silent crashkernel=128M-:64M showopts</append> - <image>(hd0,1)/boot/vmlinuz-3.0.76-0.11-default</image> - <initial>1</initial> - <initrd>(hd0,1)/boot/initrd-3.0.76-0.11-default</initrd> - <lines_cache_id>0</lines_cache_id> - <name>SUSE Linux Enterprise Server 11 SP3 - 3.0.76-0.11</name> - <original_name>linux</original_name> - <root>/dev/sda2</root> - <type>image</type> - <vgamode>0x314</vgamode> - </section> - <section> - <append>showopts ide=nodma apm=off noresume edd=off powersaved=off nohz=off highres=off processor.max_cstate=1 nomodeset x11failsafe</append> - <image>(hd0,1)/boot/vmlinuz-3.0.76-0.11-default</image> - <initrd>(hd0,1)/boot/initrd-3.0.76-0.11-default</initrd> - <lines_cache_id>1</lines_cache_id> - <name>Failsafe -- SUSE Linux Enterprise Server 11 SP3 - 3.0.76-0.11</name> - <original_name>failsafe</original_name> - <root>/dev/sda2</root> - <type>image</type> - <vgamode>0x314</vgamode> - </section> - </sections> - </bootloader> - <ca_mgm> - <CAName>YaST_Default_CA</CAName> - <ca_commonName>YaST Default CA (vagrant-sles-11sp3-x86)</ca_commonName> - <country>US</country> - <locality></locality> - <organisation></organisation> - <organisationUnit></organisationUnit> - <password>ENTER PASSWORD HERE</password> - <server_commonName>vagrant-sles-11sp3-x86.vagrantup.com</server_commonName> - <server_email>postmaster@vagrantup.com</server_email> - <state></state> - <takeLocalServerName config:type="boolean">false</takeLocalServerName> - </ca_mgm> - <deploy_image> - <image_installation config:type="boolean">false</image_installation> - </deploy_image> <general> <ask-list config:type="list"/> <mode> @@ -108,390 +30,6 @@ </signature-handling> <storage/> </general> - <groups config:type="list"> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>100</gid> - <group_password>x</group_password> - <groupname>users</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>19</gid> - <group_password>x</group_password> - <groupname>floppy</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>1</gid> - <group_password>x</group_password> - <groupname>bin</groupname> - <userlist>daemon</userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>41</gid> - <group_password>x</group_password> - <groupname>xok</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>65533</gid> - <group_password>x</group_password> - <groupname>nobody</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>43</gid> - <group_password>x</group_password> - <groupname>modem</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>5</gid> - <group_password>x</group_password> - <groupname>tty</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>7</gid> - <group_password>x</group_password> - <groupname>lp</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>104</gid> - <group_password>!</group_password> - <groupname>uuidd</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>51</gid> - <group_password>!</group_password> - <groupname>postfix</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>112</gid> - <group_password>!</group_password> - <groupname>gdm</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>65534</gid> - <group_password>x</group_password> - <groupname>nogroup</groupname> - <userlist>nobody</userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>101</gid> - <group_password>!</group_password> - <groupname>messagebus</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>59</gid> - <group_password>!</group_password> - <groupname>maildrop</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>33</gid> - <group_password>x</group_password> - <groupname>video</groupname> - <userlist>vagrant</userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>3</gid> - <group_password>x</group_password> - <groupname>sys</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>15</gid> - <group_password>x</group_password> - <groupname>shadow</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>20</gid> - <group_password>x</group_password> - <groupname>cdrom</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>21</gid> - <group_password>x</group_password> - <groupname>console</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>42</gid> - <group_password>x</group_password> - <groupname>trusted</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>102</gid> - <group_password>!</group_password> - <groupname>haldaemon</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>106</gid> - <group_password>!</group_password> - <groupname>puppet</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>16</gid> - <group_password>x</group_password> - <groupname>dialout</groupname> - <userlist>vagrant</userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>107</gid> - <group_password>!</group_password> - <groupname>polkituser</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>10</gid> - <group_password>x</group_password> - <groupname>wheel</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>109</gid> - <group_password>!</group_password> - <groupname>pulse</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>8</gid> - <group_password>x</group_password> - <groupname>www</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>40</gid> - <group_password>x</group_password> - <groupname>games</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>6</gid> - <group_password>x</group_password> - <groupname>disk</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>17</gid> - <group_password>x</group_password> - <groupname>audio</groupname> - <userlist>pulse</userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>111</gid> - <group_password>!</group_password> - <groupname>suse-ncc</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>49</gid> - <group_password>x</group_password> - <groupname>ftp</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>103</gid> - <group_password>!</group_password> - <groupname>tape</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>25</gid> - <group_password>!</group_password> - <groupname>at</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>9</gid> - <group_password>x</group_password> - <groupname>kmem</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>32</gid> - <group_password>x</group_password> - <groupname>public</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>12</gid> - <group_password>x</group_password> - <groupname>mail</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>0</gid> - <group_password>x</group_password> - <groupname>root</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>2</gid> - <group_password>x</group_password> - <groupname>daemon</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>105</gid> - <group_password>!</group_password> - <groupname>sfcb</groupname> - <userlist>root</userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>108</gid> - <group_password>!</group_password> - <groupname>ntp</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>14</gid> - <group_password>x</group_password> - <groupname>uucp</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>110</gid> - <group_password>!</group_password> - <groupname>pulse-access</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>71</gid> - <group_password>!</group_password> - <groupname>ntadmin</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>62</gid> - <group_password>x</group_password> - <groupname>man</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>22</gid> - <group_password>x</group_password> - <groupname>utmp</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>13</gid> - <group_password>x</group_password> - <groupname>news</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>65</gid> - <group_password>!</group_password> - <groupname>sshd</groupname> - <userlist></userlist> - </group> - </groups> - <host> - <hosts config:type="list"> - <hosts_entry> - <host_address>127.0.0.1</host_address> - <names config:type="list"> - <name>localhost</name> - </names> - </hosts_entry> - <hosts_entry> - <host_address>::1</host_address> - <names config:type="list"> - <name>localhost ipv6-localhost ipv6-loopback</name> - </names> - </hosts_entry> - <hosts_entry> - <host_address>fe00::0</host_address> - <names config:type="list"> - <name>ipv6-localnet</name> - </names> - </hosts_entry> - <hosts_entry> - <host_address>ff00::0</host_address> - <names config:type="list"> - <name>ipv6-mcastprefix</name> - </names> - </hosts_entry> - <hosts_entry> - <host_address>ff02::1</host_address> - <names config:type="list"> - <name>ipv6-allnodes</name> - </names> - </hosts_entry> - <hosts_entry> - <host_address>ff02::2</host_address> - <names config:type="list"> - <name>ipv6-allrouters</name> - </names> - </hosts_entry> - <hosts_entry> - <host_address>ff02::3</host_address> - <names config:type="list"> - <name>ipv6-allhosts</name> - </names> - </hosts_entry> - </hosts> - </host> <login_settings/> <networking> <dhcp_options> @@ -524,7 +62,6 @@ </networking> <partitioning config:type="list"> <drive> - <device>/dev/sda</device> <initialize config:type="boolean">true</initialize> <partitions config:type="list"> <partition> @@ -588,1542 +125,19 @@ <software> <packages config:type="list"> - <package>desktop-translations</package> - <package>gconf2-branding-SLES</package> - <package>libproxy0-config-gnome</package> - <package>sle-sdk-release</package> - <package>sle-sdk-release-SDK</package> - <package>sles-manuals_en</package> - <package>yast2-trans-en_US</package> + <package>openssh</package> + <package>kernel-default-devel</package> + <package>sudo</package> + <package>gcc</package> + <package>wget</package> + <package>make</package> </packages> <patterns config:type="list"> - <pattern>Basis-Devel</pattern> <pattern>Minimal</pattern> <pattern>apparmor</pattern> - <pattern>base</pattern> - <pattern>sdk_kernel</pattern> </patterns> <remove-packages config:type="list"> - <package>3ddiag</package> - <package>CASA</package> - <package>CASA-devel</package> - <package>CASA_auth_token_client</package> - <package>CASA_auth_token_client-devel</package> - <package>ConsoleKit-devel</package> - <package>ConsoleKit-x11</package> - <package>DirectFB-devel</package> - <package>FastCGI</package> - <package>IlmBase</package> - <package>IlmBase-devel</package> - <package>ImageMagick</package> - <package>ImageMagick-devel</package> - <package>LibVNCServer</package> - <package>LibVNCServer-devel</package> - <package>Mesa</package> - <package>Mesa-devel</package> - <package>ModemManager</package> - <package>Modules</package> - <package>NetworkManager</package> - <package>NetworkManager-devel</package> - <package>NetworkManager-glib</package> - <package>NetworkManager-gnome</package> - <package>NetworkManager-kde4</package> - <package>NetworkManager-kde4-lang</package> - <package>NetworkManager-kde4-libs</package> - <package>OpenEXR</package> - <package>OpenEXR-devel</package> - <package>OpenIPMI-devel</package> - <package>PackageKit</package> - <package>PackageKit-devel</package> - <package>PackageKit-lang</package> - <package>PolicyKit-devel</package> - <package>PolicyKit-gnome</package> - <package>PolicyKit-gnome-devel</package> - <package>PolicyKit-gnome-libs</package> - <package>SDL-devel</package> - <package>SDL_net</package> - <package>SDL_net-devel</package> - <package>TeX-Guy</package> - <package>TeX-Guy-devel</package> - <package>VFlib3</package> - <package>VFlib3-devel</package> - <package>WindowMaker</package> - <package>WindowMaker-devel</package> - <package>a2ps</package> - <package>aalib</package> - <package>aalib-devel</package> - <package>akonadi-runtime</package> - <package>akregator</package> - <package>alsa-devel</package> - <package>alsa-firmware</package> - <package>alsa-plugins-pulse</package> - <package>alsa-tools</package> - <package>alsa-tools-devel</package> - <package>anthy</package> - <package>anthy-devel</package> - <package>antlr</package> - <package>apache2</package> - <package>apache2-devel</package> - <package>apache2-mod_perl</package> - <package>apache2-mod_perl-devel</package> - <package>apache2-prefork</package> - <package>apache2-utils</package> - <package>apache2-worker</package> - <package>apparmor-profile-editor</package> - <package>art-sharp2</package> - <package>arts</package> - <package>arts-devel</package> - <package>aspell-devel</package> - <package>at-spi</package> - <package>at-spi-devel</package> - <package>at-spi-lang</package> - <package>atk-devel</package> - <package>audiofile</package> - <package>audiofile-devel</package> - <package>audit-devel</package> - <package>augeas-lenses</package> - <package>automoc4</package> - <package>avahi</package> - <package>avahi-compat-howl-devel</package> - <package>avahi-compat-mDNSResponder-devel</package> - <package>avahi-lang</package> - <package>babl-0_0</package> - <package>banshee-1</package> - <package>banshee-1-backend-engine-gstreamer</package> - <package>banshee-1-backend-platform-gnome</package> - <package>banshee-1-backend-platform-unix</package> - <package>banshee-1-devel</package> - <package>banshee-1-extensions-default</package> - <package>banshee-1-lang</package> - <package>beagle-devel</package> - <package>bind-devel</package> - <package>binutils-devel</package> - <package>bluez</package> - <package>bluez-devel</package> - <package>boo</package> - <package>boo-devel</package> - <package>boost-devel</package> - <package>bootsplash-branding-SLED</package> - <package>cairo-devel</package> - <package>cairomm</package> - <package>cairomm-devel</package> - <package>canna</package> - <package>canna-devel</package> - <package>canna-libs</package> - <package>cannadic</package> - <package>capi4linux</package> - <package>capi4linux-devel</package> - <package>cdk</package> - <package>cdk-devel</package> - <package>cdrdao</package> - <package>chasen</package> - <package>chasen-devel</package> - <package>check</package> - <package>check-devel</package> - <package>chmlib</package> - <package>chmlib-devel</package> - <package>cim-schema</package> - <package>clucene-core</package> - <package>clucene-core-devel</package> - <package>cmake</package> - <package>compiz</package> - <package>compiz-branding-SLE</package> - <package>compiz-devel</package> - <package>compiz-gnome</package> - <package>coolkey-devel</package> - <package>cracklib-devel</package> - <package>crash-devel</package> - <package>crimson</package> - <package>cscope</package> - <package>cups</package> - <package>cups-devel</package> - <package>cvsps</package> - <package>cyrus-imapd-devel</package> - <package>cyrus-sasl-crammd5</package> - <package>cyrus-sasl-devel</package> - <package>dante</package> - <package>dante-devel</package> - <package>db1</package> - <package>db1-devel</package> - <package>db43</package> - <package>db43-devel</package> - <package>dbus-1-devel</package> - <package>dbus-1-glib-devel</package> - <package>dbus-1-python-devel</package> - <package>dbus-1-qt3</package> - <package>dbus-1-qt3-devel</package> - <package>dbus-1-x11</package> - <package>dejagnu</package> - <package>dejavu</package> - <package>desktop-data-openSUSE</package> - <package>desktop-file-utils</package> - <package>devhelp</package> - <package>devhelp-devel</package> - <package>devhelp-lang</package> - <package>device-mapper-devel</package> - <package>dhcp</package> - <package>dhcp-client</package> - <package>dhcp-devel</package> - <package>diffstat</package> - <package>dmapi-devel</package> - <package>dnsmasq</package> - <package>docbook-xsl-stylesheets</package> - <package>docbook_4</package> - <package>doxygen</package> - <package>dvd+rw-tools</package> - <package>e2fsprogs-devel</package> - <package>emacs</package> - <package>emacs-nox</package> - <package>emacs-x11</package> - <package>enchant</package> - <package>enchant-devel</package> - <package>enscript</package> - <package>eog</package> - <package>eog-devel</package> - <package>eog-lang</package> - <package>espeak</package> - <package>evince</package> - <package>evince-devel</package> - <package>evince-lang</package> - <package>evoldap2-devel</package> - <package>evolution</package> - <package>evolution-data-server</package> - <package>evolution-data-server-devel</package> - <package>evolution-data-server-lang</package> - <package>evolution-devel</package> - <package>evolution-lang</package> - <package>expect-devel</package> - <package>facter</package> - <package>fam</package> - <package>fam-devel</package> - <package>farsight</package> - <package>farsight-devel</package> - <package>festival</package> - <package>festival-devel</package> - <package>fftw</package> - <package>fftw-devel</package> - <package>fftw-mpi</package> - <package>fftw-mpi-devel</package> - <package>fftw-threads</package> - <package>fftw-threads-devel</package> - <package>fftw3</package> - <package>fftw3-devel</package> - <package>fftw3-threads</package> - <package>fftw3-threads-devel</package> - <package>file-devel</package> - <package>fileshareset</package> - <package>finch</package> - <package>finch-devel</package> - <package>flac-devel</package> - <package>fltk</package> - <package>fltk-devel</package> - <package>fontconfig-devel</package> - <package>fonts-config</package> - <package>foomatic-filters</package> - <package>freeglut</package> - <package>freeglut-devel</package> - <package>freeradius-client-devel</package> - <package>freeradius-client-libs</package> - <package>freeradius-server-devel</package> - <package>freeradius-server-libs</package> - <package>freetype</package> - <package>freetype2-devel</package> - <package>fribidi</package> - <package>fribidi-devel</package> - <package>ft2demos</package> - <package>fuse-devel</package> - <package>fwnn-devel</package> - <package>fxload</package> - <package>gcc-gij</package> - <package>gcc-java</package> - <package>gcc43-gij</package> - <package>gcc43-java</package> - <package>gconf-sharp2</package> - <package>gconf2-devel</package> - <package>gconfmm</package> - <package>gconfmm-devel</package> - <package>gd</package> - <package>gd-devel</package> - <package>gdbm-32bit</package> - <package>gdk-pixbuf</package> - <package>gdk-pixbuf-devel</package> - <package>gegl-0_0</package> - <package>gettext-tools</package> - <package>gfxboot-branding-SLED</package> - <package>gfxboot-devel</package> - <package>ggz</package> - <package>ggz-client-libs</package> - <package>ggz-client-libs-devel</package> - <package>ggz-client-libs-lang</package> - <package>ghex</package> - <package>ghex-devel</package> - <package>ghex-lang</package> - <package>ghostscript-devel</package> - <package>ghostscript-fonts-other</package> - <package>ghostscript-fonts-std</package> - <package>ghostscript-ijs-devel</package> - <package>ghostscript-library</package> - <package>ghostscript-omni</package> - <package>ghostscript-x11</package> - <package>giflib-devel</package> - <package>gimp</package> - <package>gimp-branding-SLED</package> - <package>gimp-devel</package> - <package>gimp-lang</package> - <package>gimp-plugins-python</package> - <package>git</package> - <package>git-arch</package> - <package>git-core</package> - <package>git-cvs</package> - <package>git-daemon</package> - <package>git-email</package> - <package>git-gui</package> - <package>git-svn</package> - <package>git-web</package> - <package>gitk</package> - <package>gjdoc</package> - <package>glade-sharp2</package> - <package>glade3</package> - <package>glade3-lang</package> - <package>glib</package> - <package>glib-devel</package> - <package>glib-sharp2</package> - <package>glib2-devel</package> - <package>glibmm2</package> - <package>glibmm2-devel</package> - <package>glitz</package> - <package>glitz-devel</package> - <package>gltt</package> - <package>gltt-devel</package> - <package>gmime-2_4-devel</package> - <package>gmime-devel</package> - <package>gmp-devel</package> - <package>gnet</package> - <package>gnet-devel</package> - <package>gnokii</package> - <package>gnokii-devel</package> - <package>gnokii-smsd</package> - <package>gnome-certauth-devel</package> - <package>gnome-control-center</package> - <package>gnome-control-center-devel</package> - <package>gnome-control-center-lang</package> - <package>gnome-desktop</package> - <package>gnome-desktop-devel</package> - <package>gnome-desktop-lang</package> - <package>gnome-doc-utils</package> - <package>gnome-doc-utils-devel</package> - <package>gnome-doc-utils-lang</package> - <package>gnome-keyring-devel</package> - <package>gnome-keyring-sharp</package> - <package>gnome-keyring-sharp-devel</package> - <package>gnome-libs</package> - <package>gnome-libs-devel</package> - <package>gnome-mag</package> - <package>gnome-mag-devel</package> - <package>gnome-mag-lang</package> - <package>gnome-main-menu</package> - <package>gnome-main-menu-lang</package> - <package>gnome-media</package> - <package>gnome-media-devel</package> - <package>gnome-media-lang</package> - <package>gnome-menus</package> - <package>gnome-menus-branding-SLED</package> - <package>gnome-menus-devel</package> - <package>gnome-menus-lang</package> - <package>gnome-mount</package> - <package>gnome-mount-lang</package> - <package>gnome-panel</package> - <package>gnome-panel-devel</package> - <package>gnome-panel-lang</package> - <package>gnome-pilot</package> - <package>gnome-pilot-devel</package> - <package>gnome-pilot-lang</package> - <package>gnome-settings-daemon</package> - <package>gnome-settings-daemon-devel</package> - <package>gnome-settings-daemon-lang</package> - <package>gnome-sharp2</package> - <package>gnome-speech</package> - <package>gnome-speech-devel</package> - <package>gnome-themes</package> - <package>gnome-utils</package> - <package>gnome-utils-devel</package> - <package>gnome-utils-lang</package> - <package>gnome-vfs-sharp2</package> - <package>gnome-vfs2</package> - <package>gnome-vfs2-devel</package> - <package>gnome-vfs2-lang</package> - <package>gnome-vfsmm</package> - <package>gnome-vfsmm-devel</package> - <package>gnopernicus</package> - <package>gnopernicus-devel</package> - <package>gnopernicus-lang</package> - <package>gnutls</package> - <package>goffice</package> - <package>goffice-devel</package> - <package>goffice-lang</package> - <package>goocanvas</package> - <package>goocanvas-devel</package> - <package>goocanvas-lang</package> - <package>goom2k4</package> - <package>goom2k4-devel</package> - <package>graphviz</package> - <package>graphviz-devel</package> - <package>graphviz-gd</package> - <package>graphviz-gnome</package> - <package>gstreamer-0_10</package> - <package>gstreamer-0_10-devel</package> - <package>gstreamer-0_10-lang</package> - <package>gstreamer-0_10-plugins-base</package> - <package>gstreamer-0_10-plugins-base-devel</package> - <package>gstreamer-0_10-plugins-base-lang</package> - <package>gstreamer-0_10-plugins-good</package> - <package>gstreamer-0_10-plugins-good-lang</package> - <package>gstreamer-0_10-utils</package> - <package>gstreamer-utils</package> - <package>gtk</package> - <package>gtk-devel</package> - <package>gtk-lang</package> - <package>gtk-sharp2</package> - <package>gtk-vnc-devel</package> - <package>gtk2-devel</package> - <package>gtkglext</package> - <package>gtkglext-devel</package> - <package>gtkhtml2</package> - <package>gtkhtml2-devel</package> - <package>gtkhtml2-lang</package> - <package>gtkhtml314-sharp</package> - <package>gtkmm2</package> - <package>gtkmm2-devel</package> - <package>gtksourceview-devel</package> - <package>gtksourceview-lang</package> - <package>gtksourceview18</package> - <package>gtksourceview18-devel</package> - <package>gtkspell</package> - <package>gtkspell-devel</package> - <package>gtkspell-lang</package> - <package>gucharmap</package> - <package>gucharmap-devel</package> - <package>gucharmap-lang</package> - <package>guile</package> - <package>guile-devel</package> - <package>gutenprint</package> - <package>gutenprint-devel</package> - <package>gvfs-devel</package> - <package>gxmhtml</package> - <package>hal-devel</package> - <package>hal-palm</package> - <package>htdig</package> - <package>htdig-devel</package> - <package>hunspell</package> - <package>hunspell-devel</package> - <package>hunspell-tools</package> - <package>hwinfo-devel</package> - <package>i4l-base</package> - <package>icewm</package> - <package>icewm-lite</package> - <package>id3lib</package> - <package>id3lib-devel</package> - <package>imap-devel</package> - <package>imap-lib</package> - <package>imlib</package> - <package>imlib-devel</package> - <package>imlib2</package> - <package>imlib2-devel</package> - <package>indent</package> - <package>info2html</package> - <package>inn</package> - <package>inn-devel</package> - <package>intltool</package> - <package>ipadic</package> - <package>iptables-devel</package> - <package>iso-codes</package> - <package>iso-codes-devel</package> - <package>iso_ent</package> - <package>ispell</package> - <package>ispell-american</package> - <package>ispell-brazilian</package> - <package>ispell-british</package> - <package>ispell-czech</package> - <package>ispell-danish</package> - <package>ispell-finnish</package> - <package>ispell-french</package> - <package>ispell-german</package> - <package>ispell-hungarian</package> - <package>ispell-italian</package> - <package>ispell-ngerman</package> - <package>ispell-norsk</package> - <package>ispell-polish</package> - <package>ispell-portuguese</package> - <package>ispell-russian</package> - <package>ispell-slovak</package> - <package>ispell-spanish</package> - <package>ispell-swedish</package> - <package>itcl-devel</package> - <package>java-1_4_2-ibm</package> - <package>java-1_4_2-ibm-devel</package> - <package>java-1_5_0-gcj-compat</package> - <package>java-1_5_0-gcj-compat-devel</package> - <package>java-1_6_0-ibm</package> - <package>java-1_6_0-ibm-devel</package> - <package>joe</package> - <package>jpackage-utils</package> - <package>k3b</package> - <package>k3b-devel</package> - <package>k3b-lang</package> - <package>kaddressbook</package> - <package>kalarm</package> - <package>kde-susetranslations</package> - <package>kde4-filesystem</package> - <package>kde4-kgreeter-plugins</package> - <package>kdebase3</package> - <package>kdebase3-devel</package> - <package>kdebase3-runtime</package> - <package>kdebase4-SLED</package> - <package>kdebase4-SLED-lang</package> - <package>kdebase4-runtime</package> - <package>kdebase4-runtime-branding-SLED</package> - <package>kdebase4-workspace</package> - <package>kdebase4-workspace-branding-SLED</package> - <package>kdebase4-workspace-devel</package> - <package>kdebase4-workspace-ksysguardd</package> - <package>kdelibs3</package> - <package>kdelibs3-arts</package> - <package>kdelibs3-default-style</package> - <package>kdelibs3-devel</package> - <package>kdelibs3-doc</package> - <package>kdelibs4</package> - <package>kdelibs4-branding-SLED</package> - <package>kdelibs4-core</package> - <package>kdelibs4-doc</package> - <package>kdemultimedia3-arts</package> - <package>kdepim3</package> - <package>kdepim4</package> - <package>kdepim4-devel</package> - <package>kdepimlibs4</package> - <package>kdialog</package> - <package>kdm</package> - <package>kdm-branding-SLED</package> - <package>kernel-docs</package> - <package>kernel-syms</package> - <package>kernel-trace-devel</package> - <package>kernel-xen-devel</package> - <package>keyutils-devel</package> - <package>kio_sysinfo</package> - <package>kio_sysinfo-branding-SLED</package> - <package>kmail</package> - <package>knode</package> - <package>kontact</package> - <package>korganizer</package> - <package>kpilot</package> - <package>krb5-devel</package> - <package>ksh-devel</package> - <package>ktorrent</package> - <package>ktorrent-devel</package> - <package>ktorrent-lang</package> - <package>kwin</package> - <package>ladspa-devel</package> - <package>lib3ds-1-3</package> - <package>lib3ds-devel</package> - <package>libFLAC++6</package> - <package>libFLAC8</package> - <package>libHX-devel</package> - <package>libMagick++-devel</package> - <package>libMagick++1</package> - <package>libMagickWand1</package> - <package>libQtWebKit-devel</package> - <package>libQtWebKit4</package> - <package>libXerces-c-devel</package> - <package>libXerces-c28</package> - <package>libXiterm</package> - <package>libXiterm-devel</package> - <package>libacl-devel</package> - <package>libadns-devel</package> - <package>libadns1</package> - <package>libakode</package> - <package>libakode-devel</package> - <package>libakonadi4</package> - <package>libakonadiprotocolinternals-devel</package> - <package>libakonadiprotocolinternals1</package> - <package>libao</package> - <package>libao-devel</package> - <package>libapparmor-devel</package> - <package>libapr-util1</package> - <package>libapr-util1-devel</package> - <package>libapr1</package> - <package>libapr1-devel</package> - <package>libarchive-devel</package> - <package>libart_lgpl</package> - <package>libart_lgpl-devel</package> - <package>libassuan-devel</package> - <package>libatomic-ops-devel</package> - <package>libattr-devel</package> - <package>libavahi-core5</package> - <package>libavahi-devel</package> - <package>libavahi-glib-devel</package> - <package>libavahi-gobject-devel</package> - <package>libavahi-gobject0</package> - <package>libavahi-ui0</package> - <package>libavc1394-0</package> - <package>libavc1394-devel</package> - <package>libbabl-0_0-0</package> - <package>libbeagle-devel</package> - <package>libbeagle-python</package> - <package>libbeagle1</package> - <package>libbitmask-devel</package> - <package>libbitmask1</package> - <package>libblkid-devel</package> - <package>libblocxx-devel</package> - <package>libbonobo</package> - <package>libbonobo-devel</package> - <package>libbonobo-lang</package> - <package>libbonoboui</package> - <package>libbonoboui-devel</package> - <package>libbonoboui-lang</package> - <package>libboost_date_time1_36_0</package> - <package>libboost_filesystem1_36_0</package> - <package>libboost_graph1_36_0</package> - <package>libboost_iostreams1_36_0</package> - <package>libboost_math1_36_0</package> - <package>libboost_mpi1_36_0</package> - <package>libboost_program_options1_36_0</package> - <package>libboost_python1_36_0</package> - <package>libboost_serialization1_36_0</package> - <package>libboost_signals1_36_0</package> - <package>libboost_system1_36_0</package> - <package>libboost_test1_36_0</package> - <package>libboost_thread1_36_0</package> - <package>libboost_wave1_36_0</package> - <package>libbotan-1_6_4</package> - <package>libbotan-devel</package> - <package>libbtctl</package> - <package>libbtctl-devel</package> - <package>libbtctl-lang</package> - <package>libbtctl4</package> - <package>libbz2-devel</package> - <package>libcaca</package> - <package>libcaca-devel</package> - <package>libcanberra-gtk</package> - <package>libcanberra-gtk0</package> - <package>libcanberra0</package> - <package>libcap-devel</package> - <package>libcap-ng0</package> - <package>libcdda_interface0</package> - <package>libcdda_paranoia0</package> - <package>libcddb-devel</package> - <package>libcddb2</package> - <package>libcdio++0</package> - <package>libcdio-devel</package> - <package>libcgroup-devel</package> - <package>libcgroup1</package> - <package>libchewing</package> - <package>libchewing-devel</package> - <package>libcmpiutil</package> - <package>libcmpiutil-devel</package> - <package>libcolorblind0</package> - <package>libcom_err-devel</package> - <package>libcompizconfig</package> - <package>libcompizconfig-devel</package> - <package>libcppunit-1_12-0</package> - <package>libcppunit-devel</package> - <package>libcpuset-devel</package> - <package>libcpuset1</package> - <package>libcroco</package> - <package>libcroco-0_6-3</package> - <package>libcroco-devel</package> - <package>libcryptsetup-devel</package> - <package>libcsync-devel</package> - <package>libcsync0</package> - <package>libcurl-devel</package> - <package>libdaemon-devel</package> - <package>libdaemon0</package> - <package>libdatrie-devel</package> - <package>libdatrie0</package> - <package>libdb-4_5-32bit</package> - <package>libdb-4_5-devel</package> - <package>libdbus-1-qt3-0</package> - <package>libdbus-1-qt3-0-devel</package> - <package>libdc1394-22</package> - <package>libdc1394-devel</package> - <package>libdc1394_control12</package> - <package>libdc1394_control12-devel</package> - <package>libdhcp6client-1_0-2</package> - <package>libdhcp6client-devel</package> - <package>libdigikam-devel</package> - <package>libdiscid1</package> - <package>libdjvulibre-devel</package> - <package>libdjvulibre21</package> - <package>libdmxview-devel</package> - <package>libdmxview0</package> - <package>libdnet-devel</package> - <package>libdnet1</package> - <package>libdns_sd</package> - <package>libdrm</package> - <package>libdrm-devel</package> - <package>libdv-devel</package> - <package>libdv4</package> - <package>libdvdread4</package> - <package>libdw-devel</package> - <package>libebl-devel</package> - <package>libedit-devel</package> - <package>libedit0</package> - <package>libelf-devel</package> - <package>libenchant1</package> - <package>libesd-devel</package> - <package>libesd0</package> - <package>libesmtp-devel</package> - <package>libevoldap-2_4-2</package> - <package>libevtlog-devel</package> - <package>libevtlog0</package> - <package>libexempi-devel</package> - <package>libexempi3</package> - <package>libexif-devel</package> - <package>libexiv2-4</package> - <package>libexiv2-devel</package> - <package>libexpat-devel</package> - <package>libext2fs-devel</package> - <package>libfarsight-0_1-3</package> - <package>libffi-devel</package> - <package>libffi43</package> - <package>libffi43-devel</package> - <package>libflaim-devel</package> - <package>libfprint-devel</package> - <package>libfreebl3</package> - <package>libfreebob</package> - <package>libfreebob-devel</package> - <package>libgadu</package> - <package>libgadu-devel</package> - <package>libgail-gnome</package> - <package>libgail-gnome-devel</package> - <package>libgcj-devel</package> - <package>libgcj43</package> - <package>libgcj43-devel</package> - <package>libgcj43-jar</package> - <package>libgcj_bc43</package> - <package>libgcrypt-devel</package> - <package>libgda-3_0-3</package> - <package>libgda-3_0-devel</package> - <package>libgdiplus0</package> - <package>libgegl-0_0-0</package> - <package>libgeoclue0</package> - <package>libgfortran46</package> - <package>libggz2</package> - <package>libggz2-devel</package> - <package>libgimpprint</package> - <package>libgimpprint-devel</package> - <package>libglade2</package> - <package>libglade2-devel</package> - <package>libglademm</package> - <package>libglademm-2_4-1</package> - <package>libglademm-devel</package> - <package>libgladeui-1-9</package> - <package>libgladeui-1_0-devel</package> - <package>libgmime-2_0-3</package> - <package>libgmime-2_4-2</package> - <package>libgmm++-devel</package> - <package>libgnome</package> - <package>libgnome-certauth0</package> - <package>libgnome-desktop-2-11</package> - <package>libgnome-devel</package> - <package>libgnome-lang</package> - <package>libgnome-menu2</package> - <package>libgnome-window-settings1</package> - <package>libgnomecanvas</package> - <package>libgnomecanvas-devel</package> - <package>libgnomecanvas-lang</package> - <package>libgnomecanvasmm</package> - <package>libgnomecanvasmm-devel</package> - <package>libgnomecups</package> - <package>libgnomecups-devel</package> - <package>libgnomecups-lang</package> - <package>libgnomedb</package> - <package>libgnomedb-devel</package> - <package>libgnomedb-lang</package> - <package>libgnomekbd</package> - <package>libgnomekbd-devel</package> - <package>libgnomekbd-lang</package> - <package>libgnomeprint</package> - <package>libgnomeprint-devel</package> - <package>libgnomeprint-lang</package> - <package>libgnomeprintui</package> - <package>libgnomeprintui-devel</package> - <package>libgnomeprintui-lang</package> - <package>libgnomesu</package> - <package>libgnomesu-devel</package> - <package>libgnomesu-lang</package> - <package>libgnomesu0</package> - <package>libgnomeui</package> - <package>libgnomeui-devel</package> - <package>libgnomeui-lang</package> - <package>libgnomevfsmm-2_6-1</package> - <package>libgnutls-devel</package> - <package>libgnutls-extra-devel</package> - <package>libgnutls-extra26</package> - <package>libgoocanvas3</package> - <package>libgpg-error-devel</package> - <package>libgpgme-devel</package> - <package>libgphoto2-devel</package> - <package>libgpod-devel</package> - <package>libgsf</package> - <package>libgsf-1-114</package> - <package>libgsf-devel</package> - <package>libgsf-gnome</package> - <package>libgsm-devel</package> - <package>libgsm1</package> - <package>libgssglue-devel</package> - <package>libgstapp-0_10-0</package> - <package>libgstinterfaces-0_10-0</package> - <package>libgstreamer-0_10-0</package> - <package>libgtk-vnc-1_0-0</package> - <package>libgtkhtml</package> - <package>libgtkhtml-devel</package> - <package>libgtksourceview-2_0-0</package> - <package>libgtop</package> - <package>libgtop-2_0-7</package> - <package>libgtop-devel</package> - <package>libgtop-lang</package> - <package>libgudev-1_0-0</package> - <package>libgweather</package> - <package>libgweather-devel</package> - <package>libgweather-lang</package> - <package>libgweather1</package> - <package>libhangul</package> - <package>libhangul-devel</package> - <package>libhowl0</package> - <package>libical-devel</package> - <package>libical0</package> - <package>libicu-devel</package> - <package>libid3tag</package> - <package>libid3tag-devel</package> - <package>libidl-devel</package> - <package>libidn-devel</package> - <package>libiec61883</package> - <package>libiec61883-devel</package> - <package>libieee1284</package> - <package>libiniparser-devel</package> - <package>libiniparser0</package> - <package>libiptcdata</package> - <package>libiptcdata-devel</package> - <package>libiptcdata0</package> - <package>libiso9660-5</package> - <package>libiterm</package> - <package>libiterm-devel</package> - <package>libjack-devel</package> - <package>libjack0</package> - <package>libjasper</package> - <package>libjasper-devel</package> - <package>libjingle-0_3-0</package> - <package>libjingle-devel</package> - <package>libjpeg-devel</package> - <package>libkcal</package> - <package>libkcal-devel</package> - <package>libkcal2</package> - <package>libkcddb4</package> - <package>libkcddb4-devel</package> - <package>libkcompactdisc4</package> - <package>libkcompactdisc4-devel</package> - <package>libkdcraw3</package> - <package>libkdcraw3-devel</package> - <package>libkdcraw3-lang</package> - <package>libkde4</package> - <package>libkde4-devel</package> - <package>libkdecore4</package> - <package>libkdecore4-devel</package> - <package>libkdepim4</package> - <package>libkdepim4-devel</package> - <package>libkdepimlibs4</package> - <package>libkdepimlibs4-devel</package> - <package>libkexiv2-3</package> - <package>libkexiv2-3-devel</package> - <package>libkexiv2-7</package> - <package>libkipi-devel</package> - <package>libkipi6</package> - <package>libkmime-devel</package> - <package>libkmime2</package> - <package>libknotificationitem-1-1</package> - <package>libkonq-devel</package> - <package>libkonq5</package> - <package>libksba-devel</package> - <package>libktnef-devel</package> - <package>libktnef1</package> - <package>liblazy-devel</package> - <package>liblazy1</package> - <package>liblcms-devel</package> - <package>libldapcpp-devel</package> - <package>liblog4c-devel</package> - <package>liblog4c3</package> - <package>libloudmouth-1-0</package> - <package>liblpsolve55</package> - <package>liblua5_1</package> - <package>libmalaga-devel</package> - <package>libmalaga7</package> - <package>libmcrypt</package> - <package>libmcrypt-devel</package> - <package>libmikmod</package> - <package>libmikmod-devel</package> - <package>libmm-devel</package> - <package>libmm14</package> - <package>libmng-devel</package> - <package>libmpcdec-devel</package> - <package>libmpcdec5</package> - <package>libmspack-devel</package> - <package>libmtp-devel</package> - <package>libmtp8</package> - <package>libmusicbrainz-devel</package> - <package>libmusicbrainz3-6</package> - <package>libmusicbrainz3-devel</package> - <package>libmusicbrainz4</package> - <package>libmysqlclient-devel</package> - <package>libmysqlclient15</package> - <package>libmysqlclient_r15</package> - <package>libneon-devel</package> - <package>libneon27</package> - <package>libnetapi-devel</package> - <package>libnetapi0</package> - <package>libnetcontrol0</package> - <package>libnetpbm-devel</package> - <package>libnetpbm10</package> - <package>libnewt0_52</package> - <package>libnjb</package> - <package>libnjb-devel</package> - <package>libnjb5</package> - <package>libnl-devel</package> - <package>libnotify</package> - <package>libnotify-devel</package> - <package>libnotify1</package> - <package>libnscd-devel</package> - <package>libnsssharedhelper0</package> - <package>libnuma-devel</package> - <package>libofa-devel</package> - <package>libofa0</package> - <package>libogg-devel</package> - <package>libogg0</package> - <package>liboil</package> - <package>liboil-devel</package> - <package>libopenbabel-devel</package> - <package>libopenbabel3</package> - <package>libopencdk-devel</package> - <package>libopencdk10</package> - <package>libopenraw-devel</package> - <package>libopenraw1</package> - <package>libopenssl-devel</package> - <package>libopensync</package> - <package>libopensync-devel</package> - <package>libopensync-plugin-evolution2</package> - <package>libopensync-plugin-evolution2-devel</package> - <package>libopensync-plugin-palm</package> - <package>libopensync-plugin-palm-devel</package> - <package>liborc-0_4-0</package> - <package>libosip2</package> - <package>libosip2-devel</package> - <package>libotf</package> - <package>libotf-devel</package> - <package>libotr-devel</package> - <package>libotr2</package> - <package>libp11-1</package> - <package>libp11-devel</package> - <package>libpackagekit-glib10</package> - <package>libpackagekit-glib10-devel</package> - <package>libpangomm-1_4-1</package> - <package>libpcap-devel</package> - <package>libpciaccess0</package> - <package>libpciaccess0-devel</package> - <package>libphonon4</package> - <package>libpisock-devel</package> - <package>libpisock9</package> - <package>libpisync-devel</package> - <package>libpisync1</package> - <package>libpixman-1-0-devel</package> - <package>libpkcs11-helper1</package> - <package>libpng-devel</package> - <package>libpolkit-qt0</package> - <package>libpoppler-devel</package> - <package>libpoppler-glib-devel</package> - <package>libpoppler-glib4</package> - <package>libpoppler-qt2</package> - <package>libpoppler-qt3-devel</package> - <package>libpoppler-qt4-3</package> - <package>libpoppler-qt4-devel</package> - <package>libpoppler5</package> - <package>libpst4</package> - <package>libpt2</package> - <package>libpt2-devel</package> - <package>libpulse-browse0</package> - <package>libpulse-devel</package> - <package>libpulse-mainloop-glib0</package> - <package>libpulse0</package> - <package>libpurple</package> - <package>libpurple-devel</package> - <package>libpurple-lang</package> - <package>libqca2</package> - <package>libqca2-devel</package> - <package>libqdialogsolver1</package> - <package>libqdialogsolver1-devel</package> - <package>libqimageblitz-devel</package> - <package>libqimageblitz4</package> - <package>libqscintilla-devel</package> - <package>libqscintilla2-5</package> - <package>libqt4</package> - <package>libqt4-devel</package> - <package>libqt4-qt3support</package> - <package>libqt4-sql</package> - <package>libqt4-sql-mysql</package> - <package>libqt4-sql-postgresql</package> - <package>libqt4-sql-sqlite</package> - <package>libqt4-sql-unixODBC</package> - <package>libqt4-x11</package> - <package>libqtpod-devel</package> - <package>libqtpod0</package> - <package>libquadmath46</package> - <package>libquicktime</package> - <package>libquicktime-devel</package> - <package>libraptor-devel</package> - <package>libraptor1</package> - <package>librasqal-devel</package> - <package>librasqal1</package> - <package>libraw1394-11</package> - <package>libraw1394-8</package> - <package>libraw1394-devel</package> - <package>libredland-devel</package> - <package>libredland0</package> - <package>libreiserfs-devel</package> - <package>libreoffice</package> - <package>libreoffice-base</package> - <package>libreoffice-branding-SLED</package> - <package>libreoffice-branding-upstream</package> - <package>libreoffice-calc</package> - <package>libreoffice-icon-themes</package> - <package>libreoffice-impress</package> - <package>libreoffice-sdk</package> - <package>libreoffice-writer</package> - <package>librsvg</package> - <package>librsvg-devel</package> - <package>libsamplerate</package> - <package>libsamplerate-devel</package> - <package>libsatsolver-devel</package> - <package>libsblim-cmpiutil1</package> - <package>libselinux-devel</package> - <package>libsemanage-devel</package> - <package>libsemanage1</package> - <package>libsensors3-devel</package> - <package>libsensors4</package> - <package>libsepol-devel</package> - <package>libsexy</package> - <package>libsexy-devel</package> - <package>libshout-devel</package> - <package>libshout3</package> - <package>libsidplay1</package> - <package>libsidplay1-devel</package> - <package>libsigc++2</package> - <package>libsigc++2-devel</package> - <package>libslab-lang</package> - <package>libslab0</package> - <package>libsmbclient-devel</package> - <package>libsmbios-devel</package> - <package>libsmbsharemodes-devel</package> - <package>libsmbsharemodes0</package> - <package>libsndfile</package> - <package>libsndfile-devel</package> - <package>libsoprano-devel</package> - <package>libsoprano4</package> - <package>libsoup-devel</package> - <package>libspectre-devel</package> - <package>libspectre1</package> - <package>libspeex</package> - <package>libssh2-devel</package> - <package>libstrigi0</package> - <package>libstroke</package> - <package>libstroke-devel</package> - <package>libsyncml-devel</package> - <package>libsyncml0</package> - <package>libtalloc-devel</package> - <package>libtasn1-devel</package> - <package>libtdb-devel</package> - <package>libtelepathy</package> - <package>libtelepathy-devel</package> - <package>libtelepathy-glib0</package> - <package>libtheora-devel</package> - <package>libtheora0</package> - <package>libtidy</package> - <package>libtidy-devel</package> - <package>libtiff-devel</package> - <package>libtirpc-devel</package> - <package>libtomoe-gtk0</package> - <package>libtspi1</package> - <package>libtunepimp</package> - <package>libtunepimp-devel</package> - <package>libtunepimp5</package> - <package>libudev-devel</package> - <package>libudf0</package> - <package>libunique-1_0-0</package> - <package>libunwind</package> - <package>libunwind-devel</package> - <package>libupsclient1</package> - <package>libusb-devel</package> - <package>libusbpp-0_1-4</package> - <package>libustr-1_0-1</package> - <package>libustr-devel</package> - <package>libuuid-devel</package> - <package>libvirt-client</package> - <package>libvirt-devel</package> - <package>libvisual</package> - <package>libvisual-devel</package> - <package>libvoikko-devel</package> - <package>libvoikko1</package> - <package>libvorbis</package> - <package>libvorbis-devel</package> - <package>libwavpack1</package> - <package>libwbclient-devel</package> - <package>libwbxml2-0</package> - <package>libwbxml2-devel</package> - <package>libwebkit-1_0-1</package> - <package>libwebkit-1_0-2</package> - <package>libwebkit-devel</package> - <package>libwebkit-lang</package> - <package>libwmf</package> - <package>libwmf-devel</package> - <package>libwmf-gnome</package> - <package>libwnck</package> - <package>libwnck-1-22</package> - <package>libwnck-devel</package> - <package>libwnck-lang</package> - <package>libwpd-0_8-8</package> - <package>libwpd-devel</package> - <package>libwpg-0_1-1</package> - <package>libwpg-devel</package> - <package>libwps-0_1-1</package> - <package>libwps-devel</package> - <package>libwsman-devel</package> - <package>libwsman1</package> - <package>libxcrypt-devel</package> - <package>libxine-devel</package> - <package>libxine1</package> - <package>libxklavier-devel</package> - <package>libxklavier15</package> - <package>libxml2-devel</package> - <package>libxslt-devel</package> - <package>libyajl1</package> - <package>libzio-devel</package> - <package>libzip-devel</package> - <package>libzip1</package> - <package>libzvbi0</package> - <package>libzypp-devel</package> - <package>limal-apparmor-notifications</package> - <package>limal-apparmor-notifications-devel</package> - <package>limal-ca-mgm-devel</package> - <package>limal-devel</package> - <package>limal-devtools</package> - <package>limal-nfs-server-devel</package> - <package>linux-atm-devel</package> - <package>linux-atm-lib</package> - <package>lksctp-tools</package> - <package>lksctp-tools-devel</package> - <package>loudmouth-devel</package> - <package>lua</package> - <package>lua-devel</package> - <package>lzo-devel</package> - <package>m17n-db</package> - <package>m17n-lib</package> - <package>m17n-lib-devel</package> - <package>malaga-suomi</package> - <package>meanwhile</package> - <package>meanwhile-devel</package> - <package>metacity</package> - <package>metacity-devel</package> - <package>metacity-lang</package> - <package>mhash</package> - <package>mhash-devel</package> - <package>misc-console-font</package> - <package>mono-addins</package> - <package>mono-basic</package> - <package>mono-core</package> - <package>mono-data</package> - <package>mono-data-oracle</package> - <package>mono-data-sqlite</package> - <package>mono-devel</package> - <package>mono-extras</package> - <package>mono-jscript</package> - <package>mono-tools</package> - <package>mono-wcf</package> - <package>mono-web</package> - <package>mono-winforms</package> - <package>mono-zeroconf</package> - <package>mono-zeroconf-provider-avahi</package> - <package>monodevelop</package> - <package>monodoc-core</package> - <package>mozilla-nspr</package> - <package>mozilla-nspr-devel</package> - <package>mozilla-nss</package> - <package>mozilla-nss-devel</package> - <package>mozilla-xulrunner192</package> - <package>mozilla-xulrunner192-gnome</package> - <package>mpfr-devel</package> - <package>mpi-selector</package> - <package>mpich</package> - <package>mpich-devel</package> - <package>mysql</package> - <package>mysql-client</package> - <package>nagios</package> - <package>nagios-devel</package> - <package>nagios-www</package> - <package>nant</package> - <package>nautilus</package> - <package>nautilus-cd-burner</package> - <package>nautilus-cd-burner-devel</package> - <package>nautilus-cd-burner-lang</package> - <package>nautilus-devel</package> - <package>nautilus-lang</package> - <package>ndesk-dbus</package> - <package>ndesk-dbus-glib</package> - <package>ndesk-dbus-glib-devel</package> - <package>net-snmp</package> - <package>net-snmp-devel</package> - <package>netatalk</package> - <package>netatalk-devel</package> - <package>netcat-openbsd</package> - <package>newt</package> - <package>newt-devel</package> - <package>newt-static</package> - <package>nfsidmap-devel</package> - <package>notification-daemon</package> - <package>notification-daemon-lang</package> - <package>notify-sharp</package> - <package>nss-mdns</package> - <package>nss-shared-helper-devel</package> - <package>nut</package> - <package>nut-classic</package> - <package>nut-devel</package> - <package>opal</package> - <package>opal-devel</package> - <package>openCryptoki</package> - <package>openCryptoki-64bit</package> - <package>openCryptoki-devel</package> - <package>openct-devel</package> - <package>openhpi</package> - <package>openhpi-daemon</package> - <package>openhpi-devel</package> - <package>openjade</package> - <package>openjade-devel</package> - <package>openldap2-devel</package> - <package>openmotif-devel</package> - <package>openmotif-libs</package> - <package>openmpi</package> - <package>openobex-devel</package> - <package>openobex-glib-devel</package> - <package>opensc-devel</package> - <package>openslp-devel</package> - <package>opensp</package> - <package>opensp-devel</package> - <package>openwsman-client</package> - <package>openwsman-server</package> - <package>orbit</package> - <package>orbit-devel</package> - <package>orbit2-devel</package> - <package>oxygen-icon-theme</package> - <package>oxygen-icon-theme-scalable</package> - <package>ozerocdoff</package> - <package>pam-devel</package> - <package>pango-devel</package> - <package>pangomm-devel</package> - <package>parted-devel</package> - <package>patchutils</package> - <package>pciutils-devel</package> - <package>pcre-devel</package> - <package>pcsc-acr38</package> - <package>pcsc-acr38-devel</package> - <package>pcsc-lite-devel</package> - <package>perl-32bit</package> - <package>perl-Crypt-OpenSSL-RSA</package> - <package>perl-Mail-DKIM</package> - <package>perl-MailTools</package> - <package>perl-Net-DNS</package> - <package>perl-Net-IP</package> - <package>perl-NetAddr-IP</package> - <package>perl-SNMP</package> - <package>perl-Tie-IxHash</package> - <package>perl-Tk</package> - <package>perl-Tk-devel</package> - <package>perl-spamassassin</package> - <package>phonon</package> - <package>phonon-backend-gstreamer-0_10</package> - <package>phonon-devel</package> - <package>php5</package> - <package>php5-ctype</package> - <package>php5-devel</package> - <package>php5-dom</package> - <package>php5-hash</package> - <package>php5-iconv</package> - <package>php5-json</package> - <package>php5-pdo</package> - <package>php5-sqlite</package> - <package>php5-suhosin</package> - <package>php5-tokenizer</package> - <package>php5-xmlreader</package> - <package>php5-xmlwriter</package> - <package>php53</package> - <package>php53-ctype</package> - <package>php53-dom</package> - <package>php53-iconv</package> - <package>php53-json</package> - <package>php53-tokenizer</package> - <package>php53-xmlreader</package> - <package>php53-xmlwriter</package> - <package>pidgin</package> - <package>pidgin-devel</package> - <package>pilot-link</package> - <package>pkcs11-helper</package> - <package>pkcs11-helper-devel</package> - <package>planner</package> - <package>planner-devel</package> - <package>planner-lang</package> - <package>plasma-addons</package> - <package>plasma-theme-aya</package> - <package>plasmoid-networkmanagement</package> - <package>plasmoid-quickaccess</package> - <package>plotutils</package> - <package>poppler-data</package> - <package>poppler-tools</package> - <package>popt-devel</package> - <package>portmap</package> - <package>postfix-devel</package> - <package>postgresql-devel</package> - <package>postgresql-libs</package> - <package>ppp-devel</package> - <package>ppp-userpass</package> - <package>pstoedit</package> - <package>pstoedit-devel</package> - <package>pulseaudio</package> - <package>pulseaudio-esound-compat</package> - <package>pulseaudio-lang</package> - <package>puppet</package> - <package>python-cairo</package> - <package>python-cairo-devel</package> - <package>python-devel</package> - <package>python-gnome</package> - <package>python-gnome-devel</package> - <package>python-gobject2</package> - <package>python-gobject2-devel</package> - <package>python-gtk</package> - <package>python-gtk-devel</package> - <package>python-gtkglext</package> - <package>python-gtkglext-devel</package> - <package>python-gtksourceview</package> - <package>python-gtksourceview-devel</package> - <package>python-numeric</package> - <package>python-numpy</package> - <package>python-orbit</package> - <package>python-orbit-devel</package> - <package>pyxml</package> - <package>qt3</package> - <package>qt3-devel</package> - <package>quagga</package> - <package>quagga-devel</package> - <package>quilt</package> - <package>raptor</package> - <package>rarian</package> - <package>rarian-devel</package> - <package>re2c</package> - <package>readline-devel</package> - <package>recode-devel</package> - <package>rpm-devel</package> - <package>rrdtool</package> - <package>rrdtool-devel</package> - <package>rsyslog</package> - <package>ruby</package> - <package>rubygems</package> - <package>ruby-devel</package> - <package>ruby-doc-html</package> - <package>ruby-doc-ri</package> - <package>ruby-examples</package> - <package>ruby-fcgi</package> - <package>ruby-mysql</package> - <package>ruby-selinux</package> - <package>ruby-test-suite</package> - <package>ruby-tk</package> - <package>sablot</package> - <package>sablot-devel</package> - <package>samba-devel</package> - <package>sane-backends</package> - <package>sane-frontends</package> - <package>sax2-libsax</package> - <package>sax2-libsax-devel</package> - <package>sax2-libsax-perl</package> - <package>sax2-tools</package> - <package>sblim-cmpi-base</package> - <package>sblim-cmpi-base-devel</package> - <package>sblim-cmpi-devel</package> - <package>sblim-cmpiutil-devel</package> - <package>sblim-indication_helper</package> - <package>sblim-sfcb</package> - <package>sblim-sfcc</package> - <package>sblim-sfcc-devel</package> - <package>scim</package> - <package>scim-devel</package> - <package>scpm-devel</package> - <package>scrollkeeper</package> - <package>scrollkeeper-lang</package> - <package>seahorse</package> - <package>seahorse-devel</package> - <package>seahorse-lang</package> - <package>sendmail</package> - <package>sendmail-devel</package> - <package>sg3_utils-devel</package> - <package>sgml-skel</package> - <package>shared-mime-info</package> - <package>silc-toolkit</package> - <package>silc-toolkit-devel</package> - <package>slang</package> - <package>slang-devel</package> - <package>soprano</package> - <package>soprano-backend-redland</package> - <package>spamassassin</package> - <package>speex-devel</package> - <package>splashy-devel</package> - <package>sqlite2</package> - <package>sqlite3-devel</package> - <package>startup-notification</package> - <package>startup-notification-devel</package> - <package>strigi</package> - <package>strigi-devel</package> - <package>subversion</package> - <package>subversion-perl</package> - <package>susehelp</package> - <package>susehelp_cz</package> - <package>susehelp_de</package> - <package>susehelp_en</package> - <package>susehelp_es</package> - <package>susehelp_fr</package> - <package>susehelp_hu</package> - <package>susehelp_it</package> - <package>swig</package> - <package>syslogd</package> - <package>t1lib</package> - <package>t1lib-devel</package> - <package>taglib</package> - <package>taglib-devel</package> - <package>taglib-sharp</package> - <package>tango-icon-theme</package> - <package>tcl-devel</package> - <package>tcpd-devel</package> - <package>telepathy-glib-devel</package> - <package>telepathy-mission-control</package> - <package>telepathy-mission-control-devel</package> - <package>texlive-bin-devel</package> - <package>texlive-devel</package> - <package>tk-devel</package> - <package>tla</package> - <package>tn5250</package> - <package>tn5250-devel</package> - <package>tomoe</package> - <package>tomoe-devel</package> - <package>tomoe-gtk</package> - <package>tomoe-gtk-devel</package> - <package>tomoe-gtk-lang</package> - <package>totem-pl-parser</package> - <package>totem-pl-parser-devel</package> - <package>totem-pl-parser-lang</package> - <package>trousers</package> - <package>trousers-devel</package> - <package>tsclient</package> - <package>tsclient-devel</package> - <package>tsclient-lang</package> - <package>uim</package> - <package>uim-devel</package> - <package>unixODBC</package> - <package>unixODBC-devel</package> - <package>unsermake</package> - <package>update-desktop-files</package> - <package>usb_modeswitch</package> - <package>usb_modeswitch-data</package> - <package>valgrind</package> - <package>valgrind-devel</package> - <package>vte</package> - <package>vte-devel</package> - <package>vte-lang</package> - <package>wdiff</package> - <package>webkit-sharp</package> - <package>wireshark</package> - <package>wireshark-devel</package> - <package>wodim-devel</package> - <package>wordcut</package> - <package>wordcut-devel</package> - <package>words</package> - <package>wpa_supplicant</package> - <package>wvstreams</package> - <package>wvstreams-devel</package> - <package>wxGTK-compat</package> - <package>wxGTK-devel</package> - <package>wxGTK-gl</package> - <package>x11-input-wacom</package> - <package>x11-input-wacom-devel</package> - <package>x11-input-wacom-tools</package> - <package>xalan-j2</package> - <package>xaw3d-devel</package> - <package>xbase</package> - <package>xbase-devel</package> - <package>xdelta</package> - <package>xdelta-devel</package> - <package>xdg-menu</package> - <package>xen-devel</package> - <package>xen-libs</package> - <package>xerces-j2</package> - <package>xerces-j2-bootstrap</package> - <package>xerces-j2-xml-apis</package> - <package>xfsprogs-devel</package> - <package>xml-commons-apis-bootstrap</package> - <package>xml-commons-resolver-bootstrap</package> - <package>xml-commons-which-bootstrap</package> - <package>xmlcharent</package> - <package>xorg-x11</package> - <package>xorg-x11-devel</package> - <package>xorg-x11-fonts</package> - <package>xorg-x11-fonts-core</package> - <package>xorg-x11-fonts-devel</package> - <package>xorg-x11-libICE-devel</package> - <package>xorg-x11-libSM-devel</package> - <package>xorg-x11-libX11-devel</package> - <package>xorg-x11-libXau-devel</package> - <package>xorg-x11-libXdmcp-devel</package> - <package>xorg-x11-libXext-devel</package> - <package>xorg-x11-libXfixes-devel</package> - <package>xorg-x11-libXmu-devel</package> - <package>xorg-x11-libXp-devel</package> - <package>xorg-x11-libXpm-devel</package> - <package>xorg-x11-libXprintUtil-devel</package> - <package>xorg-x11-libXrender-devel</package> - <package>xorg-x11-libXt-devel</package> - <package>xorg-x11-libXv-devel</package> - <package>xorg-x11-libfontenc-devel</package> - <package>xorg-x11-libxcb-devel</package> - <package>xorg-x11-libxkbfile-devel</package> - <package>xorg-x11-proto-devel</package> - <package>xorg-x11-server</package> - <package>xorg-x11-util-devel</package> - <package>xorg-x11-xauth</package> - <package>xorg-x11-xtrans-devel</package> - <package>xosd</package> - <package>xosd-devel</package> - <package>xsp</package> - <package>xterm</package> - <package>xz-devel</package> - <package>yast2-core-devel</package> - <package>yast2-devtools</package> - <package>yast2-gtk</package> - <package>yast2-libyui-devel</package> - <package>yast2-ncurses-devel</package> - <package>yast2-qt</package> - <package>yast2-qt-devel</package> - <package>yast2-qt-pkg</package> - <package>yast2-storage-devel</package> - <package>yast2-ycp-ui-bindings-devel</package> - <package>yelp</package> - <package>yelp-lang</package> - <package>zenity</package> - <package>zenity-lang</package> - <package>zlib-devel</package> - <package>zsh</package> - <package>zvbi-devel</package> </remove-packages> - </software> <user_defaults> <expire></expire> @@ -2154,186 +168,6 @@ <user_password>$2y$05$NA1Li9ZKJOLRW5mMTXm6/e5r8dltWS5RpDZpvHrI82aLE00V51tdi</user_password> <username>vagrant</username> </user> - <user> - <encrypted config:type="boolean">true</encrypted> - <fullname>Games account</fullname> - <gid>100</gid> - <home>/var/games</home> - <password_settings> - <expire></expire> - <flag></flag> - <inact></inact> - <max></max> - <min></min> - <warn></warn> - </password_settings> - <shell>/bin/bash</shell> - <uid>12</uid> - <user_password>*</user_password> - <username>games</username> - </user> - <user> - <encrypted config:type="boolean">true</encrypted> - <fullname>bin</fullname> - <gid>1</gid> - <home>/bin</home> - <password_settings> - <expire></expire> - <flag></flag> - <inact></inact> - <max></max> - <min></min> - <warn></warn> - </password_settings> - <shell>/bin/bash</shell> - <uid>1</uid> - <user_password>*</user_password> - <username>bin</username> - </user> - <user> - <encrypted config:type="boolean">true</encrypted> - <fullname>nobody</fullname> - <gid>65533</gid> - <home>/var/lib/nobody</home> - <password_settings> - <expire></expire> - <flag></flag> - <inact></inact> - <max></max> - <min></min> - <warn></warn> - </password_settings> - <shell>/bin/bash</shell> - <uid>65534</uid> - <user_password>*</user_password> - <username>nobody</username> - </user> - <user> - <encrypted config:type="boolean">true</encrypted> - <fullname>Printing daemon</fullname> - <gid>7</gid> - <home>/var/spool/lpd</home> - <password_settings> - <expire></expire> - <flag></flag> - <inact></inact> - <max></max> - <min></min> - <warn></warn> - </password_settings> - <shell>/bin/bash</shell> - <uid>4</uid> - <user_password>*</user_password> - <username>lp</username> - </user> - <user> - <encrypted config:type="boolean">true</encrypted> - <fullname>User for uuidd</fullname> - <gid>104</gid> - <home>/var/run/uuidd</home> - <password_settings> - <expire></expire> - <flag></flag> - <inact></inact> - <max>99999</max> - <min>0</min> - <warn>7</warn> - </password_settings> - <shell>/bin/false</shell> - <uid>102</uid> - <user_password>*</user_password> - <username>uuidd</username> - </user> - <user> - <encrypted config:type="boolean">true</encrypted> - <fullname>Postfix Daemon</fullname> - <gid>51</gid> - <home>/var/spool/postfix</home> - <password_settings> - <expire></expire> - <flag></flag> - <inact></inact> - <max>99999</max> - <min>0</min> - <warn>7</warn> - </password_settings> - <shell>/bin/false</shell> - <uid>51</uid> - <user_password>*</user_password> - <username>postfix</username> - </user> - <user> - <encrypted config:type="boolean">true</encrypted> - <fullname>Novell Customer Center User</fullname> - <gid>111</gid> - <home>/var/lib/YaST2/suse-ncc-fakehome</home> - <password_settings> - <expire></expire> - <flag></flag> - <inact></inact> - <max>99999</max> - <min>0</min> - <warn>7</warn> - </password_settings> - <shell>/bin/bash</shell> - <uid>106</uid> - <user_password>*</user_password> - <username>suse-ncc</username> - </user> - <user> - <encrypted config:type="boolean">true</encrypted> - <fullname>FTP account</fullname> - <gid>49</gid> - <home>/srv/ftp</home> - <password_settings> - <expire></expire> - <flag></flag> - <inact></inact> - <max></max> - <min></min> - <warn></warn> - </password_settings> - <shell>/bin/bash</shell> - <uid>40</uid> - <user_password>*</user_password> - <username>ftp</username> - </user> - <user> - <encrypted config:type="boolean">true</encrypted> - <fullname>Gnome Display Manager daemon</fullname> - <gid>112</gid> - <home>/var/lib/gdm</home> - <password_settings> - <expire></expire> - <flag></flag> - <inact></inact> - <max>99999</max> - <min>0</min> - <warn>7</warn> - </password_settings> - <shell>/bin/false</shell> - <uid>107</uid> - <user_password>*</user_password> - <username>gdm</username> - </user> - <user> - <encrypted config:type="boolean">true</encrypted> - <fullname>Batch jobs daemon</fullname> - <gid>25</gid> - <home>/var/spool/atjobs</home> - <password_settings> - <expire></expire> - <flag></flag> - <inact></inact> - <max>99999</max> - <min>0</min> - <warn>7</warn> - </password_settings> - <shell>/bin/bash</shell> - <uid>25</uid> - <user_password>*</user_password> - <username>at</username> - </user> <user> <encrypted config:type="boolean">true</encrypted> <fullname>root</fullname> @@ -2352,211 +186,5 @@ <user_password>$2y$05$NA1Li9ZKJOLRW5mMTXm6/e5r8dltWS5RpDZpvHrI82aLE00V51tdi</user_password> <username>root</username> </user> - <user> - <encrypted config:type="boolean">true</encrypted> - <fullname>Mailer daemon</fullname> - <gid>12</gid> - <home>/var/spool/clientmqueue</home> - <password_settings> - <expire></expire> - <flag></flag> - <inact></inact> - <max></max> - <min></min> - <warn></warn> - </password_settings> - <shell>/bin/false</shell> - <uid>8</uid> - <user_password>*</user_password> - <username>mail</username> - </user> - <user> - <encrypted config:type="boolean">true</encrypted> - <fullname>Daemon</fullname> - <gid>2</gid> - <home>/sbin</home> - <password_settings> - <expire></expire> - <flag></flag> - <inact></inact> - <max></max> - <min></min> - <warn></warn> - </password_settings> - <shell>/bin/bash</shell> - <uid>2</uid> - <user_password>*</user_password> - <username>daemon</username> - </user> - <user> - <encrypted config:type="boolean">true</encrypted> - <fullname>NTP daemon</fullname> - <gid>108</gid> - <home>/var/lib/ntp</home> - <password_settings> - <expire></expire> - <flag></flag> - <inact></inact> - <max>99999</max> - <min>0</min> - <warn>7</warn> - </password_settings> - <shell>/bin/false</shell> - <uid>74</uid> - <user_password>*</user_password> - <username>ntp</username> - </user> - <user> - <encrypted config:type="boolean">true</encrypted> - <fullname>Unix-to-Unix CoPy system</fullname> - <gid>14</gid> - <home>/etc/uucp</home> - <password_settings> - <expire></expire> - <flag></flag> - <inact></inact> - <max></max> - <min></min> - <warn></warn> - </password_settings> - <shell>/bin/bash</shell> - <uid>10</uid> - <user_password>*</user_password> - <username>uucp</username> - </user> - <user> - <encrypted config:type="boolean">true</encrypted> - <fullname>User for D-Bus</fullname> - <gid>101</gid> - <home>/var/run/dbus</home> - <password_settings> - <expire></expire> - <flag></flag> - <inact></inact> - <max></max> - <min>0</min> - <warn>7</warn> - </password_settings> - <shell>/bin/false</shell> - <uid>100</uid> - <user_password>*</user_password> - <username>messagebus</username> - </user> - <user> - <encrypted config:type="boolean">true</encrypted> - <fullname>User for haldaemon</fullname> - <gid>102</gid> - <home>/var/run/hald</home> - <password_settings> - <expire></expire> - <flag></flag> - <inact></inact> - <max></max> - <min>0</min> - <warn>7</warn> - </password_settings> - <shell>/bin/false</shell> - <uid>101</uid> - <user_password>*</user_password> - <username>haldaemon</username> - </user> - <user> - <encrypted config:type="boolean">true</encrypted> - <fullname>WWW daemon apache</fullname> - <gid>8</gid> - <home>/var/lib/wwwrun</home> - <password_settings> - <expire></expire> - <flag></flag> - <inact></inact> - <max></max> - <min></min> - <warn></warn> - </password_settings> - <shell>/bin/false</shell> - <uid>30</uid> - <user_password>*</user_password> - <username>wwwrun</username> - </user> - <user> - <encrypted config:type="boolean">true</encrypted> - <fullname>Manual pages viewer</fullname> - <gid>62</gid> - <home>/var/cache/man</home> - <password_settings> - <expire></expire> - <flag></flag> - <inact></inact> - <max></max> - <min></min> - <warn></warn> - </password_settings> - <shell>/bin/bash</shell> - <uid>13</uid> - <user_password>*</user_password> - <username>man</username> - </user> - <user> - <encrypted config:type="boolean">true</encrypted> - <fullname>PolicyKit</fullname> - <gid>107</gid> - <home>/var/run/PolicyKit</home> - <password_settings> - <expire></expire> - <flag></flag> - <inact></inact> - <max>99999</max> - <min>0</min> - <warn>7</warn> - </password_settings> - <shell>/bin/false</shell> - <uid>104</uid> - <user_password>*</user_password> - <username>polkituser</username> - </user> - <user> - <encrypted config:type="boolean">true</encrypted> - <fullname>News system</fullname> - <gid>13</gid> - <home>/etc/news</home> - <password_settings> - <expire></expire> - <flag></flag> - <inact></inact> - <max></max> - <min></min> - <warn></warn> - </password_settings> - <shell>/bin/bash</shell> - <uid>9</uid> - <user_password>*</user_password> - <username>news</username> - </user> - <user> - <fullname>SSH daemon</fullname> - <gid>65</gid> - <home>/var/lib/sshd</home> - <shell>/bin/false</shell> - <uid>71</uid> - <username>sshd</username> - </user> - <user> - <encrypted config:type="boolean">true</encrypted> - <fullname>PulseAudio daemon</fullname> - <gid>109</gid> - <home>/var/lib/pulseaudio</home> - <password_settings> - <expire></expire> - <flag></flag> - <inact></inact> - <max>99999</max> - <min>0</min> - <warn>7</warn> - </password_settings> - <shell>/bin/false</shell> - <uid>105</uid> - <user_password>*</user_password> - <username>pulse</username> - </user> </users> </profile> diff --git a/http/sles-11/sles-11-sp3-x86_64-autoinst.xml b/http/sles-11/sles-11-sp3-x86_64-autoinst.xml index db505ac8b..ab4dcbb37 100644 --- a/http/sles-11/sles-11-sp3-x86_64-autoinst.xml +++ b/http/sles-11/sles-11-sp3-x86_64-autoinst.xml @@ -3,92 +3,14 @@ <profile xmlns="http://www.suse.com/1.0/yast2ns" xmlns:config="http://www.suse.com/1.0/configns"> <add-on> <add_on_products config:type="list"> - <listentry> + <!-- should not be neccessary for a minimal installation --> + <!-- <listentry> <media_url><![CDATA[http://demeter.uni-regensburg.de/SLE11SP3-SDK-x64/DVD1/]]></media_url> <product>sle-sdk</product> <product_dir>/</product_dir> - </listentry> + </listentry> --> </add_on_products> </add-on> - <bootloader> - <device_map config:type="list"> - <device_map_entry> - <firmware>hd0</firmware> - <linux>/dev/sda</linux> - </device_map_entry> - </device_map> - <global> - <activate>true</activate> - <boot_root>true</boot_root> - <default>SUSE Linux Enterprise Server 11 SP3 - 3.0.76-0.11</default> - <generic_mbr>true</generic_mbr> - <gfxmenu>/boot/message</gfxmenu> - <lines_cache_id>2</lines_cache_id> - <timeout config:type="integer">8</timeout> - </global> - <initrd_modules config:type="list"> - <initrd_module> - <module>ahci</module> - </initrd_module> - <initrd_module> - <module>ata_piix</module> - </initrd_module> - <initrd_module> - <module>ata_generic</module> - </initrd_module> - <initrd_module> - <module>jbd</module> - </initrd_module> - <initrd_module> - <module>mbcache</module> - </initrd_module> - <initrd_module> - <module>ext3</module> - </initrd_module> - </initrd_modules> - <loader_type>grub</loader_type> - <sections config:type="list"> - <section> - <append>resume=/dev/sda1 splash=silent crashkernel=128M-:64M showopts</append> - <image>(hd0,1)/boot/vmlinuz-3.0.76-0.11-default</image> - <initial>1</initial> - <initrd>(hd0,1)/boot/initrd-3.0.76-0.11-default</initrd> - <lines_cache_id>0</lines_cache_id> - <name>SUSE Linux Enterprise Server 11 SP3 - 3.0.76-0.11</name> - <original_name>linux</original_name> - <root>/dev/sda2</root> - <type>image</type> - <vgamode>0x314</vgamode> - </section> - <section> - <append>showopts ide=nodma apm=off noresume edd=off powersaved=off nohz=off highres=off processor.max_cstate=1 nomodeset x11failsafe</append> - <image>(hd0,1)/boot/vmlinuz-3.0.76-0.11-default</image> - <initrd>(hd0,1)/boot/initrd-3.0.76-0.11-default</initrd> - <lines_cache_id>1</lines_cache_id> - <name>Failsafe -- SUSE Linux Enterprise Server 11 SP3 - 3.0.76-0.11</name> - <original_name>failsafe</original_name> - <root>/dev/sda2</root> - <type>image</type> - <vgamode>0x314</vgamode> - </section> - </sections> - </bootloader> - <ca_mgm> - <CAName>YaST_Default_CA</CAName> - <ca_commonName>YaST Default CA (vagrant-sles-11sp3-x64)</ca_commonName> - <country>US</country> - <locality></locality> - <organisation></organisation> - <organisationUnit></organisationUnit> - <password>ENTER PASSWORD HERE</password> - <server_commonName>vagrant-sles-11sp3-x64.vagrantup.com</server_commonName> - <server_email>postmaster@vagrantup.com</server_email> - <state></state> - <takeLocalServerName config:type="boolean">false</takeLocalServerName> - </ca_mgm> - <deploy_image> - <image_installation config:type="boolean">false</image_installation> - </deploy_image> <general> <ask-list config:type="list"/> <mode> @@ -108,390 +30,6 @@ </signature-handling> <storage/> </general> - <groups config:type="list"> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>100</gid> - <group_password>x</group_password> - <groupname>users</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>19</gid> - <group_password>x</group_password> - <groupname>floppy</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>1</gid> - <group_password>x</group_password> - <groupname>bin</groupname> - <userlist>daemon</userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>41</gid> - <group_password>x</group_password> - <groupname>xok</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>65533</gid> - <group_password>x</group_password> - <groupname>nobody</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>43</gid> - <group_password>x</group_password> - <groupname>modem</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>5</gid> - <group_password>x</group_password> - <groupname>tty</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>7</gid> - <group_password>x</group_password> - <groupname>lp</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>104</gid> - <group_password>!</group_password> - <groupname>uuidd</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>51</gid> - <group_password>!</group_password> - <groupname>postfix</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>112</gid> - <group_password>!</group_password> - <groupname>gdm</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>65534</gid> - <group_password>x</group_password> - <groupname>nogroup</groupname> - <userlist>nobody</userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>101</gid> - <group_password>!</group_password> - <groupname>messagebus</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>59</gid> - <group_password>!</group_password> - <groupname>maildrop</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>33</gid> - <group_password>x</group_password> - <groupname>video</groupname> - <userlist>vagrant</userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>3</gid> - <group_password>x</group_password> - <groupname>sys</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>15</gid> - <group_password>x</group_password> - <groupname>shadow</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>20</gid> - <group_password>x</group_password> - <groupname>cdrom</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>21</gid> - <group_password>x</group_password> - <groupname>console</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>42</gid> - <group_password>x</group_password> - <groupname>trusted</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>102</gid> - <group_password>!</group_password> - <groupname>haldaemon</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>106</gid> - <group_password>!</group_password> - <groupname>puppet</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>16</gid> - <group_password>x</group_password> - <groupname>dialout</groupname> - <userlist>vagrant</userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>107</gid> - <group_password>!</group_password> - <groupname>polkituser</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>10</gid> - <group_password>x</group_password> - <groupname>wheel</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>109</gid> - <group_password>!</group_password> - <groupname>pulse</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>8</gid> - <group_password>x</group_password> - <groupname>www</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>40</gid> - <group_password>x</group_password> - <groupname>games</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>6</gid> - <group_password>x</group_password> - <groupname>disk</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>17</gid> - <group_password>x</group_password> - <groupname>audio</groupname> - <userlist>pulse</userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>111</gid> - <group_password>!</group_password> - <groupname>suse-ncc</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>49</gid> - <group_password>x</group_password> - <groupname>ftp</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>103</gid> - <group_password>!</group_password> - <groupname>tape</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>25</gid> - <group_password>!</group_password> - <groupname>at</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>9</gid> - <group_password>x</group_password> - <groupname>kmem</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>32</gid> - <group_password>x</group_password> - <groupname>public</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>12</gid> - <group_password>x</group_password> - <groupname>mail</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>0</gid> - <group_password>x</group_password> - <groupname>root</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>2</gid> - <group_password>x</group_password> - <groupname>daemon</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>105</gid> - <group_password>!</group_password> - <groupname>sfcb</groupname> - <userlist>root</userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>108</gid> - <group_password>!</group_password> - <groupname>ntp</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>14</gid> - <group_password>x</group_password> - <groupname>uucp</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>110</gid> - <group_password>!</group_password> - <groupname>pulse-access</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>71</gid> - <group_password>!</group_password> - <groupname>ntadmin</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>62</gid> - <group_password>x</group_password> - <groupname>man</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>22</gid> - <group_password>x</group_password> - <groupname>utmp</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>13</gid> - <group_password>x</group_password> - <groupname>news</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>65</gid> - <group_password>!</group_password> - <groupname>sshd</groupname> - <userlist></userlist> - </group> - </groups> - <host> - <hosts config:type="list"> - <hosts_entry> - <host_address>127.0.0.1</host_address> - <names config:type="list"> - <name>localhost</name> - </names> - </hosts_entry> - <hosts_entry> - <host_address>::1</host_address> - <names config:type="list"> - <name>localhost ipv6-localhost ipv6-loopback</name> - </names> - </hosts_entry> - <hosts_entry> - <host_address>fe00::0</host_address> - <names config:type="list"> - <name>ipv6-localnet</name> - </names> - </hosts_entry> - <hosts_entry> - <host_address>ff00::0</host_address> - <names config:type="list"> - <name>ipv6-mcastprefix</name> - </names> - </hosts_entry> - <hosts_entry> - <host_address>ff02::1</host_address> - <names config:type="list"> - <name>ipv6-allnodes</name> - </names> - </hosts_entry> - <hosts_entry> - <host_address>ff02::2</host_address> - <names config:type="list"> - <name>ipv6-allrouters</name> - </names> - </hosts_entry> - <hosts_entry> - <host_address>ff02::3</host_address> - <names config:type="list"> - <name>ipv6-allhosts</name> - </names> - </hosts_entry> - </hosts> - </host> <login_settings/> <networking> <dhcp_options> @@ -524,7 +62,6 @@ </networking> <partitioning config:type="list"> <drive> - <device>/dev/sda</device> <initialize config:type="boolean">true</initialize> <partitions config:type="list"> <partition> @@ -588,1542 +125,19 @@ <software> <packages config:type="list"> - <package>desktop-translations</package> - <package>gconf2-branding-SLES</package> - <package>libproxy0-config-gnome</package> - <package>sle-sdk-release</package> - <package>sle-sdk-release-SDK</package> - <package>sles-manuals_en</package> - <package>yast2-trans-en_US</package> + <package>openssh</package> + <package>kernel-default-devel</package> + <package>sudo</package> + <package>gcc</package> + <package>wget</package> + <package>make</package> </packages> <patterns config:type="list"> - <pattern>Basis-Devel</pattern> <pattern>Minimal</pattern> <pattern>apparmor</pattern> - <pattern>base</pattern> - <pattern>sdk_kernel</pattern> </patterns> <remove-packages config:type="list"> - <package>3ddiag</package> - <package>CASA</package> - <package>CASA-devel</package> - <package>CASA_auth_token_client</package> - <package>CASA_auth_token_client-devel</package> - <package>ConsoleKit-devel</package> - <package>ConsoleKit-x11</package> - <package>DirectFB-devel</package> - <package>FastCGI</package> - <package>IlmBase</package> - <package>IlmBase-devel</package> - <package>ImageMagick</package> - <package>ImageMagick-devel</package> - <package>LibVNCServer</package> - <package>LibVNCServer-devel</package> - <package>Mesa</package> - <package>Mesa-devel</package> - <package>ModemManager</package> - <package>Modules</package> - <package>NetworkManager</package> - <package>NetworkManager-devel</package> - <package>NetworkManager-glib</package> - <package>NetworkManager-gnome</package> - <package>NetworkManager-kde4</package> - <package>NetworkManager-kde4-lang</package> - <package>NetworkManager-kde4-libs</package> - <package>OpenEXR</package> - <package>OpenEXR-devel</package> - <package>OpenIPMI-devel</package> - <package>PackageKit</package> - <package>PackageKit-devel</package> - <package>PackageKit-lang</package> - <package>PolicyKit-devel</package> - <package>PolicyKit-gnome</package> - <package>PolicyKit-gnome-devel</package> - <package>PolicyKit-gnome-libs</package> - <package>SDL-devel</package> - <package>SDL_net</package> - <package>SDL_net-devel</package> - <package>TeX-Guy</package> - <package>TeX-Guy-devel</package> - <package>VFlib3</package> - <package>VFlib3-devel</package> - <package>WindowMaker</package> - <package>WindowMaker-devel</package> - <package>a2ps</package> - <package>aalib</package> - <package>aalib-devel</package> - <package>akonadi-runtime</package> - <package>akregator</package> - <package>alsa-devel</package> - <package>alsa-firmware</package> - <package>alsa-plugins-pulse</package> - <package>alsa-tools</package> - <package>alsa-tools-devel</package> - <package>anthy</package> - <package>anthy-devel</package> - <package>antlr</package> - <package>apache2</package> - <package>apache2-devel</package> - <package>apache2-mod_perl</package> - <package>apache2-mod_perl-devel</package> - <package>apache2-prefork</package> - <package>apache2-utils</package> - <package>apache2-worker</package> - <package>apparmor-profile-editor</package> - <package>art-sharp2</package> - <package>arts</package> - <package>arts-devel</package> - <package>aspell-devel</package> - <package>at-spi</package> - <package>at-spi-devel</package> - <package>at-spi-lang</package> - <package>atk-devel</package> - <package>audiofile</package> - <package>audiofile-devel</package> - <package>audit-devel</package> - <package>augeas-lenses</package> - <package>automoc4</package> - <package>avahi</package> - <package>avahi-compat-howl-devel</package> - <package>avahi-compat-mDNSResponder-devel</package> - <package>avahi-lang</package> - <package>babl-0_0</package> - <package>banshee-1</package> - <package>banshee-1-backend-engine-gstreamer</package> - <package>banshee-1-backend-platform-gnome</package> - <package>banshee-1-backend-platform-unix</package> - <package>banshee-1-devel</package> - <package>banshee-1-extensions-default</package> - <package>banshee-1-lang</package> - <package>beagle-devel</package> - <package>bind-devel</package> - <package>binutils-devel</package> - <package>bluez</package> - <package>bluez-devel</package> - <package>boo</package> - <package>boo-devel</package> - <package>boost-devel</package> - <package>bootsplash-branding-SLED</package> - <package>cairo-devel</package> - <package>cairomm</package> - <package>cairomm-devel</package> - <package>canna</package> - <package>canna-devel</package> - <package>canna-libs</package> - <package>cannadic</package> - <package>capi4linux</package> - <package>capi4linux-devel</package> - <package>cdk</package> - <package>cdk-devel</package> - <package>cdrdao</package> - <package>chasen</package> - <package>chasen-devel</package> - <package>check</package> - <package>check-devel</package> - <package>chmlib</package> - <package>chmlib-devel</package> - <package>cim-schema</package> - <package>clucene-core</package> - <package>clucene-core-devel</package> - <package>cmake</package> - <package>compiz</package> - <package>compiz-branding-SLE</package> - <package>compiz-devel</package> - <package>compiz-gnome</package> - <package>coolkey-devel</package> - <package>cracklib-devel</package> - <package>crash-devel</package> - <package>crimson</package> - <package>cscope</package> - <package>cups</package> - <package>cups-devel</package> - <package>cvsps</package> - <package>cyrus-imapd-devel</package> - <package>cyrus-sasl-crammd5</package> - <package>cyrus-sasl-devel</package> - <package>dante</package> - <package>dante-devel</package> - <package>db1</package> - <package>db1-devel</package> - <package>db43</package> - <package>db43-devel</package> - <package>dbus-1-devel</package> - <package>dbus-1-glib-devel</package> - <package>dbus-1-python-devel</package> - <package>dbus-1-qt3</package> - <package>dbus-1-qt3-devel</package> - <package>dbus-1-x11</package> - <package>dejagnu</package> - <package>dejavu</package> - <package>desktop-data-openSUSE</package> - <package>desktop-file-utils</package> - <package>devhelp</package> - <package>devhelp-devel</package> - <package>devhelp-lang</package> - <package>device-mapper-devel</package> - <package>dhcp</package> - <package>dhcp-client</package> - <package>dhcp-devel</package> - <package>diffstat</package> - <package>dmapi-devel</package> - <package>dnsmasq</package> - <package>docbook-xsl-stylesheets</package> - <package>docbook_4</package> - <package>doxygen</package> - <package>dvd+rw-tools</package> - <package>e2fsprogs-devel</package> - <package>emacs</package> - <package>emacs-nox</package> - <package>emacs-x11</package> - <package>enchant</package> - <package>enchant-devel</package> - <package>enscript</package> - <package>eog</package> - <package>eog-devel</package> - <package>eog-lang</package> - <package>espeak</package> - <package>evince</package> - <package>evince-devel</package> - <package>evince-lang</package> - <package>evoldap2-devel</package> - <package>evolution</package> - <package>evolution-data-server</package> - <package>evolution-data-server-devel</package> - <package>evolution-data-server-lang</package> - <package>evolution-devel</package> - <package>evolution-lang</package> - <package>expect-devel</package> - <package>facter</package> - <package>fam</package> - <package>fam-devel</package> - <package>farsight</package> - <package>farsight-devel</package> - <package>festival</package> - <package>festival-devel</package> - <package>fftw</package> - <package>fftw-devel</package> - <package>fftw-mpi</package> - <package>fftw-mpi-devel</package> - <package>fftw-threads</package> - <package>fftw-threads-devel</package> - <package>fftw3</package> - <package>fftw3-devel</package> - <package>fftw3-threads</package> - <package>fftw3-threads-devel</package> - <package>file-devel</package> - <package>fileshareset</package> - <package>finch</package> - <package>finch-devel</package> - <package>flac-devel</package> - <package>fltk</package> - <package>fltk-devel</package> - <package>fontconfig-devel</package> - <package>fonts-config</package> - <package>foomatic-filters</package> - <package>freeglut</package> - <package>freeglut-devel</package> - <package>freeradius-client-devel</package> - <package>freeradius-client-libs</package> - <package>freeradius-server-devel</package> - <package>freeradius-server-libs</package> - <package>freetype</package> - <package>freetype2-devel</package> - <package>fribidi</package> - <package>fribidi-devel</package> - <package>ft2demos</package> - <package>fuse-devel</package> - <package>fwnn-devel</package> - <package>fxload</package> - <package>gcc-gij</package> - <package>gcc-java</package> - <package>gcc43-gij</package> - <package>gcc43-java</package> - <package>gconf-sharp2</package> - <package>gconf2-devel</package> - <package>gconfmm</package> - <package>gconfmm-devel</package> - <package>gd</package> - <package>gd-devel</package> - <package>gdbm-32bit</package> - <package>gdk-pixbuf</package> - <package>gdk-pixbuf-devel</package> - <package>gegl-0_0</package> - <package>gettext-tools</package> - <package>gfxboot-branding-SLED</package> - <package>gfxboot-devel</package> - <package>ggz</package> - <package>ggz-client-libs</package> - <package>ggz-client-libs-devel</package> - <package>ggz-client-libs-lang</package> - <package>ghex</package> - <package>ghex-devel</package> - <package>ghex-lang</package> - <package>ghostscript-devel</package> - <package>ghostscript-fonts-other</package> - <package>ghostscript-fonts-std</package> - <package>ghostscript-ijs-devel</package> - <package>ghostscript-library</package> - <package>ghostscript-omni</package> - <package>ghostscript-x11</package> - <package>giflib-devel</package> - <package>gimp</package> - <package>gimp-branding-SLED</package> - <package>gimp-devel</package> - <package>gimp-lang</package> - <package>gimp-plugins-python</package> - <package>git</package> - <package>git-arch</package> - <package>git-core</package> - <package>git-cvs</package> - <package>git-daemon</package> - <package>git-email</package> - <package>git-gui</package> - <package>git-svn</package> - <package>git-web</package> - <package>gitk</package> - <package>gjdoc</package> - <package>glade-sharp2</package> - <package>glade3</package> - <package>glade3-lang</package> - <package>glib</package> - <package>glib-devel</package> - <package>glib-sharp2</package> - <package>glib2-devel</package> - <package>glibmm2</package> - <package>glibmm2-devel</package> - <package>glitz</package> - <package>glitz-devel</package> - <package>gltt</package> - <package>gltt-devel</package> - <package>gmime-2_4-devel</package> - <package>gmime-devel</package> - <package>gmp-devel</package> - <package>gnet</package> - <package>gnet-devel</package> - <package>gnokii</package> - <package>gnokii-devel</package> - <package>gnokii-smsd</package> - <package>gnome-certauth-devel</package> - <package>gnome-control-center</package> - <package>gnome-control-center-devel</package> - <package>gnome-control-center-lang</package> - <package>gnome-desktop</package> - <package>gnome-desktop-devel</package> - <package>gnome-desktop-lang</package> - <package>gnome-doc-utils</package> - <package>gnome-doc-utils-devel</package> - <package>gnome-doc-utils-lang</package> - <package>gnome-keyring-devel</package> - <package>gnome-keyring-sharp</package> - <package>gnome-keyring-sharp-devel</package> - <package>gnome-libs</package> - <package>gnome-libs-devel</package> - <package>gnome-mag</package> - <package>gnome-mag-devel</package> - <package>gnome-mag-lang</package> - <package>gnome-main-menu</package> - <package>gnome-main-menu-lang</package> - <package>gnome-media</package> - <package>gnome-media-devel</package> - <package>gnome-media-lang</package> - <package>gnome-menus</package> - <package>gnome-menus-branding-SLED</package> - <package>gnome-menus-devel</package> - <package>gnome-menus-lang</package> - <package>gnome-mount</package> - <package>gnome-mount-lang</package> - <package>gnome-panel</package> - <package>gnome-panel-devel</package> - <package>gnome-panel-lang</package> - <package>gnome-pilot</package> - <package>gnome-pilot-devel</package> - <package>gnome-pilot-lang</package> - <package>gnome-settings-daemon</package> - <package>gnome-settings-daemon-devel</package> - <package>gnome-settings-daemon-lang</package> - <package>gnome-sharp2</package> - <package>gnome-speech</package> - <package>gnome-speech-devel</package> - <package>gnome-themes</package> - <package>gnome-utils</package> - <package>gnome-utils-devel</package> - <package>gnome-utils-lang</package> - <package>gnome-vfs-sharp2</package> - <package>gnome-vfs2</package> - <package>gnome-vfs2-devel</package> - <package>gnome-vfs2-lang</package> - <package>gnome-vfsmm</package> - <package>gnome-vfsmm-devel</package> - <package>gnopernicus</package> - <package>gnopernicus-devel</package> - <package>gnopernicus-lang</package> - <package>gnutls</package> - <package>goffice</package> - <package>goffice-devel</package> - <package>goffice-lang</package> - <package>goocanvas</package> - <package>goocanvas-devel</package> - <package>goocanvas-lang</package> - <package>goom2k4</package> - <package>goom2k4-devel</package> - <package>graphviz</package> - <package>graphviz-devel</package> - <package>graphviz-gd</package> - <package>graphviz-gnome</package> - <package>gstreamer-0_10</package> - <package>gstreamer-0_10-devel</package> - <package>gstreamer-0_10-lang</package> - <package>gstreamer-0_10-plugins-base</package> - <package>gstreamer-0_10-plugins-base-devel</package> - <package>gstreamer-0_10-plugins-base-lang</package> - <package>gstreamer-0_10-plugins-good</package> - <package>gstreamer-0_10-plugins-good-lang</package> - <package>gstreamer-0_10-utils</package> - <package>gstreamer-utils</package> - <package>gtk</package> - <package>gtk-devel</package> - <package>gtk-lang</package> - <package>gtk-sharp2</package> - <package>gtk-vnc-devel</package> - <package>gtk2-devel</package> - <package>gtkglext</package> - <package>gtkglext-devel</package> - <package>gtkhtml2</package> - <package>gtkhtml2-devel</package> - <package>gtkhtml2-lang</package> - <package>gtkhtml314-sharp</package> - <package>gtkmm2</package> - <package>gtkmm2-devel</package> - <package>gtksourceview-devel</package> - <package>gtksourceview-lang</package> - <package>gtksourceview18</package> - <package>gtksourceview18-devel</package> - <package>gtkspell</package> - <package>gtkspell-devel</package> - <package>gtkspell-lang</package> - <package>gucharmap</package> - <package>gucharmap-devel</package> - <package>gucharmap-lang</package> - <package>guile</package> - <package>guile-devel</package> - <package>gutenprint</package> - <package>gutenprint-devel</package> - <package>gvfs-devel</package> - <package>gxmhtml</package> - <package>hal-devel</package> - <package>hal-palm</package> - <package>htdig</package> - <package>htdig-devel</package> - <package>hunspell</package> - <package>hunspell-devel</package> - <package>hunspell-tools</package> - <package>hwinfo-devel</package> - <package>i4l-base</package> - <package>icewm</package> - <package>icewm-lite</package> - <package>id3lib</package> - <package>id3lib-devel</package> - <package>imap-devel</package> - <package>imap-lib</package> - <package>imlib</package> - <package>imlib-devel</package> - <package>imlib2</package> - <package>imlib2-devel</package> - <package>indent</package> - <package>info2html</package> - <package>inn</package> - <package>inn-devel</package> - <package>intltool</package> - <package>ipadic</package> - <package>iptables-devel</package> - <package>iso-codes</package> - <package>iso-codes-devel</package> - <package>iso_ent</package> - <package>ispell</package> - <package>ispell-american</package> - <package>ispell-brazilian</package> - <package>ispell-british</package> - <package>ispell-czech</package> - <package>ispell-danish</package> - <package>ispell-finnish</package> - <package>ispell-french</package> - <package>ispell-german</package> - <package>ispell-hungarian</package> - <package>ispell-italian</package> - <package>ispell-ngerman</package> - <package>ispell-norsk</package> - <package>ispell-polish</package> - <package>ispell-portuguese</package> - <package>ispell-russian</package> - <package>ispell-slovak</package> - <package>ispell-spanish</package> - <package>ispell-swedish</package> - <package>itcl-devel</package> - <package>java-1_4_2-ibm</package> - <package>java-1_4_2-ibm-devel</package> - <package>java-1_5_0-gcj-compat</package> - <package>java-1_5_0-gcj-compat-devel</package> - <package>java-1_6_0-ibm</package> - <package>java-1_6_0-ibm-devel</package> - <package>joe</package> - <package>jpackage-utils</package> - <package>k3b</package> - <package>k3b-devel</package> - <package>k3b-lang</package> - <package>kaddressbook</package> - <package>kalarm</package> - <package>kde-susetranslations</package> - <package>kde4-filesystem</package> - <package>kde4-kgreeter-plugins</package> - <package>kdebase3</package> - <package>kdebase3-devel</package> - <package>kdebase3-runtime</package> - <package>kdebase4-SLED</package> - <package>kdebase4-SLED-lang</package> - <package>kdebase4-runtime</package> - <package>kdebase4-runtime-branding-SLED</package> - <package>kdebase4-workspace</package> - <package>kdebase4-workspace-branding-SLED</package> - <package>kdebase4-workspace-devel</package> - <package>kdebase4-workspace-ksysguardd</package> - <package>kdelibs3</package> - <package>kdelibs3-arts</package> - <package>kdelibs3-default-style</package> - <package>kdelibs3-devel</package> - <package>kdelibs3-doc</package> - <package>kdelibs4</package> - <package>kdelibs4-branding-SLED</package> - <package>kdelibs4-core</package> - <package>kdelibs4-doc</package> - <package>kdemultimedia3-arts</package> - <package>kdepim3</package> - <package>kdepim4</package> - <package>kdepim4-devel</package> - <package>kdepimlibs4</package> - <package>kdialog</package> - <package>kdm</package> - <package>kdm-branding-SLED</package> - <package>kernel-docs</package> - <package>kernel-syms</package> - <package>kernel-trace-devel</package> - <package>kernel-xen-devel</package> - <package>keyutils-devel</package> - <package>kio_sysinfo</package> - <package>kio_sysinfo-branding-SLED</package> - <package>kmail</package> - <package>knode</package> - <package>kontact</package> - <package>korganizer</package> - <package>kpilot</package> - <package>krb5-devel</package> - <package>ksh-devel</package> - <package>ktorrent</package> - <package>ktorrent-devel</package> - <package>ktorrent-lang</package> - <package>kwin</package> - <package>ladspa-devel</package> - <package>lib3ds-1-3</package> - <package>lib3ds-devel</package> - <package>libFLAC++6</package> - <package>libFLAC8</package> - <package>libHX-devel</package> - <package>libMagick++-devel</package> - <package>libMagick++1</package> - <package>libMagickWand1</package> - <package>libQtWebKit-devel</package> - <package>libQtWebKit4</package> - <package>libXerces-c-devel</package> - <package>libXerces-c28</package> - <package>libXiterm</package> - <package>libXiterm-devel</package> - <package>libacl-devel</package> - <package>libadns-devel</package> - <package>libadns1</package> - <package>libakode</package> - <package>libakode-devel</package> - <package>libakonadi4</package> - <package>libakonadiprotocolinternals-devel</package> - <package>libakonadiprotocolinternals1</package> - <package>libao</package> - <package>libao-devel</package> - <package>libapparmor-devel</package> - <package>libapr-util1</package> - <package>libapr-util1-devel</package> - <package>libapr1</package> - <package>libapr1-devel</package> - <package>libarchive-devel</package> - <package>libart_lgpl</package> - <package>libart_lgpl-devel</package> - <package>libassuan-devel</package> - <package>libatomic-ops-devel</package> - <package>libattr-devel</package> - <package>libavahi-core5</package> - <package>libavahi-devel</package> - <package>libavahi-glib-devel</package> - <package>libavahi-gobject-devel</package> - <package>libavahi-gobject0</package> - <package>libavahi-ui0</package> - <package>libavc1394-0</package> - <package>libavc1394-devel</package> - <package>libbabl-0_0-0</package> - <package>libbeagle-devel</package> - <package>libbeagle-python</package> - <package>libbeagle1</package> - <package>libbitmask-devel</package> - <package>libbitmask1</package> - <package>libblkid-devel</package> - <package>libblocxx-devel</package> - <package>libbonobo</package> - <package>libbonobo-devel</package> - <package>libbonobo-lang</package> - <package>libbonoboui</package> - <package>libbonoboui-devel</package> - <package>libbonoboui-lang</package> - <package>libboost_date_time1_36_0</package> - <package>libboost_filesystem1_36_0</package> - <package>libboost_graph1_36_0</package> - <package>libboost_iostreams1_36_0</package> - <package>libboost_math1_36_0</package> - <package>libboost_mpi1_36_0</package> - <package>libboost_program_options1_36_0</package> - <package>libboost_python1_36_0</package> - <package>libboost_serialization1_36_0</package> - <package>libboost_signals1_36_0</package> - <package>libboost_system1_36_0</package> - <package>libboost_test1_36_0</package> - <package>libboost_thread1_36_0</package> - <package>libboost_wave1_36_0</package> - <package>libbotan-1_6_4</package> - <package>libbotan-devel</package> - <package>libbtctl</package> - <package>libbtctl-devel</package> - <package>libbtctl-lang</package> - <package>libbtctl4</package> - <package>libbz2-devel</package> - <package>libcaca</package> - <package>libcaca-devel</package> - <package>libcanberra-gtk</package> - <package>libcanberra-gtk0</package> - <package>libcanberra0</package> - <package>libcap-devel</package> - <package>libcap-ng0</package> - <package>libcdda_interface0</package> - <package>libcdda_paranoia0</package> - <package>libcddb-devel</package> - <package>libcddb2</package> - <package>libcdio++0</package> - <package>libcdio-devel</package> - <package>libcgroup-devel</package> - <package>libcgroup1</package> - <package>libchewing</package> - <package>libchewing-devel</package> - <package>libcmpiutil</package> - <package>libcmpiutil-devel</package> - <package>libcolorblind0</package> - <package>libcom_err-devel</package> - <package>libcompizconfig</package> - <package>libcompizconfig-devel</package> - <package>libcppunit-1_12-0</package> - <package>libcppunit-devel</package> - <package>libcpuset-devel</package> - <package>libcpuset1</package> - <package>libcroco</package> - <package>libcroco-0_6-3</package> - <package>libcroco-devel</package> - <package>libcryptsetup-devel</package> - <package>libcsync-devel</package> - <package>libcsync0</package> - <package>libcurl-devel</package> - <package>libdaemon-devel</package> - <package>libdaemon0</package> - <package>libdatrie-devel</package> - <package>libdatrie0</package> - <package>libdb-4_5-32bit</package> - <package>libdb-4_5-devel</package> - <package>libdbus-1-qt3-0</package> - <package>libdbus-1-qt3-0-devel</package> - <package>libdc1394-22</package> - <package>libdc1394-devel</package> - <package>libdc1394_control12</package> - <package>libdc1394_control12-devel</package> - <package>libdhcp6client-1_0-2</package> - <package>libdhcp6client-devel</package> - <package>libdigikam-devel</package> - <package>libdiscid1</package> - <package>libdjvulibre-devel</package> - <package>libdjvulibre21</package> - <package>libdmxview-devel</package> - <package>libdmxview0</package> - <package>libdnet-devel</package> - <package>libdnet1</package> - <package>libdns_sd</package> - <package>libdrm</package> - <package>libdrm-devel</package> - <package>libdv-devel</package> - <package>libdv4</package> - <package>libdvdread4</package> - <package>libdw-devel</package> - <package>libebl-devel</package> - <package>libedit-devel</package> - <package>libedit0</package> - <package>libelf-devel</package> - <package>libenchant1</package> - <package>libesd-devel</package> - <package>libesd0</package> - <package>libesmtp-devel</package> - <package>libevoldap-2_4-2</package> - <package>libevtlog-devel</package> - <package>libevtlog0</package> - <package>libexempi-devel</package> - <package>libexempi3</package> - <package>libexif-devel</package> - <package>libexiv2-4</package> - <package>libexiv2-devel</package> - <package>libexpat-devel</package> - <package>libext2fs-devel</package> - <package>libfarsight-0_1-3</package> - <package>libffi-devel</package> - <package>libffi43</package> - <package>libffi43-devel</package> - <package>libflaim-devel</package> - <package>libfprint-devel</package> - <package>libfreebl3</package> - <package>libfreebob</package> - <package>libfreebob-devel</package> - <package>libgadu</package> - <package>libgadu-devel</package> - <package>libgail-gnome</package> - <package>libgail-gnome-devel</package> - <package>libgcj-devel</package> - <package>libgcj43</package> - <package>libgcj43-devel</package> - <package>libgcj43-jar</package> - <package>libgcj_bc43</package> - <package>libgcrypt-devel</package> - <package>libgda-3_0-3</package> - <package>libgda-3_0-devel</package> - <package>libgdiplus0</package> - <package>libgegl-0_0-0</package> - <package>libgeoclue0</package> - <package>libgfortran46</package> - <package>libggz2</package> - <package>libggz2-devel</package> - <package>libgimpprint</package> - <package>libgimpprint-devel</package> - <package>libglade2</package> - <package>libglade2-devel</package> - <package>libglademm</package> - <package>libglademm-2_4-1</package> - <package>libglademm-devel</package> - <package>libgladeui-1-9</package> - <package>libgladeui-1_0-devel</package> - <package>libgmime-2_0-3</package> - <package>libgmime-2_4-2</package> - <package>libgmm++-devel</package> - <package>libgnome</package> - <package>libgnome-certauth0</package> - <package>libgnome-desktop-2-11</package> - <package>libgnome-devel</package> - <package>libgnome-lang</package> - <package>libgnome-menu2</package> - <package>libgnome-window-settings1</package> - <package>libgnomecanvas</package> - <package>libgnomecanvas-devel</package> - <package>libgnomecanvas-lang</package> - <package>libgnomecanvasmm</package> - <package>libgnomecanvasmm-devel</package> - <package>libgnomecups</package> - <package>libgnomecups-devel</package> - <package>libgnomecups-lang</package> - <package>libgnomedb</package> - <package>libgnomedb-devel</package> - <package>libgnomedb-lang</package> - <package>libgnomekbd</package> - <package>libgnomekbd-devel</package> - <package>libgnomekbd-lang</package> - <package>libgnomeprint</package> - <package>libgnomeprint-devel</package> - <package>libgnomeprint-lang</package> - <package>libgnomeprintui</package> - <package>libgnomeprintui-devel</package> - <package>libgnomeprintui-lang</package> - <package>libgnomesu</package> - <package>libgnomesu-devel</package> - <package>libgnomesu-lang</package> - <package>libgnomesu0</package> - <package>libgnomeui</package> - <package>libgnomeui-devel</package> - <package>libgnomeui-lang</package> - <package>libgnomevfsmm-2_6-1</package> - <package>libgnutls-devel</package> - <package>libgnutls-extra-devel</package> - <package>libgnutls-extra26</package> - <package>libgoocanvas3</package> - <package>libgpg-error-devel</package> - <package>libgpgme-devel</package> - <package>libgphoto2-devel</package> - <package>libgpod-devel</package> - <package>libgsf</package> - <package>libgsf-1-114</package> - <package>libgsf-devel</package> - <package>libgsf-gnome</package> - <package>libgsm-devel</package> - <package>libgsm1</package> - <package>libgssglue-devel</package> - <package>libgstapp-0_10-0</package> - <package>libgstinterfaces-0_10-0</package> - <package>libgstreamer-0_10-0</package> - <package>libgtk-vnc-1_0-0</package> - <package>libgtkhtml</package> - <package>libgtkhtml-devel</package> - <package>libgtksourceview-2_0-0</package> - <package>libgtop</package> - <package>libgtop-2_0-7</package> - <package>libgtop-devel</package> - <package>libgtop-lang</package> - <package>libgudev-1_0-0</package> - <package>libgweather</package> - <package>libgweather-devel</package> - <package>libgweather-lang</package> - <package>libgweather1</package> - <package>libhangul</package> - <package>libhangul-devel</package> - <package>libhowl0</package> - <package>libical-devel</package> - <package>libical0</package> - <package>libicu-devel</package> - <package>libid3tag</package> - <package>libid3tag-devel</package> - <package>libidl-devel</package> - <package>libidn-devel</package> - <package>libiec61883</package> - <package>libiec61883-devel</package> - <package>libieee1284</package> - <package>libiniparser-devel</package> - <package>libiniparser0</package> - <package>libiptcdata</package> - <package>libiptcdata-devel</package> - <package>libiptcdata0</package> - <package>libiso9660-5</package> - <package>libiterm</package> - <package>libiterm-devel</package> - <package>libjack-devel</package> - <package>libjack0</package> - <package>libjasper</package> - <package>libjasper-devel</package> - <package>libjingle-0_3-0</package> - <package>libjingle-devel</package> - <package>libjpeg-devel</package> - <package>libkcal</package> - <package>libkcal-devel</package> - <package>libkcal2</package> - <package>libkcddb4</package> - <package>libkcddb4-devel</package> - <package>libkcompactdisc4</package> - <package>libkcompactdisc4-devel</package> - <package>libkdcraw3</package> - <package>libkdcraw3-devel</package> - <package>libkdcraw3-lang</package> - <package>libkde4</package> - <package>libkde4-devel</package> - <package>libkdecore4</package> - <package>libkdecore4-devel</package> - <package>libkdepim4</package> - <package>libkdepim4-devel</package> - <package>libkdepimlibs4</package> - <package>libkdepimlibs4-devel</package> - <package>libkexiv2-3</package> - <package>libkexiv2-3-devel</package> - <package>libkexiv2-7</package> - <package>libkipi-devel</package> - <package>libkipi6</package> - <package>libkmime-devel</package> - <package>libkmime2</package> - <package>libknotificationitem-1-1</package> - <package>libkonq-devel</package> - <package>libkonq5</package> - <package>libksba-devel</package> - <package>libktnef-devel</package> - <package>libktnef1</package> - <package>liblazy-devel</package> - <package>liblazy1</package> - <package>liblcms-devel</package> - <package>libldapcpp-devel</package> - <package>liblog4c-devel</package> - <package>liblog4c3</package> - <package>libloudmouth-1-0</package> - <package>liblpsolve55</package> - <package>liblua5_1</package> - <package>libmalaga-devel</package> - <package>libmalaga7</package> - <package>libmcrypt</package> - <package>libmcrypt-devel</package> - <package>libmikmod</package> - <package>libmikmod-devel</package> - <package>libmm-devel</package> - <package>libmm14</package> - <package>libmng-devel</package> - <package>libmpcdec-devel</package> - <package>libmpcdec5</package> - <package>libmspack-devel</package> - <package>libmtp-devel</package> - <package>libmtp8</package> - <package>libmusicbrainz-devel</package> - <package>libmusicbrainz3-6</package> - <package>libmusicbrainz3-devel</package> - <package>libmusicbrainz4</package> - <package>libmysqlclient-devel</package> - <package>libmysqlclient15</package> - <package>libmysqlclient_r15</package> - <package>libneon-devel</package> - <package>libneon27</package> - <package>libnetapi-devel</package> - <package>libnetapi0</package> - <package>libnetcontrol0</package> - <package>libnetpbm-devel</package> - <package>libnetpbm10</package> - <package>libnewt0_52</package> - <package>libnjb</package> - <package>libnjb-devel</package> - <package>libnjb5</package> - <package>libnl-devel</package> - <package>libnotify</package> - <package>libnotify-devel</package> - <package>libnotify1</package> - <package>libnscd-devel</package> - <package>libnsssharedhelper0</package> - <package>libnuma-devel</package> - <package>libofa-devel</package> - <package>libofa0</package> - <package>libogg-devel</package> - <package>libogg0</package> - <package>liboil</package> - <package>liboil-devel</package> - <package>libopenbabel-devel</package> - <package>libopenbabel3</package> - <package>libopencdk-devel</package> - <package>libopencdk10</package> - <package>libopenraw-devel</package> - <package>libopenraw1</package> - <package>libopenssl-devel</package> - <package>libopensync</package> - <package>libopensync-devel</package> - <package>libopensync-plugin-evolution2</package> - <package>libopensync-plugin-evolution2-devel</package> - <package>libopensync-plugin-palm</package> - <package>libopensync-plugin-palm-devel</package> - <package>liborc-0_4-0</package> - <package>libosip2</package> - <package>libosip2-devel</package> - <package>libotf</package> - <package>libotf-devel</package> - <package>libotr-devel</package> - <package>libotr2</package> - <package>libp11-1</package> - <package>libp11-devel</package> - <package>libpackagekit-glib10</package> - <package>libpackagekit-glib10-devel</package> - <package>libpangomm-1_4-1</package> - <package>libpcap-devel</package> - <package>libpciaccess0</package> - <package>libpciaccess0-devel</package> - <package>libphonon4</package> - <package>libpisock-devel</package> - <package>libpisock9</package> - <package>libpisync-devel</package> - <package>libpisync1</package> - <package>libpixman-1-0-devel</package> - <package>libpkcs11-helper1</package> - <package>libpng-devel</package> - <package>libpolkit-qt0</package> - <package>libpoppler-devel</package> - <package>libpoppler-glib-devel</package> - <package>libpoppler-glib4</package> - <package>libpoppler-qt2</package> - <package>libpoppler-qt3-devel</package> - <package>libpoppler-qt4-3</package> - <package>libpoppler-qt4-devel</package> - <package>libpoppler5</package> - <package>libpst4</package> - <package>libpt2</package> - <package>libpt2-devel</package> - <package>libpulse-browse0</package> - <package>libpulse-devel</package> - <package>libpulse-mainloop-glib0</package> - <package>libpulse0</package> - <package>libpurple</package> - <package>libpurple-devel</package> - <package>libpurple-lang</package> - <package>libqca2</package> - <package>libqca2-devel</package> - <package>libqdialogsolver1</package> - <package>libqdialogsolver1-devel</package> - <package>libqimageblitz-devel</package> - <package>libqimageblitz4</package> - <package>libqscintilla-devel</package> - <package>libqscintilla2-5</package> - <package>libqt4</package> - <package>libqt4-devel</package> - <package>libqt4-qt3support</package> - <package>libqt4-sql</package> - <package>libqt4-sql-mysql</package> - <package>libqt4-sql-postgresql</package> - <package>libqt4-sql-sqlite</package> - <package>libqt4-sql-unixODBC</package> - <package>libqt4-x11</package> - <package>libqtpod-devel</package> - <package>libqtpod0</package> - <package>libquadmath46</package> - <package>libquicktime</package> - <package>libquicktime-devel</package> - <package>libraptor-devel</package> - <package>libraptor1</package> - <package>librasqal-devel</package> - <package>librasqal1</package> - <package>libraw1394-11</package> - <package>libraw1394-8</package> - <package>libraw1394-devel</package> - <package>libredland-devel</package> - <package>libredland0</package> - <package>libreiserfs-devel</package> - <package>libreoffice</package> - <package>libreoffice-base</package> - <package>libreoffice-branding-SLED</package> - <package>libreoffice-branding-upstream</package> - <package>libreoffice-calc</package> - <package>libreoffice-icon-themes</package> - <package>libreoffice-impress</package> - <package>libreoffice-sdk</package> - <package>libreoffice-writer</package> - <package>librsvg</package> - <package>librsvg-devel</package> - <package>libsamplerate</package> - <package>libsamplerate-devel</package> - <package>libsatsolver-devel</package> - <package>libsblim-cmpiutil1</package> - <package>libselinux-devel</package> - <package>libsemanage-devel</package> - <package>libsemanage1</package> - <package>libsensors3-devel</package> - <package>libsensors4</package> - <package>libsepol-devel</package> - <package>libsexy</package> - <package>libsexy-devel</package> - <package>libshout-devel</package> - <package>libshout3</package> - <package>libsidplay1</package> - <package>libsidplay1-devel</package> - <package>libsigc++2</package> - <package>libsigc++2-devel</package> - <package>libslab-lang</package> - <package>libslab0</package> - <package>libsmbclient-devel</package> - <package>libsmbios-devel</package> - <package>libsmbsharemodes-devel</package> - <package>libsmbsharemodes0</package> - <package>libsndfile</package> - <package>libsndfile-devel</package> - <package>libsoprano-devel</package> - <package>libsoprano4</package> - <package>libsoup-devel</package> - <package>libspectre-devel</package> - <package>libspectre1</package> - <package>libspeex</package> - <package>libssh2-devel</package> - <package>libstrigi0</package> - <package>libstroke</package> - <package>libstroke-devel</package> - <package>libsyncml-devel</package> - <package>libsyncml0</package> - <package>libtalloc-devel</package> - <package>libtasn1-devel</package> - <package>libtdb-devel</package> - <package>libtelepathy</package> - <package>libtelepathy-devel</package> - <package>libtelepathy-glib0</package> - <package>libtheora-devel</package> - <package>libtheora0</package> - <package>libtidy</package> - <package>libtidy-devel</package> - <package>libtiff-devel</package> - <package>libtirpc-devel</package> - <package>libtomoe-gtk0</package> - <package>libtspi1</package> - <package>libtunepimp</package> - <package>libtunepimp-devel</package> - <package>libtunepimp5</package> - <package>libudev-devel</package> - <package>libudf0</package> - <package>libunique-1_0-0</package> - <package>libunwind</package> - <package>libunwind-devel</package> - <package>libupsclient1</package> - <package>libusb-devel</package> - <package>libusbpp-0_1-4</package> - <package>libustr-1_0-1</package> - <package>libustr-devel</package> - <package>libuuid-devel</package> - <package>libvirt-client</package> - <package>libvirt-devel</package> - <package>libvisual</package> - <package>libvisual-devel</package> - <package>libvoikko-devel</package> - <package>libvoikko1</package> - <package>libvorbis</package> - <package>libvorbis-devel</package> - <package>libwavpack1</package> - <package>libwbclient-devel</package> - <package>libwbxml2-0</package> - <package>libwbxml2-devel</package> - <package>libwebkit-1_0-1</package> - <package>libwebkit-1_0-2</package> - <package>libwebkit-devel</package> - <package>libwebkit-lang</package> - <package>libwmf</package> - <package>libwmf-devel</package> - <package>libwmf-gnome</package> - <package>libwnck</package> - <package>libwnck-1-22</package> - <package>libwnck-devel</package> - <package>libwnck-lang</package> - <package>libwpd-0_8-8</package> - <package>libwpd-devel</package> - <package>libwpg-0_1-1</package> - <package>libwpg-devel</package> - <package>libwps-0_1-1</package> - <package>libwps-devel</package> - <package>libwsman-devel</package> - <package>libwsman1</package> - <package>libxcrypt-devel</package> - <package>libxine-devel</package> - <package>libxine1</package> - <package>libxklavier-devel</package> - <package>libxklavier15</package> - <package>libxml2-devel</package> - <package>libxslt-devel</package> - <package>libyajl1</package> - <package>libzio-devel</package> - <package>libzip-devel</package> - <package>libzip1</package> - <package>libzvbi0</package> - <package>libzypp-devel</package> - <package>limal-apparmor-notifications</package> - <package>limal-apparmor-notifications-devel</package> - <package>limal-ca-mgm-devel</package> - <package>limal-devel</package> - <package>limal-devtools</package> - <package>limal-nfs-server-devel</package> - <package>linux-atm-devel</package> - <package>linux-atm-lib</package> - <package>lksctp-tools</package> - <package>lksctp-tools-devel</package> - <package>loudmouth-devel</package> - <package>lua</package> - <package>lua-devel</package> - <package>lzo-devel</package> - <package>m17n-db</package> - <package>m17n-lib</package> - <package>m17n-lib-devel</package> - <package>malaga-suomi</package> - <package>meanwhile</package> - <package>meanwhile-devel</package> - <package>metacity</package> - <package>metacity-devel</package> - <package>metacity-lang</package> - <package>mhash</package> - <package>mhash-devel</package> - <package>misc-console-font</package> - <package>mono-addins</package> - <package>mono-basic</package> - <package>mono-core</package> - <package>mono-data</package> - <package>mono-data-oracle</package> - <package>mono-data-sqlite</package> - <package>mono-devel</package> - <package>mono-extras</package> - <package>mono-jscript</package> - <package>mono-tools</package> - <package>mono-wcf</package> - <package>mono-web</package> - <package>mono-winforms</package> - <package>mono-zeroconf</package> - <package>mono-zeroconf-provider-avahi</package> - <package>monodevelop</package> - <package>monodoc-core</package> - <package>mozilla-nspr</package> - <package>mozilla-nspr-devel</package> - <package>mozilla-nss</package> - <package>mozilla-nss-devel</package> - <package>mozilla-xulrunner192</package> - <package>mozilla-xulrunner192-gnome</package> - <package>mpfr-devel</package> - <package>mpi-selector</package> - <package>mpich</package> - <package>mpich-devel</package> - <package>mysql</package> - <package>mysql-client</package> - <package>nagios</package> - <package>nagios-devel</package> - <package>nagios-www</package> - <package>nant</package> - <package>nautilus</package> - <package>nautilus-cd-burner</package> - <package>nautilus-cd-burner-devel</package> - <package>nautilus-cd-burner-lang</package> - <package>nautilus-devel</package> - <package>nautilus-lang</package> - <package>ndesk-dbus</package> - <package>ndesk-dbus-glib</package> - <package>ndesk-dbus-glib-devel</package> - <package>net-snmp</package> - <package>net-snmp-devel</package> - <package>netatalk</package> - <package>netatalk-devel</package> - <package>netcat-openbsd</package> - <package>newt</package> - <package>newt-devel</package> - <package>newt-static</package> - <package>nfsidmap-devel</package> - <package>notification-daemon</package> - <package>notification-daemon-lang</package> - <package>notify-sharp</package> - <package>nss-mdns</package> - <package>nss-shared-helper-devel</package> - <package>nut</package> - <package>nut-classic</package> - <package>nut-devel</package> - <package>opal</package> - <package>opal-devel</package> - <package>openCryptoki</package> - <package>openCryptoki-64bit</package> - <package>openCryptoki-devel</package> - <package>openct-devel</package> - <package>openhpi</package> - <package>openhpi-daemon</package> - <package>openhpi-devel</package> - <package>openjade</package> - <package>openjade-devel</package> - <package>openldap2-devel</package> - <package>openmotif-devel</package> - <package>openmotif-libs</package> - <package>openmpi</package> - <package>openobex-devel</package> - <package>openobex-glib-devel</package> - <package>opensc-devel</package> - <package>openslp-devel</package> - <package>opensp</package> - <package>opensp-devel</package> - <package>openwsman-client</package> - <package>openwsman-server</package> - <package>orbit</package> - <package>orbit-devel</package> - <package>orbit2-devel</package> - <package>oxygen-icon-theme</package> - <package>oxygen-icon-theme-scalable</package> - <package>ozerocdoff</package> - <package>pam-devel</package> - <package>pango-devel</package> - <package>pangomm-devel</package> - <package>parted-devel</package> - <package>patchutils</package> - <package>pciutils-devel</package> - <package>pcre-devel</package> - <package>pcsc-acr38</package> - <package>pcsc-acr38-devel</package> - <package>pcsc-lite-devel</package> - <package>perl-32bit</package> - <package>perl-Crypt-OpenSSL-RSA</package> - <package>perl-Mail-DKIM</package> - <package>perl-MailTools</package> - <package>perl-Net-DNS</package> - <package>perl-Net-IP</package> - <package>perl-NetAddr-IP</package> - <package>perl-SNMP</package> - <package>perl-Tie-IxHash</package> - <package>perl-Tk</package> - <package>perl-Tk-devel</package> - <package>perl-spamassassin</package> - <package>phonon</package> - <package>phonon-backend-gstreamer-0_10</package> - <package>phonon-devel</package> - <package>php5</package> - <package>php5-ctype</package> - <package>php5-devel</package> - <package>php5-dom</package> - <package>php5-hash</package> - <package>php5-iconv</package> - <package>php5-json</package> - <package>php5-pdo</package> - <package>php5-sqlite</package> - <package>php5-suhosin</package> - <package>php5-tokenizer</package> - <package>php5-xmlreader</package> - <package>php5-xmlwriter</package> - <package>php53</package> - <package>php53-ctype</package> - <package>php53-dom</package> - <package>php53-iconv</package> - <package>php53-json</package> - <package>php53-tokenizer</package> - <package>php53-xmlreader</package> - <package>php53-xmlwriter</package> - <package>pidgin</package> - <package>pidgin-devel</package> - <package>pilot-link</package> - <package>pkcs11-helper</package> - <package>pkcs11-helper-devel</package> - <package>planner</package> - <package>planner-devel</package> - <package>planner-lang</package> - <package>plasma-addons</package> - <package>plasma-theme-aya</package> - <package>plasmoid-networkmanagement</package> - <package>plasmoid-quickaccess</package> - <package>plotutils</package> - <package>poppler-data</package> - <package>poppler-tools</package> - <package>popt-devel</package> - <package>portmap</package> - <package>postfix-devel</package> - <package>postgresql-devel</package> - <package>postgresql-libs</package> - <package>ppp-devel</package> - <package>ppp-userpass</package> - <package>pstoedit</package> - <package>pstoedit-devel</package> - <package>pulseaudio</package> - <package>pulseaudio-esound-compat</package> - <package>pulseaudio-lang</package> - <package>puppet</package> - <package>python-cairo</package> - <package>python-cairo-devel</package> - <package>python-devel</package> - <package>python-gnome</package> - <package>python-gnome-devel</package> - <package>python-gobject2</package> - <package>python-gobject2-devel</package> - <package>python-gtk</package> - <package>python-gtk-devel</package> - <package>python-gtkglext</package> - <package>python-gtkglext-devel</package> - <package>python-gtksourceview</package> - <package>python-gtksourceview-devel</package> - <package>python-numeric</package> - <package>python-numpy</package> - <package>python-orbit</package> - <package>python-orbit-devel</package> - <package>pyxml</package> - <package>qt3</package> - <package>qt3-devel</package> - <package>quagga</package> - <package>quagga-devel</package> - <package>quilt</package> - <package>raptor</package> - <package>rarian</package> - <package>rarian-devel</package> - <package>re2c</package> - <package>readline-devel</package> - <package>recode-devel</package> - <package>rpm-devel</package> - <package>rrdtool</package> - <package>rrdtool-devel</package> - <package>rsyslog</package> - <package>ruby</package> - <package>rubygems</package> - <package>ruby-devel</package> - <package>ruby-doc-html</package> - <package>ruby-doc-ri</package> - <package>ruby-examples</package> - <package>ruby-fcgi</package> - <package>ruby-mysql</package> - <package>ruby-selinux</package> - <package>ruby-test-suite</package> - <package>ruby-tk</package> - <package>sablot</package> - <package>sablot-devel</package> - <package>samba-devel</package> - <package>sane-backends</package> - <package>sane-frontends</package> - <package>sax2-libsax</package> - <package>sax2-libsax-devel</package> - <package>sax2-libsax-perl</package> - <package>sax2-tools</package> - <package>sblim-cmpi-base</package> - <package>sblim-cmpi-base-devel</package> - <package>sblim-cmpi-devel</package> - <package>sblim-cmpiutil-devel</package> - <package>sblim-indication_helper</package> - <package>sblim-sfcb</package> - <package>sblim-sfcc</package> - <package>sblim-sfcc-devel</package> - <package>scim</package> - <package>scim-devel</package> - <package>scpm-devel</package> - <package>scrollkeeper</package> - <package>scrollkeeper-lang</package> - <package>seahorse</package> - <package>seahorse-devel</package> - <package>seahorse-lang</package> - <package>sendmail</package> - <package>sendmail-devel</package> - <package>sg3_utils-devel</package> - <package>sgml-skel</package> - <package>shared-mime-info</package> - <package>silc-toolkit</package> - <package>silc-toolkit-devel</package> - <package>slang</package> - <package>slang-devel</package> - <package>soprano</package> - <package>soprano-backend-redland</package> - <package>spamassassin</package> - <package>speex-devel</package> - <package>splashy-devel</package> - <package>sqlite2</package> - <package>sqlite3-devel</package> - <package>startup-notification</package> - <package>startup-notification-devel</package> - <package>strigi</package> - <package>strigi-devel</package> - <package>subversion</package> - <package>subversion-perl</package> - <package>susehelp</package> - <package>susehelp_cz</package> - <package>susehelp_de</package> - <package>susehelp_en</package> - <package>susehelp_es</package> - <package>susehelp_fr</package> - <package>susehelp_hu</package> - <package>susehelp_it</package> - <package>swig</package> - <package>syslogd</package> - <package>t1lib</package> - <package>t1lib-devel</package> - <package>taglib</package> - <package>taglib-devel</package> - <package>taglib-sharp</package> - <package>tango-icon-theme</package> - <package>tcl-devel</package> - <package>tcpd-devel</package> - <package>telepathy-glib-devel</package> - <package>telepathy-mission-control</package> - <package>telepathy-mission-control-devel</package> - <package>texlive-bin-devel</package> - <package>texlive-devel</package> - <package>tk-devel</package> - <package>tla</package> - <package>tn5250</package> - <package>tn5250-devel</package> - <package>tomoe</package> - <package>tomoe-devel</package> - <package>tomoe-gtk</package> - <package>tomoe-gtk-devel</package> - <package>tomoe-gtk-lang</package> - <package>totem-pl-parser</package> - <package>totem-pl-parser-devel</package> - <package>totem-pl-parser-lang</package> - <package>trousers</package> - <package>trousers-devel</package> - <package>tsclient</package> - <package>tsclient-devel</package> - <package>tsclient-lang</package> - <package>uim</package> - <package>uim-devel</package> - <package>unixODBC</package> - <package>unixODBC-devel</package> - <package>unsermake</package> - <package>update-desktop-files</package> - <package>usb_modeswitch</package> - <package>usb_modeswitch-data</package> - <package>valgrind</package> - <package>valgrind-devel</package> - <package>vte</package> - <package>vte-devel</package> - <package>vte-lang</package> - <package>wdiff</package> - <package>webkit-sharp</package> - <package>wireshark</package> - <package>wireshark-devel</package> - <package>wodim-devel</package> - <package>wordcut</package> - <package>wordcut-devel</package> - <package>words</package> - <package>wpa_supplicant</package> - <package>wvstreams</package> - <package>wvstreams-devel</package> - <package>wxGTK-compat</package> - <package>wxGTK-devel</package> - <package>wxGTK-gl</package> - <package>x11-input-wacom</package> - <package>x11-input-wacom-devel</package> - <package>x11-input-wacom-tools</package> - <package>xalan-j2</package> - <package>xaw3d-devel</package> - <package>xbase</package> - <package>xbase-devel</package> - <package>xdelta</package> - <package>xdelta-devel</package> - <package>xdg-menu</package> - <package>xen-devel</package> - <package>xen-libs</package> - <package>xerces-j2</package> - <package>xerces-j2-bootstrap</package> - <package>xerces-j2-xml-apis</package> - <package>xfsprogs-devel</package> - <package>xml-commons-apis-bootstrap</package> - <package>xml-commons-resolver-bootstrap</package> - <package>xml-commons-which-bootstrap</package> - <package>xmlcharent</package> - <package>xorg-x11</package> - <package>xorg-x11-devel</package> - <package>xorg-x11-fonts</package> - <package>xorg-x11-fonts-core</package> - <package>xorg-x11-fonts-devel</package> - <package>xorg-x11-libICE-devel</package> - <package>xorg-x11-libSM-devel</package> - <package>xorg-x11-libX11-devel</package> - <package>xorg-x11-libXau-devel</package> - <package>xorg-x11-libXdmcp-devel</package> - <package>xorg-x11-libXext-devel</package> - <package>xorg-x11-libXfixes-devel</package> - <package>xorg-x11-libXmu-devel</package> - <package>xorg-x11-libXp-devel</package> - <package>xorg-x11-libXpm-devel</package> - <package>xorg-x11-libXprintUtil-devel</package> - <package>xorg-x11-libXrender-devel</package> - <package>xorg-x11-libXt-devel</package> - <package>xorg-x11-libXv-devel</package> - <package>xorg-x11-libfontenc-devel</package> - <package>xorg-x11-libxcb-devel</package> - <package>xorg-x11-libxkbfile-devel</package> - <package>xorg-x11-proto-devel</package> - <package>xorg-x11-server</package> - <package>xorg-x11-util-devel</package> - <package>xorg-x11-xauth</package> - <package>xorg-x11-xtrans-devel</package> - <package>xosd</package> - <package>xosd-devel</package> - <package>xsp</package> - <package>xterm</package> - <package>xz-devel</package> - <package>yast2-core-devel</package> - <package>yast2-devtools</package> - <package>yast2-gtk</package> - <package>yast2-libyui-devel</package> - <package>yast2-ncurses-devel</package> - <package>yast2-qt</package> - <package>yast2-qt-devel</package> - <package>yast2-qt-pkg</package> - <package>yast2-storage-devel</package> - <package>yast2-ycp-ui-bindings-devel</package> - <package>yelp</package> - <package>yelp-lang</package> - <package>zenity</package> - <package>zenity-lang</package> - <package>zlib-devel</package> - <package>zsh</package> - <package>zvbi-devel</package> </remove-packages> - </software> <user_defaults> <expire></expire> @@ -2154,186 +168,6 @@ <user_password>$2y$05$NA1Li9ZKJOLRW5mMTXm6/e5r8dltWS5RpDZpvHrI82aLE00V51tdi</user_password> <username>vagrant</username> </user> - <user> - <encrypted config:type="boolean">true</encrypted> - <fullname>Games account</fullname> - <gid>100</gid> - <home>/var/games</home> - <password_settings> - <expire></expire> - <flag></flag> - <inact></inact> - <max></max> - <min></min> - <warn></warn> - </password_settings> - <shell>/bin/bash</shell> - <uid>12</uid> - <user_password>*</user_password> - <username>games</username> - </user> - <user> - <encrypted config:type="boolean">true</encrypted> - <fullname>bin</fullname> - <gid>1</gid> - <home>/bin</home> - <password_settings> - <expire></expire> - <flag></flag> - <inact></inact> - <max></max> - <min></min> - <warn></warn> - </password_settings> - <shell>/bin/bash</shell> - <uid>1</uid> - <user_password>*</user_password> - <username>bin</username> - </user> - <user> - <encrypted config:type="boolean">true</encrypted> - <fullname>nobody</fullname> - <gid>65533</gid> - <home>/var/lib/nobody</home> - <password_settings> - <expire></expire> - <flag></flag> - <inact></inact> - <max></max> - <min></min> - <warn></warn> - </password_settings> - <shell>/bin/bash</shell> - <uid>65534</uid> - <user_password>*</user_password> - <username>nobody</username> - </user> - <user> - <encrypted config:type="boolean">true</encrypted> - <fullname>Printing daemon</fullname> - <gid>7</gid> - <home>/var/spool/lpd</home> - <password_settings> - <expire></expire> - <flag></flag> - <inact></inact> - <max></max> - <min></min> - <warn></warn> - </password_settings> - <shell>/bin/bash</shell> - <uid>4</uid> - <user_password>*</user_password> - <username>lp</username> - </user> - <user> - <encrypted config:type="boolean">true</encrypted> - <fullname>User for uuidd</fullname> - <gid>104</gid> - <home>/var/run/uuidd</home> - <password_settings> - <expire></expire> - <flag></flag> - <inact></inact> - <max>99999</max> - <min>0</min> - <warn>7</warn> - </password_settings> - <shell>/bin/false</shell> - <uid>102</uid> - <user_password>*</user_password> - <username>uuidd</username> - </user> - <user> - <encrypted config:type="boolean">true</encrypted> - <fullname>Postfix Daemon</fullname> - <gid>51</gid> - <home>/var/spool/postfix</home> - <password_settings> - <expire></expire> - <flag></flag> - <inact></inact> - <max>99999</max> - <min>0</min> - <warn>7</warn> - </password_settings> - <shell>/bin/false</shell> - <uid>51</uid> - <user_password>*</user_password> - <username>postfix</username> - </user> - <user> - <encrypted config:type="boolean">true</encrypted> - <fullname>Novell Customer Center User</fullname> - <gid>111</gid> - <home>/var/lib/YaST2/suse-ncc-fakehome</home> - <password_settings> - <expire></expire> - <flag></flag> - <inact></inact> - <max>99999</max> - <min>0</min> - <warn>7</warn> - </password_settings> - <shell>/bin/bash</shell> - <uid>106</uid> - <user_password>*</user_password> - <username>suse-ncc</username> - </user> - <user> - <encrypted config:type="boolean">true</encrypted> - <fullname>FTP account</fullname> - <gid>49</gid> - <home>/srv/ftp</home> - <password_settings> - <expire></expire> - <flag></flag> - <inact></inact> - <max></max> - <min></min> - <warn></warn> - </password_settings> - <shell>/bin/bash</shell> - <uid>40</uid> - <user_password>*</user_password> - <username>ftp</username> - </user> - <user> - <encrypted config:type="boolean">true</encrypted> - <fullname>Gnome Display Manager daemon</fullname> - <gid>112</gid> - <home>/var/lib/gdm</home> - <password_settings> - <expire></expire> - <flag></flag> - <inact></inact> - <max>99999</max> - <min>0</min> - <warn>7</warn> - </password_settings> - <shell>/bin/false</shell> - <uid>107</uid> - <user_password>*</user_password> - <username>gdm</username> - </user> - <user> - <encrypted config:type="boolean">true</encrypted> - <fullname>Batch jobs daemon</fullname> - <gid>25</gid> - <home>/var/spool/atjobs</home> - <password_settings> - <expire></expire> - <flag></flag> - <inact></inact> - <max>99999</max> - <min>0</min> - <warn>7</warn> - </password_settings> - <shell>/bin/bash</shell> - <uid>25</uid> - <user_password>*</user_password> - <username>at</username> - </user> <user> <encrypted config:type="boolean">true</encrypted> <fullname>root</fullname> @@ -2352,211 +186,5 @@ <user_password>$2y$05$NA1Li9ZKJOLRW5mMTXm6/e5r8dltWS5RpDZpvHrI82aLE00V51tdi</user_password> <username>root</username> </user> - <user> - <encrypted config:type="boolean">true</encrypted> - <fullname>Mailer daemon</fullname> - <gid>12</gid> - <home>/var/spool/clientmqueue</home> - <password_settings> - <expire></expire> - <flag></flag> - <inact></inact> - <max></max> - <min></min> - <warn></warn> - </password_settings> - <shell>/bin/false</shell> - <uid>8</uid> - <user_password>*</user_password> - <username>mail</username> - </user> - <user> - <encrypted config:type="boolean">true</encrypted> - <fullname>Daemon</fullname> - <gid>2</gid> - <home>/sbin</home> - <password_settings> - <expire></expire> - <flag></flag> - <inact></inact> - <max></max> - <min></min> - <warn></warn> - </password_settings> - <shell>/bin/bash</shell> - <uid>2</uid> - <user_password>*</user_password> - <username>daemon</username> - </user> - <user> - <encrypted config:type="boolean">true</encrypted> - <fullname>NTP daemon</fullname> - <gid>108</gid> - <home>/var/lib/ntp</home> - <password_settings> - <expire></expire> - <flag></flag> - <inact></inact> - <max>99999</max> - <min>0</min> - <warn>7</warn> - </password_settings> - <shell>/bin/false</shell> - <uid>74</uid> - <user_password>*</user_password> - <username>ntp</username> - </user> - <user> - <encrypted config:type="boolean">true</encrypted> - <fullname>Unix-to-Unix CoPy system</fullname> - <gid>14</gid> - <home>/etc/uucp</home> - <password_settings> - <expire></expire> - <flag></flag> - <inact></inact> - <max></max> - <min></min> - <warn></warn> - </password_settings> - <shell>/bin/bash</shell> - <uid>10</uid> - <user_password>*</user_password> - <username>uucp</username> - </user> - <user> - <encrypted config:type="boolean">true</encrypted> - <fullname>User for D-Bus</fullname> - <gid>101</gid> - <home>/var/run/dbus</home> - <password_settings> - <expire></expire> - <flag></flag> - <inact></inact> - <max></max> - <min>0</min> - <warn>7</warn> - </password_settings> - <shell>/bin/false</shell> - <uid>100</uid> - <user_password>*</user_password> - <username>messagebus</username> - </user> - <user> - <encrypted config:type="boolean">true</encrypted> - <fullname>User for haldaemon</fullname> - <gid>102</gid> - <home>/var/run/hald</home> - <password_settings> - <expire></expire> - <flag></flag> - <inact></inact> - <max></max> - <min>0</min> - <warn>7</warn> - </password_settings> - <shell>/bin/false</shell> - <uid>101</uid> - <user_password>*</user_password> - <username>haldaemon</username> - </user> - <user> - <encrypted config:type="boolean">true</encrypted> - <fullname>WWW daemon apache</fullname> - <gid>8</gid> - <home>/var/lib/wwwrun</home> - <password_settings> - <expire></expire> - <flag></flag> - <inact></inact> - <max></max> - <min></min> - <warn></warn> - </password_settings> - <shell>/bin/false</shell> - <uid>30</uid> - <user_password>*</user_password> - <username>wwwrun</username> - </user> - <user> - <encrypted config:type="boolean">true</encrypted> - <fullname>Manual pages viewer</fullname> - <gid>62</gid> - <home>/var/cache/man</home> - <password_settings> - <expire></expire> - <flag></flag> - <inact></inact> - <max></max> - <min></min> - <warn></warn> - </password_settings> - <shell>/bin/bash</shell> - <uid>13</uid> - <user_password>*</user_password> - <username>man</username> - </user> - <user> - <encrypted config:type="boolean">true</encrypted> - <fullname>PolicyKit</fullname> - <gid>107</gid> - <home>/var/run/PolicyKit</home> - <password_settings> - <expire></expire> - <flag></flag> - <inact></inact> - <max>99999</max> - <min>0</min> - <warn>7</warn> - </password_settings> - <shell>/bin/false</shell> - <uid>104</uid> - <user_password>*</user_password> - <username>polkituser</username> - </user> - <user> - <encrypted config:type="boolean">true</encrypted> - <fullname>News system</fullname> - <gid>13</gid> - <home>/etc/news</home> - <password_settings> - <expire></expire> - <flag></flag> - <inact></inact> - <max></max> - <min></min> - <warn></warn> - </password_settings> - <shell>/bin/bash</shell> - <uid>9</uid> - <user_password>*</user_password> - <username>news</username> - </user> - <user> - <fullname>SSH daemon</fullname> - <gid>65</gid> - <home>/var/lib/sshd</home> - <shell>/bin/false</shell> - <uid>71</uid> - <username>sshd</username> - </user> - <user> - <encrypted config:type="boolean">true</encrypted> - <fullname>PulseAudio daemon</fullname> - <gid>109</gid> - <home>/var/lib/pulseaudio</home> - <password_settings> - <expire></expire> - <flag></flag> - <inact></inact> - <max>99999</max> - <min>0</min> - <warn>7</warn> - </password_settings> - <shell>/bin/false</shell> - <uid>105</uid> - <user_password>*</user_password> - <username>pulse</username> - </user> </users> </profile> diff --git a/http/sles-12/sles-12-x86_64-autoinst.xml b/http/sles-12/sles-12-x86_64-autoinst.xml index b4287770f..c7841bf18 100644 --- a/http/sles-12/sles-12-x86_64-autoinst.xml +++ b/http/sles-12/sles-12-x86_64-autoinst.xml @@ -5,15 +5,9 @@ <add_on_products config:type="list"/> </add-on> <bootloader> - <device_map config:type="list"> - <device_map_entry> - <firmware>hd0</firmware> - <linux>/dev/sda</linux> - </device_map_entry> - </device_map> <global> <activate>true</activate> - <append> resume=/dev/sda1 splash=silent quiet showopts</append> + <append>splash=silent quiet showopts</append> <append_failsafe>showopts apm=off noresume edd=off powersaved=off nohz=off highres=off processor.max_cstate=1 nomodeset x11failsafe</append_failsafe> <boot_boot>false</boot_boot> <boot_extended>false</boot_extended> @@ -46,19 +40,6 @@ <loader_type>grub2</loader_type> <sections config:type="list"/> </bootloader> - <ca_mgm> - <CAName>YaST_Default_CA</CAName> - <ca_commonName>YaST Default CA (vagrant-sles-12-x64)</ca_commonName> - <country>US</country> - <locality/> - <organisation/> - <organisationUnit/> - <password>ENTER PASSWORD HERE</password> - <server_commonName>vagrant-sles-12-x64.vagrantup.com</server_commonName> - <server_email>postmaster@vagrantup.com</server_email> - <state/> - <takeLocalServerName config:type="boolean">false</takeLocalServerName> - </ca_mgm> <deploy_image> <image_installation config:type="boolean">false</image_installation> </deploy_image> @@ -126,337 +107,6 @@ </signature-handling> <storage/> </general> - <groups config:type="list"> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>100</gid> - <group_password>x</group_password> - <groupname>users</groupname> - <userlist/> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>32</gid> - <group_password>x</group_password> - <groupname>public</groupname> - <userlist/> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>42</gid> - <group_password>x</group_password> - <groupname>trusted</groupname> - <userlist/> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>7</gid> - <group_password>x</group_password> - <groupname>lp</groupname> - <userlist/> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>498</gid> - <group_password>x</group_password> - <groupname>sshd</groupname> - <userlist/> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>54</gid> - <group_password>x</group_password> - <groupname>lock</groupname> - <userlist/> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>20</gid> - <group_password>x</group_password> - <groupname>cdrom</groupname> - <userlist/> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>65534</gid> - <group_password>x</group_password> - <groupname>nogroup</groupname> - <userlist>nobody</userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>6</gid> - <group_password>x</group_password> - <groupname>disk</groupname> - <userlist/> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>499</gid> - <group_password>x</group_password> - <groupname>messagebus</groupname> - <userlist/> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>40</gid> - <group_password>x</group_password> - <groupname>games</groupname> - <userlist/> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>62</gid> - <group_password>x</group_password> - <groupname>man</groupname> - <userlist/> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>496</gid> - <group_password>x</group_password> - <groupname>polkitd</groupname> - <userlist/> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>5</gid> - <group_password>x</group_password> - <groupname>tty</groupname> - <userlist/> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>9</gid> - <group_password>x</group_password> - <groupname>kmem</groupname> - <userlist/> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>19</gid> - <group_password>x</group_password> - <groupname>floppy</groupname> - <userlist/> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>17</gid> - <group_password>x</group_password> - <groupname>audio</groupname> - <userlist/> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>10</gid> - <group_password>x</group_password> - <groupname>wheel</groupname> - <userlist/> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>0</gid> - <group_password>x</group_password> - <groupname>root</groupname> - <userlist/> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>65533</gid> - <group_password>x</group_password> - <groupname>nobody</groupname> - <userlist/> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>8</gid> - <group_password>x</group_password> - <groupname>www</groupname> - <userlist/> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>15</gid> - <group_password>x</group_password> - <groupname>shadow</groupname> - <userlist/> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>22</gid> - <group_password>x</group_password> - <groupname>utmp</groupname> - <userlist/> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>3</gid> - <group_password>x</group_password> - <groupname>sys</groupname> - <userlist/> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>14</gid> - <group_password>x</group_password> - <groupname>uucp</groupname> - <userlist/> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>495</gid> - <group_password>x</group_password> - <groupname>nscd</groupname> - <userlist/> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>497</gid> - <group_password>x</group_password> - <groupname>tape</groupname> - <userlist/> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>2</gid> - <group_password>x</group_password> - <groupname>daemon</groupname> - <userlist/> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>43</gid> - <group_password>x</group_password> - <groupname>modem</groupname> - <userlist/> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>49</gid> - <group_password>x</group_password> - <groupname>ftp</groupname> - <userlist/> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>21</gid> - <group_password>x</group_password> - <groupname>console</groupname> - <userlist/> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>12</gid> - <group_password>x</group_password> - <groupname>mail</groupname> - <userlist/> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>13</gid> - <group_password>x</group_password> - <groupname>news</groupname> - <userlist/> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>41</gid> - <group_password>x</group_password> - <groupname>xok</groupname> - <userlist/> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>33</gid> - <group_password>x</group_password> - <groupname>video</groupname> - <userlist/> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>16</gid> - <group_password>x</group_password> - <groupname>dialout</groupname> - <userlist/> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>1</gid> - <group_password>x</group_password> - <groupname>bin</groupname> - <userlist>daemon</userlist> - </group> - </groups> - <host> - <hosts config:type="list"> - <hosts_entry> - <host_address>127.0.0.1</host_address> - <names config:type="list"> - <name>localhost</name> - </names> - </hosts_entry> - <hosts_entry> - <host_address>::1</host_address> - <names config:type="list"> - <name>localhost ipv6-localhost ipv6-loopback</name> - </names> - </hosts_entry> - <hosts_entry> - <host_address>fe00::0</host_address> - <names config:type="list"> - <name>ipv6-localnet</name> - </names> - </hosts_entry> - <hosts_entry> - <host_address>ff00::0</host_address> - <names config:type="list"> - <name>ipv6-mcastprefix</name> - </names> - </hosts_entry> - <hosts_entry> - <host_address>ff02::1</host_address> - <names config:type="list"> - <name>ipv6-allnodes</name> - </names> - </hosts_entry> - <hosts_entry> - <host_address>ff02::2</host_address> - <names config:type="list"> - <name>ipv6-allrouters</name> - </names> - </hosts_entry> - <hosts_entry> - <host_address>ff02::3</host_address> - <names config:type="list"> - <name>ipv6-allhosts</name> - </names> - </hosts_entry> - </hosts> - </host> - <kdump> - <add_crash_kernel config:type="boolean">false</add_crash_kernel> - <crash_kernel>208M-:104M</crash_kernel> - <general> - <KDUMP_COMMANDLINE/> - <KDUMP_COMMANDLINE_APPEND/> - <KDUMP_COPY_KERNEL>yes</KDUMP_COPY_KERNEL> - <KDUMP_DUMPFORMAT>lzo</KDUMP_DUMPFORMAT> - <KDUMP_DUMPLEVEL>31</KDUMP_DUMPLEVEL> - <KDUMP_FREE_DISK_SIZE>64</KDUMP_FREE_DISK_SIZE> - <KDUMP_IMMEDIATE_REBOOT>yes</KDUMP_IMMEDIATE_REBOOT> - <KDUMP_KEEP_OLD_DUMPS>5</KDUMP_KEEP_OLD_DUMPS> - <KDUMP_KERNELVER/> - <KDUMP_NOTIFICATION_CC/> - <KDUMP_NOTIFICATION_TO/> - <KDUMP_SAVEDIR>file:///var/crash</KDUMP_SAVEDIR> - <KDUMP_SMTP_PASSWORD/> - <KDUMP_SMTP_SERVER/> - <KDUMP_SMTP_USER/> - <KDUMP_TRANSFER/> - <KDUMP_VERBOSE>3</KDUMP_VERBOSE> - <KEXEC_OPTIONS/> - </general> - </kdump> <login_settings/> <networking> <dhcp_options> @@ -491,7 +141,13 @@ </networking> <partitioning config:type="list"> <drive> - <device>/dev/sda</device> + <!-- + definition of device not needed (starting with SLES 11 SP2 + YaST will pickup the first harddisk. + This is useful if someone wants to deploy using VirtualBox and/or KVM/virtio + --> + <!-- <device>/dev/sda</device> --> + <!-- This section may be removed entirely if we want to simply reuse YaST defaults --> <initialize config:type="boolean">true</initialize> <partitions config:type="list"> <partition> @@ -546,15 +202,6 @@ <use>all</use> </drive> </partitioning> - <proxy> - <enabled config:type="boolean">false</enabled> - <ftp_proxy/> - <http_proxy/> - <https_proxy/> - <no_proxy>localhost, 127.0.0.1</no_proxy> - <proxy_password/> - <proxy_user/> - </proxy> <report> <errors> <log config:type="boolean">true</log> @@ -656,132 +303,6 @@ <user_password>$2y$05$NA1Li9ZKJOLRW5mMTXm6/e5r8dltWS5RpDZpvHrI82aLE00V51tdi</user_password> <username>vagrant</username> </user> - <user> - <encrypted config:type="boolean">true</encrypted> - <fullname>News system</fullname> - <gid>13</gid> - <home>/etc/news</home> - <password_settings> - <expire/> - <flag/> - <inact/> - <max/> - <min/> - <warn/> - </password_settings> - <shell>/bin/bash</shell> - <uid>9</uid> - <user_password>*</user_password> - <username>news</username> - </user> - <user> - <encrypted config:type="boolean">true</encrypted> - <fullname>bin</fullname> - <gid>1</gid> - <home>/bin</home> - <password_settings> - <expire/> - <flag/> - <inact/> - <max/> - <min/> - <warn/> - </password_settings> - <shell>/bin/bash</shell> - <uid>1</uid> - <user_password>*</user_password> - <username>bin</username> - </user> - <user> - <encrypted config:type="boolean">true</encrypted> - <fullname>FTP account</fullname> - <gid>49</gid> - <home>/srv/ftp</home> - <password_settings> - <expire/> - <flag/> - <inact/> - <max/> - <min/> - <warn/> - </password_settings> - <shell>/bin/bash</shell> - <uid>40</uid> - <user_password>*</user_password> - <username>ftp</username> - </user> - <user> - <encrypted config:type="boolean">true</encrypted> - <fullname>WWW daemon apache</fullname> - <gid>8</gid> - <home>/var/lib/wwwrun</home> - <password_settings> - <expire/> - <flag/> - <inact/> - <max/> - <min/> - <warn/> - </password_settings> - <shell>/bin/false</shell> - <uid>30</uid> - <user_password>*</user_password> - <username>wwwrun</username> - </user> - <user> - <encrypted config:type="boolean">true</encrypted> - <fullname>User for polkitd</fullname> - <gid>496</gid> - <home>/var/lib/polkit</home> - <password_settings> - <expire/> - <flag/> - <inact/> - <max/> - <min/> - <warn/> - </password_settings> - <shell>/sbin/nologin</shell> - <uid>497</uid> - <user_password>!</user_password> - <username>polkitd</username> - </user> - <user> - <encrypted config:type="boolean">true</encrypted> - <fullname>Manual pages viewer</fullname> - <gid>62</gid> - <home>/var/cache/man</home> - <password_settings> - <expire/> - <flag/> - <inact/> - <max/> - <min/> - <warn/> - </password_settings> - <shell>/bin/bash</shell> - <uid>13</uid> - <user_password>*</user_password> - <username>man</username> - </user> - <user> - <encrypted config:type="boolean">true</encrypted> - <fullname>Daemon</fullname> - <gid>2</gid> - <home>/sbin</home> - <password_settings> - <expire/> - <flag/> - <inact/> - <max/> - <min/> - <warn/> - </password_settings> - <shell>/bin/bash</shell> - <uid>2</uid> - <user_password>*</user_password> - <username>daemon</username> - </user> <user> <encrypted config:type="boolean">true</encrypted> <fullname>root</fullname> @@ -800,185 +321,5 @@ <user_password>$6$UgKtUD0AUMIA$VWLyc2Uvl0Lk6xxfTuoRb0/jrhZ9IJG/Gtx/DkZUEWZm.JYO1Q1fvPo6gDxQAHp38kQ1DG1vNGRgu2T/z/vih.</user_password> <username>root</username> </user> - <user> - <encrypted config:type="boolean">true</encrypted> - <fullname>nobody</fullname> - <gid>65533</gid> - <home>/var/lib/nobody</home> - <password_settings> - <expire/> - <flag/> - <inact/> - <max/> - <min/> - <warn/> - </password_settings> - <shell>/bin/bash</shell> - <uid>65534</uid> - <user_password>*</user_password> - <username>nobody</username> - </user> - <user> - <encrypted config:type="boolean">true</encrypted> - <fullname>Mailer daemon</fullname> - <gid>12</gid> - <home>/var/spool/clientmqueue</home> - <password_settings> - <expire/> - <flag/> - <inact/> - <max/> - <min/> - <warn/> - </password_settings> - <shell>/bin/false</shell> - <uid>8</uid> - <user_password>*</user_password> - <username>mail</username> - </user> - <user> - <encrypted config:type="boolean">true</encrypted> - <fullname>openslp daemon</fullname> - <gid>2</gid> - <home>/var/lib/empty</home> - <password_settings> - <expire/> - <flag/> - <inact/> - <max/> - <min/> - <warn/> - </password_settings> - <shell>/sbin/nologin</shell> - <uid>494</uid> - <user_password>!</user_password> - <username>openslp</username> - </user> - <user> - <encrypted config:type="boolean">true</encrypted> - <fullname>User for D-Bus</fullname> - <gid>499</gid> - <home>/var/run/dbus</home> - <password_settings> - <expire/> - <flag/> - <inact/> - <max/> - <min/> - <warn/> - </password_settings> - <shell>/bin/false</shell> - <uid>499</uid> - <user_password>!</user_password> - <username>messagebus</username> - </user> - <user> - <encrypted config:type="boolean">true</encrypted> - <fullname>User for nscd</fullname> - <gid>495</gid> - <home>/run/nscd</home> - <password_settings> - <expire/> - <flag/> - <inact/> - <max/> - <min/> - <warn/> - </password_settings> - <shell>/sbin/nologin</shell> - <uid>496</uid> - <user_password>!</user_password> - <username>nscd</username> - </user> - <user> - <encrypted config:type="boolean">true</encrypted> - <fullname>user for rpcbind</fullname> - <gid>65534</gid> - <home>/var/lib/empty</home> - <password_settings> - <expire/> - <flag/> - <inact/> - <max/> - <min/> - <warn/> - </password_settings> - <shell>/sbin/nologin</shell> - <uid>495</uid> - <user_password>!</user_password> - <username>rpc</username> - </user> - <user> - <encrypted config:type="boolean">true</encrypted> - <fullname>Games account</fullname> - <gid>100</gid> - <home>/var/games</home> - <password_settings> - <expire/> - <flag/> - <inact/> - <max/> - <min/> - <warn/> - </password_settings> - <shell>/bin/bash</shell> - <uid>12</uid> - <user_password>*</user_password> - <username>games</username> - </user> - <user> - <encrypted config:type="boolean">true</encrypted> - <fullname>SSH daemon</fullname> - <gid>498</gid> - <home>/var/lib/sshd</home> - <password_settings> - <expire/> - <flag/> - <inact/> - <max/> - <min/> - <warn/> - </password_settings> - <shell>/bin/false</shell> - <uid>498</uid> - <user_password>!</user_password> - <username>sshd</username> - </user> - <user> - <encrypted config:type="boolean">true</encrypted> - <fullname>Unix-to-Unix CoPy system</fullname> - <gid>14</gid> - <home>/etc/uucp</home> - <password_settings> - <expire/> - <flag/> - <inact/> - <max/> - <min/> - <warn/> - </password_settings> - <shell>/bin/bash</shell> - <uid>10</uid> - <user_password>*</user_password> - <username>uucp</username> - </user> - <user> - <encrypted config:type="boolean">true</encrypted> - <fullname>Printing daemon</fullname> - <gid>7</gid> - <home>/var/spool/lpd</home> - <password_settings> - <expire/> - <flag/> - <inact/> - <max/> - <min/> - <warn/> - </password_settings> - <shell>/bin/bash</shell> - <uid>4</uid> - <user_password>*</user_password> - <username>lp</username> - </user> </users> </profile> From aafe3317d1677bccaa355c880b688202653f2136 Mon Sep 17 00:00:00 2001 From: Fletcher Nichol <fnichol@nichol.ca> Date: Sat, 27 Jun 2015 10:31:00 -0600 Subject: [PATCH 0337/1622] Add Ubuntu 15.04 amd64/i386 templates. Big thanks to @vincentaubert, @rickard-von-essen, and @YpNo for the work in #345 and #349 to make this happen! Closes #349 Closes #345 --- http/ubuntu-15.04/preseed.cfg | 32 ++++++ ubuntu-15.04-amd64.json | 207 ++++++++++++++++++++++++++++++++++ ubuntu-15.04-i386.json | 207 ++++++++++++++++++++++++++++++++++ 3 files changed, 446 insertions(+) create mode 100644 http/ubuntu-15.04/preseed.cfg create mode 100644 ubuntu-15.04-amd64.json create mode 100644 ubuntu-15.04-i386.json diff --git a/http/ubuntu-15.04/preseed.cfg b/http/ubuntu-15.04/preseed.cfg new file mode 100644 index 000000000..282e7d1fb --- /dev/null +++ b/http/ubuntu-15.04/preseed.cfg @@ -0,0 +1,32 @@ +choose-mirror-bin mirror/http/proxy string +d-i base-installer/kernel/override-image string linux-server +d-i clock-setup/utc boolean true +d-i clock-setup/utc-auto boolean true +d-i finish-install/reboot_in_progress note +d-i grub-installer/bootdev string /dev/sda +d-i grub-installer/only_debian boolean true +d-i grub-installer/with_other_os boolean true +d-i partman-auto-lvm/guided_size string max +d-i partman-auto/choose_recipe select atomic +d-i partman-auto/method string lvm +d-i partman-lvm/confirm boolean true +d-i partman-lvm/confirm boolean true +d-i partman-lvm/confirm_nooverwrite boolean true +d-i partman-lvm/device_remove_lvm boolean true +d-i partman/choose_partition select finish +d-i partman/confirm boolean true +d-i partman/confirm_nooverwrite boolean true +d-i partman/confirm_write_new_label boolean true +d-i passwd/user-fullname string vagrant +d-i passwd/user-uid string 900 +d-i passwd/user-password password vagrant +d-i passwd/user-password-again password vagrant +d-i passwd/username string vagrant +d-i pkgsel/include string openssh-server cryptsetup build-essential libssl-dev libreadline-dev zlib1g-dev linux-source dkms nfs-common +d-i pkgsel/install-language-support boolean false +d-i pkgsel/update-policy select unattended-upgrades +d-i pkgsel/upgrade select full-upgrade +d-i time/zone string UTC +d-i user-setup/allow-password-weak boolean true +d-i user-setup/encrypt-home boolean false +tasksel tasksel/first multiselect standard, ubuntu-server diff --git a/ubuntu-15.04-amd64.json b/ubuntu-15.04-amd64.json new file mode 100644 index 000000000..7fe1d4418 --- /dev/null +++ b/ubuntu-15.04-amd64.json @@ -0,0 +1,207 @@ +{ + "builders": [ + { + "boot_command": [ + "<esc><wait>", + "<esc><wait>", + "<enter><wait>", + "/install/vmlinuz<wait>", + " auto<wait>", + " console-setup/ask_detect=false<wait>", + " console-setup/layoutcode=us<wait>", + " console-setup/modelcode=pc105<wait>", + " debconf/frontend=noninteractive<wait>", + " debian-installer=en_US<wait>", + " fb=false<wait>", + " initrd=/install/initrd.gz<wait>", + " kbd-chooser/method=us<wait>", + " keyboard-configuration/layout=USA<wait>", + " keyboard-configuration/variant=USA<wait>", + " locale=en_US<wait>", + " netcfg/get_domain=vm<wait>", + " netcfg/get_hostname=vagrant<wait>", + " noapic<wait>", + " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/ubuntu-15.04/preseed.cfg<wait>", + " -- <wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "guest_os_type": "Ubuntu_64", + "hard_drive_interface": "sata", + "http_directory": "http", + "iso_checksum": "6501c8545374665823384bbb6235f865108f56d8a30bbf69dd18df73c14ccb84", + "iso_checksum_type": "sha256", + "iso_url": "{{user `mirror`}}/15.04/ubuntu-15.04-server-amd64.iso", + "output_directory": "packer-ubuntu-15.04-amd64-virtualbox", + "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "virtualbox-iso", + "vboxmanage": [ + [ + "modifyvm", + "{{.Name}}", + "--memory", + "384" + ], + [ + "modifyvm", + "{{.Name}}", + "--cpus", + "1" + ] + ], + "virtualbox_version_file": ".vbox_version", + "vm_name": "packer-ubuntu-15.04-amd64" + }, + { + "boot_command": [ + "<esc><wait>", + "<esc><wait>", + "<enter><wait>", + "/install/vmlinuz<wait>", + " auto<wait>", + " console-setup/ask_detect=false<wait>", + " console-setup/layoutcode=us<wait>", + " console-setup/modelcode=pc105<wait>", + " debconf/frontend=noninteractive<wait>", + " debian-installer=en_US<wait>", + " fb=false<wait>", + " initrd=/install/initrd.gz<wait>", + " kbd-chooser/method=us<wait>", + " keyboard-configuration/layout=USA<wait>", + " keyboard-configuration/variant=USA<wait>", + " locale=en_US<wait>", + " netcfg/get_domain=vm<wait>", + " netcfg/get_hostname=vagrant<wait>", + " noapic<wait>", + " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/ubuntu-15.04/preseed.cfg<wait>", + " -- <wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "guest_os_type": "ubuntu-64", + "http_directory": "http", + "iso_checksum": "6501c8545374665823384bbb6235f865108f56d8a30bbf69dd18df73c14ccb84", + "iso_checksum_type": "sha256", + "iso_url": "{{user `mirror`}}/15.04/ubuntu-15.04-server-amd64.iso", + "output_directory": "packer-ubuntu-15.04-amd64-vmware", + "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "tools_upload_flavor": "linux", + "type": "vmware-iso", + "vm_name": "packer-ubuntu-15.04-amd64", + "vmx_data": { + "cpuid.coresPerSocket": "1", + "memsize": "384", + "numvcpus": "1" + } + }, + { + "boot_command": [ + "<esc><wait>", + "<esc><wait>", + "<enter><wait>", + "/install/vmlinuz<wait>", + " auto<wait>", + " console-setup/ask_detect=false<wait>", + " console-setup/layoutcode=us<wait>", + " console-setup/modelcode=pc105<wait>", + " debconf/frontend=noninteractive<wait>", + " debian-installer=en_US<wait>", + " fb=false<wait>", + " initrd=/install/initrd.gz<wait>", + " kbd-chooser/method=us<wait>", + " keyboard-configuration/layout=USA<wait>", + " keyboard-configuration/variant=USA<wait>", + " locale=en_US<wait>", + " netcfg/get_domain=vm<wait>", + " netcfg/get_hostname=vagrant<wait>", + " noapic<wait>", + " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/ubuntu-15.04/preseed.cfg<wait>", + " -- <wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "guest_os_type": "ubuntu", + "http_directory": "http", + "iso_checksum": "6501c8545374665823384bbb6235f865108f56d8a30bbf69dd18df73c14ccb84", + "iso_checksum_type": "sha256", + "iso_url": "{{user `mirror`}}/15.04/ubuntu-15.04-server-amd64.iso", + "output_directory": "packer-ubuntu-15.04-amd64-parallels", + "parallels_tools_flavor": "lin", + "prlctl": [ + [ + "set", + "{{.Name}}", + "--memsize", + "384" + ], + [ + "set", + "{{.Name}}", + "--cpus", + "1" + ] + ], + "prlctl_version_file": ".prlctl_version", + "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "parallels-iso", + "vm_name": "packer-ubuntu-15.04-amd64" + } + ], + "post-processors": [ + { + "output": "builds/{{user `box_basename`}}.{{.Provider}}.box", + "type": "vagrant" + } + ], + "provisioners": [ + { + "destination": "/tmp/bento-metadata.json", + "source": "{{user `metadata`}}", + "type": "file" + }, + { + "environment_vars": [], + "execute_command": "echo 'vagrant'|{{.Vars}} sudo -S -E bash '{{.Path}}'", + "scripts": [ + "scripts/common/metadata.sh", + "scripts/ubuntu/update.sh", + "scripts/common/sshd.sh", + "scripts/ubuntu/networking.sh", + "scripts/ubuntu/sudoers.sh", + "scripts/common/vagrant.sh", + "scripts/common/vmtools.sh", + "scripts/ubuntu/cleanup.sh", + "scripts/common/minimize.sh" + ], + "type": "shell" + } + ], + "variables": { + "arch": "64", + "box_basename": "ubuntu-15.04", + "build_timestamp": "{{isotime \"20060102150405\"}}", + "git_revision": "__unknown_git_revision__", + "metadata": "floppy/dummy_metadata.json", + "mirror": "http://releases.ubuntu.com", + "name": "ubuntu-15.04", + "template": "ubuntu-15.04-amd64", + "version": "2.0.TIMESTAMP" + } +} + diff --git a/ubuntu-15.04-i386.json b/ubuntu-15.04-i386.json new file mode 100644 index 000000000..d3c1355a2 --- /dev/null +++ b/ubuntu-15.04-i386.json @@ -0,0 +1,207 @@ +{ + "builders": [ + { + "boot_command": [ + "<esc><wait>", + "<esc><wait>", + "<enter><wait>", + "/install/vmlinuz<wait>", + " auto<wait>", + " console-setup/ask_detect=false<wait>", + " console-setup/layoutcode=us<wait>", + " console-setup/modelcode=pc105<wait>", + " debconf/frontend=noninteractive<wait>", + " debian-installer=en_US<wait>", + " fb=false<wait>", + " initrd=/install/initrd.gz<wait>", + " kbd-chooser/method=us<wait>", + " keyboard-configuration/layout=USA<wait>", + " keyboard-configuration/variant=USA<wait>", + " locale=en_US<wait>", + " netcfg/get_domain=vm<wait>", + " netcfg/get_hostname=vagrant<wait>", + " noapic<wait>", + " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/ubuntu-15.04/preseed.cfg<wait>", + " -- <wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "guest_os_type": "Ubuntu", + "hard_drive_interface": "sata", + "http_directory": "http", + "iso_checksum": "f510169ddc03121d11a627ae3a231e1272d8e4d75f9ef76f73daa5b809c5b6d8", + "iso_checksum_type": "sha256", + "iso_url": "{{user `mirror`}}/15.04/ubuntu-15.04-server-i386.iso", + "output_directory": "packer-ubuntu-15.04-i386-virtualbox", + "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "virtualbox-iso", + "vboxmanage": [ + [ + "modifyvm", + "{{.Name}}", + "--memory", + "384" + ], + [ + "modifyvm", + "{{.Name}}", + "--cpus", + "1" + ] + ], + "virtualbox_version_file": ".vbox_version", + "vm_name": "packer-ubuntu-15.04-i386" + }, + { + "boot_command": [ + "<esc><wait>", + "<esc><wait>", + "<enter><wait>", + "/install/vmlinuz<wait>", + " auto<wait>", + " console-setup/ask_detect=false<wait>", + " console-setup/layoutcode=us<wait>", + " console-setup/modelcode=pc105<wait>", + " debconf/frontend=noninteractive<wait>", + " debian-installer=en_US<wait>", + " fb=false<wait>", + " initrd=/install/initrd.gz<wait>", + " kbd-chooser/method=us<wait>", + " keyboard-configuration/layout=USA<wait>", + " keyboard-configuration/variant=USA<wait>", + " locale=en_US<wait>", + " netcfg/get_domain=vm<wait>", + " netcfg/get_hostname=vagrant<wait>", + " noapic<wait>", + " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/ubuntu-15.04/preseed.cfg<wait>", + " -- <wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "guest_os_type": "ubuntu", + "http_directory": "http", + "iso_checksum": "f510169ddc03121d11a627ae3a231e1272d8e4d75f9ef76f73daa5b809c5b6d8", + "iso_checksum_type": "sha256", + "iso_url": "{{user `mirror`}}/15.04/ubuntu-15.04-server-i386.iso", + "output_directory": "packer-ubuntu-15.04-i386-vmware", + "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "tools_upload_flavor": "linux", + "type": "vmware-iso", + "vm_name": "packer-ubuntu-15.04-i386", + "vmx_data": { + "cpuid.coresPerSocket": "1", + "memsize": "384", + "numvcpus": "1" + } + }, + { + "boot_command": [ + "<esc><wait>", + "<esc><wait>", + "<enter><wait>", + "/install/vmlinuz<wait>", + " auto<wait>", + " console-setup/ask_detect=false<wait>", + " console-setup/layoutcode=us<wait>", + " console-setup/modelcode=pc105<wait>", + " debconf/frontend=noninteractive<wait>", + " debian-installer=en_US<wait>", + " fb=false<wait>", + " initrd=/install/initrd.gz<wait>", + " kbd-chooser/method=us<wait>", + " keyboard-configuration/layout=USA<wait>", + " keyboard-configuration/variant=USA<wait>", + " locale=en_US<wait>", + " netcfg/get_domain=vm<wait>", + " netcfg/get_hostname=vagrant<wait>", + " noapic<wait>", + " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/ubuntu-15.04/preseed.cfg<wait>", + " -- <wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "guest_os_type": "ubuntu", + "http_directory": "http", + "iso_checksum": "f510169ddc03121d11a627ae3a231e1272d8e4d75f9ef76f73daa5b809c5b6d8", + "iso_checksum_type": "sha256", + "iso_url": "{{user `mirror`}}/15.04/ubuntu-15.04-server-i386.iso", + "output_directory": "packer-ubuntu-15.04-i386-parallels", + "parallels_tools_flavor": "lin", + "prlctl": [ + [ + "set", + "{{.Name}}", + "--memsize", + "384" + ], + [ + "set", + "{{.Name}}", + "--cpus", + "1" + ] + ], + "prlctl_version_file": ".prlctl_version", + "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "parallels-iso", + "vm_name": "packer-ubuntu-15.04-i386" + } + ], + "post-processors": [ + { + "output": "builds/{{user `box_basename`}}.{{.Provider}}.box", + "type": "vagrant" + } + ], + "provisioners": [ + { + "destination": "/tmp/bento-metadata.json", + "source": "{{user `metadata`}}", + "type": "file" + }, + { + "environment_vars": [], + "execute_command": "echo 'vagrant'|{{.Vars}} sudo -S -E bash '{{.Path}}'", + "scripts": [ + "scripts/common/metadata.sh", + "scripts/ubuntu/update.sh", + "scripts/common/sshd.sh", + "scripts/ubuntu/networking.sh", + "scripts/ubuntu/sudoers.sh", + "scripts/common/vagrant.sh", + "scripts/common/vmtools.sh", + "scripts/ubuntu/cleanup.sh", + "scripts/common/minimize.sh" + ], + "type": "shell" + } + ], + "variables": { + "arch": "32", + "box_basename": "ubuntu-15.04-i386", + "build_timestamp": "{{isotime \"20060102150405\"}}", + "git_revision": "__unknown_git_revision__", + "metadata": "floppy/dummy_metadata.json", + "mirror": "http://releases.ubuntu.com", + "name": "ubuntu-15.04-i386", + "template": "ubuntu-15.04-i386", + "version": "2.0.TIMESTAMP" + } +} + From de51d86930f666e3ef9f05b5b3f74f291b8b422b Mon Sep 17 00:00:00 2001 From: Fletcher Nichol <fnichol@nichol.ca> Date: Sat, 27 Jun 2015 10:50:17 -0600 Subject: [PATCH 0338/1622] [bin/bento] Fix git clean/dirty detection logic. --- bin/bento | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/bin/bento b/bin/bento index 7fa86d37a..412bbeafe 100755 --- a/bin/bento +++ b/bin/bento @@ -284,11 +284,13 @@ class BuildMetadata def git_revision sha = %x{git rev-parse HEAD}.strip - git_clean? ? sha : "#{sha}_dirty" + r = git_clean? ? sha : "#{sha}_dirty" + require 'pry' ; binding.pry + r end def git_clean? - %{git status --porcelain}.strip.empty? + %x{git status --porcelain}.strip.empty? end def merged_vars From 79e358b0a62418b7cd155c0751a526c38a035a39 Mon Sep 17 00:00:00 2001 From: Fletcher Nichol <fnichol@nichol.ca> Date: Sat, 27 Jun 2015 10:51:19 -0600 Subject: [PATCH 0339/1622] [bin/bento] Remove pry statement. --- bin/bento | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/bin/bento b/bin/bento index 412bbeafe..f127cadec 100755 --- a/bin/bento +++ b/bin/bento @@ -284,9 +284,7 @@ class BuildMetadata def git_revision sha = %x{git rev-parse HEAD}.strip - r = git_clean? ? sha : "#{sha}_dirty" - require 'pry' ; binding.pry - r + git_clean? ? sha : "#{sha}_dirty" end def git_clean? From 5ff85cef115e5b809b8c0826c93242e03b8e229a Mon Sep 17 00:00:00 2001 From: Fletcher Nichol <fnichol@nichol.ca> Date: Sat, 27 Jun 2015 12:51:36 -0600 Subject: [PATCH 0340/1622] Remove subdirectories under `build/` as they are no longer used. --- builds/.gitkeep | 0 builds/parallels/.gitignore | 4 ---- builds/virtualbox/.gitignore | 4 ---- builds/vmware/.gitignore | 4 ---- 4 files changed, 12 deletions(-) create mode 100644 builds/.gitkeep delete mode 100644 builds/parallels/.gitignore delete mode 100644 builds/virtualbox/.gitignore delete mode 100644 builds/vmware/.gitignore diff --git a/builds/.gitkeep b/builds/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/builds/parallels/.gitignore b/builds/parallels/.gitignore deleted file mode 100644 index 86d0cb272..000000000 --- a/builds/parallels/.gitignore +++ /dev/null @@ -1,4 +0,0 @@ -# Ignore everything in this directory -* -# Except this file -!.gitignore \ No newline at end of file diff --git a/builds/virtualbox/.gitignore b/builds/virtualbox/.gitignore deleted file mode 100644 index 86d0cb272..000000000 --- a/builds/virtualbox/.gitignore +++ /dev/null @@ -1,4 +0,0 @@ -# Ignore everything in this directory -* -# Except this file -!.gitignore \ No newline at end of file diff --git a/builds/vmware/.gitignore b/builds/vmware/.gitignore deleted file mode 100644 index 86d0cb272..000000000 --- a/builds/vmware/.gitignore +++ /dev/null @@ -1,4 +0,0 @@ -# Ignore everything in this directory -* -# Except this file -!.gitignore \ No newline at end of file From 685220d96347b1a213502ad9c1ce755e1b81cf97 Mon Sep 17 00:00:00 2001 From: Fletcher Nichol <fnichol@nichol.ca> Date: Mon, 29 Jun 2015 14:30:33 -0600 Subject: [PATCH 0341/1622] Update README with Ubuntu 15.04 boxes. Closes #376 --- README.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/README.md b/README.md index ab6752b05..6e1832a30 100644 --- a/README.md +++ b/README.md @@ -49,6 +49,8 @@ These baseboxes were all built using a Mac OS X host running VirtualBox 4.3.16, * [opscode-ubuntu-14.04](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_ubuntu-14.04_chef-provisionerless.box) * [opscode-ubuntu-14.10-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_ubuntu-14.10-i386_chef-provisionerless.box) * [opscode-ubuntu-14.10](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_ubuntu-14.10_chef-provisionerless.box) +* [opscode-ubuntu-15.04-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_ubuntu-15.04-i386_chef-provisionerless.box) +* [opscode-ubuntu-15.04](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_ubuntu-15.04_chef-provisionerless.box) ### VMWare @@ -86,6 +88,8 @@ these boxes. Using `--provider vmware_fusion`, will not. * [opscode-ubuntu-14.04](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_ubuntu-14.04_chef-provisionerless.box) * [opscode-ubuntu-14.10-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_ubuntu-14.10-i386_chef-provisionerless.box) * [opscode-ubuntu-14.10](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_ubuntu-14.10_chef-provisionerless.box) +* [opscode-ubuntu-15.04-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_ubuntu-15.04-i386_chef-provisionerless.box) +* [opscode-ubuntu-15.04](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_ubuntu-15.04_chef-provisionerless.box) ## Older Baseboxes From 21ac915848ecc5b124daa80b557ea941719f32c0 Mon Sep 17 00:00:00 2001 From: Fletcher Nichol <fnichol@nichol.ca> Date: Mon, 29 Jun 2015 16:50:45 -0600 Subject: [PATCH 0342/1622] Don't write metadata file in `bento build` dry run mode. Fixes #368 --- bin/bento | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/bin/bento b/bin/bento index f127cadec..e564a9f0a 100755 --- a/bin/bento +++ b/bin/bento @@ -199,7 +199,12 @@ class BuildRunner md[:md5] = checksums[:md5] md[:sha256] = checksums[:sha256] - File.open(filename, "wb") { |file| file.write(JSON.pretty_generate(md)) } + if dry_run + banner("(Dry run) Metadata file contents would be something similar to:") + puts JSON.pretty_generate(md) + else + File.open(filename, "wb") { |file| file.write(JSON.pretty_generate(md)) } + end end def write_var_file(template, md_file, io) From e547eaf0c8c27026d5bb7cf6d5b6ee6be8550e2c Mon Sep 17 00:00:00 2001 From: Fletcher Nichol <fnichol@nichol.ca> Date: Mon, 29 Jun 2015 16:50:04 -0600 Subject: [PATCH 0343/1622] Add Debian 8.0 amd64/i386 templates. Big thanks to @josephholsten, @YpNo, @rickard-von-essen, @rmoriz, @vincentaubert, and @chantra. Closes #366 References #350 References #348 References #370 References #355 --- debian-8.0-amd64.json | 186 ++++++++++++++++++++++++++++++++++++++ debian-8.0-i386.json | 186 ++++++++++++++++++++++++++++++++++++++ http/debian-8/preseed.cfg | 49 ++++++++++ 3 files changed, 421 insertions(+) create mode 100644 debian-8.0-amd64.json create mode 100644 debian-8.0-i386.json create mode 100644 http/debian-8/preseed.cfg diff --git a/debian-8.0-amd64.json b/debian-8.0-amd64.json new file mode 100644 index 000000000..2e0d8c2e3 --- /dev/null +++ b/debian-8.0-amd64.json @@ -0,0 +1,186 @@ +{ + "builders": [ + { + "boot_command": [ + "<esc><wait>", + "install <wait>", + "preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/debian-8/preseed.cfg <wait>", + "debian-installer=en_US <wait>", + "auto <wait>", + "locale=en_US <wait>", + "kbd-chooser/method=us <wait>", + "keyboard-configuration/xkb-keymap=us <wait>", + "netcfg/get_hostname={{ .Name }} <wait>", + "netcfg/get_domain=vagrantup.com <wait>", + "fb=false <wait>", + "debconf/frontend=noninteractive <wait>", + "console-setup/ask_detect=false <wait>", + "console-keymaps-at/keymap=us <wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "guest_os_type": "Debian_64", + "hard_drive_interface": "sata", + "http_directory": "http", + "iso_checksum": "5a3a023633552b2ceee0d34c541e840c0f7c50ff", + "iso_checksum_type": "sha1", + "iso_url": "{{user `mirror`}}/8.0.0/amd64/iso-cd/debian-8.0.0-amd64-CD-1.iso", + "output_directory": "packer-debian-8.0-amd64-virtualbox", + "shutdown_command": "echo 'vagrant'|sudo -S /sbin/shutdown -hP now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "virtualbox-iso", + "vboxmanage": [ + [ + "modifyvm", + "{{.Name}}", + "--memory", + "384" + ], + [ + "modifyvm", + "{{.Name}}", + "--cpus", + "1" + ] + ], + "virtualbox_version_file": ".vbox_version", + "vm_name": "packer-debian-8.0-amd64" + }, + { + "boot_command": [ + "<esc><wait>", + "install <wait>", + "preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/debian-8/preseed.cfg <wait>", + "debian-installer=en_US <wait>", + "auto <wait>", + "locale=en_US <wait>", + "kbd-chooser/method=us <wait>", + "keyboard-configuration/xkb-keymap=us <wait>", + "netcfg/get_hostname={{ .Name }} <wait>", + "netcfg/get_domain=vagrantup.com <wait>", + "fb=false <wait>", + "debconf/frontend=noninteractive <wait>", + "console-setup/ask_detect=false <wait>", + "console-keymaps-at/keymap=us <wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "guest_os_type": "debian8-64", + "http_directory": "http", + "iso_checksum": "5a3a023633552b2ceee0d34c541e840c0f7c50ff", + "iso_checksum_type": "sha1", + "iso_url": "{{user `mirror`}}/8.0.0/amd64/iso-cd/debian-8.0.0-amd64-CD-1.iso", + "output_directory": "packer-debian-8.0-amd64-vmware", + "shutdown_command": "echo 'vagrant'|sudo -S /sbin/shutdown -hP now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "tools_upload_flavor": "linux", + "type": "vmware-iso", + "vm_name": "packer-debian-8.0-amd64", + "vmx_data": { + "cpuid.coresPerSocket": "1", + "memsize": "384", + "numvcpus": "1" + } + }, + { + "boot_command": [ + "<esc><wait>", + "install <wait>", + "preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/debian-8/preseed.cfg <wait>", + "debian-installer=en_US <wait>", + "auto <wait>", + "locale=en_US <wait>", + "kbd-chooser/method=us <wait>", + "keyboard-configuration/xkb-keymap=us <wait>", + "netcfg/get_hostname={{ .Name }} <wait>", + "netcfg/get_domain=vagrantup.com <wait>", + "fb=false <wait>", + "debconf/frontend=noninteractive <wait>", + "console-setup/ask_detect=false <wait>", + "console-keymaps-at/keymap=us <wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "guest_os_type": "debian", + "http_directory": "http", + "iso_checksum": "5a3a023633552b2ceee0d34c541e840c0f7c50ff", + "iso_checksum_type": "sha1", + "iso_url": "{{user `mirror`}}/8.0.0/amd64/iso-cd/debian-8.0.0-amd64-CD-1.iso", + "output_directory": "packer-debian-8.0-amd64-parallels", + "parallels_tools_flavor": "lin", + "prlctl": [ + [ + "set", + "{{.Name}}", + "--memsize", + "384" + ], + [ + "set", + "{{.Name}}", + "--cpus", + "1" + ] + ], + "prlctl_version_file": ".prlctl_version", + "shutdown_command": "echo 'vagrant'|sudo -S /sbin/shutdown -hP now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "parallels-iso", + "vm_name": "packer-debian-8.0-amd64" + } + ], + "post-processors": [ + { + "output": "builds/{{user `box_basename`}}.{{.Provider}}.box", + "type": "vagrant" + } + ], + "provisioners": [ + { + "destination": "/tmp/bento-metadata.json", + "source": "{{user `metadata`}}", + "type": "file" + }, + { + "environment_vars": [], + "execute_command": "echo 'vagrant' | {{.Vars}} sudo -E -S bash '{{.Path}}'", + "scripts": [ + "scripts/common/metadata.sh", + "scripts/debian/update.sh", + "scripts/common/sshd.sh", + "scripts/debian/networking.sh", + "scripts/debian/sudoers.sh", + "scripts/common/vagrant.sh", + "scripts/common/vmtools.sh", + "scripts/debian/cleanup.sh", + "scripts/common/minimize.sh" + ], + "type": "shell" + } + ], + "variables": { + "arch": "64", + "box_basename": "debian-8.0", + "build_timestamp": "{{isotime \"20060102150405\"}}", + "git_revision": "__unknown_git_revision__", + "metadata": "floppy/dummy_metadata.json", + "mirror": "http://cdimage.debian.org/cdimage/archive", + "name": "debian-8.0", + "template": "debian-8.0-amd64", + "version": "2.0.TIMESTAMP" + } +} + diff --git a/debian-8.0-i386.json b/debian-8.0-i386.json new file mode 100644 index 000000000..2edb65735 --- /dev/null +++ b/debian-8.0-i386.json @@ -0,0 +1,186 @@ +{ + "builders": [ + { + "boot_command": [ + "<esc><wait>", + "install <wait>", + "preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/debian-8/preseed.cfg <wait>", + "debian-installer=en_US <wait>", + "auto <wait>", + "locale=en_US <wait>", + "kbd-chooser/method=us <wait>", + "keyboard-configuration/xkb-keymap=us <wait>", + "netcfg/get_hostname={{ .Name }} <wait>", + "netcfg/get_domain=vagrantup.com <wait>", + "fb=false <wait>", + "debconf/frontend=noninteractive <wait>", + "console-setup/ask_detect=false <wait>", + "console-keymaps-at/keymap=us <wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "guest_os_type": "Debian", + "hard_drive_interface": "sata", + "http_directory": "http", + "iso_checksum": "a8101b2e4ef3bdc5051796eda91263c71c90eb90", + "iso_checksum_type": "sha1", + "iso_url": "{{user `mirror`}}/8.0.0/i386/iso-cd/debian-8.0.0-i386-CD-1.iso", + "output_directory": "packer-debian-8.0-i386-virtualbox", + "shutdown_command": "echo 'vagrant'|sudo -S /sbin/shutdown -hP now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "virtualbox-iso", + "vboxmanage": [ + [ + "modifyvm", + "{{.Name}}", + "--memory", + "384" + ], + [ + "modifyvm", + "{{.Name}}", + "--cpus", + "1" + ] + ], + "virtualbox_version_file": ".vbox_version", + "vm_name": "packer-debian-8.0-i386" + }, + { + "boot_command": [ + "<esc><wait>", + "install <wait>", + "preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/debian-8/preseed.cfg <wait>", + "debian-installer=en_US <wait>", + "auto <wait>", + "locale=en_US <wait>", + "kbd-chooser/method=us <wait>", + "keyboard-configuration/xkb-keymap=us <wait>", + "netcfg/get_hostname={{ .Name }} <wait>", + "netcfg/get_domain=vagrantup.com <wait>", + "fb=false <wait>", + "debconf/frontend=noninteractive <wait>", + "console-setup/ask_detect=false <wait>", + "console-keymaps-at/keymap=us <wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "guest_os_type": "debian8", + "http_directory": "http", + "iso_checksum": "a8101b2e4ef3bdc5051796eda91263c71c90eb90", + "iso_checksum_type": "sha1", + "iso_url": "{{user `mirror`}}/8.0.0/i386/iso-cd/debian-8.0.0-i386-CD-1.iso", + "output_directory": "packer-debian-8.0-i386-vmware", + "shutdown_command": "echo 'vagrant'|sudo -S /sbin/shutdown -hP now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "tools_upload_flavor": "linux", + "type": "vmware-iso", + "vm_name": "packer-debian-8.0-i386", + "vmx_data": { + "cpuid.coresPerSocket": "1", + "memsize": "384", + "numvcpus": "1" + } + }, + { + "boot_command": [ + "<esc><wait>", + "install <wait>", + "preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/debian-8/preseed.cfg <wait>", + "debian-installer=en_US <wait>", + "auto <wait>", + "locale=en_US <wait>", + "kbd-chooser/method=us <wait>", + "keyboard-configuration/xkb-keymap=us <wait>", + "netcfg/get_hostname={{ .Name }} <wait>", + "netcfg/get_domain=vagrantup.com <wait>", + "fb=false <wait>", + "debconf/frontend=noninteractive <wait>", + "console-setup/ask_detect=false <wait>", + "console-keymaps-at/keymap=us <wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "guest_os_type": "debian", + "http_directory": "http", + "iso_checksum": "a8101b2e4ef3bdc5051796eda91263c71c90eb90", + "iso_checksum_type": "sha1", + "iso_url": "{{user `mirror`}}/8.0.0/i386/iso-cd/debian-8.0.0-i386-CD-1.iso", + "output_directory": "packer-debian-8.0-i386-parallels", + "parallels_tools_flavor": "lin", + "prlctl": [ + [ + "set", + "{{.Name}}", + "--memsize", + "384" + ], + [ + "set", + "{{.Name}}", + "--cpus", + "1" + ] + ], + "prlctl_version_file": ".prlctl_version", + "shutdown_command": "echo 'vagrant'|sudo -S /sbin/shutdown -hP now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "parallels-iso", + "vm_name": "packer-debian-8.0-i386" + } + ], + "post-processors": [ + { + "output": "builds/{{user `box_basename`}}.{{.Provider}}.box", + "type": "vagrant" + } + ], + "provisioners": [ + { + "destination": "/tmp/bento-metadata.json", + "source": "{{user `metadata`}}", + "type": "file" + }, + { + "environment_vars": [], + "execute_command": "echo 'vagrant' | {{.Vars}} sudo -E -S bash '{{.Path}}'", + "scripts": [ + "scripts/common/metadata.sh", + "scripts/debian/update.sh", + "scripts/common/sshd.sh", + "scripts/debian/networking.sh", + "scripts/debian/sudoers.sh", + "scripts/common/vagrant.sh", + "scripts/common/vmtools.sh", + "scripts/debian/cleanup.sh", + "scripts/common/minimize.sh" + ], + "type": "shell" + } + ], + "variables": { + "arch": "32", + "box_basename": "debian-8.0-i386", + "build_timestamp": "{{isotime \"20060102150405\"}}", + "git_revision": "__unknown_git_revision__", + "metadata": "floppy/dummy_metadata.json", + "mirror": "http://cdimage.debian.org/cdimage/archive", + "name": "debian-8.0-i386", + "template": "debian-8.0-i386", + "version": "2.0.TIMESTAMP" + } +} + diff --git a/http/debian-8/preseed.cfg b/http/debian-8/preseed.cfg new file mode 100644 index 000000000..559776931 --- /dev/null +++ b/http/debian-8/preseed.cfg @@ -0,0 +1,49 @@ +choose-mirror-bin mirror/http/proxy string +d-i apt-setup/use_mirror boolean true +d-i base-installer/kernel/override-image string linux-server +d-i clock-setup/utc boolean true +d-i clock-setup/utc-auto boolean true +d-i finish-install/reboot_in_progress note +d-i grub-installer/bootdev string /dev/sda +d-i grub-installer/only_debian boolean true +d-i grub-installer/with_other_os boolean true +d-i keymap select us +d-i mirror/country string manual +d-i mirror/http/directory string /debian +d-i mirror/http/hostname string http.debian.net +d-i mirror/http/proxy string +d-i partman-auto-lvm/guided_size string max +d-i partman-auto/choose_recipe select atomic +d-i partman-auto/method string lvm +d-i partman-lvm/confirm boolean true +d-i partman-lvm/confirm boolean true +d-i partman-lvm/confirm_nooverwrite boolean true +d-i partman-lvm/device_remove_lvm boolean true +d-i partman/choose_partition select finish +d-i partman/confirm boolean true +d-i partman/confirm_nooverwrite boolean true +d-i partman/confirm_write_new_label boolean true +d-i passwd/root-login boolean false +d-i passwd/root-password-again password vagrant +d-i passwd/root-password password vagrant +d-i passwd/user-fullname string vagrant +d-i passwd/user-uid string 900 +d-i passwd/user-password password vagrant +d-i passwd/user-password-again password vagrant +d-i passwd/username string vagrant +d-i pkgsel/include string sudo bzip2 acpid cryptsetup zlib1g-dev wget curl dkms make nfs-common +d-i pkgsel/install-language-support boolean false +d-i pkgsel/update-policy select unattended-upgrades +d-i pkgsel/upgrade select full-upgrade +# Prevent packaged version of VirtualBox Guest Additions being installed: +d-i preseed/early_command string sed -i \ + '/in-target/idiscover(){/sbin/discover|grep -v VirtualBox;}' \ + /usr/lib/pre-pkgsel.d/20install-hwpackages +d-i time/zone string UTC +d-i user-setup/allow-password-weak boolean true +d-i user-setup/encrypt-home boolean false +d-i preseed/late_command string sed -i '/^deb cdrom:/s/^/#/' /target/etc/apt/sources.list +apt-cdrom-setup apt-setup/cdrom/set-first boolean false +apt-mirror-setup apt-setup/use_mirror boolean true +popularity-contest popularity-contest/participate boolean false +tasksel tasksel/first multiselect standard, ssh-server From 383fb730286bb1c8f778721c102f97d4a5cdff7a Mon Sep 17 00:00:00 2001 From: Fletcher Nichol <fnichol@nichol.ca> Date: Mon, 29 Jun 2015 22:18:37 -0600 Subject: [PATCH 0344/1622] Update README with Debian 8.0 boxes. Closes #381 --- README.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/README.md b/README.md index 6e1832a30..57452a91d 100644 --- a/README.md +++ b/README.md @@ -31,6 +31,8 @@ These baseboxes were all built using a Mac OS X host running VirtualBox 4.3.16, * [opscode-debian-6.0.10](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_debian-6.0.10_chef-provisionerless.box) * [opscode-debian-7.8-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_debian-7.8-i386_chef-provisionerless.box) * [opscode-debian-7.8](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_debian-7.8_chef-provisionerless.box) +* [opscode-debian-8.0-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_debian-8.0-i386_chef-provisionerless.box) +* [opscode-debian-8.0](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_debian-8.0_chef-provisionerless.box) * [opscode-fedora-20-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_fedora-20-i386_chef-provisionerless.box) * [opscode-fedora-20](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_fedora-20_chef-provisionerless.box) * [opscode-fedora-21-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_fedora-21-i386_chef-provisionerless.box) @@ -70,6 +72,8 @@ these boxes. Using `--provider vmware_fusion`, will not. * [opscode-debian-6.0.10](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_debian-6.0.10_chef-provisionerless.box) * [opscode-debian-7.8-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_debian-7.8-i386_chef-provisionerless.box) * [opscode-debian-7.8](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_debian-7.8_chef-provisionerless.box) +* [opscode-debian-8.0-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_debian-8.0-i386_chef-provisionerless.box) +* [opscode-debian-8.0](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_debian-8.0_chef-provisionerless.box) * [opscode-fedora-20-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_fedora-20-i386_chef-provisionerless.box) * [opscode-fedora-20](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_fedora-20_chef-provisionerless.box) * [opscode-fedora-21-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_fedora-21-i386_chef-provisionerless.box) From 4e37814019facfe2378134fab52cea2b28a97e75 Mon Sep 17 00:00:00 2001 From: "Julian C. Dunn" <jdunn@chef.io> Date: Mon, 11 May 2015 12:43:01 -0400 Subject: [PATCH 0345/1622] Add Mac OS X 10.10 template. --- macosx-10.10.json | 214 ++++++++++++++++++++++++++++++++ scripts/macosx/minimize.sh | 16 +++ scripts/macosx/networking.sh | 31 +++++ scripts/macosx/vmtools.sh | 35 ++++++ vagrantfile_templates/macosx.rb | 6 +- 5 files changed, 301 insertions(+), 1 deletion(-) create mode 100644 macosx-10.10.json create mode 100644 scripts/macosx/minimize.sh create mode 100644 scripts/macosx/networking.sh create mode 100644 scripts/macosx/vmtools.sh diff --git a/macosx-10.10.json b/macosx-10.10.json new file mode 100644 index 000000000..320f78e53 --- /dev/null +++ b/macosx-10.10.json @@ -0,0 +1,214 @@ +{ + "builders": [ + { + "boot_wait": "2s", + "disk_size": 20480, + "guest_os_type": "darwin12-64", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "md5", + "iso_url": "{{user `iso_url`}}", + "output_directory": "packer-macosx-10.10-vmware", + "shutdown_command": "echo 'vagrant'|sudo -S shutdown -h now", + "skip_compaction": true, + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "tools_upload_flavor": "darwin", + "tools_upload_path": "/tmp/vmtools.iso", + "type": "vmware-iso", + "vm_name": "packer-macosx-10.10-vmware", + "vmx_data": { + "cpuid.coresPerSocket": "1", + "ehci.present": "TRUE", + "firmware": "efi", + "hpet0.present": "TRUE", + "ich7m.present": "TRUE", + "keyboardAndMouseProfile": "macProfile", + "memsize": "2048", + "numvcpus": "1", + "smc.present": "TRUE", + "usb.present": "TRUE" + } + }, + { + "boot_wait": "2s", + "disk_size": 20480, + "guest_additions_mode": "disable", + "guest_os_type": "MacOS109_64", + "hard_drive_interface": "sata", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "md5", + "iso_url": "{{user `iso_url`}}", + "output_directory": "packer-macosx-10.10-virtualbox", + "shutdown_command": "echo 'vagrant'|sudo -S shutdown -h now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "virtualbox-iso", + "vboxmanage": [ + [ + "modifyvm", + "{{.Name}}", + "--audiocontroller", + "hda" + ], + [ + "modifyvm", + "{{.Name}}", + "--boot1", + "dvd" + ], + [ + "modifyvm", + "{{.Name}}", + "--boot2", + "disk" + ], + [ + "modifyvm", + "{{.Name}}", + "--chipset", + "ich9" + ], + [ + "modifyvm", + "{{.Name}}", + "--cpus", + "1" + ], + [ + "modifyvm", + "{{.Name}}", + "--firmware", + "efi" + ], + [ + "modifyvm", + "{{.Name}}", + "--hpet", + "on" + ], + [ + "modifyvm", + "{{.Name}}", + "--keyboard", + "usb" + ], + [ + "modifyvm", + "{{.Name}}", + "--memory", + "2048" + ], + [ + "modifyvm", + "{{.Name}}", + "--mouse", + "usbtablet" + ], + [ + "modifyvm", + "{{.Name}}", + "--vram", + "9" + ], + [ + "storageattach", + "{{.Name}}", + "--storagectl", + "SATA Controller", + "--port", + "1", + "--type", + "dvddrive", + "--medium", + "{{user `iso_url`}}" + ] + ], + "vboxmanage_post": [ + [ + "storageattach", + "{{.Name}}", + "--storagectl", + "SATA Controller", + "--port", + "1", + "--type", + "dvddrive", + "--medium", + "none" + ], + [ + "storagectl", + "{{.Name}}", + "--name", + "IDE Controller", + "--remove" + ] + ], + "virtualbox_version_file": ".vbox_version", + "vm_name": "packer-macosx-10.10-virtualbox" + } + ], + "min_packer_version": "0.6.0", + "post-processors": [ + { + "output": "builds/{{user `box_basename`}}.{{.Provider}}.box", + "type": "vagrant", + "vagrantfile_template": "vagrantfile_templates/macosx.rb" + } + ], + "provisioners": [ + { + "destination": "/tmp/bento-metadata.json", + "source": "{{user `metadata`}}", + "type": "file" + }, + { + "destination": "/private/tmp/kcpassword", + "source": "scripts/macosx/support/kcpassword", + "type": "file" + }, + { + "execute_command": "echo 'vagrant'| {{.Vars}} sudo -E -S sh '{{.Path}}'", + "scripts": [ + "scripts/common/metadata.sh", + "scripts/macosx/hostname.sh", + "scripts/macosx/update.sh", + "scripts/macosx/networking.sh", + "scripts/macosx/vagrant.sh", + "scripts/macosx/vmtools.sh", + "scripts/macosx/cleanup.sh", + "scripts/macosx/minimize.sh" + ], + "type": "shell" + }, + { + "execute_command": "echo 'vagrant'| {{.Vars}} sudo -E -S sh '{{.Path}}'", + "inline": [ + "[ -z \"{{user `autologin_vagrant_user`}}\" ] && exit", + "echo \"Enabling automatic GUI login for the 'vagrant' user..\"", + "cp /private/tmp/kcpassword /private/etc/kcpassword", + "/usr/bin/defaults write /Library/Preferences/com.apple.loginwindow autoLoginUser vagrant" + ], + "type": "shell" + } + ], + "variables": { + "arch": "64", + "autologin_vagrant_user": "", + "box_basename": "macosx-10.10", + "build_timestamp": "{{isotime \"20060102150405\"}}", + "git_revision": "__unknown_git_revision__", + "iso_checksum": "6d878aeb58aad23d2be00774d4da3b3d", + "iso_checksum_type": "md5", + "iso_url": "http://fakeurl/OSX_InstallESD_10.10.3_14D136.dmg", + "metadata": "floppy/dummy_metadata.json", + "name": "macosx-10.10", + "template": "macosx-10.10", + "version": "2.0.TIMESTAMP" + } +} + diff --git a/scripts/macosx/minimize.sh b/scripts/macosx/minimize.sh new file mode 100644 index 000000000..2965d2b80 --- /dev/null +++ b/scripts/macosx/minimize.sh @@ -0,0 +1,16 @@ +#!/bin/sh -eux + +# disable swap +launchctl unload -wF /System/Library/LaunchDaemons/com.apple.dynamic_pager.plist; + +rm -f /private/var/vm/swapfile*; +rm -f /private/var/vm/sleepimage; + +dd if=/dev/zero of=/EMPTY bs=1000000 || echo "dd exit code $? is suppressed"; +rm -f /EMPTY; +# Block until the empty file has been removed, otherwise, Packer +# will try to kill the box while the disk is still full and that's bad +sync; + +# re-enable swap +launchctl load -wF /System/Library/LaunchDaemons/com.apple.dynamic_pager.plist; diff --git a/scripts/macosx/networking.sh b/scripts/macosx/networking.sh new file mode 100644 index 000000000..a172a66b2 --- /dev/null +++ b/scripts/macosx/networking.sh @@ -0,0 +1,31 @@ +#!/bin/sh + +# Thank you to https://github.com/timsutton/osx-vm-templates +# for the implementation + +# This script adds a Mac OS Launch Daemon, which runs every time the +# machine is booted. The daemon will re-detect the attached network +# interfaces. If this is not done, network devices may not work. +PLIST=/Library/LaunchDaemons/com.github.timsutton.osx-vm-templates.detectnewhardware.plist +cat <<EOF > "${PLIST}" +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> +<plist version="1.0"> +<dict> + <key>Label</key> + <string>com.github.timsutton.osx-vm-templates.detectnewhardware</string> + <key>ProgramArguments</key> + <array> + <string>/usr/sbin/networksetup</string> + <string>-detectnewhardware</string> + </array> + <key>RunAtLoad</key> + <true/> +</dict> +</plist> +EOF + +# These should be already set as follows, but since they're required +# in order to load properly, we set them explicitly. +/bin/chmod 644 "${PLIST}" +/usr/sbin/chown root:wheel "${PLIST}" diff --git a/scripts/macosx/vmtools.sh b/scripts/macosx/vmtools.sh new file mode 100644 index 000000000..ab3cbe5eb --- /dev/null +++ b/scripts/macosx/vmtools.sh @@ -0,0 +1,35 @@ +#!/bin/sh -eux + +case "$PACKER_BUILDER_TYPE" in + +virtualbox-iso|virtualbox-ovf) + echo "VirtualBox not currently supported, sadface"; + ;; + +vmware-iso|vmware-vmx) + iso_name="/tmp/vmtools.iso"; + mount_point="`mktemp -d /tmp/vmware-tools.XXXX`"; + #Run install, unmount ISO and remove it + hdiutil attach "$iso_name" -mountpoint "$mount_point"; + installer -pkg "$mount_point/Install VMware Tools.app/Contents/Resources/VMware Tools.pkg" -target /; + # This usually fails + hdiutil detach "$mount_point" || true; + rm -f "$iso_name"; + rmdir "$mount_point"; + + # Point Linux shared folder root to that used by OS X guests, + # useful for the Hashicorp vmware_fusion Vagrant provider plugin + mkdir /mnt; + ln -sf /Volumes/VMware\ Shared\ Folders /mnt/hgfs; + ;; + +parallels-iso|parallels-pvm) + echo "Parallels not currently supported, sadface"; + ;; + +*) + echo "Unknown Packer Builder Type >>${PACKER_BUILDER_TYPE}<< selected."; + echo "Known are virtualbox-iso|virtualbox-ovf|vmware-iso|vmware-vmx|parallels-iso|parallels-pvm."; + ;; + +esac diff --git a/vagrantfile_templates/macosx.rb b/vagrantfile_templates/macosx.rb index 9bf0fc693..502545dc1 100644 --- a/vagrantfile_templates/macosx.rb +++ b/vagrantfile_templates/macosx.rb @@ -1,4 +1,8 @@ -Vagrant.configure('2') do |config| +Vagrant.configure(2) do |config| + # disabled until https://github.com/mitchellh/vagrant/pull/5326 makes it + # into a release following 1.7.2 + config.ssh.insert_key = false + config.vm.provider 'virtualbox' do |_, override| override.vm.synced_folder '.', '/vagrant', type: 'rsync' end From e5fea890192836e551050294fc6ddb8ee34696c5 Mon Sep 17 00:00:00 2001 From: Roland Moriz <roland@moriz.de> Date: Thu, 2 Jul 2015 11:24:29 +0200 Subject: [PATCH 0346/1622] preliminary debian 8.1 templates --- debian-8.1-amd64.json | 185 +++++++++++++++++++++++++++++++++++++++++ debian-8.1-i386.json | 186 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 371 insertions(+) create mode 100644 debian-8.1-amd64.json create mode 100644 debian-8.1-i386.json diff --git a/debian-8.1-amd64.json b/debian-8.1-amd64.json new file mode 100644 index 000000000..d91505b80 --- /dev/null +++ b/debian-8.1-amd64.json @@ -0,0 +1,185 @@ +{ + "builders": [ + { + "boot_command": [ + "<esc><wait>", + "install <wait>", + "preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/debian-8/preseed.cfg <wait>", + "debian-installer=en_US <wait>", + "auto <wait>", + "locale=en_US <wait>", + "kbd-chooser/method=us <wait>", + "keyboard-configuration/xkb-keymap=us <wait>", + "netcfg/get_hostname={{ .Name }} <wait>", + "netcfg/get_domain=vagrantup.com <wait>", + "fb=false <wait>", + "debconf/frontend=noninteractive <wait>", + "console-setup/ask_detect=false <wait>", + "console-keymaps-at/keymap=us <wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "guest_os_type": "Debian_64", + "hard_drive_interface": "sata", + "http_directory": "http", + "iso_checksum": "22bae271a732333ebff150598292d9907d2c6001", + "iso_checksum_type": "sha1", + "iso_url": "{{user `mirror`}}/8.1.0/amd64/iso-cd/debian-8.1.0-amd64-CD-1.iso", + "output_directory": "packer-debian-8.1-amd64-virtualbox", + "shutdown_command": "echo 'vagrant'|sudo -S /sbin/shutdown -hP now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "virtualbox-iso", + "vboxmanage": [ + [ + "modifyvm", + "{{.Name}}", + "--memory", + "384" + ], + [ + "modifyvm", + "{{.Name}}", + "--cpus", + "1" + ] + ], + "virtualbox_version_file": ".vbox_version", + "vm_name": "packer-debian-8.1-amd64" + }, + { + "boot_command": [ + "<esc><wait>", + "install <wait>", + "preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/debian-8/preseed.cfg <wait>", + "debian-installer=en_US <wait>", + "auto <wait>", + "locale=en_US <wait>", + "kbd-chooser/method=us <wait>", + "keyboard-configuration/xkb-keymap=us <wait>", + "netcfg/get_hostname={{ .Name }} <wait>", + "netcfg/get_domain=vagrantup.com <wait>", + "fb=false <wait>", + "debconf/frontend=noninteractive <wait>", + "console-setup/ask_detect=false <wait>", + "console-keymaps-at/keymap=us <wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "guest_os_type": "debian8-64", + "http_directory": "http", + "iso_checksum": "22bae271a732333ebff150598292d9907d2c6001", + "iso_checksum_type": "sha1", + "iso_url": "{{user `mirror`}}/8.1.0/amd64/iso-cd/debian-8.1.0-amd64-CD-1.iso", + "output_directory": "packer-debian-8.1-amd64-vmware", + "shutdown_command": "echo 'vagrant'|sudo -S /sbin/shutdown -hP now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "tools_upload_flavor": "linux", + "type": "vmware-iso", + "vm_name": "packer-debian-8.1-amd64", + "vmx_data": { + "cpuid.coresPerSocket": "1", + "memsize": "384", + "numvcpus": "1" + } + }, + { + "boot_command": [ + "<esc><wait>", + "install <wait>", + "preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/debian-8/preseed.cfg <wait>", + "debian-installer=en_US <wait>", + "auto <wait>", + "locale=en_US <wait>", + "kbd-chooser/method=us <wait>", + "keyboard-configuration/xkb-keymap=us <wait>", + "netcfg/get_hostname={{ .Name }} <wait>", + "netcfg/get_domain=vagrantup.com <wait>", + "fb=false <wait>", + "debconf/frontend=noninteractive <wait>", + "console-setup/ask_detect=false <wait>", + "console-keymaps-at/keymap=us <wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "guest_os_type": "debian", + "http_directory": "http", + "iso_checksum": "22bae271a732333ebff150598292d9907d2c6001", + "iso_checksum_type": "sha1", + "iso_url": "{{user `mirror`}}/8.1.0/amd64/iso-cd/debian-8.1.0-amd64-CD-1.iso", + "output_directory": "packer-debian-8.1-amd64-parallels", + "parallels_tools_flavor": "lin", + "prlctl": [ + [ + "set", + "{{.Name}}", + "--memsize", + "384" + ], + [ + "set", + "{{.Name}}", + "--cpus", + "1" + ] + ], + "prlctl_version_file": ".prlctl_version", + "shutdown_command": "echo 'vagrant'|sudo -S /sbin/shutdown -hP now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "parallels-iso", + "vm_name": "packer-debian-8.1-amd64" + } + ], + "post-processors": [ + { + "output": "builds/{{user `box_basename`}}.{{.Provider}}.box", + "type": "vagrant" + } + ], + "provisioners": [ + { + "destination": "/tmp/bento-metadata.json", + "source": "{{user `metadata`}}", + "type": "file" + }, + { + "environment_vars": [], + "execute_command": "echo 'vagrant' | {{.Vars}} sudo -E -S bash '{{.Path}}'", + "scripts": [ + "scripts/common/metadata.sh", + "scripts/debian/update.sh", + "scripts/common/sshd.sh", + "scripts/debian/networking.sh", + "scripts/debian/sudoers.sh", + "scripts/common/vagrant.sh", + "scripts/common/vmtools.sh", + "scripts/debian/cleanup.sh", + "scripts/common/minimize.sh" + ], + "type": "shell" + } + ], + "variables": { + "arch": "64", + "box_basename": "debian-8.1", + "build_timestamp": "{{isotime \"20060102150405\"}}", + "git_revision": "__unknown_git_revision__", + "metadata": "floppy/dummy_metadata.json", + "mirror": "http://cdimage.debian.org/cdimage/archive", + "name": "debian-8.1", + "template": "debian-8.1-amd64", + "version": "2.0.TIMESTAMP" + } +} diff --git a/debian-8.1-i386.json b/debian-8.1-i386.json new file mode 100644 index 000000000..1a5d9f65d --- /dev/null +++ b/debian-8.1-i386.json @@ -0,0 +1,186 @@ +{ + "builders": [ + { + "boot_command": [ + "<esc><wait>", + "install <wait>", + "preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/debian-8/preseed.cfg <wait>", + "debian-installer=en_US <wait>", + "auto <wait>", + "locale=en_US <wait>", + "kbd-chooser/method=us <wait>", + "keyboard-configuration/xkb-keymap=us <wait>", + "netcfg/get_hostname={{ .Name }} <wait>", + "netcfg/get_domain=vagrantup.com <wait>", + "fb=false <wait>", + "debconf/frontend=noninteractive <wait>", + "console-setup/ask_detect=false <wait>", + "console-keymaps-at/keymap=us <wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "guest_os_type": "Debian", + "hard_drive_interface": "sata", + "http_directory": "http", + "iso_checksum": "e223823e0c159f057ec83bd51d4770a132e3e51b", + "iso_checksum_type": "sha1", + "iso_url": "{{user `mirror`}}/8.1.0/i386/iso-cd/debian-8.1.0-i386-CD-1.iso", + "output_directory": "packer-debian-8.1-i386-virtualbox", + "shutdown_command": "echo 'vagrant'|sudo -S /sbin/shutdown -hP now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "virtualbox-iso", + "vboxmanage": [ + [ + "modifyvm", + "{{.Name}}", + "--memory", + "384" + ], + [ + "modifyvm", + "{{.Name}}", + "--cpus", + "1" + ] + ], + "virtualbox_version_file": ".vbox_version", + "vm_name": "packer-debian-8.1-i386" + }, + { + "boot_command": [ + "<esc><wait>", + "install <wait>", + "preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/debian-8/preseed.cfg <wait>", + "debian-installer=en_US <wait>", + "auto <wait>", + "locale=en_US <wait>", + "kbd-chooser/method=us <wait>", + "keyboard-configuration/xkb-keymap=us <wait>", + "netcfg/get_hostname={{ .Name }} <wait>", + "netcfg/get_domain=vagrantup.com <wait>", + "fb=false <wait>", + "debconf/frontend=noninteractive <wait>", + "console-setup/ask_detect=false <wait>", + "console-keymaps-at/keymap=us <wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "guest_os_type": "debian8", + "http_directory": "http", + "iso_checksum": "e223823e0c159f057ec83bd51d4770a132e3e51b", + "iso_checksum_type": "sha1", + "iso_url": "{{user `mirror`}}/8.1.0/i386/iso-cd/debian-8.1.0-i386-CD-1.iso", + "output_directory": "packer-debian-8.1-i386-vmware", + "shutdown_command": "echo 'vagrant'|sudo -S /sbin/shutdown -hP now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "tools_upload_flavor": "linux", + "type": "vmware-iso", + "vm_name": "packer-debian-8.1-i386", + "vmx_data": { + "cpuid.coresPerSocket": "1", + "memsize": "384", + "numvcpus": "1" + } + }, + { + "boot_command": [ + "<esc><wait>", + "install <wait>", + "preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/debian-8/preseed.cfg <wait>", + "debian-installer=en_US <wait>", + "auto <wait>", + "locale=en_US <wait>", + "kbd-chooser/method=us <wait>", + "keyboard-configuration/xkb-keymap=us <wait>", + "netcfg/get_hostname={{ .Name }} <wait>", + "netcfg/get_domain=vagrantup.com <wait>", + "fb=false <wait>", + "debconf/frontend=noninteractive <wait>", + "console-setup/ask_detect=false <wait>", + "console-keymaps-at/keymap=us <wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "guest_os_type": "debian", + "http_directory": "http", + "iso_checksum": "e223823e0c159f057ec83bd51d4770a132e3e51b", + "iso_checksum_type": "sha1", + "iso_url": "{{user `mirror`}}/8.1.0/i386/iso-cd/debian-8.1.0-i386-CD-1.iso", + "output_directory": "packer-debian-8.1-i386-parallels", + "parallels_tools_flavor": "lin", + "prlctl": [ + [ + "set", + "{{.Name}}", + "--memsize", + "384" + ], + [ + "set", + "{{.Name}}", + "--cpus", + "1" + ] + ], + "prlctl_version_file": ".prlctl_version", + "shutdown_command": "echo 'vagrant'|sudo -S /sbin/shutdown -hP now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "parallels-iso", + "vm_name": "packer-debian-8.1-i386" + } + ], + "post-processors": [ + { + "output": "builds/{{user `box_basename`}}.{{.Provider}}.box", + "type": "vagrant" + } + ], + "provisioners": [ + { + "destination": "/tmp/bento-metadata.json", + "source": "{{user `metadata`}}", + "type": "file" + }, + { + "environment_vars": [], + "execute_command": "echo 'vagrant' | {{.Vars}} sudo -E -S bash '{{.Path}}'", + "scripts": [ + "scripts/common/metadata.sh", + "scripts/debian/update.sh", + "scripts/common/sshd.sh", + "scripts/debian/networking.sh", + "scripts/debian/sudoers.sh", + "scripts/common/vagrant.sh", + "scripts/common/vmtools.sh", + "scripts/debian/cleanup.sh", + "scripts/common/minimize.sh" + ], + "type": "shell" + } + ], + "variables": { + "arch": "32", + "box_basename": "debian-8.1-i386", + "build_timestamp": "{{isotime \"20060102150405\"}}", + "git_revision": "__unknown_git_revision__", + "metadata": "floppy/dummy_metadata.json", + "mirror": "http://cdimage.debian.org/cdimage/archive", + "name": "debian-8.1-i386", + "template": "debian-8.1-i386", + "version": "2.0.TIMESTAMP" + } +} + From 178bb012264a7b5e56e8eeadca6cbc5f9123f909 Mon Sep 17 00:00:00 2001 From: Roland Moriz <roland@moriz.de> Date: Thu, 2 Jul 2015 17:33:25 +0200 Subject: [PATCH 0347/1622] updated debian's download redirector address see: https://lists.debian.org/debian-devel-announce/2015/05/msg00003.html --- http/debian-7/preseed.cfg | 2 +- http/debian-8/preseed.cfg | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/http/debian-7/preseed.cfg b/http/debian-7/preseed.cfg index 015dc51eb..8640675a8 100644 --- a/http/debian-7/preseed.cfg +++ b/http/debian-7/preseed.cfg @@ -9,7 +9,7 @@ d-i grub-installer/with_other_os boolean true d-i keymap select us d-i mirror/country string manual d-i mirror/http/directory string /debian -d-i mirror/http/hostname string http.debian.net +d-i mirror/http/hostname string httpredir.debian.org d-i mirror/http/proxy string d-i partman-auto-lvm/guided_size string max d-i partman-auto/choose_recipe select atomic diff --git a/http/debian-8/preseed.cfg b/http/debian-8/preseed.cfg index 559776931..57f271c81 100644 --- a/http/debian-8/preseed.cfg +++ b/http/debian-8/preseed.cfg @@ -10,7 +10,7 @@ d-i grub-installer/with_other_os boolean true d-i keymap select us d-i mirror/country string manual d-i mirror/http/directory string /debian -d-i mirror/http/hostname string http.debian.net +d-i mirror/http/hostname string httpredir.debian.org d-i mirror/http/proxy string d-i partman-auto-lvm/guided_size string max d-i partman-auto/choose_recipe select atomic From 005627af4a94e7594019468f7e12e5eecd72c846 Mon Sep 17 00:00:00 2001 From: Fletcher Nichol <fnichol@nichol.ca> Date: Thu, 2 Jul 2015 10:15:44 -0600 Subject: [PATCH 0348/1622] Add provider metadata to metdata files on build. The build metadata produced by `bin/bento` is modified to contain Vagrant provider-compatible metadata as in the following example: { "name": "chef/debian-8.0", "version": "2.0.20150702012417", "build_timestamp": "20150702012417", "git_revision": "9c7e4544c57fd9da497eda416fb7486cf941d6d7_dirty", "box_basename": "chef__debian-8.0-2.0.20150702012417.git.9c7e4544c57fd9da497eda416fb7486cf941d6d7_dirty", "template": "debian-8.0-amd64", "providers": [ { "name": "parallels", "file": "chef__debian-8.0-2.0.20150702012417.git.9c7e4544c57fd9da497eda416fb7486cf941d6d7_dirty.parallels.box", "checksum_type": "sha256", "checksum": "5ce86c9c31edadf69500b1c680be3d2afa88d1def2c972c82a066cc482855d41" }, { "name": "virtualbox", "file": "chef__debian-8.0-2.0.20150702012417.git.9c7e4544c57fd9da497eda416fb7486cf941d6d7_dirty.virtualbox.box", "checksum_type": "sha256", "checksum": "e36b86613bf80ad2fee01e9d0ad2dd7b012c6dcd53ef6f3fee356450a8bf4db1" }, { "name": "vmware_desktop", "file": "chef__debian-8.0-2.0.20150702012417.git.9c7e4544c57fd9da497eda416fb7486cf941d6d7_dirty.vmware.box", "checksum_type": "sha256", "checksum": "71a5a2c13565f13e3a142346973bca01efe5c10ff380df3cd3b99b09efd399b6" } ] } The provider data will help for future publishing to Atlas and will allow for a standalone "metadata server" to provide Atlas-like download capabilities for Vagrant clients. Also note that the following metadata attributes are dropped as of this commit: * `atlas_org`: the team/org information will be added directly to the box name. For example the box called "debian-8.0" would now be called "chef/debian-8.0" * `arch`: This piece of metadata wasn't used anywhere directly and can most likely be captured in a future description attribute. --- bin/bento | 303 +++++++++++++++++++++++++++++------------------------- 1 file changed, 163 insertions(+), 140 deletions(-) diff --git a/bin/bento b/bin/bento index e564a9f0a..0b44126f0 100755 --- a/bin/bento +++ b/bin/bento @@ -76,6 +76,11 @@ class Options class: NormalizeRunner, parser: OptionParser.new { |opts| opts.banner = "Usage: #{NAME} normalize TEMPLATE[ TEMPLATE ...]" + + opts.on("-d", "--[no-]debug", "Run packer with debug output") do |opt| + options.debug = opt + end + }, argv: templates_argv_proc }, @@ -131,9 +136,43 @@ module Common end end +module PackerExec + + def for_packer_run_with(template) + Tempfile.open("#{template}-metadata.json") do |md_file| + Tempfile.open("#{template}-metadata-var-file") do |var_file| + write_box_metadata(template, md_file) + write_var_file(template, md_file, var_file) + yield md_file, var_file + end + end + end + + def write_box_metadata(template, io) + md = BuildMetadata.new(template, build_timestamp).read + + io.write(JSON.pretty_generate(md)) + io.close + end + + def write_var_file(template, md_file, io) + md = BuildMetadata.new(template, build_timestamp).read + + io.write(JSON.pretty_generate({ + box_basename: md[:box_basename], + build_timestamp: md[:build_timestamp], + git_revision: md[:git_revision], + metadata: md_file.path, + version: md[:version] + })) + io.close + end +end + class BuildRunner include Common + include PackerExec attr_reader :templates, :dry_run, :debug, :builds, :build_timestamp @@ -148,32 +187,26 @@ class BuildRunner def start banner("Starting build for templates: #{templates}") time = Benchmark.measure do - templates.each { |template| build_template(template) } + templates.each { |template| build(template) } end banner("Build finished in #{duration(time.real)}.") end - def build_template(template) - Tempfile.open("#{template}-metadata.json") do |md_file| - Tempfile.open("#{template}-metadata-var-file") do |var_file| - write_box_metadata(template, md_file) - write_var_file(template, md_file.path, var_file) - packer(template, var_file.path) + private + + def build(template) + for_packer_run_with(template) do |md_file, var_file| + cmd = packer_build_cmd(template, var_file.path) + banner("[#{template}] Building: '#{cmd.join(' ')}'") + time = Benchmark.measure do + system(*cmd) or raise "[#{template}] Error building, exited #{$?}" write_final_metadata(template) end + banner("[#{template}] Finished building in #{duration(time.real)}.") end end - def packer(template, var_file) - cmd = packer_cmd(template, var_file) - banner("[#{template}] Running: '#{cmd.join(' ')}'") - time = Benchmark.measure do - system(*cmd) or raise "[#{template}] Error building, exited #{$?}" - end - banner("[#{template}] Finished in #{duration(time.real)}.") - end - - def packer_cmd(template, var_file) + def packer_build_cmd(template, var_file) vars = "#{template}.variables.json" cmd = %W[packer build -var-file=#{var_file} #{template}.json] cmd.insert(2, "-var-file=#{vars}") if File.exist?(vars) @@ -183,21 +216,12 @@ class BuildRunner cmd end - def write_box_metadata(template, io) - md = BuildMetadata.new(template, build_timestamp).read - - io.write(JSON.pretty_generate(md)) - io.close - end - def write_final_metadata(template) md = BuildMetadata.new(template, build_timestamp).read path = File.join(File.dirname(__FILE__), "..", "builds") filename = File.join(path, "#{md[:box_basename]}.metadata.json") - checksums = ChecksumMetadata.new(path, md[:box_basename]).read - md[:md5] = checksums[:md5] - md[:sha256] = checksums[:sha256] + md[:providers] = ProviderMetadata.new(path, md[:box_basename]).read if dry_run banner("(Dry run) Metadata file contents would be something similar to:") @@ -206,48 +230,112 @@ class BuildRunner File.open(filename, "wb") { |file| file.write(JSON.pretty_generate(md)) } end end +end - def write_var_file(template, md_file, io) - md = BuildMetadata.new(template, build_timestamp).read +class NormalizeRunner - io.write(JSON.pretty_generate({ - box_basename: md[:box_basename], - build_timestamp: md[:build_timestamp], - git_revision: md[:git_revision], - metadata: md_file, - version: md[:version] - })) - io.close + include Common + include PackerExec + + attr_reader :templates, :build_timestamp, :debug + + def initialize(opts) + @templates = opts.templates + @debug = opts.debug + @modified = [] + @build_timestamp = Time.now.gmtime.strftime("%Y%m%d%H%M%S") + end + + def start + banner("Normalizing for templates: #{templates}") + time = Benchmark.measure do + templates.each do |template| + validate(template) + fix(template) + end + end + if !@modified.empty? + info("") + info("The following templates were modified:") + @modified.sort.each { |template| info(" * #{template}")} + end + banner("Normalizing finished in #{duration(time.real)}.") + end + + private + + def checksum(file) + Digest::MD5.file(file).hexdigest + end + + def fix(template) + file = "#{template}.json" + + banner("[#{template}] Fixing") + original_checksum = checksum(file) + output = %x{packer fix #{file}} + raise "[#{template}] Error fixing, exited #{$?}" if $?.exitstatus != 0 + # preserve ampersands in shell commands, + # see: https://github.com/mitchellh/packer/issues/784 + output.gsub!("\\u0026", "&") + File.open(file, "wb") { |dest| dest.write(output) } + fixed_checksum = checksum(file) + + if original_checksum == fixed_checksum + puts("No changes made.") + else + warn("Template #{template} has been modified.") + @modified << template + end + end + + def packer_validate_cmd(template, var_file) + vars = "#{template}.variables.json" + cmd = %W[packer validate -var-file=#{var_file} #{template}.json] + cmd.insert(2, "-var-file=#{vars}") if File.exist?(vars) + cmd + end + + def validate(template) + for_packer_run_with(template) do |md_file, var_file| + cmd = packer_validate_cmd(template, var_file.path) + banner("[#{template}] Validating: '#{cmd.join(' ')}'") + if debug + banner("[#{template}] DEBUG: var_file(#{var_file.path}) is:") + puts IO.read(var_file.path) + banner("[#{template}] DEBUG: md_file(#{md_file.path}) is:") + puts IO.read(md_file.path) + end + system(*cmd) or raise "[#{template}] Error validating, exited #{$?}" + end end end -class ChecksumMetadata +class ListRunner - def initialize(path, box_basename) - @base = File.join(path, box_basename) + include Common + + attr_reader :templates + + def initialize(opts) + @templates = opts.templates end - def read - { - md5: md5_checksums, - sha256: sha256_checksums - } + def start + templates.each { |template| puts template } end +end - private +class Runner - attr_reader :base + attr_reader :options - def md5_checksums - Hash[Dir.glob("#{base}.*.box").map { |box| - [File.basename(box), Digest::MD5.file(box).hexdigest] - }] + def initialize(options) + @options = options end - def sha256_checksums - Hash[Dir.glob("#{base}.*.box").map { |box| - [File.basename(box), Digest::SHA256.file(box).hexdigest] - }] + def start + options.klass.new(options).start end end @@ -265,8 +353,6 @@ class BuildMetadata build_timestamp: build_timestamp, git_revision: git_revision, box_basename: box_basename, - atlas_org: atlas_org, - arch: template_vars.fetch("arch", UNKNOWN), template: template_vars.fetch("template", UNKNOWN), } end @@ -274,16 +360,11 @@ class BuildMetadata private UNKNOWN = "__unknown__".freeze - DEFAULT_ATLAS_ORG = "chef".freeze attr_reader :template, :build_timestamp - def atlas_org - merged_vars.fetch("atlas_org", DEFAULT_ATLAS_ORG) - end - def box_basename - "#{atlas_org}__#{name}-#{version}.git.#{git_revision}" + "#{name.gsub("/", "__")}-#{version}.git.#{git_revision}" end def git_revision @@ -314,100 +395,42 @@ class BuildMetadata @template_vars ||= JSON.load(IO.read("#{template}.json")).fetch("variables") end - def user_prefix - merged_vars.fetch("user_prefix", DEFAULT_USER_PREFIX) - end - def version merged_vars.fetch("version", "#{UNKNOWN}.TIMESTAMP"). rpartition(".").first.concat(".#{build_timestamp}") end end -class NormalizeRunner - - include Common +class ProviderMetadata - attr_reader :templates - - def initialize(opts) - @templates = opts.templates - @modified = [] + def initialize(path, box_basename) + @base = File.join(path, box_basename) end - def start - banner("Normalizing for templates: #{templates}") - time = Benchmark.measure do - templates.each do |template| - validate(template) - fix(template) - end - end - if !@modified.empty? - info("") - info("The following templates were modified:") - @modified.sort.each { |template| info(" * #{template}")} + def read + Dir.glob("#{base}.*.box").map do |file| + { + name: provider_from_file(file), + file: "#{File.basename(file)}", + checksum_type: "sha256", + checksum: shasum(file) + } end - banner("Normalizing finished in #{duration(time.real)}.") end - def fix(template) - file = "#{template}.json" + private - banner("[#{template}] Fixing") - original_checksum = checksum(file) - output = %x{packer fix #{file}} - raise "[#{template}] Error fixing, exited #{$?}" if $?.exitstatus != 0 - # preserve ampersands in shell commands, - # see: https://github.com/mitchellh/packer/issues/784 - output.gsub!("\\u0026", "&") - File.open(file, "wb") { |dest| dest.write(output) } - fixed_checksum = checksum(file) + attr_reader :base - if original_checksum == fixed_checksum - puts("No changes made.") - else - warn("Template #{template} has been modified.") - @modified << template + def provider_from_file(file) + case provider = file.sub(/^.*\.([^.]+)\.box$/, '\1') + when /vmware/i then "vmware_desktop" + else provider end end - def validate(template) - cmd = %W[packer validate #{template}.json] - banner("[#{template}] Validating") - system(*cmd) or raise "[#{template}] Error validating, exited #{$?}" - end - - def checksum(file) - Digest::MD5.file(file).hexdigest - end -end - -class ListRunner - - include Common - - attr_reader :templates - - def initialize(opts) - @templates = opts.templates - end - - def start - templates.each { |template| puts template } - end -end - -class Runner - - attr_reader :options - - def initialize(options) - @options = options - end - - def start - options.klass.new(options).start + def shasum(file) + Digest::SHA256.file(file).hexdigest end end From b76ae501a28d4612c89919dba2e1e5812d69a8f8 Mon Sep 17 00:00:00 2001 From: Roland Moriz <roland@moriz.de> Date: Thu, 2 Jul 2015 20:27:40 +0200 Subject: [PATCH 0349/1622] fix mirror url --- debian-8.1-amd64.json | 2 +- debian-8.1-i386.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/debian-8.1-amd64.json b/debian-8.1-amd64.json index d91505b80..0d5e3db38 100644 --- a/debian-8.1-amd64.json +++ b/debian-8.1-amd64.json @@ -177,7 +177,7 @@ "build_timestamp": "{{isotime \"20060102150405\"}}", "git_revision": "__unknown_git_revision__", "metadata": "floppy/dummy_metadata.json", - "mirror": "http://cdimage.debian.org/cdimage/archive", + "mirror": "http://cdimage.debian.org/cdimage/release", "name": "debian-8.1", "template": "debian-8.1-amd64", "version": "2.0.TIMESTAMP" diff --git a/debian-8.1-i386.json b/debian-8.1-i386.json index 1a5d9f65d..eddd5e1fa 100644 --- a/debian-8.1-i386.json +++ b/debian-8.1-i386.json @@ -177,7 +177,7 @@ "build_timestamp": "{{isotime \"20060102150405\"}}", "git_revision": "__unknown_git_revision__", "metadata": "floppy/dummy_metadata.json", - "mirror": "http://cdimage.debian.org/cdimage/archive", + "mirror": "http://cdimage.debian.org/cdimage/release", "name": "debian-8.1-i386", "template": "debian-8.1-i386", "version": "2.0.TIMESTAMP" From 245ae54bbffaebfd0d3cf9d05a5f0c909cd8677f Mon Sep 17 00:00:00 2001 From: Fletcher Nichol <fnichol@nichol.ca> Date: Thu, 2 Jul 2015 15:37:44 -0600 Subject: [PATCH 0350/1622] [macosx-*] Improve DRYness & correctness of Mac templates. The following improvements are made in this commit: * Using the `template` user variable to replace repetition of `"macosx-10.*"` style strings throughout * Bump the minimum version of Packer from 0.6.0 to 0.7.0 * Supply a `HOME_DIR` environment variable for provisioner scripts to use * Remove the optional autologin logic, which wasn't being triggered by default leading to less behavior "tuning knobs" in the templates * Remove now-unused user variables `arch` and `autologin` * Add consistent `_README` user variable to explain how to obtain and prepare the base disk image * Rename all template names from `"macosx-10.*"` to `"chef/macosx-10.*"` * Extract the `iso_checksum_type` into a user variable and reference it in the templates * Call all provider scripts with `sh -eux` which will: (e) exit immediately if a command exists with a non-zero exit status, (u) treats unset variables as a error, and (x) outputs the command and its expanded arguments or associated word list * Ensure that all the provider shell scripts are more conservatively bourne shell friendly * Add a call to VMware's `vmware-tools-cli disk shrink` command in `scripts/macosx/minimize.sh` if the provider is vmware-based --- macosx-10.10.json | 51 ++++++++++++------------------ macosx-10.7.json | 60 +++++++++++++++--------------------- macosx-10.8.json | 60 +++++++++++++++--------------------- macosx-10.9.json | 60 +++++++++++++++--------------------- scripts/macosx/cleanup.sh | 4 +-- scripts/macosx/hostname.sh | 10 +++--- scripts/macosx/minimize.sh | 19 +++++++++--- scripts/macosx/networking.sh | 13 ++++---- scripts/macosx/update.sh | 4 +-- scripts/macosx/vagrant.sh | 44 ++++++-------------------- 10 files changed, 135 insertions(+), 190 deletions(-) diff --git a/macosx-10.10.json b/macosx-10.10.json index 320f78e53..b15c69fa4 100644 --- a/macosx-10.10.json +++ b/macosx-10.10.json @@ -5,10 +5,10 @@ "disk_size": 20480, "guest_os_type": "darwin12-64", "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "md5", + "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `iso_url`}}", - "output_directory": "packer-macosx-10.10-vmware", - "shutdown_command": "echo 'vagrant'|sudo -S shutdown -h now", + "output_directory": "packer-{{user `template`}}-vmware", + "shutdown_command": "echo 'vagrant'| sudo -S shutdown -h now", "skip_compaction": true, "ssh_password": "vagrant", "ssh_port": 22, @@ -17,7 +17,7 @@ "tools_upload_flavor": "darwin", "tools_upload_path": "/tmp/vmtools.iso", "type": "vmware-iso", - "vm_name": "packer-macosx-10.10-vmware", + "vm_name": "packer-{{user `template`}}-vmware", "vmx_data": { "cpuid.coresPerSocket": "1", "ehci.present": "TRUE", @@ -38,10 +38,10 @@ "guest_os_type": "MacOS109_64", "hard_drive_interface": "sata", "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "md5", + "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `iso_url`}}", - "output_directory": "packer-macosx-10.10-virtualbox", - "shutdown_command": "echo 'vagrant'|sudo -S shutdown -h now", + "output_directory": "packer-{{user `template`}}-virtualbox", + "shutdown_command": "echo 'vagrant'| sudo -S shutdown -h now", "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", @@ -149,10 +149,10 @@ ] ], "virtualbox_version_file": ".vbox_version", - "vm_name": "packer-macosx-10.10-virtualbox" + "vm_name": "packer-{{user `template`}}-virtualbox" } ], - "min_packer_version": "0.6.0", + "min_packer_version": "0.7.0", "post-processors": [ { "output": "builds/{{user `box_basename`}}.{{.Provider}}.box", @@ -167,12 +167,10 @@ "type": "file" }, { - "destination": "/private/tmp/kcpassword", - "source": "scripts/macosx/support/kcpassword", - "type": "file" - }, - { - "execute_command": "echo 'vagrant'| {{.Vars}} sudo -E -S sh '{{.Path}}'", + "environment_vars": [ + "HOME_DIR=/Users/vagrant" + ], + "execute_command": "echo 'vagrant'| {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", "scripts": [ "scripts/common/metadata.sh", "scripts/macosx/hostname.sh", @@ -184,31 +182,20 @@ "scripts/macosx/minimize.sh" ], "type": "shell" - }, - { - "execute_command": "echo 'vagrant'| {{.Vars}} sudo -E -S sh '{{.Path}}'", - "inline": [ - "[ -z \"{{user `autologin_vagrant_user`}}\" ] && exit", - "echo \"Enabling automatic GUI login for the 'vagrant' user..\"", - "cp /private/tmp/kcpassword /private/etc/kcpassword", - "/usr/bin/defaults write /Library/Preferences/com.apple.loginwindow autoLoginUser vagrant" - ], - "type": "shell" } ], "variables": { - "arch": "64", - "autologin_vagrant_user": "", - "box_basename": "macosx-10.10", + "_README": "You must provide a prepared Mac disk image (from https://github.com/timsutton/osx-vm-templates) and checksum value for this template to work. For more details, consult this project's README.md", + "box_basename": "__unset_box_basename__", "build_timestamp": "{{isotime \"20060102150405\"}}", "git_revision": "__unknown_git_revision__", - "iso_checksum": "6d878aeb58aad23d2be00774d4da3b3d", + "iso_checksum": "__unset_iso_checksum__", "iso_checksum_type": "md5", - "iso_url": "http://fakeurl/OSX_InstallESD_10.10.3_14D136.dmg", + "iso_url": "http://YOU-MUST-PROVIDE-YOUR-OWN-DMG.sorry", "metadata": "floppy/dummy_metadata.json", - "name": "macosx-10.10", + "name": "chef/macosx-10.10", "template": "macosx-10.10", - "version": "2.0.TIMESTAMP" + "version": "2.1.TIMESTAMP" } } diff --git a/macosx-10.7.json b/macosx-10.7.json index caebd083b..cf3f7b173 100644 --- a/macosx-10.7.json +++ b/macosx-10.7.json @@ -5,19 +5,19 @@ "disk_size": 20480, "guest_os_type": "darwin12-64", "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "md5", + "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `iso_url`}}", - "output_directory": "packer-macosx-10.7-vmware", - "shutdown_command": "echo 'vagrant'|sudo -S shutdown -h now", + "output_directory": "packer-{{user `template`}}-vmware", + "shutdown_command": "echo 'vagrant'| sudo -S shutdown -h now", "skip_compaction": true, "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", "tools_upload_flavor": "darwin", - "tools_upload_path": "/Users/vagrant/{{.Flavor}}.iso", + "tools_upload_path": "/tmp/vmtools.iso", "type": "vmware-iso", - "vm_name": "packer-macosx-10.7-vmware", + "vm_name": "packer-{{user `template`}}-vmware", "vmx_data": { "cpuid.coresPerSocket": "1", "ehci.present": "TRUE", @@ -38,10 +38,10 @@ "guest_os_type": "MacOS107_64", "hard_drive_interface": "sata", "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "md5", + "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `iso_url`}}", - "output_directory": "packer-macosx-10.7-virtualbox", - "shutdown_command": "echo 'vagrant'|sudo -S shutdown -h now", + "output_directory": "packer-{{user `template`}}-virtualbox", + "shutdown_command": "echo 'vagrant'| sudo -S shutdown -h now", "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", @@ -149,10 +149,10 @@ ] ], "virtualbox_version_file": ".vbox_version", - "vm_name": "packer-macosx-10.7-virtualbox" + "vm_name": "packer-{{user `template`}}-virtualbox" } ], - "min_packer_version": "0.6.0", + "min_packer_version": "0.7.0", "post-processors": [ { "output": "builds/{{user `box_basename`}}.{{.Provider}}.box", @@ -167,45 +167,35 @@ "type": "file" }, { - "destination": "/private/tmp/kcpassword", - "source": "scripts/macosx/support/kcpassword", - "type": "file" - }, - { - "execute_command": "echo 'vagrant'| {{.Vars}} sudo -E -S sh '{{.Path}}'", + "environment_vars": [ + "HOME_DIR=/Users/vagrant" + ], + "execute_command": "echo 'vagrant'| {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", "scripts": [ "scripts/common/metadata.sh", "scripts/macosx/hostname.sh", - "scripts/macosx/builder.sh", "scripts/macosx/update.sh", + "scripts/macosx/networking.sh", "scripts/macosx/vagrant.sh", - "scripts/macosx/cleanup.sh" - ], - "type": "shell" - }, - { - "execute_command": "echo 'vagrant'| {{.Vars}} sudo -E -S sh '{{.Path}}'", - "inline": [ - "[ -z \"{{user `autologin_vagrant_user`}}\" ] && exit", - "echo \"Enabling automatic GUI login for the 'vagrant' user..\"", - "cp /private/tmp/kcpassword /private/etc/kcpassword", - "/usr/bin/defaults write /Library/Preferences/com.apple.loginwindow autoLoginUser vagrant" + "scripts/macosx/vmtools.sh", + "scripts/macosx/cleanup.sh", + "scripts/macosx/minimize.sh" ], "type": "shell" } ], "variables": { - "arch": "64", - "autologin_vagrant_user": "", - "box_basename": "macosx-10.7", + "_README": "You must provide a prepared Mac disk image (from https://github.com/timsutton/osx-vm-templates) and checksum value for this template to work. For more details, consult this project's README.md", + "box_basename": "__unset_box_basename__", "build_timestamp": "{{isotime \"20060102150405\"}}", "git_revision": "__unknown_git_revision__", - "iso_checksum": "e2a48af008ff3c4db6a8235151a1e90ea600fceb", - "iso_url": "http://fakeurl/OSX_InstallESD_10.7.5_11G63.dmg", + "iso_checksum": "__unset_iso_checksum__", + "iso_checksum_type": "md5", + "iso_url": "http://YOU-MUST-PROVIDE-YOUR-OWN-DMG.sorry", "metadata": "floppy/dummy_metadata.json", - "name": "macosx-10.7", + "name": "chef/macosx-10.7", "template": "macosx-10.7", - "version": "2.0.TIMESTAMP" + "version": "2.1.TIMESTAMP" } } diff --git a/macosx-10.8.json b/macosx-10.8.json index 666355594..5adec8152 100644 --- a/macosx-10.8.json +++ b/macosx-10.8.json @@ -5,19 +5,19 @@ "disk_size": 20480, "guest_os_type": "darwin12-64", "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "md5", + "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `iso_url`}}", - "output_directory": "packer-macosx-10.8-vmware", - "shutdown_command": "echo 'vagrant'|sudo -S shutdown -h now", + "output_directory": "packer-{{user `template`}}-vmware", + "shutdown_command": "echo 'vagrant'| sudo -S shutdown -h now", "skip_compaction": true, "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", "tools_upload_flavor": "darwin", - "tools_upload_path": "/Users/vagrant/{{.Flavor}}.iso", + "tools_upload_path": "/tmp/vmtools.iso", "type": "vmware-iso", - "vm_name": "packer-macosx-10.8-vmware", + "vm_name": "packer-{{user `template`}}-vmware", "vmx_data": { "cpuid.coresPerSocket": "1", "ehci.present": "TRUE", @@ -38,10 +38,10 @@ "guest_os_type": "MacOS108_64", "hard_drive_interface": "sata", "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "md5", + "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `iso_url`}}", - "output_directory": "packer-macosx-10.8-virtualbox", - "shutdown_command": "echo 'vagrant'|sudo -S shutdown -h now", + "output_directory": "packer-{{user `template`}}-virtualbox", + "shutdown_command": "echo 'vagrant'| sudo -S shutdown -h now", "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", @@ -149,10 +149,10 @@ ] ], "virtualbox_version_file": ".vbox_version", - "vm_name": "packer-macosx-10.8-virtualbox" + "vm_name": "packer-{{user `template`}}-virtualbox" } ], - "min_packer_version": "0.6.0", + "min_packer_version": "0.7.0", "post-processors": [ { "output": "builds/{{user `box_basename`}}.{{.Provider}}.box", @@ -167,45 +167,35 @@ "type": "file" }, { - "destination": "/private/tmp/kcpassword", - "source": "scripts/macosx/support/kcpassword", - "type": "file" - }, - { - "execute_command": "echo 'vagrant'| {{.Vars}} sudo -E -S sh '{{.Path}}'", + "environment_vars": [ + "HOME_DIR=/Users/vagrant" + ], + "execute_command": "echo 'vagrant'| {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", "scripts": [ "scripts/common/metadata.sh", "scripts/macosx/hostname.sh", - "scripts/macosx/builder.sh", "scripts/macosx/update.sh", + "scripts/macosx/networking.sh", "scripts/macosx/vagrant.sh", - "scripts/macosx/cleanup.sh" - ], - "type": "shell" - }, - { - "execute_command": "echo 'vagrant'| {{.Vars}} sudo -E -S sh '{{.Path}}'", - "inline": [ - "[ -z \"{{user `autologin_vagrant_user`}}\" ] && exit", - "echo \"Enabling automatic GUI login for the 'vagrant' user..\"", - "cp /private/tmp/kcpassword /private/etc/kcpassword", - "/usr/bin/defaults write /Library/Preferences/com.apple.loginwindow autoLoginUser vagrant" + "scripts/macosx/vmtools.sh", + "scripts/macosx/cleanup.sh", + "scripts/macosx/minimize.sh" ], "type": "shell" } ], "variables": { - "arch": "64", - "autologin_vagrant_user": "", - "box_basename": "macosx-10.8", + "_README": "You must provide a prepared Mac disk image (from https://github.com/timsutton/osx-vm-templates) and checksum value for this template to work. For more details, consult this project's README.md", + "box_basename": "__unset_box_basename__", "build_timestamp": "{{isotime \"20060102150405\"}}", "git_revision": "__unknown_git_revision__", - "iso_checksum": "e2a48af008ff3c4db6a8235151a1e90ea600fceb", - "iso_url": "http://fakeurl/OSX_InstallESD_10.8.5_12F45.dmg", + "iso_checksum": "__unset_iso_checksum__", + "iso_checksum_type": "md5", + "iso_url": "http://YOU-MUST-PROVIDE-YOUR-OWN-DMG.sorry", "metadata": "floppy/dummy_metadata.json", - "name": "macosx-10.8", + "name": "chef/macosx-10.8", "template": "macosx-10.8", - "version": "2.0.TIMESTAMP" + "version": "2.1.TIMESTAMP" } } diff --git a/macosx-10.9.json b/macosx-10.9.json index 9d936f22d..08fe3e6cc 100644 --- a/macosx-10.9.json +++ b/macosx-10.9.json @@ -5,19 +5,19 @@ "disk_size": 20480, "guest_os_type": "darwin12-64", "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "md5", + "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `iso_url`}}", - "output_directory": "packer-macosx-10.9-vmware", - "shutdown_command": "echo 'vagrant'|sudo -S shutdown -h now", + "output_directory": "packer-{{user `template`}}-vmware", + "shutdown_command": "echo 'vagrant'| sudo -S shutdown -h now", "skip_compaction": true, "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", "tools_upload_flavor": "darwin", - "tools_upload_path": "/Users/vagrant/{{.Flavor}}.iso", + "tools_upload_path": "/tmp/vmtools.iso", "type": "vmware-iso", - "vm_name": "packer-macosx-10.9-vmware", + "vm_name": "packer-{{user `template`}}-vmware", "vmx_data": { "cpuid.coresPerSocket": "1", "ehci.present": "TRUE", @@ -38,10 +38,10 @@ "guest_os_type": "MacOS109_64", "hard_drive_interface": "sata", "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "md5", + "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `iso_url`}}", - "output_directory": "packer-macosx-10.9-virtualbox", - "shutdown_command": "echo 'vagrant'|sudo -S shutdown -h now", + "output_directory": "packer-{{user `template`}}-virtualbox", + "shutdown_command": "echo 'vagrant'| sudo -S shutdown -h now", "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", @@ -149,10 +149,10 @@ ] ], "virtualbox_version_file": ".vbox_version", - "vm_name": "packer-macosx-10.9-virtualbox" + "vm_name": "packer-{{user `template`}}-virtualbox" } ], - "min_packer_version": "0.6.0", + "min_packer_version": "0.7.0", "post-processors": [ { "output": "builds/{{user `box_basename`}}.{{.Provider}}.box", @@ -167,45 +167,35 @@ "type": "file" }, { - "destination": "/private/tmp/kcpassword", - "source": "scripts/macosx/support/kcpassword", - "type": "file" - }, - { - "execute_command": "echo 'vagrant'| {{.Vars}} sudo -E -S sh '{{.Path}}'", + "environment_vars": [ + "HOME_DIR=/Users/vagrant" + ], + "execute_command": "echo 'vagrant'| {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", "scripts": [ "scripts/common/metadata.sh", "scripts/macosx/hostname.sh", - "scripts/macosx/builder.sh", "scripts/macosx/update.sh", + "scripts/macosx/networking.sh", "scripts/macosx/vagrant.sh", - "scripts/macosx/cleanup.sh" - ], - "type": "shell" - }, - { - "execute_command": "echo 'vagrant'| {{.Vars}} sudo -E -S sh '{{.Path}}'", - "inline": [ - "[ -z \"{{user `autologin_vagrant_user`}}\" ] && exit", - "echo \"Enabling automatic GUI login for the 'vagrant' user..\"", - "cp /private/tmp/kcpassword /private/etc/kcpassword", - "/usr/bin/defaults write /Library/Preferences/com.apple.loginwindow autoLoginUser vagrant" + "scripts/macosx/vmtools.sh", + "scripts/macosx/cleanup.sh", + "scripts/macosx/minimize.sh" ], "type": "shell" } ], "variables": { - "arch": "64", - "autologin_vagrant_user": "", - "box_basename": "macosx-10.9", + "_README": "You must provide a prepared Mac disk image (from https://github.com/timsutton/osx-vm-templates) and checksum value for this template to work. For more details, consult this project's README.md", + "box_basename": "__unset_box_basename__", "build_timestamp": "{{isotime \"20060102150405\"}}", "git_revision": "__unknown_git_revision__", - "iso_checksum": "e2a48af008ff3c4db6a8235151a1e90ea600fceb", - "iso_url": "http://fakeurl/OSX_InstallESD_10.9.1_13B42.dmg", + "iso_checksum": "__unset_iso_checksum__", + "iso_checksum_type": "md5", + "iso_url": "http://YOU-MUST-PROVIDE-YOUR-OWN-DMG.sorry", "metadata": "floppy/dummy_metadata.json", - "name": "macosx-10.9", + "name": "chef/macosx-10.9", "template": "macosx-10.9", - "version": "2.0.TIMESTAMP" + "version": "2.1.TIMESTAMP" } } diff --git a/scripts/macosx/cleanup.sh b/scripts/macosx/cleanup.sh index 77765d5e4..f99321138 100644 --- a/scripts/macosx/cleanup.sh +++ b/scripts/macosx/cleanup.sh @@ -1,4 +1,4 @@ -#!/bin/bash -eux +#!/bin/sh -eux # eject installer disc -drutil eject +drutil eject; diff --git a/scripts/macosx/hostname.sh b/scripts/macosx/hostname.sh index 7bd4d8a97..5cfe189eb 100644 --- a/scripts/macosx/hostname.sh +++ b/scripts/macosx/hostname.sh @@ -1,10 +1,10 @@ -#!/bin/bash -eux +#!/bin/sh -eux # Major thanks to @timsutton's osx-vm-templates: # https://github.com/timsutton/osx-vm-templates -osx_minor_version=$(sw_vers -productVersion | awk -F "." '{print $2}') +osx_minor_version="`sw_vers -productVersion | awk -F '.' '{print $2}'`"; # Set computer/hostname -computer_name=macosx-10-${osx_minor_version} -scutil --set ComputerName $computer_name -scutil --set HostName ${computer_name}.vagrantup.com +computer_name="macosx-10-${osx_minor_version}"; +scutil --set ComputerName "$computer_name"; +scutil --set HostName "${computer_name}.vagrantup.com"; diff --git a/scripts/macosx/minimize.sh b/scripts/macosx/minimize.sh index 2965d2b80..08b2f275c 100644 --- a/scripts/macosx/minimize.sh +++ b/scripts/macosx/minimize.sh @@ -1,16 +1,27 @@ #!/bin/sh -eux -# disable swap -launchctl unload -wF /System/Library/LaunchDaemons/com.apple.dynamic_pager.plist; - -rm -f /private/var/vm/swapfile*; +# Remove any sleepimage--a file the same size as the RAM footprint rm -f /private/var/vm/sleepimage; +# Stop the pager process and drop swap files. These will be re-created on boot +launchctl unload /System/Library/LaunchDaemons/com.apple.dynamic_pager.plist; +sleep 5; +rm -rf /private/var/vm/swap*; + dd if=/dev/zero of=/EMPTY bs=1000000 || echo "dd exit code $? is suppressed"; rm -f /EMPTY; # Block until the empty file has been removed, otherwise, Packer # will try to kill the box while the disk is still full and that's bad sync; + +case "$PACKER_BUILDER_TYPE" in + +vmware-iso|vmware-vmx) + sudo /Library/Application\ Support/VMware\ Tools/vmware-tools-cli disk shrink /; + ;; + +esac + # re-enable swap launchctl load -wF /System/Library/LaunchDaemons/com.apple.dynamic_pager.plist; diff --git a/scripts/macosx/networking.sh b/scripts/macosx/networking.sh index a172a66b2..8e32df866 100644 --- a/scripts/macosx/networking.sh +++ b/scripts/macosx/networking.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/sh -eux # Thank you to https://github.com/timsutton/osx-vm-templates # for the implementation @@ -6,8 +6,9 @@ # This script adds a Mac OS Launch Daemon, which runs every time the # machine is booted. The daemon will re-detect the attached network # interfaces. If this is not done, network devices may not work. -PLIST=/Library/LaunchDaemons/com.github.timsutton.osx-vm-templates.detectnewhardware.plist -cat <<EOF > "${PLIST}" +plist=/Library/LaunchDaemons/com.github.timsutton.osx-vm-templates.detectnewhardware.plist; + +cat <<PLIST >"$plist"; <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> <plist version="1.0"> @@ -23,9 +24,9 @@ cat <<EOF > "${PLIST}" <true/> </dict> </plist> -EOF +PLIST # These should be already set as follows, but since they're required # in order to load properly, we set them explicitly. -/bin/chmod 644 "${PLIST}" -/usr/sbin/chown root:wheel "${PLIST}" +chmod 644 "$plist"; +chown root:wheel "$plist"; diff --git a/scripts/macosx/update.sh b/scripts/macosx/update.sh index 20da6eea7..b4cd8ff93 100644 --- a/scripts/macosx/update.sh +++ b/scripts/macosx/update.sh @@ -1,3 +1,3 @@ -#!/bin/bash -eux +#!/bin/sh -eux -softwareupdate --install --all +softwareupdate --install --all; diff --git a/scripts/macosx/vagrant.sh b/scripts/macosx/vagrant.sh index d86740ae4..bd4b3ec21 100644 --- a/scripts/macosx/vagrant.sh +++ b/scripts/macosx/vagrant.sh @@ -1,38 +1,14 @@ #!/bin/bash -eux -home_dir="$(python -c 'import pwd; print pwd.getpwnam("vagrant").pw_dir')" - -if [ -f $home_dir/.vbox_version ]; then - echo "VirtualBox not currently supported, sadface" -fi - -if [ -f $home_dir/.vmfusion_version ]; then - iso_name="$(uname | tr [[:upper:]] [[:lower:]]).iso" - mount_point="$(mktemp -d /tmp/vmware-tools.XXXX)" - #Run install, unmount ISO and remove it - cd $home_dir - hdiutil attach $iso_name -mountpoint "$mount_point" - installer -pkg "$mount_point/Install VMware Tools.app/Contents/Resources/VMware Tools.pkg" -target / - # This usually fails - hdiutil detach "$mount_point" || true - rm -rf $home_dir/$iso_name - rmdir $mount_point - - # Point Linux shared folder root to that used by OS X guests, - # useful for the Hashicorp vmware_fusion Vagrant provider plugin - mkdir /mnt - ln -sf /Volumes/VMware\ Shared\ Folders /mnt/hgfs -fi - -pubkey_url='https://github.com/mitchellh/vagrant/raw/master/keys/vagrant.pub' -mkdir $home_dir/.ssh -if command -v wget >/dev/null ; then - wget --no-check-certificate "$pubkey_url" -O $home_dir/.ssh/authorized_keys -elif command -v curl >/dev/null ; then - curl --insecure --location "$pubkey_url" > $home_dir/.ssh/authorized_keys +pubkey_url="https://raw.githubusercontent.com/mitchellh/vagrant/master/keys/vagrant.pub"; +mkdir -p $HOME_DIR/.ssh; +if command -v wget >/dev/null 2>&1; then + wget --no-check-certificate "$pubkey_url" -O $HOME_DIR/.ssh/authorized_keys; +elif command -v curl >/dev/null 2>&1; then + curl --insecure --location "$pubkey_url" > $HOME_DIR/.ssh/authorized_keys; else - echo "Cannot download vagrant public key" - exit 1 + echo "Cannot download vagrant public key"; + exit 1; fi -chown -R vagrant $home_dir/.ssh -chmod -R go-rwsx $home_dir/.ssh +chown -R vagrant $HOME_DIR/.ssh; +chmod -R go-rwsx $HOME_DIR/.ssh; From aae262e30c78b76ca7d5d1e0fa6e8df8cf40f3af Mon Sep 17 00:00:00 2001 From: Fletcher Nichol <fnichol@nichol.ca> Date: Thu, 2 Jul 2015 21:23:41 -0600 Subject: [PATCH 0351/1622] Remove files that are no longer referenced by any templates. * No preseed.cfg files are referenced under `scripts/`, the versions under `http/` are used instead * Windows VeeWee templates were previously removed * The Mac OS X templates were pruned down a left unneeded files --- scripts/debian/preseed.cfg | 47 --------------------------- scripts/macosx/builder.sh | 9 ----- scripts/macosx/support/kcpassword | 1 - scripts/ubuntu/preseed.cfg | 31 ------------------ scripts/windows/install-chef.bat | 47 --------------------------- scripts/windows/install-vbox.bat | 4 --- scripts/windows/mount-validation.bat | 3 -- scripts/windows/oracle-cert.cer | Bin 1398 -> 0 bytes 8 files changed, 142 deletions(-) delete mode 100644 scripts/debian/preseed.cfg delete mode 100644 scripts/macosx/builder.sh delete mode 100644 scripts/macosx/support/kcpassword delete mode 100644 scripts/ubuntu/preseed.cfg delete mode 100644 scripts/windows/install-chef.bat delete mode 100644 scripts/windows/install-vbox.bat delete mode 100644 scripts/windows/mount-validation.bat delete mode 100644 scripts/windows/oracle-cert.cer diff --git a/scripts/debian/preseed.cfg b/scripts/debian/preseed.cfg deleted file mode 100644 index 820f090c5..000000000 --- a/scripts/debian/preseed.cfg +++ /dev/null @@ -1,47 +0,0 @@ -choose-mirror-bin mirror/http/proxy string -d-i apt-setup/use_mirror boolean true -d-i base-installer/kernel/override-image string linux-server -d-i clock-setup/utc boolean true -d-i clock-setup/utc-auto boolean true -d-i finish-install/reboot_in_progress note -d-i grub-installer/only_debian boolean true -d-i grub-installer/with_other_os boolean true -d-i keymap select us -d-i mirror/country string manual -d-i mirror/http/directory string /debian -d-i mirror/http/hostname string mirrors.kernel.org -d-i mirror/http/proxy string -d-i partman-auto-lvm/guided_size string max -d-i partman-auto/choose_recipe select atomic -d-i partman-auto/method string lvm -d-i partman-lvm/confirm boolean true -d-i partman-lvm/confirm boolean true -d-i partman-lvm/confirm_nooverwrite boolean true -d-i partman-lvm/device_remove_lvm boolean true -d-i partman/choose_partition select finish -d-i partman/confirm boolean true -d-i partman/confirm_nooverwrite boolean true -d-i partman/confirm_write_new_label boolean true -d-i passwd/root-login boolean false -d-i passwd/root-password-again password vagrant -d-i passwd/root-password password vagrant -d-i passwd/user-fullname string vagrant -d-i passwd/user-uid string 900 -d-i passwd/user-password password vagrant -d-i passwd/user-password-again password vagrant -d-i passwd/username string vagrant -d-i pkgsel/include string openssh-server sudo bzip2 acpid cryptsetup zlib1g-dev wget curl dkms make -d-i pkgsel/install-language-support boolean false -d-i pkgsel/update-policy select unattended-upgrades -d-i pkgsel/upgrade select full-upgrade -# Prevent packaged version of VirtualBox Guest Additions being installed: -d-i preseed/early_command string sed -i \ - '/in-target/idiscover(){/sbin/discover|grep -v VirtualBox;}' \ - /usr/lib/pre-pkgsel.d/20install-hwpackages -d-i time/zone string UTC -d-i user-setup/allow-password-weak boolean true -d-i user-setup/encrypt-home boolean false -apt-cdrom-setup apt-setup/cdrom/set-first boolean false -apt-mirror-setup apt-setup/use_mirror boolean true -popularity-contest popularity-contest/participate boolean false -tasksel tasksel/first multiselect standard, ubuntu-server diff --git a/scripts/macosx/builder.sh b/scripts/macosx/builder.sh deleted file mode 100644 index 135720a19..000000000 --- a/scripts/macosx/builder.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/bash -eux - -home_dir="$(python -c 'import pwd; print pwd.getpwnam("vagrant").pw_dir')" - -if [ "$PACKER_BUILDER_TYPE" = "vmware" ]; then - version_file="$home_dir/.vmfusion_version" - mkdir -p $(dirname $version_file) - touch $version_file -fi diff --git a/scripts/macosx/support/kcpassword b/scripts/macosx/support/kcpassword deleted file mode 100644 index c818c0c5b..000000000 --- a/scripts/macosx/support/kcpassword +++ /dev/null @@ -1 +0,0 @@ - è5Q³Ò©êG« \ No newline at end of file diff --git a/scripts/ubuntu/preseed.cfg b/scripts/ubuntu/preseed.cfg deleted file mode 100644 index 903f2e14b..000000000 --- a/scripts/ubuntu/preseed.cfg +++ /dev/null @@ -1,31 +0,0 @@ -choose-mirror-bin mirror/http/proxy string -d-i base-installer/kernel/override-image string linux-server -d-i clock-setup/utc boolean true -d-i clock-setup/utc-auto boolean true -d-i finish-install/reboot_in_progress note -d-i grub-installer/only_debian boolean true -d-i grub-installer/with_other_os boolean true -d-i partman-auto-lvm/guided_size string max -d-i partman-auto/choose_recipe select atomic -d-i partman-auto/method string lvm -d-i partman-lvm/confirm boolean true -d-i partman-lvm/confirm boolean true -d-i partman-lvm/confirm_nooverwrite boolean true -d-i partman-lvm/device_remove_lvm boolean true -d-i partman/choose_partition select finish -d-i partman/confirm boolean true -d-i partman/confirm_nooverwrite boolean true -d-i partman/confirm_write_new_label boolean true -d-i passwd/user-fullname string vagrant -d-i passwd/user-uid string 900 -d-i passwd/user-password password vagrant -d-i passwd/user-password-again password vagrant -d-i passwd/username string vagrant -d-i pkgsel/include string openssh-server cryptsetup build-essential libssl-dev libreadline-dev zlib1g-dev linux-source dkms -d-i pkgsel/install-language-support boolean false -d-i pkgsel/update-policy select unattended-upgrades -d-i pkgsel/upgrade select full-upgrade -d-i time/zone string UTC -d-i user-setup/allow-password-weak boolean true -d-i user-setup/encrypt-home boolean false -tasksel tasksel/first multiselect standard, ubuntu-server diff --git a/scripts/windows/install-chef.bat b/scripts/windows/install-chef.bat deleted file mode 100644 index 2107a1b29..000000000 --- a/scripts/windows/install-chef.bat +++ /dev/null @@ -1,47 +0,0 @@ -@REM Loop ten times to make sure outbound networking is up -FOR /L %%n IN (1,1,10) DO ( - PING -n 1 www.opscode.com - IF %ERRORLEVEL% == 0 CALL :wget - TIMEOUT 10 -) - -:err -ECHO "Couldn't reach Opscode even after 10 retries" -GOTO :done - -:wget -@rem Install Chef using chef-client MSI installer -@setlocal - -@set REMOTE_SOURCE_MSI_URL=https://www.opscode.com/chef/install.msi -@set LOCAL_DESTINATION_MSI_PATH=%TEMP%\chef-client-latest.msi -@set FALLBACK_QUERY_STRING=?DownloadContext=PowerShell - -@set ALTERNATE_DOWNLOAD_COMMAND=$webClient=new-object System.Net.WebClient; $webClient.DownloadFile('%REMOTE_SOURCE_MSI_URL%%FALLBACK_QUERY_STRING%', '%LOCAL_DESTINATION_MSI_PATH%') - -cscript /nologo %TEMP%\wget.vbs /url:%REMOTE_SOURCE_MSI_URL% /path:"%LOCAL_DESTINATION_MSI_PATH%" - -@rem Work around issues found in Windows Server 2012 around job objects not respecting WSMAN memory quotas -@rem that cause the MSI download process to exceed the quota even when it is increased by administrators. -@rem Retry the download using a more memory-efficient mechanism that only works if PowerShell is available. -@if ERRORLEVEL 1 ( - echo Warning: Failed to download %REMOTE_SOURCE_MSI_URL% to %LOCAL_DESTINATION_MSI_PATH% - echo Warning: Retrying download with PowerShell if available - if EXIST "%LOCAL_DESTINATION_MSI_PATH%" del /f /q "%LOCAL_DESTINATION_MSI_PATH%" - echo powershell -noprofile -noninteractive -command "%ALTERNATE_DOWNLOAD_COMMAND%" - powershell -noprofile -noninteractive -command "%ALTERNATE_DOWNLOAD_COMMAND%" - if NOT ERRORLEVEL 1 ( - echo Download succeeded - ) else ( - echo Failed to download %REMOTE_SOURCE_MSI_URL% - echo Subsequent attempt to install the downloaded MSI is likely to fail - ) -) - -msiexec /qb /i "%LOCAL_DESTINATION_MSI_PATH%" - -@endlocal -EXIT - -:done -EXIT diff --git a/scripts/windows/install-vbox.bat b/scripts/windows/install-vbox.bat deleted file mode 100644 index 614c415c7..000000000 --- a/scripts/windows/install-vbox.bat +++ /dev/null @@ -1,4 +0,0 @@ -cmd /c certutil -addstore -f "TrustedPublisher" a:oracle-cert.cer -cmd /c e:\VBoxWindowsAdditions-amd64.exe /S -cmd /c shutdown.exe /r /t 5 /d p:2:4 /c "Vagrant reboot for VBoxWindowsAdditions" - diff --git a/scripts/windows/mount-validation.bat b/scripts/windows/mount-validation.bat deleted file mode 100644 index ae458c1d6..000000000 --- a/scripts/windows/mount-validation.bat +++ /dev/null @@ -1,3 +0,0 @@ -REM This is so we can pass the validation test... I don't know that it's necessary -cmd /c net use z: \\vboxsrv\veewee-validation - diff --git a/scripts/windows/oracle-cert.cer b/scripts/windows/oracle-cert.cer deleted file mode 100644 index 6f3380d48553956036650bc711ca5aed73a1224d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1398 zcmXqLVl6UgVu@P7%*4pVBoH|JX8KPK#!$sYJbaVIzH}P!vT<s)d9;1!Wn^S!WiV*m zV#sa4$;KSY!Y0fV8f++TAPVAe3G;=e7G(x!rswG>c;+SR8Oj^Tf+V<w#b6Q&Aw{Ld zB?^A2CFS`=*@o5zmJkI-A*n^V#R~ap3Z=!V3W+5O86_nJ#a8<I<>lpiWk6Glfu`yu z=jZAd6(lNXBx@QP80s15fHX4;tHMop&PgmTRxnm@&QD2I068QxFI~aNz|cU!+0j5w zoY&CMz{tSD01TplToWMI+{oC}($q4_pm8gzw}cG@LFRJ^b2%sGWTxd8<z*(q{K_uO z7nGV(o}Zth5S)=;lv->kZ6FC!%_Sn_UzC`flL~Z0Q9*uDVo7Fxo}rzA4aA?OE}7|> zC5br-o-PV7$LcEhW+oTq7w4yyC<FtE^2DN4g)pF%DPYYCWkxW=nXwse(8Q>O97Bw( z49rc8{0u;GE~X|%MuyHw?*%`8FjtXzIendtSKY3w*O-60EAjFQ2OV~w_ftDDLUzu_ z85<Wa=?S-*nejb)|0Bzi=ZAKyJXs+1{&U}<E!<r7eBtNQVs{iy`CpdM8+pV3kFKYd z;{O}R&%U~HRFb)|&*|X#58c1RGz)!dcTGuVbeeB)eCp1-hX0aX)OY`{ZrXppaE9c( z=3cQz#vO?t;*(yVb7)<pC3A9tz>SryzkP0TS}(uOwDSCq)A{l5xun*{K0kH+^Qm$< z{v9i2H}l%A36FnQYWvH^<3!H>xUK(c<{T^S(EK-X{(E*tk9{wuILuppXYONpzdIrm z6;8kD=Vfr5%TV)i?iWRwFs0(DVJoe?Co?fKGB7S~Vyp&+NI5v&$_leE888^|0pmoL zpONuD3kx$7dxL=kh%e7#X<%+(y1;mWVVgcE6#^4sa&fY;E+`r4CKu(PCP(LBXNZ&@ zP|CmsWP$>VtpO-ub0@TUFt+`0Wn>p;HqbKAVB^qc1LhxgCPpzCe97BD7-Whn3y%R8 zObau!K_QII$jFjvkZhm=;~OxxNkHA1pIlsk;yeRuxGE+rzDdkXL{YAf<eStY19^}; zlvyMU#2Q4-&s_PcTJ4MX$-e&UA6V7iKfbhlE--&^Lj33ibQCZQSp*Ek*tmecWMOPF zXJV9Q;V@tWCO}{aBPUQ`5duu0j10%my}A5s>tn4l8@-n`97fxDH}mY7!8P?YpYXXe zANBj<Zy#8B<=plhr2w0$&kh}Y;3_J_rq%O(!d;Kdh!69Qrx$0(Z#pBlLibZ#!*^ku zETe+LaLfPw_xTrys&70sPe)j1+iVq`aMSBM(lw_ziD+!<3Y)OpMqT!-=r7Lxi?JI@ z<mcTks*7urddn8t7Ob=7j{GmlCwc6O!YLD(?sT2IaC=(b)&muZ35!DO?Rt6F3ICk! zzWcisYuQ$<<p-zv%;P9Gxv*7GE-~|}O~UcDuPhm!mwENJ*Y;evpI^83&Bmf4#}q;F kZ>ww{IP}*EUbv-wBB=FaQSwz;n~wTPeHRx#@~!?40OZx*k^lez From 5e3cf0aeabecc90065e319978a37e4c6dbe0f783 Mon Sep 17 00:00:00 2001 From: Fletcher Nichol <fnichol@nichol.ca> Date: Thu, 2 Jul 2015 21:35:49 -0600 Subject: [PATCH 0352/1622] [macosx-*] Add support for {http,https,no}_proxy environment variables. The following environment variables will be made available to the provisioner shell scripts if set on the workstation: * `http_proxy` * `https_proxy` * `no_proxy` --- macosx-10.10.json | 8 +++++++- macosx-10.7.json | 8 +++++++- macosx-10.8.json | 8 +++++++- macosx-10.9.json | 8 +++++++- 4 files changed, 28 insertions(+), 4 deletions(-) diff --git a/macosx-10.10.json b/macosx-10.10.json index b15c69fa4..44f52685e 100644 --- a/macosx-10.10.json +++ b/macosx-10.10.json @@ -168,7 +168,10 @@ }, { "environment_vars": [ - "HOME_DIR=/Users/vagrant" + "HOME_DIR=/Users/vagrant", + "http_proxy={{user `http_proxy`}}", + "https_proxy={{user `https_proxy`}}", + "no_proxy={{user `no_proxy`}}" ], "execute_command": "echo 'vagrant'| {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", "scripts": [ @@ -189,11 +192,14 @@ "box_basename": "__unset_box_basename__", "build_timestamp": "{{isotime \"20060102150405\"}}", "git_revision": "__unknown_git_revision__", + "http_proxy": "{{env `http_proxy`}}", + "https_proxy": "{{env `https_proxy`}}", "iso_checksum": "__unset_iso_checksum__", "iso_checksum_type": "md5", "iso_url": "http://YOU-MUST-PROVIDE-YOUR-OWN-DMG.sorry", "metadata": "floppy/dummy_metadata.json", "name": "chef/macosx-10.10", + "no_proxy": "{{env `no_proxy`}}", "template": "macosx-10.10", "version": "2.1.TIMESTAMP" } diff --git a/macosx-10.7.json b/macosx-10.7.json index cf3f7b173..2d4dcca7f 100644 --- a/macosx-10.7.json +++ b/macosx-10.7.json @@ -168,7 +168,10 @@ }, { "environment_vars": [ - "HOME_DIR=/Users/vagrant" + "HOME_DIR=/Users/vagrant", + "http_proxy={{user `http_proxy`}}", + "https_proxy={{user `https_proxy`}}", + "no_proxy={{user `no_proxy`}}" ], "execute_command": "echo 'vagrant'| {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", "scripts": [ @@ -189,11 +192,14 @@ "box_basename": "__unset_box_basename__", "build_timestamp": "{{isotime \"20060102150405\"}}", "git_revision": "__unknown_git_revision__", + "http_proxy": "{{env `http_proxy`}}", + "https_proxy": "{{env `https_proxy`}}", "iso_checksum": "__unset_iso_checksum__", "iso_checksum_type": "md5", "iso_url": "http://YOU-MUST-PROVIDE-YOUR-OWN-DMG.sorry", "metadata": "floppy/dummy_metadata.json", "name": "chef/macosx-10.7", + "no_proxy": "{{env `no_proxy`}}", "template": "macosx-10.7", "version": "2.1.TIMESTAMP" } diff --git a/macosx-10.8.json b/macosx-10.8.json index 5adec8152..821d621e8 100644 --- a/macosx-10.8.json +++ b/macosx-10.8.json @@ -168,7 +168,10 @@ }, { "environment_vars": [ - "HOME_DIR=/Users/vagrant" + "HOME_DIR=/Users/vagrant", + "http_proxy={{user `http_proxy`}}", + "https_proxy={{user `https_proxy`}}", + "no_proxy={{user `no_proxy`}}" ], "execute_command": "echo 'vagrant'| {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", "scripts": [ @@ -189,11 +192,14 @@ "box_basename": "__unset_box_basename__", "build_timestamp": "{{isotime \"20060102150405\"}}", "git_revision": "__unknown_git_revision__", + "http_proxy": "{{env `http_proxy`}}", + "https_proxy": "{{env `https_proxy`}}", "iso_checksum": "__unset_iso_checksum__", "iso_checksum_type": "md5", "iso_url": "http://YOU-MUST-PROVIDE-YOUR-OWN-DMG.sorry", "metadata": "floppy/dummy_metadata.json", "name": "chef/macosx-10.8", + "no_proxy": "{{env `no_proxy`}}", "template": "macosx-10.8", "version": "2.1.TIMESTAMP" } diff --git a/macosx-10.9.json b/macosx-10.9.json index 08fe3e6cc..d37dc6782 100644 --- a/macosx-10.9.json +++ b/macosx-10.9.json @@ -168,7 +168,10 @@ }, { "environment_vars": [ - "HOME_DIR=/Users/vagrant" + "HOME_DIR=/Users/vagrant", + "http_proxy={{user `http_proxy`}}", + "https_proxy={{user `https_proxy`}}", + "no_proxy={{user `no_proxy`}}" ], "execute_command": "echo 'vagrant'| {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", "scripts": [ @@ -189,11 +192,14 @@ "box_basename": "__unset_box_basename__", "build_timestamp": "{{isotime \"20060102150405\"}}", "git_revision": "__unknown_git_revision__", + "http_proxy": "{{env `http_proxy`}}", + "https_proxy": "{{env `https_proxy`}}", "iso_checksum": "__unset_iso_checksum__", "iso_checksum_type": "md5", "iso_url": "http://YOU-MUST-PROVIDE-YOUR-OWN-DMG.sorry", "metadata": "floppy/dummy_metadata.json", "name": "chef/macosx-10.9", + "no_proxy": "{{env `no_proxy`}}", "template": "macosx-10.9", "version": "2.1.TIMESTAMP" } From 00039de4e65d22c818ce2691c175eb37c791490f Mon Sep 17 00:00:00 2001 From: Fletcher Nichol <fnichol@nichol.ca> Date: Fri, 3 Jul 2015 11:41:49 -0600 Subject: [PATCH 0353/1622] Add @cheeseplus to MAINTAINERS.md So @cheeseplus, what do you think? --- MAINTAINERS.md | 1 + 1 file changed, 1 insertion(+) diff --git a/MAINTAINERS.md b/MAINTAINERS.md index 58bf928b6..9589ff9c0 100644 --- a/MAINTAINERS.md +++ b/MAINTAINERS.md @@ -21,3 +21,4 @@ Covers the Bento project repository which is responsible for building Vagrant bo ### Maintainers * [Yvonne Lam](http://github.com/yzl) +* [Seth Thomas](http://github.com/cheeseplus) From 0d8adf5b5dbea396bb20d85b8b551889feb25788 Mon Sep 17 00:00:00 2001 From: Seth Thomas <sthomas@chef.io> Date: Mon, 6 Jul 2015 11:30:49 -0700 Subject: [PATCH 0354/1622] Adding Debian 8.1 links, removing Debian 8.0 templates --- README.md | 8 +- debian-8.0-amd64.json | 186 ------------------------------------------ debian-8.0-i386.json | 186 ------------------------------------------ 3 files changed, 4 insertions(+), 376 deletions(-) delete mode 100644 debian-8.0-amd64.json delete mode 100644 debian-8.0-i386.json diff --git a/README.md b/README.md index 57452a91d..f80ce4e9a 100644 --- a/README.md +++ b/README.md @@ -31,8 +31,8 @@ These baseboxes were all built using a Mac OS X host running VirtualBox 4.3.16, * [opscode-debian-6.0.10](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_debian-6.0.10_chef-provisionerless.box) * [opscode-debian-7.8-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_debian-7.8-i386_chef-provisionerless.box) * [opscode-debian-7.8](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_debian-7.8_chef-provisionerless.box) -* [opscode-debian-8.0-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_debian-8.0-i386_chef-provisionerless.box) -* [opscode-debian-8.0](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_debian-8.0_chef-provisionerless.box) +* [opscode-debian-8.1-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_debian-8.1-i386_chef-provisionerless.box) +* [opscode-debian-8.1](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_debian-8.1_chef-provisionerless.box) * [opscode-fedora-20-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_fedora-20-i386_chef-provisionerless.box) * [opscode-fedora-20](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_fedora-20_chef-provisionerless.box) * [opscode-fedora-21-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_fedora-21-i386_chef-provisionerless.box) @@ -72,8 +72,8 @@ these boxes. Using `--provider vmware_fusion`, will not. * [opscode-debian-6.0.10](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_debian-6.0.10_chef-provisionerless.box) * [opscode-debian-7.8-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_debian-7.8-i386_chef-provisionerless.box) * [opscode-debian-7.8](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_debian-7.8_chef-provisionerless.box) -* [opscode-debian-8.0-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_debian-8.0-i386_chef-provisionerless.box) -* [opscode-debian-8.0](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_debian-8.0_chef-provisionerless.box) +* [opscode-debian-8.1-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_debian-8.1-i386_chef-provisionerless.box) +* [opscode-debian-8.1](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_debian-8.1_chef-provisionerless.box) * [opscode-fedora-20-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_fedora-20-i386_chef-provisionerless.box) * [opscode-fedora-20](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_fedora-20_chef-provisionerless.box) * [opscode-fedora-21-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_fedora-21-i386_chef-provisionerless.box) diff --git a/debian-8.0-amd64.json b/debian-8.0-amd64.json deleted file mode 100644 index 2e0d8c2e3..000000000 --- a/debian-8.0-amd64.json +++ /dev/null @@ -1,186 +0,0 @@ -{ - "builders": [ - { - "boot_command": [ - "<esc><wait>", - "install <wait>", - "preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/debian-8/preseed.cfg <wait>", - "debian-installer=en_US <wait>", - "auto <wait>", - "locale=en_US <wait>", - "kbd-chooser/method=us <wait>", - "keyboard-configuration/xkb-keymap=us <wait>", - "netcfg/get_hostname={{ .Name }} <wait>", - "netcfg/get_domain=vagrantup.com <wait>", - "fb=false <wait>", - "debconf/frontend=noninteractive <wait>", - "console-setup/ask_detect=false <wait>", - "console-keymaps-at/keymap=us <wait>", - "<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": 40960, - "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", - "guest_os_type": "Debian_64", - "hard_drive_interface": "sata", - "http_directory": "http", - "iso_checksum": "5a3a023633552b2ceee0d34c541e840c0f7c50ff", - "iso_checksum_type": "sha1", - "iso_url": "{{user `mirror`}}/8.0.0/amd64/iso-cd/debian-8.0.0-amd64-CD-1.iso", - "output_directory": "packer-debian-8.0-amd64-virtualbox", - "shutdown_command": "echo 'vagrant'|sudo -S /sbin/shutdown -hP now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "virtualbox-iso", - "vboxmanage": [ - [ - "modifyvm", - "{{.Name}}", - "--memory", - "384" - ], - [ - "modifyvm", - "{{.Name}}", - "--cpus", - "1" - ] - ], - "virtualbox_version_file": ".vbox_version", - "vm_name": "packer-debian-8.0-amd64" - }, - { - "boot_command": [ - "<esc><wait>", - "install <wait>", - "preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/debian-8/preseed.cfg <wait>", - "debian-installer=en_US <wait>", - "auto <wait>", - "locale=en_US <wait>", - "kbd-chooser/method=us <wait>", - "keyboard-configuration/xkb-keymap=us <wait>", - "netcfg/get_hostname={{ .Name }} <wait>", - "netcfg/get_domain=vagrantup.com <wait>", - "fb=false <wait>", - "debconf/frontend=noninteractive <wait>", - "console-setup/ask_detect=false <wait>", - "console-keymaps-at/keymap=us <wait>", - "<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": 40960, - "guest_os_type": "debian8-64", - "http_directory": "http", - "iso_checksum": "5a3a023633552b2ceee0d34c541e840c0f7c50ff", - "iso_checksum_type": "sha1", - "iso_url": "{{user `mirror`}}/8.0.0/amd64/iso-cd/debian-8.0.0-amd64-CD-1.iso", - "output_directory": "packer-debian-8.0-amd64-vmware", - "shutdown_command": "echo 'vagrant'|sudo -S /sbin/shutdown -hP now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "tools_upload_flavor": "linux", - "type": "vmware-iso", - "vm_name": "packer-debian-8.0-amd64", - "vmx_data": { - "cpuid.coresPerSocket": "1", - "memsize": "384", - "numvcpus": "1" - } - }, - { - "boot_command": [ - "<esc><wait>", - "install <wait>", - "preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/debian-8/preseed.cfg <wait>", - "debian-installer=en_US <wait>", - "auto <wait>", - "locale=en_US <wait>", - "kbd-chooser/method=us <wait>", - "keyboard-configuration/xkb-keymap=us <wait>", - "netcfg/get_hostname={{ .Name }} <wait>", - "netcfg/get_domain=vagrantup.com <wait>", - "fb=false <wait>", - "debconf/frontend=noninteractive <wait>", - "console-setup/ask_detect=false <wait>", - "console-keymaps-at/keymap=us <wait>", - "<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": 40960, - "guest_os_type": "debian", - "http_directory": "http", - "iso_checksum": "5a3a023633552b2ceee0d34c541e840c0f7c50ff", - "iso_checksum_type": "sha1", - "iso_url": "{{user `mirror`}}/8.0.0/amd64/iso-cd/debian-8.0.0-amd64-CD-1.iso", - "output_directory": "packer-debian-8.0-amd64-parallels", - "parallels_tools_flavor": "lin", - "prlctl": [ - [ - "set", - "{{.Name}}", - "--memsize", - "384" - ], - [ - "set", - "{{.Name}}", - "--cpus", - "1" - ] - ], - "prlctl_version_file": ".prlctl_version", - "shutdown_command": "echo 'vagrant'|sudo -S /sbin/shutdown -hP now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "parallels-iso", - "vm_name": "packer-debian-8.0-amd64" - } - ], - "post-processors": [ - { - "output": "builds/{{user `box_basename`}}.{{.Provider}}.box", - "type": "vagrant" - } - ], - "provisioners": [ - { - "destination": "/tmp/bento-metadata.json", - "source": "{{user `metadata`}}", - "type": "file" - }, - { - "environment_vars": [], - "execute_command": "echo 'vagrant' | {{.Vars}} sudo -E -S bash '{{.Path}}'", - "scripts": [ - "scripts/common/metadata.sh", - "scripts/debian/update.sh", - "scripts/common/sshd.sh", - "scripts/debian/networking.sh", - "scripts/debian/sudoers.sh", - "scripts/common/vagrant.sh", - "scripts/common/vmtools.sh", - "scripts/debian/cleanup.sh", - "scripts/common/minimize.sh" - ], - "type": "shell" - } - ], - "variables": { - "arch": "64", - "box_basename": "debian-8.0", - "build_timestamp": "{{isotime \"20060102150405\"}}", - "git_revision": "__unknown_git_revision__", - "metadata": "floppy/dummy_metadata.json", - "mirror": "http://cdimage.debian.org/cdimage/archive", - "name": "debian-8.0", - "template": "debian-8.0-amd64", - "version": "2.0.TIMESTAMP" - } -} - diff --git a/debian-8.0-i386.json b/debian-8.0-i386.json deleted file mode 100644 index 2edb65735..000000000 --- a/debian-8.0-i386.json +++ /dev/null @@ -1,186 +0,0 @@ -{ - "builders": [ - { - "boot_command": [ - "<esc><wait>", - "install <wait>", - "preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/debian-8/preseed.cfg <wait>", - "debian-installer=en_US <wait>", - "auto <wait>", - "locale=en_US <wait>", - "kbd-chooser/method=us <wait>", - "keyboard-configuration/xkb-keymap=us <wait>", - "netcfg/get_hostname={{ .Name }} <wait>", - "netcfg/get_domain=vagrantup.com <wait>", - "fb=false <wait>", - "debconf/frontend=noninteractive <wait>", - "console-setup/ask_detect=false <wait>", - "console-keymaps-at/keymap=us <wait>", - "<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": 40960, - "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", - "guest_os_type": "Debian", - "hard_drive_interface": "sata", - "http_directory": "http", - "iso_checksum": "a8101b2e4ef3bdc5051796eda91263c71c90eb90", - "iso_checksum_type": "sha1", - "iso_url": "{{user `mirror`}}/8.0.0/i386/iso-cd/debian-8.0.0-i386-CD-1.iso", - "output_directory": "packer-debian-8.0-i386-virtualbox", - "shutdown_command": "echo 'vagrant'|sudo -S /sbin/shutdown -hP now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "virtualbox-iso", - "vboxmanage": [ - [ - "modifyvm", - "{{.Name}}", - "--memory", - "384" - ], - [ - "modifyvm", - "{{.Name}}", - "--cpus", - "1" - ] - ], - "virtualbox_version_file": ".vbox_version", - "vm_name": "packer-debian-8.0-i386" - }, - { - "boot_command": [ - "<esc><wait>", - "install <wait>", - "preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/debian-8/preseed.cfg <wait>", - "debian-installer=en_US <wait>", - "auto <wait>", - "locale=en_US <wait>", - "kbd-chooser/method=us <wait>", - "keyboard-configuration/xkb-keymap=us <wait>", - "netcfg/get_hostname={{ .Name }} <wait>", - "netcfg/get_domain=vagrantup.com <wait>", - "fb=false <wait>", - "debconf/frontend=noninteractive <wait>", - "console-setup/ask_detect=false <wait>", - "console-keymaps-at/keymap=us <wait>", - "<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": 40960, - "guest_os_type": "debian8", - "http_directory": "http", - "iso_checksum": "a8101b2e4ef3bdc5051796eda91263c71c90eb90", - "iso_checksum_type": "sha1", - "iso_url": "{{user `mirror`}}/8.0.0/i386/iso-cd/debian-8.0.0-i386-CD-1.iso", - "output_directory": "packer-debian-8.0-i386-vmware", - "shutdown_command": "echo 'vagrant'|sudo -S /sbin/shutdown -hP now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "tools_upload_flavor": "linux", - "type": "vmware-iso", - "vm_name": "packer-debian-8.0-i386", - "vmx_data": { - "cpuid.coresPerSocket": "1", - "memsize": "384", - "numvcpus": "1" - } - }, - { - "boot_command": [ - "<esc><wait>", - "install <wait>", - "preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/debian-8/preseed.cfg <wait>", - "debian-installer=en_US <wait>", - "auto <wait>", - "locale=en_US <wait>", - "kbd-chooser/method=us <wait>", - "keyboard-configuration/xkb-keymap=us <wait>", - "netcfg/get_hostname={{ .Name }} <wait>", - "netcfg/get_domain=vagrantup.com <wait>", - "fb=false <wait>", - "debconf/frontend=noninteractive <wait>", - "console-setup/ask_detect=false <wait>", - "console-keymaps-at/keymap=us <wait>", - "<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": 40960, - "guest_os_type": "debian", - "http_directory": "http", - "iso_checksum": "a8101b2e4ef3bdc5051796eda91263c71c90eb90", - "iso_checksum_type": "sha1", - "iso_url": "{{user `mirror`}}/8.0.0/i386/iso-cd/debian-8.0.0-i386-CD-1.iso", - "output_directory": "packer-debian-8.0-i386-parallels", - "parallels_tools_flavor": "lin", - "prlctl": [ - [ - "set", - "{{.Name}}", - "--memsize", - "384" - ], - [ - "set", - "{{.Name}}", - "--cpus", - "1" - ] - ], - "prlctl_version_file": ".prlctl_version", - "shutdown_command": "echo 'vagrant'|sudo -S /sbin/shutdown -hP now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "parallels-iso", - "vm_name": "packer-debian-8.0-i386" - } - ], - "post-processors": [ - { - "output": "builds/{{user `box_basename`}}.{{.Provider}}.box", - "type": "vagrant" - } - ], - "provisioners": [ - { - "destination": "/tmp/bento-metadata.json", - "source": "{{user `metadata`}}", - "type": "file" - }, - { - "environment_vars": [], - "execute_command": "echo 'vagrant' | {{.Vars}} sudo -E -S bash '{{.Path}}'", - "scripts": [ - "scripts/common/metadata.sh", - "scripts/debian/update.sh", - "scripts/common/sshd.sh", - "scripts/debian/networking.sh", - "scripts/debian/sudoers.sh", - "scripts/common/vagrant.sh", - "scripts/common/vmtools.sh", - "scripts/debian/cleanup.sh", - "scripts/common/minimize.sh" - ], - "type": "shell" - } - ], - "variables": { - "arch": "32", - "box_basename": "debian-8.0-i386", - "build_timestamp": "{{isotime \"20060102150405\"}}", - "git_revision": "__unknown_git_revision__", - "metadata": "floppy/dummy_metadata.json", - "mirror": "http://cdimage.debian.org/cdimage/archive", - "name": "debian-8.0-i386", - "template": "debian-8.0-i386", - "version": "2.0.TIMESTAMP" - } -} - From 6d5771a49b9b5cdcc85d441d3d258f97ac5820fb Mon Sep 17 00:00:00 2001 From: Fletcher Nichol <fnichol@nichol.ca> Date: Wed, 8 Jul 2015 13:55:02 -0600 Subject: [PATCH 0355/1622] [ubuntu-*] Improve DRYness, correctness, and speed of Ubuntu templates. The following improvements are made in this commit: * Ensure that all related provisioner shell scripts are written using more conservative bourne coding idioms * Call all provisioner scripts with `sh -eux` which will: (e) exit immeditately if a command exits with a non-zero exit status, (u) treats unset variables as an error, and (x) outputs the command and its expanded arguments or associated word list * Use the `template` user variable to replace repetition of `"ubuntu-*"`style strings throughout * Support a `HOME_DIR` environment variable for provisioner scripts to use * Remove now-unused user variable `arch` * Rename all template names from `"ubuntu-*"` to `"chef/ubuntu-*"` * Extract the `iso_checksum` and `iso_checksum_type` into user variables and reference them in the templates * Construct the `iso_url` value from the `mirror`, `mirror_directory`, and `iso_name` user variables * Add a `preseed_path` user variable and use it throughout the templates * Add an `iso_name` user variable and use it throughout the templates * Use the `http_proxy`, `https_proxy`, and `no_proxy` environment variables if set on the workstation and make them available to the provisioner shell scripts to speed up package installations, etc. --- scripts/common/metadata.sh | 8 ++-- scripts/common/minimize.sh | 20 ++++----- scripts/common/sshd.sh | 6 +-- scripts/common/vmtools.sh | 6 ++- scripts/ubuntu/cleanup.sh | 79 ++++++++++++++++++++---------------- scripts/ubuntu/networking.sh | 16 +++++--- scripts/ubuntu/sudoers.sh | 20 ++++----- scripts/ubuntu/update.sh | 32 +++++++++------ scripts/ubuntu/vagrant.sh | 14 +++++++ ubuntu-10.04-amd64.json | 68 ++++++++++++++++++------------- ubuntu-10.04-i386.json | 68 ++++++++++++++++++------------- ubuntu-12.04-amd64.json | 70 +++++++++++++++++++------------- ubuntu-12.04-i386.json | 68 ++++++++++++++++++------------- ubuntu-14.04-amd64.json | 68 ++++++++++++++++++------------- ubuntu-14.04-i386.json | 69 ++++++++++++++++++------------- ubuntu-14.10-amd64.json | 68 ++++++++++++++++++------------- ubuntu-14.10-i386.json | 68 ++++++++++++++++++------------- ubuntu-15.04-amd64.json | 68 ++++++++++++++++++------------- ubuntu-15.04-i386.json | 68 ++++++++++++++++++------------- 19 files changed, 517 insertions(+), 367 deletions(-) create mode 100644 scripts/ubuntu/vagrant.sh diff --git a/scripts/common/metadata.sh b/scripts/common/metadata.sh index 500f4437f..42386ac26 100755 --- a/scripts/common/metadata.sh +++ b/scripts/common/metadata.sh @@ -1,6 +1,6 @@ #!/bin/sh -eux -mkdir -p /etc -cp /tmp/bento-metadata.json /etc/bento-metadata.json -chmod 0444 /etc/bento-metadata.json -rm -f /tmp/bento-metadata.json +mkdir -p /etc; +cp /tmp/bento-metadata.json /etc/bento-metadata.json; +chmod 0444 /etc/bento-metadata.json; +rm -f /tmp/bento-metadata.json; diff --git a/scripts/common/minimize.sh b/scripts/common/minimize.sh index 564710e2d..c288f2795 100644 --- a/scripts/common/minimize.sh +++ b/scripts/common/minimize.sh @@ -1,15 +1,15 @@ #!/bin/sh -eux -# Whiteout the swap partition to reduce box size -# Swap is disabled till reboot -readonly swapuuid=$(/sbin/blkid -o value -l -s UUID -t TYPE=swap) -readonly swappart=$(readlink -f /dev/disk/by-uuid/"$swapuuid") -/sbin/swapoff "$swappart" -dd if=/dev/zero of="$swappart" bs=1M || echo "dd exit code $? is suppressed" -/sbin/mkswap -U "$swapuuid" "$swappart" +# Whiteout the swap partition to reduce box size +# Swap is disabled till reboot +swapuuid="`/sbin/blkid -o value -l -s UUID -t TYPE=swap`"; +swappart="`readlink -f /dev/disk/by-uuid/$swapuuid`"; +/sbin/swapoff "$swappart"; +dd if=/dev/zero of="$swappart" bs=1M || echo "dd exit code $? is suppressed"; +/sbin/mkswap -U "$swapuuid" "$swappart"; -dd if=/dev/zero of=/EMPTY bs=1M -rm -f /EMPTY +dd if=/dev/zero of=/EMPTY bs=1M || echo "dd exit code $? is suppressed"; +rm -f /EMPTY; # Block until the empty file has been removed, otherwise, Packer # will try to kill the box while the disk is still full and that's bad -sync +sync; diff --git a/scripts/common/sshd.sh b/scripts/common/sshd.sh index fb25b5cc5..763106bbc 100644 --- a/scripts/common/sshd.sh +++ b/scripts/common/sshd.sh @@ -1,4 +1,4 @@ -#!/bin/bash -eux +#!/bin/sh -eux -echo "UseDNS no" >> /etc/ssh/sshd_config -echo "GSSAPIAuthentication no" >> /etc/ssh/sshd_config +echo "UseDNS no" >>/etc/ssh/sshd_config; +echo "GSSAPIAuthentication no" >>/etc/ssh/sshd_config; diff --git a/scripts/common/vmtools.sh b/scripts/common/vmtools.sh index d2439ea39..b536b67a9 100644 --- a/scripts/common/vmtools.sh +++ b/scripts/common/vmtools.sh @@ -4,9 +4,11 @@ case "$PACKER_BUILDER_TYPE" in virtualbox-iso|virtualbox-ovf) mkdir /tmp/vbox - VER=$(cat /home/vagrant/.vbox_version) + VER="`cat /home/vagrant/.vbox_version`" mount -o loop /home/vagrant/VBoxGuestAdditions_$VER.iso /tmp/vbox - sh /tmp/vbox/VBoxLinuxAdditions.run + sh /tmp/vbox/VBoxLinuxAdditions.run \ + || echo "VBoxLinuxAdditions.run exited $? and is suppressed." \ + "For more read https://www.virtualbox.org/ticket/12479" umount /tmp/vbox rmdir /tmp/vbox rm /home/vagrant/*.iso diff --git a/scripts/ubuntu/cleanup.sh b/scripts/ubuntu/cleanup.sh index 08c4f2b43..56971dd7f 100644 --- a/scripts/ubuntu/cleanup.sh +++ b/scripts/ubuntu/cleanup.sh @@ -1,34 +1,45 @@ -#!/bin/bash -eux - -# delete all linux headers -dpkg --list | awk '{ print $2 }' | grep linux-headers | xargs apt-get -y purge - -# this removes specific linux kernels, such as -# linux-image-3.11.0-15-generic but -# * keeps the current kernel -# * does not touch the virtual packages, e.g.'linux-image-generic', etc. -# -dpkg --list | awk '{ print $2 }' | grep 'linux-image-3.*-generic' | grep -v `uname -r` | xargs apt-get -y purge - -# delete linux source -dpkg --list | awk '{ print $2 }' | grep linux-source | xargs apt-get -y purge - -# delete development packages -dpkg --list | awk '{ print $2 }' | grep -- '-dev$' | xargs apt-get -y purge - -# delete compilers and other development tools -apt-get -y purge cpp gcc g++ - -# delete X11 libraries -apt-get -y purge libx11-data xauth libxmuu1 libxcb1 libx11-6 libxext6 - -# delete obsolete networking -apt-get -y purge ppp pppconfig pppoeconf - -# delete oddities -apt-get -y purge popularity-contest - -apt-get -y autoremove -apt-get -y clean -rm -rf VBoxGuestAdditions_*.iso VBoxGuestAdditions_*.iso.? -rm -f /tmp/chef*deb +#!/bin/sh -eux + +# Delete all Linux headers +dpkg --list \ + | awk '{ print $2 }' \ + | grep 'linux-headers' \ + | xargs apt-get -y purge; + +# Remove specific Linux kernels, such as linux-image-3.11.0-15-generic but +# keeps the current kernel and does not touch the virtual packages, +# e.g. 'linux-image-generic', etc. +dpkg --list \ + | awk '{ print $2 }' \ + | grep 'linux-image-3.*-generic' \ + | grep -v `uname -r` \ + | xargs apt-get -y purge; + +# Delete Linux source +dpkg --list \ + | awk '{ print $2 }' \ + | grep linux-source \ + | xargs apt-get -y purge; + +# Delete development packages +dpkg --list \ + | awk '{ print $2 }' \ + | grep -- '-dev$' \ + | xargs apt-get -y purge; + +# Delete compilers and other development tools +apt-get -y purge cpp gcc g++; + +# Delete X11 libraries +apt-get -y purge libx11-data xauth libxmuu1 libxcb1 libx11-6 libxext6; + +# Delete obsolete networking +apt-get -y purge ppp pppconfig pppoeconf; + +# Delete oddities +apt-get -y purge popularity-contest; + +apt-get -y autoremove; +apt-get -y clean; + +rm -f VBoxGuestAdditions_*.iso VBoxGuestAdditions_*.iso.?; diff --git a/scripts/ubuntu/networking.sh b/scripts/ubuntu/networking.sh index de3269a58..a2ee64053 100644 --- a/scripts/ubuntu/networking.sh +++ b/scripts/ubuntu/networking.sh @@ -1,7 +1,11 @@ -#!/bin/bash -eux +#!/bin/sh -eux -rm /etc/udev/rules.d/70-persistent-net.rules -mkdir /etc/udev/rules.d/70-persistent-net.rules -rm /lib/udev/rules.d/75-persistent-net-generator.rules -rm -rf /dev/.udev/ /var/lib/dhcp3/* -echo "pre-up sleep 2" >> /etc/network/interfaces +# Disable automatic udev rules for network interfaces in Ubuntu, +# source: http://6.ptmc.org/164/ +rm -f /etc/udev/rules.d/70-persistent-net.rules; +mkdir -p /etc/udev/rules.d/70-persistent-net.rules; +rm -f /lib/udev/rules.d/75-persistent-net-generator.rules; +rm -rf /dev/.udev/ /var/lib/dhcp3/*; + +# Adding a 2 sec delay to the interface up, to make the dhclient happy +echo "pre-up sleep 2" >>/etc/network/interfaces; diff --git a/scripts/ubuntu/sudoers.sh b/scripts/ubuntu/sudoers.sh index b75e92e1e..657b14468 100644 --- a/scripts/ubuntu/sudoers.sh +++ b/scripts/ubuntu/sudoers.sh @@ -1,17 +1,11 @@ -#!/bin/bash -eux +#!/bin/sh -eux -# https://help.ubuntu.com/community/CheckingYourUbuntuVersion -if [ lsb_release > /dev/null 2>&1 ] -then - # Get the major version (like "12" from the version string (like "12.04") - major_version=$(lsb_release -r | cut -f 2 | cut -d . -f 1) -fi +major_version="`lsb_release -r | awk '{print $2}' | awk -F. '{print $1}'`"; -if [ ! -z "$major_version" -a "$major_version" -lt 12 ] -then - sed -i -e '/Defaults\s\+env_reset/a Defaults\texempt_group=admin' /etc/sudoers - sed -i -e 's/%admin\s*ALL=(ALL) ALL/%admin\tALL=(ALL) NOPASSWD:ALL/g' /etc/sudoers +if [ ! -z "$major_version" -a "$major_version" -lt 12 ]; then + sed -i -e '/Defaults\s\+env_reset/a Defaults\texempt_group=admin' /etc/sudoers; + sed -i -e 's/%admin\s*ALL=(ALL) ALL/%admin\tALL=(ALL) NOPASSWD:ALL/g' /etc/sudoers; else - sed -i -e '/Defaults\s\+env_reset/a Defaults\texempt_group=sudo' /etc/sudoers - sed -i -e 's/%sudo\s*ALL=(ALL:ALL) ALL/%sudo\tALL=(ALL) NOPASSWD:ALL/g' /etc/sudoers + sed -i -e '/Defaults\s\+env_reset/a Defaults\texempt_group=sudo' /etc/sudoers; + sed -i -e 's/%sudo\s*ALL=(ALL:ALL) ALL/%sudo\tALL=(ALL) NOPASSWD:ALL/g' /etc/sudoers; fi diff --git a/scripts/ubuntu/update.sh b/scripts/ubuntu/update.sh index 91fc0c523..332e93dc9 100644 --- a/scripts/ubuntu/update.sh +++ b/scripts/ubuntu/update.sh @@ -1,30 +1,36 @@ -#!/bin/bash -eux +#!/bin/sh -eux -UBUNTU_VERSION=`lsb_release -r | awk '{print $2}'` -# on 12.04 work around bad cached lists -if [[ "$UBUNTU_VERSION" == '12.04' ]]; then - apt-get clean - rm -rf /var/lib/apt/lists +ubuntu_version="`lsb_release -r | awk '{print $2}'`"; +ubuntu_major_version="`echo $ubuntu_version | awk -F. '{print $1}'`"; + +# Work around bad cached lists on Ubuntu 12.04 +if [ "$ubuntu_version" = "12.04" ]; then + apt-get clean; + rm -rf /var/lib/apt/lists; fi # Update the package list -apt-get update +apt-get update; # Upgrade all installed packages incl. kernel and kernel headers -apt-get -y upgrade linux-server linux-headers-server +if [ "$ubuntu_major_version" -lt 14 ]; then + apt-get -y upgrade linux-server linux-headers-server; +else + apt-get -y upgrade linux-generic; +fi # ensure the correct kernel headers are installed -apt-get -y install linux-headers-$(uname -r) +apt-get -y install linux-headers-`uname -r`; # update package index on boot -cat <<EOF > /etc/init/refresh-apt.conf +cat <<EOF >/etc/init/refresh-apt.conf; description "update package index" start on networking task exec /usr/bin/apt-get update EOF -# on 12.04 manage broken indexes on distro disc 12.04.5 -if [[ $UBUNTU_VERSION == '12.04' ]]; then - apt-get -y install libreadline-dev dpkg +# Manage broken indexes on distro disc 12.04.5 +if [ "$ubuntu_version" = "12.04" ]; then + apt-get -y install libreadline-dev dpkg; fi diff --git a/scripts/ubuntu/vagrant.sh b/scripts/ubuntu/vagrant.sh new file mode 100644 index 000000000..bd4b3ec21 --- /dev/null +++ b/scripts/ubuntu/vagrant.sh @@ -0,0 +1,14 @@ +#!/bin/bash -eux + +pubkey_url="https://raw.githubusercontent.com/mitchellh/vagrant/master/keys/vagrant.pub"; +mkdir -p $HOME_DIR/.ssh; +if command -v wget >/dev/null 2>&1; then + wget --no-check-certificate "$pubkey_url" -O $HOME_DIR/.ssh/authorized_keys; +elif command -v curl >/dev/null 2>&1; then + curl --insecure --location "$pubkey_url" > $HOME_DIR/.ssh/authorized_keys; +else + echo "Cannot download vagrant public key"; + exit 1; +fi +chown -R vagrant $HOME_DIR/.ssh; +chmod -R go-rwsx $HOME_DIR/.ssh; diff --git a/ubuntu-10.04-amd64.json b/ubuntu-10.04-amd64.json index 4e90fbaff..d6f75113b 100644 --- a/ubuntu-10.04-amd64.json +++ b/ubuntu-10.04-amd64.json @@ -21,7 +21,7 @@ " netcfg/get_domain=vm<wait>", " netcfg/get_hostname=vagrant<wait>", " noapic<wait>", - " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/ubuntu-10.04/preseed.cfg<wait>", + " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}}<wait>", " -- <wait>", "<enter><wait>" ], @@ -31,11 +31,11 @@ "guest_os_type": "Ubuntu_64", "hard_drive_interface": "sata", "http_directory": "http", - "iso_checksum": "796e80702d65f2ee96e88874a1ab437e24df9cd6", - "iso_checksum_type": "sha1", - "iso_url": "{{user `mirror`}}/10.04.4/ubuntu-10.04.4-server-amd64.iso", - "output_directory": "packer-ubuntu-10.04-amd64-virtualbox", - "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-virtualbox", + "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", @@ -56,7 +56,7 @@ ] ], "virtualbox_version_file": ".vbox_version", - "vm_name": "packer-ubuntu-10.04-amd64" + "vm_name": "packer-{{user `template`}}-virtualbox" }, { "boot_command": [ @@ -79,7 +79,7 @@ " netcfg/get_domain=vm<wait>", " netcfg/get_hostname=vagrant<wait>", " noapic<wait>", - " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/ubuntu-10.04/preseed.cfg<wait>", + " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}}<wait>", " -- <wait>", "<enter><wait>" ], @@ -87,18 +87,18 @@ "disk_size": 40960, "guest_os_type": "ubuntu-64", "http_directory": "http", - "iso_checksum": "796e80702d65f2ee96e88874a1ab437e24df9cd6", - "iso_checksum_type": "sha1", - "iso_url": "{{user `mirror`}}/10.04.4/ubuntu-10.04.4-server-amd64.iso", - "output_directory": "packer-ubuntu-10.04-amd64-vmware", - "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-vmware", + "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", "tools_upload_flavor": "linux", "type": "vmware-iso", - "vm_name": "packer-ubuntu-10.04-amd64", + "vm_name": "packer-{{user `template`}}-vmware", "vmx_data": { "cpuid.coresPerSocket": "1", "memsize": "384", @@ -126,7 +126,7 @@ " netcfg/get_domain=vm<wait>", " netcfg/get_hostname=vagrant<wait>", " noapic<wait>", - " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/ubuntu-10.04/preseed.cfg<wait>", + " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}}<wait>", " -- <wait>", "<enter><wait>" ], @@ -134,10 +134,10 @@ "disk_size": 40960, "guest_os_type": "ubuntu", "http_directory": "http", - "iso_checksum": "796e80702d65f2ee96e88874a1ab437e24df9cd6", - "iso_checksum_type": "sha1", - "iso_url": "{{user `mirror`}}/10.04.4/ubuntu-10.04.4-server-amd64.iso", - "output_directory": "packer-ubuntu-10.04-amd64-parallels", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-parallels", "parallels_tools_flavor": "lin", "prlctl": [ [ @@ -154,13 +154,13 @@ ] ], "prlctl_version_file": ".prlctl_version", - "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", + "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", "type": "parallels-iso", - "vm_name": "packer-ubuntu-10.04-amd64" + "vm_name": "packer-{{user `template`}}-parallels" } ], "post-processors": [ @@ -176,15 +176,20 @@ "type": "file" }, { - "environment_vars": [], - "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E bash '{{.Path}}'", + "environment_vars": [ + "HOME_DIR=/home/vagrant", + "http_proxy={{user `http_proxy`}}", + "https_proxy={{user `https_proxy`}}", + "no_proxy={{user `no_proxy`}}" + ], + "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", "scripts": [ "scripts/common/metadata.sh", "scripts/ubuntu/update.sh", "scripts/common/sshd.sh", "scripts/ubuntu/networking.sh", "scripts/ubuntu/sudoers.sh", - "scripts/common/vagrant.sh", + "scripts/ubuntu/vagrant.sh", "scripts/common/vmtools.sh", "scripts/ubuntu/cleanup.sh", "scripts/common/minimize.sh" @@ -193,15 +198,22 @@ } ], "variables": { - "arch": "64", - "box_basename": "ubuntu-10.04", + "box_basename": "__unset_box_basename__", "build_timestamp": "{{isotime \"20060102150405\"}}", "git_revision": "__unknown_git_revision__", + "http_proxy": "{{env `http_proxy`}}", + "https_proxy": "{{env `https_proxy`}}", + "iso_checksum": "796e80702d65f2ee96e88874a1ab437e24df9cd6", + "iso_checksum_type": "sha1", + "iso_name": "ubuntu-10.04.4-server-amd64.iso", "metadata": "floppy/dummy_metadata.json", "mirror": "http://releases.ubuntu.com", - "name": "ubuntu-10.04", + "mirror_directory": "10.04.4", + "name": "chef/ubuntu-10.04", + "no_proxy": "{{env `no_proxy`}}", + "preseed_path": "ubuntu-10.04/preseed.cfg", "template": "ubuntu-10.04-amd64", - "version": "2.0.TIMESTAMP" + "version": "2.1.TIMESTAMP" } } diff --git a/ubuntu-10.04-i386.json b/ubuntu-10.04-i386.json index 00b407b4b..e0c4bf5a8 100644 --- a/ubuntu-10.04-i386.json +++ b/ubuntu-10.04-i386.json @@ -21,7 +21,7 @@ " netcfg/get_domain=vm<wait>", " netcfg/get_hostname=vagrant<wait>", " noapic<wait>", - " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/ubuntu-10.04/preseed.cfg<wait>", + " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}}<wait>", " -- <wait>", "<enter><wait>" ], @@ -31,11 +31,11 @@ "guest_os_type": "Ubuntu", "hard_drive_interface": "sata", "http_directory": "http", - "iso_checksum": "5695d8b6b914269d1374ac8d4c3dd3786e92d3fe", - "iso_checksum_type": "sha1", - "iso_url": "{{user `mirror`}}/10.04.4/ubuntu-10.04.4-server-i386.iso", - "output_directory": "packer-ubuntu-10.04-i386-virtualbox", - "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-virtualbox", + "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", @@ -56,7 +56,7 @@ ] ], "virtualbox_version_file": ".vbox_version", - "vm_name": "packer-ubuntu-10.04-i386" + "vm_name": "packer-{{user `template`}}-virtualbox" }, { "boot_command": [ @@ -79,7 +79,7 @@ " netcfg/get_domain=vm<wait>", " netcfg/get_hostname=vagrant<wait>", " noapic<wait>", - " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/ubuntu-10.04/preseed.cfg<wait>", + " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}}<wait>", " -- <wait>", "<enter><wait>" ], @@ -87,18 +87,18 @@ "disk_size": 40960, "guest_os_type": "ubuntu", "http_directory": "http", - "iso_checksum": "5695d8b6b914269d1374ac8d4c3dd3786e92d3fe", - "iso_checksum_type": "sha1", - "iso_url": "{{user `mirror`}}/10.04.4/ubuntu-10.04.4-server-i386.iso", - "output_directory": "packer-ubuntu-10.04-i386-vmware", - "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-vmware", + "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", "tools_upload_flavor": "linux", "type": "vmware-iso", - "vm_name": "packer-ubuntu-10.04-i386", + "vm_name": "packer-{{user `template`}}-vmware", "vmx_data": { "cpuid.coresPerSocket": "1", "memsize": "384", @@ -126,7 +126,7 @@ " netcfg/get_domain=vm<wait>", " netcfg/get_hostname=vagrant<wait>", " noapic<wait>", - " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/ubuntu-10.04/preseed.cfg<wait>", + " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}}<wait>", " -- <wait>", "<enter><wait>" ], @@ -134,10 +134,10 @@ "disk_size": 40960, "guest_os_type": "ubuntu", "http_directory": "http", - "iso_checksum": "5695d8b6b914269d1374ac8d4c3dd3786e92d3fe", - "iso_checksum_type": "sha1", - "iso_url": "{{user `mirror`}}/10.04.4/ubuntu-10.04.4-server-i386.iso", - "output_directory": "packer-ubuntu-10.04-i386-parallels", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-parallels", "parallels_tools_flavor": "lin", "prlctl": [ [ @@ -154,13 +154,13 @@ ] ], "prlctl_version_file": ".prlctl_version", - "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", + "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", "type": "parallels-iso", - "vm_name": "packer-ubuntu-10.04-i386" + "vm_name": "packer-{{user `template`}}-parallels" } ], "post-processors": [ @@ -176,15 +176,20 @@ "type": "file" }, { - "environment_vars": [], - "execute_command": "echo 'vagrant'|{{.Vars}} sudo -S -E bash '{{.Path}}'", + "environment_vars": [ + "HOME_DIR=/home/vagrant", + "http_proxy={{user `http_proxy`}}", + "https_proxy={{user `https_proxy`}}", + "no_proxy={{user `no_proxy`}}" + ], + "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", "scripts": [ "scripts/common/metadata.sh", "scripts/ubuntu/update.sh", "scripts/common/sshd.sh", "scripts/ubuntu/networking.sh", "scripts/ubuntu/sudoers.sh", - "scripts/common/vagrant.sh", + "scripts/ubuntu/vagrant.sh", "scripts/common/vmtools.sh", "scripts/ubuntu/cleanup.sh", "scripts/common/minimize.sh" @@ -193,15 +198,22 @@ } ], "variables": { - "arch": "32", - "box_basename": "ubuntu-10.04-i386", + "box_basename": "__unset_box_basename__", "build_timestamp": "{{isotime \"20060102150405\"}}", "git_revision": "__unknown_git_revision__", + "http_proxy": "{{env `http_proxy`}}", + "https_proxy": "{{env `https_proxy`}}", + "iso_checksum": "5695d8b6b914269d1374ac8d4c3dd3786e92d3fe", + "iso_checksum_type": "sha1", + "iso_name": "ubuntu-10.04.4-server-i386.iso", "metadata": "floppy/dummy_metadata.json", "mirror": "http://releases.ubuntu.com", - "name": "ubuntu-10.04-i386", + "mirror_directory": "10.04.4", + "name": "chef/ubuntu-10.04-i386", + "no_proxy": "{{env `no_proxy`}}", + "preseed_path": "ubuntu-10.04/preseed.cfg", "template": "ubuntu-10.04-i386", - "version": "2.0.TIMESTAMP" + "version": "2.1.TIMESTAMP" } } diff --git a/ubuntu-12.04-amd64.json b/ubuntu-12.04-amd64.json index abf4b4ab8..b234c7025 100644 --- a/ubuntu-12.04-amd64.json +++ b/ubuntu-12.04-amd64.json @@ -21,21 +21,21 @@ " netcfg/get_domain=vm<wait>", " netcfg/get_hostname=vagrant<wait>", " noapic<wait>", - " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/ubuntu-12.04/preseed.cfg<wait>", + " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}}<wait>", " -- <wait>", "<enter><wait>" ], "boot_wait": "10s", "disk_size": 40960, - "guest_additions_path": "VBoxGuestAdditions_{{ .Version }}.iso", + "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "guest_os_type": "Ubuntu_64", "hard_drive_interface": "sata", "http_directory": "http", - "iso_checksum": "7540ace2d6cdee264432f5ed987236d32edef798", - "iso_checksum_type": "sha1", - "iso_url": "{{user `mirror`}}/12.04.5/ubuntu-12.04.5-server-amd64.iso", - "output_directory": "packer-ubuntu-12.04-amd64-virtualbox", - "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-virtualbox", + "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", @@ -56,7 +56,7 @@ ] ], "virtualbox_version_file": ".vbox_version", - "vm_name": "packer-ubuntu-12.04-amd64" + "vm_name": "packer-{{user `template`}}-virtualbox" }, { "boot_command": [ @@ -79,7 +79,7 @@ " netcfg/get_domain=vm<wait>", " netcfg/get_hostname=vagrant<wait>", " noapic<wait>", - " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/ubuntu-12.04/preseed.cfg<wait>", + " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}}<wait>", " -- <wait>", "<enter><wait>" ], @@ -87,18 +87,18 @@ "disk_size": 40960, "guest_os_type": "ubuntu-64", "http_directory": "http", - "iso_checksum": "7540ace2d6cdee264432f5ed987236d32edef798", - "iso_checksum_type": "sha1", - "iso_url": "{{user `mirror`}}/12.04.5/ubuntu-12.04.5-server-amd64.iso", - "output_directory": "packer-ubuntu-12.04-amd64-vmware", - "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-vmware", + "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", "tools_upload_flavor": "linux", "type": "vmware-iso", - "vm_name": "packer-ubuntu-12.04-amd64", + "vm_name": "packer-{{user `template`}}-vmware", "vmx_data": { "cpuid.coresPerSocket": "1", "memsize": "384", @@ -126,7 +126,7 @@ " netcfg/get_domain=vm<wait>", " netcfg/get_hostname=vagrant<wait>", " noapic<wait>", - " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/ubuntu-12.04/preseed.cfg<wait>", + " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}}<wait>", " -- <wait>", "<enter><wait>" ], @@ -134,10 +134,10 @@ "disk_size": 40960, "guest_os_type": "ubuntu", "http_directory": "http", - "iso_checksum": "7540ace2d6cdee264432f5ed987236d32edef798", - "iso_checksum_type": "sha1", - "iso_url": "{{user `mirror`}}/12.04.5/ubuntu-12.04.5-server-amd64.iso", - "output_directory": "packer-ubuntu-12.04-amd64-parallels", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-parallels", "parallels_tools_flavor": "lin", "prlctl": [ [ @@ -154,13 +154,13 @@ ] ], "prlctl_version_file": ".prlctl_version", - "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", + "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", "type": "parallels-iso", - "vm_name": "packer-ubuntu-12.04-amd64" + "vm_name": "packer-{{user `template`}}-parallels" } ], "post-processors": [ @@ -176,15 +176,20 @@ "type": "file" }, { - "environment_vars": [], - "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E bash '{{.Path}}'", + "environment_vars": [ + "HOME_DIR=/home/vagrant", + "http_proxy={{user `http_proxy`}}", + "https_proxy={{user `https_proxy`}}", + "no_proxy={{user `no_proxy`}}" + ], + "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", "scripts": [ "scripts/common/metadata.sh", "scripts/ubuntu/update.sh", "scripts/common/sshd.sh", "scripts/ubuntu/networking.sh", "scripts/ubuntu/sudoers.sh", - "scripts/common/vagrant.sh", + "scripts/ubuntu/vagrant.sh", "scripts/common/vmtools.sh", "scripts/ubuntu/cleanup.sh", "scripts/common/minimize.sh" @@ -193,15 +198,22 @@ } ], "variables": { - "arch": "64", - "box_basename": "ubuntu-12.04", + "box_basename": "__unset_box_basename__", "build_timestamp": "{{isotime \"20060102150405\"}}", "git_revision": "__unknown_git_revision__", + "http_proxy": "{{env `http_proxy`}}", + "https_proxy": "{{env `https_proxy`}}", + "iso_checksum": "7540ace2d6cdee264432f5ed987236d32edef798", + "iso_checksum_type": "sha1", + "iso_name": "ubuntu-12.04.5-server-amd64.iso", "metadata": "floppy/dummy_metadata.json", "mirror": "http://releases.ubuntu.com", - "name": "ubuntu-12.04", + "mirror_directory": "12.04.5", + "name": "chef/ubuntu-12.04", + "no_proxy": "{{env `no_proxy`}}", + "preseed_path": "ubuntu-12.04/preseed.cfg", "template": "ubuntu-12.04-amd64", - "version": "2.0.TIMESTAMP" + "version": "2.1.TIMESTAMP" } } diff --git a/ubuntu-12.04-i386.json b/ubuntu-12.04-i386.json index dfb225379..6265bbf3e 100644 --- a/ubuntu-12.04-i386.json +++ b/ubuntu-12.04-i386.json @@ -21,7 +21,7 @@ " netcfg/get_domain=vm<wait>", " netcfg/get_hostname=vagrant<wait>", " noapic<wait>", - " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/ubuntu-12.04/preseed.cfg<wait>", + " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}}<wait>", " -- <wait>", "<enter><wait>" ], @@ -31,11 +31,11 @@ "guest_os_type": "Ubuntu", "hard_drive_interface": "sata", "http_directory": "http", - "iso_checksum": "a34c224b7fe72a2f5c768be5afee5c53817743fd", - "iso_checksum_type": "sha1", - "iso_url": "{{user `mirror`}}/12.04.5/ubuntu-12.04.5-server-i386.iso", - "output_directory": "packer-ubuntu-12.04-i386-virtualbox", - "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-virtualbox", + "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", @@ -56,7 +56,7 @@ ] ], "virtualbox_version_file": ".vbox_version", - "vm_name": "packer-ubuntu-12.04-i386" + "vm_name": "packer-{{user `template`}}-virtualbox" }, { "boot_command": [ @@ -79,7 +79,7 @@ " netcfg/get_domain=vm<wait>", " netcfg/get_hostname=vagrant<wait>", " noapic<wait>", - " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/ubuntu-12.04/preseed.cfg<wait>", + " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}}<wait>", " -- <wait>", "<enter><wait>" ], @@ -87,18 +87,18 @@ "disk_size": 40960, "guest_os_type": "ubuntu", "http_directory": "http", - "iso_checksum": "a34c224b7fe72a2f5c768be5afee5c53817743fd", - "iso_checksum_type": "sha1", - "iso_url": "{{user `mirror`}}/12.04.5/ubuntu-12.04.5-server-i386.iso", - "output_directory": "packer-ubuntu-12.04-i386-vmware", - "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-vmware", + "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", "tools_upload_flavor": "linux", "type": "vmware-iso", - "vm_name": "packer-ubuntu-12.04-i386", + "vm_name": "packer-{{user `template`}}-vmware", "vmx_data": { "cpuid.coresPerSocket": "1", "memsize": "384", @@ -126,7 +126,7 @@ " netcfg/get_domain=vm<wait>", " netcfg/get_hostname=vagrant<wait>", " noapic<wait>", - " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/ubuntu-12.04/preseed.cfg<wait>", + " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}}<wait>", " -- <wait>", "<enter><wait>" ], @@ -134,10 +134,10 @@ "disk_size": 40960, "guest_os_type": "ubuntu", "http_directory": "http", - "iso_checksum": "a34c224b7fe72a2f5c768be5afee5c53817743fd", - "iso_checksum_type": "sha1", - "iso_url": "{{user `mirror`}}/12.04.5/ubuntu-12.04.5-server-i386.iso", - "output_directory": "packer-ubuntu-12.04-i386-parallels", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-parallels", "parallels_tools_flavor": "lin", "prlctl": [ [ @@ -154,13 +154,13 @@ ] ], "prlctl_version_file": ".prlctl_version", - "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", + "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", "type": "parallels-iso", - "vm_name": "packer-ubuntu-12.04-i386" + "vm_name": "packer-{{user `template`}}-parallels" } ], "post-processors": [ @@ -176,15 +176,20 @@ "type": "file" }, { - "environment_vars": [], - "execute_command": "echo 'vagrant'|{{.Vars}} sudo -S -E bash '{{.Path}}'", + "environment_vars": [ + "HOME_DIR=/home/vagrant", + "http_proxy={{user `http_proxy`}}", + "https_proxy={{user `https_proxy`}}", + "no_proxy={{user `no_proxy`}}" + ], + "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", "scripts": [ "scripts/common/metadata.sh", "scripts/ubuntu/update.sh", "scripts/common/sshd.sh", "scripts/ubuntu/networking.sh", "scripts/ubuntu/sudoers.sh", - "scripts/common/vagrant.sh", + "scripts/ubuntu/vagrant.sh", "scripts/common/vmtools.sh", "scripts/ubuntu/cleanup.sh", "scripts/common/minimize.sh" @@ -193,15 +198,22 @@ } ], "variables": { - "arch": "32", - "box_basename": "ubuntu-12.04-i386", + "box_basename": "__unset_box_basename__", "build_timestamp": "{{isotime \"20060102150405\"}}", "git_revision": "__unknown_git_revision__", + "http_proxy": "{{env `http_proxy`}}", + "https_proxy": "{{env `https_proxy`}}", + "iso_checksum": "a34c224b7fe72a2f5c768be5afee5c53817743fd", + "iso_checksum_type": "sha1", + "iso_name": "ubuntu-12.04.5-server-i386.iso", "metadata": "floppy/dummy_metadata.json", "mirror": "http://releases.ubuntu.com", - "name": "ubuntu-12.04-i386", + "mirror_directory": "12.04.5", + "name": "chef/ubuntu-12.04-i386", + "no_proxy": "{{env `no_proxy`}}", + "preseed_path": "ubuntu-12.04/preseed.cfg", "template": "ubuntu-12.04-i386", - "version": "2.0.TIMESTAMP" + "version": "2.1.TIMESTAMP" } } diff --git a/ubuntu-14.04-amd64.json b/ubuntu-14.04-amd64.json index 2d6eb149d..7749812c5 100644 --- a/ubuntu-14.04-amd64.json +++ b/ubuntu-14.04-amd64.json @@ -21,7 +21,7 @@ " netcfg/get_domain=vm<wait>", " netcfg/get_hostname=vagrant<wait>", " noapic<wait>", - " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/ubuntu-14.04/preseed.cfg<wait>", + " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}}<wait>", " -- <wait>", "<enter><wait>" ], @@ -31,11 +31,11 @@ "guest_os_type": "Ubuntu_64", "hard_drive_interface": "sata", "http_directory": "http", - "iso_checksum": "8acd2f56bfcba2f7ac74a7e4a5e565ce68c024c38525c0285573e41c86ae90c0", - "iso_checksum_type": "sha256", - "iso_url": "{{user `mirror`}}/14.04.2/ubuntu-14.04.2-server-amd64.iso", - "output_directory": "packer-ubuntu-14.04-amd64-virtualbox", - "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-virtualbox", + "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", @@ -56,7 +56,7 @@ ] ], "virtualbox_version_file": ".vbox_version", - "vm_name": "packer-ubuntu-14.04-amd64" + "vm_name": "packer-{{user `template`}}-virtualbox" }, { "boot_command": [ @@ -79,7 +79,7 @@ " netcfg/get_domain=vm<wait>", " netcfg/get_hostname=vagrant<wait>", " noapic<wait>", - " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/ubuntu-14.04/preseed.cfg<wait>", + " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}}<wait>", " -- <wait>", "<enter><wait>" ], @@ -87,18 +87,18 @@ "disk_size": 40960, "guest_os_type": "ubuntu-64", "http_directory": "http", - "iso_checksum": "8acd2f56bfcba2f7ac74a7e4a5e565ce68c024c38525c0285573e41c86ae90c0", - "iso_checksum_type": "sha256", - "iso_url": "{{user `mirror`}}/14.04.2/ubuntu-14.04.2-server-amd64.iso", - "output_directory": "packer-ubuntu-14.04-amd64-vmware", - "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-vmware", + "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", "tools_upload_flavor": "linux", "type": "vmware-iso", - "vm_name": "packer-ubuntu-14.04-amd64", + "vm_name": "packer-{{user `template`}}-vmware", "vmx_data": { "cpuid.coresPerSocket": "1", "memsize": "384", @@ -126,7 +126,7 @@ " netcfg/get_domain=vm<wait>", " netcfg/get_hostname=vagrant<wait>", " noapic<wait>", - " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/ubuntu-14.04/preseed.cfg<wait>", + " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}}<wait>", " -- <wait>", "<enter><wait>" ], @@ -134,10 +134,10 @@ "disk_size": 40960, "guest_os_type": "ubuntu", "http_directory": "http", - "iso_checksum": "8acd2f56bfcba2f7ac74a7e4a5e565ce68c024c38525c0285573e41c86ae90c0", - "iso_checksum_type": "sha256", - "iso_url": "{{user `mirror`}}/14.04.2/ubuntu-14.04.2-server-amd64.iso", - "output_directory": "packer-ubuntu-14.04-amd64-parallels", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-parallels", "parallels_tools_flavor": "lin", "prlctl": [ [ @@ -154,13 +154,13 @@ ] ], "prlctl_version_file": ".prlctl_version", - "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", + "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", "type": "parallels-iso", - "vm_name": "packer-ubuntu-14.04-amd64" + "vm_name": "packer-{{user `template`}}-parallels" } ], "post-processors": [ @@ -176,15 +176,20 @@ "type": "file" }, { - "environment_vars": [], - "execute_command": "echo 'vagrant'|{{.Vars}} sudo -S -E bash '{{.Path}}'", + "environment_vars": [ + "HOME_DIR=/home/vagrant", + "http_proxy={{user `http_proxy`}}", + "https_proxy={{user `https_proxy`}}", + "no_proxy={{user `no_proxy`}}" + ], + "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", "scripts": [ "scripts/common/metadata.sh", "scripts/ubuntu/update.sh", "scripts/common/sshd.sh", "scripts/ubuntu/networking.sh", "scripts/ubuntu/sudoers.sh", - "scripts/common/vagrant.sh", + "scripts/ubuntu/vagrant.sh", "scripts/common/vmtools.sh", "scripts/ubuntu/cleanup.sh", "scripts/common/minimize.sh" @@ -193,15 +198,22 @@ } ], "variables": { - "arch": "64", - "box_basename": "ubuntu-14.04", + "box_basename": "__unset_box_basename__", "build_timestamp": "{{isotime \"20060102150405\"}}", "git_revision": "__unknown_git_revision__", + "http_proxy": "{{env `http_proxy`}}", + "https_proxy": "{{env `https_proxy`}}", + "iso_checksum": "8acd2f56bfcba2f7ac74a7e4a5e565ce68c024c38525c0285573e41c86ae90c0", + "iso_checksum_type": "sha256", + "iso_name": "ubuntu-14.04.2-server-amd64.iso", "metadata": "floppy/dummy_metadata.json", "mirror": "http://releases.ubuntu.com", - "name": "ubuntu-14.04", + "mirror_directory": "14.04.2", + "name": "chef/ubuntu-14.04", + "no_proxy": "{{env `no_proxy`}}", + "preseed_path": "ubuntu-14.04/preseed.cfg", "template": "ubuntu-14.04-amd64", - "version": "2.0.TIMESTAMP" + "version": "2.1.TIMESTAMP" } } diff --git a/ubuntu-14.04-i386.json b/ubuntu-14.04-i386.json index 7ff01ae74..13474659b 100644 --- a/ubuntu-14.04-i386.json +++ b/ubuntu-14.04-i386.json @@ -21,7 +21,7 @@ " netcfg/get_domain=vm<wait>", " netcfg/get_hostname=vagrant<wait>", " noapic<wait>", - " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/ubuntu-14.04/preseed.cfg<wait>", + " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}}<wait>", " -- <wait>", "<enter><wait>" ], @@ -31,11 +31,11 @@ "guest_os_type": "Ubuntu", "hard_drive_interface": "sata", "http_directory": "http", - "iso_checksum": "76524ab9502a34b983ed56af2d5a72835ce41aec1e2b4c0cb7788ef596958ed6", - "iso_checksum_type": "sha256", - "iso_url": "{{user `mirror`}}/14.04.2/ubuntu-14.04.2-server-i386.iso", - "output_directory": "packer-ubuntu-14.04-i386-virtualbox", - "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-virtualbox", + "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", @@ -56,7 +56,7 @@ ] ], "virtualbox_version_file": ".vbox_version", - "vm_name": "packer-ubuntu-14.04-i386" + "vm_name": "packer-{{user `template`}}-virtualbox" }, { "boot_command": [ @@ -79,7 +79,7 @@ " netcfg/get_domain=vm<wait>", " netcfg/get_hostname=vagrant<wait>", " noapic<wait>", - " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/ubuntu-14.04/preseed.cfg<wait>", + " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}}<wait>", " -- <wait>", "<enter><wait>" ], @@ -87,18 +87,18 @@ "disk_size": 40960, "guest_os_type": "ubuntu", "http_directory": "http", - "iso_checksum": "76524ab9502a34b983ed56af2d5a72835ce41aec1e2b4c0cb7788ef596958ed6", - "iso_checksum_type": "sha256", - "iso_url": "{{user `mirror`}}/14.04.2/ubuntu-14.04.2-server-i386.iso", - "output_directory": "packer-ubuntu-14.04-i386-vmware", - "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-vmware", + "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", "tools_upload_flavor": "linux", "type": "vmware-iso", - "vm_name": "packer-ubuntu-14.04-i386", + "vm_name": "packer-{{user `template`}}-vmware", "vmx_data": { "cpuid.coresPerSocket": "1", "memsize": "384", @@ -126,7 +126,7 @@ " netcfg/get_domain=vm<wait>", " netcfg/get_hostname=vagrant<wait>", " noapic<wait>", - " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/ubuntu-14.04/preseed.cfg<wait>", + " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}}<wait>", " -- <wait>", "<enter><wait>" ], @@ -134,10 +134,10 @@ "disk_size": 40960, "guest_os_type": "ubuntu", "http_directory": "http", - "iso_checksum": "76524ab9502a34b983ed56af2d5a72835ce41aec1e2b4c0cb7788ef596958ed6", - "iso_checksum_type": "sha256", - "iso_url": "{{user `mirror`}}/14.04.2/ubuntu-14.04.2-server-i386.iso", - "output_directory": "packer-ubuntu-14.04-i386-parallels", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-parallels", "parallels_tools_flavor": "lin", "prlctl": [ [ @@ -154,13 +154,13 @@ ] ], "prlctl_version_file": ".prlctl_version", - "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", + "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", "type": "parallels-iso", - "vm_name": "packer-ubuntu-14.04-i386" + "vm_name": "packer-{{user `template`}}-parallels" } ], "post-processors": [ @@ -176,15 +176,20 @@ "type": "file" }, { - "environment_vars": [], - "execute_command": "echo 'vagrant'|{{.Vars}} sudo -S -E bash '{{.Path}}'", + "environment_vars": [ + "HOME_DIR=/home/vagrant", + "http_proxy={{user `http_proxy`}}", + "https_proxy={{user `https_proxy`}}", + "no_proxy={{user `no_proxy`}}" + ], + "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", "scripts": [ "scripts/common/metadata.sh", "scripts/ubuntu/update.sh", "scripts/common/sshd.sh", "scripts/ubuntu/networking.sh", "scripts/ubuntu/sudoers.sh", - "scripts/common/vagrant.sh", + "scripts/ubuntu/vagrant.sh", "scripts/common/vmtools.sh", "scripts/ubuntu/cleanup.sh", "scripts/common/minimize.sh" @@ -193,16 +198,22 @@ } ], "variables": { - "arch": "32", - "box_basename": "ubuntu-14.04-i386", + "box_basename": "__unset_box_basename__", "build_timestamp": "{{isotime \"20060102150405\"}}", - "chef_version": "provisionerless", "git_revision": "__unknown_git_revision__", + "http_proxy": "{{env `http_proxy`}}", + "https_proxy": "{{env `https_proxy`}}", + "iso_checksum": "76524ab9502a34b983ed56af2d5a72835ce41aec1e2b4c0cb7788ef596958ed6", + "iso_checksum_type": "sha256", + "iso_name": "ubuntu-14.04.2-server-i386.iso", "metadata": "floppy/dummy_metadata.json", "mirror": "http://releases.ubuntu.com", - "name": "ubuntu-14.04-i386", + "mirror_directory": "14.04.2", + "name": "chef/ubuntu-14.04-i386", + "no_proxy": "{{env `no_proxy`}}", + "preseed_path": "ubuntu-14.04/preseed.cfg", "template": "ubuntu-14.04-i386", - "version": "2.0.TIMESTAMP" + "version": "2.1.TIMESTAMP" } } diff --git a/ubuntu-14.10-amd64.json b/ubuntu-14.10-amd64.json index 270366944..ca849ff32 100644 --- a/ubuntu-14.10-amd64.json +++ b/ubuntu-14.10-amd64.json @@ -21,7 +21,7 @@ " netcfg/get_domain=vm<wait>", " netcfg/get_hostname=vagrant<wait>", " noapic<wait>", - " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/ubuntu-14.10/preseed.cfg<wait>", + " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}}<wait>", " -- <wait>", "<enter><wait>" ], @@ -31,11 +31,11 @@ "guest_os_type": "Ubuntu_64", "hard_drive_interface": "sata", "http_directory": "http", - "iso_checksum": "0c1ebea31c3523cfe9a4ffed8bcf6c7d23dfb97b", - "iso_checksum_type": "sha1", - "iso_url": "{{user `mirror`}}/14.10/ubuntu-14.10-server-amd64.iso", - "output_directory": "packer-ubuntu-14.10-amd64-virtualbox", - "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-virtualbox", + "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", @@ -56,7 +56,7 @@ ] ], "virtualbox_version_file": ".vbox_version", - "vm_name": "packer-ubuntu-14.10-amd64" + "vm_name": "packer-{{user `template`}}-virtualbox" }, { "boot_command": [ @@ -79,7 +79,7 @@ " netcfg/get_domain=vm<wait>", " netcfg/get_hostname=vagrant<wait>", " noapic<wait>", - " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/ubuntu-14.10/preseed.cfg<wait>", + " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}}<wait>", " -- <wait>", "<enter><wait>" ], @@ -87,18 +87,18 @@ "disk_size": 40960, "guest_os_type": "ubuntu-64", "http_directory": "http", - "iso_checksum": "0c1ebea31c3523cfe9a4ffed8bcf6c7d23dfb97b", - "iso_checksum_type": "sha1", - "iso_url": "{{user `mirror`}}/14.10/ubuntu-14.10-server-amd64.iso", - "output_directory": "packer-ubuntu-14.10-amd64-vmware", - "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-vmware", + "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", "tools_upload_flavor": "linux", "type": "vmware-iso", - "vm_name": "packer-ubuntu-14.10-amd64", + "vm_name": "packer-{{user `template`}}-vmware", "vmx_data": { "cpuid.coresPerSocket": "1", "memsize": "384", @@ -126,7 +126,7 @@ " netcfg/get_domain=vm<wait>", " netcfg/get_hostname=vagrant<wait>", " noapic<wait>", - " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/ubuntu-14.10/preseed.cfg<wait>", + " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}}<wait>", " -- <wait>", "<enter><wait>" ], @@ -134,10 +134,10 @@ "disk_size": 40960, "guest_os_type": "ubuntu", "http_directory": "http", - "iso_checksum": "0c1ebea31c3523cfe9a4ffed8bcf6c7d23dfb97b", - "iso_checksum_type": "sha1", - "iso_url": "{{user `mirror`}}/14.10/ubuntu-14.10-server-amd64.iso", - "output_directory": "packer-ubuntu-14.10-amd64-parallels", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-parallels", "parallels_tools_flavor": "lin", "prlctl": [ [ @@ -154,13 +154,13 @@ ] ], "prlctl_version_file": ".prlctl_version", - "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", + "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", "type": "parallels-iso", - "vm_name": "packer-ubuntu-14.10-amd64" + "vm_name": "packer-{{user `template`}}-parallels" } ], "post-processors": [ @@ -176,15 +176,20 @@ "type": "file" }, { - "environment_vars": [], - "execute_command": "echo 'vagrant'|{{.Vars}} sudo -S -E bash '{{.Path}}'", + "environment_vars": [ + "HOME_DIR=/home/vagrant", + "http_proxy={{user `http_proxy`}}", + "https_proxy={{user `https_proxy`}}", + "no_proxy={{user `no_proxy`}}" + ], + "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", "scripts": [ "scripts/common/metadata.sh", "scripts/ubuntu/update.sh", "scripts/common/sshd.sh", "scripts/ubuntu/networking.sh", "scripts/ubuntu/sudoers.sh", - "scripts/common/vagrant.sh", + "scripts/ubuntu/vagrant.sh", "scripts/common/vmtools.sh", "scripts/ubuntu/cleanup.sh", "scripts/common/minimize.sh" @@ -193,15 +198,22 @@ } ], "variables": { - "arch": "64", - "box_basename": "ubuntu-14.10", + "box_basename": "__unset_box_basename__", "build_timestamp": "{{isotime \"20060102150405\"}}", "git_revision": "__unknown_git_revision__", + "http_proxy": "{{env `http_proxy`}}", + "https_proxy": "{{env `https_proxy`}}", + "iso_checksum": "0c1ebea31c3523cfe9a4ffed8bcf6c7d23dfb97b", + "iso_checksum_type": "sha1", + "iso_name": "ubuntu-14.10-server-amd64.iso", "metadata": "floppy/dummy_metadata.json", "mirror": "http://releases.ubuntu.com", - "name": "ubuntu-14.10", + "mirror_directory": "14.10", + "name": "chef/ubuntu-14.10", + "no_proxy": "{{env `no_proxy`}}", + "preseed_path": "ubuntu-14.10/preseed.cfg", "template": "ubuntu-14.10-amd64", - "version": "2.0.TIMESTAMP" + "version": "2.1.TIMESTAMP" } } diff --git a/ubuntu-14.10-i386.json b/ubuntu-14.10-i386.json index e8592a806..11b3174fc 100644 --- a/ubuntu-14.10-i386.json +++ b/ubuntu-14.10-i386.json @@ -21,7 +21,7 @@ " netcfg/get_domain=vm<wait>", " netcfg/get_hostname=vagrant<wait>", " noapic<wait>", - " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/ubuntu-14.10/preseed.cfg<wait>", + " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}}<wait>", " -- <wait>", "<enter><wait>" ], @@ -31,11 +31,11 @@ "guest_os_type": "Ubuntu", "hard_drive_interface": "sata", "http_directory": "http", - "iso_checksum": "26faf47df2162f4ff83e38e6831dd169da6db95f", - "iso_checksum_type": "sha1", - "iso_url": "{{user `mirror`}}/14.10/ubuntu-14.10-server-i386.iso", - "output_directory": "packer-ubuntu-14.10-i386-virtualbox", - "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-virtualbox", + "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", @@ -56,7 +56,7 @@ ] ], "virtualbox_version_file": ".vbox_version", - "vm_name": "packer-ubuntu-14.10-i386" + "vm_name": "packer-{{user `template`}}-virtualbox" }, { "boot_command": [ @@ -79,7 +79,7 @@ " netcfg/get_domain=vm<wait>", " netcfg/get_hostname=vagrant<wait>", " noapic<wait>", - " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/ubuntu-14.10/preseed.cfg<wait>", + " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}}<wait>", " -- <wait>", "<enter><wait>" ], @@ -87,18 +87,18 @@ "disk_size": 40960, "guest_os_type": "ubuntu", "http_directory": "http", - "iso_checksum": "26faf47df2162f4ff83e38e6831dd169da6db95f", - "iso_checksum_type": "sha1", - "iso_url": "{{user `mirror`}}/14.10/ubuntu-14.10-server-i386.iso", - "output_directory": "packer-ubuntu-14.10-i386-vmware", - "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-vmware", + "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", "tools_upload_flavor": "linux", "type": "vmware-iso", - "vm_name": "packer-ubuntu-14.10-i386", + "vm_name": "packer-{{user `template`}}-vmware", "vmx_data": { "cpuid.coresPerSocket": "1", "memsize": "384", @@ -126,7 +126,7 @@ " netcfg/get_domain=vm<wait>", " netcfg/get_hostname=vagrant<wait>", " noapic<wait>", - " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/ubuntu-14.10/preseed.cfg<wait>", + " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}}<wait>", " -- <wait>", "<enter><wait>" ], @@ -134,10 +134,10 @@ "disk_size": 40960, "guest_os_type": "ubuntu", "http_directory": "http", - "iso_checksum": "26faf47df2162f4ff83e38e6831dd169da6db95f", - "iso_checksum_type": "sha1", - "iso_url": "{{user `mirror`}}/14.10/ubuntu-14.10-server-i386.iso", - "output_directory": "packer-ubuntu-14.10-i386-parallels", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-parallels", "parallels_tools_flavor": "lin", "prlctl": [ [ @@ -154,13 +154,13 @@ ] ], "prlctl_version_file": ".prlctl_version", - "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", + "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", "type": "parallels-iso", - "vm_name": "packer-ubuntu-14.10-i386" + "vm_name": "packer-{{user `template`}}-parallels" } ], "post-processors": [ @@ -176,15 +176,20 @@ "type": "file" }, { - "environment_vars": [], - "execute_command": "echo 'vagrant'|{{.Vars}} sudo -S -E bash '{{.Path}}'", + "environment_vars": [ + "HOME_DIR=/home/vagrant", + "http_proxy={{user `http_proxy`}}", + "https_proxy={{user `https_proxy`}}", + "no_proxy={{user `no_proxy`}}" + ], + "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", "scripts": [ "scripts/common/metadata.sh", "scripts/ubuntu/update.sh", "scripts/common/sshd.sh", "scripts/ubuntu/networking.sh", "scripts/ubuntu/sudoers.sh", - "scripts/common/vagrant.sh", + "scripts/ubuntu/vagrant.sh", "scripts/common/vmtools.sh", "scripts/ubuntu/cleanup.sh", "scripts/common/minimize.sh" @@ -193,15 +198,22 @@ } ], "variables": { - "arch": "32", - "box_basename": "ubuntu-14.10-i386", + "box_basename": "__unset_box_basename__", "build_timestamp": "{{isotime \"20060102150405\"}}", "git_revision": "__unknown_git_revision__", + "http_proxy": "{{env `http_proxy`}}", + "https_proxy": "{{env `https_proxy`}}", + "iso_checksum": "26faf47df2162f4ff83e38e6831dd169da6db95f", + "iso_checksum_type": "sha1", + "iso_name": "ubuntu-14.10-server-i386.iso", "metadata": "floppy/dummy_metadata.json", "mirror": "http://releases.ubuntu.com", - "name": "ubuntu-14.10-i386", + "mirror_directory": "14.10", + "name": "chef/ubuntu-14.10-i386", + "no_proxy": "{{env `no_proxy`}}", + "preseed_path": "ubuntu-14.10/preseed.cfg", "template": "ubuntu-14.10-i386", - "version": "2.0.TIMESTAMP" + "version": "2.1.TIMESTAMP" } } diff --git a/ubuntu-15.04-amd64.json b/ubuntu-15.04-amd64.json index 7fe1d4418..892763ace 100644 --- a/ubuntu-15.04-amd64.json +++ b/ubuntu-15.04-amd64.json @@ -21,7 +21,7 @@ " netcfg/get_domain=vm<wait>", " netcfg/get_hostname=vagrant<wait>", " noapic<wait>", - " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/ubuntu-15.04/preseed.cfg<wait>", + " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}}<wait>", " -- <wait>", "<enter><wait>" ], @@ -31,11 +31,11 @@ "guest_os_type": "Ubuntu_64", "hard_drive_interface": "sata", "http_directory": "http", - "iso_checksum": "6501c8545374665823384bbb6235f865108f56d8a30bbf69dd18df73c14ccb84", - "iso_checksum_type": "sha256", - "iso_url": "{{user `mirror`}}/15.04/ubuntu-15.04-server-amd64.iso", - "output_directory": "packer-ubuntu-15.04-amd64-virtualbox", - "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-virtualbox", + "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", @@ -56,7 +56,7 @@ ] ], "virtualbox_version_file": ".vbox_version", - "vm_name": "packer-ubuntu-15.04-amd64" + "vm_name": "packer-{{user `template`}}-virtualbox" }, { "boot_command": [ @@ -79,7 +79,7 @@ " netcfg/get_domain=vm<wait>", " netcfg/get_hostname=vagrant<wait>", " noapic<wait>", - " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/ubuntu-15.04/preseed.cfg<wait>", + " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}}<wait>", " -- <wait>", "<enter><wait>" ], @@ -87,18 +87,18 @@ "disk_size": 40960, "guest_os_type": "ubuntu-64", "http_directory": "http", - "iso_checksum": "6501c8545374665823384bbb6235f865108f56d8a30bbf69dd18df73c14ccb84", - "iso_checksum_type": "sha256", - "iso_url": "{{user `mirror`}}/15.04/ubuntu-15.04-server-amd64.iso", - "output_directory": "packer-ubuntu-15.04-amd64-vmware", - "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-vmware", + "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", "tools_upload_flavor": "linux", "type": "vmware-iso", - "vm_name": "packer-ubuntu-15.04-amd64", + "vm_name": "packer-{{user `template`}}-vmware", "vmx_data": { "cpuid.coresPerSocket": "1", "memsize": "384", @@ -126,7 +126,7 @@ " netcfg/get_domain=vm<wait>", " netcfg/get_hostname=vagrant<wait>", " noapic<wait>", - " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/ubuntu-15.04/preseed.cfg<wait>", + " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}}<wait>", " -- <wait>", "<enter><wait>" ], @@ -134,10 +134,10 @@ "disk_size": 40960, "guest_os_type": "ubuntu", "http_directory": "http", - "iso_checksum": "6501c8545374665823384bbb6235f865108f56d8a30bbf69dd18df73c14ccb84", - "iso_checksum_type": "sha256", - "iso_url": "{{user `mirror`}}/15.04/ubuntu-15.04-server-amd64.iso", - "output_directory": "packer-ubuntu-15.04-amd64-parallels", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-parallels", "parallels_tools_flavor": "lin", "prlctl": [ [ @@ -154,13 +154,13 @@ ] ], "prlctl_version_file": ".prlctl_version", - "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", + "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", "type": "parallels-iso", - "vm_name": "packer-ubuntu-15.04-amd64" + "vm_name": "packer-{{user `template`}}-parallels" } ], "post-processors": [ @@ -176,15 +176,20 @@ "type": "file" }, { - "environment_vars": [], - "execute_command": "echo 'vagrant'|{{.Vars}} sudo -S -E bash '{{.Path}}'", + "environment_vars": [ + "HOME_DIR=/home/vagrant", + "http_proxy={{user `http_proxy`}}", + "https_proxy={{user `https_proxy`}}", + "no_proxy={{user `no_proxy`}}" + ], + "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", "scripts": [ "scripts/common/metadata.sh", "scripts/ubuntu/update.sh", "scripts/common/sshd.sh", "scripts/ubuntu/networking.sh", "scripts/ubuntu/sudoers.sh", - "scripts/common/vagrant.sh", + "scripts/ubuntu/vagrant.sh", "scripts/common/vmtools.sh", "scripts/ubuntu/cleanup.sh", "scripts/common/minimize.sh" @@ -193,15 +198,22 @@ } ], "variables": { - "arch": "64", - "box_basename": "ubuntu-15.04", + "box_basename": "__unset_box_basename__", "build_timestamp": "{{isotime \"20060102150405\"}}", "git_revision": "__unknown_git_revision__", + "http_proxy": "{{env `http_proxy`}}", + "https_proxy": "{{env `https_proxy`}}", + "iso_checksum": "6501c8545374665823384bbb6235f865108f56d8a30bbf69dd18df73c14ccb84", + "iso_checksum_type": "sha256", + "iso_name": "ubuntu-15.04-server-amd64.iso", "metadata": "floppy/dummy_metadata.json", "mirror": "http://releases.ubuntu.com", - "name": "ubuntu-15.04", + "mirror_directory": "15.04", + "name": "chef/ubuntu-15.04", + "no_proxy": "{{env `no_proxy`}}", + "preseed_path": "ubuntu-15.04/preseed.cfg", "template": "ubuntu-15.04-amd64", - "version": "2.0.TIMESTAMP" + "version": "2.1.TIMESTAMP" } } diff --git a/ubuntu-15.04-i386.json b/ubuntu-15.04-i386.json index d3c1355a2..d459c608c 100644 --- a/ubuntu-15.04-i386.json +++ b/ubuntu-15.04-i386.json @@ -21,7 +21,7 @@ " netcfg/get_domain=vm<wait>", " netcfg/get_hostname=vagrant<wait>", " noapic<wait>", - " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/ubuntu-15.04/preseed.cfg<wait>", + " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}}<wait>", " -- <wait>", "<enter><wait>" ], @@ -31,11 +31,11 @@ "guest_os_type": "Ubuntu", "hard_drive_interface": "sata", "http_directory": "http", - "iso_checksum": "f510169ddc03121d11a627ae3a231e1272d8e4d75f9ef76f73daa5b809c5b6d8", - "iso_checksum_type": "sha256", - "iso_url": "{{user `mirror`}}/15.04/ubuntu-15.04-server-i386.iso", - "output_directory": "packer-ubuntu-15.04-i386-virtualbox", - "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-virtualbox", + "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", @@ -56,7 +56,7 @@ ] ], "virtualbox_version_file": ".vbox_version", - "vm_name": "packer-ubuntu-15.04-i386" + "vm_name": "packer-{{user `template`}}-virtualbox" }, { "boot_command": [ @@ -79,7 +79,7 @@ " netcfg/get_domain=vm<wait>", " netcfg/get_hostname=vagrant<wait>", " noapic<wait>", - " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/ubuntu-15.04/preseed.cfg<wait>", + " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}}<wait>", " -- <wait>", "<enter><wait>" ], @@ -87,18 +87,18 @@ "disk_size": 40960, "guest_os_type": "ubuntu", "http_directory": "http", - "iso_checksum": "f510169ddc03121d11a627ae3a231e1272d8e4d75f9ef76f73daa5b809c5b6d8", - "iso_checksum_type": "sha256", - "iso_url": "{{user `mirror`}}/15.04/ubuntu-15.04-server-i386.iso", - "output_directory": "packer-ubuntu-15.04-i386-vmware", - "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-vmware", + "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", "tools_upload_flavor": "linux", "type": "vmware-iso", - "vm_name": "packer-ubuntu-15.04-i386", + "vm_name": "packer-{{user `template`}}-vmware", "vmx_data": { "cpuid.coresPerSocket": "1", "memsize": "384", @@ -126,7 +126,7 @@ " netcfg/get_domain=vm<wait>", " netcfg/get_hostname=vagrant<wait>", " noapic<wait>", - " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/ubuntu-15.04/preseed.cfg<wait>", + " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}}<wait>", " -- <wait>", "<enter><wait>" ], @@ -134,10 +134,10 @@ "disk_size": 40960, "guest_os_type": "ubuntu", "http_directory": "http", - "iso_checksum": "f510169ddc03121d11a627ae3a231e1272d8e4d75f9ef76f73daa5b809c5b6d8", - "iso_checksum_type": "sha256", - "iso_url": "{{user `mirror`}}/15.04/ubuntu-15.04-server-i386.iso", - "output_directory": "packer-ubuntu-15.04-i386-parallels", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-parallels", "parallels_tools_flavor": "lin", "prlctl": [ [ @@ -154,13 +154,13 @@ ] ], "prlctl_version_file": ".prlctl_version", - "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", + "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", "type": "parallels-iso", - "vm_name": "packer-ubuntu-15.04-i386" + "vm_name": "packer-{{user `template`}}-parallels" } ], "post-processors": [ @@ -176,15 +176,20 @@ "type": "file" }, { - "environment_vars": [], - "execute_command": "echo 'vagrant'|{{.Vars}} sudo -S -E bash '{{.Path}}'", + "environment_vars": [ + "HOME_DIR=/home/vagrant", + "http_proxy={{user `http_proxy`}}", + "https_proxy={{user `https_proxy`}}", + "no_proxy={{user `no_proxy`}}" + ], + "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", "scripts": [ "scripts/common/metadata.sh", "scripts/ubuntu/update.sh", "scripts/common/sshd.sh", "scripts/ubuntu/networking.sh", "scripts/ubuntu/sudoers.sh", - "scripts/common/vagrant.sh", + "scripts/ubuntu/vagrant.sh", "scripts/common/vmtools.sh", "scripts/ubuntu/cleanup.sh", "scripts/common/minimize.sh" @@ -193,15 +198,22 @@ } ], "variables": { - "arch": "32", - "box_basename": "ubuntu-15.04-i386", + "box_basename": "__unset_box_basename__", "build_timestamp": "{{isotime \"20060102150405\"}}", "git_revision": "__unknown_git_revision__", + "http_proxy": "{{env `http_proxy`}}", + "https_proxy": "{{env `https_proxy`}}", + "iso_checksum": "f510169ddc03121d11a627ae3a231e1272d8e4d75f9ef76f73daa5b809c5b6d8", + "iso_checksum_type": "sha256", + "iso_name": "ubuntu-15.04-server-i386.iso", "metadata": "floppy/dummy_metadata.json", "mirror": "http://releases.ubuntu.com", - "name": "ubuntu-15.04-i386", + "mirror_directory": "15.04", + "name": "chef/ubuntu-15.04-i386", + "no_proxy": "{{env `no_proxy`}}", + "preseed_path": "ubuntu-15.04/preseed.cfg", "template": "ubuntu-15.04-i386", - "version": "2.0.TIMESTAMP" + "version": "2.1.TIMESTAMP" } } From 89bfd77aead84278fcb63da0d0dce13663d60d44 Mon Sep 17 00:00:00 2001 From: Fletcher Nichol <fnichol@nichol.ca> Date: Wed, 8 Jul 2015 15:46:25 -0600 Subject: [PATCH 0356/1622] [macosx-*, ubuntu-*] Remove name prefixes from templates. This allows the publishing namespace to be separated from the box name. --- macosx-10.10.json | 2 +- macosx-10.7.json | 2 +- macosx-10.8.json | 2 +- macosx-10.9.json | 2 +- ubuntu-10.04-amd64.json | 2 +- ubuntu-10.04-i386.json | 2 +- ubuntu-12.04-amd64.json | 2 +- ubuntu-12.04-i386.json | 2 +- ubuntu-14.04-amd64.json | 2 +- ubuntu-14.04-i386.json | 2 +- ubuntu-14.10-amd64.json | 2 +- ubuntu-14.10-i386.json | 2 +- ubuntu-15.04-amd64.json | 2 +- ubuntu-15.04-i386.json | 2 +- 14 files changed, 14 insertions(+), 14 deletions(-) diff --git a/macosx-10.10.json b/macosx-10.10.json index 44f52685e..25be83e5f 100644 --- a/macosx-10.10.json +++ b/macosx-10.10.json @@ -198,7 +198,7 @@ "iso_checksum_type": "md5", "iso_url": "http://YOU-MUST-PROVIDE-YOUR-OWN-DMG.sorry", "metadata": "floppy/dummy_metadata.json", - "name": "chef/macosx-10.10", + "name": "macosx-10.10", "no_proxy": "{{env `no_proxy`}}", "template": "macosx-10.10", "version": "2.1.TIMESTAMP" diff --git a/macosx-10.7.json b/macosx-10.7.json index 2d4dcca7f..e91b3d804 100644 --- a/macosx-10.7.json +++ b/macosx-10.7.json @@ -198,7 +198,7 @@ "iso_checksum_type": "md5", "iso_url": "http://YOU-MUST-PROVIDE-YOUR-OWN-DMG.sorry", "metadata": "floppy/dummy_metadata.json", - "name": "chef/macosx-10.7", + "name": "macosx-10.7", "no_proxy": "{{env `no_proxy`}}", "template": "macosx-10.7", "version": "2.1.TIMESTAMP" diff --git a/macosx-10.8.json b/macosx-10.8.json index 821d621e8..540fd9a90 100644 --- a/macosx-10.8.json +++ b/macosx-10.8.json @@ -198,7 +198,7 @@ "iso_checksum_type": "md5", "iso_url": "http://YOU-MUST-PROVIDE-YOUR-OWN-DMG.sorry", "metadata": "floppy/dummy_metadata.json", - "name": "chef/macosx-10.8", + "name": "macosx-10.8", "no_proxy": "{{env `no_proxy`}}", "template": "macosx-10.8", "version": "2.1.TIMESTAMP" diff --git a/macosx-10.9.json b/macosx-10.9.json index d37dc6782..de73b6ed1 100644 --- a/macosx-10.9.json +++ b/macosx-10.9.json @@ -198,7 +198,7 @@ "iso_checksum_type": "md5", "iso_url": "http://YOU-MUST-PROVIDE-YOUR-OWN-DMG.sorry", "metadata": "floppy/dummy_metadata.json", - "name": "chef/macosx-10.9", + "name": "macosx-10.9", "no_proxy": "{{env `no_proxy`}}", "template": "macosx-10.9", "version": "2.1.TIMESTAMP" diff --git a/ubuntu-10.04-amd64.json b/ubuntu-10.04-amd64.json index d6f75113b..bba814630 100644 --- a/ubuntu-10.04-amd64.json +++ b/ubuntu-10.04-amd64.json @@ -209,7 +209,7 @@ "metadata": "floppy/dummy_metadata.json", "mirror": "http://releases.ubuntu.com", "mirror_directory": "10.04.4", - "name": "chef/ubuntu-10.04", + "name": "ubuntu-10.04", "no_proxy": "{{env `no_proxy`}}", "preseed_path": "ubuntu-10.04/preseed.cfg", "template": "ubuntu-10.04-amd64", diff --git a/ubuntu-10.04-i386.json b/ubuntu-10.04-i386.json index e0c4bf5a8..d7fdbbf70 100644 --- a/ubuntu-10.04-i386.json +++ b/ubuntu-10.04-i386.json @@ -209,7 +209,7 @@ "metadata": "floppy/dummy_metadata.json", "mirror": "http://releases.ubuntu.com", "mirror_directory": "10.04.4", - "name": "chef/ubuntu-10.04-i386", + "name": "ubuntu-10.04-i386", "no_proxy": "{{env `no_proxy`}}", "preseed_path": "ubuntu-10.04/preseed.cfg", "template": "ubuntu-10.04-i386", diff --git a/ubuntu-12.04-amd64.json b/ubuntu-12.04-amd64.json index b234c7025..61d0d931b 100644 --- a/ubuntu-12.04-amd64.json +++ b/ubuntu-12.04-amd64.json @@ -209,7 +209,7 @@ "metadata": "floppy/dummy_metadata.json", "mirror": "http://releases.ubuntu.com", "mirror_directory": "12.04.5", - "name": "chef/ubuntu-12.04", + "name": "ubuntu-12.04", "no_proxy": "{{env `no_proxy`}}", "preseed_path": "ubuntu-12.04/preseed.cfg", "template": "ubuntu-12.04-amd64", diff --git a/ubuntu-12.04-i386.json b/ubuntu-12.04-i386.json index 6265bbf3e..8557f77cd 100644 --- a/ubuntu-12.04-i386.json +++ b/ubuntu-12.04-i386.json @@ -209,7 +209,7 @@ "metadata": "floppy/dummy_metadata.json", "mirror": "http://releases.ubuntu.com", "mirror_directory": "12.04.5", - "name": "chef/ubuntu-12.04-i386", + "name": "ubuntu-12.04-i386", "no_proxy": "{{env `no_proxy`}}", "preseed_path": "ubuntu-12.04/preseed.cfg", "template": "ubuntu-12.04-i386", diff --git a/ubuntu-14.04-amd64.json b/ubuntu-14.04-amd64.json index 7749812c5..6af7de9b4 100644 --- a/ubuntu-14.04-amd64.json +++ b/ubuntu-14.04-amd64.json @@ -209,7 +209,7 @@ "metadata": "floppy/dummy_metadata.json", "mirror": "http://releases.ubuntu.com", "mirror_directory": "14.04.2", - "name": "chef/ubuntu-14.04", + "name": "ubuntu-14.04", "no_proxy": "{{env `no_proxy`}}", "preseed_path": "ubuntu-14.04/preseed.cfg", "template": "ubuntu-14.04-amd64", diff --git a/ubuntu-14.04-i386.json b/ubuntu-14.04-i386.json index 13474659b..bafbb32bb 100644 --- a/ubuntu-14.04-i386.json +++ b/ubuntu-14.04-i386.json @@ -209,7 +209,7 @@ "metadata": "floppy/dummy_metadata.json", "mirror": "http://releases.ubuntu.com", "mirror_directory": "14.04.2", - "name": "chef/ubuntu-14.04-i386", + "name": "ubuntu-14.04-i386", "no_proxy": "{{env `no_proxy`}}", "preseed_path": "ubuntu-14.04/preseed.cfg", "template": "ubuntu-14.04-i386", diff --git a/ubuntu-14.10-amd64.json b/ubuntu-14.10-amd64.json index ca849ff32..f19074d2e 100644 --- a/ubuntu-14.10-amd64.json +++ b/ubuntu-14.10-amd64.json @@ -209,7 +209,7 @@ "metadata": "floppy/dummy_metadata.json", "mirror": "http://releases.ubuntu.com", "mirror_directory": "14.10", - "name": "chef/ubuntu-14.10", + "name": "ubuntu-14.10", "no_proxy": "{{env `no_proxy`}}", "preseed_path": "ubuntu-14.10/preseed.cfg", "template": "ubuntu-14.10-amd64", diff --git a/ubuntu-14.10-i386.json b/ubuntu-14.10-i386.json index 11b3174fc..052380c0d 100644 --- a/ubuntu-14.10-i386.json +++ b/ubuntu-14.10-i386.json @@ -209,7 +209,7 @@ "metadata": "floppy/dummy_metadata.json", "mirror": "http://releases.ubuntu.com", "mirror_directory": "14.10", - "name": "chef/ubuntu-14.10-i386", + "name": "ubuntu-14.10-i386", "no_proxy": "{{env `no_proxy`}}", "preseed_path": "ubuntu-14.10/preseed.cfg", "template": "ubuntu-14.10-i386", diff --git a/ubuntu-15.04-amd64.json b/ubuntu-15.04-amd64.json index 892763ace..96245a88b 100644 --- a/ubuntu-15.04-amd64.json +++ b/ubuntu-15.04-amd64.json @@ -209,7 +209,7 @@ "metadata": "floppy/dummy_metadata.json", "mirror": "http://releases.ubuntu.com", "mirror_directory": "15.04", - "name": "chef/ubuntu-15.04", + "name": "ubuntu-15.04", "no_proxy": "{{env `no_proxy`}}", "preseed_path": "ubuntu-15.04/preseed.cfg", "template": "ubuntu-15.04-amd64", diff --git a/ubuntu-15.04-i386.json b/ubuntu-15.04-i386.json index d459c608c..43b521e61 100644 --- a/ubuntu-15.04-i386.json +++ b/ubuntu-15.04-i386.json @@ -209,7 +209,7 @@ "metadata": "floppy/dummy_metadata.json", "mirror": "http://releases.ubuntu.com", "mirror_directory": "15.04", - "name": "chef/ubuntu-15.04-i386", + "name": "ubuntu-15.04-i386", "no_proxy": "{{env `no_proxy`}}", "preseed_path": "ubuntu-15.04/preseed.cfg", "template": "ubuntu-15.04-i386", From dbc16e91f5abeaeafffa71e206a5f97a7305c1c0 Mon Sep 17 00:00:00 2001 From: Fletcher Nichol <fnichol@nichol.ca> Date: Thu, 9 Jul 2015 14:07:36 -0600 Subject: [PATCH 0357/1622] [centos-*] Improve DRYness, correctness, and speed of CentOS templates. The following improvements are made in this commit: * Ensure that all related provisioner shell scripts are written using more conservative bourne code idioms * Call all provisioner scripts with `sh -eux` which will (e) exit immediately if a command exits with a non-zero exit status, (u) treats unset variables as an error, and (x) outputs the command and its expanded arguments or associated word list * Use the `template` user variable to replace repetition of `"centos-*"` style strings throughout * Support a `HOME_DIR` environment variable for provisioner scripts to use * Remove now-unused user variable `arch` * Extract the `iso_checksum` and `iso_checksum_type` values into user variables and reference them in the templates * Construct the `iso_url` value from the `mirror`, `mirror_directory`, and `iso_name` user variables * Add a `ks_path` user variable and use it throughout the templates * Add an `iso_name` user variable and use it throughout the templates * Use the `http_proxy`, `https_proxy`, and `no_proxy` environment variables if set on the workstation and make them available to the provisioner shell scripts to speed up package installations, etc. --- centos-5.11-i386.json | 73 ++++++++++++++++++++-------------- centos-5.11-x86_64.json | 73 ++++++++++++++++++++-------------- centos-6.6-i386.json | 66 +++++++++++++++++------------- centos-6.6-x86_64.json | 66 +++++++++++++++++------------- centos-7.1-x86_64.json | 66 +++++++++++++++++------------- oracle-6.6-i386.json | 2 +- oracle-6.6-x86_64.json | 2 +- rhel-6.6-i386.json | 2 +- rhel-6.6-x86_64.json | 2 +- rhel-7.1-x86_64.json | 2 +- scripts/centos/cleanup.sh | 27 +++++++------ scripts/centos/fix-slow-dns.sh | 11 ----- scripts/centos/networking.sh | 19 +++++++++ scripts/common/minimize.sh | 15 ++++--- scripts/common/vagrant.sh | 23 +++++++---- scripts/common/vmtools.sh | 58 +++++++++++++++------------ 16 files changed, 299 insertions(+), 208 deletions(-) delete mode 100644 scripts/centos/fix-slow-dns.sh create mode 100644 scripts/centos/networking.sh diff --git a/centos-5.11-i386.json b/centos-5.11-i386.json index 5b45afeed..7fc84cb67 100644 --- a/centos-5.11-i386.json +++ b/centos-5.11-i386.json @@ -2,7 +2,7 @@ "builders": [ { "boot_command": [ - "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/centos-5.11/ks.cfg<enter><wait>" + "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], "boot_wait": "10s", "disk_size": 40960, @@ -10,11 +10,11 @@ "guest_os_type": "RedHat", "hard_drive_interface": "sata", "http_directory": "http", - "iso_checksum": "ec3a89b4edc8e391d13c1ecce4e6ce3917719e39", - "iso_checksum_type": "sha1", - "iso_url": "{{user `mirror`}}/5.11/isos/i386/CentOS-5.11-i386-bin-DVD-1of2.iso", - "output_directory": "packer-centos-5.11-i386-virtualbox", - "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-virtualbox", + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", @@ -25,7 +25,7 @@ "modifyvm", "{{.Name}}", "--memory", - "384" + "480" ], [ "modifyvm", @@ -35,53 +35,53 @@ ] ], "virtualbox_version_file": ".vbox_version", - "vm_name": "packer-centos-5.11-i386" + "vm_name": "packer-{{user `template`}}-virtualbox" }, { "boot_command": [ - "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/centos-5.11/ks.cfg<enter><wait>" + "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], "boot_wait": "10s", "disk_size": 40960, "guest_os_type": "centos", "http_directory": "http", - "iso_checksum": "ec3a89b4edc8e391d13c1ecce4e6ce3917719e39", - "iso_checksum_type": "sha1", - "iso_url": "{{user `mirror`}}/5.11/isos/i386/CentOS-5.11-i386-bin-DVD-1of2.iso", - "output_directory": "packer-centos-5.11-i386-vmware", - "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-vmware", + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", "tools_upload_flavor": "linux", "type": "vmware-iso", - "vm_name": "packer-centos-5.11-i386", + "vm_name": "packer-{{user `template`}}-vmware", "vmx_data": { "cpuid.coresPerSocket": "1", - "memsize": "384", + "memsize": "480", "numvcpus": "1" } }, { "boot_command": [ - "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/centos-5.11/ks.cfg<enter><wait>" + "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], "boot_wait": "10s", "disk_size": 40960, "guest_os_type": "centos", "http_directory": "http", - "iso_checksum": "ec3a89b4edc8e391d13c1ecce4e6ce3917719e39", - "iso_checksum_type": "sha1", - "iso_url": "{{user `mirror`}}/5.11/isos/i386/CentOS-5.11-i386-bin-DVD-1of2.iso", - "output_directory": "packer-centos-5.11-i386-parallels", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-parallels", "parallels_tools_flavor": "lin", "prlctl": [ [ "set", "{{.Name}}", "--memsize", - "384" + "480" ], [ "set", @@ -91,13 +91,13 @@ ] ], "prlctl_version_file": ".prlctl_version", - "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", "type": "parallels-iso", - "vm_name": "packer-centos-5.11-i386" + "vm_name": "packer-{{user `template`}}-parallels" } ], "post-processors": [ @@ -113,12 +113,18 @@ "type": "file" }, { - "environment_vars": [], - "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E bash '{{.Path}}'", + "environment_vars": [ + "HOME_DIR=/home/vagrant", + "http_proxy={{user `http_proxy`}}", + "https_proxy={{user `https_proxy`}}", + "no_proxy={{user `no_proxy`}}" + ], + "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", "scripts": [ "scripts/common/metadata.sh", - "scripts/common/vagrant.sh", "scripts/common/sshd.sh", + "scripts/centos/networking.sh", + "scripts/common/vagrant.sh", "scripts/common/vmtools.sh", "scripts/centos/cleanup.sh", "scripts/common/minimize.sh" @@ -127,15 +133,22 @@ } ], "variables": { - "arch": "32", - "box_basename": "centos-5.11-i386", + "box_basename": "__unset_box_basename__", "build_timestamp": "{{isotime \"20060102150405\"}}", "git_revision": "__unknown_git_revision__", + "http_proxy": "{{env `http_proxy`}}", + "https_proxy": "{{env `https_proxy`}}", + "iso_checksum": "ec3a89b4edc8e391d13c1ecce4e6ce3917719e39", + "iso_checksum_type": "sha1", + "iso_name": "CentOS-5.11-i386-bin-DVD-1of2.iso", + "ks_path": "centos-5.11/ks.cfg", "metadata": "floppy/dummy_metadata.json", "mirror": "http://mirrors.kernel.org/centos", + "mirror_directory": "5.11/isos/i386", "name": "centos-5.11-i386", + "no_proxy": "{{env `no_proxy`}}", "template": "centos-5.11-i386", - "version": "2.0.TIMESTAMP" + "version": "2.1.TIMESTAMP" } } diff --git a/centos-5.11-x86_64.json b/centos-5.11-x86_64.json index 1133c4593..9a11d9bda 100644 --- a/centos-5.11-x86_64.json +++ b/centos-5.11-x86_64.json @@ -2,7 +2,7 @@ "builders": [ { "boot_command": [ - "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/centos-5.11/ks.cfg<enter><wait>" + "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], "boot_wait": "10s", "disk_size": 40960, @@ -10,11 +10,11 @@ "guest_os_type": "RedHat_64", "hard_drive_interface": "sata", "http_directory": "http", - "iso_checksum": "ebd77f2fdfac8da04f31c508905cf52aa62937cc", - "iso_checksum_type": "sha1", - "iso_url": "{{user `mirror`}}/5.11/isos/x86_64/CentOS-5.11-x86_64-bin-DVD-1of2.iso", - "output_directory": "packer-centos-5.11-x86_64-virtualbox", - "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-virtualbox", + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", @@ -25,7 +25,7 @@ "modifyvm", "{{.Name}}", "--memory", - "384" + "480" ], [ "modifyvm", @@ -35,53 +35,53 @@ ] ], "virtualbox_version_file": ".vbox_version", - "vm_name": "packer-centos-5.11-x86_64" + "vm_name": "packer-{{user `template`}}-virtualbox" }, { "boot_command": [ - "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/centos-5.11/ks.cfg<enter><wait>" + "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], "boot_wait": "10s", "disk_size": 40960, "guest_os_type": "centos-64", "http_directory": "http", - "iso_checksum": "ebd77f2fdfac8da04f31c508905cf52aa62937cc", - "iso_checksum_type": "sha1", - "iso_url": "{{user `mirror`}}/5.11/isos/x86_64/CentOS-5.11-x86_64-bin-DVD-1of2.iso", - "output_directory": "packer-centos-5.11-x86_64-vmware", - "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-vmware", + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", "tools_upload_flavor": "linux", "type": "vmware-iso", - "vm_name": "packer-centos-5.11-x86_64", + "vm_name": "packer-{{user `template`}}-vmware", "vmx_data": { "cpuid.coresPerSocket": "1", - "memsize": "384", + "memsize": "480", "numvcpus": "1" } }, { "boot_command": [ - "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/centos-5.11/ks.cfg<enter><wait>" + "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], "boot_wait": "10s", "disk_size": 40960, "guest_os_type": "centos", "http_directory": "http", - "iso_checksum": "ebd77f2fdfac8da04f31c508905cf52aa62937cc", - "iso_checksum_type": "sha1", - "iso_url": "{{user `mirror`}}/5.11/isos/x86_64/CentOS-5.11-x86_64-bin-DVD-1of2.iso", - "output_directory": "packer-centos-5.11-x86_64-parallels", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-parallels", "parallels_tools_flavor": "lin", "prlctl": [ [ "set", "{{.Name}}", "--memsize", - "384" + "480" ], [ "set", @@ -91,13 +91,13 @@ ] ], "prlctl_version_file": ".prlctl_version", - "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", "type": "parallels-iso", - "vm_name": "packer-centos-5.11-x86_64" + "vm_name": "packer-{{user `template`}}-parallels" } ], "post-processors": [ @@ -113,12 +113,18 @@ "type": "file" }, { - "environment_vars": [], - "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E bash '{{.Path}}'", + "environment_vars": [ + "HOME_DIR=/home/vagrant", + "http_proxy={{user `http_proxy`}}", + "https_proxy={{user `https_proxy`}}", + "no_proxy={{user `no_proxy`}}" + ], + "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", "scripts": [ "scripts/common/metadata.sh", - "scripts/common/vagrant.sh", "scripts/common/sshd.sh", + "scripts/centos/networking.sh", + "scripts/common/vagrant.sh", "scripts/common/vmtools.sh", "scripts/centos/cleanup.sh", "scripts/common/minimize.sh" @@ -127,15 +133,22 @@ } ], "variables": { - "arch": "64", - "box_basename": "centos-5.11", + "box_basename": "__unset_box_basename__", "build_timestamp": "{{isotime \"20060102150405\"}}", "git_revision": "__unknown_git_revision__", + "http_proxy": "{{env `http_proxy`}}", + "https_proxy": "{{env `https_proxy`}}", + "iso_checksum": "ebd77f2fdfac8da04f31c508905cf52aa62937cc", + "iso_checksum_type": "sha1", + "iso_name": "CentOS-5.11-x86_64-bin-DVD-1of2.iso", + "ks_path": "centos-5.11/ks.cfg", "metadata": "floppy/dummy_metadata.json", "mirror": "http://mirrors.kernel.org/centos", + "mirror_directory": "5.11/isos/x86_64", "name": "centos-5.11", + "no_proxy": "{{env `no_proxy`}}", "template": "centos-5.11-x86_64", - "version": "2.0.TIMESTAMP" + "version": "2.1.TIMESTAMP" } } diff --git a/centos-6.6-i386.json b/centos-6.6-i386.json index 2ee0078b8..e0f58384c 100644 --- a/centos-6.6-i386.json +++ b/centos-6.6-i386.json @@ -2,7 +2,7 @@ "builders": [ { "boot_command": [ - "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/centos-6.6/ks.cfg<enter><wait>" + "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], "boot_wait": "10s", "disk_size": 40960, @@ -10,11 +10,11 @@ "guest_os_type": "RedHat", "hard_drive_interface": "sata", "http_directory": "http", - "iso_checksum": "d16aa4a8e6f71fb01fcc26d8ae0e3443ed514c8e", - "iso_checksum_type": "sha1", - "iso_url": "{{user `mirror`}}/6.6/isos/i386/CentOS-6.6-i386-bin-DVD1.iso", - "output_directory": "packer-centos-6.6-i386-virtualbox", - "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-virtualbox", + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", @@ -35,28 +35,28 @@ ] ], "virtualbox_version_file": ".vbox_version", - "vm_name": "packer-centos-6.6-i386" + "vm_name": "packer-{{user `template`}}-virtualbox" }, { "boot_command": [ - "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/centos-6.6/ks.cfg<enter><wait>" + "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], "boot_wait": "10s", "disk_size": 40960, "guest_os_type": "centos", "http_directory": "http", - "iso_checksum": "d16aa4a8e6f71fb01fcc26d8ae0e3443ed514c8e", - "iso_checksum_type": "sha1", - "iso_url": "{{user `mirror`}}/6.6/isos/i386/CentOS-6.6-i386-bin-DVD1.iso", - "output_directory": "packer-centos-6.6-i386-vmware", - "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-vmware", + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", "tools_upload_flavor": "linux", "type": "vmware-iso", - "vm_name": "packer-centos-6.6-i386", + "vm_name": "packer-{{user `template`}}-vmware", "vmx_data": { "cpuid.coresPerSocket": "1", "memsize": "480", @@ -65,16 +65,16 @@ }, { "boot_command": [ - "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/centos-6.6/ks.cfg<enter><wait>" + "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], "boot_wait": "10s", "disk_size": 40960, "guest_os_type": "centos", "http_directory": "http", - "iso_checksum": "d16aa4a8e6f71fb01fcc26d8ae0e3443ed514c8e", - "iso_checksum_type": "sha1", - "iso_url": "{{user `mirror`}}/6.6/isos/i386/CentOS-6.6-i386-bin-DVD1.iso", - "output_directory": "packer-centos-6.6-i386-parallels", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-parallels", "parallels_tools_flavor": "lin", "prlctl": [ [ @@ -91,13 +91,13 @@ ] ], "prlctl_version_file": ".prlctl_version", - "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", "type": "parallels-iso", - "vm_name": "packer-centos-6.6-i386" + "vm_name": "packer-{{user `template`}}-parallels" } ], "post-processors": [ @@ -113,12 +113,17 @@ "type": "file" }, { - "environment_vars": [], - "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E bash '{{.Path}}'", + "environment_vars": [ + "HOME_DIR=/home/vagrant", + "http_proxy={{user `http_proxy`}}", + "https_proxy={{user `https_proxy`}}", + "no_proxy={{user `no_proxy`}}" + ], + "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", "scripts": [ "scripts/common/metadata.sh", - "scripts/centos/fix-slow-dns.sh", "scripts/common/sshd.sh", + "scripts/centos/networking.sh", "scripts/common/vagrant.sh", "scripts/common/vmtools.sh", "scripts/centos/cleanup.sh", @@ -128,15 +133,22 @@ } ], "variables": { - "arch": "32", - "box_basename": "centos-6.6-i386", + "box_basename": "__unset_box_basename__", "build_timestamp": "{{isotime \"20060102150405\"}}", "git_revision": "__unknown_git_revision__", + "http_proxy": "{{env `http_proxy`}}", + "https_proxy": "{{env `https_proxy`}}", + "iso_checksum": "d16aa4a8e6f71fb01fcc26d8ae0e3443ed514c8e", + "iso_checksum_type": "sha1", + "iso_name": "CentOS-6.6-i386-bin-DVD1.iso", + "ks_path": "centos-6.6/ks.cfg", "metadata": "floppy/dummy_metadata.json", "mirror": "http://mirrors.kernel.org/centos", + "mirror_directory": "6.6/isos/i386", "name": "centos-6.6-i386", + "no_proxy": "{{env `no_proxy`}}", "template": "centos-6.6-i386", - "version": "2.0.TIMESTAMP" + "version": "2.1.TIMESTAMP" } } diff --git a/centos-6.6-x86_64.json b/centos-6.6-x86_64.json index a69ebae1d..edbbb75bd 100644 --- a/centos-6.6-x86_64.json +++ b/centos-6.6-x86_64.json @@ -2,7 +2,7 @@ "builders": [ { "boot_command": [ - "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/centos-6.6/ks.cfg<enter><wait>" + "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], "boot_wait": "10s", "disk_size": 40960, @@ -10,11 +10,11 @@ "guest_os_type": "RedHat_64", "hard_drive_interface": "sata", "http_directory": "http", - "iso_checksum": "08be09fd7276822bd3468af8f96198279ffc41f0", - "iso_checksum_type": "sha1", - "iso_url": "{{user `mirror`}}/6.6/isos/x86_64/CentOS-6.6-x86_64-bin-DVD1.iso", - "output_directory": "packer-centos-6.6-x86_64-virtualbox", - "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-virtualbox", + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", @@ -35,28 +35,28 @@ ] ], "virtualbox_version_file": ".vbox_version", - "vm_name": "packer-centos-6.6-x86_64" + "vm_name": "packer-{{user `template`}}-virtualbox" }, { "boot_command": [ - "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/centos-6.6/ks.cfg<enter><wait>" + "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], "boot_wait": "10s", "disk_size": 40960, "guest_os_type": "centos-64", "http_directory": "http", - "iso_checksum": "08be09fd7276822bd3468af8f96198279ffc41f0", - "iso_checksum_type": "sha1", - "iso_url": "{{user `mirror`}}/6.6/isos/x86_64/CentOS-6.6-x86_64-bin-DVD1.iso", - "output_directory": "packer-centos-6.6-x86_64-vmware", - "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-vmware", + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", "tools_upload_flavor": "linux", "type": "vmware-iso", - "vm_name": "packer-centos-6.6-x86_64", + "vm_name": "packer-{{user `template`}}-vmware", "vmx_data": { "cpuid.coresPerSocket": "1", "memsize": "480", @@ -65,16 +65,16 @@ }, { "boot_command": [ - "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/centos-6.6/ks.cfg<enter><wait>" + "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], "boot_wait": "10s", "disk_size": 40960, "guest_os_type": "centos", "http_directory": "http", - "iso_checksum": "08be09fd7276822bd3468af8f96198279ffc41f0", - "iso_checksum_type": "sha1", - "iso_url": "{{user `mirror`}}/6.6/isos/x86_64/CentOS-6.6-x86_64-bin-DVD1.iso", - "output_directory": "packer-centos-6.6-x86_64-parallels", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-parallels", "parallels_tools_flavor": "lin", "prlctl": [ [ @@ -91,13 +91,13 @@ ] ], "prlctl_version_file": ".prlctl_version", - "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", "type": "parallels-iso", - "vm_name": "packer-centos-6.6-x86_64" + "vm_name": "packer-{{user `template`}}-parallels" } ], "post-processors": [ @@ -113,12 +113,17 @@ "type": "file" }, { - "environment_vars": [], - "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E bash '{{.Path}}'", + "environment_vars": [ + "HOME_DIR=/home/vagrant", + "http_proxy={{user `http_proxy`}}", + "https_proxy={{user `https_proxy`}}", + "no_proxy={{user `no_proxy`}}" + ], + "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", "scripts": [ "scripts/common/metadata.sh", - "scripts/centos/fix-slow-dns.sh", "scripts/common/sshd.sh", + "scripts/centos/networking.sh", "scripts/common/vagrant.sh", "scripts/common/vmtools.sh", "scripts/centos/cleanup.sh", @@ -128,15 +133,22 @@ } ], "variables": { - "arch": "64", - "box_basename": "centos-6.6", + "box_basename": "__unset_box_basename__", "build_timestamp": "{{isotime \"20060102150405\"}}", "git_revision": "__unknown_git_revision__", + "http_proxy": "{{env `http_proxy`}}", + "https_proxy": "{{env `https_proxy`}}", + "iso_checksum": "08be09fd7276822bd3468af8f96198279ffc41f0", + "iso_checksum_type": "sha1", + "iso_name": "CentOS-6.6-x86_64-bin-DVD1.iso", + "ks_path": "centos-6.6/ks.cfg", "metadata": "floppy/dummy_metadata.json", "mirror": "http://mirrors.kernel.org/centos", + "mirror_directory": "6.6/isos/x86_64", "name": "centos-6.6", + "no_proxy": "{{env `no_proxy`}}", "template": "centos-6.6-x86_64", - "version": "2.0.TIMESTAMP" + "version": "2.1.TIMESTAMP" } } diff --git a/centos-7.1-x86_64.json b/centos-7.1-x86_64.json index f909a42fe..400f9ea4e 100644 --- a/centos-7.1-x86_64.json +++ b/centos-7.1-x86_64.json @@ -2,7 +2,7 @@ "builders": [ { "boot_command": [ - "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/centos-7.1/ks.cfg<enter><wait>" + "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], "boot_wait": "10s", "disk_size": 40960, @@ -10,11 +10,11 @@ "guest_os_type": "RedHat_64", "hard_drive_interface": "sata", "http_directory": "http", - "iso_checksum": "85bcf62462fb678adc0cec159bf8b39ab5515404bc3828c432f743a1b0b30157", - "iso_checksum_type": "sha256", - "iso_url": "{{user `mirror`}}/7.1.1503/isos/x86_64/CentOS-7-x86_64-DVD-1503-01.iso", - "output_directory": "packer-centos-7.1-x86_64-virtualbox", - "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-virtualbox", + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", @@ -35,28 +35,28 @@ ] ], "virtualbox_version_file": ".vbox_version", - "vm_name": "packer-centos-7.1-x86_64" + "vm_name": "packer-{{user `template`}}-virtualbox" }, { "boot_command": [ - "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/centos-7.1/ks.cfg<enter><wait>" + "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], "boot_wait": "10s", "disk_size": 40960, "guest_os_type": "centos-64", "http_directory": "http", - "iso_checksum": "85bcf62462fb678adc0cec159bf8b39ab5515404bc3828c432f743a1b0b30157", - "iso_checksum_type": "sha256", - "iso_url": "{{user `mirror`}}/7.1.1503/isos/x86_64/CentOS-7-x86_64-DVD-1503-01.iso", - "output_directory": "packer-centos-7.1-x86_64-vmware", - "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-vmware", + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", "tools_upload_flavor": "linux", "type": "vmware-iso", - "vm_name": "packer-centos-7.1-x86_64", + "vm_name": "packer-{{user `template`}}-vmware", "vmx_data": { "cpuid.coresPerSocket": "1", "memsize": "480", @@ -65,16 +65,16 @@ }, { "boot_command": [ - "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/centos-7.1/ks.cfg<enter><wait>" + "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], "boot_wait": "10s", "disk_size": 40960, "guest_os_type": "centos", "http_directory": "http", - "iso_checksum": "85bcf62462fb678adc0cec159bf8b39ab5515404bc3828c432f743a1b0b30157", - "iso_checksum_type": "sha256", - "iso_url": "{{user `mirror`}}/7.1.1503/isos/x86_64/CentOS-7-x86_64-DVD-1503-01.iso", - "output_directory": "packer-centos-7.1-x86_64-parallels", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-parallels", "parallels_tools_flavor": "lin", "prlctl": [ [ @@ -91,13 +91,13 @@ ] ], "prlctl_version_file": ".prlctl_version", - "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", "type": "parallels-iso", - "vm_name": "packer-centos-7.1-x86_64" + "vm_name": "packer-{{user `template`}}-parallels" } ], "post-processors": [ @@ -113,12 +113,17 @@ "type": "file" }, { - "environment_vars": [], - "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E bash '{{.Path}}'", + "environment_vars": [ + "HOME_DIR=/home/vagrant", + "http_proxy={{user `http_proxy`}}", + "https_proxy={{user `https_proxy`}}", + "no_proxy={{user `no_proxy`}}" + ], + "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", "scripts": [ "scripts/common/metadata.sh", - "scripts/centos/fix-slow-dns.sh", "scripts/common/sshd.sh", + "scripts/centos/networking.sh", "scripts/common/vagrant.sh", "scripts/common/vmtools.sh", "scripts/centos/cleanup.sh", @@ -128,15 +133,22 @@ } ], "variables": { - "arch": "64", - "box_basename": "centos-7.1", + "box_basename": "__unset_box_basename__", "build_timestamp": "{{isotime \"20060102150405\"}}", "git_revision": "__unknown_git_revision__", + "http_proxy": "{{env `http_proxy`}}", + "https_proxy": "{{env `https_proxy`}}", + "iso_checksum": "85bcf62462fb678adc0cec159bf8b39ab5515404bc3828c432f743a1b0b30157", + "iso_checksum_type": "sha256", + "iso_name": "CentOS-7-x86_64-DVD-1503-01.iso", + "ks_path": "centos-7.1/ks.cfg", "metadata": "floppy/dummy_metadata.json", "mirror": "http://mirrors.kernel.org/centos", + "mirror_directory": "7.1.1503/isos/x86_64", "name": "centos-7.1", + "no_proxy": "{{env `no_proxy`}}", "template": "centos-7.1-x86_64", - "version": "2.0.TIMESTAMP" + "version": "2.1.TIMESTAMP" } } diff --git a/oracle-6.6-i386.json b/oracle-6.6-i386.json index c113d7ba2..ae440686e 100644 --- a/oracle-6.6-i386.json +++ b/oracle-6.6-i386.json @@ -117,7 +117,7 @@ "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E bash '{{.Path}}'", "scripts": [ "scripts/common/metadata.sh", - "scripts/centos/fix-slow-dns.sh", + "scripts/centos/networking.sh", "scripts/common/sshd.sh", "scripts/common/vagrant.sh", "scripts/common/vmtools.sh", diff --git a/oracle-6.6-x86_64.json b/oracle-6.6-x86_64.json index d32ccbc86..f0cc8cd13 100644 --- a/oracle-6.6-x86_64.json +++ b/oracle-6.6-x86_64.json @@ -117,7 +117,7 @@ "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E bash '{{.Path}}'", "scripts": [ "scripts/common/metadata.sh", - "scripts/centos/fix-slow-dns.sh", + "scripts/centos/networking.sh", "scripts/common/sshd.sh", "scripts/common/vagrant.sh", "scripts/common/vmtools.sh", diff --git a/rhel-6.6-i386.json b/rhel-6.6-i386.json index 21fb0638e..a6e3e62c0 100644 --- a/rhel-6.6-i386.json +++ b/rhel-6.6-i386.json @@ -117,7 +117,7 @@ "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E bash '{{.Path}}'", "scripts": [ "scripts/common/metadata.sh", - "scripts/centos/fix-slow-dns.sh", + "scripts/centos/networking.sh", "scripts/common/sshd.sh", "scripts/common/vagrant.sh", "scripts/common/vmtools.sh", diff --git a/rhel-6.6-x86_64.json b/rhel-6.6-x86_64.json index cbc51fe5a..bec62625e 100644 --- a/rhel-6.6-x86_64.json +++ b/rhel-6.6-x86_64.json @@ -117,7 +117,7 @@ "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E bash '{{.Path}}'", "scripts": [ "scripts/common/metadata.sh", - "scripts/centos/fix-slow-dns.sh", + "scripts/centos/networking.sh", "scripts/common/sshd.sh", "scripts/common/vagrant.sh", "scripts/common/vmtools.sh", diff --git a/rhel-7.1-x86_64.json b/rhel-7.1-x86_64.json index 817f31f9b..678848ba7 100644 --- a/rhel-7.1-x86_64.json +++ b/rhel-7.1-x86_64.json @@ -117,7 +117,7 @@ "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E bash '{{.Path}}'", "scripts": [ "scripts/common/metadata.sh", - "scripts/centos/fix-slow-dns.sh", + "scripts/centos/networking.sh", "scripts/common/sshd.sh", "scripts/common/vagrant.sh", "scripts/common/vmtools.sh", diff --git a/scripts/centos/cleanup.sh b/scripts/centos/cleanup.sh index 9e94b2e05..89a2c91a1 100644 --- a/scripts/centos/cleanup.sh +++ b/scripts/centos/cleanup.sh @@ -1,16 +1,17 @@ -#!/bin/bash -eux -# These were only needed for building VMware/Virtualbox extensions: -yum -y remove gcc cpp kernel-devel kernel-headers perl -yum -y clean all -rm -rf VBoxGuestAdditions_*.iso VBoxGuestAdditions_*.iso.? -rm -f /tmp/chef*rpm +#!/bin/sh -eux -# clean up redhat interface persistence -rm -f /etc/udev/rules.d/70-persistent-net.rules +# Remove development and kernel source packages +yum -y remove gcc cpp kernel-devel kernel-headers perl; +yum -y clean all; -for ndev in $(ls /etc/sysconfig/network-scripts/ifcfg-*); do - if [ "$(basename ${ndev})" != "ifcfg-lo" ]; then - sed -i '/^HWADDR/d' ${ndev} - sed -i '/^UUID/d' ${ndev} - fi +# Clean up network interface persistence +rm -f /etc/udev/rules.d/70-persistent-net.rules; + +for ndev in `ls -1 /etc/sysconfig/network-scripts/ifcfg-*`; do + if [ "`basename $ndev`" != "ifcfg-lo" ]; then + sed -i '/^HWADDR/d' "$ndev"; + sed -i '/^UUID/d' "$ndev"; + fi done + +rm -f VBoxGuestAdditions_*.iso VBoxGuestAdditions_*.iso.?; diff --git a/scripts/centos/fix-slow-dns.sh b/scripts/centos/fix-slow-dns.sh deleted file mode 100644 index 70fc8d38b..000000000 --- a/scripts/centos/fix-slow-dns.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/bash -eux - -if [[ "$PACKER_BUILDER_TYPE" == virtualbox* ]]; then - ## https://access.redhat.com/site/solutions/58625 (subscription required) - # add 'single-request-reopen' so it is included when /etc/resolv.conf is generated - echo 'RES_OPTIONS="single-request-reopen"' >> /etc/sysconfig/network - service network restart - echo 'Slow DNS fix applied (single-request-reopen)' -else - echo 'Slow DNS fix not required for this platform, skipping' -fi diff --git a/scripts/centos/networking.sh b/scripts/centos/networking.sh new file mode 100644 index 000000000..e61cf3502 --- /dev/null +++ b/scripts/centos/networking.sh @@ -0,0 +1,19 @@ +#!/bin/sh -eux + +case "$PACKER_BUILDER_TYPE" in + +virtualbox-iso|virtualbox-ovf) + major_version="`sed 's/^.\+ release \([.0-9]\+\).*/\1/' /etc/redhat-release | awk -F. '{print $1}'`"; + + if [ "$major_version" -ge 6 ]; then + # Fix slow DNS: + # Add 'single-request-reopen' so it is included when /etc/resolv.conf is + # generated + # https://access.redhat.com/site/solutions/58625 (subscription required) + echo 'RES_OPTIONS="single-request-reopen"' >>/etc/sysconfig/network; + service network restart; + echo 'Slow DNS fix applied (single-request-reopen)'; + fi + ;; + +esac diff --git a/scripts/common/minimize.sh b/scripts/common/minimize.sh index c288f2795..e425a539d 100644 --- a/scripts/common/minimize.sh +++ b/scripts/common/minimize.sh @@ -1,12 +1,15 @@ #!/bin/sh -eux -# Whiteout the swap partition to reduce box size -# Swap is disabled till reboot swapuuid="`/sbin/blkid -o value -l -s UUID -t TYPE=swap`"; -swappart="`readlink -f /dev/disk/by-uuid/$swapuuid`"; -/sbin/swapoff "$swappart"; -dd if=/dev/zero of="$swappart" bs=1M || echo "dd exit code $? is suppressed"; -/sbin/mkswap -U "$swapuuid" "$swappart"; + +if [ "x${swapuuid}" != "x" ]; then + # Whiteout the swap partition to reduce box size + # Swap is disabled till reboot + swappart="`readlink -f /dev/disk/by-uuid/$swapuuid`"; + /sbin/swapoff "$swappart"; + dd if=/dev/zero of="$swappart" bs=1M || echo "dd exit code $? is suppressed"; + /sbin/mkswap -U "$swapuuid" "$swappart"; +fi dd if=/dev/zero of=/EMPTY bs=1M || echo "dd exit code $? is suppressed"; rm -f /EMPTY; diff --git a/scripts/common/vagrant.sh b/scripts/common/vagrant.sh index f703c60de..cf12a564a 100644 --- a/scripts/common/vagrant.sh +++ b/scripts/common/vagrant.sh @@ -1,8 +1,17 @@ -#!/bin/bash +#!/bin/sh -eux -mkdir ~vagrant/.ssh -wget --no-check-certificate \ - 'https://raw.githubusercontent.com/mitchellh/vagrant/master/keys/vagrant.pub' \ - -O ~vagrant/.ssh/authorized_keys -chown -R vagrant ~vagrant/.ssh -chmod -R go-rwsx ~vagrant/.ssh +# set a default HOME_DIR environment variable if not set +HOME_DIR="${HOME_DIR:-/home/vagrant}"; + +pubkey_url="https://raw.githubusercontent.com/mitchellh/vagrant/master/keys/vagrant.pub"; +mkdir -p $HOME_DIR/.ssh; +if command -v wget >/dev/null 2>&1; then + wget --no-check-certificate "$pubkey_url" -O $HOME_DIR/.ssh/authorized_keys; +elif command -v curl >/dev/null 2>&1; then + curl --insecure --location "$pubkey_url" > $HOME_DIR/.ssh/authorized_keys; +else + echo "Cannot download vagrant public key"; + exit 1; +fi +chown -R vagrant $HOME_DIR/.ssh; +chmod -R go-rwsx $HOME_DIR/.ssh; diff --git a/scripts/common/vmtools.sh b/scripts/common/vmtools.sh index b536b67a9..936d05918 100644 --- a/scripts/common/vmtools.sh +++ b/scripts/common/vmtools.sh @@ -1,43 +1,51 @@ -#!/bin/bash +#!/bin/sh -eux + +# set a default HOME_DIR environment variable if not set +HOME_DIR="${HOME_DIR:-/home/vagrant}"; case "$PACKER_BUILDER_TYPE" in virtualbox-iso|virtualbox-ovf) - mkdir /tmp/vbox - VER="`cat /home/vagrant/.vbox_version`" - mount -o loop /home/vagrant/VBoxGuestAdditions_$VER.iso /tmp/vbox + mkdir -p /tmp/vbox; + ver="`cat /home/vagrant/.vbox_version`"; + mount -o loop $HOME_DIR/VBoxGuestAdditions_${ver}.iso /tmp/vbox; sh /tmp/vbox/VBoxLinuxAdditions.run \ || echo "VBoxLinuxAdditions.run exited $? and is suppressed." \ - "For more read https://www.virtualbox.org/ticket/12479" - umount /tmp/vbox - rmdir /tmp/vbox - rm /home/vagrant/*.iso + "For more read https://www.virtualbox.org/ticket/12479"; + umount /tmp/vbox; + rm -rf /tmp/vbox; + rm -f $HOME_DIR/*.iso; ;; vmware-iso|vmware-vmx) - mkdir /tmp/vmfusion - mkdir /tmp/vmfusion-archive - mount -o loop /home/vagrant/linux.iso /tmp/vmfusion - tar xzf /tmp/vmfusion/VMwareTools-*.tar.gz -C /tmp/vmfusion-archive - /tmp/vmfusion-archive/vmware-tools-distrib/vmware-install.pl --default - umount /tmp/vmfusion - rm -rf /tmp/vmfusion - rm -rf /tmp/vmfusion-archive - rm /home/vagrant/*.iso + mkdir -p /tmp/vmfusion; + mkdir -p /tmp/vmfusion-archive; + mount -o loop $HOME_DIR/linux.iso /tmp/vmfusion; + tar xzf /tmp/vmfusion/VMwareTools-*.tar.gz -C /tmp/vmfusion-archive; + /tmp/vmfusion-archive/vmware-tools-distrib/vmware-install.pl --default; + umount /tmp/vmfusion; + rm -rf /tmp/vmfusion; + rm -rf /tmp/vmfusion-archive; + rm -f $HOME_DIR/*.iso; ;; parallels-iso|parallels-pvm) - mkdir /tmp/parallels - mount -o loop /home/vagrant/prl-tools-lin.iso /tmp/parallels - /tmp/parallels/install --install-unattended-with-deps - umount /tmp/parallels - rmdir /tmp/parallels - rm /home/vagrant/*.iso + mkdir -p /tmp/parallels; + mount -o loop $HOME_DIR/prl-tools-lin.iso /tmp/parallels; + /tmp/parallels/install --install-unattended-with-deps \ + || (code="$?"; \ + echo "Parallels tools installation exited $code, attempting" \ + "to output /var/log/parallels-tools-install.log"; \ + cat /var/log/parallels-tools-install.log; \ + exit $code); + umount /tmp/parallels; + rm -rf /tmp/parallels; + rm -f $HOME_DIR/*.iso; ;; *) - echo "Unknown Packer Builder Type >>$PACKER_BUILDER_TYPE<< selected." - echo "Known are virtualbox-iso|virtualbox-ovf|vmware-iso|vmware-vmx|parallels-iso|parallels-pvm." + echo "Unknown Packer Builder Type >>$PACKER_BUILDER_TYPE<< selected."; + echo "Known are virtualbox-iso|virtualbox-ovf|vmware-iso|vmware-vmx|parallels-iso|parallels-pvm."; ;; esac From b094c8df54d2ba9535f8acfd11581fb711e7935a Mon Sep 17 00:00:00 2001 From: Fletcher Nichol <fnichol@nichol.ca> Date: Thu, 9 Jul 2015 14:19:20 -0600 Subject: [PATCH 0358/1622] [debian-8.1] Spacing from running `bin/bento normalize`. --- debian-8.1-amd64.json | 1 + 1 file changed, 1 insertion(+) diff --git a/debian-8.1-amd64.json b/debian-8.1-amd64.json index 0d5e3db38..f58b69858 100644 --- a/debian-8.1-amd64.json +++ b/debian-8.1-amd64.json @@ -183,3 +183,4 @@ "version": "2.0.TIMESTAMP" } } + From b33f3476acc0cb653c4e1d193158d2f250712955 Mon Sep 17 00:00:00 2001 From: Yvonne Lam <yvonne@opscode.com> Date: Tue, 9 Jun 2015 13:00:45 -0700 Subject: [PATCH 0359/1622] Minimally working Rakefile to build vagrant boxes and upload to atlas. --- Rakefile | 239 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 239 insertions(+) create mode 100644 Rakefile diff --git a/Rakefile b/Rakefile new file mode 100644 index 000000000..b52a9541a --- /dev/null +++ b/Rakefile @@ -0,0 +1,239 @@ +require 'cgi' +require 'json' +require 'net/http' + +# Enables `bundle exec bundle exec rake do_all[ubuntu-12.04-amd64,centos-7.1-x86_64] +# http://blog.stevenocchipinti.com/2013/10/18/rake-task-with-an-arbitrary-number-of-arguments/ +task :do_all do |task, args| + args.extras.each do |a| + # build stage + Rake::Task['build_box'].invoke(a) + Rake::Task['build_box'].reenable + end + + # publish stage + Rake::Task['upload_all'].invoke + Rake::Task['upload_all'].reenable + + # release stage + Rake::Task['release_all'].invoke + Rake::Task['release_all'].reenable +end + +# bundle exec rake build_box[ubuntu-12.04-amd64] +desc 'Build a single bento box' +task :build_box, :template do |t, args| + # Special-case parallels for now. + if which('prlctl') + puts "Building for virtualbox, vmware, and parallels." + sh "./bin/bento build #{args[:template]}.json" + else + puts "Building for virtualbox and vmware." + sh "./bin/bento build --except parallels-iso #{args[:template]}.json" + end +end + +desc 'Upload boxes' +task :upload_all do + metadata_files.each do |metadata_file| + puts "Processing #{metadata_file} for upload." + Rake::Task['upload_box'].invoke(metadata_file) + Rake::Task['upload_box'].reenable + end +end + +desc 'Upload box files for all providers' +task :upload_box, :metadata_file do |f, args| + metadata = box_metadata(args[:metadata_file]) + create_box(metadata['name']) + create_box_version(metadata['name'], metadata['version']) + create_providers(metadata['name'], metadata['version'], metadata['providers'].keys) + upload_to_atlas(metadata['name'], metadata['version'], metadata['providers']) +end + +desc 'Release all boxes for a version' +task :release_all do + metadata_files.each do |metadata_file| + puts "Processing #{metadata_file} for release." + metadata = box_metadata(metadata_file) + release_version(metadata['name'], metadata['version']) + end +end + +desc 'Clean the build directory' +task :clean do + `rm -rf builds/*.{box,json}` +end + +def atlas_api + @atlas_api ||= 'https://atlas.hashicorp.com/api/v1' +end + +def atlas_org + @atlas_org ||= ENV['ATLAS_ORG'] +end + +def atlas_token + @atlas_token ||= ENV['ATLAS_TOKEN'] +end + +def class_for_request(verb) + Net::HTTP.const_get(verb.to_s.capitalize) +end +def build_uri(verb, path, params = {}) + if %w(delete, get).include?(verb) + path = [path, to_query_string(params)].compact.join('?') + end + + # Parse the URI + uri = URI.parse(path) + + # Don't merge absolute URLs + uri = URI.parse(File.join(endpoint, path)) unless uri.absolute? + + # Return the URI object + uri +end + +def to_query_string(hash) + hash.map do |key, value| + "#{CGI.escape(key)}=#{CGI.escape(value)}" + end.join('&')[/.+/] +end + +def request(verb, url, data = {}, headers = {}) + uri = build_uri(verb, url, data) + + # Build the request. + request = class_for_request(verb).new(uri.request_uri) + if %w(patch post put).include?(verb) + if data.respond_to?(:read) + request.content_length = data.size + request.body_stream = data + elsif data.is_a?(Hash) + request.form_data = data + else + request.body = data + end + end + + # Add headers + headers.each do |key, value| + request.add_field(key, value) + end + + connection = Net::HTTP.new(uri.host, uri.port) + + if uri.scheme == 'https' + require 'net/https' unless defined?(Net::HTTPS) + + # Turn on SSL + connection.use_ssl = true + connection.verify_mode = OpenSSL::SSL::VERIFY_PEER + end + + connection.start do |http| + response = http.request(request) + + case response + when Net::HTTPRedirection + redirect = URI.parse(response['location']) + request(verb, redirect, data, headers) + else + response + end + end +end + +def box_metadata(metadata_file) + metadata = Hash.new + file = File.read(metadata_file) + json = JSON.parse(file) + + # metadata needed for upload: boxname, version, provider, box filename + metadata['name'] = json['name'] + metadata['version'] = json['version'] + metadata['box_basename'] = json['box_basename'] + metadata['providers'] = Hash.new + json['md5'].keys.each do |k| + metadata['providers'][k.split('.')[-2]] = k + end + metadata +end + +def metadata_files + @metadata_files ||= compute_metadata_files +end + +def compute_metadata_files + `ls builds/*.json`.split("\n") +end + +def create_box(boxname) + req = request('get', "#{atlas_api}/box/#{atlas_org}/#{boxname}", { 'access_token' => atlas_token } ) + if req.code.eql?('404') + puts "Creating the box #{boxname} in atlas." + req = request('post', "#{atlas_api}/boxes", { 'box[name]' => boxname, 'access_token' => atlas_token }, { 'Content-Type' => 'application/json' } ) + else + puts "The box #{boxname} exists in atlas, continuing." + end +end + +def create_box_version(boxname, version) + req = request('post', "#{atlas_api}/box/#{atlas_org}/#{boxname}/versions", { 'version[version]' => version, 'access_token' => atlas_token },{ 'Content-Type' => 'application/json' } ) + + puts "Created box version #{boxname} #{version}." if req.code == '200' + puts "Box version #{boxname} #{version} already exists, continuing." if req.code == '422' +end + +def create_providers(boxname, version, providers) + providers.each do |provider| + puts "Creating provider #{provider} for #{boxname} #{version}" + req = request('post', "#{atlas_api}/box/#{atlas_org}/#{boxname}/version/#{version}/providers", { 'provider[name]' => provider, 'access_token' => atlas_token }, { 'Content-Type' => 'application/json' } ) + puts "Created #{provider} for #{boxname} #{version}" if req.code == '200' + puts "Provider #{provider} for #{boxname} #{version} already exists, continuing." if req.code == '422' + end +end + +def upload_to_atlas(boxname, version, provider_hash) + # Extract the upload path + provider_hash.each do |provider, boxfile| + # Get the upload path. + req = request('get', "#{atlas_api}/box/#{atlas_org}/#{boxname}/version/#{version}/provider/#{provider}/upload?access_token=#{atlas_token}") + upload_path = JSON.parse(req.body)['upload_path'] + token = JSON.parse(req.body)['token'] + + # Upload the box. + puts "Uploading the box #{boxfile} to atlas box: #{boxname}, version: #{version}, provider: #{provider}, upload path: #{upload_path}" + upload_request = request('put', upload_path, File.open("builds/#{boxfile}")) + + # Verify the download token + req = request('get', "#{atlas_api}/box/#{atlas_org}/#{boxname}/version/#{version}/provider/#{provider}?access_token=#{atlas_token}") + hosted_token = JSON.parse(req.body)['hosted_token'] + + if token == hosted_token + puts "Successful upload of box #{boxfile} to atlas box: #{boxname}, version: #{version}, provider: #{provider}" + else + puts "Failed upload due to non-matching tokens of box #{boxfile} to atlas box: #{boxname}, version: #{version}, provider: #{provider}" + # need to fail the rake task + end + end +end + +def release_version(boxname, version) + puts "Releasing version #{version} of box #{boxname}" + req = request('put', "#{atlas_api}/box/#{atlas_org}/#{boxname}/version/#{version}/release", { 'access_token' => atlas_token }, { 'Content-Type' => 'application/json' }) + puts "Version #{version} of box #{boxname} has been successfully released" if req.code == '200' +end + +# http://stackoverflow.com/questions/2108727/which-in-ruby-checking-if-program-exists-in-path-from-ruby +def which(cmd) + exts = ENV['PATHEXT'] ? ENV['PATHEXT'].split(';') : [''] + ENV['PATH'].split(File::PATH_SEPARATOR).each do |path| + exts.each { |ext| + exe = File.join(path, "#{cmd}#{ext}") + return exe if File.executable?(exe) && !File.directory?(exe) + } + end + return false +end From d4d22cead16a5a154c7a35d10ffbbcee1a62c150 Mon Sep 17 00:00:00 2001 From: Yvonne Lam <yvonne@opscode.com> Date: Wed, 10 Jun 2015 13:01:38 -0700 Subject: [PATCH 0360/1622] Support packer's "--except" command line option. --- bin/bento | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/bin/bento b/bin/bento index 0b44126f0..3782be88f 100755 --- a/bin/bento +++ b/bin/bento @@ -69,6 +69,10 @@ class Options opts.on("-o BUILDS", "--only BUILDS", "Only build some Packer builds") do |opt| options.builds = opt end + + opts.on("-e BUILDS", "--except BUILDS", "Build all Packer builds except these") do |opt| + options.except = opt + end }, argv: templates_argv_proc }, @@ -174,13 +178,14 @@ class BuildRunner include Common include PackerExec - attr_reader :templates, :dry_run, :debug, :builds, :build_timestamp + attr_reader :templates, :dry_run, :debug, :builds, :except, :build_timestamp def initialize(opts) @templates = opts.templates @dry_run = opts.dry_run @debug = opts.debug @builds = opts.builds + @except = opts.except @build_timestamp = Time.now.gmtime.strftime("%Y%m%d%H%M%S") end @@ -211,6 +216,7 @@ class BuildRunner cmd = %W[packer build -var-file=#{var_file} #{template}.json] cmd.insert(2, "-var-file=#{vars}") if File.exist?(vars) cmd.insert(2, "-only=#{builds}") if builds + cmd.insert(2, "-except=#{except}") if except cmd.insert(2, "-debug") if debug cmd.insert(0, "echo") if dry_run cmd From d8d9841914fee2e47ccd5e1d0e0d5fffe3e0f05a Mon Sep 17 00:00:00 2001 From: Yvonne Lam <yvonne@opscode.com> Date: Wed, 10 Jun 2015 13:18:00 -0700 Subject: [PATCH 0361/1622] First stab at a buildkite script. --- buildkite.rb | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 buildkite.rb diff --git a/buildkite.rb b/buildkite.rb new file mode 100644 index 000000000..361ab9310 --- /dev/null +++ b/buildkite.rb @@ -0,0 +1,24 @@ +#!/usr/bin/env ruby + +git_output = `git log -m -1 --name-only --pretty=format:%n` + +# TODO: decide what, if anything, is rebuilt if bin/bento, buildkite.rb, scripts/common change. +changed_files = git_output.split("\n").reject { |t| t.empty? || t.include?('gitignore') || t.include?('dummy_metadata') || t.include?('bin/bento') || t.include?('buildkite.rb') || t.include?('scripts/common') || t.include?('.md')} + +# Compile the list of platforms whose boxes will be rebuilt. +buildlist = [] + +# If OS-specific scripts have changed, rebuild all boxes associated with that OS. +family = changed_files.select { |b| b.include?('scripts') || b.include?('floppy') || b.include?('http') } +unless family.empty? + all_templates = `ls *.json`.split("\n") + + family.each do |f| + buildlist.concat(all_templates.collect { |a| a if a.include?(f.split('/')[1]) }.reject { |a| a.nil? }) + end +end + +buildlist.concat(changed_files.select { |b| b.include?('.json') }) +buildlist.uniq! +buildlist.collect! { |b| b.gsub!('.json', '') } +system "bundle exec rake do_all[#{buildlist.join(',')}]" From e127f36c1de8aa0936d166486994cce792865657 Mon Sep 17 00:00:00 2001 From: Yvonne Lam <yvonne@opscode.com> Date: Tue, 30 Jun 2015 16:11:19 -0700 Subject: [PATCH 0362/1622] Support specifying a mirror for iso location. --- bin/bento | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/bin/bento b/bin/bento index 3782be88f..3f2b5356d 100755 --- a/bin/bento +++ b/bin/bento @@ -73,6 +73,10 @@ class Options opts.on("-e BUILDS", "--except BUILDS", "Build all Packer builds except these") do |opt| options.except = opt end + + opts.on("-m MIRROR", "--mirror MIRROR", "Look for isos at MIRROR") do |opt| + options.mirror = opt + end }, argv: templates_argv_proc }, @@ -178,7 +182,7 @@ class BuildRunner include Common include PackerExec - attr_reader :templates, :dry_run, :debug, :builds, :except, :build_timestamp + attr_reader :templates, :dry_run, :debug, :builds, :except, :mirror, :build_timestamp def initialize(opts) @templates = opts.templates @@ -186,6 +190,7 @@ class BuildRunner @debug = opts.debug @builds = opts.builds @except = opts.except + @mirror = opts.mirror @build_timestamp = Time.now.gmtime.strftime("%Y%m%d%H%M%S") end @@ -217,6 +222,9 @@ class BuildRunner cmd.insert(2, "-var-file=#{vars}") if File.exist?(vars) cmd.insert(2, "-only=#{builds}") if builds cmd.insert(2, "-except=#{except}") if except + # Build the command line in the correct order and without spaces as future input for the splat operator. + cmd.insert(2, "mirror=#{mirror}") if mirror + cmd.insert(2, "-var") if mirror cmd.insert(2, "-debug") if debug cmd.insert(0, "echo") if dry_run cmd From b9c4a45bb57dc7d30d27b22deb619bc4520ec1d4 Mon Sep 17 00:00:00 2001 From: Yvonne Lam <yvonne@opscode.com> Date: Tue, 30 Jun 2015 16:12:39 -0700 Subject: [PATCH 0363/1622] Mark proprietary boxes as private when uploading to atlas. Allow use of a mirror when specifying iso location. --- Rakefile | 37 ++++++++++++++++++++++++++----------- 1 file changed, 26 insertions(+), 11 deletions(-) diff --git a/Rakefile b/Rakefile index b52a9541a..db9c4ecba 100644 --- a/Rakefile +++ b/Rakefile @@ -2,7 +2,9 @@ require 'cgi' require 'json' require 'net/http' -# Enables `bundle exec bundle exec rake do_all[ubuntu-12.04-amd64,centos-7.1-x86_64] +# TODO: private boxes may need to specify a mirror + +# Enables `bundle exec rake do_all[ubuntu-12.04-amd64,centos-7.1-x86_64] # http://blog.stevenocchipinti.com/2013/10/18/rake-task-with-an-arbitrary-number-of-arguments/ task :do_all do |task, args| args.extras.each do |a| @@ -23,14 +25,7 @@ end # bundle exec rake build_box[ubuntu-12.04-amd64] desc 'Build a single bento box' task :build_box, :template do |t, args| - # Special-case parallels for now. - if which('prlctl') - puts "Building for virtualbox, vmware, and parallels." - sh "./bin/bento build #{args[:template]}.json" - else - puts "Building for virtualbox and vmware." - sh "./bin/bento build --except parallels-iso #{args[:template]}.json" - end + sh "#{build_command(args[:template])}" end desc 'Upload boxes' @@ -161,6 +156,13 @@ def box_metadata(metadata_file) metadata end +def build_command(template) + cmd = "./bin/bento build" + cmd << ' --except parallels-iso' unless which('prlctl') + cmd << " --mirror #{ENV['PACKER_MIRROR']}" if private?(template) + cmd << " #{template}.json" +end + def metadata_files @metadata_files ||= compute_metadata_files end @@ -172,8 +174,13 @@ end def create_box(boxname) req = request('get', "#{atlas_api}/box/#{atlas_org}/#{boxname}", { 'access_token' => atlas_token } ) if req.code.eql?('404') - puts "Creating the box #{boxname} in atlas." - req = request('post', "#{atlas_api}/boxes", { 'box[name]' => boxname, 'access_token' => atlas_token }, { 'Content-Type' => 'application/json' } ) + if private?(boxname) + puts "Creating the private box #{boxname} in atlas." + req = request('post', "#{atlas_api}/boxes", { 'box[name]' => boxname, 'access_token' => atlas_token, 'is_private' => true }, { 'Content-Type' => 'application/json' } ) + else + puts "Creating the public box #{boxname} in atlas." + req = request('post', "#{atlas_api}/boxes", { 'box[name]' => boxname, 'access_token' => atlas_token }, { 'Content-Type' => 'application/json' } ) + end else puts "The box #{boxname} exists in atlas, continuing." end @@ -237,3 +244,11 @@ def which(cmd) end return false end + +# +# private boxes +# +def private?(boxname) + proprietary_os_list = %w(macosx sles solaris windows) + proprietary_os_list.any? { |p| boxname.include?(p) } +end From 69a6f179bd80e4175df028028f2eaf36229abb87 Mon Sep 17 00:00:00 2001 From: Seth Thomas <sthomas@chef.io> Date: Fri, 10 Jul 2015 16:24:55 -0700 Subject: [PATCH 0364/1622] Adding Revoke and Delete commands for Atlas, ensuring consistent Atlas org usage, added headless support to bin/bento --- Rakefile | 89 ++++++++++++++++++++++++++++++++++++++++++++++--------- bin/bento | 27 +++++++++++++---- 2 files changed, 96 insertions(+), 20 deletions(-) diff --git a/Rakefile b/Rakefile index db9c4ecba..d7deae809 100644 --- a/Rakefile +++ b/Rakefile @@ -20,6 +20,14 @@ task :do_all do |task, args| # release stage Rake::Task['release_all'].invoke Rake::Task['release_all'].reenable + + # revoke + Rake::Task['revoke_all'].invoke + Rake::Task['revoke_all'].reenable + + # delete + Rake::Task['delete_all'].invoke + Rake::Task['delete_all'].reenable end # bundle exec rake build_box[ubuntu-12.04-amd64] @@ -55,6 +63,15 @@ task :release_all do end end +desc 'Revoke all boxes for a version' +task :revoke_all, :version do |v, args| + revoke_version(args[:version]) +end + +desc 'Delete all boxes for a version' +task :delete_all, :version do |v, args| + delete_version(args[:version]) +end desc 'Clean the build directory' task :clean do `rm -rf builds/*.{box,json}` @@ -101,7 +118,7 @@ def request(verb, url, data = {}, headers = {}) # Build the request. request = class_for_request(verb).new(uri.request_uri) - if %w(patch post put).include?(verb) + if %w(patch post put delete).include?(verb) if data.respond_to?(:read) request.content_length = data.size request.body_stream = data @@ -150,17 +167,21 @@ def box_metadata(metadata_file) metadata['version'] = json['version'] metadata['box_basename'] = json['box_basename'] metadata['providers'] = Hash.new - json['md5'].keys.each do |k| - metadata['providers'][k.split('.')[-2]] = k + json['providers'].each do |provider| + metadata['providers'][provider['name']] = provider.reject { |k, _| k == 'name' } end metadata end def build_command(template) - cmd = "./bin/bento build" - cmd << ' --except parallels-iso' unless which('prlctl') - cmd << " --mirror #{ENV['PACKER_MIRROR']}" if private?(template) - cmd << " #{template}.json" + cmd = %[./bin/bento build] + providers = %W[vmware-iso parallels-iso virtualbox-iso] + providers.delete(vmware-iso) if which('vmrun') + providers.delete(parallels-iso) if which('prlctl') + cmd.insert(1, "--except #{providers.join(",")}") + cmd.insert(1, "--mirror #{ENV['PACKER_MIRROR']}") if private?(template) + cmd.insert(1, "#{template}.json") + cmd end def metadata_files @@ -172,14 +193,14 @@ def compute_metadata_files end def create_box(boxname) - req = request('get', "#{atlas_api}/box/#{atlas_org}/#{boxname}", { 'access_token' => atlas_token } ) + req = request('get', "#{atlas_api}/box/#{atlas_org}/#{boxname}", { 'box[username]' => atlas_org, 'access_token' => atlas_token } ) if req.code.eql?('404') if private?(boxname) puts "Creating the private box #{boxname} in atlas." - req = request('post', "#{atlas_api}/boxes", { 'box[name]' => boxname, 'access_token' => atlas_token, 'is_private' => true }, { 'Content-Type' => 'application/json' } ) + req = request('post', "#{atlas_api}/boxes", { 'box[name]' => boxname, 'box[username]' => atlas_org, 'access_token' => atlas_token, 'is_private' => true }, { 'Content-Type' => 'application/json' } ) else puts "Creating the public box #{boxname} in atlas." - req = request('post', "#{atlas_api}/boxes", { 'box[name]' => boxname, 'access_token' => atlas_token }, { 'Content-Type' => 'application/json' } ) + req = request('post', "#{atlas_api}/boxes", { 'box[name]' => boxname, 'box[username]' => atlas_org, 'access_token' => atlas_token }, { 'Content-Type' => 'application/json' } ) end else puts "The box #{boxname} exists in atlas, continuing." @@ -193,8 +214,8 @@ def create_box_version(boxname, version) puts "Box version #{boxname} #{version} already exists, continuing." if req.code == '422' end -def create_providers(boxname, version, providers) - providers.each do |provider| +def create_providers(boxname, version, provider_names) + provider_names.each do |provider| puts "Creating provider #{provider} for #{boxname} #{version}" req = request('post', "#{atlas_api}/box/#{atlas_org}/#{boxname}/version/#{version}/providers", { 'provider[name]' => provider, 'access_token' => atlas_token }, { 'Content-Type' => 'application/json' } ) puts "Created #{provider} for #{boxname} #{version}" if req.code == '200' @@ -202,9 +223,10 @@ def create_providers(boxname, version, providers) end end -def upload_to_atlas(boxname, version, provider_hash) +def upload_to_atlas(boxname, version, providers) # Extract the upload path - provider_hash.each do |provider, boxfile| + providers.each do |provider, provider_data| + boxfile = provider_data['file'] # Get the upload path. req = request('get', "#{atlas_api}/box/#{atlas_org}/#{boxname}/version/#{version}/provider/#{provider}/upload?access_token=#{atlas_token}") upload_path = JSON.parse(req.body)['upload_path'] @@ -233,6 +255,45 @@ def release_version(boxname, version) puts "Version #{version} of box #{boxname} has been successfully released" if req.code == '200' end +def revoke_version(version) + org = request('get', "#{atlas_api}/user/#{atlas_org}?access_token=#{atlas_token}") + boxes = JSON.parse(org.body)['boxes'] + + boxes.each do |b| + b['versions'].each do |v| + if v['version'] == version + puts "Revoking version #{v['version']} of box #{b['name']}" + req = request('put', v['revoke_url'], { 'access_token' => atlas_token }, { 'Content-Type' => 'application/json' }) + if req.code == '200' + puts "Version #{v['version']} of box #{b['name']} has been successfully revoked" + else + puts "Something went wrong #{req.code}" + end + end + end + end +end + +def delete_version(version) + org = request('get', "#{atlas_api}/user/#{atlas_org}?access_token=#{atlas_token}") + boxes = JSON.parse(org.body)['boxes'] + + boxes.each do |b| + b['versions'].each do |v| + if v['version'] == version + puts "Deleting version #{v['version']} of box #{b['name']}" + puts "#{atlas_api}/box/#{atlas_org}/#{b['name']}/version/#{v['version']}" + req = request('delete', "#{atlas_api}/box/#{atlas_org}/#{b['name']}/version/#{v['version']}", { 'access_token' => atlas_token }, { 'Content-Type' => 'application/json' }) + if req.code == '200' + puts "Version #{v['version']} of box #{b['name']} has been successfully deleted" + else + puts "Something went wrong #{req.code} #{req.body}" + end + end + end + end +end + # http://stackoverflow.com/questions/2108727/which-in-ruby-checking-if-program-exists-in-path-from-ruby def which(cmd) exts = ENV['PATHEXT'] ? ENV['PATHEXT'].split(';') : [''] diff --git a/bin/bento b/bin/bento index 3f2b5356d..91dc6bc0d 100755 --- a/bin/bento +++ b/bin/bento @@ -77,6 +77,10 @@ class Options opts.on("-m MIRROR", "--mirror MIRROR", "Look for isos at MIRROR") do |opt| options.mirror = opt end + + opts.on("-v VERSION", "--version VERSION", "Override the version set in the template") do |opt| + options.override_version = opt + end }, argv: templates_argv_proc }, @@ -157,14 +161,14 @@ module PackerExec end def write_box_metadata(template, io) - md = BuildMetadata.new(template, build_timestamp).read + md = BuildMetadata.new(template, build_timestamp, override_version).read io.write(JSON.pretty_generate(md)) io.close end def write_var_file(template, md_file, io) - md = BuildMetadata.new(template, build_timestamp).read + md = BuildMetadata.new(template, build_timestamp, override_version).read io.write(JSON.pretty_generate({ box_basename: md[:box_basename], @@ -182,7 +186,7 @@ class BuildRunner include Common include PackerExec - attr_reader :templates, :dry_run, :debug, :builds, :except, :mirror, :build_timestamp + attr_reader :templates, :dry_run, :debug, :builds, :except, :mirror, :override_version, :build_timestamp def initialize(opts) @templates = opts.templates @@ -191,6 +195,7 @@ class BuildRunner @builds = opts.builds @except = opts.except @mirror = opts.mirror + @override_version = opts.override_version @build_timestamp = Time.now.gmtime.strftime("%Y%m%d%H%M%S") end @@ -218,6 +223,9 @@ class BuildRunner def packer_build_cmd(template, var_file) vars = "#{template}.variables.json" + if (/darwin/ =~ RUBY_PLATFORM) + headless = false + end cmd = %W[packer build -var-file=#{var_file} #{template}.json] cmd.insert(2, "-var-file=#{vars}") if File.exist?(vars) cmd.insert(2, "-only=#{builds}") if builds @@ -225,13 +233,15 @@ class BuildRunner # Build the command line in the correct order and without spaces as future input for the splat operator. cmd.insert(2, "mirror=#{mirror}") if mirror cmd.insert(2, "-var") if mirror + cmd.insert(2, "headless=true") if headless + cmd.insert(2, "-var") if headless cmd.insert(2, "-debug") if debug cmd.insert(0, "echo") if dry_run cmd end def write_final_metadata(template) - md = BuildMetadata.new(template, build_timestamp).read + md = BuildMetadata.new(template, build_timestamp, override_version).read path = File.join(File.dirname(__FILE__), "..", "builds") filename = File.join(path, "#{md[:box_basename]}.metadata.json") @@ -355,9 +365,10 @@ end class BuildMetadata - def initialize(template, build_timestamp) + def initialize(template, build_timestamp, override_version) @template = template @build_timestamp = build_timestamp + @override_version = override_version end def read @@ -375,7 +386,7 @@ class BuildMetadata UNKNOWN = "__unknown__".freeze - attr_reader :template, :build_timestamp + attr_reader :template, :build_timestamp, :override_version def box_basename "#{name.gsub("/", "__")}-#{version}.git.#{git_revision}" @@ -410,8 +421,12 @@ class BuildMetadata end def version + if override_version + override_version + else merged_vars.fetch("version", "#{UNKNOWN}.TIMESTAMP"). rpartition(".").first.concat(".#{build_timestamp}") + end end end From 62da44241b94d3283a8ede09b5dabd887f85e88a Mon Sep 17 00:00:00 2001 From: Seth Thomas <sthomas@chef.io> Date: Fri, 10 Jul 2015 16:33:21 -0700 Subject: [PATCH 0365/1622] Fix attr reader --- bin/bento | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/bento b/bin/bento index 91dc6bc0d..15deb569a 100755 --- a/bin/bento +++ b/bin/bento @@ -261,7 +261,7 @@ class NormalizeRunner include Common include PackerExec - attr_reader :templates, :build_timestamp, :debug + attr_reader :templates, :build_timestamp, :debug, :override_version def initialize(opts) @templates = opts.templates From fd9144a6362b979a38c5d69cfe3d30bb9301a1d2 Mon Sep 17 00:00:00 2001 From: Seth Thomas <sthomas@chef.io> Date: Fri, 10 Jul 2015 16:45:08 -0700 Subject: [PATCH 0366/1622] Adding support for headless mode --- centos-5.11-i386.json | 4 ++++ centos-5.11-x86_64.json | 4 ++++ centos-6.6-i386.json | 4 ++++ centos-6.6-x86_64.json | 4 ++++ centos-7.1-x86_64.json | 4 ++++ debian-6.0.10-amd64.json | 4 ++++ debian-6.0.10-i386.json | 4 ++++ debian-7.8-amd64.json | 4 ++++ debian-7.8-i386.json | 4 ++++ debian-8.1-amd64.json | 4 ++++ debian-8.1-i386.json | 4 ++++ fedora-20-i386.json | 4 ++++ fedora-20-x86_64.json | 4 ++++ fedora-21-i386.json | 4 ++++ fedora-21-x86_64.json | 4 ++++ freebsd-10.1-amd64.json | 4 ++++ freebsd-10.1-i386.json | 4 ++++ freebsd-9.3-amd64.json | 4 ++++ freebsd-9.3-i386.json | 3 +++ macosx-10.10.json | 3 +++ macosx-10.7.json | 3 +++ macosx-10.8.json | 3 +++ macosx-10.9.json | 3 +++ omnios-r151010j.json | 4 ++++ opensuse-13.2-i386.json | 4 ++++ opensuse-13.2-x86_64.json | 4 ++++ oracle-5.11-i386.json | 4 ++++ oracle-5.11-x86_64.json | 4 ++++ oracle-6.6-i386.json | 4 ++++ oracle-6.6-x86_64.json | 4 ++++ rhel-5.11-i386.json | 4 ++++ rhel-5.11-x86_64.json | 4 ++++ rhel-6.6-i386.json | 4 ++++ rhel-6.6-x86_64.json | 4 ++++ rhel-7.1-x86_64.json | 4 ++++ sles-11-sp2-i386.json | 4 ++++ sles-11-sp2-x86_64.json | 4 ++++ sles-11-sp3-i386.json | 4 ++++ sles-11-sp3-x86_64.json | 4 ++++ sles-12-x86_64.json | 4 ++++ solaris-10.11-x86.json | 3 +++ solaris-11-x86.json | 3 +++ ubuntu-10.04-amd64.json | 4 ++++ ubuntu-10.04-i386.json | 4 ++++ ubuntu-12.04-amd64.json | 4 ++++ ubuntu-12.04-i386.json | 4 ++++ ubuntu-14.04-amd64.json | 4 ++++ ubuntu-14.04-i386.json | 4 ++++ ubuntu-14.10-amd64.json | 4 ++++ ubuntu-14.10-i386.json | 4 ++++ ubuntu-15.04-amd64.json | 4 ++++ ubuntu-15.04-i386.json | 4 ++++ 52 files changed, 201 insertions(+) diff --git a/centos-5.11-i386.json b/centos-5.11-i386.json index 7fc84cb67..25621e5be 100644 --- a/centos-5.11-i386.json +++ b/centos-5.11-i386.json @@ -9,6 +9,7 @@ "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "guest_os_type": "RedHat", "hard_drive_interface": "sata", + "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", @@ -44,6 +45,7 @@ "boot_wait": "10s", "disk_size": 40960, "guest_os_type": "centos", + "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", @@ -70,6 +72,7 @@ "boot_wait": "10s", "disk_size": 40960, "guest_os_type": "centos", + "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", @@ -136,6 +139,7 @@ "box_basename": "__unset_box_basename__", "build_timestamp": "{{isotime \"20060102150405\"}}", "git_revision": "__unknown_git_revision__", + "headless": "", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", "iso_checksum": "ec3a89b4edc8e391d13c1ecce4e6ce3917719e39", diff --git a/centos-5.11-x86_64.json b/centos-5.11-x86_64.json index 9a11d9bda..b8aaad4ee 100644 --- a/centos-5.11-x86_64.json +++ b/centos-5.11-x86_64.json @@ -9,6 +9,7 @@ "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "guest_os_type": "RedHat_64", "hard_drive_interface": "sata", + "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", @@ -44,6 +45,7 @@ "boot_wait": "10s", "disk_size": 40960, "guest_os_type": "centos-64", + "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", @@ -70,6 +72,7 @@ "boot_wait": "10s", "disk_size": 40960, "guest_os_type": "centos", + "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", @@ -136,6 +139,7 @@ "box_basename": "__unset_box_basename__", "build_timestamp": "{{isotime \"20060102150405\"}}", "git_revision": "__unknown_git_revision__", + "headless": "", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", "iso_checksum": "ebd77f2fdfac8da04f31c508905cf52aa62937cc", diff --git a/centos-6.6-i386.json b/centos-6.6-i386.json index e0f58384c..36f8580d4 100644 --- a/centos-6.6-i386.json +++ b/centos-6.6-i386.json @@ -9,6 +9,7 @@ "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "guest_os_type": "RedHat", "hard_drive_interface": "sata", + "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", @@ -44,6 +45,7 @@ "boot_wait": "10s", "disk_size": 40960, "guest_os_type": "centos", + "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", @@ -70,6 +72,7 @@ "boot_wait": "10s", "disk_size": 40960, "guest_os_type": "centos", + "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", @@ -136,6 +139,7 @@ "box_basename": "__unset_box_basename__", "build_timestamp": "{{isotime \"20060102150405\"}}", "git_revision": "__unknown_git_revision__", + "headless": "", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", "iso_checksum": "d16aa4a8e6f71fb01fcc26d8ae0e3443ed514c8e", diff --git a/centos-6.6-x86_64.json b/centos-6.6-x86_64.json index edbbb75bd..ad39eaa26 100644 --- a/centos-6.6-x86_64.json +++ b/centos-6.6-x86_64.json @@ -9,6 +9,7 @@ "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "guest_os_type": "RedHat_64", "hard_drive_interface": "sata", + "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", @@ -44,6 +45,7 @@ "boot_wait": "10s", "disk_size": 40960, "guest_os_type": "centos-64", + "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", @@ -70,6 +72,7 @@ "boot_wait": "10s", "disk_size": 40960, "guest_os_type": "centos", + "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", @@ -136,6 +139,7 @@ "box_basename": "__unset_box_basename__", "build_timestamp": "{{isotime \"20060102150405\"}}", "git_revision": "__unknown_git_revision__", + "headless": "", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", "iso_checksum": "08be09fd7276822bd3468af8f96198279ffc41f0", diff --git a/centos-7.1-x86_64.json b/centos-7.1-x86_64.json index 400f9ea4e..8e7246a45 100644 --- a/centos-7.1-x86_64.json +++ b/centos-7.1-x86_64.json @@ -9,6 +9,7 @@ "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "guest_os_type": "RedHat_64", "hard_drive_interface": "sata", + "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", @@ -44,6 +45,7 @@ "boot_wait": "10s", "disk_size": 40960, "guest_os_type": "centos-64", + "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", @@ -70,6 +72,7 @@ "boot_wait": "10s", "disk_size": 40960, "guest_os_type": "centos", + "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", @@ -136,6 +139,7 @@ "box_basename": "__unset_box_basename__", "build_timestamp": "{{isotime \"20060102150405\"}}", "git_revision": "__unknown_git_revision__", + "headless": "", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", "iso_checksum": "85bcf62462fb678adc0cec159bf8b39ab5515404bc3828c432f743a1b0b30157", diff --git a/debian-6.0.10-amd64.json b/debian-6.0.10-amd64.json index 49cee79d4..b844e6a9d 100644 --- a/debian-6.0.10-amd64.json +++ b/debian-6.0.10-amd64.json @@ -23,6 +23,7 @@ "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "guest_os_type": "Debian_64", "hard_drive_interface": "sata", + "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "f3e70528664f174a121b26491c59cd66daaf8274", "iso_checksum_type": "sha1", @@ -72,6 +73,7 @@ "boot_wait": "10s", "disk_size": 40960, "guest_os_type": "debian5-64", + "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "f3e70528664f174a121b26491c59cd66daaf8274", "iso_checksum_type": "sha1", @@ -112,6 +114,7 @@ "boot_wait": "10s", "disk_size": 40960, "guest_os_type": "debian", + "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "f3e70528664f174a121b26491c59cd66daaf8274", "iso_checksum_type": "sha1", @@ -176,6 +179,7 @@ "box_basename": "debian-6.0.10", "build_timestamp": "{{isotime \"20060102150405\"}}", "git_revision": "__unknown_git_revision__", + "headless": "", "metadata": "floppy/dummy_metadata.json", "mirror": "http://cdimage.debian.org/cdimage/archive", "name": "debian-6.0.10", diff --git a/debian-6.0.10-i386.json b/debian-6.0.10-i386.json index fd7cd23c0..3f0b62286 100644 --- a/debian-6.0.10-i386.json +++ b/debian-6.0.10-i386.json @@ -23,6 +23,7 @@ "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "guest_os_type": "Debian", "hard_drive_interface": "sata", + "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "e8f77720e30f669e731fe3166ad6c3d2da33d93a", "iso_checksum_type": "sha1", @@ -72,6 +73,7 @@ "boot_wait": "10s", "disk_size": 40960, "guest_os_type": "debian5", + "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "e8f77720e30f669e731fe3166ad6c3d2da33d93a", "iso_checksum_type": "sha1", @@ -112,6 +114,7 @@ "boot_wait": "10s", "disk_size": 40960, "guest_os_type": "debian", + "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "e8f77720e30f669e731fe3166ad6c3d2da33d93a", "iso_checksum_type": "sha1", @@ -176,6 +179,7 @@ "box_basename": "debian-6.0.10-i386", "build_timestamp": "{{isotime \"20060102150405\"}}", "git_revision": "__unknown_git_revision__", + "headless": "", "metadata": "floppy/dummy_metadata.json", "mirror": "http://cdimage.debian.org/cdimage/archive", "name": "debian-6.0.10-i386", diff --git a/debian-7.8-amd64.json b/debian-7.8-amd64.json index 03f330004..ad404abdc 100644 --- a/debian-7.8-amd64.json +++ b/debian-7.8-amd64.json @@ -23,6 +23,7 @@ "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "guest_os_type": "Debian_64", "hard_drive_interface": "sata", + "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "5f611b40b0803f8be1180da561cfbc159e381599", "iso_checksum_type": "sha1", @@ -72,6 +73,7 @@ "boot_wait": "10s", "disk_size": 40960, "guest_os_type": "debian7-64", + "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "5f611b40b0803f8be1180da561cfbc159e381599", "iso_checksum_type": "sha1", @@ -112,6 +114,7 @@ "boot_wait": "10s", "disk_size": 40960, "guest_os_type": "debian", + "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "5f611b40b0803f8be1180da561cfbc159e381599", "iso_checksum_type": "sha1", @@ -176,6 +179,7 @@ "box_basename": "debian-7.8", "build_timestamp": "{{isotime \"20060102150405\"}}", "git_revision": "__unknown_git_revision__", + "headless": "", "metadata": "floppy/dummy_metadata.json", "mirror": "http://cdimage.debian.org/cdimage/archive", "name": "debian-7.8", diff --git a/debian-7.8-i386.json b/debian-7.8-i386.json index 0a89c3f12..226978e55 100644 --- a/debian-7.8-i386.json +++ b/debian-7.8-i386.json @@ -23,6 +23,7 @@ "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "guest_os_type": "Debian", "hard_drive_interface": "sata", + "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "d87664e590f39aba725ec9705dc58a8c75417fef", "iso_checksum_type": "sha1", @@ -72,6 +73,7 @@ "boot_wait": "10s", "disk_size": 40960, "guest_os_type": "debian7", + "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "d87664e590f39aba725ec9705dc58a8c75417fef", "iso_checksum_type": "sha1", @@ -112,6 +114,7 @@ "boot_wait": "10s", "disk_size": 40960, "guest_os_type": "debian", + "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "d87664e590f39aba725ec9705dc58a8c75417fef", "iso_checksum_type": "sha1", @@ -176,6 +179,7 @@ "box_basename": "debian-7.8-i386", "build_timestamp": "{{isotime \"20060102150405\"}}", "git_revision": "__unknown_git_revision__", + "headless": "", "metadata": "floppy/dummy_metadata.json", "mirror": "http://cdimage.debian.org/cdimage/archive", "name": "debian-7.8-i386", diff --git a/debian-8.1-amd64.json b/debian-8.1-amd64.json index f58b69858..59379553f 100644 --- a/debian-8.1-amd64.json +++ b/debian-8.1-amd64.json @@ -23,6 +23,7 @@ "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "guest_os_type": "Debian_64", "hard_drive_interface": "sata", + "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "22bae271a732333ebff150598292d9907d2c6001", "iso_checksum_type": "sha1", @@ -72,6 +73,7 @@ "boot_wait": "10s", "disk_size": 40960, "guest_os_type": "debian8-64", + "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "22bae271a732333ebff150598292d9907d2c6001", "iso_checksum_type": "sha1", @@ -112,6 +114,7 @@ "boot_wait": "10s", "disk_size": 40960, "guest_os_type": "debian", + "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "22bae271a732333ebff150598292d9907d2c6001", "iso_checksum_type": "sha1", @@ -176,6 +179,7 @@ "box_basename": "debian-8.1", "build_timestamp": "{{isotime \"20060102150405\"}}", "git_revision": "__unknown_git_revision__", + "headless": "", "metadata": "floppy/dummy_metadata.json", "mirror": "http://cdimage.debian.org/cdimage/release", "name": "debian-8.1", diff --git a/debian-8.1-i386.json b/debian-8.1-i386.json index eddd5e1fa..d5fcc9c81 100644 --- a/debian-8.1-i386.json +++ b/debian-8.1-i386.json @@ -23,6 +23,7 @@ "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "guest_os_type": "Debian", "hard_drive_interface": "sata", + "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "e223823e0c159f057ec83bd51d4770a132e3e51b", "iso_checksum_type": "sha1", @@ -72,6 +73,7 @@ "boot_wait": "10s", "disk_size": 40960, "guest_os_type": "debian8", + "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "e223823e0c159f057ec83bd51d4770a132e3e51b", "iso_checksum_type": "sha1", @@ -112,6 +114,7 @@ "boot_wait": "10s", "disk_size": 40960, "guest_os_type": "debian", + "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "e223823e0c159f057ec83bd51d4770a132e3e51b", "iso_checksum_type": "sha1", @@ -176,6 +179,7 @@ "box_basename": "debian-8.1-i386", "build_timestamp": "{{isotime \"20060102150405\"}}", "git_revision": "__unknown_git_revision__", + "headless": "", "metadata": "floppy/dummy_metadata.json", "mirror": "http://cdimage.debian.org/cdimage/release", "name": "debian-8.1-i386", diff --git a/fedora-20-i386.json b/fedora-20-i386.json index 1f4639672..19c7da984 100644 --- a/fedora-20-i386.json +++ b/fedora-20-i386.json @@ -9,6 +9,7 @@ "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "guest_os_type": "Fedora", "hard_drive_interface": "sata", + "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "284ea30ddd50db1b30cd5cd9fae7495dad8714ef1e4428d69a8c8ce80e03b6a9", "iso_checksum_type": "sha256", @@ -44,6 +45,7 @@ "boot_wait": "10s", "disk_size": 40960, "guest_os_type": "fedora", + "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "284ea30ddd50db1b30cd5cd9fae7495dad8714ef1e4428d69a8c8ce80e03b6a9", "iso_checksum_type": "sha256", @@ -70,6 +72,7 @@ "boot_wait": "10s", "disk_size": 40960, "guest_os_type": "fedora-core", + "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "284ea30ddd50db1b30cd5cd9fae7495dad8714ef1e4428d69a8c8ce80e03b6a9", "iso_checksum_type": "sha256", @@ -132,6 +135,7 @@ "box_basename": "fedora-20-i386", "build_timestamp": "{{isotime \"20060102150405\"}}", "git_revision": "__unknown_git_revision__", + "headless": "", "metadata": "floppy/dummy_metadata.json", "mirror": "http://download.fedoraproject.org/pub/fedora/linux", "name": "fedora-20-i386", diff --git a/fedora-20-x86_64.json b/fedora-20-x86_64.json index 3ed1eeb89..22479ddb6 100644 --- a/fedora-20-x86_64.json +++ b/fedora-20-x86_64.json @@ -9,6 +9,7 @@ "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "guest_os_type": "Fedora_64", "hard_drive_interface": "sata", + "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "f2eeed5102b8890e9e6f4b9053717fe73031e699c4b76dc7028749ab66e7f917", "iso_checksum_type": "sha256", @@ -44,6 +45,7 @@ "boot_wait": "10s", "disk_size": 40960, "guest_os_type": "fedora-64", + "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "f2eeed5102b8890e9e6f4b9053717fe73031e699c4b76dc7028749ab66e7f917", "iso_checksum_type": "sha256", @@ -70,6 +72,7 @@ "boot_wait": "10s", "disk_size": 40960, "guest_os_type": "fedora-core", + "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "f2eeed5102b8890e9e6f4b9053717fe73031e699c4b76dc7028749ab66e7f917", "iso_checksum_type": "sha256", @@ -132,6 +135,7 @@ "box_basename": "fedora-20", "build_timestamp": "{{isotime \"20060102150405\"}}", "git_revision": "__unknown_git_revision__", + "headless": "", "metadata": "floppy/dummy_metadata.json", "mirror": "http://download.fedoraproject.org/pub/fedora/linux", "name": "fedora-20", diff --git a/fedora-21-i386.json b/fedora-21-i386.json index 8a28a2e6e..23dde0c53 100644 --- a/fedora-21-i386.json +++ b/fedora-21-i386.json @@ -9,6 +9,7 @@ "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "guest_os_type": "Fedora", "hard_drive_interface": "sata", + "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "85e50a8a938996522bf1605b3578a2d6680362c1aa963d0560d59c2e4fc795ef", "iso_checksum_type": "sha256", @@ -44,6 +45,7 @@ "boot_wait": "10s", "disk_size": 40960, "guest_os_type": "fedora", + "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "85e50a8a938996522bf1605b3578a2d6680362c1aa963d0560d59c2e4fc795ef", "iso_checksum_type": "sha256", @@ -70,6 +72,7 @@ "boot_wait": "10s", "disk_size": 40960, "guest_os_type": "fedora-core", + "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "85e50a8a938996522bf1605b3578a2d6680362c1aa963d0560d59c2e4fc795ef", "iso_checksum_type": "sha256", @@ -132,6 +135,7 @@ "box_basename": "fedora-21-i386", "build_timestamp": "{{isotime \"20060102150405\"}}", "git_revision": "__unknown_git_revision__", + "headless": "", "metadata": "floppy/dummy_metadata.json", "mirror": "http://download.fedoraproject.org/pub/fedora/linux", "name": "fedora-21-i386", diff --git a/fedora-21-x86_64.json b/fedora-21-x86_64.json index 2270306c0..72428d146 100644 --- a/fedora-21-x86_64.json +++ b/fedora-21-x86_64.json @@ -9,6 +9,7 @@ "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "guest_os_type": "Fedora_64", "hard_drive_interface": "sata", + "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "a6a2e83bb409d6b8ee3072ad07faac0a54d79c9ecbe3a40af91b773e2d843d8e", "iso_checksum_type": "sha256", @@ -44,6 +45,7 @@ "boot_wait": "10s", "disk_size": 40960, "guest_os_type": "fedora-64", + "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "a6a2e83bb409d6b8ee3072ad07faac0a54d79c9ecbe3a40af91b773e2d843d8e", "iso_checksum_type": "sha256", @@ -70,6 +72,7 @@ "boot_wait": "10s", "disk_size": 40960, "guest_os_type": "fedora-core", + "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "a6a2e83bb409d6b8ee3072ad07faac0a54d79c9ecbe3a40af91b773e2d843d8e", "iso_checksum_type": "sha256", @@ -132,6 +135,7 @@ "box_basename": "fedora-21", "build_timestamp": "{{isotime \"20060102150405\"}}", "git_revision": "__unknown_git_revision__", + "headless": "", "metadata": "floppy/dummy_metadata.json", "mirror": "http://download.fedoraproject.org/pub/fedora/linux", "name": "fedora-21", diff --git a/freebsd-10.1-amd64.json b/freebsd-10.1-amd64.json index 2ca219eb7..0ec5caf0d 100644 --- a/freebsd-10.1-amd64.json +++ b/freebsd-10.1-amd64.json @@ -16,6 +16,7 @@ "disk_size": 10140, "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "guest_os_type": "FreeBSD_64", + "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "0c3d64ce48c3ef761761d0fea07e1935e296f8c045c249118bc91a7faf053a6b", "iso_checksum_type": "sha256", @@ -60,6 +61,7 @@ "boot_wait": "10s", "disk_size": 10140, "guest_os_type": "freebsd-64", + "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "0c3d64ce48c3ef761761d0fea07e1935e296f8c045c249118bc91a7faf053a6b", "iso_checksum_type": "sha256", @@ -94,6 +96,7 @@ "boot_wait": "10s", "disk_size": 10140, "guest_os_type": "freebsd", + "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "0c3d64ce48c3ef761761d0fea07e1935e296f8c045c249118bc91a7faf053a6b", "iso_checksum_type": "sha256", @@ -179,6 +182,7 @@ "box_basename": "freebsd-10.1", "build_timestamp": "{{isotime \"20060102150405\"}}", "git_revision": "__unknown_git_revision__", + "headless": "", "metadata": "floppy/dummy_metadata.json", "mirror": "http://ftp.freebsd.org/pub/FreeBSD", "name": "freebsd-10.1", diff --git a/freebsd-10.1-i386.json b/freebsd-10.1-i386.json index 312f86f27..f1e172562 100644 --- a/freebsd-10.1-i386.json +++ b/freebsd-10.1-i386.json @@ -16,6 +16,7 @@ "disk_size": 10140, "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "guest_os_type": "FreeBSD", + "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "fe31790b762b01c99791d33e7fd9ab97323654785ce21f588116c8b4eb381cd0", "iso_checksum_type": "sha256", @@ -60,6 +61,7 @@ "boot_wait": "10s", "disk_size": 10140, "guest_os_type": "freebsd", + "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "fe31790b762b01c99791d33e7fd9ab97323654785ce21f588116c8b4eb381cd0", "iso_checksum_type": "sha256", @@ -94,6 +96,7 @@ "boot_wait": "10s", "disk_size": 10140, "guest_os_type": "freebsd", + "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "fe31790b762b01c99791d33e7fd9ab97323654785ce21f588116c8b4eb381cd0", "iso_checksum_type": "sha256", @@ -179,6 +182,7 @@ "box_basename": "freebsd-10.1-i386", "build_timestamp": "{{isotime \"20060102150405\"}}", "git_revision": "__unknown_git_revision__", + "headless": "", "metadata": "floppy/dummy_metadata.json", "mirror": "http://ftp.freebsd.org/pub/FreeBSD", "name": "freebsd-10.1-i386", diff --git a/freebsd-9.3-amd64.json b/freebsd-9.3-amd64.json index 73177411a..5274f297d 100644 --- a/freebsd-9.3-amd64.json +++ b/freebsd-9.3-amd64.json @@ -20,6 +20,7 @@ "disk_size": 10140, "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "guest_os_type": "FreeBSD_64", + "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "5a3c82653d77bba7d7ded8bd7efbedc09d52cf4045d98ce52a82c9e0f8fa9b0e", "iso_checksum_type": "sha256", @@ -68,6 +69,7 @@ "boot_wait": "10s", "disk_size": 10140, "guest_os_type": "freebsd-64", + "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "5a3c82653d77bba7d7ded8bd7efbedc09d52cf4045d98ce52a82c9e0f8fa9b0e", "iso_checksum_type": "sha256", @@ -106,6 +108,7 @@ "boot_wait": "10s", "disk_size": 10140, "guest_os_type": "freebsd", + "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "5a3c82653d77bba7d7ded8bd7efbedc09d52cf4045d98ce52a82c9e0f8fa9b0e", "iso_checksum_type": "sha256", @@ -191,6 +194,7 @@ "box_basename": "freebsd-9.3", "build_timestamp": "{{isotime \"20060102150405\"}}", "git_revision": "__unknown_git_revision__", + "headless": "", "metadata": "floppy/dummy_metadata.json", "mirror": "http://ftp.freebsd.org/pub/FreeBSD", "name": "freebsd-9.3", diff --git a/freebsd-9.3-i386.json b/freebsd-9.3-i386.json index 29e72d6a6..48e5942bd 100644 --- a/freebsd-9.3-i386.json +++ b/freebsd-9.3-i386.json @@ -20,6 +20,7 @@ "disk_size": 10140, "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "guest_os_type": "FreeBSD", + "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "cab6aad9c3d5ea6a3fb4059f808225c67f1edaea730c555a86a9707ac41ba75d", "iso_checksum_type": "sha256", @@ -68,6 +69,7 @@ "boot_wait": "10s", "disk_size": 10140, "guest_os_type": "freebsd", + "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "cab6aad9c3d5ea6a3fb4059f808225c67f1edaea730c555a86a9707ac41ba75d", "iso_checksum_type": "sha256", @@ -189,6 +191,7 @@ "box_basename": "freebsd-9.3-i386", "build_timestamp": "{{isotime \"20060102150405\"}}", "git_revision": "__unknown_git_revision__", + "headless": "", "metadata": "floppy/dummy_metadata.json", "mirror": "http://ftp.freebsd.org/pub/FreeBSD", "name": "freebsd-9.3-i386", diff --git a/macosx-10.10.json b/macosx-10.10.json index 25be83e5f..e957192cf 100644 --- a/macosx-10.10.json +++ b/macosx-10.10.json @@ -4,6 +4,7 @@ "boot_wait": "2s", "disk_size": 20480, "guest_os_type": "darwin12-64", + "headless": "{{ user `headless` }}", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `iso_url`}}", @@ -37,6 +38,7 @@ "guest_additions_mode": "disable", "guest_os_type": "MacOS109_64", "hard_drive_interface": "sata", + "headless": "{{ user `headless` }}", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `iso_url`}}", @@ -192,6 +194,7 @@ "box_basename": "__unset_box_basename__", "build_timestamp": "{{isotime \"20060102150405\"}}", "git_revision": "__unknown_git_revision__", + "headless": "", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", "iso_checksum": "__unset_iso_checksum__", diff --git a/macosx-10.7.json b/macosx-10.7.json index e91b3d804..70d968103 100644 --- a/macosx-10.7.json +++ b/macosx-10.7.json @@ -4,6 +4,7 @@ "boot_wait": "2s", "disk_size": 20480, "guest_os_type": "darwin12-64", + "headless": "{{ user `headless` }}", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `iso_url`}}", @@ -37,6 +38,7 @@ "guest_additions_mode": "disable", "guest_os_type": "MacOS107_64", "hard_drive_interface": "sata", + "headless": "{{ user `headless` }}", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `iso_url`}}", @@ -192,6 +194,7 @@ "box_basename": "__unset_box_basename__", "build_timestamp": "{{isotime \"20060102150405\"}}", "git_revision": "__unknown_git_revision__", + "headless": "", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", "iso_checksum": "__unset_iso_checksum__", diff --git a/macosx-10.8.json b/macosx-10.8.json index 540fd9a90..d32052ad7 100644 --- a/macosx-10.8.json +++ b/macosx-10.8.json @@ -4,6 +4,7 @@ "boot_wait": "2s", "disk_size": 20480, "guest_os_type": "darwin12-64", + "headless": "{{ user `headless` }}", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `iso_url`}}", @@ -37,6 +38,7 @@ "guest_additions_mode": "disable", "guest_os_type": "MacOS108_64", "hard_drive_interface": "sata", + "headless": "{{ user `headless` }}", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `iso_url`}}", @@ -192,6 +194,7 @@ "box_basename": "__unset_box_basename__", "build_timestamp": "{{isotime \"20060102150405\"}}", "git_revision": "__unknown_git_revision__", + "headless": "", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", "iso_checksum": "__unset_iso_checksum__", diff --git a/macosx-10.9.json b/macosx-10.9.json index de73b6ed1..e32eaec39 100644 --- a/macosx-10.9.json +++ b/macosx-10.9.json @@ -4,6 +4,7 @@ "boot_wait": "2s", "disk_size": 20480, "guest_os_type": "darwin12-64", + "headless": "{{ user `headless` }}", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `iso_url`}}", @@ -37,6 +38,7 @@ "guest_additions_mode": "disable", "guest_os_type": "MacOS109_64", "hard_drive_interface": "sata", + "headless": "{{ user `headless` }}", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `iso_url`}}", @@ -192,6 +194,7 @@ "box_basename": "__unset_box_basename__", "build_timestamp": "{{isotime \"20060102150405\"}}", "git_revision": "__unknown_git_revision__", + "headless": "", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", "iso_checksum": "__unset_iso_checksum__", diff --git a/omnios-r151010j.json b/omnios-r151010j.json index 684fad1c1..43f5eff96 100644 --- a/omnios-r151010j.json +++ b/omnios-r151010j.json @@ -33,6 +33,7 @@ "boot_wait": "30s", "disk_size": 40960, "guest_os_type": "OpenSolaris_64", + "headless": "{{ user `headless` }}", "iso_checksum": "bc3f4c0d29a5da75174de62da00294e5ef826b5e", "iso_checksum_type": "sha1", "iso_url": "{{user `mirror`}}/OmniOS_Text_r151010j.iso", @@ -97,6 +98,7 @@ "floppy/omnios/README.TXT" ], "guest_os_type": "solaris11-64", + "headless": "{{ user `headless` }}", "iso_checksum": "bc3f4c0d29a5da75174de62da00294e5ef826b5e", "iso_checksum_type": "sha1", "iso_url": "{{user `mirror`}}/OmniOS_Text_r151010j.iso", @@ -150,6 +152,7 @@ "disk_size": 40960, "guest_os_type": "opensolaris", "hard_drive_interface": "ide", + "headless": "{{ user `headless` }}", "iso_checksum": "bc3f4c0d29a5da75174de62da00294e5ef826b5e", "iso_checksum_type": "sha1", "iso_url": "{{user `mirror`}}/OmniOS_Text_r151010j.iso", @@ -211,6 +214,7 @@ "box_basename": "omnios-r151010j", "build_timestamp": "{{isotime \"20060102150405\"}}", "git_revision": "__unknown_git_revision__", + "headless": "", "metadata": "floppy/dummy_metadata.json", "mirror": "http://omnios.omniti.com/media", "name": "omnios-r151010j", diff --git a/opensuse-13.2-i386.json b/opensuse-13.2-i386.json index 036b4b389..3af9d250d 100644 --- a/opensuse-13.2-i386.json +++ b/opensuse-13.2-i386.json @@ -12,6 +12,7 @@ "disk_size": 20480, "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "guest_os_type": "OpenSUSE", + "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "2ec28606829d6408efc5a79b70d1da738fdc09de", "iso_checksum_type": "sha1", @@ -51,6 +52,7 @@ "boot_wait": "10s", "disk_size": 20480, "guest_os_type": "opensuse", + "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "2ec28606829d6408efc5a79b70d1da738fdc09de", "iso_checksum_type": "sha1", @@ -81,6 +83,7 @@ "boot_wait": "10s", "disk_size": 20480, "guest_os_type": "opensuse", + "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "2ec28606829d6408efc5a79b70d1da738fdc09de", "iso_checksum_type": "sha1", @@ -145,6 +148,7 @@ "box_basename": "opensuse-13.2-i386", "build_timestamp": "{{isotime \"20060102150405\"}}", "git_revision": "__unknown_git_revision__", + "headless": "", "metadata": "floppy/dummy_metadata.json", "mirror": "http://download.opensuse.org/distribution", "name": "opensuse-13.2-i386", diff --git a/opensuse-13.2-x86_64.json b/opensuse-13.2-x86_64.json index 27e0c9173..9cb453c42 100644 --- a/opensuse-13.2-x86_64.json +++ b/opensuse-13.2-x86_64.json @@ -12,6 +12,7 @@ "disk_size": 20480, "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "guest_os_type": "OpenSUSE_64", + "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "a1bd237ccfb07939953a9681607c99c00bc78d5d", "iso_checksum_type": "sha1", @@ -51,6 +52,7 @@ "boot_wait": "10s", "disk_size": 20480, "guest_os_type": "opensuse-64", + "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "a1bd237ccfb07939953a9681607c99c00bc78d5d", "iso_checksum_type": "sha1", @@ -81,6 +83,7 @@ "boot_wait": "10s", "disk_size": 20480, "guest_os_type": "opensuse", + "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "a1bd237ccfb07939953a9681607c99c00bc78d5d", "iso_checksum_type": "sha1", @@ -145,6 +148,7 @@ "box_basename": "opensuse-13.2-x86_64", "build_timestamp": "{{isotime \"20060102150405\"}}", "git_revision": "__unknown_git_revision__", + "headless": "", "metadata": "floppy/dummy_metadata.json", "mirror": "http://download.opensuse.org/distribution", "name": "opensuse-13.2-x86_64", diff --git a/oracle-5.11-i386.json b/oracle-5.11-i386.json index 206a2041a..fd561aa39 100644 --- a/oracle-5.11-i386.json +++ b/oracle-5.11-i386.json @@ -9,6 +9,7 @@ "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "guest_os_type": "Oracle", "hard_drive_interface": "sata", + "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "f4ef2b868a0cccb736664136eca798ec", "iso_checksum_type": "md5", @@ -44,6 +45,7 @@ "boot_wait": "10s", "disk_size": 40960, "guest_os_type": "oraclelinux", + "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "f4ef2b868a0cccb736664136eca798ec", "iso_checksum_type": "md5", @@ -70,6 +72,7 @@ "boot_wait": "10s", "disk_size": 40960, "guest_os_type": "centos", + "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "f4ef2b868a0cccb736664136eca798ec", "iso_checksum_type": "md5", @@ -131,6 +134,7 @@ "box_basename": "oracle-5.11-i386", "build_timestamp": "{{isotime \"20060102150405\"}}", "git_revision": "__unknown_git_revision__", + "headless": "", "metadata": "floppy/dummy_metadata.json", "mirror": "http://mirrors.dotsrc.org/oracle-linux/EL5/U11/i386", "name": "oracle-5.11-i386", diff --git a/oracle-5.11-x86_64.json b/oracle-5.11-x86_64.json index 9596cfa3a..cde4575dd 100644 --- a/oracle-5.11-x86_64.json +++ b/oracle-5.11-x86_64.json @@ -9,6 +9,7 @@ "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "guest_os_type": "Oracle_64", "hard_drive_interface": "sata", + "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "8af2121088c7e6f5ebdb6d5900403240", "iso_checksum_type": "md5", @@ -44,6 +45,7 @@ "boot_wait": "10s", "disk_size": 40960, "guest_os_type": "oraclelinux-64", + "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "8af2121088c7e6f5ebdb6d5900403240", "iso_checksum_type": "md5", @@ -70,6 +72,7 @@ "boot_wait": "10s", "disk_size": 40960, "guest_os_type": "centos", + "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "8af2121088c7e6f5ebdb6d5900403240", "iso_checksum_type": "md5", @@ -131,6 +134,7 @@ "box_basename": "oracle-5.11", "build_timestamp": "{{isotime \"20060102150405\"}}", "git_revision": "__unknown_git_revision__", + "headless": "", "metadata": "floppy/dummy_metadata.json", "mirror": "http://mirrors.dotsrc.org/oracle-linux/EL5/U11/x86_64", "name": "oracle-5.11", diff --git a/oracle-6.6-i386.json b/oracle-6.6-i386.json index ae440686e..4148e1a65 100644 --- a/oracle-6.6-i386.json +++ b/oracle-6.6-i386.json @@ -9,6 +9,7 @@ "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "guest_os_type": "Oracle", "hard_drive_interface": "sata", + "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "81f0c85217f40763dea5053ec5594e4958498bbc", "iso_checksum_type": "sha1", @@ -44,6 +45,7 @@ "boot_wait": "10s", "disk_size": 40960, "guest_os_type": "oraclelinux", + "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "81f0c85217f40763dea5053ec5594e4958498bbc", "iso_checksum_type": "sha1", @@ -70,6 +72,7 @@ "boot_wait": "10s", "disk_size": 40960, "guest_os_type": "centos", + "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "81f0c85217f40763dea5053ec5594e4958498bbc", "iso_checksum_type": "sha1", @@ -132,6 +135,7 @@ "box_basename": "oracle-6.6-i386", "build_timestamp": "{{isotime \"20060102150405\"}}", "git_revision": "__unknown_git_revision__", + "headless": "", "metadata": "floppy/dummy_metadata.json", "mirror": "http://mirrors.dotsrc.org/oracle-linux/OL6/U6/i386", "name": "oracle-6.6-i386", diff --git a/oracle-6.6-x86_64.json b/oracle-6.6-x86_64.json index f0cc8cd13..97e99ed7e 100644 --- a/oracle-6.6-x86_64.json +++ b/oracle-6.6-x86_64.json @@ -9,6 +9,7 @@ "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "guest_os_type": "Oracle_64", "hard_drive_interface": "sata", + "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "5738f10a506d3630edfd297ef179b553091c6a48", "iso_checksum_type": "sha1", @@ -44,6 +45,7 @@ "boot_wait": "10s", "disk_size": 40960, "guest_os_type": "oraclelinux-64", + "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "5738f10a506d3630edfd297ef179b553091c6a48", "iso_checksum_type": "sha1", @@ -70,6 +72,7 @@ "boot_wait": "10s", "disk_size": 40960, "guest_os_type": "centos", + "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "5738f10a506d3630edfd297ef179b553091c6a48", "iso_checksum_type": "sha1", @@ -132,6 +135,7 @@ "box_basename": "oracle-6.6", "build_timestamp": "{{isotime \"20060102150405\"}}", "git_revision": "__unknown_git_revision__", + "headless": "", "metadata": "floppy/dummy_metadata.json", "mirror": "http://mirrors.dotsrc.org/oracle-linux/OL6/U6/x86_64", "name": "oracle-6.6", diff --git a/rhel-5.11-i386.json b/rhel-5.11-i386.json index d1b3aa3aa..6b39c0baa 100644 --- a/rhel-5.11-i386.json +++ b/rhel-5.11-i386.json @@ -9,6 +9,7 @@ "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "guest_os_type": "RedHat", "hard_drive_interface": "sata", + "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "4e38e4ed06d83efb10446e7db19d96761715cdbdbf0bbfacb978b44ce368bbe2", "iso_checksum_type": "sha256", @@ -44,6 +45,7 @@ "boot_wait": "10s", "disk_size": 40960, "guest_os_type": "redhat", + "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "4e38e4ed06d83efb10446e7db19d96761715cdbdbf0bbfacb978b44ce368bbe2", "iso_checksum_type": "sha256", @@ -70,6 +72,7 @@ "boot_wait": "10s", "disk_size": 40960, "guest_os_type": "rhel", + "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "4e38e4ed06d83efb10446e7db19d96761715cdbdbf0bbfacb978b44ce368bbe2", "iso_checksum_type": "sha256", @@ -131,6 +134,7 @@ "box_basename": "rhel-5.11-i386", "build_timestamp": "{{isotime \"20060102150405\"}}", "git_revision": "__unknown_git_revision__", + "headless": "", "metadata": "floppy/dummy_metadata.json", "mirror": "https://content-web.rhn.redhat.com/rhn/isos/rhel-5.11/md5sum/1ab756241a4a209b8d39abe6bace84a9", "name": "rhel-5.11-i386", diff --git a/rhel-5.11-x86_64.json b/rhel-5.11-x86_64.json index d0d04a3d7..7f2ce981e 100644 --- a/rhel-5.11-x86_64.json +++ b/rhel-5.11-x86_64.json @@ -9,6 +9,7 @@ "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "guest_os_type": "RedHat_64", "hard_drive_interface": "sata", + "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "36565fe0c8a97207d63234d10123daeedb29d509576dbd7b34e71958ac2f9050", "iso_checksum_type": "sha256", @@ -44,6 +45,7 @@ "boot_wait": "10s", "disk_size": 40960, "guest_os_type": "rhel5-64", + "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "36565fe0c8a97207d63234d10123daeedb29d509576dbd7b34e71958ac2f9050", "iso_checksum_type": "sha256", @@ -70,6 +72,7 @@ "boot_wait": "10s", "disk_size": 40960, "guest_os_type": "rhel", + "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "36565fe0c8a97207d63234d10123daeedb29d509576dbd7b34e71958ac2f9050", "iso_checksum_type": "sha256", @@ -131,6 +134,7 @@ "box_basename": "rhel-5.11", "build_timestamp": "{{isotime \"20060102150405\"}}", "git_revision": "__unknown_git_revision__", + "headless": "", "metadata": "floppy/dummy_metadata.json", "mirror": "https://content-web.rhn.redhat.com/rhn/isos/rhel-5.11/md5sum/86cc2d5548ee2ff9c8d3e2b4db3e6001", "name": "rhel-5.11", diff --git a/rhel-6.6-i386.json b/rhel-6.6-i386.json index a6e3e62c0..53700c145 100644 --- a/rhel-6.6-i386.json +++ b/rhel-6.6-i386.json @@ -9,6 +9,7 @@ "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "guest_os_type": "RedHat", "hard_drive_interface": "sata", + "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "0a14ed1f7d7ea7b831739ed8e71719d9cb7c294bf801e8db39358651768547ad", "iso_checksum_type": "sha256", @@ -44,6 +45,7 @@ "boot_wait": "10s", "disk_size": 40960, "guest_os_type": "redhat", + "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "0a14ed1f7d7ea7b831739ed8e71719d9cb7c294bf801e8db39358651768547ad", "iso_checksum_type": "sha256", @@ -70,6 +72,7 @@ "boot_wait": "10s", "disk_size": 40960, "guest_os_type": "rhel", + "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "0a14ed1f7d7ea7b831739ed8e71719d9cb7c294bf801e8db39358651768547ad", "iso_checksum_type": "sha256", @@ -132,6 +135,7 @@ "box_basename": "rhel-6.6-i386", "build_timestamp": "{{isotime \"20060102150405\"}}", "git_revision": "__unknown_git_revision__", + "headless": "", "metadata": "floppy/dummy_metadata.json", "mirror": "https://content-web.rhn.redhat.com/rhn/isos/rhel-6.6/md5sum/64e687f958db92feccc3f7701a8771f8", "name": "rhel-6.6-i386", diff --git a/rhel-6.6-x86_64.json b/rhel-6.6-x86_64.json index bec62625e..036f53a1d 100644 --- a/rhel-6.6-x86_64.json +++ b/rhel-6.6-x86_64.json @@ -9,6 +9,7 @@ "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "guest_os_type": "RedHat_64", "hard_drive_interface": "sata", + "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "16044cb7264f4bc0150f5b6f3f66936ccf2d36e0a4152c00d9236fb7dcae5f32", "iso_checksum_type": "sha256", @@ -44,6 +45,7 @@ "boot_wait": "10s", "disk_size": 40960, "guest_os_type": "rhel6-64", + "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "16044cb7264f4bc0150f5b6f3f66936ccf2d36e0a4152c00d9236fb7dcae5f32", "iso_checksum_type": "sha256", @@ -70,6 +72,7 @@ "boot_wait": "10s", "disk_size": 40960, "guest_os_type": "rhel", + "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "16044cb7264f4bc0150f5b6f3f66936ccf2d36e0a4152c00d9236fb7dcae5f32", "iso_checksum_type": "sha256", @@ -132,6 +135,7 @@ "box_basename": "rhel-6.6", "build_timestamp": "{{isotime \"20060102150405\"}}", "git_revision": "__unknown_git_revision__", + "headless": "", "metadata": "floppy/dummy_metadata.json", "mirror": "https://content-web.rhn.redhat.com/rhn/isos/rhel-6.6/md5sum/ef031b0ae8458d6489eb277ba1dcb5de", "name": "rhel-6.6", diff --git a/rhel-7.1-x86_64.json b/rhel-7.1-x86_64.json index 678848ba7..0cd97a347 100644 --- a/rhel-7.1-x86_64.json +++ b/rhel-7.1-x86_64.json @@ -9,6 +9,7 @@ "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "guest_os_type": "RedHat_64", "hard_drive_interface": "sata", + "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "3685468ec6cdcb70dfc85ebbc164da427dc2d762644c3c2ee1520f4f661c15ce", "iso_checksum_type": "sha256", @@ -44,6 +45,7 @@ "boot_wait": "10s", "disk_size": 40960, "guest_os_type": "rhel7-64", + "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "3685468ec6cdcb70dfc85ebbc164da427dc2d762644c3c2ee1520f4f661c15ce", "iso_checksum_type": "sha256", @@ -70,6 +72,7 @@ "boot_wait": "10s", "disk_size": 40960, "guest_os_type": "rhel", + "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "3685468ec6cdcb70dfc85ebbc164da427dc2d762644c3c2ee1520f4f661c15ce", "iso_checksum_type": "sha256", @@ -132,6 +135,7 @@ "box_basename": "rhel-7.1", "build_timestamp": "{{isotime \"20060102150405\"}}", "git_revision": "__unknown_git_revision__", + "headless": "", "metadata": "floppy/dummy_metadata.json", "mirror": "http://put-your-mirror-here/", "name": "rhel-7.1", diff --git a/sles-11-sp2-i386.json b/sles-11-sp2-i386.json index 2390582a0..9ade10472 100644 --- a/sles-11-sp2-i386.json +++ b/sles-11-sp2-i386.json @@ -13,6 +13,7 @@ "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "guest_os_type": "OpenSUSE", "hard_drive_interface": "sata", + "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "a0b34f6237b2b2a6b2174c82b40ed326", "iso_checksum_type": "md5", @@ -52,6 +53,7 @@ "boot_wait": "10s", "disk_size": 20480, "guest_os_type": "sles11", + "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "a0b34f6237b2b2a6b2174c82b40ed326", "iso_checksum_type": "md5", @@ -82,6 +84,7 @@ "boot_wait": "10s", "disk_size": 20480, "guest_os_type": "suse", + "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "a0b34f6237b2b2a6b2174c82b40ed326", "iso_checksum_type": "md5", @@ -145,6 +148,7 @@ "box_basename": "sles-11-sp2-i386", "build_timestamp": "{{isotime \"20060102150405\"}}", "git_revision": "__unknown_git_revision__", + "headless": "", "metadata": "floppy/dummy_metadata.json", "mirror": "http://cdn2.novell.com/prot/FkjGyLMMiss~", "name": "sles-11-sp2-i386", diff --git a/sles-11-sp2-x86_64.json b/sles-11-sp2-x86_64.json index 91af54993..03ed7dab7 100644 --- a/sles-11-sp2-x86_64.json +++ b/sles-11-sp2-x86_64.json @@ -13,6 +13,7 @@ "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "guest_os_type": "OpenSUSE_64", "hard_drive_interface": "sata", + "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "461d82ae6e15062b0807c1338f040497", "iso_checksum_type": "md5", @@ -52,6 +53,7 @@ "boot_wait": "10s", "disk_size": 20480, "guest_os_type": "sles11-64", + "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "461d82ae6e15062b0807c1338f040497", "iso_checksum_type": "md5", @@ -82,6 +84,7 @@ "boot_wait": "10s", "disk_size": 20480, "guest_os_type": "suse", + "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "461d82ae6e15062b0807c1338f040497", "iso_checksum_type": "md5", @@ -144,6 +147,7 @@ "box_basename": "sles-11-sp2", "build_timestamp": "{{isotime \"20060102150405\"}}", "git_revision": "__unknown_git_revision__", + "headless": "", "metadata": "floppy/dummy_metadata.json", "mirror": "http://cdn.novell.com/free/h0AOp5AT-18~", "name": "sles-11-sp2", diff --git a/sles-11-sp3-i386.json b/sles-11-sp3-i386.json index 9e0177fda..6c742268e 100644 --- a/sles-11-sp3-i386.json +++ b/sles-11-sp3-i386.json @@ -13,6 +13,7 @@ "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "guest_os_type": "OpenSUSE", "hard_drive_interface": "sata", + "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "5c30a409fc8fb3343b4dc90d93ff2c89", "iso_checksum_type": "md5", @@ -52,6 +53,7 @@ "boot_wait": "10s", "disk_size": 20480, "guest_os_type": "sles11", + "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "5c30a409fc8fb3343b4dc90d93ff2c89", "iso_checksum_type": "md5", @@ -82,6 +84,7 @@ "boot_wait": "10s", "disk_size": 20480, "guest_os_type": "suse", + "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "5c30a409fc8fb3343b4dc90d93ff2c89", "iso_checksum_type": "md5", @@ -145,6 +148,7 @@ "box_basename": "sles-11-sp3-i386", "build_timestamp": "{{isotime \"20060102150405\"}}", "git_revision": "__unknown_git_revision__", + "headless": "", "metadata": "floppy/dummy_metadata.json", "mirror": "http://cdn2.novell.com/prot/4uiuDMzX0ck~", "name": "sles-11-sp3-i386", diff --git a/sles-11-sp3-x86_64.json b/sles-11-sp3-x86_64.json index 418dfc5ea..731a39a5b 100644 --- a/sles-11-sp3-x86_64.json +++ b/sles-11-sp3-x86_64.json @@ -13,6 +13,7 @@ "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "guest_os_type": "OpenSUSE_64", "hard_drive_interface": "sata", + "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "480b70d50cbb538382dc2b9325221e1b", "iso_checksum_type": "md5", @@ -52,6 +53,7 @@ "boot_wait": "10s", "disk_size": 20480, "guest_os_type": "sles11-64", + "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "480b70d50cbb538382dc2b9325221e1b", "iso_checksum_type": "md5", @@ -82,6 +84,7 @@ "boot_wait": "10s", "disk_size": 20480, "guest_os_type": "suse", + "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "480b70d50cbb538382dc2b9325221e1b", "iso_checksum_type": "md5", @@ -145,6 +148,7 @@ "box_basename": "sles-11-sp3", "build_timestamp": "{{isotime \"20060102150405\"}}", "git_revision": "__unknown_git_revision__", + "headless": "", "metadata": "floppy/dummy_metadata.json", "mirror": "http://cdn2.novell.com/prot/Q_VbW21BiB4~", "name": "sles-11-sp3", diff --git a/sles-12-x86_64.json b/sles-12-x86_64.json index 2cbe098fa..5a7e9cba3 100644 --- a/sles-12-x86_64.json +++ b/sles-12-x86_64.json @@ -13,6 +13,7 @@ "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "guest_os_type": "OpenSUSE_64", "hard_drive_interface": "sata", + "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "58086fca0441b1d44c7a51c5ee64e1bd4365466fcee48ec92c4f39d07739aeed", "iso_checksum_type": "sha256", @@ -52,6 +53,7 @@ "boot_wait": "10s", "disk_size": 20480, "guest_os_type": "sles11-64", + "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "58086fca0441b1d44c7a51c5ee64e1bd4365466fcee48ec92c4f39d07739aeed", "iso_checksum_type": "sha256", @@ -82,6 +84,7 @@ "boot_wait": "10s", "disk_size": 20480, "guest_os_type": "suse", + "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "58086fca0441b1d44c7a51c5ee64e1bd4365466fcee48ec92c4f39d07739aeed", "iso_checksum_type": "sha256", @@ -147,6 +150,7 @@ "box_basename": "sles-12", "build_timestamp": "{{isotime \"20060102150405\"}}", "git_revision": "__unknown_git_revision__", + "headless": "", "metadata": "floppy/dummy_metadata.json", "mirror": "http://cdn2.novell.com/prot/Q_VbW21BiB4~", "name": "sles-12", diff --git a/solaris-10.11-x86.json b/solaris-10.11-x86.json index c4a322bb6..78d186509 100644 --- a/solaris-10.11-x86.json +++ b/solaris-10.11-x86.json @@ -21,6 +21,7 @@ ], "guest_additions_mode": "upload", "guest_os_type": "Solaris_64", + "headless": "{{ user `headless` }}", "http_directory": "http/solaris-10", "iso_checksum": "aae1452bb3d56baa3dcb8866ce7e4a08", "iso_checksum_type": "md5", @@ -70,6 +71,7 @@ "floppy/solaris10/finish.sh" ], "guest_os_type": "solaris10-64", + "headless": "{{ user `headless` }}", "http_directory": "http/solaris-10", "iso_checksum": "aae1452bb3d56baa3dcb8866ce7e4a08", "iso_checksum_type": "md5", @@ -122,6 +124,7 @@ "box_basename": "solaris-10.11", "build_timestamp": "{{isotime \"20060102150405\"}}", "git_revision": "__unknown_git_revision__", + "headless": "", "metadata": "floppy/dummy_metadata.json", "mirror": "./packer_cache", "name": "solaris-10.11", diff --git a/solaris-11-x86.json b/solaris-11-x86.json index 22220f4bb..a1781fe5e 100644 --- a/solaris-11-x86.json +++ b/solaris-11-x86.json @@ -32,6 +32,7 @@ "disk_size": 10360, "guest_additions_mode": "attach", "guest_os_type": "Solaris11_64", + "headless": "{{ user `headless` }}", "http_directory": "http/solaris-11", "iso_checksum": "2b3859bb7532cfe42214349dff9fcc23", "iso_checksum_type": "md5", @@ -92,6 +93,7 @@ "boot_wait": "5s", "disk_size": 10360, "guest_os_type": "solaris11-64", + "headless": "{{ user `headless` }}", "http_directory": "http/solaris-11", "iso_checksum": "2b3859bb7532cfe42214349dff9fcc23", "iso_checksum_type": "md5", @@ -144,6 +146,7 @@ "box_basename": "solaris-11.2", "build_timestamp": "{{isotime \"20060102150405\"}}", "git_revision": "__unknown_git_revision__", + "headless": "", "metadata": "floppy/dummy_metadata.json", "mirror": "./packer_cache", "name": "solaris-11.2", diff --git a/ubuntu-10.04-amd64.json b/ubuntu-10.04-amd64.json index bba814630..72102942a 100644 --- a/ubuntu-10.04-amd64.json +++ b/ubuntu-10.04-amd64.json @@ -30,6 +30,7 @@ "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "guest_os_type": "Ubuntu_64", "hard_drive_interface": "sata", + "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", @@ -86,6 +87,7 @@ "boot_wait": "10s", "disk_size": 40960, "guest_os_type": "ubuntu-64", + "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", @@ -133,6 +135,7 @@ "boot_wait": "10s", "disk_size": 40960, "guest_os_type": "ubuntu", + "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", @@ -201,6 +204,7 @@ "box_basename": "__unset_box_basename__", "build_timestamp": "{{isotime \"20060102150405\"}}", "git_revision": "__unknown_git_revision__", + "headless": "", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", "iso_checksum": "796e80702d65f2ee96e88874a1ab437e24df9cd6", diff --git a/ubuntu-10.04-i386.json b/ubuntu-10.04-i386.json index d7fdbbf70..ad8513433 100644 --- a/ubuntu-10.04-i386.json +++ b/ubuntu-10.04-i386.json @@ -30,6 +30,7 @@ "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "guest_os_type": "Ubuntu", "hard_drive_interface": "sata", + "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", @@ -86,6 +87,7 @@ "boot_wait": "10s", "disk_size": 40960, "guest_os_type": "ubuntu", + "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", @@ -133,6 +135,7 @@ "boot_wait": "10s", "disk_size": 40960, "guest_os_type": "ubuntu", + "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", @@ -201,6 +204,7 @@ "box_basename": "__unset_box_basename__", "build_timestamp": "{{isotime \"20060102150405\"}}", "git_revision": "__unknown_git_revision__", + "headless": "", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", "iso_checksum": "5695d8b6b914269d1374ac8d4c3dd3786e92d3fe", diff --git a/ubuntu-12.04-amd64.json b/ubuntu-12.04-amd64.json index 61d0d931b..d61162671 100644 --- a/ubuntu-12.04-amd64.json +++ b/ubuntu-12.04-amd64.json @@ -30,6 +30,7 @@ "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "guest_os_type": "Ubuntu_64", "hard_drive_interface": "sata", + "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", @@ -86,6 +87,7 @@ "boot_wait": "10s", "disk_size": 40960, "guest_os_type": "ubuntu-64", + "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", @@ -133,6 +135,7 @@ "boot_wait": "10s", "disk_size": 40960, "guest_os_type": "ubuntu", + "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", @@ -201,6 +204,7 @@ "box_basename": "__unset_box_basename__", "build_timestamp": "{{isotime \"20060102150405\"}}", "git_revision": "__unknown_git_revision__", + "headless": "", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", "iso_checksum": "7540ace2d6cdee264432f5ed987236d32edef798", diff --git a/ubuntu-12.04-i386.json b/ubuntu-12.04-i386.json index 8557f77cd..9aed4571b 100644 --- a/ubuntu-12.04-i386.json +++ b/ubuntu-12.04-i386.json @@ -30,6 +30,7 @@ "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "guest_os_type": "Ubuntu", "hard_drive_interface": "sata", + "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", @@ -86,6 +87,7 @@ "boot_wait": "10s", "disk_size": 40960, "guest_os_type": "ubuntu", + "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", @@ -133,6 +135,7 @@ "boot_wait": "10s", "disk_size": 40960, "guest_os_type": "ubuntu", + "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", @@ -201,6 +204,7 @@ "box_basename": "__unset_box_basename__", "build_timestamp": "{{isotime \"20060102150405\"}}", "git_revision": "__unknown_git_revision__", + "headless": "", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", "iso_checksum": "a34c224b7fe72a2f5c768be5afee5c53817743fd", diff --git a/ubuntu-14.04-amd64.json b/ubuntu-14.04-amd64.json index 6af7de9b4..3e25d9e57 100644 --- a/ubuntu-14.04-amd64.json +++ b/ubuntu-14.04-amd64.json @@ -30,6 +30,7 @@ "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "guest_os_type": "Ubuntu_64", "hard_drive_interface": "sata", + "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", @@ -86,6 +87,7 @@ "boot_wait": "10s", "disk_size": 40960, "guest_os_type": "ubuntu-64", + "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", @@ -133,6 +135,7 @@ "boot_wait": "10s", "disk_size": 40960, "guest_os_type": "ubuntu", + "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", @@ -201,6 +204,7 @@ "box_basename": "__unset_box_basename__", "build_timestamp": "{{isotime \"20060102150405\"}}", "git_revision": "__unknown_git_revision__", + "headless": "", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", "iso_checksum": "8acd2f56bfcba2f7ac74a7e4a5e565ce68c024c38525c0285573e41c86ae90c0", diff --git a/ubuntu-14.04-i386.json b/ubuntu-14.04-i386.json index bafbb32bb..e91f9e55b 100644 --- a/ubuntu-14.04-i386.json +++ b/ubuntu-14.04-i386.json @@ -30,6 +30,7 @@ "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "guest_os_type": "Ubuntu", "hard_drive_interface": "sata", + "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", @@ -86,6 +87,7 @@ "boot_wait": "10s", "disk_size": 40960, "guest_os_type": "ubuntu", + "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", @@ -133,6 +135,7 @@ "boot_wait": "10s", "disk_size": 40960, "guest_os_type": "ubuntu", + "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", @@ -201,6 +204,7 @@ "box_basename": "__unset_box_basename__", "build_timestamp": "{{isotime \"20060102150405\"}}", "git_revision": "__unknown_git_revision__", + "headless": "", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", "iso_checksum": "76524ab9502a34b983ed56af2d5a72835ce41aec1e2b4c0cb7788ef596958ed6", diff --git a/ubuntu-14.10-amd64.json b/ubuntu-14.10-amd64.json index f19074d2e..afe4894fa 100644 --- a/ubuntu-14.10-amd64.json +++ b/ubuntu-14.10-amd64.json @@ -30,6 +30,7 @@ "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "guest_os_type": "Ubuntu_64", "hard_drive_interface": "sata", + "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", @@ -86,6 +87,7 @@ "boot_wait": "10s", "disk_size": 40960, "guest_os_type": "ubuntu-64", + "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", @@ -133,6 +135,7 @@ "boot_wait": "10s", "disk_size": 40960, "guest_os_type": "ubuntu", + "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", @@ -201,6 +204,7 @@ "box_basename": "__unset_box_basename__", "build_timestamp": "{{isotime \"20060102150405\"}}", "git_revision": "__unknown_git_revision__", + "headless": "", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", "iso_checksum": "0c1ebea31c3523cfe9a4ffed8bcf6c7d23dfb97b", diff --git a/ubuntu-14.10-i386.json b/ubuntu-14.10-i386.json index 052380c0d..a509d3740 100644 --- a/ubuntu-14.10-i386.json +++ b/ubuntu-14.10-i386.json @@ -30,6 +30,7 @@ "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "guest_os_type": "Ubuntu", "hard_drive_interface": "sata", + "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", @@ -86,6 +87,7 @@ "boot_wait": "10s", "disk_size": 40960, "guest_os_type": "ubuntu", + "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", @@ -133,6 +135,7 @@ "boot_wait": "10s", "disk_size": 40960, "guest_os_type": "ubuntu", + "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", @@ -201,6 +204,7 @@ "box_basename": "__unset_box_basename__", "build_timestamp": "{{isotime \"20060102150405\"}}", "git_revision": "__unknown_git_revision__", + "headless": "", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", "iso_checksum": "26faf47df2162f4ff83e38e6831dd169da6db95f", diff --git a/ubuntu-15.04-amd64.json b/ubuntu-15.04-amd64.json index 96245a88b..f1eba53bd 100644 --- a/ubuntu-15.04-amd64.json +++ b/ubuntu-15.04-amd64.json @@ -30,6 +30,7 @@ "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "guest_os_type": "Ubuntu_64", "hard_drive_interface": "sata", + "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", @@ -86,6 +87,7 @@ "boot_wait": "10s", "disk_size": 40960, "guest_os_type": "ubuntu-64", + "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", @@ -133,6 +135,7 @@ "boot_wait": "10s", "disk_size": 40960, "guest_os_type": "ubuntu", + "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", @@ -201,6 +204,7 @@ "box_basename": "__unset_box_basename__", "build_timestamp": "{{isotime \"20060102150405\"}}", "git_revision": "__unknown_git_revision__", + "headless": "", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", "iso_checksum": "6501c8545374665823384bbb6235f865108f56d8a30bbf69dd18df73c14ccb84", diff --git a/ubuntu-15.04-i386.json b/ubuntu-15.04-i386.json index 43b521e61..0d130baf7 100644 --- a/ubuntu-15.04-i386.json +++ b/ubuntu-15.04-i386.json @@ -30,6 +30,7 @@ "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "guest_os_type": "Ubuntu", "hard_drive_interface": "sata", + "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", @@ -86,6 +87,7 @@ "boot_wait": "10s", "disk_size": 40960, "guest_os_type": "ubuntu", + "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", @@ -133,6 +135,7 @@ "boot_wait": "10s", "disk_size": 40960, "guest_os_type": "ubuntu", + "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", @@ -201,6 +204,7 @@ "box_basename": "__unset_box_basename__", "build_timestamp": "{{isotime \"20060102150405\"}}", "git_revision": "__unknown_git_revision__", + "headless": "", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", "iso_checksum": "f510169ddc03121d11a627ae3a231e1272d8e4d75f9ef76f73daa5b809c5b6d8", From b179de799229adc3141003dd01963e6085c143cf Mon Sep 17 00:00:00 2001 From: Seth Thomas <sthomas@chef.io> Date: Fri, 10 Jul 2015 17:02:29 -0700 Subject: [PATCH 0367/1622] Shortening vm_name to avoid Parallels box corruption --- centos-5.11-i386.json | 6 +++--- centos-5.11-x86_64.json | 6 +++--- centos-6.6-i386.json | 6 +++--- centos-6.6-x86_64.json | 6 +++--- centos-7.1-x86_64.json | 6 +++--- debian-6.0.10-amd64.json | 6 +++--- debian-6.0.10-i386.json | 6 +++--- debian-7.8-amd64.json | 6 +++--- debian-7.8-i386.json | 6 +++--- debian-8.1-amd64.json | 6 +++--- debian-8.1-i386.json | 6 +++--- fedora-20-i386.json | 6 +++--- fedora-20-x86_64.json | 6 +++--- fedora-21-i386.json | 6 +++--- fedora-21-x86_64.json | 6 +++--- freebsd-10.1-amd64.json | 6 +++--- freebsd-10.1-i386.json | 6 +++--- freebsd-9.3-amd64.json | 6 +++--- freebsd-9.3-i386.json | 6 +++--- macosx-10.10.json | 4 ++-- macosx-10.7.json | 4 ++-- macosx-10.8.json | 4 ++-- macosx-10.9.json | 4 ++-- omnios-r151010j.json | 6 +++--- opensuse-13.2-i386.json | 6 +++--- opensuse-13.2-x86_64.json | 6 +++--- oracle-5.11-i386.json | 6 +++--- oracle-5.11-x86_64.json | 6 +++--- oracle-6.6-i386.json | 6 +++--- oracle-6.6-x86_64.json | 6 +++--- rhel-5.11-i386.json | 6 +++--- rhel-5.11-x86_64.json | 6 +++--- rhel-6.6-i386.json | 6 +++--- rhel-6.6-x86_64.json | 6 +++--- rhel-7.1-x86_64.json | 6 +++--- sles-11-sp2-i386.json | 6 +++--- sles-11-sp2-x86_64.json | 6 +++--- sles-11-sp3-i386.json | 6 +++--- sles-11-sp3-x86_64.json | 6 +++--- sles-12-x86_64.json | 6 +++--- solaris-10.11-x86.json | 4 ++-- solaris-11-x86.json | 4 ++-- ubuntu-10.04-amd64.json | 6 +++--- ubuntu-10.04-i386.json | 6 +++--- ubuntu-12.04-amd64.json | 6 +++--- ubuntu-12.04-i386.json | 6 +++--- ubuntu-14.04-amd64.json | 6 +++--- ubuntu-14.04-i386.json | 6 +++--- ubuntu-14.10-amd64.json | 6 +++--- ubuntu-14.10-i386.json | 6 +++--- ubuntu-15.04-amd64.json | 6 +++--- ubuntu-15.04-i386.json | 6 +++--- 52 files changed, 150 insertions(+), 150 deletions(-) diff --git a/centos-5.11-i386.json b/centos-5.11-i386.json index 25621e5be..a1cab1738 100644 --- a/centos-5.11-i386.json +++ b/centos-5.11-i386.json @@ -36,7 +36,7 @@ ] ], "virtualbox_version_file": ".vbox_version", - "vm_name": "packer-{{user `template`}}-virtualbox" + "vm_name": "{{ user `template` }}" }, { "boot_command": [ @@ -58,7 +58,7 @@ "ssh_wait_timeout": "10000s", "tools_upload_flavor": "linux", "type": "vmware-iso", - "vm_name": "packer-{{user `template`}}-vmware", + "vm_name": "{{ user `template` }}", "vmx_data": { "cpuid.coresPerSocket": "1", "memsize": "480", @@ -100,7 +100,7 @@ "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", "type": "parallels-iso", - "vm_name": "packer-{{user `template`}}-parallels" + "vm_name": "{{ user `template` }}" } ], "post-processors": [ diff --git a/centos-5.11-x86_64.json b/centos-5.11-x86_64.json index b8aaad4ee..8590ac75f 100644 --- a/centos-5.11-x86_64.json +++ b/centos-5.11-x86_64.json @@ -36,7 +36,7 @@ ] ], "virtualbox_version_file": ".vbox_version", - "vm_name": "packer-{{user `template`}}-virtualbox" + "vm_name": "{{ user `template` }}" }, { "boot_command": [ @@ -58,7 +58,7 @@ "ssh_wait_timeout": "10000s", "tools_upload_flavor": "linux", "type": "vmware-iso", - "vm_name": "packer-{{user `template`}}-vmware", + "vm_name": "{{ user `template` }}", "vmx_data": { "cpuid.coresPerSocket": "1", "memsize": "480", @@ -100,7 +100,7 @@ "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", "type": "parallels-iso", - "vm_name": "packer-{{user `template`}}-parallels" + "vm_name": "{{ user `template` }}" } ], "post-processors": [ diff --git a/centos-6.6-i386.json b/centos-6.6-i386.json index 36f8580d4..9ad7a922a 100644 --- a/centos-6.6-i386.json +++ b/centos-6.6-i386.json @@ -36,7 +36,7 @@ ] ], "virtualbox_version_file": ".vbox_version", - "vm_name": "packer-{{user `template`}}-virtualbox" + "vm_name": "{{ user `template` }}" }, { "boot_command": [ @@ -58,7 +58,7 @@ "ssh_wait_timeout": "10000s", "tools_upload_flavor": "linux", "type": "vmware-iso", - "vm_name": "packer-{{user `template`}}-vmware", + "vm_name": "{{ user `template` }}", "vmx_data": { "cpuid.coresPerSocket": "1", "memsize": "480", @@ -100,7 +100,7 @@ "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", "type": "parallels-iso", - "vm_name": "packer-{{user `template`}}-parallels" + "vm_name": "{{ user `template` }}" } ], "post-processors": [ diff --git a/centos-6.6-x86_64.json b/centos-6.6-x86_64.json index ad39eaa26..8b8c34354 100644 --- a/centos-6.6-x86_64.json +++ b/centos-6.6-x86_64.json @@ -36,7 +36,7 @@ ] ], "virtualbox_version_file": ".vbox_version", - "vm_name": "packer-{{user `template`}}-virtualbox" + "vm_name": "{{ user `template` }}" }, { "boot_command": [ @@ -58,7 +58,7 @@ "ssh_wait_timeout": "10000s", "tools_upload_flavor": "linux", "type": "vmware-iso", - "vm_name": "packer-{{user `template`}}-vmware", + "vm_name": "{{ user `template` }}", "vmx_data": { "cpuid.coresPerSocket": "1", "memsize": "480", @@ -100,7 +100,7 @@ "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", "type": "parallels-iso", - "vm_name": "packer-{{user `template`}}-parallels" + "vm_name": "{{ user `template` }}" } ], "post-processors": [ diff --git a/centos-7.1-x86_64.json b/centos-7.1-x86_64.json index 8e7246a45..ef965b66c 100644 --- a/centos-7.1-x86_64.json +++ b/centos-7.1-x86_64.json @@ -36,7 +36,7 @@ ] ], "virtualbox_version_file": ".vbox_version", - "vm_name": "packer-{{user `template`}}-virtualbox" + "vm_name": "{{ user `template` }}" }, { "boot_command": [ @@ -58,7 +58,7 @@ "ssh_wait_timeout": "10000s", "tools_upload_flavor": "linux", "type": "vmware-iso", - "vm_name": "packer-{{user `template`}}-vmware", + "vm_name": "{{ user `template` }}", "vmx_data": { "cpuid.coresPerSocket": "1", "memsize": "480", @@ -100,7 +100,7 @@ "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", "type": "parallels-iso", - "vm_name": "packer-{{user `template`}}-parallels" + "vm_name": "{{ user `template` }}" } ], "post-processors": [ diff --git a/debian-6.0.10-amd64.json b/debian-6.0.10-amd64.json index b844e6a9d..a3d16192a 100644 --- a/debian-6.0.10-amd64.json +++ b/debian-6.0.10-amd64.json @@ -50,7 +50,7 @@ ] ], "virtualbox_version_file": ".vbox_version", - "vm_name": "packer-debian-6.0.10-amd64" + "vm_name": "{{ user `template` }}" }, { "boot_command": [ @@ -86,7 +86,7 @@ "ssh_wait_timeout": "10000s", "tools_upload_flavor": "linux", "type": "vmware-iso", - "vm_name": "packer-debian-6.0.10-amd64", + "vm_name": "{{ user `template` }}", "vmx_data": { "cpuid.coresPerSocket": "1", "memsize": "384", @@ -142,7 +142,7 @@ "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", "type": "parallels-iso", - "vm_name": "packer-debian-6.0.10-amd64" + "vm_name": "{{ user `template` }}" } ], "post-processors": [ diff --git a/debian-6.0.10-i386.json b/debian-6.0.10-i386.json index 3f0b62286..6ea924875 100644 --- a/debian-6.0.10-i386.json +++ b/debian-6.0.10-i386.json @@ -50,7 +50,7 @@ ] ], "virtualbox_version_file": ".vbox_version", - "vm_name": "packer-debian-6.0.10-i386" + "vm_name": "{{ user `template` }}" }, { "boot_command": [ @@ -86,7 +86,7 @@ "ssh_wait_timeout": "10000s", "tools_upload_flavor": "linux", "type": "vmware-iso", - "vm_name": "packer-debian-6.0.10-i386", + "vm_name": "{{ user `template` }}", "vmx_data": { "cpuid.coresPerSocket": "1", "memsize": "384", @@ -142,7 +142,7 @@ "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", "type": "parallels-iso", - "vm_name": "packer-debian-6.0.10-i386" + "vm_name": "{{ user `template` }}" } ], "post-processors": [ diff --git a/debian-7.8-amd64.json b/debian-7.8-amd64.json index ad404abdc..ea8a1cabb 100644 --- a/debian-7.8-amd64.json +++ b/debian-7.8-amd64.json @@ -50,7 +50,7 @@ ] ], "virtualbox_version_file": ".vbox_version", - "vm_name": "packer-debian-7.8-amd64" + "vm_name": "{{ user `template` }}" }, { "boot_command": [ @@ -86,7 +86,7 @@ "ssh_wait_timeout": "10000s", "tools_upload_flavor": "linux", "type": "vmware-iso", - "vm_name": "packer-debian-7.8-amd64", + "vm_name": "{{ user `template` }}", "vmx_data": { "cpuid.coresPerSocket": "1", "memsize": "384", @@ -142,7 +142,7 @@ "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", "type": "parallels-iso", - "vm_name": "packer-debian-7.8-amd64" + "vm_name": "{{ user `template` }}" } ], "post-processors": [ diff --git a/debian-7.8-i386.json b/debian-7.8-i386.json index 226978e55..f7205deac 100644 --- a/debian-7.8-i386.json +++ b/debian-7.8-i386.json @@ -50,7 +50,7 @@ ] ], "virtualbox_version_file": ".vbox_version", - "vm_name": "packer-debian-7.8-i386" + "vm_name": "{{ user `template` }}" }, { "boot_command": [ @@ -86,7 +86,7 @@ "ssh_wait_timeout": "10000s", "tools_upload_flavor": "linux", "type": "vmware-iso", - "vm_name": "packer-debian-7.8-i386", + "vm_name": "{{ user `template` }}", "vmx_data": { "cpuid.coresPerSocket": "1", "memsize": "384", @@ -142,7 +142,7 @@ "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", "type": "parallels-iso", - "vm_name": "packer-debian-7.8-i386" + "vm_name": "{{ user `template` }}" } ], "post-processors": [ diff --git a/debian-8.1-amd64.json b/debian-8.1-amd64.json index 59379553f..9fbd149f8 100644 --- a/debian-8.1-amd64.json +++ b/debian-8.1-amd64.json @@ -50,7 +50,7 @@ ] ], "virtualbox_version_file": ".vbox_version", - "vm_name": "packer-debian-8.1-amd64" + "vm_name": "{{ user `template` }}" }, { "boot_command": [ @@ -86,7 +86,7 @@ "ssh_wait_timeout": "10000s", "tools_upload_flavor": "linux", "type": "vmware-iso", - "vm_name": "packer-debian-8.1-amd64", + "vm_name": "{{ user `template` }}", "vmx_data": { "cpuid.coresPerSocket": "1", "memsize": "384", @@ -142,7 +142,7 @@ "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", "type": "parallels-iso", - "vm_name": "packer-debian-8.1-amd64" + "vm_name": "{{ user `template` }}" } ], "post-processors": [ diff --git a/debian-8.1-i386.json b/debian-8.1-i386.json index d5fcc9c81..a8ef214f4 100644 --- a/debian-8.1-i386.json +++ b/debian-8.1-i386.json @@ -50,7 +50,7 @@ ] ], "virtualbox_version_file": ".vbox_version", - "vm_name": "packer-debian-8.1-i386" + "vm_name": "{{ user `template` }}" }, { "boot_command": [ @@ -86,7 +86,7 @@ "ssh_wait_timeout": "10000s", "tools_upload_flavor": "linux", "type": "vmware-iso", - "vm_name": "packer-debian-8.1-i386", + "vm_name": "{{ user `template` }}", "vmx_data": { "cpuid.coresPerSocket": "1", "memsize": "384", @@ -142,7 +142,7 @@ "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", "type": "parallels-iso", - "vm_name": "packer-debian-8.1-i386" + "vm_name": "{{ user `template` }}" } ], "post-processors": [ diff --git a/fedora-20-i386.json b/fedora-20-i386.json index 19c7da984..4b255bc54 100644 --- a/fedora-20-i386.json +++ b/fedora-20-i386.json @@ -36,7 +36,7 @@ ] ], "virtualbox_version_file": ".vbox_version", - "vm_name": "packer-fedora-20-i386" + "vm_name": "{{ user `template` }}" }, { "boot_command": [ @@ -58,7 +58,7 @@ "ssh_wait_timeout": "10000s", "tools_upload_flavor": "linux", "type": "vmware-iso", - "vm_name": "packer-fedora-20-i386", + "vm_name": "{{ user `template` }}", "vmx_data": { "cpuid.coresPerSocket": "1", "memsize": "512", @@ -100,7 +100,7 @@ "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", "type": "parallels-iso", - "vm_name": "packer-fedora-20-i386" + "vm_name": "{{ user `template` }}" } ], "post-processors": [ diff --git a/fedora-20-x86_64.json b/fedora-20-x86_64.json index 22479ddb6..844839621 100644 --- a/fedora-20-x86_64.json +++ b/fedora-20-x86_64.json @@ -36,7 +36,7 @@ ] ], "virtualbox_version_file": ".vbox_version", - "vm_name": "packer-fedora-20-x86_64" + "vm_name": "{{ user `template` }}" }, { "boot_command": [ @@ -58,7 +58,7 @@ "ssh_wait_timeout": "10000s", "tools_upload_flavor": "linux", "type": "vmware-iso", - "vm_name": "packer-fedora-20-x86_64", + "vm_name": "{{ user `template` }}", "vmx_data": { "cpuid.coresPerSocket": "1", "memsize": "512", @@ -100,7 +100,7 @@ "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", "type": "parallels-iso", - "vm_name": "packer-fedora-20-x86_64" + "vm_name": "{{ user `template` }}" } ], "post-processors": [ diff --git a/fedora-21-i386.json b/fedora-21-i386.json index 23dde0c53..effdb954c 100644 --- a/fedora-21-i386.json +++ b/fedora-21-i386.json @@ -36,7 +36,7 @@ ] ], "virtualbox_version_file": ".vbox_version", - "vm_name": "packer-fedora-21-i386" + "vm_name": "{{ user `template` }}" }, { "boot_command": [ @@ -58,7 +58,7 @@ "ssh_wait_timeout": "10000s", "tools_upload_flavor": "linux", "type": "vmware-iso", - "vm_name": "packer-fedora-21-i386", + "vm_name": "{{ user `template` }}", "vmx_data": { "cpuid.coresPerSocket": "1", "memsize": "512", @@ -100,7 +100,7 @@ "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", "type": "parallels-iso", - "vm_name": "packer-fedora-21-i386" + "vm_name": "{{ user `template` }}" } ], "post-processors": [ diff --git a/fedora-21-x86_64.json b/fedora-21-x86_64.json index 72428d146..cf677debf 100644 --- a/fedora-21-x86_64.json +++ b/fedora-21-x86_64.json @@ -36,7 +36,7 @@ ] ], "virtualbox_version_file": ".vbox_version", - "vm_name": "packer-fedora-21-x86_64" + "vm_name": "{{ user `template` }}" }, { "boot_command": [ @@ -58,7 +58,7 @@ "ssh_wait_timeout": "10000s", "tools_upload_flavor": "linux", "type": "vmware-iso", - "vm_name": "packer-fedora-21-x86_64", + "vm_name": "{{ user `template` }}", "vmx_data": { "cpuid.coresPerSocket": "1", "memsize": "512", @@ -100,7 +100,7 @@ "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", "type": "parallels-iso", - "vm_name": "packer-fedora-21-x86_64" + "vm_name": "{{ user `template` }}" } ], "post-processors": [ diff --git a/freebsd-10.1-amd64.json b/freebsd-10.1-amd64.json index 0ec5caf0d..bfb86fdb0 100644 --- a/freebsd-10.1-amd64.json +++ b/freebsd-10.1-amd64.json @@ -43,7 +43,7 @@ ] ], "virtualbox_version_file": ".vbox_version", - "vm_name": "packer-freebsd-10.1-amd64" + "vm_name": "{{ user `template` }}" }, { "boot_command": [ @@ -74,7 +74,7 @@ "ssh_wait_timeout": "10000s", "tools_upload_flavor": "freebsd", "type": "vmware-iso", - "vm_name": "packer-freebsd-10.1-amd64", + "vm_name": "{{ user `template` }}", "vmx_data": { "cpuid.coresPerSocket": "1", "memsize": "512", @@ -144,7 +144,7 @@ "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", "type": "parallels-iso", - "vm_name": "packer-freebsd-10.1-amd64" + "vm_name": "{{ user `template` }}" } ], "post-processors": [ diff --git a/freebsd-10.1-i386.json b/freebsd-10.1-i386.json index f1e172562..37e8c61e2 100644 --- a/freebsd-10.1-i386.json +++ b/freebsd-10.1-i386.json @@ -43,7 +43,7 @@ ] ], "virtualbox_version_file": ".vbox_version", - "vm_name": "packer-freebsd-10.1-i386" + "vm_name": "{{ user `template` }}" }, { "boot_command": [ @@ -74,7 +74,7 @@ "ssh_wait_timeout": "10000s", "tools_upload_flavor": "freebsd", "type": "vmware-iso", - "vm_name": "packer-freebsd-10.1-i386", + "vm_name": "{{ user `template` }}", "vmx_data": { "cpuid.coresPerSocket": "1", "memsize": "512", @@ -144,7 +144,7 @@ "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", "type": "parallels-iso", - "vm_name": "packer-freebsd-10.1-amd64" + "vm_name": "{{ user `template` }}" } ], "post-processors": [ diff --git a/freebsd-9.3-amd64.json b/freebsd-9.3-amd64.json index 5274f297d..c038531b1 100644 --- a/freebsd-9.3-amd64.json +++ b/freebsd-9.3-amd64.json @@ -47,7 +47,7 @@ ] ], "virtualbox_version_file": ".vbox_version", - "vm_name": "packer-freebsd-9.3-amd64" + "vm_name": "{{ user `template` }}" }, { "boot_command": [ @@ -82,7 +82,7 @@ "ssh_wait_timeout": "10000s", "tools_upload_flavor": "freebsd", "type": "vmware-iso", - "vm_name": "packer-freebsd-9.3-amd64", + "vm_name": "{{ user `template` }}", "vmx_data": { "cpuid.coresPerSocket": "1", "memsize": "512", @@ -156,7 +156,7 @@ "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", "type": "parallels-iso", - "vm_name": "packer-freebsd-9.3-amd64" + "vm_name": "{{ user `template` }}" } ], "post-processors": [ diff --git a/freebsd-9.3-i386.json b/freebsd-9.3-i386.json index 48e5942bd..9e708df04 100644 --- a/freebsd-9.3-i386.json +++ b/freebsd-9.3-i386.json @@ -47,7 +47,7 @@ ] ], "virtualbox_version_file": ".vbox_version", - "vm_name": "packer-freebsd-9.3-i386" + "vm_name": "{{ user `template` }}" }, { "boot_command": [ @@ -82,7 +82,7 @@ "ssh_wait_timeout": "10000s", "tools_upload_flavor": "freebsd", "type": "vmware-iso", - "vm_name": "packer-freebsd-9.3-i386", + "vm_name": "{{ user `template` }}", "vmx_data": { "cpuid.coresPerSocket": "1", "memsize": "512", @@ -154,7 +154,7 @@ "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", "type": "parallels-iso", - "vm_name": "packer-freebsd-9.3-i386" + "vm_name": "{{ user `template` }}" } ], "post-processors": [ diff --git a/macosx-10.10.json b/macosx-10.10.json index e957192cf..89ad89a34 100644 --- a/macosx-10.10.json +++ b/macosx-10.10.json @@ -18,7 +18,7 @@ "tools_upload_flavor": "darwin", "tools_upload_path": "/tmp/vmtools.iso", "type": "vmware-iso", - "vm_name": "packer-{{user `template`}}-vmware", + "vm_name": "{{ user `template` }}", "vmx_data": { "cpuid.coresPerSocket": "1", "ehci.present": "TRUE", @@ -151,7 +151,7 @@ ] ], "virtualbox_version_file": ".vbox_version", - "vm_name": "packer-{{user `template`}}-virtualbox" + "vm_name": "{{ user `template` }}" } ], "min_packer_version": "0.7.0", diff --git a/macosx-10.7.json b/macosx-10.7.json index 70d968103..ccddcc80a 100644 --- a/macosx-10.7.json +++ b/macosx-10.7.json @@ -18,7 +18,7 @@ "tools_upload_flavor": "darwin", "tools_upload_path": "/tmp/vmtools.iso", "type": "vmware-iso", - "vm_name": "packer-{{user `template`}}-vmware", + "vm_name": "{{ user `template` }}", "vmx_data": { "cpuid.coresPerSocket": "1", "ehci.present": "TRUE", @@ -151,7 +151,7 @@ ] ], "virtualbox_version_file": ".vbox_version", - "vm_name": "packer-{{user `template`}}-virtualbox" + "vm_name": "{{ user `template` }}" } ], "min_packer_version": "0.7.0", diff --git a/macosx-10.8.json b/macosx-10.8.json index d32052ad7..7ecc295ca 100644 --- a/macosx-10.8.json +++ b/macosx-10.8.json @@ -18,7 +18,7 @@ "tools_upload_flavor": "darwin", "tools_upload_path": "/tmp/vmtools.iso", "type": "vmware-iso", - "vm_name": "packer-{{user `template`}}-vmware", + "vm_name": "{{ user `template` }}", "vmx_data": { "cpuid.coresPerSocket": "1", "ehci.present": "TRUE", @@ -151,7 +151,7 @@ ] ], "virtualbox_version_file": ".vbox_version", - "vm_name": "packer-{{user `template`}}-virtualbox" + "vm_name": "{{ user `template` }}" } ], "min_packer_version": "0.7.0", diff --git a/macosx-10.9.json b/macosx-10.9.json index e32eaec39..c0cb948d6 100644 --- a/macosx-10.9.json +++ b/macosx-10.9.json @@ -18,7 +18,7 @@ "tools_upload_flavor": "darwin", "tools_upload_path": "/tmp/vmtools.iso", "type": "vmware-iso", - "vm_name": "packer-{{user `template`}}-vmware", + "vm_name": "{{ user `template` }}", "vmx_data": { "cpuid.coresPerSocket": "1", "ehci.present": "TRUE", @@ -151,7 +151,7 @@ ] ], "virtualbox_version_file": ".vbox_version", - "vm_name": "packer-{{user `template`}}-virtualbox" + "vm_name": "{{ user `template` }}" } ], "min_packer_version": "0.7.0", diff --git a/omnios-r151010j.json b/omnios-r151010j.json index 43f5eff96..97baaeadc 100644 --- a/omnios-r151010j.json +++ b/omnios-r151010j.json @@ -58,7 +58,7 @@ ] ], "virtualbox_version_file": ".vbox_version", - "vm_name": "packer-omnios-r151010j" + "vm_name": "{{ user `template` }}" }, { "boot_command": [ @@ -109,7 +109,7 @@ "ssh_username": "root", "tools_upload_flavor": "solaris", "type": "vmware-iso", - "vm_name": "packer-omnios-r151010j", + "vm_name": "{{ user `template` }}", "vmx_data": { "cpuid.coresPerSocket": "1", "memsize": "1024", @@ -177,7 +177,7 @@ "ssh_port": 22, "ssh_username": "root", "type": "parallels-iso", - "vm_name": "packer-omnios-r151010j" + "vm_name": "{{ user `template` }}" } ], "post-processors": [ diff --git a/opensuse-13.2-i386.json b/opensuse-13.2-i386.json index 3af9d250d..48d3684ef 100644 --- a/opensuse-13.2-i386.json +++ b/opensuse-13.2-i386.json @@ -39,7 +39,7 @@ ] ], "virtualbox_version_file": ".vbox_version", - "vm_name": "packer-opensuse-13.2-i386" + "vm_name": "{{ user `template` }}" }, { "boot_command": [ @@ -65,7 +65,7 @@ "ssh_wait_timeout": "10000s", "tools_upload_flavor": "linux", "type": "vmware-iso", - "vm_name": "packer-opensuse-13.2-i386", + "vm_name": "{{ user `template` }}", "vmx_data": { "cpuid.coresPerSocket": "1", "memsize": "480", @@ -111,7 +111,7 @@ "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", "type": "parallels-iso", - "vm_name": "packer-opensuse-13.2-i386" + "vm_name": "{{ user `template` }}" } ], "post-processors": [ diff --git a/opensuse-13.2-x86_64.json b/opensuse-13.2-x86_64.json index 9cb453c42..4c9d28fa9 100644 --- a/opensuse-13.2-x86_64.json +++ b/opensuse-13.2-x86_64.json @@ -39,7 +39,7 @@ ] ], "virtualbox_version_file": ".vbox_version", - "vm_name": "packer-opensuse-13.2-x86_64" + "vm_name": "{{ user `template` }}" }, { "boot_command": [ @@ -65,7 +65,7 @@ "ssh_wait_timeout": "10000s", "tools_upload_flavor": "linux", "type": "vmware-iso", - "vm_name": "packer-opensuse-13.2-x86_64", + "vm_name": "{{ user `template` }}", "vmx_data": { "cpuid.coresPerSocket": "1", "memsize": "480", @@ -111,7 +111,7 @@ "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", "type": "parallels-iso", - "vm_name": "packer-opensuse-13.2-x86_64" + "vm_name": "{{ user `template` }}" } ], "post-processors": [ diff --git a/oracle-5.11-i386.json b/oracle-5.11-i386.json index fd561aa39..cc80236c7 100644 --- a/oracle-5.11-i386.json +++ b/oracle-5.11-i386.json @@ -36,7 +36,7 @@ ] ], "virtualbox_version_file": ".vbox_version", - "vm_name": "packer-oracle-5.11-i386" + "vm_name": "{{ user `template` }}" }, { "boot_command": [ @@ -58,7 +58,7 @@ "ssh_wait_timeout": "10000s", "tools_upload_flavor": "linux", "type": "vmware-iso", - "vm_name": "packer-oracle-5.11-i386", + "vm_name": "{{ user `template` }}", "vmx_data": { "cpuid.coresPerSocket": "1", "memsize": "384", @@ -100,7 +100,7 @@ "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", "type": "parallels-iso", - "vm_name": "packer-oracle-5.11-i386" + "vm_name": "{{ user `template` }}" } ], "post-processors": [ diff --git a/oracle-5.11-x86_64.json b/oracle-5.11-x86_64.json index cde4575dd..69878aa0d 100644 --- a/oracle-5.11-x86_64.json +++ b/oracle-5.11-x86_64.json @@ -36,7 +36,7 @@ ] ], "virtualbox_version_file": ".vbox_version", - "vm_name": "packer-oracle-5.11-x86_64" + "vm_name": "{{ user `template` }}" }, { "boot_command": [ @@ -58,7 +58,7 @@ "ssh_wait_timeout": "10000s", "tools_upload_flavor": "linux", "type": "vmware-iso", - "vm_name": "packer-oracle-5.11-x86_64", + "vm_name": "{{ user `template` }}", "vmx_data": { "cpuid.coresPerSocket": "1", "memsize": "384", @@ -100,7 +100,7 @@ "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", "type": "parallels-iso", - "vm_name": "packer-oracle-5.11-x86_64" + "vm_name": "{{ user `template` }}" } ], "post-processors": [ diff --git a/oracle-6.6-i386.json b/oracle-6.6-i386.json index 4148e1a65..3da7e6d11 100644 --- a/oracle-6.6-i386.json +++ b/oracle-6.6-i386.json @@ -36,7 +36,7 @@ ] ], "virtualbox_version_file": ".vbox_version", - "vm_name": "packer-oracle-6.6-i386" + "vm_name": "{{ user `template` }}" }, { "boot_command": [ @@ -58,7 +58,7 @@ "ssh_wait_timeout": "10000s", "tools_upload_flavor": "linux", "type": "vmware-iso", - "vm_name": "packer-oracle-6.6-i386", + "vm_name": "{{ user `template` }}", "vmx_data": { "cpuid.coresPerSocket": "1", "memsize": "480", @@ -100,7 +100,7 @@ "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", "type": "parallels-iso", - "vm_name": "packer-oracle-6.6-i386" + "vm_name": "{{ user `template` }}" } ], "post-processors": [ diff --git a/oracle-6.6-x86_64.json b/oracle-6.6-x86_64.json index 97e99ed7e..b5f867210 100644 --- a/oracle-6.6-x86_64.json +++ b/oracle-6.6-x86_64.json @@ -36,7 +36,7 @@ ] ], "virtualbox_version_file": ".vbox_version", - "vm_name": "packer-oracle-6.6-x86_64" + "vm_name": "{{ user `template` }}" }, { "boot_command": [ @@ -58,7 +58,7 @@ "ssh_wait_timeout": "10000s", "tools_upload_flavor": "linux", "type": "vmware-iso", - "vm_name": "packer-oracle-6.6-x86_64", + "vm_name": "{{ user `template` }}", "vmx_data": { "cpuid.coresPerSocket": "1", "memsize": "480", @@ -100,7 +100,7 @@ "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", "type": "parallels-iso", - "vm_name": "packer-oracle-6.6-x86_64" + "vm_name": "{{ user `template` }}" } ], "post-processors": [ diff --git a/rhel-5.11-i386.json b/rhel-5.11-i386.json index 6b39c0baa..97faa95f8 100644 --- a/rhel-5.11-i386.json +++ b/rhel-5.11-i386.json @@ -36,7 +36,7 @@ ] ], "virtualbox_version_file": ".vbox_version", - "vm_name": "packer-rhel-5.11-i386" + "vm_name": "{{ user `template` }}" }, { "boot_command": [ @@ -58,7 +58,7 @@ "ssh_wait_timeout": "10000s", "tools_upload_flavor": "linux", "type": "vmware-iso", - "vm_name": "packer-rhel-5.11-i386", + "vm_name": "{{ user `template` }}", "vmx_data": { "cpuid.coresPerSocket": "1", "memsize": "384", @@ -100,7 +100,7 @@ "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", "type": "parallels-iso", - "vm_name": "packer-rhel-5.11-i386" + "vm_name": "{{ user `template` }}" } ], "post-processors": [ diff --git a/rhel-5.11-x86_64.json b/rhel-5.11-x86_64.json index 7f2ce981e..84fed6414 100644 --- a/rhel-5.11-x86_64.json +++ b/rhel-5.11-x86_64.json @@ -36,7 +36,7 @@ ] ], "virtualbox_version_file": ".vbox_version", - "vm_name": "packer-rhel-5.11-x86_64" + "vm_name": "{{ user `template` }}" }, { "boot_command": [ @@ -58,7 +58,7 @@ "ssh_wait_timeout": "10000s", "tools_upload_flavor": "linux", "type": "vmware-iso", - "vm_name": "packer-rhel-5.11-x86_64", + "vm_name": "{{ user `template` }}", "vmx_data": { "cpuid.coresPerSocket": "1", "memsize": "384", @@ -100,7 +100,7 @@ "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", "type": "parallels-iso", - "vm_name": "packer-rhel-5.11-x86_64" + "vm_name": "{{ user `template` }}" } ], "post-processors": [ diff --git a/rhel-6.6-i386.json b/rhel-6.6-i386.json index 53700c145..6417c11db 100644 --- a/rhel-6.6-i386.json +++ b/rhel-6.6-i386.json @@ -36,7 +36,7 @@ ] ], "virtualbox_version_file": ".vbox_version", - "vm_name": "packer-rhel-6.6-i386" + "vm_name": "{{ user `template` }}" }, { "boot_command": [ @@ -58,7 +58,7 @@ "ssh_wait_timeout": "10000s", "tools_upload_flavor": "linux", "type": "vmware-iso", - "vm_name": "packer-rhel-6.6-i386", + "vm_name": "{{ user `template` }}", "vmx_data": { "cpuid.coresPerSocket": "1", "memsize": "480", @@ -100,7 +100,7 @@ "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", "type": "parallels-iso", - "vm_name": "packer-rhel-6.6-i386" + "vm_name": "{{ user `template` }}" } ], "post-processors": [ diff --git a/rhel-6.6-x86_64.json b/rhel-6.6-x86_64.json index 036f53a1d..7aeec4734 100644 --- a/rhel-6.6-x86_64.json +++ b/rhel-6.6-x86_64.json @@ -36,7 +36,7 @@ ] ], "virtualbox_version_file": ".vbox_version", - "vm_name": "packer-rhel-6.6-x86_64" + "vm_name": "{{ user `template` }}" }, { "boot_command": [ @@ -58,7 +58,7 @@ "ssh_wait_timeout": "10000s", "tools_upload_flavor": "linux", "type": "vmware-iso", - "vm_name": "packer-rhel-6.6-x86_64", + "vm_name": "{{ user `template` }}", "vmx_data": { "cpuid.coresPerSocket": "1", "memsize": "480", @@ -100,7 +100,7 @@ "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", "type": "parallels-iso", - "vm_name": "packer-rhel-6.6-x86_64" + "vm_name": "{{ user `template` }}" } ], "post-processors": [ diff --git a/rhel-7.1-x86_64.json b/rhel-7.1-x86_64.json index 0cd97a347..f4ea7cc02 100644 --- a/rhel-7.1-x86_64.json +++ b/rhel-7.1-x86_64.json @@ -36,7 +36,7 @@ ] ], "virtualbox_version_file": ".vbox_version", - "vm_name": "packer-rhel-7.1-x86_64" + "vm_name": "{{ user `template` }}" }, { "boot_command": [ @@ -58,7 +58,7 @@ "ssh_wait_timeout": "10000s", "tools_upload_flavor": "linux", "type": "vmware-iso", - "vm_name": "packer-rhel-7.1-x86_64", + "vm_name": "{{ user `template` }}", "vmx_data": { "cpuid.coresPerSocket": "1", "memsize": "480", @@ -100,7 +100,7 @@ "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", "type": "parallels-iso", - "vm_name": "packer-rhel-7.1-x86_64" + "vm_name": "{{ user `template` }}" } ], "post-processors": [ diff --git a/sles-11-sp2-i386.json b/sles-11-sp2-i386.json index 9ade10472..4bc0f5967 100644 --- a/sles-11-sp2-i386.json +++ b/sles-11-sp2-i386.json @@ -40,7 +40,7 @@ ] ], "virtualbox_version_file": ".vbox_version", - "vm_name": "packer-sles-11-sp2-i386" + "vm_name": "{{ user `template` }}" }, { "boot_command": [ @@ -66,7 +66,7 @@ "ssh_wait_timeout": "10000s", "tools_upload_flavor": "linux", "type": "vmware-iso", - "vm_name": "packer-sles-11-sp2-i386", + "vm_name": "{{ user `template` }}", "vmx_data": { "cpuid.coresPerSocket": "1", "memsize": "480", @@ -112,7 +112,7 @@ "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", "type": "parallels-iso", - "vm_name": "packer-sles-11-sp2-i386" + "vm_name": "{{ user `template` }}" } ], "post-processors": [ diff --git a/sles-11-sp2-x86_64.json b/sles-11-sp2-x86_64.json index 03ed7dab7..a6c5f8990 100644 --- a/sles-11-sp2-x86_64.json +++ b/sles-11-sp2-x86_64.json @@ -40,7 +40,7 @@ ] ], "virtualbox_version_file": ".vbox_version", - "vm_name": "packer-sles-11-sp2-x86_64" + "vm_name": "{{ user `template` }}" }, { "boot_command": [ @@ -66,7 +66,7 @@ "ssh_wait_timeout": "10000s", "tools_upload_flavor": "linux", "type": "vmware-iso", - "vm_name": "packer-sles-11-sp2-x86_64", + "vm_name": "{{ user `template` }}", "vmx_data": { "cpuid.coresPerSocket": "1", "memsize": "480", @@ -112,7 +112,7 @@ "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", "type": "parallels-iso", - "vm_name": "packer-sles-11-sp2-x86_64" + "vm_name": "{{ user `template` }}" } ], "post-processors": [ diff --git a/sles-11-sp3-i386.json b/sles-11-sp3-i386.json index 6c742268e..8937a02c3 100644 --- a/sles-11-sp3-i386.json +++ b/sles-11-sp3-i386.json @@ -40,7 +40,7 @@ ] ], "virtualbox_version_file": ".vbox_version", - "vm_name": "packer-sles-11-sp3-i386" + "vm_name": "{{ user `template` }}" }, { "boot_command": [ @@ -66,7 +66,7 @@ "ssh_wait_timeout": "10000s", "tools_upload_flavor": "linux", "type": "vmware-iso", - "vm_name": "packer-sles-11-sp3-i386", + "vm_name": "{{ user `template` }}", "vmx_data": { "cpuid.coresPerSocket": "1", "memsize": "480", @@ -112,7 +112,7 @@ "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", "type": "parallels-iso", - "vm_name": "packer-sles-11-sp3-i386" + "vm_name": "{{ user `template` }}" } ], "post-processors": [ diff --git a/sles-11-sp3-x86_64.json b/sles-11-sp3-x86_64.json index 731a39a5b..7a5efc16b 100644 --- a/sles-11-sp3-x86_64.json +++ b/sles-11-sp3-x86_64.json @@ -40,7 +40,7 @@ ] ], "virtualbox_version_file": ".vbox_version", - "vm_name": "packer-sles-11-sp3-x86_64" + "vm_name": "{{ user `template` }}" }, { "boot_command": [ @@ -66,7 +66,7 @@ "ssh_wait_timeout": "10000s", "tools_upload_flavor": "linux", "type": "vmware-iso", - "vm_name": "packer-sles-11-sp3-x86_64", + "vm_name": "{{ user `template` }}", "vmx_data": { "cpuid.coresPerSocket": "1", "memsize": "480", @@ -112,7 +112,7 @@ "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", "type": "parallels-iso", - "vm_name": "packer-sles-11-sp3-x86_64" + "vm_name": "{{ user `template` }}" } ], "post-processors": [ diff --git a/sles-12-x86_64.json b/sles-12-x86_64.json index 5a7e9cba3..e0d2b14b3 100644 --- a/sles-12-x86_64.json +++ b/sles-12-x86_64.json @@ -40,7 +40,7 @@ ] ], "virtualbox_version_file": ".vbox_version", - "vm_name": "packer-sles-12-x86_64" + "vm_name": "{{ user `template` }}" }, { "boot_command": [ @@ -66,7 +66,7 @@ "ssh_wait_timeout": "10000s", "tools_upload_flavor": "linux", "type": "vmware-iso", - "vm_name": "packer-sles-12-sp3-x86_64", + "vm_name": "{{ user `template` }}", "vmx_data": { "cpuid.coresPerSocket": "1", "memsize": "480", @@ -112,7 +112,7 @@ "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", "type": "parallels-iso", - "vm_name": "packer-sles-12-x86_64" + "vm_name": "{{ user `template` }}" } ], "post-processors": [ diff --git a/solaris-10.11-x86.json b/solaris-10.11-x86.json index 78d186509..7a3700c99 100644 --- a/solaris-10.11-x86.json +++ b/solaris-10.11-x86.json @@ -49,7 +49,7 @@ ] ], "virtualbox_version_file": ".vbox_version", - "vm_name": "packer-solaris-10u11-x86_64" + "vm_name": "{{ user `template` }}" }, { "boot_command": [ @@ -86,7 +86,7 @@ "tools_upload_flavor": "solaris", "tools_upload_path": "/home/vagrant/solaris.iso", "type": "vmware-iso", - "vm_name": "packer-solaris-10u11-x86_64", + "vm_name": "{{ user `template` }}", "vmx_data": { "cpuid.coresPerSocket": "1", "memsize": "1536", diff --git a/solaris-11-x86.json b/solaris-11-x86.json index a1781fe5e..1b78b8719 100644 --- a/solaris-11-x86.json +++ b/solaris-11-x86.json @@ -60,7 +60,7 @@ ] ], "virtualbox_version_file": ".vbox_version", - "vm_name": "packer-solaris-11.2-x86_64" + "vm_name": "{{ user `template` }}" }, { "boot_command": [ @@ -106,7 +106,7 @@ "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", "type": "vmware-iso", - "vm_name": "packer-solaris-11.2-x86_64", + "vm_name": "{{ user `template` }}", "vmx_data": { "cpuid.coresPerSocket": "1", "memsize": "2048", diff --git a/ubuntu-10.04-amd64.json b/ubuntu-10.04-amd64.json index 72102942a..4c61e7b79 100644 --- a/ubuntu-10.04-amd64.json +++ b/ubuntu-10.04-amd64.json @@ -57,7 +57,7 @@ ] ], "virtualbox_version_file": ".vbox_version", - "vm_name": "packer-{{user `template`}}-virtualbox" + "vm_name": "{{ user `template` }}" }, { "boot_command": [ @@ -100,7 +100,7 @@ "ssh_wait_timeout": "10000s", "tools_upload_flavor": "linux", "type": "vmware-iso", - "vm_name": "packer-{{user `template`}}-vmware", + "vm_name": "{{ user `template` }}", "vmx_data": { "cpuid.coresPerSocket": "1", "memsize": "384", @@ -163,7 +163,7 @@ "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", "type": "parallels-iso", - "vm_name": "packer-{{user `template`}}-parallels" + "vm_name": "{{ user `template` }}" } ], "post-processors": [ diff --git a/ubuntu-10.04-i386.json b/ubuntu-10.04-i386.json index ad8513433..c5668b73f 100644 --- a/ubuntu-10.04-i386.json +++ b/ubuntu-10.04-i386.json @@ -57,7 +57,7 @@ ] ], "virtualbox_version_file": ".vbox_version", - "vm_name": "packer-{{user `template`}}-virtualbox" + "vm_name": "{{ user `template` }}" }, { "boot_command": [ @@ -100,7 +100,7 @@ "ssh_wait_timeout": "10000s", "tools_upload_flavor": "linux", "type": "vmware-iso", - "vm_name": "packer-{{user `template`}}-vmware", + "vm_name": "{{ user `template` }}", "vmx_data": { "cpuid.coresPerSocket": "1", "memsize": "384", @@ -163,7 +163,7 @@ "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", "type": "parallels-iso", - "vm_name": "packer-{{user `template`}}-parallels" + "vm_name": "{{ user `template` }}" } ], "post-processors": [ diff --git a/ubuntu-12.04-amd64.json b/ubuntu-12.04-amd64.json index d61162671..8ede3493e 100644 --- a/ubuntu-12.04-amd64.json +++ b/ubuntu-12.04-amd64.json @@ -57,7 +57,7 @@ ] ], "virtualbox_version_file": ".vbox_version", - "vm_name": "packer-{{user `template`}}-virtualbox" + "vm_name": "{{ user `template` }}" }, { "boot_command": [ @@ -100,7 +100,7 @@ "ssh_wait_timeout": "10000s", "tools_upload_flavor": "linux", "type": "vmware-iso", - "vm_name": "packer-{{user `template`}}-vmware", + "vm_name": "{{ user `template` }}", "vmx_data": { "cpuid.coresPerSocket": "1", "memsize": "384", @@ -163,7 +163,7 @@ "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", "type": "parallels-iso", - "vm_name": "packer-{{user `template`}}-parallels" + "vm_name": "{{ user `template` }}" } ], "post-processors": [ diff --git a/ubuntu-12.04-i386.json b/ubuntu-12.04-i386.json index 9aed4571b..84472c4d7 100644 --- a/ubuntu-12.04-i386.json +++ b/ubuntu-12.04-i386.json @@ -57,7 +57,7 @@ ] ], "virtualbox_version_file": ".vbox_version", - "vm_name": "packer-{{user `template`}}-virtualbox" + "vm_name": "{{ user `template` }}" }, { "boot_command": [ @@ -100,7 +100,7 @@ "ssh_wait_timeout": "10000s", "tools_upload_flavor": "linux", "type": "vmware-iso", - "vm_name": "packer-{{user `template`}}-vmware", + "vm_name": "{{ user `template` }}", "vmx_data": { "cpuid.coresPerSocket": "1", "memsize": "384", @@ -163,7 +163,7 @@ "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", "type": "parallels-iso", - "vm_name": "packer-{{user `template`}}-parallels" + "vm_name": "{{ user `template` }}" } ], "post-processors": [ diff --git a/ubuntu-14.04-amd64.json b/ubuntu-14.04-amd64.json index 3e25d9e57..96a1ae727 100644 --- a/ubuntu-14.04-amd64.json +++ b/ubuntu-14.04-amd64.json @@ -57,7 +57,7 @@ ] ], "virtualbox_version_file": ".vbox_version", - "vm_name": "packer-{{user `template`}}-virtualbox" + "vm_name": "{{ user `template` }}" }, { "boot_command": [ @@ -100,7 +100,7 @@ "ssh_wait_timeout": "10000s", "tools_upload_flavor": "linux", "type": "vmware-iso", - "vm_name": "packer-{{user `template`}}-vmware", + "vm_name": "{{ user `template` }}", "vmx_data": { "cpuid.coresPerSocket": "1", "memsize": "384", @@ -163,7 +163,7 @@ "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", "type": "parallels-iso", - "vm_name": "packer-{{user `template`}}-parallels" + "vm_name": "{{ user `template` }}" } ], "post-processors": [ diff --git a/ubuntu-14.04-i386.json b/ubuntu-14.04-i386.json index e91f9e55b..204730383 100644 --- a/ubuntu-14.04-i386.json +++ b/ubuntu-14.04-i386.json @@ -57,7 +57,7 @@ ] ], "virtualbox_version_file": ".vbox_version", - "vm_name": "packer-{{user `template`}}-virtualbox" + "vm_name": "{{ user `template` }}" }, { "boot_command": [ @@ -100,7 +100,7 @@ "ssh_wait_timeout": "10000s", "tools_upload_flavor": "linux", "type": "vmware-iso", - "vm_name": "packer-{{user `template`}}-vmware", + "vm_name": "{{ user `template` }}", "vmx_data": { "cpuid.coresPerSocket": "1", "memsize": "384", @@ -163,7 +163,7 @@ "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", "type": "parallels-iso", - "vm_name": "packer-{{user `template`}}-parallels" + "vm_name": "{{ user `template` }}" } ], "post-processors": [ diff --git a/ubuntu-14.10-amd64.json b/ubuntu-14.10-amd64.json index afe4894fa..ec08ac295 100644 --- a/ubuntu-14.10-amd64.json +++ b/ubuntu-14.10-amd64.json @@ -57,7 +57,7 @@ ] ], "virtualbox_version_file": ".vbox_version", - "vm_name": "packer-{{user `template`}}-virtualbox" + "vm_name": "{{ user `template` }}" }, { "boot_command": [ @@ -100,7 +100,7 @@ "ssh_wait_timeout": "10000s", "tools_upload_flavor": "linux", "type": "vmware-iso", - "vm_name": "packer-{{user `template`}}-vmware", + "vm_name": "{{ user `template` }}", "vmx_data": { "cpuid.coresPerSocket": "1", "memsize": "384", @@ -163,7 +163,7 @@ "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", "type": "parallels-iso", - "vm_name": "packer-{{user `template`}}-parallels" + "vm_name": "{{ user `template` }}" } ], "post-processors": [ diff --git a/ubuntu-14.10-i386.json b/ubuntu-14.10-i386.json index a509d3740..4dc3859a4 100644 --- a/ubuntu-14.10-i386.json +++ b/ubuntu-14.10-i386.json @@ -57,7 +57,7 @@ ] ], "virtualbox_version_file": ".vbox_version", - "vm_name": "packer-{{user `template`}}-virtualbox" + "vm_name": "{{ user `template` }}" }, { "boot_command": [ @@ -100,7 +100,7 @@ "ssh_wait_timeout": "10000s", "tools_upload_flavor": "linux", "type": "vmware-iso", - "vm_name": "packer-{{user `template`}}-vmware", + "vm_name": "{{ user `template` }}", "vmx_data": { "cpuid.coresPerSocket": "1", "memsize": "384", @@ -163,7 +163,7 @@ "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", "type": "parallels-iso", - "vm_name": "packer-{{user `template`}}-parallels" + "vm_name": "{{ user `template` }}" } ], "post-processors": [ diff --git a/ubuntu-15.04-amd64.json b/ubuntu-15.04-amd64.json index f1eba53bd..c8bceffe9 100644 --- a/ubuntu-15.04-amd64.json +++ b/ubuntu-15.04-amd64.json @@ -57,7 +57,7 @@ ] ], "virtualbox_version_file": ".vbox_version", - "vm_name": "packer-{{user `template`}}-virtualbox" + "vm_name": "{{ user `template` }}" }, { "boot_command": [ @@ -100,7 +100,7 @@ "ssh_wait_timeout": "10000s", "tools_upload_flavor": "linux", "type": "vmware-iso", - "vm_name": "packer-{{user `template`}}-vmware", + "vm_name": "{{ user `template` }}", "vmx_data": { "cpuid.coresPerSocket": "1", "memsize": "384", @@ -163,7 +163,7 @@ "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", "type": "parallels-iso", - "vm_name": "packer-{{user `template`}}-parallels" + "vm_name": "{{ user `template` }}" } ], "post-processors": [ diff --git a/ubuntu-15.04-i386.json b/ubuntu-15.04-i386.json index 0d130baf7..70d71a167 100644 --- a/ubuntu-15.04-i386.json +++ b/ubuntu-15.04-i386.json @@ -57,7 +57,7 @@ ] ], "virtualbox_version_file": ".vbox_version", - "vm_name": "packer-{{user `template`}}-virtualbox" + "vm_name": "{{ user `template` }}" }, { "boot_command": [ @@ -100,7 +100,7 @@ "ssh_wait_timeout": "10000s", "tools_upload_flavor": "linux", "type": "vmware-iso", - "vm_name": "packer-{{user `template`}}-vmware", + "vm_name": "{{ user `template` }}", "vmx_data": { "cpuid.coresPerSocket": "1", "memsize": "384", @@ -163,7 +163,7 @@ "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", "type": "parallels-iso", - "vm_name": "packer-{{user `template`}}-parallels" + "vm_name": "{{ user `template` }}" } ], "post-processors": [ From 451e02bf77887ad8b5f50b63eab6de0573336720 Mon Sep 17 00:00:00 2001 From: Seth Thomas <sthomas@chef.io> Date: Sat, 11 Jul 2015 18:41:24 -0700 Subject: [PATCH 0368/1622] Fixing headless check --- bin/bento | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/bin/bento b/bin/bento index 15deb569a..982fc8d09 100755 --- a/bin/bento +++ b/bin/bento @@ -223,9 +223,7 @@ class BuildRunner def packer_build_cmd(template, var_file) vars = "#{template}.variables.json" - if (/darwin/ =~ RUBY_PLATFORM) - headless = false - end + headless = !(RUBY_PLATFORM =~ /darwin/) cmd = %W[packer build -var-file=#{var_file} #{template}.json] cmd.insert(2, "-var-file=#{vars}") if File.exist?(vars) cmd.insert(2, "-only=#{builds}") if builds From 51b76435e8bdb4ad21da3e9dfc49cbea4ebaeb2a Mon Sep 17 00:00:00 2001 From: Fletcher Nichol <fnichol@nichol.ca> Date: Fri, 10 Jul 2015 17:48:43 -0600 Subject: [PATCH 0369/1622] [freebsd-*] Improve DRYness, correctness, & speed of FreeBSD templates. The following improvements are made in this commit: * Ensure that all related provisioner shell scripts are written using more conservative bourne code idioms * Call all provisioner scripts with `sh -eux` which will (e) exit immediately if a command exits with a non-zero exit status, (u) treats unset variables as an error, and (x) outputs the command and its expanded arguments or associated word list * Use the `template` user variable to replace repetition of `"freebsd-*"` style strings throughout * Support a `HOME_DIR` environment variable for provisioner scripts to use * Remove now-unused user variable `arch` * Extract the `iso_checksum` and `iso_checksum_type` values into user variables and reference them in the templates * Construct the `iso_url` value from the `mirror`, `mirror_directory`, and `iso_name` user variables * Add an `install_path` user variable and use it throughout the templates * Add an `iso_name` user variable and use it throughout the templates * Use the `http_proxy`, `https_proxy`, and `no_proxy` environment variables if set on the workstation and make them available to the provisioner shell scripts to speed up package installations, etc. * Fix `shutdown_command` value to not output a file as a side effect --- freebsd-10.1-amd64.json | 73 +++++++------ freebsd-10.1-i386.json | 73 +++++++------ freebsd-9.3-amd64.json | 71 +++++++------ freebsd-9.3-i386.json | 74 +++++++------ scripts/common/vagrant.sh | 2 + scripts/freebsd/cleanup.sh | 17 ++- scripts/freebsd/minimize.sh | 6 +- scripts/freebsd/postinstall.sh | 72 ++++--------- scripts/freebsd/sudoers.sh | 4 + scripts/freebsd/update.sh | 19 ++++ scripts/freebsd/vmtools.sh | 118 ++++++++++++--------- vagrantfile_templates/freebsd.rb | 15 +++ vagrantfile_templates/parallels/freebsd.rb | 17 --- 13 files changed, 305 insertions(+), 256 deletions(-) create mode 100644 scripts/freebsd/sudoers.sh create mode 100644 scripts/freebsd/update.sh create mode 100644 vagrantfile_templates/freebsd.rb delete mode 100644 vagrantfile_templates/parallels/freebsd.rb diff --git a/freebsd-10.1-amd64.json b/freebsd-10.1-amd64.json index bfb86fdb0..cd872d82e 100644 --- a/freebsd-10.1-amd64.json +++ b/freebsd-10.1-amd64.json @@ -10,7 +10,7 @@ "mdmfs -s 100m md1 /tmp<enter><wait>", "mdmfs -s 100m md2 /mnt<enter><wait>", "dhclient -l /tmp/dhclient.lease.em0 em0<enter><wait>", - "fetch -o /tmp/install.sh http://{{ .HTTPIP }}:{{ .HTTPPort }}/freebsd-10.1/install.sh && chmod +x /tmp/install.sh && /tmp/install.sh {{ .Name }}<enter><wait>" + "fetch -o /tmp/install.sh http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} && chmod +x /tmp/install.sh && /tmp/install.sh {{ .Name }}<enter><wait>" ], "boot_wait": "10s", "disk_size": 10140, @@ -18,11 +18,11 @@ "guest_os_type": "FreeBSD_64", "headless": "{{ user `headless` }}", "http_directory": "http", - "iso_checksum": "0c3d64ce48c3ef761761d0fea07e1935e296f8c045c249118bc91a7faf053a6b", - "iso_checksum_type": "sha256", - "iso_url": "{{user `mirror`}}/releases/amd64/amd64/ISO-IMAGES/10.1/FreeBSD-10.1-RELEASE-amd64-disc1.iso", - "output_directory": "packer-freebsd-10.1-amd64-virtualbox", - "shutdown_command": "echo 'shutdown -p now' > shutdown.sh; cat 'shutdown.sh' | su -", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-virtualbox", + "shutdown_command": "su -m root -c 'shutdown -p now'", "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", @@ -56,18 +56,18 @@ "mdmfs -s 100m md2 /mnt<enter><wait>", "dhclient -l /tmp/dhclient.lease.em0 em0<enter><wait>", "<wait5>", - "fetch -o /tmp/install.sh http://{{ .HTTPIP }}:{{ .HTTPPort }}/freebsd-10.1/install.sh && chmod +x /tmp/install.sh && /tmp/install.sh {{ .Name }}<enter><wait>" + "fetch -o /tmp/install.sh http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} && chmod +x /tmp/install.sh && /tmp/install.sh {{ .Name }}<enter><wait>" ], "boot_wait": "10s", "disk_size": 10140, "guest_os_type": "freebsd-64", "headless": "{{ user `headless` }}", "http_directory": "http", - "iso_checksum": "0c3d64ce48c3ef761761d0fea07e1935e296f8c045c249118bc91a7faf053a6b", - "iso_checksum_type": "sha256", - "iso_url": "{{user `mirror`}}/releases/amd64/amd64/ISO-IMAGES/10.1/FreeBSD-10.1-RELEASE-amd64-disc1.iso", - "output_directory": "packer-freebsd-10.1-amd64-vmware", - "shutdown_command": "echo 'shutdown -p now' > shutdown.sh; cat 'shutdown.sh' | su -", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-vmare", + "shutdown_command": "su -m root -c 'shutdown -p now'", "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", @@ -91,17 +91,17 @@ "mdmfs -s 100m md1 /tmp<enter><wait>", "mdmfs -s 100m md2 /mnt<enter><wait>", "dhclient -l /tmp/dhclient.lease.em0 em0<enter><wait>", - "fetch -o /tmp/install.sh http://{{ .HTTPIP }}:{{ .HTTPPort }}/freebsd-10.1/install.sh && chmod +x /tmp/install.sh && /tmp/install.sh {{ .Name }}<enter><wait>" + "fetch -o /tmp/install.sh http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} && chmod +x /tmp/install.sh && /tmp/install.sh {{ .Name }}<enter><wait>" ], - "boot_wait": "10s", + "boot_wait": "8s", "disk_size": 10140, "guest_os_type": "freebsd", "headless": "{{ user `headless` }}", "http_directory": "http", - "iso_checksum": "0c3d64ce48c3ef761761d0fea07e1935e296f8c045c249118bc91a7faf053a6b", - "iso_checksum_type": "sha256", - "iso_url": "{{user `mirror`}}/releases/amd64/amd64/ISO-IMAGES/10.1/FreeBSD-10.1-RELEASE-amd64-disc1.iso", - "output_directory": "packer-freebsd-10.1-amd64-parallels", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-parallels", "parallels_tools_mode": "disable", "prlctl": [ [ @@ -138,7 +138,7 @@ ] ], "prlctl_version_file": ".prlctl_version", - "shutdown_command": "echo 'shutdown -p now' > shutdown.sh; cat 'shutdown.sh' | su -", + "shutdown_command": "su -m root -c 'shutdown -p now'", "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", @@ -150,12 +150,8 @@ "post-processors": [ { "output": "builds/{{user `box_basename`}}.{{.Provider}}.box", - "override": { - "parallels": { - "vagrantfile_template": "vagrantfile_templates/parallels/freebsd.rb" - } - }, - "type": "vagrant" + "type": "vagrant", + "vagrantfile_template": "vagrantfile_templates/freebsd.rb" } ], "provisioners": [ @@ -165,29 +161,44 @@ "type": "file" }, { - "environment_vars": [], - "execute_command": "export {{.Vars}} && cat {{.Path}} | su -m", + "environment_vars": [ + "HOME_DIR=/home/vagrant", + "http_proxy={{user `http_proxy`}}", + "https_proxy={{user `https_proxy`}}", + "no_proxy={{user `no_proxy`}}" + ], + "execute_command": "{{.Vars}} su -m root -c 'sh -eux {{.Path}}'", "scripts": [ "scripts/common/metadata.sh", + "scripts/freebsd/update.sh", "scripts/freebsd/postinstall.sh", - "scripts/freebsd/cleanup.sh", + "scripts/freebsd/sudoers.sh", + "scripts/common/vagrant.sh", "scripts/freebsd/vmtools.sh", + "scripts/freebsd/cleanup.sh", "scripts/freebsd/minimize.sh" ], "type": "shell" } ], "variables": { - "arch": "64", - "box_basename": "freebsd-10.1", + "box_basename": "__unset_box_basename__", "build_timestamp": "{{isotime \"20060102150405\"}}", "git_revision": "__unknown_git_revision__", "headless": "", + "http_proxy": "{{env `http_proxy`}}", + "https_proxy": "{{env `https_proxy`}}", + "install_path": "freebsd-10.1/install.sh", + "iso_checksum": "0c3d64ce48c3ef761761d0fea07e1935e296f8c045c249118bc91a7faf053a6b", + "iso_checksum_type": "sha256", + "iso_name": "FreeBSD-10.1-RELEASE-amd64-disc1.iso", "metadata": "floppy/dummy_metadata.json", "mirror": "http://ftp.freebsd.org/pub/FreeBSD", + "mirror_directory": "releases/amd64/amd64/ISO-IMAGES/10.1", "name": "freebsd-10.1", + "no_proxy": "{{env `no_proxy`}}", "template": "freebsd-10.1-amd64", - "version": "2.0.TIMESTAMP" + "version": "2.1.TIMESTAMP" } } diff --git a/freebsd-10.1-i386.json b/freebsd-10.1-i386.json index 37e8c61e2..943e96c44 100644 --- a/freebsd-10.1-i386.json +++ b/freebsd-10.1-i386.json @@ -10,7 +10,7 @@ "mdmfs -s 100m md1 /tmp<enter><wait>", "mdmfs -s 100m md2 /mnt<enter><wait>", "dhclient -l /tmp/dhclient.lease.em0 em0<enter><wait>", - "fetch -o /tmp/install.sh http://{{ .HTTPIP }}:{{ .HTTPPort }}/freebsd-10.1/install.sh && chmod +x /tmp/install.sh && /tmp/install.sh {{ .Name }}<enter><wait>" + "fetch -o /tmp/install.sh http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} && chmod +x /tmp/install.sh && /tmp/install.sh {{ .Name }}<enter><wait>" ], "boot_wait": "10s", "disk_size": 10140, @@ -18,11 +18,11 @@ "guest_os_type": "FreeBSD", "headless": "{{ user `headless` }}", "http_directory": "http", - "iso_checksum": "fe31790b762b01c99791d33e7fd9ab97323654785ce21f588116c8b4eb381cd0", - "iso_checksum_type": "sha256", - "iso_url": "{{user `mirror`}}/releases/i386/i386/ISO-IMAGES/10.1/FreeBSD-10.1-RELEASE-i386-disc1.iso", - "output_directory": "packer-freebsd-10.1-i386-virtualbox", - "shutdown_command": "echo 'shutdown -p now' > shutdown.sh; cat 'shutdown.sh' | su -", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-virtualbox", + "shutdown_command": "su -m root -c 'shutdown -p now'", "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", @@ -56,18 +56,18 @@ "mdmfs -s 100m md2 /mnt<enter><wait>", "dhclient -l /tmp/dhclient.lease.em0 em0<enter><wait>", "<wait5>", - "fetch -o /tmp/install.sh http://{{ .HTTPIP }}:{{ .HTTPPort }}/freebsd-10.1/install.sh && chmod +x /tmp/install.sh && /tmp/install.sh {{ .Name }}<enter><wait>" + "fetch -o /tmp/install.sh http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} && chmod +x /tmp/install.sh && /tmp/install.sh {{ .Name }}<enter><wait>" ], "boot_wait": "10s", "disk_size": 10140, "guest_os_type": "freebsd", "headless": "{{ user `headless` }}", "http_directory": "http", - "iso_checksum": "fe31790b762b01c99791d33e7fd9ab97323654785ce21f588116c8b4eb381cd0", - "iso_checksum_type": "sha256", - "iso_url": "{{user `mirror`}}/releases/i386/i386/ISO-IMAGES/10.1/FreeBSD-10.1-RELEASE-i386-disc1.iso", - "output_directory": "packer-freebsd-10.1-i386-vmware", - "shutdown_command": "echo 'shutdown -p now' > shutdown.sh; cat 'shutdown.sh' | su -", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-vmare", + "shutdown_command": "su -m root -c 'shutdown -p now'", "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", @@ -91,17 +91,17 @@ "mdmfs -s 100m md1 /tmp<enter><wait>", "mdmfs -s 100m md2 /mnt<enter><wait>", "dhclient -l /tmp/dhclient.lease.em0 em0<enter><wait>", - "fetch -o /tmp/install.sh http://{{ .HTTPIP }}:{{ .HTTPPort }}/freebsd-10.1/install.sh && chmod +x /tmp/install.sh && /tmp/install.sh {{ .Name }}<enter><wait>" + "fetch -o /tmp/install.sh http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} && chmod +x /tmp/install.sh && /tmp/install.sh {{ .Name }}<enter><wait>" ], - "boot_wait": "10s", + "boot_wait": "8s", "disk_size": 10140, "guest_os_type": "freebsd", "headless": "{{ user `headless` }}", "http_directory": "http", - "iso_checksum": "fe31790b762b01c99791d33e7fd9ab97323654785ce21f588116c8b4eb381cd0", - "iso_checksum_type": "sha256", - "iso_url": "{{user `mirror`}}/releases/i386/i386/ISO-IMAGES/10.1/FreeBSD-10.1-RELEASE-i386-disc1.iso", - "output_directory": "packer-freebsd-10.1-i386-parallels", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-parallels", "parallels_tools_mode": "disable", "prlctl": [ [ @@ -138,7 +138,7 @@ ] ], "prlctl_version_file": ".prlctl_version", - "shutdown_command": "echo 'shutdown -p now' > shutdown.sh; cat 'shutdown.sh' | su -", + "shutdown_command": "su -m root -c 'shutdown -p now'", "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", @@ -150,12 +150,8 @@ "post-processors": [ { "output": "builds/{{user `box_basename`}}.{{.Provider}}.box", - "override": { - "parallels": { - "vagrantfile_template": "vagrantfile_templates/parallels/freebsd.rb" - } - }, - "type": "vagrant" + "type": "vagrant", + "vagrantfile_template": "vagrantfile_templates/freebsd.rb" } ], "provisioners": [ @@ -165,29 +161,44 @@ "type": "file" }, { - "environment_vars": [], - "execute_command": "export {{.Vars}} && cat {{.Path}} | su -m", + "environment_vars": [ + "HOME_DIR=/home/vagrant", + "http_proxy={{user `http_proxy`}}", + "https_proxy={{user `https_proxy`}}", + "no_proxy={{user `no_proxy`}}" + ], + "execute_command": "{{.Vars}} su -m root -c 'sh -eux {{.Path}}'", "scripts": [ "scripts/common/metadata.sh", + "scripts/freebsd/update.sh", "scripts/freebsd/postinstall.sh", - "scripts/freebsd/cleanup.sh", + "scripts/freebsd/sudoers.sh", + "scripts/common/vagrant.sh", "scripts/freebsd/vmtools.sh", + "scripts/freebsd/cleanup.sh", "scripts/freebsd/minimize.sh" ], "type": "shell" } ], "variables": { - "arch": "32", - "box_basename": "freebsd-10.1-i386", + "box_basename": "__unset_box_basename__", "build_timestamp": "{{isotime \"20060102150405\"}}", "git_revision": "__unknown_git_revision__", "headless": "", + "http_proxy": "{{env `http_proxy`}}", + "https_proxy": "{{env `https_proxy`}}", + "install_path": "freebsd-10.1/install.sh", + "iso_checksum": "fe31790b762b01c99791d33e7fd9ab97323654785ce21f588116c8b4eb381cd0", + "iso_checksum_type": "sha256", + "iso_name": "FreeBSD-10.1-RELEASE-i386-disc1.iso", "metadata": "floppy/dummy_metadata.json", "mirror": "http://ftp.freebsd.org/pub/FreeBSD", + "mirror_directory": "releases/i386/i386/ISO-IMAGES/10.1", "name": "freebsd-10.1-i386", + "no_proxy": "{{env `no_proxy`}}", "template": "freebsd-10.1-i386", - "version": "2.0.TIMESTAMP" + "version": "2.1.TIMESTAMP" } } diff --git a/freebsd-9.3-amd64.json b/freebsd-9.3-amd64.json index c038531b1..8061637d4 100644 --- a/freebsd-9.3-amd64.json +++ b/freebsd-9.3-amd64.json @@ -14,7 +14,7 @@ "mdmfs -s 100m md1 /tmp<enter><wait>", "mdmfs -s 100m md2 /mnt<enter><wait>", "dhclient -l /tmp/dhclient.lease.em0 em0<enter><wait>", - "fetch -o /tmp/install.sh http://{{ .HTTPIP }}:{{ .HTTPPort }}/freebsd-9.3/install.sh && chmod +x /tmp/install.sh && /tmp/install.sh {{ .Name }}<enter><wait>" + "fetch -o /tmp/install.sh http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} && chmod +x /tmp/install.sh && /tmp/install.sh {{ .Name }}<enter><wait>" ], "boot_wait": "10s", "disk_size": 10140, @@ -22,11 +22,11 @@ "guest_os_type": "FreeBSD_64", "headless": "{{ user `headless` }}", "http_directory": "http", - "iso_checksum": "5a3c82653d77bba7d7ded8bd7efbedc09d52cf4045d98ce52a82c9e0f8fa9b0e", - "iso_checksum_type": "sha256", - "iso_url": "{{user `mirror`}}/releases/amd64/amd64/ISO-IMAGES/9.3/FreeBSD-9.3-RELEASE-amd64-disc1.iso", - "output_directory": "packer-freebsd-9.3-amd64-virtualbox", - "shutdown_command": "echo 'shutdown -p now' > shutdown.sh; cat 'shutdown.sh' | su -", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-virtualbox", + "shutdown_command": "su -m root -c 'shutdown -p now'", "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", @@ -64,18 +64,18 @@ "mdmfs -s 100m md2 /mnt<enter><wait>", "dhclient -l /tmp/dhclient.lease.em0 em0<enter><wait>", "<wait5>", - "fetch -o /tmp/install.sh http://{{ .HTTPIP }}:{{ .HTTPPort }}/freebsd-9.3/install.sh && chmod +x /tmp/install.sh && /tmp/install.sh {{ .Name }}<enter><wait>" + "fetch -o /tmp/install.sh http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} && chmod +x /tmp/install.sh && /tmp/install.sh {{ .Name }}<enter><wait>" ], "boot_wait": "10s", "disk_size": 10140, "guest_os_type": "freebsd-64", "headless": "{{ user `headless` }}", "http_directory": "http", - "iso_checksum": "5a3c82653d77bba7d7ded8bd7efbedc09d52cf4045d98ce52a82c9e0f8fa9b0e", - "iso_checksum_type": "sha256", - "iso_url": "{{user `mirror`}}/releases/amd64/amd64/ISO-IMAGES/9.3/FreeBSD-9.3-RELEASE-amd64-disc1.iso", - "output_directory": "packer-freebsd-9.3-amd64-vmware", - "shutdown_command": "echo 'shutdown -p now' > shutdown.sh; cat 'shutdown.sh' | su -", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-vmare", + "shutdown_command": "su -m root -c 'shutdown -p now'", "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", @@ -103,17 +103,17 @@ "mdmfs -s 100m md1 /tmp<enter><wait>", "mdmfs -s 100m md2 /mnt<enter><wait>", "dhclient -l /tmp/dhclient.lease.em0 em0<enter><wait>", - "fetch -o /tmp/install.sh http://{{ .HTTPIP }}:{{ .HTTPPort }}/freebsd-9.3/install.sh && chmod +x /tmp/install.sh && /tmp/install.sh {{ .Name }}<enter><wait>" + "fetch -o /tmp/install.sh http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} && chmod +x /tmp/install.sh && /tmp/install.sh {{ .Name }}<enter><wait>" ], - "boot_wait": "10s", + "boot_wait": "8s", "disk_size": 10140, "guest_os_type": "freebsd", "headless": "{{ user `headless` }}", "http_directory": "http", - "iso_checksum": "5a3c82653d77bba7d7ded8bd7efbedc09d52cf4045d98ce52a82c9e0f8fa9b0e", - "iso_checksum_type": "sha256", - "iso_url": "{{user `mirror`}}/releases/amd64/amd64/ISO-IMAGES/9.3/FreeBSD-9.3-RELEASE-amd64-disc1.iso", - "output_directory": "packer-freebsd-9.3-amd64-parallels", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-parallels", "parallels_tools_mode": "disable", "prlctl": [ [ @@ -150,7 +150,7 @@ ] ], "prlctl_version_file": ".prlctl_version", - "shutdown_command": "echo 'shutdown -p now' > shutdown.sh; cat 'shutdown.sh' | su -", + "shutdown_command": "su -m root -c 'shutdown -p now'", "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", @@ -162,12 +162,8 @@ "post-processors": [ { "output": "builds/{{user `box_basename`}}.{{.Provider}}.box", - "override": { - "parallels": { - "vagrantfile_template": "vagrantfile_templates/parallels/freebsd.rb" - } - }, - "type": "vagrant" + "type": "vagrant", + "vagrantfile_template": "vagrantfile_templates/freebsd.rb" } ], "provisioners": [ @@ -177,11 +173,19 @@ "type": "file" }, { - "environment_vars": [], - "execute_command": "export {{.Vars}} && cat {{.Path}} | su -m", + "environment_vars": [ + "HOME_DIR=/home/vagrant", + "http_proxy={{user `http_proxy`}}", + "https_proxy={{user `https_proxy`}}", + "no_proxy={{user `no_proxy`}}" + ], + "execute_command": "{{.Vars}} su -m root -c 'sh -eux {{.Path}}'", "scripts": [ "scripts/common/metadata.sh", + "scripts/freebsd/update.sh", "scripts/freebsd/postinstall.sh", + "scripts/freebsd/sudoers.sh", + "scripts/common/vagrant.sh", "scripts/freebsd/vmtools.sh", "scripts/freebsd/cleanup.sh", "scripts/freebsd/minimize.sh" @@ -190,16 +194,23 @@ } ], "variables": { - "arch": "64", - "box_basename": "freebsd-9.3", + "box_basename": "__unset_box_basename__", "build_timestamp": "{{isotime \"20060102150405\"}}", "git_revision": "__unknown_git_revision__", "headless": "", + "http_proxy": "{{env `http_proxy`}}", + "https_proxy": "{{env `https_proxy`}}", + "install_path": "freebsd-9.3/install.sh", + "iso_checksum": "5a3c82653d77bba7d7ded8bd7efbedc09d52cf4045d98ce52a82c9e0f8fa9b0e", + "iso_checksum_type": "sha256", + "iso_name": "FreeBSD-9.3-RELEASE-amd64-disc1.iso", "metadata": "floppy/dummy_metadata.json", "mirror": "http://ftp.freebsd.org/pub/FreeBSD", + "mirror_directory": "releases/amd64/amd64/ISO-IMAGES/9.3", "name": "freebsd-9.3", + "no_proxy": "{{env `no_proxy`}}", "template": "freebsd-9.3-amd64", - "version": "2.0.TIMESTAMP" + "version": "2.1.TIMESTAMP" } } diff --git a/freebsd-9.3-i386.json b/freebsd-9.3-i386.json index 9e708df04..5424e1499 100644 --- a/freebsd-9.3-i386.json +++ b/freebsd-9.3-i386.json @@ -14,7 +14,7 @@ "mdmfs -s 100m md1 /tmp<enter><wait>", "mdmfs -s 100m md2 /mnt<enter><wait>", "dhclient -l /tmp/dhclient.lease.em0 em0<enter><wait>", - "fetch -o /tmp/install.sh http://{{ .HTTPIP }}:{{ .HTTPPort }}/freebsd-9.3/install.sh && chmod +x /tmp/install.sh && /tmp/install.sh {{ .Name }}<enter><wait>" + "fetch -o /tmp/install.sh http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} && chmod +x /tmp/install.sh && /tmp/install.sh {{ .Name }}<enter><wait>" ], "boot_wait": "10s", "disk_size": 10140, @@ -22,11 +22,11 @@ "guest_os_type": "FreeBSD", "headless": "{{ user `headless` }}", "http_directory": "http", - "iso_checksum": "cab6aad9c3d5ea6a3fb4059f808225c67f1edaea730c555a86a9707ac41ba75d", - "iso_checksum_type": "sha256", - "iso_url": "{{user `mirror`}}/releases/i386/i386/ISO-IMAGES/9.3/FreeBSD-9.3-RELEASE-i386-disc1.iso", - "output_directory": "packer-freebsd-9.3-i386-virtualbox", - "shutdown_command": "echo 'shutdown -p now' > shutdown.sh; cat 'shutdown.sh' | su -", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-virtualbox", + "shutdown_command": "su -m root -c 'shutdown -p now'", "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", @@ -64,18 +64,18 @@ "mdmfs -s 100m md2 /mnt<enter><wait>", "dhclient -l /tmp/dhclient.lease.em0 em0<enter><wait>", "<wait5>", - "fetch -o /tmp/install.sh http://{{ .HTTPIP }}:{{ .HTTPPort }}/freebsd-9.3/install.sh && chmod +x /tmp/install.sh && /tmp/install.sh {{ .Name }}<enter><wait>" + "fetch -o /tmp/install.sh http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} && chmod +x /tmp/install.sh && /tmp/install.sh {{ .Name }}<enter><wait>" ], "boot_wait": "10s", "disk_size": 10140, "guest_os_type": "freebsd", "headless": "{{ user `headless` }}", "http_directory": "http", - "iso_checksum": "cab6aad9c3d5ea6a3fb4059f808225c67f1edaea730c555a86a9707ac41ba75d", - "iso_checksum_type": "sha256", - "iso_url": "{{user `mirror`}}/releases/i386/i386/ISO-IMAGES/9.3/FreeBSD-9.3-RELEASE-i386-disc1.iso", - "output_directory": "packer-freebsd-9.3-i386-vmware", - "shutdown_command": "echo 'shutdown -p now' > shutdown.sh; cat 'shutdown.sh' | su -", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-vmare", + "shutdown_command": "su -m root -c 'shutdown -p now'", "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", @@ -103,15 +103,17 @@ "mdmfs -s 100m md1 /tmp<enter><wait>", "mdmfs -s 100m md2 /mnt<enter><wait>", "dhclient -l /tmp/dhclient.lease.em0 em0<enter><wait>", - "fetch -o /tmp/install.sh http://{{ .HTTPIP }}:{{ .HTTPPort }}/freebsd-9.3/install.sh && chmod +x /tmp/install.sh && /tmp/install.sh {{ .Name }}<enter><wait>" + "fetch -o /tmp/install.sh http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} && chmod +x /tmp/install.sh && /tmp/install.sh {{ .Name }}<enter><wait>" ], - "boot_wait": "10s", + "boot_wait": "8s", "disk_size": 10140, + "guest_os_type": "freebsd", + "headless": "{{ user `headless` }}", "http_directory": "http", - "iso_checksum": "cab6aad9c3d5ea6a3fb4059f808225c67f1edaea730c555a86a9707ac41ba75d", - "iso_checksum_type": "sha256", - "iso_url": "{{user `mirror`}}/releases/i386/i386/ISO-IMAGES/9.3/FreeBSD-9.3-RELEASE-i386-disc1.iso", - "output_directory": "packer-freebsd-9.3-i386-parallels", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-parallels", "parallels_tools_mode": "disable", "prlctl": [ [ @@ -148,7 +150,7 @@ ] ], "prlctl_version_file": ".prlctl_version", - "shutdown_command": "echo 'shutdown -p now' > shutdown.sh; cat 'shutdown.sh' | su -", + "shutdown_command": "su -m root -c 'shutdown -p now'", "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", @@ -160,12 +162,8 @@ "post-processors": [ { "output": "builds/{{user `box_basename`}}.{{.Provider}}.box", - "override": { - "parallels": { - "vagrantfile_template": "vagrantfile_templates/parallels/freebsd.rb" - } - }, - "type": "vagrant" + "type": "vagrant", + "vagrantfile_template": "vagrantfile_templates/freebsd.rb" } ], "provisioners": [ @@ -175,10 +173,19 @@ "type": "file" }, { - "execute_command": "export {{.Vars}} && cat {{.Path}} | su -m", + "environment_vars": [ + "HOME_DIR=/home/vagrant", + "http_proxy={{user `http_proxy`}}", + "https_proxy={{user `https_proxy`}}", + "no_proxy={{user `no_proxy`}}" + ], + "execute_command": "{{.Vars}} su -m root -c 'sh -eux {{.Path}}'", "scripts": [ "scripts/common/metadata.sh", + "scripts/freebsd/update.sh", "scripts/freebsd/postinstall.sh", + "scripts/freebsd/sudoers.sh", + "scripts/common/vagrant.sh", "scripts/freebsd/vmtools.sh", "scripts/freebsd/cleanup.sh", "scripts/freebsd/minimize.sh" @@ -187,16 +194,23 @@ } ], "variables": { - "arch": "32", - "box_basename": "freebsd-9.3-i386", + "box_basename": "__unset_box_basename__", "build_timestamp": "{{isotime \"20060102150405\"}}", "git_revision": "__unknown_git_revision__", "headless": "", + "http_proxy": "{{env `http_proxy`}}", + "https_proxy": "{{env `https_proxy`}}", + "install_path": "freebsd-9.3/install.sh", + "iso_checksum": "cab6aad9c3d5ea6a3fb4059f808225c67f1edaea730c555a86a9707ac41ba75d", + "iso_checksum_type": "sha256", + "iso_name": "FreeBSD-9.3-RELEASE-i386-disc1.iso", "metadata": "floppy/dummy_metadata.json", "mirror": "http://ftp.freebsd.org/pub/FreeBSD", - "name": "freebsd-9.3-i386", + "mirror_directory": "releases/i386/i386/ISO-IMAGES/9.3", + "name": "freebsd-9.3", + "no_proxy": "{{env `no_proxy`}}", "template": "freebsd-9.3-i386", - "version": "2.0.TIMESTAMP" + "version": "2.1.TIMESTAMP" } } diff --git a/scripts/common/vagrant.sh b/scripts/common/vagrant.sh index cf12a564a..b69c3a585 100644 --- a/scripts/common/vagrant.sh +++ b/scripts/common/vagrant.sh @@ -9,6 +9,8 @@ if command -v wget >/dev/null 2>&1; then wget --no-check-certificate "$pubkey_url" -O $HOME_DIR/.ssh/authorized_keys; elif command -v curl >/dev/null 2>&1; then curl --insecure --location "$pubkey_url" > $HOME_DIR/.ssh/authorized_keys; +elif command -v fetch >/dev/null 2>&1; then + fetch -am -o $HOME_DIR/.ssh/authorized_keys "$pubkey_url"; else echo "Cannot download vagrant public key"; exit 1; diff --git a/scripts/freebsd/cleanup.sh b/scripts/freebsd/cleanup.sh index dd8479794..7451cc824 100644 --- a/scripts/freebsd/cleanup.sh +++ b/scripts/freebsd/cleanup.sh @@ -1,11 +1,10 @@ -#!/bin/sh +#!/bin/sh -eux # Purge files we don't need any longer -rm -f /tmp/chef* -rm -rf /var/db/freebsd-update/files -mkdir /var/db/freebsd-update/files -rm -f /var/db/freebsd-update/*-rollback -rm -rf /var/db/freebsd-update/install.* -rm -rf /boot/kernel.old -rm -rf /usr/src/* -rm -f /*.core +rm -rf /var/db/freebsd-update/files; +mkdir -p /var/db/freebsd-update/files; +rm -f /var/db/freebsd-update/*-rollback; +rm -rf /var/db/freebsd-update/install.*; +rm -rf /boot/kernel.old; +rm -rf /usr/src/*; +rm -f /*.core; diff --git a/scripts/freebsd/minimize.sh b/scripts/freebsd/minimize.sh index 9a014d87f..670aca7ac 100644 --- a/scripts/freebsd/minimize.sh +++ b/scripts/freebsd/minimize.sh @@ -1,7 +1,7 @@ #!/bin/sh -eux -dd if=/dev/zero of=/EMPTY bs=1M -rm -f /EMPTY +dd if=/dev/zero of=/EMPTY bs=1M || echo "dd exit code $? is suppressed"; +rm -f /EMPTY; # Block until the empty file has been removed, otherwise, Packer # will try to kill the box while the disk is still full and that's bad -sync +sync; diff --git a/scripts/freebsd/postinstall.sh b/scripts/freebsd/postinstall.sh index d741ad298..5fb23ad3e 100644 --- a/scripts/freebsd/postinstall.sh +++ b/scripts/freebsd/postinstall.sh @@ -1,59 +1,25 @@ -#!/bin/sh -x +#!/bin/sh -eux -freebsd_major=`uname -r | awk -F. '{ print $1 }'` +# Set the time correctly +ntpdate -v -b in.pool.ntp.org; -#Set the time correctly -ntpdate -v -b in.pool.ntp.org +# Install sudo, curl and ca_root_nss +pkg install -y curl; +pkg install -y ca_root_nss; -date > /etc/vagrant_box_build_time +# Emulate the ETCSYMLINK behavior of ca_root_nss; this is for FreeBSD 10, +# where fetch(1) was massively refactored and doesn't come with +# SSL CAcerts anymore +ln -sf /usr/local/share/certs/ca-root-nss.crt /etc/ssl/cert.pem; -# allow freebsd-update to run fetch without stdin attached to a terminal -sed 's/\[ ! -t 0 \]/false/' /usr/sbin/freebsd-update > /tmp/freebsd-update -chmod +x /tmp/freebsd-update +# As sharedfolders are not in defaults ports tree, we will use NFS sharing +cat >>/etc/rc.conf << RC_CONF +rpcbind_enable="YES" +nfs_server_enable="YES" +mountd_flags="-r" +RC_CONF -# update FreeBSD -env PAGER=/bin/cat /tmp/freebsd-update fetch -env PAGER=/bin/cat /tmp/freebsd-update install - -# always use pkgng - pkg_add is EOL as of 1 September 2014 -env ASSUME_ALWAYS_YES=true pkg bootstrap -if [ $freebsd_major -lt 10 ]; then - echo WITH_PKGNG=yes >> /etc/make.conf -fi - -#Install sudo, curl and ca_root_nss -pkg update -pkg install -y sudo -pkg install -y curl -pkg install -y ca_root_nss - -# Emulate the ETCSYMLINK behavior of ca_root_nss; this is for FreeBSD 10, where fetch(1) was -# massively refactored and doesn't come with SSL CAcerts anymore -ln -sf /usr/local/share/certs/ca-root-nss.crt /etc/ssl/cert.pem - -#Installing vagrant keys -mkdir /home/vagrant/.ssh -chmod 700 /home/vagrant/.ssh -cd /home/vagrant/.ssh -fetch -am -o authorized_keys 'https://raw.github.com/mitchellh/vagrant/master/keys/vagrant.pub' -chown -R vagrant /home/vagrant/.ssh -chmod -R go-rwsx /home/vagrant/.ssh - -# As sharedfolders are not in defaults ports tree -# We will use vagrant via NFS -# Enable NFS -echo 'rpcbind_enable="YES"' >> /etc/rc.conf -echo 'nfs_server_enable="YES"' >> /etc/rc.conf -echo 'mountd_flags="-r"' >> /etc/rc.conf - -# Enable passwordless sudo -echo "vagrant ALL=(ALL) NOPASSWD: ALL" >> /usr/local/etc/sudoers - -# disable X11 because vagrants are (usually) headless -cat >> /etc/make.conf << EOT +# Disable X11 because Vagrants VMs are (usually) headless +cat >>/etc/make.conf << MAKE_CONF WITHOUT_X11="YES" -EOT - -pw groupadd vboxusers -pw groupmod vboxusers -m vagrant - +MAKE_CONF diff --git a/scripts/freebsd/sudoers.sh b/scripts/freebsd/sudoers.sh new file mode 100644 index 000000000..d8c2032b4 --- /dev/null +++ b/scripts/freebsd/sudoers.sh @@ -0,0 +1,4 @@ +#!/bin/sh -eux + +pkg install -y sudo; +echo "vagrant ALL=(ALL) NOPASSWD: ALL" >>/usr/local/etc/sudoers; diff --git a/scripts/freebsd/update.sh b/scripts/freebsd/update.sh new file mode 100644 index 000000000..0055c2c74 --- /dev/null +++ b/scripts/freebsd/update.sh @@ -0,0 +1,19 @@ +#!/bin/sh -eux + +major_version="`uname -r | awk -F. '{print $1}'`"; + +# Allow freebsd-update to run fetch without stdin attached to a terminal +sed 's/\[ ! -t 0 \]/false/' /usr/sbin/freebsd-update >/tmp/freebsd-update; +chmod +x /tmp/freebsd-update; + +# Update FreeBSD +env PAGER=/bin/cat /tmp/freebsd-update fetch; +env PAGER=/bin/cat /tmp/freebsd-update install; + +# Always use pkgng - pkg_add is EOL as of 1 September 2014 +env ASSUME_ALWAYS_YES=true pkg bootstrap; +if [ "$major_version" -lt 10 ]; then + echo "WITH_PKGNG=yes" >>/etc/make.conf; +fi + +pkg update; diff --git a/scripts/freebsd/vmtools.sh b/scripts/freebsd/vmtools.sh index 9927f1760..8ad971857 100644 --- a/scripts/freebsd/vmtools.sh +++ b/scripts/freebsd/vmtools.sh @@ -1,52 +1,66 @@ -#!/bin/sh - -freebsd_major=`uname -r | awk -F. '{ print $1 }'` -pkg_command="pkg install -y" -if [ $freebsd_major -gt 9 ]; then - perl_pkg="perl5" -else - perl_pkg="perl" -fi - -if [ $PACKER_BUILDER_TYPE == 'virtualbox-iso' ]; then - # disable X11 because vagrants are (usually) headless - echo 'WITHOUT_X11="YES"' >> /etc/make.conf - - $pkg_command virtualbox-ose-additions - - echo 'vboxdrv_load="YES"' >> /boot/loader.conf - echo 'vboxnet_enable="YES"' >> /etc/rc.conf - echo 'vboxguest_enable="YES"' >> /etc/rc.conf - echo 'vboxservice_enable="YES"' >> /etc/rc.conf - - echo 'virtio_blk_load="YES"' >> /boot/loader.conf - if [ $freebsd_major -gt 9 ]; then - # Appeared in FreeBSD 10 - echo 'virtio_scsi_load="YES"' >> /boot/loader.conf - fi - echo 'virtio_balloon_load="YES"' >> /boot/loader.conf - echo 'if_vtnet_load="YES"' >> /boot/loader.conf - - echo 'ifconfig_vtnet0_name="em0"' >> /etc/rc.conf - echo 'ifconfig_vtnet1_name="em1"' >> /etc/rc.conf - echo 'ifconfig_vtnet2_name="em2"' >> /etc/rc.conf - echo 'ifconfig_vtnet3_name="em3"' >> /etc/rc.conf -fi - -if [ $PACKER_BUILDER_TYPE == 'vmware-iso' ]; then - mkdir /tmp/vmfusion - mkdir /tmp/vmfusion-archive - mdconfig -a -t vnode -f /home/vagrant/freebsd.iso -u 0 - mount -t cd9660 /dev/md0 /tmp/vmfusion - tar xzf /tmp/vmfusion/vmware-freebsd-tools.tar.gz -C /tmp/vmfusion-archive - $pkg_command $perl_pkg - # Welcome to 2005. Have you heard of this "YouTube" thing? - $pkg_command compat6x-`uname -m` - /tmp/vmfusion-archive/vmware-tools-distrib/vmware-install.pl --default - - echo 'ifconfig_vxn0="dhcp"' >> /etc/rc.conf - umount /tmp/vmfusion - rmdir /tmp/vmfusion - rm -rf /tmp/vmfusion-archive - rm /home/vagrant/freebsd.iso -fi +#!/bin/sh -eux + +freebsd_major="`uname -r | awk -F. '{print $1}'`"; + +case "$PACKER_BUILDER_TYPE" in + +virtualbox-iso|virtualbox-ovf) + # Disable X11 because vagrants are (usually) headless + echo 'WITHOUT_X11="YES"' >> /etc/make.conf; + + pkg install -y virtualbox-ose-additions; + + echo 'vboxdrv_load="YES"' >>/boot/loader.conf; + echo 'vboxnet_enable="YES"' >>/etc/rc.conf; + echo 'vboxguest_enable="YES"' >>/etc/rc.conf; + echo 'vboxservice_enable="YES"' >>/etc/rc.conf; + + echo 'virtio_blk_load="YES"' >>/boot/loader.conf; + if [ "$freebsd_major" -gt 9 ]; then + # Appeared in FreeBSD 10 + echo 'virtio_scsi_load="YES"' >>/boot/loader.conf; + fi + echo 'virtio_balloon_load="YES"' >>/boot/loader.conf; + echo 'if_vtnet_load="YES"' >>/boot/loader.conf; + + echo 'ifconfig_vtnet0_name="em0"' >>/etc/rc.conf; + echo 'ifconfig_vtnet1_name="em1"' >>/etc/rc.conf; + echo 'ifconfig_vtnet2_name="em2"' >>/etc/rc.conf; + echo 'ifconfig_vtnet3_name="em3"' >>/etc/rc.conf; + + pw groupadd vboxusers; + pw groupmod vboxusers -m vagrant; + ;; + +vmware-iso|vmware-vmx) + # Install Perl and other software needed by vmware-install.pl + pkg install -y perl5; + pkg install -y compat6x-`uname -m`; + # the install script is very picky about location of perl command + ln -s /usr/local/bin/perl /usr/bin/perl; + + mkdir -p /tmp/vmfusion; + mkdir -p /tmp/vmfusion-archive; + mdconfig -a -t vnode -f $HOME_DIR/freebsd.iso -u 0; + mount -t cd9660 /dev/md0 /tmp/vmfusion; + tar xzf /tmp/vmfusion/vmware-freebsd-tools.tar.gz -C /tmp/vmfusion-archive; + /tmp/vmfusion-archive/vmware-tools-distrib/vmware-install.pl --default; + echo 'ifconfig_vxn0="dhcp"' >>/etc/rc.conf; + umount /tmp/vmfusion; + rm -rf /tmp/vmfusion; + rm -rf /tmp/vmfusion-archive; + rm -f $HOME_DIR/*.iso; + + rm -f /usr/bin/perl; + ;; + +parallels-iso|parallels-pvm) + echo "No current support for Parallels tools, continuing" + ;; + +*) + echo "Unknown Packer Builder Type >>$PACKER_BUILDER_TYPE<< selected."; + echo "Known are virtualbox-iso|virtualbox-ovf|vmware-iso|vmware-vmx|parallels-iso|parallels-pvm."; + ;; + +esac diff --git a/vagrantfile_templates/freebsd.rb b/vagrantfile_templates/freebsd.rb new file mode 100644 index 000000000..b32e741b2 --- /dev/null +++ b/vagrantfile_templates/freebsd.rb @@ -0,0 +1,15 @@ +Vagrant.require_version '>= 1.1.0' + +Vagrant.configure(2) do |config| + config.ssh.shell = 'sh' + + # Disable the base shared folder, Guest Tools supporting this feature are + # unavailable for all providers. + config.vm.synced_folder '.', '/vagrant', disabled: true + + config.vm.provider :parallels do |prl, override| + # Guest Tools are unavailable. + prl.check_guest_tools = false + prl.functional_psf = false + end +end diff --git a/vagrantfile_templates/parallels/freebsd.rb b/vagrantfile_templates/parallels/freebsd.rb deleted file mode 100644 index 1f795a8c4..000000000 --- a/vagrantfile_templates/parallels/freebsd.rb +++ /dev/null @@ -1,17 +0,0 @@ -# -*- mode: ruby -*- -# # vi: set ft=ruby : - -Vagrant.require_version ">= 1.1.0" - -Vagrant.configure("2") do |config| - config.ssh.shell = "sh" - - # Disable the base shared folder, Guest Tools are unavailable. - config.vm.synced_folder ".", "/vagrant", disabled: true - - config.vm.provider :parallels do |prl| - # Guest Tools are unavailable. - prl.check_guest_tools = false - prl.functional_psf = false - end -end From 250efaa58ad8ff239afabdc7a44a14564d530116 Mon Sep 17 00:00:00 2001 From: Fletcher Nichol <fnichol@nichol.ca> Date: Sun, 12 Jul 2015 20:49:51 -0600 Subject: [PATCH 0370/1622] [debian-*] Improve DRYness, correctness, & speed of Debian templates. The following improvements are made in this commit: * Ensure that all related provisioner shell scripts are written using more conservative bourne code idioms * Call all provisioner scripts with `sh -eux` which will (e) exit immediately if a command exits with a non-zero exit status, (u) treats unset variables as an error, and (x) outputs the command and its expanded arguments or associated word list * Use the `template` user variable to replace repetition of `"debian-*"` style strings throughout * Support a `HOME_DIR` environment variable for provisioner scripts to use * Remove now-unused user variable `arch` * Extract the `iso_checksum` and `iso_checksum_type` values into user variables and reference them in the templates * Construct the `iso_url` value from the `mirror`, `mirror_directory`, and `iso_name` user variables * Add an `install_path` user variable and use it throughout the templates * Add an `iso_name` user variable and use it throughout the templates * Use the `http_proxy`, `https_proxy`, and `no_proxy` environment variables if set on the workstation and make them available to the provisioner shell scripts to speed up package installations, etc. * Improve the `scripts/debian/cleanup.sh` implementation to more closely match the Ubuntu version * Attempt to upgrade the version of the kernel in `scripts/debian/update.sh` --- debian-6.0.10-amd64.json | 58 +++++++++++++++++++++-------------- debian-6.0.10-i386.json | 58 +++++++++++++++++++++-------------- debian-7.8-amd64.json | 58 +++++++++++++++++++++-------------- debian-7.8-i386.json | 59 ++++++++++++++++++++++-------------- debian-8.1-amd64.json | 58 +++++++++++++++++++++-------------- debian-8.1-i386.json | 58 +++++++++++++++++++++-------------- scripts/debian/cleanup.sh | 49 +++++++++++++++++++++++++++--- scripts/debian/networking.sh | 14 ++++++--- scripts/debian/sudoers.sh | 9 +++--- scripts/debian/update.sh | 20 ++++++++++-- 10 files changed, 286 insertions(+), 155 deletions(-) diff --git a/debian-6.0.10-amd64.json b/debian-6.0.10-amd64.json index a3d16192a..89609c149 100644 --- a/debian-6.0.10-amd64.json +++ b/debian-6.0.10-amd64.json @@ -4,7 +4,7 @@ "boot_command": [ "<esc><wait>", "install <wait>", - "preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/debian-6.0/preseed.cfg <wait>", + " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}} <wait>", "debian-installer=en_US <wait>", "auto <wait>", "locale=en_US <wait>", @@ -25,11 +25,11 @@ "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", "http_directory": "http", - "iso_checksum": "f3e70528664f174a121b26491c59cd66daaf8274", - "iso_checksum_type": "sha1", - "iso_url": "{{user `mirror`}}/6.0.10/amd64/iso-cd/debian-6.0.10-amd64-CD-1.iso", - "output_directory": "packer-debian-6.0.10-amd64-virtualbox", - "shutdown_command": "echo 'vagrant'|sudo -S /sbin/shutdown -hP now", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-virtualbox", + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", @@ -56,7 +56,7 @@ "boot_command": [ "<esc><wait>", "install <wait>", - "preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/debian-6.0/preseed.cfg <wait>", + " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}} <wait>", "debian-installer=en_US <wait>", "auto <wait>", "locale=en_US <wait>", @@ -75,11 +75,11 @@ "guest_os_type": "debian5-64", "headless": "{{ user `headless` }}", "http_directory": "http", - "iso_checksum": "f3e70528664f174a121b26491c59cd66daaf8274", - "iso_checksum_type": "sha1", - "iso_url": "{{user `mirror`}}/6.0.10/amd64/iso-cd/debian-6.0.10-amd64-CD-1.iso", - "output_directory": "packer-debian-6.0.10-amd64-vmware", - "shutdown_command": "echo 'vagrant'|sudo -S /sbin/shutdown -hP now", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-vmware", + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", @@ -97,7 +97,7 @@ "boot_command": [ "<esc><wait>", "install <wait>", - "preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/debian-6.0/preseed.cfg <wait>", + " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}} <wait>", "debian-installer=en_US <wait>", "auto <wait>", "locale=en_US <wait>", @@ -116,10 +116,10 @@ "guest_os_type": "debian", "headless": "{{ user `headless` }}", "http_directory": "http", - "iso_checksum": "f3e70528664f174a121b26491c59cd66daaf8274", - "iso_checksum_type": "sha1", - "iso_url": "{{user `mirror`}}/6.0.10/amd64/iso-cd/debian-6.0.10-amd64-CD-1.iso", - "output_directory": "packer-debian-6.0.10-amd64-parallels", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-parallels", "parallels_tools_flavor": "lin", "prlctl": [ [ @@ -136,7 +136,7 @@ ] ], "prlctl_version_file": ".prlctl_version", - "shutdown_command": "echo 'vagrant'|sudo -S /sbin/shutdown -hP now", + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", @@ -158,8 +158,13 @@ "type": "file" }, { - "environment_vars": [], - "execute_command": "echo 'vagrant' | {{.Vars}} sudo -E -S bash '{{.Path}}'", + "environment_vars": [ + "HOME_DIR=/home/vagrant", + "http_proxy={{user `http_proxy`}}", + "https_proxy={{user `https_proxy`}}", + "no_proxy={{user `no_proxy`}}" + ], + "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", "scripts": [ "scripts/common/metadata.sh", "scripts/debian/update.sh", @@ -175,16 +180,23 @@ } ], "variables": { - "arch": "64", - "box_basename": "debian-6.0.10", + "box_basename": "__unset_box_basename__", "build_timestamp": "{{isotime \"20060102150405\"}}", "git_revision": "__unknown_git_revision__", "headless": "", + "http_proxy": "{{env `http_proxy`}}", + "https_proxy": "{{env `https_proxy`}}", + "iso_checksum": "f3e70528664f174a121b26491c59cd66daaf8274", + "iso_checksum_type": "sha1", + "iso_name": "debian-6.0.10-amd64-CD-1.iso", "metadata": "floppy/dummy_metadata.json", "mirror": "http://cdimage.debian.org/cdimage/archive", + "mirror_directory": "6.0.10/amd64/iso-cd", "name": "debian-6.0.10", + "no_proxy": "{{env `no_proxy`}}", + "preseed_path": "debian-6.0/preseed.cfg", "template": "debian-6.0.10-amd64", - "version": "2.0.TIMESTAMP" + "version": "2.1.TIMESTAMP" } } diff --git a/debian-6.0.10-i386.json b/debian-6.0.10-i386.json index 6ea924875..d2ecbae35 100644 --- a/debian-6.0.10-i386.json +++ b/debian-6.0.10-i386.json @@ -4,7 +4,7 @@ "boot_command": [ "<esc><wait>", "install <wait>", - "preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/debian-6.0/preseed.cfg <wait>", + " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}} <wait>", "debian-installer=en_US <wait>", "auto <wait>", "locale=en_US <wait>", @@ -25,11 +25,11 @@ "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", "http_directory": "http", - "iso_checksum": "e8f77720e30f669e731fe3166ad6c3d2da33d93a", - "iso_checksum_type": "sha1", - "iso_url": "{{user `mirror`}}/6.0.10/i386/iso-cd/debian-6.0.10-i386-CD-1.iso", - "output_directory": "packer-debian-6.0.10-i386-virtualbox", - "shutdown_command": "echo 'vagrant'|sudo -S /sbin/shutdown -hP now", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-virtualbox", + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", @@ -56,7 +56,7 @@ "boot_command": [ "<esc><wait>", "install <wait>", - "preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/debian-6.0/preseed.cfg <wait>", + " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}} <wait>", "debian-installer=en_US <wait>", "auto <wait>", "locale=en_US <wait>", @@ -75,11 +75,11 @@ "guest_os_type": "debian5", "headless": "{{ user `headless` }}", "http_directory": "http", - "iso_checksum": "e8f77720e30f669e731fe3166ad6c3d2da33d93a", - "iso_checksum_type": "sha1", - "iso_url": "{{user `mirror`}}/6.0.10/i386/iso-cd/debian-6.0.10-i386-CD-1.iso", - "output_directory": "packer-debian-6.0.10-i386-vmware", - "shutdown_command": "echo 'vagrant'|sudo -S /sbin/shutdown -hP now", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-vmware", + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", @@ -97,7 +97,7 @@ "boot_command": [ "<esc><wait>", "install <wait>", - "preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/debian-6.0/preseed.cfg <wait>", + " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}} <wait>", "debian-installer=en_US <wait>", "auto <wait>", "locale=en_US <wait>", @@ -116,10 +116,10 @@ "guest_os_type": "debian", "headless": "{{ user `headless` }}", "http_directory": "http", - "iso_checksum": "e8f77720e30f669e731fe3166ad6c3d2da33d93a", - "iso_checksum_type": "sha1", - "iso_url": "{{user `mirror`}}/6.0.10/i386/iso-cd/debian-6.0.10-i386-CD-1.iso", - "output_directory": "packer-debian-6.0.10-i386-parallels", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-parallels", "parallels_tools_flavor": "lin", "prlctl": [ [ @@ -136,7 +136,7 @@ ] ], "prlctl_version_file": ".prlctl_version", - "shutdown_command": "echo 'vagrant'|sudo -S /sbin/shutdown -hP now", + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", @@ -158,8 +158,13 @@ "type": "file" }, { - "environment_vars": [], - "execute_command": "echo 'vagrant' | {{.Vars}} sudo -E -S bash '{{.Path}}'", + "environment_vars": [ + "HOME_DIR=/home/vagrant", + "http_proxy={{user `http_proxy`}}", + "https_proxy={{user `https_proxy`}}", + "no_proxy={{user `no_proxy`}}" + ], + "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", "scripts": [ "scripts/common/metadata.sh", "scripts/debian/update.sh", @@ -175,16 +180,23 @@ } ], "variables": { - "arch": "32", - "box_basename": "debian-6.0.10-i386", + "box_basename": "__unset_box_basename__", "build_timestamp": "{{isotime \"20060102150405\"}}", "git_revision": "__unknown_git_revision__", "headless": "", + "http_proxy": "{{env `http_proxy`}}", + "https_proxy": "{{env `https_proxy`}}", + "iso_checksum": "e8f77720e30f669e731fe3166ad6c3d2da33d93a", + "iso_checksum_type": "sha1", + "iso_name": "debian-6.0.10-i386-CD-1.iso", "metadata": "floppy/dummy_metadata.json", "mirror": "http://cdimage.debian.org/cdimage/archive", + "mirror_directory": "6.0.10/i386/iso-cd", "name": "debian-6.0.10-i386", + "no_proxy": "{{env `no_proxy`}}", + "preseed_path": "debian-6.0/preseed.cfg", "template": "debian-6.0.10-i386", - "version": "2.0.TIMESTAMP" + "version": "2.1.TIMESTAMP" } } diff --git a/debian-7.8-amd64.json b/debian-7.8-amd64.json index ea8a1cabb..7507eeb12 100644 --- a/debian-7.8-amd64.json +++ b/debian-7.8-amd64.json @@ -4,7 +4,7 @@ "boot_command": [ "<esc><wait>", "install <wait>", - "preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/debian-7/preseed.cfg <wait>", + " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}} <wait>", "debian-installer=en_US <wait>", "auto <wait>", "locale=en_US <wait>", @@ -25,11 +25,11 @@ "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", "http_directory": "http", - "iso_checksum": "5f611b40b0803f8be1180da561cfbc159e381599", - "iso_checksum_type": "sha1", - "iso_url": "{{user `mirror`}}/7.8.0/amd64/iso-cd/debian-7.8.0-amd64-CD-1.iso", - "output_directory": "packer-debian-7.8-amd64-virtualbox", - "shutdown_command": "echo 'vagrant'|sudo -S /sbin/shutdown -hP now", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-virtualbox", + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", @@ -56,7 +56,7 @@ "boot_command": [ "<esc><wait>", "install <wait>", - "preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/debian-7/preseed.cfg <wait>", + " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}} <wait>", "debian-installer=en_US <wait>", "auto <wait>", "locale=en_US <wait>", @@ -75,11 +75,11 @@ "guest_os_type": "debian7-64", "headless": "{{ user `headless` }}", "http_directory": "http", - "iso_checksum": "5f611b40b0803f8be1180da561cfbc159e381599", - "iso_checksum_type": "sha1", - "iso_url": "{{user `mirror`}}/7.8.0/amd64/iso-cd/debian-7.8.0-amd64-CD-1.iso", - "output_directory": "packer-debian-7.8-amd64-vmware", - "shutdown_command": "echo 'vagrant'|sudo -S /sbin/shutdown -hP now", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-vmware", + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", @@ -97,7 +97,7 @@ "boot_command": [ "<esc><wait>", "install <wait>", - "preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/debian-7/preseed.cfg <wait>", + " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}} <wait>", "debian-installer=en_US <wait>", "auto <wait>", "locale=en_US <wait>", @@ -116,10 +116,10 @@ "guest_os_type": "debian", "headless": "{{ user `headless` }}", "http_directory": "http", - "iso_checksum": "5f611b40b0803f8be1180da561cfbc159e381599", - "iso_checksum_type": "sha1", - "iso_url": "{{user `mirror`}}/7.8.0/amd64/iso-cd/debian-7.8.0-amd64-CD-1.iso", - "output_directory": "packer-debian-7.8-amd64-parallels", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-parallels", "parallels_tools_flavor": "lin", "prlctl": [ [ @@ -136,7 +136,7 @@ ] ], "prlctl_version_file": ".prlctl_version", - "shutdown_command": "echo 'vagrant'|sudo -S /sbin/shutdown -hP now", + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", @@ -158,8 +158,13 @@ "type": "file" }, { - "environment_vars": [], - "execute_command": "echo 'vagrant' | {{.Vars}} sudo -E -S bash '{{.Path}}'", + "environment_vars": [ + "HOME_DIR=/home/vagrant", + "http_proxy={{user `http_proxy`}}", + "https_proxy={{user `https_proxy`}}", + "no_proxy={{user `no_proxy`}}" + ], + "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", "scripts": [ "scripts/common/metadata.sh", "scripts/debian/update.sh", @@ -175,16 +180,23 @@ } ], "variables": { - "arch": "64", - "box_basename": "debian-7.8", + "box_basename": "__unset_box_basename__", "build_timestamp": "{{isotime \"20060102150405\"}}", "git_revision": "__unknown_git_revision__", "headless": "", + "http_proxy": "{{env `http_proxy`}}", + "https_proxy": "{{env `https_proxy`}}", + "iso_checksum": "5f611b40b0803f8be1180da561cfbc159e381599", + "iso_checksum_type": "sha1", + "iso_name": "debian-7.8.0-amd64-CD-1.iso", "metadata": "floppy/dummy_metadata.json", "mirror": "http://cdimage.debian.org/cdimage/archive", + "mirror_directory": "7.8.0/amd64/iso-cd", "name": "debian-7.8", + "no_proxy": "{{env `no_proxy`}}", + "preseed_path": "debian-7/preseed.cfg", "template": "debian-7.8-amd64", - "version": "2.0.TIMESTAMP" + "version": "2.1.TIMESTAMP" } } diff --git a/debian-7.8-i386.json b/debian-7.8-i386.json index f7205deac..381801c57 100644 --- a/debian-7.8-i386.json +++ b/debian-7.8-i386.json @@ -4,7 +4,7 @@ "boot_command": [ "<esc><wait>", "install <wait>", - "preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/debian-7/preseed.cfg <wait>", + " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}} <wait>", "debian-installer=en_US <wait>", "auto <wait>", "locale=en_US <wait>", @@ -25,11 +25,11 @@ "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", "http_directory": "http", - "iso_checksum": "d87664e590f39aba725ec9705dc58a8c75417fef", - "iso_checksum_type": "sha1", - "iso_url": "{{user `mirror`}}/7.8.0/i386/iso-cd/debian-7.8.0-i386-CD-1.iso", - "output_directory": "packer-debian-7.8-i386-virtualbox", - "shutdown_command": "echo 'vagrant'|sudo -S /sbin/shutdown -hP now", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-virtualbox", + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", @@ -56,7 +56,7 @@ "boot_command": [ "<esc><wait>", "install <wait>", - "preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/debian-7/preseed.cfg <wait>", + " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}} <wait>", "debian-installer=en_US <wait>", "auto <wait>", "locale=en_US <wait>", @@ -75,11 +75,12 @@ "guest_os_type": "debian7", "headless": "{{ user `headless` }}", "http_directory": "http", - "iso_checksum": "d87664e590f39aba725ec9705dc58a8c75417fef", - "iso_checksum_type": "sha1", - "iso_url": "{{user `mirror`}}/7.8.0/i386/iso-cd/debian-7.8.0-i386-CD-1.iso", - "output_directory": "packer-debian-7.8-i386-vmware", - "shutdown_command": "echo 'vagrant'|sudo -S /sbin/shutdown -hP now", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-vmware", + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", @@ -97,7 +98,7 @@ "boot_command": [ "<esc><wait>", "install <wait>", - "preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/debian-7/preseed.cfg <wait>", + " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}} <wait>", "debian-installer=en_US <wait>", "auto <wait>", "locale=en_US <wait>", @@ -116,10 +117,10 @@ "guest_os_type": "debian", "headless": "{{ user `headless` }}", "http_directory": "http", - "iso_checksum": "d87664e590f39aba725ec9705dc58a8c75417fef", - "iso_checksum_type": "sha1", - "iso_url": "{{user `mirror`}}/7.8.0/i386/iso-cd/debian-7.8.0-i386-CD-1.iso", - "output_directory": "packer-debian-7.8-i386-parallels", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-parallels", "parallels_tools_flavor": "lin", "prlctl": [ [ @@ -136,7 +137,7 @@ ] ], "prlctl_version_file": ".prlctl_version", - "shutdown_command": "echo 'vagrant'|sudo -S /sbin/shutdown -hP now", + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", @@ -158,8 +159,13 @@ "type": "file" }, { - "environment_vars": [], - "execute_command": "echo 'vagrant' | {{.Vars}} sudo -E -S bash '{{.Path}}'", + "environment_vars": [ + "HOME_DIR=/home/vagrant", + "http_proxy={{user `http_proxy`}}", + "https_proxy={{user `https_proxy`}}", + "no_proxy={{user `no_proxy`}}" + ], + "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", "scripts": [ "scripts/common/metadata.sh", "scripts/debian/update.sh", @@ -175,16 +181,23 @@ } ], "variables": { - "arch": "32", - "box_basename": "debian-7.8-i386", + "box_basename": "__unset_box_basename__", "build_timestamp": "{{isotime \"20060102150405\"}}", "git_revision": "__unknown_git_revision__", "headless": "", + "http_proxy": "{{env `http_proxy`}}", + "https_proxy": "{{env `https_proxy`}}", + "iso_checksum": "d87664e590f39aba725ec9705dc58a8c75417fef", + "iso_checksum_type": "sha1", + "iso_name": "debian-7.8.0-i386-CD-1.iso", "metadata": "floppy/dummy_metadata.json", "mirror": "http://cdimage.debian.org/cdimage/archive", + "mirror_directory": "7.8.0/i386/iso-cd", "name": "debian-7.8-i386", + "no_proxy": "{{env `no_proxy`}}", + "preseed_path": "debian-7/preseed.cfg", "template": "debian-7.8-i386", - "version": "2.0.TIMESTAMP" + "version": "2.1.TIMESTAMP" } } diff --git a/debian-8.1-amd64.json b/debian-8.1-amd64.json index 9fbd149f8..3ca0596ab 100644 --- a/debian-8.1-amd64.json +++ b/debian-8.1-amd64.json @@ -4,7 +4,7 @@ "boot_command": [ "<esc><wait>", "install <wait>", - "preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/debian-8/preseed.cfg <wait>", + " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}} <wait>", "debian-installer=en_US <wait>", "auto <wait>", "locale=en_US <wait>", @@ -25,11 +25,11 @@ "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", "http_directory": "http", - "iso_checksum": "22bae271a732333ebff150598292d9907d2c6001", - "iso_checksum_type": "sha1", - "iso_url": "{{user `mirror`}}/8.1.0/amd64/iso-cd/debian-8.1.0-amd64-CD-1.iso", - "output_directory": "packer-debian-8.1-amd64-virtualbox", - "shutdown_command": "echo 'vagrant'|sudo -S /sbin/shutdown -hP now", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-virtualbox", + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", @@ -56,7 +56,7 @@ "boot_command": [ "<esc><wait>", "install <wait>", - "preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/debian-8/preseed.cfg <wait>", + " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}} <wait>", "debian-installer=en_US <wait>", "auto <wait>", "locale=en_US <wait>", @@ -75,11 +75,11 @@ "guest_os_type": "debian8-64", "headless": "{{ user `headless` }}", "http_directory": "http", - "iso_checksum": "22bae271a732333ebff150598292d9907d2c6001", - "iso_checksum_type": "sha1", - "iso_url": "{{user `mirror`}}/8.1.0/amd64/iso-cd/debian-8.1.0-amd64-CD-1.iso", - "output_directory": "packer-debian-8.1-amd64-vmware", - "shutdown_command": "echo 'vagrant'|sudo -S /sbin/shutdown -hP now", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-vmware", + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", @@ -97,7 +97,7 @@ "boot_command": [ "<esc><wait>", "install <wait>", - "preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/debian-8/preseed.cfg <wait>", + " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}} <wait>", "debian-installer=en_US <wait>", "auto <wait>", "locale=en_US <wait>", @@ -116,10 +116,10 @@ "guest_os_type": "debian", "headless": "{{ user `headless` }}", "http_directory": "http", - "iso_checksum": "22bae271a732333ebff150598292d9907d2c6001", - "iso_checksum_type": "sha1", - "iso_url": "{{user `mirror`}}/8.1.0/amd64/iso-cd/debian-8.1.0-amd64-CD-1.iso", - "output_directory": "packer-debian-8.1-amd64-parallels", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-parallels", "parallels_tools_flavor": "lin", "prlctl": [ [ @@ -136,7 +136,7 @@ ] ], "prlctl_version_file": ".prlctl_version", - "shutdown_command": "echo 'vagrant'|sudo -S /sbin/shutdown -hP now", + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", @@ -158,8 +158,13 @@ "type": "file" }, { - "environment_vars": [], - "execute_command": "echo 'vagrant' | {{.Vars}} sudo -E -S bash '{{.Path}}'", + "environment_vars": [ + "HOME_DIR=/home/vagrant", + "http_proxy={{user `http_proxy`}}", + "https_proxy={{user `https_proxy`}}", + "no_proxy={{user `no_proxy`}}" + ], + "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", "scripts": [ "scripts/common/metadata.sh", "scripts/debian/update.sh", @@ -175,16 +180,23 @@ } ], "variables": { - "arch": "64", - "box_basename": "debian-8.1", + "box_basename": "__unset_box_basename__", "build_timestamp": "{{isotime \"20060102150405\"}}", "git_revision": "__unknown_git_revision__", "headless": "", + "http_proxy": "{{env `http_proxy`}}", + "https_proxy": "{{env `https_proxy`}}", + "iso_checksum": "22bae271a732333ebff150598292d9907d2c6001", + "iso_checksum_type": "sha1", + "iso_name": "debian-8.1.0-amd64-CD-1.iso", "metadata": "floppy/dummy_metadata.json", "mirror": "http://cdimage.debian.org/cdimage/release", + "mirror_directory": "8.1.0/amd64/iso-cd", "name": "debian-8.1", + "no_proxy": "{{env `no_proxy`}}", + "preseed_path": "debian-8/preseed.cfg", "template": "debian-8.1-amd64", - "version": "2.0.TIMESTAMP" + "version": "2.1.TIMESTAMP" } } diff --git a/debian-8.1-i386.json b/debian-8.1-i386.json index a8ef214f4..efca786bd 100644 --- a/debian-8.1-i386.json +++ b/debian-8.1-i386.json @@ -4,7 +4,7 @@ "boot_command": [ "<esc><wait>", "install <wait>", - "preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/debian-8/preseed.cfg <wait>", + " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}} <wait>", "debian-installer=en_US <wait>", "auto <wait>", "locale=en_US <wait>", @@ -25,11 +25,11 @@ "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", "http_directory": "http", - "iso_checksum": "e223823e0c159f057ec83bd51d4770a132e3e51b", - "iso_checksum_type": "sha1", - "iso_url": "{{user `mirror`}}/8.1.0/i386/iso-cd/debian-8.1.0-i386-CD-1.iso", - "output_directory": "packer-debian-8.1-i386-virtualbox", - "shutdown_command": "echo 'vagrant'|sudo -S /sbin/shutdown -hP now", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-virtualbox", + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", @@ -56,7 +56,7 @@ "boot_command": [ "<esc><wait>", "install <wait>", - "preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/debian-8/preseed.cfg <wait>", + " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}} <wait>", "debian-installer=en_US <wait>", "auto <wait>", "locale=en_US <wait>", @@ -75,11 +75,11 @@ "guest_os_type": "debian8", "headless": "{{ user `headless` }}", "http_directory": "http", - "iso_checksum": "e223823e0c159f057ec83bd51d4770a132e3e51b", - "iso_checksum_type": "sha1", - "iso_url": "{{user `mirror`}}/8.1.0/i386/iso-cd/debian-8.1.0-i386-CD-1.iso", - "output_directory": "packer-debian-8.1-i386-vmware", - "shutdown_command": "echo 'vagrant'|sudo -S /sbin/shutdown -hP now", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-vmware", + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", @@ -97,7 +97,7 @@ "boot_command": [ "<esc><wait>", "install <wait>", - "preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/debian-8/preseed.cfg <wait>", + " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}} <wait>", "debian-installer=en_US <wait>", "auto <wait>", "locale=en_US <wait>", @@ -116,10 +116,10 @@ "guest_os_type": "debian", "headless": "{{ user `headless` }}", "http_directory": "http", - "iso_checksum": "e223823e0c159f057ec83bd51d4770a132e3e51b", - "iso_checksum_type": "sha1", - "iso_url": "{{user `mirror`}}/8.1.0/i386/iso-cd/debian-8.1.0-i386-CD-1.iso", - "output_directory": "packer-debian-8.1-i386-parallels", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-parallels", "parallels_tools_flavor": "lin", "prlctl": [ [ @@ -136,7 +136,7 @@ ] ], "prlctl_version_file": ".prlctl_version", - "shutdown_command": "echo 'vagrant'|sudo -S /sbin/shutdown -hP now", + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", @@ -158,8 +158,13 @@ "type": "file" }, { - "environment_vars": [], - "execute_command": "echo 'vagrant' | {{.Vars}} sudo -E -S bash '{{.Path}}'", + "environment_vars": [ + "HOME_DIR=/home/vagrant", + "http_proxy={{user `http_proxy`}}", + "https_proxy={{user `https_proxy`}}", + "no_proxy={{user `no_proxy`}}" + ], + "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", "scripts": [ "scripts/common/metadata.sh", "scripts/debian/update.sh", @@ -175,16 +180,23 @@ } ], "variables": { - "arch": "32", - "box_basename": "debian-8.1-i386", + "box_basename": "__unset_box_basename__", "build_timestamp": "{{isotime \"20060102150405\"}}", "git_revision": "__unknown_git_revision__", "headless": "", + "http_proxy": "{{env `http_proxy`}}", + "https_proxy": "{{env `https_proxy`}}", + "iso_checksum": "e223823e0c159f057ec83bd51d4770a132e3e51b", + "iso_checksum_type": "sha1", + "iso_name": "debian-8.1.0-i386-CD-1.iso", "metadata": "floppy/dummy_metadata.json", "mirror": "http://cdimage.debian.org/cdimage/release", + "mirror_directory": "8.1.0/i386/iso-cd", "name": "debian-8.1-i386", + "no_proxy": "{{env `no_proxy`}}", + "preseed_path": "debian-8/preseed.cfg", "template": "debian-8.1-i386", - "version": "2.0.TIMESTAMP" + "version": "2.1.TIMESTAMP" } } diff --git a/scripts/debian/cleanup.sh b/scripts/debian/cleanup.sh index 6c7f703d6..6889c8aeb 100644 --- a/scripts/debian/cleanup.sh +++ b/scripts/debian/cleanup.sh @@ -1,6 +1,45 @@ -#!/bin/bash -eux +#!/bin/sh -eux -apt-get -y autoremove -apt-get -y clean -rm -rf VBoxGuestAdditions_*.iso VBoxGuestAdditions_*.iso.? -rm -f /tmp/chef*deb +# Delete all Linux headers +dpkg --list \ + | awk '{ print $2 }' \ + | grep 'linux-headers' \ + | xargs apt-get -y purge; + +# Remove specific Linux kernels, such as linux-image-3.11.0-15 but +# keeps the current kernel and does not touch the virtual packages, +# e.g. 'linux-image-amd64', etc. +dpkg --list \ + | awk '{ print $2 }' \ + | grep 'linux-image-[234].*' \ + | grep -v `uname -r` \ + | xargs apt-get -y purge; + +# Delete Linux source +dpkg --list \ + | awk '{ print $2 }' \ + | grep linux-source \ + | xargs apt-get -y purge; + +# Delete development packages +dpkg --list \ + | awk '{ print $2 }' \ + | grep -- '-dev$' \ + | xargs apt-get -y purge; + +# Delete compilers and other development tools +apt-get -y purge cpp gcc g++; + +# Delete X11 libraries +apt-get -y purge libx11-data xauth libxmuu1 libxcb1 libx11-6 libxext6; + +# Delete obsolete networking +apt-get -y purge ppp pppconfig pppoeconf; + +# Delete oddities +apt-get -y purge popularity-contest; + +apt-get -y autoremove; +apt-get -y clean; + +rm -f VBoxGuestAdditions_*.iso VBoxGuestAdditions_*.iso.? diff --git a/scripts/debian/networking.sh b/scripts/debian/networking.sh index caa4be08f..d66092ad8 100644 --- a/scripts/debian/networking.sh +++ b/scripts/debian/networking.sh @@ -1,7 +1,11 @@ -#!/bin/bash -eux +#!/bin/sh -eux -rm /etc/udev/rules.d/70-persistent-net.rules -mkdir /etc/udev/rules.d/70-persistent-net.rules -rm /lib/udev/rules.d/75-persistent-net-generator.rules -rm -rf /dev/.udev/ /var/lib/dhcp/* +# Disable automatic udev rules for network interfaces in Ubuntu, +# source: http://6.ptmc.org/164/ +rm -f /etc/udev/rules.d/70-persistent-net.rules; +mkdir -p /etc/udev/rules.d/70-persistent-net.rules; +rm -f /lib/udev/rules.d/75-persistent-net-generator.rules; +rm -rf /dev/.udev/ /var/lib/dhcp/*; + +# Adding a 2 sec delay to the interface up, to make the dhclient happy echo "pre-up sleep 2" >> /etc/network/interfaces diff --git a/scripts/debian/sudoers.sh b/scripts/debian/sudoers.sh index 38d767088..0e83852b7 100644 --- a/scripts/debian/sudoers.sh +++ b/scripts/debian/sudoers.sh @@ -1,9 +1,10 @@ -#!/bin/bash -eux +#!/bin/sh -eux # Only add the secure path line if it is not already present - Debian 7 # includes it by default. -grep -q 'secure_path' /etc/sudoers || sed -i -e '/Defaults\s\+env_reset/a Defaults\tsecure_path="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"' /etc/sudoers +grep -q 'secure_path' /etc/sudoers \ + || sed -i -e '/Defaults\s\+env_reset/a Defaults\tsecure_path="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"' /etc/sudoers; # Set up password-less sudo for the vagrant user -echo 'vagrant ALL=(ALL) NOPASSWD:ALL' > /etc/sudoers.d/99_vagrant -chmod 440 /etc/sudoers.d/99_vagrant +echo 'vagrant ALL=(ALL) NOPASSWD:ALL' >/etc/sudoers.d/99_vagrant; +chmod 440 /etc/sudoers.d/99_vagrant; diff --git a/scripts/debian/update.sh b/scripts/debian/update.sh index a4cc91499..8aa08ed73 100644 --- a/scripts/debian/update.sh +++ b/scripts/debian/update.sh @@ -1,4 +1,18 @@ -#!/bin/bash -eux +#!/bin/sh -eux -apt-get update -apt-get -y upgrade +arch="`uname -r | sed 's/^.*[0-9]\{1,\}\.[0-9]\{1,\}\.[0-9]\{1,\}\(-[0-9]\{1,2\}\)-//'`" + +apt-get update; + +apt-get -y upgrade linux-image-$arch; +apt-get -y install linux-headers-`uname -r`; + +if [ -d /etc/init ]; then + # update package index on boot + cat <<EOF >/etc/init/refresh-apt.conf; +description "update package index" +start on networking +task +exec /usr/bin/apt-get update +EOF +fi From a5d4732f45c0d3d576437b11afac2f43862e5c32 Mon Sep 17 00:00:00 2001 From: Fletcher Nichol <fnichol@nichol.ca> Date: Sun, 12 Jul 2015 23:12:42 -0600 Subject: [PATCH 0371/1622] Updates to support Packer 0.8.x. --- debian-7.8-i386.json | 1 - macosx-10.10.json | 1 - macosx-10.7.json | 1 - macosx-10.8.json | 1 - macosx-10.9.json | 1 - 5 files changed, 5 deletions(-) diff --git a/debian-7.8-i386.json b/debian-7.8-i386.json index 381801c57..464f6a5bd 100644 --- a/debian-7.8-i386.json +++ b/debian-7.8-i386.json @@ -75,7 +75,6 @@ "guest_os_type": "debian7", "headless": "{{ user `headless` }}", "http_directory": "http", - "http_directory": "http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", diff --git a/macosx-10.10.json b/macosx-10.10.json index 89ad89a34..632ef82a4 100644 --- a/macosx-10.10.json +++ b/macosx-10.10.json @@ -154,7 +154,6 @@ "vm_name": "{{ user `template` }}" } ], - "min_packer_version": "0.7.0", "post-processors": [ { "output": "builds/{{user `box_basename`}}.{{.Provider}}.box", diff --git a/macosx-10.7.json b/macosx-10.7.json index ccddcc80a..e3d4a1286 100644 --- a/macosx-10.7.json +++ b/macosx-10.7.json @@ -154,7 +154,6 @@ "vm_name": "{{ user `template` }}" } ], - "min_packer_version": "0.7.0", "post-processors": [ { "output": "builds/{{user `box_basename`}}.{{.Provider}}.box", diff --git a/macosx-10.8.json b/macosx-10.8.json index 7ecc295ca..0efd8d973 100644 --- a/macosx-10.8.json +++ b/macosx-10.8.json @@ -154,7 +154,6 @@ "vm_name": "{{ user `template` }}" } ], - "min_packer_version": "0.7.0", "post-processors": [ { "output": "builds/{{user `box_basename`}}.{{.Provider}}.box", diff --git a/macosx-10.9.json b/macosx-10.9.json index c0cb948d6..990b5fd20 100644 --- a/macosx-10.9.json +++ b/macosx-10.9.json @@ -154,7 +154,6 @@ "vm_name": "{{ user `template` }}" } ], - "min_packer_version": "0.7.0", "post-processors": [ { "output": "builds/{{user `box_basename`}}.{{.Provider}}.box", From 4570b56487ea7f700c4381604cf01f8a059fe955 Mon Sep 17 00:00:00 2001 From: Patrick Connolly <patrick.c.connolly@gmail.com> Date: Thu, 16 Jul 2015 14:43:28 -0400 Subject: [PATCH 0372/1622] Removed minor versions from centos slugs. --- centos-5.11-i386.json => centos-5-i386.json | 0 centos-5.11-x86_64.json => centos-5-x86_64.json | 0 centos-6.6-i386.json => centos-6-i386.json | 0 centos-6.6-x86_64.json => centos-6-x86_64.json | 0 centos-7.1-x86_64.json => centos-7-x86_64.json | 0 5 files changed, 0 insertions(+), 0 deletions(-) rename centos-5.11-i386.json => centos-5-i386.json (100%) rename centos-5.11-x86_64.json => centos-5-x86_64.json (100%) rename centos-6.6-i386.json => centos-6-i386.json (100%) rename centos-6.6-x86_64.json => centos-6-x86_64.json (100%) rename centos-7.1-x86_64.json => centos-7-x86_64.json (100%) diff --git a/centos-5.11-i386.json b/centos-5-i386.json similarity index 100% rename from centos-5.11-i386.json rename to centos-5-i386.json diff --git a/centos-5.11-x86_64.json b/centos-5-x86_64.json similarity index 100% rename from centos-5.11-x86_64.json rename to centos-5-x86_64.json diff --git a/centos-6.6-i386.json b/centos-6-i386.json similarity index 100% rename from centos-6.6-i386.json rename to centos-6-i386.json diff --git a/centos-6.6-x86_64.json b/centos-6-x86_64.json similarity index 100% rename from centos-6.6-x86_64.json rename to centos-6-x86_64.json diff --git a/centos-7.1-x86_64.json b/centos-7-x86_64.json similarity index 100% rename from centos-7.1-x86_64.json rename to centos-7-x86_64.json From e3db273d046c15011e8d181578f49dbd1f3237f4 Mon Sep 17 00:00:00 2001 From: Fletcher Nichol <fnichol@nichol.ca> Date: Thu, 6 Aug 2015 21:33:04 -0600 Subject: [PATCH 0373/1622] [macosx-*] Increase disk_size to ~40G from ~20G. --- macosx-10.10.json | 4 ++-- macosx-10.7.json | 4 ++-- macosx-10.8.json | 4 ++-- macosx-10.9.json | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/macosx-10.10.json b/macosx-10.10.json index 632ef82a4..d9317e512 100644 --- a/macosx-10.10.json +++ b/macosx-10.10.json @@ -2,7 +2,7 @@ "builders": [ { "boot_wait": "2s", - "disk_size": 20480, + "disk_size": 40960, "guest_os_type": "darwin12-64", "headless": "{{ user `headless` }}", "iso_checksum": "{{user `iso_checksum`}}", @@ -34,7 +34,7 @@ }, { "boot_wait": "2s", - "disk_size": 20480, + "disk_size": 40960, "guest_additions_mode": "disable", "guest_os_type": "MacOS109_64", "hard_drive_interface": "sata", diff --git a/macosx-10.7.json b/macosx-10.7.json index e3d4a1286..a2d24cf7f 100644 --- a/macosx-10.7.json +++ b/macosx-10.7.json @@ -2,7 +2,7 @@ "builders": [ { "boot_wait": "2s", - "disk_size": 20480, + "disk_size": 40960, "guest_os_type": "darwin12-64", "headless": "{{ user `headless` }}", "iso_checksum": "{{user `iso_checksum`}}", @@ -34,7 +34,7 @@ }, { "boot_wait": "2s", - "disk_size": 20480, + "disk_size": 40960, "guest_additions_mode": "disable", "guest_os_type": "MacOS107_64", "hard_drive_interface": "sata", diff --git a/macosx-10.8.json b/macosx-10.8.json index 0efd8d973..ca3088cb1 100644 --- a/macosx-10.8.json +++ b/macosx-10.8.json @@ -2,7 +2,7 @@ "builders": [ { "boot_wait": "2s", - "disk_size": 20480, + "disk_size": 40960, "guest_os_type": "darwin12-64", "headless": "{{ user `headless` }}", "iso_checksum": "{{user `iso_checksum`}}", @@ -34,7 +34,7 @@ }, { "boot_wait": "2s", - "disk_size": 20480, + "disk_size": 40960, "guest_additions_mode": "disable", "guest_os_type": "MacOS108_64", "hard_drive_interface": "sata", diff --git a/macosx-10.9.json b/macosx-10.9.json index 990b5fd20..833dcfe08 100644 --- a/macosx-10.9.json +++ b/macosx-10.9.json @@ -2,7 +2,7 @@ "builders": [ { "boot_wait": "2s", - "disk_size": 20480, + "disk_size": 40960, "guest_os_type": "darwin12-64", "headless": "{{ user `headless` }}", "iso_checksum": "{{user `iso_checksum`}}", @@ -34,7 +34,7 @@ }, { "boot_wait": "2s", - "disk_size": 20480, + "disk_size": 40960, "guest_additions_mode": "disable", "guest_os_type": "MacOS109_64", "hard_drive_interface": "sata", From 790b7c189e5bb920c392c3e3965a3bada51b7558 Mon Sep 17 00:00:00 2001 From: Tim Smith <tim@cozy.co> Date: Fri, 7 Aug 2015 11:48:45 -0700 Subject: [PATCH 0374/1622] Opscode -> Chefs and other minor stuff --- MAINTAINERS.md | 2 +- NOTICE.md | 4 ++-- README.md | 8 ++++---- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/MAINTAINERS.md b/MAINTAINERS.md index 9589ff9c0..b3d990a0a 100644 --- a/MAINTAINERS.md +++ b/MAINTAINERS.md @@ -2,7 +2,7 @@ This file lists how the Bento project is maintained. When making changes to the system, this file tells you who needs to review your patch - you need a simple majority of maintainers for the relevant subsystems to provide a :+1: on your pull request. Additionally, you need to not receive a veto from a Lieutenant or the Project Lead. -Check out [How Chef is Maintained](https://github.com/opscode/chef-rfc/blob/master/rfc030-maintenance-policy.md#how-the-project-is-maintained) for details on the process, how to become a maintainer, lieutenant, or the project lead. +Check out [How Chef is Maintained](https://github.com/chef/chef-rfc/blob/master/rfc030-maintenance-policy.md#how-the-project-is-maintained) for details on the process, how to become a maintainer, lieutenant, or the project lead. # Project Lead diff --git a/NOTICE.md b/NOTICE.md index 35143453f..91ecbbc40 100644 --- a/NOTICE.md +++ b/NOTICE.md @@ -1,8 +1,8 @@ Bento NOTICE ============ -Opscode Bento -Copyright 2012, Opscode, Inc. +Chef Bento +Copyright 2012-2015, Chef Software, Inc. The baseboxes in the "definitions" directory is from Tim Dysinger's "basebox" project. diff --git a/README.md b/README.md index f80ce4e9a..0aeca49ec 100644 --- a/README.md +++ b/README.md @@ -98,7 +98,7 @@ these boxes. Using `--provider vmware_fusion`, will not. ## Older Baseboxes Older baseboxes include Chef and therefore are not compatible with some -new plugins. The full list of old boxes are available in the [old boxes file](https://github.com/opscode/bento/blob/master/OLD-BOXES.md). +new plugins. The full list of old boxes are available in the [old boxes file](https://github.com/chef/bento/blob/master/OLD-BOXES.md). ## Build Your Own Boxes @@ -121,7 +121,7 @@ Congratulations! You now have box(es) in the ../builds directory that you can th ### Proprietary Boxes -Mac OS X (10.7, 10.8, and 10.9), Red Hat Enterprise Linux, and SUSE Linux Enterprise Server templates are provided. However, their ISOs are not publicly retrievable and as such, the URLs in those templates are bogus. For RHEL and SLES, you should substitute your server where you host the ISOs, using the mirror variable as above. +Mac OS X (10.7, 10.8, 10.9, 10.10), Red Hat Enterprise Linux, and SUSE Linux Enterprise Server templates are provided. However, their ISOs are not publicly retrievable and as such, the URLs in those templates are bogus. For RHEL and SLES, you should substitute your server where you host the ISOs, using the mirror variable as above. #### Mac OS X Boxes @@ -172,7 +172,7 @@ it's not the case because you have overridden line-ending conversion in your own ## Bugs and Issues Please use GitHub issues to report bugs, features, or other problems. Please note: -the [JIRA issue tracker](http://tickets.opscode.com/browse/BENTO) is no longer being used. +the [JIRA issue tracker](https://tickets.opscode.com/browse/BENTO) is no longer being used. ## License & Authors @@ -194,7 +194,7 @@ Mac OS X templates were adopted wholesale from [Fletcher Nichol's packer templat - Author: Fletcher Nichol (<fnichol@nichol.ca>) ```text -Copyright 2012-2014, Chef Software, Inc. (<legal@chef.io>) +Copyright 2012-2015, Chef Software, Inc. (<legal@chef.io>) Copyright 2011-2012, Tim Dysinger (<tim@dysinger.net>) Licensed under the Apache License, Version 2.0 (the "License"); From 5ca389e79de91d2460d2e0e222aeeac8cbec5da6 Mon Sep 17 00:00:00 2001 From: Tim Smith <tim@cozy.co> Date: Fri, 7 Aug 2015 12:27:32 -0700 Subject: [PATCH 0375/1622] Enable key insertion on OS X The fix was released in Vagrant 1.7.3. --- vagrantfile_templates/macosx.rb | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/vagrantfile_templates/macosx.rb b/vagrantfile_templates/macosx.rb index 502545dc1..d17f4912a 100644 --- a/vagrantfile_templates/macosx.rb +++ b/vagrantfile_templates/macosx.rb @@ -1,8 +1,6 @@ -Vagrant.configure(2) do |config| - # disabled until https://github.com/mitchellh/vagrant/pull/5326 makes it - # into a release following 1.7.2 - config.ssh.insert_key = false +Vagrant.require_version '>= 1.7.3' +Vagrant.configure(2) do |config| config.vm.provider 'virtualbox' do |_, override| override.vm.synced_folder '.', '/vagrant', type: 'rsync' end From b7566aee4e8b8fadc5a61ae132ece1b7e5456b4c Mon Sep 17 00:00:00 2001 From: Rickard von Essen <rickard.von.essen@gmail.com> Date: Wed, 12 Aug 2015 12:51:41 +0200 Subject: [PATCH 0376/1622] Add Fedora 22 boxes --- fedora-22-i386.json | 143 ++++++++++++++++++++++++++++++++++++++++++ fedora-22-x86_64.json | 142 +++++++++++++++++++++++++++++++++++++++++ http/fedora-22/ks.cfg | 47 ++++++++++++++ 3 files changed, 332 insertions(+) create mode 100644 fedora-22-i386.json create mode 100644 fedora-22-x86_64.json create mode 100644 http/fedora-22/ks.cfg diff --git a/fedora-22-i386.json b/fedora-22-i386.json new file mode 100644 index 000000000..baee7fd8d --- /dev/null +++ b/fedora-22-i386.json @@ -0,0 +1,143 @@ + +{ + "builders": [ + { + "boot_command": [ + "<tab> linux ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/fedora-22/ks.cfg<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "guest_os_type": "Fedora", + "hard_drive_interface": "sata", + "http_directory": "http", + "iso_checksum": "5e3dfdff30667f3339d8b4e6ac0651c2e00c9417987848bef772cb92dbc823a5", + "iso_checksum_type": "sha256", + "iso_url": "{{user `mirror`}}/releases/22/Server/i386/iso/Fedora-Server-DVD-i386-22.iso", + "output_directory": "packer-fedora-22-i386-virtualbox", + "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "virtualbox-iso", + "vboxmanage": [ + [ + "modifyvm", + "{{.Name}}", + "--memory", + "512" + ], + [ + "modifyvm", + "{{.Name}}", + "--cpus", + "1" + ] + ], + "virtualbox_version_file": ".vbox_version", + "vm_name": "packer-fedora-22-i386" + }, + { + "boot_command": [ + "<tab> linux ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/fedora-22/ks.cfg<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "guest_os_type": "fedora", + "http_directory": "http", + "iso_checksum": "5e3dfdff30667f3339d8b4e6ac0651c2e00c9417987848bef772cb92dbc823a5", + "iso_checksum_type": "sha256", + "iso_url": "{{user `mirror`}}/releases/22/Server/i386/iso/Fedora-Server-DVD-i386-22.iso", + "output_directory": "packer-fedora-22-i386-vmware", + "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "tools_upload_flavor": "linux", + "type": "vmware-iso", + "vm_name": "packer-fedora-22-i386", + "vmx_data": { + "cpuid.coresPerSocket": "1", + "memsize": "512", + "numvcpus": "1" + } + }, + { + "boot_command": [ + "<tab> linux ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/fedora-22/ks.cfg<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "guest_os_type": "fedora-core", + "http_directory": "http", + "iso_checksum": "5e3dfdff30667f3339d8b4e6ac0651c2e00c9417987848bef772cb92dbc823a5", + "iso_checksum_type": "sha256", + "iso_url": "{{user `mirror`}}/releases/22/Server/i386/iso/Fedora-Server-DVD-i386-22.iso", + "output_directory": "packer-fedora-22-i386-parallels", + "parallels_tools_flavor": "lin", + "prlctl": [ + [ + "set", + "{{.Name}}", + "--memsize", + "512" + ], + [ + "set", + "{{.Name}}", + "--cpus", + "1" + ] + ], + "prlctl_version_file": ".prlctl_version", + "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "parallels-iso", + "vm_name": "packer-fedora-22-i386" + } + ], + "post-processors": [ + { + "output": "builds/{{user `box_basename`}}.{{.Provider}}.box", + "type": "vagrant" + } + ], + "provisioners": [ + { + "destination": "/tmp/bento-metadata.json", + "source": "{{user `metadata`}}", + "type": "file" + }, + { + "environment_vars": [], + "execute_command": "echo 'vagrant' | {{.Vars}} sudo -E -S bash '{{.Path}}'", + "scripts": [ + "scripts/common/metadata.sh", + "scripts/fedora/fix-slow-dns.sh", + "scripts/common/sshd.sh", + "scripts/common/vmtools.sh", + "scripts/common/vagrant.sh", + "scripts/fedora/cleanup.sh", + "scripts/common/minimize.sh" + ], + "type": "shell" + } + ], + "variables": { + "arch": "32", + "box_basename": "fedora-22-i386", + "build_timestamp": "{{isotime \"20060102150405\"}}", + "git_revision": "__unknown_git_revision__", + "metadata": "floppy/dummy_metadata.json", + "mirror": "http://download.fedoraproject.org/pub/fedora/linux", + "name": "fedora-22-i386", + "template": "fedora-22-i386", + "version": "2.0.TIMESTAMP" + } +} + diff --git a/fedora-22-x86_64.json b/fedora-22-x86_64.json new file mode 100644 index 000000000..3c2f658a5 --- /dev/null +++ b/fedora-22-x86_64.json @@ -0,0 +1,142 @@ +{ + "builders": [ + { + "boot_command": [ + "<tab> linux ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/fedora-22/ks.cfg<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "guest_os_type": "Fedora_64", + "hard_drive_interface": "sata", + "http_directory": "http", + "iso_checksum": "b2acfa7c7c6b5d2f51d3337600c2e52eeaa1a1084991181c28ca30343e52e0df", + "iso_checksum_type": "sha256", + "iso_url": "{{user `mirror`}}/releases/22/Server/x86_64/iso/Fedora-Server-DVD-x86_64-22.iso", + "output_directory": "packer-fedora-22-x86_64-virtualbox", + "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "virtualbox-iso", + "vboxmanage": [ + [ + "modifyvm", + "{{.Name}}", + "--memory", + "512" + ], + [ + "modifyvm", + "{{.Name}}", + "--cpus", + "1" + ] + ], + "virtualbox_version_file": ".vbox_version", + "vm_name": "packer-fedora-22-x86_64" + }, + { + "boot_command": [ + "<tab> linux ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/fedora-22/ks.cfg<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "guest_os_type": "fedora-64", + "http_directory": "http", + "iso_checksum": "b2acfa7c7c6b5d2f51d3337600c2e52eeaa1a1084991181c28ca30343e52e0df", + "iso_checksum_type": "sha256", + "iso_url": "{{user `mirror`}}/releases/22/Server/x86_64/iso/Fedora-Server-DVD-x86_64-22.iso", + "output_directory": "packer-fedora-22-x86_64-vmware", + "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "tools_upload_flavor": "linux", + "type": "vmware-iso", + "vm_name": "packer-fedora-22-x86_64", + "vmx_data": { + "cpuid.coresPerSocket": "1", + "memsize": "512", + "numvcpus": "1" + } + }, + { + "boot_command": [ + "<tab> linux ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/fedora-22/ks.cfg<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "guest_os_type": "fedora-core", + "http_directory": "http", + "iso_checksum": "b2acfa7c7c6b5d2f51d3337600c2e52eeaa1a1084991181c28ca30343e52e0df", + "iso_checksum_type": "sha256", + "iso_url": "{{user `mirror`}}/releases/22/Server/x86_64/iso/Fedora-Server-DVD-x86_64-22.iso", + "output_directory": "packer-fedora-22-x86_64-parallels", + "parallels_tools_flavor": "lin", + "prlctl": [ + [ + "set", + "{{.Name}}", + "--memsize", + "512" + ], + [ + "set", + "{{.Name}}", + "--cpus", + "1" + ] + ], + "prlctl_version_file": ".prlctl_version", + "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "parallels-iso", + "vm_name": "packer-fedora-22-x86_64" + } + ], + "post-processors": [ + { + "output": "builds/{{user `box_basename`}}.{{.Provider}}.box", + "type": "vagrant" + } + ], + "provisioners": [ + { + "destination": "/tmp/bento-metadata.json", + "source": "{{user `metadata`}}", + "type": "file" + }, + { + "environment_vars": [], + "execute_command": "echo 'vagrant' | {{.Vars}} sudo -E -S bash '{{.Path}}'", + "scripts": [ + "scripts/common/metadata.sh", + "scripts/fedora/fix-slow-dns.sh", + "scripts/common/sshd.sh", + "scripts/common/vmtools.sh", + "scripts/common/vagrant.sh", + "scripts/fedora/cleanup.sh", + "scripts/common/minimize.sh" + ], + "type": "shell" + } + ], + "variables": { + "arch": "64", + "box_basename": "fedora-22", + "build_timestamp": "{{isotime \"20060102150405\"}}", + "git_revision": "__unknown_git_revision__", + "metadata": "floppy/dummy_metadata.json", + "mirror": "http://download.fedoraproject.org/pub/fedora/linux", + "name": "fedora-22", + "template": "fedora-22-x86_64", + "version": "2.0.TIMESTAMP" + } +} + diff --git a/http/fedora-22/ks.cfg b/http/fedora-22/ks.cfg new file mode 100644 index 000000000..28529a83a --- /dev/null +++ b/http/fedora-22/ks.cfg @@ -0,0 +1,47 @@ +install +cdrom +lang en_US.UTF-8 +keyboard us +network --bootproto=dhcp +rootpw vagrant +firewall --disabled +authconfig --enableshadow --passalgo=sha512 +selinux --permissive +timezone UTC +bootloader --location=mbr +text +skipx +zerombr +clearpart --all --initlabel +part /boot --fstype=ext4 --size=500 +part pv.2 --grow --size=500 +volgroup vg_vagrant --pesize=32768 pv.2 +logvol / --fstype=ext4 --name=lv_root --vgname=vg_vagrant --size=1024 --grow +logvol swap --fstype=swap --name=lv_swap --vgname=vg_vagrant --size=528 --grow --maxsize=1056 +bootloader --location=mbr --append="norhgb biosdevname=0" +auth --useshadow --enablemd5 +firstboot --disabled +reboot +user --name=vagrant --plaintext --password vagrant + +%packages --nobase --ignoremissing --excludedocs +bzip2 +gcc +kernel-devel +kernel-headers +tar +wget +nfs-utils +net-tools +dnf-yum +-linux-firmware +-plymouth +-plymouth-core-libs +%end + +%post +# sudo +echo 'Defaults:vagrant !requiretty' > /etc/sudoers.d/vagrant +echo '%vagrant ALL=(ALL) NOPASSWD: ALL' >> /etc/sudoers.d/vagrant +chmod 440 /etc/sudoers.d/vagrant +%end From 377f2214219a2e20ec3de69d2f9349bfbe9fe51b Mon Sep 17 00:00:00 2001 From: William Yeh <william.pjyeh@gmail.com> Date: Mon, 17 Aug 2015 14:59:37 +0800 Subject: [PATCH 0377/1622] Update to Ubuntu 14.04.3. --- ubuntu-14.04-amd64.json | 6 +++--- ubuntu-14.04-i386.json | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/ubuntu-14.04-amd64.json b/ubuntu-14.04-amd64.json index 96a1ae727..d9f0bd301 100644 --- a/ubuntu-14.04-amd64.json +++ b/ubuntu-14.04-amd64.json @@ -207,12 +207,12 @@ "headless": "", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", - "iso_checksum": "8acd2f56bfcba2f7ac74a7e4a5e565ce68c024c38525c0285573e41c86ae90c0", + "iso_checksum": "a3b345908a826e262f4ea1afeb357fd09ec0558cf34e6c9112cead4bb55ccdfb", "iso_checksum_type": "sha256", - "iso_name": "ubuntu-14.04.2-server-amd64.iso", + "iso_name": "ubuntu-14.04.3-server-amd64.iso", "metadata": "floppy/dummy_metadata.json", "mirror": "http://releases.ubuntu.com", - "mirror_directory": "14.04.2", + "mirror_directory": "14.04.3", "name": "ubuntu-14.04", "no_proxy": "{{env `no_proxy`}}", "preseed_path": "ubuntu-14.04/preseed.cfg", diff --git a/ubuntu-14.04-i386.json b/ubuntu-14.04-i386.json index 204730383..08eff882e 100644 --- a/ubuntu-14.04-i386.json +++ b/ubuntu-14.04-i386.json @@ -207,12 +207,12 @@ "headless": "", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", - "iso_checksum": "76524ab9502a34b983ed56af2d5a72835ce41aec1e2b4c0cb7788ef596958ed6", + "iso_checksum": "a5c02e25a8f6ab335269adb1a6c176edff075093b90854439b4a90fce9b31f28", "iso_checksum_type": "sha256", - "iso_name": "ubuntu-14.04.2-server-i386.iso", + "iso_name": "ubuntu-14.04.3-server-i386.iso", "metadata": "floppy/dummy_metadata.json", "mirror": "http://releases.ubuntu.com", - "mirror_directory": "14.04.2", + "mirror_directory": "14.04.3", "name": "ubuntu-14.04-i386", "no_proxy": "{{env `no_proxy`}}", "preseed_path": "ubuntu-14.04/preseed.cfg", From cf4c7ee377e47505a891faad728977cc22fb7c40 Mon Sep 17 00:00:00 2001 From: Geoff Garside <geoff@geoffgarside.co.uk> Date: Tue, 18 Aug 2015 15:44:59 +0100 Subject: [PATCH 0378/1622] Rename freebsd-10.1 to freebsd-10.2 ISO URLs updated ISO Checksums updated HTTP Install script path updated --- freebsd-10.1-amd64.json => freebsd-10.2-amd64.json | 13 ++++++------- freebsd-10.1-i386.json => freebsd-10.2-i386.json | 13 ++++++------- http/{freebsd-10.1 => freebsd-10.2}/install.sh | 0 3 files changed, 12 insertions(+), 14 deletions(-) rename freebsd-10.1-amd64.json => freebsd-10.2-amd64.json (95%) rename freebsd-10.1-i386.json => freebsd-10.2-i386.json (95%) rename http/{freebsd-10.1 => freebsd-10.2}/install.sh (100%) diff --git a/freebsd-10.1-amd64.json b/freebsd-10.2-amd64.json similarity index 95% rename from freebsd-10.1-amd64.json rename to freebsd-10.2-amd64.json index cd872d82e..97e270728 100644 --- a/freebsd-10.1-amd64.json +++ b/freebsd-10.2-amd64.json @@ -188,17 +188,16 @@ "headless": "", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", - "install_path": "freebsd-10.1/install.sh", - "iso_checksum": "0c3d64ce48c3ef761761d0fea07e1935e296f8c045c249118bc91a7faf053a6b", + "install_path": "freebsd-10.2/install.sh", + "iso_checksum": "97908f5cd00d86cafeb2c265bfabbd0aa79f87e9b6b31ecdb756bc96a4a62e93", "iso_checksum_type": "sha256", - "iso_name": "FreeBSD-10.1-RELEASE-amd64-disc1.iso", + "iso_name": "FreeBSD-10.2-RELEASE-amd64-disc1.iso", "metadata": "floppy/dummy_metadata.json", "mirror": "http://ftp.freebsd.org/pub/FreeBSD", - "mirror_directory": "releases/amd64/amd64/ISO-IMAGES/10.1", - "name": "freebsd-10.1", + "mirror_directory": "releases/amd64/amd64/ISO-IMAGES/10.2", + "name": "freebsd-10.2", "no_proxy": "{{env `no_proxy`}}", - "template": "freebsd-10.1-amd64", + "template": "freebsd-10.2-amd64", "version": "2.1.TIMESTAMP" } } - diff --git a/freebsd-10.1-i386.json b/freebsd-10.2-i386.json similarity index 95% rename from freebsd-10.1-i386.json rename to freebsd-10.2-i386.json index 943e96c44..6453d824c 100644 --- a/freebsd-10.1-i386.json +++ b/freebsd-10.2-i386.json @@ -188,17 +188,16 @@ "headless": "", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", - "install_path": "freebsd-10.1/install.sh", - "iso_checksum": "fe31790b762b01c99791d33e7fd9ab97323654785ce21f588116c8b4eb381cd0", + "install_path": "freebsd-10.2/install.sh", + "iso_checksum": "0e7094ae9f4f79d8955f193a1f2f5ab4f8b300e57eccd3b9bd959951ee079020", "iso_checksum_type": "sha256", - "iso_name": "FreeBSD-10.1-RELEASE-i386-disc1.iso", + "iso_name": "FreeBSD-10.2-RELEASE-i386-disc1.iso", "metadata": "floppy/dummy_metadata.json", "mirror": "http://ftp.freebsd.org/pub/FreeBSD", - "mirror_directory": "releases/i386/i386/ISO-IMAGES/10.1", - "name": "freebsd-10.1-i386", + "mirror_directory": "releases/i386/i386/ISO-IMAGES/10.2", + "name": "freebsd-10.2-i386", "no_proxy": "{{env `no_proxy`}}", - "template": "freebsd-10.1-i386", + "template": "freebsd-10.2-i386", "version": "2.1.TIMESTAMP" } } - diff --git a/http/freebsd-10.1/install.sh b/http/freebsd-10.2/install.sh similarity index 100% rename from http/freebsd-10.1/install.sh rename to http/freebsd-10.2/install.sh From 98df96a1836e518d84a180083a64ddf6c8cde700 Mon Sep 17 00:00:00 2001 From: Geoff Garside <geoff@geoffgarside.co.uk> Date: Tue, 18 Aug 2015 15:45:59 +0100 Subject: [PATCH 0379/1622] Update freebsd-update for 10.2 The FreeBSD 10.2 freebsd-update utility supports a `--not-running-from-cron` argument, so patching it to run without a TTY is no longer required. Fix failed fetching of files caused by empty proxy environment variables. Note that freebsd-update fetch & install will break if there arent any patches available for the release. I've tried to handle the install case when no updates are needed by capturing the fetch output and checking the last line. This results in some odd behaviour when there are updates available and causes the install to fail completely. As such I've removed these changes. --- scripts/freebsd/update.sh | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/scripts/freebsd/update.sh b/scripts/freebsd/update.sh index 0055c2c74..c98d0d163 100644 --- a/scripts/freebsd/update.sh +++ b/scripts/freebsd/update.sh @@ -1,14 +1,26 @@ #!/bin/sh -eux +# Unset these as if they're empty it'll break freebsd-update +[ -z "$no_proxy" ] && unset no_proxy +[ -z "$http_proxy" ] && unset http_proxy +[ -z "$https_proxy" ] && unset https_proxy + major_version="`uname -r | awk -F. '{print $1}'`"; -# Allow freebsd-update to run fetch without stdin attached to a terminal -sed 's/\[ ! -t 0 \]/false/' /usr/sbin/freebsd-update >/tmp/freebsd-update; -chmod +x /tmp/freebsd-update; +if [ "$major_version" -lt 10 ]; then + # Allow freebsd-update to run fetch without stdin attached to a terminal + sed 's/\[ ! -t 0 \]/false/' /usr/sbin/freebsd-update >/tmp/freebsd-update; + chmod +x /tmp/freebsd-update; + + freebsd_update="/tmp/freebsd-update"; +else + freebsd_update="/usr/sbin/freebsd-update --not-running-from-cron"; +fi # Update FreeBSD -env PAGER=/bin/cat /tmp/freebsd-update fetch; -env PAGER=/bin/cat /tmp/freebsd-update install; +# NOTE: this will fail if there aren't any patches available for the release yet +env PAGER=/bin/cat $freebsd_update fetch; +env PAGER=/bin/cat $freebsd_update install; # Always use pkgng - pkg_add is EOL as of 1 September 2014 env ASSUME_ALWAYS_YES=true pkg bootstrap; From 043c6aa3bcc1786cbe98ea96cdc9b63d69103e3a Mon Sep 17 00:00:00 2001 From: Seth Thomas <sthomas@chef.io> Date: Tue, 18 Aug 2015 14:53:44 -0700 Subject: [PATCH 0380/1622] CentOS 6.6 -> 6.7 --- centos-6.6-i386.json => centos-6.7-i386.json | 14 +++++++------- centos-6.6-x86_64.json => centos-6.7-x86_64.json | 14 +++++++------- http/{centos-6.6 => centos-6.7}/ks.cfg | 0 3 files changed, 14 insertions(+), 14 deletions(-) rename centos-6.6-i386.json => centos-6.7-i386.json (93%) rename centos-6.6-x86_64.json => centos-6.7-x86_64.json (93%) rename http/{centos-6.6 => centos-6.7}/ks.cfg (100%) diff --git a/centos-6.6-i386.json b/centos-6.7-i386.json similarity index 93% rename from centos-6.6-i386.json rename to centos-6.7-i386.json index 9ad7a922a..39ac1f5cc 100644 --- a/centos-6.6-i386.json +++ b/centos-6.7-i386.json @@ -142,16 +142,16 @@ "headless": "", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", - "iso_checksum": "d16aa4a8e6f71fb01fcc26d8ae0e3443ed514c8e", - "iso_checksum_type": "sha1", - "iso_name": "CentOS-6.6-i386-bin-DVD1.iso", - "ks_path": "centos-6.6/ks.cfg", + "iso_checksum": "2ef003dd0a0b7e810928da9508d5551d8d51943434d4eb634a783f1fc3cb0252", + "iso_checksum_type": "sha256", + "iso_name": "CentOS-6.7-i386-bin-DVD1.iso", + "ks_path": "centos-6.7/ks.cfg", "metadata": "floppy/dummy_metadata.json", "mirror": "http://mirrors.kernel.org/centos", - "mirror_directory": "6.6/isos/i386", - "name": "centos-6.6-i386", + "mirror_directory": "6.7/isos/i386", + "name": "centos-6.7-i386", "no_proxy": "{{env `no_proxy`}}", - "template": "centos-6.6-i386", + "template": "centos-6.7-i386", "version": "2.1.TIMESTAMP" } } diff --git a/centos-6.6-x86_64.json b/centos-6.7-x86_64.json similarity index 93% rename from centos-6.6-x86_64.json rename to centos-6.7-x86_64.json index 8b8c34354..726f367a3 100644 --- a/centos-6.6-x86_64.json +++ b/centos-6.7-x86_64.json @@ -142,16 +142,16 @@ "headless": "", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", - "iso_checksum": "08be09fd7276822bd3468af8f96198279ffc41f0", - "iso_checksum_type": "sha1", - "iso_name": "CentOS-6.6-x86_64-bin-DVD1.iso", - "ks_path": "centos-6.6/ks.cfg", + "iso_checksum": "c0c1a05d3d74fb093c6232003da4b22b0680f59d3b2fa2cb7da736bc40b3f2c5", + "iso_checksum_type": "sha256", + "iso_name": "CentOS-6.7-x86_64-bin-DVD1.iso", + "ks_path": "centos-6.7/ks.cfg", "metadata": "floppy/dummy_metadata.json", "mirror": "http://mirrors.kernel.org/centos", - "mirror_directory": "6.6/isos/x86_64", - "name": "centos-6.6", + "mirror_directory": "6.7/isos/x86_64", + "name": "centos-6.7", "no_proxy": "{{env `no_proxy`}}", - "template": "centos-6.6-x86_64", + "template": "centos-6.7-x86_64", "version": "2.1.TIMESTAMP" } } diff --git a/http/centos-6.6/ks.cfg b/http/centos-6.7/ks.cfg similarity index 100% rename from http/centos-6.6/ks.cfg rename to http/centos-6.7/ks.cfg From cdb2cd5bd1d4c171315125ef6e016f06d912d43e Mon Sep 17 00:00:00 2001 From: Seth Thomas <sthomas@chef.io> Date: Wed, 26 Aug 2015 15:14:52 -0700 Subject: [PATCH 0381/1622] Update Readme and small fixes/cleanup to Rake tasks --- README.md | 191 ++++++++++++++++++++++++++++++++---------------------- Rakefile | 46 ++++++------- 2 files changed, 133 insertions(+), 104 deletions(-) diff --git a/README.md b/README.md index 0aeca49ec..d28566949 100644 --- a/README.md +++ b/README.md @@ -18,83 +18,31 @@ this project. Note that our baseboxes do not include Chef Client. Vagrant can be instructed to install Chef at runtime using the [vagrant-omnibus](https://github.com/schisamo/vagrant-omnibus) plugin. -### VirtualBox - -These baseboxes were all built using a Mac OS X host running VirtualBox 4.3.16, and have that format of Guest Extensions. - -* [opscode-centos-5.11-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_centos-5.11-i386_chef-provisionerless.box) -* [opscode-centos-5.11](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_centos-5.11_chef-provisionerless.box) -* [opscode-centos-6.6-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_centos-6.6-i386_chef-provisionerless.box) -* [opscode-centos-6.6](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_centos-6.6_chef-provisionerless.box) -* [opscode-centos-7.1](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_centos-7.1_chef-provisionerless.box) -* [opscode-debian-6.0.10-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_debian-6.0.10-i386_chef-provisionerless.box) -* [opscode-debian-6.0.10](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_debian-6.0.10_chef-provisionerless.box) -* [opscode-debian-7.8-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_debian-7.8-i386_chef-provisionerless.box) -* [opscode-debian-7.8](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_debian-7.8_chef-provisionerless.box) -* [opscode-debian-8.1-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_debian-8.1-i386_chef-provisionerless.box) -* [opscode-debian-8.1](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_debian-8.1_chef-provisionerless.box) -* [opscode-fedora-20-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_fedora-20-i386_chef-provisionerless.box) -* [opscode-fedora-20](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_fedora-20_chef-provisionerless.box) -* [opscode-fedora-21-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_fedora-21-i386_chef-provisionerless.box) -* [opscode-fedora-21](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_fedora-21_chef-provisionerless.box) -* [opscode-freebsd-9.3-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_freebsd-9.3-i386_chef-provisionerless.box) -* [opscode-freebsd-9.3](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_freebsd-9.3_chef-provisionerless.box) -* [opscode-freebsd-10.1](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_freebsd-10.1_chef-provisionerless.box) -* [opscode-freebsd-10.1-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_freebsd-10.1-i386_chef-provisionerless.box) -* [opscode-opensuse-13.1-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_opensuse-13.1-i386_chef-provisionerless.box) -* [opscode-opensuse-13.1](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_opensuse-13.1-x86_64_chef-provisionerless.box) -* [opscode-ubuntu-10.04-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_ubuntu-10.04-i386_chef-provisionerless.box) -* [opscode-ubuntu-10.04](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_ubuntu-10.04_chef-provisionerless.box) -* [opscode-ubuntu-12.04-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_ubuntu-12.04-i386_chef-provisionerless.box) -* [opscode-ubuntu-12.04](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_ubuntu-12.04_chef-provisionerless.box) -* [opscode-ubuntu-14.04-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_ubuntu-14.04-i386_chef-provisionerless.box) -* [opscode-ubuntu-14.04](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_ubuntu-14.04_chef-provisionerless.box) -* [opscode-ubuntu-14.10-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_ubuntu-14.10-i386_chef-provisionerless.box) -* [opscode-ubuntu-14.10](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_ubuntu-14.10_chef-provisionerless.box) -* [opscode-ubuntu-15.04-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_ubuntu-15.04-i386_chef-provisionerless.box) -* [opscode-ubuntu-15.04](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_ubuntu-15.04_chef-provisionerless.box) - -### VMWare - -These baseboxes were all built using a Mac OS X host running VMWare Fusion 6.0.2, and have that version of VMWare Tools. -The boxes should work unchanged in VMWare Workstation for Windows or Linux. - -If you're using the [Vagrant VMWare Fusion](https://www.vagrantup.com/vmware) +These baseboxes are currently hosted via the Atlas [bento organization](https://atlas.hashicorp.com/bento/) + +| | VirtualBox (5.0.2) | VMware (7.1.2) | Parallels (11.0.0) | +| ------------ | ------------- | ------------- | ------------- | +| centos-5.11 | [i386][1], [x86_64][2] | [i386][3], [x86_64][4] | [i386][5], [x86_64][6] | +| centos-6.7 | [i386][7], [x86_64][8] | [i386][9], [x86_64][10] | [i386][11], [x86_64][12] | +| centos-7.1 | [x86_64][13] | [x86_64][14] | [x86_64][15] | +| debian-6.0.10 | [i386][16], [amd64][17] | [i386][18], [amd64][19] | [i386][20], [amd64][21] | +| debian-7.8 | [i386][22], [amd64][23] | [i386][24], [amd64][25] | [i386][26], [amd64][27] | +| debian-8.1 | [i386][28], [amd64][29] | [i386][30], [amd64][31] | [i386][32], [amd64][33] | +| freebsd-9.3 | [amd64][35] | [amd64][37] | [amd64][39] | +| freebsd-10.2 | [amd64][41] | [amd64][43] | [amd64][45] | +| opensuse-13.2 | [i386][46], [x86_64][47] | [i386][48], [x86_64][49] | [i386][50], [x86_64][51] | +| ubuntu-10.04 | [i386][52], [amd64][53] | [i386][54], [amd64][55] | [i386][56], [amd64][57] | +| ubuntu-12.04 | [i386][58], [amd64][59] | [i386][60], [amd64][61] | [i386][62], [amd64][63] | +| ubuntu-14.04 | [i386][64], [amd64][65] | [i386][66], [amd64][67] | [i386][68], [amd64][69] | +| ubuntu-15.04 | [i386][70], [amd64][71] | [i386][72], [amd64][73] | [i386][74], [amd64][75] | + +### Build Notes + +* Boxes built on OSX 10.10.5 hosts +* If you're using the [Vagrant VMWare Fusion](https://www.vagrantup.com/vmware) provider, using `vagrant box add --provider vmware_desktop ...` will work for these boxes. Using `--provider vmware_fusion`, will not. -* [opscode-centos-5.11-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_centos-5.11-i386_chef-provisionerless.box) -* [opscode-centos-5.11](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_centos-5.11_chef-provisionerless.box) -* [opscode-centos-6.6-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_centos-6.6-i386_chef-provisionerless.box) -* [opscode-centos-6.6](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_centos-6.6_chef-provisionerless.box) -* [opscode-centos-7.1](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_centos-7.1_chef-provisionerless.box) -* [opscode-debian-6.0.10-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_debian-6.0.10-i386_chef-provisionerless.box) -* [opscode-debian-6.0.10](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_debian-6.0.10_chef-provisionerless.box) -* [opscode-debian-7.8-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_debian-7.8-i386_chef-provisionerless.box) -* [opscode-debian-7.8](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_debian-7.8_chef-provisionerless.box) -* [opscode-debian-8.1-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_debian-8.1-i386_chef-provisionerless.box) -* [opscode-debian-8.1](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_debian-8.1_chef-provisionerless.box) -* [opscode-fedora-20-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_fedora-20-i386_chef-provisionerless.box) -* [opscode-fedora-20](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_fedora-20_chef-provisionerless.box) -* [opscode-fedora-21-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_fedora-21-i386_chef-provisionerless.box) -* [opscode-fedora-21](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_fedora-21_chef-provisionerless.box) -* [opscode-freebsd-9.3-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_freebsd-9.3-i386_chef-provisionerless.box) -* [opscode-freebsd-9.3](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_freebsd-9.3_chef-provisionerless.box) -* [opscode-freebsd-10.1](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_freebsd-10.1_chef-provisionerless.box) -* [opscode-freebsd-10.1-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_freebsd-10.1-i386_chef-provisionerless.box) -* [opscode-opensuse-13.1-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_opensuse-13.1-i386_chef-provisionerless.box) -* [opscode-opensuse-13.1](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_opensuse-13.1-x86_64_chef-provisionerless.box) -* [opscode-ubuntu-10.04-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_ubuntu-10.04-i386_chef-provisionerless.box) -* [opscode-ubuntu-10.04](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_ubuntu-10.04_chef-provisionerless.box) -* [opscode-ubuntu-12.04-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_ubuntu-12.04-i386_chef-provisionerless.box) -* [opscode-ubuntu-12.04](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_ubuntu-12.04_chef-provisionerless.box) -* [opscode-ubuntu-14.04-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_ubuntu-14.04-i386_chef-provisionerless.box) -* [opscode-ubuntu-14.04](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_ubuntu-14.04_chef-provisionerless.box) -* [opscode-ubuntu-14.10-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_ubuntu-14.10-i386_chef-provisionerless.box) -* [opscode-ubuntu-14.10](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_ubuntu-14.10_chef-provisionerless.box) -* [opscode-ubuntu-15.04-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_ubuntu-15.04-i386_chef-provisionerless.box) -* [opscode-ubuntu-15.04](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_ubuntu-15.04_chef-provisionerless.box) - ## Older Baseboxes Older baseboxes include Chef and therefore are not compatible with some @@ -107,15 +55,15 @@ First, install [Packer](http://packer.io) and then clone this project. Inside the `packer` directory, a JSON file describes each box that can be built. You can use `packer build` to build the boxes. - $ packer build debian-7.2.0-i386.json + $ packer build debian-7.8.0-i386.json If you want to use a another mirror site, use mirror variable. - $ packer build -var 'mirror=http://ftp.jaist.ac.jp/pub/Linux/debian-cdimage/release' debian-7.2.0-i386.json + $ packer build -var 'mirror=http://ftp.jaist.ac.jp/pub/Linux/debian-cdimage/release' debian-7.8.0-i386.json If you only have VMware or VirtualBox available, you may also tell Packer to build only that box. - $ packer build -only=virtualbox-iso debian-7.2.0-i386.json + $ packer build -only=virtualbox-iso debian-7.8.0-i386.json Congratulations! You now have box(es) in the ../builds directory that you can then add to Vagrant and start testing cookbooks. @@ -209,3 +157,92 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ``` + +[1]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_centos-5.11-i386_chef-provisionerless.box +[2]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_centos-5.11_chef-provisionerless.box +[3]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_centos-5.11-i386_chef-provisionerless.box +[4]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_centos-5.11_chef-provisionerless.box +[5]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/parallels/opscode_centos-5.11-i386_chef-provisionerless.box +[6]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/parallels/opscode_centos-5.11_chef-provisionerless.box + +[7]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_centos-6.7-i386_chef-provisionerless.box +[8]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_centos-6.7_chef-provisionerless.box +[9]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_centos-6.7-i386_chef-provisionerless.box +[10]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_centos-6.7_chef-provisionerless.box +[11]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/parallels/opscode_centos-6.7-i386_chef-provisionerless.box +[12]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/parallels/opscode_centos-6.7_chef-provisionerless.box + +[13]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_centos-7.1_chef-provisionerless.box +[14]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_centos-7.1_chef-provisionerless.box +[15]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/parallels/opscode_centos-7.1_chef-provisionerless.box + +[16]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_debian-6.0.10-i386_chef-provisionerless.box +[17]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_debian-6.0.10_chef-provisionerless.box +[18]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_debian-6.0.10-i386_chef-provisionerless.box +[19]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_debian-6.0.10_chef-provisionerless.box +[20]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/parallels/opscode_debian-6.0.10-i386_chef-provisionerless.box +[21]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/parallels/opscode_debian-6.0.10_chef-provisionerless.box + +[22]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_debian-7.8-i386_chef-provisionerless.box +[23]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_debian-7.8_chef-provisionerless.box +[24]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_debian-7.8-i386_chef-provisionerless.box +[25]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_debian-7.8_chef-provisionerless.box +[26]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/parallels/opscode_debian-7.8-i386_chef-provisionerless.box +[27]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/parallels/opscode_debian-7.8_chef-provisionerless.box + +[28]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_debian-8.1-i386_chef-provisionerless.box +[29]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_debian-8.1_chef-provisionerless.box +[30]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_debian-8.1-i386_chef-provisionerless.box +[31]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_debian-8.1_chef-provisionerless.box +[32]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/parallels/opscode_debian-8.1-i386_chef-provisionerless.box +[33]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/parallels/opscode_debian-8.1_chef-provisionerless.box + +[34]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_freebsd-9.3-i386_chef-provisionerless.box +[35]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_freebsd-9.3_chef-provisionerless.box +[36]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_freebsd-9.3-i386_chef-provisionerless.box +[37]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_freebsd-9.3_chef-provisionerless.box +[38]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/parallels/opscode_freebsd-9.3-i386_chef-provisionerless.box +[39]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/parallels/opscode_freebsd-9.3_chef-provisionerless.box + +[40]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_freebsd-10.2-i386_chef-provisionerless.box +[41]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_freebsd-10.2_chef-provisionerless.box +[42]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_freebsd-10.2-i386_chef-provisionerless.box +[43]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_freebsd-10.2_chef-provisionerless.box +[44]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/parallels/opscode_freebsd-10.2-i386_chef-provisionerless.box +[45]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/parallels/opscode_freebsd-10.2_chef-provisionerless.box + +[46]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_opensuse-13.2-i386_chef-provisionerless.box +[47]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_opensuse-13.2-x86_64_chef-provisionerless.box +[48]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_opensuse-13.2-i386_chef-provisionerless.box +[49]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_opensuse-13.2-x86_64_chef-provisionerless.box +[50]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/parallels/opscode_opensuse-13.2-i386_chef-provisionerless.box +[51]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/parallels/opscode_opensuse-13.2-x86_64_chef-provisionerless.box + +[52]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_ubuntu-10.04-i386_chef-provisionerless.box +[53]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_ubuntu-10.04_chef-provisionerless.box +[54]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_ubuntu-10.04-i386_chef-provisionerless.box +[55]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_ubuntu-10.04_chef-provisionerless.box +[56]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/parallels/opscode_ubuntu-10.04-i386_chef-provisionerless.box +[57]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/parallels/opscode_ubuntu-10.04_chef-provisionerless.box + +[58]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_ubuntu-12.04-i386_chef-provisionerless.box +[59]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_ubuntu-12.04_chef-provisionerless.box +[60]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_ubuntu-12.04-i386_chef-provisionerless.box +[61]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_ubuntu-12.04_chef-provisionerless.box +[62]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/parallels/opscode_ubuntu-12.04-i386_chef-provisionerless.box +[63]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/parallels/opscode_ubuntu-12.04_chef-provisionerless.box + +[64]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_ubuntu-14.04-i386_chef-provisionerless.box +[65]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_ubuntu-14.04_chef-provisionerless.box +[66]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_ubuntu-14.04-i386_chef-provisionerless.box +[67]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_ubuntu-14.04_chef-provisionerless.box +[68]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/parallels/opscode_ubuntu-14.04-i386_chef-provisionerless.box +[69]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/parallels/opscode_ubuntu-14.04_chef-provisionerless.box + + +[70]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_ubuntu-15.04-i386_chef-provisionerless.box +[71]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_ubuntu-15.04_chef-provisionerless.box +[72]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_ubuntu-15.04-i386_chef-provisionerless.box +[73]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_ubuntu-15.04_chef-provisionerless.box +[74]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/parallels/opscode_ubuntu-15.04-i386_chef-provisionerless.box +[75]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/parallels/opscode_ubuntu-15.04_chef-provisionerless.box diff --git a/Rakefile b/Rakefile index d7deae809..178dab1b6 100644 --- a/Rakefile +++ b/Rakefile @@ -20,23 +20,14 @@ task :do_all do |task, args| # release stage Rake::Task['release_all'].invoke Rake::Task['release_all'].reenable - - # revoke - Rake::Task['revoke_all'].invoke - Rake::Task['revoke_all'].reenable - - # delete - Rake::Task['delete_all'].invoke - Rake::Task['delete_all'].reenable end -# bundle exec rake build_box[ubuntu-12.04-amd64] -desc 'Build a single bento box' +desc 'Build a bento template' task :build_box, :template do |t, args| sh "#{build_command(args[:template])}" end -desc 'Upload boxes' +desc 'Upload all boxes to Atlas for all providers' task :upload_all do metadata_files.each do |metadata_file| puts "Processing #{metadata_file} for upload." @@ -45,7 +36,7 @@ task :upload_all do end end -desc 'Upload box files for all providers' +desc 'Upload box files for a single platform to Atlas for all providers' task :upload_box, :metadata_file do |f, args| metadata = box_metadata(args[:metadata_file]) create_box(metadata['name']) @@ -72,9 +63,13 @@ desc 'Delete all boxes for a version' task :delete_all, :version do |v, args| delete_version(args[:version]) end + desc 'Clean the build directory' task :clean do + puts 'Removing builds/*.{box,json}' `rm -rf builds/*.{box,json}` + puts 'Removing packer-* directories' + `rm -rf packer-*` end def atlas_api @@ -174,14 +169,11 @@ def box_metadata(metadata_file) end def build_command(template) - cmd = %[./bin/bento build] - providers = %W[vmware-iso parallels-iso virtualbox-iso] - providers.delete(vmware-iso) if which('vmrun') - providers.delete(parallels-iso) if which('prlctl') - cmd.insert(1, "--except #{providers.join(",")}") - cmd.insert(1, "--mirror #{ENV['PACKER_MIRROR']}") if private?(template) - cmd.insert(1, "#{template}.json") - cmd + cmd = %W[./bin/bento build #{template}] + cmd.insert(2, "--only #{ENV['BENTO_PROVIDERS']}") if ENV['BENTO_PROVIDERS'] + cmd.insert(2, "--mirror #{ENV['PACKER_MIRROR']}") if private?(template) + cmd.insert(2, "--version #{ENV['BENTO_VERSION']}") if ENV['BENTO_VERSION'] + cmd.join(" ") end def metadata_files @@ -200,7 +192,7 @@ def create_box(boxname) req = request('post', "#{atlas_api}/boxes", { 'box[name]' => boxname, 'box[username]' => atlas_org, 'access_token' => atlas_token, 'is_private' => true }, { 'Content-Type' => 'application/json' } ) else puts "Creating the public box #{boxname} in atlas." - req = request('post', "#{atlas_api}/boxes", { 'box[name]' => boxname, 'box[username]' => atlas_org, 'access_token' => atlas_token }, { 'Content-Type' => 'application/json' } ) + req = request('post', "#{atlas_api}/boxes", { 'box[name]' => boxname, 'box[username]' => atlas_org, 'access_token' => atlas_token, 'is_private' => false }, { 'Content-Type' => 'application/json' } ) end else puts "The box #{boxname} exists in atlas, continuing." @@ -261,14 +253,14 @@ def revoke_version(version) boxes.each do |b| b['versions'].each do |v| - if v['version'] == version + if v['version'] == ENV['BENTO_VERSION'] puts "Revoking version #{v['version']} of box #{b['name']}" req = request('put', v['revoke_url'], { 'access_token' => atlas_token }, { 'Content-Type' => 'application/json' }) if req.code == '200' - puts "Version #{v['version']} of box #{b['name']} has been successfully revoked" + puts "Version #{v['version']} of box #{b['name']} has been successfully revoked" else puts "Something went wrong #{req.code}" - end + end end end end @@ -280,15 +272,15 @@ def delete_version(version) boxes.each do |b| b['versions'].each do |v| - if v['version'] == version + if v['version'] == ENV['BENTO_VERSION'] puts "Deleting version #{v['version']} of box #{b['name']}" puts "#{atlas_api}/box/#{atlas_org}/#{b['name']}/version/#{v['version']}" req = request('delete', "#{atlas_api}/box/#{atlas_org}/#{b['name']}/version/#{v['version']}", { 'access_token' => atlas_token }, { 'Content-Type' => 'application/json' }) if req.code == '200' - puts "Version #{v['version']} of box #{b['name']} has been successfully deleted" + puts "Version #{v['version']} of box #{b['name']} has been successfully deleted" else puts "Something went wrong #{req.code} #{req.body}" - end + end end end end From fb534c4d500e44939e9915e2c16d1ff3af71d6ba Mon Sep 17 00:00:00 2001 From: Seth Thomas <sthomas@chef.io> Date: Thu, 27 Aug 2015 13:04:56 -0700 Subject: [PATCH 0382/1622] Adding Fedora 21 back to matrix --- README.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/README.md b/README.md index d28566949..ec83ec3fe 100644 --- a/README.md +++ b/README.md @@ -28,6 +28,7 @@ These baseboxes are currently hosted via the Atlas [bento organization](https:// | debian-6.0.10 | [i386][16], [amd64][17] | [i386][18], [amd64][19] | [i386][20], [amd64][21] | | debian-7.8 | [i386][22], [amd64][23] | [i386][24], [amd64][25] | [i386][26], [amd64][27] | | debian-8.1 | [i386][28], [amd64][29] | [i386][30], [amd64][31] | [i386][32], [amd64][33] | +| fedora-21 | [i386][76], [amd64][77] | [i386][78], [amd64][79] | [i386][80], [amd64][81] | | freebsd-9.3 | [amd64][35] | [amd64][37] | [amd64][39] | | freebsd-10.2 | [amd64][41] | [amd64][43] | [amd64][45] | | opensuse-13.2 | [i386][46], [x86_64][47] | [i386][48], [x86_64][49] | [i386][50], [x86_64][51] | @@ -246,3 +247,10 @@ limitations under the License. [73]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_ubuntu-15.04_chef-provisionerless.box [74]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/parallels/opscode_ubuntu-15.04-i386_chef-provisionerless.box [75]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/parallels/opscode_ubuntu-15.04_chef-provisionerless.box + +[76]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_fedora-21-i386_chef-provisionerless.box +[77]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_fedora-21_chef-provisionerless.box +[78]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_fedora-21-i386_chef-provisionerless.box +[79]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_fedora-21_chef-provisionerless.box +[80]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/parallels/opscode_fedora-21-i386_chef-provisionerless.box +[81]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/parallels/opscode_fedora-21_chef-provisionerless.box From 58161bf1f95d3939f5fd150884050fd15b1957e4 Mon Sep 17 00:00:00 2001 From: Seth Thomas <cheeseplus@chef.io> Date: Thu, 27 Aug 2015 13:34:32 -0700 Subject: [PATCH 0383/1622] Hotfix: correct Fedora arch --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index ec83ec3fe..c11d9bef6 100644 --- a/README.md +++ b/README.md @@ -28,7 +28,7 @@ These baseboxes are currently hosted via the Atlas [bento organization](https:// | debian-6.0.10 | [i386][16], [amd64][17] | [i386][18], [amd64][19] | [i386][20], [amd64][21] | | debian-7.8 | [i386][22], [amd64][23] | [i386][24], [amd64][25] | [i386][26], [amd64][27] | | debian-8.1 | [i386][28], [amd64][29] | [i386][30], [amd64][31] | [i386][32], [amd64][33] | -| fedora-21 | [i386][76], [amd64][77] | [i386][78], [amd64][79] | [i386][80], [amd64][81] | +| fedora-21 | [i386][76], [x86_64][77] | [i386][78], [x86_64][79] | [i386][80], [x86_64][81] | | freebsd-9.3 | [amd64][35] | [amd64][37] | [amd64][39] | | freebsd-10.2 | [amd64][41] | [amd64][43] | [amd64][45] | | opensuse-13.2 | [i386][46], [x86_64][47] | [i386][48], [x86_64][49] | [i386][50], [x86_64][51] | From 0a9bcf6445ae623c787ae3192686ea2a8e059ba5 Mon Sep 17 00:00:00 2001 From: Seth Thomas <sthomas@chef.io> Date: Thu, 27 Aug 2015 14:17:32 -0700 Subject: [PATCH 0384/1622] Adding s3 upload to Rakefile and add buildkite shell script --- Rakefile | 20 ++++++++++++++- build.sh | 74 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 93 insertions(+), 1 deletion(-) create mode 100644 build.sh diff --git a/Rakefile b/Rakefile index 178dab1b6..5aba4e688 100644 --- a/Rakefile +++ b/Rakefile @@ -45,7 +45,13 @@ task :upload_box, :metadata_file do |f, args| upload_to_atlas(metadata['name'], metadata['version'], metadata['providers']) end -desc 'Release all boxes for a version' +desc 'Upload box files to S3 for all providers' +task :upload_box_s3, :metadata_file do |f, args| + metadata = box_metadata(args[:metadata_file]) + upload_to_s3(metadata['name'], metadata['version'], metadata['providers']) +end + +desc 'Release all boxes for a given version' task :release_all do metadata_files.each do |metadata_file| puts "Processing #{metadata_file} for release." @@ -215,6 +221,18 @@ def create_providers(boxname, version, provider_names) end end +def upload_to_s3(boxname, version, providers) + providers.each do |provider, provider_data| + boxfile = provider_data['file'] + upload_path = "s3://opscode-vm-bento/vagrant/#{provider}/opscode_#{boxname}_chef-provisionerless.box" + puts "Uploading the box #{boxfile} to S3, version: #{version}, provider: #{provider}, upload path: #{upload_path}" + cmd = %W[s3cmd put builds/#{boxfile} #{upload_path}] + cmd.insert(1, ".s3cfg-bento") + cmd.insert(1, "--config") + sh cmd.join(' ') + end +end + def upload_to_atlas(boxname, version, providers) # Extract the upload path providers.each do |provider, provider_data| diff --git a/build.sh b/build.sh new file mode 100644 index 000000000..4f46dfab7 --- /dev/null +++ b/build.sh @@ -0,0 +1,74 @@ +#!/usr/local/bin/bash + +set -eo pipefail + +env + +source ~/.bashrc + +function inline_image { + printf '\033]1338;url='"$1"';alt='"$2"'\a\n' +} + +inline_image 'https://oaxacaborn.files.wordpress.com/2012/02/clean-all-the-things-via-hyperbole-and-a-half.png' 'Clean All The Things' + + +echo "--- Cleaning up after VirtualBox" + +for i in `vboxmanage list runningvms | awk '{print $1}' | sed 's/"//g'` +do + echo "Powering off $i" + vboxmanage controlvm $i poweroff +done + +for i in `vboxmanage list vms | awk '{print $1}' | sed 's/"//g'` +do + echo "Unregistering $i" + sleep 10 + vboxmanage unregistervm $i +done + +for i in `ls ~/VirtualBox\ VMs/` +do + echo "Removing $i" + rm -rf ~/VirtualBox\ VMs/$i +done + +echo "--- Cleaning up after Parallels" + +for i in `prlctl list --no-header --output name` +do + echo "Powering off $i" + prlctl stop $i --kill + sleep 10 +done + +for i in `prlctl list --all --no-header --output uuid` +do + echo "Unregistering $i" + prlctl unregister $i +done + +echo "--- Cleaning up after Fusion" + +for i in `vmrun list | grep -v "Total"` +do + echo "Stopping $i" + vmrun stop $i + sleep 10 + + echo "Deleting $i" + vmrun deleteVM $i +done + +echo "--- Cleaning up after Packer" +rake clean + +echo "--- Build $PLATFORM-$BENTO_PROVIDERS" +rake build_box[$PLATFORM] + +echo "--- Upload Boxes" +rake upload_all + +echo "--- Release Boxes" +rake release_all From eee7b2e7ea1030a78f528c3016d9033eb4a4c37b Mon Sep 17 00:00:00 2001 From: Michael Vermaes <michaelv@realcognita.com> Date: Tue, 24 Feb 2015 20:10:57 +0800 Subject: [PATCH 0385/1622] CentOS kickstarts: Change sed to not rewrite sudo comments --- http/centos-5.11/ks.cfg | 2 +- http/centos-6.7/ks.cfg | 2 +- http/centos-7.1/ks.cfg | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/http/centos-5.11/ks.cfg b/http/centos-5.11/ks.cfg index c1c974fdb..9b1036aaa 100644 --- a/http/centos-5.11/ks.cfg +++ b/http/centos-5.11/ks.cfg @@ -71,4 +71,4 @@ yum %post # sudo echo "vagrant ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers -sed -i "s/^.*requiretty/#Defaults requiretty/" /etc/sudoers +sed -i "s/^[^#].*requiretty/#Defaults requiretty/" /etc/sudoers diff --git a/http/centos-6.7/ks.cfg b/http/centos-6.7/ks.cfg index d7215076d..f6da105d7 100644 --- a/http/centos-6.7/ks.cfg +++ b/http/centos-6.7/ks.cfg @@ -66,4 +66,4 @@ nfs-utils sed -i -e 's/\(^SELINUX=\).*$/\1permissive/' /etc/selinux/config # sudo echo "%vagrant ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers.d/vagrant -sed -i "s/^.*requiretty/#Defaults requiretty/" /etc/sudoers +sed -i "s/^[^#].*requiretty/#Defaults requiretty/" /etc/sudoers diff --git a/http/centos-7.1/ks.cfg b/http/centos-7.1/ks.cfg index c5414695f..573a605da 100644 --- a/http/centos-7.1/ks.cfg +++ b/http/centos-7.1/ks.cfg @@ -76,5 +76,5 @@ bzip2 %post # sudo echo "%vagrant ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers.d/vagrant -sed -i "s/^.*requiretty/#Defaults requiretty/" /etc/sudoers +sed -i "s/^[^#].*requiretty/#Defaults requiretty/" /etc/sudoers %end From 1265c0084747f3023b684269b35ec6397d4226e0 Mon Sep 17 00:00:00 2001 From: Seth Thomas <sthomas@chef.io> Date: Fri, 28 Aug 2015 08:25:08 -0700 Subject: [PATCH 0386/1622] Add Fedora 22 box links --- README.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/README.md b/README.md index c11d9bef6..bfeb5527e 100644 --- a/README.md +++ b/README.md @@ -29,6 +29,7 @@ These baseboxes are currently hosted via the Atlas [bento organization](https:// | debian-7.8 | [i386][22], [amd64][23] | [i386][24], [amd64][25] | [i386][26], [amd64][27] | | debian-8.1 | [i386][28], [amd64][29] | [i386][30], [amd64][31] | [i386][32], [amd64][33] | | fedora-21 | [i386][76], [x86_64][77] | [i386][78], [x86_64][79] | [i386][80], [x86_64][81] | +| fedora-22 | [x86_64][82] | [x86_64][83] | [x86_64][84] | | freebsd-9.3 | [amd64][35] | [amd64][37] | [amd64][39] | | freebsd-10.2 | [amd64][41] | [amd64][43] | [amd64][45] | | opensuse-13.2 | [i386][46], [x86_64][47] | [i386][48], [x86_64][49] | [i386][50], [x86_64][51] | @@ -254,3 +255,7 @@ limitations under the License. [79]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_fedora-21_chef-provisionerless.box [80]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/parallels/opscode_fedora-21-i386_chef-provisionerless.box [81]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/parallels/opscode_fedora-21_chef-provisionerless.box + +[82]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_fedora-22_chef-provisionerless.box +[83]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_fedora-22_chef-provisionerless.box +[84]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/parallels/opscode_fedora-22_chef-provisionerless.box From 446d7f76d91e5f723055856096236ca833c5bfc8 Mon Sep 17 00:00:00 2001 From: Seth Thomas <sthomas@chef.io> Date: Fri, 4 Sep 2015 09:15:43 -0600 Subject: [PATCH 0387/1622] Updating readme to reflect reality --- README.md | 92 +++++++++++++++++++++++++++++++++++++------------------ 1 file changed, 63 insertions(+), 29 deletions(-) diff --git a/README.md b/README.md index bfeb5527e..66fa52681 100644 --- a/README.md +++ b/README.md @@ -5,20 +5,16 @@ [travis]: https://travis-ci.org/chef/bento Bento is a project that encapsulates [Packer](http://packer.io) templates for building -[Vagrant](http://vagrantup.com) baseboxes. We use these boxes internally at Chef Software, Inc. for +[Vagrant](http://vagrantup.com) base boxes. We use these boxes internally at Chef Software, Inc. for testing Hosted Chef, Chef Server and our open source [cookbooks](https://supermarket.chef.io/users/chef) via [test-kitchen](http://kitchen.ci/). This project is managed by the CHEF Release Engineering team. For more information on the Release Engineering team's contribution, triage, and release process, please consult the [CHEF Release Engineering OSS Management Guide](https://docs.google.com/a/opscode.com/document/d/1oJB0vZb_3bl7_ZU2YMDBkMFdL-EWplW1BJv_FXTUOzg/edit). -## Current Baseboxes +## Pre-built Boxes -The following baseboxes are publicly available and were built using -this project. Note that our baseboxes do not include Chef Client. -Vagrant can be instructed to install Chef at runtime using the -[vagrant-omnibus](https://github.com/schisamo/vagrant-omnibus) plugin. +The following boxes are built from this repository's templates for publicly available platforms and are currently hosted via Atlas in the [bento organization](https://atlas.hashicorp.com/bento/). -These baseboxes are currently hosted via the Atlas [bento organization](https://atlas.hashicorp.com/bento/) | | VirtualBox (5.0.2) | VMware (7.1.2) | Parallels (11.0.0) | | ------------ | ------------- | ------------- | ------------- | @@ -40,40 +36,84 @@ These baseboxes are currently hosted via the Atlas [bento organization](https:// ### Build Notes -* Boxes built on OSX 10.10.5 hosts +* Built on OSX 10.10.5 hosts * If you're using the [Vagrant VMWare Fusion](https://www.vagrantup.com/vmware) provider, using `vagrant box add --provider vmware_desktop ...` will work for these boxes. Using `--provider vmware_fusion`, will not. +* The boxes are currently hosted on both Atlas and Amazon S3 to maintain backward +compatibility with [test-kitchen](https://github.com/test-kitchen/test-kitchen). +Once test-kitchen changes defaults the S3 buckets will no longer be updated. -## Older Baseboxes -Older baseboxes include Chef and therefore are not compatible with some +## Older Boxes + +Older boxes include Chef and therefore are not compatible with some new plugins. The full list of old boxes are available in the [old boxes file](https://github.com/chef/bento/blob/master/OLD-BOXES.md). -## Build Your Own Boxes +## Using Pre-built Boxes + +Adding a bento box to vagrant: + + $ vagrant box add chef/debian-8.1 + +Using a bento box in a Vagrantfile: + +``` +Vagrant.configure("2") do |config| + config.vm.box = "chef/debian-8.1" +end +``` + +## Requirements + +* [Packer](http://packer.io) +* At least one virtualization provider: Virtualbox, VMware Fusion, Parallels Desktop, etc + +## Build Your Own Bento Boxes + +### Using `bento` -First, install [Packer](http://packer.io) and then clone this project. +In the `bin` directory of this repo is the `bento` utility which wraps `packer` as well as allowing other related functionality. +This is an opinionated tool that the project uses for building the hosted boxes listed above. -Inside the `packer` directory, a JSON file describes each box that can be built. You can use `packer build` to build the -boxes. +To build multiple templates for all providers (VirtualBox, Fusion, Parallels, etc): - $ packer build debian-7.8.0-i386.json + $ bin/bento build debian-8.1-amd64 debian-8.1-i386 -If you want to use a another mirror site, use mirror variable. +To build a box for a single provider: - $ packer build -var 'mirror=http://ftp.jaist.ac.jp/pub/Linux/debian-cdimage/release' debian-7.8.0-i386.json + $ bin/bento build -only=virtualbox-iso debian-8.1-amd64 -If you only have VMware or VirtualBox available, you may also tell Packer to build only that box. +### Using `packer` - $ packer build -only=virtualbox-iso debian-7.8.0-i386.json +Templates can still be built directly by `packer` + +To build a template for all providers (VirtualBox, Fusion, Parallels): + + $ packer build -var 'box_basename=debian-8.1' debian-8.1-amd64.json + +To build a template only for a list of specific providers: + + $ packer build -only=virtualbox-iso -var 'box_basename=debian-8.1' debian-8.1-amd64.json + +To build a template for all providers except a list of specific providers: + + $ packer build -except=parallels-iso,vmware-iso -var 'box_basename=debian-8.1' debian-8.1-amd64.json + +If you want to use a another mirror site, use the `mirror` user variable. + + $ packer build -var 'mirror=http://ftp.jaist.ac.jp/pub/Linux/debian-cdimage/release' -var 'box_basename=debian-8.1' debian-8.1-amd64.json Congratulations! You now have box(es) in the ../builds directory that you can then add to Vagrant and start testing cookbooks. +Notes: +* -var 'box_basename=debian-8.1' isn't required but the default value for templates is "__unset_box_basename__" + ### Proprietary Boxes -Mac OS X (10.7, 10.8, 10.9, 10.10), Red Hat Enterprise Linux, and SUSE Linux Enterprise Server templates are provided. However, their ISOs are not publicly retrievable and as such, the URLs in those templates are bogus. For RHEL and SLES, you should substitute your server where you host the ISOs, using the mirror variable as above. +Mac OS X, Red Hat Enterprise Linux, and SUSE Linux Enterprise Server templates are provided. However, their ISOs are not publicly retrievable and as such, the URLs in those templates are bogus. For RHEL and SLES, substitute a server where the ISOs are hosted, using the mirror variable as above. -#### Mac OS X Boxes +#### Mac OS X To build a Mac OS X box, you will need to start with an installer for your desired version of OS X. You will then need to use [Tim Sutton's osx-vm-templates](https://github.com/timsutton/osx-vm-templates)/) to modify that installer for use by packer. The output of that build will include the location of the ISO and its checksum, which you can substitute into your `packer build` command, e.g.: @@ -83,15 +123,9 @@ There is a known issue where [test-kitchen](http://kitchen.ci/) starts a Mac OS Note that, while it is possible to build OS X boxes for VirtualBox, it may not be ideal. VirtualBox provides no "guest additions" for OS X. Boxes consequently have limited networking configurability and must rely on rsync for folder syncing. VMWare, when available, is generally preferred. -### Windows Boxes - -Packer does not yet support Windows, so veewee definitions are still used for building those boxes. You must build these -boxes yourself due to licensing constraints. You can build these as follows: - - $ bundle install - $ bundle exec veewee vbox build [definition-name] +### Windows -These veewee definitions are lightly maintained. For other approaches to building Windows boxes, please see the following +Currently the project does not include any definitions for building Windows boxes. For other approaches to building Windows boxes, please see the following community projects: * [Mischa Taylor's Boxcutter project](https://github.com/boxcutter) From 8a573f2af8327ee2c1be020c78c987c9a88872ef Mon Sep 17 00:00:00 2001 From: Mikhail Zholobov <legal90@gmail.com> Date: Sat, 5 Sep 2015 11:50:21 +0300 Subject: [PATCH 0388/1622] Add Parallels builder to Mac OS X templates --- macosx-10.10.json | 22 ++++++++++++++++++++++ macosx-10.7.json | 22 ++++++++++++++++++++++ macosx-10.8.json | 22 ++++++++++++++++++++++ macosx-10.9.json | 22 ++++++++++++++++++++++ scripts/macosx/vmtools.sh | 14 ++++++++++++-- 5 files changed, 100 insertions(+), 2 deletions(-) diff --git a/macosx-10.10.json b/macosx-10.10.json index d9317e512..583d8c4a0 100644 --- a/macosx-10.10.json +++ b/macosx-10.10.json @@ -152,6 +152,28 @@ ], "virtualbox_version_file": ".vbox_version", "vm_name": "{{ user `template` }}" + }, + { + "boot_wait": "2s", + "disk_size": 40960, + "guest_os_type": "macosx", + "headless": "{{ user `headless` }}", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `iso_url`}}", + "output_directory": "packer-{{user `template`}}-parallels", + "parallels_tools_flavor": "mac", + "prlctl": [ + ["set", "{{.Name}}", "--memsize", "2048"], + ["set", "{{.Name}}", "--cpus", "1"], + ["set", "{{.Name}}", "--on-window-close", "keep-running"] + ], + "shutdown_command": "echo 'vagrant'| sudo -S shutdown -h now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "parallels-iso" } ], "post-processors": [ diff --git a/macosx-10.7.json b/macosx-10.7.json index a2d24cf7f..cb0303f6d 100644 --- a/macosx-10.7.json +++ b/macosx-10.7.json @@ -152,6 +152,28 @@ ], "virtualbox_version_file": ".vbox_version", "vm_name": "{{ user `template` }}" + }, + { + "boot_wait": "2s", + "disk_size": 40960, + "guest_os_type": "macosx", + "headless": "{{ user `headless` }}", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `iso_url`}}", + "output_directory": "packer-{{user `template`}}-parallels", + "parallels_tools_flavor": "mac", + "prlctl": [ + ["set", "{{.Name}}", "--memsize", "2048"], + ["set", "{{.Name}}", "--cpus", "1"], + ["set", "{{.Name}}", "--on-window-close", "keep-running"] + ], + "shutdown_command": "echo 'vagrant'| sudo -S shutdown -h now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "parallels-iso" } ], "post-processors": [ diff --git a/macosx-10.8.json b/macosx-10.8.json index ca3088cb1..b58a796b8 100644 --- a/macosx-10.8.json +++ b/macosx-10.8.json @@ -152,6 +152,28 @@ ], "virtualbox_version_file": ".vbox_version", "vm_name": "{{ user `template` }}" + }, + { + "boot_wait": "2s", + "disk_size": 40960, + "guest_os_type": "macosx", + "headless": "{{ user `headless` }}", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `iso_url`}}", + "output_directory": "packer-{{user `template`}}-parallels", + "parallels_tools_flavor": "mac", + "prlctl": [ + ["set", "{{.Name}}", "--memsize", "2048"], + ["set", "{{.Name}}", "--cpus", "1"], + ["set", "{{.Name}}", "--on-window-close", "keep-running"] + ], + "shutdown_command": "echo 'vagrant'| sudo -S shutdown -h now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "parallels-iso" } ], "post-processors": [ diff --git a/macosx-10.9.json b/macosx-10.9.json index 833dcfe08..6d6d017b0 100644 --- a/macosx-10.9.json +++ b/macosx-10.9.json @@ -152,6 +152,28 @@ ], "virtualbox_version_file": ".vbox_version", "vm_name": "{{ user `template` }}" + }, + { + "boot_wait": "2s", + "disk_size": 40960, + "guest_os_type": "macosx", + "headless": "{{ user `headless` }}", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `iso_url`}}", + "output_directory": "packer-{{user `template`}}-parallels", + "parallels_tools_flavor": "mac", + "prlctl": [ + ["set", "{{.Name}}", "--memsize", "2048"], + ["set", "{{.Name}}", "--cpus", "1"], + ["set", "{{.Name}}", "--on-window-close", "keep-running"] + ], + "shutdown_command": "echo 'vagrant'| sudo -S shutdown -h now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "parallels-iso" } ], "post-processors": [ diff --git a/scripts/macosx/vmtools.sh b/scripts/macosx/vmtools.sh index ab3cbe5eb..78699941c 100644 --- a/scripts/macosx/vmtools.sh +++ b/scripts/macosx/vmtools.sh @@ -24,9 +24,19 @@ vmware-iso|vmware-vmx) ;; parallels-iso|parallels-pvm) - echo "Parallels not currently supported, sadface"; - ;; + TOOLS_PATH="$HOME_DIR/prl-tools-mac.iso"; + TMPMOUNT="`/usr/bin/mktemp -d /tmp/parallels-tools.XXXX`"; + + #Run install, unmount ISO and remove it + hdiutil attach "$TOOLS_PATH" -mountpoint "$TMPMOUNT"; + echo "Installing Parallels Tools..." + installer -pkg "$TMPMOUNT/Install.app/Contents/Resources/Install.mpkg" -target /; + # This usually fails + hdiutil detach "$TMPMOUNT" || true; + rmdir "$TMPMOUNT"; + rm -f "$TOOLS_PATH"; + ;; *) echo "Unknown Packer Builder Type >>${PACKER_BUILDER_TYPE}<< selected."; echo "Known are virtualbox-iso|virtualbox-ovf|vmware-iso|vmware-vmx|parallels-iso|parallels-pvm."; From 8ef74148f460143e956f0d6f68f5c87531784573 Mon Sep 17 00:00:00 2001 From: Seth Thomas <cheeseplus@chef.io> Date: Tue, 8 Sep 2015 20:25:12 -0600 Subject: [PATCH 0389/1622] Revert "Rename centos images for clarity" --- centos-5-i386.json => centos-5.11-i386.json | 0 ...s-5-x86_64.json => centos-5.11-x86_64.json | 0 centos-6-i386.json | 158 ------------------ centos-6-x86_64.json | 158 ------------------ ...os-7-x86_64.json => centos-7.1-x86_64.json | 0 5 files changed, 316 deletions(-) rename centos-5-i386.json => centos-5.11-i386.json (100%) rename centos-5-x86_64.json => centos-5.11-x86_64.json (100%) delete mode 100644 centos-6-i386.json delete mode 100644 centos-6-x86_64.json rename centos-7-x86_64.json => centos-7.1-x86_64.json (100%) diff --git a/centos-5-i386.json b/centos-5.11-i386.json similarity index 100% rename from centos-5-i386.json rename to centos-5.11-i386.json diff --git a/centos-5-x86_64.json b/centos-5.11-x86_64.json similarity index 100% rename from centos-5-x86_64.json rename to centos-5.11-x86_64.json diff --git a/centos-6-i386.json b/centos-6-i386.json deleted file mode 100644 index 9ad7a922a..000000000 --- a/centos-6-i386.json +++ /dev/null @@ -1,158 +0,0 @@ -{ - "builders": [ - { - "boot_command": [ - "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": 40960, - "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", - "guest_os_type": "RedHat", - "hard_drive_interface": "sata", - "headless": "{{ user `headless` }}", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-virtualbox", - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "virtualbox-iso", - "vboxmanage": [ - [ - "modifyvm", - "{{.Name}}", - "--memory", - "480" - ], - [ - "modifyvm", - "{{.Name}}", - "--cpus", - "1" - ] - ], - "virtualbox_version_file": ".vbox_version", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": 40960, - "guest_os_type": "centos", - "headless": "{{ user `headless` }}", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-vmware", - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "tools_upload_flavor": "linux", - "type": "vmware-iso", - "vm_name": "{{ user `template` }}", - "vmx_data": { - "cpuid.coresPerSocket": "1", - "memsize": "480", - "numvcpus": "1" - } - }, - { - "boot_command": [ - "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": 40960, - "guest_os_type": "centos", - "headless": "{{ user `headless` }}", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-parallels", - "parallels_tools_flavor": "lin", - "prlctl": [ - [ - "set", - "{{.Name}}", - "--memsize", - "480" - ], - [ - "set", - "{{.Name}}", - "--cpus", - "1" - ] - ], - "prlctl_version_file": ".prlctl_version", - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "parallels-iso", - "vm_name": "{{ user `template` }}" - } - ], - "post-processors": [ - { - "output": "builds/{{user `box_basename`}}.{{.Provider}}.box", - "type": "vagrant" - } - ], - "provisioners": [ - { - "destination": "/tmp/bento-metadata.json", - "source": "{{user `metadata`}}", - "type": "file" - }, - { - "environment_vars": [ - "HOME_DIR=/home/vagrant", - "http_proxy={{user `http_proxy`}}", - "https_proxy={{user `https_proxy`}}", - "no_proxy={{user `no_proxy`}}" - ], - "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", - "scripts": [ - "scripts/common/metadata.sh", - "scripts/common/sshd.sh", - "scripts/centos/networking.sh", - "scripts/common/vagrant.sh", - "scripts/common/vmtools.sh", - "scripts/centos/cleanup.sh", - "scripts/common/minimize.sh" - ], - "type": "shell" - } - ], - "variables": { - "box_basename": "__unset_box_basename__", - "build_timestamp": "{{isotime \"20060102150405\"}}", - "git_revision": "__unknown_git_revision__", - "headless": "", - "http_proxy": "{{env `http_proxy`}}", - "https_proxy": "{{env `https_proxy`}}", - "iso_checksum": "d16aa4a8e6f71fb01fcc26d8ae0e3443ed514c8e", - "iso_checksum_type": "sha1", - "iso_name": "CentOS-6.6-i386-bin-DVD1.iso", - "ks_path": "centos-6.6/ks.cfg", - "metadata": "floppy/dummy_metadata.json", - "mirror": "http://mirrors.kernel.org/centos", - "mirror_directory": "6.6/isos/i386", - "name": "centos-6.6-i386", - "no_proxy": "{{env `no_proxy`}}", - "template": "centos-6.6-i386", - "version": "2.1.TIMESTAMP" - } -} - diff --git a/centos-6-x86_64.json b/centos-6-x86_64.json deleted file mode 100644 index 8b8c34354..000000000 --- a/centos-6-x86_64.json +++ /dev/null @@ -1,158 +0,0 @@ -{ - "builders": [ - { - "boot_command": [ - "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": 40960, - "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", - "guest_os_type": "RedHat_64", - "hard_drive_interface": "sata", - "headless": "{{ user `headless` }}", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-virtualbox", - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "virtualbox-iso", - "vboxmanage": [ - [ - "modifyvm", - "{{.Name}}", - "--memory", - "480" - ], - [ - "modifyvm", - "{{.Name}}", - "--cpus", - "1" - ] - ], - "virtualbox_version_file": ".vbox_version", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": 40960, - "guest_os_type": "centos-64", - "headless": "{{ user `headless` }}", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-vmware", - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "tools_upload_flavor": "linux", - "type": "vmware-iso", - "vm_name": "{{ user `template` }}", - "vmx_data": { - "cpuid.coresPerSocket": "1", - "memsize": "480", - "numvcpus": "1" - } - }, - { - "boot_command": [ - "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": 40960, - "guest_os_type": "centos", - "headless": "{{ user `headless` }}", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-parallels", - "parallels_tools_flavor": "lin", - "prlctl": [ - [ - "set", - "{{.Name}}", - "--memsize", - "480" - ], - [ - "set", - "{{.Name}}", - "--cpus", - "1" - ] - ], - "prlctl_version_file": ".prlctl_version", - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "parallels-iso", - "vm_name": "{{ user `template` }}" - } - ], - "post-processors": [ - { - "output": "builds/{{user `box_basename`}}.{{.Provider}}.box", - "type": "vagrant" - } - ], - "provisioners": [ - { - "destination": "/tmp/bento-metadata.json", - "source": "{{user `metadata`}}", - "type": "file" - }, - { - "environment_vars": [ - "HOME_DIR=/home/vagrant", - "http_proxy={{user `http_proxy`}}", - "https_proxy={{user `https_proxy`}}", - "no_proxy={{user `no_proxy`}}" - ], - "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", - "scripts": [ - "scripts/common/metadata.sh", - "scripts/common/sshd.sh", - "scripts/centos/networking.sh", - "scripts/common/vagrant.sh", - "scripts/common/vmtools.sh", - "scripts/centos/cleanup.sh", - "scripts/common/minimize.sh" - ], - "type": "shell" - } - ], - "variables": { - "box_basename": "__unset_box_basename__", - "build_timestamp": "{{isotime \"20060102150405\"}}", - "git_revision": "__unknown_git_revision__", - "headless": "", - "http_proxy": "{{env `http_proxy`}}", - "https_proxy": "{{env `https_proxy`}}", - "iso_checksum": "08be09fd7276822bd3468af8f96198279ffc41f0", - "iso_checksum_type": "sha1", - "iso_name": "CentOS-6.6-x86_64-bin-DVD1.iso", - "ks_path": "centos-6.6/ks.cfg", - "metadata": "floppy/dummy_metadata.json", - "mirror": "http://mirrors.kernel.org/centos", - "mirror_directory": "6.6/isos/x86_64", - "name": "centos-6.6", - "no_proxy": "{{env `no_proxy`}}", - "template": "centos-6.6-x86_64", - "version": "2.1.TIMESTAMP" - } -} - diff --git a/centos-7-x86_64.json b/centos-7.1-x86_64.json similarity index 100% rename from centos-7-x86_64.json rename to centos-7.1-x86_64.json From c626880f87fcb2f3fec26ae7ba39b7f6c96928e9 Mon Sep 17 00:00:00 2001 From: Mikhail Zholobov <legal90@gmail.com> Date: Fri, 11 Sep 2015 15:47:59 +0300 Subject: [PATCH 0390/1622] Add "vm_name" parameter to Mac OS X templates for Parallels builder --- macosx-10.10.json | 3 ++- macosx-10.7.json | 3 ++- macosx-10.8.json | 3 ++- macosx-10.9.json | 3 ++- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/macosx-10.10.json b/macosx-10.10.json index 583d8c4a0..db61cdb07 100644 --- a/macosx-10.10.json +++ b/macosx-10.10.json @@ -173,7 +173,8 @@ "ssh_port": 22, "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", - "type": "parallels-iso" + "type": "parallels-iso", + "vm_name": "{{ user `template` }}" } ], "post-processors": [ diff --git a/macosx-10.7.json b/macosx-10.7.json index cb0303f6d..edb445b0b 100644 --- a/macosx-10.7.json +++ b/macosx-10.7.json @@ -173,7 +173,8 @@ "ssh_port": 22, "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", - "type": "parallels-iso" + "type": "parallels-iso", + "vm_name": "{{ user `template` }}" } ], "post-processors": [ diff --git a/macosx-10.8.json b/macosx-10.8.json index b58a796b8..f153a83ba 100644 --- a/macosx-10.8.json +++ b/macosx-10.8.json @@ -173,7 +173,8 @@ "ssh_port": 22, "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", - "type": "parallels-iso" + "type": "parallels-iso", + "vm_name": "{{ user `template` }}" } ], "post-processors": [ diff --git a/macosx-10.9.json b/macosx-10.9.json index 6d6d017b0..758cd54c5 100644 --- a/macosx-10.9.json +++ b/macosx-10.9.json @@ -173,7 +173,8 @@ "ssh_port": 22, "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", - "type": "parallels-iso" + "type": "parallels-iso", + "vm_name": "{{ user `template` }}" } ], "post-processors": [ From c603d331aaa70154865cb2240d8594898146347d Mon Sep 17 00:00:00 2001 From: Seth Thomas <sthomas@chef.io> Date: Fri, 11 Sep 2015 08:51:49 -0600 Subject: [PATCH 0391/1622] Adding Debian 8.2, update 8.1 URL, use sha256 checksums --- debian-8.1-amd64.json | 7 +- debian-8.1-i386.json | 7 +- debian-8.2-amd64.json | 201 ++++++++++++++++++++++++++++++++++++++++++ debian-8.2-i386.json | 201 ++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 408 insertions(+), 8 deletions(-) create mode 100644 debian-8.2-amd64.json create mode 100644 debian-8.2-i386.json diff --git a/debian-8.1-amd64.json b/debian-8.1-amd64.json index 3ca0596ab..f7b1e7f23 100644 --- a/debian-8.1-amd64.json +++ b/debian-8.1-amd64.json @@ -186,11 +186,11 @@ "headless": "", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", - "iso_checksum": "22bae271a732333ebff150598292d9907d2c6001", - "iso_checksum_type": "sha1", + "iso_checksum": "10adbdac17a25ad44d0241ae978140c70ddfebdd0597d4a4bfea9fef8eaa9075", + "iso_checksum_type": "sha256", "iso_name": "debian-8.1.0-amd64-CD-1.iso", "metadata": "floppy/dummy_metadata.json", - "mirror": "http://cdimage.debian.org/cdimage/release", + "mirror": "http://cdimage.debian.org/cdimage/archive", "mirror_directory": "8.1.0/amd64/iso-cd", "name": "debian-8.1", "no_proxy": "{{env `no_proxy`}}", @@ -199,4 +199,3 @@ "version": "2.1.TIMESTAMP" } } - diff --git a/debian-8.1-i386.json b/debian-8.1-i386.json index efca786bd..a42c7db65 100644 --- a/debian-8.1-i386.json +++ b/debian-8.1-i386.json @@ -186,11 +186,11 @@ "headless": "", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", - "iso_checksum": "e223823e0c159f057ec83bd51d4770a132e3e51b", - "iso_checksum_type": "sha1", + "iso_checksum": "74343980870d5c2c73e3c1a9d92ea6546b76070ccceeae7842c809557d07d53b", + "iso_checksum_type": "sha256", "iso_name": "debian-8.1.0-i386-CD-1.iso", "metadata": "floppy/dummy_metadata.json", - "mirror": "http://cdimage.debian.org/cdimage/release", + "mirror": "http://cdimage.debian.org/cdimage/archive", "mirror_directory": "8.1.0/i386/iso-cd", "name": "debian-8.1-i386", "no_proxy": "{{env `no_proxy`}}", @@ -199,4 +199,3 @@ "version": "2.1.TIMESTAMP" } } - diff --git a/debian-8.2-amd64.json b/debian-8.2-amd64.json new file mode 100644 index 000000000..ad37f9447 --- /dev/null +++ b/debian-8.2-amd64.json @@ -0,0 +1,201 @@ +{ + "builders": [ + { + "boot_command": [ + "<esc><wait>", + "install <wait>", + " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}} <wait>", + "debian-installer=en_US <wait>", + "auto <wait>", + "locale=en_US <wait>", + "kbd-chooser/method=us <wait>", + "keyboard-configuration/xkb-keymap=us <wait>", + "netcfg/get_hostname={{ .Name }} <wait>", + "netcfg/get_domain=vagrantup.com <wait>", + "fb=false <wait>", + "debconf/frontend=noninteractive <wait>", + "console-setup/ask_detect=false <wait>", + "console-keymaps-at/keymap=us <wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "guest_os_type": "Debian_64", + "hard_drive_interface": "sata", + "headless": "{{ user `headless` }}", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-virtualbox", + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "virtualbox-iso", + "vboxmanage": [ + [ + "modifyvm", + "{{.Name}}", + "--memory", + "384" + ], + [ + "modifyvm", + "{{.Name}}", + "--cpus", + "1" + ] + ], + "virtualbox_version_file": ".vbox_version", + "vm_name": "{{ user `template` }}" + }, + { + "boot_command": [ + "<esc><wait>", + "install <wait>", + " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}} <wait>", + "debian-installer=en_US <wait>", + "auto <wait>", + "locale=en_US <wait>", + "kbd-chooser/method=us <wait>", + "keyboard-configuration/xkb-keymap=us <wait>", + "netcfg/get_hostname={{ .Name }} <wait>", + "netcfg/get_domain=vagrantup.com <wait>", + "fb=false <wait>", + "debconf/frontend=noninteractive <wait>", + "console-setup/ask_detect=false <wait>", + "console-keymaps-at/keymap=us <wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "guest_os_type": "debian8-64", + "headless": "{{ user `headless` }}", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-vmware", + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "tools_upload_flavor": "linux", + "type": "vmware-iso", + "vm_name": "{{ user `template` }}", + "vmx_data": { + "cpuid.coresPerSocket": "1", + "memsize": "384", + "numvcpus": "1" + } + }, + { + "boot_command": [ + "<esc><wait>", + "install <wait>", + " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}} <wait>", + "debian-installer=en_US <wait>", + "auto <wait>", + "locale=en_US <wait>", + "kbd-chooser/method=us <wait>", + "keyboard-configuration/xkb-keymap=us <wait>", + "netcfg/get_hostname={{ .Name }} <wait>", + "netcfg/get_domain=vagrantup.com <wait>", + "fb=false <wait>", + "debconf/frontend=noninteractive <wait>", + "console-setup/ask_detect=false <wait>", + "console-keymaps-at/keymap=us <wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "guest_os_type": "debian", + "headless": "{{ user `headless` }}", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-parallels", + "parallels_tools_flavor": "lin", + "prlctl": [ + [ + "set", + "{{.Name}}", + "--memsize", + "384" + ], + [ + "set", + "{{.Name}}", + "--cpus", + "1" + ] + ], + "prlctl_version_file": ".prlctl_version", + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "parallels-iso", + "vm_name": "{{ user `template` }}" + } + ], + "post-processors": [ + { + "output": "builds/{{user `box_basename`}}.{{.Provider}}.box", + "type": "vagrant" + } + ], + "provisioners": [ + { + "destination": "/tmp/bento-metadata.json", + "source": "{{user `metadata`}}", + "type": "file" + }, + { + "environment_vars": [ + "HOME_DIR=/home/vagrant", + "http_proxy={{user `http_proxy`}}", + "https_proxy={{user `https_proxy`}}", + "no_proxy={{user `no_proxy`}}" + ], + "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", + "scripts": [ + "scripts/common/metadata.sh", + "scripts/debian/update.sh", + "scripts/common/sshd.sh", + "scripts/debian/networking.sh", + "scripts/debian/sudoers.sh", + "scripts/common/vagrant.sh", + "scripts/common/vmtools.sh", + "scripts/debian/cleanup.sh", + "scripts/common/minimize.sh" + ], + "type": "shell" + } + ], + "variables": { + "box_basename": "__unset_box_basename__", + "build_timestamp": "{{isotime \"20060102150405\"}}", + "git_revision": "__unknown_git_revision__", + "headless": "", + "http_proxy": "{{env `http_proxy`}}", + "https_proxy": "{{env `https_proxy`}}", + "iso_checksum": "d3ac88ec064f9e941ee5d9cbfaa87ac48929b81471f96073305ccd7bd71ff521", + "iso_checksum_type": "sha256", + "iso_name": "debian-8.2.0-amd64-CD-1.iso", + "metadata": "floppy/dummy_metadata.json", + "mirror": "http://cdimage.debian.org/cdimage/release", + "mirror_directory": "8.2.0/amd64/iso-cd", + "name": "debian-8.2", + "no_proxy": "{{env `no_proxy`}}", + "preseed_path": "debian-8/preseed.cfg", + "template": "debian-8.2-amd64", + "version": "2.1.TIMESTAMP" + } +} diff --git a/debian-8.2-i386.json b/debian-8.2-i386.json new file mode 100644 index 000000000..1934843bc --- /dev/null +++ b/debian-8.2-i386.json @@ -0,0 +1,201 @@ +{ + "builders": [ + { + "boot_command": [ + "<esc><wait>", + "install <wait>", + " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}} <wait>", + "debian-installer=en_US <wait>", + "auto <wait>", + "locale=en_US <wait>", + "kbd-chooser/method=us <wait>", + "keyboard-configuration/xkb-keymap=us <wait>", + "netcfg/get_hostname={{ .Name }} <wait>", + "netcfg/get_domain=vagrantup.com <wait>", + "fb=false <wait>", + "debconf/frontend=noninteractive <wait>", + "console-setup/ask_detect=false <wait>", + "console-keymaps-at/keymap=us <wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "guest_os_type": "Debian", + "hard_drive_interface": "sata", + "headless": "{{ user `headless` }}", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-virtualbox", + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "virtualbox-iso", + "vboxmanage": [ + [ + "modifyvm", + "{{.Name}}", + "--memory", + "384" + ], + [ + "modifyvm", + "{{.Name}}", + "--cpus", + "1" + ] + ], + "virtualbox_version_file": ".vbox_version", + "vm_name": "{{ user `template` }}" + }, + { + "boot_command": [ + "<esc><wait>", + "install <wait>", + " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}} <wait>", + "debian-installer=en_US <wait>", + "auto <wait>", + "locale=en_US <wait>", + "kbd-chooser/method=us <wait>", + "keyboard-configuration/xkb-keymap=us <wait>", + "netcfg/get_hostname={{ .Name }} <wait>", + "netcfg/get_domain=vagrantup.com <wait>", + "fb=false <wait>", + "debconf/frontend=noninteractive <wait>", + "console-setup/ask_detect=false <wait>", + "console-keymaps-at/keymap=us <wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "guest_os_type": "debian8", + "headless": "{{ user `headless` }}", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-vmware", + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "tools_upload_flavor": "linux", + "type": "vmware-iso", + "vm_name": "{{ user `template` }}", + "vmx_data": { + "cpuid.coresPerSocket": "1", + "memsize": "384", + "numvcpus": "1" + } + }, + { + "boot_command": [ + "<esc><wait>", + "install <wait>", + " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}} <wait>", + "debian-installer=en_US <wait>", + "auto <wait>", + "locale=en_US <wait>", + "kbd-chooser/method=us <wait>", + "keyboard-configuration/xkb-keymap=us <wait>", + "netcfg/get_hostname={{ .Name }} <wait>", + "netcfg/get_domain=vagrantup.com <wait>", + "fb=false <wait>", + "debconf/frontend=noninteractive <wait>", + "console-setup/ask_detect=false <wait>", + "console-keymaps-at/keymap=us <wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "guest_os_type": "debian", + "headless": "{{ user `headless` }}", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-parallels", + "parallels_tools_flavor": "lin", + "prlctl": [ + [ + "set", + "{{.Name}}", + "--memsize", + "384" + ], + [ + "set", + "{{.Name}}", + "--cpus", + "1" + ] + ], + "prlctl_version_file": ".prlctl_version", + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "parallels-iso", + "vm_name": "{{ user `template` }}" + } + ], + "post-processors": [ + { + "output": "builds/{{user `box_basename`}}.{{.Provider}}.box", + "type": "vagrant" + } + ], + "provisioners": [ + { + "destination": "/tmp/bento-metadata.json", + "source": "{{user `metadata`}}", + "type": "file" + }, + { + "environment_vars": [ + "HOME_DIR=/home/vagrant", + "http_proxy={{user `http_proxy`}}", + "https_proxy={{user `https_proxy`}}", + "no_proxy={{user `no_proxy`}}" + ], + "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", + "scripts": [ + "scripts/common/metadata.sh", + "scripts/debian/update.sh", + "scripts/common/sshd.sh", + "scripts/debian/networking.sh", + "scripts/debian/sudoers.sh", + "scripts/common/vagrant.sh", + "scripts/common/vmtools.sh", + "scripts/debian/cleanup.sh", + "scripts/common/minimize.sh" + ], + "type": "shell" + } + ], + "variables": { + "box_basename": "__unset_box_basename__", + "build_timestamp": "{{isotime \"20060102150405\"}}", + "git_revision": "__unknown_git_revision__", + "headless": "", + "http_proxy": "{{env `http_proxy`}}", + "https_proxy": "{{env `https_proxy`}}", + "iso_checksum": "87060c2777f55806e313db22ba8a78aee9f7119b6321448a1dfdaf0bbfcb67ce", + "iso_checksum_type": "sha256", + "iso_name": "debian-8.2.0-i386-CD-1.iso", + "metadata": "floppy/dummy_metadata.json", + "mirror": "http://cdimage.debian.org/cdimage/release", + "mirror_directory": "8.2.0/i386/iso-cd", + "name": "debian-8.2-i386", + "no_proxy": "{{env `no_proxy`}}", + "preseed_path": "debian-8/preseed.cfg", + "template": "debian-8.2-i386", + "version": "2.1.TIMESTAMP" + } +} From fa0a3b05ac495b7f9f654b518a185c776cbe02c3 Mon Sep 17 00:00:00 2001 From: Seth Thomas <sthomas@chef.io> Date: Fri, 11 Sep 2015 09:04:10 -0600 Subject: [PATCH 0392/1622] Update OSX build command --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 66fa52681..3635878b0 100644 --- a/README.md +++ b/README.md @@ -117,7 +117,7 @@ Mac OS X, Red Hat Enterprise Linux, and SUSE Linux Enterprise Server templates a To build a Mac OS X box, you will need to start with an installer for your desired version of OS X. You will then need to use [Tim Sutton's osx-vm-templates](https://github.com/timsutton/osx-vm-templates)/) to modify that installer for use by packer. The output of that build will include the location of the ISO and its checksum, which you can substitute into your `packer build` command, e.g.: - $ packer build -var 'iso_checksum=<checksum>' -var 'iso_url=<iso_url>' macosx-10.9.json + $ packer build -var 'box_basename=macosx-10.9' -var 'iso_checksum=<checksum>' -var 'iso_url=<iso_url>' macosx-10.9.json There is a known issue where [test-kitchen](http://kitchen.ci/) starts a Mac OS X box correctly, but `vagrant up` fails due to the absence of the HGFS kernel module. This is due to a silent failure during the VMware tools installation and can be corrected by installing the VMware tools on the Mac OS X box manually. From 6740d71084d7942308bfaae1af25d33822fccead Mon Sep 17 00:00:00 2001 From: Seth Thomas <sthomas@chef.io> Date: Fri, 11 Sep 2015 11:37:57 -0600 Subject: [PATCH 0393/1622] Setting basename to a more sensible default --- centos-5.11-i386.json | 2 +- centos-5.11-x86_64.json | 2 +- centos-6.7-i386.json | 2 +- centos-6.7-x86_64.json | 2 +- centos-7.1-x86_64.json | 2 +- debian-6.0.10-amd64.json | 2 +- debian-6.0.10-i386.json | 2 +- debian-7.8-amd64.json | 2 +- debian-7.8-i386.json | 2 +- debian-8.1-amd64.json | 2 +- debian-8.1-i386.json | 2 +- debian-8.2-amd64.json | 2 +- debian-8.2-i386.json | 2 +- freebsd-10.2-amd64.json | 2 +- freebsd-10.2-i386.json | 2 +- freebsd-9.3-amd64.json | 2 +- freebsd-9.3-i386.json | 2 +- macosx-10.10.json | 2 +- macosx-10.7.json | 2 +- macosx-10.8.json | 2 +- macosx-10.9.json | 2 +- ubuntu-10.04-amd64.json | 2 +- ubuntu-10.04-i386.json | 2 +- ubuntu-12.04-amd64.json | 2 +- ubuntu-12.04-i386.json | 2 +- ubuntu-14.04-amd64.json | 2 +- ubuntu-14.04-i386.json | 2 +- ubuntu-14.10-amd64.json | 2 +- ubuntu-14.10-i386.json | 2 +- ubuntu-15.04-amd64.json | 2 +- ubuntu-15.04-i386.json | 2 +- 31 files changed, 31 insertions(+), 31 deletions(-) diff --git a/centos-5.11-i386.json b/centos-5.11-i386.json index a1cab1738..2647b06bc 100644 --- a/centos-5.11-i386.json +++ b/centos-5.11-i386.json @@ -136,7 +136,7 @@ } ], "variables": { - "box_basename": "__unset_box_basename__", + "box_basename": "centos-5.11-i386", "build_timestamp": "{{isotime \"20060102150405\"}}", "git_revision": "__unknown_git_revision__", "headless": "", diff --git a/centos-5.11-x86_64.json b/centos-5.11-x86_64.json index 8590ac75f..7b56e73ab 100644 --- a/centos-5.11-x86_64.json +++ b/centos-5.11-x86_64.json @@ -136,7 +136,7 @@ } ], "variables": { - "box_basename": "__unset_box_basename__", + "box_basename": "centos-5.11", "build_timestamp": "{{isotime \"20060102150405\"}}", "git_revision": "__unknown_git_revision__", "headless": "", diff --git a/centos-6.7-i386.json b/centos-6.7-i386.json index 39ac1f5cc..ae75da8ca 100644 --- a/centos-6.7-i386.json +++ b/centos-6.7-i386.json @@ -136,7 +136,7 @@ } ], "variables": { - "box_basename": "__unset_box_basename__", + "box_basename": "centos-6.7-i386", "build_timestamp": "{{isotime \"20060102150405\"}}", "git_revision": "__unknown_git_revision__", "headless": "", diff --git a/centos-6.7-x86_64.json b/centos-6.7-x86_64.json index 726f367a3..f4c454bc3 100644 --- a/centos-6.7-x86_64.json +++ b/centos-6.7-x86_64.json @@ -136,7 +136,7 @@ } ], "variables": { - "box_basename": "__unset_box_basename__", + "box_basename": "centos-6.7", "build_timestamp": "{{isotime \"20060102150405\"}}", "git_revision": "__unknown_git_revision__", "headless": "", diff --git a/centos-7.1-x86_64.json b/centos-7.1-x86_64.json index ef965b66c..9cf95eb3d 100644 --- a/centos-7.1-x86_64.json +++ b/centos-7.1-x86_64.json @@ -136,7 +136,7 @@ } ], "variables": { - "box_basename": "__unset_box_basename__", + "box_basename": "centos-7.1", "build_timestamp": "{{isotime \"20060102150405\"}}", "git_revision": "__unknown_git_revision__", "headless": "", diff --git a/debian-6.0.10-amd64.json b/debian-6.0.10-amd64.json index 89609c149..252265304 100644 --- a/debian-6.0.10-amd64.json +++ b/debian-6.0.10-amd64.json @@ -180,7 +180,7 @@ } ], "variables": { - "box_basename": "__unset_box_basename__", + "box_basename": "debian-6.0.10", "build_timestamp": "{{isotime \"20060102150405\"}}", "git_revision": "__unknown_git_revision__", "headless": "", diff --git a/debian-6.0.10-i386.json b/debian-6.0.10-i386.json index d2ecbae35..9ff14c8f1 100644 --- a/debian-6.0.10-i386.json +++ b/debian-6.0.10-i386.json @@ -180,7 +180,7 @@ } ], "variables": { - "box_basename": "__unset_box_basename__", + "box_basename": "debian-6.0.10-i386", "build_timestamp": "{{isotime \"20060102150405\"}}", "git_revision": "__unknown_git_revision__", "headless": "", diff --git a/debian-7.8-amd64.json b/debian-7.8-amd64.json index 7507eeb12..e0e4f659e 100644 --- a/debian-7.8-amd64.json +++ b/debian-7.8-amd64.json @@ -180,7 +180,7 @@ } ], "variables": { - "box_basename": "__unset_box_basename__", + "box_basename": "debian-7.8", "build_timestamp": "{{isotime \"20060102150405\"}}", "git_revision": "__unknown_git_revision__", "headless": "", diff --git a/debian-7.8-i386.json b/debian-7.8-i386.json index 464f6a5bd..6ab842d24 100644 --- a/debian-7.8-i386.json +++ b/debian-7.8-i386.json @@ -180,7 +180,7 @@ } ], "variables": { - "box_basename": "__unset_box_basename__", + "box_basename": "debian-7.8-i386", "build_timestamp": "{{isotime \"20060102150405\"}}", "git_revision": "__unknown_git_revision__", "headless": "", diff --git a/debian-8.1-amd64.json b/debian-8.1-amd64.json index f7b1e7f23..16ebd2ff8 100644 --- a/debian-8.1-amd64.json +++ b/debian-8.1-amd64.json @@ -180,7 +180,7 @@ } ], "variables": { - "box_basename": "__unset_box_basename__", + "box_basename": "debian-8.1", "build_timestamp": "{{isotime \"20060102150405\"}}", "git_revision": "__unknown_git_revision__", "headless": "", diff --git a/debian-8.1-i386.json b/debian-8.1-i386.json index a42c7db65..f728a5100 100644 --- a/debian-8.1-i386.json +++ b/debian-8.1-i386.json @@ -180,7 +180,7 @@ } ], "variables": { - "box_basename": "__unset_box_basename__", + "box_basename": "debian-8.1-i386", "build_timestamp": "{{isotime \"20060102150405\"}}", "git_revision": "__unknown_git_revision__", "headless": "", diff --git a/debian-8.2-amd64.json b/debian-8.2-amd64.json index ad37f9447..8d4655cf5 100644 --- a/debian-8.2-amd64.json +++ b/debian-8.2-amd64.json @@ -180,7 +180,7 @@ } ], "variables": { - "box_basename": "__unset_box_basename__", + "box_basename": "debian-8.2", "build_timestamp": "{{isotime \"20060102150405\"}}", "git_revision": "__unknown_git_revision__", "headless": "", diff --git a/debian-8.2-i386.json b/debian-8.2-i386.json index 1934843bc..98c460bd6 100644 --- a/debian-8.2-i386.json +++ b/debian-8.2-i386.json @@ -180,7 +180,7 @@ } ], "variables": { - "box_basename": "__unset_box_basename__", + "box_basename": "debian-8.2-i386", "build_timestamp": "{{isotime \"20060102150405\"}}", "git_revision": "__unknown_git_revision__", "headless": "", diff --git a/freebsd-10.2-amd64.json b/freebsd-10.2-amd64.json index 97e270728..3f22e91f5 100644 --- a/freebsd-10.2-amd64.json +++ b/freebsd-10.2-amd64.json @@ -182,7 +182,7 @@ } ], "variables": { - "box_basename": "__unset_box_basename__", + "box_basename": "freebsd-10.2", "build_timestamp": "{{isotime \"20060102150405\"}}", "git_revision": "__unknown_git_revision__", "headless": "", diff --git a/freebsd-10.2-i386.json b/freebsd-10.2-i386.json index 6453d824c..8daa6a094 100644 --- a/freebsd-10.2-i386.json +++ b/freebsd-10.2-i386.json @@ -182,7 +182,7 @@ } ], "variables": { - "box_basename": "__unset_box_basename__", + "box_basename": "freebsd-10.2-i386", "build_timestamp": "{{isotime \"20060102150405\"}}", "git_revision": "__unknown_git_revision__", "headless": "", diff --git a/freebsd-9.3-amd64.json b/freebsd-9.3-amd64.json index 8061637d4..42e4e0e58 100644 --- a/freebsd-9.3-amd64.json +++ b/freebsd-9.3-amd64.json @@ -194,7 +194,7 @@ } ], "variables": { - "box_basename": "__unset_box_basename__", + "box_basename": "freebsd-9.3", "build_timestamp": "{{isotime \"20060102150405\"}}", "git_revision": "__unknown_git_revision__", "headless": "", diff --git a/freebsd-9.3-i386.json b/freebsd-9.3-i386.json index 5424e1499..db4808a6a 100644 --- a/freebsd-9.3-i386.json +++ b/freebsd-9.3-i386.json @@ -194,7 +194,7 @@ } ], "variables": { - "box_basename": "__unset_box_basename__", + "box_basename": "freebsd-9.3-i386", "build_timestamp": "{{isotime \"20060102150405\"}}", "git_revision": "__unknown_git_revision__", "headless": "", diff --git a/macosx-10.10.json b/macosx-10.10.json index db61cdb07..3725b5ead 100644 --- a/macosx-10.10.json +++ b/macosx-10.10.json @@ -213,7 +213,7 @@ ], "variables": { "_README": "You must provide a prepared Mac disk image (from https://github.com/timsutton/osx-vm-templates) and checksum value for this template to work. For more details, consult this project's README.md", - "box_basename": "__unset_box_basename__", + "box_basename": "macosx-10.10", "build_timestamp": "{{isotime \"20060102150405\"}}", "git_revision": "__unknown_git_revision__", "headless": "", diff --git a/macosx-10.7.json b/macosx-10.7.json index edb445b0b..a6222e946 100644 --- a/macosx-10.7.json +++ b/macosx-10.7.json @@ -213,7 +213,7 @@ ], "variables": { "_README": "You must provide a prepared Mac disk image (from https://github.com/timsutton/osx-vm-templates) and checksum value for this template to work. For more details, consult this project's README.md", - "box_basename": "__unset_box_basename__", + "box_basename": "macosx-10.7", "build_timestamp": "{{isotime \"20060102150405\"}}", "git_revision": "__unknown_git_revision__", "headless": "", diff --git a/macosx-10.8.json b/macosx-10.8.json index f153a83ba..9f52f3794 100644 --- a/macosx-10.8.json +++ b/macosx-10.8.json @@ -213,7 +213,7 @@ ], "variables": { "_README": "You must provide a prepared Mac disk image (from https://github.com/timsutton/osx-vm-templates) and checksum value for this template to work. For more details, consult this project's README.md", - "box_basename": "__unset_box_basename__", + "box_basename": "macosx-10.8", "build_timestamp": "{{isotime \"20060102150405\"}}", "git_revision": "__unknown_git_revision__", "headless": "", diff --git a/macosx-10.9.json b/macosx-10.9.json index 758cd54c5..bd25f4ec5 100644 --- a/macosx-10.9.json +++ b/macosx-10.9.json @@ -213,7 +213,7 @@ ], "variables": { "_README": "You must provide a prepared Mac disk image (from https://github.com/timsutton/osx-vm-templates) and checksum value for this template to work. For more details, consult this project's README.md", - "box_basename": "__unset_box_basename__", + "box_basename": "macosx-10.9", "build_timestamp": "{{isotime \"20060102150405\"}}", "git_revision": "__unknown_git_revision__", "headless": "", diff --git a/ubuntu-10.04-amd64.json b/ubuntu-10.04-amd64.json index 4c61e7b79..0f77f4f82 100644 --- a/ubuntu-10.04-amd64.json +++ b/ubuntu-10.04-amd64.json @@ -201,7 +201,7 @@ } ], "variables": { - "box_basename": "__unset_box_basename__", + "box_basename": "ubuntu-10.04", "build_timestamp": "{{isotime \"20060102150405\"}}", "git_revision": "__unknown_git_revision__", "headless": "", diff --git a/ubuntu-10.04-i386.json b/ubuntu-10.04-i386.json index c5668b73f..d0a3cd441 100644 --- a/ubuntu-10.04-i386.json +++ b/ubuntu-10.04-i386.json @@ -201,7 +201,7 @@ } ], "variables": { - "box_basename": "__unset_box_basename__", + "box_basename": "ubuntu-10.04-i386", "build_timestamp": "{{isotime \"20060102150405\"}}", "git_revision": "__unknown_git_revision__", "headless": "", diff --git a/ubuntu-12.04-amd64.json b/ubuntu-12.04-amd64.json index 8ede3493e..fc2080fad 100644 --- a/ubuntu-12.04-amd64.json +++ b/ubuntu-12.04-amd64.json @@ -201,7 +201,7 @@ } ], "variables": { - "box_basename": "__unset_box_basename__", + "box_basename": "ubuntu-12.04", "build_timestamp": "{{isotime \"20060102150405\"}}", "git_revision": "__unknown_git_revision__", "headless": "", diff --git a/ubuntu-12.04-i386.json b/ubuntu-12.04-i386.json index 84472c4d7..c2817bd29 100644 --- a/ubuntu-12.04-i386.json +++ b/ubuntu-12.04-i386.json @@ -201,7 +201,7 @@ } ], "variables": { - "box_basename": "__unset_box_basename__", + "box_basename": "ubuntu-12.04-i386", "build_timestamp": "{{isotime \"20060102150405\"}}", "git_revision": "__unknown_git_revision__", "headless": "", diff --git a/ubuntu-14.04-amd64.json b/ubuntu-14.04-amd64.json index d9f0bd301..df3326066 100644 --- a/ubuntu-14.04-amd64.json +++ b/ubuntu-14.04-amd64.json @@ -201,7 +201,7 @@ } ], "variables": { - "box_basename": "__unset_box_basename__", + "box_basename": "ubuntu-14.04", "build_timestamp": "{{isotime \"20060102150405\"}}", "git_revision": "__unknown_git_revision__", "headless": "", diff --git a/ubuntu-14.04-i386.json b/ubuntu-14.04-i386.json index 08eff882e..ab1e604cd 100644 --- a/ubuntu-14.04-i386.json +++ b/ubuntu-14.04-i386.json @@ -201,7 +201,7 @@ } ], "variables": { - "box_basename": "__unset_box_basename__", + "box_basename": "ubuntu-14.04-i386", "build_timestamp": "{{isotime \"20060102150405\"}}", "git_revision": "__unknown_git_revision__", "headless": "", diff --git a/ubuntu-14.10-amd64.json b/ubuntu-14.10-amd64.json index ec08ac295..1398bd855 100644 --- a/ubuntu-14.10-amd64.json +++ b/ubuntu-14.10-amd64.json @@ -201,7 +201,7 @@ } ], "variables": { - "box_basename": "__unset_box_basename__", + "box_basename": "ubuntu-14.10", "build_timestamp": "{{isotime \"20060102150405\"}}", "git_revision": "__unknown_git_revision__", "headless": "", diff --git a/ubuntu-14.10-i386.json b/ubuntu-14.10-i386.json index 4dc3859a4..587194b5f 100644 --- a/ubuntu-14.10-i386.json +++ b/ubuntu-14.10-i386.json @@ -201,7 +201,7 @@ } ], "variables": { - "box_basename": "__unset_box_basename__", + "box_basename": "ubuntu-14.10-i386", "build_timestamp": "{{isotime \"20060102150405\"}}", "git_revision": "__unknown_git_revision__", "headless": "", diff --git a/ubuntu-15.04-amd64.json b/ubuntu-15.04-amd64.json index c8bceffe9..2ee3d2660 100644 --- a/ubuntu-15.04-amd64.json +++ b/ubuntu-15.04-amd64.json @@ -201,7 +201,7 @@ } ], "variables": { - "box_basename": "__unset_box_basename__", + "box_basename": "ubuntu-15.04", "build_timestamp": "{{isotime \"20060102150405\"}}", "git_revision": "__unknown_git_revision__", "headless": "", diff --git a/ubuntu-15.04-i386.json b/ubuntu-15.04-i386.json index 70d71a167..854aed7b7 100644 --- a/ubuntu-15.04-i386.json +++ b/ubuntu-15.04-i386.json @@ -201,7 +201,7 @@ } ], "variables": { - "box_basename": "__unset_box_basename__", + "box_basename": "ubuntu-15.04-i386", "build_timestamp": "{{isotime \"20060102150405\"}}", "git_revision": "__unknown_git_revision__", "headless": "", From dc93708f831dea30c883325bf47b400730ed61b1 Mon Sep 17 00:00:00 2001 From: Lee Jones <scribblethink@gmail.com> Date: Sat, 12 Sep 2015 22:13:44 -0500 Subject: [PATCH 0394/1622] Use bento prefix for box names in README `vagrant up` failed when I used the `chef/` prefix in my `Vagrantfile`. Here is the error I experienced: ``` $> vagrant --version Vagrant 1.7.4 $> cat Vagrantfile Vagrant.configure(2) do |config| config.vm.box = "chef/ubuntu-12.04" end $> vagrant up Bringing machine 'default' up with 'virtualbox' provider... ==> default: Box 'chef/ubuntu-12.04' could not be found. Attempting to find and install... default: Box Provider: virtualbox default: Box Version: >= 0 ==> default: Loading metadata for box 'chef/ubuntu-12.04' default: URL: https://atlas.hashicorp.com/chef/ubuntu-12.04 The box you're adding has a name different from the name you requested. For boxes with metadata, you cannot override the name. If you're adding a box using `vagrant box add`, don't specify the `--name` parameter. If the box is being added via a Vagrantfile, change the `config.vm.box` value to match the name below. Requested name: chef/ubuntu-12.04 Actual name: bento/ubuntu-12.04 ``` I updated the README based on the recommendation in the error message. The `bento/` prefix works in my testing for both `vagrant up` and `vagrant box add`. `vagrant box add` works with the `chef/` prefix because it appears to redirect from the `chef/` prefix to the `bento/` one. I updated the `vagrant box add` example to use the `bento/` prefix since it seems to be the new location and for consistency between the two examples. --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 3635878b0..b5245253e 100644 --- a/README.md +++ b/README.md @@ -54,13 +54,13 @@ new plugins. The full list of old boxes are available in the [old boxes file](ht Adding a bento box to vagrant: - $ vagrant box add chef/debian-8.1 + $ vagrant box add bento/debian-8.1 Using a bento box in a Vagrantfile: ``` Vagrant.configure("2") do |config| - config.vm.box = "chef/debian-8.1" + config.vm.box = "bento/debian-8.1" end ``` From 259cab79f0a94cc6e29657e905bab7b28a3a5b5e Mon Sep 17 00:00:00 2001 From: Seth Thomas <sthomas@chef.io> Date: Mon, 14 Sep 2015 10:12:49 -0700 Subject: [PATCH 0395/1622] Add Debian 7.9 template --- debian-7.9-amd64.json | 201 ++++++++++++++++++++++++++++++++++++++++++ debian-7.9-i386.json | 201 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 402 insertions(+) create mode 100644 debian-7.9-amd64.json create mode 100644 debian-7.9-i386.json diff --git a/debian-7.9-amd64.json b/debian-7.9-amd64.json new file mode 100644 index 000000000..7c543b172 --- /dev/null +++ b/debian-7.9-amd64.json @@ -0,0 +1,201 @@ +{ + "builders": [ + { + "boot_command": [ + "<esc><wait>", + "install <wait>", + " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}} <wait>", + "debian-installer=en_US <wait>", + "auto <wait>", + "locale=en_US <wait>", + "kbd-chooser/method=us <wait>", + "keyboard-configuration/xkb-keymap=us <wait>", + "netcfg/get_hostname={{ .Name }} <wait>", + "netcfg/get_domain=vagrantup.com <wait>", + "fb=false <wait>", + "debconf/frontend=noninteractive <wait>", + "console-setup/ask_detect=false <wait>", + "console-keymaps-at/keymap=us <wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "guest_os_type": "Debian_64", + "hard_drive_interface": "sata", + "headless": "{{ user `headless` }}", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-virtualbox", + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "virtualbox-iso", + "vboxmanage": [ + [ + "modifyvm", + "{{.Name}}", + "--memory", + "384" + ], + [ + "modifyvm", + "{{.Name}}", + "--cpus", + "1" + ] + ], + "virtualbox_version_file": ".vbox_version", + "vm_name": "{{ user `template` }}" + }, + { + "boot_command": [ + "<esc><wait>", + "install <wait>", + " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}} <wait>", + "debian-installer=en_US <wait>", + "auto <wait>", + "locale=en_US <wait>", + "kbd-chooser/method=us <wait>", + "keyboard-configuration/xkb-keymap=us <wait>", + "netcfg/get_hostname={{ .Name }} <wait>", + "netcfg/get_domain=vagrantup.com <wait>", + "fb=false <wait>", + "debconf/frontend=noninteractive <wait>", + "console-setup/ask_detect=false <wait>", + "console-keymaps-at/keymap=us <wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "guest_os_type": "debian7-64", + "headless": "{{ user `headless` }}", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-vmware", + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "tools_upload_flavor": "linux", + "type": "vmware-iso", + "vm_name": "{{ user `template` }}", + "vmx_data": { + "cpuid.coresPerSocket": "1", + "memsize": "384", + "numvcpus": "1" + } + }, + { + "boot_command": [ + "<esc><wait>", + "install <wait>", + " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}} <wait>", + "debian-installer=en_US <wait>", + "auto <wait>", + "locale=en_US <wait>", + "kbd-chooser/method=us <wait>", + "keyboard-configuration/xkb-keymap=us <wait>", + "netcfg/get_hostname={{ .Name }} <wait>", + "netcfg/get_domain=vagrantup.com <wait>", + "fb=false <wait>", + "debconf/frontend=noninteractive <wait>", + "console-setup/ask_detect=false <wait>", + "console-keymaps-at/keymap=us <wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "guest_os_type": "debian", + "headless": "{{ user `headless` }}", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-parallels", + "parallels_tools_flavor": "lin", + "prlctl": [ + [ + "set", + "{{.Name}}", + "--memsize", + "384" + ], + [ + "set", + "{{.Name}}", + "--cpus", + "1" + ] + ], + "prlctl_version_file": ".prlctl_version", + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "parallels-iso", + "vm_name": "{{ user `template` }}" + } + ], + "post-processors": [ + { + "output": "builds/{{user `box_basename`}}.{{.Provider}}.box", + "type": "vagrant" + } + ], + "provisioners": [ + { + "destination": "/tmp/bento-metadata.json", + "source": "{{user `metadata`}}", + "type": "file" + }, + { + "environment_vars": [ + "HOME_DIR=/home/vagrant", + "http_proxy={{user `http_proxy`}}", + "https_proxy={{user `https_proxy`}}", + "no_proxy={{user `no_proxy`}}" + ], + "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", + "scripts": [ + "scripts/common/metadata.sh", + "scripts/debian/update.sh", + "scripts/common/sshd.sh", + "scripts/debian/networking.sh", + "scripts/debian/sudoers.sh", + "scripts/common/vagrant.sh", + "scripts/common/vmtools.sh", + "scripts/debian/cleanup.sh", + "scripts/common/minimize.sh" + ], + "type": "shell" + } + ], + "variables": { + "box_basename": "debian-7.9", + "build_timestamp": "{{isotime \"20060102150405\"}}", + "git_revision": "__unknown_git_revision__", + "headless": "", + "http_proxy": "{{env `http_proxy`}}", + "https_proxy": "{{env `https_proxy`}}", + "iso_checksum": "86fc1138497ce37dc502383e0326614d9d102c75ea6b43d22a9c7580b26349f4", + "iso_checksum_type": "sha256", + "iso_name": "debian-7.9.0-amd64-CD-1.iso", + "metadata": "floppy/dummy_metadata.json", + "mirror": "http://cdimage.debian.org/cdimage/archive", + "mirror_directory": "7.9.0/amd64/iso-cd", + "name": "debian-7.9", + "no_proxy": "{{env `no_proxy`}}", + "preseed_path": "debian-7/preseed.cfg", + "template": "debian-7.9-amd64", + "version": "2.1.TIMESTAMP" + } +} diff --git a/debian-7.9-i386.json b/debian-7.9-i386.json new file mode 100644 index 000000000..34363db33 --- /dev/null +++ b/debian-7.9-i386.json @@ -0,0 +1,201 @@ +{ + "builders": [ + { + "boot_command": [ + "<esc><wait>", + "install <wait>", + " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}} <wait>", + "debian-installer=en_US <wait>", + "auto <wait>", + "locale=en_US <wait>", + "kbd-chooser/method=us <wait>", + "keyboard-configuration/xkb-keymap=us <wait>", + "netcfg/get_hostname={{ .Name }} <wait>", + "netcfg/get_domain=vagrantup.com <wait>", + "fb=false <wait>", + "debconf/frontend=noninteractive <wait>", + "console-setup/ask_detect=false <wait>", + "console-keymaps-at/keymap=us <wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "guest_os_type": "Debian", + "hard_drive_interface": "sata", + "headless": "{{ user `headless` }}", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-virtualbox", + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "virtualbox-iso", + "vboxmanage": [ + [ + "modifyvm", + "{{.Name}}", + "--memory", + "384" + ], + [ + "modifyvm", + "{{.Name}}", + "--cpus", + "1" + ] + ], + "virtualbox_version_file": ".vbox_version", + "vm_name": "{{ user `template` }}" + }, + { + "boot_command": [ + "<esc><wait>", + "install <wait>", + " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}} <wait>", + "debian-installer=en_US <wait>", + "auto <wait>", + "locale=en_US <wait>", + "kbd-chooser/method=us <wait>", + "keyboard-configuration/xkb-keymap=us <wait>", + "netcfg/get_hostname={{ .Name }} <wait>", + "netcfg/get_domain=vagrantup.com <wait>", + "fb=false <wait>", + "debconf/frontend=noninteractive <wait>", + "console-setup/ask_detect=false <wait>", + "console-keymaps-at/keymap=us <wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "guest_os_type": "debian7", + "headless": "{{ user `headless` }}", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-vmware", + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "tools_upload_flavor": "linux", + "type": "vmware-iso", + "vm_name": "{{ user `template` }}", + "vmx_data": { + "cpuid.coresPerSocket": "1", + "memsize": "384", + "numvcpus": "1" + } + }, + { + "boot_command": [ + "<esc><wait>", + "install <wait>", + " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}} <wait>", + "debian-installer=en_US <wait>", + "auto <wait>", + "locale=en_US <wait>", + "kbd-chooser/method=us <wait>", + "keyboard-configuration/xkb-keymap=us <wait>", + "netcfg/get_hostname={{ .Name }} <wait>", + "netcfg/get_domain=vagrantup.com <wait>", + "fb=false <wait>", + "debconf/frontend=noninteractive <wait>", + "console-setup/ask_detect=false <wait>", + "console-keymaps-at/keymap=us <wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "guest_os_type": "debian", + "headless": "{{ user `headless` }}", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-parallels", + "parallels_tools_flavor": "lin", + "prlctl": [ + [ + "set", + "{{.Name}}", + "--memsize", + "384" + ], + [ + "set", + "{{.Name}}", + "--cpus", + "1" + ] + ], + "prlctl_version_file": ".prlctl_version", + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "parallels-iso", + "vm_name": "{{ user `template` }}" + } + ], + "post-processors": [ + { + "output": "builds/{{user `box_basename`}}.{{.Provider}}.box", + "type": "vagrant" + } + ], + "provisioners": [ + { + "destination": "/tmp/bento-metadata.json", + "source": "{{user `metadata`}}", + "type": "file" + }, + { + "environment_vars": [ + "HOME_DIR=/home/vagrant", + "http_proxy={{user `http_proxy`}}", + "https_proxy={{user `https_proxy`}}", + "no_proxy={{user `no_proxy`}}" + ], + "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", + "scripts": [ + "scripts/common/metadata.sh", + "scripts/debian/update.sh", + "scripts/common/sshd.sh", + "scripts/debian/networking.sh", + "scripts/debian/sudoers.sh", + "scripts/common/vagrant.sh", + "scripts/common/vmtools.sh", + "scripts/debian/cleanup.sh", + "scripts/common/minimize.sh" + ], + "type": "shell" + } + ], + "variables": { + "box_basename": "debian-7.9-i386", + "build_timestamp": "{{isotime \"20060102150405\"}}", + "git_revision": "__unknown_git_revision__", + "headless": "", + "http_proxy": "{{env `http_proxy`}}", + "https_proxy": "{{env `https_proxy`}}", + "iso_checksum": "b1168c5379b8b84bb700d146ca3c90f3cd8a43bd1ea77517a6176dbafa0063ab", + "iso_checksum_type": "sha256", + "iso_name": "debian-7.9.0-i386-CD-1.iso", + "metadata": "floppy/dummy_metadata.json", + "mirror": "http://cdimage.debian.org/cdimage/archive", + "mirror_directory": "7.9.0/i386/iso-cd", + "name": "debian-7.9-i386", + "no_proxy": "{{env `no_proxy`}}", + "preseed_path": "debian-7/preseed.cfg", + "template": "debian-7.9-i386", + "version": "2.1.TIMESTAMP" + } +} From 4593ca218611c7e5ded0fdb6261957585b514740 Mon Sep 17 00:00:00 2001 From: Seth Thomas <sthomas@chef.io> Date: Mon, 14 Sep 2015 13:39:15 -0700 Subject: [PATCH 0396/1622] Updating platforms to use sha256 --- centos-5.11-i386.json | 5 ++--- centos-5.11-x86_64.json | 5 ++--- debian-6.0.10-amd64.json | 5 ++--- debian-6.0.10-i386.json | 5 ++--- ubuntu-10.04-amd64.json | 5 ++--- ubuntu-10.04-i386.json | 5 ++--- ubuntu-12.04-amd64.json | 5 ++--- ubuntu-12.04-i386.json | 5 ++--- ubuntu-14.10-amd64.json | 5 ++--- ubuntu-14.10-i386.json | 5 ++--- 10 files changed, 20 insertions(+), 30 deletions(-) diff --git a/centos-5.11-i386.json b/centos-5.11-i386.json index 2647b06bc..8e01363ac 100644 --- a/centos-5.11-i386.json +++ b/centos-5.11-i386.json @@ -142,8 +142,8 @@ "headless": "", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", - "iso_checksum": "ec3a89b4edc8e391d13c1ecce4e6ce3917719e39", - "iso_checksum_type": "sha1", + "iso_checksum": "66d7aa1be7f7aa327b823a706b04b37e219cea67c4eadd9185e8de5e3c4fb08d", + "iso_checksum_type": "sha256", "iso_name": "CentOS-5.11-i386-bin-DVD-1of2.iso", "ks_path": "centos-5.11/ks.cfg", "metadata": "floppy/dummy_metadata.json", @@ -155,4 +155,3 @@ "version": "2.1.TIMESTAMP" } } - diff --git a/centos-5.11-x86_64.json b/centos-5.11-x86_64.json index 7b56e73ab..5cbfe109b 100644 --- a/centos-5.11-x86_64.json +++ b/centos-5.11-x86_64.json @@ -142,8 +142,8 @@ "headless": "", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", - "iso_checksum": "ebd77f2fdfac8da04f31c508905cf52aa62937cc", - "iso_checksum_type": "sha1", + "iso_checksum": "b6eb0565b636513b90663ff01c6ec4da5058baff0d7d4007d187be997dd985f8", + "iso_checksum_type": "sha256", "iso_name": "CentOS-5.11-x86_64-bin-DVD-1of2.iso", "ks_path": "centos-5.11/ks.cfg", "metadata": "floppy/dummy_metadata.json", @@ -155,4 +155,3 @@ "version": "2.1.TIMESTAMP" } } - diff --git a/debian-6.0.10-amd64.json b/debian-6.0.10-amd64.json index 252265304..ba1b1c6df 100644 --- a/debian-6.0.10-amd64.json +++ b/debian-6.0.10-amd64.json @@ -186,8 +186,8 @@ "headless": "", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", - "iso_checksum": "f3e70528664f174a121b26491c59cd66daaf8274", - "iso_checksum_type": "sha1", + "iso_checksum": "ee3bc7fd1a1bcbf49297fe305cec935cc8012ab6ec8d37e9428d0600b060c0d8", + "iso_checksum_type": "sha256", "iso_name": "debian-6.0.10-amd64-CD-1.iso", "metadata": "floppy/dummy_metadata.json", "mirror": "http://cdimage.debian.org/cdimage/archive", @@ -199,4 +199,3 @@ "version": "2.1.TIMESTAMP" } } - diff --git a/debian-6.0.10-i386.json b/debian-6.0.10-i386.json index 9ff14c8f1..76bd20555 100644 --- a/debian-6.0.10-i386.json +++ b/debian-6.0.10-i386.json @@ -186,8 +186,8 @@ "headless": "", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", - "iso_checksum": "e8f77720e30f669e731fe3166ad6c3d2da33d93a", - "iso_checksum_type": "sha1", + "iso_checksum": "d2740420ba52d397c453fbfea6f5d3bcdbfe27dee666ee63b0fb1e7df1d18633", + "iso_checksum_type": "sha256", "iso_name": "debian-6.0.10-i386-CD-1.iso", "metadata": "floppy/dummy_metadata.json", "mirror": "http://cdimage.debian.org/cdimage/archive", @@ -199,4 +199,3 @@ "version": "2.1.TIMESTAMP" } } - diff --git a/ubuntu-10.04-amd64.json b/ubuntu-10.04-amd64.json index 0f77f4f82..bb2133cc8 100644 --- a/ubuntu-10.04-amd64.json +++ b/ubuntu-10.04-amd64.json @@ -207,8 +207,8 @@ "headless": "", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", - "iso_checksum": "796e80702d65f2ee96e88874a1ab437e24df9cd6", - "iso_checksum_type": "sha1", + "iso_checksum": "3de19967318906fd57252ef67ed3ad411b89e3ea6b81205e26517530d7a8cd0b", + "iso_checksum_type": "sha256", "iso_name": "ubuntu-10.04.4-server-amd64.iso", "metadata": "floppy/dummy_metadata.json", "mirror": "http://releases.ubuntu.com", @@ -220,4 +220,3 @@ "version": "2.1.TIMESTAMP" } } - diff --git a/ubuntu-10.04-i386.json b/ubuntu-10.04-i386.json index d0a3cd441..d766c2959 100644 --- a/ubuntu-10.04-i386.json +++ b/ubuntu-10.04-i386.json @@ -207,8 +207,8 @@ "headless": "", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", - "iso_checksum": "5695d8b6b914269d1374ac8d4c3dd3786e92d3fe", - "iso_checksum_type": "sha1", + "iso_checksum": "564eb67534ab64dbddd4b5bed54ec96f447cbbeb27a8a1354eae85658559503f", + "iso_checksum_type": "sha256", "iso_name": "ubuntu-10.04.4-server-i386.iso", "metadata": "floppy/dummy_metadata.json", "mirror": "http://releases.ubuntu.com", @@ -220,4 +220,3 @@ "version": "2.1.TIMESTAMP" } } - diff --git a/ubuntu-12.04-amd64.json b/ubuntu-12.04-amd64.json index fc2080fad..6a4b9111a 100644 --- a/ubuntu-12.04-amd64.json +++ b/ubuntu-12.04-amd64.json @@ -207,8 +207,8 @@ "headless": "", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", - "iso_checksum": "7540ace2d6cdee264432f5ed987236d32edef798", - "iso_checksum_type": "sha1", + "iso_checksum": "af224223de99e2a730b67d7785b657f549be0d63221188e105445f75fb8305c9", + "iso_checksum_type": "sha256", "iso_name": "ubuntu-12.04.5-server-amd64.iso", "metadata": "floppy/dummy_metadata.json", "mirror": "http://releases.ubuntu.com", @@ -220,4 +220,3 @@ "version": "2.1.TIMESTAMP" } } - diff --git a/ubuntu-12.04-i386.json b/ubuntu-12.04-i386.json index c2817bd29..a504f722a 100644 --- a/ubuntu-12.04-i386.json +++ b/ubuntu-12.04-i386.json @@ -207,8 +207,8 @@ "headless": "", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", - "iso_checksum": "a34c224b7fe72a2f5c768be5afee5c53817743fd", - "iso_checksum_type": "sha1", + "iso_checksum": "bec39e79664aa189dea338993f636e54c5eda2f84c27def7b06bd6373ab87628", + "iso_checksum_type": "sha256", "iso_name": "ubuntu-12.04.5-server-i386.iso", "metadata": "floppy/dummy_metadata.json", "mirror": "http://releases.ubuntu.com", @@ -220,4 +220,3 @@ "version": "2.1.TIMESTAMP" } } - diff --git a/ubuntu-14.10-amd64.json b/ubuntu-14.10-amd64.json index 1398bd855..64532832d 100644 --- a/ubuntu-14.10-amd64.json +++ b/ubuntu-14.10-amd64.json @@ -207,8 +207,8 @@ "headless": "", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", - "iso_checksum": "0c1ebea31c3523cfe9a4ffed8bcf6c7d23dfb97b", - "iso_checksum_type": "sha1", + "iso_checksum": "f79edea19575e2cabb5ff9aeca787ea821fcfdbf81ce89823c26b020d9940956", + "iso_checksum_type": "sha256", "iso_name": "ubuntu-14.10-server-amd64.iso", "metadata": "floppy/dummy_metadata.json", "mirror": "http://releases.ubuntu.com", @@ -220,4 +220,3 @@ "version": "2.1.TIMESTAMP" } } - diff --git a/ubuntu-14.10-i386.json b/ubuntu-14.10-i386.json index 587194b5f..1f24dae62 100644 --- a/ubuntu-14.10-i386.json +++ b/ubuntu-14.10-i386.json @@ -207,8 +207,8 @@ "headless": "", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", - "iso_checksum": "26faf47df2162f4ff83e38e6831dd169da6db95f", - "iso_checksum_type": "sha1", + "iso_checksum": "e1c74e163b06e28bfd71ef322ce986fb6098d03704408f9dc2eaf3ef6f7f86b9", + "iso_checksum_type": "sha256", "iso_name": "ubuntu-14.10-server-i386.iso", "metadata": "floppy/dummy_metadata.json", "mirror": "http://releases.ubuntu.com", @@ -220,4 +220,3 @@ "version": "2.1.TIMESTAMP" } } - From b8db9bccdd5ea26553b4092b2a6cbf672bd12fe8 Mon Sep 17 00:00:00 2001 From: Seth Thomas <sthomas@chef.io> Date: Tue, 15 Sep 2015 09:44:25 -0700 Subject: [PATCH 0397/1622] [fedora-*] DRYness pass --- fedora-20-i386.json | 47 +++++++++++++++++++++++------------- fedora-20-x86_64.json | 47 +++++++++++++++++++++++------------- fedora-21-i386.json | 46 ++++++++++++++++++++++------------- fedora-21-x86_64.json | 46 ++++++++++++++++++++++------------- fedora-22-i386.json | 49 ++++++++++++++++++++++--------------- fedora-22-x86_64.json | 56 +++++++++++++++++++++++++++---------------- 6 files changed, 184 insertions(+), 107 deletions(-) diff --git a/fedora-20-i386.json b/fedora-20-i386.json index 4b255bc54..f005a3556 100644 --- a/fedora-20-i386.json +++ b/fedora-20-i386.json @@ -2,7 +2,7 @@ "builders": [ { "boot_command": [ - "<tab> linux ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/fedora-20/ks.cfg<enter><wait>" + "<tab> linux ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], "boot_wait": "10s", "disk_size": 40960, @@ -11,10 +11,10 @@ "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", "http_directory": "http", - "iso_checksum": "284ea30ddd50db1b30cd5cd9fae7495dad8714ef1e4428d69a8c8ce80e03b6a9", - "iso_checksum_type": "sha256", - "iso_url": "{{user `mirror`}}/releases/20/Fedora/i386/iso/Fedora-20-i386-DVD.iso", - "output_directory": "packer-fedora-20-i386-virtualbox", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-virtualbox", "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", "ssh_password": "vagrant", "ssh_port": 22, @@ -40,17 +40,17 @@ }, { "boot_command": [ - "<tab> linux ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/fedora-20/ks.cfg<enter><wait>" + "<tab> linux ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], "boot_wait": "10s", "disk_size": 40960, "guest_os_type": "fedora", "headless": "{{ user `headless` }}", "http_directory": "http", - "iso_checksum": "284ea30ddd50db1b30cd5cd9fae7495dad8714ef1e4428d69a8c8ce80e03b6a9", - "iso_checksum_type": "sha256", - "iso_url": "{{user `mirror`}}/releases/20/Fedora/i386/iso/Fedora-20-i386-DVD.iso", - "output_directory": "packer-fedora-20-i386-vmware", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}" + "output_directory": "packer-{{user `template`}}-vmware", "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", "ssh_password": "vagrant", "ssh_port": 22, @@ -67,17 +67,17 @@ }, { "boot_command": [ - "<tab> linux ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/fedora-20/ks.cfg<enter><wait>" + "<tab> linux ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], "boot_wait": "10s", "disk_size": 40960, "guest_os_type": "fedora-core", "headless": "{{ user `headless` }}", "http_directory": "http", - "iso_checksum": "284ea30ddd50db1b30cd5cd9fae7495dad8714ef1e4428d69a8c8ce80e03b6a9", - "iso_checksum_type": "sha256", - "iso_url": "{{user `mirror`}}/releases/20/Fedora/i386/iso/Fedora-20-i386-DVD.iso", - "output_directory": "packer-fedora-20-i386-parallels", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-parallels", "parallels_tools_flavor": "lin", "prlctl": [ [ @@ -116,7 +116,12 @@ "type": "file" }, { - "environment_vars": [], + "environment_vars": [ + "HOME_DIR=/home/vagrant", + "http_proxy={{user `http_proxy`}}", + "https_proxy={{user `https_proxy`}}", + "no_proxy={{user `no_proxy`}}" + ], "execute_command": "echo 'vagrant' | {{.Vars}} sudo -E -S bash '{{.Path}}'", "scripts": [ "scripts/common/metadata.sh", @@ -136,9 +141,17 @@ "build_timestamp": "{{isotime \"20060102150405\"}}", "git_revision": "__unknown_git_revision__", "headless": "", + "http_proxy": "{{env `http_proxy`}}", + "https_proxy": "{{env `https_proxy`}}", + "iso_checksum": "284ea30ddd50db1b30cd5cd9fae7495dad8714ef1e4428d69a8c8ce80e03b6a9", + "iso_checksum_type": "sha256", + "iso_name": "Fedora-20-i386-DVD.iso", + "ks_path": "fedora-20/ks.cfg", "metadata": "floppy/dummy_metadata.json", - "mirror": "http://download.fedoraproject.org/pub/fedora/linux", + "mirror": "https://archive.fedoraproject.org/pub/archive/fedora/linux", + "mirror_directory": "releases/20/Fedora/x86_64/iso", "name": "fedora-20-i386", + "no_proxy": "{{env `no_proxy`}}", "template": "fedora-20-i386", "version": "2.0.TIMESTAMP" } diff --git a/fedora-20-x86_64.json b/fedora-20-x86_64.json index 844839621..5575f91b7 100644 --- a/fedora-20-x86_64.json +++ b/fedora-20-x86_64.json @@ -2,7 +2,7 @@ "builders": [ { "boot_command": [ - "<tab> linux ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/fedora-20/ks.cfg<enter><wait>" + "<tab> linux ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], "boot_wait": "10s", "disk_size": 40960, @@ -11,10 +11,10 @@ "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", "http_directory": "http", - "iso_checksum": "f2eeed5102b8890e9e6f4b9053717fe73031e699c4b76dc7028749ab66e7f917", - "iso_checksum_type": "sha256", - "iso_url": "{{user `mirror`}}/releases/20/Fedora/x86_64/iso/Fedora-20-x86_64-DVD.iso", - "output_directory": "packer-fedora-20-x86_64-virtualbox", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-virtualbox", "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", "ssh_password": "vagrant", "ssh_port": 22, @@ -40,17 +40,17 @@ }, { "boot_command": [ - "<tab> linux ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/fedora-20/ks.cfg<enter><wait>" + "<tab> linux ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], "boot_wait": "10s", "disk_size": 40960, "guest_os_type": "fedora-64", "headless": "{{ user `headless` }}", "http_directory": "http", - "iso_checksum": "f2eeed5102b8890e9e6f4b9053717fe73031e699c4b76dc7028749ab66e7f917", - "iso_checksum_type": "sha256", - "iso_url": "{{user `mirror`}}/releases/20/Fedora/x86_64/iso/Fedora-20-x86_64-DVD.iso", - "output_directory": "packer-fedora-20-x86_64-vmware", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-vmware", "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", "ssh_password": "vagrant", "ssh_port": 22, @@ -67,17 +67,17 @@ }, { "boot_command": [ - "<tab> linux ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/fedora-20/ks.cfg<enter><wait>" + "<tab> linux ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], "boot_wait": "10s", "disk_size": 40960, "guest_os_type": "fedora-core", "headless": "{{ user `headless` }}", "http_directory": "http", - "iso_checksum": "f2eeed5102b8890e9e6f4b9053717fe73031e699c4b76dc7028749ab66e7f917", - "iso_checksum_type": "sha256", - "iso_url": "{{user `mirror`}}/releases/20/Fedora/x86_64/iso/Fedora-20-x86_64-DVD.iso", - "output_directory": "packer-fedora-20-x86_64-parallels", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-parallels", "parallels_tools_flavor": "lin", "prlctl": [ [ @@ -116,7 +116,12 @@ "type": "file" }, { - "environment_vars": [], + "environment_vars": [ + "HOME_DIR=/home/vagrant", + "http_proxy={{user `http_proxy`}}", + "https_proxy={{user `https_proxy`}}", + "no_proxy={{user `no_proxy`}}" + ], "execute_command": "echo 'vagrant' | {{.Vars}} sudo -E -S bash '{{.Path}}'", "scripts": [ "scripts/common/metadata.sh", @@ -136,9 +141,17 @@ "build_timestamp": "{{isotime \"20060102150405\"}}", "git_revision": "__unknown_git_revision__", "headless": "", + "http_proxy": "{{env `http_proxy`}}", + "https_proxy": "{{env `https_proxy`}}", + "iso_checksum": "f2eeed5102b8890e9e6f4b9053717fe73031e699c4b76dc7028749ab66e7f917", + "iso_checksum_type": "sha256", + "iso_name": "Fedora-20-x86_64-DVD.iso", + "ks_path": "fedora-20/ks.cfg", "metadata": "floppy/dummy_metadata.json", - "mirror": "http://download.fedoraproject.org/pub/fedora/linux", + "mirror": "https://archive.fedoraproject.org/pub/archive/fedora/linux", + "mirror_directory": "releases/20/Fedora/x86_64/iso", "name": "fedora-20", + "no_proxy": "{{env `no_proxy`}}", "template": "fedora-20-x86_64", "version": "2.0.TIMESTAMP" } diff --git a/fedora-21-i386.json b/fedora-21-i386.json index effdb954c..af5a03804 100644 --- a/fedora-21-i386.json +++ b/fedora-21-i386.json @@ -2,7 +2,7 @@ "builders": [ { "boot_command": [ - "<tab> linux ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/fedora-21/ks.cfg<enter><wait>" + "<tab> linux ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], "boot_wait": "10s", "disk_size": 40960, @@ -11,10 +11,10 @@ "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", "http_directory": "http", - "iso_checksum": "85e50a8a938996522bf1605b3578a2d6680362c1aa963d0560d59c2e4fc795ef", - "iso_checksum_type": "sha256", - "iso_url": "{{user `mirror`}}/releases/21/Server/i386/iso/Fedora-Server-DVD-i386-21.iso", - "output_directory": "packer-fedora-21-i386-virtualbox", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-virtualbox", "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", "ssh_password": "vagrant", "ssh_port": 22, @@ -40,17 +40,17 @@ }, { "boot_command": [ - "<tab> linux ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/fedora-21/ks.cfg<enter><wait>" + "<tab> linux ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], "boot_wait": "10s", "disk_size": 40960, "guest_os_type": "fedora", "headless": "{{ user `headless` }}", "http_directory": "http", - "iso_checksum": "85e50a8a938996522bf1605b3578a2d6680362c1aa963d0560d59c2e4fc795ef", - "iso_checksum_type": "sha256", - "iso_url": "{{user `mirror`}}/releases/21/Server/i386/iso/Fedora-Server-DVD-i386-21.iso", - "output_directory": "packer-fedora-21-i386-vmware", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}" + "output_directory": "packer-{{user `template`}}-vmware", "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", "ssh_password": "vagrant", "ssh_port": 22, @@ -67,17 +67,17 @@ }, { "boot_command": [ - "<tab> linux ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/fedora-21/ks.cfg<enter><wait>" + "<tab> linux ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], "boot_wait": "10s", "disk_size": 40960, "guest_os_type": "fedora-core", "headless": "{{ user `headless` }}", "http_directory": "http", - "iso_checksum": "85e50a8a938996522bf1605b3578a2d6680362c1aa963d0560d59c2e4fc795ef", - "iso_checksum_type": "sha256", - "iso_url": "{{user `mirror`}}/releases/21/Server/i386/iso/Fedora-Server-DVD-i386-21.iso", - "output_directory": "packer-fedora-21-i386-parallels", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-parallels", "parallels_tools_flavor": "lin", "prlctl": [ [ @@ -116,7 +116,12 @@ "type": "file" }, { - "environment_vars": [], + "environment_vars": [ + "HOME_DIR=/home/vagrant", + "http_proxy={{user `http_proxy`}}", + "https_proxy={{user `https_proxy`}}", + "no_proxy={{user `no_proxy`}}" + ], "execute_command": "echo 'vagrant' | {{.Vars}} sudo -E -S bash '{{.Path}}'", "scripts": [ "scripts/common/metadata.sh", @@ -136,11 +141,18 @@ "build_timestamp": "{{isotime \"20060102150405\"}}", "git_revision": "__unknown_git_revision__", "headless": "", + "http_proxy": "{{env `http_proxy`}}", + "https_proxy": "{{env `https_proxy`}}", + "iso_checksum": "85e50a8a938996522bf1605b3578a2d6680362c1aa963d0560d59c2e4fc795ef", + "iso_checksum_type": "sha256", + "iso_name": "Fedora-Server-DVD-i386-21.iso", + "ks_path": "fedora-21/ks.cfg", "metadata": "floppy/dummy_metadata.json", "mirror": "http://download.fedoraproject.org/pub/fedora/linux", + "mirror_directory": "releases/21/Server/i386/iso", "name": "fedora-21-i386", + "no_proxy": "{{env `no_proxy`}}", "template": "fedora-21-i386", "version": "2.0.TIMESTAMP" } } - diff --git a/fedora-21-x86_64.json b/fedora-21-x86_64.json index cf677debf..54fed691e 100644 --- a/fedora-21-x86_64.json +++ b/fedora-21-x86_64.json @@ -2,7 +2,7 @@ "builders": [ { "boot_command": [ - "<tab> linux ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/fedora-21/ks.cfg<enter><wait>" + "<tab> linux ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], "boot_wait": "10s", "disk_size": 40960, @@ -11,10 +11,10 @@ "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", "http_directory": "http", - "iso_checksum": "a6a2e83bb409d6b8ee3072ad07faac0a54d79c9ecbe3a40af91b773e2d843d8e", - "iso_checksum_type": "sha256", - "iso_url": "{{user `mirror`}}/releases/21/Server/x86_64/iso/Fedora-Server-DVD-x86_64-21.iso", - "output_directory": "packer-fedora-21-x86_64-virtualbox", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-virtualbox", "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", "ssh_password": "vagrant", "ssh_port": 22, @@ -40,17 +40,17 @@ }, { "boot_command": [ - "<tab> linux ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/fedora-21/ks.cfg<enter><wait>" + "<tab> linux ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], "boot_wait": "10s", "disk_size": 40960, "guest_os_type": "fedora-64", "headless": "{{ user `headless` }}", "http_directory": "http", - "iso_checksum": "a6a2e83bb409d6b8ee3072ad07faac0a54d79c9ecbe3a40af91b773e2d843d8e", - "iso_checksum_type": "sha256", - "iso_url": "{{user `mirror`}}/releases/21/Server/x86_64/iso/Fedora-Server-DVD-x86_64-21.iso", - "output_directory": "packer-fedora-21-x86_64-vmware", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-vmware", "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", "ssh_password": "vagrant", "ssh_port": 22, @@ -67,17 +67,17 @@ }, { "boot_command": [ - "<tab> linux ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/fedora-21/ks.cfg<enter><wait>" + "<tab> linux ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], "boot_wait": "10s", "disk_size": 40960, "guest_os_type": "fedora-core", "headless": "{{ user `headless` }}", "http_directory": "http", - "iso_checksum": "a6a2e83bb409d6b8ee3072ad07faac0a54d79c9ecbe3a40af91b773e2d843d8e", - "iso_checksum_type": "sha256", - "iso_url": "{{user `mirror`}}/releases/21/Server/x86_64/iso/Fedora-Server-DVD-x86_64-21.iso", - "output_directory": "packer-fedora-21-x86_64-parallels", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-parallels", "parallels_tools_flavor": "lin", "prlctl": [ [ @@ -116,7 +116,12 @@ "type": "file" }, { - "environment_vars": [], + "environment_vars": [ + "HOME_DIR=/home/vagrant", + "http_proxy={{user `http_proxy`}}", + "https_proxy={{user `https_proxy`}}", + "no_proxy={{user `no_proxy`}}" + ], "execute_command": "echo 'vagrant' | {{.Vars}} sudo -E -S bash '{{.Path}}'", "scripts": [ "scripts/common/metadata.sh", @@ -136,11 +141,18 @@ "build_timestamp": "{{isotime \"20060102150405\"}}", "git_revision": "__unknown_git_revision__", "headless": "", + "http_proxy": "{{env `http_proxy`}}", + "https_proxy": "{{env `https_proxy`}}", + "iso_checksum": "a6a2e83bb409d6b8ee3072ad07faac0a54d79c9ecbe3a40af91b773e2d843d8e", + "iso_checksum_type": "sha256", + "iso_name": "Fedora-Server-DVD-x86_64-21.iso", + "ks_path": "fedora-21/ks.cfg", "metadata": "floppy/dummy_metadata.json", "mirror": "http://download.fedoraproject.org/pub/fedora/linux", + "mirror_directory": "releases/21/Server/x86_64/iso", "name": "fedora-21", + "no_proxy": "{{env `no_proxy`}}", "template": "fedora-21-x86_64", "version": "2.0.TIMESTAMP" } } - diff --git a/fedora-22-i386.json b/fedora-22-i386.json index baee7fd8d..f7d11e43e 100644 --- a/fedora-22-i386.json +++ b/fedora-22-i386.json @@ -3,18 +3,19 @@ "builders": [ { "boot_command": [ - "<tab> linux ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/fedora-22/ks.cfg<enter><wait>" + "<tab> linux ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], "boot_wait": "10s", "disk_size": 40960, "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "guest_os_type": "Fedora", "hard_drive_interface": "sata", + "headless": "{{ user `headless` }}", "http_directory": "http", - "iso_checksum": "5e3dfdff30667f3339d8b4e6ac0651c2e00c9417987848bef772cb92dbc823a5", - "iso_checksum_type": "sha256", - "iso_url": "{{user `mirror`}}/releases/22/Server/i386/iso/Fedora-Server-DVD-i386-22.iso", - "output_directory": "packer-fedora-22-i386-virtualbox", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-virtualbox", "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", "ssh_password": "vagrant", "ssh_port": 22, @@ -36,20 +37,21 @@ ] ], "virtualbox_version_file": ".vbox_version", - "vm_name": "packer-fedora-22-i386" + "vm_name": "{{ user `template` }}" }, { "boot_command": [ - "<tab> linux ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/fedora-22/ks.cfg<enter><wait>" + "<tab> linux ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], "boot_wait": "10s", "disk_size": 40960, "guest_os_type": "fedora", + "headless": "{{ user `headless` }}", "http_directory": "http", - "iso_checksum": "5e3dfdff30667f3339d8b4e6ac0651c2e00c9417987848bef772cb92dbc823a5", - "iso_checksum_type": "sha256", - "iso_url": "{{user `mirror`}}/releases/22/Server/i386/iso/Fedora-Server-DVD-i386-22.iso", - "output_directory": "packer-fedora-22-i386-vmware", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-vmware", "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", "ssh_password": "vagrant", "ssh_port": 22, @@ -57,7 +59,7 @@ "ssh_wait_timeout": "10000s", "tools_upload_flavor": "linux", "type": "vmware-iso", - "vm_name": "packer-fedora-22-i386", + "vm_name": "{{ user `template` }}", "vmx_data": { "cpuid.coresPerSocket": "1", "memsize": "512", @@ -66,16 +68,17 @@ }, { "boot_command": [ - "<tab> linux ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/fedora-22/ks.cfg<enter><wait>" + "<tab> linux ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], "boot_wait": "10s", "disk_size": 40960, "guest_os_type": "fedora-core", + "headless": "{{ user `headless` }}", "http_directory": "http", - "iso_checksum": "5e3dfdff30667f3339d8b4e6ac0651c2e00c9417987848bef772cb92dbc823a5", - "iso_checksum_type": "sha256", - "iso_url": "{{user `mirror`}}/releases/22/Server/i386/iso/Fedora-Server-DVD-i386-22.iso", - "output_directory": "packer-fedora-22-i386-parallels", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-parallels", "parallels_tools_flavor": "lin", "prlctl": [ [ @@ -98,7 +101,7 @@ "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", "type": "parallels-iso", - "vm_name": "packer-fedora-22-i386" + "vm_name": "{{ user `template` }}" } ], "post-processors": [ @@ -133,11 +136,19 @@ "box_basename": "fedora-22-i386", "build_timestamp": "{{isotime \"20060102150405\"}}", "git_revision": "__unknown_git_revision__", + "headless": "", + "http_proxy": "{{env `http_proxy`}}", + "https_proxy": "{{env `https_proxy`}}", + "iso_checksum": "5e3dfdff30667f3339d8b4e6ac0651c2e00c9417987848bef772cb92dbc823a5", + "iso_checksum_type": "sha256", + "iso_name": "Fedora-Server-DVD-i386-22.iso", + "ks_path": "fedora-22/ks.cfg", "metadata": "floppy/dummy_metadata.json", "mirror": "http://download.fedoraproject.org/pub/fedora/linux", + "mirror_directory": "releases/22/Server/i386/iso", "name": "fedora-22-i386", + "no_proxy": "{{env `no_proxy`}}", "template": "fedora-22-i386", "version": "2.0.TIMESTAMP" } } - diff --git a/fedora-22-x86_64.json b/fedora-22-x86_64.json index 3c2f658a5..e9673dd5f 100644 --- a/fedora-22-x86_64.json +++ b/fedora-22-x86_64.json @@ -2,18 +2,19 @@ "builders": [ { "boot_command": [ - "<tab> linux ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/fedora-22/ks.cfg<enter><wait>" + "<tab> linux ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], "boot_wait": "10s", "disk_size": 40960, "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "guest_os_type": "Fedora_64", "hard_drive_interface": "sata", + "headless": "{{ user `headless` }}", "http_directory": "http", - "iso_checksum": "b2acfa7c7c6b5d2f51d3337600c2e52eeaa1a1084991181c28ca30343e52e0df", - "iso_checksum_type": "sha256", - "iso_url": "{{user `mirror`}}/releases/22/Server/x86_64/iso/Fedora-Server-DVD-x86_64-22.iso", - "output_directory": "packer-fedora-22-x86_64-virtualbox", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-virtualbox", "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", "ssh_password": "vagrant", "ssh_port": 22, @@ -35,20 +36,21 @@ ] ], "virtualbox_version_file": ".vbox_version", - "vm_name": "packer-fedora-22-x86_64" + "vm_name": "{{ user `template` }}" }, { "boot_command": [ - "<tab> linux ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/fedora-22/ks.cfg<enter><wait>" + "<tab> linux ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], "boot_wait": "10s", "disk_size": 40960, "guest_os_type": "fedora-64", + "headless": "{{ user `headless` }}", "http_directory": "http", - "iso_checksum": "b2acfa7c7c6b5d2f51d3337600c2e52eeaa1a1084991181c28ca30343e52e0df", - "iso_checksum_type": "sha256", - "iso_url": "{{user `mirror`}}/releases/22/Server/x86_64/iso/Fedora-Server-DVD-x86_64-22.iso", - "output_directory": "packer-fedora-22-x86_64-vmware", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-vmware", "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", "ssh_password": "vagrant", "ssh_port": 22, @@ -56,7 +58,7 @@ "ssh_wait_timeout": "10000s", "tools_upload_flavor": "linux", "type": "vmware-iso", - "vm_name": "packer-fedora-22-x86_64", + "vm_name": "{{ user `template` }}", "vmx_data": { "cpuid.coresPerSocket": "1", "memsize": "512", @@ -65,16 +67,17 @@ }, { "boot_command": [ - "<tab> linux ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/fedora-22/ks.cfg<enter><wait>" + "<tab> linux ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], "boot_wait": "10s", "disk_size": 40960, "guest_os_type": "fedora-core", + "headless": "{{ user `headless` }}", "http_directory": "http", - "iso_checksum": "b2acfa7c7c6b5d2f51d3337600c2e52eeaa1a1084991181c28ca30343e52e0df", - "iso_checksum_type": "sha256", - "iso_url": "{{user `mirror`}}/releases/22/Server/x86_64/iso/Fedora-Server-DVD-x86_64-22.iso", - "output_directory": "packer-fedora-22-x86_64-parallels", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-parallels", "parallels_tools_flavor": "lin", "prlctl": [ [ @@ -97,7 +100,7 @@ "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", "type": "parallels-iso", - "vm_name": "packer-fedora-22-x86_64" + "vm_name": "{{ user `template` }}" } ], "post-processors": [ @@ -113,7 +116,12 @@ "type": "file" }, { - "environment_vars": [], + "environment_vars": [ + "HOME_DIR=/home/vagrant", + "http_proxy={{user `http_proxy`}}", + "https_proxy={{user `https_proxy`}}", + "no_proxy={{user `no_proxy`}}" + ], "execute_command": "echo 'vagrant' | {{.Vars}} sudo -E -S bash '{{.Path}}'", "scripts": [ "scripts/common/metadata.sh", @@ -132,11 +140,19 @@ "box_basename": "fedora-22", "build_timestamp": "{{isotime \"20060102150405\"}}", "git_revision": "__unknown_git_revision__", + "headless": "", + "http_proxy": "{{env `http_proxy`}}", + "https_proxy": "{{env `https_proxy`}}", + "iso_checksum": "b2acfa7c7c6b5d2f51d3337600c2e52eeaa1a1084991181c28ca30343e52e0df", + "iso_checksum_type": "sha256", + "iso_name": "Fedora-Server-DVD-x86_64-22.iso", + "ks_path": "fedora-22/ks.cfg", "metadata": "floppy/dummy_metadata.json", "mirror": "http://download.fedoraproject.org/pub/fedora/linux", + "mirror_directory": "releases/22/Server/x86_64/iso", "name": "fedora-22", + "no_proxy": "{{env `no_proxy`}}", "template": "fedora-22-x86_64", "version": "2.0.TIMESTAMP" } } - From 4ec9ca5e6abba798695062f09466551454b57d07 Mon Sep 17 00:00:00 2001 From: Seth Thomas <sthomas@chef.io> Date: Tue, 15 Sep 2015 13:58:36 -0700 Subject: [PATCH 0398/1622] DRY up opensuse --- opensuse-13.2-i386.json | 46 ++++++++++++++++++++++------------- opensuse-13.2-x86_64.json | 50 ++++++++++++++++++++++++--------------- 2 files changed, 60 insertions(+), 36 deletions(-) diff --git a/opensuse-13.2-i386.json b/opensuse-13.2-i386.json index 48d3684ef..0e43530a2 100644 --- a/opensuse-13.2-i386.json +++ b/opensuse-13.2-i386.json @@ -4,7 +4,7 @@ "boot_command": [ "<esc><enter><wait>", "linux netsetup=dhcp install=cd:/<wait>", - " lang=en_US autoyast=http://{{ .HTTPIP }}:{{ .HTTPPort }}/opensuse-13.2/autoinst.xml<wait>", + " lang=en_US autoyast=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `autoinst_cfg`}}<wait>", " textmode=1<wait>", "<enter><wait>" ], @@ -12,12 +12,13 @@ "disk_size": 20480, "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "guest_os_type": "OpenSUSE", + "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", "http_directory": "http", - "iso_checksum": "2ec28606829d6408efc5a79b70d1da738fdc09de", - "iso_checksum_type": "sha1", - "iso_url": "{{user `mirror`}}/13.2/iso/openSUSE-13.2-DVD-i586.iso", - "output_directory": "packer-opensuse-13.2-i386-virtualbox", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-virtualbox", "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, @@ -45,7 +46,7 @@ "boot_command": [ "<esc><enter><wait>", "linux netsetup=dhcp install=cd:/<wait>", - " lang=en_US autoyast=http://{{ .HTTPIP }}:{{ .HTTPPort }}/opensuse-13.2/autoinst.xml<wait>", + " lang=en_US autoyast=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `autoinst_cfg`}}<wait>", " textmode=1<wait>", "<enter><wait>" ], @@ -54,10 +55,10 @@ "guest_os_type": "opensuse", "headless": "{{ user `headless` }}", "http_directory": "http", - "iso_checksum": "2ec28606829d6408efc5a79b70d1da738fdc09de", - "iso_checksum_type": "sha1", - "iso_url": "{{user `mirror`}}/13.2/iso/openSUSE-13.2-DVD-i586.iso", - "output_directory": "packer-opensuse-13.2-i386-vmware", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-vmware", "shutdown_command": "echo 'vagrant'|sudo -S /sbin/shutdown -h 1", "ssh_password": "vagrant", "ssh_port": 22, @@ -76,7 +77,7 @@ "boot_command": [ "<esc><enter><wait>", "linux netsetup=dhcp netdevice=eth0 install=cd:/<wait>", - " lang=en_US autoyast=http://{{ .HTTPIP }}:{{ .HTTPPort }}/opensuse-13.2/autoinst.xml<wait>", + " lang=en_US autoyast=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `autoinst_cfg`}}<wait>", " textmode=1<wait>", "<enter><wait>" ], @@ -85,10 +86,10 @@ "guest_os_type": "opensuse", "headless": "{{ user `headless` }}", "http_directory": "http", - "iso_checksum": "2ec28606829d6408efc5a79b70d1da738fdc09de", - "iso_checksum_type": "sha1", - "iso_url": "{{user `mirror`}}/13.2/iso/openSUSE-13.2-DVD-i586.iso", - "output_directory": "packer-opensuse-13.2-i386-parallels", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-parallels", "parallels_tools_flavor": "lin", "prlctl": [ [ @@ -127,7 +128,12 @@ "type": "file" }, { - "environment_vars": [], + "environment_vars": [ + "HOME_DIR=/home/vagrant", + "http_proxy={{user `http_proxy`}}", + "https_proxy={{user `https_proxy`}}", + "no_proxy={{user `no_proxy`}}" + ], "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh '{{.Path}}'", "scripts": [ "scripts/common/metadata.sh", @@ -145,15 +151,21 @@ ], "variables": { "arch": "32", + "autoinst_cfg": "opensuse-13.2/autoinst.xml", "box_basename": "opensuse-13.2-i386", "build_timestamp": "{{isotime \"20060102150405\"}}", "git_revision": "__unknown_git_revision__", "headless": "", + "http_proxy": "{{env `http_proxy`}}", + "https_proxy": "{{env `https_proxy`}}", + "iso_checksum": "bada6d5b304a9ecbb9b27e0a02d0c347c72d91c32231c2594e4deb11a4d9ce55", + "iso_checksum_type": "sha256", + "iso_name": "openSUSE-13.2-DVD-i586.iso", "metadata": "floppy/dummy_metadata.json", "mirror": "http://download.opensuse.org/distribution", + "mirror_directory": "13.2/iso", "name": "opensuse-13.2-i386", "template": "opensuse-13.2-i386", "version": "2.0.TIMESTAMP" } } - diff --git a/opensuse-13.2-x86_64.json b/opensuse-13.2-x86_64.json index 4c9d28fa9..dd38071b1 100644 --- a/opensuse-13.2-x86_64.json +++ b/opensuse-13.2-x86_64.json @@ -4,7 +4,7 @@ "boot_command": [ "<esc><enter><wait>", "linux netsetup=dhcp install=cd:/<wait>", - " lang=en_US autoyast=http://{{ .HTTPIP }}:{{ .HTTPPort }}/opensuse-13.2/autoinst.xml<wait>", + " lang=en_US autoyast=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `autoinst_cfg`}}<wait>", " textmode=1<wait>", "<enter><wait>" ], @@ -12,12 +12,13 @@ "disk_size": 20480, "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "guest_os_type": "OpenSUSE_64", + "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", "http_directory": "http", - "iso_checksum": "a1bd237ccfb07939953a9681607c99c00bc78d5d", - "iso_checksum_type": "sha1", - "iso_url": "{{user `mirror`}}/13.2/iso/openSUSE-13.2-DVD-x86_64.iso", - "output_directory": "packer-opensuse-13.2-x86_64-virtualbox", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-virtualbox", "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, @@ -45,7 +46,7 @@ "boot_command": [ "<esc><enter><wait>", "linux netsetup=dhcp install=cd:/<wait>", - " lang=en_US autoyast=http://{{ .HTTPIP }}:{{ .HTTPPort }}/opensuse-13.2/autoinst.xml<wait>", + " lang=en_US autoyast=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `autoinst_cfg`}}<wait>", " textmode=1<wait>", "<enter><wait>" ], @@ -54,10 +55,10 @@ "guest_os_type": "opensuse-64", "headless": "{{ user `headless` }}", "http_directory": "http", - "iso_checksum": "a1bd237ccfb07939953a9681607c99c00bc78d5d", - "iso_checksum_type": "sha1", - "iso_url": "{{user `mirror`}}/13.2/iso/openSUSE-13.2-DVD-x86_64.iso", - "output_directory": "packer-opensuse-13.2-x86_64-vmware", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-vmware", "shutdown_command": "echo 'vagrant'|sudo -S /sbin/shutdown -h 1", "ssh_password": "vagrant", "ssh_port": 22, @@ -76,7 +77,7 @@ "boot_command": [ "<esc><enter><wait>", "linux netsetup=dhcp netdevice=eth0 install=cd:/<wait>", - " lang=en_US autoyast=http://{{ .HTTPIP }}:{{ .HTTPPort }}/opensuse-13.2/autoinst.xml<wait>", + " lang=en_US autoyast=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `autoinst_cfg`}}<wait>", " textmode=1<wait>", "<enter><wait>" ], @@ -85,10 +86,10 @@ "guest_os_type": "opensuse", "headless": "{{ user `headless` }}", "http_directory": "http", - "iso_checksum": "a1bd237ccfb07939953a9681607c99c00bc78d5d", - "iso_checksum_type": "sha1", - "iso_url": "{{user `mirror`}}/13.2/iso/openSUSE-13.2-DVD-x86_64.iso", - "output_directory": "packer-opensuse-13.2-x86_64-parallels", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-parallels", "parallels_tools_flavor": "lin", "prlctl": [ [ @@ -127,7 +128,12 @@ "type": "file" }, { - "environment_vars": [], + "environment_vars": [ + "HOME_DIR=/home/vagrant", + "http_proxy={{user `http_proxy`}}", + "https_proxy={{user `https_proxy`}}", + "no_proxy={{user `no_proxy`}}" + ], "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh '{{.Path}}'", "scripts": [ "scripts/common/metadata.sh", @@ -145,15 +151,21 @@ ], "variables": { "arch": "64", - "box_basename": "opensuse-13.2-x86_64", + "autoinst_cfg": "opensuse-13.2/autoinst.xml", + "box_basename": "opensuse-13.2", "build_timestamp": "{{isotime \"20060102150405\"}}", "git_revision": "__unknown_git_revision__", "headless": "", + "http_proxy": "{{env `http_proxy`}}", + "https_proxy": "{{env `https_proxy`}}", + "iso_checksum": "787b0a600e8304a9dda12a4f7ff89a08c9fc4b445215b9f91c52628eccdc3c40", + "iso_checksum_type": "sha256", + "iso_name": "openSUSE-13.2-DVD-x86_64.iso", "metadata": "floppy/dummy_metadata.json", "mirror": "http://download.opensuse.org/distribution", - "name": "opensuse-13.2-x86_64", + "mirror_directory": "13.2/iso", + "name": "opensuse-13.2", "template": "opensuse-13.2-x86_64", "version": "2.0.TIMESTAMP" } } - From 29c1a92dbf03c3b926000600f8ad6cf8f0d98c54 Mon Sep 17 00:00:00 2001 From: Seth Thomas <sthomas@chef.io> Date: Tue, 15 Sep 2015 14:41:13 -0700 Subject: [PATCH 0399/1622] Adding missing no_proxy key --- opensuse-13.2-i386.json | 1 + opensuse-13.2-x86_64.json | 1 + 2 files changed, 2 insertions(+) diff --git a/opensuse-13.2-i386.json b/opensuse-13.2-i386.json index 0e43530a2..6a36f97e0 100644 --- a/opensuse-13.2-i386.json +++ b/opensuse-13.2-i386.json @@ -165,6 +165,7 @@ "mirror": "http://download.opensuse.org/distribution", "mirror_directory": "13.2/iso", "name": "opensuse-13.2-i386", + "no_proxy": "{{env `no_proxy`}}", "template": "opensuse-13.2-i386", "version": "2.0.TIMESTAMP" } diff --git a/opensuse-13.2-x86_64.json b/opensuse-13.2-x86_64.json index dd38071b1..c07c5e09a 100644 --- a/opensuse-13.2-x86_64.json +++ b/opensuse-13.2-x86_64.json @@ -165,6 +165,7 @@ "mirror": "http://download.opensuse.org/distribution", "mirror_directory": "13.2/iso", "name": "opensuse-13.2", + "no_proxy": "{{env `no_proxy`}}", "template": "opensuse-13.2-x86_64", "version": "2.0.TIMESTAMP" } From c3245d18219d4e73f83728745dde42ae7153380c Mon Sep 17 00:00:00 2001 From: Seth Thomas <sthomas@chef.io> Date: Wed, 16 Sep 2015 10:01:50 -0700 Subject: [PATCH 0400/1622] Adding verification (tk) stage to build process --- Rakefile | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) diff --git a/Rakefile b/Rakefile index 5aba4e688..3620ccf19 100644 --- a/Rakefile +++ b/Rakefile @@ -1,6 +1,7 @@ require 'cgi' require 'json' require 'net/http' +require 'kitchen' # TODO: private boxes may need to specify a mirror @@ -13,6 +14,10 @@ task :do_all do |task, args| Rake::Task['build_box'].reenable end + # verification stage + Rake::Task['test_all'].invoke + Rake::Task['test_all'].reenable + # publish stage Rake::Task['upload_all'].invoke Rake::Task['upload_all'].reenable @@ -27,6 +32,21 @@ task :build_box, :template do |t, args| sh "#{build_command(args[:template])}" end +desc 'Test all boxes with Test Kitchen' +task :test_all do + metadata_files.each do |metadata_file| + puts "Processing #{metadata_file} for test." + Rake::Task['test_box'].invoke(metadata_file) + Rake::Task['test_box'].reenable + end +end + +desc 'Test a box with Test Kitchen' +task :test_box, :metadata_file do |f, args| + metadata = box_metadata(args[:metadata_file]) + test_box(metadata['name'], metadata['providers']) +end + desc 'Upload all boxes to Atlas for all providers' task :upload_all do metadata_files.each do |metadata_file| @@ -76,6 +96,8 @@ task :clean do `rm -rf builds/*.{box,json}` puts 'Removing packer-* directories' `rm -rf packer-*` + puts 'Removing .kitchen.*.yml' + `rm -f .kitchen.*.yml` end def atlas_api @@ -190,6 +212,32 @@ def compute_metadata_files `ls builds/*.json`.split("\n") end +def test_box(boxname, providers) + providers.each do |provider, provider_data| + puts "Testing provider #{provider} for #{boxname}" + + provider = 'vmware_fusion' if provider == 'vmware_desktop' + kitchen_cfg = {"provisioner"=>{"name"=>"chef_zero", "data_path"=>"test/fixtures"}, + "platforms"=> + [{"name"=>"#{boxname}-#{provider}", + "driver"=> + {"name"=>"vagrant", + "provider"=>provider, + "box"=>boxname, + "box_url"=>"file://#{ENV['PWD']}/builds/#{provider_data['file']}"}}], + "suites"=>[{"name"=>"default", "run_list"=>nil, "attributes"=>{}}]} + + File.open(".kitchen.#{provider}.yml", "w") {|f| f.write(kitchen_cfg.to_yaml) } + + Kitchen.logger = Kitchen.default_file_logger + @loader = Kitchen::Loader::YAML.new(project_config: "./.kitchen.#{provider}.yml") + config = Kitchen::Config.new(loader: @loader) + config.instances.each do |instance| + instance.test(:always) + end + end +end + def create_box(boxname) req = request('get', "#{atlas_api}/box/#{atlas_org}/#{boxname}", { 'box[username]' => atlas_org, 'access_token' => atlas_token } ) if req.code.eql?('404') From 78bbe8dba0776d46931cc0102b9c3fa199b94c3b Mon Sep 17 00:00:00 2001 From: Seth Thomas <sthomas@chef.io> Date: Wed, 16 Sep 2015 10:55:55 -0700 Subject: [PATCH 0401/1622] Adding tk step to buildkite script --- build.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/build.sh b/build.sh index 4f46dfab7..0f6c6d594 100644 --- a/build.sh +++ b/build.sh @@ -67,6 +67,9 @@ rake clean echo "--- Build $PLATFORM-$BENTO_PROVIDERS" rake build_box[$PLATFORM] +echo "--- Test $PLATFORM-$BENTO_PROVIDERS" +rake test_all + echo "--- Upload Boxes" rake upload_all From bd561c6be0eb1b3a31e9fc284a2e1c3ea0df4d42 Mon Sep 17 00:00:00 2001 From: Seth Thomas <sthomas@chef.io> Date: Wed, 16 Sep 2015 14:57:13 -0700 Subject: [PATCH 0402/1622] Have vagrant clean purge existing box before test --- Rakefile | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Rakefile b/Rakefile index 3620ccf19..fd0bb4e62 100644 --- a/Rakefile +++ b/Rakefile @@ -214,9 +214,13 @@ end def test_box(boxname, providers) providers.each do |provider, provider_data| - puts "Testing provider #{provider} for #{boxname}" + + puts "Removing box: #{boxname} provider: #{provider}" + `vagrant box remove #{boxname} --provider #{provider}` provider = 'vmware_fusion' if provider == 'vmware_desktop' + + puts "Testing provider #{provider} for #{boxname}" kitchen_cfg = {"provisioner"=>{"name"=>"chef_zero", "data_path"=>"test/fixtures"}, "platforms"=> [{"name"=>"#{boxname}-#{provider}", From 6800f5fcbce925ca3f3f2e552863dbcf225b0d4b Mon Sep 17 00:00:00 2001 From: Rickard von Essen <rickard.von.essen@gmail.com> Date: Thu, 17 Sep 2015 14:23:23 +0200 Subject: [PATCH 0403/1622] Remove the headless option for Parallels builder. This option will not be allowed anymore by packer, it has never been documented and never hade any effect. --- centos-5.11-i386.json | 1 - centos-5.11-x86_64.json | 1 - centos-6.7-i386.json | 1 - centos-6.7-x86_64.json | 1 - centos-7.1-x86_64.json | 1 - debian-6.0.10-amd64.json | 1 - debian-6.0.10-i386.json | 1 - debian-7.8-amd64.json | 1 - debian-7.8-i386.json | 1 - debian-7.9-amd64.json | 1 - debian-7.9-i386.json | 1 - debian-8.1-amd64.json | 1 - debian-8.1-i386.json | 1 - debian-8.2-amd64.json | 1 - debian-8.2-i386.json | 1 - fedora-20-i386.json | 1 - fedora-20-x86_64.json | 1 - fedora-21-i386.json | 1 - fedora-21-x86_64.json | 1 - fedora-22-i386.json | 1 - fedora-22-x86_64.json | 1 - freebsd-10.2-amd64.json | 1 - freebsd-10.2-i386.json | 1 - freebsd-9.3-amd64.json | 1 - freebsd-9.3-i386.json | 1 - macosx-10.10.json | 1 - macosx-10.7.json | 1 - macosx-10.8.json | 1 - macosx-10.9.json | 1 - omnios-r151010j.json | 1 - opensuse-13.2-i386.json | 1 - opensuse-13.2-x86_64.json | 1 - oracle-5.11-i386.json | 1 - oracle-5.11-x86_64.json | 1 - oracle-6.6-i386.json | 1 - oracle-6.6-x86_64.json | 1 - rhel-5.11-i386.json | 1 - rhel-5.11-x86_64.json | 1 - rhel-6.6-i386.json | 1 - rhel-6.6-x86_64.json | 1 - rhel-7.1-x86_64.json | 1 - sles-11-sp2-i386.json | 1 - sles-11-sp2-x86_64.json | 1 - sles-11-sp3-i386.json | 1 - sles-11-sp3-x86_64.json | 1 - sles-12-x86_64.json | 1 - ubuntu-10.04-amd64.json | 1 - ubuntu-10.04-i386.json | 1 - ubuntu-12.04-amd64.json | 1 - ubuntu-12.04-i386.json | 1 - ubuntu-14.04-amd64.json | 1 - ubuntu-14.04-i386.json | 1 - ubuntu-14.10-amd64.json | 1 - ubuntu-14.10-i386.json | 1 - ubuntu-15.04-amd64.json | 1 - ubuntu-15.04-i386.json | 1 - 56 files changed, 56 deletions(-) diff --git a/centos-5.11-i386.json b/centos-5.11-i386.json index 8e01363ac..94f4f8b26 100644 --- a/centos-5.11-i386.json +++ b/centos-5.11-i386.json @@ -72,7 +72,6 @@ "boot_wait": "10s", "disk_size": 40960, "guest_os_type": "centos", - "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", diff --git a/centos-5.11-x86_64.json b/centos-5.11-x86_64.json index 5cbfe109b..8d94d491c 100644 --- a/centos-5.11-x86_64.json +++ b/centos-5.11-x86_64.json @@ -72,7 +72,6 @@ "boot_wait": "10s", "disk_size": 40960, "guest_os_type": "centos", - "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", diff --git a/centos-6.7-i386.json b/centos-6.7-i386.json index ae75da8ca..c3d3cb5b9 100644 --- a/centos-6.7-i386.json +++ b/centos-6.7-i386.json @@ -72,7 +72,6 @@ "boot_wait": "10s", "disk_size": 40960, "guest_os_type": "centos", - "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", diff --git a/centos-6.7-x86_64.json b/centos-6.7-x86_64.json index f4c454bc3..380e0fa8e 100644 --- a/centos-6.7-x86_64.json +++ b/centos-6.7-x86_64.json @@ -72,7 +72,6 @@ "boot_wait": "10s", "disk_size": 40960, "guest_os_type": "centos", - "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", diff --git a/centos-7.1-x86_64.json b/centos-7.1-x86_64.json index 9cf95eb3d..b5f244584 100644 --- a/centos-7.1-x86_64.json +++ b/centos-7.1-x86_64.json @@ -72,7 +72,6 @@ "boot_wait": "10s", "disk_size": 40960, "guest_os_type": "centos", - "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", diff --git a/debian-6.0.10-amd64.json b/debian-6.0.10-amd64.json index ba1b1c6df..9db62817f 100644 --- a/debian-6.0.10-amd64.json +++ b/debian-6.0.10-amd64.json @@ -114,7 +114,6 @@ "boot_wait": "10s", "disk_size": 40960, "guest_os_type": "debian", - "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", diff --git a/debian-6.0.10-i386.json b/debian-6.0.10-i386.json index 76bd20555..e20cd016b 100644 --- a/debian-6.0.10-i386.json +++ b/debian-6.0.10-i386.json @@ -114,7 +114,6 @@ "boot_wait": "10s", "disk_size": 40960, "guest_os_type": "debian", - "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", diff --git a/debian-7.8-amd64.json b/debian-7.8-amd64.json index e0e4f659e..651365189 100644 --- a/debian-7.8-amd64.json +++ b/debian-7.8-amd64.json @@ -114,7 +114,6 @@ "boot_wait": "10s", "disk_size": 40960, "guest_os_type": "debian", - "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", diff --git a/debian-7.8-i386.json b/debian-7.8-i386.json index 6ab842d24..046ea58bf 100644 --- a/debian-7.8-i386.json +++ b/debian-7.8-i386.json @@ -114,7 +114,6 @@ "boot_wait": "10s", "disk_size": 40960, "guest_os_type": "debian", - "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", diff --git a/debian-7.9-amd64.json b/debian-7.9-amd64.json index 7c543b172..de9f95213 100644 --- a/debian-7.9-amd64.json +++ b/debian-7.9-amd64.json @@ -114,7 +114,6 @@ "boot_wait": "10s", "disk_size": 40960, "guest_os_type": "debian", - "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", diff --git a/debian-7.9-i386.json b/debian-7.9-i386.json index 34363db33..85d152d14 100644 --- a/debian-7.9-i386.json +++ b/debian-7.9-i386.json @@ -114,7 +114,6 @@ "boot_wait": "10s", "disk_size": 40960, "guest_os_type": "debian", - "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", diff --git a/debian-8.1-amd64.json b/debian-8.1-amd64.json index 16ebd2ff8..174ffdcc3 100644 --- a/debian-8.1-amd64.json +++ b/debian-8.1-amd64.json @@ -114,7 +114,6 @@ "boot_wait": "10s", "disk_size": 40960, "guest_os_type": "debian", - "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", diff --git a/debian-8.1-i386.json b/debian-8.1-i386.json index f728a5100..27b934e33 100644 --- a/debian-8.1-i386.json +++ b/debian-8.1-i386.json @@ -114,7 +114,6 @@ "boot_wait": "10s", "disk_size": 40960, "guest_os_type": "debian", - "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", diff --git a/debian-8.2-amd64.json b/debian-8.2-amd64.json index 8d4655cf5..3f59cda0d 100644 --- a/debian-8.2-amd64.json +++ b/debian-8.2-amd64.json @@ -114,7 +114,6 @@ "boot_wait": "10s", "disk_size": 40960, "guest_os_type": "debian", - "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", diff --git a/debian-8.2-i386.json b/debian-8.2-i386.json index 98c460bd6..20a647dd0 100644 --- a/debian-8.2-i386.json +++ b/debian-8.2-i386.json @@ -114,7 +114,6 @@ "boot_wait": "10s", "disk_size": 40960, "guest_os_type": "debian", - "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", diff --git a/fedora-20-i386.json b/fedora-20-i386.json index f005a3556..70aa60583 100644 --- a/fedora-20-i386.json +++ b/fedora-20-i386.json @@ -72,7 +72,6 @@ "boot_wait": "10s", "disk_size": 40960, "guest_os_type": "fedora-core", - "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", diff --git a/fedora-20-x86_64.json b/fedora-20-x86_64.json index 5575f91b7..e613aece5 100644 --- a/fedora-20-x86_64.json +++ b/fedora-20-x86_64.json @@ -72,7 +72,6 @@ "boot_wait": "10s", "disk_size": 40960, "guest_os_type": "fedora-core", - "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", diff --git a/fedora-21-i386.json b/fedora-21-i386.json index af5a03804..03bd66bdc 100644 --- a/fedora-21-i386.json +++ b/fedora-21-i386.json @@ -72,7 +72,6 @@ "boot_wait": "10s", "disk_size": 40960, "guest_os_type": "fedora-core", - "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", diff --git a/fedora-21-x86_64.json b/fedora-21-x86_64.json index 54fed691e..4392d0dbc 100644 --- a/fedora-21-x86_64.json +++ b/fedora-21-x86_64.json @@ -72,7 +72,6 @@ "boot_wait": "10s", "disk_size": 40960, "guest_os_type": "fedora-core", - "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", diff --git a/fedora-22-i386.json b/fedora-22-i386.json index f7d11e43e..6fde82a01 100644 --- a/fedora-22-i386.json +++ b/fedora-22-i386.json @@ -73,7 +73,6 @@ "boot_wait": "10s", "disk_size": 40960, "guest_os_type": "fedora-core", - "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", diff --git a/fedora-22-x86_64.json b/fedora-22-x86_64.json index e9673dd5f..9b7f68dc2 100644 --- a/fedora-22-x86_64.json +++ b/fedora-22-x86_64.json @@ -72,7 +72,6 @@ "boot_wait": "10s", "disk_size": 40960, "guest_os_type": "fedora-core", - "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", diff --git a/freebsd-10.2-amd64.json b/freebsd-10.2-amd64.json index 3f22e91f5..858ade6b4 100644 --- a/freebsd-10.2-amd64.json +++ b/freebsd-10.2-amd64.json @@ -96,7 +96,6 @@ "boot_wait": "8s", "disk_size": 10140, "guest_os_type": "freebsd", - "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", diff --git a/freebsd-10.2-i386.json b/freebsd-10.2-i386.json index 8daa6a094..30d6e7974 100644 --- a/freebsd-10.2-i386.json +++ b/freebsd-10.2-i386.json @@ -96,7 +96,6 @@ "boot_wait": "8s", "disk_size": 10140, "guest_os_type": "freebsd", - "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", diff --git a/freebsd-9.3-amd64.json b/freebsd-9.3-amd64.json index 42e4e0e58..25243efee 100644 --- a/freebsd-9.3-amd64.json +++ b/freebsd-9.3-amd64.json @@ -108,7 +108,6 @@ "boot_wait": "8s", "disk_size": 10140, "guest_os_type": "freebsd", - "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", diff --git a/freebsd-9.3-i386.json b/freebsd-9.3-i386.json index db4808a6a..67fb71caa 100644 --- a/freebsd-9.3-i386.json +++ b/freebsd-9.3-i386.json @@ -108,7 +108,6 @@ "boot_wait": "8s", "disk_size": 10140, "guest_os_type": "freebsd", - "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", diff --git a/macosx-10.10.json b/macosx-10.10.json index 3725b5ead..7ad6c9df2 100644 --- a/macosx-10.10.json +++ b/macosx-10.10.json @@ -157,7 +157,6 @@ "boot_wait": "2s", "disk_size": 40960, "guest_os_type": "macosx", - "headless": "{{ user `headless` }}", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `iso_url`}}", diff --git a/macosx-10.7.json b/macosx-10.7.json index a6222e946..e667e4c43 100644 --- a/macosx-10.7.json +++ b/macosx-10.7.json @@ -157,7 +157,6 @@ "boot_wait": "2s", "disk_size": 40960, "guest_os_type": "macosx", - "headless": "{{ user `headless` }}", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `iso_url`}}", diff --git a/macosx-10.8.json b/macosx-10.8.json index 9f52f3794..012b5c623 100644 --- a/macosx-10.8.json +++ b/macosx-10.8.json @@ -157,7 +157,6 @@ "boot_wait": "2s", "disk_size": 40960, "guest_os_type": "macosx", - "headless": "{{ user `headless` }}", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `iso_url`}}", diff --git a/macosx-10.9.json b/macosx-10.9.json index bd25f4ec5..ffd041f33 100644 --- a/macosx-10.9.json +++ b/macosx-10.9.json @@ -157,7 +157,6 @@ "boot_wait": "2s", "disk_size": 40960, "guest_os_type": "macosx", - "headless": "{{ user `headless` }}", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `iso_url`}}", diff --git a/omnios-r151010j.json b/omnios-r151010j.json index 97baaeadc..df9c3a009 100644 --- a/omnios-r151010j.json +++ b/omnios-r151010j.json @@ -152,7 +152,6 @@ "disk_size": 40960, "guest_os_type": "opensolaris", "hard_drive_interface": "ide", - "headless": "{{ user `headless` }}", "iso_checksum": "bc3f4c0d29a5da75174de62da00294e5ef826b5e", "iso_checksum_type": "sha1", "iso_url": "{{user `mirror`}}/OmniOS_Text_r151010j.iso", diff --git a/opensuse-13.2-i386.json b/opensuse-13.2-i386.json index 6a36f97e0..5111de35c 100644 --- a/opensuse-13.2-i386.json +++ b/opensuse-13.2-i386.json @@ -84,7 +84,6 @@ "boot_wait": "10s", "disk_size": 20480, "guest_os_type": "opensuse", - "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", diff --git a/opensuse-13.2-x86_64.json b/opensuse-13.2-x86_64.json index c07c5e09a..d30aa6924 100644 --- a/opensuse-13.2-x86_64.json +++ b/opensuse-13.2-x86_64.json @@ -84,7 +84,6 @@ "boot_wait": "10s", "disk_size": 20480, "guest_os_type": "opensuse", - "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", diff --git a/oracle-5.11-i386.json b/oracle-5.11-i386.json index cc80236c7..b42d10218 100644 --- a/oracle-5.11-i386.json +++ b/oracle-5.11-i386.json @@ -72,7 +72,6 @@ "boot_wait": "10s", "disk_size": 40960, "guest_os_type": "centos", - "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "f4ef2b868a0cccb736664136eca798ec", "iso_checksum_type": "md5", diff --git a/oracle-5.11-x86_64.json b/oracle-5.11-x86_64.json index 69878aa0d..0678dfd32 100644 --- a/oracle-5.11-x86_64.json +++ b/oracle-5.11-x86_64.json @@ -72,7 +72,6 @@ "boot_wait": "10s", "disk_size": 40960, "guest_os_type": "centos", - "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "8af2121088c7e6f5ebdb6d5900403240", "iso_checksum_type": "md5", diff --git a/oracle-6.6-i386.json b/oracle-6.6-i386.json index 3da7e6d11..27269469a 100644 --- a/oracle-6.6-i386.json +++ b/oracle-6.6-i386.json @@ -72,7 +72,6 @@ "boot_wait": "10s", "disk_size": 40960, "guest_os_type": "centos", - "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "81f0c85217f40763dea5053ec5594e4958498bbc", "iso_checksum_type": "sha1", diff --git a/oracle-6.6-x86_64.json b/oracle-6.6-x86_64.json index b5f867210..587565ac1 100644 --- a/oracle-6.6-x86_64.json +++ b/oracle-6.6-x86_64.json @@ -72,7 +72,6 @@ "boot_wait": "10s", "disk_size": 40960, "guest_os_type": "centos", - "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "5738f10a506d3630edfd297ef179b553091c6a48", "iso_checksum_type": "sha1", diff --git a/rhel-5.11-i386.json b/rhel-5.11-i386.json index 97faa95f8..a474bf103 100644 --- a/rhel-5.11-i386.json +++ b/rhel-5.11-i386.json @@ -72,7 +72,6 @@ "boot_wait": "10s", "disk_size": 40960, "guest_os_type": "rhel", - "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "4e38e4ed06d83efb10446e7db19d96761715cdbdbf0bbfacb978b44ce368bbe2", "iso_checksum_type": "sha256", diff --git a/rhel-5.11-x86_64.json b/rhel-5.11-x86_64.json index 84fed6414..4a889f343 100644 --- a/rhel-5.11-x86_64.json +++ b/rhel-5.11-x86_64.json @@ -72,7 +72,6 @@ "boot_wait": "10s", "disk_size": 40960, "guest_os_type": "rhel", - "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "36565fe0c8a97207d63234d10123daeedb29d509576dbd7b34e71958ac2f9050", "iso_checksum_type": "sha256", diff --git a/rhel-6.6-i386.json b/rhel-6.6-i386.json index 6417c11db..f22415397 100644 --- a/rhel-6.6-i386.json +++ b/rhel-6.6-i386.json @@ -72,7 +72,6 @@ "boot_wait": "10s", "disk_size": 40960, "guest_os_type": "rhel", - "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "0a14ed1f7d7ea7b831739ed8e71719d9cb7c294bf801e8db39358651768547ad", "iso_checksum_type": "sha256", diff --git a/rhel-6.6-x86_64.json b/rhel-6.6-x86_64.json index 7aeec4734..0624c13fc 100644 --- a/rhel-6.6-x86_64.json +++ b/rhel-6.6-x86_64.json @@ -72,7 +72,6 @@ "boot_wait": "10s", "disk_size": 40960, "guest_os_type": "rhel", - "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "16044cb7264f4bc0150f5b6f3f66936ccf2d36e0a4152c00d9236fb7dcae5f32", "iso_checksum_type": "sha256", diff --git a/rhel-7.1-x86_64.json b/rhel-7.1-x86_64.json index f4ea7cc02..fa61504c8 100644 --- a/rhel-7.1-x86_64.json +++ b/rhel-7.1-x86_64.json @@ -72,7 +72,6 @@ "boot_wait": "10s", "disk_size": 40960, "guest_os_type": "rhel", - "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "3685468ec6cdcb70dfc85ebbc164da427dc2d762644c3c2ee1520f4f661c15ce", "iso_checksum_type": "sha256", diff --git a/sles-11-sp2-i386.json b/sles-11-sp2-i386.json index 4bc0f5967..e4d50ce96 100644 --- a/sles-11-sp2-i386.json +++ b/sles-11-sp2-i386.json @@ -84,7 +84,6 @@ "boot_wait": "10s", "disk_size": 20480, "guest_os_type": "suse", - "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "a0b34f6237b2b2a6b2174c82b40ed326", "iso_checksum_type": "md5", diff --git a/sles-11-sp2-x86_64.json b/sles-11-sp2-x86_64.json index a6c5f8990..0dc886984 100644 --- a/sles-11-sp2-x86_64.json +++ b/sles-11-sp2-x86_64.json @@ -84,7 +84,6 @@ "boot_wait": "10s", "disk_size": 20480, "guest_os_type": "suse", - "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "461d82ae6e15062b0807c1338f040497", "iso_checksum_type": "md5", diff --git a/sles-11-sp3-i386.json b/sles-11-sp3-i386.json index 8937a02c3..0a1b66229 100644 --- a/sles-11-sp3-i386.json +++ b/sles-11-sp3-i386.json @@ -84,7 +84,6 @@ "boot_wait": "10s", "disk_size": 20480, "guest_os_type": "suse", - "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "5c30a409fc8fb3343b4dc90d93ff2c89", "iso_checksum_type": "md5", diff --git a/sles-11-sp3-x86_64.json b/sles-11-sp3-x86_64.json index 7a5efc16b..ad8dc1e11 100644 --- a/sles-11-sp3-x86_64.json +++ b/sles-11-sp3-x86_64.json @@ -84,7 +84,6 @@ "boot_wait": "10s", "disk_size": 20480, "guest_os_type": "suse", - "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "480b70d50cbb538382dc2b9325221e1b", "iso_checksum_type": "md5", diff --git a/sles-12-x86_64.json b/sles-12-x86_64.json index e0d2b14b3..2bd7919d6 100644 --- a/sles-12-x86_64.json +++ b/sles-12-x86_64.json @@ -84,7 +84,6 @@ "boot_wait": "10s", "disk_size": 20480, "guest_os_type": "suse", - "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "58086fca0441b1d44c7a51c5ee64e1bd4365466fcee48ec92c4f39d07739aeed", "iso_checksum_type": "sha256", diff --git a/ubuntu-10.04-amd64.json b/ubuntu-10.04-amd64.json index bb2133cc8..631612a5c 100644 --- a/ubuntu-10.04-amd64.json +++ b/ubuntu-10.04-amd64.json @@ -135,7 +135,6 @@ "boot_wait": "10s", "disk_size": 40960, "guest_os_type": "ubuntu", - "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", diff --git a/ubuntu-10.04-i386.json b/ubuntu-10.04-i386.json index d766c2959..27bf6922b 100644 --- a/ubuntu-10.04-i386.json +++ b/ubuntu-10.04-i386.json @@ -135,7 +135,6 @@ "boot_wait": "10s", "disk_size": 40960, "guest_os_type": "ubuntu", - "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", diff --git a/ubuntu-12.04-amd64.json b/ubuntu-12.04-amd64.json index 6a4b9111a..9fb8fb195 100644 --- a/ubuntu-12.04-amd64.json +++ b/ubuntu-12.04-amd64.json @@ -135,7 +135,6 @@ "boot_wait": "10s", "disk_size": 40960, "guest_os_type": "ubuntu", - "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", diff --git a/ubuntu-12.04-i386.json b/ubuntu-12.04-i386.json index a504f722a..66854c89d 100644 --- a/ubuntu-12.04-i386.json +++ b/ubuntu-12.04-i386.json @@ -135,7 +135,6 @@ "boot_wait": "10s", "disk_size": 40960, "guest_os_type": "ubuntu", - "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", diff --git a/ubuntu-14.04-amd64.json b/ubuntu-14.04-amd64.json index df3326066..1855729cf 100644 --- a/ubuntu-14.04-amd64.json +++ b/ubuntu-14.04-amd64.json @@ -135,7 +135,6 @@ "boot_wait": "10s", "disk_size": 40960, "guest_os_type": "ubuntu", - "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", diff --git a/ubuntu-14.04-i386.json b/ubuntu-14.04-i386.json index ab1e604cd..8811c9ec8 100644 --- a/ubuntu-14.04-i386.json +++ b/ubuntu-14.04-i386.json @@ -135,7 +135,6 @@ "boot_wait": "10s", "disk_size": 40960, "guest_os_type": "ubuntu", - "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", diff --git a/ubuntu-14.10-amd64.json b/ubuntu-14.10-amd64.json index 64532832d..01856dcb3 100644 --- a/ubuntu-14.10-amd64.json +++ b/ubuntu-14.10-amd64.json @@ -135,7 +135,6 @@ "boot_wait": "10s", "disk_size": 40960, "guest_os_type": "ubuntu", - "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", diff --git a/ubuntu-14.10-i386.json b/ubuntu-14.10-i386.json index 1f24dae62..45ea510d1 100644 --- a/ubuntu-14.10-i386.json +++ b/ubuntu-14.10-i386.json @@ -135,7 +135,6 @@ "boot_wait": "10s", "disk_size": 40960, "guest_os_type": "ubuntu", - "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", diff --git a/ubuntu-15.04-amd64.json b/ubuntu-15.04-amd64.json index 2ee3d2660..95af28f47 100644 --- a/ubuntu-15.04-amd64.json +++ b/ubuntu-15.04-amd64.json @@ -135,7 +135,6 @@ "boot_wait": "10s", "disk_size": 40960, "guest_os_type": "ubuntu", - "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", diff --git a/ubuntu-15.04-i386.json b/ubuntu-15.04-i386.json index 854aed7b7..cd7370f21 100644 --- a/ubuntu-15.04-i386.json +++ b/ubuntu-15.04-i386.json @@ -135,7 +135,6 @@ "boot_wait": "10s", "disk_size": 40960, "guest_os_type": "ubuntu", - "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", From efbeeafa9f440da92b3f05c5b8d097d13a0dbf7a Mon Sep 17 00:00:00 2001 From: Seth Thomas <sthomas@chef.io> Date: Fri, 18 Sep 2015 10:34:49 -0700 Subject: [PATCH 0404/1622] Stop using s3cmd and use aws-sdk --- Rakefile | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/Rakefile b/Rakefile index fd0bb4e62..edc0099fe 100644 --- a/Rakefile +++ b/Rakefile @@ -2,6 +2,7 @@ require 'cgi' require 'json' require 'net/http' require 'kitchen' +require 'aws-sdk' # TODO: private boxes may need to specify a mirror @@ -275,13 +276,16 @@ end def upload_to_s3(boxname, version, providers) providers.each do |provider, provider_data| - boxfile = provider_data['file'] - upload_path = "s3://opscode-vm-bento/vagrant/#{provider}/opscode_#{boxname}_chef-provisionerless.box" - puts "Uploading the box #{boxfile} to S3, version: #{version}, provider: #{provider}, upload path: #{upload_path}" - cmd = %W[s3cmd put builds/#{boxfile} #{upload_path}] - cmd.insert(1, ".s3cfg-bento") - cmd.insert(1, "--config") - sh cmd.join(' ') + boxfile = provider_data['file'] + provider = 'vmware' if provider == 'vmware_desktop' + box_path = "vagrant/#{provider}/opscode_#{boxname}_chef-provisionerless.box" + credentials = Aws::Credentials.new(ENV['AWS_ACCESS_KEY_ID'], ENV['AWS_SECRET_ACCESS_KEY']) + + s3 = Aws::S3::Resource.new(credentials: credentials, endpoint: 'https://s3.amazonaws.com') + puts "Uploading box: #{boxname} provider: #{provider}" + s3_object = s3.bucket('opscode-vm-bento').object(box_path) + s3_object.upload_file("builds/#{boxfile}", acl:'public-read') + puts "Uploaded to #{s3_object.public_url}" end end From 9078f40a4a06b37fcc7feba7b0320215b01365aa Mon Sep 17 00:00:00 2001 From: Seth Thomas <sthomas@chef.io> Date: Fri, 18 Sep 2015 10:55:21 -0700 Subject: [PATCH 0405/1622] Make S3 upload part of buildkite process --- build.sh | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/build.sh b/build.sh index 0f6c6d594..430c3188e 100644 --- a/build.sh +++ b/build.sh @@ -70,8 +70,11 @@ rake build_box[$PLATFORM] echo "--- Test $PLATFORM-$BENTO_PROVIDERS" rake test_all -echo "--- Upload Boxes" +echo "--- Upload Boxes to S3" +rake upload_all_s3 + +echo "--- Upload Boxes to Atlas" rake upload_all -echo "--- Release Boxes" +echo "--- Release Boxes on Atlas" rake release_all From 2e90f2997c503bfddc65505b48dd9086bd99fbfa Mon Sep 17 00:00:00 2001 From: Seth Thomas <sthomas@chef.io> Date: Fri, 18 Sep 2015 10:56:55 -0700 Subject: [PATCH 0406/1622] Add upload_all_s3 task --- Rakefile | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/Rakefile b/Rakefile index edc0099fe..aa69b947c 100644 --- a/Rakefile +++ b/Rakefile @@ -66,6 +66,15 @@ task :upload_box, :metadata_file do |f, args| upload_to_atlas(metadata['name'], metadata['version'], metadata['providers']) end +desc 'Upload all boxes to S3 for all providers' +task :upload_all_s3 do + metadata_files.each do |metadata_file| + puts "Processing #{metadata_file} for upload." + Rake::Task['upload_box_s3'].invoke(metadata_file) + Rake::Task['upload_box_s3'].reenable + end +end + desc 'Upload box files to S3 for all providers' task :upload_box_s3, :metadata_file do |f, args| metadata = box_metadata(args[:metadata_file]) From 457b6fc2b1a4460505fd30b7a55bb550a8d7abea Mon Sep 17 00:00:00 2001 From: Seth Thomas <sthomas@chef.io> Date: Fri, 18 Sep 2015 11:04:21 -0700 Subject: [PATCH 0407/1622] Fixing template --- fedora-21-i386.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fedora-21-i386.json b/fedora-21-i386.json index 03bd66bdc..64d731c29 100644 --- a/fedora-21-i386.json +++ b/fedora-21-i386.json @@ -49,7 +49,7 @@ "http_directory": "http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}" + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", "output_directory": "packer-{{user `template`}}-vmware", "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", "ssh_password": "vagrant", From 701112392b6040aa09e3b7c6992701431eb1bf59 Mon Sep 17 00:00:00 2001 From: Seth Thomas <sthomas@chef.io> Date: Fri, 18 Sep 2015 11:10:28 -0700 Subject: [PATCH 0408/1622] Also fixing Fedora 20 for posterity --- fedora-20-i386.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fedora-20-i386.json b/fedora-20-i386.json index 70aa60583..5901c1122 100644 --- a/fedora-20-i386.json +++ b/fedora-20-i386.json @@ -49,7 +49,7 @@ "http_directory": "http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}" + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", "output_directory": "packer-{{user `template`}}-vmware", "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", "ssh_password": "vagrant", From 14ce1c37c6b18ac48ea4a410c0550f104accf02f Mon Sep 17 00:00:00 2001 From: Seth Thomas <sthomas@chef.io> Date: Fri, 18 Sep 2015 13:13:55 -0700 Subject: [PATCH 0409/1622] Making upload/release optional --- build.sh | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/build.sh b/build.sh index 430c3188e..cdd25f85c 100644 --- a/build.sh +++ b/build.sh @@ -70,11 +70,14 @@ rake build_box[$PLATFORM] echo "--- Test $PLATFORM-$BENTO_PROVIDERS" rake test_all -echo "--- Upload Boxes to S3" -rake upload_all_s3 +if [ $BENTO_UPLOAD -eq 1 ] +then + echo "--- Upload Boxes to S3" + rake upload_all_s3 -echo "--- Upload Boxes to Atlas" -rake upload_all + echo "--- Upload Boxes to Atlas" + rake upload_all -echo "--- Release Boxes on Atlas" -rake release_all + echo "--- Release Boxes on Atlas" + rake release_all +fi From a8f5ab4b90abac9371810d4050d1e957b61ba5d6 Mon Sep 17 00:00:00 2001 From: Seth Thomas <sthomas@chef.io> Date: Mon, 21 Sep 2015 23:52:41 +0100 Subject: [PATCH 0410/1622] use --force-install for VMware tools --- scripts/common/vmtools.sh | 2 +- scripts/freebsd/vmtools.sh | 2 +- scripts/omnios/vmtools.sh | 2 +- scripts/solaris10/vmtools.sh | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/common/vmtools.sh b/scripts/common/vmtools.sh index 936d05918..48d3a658d 100644 --- a/scripts/common/vmtools.sh +++ b/scripts/common/vmtools.sh @@ -22,7 +22,7 @@ vmware-iso|vmware-vmx) mkdir -p /tmp/vmfusion-archive; mount -o loop $HOME_DIR/linux.iso /tmp/vmfusion; tar xzf /tmp/vmfusion/VMwareTools-*.tar.gz -C /tmp/vmfusion-archive; - /tmp/vmfusion-archive/vmware-tools-distrib/vmware-install.pl --default; + /tmp/vmfusion-archive/vmware-tools-distrib/vmware-install.pl --force-install; umount /tmp/vmfusion; rm -rf /tmp/vmfusion; rm -rf /tmp/vmfusion-archive; diff --git a/scripts/freebsd/vmtools.sh b/scripts/freebsd/vmtools.sh index 8ad971857..ad5962ab4 100644 --- a/scripts/freebsd/vmtools.sh +++ b/scripts/freebsd/vmtools.sh @@ -44,7 +44,7 @@ vmware-iso|vmware-vmx) mdconfig -a -t vnode -f $HOME_DIR/freebsd.iso -u 0; mount -t cd9660 /dev/md0 /tmp/vmfusion; tar xzf /tmp/vmfusion/vmware-freebsd-tools.tar.gz -C /tmp/vmfusion-archive; - /tmp/vmfusion-archive/vmware-tools-distrib/vmware-install.pl --default; + /tmp/vmfusion-archive/vmware-tools-distrib/vmware-install.pl --force-install; echo 'ifconfig_vxn0="dhcp"' >>/etc/rc.conf; umount /tmp/vmfusion; rm -rf /tmp/vmfusion; diff --git a/scripts/omnios/vmtools.sh b/scripts/omnios/vmtools.sh index 577783485..7fa684c32 100644 --- a/scripts/omnios/vmtools.sh +++ b/scripts/omnios/vmtools.sh @@ -21,7 +21,7 @@ if [ $PACKER_BUILDER_TYPE == 'vmware' ]; then mount -o ro -F hsfs $VMTOOLSDEV /mnt/vmtools mkdir /tmp/vmfusion-archive tar zxvf /mnt/vmtools/vmware-solaris-tools.tar.gz -C /tmp/vmfusion-archive - /tmp/vmfusion-archive/vmware-tools-distrib/vmware-install.pl --default + /tmp/vmfusion-archive/vmware-tools-distrib/vmware-install.pl --force-install umount /mnt/vmtools lofiadm -d $VMTOOLSDEV rmdir /mnt/vmtools diff --git a/scripts/solaris10/vmtools.sh b/scripts/solaris10/vmtools.sh index cb84f57cb..289e870ff 100644 --- a/scripts/solaris10/vmtools.sh +++ b/scripts/solaris10/vmtools.sh @@ -31,7 +31,7 @@ else mount -o ro -F hsfs $VMTOOLSDEV /cdrom mkdir /tmp/vmfusion-archive gtar zxvf /cdrom/vmware-solaris-tools.tar.gz -C /tmp/vmfusion-archive - /tmp/vmfusion-archive/vmware-tools-distrib/vmware-install.pl --default + /tmp/vmfusion-archive/vmware-tools-distrib/vmware-install.pl --force-install umount /cdrom lofiadm -d $VMTOOLSDEV rm -rf /mnt/vmtools From 7f5f53892cdfa38181e88ee32ab21d831f42ef0e Mon Sep 17 00:00:00 2001 From: Mark McKinstry <mmckinst@umich.edu> Date: Wed, 23 Sep 2015 19:04:20 -0400 Subject: [PATCH 0411/1622] remove duplicate auth/authconfig and use sha512 algorithm for password hashing auth and authconfig are the same thing, they're used twice in the kickstart files. the first one tells authconfig to use sha512, the second one tells it to use md5. the end result the machine is configured to use md5 instead of sha512 for password hashing --- http/centos-5.11/ks.cfg | 1 - http/fedora-20/ks.cfg | 1 - http/fedora-21/ks.cfg | 1 - http/fedora-22/ks.cfg | 1 - 4 files changed, 4 deletions(-) diff --git a/http/centos-5.11/ks.cfg b/http/centos-5.11/ks.cfg index 9b1036aaa..d21167f60 100644 --- a/http/centos-5.11/ks.cfg +++ b/http/centos-5.11/ks.cfg @@ -14,7 +14,6 @@ skipx zerombr clearpart --all --initlabel autopart -auth --useshadow --enablemd5 firstboot --disabled reboot user --name=vagrant --password vagrant diff --git a/http/fedora-20/ks.cfg b/http/fedora-20/ks.cfg index 2e3e13e55..98f6de606 100644 --- a/http/fedora-20/ks.cfg +++ b/http/fedora-20/ks.cfg @@ -19,7 +19,6 @@ volgroup vg_vagrant --pesize=32768 pv.2 logvol / --fstype=ext4 --name=lv_root --vgname=vg_vagrant --size=1024 --grow logvol swap --fstype=swap --name=lv_swap --vgname=vg_vagrant --size=528 --grow --maxsize=1056 bootloader --location=mbr --append="norhgb biosdevname=0" -auth --useshadow --enablemd5 firstboot --disabled reboot user --name=vagrant --plaintext --password vagrant diff --git a/http/fedora-21/ks.cfg b/http/fedora-21/ks.cfg index 2e3e13e55..98f6de606 100644 --- a/http/fedora-21/ks.cfg +++ b/http/fedora-21/ks.cfg @@ -19,7 +19,6 @@ volgroup vg_vagrant --pesize=32768 pv.2 logvol / --fstype=ext4 --name=lv_root --vgname=vg_vagrant --size=1024 --grow logvol swap --fstype=swap --name=lv_swap --vgname=vg_vagrant --size=528 --grow --maxsize=1056 bootloader --location=mbr --append="norhgb biosdevname=0" -auth --useshadow --enablemd5 firstboot --disabled reboot user --name=vagrant --plaintext --password vagrant diff --git a/http/fedora-22/ks.cfg b/http/fedora-22/ks.cfg index 28529a83a..1a8f571bd 100644 --- a/http/fedora-22/ks.cfg +++ b/http/fedora-22/ks.cfg @@ -19,7 +19,6 @@ volgroup vg_vagrant --pesize=32768 pv.2 logvol / --fstype=ext4 --name=lv_root --vgname=vg_vagrant --size=1024 --grow logvol swap --fstype=swap --name=lv_swap --vgname=vg_vagrant --size=528 --grow --maxsize=1056 bootloader --location=mbr --append="norhgb biosdevname=0" -auth --useshadow --enablemd5 firstboot --disabled reboot user --name=vagrant --plaintext --password vagrant From 53d68038722bb3e9dc01d7743c1fb2222df9b129 Mon Sep 17 00:00:00 2001 From: Mark McKinstry <mmckinst@umich.edu> Date: Wed, 23 Sep 2015 20:34:20 -0400 Subject: [PATCH 0412/1622] bento command needs two dashes --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index b5245253e..11815f9ca 100644 --- a/README.md +++ b/README.md @@ -82,7 +82,7 @@ To build multiple templates for all providers (VirtualBox, Fusion, Parallels, et To build a box for a single provider: - $ bin/bento build -only=virtualbox-iso debian-8.1-amd64 + $ bin/bento build --only=virtualbox-iso debian-8.1-amd64 ### Using `packer` From fd28825e07be87979e80dbe1437e6b5a7f9ea82f Mon Sep 17 00:00:00 2001 From: David Brown <dmlb2000@gmail.com> Date: Sat, 26 Sep 2015 23:58:42 -0700 Subject: [PATCH 0413/1622] squashed commit to add qemu options for all boxes --- centos-5.11-i386.json | 19 ++++++++++++++++ centos-5.11-x86_64.json | 19 ++++++++++++++++ centos-6.7-i386.json | 19 ++++++++++++++++ centos-6.7-x86_64.json | 19 ++++++++++++++++ centos-7.1-x86_64.json | 19 ++++++++++++++++ debian-6.0.10-amd64.json | 33 +++++++++++++++++++++++++++ debian-6.0.10-i386.json | 33 +++++++++++++++++++++++++++ debian-7.8-amd64.json | 33 +++++++++++++++++++++++++++ debian-7.8-i386.json | 33 +++++++++++++++++++++++++++ debian-7.9-amd64.json | 33 +++++++++++++++++++++++++++ debian-7.9-i386.json | 33 +++++++++++++++++++++++++++ debian-8.1-amd64.json | 34 ++++++++++++++++++++++++++++ debian-8.1-i386.json | 34 ++++++++++++++++++++++++++++ debian-8.2-amd64.json | 34 ++++++++++++++++++++++++++++ debian-8.2-i386.json | 34 ++++++++++++++++++++++++++++ fedora-20-i386.json | 19 ++++++++++++++++ fedora-20-x86_64.json | 19 ++++++++++++++++ fedora-21-i386.json | 19 ++++++++++++++++ fedora-21-x86_64.json | 19 ++++++++++++++++ fedora-22-i386.json | 19 ++++++++++++++++ fedora-22-x86_64.json | 19 ++++++++++++++++ freebsd-10.2-amd64.json | 27 ++++++++++++++++++++++ freebsd-10.2-i386.json | 27 ++++++++++++++++++++++ freebsd-9.3-amd64.json | 31 +++++++++++++++++++++++++ freebsd-9.3-i386.json | 31 +++++++++++++++++++++++++ http/centos-5.11/ks.cfg | 1 + http/centos-6.7/ks.cfg | 1 + http/freebsd-10.2/install.sh | 10 +++++++-- http/freebsd-9.3/install.sh | 10 +++++++-- http/opensuse-13.2/autoinst.xml | 1 - opensuse-13.2-i386.json | 23 +++++++++++++++++++ opensuse-13.2-x86_64.json | 23 +++++++++++++++++++ oracle-5.11-i386.json | 19 ++++++++++++++++ oracle-5.11-x86_64.json | 19 ++++++++++++++++ oracle-6.6-i386.json | 19 ++++++++++++++++ oracle-6.6-x86_64.json | 19 ++++++++++++++++ rhel-5.11-i386.json | 19 ++++++++++++++++ rhel-5.11-x86_64.json | 19 ++++++++++++++++ rhel-6.6-i386.json | 19 ++++++++++++++++ rhel-6.6-x86_64.json | 19 ++++++++++++++++ rhel-7.1-x86_64.json | 19 ++++++++++++++++ scripts/common/minimize.sh | 4 ++++ scripts/common/vmtools.sh | 4 ++++ scripts/freebsd/minimize.sh | 4 ++++ sles-11-sp2-i386.json | 23 +++++++++++++++++++ sles-11-sp2-x86_64.json | 23 +++++++++++++++++++ sles-11-sp3-i386.json | 23 +++++++++++++++++++ sles-11-sp3-x86_64.json | 23 +++++++++++++++++++ sles-12-x86_64.json | 23 +++++++++++++++++++ ubuntu-10.04-amd64.json | 40 +++++++++++++++++++++++++++++++++ ubuntu-10.04-i386.json | 40 +++++++++++++++++++++++++++++++++ ubuntu-12.04-amd64.json | 40 +++++++++++++++++++++++++++++++++ ubuntu-12.04-i386.json | 40 +++++++++++++++++++++++++++++++++ ubuntu-14.04-amd64.json | 40 +++++++++++++++++++++++++++++++++ ubuntu-14.04-i386.json | 40 +++++++++++++++++++++++++++++++++ ubuntu-14.10-amd64.json | 40 +++++++++++++++++++++++++++++++++ ubuntu-14.10-i386.json | 40 +++++++++++++++++++++++++++++++++ ubuntu-15.04-amd64.json | 40 +++++++++++++++++++++++++++++++++ ubuntu-15.04-i386.json | 40 +++++++++++++++++++++++++++++++++ 59 files changed, 1421 insertions(+), 5 deletions(-) diff --git a/centos-5.11-i386.json b/centos-5.11-i386.json index 94f4f8b26..cf95fabce 100644 --- a/centos-5.11-i386.json +++ b/centos-5.11-i386.json @@ -100,6 +100,25 @@ "ssh_wait_timeout": "10000s", "type": "parallels-iso", "vm_name": "{{ user `template` }}" + }, + { + "boot_command": [ + "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-qemu", + "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "qemu", + "vm_name": "{{ user `template` }}" } ], "post-processors": [ diff --git a/centos-5.11-x86_64.json b/centos-5.11-x86_64.json index 8d94d491c..6b69da25d 100644 --- a/centos-5.11-x86_64.json +++ b/centos-5.11-x86_64.json @@ -100,6 +100,25 @@ "ssh_wait_timeout": "10000s", "type": "parallels-iso", "vm_name": "{{ user `template` }}" + }, + { + "boot_command": [ + "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-qemu", + "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "qemu", + "vm_name": "{{ user `template` }}" } ], "post-processors": [ diff --git a/centos-6.7-i386.json b/centos-6.7-i386.json index c3d3cb5b9..db6ab162a 100644 --- a/centos-6.7-i386.json +++ b/centos-6.7-i386.json @@ -100,6 +100,25 @@ "ssh_wait_timeout": "10000s", "type": "parallels-iso", "vm_name": "{{ user `template` }}" + }, + { + "boot_command": [ + "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-qemu", + "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "qemu", + "vm_name": "{{ user `template` }}" } ], "post-processors": [ diff --git a/centos-6.7-x86_64.json b/centos-6.7-x86_64.json index 380e0fa8e..3384f47e6 100644 --- a/centos-6.7-x86_64.json +++ b/centos-6.7-x86_64.json @@ -100,6 +100,25 @@ "ssh_wait_timeout": "10000s", "type": "parallels-iso", "vm_name": "{{ user `template` }}" + }, + { + "boot_command": [ + "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-qemu", + "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "qemu", + "vm_name": "{{ user `template` }}" } ], "post-processors": [ diff --git a/centos-7.1-x86_64.json b/centos-7.1-x86_64.json index b5f244584..f1cdacf56 100644 --- a/centos-7.1-x86_64.json +++ b/centos-7.1-x86_64.json @@ -100,6 +100,25 @@ "ssh_wait_timeout": "10000s", "type": "parallels-iso", "vm_name": "{{ user `template` }}" + }, + { + "boot_command": [ + "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-qemu", + "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "qemu", + "vm_name": "{{ user `template` }}" } ], "post-processors": [ diff --git a/debian-6.0.10-amd64.json b/debian-6.0.10-amd64.json index 9db62817f..3d335a96c 100644 --- a/debian-6.0.10-amd64.json +++ b/debian-6.0.10-amd64.json @@ -142,6 +142,39 @@ "ssh_wait_timeout": "10000s", "type": "parallels-iso", "vm_name": "{{ user `template` }}" + }, + { + "boot_command": [ + "<esc><wait>", + "install <wait>", + " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}} <wait>", + "debian-installer=en_US <wait>", + "auto <wait>", + "locale=en_US <wait>", + "kbd-chooser/method=us <wait>", + "keyboard-configuration/xkb-keymap=us <wait>", + "netcfg/get_hostname={{ .Name }} <wait>", + "netcfg/get_domain=vagrantup.com <wait>", + "fb=false <wait>", + "debconf/frontend=noninteractive <wait>", + "console-setup/ask_detect=false <wait>", + "console-keymaps-at/keymap=us <wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-qemu", + "ssh_username": "vagrant", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_wait_timeout": "10000s", + "shutdown_command": "echo 'vagrant'|sudo -S /sbin/shutdown -hP now", + "type": "qemu", + "vm_name": "{{ user `template` }}" } ], "post-processors": [ diff --git a/debian-6.0.10-i386.json b/debian-6.0.10-i386.json index e20cd016b..0cc9c2a97 100644 --- a/debian-6.0.10-i386.json +++ b/debian-6.0.10-i386.json @@ -142,6 +142,39 @@ "ssh_wait_timeout": "10000s", "type": "parallels-iso", "vm_name": "{{ user `template` }}" + }, + { + "boot_command": [ + "<esc><wait>", + "install <wait>", + " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}} <wait>", + "debian-installer=en_US <wait>", + "auto <wait>", + "locale=en_US <wait>", + "kbd-chooser/method=us <wait>", + "keyboard-configuration/xkb-keymap=us <wait>", + "netcfg/get_hostname={{ .Name }} <wait>", + "netcfg/get_domain=vagrantup.com <wait>", + "fb=false <wait>", + "debconf/frontend=noninteractive <wait>", + "console-setup/ask_detect=false <wait>", + "console-keymaps-at/keymap=us <wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-qemu", + "ssh_username": "vagrant", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_wait_timeout": "10000s", + "shutdown_command": "echo 'vagrant'|sudo -S /sbin/shutdown -hP now", + "type": "qemu", + "vm_name": "{{ user `template` }}" } ], "post-processors": [ diff --git a/debian-7.8-amd64.json b/debian-7.8-amd64.json index 651365189..8579fe577 100644 --- a/debian-7.8-amd64.json +++ b/debian-7.8-amd64.json @@ -142,6 +142,39 @@ "ssh_wait_timeout": "10000s", "type": "parallels-iso", "vm_name": "{{ user `template` }}" + }, + { + "boot_command": [ + "<esc><wait>", + "install <wait>", + " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}} <wait>", + "debian-installer=en_US <wait>", + "auto <wait>", + "locale=en_US <wait>", + "kbd-chooser/method=us <wait>", + "keyboard-configuration/xkb-keymap=us <wait>", + "netcfg/get_hostname={{ .Name }} <wait>", + "netcfg/get_domain=vagrantup.com <wait>", + "fb=false <wait>", + "debconf/frontend=noninteractive <wait>", + "console-setup/ask_detect=false <wait>", + "console-keymaps-at/keymap=us <wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-qemu", + "ssh_username": "vagrant", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_wait_timeout": "10000s", + "shutdown_command": "echo 'vagrant'|sudo -S /sbin/shutdown -hP now", + "type": "qemu", + "vm_name": "{{ user `template` }}" } ], "post-processors": [ diff --git a/debian-7.8-i386.json b/debian-7.8-i386.json index 046ea58bf..59a09da38 100644 --- a/debian-7.8-i386.json +++ b/debian-7.8-i386.json @@ -142,6 +142,39 @@ "ssh_wait_timeout": "10000s", "type": "parallels-iso", "vm_name": "{{ user `template` }}" + }, + { + "boot_command": [ + "<esc><wait>", + "install <wait>", + " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}} <wait>", + "debian-installer=en_US <wait>", + "auto <wait>", + "locale=en_US <wait>", + "kbd-chooser/method=us <wait>", + "keyboard-configuration/xkb-keymap=us <wait>", + "netcfg/get_hostname={{ .Name }} <wait>", + "netcfg/get_domain=vagrantup.com <wait>", + "fb=false <wait>", + "debconf/frontend=noninteractive <wait>", + "console-setup/ask_detect=false <wait>", + "console-keymaps-at/keymap=us <wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-qemu", + "ssh_username": "vagrant", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_wait_timeout": "10000s", + "shutdown_command": "echo 'vagrant'|sudo -S /sbin/shutdown -hP now", + "type": "qemu", + "vm_name": "{{ user `template` }}" } ], "post-processors": [ diff --git a/debian-7.9-amd64.json b/debian-7.9-amd64.json index de9f95213..d764ca3fe 100644 --- a/debian-7.9-amd64.json +++ b/debian-7.9-amd64.json @@ -142,6 +142,39 @@ "ssh_wait_timeout": "10000s", "type": "parallels-iso", "vm_name": "{{ user `template` }}" + }, + { + "boot_command": [ + "<esc><wait>", + "install <wait>", + "preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/debian-7/preseed.cfg <wait>", + "debian-installer=en_US <wait>", + "auto <wait>", + "locale=en_US <wait>", + "kbd-chooser/method=us <wait>", + "keyboard-configuration/xkb-keymap=us <wait>", + "netcfg/get_hostname={{ .Name }} <wait>", + "netcfg/get_domain=vagrantup.com <wait>", + "fb=false <wait>", + "debconf/frontend=noninteractive <wait>", + "console-setup/ask_detect=false <wait>", + "console-keymaps-at/keymap=us <wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-qemu", + "ssh_username": "vagrant", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_wait_timeout": "10000s", + "shutdown_command": "echo 'vagrant'|sudo -S /sbin/shutdown -hP now", + "type": "qemu", + "vm_name": "{{ user `template` }}" } ], "post-processors": [ diff --git a/debian-7.9-i386.json b/debian-7.9-i386.json index 85d152d14..7eb2b351d 100644 --- a/debian-7.9-i386.json +++ b/debian-7.9-i386.json @@ -142,6 +142,39 @@ "ssh_wait_timeout": "10000s", "type": "parallels-iso", "vm_name": "{{ user `template` }}" + }, + { + "boot_command": [ + "<esc><wait>", + "install <wait>", + "preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/debian-7/preseed.cfg <wait>", + "debian-installer=en_US <wait>", + "auto <wait>", + "locale=en_US <wait>", + "kbd-chooser/method=us <wait>", + "keyboard-configuration/xkb-keymap=us <wait>", + "netcfg/get_hostname={{ .Name }} <wait>", + "netcfg/get_domain=vagrantup.com <wait>", + "fb=false <wait>", + "debconf/frontend=noninteractive <wait>", + "console-setup/ask_detect=false <wait>", + "console-keymaps-at/keymap=us <wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-qemu", + "ssh_username": "vagrant", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_wait_timeout": "10000s", + "shutdown_command": "echo 'vagrant'|sudo -S /sbin/shutdown -hP now", + "type": "qemu", + "vm_name": "{{ user `template` }}" } ], "post-processors": [ diff --git a/debian-8.1-amd64.json b/debian-8.1-amd64.json index 174ffdcc3..c2bad8d7a 100644 --- a/debian-8.1-amd64.json +++ b/debian-8.1-amd64.json @@ -142,6 +142,40 @@ "ssh_wait_timeout": "10000s", "type": "parallels-iso", "vm_name": "{{ user `template` }}" + }, + { + "boot_command": [ + "<esc><wait>", + "install <wait>", + " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}} <wait>", + "debian-installer=en_US <wait>", + "auto <wait>", + "locale=en_US <wait>", + "kbd-chooser/method=us <wait>", + "keyboard-configuration/xkb-keymap=us <wait>", + "netcfg/get_hostname={{ .Name }} <wait>", + "netcfg/get_domain=vagrantup.com <wait>", + "fb=false <wait>", + "debconf/frontend=noninteractive <wait>", + "console-setup/ask_detect=false <wait>", + "console-keymaps-at/keymap=us <wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "disk_interface": "scsi", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-qemu", + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "qemu", + "vm_name": "{{ user `template` }}" } ], "post-processors": [ diff --git a/debian-8.1-i386.json b/debian-8.1-i386.json index 27b934e33..562050bc8 100644 --- a/debian-8.1-i386.json +++ b/debian-8.1-i386.json @@ -142,6 +142,40 @@ "ssh_wait_timeout": "10000s", "type": "parallels-iso", "vm_name": "{{ user `template` }}" + }, + { + "boot_command": [ + "<esc><wait>", + "install <wait>", + " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}} <wait>", + "debian-installer=en_US <wait>", + "auto <wait>", + "locale=en_US <wait>", + "kbd-chooser/method=us <wait>", + "keyboard-configuration/xkb-keymap=us <wait>", + "netcfg/get_hostname={{ .Name }} <wait>", + "netcfg/get_domain=vagrantup.com <wait>", + "fb=false <wait>", + "debconf/frontend=noninteractive <wait>", + "console-setup/ask_detect=false <wait>", + "console-keymaps-at/keymap=us <wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "disk_interface": "scsi", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-qemu", + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "qemu", + "vm_name": "{{ user `template` }}" } ], "post-processors": [ diff --git a/debian-8.2-amd64.json b/debian-8.2-amd64.json index 3f59cda0d..d6a6bdb77 100644 --- a/debian-8.2-amd64.json +++ b/debian-8.2-amd64.json @@ -142,6 +142,40 @@ "ssh_wait_timeout": "10000s", "type": "parallels-iso", "vm_name": "{{ user `template` }}" + }, + { + "boot_command": [ + "<esc><wait>", + "install <wait>", + " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}} <wait>", + "debian-installer=en_US <wait>", + "auto <wait>", + "locale=en_US <wait>", + "kbd-chooser/method=us <wait>", + "keyboard-configuration/xkb-keymap=us <wait>", + "netcfg/get_hostname={{ .Name }} <wait>", + "netcfg/get_domain=vagrantup.com <wait>", + "fb=false <wait>", + "debconf/frontend=noninteractive <wait>", + "console-setup/ask_detect=false <wait>", + "console-keymaps-at/keymap=us <wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "disk_interface": "scsi", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-qemu", + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "qemu", + "vm_name": "{{ user `template` }}" } ], "post-processors": [ diff --git a/debian-8.2-i386.json b/debian-8.2-i386.json index 20a647dd0..e4162bc6d 100644 --- a/debian-8.2-i386.json +++ b/debian-8.2-i386.json @@ -142,6 +142,40 @@ "ssh_wait_timeout": "10000s", "type": "parallels-iso", "vm_name": "{{ user `template` }}" + }, + { + "boot_command": [ + "<esc><wait>", + "install <wait>", + " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}} <wait>", + "debian-installer=en_US <wait>", + "auto <wait>", + "locale=en_US <wait>", + "kbd-chooser/method=us <wait>", + "keyboard-configuration/xkb-keymap=us <wait>", + "netcfg/get_hostname={{ .Name }} <wait>", + "netcfg/get_domain=vagrantup.com <wait>", + "fb=false <wait>", + "debconf/frontend=noninteractive <wait>", + "console-setup/ask_detect=false <wait>", + "console-keymaps-at/keymap=us <wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "disk_interface": "scsi", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-qemu", + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "qemu", + "vm_name": "{{ user `template` }}" } ], "post-processors": [ diff --git a/fedora-20-i386.json b/fedora-20-i386.json index 5901c1122..0cdd7c571 100644 --- a/fedora-20-i386.json +++ b/fedora-20-i386.json @@ -100,6 +100,25 @@ "ssh_wait_timeout": "10000s", "type": "parallels-iso", "vm_name": "{{ user `template` }}" + }, + { + "boot_command": [ + "<tab> linux ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-qemu", + "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "qemu", + "vm_name": "{{ user `template` }}" } ], "post-processors": [ diff --git a/fedora-20-x86_64.json b/fedora-20-x86_64.json index e613aece5..d200e9397 100644 --- a/fedora-20-x86_64.json +++ b/fedora-20-x86_64.json @@ -100,6 +100,25 @@ "ssh_wait_timeout": "10000s", "type": "parallels-iso", "vm_name": "{{ user `template` }}" + }, + { + "boot_command": [ + "<tab> linux ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-qemu", + "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "qemu", + "vm_name": "{{ user `template` }}" } ], "post-processors": [ diff --git a/fedora-21-i386.json b/fedora-21-i386.json index 64d731c29..d996c8e90 100644 --- a/fedora-21-i386.json +++ b/fedora-21-i386.json @@ -100,6 +100,25 @@ "ssh_wait_timeout": "10000s", "type": "parallels-iso", "vm_name": "{{ user `template` }}" + }, + { + "boot_command": [ + "<tab> linux ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-qemu", + "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "qemu", + "vm_name": "{{ user `template` }}" } ], "post-processors": [ diff --git a/fedora-21-x86_64.json b/fedora-21-x86_64.json index 4392d0dbc..77bc9ce76 100644 --- a/fedora-21-x86_64.json +++ b/fedora-21-x86_64.json @@ -100,6 +100,25 @@ "ssh_wait_timeout": "10000s", "type": "parallels-iso", "vm_name": "{{ user `template` }}" + }, + { + "boot_command": [ + "<tab> linux ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-qemu", + "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "qemu", + "vm_name": "{{ user `template` }}" } ], "post-processors": [ diff --git a/fedora-22-i386.json b/fedora-22-i386.json index 6fde82a01..4d941b234 100644 --- a/fedora-22-i386.json +++ b/fedora-22-i386.json @@ -101,6 +101,25 @@ "ssh_wait_timeout": "10000s", "type": "parallels-iso", "vm_name": "{{ user `template` }}" + }, + { + "boot_command": [ + "<tab> linux ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-qemu", + "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "qemu", + "vm_name": "{{ user `template` }}" } ], "post-processors": [ diff --git a/fedora-22-x86_64.json b/fedora-22-x86_64.json index 9b7f68dc2..19c2e58df 100644 --- a/fedora-22-x86_64.json +++ b/fedora-22-x86_64.json @@ -100,6 +100,25 @@ "ssh_wait_timeout": "10000s", "type": "parallels-iso", "vm_name": "{{ user `template` }}" + }, + { + "boot_command": [ + "<tab> linux ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-qemu", + "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "qemu", + "vm_name": "{{ user `template` }}" } ], "post-processors": [ diff --git a/freebsd-10.2-amd64.json b/freebsd-10.2-amd64.json index 858ade6b4..51741705c 100644 --- a/freebsd-10.2-amd64.json +++ b/freebsd-10.2-amd64.json @@ -144,6 +144,33 @@ "ssh_wait_timeout": "10000s", "type": "parallels-iso", "vm_name": "{{ user `template` }}" + }, + { + "boot_command": [ + "<esc><wait>", + "boot -s<wait>", + "<enter><wait>", + "<wait10><wait10>", + "/bin/sh<enter><wait>", + "mdmfs -s 100m md1 /tmp<enter><wait>", + "mdmfs -s 100m md2 /mnt<enter><wait>", + "dhclient -l /tmp/dhclient.lease.vtnet0 vtnet0<enter><wait>", + "fetch -o /tmp/install.sh http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} && chmod +x /tmp/install.sh && /tmp/install.sh {{ .Name }} vtnet0<enter><wait>" + ], + "boot_wait": "7s", + "disk_size": 10140, + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-qemu", + "shutdown_command": "su -m root -c 'shutdown -p now'", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "qemu", + "vm_name": "{{ user `template` }}" } ], "post-processors": [ diff --git a/freebsd-10.2-i386.json b/freebsd-10.2-i386.json index 30d6e7974..fbbe73571 100644 --- a/freebsd-10.2-i386.json +++ b/freebsd-10.2-i386.json @@ -144,6 +144,33 @@ "ssh_wait_timeout": "10000s", "type": "parallels-iso", "vm_name": "{{ user `template` }}" + }, + { + "boot_command": [ + "<esc><wait>", + "boot -s<wait>", + "<enter><wait>", + "<wait10><wait10>", + "/bin/sh<enter><wait>", + "mdmfs -s 100m md1 /tmp<enter><wait>", + "mdmfs -s 100m md2 /mnt<enter><wait>", + "dhclient -l /tmp/dhclient.lease.vtnet0 vtnet0<enter><wait>", + "fetch -o /tmp/install.sh http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} && chmod +x /tmp/install.sh && /tmp/install.sh {{ .Name }}<enter><wait>" + ], + "boot_wait": "7s", + "disk_size": 10140, + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-qemu", + "shutdown_command": "su -m root -c 'shutdown -p now'", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "qemu", + "vm_name": "{{ user `template` }}" } ], "post-processors": [ diff --git a/freebsd-9.3-amd64.json b/freebsd-9.3-amd64.json index 25243efee..223c79387 100644 --- a/freebsd-9.3-amd64.json +++ b/freebsd-9.3-amd64.json @@ -156,6 +156,37 @@ "ssh_wait_timeout": "10000s", "type": "parallels-iso", "vm_name": "{{ user `template` }}" + }, + { + "boot_command": [ + "<esc><wait>", + "load geom_mbr<wait>", + "<enter><wait>", + "load zfs<wait>", + "<enter><wait>", + "boot -s<wait>", + "<enter><wait>", + "<wait10><wait10>", + "/bin/sh<enter><wait>", + "mdmfs -s 100m md1 /tmp<enter><wait>", + "mdmfs -s 100m md2 /mnt<enter><wait>", + "dhclient -l /tmp/dhclient.lease.vtnet0 vtnet0<enter><wait>", + "fetch -o /tmp/install.sh http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} && chmod +x /tmp/install.sh && /tmp/install.sh {{ .Name }}<enter><wait>" + ], + "boot_wait": "7s", + "disk_size": 10140, + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-qemu", + "shutdown_command": "su -m root -c 'shutdown -p now'", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "qemu", + "vm_name": "{{ user `template` }}" } ], "post-processors": [ diff --git a/freebsd-9.3-i386.json b/freebsd-9.3-i386.json index 67fb71caa..59bba6fbc 100644 --- a/freebsd-9.3-i386.json +++ b/freebsd-9.3-i386.json @@ -156,6 +156,37 @@ "ssh_wait_timeout": "10000s", "type": "parallels-iso", "vm_name": "{{ user `template` }}" + }, + { + "boot_command": [ + "<esc><wait>", + "load geom_mbr<wait>", + "<enter><wait>", + "load zfs<wait>", + "<enter><wait>", + "boot -s<wait>", + "<enter><wait>", + "<wait10><wait10>", + "/bin/sh<enter><wait>", + "mdmfs -s 100m md1 /tmp<enter><wait>", + "mdmfs -s 100m md2 /mnt<enter><wait>", + "dhclient -l /tmp/dhclient.lease.vtnet0 vtnet0<enter><wait>", + "fetch -o /tmp/install.sh http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} && chmod +x /tmp/install.sh && /tmp/install.sh {{ .Name }}<enter><wait>" + ], + "boot_wait": "7s", + "disk_size": 10140, + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-qemu", + "shutdown_command": "su -m root -c 'shutdown -p now'", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "qemu", + "vm_name": "{{ user `template` }}" } ], "post-processors": [ diff --git a/http/centos-5.11/ks.cfg b/http/centos-5.11/ks.cfg index d21167f60..6fe9828ab 100644 --- a/http/centos-5.11/ks.cfg +++ b/http/centos-5.11/ks.cfg @@ -17,6 +17,7 @@ autopart firstboot --disabled reboot user --name=vagrant --password vagrant +key --skip %packages --nobase --ignoremissing --excludedocs # vagrant needs this to copy initial files via scp diff --git a/http/centos-6.7/ks.cfg b/http/centos-6.7/ks.cfg index f6da105d7..eb559dbb3 100644 --- a/http/centos-6.7/ks.cfg +++ b/http/centos-6.7/ks.cfg @@ -18,6 +18,7 @@ auth --enableshadow --passalgo=sha512 --kickstart firstboot --disabled reboot user --name=vagrant --plaintext --password vagrant +key --skip %packages --nobase --ignoremissing --excludedocs # vagrant needs this to copy initial files via scp diff --git a/http/freebsd-10.2/install.sh b/http/freebsd-10.2/install.sh index 4e9c4b5c4..aab273fe8 100644 --- a/http/freebsd-10.2/install.sh +++ b/http/freebsd-10.2/install.sh @@ -11,8 +11,13 @@ NAME=$1 # for variations in the root disk device name between VMware and Virtualbox if [ -e /dev/ada0 ]; then DISKSLICE=ada0 -else +elif [ -e /dev/da0 ]; then DISKSLICE=da0 +elif [ -e /dev/vtbd0 ]; then + DISKSLICE=vtbd0 +else + echo "Unknown disk for install.sh to work with!" + exit -1 fi gpart create -s gpt $DISKSLICE @@ -65,11 +70,12 @@ cp /tmp/zpool.cache /mnt/zroot/boot/zfs/zpool.cache zfs set readonly=on zroot/var/empty +ifdev=`ifconfig | grep '^[a-z]' | cut -d: -f1 | head -n 1` # Enable required services cat >> /mnt/zroot/etc/rc.conf << EOT zfs_enable="YES" hostname="${NAME}" -ifconfig_em0="dhcp" +ifconfig_${ifdev}="dhcp" sshd_enable="YES" EOT diff --git a/http/freebsd-9.3/install.sh b/http/freebsd-9.3/install.sh index 4e9c4b5c4..aab273fe8 100644 --- a/http/freebsd-9.3/install.sh +++ b/http/freebsd-9.3/install.sh @@ -11,8 +11,13 @@ NAME=$1 # for variations in the root disk device name between VMware and Virtualbox if [ -e /dev/ada0 ]; then DISKSLICE=ada0 -else +elif [ -e /dev/da0 ]; then DISKSLICE=da0 +elif [ -e /dev/vtbd0 ]; then + DISKSLICE=vtbd0 +else + echo "Unknown disk for install.sh to work with!" + exit -1 fi gpart create -s gpt $DISKSLICE @@ -65,11 +70,12 @@ cp /tmp/zpool.cache /mnt/zroot/boot/zfs/zpool.cache zfs set readonly=on zroot/var/empty +ifdev=`ifconfig | grep '^[a-z]' | cut -d: -f1 | head -n 1` # Enable required services cat >> /mnt/zroot/etc/rc.conf << EOT zfs_enable="YES" hostname="${NAME}" -ifconfig_em0="dhcp" +ifconfig_${ifdev}="dhcp" sshd_enable="YES" EOT diff --git a/http/opensuse-13.2/autoinst.xml b/http/opensuse-13.2/autoinst.xml index 1f16ef216..725f36257 100644 --- a/http/opensuse-13.2/autoinst.xml +++ b/http/opensuse-13.2/autoinst.xml @@ -42,7 +42,6 @@ </timezone> <partitioning config:type="list"> <drive> - <device>/dev/sda</device> <initialize config:type="boolean">true</initialize> <partitions config:type="list"> <partition> diff --git a/opensuse-13.2-i386.json b/opensuse-13.2-i386.json index 5111de35c..61ee31402 100644 --- a/opensuse-13.2-i386.json +++ b/opensuse-13.2-i386.json @@ -112,6 +112,29 @@ "ssh_wait_timeout": "10000s", "type": "parallels-iso", "vm_name": "{{ user `template` }}" + }, + { + "boot_command": [ + "<esc><enter><wait>", + "linux netsetup=dhcp netdevice=eth0 install=cd:/<wait>", + " lang=en_US autoyast=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `autoinst_cfg`}}<wait>", + " textmode=1<wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 20480, + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-qemu", + "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "qemu", + "vm_name": "{{ user `template` }}" } ], "post-processors": [ diff --git a/opensuse-13.2-x86_64.json b/opensuse-13.2-x86_64.json index d30aa6924..98cb94d57 100644 --- a/opensuse-13.2-x86_64.json +++ b/opensuse-13.2-x86_64.json @@ -112,6 +112,29 @@ "ssh_wait_timeout": "10000s", "type": "parallels-iso", "vm_name": "{{ user `template` }}" + }, + { + "boot_command": [ + "<esc><enter><wait>", + "linux netsetup=dhcp netdevice=eth0 install=cd:/<wait>", + " lang=en_US autoyast=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `autoinst_cfg`}}<wait>", + " textmode=1<wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 20480, + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-qemu", + "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "qemu", + "vm_name": "{{ user `template` }}" } ], "post-processors": [ diff --git a/oracle-5.11-i386.json b/oracle-5.11-i386.json index b42d10218..e48fe6d45 100644 --- a/oracle-5.11-i386.json +++ b/oracle-5.11-i386.json @@ -100,6 +100,25 @@ "ssh_wait_timeout": "10000s", "type": "parallels-iso", "vm_name": "{{ user `template` }}" + }, + { + "boot_command": [ + "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/centos-5.11/ks.cfg<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "http_directory": "http", + "iso_checksum": "f4ef2b868a0cccb736664136eca798ec", + "iso_checksum_type": "md5", + "iso_url": "{{user `mirror`}}/Enterprise-R5-U11-Server-i386-dvd.iso", + "output_directory": "packer-{{user `template`}}-qemu", + "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "qemu", + "vm_name": "{{ user `template` }}" } ], "post-processors": [ diff --git a/oracle-5.11-x86_64.json b/oracle-5.11-x86_64.json index 0678dfd32..058dc82ff 100644 --- a/oracle-5.11-x86_64.json +++ b/oracle-5.11-x86_64.json @@ -100,6 +100,25 @@ "ssh_wait_timeout": "10000s", "type": "parallels-iso", "vm_name": "{{ user `template` }}" + }, + { + "boot_command": [ + "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/centos-5.11/ks.cfg<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "http_directory": "http", + "iso_checksum": "8af2121088c7e6f5ebdb6d5900403240", + "iso_checksum_type": "md5", + "iso_url": "{{user `mirror`}}/Enterprise-R5-U11-Server-x86_64-dvd.iso", + "output_directory": "packer-{{user `template`}}-qemu", + "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "qemu", + "vm_name": "{{ user `template` }}" } ], "post-processors": [ diff --git a/oracle-6.6-i386.json b/oracle-6.6-i386.json index 27269469a..e329e4b3d 100644 --- a/oracle-6.6-i386.json +++ b/oracle-6.6-i386.json @@ -100,6 +100,25 @@ "ssh_wait_timeout": "10000s", "type": "parallels-iso", "vm_name": "{{ user `template` }}" + }, + { + "boot_command": [ + "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/centos-6.6/ks.cfg<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "http_directory": "http", + "iso_checksum": "81f0c85217f40763dea5053ec5594e4958498bbc", + "iso_checksum_type": "sha1", + "iso_url": "{{user `mirror`}}/OracleLinux-R6-U6-Server-i386-dvd.iso", + "output_directory": "packer-{{user `template`}}-qemu", + "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "qemu", + "vm_name": "{{ user `template` }}" } ], "post-processors": [ diff --git a/oracle-6.6-x86_64.json b/oracle-6.6-x86_64.json index 587565ac1..5be4bb6f8 100644 --- a/oracle-6.6-x86_64.json +++ b/oracle-6.6-x86_64.json @@ -100,6 +100,25 @@ "ssh_wait_timeout": "10000s", "type": "parallels-iso", "vm_name": "{{ user `template` }}" + }, + { + "boot_command": [ + "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/centos-6.6/ks.cfg<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "http_directory": "http", + "iso_checksum": "5738f10a506d3630edfd297ef179b553091c6a48", + "iso_checksum_type": "sha1", + "iso_url": "{{user `mirror`}}/OracleLinux-R6-U6-Server-x86_64-dvd.iso", + "output_directory": "packer-{{user `template`}}-qemu", + "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "qemu", + "vm_name": "{{ user `template` }}" } ], "post-processors": [ diff --git a/rhel-5.11-i386.json b/rhel-5.11-i386.json index a474bf103..76ced93c2 100644 --- a/rhel-5.11-i386.json +++ b/rhel-5.11-i386.json @@ -100,6 +100,25 @@ "ssh_wait_timeout": "10000s", "type": "parallels-iso", "vm_name": "{{ user `template` }}" + }, + { + "boot_command": [ + "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/centos-5.11/ks.cfg<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "http_directory": "http", + "iso_checksum": "4e38e4ed06d83efb10446e7db19d96761715cdbdbf0bbfacb978b44ce368bbe2", + "iso_checksum_type": "sha256", + "iso_url": "{{user `mirror`}}/rhel-server-5.11-i386-dvd.iso", + "output_directory": "packer-{{user `template`}}-qemu", + "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "qemu", + "vm_name": "{{ user `template` }}" } ], "post-processors": [ diff --git a/rhel-5.11-x86_64.json b/rhel-5.11-x86_64.json index 4a889f343..d710fb684 100644 --- a/rhel-5.11-x86_64.json +++ b/rhel-5.11-x86_64.json @@ -100,6 +100,25 @@ "ssh_wait_timeout": "10000s", "type": "parallels-iso", "vm_name": "{{ user `template` }}" + }, + { + "boot_command": [ + "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/centos-5.11/ks.cfg<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "http_directory": "http", + "iso_checksum": "36565fe0c8a97207d63234d10123daeedb29d509576dbd7b34e71958ac2f9050", + "iso_checksum_type": "sha256", + "iso_url": "{{user `mirror`}}/rhel-server-5.11-x86_64-dvd.iso", + "output_directory": "packer-{{user `template`}}-qemu", + "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "qemu", + "vm_name": "{{ user `template` }}" } ], "post-processors": [ diff --git a/rhel-6.6-i386.json b/rhel-6.6-i386.json index f22415397..8cdf39b76 100644 --- a/rhel-6.6-i386.json +++ b/rhel-6.6-i386.json @@ -100,6 +100,25 @@ "ssh_wait_timeout": "10000s", "type": "parallels-iso", "vm_name": "{{ user `template` }}" + }, + { + "boot_command": [ + "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/centos-6.6/ks.cfg<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "http_directory": "http", + "iso_checksum": "0a14ed1f7d7ea7b831739ed8e71719d9cb7c294bf801e8db39358651768547ad", + "iso_checksum_type": "sha256", + "iso_url": "{{user `mirror`}}/rhel-server-6.6-i386-dvd.iso", + "output_directory": "packer-{{user `template`}}-qemu", + "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "qemu", + "vm_name": "{{ user `template` }}" } ], "post-processors": [ diff --git a/rhel-6.6-x86_64.json b/rhel-6.6-x86_64.json index 0624c13fc..337cb5fce 100644 --- a/rhel-6.6-x86_64.json +++ b/rhel-6.6-x86_64.json @@ -100,6 +100,25 @@ "ssh_wait_timeout": "10000s", "type": "parallels-iso", "vm_name": "{{ user `template` }}" + }, + { + "boot_command": [ + "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/centos-6.6/ks.cfg<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "http_directory": "http", + "iso_checksum": "16044cb7264f4bc0150f5b6f3f66936ccf2d36e0a4152c00d9236fb7dcae5f32", + "iso_checksum_type": "sha256", + "iso_url": "{{user `mirror`}}/rhel-server-6.6-x86_64-dvd.iso", + "output_directory": "packer-{{user `template`}}-qemu", + "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "qemu", + "vm_name": "{{ user `template` }}" } ], "post-processors": [ diff --git a/rhel-7.1-x86_64.json b/rhel-7.1-x86_64.json index fa61504c8..c996cd70c 100644 --- a/rhel-7.1-x86_64.json +++ b/rhel-7.1-x86_64.json @@ -100,6 +100,25 @@ "ssh_wait_timeout": "10000s", "type": "parallels-iso", "vm_name": "{{ user `template` }}" + }, + { + "boot_command": [ + "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/centos-7.1/ks.cfg<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "http_directory": "http", + "iso_checksum": "3685468ec6cdcb70dfc85ebbc164da427dc2d762644c3c2ee1520f4f661c15ce", + "iso_checksum_type": "sha256", + "iso_url": "{{user `mirror`}}/rhel-server-7.1-x86_64-dvd.iso", + "output_directory": "packer-{{user `template`}}-qemu", + "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "qemu", + "vm_name": "{{ user `template` }}" } ], "post-processors": [ diff --git a/scripts/common/minimize.sh b/scripts/common/minimize.sh index e425a539d..379e0f5de 100644 --- a/scripts/common/minimize.sh +++ b/scripts/common/minimize.sh @@ -1,5 +1,9 @@ #!/bin/sh -eux +case "$PACKER_BUILDER_TYPE" in + qemu) exit 0 ;; +esac + swapuuid="`/sbin/blkid -o value -l -s UUID -t TYPE=swap`"; if [ "x${swapuuid}" != "x" ]; then diff --git a/scripts/common/vmtools.sh b/scripts/common/vmtools.sh index 48d3a658d..ad1d47afc 100644 --- a/scripts/common/vmtools.sh +++ b/scripts/common/vmtools.sh @@ -43,6 +43,10 @@ parallels-iso|parallels-pvm) rm -f $HOME_DIR/*.iso; ;; +qemu) + echo "Don't need anything for this one" + ;; + *) echo "Unknown Packer Builder Type >>$PACKER_BUILDER_TYPE<< selected."; echo "Known are virtualbox-iso|virtualbox-ovf|vmware-iso|vmware-vmx|parallels-iso|parallels-pvm."; diff --git a/scripts/freebsd/minimize.sh b/scripts/freebsd/minimize.sh index 670aca7ac..4192113ba 100644 --- a/scripts/freebsd/minimize.sh +++ b/scripts/freebsd/minimize.sh @@ -1,5 +1,9 @@ #!/bin/sh -eux +case "$PACKER_BUILDER_TYPE" in + qemu) exit 0 ;; +esac + dd if=/dev/zero of=/EMPTY bs=1M || echo "dd exit code $? is suppressed"; rm -f /EMPTY; # Block until the empty file has been removed, otherwise, Packer diff --git a/sles-11-sp2-i386.json b/sles-11-sp2-i386.json index e4d50ce96..e8253caf8 100644 --- a/sles-11-sp2-i386.json +++ b/sles-11-sp2-i386.json @@ -112,6 +112,29 @@ "ssh_wait_timeout": "10000s", "type": "parallels-iso", "vm_name": "{{ user `template` }}" + }, + { + "boot_command": [ + "<esc><enter><wait>", + "linux netdevice=eth0 netsetup=dhcp install=cd:/<wait>", + " lang=en_US autoyast=http://{{ .HTTPIP }}:{{ .HTTPPort }}/sles-11/sles-11-sp2-i386-autoinst.xml<wait>", + " textmode=1<wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 20480, + "http_directory": "http", + "iso_checksum": "a0b34f6237b2b2a6b2174c82b40ed326", + "iso_checksum_type": "md5", + "iso_url": "{{user `mirror`}}/SLES-11-SP2-DVD-i586-GM-DVD1.iso", + "output_directory": "packer-sles-11-sp2-i386-qemu", + "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "qemu", + "vm_name": "{{ user `template` }}" } ], "post-processors": [ diff --git a/sles-11-sp2-x86_64.json b/sles-11-sp2-x86_64.json index 0dc886984..664b4d813 100644 --- a/sles-11-sp2-x86_64.json +++ b/sles-11-sp2-x86_64.json @@ -112,6 +112,29 @@ "ssh_wait_timeout": "10000s", "type": "parallels-iso", "vm_name": "{{ user `template` }}" + }, + { + "boot_command": [ + "<esc><enter><wait>", + "linux netdevice=eth0 netsetup=dhcp install=cd:/<wait>", + " lang=en_US autoyast=http://{{ .HTTPIP }}:{{ .HTTPPort }}/sles-11/sles-11-sp2-x86_64-autoinst.xml<wait>", + " textmode=1<wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 20480, + "http_directory": "http", + "iso_checksum": "461d82ae6e15062b0807c1338f040497", + "iso_checksum_type": "md5", + "iso_url": "{{user `mirror`}}/SLES-11-SP2-DVD-x86_64-GM-DVD1.iso", + "output_directory": "packer-sles-11-sp2-x86_64-qemu", + "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "qemu", + "vm_name": "{{ user `template` }}" } ], "post-processors": [ diff --git a/sles-11-sp3-i386.json b/sles-11-sp3-i386.json index 0a1b66229..bd9349c6b 100644 --- a/sles-11-sp3-i386.json +++ b/sles-11-sp3-i386.json @@ -112,6 +112,29 @@ "ssh_wait_timeout": "10000s", "type": "parallels-iso", "vm_name": "{{ user `template` }}" + }, + { + "boot_command": [ + "<esc><enter><wait>", + "linux netdevice=eth0 netsetup=dhcp install=cd:/<wait>", + " lang=en_US autoyast=http://{{ .HTTPIP }}:{{ .HTTPPort }}/sles-11/sles-11-sp3-i386-autoinst.xml<wait>", + " textmode=1<wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 20480, + "http_directory": "http", + "iso_checksum": "5c30a409fc8fb3343b4dc90d93ff2c89", + "iso_checksum_type": "md5", + "iso_url": "{{user `mirror`}}/SLES-11-SP3-DVD-i586-GM-DVD1.iso", + "output_directory": "packer-sles-11-sp3-i386-qemu", + "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "qemu", + "vm_name": "{{ user `template` }}" } ], "post-processors": [ diff --git a/sles-11-sp3-x86_64.json b/sles-11-sp3-x86_64.json index ad8dc1e11..faa6fb24f 100644 --- a/sles-11-sp3-x86_64.json +++ b/sles-11-sp3-x86_64.json @@ -112,6 +112,29 @@ "ssh_wait_timeout": "10000s", "type": "parallels-iso", "vm_name": "{{ user `template` }}" + }, + { + "boot_command": [ + "<esc><enter><wait>", + "linux netdevice=eth0 netsetup=dhcp install=cd:/<wait>", + " lang=en_US autoyast=http://{{ .HTTPIP }}:{{ .HTTPPort }}/sles-11/sles-11-sp3-x86_64-autoinst.xml<wait>", + " textmode=1<wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 20480, + "http_directory": "http", + "iso_checksum": "480b70d50cbb538382dc2b9325221e1b", + "iso_checksum_type": "md5", + "iso_url": "{{user `mirror`}}/SLES-11-SP3-DVD-x86_64-GM-DVD1.iso", + "output_directory": "packer-sles-11-sp3-x86_64-qemu", + "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "qemu", + "vm_name": "{{ user `template` }}" } ], "post-processors": [ diff --git a/sles-12-x86_64.json b/sles-12-x86_64.json index 2bd7919d6..688e76130 100644 --- a/sles-12-x86_64.json +++ b/sles-12-x86_64.json @@ -112,6 +112,29 @@ "ssh_wait_timeout": "10000s", "type": "parallels-iso", "vm_name": "{{ user `template` }}" + }, + { + "boot_command": [ + "<esc><enter><wait>", + "linux netdevice=eth0 netsetup=dhcp install=cd:/<wait>", + " lang=en_US autoyast=http://{{ .HTTPIP }}:{{ .HTTPPort }}/sles-12/sles-12-x86_64-autoinst.xml<wait>", + " textmode=1<wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 20480, + "http_directory": "http", + "iso_checksum": "58086fca0441b1d44c7a51c5ee64e1bd4365466fcee48ec92c4f39d07739aeed", + "iso_checksum_type": "sha256", + "iso_url": "{{user `mirror`}}/SLE-12-Server-DVD-x86_64-GM-DVD1.iso", + "output_directory": "packer-sles-12-x86_64-qemu", + "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "qemu", + "vm_name": "{{ user `template` }}" } ], "post-processors": [ diff --git a/ubuntu-10.04-amd64.json b/ubuntu-10.04-amd64.json index 631612a5c..2a25f4dc1 100644 --- a/ubuntu-10.04-amd64.json +++ b/ubuntu-10.04-amd64.json @@ -163,6 +163,46 @@ "ssh_wait_timeout": "10000s", "type": "parallels-iso", "vm_name": "{{ user `template` }}" + }, + { + "boot_command": [ + "<esc><wait>", + "<esc><wait>", + "<enter><wait>", + "/install/vmlinuz<wait>", + " auto<wait>", + " console-setup/ask_detect=false<wait>", + " console-setup/layoutcode=us<wait>", + " console-setup/modelcode=pc105<wait>", + " debconf/frontend=noninteractive<wait>", + " debian-installer=en_US<wait>", + " fb=false<wait>", + " initrd=/install/initrd.gz<wait>", + " kbd-chooser/method=us<wait>", + " keyboard-configuration/layout=USA<wait>", + " keyboard-configuration/variant=USA<wait>", + " locale=en_US<wait>", + " netcfg/get_domain=vm<wait>", + " netcfg/get_hostname=vagrant<wait>", + " noapic<wait>", + " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}}<wait>", + " -- <wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-qemu", + "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "qemu", + "vm_name": "{{ user `template` }}" } ], "post-processors": [ diff --git a/ubuntu-10.04-i386.json b/ubuntu-10.04-i386.json index 27bf6922b..bdc85d83a 100644 --- a/ubuntu-10.04-i386.json +++ b/ubuntu-10.04-i386.json @@ -163,6 +163,46 @@ "ssh_wait_timeout": "10000s", "type": "parallels-iso", "vm_name": "{{ user `template` }}" + }, + { + "boot_command": [ + "<esc><wait>", + "<esc><wait>", + "<enter><wait>", + "/install/vmlinuz<wait>", + " auto<wait>", + " console-setup/ask_detect=false<wait>", + " console-setup/layoutcode=us<wait>", + " console-setup/modelcode=pc105<wait>", + " debconf/frontend=noninteractive<wait>", + " debian-installer=en_US<wait>", + " fb=false<wait>", + " initrd=/install/initrd.gz<wait>", + " kbd-chooser/method=us<wait>", + " keyboard-configuration/layout=USA<wait>", + " keyboard-configuration/variant=USA<wait>", + " locale=en_US<wait>", + " netcfg/get_domain=vm<wait>", + " netcfg/get_hostname=vagrant<wait>", + " noapic<wait>", + " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}}<wait>", + " -- <wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-qemu", + "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "qemu", + "vm_name": "{{ user `template` }}" } ], "post-processors": [ diff --git a/ubuntu-12.04-amd64.json b/ubuntu-12.04-amd64.json index 9fb8fb195..93b15ea87 100644 --- a/ubuntu-12.04-amd64.json +++ b/ubuntu-12.04-amd64.json @@ -163,6 +163,46 @@ "ssh_wait_timeout": "10000s", "type": "parallels-iso", "vm_name": "{{ user `template` }}" + }, + { + "boot_command": [ + "<esc><wait>", + "<esc><wait>", + "<enter><wait>", + "/install/vmlinuz<wait>", + " auto<wait>", + " console-setup/ask_detect=false<wait>", + " console-setup/layoutcode=us<wait>", + " console-setup/modelcode=pc105<wait>", + " debconf/frontend=noninteractive<wait>", + " debian-installer=en_US<wait>", + " fb=false<wait>", + " initrd=/install/initrd.gz<wait>", + " kbd-chooser/method=us<wait>", + " keyboard-configuration/layout=USA<wait>", + " keyboard-configuration/variant=USA<wait>", + " locale=en_US<wait>", + " netcfg/get_domain=vm<wait>", + " netcfg/get_hostname=vagrant<wait>", + " noapic<wait>", + " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}}<wait>", + " -- <wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-qemu", + "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "qemu", + "vm_name": "{{ user `template` }}" } ], "post-processors": [ diff --git a/ubuntu-12.04-i386.json b/ubuntu-12.04-i386.json index 66854c89d..d03964284 100644 --- a/ubuntu-12.04-i386.json +++ b/ubuntu-12.04-i386.json @@ -163,6 +163,46 @@ "ssh_wait_timeout": "10000s", "type": "parallels-iso", "vm_name": "{{ user `template` }}" + }, + { + "boot_command": [ + "<esc><wait>", + "<esc><wait>", + "<enter><wait>", + "/install/vmlinuz<wait>", + " auto<wait>", + " console-setup/ask_detect=false<wait>", + " console-setup/layoutcode=us<wait>", + " console-setup/modelcode=pc105<wait>", + " debconf/frontend=noninteractive<wait>", + " debian-installer=en_US<wait>", + " fb=false<wait>", + " initrd=/install/initrd.gz<wait>", + " kbd-chooser/method=us<wait>", + " keyboard-configuration/layout=USA<wait>", + " keyboard-configuration/variant=USA<wait>", + " locale=en_US<wait>", + " netcfg/get_domain=vm<wait>", + " netcfg/get_hostname=vagrant<wait>", + " noapic<wait>", + " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}}<wait>", + " -- <wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-qemu", + "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "qemu", + "vm_name": "{{ user `template` }}" } ], "post-processors": [ diff --git a/ubuntu-14.04-amd64.json b/ubuntu-14.04-amd64.json index 1855729cf..097a2f351 100644 --- a/ubuntu-14.04-amd64.json +++ b/ubuntu-14.04-amd64.json @@ -163,6 +163,46 @@ "ssh_wait_timeout": "10000s", "type": "parallels-iso", "vm_name": "{{ user `template` }}" + }, + { + "boot_command": [ + "<esc><wait>", + "<esc><wait>", + "<enter><wait>", + "/install/vmlinuz<wait>", + " auto<wait>", + " console-setup/ask_detect=false<wait>", + " console-setup/layoutcode=us<wait>", + " console-setup/modelcode=pc105<wait>", + " debconf/frontend=noninteractive<wait>", + " debian-installer=en_US<wait>", + " fb=false<wait>", + " initrd=/install/initrd.gz<wait>", + " kbd-chooser/method=us<wait>", + " keyboard-configuration/layout=USA<wait>", + " keyboard-configuration/variant=USA<wait>", + " locale=en_US<wait>", + " netcfg/get_domain=vm<wait>", + " netcfg/get_hostname=vagrant<wait>", + " noapic<wait>", + " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}}<wait>", + " -- <wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-qemu", + "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "qemu", + "vm_name": "{{ user `template` }}" } ], "post-processors": [ diff --git a/ubuntu-14.04-i386.json b/ubuntu-14.04-i386.json index 8811c9ec8..b33d6e0ea 100644 --- a/ubuntu-14.04-i386.json +++ b/ubuntu-14.04-i386.json @@ -163,6 +163,46 @@ "ssh_wait_timeout": "10000s", "type": "parallels-iso", "vm_name": "{{ user `template` }}" + }, + { + "boot_command": [ + "<esc><wait>", + "<esc><wait>", + "<enter><wait>", + "/install/vmlinuz<wait>", + " auto<wait>", + " console-setup/ask_detect=false<wait>", + " console-setup/layoutcode=us<wait>", + " console-setup/modelcode=pc105<wait>", + " debconf/frontend=noninteractive<wait>", + " debian-installer=en_US<wait>", + " fb=false<wait>", + " initrd=/install/initrd.gz<wait>", + " kbd-chooser/method=us<wait>", + " keyboard-configuration/layout=USA<wait>", + " keyboard-configuration/variant=USA<wait>", + " locale=en_US<wait>", + " netcfg/get_domain=vm<wait>", + " netcfg/get_hostname=vagrant<wait>", + " noapic<wait>", + " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}}<wait>", + " -- <wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-qemu", + "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "qemu", + "vm_name": "{{ user `template` }}" } ], "post-processors": [ diff --git a/ubuntu-14.10-amd64.json b/ubuntu-14.10-amd64.json index 01856dcb3..93e2b7b6e 100644 --- a/ubuntu-14.10-amd64.json +++ b/ubuntu-14.10-amd64.json @@ -163,6 +163,46 @@ "ssh_wait_timeout": "10000s", "type": "parallels-iso", "vm_name": "{{ user `template` }}" + }, + { + "boot_command": [ + "<esc><wait>", + "<esc><wait>", + "<enter><wait>", + "/install/vmlinuz<wait>", + " auto<wait>", + " console-setup/ask_detect=false<wait>", + " console-setup/layoutcode=us<wait>", + " console-setup/modelcode=pc105<wait>", + " debconf/frontend=noninteractive<wait>", + " debian-installer=en_US<wait>", + " fb=false<wait>", + " initrd=/install/initrd.gz<wait>", + " kbd-chooser/method=us<wait>", + " keyboard-configuration/layout=USA<wait>", + " keyboard-configuration/variant=USA<wait>", + " locale=en_US<wait>", + " netcfg/get_domain=vm<wait>", + " netcfg/get_hostname=vagrant<wait>", + " noapic<wait>", + " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}}<wait>", + " -- <wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-qemu", + "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "qemu", + "vm_name": "{{ user `template` }}" } ], "post-processors": [ diff --git a/ubuntu-14.10-i386.json b/ubuntu-14.10-i386.json index 45ea510d1..94fdb898a 100644 --- a/ubuntu-14.10-i386.json +++ b/ubuntu-14.10-i386.json @@ -163,6 +163,46 @@ "ssh_wait_timeout": "10000s", "type": "parallels-iso", "vm_name": "{{ user `template` }}" + }, + { + "boot_command": [ + "<esc><wait>", + "<esc><wait>", + "<enter><wait>", + "/install/vmlinuz<wait>", + " auto<wait>", + " console-setup/ask_detect=false<wait>", + " console-setup/layoutcode=us<wait>", + " console-setup/modelcode=pc105<wait>", + " debconf/frontend=noninteractive<wait>", + " debian-installer=en_US<wait>", + " fb=false<wait>", + " initrd=/install/initrd.gz<wait>", + " kbd-chooser/method=us<wait>", + " keyboard-configuration/layout=USA<wait>", + " keyboard-configuration/variant=USA<wait>", + " locale=en_US<wait>", + " netcfg/get_domain=vm<wait>", + " netcfg/get_hostname=vagrant<wait>", + " noapic<wait>", + " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}}<wait>", + " -- <wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-qemu", + "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "qemu", + "vm_name": "{{ user `template` }}" } ], "post-processors": [ diff --git a/ubuntu-15.04-amd64.json b/ubuntu-15.04-amd64.json index 95af28f47..3887fba90 100644 --- a/ubuntu-15.04-amd64.json +++ b/ubuntu-15.04-amd64.json @@ -163,6 +163,46 @@ "ssh_wait_timeout": "10000s", "type": "parallels-iso", "vm_name": "{{ user `template` }}" + }, + { + "boot_command": [ + "<esc><wait>", + "<esc><wait>", + "<enter><wait>", + "/install/vmlinuz<wait>", + " auto<wait>", + " console-setup/ask_detect=false<wait>", + " console-setup/layoutcode=us<wait>", + " console-setup/modelcode=pc105<wait>", + " debconf/frontend=noninteractive<wait>", + " debian-installer=en_US<wait>", + " fb=false<wait>", + " initrd=/install/initrd.gz<wait>", + " kbd-chooser/method=us<wait>", + " keyboard-configuration/layout=USA<wait>", + " keyboard-configuration/variant=USA<wait>", + " locale=en_US<wait>", + " netcfg/get_domain=vm<wait>", + " netcfg/get_hostname=vagrant<wait>", + " noapic<wait>", + " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}}<wait>", + " -- <wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-qemu", + "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "qemu", + "vm_name": "{{ user `template` }}" } ], "post-processors": [ diff --git a/ubuntu-15.04-i386.json b/ubuntu-15.04-i386.json index cd7370f21..9cf648d3f 100644 --- a/ubuntu-15.04-i386.json +++ b/ubuntu-15.04-i386.json @@ -163,6 +163,46 @@ "ssh_wait_timeout": "10000s", "type": "parallels-iso", "vm_name": "{{ user `template` }}" + }, + { + "boot_command": [ + "<esc><wait>", + "<esc><wait>", + "<enter><wait>", + "/install/vmlinuz<wait>", + " auto<wait>", + " console-setup/ask_detect=false<wait>", + " console-setup/layoutcode=us<wait>", + " console-setup/modelcode=pc105<wait>", + " debconf/frontend=noninteractive<wait>", + " debian-installer=en_US<wait>", + " fb=false<wait>", + " initrd=/install/initrd.gz<wait>", + " kbd-chooser/method=us<wait>", + " keyboard-configuration/layout=USA<wait>", + " keyboard-configuration/variant=USA<wait>", + " locale=en_US<wait>", + " netcfg/get_domain=vm<wait>", + " netcfg/get_hostname=vagrant<wait>", + " noapic<wait>", + " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}}<wait>", + " -- <wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-qemu", + "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "qemu", + "vm_name": "{{ user `template` }}" } ], "post-processors": [ From 169f547c38d9439c0c6e4dd0961d7a2fe3c3fd9a Mon Sep 17 00:00:00 2001 From: David Brown <dmlb2000@gmail.com> Date: Sun, 27 Sep 2015 18:15:06 -0700 Subject: [PATCH 0414/1622] figured out how to fix the ubuntu/debian bits use virtio instead of scsi --- debian-8.1-amd64.json | 5 ++++- debian-8.1-i386.json | 5 ++++- debian-8.2-amd64.json | 5 ++++- debian-8.2-i386.json | 5 ++++- http/debian-8/preseed.cfg | 1 - http/ubuntu-15.04/preseed.cfg | 1 - ubuntu-15.04-amd64.json | 4 ++++ ubuntu-15.04-i386.json | 4 ++++ 8 files changed, 24 insertions(+), 6 deletions(-) diff --git a/debian-8.1-amd64.json b/debian-8.1-amd64.json index c2bad8d7a..afd8e28f8 100644 --- a/debian-8.1-amd64.json +++ b/debian-8.1-amd64.json @@ -16,6 +16,7 @@ "debconf/frontend=noninteractive <wait>", "console-setup/ask_detect=false <wait>", "console-keymaps-at/keymap=us <wait>", + "grub-installer/bootdev=/dev/sda <wait>", "<enter><wait>" ], "boot_wait": "10s", @@ -68,6 +69,7 @@ "debconf/frontend=noninteractive <wait>", "console-setup/ask_detect=false <wait>", "console-keymaps-at/keymap=us <wait>", + "grub-installer/bootdev=/dev/sda <wait>", "<enter><wait>" ], "boot_wait": "10s", @@ -109,6 +111,7 @@ "debconf/frontend=noninteractive <wait>", "console-setup/ask_detect=false <wait>", "console-keymaps-at/keymap=us <wait>", + "grub-installer/bootdev=/dev/sda <wait>", "<enter><wait>" ], "boot_wait": "10s", @@ -159,11 +162,11 @@ "debconf/frontend=noninteractive <wait>", "console-setup/ask_detect=false <wait>", "console-keymaps-at/keymap=us <wait>", + "grub-installer/bootdev=/dev/vda <wait>", "<enter><wait>" ], "boot_wait": "10s", "disk_size": 40960, - "disk_interface": "scsi", "http_directory": "http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", diff --git a/debian-8.1-i386.json b/debian-8.1-i386.json index 562050bc8..80d0243f2 100644 --- a/debian-8.1-i386.json +++ b/debian-8.1-i386.json @@ -16,6 +16,7 @@ "debconf/frontend=noninteractive <wait>", "console-setup/ask_detect=false <wait>", "console-keymaps-at/keymap=us <wait>", + "grub-installer/bootdev=/dev/sda <wait>", "<enter><wait>" ], "boot_wait": "10s", @@ -68,6 +69,7 @@ "debconf/frontend=noninteractive <wait>", "console-setup/ask_detect=false <wait>", "console-keymaps-at/keymap=us <wait>", + "grub-installer/bootdev=/dev/sda <wait>", "<enter><wait>" ], "boot_wait": "10s", @@ -109,6 +111,7 @@ "debconf/frontend=noninteractive <wait>", "console-setup/ask_detect=false <wait>", "console-keymaps-at/keymap=us <wait>", + "grub-installer/bootdev=/dev/sda <wait>", "<enter><wait>" ], "boot_wait": "10s", @@ -159,11 +162,11 @@ "debconf/frontend=noninteractive <wait>", "console-setup/ask_detect=false <wait>", "console-keymaps-at/keymap=us <wait>", + "grub-installer/bootdev=/dev/vda <wait>", "<enter><wait>" ], "boot_wait": "10s", "disk_size": 40960, - "disk_interface": "scsi", "http_directory": "http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", diff --git a/debian-8.2-amd64.json b/debian-8.2-amd64.json index d6a6bdb77..30f22bbd4 100644 --- a/debian-8.2-amd64.json +++ b/debian-8.2-amd64.json @@ -16,6 +16,7 @@ "debconf/frontend=noninteractive <wait>", "console-setup/ask_detect=false <wait>", "console-keymaps-at/keymap=us <wait>", + "grub-installer/bootdev=/dev/sda <wait>", "<enter><wait>" ], "boot_wait": "10s", @@ -68,6 +69,7 @@ "debconf/frontend=noninteractive <wait>", "console-setup/ask_detect=false <wait>", "console-keymaps-at/keymap=us <wait>", + "grub-installer/bootdev=/dev/sda <wait>", "<enter><wait>" ], "boot_wait": "10s", @@ -109,6 +111,7 @@ "debconf/frontend=noninteractive <wait>", "console-setup/ask_detect=false <wait>", "console-keymaps-at/keymap=us <wait>", + "grub-installer/bootdev=/dev/sda <wait>", "<enter><wait>" ], "boot_wait": "10s", @@ -159,11 +162,11 @@ "debconf/frontend=noninteractive <wait>", "console-setup/ask_detect=false <wait>", "console-keymaps-at/keymap=us <wait>", + "grub-installer/bootdev=/dev/vda <wait>", "<enter><wait>" ], "boot_wait": "10s", "disk_size": 40960, - "disk_interface": "scsi", "http_directory": "http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", diff --git a/debian-8.2-i386.json b/debian-8.2-i386.json index e4162bc6d..ab911651e 100644 --- a/debian-8.2-i386.json +++ b/debian-8.2-i386.json @@ -16,6 +16,7 @@ "debconf/frontend=noninteractive <wait>", "console-setup/ask_detect=false <wait>", "console-keymaps-at/keymap=us <wait>", + "grub-installer/bootdev=/dev/sda <wait>", "<enter><wait>" ], "boot_wait": "10s", @@ -68,6 +69,7 @@ "debconf/frontend=noninteractive <wait>", "console-setup/ask_detect=false <wait>", "console-keymaps-at/keymap=us <wait>", + "grub-installer/bootdev=/dev/sda <wait>", "<enter><wait>" ], "boot_wait": "10s", @@ -109,6 +111,7 @@ "debconf/frontend=noninteractive <wait>", "console-setup/ask_detect=false <wait>", "console-keymaps-at/keymap=us <wait>", + "grub-installer/bootdev=/dev/sda <wait>", "<enter><wait>" ], "boot_wait": "10s", @@ -159,11 +162,11 @@ "debconf/frontend=noninteractive <wait>", "console-setup/ask_detect=false <wait>", "console-keymaps-at/keymap=us <wait>", + "grub-installer/bootdev=/dev/vda <wait>", "<enter><wait>" ], "boot_wait": "10s", "disk_size": 40960, - "disk_interface": "scsi", "http_directory": "http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", diff --git a/http/debian-8/preseed.cfg b/http/debian-8/preseed.cfg index 57f271c81..e33462177 100644 --- a/http/debian-8/preseed.cfg +++ b/http/debian-8/preseed.cfg @@ -4,7 +4,6 @@ d-i base-installer/kernel/override-image string linux-server d-i clock-setup/utc boolean true d-i clock-setup/utc-auto boolean true d-i finish-install/reboot_in_progress note -d-i grub-installer/bootdev string /dev/sda d-i grub-installer/only_debian boolean true d-i grub-installer/with_other_os boolean true d-i keymap select us diff --git a/http/ubuntu-15.04/preseed.cfg b/http/ubuntu-15.04/preseed.cfg index 282e7d1fb..0a4d4939b 100644 --- a/http/ubuntu-15.04/preseed.cfg +++ b/http/ubuntu-15.04/preseed.cfg @@ -3,7 +3,6 @@ d-i base-installer/kernel/override-image string linux-server d-i clock-setup/utc boolean true d-i clock-setup/utc-auto boolean true d-i finish-install/reboot_in_progress note -d-i grub-installer/bootdev string /dev/sda d-i grub-installer/only_debian boolean true d-i grub-installer/with_other_os boolean true d-i partman-auto-lvm/guided_size string max diff --git a/ubuntu-15.04-amd64.json b/ubuntu-15.04-amd64.json index 3887fba90..ddda42369 100644 --- a/ubuntu-15.04-amd64.json +++ b/ubuntu-15.04-amd64.json @@ -20,6 +20,7 @@ " locale=en_US<wait>", " netcfg/get_domain=vm<wait>", " netcfg/get_hostname=vagrant<wait>", + " grub-installer/bootdev=/dev/sda<wait>", " noapic<wait>", " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}}<wait>", " -- <wait>", @@ -79,6 +80,7 @@ " locale=en_US<wait>", " netcfg/get_domain=vm<wait>", " netcfg/get_hostname=vagrant<wait>", + " grub-installer/bootdev=/dev/sda<wait>", " noapic<wait>", " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}}<wait>", " -- <wait>", @@ -127,6 +129,7 @@ " locale=en_US<wait>", " netcfg/get_domain=vm<wait>", " netcfg/get_hostname=vagrant<wait>", + " grub-installer/bootdev=/dev/sda<wait>", " noapic<wait>", " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}}<wait>", " -- <wait>", @@ -184,6 +187,7 @@ " locale=en_US<wait>", " netcfg/get_domain=vm<wait>", " netcfg/get_hostname=vagrant<wait>", + " grub-installer/bootdev=/dev/vda<wait>", " noapic<wait>", " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}}<wait>", " -- <wait>", diff --git a/ubuntu-15.04-i386.json b/ubuntu-15.04-i386.json index 9cf648d3f..32b073765 100644 --- a/ubuntu-15.04-i386.json +++ b/ubuntu-15.04-i386.json @@ -20,6 +20,7 @@ " locale=en_US<wait>", " netcfg/get_domain=vm<wait>", " netcfg/get_hostname=vagrant<wait>", + " grub-installer/bootdev=/dev/sda <wait>", " noapic<wait>", " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}}<wait>", " -- <wait>", @@ -79,6 +80,7 @@ " locale=en_US<wait>", " netcfg/get_domain=vm<wait>", " netcfg/get_hostname=vagrant<wait>", + " grub-installer/bootdev=/dev/sda <wait>", " noapic<wait>", " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}}<wait>", " -- <wait>", @@ -127,6 +129,7 @@ " locale=en_US<wait>", " netcfg/get_domain=vm<wait>", " netcfg/get_hostname=vagrant<wait>", + " grub-installer/bootdev=/dev/sda <wait>", " noapic<wait>", " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}}<wait>", " -- <wait>", @@ -184,6 +187,7 @@ " locale=en_US<wait>", " netcfg/get_domain=vm<wait>", " netcfg/get_hostname=vagrant<wait>", + " grub-installer/bootdev=/dev/vda <wait>", " noapic<wait>", " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}}<wait>", " -- <wait>", From 3dd65ec23b3c3281611050fe0bd544d2a28107a9 Mon Sep 17 00:00:00 2001 From: Matt Wrock <matt@mattwrock.com> Date: Tue, 29 Sep 2015 15:26:17 -0700 Subject: [PATCH 0415/1622] initial windows nano commit --- scripts/windows/Autounattend.xml | 158 ++++++++++++++++++++++++++++++ scripts/windows/SetupComplete.cmd | 5 + scripts/windows/nano_cleanup.ps1 | 37 +++++++ scripts/windows/nano_create.ps1 | 39 ++++++++ scripts/windows/postunattend.xml | 49 +++++++++ windows-nano-tp3.json | 51 ++++++++++ 6 files changed, 339 insertions(+) create mode 100644 scripts/windows/Autounattend.xml create mode 100644 scripts/windows/SetupComplete.cmd create mode 100644 scripts/windows/nano_cleanup.ps1 create mode 100644 scripts/windows/nano_create.ps1 create mode 100644 scripts/windows/postunattend.xml create mode 100644 windows-nano-tp3.json diff --git a/scripts/windows/Autounattend.xml b/scripts/windows/Autounattend.xml new file mode 100644 index 000000000..044f1af44 --- /dev/null +++ b/scripts/windows/Autounattend.xml @@ -0,0 +1,158 @@ +<?xml version="1.0" encoding="utf-8"?> +<unattend xmlns="urn:schemas-microsoft-com:unattend"> + <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-International-Core-WinPE" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> + <SetupUILanguage> + <UILanguage>en-US</UILanguage> + </SetupUILanguage> + <InputLocale>en-US</InputLocale> + <SystemLocale>en-US</SystemLocale> + <UILanguage>en-US</UILanguage> + <UILanguageFallback>en-US</UILanguageFallback> + <UserLocale>en-US</UserLocale> + </component> + <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"> + <CreatePartitions> + <CreatePartition wcm:action="add"> + <Type>Primary</Type> + <Order>1</Order> + <Size>350</Size> + </CreatePartition> + <CreatePartition wcm:action="add"> + <Order>2</Order> + <Type>Primary</Type> + <Size>15360</Size> + </CreatePartition> + <CreatePartition wcm:action="add"> + <Order>3</Order> + <Type>Primary</Type> + <Extend>true</Extend> + </CreatePartition> + </CreatePartitions> + <ModifyPartitions> + <ModifyPartition wcm:action="add"> + <Active>true</Active> + <Format>NTFS</Format> + <Label>boot</Label> + <Order>1</Order> + <PartitionID>1</PartitionID> + </ModifyPartition> + <ModifyPartition wcm:action="add"> + <Format>NTFS</Format> + <Label>nano</Label> + <Letter>E</Letter> + <Order>2</Order> + <PartitionID>2</PartitionID> + </ModifyPartition> + <ModifyPartition wcm:action="add"> + <Format>NTFS</Format> + <Label>2016</Label> + <Letter>C</Letter> + <Order>3</Order> + <PartitionID>3</PartitionID> + </ModifyPartition> + </ModifyPartitions> + <DiskID>0</DiskID> + <WillWipeDisk>true</WillWipeDisk> + </Disk> + </DiskConfiguration> + <ImageInstall> + <OSImage> + <InstallFrom> + <MetaData wcm:action="add"> + <Key>/IMAGE/NAME </Key> + <Value>Windows Server 2012 R2 SERVERDATACENTERCORE</Value> + </MetaData> + </InstallFrom> + <InstallTo> + <DiskID>0</DiskID> + <PartitionID>3</PartitionID> + </InstallTo> + </OSImage> + </ImageInstall> + <UserData> + <ProductKey> + <WillShowUI>OnError</WillShowUI> + </ProductKey> + <AcceptEula>true</AcceptEula> + <FullName>Vagrant</FullName> + <Organization>Vagrant</Organization> + </UserData> + </component> + </settings> + <settings pass="generalize"> + <component name="Microsoft-Windows-Security-SPP" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <SkipRearm>1</SkipRearm> + </component> + <component name="Microsoft-Windows-PnpSysprep" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <PersistAllDeviceInstalls>false</PersistAllDeviceInstalls> + <DoNotCleanUpNonPresentDevices>false</DoNotCleanUpNonPresentDevices> + </component> + </settings> + <settings pass="oobeSystem"> + <component name="Microsoft-Windows-International-Core" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <InputLocale>en-US</InputLocale> + <SystemLocale>en-US</SystemLocale> + <UILanguage>en-US</UILanguage> + <UserLocale>en-US</UserLocale> + </component> + <component name="Microsoft-Windows-Shell-Setup" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <OOBE> + <HideEULAPage>true</HideEULAPage> + <HideLocalAccountScreen>true</HideLocalAccountScreen> + <HideOEMRegistrationScreen>true</HideOEMRegistrationScreen> + <HideOnlineAccountScreens>true</HideOnlineAccountScreens> + <HideWirelessSetupInOOBE>true</HideWirelessSetupInOOBE> + <NetworkLocation>Home</NetworkLocation> + <ProtectYourPC>1</ProtectYourPC> + </OOBE> + <TimeZone>UTC</TimeZone> + <UserAccounts> + <AdministratorPassword> + <Value>vagrant</Value> + <PlainText>true</PlainText> + </AdministratorPassword> + <LocalAccounts> + <LocalAccount wcm:action="add"> + <Password> + <Value>vagrant</Value> + <PlainText>true</PlainText> + </Password> + <Group>administrators</Group> + <DisplayName>Vagrant</DisplayName> + <Name>vagrant</Name> + <Description>Vagrant User</Description> + </LocalAccount> + </LocalAccounts> + </UserAccounts> + <AutoLogon> + <Password> + <Value>vagrant</Value> + <PlainText>true</PlainText> + </Password> + <Enabled>true</Enabled> + <Username>vagrant</Username> + </AutoLogon> + <FirstLogonCommands> + <SynchronousCommand wcm:action="add"> + <CommandLine>cmd.exe /c C:\Windows\System32\WindowsPowerShell\v1.0\powershell.exe -File a:\nano_create.ps1</CommandLine> + <Order>1</Order> + </SynchronousCommand> + </FirstLogonCommands> + </component> + </settings> + <settings pass="specialize"> + <component xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" name="Microsoft-Windows-ServerManager-SvrMgrNc" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> + <DoNotOpenServerManagerAtLogon>true</DoNotOpenServerManagerAtLogon> + </component> + <component xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" name="Microsoft-Windows-IE-ESC" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> + <IEHardenAdmin>false</IEHardenAdmin> + <IEHardenUser>false</IEHardenUser> + </component> + <component xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" name="Microsoft-Windows-OutOfBoxExperience" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> + <DoNotOpenInitialConfigurationTasksAtLogon>true</DoNotOpenInitialConfigurationTasksAtLogon> + </component> + </settings> +</unattend> diff --git a/scripts/windows/SetupComplete.cmd b/scripts/windows/SetupComplete.cmd new file mode 100644 index 000000000..08755b5c2 --- /dev/null +++ b/scripts/windows/SetupComplete.cmd @@ -0,0 +1,5 @@ +REG ADD HKLM\Software\Microsoft\Windows\CurrentVersion\WSMAN\Service /v allow_unencrypted /t REG_DWORD /d 1 /f +REG ADD HKLM\Software\Microsoft\Windows\CurrentVersion\WSMAN\Service /v auth_basic /t REG_DWORD /d 1 /f +REG ADD HKLM\Software\Microsoft\Windows\CurrentVersion\WSMAN\Client /v auth_basic /t REG_DWORD /d 1 /f + +cmd.exe /c C:\Windows\System32\WindowsPowerShell\v1.0\powershell.exe -command . c:\windows\setup\scripts\nano_cleanup.ps1 > c:\windows\setup\scripts\cleanup.txt \ No newline at end of file diff --git a/scripts/windows/nano_cleanup.ps1 b/scripts/windows/nano_cleanup.ps1 new file mode 100644 index 000000000..b8d976b25 --- /dev/null +++ b/scripts/windows/nano_cleanup.ps1 @@ -0,0 +1,37 @@ +Import-Module C:\windows\system32\windowspowershell\v1.0\Modules\Microsoft.PowerShell.Utility\Microsoft.PowerShell.Utility.psd1 +Import-Module C:\windows\system32\windowspowershell\v1.0\Modules\Microsoft.PowerShell.Management\Microsoft.PowerShell.Management.psd1 +Import-Module C:\windows\system32\windowspowershell\v1.0\Modules\Storage\Storage.psd1 + +$partition = Get-Partition -DriveLetter C +$c_size = $partition.size +$partition = Get-Partition -DriveLetter D +$d_size = $partition.size + +Remove-Partition -DriveLetter D -Confirm:$false +Resize-Partition -DriveLetter C -Size ($c_size + $d_size) + +Optimize-Volume -DriveLetter C + +$FilePath="c:\zero.tmp" +$Volume= Get-Volume -DriveLetter C +$ArraySize= 64kb +$SpaceToLeave= $Volume.Size * 0.05 +$FileSize= $Volume.SizeRemaining - $SpacetoLeave +$ZeroArray= new-object byte[]($ArraySize) + +$Stream= [io.File]::OpenWrite($FilePath) +try { + $CurFileSize = 0 + while($CurFileSize -lt $FileSize) { + $Stream.Write($ZeroArray,0, $ZeroArray.Length) + $CurFileSize +=$ZeroArray.Length + } +} finally { + if($Stream) { + $Stream.Close() + } +} + +Del $FilePath + +shutdown /s /t 0 \ No newline at end of file diff --git a/scripts/windows/nano_create.ps1 b/scripts/windows/nano_create.ps1 new file mode 100644 index 000000000..306ec3333 --- /dev/null +++ b/scripts/windows/nano_create.ps1 @@ -0,0 +1,39 @@ +start-transcript -path $env:temp\transcript0.txt -noclobber + +mkdir c:\NanoServer +cd c:\NanoServer +xcopy /s d:\NanoServer\*.* . +. .\new-nanoserverimage.ps1 +$adminPassword = ConvertTo-SecureString "Pass@word1" -AsPlainText -Force + +New-NanoServerImage ` + -MediaPath D:\ ` + -BasePath .\Base ` + -TargetPath .\Nano ` + -ComputerName Nano ` + -OEMDrivers ` + -ReverseForwarders ` + -AdministratorPassword $adminPassword + +Mount-DiskImage -ImagePath "c:\NanoServer\nano\Nano.vhd" + +Copy-Item ` + -Path "F:\*" ` + -Destination "E:\" ` + -Force ` + -Recurse ` + -Exclude "System Volume Information" ` + -ErrorAction SilentlyContinue + +mkdir E:\Windows\setup\scripts +copy-item a:\postunattend.xml E:\Windows\Panther\unattend.xml -Force +copy-item a:\SetupComplete.cmd E:\Windows\setup\scripts\SetupComplete.cmd -Force +copy-item a:\nano_cleanup.ps1 E:\Windows\setup\scripts\nano_cleanup.ps1 -Force + +bcdedit /set "{current}" device "partition=E:" +bcdedit /set "{current}" osdevice "partition=E:" +bcdedit /set "{current}" path \windows\system32\boot\winload.exe + +winrm set winrm/config/client/auth '@{Basic="true"}' +winrm set winrm/config/service/auth '@{Basic="true"}' +winrm set winrm/config/service '@{AllowUnencrypted="true"}' diff --git a/scripts/windows/postunattend.xml b/scripts/windows/postunattend.xml new file mode 100644 index 000000000..e5189cc9d --- /dev/null +++ b/scripts/windows/postunattend.xml @@ -0,0 +1,49 @@ +<?xml version="1.0" encoding="utf-8"?> +<unattend xmlns="urn:schemas-microsoft-com:unattend"> + <settings pass="generalize"> + <component name="Microsoft-Windows-Security-SPP" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <SkipRearm>1</SkipRearm> + </component> + <component name="Microsoft-Windows-PnpSysprep" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <PersistAllDeviceInstalls>false</PersistAllDeviceInstalls> + <DoNotCleanUpNonPresentDevices>false</DoNotCleanUpNonPresentDevices> + </component> + </settings> + <settings pass="oobeSystem"> + <component name="Microsoft-Windows-International-Core" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <InputLocale>en-US</InputLocale> + <SystemLocale>en-US</SystemLocale> + <UILanguage>en-US</UILanguage> + <UserLocale>en-US</UserLocale> + </component> + <component name="Microsoft-Windows-Shell-Setup" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <OOBE> + <HideEULAPage>true</HideEULAPage> + <ProtectYourPC>1</ProtectYourPC> + <NetworkLocation>Home</NetworkLocation> + <HideWirelessSetupInOOBE>true</HideWirelessSetupInOOBE> + </OOBE> + <TimeZone>UTC</TimeZone> + <UserAccounts> + <AdministratorPassword> + <Value>vagrant</Value> + <PlainText>true</PlainText> + </AdministratorPassword> + <LocalAccounts> + <LocalAccount wcm:action="add"> + <Password> + <Value>vagrant</Value> + <PlainText>true</PlainText> + </Password> + <Group>administrators</Group> + <DisplayName>Vagrant</DisplayName> + <Name>vagrant</Name> + <Description>Vagrant User</Description> + </LocalAccount> + </LocalAccounts> + </UserAccounts> + </component> + </settings> + <settings pass="specialize"> + </settings> +</unattend> diff --git a/windows-nano-tp3.json b/windows-nano-tp3.json new file mode 100644 index 000000000..7f8c5cf1b --- /dev/null +++ b/windows-nano-tp3.json @@ -0,0 +1,51 @@ +{ + "builders": [{ + "disk_size": 61440, + "type": "virtualbox-iso", + "vboxmanage": [ + [ "modifyvm", "{{.Name}}", "--natpf1", "guest_winrm,tcp,,55985,,5985" ], + [ "modifyvm", "{{.Name}}", "--memory", "2048" ], + [ "modifyvm", "{{.Name}}", "--vram", "36" ], + [ "modifyvm", "{{.Name}}", "--cpus", "2" ], + [ "modifyvm", "{{.Name}}", "--hardwareuuid", "02f110e7-369a-4bbc-bbe6-6f0b6864ccb6" ] + ], + "guest_os_type": "Windows2012_64", + "headless": "{{ user `headless` }}", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "communicator": "winrm", + "output_directory": "packer-{{user `template`}}-virtualbox", + "virtualbox_version_file": ".vbox_version", + "vm_name": "{{ user `template` }}", + "winrm_username": "vagrant", + "winrm_password": "vagrant", + "winrm_timeout": "2h", + "guest_additions_mode": "disable", + "shutdown_command": "shutdown /r /t 10 /f /d p:4:1 /c \"Packer Shutdown\"", + "shutdown_timeout": "15m", + "floppy_files": [ + "scripts/Autounattend.xml", + "scripts/nano_create.ps1", + "scripts/nano_cleanup.ps1", + "scripts/SetupComplete.cmd", + "scripts/postunattend.xml" + ] + }], + "post-processors": [ + { + "type": "vagrant", + "keep_input_artifact": true, + "output": "builds/{{user `box_basename`}}.{{.Provider}}.box", + "vagrantfile_template": "vagrantfile-windows-nano.template" + } + ], + "variables": { + "box_basename": "windows-nano", + "headless": "", + "iso_checksum": "7003c2a4f9abe672c570ff018fbf3a27", + "iso_checksum_type": "md5", + "iso_url": "iso/10514.0.150808-1529.TH2_RELEASE_SERVER_OEMRET_X64FRE_EN-US.ISO", + "template": "windows-nano-tp3" + } +} From f908183dc54d33fa9cd7961fa422f6e41e3c37c7 Mon Sep 17 00:00:00 2001 From: Matt Wrock <matt@mattwrock.com> Date: Tue, 29 Sep 2015 16:24:27 -0700 Subject: [PATCH 0416/1622] ready to try on linux --- vagrantfile_templates/windows-nano.rb | 17 +++++++ windows-nano-tp3.json | 68 ++++++++++++++++++--------- 2 files changed, 63 insertions(+), 22 deletions(-) create mode 100644 vagrantfile_templates/windows-nano.rb diff --git a/vagrantfile_templates/windows-nano.rb b/vagrantfile_templates/windows-nano.rb new file mode 100644 index 000000000..92426e380 --- /dev/null +++ b/vagrantfile_templates/windows-nano.rb @@ -0,0 +1,17 @@ +# -*- mode: ruby -*- +# vi: set ft=ruby : + +Vagrant.configure(2) do |config| + config.vm.guest = :windows + config.vm.communicator = "winrm" + + config.vm.provider "virtualbox" do |vb| + vb.customize ["modifyvm", :id, "--hardwareuuid", "02f110e7-369a-4bbc-bbe6-6f0b6864ccb6"] + vb.gui = true + vb.memory = "1024" + end + + config.vm.provider 'hyperv' do |hv| + hv.ip_address_timeout = 240 + end +end diff --git a/windows-nano-tp3.json b/windows-nano-tp3.json index 7f8c5cf1b..f6999b370 100644 --- a/windows-nano-tp3.json +++ b/windows-nano-tp3.json @@ -1,43 +1,67 @@ { "builders": [{ + "communicator": "winrm", "disk_size": 61440, - "type": "virtualbox-iso", - "vboxmanage": [ - [ "modifyvm", "{{.Name}}", "--natpf1", "guest_winrm,tcp,,55985,,5985" ], - [ "modifyvm", "{{.Name}}", "--memory", "2048" ], - [ "modifyvm", "{{.Name}}", "--vram", "36" ], - [ "modifyvm", "{{.Name}}", "--cpus", "2" ], - [ "modifyvm", "{{.Name}}", "--hardwareuuid", "02f110e7-369a-4bbc-bbe6-6f0b6864ccb6" ] + "floppy_files": [ + "scripts/windows/Autounattend.xml", + "scripts/windows/nano_create.ps1", + "scripts/windows/nano_cleanup.ps1", + "scripts/windows/SetupComplete.cmd", + "scripts/windows/postunattend.xml" ], + "guest_additions_mode": "disable", "guest_os_type": "Windows2012_64", "headless": "{{ user `headless` }}", "iso_url": "{{ user `iso_url` }}", "iso_checksum": "{{ user `iso_checksum` }}", "iso_checksum_type": "{{user `iso_checksum_type`}}", - "communicator": "winrm", "output_directory": "packer-{{user `template`}}-virtualbox", + "shutdown_command": "shutdown /r /t 10 /f /d p:4:1 /c \"Packer Shutdown\"", + "shutdown_timeout": "15m", + "type": "virtualbox-iso", + "vboxmanage": [ + [ + "modifyvm", + "{{.Name}}", + "--natpf1", + "guest_winrm,tcp,,55985,,5985" + ], + [ + "modifyvm", + "{{.Name}}", + "--memory", + "2048" + ], + [ + "modifyvm", + "{{.Name}}", + "--vram", + "36" + ], + [ + "modifyvm", + "{{.Name}}", + "--cpus", + "2" + ], + [ + "modifyvm", + "{{.Name}}", + "--hardwareuuid", + "02f110e7-369a-4bbc-bbe6-6f0b6864ccb6" + ] + ], "virtualbox_version_file": ".vbox_version", "vm_name": "{{ user `template` }}", - "winrm_username": "vagrant", "winrm_password": "vagrant", "winrm_timeout": "2h", - "guest_additions_mode": "disable", - "shutdown_command": "shutdown /r /t 10 /f /d p:4:1 /c \"Packer Shutdown\"", - "shutdown_timeout": "15m", - "floppy_files": [ - "scripts/Autounattend.xml", - "scripts/nano_create.ps1", - "scripts/nano_cleanup.ps1", - "scripts/SetupComplete.cmd", - "scripts/postunattend.xml" - ] + "winrm_username": "vagrant" }], "post-processors": [ { "type": "vagrant", - "keep_input_artifact": true, "output": "builds/{{user `box_basename`}}.{{.Provider}}.box", - "vagrantfile_template": "vagrantfile-windows-nano.template" + "vagrantfile_template": "vagrantfile_templates/windows-nano.rb" } ], "variables": { @@ -45,7 +69,7 @@ "headless": "", "iso_checksum": "7003c2a4f9abe672c570ff018fbf3a27", "iso_checksum_type": "md5", - "iso_url": "iso/10514.0.150808-1529.TH2_RELEASE_SERVER_OEMRET_X64FRE_EN-US.ISO", + "iso_url": "http://care.dlservice.microsoft.com/dl/download/7/3/C/73C250BE-67C4-440B-A69B-D0E8EE77F01C/10514.0.150808-1529.TH2_RELEASE_SERVER_OEMRET_X64FRE_EN-US.ISO", "template": "windows-nano-tp3" } } From 8721898cddf4614e46d72a0e87f45fa5300bfa27 Mon Sep 17 00:00:00 2001 From: Matt Wrock <matt@mattwrock.com> Date: Tue, 29 Sep 2015 19:22:43 -0700 Subject: [PATCH 0417/1622] extending timeout to zap disk --- windows-nano-tp3.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/windows-nano-tp3.json b/windows-nano-tp3.json index f6999b370..3728cc82c 100644 --- a/windows-nano-tp3.json +++ b/windows-nano-tp3.json @@ -17,7 +17,7 @@ "iso_checksum_type": "{{user `iso_checksum_type`}}", "output_directory": "packer-{{user `template`}}-virtualbox", "shutdown_command": "shutdown /r /t 10 /f /d p:4:1 /c \"Packer Shutdown\"", - "shutdown_timeout": "15m", + "shutdown_timeout": "1h", "type": "virtualbox-iso", "vboxmanage": [ [ From fa1805331aa8e4f1e699a2a24809d27a1eea1778 Mon Sep 17 00:00:00 2001 From: Matt Wrock <matt@mattwrock.com> Date: Tue, 29 Sep 2015 19:38:40 -0700 Subject: [PATCH 0418/1622] adding missing vars --- windows-nano-tp3.json | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/windows-nano-tp3.json b/windows-nano-tp3.json index 3728cc82c..2b740494c 100644 --- a/windows-nano-tp3.json +++ b/windows-nano-tp3.json @@ -66,10 +66,14 @@ ], "variables": { "box_basename": "windows-nano", + "build_timestamp": "{{isotime \"20060102150405\"}}", + "git_revision": "__unknown_git_revision__", "headless": "", "iso_checksum": "7003c2a4f9abe672c570ff018fbf3a27", "iso_checksum_type": "md5", "iso_url": "http://care.dlservice.microsoft.com/dl/download/7/3/C/73C250BE-67C4-440B-A69B-D0E8EE77F01C/10514.0.150808-1529.TH2_RELEASE_SERVER_OEMRET_X64FRE_EN-US.ISO", - "template": "windows-nano-tp3" + "metadata": "floppy/dummy_metadata.json", + "template": "windows-nano-tp3", + "version": "1.0.TIMESTAMP" } } From 8d211ef5ae324e0c5cd1e756f7bd268dad51ac7c Mon Sep 17 00:00:00 2001 From: Matt Wrock <matt@mattwrock.com> Date: Tue, 29 Sep 2015 19:54:15 -0700 Subject: [PATCH 0419/1622] use the latest version of packer that supports winrm --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 601321a13..c0399649c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,7 @@ rvm: - 2.2 -before_install: wget --no-check-certificate https://dl.bintray.com/mitchellh/packer/packer_0.7.5_linux_amd64.zip && unzip -d packer packer_0.7.5_linux_amd64.zip +before_install: wget --no-check-certificate https://dl.bintray.com/mitchellh/packer/packer_0.8.6_linux_amd64.zip && unzip -d packer_0.8.6_linux_amd64.zip before_script: export PATH=$PATH:$PWD/packer script: ./bin/bento normalize From 27d5471b509fbfbb33cf35de85285be24566336f Mon Sep 17 00:00:00 2001 From: Matt Wrock <matt@mattwrock.com> Date: Tue, 29 Sep 2015 19:59:20 -0700 Subject: [PATCH 0420/1622] fixing unzip --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index c0399649c..cde67abd7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,7 @@ rvm: - 2.2 -before_install: wget --no-check-certificate https://dl.bintray.com/mitchellh/packer/packer_0.8.6_linux_amd64.zip && unzip -d packer_0.8.6_linux_amd64.zip +before_install: wget --no-check-certificate https://dl.bintray.com/mitchellh/packer/packer_0.8.6_linux_amd64.zip && unzip -d packer packer_0.8.6_linux_amd64.zip before_script: export PATH=$PATH:$PWD/packer script: ./bin/bento normalize From 1440d455387ae875ce8c8204174c4529eae7ddbb Mon Sep 17 00:00:00 2001 From: Matt Wrock <matt@mattwrock.com> Date: Thu, 1 Oct 2015 18:47:25 -0700 Subject: [PATCH 0421/1622] add a private network to nano --- vagrantfile_templates/windows-nano.rb | 1 + windows-nano-tp3.json | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/vagrantfile_templates/windows-nano.rb b/vagrantfile_templates/windows-nano.rb index 92426e380..75cbc4207 100644 --- a/vagrantfile_templates/windows-nano.rb +++ b/vagrantfile_templates/windows-nano.rb @@ -4,6 +4,7 @@ Vagrant.configure(2) do |config| config.vm.guest = :windows config.vm.communicator = "winrm" + config.vm.network "private_network", type: "dhcp", virtualbox__intnet: true config.vm.provider "virtualbox" do |vb| vb.customize ["modifyvm", :id, "--hardwareuuid", "02f110e7-369a-4bbc-bbe6-6f0b6864ccb6"] diff --git a/windows-nano-tp3.json b/windows-nano-tp3.json index 2b740494c..382288800 100644 --- a/windows-nano-tp3.json +++ b/windows-nano-tp3.json @@ -74,6 +74,6 @@ "iso_url": "http://care.dlservice.microsoft.com/dl/download/7/3/C/73C250BE-67C4-440B-A69B-D0E8EE77F01C/10514.0.150808-1529.TH2_RELEASE_SERVER_OEMRET_X64FRE_EN-US.ISO", "metadata": "floppy/dummy_metadata.json", "template": "windows-nano-tp3", - "version": "1.0.TIMESTAMP" + "version": "1.1.TIMESTAMP" } } From d3347251b16bcd85f96f3066c8187fe891588db9 Mon Sep 17 00:00:00 2001 From: Matt Wrock <matt@mattwrock.com> Date: Thu, 1 Oct 2015 22:17:06 -0700 Subject: [PATCH 0422/1622] open firewall to allow file sharing --- scripts/windows/SetupComplete.cmd | 2 ++ windows-nano-tp3.json | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/scripts/windows/SetupComplete.cmd b/scripts/windows/SetupComplete.cmd index 08755b5c2..1061ac3d2 100644 --- a/scripts/windows/SetupComplete.cmd +++ b/scripts/windows/SetupComplete.cmd @@ -2,4 +2,6 @@ REG ADD HKLM\Software\Microsoft\Windows\CurrentVersion\WSMAN\Service /v allow_un REG ADD HKLM\Software\Microsoft\Windows\CurrentVersion\WSMAN\Service /v auth_basic /t REG_DWORD /d 1 /f REG ADD HKLM\Software\Microsoft\Windows\CurrentVersion\WSMAN\Client /v auth_basic /t REG_DWORD /d 1 /f +netsh advfirewall firewall set rule group="File and Printer Sharing" new enable=yes + cmd.exe /c C:\Windows\System32\WindowsPowerShell\v1.0\powershell.exe -command . c:\windows\setup\scripts\nano_cleanup.ps1 > c:\windows\setup\scripts\cleanup.txt \ No newline at end of file diff --git a/windows-nano-tp3.json b/windows-nano-tp3.json index 382288800..643ae28ae 100644 --- a/windows-nano-tp3.json +++ b/windows-nano-tp3.json @@ -74,6 +74,6 @@ "iso_url": "http://care.dlservice.microsoft.com/dl/download/7/3/C/73C250BE-67C4-440B-A69B-D0E8EE77F01C/10514.0.150808-1529.TH2_RELEASE_SERVER_OEMRET_X64FRE_EN-US.ISO", "metadata": "floppy/dummy_metadata.json", "template": "windows-nano-tp3", - "version": "1.1.TIMESTAMP" + "version": "1.2.TIMESTAMP" } } From c3fadf694a9c73feee24dc6a58709ed5096d6d76 Mon Sep 17 00:00:00 2001 From: Matt Wrock <matt@mattwrock.com> Date: Fri, 2 Oct 2015 05:11:06 -0700 Subject: [PATCH 0423/1622] removing internal network --- vagrantfile_templates/windows-nano.rb | 2 +- windows-nano-tp3.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/vagrantfile_templates/windows-nano.rb b/vagrantfile_templates/windows-nano.rb index 75cbc4207..0d46a8b5a 100644 --- a/vagrantfile_templates/windows-nano.rb +++ b/vagrantfile_templates/windows-nano.rb @@ -4,7 +4,7 @@ Vagrant.configure(2) do |config| config.vm.guest = :windows config.vm.communicator = "winrm" - config.vm.network "private_network", type: "dhcp", virtualbox__intnet: true + config.vm.network "private_network", type: "dhcp" config.vm.provider "virtualbox" do |vb| vb.customize ["modifyvm", :id, "--hardwareuuid", "02f110e7-369a-4bbc-bbe6-6f0b6864ccb6"] diff --git a/windows-nano-tp3.json b/windows-nano-tp3.json index 643ae28ae..9287154d5 100644 --- a/windows-nano-tp3.json +++ b/windows-nano-tp3.json @@ -74,6 +74,6 @@ "iso_url": "http://care.dlservice.microsoft.com/dl/download/7/3/C/73C250BE-67C4-440B-A69B-D0E8EE77F01C/10514.0.150808-1529.TH2_RELEASE_SERVER_OEMRET_X64FRE_EN-US.ISO", "metadata": "floppy/dummy_metadata.json", "template": "windows-nano-tp3", - "version": "1.2.TIMESTAMP" + "version": "1.3.TIMESTAMP" } } From fadade36d76d1e9a20b5ca975a844621ec580b31 Mon Sep 17 00:00:00 2001 From: Matt Wrock <matt@mattwrock.com> Date: Fri, 2 Oct 2015 05:16:51 -0700 Subject: [PATCH 0424/1622] changing version back to 1.1 since it was never released --- windows-nano-tp3.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/windows-nano-tp3.json b/windows-nano-tp3.json index 9287154d5..382288800 100644 --- a/windows-nano-tp3.json +++ b/windows-nano-tp3.json @@ -74,6 +74,6 @@ "iso_url": "http://care.dlservice.microsoft.com/dl/download/7/3/C/73C250BE-67C4-440B-A69B-D0E8EE77F01C/10514.0.150808-1529.TH2_RELEASE_SERVER_OEMRET_X64FRE_EN-US.ISO", "metadata": "floppy/dummy_metadata.json", "template": "windows-nano-tp3", - "version": "1.3.TIMESTAMP" + "version": "1.1.TIMESTAMP" } } From 0a66bab4bc764ec0d5a2df2a96cf5e702515da68 Mon Sep 17 00:00:00 2001 From: Seth Thomas <sthomas@chef.io> Date: Fri, 2 Oct 2015 16:12:33 +0100 Subject: [PATCH 0425/1622] Fixing Fedora 22 build tools to fix vm tools --- fedora-22-i386.json | 1 + fedora-22-x86_64.json | 1 + http/fedora-22/ks.cfg | 5 +++-- scripts/fedora/22-build-tools.sh | 3 +++ 4 files changed, 8 insertions(+), 2 deletions(-) create mode 100644 scripts/fedora/22-build-tools.sh diff --git a/fedora-22-i386.json b/fedora-22-i386.json index 4d941b234..e6b0a1f96 100644 --- a/fedora-22-i386.json +++ b/fedora-22-i386.json @@ -141,6 +141,7 @@ "scripts/common/metadata.sh", "scripts/fedora/fix-slow-dns.sh", "scripts/common/sshd.sh", + "scripts/fedora/22-build-tools.sh", "scripts/common/vmtools.sh", "scripts/common/vagrant.sh", "scripts/fedora/cleanup.sh", diff --git a/fedora-22-x86_64.json b/fedora-22-x86_64.json index 19c2e58df..865acff6a 100644 --- a/fedora-22-x86_64.json +++ b/fedora-22-x86_64.json @@ -145,6 +145,7 @@ "scripts/common/metadata.sh", "scripts/fedora/fix-slow-dns.sh", "scripts/common/sshd.sh", + "scripts/fedora/22-build-tools.sh", "scripts/common/vmtools.sh", "scripts/common/vagrant.sh", "scripts/fedora/cleanup.sh", diff --git a/http/fedora-22/ks.cfg b/http/fedora-22/ks.cfg index 1a8f571bd..a07295510 100644 --- a/http/fedora-22/ks.cfg +++ b/http/fedora-22/ks.cfg @@ -23,9 +23,10 @@ firstboot --disabled reboot user --name=vagrant --plaintext --password vagrant -%packages --nobase --ignoremissing --excludedocs +%packages --ignoremissing --excludedocs bzip2 -gcc +# GCC won't install during kickstart +# gcc kernel-devel kernel-headers tar diff --git a/scripts/fedora/22-build-tools.sh b/scripts/fedora/22-build-tools.sh new file mode 100644 index 000000000..daec1c810 --- /dev/null +++ b/scripts/fedora/22-build-tools.sh @@ -0,0 +1,3 @@ +#!/bin/bash -eux +# Installing build tools here because Fedora 22 will not do so during kickstart +dnf -y install kernel-headers-$(uname -r) kernel-devel-$(uname -r) gcc make perl From f3784eb5291384c3a0f5a490ed7eef7ec96bea3f Mon Sep 17 00:00:00 2001 From: Seth Thomas <sthomas@chef.io> Date: Sat, 3 Oct 2015 10:07:26 +0100 Subject: [PATCH 0426/1622] Adding OmniOS r151014 --- omnios-r151014.json | 235 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 235 insertions(+) create mode 100644 omnios-r151014.json diff --git a/omnios-r151014.json b/omnios-r151014.json new file mode 100644 index 000000000..3851c4f6e --- /dev/null +++ b/omnios-r151014.json @@ -0,0 +1,235 @@ +{ + "builders": [ + { + "boot_command": [ + "<enter><wait10><wait5>", + "1<enter><wait10>", + "<wait10>", + "<f2><wait>", + "<f2><wait>", + "<f2><wait>", + "<bs><bs><bs><bs><bs><bs><bs>omnios-vagrant", + "<f2><wait>", + "<f2><wait>", + "<f2><wait>", + "<wait10><wait10><wait10><wait10><wait10><wait10>", + "<wait10><wait10><wait10><wait10><wait10><wait10>", + "<wait10><wait10><wait10><wait10><wait10><wait10>", + "<wait10><wait10><wait10><wait10><wait10><wait10>", + "<f8><wait>", + "<wait10><wait10><wait10><wait10><wait10><wait10>", + "<wait10><wait10><wait10><wait10><wait10><wait10>", + "root<enter><wait><enter><wait5>", + "passwd<enter><wait>", + "vagrant<enter><wait>", + "vagrant<enter><wait>", + "ipadm create-if e1000g0<enter><wait>", + "ipadm create-addr -T dhcp e1000g0/v4<enter><wait>", + "echo 'nameserver 8.8.8.8' > /etc/resolv.conf<enter><wait>", + "cp /etc/nsswitch.dns /etc/nsswitch.conf<enter><wait>", + "sed -i -e 's/PermitRootLogin no/PermitRootLogin yes/' /etc/ssh/sshd_config<enter><wait>", + "svcadm restart ssh<enter><wait>" + ], + "boot_wait": "30s", + "disk_size": 40960, + "guest_os_type": "OpenSolaris_64", + "headless": "{{ user `headless` }}", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-virtualbox", + "shutdown_command": "/usr/sbin/shutdown -g 0 -y -i 5", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "root", + "type": "virtualbox-iso", + "vboxmanage": [ + [ + "modifyvm", + "{{.Name}}", + "--memory", + "1024" + ], + [ + "modifyvm", + "{{.Name}}", + "--cpus", + "1" + ] + ], + "virtualbox_version_file": ".vbox_version", + "vm_name": "{{ user `template` }}" + }, + { + "boot_command": [ + "<enter><wait10><wait5>", + "1<enter><wait10>", + "<wait10>", + "<f2><wait10>", + "<wait10><wait10><wait10><wait10><wait10><wait10>", + "<wait10><wait10><wait10><wait10><wait10><wait10>", + "<f2><wait>", + "<f2><wait>", + "<bs><bs><bs><bs><bs><bs><bs>omnios-vagrant", + "<f2><wait>", + "<f2><wait>", + "<f2><wait>", + "<wait10><wait10><wait10><wait10><wait10><wait10>", + "<wait10><wait10><wait10><wait10><wait10><wait10>", + "<wait10><wait10><wait10><wait10><wait10><wait10>", + "<wait10><wait10><wait10><wait10><wait10><wait10>", + "<f8><wait>", + "<wait10><wait10><wait10><wait10><wait10><wait10>", + "<wait10><wait10><wait10><wait10><wait10><wait10>", + "root<enter><wait><enter><wait5>", + "passwd<enter><wait>", + "vagrant<enter><wait>", + "vagrant<enter><wait>", + "ipadm create-if e1000g0<enter><wait>", + "ipadm create-addr -T dhcp e1000g0/v4<enter><wait>", + "echo 'nameserver 8.8.8.8' > /etc/resolv.conf<enter><wait>", + "cp /etc/nsswitch.dns /etc/nsswitch.conf<enter><wait>", + "sed -i -e 's/PermitRootLogin no/PermitRootLogin yes/' /etc/ssh/sshd_config<enter><wait>", + "svcadm restart ssh<enter><wait>" + ], + "boot_wait": "30s", + "disk_size": 40960, + "floppy_files": [ + "floppy/omnios/README.TXT" + ], + "guest_os_type": "solaris11-64", + "headless": "{{ user `headless` }}", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-vmware", + "shutdown_command": "/usr/sbin/shutdown -g 0 -y -i 5", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "root", + "tools_upload_flavor": "solaris", + "type": "vmware-iso", + "vm_name": "{{ user `template` }}", + "vmx_data": { + "cpuid.coresPerSocket": "1", + "memsize": "1024", + "numvcpus": "1" + } + }, + { + "boot_command": [ + "<enter><wait10><wait5>", + "1<enter><wait10>", + "<wait10>", + "<f2><wait10>", + "<wait10><wait10><wait10><wait10><wait10><wait10>", + "<wait10><wait10><wait10><wait10><wait10><wait10>", + "<f2><wait>", + "<f2><wait>", + "<bs><bs><bs><bs><bs><bs><bs>omnios-vagrant", + "<f2><wait>", + "<f2><wait>", + "<f2><wait>", + "<wait10><wait10><wait10><wait10><wait10><wait10>", + "<wait10><wait10><wait10><wait10><wait10><wait10>", + "<wait10><wait10><wait10><wait10><wait10><wait10>", + "<wait10><wait10><wait10><wait10><wait10><wait10>", + "<f8><wait>", + "<wait10><wait10><wait10><wait10><wait10><wait10>", + "<wait10><wait10><wait10><wait10><wait10><wait10>", + "root<enter><wait><enter><wait5>", + "passwd<enter><wait>", + "vagrant<enter><wait>", + "vagrant<enter><wait>", + "ipadm create-if e1000g0<enter><wait>", + "ipadm create-addr -T dhcp e1000g0/v4<enter><wait>", + "echo 'nameserver 8.8.8.8' > /etc/resolv.conf<enter><wait>", + "cp /etc/nsswitch.dns /etc/nsswitch.conf<enter><wait>", + "sed -i -e 's/PermitRootLogin no/PermitRootLogin yes/' /etc/ssh/sshd_config<enter><wait>", + "svcadm restart ssh<enter><wait>" + ], + "boot_wait": "30s", + "disk_size": 40960, + "guest_os_type": "opensolaris", + "hard_drive_interface": "ide", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-parallels", + "parallels_tools_mode": "disable", + "prlctl": [ + [ + "set", + "{{.Name}}", + "--memsize", + "1024" + ], + [ + "set", + "{{.Name}}", + "--cpus", + "1" + ] + ], + "shutdown_command": "/usr/sbin/shutdown -g 0 -y -i 5", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "root", + "type": "parallels-iso", + "vm_name": "{{ user `template` }}" + } + ], + "post-processors": [ + { + "compression_level": 9, + "output": "builds/{{user `box_basename`}}.{{.Provider}}.box", + "override": { + "parallels": { + "vagrantfile_template": "vagrantfile_templates/parallels/omnios.rb" + } + }, + "type": "vagrant" + } + ], + "provisioners": [ + { + "destination": "/tmp/bento-metadata.json", + "source": "{{user `metadata`}}", + "type": "file" + }, + { + "environment_vars": [ + "HOME_DIR=/home/vagrant", + "http_proxy={{user `http_proxy`}}", + "https_proxy={{user `https_proxy`}}", + "no_proxy={{user `no_proxy`}}" + ], + "execute_command": "export {{.Vars}} && sh '{{.Path}}'", + "scripts": [ + "scripts/common/metadata.sh", + "scripts/omnios/vmtools.sh", + "scripts/omnios/postinstall.sh" + ], + "type": "shell" + } + ], + "variables": { + "arch": "64", + "box_basename": "omnios-r151014", + "build_timestamp": "{{isotime \"20060102150405\"}}", + "git_revision": "__unknown_git_revision__", + "headless": "", + "http_proxy": "{{env `http_proxy`}}", + "https_proxy": "{{env `https_proxy`}}", + "iso_checksum": "2dffd9acda9ad3eb22f0bf6bdff1717b2ee4b8b4", + "iso_checksum_type": "sha1", + "iso_name": "OmniOS_Text_r151014.iso", + "metadata": "floppy/dummy_metadata.json", + "mirror": "http://omnios.omniti.com", + "mirror_directory": "media", + "name": "omnios-r151014", + "no_proxy": "{{env `no_proxy`}}", + "template": "omnios-r151014", + "version": "2.2.TIMESTAMP" + } +} From 6766ade8f834226bc6e8c85a9b3ebbc2bbf6db7b Mon Sep 17 00:00:00 2001 From: Seth Thomas <sthomas@chef.io> Date: Mon, 5 Oct 2015 14:31:48 -0700 Subject: [PATCH 0427/1622] Adding shared folder as part of test-kitchen run --- Rakefile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Rakefile b/Rakefile index aa69b947c..1cbdb86e2 100644 --- a/Rakefile +++ b/Rakefile @@ -230,12 +230,15 @@ def test_box(boxname, providers) provider = 'vmware_fusion' if provider == 'vmware_desktop' + share_disabled = /omnios.*|freebsd.*/ === boxname ? true : false + puts "Testing provider #{provider} for #{boxname}" kitchen_cfg = {"provisioner"=>{"name"=>"chef_zero", "data_path"=>"test/fixtures"}, "platforms"=> [{"name"=>"#{boxname}-#{provider}", "driver"=> {"name"=>"vagrant", + "synced_folders"=>[[".", "/vagrant", "disabled: #{share_disabled}"]], "provider"=>provider, "box"=>boxname, "box_url"=>"file://#{ENV['PWD']}/builds/#{provider_data['file']}"}}], From 262dbd9e7a5a8e3a1ee9e1a4b78be51c25039a0b Mon Sep 17 00:00:00 2001 From: Seth Thomas <sthomas@chef.io> Date: Wed, 7 Oct 2015 07:48:31 -0700 Subject: [PATCH 0428/1622] The sha changed :/ --- omnios-r151014.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/omnios-r151014.json b/omnios-r151014.json index 3851c4f6e..ae2cddf50 100644 --- a/omnios-r151014.json +++ b/omnios-r151014.json @@ -221,7 +221,7 @@ "headless": "", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", - "iso_checksum": "2dffd9acda9ad3eb22f0bf6bdff1717b2ee4b8b4", + "iso_checksum": "91ebc2b447fb8934099cefe210f1f5c2f3bab3d2", "iso_checksum_type": "sha1", "iso_name": "OmniOS_Text_r151014.iso", "metadata": "floppy/dummy_metadata.json", From 3e3397080b201a0c8c7f93f27fa09ca6dc8bfcbf Mon Sep 17 00:00:00 2001 From: Seth Thomas <sthomas@chef.io> Date: Wed, 7 Oct 2015 10:01:03 -0700 Subject: [PATCH 0429/1622] Cutting 2.2.2 release --- CHANGELOG.md | 9 +++++++++ README.md | 18 +++++++++--------- 2 files changed, 18 insertions(+), 9 deletions(-) create mode 100644 CHANGELOG.md diff --git a/CHANGELOG.md b/CHANGELOG.md new file mode 100644 index 000000000..0f840bfdc --- /dev/null +++ b/CHANGELOG.md @@ -0,0 +1,9 @@ +Changelog for Bento Box Artifacts (Atlas) +========================================= + +## v2.2.2 + +* Built with latest virtualization suites - Virtualbox 5.0.6, VMware Fusion 8.0.1, Parallels 11.0.1 +* Test shared folders across all providers +* Fix Fedora 22 build tools which fixes vmtools (shared folders) +* Miscellaneous cleanup of templates diff --git a/README.md b/README.md index 11815f9ca..4aa741c2b 100644 --- a/README.md +++ b/README.md @@ -16,14 +16,14 @@ This project is managed by the CHEF Release Engineering team. For more informati The following boxes are built from this repository's templates for publicly available platforms and are currently hosted via Atlas in the [bento organization](https://atlas.hashicorp.com/bento/). -| | VirtualBox (5.0.2) | VMware (7.1.2) | Parallels (11.0.0) | +| | VirtualBox (5.0.6) | VMware (8.0.1) | Parallels (11.0.1) | | ------------ | ------------- | ------------- | ------------- | | centos-5.11 | [i386][1], [x86_64][2] | [i386][3], [x86_64][4] | [i386][5], [x86_64][6] | | centos-6.7 | [i386][7], [x86_64][8] | [i386][9], [x86_64][10] | [i386][11], [x86_64][12] | | centos-7.1 | [x86_64][13] | [x86_64][14] | [x86_64][15] | | debian-6.0.10 | [i386][16], [amd64][17] | [i386][18], [amd64][19] | [i386][20], [amd64][21] | -| debian-7.8 | [i386][22], [amd64][23] | [i386][24], [amd64][25] | [i386][26], [amd64][27] | -| debian-8.1 | [i386][28], [amd64][29] | [i386][30], [amd64][31] | [i386][32], [amd64][33] | +| debian-7.9 | [i386][22], [amd64][23] | [i386][24], [amd64][25] | [i386][26], [amd64][27] | +| debian-8.2 | [i386][28], [amd64][29] | [i386][30], [amd64][31] | [i386][32], [amd64][33] | | fedora-21 | [i386][76], [x86_64][77] | [i386][78], [x86_64][79] | [i386][80], [x86_64][81] | | fedora-22 | [x86_64][82] | [x86_64][83] | [x86_64][84] | | freebsd-9.3 | [amd64][35] | [amd64][37] | [amd64][39] | @@ -90,24 +90,24 @@ Templates can still be built directly by `packer` To build a template for all providers (VirtualBox, Fusion, Parallels): - $ packer build -var 'box_basename=debian-8.1' debian-8.1-amd64.json + $ packer build debian-8.2-amd64.json To build a template only for a list of specific providers: - $ packer build -only=virtualbox-iso -var 'box_basename=debian-8.1' debian-8.1-amd64.json + $ packer build -only=virtualbox-iso debian-8.2-amd64.json To build a template for all providers except a list of specific providers: - $ packer build -except=parallels-iso,vmware-iso -var 'box_basename=debian-8.1' debian-8.1-amd64.json + $ packer build -except=parallels-iso,vmware-iso debian-8.2-amd64.json If you want to use a another mirror site, use the `mirror` user variable. - $ packer build -var 'mirror=http://ftp.jaist.ac.jp/pub/Linux/debian-cdimage/release' -var 'box_basename=debian-8.1' debian-8.1-amd64.json + $ packer build -var 'mirror=http://ftp.jaist.ac.jp/pub/Linux/debian-cdimage/release' debian-8.2-amd64.json Congratulations! You now have box(es) in the ../builds directory that you can then add to Vagrant and start testing cookbooks. Notes: -* -var 'box_basename=debian-8.1' isn't required but the default value for templates is "__unset_box_basename__" +* The box_basename can be overridden like other Packer vars with ``-var 'box_basename=debian-8.2'`` ### Proprietary Boxes @@ -117,7 +117,7 @@ Mac OS X, Red Hat Enterprise Linux, and SUSE Linux Enterprise Server templates a To build a Mac OS X box, you will need to start with an installer for your desired version of OS X. You will then need to use [Tim Sutton's osx-vm-templates](https://github.com/timsutton/osx-vm-templates)/) to modify that installer for use by packer. The output of that build will include the location of the ISO and its checksum, which you can substitute into your `packer build` command, e.g.: - $ packer build -var 'box_basename=macosx-10.9' -var 'iso_checksum=<checksum>' -var 'iso_url=<iso_url>' macosx-10.9.json + $ packer build -var 'iso_checksum=<checksum>' -var 'iso_url=<iso_url>' macosx-10.9.json There is a known issue where [test-kitchen](http://kitchen.ci/) starts a Mac OS X box correctly, but `vagrant up` fails due to the absence of the HGFS kernel module. This is due to a silent failure during the VMware tools installation and can be corrected by installing the VMware tools on the Mac OS X box manually. From 8bae193acb414cf351e02921eb4c53ec8d559e35 Mon Sep 17 00:00:00 2001 From: Seth Thomas <sthomas@chef.io> Date: Fri, 9 Oct 2015 09:56:53 -0700 Subject: [PATCH 0430/1622] DRY up oracle versions, all boxes build --- oracle-5.11-i386.json | 66 +++++++++------ oracle-5.11-x86_64.json | 66 +++++++++------ oracle-6.6-i386.json | 66 +++++++++------ oracle-6.6-x86_64.json | 66 +++++++++------ oracle-6.7-i386.json | 176 ++++++++++++++++++++++++++++++++++++++++ oracle-6.7-x86_64.json | 176 ++++++++++++++++++++++++++++++++++++++++ oracle-7.1-x86_64.json | 176 ++++++++++++++++++++++++++++++++++++++++ 7 files changed, 684 insertions(+), 108 deletions(-) create mode 100644 oracle-6.7-i386.json create mode 100644 oracle-6.7-x86_64.json create mode 100644 oracle-7.1-x86_64.json diff --git a/oracle-5.11-i386.json b/oracle-5.11-i386.json index e48fe6d45..79e2ce048 100644 --- a/oracle-5.11-i386.json +++ b/oracle-5.11-i386.json @@ -2,7 +2,7 @@ "builders": [ { "boot_command": [ - "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/centos-5.11/ks.cfg<enter><wait>" + "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], "boot_wait": "10s", "disk_size": 40960, @@ -11,11 +11,11 @@ "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", "http_directory": "http", - "iso_checksum": "f4ef2b868a0cccb736664136eca798ec", - "iso_checksum_type": "md5", - "iso_url": "{{user `mirror`}}/Enterprise-R5-U11-Server-i386-dvd.iso", - "output_directory": "packer-oracle-5.11-i386-virtualbox", - "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-virtualbox", + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", @@ -40,18 +40,18 @@ }, { "boot_command": [ - "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/centos-5.11/ks.cfg<enter><wait>" + "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], "boot_wait": "10s", "disk_size": 40960, "guest_os_type": "oraclelinux", "headless": "{{ user `headless` }}", "http_directory": "http", - "iso_checksum": "f4ef2b868a0cccb736664136eca798ec", - "iso_checksum_type": "md5", - "iso_url": "{{user `mirror`}}/Enterprise-R5-U11-Server-i386-dvd.iso", - "output_directory": "packer-oracle-5.11-i386-vmware", - "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-vmware", + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", @@ -67,16 +67,16 @@ }, { "boot_command": [ - "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/centos-5.11/ks.cfg<enter><wait>" + "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], "boot_wait": "10s", "disk_size": 40960, "guest_os_type": "centos", "http_directory": "http", - "iso_checksum": "f4ef2b868a0cccb736664136eca798ec", - "iso_checksum_type": "md5", - "iso_url": "{{user `mirror`}}/Enterprise-R5-U11-Server-i386-dvd.iso", - "output_directory": "packer-oracle-5.11-i386-parallels", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-parallels", "parallels_tools_flavor": "lin", "prlctl": [ [ @@ -93,7 +93,7 @@ ] ], "prlctl_version_file": ".prlctl_version", - "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", @@ -103,14 +103,14 @@ }, { "boot_command": [ - "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/centos-5.11/ks.cfg<enter><wait>" + "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], "boot_wait": "10s", "disk_size": 40960, "http_directory": "http", - "iso_checksum": "f4ef2b868a0cccb736664136eca798ec", - "iso_checksum_type": "md5", - "iso_url": "{{user `mirror`}}/Enterprise-R5-U11-Server-i386-dvd.iso", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", "output_directory": "packer-{{user `template`}}-qemu", "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", @@ -134,8 +134,13 @@ "type": "file" }, { - "environment_vars": [], - "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E bash '{{.Path}}'", + "environment_vars": [ + "HOME_DIR=/home/vagrant", + "http_proxy={{user `http_proxy`}}", + "https_proxy={{user `https_proxy`}}", + "no_proxy={{user `no_proxy`}}" + ], + "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", "scripts": [ "scripts/common/metadata.sh", "scripts/common/vagrant.sh", @@ -153,11 +158,18 @@ "build_timestamp": "{{isotime \"20060102150405\"}}", "git_revision": "__unknown_git_revision__", "headless": "", + "http_proxy": "{{env `http_proxy`}}", + "https_proxy": "{{env `https_proxy`}}", + "iso_checksum": "E60962C4EBF8920BBD828EFE32A78A7CC8F28E3B", + "iso_checksum_type": "sha1", + "iso_name": "Enterprise-R5-U11-Server-i386-dvd.iso", + "ks_path": "centos-5.11/ks.cfg", "metadata": "floppy/dummy_metadata.json", - "mirror": "http://mirrors.dotsrc.org/oracle-linux/EL5/U11/i386", + "mirror": "http://mirrors.dotsrc.org/oracle-linux", + "mirror_directory": "EL5/U11/i386", "name": "oracle-5.11-i386", + "no_proxy": "{{env `no_proxy`}}", "template": "oracle-5.11-i386", - "version": "2.0.TIMESTAMP" + "version": "2.2.TIMESTAMP" } } - diff --git a/oracle-5.11-x86_64.json b/oracle-5.11-x86_64.json index 058dc82ff..52b0148d1 100644 --- a/oracle-5.11-x86_64.json +++ b/oracle-5.11-x86_64.json @@ -2,7 +2,7 @@ "builders": [ { "boot_command": [ - "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/centos-5.11/ks.cfg<enter><wait>" + "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], "boot_wait": "10s", "disk_size": 40960, @@ -11,11 +11,11 @@ "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", "http_directory": "http", - "iso_checksum": "8af2121088c7e6f5ebdb6d5900403240", - "iso_checksum_type": "md5", - "iso_url": "{{user `mirror`}}/Enterprise-R5-U11-Server-x86_64-dvd.iso", - "output_directory": "packer-oracle-5.11-x86_64-virtualbox", - "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-virtualbox", + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", @@ -40,18 +40,18 @@ }, { "boot_command": [ - "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/centos-5.11/ks.cfg<enter><wait>" + "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], "boot_wait": "10s", "disk_size": 40960, "guest_os_type": "oraclelinux-64", "headless": "{{ user `headless` }}", "http_directory": "http", - "iso_checksum": "8af2121088c7e6f5ebdb6d5900403240", - "iso_checksum_type": "md5", - "iso_url": "{{user `mirror`}}/Enterprise-R5-U11-Server-x86_64-dvd.iso", - "output_directory": "packer-oracle-5.11-x86_64-vmware", - "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-vmware", + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", @@ -67,16 +67,16 @@ }, { "boot_command": [ - "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/centos-5.11/ks.cfg<enter><wait>" + "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], "boot_wait": "10s", "disk_size": 40960, "guest_os_type": "centos", "http_directory": "http", - "iso_checksum": "8af2121088c7e6f5ebdb6d5900403240", - "iso_checksum_type": "md5", - "iso_url": "{{user `mirror`}}/Enterprise-R5-U11-Server-x86_64-dvd.iso", - "output_directory": "packer-oracle-5.11-x86_64-parallels", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-parallels", "parallels_tools_flavor": "lin", "prlctl": [ [ @@ -93,7 +93,7 @@ ] ], "prlctl_version_file": ".prlctl_version", - "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", @@ -103,14 +103,14 @@ }, { "boot_command": [ - "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/centos-5.11/ks.cfg<enter><wait>" + "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], "boot_wait": "10s", "disk_size": 40960, "http_directory": "http", - "iso_checksum": "8af2121088c7e6f5ebdb6d5900403240", - "iso_checksum_type": "md5", - "iso_url": "{{user `mirror`}}/Enterprise-R5-U11-Server-x86_64-dvd.iso", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", "output_directory": "packer-{{user `template`}}-qemu", "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", @@ -134,8 +134,13 @@ "type": "file" }, { - "environment_vars": [], - "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E bash '{{.Path}}'", + "environment_vars": [ + "HOME_DIR=/home/vagrant", + "http_proxy={{user `http_proxy`}}", + "https_proxy={{user `https_proxy`}}", + "no_proxy={{user `no_proxy`}}" + ], + "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", "scripts": [ "scripts/common/metadata.sh", "scripts/common/vagrant.sh", @@ -153,11 +158,18 @@ "build_timestamp": "{{isotime \"20060102150405\"}}", "git_revision": "__unknown_git_revision__", "headless": "", + "http_proxy": "{{env `http_proxy`}}", + "https_proxy": "{{env `https_proxy`}}", + "iso_checksum": "2D38F76652CBC1367FDF30024F13CDE5F6BF34DF", + "iso_checksum_type": "sha1", + "iso_name": "Enterprise-R5-U11-Server-x86_64-dvd.iso", + "ks_path": "centos-5.11/ks.cfg", "metadata": "floppy/dummy_metadata.json", - "mirror": "http://mirrors.dotsrc.org/oracle-linux/EL5/U11/x86_64", + "mirror": "http://mirrors.dotsrc.org/oracle-linux", + "mirror_directory": "EL5/U11/x86_64", "name": "oracle-5.11", + "no_proxy": "{{env `no_proxy`}}", "template": "oracle-5.11-x86_64", - "version": "2.0.TIMESTAMP" + "version": "2.2.TIMESTAMP" } } - diff --git a/oracle-6.6-i386.json b/oracle-6.6-i386.json index e329e4b3d..2d8073443 100644 --- a/oracle-6.6-i386.json +++ b/oracle-6.6-i386.json @@ -2,7 +2,7 @@ "builders": [ { "boot_command": [ - "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/centos-6.6/ks.cfg<enter><wait>" + "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], "boot_wait": "10s", "disk_size": 40960, @@ -11,11 +11,11 @@ "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", "http_directory": "http", - "iso_checksum": "81f0c85217f40763dea5053ec5594e4958498bbc", - "iso_checksum_type": "sha1", - "iso_url": "{{user `mirror`}}/OracleLinux-R6-U6-Server-i386-dvd.iso", - "output_directory": "packer-oracle-6.6-i386-virtualbox", - "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-virtualbox", + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", @@ -40,18 +40,18 @@ }, { "boot_command": [ - "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/centos-6.6/ks.cfg<enter><wait>" + "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], "boot_wait": "10s", "disk_size": 40960, "guest_os_type": "oraclelinux", "headless": "{{ user `headless` }}", "http_directory": "http", - "iso_checksum": "81f0c85217f40763dea5053ec5594e4958498bbc", - "iso_checksum_type": "sha1", - "iso_url": "{{user `mirror`}}/OracleLinux-R6-U6-Server-i386-dvd.iso", - "output_directory": "packer-oracle-6.6-i386-vmware", - "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-vmware", + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", @@ -67,16 +67,16 @@ }, { "boot_command": [ - "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/centos-6.6/ks.cfg<enter><wait>" + "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], "boot_wait": "10s", "disk_size": 40960, "guest_os_type": "centos", "http_directory": "http", - "iso_checksum": "81f0c85217f40763dea5053ec5594e4958498bbc", - "iso_checksum_type": "sha1", - "iso_url": "{{user `mirror`}}/OracleLinux-R6-U6-Server-i386-dvd.iso", - "output_directory": "packer-oracle-6.6-i386-parallels", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-parallels", "parallels_tools_flavor": "lin", "prlctl": [ [ @@ -93,7 +93,7 @@ ] ], "prlctl_version_file": ".prlctl_version", - "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", @@ -103,14 +103,14 @@ }, { "boot_command": [ - "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/centos-6.6/ks.cfg<enter><wait>" + "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], "boot_wait": "10s", "disk_size": 40960, "http_directory": "http", - "iso_checksum": "81f0c85217f40763dea5053ec5594e4958498bbc", - "iso_checksum_type": "sha1", - "iso_url": "{{user `mirror`}}/OracleLinux-R6-U6-Server-i386-dvd.iso", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", "output_directory": "packer-{{user `template`}}-qemu", "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", @@ -134,8 +134,13 @@ "type": "file" }, { - "environment_vars": [], - "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E bash '{{.Path}}'", + "environment_vars": [ + "HOME_DIR=/home/vagrant", + "http_proxy={{user `http_proxy`}}", + "https_proxy={{user `https_proxy`}}", + "no_proxy={{user `no_proxy`}}" + ], + "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", "scripts": [ "scripts/common/metadata.sh", "scripts/centos/networking.sh", @@ -154,11 +159,18 @@ "build_timestamp": "{{isotime \"20060102150405\"}}", "git_revision": "__unknown_git_revision__", "headless": "", + "http_proxy": "{{env `http_proxy`}}", + "https_proxy": "{{env `https_proxy`}}", + "iso_checksum": "81F0C85217F40763DEA5053EC5594E4958498BBC", + "iso_checksum_type": "sha1", + "iso_name": "OracleLinux-R6-U6-Server-i386-dvd.iso", + "ks_path": "centos-6.7/ks.cfg", "metadata": "floppy/dummy_metadata.json", - "mirror": "http://mirrors.dotsrc.org/oracle-linux/OL6/U6/i386", + "mirror": "http://mirrors.dotsrc.org/oracle-linux", + "mirror_directory": "OL6/U6/i386", "name": "oracle-6.6-i386", + "no_proxy": "{{env `no_proxy`}}", "template": "oracle-6.6-i386", - "version": "2.0.TIMESTAMP" + "version": "2.2.TIMESTAMP" } } - diff --git a/oracle-6.6-x86_64.json b/oracle-6.6-x86_64.json index 5be4bb6f8..4dde0f455 100644 --- a/oracle-6.6-x86_64.json +++ b/oracle-6.6-x86_64.json @@ -2,7 +2,7 @@ "builders": [ { "boot_command": [ - "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/centos-6.6/ks.cfg<enter><wait>" + "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], "boot_wait": "10s", "disk_size": 40960, @@ -11,11 +11,11 @@ "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", "http_directory": "http", - "iso_checksum": "5738f10a506d3630edfd297ef179b553091c6a48", - "iso_checksum_type": "sha1", - "iso_url": "{{user `mirror`}}/OracleLinux-R6-U6-Server-x86_64-dvd.iso", - "output_directory": "packer-oracle-6.6-x86_64-virtualbox", - "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-virtualbox", + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", @@ -40,18 +40,18 @@ }, { "boot_command": [ - "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/centos-6.6/ks.cfg<enter><wait>" + "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], "boot_wait": "10s", "disk_size": 40960, "guest_os_type": "oraclelinux-64", "headless": "{{ user `headless` }}", "http_directory": "http", - "iso_checksum": "5738f10a506d3630edfd297ef179b553091c6a48", - "iso_checksum_type": "sha1", - "iso_url": "{{user `mirror`}}/OracleLinux-R6-U6-Server-x86_64-dvd.iso", - "output_directory": "packer-oracle-6.6-x86_64-vmware", - "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-vmware", + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", @@ -67,16 +67,16 @@ }, { "boot_command": [ - "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/centos-6.6/ks.cfg<enter><wait>" + "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], "boot_wait": "10s", "disk_size": 40960, "guest_os_type": "centos", "http_directory": "http", - "iso_checksum": "5738f10a506d3630edfd297ef179b553091c6a48", - "iso_checksum_type": "sha1", - "iso_url": "{{user `mirror`}}/OracleLinux-R6-U6-Server-x86_64-dvd.iso", - "output_directory": "packer-oracle-6.6-x86_64-parallels", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-parallels", "parallels_tools_flavor": "lin", "prlctl": [ [ @@ -93,7 +93,7 @@ ] ], "prlctl_version_file": ".prlctl_version", - "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", @@ -103,14 +103,14 @@ }, { "boot_command": [ - "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/centos-6.6/ks.cfg<enter><wait>" + "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], "boot_wait": "10s", "disk_size": 40960, "http_directory": "http", - "iso_checksum": "5738f10a506d3630edfd297ef179b553091c6a48", - "iso_checksum_type": "sha1", - "iso_url": "{{user `mirror`}}/OracleLinux-R6-U6-Server-x86_64-dvd.iso", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", "output_directory": "packer-{{user `template`}}-qemu", "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", @@ -134,8 +134,13 @@ "type": "file" }, { - "environment_vars": [], - "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E bash '{{.Path}}'", + "environment_vars": [ + "HOME_DIR=/home/vagrant", + "http_proxy={{user `http_proxy`}}", + "https_proxy={{user `https_proxy`}}", + "no_proxy={{user `no_proxy`}}" + ], + "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", "scripts": [ "scripts/common/metadata.sh", "scripts/centos/networking.sh", @@ -154,11 +159,18 @@ "build_timestamp": "{{isotime \"20060102150405\"}}", "git_revision": "__unknown_git_revision__", "headless": "", + "http_proxy": "{{env `http_proxy`}}", + "https_proxy": "{{env `https_proxy`}}", + "iso_checksum": "5738F10A506D3630EDFD297EF179B553091C6A48", + "iso_checksum_type": "sha1", + "iso_name": "OracleLinux-R6-U6-Server-x86_64-dvd.iso", + "ks_path": "centos-6.7/ks.cfg", "metadata": "floppy/dummy_metadata.json", - "mirror": "http://mirrors.dotsrc.org/oracle-linux/OL6/U6/x86_64", + "mirror": "http://mirrors.dotsrc.org/oracle-linux", + "mirror_directory": "OL6/U6/x86_64", "name": "oracle-6.6", + "no_proxy": "{{env `no_proxy`}}", "template": "oracle-6.6-x86_64", - "version": "2.0.TIMESTAMP" + "version": "2.2.TIMESTAMP" } } - diff --git a/oracle-6.7-i386.json b/oracle-6.7-i386.json new file mode 100644 index 000000000..f51931b86 --- /dev/null +++ b/oracle-6.7-i386.json @@ -0,0 +1,176 @@ +{ + "builders": [ + { + "boot_command": [ + "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "guest_os_type": "Oracle", + "hard_drive_interface": "sata", + "headless": "{{ user `headless` }}", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-virtualbox", + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "virtualbox-iso", + "vboxmanage": [ + [ + "modifyvm", + "{{.Name}}", + "--memory", + "480" + ], + [ + "modifyvm", + "{{.Name}}", + "--cpus", + "1" + ] + ], + "virtualbox_version_file": ".vbox_version", + "vm_name": "{{ user `template` }}" + }, + { + "boot_command": [ + "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "guest_os_type": "oraclelinux", + "headless": "{{ user `headless` }}", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-vmware", + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "tools_upload_flavor": "linux", + "type": "vmware-iso", + "vm_name": "{{ user `template` }}", + "vmx_data": { + "cpuid.coresPerSocket": "1", + "memsize": "480", + "numvcpus": "1" + } + }, + { + "boot_command": [ + "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "guest_os_type": "centos", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-parallels", + "parallels_tools_flavor": "lin", + "prlctl": [ + [ + "set", + "{{.Name}}", + "--memsize", + "480" + ], + [ + "set", + "{{.Name}}", + "--cpus", + "1" + ] + ], + "prlctl_version_file": ".prlctl_version", + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "parallels-iso", + "vm_name": "{{ user `template` }}" + }, + { + "boot_command": [ + "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-qemu", + "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "qemu", + "vm_name": "{{ user `template` }}" + } + ], + "post-processors": [ + { + "output": "builds/{{user `box_basename`}}.{{.Provider}}.box", + "type": "vagrant" + } + ], + "provisioners": [ + { + "destination": "/tmp/bento-metadata.json", + "source": "{{user `metadata`}}", + "type": "file" + }, + { + "environment_vars": [ + "HOME_DIR=/home/vagrant", + "http_proxy={{user `http_proxy`}}", + "https_proxy={{user `https_proxy`}}", + "no_proxy={{user `no_proxy`}}" + ], + "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", + "scripts": [ + "scripts/common/metadata.sh", + "scripts/centos/networking.sh", + "scripts/common/sshd.sh", + "scripts/common/vagrant.sh", + "scripts/common/vmtools.sh", + "scripts/centos/cleanup.sh", + "scripts/common/minimize.sh" + ], + "type": "shell" + } + ], + "variables": { + "arch": "32", + "box_basename": "oracle-6.7-i386", + "build_timestamp": "{{isotime \"20060102150405\"}}", + "git_revision": "__unknown_git_revision__", + "headless": "", + "http_proxy": "{{env `http_proxy`}}", + "https_proxy": "{{env `https_proxy`}}", + "iso_checksum": "F35C749FBDD7BF0FB0A676C477728D0B864E4D69", + "iso_checksum_type": "sha1", + "iso_name": "OracleLinux-R6-U7-Server-i386-dvd.iso", + "ks_path": "centos-6.7/ks.cfg", + "metadata": "floppy/dummy_metadata.json", + "mirror": "http://mirrors.dotsrc.org/oracle-linux", + "mirror_directory": "OL6/U7/i386", + "name": "oracle-6.7-i386", + "no_proxy": "{{env `no_proxy`}}", + "template": "oracle-6.7-i386", + "version": "2.2.TIMESTAMP" + } +} diff --git a/oracle-6.7-x86_64.json b/oracle-6.7-x86_64.json new file mode 100644 index 000000000..eadfeaaff --- /dev/null +++ b/oracle-6.7-x86_64.json @@ -0,0 +1,176 @@ +{ + "builders": [ + { + "boot_command": [ + "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "guest_os_type": "Oracle_64", + "hard_drive_interface": "sata", + "headless": "{{ user `headless` }}", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-virtualbox", + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "virtualbox-iso", + "vboxmanage": [ + [ + "modifyvm", + "{{.Name}}", + "--memory", + "480" + ], + [ + "modifyvm", + "{{.Name}}", + "--cpus", + "1" + ] + ], + "virtualbox_version_file": ".vbox_version", + "vm_name": "{{ user `template` }}" + }, + { + "boot_command": [ + "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "guest_os_type": "oraclelinux-64", + "headless": "{{ user `headless` }}", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-vmware", + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "tools_upload_flavor": "linux", + "type": "vmware-iso", + "vm_name": "{{ user `template` }}", + "vmx_data": { + "cpuid.coresPerSocket": "1", + "memsize": "480", + "numvcpus": "1" + } + }, + { + "boot_command": [ + "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "guest_os_type": "centos", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-parallels", + "parallels_tools_flavor": "lin", + "prlctl": [ + [ + "set", + "{{.Name}}", + "--memsize", + "480" + ], + [ + "set", + "{{.Name}}", + "--cpus", + "1" + ] + ], + "prlctl_version_file": ".prlctl_version", + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "parallels-iso", + "vm_name": "{{ user `template` }}" + }, + { + "boot_command": [ + "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-qemu", + "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "qemu", + "vm_name": "{{ user `template` }}" + } + ], + "post-processors": [ + { + "output": "builds/{{user `box_basename`}}.{{.Provider}}.box", + "type": "vagrant" + } + ], + "provisioners": [ + { + "destination": "/tmp/bento-metadata.json", + "source": "{{user `metadata`}}", + "type": "file" + }, + { + "environment_vars": [ + "HOME_DIR=/home/vagrant", + "http_proxy={{user `http_proxy`}}", + "https_proxy={{user `https_proxy`}}", + "no_proxy={{user `no_proxy`}}" + ], + "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", + "scripts": [ + "scripts/common/metadata.sh", + "scripts/centos/networking.sh", + "scripts/common/sshd.sh", + "scripts/common/vagrant.sh", + "scripts/common/vmtools.sh", + "scripts/centos/cleanup.sh", + "scripts/common/minimize.sh" + ], + "type": "shell" + } + ], + "variables": { + "arch": "64", + "box_basename": "oracle-6.7", + "build_timestamp": "{{isotime \"20060102150405\"}}", + "git_revision": "__unknown_git_revision__", + "headless": "", + "http_proxy": "{{env `http_proxy`}}", + "https_proxy": "{{env `https_proxy`}}", + "iso_checksum": "DD7231B378F23E2E846AC78B0C5D8974A23631D5", + "iso_checksum_type": "sha1", + "iso_name": "OracleLinux-R6-U7-Server-x86_64-dvd.iso", + "ks_path": "centos-6.7/ks.cfg", + "metadata": "floppy/dummy_metadata.json", + "mirror": "http://mirrors.dotsrc.org/oracle-linux", + "mirror_directory": "OL6/U7/x86_64", + "name": "oracle-6.7", + "no_proxy": "{{env `no_proxy`}}", + "template": "oracle-6.7-x86_64", + "version": "2.0.TIMESTAMP" + } +} diff --git a/oracle-7.1-x86_64.json b/oracle-7.1-x86_64.json new file mode 100644 index 000000000..a1cd331e3 --- /dev/null +++ b/oracle-7.1-x86_64.json @@ -0,0 +1,176 @@ +{ + "builders": [ + { + "boot_command": [ + "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "guest_os_type": "Oracle_64", + "hard_drive_interface": "sata", + "headless": "{{ user `headless` }}", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-virtualbox", + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "virtualbox-iso", + "vboxmanage": [ + [ + "modifyvm", + "{{.Name}}", + "--memory", + "480" + ], + [ + "modifyvm", + "{{.Name}}", + "--cpus", + "1" + ] + ], + "virtualbox_version_file": ".vbox_version", + "vm_name": "{{ user `template` }}" + }, + { + "boot_command": [ + "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "guest_os_type": "oraclelinux-64", + "headless": "{{ user `headless` }}", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-vmware", + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "tools_upload_flavor": "linux", + "type": "vmware-iso", + "vm_name": "{{ user `template` }}", + "vmx_data": { + "cpuid.coresPerSocket": "1", + "memsize": "480", + "numvcpus": "1" + } + }, + { + "boot_command": [ + "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "guest_os_type": "centos", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-parallels", + "parallels_tools_flavor": "lin", + "prlctl": [ + [ + "set", + "{{.Name}}", + "--memsize", + "480" + ], + [ + "set", + "{{.Name}}", + "--cpus", + "1" + ] + ], + "prlctl_version_file": ".prlctl_version", + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "parallels-iso", + "vm_name": "{{ user `template` }}" + }, + { + "boot_command": [ + "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-qemu", + "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "qemu", + "vm_name": "{{ user `template` }}" + } + ], + "post-processors": [ + { + "output": "builds/{{user `box_basename`}}.{{.Provider}}.box", + "type": "vagrant" + } + ], + "provisioners": [ + { + "destination": "/tmp/bento-metadata.json", + "source": "{{user `metadata`}}", + "type": "file" + }, + { + "environment_vars": [ + "HOME_DIR=/home/vagrant", + "http_proxy={{user `http_proxy`}}", + "https_proxy={{user `https_proxy`}}", + "no_proxy={{user `no_proxy`}}" + ], + "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", + "scripts": [ + "scripts/common/metadata.sh", + "scripts/centos/networking.sh", + "scripts/common/sshd.sh", + "scripts/common/vagrant.sh", + "scripts/common/vmtools.sh", + "scripts/centos/cleanup.sh", + "scripts/common/minimize.sh" + ], + "type": "shell" + } + ], + "variables": { + "arch": "64", + "box_basename": "oracle-7.1", + "build_timestamp": "{{isotime \"20060102150405\"}}", + "git_revision": "__unknown_git_revision__", + "headless": "", + "http_proxy": "{{env `http_proxy`}}", + "https_proxy": "{{env `https_proxy`}}", + "iso_checksum": "FA9666448E8A24AD6A4C7203575B66532FA833D7", + "iso_checksum_type": "sha1", + "iso_name": "OracleLinux-R7-U1-Server-x86_64-dvd.iso", + "ks_path": "centos-7.1/ks.cfg", + "metadata": "floppy/dummy_metadata.json", + "mirror": "http://mirrors.dotsrc.org/oracle-linux", + "mirror_directory": "OL7/u1/x86_64", + "name": "oracle-7.1", + "no_proxy": "{{env `no_proxy`}}", + "template": "oracle-7.1-x86_64", + "version": "2.2.TIMESTAMP" + } +} From 6ab322b59f9481a893111a98c3aad21df9377965 Mon Sep 17 00:00:00 2001 From: Seth Thomas <sthomas@chef.io> Date: Fri, 9 Oct 2015 17:33:07 -0700 Subject: [PATCH 0431/1622] First pass at fixing up and DRYing sles --- http/sles-11/sles-11-sp4-i386-autoinst.xml | 180 +++++++++++++++++ http/sles-11/sles-11-sp4-x86_64-autoinst.xml | 180 +++++++++++++++++ scripts/sles/remove-dvd-source.sh | 8 +- scripts/sles/zypper-locks.sh | 8 +- sles-11-sp4-i386.json | 191 +++++++++++++++++++ sles-11-sp4-x86_64.json | 191 +++++++++++++++++++ sles-12-x86_64.json | 66 ++++--- 7 files changed, 791 insertions(+), 33 deletions(-) create mode 100644 http/sles-11/sles-11-sp4-i386-autoinst.xml create mode 100644 http/sles-11/sles-11-sp4-x86_64-autoinst.xml create mode 100644 sles-11-sp4-i386.json create mode 100644 sles-11-sp4-x86_64.json diff --git a/http/sles-11/sles-11-sp4-i386-autoinst.xml b/http/sles-11/sles-11-sp4-i386-autoinst.xml new file mode 100644 index 000000000..7a2b03d84 --- /dev/null +++ b/http/sles-11/sles-11-sp4-i386-autoinst.xml @@ -0,0 +1,180 @@ +<?xml version="1.0"?> +<!DOCTYPE profile> +<profile xmlns="http://www.suse.com/1.0/yast2ns" xmlns:config="http://www.suse.com/1.0/configns"> + <general> + <ask-list config:type="list"/> + <mode> + <confirm config:type="boolean">false</confirm> + </mode> + <mouse> + <id>none</id> + </mouse> + <proposals config:type="list"/> + <signature-handling> + <accept_file_without_checksum config:type="boolean">true</accept_file_without_checksum> + <accept_non_trusted_gpg_key config:type="boolean">true</accept_non_trusted_gpg_key> + <accept_unknown_gpg_key config:type="boolean">true</accept_unknown_gpg_key> + <accept_unsigned_file config:type="boolean">true</accept_unsigned_file> + <accept_verification_failed config:type="boolean">false</accept_verification_failed> + <import_gpg_key config:type="boolean">true</import_gpg_key> + </signature-handling> + <storage/> + </general> + <login_settings/> + <networking> + <dhcp_options> + <dhclient_client_id></dhclient_client_id> + <dhclient_hostname_option>AUTO</dhclient_hostname_option> + </dhcp_options> + <dns> + <dhcp_hostname config:type="boolean">false</dhcp_hostname> + <domain>vagrantup.com</domain> + <hostname>vagrant-sles-11sp4-x86</hostname> + <resolv_conf_policy>auto</resolv_conf_policy> + <searchlist config:type="list"> + <search>vagrantup.com</search> + </searchlist> + <write_hostname config:type="boolean">true</write_hostname> + </dns> + <interfaces config:type="list"> + <interface> + <bootproto>dhcp</bootproto> + <device>eth0</device> + <startmode>auto</startmode> + <usercontrol>no</usercontrol> + </interface> + </interfaces> + <keep_install_network config:type="boolean">true</keep_install_network> + <managed config:type="boolean">false</managed> + <routing> + <ip_forward config:type="boolean">false</ip_forward> + </routing> + </networking> + <partitioning config:type="list"> + <drive> + <initialize config:type="boolean">true</initialize> + <partitions config:type="list"> + <partition> + <create config:type="boolean">true</create> + <crypt_fs config:type="boolean">false</crypt_fs> + <filesystem config:type="symbol">swap</filesystem> + <format config:type="boolean">true</format> + <fstopt>defaults</fstopt> + <loop_fs config:type="boolean">false</loop_fs> + <mount>swap</mount> + <mountby config:type="symbol">device</mountby> + <partition_id config:type="integer">130</partition_id> + <partition_nr config:type="integer">1</partition_nr> + <raid_options/> + <resize config:type="boolean">false</resize> + <size>1561492992</size> + </partition> + <partition> + <create config:type="boolean">true</create> + <crypt_fs config:type="boolean">false</crypt_fs> + <filesystem config:type="symbol">ext3</filesystem> + <format config:type="boolean">true</format> + <fstopt>acl,user_xattr</fstopt> + <loop_fs config:type="boolean">false</loop_fs> + <mount>/</mount> + <mountby config:type="symbol">device</mountby> + <partition_id config:type="integer">131</partition_id> + <partition_nr config:type="integer">2</partition_nr> + <raid_options/> + <resize config:type="boolean">false</resize> + <size>19895844352</size> + </partition> + </partitions> + <pesize></pesize> + <type config:type="symbol">CT_DISK</type> + <use>all</use> + </drive> + </partitioning> + <report> + <errors> + <log config:type="boolean">true</log> + <show config:type="boolean">true</show> + <timeout config:type="integer">0</timeout> + </errors> + <messages> + <log config:type="boolean">true</log> + <show config:type="boolean">true</show> + <timeout config:type="integer">0</timeout> + </messages> + <warnings> + <log config:type="boolean">true</log> + <show config:type="boolean">true</show> + <timeout config:type="integer">0</timeout> + </warnings> + <yesno_messages> + <log config:type="boolean">true</log> + <show config:type="boolean">true</show> + <timeout config:type="integer">0</timeout> + </yesno_messages> + </report> + <software> + + <packages config:type="list"> + <package>openssh</package> + <package>kernel-default-devel</package> + <package>sudo</package> + <package>gcc</package> + <package>wget</package> + <package>make</package> + </packages> + <patterns config:type="list"> + <pattern>Minimal</pattern> + <pattern>apparmor</pattern> + </patterns> + <remove-packages config:type="list"> + </remove-packages> + </software> + <user_defaults> + <expire></expire> + <group>100</group> + <groups>video,dialout</groups> + <home>/home</home> + <inactive>-1</inactive> + <shell>/bin/bash</shell> + <skel>/etc/skel</skel> + <umask>022</umask> + </user_defaults> + <users config:type="list"> + <user> + <encrypted config:type="boolean">true</encrypted> + <fullname>vagrant</fullname> + <gid>100</gid> + <home>/home/vagrant</home> + <password_settings> + <expire></expire> + <flag></flag> + <inact></inact> + <max>99999</max> + <min>0</min> + <warn>7</warn> + </password_settings> + <shell>/bin/bash</shell> + <uid>1000</uid> + <user_password>$2y$05$NA1Li9ZKJOLRW5mMTXm6/e5r8dltWS5RpDZpvHrI82aLE00V51tdi</user_password> + <username>vagrant</username> + </user> + <user> + <encrypted config:type="boolean">true</encrypted> + <fullname>root</fullname> + <gid>0</gid> + <home>/root</home> + <password_settings> + <expire></expire> + <flag></flag> + <inact></inact> + <max></max> + <min></min> + <warn></warn> + </password_settings> + <shell>/bin/bash</shell> + <uid>0</uid> + <user_password>$2y$05$NA1Li9ZKJOLRW5mMTXm6/e5r8dltWS5RpDZpvHrI82aLE00V51tdi</user_password> + <username>root</username> + </user> + </users> +</profile> diff --git a/http/sles-11/sles-11-sp4-x86_64-autoinst.xml b/http/sles-11/sles-11-sp4-x86_64-autoinst.xml new file mode 100644 index 000000000..ae21e9f85 --- /dev/null +++ b/http/sles-11/sles-11-sp4-x86_64-autoinst.xml @@ -0,0 +1,180 @@ +<?xml version="1.0"?> +<!DOCTYPE profile> +<profile xmlns="http://www.suse.com/1.0/yast2ns" xmlns:config="http://www.suse.com/1.0/configns"> + <general> + <ask-list config:type="list"/> + <mode> + <confirm config:type="boolean">false</confirm> + </mode> + <mouse> + <id>none</id> + </mouse> + <proposals config:type="list"/> + <signature-handling> + <accept_file_without_checksum config:type="boolean">true</accept_file_without_checksum> + <accept_non_trusted_gpg_key config:type="boolean">true</accept_non_trusted_gpg_key> + <accept_unknown_gpg_key config:type="boolean">true</accept_unknown_gpg_key> + <accept_unsigned_file config:type="boolean">true</accept_unsigned_file> + <accept_verification_failed config:type="boolean">false</accept_verification_failed> + <import_gpg_key config:type="boolean">true</import_gpg_key> + </signature-handling> + <storage/> + </general> + <login_settings/> + <networking> + <dhcp_options> + <dhclient_client_id></dhclient_client_id> + <dhclient_hostname_option>AUTO</dhclient_hostname_option> + </dhcp_options> + <dns> + <dhcp_hostname config:type="boolean">false</dhcp_hostname> + <domain>vagrantup.com</domain> + <hostname>vagrant-sles-11sp4-x64</hostname> + <resolv_conf_policy>auto</resolv_conf_policy> + <searchlist config:type="list"> + <search>vagrantup.com</search> + </searchlist> + <write_hostname config:type="boolean">true</write_hostname> + </dns> + <interfaces config:type="list"> + <interface> + <bootproto>dhcp</bootproto> + <device>eth0</device> + <startmode>auto</startmode> + <usercontrol>no</usercontrol> + </interface> + </interfaces> + <keep_install_network config:type="boolean">true</keep_install_network> + <managed config:type="boolean">false</managed> + <routing> + <ip_forward config:type="boolean">false</ip_forward> + </routing> + </networking> + <partitioning config:type="list"> + <drive> + <initialize config:type="boolean">true</initialize> + <partitions config:type="list"> + <partition> + <create config:type="boolean">true</create> + <crypt_fs config:type="boolean">false</crypt_fs> + <filesystem config:type="symbol">swap</filesystem> + <format config:type="boolean">true</format> + <fstopt>defaults</fstopt> + <loop_fs config:type="boolean">false</loop_fs> + <mount>swap</mount> + <mountby config:type="symbol">device</mountby> + <partition_id config:type="integer">130</partition_id> + <partition_nr config:type="integer">1</partition_nr> + <raid_options/> + <resize config:type="boolean">false</resize> + <size>1561492992</size> + </partition> + <partition> + <create config:type="boolean">true</create> + <crypt_fs config:type="boolean">false</crypt_fs> + <filesystem config:type="symbol">ext3</filesystem> + <format config:type="boolean">true</format> + <fstopt>acl,user_xattr</fstopt> + <loop_fs config:type="boolean">false</loop_fs> + <mount>/</mount> + <mountby config:type="symbol">device</mountby> + <partition_id config:type="integer">131</partition_id> + <partition_nr config:type="integer">2</partition_nr> + <raid_options/> + <resize config:type="boolean">false</resize> + <size>19895844352</size> + </partition> + </partitions> + <pesize></pesize> + <type config:type="symbol">CT_DISK</type> + <use>all</use> + </drive> + </partitioning> + <report> + <errors> + <log config:type="boolean">true</log> + <show config:type="boolean">true</show> + <timeout config:type="integer">0</timeout> + </errors> + <messages> + <log config:type="boolean">true</log> + <show config:type="boolean">true</show> + <timeout config:type="integer">0</timeout> + </messages> + <warnings> + <log config:type="boolean">true</log> + <show config:type="boolean">true</show> + <timeout config:type="integer">0</timeout> + </warnings> + <yesno_messages> + <log config:type="boolean">true</log> + <show config:type="boolean">true</show> + <timeout config:type="integer">0</timeout> + </yesno_messages> + </report> + <software> + + <packages config:type="list"> + <package>openssh</package> + <package>kernel-default-devel</package> + <package>sudo</package> + <package>gcc</package> + <package>wget</package> + <package>make</package> + </packages> + <patterns config:type="list"> + <pattern>Minimal</pattern> + <pattern>apparmor</pattern> + </patterns> + <remove-packages config:type="list"> + </remove-packages> + </software> + <user_defaults> + <expire></expire> + <group>100</group> + <groups>video,dialout</groups> + <home>/home</home> + <inactive>-1</inactive> + <shell>/bin/bash</shell> + <skel>/etc/skel</skel> + <umask>022</umask> + </user_defaults> + <users config:type="list"> + <user> + <encrypted config:type="boolean">true</encrypted> + <fullname>vagrant</fullname> + <gid>100</gid> + <home>/home/vagrant</home> + <password_settings> + <expire></expire> + <flag></flag> + <inact></inact> + <max>99999</max> + <min>0</min> + <warn>7</warn> + </password_settings> + <shell>/bin/bash</shell> + <uid>1000</uid> + <user_password>$2y$05$NA1Li9ZKJOLRW5mMTXm6/e5r8dltWS5RpDZpvHrI82aLE00V51tdi</user_password> + <username>vagrant</username> + </user> + <user> + <encrypted config:type="boolean">true</encrypted> + <fullname>root</fullname> + <gid>0</gid> + <home>/root</home> + <password_settings> + <expire></expire> + <flag></flag> + <inact></inact> + <max></max> + <min></min> + <warn></warn> + </password_settings> + <shell>/bin/bash</shell> + <uid>0</uid> + <user_password>$2y$05$NA1Li9ZKJOLRW5mMTXm6/e5r8dltWS5RpDZpvHrI82aLE00V51tdi</user_password> + <username>root</username> + </user> + </users> +</profile> diff --git a/scripts/sles/remove-dvd-source.sh b/scripts/sles/remove-dvd-source.sh index 632fa6cbc..7eef549e7 100644 --- a/scripts/sles/remove-dvd-source.sh +++ b/scripts/sles/remove-dvd-source.sh @@ -14,16 +14,16 @@ if [ $oslevel == '11' ]; then repo_ver="11.2.2-1.234" elif [ $patchlevel == '3' ]; then repo_ver="11.3.3-1.138" + elif [ $patchlevel == '4' ]; then + repo_ver="11.4.4-1.109" else echo "Failed to remove DVD source; don't know how to deal with patchlevel $patchlevel" exit 1 fi zypper removerepo "SUSE-Linux-Enterprise-Server-11-SP$patchlevel $repo_ver" - zypper addrepo "http://demeter.uni-regensburg.de/SLES11SP$patchlevel-$arch_suffix/DVD1/" "SLES11SP$patchlevel-$arch_suffix DVD1 Online" + elif [ $oslevel == '12' ]; then - zypper removerepo "SLES12-12-$patchlevel" - zypper addrepo "http://demeter.uni-regensburg.de/SLES12-$arch_suffix/DVD1/" "SLES12-12-$patchlevel-$arch_suffix DVD1 Online" - zypper addrepo "http://demeter.uni-regensburg.de/SLES12-$arch_suffix/DVD2/" "SLES12-12-$patchlevel-$arch_suffix DVD2 Online" + zypper removerepo "SLES12-12-$patchlevel"; fi zypper refresh diff --git a/scripts/sles/zypper-locks.sh b/scripts/sles/zypper-locks.sh index a86fa5f4a..fe464451b 100644 --- a/scripts/sles/zypper-locks.sh +++ b/scripts/sles/zypper-locks.sh @@ -1,4 +1,10 @@ #!/bin/sh -eux # remove zypper locks on removed packages to avoid later dependency problems -zypper --non-interactive ll | grep package | awk -F\| '{ print $2 }' | xargs -n 20 zypper --non-interactive rl +any_package_locks=`zypper --non-interactive ll | grep package`; + +if [ 'There are no package locks defined.' == "$any_package_locks" ]; then + echo 'There are no package locks defined. Doing nothing.'; +else + zypper --non-interactive ll | grep package | awk -F\| '{ print $2 }' | xargs -n 20 zypper --non-interactive rl; +fi diff --git a/sles-11-sp4-i386.json b/sles-11-sp4-i386.json new file mode 100644 index 000000000..d57dc7aa7 --- /dev/null +++ b/sles-11-sp4-i386.json @@ -0,0 +1,191 @@ +{ + "builders": [ + { + "boot_command": [ + "<esc><enter><wait>", + "linux netdevice=eth0 netsetup=dhcp install=cd:/<wait>", + " lang=en_US autoyast=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `autoinst_cfg`}}<wait>", + " textmode=1<wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 20480, + "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "guest_os_type": "OpenSUSE", + "hard_drive_interface": "sata", + "headless": "{{ user `headless` }}", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-virtualbox", + "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "virtualbox-iso", + "vboxmanage": [ + [ + "modifyvm", + "{{.Name}}", + "--memory", + "480" + ], + [ + "modifyvm", + "{{.Name}}", + "--cpus", + "1" + ] + ], + "virtualbox_version_file": ".vbox_version", + "vm_name": "{{ user `template` }}" + }, + { + "boot_command": [ + "<esc><enter><wait>", + "linux netdevice=eth0 netsetup=dhcp install=cd:/<wait>", + " lang=en_US autoyast=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `autoinst_cfg`}}", + " textmode=1<wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 20480, + "guest_os_type": "sles11", + "headless": "{{ user `headless` }}", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-vmware", + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "tools_upload_flavor": "linux", + "type": "vmware-iso", + "vm_name": "{{ user `template` }}", + "vmx_data": { + "cpuid.coresPerSocket": "1", + "memsize": "480", + "numvcpus": "1" + } + }, + { + "boot_command": [ + "<esc><enter><wait>", + "linux netdevice=eth0 netsetup=dhcp install=cd:/<wait>", + " lang=en_US autoyast=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `autoinst_cfg`}}<wait>", + " textmode=1<wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 20480, + "guest_os_type": "suse", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-parallels", + "parallels_tools_flavor": "lin", + "prlctl": [ + [ + "set", + "{{.Name}}", + "--memsize", + "480" + ], + [ + "set", + "{{.Name}}", + "--cpus", + "1" + ] + ], + "prlctl_version_file": ".prlctl_version", + "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "parallels-iso", + "vm_name": "{{ user `template` }}" + }, + { + "boot_command": [ + "<esc><enter><wait>", + "linux netdevice=eth0 netsetup=dhcp install=cd:/<wait>", + " lang=en_US autoyast=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `autoinst_cfg`}}<wait>", + " textmode=1<wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 20480, + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-qemu", + "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "qemu", + "vm_name": "{{ user `template` }}" + } + ], + "post-processors": [ + { + "output": "builds/{{user `box_basename`}}.{{.Provider}}.box", + "type": "vagrant" + } + ], + "provisioners": [ + { + "destination": "/tmp/bento-metadata.json", + "source": "{{user `metadata`}}", + "type": "file" + }, + { + "environment_vars": [ + "HOME_DIR=/home/vagrant", + "http_proxy={{user `http_proxy`}}", + "https_proxy={{user `https_proxy`}}", + "no_proxy={{user `no_proxy`}}" + ], + "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh '{{.Path}}'", + "scripts": [ + "scripts/common/metadata.sh", + "scripts/common/sshd.sh", + "scripts/common/vagrant.sh", + "scripts/common/vmtools.sh", + "scripts/sles/sudoers.sh", + "scripts/sles/zypper-locks.sh", + "scripts/sles/remove-dvd-source.sh", + "scripts/common/minimize.sh" + ], + "type": "shell" + } + ], + "variables": { + "arch": "32", + "autoinst_cfg": "sles-11/sles-11-sp4-i386-autoinst.xml", + "box_basename": "sles-11-sp4-i386", + "build_timestamp": "{{isotime \"20060102150405\"}}", + "git_revision": "__unknown_git_revision__", + "headless": "", + "http_proxy": "{{env `http_proxy`}}", + "https_proxy": "{{env `https_proxy`}}", + "iso_checksum": "3e2f09b0a5dc04f4b8cafa174ab971b7355b8f6c22925aab1d1817fff5c7e549", + "iso_checksum_type": "sha256", + "iso_name": "SLES-11-SP4-DVD-i586-GM-DVD1.iso", + "metadata": "floppy/dummy_metadata.json", + "mirror": "http://cdn.novell.com/prot/46PZWZ91TPo~", + "name": "sles-11-sp4-i386", + "template": "sles-11-sp4-i386", + "version": "2.0.TIMESTAMP" + } +} diff --git a/sles-11-sp4-x86_64.json b/sles-11-sp4-x86_64.json new file mode 100644 index 000000000..99afcb614 --- /dev/null +++ b/sles-11-sp4-x86_64.json @@ -0,0 +1,191 @@ +{ + "builders": [ + { + "boot_command": [ + "<esc><enter><wait>", + "linux netdevice=eth0 netsetup=dhcp install=cd:/<wait>", + " lang=en_US autoyast=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `autoinst_cfg`}}<wait>", + " textmode=1<wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 20480, + "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "guest_os_type": "OpenSUSE_64", + "hard_drive_interface": "sata", + "headless": "{{ user `headless` }}", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-virtualbox", + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "virtualbox-iso", + "vboxmanage": [ + [ + "modifyvm", + "{{.Name}}", + "--memory", + "480" + ], + [ + "modifyvm", + "{{.Name}}", + "--cpus", + "1" + ] + ], + "virtualbox_version_file": ".vbox_version", + "vm_name": "{{ user `template` }}" + }, + { + "boot_command": [ + "<esc><enter><wait>", + "linux netdevice=eth0 netsetup=dhcp install=cd:/<wait>", + " lang=en_US autoyast=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `autoinst_cfg`}}", + " textmode=1<wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 20480, + "guest_os_type": "sles11-64", + "headless": "{{ user `headless` }}", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-vmware", + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "tools_upload_flavor": "linux", + "type": "vmware-iso", + "vm_name": "{{ user `template` }}", + "vmx_data": { + "cpuid.coresPerSocket": "1", + "memsize": "480", + "numvcpus": "1" + } + }, + { + "boot_command": [ + "<esc><enter><wait>", + "linux netdevice=eth0 netsetup=dhcp install=cd:/<wait>", + " lang=en_US autoyast=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `autoinst_cfg`}}<wait>", + " textmode=1<wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 20480, + "guest_os_type": "suse", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-parallels", + "parallels_tools_flavor": "lin", + "prlctl": [ + [ + "set", + "{{.Name}}", + "--memsize", + "480" + ], + [ + "set", + "{{.Name}}", + "--cpus", + "1" + ] + ], + "prlctl_version_file": ".prlctl_version", + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "parallels-iso", + "vm_name": "{{ user `template` }}" + }, + { + "boot_command": [ + "<esc><enter><wait>", + "linux netdevice=eth0 netsetup=dhcp install=cd:/<wait>", + " lang=en_US autoyast=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `autoinst_cfg`}}<wait>", + " textmode=1<wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 20480, + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-qemu", + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "qemu", + "vm_name": "{{ user `template` }}" + } + ], + "post-processors": [ + { + "output": "builds/{{user `box_basename`}}.{{.Provider}}.box", + "type": "vagrant" + } + ], + "provisioners": [ + { + "destination": "/tmp/bento-metadata.json", + "source": "{{user `metadata`}}", + "type": "file" + }, + { + "environment_vars": [ + "HOME_DIR=/home/vagrant", + "http_proxy={{user `http_proxy`}}", + "https_proxy={{user `https_proxy`}}", + "no_proxy={{user `no_proxy`}}" + ], + "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh '{{.Path}}'", + "scripts": [ + "scripts/common/metadata.sh", + "scripts/common/sshd.sh", + "scripts/common/vagrant.sh", + "scripts/common/vmtools.sh", + "scripts/sles/sudoers.sh", + "scripts/sles/zypper-locks.sh", + "scripts/sles/remove-dvd-source.sh", + "scripts/common/minimize.sh" + ], + "type": "shell" + } + ], + "variables": { + "arch": "64", + "autoinst_cfg": "sles-11/sles-11-sp4-x86_64-autoinst.xml", + "box_basename": "sles-11-sp4", + "build_timestamp": "{{isotime \"20060102150405\"}}", + "git_revision": "__unknown_git_revision__", + "headless": "", + "http_proxy": "{{env `http_proxy`}}", + "https_proxy": "{{env `https_proxy`}}", + "iso_checksum": "4fbf22201876d571c719328f385d87d6d690fb3ceb5e093108cdf0373c43e855", + "iso_checksum_type": "sha256", + "iso_name": "SLES-11-SP4-DVD-x86_64-GM-DVD1.iso", + "metadata": "floppy/dummy_metadata.json", + "mirror": "http://cdn.novell.com/prot/l7C51hFz57E~", + "name": "sles-11-sp4", + "template": "sles-11-sp4-x86_64", + "version": "2.2.TIMESTAMP" + } +} diff --git a/sles-12-x86_64.json b/sles-12-x86_64.json index 688e76130..5f2b60d7f 100644 --- a/sles-12-x86_64.json +++ b/sles-12-x86_64.json @@ -4,7 +4,7 @@ "boot_command": [ "<esc><enter><wait>", "linux netdevice=eth0 netsetup=dhcp install=cd:/<wait>", - " lang=en_US autoyast=http://{{ .HTTPIP }}:{{ .HTTPPort }}/sles-12/sles-12-x86_64-autoinst.xml<wait>", + " lang=en_US autoyast=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `autoinst_cfg`}}<wait>", " textmode=1<wait>", "<enter><wait>" ], @@ -15,11 +15,11 @@ "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", "http_directory": "http", - "iso_checksum": "58086fca0441b1d44c7a51c5ee64e1bd4365466fcee48ec92c4f39d07739aeed", - "iso_checksum_type": "sha256", - "iso_url": "{{user `mirror`}}/SLE-12-Server-DVD-x86_64-GM-DVD1.iso", - "output_directory": "packer-sles-12-x86_64-virtualbox", - "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-virtualbox", + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", @@ -46,7 +46,7 @@ "boot_command": [ "<esc><enter><wait>", "linux netdevice=eth0 netsetup=dhcp install=cd:/<wait>", - " lang=en_US autoyast=http://{{ .HTTPIP }}:{{ .HTTPPort }}/sles-12/sles-12-x86_64-autoinst.xml", + " lang=en_US autoyast=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `autoinst_cfg`}}<wait>", " textmode=1<wait>", "<enter><wait>" ], @@ -55,11 +55,11 @@ "guest_os_type": "sles11-64", "headless": "{{ user `headless` }}", "http_directory": "http", - "iso_checksum": "58086fca0441b1d44c7a51c5ee64e1bd4365466fcee48ec92c4f39d07739aeed", - "iso_checksum_type": "sha256", - "iso_url": "{{user `mirror`}}/SLE-12-Server-DVD-x86_64-GM-DVD1.iso", - "output_directory": "packer-sles-12-sp3-x86_64-vmware", - "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-vmware", + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", @@ -77,7 +77,7 @@ "boot_command": [ "<esc><enter><wait>", "linux netdevice=eth0 netsetup=dhcp install=cd:/<wait>", - " lang=en_US autoyast=http://{{ .HTTPIP }}:{{ .HTTPPort }}/sles-12/sles-12-x86_64-autoinst.xml<wait>", + " lang=en_US autoyast=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `autoinst_cfg`}}<wait>", " textmode=1<wait>", "<enter><wait>" ], @@ -85,10 +85,10 @@ "disk_size": 20480, "guest_os_type": "suse", "http_directory": "http", - "iso_checksum": "58086fca0441b1d44c7a51c5ee64e1bd4365466fcee48ec92c4f39d07739aeed", - "iso_checksum_type": "sha256", - "iso_url": "{{user `mirror`}}/SLE-12-Server-DVD-x86_64-GM-DVD1.iso", - "output_directory": "packer-sles-12-x86_64-parallels", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-parallels", "parallels_tools_flavor": "lin", "prlctl": [ [ @@ -105,7 +105,7 @@ ] ], "prlctl_version_file": ".prlctl_version", - "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", @@ -117,18 +117,18 @@ "boot_command": [ "<esc><enter><wait>", "linux netdevice=eth0 netsetup=dhcp install=cd:/<wait>", - " lang=en_US autoyast=http://{{ .HTTPIP }}:{{ .HTTPPort }}/sles-12/sles-12-x86_64-autoinst.xml<wait>", + " lang=en_US autoyast=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `autoinst_cfg`}}<wait>", " textmode=1<wait>", "<enter><wait>" ], "boot_wait": "10s", "disk_size": 20480, "http_directory": "http", - "iso_checksum": "58086fca0441b1d44c7a51c5ee64e1bd4365466fcee48ec92c4f39d07739aeed", - "iso_checksum_type": "sha256", - "iso_url": "{{user `mirror`}}/SLE-12-Server-DVD-x86_64-GM-DVD1.iso", - "output_directory": "packer-sles-12-x86_64-qemu", - "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-qemu", + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", @@ -150,7 +150,12 @@ "type": "file" }, { - "environment_vars": [], + "environment_vars": [ + "HOME_DIR=/home/vagrant", + "http_proxy={{user `http_proxy`}}", + "https_proxy={{user `https_proxy`}}", + "no_proxy={{user `no_proxy`}}" + ], "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh '{{.Path}}'", "scripts": [ "scripts/common/metadata.sh", @@ -169,15 +174,20 @@ ], "variables": { "arch": "64", + "autoinst_cfg": "sles-12/sles-12-x86_64-autoinst.xml", "box_basename": "sles-12", "build_timestamp": "{{isotime \"20060102150405\"}}", "git_revision": "__unknown_git_revision__", "headless": "", + "http_proxy": "{{env `http_proxy`}}", + "https_proxy": "{{env `https_proxy`}}", + "iso_checksum": "58086fca0441b1d44c7a51c5ee64e1bd4365466fcee48ec92c4f39d07739aeed", + "iso_checksum_type": "sha256", + "iso_name": "SLE-12-Server-DVD-x86_64-GM-DVD1.iso", "metadata": "floppy/dummy_metadata.json", - "mirror": "http://cdn2.novell.com/prot/Q_VbW21BiB4~", + "mirror": "http://cdn.novell.com/prot/1RBC-NrdggI~", "name": "sles-12", "template": "sles-12-x86_64", - "version": "2.0.TIMESTAMP" + "version": "2.2.TIMESTAMP" } } - From ca861e2e07c56a9c095934c99ef3b4989bb68086 Mon Sep 17 00:00:00 2001 From: Seth Thomas <sthomas@chef.io> Date: Tue, 13 Oct 2015 09:21:43 -0700 Subject: [PATCH 0432/1622] DRY up rhel --- rhel-5.11-i386.json | 66 +++++++++------- rhel-5.11-x86_64.json | 66 +++++++++------- rhel-6.6-i386.json | 65 +++++++++------- rhel-6.6-x86_64.json | 66 +++++++++------- rhel-6.7-i386.json | 176 ++++++++++++++++++++++++++++++++++++++++++ rhel-6.7-x86_64.json | 176 ++++++++++++++++++++++++++++++++++++++++++ rhel-7.1-x86_64.json | 66 +++++++++------- 7 files changed, 547 insertions(+), 134 deletions(-) create mode 100644 rhel-6.7-i386.json create mode 100644 rhel-6.7-x86_64.json diff --git a/rhel-5.11-i386.json b/rhel-5.11-i386.json index 76ced93c2..ef2142a1a 100644 --- a/rhel-5.11-i386.json +++ b/rhel-5.11-i386.json @@ -2,7 +2,7 @@ "builders": [ { "boot_command": [ - "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/centos-5.11/ks.cfg<enter><wait>" + "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], "boot_wait": "10s", "disk_size": 40960, @@ -11,11 +11,11 @@ "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", "http_directory": "http", - "iso_checksum": "4e38e4ed06d83efb10446e7db19d96761715cdbdbf0bbfacb978b44ce368bbe2", - "iso_checksum_type": "sha256", - "iso_url": "{{user `mirror`}}/rhel-server-5.11-i386-dvd.iso", - "output_directory": "packer-rhel-5.11-i386-virtualbox", - "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-virtualbox", + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", @@ -40,18 +40,18 @@ }, { "boot_command": [ - "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/centos-5.11/ks.cfg<enter><wait>" + "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], "boot_wait": "10s", "disk_size": 40960, "guest_os_type": "redhat", "headless": "{{ user `headless` }}", "http_directory": "http", - "iso_checksum": "4e38e4ed06d83efb10446e7db19d96761715cdbdbf0bbfacb978b44ce368bbe2", - "iso_checksum_type": "sha256", - "iso_url": "{{user `mirror`}}/rhel-server-5.11-i386-dvd.iso", - "output_directory": "packer-rhel-5.11-i386-vmware", - "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-vmware", + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", @@ -67,16 +67,16 @@ }, { "boot_command": [ - "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/centos-5.11/ks.cfg<enter><wait>" + "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], "boot_wait": "10s", "disk_size": 40960, "guest_os_type": "rhel", "http_directory": "http", - "iso_checksum": "4e38e4ed06d83efb10446e7db19d96761715cdbdbf0bbfacb978b44ce368bbe2", - "iso_checksum_type": "sha256", - "iso_url": "{{user `mirror`}}/rhel-server-5.11-i386-dvd.iso", - "output_directory": "packer-rhel-5.11-i386-parallels", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-parallels", "parallels_tools_flavor": "lin", "prlctl": [ [ @@ -93,7 +93,7 @@ ] ], "prlctl_version_file": ".prlctl_version", - "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", @@ -103,14 +103,14 @@ }, { "boot_command": [ - "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/centos-5.11/ks.cfg<enter><wait>" + "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], "boot_wait": "10s", "disk_size": 40960, "http_directory": "http", - "iso_checksum": "4e38e4ed06d83efb10446e7db19d96761715cdbdbf0bbfacb978b44ce368bbe2", - "iso_checksum_type": "sha256", - "iso_url": "{{user `mirror`}}/rhel-server-5.11-i386-dvd.iso", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", "output_directory": "packer-{{user `template`}}-qemu", "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", @@ -134,8 +134,13 @@ "type": "file" }, { - "environment_vars": [], - "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E bash '{{.Path}}'", + "environment_vars": [ + "HOME_DIR=/home/vagrant", + "http_proxy={{user `http_proxy`}}", + "https_proxy={{user `https_proxy`}}", + "no_proxy={{user `no_proxy`}}" + ], + "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", "scripts": [ "scripts/common/metadata.sh", "scripts/common/vagrant.sh", @@ -153,11 +158,18 @@ "build_timestamp": "{{isotime \"20060102150405\"}}", "git_revision": "__unknown_git_revision__", "headless": "", + "http_proxy": "{{env `http_proxy`}}", + "https_proxy": "{{env `https_proxy`}}", + "iso_checksum": "4e38e4ed06d83efb10446e7db19d96761715cdbdbf0bbfacb978b44ce368bbe2", + "iso_checksum_type": "sha256", + "iso_name": "rhel-server-5.11-i386-dvd.iso", + "ks_path": "centos-5.11/ks.cfg", "metadata": "floppy/dummy_metadata.json", - "mirror": "https://content-web.rhn.redhat.com/rhn/isos/rhel-5.11/md5sum/1ab756241a4a209b8d39abe6bace84a9", + "mirror": "http://YOU-MUST-PROVIDE-YOUR-OWN-ISO.sorry", + "mirror_directory": "rhel", "name": "rhel-5.11-i386", + "no_proxy": "{{env `no_proxy`}}", "template": "rhel-5.11-i386", - "version": "2.0.TIMESTAMP" + "version": "2.2.TIMESTAMP" } } - diff --git a/rhel-5.11-x86_64.json b/rhel-5.11-x86_64.json index d710fb684..e6c71dcbf 100644 --- a/rhel-5.11-x86_64.json +++ b/rhel-5.11-x86_64.json @@ -2,7 +2,7 @@ "builders": [ { "boot_command": [ - "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/centos-5.11/ks.cfg<enter><wait>" + "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], "boot_wait": "10s", "disk_size": 40960, @@ -11,11 +11,11 @@ "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", "http_directory": "http", - "iso_checksum": "36565fe0c8a97207d63234d10123daeedb29d509576dbd7b34e71958ac2f9050", - "iso_checksum_type": "sha256", - "iso_url": "{{user `mirror`}}/rhel-server-5.11-x86_64-dvd.iso", - "output_directory": "packer-rhel-5.11-x86_64-virtualbox", - "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-virtualbox", + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", @@ -40,18 +40,18 @@ }, { "boot_command": [ - "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/centos-5.11/ks.cfg<enter><wait>" + "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], "boot_wait": "10s", "disk_size": 40960, "guest_os_type": "rhel5-64", "headless": "{{ user `headless` }}", "http_directory": "http", - "iso_checksum": "36565fe0c8a97207d63234d10123daeedb29d509576dbd7b34e71958ac2f9050", - "iso_checksum_type": "sha256", - "iso_url": "{{user `mirror`}}/rhel-server-5.11-x86_64-dvd.iso", - "output_directory": "packer-rhel-5.11-x86_64-vmware", - "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-vmware", + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", @@ -67,16 +67,16 @@ }, { "boot_command": [ - "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/centos-5.11/ks.cfg<enter><wait>" + "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], "boot_wait": "10s", "disk_size": 40960, "guest_os_type": "rhel", "http_directory": "http", - "iso_checksum": "36565fe0c8a97207d63234d10123daeedb29d509576dbd7b34e71958ac2f9050", - "iso_checksum_type": "sha256", - "iso_url": "{{user `mirror`}}/rhel-server-5.11-x86_64-dvd.iso", - "output_directory": "packer-rhel-5.11-x86_64-parallels", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-parallels", "parallels_tools_flavor": "lin", "prlctl": [ [ @@ -93,7 +93,7 @@ ] ], "prlctl_version_file": ".prlctl_version", - "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", @@ -103,14 +103,14 @@ }, { "boot_command": [ - "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/centos-5.11/ks.cfg<enter><wait>" + "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], "boot_wait": "10s", "disk_size": 40960, "http_directory": "http", - "iso_checksum": "36565fe0c8a97207d63234d10123daeedb29d509576dbd7b34e71958ac2f9050", - "iso_checksum_type": "sha256", - "iso_url": "{{user `mirror`}}/rhel-server-5.11-x86_64-dvd.iso", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", "output_directory": "packer-{{user `template`}}-qemu", "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", @@ -134,8 +134,13 @@ "type": "file" }, { - "environment_vars": [], - "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E bash '{{.Path}}'", + "environment_vars": [ + "HOME_DIR=/home/vagrant", + "http_proxy={{user `http_proxy`}}", + "https_proxy={{user `https_proxy`}}", + "no_proxy={{user `no_proxy`}}" + ], + "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", "scripts": [ "scripts/common/metadata.sh", "scripts/common/vagrant.sh", @@ -153,11 +158,18 @@ "build_timestamp": "{{isotime \"20060102150405\"}}", "git_revision": "__unknown_git_revision__", "headless": "", + "http_proxy": "{{env `http_proxy`}}", + "https_proxy": "{{env `https_proxy`}}", + "iso_checksum": "36565fe0c8a97207d63234d10123daeedb29d509576dbd7b34e71958ac2f9050", + "iso_checksum_type": "sha256", + "iso_name": "rhel-server-5.11-x86_64-dvd.iso", + "ks_path": "centos-5.11/ks.cfg", "metadata": "floppy/dummy_metadata.json", - "mirror": "https://content-web.rhn.redhat.com/rhn/isos/rhel-5.11/md5sum/86cc2d5548ee2ff9c8d3e2b4db3e6001", + "mirror": "http://YOU-MUST-PROVIDE-YOUR-OWN-ISO.sorry", + "mirror_directory": "rhel", "name": "rhel-5.11", + "no_proxy": "{{env `no_proxy`}}", "template": "rhel-5.11-x86_64", - "version": "2.0.TIMESTAMP" + "version": "2.2.TIMESTAMP" } } - diff --git a/rhel-6.6-i386.json b/rhel-6.6-i386.json index 8cdf39b76..4e21635f8 100644 --- a/rhel-6.6-i386.json +++ b/rhel-6.6-i386.json @@ -2,7 +2,7 @@ "builders": [ { "boot_command": [ - "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/centos-6.6/ks.cfg<enter><wait>" + "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], "boot_wait": "10s", "disk_size": 40960, @@ -11,11 +11,11 @@ "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", "http_directory": "http", - "iso_checksum": "0a14ed1f7d7ea7b831739ed8e71719d9cb7c294bf801e8db39358651768547ad", - "iso_checksum_type": "sha256", - "iso_url": "{{user `mirror`}}/rhel-server-6.6-i386-dvd.iso", - "output_directory": "packer-rhel-6.6-i386-virtualbox", - "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-virtualbox", + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", @@ -40,18 +40,18 @@ }, { "boot_command": [ - "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/centos-6.6/ks.cfg<enter><wait>" + "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], "boot_wait": "10s", "disk_size": 40960, "guest_os_type": "redhat", "headless": "{{ user `headless` }}", "http_directory": "http", - "iso_checksum": "0a14ed1f7d7ea7b831739ed8e71719d9cb7c294bf801e8db39358651768547ad", - "iso_checksum_type": "sha256", - "iso_url": "{{user `mirror`}}/rhel-server-6.6-i386-dvd.iso", - "output_directory": "packer-rhel-6.6-i386-vmware", - "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-vmware", + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", @@ -67,16 +67,16 @@ }, { "boot_command": [ - "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/centos-6.6/ks.cfg<enter><wait>" + "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], "boot_wait": "10s", "disk_size": 40960, "guest_os_type": "rhel", "http_directory": "http", - "iso_checksum": "0a14ed1f7d7ea7b831739ed8e71719d9cb7c294bf801e8db39358651768547ad", - "iso_checksum_type": "sha256", - "iso_url": "{{user `mirror`}}/rhel-server-6.6-i386-dvd.iso", - "output_directory": "packer-rhel-6.6-i386-parallels", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-parallels", "parallels_tools_flavor": "lin", "prlctl": [ [ @@ -93,7 +93,7 @@ ] ], "prlctl_version_file": ".prlctl_version", - "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", @@ -103,14 +103,14 @@ }, { "boot_command": [ - "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/centos-6.6/ks.cfg<enter><wait>" + "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], "boot_wait": "10s", "disk_size": 40960, "http_directory": "http", - "iso_checksum": "0a14ed1f7d7ea7b831739ed8e71719d9cb7c294bf801e8db39358651768547ad", - "iso_checksum_type": "sha256", - "iso_url": "{{user `mirror`}}/rhel-server-6.6-i386-dvd.iso", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", "output_directory": "packer-{{user `template`}}-qemu", "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", @@ -134,8 +134,13 @@ "type": "file" }, { - "environment_vars": [], - "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E bash '{{.Path}}'", + "environment_vars": [ + "HOME_DIR=/home/vagrant", + "http_proxy={{user `http_proxy`}}", + "https_proxy={{user `https_proxy`}}", + "no_proxy={{user `no_proxy`}}" + ], + "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", "scripts": [ "scripts/common/metadata.sh", "scripts/centos/networking.sh", @@ -154,11 +159,19 @@ "build_timestamp": "{{isotime \"20060102150405\"}}", "git_revision": "__unknown_git_revision__", "headless": "", + "http_proxy": "{{env `http_proxy`}}", + "https_proxy": "{{env `https_proxy`}}", + "iso_checksum": "0a14ed1f7d7ea7b831739ed8e71719d9cb7c294bf801e8db39358651768547ad", + "iso_checksum_type": "sha256", + "iso_name": "rhel-server-6.6-i386-dvd.iso", + "ks_path": "centos-6.7/ks.cfg", "metadata": "floppy/dummy_metadata.json", - "mirror": "https://content-web.rhn.redhat.com/rhn/isos/rhel-6.6/md5sum/64e687f958db92feccc3f7701a8771f8", + "mirror": "http://YOU-MUST-PROVIDE-YOUR-OWN-ISO.sorry", + "mirror_directory": "rhel", "name": "rhel-6.6-i386", + "no_proxy": "{{env `no_proxy`}}", "template": "rhel-6.6-i386", - "version": "2.0.TIMESTAMP" + "version": "2.2.TIMESTAMP" } } diff --git a/rhel-6.6-x86_64.json b/rhel-6.6-x86_64.json index 337cb5fce..094ae7f9d 100644 --- a/rhel-6.6-x86_64.json +++ b/rhel-6.6-x86_64.json @@ -2,7 +2,7 @@ "builders": [ { "boot_command": [ - "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/centos-6.6/ks.cfg<enter><wait>" + "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], "boot_wait": "10s", "disk_size": 40960, @@ -11,11 +11,11 @@ "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", "http_directory": "http", - "iso_checksum": "16044cb7264f4bc0150f5b6f3f66936ccf2d36e0a4152c00d9236fb7dcae5f32", - "iso_checksum_type": "sha256", - "iso_url": "{{user `mirror`}}/rhel-server-6.6-x86_64-dvd.iso", - "output_directory": "packer-rhel-6.6-x86_64-virtualbox", - "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-virtualbox", + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", @@ -40,18 +40,18 @@ }, { "boot_command": [ - "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/centos-6.6/ks.cfg<enter><wait>" + "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], "boot_wait": "10s", "disk_size": 40960, "guest_os_type": "rhel6-64", "headless": "{{ user `headless` }}", "http_directory": "http", - "iso_checksum": "16044cb7264f4bc0150f5b6f3f66936ccf2d36e0a4152c00d9236fb7dcae5f32", - "iso_checksum_type": "sha256", - "iso_url": "{{user `mirror`}}/rhel-server-6.6-x86_64-dvd.iso", - "output_directory": "packer-rhel-6.6-x86_64-vmware", - "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-vmware", + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", @@ -67,16 +67,16 @@ }, { "boot_command": [ - "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/centos-6.6/ks.cfg<enter><wait>" + "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], "boot_wait": "10s", "disk_size": 40960, "guest_os_type": "rhel", "http_directory": "http", - "iso_checksum": "16044cb7264f4bc0150f5b6f3f66936ccf2d36e0a4152c00d9236fb7dcae5f32", - "iso_checksum_type": "sha256", - "iso_url": "{{user `mirror`}}/rhel-server-6.6-x86_64-dvd.iso", - "output_directory": "packer-rhel-6.6-x86_64-parallels", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-parallels", "parallels_tools_flavor": "lin", "prlctl": [ [ @@ -93,7 +93,7 @@ ] ], "prlctl_version_file": ".prlctl_version", - "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", @@ -103,14 +103,14 @@ }, { "boot_command": [ - "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/centos-6.6/ks.cfg<enter><wait>" + "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], "boot_wait": "10s", "disk_size": 40960, "http_directory": "http", - "iso_checksum": "16044cb7264f4bc0150f5b6f3f66936ccf2d36e0a4152c00d9236fb7dcae5f32", - "iso_checksum_type": "sha256", - "iso_url": "{{user `mirror`}}/rhel-server-6.6-x86_64-dvd.iso", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", "output_directory": "packer-{{user `template`}}-qemu", "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", @@ -134,8 +134,13 @@ "type": "file" }, { - "environment_vars": [], - "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E bash '{{.Path}}'", + "environment_vars": [ + "HOME_DIR=/home/vagrant", + "http_proxy={{user `http_proxy`}}", + "https_proxy={{user `https_proxy`}}", + "no_proxy={{user `no_proxy`}}" + ], + "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", "scripts": [ "scripts/common/metadata.sh", "scripts/centos/networking.sh", @@ -154,11 +159,18 @@ "build_timestamp": "{{isotime \"20060102150405\"}}", "git_revision": "__unknown_git_revision__", "headless": "", + "http_proxy": "{{env `http_proxy`}}", + "https_proxy": "{{env `https_proxy`}}", + "iso_checksum": "16044cb7264f4bc0150f5b6f3f66936ccf2d36e0a4152c00d9236fb7dcae5f32", + "iso_checksum_type": "sha256", + "iso_name": "rhel-server-6.6-x86_64-dvd.iso", + "ks_path": "centos-6.7/ks.cfg", "metadata": "floppy/dummy_metadata.json", - "mirror": "https://content-web.rhn.redhat.com/rhn/isos/rhel-6.6/md5sum/ef031b0ae8458d6489eb277ba1dcb5de", + "mirror": "http://YOU-MUST-PROVIDE-YOUR-OWN-ISO.sorry", + "mirror_directory": "rhel", "name": "rhel-6.6", + "no_proxy": "{{env `no_proxy`}}", "template": "rhel-6.6-x86_64", - "version": "2.0.TIMESTAMP" + "version": "2.2.TIMESTAMP" } } - diff --git a/rhel-6.7-i386.json b/rhel-6.7-i386.json new file mode 100644 index 000000000..5eaa2fcb2 --- /dev/null +++ b/rhel-6.7-i386.json @@ -0,0 +1,176 @@ +{ + "builders": [ + { + "boot_command": [ + "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "guest_os_type": "RedHat", + "hard_drive_interface": "sata", + "headless": "{{ user `headless` }}", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-virtualbox", + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "virtualbox-iso", + "vboxmanage": [ + [ + "modifyvm", + "{{.Name}}", + "--memory", + "480" + ], + [ + "modifyvm", + "{{.Name}}", + "--cpus", + "1" + ] + ], + "virtualbox_version_file": ".vbox_version", + "vm_name": "{{ user `template` }}" + }, + { + "boot_command": [ + "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "guest_os_type": "redhat", + "headless": "{{ user `headless` }}", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-vmware", + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "tools_upload_flavor": "linux", + "type": "vmware-iso", + "vm_name": "{{ user `template` }}", + "vmx_data": { + "cpuid.coresPerSocket": "1", + "memsize": "480", + "numvcpus": "1" + } + }, + { + "boot_command": [ + "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "guest_os_type": "rhel", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-parallels", + "parallels_tools_flavor": "lin", + "prlctl": [ + [ + "set", + "{{.Name}}", + "--memsize", + "480" + ], + [ + "set", + "{{.Name}}", + "--cpus", + "1" + ] + ], + "prlctl_version_file": ".prlctl_version", + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "parallels-iso", + "vm_name": "{{ user `template` }}" + }, + { + "boot_command": [ + "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-qemu", + "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "qemu", + "vm_name": "{{ user `template` }}" + } + ], + "post-processors": [ + { + "output": "builds/{{user `box_basename`}}.{{.Provider}}.box", + "type": "vagrant" + } + ], + "provisioners": [ + { + "destination": "/tmp/bento-metadata.json", + "source": "{{user `metadata`}}", + "type": "file" + }, + { + "environment_vars": [ + "HOME_DIR=/home/vagrant", + "http_proxy={{user `http_proxy`}}", + "https_proxy={{user `https_proxy`}}", + "no_proxy={{user `no_proxy`}}" + ], + "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", + "scripts": [ + "scripts/common/metadata.sh", + "scripts/centos/networking.sh", + "scripts/common/sshd.sh", + "scripts/common/vagrant.sh", + "scripts/common/vmtools.sh", + "scripts/centos/cleanup.sh", + "scripts/common/minimize.sh" + ], + "type": "shell" + } + ], + "variables": { + "arch": "32", + "box_basename": "rhel-6.7-i386", + "build_timestamp": "{{isotime \"20060102150405\"}}", + "git_revision": "__unknown_git_revision__", + "headless": "", + "http_proxy": "{{env `http_proxy`}}", + "https_proxy": "{{env `https_proxy`}}", + "iso_checksum": "4f70a74d676c74609586d616648d7cd5720d48dcf789be10cc1da429d6734078", + "iso_checksum_type": "sha256", + "iso_name": "rhel-server-6.7-i386-dvd.iso", + "ks_path": "centos-6.7/ks.cfg", + "metadata": "floppy/dummy_metadata.json", + "mirror": "http://YOU-MUST-PROVIDE-YOUR-OWN-ISO.sorry", + "mirror_directory": "rhel", + "name": "rhel-6.7-i386", + "no_proxy": "{{env `no_proxy`}}", + "template": "rhel-6.7-i386", + "version": "2.2.TIMESTAMP" + } +} diff --git a/rhel-6.7-x86_64.json b/rhel-6.7-x86_64.json new file mode 100644 index 000000000..04cebcad6 --- /dev/null +++ b/rhel-6.7-x86_64.json @@ -0,0 +1,176 @@ +{ + "builders": [ + { + "boot_command": [ + "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "guest_os_type": "RedHat_64", + "hard_drive_interface": "sata", + "headless": "{{ user `headless` }}", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-virtualbox", + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "virtualbox-iso", + "vboxmanage": [ + [ + "modifyvm", + "{{.Name}}", + "--memory", + "480" + ], + [ + "modifyvm", + "{{.Name}}", + "--cpus", + "1" + ] + ], + "virtualbox_version_file": ".vbox_version", + "vm_name": "{{ user `template` }}" + }, + { + "boot_command": [ + "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "guest_os_type": "oraclelinux-64", + "headless": "{{ user `headless` }}", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-vmware", + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "tools_upload_flavor": "linux", + "type": "vmware-iso", + "vm_name": "{{ user `template` }}", + "vmx_data": { + "cpuid.coresPerSocket": "1", + "memsize": "480", + "numvcpus": "1" + } + }, + { + "boot_command": [ + "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "guest_os_type": "rhel", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-parallels", + "parallels_tools_flavor": "lin", + "prlctl": [ + [ + "set", + "{{.Name}}", + "--memsize", + "480" + ], + [ + "set", + "{{.Name}}", + "--cpus", + "1" + ] + ], + "prlctl_version_file": ".prlctl_version", + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "parallels-iso", + "vm_name": "{{ user `template` }}" + }, + { + "boot_command": [ + "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-qemu", + "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "qemu", + "vm_name": "{{ user `template` }}" + } + ], + "post-processors": [ + { + "output": "builds/{{user `box_basename`}}.{{.Provider}}.box", + "type": "vagrant" + } + ], + "provisioners": [ + { + "destination": "/tmp/bento-metadata.json", + "source": "{{user `metadata`}}", + "type": "file" + }, + { + "environment_vars": [ + "HOME_DIR=/home/vagrant", + "http_proxy={{user `http_proxy`}}", + "https_proxy={{user `https_proxy`}}", + "no_proxy={{user `no_proxy`}}" + ], + "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", + "scripts": [ + "scripts/common/metadata.sh", + "scripts/centos/networking.sh", + "scripts/common/sshd.sh", + "scripts/common/vagrant.sh", + "scripts/common/vmtools.sh", + "scripts/centos/cleanup.sh", + "scripts/common/minimize.sh" + ], + "type": "shell" + } + ], + "variables": { + "arch": "64", + "box_basename": "rhel-6.7", + "build_timestamp": "{{isotime \"20060102150405\"}}", + "git_revision": "__unknown_git_revision__", + "headless": "", + "http_proxy": "{{env `http_proxy`}}", + "https_proxy": "{{env `https_proxy`}}", + "iso_checksum": "0e0acb2a544f4d58f10292144161f40439734c6e98b13ba8c595372b20354bc5", + "iso_checksum_type": "sha256", + "iso_name": "rhel-server-6.7-x86_64-dvd.iso", + "ks_path": "centos-6.7/ks.cfg", + "metadata": "floppy/dummy_metadata.json", + "mirror": "http://YOU-MUST-PROVIDE-YOUR-OWN-ISO.sorry", + "mirror_directory": "rhel", + "name": "rhel-6.7", + "no_proxy": "{{env `no_proxy`}}", + "template": "rhel-6.7-x86_64", + "version": "2.2.TIMESTAMP" + } +} diff --git a/rhel-7.1-x86_64.json b/rhel-7.1-x86_64.json index c996cd70c..14065b554 100644 --- a/rhel-7.1-x86_64.json +++ b/rhel-7.1-x86_64.json @@ -2,7 +2,7 @@ "builders": [ { "boot_command": [ - "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/centos-7.1/ks.cfg<enter><wait>" + "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], "boot_wait": "10s", "disk_size": 40960, @@ -11,11 +11,11 @@ "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", "http_directory": "http", - "iso_checksum": "3685468ec6cdcb70dfc85ebbc164da427dc2d762644c3c2ee1520f4f661c15ce", - "iso_checksum_type": "sha256", - "iso_url": "{{user `mirror`}}/rhel-server-7.1-x86_64-dvd.iso", - "output_directory": "packer-rhel-7.1-x86_64-virtualbox", - "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-virtualbox", + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", @@ -40,18 +40,18 @@ }, { "boot_command": [ - "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/centos-7.1/ks.cfg<enter><wait>" + "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], "boot_wait": "10s", "disk_size": 40960, "guest_os_type": "rhel7-64", "headless": "{{ user `headless` }}", "http_directory": "http", - "iso_checksum": "3685468ec6cdcb70dfc85ebbc164da427dc2d762644c3c2ee1520f4f661c15ce", - "iso_checksum_type": "sha256", - "iso_url": "{{user `mirror`}}/rhel-server-7.1-x86_64-dvd.iso", - "output_directory": "packer-rhel-7.1-x86_64-vmware", - "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-vmware", + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", @@ -67,16 +67,16 @@ }, { "boot_command": [ - "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/centos-7.1/ks.cfg<enter><wait>" + "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], "boot_wait": "10s", "disk_size": 40960, "guest_os_type": "rhel", "http_directory": "http", - "iso_checksum": "3685468ec6cdcb70dfc85ebbc164da427dc2d762644c3c2ee1520f4f661c15ce", - "iso_checksum_type": "sha256", - "iso_url": "{{user `mirror`}}/rhel-server-7.1-x86_64-dvd.iso", - "output_directory": "packer-rhel-7.1-x86_64-parallels", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-parallels", "parallels_tools_flavor": "lin", "prlctl": [ [ @@ -93,7 +93,7 @@ ] ], "prlctl_version_file": ".prlctl_version", - "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", @@ -103,14 +103,14 @@ }, { "boot_command": [ - "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/centos-7.1/ks.cfg<enter><wait>" + "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], "boot_wait": "10s", "disk_size": 40960, "http_directory": "http", - "iso_checksum": "3685468ec6cdcb70dfc85ebbc164da427dc2d762644c3c2ee1520f4f661c15ce", - "iso_checksum_type": "sha256", - "iso_url": "{{user `mirror`}}/rhel-server-7.1-x86_64-dvd.iso", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", "output_directory": "packer-{{user `template`}}-qemu", "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", @@ -134,8 +134,13 @@ "type": "file" }, { - "environment_vars": [], - "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E bash '{{.Path}}'", + "environment_vars": [ + "HOME_DIR=/home/vagrant", + "http_proxy={{user `http_proxy`}}", + "https_proxy={{user `https_proxy`}}", + "no_proxy={{user `no_proxy`}}" + ], + "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", "scripts": [ "scripts/common/metadata.sh", "scripts/centos/networking.sh", @@ -154,11 +159,18 @@ "build_timestamp": "{{isotime \"20060102150405\"}}", "git_revision": "__unknown_git_revision__", "headless": "", + "http_proxy": "{{env `http_proxy`}}", + "https_proxy": "{{env `https_proxy`}}", + "iso_checksum": "3685468ec6cdcb70dfc85ebbc164da427dc2d762644c3c2ee1520f4f661c15ce", + "iso_checksum_type": "sha256", + "iso_name": "rhel-server-7.1-x86_64-dvd.iso", + "ks_path": "centos-7.1/ks.cfg", "metadata": "floppy/dummy_metadata.json", - "mirror": "http://put-your-mirror-here/", + "mirror": "http://YOU-MUST-PROVIDE-YOUR-OWN-ISO.sorry", + "mirror_directory": "rhel", "name": "rhel-7.1", + "no_proxy": "{{env `no_proxy`}}", "template": "rhel-7.1-x86_64", - "version": "2.0.TIMESTAMP" + "version": "2.2.TIMESTAMP" } } - From 27e7ec8f53095cf2ce85f673418d2fbd6fcdb069 Mon Sep 17 00:00:00 2001 From: Seth Thomas <sthomas@chef.io> Date: Tue, 13 Oct 2015 09:39:17 -0700 Subject: [PATCH 0433/1622] Remove all bento-* vagrant instances prior to test --- Rakefile | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/Rakefile b/Rakefile index 1cbdb86e2..7c94a10cb 100644 --- a/Rakefile +++ b/Rakefile @@ -3,6 +3,7 @@ require 'json' require 'net/http' require 'kitchen' require 'aws-sdk' +require 'mixlib/shellout' # TODO: private boxes may need to specify a mirror @@ -222,11 +223,23 @@ def compute_metadata_files `ls builds/*.json`.split("\n") end +def destroy_all_bento + cmd = Mixlib::ShellOut.new("vagrant box list | grep 'bento-'") + cmd.run_command + boxes = cmd.stdout.split("\n") + + boxes.each do | box | + b = box.split(" ") + rm_cmd = Mixlib::ShellOut.new("vagrant box remove --force #{b[0]} --provider #{b[1].to_s.gsub(/(,|\()/, '')}") + puts "Removing #{b[0]} for provider #{b[1].to_s.gsub(/(,|\()/, '')}" + rm_cmd.run_command + end +end + def test_box(boxname, providers) providers.each do |provider, provider_data| - puts "Removing box: #{boxname} provider: #{provider}" - `vagrant box remove #{boxname} --provider #{provider}` + destroy_all_bento provider = 'vmware_fusion' if provider == 'vmware_desktop' @@ -240,7 +253,7 @@ def test_box(boxname, providers) {"name"=>"vagrant", "synced_folders"=>[[".", "/vagrant", "disabled: #{share_disabled}"]], "provider"=>provider, - "box"=>boxname, + "box"=>"bento-#{boxname}", "box_url"=>"file://#{ENV['PWD']}/builds/#{provider_data['file']}"}}], "suites"=>[{"name"=>"default", "run_list"=>nil, "attributes"=>{}}]} From 4897ed2b90530ff0edcdbf572fbbdc212d21b77b Mon Sep 17 00:00:00 2001 From: Seth Thomas <sthomas@chef.io> Date: Tue, 13 Oct 2015 09:58:07 -0700 Subject: [PATCH 0434/1622] Ignore .kitchen dir --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 8a63de8db..5f5d39ad7 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ packer.log /packer-*/ *.variables.json /builds/ +.kitchen From 238b70bfbcd4069951a622cf7834933876955cd6 Mon Sep 17 00:00:00 2001 From: Sheldon Hearn <sheldonh@starjuice.net> Date: Mon, 19 Oct 2015 23:39:25 +0200 Subject: [PATCH 0435/1622] Support swapless builders in minimize.sh The blkid utility returns exit status 2 when the requested label can't be found. --- scripts/common/minimize.sh | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/scripts/common/minimize.sh b/scripts/common/minimize.sh index 379e0f5de..1ca88bee9 100644 --- a/scripts/common/minimize.sh +++ b/scripts/common/minimize.sh @@ -4,7 +4,13 @@ case "$PACKER_BUILDER_TYPE" in qemu) exit 0 ;; esac +set +e swapuuid="`/sbin/blkid -o value -l -s UUID -t TYPE=swap`"; +case "$?" in + 2|0) ;; + *) exit 1 ;; +esac +set -e if [ "x${swapuuid}" != "x" ]; then # Whiteout the swap partition to reduce box size From d01cb1d73f8830d03a453a56b3b1c7d3a33106cd Mon Sep 17 00:00:00 2001 From: Seth Thomas <cheeseplus@getchef.io> Date: Mon, 19 Oct 2015 15:19:20 -0700 Subject: [PATCH 0436/1622] Add check to skip yum clean all on RHEL --- scripts/centos/cleanup.sh | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/scripts/centos/cleanup.sh b/scripts/centos/cleanup.sh index 89a2c91a1..faa7e0b49 100644 --- a/scripts/centos/cleanup.sh +++ b/scripts/centos/cleanup.sh @@ -1,8 +1,21 @@ #!/bin/sh -eux +if [ -s /etc/oracle-release ]; then + distro = 'oracle' +elif [ -s /etc/enterprise-release ]; then + distro = 'oracle' +elif [ -s /etc/redhat-release ]; then + # should ouput 'centos' OR 'red hat' + distro=`cat /etc/redhat-release | sed 's/^\(CentOS\|Red Hat\).*/\1/i' | tr '[:upper:]' '[:lower:]'` +fi + + # Remove development and kernel source packages yum -y remove gcc cpp kernel-devel kernel-headers perl; -yum -y clean all; + +if [ "$distro" != 'red hat' ]; then + yum -y clean all; +fi # Clean up network interface persistence rm -f /etc/udev/rules.d/70-persistent-net.rules; From 2e7b08f2d3923815c83e77b4d83c6cf093c4e872 Mon Sep 17 00:00:00 2001 From: Rickard von Essen <rickard.von.essen@gmail.com> Date: Wed, 28 Oct 2015 15:33:13 +0100 Subject: [PATCH 0437/1622] Ubuntu 15.10 support --- http/ubuntu-15.10/preseed.cfg | 31 ++++ ubuntu-15.10-amd64.json | 270 ++++++++++++++++++++++++++++++++++ ubuntu-15.10-i386.json | 270 ++++++++++++++++++++++++++++++++++ 3 files changed, 571 insertions(+) create mode 100644 http/ubuntu-15.10/preseed.cfg create mode 100644 ubuntu-15.10-amd64.json create mode 100644 ubuntu-15.10-i386.json diff --git a/http/ubuntu-15.10/preseed.cfg b/http/ubuntu-15.10/preseed.cfg new file mode 100644 index 000000000..0a4d4939b --- /dev/null +++ b/http/ubuntu-15.10/preseed.cfg @@ -0,0 +1,31 @@ +choose-mirror-bin mirror/http/proxy string +d-i base-installer/kernel/override-image string linux-server +d-i clock-setup/utc boolean true +d-i clock-setup/utc-auto boolean true +d-i finish-install/reboot_in_progress note +d-i grub-installer/only_debian boolean true +d-i grub-installer/with_other_os boolean true +d-i partman-auto-lvm/guided_size string max +d-i partman-auto/choose_recipe select atomic +d-i partman-auto/method string lvm +d-i partman-lvm/confirm boolean true +d-i partman-lvm/confirm boolean true +d-i partman-lvm/confirm_nooverwrite boolean true +d-i partman-lvm/device_remove_lvm boolean true +d-i partman/choose_partition select finish +d-i partman/confirm boolean true +d-i partman/confirm_nooverwrite boolean true +d-i partman/confirm_write_new_label boolean true +d-i passwd/user-fullname string vagrant +d-i passwd/user-uid string 900 +d-i passwd/user-password password vagrant +d-i passwd/user-password-again password vagrant +d-i passwd/username string vagrant +d-i pkgsel/include string openssh-server cryptsetup build-essential libssl-dev libreadline-dev zlib1g-dev linux-source dkms nfs-common +d-i pkgsel/install-language-support boolean false +d-i pkgsel/update-policy select unattended-upgrades +d-i pkgsel/upgrade select full-upgrade +d-i time/zone string UTC +d-i user-setup/allow-password-weak boolean true +d-i user-setup/encrypt-home boolean false +tasksel tasksel/first multiselect standard, ubuntu-server diff --git a/ubuntu-15.10-amd64.json b/ubuntu-15.10-amd64.json new file mode 100644 index 000000000..69f863ab3 --- /dev/null +++ b/ubuntu-15.10-amd64.json @@ -0,0 +1,270 @@ +{ + "builders": [ + { + "boot_command": [ + "<enter><wait><f6><esc><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs>", + "<bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs>", + "<bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs>", + "<bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs>", + "/install/vmlinuz<wait>", + " auto<wait>", + " console-setup/ask_detect=false<wait>", + " console-setup/layoutcode=us<wait>", + " console-setup/modelcode=pc105<wait>", + " debconf/frontend=noninteractive<wait>", + " debian-installer=en_US<wait>", + " fb=false<wait>", + " initrd=/install/initrd.gz<wait>", + " kbd-chooser/method=us<wait>", + " keyboard-configuration/layout=USA<wait>", + " keyboard-configuration/variant=USA<wait>", + " locale=en_US<wait>", + " netcfg/get_domain=vm<wait>", + " netcfg/get_hostname=vagrant<wait>", + " grub-installer/bootdev=/dev/sda<wait>", + " noapic<wait>", + " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}}<wait>", + " -- <wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "guest_os_type": "Ubuntu_64", + "hard_drive_interface": "sata", + "headless": "{{ user `headless` }}", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-virtualbox", + "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "virtualbox-iso", + "vboxmanage": [ + [ + "modifyvm", + "{{.Name}}", + "--memory", + "384" + ], + [ + "modifyvm", + "{{.Name}}", + "--cpus", + "1" + ] + ], + "virtualbox_version_file": ".vbox_version", + "vm_name": "{{ user `template` }}" + }, + { + "boot_command": [ + "<enter><wait><f6><esc><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs>", + "<bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs>", + "<bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs>", + "<bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs>", + "/install/vmlinuz<wait>", + " auto<wait>", + " console-setup/ask_detect=false<wait>", + " console-setup/layoutcode=us<wait>", + " console-setup/modelcode=pc105<wait>", + " debconf/frontend=noninteractive<wait>", + " debian-installer=en_US<wait>", + " fb=false<wait>", + " initrd=/install/initrd.gz<wait>", + " kbd-chooser/method=us<wait>", + " keyboard-configuration/layout=USA<wait>", + " keyboard-configuration/variant=USA<wait>", + " locale=en_US<wait>", + " netcfg/get_domain=vm<wait>", + " netcfg/get_hostname=vagrant<wait>", + " grub-installer/bootdev=/dev/sda<wait>", + " noapic<wait>", + " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}}<wait>", + " -- <wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "guest_os_type": "ubuntu-64", + "headless": "{{ user `headless` }}", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-vmware", + "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "tools_upload_flavor": "linux", + "type": "vmware-iso", + "vm_name": "{{ user `template` }}", + "vmx_data": { + "cpuid.coresPerSocket": "1", + "memsize": "384", + "numvcpus": "1" + } + }, + { + "boot_command": [ + "<enter><wait><f6><esc><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs>", + "<bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs>", + "<bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs>", + "<bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs>", + "/install/vmlinuz<wait>", + " auto<wait>", + " console-setup/ask_detect=false<wait>", + " console-setup/layoutcode=us<wait>", + " console-setup/modelcode=pc105<wait>", + " debconf/frontend=noninteractive<wait>", + " debian-installer=en_US<wait>", + " fb=false<wait>", + " initrd=/install/initrd.gz<wait>", + " kbd-chooser/method=us<wait>", + " keyboard-configuration/layout=USA<wait>", + " keyboard-configuration/variant=USA<wait>", + " locale=en_US<wait>", + " netcfg/get_domain=vm<wait>", + " netcfg/get_hostname=vagrant<wait>", + " grub-installer/bootdev=/dev/sda<wait>", + " noapic<wait>", + " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}}<wait>", + " -- <wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "guest_os_type": "ubuntu", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-parallels", + "parallels_tools_flavor": "lin", + "prlctl": [ + [ + "set", + "{{.Name}}", + "--memsize", + "384" + ], + [ + "set", + "{{.Name}}", + "--cpus", + "1" + ] + ], + "prlctl_version_file": ".prlctl_version", + "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "parallels-iso", + "vm_name": "{{ user `template` }}" + }, + { + "boot_command": [ + "<enter><wait><f6><esc><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs>", + "<bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs>", + "<bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs>", + "<bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs>", + "/install/vmlinuz<wait>", + " auto<wait>", + " console-setup/ask_detect=false<wait>", + " console-setup/layoutcode=us<wait>", + " console-setup/modelcode=pc105<wait>", + " debconf/frontend=noninteractive<wait>", + " debian-installer=en_US<wait>", + " fb=false<wait>", + " initrd=/install/initrd.gz<wait>", + " kbd-chooser/method=us<wait>", + " keyboard-configuration/layout=USA<wait>", + " keyboard-configuration/variant=USA<wait>", + " locale=en_US<wait>", + " netcfg/get_domain=vm<wait>", + " netcfg/get_hostname=vagrant<wait>", + " grub-installer/bootdev=/dev/vda<wait>", + " noapic<wait>", + " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}}<wait>", + " -- <wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-qemu", + "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "qemu", + "vm_name": "{{ user `template` }}" + } + ], + "post-processors": [ + { + "output": "builds/{{user `box_basename`}}.{{.Provider}}.box", + "type": "vagrant" + } + ], + "provisioners": [ + { + "destination": "/tmp/bento-metadata.json", + "source": "{{user `metadata`}}", + "type": "file" + }, + { + "environment_vars": [ + "HOME_DIR=/home/vagrant", + "http_proxy={{user `http_proxy`}}", + "https_proxy={{user `https_proxy`}}", + "no_proxy={{user `no_proxy`}}" + ], + "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", + "scripts": [ + "scripts/common/metadata.sh", + "scripts/ubuntu/update.sh", + "scripts/common/sshd.sh", + "scripts/ubuntu/networking.sh", + "scripts/ubuntu/sudoers.sh", + "scripts/ubuntu/vagrant.sh", + "scripts/common/vmtools.sh", + "scripts/ubuntu/cleanup.sh", + "scripts/common/minimize.sh" + ], + "type": "shell" + } + ], + "variables": { + "box_basename": "ubuntu-15.10", + "build_timestamp": "{{isotime \"20060102150405\"}}", + "git_revision": "__unknown_git_revision__", + "headless": "", + "http_proxy": "{{env `http_proxy`}}", + "https_proxy": "{{env `https_proxy`}}", + "iso_checksum": "86aa35a986eba6e5ad30e3d486d57efe6803ae7ea4859b0216953e9e62871131", + "iso_checksum_type": "sha256", + "iso_name": "ubuntu-15.10-server-amd64.iso", + "metadata": "floppy/dummy_metadata.json", + "mirror": "http://releases.ubuntu.com", + "mirror_directory": "15.10", + "name": "ubuntu-15.10", + "no_proxy": "{{env `no_proxy`}}", + "preseed_path": "ubuntu-15.10/preseed.cfg", + "template": "ubuntu-15.10-amd64", + "version": "2.1.TIMESTAMP" + } +} + diff --git a/ubuntu-15.10-i386.json b/ubuntu-15.10-i386.json new file mode 100644 index 000000000..659f9ba46 --- /dev/null +++ b/ubuntu-15.10-i386.json @@ -0,0 +1,270 @@ +{ + "builders": [ + { + "boot_command": [ + "<enter><wait><f6><esc><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs>", + "<bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs>", + "<bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs>", + "<bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs>", + "/install/vmlinuz<wait>", + " auto<wait>", + " console-setup/ask_detect=false<wait>", + " console-setup/layoutcode=us<wait>", + " console-setup/modelcode=pc105<wait>", + " debconf/frontend=noninteractive<wait>", + " debian-installer=en_US<wait>", + " fb=false<wait>", + " initrd=/install/initrd.gz<wait>", + " kbd-chooser/method=us<wait>", + " keyboard-configuration/layout=USA<wait>", + " keyboard-configuration/variant=USA<wait>", + " locale=en_US<wait>", + " netcfg/get_domain=vm<wait>", + " netcfg/get_hostname=vagrant<wait>", + " grub-installer/bootdev=/dev/sda <wait>", + " noapic<wait>", + " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}}<wait>", + " -- <wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "guest_os_type": "Ubuntu", + "hard_drive_interface": "sata", + "headless": "{{ user `headless` }}", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-virtualbox", + "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "virtualbox-iso", + "vboxmanage": [ + [ + "modifyvm", + "{{.Name}}", + "--memory", + "384" + ], + [ + "modifyvm", + "{{.Name}}", + "--cpus", + "1" + ] + ], + "virtualbox_version_file": ".vbox_version", + "vm_name": "{{ user `template` }}" + }, + { + "boot_command": [ + "<enter><wait><f6><esc><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs>", + "<bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs>", + "<bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs>", + "<bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs>", + "/install/vmlinuz<wait>", + " auto<wait>", + " console-setup/ask_detect=false<wait>", + " console-setup/layoutcode=us<wait>", + " console-setup/modelcode=pc105<wait>", + " debconf/frontend=noninteractive<wait>", + " debian-installer=en_US<wait>", + " fb=false<wait>", + " initrd=/install/initrd.gz<wait>", + " kbd-chooser/method=us<wait>", + " keyboard-configuration/layout=USA<wait>", + " keyboard-configuration/variant=USA<wait>", + " locale=en_US<wait>", + " netcfg/get_domain=vm<wait>", + " netcfg/get_hostname=vagrant<wait>", + " grub-installer/bootdev=/dev/sda <wait>", + " noapic<wait>", + " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}}<wait>", + " -- <wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "guest_os_type": "ubuntu", + "headless": "{{ user `headless` }}", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-vmware", + "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "tools_upload_flavor": "linux", + "type": "vmware-iso", + "vm_name": "{{ user `template` }}", + "vmx_data": { + "cpuid.coresPerSocket": "1", + "memsize": "384", + "numvcpus": "1" + } + }, + { + "boot_command": [ + "<enter><wait><f6><esc><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs>", + "<bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs>", + "<bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs>", + "<bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs>", + "/install/vmlinuz<wait>", + " auto<wait>", + " console-setup/ask_detect=false<wait>", + " console-setup/layoutcode=us<wait>", + " console-setup/modelcode=pc105<wait>", + " debconf/frontend=noninteractive<wait>", + " debian-installer=en_US<wait>", + " fb=false<wait>", + " initrd=/install/initrd.gz<wait>", + " kbd-chooser/method=us<wait>", + " keyboard-configuration/layout=USA<wait>", + " keyboard-configuration/variant=USA<wait>", + " locale=en_US<wait>", + " netcfg/get_domain=vm<wait>", + " netcfg/get_hostname=vagrant<wait>", + " grub-installer/bootdev=/dev/sda <wait>", + " noapic<wait>", + " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}}<wait>", + " -- <wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "guest_os_type": "ubuntu", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-parallels", + "parallels_tools_flavor": "lin", + "prlctl": [ + [ + "set", + "{{.Name}}", + "--memsize", + "384" + ], + [ + "set", + "{{.Name}}", + "--cpus", + "1" + ] + ], + "prlctl_version_file": ".prlctl_version", + "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "parallels-iso", + "vm_name": "{{ user `template` }}" + }, + { + "boot_command": [ + "<enter><wait><f6><esc><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs>", + "<bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs>", + "<bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs>", + "<bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs>", + "/install/vmlinuz<wait>", + " auto<wait>", + " console-setup/ask_detect=false<wait>", + " console-setup/layoutcode=us<wait>", + " console-setup/modelcode=pc105<wait>", + " debconf/frontend=noninteractive<wait>", + " debian-installer=en_US<wait>", + " fb=false<wait>", + " initrd=/install/initrd.gz<wait>", + " kbd-chooser/method=us<wait>", + " keyboard-configuration/layout=USA<wait>", + " keyboard-configuration/variant=USA<wait>", + " locale=en_US<wait>", + " netcfg/get_domain=vm<wait>", + " netcfg/get_hostname=vagrant<wait>", + " grub-installer/bootdev=/dev/vda <wait>", + " noapic<wait>", + " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}}<wait>", + " -- <wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-qemu", + "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "qemu", + "vm_name": "{{ user `template` }}" + } + ], + "post-processors": [ + { + "output": "builds/{{user `box_basename`}}.{{.Provider}}.box", + "type": "vagrant" + } + ], + "provisioners": [ + { + "destination": "/tmp/bento-metadata.json", + "source": "{{user `metadata`}}", + "type": "file" + }, + { + "environment_vars": [ + "HOME_DIR=/home/vagrant", + "http_proxy={{user `http_proxy`}}", + "https_proxy={{user `https_proxy`}}", + "no_proxy={{user `no_proxy`}}" + ], + "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", + "scripts": [ + "scripts/common/metadata.sh", + "scripts/ubuntu/update.sh", + "scripts/common/sshd.sh", + "scripts/ubuntu/networking.sh", + "scripts/ubuntu/sudoers.sh", + "scripts/ubuntu/vagrant.sh", + "scripts/common/vmtools.sh", + "scripts/ubuntu/cleanup.sh", + "scripts/common/minimize.sh" + ], + "type": "shell" + } + ], + "variables": { + "box_basename": "ubuntu-15.10-i386", + "build_timestamp": "{{isotime \"20060102150405\"}}", + "git_revision": "__unknown_git_revision__", + "headless": "", + "http_proxy": "{{env `http_proxy`}}", + "https_proxy": "{{env `https_proxy`}}", + "iso_checksum": "fa97768bdc3f198b82180d39bf0c26f021ab716f5da98094cd220771095e3394", + "iso_checksum_type": "sha256", + "iso_name": "ubuntu-15.10-server-i386.iso", + "metadata": "floppy/dummy_metadata.json", + "mirror": "http://releases.ubuntu.com", + "mirror_directory": "15.10", + "name": "ubuntu-15.10-i386", + "no_proxy": "{{env `no_proxy`}}", + "preseed_path": "ubuntu-15.10/preseed.cfg", + "template": "ubuntu-15.10-i386", + "version": "2.1.TIMESTAMP" + } +} + From b824e3c6a6ee2fb046ca32491ec80b9ac556f497 Mon Sep 17 00:00:00 2001 From: Mikhail Zholobov <legal90@gmail.com> Date: Sat, 31 Oct 2015 15:51:56 +0200 Subject: [PATCH 0438/1622] Add template for OS X 10.11 El Capitan --- macosx-10.11.json | 230 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 230 insertions(+) create mode 100644 macosx-10.11.json diff --git a/macosx-10.11.json b/macosx-10.11.json new file mode 100644 index 000000000..d510f256d --- /dev/null +++ b/macosx-10.11.json @@ -0,0 +1,230 @@ +{ + "builders": [ + { + "boot_wait": "2s", + "disk_size": 40960, + "guest_os_type": "darwin12-64", + "headless": "{{ user `headless` }}", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `iso_url`}}", + "output_directory": "packer-{{user `template`}}-vmware", + "shutdown_command": "echo 'vagrant'| sudo -S shutdown -h now", + "skip_compaction": true, + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "tools_upload_flavor": "darwin", + "tools_upload_path": "/tmp/vmtools.iso", + "type": "vmware-iso", + "vm_name": "{{ user `template` }}", + "vmx_data": { + "cpuid.coresPerSocket": "1", + "ehci.present": "TRUE", + "firmware": "efi", + "hpet0.present": "TRUE", + "ich7m.present": "TRUE", + "keyboardAndMouseProfile": "macProfile", + "memsize": "2048", + "numvcpus": "1", + "smc.present": "TRUE", + "usb.present": "TRUE" + } + }, + { + "boot_wait": "2s", + "disk_size": 40960, + "guest_additions_mode": "disable", + "guest_os_type": "MacOS109_64", + "hard_drive_interface": "sata", + "headless": "{{ user `headless` }}", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `iso_url`}}", + "output_directory": "packer-{{user `template`}}-virtualbox", + "shutdown_command": "echo 'vagrant'| sudo -S shutdown -h now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "virtualbox-iso", + "vboxmanage": [ + [ + "modifyvm", + "{{.Name}}", + "--audiocontroller", + "hda" + ], + [ + "modifyvm", + "{{.Name}}", + "--boot1", + "dvd" + ], + [ + "modifyvm", + "{{.Name}}", + "--boot2", + "disk" + ], + [ + "modifyvm", + "{{.Name}}", + "--chipset", + "ich9" + ], + [ + "modifyvm", + "{{.Name}}", + "--cpus", + "1" + ], + [ + "modifyvm", + "{{.Name}}", + "--firmware", + "efi" + ], + [ + "modifyvm", + "{{.Name}}", + "--hpet", + "on" + ], + [ + "modifyvm", + "{{.Name}}", + "--keyboard", + "usb" + ], + [ + "modifyvm", + "{{.Name}}", + "--memory", + "2048" + ], + [ + "modifyvm", + "{{.Name}}", + "--mouse", + "usbtablet" + ], + [ + "modifyvm", + "{{.Name}}", + "--vram", + "9" + ], + [ + "storageattach", + "{{.Name}}", + "--storagectl", + "SATA Controller", + "--port", + "1", + "--type", + "dvddrive", + "--medium", + "{{user `iso_url`}}" + ] + ], + "vboxmanage_post": [ + [ + "storageattach", + "{{.Name}}", + "--storagectl", + "SATA Controller", + "--port", + "1", + "--type", + "dvddrive", + "--medium", + "none" + ], + [ + "storagectl", + "{{.Name}}", + "--name", + "IDE Controller", + "--remove" + ] + ], + "virtualbox_version_file": ".vbox_version", + "vm_name": "{{ user `template` }}" + }, + { + "boot_wait": "2s", + "disk_size": 40960, + "guest_os_type": "macosx", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `iso_url`}}", + "output_directory": "packer-{{user `template`}}-parallels", + "parallels_tools_flavor": "mac", + "prlctl": [ + ["set", "{{.Name}}", "--memsize", "2048"], + ["set", "{{.Name}}", "--cpus", "1"], + ["set", "{{.Name}}", "--on-window-close", "keep-running"] + ], + "shutdown_command": "echo 'vagrant'| sudo -S shutdown -h now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "parallels-iso", + "vm_name": "{{ user `template` }}" + } + ], + "post-processors": [ + { + "output": "builds/{{user `box_basename`}}.{{.Provider}}.box", + "type": "vagrant", + "vagrantfile_template": "vagrantfile_templates/macosx.rb" + } + ], + "provisioners": [ + { + "destination": "/tmp/bento-metadata.json", + "source": "{{user `metadata`}}", + "type": "file" + }, + { + "environment_vars": [ + "HOME_DIR=/Users/vagrant", + "http_proxy={{user `http_proxy`}}", + "https_proxy={{user `https_proxy`}}", + "no_proxy={{user `no_proxy`}}" + ], + "execute_command": "echo 'vagrant'| {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", + "scripts": [ + "scripts/common/metadata.sh", + "scripts/macosx/hostname.sh", + "scripts/macosx/update.sh", + "scripts/macosx/networking.sh", + "scripts/macosx/vagrant.sh", + "scripts/macosx/vmtools.sh", + "scripts/macosx/cleanup.sh", + "scripts/macosx/minimize.sh" + ], + "type": "shell" + } + ], + "variables": { + "_README": "You must provide a prepared Mac disk image (from https://github.com/timsutton/osx-vm-templates) and checksum value for this template to work. For more details, consult this project's README.md", + "box_basename": "macosx-10.11", + "build_timestamp": "{{isotime \"20060102150405\"}}", + "git_revision": "__unknown_git_revision__", + "headless": "", + "http_proxy": "{{env `http_proxy`}}", + "https_proxy": "{{env `https_proxy`}}", + "iso_checksum": "__unset_iso_checksum__", + "iso_checksum_type": "md5", + "iso_url": "http://YOU-MUST-PROVIDE-YOUR-OWN-DMG.sorry", + "metadata": "floppy/dummy_metadata.json", + "name": "macosx-10.11", + "no_proxy": "{{env `no_proxy`}}", + "template": "macosx-10.11", + "version": "2.1.TIMESTAMP" + } +} From 80ca24065dc83df072bf2f090c1ea08b7816e3bd Mon Sep 17 00:00:00 2001 From: Joshua Hoblitt <josh@hoblitt.com> Date: Tue, 3 Nov 2015 17:22:29 -0700 Subject: [PATCH 0439/1622] attempt to manage sshd_config in an [more] idempotent manner Blindly appending entries to `sshd_config` is problematic if the configuration keys are already defined and/or the configuration file is missing a trailing newline. --- scripts/common/sshd.sh | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/scripts/common/sshd.sh b/scripts/common/sshd.sh index 763106bbc..b12fd57f9 100644 --- a/scripts/common/sshd.sh +++ b/scripts/common/sshd.sh @@ -1,4 +1,20 @@ #!/bin/sh -eux -echo "UseDNS no" >>/etc/ssh/sshd_config; -echo "GSSAPIAuthentication no" >>/etc/ssh/sshd_config; +SSHD_CONFIG="/etc/ssh/sshd_config" + +# ensure that there is a trailing newline before attempting to concatenate +sed -i -e '$a\' "$SSHD_CONFIG" + +USEDNS="UseDNS no" +if grep -q -E "^[:space:]*UseDNS" "$SSHD_CONFIG"; then + sed -i "s/^\s*UseDNS.*/${USEDNS}/" "$SSHD_CONFIG" +else + echo "$USEDNS" >>"$SSHD_CONFIG" +fi + +GSSAPI="GSSAPIAuthentication no" +if grep -q -E "^[:space:]*GSSAPIAuthentication" "$SSHD_CONFIG"; then + sed -i "s/^\s*GSSAPIAuthentication.*/${GSSAPI}/" "$SSHD_CONFIG" +else + echo "$GSSAPI" >>"$SSHD_CONFIG" +fi From f12c1a2767a55846b5697726815c408d4ec1422e Mon Sep 17 00:00:00 2001 From: Rickard von Essen <rickard.von.essen@gmail.com> Date: Wed, 4 Nov 2015 10:59:47 +0100 Subject: [PATCH 0440/1622] Support Fedora 23 --- fedora-23-i386.json | 173 +++++++++++++++++++++++++++++++++++++++++ fedora-23-x86_64.json | 177 ++++++++++++++++++++++++++++++++++++++++++ http/fedora-23/ks.cfg | 47 +++++++++++ 3 files changed, 397 insertions(+) create mode 100644 fedora-23-i386.json create mode 100644 fedora-23-x86_64.json create mode 100644 http/fedora-23/ks.cfg diff --git a/fedora-23-i386.json b/fedora-23-i386.json new file mode 100644 index 000000000..227d97d59 --- /dev/null +++ b/fedora-23-i386.json @@ -0,0 +1,173 @@ + +{ + "builders": [ + { + "boot_command": [ + "<tab> linux ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "guest_os_type": "Fedora", + "hard_drive_interface": "sata", + "headless": "{{ user `headless` }}", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-virtualbox", + "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "virtualbox-iso", + "vboxmanage": [ + [ + "modifyvm", + "{{.Name}}", + "--memory", + "512" + ], + [ + "modifyvm", + "{{.Name}}", + "--cpus", + "1" + ] + ], + "virtualbox_version_file": ".vbox_version", + "vm_name": "{{ user `template` }}" + }, + { + "boot_command": [ + "<tab> linux ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "guest_os_type": "fedora", + "headless": "{{ user `headless` }}", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-vmware", + "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "tools_upload_flavor": "linux", + "type": "vmware-iso", + "vm_name": "{{ user `template` }}", + "vmx_data": { + "cpuid.coresPerSocket": "1", + "memsize": "512", + "numvcpus": "1" + } + }, + { + "boot_command": [ + "<tab> linux ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "guest_os_type": "fedora-core", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-parallels", + "parallels_tools_flavor": "lin", + "prlctl": [ + [ + "set", + "{{.Name}}", + "--memsize", + "512" + ], + [ + "set", + "{{.Name}}", + "--cpus", + "1" + ] + ], + "prlctl_version_file": ".prlctl_version", + "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "parallels-iso", + "vm_name": "{{ user `template` }}" + }, + { + "boot_command": [ + "<tab> linux ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-qemu", + "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "qemu", + "vm_name": "{{ user `template` }}" + } + ], + "post-processors": [ + { + "output": "builds/{{user `box_basename`}}.{{.Provider}}.box", + "type": "vagrant" + } + ], + "provisioners": [ + { + "destination": "/tmp/bento-metadata.json", + "source": "{{user `metadata`}}", + "type": "file" + }, + { + "environment_vars": [], + "execute_command": "echo 'vagrant' | {{.Vars}} sudo -E -S bash '{{.Path}}'", + "scripts": [ + "scripts/common/metadata.sh", + "scripts/fedora/fix-slow-dns.sh", + "scripts/common/sshd.sh", + "scripts/fedora/22-build-tools.sh", + "scripts/common/vmtools.sh", + "scripts/common/vagrant.sh", + "scripts/fedora/cleanup.sh", + "scripts/common/minimize.sh" + ], + "type": "shell" + } + ], + "variables": { + "arch": "32", + "box_basename": "fedora-23-i386", + "build_timestamp": "{{isotime \"20060102150405\"}}", + "git_revision": "__unknown_git_revision__", + "headless": "", + "http_proxy": "{{env `http_proxy`}}", + "https_proxy": "{{env `https_proxy`}}", + "iso_checksum": "aa2125b6351480ce82ace619925d897d0588195a3287ef74fb203b6eb34cbccf", + "iso_checksum_type": "sha256", + "iso_name": "Fedora-Server-DVD-i386-23.iso", + "ks_path": "fedora-23/ks.cfg", + "metadata": "floppy/dummy_metadata.json", + "mirror": "http://download.fedoraproject.org/pub/fedora/linux", + "mirror_directory": "releases/23/Server/i386/iso", + "name": "fedora-23-i386", + "no_proxy": "{{env `no_proxy`}}", + "template": "fedora-23-i386", + "version": "2.0.TIMESTAMP" + } +} diff --git a/fedora-23-x86_64.json b/fedora-23-x86_64.json new file mode 100644 index 000000000..f6b2222e6 --- /dev/null +++ b/fedora-23-x86_64.json @@ -0,0 +1,177 @@ +{ + "builders": [ + { + "boot_command": [ + "<tab> linux ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "guest_os_type": "Fedora_64", + "hard_drive_interface": "sata", + "headless": "{{ user `headless` }}", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-virtualbox", + "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "virtualbox-iso", + "vboxmanage": [ + [ + "modifyvm", + "{{.Name}}", + "--memory", + "512" + ], + [ + "modifyvm", + "{{.Name}}", + "--cpus", + "1" + ] + ], + "virtualbox_version_file": ".vbox_version", + "vm_name": "{{ user `template` }}" + }, + { + "boot_command": [ + "<tab> linux ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "guest_os_type": "fedora-64", + "headless": "{{ user `headless` }}", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-vmware", + "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "tools_upload_flavor": "linux", + "type": "vmware-iso", + "vm_name": "{{ user `template` }}", + "vmx_data": { + "cpuid.coresPerSocket": "1", + "memsize": "512", + "numvcpus": "1" + } + }, + { + "boot_command": [ + "<tab> linux ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "guest_os_type": "fedora-core", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-parallels", + "parallels_tools_flavor": "lin", + "prlctl": [ + [ + "set", + "{{.Name}}", + "--memsize", + "512" + ], + [ + "set", + "{{.Name}}", + "--cpus", + "1" + ] + ], + "prlctl_version_file": ".prlctl_version", + "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "parallels-iso", + "vm_name": "{{ user `template` }}" + }, + { + "boot_command": [ + "<tab> linux ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-qemu", + "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "qemu", + "vm_name": "{{ user `template` }}" + } + ], + "post-processors": [ + { + "output": "builds/{{user `box_basename`}}.{{.Provider}}.box", + "type": "vagrant" + } + ], + "provisioners": [ + { + "destination": "/tmp/bento-metadata.json", + "source": "{{user `metadata`}}", + "type": "file" + }, + { + "environment_vars": [ + "HOME_DIR=/home/vagrant", + "http_proxy={{user `http_proxy`}}", + "https_proxy={{user `https_proxy`}}", + "no_proxy={{user `no_proxy`}}" + ], + "execute_command": "echo 'vagrant' | {{.Vars}} sudo -E -S bash '{{.Path}}'", + "scripts": [ + "scripts/common/metadata.sh", + "scripts/fedora/fix-slow-dns.sh", + "scripts/fedora/22-build-tools.sh", + "scripts/common/sshd.sh", + "scripts/common/vmtools.sh", + "scripts/common/vagrant.sh", + "scripts/fedora/cleanup.sh", + "scripts/common/minimize.sh" + ], + "type": "shell" + } + ], + "variables": { + "arch": "64", + "box_basename": "fedora-23", + "build_timestamp": "{{isotime \"20060102150405\"}}", + "git_revision": "__unknown_git_revision__", + "headless": "", + "http_proxy": "{{env `http_proxy`}}", + "https_proxy": "{{env `https_proxy`}}", + "iso_checksum": "30758dc821d1530de427c9e35212bd79b058bd4282e64b7b34ae1a40c87c05ae", + "iso_checksum_type": "sha256", + "iso_name": "Fedora-Server-DVD-x86_64-23.iso", + "ks_path": "fedora-23/ks.cfg", + "metadata": "floppy/dummy_metadata.json", + "mirror": "http://download.fedoraproject.org/pub/fedora/linux", + "mirror_directory": "releases/23/Server/x86_64/iso", + "name": "fedora-23", + "no_proxy": "{{env `no_proxy`}}", + "template": "fedora-23-x86_64", + "version": "2.0.TIMESTAMP" + } +} diff --git a/http/fedora-23/ks.cfg b/http/fedora-23/ks.cfg new file mode 100644 index 000000000..460fbc546 --- /dev/null +++ b/http/fedora-23/ks.cfg @@ -0,0 +1,47 @@ +install +cdrom +lang en_US.UTF-8 +keyboard us +network --bootproto=dhcp +rootpw vagrant +firewall --disabled +authconfig --enableshadow --passalgo=sha512 +selinux --permissive +timezone UTC +bootloader --location=mbr +text +skipx +zerombr +clearpart --all --initlabel +part /boot --fstype=ext4 --size=500 +part pv.2 --grow --size=500 +volgroup vg_vagrant --pesize=32768 pv.2 +logvol / --fstype=ext4 --name=lv_root --vgname=vg_vagrant --size=1024 --grow +logvol swap --fstype=swap --name=lv_swap --vgname=vg_vagrant --size=528 --grow --maxsize=1056 +bootloader --location=mbr --append="norhgb biosdevname=0" +firstboot --disabled +reboot +user --name=vagrant --plaintext --password vagrant + +%packages --ignoremissing --excludedocs +bzip2 +# GCC won't install during kickstart +#gcc +kernel-devel +kernel-headers +tar +wget +nfs-utils +net-tools +dnf-yum +-linux-firmware +-plymouth +-plymouth-core-libs +%end + +%post +# sudo +echo 'Defaults:vagrant !requiretty' > /etc/sudoers.d/vagrant +echo '%vagrant ALL=(ALL) NOPASSWD: ALL' >> /etc/sudoers.d/vagrant +chmod 440 /etc/sudoers.d/vagrant +%end From 2d3f10274d5489345d421bb49cfcf9279cc936d0 Mon Sep 17 00:00:00 2001 From: Joshua Hoblitt <josh@hoblitt.com> Date: Fri, 20 Nov 2015 17:19:24 -0700 Subject: [PATCH 0441/1622] fix or suppress all shellcheck warnings This change-set represent the minimum possible change to either fix or suppress all warnings from the shellcheck linter. The presence of these warnings is an annoyance for those with automatic linting enabled in their editor of choice. This include dead variable removal but no logic or stylistic improvements. --- scripts/centos/cleanup.sh | 10 ++++---- scripts/centos/networking.sh | 2 +- scripts/common/minimize.sh | 4 ++-- scripts/common/shutdown.sh | 2 ++ scripts/common/sshd.sh | 1 + scripts/common/vagrant.sh | 12 +++++----- scripts/common/vmtools.sh | 14 ++++++------ scripts/debian/cleanup.sh | 2 +- scripts/debian/update.sh | 6 ++--- scripts/fedora/22-build-tools.sh | 2 +- scripts/fedora/shutdown.sh | 2 ++ scripts/freebsd/update.sh | 6 ++--- scripts/freebsd/vmtools.sh | 8 +++---- scripts/macosx/hostname.sh | 2 +- scripts/macosx/vagrant.sh | 10 ++++---- scripts/macosx/vmtools.sh | 4 ++-- scripts/omnios/postinstall.sh | 2 +- scripts/omnios/vmtools.sh | 28 ++++++++++++----------- scripts/opensuse/sudoers.sh | 2 +- scripts/sles/remove-dvd-source.sh | 22 +++++++----------- scripts/sles/sudoers.sh | 2 ++ scripts/sles/zypper-locks.sh | 4 ++-- scripts/solaris/vmtools.sh | 27 ++++++++++++---------- scripts/solaris10/vmtools.sh | 38 ++++++++++++++++--------------- scripts/ubuntu/cleanup.sh | 2 +- scripts/ubuntu/sudoers.sh | 2 +- scripts/ubuntu/update.sh | 6 ++--- scripts/ubuntu/vagrant.sh | 10 ++++---- 28 files changed, 120 insertions(+), 112 deletions(-) diff --git a/scripts/centos/cleanup.sh b/scripts/centos/cleanup.sh index faa7e0b49..b71aecae4 100644 --- a/scripts/centos/cleanup.sh +++ b/scripts/centos/cleanup.sh @@ -1,12 +1,12 @@ #!/bin/sh -eux if [ -s /etc/oracle-release ]; then - distro = 'oracle' + distro='oracle' elif [ -s /etc/enterprise-release ]; then - distro = 'oracle' + distro='oracle' elif [ -s /etc/redhat-release ]; then # should ouput 'centos' OR 'red hat' - distro=`cat /etc/redhat-release | sed 's/^\(CentOS\|Red Hat\).*/\1/i' | tr '[:upper:]' '[:lower:]'` + distro=$(sed 's/^\(CentOS\|Red Hat\).*/\1/i' /etc/redhat-release | tr '[:upper:]' '[:lower:]') fi @@ -20,8 +20,8 @@ fi # Clean up network interface persistence rm -f /etc/udev/rules.d/70-persistent-net.rules; -for ndev in `ls -1 /etc/sysconfig/network-scripts/ifcfg-*`; do - if [ "`basename $ndev`" != "ifcfg-lo" ]; then +for ndev in /etc/sysconfig/network-scripts/ifcfg-*; do + if [ "$(basename "$ndev")" != "ifcfg-lo" ]; then sed -i '/^HWADDR/d' "$ndev"; sed -i '/^UUID/d' "$ndev"; fi diff --git a/scripts/centos/networking.sh b/scripts/centos/networking.sh index e61cf3502..905eccf1d 100644 --- a/scripts/centos/networking.sh +++ b/scripts/centos/networking.sh @@ -3,7 +3,7 @@ case "$PACKER_BUILDER_TYPE" in virtualbox-iso|virtualbox-ovf) - major_version="`sed 's/^.\+ release \([.0-9]\+\).*/\1/' /etc/redhat-release | awk -F. '{print $1}'`"; + major_version="$(sed 's/^.\+ release \([.0-9]\+\).*/\1/' /etc/redhat-release | awk -F. '{print $1}')"; if [ "$major_version" -ge 6 ]; then # Fix slow DNS: diff --git a/scripts/common/minimize.sh b/scripts/common/minimize.sh index 1ca88bee9..faf106374 100644 --- a/scripts/common/minimize.sh +++ b/scripts/common/minimize.sh @@ -5,7 +5,7 @@ case "$PACKER_BUILDER_TYPE" in esac set +e -swapuuid="`/sbin/blkid -o value -l -s UUID -t TYPE=swap`"; +swapuuid="$(/sbin/blkid -o value -l -s UUID -t TYPE=swap)"; case "$?" in 2|0) ;; *) exit 1 ;; @@ -15,7 +15,7 @@ set -e if [ "x${swapuuid}" != "x" ]; then # Whiteout the swap partition to reduce box size # Swap is disabled till reboot - swappart="`readlink -f /dev/disk/by-uuid/$swapuuid`"; + swappart="$(readlink -f /dev/disk/by-uuid/"$swapuuid")"; /sbin/swapoff "$swappart"; dd if=/dev/zero of="$swappart" bs=1M || echo "dd exit code $? is suppressed"; /sbin/mkswap -U "$swapuuid" "$swappart"; diff --git a/scripts/common/shutdown.sh b/scripts/common/shutdown.sh index 7d7aee557..a1cb16c1d 100644 --- a/scripts/common/shutdown.sh +++ b/scripts/common/shutdown.sh @@ -1 +1,3 @@ +#!/bin/sh -eux + shutdown -P now diff --git a/scripts/common/sshd.sh b/scripts/common/sshd.sh index b12fd57f9..6ac38961e 100644 --- a/scripts/common/sshd.sh +++ b/scripts/common/sshd.sh @@ -3,6 +3,7 @@ SSHD_CONFIG="/etc/ssh/sshd_config" # ensure that there is a trailing newline before attempting to concatenate +# shellcheck disable=SC1003 sed -i -e '$a\' "$SSHD_CONFIG" USEDNS="UseDNS no" diff --git a/scripts/common/vagrant.sh b/scripts/common/vagrant.sh index b69c3a585..f1527b0b3 100644 --- a/scripts/common/vagrant.sh +++ b/scripts/common/vagrant.sh @@ -4,16 +4,16 @@ HOME_DIR="${HOME_DIR:-/home/vagrant}"; pubkey_url="https://raw.githubusercontent.com/mitchellh/vagrant/master/keys/vagrant.pub"; -mkdir -p $HOME_DIR/.ssh; +mkdir -p "$HOME_DIR"/.ssh; if command -v wget >/dev/null 2>&1; then - wget --no-check-certificate "$pubkey_url" -O $HOME_DIR/.ssh/authorized_keys; + wget --no-check-certificate "$pubkey_url" -O "$HOME_DIR"/.ssh/authorized_keys; elif command -v curl >/dev/null 2>&1; then - curl --insecure --location "$pubkey_url" > $HOME_DIR/.ssh/authorized_keys; + curl --insecure --location "$pubkey_url" > "$HOME_DIR"/.ssh/authorized_keys; elif command -v fetch >/dev/null 2>&1; then - fetch -am -o $HOME_DIR/.ssh/authorized_keys "$pubkey_url"; + fetch -am -o "$HOME_DIR"/.ssh/authorized_keys "$pubkey_url"; else echo "Cannot download vagrant public key"; exit 1; fi -chown -R vagrant $HOME_DIR/.ssh; -chmod -R go-rwsx $HOME_DIR/.ssh; +chown -R vagrant "$HOME_DIR"/.ssh; +chmod -R go-rwsx "$HOME_DIR"/.ssh; diff --git a/scripts/common/vmtools.sh b/scripts/common/vmtools.sh index ad1d47afc..41c6dfa69 100644 --- a/scripts/common/vmtools.sh +++ b/scripts/common/vmtools.sh @@ -7,31 +7,31 @@ case "$PACKER_BUILDER_TYPE" in virtualbox-iso|virtualbox-ovf) mkdir -p /tmp/vbox; - ver="`cat /home/vagrant/.vbox_version`"; - mount -o loop $HOME_DIR/VBoxGuestAdditions_${ver}.iso /tmp/vbox; + ver="$(cat /home/vagrant/.vbox_version)"; + mount -o loop "$HOME_DIR/VBoxGuestAdditions_${ver}.iso" /tmp/vbox; sh /tmp/vbox/VBoxLinuxAdditions.run \ || echo "VBoxLinuxAdditions.run exited $? and is suppressed." \ "For more read https://www.virtualbox.org/ticket/12479"; umount /tmp/vbox; rm -rf /tmp/vbox; - rm -f $HOME_DIR/*.iso; + rm -f "$HOME_DIR"/*.iso; ;; vmware-iso|vmware-vmx) mkdir -p /tmp/vmfusion; mkdir -p /tmp/vmfusion-archive; - mount -o loop $HOME_DIR/linux.iso /tmp/vmfusion; + mount -o loop "$HOME_DIR/linux.iso" /tmp/vmfusion; tar xzf /tmp/vmfusion/VMwareTools-*.tar.gz -C /tmp/vmfusion-archive; /tmp/vmfusion-archive/vmware-tools-distrib/vmware-install.pl --force-install; umount /tmp/vmfusion; rm -rf /tmp/vmfusion; rm -rf /tmp/vmfusion-archive; - rm -f $HOME_DIR/*.iso; + rm -f "$HOME_DIR"/*.iso; ;; parallels-iso|parallels-pvm) mkdir -p /tmp/parallels; - mount -o loop $HOME_DIR/prl-tools-lin.iso /tmp/parallels; + mount -o loop "$HOME_DIR/prl-tools-lin.iso" /tmp/parallels; /tmp/parallels/install --install-unattended-with-deps \ || (code="$?"; \ echo "Parallels tools installation exited $code, attempting" \ @@ -40,7 +40,7 @@ parallels-iso|parallels-pvm) exit $code); umount /tmp/parallels; rm -rf /tmp/parallels; - rm -f $HOME_DIR/*.iso; + rm -f "$HOME_DIR"/*.iso; ;; qemu) diff --git a/scripts/debian/cleanup.sh b/scripts/debian/cleanup.sh index 6889c8aeb..367981652 100644 --- a/scripts/debian/cleanup.sh +++ b/scripts/debian/cleanup.sh @@ -12,7 +12,7 @@ dpkg --list \ dpkg --list \ | awk '{ print $2 }' \ | grep 'linux-image-[234].*' \ - | grep -v `uname -r` \ + | grep -v "$(uname -r)" \ | xargs apt-get -y purge; # Delete Linux source diff --git a/scripts/debian/update.sh b/scripts/debian/update.sh index 8aa08ed73..59a237b7e 100644 --- a/scripts/debian/update.sh +++ b/scripts/debian/update.sh @@ -1,11 +1,11 @@ #!/bin/sh -eux -arch="`uname -r | sed 's/^.*[0-9]\{1,\}\.[0-9]\{1,\}\.[0-9]\{1,\}\(-[0-9]\{1,2\}\)-//'`" +arch="$(uname -r | sed 's/^.*[0-9]\{1,\}\.[0-9]\{1,\}\.[0-9]\{1,\}\(-[0-9]\{1,2\}\)-//')" apt-get update; -apt-get -y upgrade linux-image-$arch; -apt-get -y install linux-headers-`uname -r`; +apt-get -y "upgrade linux-image-$arch"; +apt-get -y "install linux-headers-$(uname -r)"; if [ -d /etc/init ]; then # update package index on boot diff --git a/scripts/fedora/22-build-tools.sh b/scripts/fedora/22-build-tools.sh index daec1c810..f56b600ef 100644 --- a/scripts/fedora/22-build-tools.sh +++ b/scripts/fedora/22-build-tools.sh @@ -1,3 +1,3 @@ #!/bin/bash -eux # Installing build tools here because Fedora 22 will not do so during kickstart -dnf -y install kernel-headers-$(uname -r) kernel-devel-$(uname -r) gcc make perl +dnf -y install "kernel-headers-$(uname -r)" "kernel-devel-$(uname -r)" gcc make perl diff --git a/scripts/fedora/shutdown.sh b/scripts/fedora/shutdown.sh index bb7ec991b..c72373cf7 100644 --- a/scripts/fedora/shutdown.sh +++ b/scripts/fedora/shutdown.sh @@ -1 +1,3 @@ +#!/bin/sh -eux + /sbin/halt -h -p diff --git a/scripts/freebsd/update.sh b/scripts/freebsd/update.sh index c98d0d163..3ba13f615 100644 --- a/scripts/freebsd/update.sh +++ b/scripts/freebsd/update.sh @@ -5,7 +5,7 @@ [ -z "$http_proxy" ] && unset http_proxy [ -z "$https_proxy" ] && unset https_proxy -major_version="`uname -r | awk -F. '{print $1}'`"; +major_version="$(uname -r | awk -F. '{print $1}')"; if [ "$major_version" -lt 10 ]; then # Allow freebsd-update to run fetch without stdin attached to a terminal @@ -19,8 +19,8 @@ fi # Update FreeBSD # NOTE: this will fail if there aren't any patches available for the release yet -env PAGER=/bin/cat $freebsd_update fetch; -env PAGER=/bin/cat $freebsd_update install; +env PAGER=/bin/cat "$freebsd_update" fetch; +env PAGER=/bin/cat "$freebsd_update" install; # Always use pkgng - pkg_add is EOL as of 1 September 2014 env ASSUME_ALWAYS_YES=true pkg bootstrap; diff --git a/scripts/freebsd/vmtools.sh b/scripts/freebsd/vmtools.sh index ad5962ab4..13a0cbd5c 100644 --- a/scripts/freebsd/vmtools.sh +++ b/scripts/freebsd/vmtools.sh @@ -1,6 +1,6 @@ #!/bin/sh -eux -freebsd_major="`uname -r | awk -F. '{print $1}'`"; +freebsd_major="$(uname -r | awk -F. '{print $1}')"; case "$PACKER_BUILDER_TYPE" in @@ -35,13 +35,13 @@ virtualbox-iso|virtualbox-ovf) vmware-iso|vmware-vmx) # Install Perl and other software needed by vmware-install.pl pkg install -y perl5; - pkg install -y compat6x-`uname -m`; + pkg install -y "compat6x-$(uname -m)"; # the install script is very picky about location of perl command ln -s /usr/local/bin/perl /usr/bin/perl; mkdir -p /tmp/vmfusion; mkdir -p /tmp/vmfusion-archive; - mdconfig -a -t vnode -f $HOME_DIR/freebsd.iso -u 0; + mdconfig -a -t vnode -f "$HOME_DIR/freebsd.iso" -u 0; mount -t cd9660 /dev/md0 /tmp/vmfusion; tar xzf /tmp/vmfusion/vmware-freebsd-tools.tar.gz -C /tmp/vmfusion-archive; /tmp/vmfusion-archive/vmware-tools-distrib/vmware-install.pl --force-install; @@ -49,7 +49,7 @@ vmware-iso|vmware-vmx) umount /tmp/vmfusion; rm -rf /tmp/vmfusion; rm -rf /tmp/vmfusion-archive; - rm -f $HOME_DIR/*.iso; + rm -f "$HOME_DIR/*.iso"; rm -f /usr/bin/perl; ;; diff --git a/scripts/macosx/hostname.sh b/scripts/macosx/hostname.sh index 5cfe189eb..e4083b05f 100644 --- a/scripts/macosx/hostname.sh +++ b/scripts/macosx/hostname.sh @@ -2,7 +2,7 @@ # Major thanks to @timsutton's osx-vm-templates: # https://github.com/timsutton/osx-vm-templates -osx_minor_version="`sw_vers -productVersion | awk -F '.' '{print $2}'`"; +osx_minor_version="$(sw_vers -productVersion | awk -F '.' '{print $2}')"; # Set computer/hostname computer_name="macosx-10-${osx_minor_version}"; diff --git a/scripts/macosx/vagrant.sh b/scripts/macosx/vagrant.sh index bd4b3ec21..654c96b35 100644 --- a/scripts/macosx/vagrant.sh +++ b/scripts/macosx/vagrant.sh @@ -1,14 +1,14 @@ #!/bin/bash -eux pubkey_url="https://raw.githubusercontent.com/mitchellh/vagrant/master/keys/vagrant.pub"; -mkdir -p $HOME_DIR/.ssh; +mkdir -p "$HOME_DIR/.ssh"; if command -v wget >/dev/null 2>&1; then - wget --no-check-certificate "$pubkey_url" -O $HOME_DIR/.ssh/authorized_keys; + wget --no-check-certificate "$pubkey_url" -O "$HOME_DIR/.ssh/authorized_keys"; elif command -v curl >/dev/null 2>&1; then - curl --insecure --location "$pubkey_url" > $HOME_DIR/.ssh/authorized_keys; + curl --insecure --location "$pubkey_url" > "$HOME_DIR/.ssh/authorized_keys"; else echo "Cannot download vagrant public key"; exit 1; fi -chown -R vagrant $HOME_DIR/.ssh; -chmod -R go-rwsx $HOME_DIR/.ssh; +chown -R vagrant "$HOME_DIR/.ssh"; +chmod -R go-rwsx "$HOME_DIR/.ssh"; diff --git a/scripts/macosx/vmtools.sh b/scripts/macosx/vmtools.sh index 78699941c..e0427530b 100644 --- a/scripts/macosx/vmtools.sh +++ b/scripts/macosx/vmtools.sh @@ -8,7 +8,7 @@ virtualbox-iso|virtualbox-ovf) vmware-iso|vmware-vmx) iso_name="/tmp/vmtools.iso"; - mount_point="`mktemp -d /tmp/vmware-tools.XXXX`"; + mount_point="$(mktemp -d /tmp/vmware-tools.XXXX)"; #Run install, unmount ISO and remove it hdiutil attach "$iso_name" -mountpoint "$mount_point"; installer -pkg "$mount_point/Install VMware Tools.app/Contents/Resources/VMware Tools.pkg" -target /; @@ -25,7 +25,7 @@ vmware-iso|vmware-vmx) parallels-iso|parallels-pvm) TOOLS_PATH="$HOME_DIR/prl-tools-mac.iso"; - TMPMOUNT="`/usr/bin/mktemp -d /tmp/parallels-tools.XXXX`"; + TMPMOUNT="$(/usr/bin/mktemp -d /tmp/parallels-tools.XXXX)"; #Run install, unmount ISO and remove it hdiutil attach "$TOOLS_PATH" -mountpoint "$TMPMOUNT"; diff --git a/scripts/omnios/postinstall.sh b/scripts/omnios/postinstall.sh index 07fe0c488..59dff3d39 100644 --- a/scripts/omnios/postinstall.sh +++ b/scripts/omnios/postinstall.sh @@ -45,7 +45,7 @@ svcadm restart ssh # update grub menu to lower timeout and remove unnecessary second entry echo "Updating Grub boot menu" -sed -i -e 's/^timeout.*$/timeout 5/' -e "/^title omniosvar/,`wc -l /rpool/boot/grub/menu.lst | awk '{ print $1 }'` d" /rpool/boot/grub/menu.lst +sed -i -e 's/^timeout.*$/timeout 5/' -e "/^title omniosvar/,$(wc -l /rpool/boot/grub/menu.lst | awk '{ print $1 }') d" /rpool/boot/grub/menu.lst # Reset resolv.conf echo "Resetting resolv.conf" diff --git a/scripts/omnios/vmtools.sh b/scripts/omnios/vmtools.sh index 7fa684c32..482d46ef3 100644 --- a/scripts/omnios/vmtools.sh +++ b/scripts/omnios/vmtools.sh @@ -1,29 +1,31 @@ -#!/bin/sh +#!/bin/bash -if [ $PACKER_BUILDER_TYPE == 'virtualbox' ]; then +if [ "$PACKER_BUILDER_TYPE" == 'virtualbox' ]; then echo "Installing VirtualBox Guest Additions" - echo "mail=\ninstance=overwrite\npartial=quit" > /tmp/noask.admin - echo "runlevel=nocheck\nidepend=quit\nrdepend=quit" >> /tmp/noask.admin - echo "space=quit\nsetuid=nocheck\nconflict=nocheck" >> /tmp/noask.admin - echo "action=nocheck\nbasedir=default" >> /tmp/noask.admin + { + echo -e "mail=\ninstance=overwrite\npartial=quit" + echo -e "runlevel=nocheck\nidepend=quit\nrdepend=quit" + echo -e "space=quit\nsetuid=nocheck\nconflict=nocheck" + echo -e "action=nocheck\nbasedir=default" + } > /tmp/noask.admin mkdir /mnt/vbga - VBGADEV=`lofiadm -a VBoxGuestAdditions.iso` - mount -o ro -F hsfs $VBGADEV /mnt/vbga + VBGADEV=$(lofiadm -a VBoxGuestAdditions.iso) + mount -o ro -F hsfs "$VBGADEV" /mnt/vbga pkgadd -a /tmp/noask.admin -G -d /mnt/vbga/VBoxSolarisAdditions.pkg all umount /mnt/vbga - lofiadm -d $VBGADEV + lofiadm -d "$VBGADEV" rm -f VBoxGuestAdditions.iso fi -if [ $PACKER_BUILDER_TYPE == 'vmware' ]; then +if [ "$PACKER_BUILDER_TYPE" == 'vmware' ]; then mkdir /mnt/vmtools - VMTOOLSDEV=`lofiadm -a solaris.iso` - mount -o ro -F hsfs $VMTOOLSDEV /mnt/vmtools + VMTOOLSDEV=$(lofiadm -a solaris.iso) + mount -o ro -F hsfs "$VMTOOLSDEV" /mnt/vmtools mkdir /tmp/vmfusion-archive tar zxvf /mnt/vmtools/vmware-solaris-tools.tar.gz -C /tmp/vmfusion-archive /tmp/vmfusion-archive/vmware-tools-distrib/vmware-install.pl --force-install umount /mnt/vmtools - lofiadm -d $VMTOOLSDEV + lofiadm -d "$VMTOOLSDEV" rmdir /mnt/vmtools rm -rf /tmp/vmfusion-archive rm -f solaris.iso diff --git a/scripts/opensuse/sudoers.sh b/scripts/opensuse/sudoers.sh index a80d47031..1bfc48348 100644 --- a/scripts/opensuse/sudoers.sh +++ b/scripts/opensuse/sudoers.sh @@ -1,4 +1,4 @@ -#!/bin/sh -eux +#!/bin/bash -eux # update sudoers - can't do this in autoinst.xml echo -e "\nupdate sudoers ..." diff --git a/scripts/sles/remove-dvd-source.sh b/scripts/sles/remove-dvd-source.sh index 7eef549e7..46d5caf57 100644 --- a/scripts/sles/remove-dvd-source.sh +++ b/scripts/sles/remove-dvd-source.sh @@ -1,20 +1,14 @@ -#!/bin/sh -eux +#!/bin/bash -eux -if [ 'x86_64' == `uname -m` ]; then - arch_suffix=x64 -else - arch_suffix=x86 -fi - -oslevel=`grep VERSION /etc/SuSE-release | awk '{ print $3 }'` -patchlevel=`grep PATCHLEVEL /etc/SuSE-release | awk '{ print $3 }'` +oslevel=$(grep VERSION /etc/SuSE-release | awk '{ print $3 }') +patchlevel=$(grep PATCHLEVEL /etc/SuSE-release | awk '{ print $3 }') -if [ $oslevel == '11' ]; then - if [ $patchlevel == '2' ]; then +if [ "$oslevel" == '11' ]; then + if [ "$patchlevel" == '2' ]; then repo_ver="11.2.2-1.234" - elif [ $patchlevel == '3' ]; then + elif [ "$patchlevel" == '3' ]; then repo_ver="11.3.3-1.138" - elif [ $patchlevel == '4' ]; then + elif [ "$patchlevel" == '4' ]; then repo_ver="11.4.4-1.109" else echo "Failed to remove DVD source; don't know how to deal with patchlevel $patchlevel" @@ -22,7 +16,7 @@ if [ $oslevel == '11' ]; then fi zypper removerepo "SUSE-Linux-Enterprise-Server-11-SP$patchlevel $repo_ver" -elif [ $oslevel == '12' ]; then +elif [ "$oslevel" == '12' ]; then zypper removerepo "SLES12-12-$patchlevel"; fi diff --git a/scripts/sles/sudoers.sh b/scripts/sles/sudoers.sh index eb80f3f88..1bfc48348 100644 --- a/scripts/sles/sudoers.sh +++ b/scripts/sles/sudoers.sh @@ -1,3 +1,5 @@ +#!/bin/bash -eux + # update sudoers - can't do this in autoinst.xml echo -e "\nupdate sudoers ..." echo -e "vagrant ALL=(ALL) NOPASSWD: ALL\n" >> /etc/sudoers diff --git a/scripts/sles/zypper-locks.sh b/scripts/sles/zypper-locks.sh index fe464451b..4805ccf22 100644 --- a/scripts/sles/zypper-locks.sh +++ b/scripts/sles/zypper-locks.sh @@ -1,7 +1,7 @@ -#!/bin/sh -eux +#!/bin/bash -eux # remove zypper locks on removed packages to avoid later dependency problems -any_package_locks=`zypper --non-interactive ll | grep package`; +any_package_locks=$(zypper --non-interactive ll | grep package); if [ 'There are no package locks defined.' == "$any_package_locks" ]; then echo 'There are no package locks defined. Doing nothing.'; diff --git a/scripts/solaris/vmtools.sh b/scripts/solaris/vmtools.sh index cefaffb28..b64d0a21d 100644 --- a/scripts/solaris/vmtools.sh +++ b/scripts/solaris/vmtools.sh @@ -3,24 +3,27 @@ # Add pkgadd auto-answer file sudo mkdir -p /tmp sudo chmod 777 /tmp -echo "mail=" > /tmp/nocheck -echo "instance=overwrite" >> /tmp/nocheck -echo "partial=nocheck" >> /tmp/nocheck -echo "runlevel=nocheck" >> /tmp/nocheck -echo "idepend=nocheck" >> /tmp/nocheck -echo "rdepend=nocheck" >> /tmp/nocheck -echo "space=nocheck" >> /tmp/nocheck -echo "setuid=nocheck" >> /tmp/nocheck -echo "conflict=nocheck" >> /tmp/nocheck -echo "action=nocheck" >> /tmp/nocheck -echo "basedir=default" >> /tmp/nocheck +{ + echo "mail=" + echo "instance=overwrite" + echo "partial=nocheck" + echo "runlevel=nocheck" + echo "idepend=nocheck" + echo "rdepend=nocheck" + echo "space=nocheck" + echo "setuid=nocheck" + echo "conflict=nocheck" + echo "action=nocheck" + echo "basedir=default" +} >> /tmp/nocheck echo "all" > /tmp/allfiles if [ -f /home/vagrant/.vbox_version ]; then mkdir /tmp/vbox - VER=$(cat /home/vagrant/.vbox_version) ls + # XXX does this redirect actually work? + # shellcheck disable=SC2024 sudo -i pkgadd -a /tmp/nocheck -d /media/VBOXADDITIONS_*/VBoxSolarisAdditions.pkg < /tmp/allfiles fi diff --git a/scripts/solaris10/vmtools.sh b/scripts/solaris10/vmtools.sh index 289e870ff..92ad93e45 100644 --- a/scripts/solaris10/vmtools.sh +++ b/scripts/solaris10/vmtools.sh @@ -1,39 +1,41 @@ #!/bin/bash -eux # Add pkgadd auto-answer file -echo "mail=" > /tmp/nocheck -echo "instance=overwrite" >> /tmp/nocheck -echo "partial=nocheck" >> /tmp/nocheck -echo "runlevel=nocheck" >> /tmp/nocheck -echo "idepend=nocheck" >> /tmp/nocheck -echo "rdepend=nocheck" >> /tmp/nocheck -echo "space=nocheck" >> /tmp/nocheck -echo "setuid=nocheck" >> /tmp/nocheck -echo "conflict=nocheck" >> /tmp/nocheck -echo "action=nocheck" >> /tmp/nocheck -echo "basedir=default" >> /tmp/nocheck +{ + echo "mail=" + echo "instance=overwrite" + echo "partial=nocheck" + echo "runlevel=nocheck" + echo "idepend=nocheck" + echo "rdepend=nocheck" + echo "space=nocheck" + echo "setuid=nocheck" + echo "conflict=nocheck" + echo "action=nocheck" + echo "basedir=default" +} >> /tmp/nocheck + echo "all" > /tmp/allfiles if [ -f /home/vagrant/.vbox_version ]; then mkdir /tmp/vbox - VER=$(cat /home/vagrant/.vbox_version) mkdir /cdrom - VBGADEV=`lofiadm -a /home/vagrant/VBoxGuestAdditions.iso` - mount -o ro -F hsfs $VBGADEV /cdrom + VBGADEV=$(lofiadm -a /home/vagrant/VBoxGuestAdditions.iso) + mount -o ro -F hsfs "$VBGADEV" /cdrom pkgadd -a /tmp/nocheck -d /cdrom/VBoxSolarisAdditions.pkg < /tmp/allfiles umount /cdrom - lofiadm -d $VBGADEV + lofiadm -d "$VBGADEV" rm -f /home/vagrant/VBoxGuestAdditions.iso else - VMTOOLSDEV=`/usr/sbin/lofiadm -a /home/vagrant/solaris.iso` + VMTOOLSDEV=$(/usr/sbin/lofiadm -a /home/vagrant/solaris.iso) mkdir /cdrom - mount -o ro -F hsfs $VMTOOLSDEV /cdrom + mount -o ro -F hsfs "$VMTOOLSDEV" /cdrom mkdir /tmp/vmfusion-archive gtar zxvf /cdrom/vmware-solaris-tools.tar.gz -C /tmp/vmfusion-archive /tmp/vmfusion-archive/vmware-tools-distrib/vmware-install.pl --force-install umount /cdrom - lofiadm -d $VMTOOLSDEV + lofiadm -d "$VMTOOLSDEV" rm -rf /mnt/vmtools rm -rf /tmp/vmfusion-archive rm -f /home/vagrant/solaris.iso diff --git a/scripts/ubuntu/cleanup.sh b/scripts/ubuntu/cleanup.sh index 56971dd7f..2dd3747ee 100644 --- a/scripts/ubuntu/cleanup.sh +++ b/scripts/ubuntu/cleanup.sh @@ -12,7 +12,7 @@ dpkg --list \ dpkg --list \ | awk '{ print $2 }' \ | grep 'linux-image-3.*-generic' \ - | grep -v `uname -r` \ + | grep -v "$(uname -r)" \ | xargs apt-get -y purge; # Delete Linux source diff --git a/scripts/ubuntu/sudoers.sh b/scripts/ubuntu/sudoers.sh index 657b14468..b91bbe401 100644 --- a/scripts/ubuntu/sudoers.sh +++ b/scripts/ubuntu/sudoers.sh @@ -1,6 +1,6 @@ #!/bin/sh -eux -major_version="`lsb_release -r | awk '{print $2}' | awk -F. '{print $1}'`"; +major_version="$(lsb_release -r | awk '{print $2}' | awk -F. '{print $1}')"; if [ ! -z "$major_version" -a "$major_version" -lt 12 ]; then sed -i -e '/Defaults\s\+env_reset/a Defaults\texempt_group=admin' /etc/sudoers; diff --git a/scripts/ubuntu/update.sh b/scripts/ubuntu/update.sh index 332e93dc9..a36c4e4e6 100644 --- a/scripts/ubuntu/update.sh +++ b/scripts/ubuntu/update.sh @@ -1,7 +1,7 @@ #!/bin/sh -eux -ubuntu_version="`lsb_release -r | awk '{print $2}'`"; -ubuntu_major_version="`echo $ubuntu_version | awk -F. '{print $1}'`"; +ubuntu_version="$(lsb_release -r | awk '{print $2}')"; +ubuntu_major_version="$(echo "$ubuntu_version" | awk -F. '{print $1}')"; # Work around bad cached lists on Ubuntu 12.04 if [ "$ubuntu_version" = "12.04" ]; then @@ -20,7 +20,7 @@ else fi # ensure the correct kernel headers are installed -apt-get -y install linux-headers-`uname -r`; +apt-get -y install "linux-headers-$(uname -r)"; # update package index on boot cat <<EOF >/etc/init/refresh-apt.conf; diff --git a/scripts/ubuntu/vagrant.sh b/scripts/ubuntu/vagrant.sh index bd4b3ec21..654c96b35 100644 --- a/scripts/ubuntu/vagrant.sh +++ b/scripts/ubuntu/vagrant.sh @@ -1,14 +1,14 @@ #!/bin/bash -eux pubkey_url="https://raw.githubusercontent.com/mitchellh/vagrant/master/keys/vagrant.pub"; -mkdir -p $HOME_DIR/.ssh; +mkdir -p "$HOME_DIR/.ssh"; if command -v wget >/dev/null 2>&1; then - wget --no-check-certificate "$pubkey_url" -O $HOME_DIR/.ssh/authorized_keys; + wget --no-check-certificate "$pubkey_url" -O "$HOME_DIR/.ssh/authorized_keys"; elif command -v curl >/dev/null 2>&1; then - curl --insecure --location "$pubkey_url" > $HOME_DIR/.ssh/authorized_keys; + curl --insecure --location "$pubkey_url" > "$HOME_DIR/.ssh/authorized_keys"; else echo "Cannot download vagrant public key"; exit 1; fi -chown -R vagrant $HOME_DIR/.ssh; -chmod -R go-rwsx $HOME_DIR/.ssh; +chown -R vagrant "$HOME_DIR/.ssh"; +chmod -R go-rwsx "$HOME_DIR/.ssh"; From f08c1f52f3803d14685e5b0ebf03ea92f38dd6a0 Mon Sep 17 00:00:00 2001 From: Mikhail Zholobov <legal90@gmail.com> Date: Sun, 22 Nov 2015 12:30:00 +0200 Subject: [PATCH 0442/1622] Fix grep character class syntax in sshd.sh script --- scripts/common/sshd.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/common/sshd.sh b/scripts/common/sshd.sh index b12fd57f9..1bb16f56e 100644 --- a/scripts/common/sshd.sh +++ b/scripts/common/sshd.sh @@ -6,14 +6,14 @@ SSHD_CONFIG="/etc/ssh/sshd_config" sed -i -e '$a\' "$SSHD_CONFIG" USEDNS="UseDNS no" -if grep -q -E "^[:space:]*UseDNS" "$SSHD_CONFIG"; then +if grep -q -E "^[[:space:]]*UseDNS" "$SSHD_CONFIG"; then sed -i "s/^\s*UseDNS.*/${USEDNS}/" "$SSHD_CONFIG" else echo "$USEDNS" >>"$SSHD_CONFIG" fi GSSAPI="GSSAPIAuthentication no" -if grep -q -E "^[:space:]*GSSAPIAuthentication" "$SSHD_CONFIG"; then +if grep -q -E "^[[:space:]]*GSSAPIAuthentication" "$SSHD_CONFIG"; then sed -i "s/^\s*GSSAPIAuthentication.*/${GSSAPI}/" "$SSHD_CONFIG" else echo "$GSSAPI" >>"$SSHD_CONFIG" From 78c7c31bb9a6dc4fe174a094e800830b76184f0a Mon Sep 17 00:00:00 2001 From: Mikhail Zholobov <legal90@gmail.com> Date: Tue, 24 Nov 2015 21:26:58 +0200 Subject: [PATCH 0443/1622] Disable automatic udev rules for network interfaces in CentOS --- scripts/centos/cleanup.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/scripts/centos/cleanup.sh b/scripts/centos/cleanup.sh index faa7e0b49..886d04ee7 100644 --- a/scripts/centos/cleanup.sh +++ b/scripts/centos/cleanup.sh @@ -19,6 +19,9 @@ fi # Clean up network interface persistence rm -f /etc/udev/rules.d/70-persistent-net.rules; +mkdir -p /etc/udev/rules.d/70-persistent-net.rules; +rm -f /lib/udev/rules.d/75-persistent-net-generator.rules; +rm -rf /dev/.udev/; for ndev in `ls -1 /etc/sysconfig/network-scripts/ifcfg-*`; do if [ "`basename $ndev`" != "ifcfg-lo" ]; then From 81409284146b5c9c3ecf1d0912774795b5e30360 Mon Sep 17 00:00:00 2001 From: Mikhail Zholobov <legal90@gmail.com> Date: Tue, 24 Nov 2015 21:54:25 +0200 Subject: [PATCH 0444/1622] Fix dhcp settings clean up in Ubuntu 12.04 and higher --- scripts/ubuntu/networking.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/ubuntu/networking.sh b/scripts/ubuntu/networking.sh index a2ee64053..e2e39d5ca 100644 --- a/scripts/ubuntu/networking.sh +++ b/scripts/ubuntu/networking.sh @@ -5,7 +5,7 @@ rm -f /etc/udev/rules.d/70-persistent-net.rules; mkdir -p /etc/udev/rules.d/70-persistent-net.rules; rm -f /lib/udev/rules.d/75-persistent-net-generator.rules; -rm -rf /dev/.udev/ /var/lib/dhcp3/*; +rm -rf /dev/.udev/ /var/lib/dhcp3/* /var/lib/dhcp/*; # Adding a 2 sec delay to the interface up, to make the dhclient happy echo "pre-up sleep 2" >>/etc/network/interfaces; From d8a8de70046594b63481b78c57e291b8ce40246f Mon Sep 17 00:00:00 2001 From: "Julian C. Dunn" <jdunn@aquezada.com> Date: Tue, 8 Dec 2015 00:11:33 -0500 Subject: [PATCH 0445/1622] Fix RHEL 6.7 guest type --- rhel-6.7-x86_64.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rhel-6.7-x86_64.json b/rhel-6.7-x86_64.json index 04cebcad6..97e5e373d 100644 --- a/rhel-6.7-x86_64.json +++ b/rhel-6.7-x86_64.json @@ -44,7 +44,7 @@ ], "boot_wait": "10s", "disk_size": 40960, - "guest_os_type": "oraclelinux-64", + "guest_os_type": "rhel6-64", "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "{{user `iso_checksum`}}", From c003dcc699ca3035f5d1d229d05482eedeb20534 Mon Sep 17 00:00:00 2001 From: Rickard von Essen <rickard.von.essen@gmail.com> Date: Tue, 15 Dec 2015 15:15:43 +0100 Subject: [PATCH 0446/1622] Enterprise Linux 7.2 (RHEL/CentOS/OEL) Updated RHEL/CentOS/OEL to 7.2 Note: To install Parallels Tools selinux-policy-devel is needed. --- centos-7.1-x86_64.json => centos-7.2-x86_64.json | 14 +++++++------- http/{centos-7.1 => centos-7.2}/ks.cfg | 1 + oracle-7.1-x86_64.json => oracle-7.2-x86_64.json | 14 +++++++------- rhel-7.1-x86_64.json => rhel-7.2-x86_64.json | 12 ++++++------ 4 files changed, 21 insertions(+), 20 deletions(-) rename centos-7.1-x86_64.json => centos-7.2-x86_64.json (94%) rename http/{centos-7.1 => centos-7.2}/ks.cfg (98%) rename oracle-7.1-x86_64.json => oracle-7.2-x86_64.json (94%) rename rhel-7.1-x86_64.json => rhel-7.2-x86_64.json (95%) diff --git a/centos-7.1-x86_64.json b/centos-7.2-x86_64.json similarity index 94% rename from centos-7.1-x86_64.json rename to centos-7.2-x86_64.json index f1cdacf56..2709c9c8f 100644 --- a/centos-7.1-x86_64.json +++ b/centos-7.2-x86_64.json @@ -154,22 +154,22 @@ } ], "variables": { - "box_basename": "centos-7.1", + "box_basename": "centos-7.2", "build_timestamp": "{{isotime \"20060102150405\"}}", "git_revision": "__unknown_git_revision__", "headless": "", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", - "iso_checksum": "85bcf62462fb678adc0cec159bf8b39ab5515404bc3828c432f743a1b0b30157", + "iso_checksum": "907e5755f824c5848b9c8efbb484f3cd945e93faa024bad6ba875226f9683b16", "iso_checksum_type": "sha256", - "iso_name": "CentOS-7-x86_64-DVD-1503-01.iso", - "ks_path": "centos-7.1/ks.cfg", + "iso_name": "CentOS-7-x86_64-DVD-1511.iso", + "ks_path": "centos-7.2/ks.cfg", "metadata": "floppy/dummy_metadata.json", "mirror": "http://mirrors.kernel.org/centos", - "mirror_directory": "7.1.1503/isos/x86_64", - "name": "centos-7.1", + "mirror_directory": "7.2.1511/isos/x86_64", + "name": "centos-7.2", "no_proxy": "{{env `no_proxy`}}", - "template": "centos-7.1-x86_64", + "template": "centos-7.2-x86_64", "version": "2.1.TIMESTAMP" } } diff --git a/http/centos-7.1/ks.cfg b/http/centos-7.2/ks.cfg similarity index 98% rename from http/centos-7.1/ks.cfg rename to http/centos-7.2/ks.cfg index 573a605da..1b2563dff 100644 --- a/http/centos-7.1/ks.cfg +++ b/http/centos-7.2/ks.cfg @@ -28,6 +28,7 @@ kernel-devel gcc make perl +selinux-policy-devel wget nfs-utils net-tools diff --git a/oracle-7.1-x86_64.json b/oracle-7.2-x86_64.json similarity index 94% rename from oracle-7.1-x86_64.json rename to oracle-7.2-x86_64.json index a1cd331e3..fa03e55cc 100644 --- a/oracle-7.1-x86_64.json +++ b/oracle-7.2-x86_64.json @@ -155,22 +155,22 @@ ], "variables": { "arch": "64", - "box_basename": "oracle-7.1", + "box_basename": "oracle-7.2", "build_timestamp": "{{isotime \"20060102150405\"}}", "git_revision": "__unknown_git_revision__", "headless": "", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", - "iso_checksum": "FA9666448E8A24AD6A4C7203575B66532FA833D7", + "iso_checksum": "03E048F23D798C8E8E7935FAB76245C2F1341378", "iso_checksum_type": "sha1", - "iso_name": "OracleLinux-R7-U1-Server-x86_64-dvd.iso", - "ks_path": "centos-7.1/ks.cfg", + "iso_name": "OracleLinux-R7-U2-Server-x86_64-dvd.iso", + "ks_path": "centos-7.2/ks.cfg", "metadata": "floppy/dummy_metadata.json", "mirror": "http://mirrors.dotsrc.org/oracle-linux", - "mirror_directory": "OL7/u1/x86_64", - "name": "oracle-7.1", + "mirror_directory": "OL7/u2/x86_64", + "name": "oracle-7.2", "no_proxy": "{{env `no_proxy`}}", - "template": "oracle-7.1-x86_64", + "template": "oracle-7.2-x86_64", "version": "2.2.TIMESTAMP" } } diff --git a/rhel-7.1-x86_64.json b/rhel-7.2-x86_64.json similarity index 95% rename from rhel-7.1-x86_64.json rename to rhel-7.2-x86_64.json index 14065b554..033d80b8b 100644 --- a/rhel-7.1-x86_64.json +++ b/rhel-7.2-x86_64.json @@ -155,22 +155,22 @@ ], "variables": { "arch": "64", - "box_basename": "rhel-7.1", + "box_basename": "rhel-7.2", "build_timestamp": "{{isotime \"20060102150405\"}}", "git_revision": "__unknown_git_revision__", "headless": "", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", - "iso_checksum": "3685468ec6cdcb70dfc85ebbc164da427dc2d762644c3c2ee1520f4f661c15ce", + "iso_checksum": "03f3a0291634335f6995534d829bd21ffaa0d000004dfeb1b2fb81052d64a4d5", "iso_checksum_type": "sha256", - "iso_name": "rhel-server-7.1-x86_64-dvd.iso", - "ks_path": "centos-7.1/ks.cfg", + "iso_name": "rhel-server-7.2-x86_64-dvd.iso", + "ks_path": "centos-7.2/ks.cfg", "metadata": "floppy/dummy_metadata.json", "mirror": "http://YOU-MUST-PROVIDE-YOUR-OWN-ISO.sorry", "mirror_directory": "rhel", - "name": "rhel-7.1", + "name": "rhel-7.2", "no_proxy": "{{env `no_proxy`}}", - "template": "rhel-7.1-x86_64", + "template": "rhel-7.2-x86_64", "version": "2.2.TIMESTAMP" } } From ca28c500ffdc33d794cd8da8b94dc3496831e47f Mon Sep 17 00:00:00 2001 From: Rickard von Essen <rickard.von.essen@gmail.com> Date: Tue, 15 Dec 2015 15:18:59 +0100 Subject: [PATCH 0447/1622] Fix error in cleanup.sh script introduced in d01cb1d7 Declaring varibles can't have spaces surrounding the equals sign. This only affects OEL. --- scripts/centos/cleanup.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/centos/cleanup.sh b/scripts/centos/cleanup.sh index faa7e0b49..95decdd89 100644 --- a/scripts/centos/cleanup.sh +++ b/scripts/centos/cleanup.sh @@ -1,9 +1,9 @@ #!/bin/sh -eux if [ -s /etc/oracle-release ]; then - distro = 'oracle' + distro='oracle' elif [ -s /etc/enterprise-release ]; then - distro = 'oracle' + distro='oracle' elif [ -s /etc/redhat-release ]; then # should ouput 'centos' OR 'red hat' distro=`cat /etc/redhat-release | sed 's/^\(CentOS\|Red Hat\).*/\1/i' | tr '[:upper:]' '[:lower:]'` From ebea21f0715b4cba0693dcf83de15f59988c13c4 Mon Sep 17 00:00:00 2001 From: Robert DeRose <rderose@linode.com> Date: Fri, 18 Dec 2015 15:45:07 -0500 Subject: [PATCH 0448/1622] Stops DKMS package from being removed. DKMS is needed to recompile the guest additions if a new kernel is installed. Removing the C/C++ packages also removes the `dkms` package. This fixes #509 for Dedian based distros. --- scripts/debian/cleanup.sh | 3 --- scripts/ubuntu/cleanup.sh | 3 --- 2 files changed, 6 deletions(-) diff --git a/scripts/debian/cleanup.sh b/scripts/debian/cleanup.sh index 6889c8aeb..6ec0c7c0a 100644 --- a/scripts/debian/cleanup.sh +++ b/scripts/debian/cleanup.sh @@ -27,9 +27,6 @@ dpkg --list \ | grep -- '-dev$' \ | xargs apt-get -y purge; -# Delete compilers and other development tools -apt-get -y purge cpp gcc g++; - # Delete X11 libraries apt-get -y purge libx11-data xauth libxmuu1 libxcb1 libx11-6 libxext6; diff --git a/scripts/ubuntu/cleanup.sh b/scripts/ubuntu/cleanup.sh index 56971dd7f..c2306880f 100644 --- a/scripts/ubuntu/cleanup.sh +++ b/scripts/ubuntu/cleanup.sh @@ -27,9 +27,6 @@ dpkg --list \ | grep -- '-dev$' \ | xargs apt-get -y purge; -# Delete compilers and other development tools -apt-get -y purge cpp gcc g++; - # Delete X11 libraries apt-get -y purge libx11-data xauth libxmuu1 libxcb1 libx11-6 libxext6; From e69df42a07a916287f3732111c3c5041bf64bd1d Mon Sep 17 00:00:00 2001 From: Seth Thomas <cheeseplus@chef.io> Date: Mon, 21 Dec 2015 10:57:47 -0800 Subject: [PATCH 0449/1622] Revert "fix or suppress all shellcheck warnings" --- scripts/centos/cleanup.sh | 6 ++--- scripts/centos/networking.sh | 2 +- scripts/common/minimize.sh | 4 ++-- scripts/common/shutdown.sh | 2 -- scripts/common/sshd.sh | 1 - scripts/common/vagrant.sh | 12 +++++----- scripts/common/vmtools.sh | 14 ++++++------ scripts/debian/cleanup.sh | 2 +- scripts/debian/update.sh | 6 ++--- scripts/fedora/22-build-tools.sh | 2 +- scripts/fedora/shutdown.sh | 2 -- scripts/freebsd/update.sh | 6 ++--- scripts/freebsd/vmtools.sh | 8 +++---- scripts/macosx/hostname.sh | 2 +- scripts/macosx/vagrant.sh | 10 ++++---- scripts/macosx/vmtools.sh | 4 ++-- scripts/omnios/postinstall.sh | 2 +- scripts/omnios/vmtools.sh | 28 +++++++++++------------ scripts/opensuse/sudoers.sh | 2 +- scripts/sles/remove-dvd-source.sh | 22 +++++++++++------- scripts/sles/sudoers.sh | 2 -- scripts/sles/zypper-locks.sh | 4 ++-- scripts/solaris/vmtools.sh | 27 ++++++++++------------ scripts/solaris10/vmtools.sh | 38 +++++++++++++++---------------- scripts/ubuntu/cleanup.sh | 2 +- scripts/ubuntu/sudoers.sh | 2 +- scripts/ubuntu/update.sh | 6 ++--- scripts/ubuntu/vagrant.sh | 10 ++++---- 28 files changed, 110 insertions(+), 118 deletions(-) diff --git a/scripts/centos/cleanup.sh b/scripts/centos/cleanup.sh index e468feba6..1ffcc9334 100644 --- a/scripts/centos/cleanup.sh +++ b/scripts/centos/cleanup.sh @@ -6,7 +6,7 @@ elif [ -s /etc/enterprise-release ]; then distro='oracle' elif [ -s /etc/redhat-release ]; then # should ouput 'centos' OR 'red hat' - distro=$(sed 's/^\(CentOS\|Red Hat\).*/\1/i' /etc/redhat-release | tr '[:upper:]' '[:lower:]') + distro=`cat /etc/redhat-release | sed 's/^\(CentOS\|Red Hat\).*/\1/i' | tr '[:upper:]' '[:lower:]'` fi @@ -23,8 +23,8 @@ mkdir -p /etc/udev/rules.d/70-persistent-net.rules; rm -f /lib/udev/rules.d/75-persistent-net-generator.rules; rm -rf /dev/.udev/; -for ndev in /etc/sysconfig/network-scripts/ifcfg-*; do - if [ "$(basename "$ndev")" != "ifcfg-lo" ]; then +for ndev in `ls -1 /etc/sysconfig/network-scripts/ifcfg-*`; do + if [ "`basename $ndev`" != "ifcfg-lo" ]; then sed -i '/^HWADDR/d' "$ndev"; sed -i '/^UUID/d' "$ndev"; fi diff --git a/scripts/centos/networking.sh b/scripts/centos/networking.sh index 905eccf1d..e61cf3502 100644 --- a/scripts/centos/networking.sh +++ b/scripts/centos/networking.sh @@ -3,7 +3,7 @@ case "$PACKER_BUILDER_TYPE" in virtualbox-iso|virtualbox-ovf) - major_version="$(sed 's/^.\+ release \([.0-9]\+\).*/\1/' /etc/redhat-release | awk -F. '{print $1}')"; + major_version="`sed 's/^.\+ release \([.0-9]\+\).*/\1/' /etc/redhat-release | awk -F. '{print $1}'`"; if [ "$major_version" -ge 6 ]; then # Fix slow DNS: diff --git a/scripts/common/minimize.sh b/scripts/common/minimize.sh index faf106374..1ca88bee9 100644 --- a/scripts/common/minimize.sh +++ b/scripts/common/minimize.sh @@ -5,7 +5,7 @@ case "$PACKER_BUILDER_TYPE" in esac set +e -swapuuid="$(/sbin/blkid -o value -l -s UUID -t TYPE=swap)"; +swapuuid="`/sbin/blkid -o value -l -s UUID -t TYPE=swap`"; case "$?" in 2|0) ;; *) exit 1 ;; @@ -15,7 +15,7 @@ set -e if [ "x${swapuuid}" != "x" ]; then # Whiteout the swap partition to reduce box size # Swap is disabled till reboot - swappart="$(readlink -f /dev/disk/by-uuid/"$swapuuid")"; + swappart="`readlink -f /dev/disk/by-uuid/$swapuuid`"; /sbin/swapoff "$swappart"; dd if=/dev/zero of="$swappart" bs=1M || echo "dd exit code $? is suppressed"; /sbin/mkswap -U "$swapuuid" "$swappart"; diff --git a/scripts/common/shutdown.sh b/scripts/common/shutdown.sh index a1cb16c1d..7d7aee557 100644 --- a/scripts/common/shutdown.sh +++ b/scripts/common/shutdown.sh @@ -1,3 +1 @@ -#!/bin/sh -eux - shutdown -P now diff --git a/scripts/common/sshd.sh b/scripts/common/sshd.sh index 835193f29..1bb16f56e 100644 --- a/scripts/common/sshd.sh +++ b/scripts/common/sshd.sh @@ -3,7 +3,6 @@ SSHD_CONFIG="/etc/ssh/sshd_config" # ensure that there is a trailing newline before attempting to concatenate -# shellcheck disable=SC1003 sed -i -e '$a\' "$SSHD_CONFIG" USEDNS="UseDNS no" diff --git a/scripts/common/vagrant.sh b/scripts/common/vagrant.sh index f1527b0b3..b69c3a585 100644 --- a/scripts/common/vagrant.sh +++ b/scripts/common/vagrant.sh @@ -4,16 +4,16 @@ HOME_DIR="${HOME_DIR:-/home/vagrant}"; pubkey_url="https://raw.githubusercontent.com/mitchellh/vagrant/master/keys/vagrant.pub"; -mkdir -p "$HOME_DIR"/.ssh; +mkdir -p $HOME_DIR/.ssh; if command -v wget >/dev/null 2>&1; then - wget --no-check-certificate "$pubkey_url" -O "$HOME_DIR"/.ssh/authorized_keys; + wget --no-check-certificate "$pubkey_url" -O $HOME_DIR/.ssh/authorized_keys; elif command -v curl >/dev/null 2>&1; then - curl --insecure --location "$pubkey_url" > "$HOME_DIR"/.ssh/authorized_keys; + curl --insecure --location "$pubkey_url" > $HOME_DIR/.ssh/authorized_keys; elif command -v fetch >/dev/null 2>&1; then - fetch -am -o "$HOME_DIR"/.ssh/authorized_keys "$pubkey_url"; + fetch -am -o $HOME_DIR/.ssh/authorized_keys "$pubkey_url"; else echo "Cannot download vagrant public key"; exit 1; fi -chown -R vagrant "$HOME_DIR"/.ssh; -chmod -R go-rwsx "$HOME_DIR"/.ssh; +chown -R vagrant $HOME_DIR/.ssh; +chmod -R go-rwsx $HOME_DIR/.ssh; diff --git a/scripts/common/vmtools.sh b/scripts/common/vmtools.sh index 41c6dfa69..ad1d47afc 100644 --- a/scripts/common/vmtools.sh +++ b/scripts/common/vmtools.sh @@ -7,31 +7,31 @@ case "$PACKER_BUILDER_TYPE" in virtualbox-iso|virtualbox-ovf) mkdir -p /tmp/vbox; - ver="$(cat /home/vagrant/.vbox_version)"; - mount -o loop "$HOME_DIR/VBoxGuestAdditions_${ver}.iso" /tmp/vbox; + ver="`cat /home/vagrant/.vbox_version`"; + mount -o loop $HOME_DIR/VBoxGuestAdditions_${ver}.iso /tmp/vbox; sh /tmp/vbox/VBoxLinuxAdditions.run \ || echo "VBoxLinuxAdditions.run exited $? and is suppressed." \ "For more read https://www.virtualbox.org/ticket/12479"; umount /tmp/vbox; rm -rf /tmp/vbox; - rm -f "$HOME_DIR"/*.iso; + rm -f $HOME_DIR/*.iso; ;; vmware-iso|vmware-vmx) mkdir -p /tmp/vmfusion; mkdir -p /tmp/vmfusion-archive; - mount -o loop "$HOME_DIR/linux.iso" /tmp/vmfusion; + mount -o loop $HOME_DIR/linux.iso /tmp/vmfusion; tar xzf /tmp/vmfusion/VMwareTools-*.tar.gz -C /tmp/vmfusion-archive; /tmp/vmfusion-archive/vmware-tools-distrib/vmware-install.pl --force-install; umount /tmp/vmfusion; rm -rf /tmp/vmfusion; rm -rf /tmp/vmfusion-archive; - rm -f "$HOME_DIR"/*.iso; + rm -f $HOME_DIR/*.iso; ;; parallels-iso|parallels-pvm) mkdir -p /tmp/parallels; - mount -o loop "$HOME_DIR/prl-tools-lin.iso" /tmp/parallels; + mount -o loop $HOME_DIR/prl-tools-lin.iso /tmp/parallels; /tmp/parallels/install --install-unattended-with-deps \ || (code="$?"; \ echo "Parallels tools installation exited $code, attempting" \ @@ -40,7 +40,7 @@ parallels-iso|parallels-pvm) exit $code); umount /tmp/parallels; rm -rf /tmp/parallels; - rm -f "$HOME_DIR"/*.iso; + rm -f $HOME_DIR/*.iso; ;; qemu) diff --git a/scripts/debian/cleanup.sh b/scripts/debian/cleanup.sh index d72167ea1..6ec0c7c0a 100644 --- a/scripts/debian/cleanup.sh +++ b/scripts/debian/cleanup.sh @@ -12,7 +12,7 @@ dpkg --list \ dpkg --list \ | awk '{ print $2 }' \ | grep 'linux-image-[234].*' \ - | grep -v "$(uname -r)" \ + | grep -v `uname -r` \ | xargs apt-get -y purge; # Delete Linux source diff --git a/scripts/debian/update.sh b/scripts/debian/update.sh index 59a237b7e..8aa08ed73 100644 --- a/scripts/debian/update.sh +++ b/scripts/debian/update.sh @@ -1,11 +1,11 @@ #!/bin/sh -eux -arch="$(uname -r | sed 's/^.*[0-9]\{1,\}\.[0-9]\{1,\}\.[0-9]\{1,\}\(-[0-9]\{1,2\}\)-//')" +arch="`uname -r | sed 's/^.*[0-9]\{1,\}\.[0-9]\{1,\}\.[0-9]\{1,\}\(-[0-9]\{1,2\}\)-//'`" apt-get update; -apt-get -y "upgrade linux-image-$arch"; -apt-get -y "install linux-headers-$(uname -r)"; +apt-get -y upgrade linux-image-$arch; +apt-get -y install linux-headers-`uname -r`; if [ -d /etc/init ]; then # update package index on boot diff --git a/scripts/fedora/22-build-tools.sh b/scripts/fedora/22-build-tools.sh index f56b600ef..daec1c810 100644 --- a/scripts/fedora/22-build-tools.sh +++ b/scripts/fedora/22-build-tools.sh @@ -1,3 +1,3 @@ #!/bin/bash -eux # Installing build tools here because Fedora 22 will not do so during kickstart -dnf -y install "kernel-headers-$(uname -r)" "kernel-devel-$(uname -r)" gcc make perl +dnf -y install kernel-headers-$(uname -r) kernel-devel-$(uname -r) gcc make perl diff --git a/scripts/fedora/shutdown.sh b/scripts/fedora/shutdown.sh index c72373cf7..bb7ec991b 100644 --- a/scripts/fedora/shutdown.sh +++ b/scripts/fedora/shutdown.sh @@ -1,3 +1 @@ -#!/bin/sh -eux - /sbin/halt -h -p diff --git a/scripts/freebsd/update.sh b/scripts/freebsd/update.sh index 3ba13f615..c98d0d163 100644 --- a/scripts/freebsd/update.sh +++ b/scripts/freebsd/update.sh @@ -5,7 +5,7 @@ [ -z "$http_proxy" ] && unset http_proxy [ -z "$https_proxy" ] && unset https_proxy -major_version="$(uname -r | awk -F. '{print $1}')"; +major_version="`uname -r | awk -F. '{print $1}'`"; if [ "$major_version" -lt 10 ]; then # Allow freebsd-update to run fetch without stdin attached to a terminal @@ -19,8 +19,8 @@ fi # Update FreeBSD # NOTE: this will fail if there aren't any patches available for the release yet -env PAGER=/bin/cat "$freebsd_update" fetch; -env PAGER=/bin/cat "$freebsd_update" install; +env PAGER=/bin/cat $freebsd_update fetch; +env PAGER=/bin/cat $freebsd_update install; # Always use pkgng - pkg_add is EOL as of 1 September 2014 env ASSUME_ALWAYS_YES=true pkg bootstrap; diff --git a/scripts/freebsd/vmtools.sh b/scripts/freebsd/vmtools.sh index 13a0cbd5c..ad5962ab4 100644 --- a/scripts/freebsd/vmtools.sh +++ b/scripts/freebsd/vmtools.sh @@ -1,6 +1,6 @@ #!/bin/sh -eux -freebsd_major="$(uname -r | awk -F. '{print $1}')"; +freebsd_major="`uname -r | awk -F. '{print $1}'`"; case "$PACKER_BUILDER_TYPE" in @@ -35,13 +35,13 @@ virtualbox-iso|virtualbox-ovf) vmware-iso|vmware-vmx) # Install Perl and other software needed by vmware-install.pl pkg install -y perl5; - pkg install -y "compat6x-$(uname -m)"; + pkg install -y compat6x-`uname -m`; # the install script is very picky about location of perl command ln -s /usr/local/bin/perl /usr/bin/perl; mkdir -p /tmp/vmfusion; mkdir -p /tmp/vmfusion-archive; - mdconfig -a -t vnode -f "$HOME_DIR/freebsd.iso" -u 0; + mdconfig -a -t vnode -f $HOME_DIR/freebsd.iso -u 0; mount -t cd9660 /dev/md0 /tmp/vmfusion; tar xzf /tmp/vmfusion/vmware-freebsd-tools.tar.gz -C /tmp/vmfusion-archive; /tmp/vmfusion-archive/vmware-tools-distrib/vmware-install.pl --force-install; @@ -49,7 +49,7 @@ vmware-iso|vmware-vmx) umount /tmp/vmfusion; rm -rf /tmp/vmfusion; rm -rf /tmp/vmfusion-archive; - rm -f "$HOME_DIR/*.iso"; + rm -f $HOME_DIR/*.iso; rm -f /usr/bin/perl; ;; diff --git a/scripts/macosx/hostname.sh b/scripts/macosx/hostname.sh index e4083b05f..5cfe189eb 100644 --- a/scripts/macosx/hostname.sh +++ b/scripts/macosx/hostname.sh @@ -2,7 +2,7 @@ # Major thanks to @timsutton's osx-vm-templates: # https://github.com/timsutton/osx-vm-templates -osx_minor_version="$(sw_vers -productVersion | awk -F '.' '{print $2}')"; +osx_minor_version="`sw_vers -productVersion | awk -F '.' '{print $2}'`"; # Set computer/hostname computer_name="macosx-10-${osx_minor_version}"; diff --git a/scripts/macosx/vagrant.sh b/scripts/macosx/vagrant.sh index 654c96b35..bd4b3ec21 100644 --- a/scripts/macosx/vagrant.sh +++ b/scripts/macosx/vagrant.sh @@ -1,14 +1,14 @@ #!/bin/bash -eux pubkey_url="https://raw.githubusercontent.com/mitchellh/vagrant/master/keys/vagrant.pub"; -mkdir -p "$HOME_DIR/.ssh"; +mkdir -p $HOME_DIR/.ssh; if command -v wget >/dev/null 2>&1; then - wget --no-check-certificate "$pubkey_url" -O "$HOME_DIR/.ssh/authorized_keys"; + wget --no-check-certificate "$pubkey_url" -O $HOME_DIR/.ssh/authorized_keys; elif command -v curl >/dev/null 2>&1; then - curl --insecure --location "$pubkey_url" > "$HOME_DIR/.ssh/authorized_keys"; + curl --insecure --location "$pubkey_url" > $HOME_DIR/.ssh/authorized_keys; else echo "Cannot download vagrant public key"; exit 1; fi -chown -R vagrant "$HOME_DIR/.ssh"; -chmod -R go-rwsx "$HOME_DIR/.ssh"; +chown -R vagrant $HOME_DIR/.ssh; +chmod -R go-rwsx $HOME_DIR/.ssh; diff --git a/scripts/macosx/vmtools.sh b/scripts/macosx/vmtools.sh index e0427530b..78699941c 100644 --- a/scripts/macosx/vmtools.sh +++ b/scripts/macosx/vmtools.sh @@ -8,7 +8,7 @@ virtualbox-iso|virtualbox-ovf) vmware-iso|vmware-vmx) iso_name="/tmp/vmtools.iso"; - mount_point="$(mktemp -d /tmp/vmware-tools.XXXX)"; + mount_point="`mktemp -d /tmp/vmware-tools.XXXX`"; #Run install, unmount ISO and remove it hdiutil attach "$iso_name" -mountpoint "$mount_point"; installer -pkg "$mount_point/Install VMware Tools.app/Contents/Resources/VMware Tools.pkg" -target /; @@ -25,7 +25,7 @@ vmware-iso|vmware-vmx) parallels-iso|parallels-pvm) TOOLS_PATH="$HOME_DIR/prl-tools-mac.iso"; - TMPMOUNT="$(/usr/bin/mktemp -d /tmp/parallels-tools.XXXX)"; + TMPMOUNT="`/usr/bin/mktemp -d /tmp/parallels-tools.XXXX`"; #Run install, unmount ISO and remove it hdiutil attach "$TOOLS_PATH" -mountpoint "$TMPMOUNT"; diff --git a/scripts/omnios/postinstall.sh b/scripts/omnios/postinstall.sh index 59dff3d39..07fe0c488 100644 --- a/scripts/omnios/postinstall.sh +++ b/scripts/omnios/postinstall.sh @@ -45,7 +45,7 @@ svcadm restart ssh # update grub menu to lower timeout and remove unnecessary second entry echo "Updating Grub boot menu" -sed -i -e 's/^timeout.*$/timeout 5/' -e "/^title omniosvar/,$(wc -l /rpool/boot/grub/menu.lst | awk '{ print $1 }') d" /rpool/boot/grub/menu.lst +sed -i -e 's/^timeout.*$/timeout 5/' -e "/^title omniosvar/,`wc -l /rpool/boot/grub/menu.lst | awk '{ print $1 }'` d" /rpool/boot/grub/menu.lst # Reset resolv.conf echo "Resetting resolv.conf" diff --git a/scripts/omnios/vmtools.sh b/scripts/omnios/vmtools.sh index 482d46ef3..7fa684c32 100644 --- a/scripts/omnios/vmtools.sh +++ b/scripts/omnios/vmtools.sh @@ -1,31 +1,29 @@ -#!/bin/bash +#!/bin/sh -if [ "$PACKER_BUILDER_TYPE" == 'virtualbox' ]; then +if [ $PACKER_BUILDER_TYPE == 'virtualbox' ]; then echo "Installing VirtualBox Guest Additions" - { - echo -e "mail=\ninstance=overwrite\npartial=quit" - echo -e "runlevel=nocheck\nidepend=quit\nrdepend=quit" - echo -e "space=quit\nsetuid=nocheck\nconflict=nocheck" - echo -e "action=nocheck\nbasedir=default" - } > /tmp/noask.admin + echo "mail=\ninstance=overwrite\npartial=quit" > /tmp/noask.admin + echo "runlevel=nocheck\nidepend=quit\nrdepend=quit" >> /tmp/noask.admin + echo "space=quit\nsetuid=nocheck\nconflict=nocheck" >> /tmp/noask.admin + echo "action=nocheck\nbasedir=default" >> /tmp/noask.admin mkdir /mnt/vbga - VBGADEV=$(lofiadm -a VBoxGuestAdditions.iso) - mount -o ro -F hsfs "$VBGADEV" /mnt/vbga + VBGADEV=`lofiadm -a VBoxGuestAdditions.iso` + mount -o ro -F hsfs $VBGADEV /mnt/vbga pkgadd -a /tmp/noask.admin -G -d /mnt/vbga/VBoxSolarisAdditions.pkg all umount /mnt/vbga - lofiadm -d "$VBGADEV" + lofiadm -d $VBGADEV rm -f VBoxGuestAdditions.iso fi -if [ "$PACKER_BUILDER_TYPE" == 'vmware' ]; then +if [ $PACKER_BUILDER_TYPE == 'vmware' ]; then mkdir /mnt/vmtools - VMTOOLSDEV=$(lofiadm -a solaris.iso) - mount -o ro -F hsfs "$VMTOOLSDEV" /mnt/vmtools + VMTOOLSDEV=`lofiadm -a solaris.iso` + mount -o ro -F hsfs $VMTOOLSDEV /mnt/vmtools mkdir /tmp/vmfusion-archive tar zxvf /mnt/vmtools/vmware-solaris-tools.tar.gz -C /tmp/vmfusion-archive /tmp/vmfusion-archive/vmware-tools-distrib/vmware-install.pl --force-install umount /mnt/vmtools - lofiadm -d "$VMTOOLSDEV" + lofiadm -d $VMTOOLSDEV rmdir /mnt/vmtools rm -rf /tmp/vmfusion-archive rm -f solaris.iso diff --git a/scripts/opensuse/sudoers.sh b/scripts/opensuse/sudoers.sh index 1bfc48348..a80d47031 100644 --- a/scripts/opensuse/sudoers.sh +++ b/scripts/opensuse/sudoers.sh @@ -1,4 +1,4 @@ -#!/bin/bash -eux +#!/bin/sh -eux # update sudoers - can't do this in autoinst.xml echo -e "\nupdate sudoers ..." diff --git a/scripts/sles/remove-dvd-source.sh b/scripts/sles/remove-dvd-source.sh index 46d5caf57..7eef549e7 100644 --- a/scripts/sles/remove-dvd-source.sh +++ b/scripts/sles/remove-dvd-source.sh @@ -1,14 +1,20 @@ -#!/bin/bash -eux +#!/bin/sh -eux -oslevel=$(grep VERSION /etc/SuSE-release | awk '{ print $3 }') -patchlevel=$(grep PATCHLEVEL /etc/SuSE-release | awk '{ print $3 }') +if [ 'x86_64' == `uname -m` ]; then + arch_suffix=x64 +else + arch_suffix=x86 +fi + +oslevel=`grep VERSION /etc/SuSE-release | awk '{ print $3 }'` +patchlevel=`grep PATCHLEVEL /etc/SuSE-release | awk '{ print $3 }'` -if [ "$oslevel" == '11' ]; then - if [ "$patchlevel" == '2' ]; then +if [ $oslevel == '11' ]; then + if [ $patchlevel == '2' ]; then repo_ver="11.2.2-1.234" - elif [ "$patchlevel" == '3' ]; then + elif [ $patchlevel == '3' ]; then repo_ver="11.3.3-1.138" - elif [ "$patchlevel" == '4' ]; then + elif [ $patchlevel == '4' ]; then repo_ver="11.4.4-1.109" else echo "Failed to remove DVD source; don't know how to deal with patchlevel $patchlevel" @@ -16,7 +22,7 @@ if [ "$oslevel" == '11' ]; then fi zypper removerepo "SUSE-Linux-Enterprise-Server-11-SP$patchlevel $repo_ver" -elif [ "$oslevel" == '12' ]; then +elif [ $oslevel == '12' ]; then zypper removerepo "SLES12-12-$patchlevel"; fi diff --git a/scripts/sles/sudoers.sh b/scripts/sles/sudoers.sh index 1bfc48348..eb80f3f88 100644 --- a/scripts/sles/sudoers.sh +++ b/scripts/sles/sudoers.sh @@ -1,5 +1,3 @@ -#!/bin/bash -eux - # update sudoers - can't do this in autoinst.xml echo -e "\nupdate sudoers ..." echo -e "vagrant ALL=(ALL) NOPASSWD: ALL\n" >> /etc/sudoers diff --git a/scripts/sles/zypper-locks.sh b/scripts/sles/zypper-locks.sh index 4805ccf22..fe464451b 100644 --- a/scripts/sles/zypper-locks.sh +++ b/scripts/sles/zypper-locks.sh @@ -1,7 +1,7 @@ -#!/bin/bash -eux +#!/bin/sh -eux # remove zypper locks on removed packages to avoid later dependency problems -any_package_locks=$(zypper --non-interactive ll | grep package); +any_package_locks=`zypper --non-interactive ll | grep package`; if [ 'There are no package locks defined.' == "$any_package_locks" ]; then echo 'There are no package locks defined. Doing nothing.'; diff --git a/scripts/solaris/vmtools.sh b/scripts/solaris/vmtools.sh index b64d0a21d..cefaffb28 100644 --- a/scripts/solaris/vmtools.sh +++ b/scripts/solaris/vmtools.sh @@ -3,27 +3,24 @@ # Add pkgadd auto-answer file sudo mkdir -p /tmp sudo chmod 777 /tmp -{ - echo "mail=" - echo "instance=overwrite" - echo "partial=nocheck" - echo "runlevel=nocheck" - echo "idepend=nocheck" - echo "rdepend=nocheck" - echo "space=nocheck" - echo "setuid=nocheck" - echo "conflict=nocheck" - echo "action=nocheck" - echo "basedir=default" -} >> /tmp/nocheck +echo "mail=" > /tmp/nocheck +echo "instance=overwrite" >> /tmp/nocheck +echo "partial=nocheck" >> /tmp/nocheck +echo "runlevel=nocheck" >> /tmp/nocheck +echo "idepend=nocheck" >> /tmp/nocheck +echo "rdepend=nocheck" >> /tmp/nocheck +echo "space=nocheck" >> /tmp/nocheck +echo "setuid=nocheck" >> /tmp/nocheck +echo "conflict=nocheck" >> /tmp/nocheck +echo "action=nocheck" >> /tmp/nocheck +echo "basedir=default" >> /tmp/nocheck echo "all" > /tmp/allfiles if [ -f /home/vagrant/.vbox_version ]; then mkdir /tmp/vbox + VER=$(cat /home/vagrant/.vbox_version) ls - # XXX does this redirect actually work? - # shellcheck disable=SC2024 sudo -i pkgadd -a /tmp/nocheck -d /media/VBOXADDITIONS_*/VBoxSolarisAdditions.pkg < /tmp/allfiles fi diff --git a/scripts/solaris10/vmtools.sh b/scripts/solaris10/vmtools.sh index 92ad93e45..289e870ff 100644 --- a/scripts/solaris10/vmtools.sh +++ b/scripts/solaris10/vmtools.sh @@ -1,41 +1,39 @@ #!/bin/bash -eux # Add pkgadd auto-answer file -{ - echo "mail=" - echo "instance=overwrite" - echo "partial=nocheck" - echo "runlevel=nocheck" - echo "idepend=nocheck" - echo "rdepend=nocheck" - echo "space=nocheck" - echo "setuid=nocheck" - echo "conflict=nocheck" - echo "action=nocheck" - echo "basedir=default" -} >> /tmp/nocheck - +echo "mail=" > /tmp/nocheck +echo "instance=overwrite" >> /tmp/nocheck +echo "partial=nocheck" >> /tmp/nocheck +echo "runlevel=nocheck" >> /tmp/nocheck +echo "idepend=nocheck" >> /tmp/nocheck +echo "rdepend=nocheck" >> /tmp/nocheck +echo "space=nocheck" >> /tmp/nocheck +echo "setuid=nocheck" >> /tmp/nocheck +echo "conflict=nocheck" >> /tmp/nocheck +echo "action=nocheck" >> /tmp/nocheck +echo "basedir=default" >> /tmp/nocheck echo "all" > /tmp/allfiles if [ -f /home/vagrant/.vbox_version ]; then mkdir /tmp/vbox + VER=$(cat /home/vagrant/.vbox_version) mkdir /cdrom - VBGADEV=$(lofiadm -a /home/vagrant/VBoxGuestAdditions.iso) - mount -o ro -F hsfs "$VBGADEV" /cdrom + VBGADEV=`lofiadm -a /home/vagrant/VBoxGuestAdditions.iso` + mount -o ro -F hsfs $VBGADEV /cdrom pkgadd -a /tmp/nocheck -d /cdrom/VBoxSolarisAdditions.pkg < /tmp/allfiles umount /cdrom - lofiadm -d "$VBGADEV" + lofiadm -d $VBGADEV rm -f /home/vagrant/VBoxGuestAdditions.iso else - VMTOOLSDEV=$(/usr/sbin/lofiadm -a /home/vagrant/solaris.iso) + VMTOOLSDEV=`/usr/sbin/lofiadm -a /home/vagrant/solaris.iso` mkdir /cdrom - mount -o ro -F hsfs "$VMTOOLSDEV" /cdrom + mount -o ro -F hsfs $VMTOOLSDEV /cdrom mkdir /tmp/vmfusion-archive gtar zxvf /cdrom/vmware-solaris-tools.tar.gz -C /tmp/vmfusion-archive /tmp/vmfusion-archive/vmware-tools-distrib/vmware-install.pl --force-install umount /cdrom - lofiadm -d "$VMTOOLSDEV" + lofiadm -d $VMTOOLSDEV rm -rf /mnt/vmtools rm -rf /tmp/vmfusion-archive rm -f /home/vagrant/solaris.iso diff --git a/scripts/ubuntu/cleanup.sh b/scripts/ubuntu/cleanup.sh index f676fe557..c2306880f 100644 --- a/scripts/ubuntu/cleanup.sh +++ b/scripts/ubuntu/cleanup.sh @@ -12,7 +12,7 @@ dpkg --list \ dpkg --list \ | awk '{ print $2 }' \ | grep 'linux-image-3.*-generic' \ - | grep -v "$(uname -r)" \ + | grep -v `uname -r` \ | xargs apt-get -y purge; # Delete Linux source diff --git a/scripts/ubuntu/sudoers.sh b/scripts/ubuntu/sudoers.sh index b91bbe401..657b14468 100644 --- a/scripts/ubuntu/sudoers.sh +++ b/scripts/ubuntu/sudoers.sh @@ -1,6 +1,6 @@ #!/bin/sh -eux -major_version="$(lsb_release -r | awk '{print $2}' | awk -F. '{print $1}')"; +major_version="`lsb_release -r | awk '{print $2}' | awk -F. '{print $1}'`"; if [ ! -z "$major_version" -a "$major_version" -lt 12 ]; then sed -i -e '/Defaults\s\+env_reset/a Defaults\texempt_group=admin' /etc/sudoers; diff --git a/scripts/ubuntu/update.sh b/scripts/ubuntu/update.sh index a36c4e4e6..332e93dc9 100644 --- a/scripts/ubuntu/update.sh +++ b/scripts/ubuntu/update.sh @@ -1,7 +1,7 @@ #!/bin/sh -eux -ubuntu_version="$(lsb_release -r | awk '{print $2}')"; -ubuntu_major_version="$(echo "$ubuntu_version" | awk -F. '{print $1}')"; +ubuntu_version="`lsb_release -r | awk '{print $2}'`"; +ubuntu_major_version="`echo $ubuntu_version | awk -F. '{print $1}'`"; # Work around bad cached lists on Ubuntu 12.04 if [ "$ubuntu_version" = "12.04" ]; then @@ -20,7 +20,7 @@ else fi # ensure the correct kernel headers are installed -apt-get -y install "linux-headers-$(uname -r)"; +apt-get -y install linux-headers-`uname -r`; # update package index on boot cat <<EOF >/etc/init/refresh-apt.conf; diff --git a/scripts/ubuntu/vagrant.sh b/scripts/ubuntu/vagrant.sh index 654c96b35..bd4b3ec21 100644 --- a/scripts/ubuntu/vagrant.sh +++ b/scripts/ubuntu/vagrant.sh @@ -1,14 +1,14 @@ #!/bin/bash -eux pubkey_url="https://raw.githubusercontent.com/mitchellh/vagrant/master/keys/vagrant.pub"; -mkdir -p "$HOME_DIR/.ssh"; +mkdir -p $HOME_DIR/.ssh; if command -v wget >/dev/null 2>&1; then - wget --no-check-certificate "$pubkey_url" -O "$HOME_DIR/.ssh/authorized_keys"; + wget --no-check-certificate "$pubkey_url" -O $HOME_DIR/.ssh/authorized_keys; elif command -v curl >/dev/null 2>&1; then - curl --insecure --location "$pubkey_url" > "$HOME_DIR/.ssh/authorized_keys"; + curl --insecure --location "$pubkey_url" > $HOME_DIR/.ssh/authorized_keys; else echo "Cannot download vagrant public key"; exit 1; fi -chown -R vagrant "$HOME_DIR/.ssh"; -chmod -R go-rwsx "$HOME_DIR/.ssh"; +chown -R vagrant $HOME_DIR/.ssh; +chmod -R go-rwsx $HOME_DIR/.ssh; From a52c38344d52e8dcc992a47a2056ca7580e31a10 Mon Sep 17 00:00:00 2001 From: Seth Thomas <sthomas@chef.io> Date: Mon, 28 Dec 2015 07:25:52 -0800 Subject: [PATCH 0450/1622] Cutting 2.2.3 --- CHANGELOG.md | 432 ++++++++++++++++++++++++++++++++++++++++++++++++++- README.md | 29 ++-- 2 files changed, 442 insertions(+), 19 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0f840bfdc..634f3945b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,9 +1,427 @@ -Changelog for Bento Box Artifacts (Atlas) -========================================= +# Change Log -## v2.2.2 +## [2.2.3](https://github.com/chef/bento/tree/2.2.3) (2015-12-26) +[Full Changelog](https://github.com/chef/bento/compare/2.2.2...2.2.3) -* Built with latest virtualization suites - Virtualbox 5.0.6, VMware Fusion 8.0.1, Parallels 11.0.1 -* Test shared folders across all providers -* Fix Fedora 22 build tools which fixes vmtools (shared folders) -* Miscellaneous cleanup of templates +**Fixed bugs:** + +- minimize.sh fails with no swap partition [\#420](https://github.com/chef/bento/issues/420) +- Workstation 11.1.2 Tools incompatible with current builds [\#377](https://github.com/chef/bento/issues/377) + +**Closed issues:** + +- Debian cleanup script removes C/C++ compiler and therefore breaks DKMS support [\#509](https://github.com/chef/bento/issues/509) +- RHEL 6.7 image has wrong guest [\#501](https://github.com/chef/bento/issues/501) +- Fedora 23 x86\_64 and virtualbox: no vboxsf [\#500](https://github.com/chef/bento/issues/500) +- Broken url on description [\#493](https://github.com/chef/bento/issues/493) +- Porposal Fedora 23 [\#491](https://github.com/chef/bento/issues/491) +- Ubuntu 15.10 [\#482](https://github.com/chef/bento/issues/482) +- /dev/sr0 is readonly [\#480](https://github.com/chef/bento/issues/480) +- Ubuntu 14.04 Fails to build with bento/packer [\#477](https://github.com/chef/bento/issues/477) +- The download link to fedora 21 vmware 64 is broken [\#472](https://github.com/chef/bento/issues/472) +- Debian 8.2 vagrant box doesn't have HGFS kernel module [\#463](https://github.com/chef/bento/issues/463) +- Unable to have synced\_folder with Fedora 22 VirtualBox [\#459](https://github.com/chef/bento/issues/459) +- Fedora 22 VM Tools not installed [\#458](https://github.com/chef/bento/issues/458) +- Update Virtualbox Guest Addition from 5.0.2 to 5.0.4 [\#448](https://github.com/chef/bento/issues/448) +- Standardize iso\_checksum / iso\_checksum\_type on sha256 [\#440](https://github.com/chef/bento/issues/440) +- rhel/centos 6 and 7, virtualbox guest additions [\#412](https://github.com/chef/bento/issues/412) +- opscode-centos-7.1 Virtualbox box not able to NFS mount [\#388](https://github.com/chef/bento/issues/388) +- Vagrant public key file could be empty [\#258](https://github.com/chef/bento/issues/258) + +**Merged pull requests:** + +- Revert "fix or suppress all shellcheck warnings" [\#513](https://github.com/chef/bento/pull/513) ([cheeseplus](https://github.com/cheeseplus)) +- Stops DKMS package from being removed. [\#510](https://github.com/chef/bento/pull/510) ([RobertDeRose](https://github.com/RobertDeRose)) +- Enterprise Linux 7.2 \(RHEL/CentOS/OEL\) [\#508](https://github.com/chef/bento/pull/508) ([rickard-von-essen](https://github.com/rickard-von-essen)) +- Fix error in cleanup.sh script introduced in d01cb1d7 [\#507](https://github.com/chef/bento/pull/507) ([rickard-von-essen](https://github.com/rickard-von-essen)) +- Fix RHEL 6.7 guest type [\#503](https://github.com/chef/bento/pull/503) ([juliandunn](https://github.com/juliandunn)) +- Fix dhcp settings cleanup in Ubuntu 12.04 and higher [\#498](https://github.com/chef/bento/pull/498) ([legal90](https://github.com/legal90)) +- Disable automatic udev rules for network interfaces in CentOS [\#497](https://github.com/chef/bento/pull/497) ([legal90](https://github.com/legal90)) +- Fix grep character class syntax in sshd.sh script [\#495](https://github.com/chef/bento/pull/495) ([legal90](https://github.com/legal90)) +- fix or suppress all shellcheck warnings [\#494](https://github.com/chef/bento/pull/494) ([jhoblitt](https://github.com/jhoblitt)) +- Support Fedora 23 [\#489](https://github.com/chef/bento/pull/489) ([rickard-von-essen](https://github.com/rickard-von-essen)) +- attempt to manage sshd\_config in an \[more\] idempotent manner [\#487](https://github.com/chef/bento/pull/487) ([jhoblitt](https://github.com/jhoblitt)) +- Add template for OS X 10.11 El Capitan [\#484](https://github.com/chef/bento/pull/484) ([legal90](https://github.com/legal90)) +- Ubuntu 15.10 support [\#483](https://github.com/chef/bento/pull/483) ([rickard-von-essen](https://github.com/rickard-von-essen)) +- Support swapless builders in minimize.sh [\#479](https://github.com/chef/bento/pull/479) ([sheldonh](https://github.com/sheldonh)) +- Be more aggressive about removing "bento-\*" vagrant boxes [\#476](https://github.com/chef/bento/pull/476) ([cheeseplus](https://github.com/cheeseplus)) +- \[DRY\] up rhel [\#475](https://github.com/chef/bento/pull/475) ([cheeseplus](https://github.com/cheeseplus)) +- \[DRY\] SLES [\#474](https://github.com/chef/bento/pull/474) ([cheeseplus](https://github.com/cheeseplus)) +- \[DRY\] Oracle Linux [\#473](https://github.com/chef/bento/pull/473) ([cheeseplus](https://github.com/cheeseplus)) +- Minimized AutoYaST profiles for SLES 11.3/12 to enhance readability [\#373](https://github.com/chef/bento/pull/373) ([mattiasgiese](https://github.com/mattiasgiese)) + +## [2.2.2](https://github.com/chef/bento/tree/2.2.2) (2015-10-07) +[Full Changelog](https://github.com/chef/bento/compare/2.2.1...2.2.2) + +**Closed issues:** + +- bento/centos-6.7 won't vagrant up after halt or reload [\#468](https://github.com/chef/bento/issues/468) +- Build process broken under VMware Workstation 11.1.2 [\#467](https://github.com/chef/bento/issues/467) +- minimize.sh leads to unexpected error in packer \(vagrant 1.7.2\) [\#320](https://github.com/chef/bento/issues/320) +- Ubuntu 14.04 VMware HGFS modules not loaded [\#283](https://github.com/chef/bento/issues/283) + +**Merged pull requests:** + +- Cutting 2.2.2 release [\#471](https://github.com/chef/bento/pull/471) ([cheeseplus](https://github.com/cheeseplus)) +- The sha changed :/ [\#470](https://github.com/chef/bento/pull/470) ([cheeseplus](https://github.com/cheeseplus)) +- Adding shared folder as part of test-kitchen run [\#469](https://github.com/chef/bento/pull/469) ([cheeseplus](https://github.com/cheeseplus)) +- Adding OmniOS r151014 [\#466](https://github.com/chef/bento/pull/466) ([cheeseplus](https://github.com/cheeseplus)) +- Fixing Fedora 22 build tools to fix vm tools [\#465](https://github.com/chef/bento/pull/465) ([cheeseplus](https://github.com/cheeseplus)) +- Adds host only network for nano and enables file and printer sharing [\#464](https://github.com/chef/bento/pull/464) ([mwrock](https://github.com/mwrock)) +- Windows Nano [\#462](https://github.com/chef/bento/pull/462) ([mwrock](https://github.com/mwrock)) +- squashed commit to add qemu options for all boxes [\#461](https://github.com/chef/bento/pull/461) ([dmlb2000](https://github.com/dmlb2000)) +- bento command needs two dashes [\#457](https://github.com/chef/bento/pull/457) ([mmckinst](https://github.com/mmckinst)) +- remove duplicate auth/authconfig and use sha512 algorithm for password hashing [\#456](https://github.com/chef/bento/pull/456) ([mmckinst](https://github.com/mmckinst)) +- Making upload/release optional [\#455](https://github.com/chef/bento/pull/455) ([cheeseplus](https://github.com/cheeseplus)) +- use --force-install for VMware tools [\#454](https://github.com/chef/bento/pull/454) ([cheeseplus](https://github.com/cheeseplus)) +- Fixing templates [\#453](https://github.com/chef/bento/pull/453) ([cheeseplus](https://github.com/cheeseplus)) +- Remove the headless option for Parallels builder. [\#452](https://github.com/chef/bento/pull/452) ([rickard-von-essen](https://github.com/rickard-von-essen)) +- Adding verification \(tk\) stage to build process [\#451](https://github.com/chef/bento/pull/451) ([cheeseplus](https://github.com/cheeseplus)) + +## [2.2.1](https://github.com/chef/bento/tree/2.2.1) (2015-09-16) +[Full Changelog](https://github.com/chef/bento/compare/2.2.0...2.2.1) + +**Closed issues:** + +- Debian 7.9 [\#444](https://github.com/chef/bento/issues/444) +- Building boxes results in files with unhelpful names [\#433](https://github.com/chef/bento/issues/433) +- fedora-22 Bento Box Corruption? [\#432](https://github.com/chef/bento/issues/432) +- Manually building baseboxes [\#430](https://github.com/chef/bento/issues/430) +- Missing 13 Boxes [\#427](https://github.com/chef/bento/issues/427) +- "yum update" for RHEL/CentOS boxes [\#425](https://github.com/chef/bento/issues/425) +- We need fedora-22 for DNF testing [\#419](https://github.com/chef/bento/issues/419) +- Ubuntu 12.04 downloadable box up-to-date? [\#417](https://github.com/chef/bento/issues/417) +- Using bento boxes with Vagrant [\#410](https://github.com/chef/bento/issues/410) +- chef.github.io/bento is outdated [\#409](https://github.com/chef/bento/issues/409) +- vagrant box `chef/freebsd-10.0`: Unable to install packages [\#407](https://github.com/chef/bento/issues/407) +- debian-7.8 box broken by VMWare Fusion 7.1.1 to 7.1.2 update [\#397](https://github.com/chef/bento/issues/397) +- Parallels boxes? [\#371](https://github.com/chef/bento/issues/371) +- Building a Windows image [\#343](https://github.com/chef/bento/issues/343) +- chef/fedora-21 [\#333](https://github.com/chef/bento/issues/333) +- Ubuntu sudoers file only allows to run as root [\#302](https://github.com/chef/bento/issues/302) +- Puppet support in bento? [\#251](https://github.com/chef/bento/issues/251) +- rename box prefixes to bento- instead of opscode- [\#208](https://github.com/chef/bento/issues/208) + +**Merged pull requests:** + +- DRY up opensuse [\#450](https://github.com/chef/bento/pull/450) ([cheeseplus](https://github.com/cheeseplus)) +- \[fedora-\*\] DRYness pass [\#449](https://github.com/chef/bento/pull/449) ([cheeseplus](https://github.com/cheeseplus)) +- Updating platforms to use sha256 [\#447](https://github.com/chef/bento/pull/447) ([cheeseplus](https://github.com/cheeseplus)) +- Add Debian 7.9 template [\#446](https://github.com/chef/bento/pull/446) ([cheeseplus](https://github.com/cheeseplus)) +- Use bento prefix for box names in README [\#445](https://github.com/chef/bento/pull/445) ([leejones](https://github.com/leejones)) +- Setting basename to a more sensible default [\#442](https://github.com/chef/bento/pull/442) ([cheeseplus](https://github.com/cheeseplus)) +- Debian 8.2 [\#439](https://github.com/chef/bento/pull/439) ([cheeseplus](https://github.com/cheeseplus)) +- Add "vm\_name" parameter to Mac OS X templates for Parallels builder [\#438](https://github.com/chef/bento/pull/438) ([legal90](https://github.com/legal90)) +- Revert "Rename centos images for clarity" [\#437](https://github.com/chef/bento/pull/437) ([cheeseplus](https://github.com/cheeseplus)) +- Add Parallels builder to Mac OS X templates [\#436](https://github.com/chef/bento/pull/436) ([legal90](https://github.com/legal90)) +- Updating readme to reflect reality [\#434](https://github.com/chef/bento/pull/434) ([cheeseplus](https://github.com/cheeseplus)) +- Add Fedora 22 box links [\#431](https://github.com/chef/bento/pull/431) ([cheeseplus](https://github.com/cheeseplus)) +- Adding s3 upload to Rakefile and add buildkite shell script [\#429](https://github.com/chef/bento/pull/429) ([cheeseplus](https://github.com/cheeseplus)) +- Adding Fedora 21 back to matrix [\#428](https://github.com/chef/bento/pull/428) ([cheeseplus](https://github.com/cheeseplus)) +- Add Fedora 22 boxes [\#418](https://github.com/chef/bento/pull/418) ([rickard-von-essen](https://github.com/rickard-von-essen)) +- Enable key insertion on OS X [\#415](https://github.com/chef/bento/pull/415) ([tas50](https://github.com/tas50)) +- Rename centos images for clarity [\#406](https://github.com/chef/bento/pull/406) ([patcon](https://github.com/patcon)) +- CentOS kickstarts: Change sed to not rewrite sudo comments [\#326](https://github.com/chef/bento/pull/326) ([mvermaes](https://github.com/mvermaes)) + +## [2.2.0](https://github.com/chef/bento/tree/2.2.0) (2015-08-26) +[Full Changelog](https://github.com/chef/bento/compare/2.1.0...2.2.0) + +**Merged pull requests:** + +- Update Readme and small fixes/cleanup to Rake tasks [\#426](https://github.com/chef/bento/pull/426) ([cheeseplus](https://github.com/cheeseplus)) +- Freebsd 10.2 [\#424](https://github.com/chef/bento/pull/424) ([geoffgarside](https://github.com/geoffgarside)) +- CentOS 6.6 -\> 6.7 [\#423](https://github.com/chef/bento/pull/423) ([cheeseplus](https://github.com/cheeseplus)) +- Update to Ubuntu 14.04.3. [\#421](https://github.com/chef/bento/pull/421) ([William-Yeh](https://github.com/William-Yeh)) +- Opscode -\> Chefs and other minor stuff [\#414](https://github.com/chef/bento/pull/414) ([tas50](https://github.com/tas50)) +- \[macosx-\*\] Increase disk\_size to ~40G from ~20G. [\#413](https://github.com/chef/bento/pull/413) ([fnichol](https://github.com/fnichol)) + +## [2.1.0](https://github.com/chef/bento/tree/2.1.0) (2015-08-07) +[Full Changelog](https://github.com/chef/bento/compare/2.0.0...2.1.0) + +**Fixed bugs:** + +- Do not write metadata files when `bento build` is in dry run mode [\#368](https://github.com/chef/bento/issues/368) +- fix OmniOS build under VMWare [\#178](https://github.com/chef/bento/issues/178) +- Shortening vm\_name to avoid Parallels box corruption [\#400](https://github.com/chef/bento/pull/400) ([cheeseplus](https://github.com/cheeseplus)) +- Don't write metadata file in `bento build` dry run mode. [\#380](https://github.com/chef/bento/pull/380) ([fnichol](https://github.com/fnichol)) + +**Closed issues:** + +- Release Debian 8.0 boxes [\#381](https://github.com/chef/bento/issues/381) +- Debian 8.1 [\#379](https://github.com/chef/bento/issues/379) +- Upload Ubuntu 15.04 to S3 Bucket [\#376](https://github.com/chef/bento/issues/376) +- Add build metadata to boxes and build artifacts [\#364](https://github.com/chef/bento/issues/364) +- Add support for Debian 8 [\#355](https://github.com/chef/bento/issues/355) +- Chef on Centos boxes seems not be installed [\#352](https://github.com/chef/bento/issues/352) +- centos-7.1 vmware box got uploaded as virtualbox [\#351](https://github.com/chef/bento/issues/351) +- chef/centos-7.1 on atlas [\#346](https://github.com/chef/bento/issues/346) +- Add support for Ubuntu 15.04 [\#345](https://github.com/chef/bento/issues/345) +- Why are definitions removed \(RHEL 7.0 was just removed\) [\#344](https://github.com/chef/bento/issues/344) +- Please fix CentOS 7 README links [\#340](https://github.com/chef/bento/issues/340) +- Latest Ubuntu 14.04 Fails to install kernel headers [\#335](https://github.com/chef/bento/issues/335) +- centos 7.1 image request [\#334](https://github.com/chef/bento/issues/334) +- Guest Additions are installed without dkms support [\#332](https://github.com/chef/bento/issues/332) +- need to get the correct cacert.pem for AWS on CentOS boxes [\#325](https://github.com/chef/bento/issues/325) +- Use the SATA HDD controller for faster disk IO speeds [\#324](https://github.com/chef/bento/issues/324) +- Better package miror for Debian [\#322](https://github.com/chef/bento/issues/322) +- Error building debian7.8-amd-64 [\#319](https://github.com/chef/bento/issues/319) +- Fedora kickstart script downloads CA cert bundle over HTTP [\#318](https://github.com/chef/bento/issues/318) +- CentOS and Fedora boxes packed without docs? [\#317](https://github.com/chef/bento/issues/317) +- Create Fedora 21 box [\#312](https://github.com/chef/bento/issues/312) +- \[SLES\] zypper-locks.sh not working [\#309](https://github.com/chef/bento/issues/309) +- Upload Boxes for Parallels to Atlas [\#308](https://github.com/chef/bento/issues/308) +- Single disk configuration for VMware [\#307](https://github.com/chef/bento/issues/307) +- Build new boxes for VMware Fusion 7 [\#304](https://github.com/chef/bento/issues/304) +- FreeBSD 9.3 \(amd64\) box broken [\#301](https://github.com/chef/bento/issues/301) +- OpenSUSE 13.2 should specify netdevice=eth0 [\#299](https://github.com/chef/bento/issues/299) +- vagrant-vbguest plugin compatibility [\#297](https://github.com/chef/bento/issues/297) +- Ubuntu 14.04.1 [\#290](https://github.com/chef/bento/issues/290) +- Everything looks fine, but not able to mount the device? [\#279](https://github.com/chef/bento/issues/279) +- opscode.github.io/bento is out-of-date \(centos-6.4\) [\#277](https://github.com/chef/bento/issues/277) +- sudo with SSH agent forwarding [\#273](https://github.com/chef/bento/issues/273) +- Upload rhel-6.5 box to bento AWS repo [\#271](https://github.com/chef/bento/issues/271) +- Importing opscode-centos-6.4 fails with virtualbox error [\#264](https://github.com/chef/bento/issues/264) +- Chef should get permission to distribute proprietary boxes for testing use [\#261](https://github.com/chef/bento/issues/261) +- Should the CentOS 7.0 box be listed in the README? [\#260](https://github.com/chef/bento/issues/260) +- Chef binary not installed on FreeBSD 9.2 and 10.0 [\#250](https://github.com/chef/bento/issues/250) +- chef\debian-7.4 not able to run sudo apt-get update with error in description. [\#242](https://github.com/chef/bento/issues/242) +- Box chef/ubuntu-12.10 / 13.04 fails to install any packages [\#240](https://github.com/chef/bento/issues/240) +- chef/ubuntu-13.10 no chef\_solo? [\#238](https://github.com/chef/bento/issues/238) +- virtualbox - opscode\_ubuntu-1204\_chef-provisionerless.box 404 [\#236](https://github.com/chef/bento/issues/236) +- VirtualBox: Mounting shared folder with vboxsf failed [\#234](https://github.com/chef/bento/issues/234) +- Ubuntu 14.04: No guest IP was given to the Vagrant core NFS helper [\#232](https://github.com/chef/bento/issues/232) +- VMware boxes claim to be built on VMware Fusion, but report VMware Desktop [\#231](https://github.com/chef/bento/issues/231) +- add more swap [\#228](https://github.com/chef/bento/issues/228) +- error processing drive [\#227](https://github.com/chef/bento/issues/227) +- centos-5.10 add net-tools [\#226](https://github.com/chef/bento/issues/226) +- merge bento and packer-windows [\#225](https://github.com/chef/bento/issues/225) +- Deploy all those boxes to vagrant cloud [\#224](https://github.com/chef/bento/issues/224) +- Example of establishing SSH keys [\#223](https://github.com/chef/bento/issues/223) +- \[Enhancement\] Packer template for Windows [\#222](https://github.com/chef/bento/issues/222) +- Missing credentials for root [\#217](https://github.com/chef/bento/issues/217) +- Virtualbox and debian-7.4: cannot download preseed.cfg [\#215](https://github.com/chef/bento/issues/215) +- Bug with minimize.sh \(Ubuntu 14.04 amd64\) [\#214](https://github.com/chef/bento/issues/214) +- Ubuntu 14.04 box vboxvfs broken? [\#207](https://github.com/chef/bento/issues/207) +- Can we disable SELinux in the CentOS box images? [\#200](https://github.com/chef/bento/issues/200) +- Debian 7.4 64bit [\#198](https://github.com/chef/bento/issues/198) +- Links for FreeBSD 10 boxes give NoSuchKey error \(HTTP 404\) [\#197](https://github.com/chef/bento/issues/197) +- Unable to provision a fedora-19 machine with private-network [\#196](https://github.com/chef/bento/issues/196) +- Vagrant 1.5.1 errors with opscode\_ubuntu-12.04\_chef-provisionerless.box [\#193](https://github.com/chef/bento/issues/193) +- Fixed size /tmp in Fedora 19 box [\#188](https://github.com/chef/bento/issues/188) +- Configure Oracle Linux boxes with an update source [\#186](https://github.com/chef/bento/issues/186) +- slim down CentOS/RHEL box builds with updated ks.cfg [\#179](https://github.com/chef/bento/issues/179) +- add Oracle Linux templates [\#177](https://github.com/chef/bento/issues/177) +- red hat linux 5.10 box cannot download packages [\#173](https://github.com/chef/bento/issues/173) +- 'Error downloading kickstart file' within Oracle VM VirtualBox [\#172](https://github.com/chef/bento/issues/172) +- move single-request-reopen from ks.cfg [\#171](https://github.com/chef/bento/issues/171) + +**Merged pull requests:** + +- \[debian-\*\] Improve DRYness, correctness, & speed of Debian templates. [\#404](https://github.com/chef/bento/pull/404) ([fnichol](https://github.com/fnichol)) +- \[freebsd-\*\] Improve DRYness, correctness, & speed of FreeBSD templates. [\#403](https://github.com/chef/bento/pull/403) ([fnichol](https://github.com/fnichol)) +- Fixing headless check [\#401](https://github.com/chef/bento/pull/401) ([cheeseplus](https://github.com/cheeseplus)) +- Adding support for headless mode [\#399](https://github.com/chef/bento/pull/399) ([cheeseplus](https://github.com/cheeseplus)) +- Box build pipeline [\#398](https://github.com/chef/bento/pull/398) ([cheeseplus](https://github.com/cheeseplus)) +- \[centos-\*\] Improve DRYness, correctness, and speed of CentOS templates. [\#396](https://github.com/chef/bento/pull/396) ([fnichol](https://github.com/fnichol)) +- \[macosx-\*, ubuntu-\*\] Remove name prefixes from templates. [\#395](https://github.com/chef/bento/pull/395) ([fnichol](https://github.com/fnichol)) +- \[ubuntu-\*\] Improve DRYness, correctness, and speed of Ubuntu templates. [\#394](https://github.com/chef/bento/pull/394) ([fnichol](https://github.com/fnichol)) +- Adding Debian 8.1 links, removing Debian 8.0 templates [\#393](https://github.com/chef/bento/pull/393) ([cheeseplus](https://github.com/cheeseplus)) +- Add @cheeseplus to MAINTAINERS.md [\#392](https://github.com/chef/bento/pull/392) ([fnichol](https://github.com/fnichol)) +- \[macosx-\*\] Add support for {http,https,no}\_proxy environment variables. [\#391](https://github.com/chef/bento/pull/391) ([fnichol](https://github.com/fnichol)) +- Remove files that are no longer referenced by any templates. [\#390](https://github.com/chef/bento/pull/390) ([fnichol](https://github.com/fnichol)) +- \[macosx-\*\] Improve DRYness & correctness of Mac templates. [\#389](https://github.com/chef/bento/pull/389) ([fnichol](https://github.com/fnichol)) +- Add provider metadata to metdata files on build. [\#387](https://github.com/chef/bento/pull/387) ([fnichol](https://github.com/fnichol)) +- updated debian's download redirector address [\#386](https://github.com/chef/bento/pull/386) ([rmoriz](https://github.com/rmoriz)) +- preliminary debian 8.1 templates [\#385](https://github.com/chef/bento/pull/385) ([rmoriz](https://github.com/rmoriz)) +- Add Mac OS X 10.10 template. [\#384](https://github.com/chef/bento/pull/384) ([fnichol](https://github.com/fnichol)) +- Update README with Debian 8.0 boxes. [\#383](https://github.com/chef/bento/pull/383) ([fnichol](https://github.com/fnichol)) +- Add Debian 8.0 amd64/i386 templates. [\#382](https://github.com/chef/bento/pull/382) ([fnichol](https://github.com/fnichol)) +- Update README with Ubuntu 15.04 boxes. [\#378](https://github.com/chef/bento/pull/378) ([fnichol](https://github.com/fnichol)) +- Add Ubuntu 15.04 amd64/i386 templates. [\#375](https://github.com/chef/bento/pull/375) ([fnichol](https://github.com/fnichol)) +- Add build metadata to boxes and build artifacts. [\#365](https://github.com/chef/bento/pull/365) ([fnichol](https://github.com/fnichol)) +- Remove `chef\_version` user variable & remove Chef installation option. [\#362](https://github.com/chef/bento/pull/362) ([fnichol](https://github.com/fnichol)) +- Normalize Bento templates [\#361](https://github.com/chef/bento/pull/361) ([fnichol](https://github.com/fnichol)) +- TravisCI project updates [\#360](https://github.com/chef/bento/pull/360) ([fnichol](https://github.com/fnichol)) +- \[ubuntu-12.04-\*\] Update URL paths to use 12.04.5. [\#359](https://github.com/chef/bento/pull/359) ([fnichol](https://github.com/fnichol)) +- Remove VeeWee definitions from project [\#358](https://github.com/chef/bento/pull/358) ([fnichol](https://github.com/fnichol)) +- Add packer/bin/bento for building templates. [\#357](https://github.com/chef/bento/pull/357) ([fnichol](https://github.com/fnichol)) +- update README to point to Boxcutter intead of basebox [\#354](https://github.com/chef/bento/pull/354) ([OBrienCommaJosh](https://github.com/OBrienCommaJosh)) +- Add MAINTAINERS.md file. [\#347](https://github.com/chef/bento/pull/347) ([fnichol](https://github.com/fnichol)) +- Add RHEL 7.1 JSON file. [\#342](https://github.com/chef/bento/pull/342) ([lopaka](https://github.com/lopaka)) +- Solaris 10u11 - zfs base box [\#341](https://github.com/chef/bento/pull/341) ([scotthain](https://github.com/scotthain)) +- Updated README with CentOS 7.1 boxes [\#339](https://github.com/chef/bento/pull/339) ([juliandunn](https://github.com/juliandunn)) +- Fix "sudoers.sh" for Ubuntu [\#338](https://github.com/chef/bento/pull/338) ([legal90](https://github.com/legal90)) +- Switch to SATA HDD for Linux VMs on virtualbox [\#331](https://github.com/chef/bento/pull/331) ([irvingpop](https://github.com/irvingpop)) +- Update to Ubuntu 14.04.2. [\#330](https://github.com/chef/bento/pull/330) ([juliandunn](https://github.com/juliandunn)) +- Remove extraneous ks.cfg [\#329](https://github.com/chef/bento/pull/329) ([juliandunn](https://github.com/juliandunn)) +- Fixes \#325, \#318 - don't download cacert.pem [\#328](https://github.com/chef/bento/pull/328) ([jtimberman](https://github.com/jtimberman)) +- change mirror to http.debian.net, fixes \#322 [\#323](https://github.com/chef/bento/pull/323) ([rmoriz](https://github.com/rmoriz)) +- Fix mac address issue for ens33 on centos 7 [\#321](https://github.com/chef/bento/pull/321) ([alappe](https://github.com/alappe)) +- Update to Ubuntu 14.04.1 [\#315](https://github.com/chef/bento/pull/315) ([juliandunn](https://github.com/juliandunn)) +- Update travis.yml for opscode to chef org rename [\#314](https://github.com/chef/bento/pull/314) ([cmluciano](https://github.com/cmluciano)) +- Added Fedora 21 VB base boxes to README [\#313](https://github.com/chef/bento/pull/313) ([dfarrell07](https://github.com/dfarrell07)) +- Remove EOL Fedora 19 content [\#311](https://github.com/chef/bento/pull/311) ([juliandunn](https://github.com/juliandunn)) +- Make script zypper-locks.sh workable [\#310](https://github.com/chef/bento/pull/310) ([berendt](https://github.com/berendt)) +- centos-6.6: Force to set SELinux to a permissive mode [\#306](https://github.com/chef/bento/pull/306) ([legal90](https://github.com/legal90)) +- added Fedora 21 support [\#305](https://github.com/chef/bento/pull/305) ([juliandunn](https://github.com/juliandunn)) +- Removed some more unnecessary firmware packages [\#303](https://github.com/chef/bento/pull/303) ([yves-vogl](https://github.com/yves-vogl)) +- \#299 OpenSUSE 13.2 should specify netdevice=eth0 [\#300](https://github.com/chef/bento/pull/300) ([rickard-von-essen](https://github.com/rickard-von-essen)) +- FreeBSD/i386: Fixed incorrect output filename. [\#293](https://github.com/chef/bento/pull/293) ([juliandunn](https://github.com/juliandunn)) +- Minimal support for a compilation environment. [\#291](https://github.com/chef/bento/pull/291) ([yzl](https://github.com/yzl)) +- Update all box links to latest [\#288](https://github.com/chef/bento/pull/288) ([nshemonsky](https://github.com/nshemonsky)) +- Remove curl from CentOS boxes from here on in. [\#287](https://github.com/chef/bento/pull/287) ([juliandunn](https://github.com/juliandunn)) +- adds ubuntu 14.10 configuration [\#286](https://github.com/chef/bento/pull/286) ([vincentaubert](https://github.com/vincentaubert)) +- update debian packer json to 7.7 [\#285](https://github.com/chef/bento/pull/285) ([vincentaubert](https://github.com/vincentaubert)) +- add note in readme about vmware fusion provider [\#284](https://github.com/chef/bento/pull/284) ([smith](https://github.com/smith)) +- Reduce Linux box size by not packing a swap partition gubbish [\#281](https://github.com/chef/bento/pull/281) ([ceetav](https://github.com/ceetav)) +- Parallels: Support of FreeBSD and OmniOS. Some fixes [\#278](https://github.com/chef/bento/pull/278) ([legal90](https://github.com/legal90)) +- Updated RHEL to 5.11. [\#276](https://github.com/chef/bento/pull/276) ([juliandunn](https://github.com/juliandunn)) +- Updated Oracle Enterprise Linux definitions to 5.11 [\#275](https://github.com/chef/bento/pull/275) ([juliandunn](https://github.com/juliandunn)) +- Upgrade CentOS 5 to 5.11 [\#274](https://github.com/chef/bento/pull/274) ([eshamow](https://github.com/eshamow)) +- Fix syntax and typo share\_folder -\> synced\_folder of console message. [\#272](https://github.com/chef/bento/pull/272) ([jevonearth](https://github.com/jevonearth)) +- Fix packer validation failures. [\#269](https://github.com/chef/bento/pull/269) ([juliandunn](https://github.com/juliandunn)) +- Fix erroneous virtualbox output directory for vmware-iso build [\#267](https://github.com/chef/bento/pull/267) ([eshamow](https://github.com/eshamow)) +- Remove EOL Ubuntu 12.10 [\#266](https://github.com/chef/bento/pull/266) ([eshamow](https://github.com/eshamow)) +- Update 12.04 logic to handle outdated apt cache on distro [\#265](https://github.com/chef/bento/pull/265) ([eshamow](https://github.com/eshamow)) +- Document CentOS 7.0 box. [\#262](https://github.com/chef/bento/pull/262) ([juliandunn](https://github.com/juliandunn)) +- update to FreeBSD 9.3 [\#259](https://github.com/chef/bento/pull/259) ([juliandunn](https://github.com/juliandunn)) +- Update README to reflect current Debian boxes and remove old Ubuntu [\#254](https://github.com/chef/bento/pull/254) ([juliandunn](https://github.com/juliandunn)) +- Updated to Ubuntu 12.04.5 LTS. [\#253](https://github.com/chef/bento/pull/253) ([juliandunn](https://github.com/juliandunn)) +- Update Debian 6.0.9 to 6.0.10 [\#252](https://github.com/chef/bento/pull/252) ([juliandunn](https://github.com/juliandunn)) +- Update documentation [\#246](https://github.com/chef/bento/pull/246) ([juliandunn](https://github.com/juliandunn)) +- Remove Ubuntu 13.10 as it is EOL as of July 17, 2014. [\#245](https://github.com/chef/bento/pull/245) ([juliandunn](https://github.com/juliandunn)) +- Upgrade to OmniOS r151010j [\#244](https://github.com/chef/bento/pull/244) ([juliandunn](https://github.com/juliandunn)) +- Fix bugs on building VMWare box [\#243](https://github.com/chef/bento/pull/243) ([juliandunn](https://github.com/juliandunn)) +- Support OpenSUSE 13.1 [\#241](https://github.com/chef/bento/pull/241) ([simonoff](https://github.com/simonoff)) +- Switch to newest Debian release \(7.5 -\> 7.6\) [\#239](https://github.com/chef/bento/pull/239) ([fadenb](https://github.com/fadenb)) +- Support CentOS 7.0 [\#237](https://github.com/chef/bento/pull/237) ([andytson](https://github.com/andytson)) +- Updated checksum and mirror to GA release [\#233](https://github.com/chef/bento/pull/233) ([juliandunn](https://github.com/juliandunn)) +- fix vmware-vmx tools install [\#230](https://github.com/chef/bento/pull/230) ([rjocoleman](https://github.com/rjocoleman)) +- Corrected some copy paste errors in SLES configuration. [\#221](https://github.com/chef/bento/pull/221) ([rickard-von-essen](https://github.com/rickard-von-essen)) +- Cleanup the boxes to actually work [\#219](https://github.com/chef/bento/pull/219) ([sethvargo](https://github.com/sethvargo)) +- Dependency Fix [\#218](https://github.com/chef/bento/pull/218) ([bdwyertech](https://github.com/bdwyertech)) +- Update Debian Wheezy to 7.5 [\#216](https://github.com/chef/bento/pull/216) ([tmatilai](https://github.com/tmatilai)) +- Update to OmniOS r151008t [\#212](https://github.com/chef/bento/pull/212) ([juliandunn](https://github.com/juliandunn)) +- Support Red Hat Enterprise Linux 7 Release Candidate. [\#210](https://github.com/chef/bento/pull/210) ([juliandunn](https://github.com/juliandunn)) +- Add links to new ubuntu images [\#209](https://github.com/chef/bento/pull/209) ([Maks3w](https://github.com/Maks3w)) +- Cleanup inconsistencies in Ubuntu templates. [\#206](https://github.com/chef/bento/pull/206) ([juliandunn](https://github.com/juliandunn)) +- Add templates for Ubuntu 14.04 [\#205](https://github.com/chef/bento/pull/205) ([rjocoleman](https://github.com/rjocoleman)) +- Update vagrant.sh [\#204](https://github.com/chef/bento/pull/204) ([sbarber](https://github.com/sbarber)) +- The wget failed in Debian distro [\#199](https://github.com/chef/bento/pull/199) ([rhacker](https://github.com/rhacker)) +- Make sure to update checksums and ISOs for vmware-iso builder too. [\#191](https://github.com/chef/bento/pull/191) ([juliandunn](https://github.com/juliandunn)) +- BENTO-116: use ISO for Ubuntu 12.04.04, not 12.04.03 [\#190](https://github.com/chef/bento/pull/190) ([client9](https://github.com/client9)) +- Bugfixes for FreeBSD 10 [\#189](https://github.com/chef/bento/pull/189) ([juliandunn](https://github.com/juliandunn)) +- slim down Fedora boxes using same ks.cfg minimizations as CentOS [\#187](https://github.com/chef/bento/pull/187) ([juliandunn](https://github.com/juliandunn)) +- Remove Ubuntu 13.04: EOL as of January 27, 2014 [\#185](https://github.com/chef/bento/pull/185) ([juliandunn](https://github.com/juliandunn)) +- Slim down box builds by removing unnecessary firmware and docs. [\#183](https://github.com/chef/bento/pull/183) ([juliandunn](https://github.com/juliandunn)) +- Force CRLF on Autounattend files for Windows [\#175](https://github.com/chef/bento/pull/175) ([juliandunn](https://github.com/juliandunn)) +- Update Debian 6.0.8 to 6.0.9 [\#170](https://github.com/chef/bento/pull/170) ([tmatilai](https://github.com/tmatilai)) +- Updated to OmniOS r151008j [\#169](https://github.com/chef/bento/pull/169) ([juliandunn](https://github.com/juliandunn)) +- End-of-life: Fedora 18 and Debian 7.2 [\#168](https://github.com/chef/bento/pull/168) ([juliandunn](https://github.com/juliandunn)) +- BENTO-112 add single-request-reopen to resolv.conf [\#165](https://github.com/chef/bento/pull/165) ([rjocoleman](https://github.com/rjocoleman)) +- Add Packer templates for Debian 7.4 [\#164](https://github.com/chef/bento/pull/164) ([tmatilai](https://github.com/tmatilai)) +- Use sudoers.d in Debian [\#163](https://github.com/chef/bento/pull/163) ([tmatilai](https://github.com/tmatilai)) +- Fix DHCP lease directory name in Debian [\#162](https://github.com/chef/bento/pull/162) ([tmatilai](https://github.com/tmatilai)) +- Allow `packer\_cache` to be symlink [\#161](https://github.com/chef/bento/pull/161) ([tmatilai](https://github.com/tmatilai)) +- Debian 7.3.0 support [\#160](https://github.com/chef/bento/pull/160) ([fadenb](https://github.com/fadenb)) +- Finalize FreeBSD 10 support [\#159](https://github.com/chef/bento/pull/159) ([juliandunn](https://github.com/juliandunn)) +- support mirror variable for iso\_url in all centos/vmware builders [\#158](https://github.com/chef/bento/pull/158) ([adler](https://github.com/adler)) +- \[BENTO-111\] Added a .gitattributes and a note for Windows hosts [\#157](https://github.com/chef/bento/pull/157) ([maoueh](https://github.com/maoueh)) +- Don't disable selinux on Fedora; just make it Permissive. [\#156](https://github.com/chef/bento/pull/156) ([juliandunn](https://github.com/juliandunn)) +- Fixing outdated command in README [\#155](https://github.com/chef/bento/pull/155) ([apetresc](https://github.com/apetresc)) +- Update vmtools branch logic to reflect new providers in packer 0.5.1- [\#154](https://github.com/chef/bento/pull/154) ([lwieske](https://github.com/lwieske)) +- Repair FreeBSD definitions after they got corrupted by a Packer bug. [\#153](https://github.com/chef/bento/pull/153) ([juliandunn](https://github.com/juliandunn)) +- Update to packer 0.5.1 [\#152](https://github.com/chef/bento/pull/152) ([lwieske](https://github.com/lwieske)) +- Update sshd.sh [\#150](https://github.com/chef/bento/pull/150) ([sc0ttruss](https://github.com/sc0ttruss)) +- Update to packer 0.4.1. [\#148](https://github.com/chef/bento/pull/148) ([juliandunn](https://github.com/juliandunn)) +- Allow building provisionered OmniOS boxes. [\#146](https://github.com/chef/bento/pull/146) ([juliandunn](https://github.com/juliandunn)) +- Rewrite chef.sh to be more cross-platform. [\#145](https://github.com/chef/bento/pull/145) ([juliandunn](https://github.com/juliandunn)) +- Fix FreeBSD i386 not passing env vars through properly [\#141](https://github.com/chef/bento/pull/141) ([juliandunn](https://github.com/juliandunn)) +- Update readme for CentOS 6.5 [\#137](https://github.com/chef/bento/pull/137) ([juliandunn](https://github.com/juliandunn)) +- Make Thor actually exit non-zero when a validation error occurs. [\#136](https://github.com/chef/bento/pull/136) ([juliandunn](https://github.com/juliandunn)) +- Fix broken CentOS 6.5 i386 template [\#135](https://github.com/chef/bento/pull/135) ([juliandunn](https://github.com/juliandunn)) +- Allow RHEL mirror URL to be customized at box build time [\#134](https://github.com/chef/bento/pull/134) ([juliandunn](https://github.com/juliandunn)) +- \[BENTO-83\] Add working templates for SuSE Linux Enterprise Server 11 [\#132](https://github.com/chef/bento/pull/132) ([juliandunn](https://github.com/juliandunn)) +- Reduce memory usage of FreeBSD box to 512M [\#129](https://github.com/chef/bento/pull/129) ([juliandunn](https://github.com/juliandunn)) +- Repair incorrect SHA1 checksum on Ubuntu 12.04-i386 box [\#128](https://github.com/chef/bento/pull/128) ([juliandunn](https://github.com/juliandunn)) +- Upgrade FreeBSD box to 9.2 [\#127](https://github.com/chef/bento/pull/127) ([juliandunn](https://github.com/juliandunn)) +- Fix incorrect FreeBSD i386 guest\_os\_type [\#126](https://github.com/chef/bento/pull/126) ([juliandunn](https://github.com/juliandunn)) +- Bash is dead, Long live Bash. [\#120](https://github.com/chef/bento/pull/120) ([petecheslock](https://github.com/petecheslock)) +- Migrate to RHEL 6.5. Also be consistent about the output package name. [\#119](https://github.com/chef/bento/pull/119) ([juliandunn](https://github.com/juliandunn)) +- Fix incorrect CPU type on Ubuntu 12.10. [\#117](https://github.com/chef/bento/pull/117) ([juliandunn](https://github.com/juliandunn)) +- \[BENTO-91\] Re-fix sudoers rules for Ubuntu \>= 12.04 [\#116](https://github.com/chef/bento/pull/116) ([juliandunn](https://github.com/juliandunn)) +- BENTO-96 fix execute\_command for debian to include env vars [\#115](https://github.com/chef/bento/pull/115) ([fourseven](https://github.com/fourseven)) +- BENTO-94 and BENTO-95 Fixes [\#114](https://github.com/chef/bento/pull/114) ([bflad](https://github.com/bflad)) +- Fix documentation in README; add info on how to build legacy veewee base... [\#112](https://github.com/chef/bento/pull/112) ([juliandunn](https://github.com/juliandunn)) +- Fix .gitignore for iso dir [\#110](https://github.com/chef/bento/pull/110) ([juliandunn](https://github.com/juliandunn)) +- Add Windows 2012R2 server definitions. [\#107](https://github.com/chef/bento/pull/107) ([juliandunn](https://github.com/juliandunn)) +- Added templates for RHEL. [\#106](https://github.com/chef/bento/pull/106) ([juliandunn](https://github.com/juliandunn)) +- \[BENTO-5\] Add NFS client capability to CentOS and Fedora templates. [\#105](https://github.com/chef/bento/pull/105) ([andytson](https://github.com/andytson)) +- Fix all Packer validation errors [\#104](https://github.com/chef/bento/pull/104) ([juliandunn](https://github.com/juliandunn)) +- CentOS 6.4 won't install with only 384MB of RAM [\#102](https://github.com/chef/bento/pull/102) ([juliandunn](https://github.com/juliandunn)) +- Debian 6.0.8 [\#100](https://github.com/chef/bento/pull/100) ([someara](https://github.com/someara)) +- Debian 7.2.0 [\#99](https://github.com/chef/bento/pull/99) ([someara](https://github.com/someara)) +- Upgrade to CentOS 5.10 [\#97](https://github.com/chef/bento/pull/97) ([juliandunn](https://github.com/juliandunn)) +- added ubuntu-13.10 packer templates w/debian sudoers scripts [\#96](https://github.com/chef/bento/pull/96) ([routelastresort](https://github.com/routelastresort)) +- Use proper packer env var for checking VirtualBox [\#95](https://github.com/chef/bento/pull/95) ([juliandunn](https://github.com/juliandunn)) +- fixing packer templates to work on vmware [\#93](https://github.com/chef/bento/pull/93) ([someara](https://github.com/someara)) +- Fix box names [\#90](https://github.com/chef/bento/pull/90) ([tduffield](https://github.com/tduffield)) +- Clean FreeBSD boxes to save space. [\#89](https://github.com/chef/bento/pull/89) ([juliandunn](https://github.com/juliandunn)) +- Remove bash from the FreeBSD image. [\#88](https://github.com/chef/bento/pull/88) ([juliandunn](https://github.com/juliandunn)) +- Cleanup shutdown scripts [\#87](https://github.com/chef/bento/pull/87) ([tduffield](https://github.com/tduffield)) +- removed name field from all templates [\#86](https://github.com/chef/bento/pull/86) ([tduffield](https://github.com/tduffield)) +- Since the 12.04 release, Ubuntu uses the more standard "sudo" group [\#84](https://github.com/chef/bento/pull/84) ([whiteley](https://github.com/whiteley)) +- Fixup readme for packer [\#83](https://github.com/chef/bento/pull/83) ([juliandunn](https://github.com/juliandunn)) +- \[BENTO-84\] Update Ubuntu LTS definitions to 12.04.3 [\#81](https://github.com/chef/bento/pull/81) ([juliandunn](https://github.com/juliandunn)) +- Updated to vagrant-windows that works under Vagrant 1.2 and 1.3 [\#80](https://github.com/chef/bento/pull/80) ([juliandunn](https://github.com/juliandunn)) +- Added Fedora 19 to list of documented boxes. [\#78](https://github.com/chef/bento/pull/78) ([juliandunn](https://github.com/juliandunn)) +- \[BENTO-82\] Import same fix from PR\#72 to i386 box. [\#77](https://github.com/chef/bento/pull/77) ([juliandunn](https://github.com/juliandunn)) +- Bump to Vagrant 1.2.7 [\#76](https://github.com/chef/bento/pull/76) ([juliandunn](https://github.com/juliandunn)) +- \[BENTO-13\] ensure `kudzu` is uninstalled on CentOS boxes [\#75](https://github.com/chef/bento/pull/75) ([schisamo](https://github.com/schisamo)) +- Ensure /etc/sudoers sed replacement works for Debian 7.x. [\#73](https://github.com/chef/bento/pull/73) ([justsee](https://github.com/justsee)) +- Add preseed command to comment out cdrom in /etc/apt/sources.list. [\#72](https://github.com/chef/bento/pull/72) ([justsee](https://github.com/justsee)) +- \[BENTO-80\] Sudoer should use secure\_path by default [\#70](https://github.com/chef/bento/pull/70) ([jamesonjlee](https://github.com/jamesonjlee)) +- Added definitions for SUSE Linux Enterprise Server 11 SP3. [\#68](https://github.com/chef/bento/pull/68) ([juliandunn](https://github.com/juliandunn)) +- Added definitions for Fedora 19, Schrodinger's Cat [\#66](https://github.com/chef/bento/pull/66) ([juliandunn](https://github.com/juliandunn)) +- \[BENTO-58\] Switch to manual partitioning since autopart makes /tmp too small to actually run tests sensibly [\#65](https://github.com/chef/bento/pull/65) ([juliandunn](https://github.com/juliandunn)) +- \[BENTO-50\] Add documentation for all current baseboxes [\#64](https://github.com/chef/bento/pull/64) ([juliandunn](https://github.com/juliandunn)) +- \[BENTO-56\] Fix missing vagrant user in the sudoers file [\#63](https://github.com/chef/bento/pull/63) ([juliandunn](https://github.com/juliandunn)) +- \[BENTO-54\] Fix Debian 7 definitions [\#62](https://github.com/chef/bento/pull/62) ([vaskas](https://github.com/vaskas)) +- \[BENTO-53\] Fixed paths for Debian 6.0.7 ISOs [\#61](https://github.com/chef/bento/pull/61) ([hectcastro](https://github.com/hectcastro)) +- \[BENTO-49\] Debian 6 definitions broken: missing sshd.sh [\#60](https://github.com/chef/bento/pull/60) ([zuazo](https://github.com/zuazo)) +- \[BENTO-48\] Add SLES11SP2 definitions [\#59](https://github.com/chef/bento/pull/59) ([juliandunn](https://github.com/juliandunn)) +- \[BENTO-47\] Regenerate Autounattend.xml for Windows 2012 to unbreak it. [\#57](https://github.com/chef/bento/pull/57) ([juliandunn](https://github.com/juliandunn)) +- Fix Gemfile and Gemfile.lock. [\#55](https://github.com/chef/bento/pull/55) ([juliandunn](https://github.com/juliandunn)) +- \[BENTO-46\] Update centos 6.4 definitions to use the common components. [\#54](https://github.com/chef/bento/pull/54) ([lewg](https://github.com/lewg)) +- \[BENTO-45\] Install vmware tools if on fusion provider. [\#53](https://github.com/chef/bento/pull/53) ([lewg](https://github.com/lewg)) +- Fix PR\#33 - CentOS 5.8 is in the vault now. [\#52](https://github.com/chef/bento/pull/52) ([juliandunn](https://github.com/juliandunn)) +- \[BENTO-41\] Check to see if you're on VirtualBox [\#51](https://github.com/chef/bento/pull/51) ([lewg](https://github.com/lewg)) +- \[BENTO-19\] Use the VirtualBox ISO that veewee attaches to the machine [\#50](https://github.com/chef/bento/pull/50) ([juliandunn](https://github.com/juliandunn)) +- Upgrade to veewee that has hooks \(we may use them\) [\#49](https://github.com/chef/bento/pull/49) ([juliandunn](https://github.com/juliandunn)) +- \[BENTO-37\] Added definitions for ubuntu 13.04. [\#48](https://github.com/chef/bento/pull/48) ([juliandunn](https://github.com/juliandunn)) +- Add Debian 7.0.0 definitions [\#47](https://github.com/chef/bento/pull/47) ([jtimberman](https://github.com/jtimberman)) +- \[BENTO-35\] Do not ship Chef with our baseboxes anymore. [\#46](https://github.com/chef/bento/pull/46) ([juliandunn](https://github.com/juliandunn)) +- \[BENTO-10\] Add "UseDNS no" to all sshd configs [\#45](https://github.com/chef/bento/pull/45) ([juliandunn](https://github.com/juliandunn)) +- Fix Windows 8 Enterprise box builds. [\#44](https://github.com/chef/bento/pull/44) ([juliandunn](https://github.com/juliandunn)) +- Windows 8 and 2012 fixes [\#43](https://github.com/chef/bento/pull/43) ([juliandunn](https://github.com/juliandunn)) +- Added ubuntu-12.10 definitions. [\#41](https://github.com/chef/bento/pull/41) ([johnbellone](https://github.com/johnbellone)) +- Update documentation for Chef 11.4.4. Update Gemfile for vagrant 1.2.2. [\#40](https://github.com/chef/bento/pull/40) ([juliandunn](https://github.com/juliandunn)) +- Add a task to update apt-get on boot in ubuntu. [\#39](https://github.com/chef/bento/pull/39) ([whilp](https://github.com/whilp)) +- update build directions, new links for Chef 11.4.0 baseboxes [\#38](https://github.com/chef/bento/pull/38) ([juliandunn](https://github.com/juliandunn)) +- fix Windows box builds for Vagrant 1.1 [\#37](https://github.com/chef/bento/pull/37) ([juliandunn](https://github.com/juliandunn)) +- Added defs for CentOS 5.9 and 6.4 boxes. Bugfix CentOS 5.8 x86\_64 box. [\#36](https://github.com/chef/bento/pull/36) ([juliandunn](https://github.com/juliandunn)) +- Repin gemset to Vagrant 1.1 versions and veewee head [\#35](https://github.com/chef/bento/pull/35) ([juliandunn](https://github.com/juliandunn)) +- \[BENTO-31\] debian 6.0.5 is no longer available, change to 6.0.7 [\#32](https://github.com/chef/bento/pull/32) ([ctdk](https://github.com/ctdk)) +- Vagrant11+2008 [\#30](https://github.com/chef/bento/pull/30) ([hh](https://github.com/hh)) +- Windows+2012+8 [\#29](https://github.com/chef/bento/pull/29) ([hh](https://github.com/hh)) +- \[BENTO-28\] Use Centos, not RedHat for os\_type\_id [\#27](https://github.com/chef/bento/pull/27) ([chulkilee](https://github.com/chulkilee)) +- \[BENTO-24\] "\#" is not a valid comment character for Windows batch files [\#22](https://github.com/chef/bento/pull/22) ([juliandunn](https://github.com/juliandunn)) +- Update to ubuntu 12.04.2 [\#20](https://github.com/chef/bento/pull/20) ([rnewson](https://github.com/rnewson)) +- \[BENTO-20\] add fedora 18 support [\#17](https://github.com/chef/bento/pull/17) ([josephholsten](https://github.com/josephholsten)) +- BENTO-17 passes validation for windows 7 and 2008R2 [\#15](https://github.com/chef/bento/pull/15) ([hh](https://github.com/hh)) +- \[BENTO-2\] Update Ubuntu iso filenames, md5sums. [\#6](https://github.com/chef/bento/pull/6) ([torandu](https://github.com/torandu)) +- \[BENTO-4\] Updated centos 6.2 iso urls to use the vault.centos.org url [\#4](https://github.com/chef/bento/pull/4) ([cburyta](https://github.com/cburyta)) + + + +\* *This Change Log was automatically generated by [github_changelog_generator](https://github.com/skywinder/Github-Changelog-Generator)* \ No newline at end of file diff --git a/README.md b/README.md index 4aa741c2b..903a9c7c1 100644 --- a/README.md +++ b/README.md @@ -16,16 +16,17 @@ This project is managed by the CHEF Release Engineering team. For more informati The following boxes are built from this repository's templates for publicly available platforms and are currently hosted via Atlas in the [bento organization](https://atlas.hashicorp.com/bento/). -| | VirtualBox (5.0.6) | VMware (8.0.1) | Parallels (11.0.1) | +| | VirtualBox (5.0.12) | VMware (8.0.2) | Parallels (11.1.0) | | ------------ | ------------- | ------------- | ------------- | | centos-5.11 | [i386][1], [x86_64][2] | [i386][3], [x86_64][4] | [i386][5], [x86_64][6] | | centos-6.7 | [i386][7], [x86_64][8] | [i386][9], [x86_64][10] | [i386][11], [x86_64][12] | -| centos-7.1 | [x86_64][13] | [x86_64][14] | [x86_64][15] | +| centos-7.2 | [x86_64][13] | [x86_64][14] | [x86_64][15] | | debian-6.0.10 | [i386][16], [amd64][17] | [i386][18], [amd64][19] | [i386][20], [amd64][21] | | debian-7.9 | [i386][22], [amd64][23] | [i386][24], [amd64][25] | [i386][26], [amd64][27] | | debian-8.2 | [i386][28], [amd64][29] | [i386][30], [amd64][31] | [i386][32], [amd64][33] | | fedora-21 | [i386][76], [x86_64][77] | [i386][78], [x86_64][79] | [i386][80], [x86_64][81] | | fedora-22 | [x86_64][82] | [x86_64][83] | [x86_64][84] | +| fedora-23 | [x86_64][85] | [x86_64][86] | [x86_64][87] | | freebsd-9.3 | [amd64][35] | [amd64][37] | [amd64][39] | | freebsd-10.2 | [amd64][41] | [amd64][43] | [amd64][45] | | opensuse-13.2 | [i386][46], [x86_64][47] | [i386][48], [x86_64][49] | [i386][50], [x86_64][51] | @@ -36,7 +37,7 @@ The following boxes are built from this repository's templates for publicly avai ### Build Notes -* Built on OSX 10.10.5 hosts +* Built on OSX 10.11.2 hosts * If you're using the [Vagrant VMWare Fusion](https://www.vagrantup.com/vmware) provider, using `vagrant box add --provider vmware_desktop ...` will work for these boxes. Using `--provider vmware_fusion`, will not. @@ -208,9 +209,9 @@ limitations under the License. [11]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/parallels/opscode_centos-6.7-i386_chef-provisionerless.box [12]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/parallels/opscode_centos-6.7_chef-provisionerless.box -[13]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_centos-7.1_chef-provisionerless.box -[14]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_centos-7.1_chef-provisionerless.box -[15]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/parallels/opscode_centos-7.1_chef-provisionerless.box +[13]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_centos-7.2_chef-provisionerless.box +[14]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_centos-7.2_chef-provisionerless.box +[15]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/parallels/opscode_centos-7.2_chef-provisionerless.box [16]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_debian-6.0.10-i386_chef-provisionerless.box [17]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_debian-6.0.10_chef-provisionerless.box @@ -226,12 +227,12 @@ limitations under the License. [26]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/parallels/opscode_debian-7.8-i386_chef-provisionerless.box [27]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/parallels/opscode_debian-7.8_chef-provisionerless.box -[28]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_debian-8.1-i386_chef-provisionerless.box -[29]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_debian-8.1_chef-provisionerless.box -[30]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_debian-8.1-i386_chef-provisionerless.box -[31]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_debian-8.1_chef-provisionerless.box -[32]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/parallels/opscode_debian-8.1-i386_chef-provisionerless.box -[33]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/parallels/opscode_debian-8.1_chef-provisionerless.box +[28]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_debian-8.2-i386_chef-provisionerless.box +[29]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_debian-8.2_chef-provisionerless.box +[30]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_debian-8.2-i386_chef-provisionerless.box +[31]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_debian-8.2_chef-provisionerless.box +[32]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/parallels/opscode_debian-8.2-i386_chef-provisionerless.box +[33]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/parallels/opscode_debian-8.2_chef-provisionerless.box [34]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_freebsd-9.3-i386_chef-provisionerless.box [35]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_freebsd-9.3_chef-provisionerless.box @@ -293,3 +294,7 @@ limitations under the License. [82]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_fedora-22_chef-provisionerless.box [83]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_fedora-22_chef-provisionerless.box [84]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/parallels/opscode_fedora-22_chef-provisionerless.box + +[85]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_fedora-22_chef-provisionerless.box +[86]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_fedora-22_chef-provisionerless.box +[87]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/parallels/opscode_fedora-22_chef-provisionerless.box From 204bc781554c0ce305e7237457bef31729f716bd Mon Sep 17 00:00:00 2001 From: "Julian C. Dunn" <jdunn@aquezada.com> Date: Fri, 1 Jan 2016 14:37:20 -0500 Subject: [PATCH 0451/1622] Fix links to Fedora 23 boxes. --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 903a9c7c1..9d3cc265c 100644 --- a/README.md +++ b/README.md @@ -295,6 +295,6 @@ limitations under the License. [83]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_fedora-22_chef-provisionerless.box [84]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/parallels/opscode_fedora-22_chef-provisionerless.box -[85]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_fedora-22_chef-provisionerless.box -[86]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_fedora-22_chef-provisionerless.box -[87]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/parallels/opscode_fedora-22_chef-provisionerless.box +[85]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_fedora-23_chef-provisionerless.box +[86]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_fedora-23_chef-provisionerless.box +[87]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/parallels/opscode_fedora-23_chef-provisionerless.box From 0224b5f4c89ebff83f6dba0458069cc591e69386 Mon Sep 17 00:00:00 2001 From: "Julian C. Dunn" <jdunn@chef.io> Date: Mon, 4 Jan 2016 11:37:29 -0800 Subject: [PATCH 0452/1622] VMWare Fedora 23 box can't be built. --- README.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/README.md b/README.md index 9d3cc265c..7090e59f1 100644 --- a/README.md +++ b/README.md @@ -26,7 +26,7 @@ The following boxes are built from this repository's templates for publicly avai | debian-8.2 | [i386][28], [amd64][29] | [i386][30], [amd64][31] | [i386][32], [amd64][33] | | fedora-21 | [i386][76], [x86_64][77] | [i386][78], [x86_64][79] | [i386][80], [x86_64][81] | | fedora-22 | [x86_64][82] | [x86_64][83] | [x86_64][84] | -| fedora-23 | [x86_64][85] | [x86_64][86] | [x86_64][87] | +| fedora-23 | [x86_64][85] | | [x86_64][87] | | freebsd-9.3 | [amd64][35] | [amd64][37] | [amd64][39] | | freebsd-10.2 | [amd64][41] | [amd64][43] | [amd64][45] | | opensuse-13.2 | [i386][46], [x86_64][47] | [i386][48], [x86_64][49] | [i386][50], [x86_64][51] | @@ -296,5 +296,4 @@ limitations under the License. [84]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/parallels/opscode_fedora-22_chef-provisionerless.box [85]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_fedora-23_chef-provisionerless.box -[86]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_fedora-23_chef-provisionerless.box [87]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/parallels/opscode_fedora-23_chef-provisionerless.box From 6d5c8134f77f7b0860a044ac38709fca195ed2b9 Mon Sep 17 00:00:00 2001 From: Rickard von Essen <rickard.von.essen@gmail.com> Date: Fri, 8 Jan 2016 15:15:30 +0100 Subject: [PATCH 0453/1622] Add support for OpenSUSE Leap 42.1 - x86_64 --- http/opensuse-leap-42.1/autoinst.xml | 218 ++++++++++++++++++++++++++ opensuse-leap-42.1-x86_64.json | 194 +++++++++++++++++++++++ scripts/opensuse/remove-dvd-source.sh | 23 ++- 3 files changed, 430 insertions(+), 5 deletions(-) create mode 100644 http/opensuse-leap-42.1/autoinst.xml create mode 100644 opensuse-leap-42.1-x86_64.json diff --git a/http/opensuse-leap-42.1/autoinst.xml b/http/opensuse-leap-42.1/autoinst.xml new file mode 100644 index 000000000..3b5619238 --- /dev/null +++ b/http/opensuse-leap-42.1/autoinst.xml @@ -0,0 +1,218 @@ +<?xml version="1.0"?> +<!DOCTYPE profile> + +<!-- http://doc.opensuse.org/projects/autoyast/configuration.html --> + +<profile xmlns="http://www.suse.com/1.0/yast2ns" xmlns:config="http://www.suse.com/1.0/configns"> + <general> + <mode> + <confirm config:type="boolean">false</confirm> + <forceboot config:type="boolean">true</forceboot> + <final_reboot config:type="boolean">false</final_reboot> + </mode> + </general> + <report> + <messages> + <show config:type="boolean">false</show> + <timeout config:type="integer">10</timeout> + <log config:type="boolean">true</log> + </messages> + <warnings> + <show config:type="boolean">false</show> + <timeout config:type="integer">10</timeout> + <log config:type="boolean">true</log> + </warnings> + <errors> + <show config:type="boolean">false</show> + <timeout config:type="integer">10</timeout> + <log config:type="boolean">true</log> + </errors> + </report> + + <keyboard> + <keymap>english-us</keymap> + </keyboard> + <language> + <language>en_US</language> + <languages>en_US</languages> + </language> + <timezone> + <hwclock>UTC</hwclock> + <timezone>Etc/UTC</timezone> + </timezone> + <partitioning config:type="list"> + <drive> + <initialize config:type="boolean">true</initialize> + <partitions config:type="list"> + <partition> + <create config:type="boolean">true</create> + <crypt_fs config:type="boolean">false</crypt_fs> + <filesystem config:type="symbol">swap</filesystem> + <format config:type="boolean">true</format> + <fstopt>defaults</fstopt> + <loop_fs config:type="boolean">false</loop_fs> + <mount>swap</mount> + <mountby config:type="symbol">device</mountby> + <partition_id config:type="integer">130</partition_id> + <partition_nr config:type="integer">1</partition_nr> + <raid_options/> + <resize config:type="boolean">false</resize> + <size>512M</size> + </partition> + <partition> + <create config:type="boolean">true</create> + <crypt_fs config:type="boolean">false</crypt_fs> + <filesystem config:type="symbol">btrfs</filesystem> + <format config:type="boolean">true</format> + <loop_fs config:type="boolean">false</loop_fs> + <mount>/</mount> + <mountby config:type="symbol">device</mountby> + <partition_id config:type="integer">131</partition_id> + <partition_nr config:type="integer">2</partition_nr> + <raid_options/> + <resize config:type="boolean">false</resize> + <size>max</size> + <subvolumes config:type="list"> + <listentry>boot/grub2/i386-pc</listentry> + <listentry>boot/grub2/x86_64-efi</listentry> + <listentry>home</listentry> + <listentry>opt</listentry> + <listentry>srv</listentry> + <listentry>tmp</listentry> + <listentry>usr/local</listentry> + <listentry>var/crash</listentry> + <listentry>var/lib/mailman</listentry> + <listentry>var/lib/named</listentry> + <listentry>var/lib/pgsql</listentry> + <listentry>var/log</listentry> + <listentry>var/opt</listentry> + <listentry>var/spool</listentry> + <listentry>var/tmp</listentry> + </subvolumes> + </partition> + </partitions> + <pesize/> + <type config:type="symbol">CT_DISK</type> + <use>all</use> + </drive> + </partitioning> + + <bootloader> + <loader_type>grub2</loader_type> + </bootloader> + + <networking> + <ipv6 config:type="boolean">false</ipv6> + <keep_install_network config:type="boolean">true</keep_install_network> + <dns> + <dhcp_hostname config:type="boolean">true</dhcp_hostname> + <dhcp_resolv config:type="boolean">true</dhcp_resolv> + <domain>vagrantup.com</domain> + <hostname>opensuse-leap-42.1-x64</hostname> + </dns> + <interfaces config:type="list"> + <interface> + <bootproto>dhcp</bootproto> + <device>enp0s3</device> + <startmode>onboot</startmode> + </interface> + <interface> + <bootproto>dhcp</bootproto> + <device>ens33</device> + <startmode>onboot</startmode> + </interface> + </interfaces> + </networking> + + <firewall> + <enable_firewall config:type="boolean">true</enable_firewall> + <start_firewall config:type="boolean">true</start_firewall> + </firewall> + + <software> + <image/> + <instsource/> + <packages config:type="list"> + <package>grub2</package> + <package>glibc-locale</package> + <package>iputils</package> + <package>kernel-default</package> + <package>kernel-default-devel</package> + <package>gcc</package> + <package>make</package> + <package>sudo</package> + <package>yast2</package> + <package>yast2-firstboot</package> + <package>zypper</package> + <package>yast2-trans-en_US</package> + <package>wget</package> + <package>curl</package> + <package>grub2-branding-openSUSE</package> + </packages> + <patterns config:type="list"> + <pattern>sw_management</pattern> + <pattern>yast2_install_wf</pattern> + <pattern>minimal_base</pattern> + </patterns> + <remove-packages config:type="list"> + <package>bash-completion</package> + <package>telnet</package> + <package>virtualbox-guest-kmp-default</package> + <package>virtualbox-guest-tools</package> + </remove-packages> + </software> + <services-manager> + <default_target>graphical</default_target> + <services> + <disable config:type="list"/> + <enable config:type="list"> + <service>sshd</service> + </enable> + </services> + </services-manager> + <groups config:type="list"> + <group> + <gid>100</gid> + <groupname>users</groupname> + <userlist/> + </group> + </groups> + <user_defaults> + <expire/> + <group>100</group> + <groups/> + <home>/home</home> + <inactive>-1</inactive> + <no_groups config:type="boolean">true</no_groups> + <shell>/bin/bash</shell> + <skel>/etc/skel</skel> + <umask>022</umask> + </user_defaults> + + <users config:type="list"> + <user> + <user_password>vagrant</user_password> + <username>root</username> + </user> + <user> + <fullname>vagrant</fullname> + <gid>100</gid> + <home>/home/vagrant</home> + <password_settings> + <expire/> + <flag/> + <inact>-1</inact> + <max>99999</max> + <min>0</min> + <warn>7</warn> + </password_settings> + <shell>/bin/bash</shell> + <uid>1000</uid> + <user_password>vagrant</user_password> + <username>vagrant</username> + </user> + </users> + <kdump> + <add_crash_kernel config:type="boolean">false</add_crash_kernel> + </kdump> +</profile> diff --git a/opensuse-leap-42.1-x86_64.json b/opensuse-leap-42.1-x86_64.json new file mode 100644 index 000000000..3bb93d460 --- /dev/null +++ b/opensuse-leap-42.1-x86_64.json @@ -0,0 +1,194 @@ +{ + "builders": [ + { + "boot_command": [ + "<esc><enter><wait>", + "linux netsetup=dhcp install=cd:/<wait>", + " lang=en_US autoyast=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `autoinst_cfg`}}<wait>", + " textmode=1<wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 20480, + "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "guest_os_type": "OpenSUSE_64", + "hard_drive_interface": "sata", + "headless": "{{ user `headless` }}", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-virtualbox", + "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "virtualbox-iso", + "vboxmanage": [ + [ + "modifyvm", + "{{.Name}}", + "--memory", + "768" + ], + [ + "modifyvm", + "{{.Name}}", + "--cpus", + "1" + ] + ], + "virtualbox_version_file": ".vbox_version", + "vm_name": "{{ user `template` }}" + }, + { + "boot_command": [ + "<esc><enter><wait>", + "linux netsetup=dhcp install=cd:/<wait>", + " lang=en_US autoyast=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `autoinst_cfg`}}<wait>", + " textmode=1<wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 20480, + "guest_os_type": "opensuse-64", + "headless": "{{ user `headless` }}", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-vmware", + "shutdown_command": "echo 'vagrant'|sudo -S /sbin/shutdown -h 1", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "tools_upload_flavor": "linux", + "type": "vmware-iso", + "vm_name": "{{ user `template` }}", + "vmx_data": { + "cpuid.coresPerSocket": "1", + "memsize": "768", + "numvcpus": "1" + } + }, + { + "boot_command": [ + "<esc><enter><wait>", + "linux netsetup=dhcp netdevice=eth0 install=cd:/<wait>", + " lang=en_US autoyast=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `autoinst_cfg`}}<wait>", + " textmode=1<wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 20480, + "guest_os_type": "opensuse", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-parallels", + "parallels_tools_flavor": "lin", + "prlctl": [ + [ + "set", + "{{.Name}}", + "--memsize", + "768" + ], + [ + "set", + "{{.Name}}", + "--cpus", + "1" + ] + ], + "prlctl_version_file": ".prlctl_version", + "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "parallels-iso", + "vm_name": "{{ user `template` }}" + }, + { + "boot_command": [ + "<esc><enter><wait>", + "linux netsetup=dhcp netdevice=eth0 install=cd:/<wait>", + " lang=en_US autoyast=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `autoinst_cfg`}}<wait>", + " textmode=1<wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 20480, + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-qemu", + "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "qemu", + "vm_name": "{{ user `template` }}" + } + ], + "post-processors": [ + { + "output": "builds/{{user `box_basename`}}.{{.Provider}}.box", + "type": "vagrant" + } + ], + "provisioners": [ + { + "destination": "/tmp/bento-metadata.json", + "source": "{{user `metadata`}}", + "type": "file" + }, + { + "environment_vars": [ + "HOME_DIR=/home/vagrant", + "http_proxy={{user `http_proxy`}}", + "https_proxy={{user `https_proxy`}}", + "no_proxy={{user `no_proxy`}}" + ], + "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh '{{.Path}}'", + "scripts": [ + "scripts/common/metadata.sh", + "scripts/common/sshd.sh", + "scripts/common/vagrant.sh", + "scripts/common/vmtools.sh", + "scripts/opensuse/sudoers.sh", + "scripts/opensuse/zypper-locks.sh", + "scripts/opensuse/remove-dvd-source.sh", + "scripts/opensuse/cleanup.sh", + "scripts/common/minimize.sh" + ], + "type": "shell" + } + ], + "variables": { + "arch": "64", + "autoinst_cfg": "opensuse-leap-42.1/autoinst.xml", + "box_basename": "opensuse-leap-42.1", + "build_timestamp": "{{isotime \"20060102150405\"}}", + "git_revision": "__unknown_git_revision__", + "headless": "", + "http_proxy": "{{env `http_proxy`}}", + "https_proxy": "{{env `https_proxy`}}", + "iso_checksum": "8576e84822cdbe566bf551e28a169fc028229831eba9f07a4c1f84302c5ddb09", + "iso_checksum_type": "sha256", + "iso_name": "openSUSE-Leap-42.1-DVD-x86_64.iso", + "metadata": "floppy/dummy_metadata.json", + "mirror": "http://download.opensuse.org/distribution", + "mirror_directory": "leap/42.1/iso", + "name": "opensuse-leap-42.1", + "no_proxy": "{{env `no_proxy`}}", + "template": "opensuse-leap-42.1-x86_64", + "version": "2.0.TIMESTAMP" + } +} diff --git a/scripts/opensuse/remove-dvd-source.sh b/scripts/opensuse/remove-dvd-source.sh index f851a3e14..0889344fb 100644 --- a/scripts/opensuse/remove-dvd-source.sh +++ b/scripts/opensuse/remove-dvd-source.sh @@ -1,8 +1,21 @@ #!/bin/sh -eux -zypper removerepo "openSUSE-13.2-0" -zypper ar http://download.opensuse.org/distribution/13.2/repo/oss/ openSUSE-13.2-Oss -zypper ar http://download.opensuse.org/distribution/13.2/repo/non-oss/ openSUSE-13.2-Non-Oss -zypper ar http://download.opensuse.org/update/13.2/ openSUSE-13.2-Update -zypper ar http://download.opensuse.org/update/13.2-non-oss/ openSUSE-13.2-Update-Non-Oss +version=`grep VERSION= /etc/os-release | cut -f2 -d\" | cut -f1 -d\ ` + +zypper removerepo "openSUSE-${version}-0" + +if [[ $version =~ "13" ]]; then + zypper ar http://download.opensuse.org/distribution/${version}/repo/oss/ openSUSE-${version}-Oss + zypper ar http://download.opensuse.org/distribution/${version}/repo/non-oss/ openSUSE-${version}-Non-Oss + zypper ar http://download.opensuse.org/update/${version}/ openSUSE-${version}-Update + zypper ar http://download.opensuse.org/update/${version}-non-oss/ openSUSE-${version}-Update-Non-Oss +fi + +if [[ $version =~ "4" ]]; then + zypper ar http://download.opensuse.org/distribution/leap/${version}/repo/oss/ openSUSE-Leap-${version}-Oss + zypper ar http://download.opensuse.org/distribution/leap/${version}/repo/non-oss/ openSUSE-Leap-${version}-Non-Oss + zypper ar http://download.opensuse.org/update/leap/${version}/oss/ openSUSE-Leap-${version}-Update + zypper ar http://download.opensuse.org/update/leap/${version}/non-oss/ openSUSE-Leap-${version}-Update-Non-Oss +fi + zypper refresh From 9c191bb994e0d3d202d67b949a9775aacc77b554 Mon Sep 17 00:00:00 2001 From: ceetav <ceetav@gmail.com> Date: Wed, 20 Jan 2016 01:29:26 +0300 Subject: [PATCH 0454/1622] simplify distro detection for RHEL-derivatives --- scripts/centos/cleanup.sh | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/scripts/centos/cleanup.sh b/scripts/centos/cleanup.sh index 1ffcc9334..4399e21ee 100644 --- a/scripts/centos/cleanup.sh +++ b/scripts/centos/cleanup.sh @@ -1,19 +1,12 @@ #!/bin/sh -eux -if [ -s /etc/oracle-release ]; then - distro='oracle' -elif [ -s /etc/enterprise-release ]; then - distro='oracle' -elif [ -s /etc/redhat-release ]; then - # should ouput 'centos' OR 'red hat' - distro=`cat /etc/redhat-release | sed 's/^\(CentOS\|Red Hat\).*/\1/i' | tr '[:upper:]' '[:lower:]'` -fi - +# should output one of 'redhat' 'centos' 'oraclelinux' +distro="`rpm -qf --queryformat '%{NAME}' /etc/redhat-release | cut -f 1 -d '-'`" # Remove development and kernel source packages yum -y remove gcc cpp kernel-devel kernel-headers perl; -if [ "$distro" != 'red hat' ]; then +if [ "$distro" != 'redhat' ]; then yum -y clean all; fi From d534066d50a3fab66f820f32690519bfed4e1910 Mon Sep 17 00:00:00 2001 From: HAYASHI Kentaro <hayashi@clear-code.com> Date: Mon, 25 Jan 2016 17:18:22 +0900 Subject: [PATCH 0455/1622] Add support for Debian GNU/Linux 8.3 --- debian-8.3-amd64.json | 237 ++++++++++++++++++++++++++++++++++++++++++ debian-8.3-i386.json | 237 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 474 insertions(+) create mode 100644 debian-8.3-amd64.json create mode 100644 debian-8.3-i386.json diff --git a/debian-8.3-amd64.json b/debian-8.3-amd64.json new file mode 100644 index 000000000..5e781ce36 --- /dev/null +++ b/debian-8.3-amd64.json @@ -0,0 +1,237 @@ +{ + "builders": [ + { + "boot_command": [ + "<esc><wait>", + "install <wait>", + " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}} <wait>", + "debian-installer=en_US <wait>", + "auto <wait>", + "locale=en_US <wait>", + "kbd-chooser/method=us <wait>", + "keyboard-configuration/xkb-keymap=us <wait>", + "netcfg/get_hostname={{ .Name }} <wait>", + "netcfg/get_domain=vagrantup.com <wait>", + "fb=false <wait>", + "debconf/frontend=noninteractive <wait>", + "console-setup/ask_detect=false <wait>", + "console-keymaps-at/keymap=us <wait>", + "grub-installer/bootdev=/dev/sda <wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "guest_os_type": "Debian_64", + "hard_drive_interface": "sata", + "headless": "{{ user `headless` }}", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-virtualbox", + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "virtualbox-iso", + "vboxmanage": [ + [ + "modifyvm", + "{{.Name}}", + "--memory", + "384" + ], + [ + "modifyvm", + "{{.Name}}", + "--cpus", + "1" + ] + ], + "virtualbox_version_file": ".vbox_version", + "vm_name": "{{ user `template` }}" + }, + { + "boot_command": [ + "<esc><wait>", + "install <wait>", + " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}} <wait>", + "debian-installer=en_US <wait>", + "auto <wait>", + "locale=en_US <wait>", + "kbd-chooser/method=us <wait>", + "keyboard-configuration/xkb-keymap=us <wait>", + "netcfg/get_hostname={{ .Name }} <wait>", + "netcfg/get_domain=vagrantup.com <wait>", + "fb=false <wait>", + "debconf/frontend=noninteractive <wait>", + "console-setup/ask_detect=false <wait>", + "console-keymaps-at/keymap=us <wait>", + "grub-installer/bootdev=/dev/sda <wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "guest_os_type": "debian8-64", + "headless": "{{ user `headless` }}", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-vmware", + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "tools_upload_flavor": "linux", + "type": "vmware-iso", + "vm_name": "{{ user `template` }}", + "vmx_data": { + "cpuid.coresPerSocket": "1", + "memsize": "384", + "numvcpus": "1" + } + }, + { + "boot_command": [ + "<esc><wait>", + "install <wait>", + " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}} <wait>", + "debian-installer=en_US <wait>", + "auto <wait>", + "locale=en_US <wait>", + "kbd-chooser/method=us <wait>", + "keyboard-configuration/xkb-keymap=us <wait>", + "netcfg/get_hostname={{ .Name }} <wait>", + "netcfg/get_domain=vagrantup.com <wait>", + "fb=false <wait>", + "debconf/frontend=noninteractive <wait>", + "console-setup/ask_detect=false <wait>", + "console-keymaps-at/keymap=us <wait>", + "grub-installer/bootdev=/dev/sda <wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "guest_os_type": "debian", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-parallels", + "parallels_tools_flavor": "lin", + "prlctl": [ + [ + "set", + "{{.Name}}", + "--memsize", + "384" + ], + [ + "set", + "{{.Name}}", + "--cpus", + "1" + ] + ], + "prlctl_version_file": ".prlctl_version", + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "parallels-iso", + "vm_name": "{{ user `template` }}" + }, + { + "boot_command": [ + "<esc><wait>", + "install <wait>", + " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}} <wait>", + "debian-installer=en_US <wait>", + "auto <wait>", + "locale=en_US <wait>", + "kbd-chooser/method=us <wait>", + "keyboard-configuration/xkb-keymap=us <wait>", + "netcfg/get_hostname={{ .Name }} <wait>", + "netcfg/get_domain=vagrantup.com <wait>", + "fb=false <wait>", + "debconf/frontend=noninteractive <wait>", + "console-setup/ask_detect=false <wait>", + "console-keymaps-at/keymap=us <wait>", + "grub-installer/bootdev=/dev/vda <wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-qemu", + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "qemu", + "vm_name": "{{ user `template` }}" + } + ], + "post-processors": [ + { + "output": "builds/{{user `box_basename`}}.{{.Provider}}.box", + "type": "vagrant" + } + ], + "provisioners": [ + { + "destination": "/tmp/bento-metadata.json", + "source": "{{user `metadata`}}", + "type": "file" + }, + { + "environment_vars": [ + "HOME_DIR=/home/vagrant", + "http_proxy={{user `http_proxy`}}", + "https_proxy={{user `https_proxy`}}", + "no_proxy={{user `no_proxy`}}" + ], + "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", + "scripts": [ + "scripts/common/metadata.sh", + "scripts/debian/update.sh", + "scripts/common/sshd.sh", + "scripts/debian/networking.sh", + "scripts/debian/sudoers.sh", + "scripts/common/vagrant.sh", + "scripts/common/vmtools.sh", + "scripts/debian/cleanup.sh", + "scripts/common/minimize.sh" + ], + "type": "shell" + } + ], + "variables": { + "box_basename": "debian-8.3", + "build_timestamp": "{{isotime \"20060102150405\"}}", + "git_revision": "__unknown_git_revision__", + "headless": "", + "http_proxy": "{{env `http_proxy`}}", + "https_proxy": "{{env `https_proxy`}}", + "iso_checksum": "1dae8556e57bb04bf380b2dbf64f3e6c61f9c28cbb6518aabae95a003c89739a", + "iso_checksum_type": "sha256", + "iso_name": "debian-8.3.0-amd64-CD-1.iso", + "metadata": "floppy/dummy_metadata.json", + "mirror": "http://cdimage.debian.org/cdimage/release", + "mirror_directory": "8.3.0/amd64/iso-cd", + "name": "debian-8.3", + "no_proxy": "{{env `no_proxy`}}", + "preseed_path": "debian-8/preseed.cfg", + "template": "debian-8.3-amd64", + "version": "2.1.TIMESTAMP" + } +} diff --git a/debian-8.3-i386.json b/debian-8.3-i386.json new file mode 100644 index 000000000..ef4a21aef --- /dev/null +++ b/debian-8.3-i386.json @@ -0,0 +1,237 @@ +{ + "builders": [ + { + "boot_command": [ + "<esc><wait>", + "install <wait>", + " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}} <wait>", + "debian-installer=en_US <wait>", + "auto <wait>", + "locale=en_US <wait>", + "kbd-chooser/method=us <wait>", + "keyboard-configuration/xkb-keymap=us <wait>", + "netcfg/get_hostname={{ .Name }} <wait>", + "netcfg/get_domain=vagrantup.com <wait>", + "fb=false <wait>", + "debconf/frontend=noninteractive <wait>", + "console-setup/ask_detect=false <wait>", + "console-keymaps-at/keymap=us <wait>", + "grub-installer/bootdev=/dev/sda <wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "guest_os_type": "Debian", + "hard_drive_interface": "sata", + "headless": "{{ user `headless` }}", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-virtualbox", + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "virtualbox-iso", + "vboxmanage": [ + [ + "modifyvm", + "{{.Name}}", + "--memory", + "384" + ], + [ + "modifyvm", + "{{.Name}}", + "--cpus", + "1" + ] + ], + "virtualbox_version_file": ".vbox_version", + "vm_name": "{{ user `template` }}" + }, + { + "boot_command": [ + "<esc><wait>", + "install <wait>", + " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}} <wait>", + "debian-installer=en_US <wait>", + "auto <wait>", + "locale=en_US <wait>", + "kbd-chooser/method=us <wait>", + "keyboard-configuration/xkb-keymap=us <wait>", + "netcfg/get_hostname={{ .Name }} <wait>", + "netcfg/get_domain=vagrantup.com <wait>", + "fb=false <wait>", + "debconf/frontend=noninteractive <wait>", + "console-setup/ask_detect=false <wait>", + "console-keymaps-at/keymap=us <wait>", + "grub-installer/bootdev=/dev/sda <wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "guest_os_type": "debian8", + "headless": "{{ user `headless` }}", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-vmware", + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "tools_upload_flavor": "linux", + "type": "vmware-iso", + "vm_name": "{{ user `template` }}", + "vmx_data": { + "cpuid.coresPerSocket": "1", + "memsize": "384", + "numvcpus": "1" + } + }, + { + "boot_command": [ + "<esc><wait>", + "install <wait>", + " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}} <wait>", + "debian-installer=en_US <wait>", + "auto <wait>", + "locale=en_US <wait>", + "kbd-chooser/method=us <wait>", + "keyboard-configuration/xkb-keymap=us <wait>", + "netcfg/get_hostname={{ .Name }} <wait>", + "netcfg/get_domain=vagrantup.com <wait>", + "fb=false <wait>", + "debconf/frontend=noninteractive <wait>", + "console-setup/ask_detect=false <wait>", + "console-keymaps-at/keymap=us <wait>", + "grub-installer/bootdev=/dev/sda <wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "guest_os_type": "debian", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-parallels", + "parallels_tools_flavor": "lin", + "prlctl": [ + [ + "set", + "{{.Name}}", + "--memsize", + "384" + ], + [ + "set", + "{{.Name}}", + "--cpus", + "1" + ] + ], + "prlctl_version_file": ".prlctl_version", + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "parallels-iso", + "vm_name": "{{ user `template` }}" + }, + { + "boot_command": [ + "<esc><wait>", + "install <wait>", + " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}} <wait>", + "debian-installer=en_US <wait>", + "auto <wait>", + "locale=en_US <wait>", + "kbd-chooser/method=us <wait>", + "keyboard-configuration/xkb-keymap=us <wait>", + "netcfg/get_hostname={{ .Name }} <wait>", + "netcfg/get_domain=vagrantup.com <wait>", + "fb=false <wait>", + "debconf/frontend=noninteractive <wait>", + "console-setup/ask_detect=false <wait>", + "console-keymaps-at/keymap=us <wait>", + "grub-installer/bootdev=/dev/vda <wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-qemu", + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "qemu", + "vm_name": "{{ user `template` }}" + } + ], + "post-processors": [ + { + "output": "builds/{{user `box_basename`}}.{{.Provider}}.box", + "type": "vagrant" + } + ], + "provisioners": [ + { + "destination": "/tmp/bento-metadata.json", + "source": "{{user `metadata`}}", + "type": "file" + }, + { + "environment_vars": [ + "HOME_DIR=/home/vagrant", + "http_proxy={{user `http_proxy`}}", + "https_proxy={{user `https_proxy`}}", + "no_proxy={{user `no_proxy`}}" + ], + "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", + "scripts": [ + "scripts/common/metadata.sh", + "scripts/debian/update.sh", + "scripts/common/sshd.sh", + "scripts/debian/networking.sh", + "scripts/debian/sudoers.sh", + "scripts/common/vagrant.sh", + "scripts/common/vmtools.sh", + "scripts/debian/cleanup.sh", + "scripts/common/minimize.sh" + ], + "type": "shell" + } + ], + "variables": { + "box_basename": "debian-8.3-i386", + "build_timestamp": "{{isotime \"20060102150405\"}}", + "git_revision": "__unknown_git_revision__", + "headless": "", + "http_proxy": "{{env `http_proxy`}}", + "https_proxy": "{{env `https_proxy`}}", + "iso_checksum": "0838af9e9403f0cc37c95888eff805496c688cd7b7fab3fa0812857f0e4eaca4", + "iso_checksum_type": "sha256", + "iso_name": "debian-8.3.0-i386-CD-1.iso", + "metadata": "floppy/dummy_metadata.json", + "mirror": "http://cdimage.debian.org/cdimage/release", + "mirror_directory": "8.3.0/i386/iso-cd", + "name": "debian-8.3-i386", + "no_proxy": "{{env `no_proxy`}}", + "preseed_path": "debian-8/preseed.cfg", + "template": "debian-8.3-i386", + "version": "2.1.TIMESTAMP" + } +} From 4710cd1d4b1295bc9cb8f1e2486ff81f6da65465 Mon Sep 17 00:00:00 2001 From: Christoph Hartmann <chris@lollyrock.com> Date: Mon, 1 Feb 2016 07:39:08 +0100 Subject: [PATCH 0456/1622] update solaris 11 box to 11.3 --- solaris-11-x86.json | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/solaris-11-x86.json b/solaris-11-x86.json index 1b78b8719..547fa9fa7 100644 --- a/solaris-11-x86.json +++ b/solaris-11-x86.json @@ -34,10 +34,10 @@ "guest_os_type": "Solaris11_64", "headless": "{{ user `headless` }}", "http_directory": "http/solaris-11", - "iso_checksum": "2b3859bb7532cfe42214349dff9fcc23", + "iso_checksum": "30d9ae857f62938c21307722d031e0dc", "iso_checksum_type": "md5", - "iso_url": "{{user `mirror`}}/sol-11_2-ai-x86.iso", - "output_directory": "packer-solaris-11.2-x86_64-virtualbox", + "iso_url": "{{user `mirror`}}/sol-11_3-ai-x86.iso", + "output_directory": "packer-solaris-11.3-x86_64-virtualbox", "shutdown_command": "echo 'vagrant'|sudo -i init 5", "shutdown_timeout": "10m", "ssh_password": "vagrant", @@ -95,10 +95,10 @@ "guest_os_type": "solaris11-64", "headless": "{{ user `headless` }}", "http_directory": "http/solaris-11", - "iso_checksum": "2b3859bb7532cfe42214349dff9fcc23", + "iso_checksum": "30d9ae857f62938c21307722d031e0dc", "iso_checksum_type": "md5", - "iso_url": "{{user `mirror`}}/sol-11_2-ai-x86.iso", - "output_directory": "packer-solaris-11.2-x86_64-vmware", + "iso_url": "{{user `mirror`}}/sol-11_3-ai-x86.iso", + "output_directory": "packer-solaris-11.3-x86_64-vmware", "shutdown_command": "echo 'vagrant'|sudo -i init 5", "shutdown_timeout": "10m", "ssh_password": "vagrant", @@ -143,15 +143,14 @@ "_DOWNLOAD_SITE": "http://www.oracle.com/technetwork/server-storage/solaris11/downloads/index.html", "_README": "You must download the automated installer iso from the following page, and then place it somewhere that packer can fetch it", "arch": "64", - "box_basename": "solaris-11.2", + "box_basename": "solaris-11.3", "build_timestamp": "{{isotime \"20060102150405\"}}", "git_revision": "__unknown_git_revision__", "headless": "", "metadata": "floppy/dummy_metadata.json", "mirror": "./packer_cache", - "name": "solaris-11.2", - "template": "solaris-11.2-x86", + "name": "solaris-11.3", + "template": "solaris-11.3-x86", "version": "2.0.TIMESTAMP" } } - From 84d495cd6c74c142513c61c9165a4ab0c9cf0d9c Mon Sep 17 00:00:00 2001 From: Christoph Hartmann <chris@lollyrock.com> Date: Sun, 31 Jan 2016 15:17:18 +0100 Subject: [PATCH 0457/1622] update sha1 for omnios according to http://omnios.omniti.com/wiki.php/Installation --- omnios-r151014.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/omnios-r151014.json b/omnios-r151014.json index ae2cddf50..98daca07f 100644 --- a/omnios-r151014.json +++ b/omnios-r151014.json @@ -221,7 +221,7 @@ "headless": "", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", - "iso_checksum": "91ebc2b447fb8934099cefe210f1f5c2f3bab3d2", + "iso_checksum": "c2cdcb6e7a51a119fc73528e3c3c24c9ef146185", "iso_checksum_type": "sha1", "iso_name": "OmniOS_Text_r151014.iso", "metadata": "floppy/dummy_metadata.json", From 9b8f5b0f9b3d2322393e1026f388b28710040485 Mon Sep 17 00:00:00 2001 From: Scott Hain <shain@chef.io> Date: Tue, 2 Feb 2016 19:14:57 -0800 Subject: [PATCH 0458/1622] Sudo path changed --- floppy/solaris10/S99startup.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/floppy/solaris10/S99startup.sh b/floppy/solaris10/S99startup.sh index e27326803..b5527eab9 100644 --- a/floppy/solaris10/S99startup.sh +++ b/floppy/solaris10/S99startup.sh @@ -39,9 +39,9 @@ echo "mail=\ninstance=overwrite\npartial=nocheck\nrunlevel=nocheck\nidepend=noch # install sudo so that packer functions correctly # NOTE - LOOK HERE FIRST IF THE URL CHANGES! -/usr/sfw/bin/wget http://www.sudo.ws/sudo/dist/packages/Solaris/10/TCMsudo-1.8.13-i386.pkg.gz -gunzip TCMsudo-1.8.13-i386.pkg.gz -pkgadd -a /tmp/noask -d TCMsudo-1.8.13-i386.pkg all +/usr/sfw/bin/wget http://www.sudo.ws/sudo/dist/packages/Solaris/10/TCMsudo-1.8.15-i386.pkg.gz +gunzip TCMsudo-1.8.15-i386.pkg.gz +pkgadd -a /tmp/noask -d TCMsudo-1.8.15-i386.pkg all echo "vagrant ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers echo "Defaults secure_path=/usr/local/bin:/usr/sfw/bin:/usr/ccs/bin:/usr/sbin:/usr/bin:/bin:/sbin" >> /etc/sudoers From a95b04a8ddfa1f86a4179c73af062be16a5c85db Mon Sep 17 00:00:00 2001 From: "Julian C. Dunn" <jdunn@chef.io> Date: Tue, 16 Feb 2016 10:31:43 -0500 Subject: [PATCH 0459/1622] Fix guest_os_type for VirtualBox --- macosx-10.11.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/macosx-10.11.json b/macosx-10.11.json index d510f256d..d8bd3aafd 100644 --- a/macosx-10.11.json +++ b/macosx-10.11.json @@ -36,7 +36,7 @@ "boot_wait": "2s", "disk_size": 40960, "guest_additions_mode": "disable", - "guest_os_type": "MacOS109_64", + "guest_os_type": "MacOS1011_64", "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", "iso_checksum": "{{user `iso_checksum`}}", From 4da614912f0f8e822f7d2697de23fc5d5acfc0e0 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Fri, 26 Feb 2016 16:22:26 -0800 Subject: [PATCH 0460/1622] Minor readme updates Avoid redirects on Hashicorp URLs Remove the mention of JIRA Update the copyright --- README.md | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 7090e59f1..75b110c92 100644 --- a/README.md +++ b/README.md @@ -4,8 +4,8 @@ [travis]: https://travis-ci.org/chef/bento -Bento is a project that encapsulates [Packer](http://packer.io) templates for building -[Vagrant](http://vagrantup.com) base boxes. We use these boxes internally at Chef Software, Inc. for +Bento is a project that encapsulates [Packer](https://www.packer.io/) templates for building +[Vagrant](https://www.vagrantup.com/) base boxes. We use these boxes internally at Chef Software, Inc. for testing Hosted Chef, Chef Server and our open source [cookbooks](https://supermarket.chef.io/users/chef) via [test-kitchen](http://kitchen.ci/). @@ -67,7 +67,7 @@ end ## Requirements -* [Packer](http://packer.io) +* [Packer](https://www.packer.io/) * At least one virtualization provider: Virtualbox, VMware Fusion, Parallels Desktop, etc ## Build Your Own Bento Boxes @@ -156,8 +156,7 @@ it's not the case because you have overridden line-ending conversion in your own ## Bugs and Issues -Please use GitHub issues to report bugs, features, or other problems. Please note: -the [JIRA issue tracker](https://tickets.opscode.com/browse/BENTO) is no longer being used. +Please use GitHub issues to report bugs, features, or other problems. ## License & Authors @@ -179,7 +178,7 @@ Mac OS X templates were adopted wholesale from [Fletcher Nichol's packer templat - Author: Fletcher Nichol (<fnichol@nichol.ca>) ```text -Copyright 2012-2015, Chef Software, Inc. (<legal@chef.io>) +Copyright 2012-2016, Chef Software, Inc. (<legal@chef.io>) Copyright 2011-2012, Tim Dysinger (<tim@dysinger.net>) Licensed under the Apache License, Version 2.0 (the "License"); From d990d96ba3581112c417b5dcf8b8a221eb6fe779 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Sat, 27 Feb 2016 11:23:04 -0800 Subject: [PATCH 0461/1622] Update the packer download URL and use 0.9.0 --- .travis.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index cde67abd7..96453d392 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,9 +1,9 @@ +sudo: false + rvm: - 2.2 -before_install: wget --no-check-certificate https://dl.bintray.com/mitchellh/packer/packer_0.8.6_linux_amd64.zip && unzip -d packer packer_0.8.6_linux_amd64.zip +before_install: wget --no-check-certificate https://releases.hashicorp.com/packer/0.9.0/packer_0.9.0_linux_amd64.zip && unzip -d packer packer_0.9.0_linux_amd64.zip before_script: export PATH=$PATH:$PWD/packer script: ./bin/bento normalize - -sudo: false From 5f1e996b3219f8c30b998cbc6114a2cb76a10794 Mon Sep 17 00:00:00 2001 From: Seth Thomas <sthomas@chef.io> Date: Tue, 1 Mar 2016 15:55:47 -0800 Subject: [PATCH 0462/1622] Updating for 14.04.4 release --- ubuntu-14.04-amd64.json | 7 +++---- ubuntu-14.04-i386.json | 7 +++---- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/ubuntu-14.04-amd64.json b/ubuntu-14.04-amd64.json index 097a2f351..e1efe7d41 100644 --- a/ubuntu-14.04-amd64.json +++ b/ubuntu-14.04-amd64.json @@ -246,12 +246,12 @@ "headless": "", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", - "iso_checksum": "a3b345908a826e262f4ea1afeb357fd09ec0558cf34e6c9112cead4bb55ccdfb", + "iso_checksum": "07e4bb5569814eab41fafac882ba127893e3ff0bdb7ec931c9b2d040e3e94e7a", "iso_checksum_type": "sha256", - "iso_name": "ubuntu-14.04.3-server-amd64.iso", + "iso_name": "ubuntu-14.04.4-server-amd64.iso", "metadata": "floppy/dummy_metadata.json", "mirror": "http://releases.ubuntu.com", - "mirror_directory": "14.04.3", + "mirror_directory": "14.04.4", "name": "ubuntu-14.04", "no_proxy": "{{env `no_proxy`}}", "preseed_path": "ubuntu-14.04/preseed.cfg", @@ -259,4 +259,3 @@ "version": "2.1.TIMESTAMP" } } - diff --git a/ubuntu-14.04-i386.json b/ubuntu-14.04-i386.json index b33d6e0ea..ed184420d 100644 --- a/ubuntu-14.04-i386.json +++ b/ubuntu-14.04-i386.json @@ -246,12 +246,12 @@ "headless": "", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", - "iso_checksum": "a5c02e25a8f6ab335269adb1a6c176edff075093b90854439b4a90fce9b31f28", + "iso_checksum": "e20cf9e0812b52287ca22ac1815bc933c0cfef2be88191110b697d8943bef19e", "iso_checksum_type": "sha256", - "iso_name": "ubuntu-14.04.3-server-i386.iso", + "iso_name": "ubuntu-14.04.4-server-i386.iso", "metadata": "floppy/dummy_metadata.json", "mirror": "http://releases.ubuntu.com", - "mirror_directory": "14.04.3", + "mirror_directory": "14.04.4", "name": "ubuntu-14.04-i386", "no_proxy": "{{env `no_proxy`}}", "preseed_path": "ubuntu-14.04/preseed.cfg", @@ -259,4 +259,3 @@ "version": "2.1.TIMESTAMP" } } - From dcb7fe89e29f01c92850b4f1c8626a30988cab47 Mon Sep 17 00:00:00 2001 From: Seth Thomas <sthomas@chef.io> Date: Mon, 14 Mar 2016 12:08:59 -0700 Subject: [PATCH 0463/1622] Updating maintainers --- MAINTAINERS.md | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/MAINTAINERS.md b/MAINTAINERS.md index b3d990a0a..34913fe79 100644 --- a/MAINTAINERS.md +++ b/MAINTAINERS.md @@ -17,8 +17,15 @@ Covers the Bento project repository which is responsible for building Vagrant bo ### Lieutenants * [Seth Chisamore](https://github.com/schisamo) +* [Yvonne Lam](https://github.com/yzl) +* [Seth Thomas](https://github.com/cheeseplus) ### Maintainers -* [Yvonne Lam](http://github.com/yzl) -* [Seth Thomas](http://github.com/cheeseplus) +* [Rickard von Essen](https://github.com/rickard-von-essen) +* [Mikhail Zholobov](https://github.com/legal90) +* [Brian Flad](https://github.com/bflad) +* [Tim Smith](https://github.com/tas50) +* [Seth Vargo](http://github.com/sethvargo) +* [William Tisäter](https://github.com/tiwilliam) +* [Josh Hudson](https://github.com/itmustbejj) From f795da17e9ac4424702970bf6319d13794b8d9eb Mon Sep 17 00:00:00 2001 From: Seth Thomas <sthomas@chef.io> Date: Mon, 14 Mar 2016 15:24:06 -0700 Subject: [PATCH 0464/1622] https everywhere --- MAINTAINERS.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MAINTAINERS.md b/MAINTAINERS.md index 34913fe79..b9bcdce3e 100644 --- a/MAINTAINERS.md +++ b/MAINTAINERS.md @@ -26,6 +26,6 @@ Covers the Bento project repository which is responsible for building Vagrant bo * [Mikhail Zholobov](https://github.com/legal90) * [Brian Flad](https://github.com/bflad) * [Tim Smith](https://github.com/tas50) -* [Seth Vargo](http://github.com/sethvargo) +* [Seth Vargo](https://github.com/sethvargo) * [William Tisäter](https://github.com/tiwilliam) * [Josh Hudson](https://github.com/itmustbejj) From d83efbf4cf3d65017f6d78cc2835174d5043505f Mon Sep 17 00:00:00 2001 From: Mikhail Zholobov <legal90@gmail.com> Date: Tue, 15 Mar 2016 10:56:35 +0200 Subject: [PATCH 0465/1622] Update mirror URL for Debian 8.2 Debian 8.2 has been moved to the "archive", so the default URL should be updated --- debian-8.2-amd64.json | 2 +- debian-8.2-i386.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/debian-8.2-amd64.json b/debian-8.2-amd64.json index 30f22bbd4..9d272ae2b 100644 --- a/debian-8.2-amd64.json +++ b/debian-8.2-amd64.json @@ -226,7 +226,7 @@ "iso_checksum_type": "sha256", "iso_name": "debian-8.2.0-amd64-CD-1.iso", "metadata": "floppy/dummy_metadata.json", - "mirror": "http://cdimage.debian.org/cdimage/release", + "mirror": "http://cdimage.debian.org/cdimage/archive", "mirror_directory": "8.2.0/amd64/iso-cd", "name": "debian-8.2", "no_proxy": "{{env `no_proxy`}}", diff --git a/debian-8.2-i386.json b/debian-8.2-i386.json index ab911651e..eb4940a7b 100644 --- a/debian-8.2-i386.json +++ b/debian-8.2-i386.json @@ -226,7 +226,7 @@ "iso_checksum_type": "sha256", "iso_name": "debian-8.2.0-i386-CD-1.iso", "metadata": "floppy/dummy_metadata.json", - "mirror": "http://cdimage.debian.org/cdimage/release", + "mirror": "http://cdimage.debian.org/cdimage/archive", "mirror_directory": "8.2.0/i386/iso-cd", "name": "debian-8.2-i386", "no_proxy": "{{env `no_proxy`}}", From 16a8366de72e610e0c0b9b5691585055aca52192 Mon Sep 17 00:00:00 2001 From: Seth Thomas <sthomas@chef.io> Date: Tue, 15 Mar 2016 15:39:27 -0700 Subject: [PATCH 0466/1622] Adding Ubuntu 16.04 --- ubuntu-16.04-amd64.json | 269 ++++++++++++++++++++++++++++++++++++++++ ubuntu-16.04-i386.json | 269 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 538 insertions(+) create mode 100644 ubuntu-16.04-amd64.json create mode 100644 ubuntu-16.04-i386.json diff --git a/ubuntu-16.04-amd64.json b/ubuntu-16.04-amd64.json new file mode 100644 index 000000000..3251c0beb --- /dev/null +++ b/ubuntu-16.04-amd64.json @@ -0,0 +1,269 @@ +{ + "builders": [ + { + "boot_command": [ + "<enter><wait><f6><esc><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs>", + "<bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs>", + "<bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs>", + "<bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs>", + "/install/vmlinuz<wait>", + " auto<wait>", + " console-setup/ask_detect=false<wait>", + " console-setup/layoutcode=us<wait>", + " console-setup/modelcode=pc105<wait>", + " debconf/frontend=noninteractive<wait>", + " debian-installer=en_US<wait>", + " fb=false<wait>", + " initrd=/install/initrd.gz<wait>", + " kbd-chooser/method=us<wait>", + " keyboard-configuration/layout=USA<wait>", + " keyboard-configuration/variant=USA<wait>", + " locale=en_US<wait>", + " netcfg/get_domain=vm<wait>", + " netcfg/get_hostname=vagrant<wait>", + " grub-installer/bootdev=/dev/sda<wait>", + " noapic<wait>", + " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}}<wait>", + " -- <wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "guest_os_type": "Ubuntu_64", + "hard_drive_interface": "sata", + "headless": "{{ user `headless` }}", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-virtualbox", + "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "virtualbox-iso", + "vboxmanage": [ + [ + "modifyvm", + "{{.Name}}", + "--memory", + "384" + ], + [ + "modifyvm", + "{{.Name}}", + "--cpus", + "1" + ] + ], + "virtualbox_version_file": ".vbox_version", + "vm_name": "{{ user `template` }}" + }, + { + "boot_command": [ + "<enter><wait><f6><esc><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs>", + "<bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs>", + "<bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs>", + "<bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs>", + "/install/vmlinuz<wait>", + " auto<wait>", + " console-setup/ask_detect=false<wait>", + " console-setup/layoutcode=us<wait>", + " console-setup/modelcode=pc105<wait>", + " debconf/frontend=noninteractive<wait>", + " debian-installer=en_US<wait>", + " fb=false<wait>", + " initrd=/install/initrd.gz<wait>", + " kbd-chooser/method=us<wait>", + " keyboard-configuration/layout=USA<wait>", + " keyboard-configuration/variant=USA<wait>", + " locale=en_US<wait>", + " netcfg/get_domain=vm<wait>", + " netcfg/get_hostname=vagrant<wait>", + " grub-installer/bootdev=/dev/sda<wait>", + " noapic<wait>", + " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}}<wait>", + " -- <wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "guest_os_type": "ubuntu-64", + "headless": "{{ user `headless` }}", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-vmware", + "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "tools_upload_flavor": "linux", + "type": "vmware-iso", + "vm_name": "{{ user `template` }}", + "vmx_data": { + "cpuid.coresPerSocket": "1", + "memsize": "384", + "numvcpus": "1" + } + }, + { + "boot_command": [ + "<enter><wait><f6><esc><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs>", + "<bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs>", + "<bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs>", + "<bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs>", + "/install/vmlinuz<wait>", + " auto<wait>", + " console-setup/ask_detect=false<wait>", + " console-setup/layoutcode=us<wait>", + " console-setup/modelcode=pc105<wait>", + " debconf/frontend=noninteractive<wait>", + " debian-installer=en_US<wait>", + " fb=false<wait>", + " initrd=/install/initrd.gz<wait>", + " kbd-chooser/method=us<wait>", + " keyboard-configuration/layout=USA<wait>", + " keyboard-configuration/variant=USA<wait>", + " locale=en_US<wait>", + " netcfg/get_domain=vm<wait>", + " netcfg/get_hostname=vagrant<wait>", + " grub-installer/bootdev=/dev/sda<wait>", + " noapic<wait>", + " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}}<wait>", + " -- <wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "guest_os_type": "ubuntu", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-parallels", + "parallels_tools_flavor": "lin", + "prlctl": [ + [ + "set", + "{{.Name}}", + "--memsize", + "384" + ], + [ + "set", + "{{.Name}}", + "--cpus", + "1" + ] + ], + "prlctl_version_file": ".prlctl_version", + "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "parallels-iso", + "vm_name": "{{ user `template` }}" + }, + { + "boot_command": [ + "<enter><wait><f6><esc><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs>", + "<bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs>", + "<bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs>", + "<bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs>", + "/install/vmlinuz<wait>", + " auto<wait>", + " console-setup/ask_detect=false<wait>", + " console-setup/layoutcode=us<wait>", + " console-setup/modelcode=pc105<wait>", + " debconf/frontend=noninteractive<wait>", + " debian-installer=en_US<wait>", + " fb=false<wait>", + " initrd=/install/initrd.gz<wait>", + " kbd-chooser/method=us<wait>", + " keyboard-configuration/layout=USA<wait>", + " keyboard-configuration/variant=USA<wait>", + " locale=en_US<wait>", + " netcfg/get_domain=vm<wait>", + " netcfg/get_hostname=vagrant<wait>", + " grub-installer/bootdev=/dev/vda<wait>", + " noapic<wait>", + " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}}<wait>", + " -- <wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-qemu", + "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "qemu", + "vm_name": "{{ user `template` }}" + } + ], + "post-processors": [ + { + "output": "builds/{{user `box_basename`}}.{{.Provider}}.box", + "type": "vagrant" + } + ], + "provisioners": [ + { + "destination": "/tmp/bento-metadata.json", + "source": "{{user `metadata`}}", + "type": "file" + }, + { + "environment_vars": [ + "HOME_DIR=/home/vagrant", + "http_proxy={{user `http_proxy`}}", + "https_proxy={{user `https_proxy`}}", + "no_proxy={{user `no_proxy`}}" + ], + "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", + "scripts": [ + "scripts/common/metadata.sh", + "scripts/ubuntu/update.sh", + "scripts/common/sshd.sh", + "scripts/ubuntu/networking.sh", + "scripts/ubuntu/sudoers.sh", + "scripts/ubuntu/vagrant.sh", + "scripts/common/vmtools.sh", + "scripts/ubuntu/cleanup.sh", + "scripts/common/minimize.sh" + ], + "type": "shell" + } + ], + "variables": { + "box_basename": "ubuntu-16.04", + "build_timestamp": "{{isotime \"20060102150405\"}}", + "git_revision": "__unknown_git_revision__", + "headless": "", + "http_proxy": "{{env `http_proxy`}}", + "https_proxy": "{{env `https_proxy`}}", + "iso_checksum": "079763f6d613d1cc4e8facd5a2ef119f5c523b38d9c78f35a9e0d2ac64ccb7cf", + "iso_checksum_type": "sha256", + "iso_name": "xenial-server-amd64.iso", + "metadata": "floppy/dummy_metadata.json", + "mirror": "http://cdimage.ubuntu.com/ubuntu-server/daily", + "mirror_directory": "current", + "name": "ubuntu-16.04", + "no_proxy": "{{env `no_proxy`}}", + "preseed_path": "ubuntu-15.10/preseed.cfg", + "template": "ubuntu-16.04-amd64", + "version": "2.1.TIMESTAMP" + } +} diff --git a/ubuntu-16.04-i386.json b/ubuntu-16.04-i386.json new file mode 100644 index 000000000..9b801b4c1 --- /dev/null +++ b/ubuntu-16.04-i386.json @@ -0,0 +1,269 @@ +{ + "builders": [ + { + "boot_command": [ + "<enter><wait><f6><esc><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs>", + "<bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs>", + "<bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs>", + "<bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs>", + "/install/vmlinuz<wait>", + " auto<wait>", + " console-setup/ask_detect=false<wait>", + " console-setup/layoutcode=us<wait>", + " console-setup/modelcode=pc105<wait>", + " debconf/frontend=noninteractive<wait>", + " debian-installer=en_US<wait>", + " fb=false<wait>", + " initrd=/install/initrd.gz<wait>", + " kbd-chooser/method=us<wait>", + " keyboard-configuration/layout=USA<wait>", + " keyboard-configuration/variant=USA<wait>", + " locale=en_US<wait>", + " netcfg/get_domain=vm<wait>", + " netcfg/get_hostname=vagrant<wait>", + " grub-installer/bootdev=/dev/sda <wait>", + " noapic<wait>", + " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}}<wait>", + " -- <wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "guest_os_type": "Ubuntu", + "hard_drive_interface": "sata", + "headless": "{{ user `headless` }}", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-virtualbox", + "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "virtualbox-iso", + "vboxmanage": [ + [ + "modifyvm", + "{{.Name}}", + "--memory", + "384" + ], + [ + "modifyvm", + "{{.Name}}", + "--cpus", + "1" + ] + ], + "virtualbox_version_file": ".vbox_version", + "vm_name": "{{ user `template` }}" + }, + { + "boot_command": [ + "<enter><wait><f6><esc><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs>", + "<bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs>", + "<bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs>", + "<bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs>", + "/install/vmlinuz<wait>", + " auto<wait>", + " console-setup/ask_detect=false<wait>", + " console-setup/layoutcode=us<wait>", + " console-setup/modelcode=pc105<wait>", + " debconf/frontend=noninteractive<wait>", + " debian-installer=en_US<wait>", + " fb=false<wait>", + " initrd=/install/initrd.gz<wait>", + " kbd-chooser/method=us<wait>", + " keyboard-configuration/layout=USA<wait>", + " keyboard-configuration/variant=USA<wait>", + " locale=en_US<wait>", + " netcfg/get_domain=vm<wait>", + " netcfg/get_hostname=vagrant<wait>", + " grub-installer/bootdev=/dev/sda <wait>", + " noapic<wait>", + " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}}<wait>", + " -- <wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "guest_os_type": "ubuntu", + "headless": "{{ user `headless` }}", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-vmware", + "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "tools_upload_flavor": "linux", + "type": "vmware-iso", + "vm_name": "{{ user `template` }}", + "vmx_data": { + "cpuid.coresPerSocket": "1", + "memsize": "384", + "numvcpus": "1" + } + }, + { + "boot_command": [ + "<enter><wait><f6><esc><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs>", + "<bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs>", + "<bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs>", + "<bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs>", + "/install/vmlinuz<wait>", + " auto<wait>", + " console-setup/ask_detect=false<wait>", + " console-setup/layoutcode=us<wait>", + " console-setup/modelcode=pc105<wait>", + " debconf/frontend=noninteractive<wait>", + " debian-installer=en_US<wait>", + " fb=false<wait>", + " initrd=/install/initrd.gz<wait>", + " kbd-chooser/method=us<wait>", + " keyboard-configuration/layout=USA<wait>", + " keyboard-configuration/variant=USA<wait>", + " locale=en_US<wait>", + " netcfg/get_domain=vm<wait>", + " netcfg/get_hostname=vagrant<wait>", + " grub-installer/bootdev=/dev/sda <wait>", + " noapic<wait>", + " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}}<wait>", + " -- <wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "guest_os_type": "ubuntu", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-parallels", + "parallels_tools_flavor": "lin", + "prlctl": [ + [ + "set", + "{{.Name}}", + "--memsize", + "384" + ], + [ + "set", + "{{.Name}}", + "--cpus", + "1" + ] + ], + "prlctl_version_file": ".prlctl_version", + "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "parallels-iso", + "vm_name": "{{ user `template` }}" + }, + { + "boot_command": [ + "<enter><wait><f6><esc><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs>", + "<bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs>", + "<bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs>", + "<bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs>", + "/install/vmlinuz<wait>", + " auto<wait>", + " console-setup/ask_detect=false<wait>", + " console-setup/layoutcode=us<wait>", + " console-setup/modelcode=pc105<wait>", + " debconf/frontend=noninteractive<wait>", + " debian-installer=en_US<wait>", + " fb=false<wait>", + " initrd=/install/initrd.gz<wait>", + " kbd-chooser/method=us<wait>", + " keyboard-configuration/layout=USA<wait>", + " keyboard-configuration/variant=USA<wait>", + " locale=en_US<wait>", + " netcfg/get_domain=vm<wait>", + " netcfg/get_hostname=vagrant<wait>", + " grub-installer/bootdev=/dev/vda <wait>", + " noapic<wait>", + " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}}<wait>", + " -- <wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-qemu", + "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "qemu", + "vm_name": "{{ user `template` }}" + } + ], + "post-processors": [ + { + "output": "builds/{{user `box_basename`}}.{{.Provider}}.box", + "type": "vagrant" + } + ], + "provisioners": [ + { + "destination": "/tmp/bento-metadata.json", + "source": "{{user `metadata`}}", + "type": "file" + }, + { + "environment_vars": [ + "HOME_DIR=/home/vagrant", + "http_proxy={{user `http_proxy`}}", + "https_proxy={{user `https_proxy`}}", + "no_proxy={{user `no_proxy`}}" + ], + "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", + "scripts": [ + "scripts/common/metadata.sh", + "scripts/ubuntu/update.sh", + "scripts/common/sshd.sh", + "scripts/ubuntu/networking.sh", + "scripts/ubuntu/sudoers.sh", + "scripts/ubuntu/vagrant.sh", + "scripts/common/vmtools.sh", + "scripts/ubuntu/cleanup.sh", + "scripts/common/minimize.sh" + ], + "type": "shell" + } + ], + "variables": { + "box_basename": "ubuntu-16.04-i386", + "build_timestamp": "{{isotime \"20060102150405\"}}", + "git_revision": "__unknown_git_revision__", + "headless": "", + "http_proxy": "{{env `http_proxy`}}", + "https_proxy": "{{env `https_proxy`}}", + "iso_checksum": "fa71252c2364bd851b978bee196489dfc6fbaa4873c489cc592016e256df8445", + "iso_checksum_type": "sha256", + "iso_name": "xenial-server-i386.iso", + "metadata": "floppy/dummy_metadata.json", + "mirror": "http://cdimage.ubuntu.com/ubuntu-server/daily", + "mirror_directory": "current", + "name": "ubuntu-16.04-i386", + "no_proxy": "{{env `no_proxy`}}", + "preseed_path": "ubuntu-15.10/preseed.cfg", + "template": "ubuntu-16.04-i386", + "version": "2.1.TIMESTAMP" + } +} From 2478ed3327ba8c74ff97553a8fa0631f8f71fc0b Mon Sep 17 00:00:00 2001 From: Seth Thomas <sthomas@chef.io> Date: Wed, 23 Mar 2016 09:39:09 -0700 Subject: [PATCH 0467/1622] Cutting 2.2.4 --- CHANGELOG.md | 75 +++++++++++++--- README.md | 241 +++++++++++++++++++++++++-------------------------- 2 files changed, 180 insertions(+), 136 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 634f3945b..df7baa11d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,43 @@ # Change Log -## [2.2.3](https://github.com/chef/bento/tree/2.2.3) (2015-12-26) +## [2.2.4](https://github.com/chef/bento/tree/2.2.4) (2016-03-23) +[Full Changelog](https://github.com/chef/bento/compare/2.2.3...2.2.4) + +**Closed issues:** + +- CALL FOR MAINTAINERS [\#537](https://github.com/chef/bento/issues/537) +- Proposal: Move bento under test-kitchen org [\#536](https://github.com/chef/bento/issues/536) +- /tmp directory is cleaned upon restart? [\#535](https://github.com/chef/bento/issues/535) +- bento/centos-7.2 missing from atlas [\#524](https://github.com/chef/bento/issues/524) +- sles 12 mirror no more exist [\#520](https://github.com/chef/bento/issues/520) +- Pipeline: Update to VMware Fusion 8.1.0 [\#519](https://github.com/chef/bento/issues/519) +- error when building boxes with packer [\#514](https://github.com/chef/bento/issues/514) +- Ubuntu 12.04 HGFS module failing in VMWare [\#512](https://github.com/chef/bento/issues/512) +- Uncompressed boxes for VMware and Parallels are to large [\#505](https://github.com/chef/bento/issues/505) +- OpenSUSE Leap \(and Tumbleweed\) [\#504](https://github.com/chef/bento/issues/504) +- Ubuntu 14.04 HGFS kernel module not working for VMWare 8.0.2 [\#496](https://github.com/chef/bento/issues/496) +- Any support \(or planned support\) for building Amazon AMIs? [\#490](https://github.com/chef/bento/issues/490) +- ARM builds [\#486](https://github.com/chef/bento/issues/486) +- Minimize script results in large \(non-sparse\) image file for QEMU builder [\#369](https://github.com/chef/bento/issues/369) + +**Merged pull requests:** + +- Update mirror URL for Debian 8.2 [\#544](https://github.com/chef/bento/pull/544) ([legal90](https://github.com/legal90)) +- Updating maintainers [\#543](https://github.com/chef/bento/pull/543) ([cheeseplus](https://github.com/cheeseplus)) +- Updating for 14.04.4 release [\#542](https://github.com/chef/bento/pull/542) ([cheeseplus](https://github.com/cheeseplus)) +- Update the packer download URL and use 0.9.0 [\#540](https://github.com/chef/bento/pull/540) ([tas50](https://github.com/tas50)) +- Minor readme updates [\#539](https://github.com/chef/bento/pull/539) ([tas50](https://github.com/tas50)) +- Fix guest\_os\_type for VirtualBox [\#534](https://github.com/chef/bento/pull/534) ([juliandunn](https://github.com/juliandunn)) +- Sudo path changed [\#530](https://github.com/chef/bento/pull/530) ([scotthain](https://github.com/scotthain)) +- update solaris 11 box to 11.3 [\#528](https://github.com/chef/bento/pull/528) ([chris-rock](https://github.com/chris-rock)) +- update sha1 for omnios [\#527](https://github.com/chef/bento/pull/527) ([chris-rock](https://github.com/chris-rock)) +- Add support for Debian GNU/Linux 8.3 [\#526](https://github.com/chef/bento/pull/526) ([kenhys](https://github.com/kenhys)) +- simplify distro detection for RHEL-derivatives [\#525](https://github.com/chef/bento/pull/525) ([ceetav](https://github.com/ceetav)) +- Add support for OpenSUSE Leap 42.1 - x86\_64 [\#523](https://github.com/chef/bento/pull/523) ([rickard-von-essen](https://github.com/rickard-von-essen)) +- Fix links to Fedora 23 boxes. [\#518](https://github.com/chef/bento/pull/518) ([juliandunn](https://github.com/juliandunn)) +- Cutting 2.2.3 [\#515](https://github.com/chef/bento/pull/515) ([cheeseplus](https://github.com/cheeseplus)) + +## [2.2.3](https://github.com/chef/bento/tree/2.2.3) (2015-12-28) [Full Changelog](https://github.com/chef/bento/compare/2.2.2...2.2.3) **Fixed bugs:** @@ -140,19 +177,39 @@ **Fixed bugs:** +- Shortening vm\_name to avoid Parallels box corruption [\#400](https://github.com/chef/bento/pull/400) ([cheeseplus](https://github.com/cheeseplus)) + +**Closed issues:** + +- Debian 8.1 [\#379](https://github.com/chef/bento/issues/379) +- Chef on Centos boxes seems not be installed [\#352](https://github.com/chef/bento/issues/352) + +**Merged pull requests:** + +- \[debian-\*\] Improve DRYness, correctness, & speed of Debian templates. [\#404](https://github.com/chef/bento/pull/404) ([fnichol](https://github.com/fnichol)) +- \[freebsd-\*\] Improve DRYness, correctness, & speed of FreeBSD templates. [\#403](https://github.com/chef/bento/pull/403) ([fnichol](https://github.com/fnichol)) +- Fixing headless check [\#401](https://github.com/chef/bento/pull/401) ([cheeseplus](https://github.com/cheeseplus)) +- Adding support for headless mode [\#399](https://github.com/chef/bento/pull/399) ([cheeseplus](https://github.com/cheeseplus)) +- Box build pipeline [\#398](https://github.com/chef/bento/pull/398) ([cheeseplus](https://github.com/cheeseplus)) +- \[centos-\*\] Improve DRYness, correctness, and speed of CentOS templates. [\#396](https://github.com/chef/bento/pull/396) ([fnichol](https://github.com/fnichol)) +- \[macosx-\*, ubuntu-\*\] Remove name prefixes from templates. [\#395](https://github.com/chef/bento/pull/395) ([fnichol](https://github.com/fnichol)) +- \[ubuntu-\*\] Improve DRYness, correctness, and speed of Ubuntu templates. [\#394](https://github.com/chef/bento/pull/394) ([fnichol](https://github.com/fnichol)) +- Adding Debian 8.1 links, removing Debian 8.0 templates [\#393](https://github.com/chef/bento/pull/393) ([cheeseplus](https://github.com/cheeseplus)) +- Add @cheeseplus to MAINTAINERS.md [\#392](https://github.com/chef/bento/pull/392) ([fnichol](https://github.com/fnichol)) + +## [2.0.0](https://github.com/chef/bento/tree/2.0.0) (2015-07-03) +**Fixed bugs:** + - Do not write metadata files when `bento build` is in dry run mode [\#368](https://github.com/chef/bento/issues/368) - fix OmniOS build under VMWare [\#178](https://github.com/chef/bento/issues/178) -- Shortening vm\_name to avoid Parallels box corruption [\#400](https://github.com/chef/bento/pull/400) ([cheeseplus](https://github.com/cheeseplus)) - Don't write metadata file in `bento build` dry run mode. [\#380](https://github.com/chef/bento/pull/380) ([fnichol](https://github.com/fnichol)) **Closed issues:** - Release Debian 8.0 boxes [\#381](https://github.com/chef/bento/issues/381) -- Debian 8.1 [\#379](https://github.com/chef/bento/issues/379) - Upload Ubuntu 15.04 to S3 Bucket [\#376](https://github.com/chef/bento/issues/376) - Add build metadata to boxes and build artifacts [\#364](https://github.com/chef/bento/issues/364) - Add support for Debian 8 [\#355](https://github.com/chef/bento/issues/355) -- Chef on Centos boxes seems not be installed [\#352](https://github.com/chef/bento/issues/352) - centos-7.1 vmware box got uploaded as virtualbox [\#351](https://github.com/chef/bento/issues/351) - chef/centos-7.1 on atlas [\#346](https://github.com/chef/bento/issues/346) - Add support for Ubuntu 15.04 [\#345](https://github.com/chef/bento/issues/345) @@ -217,16 +274,6 @@ **Merged pull requests:** -- \[debian-\*\] Improve DRYness, correctness, & speed of Debian templates. [\#404](https://github.com/chef/bento/pull/404) ([fnichol](https://github.com/fnichol)) -- \[freebsd-\*\] Improve DRYness, correctness, & speed of FreeBSD templates. [\#403](https://github.com/chef/bento/pull/403) ([fnichol](https://github.com/fnichol)) -- Fixing headless check [\#401](https://github.com/chef/bento/pull/401) ([cheeseplus](https://github.com/cheeseplus)) -- Adding support for headless mode [\#399](https://github.com/chef/bento/pull/399) ([cheeseplus](https://github.com/cheeseplus)) -- Box build pipeline [\#398](https://github.com/chef/bento/pull/398) ([cheeseplus](https://github.com/cheeseplus)) -- \[centos-\*\] Improve DRYness, correctness, and speed of CentOS templates. [\#396](https://github.com/chef/bento/pull/396) ([fnichol](https://github.com/fnichol)) -- \[macosx-\*, ubuntu-\*\] Remove name prefixes from templates. [\#395](https://github.com/chef/bento/pull/395) ([fnichol](https://github.com/fnichol)) -- \[ubuntu-\*\] Improve DRYness, correctness, and speed of Ubuntu templates. [\#394](https://github.com/chef/bento/pull/394) ([fnichol](https://github.com/fnichol)) -- Adding Debian 8.1 links, removing Debian 8.0 templates [\#393](https://github.com/chef/bento/pull/393) ([cheeseplus](https://github.com/cheeseplus)) -- Add @cheeseplus to MAINTAINERS.md [\#392](https://github.com/chef/bento/pull/392) ([fnichol](https://github.com/fnichol)) - \[macosx-\*\] Add support for {http,https,no}\_proxy environment variables. [\#391](https://github.com/chef/bento/pull/391) ([fnichol](https://github.com/fnichol)) - Remove files that are no longer referenced by any templates. [\#390](https://github.com/chef/bento/pull/390) ([fnichol](https://github.com/fnichol)) - \[macosx-\*\] Improve DRYness & correctness of Mac templates. [\#389](https://github.com/chef/bento/pull/389) ([fnichol](https://github.com/fnichol)) diff --git a/README.md b/README.md index 75b110c92..331d1c226 100644 --- a/README.md +++ b/README.md @@ -15,35 +15,53 @@ This project is managed by the CHEF Release Engineering team. For more informati The following boxes are built from this repository's templates for publicly available platforms and are currently hosted via Atlas in the [bento organization](https://atlas.hashicorp.com/bento/). - -| | VirtualBox (5.0.12) | VMware (8.0.2) | Parallels (11.1.0) | -| ------------ | ------------- | ------------- | ------------- | -| centos-5.11 | [i386][1], [x86_64][2] | [i386][3], [x86_64][4] | [i386][5], [x86_64][6] | -| centos-6.7 | [i386][7], [x86_64][8] | [i386][9], [x86_64][10] | [i386][11], [x86_64][12] | -| centos-7.2 | [x86_64][13] | [x86_64][14] | [x86_64][15] | -| debian-6.0.10 | [i386][16], [amd64][17] | [i386][18], [amd64][19] | [i386][20], [amd64][21] | -| debian-7.9 | [i386][22], [amd64][23] | [i386][24], [amd64][25] | [i386][26], [amd64][27] | -| debian-8.2 | [i386][28], [amd64][29] | [i386][30], [amd64][31] | [i386][32], [amd64][33] | -| fedora-21 | [i386][76], [x86_64][77] | [i386][78], [x86_64][79] | [i386][80], [x86_64][81] | -| fedora-22 | [x86_64][82] | [x86_64][83] | [x86_64][84] | -| fedora-23 | [x86_64][85] | | [x86_64][87] | -| freebsd-9.3 | [amd64][35] | [amd64][37] | [amd64][39] | -| freebsd-10.2 | [amd64][41] | [amd64][43] | [amd64][45] | -| opensuse-13.2 | [i386][46], [x86_64][47] | [i386][48], [x86_64][49] | [i386][50], [x86_64][51] | -| ubuntu-10.04 | [i386][52], [amd64][53] | [i386][54], [amd64][55] | [i386][56], [amd64][57] | -| ubuntu-12.04 | [i386][58], [amd64][59] | [i386][60], [amd64][61] | [i386][62], [amd64][63] | -| ubuntu-14.04 | [i386][64], [amd64][65] | [i386][66], [amd64][67] | [i386][68], [amd64][69] | -| ubuntu-15.04 | [i386][70], [amd64][71] | [i386][72], [amd64][73] | [i386][74], [amd64][75] | +### 64 bit +| | VirtualBox | VMware | Parallels | +| ------------ | ------------- | ------------- | ------------- | +| centos-5.11 | [x86_64][centos_511_64_vbox] | [x86_64][centos_511_64_vmware] | [x86_64][centos_511_64_prl] | +| centos-6.7 | [x86_64][centos_67_64_vbox] | [x86_64][centos_67_64_vmware] | [x86_64][centos_67_64_prl] | +| centos-7.2 | [x86_64][centos_72_64_vbox] | [x86_64][centos_72_64_vmware] | [x86_64][centos_72_64_prl] | +| debian-7.9 | [amd64][debian_79_64_vbox] | [amd64][debian_79_64_vmware] | [amd64][debian_79_64_prl] | +| debian-8.3 | [amd64][debian_83_64_vbox] | [amd64][debian_83_64_vmware] | [amd64][debian_83_64_prl] | +| fedora-22 | [x86_64][fedora_22_64_vbox] | [x86_64][fedora_22_64_vmware] | [x86_64][fedora_22_64_prl] | +| fedora-23 | [x86_64][fedora_23_64_vbox] | [x86_64][fedora_22_64_vmware] | [x86_64][fedora_23_64_prl] | +| freebsd-9.3 | [amd64][freebsd_93_64_vbox] | [amd64][freebsd_93_64_vmware] | [amd64][freebsd_93_64_prl] | +| freebsd-10.2 | [amd64][freebsd_102_64_vbox] | [amd64][freebsd_102_64_vmware] | [amd64][freebsd_102_64_prl] | +| opensuse-13.2 | [x86_64][osuse_132_64_vbox] | [x86_64][osuse_132_64_vmware] | [x86_64][osuse_132_64_prl] | +| ubuntu-12.04 | [amd64][ubuntu_1204_64_vbox] | [amd64][ubuntu_1204_64_vmware] | [amd64][ubuntu_1204_64_prl] | +| ubuntu-14.04 | [amd64][ubuntu_1404_64_vbox] | [amd64][ubuntu_1404_64_vmware] | [amd64][ubuntu_1404_64_prl] | +| ubuntu-15.10 | [amd64][ubuntu_1510_64_vbox] | [amd64][ubuntu_1510_64_vmware] | [amd64][ubuntu_1510_64_prl] | + +### 32 bit +| | VirtualBox | VMware | Parallels | +| ------------ | ------------- | ------------- | ------------- | +| centos-5.11 | [i386][centos_511_32_vbox] | [i386][centos_511_32_vmware] | [i386][centos_511_32_prl] | +| centos-6.7 | [i386][centos_67_32_vbox] | [i386][centos_67_32_vmware] | [i386][centos_67_32_prl] | +| debian-7.9 | [i386][debian_79_32_vbox] | [i386][debian_79_32_vmware] | [i386][debian_79_32_prl] | +| debian-8.3 | [i386][debian_83_32_vbox] | [i386][debian_83_32_vmware] | [i386][debian_83_32_prl] | +| opensuse-13.2 | [i386][osuse_132_32_vbox] | [i386][osuse_132_32_vmware] | [i386][osuse_132_32_prl] | +| ubuntu-12.04 | [i386][ubuntu_1204_32_vbox] | [i386][ubuntu_1204_32_vmware] | [i386][ubuntu_1204_32_prl] | +| ubuntu-14.04 | [i386][ubuntu_1404_32_vbox] | [i386][ubuntu_1404_32_vmware] | [i386][ubuntu_1404_32_prl] | +| ubuntu-15.10 | [i386][ubuntu_1510_32_vbox] | [i386][ubuntu_1510_32_vmware] | [i386][ubuntu_1510_32_prl] | + + +*NOTE* This table tracks only the latest release for a given version. Boxes may exist in Atlas or S3 but are not +guaranteed to be updated at this time. ### Build Notes -* Built on OSX 10.11.2 hosts +* Built on OSX 10.11.3 hosts * If you're using the [Vagrant VMWare Fusion](https://www.vagrantup.com/vmware) provider, using `vagrant box add --provider vmware_desktop ...` will work for these boxes. Using `--provider vmware_fusion`, will not. * The boxes are currently hosted on both Atlas and Amazon S3 to maintain backward compatibility with [test-kitchen](https://github.com/test-kitchen/test-kitchen). Once test-kitchen changes defaults the S3 buckets will no longer be updated. +* Tooling versions + * Packer: 0.10.0 + * VirtualBox: 5.0.16 + * VMware Fusion: 8.1.0 + * Parallels: 11.1.3 ## Older Boxes @@ -194,105 +212,84 @@ See the License for the specific language governing permissions and limitations under the License. ``` -[1]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_centos-5.11-i386_chef-provisionerless.box -[2]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_centos-5.11_chef-provisionerless.box -[3]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_centos-5.11-i386_chef-provisionerless.box -[4]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_centos-5.11_chef-provisionerless.box -[5]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/parallels/opscode_centos-5.11-i386_chef-provisionerless.box -[6]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/parallels/opscode_centos-5.11_chef-provisionerless.box - -[7]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_centos-6.7-i386_chef-provisionerless.box -[8]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_centos-6.7_chef-provisionerless.box -[9]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_centos-6.7-i386_chef-provisionerless.box -[10]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_centos-6.7_chef-provisionerless.box -[11]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/parallels/opscode_centos-6.7-i386_chef-provisionerless.box -[12]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/parallels/opscode_centos-6.7_chef-provisionerless.box - -[13]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_centos-7.2_chef-provisionerless.box -[14]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_centos-7.2_chef-provisionerless.box -[15]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/parallels/opscode_centos-7.2_chef-provisionerless.box - -[16]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_debian-6.0.10-i386_chef-provisionerless.box -[17]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_debian-6.0.10_chef-provisionerless.box -[18]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_debian-6.0.10-i386_chef-provisionerless.box -[19]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_debian-6.0.10_chef-provisionerless.box -[20]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/parallels/opscode_debian-6.0.10-i386_chef-provisionerless.box -[21]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/parallels/opscode_debian-6.0.10_chef-provisionerless.box - -[22]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_debian-7.8-i386_chef-provisionerless.box -[23]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_debian-7.8_chef-provisionerless.box -[24]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_debian-7.8-i386_chef-provisionerless.box -[25]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_debian-7.8_chef-provisionerless.box -[26]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/parallels/opscode_debian-7.8-i386_chef-provisionerless.box -[27]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/parallels/opscode_debian-7.8_chef-provisionerless.box - -[28]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_debian-8.2-i386_chef-provisionerless.box -[29]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_debian-8.2_chef-provisionerless.box -[30]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_debian-8.2-i386_chef-provisionerless.box -[31]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_debian-8.2_chef-provisionerless.box -[32]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/parallels/opscode_debian-8.2-i386_chef-provisionerless.box -[33]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/parallels/opscode_debian-8.2_chef-provisionerless.box - -[34]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_freebsd-9.3-i386_chef-provisionerless.box -[35]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_freebsd-9.3_chef-provisionerless.box -[36]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_freebsd-9.3-i386_chef-provisionerless.box -[37]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_freebsd-9.3_chef-provisionerless.box -[38]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/parallels/opscode_freebsd-9.3-i386_chef-provisionerless.box -[39]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/parallels/opscode_freebsd-9.3_chef-provisionerless.box - -[40]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_freebsd-10.2-i386_chef-provisionerless.box -[41]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_freebsd-10.2_chef-provisionerless.box -[42]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_freebsd-10.2-i386_chef-provisionerless.box -[43]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_freebsd-10.2_chef-provisionerless.box -[44]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/parallels/opscode_freebsd-10.2-i386_chef-provisionerless.box -[45]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/parallels/opscode_freebsd-10.2_chef-provisionerless.box - -[46]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_opensuse-13.2-i386_chef-provisionerless.box -[47]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_opensuse-13.2-x86_64_chef-provisionerless.box -[48]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_opensuse-13.2-i386_chef-provisionerless.box -[49]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_opensuse-13.2-x86_64_chef-provisionerless.box -[50]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/parallels/opscode_opensuse-13.2-i386_chef-provisionerless.box -[51]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/parallels/opscode_opensuse-13.2-x86_64_chef-provisionerless.box - -[52]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_ubuntu-10.04-i386_chef-provisionerless.box -[53]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_ubuntu-10.04_chef-provisionerless.box -[54]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_ubuntu-10.04-i386_chef-provisionerless.box -[55]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_ubuntu-10.04_chef-provisionerless.box -[56]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/parallels/opscode_ubuntu-10.04-i386_chef-provisionerless.box -[57]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/parallels/opscode_ubuntu-10.04_chef-provisionerless.box - -[58]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_ubuntu-12.04-i386_chef-provisionerless.box -[59]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_ubuntu-12.04_chef-provisionerless.box -[60]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_ubuntu-12.04-i386_chef-provisionerless.box -[61]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_ubuntu-12.04_chef-provisionerless.box -[62]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/parallels/opscode_ubuntu-12.04-i386_chef-provisionerless.box -[63]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/parallels/opscode_ubuntu-12.04_chef-provisionerless.box - -[64]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_ubuntu-14.04-i386_chef-provisionerless.box -[65]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_ubuntu-14.04_chef-provisionerless.box -[66]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_ubuntu-14.04-i386_chef-provisionerless.box -[67]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_ubuntu-14.04_chef-provisionerless.box -[68]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/parallels/opscode_ubuntu-14.04-i386_chef-provisionerless.box -[69]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/parallels/opscode_ubuntu-14.04_chef-provisionerless.box - - -[70]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_ubuntu-15.04-i386_chef-provisionerless.box -[71]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_ubuntu-15.04_chef-provisionerless.box -[72]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_ubuntu-15.04-i386_chef-provisionerless.box -[73]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_ubuntu-15.04_chef-provisionerless.box -[74]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/parallels/opscode_ubuntu-15.04-i386_chef-provisionerless.box -[75]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/parallels/opscode_ubuntu-15.04_chef-provisionerless.box - -[76]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_fedora-21-i386_chef-provisionerless.box -[77]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_fedora-21_chef-provisionerless.box -[78]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_fedora-21-i386_chef-provisionerless.box -[79]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_fedora-21_chef-provisionerless.box -[80]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/parallels/opscode_fedora-21-i386_chef-provisionerless.box -[81]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/parallels/opscode_fedora-21_chef-provisionerless.box - -[82]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_fedora-22_chef-provisionerless.box -[83]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_fedora-22_chef-provisionerless.box -[84]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/parallels/opscode_fedora-22_chef-provisionerless.box - -[85]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_fedora-23_chef-provisionerless.box -[87]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/parallels/opscode_fedora-23_chef-provisionerless.box +[centos_511_32_vbox]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_centos-5.11-i386_chef-provisionerless.box +[centos_511_64_vbox]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_centos-5.11_chef-provisionerless.box +[centos_511_32_vmware]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_centos-5.11-i386_chef-provisionerless.box +[centos_511_64_vmware]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_centos-5.11_chef-provisionerless.box +[centos_511_32_prl]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/parallels/opscode_centos-5.11-i386_chef-provisionerless.box +[centos_511_64_prl]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/parallels/opscode_centos-5.11_chef-provisionerless.box + +[centos_67_32_vbox]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_centos-6.7-i386_chef-provisionerless.box +[centos_67_64_vbox]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_centos-6.7_chef-provisionerless.box +[centos_67_32_vmware]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_centos-6.7-i386_chef-provisionerless.box +[centos_67_64_vmware]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_centos-6.7_chef-provisionerless.box +[centos_67_32_prl]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/parallels/opscode_centos-6.7-i386_chef-provisionerless.box +[centos_67_64_prl]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/parallels/opscode_centos-6.7_chef-provisionerless.box + +[centos_72_64_vbox]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_centos-7.2_chef-provisionerless.box +[centos_72_64_vmware]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_centos-7.2_chef-provisionerless.box +[centos_72_64_prl]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/parallels/opscode_centos-7.2_chef-provisionerless.box + +[debian_79_32_vbox]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_debian-7.9-i386_chef-provisionerless.box +[debian_79_64_vbox]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_debian-7.9_chef-provisionerless.box +[debian_79_32_vmware]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_debian-7.9-i386_chef-provisionerless.box +[debian_79_64_vmware]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_debian-7.9_chef-provisionerless.box +[debian_79_32_prl]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/parallels/opscode_debian-7.9-i386_chef-provisionerless.box +[debian_79_64_prl]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/parallels/opscode_debian-7.9_chef-provisionerless.box + +[debian_83_32_vbox]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_debian-8.3-i386_chef-provisionerless.box +[debian_83_64_vbox]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_debian-8.3_chef-provisionerless.box +[debian_83_32_vmware]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_debian-8.3-i386_chef-provisionerless.box +[debian_83_64_vmware]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_debian-8.3_chef-provisionerless.box +[debian_83_32_prl]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/parallels/opscode_debian-8.3-i386_chef-provisionerless.box +[debian_83_64_prl]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/parallels/opscode_debian-8.3_chef-provisionerless.box + +[freebsd_93_32_vbox]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_freebsd-9.3-i386_chef-provisionerless.box +[freebsd_93_64_vbox]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_freebsd-9.3_chef-provisionerless.box +[freebsd_93_32_vmware]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_freebsd-9.3-i386_chef-provisionerless.box +[freebsd_93_64_vmware]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_freebsd-9.3_chef-provisionerless.box +[freebsd_93_32_prl]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/parallels/opscode_freebsd-9.3-i386_chef-provisionerless.box +[freebsd_93_64_prl]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/parallels/opscode_freebsd-9.3_chef-provisionerless.box + +[freebsd_102_32_vbox]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_freebsd-10.2-i386_chef-provisionerless.box +[freebsd_102_64_vbox]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_freebsd-10.2_chef-provisionerless.box +[freebsd_102_32_vmware]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_freebsd-10.2-i386_chef-provisionerless.box +[freebsd_102_64_vmware]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_freebsd-10.2_chef-provisionerless.box +[freebsd_102_32_prl]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/parallels/opscode_freebsd-10.2-i386_chef-provisionerless.box +[freebsd_102_64_prl]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/parallels/opscode_freebsd-10.2_chef-provisionerless.box + +[osuse_132_32_vbox]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_opensuse-13.2-i386_chef-provisionerless.box +[osuse_132_64_vbox]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_opensuse-13.2-x86_64_chef-provisionerless.box +[osuse_132_32_vmware]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_opensuse-13.2-i386_chef-provisionerless.box +[osuse_132_64_vmware]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_opensuse-13.2-x86_64_chef-provisionerless.box +[osuse_132_32_prl]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/parallels/opscode_opensuse-13.2-i386_chef-provisionerless.box +[osuse_132_64_prl]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/parallels/opscode_opensuse-13.2-x86_64_chef-provisionerless.box + +[ubuntu_1204_32_vbox]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_ubuntu-12.04-i386_chef-provisionerless.box +[ubuntu_1204_64_vbox]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_ubuntu-12.04_chef-provisionerless.box +[ubuntu_1204_32_vmware]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_ubuntu-12.04-i386_chef-provisionerless.box +[ubuntu_1204_64_vmware]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_ubuntu-12.04_chef-provisionerless.box +[ubuntu_1204_32_prl]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/parallels/opscode_ubuntu-12.04-i386_chef-provisionerless.box +[ubuntu_1204_64_prl]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/parallels/opscode_ubuntu-12.04_chef-provisionerless.box + +[ubuntu_1404_32_vbox]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_ubuntu-14.04-i386_chef-provisionerless.box +[ubuntu_1404_64_vbox]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_ubuntu-14.04_chef-provisionerless.box +[ubuntu_1404_32_vmware]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_ubuntu-14.04-i386_chef-provisionerless.box +[ubuntu_1404_64_vmware]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_ubuntu-14.04_chef-provisionerless.box +[ubuntu_1404_32_prl]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/parallels/opscode_ubuntu-14.04-i386_chef-provisionerless.box +[ubuntu_1404_64_prl]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/parallels/opscode_ubuntu-14.04_chef-provisionerless.box + +[ubuntu_1510_32_vbox]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_ubuntu-15.10-i386_chef-provisionerless.box +[ubuntu_1510_64_vbox]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_ubuntu-15.10_chef-provisionerless.box +[ubuntu_1510_32_vmware]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_ubuntu-15.10-i386_chef-provisionerless.box +[ubuntu_1510_64_vmware]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_ubuntu-15.10_chef-provisionerless.box +[ubuntu_1510_32_prl]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/parallels/opscode_ubuntu-15.10-i386_chef-provisionerless.box +[ubuntu_1510_64_prl]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/parallels/opscode_ubuntu-15.10_chef-provisionerless.box + +[fedora_22_64_vbox]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_fedora-22_chef-provisionerless.box +[fedora_22_64_vmware]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_fedora-22_chef-provisionerless.box +[fedora_22_64_prl]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/parallels/opscode_fedora-22_chef-provisionerless.box + +[fedora_23_64_vbox]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_fedora-23_chef-provisionerless.box +[fedora_23_64_vmware]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_fedora-23_chef-provisionerless.box +[fedora_23_64_prl]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/parallels/opscode_fedora-23_chef-provisionerless.box From 698ba3b28302f6da08e583ce6b080a7485cd7911 Mon Sep 17 00:00:00 2001 From: Seth Thomas <sthomas@chef.io> Date: Mon, 28 Mar 2016 22:43:57 -0700 Subject: [PATCH 0468/1622] Use dist-upgrade and install build packages in preseed --- http/ubuntu-12.04/preseed.cfg | 2 +- http/ubuntu-14.04/preseed.cfg | 2 +- http/ubuntu-15.10/preseed.cfg | 2 +- scripts/ubuntu/update.sh | 16 +++++++--------- 4 files changed, 10 insertions(+), 12 deletions(-) diff --git a/http/ubuntu-12.04/preseed.cfg b/http/ubuntu-12.04/preseed.cfg index 5282b5811..839c4602d 100644 --- a/http/ubuntu-12.04/preseed.cfg +++ b/http/ubuntu-12.04/preseed.cfg @@ -21,7 +21,7 @@ d-i passwd/user-uid string 900 d-i passwd/user-password password vagrant d-i passwd/user-password-again password vagrant d-i passwd/username string vagrant -d-i pkgsel/include string openssh-server cryptsetup build-essential libssl-dev zlib1g-dev linux-source nfs-common +d-i pkgsel/include string openssh-server cryptsetup build-essential libssl-dev zlib1g-dev linux-source nfs-common linux-headers-$(uname -r) perl d-i pkgsel/install-language-support boolean false d-i pkgsel/update-policy select unattended-upgrades d-i pkgsel/upgrade select full-upgrade diff --git a/http/ubuntu-14.04/preseed.cfg b/http/ubuntu-14.04/preseed.cfg index 0a4d4939b..572015513 100644 --- a/http/ubuntu-14.04/preseed.cfg +++ b/http/ubuntu-14.04/preseed.cfg @@ -21,7 +21,7 @@ d-i passwd/user-uid string 900 d-i passwd/user-password password vagrant d-i passwd/user-password-again password vagrant d-i passwd/username string vagrant -d-i pkgsel/include string openssh-server cryptsetup build-essential libssl-dev libreadline-dev zlib1g-dev linux-source dkms nfs-common +d-i pkgsel/include string openssh-server cryptsetup build-essential libssl-dev libreadline-dev zlib1g-dev linux-source dkms nfs-common linux-headers-$(uname -r) perl d-i pkgsel/install-language-support boolean false d-i pkgsel/update-policy select unattended-upgrades d-i pkgsel/upgrade select full-upgrade diff --git a/http/ubuntu-15.10/preseed.cfg b/http/ubuntu-15.10/preseed.cfg index 0a4d4939b..572015513 100644 --- a/http/ubuntu-15.10/preseed.cfg +++ b/http/ubuntu-15.10/preseed.cfg @@ -21,7 +21,7 @@ d-i passwd/user-uid string 900 d-i passwd/user-password password vagrant d-i passwd/user-password-again password vagrant d-i passwd/username string vagrant -d-i pkgsel/include string openssh-server cryptsetup build-essential libssl-dev libreadline-dev zlib1g-dev linux-source dkms nfs-common +d-i pkgsel/include string openssh-server cryptsetup build-essential libssl-dev libreadline-dev zlib1g-dev linux-source dkms nfs-common linux-headers-$(uname -r) perl d-i pkgsel/install-language-support boolean false d-i pkgsel/update-policy select unattended-upgrades d-i pkgsel/upgrade select full-upgrade diff --git a/scripts/ubuntu/update.sh b/scripts/ubuntu/update.sh index 332e93dc9..e7f76ee3c 100644 --- a/scripts/ubuntu/update.sh +++ b/scripts/ubuntu/update.sh @@ -9,18 +9,16 @@ if [ "$ubuntu_version" = "12.04" ]; then rm -rf /var/lib/apt/lists; fi +# Disable release-upgrades +sed -i.bak 's/^Prompt=.*$/Prompt=never/' /etc/update-manager/release-upgrades; + # Update the package list -apt-get update; +apt-get -y update; # Upgrade all installed packages incl. kernel and kernel headers -if [ "$ubuntu_major_version" -lt 14 ]; then - apt-get -y upgrade linux-server linux-headers-server; -else - apt-get -y upgrade linux-generic; -fi - -# ensure the correct kernel headers are installed -apt-get -y install linux-headers-`uname -r`; +apt-get -y dist-upgrade --force-yes; +reboot; +sleep 60; # update package index on boot cat <<EOF >/etc/init/refresh-apt.conf; From 0b7a3f88f1dd5854829ba7122e585b3741bd69f3 Mon Sep 17 00:00:00 2001 From: Seth Thomas <sthomas@chef.io> Date: Tue, 29 Mar 2016 13:00:50 -0700 Subject: [PATCH 0469/1622] Cutting 2.2.5 --- CHANGELOG.md | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index df7baa11d..1c39a55d3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,13 @@ # Change Log -## [2.2.4](https://github.com/chef/bento/tree/2.2.4) (2016-03-23) +## [2.2.5](https://github.com/chef/bento/tree/2.2.5) (2016-03-29) +[Full Changelog](https://github.com/chef/bento/compare/2.2.4...2.2.5) + +**Merged pull requests:** + +- Ubuntu: use dist-upgrade and install build packages in preseed [\#551](https://github.com/chef/bento/pull/551) ([cheeseplus](https://github.com/cheeseplus)) + +## [2.2.4](https://github.com/chef/bento/tree/2.2.4) (2016-03-29) [Full Changelog](https://github.com/chef/bento/compare/2.2.3...2.2.4) **Closed issues:** @@ -22,6 +29,7 @@ **Merged pull requests:** +- Cutting 2.2.4 [\#550](https://github.com/chef/bento/pull/550) ([cheeseplus](https://github.com/cheeseplus)) - Update mirror URL for Debian 8.2 [\#544](https://github.com/chef/bento/pull/544) ([legal90](https://github.com/legal90)) - Updating maintainers [\#543](https://github.com/chef/bento/pull/543) ([cheeseplus](https://github.com/cheeseplus)) - Updating for 14.04.4 release [\#542](https://github.com/chef/bento/pull/542) ([cheeseplus](https://github.com/cheeseplus)) From cf66848908f58e3dcf269b7c4bcd1f5a5615349a Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Fri, 1 Apr 2016 22:52:55 -0700 Subject: [PATCH 0470/1622] Add FreeBSD 10.3 Also move the install script for FreeBSD 10 into a major version directory --- freebsd-10.2-amd64.json | 2 +- freebsd-10.2-i386.json | 2 +- freebsd-10.3-amd64.json | 229 +++++++++++++++++++ freebsd-10.3-i386.json | 229 +++++++++++++++++++ http/{freebsd-10.2 => freebsd-10}/install.sh | 2 +- http/freebsd-9.3/install.sh | 2 +- scripts/freebsd/postinstall.sh | 2 +- 7 files changed, 463 insertions(+), 5 deletions(-) create mode 100644 freebsd-10.3-amd64.json create mode 100644 freebsd-10.3-i386.json rename http/{freebsd-10.2 => freebsd-10}/install.sh (98%) diff --git a/freebsd-10.2-amd64.json b/freebsd-10.2-amd64.json index 51741705c..1d8c17db6 100644 --- a/freebsd-10.2-amd64.json +++ b/freebsd-10.2-amd64.json @@ -214,7 +214,7 @@ "headless": "", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", - "install_path": "freebsd-10.2/install.sh", + "install_path": "freebsd-10/install.sh", "iso_checksum": "97908f5cd00d86cafeb2c265bfabbd0aa79f87e9b6b31ecdb756bc96a4a62e93", "iso_checksum_type": "sha256", "iso_name": "FreeBSD-10.2-RELEASE-amd64-disc1.iso", diff --git a/freebsd-10.2-i386.json b/freebsd-10.2-i386.json index fbbe73571..73bb9e98b 100644 --- a/freebsd-10.2-i386.json +++ b/freebsd-10.2-i386.json @@ -214,7 +214,7 @@ "headless": "", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", - "install_path": "freebsd-10.2/install.sh", + "install_path": "freebsd-10/install.sh", "iso_checksum": "0e7094ae9f4f79d8955f193a1f2f5ab4f8b300e57eccd3b9bd959951ee079020", "iso_checksum_type": "sha256", "iso_name": "FreeBSD-10.2-RELEASE-i386-disc1.iso", diff --git a/freebsd-10.3-amd64.json b/freebsd-10.3-amd64.json new file mode 100644 index 000000000..a87504926 --- /dev/null +++ b/freebsd-10.3-amd64.json @@ -0,0 +1,229 @@ +{ + "builders": [ + { + "boot_command": [ + "<esc><wait>", + "boot -s<wait>", + "<enter><wait>", + "<wait10><wait10>", + "/bin/sh<enter><wait>", + "mdmfs -s 100m md1 /tmp<enter><wait>", + "mdmfs -s 100m md2 /mnt<enter><wait>", + "dhclient -l /tmp/dhclient.lease.em0 em0<enter><wait>", + "fetch -o /tmp/install.sh http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} && chmod +x /tmp/install.sh && /tmp/install.sh {{ .Name }}<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 10140, + "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "guest_os_type": "FreeBSD_64", + "headless": "{{ user `headless` }}", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-virtualbox", + "shutdown_command": "su -m root -c 'shutdown -p now'", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "virtualbox-iso", + "vboxmanage": [ + [ + "modifyvm", + "{{.Name}}", + "--memory", + "512" + ], + [ + "modifyvm", + "{{.Name}}", + "--cpus", + "1" + ] + ], + "virtualbox_version_file": ".vbox_version", + "vm_name": "{{ user `template` }}" + }, + { + "boot_command": [ + "<esc><wait>", + "boot -s<wait>", + "<enter><wait>", + "<wait10><wait10>", + "/bin/sh<enter><wait>", + "mdmfs -s 100m md1 /tmp<enter><wait>", + "mdmfs -s 100m md2 /mnt<enter><wait>", + "dhclient -l /tmp/dhclient.lease.em0 em0<enter><wait>", + "<wait5>", + "fetch -o /tmp/install.sh http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} && chmod +x /tmp/install.sh && /tmp/install.sh {{ .Name }}<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 10140, + "guest_os_type": "freebsd-64", + "headless": "{{ user `headless` }}", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-vmare", + "shutdown_command": "su -m root -c 'shutdown -p now'", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "tools_upload_flavor": "freebsd", + "type": "vmware-iso", + "vm_name": "{{ user `template` }}", + "vmx_data": { + "cpuid.coresPerSocket": "1", + "memsize": "512", + "numvcpus": "1" + } + }, + { + "boot_command": [ + "<esc><wait>", + "boot -s<wait>", + "<enter><wait>", + "<wait10><wait10>", + "/bin/sh<enter><wait>", + "mdmfs -s 100m md1 /tmp<enter><wait>", + "mdmfs -s 100m md2 /mnt<enter><wait>", + "dhclient -l /tmp/dhclient.lease.em0 em0<enter><wait>", + "fetch -o /tmp/install.sh http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} && chmod +x /tmp/install.sh && /tmp/install.sh {{ .Name }}<enter><wait>" + ], + "boot_wait": "8s", + "disk_size": 10140, + "guest_os_type": "freebsd", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-parallels", + "parallels_tools_mode": "disable", + "prlctl": [ + [ + "set", + "{{.Name}}", + "--memsize", + "512" + ], + [ + "set", + "{{.Name}}", + "--cpus", + "1" + ], + [ + "set", + "{{.Name}}", + "--device-set", + "cdrom0", + "--iface", + "ide" + ], + [ + "set", + "{{.Name}}", + "--device-del", + "fdd0" + ], + [ + "set", + "{{.Name}}", + "--device-del", + "parallel0" + ] + ], + "prlctl_version_file": ".prlctl_version", + "shutdown_command": "su -m root -c 'shutdown -p now'", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "parallels-iso", + "vm_name": "{{ user `template` }}" + }, + { + "boot_command": [ + "<esc><wait>", + "boot -s<wait>", + "<enter><wait>", + "<wait10><wait10>", + "/bin/sh<enter><wait>", + "mdmfs -s 100m md1 /tmp<enter><wait>", + "mdmfs -s 100m md2 /mnt<enter><wait>", + "dhclient -l /tmp/dhclient.lease.vtnet0 vtnet0<enter><wait>", + "fetch -o /tmp/install.sh http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} && chmod +x /tmp/install.sh && /tmp/install.sh {{ .Name }} vtnet0<enter><wait>" + ], + "boot_wait": "7s", + "disk_size": 10140, + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-qemu", + "shutdown_command": "su -m root -c 'shutdown -p now'", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "qemu", + "vm_name": "{{ user `template` }}" + } + ], + "post-processors": [ + { + "output": "builds/{{user `box_basename`}}.{{.Provider}}.box", + "type": "vagrant", + "vagrantfile_template": "vagrantfile_templates/freebsd.rb" + } + ], + "provisioners": [ + { + "destination": "/tmp/bento-metadata.json", + "source": "{{user `metadata`}}", + "type": "file" + }, + { + "environment_vars": [ + "HOME_DIR=/home/vagrant", + "http_proxy={{user `http_proxy`}}", + "https_proxy={{user `https_proxy`}}", + "no_proxy={{user `no_proxy`}}" + ], + "execute_command": "{{.Vars}} su -m root -c 'sh -eux {{.Path}}'", + "scripts": [ + "scripts/common/metadata.sh", + "scripts/freebsd/update.sh", + "scripts/freebsd/postinstall.sh", + "scripts/freebsd/sudoers.sh", + "scripts/common/vagrant.sh", + "scripts/freebsd/vmtools.sh", + "scripts/freebsd/cleanup.sh", + "scripts/freebsd/minimize.sh" + ], + "type": "shell" + } + ], + "variables": { + "box_basename": "freebsd-10.3", + "build_timestamp": "{{isotime \"20060102150405\"}}", + "git_revision": "__unknown_git_revision__", + "headless": "", + "http_proxy": "{{env `http_proxy`}}", + "https_proxy": "{{env `https_proxy`}}", + "install_path": "freebsd-10/install.sh", + "iso_checksum": "fef068cf6dea26923ab84b62ba9f21461ca0bdec90a0741c8ffb0e1ca29e410d", + "iso_checksum_type": "sha256", + "iso_name": "FreeBSD-10.3-RELEASE-amd64-disc1.iso", + "metadata": "floppy/dummy_metadata.json", + "mirror": "http://ftp.freebsd.org/pub/FreeBSD", + "mirror_directory": "releases/amd64/amd64/ISO-IMAGES/10.3", + "name": "freebsd-10.3", + "no_proxy": "{{env `no_proxy`}}", + "template": "freebsd-10.3-amd64", + "version": "2.1.TIMESTAMP" + } +} diff --git a/freebsd-10.3-i386.json b/freebsd-10.3-i386.json new file mode 100644 index 000000000..ce1f83050 --- /dev/null +++ b/freebsd-10.3-i386.json @@ -0,0 +1,229 @@ +{ + "builders": [ + { + "boot_command": [ + "<esc><wait>", + "boot -s<wait>", + "<enter><wait>", + "<wait10><wait10>", + "/bin/sh<enter><wait>", + "mdmfs -s 100m md1 /tmp<enter><wait>", + "mdmfs -s 100m md2 /mnt<enter><wait>", + "dhclient -l /tmp/dhclient.lease.em0 em0<enter><wait>", + "fetch -o /tmp/install.sh http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} && chmod +x /tmp/install.sh && /tmp/install.sh {{ .Name }}<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 10140, + "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "guest_os_type": "FreeBSD", + "headless": "{{ user `headless` }}", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-virtualbox", + "shutdown_command": "su -m root -c 'shutdown -p now'", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "virtualbox-iso", + "vboxmanage": [ + [ + "modifyvm", + "{{.Name}}", + "--memory", + "512" + ], + [ + "modifyvm", + "{{.Name}}", + "--cpus", + "1" + ] + ], + "virtualbox_version_file": ".vbox_version", + "vm_name": "{{ user `template` }}" + }, + { + "boot_command": [ + "<esc><wait>", + "boot -s<wait>", + "<enter><wait>", + "<wait10><wait10>", + "/bin/sh<enter><wait>", + "mdmfs -s 100m md1 /tmp<enter><wait>", + "mdmfs -s 100m md2 /mnt<enter><wait>", + "dhclient -l /tmp/dhclient.lease.em0 em0<enter><wait>", + "<wait5>", + "fetch -o /tmp/install.sh http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} && chmod +x /tmp/install.sh && /tmp/install.sh {{ .Name }}<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 10140, + "guest_os_type": "freebsd", + "headless": "{{ user `headless` }}", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-vmare", + "shutdown_command": "su -m root -c 'shutdown -p now'", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "tools_upload_flavor": "freebsd", + "type": "vmware-iso", + "vm_name": "{{ user `template` }}", + "vmx_data": { + "cpuid.coresPerSocket": "1", + "memsize": "512", + "numvcpus": "1" + } + }, + { + "boot_command": [ + "<esc><wait>", + "boot -s<wait>", + "<enter><wait>", + "<wait10><wait10>", + "/bin/sh<enter><wait>", + "mdmfs -s 100m md1 /tmp<enter><wait>", + "mdmfs -s 100m md2 /mnt<enter><wait>", + "dhclient -l /tmp/dhclient.lease.em0 em0<enter><wait>", + "fetch -o /tmp/install.sh http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} && chmod +x /tmp/install.sh && /tmp/install.sh {{ .Name }}<enter><wait>" + ], + "boot_wait": "8s", + "disk_size": 10140, + "guest_os_type": "freebsd", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-parallels", + "parallels_tools_mode": "disable", + "prlctl": [ + [ + "set", + "{{.Name}}", + "--memsize", + "512" + ], + [ + "set", + "{{.Name}}", + "--cpus", + "1" + ], + [ + "set", + "{{.Name}}", + "--device-set", + "cdrom0", + "--iface", + "ide" + ], + [ + "set", + "{{.Name}}", + "--device-del", + "fdd0" + ], + [ + "set", + "{{.Name}}", + "--device-del", + "parallel0" + ] + ], + "prlctl_version_file": ".prlctl_version", + "shutdown_command": "su -m root -c 'shutdown -p now'", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "parallels-iso", + "vm_name": "{{ user `template` }}" + }, + { + "boot_command": [ + "<esc><wait>", + "boot -s<wait>", + "<enter><wait>", + "<wait10><wait10>", + "/bin/sh<enter><wait>", + "mdmfs -s 100m md1 /tmp<enter><wait>", + "mdmfs -s 100m md2 /mnt<enter><wait>", + "dhclient -l /tmp/dhclient.lease.vtnet0 vtnet0<enter><wait>", + "fetch -o /tmp/install.sh http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} && chmod +x /tmp/install.sh && /tmp/install.sh {{ .Name }}<enter><wait>" + ], + "boot_wait": "7s", + "disk_size": 10140, + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-qemu", + "shutdown_command": "su -m root -c 'shutdown -p now'", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "qemu", + "vm_name": "{{ user `template` }}" + } + ], + "post-processors": [ + { + "output": "builds/{{user `box_basename`}}.{{.Provider}}.box", + "type": "vagrant", + "vagrantfile_template": "vagrantfile_templates/freebsd.rb" + } + ], + "provisioners": [ + { + "destination": "/tmp/bento-metadata.json", + "source": "{{user `metadata`}}", + "type": "file" + }, + { + "environment_vars": [ + "HOME_DIR=/home/vagrant", + "http_proxy={{user `http_proxy`}}", + "https_proxy={{user `https_proxy`}}", + "no_proxy={{user `no_proxy`}}" + ], + "execute_command": "{{.Vars}} su -m root -c 'sh -eux {{.Path}}'", + "scripts": [ + "scripts/common/metadata.sh", + "scripts/freebsd/update.sh", + "scripts/freebsd/postinstall.sh", + "scripts/freebsd/sudoers.sh", + "scripts/common/vagrant.sh", + "scripts/freebsd/vmtools.sh", + "scripts/freebsd/cleanup.sh", + "scripts/freebsd/minimize.sh" + ], + "type": "shell" + } + ], + "variables": { + "box_basename": "freebsd-10.3-i386", + "build_timestamp": "{{isotime \"20060102150405\"}}", + "git_revision": "__unknown_git_revision__", + "headless": "", + "http_proxy": "{{env `http_proxy`}}", + "https_proxy": "{{env `https_proxy`}}", + "install_path": "freebsd-10/install.sh", + "iso_checksum": "8329ee2ca4779892edbb001c303670d74642e4353e97d02f4521895023cacd5d", + "iso_checksum_type": "sha256", + "iso_name": "FreeBSD-10.3-RELEASE-i386-disc1.iso", + "metadata": "floppy/dummy_metadata.json", + "mirror": "http://ftp.freebsd.org/pub/FreeBSD", + "mirror_directory": "releases/i386/i386/ISO-IMAGES/10.3", + "name": "freebsd-10.3-i386", + "no_proxy": "{{env `no_proxy`}}", + "template": "freebsd-10.3-i386", + "version": "2.1.TIMESTAMP" + } +} diff --git a/http/freebsd-10.2/install.sh b/http/freebsd-10/install.sh similarity index 98% rename from http/freebsd-10.2/install.sh rename to http/freebsd-10/install.sh index aab273fe8..8757ffdbd 100644 --- a/http/freebsd-10.2/install.sh +++ b/http/freebsd-10/install.sh @@ -3,7 +3,7 @@ # Credit: http://www.aisecure.net/2011/05/01/root-on-zfs-freebsd-current/ # # Heavily re-adapted from https://wiki.freebsd.org/RootOnZFS/GPTZFSBoot -# by Julian Dunn (jdunn@opscode.com) to remove legacy junk +# by Julian Dunn (jdunn@chef.io) to remove legacy junk NAME=$1 diff --git a/http/freebsd-9.3/install.sh b/http/freebsd-9.3/install.sh index aab273fe8..8757ffdbd 100644 --- a/http/freebsd-9.3/install.sh +++ b/http/freebsd-9.3/install.sh @@ -3,7 +3,7 @@ # Credit: http://www.aisecure.net/2011/05/01/root-on-zfs-freebsd-current/ # # Heavily re-adapted from https://wiki.freebsd.org/RootOnZFS/GPTZFSBoot -# by Julian Dunn (jdunn@opscode.com) to remove legacy junk +# by Julian Dunn (jdunn@chef.io) to remove legacy junk NAME=$1 diff --git a/scripts/freebsd/postinstall.sh b/scripts/freebsd/postinstall.sh index 5fb23ad3e..649e90ee1 100644 --- a/scripts/freebsd/postinstall.sh +++ b/scripts/freebsd/postinstall.sh @@ -3,7 +3,7 @@ # Set the time correctly ntpdate -v -b in.pool.ntp.org; -# Install sudo, curl and ca_root_nss +# Install curl and ca_root_nss pkg install -y curl; pkg install -y ca_root_nss; From 98bc8eab2df1f29e794a2a4bcd1a68cb44110fa6 Mon Sep 17 00:00:00 2001 From: HAYASHI Kentaro <hayashi@clear-code.com> Date: Mon, 4 Apr 2016 13:30:13 +0900 Subject: [PATCH 0471/1622] Add support for Debian 8.4 --- debian-8.4-amd64.json | 237 ++++++++++++++++++++++++++++++++++++++++++ debian-8.4-i386.json | 237 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 474 insertions(+) create mode 100644 debian-8.4-amd64.json create mode 100644 debian-8.4-i386.json diff --git a/debian-8.4-amd64.json b/debian-8.4-amd64.json new file mode 100644 index 000000000..36985657b --- /dev/null +++ b/debian-8.4-amd64.json @@ -0,0 +1,237 @@ +{ + "builders": [ + { + "boot_command": [ + "<esc><wait>", + "install <wait>", + " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}} <wait>", + "debian-installer=en_US <wait>", + "auto <wait>", + "locale=en_US <wait>", + "kbd-chooser/method=us <wait>", + "keyboard-configuration/xkb-keymap=us <wait>", + "netcfg/get_hostname={{ .Name }} <wait>", + "netcfg/get_domain=vagrantup.com <wait>", + "fb=false <wait>", + "debconf/frontend=noninteractive <wait>", + "console-setup/ask_detect=false <wait>", + "console-keymaps-at/keymap=us <wait>", + "grub-installer/bootdev=/dev/sda <wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "guest_os_type": "Debian_64", + "hard_drive_interface": "sata", + "headless": "{{ user `headless` }}", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-virtualbox", + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "virtualbox-iso", + "vboxmanage": [ + [ + "modifyvm", + "{{.Name}}", + "--memory", + "384" + ], + [ + "modifyvm", + "{{.Name}}", + "--cpus", + "1" + ] + ], + "virtualbox_version_file": ".vbox_version", + "vm_name": "{{ user `template` }}" + }, + { + "boot_command": [ + "<esc><wait>", + "install <wait>", + " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}} <wait>", + "debian-installer=en_US <wait>", + "auto <wait>", + "locale=en_US <wait>", + "kbd-chooser/method=us <wait>", + "keyboard-configuration/xkb-keymap=us <wait>", + "netcfg/get_hostname={{ .Name }} <wait>", + "netcfg/get_domain=vagrantup.com <wait>", + "fb=false <wait>", + "debconf/frontend=noninteractive <wait>", + "console-setup/ask_detect=false <wait>", + "console-keymaps-at/keymap=us <wait>", + "grub-installer/bootdev=/dev/sda <wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "guest_os_type": "debian8-64", + "headless": "{{ user `headless` }}", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-vmware", + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "tools_upload_flavor": "linux", + "type": "vmware-iso", + "vm_name": "{{ user `template` }}", + "vmx_data": { + "cpuid.coresPerSocket": "1", + "memsize": "384", + "numvcpus": "1" + } + }, + { + "boot_command": [ + "<esc><wait>", + "install <wait>", + " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}} <wait>", + "debian-installer=en_US <wait>", + "auto <wait>", + "locale=en_US <wait>", + "kbd-chooser/method=us <wait>", + "keyboard-configuration/xkb-keymap=us <wait>", + "netcfg/get_hostname={{ .Name }} <wait>", + "netcfg/get_domain=vagrantup.com <wait>", + "fb=false <wait>", + "debconf/frontend=noninteractive <wait>", + "console-setup/ask_detect=false <wait>", + "console-keymaps-at/keymap=us <wait>", + "grub-installer/bootdev=/dev/sda <wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "guest_os_type": "debian", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-parallels", + "parallels_tools_flavor": "lin", + "prlctl": [ + [ + "set", + "{{.Name}}", + "--memsize", + "384" + ], + [ + "set", + "{{.Name}}", + "--cpus", + "1" + ] + ], + "prlctl_version_file": ".prlctl_version", + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "parallels-iso", + "vm_name": "{{ user `template` }}" + }, + { + "boot_command": [ + "<esc><wait>", + "install <wait>", + " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}} <wait>", + "debian-installer=en_US <wait>", + "auto <wait>", + "locale=en_US <wait>", + "kbd-chooser/method=us <wait>", + "keyboard-configuration/xkb-keymap=us <wait>", + "netcfg/get_hostname={{ .Name }} <wait>", + "netcfg/get_domain=vagrantup.com <wait>", + "fb=false <wait>", + "debconf/frontend=noninteractive <wait>", + "console-setup/ask_detect=false <wait>", + "console-keymaps-at/keymap=us <wait>", + "grub-installer/bootdev=/dev/vda <wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-qemu", + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "qemu", + "vm_name": "{{ user `template` }}" + } + ], + "post-processors": [ + { + "output": "builds/{{user `box_basename`}}.{{.Provider}}.box", + "type": "vagrant" + } + ], + "provisioners": [ + { + "destination": "/tmp/bento-metadata.json", + "source": "{{user `metadata`}}", + "type": "file" + }, + { + "environment_vars": [ + "HOME_DIR=/home/vagrant", + "http_proxy={{user `http_proxy`}}", + "https_proxy={{user `https_proxy`}}", + "no_proxy={{user `no_proxy`}}" + ], + "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", + "scripts": [ + "scripts/common/metadata.sh", + "scripts/debian/update.sh", + "scripts/common/sshd.sh", + "scripts/debian/networking.sh", + "scripts/debian/sudoers.sh", + "scripts/common/vagrant.sh", + "scripts/common/vmtools.sh", + "scripts/debian/cleanup.sh", + "scripts/common/minimize.sh" + ], + "type": "shell" + } + ], + "variables": { + "box_basename": "debian-8.4", + "build_timestamp": "{{isotime \"20060102150405\"}}", + "git_revision": "__unknown_git_revision__", + "headless": "", + "http_proxy": "{{env `http_proxy`}}", + "https_proxy": "{{env `https_proxy`}}", + "iso_checksum": "e0d23bf95a16984cef5c04aeb8b1c810a0df20327984963e71bbd6a5d95fb0ee", + "iso_checksum_type": "sha256", + "iso_name": "debian-8.4.0-amd64-CD-1.iso", + "metadata": "floppy/dummy_metadata.json", + "mirror": "http://cdimage.debian.org/cdimage/release", + "mirror_directory": "8.4.0/amd64/iso-cd", + "name": "debian-8.4", + "no_proxy": "{{env `no_proxy`}}", + "preseed_path": "debian-8/preseed.cfg", + "template": "debian-8.4-amd64", + "version": "2.1.TIMESTAMP" + } +} diff --git a/debian-8.4-i386.json b/debian-8.4-i386.json new file mode 100644 index 000000000..a2d8b8448 --- /dev/null +++ b/debian-8.4-i386.json @@ -0,0 +1,237 @@ +{ + "builders": [ + { + "boot_command": [ + "<esc><wait>", + "install <wait>", + " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}} <wait>", + "debian-installer=en_US <wait>", + "auto <wait>", + "locale=en_US <wait>", + "kbd-chooser/method=us <wait>", + "keyboard-configuration/xkb-keymap=us <wait>", + "netcfg/get_hostname={{ .Name }} <wait>", + "netcfg/get_domain=vagrantup.com <wait>", + "fb=false <wait>", + "debconf/frontend=noninteractive <wait>", + "console-setup/ask_detect=false <wait>", + "console-keymaps-at/keymap=us <wait>", + "grub-installer/bootdev=/dev/sda <wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "guest_os_type": "Debian", + "hard_drive_interface": "sata", + "headless": "{{ user `headless` }}", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-virtualbox", + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "virtualbox-iso", + "vboxmanage": [ + [ + "modifyvm", + "{{.Name}}", + "--memory", + "384" + ], + [ + "modifyvm", + "{{.Name}}", + "--cpus", + "1" + ] + ], + "virtualbox_version_file": ".vbox_version", + "vm_name": "{{ user `template` }}" + }, + { + "boot_command": [ + "<esc><wait>", + "install <wait>", + " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}} <wait>", + "debian-installer=en_US <wait>", + "auto <wait>", + "locale=en_US <wait>", + "kbd-chooser/method=us <wait>", + "keyboard-configuration/xkb-keymap=us <wait>", + "netcfg/get_hostname={{ .Name }} <wait>", + "netcfg/get_domain=vagrantup.com <wait>", + "fb=false <wait>", + "debconf/frontend=noninteractive <wait>", + "console-setup/ask_detect=false <wait>", + "console-keymaps-at/keymap=us <wait>", + "grub-installer/bootdev=/dev/sda <wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "guest_os_type": "debian8", + "headless": "{{ user `headless` }}", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-vmware", + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "tools_upload_flavor": "linux", + "type": "vmware-iso", + "vm_name": "{{ user `template` }}", + "vmx_data": { + "cpuid.coresPerSocket": "1", + "memsize": "384", + "numvcpus": "1" + } + }, + { + "boot_command": [ + "<esc><wait>", + "install <wait>", + " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}} <wait>", + "debian-installer=en_US <wait>", + "auto <wait>", + "locale=en_US <wait>", + "kbd-chooser/method=us <wait>", + "keyboard-configuration/xkb-keymap=us <wait>", + "netcfg/get_hostname={{ .Name }} <wait>", + "netcfg/get_domain=vagrantup.com <wait>", + "fb=false <wait>", + "debconf/frontend=noninteractive <wait>", + "console-setup/ask_detect=false <wait>", + "console-keymaps-at/keymap=us <wait>", + "grub-installer/bootdev=/dev/sda <wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "guest_os_type": "debian", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-parallels", + "parallels_tools_flavor": "lin", + "prlctl": [ + [ + "set", + "{{.Name}}", + "--memsize", + "384" + ], + [ + "set", + "{{.Name}}", + "--cpus", + "1" + ] + ], + "prlctl_version_file": ".prlctl_version", + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "parallels-iso", + "vm_name": "{{ user `template` }}" + }, + { + "boot_command": [ + "<esc><wait>", + "install <wait>", + " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}} <wait>", + "debian-installer=en_US <wait>", + "auto <wait>", + "locale=en_US <wait>", + "kbd-chooser/method=us <wait>", + "keyboard-configuration/xkb-keymap=us <wait>", + "netcfg/get_hostname={{ .Name }} <wait>", + "netcfg/get_domain=vagrantup.com <wait>", + "fb=false <wait>", + "debconf/frontend=noninteractive <wait>", + "console-setup/ask_detect=false <wait>", + "console-keymaps-at/keymap=us <wait>", + "grub-installer/bootdev=/dev/vda <wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-qemu", + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "qemu", + "vm_name": "{{ user `template` }}" + } + ], + "post-processors": [ + { + "output": "builds/{{user `box_basename`}}.{{.Provider}}.box", + "type": "vagrant" + } + ], + "provisioners": [ + { + "destination": "/tmp/bento-metadata.json", + "source": "{{user `metadata`}}", + "type": "file" + }, + { + "environment_vars": [ + "HOME_DIR=/home/vagrant", + "http_proxy={{user `http_proxy`}}", + "https_proxy={{user `https_proxy`}}", + "no_proxy={{user `no_proxy`}}" + ], + "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", + "scripts": [ + "scripts/common/metadata.sh", + "scripts/debian/update.sh", + "scripts/common/sshd.sh", + "scripts/debian/networking.sh", + "scripts/debian/sudoers.sh", + "scripts/common/vagrant.sh", + "scripts/common/vmtools.sh", + "scripts/debian/cleanup.sh", + "scripts/common/minimize.sh" + ], + "type": "shell" + } + ], + "variables": { + "box_basename": "debian-8.4-i386", + "build_timestamp": "{{isotime \"20060102150405\"}}", + "git_revision": "__unknown_git_revision__", + "headless": "", + "http_proxy": "{{env `http_proxy`}}", + "https_proxy": "{{env `https_proxy`}}", + "iso_checksum": "180d4ff9bbf956518df7171490d57f77a96d99d123141b48d423f3c5241e0a68", + "iso_checksum_type": "sha256", + "iso_name": "debian-8.4.0-i386-CD-1.iso", + "metadata": "floppy/dummy_metadata.json", + "mirror": "http://cdimage.debian.org/cdimage/release", + "mirror_directory": "8.4.0/i386/iso-cd", + "name": "debian-8.4-i386", + "no_proxy": "{{env `no_proxy`}}", + "preseed_path": "debian-8/preseed.cfg", + "template": "debian-8.4-i386", + "version": "2.1.TIMESTAMP" + } +} From 54a8d17103004d760e7799bb36ebe7465d470e4e Mon Sep 17 00:00:00 2001 From: "Marseglia. Mike" <mike.marseglia@hasbro.com> Date: Mon, 4 Apr 2016 09:28:58 -0400 Subject: [PATCH 0472/1622] Multiple fixes to build.sh according to shellcheck. Replace backticks with , doublequote strings. --- build.sh | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/build.sh b/build.sh index cdd25f85c..79a41278a 100644 --- a/build.sh +++ b/build.sh @@ -7,7 +7,7 @@ env source ~/.bashrc function inline_image { - printf '\033]1338;url='"$1"';alt='"$2"'\a\n' + printf '\033]1338;url='%s';alt='%s'\a\n' "$1" "$2" } inline_image 'https://oaxacaborn.files.wordpress.com/2012/02/clean-all-the-things-via-hyperbole-and-a-half.png' 'Clean All The Things' @@ -15,50 +15,50 @@ inline_image 'https://oaxacaborn.files.wordpress.com/2012/02/clean-all-the-thing echo "--- Cleaning up after VirtualBox" -for i in `vboxmanage list runningvms | awk '{print $1}' | sed 's/"//g'` +for i in $(vboxmanage list runningvms | awk '{print $1}' | sed 's/"//g') do echo "Powering off $i" - vboxmanage controlvm $i poweroff + vboxmanage controlvm "$i" poweroff done -for i in `vboxmanage list vms | awk '{print $1}' | sed 's/"//g'` +for i in $(vboxmanage list vms | awk '{print $1}' | sed 's/"//g') do echo "Unregistering $i" sleep 10 - vboxmanage unregistervm $i + vboxmanage unregistervm "$i" done -for i in `ls ~/VirtualBox\ VMs/` +for i in ~/VirtualBox\ VMs/* do echo "Removing $i" - rm -rf ~/VirtualBox\ VMs/$i + rm -rf ~/VirtualBox\ VMs/"$i" done echo "--- Cleaning up after Parallels" -for i in `prlctl list --no-header --output name` +for i in $(prlctl list --no-header --output name) do echo "Powering off $i" - prlctl stop $i --kill + prlctl stop "$i" --kill sleep 10 done -for i in `prlctl list --all --no-header --output uuid` +for i in $(prlctl list --all --no-header --output uuid) do echo "Unregistering $i" - prlctl unregister $i + prlctl unregister "$i" done echo "--- Cleaning up after Fusion" -for i in `vmrun list | grep -v "Total"` +for i in $(vmrun list | grep -v "Total") do echo "Stopping $i" - vmrun stop $i + vmrun stop "$i" sleep 10 echo "Deleting $i" - vmrun deleteVM $i + vmrun deleteVM "$i" done echo "--- Cleaning up after Packer" @@ -70,7 +70,7 @@ rake build_box[$PLATFORM] echo "--- Test $PLATFORM-$BENTO_PROVIDERS" rake test_all -if [ $BENTO_UPLOAD -eq 1 ] +if [ "$BENTO_UPLOAD" -eq 1 ] then echo "--- Upload Boxes to S3" rake upload_all_s3 From 11375c1573a4aaa6bdcf5ce785d268d253b56b5f Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Mon, 4 Apr 2016 12:21:05 -0700 Subject: [PATCH 0473/1622] Handle FreeBSD systems without any updates to install --- scripts/freebsd/update.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/freebsd/update.sh b/scripts/freebsd/update.sh index c98d0d163..5c17fcff6 100644 --- a/scripts/freebsd/update.sh +++ b/scripts/freebsd/update.sh @@ -18,9 +18,9 @@ else fi # Update FreeBSD -# NOTE: this will fail if there aren't any patches available for the release yet +# NOTE: the install action fails if there are no updates so || true it env PAGER=/bin/cat $freebsd_update fetch; -env PAGER=/bin/cat $freebsd_update install; +env PAGER=/bin/cat $freebsd_update install || true; # Always use pkgng - pkg_add is EOL as of 1 September 2014 env ASSUME_ALWAYS_YES=true pkg bootstrap; From e821a642c084159f6ed3c02bb2499188102a5ac9 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Mon, 4 Apr 2016 18:04:36 -0700 Subject: [PATCH 0474/1622] Rename the build_tools script since it's not just for Fedora 22 --- fedora-22-i386.json | 2 +- fedora-22-x86_64.json | 2 +- fedora-23-i386.json | 2 +- fedora-23-x86_64.json | 2 +- scripts/fedora/{22-build-tools.sh => build-tools.sh} | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) rename scripts/fedora/{22-build-tools.sh => build-tools.sh} (54%) diff --git a/fedora-22-i386.json b/fedora-22-i386.json index e6b0a1f96..f0a566a9a 100644 --- a/fedora-22-i386.json +++ b/fedora-22-i386.json @@ -141,7 +141,7 @@ "scripts/common/metadata.sh", "scripts/fedora/fix-slow-dns.sh", "scripts/common/sshd.sh", - "scripts/fedora/22-build-tools.sh", + "scripts/fedora/build-tools.sh", "scripts/common/vmtools.sh", "scripts/common/vagrant.sh", "scripts/fedora/cleanup.sh", diff --git a/fedora-22-x86_64.json b/fedora-22-x86_64.json index 865acff6a..6e3096f07 100644 --- a/fedora-22-x86_64.json +++ b/fedora-22-x86_64.json @@ -145,7 +145,7 @@ "scripts/common/metadata.sh", "scripts/fedora/fix-slow-dns.sh", "scripts/common/sshd.sh", - "scripts/fedora/22-build-tools.sh", + "scripts/fedora/build-tools.sh", "scripts/common/vmtools.sh", "scripts/common/vagrant.sh", "scripts/fedora/cleanup.sh", diff --git a/fedora-23-i386.json b/fedora-23-i386.json index 227d97d59..e48069b6d 100644 --- a/fedora-23-i386.json +++ b/fedora-23-i386.json @@ -141,7 +141,7 @@ "scripts/common/metadata.sh", "scripts/fedora/fix-slow-dns.sh", "scripts/common/sshd.sh", - "scripts/fedora/22-build-tools.sh", + "scripts/fedora/build-tools.sh", "scripts/common/vmtools.sh", "scripts/common/vagrant.sh", "scripts/fedora/cleanup.sh", diff --git a/fedora-23-x86_64.json b/fedora-23-x86_64.json index f6b2222e6..5ceb077dd 100644 --- a/fedora-23-x86_64.json +++ b/fedora-23-x86_64.json @@ -144,7 +144,7 @@ "scripts": [ "scripts/common/metadata.sh", "scripts/fedora/fix-slow-dns.sh", - "scripts/fedora/22-build-tools.sh", + "scripts/fedora/build-tools.sh", "scripts/common/sshd.sh", "scripts/common/vmtools.sh", "scripts/common/vagrant.sh", diff --git a/scripts/fedora/22-build-tools.sh b/scripts/fedora/build-tools.sh similarity index 54% rename from scripts/fedora/22-build-tools.sh rename to scripts/fedora/build-tools.sh index daec1c810..1a128e981 100644 --- a/scripts/fedora/22-build-tools.sh +++ b/scripts/fedora/build-tools.sh @@ -1,3 +1,3 @@ #!/bin/bash -eux -# Installing build tools here because Fedora 22 will not do so during kickstart +# Installing build tools here because Fedora 22+ will not do so during kickstart dnf -y install kernel-headers-$(uname -r) kernel-devel-$(uname -r) gcc make perl From 35b0c865aca94855f037dab8b19171cec3ec4038 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Mon, 4 Apr 2016 22:06:18 -0700 Subject: [PATCH 0475/1622] Use autopart on Fedora We're already doing this on RHEL 7. It produces the same output, but the vg is named fedora not vagrant and the swap is exactly a gig not a tiny bit over. --- http/fedora-22/ks.cfg | 7 +------ http/fedora-23/ks.cfg | 9 ++------- 2 files changed, 3 insertions(+), 13 deletions(-) diff --git a/http/fedora-22/ks.cfg b/http/fedora-22/ks.cfg index a07295510..fceea35a8 100644 --- a/http/fedora-22/ks.cfg +++ b/http/fedora-22/ks.cfg @@ -13,12 +13,7 @@ text skipx zerombr clearpart --all --initlabel -part /boot --fstype=ext4 --size=500 -part pv.2 --grow --size=500 -volgroup vg_vagrant --pesize=32768 pv.2 -logvol / --fstype=ext4 --name=lv_root --vgname=vg_vagrant --size=1024 --grow -logvol swap --fstype=swap --name=lv_swap --vgname=vg_vagrant --size=528 --grow --maxsize=1056 -bootloader --location=mbr --append="norhgb biosdevname=0" +autopart firstboot --disabled reboot user --name=vagrant --plaintext --password vagrant diff --git a/http/fedora-23/ks.cfg b/http/fedora-23/ks.cfg index 460fbc546..fceea35a8 100644 --- a/http/fedora-23/ks.cfg +++ b/http/fedora-23/ks.cfg @@ -13,12 +13,7 @@ text skipx zerombr clearpart --all --initlabel -part /boot --fstype=ext4 --size=500 -part pv.2 --grow --size=500 -volgroup vg_vagrant --pesize=32768 pv.2 -logvol / --fstype=ext4 --name=lv_root --vgname=vg_vagrant --size=1024 --grow -logvol swap --fstype=swap --name=lv_swap --vgname=vg_vagrant --size=528 --grow --maxsize=1056 -bootloader --location=mbr --append="norhgb biosdevname=0" +autopart firstboot --disabled reboot user --name=vagrant --plaintext --password vagrant @@ -26,7 +21,7 @@ user --name=vagrant --plaintext --password vagrant %packages --ignoremissing --excludedocs bzip2 # GCC won't install during kickstart -#gcc +# gcc kernel-devel kernel-headers tar From 5022ea6d8e7d60ac0ed88682e5c09297062d2101 Mon Sep 17 00:00:00 2001 From: HAYASHI Kentaro <hayashi@clear-code.com> Date: Fri, 8 Apr 2016 21:13:00 +0900 Subject: [PATCH 0476/1622] Add support for Debian GNU/Linux 7.10 Debian 7.10 has been released. https://www.debian.org/News/2016/2016040202 --- debian-7.10-amd64.json | 233 +++++++++++++++++++++++++++++++++++++++++ debian-7.10-i386.json | 233 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 466 insertions(+) create mode 100644 debian-7.10-amd64.json create mode 100644 debian-7.10-i386.json diff --git a/debian-7.10-amd64.json b/debian-7.10-amd64.json new file mode 100644 index 000000000..054735fa6 --- /dev/null +++ b/debian-7.10-amd64.json @@ -0,0 +1,233 @@ +{ + "builders": [ + { + "boot_command": [ + "<esc><wait>", + "install <wait>", + " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}} <wait>", + "debian-installer=en_US <wait>", + "auto <wait>", + "locale=en_US <wait>", + "kbd-chooser/method=us <wait>", + "keyboard-configuration/xkb-keymap=us <wait>", + "netcfg/get_hostname={{ .Name }} <wait>", + "netcfg/get_domain=vagrantup.com <wait>", + "fb=false <wait>", + "debconf/frontend=noninteractive <wait>", + "console-setup/ask_detect=false <wait>", + "console-keymaps-at/keymap=us <wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "guest_os_type": "Debian_64", + "hard_drive_interface": "sata", + "headless": "{{ user `headless` }}", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-virtualbox", + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "virtualbox-iso", + "vboxmanage": [ + [ + "modifyvm", + "{{.Name}}", + "--memory", + "384" + ], + [ + "modifyvm", + "{{.Name}}", + "--cpus", + "1" + ] + ], + "virtualbox_version_file": ".vbox_version", + "vm_name": "{{ user `template` }}" + }, + { + "boot_command": [ + "<esc><wait>", + "install <wait>", + " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}} <wait>", + "debian-installer=en_US <wait>", + "auto <wait>", + "locale=en_US <wait>", + "kbd-chooser/method=us <wait>", + "keyboard-configuration/xkb-keymap=us <wait>", + "netcfg/get_hostname={{ .Name }} <wait>", + "netcfg/get_domain=vagrantup.com <wait>", + "fb=false <wait>", + "debconf/frontend=noninteractive <wait>", + "console-setup/ask_detect=false <wait>", + "console-keymaps-at/keymap=us <wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "guest_os_type": "debian7-64", + "headless": "{{ user `headless` }}", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-vmware", + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "tools_upload_flavor": "linux", + "type": "vmware-iso", + "vm_name": "{{ user `template` }}", + "vmx_data": { + "cpuid.coresPerSocket": "1", + "memsize": "384", + "numvcpus": "1" + } + }, + { + "boot_command": [ + "<esc><wait>", + "install <wait>", + " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}} <wait>", + "debian-installer=en_US <wait>", + "auto <wait>", + "locale=en_US <wait>", + "kbd-chooser/method=us <wait>", + "keyboard-configuration/xkb-keymap=us <wait>", + "netcfg/get_hostname={{ .Name }} <wait>", + "netcfg/get_domain=vagrantup.com <wait>", + "fb=false <wait>", + "debconf/frontend=noninteractive <wait>", + "console-setup/ask_detect=false <wait>", + "console-keymaps-at/keymap=us <wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "guest_os_type": "debian", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-parallels", + "parallels_tools_flavor": "lin", + "prlctl": [ + [ + "set", + "{{.Name}}", + "--memsize", + "384" + ], + [ + "set", + "{{.Name}}", + "--cpus", + "1" + ] + ], + "prlctl_version_file": ".prlctl_version", + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "parallels-iso", + "vm_name": "{{ user `template` }}" + }, + { + "boot_command": [ + "<esc><wait>", + "install <wait>", + "preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/debian-7/preseed.cfg <wait>", + "debian-installer=en_US <wait>", + "auto <wait>", + "locale=en_US <wait>", + "kbd-chooser/method=us <wait>", + "keyboard-configuration/xkb-keymap=us <wait>", + "netcfg/get_hostname={{ .Name }} <wait>", + "netcfg/get_domain=vagrantup.com <wait>", + "fb=false <wait>", + "debconf/frontend=noninteractive <wait>", + "console-setup/ask_detect=false <wait>", + "console-keymaps-at/keymap=us <wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-qemu", + "ssh_username": "vagrant", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_wait_timeout": "10000s", + "shutdown_command": "echo 'vagrant'|sudo -S /sbin/shutdown -hP now", + "type": "qemu", + "vm_name": "{{ user `template` }}" + } + ], + "post-processors": [ + { + "output": "builds/{{user `box_basename`}}.{{.Provider}}.box", + "type": "vagrant" + } + ], + "provisioners": [ + { + "destination": "/tmp/bento-metadata.json", + "source": "{{user `metadata`}}", + "type": "file" + }, + { + "environment_vars": [ + "HOME_DIR=/home/vagrant", + "http_proxy={{user `http_proxy`}}", + "https_proxy={{user `https_proxy`}}", + "no_proxy={{user `no_proxy`}}" + ], + "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", + "scripts": [ + "scripts/common/metadata.sh", + "scripts/debian/update.sh", + "scripts/common/sshd.sh", + "scripts/debian/networking.sh", + "scripts/debian/sudoers.sh", + "scripts/common/vagrant.sh", + "scripts/common/vmtools.sh", + "scripts/debian/cleanup.sh", + "scripts/common/minimize.sh" + ], + "type": "shell" + } + ], + "variables": { + "box_basename": "debian-7.10", + "build_timestamp": "{{isotime \"20060102150405\"}}", + "git_revision": "__unknown_git_revision__", + "headless": "", + "http_proxy": "{{env `http_proxy`}}", + "https_proxy": "{{env `https_proxy`}}", + "iso_checksum": "cc594c96126d39e33e83ba083c4bd61471ffd95bc1a0b5334ac58dec7a17a5f7", + "iso_checksum_type": "sha256", + "iso_name": "debian-7.10.0-amd64-CD-1.iso", + "metadata": "floppy/dummy_metadata.json", + "mirror": "http://cdimage.debian.org/cdimage/archive", + "mirror_directory": "7.10.0/amd64/iso-cd", + "name": "debian-7.10", + "no_proxy": "{{env `no_proxy`}}", + "preseed_path": "debian-7/preseed.cfg", + "template": "debian-7.10-amd64", + "version": "2.1.TIMESTAMP" + } +} diff --git a/debian-7.10-i386.json b/debian-7.10-i386.json new file mode 100644 index 000000000..534f5f881 --- /dev/null +++ b/debian-7.10-i386.json @@ -0,0 +1,233 @@ +{ + "builders": [ + { + "boot_command": [ + "<esc><wait>", + "install <wait>", + " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}} <wait>", + "debian-installer=en_US <wait>", + "auto <wait>", + "locale=en_US <wait>", + "kbd-chooser/method=us <wait>", + "keyboard-configuration/xkb-keymap=us <wait>", + "netcfg/get_hostname={{ .Name }} <wait>", + "netcfg/get_domain=vagrantup.com <wait>", + "fb=false <wait>", + "debconf/frontend=noninteractive <wait>", + "console-setup/ask_detect=false <wait>", + "console-keymaps-at/keymap=us <wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "guest_os_type": "Debian", + "hard_drive_interface": "sata", + "headless": "{{ user `headless` }}", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-virtualbox", + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "virtualbox-iso", + "vboxmanage": [ + [ + "modifyvm", + "{{.Name}}", + "--memory", + "384" + ], + [ + "modifyvm", + "{{.Name}}", + "--cpus", + "1" + ] + ], + "virtualbox_version_file": ".vbox_version", + "vm_name": "{{ user `template` }}" + }, + { + "boot_command": [ + "<esc><wait>", + "install <wait>", + " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}} <wait>", + "debian-installer=en_US <wait>", + "auto <wait>", + "locale=en_US <wait>", + "kbd-chooser/method=us <wait>", + "keyboard-configuration/xkb-keymap=us <wait>", + "netcfg/get_hostname={{ .Name }} <wait>", + "netcfg/get_domain=vagrantup.com <wait>", + "fb=false <wait>", + "debconf/frontend=noninteractive <wait>", + "console-setup/ask_detect=false <wait>", + "console-keymaps-at/keymap=us <wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "guest_os_type": "debian7", + "headless": "{{ user `headless` }}", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-vmware", + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "tools_upload_flavor": "linux", + "type": "vmware-iso", + "vm_name": "{{ user `template` }}", + "vmx_data": { + "cpuid.coresPerSocket": "1", + "memsize": "384", + "numvcpus": "1" + } + }, + { + "boot_command": [ + "<esc><wait>", + "install <wait>", + " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}} <wait>", + "debian-installer=en_US <wait>", + "auto <wait>", + "locale=en_US <wait>", + "kbd-chooser/method=us <wait>", + "keyboard-configuration/xkb-keymap=us <wait>", + "netcfg/get_hostname={{ .Name }} <wait>", + "netcfg/get_domain=vagrantup.com <wait>", + "fb=false <wait>", + "debconf/frontend=noninteractive <wait>", + "console-setup/ask_detect=false <wait>", + "console-keymaps-at/keymap=us <wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "guest_os_type": "debian", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-parallels", + "parallels_tools_flavor": "lin", + "prlctl": [ + [ + "set", + "{{.Name}}", + "--memsize", + "384" + ], + [ + "set", + "{{.Name}}", + "--cpus", + "1" + ] + ], + "prlctl_version_file": ".prlctl_version", + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "parallels-iso", + "vm_name": "{{ user `template` }}" + }, + { + "boot_command": [ + "<esc><wait>", + "install <wait>", + "preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/debian-7/preseed.cfg <wait>", + "debian-installer=en_US <wait>", + "auto <wait>", + "locale=en_US <wait>", + "kbd-chooser/method=us <wait>", + "keyboard-configuration/xkb-keymap=us <wait>", + "netcfg/get_hostname={{ .Name }} <wait>", + "netcfg/get_domain=vagrantup.com <wait>", + "fb=false <wait>", + "debconf/frontend=noninteractive <wait>", + "console-setup/ask_detect=false <wait>", + "console-keymaps-at/keymap=us <wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 40960, + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-qemu", + "ssh_username": "vagrant", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_wait_timeout": "10000s", + "shutdown_command": "echo 'vagrant'|sudo -S /sbin/shutdown -hP now", + "type": "qemu", + "vm_name": "{{ user `template` }}" + } + ], + "post-processors": [ + { + "output": "builds/{{user `box_basename`}}.{{.Provider}}.box", + "type": "vagrant" + } + ], + "provisioners": [ + { + "destination": "/tmp/bento-metadata.json", + "source": "{{user `metadata`}}", + "type": "file" + }, + { + "environment_vars": [ + "HOME_DIR=/home/vagrant", + "http_proxy={{user `http_proxy`}}", + "https_proxy={{user `https_proxy`}}", + "no_proxy={{user `no_proxy`}}" + ], + "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", + "scripts": [ + "scripts/common/metadata.sh", + "scripts/debian/update.sh", + "scripts/common/sshd.sh", + "scripts/debian/networking.sh", + "scripts/debian/sudoers.sh", + "scripts/common/vagrant.sh", + "scripts/common/vmtools.sh", + "scripts/debian/cleanup.sh", + "scripts/common/minimize.sh" + ], + "type": "shell" + } + ], + "variables": { + "box_basename": "debian-7.10-i386", + "build_timestamp": "{{isotime \"20060102150405\"}}", + "git_revision": "__unknown_git_revision__", + "headless": "", + "http_proxy": "{{env `http_proxy`}}", + "https_proxy": "{{env `https_proxy`}}", + "iso_checksum": "34f496893f7951cc3a35704f5776d652266595116937d46ba2562b1ed25eb4b0", + "iso_checksum_type": "sha256", + "iso_name": "debian-7.10.0-i386-CD-1.iso", + "metadata": "floppy/dummy_metadata.json", + "mirror": "http://cdimage.debian.org/cdimage/archive", + "mirror_directory": "7.10.0/i386/iso-cd", + "name": "debian-7.10-i386", + "no_proxy": "{{env `no_proxy`}}", + "preseed_path": "debian-7/preseed.cfg", + "template": "debian-7.10-i386", + "version": "2.1.TIMESTAMP" + } +} From 480760b54858616a74a15b9710ed893b78433cae Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Mon, 18 Apr 2016 17:12:53 -0700 Subject: [PATCH 0477/1622] Add new omios box for r151018 --- omnios-r151018.json | 235 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 235 insertions(+) create mode 100644 omnios-r151018.json diff --git a/omnios-r151018.json b/omnios-r151018.json new file mode 100644 index 000000000..7e9aee95b --- /dev/null +++ b/omnios-r151018.json @@ -0,0 +1,235 @@ +{ + "builders": [ + { + "boot_command": [ + "<enter><wait10><wait5>", + "1<enter><wait10>", + "<wait10>", + "<f2><wait>", + "<f2><wait>", + "<f2><wait>", + "<bs><bs><bs><bs><bs><bs><bs>omnios-vagrant", + "<f2><wait>", + "<f2><wait>", + "<f2><wait>", + "<wait10><wait10><wait10><wait10><wait10><wait10>", + "<wait10><wait10><wait10><wait10><wait10><wait10>", + "<wait10><wait10><wait10><wait10><wait10><wait10>", + "<wait10><wait10><wait10><wait10><wait10><wait10>", + "<f8><wait>", + "<wait10><wait10><wait10><wait10><wait10><wait10>", + "<wait10><wait10><wait10><wait10><wait10><wait10>", + "root<enter><wait><enter><wait5>", + "passwd<enter><wait>", + "vagrant<enter><wait>", + "vagrant<enter><wait>", + "ipadm create-if e1000g0<enter><wait>", + "ipadm create-addr -T dhcp e1000g0/v4<enter><wait>", + "echo 'nameserver 8.8.8.8' > /etc/resolv.conf<enter><wait>", + "cp /etc/nsswitch.dns /etc/nsswitch.conf<enter><wait>", + "sed -i -e 's/PermitRootLogin no/PermitRootLogin yes/' /etc/ssh/sshd_config<enter><wait>", + "svcadm restart ssh<enter><wait>" + ], + "boot_wait": "30s", + "disk_size": 40960, + "guest_os_type": "OpenSolaris_64", + "headless": "{{ user `headless` }}", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-virtualbox", + "shutdown_command": "/usr/sbin/shutdown -g 0 -y -i 5", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "root", + "type": "virtualbox-iso", + "vboxmanage": [ + [ + "modifyvm", + "{{.Name}}", + "--memory", + "1024" + ], + [ + "modifyvm", + "{{.Name}}", + "--cpus", + "1" + ] + ], + "virtualbox_version_file": ".vbox_version", + "vm_name": "{{ user `template` }}" + }, + { + "boot_command": [ + "<enter><wait10><wait5>", + "1<enter><wait10>", + "<wait10>", + "<f2><wait10>", + "<wait10><wait10><wait10><wait10><wait10><wait10>", + "<wait10><wait10><wait10><wait10><wait10><wait10>", + "<f2><wait>", + "<f2><wait>", + "<bs><bs><bs><bs><bs><bs><bs>omnios-vagrant", + "<f2><wait>", + "<f2><wait>", + "<f2><wait>", + "<wait10><wait10><wait10><wait10><wait10><wait10>", + "<wait10><wait10><wait10><wait10><wait10><wait10>", + "<wait10><wait10><wait10><wait10><wait10><wait10>", + "<wait10><wait10><wait10><wait10><wait10><wait10>", + "<f8><wait>", + "<wait10><wait10><wait10><wait10><wait10><wait10>", + "<wait10><wait10><wait10><wait10><wait10><wait10>", + "root<enter><wait><enter><wait5>", + "passwd<enter><wait>", + "vagrant<enter><wait>", + "vagrant<enter><wait>", + "ipadm create-if e1000g0<enter><wait>", + "ipadm create-addr -T dhcp e1000g0/v4<enter><wait>", + "echo 'nameserver 8.8.8.8' > /etc/resolv.conf<enter><wait>", + "cp /etc/nsswitch.dns /etc/nsswitch.conf<enter><wait>", + "sed -i -e 's/PermitRootLogin no/PermitRootLogin yes/' /etc/ssh/sshd_config<enter><wait>", + "svcadm restart ssh<enter><wait>" + ], + "boot_wait": "30s", + "disk_size": 40960, + "floppy_files": [ + "floppy/omnios/README.TXT" + ], + "guest_os_type": "solaris11-64", + "headless": "{{ user `headless` }}", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-vmware", + "shutdown_command": "/usr/sbin/shutdown -g 0 -y -i 5", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "root", + "tools_upload_flavor": "solaris", + "type": "vmware-iso", + "vm_name": "{{ user `template` }}", + "vmx_data": { + "cpuid.coresPerSocket": "1", + "memsize": "1024", + "numvcpus": "1" + } + }, + { + "boot_command": [ + "<enter><wait10><wait5>", + "1<enter><wait10>", + "<wait10>", + "<f2><wait10>", + "<wait10><wait10><wait10><wait10><wait10><wait10>", + "<wait10><wait10><wait10><wait10><wait10><wait10>", + "<f2><wait>", + "<f2><wait>", + "<bs><bs><bs><bs><bs><bs><bs>omnios-vagrant", + "<f2><wait>", + "<f2><wait>", + "<f2><wait>", + "<wait10><wait10><wait10><wait10><wait10><wait10>", + "<wait10><wait10><wait10><wait10><wait10><wait10>", + "<wait10><wait10><wait10><wait10><wait10><wait10>", + "<wait10><wait10><wait10><wait10><wait10><wait10>", + "<f8><wait>", + "<wait10><wait10><wait10><wait10><wait10><wait10>", + "<wait10><wait10><wait10><wait10><wait10><wait10>", + "root<enter><wait><enter><wait5>", + "passwd<enter><wait>", + "vagrant<enter><wait>", + "vagrant<enter><wait>", + "ipadm create-if e1000g0<enter><wait>", + "ipadm create-addr -T dhcp e1000g0/v4<enter><wait>", + "echo 'nameserver 8.8.8.8' > /etc/resolv.conf<enter><wait>", + "cp /etc/nsswitch.dns /etc/nsswitch.conf<enter><wait>", + "sed -i -e 's/PermitRootLogin no/PermitRootLogin yes/' /etc/ssh/sshd_config<enter><wait>", + "svcadm restart ssh<enter><wait>" + ], + "boot_wait": "30s", + "disk_size": 40960, + "guest_os_type": "opensolaris", + "hard_drive_interface": "ide", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-parallels", + "parallels_tools_mode": "disable", + "prlctl": [ + [ + "set", + "{{.Name}}", + "--memsize", + "1024" + ], + [ + "set", + "{{.Name}}", + "--cpus", + "1" + ] + ], + "shutdown_command": "/usr/sbin/shutdown -g 0 -y -i 5", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "root", + "type": "parallels-iso", + "vm_name": "{{ user `template` }}" + } + ], + "post-processors": [ + { + "compression_level": 9, + "output": "builds/{{user `box_basename`}}.{{.Provider}}.box", + "override": { + "parallels": { + "vagrantfile_template": "vagrantfile_templates/parallels/omnios.rb" + } + }, + "type": "vagrant" + } + ], + "provisioners": [ + { + "destination": "/tmp/bento-metadata.json", + "source": "{{user `metadata`}}", + "type": "file" + }, + { + "environment_vars": [ + "HOME_DIR=/home/vagrant", + "http_proxy={{user `http_proxy`}}", + "https_proxy={{user `https_proxy`}}", + "no_proxy={{user `no_proxy`}}" + ], + "execute_command": "export {{.Vars}} && sh '{{.Path}}'", + "scripts": [ + "scripts/common/metadata.sh", + "scripts/omnios/vmtools.sh", + "scripts/omnios/postinstall.sh" + ], + "type": "shell" + } + ], + "variables": { + "arch": "64", + "box_basename": "omnios-r151018", + "build_timestamp": "{{isotime \"20060102150405\"}}", + "git_revision": "__unknown_git_revision__", + "headless": "", + "http_proxy": "{{env `http_proxy`}}", + "https_proxy": "{{env `https_proxy`}}", + "iso_checksum": "562f0e35010717c43169bb2dc15169ec08c62bbf", + "iso_checksum_type": "sha1", + "iso_name": "OmniOS_Text_r151018.iso", + "metadata": "floppy/dummy_metadata.json", + "mirror": "http://omnios.omniti.com", + "mirror_directory": "media", + "name": "omnios-r151018", + "no_proxy": "{{env `no_proxy`}}", + "template": "omnios-r151018", + "version": "2.2.TIMESTAMP" + } +} From 284f214a48e9b23bb157ad49af2d8bfc45f438c6 Mon Sep 17 00:00:00 2001 From: Roland Moriz <roland@moriz.de> Date: Tue, 19 Apr 2016 19:34:01 +0200 Subject: [PATCH 0478/1622] vmware: tie network device to pci slot 32, see #554 --- README.md | 15 +++++++++++++++ debian-8.4-amd64.json | 1 + debian-8.4-i386.json | 1 + ubuntu-15.10-amd64.json | 1 + ubuntu-15.10-i386.json | 1 + 5 files changed, 19 insertions(+) diff --git a/README.md b/README.md index 331d1c226..65d2b85fa 100644 --- a/README.md +++ b/README.md @@ -64,6 +64,21 @@ Once test-kitchen changes defaults the S3 buckets will no longer be updated. * Parallels: 11.1.3 +#### VMWare Fusion 8, Packer, systemd + +Recent Linux distributions use [systemd's logic to predictably name network devices](https://www.freedesktop.org/wiki/Software/systemd/PredictableNetworkInterfaceNames/). In our scenario, this is tied to the PCI slot +id. For unknown reasons, boxes built with [the default vmx config provided by packer](https://github.com/mitchellh/packer/blob/e868f9b69c995cf8a681847aa67e9be286243630/builder/vmware/iso/step_create_vmx.go#L167) use a different +PCI slot id (32 instead of 33) once they got imported to VMWare Fusion 8, which results in a different device name and finally in broken +networking. This issue is documented in the following places: + +- https://github.com/chef/bento/issues/554 +- https://github.com/chef/bento/pull/545#issuecomment-202988690 +- https://github.com/mitchellh/vagrant/issues/4590 + +As a workaround we've started to provide the changed PCI slot id as a custom value with the packer definitions with Ubuntu 15.10+ and Debian 8.4+. +However this is not yet tested, may not solve the issue and/or break compatibility with other VMWare +products/versions! + ## Older Boxes Older boxes include Chef and therefore are not compatible with some diff --git a/debian-8.4-amd64.json b/debian-8.4-amd64.json index 36985657b..e43810188 100644 --- a/debian-8.4-amd64.json +++ b/debian-8.4-amd64.json @@ -91,6 +91,7 @@ "vm_name": "{{ user `template` }}", "vmx_data": { "cpuid.coresPerSocket": "1", + "ethernet0.pciSlotNumber": "32", "memsize": "384", "numvcpus": "1" } diff --git a/debian-8.4-i386.json b/debian-8.4-i386.json index a2d8b8448..01e8a65c5 100644 --- a/debian-8.4-i386.json +++ b/debian-8.4-i386.json @@ -91,6 +91,7 @@ "vm_name": "{{ user `template` }}", "vmx_data": { "cpuid.coresPerSocket": "1", + "ethernet0.pciSlotNumber": "32", "memsize": "384", "numvcpus": "1" } diff --git a/ubuntu-15.10-amd64.json b/ubuntu-15.10-amd64.json index 69f863ab3..26f771824 100644 --- a/ubuntu-15.10-amd64.json +++ b/ubuntu-15.10-amd64.json @@ -107,6 +107,7 @@ "vm_name": "{{ user `template` }}", "vmx_data": { "cpuid.coresPerSocket": "1", + "ethernet0.pciSlotNumber": "32", "memsize": "384", "numvcpus": "1" } diff --git a/ubuntu-15.10-i386.json b/ubuntu-15.10-i386.json index 659f9ba46..4b9cf91b7 100644 --- a/ubuntu-15.10-i386.json +++ b/ubuntu-15.10-i386.json @@ -107,6 +107,7 @@ "vm_name": "{{ user `template` }}", "vmx_data": { "cpuid.coresPerSocket": "1", + "ethernet0.pciSlotNumber": "32", "memsize": "384", "numvcpus": "1" } From c6f8869f74e6d61328f355df28819463ab1262aa Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Sat, 23 Apr 2016 10:03:56 -0700 Subject: [PATCH 0479/1622] Update omnios ISO SHAs OmniOS re-released the ISOs with fixes, but maintained the same release numbers so the SHAs need to get updated. These are straight from their site and confirmed to be valid locally. --- omnios-r151014.json | 2 +- omnios-r151018.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/omnios-r151014.json b/omnios-r151014.json index 98daca07f..36ca27d92 100644 --- a/omnios-r151014.json +++ b/omnios-r151014.json @@ -221,7 +221,7 @@ "headless": "", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", - "iso_checksum": "c2cdcb6e7a51a119fc73528e3c3c24c9ef146185", + "iso_checksum": "16fd303c81521db72fe6b0b5e891cffb5f9caa60", "iso_checksum_type": "sha1", "iso_name": "OmniOS_Text_r151014.iso", "metadata": "floppy/dummy_metadata.json", diff --git a/omnios-r151018.json b/omnios-r151018.json index 7e9aee95b..e95122879 100644 --- a/omnios-r151018.json +++ b/omnios-r151018.json @@ -221,7 +221,7 @@ "headless": "", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", - "iso_checksum": "562f0e35010717c43169bb2dc15169ec08c62bbf", + "iso_checksum": "5378cfdf9c7197c886231eb622bd9b19de597dba", "iso_checksum_type": "sha1", "iso_name": "OmniOS_Text_r151018.iso", "metadata": "floppy/dummy_metadata.json", From 1b72a5741486835589945e2c93030d3135477739 Mon Sep 17 00:00:00 2001 From: "J. Matt Peterson" <jmatt@jmatt.org> Date: Sun, 24 Apr 2016 17:13:50 -0700 Subject: [PATCH 0480/1622] Add the headless option for QEMU builders. #567 Add the existing headless option, ``"{{user `headless`}}"``, to QEMU builders. --- centos-5.11-i386.json | 1 + centos-5.11-x86_64.json | 1 + centos-6.7-i386.json | 1 + centos-6.7-x86_64.json | 1 + centos-7.2-x86_64.json | 1 + debian-6.0.10-amd64.json | 1 + debian-6.0.10-i386.json | 1 + debian-7.10-amd64.json | 1 + debian-7.10-i386.json | 1 + debian-7.8-amd64.json | 1 + debian-7.8-i386.json | 1 + debian-7.9-amd64.json | 1 + debian-7.9-i386.json | 1 + debian-8.1-amd64.json | 1 + debian-8.1-i386.json | 1 + debian-8.2-amd64.json | 1 + debian-8.2-i386.json | 1 + debian-8.3-amd64.json | 1 + debian-8.3-i386.json | 1 + debian-8.4-amd64.json | 1 + debian-8.4-i386.json | 1 + fedora-20-i386.json | 1 + fedora-20-x86_64.json | 1 + fedora-21-i386.json | 1 + fedora-21-x86_64.json | 1 + fedora-22-i386.json | 1 + fedora-22-x86_64.json | 1 + fedora-23-i386.json | 1 + fedora-23-x86_64.json | 1 + freebsd-10.2-amd64.json | 1 + freebsd-10.2-i386.json | 1 + freebsd-10.3-amd64.json | 1 + freebsd-10.3-i386.json | 1 + freebsd-9.3-amd64.json | 1 + freebsd-9.3-i386.json | 1 + opensuse-13.2-i386.json | 1 + opensuse-13.2-x86_64.json | 1 + opensuse-leap-42.1-x86_64.json | 1 + oracle-5.11-i386.json | 1 + oracle-5.11-x86_64.json | 1 + oracle-6.6-i386.json | 1 + oracle-6.6-x86_64.json | 1 + oracle-6.7-i386.json | 1 + oracle-6.7-x86_64.json | 1 + oracle-7.2-x86_64.json | 1 + rhel-5.11-i386.json | 1 + rhel-5.11-x86_64.json | 1 + rhel-6.6-i386.json | 1 + rhel-6.6-x86_64.json | 1 + rhel-6.7-i386.json | 1 + rhel-6.7-x86_64.json | 1 + rhel-7.2-x86_64.json | 1 + sles-11-sp2-i386.json | 1 + sles-11-sp2-x86_64.json | 1 + sles-11-sp3-i386.json | 1 + sles-11-sp3-x86_64.json | 1 + sles-11-sp4-i386.json | 1 + sles-11-sp4-x86_64.json | 1 + sles-12-x86_64.json | 1 + ubuntu-10.04-amd64.json | 1 + ubuntu-10.04-i386.json | 1 + ubuntu-12.04-amd64.json | 1 + ubuntu-12.04-i386.json | 1 + ubuntu-14.04-amd64.json | 1 + ubuntu-14.04-i386.json | 1 + ubuntu-14.10-amd64.json | 1 + ubuntu-14.10-i386.json | 1 + ubuntu-15.04-amd64.json | 1 + ubuntu-15.04-i386.json | 1 + ubuntu-15.10-amd64.json | 1 + ubuntu-15.10-i386.json | 1 + 71 files changed, 71 insertions(+) diff --git a/centos-5.11-i386.json b/centos-5.11-i386.json index cf95fabce..43946e1b6 100644 --- a/centos-5.11-i386.json +++ b/centos-5.11-i386.json @@ -107,6 +107,7 @@ ], "boot_wait": "10s", "disk_size": 40960, + "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", diff --git a/centos-5.11-x86_64.json b/centos-5.11-x86_64.json index 6b69da25d..b463876cf 100644 --- a/centos-5.11-x86_64.json +++ b/centos-5.11-x86_64.json @@ -107,6 +107,7 @@ ], "boot_wait": "10s", "disk_size": 40960, + "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", diff --git a/centos-6.7-i386.json b/centos-6.7-i386.json index db6ab162a..bb33a422f 100644 --- a/centos-6.7-i386.json +++ b/centos-6.7-i386.json @@ -107,6 +107,7 @@ ], "boot_wait": "10s", "disk_size": 40960, + "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", diff --git a/centos-6.7-x86_64.json b/centos-6.7-x86_64.json index 3384f47e6..fac997e9c 100644 --- a/centos-6.7-x86_64.json +++ b/centos-6.7-x86_64.json @@ -107,6 +107,7 @@ ], "boot_wait": "10s", "disk_size": 40960, + "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", diff --git a/centos-7.2-x86_64.json b/centos-7.2-x86_64.json index 2709c9c8f..be498bba8 100644 --- a/centos-7.2-x86_64.json +++ b/centos-7.2-x86_64.json @@ -107,6 +107,7 @@ ], "boot_wait": "10s", "disk_size": 40960, + "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", diff --git a/debian-6.0.10-amd64.json b/debian-6.0.10-amd64.json index 3d335a96c..7ca42560e 100644 --- a/debian-6.0.10-amd64.json +++ b/debian-6.0.10-amd64.json @@ -163,6 +163,7 @@ ], "boot_wait": "10s", "disk_size": 40960, + "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", diff --git a/debian-6.0.10-i386.json b/debian-6.0.10-i386.json index 0cc9c2a97..90e971a29 100644 --- a/debian-6.0.10-i386.json +++ b/debian-6.0.10-i386.json @@ -163,6 +163,7 @@ ], "boot_wait": "10s", "disk_size": 40960, + "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", diff --git a/debian-7.10-amd64.json b/debian-7.10-amd64.json index 054735fa6..4f0b0712b 100644 --- a/debian-7.10-amd64.json +++ b/debian-7.10-amd64.json @@ -163,6 +163,7 @@ ], "boot_wait": "10s", "disk_size": 40960, + "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", diff --git a/debian-7.10-i386.json b/debian-7.10-i386.json index 534f5f881..d4b1f5331 100644 --- a/debian-7.10-i386.json +++ b/debian-7.10-i386.json @@ -163,6 +163,7 @@ ], "boot_wait": "10s", "disk_size": 40960, + "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", diff --git a/debian-7.8-amd64.json b/debian-7.8-amd64.json index 8579fe577..b199dd258 100644 --- a/debian-7.8-amd64.json +++ b/debian-7.8-amd64.json @@ -163,6 +163,7 @@ ], "boot_wait": "10s", "disk_size": 40960, + "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", diff --git a/debian-7.8-i386.json b/debian-7.8-i386.json index 59a09da38..f39b7163d 100644 --- a/debian-7.8-i386.json +++ b/debian-7.8-i386.json @@ -163,6 +163,7 @@ ], "boot_wait": "10s", "disk_size": 40960, + "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", diff --git a/debian-7.9-amd64.json b/debian-7.9-amd64.json index d764ca3fe..70b0219a5 100644 --- a/debian-7.9-amd64.json +++ b/debian-7.9-amd64.json @@ -163,6 +163,7 @@ ], "boot_wait": "10s", "disk_size": 40960, + "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", diff --git a/debian-7.9-i386.json b/debian-7.9-i386.json index 7eb2b351d..2b36fb949 100644 --- a/debian-7.9-i386.json +++ b/debian-7.9-i386.json @@ -163,6 +163,7 @@ ], "boot_wait": "10s", "disk_size": 40960, + "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", diff --git a/debian-8.1-amd64.json b/debian-8.1-amd64.json index afd8e28f8..0973637ea 100644 --- a/debian-8.1-amd64.json +++ b/debian-8.1-amd64.json @@ -167,6 +167,7 @@ ], "boot_wait": "10s", "disk_size": 40960, + "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", diff --git a/debian-8.1-i386.json b/debian-8.1-i386.json index 80d0243f2..0461cca14 100644 --- a/debian-8.1-i386.json +++ b/debian-8.1-i386.json @@ -167,6 +167,7 @@ ], "boot_wait": "10s", "disk_size": 40960, + "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", diff --git a/debian-8.2-amd64.json b/debian-8.2-amd64.json index 9d272ae2b..87c18f549 100644 --- a/debian-8.2-amd64.json +++ b/debian-8.2-amd64.json @@ -167,6 +167,7 @@ ], "boot_wait": "10s", "disk_size": 40960, + "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", diff --git a/debian-8.2-i386.json b/debian-8.2-i386.json index eb4940a7b..5a690d5d0 100644 --- a/debian-8.2-i386.json +++ b/debian-8.2-i386.json @@ -167,6 +167,7 @@ ], "boot_wait": "10s", "disk_size": 40960, + "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", diff --git a/debian-8.3-amd64.json b/debian-8.3-amd64.json index 5e781ce36..ca40e5b0f 100644 --- a/debian-8.3-amd64.json +++ b/debian-8.3-amd64.json @@ -167,6 +167,7 @@ ], "boot_wait": "10s", "disk_size": 40960, + "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", diff --git a/debian-8.3-i386.json b/debian-8.3-i386.json index ef4a21aef..5342b8694 100644 --- a/debian-8.3-i386.json +++ b/debian-8.3-i386.json @@ -167,6 +167,7 @@ ], "boot_wait": "10s", "disk_size": 40960, + "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", diff --git a/debian-8.4-amd64.json b/debian-8.4-amd64.json index e43810188..d697653c1 100644 --- a/debian-8.4-amd64.json +++ b/debian-8.4-amd64.json @@ -168,6 +168,7 @@ ], "boot_wait": "10s", "disk_size": 40960, + "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", diff --git a/debian-8.4-i386.json b/debian-8.4-i386.json index 01e8a65c5..f3ee292bb 100644 --- a/debian-8.4-i386.json +++ b/debian-8.4-i386.json @@ -168,6 +168,7 @@ ], "boot_wait": "10s", "disk_size": 40960, + "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", diff --git a/fedora-20-i386.json b/fedora-20-i386.json index 0cdd7c571..1fde7f2c7 100644 --- a/fedora-20-i386.json +++ b/fedora-20-i386.json @@ -107,6 +107,7 @@ ], "boot_wait": "10s", "disk_size": 40960, + "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", diff --git a/fedora-20-x86_64.json b/fedora-20-x86_64.json index d200e9397..94e368707 100644 --- a/fedora-20-x86_64.json +++ b/fedora-20-x86_64.json @@ -107,6 +107,7 @@ ], "boot_wait": "10s", "disk_size": 40960, + "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", diff --git a/fedora-21-i386.json b/fedora-21-i386.json index d996c8e90..e7deec52a 100644 --- a/fedora-21-i386.json +++ b/fedora-21-i386.json @@ -107,6 +107,7 @@ ], "boot_wait": "10s", "disk_size": 40960, + "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", diff --git a/fedora-21-x86_64.json b/fedora-21-x86_64.json index 77bc9ce76..c91df99f6 100644 --- a/fedora-21-x86_64.json +++ b/fedora-21-x86_64.json @@ -107,6 +107,7 @@ ], "boot_wait": "10s", "disk_size": 40960, + "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", diff --git a/fedora-22-i386.json b/fedora-22-i386.json index f0a566a9a..3e8773bd6 100644 --- a/fedora-22-i386.json +++ b/fedora-22-i386.json @@ -108,6 +108,7 @@ ], "boot_wait": "10s", "disk_size": 40960, + "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", diff --git a/fedora-22-x86_64.json b/fedora-22-x86_64.json index 6e3096f07..a449ff01a 100644 --- a/fedora-22-x86_64.json +++ b/fedora-22-x86_64.json @@ -107,6 +107,7 @@ ], "boot_wait": "10s", "disk_size": 40960, + "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", diff --git a/fedora-23-i386.json b/fedora-23-i386.json index e48069b6d..74a6a5450 100644 --- a/fedora-23-i386.json +++ b/fedora-23-i386.json @@ -108,6 +108,7 @@ ], "boot_wait": "10s", "disk_size": 40960, + "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", diff --git a/fedora-23-x86_64.json b/fedora-23-x86_64.json index 5ceb077dd..5f4311857 100644 --- a/fedora-23-x86_64.json +++ b/fedora-23-x86_64.json @@ -107,6 +107,7 @@ ], "boot_wait": "10s", "disk_size": 40960, + "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", diff --git a/freebsd-10.2-amd64.json b/freebsd-10.2-amd64.json index 1d8c17db6..e42a33fd9 100644 --- a/freebsd-10.2-amd64.json +++ b/freebsd-10.2-amd64.json @@ -159,6 +159,7 @@ ], "boot_wait": "7s", "disk_size": 10140, + "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", diff --git a/freebsd-10.2-i386.json b/freebsd-10.2-i386.json index 73bb9e98b..607f96c07 100644 --- a/freebsd-10.2-i386.json +++ b/freebsd-10.2-i386.json @@ -159,6 +159,7 @@ ], "boot_wait": "7s", "disk_size": 10140, + "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", diff --git a/freebsd-10.3-amd64.json b/freebsd-10.3-amd64.json index a87504926..ce875666a 100644 --- a/freebsd-10.3-amd64.json +++ b/freebsd-10.3-amd64.json @@ -159,6 +159,7 @@ ], "boot_wait": "7s", "disk_size": 10140, + "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", diff --git a/freebsd-10.3-i386.json b/freebsd-10.3-i386.json index ce1f83050..9e3a993d3 100644 --- a/freebsd-10.3-i386.json +++ b/freebsd-10.3-i386.json @@ -159,6 +159,7 @@ ], "boot_wait": "7s", "disk_size": 10140, + "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", diff --git a/freebsd-9.3-amd64.json b/freebsd-9.3-amd64.json index 223c79387..feb81baa6 100644 --- a/freebsd-9.3-amd64.json +++ b/freebsd-9.3-amd64.json @@ -175,6 +175,7 @@ ], "boot_wait": "7s", "disk_size": 10140, + "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", diff --git a/freebsd-9.3-i386.json b/freebsd-9.3-i386.json index 59bba6fbc..e2d260a78 100644 --- a/freebsd-9.3-i386.json +++ b/freebsd-9.3-i386.json @@ -175,6 +175,7 @@ ], "boot_wait": "7s", "disk_size": 10140, + "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", diff --git a/opensuse-13.2-i386.json b/opensuse-13.2-i386.json index 61ee31402..6d1ea50b7 100644 --- a/opensuse-13.2-i386.json +++ b/opensuse-13.2-i386.json @@ -123,6 +123,7 @@ ], "boot_wait": "10s", "disk_size": 20480, + "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", diff --git a/opensuse-13.2-x86_64.json b/opensuse-13.2-x86_64.json index 98cb94d57..7018265fb 100644 --- a/opensuse-13.2-x86_64.json +++ b/opensuse-13.2-x86_64.json @@ -123,6 +123,7 @@ ], "boot_wait": "10s", "disk_size": 20480, + "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", diff --git a/opensuse-leap-42.1-x86_64.json b/opensuse-leap-42.1-x86_64.json index 3bb93d460..86128eda1 100644 --- a/opensuse-leap-42.1-x86_64.json +++ b/opensuse-leap-42.1-x86_64.json @@ -123,6 +123,7 @@ ], "boot_wait": "10s", "disk_size": 20480, + "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", diff --git a/oracle-5.11-i386.json b/oracle-5.11-i386.json index 79e2ce048..0343e1b1b 100644 --- a/oracle-5.11-i386.json +++ b/oracle-5.11-i386.json @@ -107,6 +107,7 @@ ], "boot_wait": "10s", "disk_size": 40960, + "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", diff --git a/oracle-5.11-x86_64.json b/oracle-5.11-x86_64.json index 52b0148d1..215ee690e 100644 --- a/oracle-5.11-x86_64.json +++ b/oracle-5.11-x86_64.json @@ -107,6 +107,7 @@ ], "boot_wait": "10s", "disk_size": 40960, + "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", diff --git a/oracle-6.6-i386.json b/oracle-6.6-i386.json index 2d8073443..492c1e17b 100644 --- a/oracle-6.6-i386.json +++ b/oracle-6.6-i386.json @@ -107,6 +107,7 @@ ], "boot_wait": "10s", "disk_size": 40960, + "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", diff --git a/oracle-6.6-x86_64.json b/oracle-6.6-x86_64.json index 4dde0f455..3557739c8 100644 --- a/oracle-6.6-x86_64.json +++ b/oracle-6.6-x86_64.json @@ -107,6 +107,7 @@ ], "boot_wait": "10s", "disk_size": 40960, + "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", diff --git a/oracle-6.7-i386.json b/oracle-6.7-i386.json index f51931b86..a5ee724f2 100644 --- a/oracle-6.7-i386.json +++ b/oracle-6.7-i386.json @@ -107,6 +107,7 @@ ], "boot_wait": "10s", "disk_size": 40960, + "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", diff --git a/oracle-6.7-x86_64.json b/oracle-6.7-x86_64.json index eadfeaaff..7fb0852f3 100644 --- a/oracle-6.7-x86_64.json +++ b/oracle-6.7-x86_64.json @@ -107,6 +107,7 @@ ], "boot_wait": "10s", "disk_size": 40960, + "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", diff --git a/oracle-7.2-x86_64.json b/oracle-7.2-x86_64.json index fa03e55cc..b49046fcc 100644 --- a/oracle-7.2-x86_64.json +++ b/oracle-7.2-x86_64.json @@ -107,6 +107,7 @@ ], "boot_wait": "10s", "disk_size": 40960, + "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", diff --git a/rhel-5.11-i386.json b/rhel-5.11-i386.json index ef2142a1a..f5e0f0f59 100644 --- a/rhel-5.11-i386.json +++ b/rhel-5.11-i386.json @@ -107,6 +107,7 @@ ], "boot_wait": "10s", "disk_size": 40960, + "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", diff --git a/rhel-5.11-x86_64.json b/rhel-5.11-x86_64.json index e6c71dcbf..597421c0d 100644 --- a/rhel-5.11-x86_64.json +++ b/rhel-5.11-x86_64.json @@ -107,6 +107,7 @@ ], "boot_wait": "10s", "disk_size": 40960, + "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", diff --git a/rhel-6.6-i386.json b/rhel-6.6-i386.json index 4e21635f8..4bf006795 100644 --- a/rhel-6.6-i386.json +++ b/rhel-6.6-i386.json @@ -107,6 +107,7 @@ ], "boot_wait": "10s", "disk_size": 40960, + "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", diff --git a/rhel-6.6-x86_64.json b/rhel-6.6-x86_64.json index 094ae7f9d..320eb5ae7 100644 --- a/rhel-6.6-x86_64.json +++ b/rhel-6.6-x86_64.json @@ -107,6 +107,7 @@ ], "boot_wait": "10s", "disk_size": 40960, + "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", diff --git a/rhel-6.7-i386.json b/rhel-6.7-i386.json index 5eaa2fcb2..936024326 100644 --- a/rhel-6.7-i386.json +++ b/rhel-6.7-i386.json @@ -107,6 +107,7 @@ ], "boot_wait": "10s", "disk_size": 40960, + "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", diff --git a/rhel-6.7-x86_64.json b/rhel-6.7-x86_64.json index 97e5e373d..a067330c0 100644 --- a/rhel-6.7-x86_64.json +++ b/rhel-6.7-x86_64.json @@ -107,6 +107,7 @@ ], "boot_wait": "10s", "disk_size": 40960, + "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", diff --git a/rhel-7.2-x86_64.json b/rhel-7.2-x86_64.json index 033d80b8b..d3d62b091 100644 --- a/rhel-7.2-x86_64.json +++ b/rhel-7.2-x86_64.json @@ -107,6 +107,7 @@ ], "boot_wait": "10s", "disk_size": 40960, + "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", diff --git a/sles-11-sp2-i386.json b/sles-11-sp2-i386.json index e8253caf8..68c4ca758 100644 --- a/sles-11-sp2-i386.json +++ b/sles-11-sp2-i386.json @@ -123,6 +123,7 @@ ], "boot_wait": "10s", "disk_size": 20480, + "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "a0b34f6237b2b2a6b2174c82b40ed326", "iso_checksum_type": "md5", diff --git a/sles-11-sp2-x86_64.json b/sles-11-sp2-x86_64.json index 664b4d813..4b8d69b3c 100644 --- a/sles-11-sp2-x86_64.json +++ b/sles-11-sp2-x86_64.json @@ -123,6 +123,7 @@ ], "boot_wait": "10s", "disk_size": 20480, + "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "461d82ae6e15062b0807c1338f040497", "iso_checksum_type": "md5", diff --git a/sles-11-sp3-i386.json b/sles-11-sp3-i386.json index bd9349c6b..108c8ebec 100644 --- a/sles-11-sp3-i386.json +++ b/sles-11-sp3-i386.json @@ -123,6 +123,7 @@ ], "boot_wait": "10s", "disk_size": 20480, + "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "5c30a409fc8fb3343b4dc90d93ff2c89", "iso_checksum_type": "md5", diff --git a/sles-11-sp3-x86_64.json b/sles-11-sp3-x86_64.json index faa6fb24f..d317f08bd 100644 --- a/sles-11-sp3-x86_64.json +++ b/sles-11-sp3-x86_64.json @@ -123,6 +123,7 @@ ], "boot_wait": "10s", "disk_size": 20480, + "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "480b70d50cbb538382dc2b9325221e1b", "iso_checksum_type": "md5", diff --git a/sles-11-sp4-i386.json b/sles-11-sp4-i386.json index d57dc7aa7..d5b4d165c 100644 --- a/sles-11-sp4-i386.json +++ b/sles-11-sp4-i386.json @@ -123,6 +123,7 @@ ], "boot_wait": "10s", "disk_size": 20480, + "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", diff --git a/sles-11-sp4-x86_64.json b/sles-11-sp4-x86_64.json index 99afcb614..6fdad4aa1 100644 --- a/sles-11-sp4-x86_64.json +++ b/sles-11-sp4-x86_64.json @@ -123,6 +123,7 @@ ], "boot_wait": "10s", "disk_size": 20480, + "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", diff --git a/sles-12-x86_64.json b/sles-12-x86_64.json index 5f2b60d7f..b7720e53c 100644 --- a/sles-12-x86_64.json +++ b/sles-12-x86_64.json @@ -123,6 +123,7 @@ ], "boot_wait": "10s", "disk_size": 20480, + "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", diff --git a/ubuntu-10.04-amd64.json b/ubuntu-10.04-amd64.json index 2a25f4dc1..6b79252e2 100644 --- a/ubuntu-10.04-amd64.json +++ b/ubuntu-10.04-amd64.json @@ -191,6 +191,7 @@ ], "boot_wait": "10s", "disk_size": 40960, + "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", diff --git a/ubuntu-10.04-i386.json b/ubuntu-10.04-i386.json index bdc85d83a..b66b37930 100644 --- a/ubuntu-10.04-i386.json +++ b/ubuntu-10.04-i386.json @@ -191,6 +191,7 @@ ], "boot_wait": "10s", "disk_size": 40960, + "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", diff --git a/ubuntu-12.04-amd64.json b/ubuntu-12.04-amd64.json index 93b15ea87..85c00bb9f 100644 --- a/ubuntu-12.04-amd64.json +++ b/ubuntu-12.04-amd64.json @@ -191,6 +191,7 @@ ], "boot_wait": "10s", "disk_size": 40960, + "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", diff --git a/ubuntu-12.04-i386.json b/ubuntu-12.04-i386.json index d03964284..fef1eab87 100644 --- a/ubuntu-12.04-i386.json +++ b/ubuntu-12.04-i386.json @@ -191,6 +191,7 @@ ], "boot_wait": "10s", "disk_size": 40960, + "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", diff --git a/ubuntu-14.04-amd64.json b/ubuntu-14.04-amd64.json index e1efe7d41..419a5bf9f 100644 --- a/ubuntu-14.04-amd64.json +++ b/ubuntu-14.04-amd64.json @@ -191,6 +191,7 @@ ], "boot_wait": "10s", "disk_size": 40960, + "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", diff --git a/ubuntu-14.04-i386.json b/ubuntu-14.04-i386.json index ed184420d..a4f2b130b 100644 --- a/ubuntu-14.04-i386.json +++ b/ubuntu-14.04-i386.json @@ -191,6 +191,7 @@ ], "boot_wait": "10s", "disk_size": 40960, + "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", diff --git a/ubuntu-14.10-amd64.json b/ubuntu-14.10-amd64.json index 93e2b7b6e..30dd65947 100644 --- a/ubuntu-14.10-amd64.json +++ b/ubuntu-14.10-amd64.json @@ -191,6 +191,7 @@ ], "boot_wait": "10s", "disk_size": 40960, + "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", diff --git a/ubuntu-14.10-i386.json b/ubuntu-14.10-i386.json index 94fdb898a..4fcfeb160 100644 --- a/ubuntu-14.10-i386.json +++ b/ubuntu-14.10-i386.json @@ -191,6 +191,7 @@ ], "boot_wait": "10s", "disk_size": 40960, + "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", diff --git a/ubuntu-15.04-amd64.json b/ubuntu-15.04-amd64.json index ddda42369..2a035d001 100644 --- a/ubuntu-15.04-amd64.json +++ b/ubuntu-15.04-amd64.json @@ -195,6 +195,7 @@ ], "boot_wait": "10s", "disk_size": 40960, + "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", diff --git a/ubuntu-15.04-i386.json b/ubuntu-15.04-i386.json index 32b073765..23e2e5290 100644 --- a/ubuntu-15.04-i386.json +++ b/ubuntu-15.04-i386.json @@ -195,6 +195,7 @@ ], "boot_wait": "10s", "disk_size": 40960, + "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", diff --git a/ubuntu-15.10-amd64.json b/ubuntu-15.10-amd64.json index 26f771824..0d9a580f8 100644 --- a/ubuntu-15.10-amd64.json +++ b/ubuntu-15.10-amd64.json @@ -200,6 +200,7 @@ ], "boot_wait": "10s", "disk_size": 40960, + "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", diff --git a/ubuntu-15.10-i386.json b/ubuntu-15.10-i386.json index 4b9cf91b7..a0b8a2a8a 100644 --- a/ubuntu-15.10-i386.json +++ b/ubuntu-15.10-i386.json @@ -200,6 +200,7 @@ ], "boot_wait": "10s", "disk_size": 40960, + "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", From fc235357e2f697b759567d035a6c8cc894648d2f Mon Sep 17 00:00:00 2001 From: Seth Thomas <sthomas@chef.io> Date: Mon, 25 Apr 2016 08:00:19 -0700 Subject: [PATCH 0481/1622] Updating for 16.04 release --- ubuntu-16.04-amd64.json | 8 ++++---- ubuntu-16.04-i386.json | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/ubuntu-16.04-amd64.json b/ubuntu-16.04-amd64.json index 3251c0beb..1cb7cf028 100644 --- a/ubuntu-16.04-amd64.json +++ b/ubuntu-16.04-amd64.json @@ -254,12 +254,12 @@ "headless": "", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", - "iso_checksum": "079763f6d613d1cc4e8facd5a2ef119f5c523b38d9c78f35a9e0d2ac64ccb7cf", + "iso_checksum": "b8b172cbdf04f5ff8adc8c2c1b4007ccf66f00fc6a324a6da6eba67de71746f6", "iso_checksum_type": "sha256", - "iso_name": "xenial-server-amd64.iso", + "iso_name": "ubuntu-16.04-server-amd64.iso", "metadata": "floppy/dummy_metadata.json", - "mirror": "http://cdimage.ubuntu.com/ubuntu-server/daily", - "mirror_directory": "current", + "mirror": "http://releases.ubuntu.com", + "mirror_directory": "16.04", "name": "ubuntu-16.04", "no_proxy": "{{env `no_proxy`}}", "preseed_path": "ubuntu-15.10/preseed.cfg", diff --git a/ubuntu-16.04-i386.json b/ubuntu-16.04-i386.json index 9b801b4c1..10722b2a4 100644 --- a/ubuntu-16.04-i386.json +++ b/ubuntu-16.04-i386.json @@ -254,12 +254,12 @@ "headless": "", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", - "iso_checksum": "fa71252c2364bd851b978bee196489dfc6fbaa4873c489cc592016e256df8445", + "iso_checksum": "8d52f3127f2b7ffa97698913b722e3219187476a9b936055d737f3e00aecd24d", "iso_checksum_type": "sha256", - "iso_name": "xenial-server-i386.iso", + "iso_name": "ubuntu-16.04-server-i386.iso ", "metadata": "floppy/dummy_metadata.json", - "mirror": "http://cdimage.ubuntu.com/ubuntu-server/daily", - "mirror_directory": "current", + "mirror": "http://releases.ubuntu.com", + "mirror_directory": "16.04", "name": "ubuntu-16.04-i386", "no_proxy": "{{env `no_proxy`}}", "preseed_path": "ubuntu-15.10/preseed.cfg", From a0a1f30b1eacd15a6453f83cc7188e4a23ec4c50 Mon Sep 17 00:00:00 2001 From: Seth Thomas <sthomas@chef.io> Date: Mon, 25 Apr 2016 08:29:11 -0700 Subject: [PATCH 0482/1622] Applying vmware networking fix in lieu up upstream resolution --- ubuntu-16.04-amd64.json | 1 + ubuntu-16.04-i386.json | 1 + 2 files changed, 2 insertions(+) diff --git a/ubuntu-16.04-amd64.json b/ubuntu-16.04-amd64.json index 1cb7cf028..190d0438c 100644 --- a/ubuntu-16.04-amd64.json +++ b/ubuntu-16.04-amd64.json @@ -107,6 +107,7 @@ "vm_name": "{{ user `template` }}", "vmx_data": { "cpuid.coresPerSocket": "1", + "ethernet0.pciSlotNumber": "32", "memsize": "384", "numvcpus": "1" } diff --git a/ubuntu-16.04-i386.json b/ubuntu-16.04-i386.json index 10722b2a4..633168218 100644 --- a/ubuntu-16.04-i386.json +++ b/ubuntu-16.04-i386.json @@ -107,6 +107,7 @@ "vm_name": "{{ user `template` }}", "vmx_data": { "cpuid.coresPerSocket": "1", + "ethernet0.pciSlotNumber": "32", "memsize": "384", "numvcpus": "1" } From 39a6cebce0e3abcab792eba5560661b34875b6b3 Mon Sep 17 00:00:00 2001 From: Seth Thomas <sthomas@chef.io> Date: Mon, 25 Apr 2016 09:09:39 -0700 Subject: [PATCH 0483/1622] Adding headless option for qemu --- ubuntu-16.04-amd64.json | 1 + ubuntu-16.04-i386.json | 1 + 2 files changed, 2 insertions(+) diff --git a/ubuntu-16.04-amd64.json b/ubuntu-16.04-amd64.json index 190d0438c..3dd9f6d23 100644 --- a/ubuntu-16.04-amd64.json +++ b/ubuntu-16.04-amd64.json @@ -200,6 +200,7 @@ ], "boot_wait": "10s", "disk_size": 40960, + "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", diff --git a/ubuntu-16.04-i386.json b/ubuntu-16.04-i386.json index 633168218..6f2833657 100644 --- a/ubuntu-16.04-i386.json +++ b/ubuntu-16.04-i386.json @@ -200,6 +200,7 @@ ], "boot_wait": "10s", "disk_size": 40960, + "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", From ae400746e31910493d31f6bf37b1f0154944cfac Mon Sep 17 00:00:00 2001 From: Seth Thomas <sthomas@chef.io> Date: Mon, 25 Apr 2016 09:26:07 -0700 Subject: [PATCH 0484/1622] Ignore .kitchen.VIRT.yml files --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 5f5d39ad7..68bf87b99 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ packer.log *.variables.json /builds/ .kitchen +.kitchen.*.yml From 2611d37f89d954db23bad4e6426acf9160d674de Mon Sep 17 00:00:00 2001 From: Seth Thomas <sthomas@chef.io> Date: Tue, 26 Apr 2016 14:34:59 -0700 Subject: [PATCH 0485/1622] Min memory is 512MB unless otherwise set, mem and CPU tunable --- centos-5.11-i386.json | 14 ++++++++------ centos-5.11-x86_64.json | 14 ++++++++------ centos-6.7-i386.json | 15 ++++++++------- centos-6.7-x86_64.json | 15 ++++++++------- centos-7.2-x86_64.json | 15 ++++++++------- debian-6.0.10-amd64.json | 14 ++++++++------ debian-6.0.10-i386.json | 14 ++++++++------ debian-7.10-amd64.json | 14 ++++++++------ debian-7.10-i386.json | 14 ++++++++------ debian-7.8-amd64.json | 15 ++++++++------- debian-7.8-i386.json | 15 ++++++++------- debian-7.9-amd64.json | 14 ++++++++------ debian-7.9-i386.json | 14 ++++++++------ debian-8.1-amd64.json | 14 ++++++++------ debian-8.1-i386.json | 14 ++++++++------ debian-8.2-amd64.json | 14 ++++++++------ debian-8.2-i386.json | 14 ++++++++------ debian-8.3-amd64.json | 14 ++++++++------ debian-8.3-i386.json | 14 ++++++++------ debian-8.4-amd64.json | 14 ++++++++------ debian-8.4-i386.json | 14 ++++++++------ fedora-20-i386.json | 15 ++++++++------- fedora-20-x86_64.json | 15 ++++++++------- fedora-21-i386.json | 14 ++++++++------ fedora-21-x86_64.json | 14 ++++++++------ fedora-22-i386.json | 14 ++++++++------ fedora-22-x86_64.json | 14 ++++++++------ fedora-23-i386.json | 14 ++++++++------ fedora-23-x86_64.json | 14 ++++++++------ freebsd-10.2-amd64.json | 14 ++++++++------ freebsd-10.2-i386.json | 14 ++++++++------ freebsd-10.3-amd64.json | 14 ++++++++------ freebsd-10.3-i386.json | 14 ++++++++------ freebsd-9.3-amd64.json | 15 ++++++++------- freebsd-9.3-i386.json | 15 ++++++++------- macosx-10.10.json | 19 ++++++++++--------- macosx-10.11.json | 18 ++++++++++-------- macosx-10.7.json | 19 ++++++++++--------- macosx-10.8.json | 19 ++++++++++--------- macosx-10.9.json | 19 ++++++++++--------- omnios-r151010j.json | 11 ++++++----- omnios-r151014.json | 8 +++++--- omnios-r151018.json | 8 +++++--- opensuse-13.2-i386.json | 14 ++++++++------ opensuse-13.2-x86_64.json | 14 ++++++++------ opensuse-leap-42.1-x86_64.json | 8 +++++--- oracle-5.11-i386.json | 14 ++++++++------ oracle-5.11-x86_64.json | 14 ++++++++------ oracle-6.6-i386.json | 14 ++++++++------ oracle-6.6-x86_64.json | 14 ++++++++------ oracle-6.7-i386.json | 14 ++++++++------ oracle-6.7-x86_64.json | 14 ++++++++------ oracle-7.2-x86_64.json | 14 ++++++++------ rhel-5.11-i386.json | 14 ++++++++------ rhel-5.11-x86_64.json | 14 ++++++++------ rhel-6.6-i386.json | 15 ++++++++------- rhel-6.6-x86_64.json | 14 ++++++++------ rhel-6.7-i386.json | 14 ++++++++------ rhel-6.7-x86_64.json | 14 ++++++++------ rhel-7.2-x86_64.json | 14 ++++++++------ sles-11-sp2-i386.json | 15 ++++++++------- sles-11-sp2-x86_64.json | 15 ++++++++------- sles-11-sp3-i386.json | 15 ++++++++------- sles-11-sp3-x86_64.json | 15 ++++++++------- sles-11-sp4-i386.json | 14 ++++++++------ sles-11-sp4-x86_64.json | 14 ++++++++------ sles-12-x86_64.json | 14 ++++++++------ solaris-10.11-x86.json | 11 ++++++----- solaris-11-x86.json | 10 ++++++---- ubuntu-10.04-amd64.json | 14 ++++++++------ ubuntu-10.04-i386.json | 14 ++++++++------ ubuntu-12.04-amd64.json | 14 ++++++++------ ubuntu-12.04-i386.json | 14 ++++++++------ ubuntu-14.04-amd64.json | 14 ++++++++------ ubuntu-14.04-i386.json | 14 ++++++++------ ubuntu-14.10-amd64.json | 14 ++++++++------ ubuntu-14.10-i386.json | 14 ++++++++------ ubuntu-15.04-amd64.json | 15 ++++++++------- ubuntu-15.04-i386.json | 15 ++++++++------- ubuntu-15.10-amd64.json | 15 ++++++++------- ubuntu-15.10-i386.json | 15 ++++++++------- ubuntu-16.04-amd64.json | 14 ++++++++------ ubuntu-16.04-i386.json | 14 ++++++++------ windows-nano-tp3.json | 8 +++++--- 84 files changed, 664 insertions(+), 520 deletions(-) diff --git a/centos-5.11-i386.json b/centos-5.11-i386.json index 43946e1b6..fa9c5f5ff 100644 --- a/centos-5.11-i386.json +++ b/centos-5.11-i386.json @@ -26,13 +26,13 @@ "modifyvm", "{{.Name}}", "--memory", - "480" + "{{ user `memory` }}" ], [ "modifyvm", "{{.Name}}", "--cpus", - "1" + "{{ user `cpus` }}" ] ], "virtualbox_version_file": ".vbox_version", @@ -61,8 +61,8 @@ "vm_name": "{{ user `template` }}", "vmx_data": { "cpuid.coresPerSocket": "1", - "memsize": "480", - "numvcpus": "1" + "memsize": "{{ user `memory` }}", + "numvcpus": "{{ user `cpus` }}" } }, { @@ -83,13 +83,13 @@ "set", "{{.Name}}", "--memsize", - "480" + "{{ user `memory` }}" ], [ "set", "{{.Name}}", "--cpus", - "1" + "{{ user `cpus` }}" ] ], "prlctl_version_file": ".prlctl_version", @@ -157,6 +157,7 @@ "variables": { "box_basename": "centos-5.11-i386", "build_timestamp": "{{isotime \"20060102150405\"}}", + "cpus": "1", "git_revision": "__unknown_git_revision__", "headless": "", "http_proxy": "{{env `http_proxy`}}", @@ -165,6 +166,7 @@ "iso_checksum_type": "sha256", "iso_name": "CentOS-5.11-i386-bin-DVD-1of2.iso", "ks_path": "centos-5.11/ks.cfg", + "memory": "512", "metadata": "floppy/dummy_metadata.json", "mirror": "http://mirrors.kernel.org/centos", "mirror_directory": "5.11/isos/i386", diff --git a/centos-5.11-x86_64.json b/centos-5.11-x86_64.json index b463876cf..6579effd4 100644 --- a/centos-5.11-x86_64.json +++ b/centos-5.11-x86_64.json @@ -26,13 +26,13 @@ "modifyvm", "{{.Name}}", "--memory", - "480" + "{{ user `memory` }}" ], [ "modifyvm", "{{.Name}}", "--cpus", - "1" + "{{ user `cpus` }}" ] ], "virtualbox_version_file": ".vbox_version", @@ -61,8 +61,8 @@ "vm_name": "{{ user `template` }}", "vmx_data": { "cpuid.coresPerSocket": "1", - "memsize": "480", - "numvcpus": "1" + "memsize": "{{ user `memory` }}", + "numvcpus": "{{ user `cpus` }}" } }, { @@ -83,13 +83,13 @@ "set", "{{.Name}}", "--memsize", - "480" + "{{ user `memory` }}" ], [ "set", "{{.Name}}", "--cpus", - "1" + "{{ user `cpus` }}" ] ], "prlctl_version_file": ".prlctl_version", @@ -157,6 +157,7 @@ "variables": { "box_basename": "centos-5.11", "build_timestamp": "{{isotime \"20060102150405\"}}", + "cpus": "1", "git_revision": "__unknown_git_revision__", "headless": "", "http_proxy": "{{env `http_proxy`}}", @@ -165,6 +166,7 @@ "iso_checksum_type": "sha256", "iso_name": "CentOS-5.11-x86_64-bin-DVD-1of2.iso", "ks_path": "centos-5.11/ks.cfg", + "memory": "512", "metadata": "floppy/dummy_metadata.json", "mirror": "http://mirrors.kernel.org/centos", "mirror_directory": "5.11/isos/x86_64", diff --git a/centos-6.7-i386.json b/centos-6.7-i386.json index bb33a422f..422cda1d1 100644 --- a/centos-6.7-i386.json +++ b/centos-6.7-i386.json @@ -26,13 +26,13 @@ "modifyvm", "{{.Name}}", "--memory", - "480" + "{{ user `memory` }}" ], [ "modifyvm", "{{.Name}}", "--cpus", - "1" + "{{ user `cpus` }}" ] ], "virtualbox_version_file": ".vbox_version", @@ -61,8 +61,8 @@ "vm_name": "{{ user `template` }}", "vmx_data": { "cpuid.coresPerSocket": "1", - "memsize": "480", - "numvcpus": "1" + "memsize": "{{ user `memory` }}", + "numvcpus": "{{ user `cpus` }}" } }, { @@ -83,13 +83,13 @@ "set", "{{.Name}}", "--memsize", - "480" + "{{ user `memory` }}" ], [ "set", "{{.Name}}", "--cpus", - "1" + "{{ user `cpus` }}" ] ], "prlctl_version_file": ".prlctl_version", @@ -157,6 +157,7 @@ "variables": { "box_basename": "centos-6.7-i386", "build_timestamp": "{{isotime \"20060102150405\"}}", + "cpus": "1", "git_revision": "__unknown_git_revision__", "headless": "", "http_proxy": "{{env `http_proxy`}}", @@ -165,6 +166,7 @@ "iso_checksum_type": "sha256", "iso_name": "CentOS-6.7-i386-bin-DVD1.iso", "ks_path": "centos-6.7/ks.cfg", + "memory": "512", "metadata": "floppy/dummy_metadata.json", "mirror": "http://mirrors.kernel.org/centos", "mirror_directory": "6.7/isos/i386", @@ -174,4 +176,3 @@ "version": "2.1.TIMESTAMP" } } - diff --git a/centos-6.7-x86_64.json b/centos-6.7-x86_64.json index fac997e9c..3af906ec8 100644 --- a/centos-6.7-x86_64.json +++ b/centos-6.7-x86_64.json @@ -26,13 +26,13 @@ "modifyvm", "{{.Name}}", "--memory", - "480" + "{{ user `memory` }}" ], [ "modifyvm", "{{.Name}}", "--cpus", - "1" + "{{ user `cpus` }}" ] ], "virtualbox_version_file": ".vbox_version", @@ -61,8 +61,8 @@ "vm_name": "{{ user `template` }}", "vmx_data": { "cpuid.coresPerSocket": "1", - "memsize": "480", - "numvcpus": "1" + "memsize": "{{ user `memory` }}", + "numvcpus": "{{ user `cpus` }}" } }, { @@ -83,13 +83,13 @@ "set", "{{.Name}}", "--memsize", - "480" + "{{ user `memory` }}" ], [ "set", "{{.Name}}", "--cpus", - "1" + "{{ user `cpus` }}" ] ], "prlctl_version_file": ".prlctl_version", @@ -157,6 +157,7 @@ "variables": { "box_basename": "centos-6.7", "build_timestamp": "{{isotime \"20060102150405\"}}", + "cpus": "1", "git_revision": "__unknown_git_revision__", "headless": "", "http_proxy": "{{env `http_proxy`}}", @@ -165,6 +166,7 @@ "iso_checksum_type": "sha256", "iso_name": "CentOS-6.7-x86_64-bin-DVD1.iso", "ks_path": "centos-6.7/ks.cfg", + "memory": "512", "metadata": "floppy/dummy_metadata.json", "mirror": "http://mirrors.kernel.org/centos", "mirror_directory": "6.7/isos/x86_64", @@ -174,4 +176,3 @@ "version": "2.1.TIMESTAMP" } } - diff --git a/centos-7.2-x86_64.json b/centos-7.2-x86_64.json index be498bba8..45b0a307b 100644 --- a/centos-7.2-x86_64.json +++ b/centos-7.2-x86_64.json @@ -26,13 +26,13 @@ "modifyvm", "{{.Name}}", "--memory", - "480" + "{{ user `memory` }}" ], [ "modifyvm", "{{.Name}}", "--cpus", - "1" + "{{ user `cpus` }}" ] ], "virtualbox_version_file": ".vbox_version", @@ -61,8 +61,8 @@ "vm_name": "{{ user `template` }}", "vmx_data": { "cpuid.coresPerSocket": "1", - "memsize": "480", - "numvcpus": "1" + "memsize": "{{ user `memory` }}", + "numvcpus": "{{ user `cpus` }}" } }, { @@ -83,13 +83,13 @@ "set", "{{.Name}}", "--memsize", - "480" + "{{ user `memory` }}" ], [ "set", "{{.Name}}", "--cpus", - "1" + "{{ user `cpus` }}" ] ], "prlctl_version_file": ".prlctl_version", @@ -157,6 +157,7 @@ "variables": { "box_basename": "centos-7.2", "build_timestamp": "{{isotime \"20060102150405\"}}", + "cpus": "1", "git_revision": "__unknown_git_revision__", "headless": "", "http_proxy": "{{env `http_proxy`}}", @@ -165,6 +166,7 @@ "iso_checksum_type": "sha256", "iso_name": "CentOS-7-x86_64-DVD-1511.iso", "ks_path": "centos-7.2/ks.cfg", + "memory": "512", "metadata": "floppy/dummy_metadata.json", "mirror": "http://mirrors.kernel.org/centos", "mirror_directory": "7.2.1511/isos/x86_64", @@ -174,4 +176,3 @@ "version": "2.1.TIMESTAMP" } } - diff --git a/debian-6.0.10-amd64.json b/debian-6.0.10-amd64.json index 7ca42560e..e6e5f7bc3 100644 --- a/debian-6.0.10-amd64.json +++ b/debian-6.0.10-amd64.json @@ -40,13 +40,13 @@ "modifyvm", "{{.Name}}", "--memory", - "384" + "{{ user `memory` }}" ], [ "modifyvm", "{{.Name}}", "--cpus", - "1" + "{{ user `cpus` }}" ] ], "virtualbox_version_file": ".vbox_version", @@ -89,8 +89,8 @@ "vm_name": "{{ user `template` }}", "vmx_data": { "cpuid.coresPerSocket": "1", - "memsize": "384", - "numvcpus": "1" + "memsize": "{{ user `memory` }}", + "numvcpus": "{{ user `cpus` }}" } }, { @@ -125,13 +125,13 @@ "set", "{{.Name}}", "--memsize", - "384" + "{{ user `memory` }}" ], [ "set", "{{.Name}}", "--cpus", - "1" + "{{ user `cpus` }}" ] ], "prlctl_version_file": ".prlctl_version", @@ -215,6 +215,7 @@ "variables": { "box_basename": "debian-6.0.10", "build_timestamp": "{{isotime \"20060102150405\"}}", + "cpus": "1", "git_revision": "__unknown_git_revision__", "headless": "", "http_proxy": "{{env `http_proxy`}}", @@ -222,6 +223,7 @@ "iso_checksum": "ee3bc7fd1a1bcbf49297fe305cec935cc8012ab6ec8d37e9428d0600b060c0d8", "iso_checksum_type": "sha256", "iso_name": "debian-6.0.10-amd64-CD-1.iso", + "memory": "512", "metadata": "floppy/dummy_metadata.json", "mirror": "http://cdimage.debian.org/cdimage/archive", "mirror_directory": "6.0.10/amd64/iso-cd", diff --git a/debian-6.0.10-i386.json b/debian-6.0.10-i386.json index 90e971a29..9d4c0b914 100644 --- a/debian-6.0.10-i386.json +++ b/debian-6.0.10-i386.json @@ -40,13 +40,13 @@ "modifyvm", "{{.Name}}", "--memory", - "384" + "{{ user `memory` }}" ], [ "modifyvm", "{{.Name}}", "--cpus", - "1" + "{{ user `cpus` }}" ] ], "virtualbox_version_file": ".vbox_version", @@ -89,8 +89,8 @@ "vm_name": "{{ user `template` }}", "vmx_data": { "cpuid.coresPerSocket": "1", - "memsize": "384", - "numvcpus": "1" + "memsize": "{{ user `memory` }}", + "numvcpus": "{{ user `cpus` }}" } }, { @@ -125,13 +125,13 @@ "set", "{{.Name}}", "--memsize", - "384" + "{{ user `memory` }}" ], [ "set", "{{.Name}}", "--cpus", - "1" + "{{ user `cpus` }}" ] ], "prlctl_version_file": ".prlctl_version", @@ -215,6 +215,7 @@ "variables": { "box_basename": "debian-6.0.10-i386", "build_timestamp": "{{isotime \"20060102150405\"}}", + "cpus": "1", "git_revision": "__unknown_git_revision__", "headless": "", "http_proxy": "{{env `http_proxy`}}", @@ -222,6 +223,7 @@ "iso_checksum": "d2740420ba52d397c453fbfea6f5d3bcdbfe27dee666ee63b0fb1e7df1d18633", "iso_checksum_type": "sha256", "iso_name": "debian-6.0.10-i386-CD-1.iso", + "memory": "512", "metadata": "floppy/dummy_metadata.json", "mirror": "http://cdimage.debian.org/cdimage/archive", "mirror_directory": "6.0.10/i386/iso-cd", diff --git a/debian-7.10-amd64.json b/debian-7.10-amd64.json index 4f0b0712b..55bf2d0e9 100644 --- a/debian-7.10-amd64.json +++ b/debian-7.10-amd64.json @@ -40,13 +40,13 @@ "modifyvm", "{{.Name}}", "--memory", - "384" + "{{ user `memory` }}" ], [ "modifyvm", "{{.Name}}", "--cpus", - "1" + "{{ user `cpus` }}" ] ], "virtualbox_version_file": ".vbox_version", @@ -89,8 +89,8 @@ "vm_name": "{{ user `template` }}", "vmx_data": { "cpuid.coresPerSocket": "1", - "memsize": "384", - "numvcpus": "1" + "memsize": "{{ user `memory` }}", + "numvcpus": "{{ user `cpus` }}" } }, { @@ -125,13 +125,13 @@ "set", "{{.Name}}", "--memsize", - "384" + "{{ user `memory` }}" ], [ "set", "{{.Name}}", "--cpus", - "1" + "{{ user `cpus` }}" ] ], "prlctl_version_file": ".prlctl_version", @@ -215,6 +215,7 @@ "variables": { "box_basename": "debian-7.10", "build_timestamp": "{{isotime \"20060102150405\"}}", + "cpus": "1", "git_revision": "__unknown_git_revision__", "headless": "", "http_proxy": "{{env `http_proxy`}}", @@ -222,6 +223,7 @@ "iso_checksum": "cc594c96126d39e33e83ba083c4bd61471ffd95bc1a0b5334ac58dec7a17a5f7", "iso_checksum_type": "sha256", "iso_name": "debian-7.10.0-amd64-CD-1.iso", + "memory": "512", "metadata": "floppy/dummy_metadata.json", "mirror": "http://cdimage.debian.org/cdimage/archive", "mirror_directory": "7.10.0/amd64/iso-cd", diff --git a/debian-7.10-i386.json b/debian-7.10-i386.json index d4b1f5331..b556c015e 100644 --- a/debian-7.10-i386.json +++ b/debian-7.10-i386.json @@ -40,13 +40,13 @@ "modifyvm", "{{.Name}}", "--memory", - "384" + "{{ user `memory` }}" ], [ "modifyvm", "{{.Name}}", "--cpus", - "1" + "{{ user `cpus` }}" ] ], "virtualbox_version_file": ".vbox_version", @@ -89,8 +89,8 @@ "vm_name": "{{ user `template` }}", "vmx_data": { "cpuid.coresPerSocket": "1", - "memsize": "384", - "numvcpus": "1" + "memsize": "{{ user `memory` }}", + "numvcpus": "{{ user `cpus` }}" } }, { @@ -125,13 +125,13 @@ "set", "{{.Name}}", "--memsize", - "384" + "{{ user `memory` }}" ], [ "set", "{{.Name}}", "--cpus", - "1" + "{{ user `cpus` }}" ] ], "prlctl_version_file": ".prlctl_version", @@ -215,6 +215,7 @@ "variables": { "box_basename": "debian-7.10-i386", "build_timestamp": "{{isotime \"20060102150405\"}}", + "cpus": "1", "git_revision": "__unknown_git_revision__", "headless": "", "http_proxy": "{{env `http_proxy`}}", @@ -222,6 +223,7 @@ "iso_checksum": "34f496893f7951cc3a35704f5776d652266595116937d46ba2562b1ed25eb4b0", "iso_checksum_type": "sha256", "iso_name": "debian-7.10.0-i386-CD-1.iso", + "memory": "512", "metadata": "floppy/dummy_metadata.json", "mirror": "http://cdimage.debian.org/cdimage/archive", "mirror_directory": "7.10.0/i386/iso-cd", diff --git a/debian-7.8-amd64.json b/debian-7.8-amd64.json index b199dd258..ffce2c9f6 100644 --- a/debian-7.8-amd64.json +++ b/debian-7.8-amd64.json @@ -40,13 +40,13 @@ "modifyvm", "{{.Name}}", "--memory", - "384" + "{{ user `memory` }}" ], [ "modifyvm", "{{.Name}}", "--cpus", - "1" + "{{ user `cpus` }}" ] ], "virtualbox_version_file": ".vbox_version", @@ -89,8 +89,8 @@ "vm_name": "{{ user `template` }}", "vmx_data": { "cpuid.coresPerSocket": "1", - "memsize": "384", - "numvcpus": "1" + "memsize": "{{ user `memory` }}", + "numvcpus": "{{ user `cpus` }}" } }, { @@ -125,13 +125,13 @@ "set", "{{.Name}}", "--memsize", - "384" + "{{ user `memory` }}" ], [ "set", "{{.Name}}", "--cpus", - "1" + "{{ user `cpus` }}" ] ], "prlctl_version_file": ".prlctl_version", @@ -215,6 +215,7 @@ "variables": { "box_basename": "debian-7.8", "build_timestamp": "{{isotime \"20060102150405\"}}", + "cpus": "1", "git_revision": "__unknown_git_revision__", "headless": "", "http_proxy": "{{env `http_proxy`}}", @@ -222,6 +223,7 @@ "iso_checksum": "5f611b40b0803f8be1180da561cfbc159e381599", "iso_checksum_type": "sha1", "iso_name": "debian-7.8.0-amd64-CD-1.iso", + "memory": "512", "metadata": "floppy/dummy_metadata.json", "mirror": "http://cdimage.debian.org/cdimage/archive", "mirror_directory": "7.8.0/amd64/iso-cd", @@ -232,4 +234,3 @@ "version": "2.1.TIMESTAMP" } } - diff --git a/debian-7.8-i386.json b/debian-7.8-i386.json index f39b7163d..64ed91cd2 100644 --- a/debian-7.8-i386.json +++ b/debian-7.8-i386.json @@ -40,13 +40,13 @@ "modifyvm", "{{.Name}}", "--memory", - "384" + "{{ user `memory` }}" ], [ "modifyvm", "{{.Name}}", "--cpus", - "1" + "{{ user `cpus` }}" ] ], "virtualbox_version_file": ".vbox_version", @@ -89,8 +89,8 @@ "vm_name": "{{ user `template` }}", "vmx_data": { "cpuid.coresPerSocket": "1", - "memsize": "384", - "numvcpus": "1" + "memsize": "{{ user `memory` }}", + "numvcpus": "{{ user `cpus` }}" } }, { @@ -125,13 +125,13 @@ "set", "{{.Name}}", "--memsize", - "384" + "{{ user `memory` }}" ], [ "set", "{{.Name}}", "--cpus", - "1" + "{{ user `cpus` }}" ] ], "prlctl_version_file": ".prlctl_version", @@ -215,6 +215,7 @@ "variables": { "box_basename": "debian-7.8-i386", "build_timestamp": "{{isotime \"20060102150405\"}}", + "cpus": "1", "git_revision": "__unknown_git_revision__", "headless": "", "http_proxy": "{{env `http_proxy`}}", @@ -222,6 +223,7 @@ "iso_checksum": "d87664e590f39aba725ec9705dc58a8c75417fef", "iso_checksum_type": "sha1", "iso_name": "debian-7.8.0-i386-CD-1.iso", + "memory": "512", "metadata": "floppy/dummy_metadata.json", "mirror": "http://cdimage.debian.org/cdimage/archive", "mirror_directory": "7.8.0/i386/iso-cd", @@ -232,4 +234,3 @@ "version": "2.1.TIMESTAMP" } } - diff --git a/debian-7.9-amd64.json b/debian-7.9-amd64.json index 70b0219a5..75110a7fc 100644 --- a/debian-7.9-amd64.json +++ b/debian-7.9-amd64.json @@ -40,13 +40,13 @@ "modifyvm", "{{.Name}}", "--memory", - "384" + "{{ user `memory` }}" ], [ "modifyvm", "{{.Name}}", "--cpus", - "1" + "{{ user `cpus` }}" ] ], "virtualbox_version_file": ".vbox_version", @@ -89,8 +89,8 @@ "vm_name": "{{ user `template` }}", "vmx_data": { "cpuid.coresPerSocket": "1", - "memsize": "384", - "numvcpus": "1" + "memsize": "{{ user `memory` }}", + "numvcpus": "{{ user `cpus` }}" } }, { @@ -125,13 +125,13 @@ "set", "{{.Name}}", "--memsize", - "384" + "{{ user `memory` }}" ], [ "set", "{{.Name}}", "--cpus", - "1" + "{{ user `cpus` }}" ] ], "prlctl_version_file": ".prlctl_version", @@ -215,6 +215,7 @@ "variables": { "box_basename": "debian-7.9", "build_timestamp": "{{isotime \"20060102150405\"}}", + "cpus": "1", "git_revision": "__unknown_git_revision__", "headless": "", "http_proxy": "{{env `http_proxy`}}", @@ -222,6 +223,7 @@ "iso_checksum": "86fc1138497ce37dc502383e0326614d9d102c75ea6b43d22a9c7580b26349f4", "iso_checksum_type": "sha256", "iso_name": "debian-7.9.0-amd64-CD-1.iso", + "memory": "512", "metadata": "floppy/dummy_metadata.json", "mirror": "http://cdimage.debian.org/cdimage/archive", "mirror_directory": "7.9.0/amd64/iso-cd", diff --git a/debian-7.9-i386.json b/debian-7.9-i386.json index 2b36fb949..a4e88c6d1 100644 --- a/debian-7.9-i386.json +++ b/debian-7.9-i386.json @@ -40,13 +40,13 @@ "modifyvm", "{{.Name}}", "--memory", - "384" + "{{ user `memory` }}" ], [ "modifyvm", "{{.Name}}", "--cpus", - "1" + "{{ user `cpus` }}" ] ], "virtualbox_version_file": ".vbox_version", @@ -89,8 +89,8 @@ "vm_name": "{{ user `template` }}", "vmx_data": { "cpuid.coresPerSocket": "1", - "memsize": "384", - "numvcpus": "1" + "memsize": "{{ user `memory` }}", + "numvcpus": "{{ user `cpus` }}" } }, { @@ -125,13 +125,13 @@ "set", "{{.Name}}", "--memsize", - "384" + "{{ user `memory` }}" ], [ "set", "{{.Name}}", "--cpus", - "1" + "{{ user `cpus` }}" ] ], "prlctl_version_file": ".prlctl_version", @@ -215,6 +215,7 @@ "variables": { "box_basename": "debian-7.9-i386", "build_timestamp": "{{isotime \"20060102150405\"}}", + "cpus": "1", "git_revision": "__unknown_git_revision__", "headless": "", "http_proxy": "{{env `http_proxy`}}", @@ -222,6 +223,7 @@ "iso_checksum": "b1168c5379b8b84bb700d146ca3c90f3cd8a43bd1ea77517a6176dbafa0063ab", "iso_checksum_type": "sha256", "iso_name": "debian-7.9.0-i386-CD-1.iso", + "memory": "512", "metadata": "floppy/dummy_metadata.json", "mirror": "http://cdimage.debian.org/cdimage/archive", "mirror_directory": "7.9.0/i386/iso-cd", diff --git a/debian-8.1-amd64.json b/debian-8.1-amd64.json index 0973637ea..6bb66122e 100644 --- a/debian-8.1-amd64.json +++ b/debian-8.1-amd64.json @@ -41,13 +41,13 @@ "modifyvm", "{{.Name}}", "--memory", - "384" + "{{ user `memory` }}" ], [ "modifyvm", "{{.Name}}", "--cpus", - "1" + "{{ user `cpus` }}" ] ], "virtualbox_version_file": ".vbox_version", @@ -91,8 +91,8 @@ "vm_name": "{{ user `template` }}", "vmx_data": { "cpuid.coresPerSocket": "1", - "memsize": "384", - "numvcpus": "1" + "memsize": "{{ user `memory` }}", + "numvcpus": "{{ user `cpus` }}" } }, { @@ -128,13 +128,13 @@ "set", "{{.Name}}", "--memsize", - "384" + "{{ user `memory` }}" ], [ "set", "{{.Name}}", "--cpus", - "1" + "{{ user `cpus` }}" ] ], "prlctl_version_file": ".prlctl_version", @@ -219,6 +219,7 @@ "variables": { "box_basename": "debian-8.1", "build_timestamp": "{{isotime \"20060102150405\"}}", + "cpus": "1", "git_revision": "__unknown_git_revision__", "headless": "", "http_proxy": "{{env `http_proxy`}}", @@ -226,6 +227,7 @@ "iso_checksum": "10adbdac17a25ad44d0241ae978140c70ddfebdd0597d4a4bfea9fef8eaa9075", "iso_checksum_type": "sha256", "iso_name": "debian-8.1.0-amd64-CD-1.iso", + "memory": "512", "metadata": "floppy/dummy_metadata.json", "mirror": "http://cdimage.debian.org/cdimage/archive", "mirror_directory": "8.1.0/amd64/iso-cd", diff --git a/debian-8.1-i386.json b/debian-8.1-i386.json index 0461cca14..a5d1b7419 100644 --- a/debian-8.1-i386.json +++ b/debian-8.1-i386.json @@ -41,13 +41,13 @@ "modifyvm", "{{.Name}}", "--memory", - "384" + "{{ user `memory` }}" ], [ "modifyvm", "{{.Name}}", "--cpus", - "1" + "{{ user `cpus` }}" ] ], "virtualbox_version_file": ".vbox_version", @@ -91,8 +91,8 @@ "vm_name": "{{ user `template` }}", "vmx_data": { "cpuid.coresPerSocket": "1", - "memsize": "384", - "numvcpus": "1" + "memsize": "{{ user `memory` }}", + "numvcpus": "{{ user `cpus` }}" } }, { @@ -128,13 +128,13 @@ "set", "{{.Name}}", "--memsize", - "384" + "{{ user `memory` }}" ], [ "set", "{{.Name}}", "--cpus", - "1" + "{{ user `cpus` }}" ] ], "prlctl_version_file": ".prlctl_version", @@ -219,6 +219,7 @@ "variables": { "box_basename": "debian-8.1-i386", "build_timestamp": "{{isotime \"20060102150405\"}}", + "cpus": "1", "git_revision": "__unknown_git_revision__", "headless": "", "http_proxy": "{{env `http_proxy`}}", @@ -226,6 +227,7 @@ "iso_checksum": "74343980870d5c2c73e3c1a9d92ea6546b76070ccceeae7842c809557d07d53b", "iso_checksum_type": "sha256", "iso_name": "debian-8.1.0-i386-CD-1.iso", + "memory": "512", "metadata": "floppy/dummy_metadata.json", "mirror": "http://cdimage.debian.org/cdimage/archive", "mirror_directory": "8.1.0/i386/iso-cd", diff --git a/debian-8.2-amd64.json b/debian-8.2-amd64.json index 87c18f549..ae654c565 100644 --- a/debian-8.2-amd64.json +++ b/debian-8.2-amd64.json @@ -41,13 +41,13 @@ "modifyvm", "{{.Name}}", "--memory", - "384" + "{{ user `memory` }}" ], [ "modifyvm", "{{.Name}}", "--cpus", - "1" + "{{ user `cpus` }}" ] ], "virtualbox_version_file": ".vbox_version", @@ -91,8 +91,8 @@ "vm_name": "{{ user `template` }}", "vmx_data": { "cpuid.coresPerSocket": "1", - "memsize": "384", - "numvcpus": "1" + "memsize": "{{ user `memory` }}", + "numvcpus": "{{ user `cpus` }}" } }, { @@ -128,13 +128,13 @@ "set", "{{.Name}}", "--memsize", - "384" + "{{ user `memory` }}" ], [ "set", "{{.Name}}", "--cpus", - "1" + "{{ user `cpus` }}" ] ], "prlctl_version_file": ".prlctl_version", @@ -219,6 +219,7 @@ "variables": { "box_basename": "debian-8.2", "build_timestamp": "{{isotime \"20060102150405\"}}", + "cpus": "1", "git_revision": "__unknown_git_revision__", "headless": "", "http_proxy": "{{env `http_proxy`}}", @@ -226,6 +227,7 @@ "iso_checksum": "d3ac88ec064f9e941ee5d9cbfaa87ac48929b81471f96073305ccd7bd71ff521", "iso_checksum_type": "sha256", "iso_name": "debian-8.2.0-amd64-CD-1.iso", + "memory": "512", "metadata": "floppy/dummy_metadata.json", "mirror": "http://cdimage.debian.org/cdimage/archive", "mirror_directory": "8.2.0/amd64/iso-cd", diff --git a/debian-8.2-i386.json b/debian-8.2-i386.json index 5a690d5d0..a3c9ddec9 100644 --- a/debian-8.2-i386.json +++ b/debian-8.2-i386.json @@ -41,13 +41,13 @@ "modifyvm", "{{.Name}}", "--memory", - "384" + "{{ user `memory` }}" ], [ "modifyvm", "{{.Name}}", "--cpus", - "1" + "{{ user `cpus` }}" ] ], "virtualbox_version_file": ".vbox_version", @@ -91,8 +91,8 @@ "vm_name": "{{ user `template` }}", "vmx_data": { "cpuid.coresPerSocket": "1", - "memsize": "384", - "numvcpus": "1" + "memsize": "{{ user `memory` }}", + "numvcpus": "{{ user `cpus` }}" } }, { @@ -128,13 +128,13 @@ "set", "{{.Name}}", "--memsize", - "384" + "{{ user `memory` }}" ], [ "set", "{{.Name}}", "--cpus", - "1" + "{{ user `cpus` }}" ] ], "prlctl_version_file": ".prlctl_version", @@ -219,6 +219,7 @@ "variables": { "box_basename": "debian-8.2-i386", "build_timestamp": "{{isotime \"20060102150405\"}}", + "cpus": "1", "git_revision": "__unknown_git_revision__", "headless": "", "http_proxy": "{{env `http_proxy`}}", @@ -226,6 +227,7 @@ "iso_checksum": "87060c2777f55806e313db22ba8a78aee9f7119b6321448a1dfdaf0bbfcb67ce", "iso_checksum_type": "sha256", "iso_name": "debian-8.2.0-i386-CD-1.iso", + "memory": "512", "metadata": "floppy/dummy_metadata.json", "mirror": "http://cdimage.debian.org/cdimage/archive", "mirror_directory": "8.2.0/i386/iso-cd", diff --git a/debian-8.3-amd64.json b/debian-8.3-amd64.json index ca40e5b0f..0efb42319 100644 --- a/debian-8.3-amd64.json +++ b/debian-8.3-amd64.json @@ -41,13 +41,13 @@ "modifyvm", "{{.Name}}", "--memory", - "384" + "{{ user `memory` }}" ], [ "modifyvm", "{{.Name}}", "--cpus", - "1" + "{{ user `cpus` }}" ] ], "virtualbox_version_file": ".vbox_version", @@ -91,8 +91,8 @@ "vm_name": "{{ user `template` }}", "vmx_data": { "cpuid.coresPerSocket": "1", - "memsize": "384", - "numvcpus": "1" + "memsize": "{{ user `memory` }}", + "numvcpus": "{{ user `cpus` }}" } }, { @@ -128,13 +128,13 @@ "set", "{{.Name}}", "--memsize", - "384" + "{{ user `memory` }}" ], [ "set", "{{.Name}}", "--cpus", - "1" + "{{ user `cpus` }}" ] ], "prlctl_version_file": ".prlctl_version", @@ -219,6 +219,7 @@ "variables": { "box_basename": "debian-8.3", "build_timestamp": "{{isotime \"20060102150405\"}}", + "cpus": "1", "git_revision": "__unknown_git_revision__", "headless": "", "http_proxy": "{{env `http_proxy`}}", @@ -226,6 +227,7 @@ "iso_checksum": "1dae8556e57bb04bf380b2dbf64f3e6c61f9c28cbb6518aabae95a003c89739a", "iso_checksum_type": "sha256", "iso_name": "debian-8.3.0-amd64-CD-1.iso", + "memory": "512", "metadata": "floppy/dummy_metadata.json", "mirror": "http://cdimage.debian.org/cdimage/release", "mirror_directory": "8.3.0/amd64/iso-cd", diff --git a/debian-8.3-i386.json b/debian-8.3-i386.json index 5342b8694..b704aaf18 100644 --- a/debian-8.3-i386.json +++ b/debian-8.3-i386.json @@ -41,13 +41,13 @@ "modifyvm", "{{.Name}}", "--memory", - "384" + "{{ user `memory` }}" ], [ "modifyvm", "{{.Name}}", "--cpus", - "1" + "{{ user `cpus` }}" ] ], "virtualbox_version_file": ".vbox_version", @@ -91,8 +91,8 @@ "vm_name": "{{ user `template` }}", "vmx_data": { "cpuid.coresPerSocket": "1", - "memsize": "384", - "numvcpus": "1" + "memsize": "{{ user `memory` }}", + "numvcpus": "{{ user `cpus` }}" } }, { @@ -128,13 +128,13 @@ "set", "{{.Name}}", "--memsize", - "384" + "{{ user `memory` }}" ], [ "set", "{{.Name}}", "--cpus", - "1" + "{{ user `cpus` }}" ] ], "prlctl_version_file": ".prlctl_version", @@ -219,6 +219,7 @@ "variables": { "box_basename": "debian-8.3-i386", "build_timestamp": "{{isotime \"20060102150405\"}}", + "cpus": "1", "git_revision": "__unknown_git_revision__", "headless": "", "http_proxy": "{{env `http_proxy`}}", @@ -226,6 +227,7 @@ "iso_checksum": "0838af9e9403f0cc37c95888eff805496c688cd7b7fab3fa0812857f0e4eaca4", "iso_checksum_type": "sha256", "iso_name": "debian-8.3.0-i386-CD-1.iso", + "memory": "512", "metadata": "floppy/dummy_metadata.json", "mirror": "http://cdimage.debian.org/cdimage/release", "mirror_directory": "8.3.0/i386/iso-cd", diff --git a/debian-8.4-amd64.json b/debian-8.4-amd64.json index d697653c1..4a97aac9e 100644 --- a/debian-8.4-amd64.json +++ b/debian-8.4-amd64.json @@ -41,13 +41,13 @@ "modifyvm", "{{.Name}}", "--memory", - "384" + "{{ user `memory` }}" ], [ "modifyvm", "{{.Name}}", "--cpus", - "1" + "{{ user `cpus` }}" ] ], "virtualbox_version_file": ".vbox_version", @@ -92,8 +92,8 @@ "vmx_data": { "cpuid.coresPerSocket": "1", "ethernet0.pciSlotNumber": "32", - "memsize": "384", - "numvcpus": "1" + "memsize": "{{ user `memory` }}", + "numvcpus": "{{ user `cpus` }}" } }, { @@ -129,13 +129,13 @@ "set", "{{.Name}}", "--memsize", - "384" + "{{ user `memory` }}" ], [ "set", "{{.Name}}", "--cpus", - "1" + "{{ user `cpus` }}" ] ], "prlctl_version_file": ".prlctl_version", @@ -220,6 +220,7 @@ "variables": { "box_basename": "debian-8.4", "build_timestamp": "{{isotime \"20060102150405\"}}", + "cpus": "1", "git_revision": "__unknown_git_revision__", "headless": "", "http_proxy": "{{env `http_proxy`}}", @@ -227,6 +228,7 @@ "iso_checksum": "e0d23bf95a16984cef5c04aeb8b1c810a0df20327984963e71bbd6a5d95fb0ee", "iso_checksum_type": "sha256", "iso_name": "debian-8.4.0-amd64-CD-1.iso", + "memory": "512", "metadata": "floppy/dummy_metadata.json", "mirror": "http://cdimage.debian.org/cdimage/release", "mirror_directory": "8.4.0/amd64/iso-cd", diff --git a/debian-8.4-i386.json b/debian-8.4-i386.json index f3ee292bb..77c9d5f64 100644 --- a/debian-8.4-i386.json +++ b/debian-8.4-i386.json @@ -41,13 +41,13 @@ "modifyvm", "{{.Name}}", "--memory", - "384" + "{{ user `memory` }}" ], [ "modifyvm", "{{.Name}}", "--cpus", - "1" + "{{ user `cpus` }}" ] ], "virtualbox_version_file": ".vbox_version", @@ -92,8 +92,8 @@ "vmx_data": { "cpuid.coresPerSocket": "1", "ethernet0.pciSlotNumber": "32", - "memsize": "384", - "numvcpus": "1" + "memsize": "{{ user `memory` }}", + "numvcpus": "{{ user `cpus` }}" } }, { @@ -129,13 +129,13 @@ "set", "{{.Name}}", "--memsize", - "384" + "{{ user `memory` }}" ], [ "set", "{{.Name}}", "--cpus", - "1" + "{{ user `cpus` }}" ] ], "prlctl_version_file": ".prlctl_version", @@ -220,6 +220,7 @@ "variables": { "box_basename": "debian-8.4-i386", "build_timestamp": "{{isotime \"20060102150405\"}}", + "cpus": "1", "git_revision": "__unknown_git_revision__", "headless": "", "http_proxy": "{{env `http_proxy`}}", @@ -227,6 +228,7 @@ "iso_checksum": "180d4ff9bbf956518df7171490d57f77a96d99d123141b48d423f3c5241e0a68", "iso_checksum_type": "sha256", "iso_name": "debian-8.4.0-i386-CD-1.iso", + "memory": "512", "metadata": "floppy/dummy_metadata.json", "mirror": "http://cdimage.debian.org/cdimage/release", "mirror_directory": "8.4.0/i386/iso-cd", diff --git a/fedora-20-i386.json b/fedora-20-i386.json index 1fde7f2c7..644210b7d 100644 --- a/fedora-20-i386.json +++ b/fedora-20-i386.json @@ -26,13 +26,13 @@ "modifyvm", "{{.Name}}", "--memory", - "512" + "{{ user `memory` }}" ], [ "modifyvm", "{{.Name}}", "--cpus", - "1" + "{{ user `cpus` }}" ] ], "virtualbox_version_file": ".vbox_version", @@ -61,8 +61,8 @@ "vm_name": "{{ user `template` }}", "vmx_data": { "cpuid.coresPerSocket": "1", - "memsize": "512", - "numvcpus": "1" + "memsize": "{{ user `memory` }}", + "numvcpus": "{{ user `cpus` }}" } }, { @@ -83,13 +83,13 @@ "set", "{{.Name}}", "--memsize", - "512" + "{{ user `memory` }}" ], [ "set", "{{.Name}}", "--cpus", - "1" + "{{ user `cpus` }}" ] ], "prlctl_version_file": ".prlctl_version", @@ -158,6 +158,7 @@ "arch": "32", "box_basename": "fedora-20-i386", "build_timestamp": "{{isotime \"20060102150405\"}}", + "cpus": "1", "git_revision": "__unknown_git_revision__", "headless": "", "http_proxy": "{{env `http_proxy`}}", @@ -166,6 +167,7 @@ "iso_checksum_type": "sha256", "iso_name": "Fedora-20-i386-DVD.iso", "ks_path": "fedora-20/ks.cfg", + "memory": "512", "metadata": "floppy/dummy_metadata.json", "mirror": "https://archive.fedoraproject.org/pub/archive/fedora/linux", "mirror_directory": "releases/20/Fedora/x86_64/iso", @@ -175,4 +177,3 @@ "version": "2.0.TIMESTAMP" } } - diff --git a/fedora-20-x86_64.json b/fedora-20-x86_64.json index 94e368707..421e1c9d7 100644 --- a/fedora-20-x86_64.json +++ b/fedora-20-x86_64.json @@ -26,13 +26,13 @@ "modifyvm", "{{.Name}}", "--memory", - "512" + "{{ user `memory` }}" ], [ "modifyvm", "{{.Name}}", "--cpus", - "1" + "{{ user `cpus` }}" ] ], "virtualbox_version_file": ".vbox_version", @@ -61,8 +61,8 @@ "vm_name": "{{ user `template` }}", "vmx_data": { "cpuid.coresPerSocket": "1", - "memsize": "512", - "numvcpus": "1" + "memsize": "{{ user `memory` }}", + "numvcpus": "{{ user `cpus` }}" } }, { @@ -83,13 +83,13 @@ "set", "{{.Name}}", "--memsize", - "512" + "{{ user `memory` }}" ], [ "set", "{{.Name}}", "--cpus", - "1" + "{{ user `cpus` }}" ] ], "prlctl_version_file": ".prlctl_version", @@ -158,6 +158,7 @@ "arch": "64", "box_basename": "fedora-20", "build_timestamp": "{{isotime \"20060102150405\"}}", + "cpus": "1", "git_revision": "__unknown_git_revision__", "headless": "", "http_proxy": "{{env `http_proxy`}}", @@ -166,6 +167,7 @@ "iso_checksum_type": "sha256", "iso_name": "Fedora-20-x86_64-DVD.iso", "ks_path": "fedora-20/ks.cfg", + "memory": "512", "metadata": "floppy/dummy_metadata.json", "mirror": "https://archive.fedoraproject.org/pub/archive/fedora/linux", "mirror_directory": "releases/20/Fedora/x86_64/iso", @@ -175,4 +177,3 @@ "version": "2.0.TIMESTAMP" } } - diff --git a/fedora-21-i386.json b/fedora-21-i386.json index e7deec52a..7d2c4a2de 100644 --- a/fedora-21-i386.json +++ b/fedora-21-i386.json @@ -26,13 +26,13 @@ "modifyvm", "{{.Name}}", "--memory", - "512" + "{{ user `memory` }}" ], [ "modifyvm", "{{.Name}}", "--cpus", - "1" + "{{ user `cpus` }}" ] ], "virtualbox_version_file": ".vbox_version", @@ -61,8 +61,8 @@ "vm_name": "{{ user `template` }}", "vmx_data": { "cpuid.coresPerSocket": "1", - "memsize": "512", - "numvcpus": "1" + "memsize": "{{ user `memory` }}", + "numvcpus": "{{ user `cpus` }}" } }, { @@ -83,13 +83,13 @@ "set", "{{.Name}}", "--memsize", - "512" + "{{ user `memory` }}" ], [ "set", "{{.Name}}", "--cpus", - "1" + "{{ user `cpus` }}" ] ], "prlctl_version_file": ".prlctl_version", @@ -158,6 +158,7 @@ "arch": "32", "box_basename": "fedora-21-i386", "build_timestamp": "{{isotime \"20060102150405\"}}", + "cpus": "1", "git_revision": "__unknown_git_revision__", "headless": "", "http_proxy": "{{env `http_proxy`}}", @@ -166,6 +167,7 @@ "iso_checksum_type": "sha256", "iso_name": "Fedora-Server-DVD-i386-21.iso", "ks_path": "fedora-21/ks.cfg", + "memory": "512", "metadata": "floppy/dummy_metadata.json", "mirror": "http://download.fedoraproject.org/pub/fedora/linux", "mirror_directory": "releases/21/Server/i386/iso", diff --git a/fedora-21-x86_64.json b/fedora-21-x86_64.json index c91df99f6..4d1db0589 100644 --- a/fedora-21-x86_64.json +++ b/fedora-21-x86_64.json @@ -26,13 +26,13 @@ "modifyvm", "{{.Name}}", "--memory", - "512" + "{{ user `memory` }}" ], [ "modifyvm", "{{.Name}}", "--cpus", - "1" + "{{ user `cpus` }}" ] ], "virtualbox_version_file": ".vbox_version", @@ -61,8 +61,8 @@ "vm_name": "{{ user `template` }}", "vmx_data": { "cpuid.coresPerSocket": "1", - "memsize": "512", - "numvcpus": "1" + "memsize": "{{ user `memory` }}", + "numvcpus": "{{ user `cpus` }}" } }, { @@ -83,13 +83,13 @@ "set", "{{.Name}}", "--memsize", - "512" + "{{ user `memory` }}" ], [ "set", "{{.Name}}", "--cpus", - "1" + "{{ user `cpus` }}" ] ], "prlctl_version_file": ".prlctl_version", @@ -158,6 +158,7 @@ "arch": "64", "box_basename": "fedora-21", "build_timestamp": "{{isotime \"20060102150405\"}}", + "cpus": "1", "git_revision": "__unknown_git_revision__", "headless": "", "http_proxy": "{{env `http_proxy`}}", @@ -166,6 +167,7 @@ "iso_checksum_type": "sha256", "iso_name": "Fedora-Server-DVD-x86_64-21.iso", "ks_path": "fedora-21/ks.cfg", + "memory": "512", "metadata": "floppy/dummy_metadata.json", "mirror": "http://download.fedoraproject.org/pub/fedora/linux", "mirror_directory": "releases/21/Server/x86_64/iso", diff --git a/fedora-22-i386.json b/fedora-22-i386.json index 3e8773bd6..c02ad1bfc 100644 --- a/fedora-22-i386.json +++ b/fedora-22-i386.json @@ -27,13 +27,13 @@ "modifyvm", "{{.Name}}", "--memory", - "512" + "{{ user `memory` }}" ], [ "modifyvm", "{{.Name}}", "--cpus", - "1" + "{{ user `cpus` }}" ] ], "virtualbox_version_file": ".vbox_version", @@ -62,8 +62,8 @@ "vm_name": "{{ user `template` }}", "vmx_data": { "cpuid.coresPerSocket": "1", - "memsize": "512", - "numvcpus": "1" + "memsize": "{{ user `memory` }}", + "numvcpus": "{{ user `cpus` }}" } }, { @@ -84,13 +84,13 @@ "set", "{{.Name}}", "--memsize", - "512" + "{{ user `memory` }}" ], [ "set", "{{.Name}}", "--cpus", - "1" + "{{ user `cpus` }}" ] ], "prlctl_version_file": ".prlctl_version", @@ -155,6 +155,7 @@ "arch": "32", "box_basename": "fedora-22-i386", "build_timestamp": "{{isotime \"20060102150405\"}}", + "cpus": "1", "git_revision": "__unknown_git_revision__", "headless": "", "http_proxy": "{{env `http_proxy`}}", @@ -163,6 +164,7 @@ "iso_checksum_type": "sha256", "iso_name": "Fedora-Server-DVD-i386-22.iso", "ks_path": "fedora-22/ks.cfg", + "memory": "512", "metadata": "floppy/dummy_metadata.json", "mirror": "http://download.fedoraproject.org/pub/fedora/linux", "mirror_directory": "releases/22/Server/i386/iso", diff --git a/fedora-22-x86_64.json b/fedora-22-x86_64.json index a449ff01a..5074668ac 100644 --- a/fedora-22-x86_64.json +++ b/fedora-22-x86_64.json @@ -26,13 +26,13 @@ "modifyvm", "{{.Name}}", "--memory", - "512" + "{{ user `memory` }}" ], [ "modifyvm", "{{.Name}}", "--cpus", - "1" + "{{ user `cpus` }}" ] ], "virtualbox_version_file": ".vbox_version", @@ -61,8 +61,8 @@ "vm_name": "{{ user `template` }}", "vmx_data": { "cpuid.coresPerSocket": "1", - "memsize": "512", - "numvcpus": "1" + "memsize": "{{ user `memory` }}", + "numvcpus": "{{ user `cpus` }}" } }, { @@ -83,13 +83,13 @@ "set", "{{.Name}}", "--memsize", - "512" + "{{ user `memory` }}" ], [ "set", "{{.Name}}", "--cpus", - "1" + "{{ user `cpus` }}" ] ], "prlctl_version_file": ".prlctl_version", @@ -159,6 +159,7 @@ "arch": "64", "box_basename": "fedora-22", "build_timestamp": "{{isotime \"20060102150405\"}}", + "cpus": "1", "git_revision": "__unknown_git_revision__", "headless": "", "http_proxy": "{{env `http_proxy`}}", @@ -167,6 +168,7 @@ "iso_checksum_type": "sha256", "iso_name": "Fedora-Server-DVD-x86_64-22.iso", "ks_path": "fedora-22/ks.cfg", + "memory": "512", "metadata": "floppy/dummy_metadata.json", "mirror": "http://download.fedoraproject.org/pub/fedora/linux", "mirror_directory": "releases/22/Server/x86_64/iso", diff --git a/fedora-23-i386.json b/fedora-23-i386.json index 74a6a5450..63ec2a022 100644 --- a/fedora-23-i386.json +++ b/fedora-23-i386.json @@ -27,13 +27,13 @@ "modifyvm", "{{.Name}}", "--memory", - "512" + "{{ user `memory` }}" ], [ "modifyvm", "{{.Name}}", "--cpus", - "1" + "{{ user `cpus` }}" ] ], "virtualbox_version_file": ".vbox_version", @@ -62,8 +62,8 @@ "vm_name": "{{ user `template` }}", "vmx_data": { "cpuid.coresPerSocket": "1", - "memsize": "512", - "numvcpus": "1" + "memsize": "{{ user `memory` }}", + "numvcpus": "{{ user `cpus` }}" } }, { @@ -84,13 +84,13 @@ "set", "{{.Name}}", "--memsize", - "512" + "{{ user `memory` }}" ], [ "set", "{{.Name}}", "--cpus", - "1" + "{{ user `cpus` }}" ] ], "prlctl_version_file": ".prlctl_version", @@ -155,6 +155,7 @@ "arch": "32", "box_basename": "fedora-23-i386", "build_timestamp": "{{isotime \"20060102150405\"}}", + "cpus": "1", "git_revision": "__unknown_git_revision__", "headless": "", "http_proxy": "{{env `http_proxy`}}", @@ -163,6 +164,7 @@ "iso_checksum_type": "sha256", "iso_name": "Fedora-Server-DVD-i386-23.iso", "ks_path": "fedora-23/ks.cfg", + "memory": "512", "metadata": "floppy/dummy_metadata.json", "mirror": "http://download.fedoraproject.org/pub/fedora/linux", "mirror_directory": "releases/23/Server/i386/iso", diff --git a/fedora-23-x86_64.json b/fedora-23-x86_64.json index 5f4311857..0f089e5db 100644 --- a/fedora-23-x86_64.json +++ b/fedora-23-x86_64.json @@ -26,13 +26,13 @@ "modifyvm", "{{.Name}}", "--memory", - "512" + "{{ user `memory` }}" ], [ "modifyvm", "{{.Name}}", "--cpus", - "1" + "{{ user `cpus` }}" ] ], "virtualbox_version_file": ".vbox_version", @@ -61,8 +61,8 @@ "vm_name": "{{ user `template` }}", "vmx_data": { "cpuid.coresPerSocket": "1", - "memsize": "512", - "numvcpus": "1" + "memsize": "{{ user `memory` }}", + "numvcpus": "{{ user `cpus` }}" } }, { @@ -83,13 +83,13 @@ "set", "{{.Name}}", "--memsize", - "512" + "{{ user `memory` }}" ], [ "set", "{{.Name}}", "--cpus", - "1" + "{{ user `cpus` }}" ] ], "prlctl_version_file": ".prlctl_version", @@ -159,6 +159,7 @@ "arch": "64", "box_basename": "fedora-23", "build_timestamp": "{{isotime \"20060102150405\"}}", + "cpus": "1", "git_revision": "__unknown_git_revision__", "headless": "", "http_proxy": "{{env `http_proxy`}}", @@ -167,6 +168,7 @@ "iso_checksum_type": "sha256", "iso_name": "Fedora-Server-DVD-x86_64-23.iso", "ks_path": "fedora-23/ks.cfg", + "memory": "512", "metadata": "floppy/dummy_metadata.json", "mirror": "http://download.fedoraproject.org/pub/fedora/linux", "mirror_directory": "releases/23/Server/x86_64/iso", diff --git a/freebsd-10.2-amd64.json b/freebsd-10.2-amd64.json index e42a33fd9..dae70f3aa 100644 --- a/freebsd-10.2-amd64.json +++ b/freebsd-10.2-amd64.json @@ -33,13 +33,13 @@ "modifyvm", "{{.Name}}", "--memory", - "512" + "{{ user `memory` }}" ], [ "modifyvm", "{{.Name}}", "--cpus", - "1" + "{{ user `cpus` }}" ] ], "virtualbox_version_file": ".vbox_version", @@ -77,8 +77,8 @@ "vm_name": "{{ user `template` }}", "vmx_data": { "cpuid.coresPerSocket": "1", - "memsize": "512", - "numvcpus": "1" + "memsize": "{{ user `memory` }}", + "numvcpus": "{{ user `cpus` }}" } }, { @@ -107,13 +107,13 @@ "set", "{{.Name}}", "--memsize", - "512" + "{{ user `memory` }}" ], [ "set", "{{.Name}}", "--cpus", - "1" + "{{ user `cpus` }}" ], [ "set", @@ -211,6 +211,7 @@ "variables": { "box_basename": "freebsd-10.2", "build_timestamp": "{{isotime \"20060102150405\"}}", + "cpus": "1", "git_revision": "__unknown_git_revision__", "headless": "", "http_proxy": "{{env `http_proxy`}}", @@ -219,6 +220,7 @@ "iso_checksum": "97908f5cd00d86cafeb2c265bfabbd0aa79f87e9b6b31ecdb756bc96a4a62e93", "iso_checksum_type": "sha256", "iso_name": "FreeBSD-10.2-RELEASE-amd64-disc1.iso", + "memory": "512", "metadata": "floppy/dummy_metadata.json", "mirror": "http://ftp.freebsd.org/pub/FreeBSD", "mirror_directory": "releases/amd64/amd64/ISO-IMAGES/10.2", diff --git a/freebsd-10.2-i386.json b/freebsd-10.2-i386.json index 607f96c07..18473fc77 100644 --- a/freebsd-10.2-i386.json +++ b/freebsd-10.2-i386.json @@ -33,13 +33,13 @@ "modifyvm", "{{.Name}}", "--memory", - "512" + "{{ user `memory` }}" ], [ "modifyvm", "{{.Name}}", "--cpus", - "1" + "{{ user `cpus` }}" ] ], "virtualbox_version_file": ".vbox_version", @@ -77,8 +77,8 @@ "vm_name": "{{ user `template` }}", "vmx_data": { "cpuid.coresPerSocket": "1", - "memsize": "512", - "numvcpus": "1" + "memsize": "{{ user `memory` }}", + "numvcpus": "{{ user `cpus` }}" } }, { @@ -107,13 +107,13 @@ "set", "{{.Name}}", "--memsize", - "512" + "{{ user `memory` }}" ], [ "set", "{{.Name}}", "--cpus", - "1" + "{{ user `cpus` }}" ], [ "set", @@ -211,6 +211,7 @@ "variables": { "box_basename": "freebsd-10.2-i386", "build_timestamp": "{{isotime \"20060102150405\"}}", + "cpus": "1", "git_revision": "__unknown_git_revision__", "headless": "", "http_proxy": "{{env `http_proxy`}}", @@ -219,6 +220,7 @@ "iso_checksum": "0e7094ae9f4f79d8955f193a1f2f5ab4f8b300e57eccd3b9bd959951ee079020", "iso_checksum_type": "sha256", "iso_name": "FreeBSD-10.2-RELEASE-i386-disc1.iso", + "memory": "512", "metadata": "floppy/dummy_metadata.json", "mirror": "http://ftp.freebsd.org/pub/FreeBSD", "mirror_directory": "releases/i386/i386/ISO-IMAGES/10.2", diff --git a/freebsd-10.3-amd64.json b/freebsd-10.3-amd64.json index ce875666a..c6696d8e6 100644 --- a/freebsd-10.3-amd64.json +++ b/freebsd-10.3-amd64.json @@ -33,13 +33,13 @@ "modifyvm", "{{.Name}}", "--memory", - "512" + "{{ user `memory` }}" ], [ "modifyvm", "{{.Name}}", "--cpus", - "1" + "{{ user `cpus` }}" ] ], "virtualbox_version_file": ".vbox_version", @@ -77,8 +77,8 @@ "vm_name": "{{ user `template` }}", "vmx_data": { "cpuid.coresPerSocket": "1", - "memsize": "512", - "numvcpus": "1" + "memsize": "{{ user `memory` }}", + "numvcpus": "{{ user `cpus` }}" } }, { @@ -107,13 +107,13 @@ "set", "{{.Name}}", "--memsize", - "512" + "{{ user `memory` }}" ], [ "set", "{{.Name}}", "--cpus", - "1" + "{{ user `cpus` }}" ], [ "set", @@ -211,6 +211,7 @@ "variables": { "box_basename": "freebsd-10.3", "build_timestamp": "{{isotime \"20060102150405\"}}", + "cpus": "1", "git_revision": "__unknown_git_revision__", "headless": "", "http_proxy": "{{env `http_proxy`}}", @@ -219,6 +220,7 @@ "iso_checksum": "fef068cf6dea26923ab84b62ba9f21461ca0bdec90a0741c8ffb0e1ca29e410d", "iso_checksum_type": "sha256", "iso_name": "FreeBSD-10.3-RELEASE-amd64-disc1.iso", + "memory": "512", "metadata": "floppy/dummy_metadata.json", "mirror": "http://ftp.freebsd.org/pub/FreeBSD", "mirror_directory": "releases/amd64/amd64/ISO-IMAGES/10.3", diff --git a/freebsd-10.3-i386.json b/freebsd-10.3-i386.json index 9e3a993d3..dbe27f071 100644 --- a/freebsd-10.3-i386.json +++ b/freebsd-10.3-i386.json @@ -33,13 +33,13 @@ "modifyvm", "{{.Name}}", "--memory", - "512" + "{{ user `memory` }}" ], [ "modifyvm", "{{.Name}}", "--cpus", - "1" + "{{ user `cpus` }}" ] ], "virtualbox_version_file": ".vbox_version", @@ -77,8 +77,8 @@ "vm_name": "{{ user `template` }}", "vmx_data": { "cpuid.coresPerSocket": "1", - "memsize": "512", - "numvcpus": "1" + "memsize": "{{ user `memory` }}", + "numvcpus": "{{ user `cpus` }}" } }, { @@ -107,13 +107,13 @@ "set", "{{.Name}}", "--memsize", - "512" + "{{ user `memory` }}" ], [ "set", "{{.Name}}", "--cpus", - "1" + "{{ user `cpus` }}" ], [ "set", @@ -211,6 +211,7 @@ "variables": { "box_basename": "freebsd-10.3-i386", "build_timestamp": "{{isotime \"20060102150405\"}}", + "cpus": "1", "git_revision": "__unknown_git_revision__", "headless": "", "http_proxy": "{{env `http_proxy`}}", @@ -219,6 +220,7 @@ "iso_checksum": "8329ee2ca4779892edbb001c303670d74642e4353e97d02f4521895023cacd5d", "iso_checksum_type": "sha256", "iso_name": "FreeBSD-10.3-RELEASE-i386-disc1.iso", + "memory": "512", "metadata": "floppy/dummy_metadata.json", "mirror": "http://ftp.freebsd.org/pub/FreeBSD", "mirror_directory": "releases/i386/i386/ISO-IMAGES/10.3", diff --git a/freebsd-9.3-amd64.json b/freebsd-9.3-amd64.json index feb81baa6..a816c5113 100644 --- a/freebsd-9.3-amd64.json +++ b/freebsd-9.3-amd64.json @@ -37,13 +37,13 @@ "modifyvm", "{{.Name}}", "--memory", - "512" + "{{ user `memory` }}" ], [ "modifyvm", "{{.Name}}", "--cpus", - "1" + "{{ user `cpus` }}" ] ], "virtualbox_version_file": ".vbox_version", @@ -85,8 +85,8 @@ "vm_name": "{{ user `template` }}", "vmx_data": { "cpuid.coresPerSocket": "1", - "memsize": "512", - "numvcpus": "1" + "memsize": "{{ user `memory` }}", + "numvcpus": "{{ user `cpus` }}" } }, { @@ -119,13 +119,13 @@ "set", "{{.Name}}", "--memsize", - "512" + "{{ user `memory` }}" ], [ "set", "{{.Name}}", "--cpus", - "1" + "{{ user `cpus` }}" ], [ "set", @@ -227,6 +227,7 @@ "variables": { "box_basename": "freebsd-9.3", "build_timestamp": "{{isotime \"20060102150405\"}}", + "cpus": "1", "git_revision": "__unknown_git_revision__", "headless": "", "http_proxy": "{{env `http_proxy`}}", @@ -235,6 +236,7 @@ "iso_checksum": "5a3c82653d77bba7d7ded8bd7efbedc09d52cf4045d98ce52a82c9e0f8fa9b0e", "iso_checksum_type": "sha256", "iso_name": "FreeBSD-9.3-RELEASE-amd64-disc1.iso", + "memory": "512", "metadata": "floppy/dummy_metadata.json", "mirror": "http://ftp.freebsd.org/pub/FreeBSD", "mirror_directory": "releases/amd64/amd64/ISO-IMAGES/9.3", @@ -244,4 +246,3 @@ "version": "2.1.TIMESTAMP" } } - diff --git a/freebsd-9.3-i386.json b/freebsd-9.3-i386.json index e2d260a78..30dc011c7 100644 --- a/freebsd-9.3-i386.json +++ b/freebsd-9.3-i386.json @@ -37,13 +37,13 @@ "modifyvm", "{{.Name}}", "--memory", - "512" + "{{ user `memory` }}" ], [ "modifyvm", "{{.Name}}", "--cpus", - "1" + "{{ user `cpus` }}" ] ], "virtualbox_version_file": ".vbox_version", @@ -85,8 +85,8 @@ "vm_name": "{{ user `template` }}", "vmx_data": { "cpuid.coresPerSocket": "1", - "memsize": "512", - "numvcpus": "1" + "memsize": "{{ user `memory` }}", + "numvcpus": "{{ user `cpus` }}" } }, { @@ -119,13 +119,13 @@ "set", "{{.Name}}", "--memsize", - "512" + "{{ user `memory` }}" ], [ "set", "{{.Name}}", "--cpus", - "1" + "{{ user `cpus` }}" ], [ "set", @@ -227,6 +227,7 @@ "variables": { "box_basename": "freebsd-9.3-i386", "build_timestamp": "{{isotime \"20060102150405\"}}", + "cpus": "1", "git_revision": "__unknown_git_revision__", "headless": "", "http_proxy": "{{env `http_proxy`}}", @@ -235,6 +236,7 @@ "iso_checksum": "cab6aad9c3d5ea6a3fb4059f808225c67f1edaea730c555a86a9707ac41ba75d", "iso_checksum_type": "sha256", "iso_name": "FreeBSD-9.3-RELEASE-i386-disc1.iso", + "memory": "512", "metadata": "floppy/dummy_metadata.json", "mirror": "http://ftp.freebsd.org/pub/FreeBSD", "mirror_directory": "releases/i386/i386/ISO-IMAGES/9.3", @@ -244,4 +246,3 @@ "version": "2.1.TIMESTAMP" } } - diff --git a/macosx-10.10.json b/macosx-10.10.json index 7ad6c9df2..111e08013 100644 --- a/macosx-10.10.json +++ b/macosx-10.10.json @@ -26,8 +26,8 @@ "hpet0.present": "TRUE", "ich7m.present": "TRUE", "keyboardAndMouseProfile": "macProfile", - "memsize": "2048", - "numvcpus": "1", + "memsize": "{{ user `memory` }}", + "numvcpus": "{{ user `cpus` }}", "smc.present": "TRUE", "usb.present": "TRUE" } @@ -78,7 +78,7 @@ "modifyvm", "{{.Name}}", "--cpus", - "1" + "{{ user `cpus` }}" ], [ "modifyvm", @@ -102,7 +102,7 @@ "modifyvm", "{{.Name}}", "--memory", - "2048" + "{{ user `memory` }}" ], [ "modifyvm", @@ -122,7 +122,7 @@ "--storagectl", "SATA Controller", "--port", - "1", + "{{ user `cpus` }}", "--type", "dvddrive", "--medium", @@ -136,7 +136,7 @@ "--storagectl", "SATA Controller", "--port", - "1", + "{{ user `cpus` }}", "--type", "dvddrive", "--medium", @@ -163,8 +163,8 @@ "output_directory": "packer-{{user `template`}}-parallels", "parallels_tools_flavor": "mac", "prlctl": [ - ["set", "{{.Name}}", "--memsize", "2048"], - ["set", "{{.Name}}", "--cpus", "1"], + ["set", "{{.Name}}", "--memsize", "{{ user `memory` }}"], + ["set", "{{.Name}}", "--cpus", "{{ user `cpus` }}"], ["set", "{{.Name}}", "--on-window-close", "keep-running"] ], "shutdown_command": "echo 'vagrant'| sudo -S shutdown -h now", @@ -214,6 +214,7 @@ "_README": "You must provide a prepared Mac disk image (from https://github.com/timsutton/osx-vm-templates) and checksum value for this template to work. For more details, consult this project's README.md", "box_basename": "macosx-10.10", "build_timestamp": "{{isotime \"20060102150405\"}}", + "cpus": "1", "git_revision": "__unknown_git_revision__", "headless": "", "http_proxy": "{{env `http_proxy`}}", @@ -221,6 +222,7 @@ "iso_checksum": "__unset_iso_checksum__", "iso_checksum_type": "md5", "iso_url": "http://YOU-MUST-PROVIDE-YOUR-OWN-DMG.sorry", + "memory": "2048", "metadata": "floppy/dummy_metadata.json", "name": "macosx-10.10", "no_proxy": "{{env `no_proxy`}}", @@ -228,4 +230,3 @@ "version": "2.1.TIMESTAMP" } } - diff --git a/macosx-10.11.json b/macosx-10.11.json index d8bd3aafd..0dc917dd4 100644 --- a/macosx-10.11.json +++ b/macosx-10.11.json @@ -26,8 +26,8 @@ "hpet0.present": "TRUE", "ich7m.present": "TRUE", "keyboardAndMouseProfile": "macProfile", - "memsize": "2048", - "numvcpus": "1", + "memsize": "{{ user `memory` }}", + "numvcpus": "{{ user `cpus` }}", "smc.present": "TRUE", "usb.present": "TRUE" } @@ -78,7 +78,7 @@ "modifyvm", "{{.Name}}", "--cpus", - "1" + "{{ user `cpus` }}" ], [ "modifyvm", @@ -102,7 +102,7 @@ "modifyvm", "{{.Name}}", "--memory", - "2048" + "{{ user `memory` }}" ], [ "modifyvm", @@ -122,7 +122,7 @@ "--storagectl", "SATA Controller", "--port", - "1", + "{{ user `cpus` }}", "--type", "dvddrive", "--medium", @@ -136,7 +136,7 @@ "--storagectl", "SATA Controller", "--port", - "1", + "{{ user `cpus` }}", "--type", "dvddrive", "--medium", @@ -163,8 +163,8 @@ "output_directory": "packer-{{user `template`}}-parallels", "parallels_tools_flavor": "mac", "prlctl": [ - ["set", "{{.Name}}", "--memsize", "2048"], - ["set", "{{.Name}}", "--cpus", "1"], + ["set", "{{.Name}}", "--memsize", "{{ user `memory` }}"], + ["set", "{{.Name}}", "--cpus", "{{ user `cpus` }}"], ["set", "{{.Name}}", "--on-window-close", "keep-running"] ], "shutdown_command": "echo 'vagrant'| sudo -S shutdown -h now", @@ -214,6 +214,7 @@ "_README": "You must provide a prepared Mac disk image (from https://github.com/timsutton/osx-vm-templates) and checksum value for this template to work. For more details, consult this project's README.md", "box_basename": "macosx-10.11", "build_timestamp": "{{isotime \"20060102150405\"}}", + "cpus": "1", "git_revision": "__unknown_git_revision__", "headless": "", "http_proxy": "{{env `http_proxy`}}", @@ -221,6 +222,7 @@ "iso_checksum": "__unset_iso_checksum__", "iso_checksum_type": "md5", "iso_url": "http://YOU-MUST-PROVIDE-YOUR-OWN-DMG.sorry", + "memory": "2048", "metadata": "floppy/dummy_metadata.json", "name": "macosx-10.11", "no_proxy": "{{env `no_proxy`}}", diff --git a/macosx-10.7.json b/macosx-10.7.json index e667e4c43..60dd55045 100644 --- a/macosx-10.7.json +++ b/macosx-10.7.json @@ -26,8 +26,8 @@ "hpet0.present": "TRUE", "ich7m.present": "TRUE", "keyboardAndMouseProfile": "macProfile", - "memsize": "2048", - "numvcpus": "1", + "memsize": "{{ user `memory` }}", + "numvcpus": "{{ user `cpus` }}", "smc.present": "TRUE", "usb.present": "TRUE" } @@ -78,7 +78,7 @@ "modifyvm", "{{.Name}}", "--cpus", - "1" + "{{ user `cpus` }}" ], [ "modifyvm", @@ -102,7 +102,7 @@ "modifyvm", "{{.Name}}", "--memory", - "2048" + "{{ user `memory` }}" ], [ "modifyvm", @@ -122,7 +122,7 @@ "--storagectl", "SATA Controller", "--port", - "1", + "{{ user `cpus` }}", "--type", "dvddrive", "--medium", @@ -136,7 +136,7 @@ "--storagectl", "SATA Controller", "--port", - "1", + "{{ user `cpus` }}", "--type", "dvddrive", "--medium", @@ -163,8 +163,8 @@ "output_directory": "packer-{{user `template`}}-parallels", "parallels_tools_flavor": "mac", "prlctl": [ - ["set", "{{.Name}}", "--memsize", "2048"], - ["set", "{{.Name}}", "--cpus", "1"], + ["set", "{{.Name}}", "--memsize", "{{ user `memory` }}"], + ["set", "{{.Name}}", "--cpus", "{{ user `cpus` }}"], ["set", "{{.Name}}", "--on-window-close", "keep-running"] ], "shutdown_command": "echo 'vagrant'| sudo -S shutdown -h now", @@ -214,6 +214,7 @@ "_README": "You must provide a prepared Mac disk image (from https://github.com/timsutton/osx-vm-templates) and checksum value for this template to work. For more details, consult this project's README.md", "box_basename": "macosx-10.7", "build_timestamp": "{{isotime \"20060102150405\"}}", + "cpus": "1", "git_revision": "__unknown_git_revision__", "headless": "", "http_proxy": "{{env `http_proxy`}}", @@ -221,6 +222,7 @@ "iso_checksum": "__unset_iso_checksum__", "iso_checksum_type": "md5", "iso_url": "http://YOU-MUST-PROVIDE-YOUR-OWN-DMG.sorry", + "memory": "2048", "metadata": "floppy/dummy_metadata.json", "name": "macosx-10.7", "no_proxy": "{{env `no_proxy`}}", @@ -228,4 +230,3 @@ "version": "2.1.TIMESTAMP" } } - diff --git a/macosx-10.8.json b/macosx-10.8.json index 012b5c623..362db55b1 100644 --- a/macosx-10.8.json +++ b/macosx-10.8.json @@ -26,8 +26,8 @@ "hpet0.present": "TRUE", "ich7m.present": "TRUE", "keyboardAndMouseProfile": "macProfile", - "memsize": "2048", - "numvcpus": "1", + "memsize": "{{ user `memory` }}", + "numvcpus": "{{ user `cpus` }}", "smc.present": "TRUE", "usb.present": "TRUE" } @@ -78,7 +78,7 @@ "modifyvm", "{{.Name}}", "--cpus", - "1" + "{{ user `cpus` }}" ], [ "modifyvm", @@ -102,7 +102,7 @@ "modifyvm", "{{.Name}}", "--memory", - "2048" + "{{ user `memory` }}" ], [ "modifyvm", @@ -122,7 +122,7 @@ "--storagectl", "SATA Controller", "--port", - "1", + "{{ user `cpus` }}", "--type", "dvddrive", "--medium", @@ -136,7 +136,7 @@ "--storagectl", "SATA Controller", "--port", - "1", + "{{ user `cpus` }}", "--type", "dvddrive", "--medium", @@ -163,8 +163,8 @@ "output_directory": "packer-{{user `template`}}-parallels", "parallels_tools_flavor": "mac", "prlctl": [ - ["set", "{{.Name}}", "--memsize", "2048"], - ["set", "{{.Name}}", "--cpus", "1"], + ["set", "{{.Name}}", "--memsize", "{{ user `memory` }}"], + ["set", "{{.Name}}", "--cpus", "{{ user `cpus` }}"], ["set", "{{.Name}}", "--on-window-close", "keep-running"] ], "shutdown_command": "echo 'vagrant'| sudo -S shutdown -h now", @@ -214,6 +214,7 @@ "_README": "You must provide a prepared Mac disk image (from https://github.com/timsutton/osx-vm-templates) and checksum value for this template to work. For more details, consult this project's README.md", "box_basename": "macosx-10.8", "build_timestamp": "{{isotime \"20060102150405\"}}", + "cpus": "1", "git_revision": "__unknown_git_revision__", "headless": "", "http_proxy": "{{env `http_proxy`}}", @@ -221,6 +222,7 @@ "iso_checksum": "__unset_iso_checksum__", "iso_checksum_type": "md5", "iso_url": "http://YOU-MUST-PROVIDE-YOUR-OWN-DMG.sorry", + "memory": "2048", "metadata": "floppy/dummy_metadata.json", "name": "macosx-10.8", "no_proxy": "{{env `no_proxy`}}", @@ -228,4 +230,3 @@ "version": "2.1.TIMESTAMP" } } - diff --git a/macosx-10.9.json b/macosx-10.9.json index ffd041f33..c9cc33a17 100644 --- a/macosx-10.9.json +++ b/macosx-10.9.json @@ -26,8 +26,8 @@ "hpet0.present": "TRUE", "ich7m.present": "TRUE", "keyboardAndMouseProfile": "macProfile", - "memsize": "2048", - "numvcpus": "1", + "memsize": "{{ user `memory` }}", + "numvcpus": "{{ user `cpus` }}", "smc.present": "TRUE", "usb.present": "TRUE" } @@ -78,7 +78,7 @@ "modifyvm", "{{.Name}}", "--cpus", - "1" + "{{ user `cpus` }}" ], [ "modifyvm", @@ -102,7 +102,7 @@ "modifyvm", "{{.Name}}", "--memory", - "2048" + "{{ user `memory` }}" ], [ "modifyvm", @@ -122,7 +122,7 @@ "--storagectl", "SATA Controller", "--port", - "1", + "{{ user `cpus` }}", "--type", "dvddrive", "--medium", @@ -136,7 +136,7 @@ "--storagectl", "SATA Controller", "--port", - "1", + "{{ user `cpus` }}", "--type", "dvddrive", "--medium", @@ -163,8 +163,8 @@ "output_directory": "packer-{{user `template`}}-parallels", "parallels_tools_flavor": "mac", "prlctl": [ - ["set", "{{.Name}}", "--memsize", "2048"], - ["set", "{{.Name}}", "--cpus", "1"], + ["set", "{{.Name}}", "--memsize", "{{ user `memory` }}"], + ["set", "{{.Name}}", "--cpus", "{{ user `cpus` }}"], ["set", "{{.Name}}", "--on-window-close", "keep-running"] ], "shutdown_command": "echo 'vagrant'| sudo -S shutdown -h now", @@ -214,6 +214,7 @@ "_README": "You must provide a prepared Mac disk image (from https://github.com/timsutton/osx-vm-templates) and checksum value for this template to work. For more details, consult this project's README.md", "box_basename": "macosx-10.9", "build_timestamp": "{{isotime \"20060102150405\"}}", + "cpus": "1", "git_revision": "__unknown_git_revision__", "headless": "", "http_proxy": "{{env `http_proxy`}}", @@ -221,6 +222,7 @@ "iso_checksum": "__unset_iso_checksum__", "iso_checksum_type": "md5", "iso_url": "http://YOU-MUST-PROVIDE-YOUR-OWN-DMG.sorry", + "memory": "2048", "metadata": "floppy/dummy_metadata.json", "name": "macosx-10.9", "no_proxy": "{{env `no_proxy`}}", @@ -228,4 +230,3 @@ "version": "2.1.TIMESTAMP" } } - diff --git a/omnios-r151010j.json b/omnios-r151010j.json index df9c3a009..ea8149fcf 100644 --- a/omnios-r151010j.json +++ b/omnios-r151010j.json @@ -54,7 +54,7 @@ "modifyvm", "{{.Name}}", "--cpus", - "1" + "{{ user `cpus` }}" ] ], "virtualbox_version_file": ".vbox_version", @@ -113,7 +113,7 @@ "vmx_data": { "cpuid.coresPerSocket": "1", "memsize": "1024", - "numvcpus": "1" + "numvcpus": "{{ user `cpus` }}" } }, { @@ -162,13 +162,13 @@ "set", "{{.Name}}", "--memsize", - "512" + "{{ user `memory` }}" ], [ "set", "{{.Name}}", "--cpus", - "1" + "{{ user `cpus` }}" ] ], "shutdown_command": "/usr/sbin/shutdown -g 0 -y -i 5", @@ -212,8 +212,10 @@ "arch": "64", "box_basename": "omnios-r151010j", "build_timestamp": "{{isotime \"20060102150405\"}}", + "cpus": "1", "git_revision": "__unknown_git_revision__", "headless": "", + "memory": "512", "metadata": "floppy/dummy_metadata.json", "mirror": "http://omnios.omniti.com/media", "name": "omnios-r151010j", @@ -221,4 +223,3 @@ "version": "2.0.TIMESTAMP" } } - diff --git a/omnios-r151014.json b/omnios-r151014.json index 36ca27d92..6a64cd1c6 100644 --- a/omnios-r151014.json +++ b/omnios-r151014.json @@ -54,7 +54,7 @@ "modifyvm", "{{.Name}}", "--cpus", - "1" + "{{ user `cpus` }}" ] ], "virtualbox_version_file": ".vbox_version", @@ -113,7 +113,7 @@ "vmx_data": { "cpuid.coresPerSocket": "1", "memsize": "1024", - "numvcpus": "1" + "numvcpus": "{{ user `cpus` }}" } }, { @@ -168,7 +168,7 @@ "set", "{{.Name}}", "--cpus", - "1" + "{{ user `cpus` }}" ] ], "shutdown_command": "/usr/sbin/shutdown -g 0 -y -i 5", @@ -217,6 +217,7 @@ "arch": "64", "box_basename": "omnios-r151014", "build_timestamp": "{{isotime \"20060102150405\"}}", + "cpus": "1", "git_revision": "__unknown_git_revision__", "headless": "", "http_proxy": "{{env `http_proxy`}}", @@ -224,6 +225,7 @@ "iso_checksum": "16fd303c81521db72fe6b0b5e891cffb5f9caa60", "iso_checksum_type": "sha1", "iso_name": "OmniOS_Text_r151014.iso", + "memory": "512", "metadata": "floppy/dummy_metadata.json", "mirror": "http://omnios.omniti.com", "mirror_directory": "media", diff --git a/omnios-r151018.json b/omnios-r151018.json index e95122879..1ca25ce6f 100644 --- a/omnios-r151018.json +++ b/omnios-r151018.json @@ -54,7 +54,7 @@ "modifyvm", "{{.Name}}", "--cpus", - "1" + "{{ user `cpus` }}" ] ], "virtualbox_version_file": ".vbox_version", @@ -113,7 +113,7 @@ "vmx_data": { "cpuid.coresPerSocket": "1", "memsize": "1024", - "numvcpus": "1" + "numvcpus": "{{ user `cpus` }}" } }, { @@ -168,7 +168,7 @@ "set", "{{.Name}}", "--cpus", - "1" + "{{ user `cpus` }}" ] ], "shutdown_command": "/usr/sbin/shutdown -g 0 -y -i 5", @@ -217,6 +217,7 @@ "arch": "64", "box_basename": "omnios-r151018", "build_timestamp": "{{isotime \"20060102150405\"}}", + "cpus": "1", "git_revision": "__unknown_git_revision__", "headless": "", "http_proxy": "{{env `http_proxy`}}", @@ -224,6 +225,7 @@ "iso_checksum": "5378cfdf9c7197c886231eb622bd9b19de597dba", "iso_checksum_type": "sha1", "iso_name": "OmniOS_Text_r151018.iso", + "memory": "512", "metadata": "floppy/dummy_metadata.json", "mirror": "http://omnios.omniti.com", "mirror_directory": "media", diff --git a/opensuse-13.2-i386.json b/opensuse-13.2-i386.json index 6d1ea50b7..e18840487 100644 --- a/opensuse-13.2-i386.json +++ b/opensuse-13.2-i386.json @@ -30,13 +30,13 @@ "modifyvm", "{{.Name}}", "--memory", - "480" + "{{ user `memory` }}" ], [ "modifyvm", "{{.Name}}", "--cpus", - "1" + "{{ user `cpus` }}" ] ], "virtualbox_version_file": ".vbox_version", @@ -69,8 +69,8 @@ "vm_name": "{{ user `template` }}", "vmx_data": { "cpuid.coresPerSocket": "1", - "memsize": "480", - "numvcpus": "1" + "memsize": "{{ user `memory` }}", + "numvcpus": "{{ user `cpus` }}" } }, { @@ -95,13 +95,13 @@ "set", "{{.Name}}", "--memsize", - "480" + "{{ user `memory` }}" ], [ "set", "{{.Name}}", "--cpus", - "1" + "{{ user `cpus` }}" ] ], "prlctl_version_file": ".prlctl_version", @@ -177,6 +177,7 @@ "autoinst_cfg": "opensuse-13.2/autoinst.xml", "box_basename": "opensuse-13.2-i386", "build_timestamp": "{{isotime \"20060102150405\"}}", + "cpus": "1", "git_revision": "__unknown_git_revision__", "headless": "", "http_proxy": "{{env `http_proxy`}}", @@ -184,6 +185,7 @@ "iso_checksum": "bada6d5b304a9ecbb9b27e0a02d0c347c72d91c32231c2594e4deb11a4d9ce55", "iso_checksum_type": "sha256", "iso_name": "openSUSE-13.2-DVD-i586.iso", + "memory": "512", "metadata": "floppy/dummy_metadata.json", "mirror": "http://download.opensuse.org/distribution", "mirror_directory": "13.2/iso", diff --git a/opensuse-13.2-x86_64.json b/opensuse-13.2-x86_64.json index 7018265fb..a303d465f 100644 --- a/opensuse-13.2-x86_64.json +++ b/opensuse-13.2-x86_64.json @@ -30,13 +30,13 @@ "modifyvm", "{{.Name}}", "--memory", - "480" + "{{ user `memory` }}" ], [ "modifyvm", "{{.Name}}", "--cpus", - "1" + "{{ user `cpus` }}" ] ], "virtualbox_version_file": ".vbox_version", @@ -69,8 +69,8 @@ "vm_name": "{{ user `template` }}", "vmx_data": { "cpuid.coresPerSocket": "1", - "memsize": "480", - "numvcpus": "1" + "memsize": "{{ user `memory` }}", + "numvcpus": "{{ user `cpus` }}" } }, { @@ -95,13 +95,13 @@ "set", "{{.Name}}", "--memsize", - "480" + "{{ user `memory` }}" ], [ "set", "{{.Name}}", "--cpus", - "1" + "{{ user `cpus` }}" ] ], "prlctl_version_file": ".prlctl_version", @@ -177,6 +177,7 @@ "autoinst_cfg": "opensuse-13.2/autoinst.xml", "box_basename": "opensuse-13.2", "build_timestamp": "{{isotime \"20060102150405\"}}", + "cpus": "1", "git_revision": "__unknown_git_revision__", "headless": "", "http_proxy": "{{env `http_proxy`}}", @@ -184,6 +185,7 @@ "iso_checksum": "787b0a600e8304a9dda12a4f7ff89a08c9fc4b445215b9f91c52628eccdc3c40", "iso_checksum_type": "sha256", "iso_name": "openSUSE-13.2-DVD-x86_64.iso", + "memory": "512", "metadata": "floppy/dummy_metadata.json", "mirror": "http://download.opensuse.org/distribution", "mirror_directory": "13.2/iso", diff --git a/opensuse-leap-42.1-x86_64.json b/opensuse-leap-42.1-x86_64.json index 86128eda1..a2d398b0d 100644 --- a/opensuse-leap-42.1-x86_64.json +++ b/opensuse-leap-42.1-x86_64.json @@ -36,7 +36,7 @@ "modifyvm", "{{.Name}}", "--cpus", - "1" + "{{ user `cpus` }}" ] ], "virtualbox_version_file": ".vbox_version", @@ -70,7 +70,7 @@ "vmx_data": { "cpuid.coresPerSocket": "1", "memsize": "768", - "numvcpus": "1" + "numvcpus": "{{ user `cpus` }}" } }, { @@ -101,7 +101,7 @@ "set", "{{.Name}}", "--cpus", - "1" + "{{ user `cpus` }}" ] ], "prlctl_version_file": ".prlctl_version", @@ -177,6 +177,7 @@ "autoinst_cfg": "opensuse-leap-42.1/autoinst.xml", "box_basename": "opensuse-leap-42.1", "build_timestamp": "{{isotime \"20060102150405\"}}", + "cpus": "1", "git_revision": "__unknown_git_revision__", "headless": "", "http_proxy": "{{env `http_proxy`}}", @@ -184,6 +185,7 @@ "iso_checksum": "8576e84822cdbe566bf551e28a169fc028229831eba9f07a4c1f84302c5ddb09", "iso_checksum_type": "sha256", "iso_name": "openSUSE-Leap-42.1-DVD-x86_64.iso", + "memory": "512", "metadata": "floppy/dummy_metadata.json", "mirror": "http://download.opensuse.org/distribution", "mirror_directory": "leap/42.1/iso", diff --git a/oracle-5.11-i386.json b/oracle-5.11-i386.json index 0343e1b1b..46c205277 100644 --- a/oracle-5.11-i386.json +++ b/oracle-5.11-i386.json @@ -26,13 +26,13 @@ "modifyvm", "{{.Name}}", "--memory", - "384" + "{{ user `memory` }}" ], [ "modifyvm", "{{.Name}}", "--cpus", - "1" + "{{ user `cpus` }}" ] ], "virtualbox_version_file": ".vbox_version", @@ -61,8 +61,8 @@ "vm_name": "{{ user `template` }}", "vmx_data": { "cpuid.coresPerSocket": "1", - "memsize": "384", - "numvcpus": "1" + "memsize": "{{ user `memory` }}", + "numvcpus": "{{ user `cpus` }}" } }, { @@ -83,13 +83,13 @@ "set", "{{.Name}}", "--memsize", - "384" + "{{ user `memory` }}" ], [ "set", "{{.Name}}", "--cpus", - "1" + "{{ user `cpus` }}" ] ], "prlctl_version_file": ".prlctl_version", @@ -157,6 +157,7 @@ "arch": "32", "box_basename": "oracle-5.11-i386", "build_timestamp": "{{isotime \"20060102150405\"}}", + "cpus": "1", "git_revision": "__unknown_git_revision__", "headless": "", "http_proxy": "{{env `http_proxy`}}", @@ -165,6 +166,7 @@ "iso_checksum_type": "sha1", "iso_name": "Enterprise-R5-U11-Server-i386-dvd.iso", "ks_path": "centos-5.11/ks.cfg", + "memory": "512", "metadata": "floppy/dummy_metadata.json", "mirror": "http://mirrors.dotsrc.org/oracle-linux", "mirror_directory": "EL5/U11/i386", diff --git a/oracle-5.11-x86_64.json b/oracle-5.11-x86_64.json index 215ee690e..f01b386c5 100644 --- a/oracle-5.11-x86_64.json +++ b/oracle-5.11-x86_64.json @@ -26,13 +26,13 @@ "modifyvm", "{{.Name}}", "--memory", - "384" + "{{ user `memory` }}" ], [ "modifyvm", "{{.Name}}", "--cpus", - "1" + "{{ user `cpus` }}" ] ], "virtualbox_version_file": ".vbox_version", @@ -61,8 +61,8 @@ "vm_name": "{{ user `template` }}", "vmx_data": { "cpuid.coresPerSocket": "1", - "memsize": "384", - "numvcpus": "1" + "memsize": "{{ user `memory` }}", + "numvcpus": "{{ user `cpus` }}" } }, { @@ -83,13 +83,13 @@ "set", "{{.Name}}", "--memsize", - "384" + "{{ user `memory` }}" ], [ "set", "{{.Name}}", "--cpus", - "1" + "{{ user `cpus` }}" ] ], "prlctl_version_file": ".prlctl_version", @@ -157,6 +157,7 @@ "arch": "64", "box_basename": "oracle-5.11", "build_timestamp": "{{isotime \"20060102150405\"}}", + "cpus": "1", "git_revision": "__unknown_git_revision__", "headless": "", "http_proxy": "{{env `http_proxy`}}", @@ -165,6 +166,7 @@ "iso_checksum_type": "sha1", "iso_name": "Enterprise-R5-U11-Server-x86_64-dvd.iso", "ks_path": "centos-5.11/ks.cfg", + "memory": "512", "metadata": "floppy/dummy_metadata.json", "mirror": "http://mirrors.dotsrc.org/oracle-linux", "mirror_directory": "EL5/U11/x86_64", diff --git a/oracle-6.6-i386.json b/oracle-6.6-i386.json index 492c1e17b..af10343b2 100644 --- a/oracle-6.6-i386.json +++ b/oracle-6.6-i386.json @@ -26,13 +26,13 @@ "modifyvm", "{{.Name}}", "--memory", - "480" + "{{ user `memory` }}" ], [ "modifyvm", "{{.Name}}", "--cpus", - "1" + "{{ user `cpus` }}" ] ], "virtualbox_version_file": ".vbox_version", @@ -61,8 +61,8 @@ "vm_name": "{{ user `template` }}", "vmx_data": { "cpuid.coresPerSocket": "1", - "memsize": "480", - "numvcpus": "1" + "memsize": "{{ user `memory` }}", + "numvcpus": "{{ user `cpus` }}" } }, { @@ -83,13 +83,13 @@ "set", "{{.Name}}", "--memsize", - "480" + "{{ user `memory` }}" ], [ "set", "{{.Name}}", "--cpus", - "1" + "{{ user `cpus` }}" ] ], "prlctl_version_file": ".prlctl_version", @@ -158,6 +158,7 @@ "arch": "32", "box_basename": "oracle-6.6-i386", "build_timestamp": "{{isotime \"20060102150405\"}}", + "cpus": "1", "git_revision": "__unknown_git_revision__", "headless": "", "http_proxy": "{{env `http_proxy`}}", @@ -166,6 +167,7 @@ "iso_checksum_type": "sha1", "iso_name": "OracleLinux-R6-U6-Server-i386-dvd.iso", "ks_path": "centos-6.7/ks.cfg", + "memory": "512", "metadata": "floppy/dummy_metadata.json", "mirror": "http://mirrors.dotsrc.org/oracle-linux", "mirror_directory": "OL6/U6/i386", diff --git a/oracle-6.6-x86_64.json b/oracle-6.6-x86_64.json index 3557739c8..e7abf830b 100644 --- a/oracle-6.6-x86_64.json +++ b/oracle-6.6-x86_64.json @@ -26,13 +26,13 @@ "modifyvm", "{{.Name}}", "--memory", - "480" + "{{ user `memory` }}" ], [ "modifyvm", "{{.Name}}", "--cpus", - "1" + "{{ user `cpus` }}" ] ], "virtualbox_version_file": ".vbox_version", @@ -61,8 +61,8 @@ "vm_name": "{{ user `template` }}", "vmx_data": { "cpuid.coresPerSocket": "1", - "memsize": "480", - "numvcpus": "1" + "memsize": "{{ user `memory` }}", + "numvcpus": "{{ user `cpus` }}" } }, { @@ -83,13 +83,13 @@ "set", "{{.Name}}", "--memsize", - "480" + "{{ user `memory` }}" ], [ "set", "{{.Name}}", "--cpus", - "1" + "{{ user `cpus` }}" ] ], "prlctl_version_file": ".prlctl_version", @@ -158,6 +158,7 @@ "arch": "64", "box_basename": "oracle-6.6", "build_timestamp": "{{isotime \"20060102150405\"}}", + "cpus": "1", "git_revision": "__unknown_git_revision__", "headless": "", "http_proxy": "{{env `http_proxy`}}", @@ -166,6 +167,7 @@ "iso_checksum_type": "sha1", "iso_name": "OracleLinux-R6-U6-Server-x86_64-dvd.iso", "ks_path": "centos-6.7/ks.cfg", + "memory": "512", "metadata": "floppy/dummy_metadata.json", "mirror": "http://mirrors.dotsrc.org/oracle-linux", "mirror_directory": "OL6/U6/x86_64", diff --git a/oracle-6.7-i386.json b/oracle-6.7-i386.json index a5ee724f2..bba2b43f1 100644 --- a/oracle-6.7-i386.json +++ b/oracle-6.7-i386.json @@ -26,13 +26,13 @@ "modifyvm", "{{.Name}}", "--memory", - "480" + "{{ user `memory` }}" ], [ "modifyvm", "{{.Name}}", "--cpus", - "1" + "{{ user `cpus` }}" ] ], "virtualbox_version_file": ".vbox_version", @@ -61,8 +61,8 @@ "vm_name": "{{ user `template` }}", "vmx_data": { "cpuid.coresPerSocket": "1", - "memsize": "480", - "numvcpus": "1" + "memsize": "{{ user `memory` }}", + "numvcpus": "{{ user `cpus` }}" } }, { @@ -83,13 +83,13 @@ "set", "{{.Name}}", "--memsize", - "480" + "{{ user `memory` }}" ], [ "set", "{{.Name}}", "--cpus", - "1" + "{{ user `cpus` }}" ] ], "prlctl_version_file": ".prlctl_version", @@ -158,6 +158,7 @@ "arch": "32", "box_basename": "oracle-6.7-i386", "build_timestamp": "{{isotime \"20060102150405\"}}", + "cpus": "1", "git_revision": "__unknown_git_revision__", "headless": "", "http_proxy": "{{env `http_proxy`}}", @@ -166,6 +167,7 @@ "iso_checksum_type": "sha1", "iso_name": "OracleLinux-R6-U7-Server-i386-dvd.iso", "ks_path": "centos-6.7/ks.cfg", + "memory": "512", "metadata": "floppy/dummy_metadata.json", "mirror": "http://mirrors.dotsrc.org/oracle-linux", "mirror_directory": "OL6/U7/i386", diff --git a/oracle-6.7-x86_64.json b/oracle-6.7-x86_64.json index 7fb0852f3..d757ae58e 100644 --- a/oracle-6.7-x86_64.json +++ b/oracle-6.7-x86_64.json @@ -26,13 +26,13 @@ "modifyvm", "{{.Name}}", "--memory", - "480" + "{{ user `memory` }}" ], [ "modifyvm", "{{.Name}}", "--cpus", - "1" + "{{ user `cpus` }}" ] ], "virtualbox_version_file": ".vbox_version", @@ -61,8 +61,8 @@ "vm_name": "{{ user `template` }}", "vmx_data": { "cpuid.coresPerSocket": "1", - "memsize": "480", - "numvcpus": "1" + "memsize": "{{ user `memory` }}", + "numvcpus": "{{ user `cpus` }}" } }, { @@ -83,13 +83,13 @@ "set", "{{.Name}}", "--memsize", - "480" + "{{ user `memory` }}" ], [ "set", "{{.Name}}", "--cpus", - "1" + "{{ user `cpus` }}" ] ], "prlctl_version_file": ".prlctl_version", @@ -158,6 +158,7 @@ "arch": "64", "box_basename": "oracle-6.7", "build_timestamp": "{{isotime \"20060102150405\"}}", + "cpus": "1", "git_revision": "__unknown_git_revision__", "headless": "", "http_proxy": "{{env `http_proxy`}}", @@ -166,6 +167,7 @@ "iso_checksum_type": "sha1", "iso_name": "OracleLinux-R6-U7-Server-x86_64-dvd.iso", "ks_path": "centos-6.7/ks.cfg", + "memory": "512", "metadata": "floppy/dummy_metadata.json", "mirror": "http://mirrors.dotsrc.org/oracle-linux", "mirror_directory": "OL6/U7/x86_64", diff --git a/oracle-7.2-x86_64.json b/oracle-7.2-x86_64.json index b49046fcc..72d98542d 100644 --- a/oracle-7.2-x86_64.json +++ b/oracle-7.2-x86_64.json @@ -26,13 +26,13 @@ "modifyvm", "{{.Name}}", "--memory", - "480" + "{{ user `memory` }}" ], [ "modifyvm", "{{.Name}}", "--cpus", - "1" + "{{ user `cpus` }}" ] ], "virtualbox_version_file": ".vbox_version", @@ -61,8 +61,8 @@ "vm_name": "{{ user `template` }}", "vmx_data": { "cpuid.coresPerSocket": "1", - "memsize": "480", - "numvcpus": "1" + "memsize": "{{ user `memory` }}", + "numvcpus": "{{ user `cpus` }}" } }, { @@ -83,13 +83,13 @@ "set", "{{.Name}}", "--memsize", - "480" + "{{ user `memory` }}" ], [ "set", "{{.Name}}", "--cpus", - "1" + "{{ user `cpus` }}" ] ], "prlctl_version_file": ".prlctl_version", @@ -158,6 +158,7 @@ "arch": "64", "box_basename": "oracle-7.2", "build_timestamp": "{{isotime \"20060102150405\"}}", + "cpus": "1", "git_revision": "__unknown_git_revision__", "headless": "", "http_proxy": "{{env `http_proxy`}}", @@ -166,6 +167,7 @@ "iso_checksum_type": "sha1", "iso_name": "OracleLinux-R7-U2-Server-x86_64-dvd.iso", "ks_path": "centos-7.2/ks.cfg", + "memory": "512", "metadata": "floppy/dummy_metadata.json", "mirror": "http://mirrors.dotsrc.org/oracle-linux", "mirror_directory": "OL7/u2/x86_64", diff --git a/rhel-5.11-i386.json b/rhel-5.11-i386.json index f5e0f0f59..30b0caf9c 100644 --- a/rhel-5.11-i386.json +++ b/rhel-5.11-i386.json @@ -26,13 +26,13 @@ "modifyvm", "{{.Name}}", "--memory", - "384" + "{{ user `memory` }}" ], [ "modifyvm", "{{.Name}}", "--cpus", - "1" + "{{ user `cpus` }}" ] ], "virtualbox_version_file": ".vbox_version", @@ -61,8 +61,8 @@ "vm_name": "{{ user `template` }}", "vmx_data": { "cpuid.coresPerSocket": "1", - "memsize": "384", - "numvcpus": "1" + "memsize": "{{ user `memory` }}", + "numvcpus": "{{ user `cpus` }}" } }, { @@ -83,13 +83,13 @@ "set", "{{.Name}}", "--memsize", - "384" + "{{ user `memory` }}" ], [ "set", "{{.Name}}", "--cpus", - "1" + "{{ user `cpus` }}" ] ], "prlctl_version_file": ".prlctl_version", @@ -157,6 +157,7 @@ "arch": "32", "box_basename": "rhel-5.11-i386", "build_timestamp": "{{isotime \"20060102150405\"}}", + "cpus": "1", "git_revision": "__unknown_git_revision__", "headless": "", "http_proxy": "{{env `http_proxy`}}", @@ -165,6 +166,7 @@ "iso_checksum_type": "sha256", "iso_name": "rhel-server-5.11-i386-dvd.iso", "ks_path": "centos-5.11/ks.cfg", + "memory": "512", "metadata": "floppy/dummy_metadata.json", "mirror": "http://YOU-MUST-PROVIDE-YOUR-OWN-ISO.sorry", "mirror_directory": "rhel", diff --git a/rhel-5.11-x86_64.json b/rhel-5.11-x86_64.json index 597421c0d..6417ed5c8 100644 --- a/rhel-5.11-x86_64.json +++ b/rhel-5.11-x86_64.json @@ -26,13 +26,13 @@ "modifyvm", "{{.Name}}", "--memory", - "384" + "{{ user `memory` }}" ], [ "modifyvm", "{{.Name}}", "--cpus", - "1" + "{{ user `cpus` }}" ] ], "virtualbox_version_file": ".vbox_version", @@ -61,8 +61,8 @@ "vm_name": "{{ user `template` }}", "vmx_data": { "cpuid.coresPerSocket": "1", - "memsize": "384", - "numvcpus": "1" + "memsize": "{{ user `memory` }}", + "numvcpus": "{{ user `cpus` }}" } }, { @@ -83,13 +83,13 @@ "set", "{{.Name}}", "--memsize", - "384" + "{{ user `memory` }}" ], [ "set", "{{.Name}}", "--cpus", - "1" + "{{ user `cpus` }}" ] ], "prlctl_version_file": ".prlctl_version", @@ -157,6 +157,7 @@ "arch": "64", "box_basename": "rhel-5.11", "build_timestamp": "{{isotime \"20060102150405\"}}", + "cpus": "1", "git_revision": "__unknown_git_revision__", "headless": "", "http_proxy": "{{env `http_proxy`}}", @@ -165,6 +166,7 @@ "iso_checksum_type": "sha256", "iso_name": "rhel-server-5.11-x86_64-dvd.iso", "ks_path": "centos-5.11/ks.cfg", + "memory": "512", "metadata": "floppy/dummy_metadata.json", "mirror": "http://YOU-MUST-PROVIDE-YOUR-OWN-ISO.sorry", "mirror_directory": "rhel", diff --git a/rhel-6.6-i386.json b/rhel-6.6-i386.json index 4bf006795..4340f2bdb 100644 --- a/rhel-6.6-i386.json +++ b/rhel-6.6-i386.json @@ -26,13 +26,13 @@ "modifyvm", "{{.Name}}", "--memory", - "480" + "{{ user `memory` }}" ], [ "modifyvm", "{{.Name}}", "--cpus", - "1" + "{{ user `cpus` }}" ] ], "virtualbox_version_file": ".vbox_version", @@ -61,8 +61,8 @@ "vm_name": "{{ user `template` }}", "vmx_data": { "cpuid.coresPerSocket": "1", - "memsize": "480", - "numvcpus": "1" + "memsize": "{{ user `memory` }}", + "numvcpus": "{{ user `cpus` }}" } }, { @@ -83,13 +83,13 @@ "set", "{{.Name}}", "--memsize", - "480" + "{{ user `memory` }}" ], [ "set", "{{.Name}}", "--cpus", - "1" + "{{ user `cpus` }}" ] ], "prlctl_version_file": ".prlctl_version", @@ -158,6 +158,7 @@ "arch": "32", "box_basename": "rhel-6.6-i386", "build_timestamp": "{{isotime \"20060102150405\"}}", + "cpus": "1", "git_revision": "__unknown_git_revision__", "headless": "", "http_proxy": "{{env `http_proxy`}}", @@ -166,6 +167,7 @@ "iso_checksum_type": "sha256", "iso_name": "rhel-server-6.6-i386-dvd.iso", "ks_path": "centos-6.7/ks.cfg", + "memory": "512", "metadata": "floppy/dummy_metadata.json", "mirror": "http://YOU-MUST-PROVIDE-YOUR-OWN-ISO.sorry", "mirror_directory": "rhel", @@ -175,4 +177,3 @@ "version": "2.2.TIMESTAMP" } } - diff --git a/rhel-6.6-x86_64.json b/rhel-6.6-x86_64.json index 320eb5ae7..4622ada7b 100644 --- a/rhel-6.6-x86_64.json +++ b/rhel-6.6-x86_64.json @@ -26,13 +26,13 @@ "modifyvm", "{{.Name}}", "--memory", - "480" + "{{ user `memory` }}" ], [ "modifyvm", "{{.Name}}", "--cpus", - "1" + "{{ user `cpus` }}" ] ], "virtualbox_version_file": ".vbox_version", @@ -61,8 +61,8 @@ "vm_name": "{{ user `template` }}", "vmx_data": { "cpuid.coresPerSocket": "1", - "memsize": "480", - "numvcpus": "1" + "memsize": "{{ user `memory` }}", + "numvcpus": "{{ user `cpus` }}" } }, { @@ -83,13 +83,13 @@ "set", "{{.Name}}", "--memsize", - "480" + "{{ user `memory` }}" ], [ "set", "{{.Name}}", "--cpus", - "1" + "{{ user `cpus` }}" ] ], "prlctl_version_file": ".prlctl_version", @@ -158,6 +158,7 @@ "arch": "64", "box_basename": "rhel-6.6", "build_timestamp": "{{isotime \"20060102150405\"}}", + "cpus": "1", "git_revision": "__unknown_git_revision__", "headless": "", "http_proxy": "{{env `http_proxy`}}", @@ -166,6 +167,7 @@ "iso_checksum_type": "sha256", "iso_name": "rhel-server-6.6-x86_64-dvd.iso", "ks_path": "centos-6.7/ks.cfg", + "memory": "512", "metadata": "floppy/dummy_metadata.json", "mirror": "http://YOU-MUST-PROVIDE-YOUR-OWN-ISO.sorry", "mirror_directory": "rhel", diff --git a/rhel-6.7-i386.json b/rhel-6.7-i386.json index 936024326..1b63cf439 100644 --- a/rhel-6.7-i386.json +++ b/rhel-6.7-i386.json @@ -26,13 +26,13 @@ "modifyvm", "{{.Name}}", "--memory", - "480" + "{{ user `memory` }}" ], [ "modifyvm", "{{.Name}}", "--cpus", - "1" + "{{ user `cpus` }}" ] ], "virtualbox_version_file": ".vbox_version", @@ -61,8 +61,8 @@ "vm_name": "{{ user `template` }}", "vmx_data": { "cpuid.coresPerSocket": "1", - "memsize": "480", - "numvcpus": "1" + "memsize": "{{ user `memory` }}", + "numvcpus": "{{ user `cpus` }}" } }, { @@ -83,13 +83,13 @@ "set", "{{.Name}}", "--memsize", - "480" + "{{ user `memory` }}" ], [ "set", "{{.Name}}", "--cpus", - "1" + "{{ user `cpus` }}" ] ], "prlctl_version_file": ".prlctl_version", @@ -158,6 +158,7 @@ "arch": "32", "box_basename": "rhel-6.7-i386", "build_timestamp": "{{isotime \"20060102150405\"}}", + "cpus": "1", "git_revision": "__unknown_git_revision__", "headless": "", "http_proxy": "{{env `http_proxy`}}", @@ -166,6 +167,7 @@ "iso_checksum_type": "sha256", "iso_name": "rhel-server-6.7-i386-dvd.iso", "ks_path": "centos-6.7/ks.cfg", + "memory": "512", "metadata": "floppy/dummy_metadata.json", "mirror": "http://YOU-MUST-PROVIDE-YOUR-OWN-ISO.sorry", "mirror_directory": "rhel", diff --git a/rhel-6.7-x86_64.json b/rhel-6.7-x86_64.json index a067330c0..2177d6d42 100644 --- a/rhel-6.7-x86_64.json +++ b/rhel-6.7-x86_64.json @@ -26,13 +26,13 @@ "modifyvm", "{{.Name}}", "--memory", - "480" + "{{ user `memory` }}" ], [ "modifyvm", "{{.Name}}", "--cpus", - "1" + "{{ user `cpus` }}" ] ], "virtualbox_version_file": ".vbox_version", @@ -61,8 +61,8 @@ "vm_name": "{{ user `template` }}", "vmx_data": { "cpuid.coresPerSocket": "1", - "memsize": "480", - "numvcpus": "1" + "memsize": "{{ user `memory` }}", + "numvcpus": "{{ user `cpus` }}" } }, { @@ -83,13 +83,13 @@ "set", "{{.Name}}", "--memsize", - "480" + "{{ user `memory` }}" ], [ "set", "{{.Name}}", "--cpus", - "1" + "{{ user `cpus` }}" ] ], "prlctl_version_file": ".prlctl_version", @@ -158,6 +158,7 @@ "arch": "64", "box_basename": "rhel-6.7", "build_timestamp": "{{isotime \"20060102150405\"}}", + "cpus": "1", "git_revision": "__unknown_git_revision__", "headless": "", "http_proxy": "{{env `http_proxy`}}", @@ -166,6 +167,7 @@ "iso_checksum_type": "sha256", "iso_name": "rhel-server-6.7-x86_64-dvd.iso", "ks_path": "centos-6.7/ks.cfg", + "memory": "512", "metadata": "floppy/dummy_metadata.json", "mirror": "http://YOU-MUST-PROVIDE-YOUR-OWN-ISO.sorry", "mirror_directory": "rhel", diff --git a/rhel-7.2-x86_64.json b/rhel-7.2-x86_64.json index d3d62b091..2dbf7bcec 100644 --- a/rhel-7.2-x86_64.json +++ b/rhel-7.2-x86_64.json @@ -26,13 +26,13 @@ "modifyvm", "{{.Name}}", "--memory", - "480" + "{{ user `memory` }}" ], [ "modifyvm", "{{.Name}}", "--cpus", - "1" + "{{ user `cpus` }}" ] ], "virtualbox_version_file": ".vbox_version", @@ -61,8 +61,8 @@ "vm_name": "{{ user `template` }}", "vmx_data": { "cpuid.coresPerSocket": "1", - "memsize": "480", - "numvcpus": "1" + "memsize": "{{ user `memory` }}", + "numvcpus": "{{ user `cpus` }}" } }, { @@ -83,13 +83,13 @@ "set", "{{.Name}}", "--memsize", - "480" + "{{ user `memory` }}" ], [ "set", "{{.Name}}", "--cpus", - "1" + "{{ user `cpus` }}" ] ], "prlctl_version_file": ".prlctl_version", @@ -158,6 +158,7 @@ "arch": "64", "box_basename": "rhel-7.2", "build_timestamp": "{{isotime \"20060102150405\"}}", + "cpus": "1", "git_revision": "__unknown_git_revision__", "headless": "", "http_proxy": "{{env `http_proxy`}}", @@ -166,6 +167,7 @@ "iso_checksum_type": "sha256", "iso_name": "rhel-server-7.2-x86_64-dvd.iso", "ks_path": "centos-7.2/ks.cfg", + "memory": "512", "metadata": "floppy/dummy_metadata.json", "mirror": "http://YOU-MUST-PROVIDE-YOUR-OWN-ISO.sorry", "mirror_directory": "rhel", diff --git a/sles-11-sp2-i386.json b/sles-11-sp2-i386.json index 68c4ca758..7c66f78a1 100644 --- a/sles-11-sp2-i386.json +++ b/sles-11-sp2-i386.json @@ -30,13 +30,13 @@ "modifyvm", "{{.Name}}", "--memory", - "480" + "{{ user `memory` }}" ], [ "modifyvm", "{{.Name}}", "--cpus", - "1" + "{{ user `cpus` }}" ] ], "virtualbox_version_file": ".vbox_version", @@ -69,8 +69,8 @@ "vm_name": "{{ user `template` }}", "vmx_data": { "cpuid.coresPerSocket": "1", - "memsize": "480", - "numvcpus": "1" + "memsize": "{{ user `memory` }}", + "numvcpus": "{{ user `cpus` }}" } }, { @@ -95,13 +95,13 @@ "set", "{{.Name}}", "--memsize", - "480" + "{{ user `memory` }}" ], [ "set", "{{.Name}}", "--cpus", - "1" + "{{ user `cpus` }}" ] ], "prlctl_version_file": ".prlctl_version", @@ -170,8 +170,10 @@ "arch": "32", "box_basename": "sles-11-sp2-i386", "build_timestamp": "{{isotime \"20060102150405\"}}", + "cpus": "1", "git_revision": "__unknown_git_revision__", "headless": "", + "memory": "512", "metadata": "floppy/dummy_metadata.json", "mirror": "http://cdn2.novell.com/prot/FkjGyLMMiss~", "name": "sles-11-sp2-i386", @@ -179,4 +181,3 @@ "version": "2.0.TIMESTAMP" } } - diff --git a/sles-11-sp2-x86_64.json b/sles-11-sp2-x86_64.json index 4b8d69b3c..8d25712b1 100644 --- a/sles-11-sp2-x86_64.json +++ b/sles-11-sp2-x86_64.json @@ -30,13 +30,13 @@ "modifyvm", "{{.Name}}", "--memory", - "480" + "{{ user `memory` }}" ], [ "modifyvm", "{{.Name}}", "--cpus", - "1" + "{{ user `cpus` }}" ] ], "virtualbox_version_file": ".vbox_version", @@ -69,8 +69,8 @@ "vm_name": "{{ user `template` }}", "vmx_data": { "cpuid.coresPerSocket": "1", - "memsize": "480", - "numvcpus": "1" + "memsize": "{{ user `memory` }}", + "numvcpus": "{{ user `cpus` }}" } }, { @@ -95,13 +95,13 @@ "set", "{{.Name}}", "--memsize", - "480" + "{{ user `memory` }}" ], [ "set", "{{.Name}}", "--cpus", - "1" + "{{ user `cpus` }}" ] ], "prlctl_version_file": ".prlctl_version", @@ -169,8 +169,10 @@ "arch": "64", "box_basename": "sles-11-sp2", "build_timestamp": "{{isotime \"20060102150405\"}}", + "cpus": "1", "git_revision": "__unknown_git_revision__", "headless": "", + "memory": "512", "metadata": "floppy/dummy_metadata.json", "mirror": "http://cdn.novell.com/free/h0AOp5AT-18~", "name": "sles-11-sp2", @@ -178,4 +180,3 @@ "version": "2.0.TIMESTAMP" } } - diff --git a/sles-11-sp3-i386.json b/sles-11-sp3-i386.json index 108c8ebec..ad06f6574 100644 --- a/sles-11-sp3-i386.json +++ b/sles-11-sp3-i386.json @@ -30,13 +30,13 @@ "modifyvm", "{{.Name}}", "--memory", - "480" + "{{ user `memory` }}" ], [ "modifyvm", "{{.Name}}", "--cpus", - "1" + "{{ user `cpus` }}" ] ], "virtualbox_version_file": ".vbox_version", @@ -69,8 +69,8 @@ "vm_name": "{{ user `template` }}", "vmx_data": { "cpuid.coresPerSocket": "1", - "memsize": "480", - "numvcpus": "1" + "memsize": "{{ user `memory` }}", + "numvcpus": "{{ user `cpus` }}" } }, { @@ -95,13 +95,13 @@ "set", "{{.Name}}", "--memsize", - "480" + "{{ user `memory` }}" ], [ "set", "{{.Name}}", "--cpus", - "1" + "{{ user `cpus` }}" ] ], "prlctl_version_file": ".prlctl_version", @@ -170,8 +170,10 @@ "arch": "32", "box_basename": "sles-11-sp3-i386", "build_timestamp": "{{isotime \"20060102150405\"}}", + "cpus": "1", "git_revision": "__unknown_git_revision__", "headless": "", + "memory": "512", "metadata": "floppy/dummy_metadata.json", "mirror": "http://cdn2.novell.com/prot/4uiuDMzX0ck~", "name": "sles-11-sp3-i386", @@ -179,4 +181,3 @@ "version": "2.0.TIMESTAMP" } } - diff --git a/sles-11-sp3-x86_64.json b/sles-11-sp3-x86_64.json index d317f08bd..942cef217 100644 --- a/sles-11-sp3-x86_64.json +++ b/sles-11-sp3-x86_64.json @@ -30,13 +30,13 @@ "modifyvm", "{{.Name}}", "--memory", - "480" + "{{ user `memory` }}" ], [ "modifyvm", "{{.Name}}", "--cpus", - "1" + "{{ user `cpus` }}" ] ], "virtualbox_version_file": ".vbox_version", @@ -69,8 +69,8 @@ "vm_name": "{{ user `template` }}", "vmx_data": { "cpuid.coresPerSocket": "1", - "memsize": "480", - "numvcpus": "1" + "memsize": "{{ user `memory` }}", + "numvcpus": "{{ user `cpus` }}" } }, { @@ -95,13 +95,13 @@ "set", "{{.Name}}", "--memsize", - "480" + "{{ user `memory` }}" ], [ "set", "{{.Name}}", "--cpus", - "1" + "{{ user `cpus` }}" ] ], "prlctl_version_file": ".prlctl_version", @@ -170,8 +170,10 @@ "arch": "64", "box_basename": "sles-11-sp3", "build_timestamp": "{{isotime \"20060102150405\"}}", + "cpus": "1", "git_revision": "__unknown_git_revision__", "headless": "", + "memory": "512", "metadata": "floppy/dummy_metadata.json", "mirror": "http://cdn2.novell.com/prot/Q_VbW21BiB4~", "name": "sles-11-sp3", @@ -179,4 +181,3 @@ "version": "2.0.TIMESTAMP" } } - diff --git a/sles-11-sp4-i386.json b/sles-11-sp4-i386.json index d5b4d165c..30d861b80 100644 --- a/sles-11-sp4-i386.json +++ b/sles-11-sp4-i386.json @@ -30,13 +30,13 @@ "modifyvm", "{{.Name}}", "--memory", - "480" + "{{ user `memory` }}" ], [ "modifyvm", "{{.Name}}", "--cpus", - "1" + "{{ user `cpus` }}" ] ], "virtualbox_version_file": ".vbox_version", @@ -69,8 +69,8 @@ "vm_name": "{{ user `template` }}", "vmx_data": { "cpuid.coresPerSocket": "1", - "memsize": "480", - "numvcpus": "1" + "memsize": "{{ user `memory` }}", + "numvcpus": "{{ user `cpus` }}" } }, { @@ -95,13 +95,13 @@ "set", "{{.Name}}", "--memsize", - "480" + "{{ user `memory` }}" ], [ "set", "{{.Name}}", "--cpus", - "1" + "{{ user `cpus` }}" ] ], "prlctl_version_file": ".prlctl_version", @@ -176,6 +176,7 @@ "autoinst_cfg": "sles-11/sles-11-sp4-i386-autoinst.xml", "box_basename": "sles-11-sp4-i386", "build_timestamp": "{{isotime \"20060102150405\"}}", + "cpus": "1", "git_revision": "__unknown_git_revision__", "headless": "", "http_proxy": "{{env `http_proxy`}}", @@ -183,6 +184,7 @@ "iso_checksum": "3e2f09b0a5dc04f4b8cafa174ab971b7355b8f6c22925aab1d1817fff5c7e549", "iso_checksum_type": "sha256", "iso_name": "SLES-11-SP4-DVD-i586-GM-DVD1.iso", + "memory": "512", "metadata": "floppy/dummy_metadata.json", "mirror": "http://cdn.novell.com/prot/46PZWZ91TPo~", "name": "sles-11-sp4-i386", diff --git a/sles-11-sp4-x86_64.json b/sles-11-sp4-x86_64.json index 6fdad4aa1..97b6fdb25 100644 --- a/sles-11-sp4-x86_64.json +++ b/sles-11-sp4-x86_64.json @@ -30,13 +30,13 @@ "modifyvm", "{{.Name}}", "--memory", - "480" + "{{ user `memory` }}" ], [ "modifyvm", "{{.Name}}", "--cpus", - "1" + "{{ user `cpus` }}" ] ], "virtualbox_version_file": ".vbox_version", @@ -69,8 +69,8 @@ "vm_name": "{{ user `template` }}", "vmx_data": { "cpuid.coresPerSocket": "1", - "memsize": "480", - "numvcpus": "1" + "memsize": "{{ user `memory` }}", + "numvcpus": "{{ user `cpus` }}" } }, { @@ -95,13 +95,13 @@ "set", "{{.Name}}", "--memsize", - "480" + "{{ user `memory` }}" ], [ "set", "{{.Name}}", "--cpus", - "1" + "{{ user `cpus` }}" ] ], "prlctl_version_file": ".prlctl_version", @@ -176,6 +176,7 @@ "autoinst_cfg": "sles-11/sles-11-sp4-x86_64-autoinst.xml", "box_basename": "sles-11-sp4", "build_timestamp": "{{isotime \"20060102150405\"}}", + "cpus": "1", "git_revision": "__unknown_git_revision__", "headless": "", "http_proxy": "{{env `http_proxy`}}", @@ -183,6 +184,7 @@ "iso_checksum": "4fbf22201876d571c719328f385d87d6d690fb3ceb5e093108cdf0373c43e855", "iso_checksum_type": "sha256", "iso_name": "SLES-11-SP4-DVD-x86_64-GM-DVD1.iso", + "memory": "512", "metadata": "floppy/dummy_metadata.json", "mirror": "http://cdn.novell.com/prot/l7C51hFz57E~", "name": "sles-11-sp4", diff --git a/sles-12-x86_64.json b/sles-12-x86_64.json index b7720e53c..04c479ff5 100644 --- a/sles-12-x86_64.json +++ b/sles-12-x86_64.json @@ -30,13 +30,13 @@ "modifyvm", "{{.Name}}", "--memory", - "480" + "{{ user `memory` }}" ], [ "modifyvm", "{{.Name}}", "--cpus", - "1" + "{{ user `cpus` }}" ] ], "virtualbox_version_file": ".vbox_version", @@ -69,8 +69,8 @@ "vm_name": "{{ user `template` }}", "vmx_data": { "cpuid.coresPerSocket": "1", - "memsize": "480", - "numvcpus": "1" + "memsize": "{{ user `memory` }}", + "numvcpus": "{{ user `cpus` }}" } }, { @@ -95,13 +95,13 @@ "set", "{{.Name}}", "--memsize", - "480" + "{{ user `memory` }}" ], [ "set", "{{.Name}}", "--cpus", - "1" + "{{ user `cpus` }}" ] ], "prlctl_version_file": ".prlctl_version", @@ -178,6 +178,7 @@ "autoinst_cfg": "sles-12/sles-12-x86_64-autoinst.xml", "box_basename": "sles-12", "build_timestamp": "{{isotime \"20060102150405\"}}", + "cpus": "1", "git_revision": "__unknown_git_revision__", "headless": "", "http_proxy": "{{env `http_proxy`}}", @@ -185,6 +186,7 @@ "iso_checksum": "58086fca0441b1d44c7a51c5ee64e1bd4365466fcee48ec92c4f39d07739aeed", "iso_checksum_type": "sha256", "iso_name": "SLE-12-Server-DVD-x86_64-GM-DVD1.iso", + "memory": "512", "metadata": "floppy/dummy_metadata.json", "mirror": "http://cdn.novell.com/prot/1RBC-NrdggI~", "name": "sles-12", diff --git a/solaris-10.11-x86.json b/solaris-10.11-x86.json index 7a3700c99..446c51eef 100644 --- a/solaris-10.11-x86.json +++ b/solaris-10.11-x86.json @@ -39,13 +39,13 @@ "modifyvm", "{{.Name}}", "--memory", - "1536" + "{{ user `memory` }}" ], [ "modifyvm", "{{.Name}}", "--cpus", - "1" + "{{ user `cpus` }}" ] ], "virtualbox_version_file": ".vbox_version", @@ -89,8 +89,8 @@ "vm_name": "{{ user `template` }}", "vmx_data": { "cpuid.coresPerSocket": "1", - "memsize": "1536", - "numvcpus": "1" + "memsize": "{{ user `memory` }}", + "numvcpus": "{{ user `cpus` }}" } } ], @@ -123,8 +123,10 @@ "arch": "64", "box_basename": "solaris-10.11", "build_timestamp": "{{isotime \"20060102150405\"}}", + "cpus": "1", "git_revision": "__unknown_git_revision__", "headless": "", + "memory": "1536", "metadata": "floppy/dummy_metadata.json", "mirror": "./packer_cache", "name": "solaris-10.11", @@ -132,4 +134,3 @@ "version": "2.0.TIMESTAMP" } } - diff --git a/solaris-11-x86.json b/solaris-11-x86.json index 547fa9fa7..c1382fe83 100644 --- a/solaris-11-x86.json +++ b/solaris-11-x86.json @@ -50,13 +50,13 @@ "modifyvm", "{{.Name}}", "--memory", - "2048" + "{{ user `memory` }}" ], [ "modifyvm", "{{.Name}}", "--cpus", - "1" + "{{ user `cpus` }}" ] ], "virtualbox_version_file": ".vbox_version", @@ -109,8 +109,8 @@ "vm_name": "{{ user `template` }}", "vmx_data": { "cpuid.coresPerSocket": "1", - "memsize": "2048", - "numvcpus": "1" + "memsize": "{{ user `memory` }}", + "numvcpus": "{{ user `cpus` }}" } } ], @@ -145,8 +145,10 @@ "arch": "64", "box_basename": "solaris-11.3", "build_timestamp": "{{isotime \"20060102150405\"}}", + "cpus": "1", "git_revision": "__unknown_git_revision__", "headless": "", + "memory": "2048", "metadata": "floppy/dummy_metadata.json", "mirror": "./packer_cache", "name": "solaris-11.3", diff --git a/ubuntu-10.04-amd64.json b/ubuntu-10.04-amd64.json index 6b79252e2..8b6ce1a65 100644 --- a/ubuntu-10.04-amd64.json +++ b/ubuntu-10.04-amd64.json @@ -47,13 +47,13 @@ "modifyvm", "{{.Name}}", "--memory", - "384" + "{{ user `memory` }}" ], [ "modifyvm", "{{.Name}}", "--cpus", - "1" + "{{ user `cpus` }}" ] ], "virtualbox_version_file": ".vbox_version", @@ -103,8 +103,8 @@ "vm_name": "{{ user `template` }}", "vmx_data": { "cpuid.coresPerSocket": "1", - "memsize": "384", - "numvcpus": "1" + "memsize": "{{ user `memory` }}", + "numvcpus": "{{ user `cpus` }}" } }, { @@ -146,13 +146,13 @@ "set", "{{.Name}}", "--memsize", - "384" + "{{ user `memory` }}" ], [ "set", "{{.Name}}", "--cpus", - "1" + "{{ user `cpus` }}" ] ], "prlctl_version_file": ".prlctl_version", @@ -243,6 +243,7 @@ "variables": { "box_basename": "ubuntu-10.04", "build_timestamp": "{{isotime \"20060102150405\"}}", + "cpus": "1", "git_revision": "__unknown_git_revision__", "headless": "", "http_proxy": "{{env `http_proxy`}}", @@ -250,6 +251,7 @@ "iso_checksum": "3de19967318906fd57252ef67ed3ad411b89e3ea6b81205e26517530d7a8cd0b", "iso_checksum_type": "sha256", "iso_name": "ubuntu-10.04.4-server-amd64.iso", + "memory": "512", "metadata": "floppy/dummy_metadata.json", "mirror": "http://releases.ubuntu.com", "mirror_directory": "10.04.4", diff --git a/ubuntu-10.04-i386.json b/ubuntu-10.04-i386.json index b66b37930..e57898aca 100644 --- a/ubuntu-10.04-i386.json +++ b/ubuntu-10.04-i386.json @@ -47,13 +47,13 @@ "modifyvm", "{{.Name}}", "--memory", - "384" + "{{ user `memory` }}" ], [ "modifyvm", "{{.Name}}", "--cpus", - "1" + "{{ user `cpus` }}" ] ], "virtualbox_version_file": ".vbox_version", @@ -103,8 +103,8 @@ "vm_name": "{{ user `template` }}", "vmx_data": { "cpuid.coresPerSocket": "1", - "memsize": "384", - "numvcpus": "1" + "memsize": "{{ user `memory` }}", + "numvcpus": "{{ user `cpus` }}" } }, { @@ -146,13 +146,13 @@ "set", "{{.Name}}", "--memsize", - "384" + "{{ user `memory` }}" ], [ "set", "{{.Name}}", "--cpus", - "1" + "{{ user `cpus` }}" ] ], "prlctl_version_file": ".prlctl_version", @@ -243,6 +243,7 @@ "variables": { "box_basename": "ubuntu-10.04-i386", "build_timestamp": "{{isotime \"20060102150405\"}}", + "cpus": "1", "git_revision": "__unknown_git_revision__", "headless": "", "http_proxy": "{{env `http_proxy`}}", @@ -250,6 +251,7 @@ "iso_checksum": "564eb67534ab64dbddd4b5bed54ec96f447cbbeb27a8a1354eae85658559503f", "iso_checksum_type": "sha256", "iso_name": "ubuntu-10.04.4-server-i386.iso", + "memory": "512", "metadata": "floppy/dummy_metadata.json", "mirror": "http://releases.ubuntu.com", "mirror_directory": "10.04.4", diff --git a/ubuntu-12.04-amd64.json b/ubuntu-12.04-amd64.json index 85c00bb9f..8f211be8c 100644 --- a/ubuntu-12.04-amd64.json +++ b/ubuntu-12.04-amd64.json @@ -47,13 +47,13 @@ "modifyvm", "{{.Name}}", "--memory", - "384" + "{{ user `memory` }}" ], [ "modifyvm", "{{.Name}}", "--cpus", - "1" + "{{ user `cpus` }}" ] ], "virtualbox_version_file": ".vbox_version", @@ -103,8 +103,8 @@ "vm_name": "{{ user `template` }}", "vmx_data": { "cpuid.coresPerSocket": "1", - "memsize": "384", - "numvcpus": "1" + "memsize": "{{ user `memory` }}", + "numvcpus": "{{ user `cpus` }}" } }, { @@ -146,13 +146,13 @@ "set", "{{.Name}}", "--memsize", - "384" + "{{ user `memory` }}" ], [ "set", "{{.Name}}", "--cpus", - "1" + "{{ user `cpus` }}" ] ], "prlctl_version_file": ".prlctl_version", @@ -243,6 +243,7 @@ "variables": { "box_basename": "ubuntu-12.04", "build_timestamp": "{{isotime \"20060102150405\"}}", + "cpus": "1", "git_revision": "__unknown_git_revision__", "headless": "", "http_proxy": "{{env `http_proxy`}}", @@ -250,6 +251,7 @@ "iso_checksum": "af224223de99e2a730b67d7785b657f549be0d63221188e105445f75fb8305c9", "iso_checksum_type": "sha256", "iso_name": "ubuntu-12.04.5-server-amd64.iso", + "memory": "512", "metadata": "floppy/dummy_metadata.json", "mirror": "http://releases.ubuntu.com", "mirror_directory": "12.04.5", diff --git a/ubuntu-12.04-i386.json b/ubuntu-12.04-i386.json index fef1eab87..a567fd7be 100644 --- a/ubuntu-12.04-i386.json +++ b/ubuntu-12.04-i386.json @@ -47,13 +47,13 @@ "modifyvm", "{{.Name}}", "--memory", - "384" + "{{ user `memory` }}" ], [ "modifyvm", "{{.Name}}", "--cpus", - "1" + "{{ user `cpus` }}" ] ], "virtualbox_version_file": ".vbox_version", @@ -103,8 +103,8 @@ "vm_name": "{{ user `template` }}", "vmx_data": { "cpuid.coresPerSocket": "1", - "memsize": "384", - "numvcpus": "1" + "memsize": "{{ user `memory` }}", + "numvcpus": "{{ user `cpus` }}" } }, { @@ -146,13 +146,13 @@ "set", "{{.Name}}", "--memsize", - "384" + "{{ user `memory` }}" ], [ "set", "{{.Name}}", "--cpus", - "1" + "{{ user `cpus` }}" ] ], "prlctl_version_file": ".prlctl_version", @@ -243,6 +243,7 @@ "variables": { "box_basename": "ubuntu-12.04-i386", "build_timestamp": "{{isotime \"20060102150405\"}}", + "cpus": "1", "git_revision": "__unknown_git_revision__", "headless": "", "http_proxy": "{{env `http_proxy`}}", @@ -250,6 +251,7 @@ "iso_checksum": "bec39e79664aa189dea338993f636e54c5eda2f84c27def7b06bd6373ab87628", "iso_checksum_type": "sha256", "iso_name": "ubuntu-12.04.5-server-i386.iso", + "memory": "512", "metadata": "floppy/dummy_metadata.json", "mirror": "http://releases.ubuntu.com", "mirror_directory": "12.04.5", diff --git a/ubuntu-14.04-amd64.json b/ubuntu-14.04-amd64.json index 419a5bf9f..22f6ca9a2 100644 --- a/ubuntu-14.04-amd64.json +++ b/ubuntu-14.04-amd64.json @@ -47,13 +47,13 @@ "modifyvm", "{{.Name}}", "--memory", - "384" + "{{ user `memory` }}" ], [ "modifyvm", "{{.Name}}", "--cpus", - "1" + "{{ user `cpus` }}" ] ], "virtualbox_version_file": ".vbox_version", @@ -103,8 +103,8 @@ "vm_name": "{{ user `template` }}", "vmx_data": { "cpuid.coresPerSocket": "1", - "memsize": "384", - "numvcpus": "1" + "memsize": "{{ user `memory` }}", + "numvcpus": "{{ user `cpus` }}" } }, { @@ -146,13 +146,13 @@ "set", "{{.Name}}", "--memsize", - "384" + "{{ user `memory` }}" ], [ "set", "{{.Name}}", "--cpus", - "1" + "{{ user `cpus` }}" ] ], "prlctl_version_file": ".prlctl_version", @@ -243,6 +243,7 @@ "variables": { "box_basename": "ubuntu-14.04", "build_timestamp": "{{isotime \"20060102150405\"}}", + "cpus": "1", "git_revision": "__unknown_git_revision__", "headless": "", "http_proxy": "{{env `http_proxy`}}", @@ -250,6 +251,7 @@ "iso_checksum": "07e4bb5569814eab41fafac882ba127893e3ff0bdb7ec931c9b2d040e3e94e7a", "iso_checksum_type": "sha256", "iso_name": "ubuntu-14.04.4-server-amd64.iso", + "memory": "512", "metadata": "floppy/dummy_metadata.json", "mirror": "http://releases.ubuntu.com", "mirror_directory": "14.04.4", diff --git a/ubuntu-14.04-i386.json b/ubuntu-14.04-i386.json index a4f2b130b..20bed1e91 100644 --- a/ubuntu-14.04-i386.json +++ b/ubuntu-14.04-i386.json @@ -47,13 +47,13 @@ "modifyvm", "{{.Name}}", "--memory", - "384" + "{{ user `memory` }}" ], [ "modifyvm", "{{.Name}}", "--cpus", - "1" + "{{ user `cpus` }}" ] ], "virtualbox_version_file": ".vbox_version", @@ -103,8 +103,8 @@ "vm_name": "{{ user `template` }}", "vmx_data": { "cpuid.coresPerSocket": "1", - "memsize": "384", - "numvcpus": "1" + "memsize": "{{ user `memory` }}", + "numvcpus": "{{ user `cpus` }}" } }, { @@ -146,13 +146,13 @@ "set", "{{.Name}}", "--memsize", - "384" + "{{ user `memory` }}" ], [ "set", "{{.Name}}", "--cpus", - "1" + "{{ user `cpus` }}" ] ], "prlctl_version_file": ".prlctl_version", @@ -243,6 +243,7 @@ "variables": { "box_basename": "ubuntu-14.04-i386", "build_timestamp": "{{isotime \"20060102150405\"}}", + "cpus": "1", "git_revision": "__unknown_git_revision__", "headless": "", "http_proxy": "{{env `http_proxy`}}", @@ -250,6 +251,7 @@ "iso_checksum": "e20cf9e0812b52287ca22ac1815bc933c0cfef2be88191110b697d8943bef19e", "iso_checksum_type": "sha256", "iso_name": "ubuntu-14.04.4-server-i386.iso", + "memory": "512", "metadata": "floppy/dummy_metadata.json", "mirror": "http://releases.ubuntu.com", "mirror_directory": "14.04.4", diff --git a/ubuntu-14.10-amd64.json b/ubuntu-14.10-amd64.json index 30dd65947..65897b2a4 100644 --- a/ubuntu-14.10-amd64.json +++ b/ubuntu-14.10-amd64.json @@ -47,13 +47,13 @@ "modifyvm", "{{.Name}}", "--memory", - "384" + "{{ user `memory` }}" ], [ "modifyvm", "{{.Name}}", "--cpus", - "1" + "{{ user `cpus` }}" ] ], "virtualbox_version_file": ".vbox_version", @@ -103,8 +103,8 @@ "vm_name": "{{ user `template` }}", "vmx_data": { "cpuid.coresPerSocket": "1", - "memsize": "384", - "numvcpus": "1" + "memsize": "{{ user `memory` }}", + "numvcpus": "{{ user `cpus` }}" } }, { @@ -146,13 +146,13 @@ "set", "{{.Name}}", "--memsize", - "384" + "{{ user `memory` }}" ], [ "set", "{{.Name}}", "--cpus", - "1" + "{{ user `cpus` }}" ] ], "prlctl_version_file": ".prlctl_version", @@ -243,6 +243,7 @@ "variables": { "box_basename": "ubuntu-14.10", "build_timestamp": "{{isotime \"20060102150405\"}}", + "cpus": "1", "git_revision": "__unknown_git_revision__", "headless": "", "http_proxy": "{{env `http_proxy`}}", @@ -250,6 +251,7 @@ "iso_checksum": "f79edea19575e2cabb5ff9aeca787ea821fcfdbf81ce89823c26b020d9940956", "iso_checksum_type": "sha256", "iso_name": "ubuntu-14.10-server-amd64.iso", + "memory": "512", "metadata": "floppy/dummy_metadata.json", "mirror": "http://releases.ubuntu.com", "mirror_directory": "14.10", diff --git a/ubuntu-14.10-i386.json b/ubuntu-14.10-i386.json index 4fcfeb160..913671a3a 100644 --- a/ubuntu-14.10-i386.json +++ b/ubuntu-14.10-i386.json @@ -47,13 +47,13 @@ "modifyvm", "{{.Name}}", "--memory", - "384" + "{{ user `memory` }}" ], [ "modifyvm", "{{.Name}}", "--cpus", - "1" + "{{ user `cpus` }}" ] ], "virtualbox_version_file": ".vbox_version", @@ -103,8 +103,8 @@ "vm_name": "{{ user `template` }}", "vmx_data": { "cpuid.coresPerSocket": "1", - "memsize": "384", - "numvcpus": "1" + "memsize": "{{ user `memory` }}", + "numvcpus": "{{ user `cpus` }}" } }, { @@ -146,13 +146,13 @@ "set", "{{.Name}}", "--memsize", - "384" + "{{ user `memory` }}" ], [ "set", "{{.Name}}", "--cpus", - "1" + "{{ user `cpus` }}" ] ], "prlctl_version_file": ".prlctl_version", @@ -243,6 +243,7 @@ "variables": { "box_basename": "ubuntu-14.10-i386", "build_timestamp": "{{isotime \"20060102150405\"}}", + "cpus": "1", "git_revision": "__unknown_git_revision__", "headless": "", "http_proxy": "{{env `http_proxy`}}", @@ -250,6 +251,7 @@ "iso_checksum": "e1c74e163b06e28bfd71ef322ce986fb6098d03704408f9dc2eaf3ef6f7f86b9", "iso_checksum_type": "sha256", "iso_name": "ubuntu-14.10-server-i386.iso", + "memory": "512", "metadata": "floppy/dummy_metadata.json", "mirror": "http://releases.ubuntu.com", "mirror_directory": "14.10", diff --git a/ubuntu-15.04-amd64.json b/ubuntu-15.04-amd64.json index 2a035d001..ba15126a6 100644 --- a/ubuntu-15.04-amd64.json +++ b/ubuntu-15.04-amd64.json @@ -48,13 +48,13 @@ "modifyvm", "{{.Name}}", "--memory", - "384" + "{{ user `memory` }}" ], [ "modifyvm", "{{.Name}}", "--cpus", - "1" + "{{ user `cpus` }}" ] ], "virtualbox_version_file": ".vbox_version", @@ -105,8 +105,8 @@ "vm_name": "{{ user `template` }}", "vmx_data": { "cpuid.coresPerSocket": "1", - "memsize": "384", - "numvcpus": "1" + "memsize": "{{ user `memory` }}", + "numvcpus": "{{ user `cpus` }}" } }, { @@ -149,13 +149,13 @@ "set", "{{.Name}}", "--memsize", - "384" + "{{ user `memory` }}" ], [ "set", "{{.Name}}", "--cpus", - "1" + "{{ user `cpus` }}" ] ], "prlctl_version_file": ".prlctl_version", @@ -247,6 +247,7 @@ "variables": { "box_basename": "ubuntu-15.04", "build_timestamp": "{{isotime \"20060102150405\"}}", + "cpus": "1", "git_revision": "__unknown_git_revision__", "headless": "", "http_proxy": "{{env `http_proxy`}}", @@ -254,6 +255,7 @@ "iso_checksum": "6501c8545374665823384bbb6235f865108f56d8a30bbf69dd18df73c14ccb84", "iso_checksum_type": "sha256", "iso_name": "ubuntu-15.04-server-amd64.iso", + "memory": "512", "metadata": "floppy/dummy_metadata.json", "mirror": "http://releases.ubuntu.com", "mirror_directory": "15.04", @@ -264,4 +266,3 @@ "version": "2.1.TIMESTAMP" } } - diff --git a/ubuntu-15.04-i386.json b/ubuntu-15.04-i386.json index 23e2e5290..a152caf77 100644 --- a/ubuntu-15.04-i386.json +++ b/ubuntu-15.04-i386.json @@ -48,13 +48,13 @@ "modifyvm", "{{.Name}}", "--memory", - "384" + "{{ user `memory` }}" ], [ "modifyvm", "{{.Name}}", "--cpus", - "1" + "{{ user `cpus` }}" ] ], "virtualbox_version_file": ".vbox_version", @@ -105,8 +105,8 @@ "vm_name": "{{ user `template` }}", "vmx_data": { "cpuid.coresPerSocket": "1", - "memsize": "384", - "numvcpus": "1" + "memsize": "{{ user `memory` }}", + "numvcpus": "{{ user `cpus` }}" } }, { @@ -149,13 +149,13 @@ "set", "{{.Name}}", "--memsize", - "384" + "{{ user `memory` }}" ], [ "set", "{{.Name}}", "--cpus", - "1" + "{{ user `cpus` }}" ] ], "prlctl_version_file": ".prlctl_version", @@ -247,6 +247,7 @@ "variables": { "box_basename": "ubuntu-15.04-i386", "build_timestamp": "{{isotime \"20060102150405\"}}", + "cpus": "1", "git_revision": "__unknown_git_revision__", "headless": "", "http_proxy": "{{env `http_proxy`}}", @@ -254,6 +255,7 @@ "iso_checksum": "f510169ddc03121d11a627ae3a231e1272d8e4d75f9ef76f73daa5b809c5b6d8", "iso_checksum_type": "sha256", "iso_name": "ubuntu-15.04-server-i386.iso", + "memory": "512", "metadata": "floppy/dummy_metadata.json", "mirror": "http://releases.ubuntu.com", "mirror_directory": "15.04", @@ -264,4 +266,3 @@ "version": "2.1.TIMESTAMP" } } - diff --git a/ubuntu-15.10-amd64.json b/ubuntu-15.10-amd64.json index 0d9a580f8..7f1aedaf2 100644 --- a/ubuntu-15.10-amd64.json +++ b/ubuntu-15.10-amd64.json @@ -49,13 +49,13 @@ "modifyvm", "{{.Name}}", "--memory", - "384" + "{{ user `memory` }}" ], [ "modifyvm", "{{.Name}}", "--cpus", - "1" + "{{ user `cpus` }}" ] ], "virtualbox_version_file": ".vbox_version", @@ -108,8 +108,8 @@ "vmx_data": { "cpuid.coresPerSocket": "1", "ethernet0.pciSlotNumber": "32", - "memsize": "384", - "numvcpus": "1" + "memsize": "{{ user `memory` }}", + "numvcpus": "{{ user `cpus` }}" } }, { @@ -153,13 +153,13 @@ "set", "{{.Name}}", "--memsize", - "384" + "{{ user `memory` }}" ], [ "set", "{{.Name}}", "--cpus", - "1" + "{{ user `cpus` }}" ] ], "prlctl_version_file": ".prlctl_version", @@ -252,6 +252,7 @@ "variables": { "box_basename": "ubuntu-15.10", "build_timestamp": "{{isotime \"20060102150405\"}}", + "cpus": "1", "git_revision": "__unknown_git_revision__", "headless": "", "http_proxy": "{{env `http_proxy`}}", @@ -259,6 +260,7 @@ "iso_checksum": "86aa35a986eba6e5ad30e3d486d57efe6803ae7ea4859b0216953e9e62871131", "iso_checksum_type": "sha256", "iso_name": "ubuntu-15.10-server-amd64.iso", + "memory": "512", "metadata": "floppy/dummy_metadata.json", "mirror": "http://releases.ubuntu.com", "mirror_directory": "15.10", @@ -269,4 +271,3 @@ "version": "2.1.TIMESTAMP" } } - diff --git a/ubuntu-15.10-i386.json b/ubuntu-15.10-i386.json index a0b8a2a8a..a9db02cfd 100644 --- a/ubuntu-15.10-i386.json +++ b/ubuntu-15.10-i386.json @@ -49,13 +49,13 @@ "modifyvm", "{{.Name}}", "--memory", - "384" + "{{ user `memory` }}" ], [ "modifyvm", "{{.Name}}", "--cpus", - "1" + "{{ user `cpus` }}" ] ], "virtualbox_version_file": ".vbox_version", @@ -108,8 +108,8 @@ "vmx_data": { "cpuid.coresPerSocket": "1", "ethernet0.pciSlotNumber": "32", - "memsize": "384", - "numvcpus": "1" + "memsize": "{{ user `memory` }}", + "numvcpus": "{{ user `cpus` }}" } }, { @@ -153,13 +153,13 @@ "set", "{{.Name}}", "--memsize", - "384" + "{{ user `memory` }}" ], [ "set", "{{.Name}}", "--cpus", - "1" + "{{ user `cpus` }}" ] ], "prlctl_version_file": ".prlctl_version", @@ -252,6 +252,7 @@ "variables": { "box_basename": "ubuntu-15.10-i386", "build_timestamp": "{{isotime \"20060102150405\"}}", + "cpus": "1", "git_revision": "__unknown_git_revision__", "headless": "", "http_proxy": "{{env `http_proxy`}}", @@ -259,6 +260,7 @@ "iso_checksum": "fa97768bdc3f198b82180d39bf0c26f021ab716f5da98094cd220771095e3394", "iso_checksum_type": "sha256", "iso_name": "ubuntu-15.10-server-i386.iso", + "memory": "512", "metadata": "floppy/dummy_metadata.json", "mirror": "http://releases.ubuntu.com", "mirror_directory": "15.10", @@ -269,4 +271,3 @@ "version": "2.1.TIMESTAMP" } } - diff --git a/ubuntu-16.04-amd64.json b/ubuntu-16.04-amd64.json index 3dd9f6d23..de0af80ed 100644 --- a/ubuntu-16.04-amd64.json +++ b/ubuntu-16.04-amd64.json @@ -49,13 +49,13 @@ "modifyvm", "{{.Name}}", "--memory", - "384" + "{{ user `memory` }}" ], [ "modifyvm", "{{.Name}}", "--cpus", - "1" + "{{ user `cpus` }}" ] ], "virtualbox_version_file": ".vbox_version", @@ -108,8 +108,8 @@ "vmx_data": { "cpuid.coresPerSocket": "1", "ethernet0.pciSlotNumber": "32", - "memsize": "384", - "numvcpus": "1" + "memsize": "{{ user `memory` }}", + "numvcpus": "{{ user `cpus` }}" } }, { @@ -153,13 +153,13 @@ "set", "{{.Name}}", "--memsize", - "384" + "{{ user `memory` }}" ], [ "set", "{{.Name}}", "--cpus", - "1" + "{{ user `cpus` }}" ] ], "prlctl_version_file": ".prlctl_version", @@ -252,6 +252,7 @@ "variables": { "box_basename": "ubuntu-16.04", "build_timestamp": "{{isotime \"20060102150405\"}}", + "cpus": "1", "git_revision": "__unknown_git_revision__", "headless": "", "http_proxy": "{{env `http_proxy`}}", @@ -259,6 +260,7 @@ "iso_checksum": "b8b172cbdf04f5ff8adc8c2c1b4007ccf66f00fc6a324a6da6eba67de71746f6", "iso_checksum_type": "sha256", "iso_name": "ubuntu-16.04-server-amd64.iso", + "memory": "512", "metadata": "floppy/dummy_metadata.json", "mirror": "http://releases.ubuntu.com", "mirror_directory": "16.04", diff --git a/ubuntu-16.04-i386.json b/ubuntu-16.04-i386.json index 6f2833657..3361b9af8 100644 --- a/ubuntu-16.04-i386.json +++ b/ubuntu-16.04-i386.json @@ -49,13 +49,13 @@ "modifyvm", "{{.Name}}", "--memory", - "384" + "{{ user `memory` }}" ], [ "modifyvm", "{{.Name}}", "--cpus", - "1" + "{{ user `cpus` }}" ] ], "virtualbox_version_file": ".vbox_version", @@ -108,8 +108,8 @@ "vmx_data": { "cpuid.coresPerSocket": "1", "ethernet0.pciSlotNumber": "32", - "memsize": "384", - "numvcpus": "1" + "memsize": "{{ user `memory` }}", + "numvcpus": "{{ user `cpus` }}" } }, { @@ -153,13 +153,13 @@ "set", "{{.Name}}", "--memsize", - "384" + "{{ user `memory` }}" ], [ "set", "{{.Name}}", "--cpus", - "1" + "{{ user `cpus` }}" ] ], "prlctl_version_file": ".prlctl_version", @@ -252,6 +252,7 @@ "variables": { "box_basename": "ubuntu-16.04-i386", "build_timestamp": "{{isotime \"20060102150405\"}}", + "cpus": "1", "git_revision": "__unknown_git_revision__", "headless": "", "http_proxy": "{{env `http_proxy`}}", @@ -259,6 +260,7 @@ "iso_checksum": "8d52f3127f2b7ffa97698913b722e3219187476a9b936055d737f3e00aecd24d", "iso_checksum_type": "sha256", "iso_name": "ubuntu-16.04-server-i386.iso ", + "memory": "512", "metadata": "floppy/dummy_metadata.json", "mirror": "http://releases.ubuntu.com", "mirror_directory": "16.04", diff --git a/windows-nano-tp3.json b/windows-nano-tp3.json index 382288800..03b9cd3af 100644 --- a/windows-nano-tp3.json +++ b/windows-nano-tp3.json @@ -20,7 +20,7 @@ "shutdown_timeout": "1h", "type": "virtualbox-iso", "vboxmanage": [ - [ + [ "modifyvm", "{{.Name}}", "--natpf1", @@ -30,7 +30,7 @@ "modifyvm", "{{.Name}}", "--memory", - "2048" + "{{ user `memory` }}" ], [ "modifyvm", @@ -42,7 +42,7 @@ "modifyvm", "{{.Name}}", "--cpus", - "2" + "{{ user `cpus` }}" ], [ "modifyvm", @@ -67,11 +67,13 @@ "variables": { "box_basename": "windows-nano", "build_timestamp": "{{isotime \"20060102150405\"}}", + "cpus": "2", "git_revision": "__unknown_git_revision__", "headless": "", "iso_checksum": "7003c2a4f9abe672c570ff018fbf3a27", "iso_checksum_type": "md5", "iso_url": "http://care.dlservice.microsoft.com/dl/download/7/3/C/73C250BE-67C4-440B-A69B-D0E8EE77F01C/10514.0.150808-1529.TH2_RELEASE_SERVER_OEMRET_X64FRE_EN-US.ISO", + "memory": "2048", "metadata": "floppy/dummy_metadata.json", "template": "windows-nano-tp3", "version": "1.1.TIMESTAMP" From 6683ed93cf70242660ba44e942bc1cb3bac05237 Mon Sep 17 00:00:00 2001 From: Seth Thomas <sthomas@chef.io> Date: Tue, 26 Apr 2016 15:34:45 -0700 Subject: [PATCH 0486/1622] Fixing omnios and leap templates --- omnios-r151010j.json | 6 +++--- omnios-r151014.json | 8 ++++---- omnios-r151018.json | 8 ++++---- opensuse-leap-42.1-x86_64.json | 6 +++--- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/omnios-r151010j.json b/omnios-r151010j.json index ea8149fcf..661156ed8 100644 --- a/omnios-r151010j.json +++ b/omnios-r151010j.json @@ -48,7 +48,7 @@ "modifyvm", "{{.Name}}", "--memory", - "1024" + "{{ user `memory` }}" ], [ "modifyvm", @@ -112,7 +112,7 @@ "vm_name": "{{ user `template` }}", "vmx_data": { "cpuid.coresPerSocket": "1", - "memsize": "1024", + "memsize": "{{ user `memory` }}", "numvcpus": "{{ user `cpus` }}" } }, @@ -215,7 +215,7 @@ "cpus": "1", "git_revision": "__unknown_git_revision__", "headless": "", - "memory": "512", + "memory": "1024", "metadata": "floppy/dummy_metadata.json", "mirror": "http://omnios.omniti.com/media", "name": "omnios-r151010j", diff --git a/omnios-r151014.json b/omnios-r151014.json index 6a64cd1c6..671020dc6 100644 --- a/omnios-r151014.json +++ b/omnios-r151014.json @@ -48,7 +48,7 @@ "modifyvm", "{{.Name}}", "--memory", - "1024" + "{{ user `memory` }}" ], [ "modifyvm", @@ -112,7 +112,7 @@ "vm_name": "{{ user `template` }}", "vmx_data": { "cpuid.coresPerSocket": "1", - "memsize": "1024", + "memsize": "{{ user `memory` }}", "numvcpus": "{{ user `cpus` }}" } }, @@ -162,7 +162,7 @@ "set", "{{.Name}}", "--memsize", - "1024" + "{{ user `memory` }}" ], [ "set", @@ -225,7 +225,7 @@ "iso_checksum": "16fd303c81521db72fe6b0b5e891cffb5f9caa60", "iso_checksum_type": "sha1", "iso_name": "OmniOS_Text_r151014.iso", - "memory": "512", + "memory": "1024", "metadata": "floppy/dummy_metadata.json", "mirror": "http://omnios.omniti.com", "mirror_directory": "media", diff --git a/omnios-r151018.json b/omnios-r151018.json index 1ca25ce6f..6941ec37a 100644 --- a/omnios-r151018.json +++ b/omnios-r151018.json @@ -48,7 +48,7 @@ "modifyvm", "{{.Name}}", "--memory", - "1024" + "{{ user `memory` }}" ], [ "modifyvm", @@ -112,7 +112,7 @@ "vm_name": "{{ user `template` }}", "vmx_data": { "cpuid.coresPerSocket": "1", - "memsize": "1024", + "memsize": "{{ user `memory` }}", "numvcpus": "{{ user `cpus` }}" } }, @@ -162,7 +162,7 @@ "set", "{{.Name}}", "--memsize", - "1024" + "{{ user `memory` }}" ], [ "set", @@ -225,7 +225,7 @@ "iso_checksum": "5378cfdf9c7197c886231eb622bd9b19de597dba", "iso_checksum_type": "sha1", "iso_name": "OmniOS_Text_r151018.iso", - "memory": "512", + "memory": "1024", "metadata": "floppy/dummy_metadata.json", "mirror": "http://omnios.omniti.com", "mirror_directory": "media", diff --git a/opensuse-leap-42.1-x86_64.json b/opensuse-leap-42.1-x86_64.json index a2d398b0d..2f0562b1d 100644 --- a/opensuse-leap-42.1-x86_64.json +++ b/opensuse-leap-42.1-x86_64.json @@ -30,7 +30,7 @@ "modifyvm", "{{.Name}}", "--memory", - "768" + "{{ user `memory` }}" ], [ "modifyvm", @@ -69,7 +69,7 @@ "vm_name": "{{ user `template` }}", "vmx_data": { "cpuid.coresPerSocket": "1", - "memsize": "768", + "memsize": "{{ user `memory` }}", "numvcpus": "{{ user `cpus` }}" } }, @@ -95,7 +95,7 @@ "set", "{{.Name}}", "--memsize", - "768" + "{{ user `memory` }}" ], [ "set", From 04385441d3d7e111ae79ff0a4e4eb36e14a55225 Mon Sep 17 00:00:00 2001 From: Seth Thomas <sthomas@chef.io> Date: Tue, 26 Apr 2016 17:34:09 -0700 Subject: [PATCH 0487/1622] Possible fix for Fedora 23 vmware issue --- fedora-23-x86_64.json | 1 + 1 file changed, 1 insertion(+) diff --git a/fedora-23-x86_64.json b/fedora-23-x86_64.json index 0f089e5db..437fda51c 100644 --- a/fedora-23-x86_64.json +++ b/fedora-23-x86_64.json @@ -61,6 +61,7 @@ "vm_name": "{{ user `template` }}", "vmx_data": { "cpuid.coresPerSocket": "1", + "ethernet0.pciSlotNumber": "32", "memsize": "{{ user `memory` }}", "numvcpus": "{{ user `cpus` }}" } From bf43f995ea1f5ff62fff99ace3f121eb8b969852 Mon Sep 17 00:00:00 2001 From: Mikhail Zholobov <legal90@gmail.com> Date: Wed, 27 Apr 2016 21:23:02 +0300 Subject: [PATCH 0488/1622] Fix iso_name in ubuntu-16.04-i386.json --- ubuntu-16.04-i386.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ubuntu-16.04-i386.json b/ubuntu-16.04-i386.json index 3361b9af8..181173cda 100644 --- a/ubuntu-16.04-i386.json +++ b/ubuntu-16.04-i386.json @@ -259,7 +259,7 @@ "https_proxy": "{{env `https_proxy`}}", "iso_checksum": "8d52f3127f2b7ffa97698913b722e3219187476a9b936055d737f3e00aecd24d", "iso_checksum_type": "sha256", - "iso_name": "ubuntu-16.04-server-i386.iso ", + "iso_name": "ubuntu-16.04-server-i386.iso", "memory": "512", "metadata": "floppy/dummy_metadata.json", "mirror": "http://releases.ubuntu.com", From e59122c5801846e742b344467144e08afcf319b4 Mon Sep 17 00:00:00 2001 From: Seth Thomas <sthomas@chef.io> Date: Wed, 27 Apr 2016 14:04:20 -0700 Subject: [PATCH 0489/1622] Disabling shared folder testing for now, will have secondary or refactored stage --- Rakefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Rakefile b/Rakefile index 7c94a10cb..3a92e6bea 100644 --- a/Rakefile +++ b/Rakefile @@ -251,7 +251,7 @@ def test_box(boxname, providers) [{"name"=>"#{boxname}-#{provider}", "driver"=> {"name"=>"vagrant", - "synced_folders"=>[[".", "/vagrant", "disabled: #{share_disabled}"]], + #"synced_folders"=>[[".", "/vagrant", "disabled: #{share_disabled}"]], "provider"=>provider, "box"=>"bento-#{boxname}", "box_url"=>"file://#{ENV['PWD']}/builds/#{provider_data['file']}"}}], From 6f169ac911d2285ffd2fac22e8821af559f75713 Mon Sep 17 00:00:00 2001 From: Seth Thomas <sthomas@chef.io> Date: Thu, 28 Apr 2016 15:24:28 -0700 Subject: [PATCH 0490/1622] Readme and Changelog for 2.2.6 --- CHANGELOG.md | 31 ++++++++++++++++++++- README.md | 79 +++++++++++++++++++++++++++++----------------------- 2 files changed, 74 insertions(+), 36 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1c39a55d3..5807d69c1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,34 @@ # Change Log +## [2.2.6](https://github.com/chef/bento/tree/2.2.6) (2016-04-28) +[Full Changelog](https://github.com/chef/bento/compare/2.2.5...2.2.6) + +**Tool Versions:** + +- Packer 0.10.0 +- VirtualBox 5.0.16 +- VMware Fusion 8.1.1 +- Parallels Pro 11.1.3 + +**Added platforms:** + +- Debian 8.4 [\#559](https://github.com/chef/bento/pull/559) ([kenhys](https://github.com/kenhys)) +- Debian 7.10 [\#563](https://github.com/chef/bento/pull/563) ([kenhys](https://github.com/kenhys)) +- FreeBSD 10.3 [\#557](https://github.com/chef/bento/pull/557) ([tas50](https://github.com/tas50)) +- OmniOS 151018 [\#565](https://github.com/chef/bento/pull/565) ([tas50](https://github.com/tas50)) +- Ubuntu 16.04 [\#545](https://github.com/chef/bento/pull/545) ([cheeseplus](https://github.com/cheeseplus)) + +**Fixed bugs:** + +- VMWare: tie network device to pci slot 32 [\#566](https://github.com/chef/bento/pull/566) ([rmoriz](https://github.com/rmoriz)) +- VMware: Fedora 23 box builds but can't connect [\#521](https://github.com/chef/bento/issues/521) +- Publish Ubuntu 15.10 boxes on Atlas [\#506](https://github.com/chef/bento/issues/506) + +**Improvements:** + +- Standardize on 512MB minimum memory [\#574](https://github.com/chef/bento/issues/574) +- Added headless option for QEMU builders [\#570](https://github.com/chef/bento/pull/570) ([jmatt](https://github.com/jmatt)) + ## [2.2.5](https://github.com/chef/bento/tree/2.2.5) (2016-03-29) [Full Changelog](https://github.com/chef/bento/compare/2.2.4...2.2.5) @@ -479,4 +508,4 @@ -\* *This Change Log was automatically generated by [github_changelog_generator](https://github.com/skywinder/Github-Changelog-Generator)* \ No newline at end of file +\* *This Change Log was automatically generated by [github_changelog_generator](https://github.com/skywinder/Github-Changelog-Generator)* diff --git a/README.md b/README.md index 65d2b85fa..e37d5a185 100644 --- a/README.md +++ b/README.md @@ -21,28 +21,30 @@ The following boxes are built from this repository's templates for publicly avai | centos-5.11 | [x86_64][centos_511_64_vbox] | [x86_64][centos_511_64_vmware] | [x86_64][centos_511_64_prl] | | centos-6.7 | [x86_64][centos_67_64_vbox] | [x86_64][centos_67_64_vmware] | [x86_64][centos_67_64_prl] | | centos-7.2 | [x86_64][centos_72_64_vbox] | [x86_64][centos_72_64_vmware] | [x86_64][centos_72_64_prl] | -| debian-7.9 | [amd64][debian_79_64_vbox] | [amd64][debian_79_64_vmware] | [amd64][debian_79_64_prl] | -| debian-8.3 | [amd64][debian_83_64_vbox] | [amd64][debian_83_64_vmware] | [amd64][debian_83_64_prl] | +| debian-7.10 | [amd64][debian_710_64_vbox] | [amd64][debian_710_64_vmware] | [amd64][debian_710_64_prl] | +| debian-8.4 | [amd64][debian_84_64_vbox] | [amd64][debian_84_64_vmware] | [amd64][debian_84_64_prl] | | fedora-22 | [x86_64][fedora_22_64_vbox] | [x86_64][fedora_22_64_vmware] | [x86_64][fedora_22_64_prl] | | fedora-23 | [x86_64][fedora_23_64_vbox] | [x86_64][fedora_22_64_vmware] | [x86_64][fedora_23_64_prl] | | freebsd-9.3 | [amd64][freebsd_93_64_vbox] | [amd64][freebsd_93_64_vmware] | [amd64][freebsd_93_64_prl] | -| freebsd-10.2 | [amd64][freebsd_102_64_vbox] | [amd64][freebsd_102_64_vmware] | [amd64][freebsd_102_64_prl] | +| freebsd-10.3 | [amd64][freebsd_103_64_vbox] | [amd64][freebsd_103_64_vmware] | [amd64][freebsd_103_64_prl] | | opensuse-13.2 | [x86_64][osuse_132_64_vbox] | [x86_64][osuse_132_64_vmware] | [x86_64][osuse_132_64_prl] | | ubuntu-12.04 | [amd64][ubuntu_1204_64_vbox] | [amd64][ubuntu_1204_64_vmware] | [amd64][ubuntu_1204_64_prl] | | ubuntu-14.04 | [amd64][ubuntu_1404_64_vbox] | [amd64][ubuntu_1404_64_vmware] | [amd64][ubuntu_1404_64_prl] | | ubuntu-15.10 | [amd64][ubuntu_1510_64_vbox] | [amd64][ubuntu_1510_64_vmware] | [amd64][ubuntu_1510_64_prl] | +| ubuntu-16.04 | [amd64][ubuntu_1604_64_vbox] | [amd64][ubuntu_1604_64_vmware] | [amd64][ubuntu_1604_64_prl] | ### 32 bit | | VirtualBox | VMware | Parallels | | ------------ | ------------- | ------------- | ------------- | | centos-5.11 | [i386][centos_511_32_vbox] | [i386][centos_511_32_vmware] | [i386][centos_511_32_prl] | | centos-6.7 | [i386][centos_67_32_vbox] | [i386][centos_67_32_vmware] | [i386][centos_67_32_prl] | -| debian-7.9 | [i386][debian_79_32_vbox] | [i386][debian_79_32_vmware] | [i386][debian_79_32_prl] | -| debian-8.3 | [i386][debian_83_32_vbox] | [i386][debian_83_32_vmware] | [i386][debian_83_32_prl] | +| debian-7.10 | [i386][debian_710_32_vbox] | [i386][debian_710_32_vmware] | [i386][debian_710_32_prl] | +| debian-8.4 | [i386][debian_84_32_vbox] | [i386][debian_84_32_vmware] | [i386][debian_84_32_prl] | | opensuse-13.2 | [i386][osuse_132_32_vbox] | [i386][osuse_132_32_vmware] | [i386][osuse_132_32_prl] | | ubuntu-12.04 | [i386][ubuntu_1204_32_vbox] | [i386][ubuntu_1204_32_vmware] | [i386][ubuntu_1204_32_prl] | | ubuntu-14.04 | [i386][ubuntu_1404_32_vbox] | [i386][ubuntu_1404_32_vmware] | [i386][ubuntu_1404_32_prl] | | ubuntu-15.10 | [i386][ubuntu_1510_32_vbox] | [i386][ubuntu_1510_32_vmware] | [i386][ubuntu_1510_32_prl] | +| ubuntu-16.04 | [i386][ubuntu_1604_32_vbox] | [i386][ubuntu_1604_32_vmware] | [i386][ubuntu_1604_32_prl] | *NOTE* This table tracks only the latest release for a given version. Boxes may exist in Atlas or S3 but are not @@ -50,7 +52,7 @@ guaranteed to be updated at this time. ### Build Notes -* Built on OSX 10.11.3 hosts +* Built on OSX 10.11.4 hosts * If you're using the [Vagrant VMWare Fusion](https://www.vagrantup.com/vmware) provider, using `vagrant box add --provider vmware_desktop ...` will work for these boxes. Using `--provider vmware_fusion`, will not. @@ -60,7 +62,7 @@ Once test-kitchen changes defaults the S3 buckets will no longer be updated. * Tooling versions * Packer: 0.10.0 * VirtualBox: 5.0.16 - * VMware Fusion: 8.1.0 + * VMware Fusion: 8.1.1 * Parallels: 11.1.3 @@ -88,13 +90,13 @@ new plugins. The full list of old boxes are available in the [old boxes file](ht Adding a bento box to vagrant: - $ vagrant box add bento/debian-8.1 + $ vagrant box add bento/debian-8.4 Using a bento box in a Vagrantfile: ``` Vagrant.configure("2") do |config| - config.vm.box = "bento/debian-8.1" + config.vm.box = "bento/debian-8.4" end ``` @@ -112,11 +114,11 @@ This is an opinionated tool that the project uses for building the hosted boxes To build multiple templates for all providers (VirtualBox, Fusion, Parallels, etc): - $ bin/bento build debian-8.1-amd64 debian-8.1-i386 + $ bin/bento build debian-8.4-amd64 debian-8.4-i386 To build a box for a single provider: - $ bin/bento build --only=virtualbox-iso debian-8.1-amd64 + $ bin/bento build --only=virtualbox-iso debian-8.4-amd64 ### Using `packer` @@ -124,24 +126,24 @@ Templates can still be built directly by `packer` To build a template for all providers (VirtualBox, Fusion, Parallels): - $ packer build debian-8.2-amd64.json + $ packer build debian-8.4-amd64.json To build a template only for a list of specific providers: - $ packer build -only=virtualbox-iso debian-8.2-amd64.json + $ packer build -only=virtualbox-iso debian-8.4-amd64.json To build a template for all providers except a list of specific providers: - $ packer build -except=parallels-iso,vmware-iso debian-8.2-amd64.json + $ packer build -except=parallels-iso,vmware-iso debian-8.4-amd64.json If you want to use a another mirror site, use the `mirror` user variable. - $ packer build -var 'mirror=http://ftp.jaist.ac.jp/pub/Linux/debian-cdimage/release' debian-8.2-amd64.json + $ packer build -var 'mirror=http://ftp.jaist.ac.jp/pub/Linux/debian-cdimage/release' debian-8.4-amd64.json Congratulations! You now have box(es) in the ../builds directory that you can then add to Vagrant and start testing cookbooks. Notes: -* The box_basename can be overridden like other Packer vars with ``-var 'box_basename=debian-8.2'`` +* The box_basename can be overridden like other Packer vars with ``-var 'box_basename=debian-8.4'`` ### Proprietary Boxes @@ -151,7 +153,7 @@ Mac OS X, Red Hat Enterprise Linux, and SUSE Linux Enterprise Server templates a To build a Mac OS X box, you will need to start with an installer for your desired version of OS X. You will then need to use [Tim Sutton's osx-vm-templates](https://github.com/timsutton/osx-vm-templates)/) to modify that installer for use by packer. The output of that build will include the location of the ISO and its checksum, which you can substitute into your `packer build` command, e.g.: - $ packer build -var 'iso_checksum=<checksum>' -var 'iso_url=<iso_url>' macosx-10.9.json + $ packer build -var 'iso_checksum=<checksum>' -var 'iso_url=<iso_url>' macosx-10.11.json There is a known issue where [test-kitchen](http://kitchen.ci/) starts a Mac OS X box correctly, but `vagrant up` fails due to the absence of the HGFS kernel module. This is due to a silent failure during the VMware tools installation and can be corrected by installing the VMware tools on the Mac OS X box manually. @@ -245,19 +247,19 @@ limitations under the License. [centos_72_64_vmware]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_centos-7.2_chef-provisionerless.box [centos_72_64_prl]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/parallels/opscode_centos-7.2_chef-provisionerless.box -[debian_79_32_vbox]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_debian-7.9-i386_chef-provisionerless.box -[debian_79_64_vbox]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_debian-7.9_chef-provisionerless.box -[debian_79_32_vmware]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_debian-7.9-i386_chef-provisionerless.box -[debian_79_64_vmware]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_debian-7.9_chef-provisionerless.box -[debian_79_32_prl]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/parallels/opscode_debian-7.9-i386_chef-provisionerless.box -[debian_79_64_prl]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/parallels/opscode_debian-7.9_chef-provisionerless.box +[debian_710_32_vbox]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_debian-7.10-i386_chef-provisionerless.box +[debian_710_64_vbox]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_debian-7.10_chef-provisionerless.box +[debian_710_32_vmware]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_debian-7.10-i386_chef-provisionerless.box +[debian_710_64_vmware]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_debian-7.10_chef-provisionerless.box +[debian_710_32_prl]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/parallels/opscode_debian-7.10-i386_chef-provisionerless.box +[debian_710_64_prl]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/parallels/opscode_debian-7.10_chef-provisionerless.box -[debian_83_32_vbox]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_debian-8.3-i386_chef-provisionerless.box -[debian_83_64_vbox]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_debian-8.3_chef-provisionerless.box -[debian_83_32_vmware]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_debian-8.3-i386_chef-provisionerless.box -[debian_83_64_vmware]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_debian-8.3_chef-provisionerless.box -[debian_83_32_prl]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/parallels/opscode_debian-8.3-i386_chef-provisionerless.box -[debian_83_64_prl]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/parallels/opscode_debian-8.3_chef-provisionerless.box +[debian_84_32_vbox]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_debian-8.4-i386_chef-provisionerless.box +[debian_84_64_vbox]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_debian-8.4_chef-provisionerless.box +[debian_84_32_vmware]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_debian-8.4-i386_chef-provisionerless.box +[debian_84_64_vmware]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_debian-8.4_chef-provisionerless.box +[debian_84_32_prl]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/parallels/opscode_debian-8.4-i386_chef-provisionerless.box +[debian_84_64_prl]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/parallels/opscode_debian-8.4_chef-provisionerless.box [freebsd_93_32_vbox]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_freebsd-9.3-i386_chef-provisionerless.box [freebsd_93_64_vbox]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_freebsd-9.3_chef-provisionerless.box @@ -266,12 +268,12 @@ limitations under the License. [freebsd_93_32_prl]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/parallels/opscode_freebsd-9.3-i386_chef-provisionerless.box [freebsd_93_64_prl]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/parallels/opscode_freebsd-9.3_chef-provisionerless.box -[freebsd_102_32_vbox]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_freebsd-10.2-i386_chef-provisionerless.box -[freebsd_102_64_vbox]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_freebsd-10.2_chef-provisionerless.box -[freebsd_102_32_vmware]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_freebsd-10.2-i386_chef-provisionerless.box -[freebsd_102_64_vmware]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_freebsd-10.2_chef-provisionerless.box -[freebsd_102_32_prl]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/parallels/opscode_freebsd-10.2-i386_chef-provisionerless.box -[freebsd_102_64_prl]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/parallels/opscode_freebsd-10.2_chef-provisionerless.box +[freebsd_103_32_vbox]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_freebsd-10.3-i386_chef-provisionerless.box +[freebsd_103_64_vbox]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_freebsd-10.3_chef-provisionerless.box +[freebsd_103_32_vmware]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_freebsd-10.3-i386_chef-provisionerless.box +[freebsd_103_64_vmware]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_freebsd-10.3_chef-provisionerless.box +[freebsd_103_32_prl]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/parallels/opscode_freebsd-10.3-i386_chef-provisionerless.box +[freebsd_103_64_prl]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/parallels/opscode_freebsd-10.3_chef-provisionerless.box [osuse_132_32_vbox]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_opensuse-13.2-i386_chef-provisionerless.box [osuse_132_64_vbox]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_opensuse-13.2-x86_64_chef-provisionerless.box @@ -301,6 +303,13 @@ limitations under the License. [ubuntu_1510_32_prl]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/parallels/opscode_ubuntu-15.10-i386_chef-provisionerless.box [ubuntu_1510_64_prl]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/parallels/opscode_ubuntu-15.10_chef-provisionerless.box +[ubuntu_1604_32_vbox]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_ubuntu-16.04-i386_chef-provisionerless.box +[ubuntu_1604_64_vbox]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_ubuntu-16.04_chef-provisionerless.box +[ubuntu_1604_32_vmware]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_ubuntu-16.04-i386_chef-provisionerless.box +[ubuntu_1604_64_vmware]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_ubuntu-16.04_chef-provisionerless.box +[ubuntu_1604_32_prl]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/parallels/opscode_ubuntu-16.04-i386_chef-provisionerless.box +[ubuntu_1604_64_prl]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/parallels/opscode_ubuntu-16.04_chef-provisionerless.box + [fedora_22_64_vbox]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_fedora-22_chef-provisionerless.box [fedora_22_64_vmware]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_fedora-22_chef-provisionerless.box [fedora_22_64_prl]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/parallels/opscode_fedora-22_chef-provisionerless.box From 096926540437219eb719e54ad8f80d83927f034f Mon Sep 17 00:00:00 2001 From: Seth Thomas <sthomas@chef.io> Date: Fri, 29 Apr 2016 11:36:57 -0700 Subject: [PATCH 0491/1622] Switching to more reliable mirror --- opensuse-13.2-i386.json | 2 +- opensuse-13.2-x86_64.json | 2 +- opensuse-leap-42.1-x86_64.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/opensuse-13.2-i386.json b/opensuse-13.2-i386.json index e18840487..f895e8f10 100644 --- a/opensuse-13.2-i386.json +++ b/opensuse-13.2-i386.json @@ -187,7 +187,7 @@ "iso_name": "openSUSE-13.2-DVD-i586.iso", "memory": "512", "metadata": "floppy/dummy_metadata.json", - "mirror": "http://download.opensuse.org/distribution", + "mirror": "http://suse.mobile-central.org/distribution", "mirror_directory": "13.2/iso", "name": "opensuse-13.2-i386", "no_proxy": "{{env `no_proxy`}}", diff --git a/opensuse-13.2-x86_64.json b/opensuse-13.2-x86_64.json index a303d465f..314bae5a6 100644 --- a/opensuse-13.2-x86_64.json +++ b/opensuse-13.2-x86_64.json @@ -187,7 +187,7 @@ "iso_name": "openSUSE-13.2-DVD-x86_64.iso", "memory": "512", "metadata": "floppy/dummy_metadata.json", - "mirror": "http://download.opensuse.org/distribution", + "mirror": "http://suse.mobile-central.org/distribution", "mirror_directory": "13.2/iso", "name": "opensuse-13.2", "no_proxy": "{{env `no_proxy`}}", diff --git a/opensuse-leap-42.1-x86_64.json b/opensuse-leap-42.1-x86_64.json index 2f0562b1d..47801946e 100644 --- a/opensuse-leap-42.1-x86_64.json +++ b/opensuse-leap-42.1-x86_64.json @@ -187,7 +187,7 @@ "iso_name": "openSUSE-Leap-42.1-DVD-x86_64.iso", "memory": "512", "metadata": "floppy/dummy_metadata.json", - "mirror": "http://download.opensuse.org/distribution", + "mirror": "http://suse.mobile-central.org/distribution", "mirror_directory": "leap/42.1/iso", "name": "opensuse-leap-42.1", "no_proxy": "{{env `no_proxy`}}", From f4460d01607f0f73536303556f02193ff1f9c5c1 Mon Sep 17 00:00:00 2001 From: David M Noriega <davidmnoriega@gmail.com> Date: Fri, 29 Apr 2016 15:51:00 -0700 Subject: [PATCH 0492/1622] Changed ubuntu-14.04 to use 14.04.1 base --- ubuntu-14.04-amd64.json | 8 ++++---- ubuntu-14.04-i386.json | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/ubuntu-14.04-amd64.json b/ubuntu-14.04-amd64.json index 22f6ca9a2..73c1dd97d 100644 --- a/ubuntu-14.04-amd64.json +++ b/ubuntu-14.04-amd64.json @@ -248,13 +248,13 @@ "headless": "", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", - "iso_checksum": "07e4bb5569814eab41fafac882ba127893e3ff0bdb7ec931c9b2d040e3e94e7a", + "iso_checksum": "946a6077af6f5f95a51f82fdc44051c7aa19f9cfc5f737954845a6050543d7c2", "iso_checksum_type": "sha256", - "iso_name": "ubuntu-14.04.4-server-amd64.iso", + "iso_name": "ubuntu-14.04.1-server-amd64.iso", "memory": "512", "metadata": "floppy/dummy_metadata.json", - "mirror": "http://releases.ubuntu.com", - "mirror_directory": "14.04.4", + "mirror": "http://old-releases.ubuntu.com/releases", + "mirror_directory": "14.04.1", "name": "ubuntu-14.04", "no_proxy": "{{env `no_proxy`}}", "preseed_path": "ubuntu-14.04/preseed.cfg", diff --git a/ubuntu-14.04-i386.json b/ubuntu-14.04-i386.json index 20bed1e91..27ef6e4b6 100644 --- a/ubuntu-14.04-i386.json +++ b/ubuntu-14.04-i386.json @@ -248,13 +248,13 @@ "headless": "", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", - "iso_checksum": "e20cf9e0812b52287ca22ac1815bc933c0cfef2be88191110b697d8943bef19e", + "iso_checksum": "976044842804eafc18390505508958b559c131211160ecae5e60694bdf171f78", "iso_checksum_type": "sha256", - "iso_name": "ubuntu-14.04.4-server-i386.iso", + "iso_name": "ubuntu-14.04.1-server-i386.iso", "memory": "512", "metadata": "floppy/dummy_metadata.json", - "mirror": "http://releases.ubuntu.com", - "mirror_directory": "14.04.4", + "mirror": "http://old-releases.ubuntu.com/releases", + "mirror_directory": "14.04.1", "name": "ubuntu-14.04-i386", "no_proxy": "{{env `no_proxy`}}", "preseed_path": "ubuntu-14.04/preseed.cfg", From eaa4ff2c06f425f5eb7caa35c4a19ed7c593f1bf Mon Sep 17 00:00:00 2001 From: Seth Thomas <sthomas@chef.io> Date: Thu, 5 May 2016 11:02:34 -0400 Subject: [PATCH 0493/1622] HWE BEGONE! --- ubuntu-12.04-amd64.json | 8 ++++---- ubuntu-12.04-i386.json | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/ubuntu-12.04-amd64.json b/ubuntu-12.04-amd64.json index 8f211be8c..7a6b1a386 100644 --- a/ubuntu-12.04-amd64.json +++ b/ubuntu-12.04-amd64.json @@ -248,13 +248,13 @@ "headless": "", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", - "iso_checksum": "af224223de99e2a730b67d7785b657f549be0d63221188e105445f75fb8305c9", + "iso_checksum": "9c21c99bab91462b6ca779bfcaccb1de466b9ad0309a9dbd6d196b4918cc72ef", "iso_checksum_type": "sha256", - "iso_name": "ubuntu-12.04.5-server-amd64.iso", + "iso_name": "ubuntu-12.04.1-server-amd64.iso", "memory": "512", "metadata": "floppy/dummy_metadata.json", - "mirror": "http://releases.ubuntu.com", - "mirror_directory": "12.04.5", + "mirror": "http://old-releases.ubuntu.com/releases", + "mirror_directory": "12.04.1", "name": "ubuntu-12.04", "no_proxy": "{{env `no_proxy`}}", "preseed_path": "ubuntu-12.04/preseed.cfg", diff --git a/ubuntu-12.04-i386.json b/ubuntu-12.04-i386.json index a567fd7be..cd18219dc 100644 --- a/ubuntu-12.04-i386.json +++ b/ubuntu-12.04-i386.json @@ -248,13 +248,13 @@ "headless": "", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", - "iso_checksum": "bec39e79664aa189dea338993f636e54c5eda2f84c27def7b06bd6373ab87628", + "iso_checksum": "77f43bc3332ce7a678b7b6b2fe9190e15276fd14d121be479f00bc18e570d323", "iso_checksum_type": "sha256", - "iso_name": "ubuntu-12.04.5-server-i386.iso", + "iso_name": "ubuntu-12.04.1-server-i386.iso", "memory": "512", "metadata": "floppy/dummy_metadata.json", - "mirror": "http://releases.ubuntu.com", - "mirror_directory": "12.04.5", + "mirror": "http://old-releases.ubuntu.com/releases", + "mirror_directory": "12.04.1", "name": "ubuntu-12.04-i386", "no_proxy": "{{env `no_proxy`}}", "preseed_path": "ubuntu-12.04/preseed.cfg", From bb85a625c1c868aed37e32c6a6d29da01429676e Mon Sep 17 00:00:00 2001 From: Seth Thomas <sthomas@chef.io> Date: Mon, 9 May 2016 08:51:53 -0700 Subject: [PATCH 0494/1622] 2.2.7 - Death to HWE --- CHANGELOG.md | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5807d69c1..9d63761df 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,14 @@ # Change Log +## [2.2.7](https://github.com/chef/bento/tree/2.2.7) (2016-05-09) +[Full Changelog](https://github.com/chef/bento/compare/2.2.6...2.2.7) + + +**Improvements:** +- Ubuntu: HWE BEGONE! pt 1 - Fix for VMware HGFS on 14.04 [\#584](https://github.com/chef/bento/pull/584) ([davidmnoriega](https://github.com/davidmnoriega)) +- Ubuntu: HWE BEGONE! pt 2 - The Pangolining [\#587](https://github.com/chef/bento/pull/587) ([cheeseplus](https://github.com/cheeseplus)) +- OpenSuSE: Switching to more reliable mirror [\#583](https://github.com/chef/bento/pull/583) ([cheeseplus](https://github.com/cheeseplus)) + ## [2.2.6](https://github.com/chef/bento/tree/2.2.6) (2016-04-28) [Full Changelog](https://github.com/chef/bento/compare/2.2.5...2.2.6) From fa9e46879d045c5d2a56097aec7a232999c02cfa Mon Sep 17 00:00:00 2001 From: Seth Thomas <sthomas@chef.io> Date: Mon, 9 May 2016 16:52:15 -0700 Subject: [PATCH 0495/1622] We should just respect the env var and let it default as designed --- bin/bento | 2 -- 1 file changed, 2 deletions(-) diff --git a/bin/bento b/bin/bento index 982fc8d09..e541a23f5 100755 --- a/bin/bento +++ b/bin/bento @@ -21,8 +21,6 @@ class Options options = OpenStruct.new options.templates = calculate_templates("*.json") - ENV['PACKER_CACHE_DIR'] = "packer_cache" - global = OptionParser.new do |opts| opts.banner = "Usage: #{NAME} [SUBCOMMAND [options]]" opts.separator "" From 3cedc5ff781145c7dc72c78f87ace46848ff350c Mon Sep 17 00:00:00 2001 From: Seth Thomas <sthomas@chef.io> Date: Thu, 12 May 2016 18:41:19 -0700 Subject: [PATCH 0496/1622] Set VMware script flags based on version - improve logging for all vmtools --- scripts/common/vmtools.sh | 38 ++++++++++++++++++++++++++++---------- 1 file changed, 28 insertions(+), 10 deletions(-) diff --git a/scripts/common/vmtools.sh b/scripts/common/vmtools.sh index ad1d47afc..2268653ba 100644 --- a/scripts/common/vmtools.sh +++ b/scripts/common/vmtools.sh @@ -6,9 +6,12 @@ HOME_DIR="${HOME_DIR:-/home/vagrant}"; case "$PACKER_BUILDER_TYPE" in virtualbox-iso|virtualbox-ovf) + VER="`cat /home/vagrant/.vbox_version`"; + + echo "Virtualbox Tools Version: $VER"; + mkdir -p /tmp/vbox; - ver="`cat /home/vagrant/.vbox_version`"; - mount -o loop $HOME_DIR/VBoxGuestAdditions_${ver}.iso /tmp/vbox; + mount -o loop $HOME_DIR/VBoxGuestAdditions_${VER}.iso /tmp/vbox; sh /tmp/vbox/VBoxLinuxAdditions.run \ || echo "VBoxLinuxAdditions.run exited $? and is suppressed." \ "For more read https://www.virtualbox.org/ticket/12479"; @@ -18,20 +21,35 @@ virtualbox-iso|virtualbox-ovf) ;; vmware-iso|vmware-vmx) - mkdir -p /tmp/vmfusion; - mkdir -p /tmp/vmfusion-archive; - mount -o loop $HOME_DIR/linux.iso /tmp/vmfusion; - tar xzf /tmp/vmfusion/VMwareTools-*.tar.gz -C /tmp/vmfusion-archive; - /tmp/vmfusion-archive/vmware-tools-distrib/vmware-install.pl --force-install; - umount /tmp/vmfusion; - rm -rf /tmp/vmfusion; - rm -rf /tmp/vmfusion-archive; + mkdir -p /tmp/vmware; + mkdir -p /tmp/vmware-archive; + mount -o loop $HOME_DIR/linux.iso /tmp/vmware; + + TOOLS_PATH="`ls /tmp/vmware/VMwareTools-*.tar.gz`"; + VER="`echo "${TOOLS_PATH}" | cut -f2 -d'-'`"; + MAJ_VER="`echo ${VER} | cut -d '.' -f 1)`"; + + echo "VMware Tools Version: $VER"; + + tar xzf ${TOOLS_PATH} -C /tmp/vmware-archive; + if [ "${MAJ_VER}" -lt "10" ]; then + /tmp/vmware-archive/vmware-tools-distrib/vmware-install.pl --default; + else + /tmp/vmware-archive/vmware-tools-distrib/vmware-install.pl --force-install; + fi + umount /tmp/vmware; + rm -rf /tmp/vmware; + rm -rf /tmp/vmware-archive; rm -f $HOME_DIR/*.iso; ;; parallels-iso|parallels-pvm) mkdir -p /tmp/parallels; mount -o loop $HOME_DIR/prl-tools-lin.iso /tmp/parallels; + VER="`cat /tmp/parallels/version`"; + + echo "Parallels Tools Version: $VER"; + /tmp/parallels/install --install-unattended-with-deps \ || (code="$?"; \ echo "Parallels tools installation exited $code, attempting" \ From a3a19348ca622772017d98b1c2641b993e1a07e4 Mon Sep 17 00:00:00 2001 From: Seth Thomas <sthomas@chef.io> Date: Thu, 12 May 2016 18:48:41 -0700 Subject: [PATCH 0497/1622] Don't disable udev rules for 15.10+ --- scripts/ubuntu/networking.sh | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/scripts/ubuntu/networking.sh b/scripts/ubuntu/networking.sh index e2e39d5ca..395904499 100644 --- a/scripts/ubuntu/networking.sh +++ b/scripts/ubuntu/networking.sh @@ -1,11 +1,17 @@ #!/bin/sh -eux -# Disable automatic udev rules for network interfaces in Ubuntu, -# source: http://6.ptmc.org/164/ -rm -f /etc/udev/rules.d/70-persistent-net.rules; -mkdir -p /etc/udev/rules.d/70-persistent-net.rules; -rm -f /lib/udev/rules.d/75-persistent-net-generator.rules; -rm -rf /dev/.udev/ /var/lib/dhcp3/* /var/lib/dhcp/*; +ubuntu_version="`lsb_release -r | awk '{print $2}'`"; +major_version="`echo $ubuntu_version | awk -F. '{print $1}'`"; + +if [ "$major_version" -le "15" ] && [ "$ubuntu_version" != "15.10" ]; then + echo "Disabling automatic udev rules for network interfaces in Ubuntu" + # Disable automatic udev rules for network interfaces in Ubuntu, + # source: http://6.ptmc.org/164/ + rm -f /etc/udev/rules.d/70-persistent-net.rules; + mkdir -p /etc/udev/rules.d/70-persistent-net.rules; + rm -f /lib/udev/rules.d/75-persistent-net-generator.rules; + rm -rf /dev/.udev/ /var/lib/dhcp3/* /var/lib/dhcp/*; +fi # Adding a 2 sec delay to the interface up, to make the dhclient happy echo "pre-up sleep 2" >>/etc/network/interfaces; From 7ee827a859ba813d09153244b885658e9e914322 Mon Sep 17 00:00:00 2001 From: svpace <svpace@gmail.com> Date: Thu, 12 May 2016 23:06:59 -0300 Subject: [PATCH 0498/1622] Added "disk_size" user variable --- centos-5.11-i386.json | 9 +++++---- centos-5.11-x86_64.json | 9 +++++---- centos-6.7-i386.json | 9 +++++---- centos-6.7-x86_64.json | 9 +++++---- centos-7.2-x86_64.json | 9 +++++---- debian-6.0.10-amd64.json | 9 +++++---- debian-6.0.10-i386.json | 9 +++++---- debian-7.10-amd64.json | 9 +++++---- debian-7.10-i386.json | 9 +++++---- debian-7.8-amd64.json | 9 +++++---- debian-7.8-i386.json | 9 +++++---- debian-7.9-amd64.json | 9 +++++---- debian-7.9-i386.json | 9 +++++---- debian-8.1-amd64.json | 9 +++++---- debian-8.1-i386.json | 9 +++++---- debian-8.2-amd64.json | 9 +++++---- debian-8.2-i386.json | 9 +++++---- debian-8.3-amd64.json | 9 +++++---- debian-8.3-i386.json | 9 +++++---- debian-8.4-amd64.json | 9 +++++---- debian-8.4-i386.json | 9 +++++---- fedora-20-i386.json | 9 +++++---- fedora-20-x86_64.json | 9 +++++---- fedora-21-i386.json | 9 +++++---- fedora-21-x86_64.json | 9 +++++---- fedora-22-i386.json | 9 +++++---- fedora-22-x86_64.json | 9 +++++---- fedora-23-i386.json | 9 +++++---- fedora-23-x86_64.json | 9 +++++---- freebsd-10.2-amd64.json | 9 +++++---- freebsd-10.2-i386.json | 9 +++++---- freebsd-10.3-amd64.json | 9 +++++---- freebsd-10.3-i386.json | 9 +++++---- freebsd-9.3-amd64.json | 9 +++++---- freebsd-9.3-i386.json | 9 +++++---- macosx-10.10.json | 7 ++++--- macosx-10.11.json | 7 ++++--- macosx-10.7.json | 7 ++++--- macosx-10.8.json | 7 ++++--- macosx-10.9.json | 7 ++++--- omnios-r151010j.json | 7 ++++--- omnios-r151014.json | 7 ++++--- omnios-r151018.json | 7 ++++--- opensuse-13.2-i386.json | 9 +++++---- opensuse-13.2-x86_64.json | 9 +++++---- opensuse-leap-42.1-x86_64.json | 9 +++++---- oracle-5.11-i386.json | 9 +++++---- oracle-5.11-x86_64.json | 9 +++++---- oracle-6.6-i386.json | 9 +++++---- oracle-6.6-x86_64.json | 9 +++++---- oracle-6.7-i386.json | 9 +++++---- oracle-6.7-x86_64.json | 9 +++++---- oracle-7.2-x86_64.json | 9 +++++---- rhel-5.11-i386.json | 9 +++++---- rhel-5.11-x86_64.json | 9 +++++---- rhel-6.6-i386.json | 9 +++++---- rhel-6.6-x86_64.json | 9 +++++---- rhel-6.7-i386.json | 9 +++++---- rhel-6.7-x86_64.json | 9 +++++---- rhel-7.2-x86_64.json | 9 +++++---- sles-11-sp2-i386.json | 9 +++++---- sles-11-sp2-x86_64.json | 9 +++++---- sles-11-sp3-i386.json | 9 +++++---- sles-11-sp3-x86_64.json | 9 +++++---- sles-11-sp4-i386.json | 9 +++++---- sles-11-sp4-x86_64.json | 9 +++++---- sles-12-x86_64.json | 9 +++++---- solaris-10.11-x86.json | 5 +++-- solaris-11-x86.json | 5 +++-- ubuntu-10.04-amd64.json | 9 +++++---- ubuntu-10.04-i386.json | 9 +++++---- ubuntu-12.04-amd64.json | 9 +++++---- ubuntu-12.04-i386.json | 9 +++++---- ubuntu-14.04-amd64.json | 9 +++++---- ubuntu-14.04-i386.json | 9 +++++---- ubuntu-14.10-amd64.json | 9 +++++---- ubuntu-14.10-i386.json | 9 +++++---- ubuntu-15.04-amd64.json | 9 +++++---- ubuntu-15.04-i386.json | 9 +++++---- ubuntu-15.10-amd64.json | 9 +++++---- ubuntu-15.10-i386.json | 9 +++++---- ubuntu-16.04-amd64.json | 9 +++++---- ubuntu-16.04-i386.json | 9 +++++---- windows-nano-tp3.json | 3 ++- 84 files changed, 405 insertions(+), 321 deletions(-) diff --git a/centos-5.11-i386.json b/centos-5.11-i386.json index fa9c5f5ff..71c11f72a 100644 --- a/centos-5.11-i386.json +++ b/centos-5.11-i386.json @@ -5,7 +5,7 @@ "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], "boot_wait": "10s", - "disk_size": 40960, + "disk_size": "{{user `disk_size`}}", "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "guest_os_type": "RedHat", "hard_drive_interface": "sata", @@ -43,7 +43,7 @@ "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], "boot_wait": "10s", - "disk_size": 40960, + "disk_size": "{{user `disk_size`}}", "guest_os_type": "centos", "headless": "{{ user `headless` }}", "http_directory": "http", @@ -70,7 +70,7 @@ "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], "boot_wait": "10s", - "disk_size": 40960, + "disk_size": "{{user `disk_size`}}", "guest_os_type": "centos", "http_directory": "http", "iso_checksum": "{{user `iso_checksum`}}", @@ -106,7 +106,7 @@ "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], "boot_wait": "10s", - "disk_size": 40960, + "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "{{user `iso_checksum`}}", @@ -158,6 +158,7 @@ "box_basename": "centos-5.11-i386", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", + "disk_size": "40960", "git_revision": "__unknown_git_revision__", "headless": "", "http_proxy": "{{env `http_proxy`}}", diff --git a/centos-5.11-x86_64.json b/centos-5.11-x86_64.json index 6579effd4..893213e6a 100644 --- a/centos-5.11-x86_64.json +++ b/centos-5.11-x86_64.json @@ -5,7 +5,7 @@ "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], "boot_wait": "10s", - "disk_size": 40960, + "disk_size": "{{user `disk_size`}}", "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "guest_os_type": "RedHat_64", "hard_drive_interface": "sata", @@ -43,7 +43,7 @@ "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], "boot_wait": "10s", - "disk_size": 40960, + "disk_size": "{{user `disk_size`}}", "guest_os_type": "centos-64", "headless": "{{ user `headless` }}", "http_directory": "http", @@ -70,7 +70,7 @@ "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], "boot_wait": "10s", - "disk_size": 40960, + "disk_size": "{{user `disk_size`}}", "guest_os_type": "centos", "http_directory": "http", "iso_checksum": "{{user `iso_checksum`}}", @@ -106,7 +106,7 @@ "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], "boot_wait": "10s", - "disk_size": 40960, + "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "{{user `iso_checksum`}}", @@ -158,6 +158,7 @@ "box_basename": "centos-5.11", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", + "disk_size": "40960", "git_revision": "__unknown_git_revision__", "headless": "", "http_proxy": "{{env `http_proxy`}}", diff --git a/centos-6.7-i386.json b/centos-6.7-i386.json index 422cda1d1..e2fbe935d 100644 --- a/centos-6.7-i386.json +++ b/centos-6.7-i386.json @@ -5,7 +5,7 @@ "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], "boot_wait": "10s", - "disk_size": 40960, + "disk_size": "{{user `disk_size`}}", "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "guest_os_type": "RedHat", "hard_drive_interface": "sata", @@ -43,7 +43,7 @@ "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], "boot_wait": "10s", - "disk_size": 40960, + "disk_size": "{{user `disk_size`}}", "guest_os_type": "centos", "headless": "{{ user `headless` }}", "http_directory": "http", @@ -70,7 +70,7 @@ "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], "boot_wait": "10s", - "disk_size": 40960, + "disk_size": "{{user `disk_size`}}", "guest_os_type": "centos", "http_directory": "http", "iso_checksum": "{{user `iso_checksum`}}", @@ -106,7 +106,7 @@ "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], "boot_wait": "10s", - "disk_size": 40960, + "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "{{user `iso_checksum`}}", @@ -158,6 +158,7 @@ "box_basename": "centos-6.7-i386", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", + "disk_size": "40960", "git_revision": "__unknown_git_revision__", "headless": "", "http_proxy": "{{env `http_proxy`}}", diff --git a/centos-6.7-x86_64.json b/centos-6.7-x86_64.json index 3af906ec8..c5041b949 100644 --- a/centos-6.7-x86_64.json +++ b/centos-6.7-x86_64.json @@ -5,7 +5,7 @@ "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], "boot_wait": "10s", - "disk_size": 40960, + "disk_size": "{{user `disk_size`}}", "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "guest_os_type": "RedHat_64", "hard_drive_interface": "sata", @@ -43,7 +43,7 @@ "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], "boot_wait": "10s", - "disk_size": 40960, + "disk_size": "{{user `disk_size`}}", "guest_os_type": "centos-64", "headless": "{{ user `headless` }}", "http_directory": "http", @@ -70,7 +70,7 @@ "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], "boot_wait": "10s", - "disk_size": 40960, + "disk_size": "{{user `disk_size`}}", "guest_os_type": "centos", "http_directory": "http", "iso_checksum": "{{user `iso_checksum`}}", @@ -106,7 +106,7 @@ "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], "boot_wait": "10s", - "disk_size": 40960, + "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "{{user `iso_checksum`}}", @@ -158,6 +158,7 @@ "box_basename": "centos-6.7", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", + "disk_size": "40960", "git_revision": "__unknown_git_revision__", "headless": "", "http_proxy": "{{env `http_proxy`}}", diff --git a/centos-7.2-x86_64.json b/centos-7.2-x86_64.json index 45b0a307b..950474a23 100644 --- a/centos-7.2-x86_64.json +++ b/centos-7.2-x86_64.json @@ -5,7 +5,7 @@ "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], "boot_wait": "10s", - "disk_size": 40960, + "disk_size": "{{user `disk_size`}}", "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "guest_os_type": "RedHat_64", "hard_drive_interface": "sata", @@ -43,7 +43,7 @@ "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], "boot_wait": "10s", - "disk_size": 40960, + "disk_size": "{{user `disk_size`}}", "guest_os_type": "centos-64", "headless": "{{ user `headless` }}", "http_directory": "http", @@ -70,7 +70,7 @@ "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], "boot_wait": "10s", - "disk_size": 40960, + "disk_size": "{{user `disk_size`}}", "guest_os_type": "centos", "http_directory": "http", "iso_checksum": "{{user `iso_checksum`}}", @@ -106,7 +106,7 @@ "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], "boot_wait": "10s", - "disk_size": 40960, + "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "{{user `iso_checksum`}}", @@ -158,6 +158,7 @@ "box_basename": "centos-7.2", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", + "disk_size": "40960", "git_revision": "__unknown_git_revision__", "headless": "", "http_proxy": "{{env `http_proxy`}}", diff --git a/debian-6.0.10-amd64.json b/debian-6.0.10-amd64.json index e6e5f7bc3..87cb668db 100644 --- a/debian-6.0.10-amd64.json +++ b/debian-6.0.10-amd64.json @@ -19,7 +19,7 @@ "<enter><wait>" ], "boot_wait": "10s", - "disk_size": 40960, + "disk_size": "{{user `disk_size`}}", "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "guest_os_type": "Debian_64", "hard_drive_interface": "sata", @@ -71,7 +71,7 @@ "<enter><wait>" ], "boot_wait": "10s", - "disk_size": 40960, + "disk_size": "{{user `disk_size`}}", "guest_os_type": "debian5-64", "headless": "{{ user `headless` }}", "http_directory": "http", @@ -112,7 +112,7 @@ "<enter><wait>" ], "boot_wait": "10s", - "disk_size": 40960, + "disk_size": "{{user `disk_size`}}", "guest_os_type": "debian", "http_directory": "http", "iso_checksum": "{{user `iso_checksum`}}", @@ -162,7 +162,7 @@ "<enter><wait>" ], "boot_wait": "10s", - "disk_size": 40960, + "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "{{user `iso_checksum`}}", @@ -216,6 +216,7 @@ "box_basename": "debian-6.0.10", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", + "disk_size": "40960", "git_revision": "__unknown_git_revision__", "headless": "", "http_proxy": "{{env `http_proxy`}}", diff --git a/debian-6.0.10-i386.json b/debian-6.0.10-i386.json index 9d4c0b914..60ffe78f0 100644 --- a/debian-6.0.10-i386.json +++ b/debian-6.0.10-i386.json @@ -19,7 +19,7 @@ "<enter><wait>" ], "boot_wait": "10s", - "disk_size": 40960, + "disk_size": "{{user `disk_size`}}", "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "guest_os_type": "Debian", "hard_drive_interface": "sata", @@ -71,7 +71,7 @@ "<enter><wait>" ], "boot_wait": "10s", - "disk_size": 40960, + "disk_size": "{{user `disk_size`}}", "guest_os_type": "debian5", "headless": "{{ user `headless` }}", "http_directory": "http", @@ -112,7 +112,7 @@ "<enter><wait>" ], "boot_wait": "10s", - "disk_size": 40960, + "disk_size": "{{user `disk_size`}}", "guest_os_type": "debian", "http_directory": "http", "iso_checksum": "{{user `iso_checksum`}}", @@ -162,7 +162,7 @@ "<enter><wait>" ], "boot_wait": "10s", - "disk_size": 40960, + "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "{{user `iso_checksum`}}", @@ -216,6 +216,7 @@ "box_basename": "debian-6.0.10-i386", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", + "disk_size": "40960", "git_revision": "__unknown_git_revision__", "headless": "", "http_proxy": "{{env `http_proxy`}}", diff --git a/debian-7.10-amd64.json b/debian-7.10-amd64.json index 55bf2d0e9..16534d95d 100644 --- a/debian-7.10-amd64.json +++ b/debian-7.10-amd64.json @@ -19,7 +19,7 @@ "<enter><wait>" ], "boot_wait": "10s", - "disk_size": 40960, + "disk_size": "{{user `disk_size`}}", "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "guest_os_type": "Debian_64", "hard_drive_interface": "sata", @@ -71,7 +71,7 @@ "<enter><wait>" ], "boot_wait": "10s", - "disk_size": 40960, + "disk_size": "{{user `disk_size`}}", "guest_os_type": "debian7-64", "headless": "{{ user `headless` }}", "http_directory": "http", @@ -112,7 +112,7 @@ "<enter><wait>" ], "boot_wait": "10s", - "disk_size": 40960, + "disk_size": "{{user `disk_size`}}", "guest_os_type": "debian", "http_directory": "http", "iso_checksum": "{{user `iso_checksum`}}", @@ -162,7 +162,7 @@ "<enter><wait>" ], "boot_wait": "10s", - "disk_size": 40960, + "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "{{user `iso_checksum`}}", @@ -216,6 +216,7 @@ "box_basename": "debian-7.10", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", + "disk_size": "40960", "git_revision": "__unknown_git_revision__", "headless": "", "http_proxy": "{{env `http_proxy`}}", diff --git a/debian-7.10-i386.json b/debian-7.10-i386.json index b556c015e..c9e808959 100644 --- a/debian-7.10-i386.json +++ b/debian-7.10-i386.json @@ -19,7 +19,7 @@ "<enter><wait>" ], "boot_wait": "10s", - "disk_size": 40960, + "disk_size": "{{user `disk_size`}}", "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "guest_os_type": "Debian", "hard_drive_interface": "sata", @@ -71,7 +71,7 @@ "<enter><wait>" ], "boot_wait": "10s", - "disk_size": 40960, + "disk_size": "{{user `disk_size`}}", "guest_os_type": "debian7", "headless": "{{ user `headless` }}", "http_directory": "http", @@ -112,7 +112,7 @@ "<enter><wait>" ], "boot_wait": "10s", - "disk_size": 40960, + "disk_size": "{{user `disk_size`}}", "guest_os_type": "debian", "http_directory": "http", "iso_checksum": "{{user `iso_checksum`}}", @@ -162,7 +162,7 @@ "<enter><wait>" ], "boot_wait": "10s", - "disk_size": 40960, + "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "{{user `iso_checksum`}}", @@ -216,6 +216,7 @@ "box_basename": "debian-7.10-i386", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", + "disk_size": "40960", "git_revision": "__unknown_git_revision__", "headless": "", "http_proxy": "{{env `http_proxy`}}", diff --git a/debian-7.8-amd64.json b/debian-7.8-amd64.json index ffce2c9f6..0535e9c5b 100644 --- a/debian-7.8-amd64.json +++ b/debian-7.8-amd64.json @@ -19,7 +19,7 @@ "<enter><wait>" ], "boot_wait": "10s", - "disk_size": 40960, + "disk_size": "{{user `disk_size`}}", "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "guest_os_type": "Debian_64", "hard_drive_interface": "sata", @@ -71,7 +71,7 @@ "<enter><wait>" ], "boot_wait": "10s", - "disk_size": 40960, + "disk_size": "{{user `disk_size`}}", "guest_os_type": "debian7-64", "headless": "{{ user `headless` }}", "http_directory": "http", @@ -112,7 +112,7 @@ "<enter><wait>" ], "boot_wait": "10s", - "disk_size": 40960, + "disk_size": "{{user `disk_size`}}", "guest_os_type": "debian", "http_directory": "http", "iso_checksum": "{{user `iso_checksum`}}", @@ -162,7 +162,7 @@ "<enter><wait>" ], "boot_wait": "10s", - "disk_size": 40960, + "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "{{user `iso_checksum`}}", @@ -216,6 +216,7 @@ "box_basename": "debian-7.8", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", + "disk_size": "40960", "git_revision": "__unknown_git_revision__", "headless": "", "http_proxy": "{{env `http_proxy`}}", diff --git a/debian-7.8-i386.json b/debian-7.8-i386.json index 64ed91cd2..38c601272 100644 --- a/debian-7.8-i386.json +++ b/debian-7.8-i386.json @@ -19,7 +19,7 @@ "<enter><wait>" ], "boot_wait": "10s", - "disk_size": 40960, + "disk_size": "{{user `disk_size`}}", "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "guest_os_type": "Debian", "hard_drive_interface": "sata", @@ -71,7 +71,7 @@ "<enter><wait>" ], "boot_wait": "10s", - "disk_size": 40960, + "disk_size": "{{user `disk_size`}}", "guest_os_type": "debian7", "headless": "{{ user `headless` }}", "http_directory": "http", @@ -112,7 +112,7 @@ "<enter><wait>" ], "boot_wait": "10s", - "disk_size": 40960, + "disk_size": "{{user `disk_size`}}", "guest_os_type": "debian", "http_directory": "http", "iso_checksum": "{{user `iso_checksum`}}", @@ -162,7 +162,7 @@ "<enter><wait>" ], "boot_wait": "10s", - "disk_size": 40960, + "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "{{user `iso_checksum`}}", @@ -216,6 +216,7 @@ "box_basename": "debian-7.8-i386", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", + "disk_size": "40960", "git_revision": "__unknown_git_revision__", "headless": "", "http_proxy": "{{env `http_proxy`}}", diff --git a/debian-7.9-amd64.json b/debian-7.9-amd64.json index 75110a7fc..316dd40f2 100644 --- a/debian-7.9-amd64.json +++ b/debian-7.9-amd64.json @@ -19,7 +19,7 @@ "<enter><wait>" ], "boot_wait": "10s", - "disk_size": 40960, + "disk_size": "{{user `disk_size`}}", "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "guest_os_type": "Debian_64", "hard_drive_interface": "sata", @@ -71,7 +71,7 @@ "<enter><wait>" ], "boot_wait": "10s", - "disk_size": 40960, + "disk_size": "{{user `disk_size`}}", "guest_os_type": "debian7-64", "headless": "{{ user `headless` }}", "http_directory": "http", @@ -112,7 +112,7 @@ "<enter><wait>" ], "boot_wait": "10s", - "disk_size": 40960, + "disk_size": "{{user `disk_size`}}", "guest_os_type": "debian", "http_directory": "http", "iso_checksum": "{{user `iso_checksum`}}", @@ -162,7 +162,7 @@ "<enter><wait>" ], "boot_wait": "10s", - "disk_size": 40960, + "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "{{user `iso_checksum`}}", @@ -216,6 +216,7 @@ "box_basename": "debian-7.9", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", + "disk_size": "40960", "git_revision": "__unknown_git_revision__", "headless": "", "http_proxy": "{{env `http_proxy`}}", diff --git a/debian-7.9-i386.json b/debian-7.9-i386.json index a4e88c6d1..8b4afcb06 100644 --- a/debian-7.9-i386.json +++ b/debian-7.9-i386.json @@ -19,7 +19,7 @@ "<enter><wait>" ], "boot_wait": "10s", - "disk_size": 40960, + "disk_size": "{{user `disk_size`}}", "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "guest_os_type": "Debian", "hard_drive_interface": "sata", @@ -71,7 +71,7 @@ "<enter><wait>" ], "boot_wait": "10s", - "disk_size": 40960, + "disk_size": "{{user `disk_size`}}", "guest_os_type": "debian7", "headless": "{{ user `headless` }}", "http_directory": "http", @@ -112,7 +112,7 @@ "<enter><wait>" ], "boot_wait": "10s", - "disk_size": 40960, + "disk_size": "{{user `disk_size`}}", "guest_os_type": "debian", "http_directory": "http", "iso_checksum": "{{user `iso_checksum`}}", @@ -162,7 +162,7 @@ "<enter><wait>" ], "boot_wait": "10s", - "disk_size": 40960, + "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "{{user `iso_checksum`}}", @@ -216,6 +216,7 @@ "box_basename": "debian-7.9-i386", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", + "disk_size": "40960", "git_revision": "__unknown_git_revision__", "headless": "", "http_proxy": "{{env `http_proxy`}}", diff --git a/debian-8.1-amd64.json b/debian-8.1-amd64.json index 6bb66122e..6a39d1ee5 100644 --- a/debian-8.1-amd64.json +++ b/debian-8.1-amd64.json @@ -20,7 +20,7 @@ "<enter><wait>" ], "boot_wait": "10s", - "disk_size": 40960, + "disk_size": "{{user `disk_size`}}", "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "guest_os_type": "Debian_64", "hard_drive_interface": "sata", @@ -73,7 +73,7 @@ "<enter><wait>" ], "boot_wait": "10s", - "disk_size": 40960, + "disk_size": "{{user `disk_size`}}", "guest_os_type": "debian8-64", "headless": "{{ user `headless` }}", "http_directory": "http", @@ -115,7 +115,7 @@ "<enter><wait>" ], "boot_wait": "10s", - "disk_size": 40960, + "disk_size": "{{user `disk_size`}}", "guest_os_type": "debian", "http_directory": "http", "iso_checksum": "{{user `iso_checksum`}}", @@ -166,7 +166,7 @@ "<enter><wait>" ], "boot_wait": "10s", - "disk_size": 40960, + "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "{{user `iso_checksum`}}", @@ -220,6 +220,7 @@ "box_basename": "debian-8.1", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", + "disk_size": "40960", "git_revision": "__unknown_git_revision__", "headless": "", "http_proxy": "{{env `http_proxy`}}", diff --git a/debian-8.1-i386.json b/debian-8.1-i386.json index a5d1b7419..34d6d0c35 100644 --- a/debian-8.1-i386.json +++ b/debian-8.1-i386.json @@ -20,7 +20,7 @@ "<enter><wait>" ], "boot_wait": "10s", - "disk_size": 40960, + "disk_size": "{{user `disk_size`}}", "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "guest_os_type": "Debian", "hard_drive_interface": "sata", @@ -73,7 +73,7 @@ "<enter><wait>" ], "boot_wait": "10s", - "disk_size": 40960, + "disk_size": "{{user `disk_size`}}", "guest_os_type": "debian8", "headless": "{{ user `headless` }}", "http_directory": "http", @@ -115,7 +115,7 @@ "<enter><wait>" ], "boot_wait": "10s", - "disk_size": 40960, + "disk_size": "{{user `disk_size`}}", "guest_os_type": "debian", "http_directory": "http", "iso_checksum": "{{user `iso_checksum`}}", @@ -166,7 +166,7 @@ "<enter><wait>" ], "boot_wait": "10s", - "disk_size": 40960, + "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "{{user `iso_checksum`}}", @@ -220,6 +220,7 @@ "box_basename": "debian-8.1-i386", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", + "disk_size": "40960", "git_revision": "__unknown_git_revision__", "headless": "", "http_proxy": "{{env `http_proxy`}}", diff --git a/debian-8.2-amd64.json b/debian-8.2-amd64.json index ae654c565..32abf00c0 100644 --- a/debian-8.2-amd64.json +++ b/debian-8.2-amd64.json @@ -20,7 +20,7 @@ "<enter><wait>" ], "boot_wait": "10s", - "disk_size": 40960, + "disk_size": "{{user `disk_size`}}", "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "guest_os_type": "Debian_64", "hard_drive_interface": "sata", @@ -73,7 +73,7 @@ "<enter><wait>" ], "boot_wait": "10s", - "disk_size": 40960, + "disk_size": "{{user `disk_size`}}", "guest_os_type": "debian8-64", "headless": "{{ user `headless` }}", "http_directory": "http", @@ -115,7 +115,7 @@ "<enter><wait>" ], "boot_wait": "10s", - "disk_size": 40960, + "disk_size": "{{user `disk_size`}}", "guest_os_type": "debian", "http_directory": "http", "iso_checksum": "{{user `iso_checksum`}}", @@ -166,7 +166,7 @@ "<enter><wait>" ], "boot_wait": "10s", - "disk_size": 40960, + "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "{{user `iso_checksum`}}", @@ -220,6 +220,7 @@ "box_basename": "debian-8.2", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", + "disk_size": "40960", "git_revision": "__unknown_git_revision__", "headless": "", "http_proxy": "{{env `http_proxy`}}", diff --git a/debian-8.2-i386.json b/debian-8.2-i386.json index a3c9ddec9..b221653de 100644 --- a/debian-8.2-i386.json +++ b/debian-8.2-i386.json @@ -20,7 +20,7 @@ "<enter><wait>" ], "boot_wait": "10s", - "disk_size": 40960, + "disk_size": "{{user `disk_size`}}", "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "guest_os_type": "Debian", "hard_drive_interface": "sata", @@ -73,7 +73,7 @@ "<enter><wait>" ], "boot_wait": "10s", - "disk_size": 40960, + "disk_size": "{{user `disk_size`}}", "guest_os_type": "debian8", "headless": "{{ user `headless` }}", "http_directory": "http", @@ -115,7 +115,7 @@ "<enter><wait>" ], "boot_wait": "10s", - "disk_size": 40960, + "disk_size": "{{user `disk_size`}}", "guest_os_type": "debian", "http_directory": "http", "iso_checksum": "{{user `iso_checksum`}}", @@ -166,7 +166,7 @@ "<enter><wait>" ], "boot_wait": "10s", - "disk_size": 40960, + "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "{{user `iso_checksum`}}", @@ -220,6 +220,7 @@ "box_basename": "debian-8.2-i386", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", + "disk_size": "40960", "git_revision": "__unknown_git_revision__", "headless": "", "http_proxy": "{{env `http_proxy`}}", diff --git a/debian-8.3-amd64.json b/debian-8.3-amd64.json index 0efb42319..35daec1e4 100644 --- a/debian-8.3-amd64.json +++ b/debian-8.3-amd64.json @@ -20,7 +20,7 @@ "<enter><wait>" ], "boot_wait": "10s", - "disk_size": 40960, + "disk_size": "{{user `disk_size`}}", "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "guest_os_type": "Debian_64", "hard_drive_interface": "sata", @@ -73,7 +73,7 @@ "<enter><wait>" ], "boot_wait": "10s", - "disk_size": 40960, + "disk_size": "{{user `disk_size`}}", "guest_os_type": "debian8-64", "headless": "{{ user `headless` }}", "http_directory": "http", @@ -115,7 +115,7 @@ "<enter><wait>" ], "boot_wait": "10s", - "disk_size": 40960, + "disk_size": "{{user `disk_size`}}", "guest_os_type": "debian", "http_directory": "http", "iso_checksum": "{{user `iso_checksum`}}", @@ -166,7 +166,7 @@ "<enter><wait>" ], "boot_wait": "10s", - "disk_size": 40960, + "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "{{user `iso_checksum`}}", @@ -220,6 +220,7 @@ "box_basename": "debian-8.3", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", + "disk_size": "40960", "git_revision": "__unknown_git_revision__", "headless": "", "http_proxy": "{{env `http_proxy`}}", diff --git a/debian-8.3-i386.json b/debian-8.3-i386.json index b704aaf18..a84b0e996 100644 --- a/debian-8.3-i386.json +++ b/debian-8.3-i386.json @@ -20,7 +20,7 @@ "<enter><wait>" ], "boot_wait": "10s", - "disk_size": 40960, + "disk_size": "{{user `disk_size`}}", "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "guest_os_type": "Debian", "hard_drive_interface": "sata", @@ -73,7 +73,7 @@ "<enter><wait>" ], "boot_wait": "10s", - "disk_size": 40960, + "disk_size": "{{user `disk_size`}}", "guest_os_type": "debian8", "headless": "{{ user `headless` }}", "http_directory": "http", @@ -115,7 +115,7 @@ "<enter><wait>" ], "boot_wait": "10s", - "disk_size": 40960, + "disk_size": "{{user `disk_size`}}", "guest_os_type": "debian", "http_directory": "http", "iso_checksum": "{{user `iso_checksum`}}", @@ -166,7 +166,7 @@ "<enter><wait>" ], "boot_wait": "10s", - "disk_size": 40960, + "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "{{user `iso_checksum`}}", @@ -220,6 +220,7 @@ "box_basename": "debian-8.3-i386", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", + "disk_size": "40960", "git_revision": "__unknown_git_revision__", "headless": "", "http_proxy": "{{env `http_proxy`}}", diff --git a/debian-8.4-amd64.json b/debian-8.4-amd64.json index 4a97aac9e..c80a09114 100644 --- a/debian-8.4-amd64.json +++ b/debian-8.4-amd64.json @@ -20,7 +20,7 @@ "<enter><wait>" ], "boot_wait": "10s", - "disk_size": 40960, + "disk_size": "{{user `disk_size`}}", "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "guest_os_type": "Debian_64", "hard_drive_interface": "sata", @@ -73,7 +73,7 @@ "<enter><wait>" ], "boot_wait": "10s", - "disk_size": 40960, + "disk_size": "{{user `disk_size`}}", "guest_os_type": "debian8-64", "headless": "{{ user `headless` }}", "http_directory": "http", @@ -116,7 +116,7 @@ "<enter><wait>" ], "boot_wait": "10s", - "disk_size": 40960, + "disk_size": "{{user `disk_size`}}", "guest_os_type": "debian", "http_directory": "http", "iso_checksum": "{{user `iso_checksum`}}", @@ -167,7 +167,7 @@ "<enter><wait>" ], "boot_wait": "10s", - "disk_size": 40960, + "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "{{user `iso_checksum`}}", @@ -221,6 +221,7 @@ "box_basename": "debian-8.4", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", + "disk_size": "40960", "git_revision": "__unknown_git_revision__", "headless": "", "http_proxy": "{{env `http_proxy`}}", diff --git a/debian-8.4-i386.json b/debian-8.4-i386.json index 77c9d5f64..325612345 100644 --- a/debian-8.4-i386.json +++ b/debian-8.4-i386.json @@ -20,7 +20,7 @@ "<enter><wait>" ], "boot_wait": "10s", - "disk_size": 40960, + "disk_size": "{{user `disk_size`}}", "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "guest_os_type": "Debian", "hard_drive_interface": "sata", @@ -73,7 +73,7 @@ "<enter><wait>" ], "boot_wait": "10s", - "disk_size": 40960, + "disk_size": "{{user `disk_size`}}", "guest_os_type": "debian8", "headless": "{{ user `headless` }}", "http_directory": "http", @@ -116,7 +116,7 @@ "<enter><wait>" ], "boot_wait": "10s", - "disk_size": 40960, + "disk_size": "{{user `disk_size`}}", "guest_os_type": "debian", "http_directory": "http", "iso_checksum": "{{user `iso_checksum`}}", @@ -167,7 +167,7 @@ "<enter><wait>" ], "boot_wait": "10s", - "disk_size": 40960, + "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "{{user `iso_checksum`}}", @@ -221,6 +221,7 @@ "box_basename": "debian-8.4-i386", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", + "disk_size": "40960", "git_revision": "__unknown_git_revision__", "headless": "", "http_proxy": "{{env `http_proxy`}}", diff --git a/fedora-20-i386.json b/fedora-20-i386.json index 644210b7d..47f18f5b9 100644 --- a/fedora-20-i386.json +++ b/fedora-20-i386.json @@ -5,7 +5,7 @@ "<tab> linux ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], "boot_wait": "10s", - "disk_size": 40960, + "disk_size": "{{user `disk_size`}}", "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "guest_os_type": "Fedora", "hard_drive_interface": "sata", @@ -43,7 +43,7 @@ "<tab> linux ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], "boot_wait": "10s", - "disk_size": 40960, + "disk_size": "{{user `disk_size`}}", "guest_os_type": "fedora", "headless": "{{ user `headless` }}", "http_directory": "http", @@ -70,7 +70,7 @@ "<tab> linux ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], "boot_wait": "10s", - "disk_size": 40960, + "disk_size": "{{user `disk_size`}}", "guest_os_type": "fedora-core", "http_directory": "http", "iso_checksum": "{{user `iso_checksum`}}", @@ -106,7 +106,7 @@ "<tab> linux ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], "boot_wait": "10s", - "disk_size": 40960, + "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "{{user `iso_checksum`}}", @@ -159,6 +159,7 @@ "box_basename": "fedora-20-i386", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", + "disk_size": "40960", "git_revision": "__unknown_git_revision__", "headless": "", "http_proxy": "{{env `http_proxy`}}", diff --git a/fedora-20-x86_64.json b/fedora-20-x86_64.json index 421e1c9d7..4622e6862 100644 --- a/fedora-20-x86_64.json +++ b/fedora-20-x86_64.json @@ -5,7 +5,7 @@ "<tab> linux ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], "boot_wait": "10s", - "disk_size": 40960, + "disk_size": "{{user `disk_size`}}", "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "guest_os_type": "Fedora_64", "hard_drive_interface": "sata", @@ -43,7 +43,7 @@ "<tab> linux ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], "boot_wait": "10s", - "disk_size": 40960, + "disk_size": "{{user `disk_size`}}", "guest_os_type": "fedora-64", "headless": "{{ user `headless` }}", "http_directory": "http", @@ -70,7 +70,7 @@ "<tab> linux ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], "boot_wait": "10s", - "disk_size": 40960, + "disk_size": "{{user `disk_size`}}", "guest_os_type": "fedora-core", "http_directory": "http", "iso_checksum": "{{user `iso_checksum`}}", @@ -106,7 +106,7 @@ "<tab> linux ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], "boot_wait": "10s", - "disk_size": 40960, + "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "{{user `iso_checksum`}}", @@ -159,6 +159,7 @@ "box_basename": "fedora-20", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", + "disk_size": "40960", "git_revision": "__unknown_git_revision__", "headless": "", "http_proxy": "{{env `http_proxy`}}", diff --git a/fedora-21-i386.json b/fedora-21-i386.json index 7d2c4a2de..f6f087382 100644 --- a/fedora-21-i386.json +++ b/fedora-21-i386.json @@ -5,7 +5,7 @@ "<tab> linux ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], "boot_wait": "10s", - "disk_size": 40960, + "disk_size": "{{user `disk_size`}}", "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "guest_os_type": "Fedora", "hard_drive_interface": "sata", @@ -43,7 +43,7 @@ "<tab> linux ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], "boot_wait": "10s", - "disk_size": 40960, + "disk_size": "{{user `disk_size`}}", "guest_os_type": "fedora", "headless": "{{ user `headless` }}", "http_directory": "http", @@ -70,7 +70,7 @@ "<tab> linux ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], "boot_wait": "10s", - "disk_size": 40960, + "disk_size": "{{user `disk_size`}}", "guest_os_type": "fedora-core", "http_directory": "http", "iso_checksum": "{{user `iso_checksum`}}", @@ -106,7 +106,7 @@ "<tab> linux ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], "boot_wait": "10s", - "disk_size": 40960, + "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "{{user `iso_checksum`}}", @@ -159,6 +159,7 @@ "box_basename": "fedora-21-i386", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", + "disk_size": "40960", "git_revision": "__unknown_git_revision__", "headless": "", "http_proxy": "{{env `http_proxy`}}", diff --git a/fedora-21-x86_64.json b/fedora-21-x86_64.json index 4d1db0589..18a08c074 100644 --- a/fedora-21-x86_64.json +++ b/fedora-21-x86_64.json @@ -5,7 +5,7 @@ "<tab> linux ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], "boot_wait": "10s", - "disk_size": 40960, + "disk_size": "{{user `disk_size`}}", "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "guest_os_type": "Fedora_64", "hard_drive_interface": "sata", @@ -43,7 +43,7 @@ "<tab> linux ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], "boot_wait": "10s", - "disk_size": 40960, + "disk_size": "{{user `disk_size`}}", "guest_os_type": "fedora-64", "headless": "{{ user `headless` }}", "http_directory": "http", @@ -70,7 +70,7 @@ "<tab> linux ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], "boot_wait": "10s", - "disk_size": 40960, + "disk_size": "{{user `disk_size`}}", "guest_os_type": "fedora-core", "http_directory": "http", "iso_checksum": "{{user `iso_checksum`}}", @@ -106,7 +106,7 @@ "<tab> linux ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], "boot_wait": "10s", - "disk_size": 40960, + "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "{{user `iso_checksum`}}", @@ -159,6 +159,7 @@ "box_basename": "fedora-21", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", + "disk_size": "40960", "git_revision": "__unknown_git_revision__", "headless": "", "http_proxy": "{{env `http_proxy`}}", diff --git a/fedora-22-i386.json b/fedora-22-i386.json index c02ad1bfc..a1e3071e9 100644 --- a/fedora-22-i386.json +++ b/fedora-22-i386.json @@ -6,7 +6,7 @@ "<tab> linux ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], "boot_wait": "10s", - "disk_size": 40960, + "disk_size": "{{user `disk_size`}}", "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "guest_os_type": "Fedora", "hard_drive_interface": "sata", @@ -44,7 +44,7 @@ "<tab> linux ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], "boot_wait": "10s", - "disk_size": 40960, + "disk_size": "{{user `disk_size`}}", "guest_os_type": "fedora", "headless": "{{ user `headless` }}", "http_directory": "http", @@ -71,7 +71,7 @@ "<tab> linux ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], "boot_wait": "10s", - "disk_size": 40960, + "disk_size": "{{user `disk_size`}}", "guest_os_type": "fedora-core", "http_directory": "http", "iso_checksum": "{{user `iso_checksum`}}", @@ -107,7 +107,7 @@ "<tab> linux ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], "boot_wait": "10s", - "disk_size": 40960, + "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "{{user `iso_checksum`}}", @@ -156,6 +156,7 @@ "box_basename": "fedora-22-i386", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", + "disk_size": "40960", "git_revision": "__unknown_git_revision__", "headless": "", "http_proxy": "{{env `http_proxy`}}", diff --git a/fedora-22-x86_64.json b/fedora-22-x86_64.json index 5074668ac..68bbfaf09 100644 --- a/fedora-22-x86_64.json +++ b/fedora-22-x86_64.json @@ -5,7 +5,7 @@ "<tab> linux ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], "boot_wait": "10s", - "disk_size": 40960, + "disk_size": "{{user `disk_size`}}", "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "guest_os_type": "Fedora_64", "hard_drive_interface": "sata", @@ -43,7 +43,7 @@ "<tab> linux ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], "boot_wait": "10s", - "disk_size": 40960, + "disk_size": "{{user `disk_size`}}", "guest_os_type": "fedora-64", "headless": "{{ user `headless` }}", "http_directory": "http", @@ -70,7 +70,7 @@ "<tab> linux ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], "boot_wait": "10s", - "disk_size": 40960, + "disk_size": "{{user `disk_size`}}", "guest_os_type": "fedora-core", "http_directory": "http", "iso_checksum": "{{user `iso_checksum`}}", @@ -106,7 +106,7 @@ "<tab> linux ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], "boot_wait": "10s", - "disk_size": 40960, + "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "{{user `iso_checksum`}}", @@ -160,6 +160,7 @@ "box_basename": "fedora-22", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", + "disk_size": "40960", "git_revision": "__unknown_git_revision__", "headless": "", "http_proxy": "{{env `http_proxy`}}", diff --git a/fedora-23-i386.json b/fedora-23-i386.json index 63ec2a022..4c4a29aae 100644 --- a/fedora-23-i386.json +++ b/fedora-23-i386.json @@ -6,7 +6,7 @@ "<tab> linux ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], "boot_wait": "10s", - "disk_size": 40960, + "disk_size": "{{user `disk_size`}}", "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "guest_os_type": "Fedora", "hard_drive_interface": "sata", @@ -44,7 +44,7 @@ "<tab> linux ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], "boot_wait": "10s", - "disk_size": 40960, + "disk_size": "{{user `disk_size`}}", "guest_os_type": "fedora", "headless": "{{ user `headless` }}", "http_directory": "http", @@ -71,7 +71,7 @@ "<tab> linux ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], "boot_wait": "10s", - "disk_size": 40960, + "disk_size": "{{user `disk_size`}}", "guest_os_type": "fedora-core", "http_directory": "http", "iso_checksum": "{{user `iso_checksum`}}", @@ -107,7 +107,7 @@ "<tab> linux ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], "boot_wait": "10s", - "disk_size": 40960, + "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "{{user `iso_checksum`}}", @@ -156,6 +156,7 @@ "box_basename": "fedora-23-i386", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", + "disk_size": "40960", "git_revision": "__unknown_git_revision__", "headless": "", "http_proxy": "{{env `http_proxy`}}", diff --git a/fedora-23-x86_64.json b/fedora-23-x86_64.json index 437fda51c..ed5cc79de 100644 --- a/fedora-23-x86_64.json +++ b/fedora-23-x86_64.json @@ -5,7 +5,7 @@ "<tab> linux ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], "boot_wait": "10s", - "disk_size": 40960, + "disk_size": "{{user `disk_size`}}", "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "guest_os_type": "Fedora_64", "hard_drive_interface": "sata", @@ -43,7 +43,7 @@ "<tab> linux ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], "boot_wait": "10s", - "disk_size": 40960, + "disk_size": "{{user `disk_size`}}", "guest_os_type": "fedora-64", "headless": "{{ user `headless` }}", "http_directory": "http", @@ -71,7 +71,7 @@ "<tab> linux ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], "boot_wait": "10s", - "disk_size": 40960, + "disk_size": "{{user `disk_size`}}", "guest_os_type": "fedora-core", "http_directory": "http", "iso_checksum": "{{user `iso_checksum`}}", @@ -107,7 +107,7 @@ "<tab> linux ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], "boot_wait": "10s", - "disk_size": 40960, + "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "{{user `iso_checksum`}}", @@ -161,6 +161,7 @@ "box_basename": "fedora-23", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", + "disk_size": "40960", "git_revision": "__unknown_git_revision__", "headless": "", "http_proxy": "{{env `http_proxy`}}", diff --git a/freebsd-10.2-amd64.json b/freebsd-10.2-amd64.json index dae70f3aa..072c0c873 100644 --- a/freebsd-10.2-amd64.json +++ b/freebsd-10.2-amd64.json @@ -13,7 +13,7 @@ "fetch -o /tmp/install.sh http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} && chmod +x /tmp/install.sh && /tmp/install.sh {{ .Name }}<enter><wait>" ], "boot_wait": "10s", - "disk_size": 10140, + "disk_size": "{{user `disk_size`}}", "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "guest_os_type": "FreeBSD_64", "headless": "{{ user `headless` }}", @@ -59,7 +59,7 @@ "fetch -o /tmp/install.sh http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} && chmod +x /tmp/install.sh && /tmp/install.sh {{ .Name }}<enter><wait>" ], "boot_wait": "10s", - "disk_size": 10140, + "disk_size": "{{user `disk_size`}}", "guest_os_type": "freebsd-64", "headless": "{{ user `headless` }}", "http_directory": "http", @@ -94,7 +94,7 @@ "fetch -o /tmp/install.sh http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} && chmod +x /tmp/install.sh && /tmp/install.sh {{ .Name }}<enter><wait>" ], "boot_wait": "8s", - "disk_size": 10140, + "disk_size": "{{user `disk_size`}}", "guest_os_type": "freebsd", "http_directory": "http", "iso_checksum": "{{user `iso_checksum`}}", @@ -158,7 +158,7 @@ "fetch -o /tmp/install.sh http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} && chmod +x /tmp/install.sh && /tmp/install.sh {{ .Name }} vtnet0<enter><wait>" ], "boot_wait": "7s", - "disk_size": 10140, + "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "{{user `iso_checksum`}}", @@ -212,6 +212,7 @@ "box_basename": "freebsd-10.2", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", + "disk_size": "10140", "git_revision": "__unknown_git_revision__", "headless": "", "http_proxy": "{{env `http_proxy`}}", diff --git a/freebsd-10.2-i386.json b/freebsd-10.2-i386.json index 18473fc77..57f45adf2 100644 --- a/freebsd-10.2-i386.json +++ b/freebsd-10.2-i386.json @@ -13,7 +13,7 @@ "fetch -o /tmp/install.sh http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} && chmod +x /tmp/install.sh && /tmp/install.sh {{ .Name }}<enter><wait>" ], "boot_wait": "10s", - "disk_size": 10140, + "disk_size": "{{user `disk_size`}}", "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "guest_os_type": "FreeBSD", "headless": "{{ user `headless` }}", @@ -59,7 +59,7 @@ "fetch -o /tmp/install.sh http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} && chmod +x /tmp/install.sh && /tmp/install.sh {{ .Name }}<enter><wait>" ], "boot_wait": "10s", - "disk_size": 10140, + "disk_size": "{{user `disk_size`}}", "guest_os_type": "freebsd", "headless": "{{ user `headless` }}", "http_directory": "http", @@ -94,7 +94,7 @@ "fetch -o /tmp/install.sh http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} && chmod +x /tmp/install.sh && /tmp/install.sh {{ .Name }}<enter><wait>" ], "boot_wait": "8s", - "disk_size": 10140, + "disk_size": "{{user `disk_size`}}", "guest_os_type": "freebsd", "http_directory": "http", "iso_checksum": "{{user `iso_checksum`}}", @@ -158,7 +158,7 @@ "fetch -o /tmp/install.sh http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} && chmod +x /tmp/install.sh && /tmp/install.sh {{ .Name }}<enter><wait>" ], "boot_wait": "7s", - "disk_size": 10140, + "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "{{user `iso_checksum`}}", @@ -212,6 +212,7 @@ "box_basename": "freebsd-10.2-i386", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", + "disk_size": "40960", "git_revision": "__unknown_git_revision__", "headless": "", "http_proxy": "{{env `http_proxy`}}", diff --git a/freebsd-10.3-amd64.json b/freebsd-10.3-amd64.json index c6696d8e6..7c348a339 100644 --- a/freebsd-10.3-amd64.json +++ b/freebsd-10.3-amd64.json @@ -13,7 +13,7 @@ "fetch -o /tmp/install.sh http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} && chmod +x /tmp/install.sh && /tmp/install.sh {{ .Name }}<enter><wait>" ], "boot_wait": "10s", - "disk_size": 10140, + "disk_size": "{{user `disk_size`}}", "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "guest_os_type": "FreeBSD_64", "headless": "{{ user `headless` }}", @@ -59,7 +59,7 @@ "fetch -o /tmp/install.sh http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} && chmod +x /tmp/install.sh && /tmp/install.sh {{ .Name }}<enter><wait>" ], "boot_wait": "10s", - "disk_size": 10140, + "disk_size": "{{user `disk_size`}}", "guest_os_type": "freebsd-64", "headless": "{{ user `headless` }}", "http_directory": "http", @@ -94,7 +94,7 @@ "fetch -o /tmp/install.sh http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} && chmod +x /tmp/install.sh && /tmp/install.sh {{ .Name }}<enter><wait>" ], "boot_wait": "8s", - "disk_size": 10140, + "disk_size": "{{user `disk_size`}}", "guest_os_type": "freebsd", "http_directory": "http", "iso_checksum": "{{user `iso_checksum`}}", @@ -158,7 +158,7 @@ "fetch -o /tmp/install.sh http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} && chmod +x /tmp/install.sh && /tmp/install.sh {{ .Name }} vtnet0<enter><wait>" ], "boot_wait": "7s", - "disk_size": 10140, + "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "{{user `iso_checksum`}}", @@ -212,6 +212,7 @@ "box_basename": "freebsd-10.3", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", + "disk_size": "40960", "git_revision": "__unknown_git_revision__", "headless": "", "http_proxy": "{{env `http_proxy`}}", diff --git a/freebsd-10.3-i386.json b/freebsd-10.3-i386.json index dbe27f071..99a771e7f 100644 --- a/freebsd-10.3-i386.json +++ b/freebsd-10.3-i386.json @@ -13,7 +13,7 @@ "fetch -o /tmp/install.sh http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} && chmod +x /tmp/install.sh && /tmp/install.sh {{ .Name }}<enter><wait>" ], "boot_wait": "10s", - "disk_size": 10140, + "disk_size": "{{user `disk_size`}}", "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "guest_os_type": "FreeBSD", "headless": "{{ user `headless` }}", @@ -59,7 +59,7 @@ "fetch -o /tmp/install.sh http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} && chmod +x /tmp/install.sh && /tmp/install.sh {{ .Name }}<enter><wait>" ], "boot_wait": "10s", - "disk_size": 10140, + "disk_size": "{{user `disk_size`}}", "guest_os_type": "freebsd", "headless": "{{ user `headless` }}", "http_directory": "http", @@ -94,7 +94,7 @@ "fetch -o /tmp/install.sh http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} && chmod +x /tmp/install.sh && /tmp/install.sh {{ .Name }}<enter><wait>" ], "boot_wait": "8s", - "disk_size": 10140, + "disk_size": "{{user `disk_size`}}", "guest_os_type": "freebsd", "http_directory": "http", "iso_checksum": "{{user `iso_checksum`}}", @@ -158,7 +158,7 @@ "fetch -o /tmp/install.sh http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} && chmod +x /tmp/install.sh && /tmp/install.sh {{ .Name }}<enter><wait>" ], "boot_wait": "7s", - "disk_size": 10140, + "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "{{user `iso_checksum`}}", @@ -212,6 +212,7 @@ "box_basename": "freebsd-10.3-i386", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", + "disk_size": "40960", "git_revision": "__unknown_git_revision__", "headless": "", "http_proxy": "{{env `http_proxy`}}", diff --git a/freebsd-9.3-amd64.json b/freebsd-9.3-amd64.json index a816c5113..147624160 100644 --- a/freebsd-9.3-amd64.json +++ b/freebsd-9.3-amd64.json @@ -17,7 +17,7 @@ "fetch -o /tmp/install.sh http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} && chmod +x /tmp/install.sh && /tmp/install.sh {{ .Name }}<enter><wait>" ], "boot_wait": "10s", - "disk_size": 10140, + "disk_size": "{{user `disk_size`}}", "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "guest_os_type": "FreeBSD_64", "headless": "{{ user `headless` }}", @@ -67,7 +67,7 @@ "fetch -o /tmp/install.sh http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} && chmod +x /tmp/install.sh && /tmp/install.sh {{ .Name }}<enter><wait>" ], "boot_wait": "10s", - "disk_size": 10140, + "disk_size": "{{user `disk_size`}}", "guest_os_type": "freebsd-64", "headless": "{{ user `headless` }}", "http_directory": "http", @@ -106,7 +106,7 @@ "fetch -o /tmp/install.sh http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} && chmod +x /tmp/install.sh && /tmp/install.sh {{ .Name }}<enter><wait>" ], "boot_wait": "8s", - "disk_size": 10140, + "disk_size": "{{user `disk_size`}}", "guest_os_type": "freebsd", "http_directory": "http", "iso_checksum": "{{user `iso_checksum`}}", @@ -174,7 +174,7 @@ "fetch -o /tmp/install.sh http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} && chmod +x /tmp/install.sh && /tmp/install.sh {{ .Name }}<enter><wait>" ], "boot_wait": "7s", - "disk_size": 10140, + "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "{{user `iso_checksum`}}", @@ -228,6 +228,7 @@ "box_basename": "freebsd-9.3", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", + "disk_size": "40960", "git_revision": "__unknown_git_revision__", "headless": "", "http_proxy": "{{env `http_proxy`}}", diff --git a/freebsd-9.3-i386.json b/freebsd-9.3-i386.json index 30dc011c7..fb1827c84 100644 --- a/freebsd-9.3-i386.json +++ b/freebsd-9.3-i386.json @@ -17,7 +17,7 @@ "fetch -o /tmp/install.sh http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} && chmod +x /tmp/install.sh && /tmp/install.sh {{ .Name }}<enter><wait>" ], "boot_wait": "10s", - "disk_size": 10140, + "disk_size": "{{user `disk_size`}}", "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "guest_os_type": "FreeBSD", "headless": "{{ user `headless` }}", @@ -67,7 +67,7 @@ "fetch -o /tmp/install.sh http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} && chmod +x /tmp/install.sh && /tmp/install.sh {{ .Name }}<enter><wait>" ], "boot_wait": "10s", - "disk_size": 10140, + "disk_size": "{{user `disk_size`}}", "guest_os_type": "freebsd", "headless": "{{ user `headless` }}", "http_directory": "http", @@ -106,7 +106,7 @@ "fetch -o /tmp/install.sh http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} && chmod +x /tmp/install.sh && /tmp/install.sh {{ .Name }}<enter><wait>" ], "boot_wait": "8s", - "disk_size": 10140, + "disk_size": "{{user `disk_size`}}", "guest_os_type": "freebsd", "http_directory": "http", "iso_checksum": "{{user `iso_checksum`}}", @@ -174,7 +174,7 @@ "fetch -o /tmp/install.sh http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} && chmod +x /tmp/install.sh && /tmp/install.sh {{ .Name }}<enter><wait>" ], "boot_wait": "7s", - "disk_size": 10140, + "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "{{user `iso_checksum`}}", @@ -228,6 +228,7 @@ "box_basename": "freebsd-9.3-i386", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", + "disk_size": "40960", "git_revision": "__unknown_git_revision__", "headless": "", "http_proxy": "{{env `http_proxy`}}", diff --git a/macosx-10.10.json b/macosx-10.10.json index 111e08013..23a877554 100644 --- a/macosx-10.10.json +++ b/macosx-10.10.json @@ -2,7 +2,7 @@ "builders": [ { "boot_wait": "2s", - "disk_size": 40960, + "disk_size": "{{user `disk_size`}}", "guest_os_type": "darwin12-64", "headless": "{{ user `headless` }}", "iso_checksum": "{{user `iso_checksum`}}", @@ -34,7 +34,7 @@ }, { "boot_wait": "2s", - "disk_size": 40960, + "disk_size": "{{user `disk_size`}}", "guest_additions_mode": "disable", "guest_os_type": "MacOS109_64", "hard_drive_interface": "sata", @@ -155,7 +155,7 @@ }, { "boot_wait": "2s", - "disk_size": 40960, + "disk_size": "{{user `disk_size`}}", "guest_os_type": "macosx", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", @@ -215,6 +215,7 @@ "box_basename": "macosx-10.10", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", + "disk_size": "40960", "git_revision": "__unknown_git_revision__", "headless": "", "http_proxy": "{{env `http_proxy`}}", diff --git a/macosx-10.11.json b/macosx-10.11.json index 0dc917dd4..0ac3ce4f2 100644 --- a/macosx-10.11.json +++ b/macosx-10.11.json @@ -2,7 +2,7 @@ "builders": [ { "boot_wait": "2s", - "disk_size": 40960, + "disk_size": "{{user `disk_size`}}", "guest_os_type": "darwin12-64", "headless": "{{ user `headless` }}", "iso_checksum": "{{user `iso_checksum`}}", @@ -34,7 +34,7 @@ }, { "boot_wait": "2s", - "disk_size": 40960, + "disk_size": "{{user `disk_size`}}", "guest_additions_mode": "disable", "guest_os_type": "MacOS1011_64", "hard_drive_interface": "sata", @@ -155,7 +155,7 @@ }, { "boot_wait": "2s", - "disk_size": 40960, + "disk_size": "{{user `disk_size`}}", "guest_os_type": "macosx", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", @@ -215,6 +215,7 @@ "box_basename": "macosx-10.11", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", + "disk_size": "40960", "git_revision": "__unknown_git_revision__", "headless": "", "http_proxy": "{{env `http_proxy`}}", diff --git a/macosx-10.7.json b/macosx-10.7.json index 60dd55045..26166067e 100644 --- a/macosx-10.7.json +++ b/macosx-10.7.json @@ -2,7 +2,7 @@ "builders": [ { "boot_wait": "2s", - "disk_size": 40960, + "disk_size": "{{user `disk_size`}}", "guest_os_type": "darwin12-64", "headless": "{{ user `headless` }}", "iso_checksum": "{{user `iso_checksum`}}", @@ -34,7 +34,7 @@ }, { "boot_wait": "2s", - "disk_size": 40960, + "disk_size": "{{user `disk_size`}}", "guest_additions_mode": "disable", "guest_os_type": "MacOS107_64", "hard_drive_interface": "sata", @@ -155,7 +155,7 @@ }, { "boot_wait": "2s", - "disk_size": 40960, + "disk_size": "{{user `disk_size`}}", "guest_os_type": "macosx", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", @@ -215,6 +215,7 @@ "box_basename": "macosx-10.7", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", + "disk_size": "40960", "git_revision": "__unknown_git_revision__", "headless": "", "http_proxy": "{{env `http_proxy`}}", diff --git a/macosx-10.8.json b/macosx-10.8.json index 362db55b1..75fb1b7db 100644 --- a/macosx-10.8.json +++ b/macosx-10.8.json @@ -2,7 +2,7 @@ "builders": [ { "boot_wait": "2s", - "disk_size": 40960, + "disk_size": "{{user `disk_size`}}", "guest_os_type": "darwin12-64", "headless": "{{ user `headless` }}", "iso_checksum": "{{user `iso_checksum`}}", @@ -34,7 +34,7 @@ }, { "boot_wait": "2s", - "disk_size": 40960, + "disk_size": "{{user `disk_size`}}", "guest_additions_mode": "disable", "guest_os_type": "MacOS108_64", "hard_drive_interface": "sata", @@ -155,7 +155,7 @@ }, { "boot_wait": "2s", - "disk_size": 40960, + "disk_size": "{{user `disk_size`}}", "guest_os_type": "macosx", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", @@ -215,6 +215,7 @@ "box_basename": "macosx-10.8", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", + "disk_size": "40960", "git_revision": "__unknown_git_revision__", "headless": "", "http_proxy": "{{env `http_proxy`}}", diff --git a/macosx-10.9.json b/macosx-10.9.json index c9cc33a17..ba2722089 100644 --- a/macosx-10.9.json +++ b/macosx-10.9.json @@ -2,7 +2,7 @@ "builders": [ { "boot_wait": "2s", - "disk_size": 40960, + "disk_size": "{{user `disk_size`}}", "guest_os_type": "darwin12-64", "headless": "{{ user `headless` }}", "iso_checksum": "{{user `iso_checksum`}}", @@ -34,7 +34,7 @@ }, { "boot_wait": "2s", - "disk_size": 40960, + "disk_size": "{{user `disk_size`}}", "guest_additions_mode": "disable", "guest_os_type": "MacOS109_64", "hard_drive_interface": "sata", @@ -155,7 +155,7 @@ }, { "boot_wait": "2s", - "disk_size": 40960, + "disk_size": "{{user `disk_size`}}", "guest_os_type": "macosx", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", @@ -215,6 +215,7 @@ "box_basename": "macosx-10.9", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", + "disk_size": "40960", "git_revision": "__unknown_git_revision__", "headless": "", "http_proxy": "{{env `http_proxy`}}", diff --git a/omnios-r151010j.json b/omnios-r151010j.json index 661156ed8..2adc9605d 100644 --- a/omnios-r151010j.json +++ b/omnios-r151010j.json @@ -31,7 +31,7 @@ "svcadm restart ssh<enter><wait>" ], "boot_wait": "30s", - "disk_size": 40960, + "disk_size": "{{user `disk_size`}}", "guest_os_type": "OpenSolaris_64", "headless": "{{ user `headless` }}", "iso_checksum": "bc3f4c0d29a5da75174de62da00294e5ef826b5e", @@ -93,7 +93,7 @@ "svcadm restart ssh<enter><wait>" ], "boot_wait": "30s", - "disk_size": 40960, + "disk_size": "{{user `disk_size`}}", "floppy_files": [ "floppy/omnios/README.TXT" ], @@ -149,7 +149,7 @@ "svcadm restart ssh<enter><wait>" ], "boot_wait": "30s", - "disk_size": 40960, + "disk_size": "{{user `disk_size`}}", "guest_os_type": "opensolaris", "hard_drive_interface": "ide", "iso_checksum": "bc3f4c0d29a5da75174de62da00294e5ef826b5e", @@ -213,6 +213,7 @@ "box_basename": "omnios-r151010j", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", + "disk_size": "40960", "git_revision": "__unknown_git_revision__", "headless": "", "memory": "1024", diff --git a/omnios-r151014.json b/omnios-r151014.json index 671020dc6..897d98b7a 100644 --- a/omnios-r151014.json +++ b/omnios-r151014.json @@ -31,7 +31,7 @@ "svcadm restart ssh<enter><wait>" ], "boot_wait": "30s", - "disk_size": 40960, + "disk_size": "{{user `disk_size`}}", "guest_os_type": "OpenSolaris_64", "headless": "{{ user `headless` }}", "iso_checksum": "{{user `iso_checksum`}}", @@ -93,7 +93,7 @@ "svcadm restart ssh<enter><wait>" ], "boot_wait": "30s", - "disk_size": 40960, + "disk_size": "{{user `disk_size`}}", "floppy_files": [ "floppy/omnios/README.TXT" ], @@ -149,7 +149,7 @@ "svcadm restart ssh<enter><wait>" ], "boot_wait": "30s", - "disk_size": 40960, + "disk_size": "{{user `disk_size`}}", "guest_os_type": "opensolaris", "hard_drive_interface": "ide", "iso_checksum": "{{user `iso_checksum`}}", @@ -218,6 +218,7 @@ "box_basename": "omnios-r151014", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", + "disk_size": "40960", "git_revision": "__unknown_git_revision__", "headless": "", "http_proxy": "{{env `http_proxy`}}", diff --git a/omnios-r151018.json b/omnios-r151018.json index 6941ec37a..e0893adb1 100644 --- a/omnios-r151018.json +++ b/omnios-r151018.json @@ -31,7 +31,7 @@ "svcadm restart ssh<enter><wait>" ], "boot_wait": "30s", - "disk_size": 40960, + "disk_size": "{{user `disk_size`}}", "guest_os_type": "OpenSolaris_64", "headless": "{{ user `headless` }}", "iso_checksum": "{{user `iso_checksum`}}", @@ -93,7 +93,7 @@ "svcadm restart ssh<enter><wait>" ], "boot_wait": "30s", - "disk_size": 40960, + "disk_size": "{{user `disk_size`}}", "floppy_files": [ "floppy/omnios/README.TXT" ], @@ -149,7 +149,7 @@ "svcadm restart ssh<enter><wait>" ], "boot_wait": "30s", - "disk_size": 40960, + "disk_size": "{{user `disk_size`}}", "guest_os_type": "opensolaris", "hard_drive_interface": "ide", "iso_checksum": "{{user `iso_checksum`}}", @@ -218,6 +218,7 @@ "box_basename": "omnios-r151018", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", + "disk_size": "40960", "git_revision": "__unknown_git_revision__", "headless": "", "http_proxy": "{{env `http_proxy`}}", diff --git a/opensuse-13.2-i386.json b/opensuse-13.2-i386.json index f895e8f10..14cdb50df 100644 --- a/opensuse-13.2-i386.json +++ b/opensuse-13.2-i386.json @@ -9,7 +9,7 @@ "<enter><wait>" ], "boot_wait": "10s", - "disk_size": 20480, + "disk_size": "{{user `disk_size`}}", "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "guest_os_type": "OpenSUSE", "hard_drive_interface": "sata", @@ -51,7 +51,7 @@ "<enter><wait>" ], "boot_wait": "10s", - "disk_size": 20480, + "disk_size": "{{user `disk_size`}}", "guest_os_type": "opensuse", "headless": "{{ user `headless` }}", "http_directory": "http", @@ -82,7 +82,7 @@ "<enter><wait>" ], "boot_wait": "10s", - "disk_size": 20480, + "disk_size": "{{user `disk_size`}}", "guest_os_type": "opensuse", "http_directory": "http", "iso_checksum": "{{user `iso_checksum`}}", @@ -122,7 +122,7 @@ "<enter><wait>" ], "boot_wait": "10s", - "disk_size": 20480, + "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "{{user `iso_checksum`}}", @@ -178,6 +178,7 @@ "box_basename": "opensuse-13.2-i386", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", + "disk_size": "20480", "git_revision": "__unknown_git_revision__", "headless": "", "http_proxy": "{{env `http_proxy`}}", diff --git a/opensuse-13.2-x86_64.json b/opensuse-13.2-x86_64.json index 314bae5a6..397ca82ae 100644 --- a/opensuse-13.2-x86_64.json +++ b/opensuse-13.2-x86_64.json @@ -9,7 +9,7 @@ "<enter><wait>" ], "boot_wait": "10s", - "disk_size": 20480, + "disk_size": "{{user `disk_size`}}", "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "guest_os_type": "OpenSUSE_64", "hard_drive_interface": "sata", @@ -51,7 +51,7 @@ "<enter><wait>" ], "boot_wait": "10s", - "disk_size": 20480, + "disk_size": "{{user `disk_size`}}", "guest_os_type": "opensuse-64", "headless": "{{ user `headless` }}", "http_directory": "http", @@ -82,7 +82,7 @@ "<enter><wait>" ], "boot_wait": "10s", - "disk_size": 20480, + "disk_size": "{{user `disk_size`}}", "guest_os_type": "opensuse", "http_directory": "http", "iso_checksum": "{{user `iso_checksum`}}", @@ -122,7 +122,7 @@ "<enter><wait>" ], "boot_wait": "10s", - "disk_size": 20480, + "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "{{user `iso_checksum`}}", @@ -178,6 +178,7 @@ "box_basename": "opensuse-13.2", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", + "disk_size": "20480", "git_revision": "__unknown_git_revision__", "headless": "", "http_proxy": "{{env `http_proxy`}}", diff --git a/opensuse-leap-42.1-x86_64.json b/opensuse-leap-42.1-x86_64.json index 47801946e..b1b0705f8 100644 --- a/opensuse-leap-42.1-x86_64.json +++ b/opensuse-leap-42.1-x86_64.json @@ -9,7 +9,7 @@ "<enter><wait>" ], "boot_wait": "10s", - "disk_size": 20480, + "disk_size": "{{user `disk_size`}}", "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "guest_os_type": "OpenSUSE_64", "hard_drive_interface": "sata", @@ -51,7 +51,7 @@ "<enter><wait>" ], "boot_wait": "10s", - "disk_size": 20480, + "disk_size": "{{user `disk_size`}}", "guest_os_type": "opensuse-64", "headless": "{{ user `headless` }}", "http_directory": "http", @@ -82,7 +82,7 @@ "<enter><wait>" ], "boot_wait": "10s", - "disk_size": 20480, + "disk_size": "{{user `disk_size`}}", "guest_os_type": "opensuse", "http_directory": "http", "iso_checksum": "{{user `iso_checksum`}}", @@ -122,7 +122,7 @@ "<enter><wait>" ], "boot_wait": "10s", - "disk_size": 20480, + "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "{{user `iso_checksum`}}", @@ -178,6 +178,7 @@ "box_basename": "opensuse-leap-42.1", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", + "disk_size": "20480", "git_revision": "__unknown_git_revision__", "headless": "", "http_proxy": "{{env `http_proxy`}}", diff --git a/oracle-5.11-i386.json b/oracle-5.11-i386.json index 46c205277..3c9056ea4 100644 --- a/oracle-5.11-i386.json +++ b/oracle-5.11-i386.json @@ -5,7 +5,7 @@ "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], "boot_wait": "10s", - "disk_size": 40960, + "disk_size": "{{user `disk_size`}}", "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "guest_os_type": "Oracle", "hard_drive_interface": "sata", @@ -43,7 +43,7 @@ "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], "boot_wait": "10s", - "disk_size": 40960, + "disk_size": "{{user `disk_size`}}", "guest_os_type": "oraclelinux", "headless": "{{ user `headless` }}", "http_directory": "http", @@ -70,7 +70,7 @@ "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], "boot_wait": "10s", - "disk_size": 40960, + "disk_size": "{{user `disk_size`}}", "guest_os_type": "centos", "http_directory": "http", "iso_checksum": "{{user `iso_checksum`}}", @@ -106,7 +106,7 @@ "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], "boot_wait": "10s", - "disk_size": 40960, + "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "{{user `iso_checksum`}}", @@ -158,6 +158,7 @@ "box_basename": "oracle-5.11-i386", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", + "disk_size": "40960", "git_revision": "__unknown_git_revision__", "headless": "", "http_proxy": "{{env `http_proxy`}}", diff --git a/oracle-5.11-x86_64.json b/oracle-5.11-x86_64.json index f01b386c5..a1823691a 100644 --- a/oracle-5.11-x86_64.json +++ b/oracle-5.11-x86_64.json @@ -5,7 +5,7 @@ "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], "boot_wait": "10s", - "disk_size": 40960, + "disk_size": "{{user `disk_size`}}", "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "guest_os_type": "Oracle_64", "hard_drive_interface": "sata", @@ -43,7 +43,7 @@ "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], "boot_wait": "10s", - "disk_size": 40960, + "disk_size": "{{user `disk_size`}}", "guest_os_type": "oraclelinux-64", "headless": "{{ user `headless` }}", "http_directory": "http", @@ -70,7 +70,7 @@ "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], "boot_wait": "10s", - "disk_size": 40960, + "disk_size": "{{user `disk_size`}}", "guest_os_type": "centos", "http_directory": "http", "iso_checksum": "{{user `iso_checksum`}}", @@ -106,7 +106,7 @@ "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], "boot_wait": "10s", - "disk_size": 40960, + "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "{{user `iso_checksum`}}", @@ -158,6 +158,7 @@ "box_basename": "oracle-5.11", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", + "disk_size": "40960", "git_revision": "__unknown_git_revision__", "headless": "", "http_proxy": "{{env `http_proxy`}}", diff --git a/oracle-6.6-i386.json b/oracle-6.6-i386.json index af10343b2..4e3eb21ad 100644 --- a/oracle-6.6-i386.json +++ b/oracle-6.6-i386.json @@ -5,7 +5,7 @@ "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], "boot_wait": "10s", - "disk_size": 40960, + "disk_size": "{{user `disk_size`}}", "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "guest_os_type": "Oracle", "hard_drive_interface": "sata", @@ -43,7 +43,7 @@ "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], "boot_wait": "10s", - "disk_size": 40960, + "disk_size": "{{user `disk_size`}}", "guest_os_type": "oraclelinux", "headless": "{{ user `headless` }}", "http_directory": "http", @@ -70,7 +70,7 @@ "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], "boot_wait": "10s", - "disk_size": 40960, + "disk_size": "{{user `disk_size`}}", "guest_os_type": "centos", "http_directory": "http", "iso_checksum": "{{user `iso_checksum`}}", @@ -106,7 +106,7 @@ "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], "boot_wait": "10s", - "disk_size": 40960, + "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "{{user `iso_checksum`}}", @@ -159,6 +159,7 @@ "box_basename": "oracle-6.6-i386", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", + "disk_size": "40960", "git_revision": "__unknown_git_revision__", "headless": "", "http_proxy": "{{env `http_proxy`}}", diff --git a/oracle-6.6-x86_64.json b/oracle-6.6-x86_64.json index e7abf830b..c10d50566 100644 --- a/oracle-6.6-x86_64.json +++ b/oracle-6.6-x86_64.json @@ -5,7 +5,7 @@ "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], "boot_wait": "10s", - "disk_size": 40960, + "disk_size": "{{user `disk_size`}}", "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "guest_os_type": "Oracle_64", "hard_drive_interface": "sata", @@ -43,7 +43,7 @@ "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], "boot_wait": "10s", - "disk_size": 40960, + "disk_size": "{{user `disk_size`}}", "guest_os_type": "oraclelinux-64", "headless": "{{ user `headless` }}", "http_directory": "http", @@ -70,7 +70,7 @@ "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], "boot_wait": "10s", - "disk_size": 40960, + "disk_size": "{{user `disk_size`}}", "guest_os_type": "centos", "http_directory": "http", "iso_checksum": "{{user `iso_checksum`}}", @@ -106,7 +106,7 @@ "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], "boot_wait": "10s", - "disk_size": 40960, + "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "{{user `iso_checksum`}}", @@ -159,6 +159,7 @@ "box_basename": "oracle-6.6", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", + "disk_size": "40960", "git_revision": "__unknown_git_revision__", "headless": "", "http_proxy": "{{env `http_proxy`}}", diff --git a/oracle-6.7-i386.json b/oracle-6.7-i386.json index bba2b43f1..dad40f43a 100644 --- a/oracle-6.7-i386.json +++ b/oracle-6.7-i386.json @@ -5,7 +5,7 @@ "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], "boot_wait": "10s", - "disk_size": 40960, + "disk_size": "{{user `disk_size`}}", "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "guest_os_type": "Oracle", "hard_drive_interface": "sata", @@ -43,7 +43,7 @@ "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], "boot_wait": "10s", - "disk_size": 40960, + "disk_size": "{{user `disk_size`}}", "guest_os_type": "oraclelinux", "headless": "{{ user `headless` }}", "http_directory": "http", @@ -70,7 +70,7 @@ "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], "boot_wait": "10s", - "disk_size": 40960, + "disk_size": "{{user `disk_size`}}", "guest_os_type": "centos", "http_directory": "http", "iso_checksum": "{{user `iso_checksum`}}", @@ -106,7 +106,7 @@ "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], "boot_wait": "10s", - "disk_size": 40960, + "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "{{user `iso_checksum`}}", @@ -159,6 +159,7 @@ "box_basename": "oracle-6.7-i386", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", + "disk_size": "40960", "git_revision": "__unknown_git_revision__", "headless": "", "http_proxy": "{{env `http_proxy`}}", diff --git a/oracle-6.7-x86_64.json b/oracle-6.7-x86_64.json index d757ae58e..e26ac6d4b 100644 --- a/oracle-6.7-x86_64.json +++ b/oracle-6.7-x86_64.json @@ -5,7 +5,7 @@ "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], "boot_wait": "10s", - "disk_size": 40960, + "disk_size": "{{user `disk_size`}}", "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "guest_os_type": "Oracle_64", "hard_drive_interface": "sata", @@ -43,7 +43,7 @@ "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], "boot_wait": "10s", - "disk_size": 40960, + "disk_size": "{{user `disk_size`}}", "guest_os_type": "oraclelinux-64", "headless": "{{ user `headless` }}", "http_directory": "http", @@ -70,7 +70,7 @@ "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], "boot_wait": "10s", - "disk_size": 40960, + "disk_size": "{{user `disk_size`}}", "guest_os_type": "centos", "http_directory": "http", "iso_checksum": "{{user `iso_checksum`}}", @@ -106,7 +106,7 @@ "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], "boot_wait": "10s", - "disk_size": 40960, + "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "{{user `iso_checksum`}}", @@ -159,6 +159,7 @@ "box_basename": "oracle-6.7", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", + "disk_size": "40960", "git_revision": "__unknown_git_revision__", "headless": "", "http_proxy": "{{env `http_proxy`}}", diff --git a/oracle-7.2-x86_64.json b/oracle-7.2-x86_64.json index 72d98542d..30312b15a 100644 --- a/oracle-7.2-x86_64.json +++ b/oracle-7.2-x86_64.json @@ -5,7 +5,7 @@ "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], "boot_wait": "10s", - "disk_size": 40960, + "disk_size": "{{user `disk_size`}}", "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "guest_os_type": "Oracle_64", "hard_drive_interface": "sata", @@ -43,7 +43,7 @@ "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], "boot_wait": "10s", - "disk_size": 40960, + "disk_size": "{{user `disk_size`}}", "guest_os_type": "oraclelinux-64", "headless": "{{ user `headless` }}", "http_directory": "http", @@ -70,7 +70,7 @@ "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], "boot_wait": "10s", - "disk_size": 40960, + "disk_size": "{{user `disk_size`}}", "guest_os_type": "centos", "http_directory": "http", "iso_checksum": "{{user `iso_checksum`}}", @@ -106,7 +106,7 @@ "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], "boot_wait": "10s", - "disk_size": 40960, + "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "{{user `iso_checksum`}}", @@ -159,6 +159,7 @@ "box_basename": "oracle-7.2", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", + "disk_size": "40960", "git_revision": "__unknown_git_revision__", "headless": "", "http_proxy": "{{env `http_proxy`}}", diff --git a/rhel-5.11-i386.json b/rhel-5.11-i386.json index 30b0caf9c..d163833c0 100644 --- a/rhel-5.11-i386.json +++ b/rhel-5.11-i386.json @@ -5,7 +5,7 @@ "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], "boot_wait": "10s", - "disk_size": 40960, + "disk_size": "{{user `disk_size`}}", "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "guest_os_type": "RedHat", "hard_drive_interface": "sata", @@ -43,7 +43,7 @@ "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], "boot_wait": "10s", - "disk_size": 40960, + "disk_size": "{{user `disk_size`}}", "guest_os_type": "redhat", "headless": "{{ user `headless` }}", "http_directory": "http", @@ -70,7 +70,7 @@ "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], "boot_wait": "10s", - "disk_size": 40960, + "disk_size": "{{user `disk_size`}}", "guest_os_type": "rhel", "http_directory": "http", "iso_checksum": "{{user `iso_checksum`}}", @@ -106,7 +106,7 @@ "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], "boot_wait": "10s", - "disk_size": 40960, + "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "{{user `iso_checksum`}}", @@ -158,6 +158,7 @@ "box_basename": "rhel-5.11-i386", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", + "disk_size": "40960", "git_revision": "__unknown_git_revision__", "headless": "", "http_proxy": "{{env `http_proxy`}}", diff --git a/rhel-5.11-x86_64.json b/rhel-5.11-x86_64.json index 6417ed5c8..0a1a5b09d 100644 --- a/rhel-5.11-x86_64.json +++ b/rhel-5.11-x86_64.json @@ -5,7 +5,7 @@ "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], "boot_wait": "10s", - "disk_size": 40960, + "disk_size": "{{user `disk_size`}}", "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "guest_os_type": "RedHat_64", "hard_drive_interface": "sata", @@ -43,7 +43,7 @@ "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], "boot_wait": "10s", - "disk_size": 40960, + "disk_size": "{{user `disk_size`}}", "guest_os_type": "rhel5-64", "headless": "{{ user `headless` }}", "http_directory": "http", @@ -70,7 +70,7 @@ "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], "boot_wait": "10s", - "disk_size": 40960, + "disk_size": "{{user `disk_size`}}", "guest_os_type": "rhel", "http_directory": "http", "iso_checksum": "{{user `iso_checksum`}}", @@ -106,7 +106,7 @@ "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], "boot_wait": "10s", - "disk_size": 40960, + "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "{{user `iso_checksum`}}", @@ -158,6 +158,7 @@ "box_basename": "rhel-5.11", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", + "disk_size": "40960", "git_revision": "__unknown_git_revision__", "headless": "", "http_proxy": "{{env `http_proxy`}}", diff --git a/rhel-6.6-i386.json b/rhel-6.6-i386.json index 4340f2bdb..729fd2530 100644 --- a/rhel-6.6-i386.json +++ b/rhel-6.6-i386.json @@ -5,7 +5,7 @@ "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], "boot_wait": "10s", - "disk_size": 40960, + "disk_size": "{{user `disk_size`}}", "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "guest_os_type": "RedHat", "hard_drive_interface": "sata", @@ -43,7 +43,7 @@ "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], "boot_wait": "10s", - "disk_size": 40960, + "disk_size": "{{user `disk_size`}}", "guest_os_type": "redhat", "headless": "{{ user `headless` }}", "http_directory": "http", @@ -70,7 +70,7 @@ "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], "boot_wait": "10s", - "disk_size": 40960, + "disk_size": "{{user `disk_size`}}", "guest_os_type": "rhel", "http_directory": "http", "iso_checksum": "{{user `iso_checksum`}}", @@ -106,7 +106,7 @@ "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], "boot_wait": "10s", - "disk_size": 40960, + "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "{{user `iso_checksum`}}", @@ -159,6 +159,7 @@ "box_basename": "rhel-6.6-i386", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", + "disk_size": "40960", "git_revision": "__unknown_git_revision__", "headless": "", "http_proxy": "{{env `http_proxy`}}", diff --git a/rhel-6.6-x86_64.json b/rhel-6.6-x86_64.json index 4622ada7b..e83538d81 100644 --- a/rhel-6.6-x86_64.json +++ b/rhel-6.6-x86_64.json @@ -5,7 +5,7 @@ "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], "boot_wait": "10s", - "disk_size": 40960, + "disk_size": "{{user `disk_size`}}", "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "guest_os_type": "RedHat_64", "hard_drive_interface": "sata", @@ -43,7 +43,7 @@ "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], "boot_wait": "10s", - "disk_size": 40960, + "disk_size": "{{user `disk_size`}}", "guest_os_type": "rhel6-64", "headless": "{{ user `headless` }}", "http_directory": "http", @@ -70,7 +70,7 @@ "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], "boot_wait": "10s", - "disk_size": 40960, + "disk_size": "{{user `disk_size`}}", "guest_os_type": "rhel", "http_directory": "http", "iso_checksum": "{{user `iso_checksum`}}", @@ -106,7 +106,7 @@ "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], "boot_wait": "10s", - "disk_size": 40960, + "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "{{user `iso_checksum`}}", @@ -159,6 +159,7 @@ "box_basename": "rhel-6.6", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", + "disk_size": "40960", "git_revision": "__unknown_git_revision__", "headless": "", "http_proxy": "{{env `http_proxy`}}", diff --git a/rhel-6.7-i386.json b/rhel-6.7-i386.json index 1b63cf439..5954b2d9c 100644 --- a/rhel-6.7-i386.json +++ b/rhel-6.7-i386.json @@ -5,7 +5,7 @@ "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], "boot_wait": "10s", - "disk_size": 40960, + "disk_size": "{{user `disk_size`}}", "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "guest_os_type": "RedHat", "hard_drive_interface": "sata", @@ -43,7 +43,7 @@ "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], "boot_wait": "10s", - "disk_size": 40960, + "disk_size": "{{user `disk_size`}}", "guest_os_type": "redhat", "headless": "{{ user `headless` }}", "http_directory": "http", @@ -70,7 +70,7 @@ "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], "boot_wait": "10s", - "disk_size": 40960, + "disk_size": "{{user `disk_size`}}", "guest_os_type": "rhel", "http_directory": "http", "iso_checksum": "{{user `iso_checksum`}}", @@ -106,7 +106,7 @@ "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], "boot_wait": "10s", - "disk_size": 40960, + "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "{{user `iso_checksum`}}", @@ -159,6 +159,7 @@ "box_basename": "rhel-6.7-i386", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", + "disk_size": "40960", "git_revision": "__unknown_git_revision__", "headless": "", "http_proxy": "{{env `http_proxy`}}", diff --git a/rhel-6.7-x86_64.json b/rhel-6.7-x86_64.json index 2177d6d42..fae4fb8b2 100644 --- a/rhel-6.7-x86_64.json +++ b/rhel-6.7-x86_64.json @@ -5,7 +5,7 @@ "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], "boot_wait": "10s", - "disk_size": 40960, + "disk_size": "{{user `disk_size`}}", "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "guest_os_type": "RedHat_64", "hard_drive_interface": "sata", @@ -43,7 +43,7 @@ "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], "boot_wait": "10s", - "disk_size": 40960, + "disk_size": "{{user `disk_size`}}", "guest_os_type": "rhel6-64", "headless": "{{ user `headless` }}", "http_directory": "http", @@ -70,7 +70,7 @@ "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], "boot_wait": "10s", - "disk_size": 40960, + "disk_size": "{{user `disk_size`}}", "guest_os_type": "rhel", "http_directory": "http", "iso_checksum": "{{user `iso_checksum`}}", @@ -106,7 +106,7 @@ "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], "boot_wait": "10s", - "disk_size": 40960, + "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "{{user `iso_checksum`}}", @@ -159,6 +159,7 @@ "box_basename": "rhel-6.7", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", + "disk_size": "40960", "git_revision": "__unknown_git_revision__", "headless": "", "http_proxy": "{{env `http_proxy`}}", diff --git a/rhel-7.2-x86_64.json b/rhel-7.2-x86_64.json index 2dbf7bcec..b4b932d42 100644 --- a/rhel-7.2-x86_64.json +++ b/rhel-7.2-x86_64.json @@ -5,7 +5,7 @@ "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], "boot_wait": "10s", - "disk_size": 40960, + "disk_size": "{{user `disk_size`}}", "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "guest_os_type": "RedHat_64", "hard_drive_interface": "sata", @@ -43,7 +43,7 @@ "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], "boot_wait": "10s", - "disk_size": 40960, + "disk_size": "{{user `disk_size`}}", "guest_os_type": "rhel7-64", "headless": "{{ user `headless` }}", "http_directory": "http", @@ -70,7 +70,7 @@ "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], "boot_wait": "10s", - "disk_size": 40960, + "disk_size": "{{user `disk_size`}}", "guest_os_type": "rhel", "http_directory": "http", "iso_checksum": "{{user `iso_checksum`}}", @@ -106,7 +106,7 @@ "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], "boot_wait": "10s", - "disk_size": 40960, + "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "{{user `iso_checksum`}}", @@ -159,6 +159,7 @@ "box_basename": "rhel-7.2", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", + "disk_size": "40960", "git_revision": "__unknown_git_revision__", "headless": "", "http_proxy": "{{env `http_proxy`}}", diff --git a/sles-11-sp2-i386.json b/sles-11-sp2-i386.json index 7c66f78a1..1f758228c 100644 --- a/sles-11-sp2-i386.json +++ b/sles-11-sp2-i386.json @@ -9,7 +9,7 @@ "<enter><wait>" ], "boot_wait": "10s", - "disk_size": 20480, + "disk_size": "{{user `disk_size`}}", "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "guest_os_type": "OpenSUSE", "hard_drive_interface": "sata", @@ -51,7 +51,7 @@ "<enter><wait>" ], "boot_wait": "10s", - "disk_size": 20480, + "disk_size": "{{user `disk_size`}}", "guest_os_type": "sles11", "headless": "{{ user `headless` }}", "http_directory": "http", @@ -82,7 +82,7 @@ "<enter><wait>" ], "boot_wait": "10s", - "disk_size": 20480, + "disk_size": "{{user `disk_size`}}", "guest_os_type": "suse", "http_directory": "http", "iso_checksum": "a0b34f6237b2b2a6b2174c82b40ed326", @@ -122,7 +122,7 @@ "<enter><wait>" ], "boot_wait": "10s", - "disk_size": 20480, + "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "a0b34f6237b2b2a6b2174c82b40ed326", @@ -171,6 +171,7 @@ "box_basename": "sles-11-sp2-i386", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", + "disk_size": "20480", "git_revision": "__unknown_git_revision__", "headless": "", "memory": "512", diff --git a/sles-11-sp2-x86_64.json b/sles-11-sp2-x86_64.json index 8d25712b1..931201871 100644 --- a/sles-11-sp2-x86_64.json +++ b/sles-11-sp2-x86_64.json @@ -9,7 +9,7 @@ "<enter><wait>" ], "boot_wait": "10s", - "disk_size": 20480, + "disk_size": "{{user `disk_size`}}", "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "guest_os_type": "OpenSUSE_64", "hard_drive_interface": "sata", @@ -51,7 +51,7 @@ "<enter><wait>" ], "boot_wait": "10s", - "disk_size": 20480, + "disk_size": "{{user `disk_size`}}", "guest_os_type": "sles11-64", "headless": "{{ user `headless` }}", "http_directory": "http", @@ -82,7 +82,7 @@ "<enter><wait>" ], "boot_wait": "10s", - "disk_size": 20480, + "disk_size": "{{user `disk_size`}}", "guest_os_type": "suse", "http_directory": "http", "iso_checksum": "461d82ae6e15062b0807c1338f040497", @@ -122,7 +122,7 @@ "<enter><wait>" ], "boot_wait": "10s", - "disk_size": 20480, + "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "461d82ae6e15062b0807c1338f040497", @@ -170,6 +170,7 @@ "box_basename": "sles-11-sp2", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", + "disk_size": "20480", "git_revision": "__unknown_git_revision__", "headless": "", "memory": "512", diff --git a/sles-11-sp3-i386.json b/sles-11-sp3-i386.json index ad06f6574..f998f3cfc 100644 --- a/sles-11-sp3-i386.json +++ b/sles-11-sp3-i386.json @@ -9,7 +9,7 @@ "<enter><wait>" ], "boot_wait": "10s", - "disk_size": 20480, + "disk_size": "{{user `disk_size`}}", "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "guest_os_type": "OpenSUSE", "hard_drive_interface": "sata", @@ -51,7 +51,7 @@ "<enter><wait>" ], "boot_wait": "10s", - "disk_size": 20480, + "disk_size": "{{user `disk_size`}}", "guest_os_type": "sles11", "headless": "{{ user `headless` }}", "http_directory": "http", @@ -82,7 +82,7 @@ "<enter><wait>" ], "boot_wait": "10s", - "disk_size": 20480, + "disk_size": "{{user `disk_size`}}", "guest_os_type": "suse", "http_directory": "http", "iso_checksum": "5c30a409fc8fb3343b4dc90d93ff2c89", @@ -122,7 +122,7 @@ "<enter><wait>" ], "boot_wait": "10s", - "disk_size": 20480, + "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "5c30a409fc8fb3343b4dc90d93ff2c89", @@ -171,6 +171,7 @@ "box_basename": "sles-11-sp3-i386", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", + "disk_size": "20480", "git_revision": "__unknown_git_revision__", "headless": "", "memory": "512", diff --git a/sles-11-sp3-x86_64.json b/sles-11-sp3-x86_64.json index 942cef217..719798508 100644 --- a/sles-11-sp3-x86_64.json +++ b/sles-11-sp3-x86_64.json @@ -9,7 +9,7 @@ "<enter><wait>" ], "boot_wait": "10s", - "disk_size": 20480, + "disk_size": "{{user `disk_size`}}", "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "guest_os_type": "OpenSUSE_64", "hard_drive_interface": "sata", @@ -51,7 +51,7 @@ "<enter><wait>" ], "boot_wait": "10s", - "disk_size": 20480, + "disk_size": "{{user `disk_size`}}", "guest_os_type": "sles11-64", "headless": "{{ user `headless` }}", "http_directory": "http", @@ -82,7 +82,7 @@ "<enter><wait>" ], "boot_wait": "10s", - "disk_size": 20480, + "disk_size": "{{user `disk_size`}}", "guest_os_type": "suse", "http_directory": "http", "iso_checksum": "480b70d50cbb538382dc2b9325221e1b", @@ -122,7 +122,7 @@ "<enter><wait>" ], "boot_wait": "10s", - "disk_size": 20480, + "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "480b70d50cbb538382dc2b9325221e1b", @@ -171,6 +171,7 @@ "box_basename": "sles-11-sp3", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", + "disk_size": "20480", "git_revision": "__unknown_git_revision__", "headless": "", "memory": "512", diff --git a/sles-11-sp4-i386.json b/sles-11-sp4-i386.json index 30d861b80..44b3b008f 100644 --- a/sles-11-sp4-i386.json +++ b/sles-11-sp4-i386.json @@ -9,7 +9,7 @@ "<enter><wait>" ], "boot_wait": "10s", - "disk_size": 20480, + "disk_size": "{{user `disk_size`}}", "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "guest_os_type": "OpenSUSE", "hard_drive_interface": "sata", @@ -51,7 +51,7 @@ "<enter><wait>" ], "boot_wait": "10s", - "disk_size": 20480, + "disk_size": "{{user `disk_size`}}", "guest_os_type": "sles11", "headless": "{{ user `headless` }}", "http_directory": "http", @@ -82,7 +82,7 @@ "<enter><wait>" ], "boot_wait": "10s", - "disk_size": 20480, + "disk_size": "{{user `disk_size`}}", "guest_os_type": "suse", "http_directory": "http", "iso_checksum": "{{user `iso_checksum`}}", @@ -122,7 +122,7 @@ "<enter><wait>" ], "boot_wait": "10s", - "disk_size": 20480, + "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "{{user `iso_checksum`}}", @@ -177,6 +177,7 @@ "box_basename": "sles-11-sp4-i386", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", + "disk_size": "20480", "git_revision": "__unknown_git_revision__", "headless": "", "http_proxy": "{{env `http_proxy`}}", diff --git a/sles-11-sp4-x86_64.json b/sles-11-sp4-x86_64.json index 97b6fdb25..75621fe4d 100644 --- a/sles-11-sp4-x86_64.json +++ b/sles-11-sp4-x86_64.json @@ -9,7 +9,7 @@ "<enter><wait>" ], "boot_wait": "10s", - "disk_size": 20480, + "disk_size": "{{user `disk_size`}}", "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "guest_os_type": "OpenSUSE_64", "hard_drive_interface": "sata", @@ -51,7 +51,7 @@ "<enter><wait>" ], "boot_wait": "10s", - "disk_size": 20480, + "disk_size": "{{user `disk_size`}}", "guest_os_type": "sles11-64", "headless": "{{ user `headless` }}", "http_directory": "http", @@ -82,7 +82,7 @@ "<enter><wait>" ], "boot_wait": "10s", - "disk_size": 20480, + "disk_size": "{{user `disk_size`}}", "guest_os_type": "suse", "http_directory": "http", "iso_checksum": "{{user `iso_checksum`}}", @@ -122,7 +122,7 @@ "<enter><wait>" ], "boot_wait": "10s", - "disk_size": 20480, + "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "{{user `iso_checksum`}}", @@ -177,6 +177,7 @@ "box_basename": "sles-11-sp4", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", + "disk_size": "20480", "git_revision": "__unknown_git_revision__", "headless": "", "http_proxy": "{{env `http_proxy`}}", diff --git a/sles-12-x86_64.json b/sles-12-x86_64.json index 04c479ff5..c55108180 100644 --- a/sles-12-x86_64.json +++ b/sles-12-x86_64.json @@ -9,7 +9,7 @@ "<enter><wait>" ], "boot_wait": "10s", - "disk_size": 20480, + "disk_size": "{{user `disk_size`}}", "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "guest_os_type": "OpenSUSE_64", "hard_drive_interface": "sata", @@ -51,7 +51,7 @@ "<enter><wait>" ], "boot_wait": "10s", - "disk_size": 20480, + "disk_size": "{{user `disk_size`}}", "guest_os_type": "sles11-64", "headless": "{{ user `headless` }}", "http_directory": "http", @@ -82,7 +82,7 @@ "<enter><wait>" ], "boot_wait": "10s", - "disk_size": 20480, + "disk_size": "{{user `disk_size`}}", "guest_os_type": "suse", "http_directory": "http", "iso_checksum": "{{user `iso_checksum`}}", @@ -122,7 +122,7 @@ "<enter><wait>" ], "boot_wait": "10s", - "disk_size": 20480, + "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "{{user `iso_checksum`}}", @@ -179,6 +179,7 @@ "box_basename": "sles-12", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", + "disk_size": "20480", "git_revision": "__unknown_git_revision__", "headless": "", "http_proxy": "{{env `http_proxy`}}", diff --git a/solaris-10.11-x86.json b/solaris-10.11-x86.json index 446c51eef..23c036146 100644 --- a/solaris-10.11-x86.json +++ b/solaris-10.11-x86.json @@ -11,7 +11,7 @@ "b" ], "boot_wait": "5s", - "disk_size": 20000, + "disk_size": "{{user `disk_size`}}", "floppy_files": [ "floppy/solaris10/sysidcfg", "floppy/solaris10/awesome_prof", @@ -62,7 +62,7 @@ "b" ], "boot_wait": "5s", - "disk_size": 20000, + "disk_size": "{{user `disk_size`}}", "floppy_files": [ "floppy/solaris10/sysidcfg", "floppy/solaris10/awesome_prof", @@ -124,6 +124,7 @@ "box_basename": "solaris-10.11", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", + "disk_size": "20000", "git_revision": "__unknown_git_revision__", "headless": "", "memory": "1536", diff --git a/solaris-11-x86.json b/solaris-11-x86.json index c1382fe83..0fca51534 100644 --- a/solaris-11-x86.json +++ b/solaris-11-x86.json @@ -29,7 +29,7 @@ "tail -f /var/svc/log/application-auto-installer\\:default.log<enter><wait>" ], "boot_wait": "5s", - "disk_size": 10360, + "disk_size": "{{user `disk_size`}}", "guest_additions_mode": "attach", "guest_os_type": "Solaris11_64", "headless": "{{ user `headless` }}", @@ -91,7 +91,7 @@ "tail -f /var/svc/log/application-auto-installer\\:default.log<enter><wait>" ], "boot_wait": "5s", - "disk_size": 10360, + "disk_size": "{{user `disk_size`}}", "guest_os_type": "solaris11-64", "headless": "{{ user `headless` }}", "http_directory": "http/solaris-11", @@ -146,6 +146,7 @@ "box_basename": "solaris-11.3", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", + "disk_size": "10360", "git_revision": "__unknown_git_revision__", "headless": "", "memory": "2048", diff --git a/ubuntu-10.04-amd64.json b/ubuntu-10.04-amd64.json index 8b6ce1a65..0f03f028c 100644 --- a/ubuntu-10.04-amd64.json +++ b/ubuntu-10.04-amd64.json @@ -26,7 +26,7 @@ "<enter><wait>" ], "boot_wait": "10s", - "disk_size": 40960, + "disk_size": "{{user `disk_size`}}", "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "guest_os_type": "Ubuntu_64", "hard_drive_interface": "sata", @@ -85,7 +85,7 @@ "<enter><wait>" ], "boot_wait": "10s", - "disk_size": 40960, + "disk_size": "{{user `disk_size`}}", "guest_os_type": "ubuntu-64", "headless": "{{ user `headless` }}", "http_directory": "http", @@ -133,7 +133,7 @@ "<enter><wait>" ], "boot_wait": "10s", - "disk_size": 40960, + "disk_size": "{{user `disk_size`}}", "guest_os_type": "ubuntu", "http_directory": "http", "iso_checksum": "{{user `iso_checksum`}}", @@ -190,7 +190,7 @@ "<enter><wait>" ], "boot_wait": "10s", - "disk_size": 40960, + "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "{{user `iso_checksum`}}", @@ -244,6 +244,7 @@ "box_basename": "ubuntu-10.04", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", + "disk_size": "40960", "git_revision": "__unknown_git_revision__", "headless": "", "http_proxy": "{{env `http_proxy`}}", diff --git a/ubuntu-10.04-i386.json b/ubuntu-10.04-i386.json index e57898aca..f72e6fc16 100644 --- a/ubuntu-10.04-i386.json +++ b/ubuntu-10.04-i386.json @@ -26,7 +26,7 @@ "<enter><wait>" ], "boot_wait": "10s", - "disk_size": 40960, + "disk_size": "{{user `disk_size`}}", "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "guest_os_type": "Ubuntu", "hard_drive_interface": "sata", @@ -85,7 +85,7 @@ "<enter><wait>" ], "boot_wait": "10s", - "disk_size": 40960, + "disk_size": "{{user `disk_size`}}", "guest_os_type": "ubuntu", "headless": "{{ user `headless` }}", "http_directory": "http", @@ -133,7 +133,7 @@ "<enter><wait>" ], "boot_wait": "10s", - "disk_size": 40960, + "disk_size": "{{user `disk_size`}}", "guest_os_type": "ubuntu", "http_directory": "http", "iso_checksum": "{{user `iso_checksum`}}", @@ -190,7 +190,7 @@ "<enter><wait>" ], "boot_wait": "10s", - "disk_size": 40960, + "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "{{user `iso_checksum`}}", @@ -244,6 +244,7 @@ "box_basename": "ubuntu-10.04-i386", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", + "disk_size": "40960", "git_revision": "__unknown_git_revision__", "headless": "", "http_proxy": "{{env `http_proxy`}}", diff --git a/ubuntu-12.04-amd64.json b/ubuntu-12.04-amd64.json index 7a6b1a386..70a1b92c1 100644 --- a/ubuntu-12.04-amd64.json +++ b/ubuntu-12.04-amd64.json @@ -26,7 +26,7 @@ "<enter><wait>" ], "boot_wait": "10s", - "disk_size": 40960, + "disk_size": "{{user `disk_size`}}", "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "guest_os_type": "Ubuntu_64", "hard_drive_interface": "sata", @@ -85,7 +85,7 @@ "<enter><wait>" ], "boot_wait": "10s", - "disk_size": 40960, + "disk_size": "{{user `disk_size`}}", "guest_os_type": "ubuntu-64", "headless": "{{ user `headless` }}", "http_directory": "http", @@ -133,7 +133,7 @@ "<enter><wait>" ], "boot_wait": "10s", - "disk_size": 40960, + "disk_size": "{{user `disk_size`}}", "guest_os_type": "ubuntu", "http_directory": "http", "iso_checksum": "{{user `iso_checksum`}}", @@ -190,7 +190,7 @@ "<enter><wait>" ], "boot_wait": "10s", - "disk_size": 40960, + "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "{{user `iso_checksum`}}", @@ -244,6 +244,7 @@ "box_basename": "ubuntu-12.04", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", + "disk_size": "40960", "git_revision": "__unknown_git_revision__", "headless": "", "http_proxy": "{{env `http_proxy`}}", diff --git a/ubuntu-12.04-i386.json b/ubuntu-12.04-i386.json index cd18219dc..f7d264780 100644 --- a/ubuntu-12.04-i386.json +++ b/ubuntu-12.04-i386.json @@ -26,7 +26,7 @@ "<enter><wait>" ], "boot_wait": "10s", - "disk_size": 40960, + "disk_size": "{{user `disk_size`}}", "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "guest_os_type": "Ubuntu", "hard_drive_interface": "sata", @@ -85,7 +85,7 @@ "<enter><wait>" ], "boot_wait": "10s", - "disk_size": 40960, + "disk_size": "{{user `disk_size`}}", "guest_os_type": "ubuntu", "headless": "{{ user `headless` }}", "http_directory": "http", @@ -133,7 +133,7 @@ "<enter><wait>" ], "boot_wait": "10s", - "disk_size": 40960, + "disk_size": "{{user `disk_size`}}", "guest_os_type": "ubuntu", "http_directory": "http", "iso_checksum": "{{user `iso_checksum`}}", @@ -190,7 +190,7 @@ "<enter><wait>" ], "boot_wait": "10s", - "disk_size": 40960, + "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "{{user `iso_checksum`}}", @@ -244,6 +244,7 @@ "box_basename": "ubuntu-12.04-i386", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", + "disk_size": "40960", "git_revision": "__unknown_git_revision__", "headless": "", "http_proxy": "{{env `http_proxy`}}", diff --git a/ubuntu-14.04-amd64.json b/ubuntu-14.04-amd64.json index 73c1dd97d..2c6dbeff4 100644 --- a/ubuntu-14.04-amd64.json +++ b/ubuntu-14.04-amd64.json @@ -26,7 +26,7 @@ "<enter><wait>" ], "boot_wait": "10s", - "disk_size": 40960, + "disk_size": "{{user `disk_size`}}", "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "guest_os_type": "Ubuntu_64", "hard_drive_interface": "sata", @@ -85,7 +85,7 @@ "<enter><wait>" ], "boot_wait": "10s", - "disk_size": 40960, + "disk_size": "{{user `disk_size`}}", "guest_os_type": "ubuntu-64", "headless": "{{ user `headless` }}", "http_directory": "http", @@ -133,7 +133,7 @@ "<enter><wait>" ], "boot_wait": "10s", - "disk_size": 40960, + "disk_size": "{{user `disk_size`}}", "guest_os_type": "ubuntu", "http_directory": "http", "iso_checksum": "{{user `iso_checksum`}}", @@ -190,7 +190,7 @@ "<enter><wait>" ], "boot_wait": "10s", - "disk_size": 40960, + "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "{{user `iso_checksum`}}", @@ -244,6 +244,7 @@ "box_basename": "ubuntu-14.04", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", + "disk_size": "40960", "git_revision": "__unknown_git_revision__", "headless": "", "http_proxy": "{{env `http_proxy`}}", diff --git a/ubuntu-14.04-i386.json b/ubuntu-14.04-i386.json index 27ef6e4b6..6535db6c4 100644 --- a/ubuntu-14.04-i386.json +++ b/ubuntu-14.04-i386.json @@ -26,7 +26,7 @@ "<enter><wait>" ], "boot_wait": "10s", - "disk_size": 40960, + "disk_size": "{{user `disk_size`}}", "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "guest_os_type": "Ubuntu", "hard_drive_interface": "sata", @@ -85,7 +85,7 @@ "<enter><wait>" ], "boot_wait": "10s", - "disk_size": 40960, + "disk_size": "{{user `disk_size`}}", "guest_os_type": "ubuntu", "headless": "{{ user `headless` }}", "http_directory": "http", @@ -133,7 +133,7 @@ "<enter><wait>" ], "boot_wait": "10s", - "disk_size": 40960, + "disk_size": "{{user `disk_size`}}", "guest_os_type": "ubuntu", "http_directory": "http", "iso_checksum": "{{user `iso_checksum`}}", @@ -190,7 +190,7 @@ "<enter><wait>" ], "boot_wait": "10s", - "disk_size": 40960, + "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "{{user `iso_checksum`}}", @@ -244,6 +244,7 @@ "box_basename": "ubuntu-14.04-i386", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", + "disk_size": "40960", "git_revision": "__unknown_git_revision__", "headless": "", "http_proxy": "{{env `http_proxy`}}", diff --git a/ubuntu-14.10-amd64.json b/ubuntu-14.10-amd64.json index 65897b2a4..5e7e013e1 100644 --- a/ubuntu-14.10-amd64.json +++ b/ubuntu-14.10-amd64.json @@ -26,7 +26,7 @@ "<enter><wait>" ], "boot_wait": "10s", - "disk_size": 40960, + "disk_size": "{{user `disk_size`}}", "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "guest_os_type": "Ubuntu_64", "hard_drive_interface": "sata", @@ -85,7 +85,7 @@ "<enter><wait>" ], "boot_wait": "10s", - "disk_size": 40960, + "disk_size": "{{user `disk_size`}}", "guest_os_type": "ubuntu-64", "headless": "{{ user `headless` }}", "http_directory": "http", @@ -133,7 +133,7 @@ "<enter><wait>" ], "boot_wait": "10s", - "disk_size": 40960, + "disk_size": "{{user `disk_size`}}", "guest_os_type": "ubuntu", "http_directory": "http", "iso_checksum": "{{user `iso_checksum`}}", @@ -190,7 +190,7 @@ "<enter><wait>" ], "boot_wait": "10s", - "disk_size": 40960, + "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "{{user `iso_checksum`}}", @@ -244,6 +244,7 @@ "box_basename": "ubuntu-14.10", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", + "disk_size": "40960", "git_revision": "__unknown_git_revision__", "headless": "", "http_proxy": "{{env `http_proxy`}}", diff --git a/ubuntu-14.10-i386.json b/ubuntu-14.10-i386.json index 913671a3a..23cb502ae 100644 --- a/ubuntu-14.10-i386.json +++ b/ubuntu-14.10-i386.json @@ -26,7 +26,7 @@ "<enter><wait>" ], "boot_wait": "10s", - "disk_size": 40960, + "disk_size": "{{user `disk_size`}}", "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "guest_os_type": "Ubuntu", "hard_drive_interface": "sata", @@ -85,7 +85,7 @@ "<enter><wait>" ], "boot_wait": "10s", - "disk_size": 40960, + "disk_size": "{{user `disk_size`}}", "guest_os_type": "ubuntu", "headless": "{{ user `headless` }}", "http_directory": "http", @@ -133,7 +133,7 @@ "<enter><wait>" ], "boot_wait": "10s", - "disk_size": 40960, + "disk_size": "{{user `disk_size`}}", "guest_os_type": "ubuntu", "http_directory": "http", "iso_checksum": "{{user `iso_checksum`}}", @@ -190,7 +190,7 @@ "<enter><wait>" ], "boot_wait": "10s", - "disk_size": 40960, + "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "{{user `iso_checksum`}}", @@ -244,6 +244,7 @@ "box_basename": "ubuntu-14.10-i386", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", + "disk_size": "40960", "git_revision": "__unknown_git_revision__", "headless": "", "http_proxy": "{{env `http_proxy`}}", diff --git a/ubuntu-15.04-amd64.json b/ubuntu-15.04-amd64.json index ba15126a6..38d9522cd 100644 --- a/ubuntu-15.04-amd64.json +++ b/ubuntu-15.04-amd64.json @@ -27,7 +27,7 @@ "<enter><wait>" ], "boot_wait": "10s", - "disk_size": 40960, + "disk_size": "{{user `disk_size`}}", "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "guest_os_type": "Ubuntu_64", "hard_drive_interface": "sata", @@ -87,7 +87,7 @@ "<enter><wait>" ], "boot_wait": "10s", - "disk_size": 40960, + "disk_size": "{{user `disk_size`}}", "guest_os_type": "ubuntu-64", "headless": "{{ user `headless` }}", "http_directory": "http", @@ -136,7 +136,7 @@ "<enter><wait>" ], "boot_wait": "10s", - "disk_size": 40960, + "disk_size": "{{user `disk_size`}}", "guest_os_type": "ubuntu", "http_directory": "http", "iso_checksum": "{{user `iso_checksum`}}", @@ -194,7 +194,7 @@ "<enter><wait>" ], "boot_wait": "10s", - "disk_size": 40960, + "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "{{user `iso_checksum`}}", @@ -248,6 +248,7 @@ "box_basename": "ubuntu-15.04", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", + "disk_size": "40960", "git_revision": "__unknown_git_revision__", "headless": "", "http_proxy": "{{env `http_proxy`}}", diff --git a/ubuntu-15.04-i386.json b/ubuntu-15.04-i386.json index a152caf77..43e9f732d 100644 --- a/ubuntu-15.04-i386.json +++ b/ubuntu-15.04-i386.json @@ -27,7 +27,7 @@ "<enter><wait>" ], "boot_wait": "10s", - "disk_size": 40960, + "disk_size": "{{user `disk_size`}}", "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "guest_os_type": "Ubuntu", "hard_drive_interface": "sata", @@ -87,7 +87,7 @@ "<enter><wait>" ], "boot_wait": "10s", - "disk_size": 40960, + "disk_size": "{{user `disk_size`}}", "guest_os_type": "ubuntu", "headless": "{{ user `headless` }}", "http_directory": "http", @@ -136,7 +136,7 @@ "<enter><wait>" ], "boot_wait": "10s", - "disk_size": 40960, + "disk_size": "{{user `disk_size`}}", "guest_os_type": "ubuntu", "http_directory": "http", "iso_checksum": "{{user `iso_checksum`}}", @@ -194,7 +194,7 @@ "<enter><wait>" ], "boot_wait": "10s", - "disk_size": 40960, + "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "{{user `iso_checksum`}}", @@ -248,6 +248,7 @@ "box_basename": "ubuntu-15.04-i386", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", + "disk_size": "40960", "git_revision": "__unknown_git_revision__", "headless": "", "http_proxy": "{{env `http_proxy`}}", diff --git a/ubuntu-15.10-amd64.json b/ubuntu-15.10-amd64.json index 7f1aedaf2..bd3bb4f81 100644 --- a/ubuntu-15.10-amd64.json +++ b/ubuntu-15.10-amd64.json @@ -28,7 +28,7 @@ "<enter><wait>" ], "boot_wait": "10s", - "disk_size": 40960, + "disk_size": "{{user `disk_size`}}", "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "guest_os_type": "Ubuntu_64", "hard_drive_interface": "sata", @@ -89,7 +89,7 @@ "<enter><wait>" ], "boot_wait": "10s", - "disk_size": 40960, + "disk_size": "{{user `disk_size`}}", "guest_os_type": "ubuntu-64", "headless": "{{ user `headless` }}", "http_directory": "http", @@ -140,7 +140,7 @@ "<enter><wait>" ], "boot_wait": "10s", - "disk_size": 40960, + "disk_size": "{{user `disk_size`}}", "guest_os_type": "ubuntu", "http_directory": "http", "iso_checksum": "{{user `iso_checksum`}}", @@ -199,7 +199,7 @@ "<enter><wait>" ], "boot_wait": "10s", - "disk_size": 40960, + "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "{{user `iso_checksum`}}", @@ -253,6 +253,7 @@ "box_basename": "ubuntu-15.10", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", + "disk_size": "40960", "git_revision": "__unknown_git_revision__", "headless": "", "http_proxy": "{{env `http_proxy`}}", diff --git a/ubuntu-15.10-i386.json b/ubuntu-15.10-i386.json index a9db02cfd..c844423f6 100644 --- a/ubuntu-15.10-i386.json +++ b/ubuntu-15.10-i386.json @@ -28,7 +28,7 @@ "<enter><wait>" ], "boot_wait": "10s", - "disk_size": 40960, + "disk_size": "{{user `disk_size`}}", "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "guest_os_type": "Ubuntu", "hard_drive_interface": "sata", @@ -89,7 +89,7 @@ "<enter><wait>" ], "boot_wait": "10s", - "disk_size": 40960, + "disk_size": "{{user `disk_size`}}", "guest_os_type": "ubuntu", "headless": "{{ user `headless` }}", "http_directory": "http", @@ -140,7 +140,7 @@ "<enter><wait>" ], "boot_wait": "10s", - "disk_size": 40960, + "disk_size": "{{user `disk_size`}}", "guest_os_type": "ubuntu", "http_directory": "http", "iso_checksum": "{{user `iso_checksum`}}", @@ -199,7 +199,7 @@ "<enter><wait>" ], "boot_wait": "10s", - "disk_size": 40960, + "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "{{user `iso_checksum`}}", @@ -253,6 +253,7 @@ "box_basename": "ubuntu-15.10-i386", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", + "disk_size": "40960", "git_revision": "__unknown_git_revision__", "headless": "", "http_proxy": "{{env `http_proxy`}}", diff --git a/ubuntu-16.04-amd64.json b/ubuntu-16.04-amd64.json index de0af80ed..9c0dee88f 100644 --- a/ubuntu-16.04-amd64.json +++ b/ubuntu-16.04-amd64.json @@ -28,7 +28,7 @@ "<enter><wait>" ], "boot_wait": "10s", - "disk_size": 40960, + "disk_size": "{{user `disk_size`}}", "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "guest_os_type": "Ubuntu_64", "hard_drive_interface": "sata", @@ -89,7 +89,7 @@ "<enter><wait>" ], "boot_wait": "10s", - "disk_size": 40960, + "disk_size": "{{user `disk_size`}}", "guest_os_type": "ubuntu-64", "headless": "{{ user `headless` }}", "http_directory": "http", @@ -140,7 +140,7 @@ "<enter><wait>" ], "boot_wait": "10s", - "disk_size": 40960, + "disk_size": "{{user `disk_size`}}", "guest_os_type": "ubuntu", "http_directory": "http", "iso_checksum": "{{user `iso_checksum`}}", @@ -199,7 +199,7 @@ "<enter><wait>" ], "boot_wait": "10s", - "disk_size": 40960, + "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "{{user `iso_checksum`}}", @@ -253,6 +253,7 @@ "box_basename": "ubuntu-16.04", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", + "disk_size": "40960", "git_revision": "__unknown_git_revision__", "headless": "", "http_proxy": "{{env `http_proxy`}}", diff --git a/ubuntu-16.04-i386.json b/ubuntu-16.04-i386.json index 181173cda..22b86dc61 100644 --- a/ubuntu-16.04-i386.json +++ b/ubuntu-16.04-i386.json @@ -28,7 +28,7 @@ "<enter><wait>" ], "boot_wait": "10s", - "disk_size": 40960, + "disk_size": "{{user `disk_size`}}", "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "guest_os_type": "Ubuntu", "hard_drive_interface": "sata", @@ -89,7 +89,7 @@ "<enter><wait>" ], "boot_wait": "10s", - "disk_size": 40960, + "disk_size": "{{user `disk_size`}}", "guest_os_type": "ubuntu", "headless": "{{ user `headless` }}", "http_directory": "http", @@ -140,7 +140,7 @@ "<enter><wait>" ], "boot_wait": "10s", - "disk_size": 40960, + "disk_size": "{{user `disk_size`}}", "guest_os_type": "ubuntu", "http_directory": "http", "iso_checksum": "{{user `iso_checksum`}}", @@ -199,7 +199,7 @@ "<enter><wait>" ], "boot_wait": "10s", - "disk_size": 40960, + "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "{{user `iso_checksum`}}", @@ -253,6 +253,7 @@ "box_basename": "ubuntu-16.04-i386", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", + "disk_size": "40960", "git_revision": "__unknown_git_revision__", "headless": "", "http_proxy": "{{env `http_proxy`}}", diff --git a/windows-nano-tp3.json b/windows-nano-tp3.json index 03b9cd3af..2c0ea7066 100644 --- a/windows-nano-tp3.json +++ b/windows-nano-tp3.json @@ -1,7 +1,7 @@ { "builders": [{ "communicator": "winrm", - "disk_size": 61440, + "disk_size": "{{user `disk_size`}}", "floppy_files": [ "scripts/windows/Autounattend.xml", "scripts/windows/nano_create.ps1", @@ -68,6 +68,7 @@ "box_basename": "windows-nano", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "2", + "disk_size": "61440", "git_revision": "__unknown_git_revision__", "headless": "", "iso_checksum": "7003c2a4f9abe672c570ff018fbf3a27", From dba570e78c5c5ce531cadb41218f4f4a220658eb Mon Sep 17 00:00:00 2001 From: Seth Thomas <sthomas@chef.io> Date: Mon, 16 May 2016 15:43:01 -0700 Subject: [PATCH 0499/1622] Fix vmware vmtools by removing errant character --- scripts/common/vmtools.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/common/vmtools.sh b/scripts/common/vmtools.sh index 2268653ba..0d9880fd1 100644 --- a/scripts/common/vmtools.sh +++ b/scripts/common/vmtools.sh @@ -27,7 +27,7 @@ vmware-iso|vmware-vmx) TOOLS_PATH="`ls /tmp/vmware/VMwareTools-*.tar.gz`"; VER="`echo "${TOOLS_PATH}" | cut -f2 -d'-'`"; - MAJ_VER="`echo ${VER} | cut -d '.' -f 1)`"; + MAJ_VER="`echo ${VER} | cut -d '.' -f 1`"; echo "VMware Tools Version: $VER"; From 559c4819f6cfd23ab80a74cf29d651008c612fc7 Mon Sep 17 00:00:00 2001 From: Seth Thomas <cheeseplus@getchef.io> Date: Tue, 17 May 2016 11:43:16 -0700 Subject: [PATCH 0500/1622] Making bash shebang portable for future builders --- build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sh b/build.sh index 79a41278a..940cf507d 100644 --- a/build.sh +++ b/build.sh @@ -1,4 +1,4 @@ -#!/usr/local/bin/bash +#!/usr/bin/env bash set -eo pipefail From 5bbafac9422be7bc7dba7af199e786d381603913 Mon Sep 17 00:00:00 2001 From: Seth Thomas <cheeseplus@getchef.io> Date: Wed, 18 May 2016 13:37:24 -0700 Subject: [PATCH 0501/1622] Choose kitchen driver based on available vagrant plugins --- Rakefile | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/Rakefile b/Rakefile index 3a92e6bea..1c00aeefd 100644 --- a/Rakefile +++ b/Rakefile @@ -241,7 +241,18 @@ def test_box(boxname, providers) destroy_all_bento - provider = 'vmware_fusion' if provider == 'vmware_desktop' + plugin_list = Mixlib::ShellOut.new("vagrant plugin list | awk '{print $1}'") + plugin_list.run_command + plugins = plugin_list.stdout.split("\n") + + if provider == 'vmware_desktop' + case + when plugins.include?('vagrant-vmware-workstation') + provider = 'vmware_workstation' + when plugins.include?('vagrant-vmware-fusion') + provider = 'vmware_fusion' + end + end share_disabled = /omnios.*|freebsd.*/ === boxname ? true : false From a562dd227d44469a9d86a3ccb08e096a8789b3b3 Mon Sep 17 00:00:00 2001 From: Seth Thomas <cheeseplus@getchef.io> Date: Wed, 18 May 2016 13:44:38 -0700 Subject: [PATCH 0502/1622] Updating script to be a lil more informative and correct --- build.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/build.sh b/build.sh index 940cf507d..1c6d39882 100644 --- a/build.sh +++ b/build.sh @@ -2,10 +2,10 @@ set -eo pipefail -env - source ~/.bashrc +env + function inline_image { printf '\033]1338;url='%s';alt='%s'\a\n' "$1" "$2" } @@ -49,7 +49,7 @@ do prlctl unregister "$i" done -echo "--- Cleaning up after Fusion" +echo "--- Cleaning up after VMware" for i in $(vmrun list | grep -v "Total") do From 75d57abd19cbea46d99869a6ce9f86f07c5f6d16 Mon Sep 17 00:00:00 2001 From: Seth Thomas <cheeseplus@getchef.io> Date: Thu, 19 May 2016 18:47:44 -0700 Subject: [PATCH 0503/1622] Move all the logic out of Rakefile and into bin/bento --- Rakefile | 366 ++++----------------------------------- bin/bento | 501 ++++++++++++++++++++++++++++++++++++++++++++++++++++-- build.sh | 5 +- 3 files changed, 517 insertions(+), 355 deletions(-) diff --git a/Rakefile b/Rakefile index 1c00aeefd..dc6c29090 100644 --- a/Rakefile +++ b/Rakefile @@ -1,15 +1,10 @@ -require 'cgi' require 'json' -require 'net/http' -require 'kitchen' -require 'aws-sdk' -require 'mixlib/shellout' # TODO: private boxes may need to specify a mirror # Enables `bundle exec rake do_all[ubuntu-12.04-amd64,centos-7.1-x86_64] # http://blog.stevenocchipinti.com/2013/10/18/rake-task-with-an-arbitrary-number-of-arguments/ -task :do_all do |task, args| +task :do_all do |_task, args| args.extras.each do |a| # build stage Rake::Task['build_box'].invoke(a) @@ -29,170 +24,53 @@ task :do_all do |task, args| Rake::Task['release_all'].reenable end -desc 'Build a bento template' -task :build_box, :template do |t, args| - sh "#{build_command(args[:template])}" -end - desc 'Test all boxes with Test Kitchen' task :test_all do - metadata_files.each do |metadata_file| - puts "Processing #{metadata_file} for test." - Rake::Task['test_box'].invoke(metadata_file) - Rake::Task['test_box'].reenable - end -end - -desc 'Test a box with Test Kitchen' -task :test_box, :metadata_file do |f, args| - metadata = box_metadata(args[:metadata_file]) - test_box(metadata['name'], metadata['providers']) + sh './bin/bento test' end -desc 'Upload all boxes to Atlas for all providers' +desc 'Upload all boxes to Atlas and S3 for all providers' task :upload_all do - metadata_files.each do |metadata_file| - puts "Processing #{metadata_file} for upload." - Rake::Task['upload_box'].invoke(metadata_file) - Rake::Task['upload_box'].reenable - end -end - -desc 'Upload box files for a single platform to Atlas for all providers' -task :upload_box, :metadata_file do |f, args| - metadata = box_metadata(args[:metadata_file]) - create_box(metadata['name']) - create_box_version(metadata['name'], metadata['version']) - create_providers(metadata['name'], metadata['version'], metadata['providers'].keys) - upload_to_atlas(metadata['name'], metadata['version'], metadata['providers']) + sh './bin/bento upload' end -desc 'Upload all boxes to S3 for all providers' -task :upload_all_s3 do - metadata_files.each do |metadata_file| - puts "Processing #{metadata_file} for upload." - Rake::Task['upload_box_s3'].invoke(metadata_file) - Rake::Task['upload_box_s3'].reenable - end -end - -desc 'Upload box files to S3 for all providers' -task :upload_box_s3, :metadata_file do |f, args| - metadata = box_metadata(args[:metadata_file]) - upload_to_s3(metadata['name'], metadata['version'], metadata['providers']) -end - -desc 'Release all boxes for a given version' +desc 'Release all' task :release_all do metadata_files.each do |metadata_file| - puts "Processing #{metadata_file} for release." metadata = box_metadata(metadata_file) - release_version(metadata['name'], metadata['version']) + Rake::Task['release'].invoke(metadata['name'], metadata['version']) + Rake::Task['release'].reenable end end -desc 'Revoke all boxes for a version' -task :revoke_all, :version do |v, args| - revoke_version(args[:version]) -end - -desc 'Delete all boxes for a version' -task :delete_all, :version do |v, args| - delete_version(args[:version]) -end - -desc 'Clean the build directory' -task :clean do - puts 'Removing builds/*.{box,json}' - `rm -rf builds/*.{box,json}` - puts 'Removing packer-* directories' - `rm -rf packer-*` - puts 'Removing .kitchen.*.yml' - `rm -f .kitchen.*.yml` -end - -def atlas_api - @atlas_api ||= 'https://atlas.hashicorp.com/api/v1' -end - -def atlas_org - @atlas_org ||= ENV['ATLAS_ORG'] -end - -def atlas_token - @atlas_token ||= ENV['ATLAS_TOKEN'] +desc 'Build a bento template' +task :build_box, :template do |_, args| + sh build_command(args[:template]) end -def class_for_request(verb) - Net::HTTP.const_get(verb.to_s.capitalize) +desc 'Release a version of a box' +task :release, [:boxname, :version] do |_, args| + sh "./bin/bento release #{args[:boxname]} #{args[:version]}" end -def build_uri(verb, path, params = {}) - if %w(delete, get).include?(verb) - path = [path, to_query_string(params)].compact.join('?') - end - # Parse the URI - uri = URI.parse(path) - - # Don't merge absolute URLs - uri = URI.parse(File.join(endpoint, path)) unless uri.absolute? - - # Return the URI object - uri +desc 'Revoke a version of a box' +task :revoke, [:boxname, :version] do |_, args| + sh "./bin/bento revoke #{args[:boxname]} #{args[:version]}" end -def to_query_string(hash) - hash.map do |key, value| - "#{CGI.escape(key)}=#{CGI.escape(value)}" - end.join('&')[/.+/] +desc 'Delete a version of a box' +task :delete, [:boxname, :version] do |_, args| + sh "./bin/bento delete #{args[:boxname]} #{args[:version]}" end -def request(verb, url, data = {}, headers = {}) - uri = build_uri(verb, url, data) - - # Build the request. - request = class_for_request(verb).new(uri.request_uri) - if %w(patch post put delete).include?(verb) - if data.respond_to?(:read) - request.content_length = data.size - request.body_stream = data - elsif data.is_a?(Hash) - request.form_data = data - else - request.body = data - end - end - - # Add headers - headers.each do |key, value| - request.add_field(key, value) - end - - connection = Net::HTTP.new(uri.host, uri.port) - - if uri.scheme == 'https' - require 'net/https' unless defined?(Net::HTTPS) - - # Turn on SSL - connection.use_ssl = true - connection.verify_mode = OpenSSL::SSL::VERIFY_PEER - end - - connection.start do |http| - response = http.request(request) - - case response - when Net::HTTPRedirection - redirect = URI.parse(response['location']) - request(verb, redirect, data, headers) - else - response - end - end +desc 'Clean the build directory' +task :clean do + puts 'Cleaning up...' + `rm -rf builds/*.json builds/*.box packer-* .kitchen.*.yml` end def box_metadata(metadata_file) - metadata = Hash.new + metadata = {} file = File.read(metadata_file) json = JSON.parse(file) @@ -200,7 +78,7 @@ def box_metadata(metadata_file) metadata['name'] = json['name'] metadata['version'] = json['version'] metadata['box_basename'] = json['box_basename'] - metadata['providers'] = Hash.new + metadata['providers'] = {} json['providers'].each do |provider| metadata['providers'][provider['name']] = provider.reject { |k, _| k == 'name' } end @@ -208,11 +86,12 @@ def box_metadata(metadata_file) end def build_command(template) - cmd = %W[./bin/bento build #{template}] + cmd = %W(./bin/bento build #{template}) cmd.insert(2, "--only #{ENV['BENTO_PROVIDERS']}") if ENV['BENTO_PROVIDERS'] - cmd.insert(2, "--mirror #{ENV['PACKER_MIRROR']}") if private?(template) + cmd.insert(2, "--mirror #{ENV['PACKER_MIRROR']}") if ENV['PACKER_MIRROR'] cmd.insert(2, "--version #{ENV['BENTO_VERSION']}") if ENV['BENTO_VERSION'] - cmd.join(" ") + cmd.insert(2, "--headless") + cmd.join(' ') end def metadata_files @@ -223,195 +102,14 @@ def compute_metadata_files `ls builds/*.json`.split("\n") end -def destroy_all_bento - cmd = Mixlib::ShellOut.new("vagrant box list | grep 'bento-'") - cmd.run_command - boxes = cmd.stdout.split("\n") - - boxes.each do | box | - b = box.split(" ") - rm_cmd = Mixlib::ShellOut.new("vagrant box remove --force #{b[0]} --provider #{b[1].to_s.gsub(/(,|\()/, '')}") - puts "Removing #{b[0]} for provider #{b[1].to_s.gsub(/(,|\()/, '')}" - rm_cmd.run_command - end -end - -def test_box(boxname, providers) - providers.each do |provider, provider_data| - - destroy_all_bento - - plugin_list = Mixlib::ShellOut.new("vagrant plugin list | awk '{print $1}'") - plugin_list.run_command - plugins = plugin_list.stdout.split("\n") - - if provider == 'vmware_desktop' - case - when plugins.include?('vagrant-vmware-workstation') - provider = 'vmware_workstation' - when plugins.include?('vagrant-vmware-fusion') - provider = 'vmware_fusion' - end - end - - share_disabled = /omnios.*|freebsd.*/ === boxname ? true : false - - puts "Testing provider #{provider} for #{boxname}" - kitchen_cfg = {"provisioner"=>{"name"=>"chef_zero", "data_path"=>"test/fixtures"}, - "platforms"=> - [{"name"=>"#{boxname}-#{provider}", - "driver"=> - {"name"=>"vagrant", - #"synced_folders"=>[[".", "/vagrant", "disabled: #{share_disabled}"]], - "provider"=>provider, - "box"=>"bento-#{boxname}", - "box_url"=>"file://#{ENV['PWD']}/builds/#{provider_data['file']}"}}], - "suites"=>[{"name"=>"default", "run_list"=>nil, "attributes"=>{}}]} - - File.open(".kitchen.#{provider}.yml", "w") {|f| f.write(kitchen_cfg.to_yaml) } - - Kitchen.logger = Kitchen.default_file_logger - @loader = Kitchen::Loader::YAML.new(project_config: "./.kitchen.#{provider}.yml") - config = Kitchen::Config.new(loader: @loader) - config.instances.each do |instance| - instance.test(:always) - end - end -end - -def create_box(boxname) - req = request('get', "#{atlas_api}/box/#{atlas_org}/#{boxname}", { 'box[username]' => atlas_org, 'access_token' => atlas_token } ) - if req.code.eql?('404') - if private?(boxname) - puts "Creating the private box #{boxname} in atlas." - req = request('post', "#{atlas_api}/boxes", { 'box[name]' => boxname, 'box[username]' => atlas_org, 'access_token' => atlas_token, 'is_private' => true }, { 'Content-Type' => 'application/json' } ) - else - puts "Creating the public box #{boxname} in atlas." - req = request('post', "#{atlas_api}/boxes", { 'box[name]' => boxname, 'box[username]' => atlas_org, 'access_token' => atlas_token, 'is_private' => false }, { 'Content-Type' => 'application/json' } ) - end - else - puts "The box #{boxname} exists in atlas, continuing." - end -end - -def create_box_version(boxname, version) - req = request('post', "#{atlas_api}/box/#{atlas_org}/#{boxname}/versions", { 'version[version]' => version, 'access_token' => atlas_token },{ 'Content-Type' => 'application/json' } ) - - puts "Created box version #{boxname} #{version}." if req.code == '200' - puts "Box version #{boxname} #{version} already exists, continuing." if req.code == '422' -end - -def create_providers(boxname, version, provider_names) - provider_names.each do |provider| - puts "Creating provider #{provider} for #{boxname} #{version}" - req = request('post', "#{atlas_api}/box/#{atlas_org}/#{boxname}/version/#{version}/providers", { 'provider[name]' => provider, 'access_token' => atlas_token }, { 'Content-Type' => 'application/json' } ) - puts "Created #{provider} for #{boxname} #{version}" if req.code == '200' - puts "Provider #{provider} for #{boxname} #{version} already exists, continuing." if req.code == '422' - end -end - -def upload_to_s3(boxname, version, providers) - providers.each do |provider, provider_data| - boxfile = provider_data['file'] - provider = 'vmware' if provider == 'vmware_desktop' - box_path = "vagrant/#{provider}/opscode_#{boxname}_chef-provisionerless.box" - credentials = Aws::Credentials.new(ENV['AWS_ACCESS_KEY_ID'], ENV['AWS_SECRET_ACCESS_KEY']) - - s3 = Aws::S3::Resource.new(credentials: credentials, endpoint: 'https://s3.amazonaws.com') - puts "Uploading box: #{boxname} provider: #{provider}" - s3_object = s3.bucket('opscode-vm-bento').object(box_path) - s3_object.upload_file("builds/#{boxfile}", acl:'public-read') - puts "Uploaded to #{s3_object.public_url}" - end -end - -def upload_to_atlas(boxname, version, providers) - # Extract the upload path - providers.each do |provider, provider_data| - boxfile = provider_data['file'] - # Get the upload path. - req = request('get', "#{atlas_api}/box/#{atlas_org}/#{boxname}/version/#{version}/provider/#{provider}/upload?access_token=#{atlas_token}") - upload_path = JSON.parse(req.body)['upload_path'] - token = JSON.parse(req.body)['token'] - - # Upload the box. - puts "Uploading the box #{boxfile} to atlas box: #{boxname}, version: #{version}, provider: #{provider}, upload path: #{upload_path}" - upload_request = request('put', upload_path, File.open("builds/#{boxfile}")) - - # Verify the download token - req = request('get', "#{atlas_api}/box/#{atlas_org}/#{boxname}/version/#{version}/provider/#{provider}?access_token=#{atlas_token}") - hosted_token = JSON.parse(req.body)['hosted_token'] - - if token == hosted_token - puts "Successful upload of box #{boxfile} to atlas box: #{boxname}, version: #{version}, provider: #{provider}" - else - puts "Failed upload due to non-matching tokens of box #{boxfile} to atlas box: #{boxname}, version: #{version}, provider: #{provider}" - # need to fail the rake task - end - end -end - -def release_version(boxname, version) - puts "Releasing version #{version} of box #{boxname}" - req = request('put', "#{atlas_api}/box/#{atlas_org}/#{boxname}/version/#{version}/release", { 'access_token' => atlas_token }, { 'Content-Type' => 'application/json' }) - puts "Version #{version} of box #{boxname} has been successfully released" if req.code == '200' -end - -def revoke_version(version) - org = request('get', "#{atlas_api}/user/#{atlas_org}?access_token=#{atlas_token}") - boxes = JSON.parse(org.body)['boxes'] - - boxes.each do |b| - b['versions'].each do |v| - if v['version'] == ENV['BENTO_VERSION'] - puts "Revoking version #{v['version']} of box #{b['name']}" - req = request('put', v['revoke_url'], { 'access_token' => atlas_token }, { 'Content-Type' => 'application/json' }) - if req.code == '200' - puts "Version #{v['version']} of box #{b['name']} has been successfully revoked" - else - puts "Something went wrong #{req.code}" - end - end - end - end -end - -def delete_version(version) - org = request('get', "#{atlas_api}/user/#{atlas_org}?access_token=#{atlas_token}") - boxes = JSON.parse(org.body)['boxes'] - - boxes.each do |b| - b['versions'].each do |v| - if v['version'] == ENV['BENTO_VERSION'] - puts "Deleting version #{v['version']} of box #{b['name']}" - puts "#{atlas_api}/box/#{atlas_org}/#{b['name']}/version/#{v['version']}" - req = request('delete', "#{atlas_api}/box/#{atlas_org}/#{b['name']}/version/#{v['version']}", { 'access_token' => atlas_token }, { 'Content-Type' => 'application/json' }) - if req.code == '200' - puts "Version #{v['version']} of box #{b['name']} has been successfully deleted" - else - puts "Something went wrong #{req.code} #{req.body}" - end - end - end - end -end - # http://stackoverflow.com/questions/2108727/which-in-ruby-checking-if-program-exists-in-path-from-ruby def which(cmd) exts = ENV['PATHEXT'] ? ENV['PATHEXT'].split(';') : [''] ENV['PATH'].split(File::PATH_SEPARATOR).each do |path| - exts.each { |ext| + exts.each do |ext| exe = File.join(path, "#{cmd}#{ext}") return exe if File.executable?(exe) && !File.directory?(exe) - } + end end - return false -end - -# -# private boxes -# -def private?(boxname) - proprietary_os_list = %w(macosx sles solaris windows) - proprietary_os_list.any? { |p| boxname.include?(p) } + false end diff --git a/bin/bento b/bin/bento index e541a23f5..f8916839e 100755 --- a/bin/bento +++ b/bin/bento @@ -6,12 +6,16 @@ Signal.trap("INT") { exit 1 } $stdout.sync = true $stderr.sync = true -require "benchmark" -require "digest" -require "json" -require "optparse" -require "ostruct" -require "tempfile" +require 'benchmark' +require 'digest' +require 'json' +require 'optparse' +require 'ostruct' +require 'tempfile' +require 'net/http' +require 'aws-sdk' +require 'kitchen' +require 'mixlib/shellout' class Options @@ -25,10 +29,15 @@ class Options opts.banner = "Usage: #{NAME} [SUBCOMMAND [options]]" opts.separator "" opts.separator <<-COMMANDS.gsub(/^ {8}/, "") - build : build one or more templates - help : prints this help message - list : list all templates in project - normalize : normalize one or more templates + build : build one or more templates + help : prints this help message + list : list all templates in project + normalize : normalize one or more templates + test : test one or more builds with kitchen + upload : upload one or more builds to Atlas and S3 + release : release a version of a box on Atlas + revoke : revoke a version of a box on Atlas + delete : delete a version of a box from Atlas COMMANDS end @@ -43,6 +52,11 @@ class Options end } + box_version_argv_proc = proc { |options| + options.box = ARGV[0] + options.version = ARGV[1] + } + subcommand = { help: { parser: OptionParser.new {}, @@ -76,12 +90,23 @@ class Options options.mirror = opt end + opts.on("-H", "--headless", "Run providers as headless") do |opt| + options.headless = opt + end + opts.on("-v VERSION", "--version VERSION", "Override the version set in the template") do |opt| options.override_version = opt end }, argv: templates_argv_proc }, + list: { + class: ListRunner, + parser: OptionParser.new { |opts| + opts.banner = "Usage: #{NAME} list [TEMPLATE ...]" + }, + argv: templates_argv_proc + }, normalize: { class: NormalizeRunner, parser: OptionParser.new { |opts| @@ -90,16 +115,47 @@ class Options opts.on("-d", "--[no-]debug", "Run packer with debug output") do |opt| options.debug = opt end - }, argv: templates_argv_proc }, - list: { - class: ListRunner, + test: { + class: TestRunner, parser: OptionParser.new { |opts| - opts.banner = "Usage: #{NAME} list [TEMPLATE ...]" + opts.banner = "Usage: #{NAME} test [options]" + + opts.on("-f", "--shared-folder", "Enable shared folder") do |opt| + options.shared_folder = opt + end }, - argv: templates_argv_proc + argv: box_version_argv_proc + }, + upload: { + class: UploadRunner, + parser: OptionParser.new { |opts| + opts.banner = "Usage: #{NAME} upload" + }, + argv: box_version_argv_proc + }, + release: { + class: ReleaseRunner, + parser: OptionParser.new { |opts| + opts.banner = "Usage: #{NAME} release BOX VERSION" + }, + argv: box_version_argv_proc + }, + revoke: { + class: RevokeRunner, + parser: OptionParser.new { |opts| + opts.banner = "Usage: #{NAME} revoke BOX VERSION" + }, + argv: box_version_argv_proc + }, + delete: { + class: DeleteRunner, + parser: OptionParser.new { |opts| + opts.banner = "Usage: #{NAME} delete BOX VERSION" + }, + argv: box_version_argv_proc } } @@ -144,6 +200,127 @@ module Common seconds = (total - (minutes * 60)) format("%dm%.2fs", minutes, seconds) end + + def box_metadata(metadata_file) + metadata = Hash.new + file = File.read(metadata_file) + json = JSON.parse(file) + + # metadata needed for upload: boxname, version, provider, box filename + metadata['name'] = json['name'] + metadata['version'] = json['version'] + metadata['box_basename'] = json['box_basename'] + metadata['providers'] = Hash.new + json['providers'].each do |provider| + metadata['providers'][provider['name']] = provider.reject { |k, _| k == 'name' } + end + metadata + end + + def metadata_files + @metadata_files ||= compute_metadata_files + end + + def compute_metadata_files + `ls builds/*.json`.split("\n") + end + + def atlas_api + @atlas_api ||= 'https://atlas.hashicorp.com/api/v1' + end + + def atlas_org + @atlas_org ||= ENV['ATLAS_ORG'] + end + + def atlas_token + @atlas_token ||= ENV['ATLAS_TOKEN'] + end + + def s3_endpoint + @s3_endpoint ||= ENV['BENTO_S3_ENDPOINT'] + end + + def s3_bucket + @s3_bucket ||= ENV['BENTO_S3_BUCKET'] + end + + def private_box?(boxname) + proprietary_os_list = %w(macosx sles solaris windows) + proprietary_os_list.any? { |p| boxname.include?(p) } + end +end + +module HttpStuff + + def class_for_request(verb) + Net::HTTP.const_get(verb.to_s.capitalize) + end + + def build_uri(verb, path, params = {}) + if %w(delete, get).include?(verb) + path = [path, to_query_string(params)].compact.join('?') + end + + # Parse the URI + uri = URI.parse(path) + + # Don't merge absolute URLs + uri = URI.parse(File.join(endpoint, path)) unless uri.absolute? + + # Return the URI object + uri + end + + def to_query_string(hash) + hash.map do |key, value| + "#{CGI.escape(key)}=#{CGI.escape(value)}" + end.join('&')[/.+/] + end + + def request(verb, url, data = {}, headers = {}) + uri = build_uri(verb, url, data) + + # Build the request. + request = class_for_request(verb).new(uri.request_uri) + if %w(patch post put delete).include?(verb) + if data.respond_to?(:read) + request.content_length = data.size + request.body_stream = data + elsif data.is_a?(Hash) + request.form_data = data + else + request.body = data + end + end + + # Add headers + headers.each do |key, value| + request.add_field(key, value) + end + + connection = Net::HTTP.new(uri.host, uri.port) + + if uri.scheme == 'https' + require 'net/https' unless defined?(Net::HTTPS) + + # Turn on SSL + connection.use_ssl = true + connection.verify_mode = OpenSSL::SSL::VERIFY_PEER + end + + connection.start do |http| + response = http.request(request) + + case response + when Net::HTTPRedirection + redirect = URI.parse(response['location']) + request(verb, redirect, data, headers) + else + response + end + end + end end module PackerExec @@ -184,7 +361,7 @@ class BuildRunner include Common include PackerExec - attr_reader :templates, :dry_run, :debug, :builds, :except, :mirror, :override_version, :build_timestamp + attr_reader :templates, :dry_run, :debug, :builds, :except, :mirror, :headless, :override_version, :build_timestamp def initialize(opts) @templates = opts.templates @@ -193,6 +370,7 @@ class BuildRunner @builds = opts.builds @except = opts.except @mirror = opts.mirror + @headless = opts.headless @override_version = opts.override_version @build_timestamp = Time.now.gmtime.strftime("%Y%m%d%H%M%S") end @@ -221,7 +399,6 @@ class BuildRunner def packer_build_cmd(template, var_file) vars = "#{template}.variables.json" - headless = !(RUBY_PLATFORM =~ /darwin/) cmd = %W[packer build -var-file=#{var_file} #{template}.json] cmd.insert(2, "-var-file=#{vars}") if File.exist?(vars) cmd.insert(2, "-only=#{builds}") if builds @@ -331,6 +508,296 @@ class NormalizeRunner end end +class TestRunner + include Common + + attr_reader :shared_folder + + def initialize(opts) + @debug = opts.debug + @shared_folder = opts.shared_folder + end + + def start + banner("Starting testing...") + time = Benchmark.measure do + metadata_files.each do |metadata_file| + m = box_metadata(metadata_file) + destroy_all_bento + test_box(m['name'], m['providers']) + destroy_all_bento + end + end + banner("Testing finished in #{duration(time.real)}.") + end + + private + + def destroy_all_bento + cmd = Mixlib::ShellOut.new("vagrant box list | grep 'bento-'") + cmd.run_command + boxes = cmd.stdout.split("\n") + + boxes.each do |box| + b = box.split(' ') + rm_cmd = Mixlib::ShellOut.new("vagrant box remove --force #{b[0]} --provider #{b[1].to_s.gsub(/(,|\()/, '')}") + banner("Removing #{b[0]} for provider #{b[1].to_s.gsub(/(,|\()/, '')}") + rm_cmd.run_command + end + end + + def test_box(boxname, providers) + providers.each do |provider, provider_data| + + plugin_list = Mixlib::ShellOut.new("vagrant plugin list | awk '{print $1}'") + plugin_list.run_command + plugins = plugin_list.stdout.split("\n") + + if provider == 'vmware_desktop' + case + when plugins.include?('vagrant-vmware-workstation') + provider = 'vmware_workstation' + when plugins.include?('vagrant-vmware-fusion') + provider = 'vmware_fusion' + end + end + + share_disabled = shared_folder ? false : true + + kitchen_cfg = {"provisioner"=>{"name"=>"chef_zero", "data_path"=>"test/fixtures"}, + "platforms"=> + [{"name"=>"#{boxname}-#{provider}", + "driver"=> + {"name"=>"vagrant", + "synced_folders"=>[[".", "/vagrant", "disabled: #{share_disabled}"]], + "provider"=>provider, + "box"=>"bento-#{boxname}", + "box_url"=>"file://#{ENV['PWD']}/builds/#{provider_data['file']}"}}], + "suites"=>[{"name"=>"default", "run_list"=>nil, "attributes"=>{}}]} + + File.open(".kitchen.#{provider}.yml", "w") { |f| f.write(kitchen_cfg.to_yaml) } + + Kitchen.logger = Kitchen.default_file_logger + @loader = Kitchen::Loader::YAML.new(project_config: "./.kitchen.#{provider}.yml") + config = Kitchen::Config.new(loader: @loader) + config.instances.each do |instance| + instance.test(:always) + end + end + end +end + +class DeleteRunner + include Common + include HttpStuff + + attr_reader :boxname, :version + + def initialize(opts) + @boxname = opts.box + @version = opts.version + end + + def start + banner("Starting Delete...") + time = Benchmark.measure do + delete_version(boxname, version) + end + banner("Delete finished in #{duration(time.real)}.") + end + + private + + def delete_version(boxname, version) + banner("Deleting version #{version} of box #{boxname}") + req = request('delete', "#{atlas_api}/box/#{atlas_org}/#{boxname}/version/#{version}", { 'access_token' => atlas_token }, { 'Content-Type' => 'application/json' }) + + case req.code + when '200' + banner("Version #{version} of box #{boxname} has been successfully deleted") + when '404' + warn("No box exists for this version") + else + warn("Something went wrong #{req.code}") + end + end +end + +class ReleaseRunner + include Common + include HttpStuff + + attr_reader :boxname, :version + + def initialize(opts) + @boxname = opts.box + @version = opts.version + end + + def start + banner("Starting Release...") + time = Benchmark.measure do + release_version(boxname, version) + end + banner("Release finished in #{duration(time.real)}.") + end + + private + + def release_version(boxname, version) + banner("Releasing version #{version} of box #{boxname}") + req = request('put', "#{atlas_api}/box/#{atlas_org}/#{boxname}/version/#{version}/release", { 'access_token' => atlas_token }, { 'Content-Type' => 'application/json' }) + if req.code == '200' + banner("Version #{version} of box #{boxname} has been successfully released") + else + warn("Something went wrong #{req.code}") + end + end +end + +class RevokeRunner + include Common + include HttpStuff + + attr_reader :boxname, :version + + def initialize(opts) + @boxname = opts.box + @version = opts.version + end + + def start + banner("Starting Revoke...") + time = Benchmark.measure do + revoke_version(boxname, version) + end + banner("Revoke finished in #{duration(time.real)}.") + end + + private + + def revoke_version(boxname, version) + banner("Revoking version #{version} of box #{boxname}") + req = request('put', "#{atlas_api}/box/#{atlas_org}/#{boxname}/version/#{version}/revoke", { 'access_token' => atlas_token }, { 'Content-Type' => 'application/json' }) + if req.code == '200' + banner("Version #{version} of box #{boxname} has been successfully revoked") + else + banner("Something went wrong #{req.code}") + end + end +end + +class UploadRunner + include Common + include HttpStuff + + attr_reader :templates + + def initialize(opts) + @templates = opts.templates + end + + def start + banner("Starting uploads...") + time = Benchmark.measure do + metadata_files.each do |metadata_file| + metadata = box_metadata(metadata_file) + create_box(metadata['name']) + create_box_version(metadata['name'], metadata['version']) + create_providers(metadata['name'], metadata['version'], metadata['providers'].keys) + upload_to_atlas(metadata['name'], metadata['version'], metadata['providers']) + # upload_to_s3(metadata['name'], metadata['version'], metadata['providers']) + end + end + banner("Atlas uploads finished in #{duration(time.real)}.") + end + + private + + def create_box(boxname) + req = request('get', "#{atlas_api}/box/#{atlas_org}/#{boxname}", { 'box[username]' => atlas_org, 'access_token' => atlas_token } ) + if req.code.eql?('404') + if private_box?(boxname) + banner("Creating the private box #{boxname} in Atlas.") + req = request('post', "#{atlas_api}/boxes", { 'box[name]' => boxname, 'box[username]' => atlas_org, 'access_token' => atlas_token }, { 'Content-Type' => 'application/json' } ) + else + banner("Creating the box #{boxname} in Atlas.") + req = request('post', "#{atlas_api}/boxes", { 'box[name]' => boxname, 'box[username]' => atlas_org, 'access_token' => atlas_token }, { 'Content-Type' => 'application/json' } ) + make_public(boxname) + end + else + banner("The box #{boxname} exists in atlas, continuing...") + end + end + + def make_public(boxname) + banner("Making #{boxname} public") + req = request('put', "#{atlas_api}/box/#{atlas_org}/#{boxname}", { 'box[is_private]' => false, 'access_token' => atlas_token }, { 'Content-Type' => 'application/json' } ) + banner("#{boxname} successfully made public") if req.code == '200' + end + + def create_box_version(boxname, version) + req = request('post', "#{atlas_api}/box/#{atlas_org}/#{boxname}/versions", { 'version[version]' => version, 'access_token' => atlas_token },{ 'Content-Type' => 'application/json' } ) + + banner("Created box version #{boxname} #{version}.") if req.code == '200' + banner("Box version #{boxname} #{version} already exists, continuing.") if req.code == '422' + end + + def create_providers(boxname, version, provider_names) + provider_names.each do |provider| + banner("Creating provider #{provider} for #{boxname} #{version}") + req = request('post', "#{atlas_api}/box/#{atlas_org}/#{boxname}/version/#{version}/providers", { 'provider[name]' => provider, 'access_token' => atlas_token }, { 'Content-Type' => 'application/json' } ) + banner("Created #{provider} for #{boxname} #{version}") if req.code == '200' + banner("Provider #{provider} for #{boxname} #{version} already exists, continuing.") if req.code == '422' + end + end + + def upload_to_atlas(boxname, version, providers) + providers.each do |provider, provider_data| + boxfile = provider_data['file'] + req = request('get', "#{atlas_api}/box/#{atlas_org}/#{boxname}/version/#{version}/provider/#{provider}/upload?access_token=#{atlas_token}") + upload_path = JSON.parse(req.body)['upload_path'] + token = JSON.parse(req.body)['token'] + + banner("Atlas: Uploading #{boxfile}") + info("Name: #{boxname}") + info("Version: #{version}") + info("Provider: #{provider}") + info("Upload Path: #{upload_path}") + upload_request = request('put', upload_path, File.open("builds/#{boxfile}")) + + req = request('get', "#{atlas_api}/box/#{atlas_org}/#{boxname}/version/#{version}/provider/#{provider}?access_token=#{atlas_token}") + hosted_token = JSON.parse(req.body)['hosted_token'] + + if token == hosted_token + banner("Successful upload of box #{boxfile}") + else + banner("Failed upload due to non-matching tokens of box #{boxfile} to atlas box: #{boxname}, version: #{version}, provider: #{provider}") + warn("Code: #{req.code}") + warn("Body: #{req.body}") + end + end + + def upload_to_s3(boxname, version, providers) + providers.each do |provider, provider_data| + boxfile = provider_data['file'] + provider = 'vmware' if provider == 'vmware_desktop' + box_path = "vagrant/#{provider}/opscode_#{boxname}_chef-provisionerless.box" + credentials = Aws::Credentials.new(ENV['AWS_ACCESS_KEY_ID'], ENV['AWS_SECRET_ACCESS_KEY']) + + s3 = Aws::S3::Resource.new(credentials: credentials, endpoint: s3_endpoint) + banner("S3: Uploading #{boxfile}") + info("Name: #{boxname}") + info("Version: #{version}") + info("Provider: #{provider}") + s3_object = s3.bucket(s3_bucket).object(box_path) + s3_object.upload_file("builds/#{boxfile}", acl:'public-read') + banner("Upload Path: #{s3_object.public_url}") + end + end + end +end + class ListRunner include Common diff --git a/build.sh b/build.sh index 1c6d39882..2345ede3c 100644 --- a/build.sh +++ b/build.sh @@ -72,10 +72,7 @@ rake test_all if [ "$BENTO_UPLOAD" -eq 1 ] then - echo "--- Upload Boxes to S3" - rake upload_all_s3 - - echo "--- Upload Boxes to Atlas" + echo "--- Upload Boxes to Atlas and S3" rake upload_all echo "--- Release Boxes on Atlas" From 4f9f0e34ad8263441ecda50b7d170d277ef61341 Mon Sep 17 00:00:00 2001 From: Seth Thomas <cheeseplus@getchef.io> Date: Thu, 19 May 2016 18:56:12 -0700 Subject: [PATCH 0504/1622] Updating Gemfile --- Gemfile | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 1c1f6f059..9e215f7af 100644 --- a/Gemfile +++ b/Gemfile @@ -1,4 +1,8 @@ -source "https://rubygems.org" +source 'https://rubygems.org' -gem "rake" -gem "thor" +gem 'rake' +gem 'thor' +gem 'test-kitchen' +gem 'json' +gem 'mixlib-shellout' +gem 'aws-sdk' From 2c6d14379d3b79d6ec5719722eb5e09957152055 Mon Sep 17 00:00:00 2001 From: Seth Thomas <sthomas@chef.io> Date: Fri, 20 May 2016 14:22:02 -0700 Subject: [PATCH 0505/1622] Updating to include recent fixes --- CHANGELOG.md | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9d63761df..0d87b5f2d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,13 +1,26 @@ # Change Log -## [2.2.7](https://github.com/chef/bento/tree/2.2.7) (2016-05-09) +## [2.2.7](https://github.com/chef/bento/tree/2.2.7) (2016-05-20) [Full Changelog](https://github.com/chef/bento/compare/2.2.6...2.2.7) - **Improvements:** - Ubuntu: HWE BEGONE! pt 1 - Fix for VMware HGFS on 14.04 [\#584](https://github.com/chef/bento/pull/584) ([davidmnoriega](https://github.com/davidmnoriega)) - Ubuntu: HWE BEGONE! pt 2 - The Pangolining [\#587](https://github.com/chef/bento/pull/587) ([cheeseplus](https://github.com/cheeseplus)) - OpenSuSE: Switching to more reliable mirror [\#583](https://github.com/chef/bento/pull/583) ([cheeseplus](https://github.com/cheeseplus)) +- Added "disk\_size" user variable [\#596](https://github.com/chef/bento/pull/596) ([svpace](https://github.com/svpace)) + +**Fixed bugs:** + +- Ubuntu 16.04: 70-persistent-net.rules "hack" messes with update-initramfs triggers [\#592](https://github.com/chef/bento/issues/592) +- VMware: use correct script flags based on version [\#590](https://github.com/chef/bento/issues/590) + +**Tool Versions:** + +- Packer 0.10.1 +- VirtualBox 5.0.20 +- VMware Fusion 8.1.1 +- VMware Workstation 12.1.1 +- Parallels Pro 11.2.0 ## [2.2.6](https://github.com/chef/bento/tree/2.2.6) (2016-04-28) [Full Changelog](https://github.com/chef/bento/compare/2.2.5...2.2.6) From e3ad6996d33bcf4d4f659e7b3bcc15e00a4bab9b Mon Sep 17 00:00:00 2001 From: Rickard von Essen <rickard.von.essen@gmail.com> Date: Fri, 27 May 2016 10:31:41 +0200 Subject: [PATCH 0506/1622] Updated CentOS and RHEL to 6.8 --- centos-6.7-i386.json => centos-6.8-i386.json | 14 +++++++------- centos-6.7-x86_64.json => centos-6.8-x86_64.json | 14 +++++++------- http/{centos-6.7 => centos-6.8}/ks.cfg | 0 rhel-6.6-i386.json => rhel-6.8-i386.json | 12 ++++++------ rhel-6.6-x86_64.json => rhel-6.8-x86_64.json | 12 ++++++------ 5 files changed, 26 insertions(+), 26 deletions(-) rename centos-6.7-i386.json => centos-6.8-i386.json (94%) rename centos-6.7-x86_64.json => centos-6.8-x86_64.json (94%) rename http/{centos-6.7 => centos-6.8}/ks.cfg (100%) rename rhel-6.6-i386.json => rhel-6.8-i386.json (95%) rename rhel-6.6-x86_64.json => rhel-6.8-x86_64.json (95%) diff --git a/centos-6.7-i386.json b/centos-6.8-i386.json similarity index 94% rename from centos-6.7-i386.json rename to centos-6.8-i386.json index e2fbe935d..00a923345 100644 --- a/centos-6.7-i386.json +++ b/centos-6.8-i386.json @@ -155,7 +155,7 @@ } ], "variables": { - "box_basename": "centos-6.7-i386", + "box_basename": "centos-6.8-i386", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", "disk_size": "40960", @@ -163,17 +163,17 @@ "headless": "", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", - "iso_checksum": "2ef003dd0a0b7e810928da9508d5551d8d51943434d4eb634a783f1fc3cb0252", + "iso_checksum": "720d185fdf063383a4471657076b72fc162d3c3c3bca2e5e5ae13a25b3046519", "iso_checksum_type": "sha256", - "iso_name": "CentOS-6.7-i386-bin-DVD1.iso", - "ks_path": "centos-6.7/ks.cfg", + "iso_name": "CentOS-6.8-i386-bin-DVD1.iso", + "ks_path": "centos-6.8/ks.cfg", "memory": "512", "metadata": "floppy/dummy_metadata.json", "mirror": "http://mirrors.kernel.org/centos", - "mirror_directory": "6.7/isos/i386", - "name": "centos-6.7-i386", + "mirror_directory": "6.8/isos/i386", + "name": "centos-6.8-i386", "no_proxy": "{{env `no_proxy`}}", - "template": "centos-6.7-i386", + "template": "centos-6.8-i386", "version": "2.1.TIMESTAMP" } } diff --git a/centos-6.7-x86_64.json b/centos-6.8-x86_64.json similarity index 94% rename from centos-6.7-x86_64.json rename to centos-6.8-x86_64.json index c5041b949..57968dc90 100644 --- a/centos-6.7-x86_64.json +++ b/centos-6.8-x86_64.json @@ -155,7 +155,7 @@ } ], "variables": { - "box_basename": "centos-6.7", + "box_basename": "centos-6.8", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", "disk_size": "40960", @@ -163,17 +163,17 @@ "headless": "", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", - "iso_checksum": "c0c1a05d3d74fb093c6232003da4b22b0680f59d3b2fa2cb7da736bc40b3f2c5", + "iso_checksum": "1dda55622614a8b43b448a72f87d6cb7f79de1eff49ee8c5881a7d9db28d4e35", "iso_checksum_type": "sha256", - "iso_name": "CentOS-6.7-x86_64-bin-DVD1.iso", - "ks_path": "centos-6.7/ks.cfg", + "iso_name": "CentOS-6.8-x86_64-bin-DVD1.iso", + "ks_path": "centos-6.8/ks.cfg", "memory": "512", "metadata": "floppy/dummy_metadata.json", "mirror": "http://mirrors.kernel.org/centos", - "mirror_directory": "6.7/isos/x86_64", - "name": "centos-6.7", + "mirror_directory": "6.8/isos/x86_64", + "name": "centos-6.8", "no_proxy": "{{env `no_proxy`}}", - "template": "centos-6.7-x86_64", + "template": "centos-6.8-x86_64", "version": "2.1.TIMESTAMP" } } diff --git a/http/centos-6.7/ks.cfg b/http/centos-6.8/ks.cfg similarity index 100% rename from http/centos-6.7/ks.cfg rename to http/centos-6.8/ks.cfg diff --git a/rhel-6.6-i386.json b/rhel-6.8-i386.json similarity index 95% rename from rhel-6.6-i386.json rename to rhel-6.8-i386.json index 729fd2530..52478967a 100644 --- a/rhel-6.6-i386.json +++ b/rhel-6.8-i386.json @@ -156,7 +156,7 @@ ], "variables": { "arch": "32", - "box_basename": "rhel-6.6-i386", + "box_basename": "rhel-6.8-i386", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", "disk_size": "40960", @@ -164,17 +164,17 @@ "headless": "", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", - "iso_checksum": "0a14ed1f7d7ea7b831739ed8e71719d9cb7c294bf801e8db39358651768547ad", + "iso_checksum": "22d1754f3e642c2b60234c3f97d1d6689b33bef4dd2252e3f52cd9aa823bb5f3", "iso_checksum_type": "sha256", - "iso_name": "rhel-server-6.6-i386-dvd.iso", - "ks_path": "centos-6.7/ks.cfg", + "iso_name": "rhel-server-6.8-i386-dvd.iso", + "ks_path": "centos-6.8/ks.cfg", "memory": "512", "metadata": "floppy/dummy_metadata.json", "mirror": "http://YOU-MUST-PROVIDE-YOUR-OWN-ISO.sorry", "mirror_directory": "rhel", - "name": "rhel-6.6-i386", + "name": "rhel-6.8-i386", "no_proxy": "{{env `no_proxy`}}", - "template": "rhel-6.6-i386", + "template": "rhel-6.8-i386", "version": "2.2.TIMESTAMP" } } diff --git a/rhel-6.6-x86_64.json b/rhel-6.8-x86_64.json similarity index 95% rename from rhel-6.6-x86_64.json rename to rhel-6.8-x86_64.json index e83538d81..1f10cd5bd 100644 --- a/rhel-6.6-x86_64.json +++ b/rhel-6.8-x86_64.json @@ -156,7 +156,7 @@ ], "variables": { "arch": "64", - "box_basename": "rhel-6.6", + "box_basename": "rhel-6.8", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", "disk_size": "40960", @@ -164,17 +164,17 @@ "headless": "", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", - "iso_checksum": "16044cb7264f4bc0150f5b6f3f66936ccf2d36e0a4152c00d9236fb7dcae5f32", + "iso_checksum": "d35fd1af20f6adef9b11b46c2534ae8b6e18de7754889e2b51808b436dff2804", "iso_checksum_type": "sha256", - "iso_name": "rhel-server-6.6-x86_64-dvd.iso", - "ks_path": "centos-6.7/ks.cfg", + "iso_name": "rhel-server-6.8-x86_64-dvd.iso", + "ks_path": "centos-6.8/ks.cfg", "memory": "512", "metadata": "floppy/dummy_metadata.json", "mirror": "http://YOU-MUST-PROVIDE-YOUR-OWN-ISO.sorry", "mirror_directory": "rhel", - "name": "rhel-6.6", + "name": "rhel-6.8", "no_proxy": "{{env `no_proxy`}}", - "template": "rhel-6.6-x86_64", + "template": "rhel-6.8-x86_64", "version": "2.2.TIMESTAMP" } } From 626e20a1f6cec3e7e654da220fdc819e06161e53 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith@chef.io> Date: Thu, 2 Jun 2016 09:26:25 -0700 Subject: [PATCH 0507/1622] Fix vagrant.sh failing on Solaris nodes Redefining home to /home/vagrant fails since that doesn't exist on Solaris Signed-off-by: Tim Smith <tsmith@chef.io> --- scripts/solaris/vagrant.sh | 19 +++++++++++++++++++ solaris-11-x86.json | 4 ++-- 2 files changed, 21 insertions(+), 2 deletions(-) create mode 100644 scripts/solaris/vagrant.sh diff --git a/scripts/solaris/vagrant.sh b/scripts/solaris/vagrant.sh new file mode 100644 index 000000000..72803e267 --- /dev/null +++ b/scripts/solaris/vagrant.sh @@ -0,0 +1,19 @@ +#!/bin/sh -eux + +# set a default HOME_DIR environment variable if not set +HOME_DIR="${HOME_DIR:-/export/home/vagrant}"; + +pubkey_url="https://raw.githubusercontent.com/mitchellh/vagrant/master/keys/vagrant.pub"; +mkdir -p $HOME_DIR/.ssh; +if command -v wget >/dev/null 2>&1; then + wget --no-check-certificate "$pubkey_url" -O $HOME_DIR/.ssh/authorized_keys; +elif command -v curl >/dev/null 2>&1; then + curl --insecure --location "$pubkey_url" > $HOME_DIR/.ssh/authorized_keys; +elif command -v fetch >/dev/null 2>&1; then + fetch -am -o $HOME_DIR/.ssh/authorized_keys "$pubkey_url"; +else + echo "Cannot download vagrant public key"; + exit 1; +fi +chown -R vagrant $HOME_DIR/.ssh; +chmod -R go-rwsx $HOME_DIR/.ssh; diff --git a/solaris-11-x86.json b/solaris-11-x86.json index 0fca51534..22bc85d7b 100644 --- a/solaris-11-x86.json +++ b/solaris-11-x86.json @@ -133,7 +133,7 @@ "scripts/common/metadata.sh", "scripts/solaris/update.sh", "scripts/solaris/vmtools.sh", - "scripts/common/vagrant.sh", + "scripts/solaris/vagrant.sh", "scripts/solaris/minimize.sh" ], "type": "shell" @@ -141,7 +141,7 @@ ], "variables": { "_DOWNLOAD_SITE": "http://www.oracle.com/technetwork/server-storage/solaris11/downloads/index.html", - "_README": "You must download the automated installer iso from the following page, and then place it somewhere that packer can fetch it", + "_README": "You must download the automated installer iso from the following page, and then place it in the packer_cache dir", "arch": "64", "box_basename": "solaris-11.3", "build_timestamp": "{{isotime \"20060102150405\"}}", From 39ac9d7e18fce28811604f55e911e6a9add458fa Mon Sep 17 00:00:00 2001 From: Rickard von Essen <rickard.von.essen@gmail.com> Date: Tue, 7 Jun 2016 07:07:33 +0200 Subject: [PATCH 0508/1622] Updated Debian 7 to 7.11 --- debian-7.11-amd64.json | 237 +++++++++++++++++++++++++++++++++++++++++ debian-7.11-i386.json | 237 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 474 insertions(+) create mode 100644 debian-7.11-amd64.json create mode 100644 debian-7.11-i386.json diff --git a/debian-7.11-amd64.json b/debian-7.11-amd64.json new file mode 100644 index 000000000..65072e4e2 --- /dev/null +++ b/debian-7.11-amd64.json @@ -0,0 +1,237 @@ +{ + "builders": [ + { + "boot_command": [ + "<esc><wait>", + "install <wait>", + " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}} <wait>", + "debian-installer=en_US <wait>", + "auto <wait>", + "locale=en_US <wait>", + "kbd-chooser/method=us <wait>", + "keyboard-configuration/xkb-keymap=us <wait>", + "netcfg/get_hostname={{ .Name }} <wait>", + "netcfg/get_domain=vagrantup.com <wait>", + "fb=false <wait>", + "debconf/frontend=noninteractive <wait>", + "console-setup/ask_detect=false <wait>", + "console-keymaps-at/keymap=us <wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": "{{user `disk_size`}}", + "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "guest_os_type": "Debian_64", + "hard_drive_interface": "sata", + "headless": "{{ user `headless` }}", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-virtualbox", + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "virtualbox-iso", + "vboxmanage": [ + [ + "modifyvm", + "{{.Name}}", + "--memory", + "{{ user `memory` }}" + ], + [ + "modifyvm", + "{{.Name}}", + "--cpus", + "{{ user `cpus` }}" + ] + ], + "virtualbox_version_file": ".vbox_version", + "vm_name": "{{ user `template` }}" + }, + { + "boot_command": [ + "<esc><wait>", + "install <wait>", + " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}} <wait>", + "debian-installer=en_US <wait>", + "auto <wait>", + "locale=en_US <wait>", + "kbd-chooser/method=us <wait>", + "keyboard-configuration/xkb-keymap=us <wait>", + "netcfg/get_hostname={{ .Name }} <wait>", + "netcfg/get_domain=vagrantup.com <wait>", + "fb=false <wait>", + "debconf/frontend=noninteractive <wait>", + "console-setup/ask_detect=false <wait>", + "console-keymaps-at/keymap=us <wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": "{{user `disk_size`}}", + "guest_os_type": "debian7-64", + "headless": "{{ user `headless` }}", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-vmware", + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "tools_upload_flavor": "linux", + "type": "vmware-iso", + "vm_name": "{{ user `template` }}", + "vmx_data": { + "cpuid.coresPerSocket": "1", + "memsize": "{{ user `memory` }}", + "numvcpus": "{{ user `cpus` }}" + } + }, + { + "boot_command": [ + "<esc><wait>", + "install <wait>", + " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}} <wait>", + "debian-installer=en_US <wait>", + "auto <wait>", + "locale=en_US <wait>", + "kbd-chooser/method=us <wait>", + "keyboard-configuration/xkb-keymap=us <wait>", + "netcfg/get_hostname={{ .Name }} <wait>", + "netcfg/get_domain=vagrantup.com <wait>", + "fb=false <wait>", + "debconf/frontend=noninteractive <wait>", + "console-setup/ask_detect=false <wait>", + "console-keymaps-at/keymap=us <wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": "{{user `disk_size`}}", + "guest_os_type": "debian", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-parallels", + "parallels_tools_flavor": "lin", + "prlctl": [ + [ + "set", + "{{.Name}}", + "--memsize", + "{{ user `memory` }}" + ], + [ + "set", + "{{.Name}}", + "--cpus", + "{{ user `cpus` }}" + ] + ], + "prlctl_version_file": ".prlctl_version", + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "parallels-iso", + "vm_name": "{{ user `template` }}" + }, + { + "boot_command": [ + "<esc><wait>", + "install <wait>", + "preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/debian-7/preseed.cfg <wait>", + "debian-installer=en_US <wait>", + "auto <wait>", + "locale=en_US <wait>", + "kbd-chooser/method=us <wait>", + "keyboard-configuration/xkb-keymap=us <wait>", + "netcfg/get_hostname={{ .Name }} <wait>", + "netcfg/get_domain=vagrantup.com <wait>", + "fb=false <wait>", + "debconf/frontend=noninteractive <wait>", + "console-setup/ask_detect=false <wait>", + "console-keymaps-at/keymap=us <wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": "{{user `disk_size`}}", + "headless": "{{ user `headless` }}", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-qemu", + "ssh_username": "vagrant", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_wait_timeout": "10000s", + "shutdown_command": "echo 'vagrant'|sudo -S /sbin/shutdown -hP now", + "type": "qemu", + "vm_name": "{{ user `template` }}" + } + ], + "post-processors": [ + { + "output": "builds/{{user `box_basename`}}.{{.Provider}}.box", + "type": "vagrant" + } + ], + "provisioners": [ + { + "destination": "/tmp/bento-metadata.json", + "source": "{{user `metadata`}}", + "type": "file" + }, + { + "environment_vars": [ + "HOME_DIR=/home/vagrant", + "http_proxy={{user `http_proxy`}}", + "https_proxy={{user `https_proxy`}}", + "no_proxy={{user `no_proxy`}}" + ], + "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", + "scripts": [ + "scripts/common/metadata.sh", + "scripts/debian/update.sh", + "scripts/common/sshd.sh", + "scripts/debian/networking.sh", + "scripts/debian/sudoers.sh", + "scripts/common/vagrant.sh", + "scripts/common/vmtools.sh", + "scripts/debian/cleanup.sh", + "scripts/common/minimize.sh" + ], + "type": "shell" + } + ], + "variables": { + "box_basename": "debian-7.11", + "build_timestamp": "{{isotime \"20060102150405\"}}", + "cpus": "1", + "disk_size": "40960", + "git_revision": "__unknown_git_revision__", + "headless": "", + "http_proxy": "{{env `http_proxy`}}", + "https_proxy": "{{env `https_proxy`}}", + "iso_checksum": "cbae9d679dbe2d37828a5abb9d3ea8c40183972952180843d8b07f7b33e09877", + "iso_checksum_type": "sha256", + "iso_name": "debian-7.11.0-amd64-CD-1.iso", + "memory": "512", + "metadata": "floppy/dummy_metadata.json", + "mirror": "http://cdimage.debian.org/cdimage/archive", + "mirror_directory": "7.11.0/amd64/iso-cd", + "name": "debian-7.11", + "no_proxy": "{{env `no_proxy`}}", + "preseed_path": "debian-7/preseed.cfg", + "template": "debian-7.11-amd64", + "version": "2.1.TIMESTAMP" + } +} diff --git a/debian-7.11-i386.json b/debian-7.11-i386.json new file mode 100644 index 000000000..3a9440f5b --- /dev/null +++ b/debian-7.11-i386.json @@ -0,0 +1,237 @@ +{ + "builders": [ + { + "boot_command": [ + "<esc><wait>", + "install <wait>", + " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}} <wait>", + "debian-installer=en_US <wait>", + "auto <wait>", + "locale=en_US <wait>", + "kbd-chooser/method=us <wait>", + "keyboard-configuration/xkb-keymap=us <wait>", + "netcfg/get_hostname={{ .Name }} <wait>", + "netcfg/get_domain=vagrantup.com <wait>", + "fb=false <wait>", + "debconf/frontend=noninteractive <wait>", + "console-setup/ask_detect=false <wait>", + "console-keymaps-at/keymap=us <wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": "{{user `disk_size`}}", + "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "guest_os_type": "Debian", + "hard_drive_interface": "sata", + "headless": "{{ user `headless` }}", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-virtualbox", + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "virtualbox-iso", + "vboxmanage": [ + [ + "modifyvm", + "{{.Name}}", + "--memory", + "{{ user `memory` }}" + ], + [ + "modifyvm", + "{{.Name}}", + "--cpus", + "{{ user `cpus` }}" + ] + ], + "virtualbox_version_file": ".vbox_version", + "vm_name": "{{ user `template` }}" + }, + { + "boot_command": [ + "<esc><wait>", + "install <wait>", + " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}} <wait>", + "debian-installer=en_US <wait>", + "auto <wait>", + "locale=en_US <wait>", + "kbd-chooser/method=us <wait>", + "keyboard-configuration/xkb-keymap=us <wait>", + "netcfg/get_hostname={{ .Name }} <wait>", + "netcfg/get_domain=vagrantup.com <wait>", + "fb=false <wait>", + "debconf/frontend=noninteractive <wait>", + "console-setup/ask_detect=false <wait>", + "console-keymaps-at/keymap=us <wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": "{{user `disk_size`}}", + "guest_os_type": "debian7", + "headless": "{{ user `headless` }}", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-vmware", + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "tools_upload_flavor": "linux", + "type": "vmware-iso", + "vm_name": "{{ user `template` }}", + "vmx_data": { + "cpuid.coresPerSocket": "1", + "memsize": "{{ user `memory` }}", + "numvcpus": "{{ user `cpus` }}" + } + }, + { + "boot_command": [ + "<esc><wait>", + "install <wait>", + " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}} <wait>", + "debian-installer=en_US <wait>", + "auto <wait>", + "locale=en_US <wait>", + "kbd-chooser/method=us <wait>", + "keyboard-configuration/xkb-keymap=us <wait>", + "netcfg/get_hostname={{ .Name }} <wait>", + "netcfg/get_domain=vagrantup.com <wait>", + "fb=false <wait>", + "debconf/frontend=noninteractive <wait>", + "console-setup/ask_detect=false <wait>", + "console-keymaps-at/keymap=us <wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": "{{user `disk_size`}}", + "guest_os_type": "debian", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-parallels", + "parallels_tools_flavor": "lin", + "prlctl": [ + [ + "set", + "{{.Name}}", + "--memsize", + "{{ user `memory` }}" + ], + [ + "set", + "{{.Name}}", + "--cpus", + "{{ user `cpus` }}" + ] + ], + "prlctl_version_file": ".prlctl_version", + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "parallels-iso", + "vm_name": "{{ user `template` }}" + }, + { + "boot_command": [ + "<esc><wait>", + "install <wait>", + "preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/debian-7/preseed.cfg <wait>", + "debian-installer=en_US <wait>", + "auto <wait>", + "locale=en_US <wait>", + "kbd-chooser/method=us <wait>", + "keyboard-configuration/xkb-keymap=us <wait>", + "netcfg/get_hostname={{ .Name }} <wait>", + "netcfg/get_domain=vagrantup.com <wait>", + "fb=false <wait>", + "debconf/frontend=noninteractive <wait>", + "console-setup/ask_detect=false <wait>", + "console-keymaps-at/keymap=us <wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": "{{user `disk_size`}}", + "headless": "{{ user `headless` }}", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-qemu", + "ssh_username": "vagrant", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_wait_timeout": "10000s", + "shutdown_command": "echo 'vagrant'|sudo -S /sbin/shutdown -hP now", + "type": "qemu", + "vm_name": "{{ user `template` }}" + } + ], + "post-processors": [ + { + "output": "builds/{{user `box_basename`}}.{{.Provider}}.box", + "type": "vagrant" + } + ], + "provisioners": [ + { + "destination": "/tmp/bento-metadata.json", + "source": "{{user `metadata`}}", + "type": "file" + }, + { + "environment_vars": [ + "HOME_DIR=/home/vagrant", + "http_proxy={{user `http_proxy`}}", + "https_proxy={{user `https_proxy`}}", + "no_proxy={{user `no_proxy`}}" + ], + "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", + "scripts": [ + "scripts/common/metadata.sh", + "scripts/debian/update.sh", + "scripts/common/sshd.sh", + "scripts/debian/networking.sh", + "scripts/debian/sudoers.sh", + "scripts/common/vagrant.sh", + "scripts/common/vmtools.sh", + "scripts/debian/cleanup.sh", + "scripts/common/minimize.sh" + ], + "type": "shell" + } + ], + "variables": { + "box_basename": "debian-7.11-i386", + "build_timestamp": "{{isotime \"20060102150405\"}}", + "cpus": "1", + "disk_size": "40960", + "git_revision": "__unknown_git_revision__", + "headless": "", + "http_proxy": "{{env `http_proxy`}}", + "https_proxy": "{{env `https_proxy`}}", + "iso_checksum": "9486d582a9d6cbce3e68dd8f8734425bea02dba9da5c484028e3c7f52ad28845", + "iso_checksum_type": "sha256", + "iso_name": "debian-7.11.0-i386-CD-1.iso", + "memory": "512", + "metadata": "floppy/dummy_metadata.json", + "mirror": "http://cdimage.debian.org/cdimage/archive", + "mirror_directory": "7.11.0/i386/iso-cd", + "name": "debian-7.11-i386", + "no_proxy": "{{env `no_proxy`}}", + "preseed_path": "debian-7/preseed.cfg", + "template": "debian-7.11-i386", + "version": "2.1.TIMESTAMP" + } +} From 1baa92439e1551e6bd8ad6fc92c999582ea8c2fe Mon Sep 17 00:00:00 2001 From: Rickard von Essen <rickard.von.essen@gmail.com> Date: Tue, 7 Jun 2016 07:34:13 +0200 Subject: [PATCH 0509/1622] Updated Debian 8 to 8.5 --- debian-8.5-amd64.json | 242 ++++++++++++++++++++++++++++++++++++++++++ debian-8.5-i386.json | 242 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 484 insertions(+) create mode 100644 debian-8.5-amd64.json create mode 100644 debian-8.5-i386.json diff --git a/debian-8.5-amd64.json b/debian-8.5-amd64.json new file mode 100644 index 000000000..81fa63bb3 --- /dev/null +++ b/debian-8.5-amd64.json @@ -0,0 +1,242 @@ +{ + "builders": [ + { + "boot_command": [ + "<esc><wait>", + "install <wait>", + " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}} <wait>", + "debian-installer=en_US <wait>", + "auto <wait>", + "locale=en_US <wait>", + "kbd-chooser/method=us <wait>", + "keyboard-configuration/xkb-keymap=us <wait>", + "netcfg/get_hostname={{ .Name }} <wait>", + "netcfg/get_domain=vagrantup.com <wait>", + "fb=false <wait>", + "debconf/frontend=noninteractive <wait>", + "console-setup/ask_detect=false <wait>", + "console-keymaps-at/keymap=us <wait>", + "grub-installer/bootdev=/dev/sda <wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": "{{user `disk_size`}}", + "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "guest_os_type": "Debian_64", + "hard_drive_interface": "sata", + "headless": "{{ user `headless` }}", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-virtualbox", + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "virtualbox-iso", + "vboxmanage": [ + [ + "modifyvm", + "{{.Name}}", + "--memory", + "{{ user `memory` }}" + ], + [ + "modifyvm", + "{{.Name}}", + "--cpus", + "{{ user `cpus` }}" + ] + ], + "virtualbox_version_file": ".vbox_version", + "vm_name": "{{ user `template` }}" + }, + { + "boot_command": [ + "<esc><wait>", + "install <wait>", + " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}} <wait>", + "debian-installer=en_US <wait>", + "auto <wait>", + "locale=en_US <wait>", + "kbd-chooser/method=us <wait>", + "keyboard-configuration/xkb-keymap=us <wait>", + "netcfg/get_hostname={{ .Name }} <wait>", + "netcfg/get_domain=vagrantup.com <wait>", + "fb=false <wait>", + "debconf/frontend=noninteractive <wait>", + "console-setup/ask_detect=false <wait>", + "console-keymaps-at/keymap=us <wait>", + "grub-installer/bootdev=/dev/sda <wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": "{{user `disk_size`}}", + "guest_os_type": "debian8-64", + "headless": "{{ user `headless` }}", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-vmware", + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "tools_upload_flavor": "linux", + "type": "vmware-iso", + "vm_name": "{{ user `template` }}", + "vmx_data": { + "cpuid.coresPerSocket": "1", + "ethernet0.pciSlotNumber": "32", + "memsize": "{{ user `memory` }}", + "numvcpus": "{{ user `cpus` }}" + } + }, + { + "boot_command": [ + "<esc><wait>", + "install <wait>", + " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}} <wait>", + "debian-installer=en_US <wait>", + "auto <wait>", + "locale=en_US <wait>", + "kbd-chooser/method=us <wait>", + "keyboard-configuration/xkb-keymap=us <wait>", + "netcfg/get_hostname={{ .Name }} <wait>", + "netcfg/get_domain=vagrantup.com <wait>", + "fb=false <wait>", + "debconf/frontend=noninteractive <wait>", + "console-setup/ask_detect=false <wait>", + "console-keymaps-at/keymap=us <wait>", + "grub-installer/bootdev=/dev/sda <wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": "{{user `disk_size`}}", + "guest_os_type": "debian", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-parallels", + "parallels_tools_flavor": "lin", + "prlctl": [ + [ + "set", + "{{.Name}}", + "--memsize", + "{{ user `memory` }}" + ], + [ + "set", + "{{.Name}}", + "--cpus", + "{{ user `cpus` }}" + ] + ], + "prlctl_version_file": ".prlctl_version", + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "parallels-iso", + "vm_name": "{{ user `template` }}" + }, + { + "boot_command": [ + "<esc><wait>", + "install <wait>", + " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}} <wait>", + "debian-installer=en_US <wait>", + "auto <wait>", + "locale=en_US <wait>", + "kbd-chooser/method=us <wait>", + "keyboard-configuration/xkb-keymap=us <wait>", + "netcfg/get_hostname={{ .Name }} <wait>", + "netcfg/get_domain=vagrantup.com <wait>", + "fb=false <wait>", + "debconf/frontend=noninteractive <wait>", + "console-setup/ask_detect=false <wait>", + "console-keymaps-at/keymap=us <wait>", + "grub-installer/bootdev=/dev/vda <wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": "{{user `disk_size`}}", + "headless": "{{ user `headless` }}", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-qemu", + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "qemu", + "vm_name": "{{ user `template` }}" + } + ], + "post-processors": [ + { + "output": "builds/{{user `box_basename`}}.{{.Provider}}.box", + "type": "vagrant" + } + ], + "provisioners": [ + { + "destination": "/tmp/bento-metadata.json", + "source": "{{user `metadata`}}", + "type": "file" + }, + { + "environment_vars": [ + "HOME_DIR=/home/vagrant", + "http_proxy={{user `http_proxy`}}", + "https_proxy={{user `https_proxy`}}", + "no_proxy={{user `no_proxy`}}" + ], + "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", + "scripts": [ + "scripts/common/metadata.sh", + "scripts/debian/update.sh", + "scripts/common/sshd.sh", + "scripts/debian/networking.sh", + "scripts/debian/sudoers.sh", + "scripts/common/vagrant.sh", + "scripts/common/vmtools.sh", + "scripts/debian/cleanup.sh", + "scripts/common/minimize.sh" + ], + "type": "shell" + } + ], + "variables": { + "box_basename": "debian-8.5", + "build_timestamp": "{{isotime \"20060102150405\"}}", + "cpus": "1", + "disk_size": "40960", + "git_revision": "__unknown_git_revision__", + "headless": "", + "http_proxy": "{{env `http_proxy`}}", + "https_proxy": "{{env `https_proxy`}}", + "iso_checksum": "f8a71bb612a4c0bba85c676de8dbd63017692ff45b025206c3ec3530baa56964", + "iso_checksum_type": "sha256", + "iso_name": "debian-8.5.0-amd64-CD-1.iso", + "memory": "512", + "metadata": "floppy/dummy_metadata.json", + "mirror": "http://cdimage.debian.org/cdimage/release", + "mirror_directory": "8.5.0/amd64/iso-cd", + "name": "debian-8.5", + "no_proxy": "{{env `no_proxy`}}", + "preseed_path": "debian-8/preseed.cfg", + "template": "debian-8.5-amd64", + "version": "2.1.TIMESTAMP" + } +} diff --git a/debian-8.5-i386.json b/debian-8.5-i386.json new file mode 100644 index 000000000..4d06cd18a --- /dev/null +++ b/debian-8.5-i386.json @@ -0,0 +1,242 @@ +{ + "builders": [ + { + "boot_command": [ + "<esc><wait>", + "install <wait>", + " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}} <wait>", + "debian-installer=en_US <wait>", + "auto <wait>", + "locale=en_US <wait>", + "kbd-chooser/method=us <wait>", + "keyboard-configuration/xkb-keymap=us <wait>", + "netcfg/get_hostname={{ .Name }} <wait>", + "netcfg/get_domain=vagrantup.com <wait>", + "fb=false <wait>", + "debconf/frontend=noninteractive <wait>", + "console-setup/ask_detect=false <wait>", + "console-keymaps-at/keymap=us <wait>", + "grub-installer/bootdev=/dev/sda <wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": "{{user `disk_size`}}", + "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "guest_os_type": "Debian", + "hard_drive_interface": "sata", + "headless": "{{ user `headless` }}", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-virtualbox", + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "virtualbox-iso", + "vboxmanage": [ + [ + "modifyvm", + "{{.Name}}", + "--memory", + "{{ user `memory` }}" + ], + [ + "modifyvm", + "{{.Name}}", + "--cpus", + "{{ user `cpus` }}" + ] + ], + "virtualbox_version_file": ".vbox_version", + "vm_name": "{{ user `template` }}" + }, + { + "boot_command": [ + "<esc><wait>", + "install <wait>", + " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}} <wait>", + "debian-installer=en_US <wait>", + "auto <wait>", + "locale=en_US <wait>", + "kbd-chooser/method=us <wait>", + "keyboard-configuration/xkb-keymap=us <wait>", + "netcfg/get_hostname={{ .Name }} <wait>", + "netcfg/get_domain=vagrantup.com <wait>", + "fb=false <wait>", + "debconf/frontend=noninteractive <wait>", + "console-setup/ask_detect=false <wait>", + "console-keymaps-at/keymap=us <wait>", + "grub-installer/bootdev=/dev/sda <wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": "{{user `disk_size`}}", + "guest_os_type": "debian8", + "headless": "{{ user `headless` }}", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-vmware", + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "tools_upload_flavor": "linux", + "type": "vmware-iso", + "vm_name": "{{ user `template` }}", + "vmx_data": { + "cpuid.coresPerSocket": "1", + "ethernet0.pciSlotNumber": "32", + "memsize": "{{ user `memory` }}", + "numvcpus": "{{ user `cpus` }}" + } + }, + { + "boot_command": [ + "<esc><wait>", + "install <wait>", + " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}} <wait>", + "debian-installer=en_US <wait>", + "auto <wait>", + "locale=en_US <wait>", + "kbd-chooser/method=us <wait>", + "keyboard-configuration/xkb-keymap=us <wait>", + "netcfg/get_hostname={{ .Name }} <wait>", + "netcfg/get_domain=vagrantup.com <wait>", + "fb=false <wait>", + "debconf/frontend=noninteractive <wait>", + "console-setup/ask_detect=false <wait>", + "console-keymaps-at/keymap=us <wait>", + "grub-installer/bootdev=/dev/sda <wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": "{{user `disk_size`}}", + "guest_os_type": "debian", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-parallels", + "parallels_tools_flavor": "lin", + "prlctl": [ + [ + "set", + "{{.Name}}", + "--memsize", + "{{ user `memory` }}" + ], + [ + "set", + "{{.Name}}", + "--cpus", + "{{ user `cpus` }}" + ] + ], + "prlctl_version_file": ".prlctl_version", + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "parallels-iso", + "vm_name": "{{ user `template` }}" + }, + { + "boot_command": [ + "<esc><wait>", + "install <wait>", + " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}} <wait>", + "debian-installer=en_US <wait>", + "auto <wait>", + "locale=en_US <wait>", + "kbd-chooser/method=us <wait>", + "keyboard-configuration/xkb-keymap=us <wait>", + "netcfg/get_hostname={{ .Name }} <wait>", + "netcfg/get_domain=vagrantup.com <wait>", + "fb=false <wait>", + "debconf/frontend=noninteractive <wait>", + "console-setup/ask_detect=false <wait>", + "console-keymaps-at/keymap=us <wait>", + "grub-installer/bootdev=/dev/vda <wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": "{{user `disk_size`}}", + "headless": "{{ user `headless` }}", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-qemu", + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "qemu", + "vm_name": "{{ user `template` }}" + } + ], + "post-processors": [ + { + "output": "builds/{{user `box_basename`}}.{{.Provider}}.box", + "type": "vagrant" + } + ], + "provisioners": [ + { + "destination": "/tmp/bento-metadata.json", + "source": "{{user `metadata`}}", + "type": "file" + }, + { + "environment_vars": [ + "HOME_DIR=/home/vagrant", + "http_proxy={{user `http_proxy`}}", + "https_proxy={{user `https_proxy`}}", + "no_proxy={{user `no_proxy`}}" + ], + "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", + "scripts": [ + "scripts/common/metadata.sh", + "scripts/debian/update.sh", + "scripts/common/sshd.sh", + "scripts/debian/networking.sh", + "scripts/debian/sudoers.sh", + "scripts/common/vagrant.sh", + "scripts/common/vmtools.sh", + "scripts/debian/cleanup.sh", + "scripts/common/minimize.sh" + ], + "type": "shell" + } + ], + "variables": { + "box_basename": "debian-8.5-i386", + "build_timestamp": "{{isotime \"20060102150405\"}}", + "cpus": "1", + "disk_size": "40960", + "git_revision": "__unknown_git_revision__", + "headless": "", + "http_proxy": "{{env `http_proxy`}}", + "https_proxy": "{{env `https_proxy`}}", + "iso_checksum": "c02042cc8602114cd2ad3a354fc37a73456443b38594b0259b1c62487b929567", + "iso_checksum_type": "sha256", + "iso_name": "debian-8.5.0-i386-CD-1.iso", + "memory": "512", + "metadata": "floppy/dummy_metadata.json", + "mirror": "http://cdimage.debian.org/cdimage/release", + "mirror_directory": "8.5.0/i386/iso-cd", + "name": "debian-8.5-i386", + "no_proxy": "{{env `no_proxy`}}", + "preseed_path": "debian-8/preseed.cfg", + "template": "debian-8.5-i386", + "version": "2.1.TIMESTAMP" + } +} From d72c80a31c6f86e9dd6ee3af2e5ea70b71ffa820 Mon Sep 17 00:00:00 2001 From: Seth Thomas <cheeseplus@getchef.io> Date: Tue, 7 Jun 2016 10:56:57 -0700 Subject: [PATCH 0510/1622] Fixing errant comment from testing --- bin/bento | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/bento b/bin/bento index f8916839e..51fc52724 100755 --- a/bin/bento +++ b/bin/bento @@ -706,7 +706,7 @@ class UploadRunner create_box_version(metadata['name'], metadata['version']) create_providers(metadata['name'], metadata['version'], metadata['providers'].keys) upload_to_atlas(metadata['name'], metadata['version'], metadata['providers']) - # upload_to_s3(metadata['name'], metadata['version'], metadata['providers']) + upload_to_s3(metadata['name'], metadata['version'], metadata['providers']) end end banner("Atlas uploads finished in #{duration(time.real)}.") From ac035cfe81a315a9db1829da8ea205af121e05fa Mon Sep 17 00:00:00 2001 From: Rickard von Essen <rickard.von.essen@gmail.com> Date: Mon, 13 Jun 2016 20:34:34 +0200 Subject: [PATCH 0511/1622] FreeBSD: Properly set roots password. --- freebsd-10.2-amd64.json | 10 +++++----- freebsd-10.2-i386.json | 10 +++++----- freebsd-10.3-amd64.json | 10 +++++----- freebsd-10.3-i386.json | 10 +++++----- freebsd-9.3-amd64.json | 10 +++++----- freebsd-9.3-i386.json | 10 +++++----- http/freebsd-10/install.sh | 2 +- http/freebsd-9.3/install.sh | 2 +- 8 files changed, 32 insertions(+), 32 deletions(-) diff --git a/freebsd-10.2-amd64.json b/freebsd-10.2-amd64.json index 072c0c873..c2081ad4f 100644 --- a/freebsd-10.2-amd64.json +++ b/freebsd-10.2-amd64.json @@ -22,7 +22,7 @@ "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", "output_directory": "packer-{{user `template`}}-virtualbox", - "shutdown_command": "su -m root -c 'shutdown -p now'", + "shutdown_command": "echo 'vagrant' | su -m root -c 'shutdown -p now'", "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", @@ -67,7 +67,7 @@ "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", "output_directory": "packer-{{user `template`}}-vmare", - "shutdown_command": "su -m root -c 'shutdown -p now'", + "shutdown_command": "echo 'vagrant' | su -m root -c 'shutdown -p now'", "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", @@ -137,7 +137,7 @@ ] ], "prlctl_version_file": ".prlctl_version", - "shutdown_command": "su -m root -c 'shutdown -p now'", + "shutdown_command": "echo 'vagrant' | su -m root -c 'shutdown -p now'", "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", @@ -165,7 +165,7 @@ "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", "output_directory": "packer-{{user `template`}}-qemu", - "shutdown_command": "su -m root -c 'shutdown -p now'", + "shutdown_command": "echo 'vagrant' | su -m root -c 'shutdown -p now'", "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", @@ -194,7 +194,7 @@ "https_proxy={{user `https_proxy`}}", "no_proxy={{user `no_proxy`}}" ], - "execute_command": "{{.Vars}} su -m root -c 'sh -eux {{.Path}}'", + "execute_command": "echo 'vagrant' | {{.Vars}} su -m root -c 'sh -eux {{.Path}}'", "scripts": [ "scripts/common/metadata.sh", "scripts/freebsd/update.sh", diff --git a/freebsd-10.2-i386.json b/freebsd-10.2-i386.json index 57f45adf2..c45d41177 100644 --- a/freebsd-10.2-i386.json +++ b/freebsd-10.2-i386.json @@ -22,7 +22,7 @@ "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", "output_directory": "packer-{{user `template`}}-virtualbox", - "shutdown_command": "su -m root -c 'shutdown -p now'", + "shutdown_command": "echo 'vagrant' | su -m root -c 'shutdown -p now'", "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", @@ -67,7 +67,7 @@ "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", "output_directory": "packer-{{user `template`}}-vmare", - "shutdown_command": "su -m root -c 'shutdown -p now'", + "shutdown_command": "echo 'vagrant' | su -m root -c 'shutdown -p now'", "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", @@ -137,7 +137,7 @@ ] ], "prlctl_version_file": ".prlctl_version", - "shutdown_command": "su -m root -c 'shutdown -p now'", + "shutdown_command": "echo 'vagrant' | su -m root -c 'shutdown -p now'", "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", @@ -165,7 +165,7 @@ "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", "output_directory": "packer-{{user `template`}}-qemu", - "shutdown_command": "su -m root -c 'shutdown -p now'", + "shutdown_command": "echo 'vagrant' | su -m root -c 'shutdown -p now'", "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", @@ -194,7 +194,7 @@ "https_proxy={{user `https_proxy`}}", "no_proxy={{user `no_proxy`}}" ], - "execute_command": "{{.Vars}} su -m root -c 'sh -eux {{.Path}}'", + "execute_command": "echo 'vagrant' | {{.Vars}} su -m root -c 'sh -eux {{.Path}}'", "scripts": [ "scripts/common/metadata.sh", "scripts/freebsd/update.sh", diff --git a/freebsd-10.3-amd64.json b/freebsd-10.3-amd64.json index 7c348a339..35f956959 100644 --- a/freebsd-10.3-amd64.json +++ b/freebsd-10.3-amd64.json @@ -22,7 +22,7 @@ "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", "output_directory": "packer-{{user `template`}}-virtualbox", - "shutdown_command": "su -m root -c 'shutdown -p now'", + "shutdown_command": "echo 'vagrant' | su -m root -c 'shutdown -p now'", "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", @@ -67,7 +67,7 @@ "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", "output_directory": "packer-{{user `template`}}-vmare", - "shutdown_command": "su -m root -c 'shutdown -p now'", + "shutdown_command": "echo 'vagrant' | su -m root -c 'shutdown -p now'", "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", @@ -137,7 +137,7 @@ ] ], "prlctl_version_file": ".prlctl_version", - "shutdown_command": "su -m root -c 'shutdown -p now'", + "shutdown_command": "echo 'vagrant' | su -m root -c 'shutdown -p now'", "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", @@ -165,7 +165,7 @@ "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", "output_directory": "packer-{{user `template`}}-qemu", - "shutdown_command": "su -m root -c 'shutdown -p now'", + "shutdown_command": "echo 'vagrant' | su -m root -c 'shutdown -p now'", "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", @@ -194,7 +194,7 @@ "https_proxy={{user `https_proxy`}}", "no_proxy={{user `no_proxy`}}" ], - "execute_command": "{{.Vars}} su -m root -c 'sh -eux {{.Path}}'", + "execute_command": "echo 'vagrant' | {{.Vars}} su -m root -c 'sh -eux {{.Path}}'", "scripts": [ "scripts/common/metadata.sh", "scripts/freebsd/update.sh", diff --git a/freebsd-10.3-i386.json b/freebsd-10.3-i386.json index 99a771e7f..1b6a2bd8c 100644 --- a/freebsd-10.3-i386.json +++ b/freebsd-10.3-i386.json @@ -22,7 +22,7 @@ "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", "output_directory": "packer-{{user `template`}}-virtualbox", - "shutdown_command": "su -m root -c 'shutdown -p now'", + "shutdown_command": "echo 'vagrant' | su -m root -c 'shutdown -p now'", "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", @@ -67,7 +67,7 @@ "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", "output_directory": "packer-{{user `template`}}-vmare", - "shutdown_command": "su -m root -c 'shutdown -p now'", + "shutdown_command": "echo 'vagrant' | su -m root -c 'shutdown -p now'", "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", @@ -137,7 +137,7 @@ ] ], "prlctl_version_file": ".prlctl_version", - "shutdown_command": "su -m root -c 'shutdown -p now'", + "shutdown_command": "echo 'vagrant' | su -m root -c 'shutdown -p now'", "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", @@ -165,7 +165,7 @@ "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", "output_directory": "packer-{{user `template`}}-qemu", - "shutdown_command": "su -m root -c 'shutdown -p now'", + "shutdown_command": "echo 'vagrant' | su -m root -c 'shutdown -p now'", "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", @@ -194,7 +194,7 @@ "https_proxy={{user `https_proxy`}}", "no_proxy={{user `no_proxy`}}" ], - "execute_command": "{{.Vars}} su -m root -c 'sh -eux {{.Path}}'", + "execute_command": "echo 'vagrant' | {{.Vars}} su -m root -c 'sh -eux {{.Path}}'", "scripts": [ "scripts/common/metadata.sh", "scripts/freebsd/update.sh", diff --git a/freebsd-9.3-amd64.json b/freebsd-9.3-amd64.json index 147624160..6055ccdfd 100644 --- a/freebsd-9.3-amd64.json +++ b/freebsd-9.3-amd64.json @@ -26,7 +26,7 @@ "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", "output_directory": "packer-{{user `template`}}-virtualbox", - "shutdown_command": "su -m root -c 'shutdown -p now'", + "shutdown_command": "echo 'vagrant' | su -m root -c 'shutdown -p now'", "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", @@ -75,7 +75,7 @@ "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", "output_directory": "packer-{{user `template`}}-vmare", - "shutdown_command": "su -m root -c 'shutdown -p now'", + "shutdown_command": "echo 'vagrant' | su -m root -c 'shutdown -p now'", "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", @@ -149,7 +149,7 @@ ] ], "prlctl_version_file": ".prlctl_version", - "shutdown_command": "su -m root -c 'shutdown -p now'", + "shutdown_command": "echo 'vagrant' | su -m root -c 'shutdown -p now'", "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", @@ -181,7 +181,7 @@ "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", "output_directory": "packer-{{user `template`}}-qemu", - "shutdown_command": "su -m root -c 'shutdown -p now'", + "shutdown_command": "echo 'vagrant' | su -m root -c 'shutdown -p now'", "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", @@ -210,7 +210,7 @@ "https_proxy={{user `https_proxy`}}", "no_proxy={{user `no_proxy`}}" ], - "execute_command": "{{.Vars}} su -m root -c 'sh -eux {{.Path}}'", + "execute_command": "echo 'vagrant' | {{.Vars}} su -m root -c 'sh -eux {{.Path}}'", "scripts": [ "scripts/common/metadata.sh", "scripts/freebsd/update.sh", diff --git a/freebsd-9.3-i386.json b/freebsd-9.3-i386.json index fb1827c84..1582d6b79 100644 --- a/freebsd-9.3-i386.json +++ b/freebsd-9.3-i386.json @@ -26,7 +26,7 @@ "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", "output_directory": "packer-{{user `template`}}-virtualbox", - "shutdown_command": "su -m root -c 'shutdown -p now'", + "shutdown_command": "echo 'vagrant' | su -m root -c 'shutdown -p now'", "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", @@ -75,7 +75,7 @@ "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", "output_directory": "packer-{{user `template`}}-vmare", - "shutdown_command": "su -m root -c 'shutdown -p now'", + "shutdown_command": "echo 'vagrant' | su -m root -c 'shutdown -p now'", "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", @@ -149,7 +149,7 @@ ] ], "prlctl_version_file": ".prlctl_version", - "shutdown_command": "su -m root -c 'shutdown -p now'", + "shutdown_command": "echo 'vagrant' | su -m root -c 'shutdown -p now'", "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", @@ -181,7 +181,7 @@ "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", "output_directory": "packer-{{user `template`}}-qemu", - "shutdown_command": "su -m root -c 'shutdown -p now'", + "shutdown_command": "echo 'vagrant' | su -m root -c 'shutdown -p now'", "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", @@ -210,7 +210,7 @@ "https_proxy={{user `https_proxy`}}", "no_proxy={{user `no_proxy`}}" ], - "execute_command": "{{.Vars}} su -m root -c 'sh -eux {{.Path}}'", + "execute_command": "echo 'vagrant' | {{.Vars}} su -m root -c 'sh -eux {{.Path}}'", "scripts": [ "scripts/common/metadata.sh", "scripts/freebsd/update.sh", diff --git a/http/freebsd-10/install.sh b/http/freebsd-10/install.sh index 8757ffdbd..e8fc9c106 100644 --- a/http/freebsd-10/install.sh +++ b/http/freebsd-10/install.sh @@ -95,7 +95,7 @@ touch /mnt/zroot/etc/fstab # Set up user accounts zfs create zroot/usr/home/vagrant echo "vagrant" | pw -V /mnt/zroot/etc useradd vagrant -h 0 -s /bin/sh -G wheel -d /home/vagrant -c "Vagrant User" -echo "vagrant" | pw -V /mnt/zroot/etc usermod root +echo "vagrant" | pw -V /mnt/zroot/etc usermod root -h 0 chown 1001:1001 /mnt/zroot/home/vagrant diff --git a/http/freebsd-9.3/install.sh b/http/freebsd-9.3/install.sh index 8757ffdbd..e8fc9c106 100644 --- a/http/freebsd-9.3/install.sh +++ b/http/freebsd-9.3/install.sh @@ -95,7 +95,7 @@ touch /mnt/zroot/etc/fstab # Set up user accounts zfs create zroot/usr/home/vagrant echo "vagrant" | pw -V /mnt/zroot/etc useradd vagrant -h 0 -s /bin/sh -G wheel -d /home/vagrant -c "Vagrant User" -echo "vagrant" | pw -V /mnt/zroot/etc usermod root +echo "vagrant" | pw -V /mnt/zroot/etc usermod root -h 0 chown 1001:1001 /mnt/zroot/home/vagrant From 51e33c5cc1dec8a3942356cdb7c91bd0026f9394 Mon Sep 17 00:00:00 2001 From: Jared Baldridge <jrb@expunge.us> Date: Tue, 14 Jun 2016 15:58:24 -0700 Subject: [PATCH 0512/1622] Disabling unattended apt upgrades --- http/debian-6.0/preseed.cfg | 2 +- http/debian-7/preseed.cfg | 2 +- http/debian-8/preseed.cfg | 2 +- http/ubuntu-10.04/preseed.cfg | 2 +- http/ubuntu-12.04/preseed.cfg | 2 +- http/ubuntu-14.04/preseed.cfg | 2 +- http/ubuntu-14.10/preseed.cfg | 2 +- http/ubuntu-15.04/preseed.cfg | 2 +- http/ubuntu-15.10/preseed.cfg | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/http/debian-6.0/preseed.cfg b/http/debian-6.0/preseed.cfg index ced8699d2..fcf343623 100644 --- a/http/debian-6.0/preseed.cfg +++ b/http/debian-6.0/preseed.cfg @@ -32,7 +32,7 @@ d-i passwd/user-password-again password vagrant d-i passwd/username string vagrant d-i pkgsel/include string openssh-server sudo bzip2 acpid cryptsetup zlib1g-dev wget curl dkms make nfs-common d-i pkgsel/install-language-support boolean false -d-i pkgsel/update-policy select unattended-upgrades +d-i pkgsel/update-policy select none d-i pkgsel/upgrade select full-upgrade # Prevent packaged version of VirtualBox Guest Additions being installed: d-i preseed/early_command string sed -i \ diff --git a/http/debian-7/preseed.cfg b/http/debian-7/preseed.cfg index 8640675a8..9b996d3e9 100644 --- a/http/debian-7/preseed.cfg +++ b/http/debian-7/preseed.cfg @@ -32,7 +32,7 @@ d-i passwd/user-password-again password vagrant d-i passwd/username string vagrant d-i pkgsel/include string openssh-server sudo bzip2 acpid cryptsetup zlib1g-dev wget curl dkms make nfs-common d-i pkgsel/install-language-support boolean false -d-i pkgsel/update-policy select unattended-upgrades +d-i pkgsel/update-policy select none d-i pkgsel/upgrade select full-upgrade # Prevent packaged version of VirtualBox Guest Additions being installed: d-i preseed/early_command string sed -i \ diff --git a/http/debian-8/preseed.cfg b/http/debian-8/preseed.cfg index e33462177..bde0adcbc 100644 --- a/http/debian-8/preseed.cfg +++ b/http/debian-8/preseed.cfg @@ -32,7 +32,7 @@ d-i passwd/user-password-again password vagrant d-i passwd/username string vagrant d-i pkgsel/include string sudo bzip2 acpid cryptsetup zlib1g-dev wget curl dkms make nfs-common d-i pkgsel/install-language-support boolean false -d-i pkgsel/update-policy select unattended-upgrades +d-i pkgsel/update-policy select none d-i pkgsel/upgrade select full-upgrade # Prevent packaged version of VirtualBox Guest Additions being installed: d-i preseed/early_command string sed -i \ diff --git a/http/ubuntu-10.04/preseed.cfg b/http/ubuntu-10.04/preseed.cfg index 0a4d4939b..a0b1ba1f9 100644 --- a/http/ubuntu-10.04/preseed.cfg +++ b/http/ubuntu-10.04/preseed.cfg @@ -23,7 +23,7 @@ d-i passwd/user-password-again password vagrant d-i passwd/username string vagrant d-i pkgsel/include string openssh-server cryptsetup build-essential libssl-dev libreadline-dev zlib1g-dev linux-source dkms nfs-common d-i pkgsel/install-language-support boolean false -d-i pkgsel/update-policy select unattended-upgrades +d-i pkgsel/update-policy select none d-i pkgsel/upgrade select full-upgrade d-i time/zone string UTC d-i user-setup/allow-password-weak boolean true diff --git a/http/ubuntu-12.04/preseed.cfg b/http/ubuntu-12.04/preseed.cfg index 839c4602d..d56685fa5 100644 --- a/http/ubuntu-12.04/preseed.cfg +++ b/http/ubuntu-12.04/preseed.cfg @@ -23,7 +23,7 @@ d-i passwd/user-password-again password vagrant d-i passwd/username string vagrant d-i pkgsel/include string openssh-server cryptsetup build-essential libssl-dev zlib1g-dev linux-source nfs-common linux-headers-$(uname -r) perl d-i pkgsel/install-language-support boolean false -d-i pkgsel/update-policy select unattended-upgrades +d-i pkgsel/update-policy select none d-i pkgsel/upgrade select full-upgrade d-i time/zone string UTC d-i user-setup/allow-password-weak boolean true diff --git a/http/ubuntu-14.04/preseed.cfg b/http/ubuntu-14.04/preseed.cfg index 572015513..b1350ecef 100644 --- a/http/ubuntu-14.04/preseed.cfg +++ b/http/ubuntu-14.04/preseed.cfg @@ -23,7 +23,7 @@ d-i passwd/user-password-again password vagrant d-i passwd/username string vagrant d-i pkgsel/include string openssh-server cryptsetup build-essential libssl-dev libreadline-dev zlib1g-dev linux-source dkms nfs-common linux-headers-$(uname -r) perl d-i pkgsel/install-language-support boolean false -d-i pkgsel/update-policy select unattended-upgrades +d-i pkgsel/update-policy select none d-i pkgsel/upgrade select full-upgrade d-i time/zone string UTC d-i user-setup/allow-password-weak boolean true diff --git a/http/ubuntu-14.10/preseed.cfg b/http/ubuntu-14.10/preseed.cfg index 0a4d4939b..a0b1ba1f9 100644 --- a/http/ubuntu-14.10/preseed.cfg +++ b/http/ubuntu-14.10/preseed.cfg @@ -23,7 +23,7 @@ d-i passwd/user-password-again password vagrant d-i passwd/username string vagrant d-i pkgsel/include string openssh-server cryptsetup build-essential libssl-dev libreadline-dev zlib1g-dev linux-source dkms nfs-common d-i pkgsel/install-language-support boolean false -d-i pkgsel/update-policy select unattended-upgrades +d-i pkgsel/update-policy select none d-i pkgsel/upgrade select full-upgrade d-i time/zone string UTC d-i user-setup/allow-password-weak boolean true diff --git a/http/ubuntu-15.04/preseed.cfg b/http/ubuntu-15.04/preseed.cfg index 0a4d4939b..a0b1ba1f9 100644 --- a/http/ubuntu-15.04/preseed.cfg +++ b/http/ubuntu-15.04/preseed.cfg @@ -23,7 +23,7 @@ d-i passwd/user-password-again password vagrant d-i passwd/username string vagrant d-i pkgsel/include string openssh-server cryptsetup build-essential libssl-dev libreadline-dev zlib1g-dev linux-source dkms nfs-common d-i pkgsel/install-language-support boolean false -d-i pkgsel/update-policy select unattended-upgrades +d-i pkgsel/update-policy select none d-i pkgsel/upgrade select full-upgrade d-i time/zone string UTC d-i user-setup/allow-password-weak boolean true diff --git a/http/ubuntu-15.10/preseed.cfg b/http/ubuntu-15.10/preseed.cfg index 572015513..b1350ecef 100644 --- a/http/ubuntu-15.10/preseed.cfg +++ b/http/ubuntu-15.10/preseed.cfg @@ -23,7 +23,7 @@ d-i passwd/user-password-again password vagrant d-i passwd/username string vagrant d-i pkgsel/include string openssh-server cryptsetup build-essential libssl-dev libreadline-dev zlib1g-dev linux-source dkms nfs-common linux-headers-$(uname -r) perl d-i pkgsel/install-language-support boolean false -d-i pkgsel/update-policy select unattended-upgrades +d-i pkgsel/update-policy select none d-i pkgsel/upgrade select full-upgrade d-i time/zone string UTC d-i user-setup/allow-password-weak boolean true From 79b90c501f27569bbbab235731681dfc5cf16d8b Mon Sep 17 00:00:00 2001 From: Apollo Catlin <apollo@threatstack.com> Date: Thu, 16 Jun 2016 10:46:50 -0400 Subject: [PATCH 0513/1622] update apt sources to use archive.debian.org for packages --- debian-6.0.10-amd64.json | 1 + scripts/debian/debian6-apt.sh | 3 +++ 2 files changed, 4 insertions(+) create mode 100644 scripts/debian/debian6-apt.sh diff --git a/debian-6.0.10-amd64.json b/debian-6.0.10-amd64.json index 87cb668db..30ebb36b5 100644 --- a/debian-6.0.10-amd64.json +++ b/debian-6.0.10-amd64.json @@ -200,6 +200,7 @@ "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", "scripts": [ "scripts/common/metadata.sh", + "scripts/debian/debian6-apt.sh", "scripts/debian/update.sh", "scripts/common/sshd.sh", "scripts/debian/networking.sh", diff --git a/scripts/debian/debian6-apt.sh b/scripts/debian/debian6-apt.sh new file mode 100644 index 000000000..6cd65e923 --- /dev/null +++ b/scripts/debian/debian6-apt.sh @@ -0,0 +1,3 @@ +#!/bin/sh -eux + +sed -i 's/mirrors.kernel.org/archive.debian.org/g' /etc/apt/sources.list From 68367f95e81298d7808b36ce9ccdf403f6a31ff1 Mon Sep 17 00:00:00 2001 From: Apollo Catlin <apollo@threatstack.com> Date: Thu, 16 Jun 2016 10:52:03 -0400 Subject: [PATCH 0514/1622] update i386 debian template with apt update --- debian-6.0.10-i386.json | 1 + 1 file changed, 1 insertion(+) diff --git a/debian-6.0.10-i386.json b/debian-6.0.10-i386.json index 60ffe78f0..4d45329cd 100644 --- a/debian-6.0.10-i386.json +++ b/debian-6.0.10-i386.json @@ -200,6 +200,7 @@ "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", "scripts": [ "scripts/common/metadata.sh", + "scripts/debian/debian6-apt.sh", "scripts/debian/update.sh", "scripts/common/sshd.sh", "scripts/debian/networking.sh", From d0c2e56fcc4ec81e152af6c5fbdf1f115f976e95 Mon Sep 17 00:00:00 2001 From: Mikhail Zholobov <legal90@gmail.com> Date: Mon, 20 Jun 2016 11:14:08 +0300 Subject: [PATCH 0515/1622] Fix new-style device naming from Network Manager on RHEL/CentOS 7 --- scripts/centos/cleanup.sh | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/scripts/centos/cleanup.sh b/scripts/centos/cleanup.sh index 4399e21ee..21065f708 100644 --- a/scripts/centos/cleanup.sh +++ b/scripts/centos/cleanup.sh @@ -23,4 +23,36 @@ for ndev in `ls -1 /etc/sysconfig/network-scripts/ifcfg-*`; do fi done +# new-style network device naming for centos7 +if grep -q -i "release 7" /etc/redhat-release ; then + # radio off & remove all interface configration + nmcli radio all off + /bin/systemctl stop NetworkManager.service + for ifcfg in `ls /etc/sysconfig/network-scripts/ifcfg-* |grep -v ifcfg-lo` ; do + rm -f $ifcfg + done + rm -rf /var/lib/NetworkManager/* + + echo "==> Setup /etc/rc.d/rc.local for CentOS7" + cat <<_EOF_ | cat >> /etc/rc.d/rc.local +#BENTO-BEGIN +LANG=C +# delete all connection +for con in \`nmcli -t -f uuid con\`; do + if [ "\$con" != "" ]; then + nmcli con del \$con + fi +done +# add gateway interface connection. +gwdev=\`nmcli dev | grep ethernet | egrep -v 'unmanaged' | head -n 1 | awk '{print \$1}'\` +if [ "\$gwdev" != "" ]; then + nmcli c add type eth ifname \$gwdev con-name \$gwdev +fi +sed -i "/^#BENTO-BEGIN/,/^#BENTO-END/d" /etc/rc.d/rc.local +chmod -x /etc/rc.d/rc.local +#BENTO-END +_EOF_ + chmod +x /etc/rc.d/rc.local +fi + rm -f VBoxGuestAdditions_*.iso VBoxGuestAdditions_*.iso.?; From dda076dd2b76f1fc2ff0cd49b15a82cccae23774 Mon Sep 17 00:00:00 2001 From: Artem Sidorenko <artem@posteo.de> Date: Thu, 7 Jul 2016 13:45:42 +0200 Subject: [PATCH 0516/1622] Disable periodic activities of apt To avoid blocking of dpkg https://github.com/chef/bento/issues/609#issuecomment-227202607 --- scripts/ubuntu/update.sh | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/scripts/ubuntu/update.sh b/scripts/ubuntu/update.sh index e7f76ee3c..fe99707c6 100644 --- a/scripts/ubuntu/update.sh +++ b/scripts/ubuntu/update.sh @@ -32,3 +32,8 @@ EOF if [ "$ubuntu_version" = "12.04" ]; then apt-get -y install libreadline-dev dpkg; fi + +# Disable periodic activities of apt +cat <<EOF >/etc/apt/apt.conf.d/10disable-periodic +APT::Periodic::Enable "0"; +EOF From 9f4a73ab99e3951780099b947091244c4bffd5e0 Mon Sep 17 00:00:00 2001 From: Seth Thomas <sthomas@chef.io> Date: Sat, 9 Jul 2016 12:16:06 -0400 Subject: [PATCH 0517/1622] The power of ERB compels you --- .kitchen.yml.erb | 16 ++++++++++++++++ bin/bento | 31 +++++++++++++++---------------- bootstrap.sh | 1 + 3 files changed, 32 insertions(+), 16 deletions(-) create mode 100644 .kitchen.yml.erb create mode 100644 bootstrap.sh diff --git a/.kitchen.yml.erb b/.kitchen.yml.erb new file mode 100644 index 000000000..15881fe27 --- /dev/null +++ b/.kitchen.yml.erb @@ -0,0 +1,16 @@ +--- +provisioner: + name: <%= @provisioner %> + +platforms: +- name: "<%= @boxname %>" + driver: + name: vagrant + synced_folders: + - [".", "/vagrant", "disabled: <%= @share_disabled %>"] + provider: <%= @provider %> + box: bento-<%= @boxname %> + box_url: <%= @box_url %> + +suites: +- name: default diff --git a/bin/bento b/bin/bento index 51fc52724..29e5f6aab 100755 --- a/bin/bento +++ b/bin/bento @@ -16,6 +16,7 @@ require 'net/http' require 'aws-sdk' require 'kitchen' require 'mixlib/shellout' +require 'erb' class Options @@ -126,8 +127,12 @@ class Options opts.on("-f", "--shared-folder", "Enable shared folder") do |opt| options.shared_folder = opt end + + opts.on("-p", "--provisioner PROVISIONER", "Use a specfic provisioner") do |opt| + options.provisioner = opt + end }, - argv: box_version_argv_proc + argv: Proc.new {} }, upload: { class: UploadRunner, @@ -511,11 +516,12 @@ end class TestRunner include Common - attr_reader :shared_folder + attr_reader :shared_folder, :boxname, :provider, :box_url, :share_disabled, :provisioner def initialize(opts) @debug = opts.debug @shared_folder = opts.shared_folder + @provisioner = opts.provisioner.nil? ? "shell" : opts.provisioner end def start @@ -562,20 +568,13 @@ class TestRunner end end - share_disabled = shared_folder ? false : true + @boxname = boxname + @provider = provider + @share_disabled = shared_folder ? false : true + @box_url = "file://#{ENV['PWD']}/builds/#{provider_data['file']}" - kitchen_cfg = {"provisioner"=>{"name"=>"chef_zero", "data_path"=>"test/fixtures"}, - "platforms"=> - [{"name"=>"#{boxname}-#{provider}", - "driver"=> - {"name"=>"vagrant", - "synced_folders"=>[[".", "/vagrant", "disabled: #{share_disabled}"]], - "provider"=>provider, - "box"=>"bento-#{boxname}", - "box_url"=>"file://#{ENV['PWD']}/builds/#{provider_data['file']}"}}], - "suites"=>[{"name"=>"default", "run_list"=>nil, "attributes"=>{}}]} - - File.open(".kitchen.#{provider}.yml", "w") { |f| f.write(kitchen_cfg.to_yaml) } + kitchen_cfg = ERB.new(File.read('.kitchen.yml.erb'), nil, '-').result(binding) + File.open(".kitchen.#{provider}.yml", "w") { |f| f.puts kitchen_cfg } Kitchen.logger = Kitchen.default_file_logger @loader = Kitchen::Loader::YAML.new(project_config: "./.kitchen.#{provider}.yml") @@ -777,7 +776,7 @@ class UploadRunner warn("Body: #{req.body}") end end - + def upload_to_s3(boxname, version, providers) providers.each do |provider, provider_data| boxfile = provider_data['file'] diff --git a/bootstrap.sh b/bootstrap.sh new file mode 100644 index 000000000..99d3975e1 --- /dev/null +++ b/bootstrap.sh @@ -0,0 +1 @@ +echo "Shell Provisioner Says What" From 3b607245474ede2600ab5ddffd84c846b81ec0f9 Mon Sep 17 00:00:00 2001 From: Seth Thomas <sthomas@chef.io> Date: Sat, 9 Jul 2016 12:24:37 -0400 Subject: [PATCH 0518/1622] 16.04 should use open-vm-tools --- scripts/common/vmtools.sh | 41 ++++++++++++++++++++++++--------------- 1 file changed, 25 insertions(+), 16 deletions(-) diff --git a/scripts/common/vmtools.sh b/scripts/common/vmtools.sh index 0d9880fd1..1a67806a8 100644 --- a/scripts/common/vmtools.sh +++ b/scripts/common/vmtools.sh @@ -21,26 +21,35 @@ virtualbox-iso|virtualbox-ovf) ;; vmware-iso|vmware-vmx) - mkdir -p /tmp/vmware; - mkdir -p /tmp/vmware-archive; - mount -o loop $HOME_DIR/linux.iso /tmp/vmware; + ubuntu_version="`lsb_release -r | awk '{print $2}'`"; + ubuntu_major_version="`echo $ubuntu_version | awk -F. '{print $1}'`"; - TOOLS_PATH="`ls /tmp/vmware/VMwareTools-*.tar.gz`"; - VER="`echo "${TOOLS_PATH}" | cut -f2 -d'-'`"; - MAJ_VER="`echo ${VER} | cut -d '.' -f 1`"; + # Use open-vm-tools + if [ "$ubuntu_version" = "16.04" ]; then + apt-get install -y open-vm-tools + mkdir /mnt/hgfs; + else + mkdir -p /tmp/vmware; + mkdir -p /tmp/vmware-archive; + mount -o loop $HOME_DIR/linux.iso /tmp/vmware; - echo "VMware Tools Version: $VER"; + TOOLS_PATH="`ls /tmp/vmware/VMwareTools-*.tar.gz`"; + VER="`echo "${TOOLS_PATH}" | cut -f2 -d'-'`"; + MAJ_VER="`echo ${VER} | cut -d '.' -f 1`"; - tar xzf ${TOOLS_PATH} -C /tmp/vmware-archive; - if [ "${MAJ_VER}" -lt "10" ]; then - /tmp/vmware-archive/vmware-tools-distrib/vmware-install.pl --default; - else - /tmp/vmware-archive/vmware-tools-distrib/vmware-install.pl --force-install; + echo "VMware Tools Version: $VER"; + + tar xzf ${TOOLS_PATH} -C /tmp/vmware-archive; + if [ "${MAJ_VER}" -lt "10" ]; then + /tmp/vmware-archive/vmware-tools-distrib/vmware-install.pl --default; + else + /tmp/vmware-archive/vmware-tools-distrib/vmware-install.pl --force-install; + fi + umount /tmp/vmware; + rm -rf /tmp/vmware; + rm -rf /tmp/vmware-archive; + rm -f $HOME_DIR/*.iso; fi - umount /tmp/vmware; - rm -rf /tmp/vmware; - rm -rf /tmp/vmware-archive; - rm -f $HOME_DIR/*.iso; ;; parallels-iso|parallels-pvm) From 1fdf255a39b7c017de46c2b34a7ddeb20b89296d Mon Sep 17 00:00:00 2001 From: Seth Thomas <sthomas@chef.io> Date: Sat, 9 Jul 2016 16:03:31 -0400 Subject: [PATCH 0519/1622] Archiving all non-current builds --- debian-6.0.10-amd64.json => archive/debian-6.0.10-amd64.json | 0 debian-6.0.10-i386.json => archive/debian-6.0.10-i386.json | 0 debian-7.10-amd64.json => archive/debian-7.10-amd64.json | 0 debian-7.10-i386.json => archive/debian-7.10-i386.json | 0 debian-7.8-amd64.json => archive/debian-7.8-amd64.json | 0 debian-7.8-i386.json => archive/debian-7.8-i386.json | 0 debian-7.9-amd64.json => archive/debian-7.9-amd64.json | 0 debian-7.9-i386.json => archive/debian-7.9-i386.json | 0 debian-8.1-amd64.json => archive/debian-8.1-amd64.json | 0 debian-8.1-i386.json => archive/debian-8.1-i386.json | 0 debian-8.2-amd64.json => archive/debian-8.2-amd64.json | 0 debian-8.2-i386.json => archive/debian-8.2-i386.json | 0 debian-8.3-amd64.json => archive/debian-8.3-amd64.json | 0 debian-8.3-i386.json => archive/debian-8.3-i386.json | 0 debian-8.4-amd64.json => archive/debian-8.4-amd64.json | 0 debian-8.4-i386.json => archive/debian-8.4-i386.json | 0 fedora-20-i386.json => archive/fedora-20-i386.json | 0 fedora-20-x86_64.json => archive/fedora-20-x86_64.json | 0 fedora-21-i386.json => archive/fedora-21-i386.json | 0 fedora-21-x86_64.json => archive/fedora-21-x86_64.json | 0 freebsd-10.2-amd64.json => archive/freebsd-10.2-amd64.json | 0 freebsd-10.2-i386.json => archive/freebsd-10.2-i386.json | 0 omnios-r151010j.json => archive/omnios-r151010j.json | 0 oracle-6.6-i386.json => archive/oracle-6.6-i386.json | 0 oracle-6.6-x86_64.json => archive/oracle-6.6-x86_64.json | 0 rhel-6.7-i386.json => archive/rhel-6.7-i386.json | 0 rhel-6.7-x86_64.json => archive/rhel-6.7-x86_64.json | 0 sles-11-sp2-i386.json => archive/sles-11-sp2-i386.json | 0 sles-11-sp2-x86_64.json => archive/sles-11-sp2-x86_64.json | 0 sles-11-sp3-i386.json => archive/sles-11-sp3-i386.json | 0 sles-11-sp3-x86_64.json => archive/sles-11-sp3-x86_64.json | 0 sles-11-sp4-i386.json => archive/sles-11-sp4-i386.json | 0 sles-11-sp4-x86_64.json => archive/sles-11-sp4-x86_64.json | 0 ubuntu-10.04-amd64.json => archive/ubuntu-10.04-amd64.json | 0 ubuntu-10.04-i386.json => archive/ubuntu-10.04-i386.json | 0 ubuntu-14.10-amd64.json => archive/ubuntu-14.10-amd64.json | 0 ubuntu-14.10-i386.json => archive/ubuntu-14.10-i386.json | 0 ubuntu-15.04-amd64.json => archive/ubuntu-15.04-amd64.json | 0 ubuntu-15.04-i386.json => archive/ubuntu-15.04-i386.json | 0 39 files changed, 0 insertions(+), 0 deletions(-) rename debian-6.0.10-amd64.json => archive/debian-6.0.10-amd64.json (100%) rename debian-6.0.10-i386.json => archive/debian-6.0.10-i386.json (100%) rename debian-7.10-amd64.json => archive/debian-7.10-amd64.json (100%) rename debian-7.10-i386.json => archive/debian-7.10-i386.json (100%) rename debian-7.8-amd64.json => archive/debian-7.8-amd64.json (100%) rename debian-7.8-i386.json => archive/debian-7.8-i386.json (100%) rename debian-7.9-amd64.json => archive/debian-7.9-amd64.json (100%) rename debian-7.9-i386.json => archive/debian-7.9-i386.json (100%) rename debian-8.1-amd64.json => archive/debian-8.1-amd64.json (100%) rename debian-8.1-i386.json => archive/debian-8.1-i386.json (100%) rename debian-8.2-amd64.json => archive/debian-8.2-amd64.json (100%) rename debian-8.2-i386.json => archive/debian-8.2-i386.json (100%) rename debian-8.3-amd64.json => archive/debian-8.3-amd64.json (100%) rename debian-8.3-i386.json => archive/debian-8.3-i386.json (100%) rename debian-8.4-amd64.json => archive/debian-8.4-amd64.json (100%) rename debian-8.4-i386.json => archive/debian-8.4-i386.json (100%) rename fedora-20-i386.json => archive/fedora-20-i386.json (100%) rename fedora-20-x86_64.json => archive/fedora-20-x86_64.json (100%) rename fedora-21-i386.json => archive/fedora-21-i386.json (100%) rename fedora-21-x86_64.json => archive/fedora-21-x86_64.json (100%) rename freebsd-10.2-amd64.json => archive/freebsd-10.2-amd64.json (100%) rename freebsd-10.2-i386.json => archive/freebsd-10.2-i386.json (100%) rename omnios-r151010j.json => archive/omnios-r151010j.json (100%) rename oracle-6.6-i386.json => archive/oracle-6.6-i386.json (100%) rename oracle-6.6-x86_64.json => archive/oracle-6.6-x86_64.json (100%) rename rhel-6.7-i386.json => archive/rhel-6.7-i386.json (100%) rename rhel-6.7-x86_64.json => archive/rhel-6.7-x86_64.json (100%) rename sles-11-sp2-i386.json => archive/sles-11-sp2-i386.json (100%) rename sles-11-sp2-x86_64.json => archive/sles-11-sp2-x86_64.json (100%) rename sles-11-sp3-i386.json => archive/sles-11-sp3-i386.json (100%) rename sles-11-sp3-x86_64.json => archive/sles-11-sp3-x86_64.json (100%) rename sles-11-sp4-i386.json => archive/sles-11-sp4-i386.json (100%) rename sles-11-sp4-x86_64.json => archive/sles-11-sp4-x86_64.json (100%) rename ubuntu-10.04-amd64.json => archive/ubuntu-10.04-amd64.json (100%) rename ubuntu-10.04-i386.json => archive/ubuntu-10.04-i386.json (100%) rename ubuntu-14.10-amd64.json => archive/ubuntu-14.10-amd64.json (100%) rename ubuntu-14.10-i386.json => archive/ubuntu-14.10-i386.json (100%) rename ubuntu-15.04-amd64.json => archive/ubuntu-15.04-amd64.json (100%) rename ubuntu-15.04-i386.json => archive/ubuntu-15.04-i386.json (100%) diff --git a/debian-6.0.10-amd64.json b/archive/debian-6.0.10-amd64.json similarity index 100% rename from debian-6.0.10-amd64.json rename to archive/debian-6.0.10-amd64.json diff --git a/debian-6.0.10-i386.json b/archive/debian-6.0.10-i386.json similarity index 100% rename from debian-6.0.10-i386.json rename to archive/debian-6.0.10-i386.json diff --git a/debian-7.10-amd64.json b/archive/debian-7.10-amd64.json similarity index 100% rename from debian-7.10-amd64.json rename to archive/debian-7.10-amd64.json diff --git a/debian-7.10-i386.json b/archive/debian-7.10-i386.json similarity index 100% rename from debian-7.10-i386.json rename to archive/debian-7.10-i386.json diff --git a/debian-7.8-amd64.json b/archive/debian-7.8-amd64.json similarity index 100% rename from debian-7.8-amd64.json rename to archive/debian-7.8-amd64.json diff --git a/debian-7.8-i386.json b/archive/debian-7.8-i386.json similarity index 100% rename from debian-7.8-i386.json rename to archive/debian-7.8-i386.json diff --git a/debian-7.9-amd64.json b/archive/debian-7.9-amd64.json similarity index 100% rename from debian-7.9-amd64.json rename to archive/debian-7.9-amd64.json diff --git a/debian-7.9-i386.json b/archive/debian-7.9-i386.json similarity index 100% rename from debian-7.9-i386.json rename to archive/debian-7.9-i386.json diff --git a/debian-8.1-amd64.json b/archive/debian-8.1-amd64.json similarity index 100% rename from debian-8.1-amd64.json rename to archive/debian-8.1-amd64.json diff --git a/debian-8.1-i386.json b/archive/debian-8.1-i386.json similarity index 100% rename from debian-8.1-i386.json rename to archive/debian-8.1-i386.json diff --git a/debian-8.2-amd64.json b/archive/debian-8.2-amd64.json similarity index 100% rename from debian-8.2-amd64.json rename to archive/debian-8.2-amd64.json diff --git a/debian-8.2-i386.json b/archive/debian-8.2-i386.json similarity index 100% rename from debian-8.2-i386.json rename to archive/debian-8.2-i386.json diff --git a/debian-8.3-amd64.json b/archive/debian-8.3-amd64.json similarity index 100% rename from debian-8.3-amd64.json rename to archive/debian-8.3-amd64.json diff --git a/debian-8.3-i386.json b/archive/debian-8.3-i386.json similarity index 100% rename from debian-8.3-i386.json rename to archive/debian-8.3-i386.json diff --git a/debian-8.4-amd64.json b/archive/debian-8.4-amd64.json similarity index 100% rename from debian-8.4-amd64.json rename to archive/debian-8.4-amd64.json diff --git a/debian-8.4-i386.json b/archive/debian-8.4-i386.json similarity index 100% rename from debian-8.4-i386.json rename to archive/debian-8.4-i386.json diff --git a/fedora-20-i386.json b/archive/fedora-20-i386.json similarity index 100% rename from fedora-20-i386.json rename to archive/fedora-20-i386.json diff --git a/fedora-20-x86_64.json b/archive/fedora-20-x86_64.json similarity index 100% rename from fedora-20-x86_64.json rename to archive/fedora-20-x86_64.json diff --git a/fedora-21-i386.json b/archive/fedora-21-i386.json similarity index 100% rename from fedora-21-i386.json rename to archive/fedora-21-i386.json diff --git a/fedora-21-x86_64.json b/archive/fedora-21-x86_64.json similarity index 100% rename from fedora-21-x86_64.json rename to archive/fedora-21-x86_64.json diff --git a/freebsd-10.2-amd64.json b/archive/freebsd-10.2-amd64.json similarity index 100% rename from freebsd-10.2-amd64.json rename to archive/freebsd-10.2-amd64.json diff --git a/freebsd-10.2-i386.json b/archive/freebsd-10.2-i386.json similarity index 100% rename from freebsd-10.2-i386.json rename to archive/freebsd-10.2-i386.json diff --git a/omnios-r151010j.json b/archive/omnios-r151010j.json similarity index 100% rename from omnios-r151010j.json rename to archive/omnios-r151010j.json diff --git a/oracle-6.6-i386.json b/archive/oracle-6.6-i386.json similarity index 100% rename from oracle-6.6-i386.json rename to archive/oracle-6.6-i386.json diff --git a/oracle-6.6-x86_64.json b/archive/oracle-6.6-x86_64.json similarity index 100% rename from oracle-6.6-x86_64.json rename to archive/oracle-6.6-x86_64.json diff --git a/rhel-6.7-i386.json b/archive/rhel-6.7-i386.json similarity index 100% rename from rhel-6.7-i386.json rename to archive/rhel-6.7-i386.json diff --git a/rhel-6.7-x86_64.json b/archive/rhel-6.7-x86_64.json similarity index 100% rename from rhel-6.7-x86_64.json rename to archive/rhel-6.7-x86_64.json diff --git a/sles-11-sp2-i386.json b/archive/sles-11-sp2-i386.json similarity index 100% rename from sles-11-sp2-i386.json rename to archive/sles-11-sp2-i386.json diff --git a/sles-11-sp2-x86_64.json b/archive/sles-11-sp2-x86_64.json similarity index 100% rename from sles-11-sp2-x86_64.json rename to archive/sles-11-sp2-x86_64.json diff --git a/sles-11-sp3-i386.json b/archive/sles-11-sp3-i386.json similarity index 100% rename from sles-11-sp3-i386.json rename to archive/sles-11-sp3-i386.json diff --git a/sles-11-sp3-x86_64.json b/archive/sles-11-sp3-x86_64.json similarity index 100% rename from sles-11-sp3-x86_64.json rename to archive/sles-11-sp3-x86_64.json diff --git a/sles-11-sp4-i386.json b/archive/sles-11-sp4-i386.json similarity index 100% rename from sles-11-sp4-i386.json rename to archive/sles-11-sp4-i386.json diff --git a/sles-11-sp4-x86_64.json b/archive/sles-11-sp4-x86_64.json similarity index 100% rename from sles-11-sp4-x86_64.json rename to archive/sles-11-sp4-x86_64.json diff --git a/ubuntu-10.04-amd64.json b/archive/ubuntu-10.04-amd64.json similarity index 100% rename from ubuntu-10.04-amd64.json rename to archive/ubuntu-10.04-amd64.json diff --git a/ubuntu-10.04-i386.json b/archive/ubuntu-10.04-i386.json similarity index 100% rename from ubuntu-10.04-i386.json rename to archive/ubuntu-10.04-i386.json diff --git a/ubuntu-14.10-amd64.json b/archive/ubuntu-14.10-amd64.json similarity index 100% rename from ubuntu-14.10-amd64.json rename to archive/ubuntu-14.10-amd64.json diff --git a/ubuntu-14.10-i386.json b/archive/ubuntu-14.10-i386.json similarity index 100% rename from ubuntu-14.10-i386.json rename to archive/ubuntu-14.10-i386.json diff --git a/ubuntu-15.04-amd64.json b/archive/ubuntu-15.04-amd64.json similarity index 100% rename from ubuntu-15.04-amd64.json rename to archive/ubuntu-15.04-amd64.json diff --git a/ubuntu-15.04-i386.json b/archive/ubuntu-15.04-i386.json similarity index 100% rename from ubuntu-15.04-i386.json rename to archive/ubuntu-15.04-i386.json From a3910442857f0c6463a7550eec26d9cb57838637 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith@chef.io> Date: Thu, 14 Jul 2016 13:22:57 -0500 Subject: [PATCH 0520/1622] Add Fedora 24 and dedupe kickstart scripts The last few versions are all the same. Call them latest --- fedora-22-i386.json | 2 +- fedora-22-x86_64.json | 2 +- fedora-23-i386.json | 2 +- fedora-23-x86_64.json | 2 +- fedora-24-i386.json | 176 ++++++++++++++++++++++ fedora-24-x86_64.json | 182 +++++++++++++++++++++++ http/fedora-23/ks.cfg | 42 ------ http/{fedora-22 => fedora-latest}/ks.cfg | 0 8 files changed, 362 insertions(+), 46 deletions(-) create mode 100644 fedora-24-i386.json create mode 100644 fedora-24-x86_64.json delete mode 100644 http/fedora-23/ks.cfg rename http/{fedora-22 => fedora-latest}/ks.cfg (100%) diff --git a/fedora-22-i386.json b/fedora-22-i386.json index a1e3071e9..8404a76c2 100644 --- a/fedora-22-i386.json +++ b/fedora-22-i386.json @@ -164,7 +164,7 @@ "iso_checksum": "5e3dfdff30667f3339d8b4e6ac0651c2e00c9417987848bef772cb92dbc823a5", "iso_checksum_type": "sha256", "iso_name": "Fedora-Server-DVD-i386-22.iso", - "ks_path": "fedora-22/ks.cfg", + "ks_path": "fedora-latest/ks.cfg", "memory": "512", "metadata": "floppy/dummy_metadata.json", "mirror": "http://download.fedoraproject.org/pub/fedora/linux", diff --git a/fedora-22-x86_64.json b/fedora-22-x86_64.json index 68bbfaf09..ad0652c65 100644 --- a/fedora-22-x86_64.json +++ b/fedora-22-x86_64.json @@ -168,7 +168,7 @@ "iso_checksum": "b2acfa7c7c6b5d2f51d3337600c2e52eeaa1a1084991181c28ca30343e52e0df", "iso_checksum_type": "sha256", "iso_name": "Fedora-Server-DVD-x86_64-22.iso", - "ks_path": "fedora-22/ks.cfg", + "ks_path": "fedora-latest/ks.cfg", "memory": "512", "metadata": "floppy/dummy_metadata.json", "mirror": "http://download.fedoraproject.org/pub/fedora/linux", diff --git a/fedora-23-i386.json b/fedora-23-i386.json index 4c4a29aae..872b3bdee 100644 --- a/fedora-23-i386.json +++ b/fedora-23-i386.json @@ -164,7 +164,7 @@ "iso_checksum": "aa2125b6351480ce82ace619925d897d0588195a3287ef74fb203b6eb34cbccf", "iso_checksum_type": "sha256", "iso_name": "Fedora-Server-DVD-i386-23.iso", - "ks_path": "fedora-23/ks.cfg", + "ks_path": "fedora-latest/ks.cfg", "memory": "512", "metadata": "floppy/dummy_metadata.json", "mirror": "http://download.fedoraproject.org/pub/fedora/linux", diff --git a/fedora-23-x86_64.json b/fedora-23-x86_64.json index ed5cc79de..fa6c71ac3 100644 --- a/fedora-23-x86_64.json +++ b/fedora-23-x86_64.json @@ -169,7 +169,7 @@ "iso_checksum": "30758dc821d1530de427c9e35212bd79b058bd4282e64b7b34ae1a40c87c05ae", "iso_checksum_type": "sha256", "iso_name": "Fedora-Server-DVD-x86_64-23.iso", - "ks_path": "fedora-23/ks.cfg", + "ks_path": "fedora-latest/ks.cfg", "memory": "512", "metadata": "floppy/dummy_metadata.json", "mirror": "http://download.fedoraproject.org/pub/fedora/linux", diff --git a/fedora-24-i386.json b/fedora-24-i386.json new file mode 100644 index 000000000..8f5a65436 --- /dev/null +++ b/fedora-24-i386.json @@ -0,0 +1,176 @@ +{ + "builders": [ + { + "boot_command": [ + "<tab> linux ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": "{{user `disk_size`}}", + "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "guest_os_type": "Fedora", + "hard_drive_interface": "sata", + "headless": "{{ user `headless` }}", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-virtualbox", + "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "virtualbox-iso", + "vboxmanage": [ + [ + "modifyvm", + "{{.Name}}", + "--memory", + "{{ user `memory` }}" + ], + [ + "modifyvm", + "{{.Name}}", + "--cpus", + "{{ user `cpus` }}" + ] + ], + "virtualbox_version_file": ".vbox_version", + "vm_name": "{{ user `template` }}" + }, + { + "boot_command": [ + "<tab> linux ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": "{{user `disk_size`}}", + "guest_os_type": "fedora", + "headless": "{{ user `headless` }}", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-vmware", + "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "tools_upload_flavor": "linux", + "type": "vmware-iso", + "vm_name": "{{ user `template` }}", + "vmx_data": { + "cpuid.coresPerSocket": "1", + "memsize": "{{ user `memory` }}", + "numvcpus": "{{ user `cpus` }}" + } + }, + { + "boot_command": [ + "<tab> linux ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": "{{user `disk_size`}}", + "guest_os_type": "fedora-core", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-parallels", + "parallels_tools_flavor": "lin", + "prlctl": [ + [ + "set", + "{{.Name}}", + "--memsize", + "{{ user `memory` }}" + ], + [ + "set", + "{{.Name}}", + "--cpus", + "{{ user `cpus` }}" + ] + ], + "prlctl_version_file": ".prlctl_version", + "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "parallels-iso", + "vm_name": "{{ user `template` }}" + }, + { + "boot_command": [ + "<tab> linux ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": "{{user `disk_size`}}", + "headless": "{{ user `headless` }}", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-qemu", + "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "qemu", + "vm_name": "{{ user `template` }}" + } + ], + "post-processors": [ + { + "output": "builds/{{user `box_basename`}}.{{.Provider}}.box", + "type": "vagrant" + } + ], + "provisioners": [ + { + "destination": "/tmp/bento-metadata.json", + "source": "{{user `metadata`}}", + "type": "file" + }, + { + "environment_vars": [], + "execute_command": "echo 'vagrant' | {{.Vars}} sudo -E -S bash '{{.Path}}'", + "scripts": [ + "scripts/common/metadata.sh", + "scripts/fedora/fix-slow-dns.sh", + "scripts/fedora/build-tools.sh", + "scripts/common/sshd.sh", + "scripts/common/vmtools.sh", + "scripts/common/vagrant.sh", + "scripts/fedora/cleanup.sh", + "scripts/common/minimize.sh" + ], + "type": "shell" + } + ], + "variables": { + "arch": "32", + "box_basename": "fedora-24-i386", + "build_timestamp": "{{isotime \"20060102150405\"}}", + "cpus": "1", + "disk_size": "40960", + "git_revision": "__unknown_git_revision__", + "headless": "", + "http_proxy": "{{env `http_proxy`}}", + "https_proxy": "{{env `https_proxy`}}", + "iso_checksum": "93c0bfe6e6bf23ca22cc1a85636ed15834336ee40a57bfe374f0044ad2d864b0", + "iso_checksum_type": "sha256", + "iso_name": "Fedora-Server-dvd-i386-24-1.2.iso", + "ks_path": "fedora-latest/ks.cfg", + "memory": "512", + "metadata": "floppy/dummy_metadata.json", + "mirror": "http://download.fedoraproject.org/pub/fedora/linux", + "mirror_directory": "releases/24/Server/i386/iso", + "name": "fedora-24-i386", + "no_proxy": "{{env `no_proxy`}}", + "template": "fedora-24-i386", + "version": "2.0.TIMESTAMP" + } +} diff --git a/fedora-24-x86_64.json b/fedora-24-x86_64.json new file mode 100644 index 000000000..5473ddd5b --- /dev/null +++ b/fedora-24-x86_64.json @@ -0,0 +1,182 @@ +{ + "builders": [ + { + "boot_command": [ + "<tab> linux ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": "{{user `disk_size`}}", + "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "guest_os_type": "Fedora_64", + "hard_drive_interface": "sata", + "headless": "{{ user `headless` }}", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-virtualbox", + "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "virtualbox-iso", + "vboxmanage": [ + [ + "modifyvm", + "{{.Name}}", + "--memory", + "{{ user `memory` }}" + ], + [ + "modifyvm", + "{{.Name}}", + "--cpus", + "{{ user `cpus` }}" + ] + ], + "virtualbox_version_file": ".vbox_version", + "vm_name": "{{ user `template` }}" + }, + { + "boot_command": [ + "<tab> linux ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": "{{user `disk_size`}}", + "guest_os_type": "fedora-64", + "headless": "{{ user `headless` }}", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-vmware", + "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "tools_upload_flavor": "linux", + "type": "vmware-iso", + "vm_name": "{{ user `template` }}", + "vmx_data": { + "cpuid.coresPerSocket": "1", + "ethernet0.pciSlotNumber": "32", + "memsize": "{{ user `memory` }}", + "numvcpus": "{{ user `cpus` }}" + } + }, + { + "boot_command": [ + "<tab> linux ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": "{{user `disk_size`}}", + "guest_os_type": "fedora-core", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-parallels", + "parallels_tools_flavor": "lin", + "prlctl": [ + [ + "set", + "{{.Name}}", + "--memsize", + "{{ user `memory` }}" + ], + [ + "set", + "{{.Name}}", + "--cpus", + "{{ user `cpus` }}" + ] + ], + "prlctl_version_file": ".prlctl_version", + "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "parallels-iso", + "vm_name": "{{ user `template` }}" + }, + { + "boot_command": [ + "<tab> linux ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": "{{user `disk_size`}}", + "headless": "{{ user `headless` }}", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-qemu", + "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "qemu", + "vm_name": "{{ user `template` }}" + } + ], + "post-processors": [ + { + "output": "builds/{{user `box_basename`}}.{{.Provider}}.box", + "type": "vagrant" + } + ], + "provisioners": [ + { + "destination": "/tmp/bento-metadata.json", + "source": "{{user `metadata`}}", + "type": "file" + }, + { + "environment_vars": [ + "HOME_DIR=/home/vagrant", + "http_proxy={{user `http_proxy`}}", + "https_proxy={{user `https_proxy`}}", + "no_proxy={{user `no_proxy`}}" + ], + "execute_command": "echo 'vagrant' | {{.Vars}} sudo -E -S bash '{{.Path}}'", + "scripts": [ + "scripts/common/metadata.sh", + "scripts/fedora/fix-slow-dns.sh", + "scripts/fedora/build-tools.sh", + "scripts/common/sshd.sh", + "scripts/common/vmtools.sh", + "scripts/common/vagrant.sh", + "scripts/fedora/cleanup.sh", + "scripts/common/minimize.sh" + ], + "type": "shell" + } + ], + "variables": { + "arch": "64", + "box_basename": "fedora-24", + "build_timestamp": "{{isotime \"20060102150405\"}}", + "cpus": "1", + "disk_size": "40960", + "git_revision": "__unknown_git_revision__", + "headless": "", + "http_proxy": "{{env `http_proxy`}}", + "https_proxy": "{{env `https_proxy`}}", + "iso_checksum": "1c0971d4c1a37bb06ec603ed3ded0af79e22069499443bb2d47e501c9ef42ae8", + "iso_checksum_type": "sha256", + "iso_name": "Fedora-Server-dvd-x86_64-24-1.2.iso", + "ks_path": "fedora-latest/ks.cfg", + "memory": "512", + "metadata": "floppy/dummy_metadata.json", + "mirror": "http://download.fedoraproject.org/pub/fedora/linux", + "mirror_directory": "releases/24/Server/x86_64/iso", + "name": "fedora-24", + "no_proxy": "{{env `no_proxy`}}", + "template": "fedora-24-x86_64", + "version": "2.0.TIMESTAMP" + } +} diff --git a/http/fedora-23/ks.cfg b/http/fedora-23/ks.cfg deleted file mode 100644 index fceea35a8..000000000 --- a/http/fedora-23/ks.cfg +++ /dev/null @@ -1,42 +0,0 @@ -install -cdrom -lang en_US.UTF-8 -keyboard us -network --bootproto=dhcp -rootpw vagrant -firewall --disabled -authconfig --enableshadow --passalgo=sha512 -selinux --permissive -timezone UTC -bootloader --location=mbr -text -skipx -zerombr -clearpart --all --initlabel -autopart -firstboot --disabled -reboot -user --name=vagrant --plaintext --password vagrant - -%packages --ignoremissing --excludedocs -bzip2 -# GCC won't install during kickstart -# gcc -kernel-devel -kernel-headers -tar -wget -nfs-utils -net-tools -dnf-yum --linux-firmware --plymouth --plymouth-core-libs -%end - -%post -# sudo -echo 'Defaults:vagrant !requiretty' > /etc/sudoers.d/vagrant -echo '%vagrant ALL=(ALL) NOPASSWD: ALL' >> /etc/sudoers.d/vagrant -chmod 440 /etc/sudoers.d/vagrant -%end diff --git a/http/fedora-22/ks.cfg b/http/fedora-latest/ks.cfg similarity index 100% rename from http/fedora-22/ks.cfg rename to http/fedora-latest/ks.cfg From ba368e89dccfa4bf01e6b366ba20f9745c4ceb47 Mon Sep 17 00:00:00 2001 From: Seth Thomas <cheeseplus@chef.io> Date: Fri, 22 Jul 2016 12:57:46 -0400 Subject: [PATCH 0521/1622] Release 2.2.8 (#626) * Updating for 2.2.8 * Adding semicolon for consistency --- README.md | 89 +++++++++++++++++++-------------------- scripts/common/vmtools.sh | 2 +- 2 files changed, 45 insertions(+), 46 deletions(-) diff --git a/README.md b/README.md index e37d5a185..68ffe1311 100644 --- a/README.md +++ b/README.md @@ -19,12 +19,12 @@ The following boxes are built from this repository's templates for publicly avai | | VirtualBox | VMware | Parallels | | ------------ | ------------- | ------------- | ------------- | | centos-5.11 | [x86_64][centos_511_64_vbox] | [x86_64][centos_511_64_vmware] | [x86_64][centos_511_64_prl] | -| centos-6.7 | [x86_64][centos_67_64_vbox] | [x86_64][centos_67_64_vmware] | [x86_64][centos_67_64_prl] | +| centos-6.8 | [x86_64][centos_68_64_vbox] | [x86_64][centos_68_64_vmware] | [x86_64][centos_68_64_prl] | | centos-7.2 | [x86_64][centos_72_64_vbox] | [x86_64][centos_72_64_vmware] | [x86_64][centos_72_64_prl] | -| debian-7.10 | [amd64][debian_710_64_vbox] | [amd64][debian_710_64_vmware] | [amd64][debian_710_64_prl] | -| debian-8.4 | [amd64][debian_84_64_vbox] | [amd64][debian_84_64_vmware] | [amd64][debian_84_64_prl] | -| fedora-22 | [x86_64][fedora_22_64_vbox] | [x86_64][fedora_22_64_vmware] | [x86_64][fedora_22_64_prl] | -| fedora-23 | [x86_64][fedora_23_64_vbox] | [x86_64][fedora_22_64_vmware] | [x86_64][fedora_23_64_prl] | +| debian-7.11 | [amd64][debian_711_64_vbox] | [amd64][debian_711_64_vmware] | [amd64][debian_711_64_prl] | +| debian-8.5 | [amd64][debian_85_64_vbox] | [amd64][debian_85_64_vmware] | [amd64][debian_85_64_prl] | +| fedora-23 | [x86_64][fedora_23_64_vbox] | [x86_64][fedora_23_64_vmware] | [x86_64][fedora_23_64_prl] | +| fedora-24 | [x86_64][fedora_24_64_vbox] | [x86_64][fedora_24_64_vmware] | [x86_64][fedora_24_64_prl] | | freebsd-9.3 | [amd64][freebsd_93_64_vbox] | [amd64][freebsd_93_64_vmware] | [amd64][freebsd_93_64_prl] | | freebsd-10.3 | [amd64][freebsd_103_64_vbox] | [amd64][freebsd_103_64_vmware] | [amd64][freebsd_103_64_prl] | | opensuse-13.2 | [x86_64][osuse_132_64_vbox] | [x86_64][osuse_132_64_vmware] | [x86_64][osuse_132_64_prl] | @@ -37,9 +37,9 @@ The following boxes are built from this repository's templates for publicly avai | | VirtualBox | VMware | Parallels | | ------------ | ------------- | ------------- | ------------- | | centos-5.11 | [i386][centos_511_32_vbox] | [i386][centos_511_32_vmware] | [i386][centos_511_32_prl] | -| centos-6.7 | [i386][centos_67_32_vbox] | [i386][centos_67_32_vmware] | [i386][centos_67_32_prl] | -| debian-7.10 | [i386][debian_710_32_vbox] | [i386][debian_710_32_vmware] | [i386][debian_710_32_prl] | -| debian-8.4 | [i386][debian_84_32_vbox] | [i386][debian_84_32_vmware] | [i386][debian_84_32_prl] | +| centos-6.8 | [i386][centos_68_32_vbox] | [i386][centos_68_32_vmware] | [i386][centos_68_32_prl] | +| debian-7.11 | [i386][debian_711_32_vbox] | [i386][debian_711_32_vmware] | [i386][debian_711_32_prl] | +| debian-8.5 | [i386][debian_85_32_vbox] | [i386][debian_85_32_vmware] | [i386][debian_85_32_prl] | | opensuse-13.2 | [i386][osuse_132_32_vbox] | [i386][osuse_132_32_vmware] | [i386][osuse_132_32_prl] | | ubuntu-12.04 | [i386][ubuntu_1204_32_vbox] | [i386][ubuntu_1204_32_vmware] | [i386][ubuntu_1204_32_prl] | | ubuntu-14.04 | [i386][ubuntu_1404_32_vbox] | [i386][ubuntu_1404_32_vmware] | [i386][ubuntu_1404_32_prl] | @@ -52,7 +52,6 @@ guaranteed to be updated at this time. ### Build Notes -* Built on OSX 10.11.4 hosts * If you're using the [Vagrant VMWare Fusion](https://www.vagrantup.com/vmware) provider, using `vagrant box add --provider vmware_desktop ...` will work for these boxes. Using `--provider vmware_fusion`, will not. @@ -60,16 +59,16 @@ these boxes. Using `--provider vmware_fusion`, will not. compatibility with [test-kitchen](https://github.com/test-kitchen/test-kitchen). Once test-kitchen changes defaults the S3 buckets will no longer be updated. * Tooling versions - * Packer: 0.10.0 - * VirtualBox: 5.0.16 + * Packer: 0.10.1 + * VirtualBox: 5.1.0 * VMware Fusion: 8.1.1 - * Parallels: 11.1.3 + * Parallels: 11.2.0 #### VMWare Fusion 8, Packer, systemd Recent Linux distributions use [systemd's logic to predictably name network devices](https://www.freedesktop.org/wiki/Software/systemd/PredictableNetworkInterfaceNames/). In our scenario, this is tied to the PCI slot -id. For unknown reasons, boxes built with [the default vmx config provided by packer](https://github.com/mitchellh/packer/blob/e868f9b69c995cf8a681847aa67e9be286243630/builder/vmware/iso/step_create_vmx.go#L167) use a different +id. For unknown reasons, boxes built with [the default vmx config provided by packer](https://github.com/mitchellh/packer/blob/e868f9b69c995cf8a681857aa68e9be286243630/builder/vmware/iso/step_create_vmx.go#L168) use a different PCI slot id (32 instead of 33) once they got imported to VMWare Fusion 8, which results in a different device name and finally in broken networking. This issue is documented in the following places: @@ -77,7 +76,7 @@ networking. This issue is documented in the following places: - https://github.com/chef/bento/pull/545#issuecomment-202988690 - https://github.com/mitchellh/vagrant/issues/4590 -As a workaround we've started to provide the changed PCI slot id as a custom value with the packer definitions with Ubuntu 15.10+ and Debian 8.4+. +As a workaround we've started to provide the changed PCI slot id as a custom value with the packer definitions with Ubuntu 15.10+ and Debian 8+. However this is not yet tested, may not solve the issue and/or break compatibility with other VMWare products/versions! @@ -90,13 +89,13 @@ new plugins. The full list of old boxes are available in the [old boxes file](ht Adding a bento box to vagrant: - $ vagrant box add bento/debian-8.4 + $ vagrant box add bento/debian-8.5 Using a bento box in a Vagrantfile: ``` Vagrant.configure("2") do |config| - config.vm.box = "bento/debian-8.4" + config.vm.box = "bento/debian-8.5" end ``` @@ -114,11 +113,11 @@ This is an opinionated tool that the project uses for building the hosted boxes To build multiple templates for all providers (VirtualBox, Fusion, Parallels, etc): - $ bin/bento build debian-8.4-amd64 debian-8.4-i386 + $ bin/bento build debian-8.5-amd64 debian-8.5-i386 To build a box for a single provider: - $ bin/bento build --only=virtualbox-iso debian-8.4-amd64 + $ bin/bento build --only=virtualbox-iso debian-8.5-amd64 ### Using `packer` @@ -126,24 +125,24 @@ Templates can still be built directly by `packer` To build a template for all providers (VirtualBox, Fusion, Parallels): - $ packer build debian-8.4-amd64.json + $ packer build debian-8.5-amd64.json To build a template only for a list of specific providers: - $ packer build -only=virtualbox-iso debian-8.4-amd64.json + $ packer build -only=virtualbox-iso debian-8.5-amd64.json To build a template for all providers except a list of specific providers: - $ packer build -except=parallels-iso,vmware-iso debian-8.4-amd64.json + $ packer build -except=parallels-iso,vmware-iso debian-8.5-amd64.json If you want to use a another mirror site, use the `mirror` user variable. - $ packer build -var 'mirror=http://ftp.jaist.ac.jp/pub/Linux/debian-cdimage/release' debian-8.4-amd64.json + $ packer build -var 'mirror=http://ftp.jaist.ac.jp/pub/Linux/debian-cdimage/release' debian-8.5-amd64.json Congratulations! You now have box(es) in the ../builds directory that you can then add to Vagrant and start testing cookbooks. Notes: -* The box_basename can be overridden like other Packer vars with ``-var 'box_basename=debian-8.4'`` +* The box_basename can be overridden like other Packer vars with ``-var 'box_basename=debian-8.5'`` ### Proprietary Boxes @@ -236,30 +235,30 @@ limitations under the License. [centos_511_32_prl]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/parallels/opscode_centos-5.11-i386_chef-provisionerless.box [centos_511_64_prl]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/parallels/opscode_centos-5.11_chef-provisionerless.box -[centos_67_32_vbox]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_centos-6.7-i386_chef-provisionerless.box -[centos_67_64_vbox]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_centos-6.7_chef-provisionerless.box -[centos_67_32_vmware]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_centos-6.7-i386_chef-provisionerless.box -[centos_67_64_vmware]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_centos-6.7_chef-provisionerless.box -[centos_67_32_prl]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/parallels/opscode_centos-6.7-i386_chef-provisionerless.box -[centos_67_64_prl]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/parallels/opscode_centos-6.7_chef-provisionerless.box +[centos_68_32_vbox]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_centos-6.8-i386_chef-provisionerless.box +[centos_68_64_vbox]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_centos-6.8_chef-provisionerless.box +[centos_68_32_vmware]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_centos-6.8-i386_chef-provisionerless.box +[centos_68_64_vmware]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_centos-6.8_chef-provisionerless.box +[centos_68_32_prl]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/parallels/opscode_centos-6.8-i386_chef-provisionerless.box +[centos_68_64_prl]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/parallels/opscode_centos-6.8_chef-provisionerless.box [centos_72_64_vbox]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_centos-7.2_chef-provisionerless.box [centos_72_64_vmware]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_centos-7.2_chef-provisionerless.box [centos_72_64_prl]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/parallels/opscode_centos-7.2_chef-provisionerless.box -[debian_710_32_vbox]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_debian-7.10-i386_chef-provisionerless.box -[debian_710_64_vbox]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_debian-7.10_chef-provisionerless.box -[debian_710_32_vmware]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_debian-7.10-i386_chef-provisionerless.box -[debian_710_64_vmware]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_debian-7.10_chef-provisionerless.box -[debian_710_32_prl]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/parallels/opscode_debian-7.10-i386_chef-provisionerless.box -[debian_710_64_prl]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/parallels/opscode_debian-7.10_chef-provisionerless.box +[debian_711_32_vbox]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_debian-7.11-i386_chef-provisionerless.box +[debian_711_64_vbox]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_debian-7.11_chef-provisionerless.box +[debian_711_32_vmware]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_debian-7.11-i386_chef-provisionerless.box +[debian_711_64_vmware]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_debian-7.11_chef-provisionerless.box +[debian_711_32_prl]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/parallels/opscode_debian-7.11-i386_chef-provisionerless.box +[debian_711_64_prl]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/parallels/opscode_debian-7.11_chef-provisionerless.box -[debian_84_32_vbox]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_debian-8.4-i386_chef-provisionerless.box -[debian_84_64_vbox]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_debian-8.4_chef-provisionerless.box -[debian_84_32_vmware]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_debian-8.4-i386_chef-provisionerless.box -[debian_84_64_vmware]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_debian-8.4_chef-provisionerless.box -[debian_84_32_prl]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/parallels/opscode_debian-8.4-i386_chef-provisionerless.box -[debian_84_64_prl]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/parallels/opscode_debian-8.4_chef-provisionerless.box +[debian_85_32_vbox]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_debian-8.5-i386_chef-provisionerless.box +[debian_85_64_vbox]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_debian-8.5_chef-provisionerless.box +[debian_85_32_vmware]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_debian-8.5-i386_chef-provisionerless.box +[debian_85_64_vmware]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_debian-8.5_chef-provisionerless.box +[debian_85_32_prl]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/parallels/opscode_debian-8.5-i386_chef-provisionerless.box +[debian_85_64_prl]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/parallels/opscode_debian-8.5_chef-provisionerless.box [freebsd_93_32_vbox]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_freebsd-9.3-i386_chef-provisionerless.box [freebsd_93_64_vbox]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_freebsd-9.3_chef-provisionerless.box @@ -310,10 +309,10 @@ limitations under the License. [ubuntu_1604_32_prl]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/parallels/opscode_ubuntu-16.04-i386_chef-provisionerless.box [ubuntu_1604_64_prl]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/parallels/opscode_ubuntu-16.04_chef-provisionerless.box -[fedora_22_64_vbox]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_fedora-22_chef-provisionerless.box -[fedora_22_64_vmware]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_fedora-22_chef-provisionerless.box -[fedora_22_64_prl]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/parallels/opscode_fedora-22_chef-provisionerless.box - [fedora_23_64_vbox]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_fedora-23_chef-provisionerless.box [fedora_23_64_vmware]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_fedora-23_chef-provisionerless.box [fedora_23_64_prl]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/parallels/opscode_fedora-23_chef-provisionerless.box + +[fedora_24_64_vbox]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_fedora-24_chef-provisionerless.box +[fedora_24_64_vmware]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_fedora-24_chef-provisionerless.box +[fedora_24_64_prl]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/parallels/opscode_fedora-24_chef-provisionerless.box diff --git a/scripts/common/vmtools.sh b/scripts/common/vmtools.sh index 1a67806a8..be01e42ef 100644 --- a/scripts/common/vmtools.sh +++ b/scripts/common/vmtools.sh @@ -26,7 +26,7 @@ vmware-iso|vmware-vmx) # Use open-vm-tools if [ "$ubuntu_version" = "16.04" ]; then - apt-get install -y open-vm-tools + apt-get install -y open-vm-tools; mkdir /mnt/hgfs; else mkdir -p /tmp/vmware; From 14a3ba29ffd766913c228cbba3556084a425f8ae Mon Sep 17 00:00:00 2001 From: cheeseplus <cheeseplus@brix.local> Date: Fri, 22 Jul 2016 12:15:58 -0700 Subject: [PATCH 0522/1622] Fedora 22 EOL --- fedora-22-i386.json => archive/fedora-22-i386.json | 0 fedora-22-x86_64.json => archive/fedora-22-x86_64.json | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename fedora-22-i386.json => archive/fedora-22-i386.json (100%) rename fedora-22-x86_64.json => archive/fedora-22-x86_64.json (100%) diff --git a/fedora-22-i386.json b/archive/fedora-22-i386.json similarity index 100% rename from fedora-22-i386.json rename to archive/fedora-22-i386.json diff --git a/fedora-22-x86_64.json b/archive/fedora-22-x86_64.json similarity index 100% rename from fedora-22-x86_64.json rename to archive/fedora-22-x86_64.json From 771bb3aab5eca42476b6f3552f3c50b78afa84ee Mon Sep 17 00:00:00 2001 From: Seth Thomas <sthomas@chef.io> Date: Sun, 24 Jul 2016 12:13:26 -0400 Subject: [PATCH 0523/1622] Update for 16.04.1 iso --- ubuntu-16.04-amd64.json | 4 ++-- ubuntu-16.04-i386.json | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ubuntu-16.04-amd64.json b/ubuntu-16.04-amd64.json index 9c0dee88f..28a5a3adf 100644 --- a/ubuntu-16.04-amd64.json +++ b/ubuntu-16.04-amd64.json @@ -258,9 +258,9 @@ "headless": "", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", - "iso_checksum": "b8b172cbdf04f5ff8adc8c2c1b4007ccf66f00fc6a324a6da6eba67de71746f6", + "iso_checksum": "29a8b9009509b39d542ecb229787cdf48f05e739a932289de9e9858d7c487c80", "iso_checksum_type": "sha256", - "iso_name": "ubuntu-16.04-server-amd64.iso", + "iso_name": "ubuntu-16.04.1-server-amd64.iso", "memory": "512", "metadata": "floppy/dummy_metadata.json", "mirror": "http://releases.ubuntu.com", diff --git a/ubuntu-16.04-i386.json b/ubuntu-16.04-i386.json index 22b86dc61..151dbd0d7 100644 --- a/ubuntu-16.04-i386.json +++ b/ubuntu-16.04-i386.json @@ -258,9 +258,9 @@ "headless": "", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", - "iso_checksum": "8d52f3127f2b7ffa97698913b722e3219187476a9b936055d737f3e00aecd24d", + "iso_checksum": "62fc3e810c7631fbbd45d9c960ec749fc1eb66e5c56039423e3e94a5391a437a", "iso_checksum_type": "sha256", - "iso_name": "ubuntu-16.04-server-i386.iso", + "iso_name": "ubuntu-16.04.1-server-i386.iso", "memory": "512", "metadata": "floppy/dummy_metadata.json", "mirror": "http://releases.ubuntu.com", From b0696174d71d85b626f8d6ed9521be027944741e Mon Sep 17 00:00:00 2001 From: Seth Thomas <sthomas@chef.io> Date: Tue, 26 Jul 2016 11:18:13 -0400 Subject: [PATCH 0524/1622] Didn't use 5.1 because #problems --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 68ffe1311..b6969bf72 100644 --- a/README.md +++ b/README.md @@ -60,7 +60,7 @@ compatibility with [test-kitchen](https://github.com/test-kitchen/test-kitchen). Once test-kitchen changes defaults the S3 buckets will no longer be updated. * Tooling versions * Packer: 0.10.1 - * VirtualBox: 5.1.0 + * VirtualBox: 5.0.26 * VMware Fusion: 8.1.1 * Parallels: 11.2.0 From 6fe810c5abbdb26dd3c22b566a10402691d71a6b Mon Sep 17 00:00:00 2001 From: Rickard von Essen <rickard.von.essen@gmail.com> Date: Tue, 26 Jul 2016 22:13:42 +0200 Subject: [PATCH 0525/1622] OpenSUSE Leap 42.1: requires 768 Mb memory. --- opensuse-leap-42.1-x86_64.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/opensuse-leap-42.1-x86_64.json b/opensuse-leap-42.1-x86_64.json index b1b0705f8..7c56c8f54 100644 --- a/opensuse-leap-42.1-x86_64.json +++ b/opensuse-leap-42.1-x86_64.json @@ -186,7 +186,7 @@ "iso_checksum": "8576e84822cdbe566bf551e28a169fc028229831eba9f07a4c1f84302c5ddb09", "iso_checksum_type": "sha256", "iso_name": "openSUSE-Leap-42.1-DVD-x86_64.iso", - "memory": "512", + "memory": "768", "metadata": "floppy/dummy_metadata.json", "mirror": "http://suse.mobile-central.org/distribution", "mirror_directory": "leap/42.1/iso", From d5677a224dd3cf5225f94872e865f6bc79a1879a Mon Sep 17 00:00:00 2001 From: Seth Thomas <sthomas@chef.io> Date: Wed, 27 Jul 2016 20:19:47 -0400 Subject: [PATCH 0526/1622] I regret to inform you that this is in fact the fix --- scripts/ubuntu/update.sh | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/scripts/ubuntu/update.sh b/scripts/ubuntu/update.sh index fe99707c6..e4582b7ef 100644 --- a/scripts/ubuntu/update.sh +++ b/scripts/ubuntu/update.sh @@ -15,11 +15,6 @@ sed -i.bak 's/^Prompt=.*$/Prompt=never/' /etc/update-manager/release-upgrades; # Update the package list apt-get -y update; -# Upgrade all installed packages incl. kernel and kernel headers -apt-get -y dist-upgrade --force-yes; -reboot; -sleep 60; - # update package index on boot cat <<EOF >/etc/init/refresh-apt.conf; description "update package index" @@ -34,6 +29,11 @@ if [ "$ubuntu_version" = "12.04" ]; then fi # Disable periodic activities of apt -cat <<EOF >/etc/apt/apt.conf.d/10disable-periodic +cat <<EOF >/etc/apt/apt.conf.d/10disable-periodic; APT::Periodic::Enable "0"; EOF + +# Upgrade all installed packages incl. kernel and kernel headers +apt-get -y dist-upgrade; +reboot; +sleep 60; From 4591252939fc6cdb24dc80df05b2835ff84546d6 Mon Sep 17 00:00:00 2001 From: svpace <svpace@gmail.com> Date: Wed, 27 Jul 2016 22:14:15 -0300 Subject: [PATCH 0527/1622] Refactored vmware tools scripts --- centos-5.11-i386.json | 4 +- centos-5.11-x86_64.json | 4 +- centos-6.8-i386.json | 4 +- centos-6.8-x86_64.json | 4 +- centos-7.2-x86_64.json | 4 +- debian-7.11-amd64.json | 4 +- debian-7.11-i386.json | 4 +- debian-8.5-amd64.json | 4 +- debian-8.5-i386.json | 4 +- fedora-23-i386.json | 4 +- fedora-23-x86_64.json | 4 +- fedora-24-i386.json | 4 +- fedora-24-x86_64.json | 4 +- opensuse-13.2-i386.json | 4 +- opensuse-13.2-x86_64.json | 4 +- opensuse-leap-42.1-x86_64.json | 4 +- oracle-5.11-i386.json | 4 +- oracle-5.11-x86_64.json | 4 +- oracle-6.7-i386.json | 4 +- oracle-6.7-x86_64.json | 4 +- oracle-7.2-x86_64.json | 4 +- rhel-5.11-i386.json | 4 +- rhel-5.11-x86_64.json | 4 +- rhel-6.8-i386.json | 4 +- rhel-6.8-x86_64.json | 4 +- rhel-7.2-x86_64.json | 4 +- scripts/centos/vmware.sh | 8 ++++ scripts/common/minimize.sh | 4 +- scripts/common/parallels.sh | 24 ++++++++++ scripts/common/virtualbox.sh | 18 ++++++++ scripts/common/vmtools.sh | 82 ---------------------------------- scripts/common/vmware.sh | 29 ++++++++++++ scripts/ubuntu/vmware.sh | 8 ++++ sles-12-x86_64.json | 4 +- ubuntu-12.04-amd64.json | 4 +- ubuntu-12.04-i386.json | 4 +- ubuntu-14.04-amd64.json | 4 +- ubuntu-14.04-i386.json | 4 +- ubuntu-15.10-amd64.json | 4 +- ubuntu-15.10-i386.json | 4 +- ubuntu-16.04-amd64.json | 4 +- ubuntu-16.04-i386.json | 4 +- 42 files changed, 194 insertions(+), 119 deletions(-) create mode 100644 scripts/centos/vmware.sh create mode 100644 scripts/common/parallels.sh create mode 100644 scripts/common/virtualbox.sh delete mode 100644 scripts/common/vmtools.sh create mode 100644 scripts/common/vmware.sh create mode 100644 scripts/ubuntu/vmware.sh diff --git a/centos-5.11-i386.json b/centos-5.11-i386.json index 71c11f72a..760b26593 100644 --- a/centos-5.11-i386.json +++ b/centos-5.11-i386.json @@ -147,7 +147,9 @@ "scripts/common/sshd.sh", "scripts/centos/networking.sh", "scripts/common/vagrant.sh", - "scripts/common/vmtools.sh", + "scripts/common/virtualbox.sh", + "scripts/common/vmware.sh", + "scripts/common/parallels.sh", "scripts/centos/cleanup.sh", "scripts/common/minimize.sh" ], diff --git a/centos-5.11-x86_64.json b/centos-5.11-x86_64.json index 893213e6a..28ddd11ec 100644 --- a/centos-5.11-x86_64.json +++ b/centos-5.11-x86_64.json @@ -147,7 +147,9 @@ "scripts/common/sshd.sh", "scripts/centos/networking.sh", "scripts/common/vagrant.sh", - "scripts/common/vmtools.sh", + "scripts/common/virtualbox.sh", + "scripts/common/vmware.sh", + "scripts/common/parallels.sh", "scripts/centos/cleanup.sh", "scripts/common/minimize.sh" ], diff --git a/centos-6.8-i386.json b/centos-6.8-i386.json index 00a923345..abf98f844 100644 --- a/centos-6.8-i386.json +++ b/centos-6.8-i386.json @@ -147,7 +147,9 @@ "scripts/common/sshd.sh", "scripts/centos/networking.sh", "scripts/common/vagrant.sh", - "scripts/common/vmtools.sh", + "scripts/common/virtualbox.sh", + "scripts/common/vmware.sh", + "scripts/common/parallels.sh", "scripts/centos/cleanup.sh", "scripts/common/minimize.sh" ], diff --git a/centos-6.8-x86_64.json b/centos-6.8-x86_64.json index 57968dc90..a1ec1e8d5 100644 --- a/centos-6.8-x86_64.json +++ b/centos-6.8-x86_64.json @@ -147,7 +147,9 @@ "scripts/common/sshd.sh", "scripts/centos/networking.sh", "scripts/common/vagrant.sh", - "scripts/common/vmtools.sh", + "scripts/common/virtualbox.sh", + "scripts/common/vmware.sh", + "scripts/common/parallels.sh", "scripts/centos/cleanup.sh", "scripts/common/minimize.sh" ], diff --git a/centos-7.2-x86_64.json b/centos-7.2-x86_64.json index 950474a23..0566634c3 100644 --- a/centos-7.2-x86_64.json +++ b/centos-7.2-x86_64.json @@ -147,7 +147,9 @@ "scripts/common/sshd.sh", "scripts/centos/networking.sh", "scripts/common/vagrant.sh", - "scripts/common/vmtools.sh", + "scripts/common/virtualbox.sh", + "scripts/centos/vmware.sh", + "scripts/common/parallels.sh", "scripts/centos/cleanup.sh", "scripts/common/minimize.sh" ], diff --git a/debian-7.11-amd64.json b/debian-7.11-amd64.json index 65072e4e2..59725180a 100644 --- a/debian-7.11-amd64.json +++ b/debian-7.11-amd64.json @@ -205,7 +205,9 @@ "scripts/debian/networking.sh", "scripts/debian/sudoers.sh", "scripts/common/vagrant.sh", - "scripts/common/vmtools.sh", + "scripts/common/virtualbox.sh", + "scripts/common/vmware.sh", + "scripts/common/parallels.sh", "scripts/debian/cleanup.sh", "scripts/common/minimize.sh" ], diff --git a/debian-7.11-i386.json b/debian-7.11-i386.json index 3a9440f5b..83eec2a14 100644 --- a/debian-7.11-i386.json +++ b/debian-7.11-i386.json @@ -205,7 +205,9 @@ "scripts/debian/networking.sh", "scripts/debian/sudoers.sh", "scripts/common/vagrant.sh", - "scripts/common/vmtools.sh", + "scripts/common/virtualbox.sh", + "scripts/common/vmware.sh", + "scripts/common/parallels.sh", "scripts/debian/cleanup.sh", "scripts/common/minimize.sh" ], diff --git a/debian-8.5-amd64.json b/debian-8.5-amd64.json index 81fa63bb3..54c3eb9ca 100644 --- a/debian-8.5-amd64.json +++ b/debian-8.5-amd64.json @@ -210,7 +210,9 @@ "scripts/debian/networking.sh", "scripts/debian/sudoers.sh", "scripts/common/vagrant.sh", - "scripts/common/vmtools.sh", + "scripts/common/virtualbox.sh", + "scripts/common/vmware.sh", + "scripts/common/parallels.sh", "scripts/debian/cleanup.sh", "scripts/common/minimize.sh" ], diff --git a/debian-8.5-i386.json b/debian-8.5-i386.json index 4d06cd18a..2c5b92f5f 100644 --- a/debian-8.5-i386.json +++ b/debian-8.5-i386.json @@ -210,7 +210,9 @@ "scripts/debian/networking.sh", "scripts/debian/sudoers.sh", "scripts/common/vagrant.sh", - "scripts/common/vmtools.sh", + "scripts/common/virtualbox.sh", + "scripts/common/vmware.sh", + "scripts/common/parallels.sh", "scripts/debian/cleanup.sh", "scripts/common/minimize.sh" ], diff --git a/fedora-23-i386.json b/fedora-23-i386.json index 872b3bdee..bebadd145 100644 --- a/fedora-23-i386.json +++ b/fedora-23-i386.json @@ -143,7 +143,9 @@ "scripts/fedora/fix-slow-dns.sh", "scripts/common/sshd.sh", "scripts/fedora/build-tools.sh", - "scripts/common/vmtools.sh", + "scripts/common/virtualbox.sh", + "scripts/common/vmware.sh", + "scripts/common/parallels.sh", "scripts/common/vagrant.sh", "scripts/fedora/cleanup.sh", "scripts/common/minimize.sh" diff --git a/fedora-23-x86_64.json b/fedora-23-x86_64.json index fa6c71ac3..82f5e088f 100644 --- a/fedora-23-x86_64.json +++ b/fedora-23-x86_64.json @@ -148,7 +148,9 @@ "scripts/fedora/fix-slow-dns.sh", "scripts/fedora/build-tools.sh", "scripts/common/sshd.sh", - "scripts/common/vmtools.sh", + "scripts/common/virtualbox.sh", + "scripts/common/vmware.sh", + "scripts/common/parallels.sh", "scripts/common/vagrant.sh", "scripts/fedora/cleanup.sh", "scripts/common/minimize.sh" diff --git a/fedora-24-i386.json b/fedora-24-i386.json index 8f5a65436..2dc50354f 100644 --- a/fedora-24-i386.json +++ b/fedora-24-i386.json @@ -142,7 +142,9 @@ "scripts/fedora/fix-slow-dns.sh", "scripts/fedora/build-tools.sh", "scripts/common/sshd.sh", - "scripts/common/vmtools.sh", + "scripts/common/virtualbox.sh", + "scripts/common/vmware.sh", + "scripts/common/parallels.sh", "scripts/common/vagrant.sh", "scripts/fedora/cleanup.sh", "scripts/common/minimize.sh" diff --git a/fedora-24-x86_64.json b/fedora-24-x86_64.json index 5473ddd5b..a7ce8c5bb 100644 --- a/fedora-24-x86_64.json +++ b/fedora-24-x86_64.json @@ -148,7 +148,9 @@ "scripts/fedora/fix-slow-dns.sh", "scripts/fedora/build-tools.sh", "scripts/common/sshd.sh", - "scripts/common/vmtools.sh", + "scripts/common/virtualbox.sh", + "scripts/common/vmware.sh", + "scripts/common/parallels.sh", "scripts/common/vagrant.sh", "scripts/fedora/cleanup.sh", "scripts/common/minimize.sh" diff --git a/opensuse-13.2-i386.json b/opensuse-13.2-i386.json index 14cdb50df..051ee3368 100644 --- a/opensuse-13.2-i386.json +++ b/opensuse-13.2-i386.json @@ -162,7 +162,9 @@ "scripts/common/metadata.sh", "scripts/common/sshd.sh", "scripts/common/vagrant.sh", - "scripts/common/vmtools.sh", + "scripts/common/virtualbox.sh", + "scripts/common/vmware.sh", + "scripts/common/parallels.sh", "scripts/opensuse/sudoers.sh", "scripts/opensuse/zypper-locks.sh", "scripts/opensuse/remove-dvd-source.sh", diff --git a/opensuse-13.2-x86_64.json b/opensuse-13.2-x86_64.json index 397ca82ae..a7ab28574 100644 --- a/opensuse-13.2-x86_64.json +++ b/opensuse-13.2-x86_64.json @@ -162,7 +162,9 @@ "scripts/common/metadata.sh", "scripts/common/sshd.sh", "scripts/common/vagrant.sh", - "scripts/common/vmtools.sh", + "scripts/common/virtualbox.sh", + "scripts/common/vmware.sh", + "scripts/common/parallels.sh", "scripts/opensuse/sudoers.sh", "scripts/opensuse/zypper-locks.sh", "scripts/opensuse/remove-dvd-source.sh", diff --git a/opensuse-leap-42.1-x86_64.json b/opensuse-leap-42.1-x86_64.json index 7c56c8f54..ec3a3d9c5 100644 --- a/opensuse-leap-42.1-x86_64.json +++ b/opensuse-leap-42.1-x86_64.json @@ -162,7 +162,9 @@ "scripts/common/metadata.sh", "scripts/common/sshd.sh", "scripts/common/vagrant.sh", - "scripts/common/vmtools.sh", + "scripts/common/virtualbox.sh", + "scripts/common/vmware.sh", + "scripts/common/parallels.sh", "scripts/opensuse/sudoers.sh", "scripts/opensuse/zypper-locks.sh", "scripts/opensuse/remove-dvd-source.sh", diff --git a/oracle-5.11-i386.json b/oracle-5.11-i386.json index 3c9056ea4..0c63d033d 100644 --- a/oracle-5.11-i386.json +++ b/oracle-5.11-i386.json @@ -146,7 +146,9 @@ "scripts/common/metadata.sh", "scripts/common/vagrant.sh", "scripts/common/sshd.sh", - "scripts/common/vmtools.sh", + "scripts/common/virtualbox.sh", + "scripts/common/vmware.sh", + "scripts/common/parallels.sh", "scripts/centos/cleanup.sh", "scripts/common/minimize.sh" ], diff --git a/oracle-5.11-x86_64.json b/oracle-5.11-x86_64.json index a1823691a..e7a55455c 100644 --- a/oracle-5.11-x86_64.json +++ b/oracle-5.11-x86_64.json @@ -146,7 +146,9 @@ "scripts/common/metadata.sh", "scripts/common/vagrant.sh", "scripts/common/sshd.sh", - "scripts/common/vmtools.sh", + "scripts/common/virtualbox.sh", + "scripts/common/vmware.sh", + "scripts/common/parallels.sh", "scripts/centos/cleanup.sh", "scripts/common/minimize.sh" ], diff --git a/oracle-6.7-i386.json b/oracle-6.7-i386.json index dad40f43a..c26e478ac 100644 --- a/oracle-6.7-i386.json +++ b/oracle-6.7-i386.json @@ -147,7 +147,9 @@ "scripts/centos/networking.sh", "scripts/common/sshd.sh", "scripts/common/vagrant.sh", - "scripts/common/vmtools.sh", + "scripts/common/virtualbox.sh", + "scripts/common/vmware.sh", + "scripts/common/parallels.sh", "scripts/centos/cleanup.sh", "scripts/common/minimize.sh" ], diff --git a/oracle-6.7-x86_64.json b/oracle-6.7-x86_64.json index e26ac6d4b..dfd77f542 100644 --- a/oracle-6.7-x86_64.json +++ b/oracle-6.7-x86_64.json @@ -147,7 +147,9 @@ "scripts/centos/networking.sh", "scripts/common/sshd.sh", "scripts/common/vagrant.sh", - "scripts/common/vmtools.sh", + "scripts/common/virtualbox.sh", + "scripts/common/vmware.sh", + "scripts/common/parallels.sh", "scripts/centos/cleanup.sh", "scripts/common/minimize.sh" ], diff --git a/oracle-7.2-x86_64.json b/oracle-7.2-x86_64.json index 30312b15a..c9068aaaf 100644 --- a/oracle-7.2-x86_64.json +++ b/oracle-7.2-x86_64.json @@ -147,7 +147,9 @@ "scripts/centos/networking.sh", "scripts/common/sshd.sh", "scripts/common/vagrant.sh", - "scripts/common/vmtools.sh", + "scripts/common/virtualbox.sh", + "scripts/common/vmware.sh", + "scripts/common/parallels.sh", "scripts/centos/cleanup.sh", "scripts/common/minimize.sh" ], diff --git a/rhel-5.11-i386.json b/rhel-5.11-i386.json index d163833c0..41b7cddd8 100644 --- a/rhel-5.11-i386.json +++ b/rhel-5.11-i386.json @@ -146,7 +146,9 @@ "scripts/common/metadata.sh", "scripts/common/vagrant.sh", "scripts/common/sshd.sh", - "scripts/common/vmtools.sh", + "scripts/common/virtualbox.sh", + "scripts/common/vmware.sh", + "scripts/common/parallels.sh", "scripts/centos/cleanup.sh", "scripts/common/minimize.sh" ], diff --git a/rhel-5.11-x86_64.json b/rhel-5.11-x86_64.json index 0a1a5b09d..1d893ff85 100644 --- a/rhel-5.11-x86_64.json +++ b/rhel-5.11-x86_64.json @@ -146,7 +146,9 @@ "scripts/common/metadata.sh", "scripts/common/vagrant.sh", "scripts/common/sshd.sh", - "scripts/common/vmtools.sh", + "scripts/common/virtualbox.sh", + "scripts/common/vmware.sh", + "scripts/common/parallels.sh", "scripts/centos/cleanup.sh", "scripts/common/minimize.sh" ], diff --git a/rhel-6.8-i386.json b/rhel-6.8-i386.json index 52478967a..7b2627caf 100644 --- a/rhel-6.8-i386.json +++ b/rhel-6.8-i386.json @@ -147,7 +147,9 @@ "scripts/centos/networking.sh", "scripts/common/sshd.sh", "scripts/common/vagrant.sh", - "scripts/common/vmtools.sh", + "scripts/common/virtualbox.sh", + "scripts/common/vmware.sh", + "scripts/common/parallels.sh", "scripts/centos/cleanup.sh", "scripts/common/minimize.sh" ], diff --git a/rhel-6.8-x86_64.json b/rhel-6.8-x86_64.json index 1f10cd5bd..bbe9c7a79 100644 --- a/rhel-6.8-x86_64.json +++ b/rhel-6.8-x86_64.json @@ -147,7 +147,9 @@ "scripts/centos/networking.sh", "scripts/common/sshd.sh", "scripts/common/vagrant.sh", - "scripts/common/vmtools.sh", + "scripts/common/virtualbox.sh", + "scripts/common/vmware.sh", + "scripts/common/parallels.sh", "scripts/centos/cleanup.sh", "scripts/common/minimize.sh" ], diff --git a/rhel-7.2-x86_64.json b/rhel-7.2-x86_64.json index b4b932d42..f933d6d2f 100644 --- a/rhel-7.2-x86_64.json +++ b/rhel-7.2-x86_64.json @@ -147,7 +147,9 @@ "scripts/centos/networking.sh", "scripts/common/sshd.sh", "scripts/common/vagrant.sh", - "scripts/common/vmtools.sh", + "scripts/common/virtualbox.sh", + "scripts/common/vmware.sh", + "scripts/common/parallels.sh", "scripts/centos/cleanup.sh", "scripts/common/minimize.sh" ], diff --git a/scripts/centos/vmware.sh b/scripts/centos/vmware.sh new file mode 100644 index 000000000..05fc1f040 --- /dev/null +++ b/scripts/centos/vmware.sh @@ -0,0 +1,8 @@ +#!/bin/sh -eux + +case "$PACKER_BUILDER_TYPE" in +vmware-iso|vmware-vmx) + yum install -y open-vm-tools; + mkdir /mnt/hgfs; + echo "platform specific vmware.sh executed"; +esac diff --git a/scripts/common/minimize.sh b/scripts/common/minimize.sh index 1ca88bee9..045d7be43 100644 --- a/scripts/common/minimize.sh +++ b/scripts/common/minimize.sh @@ -7,8 +7,8 @@ esac set +e swapuuid="`/sbin/blkid -o value -l -s UUID -t TYPE=swap`"; case "$?" in - 2|0) ;; - *) exit 1 ;; + 2|0) ;; + *) exit 1 ;; esac set -e diff --git a/scripts/common/parallels.sh b/scripts/common/parallels.sh new file mode 100644 index 000000000..16b36442e --- /dev/null +++ b/scripts/common/parallels.sh @@ -0,0 +1,24 @@ +#!/bin/sh -eux + +# set a default HOME_DIR environment variable if not set +HOME_DIR="${HOME_DIR:-/home/vagrant}"; + +case "$PACKER_BUILDER_TYPE" in +parallels-iso|parallels-pvm) + mkdir -p /tmp/parallels; + mount -o loop $HOME_DIR/prl-tools-lin.iso /tmp/parallels; + VER="`cat /tmp/parallels/version`"; + + echo "Parallels Tools Version: $VER"; + + /tmp/parallels/install --install-unattended-with-deps \ + || (code="$?"; \ + echo "Parallels tools installation exited $code, attempting" \ + "to output /var/log/parallels-tools-install.log"; \ + cat /var/log/parallels-tools-install.log; \ + exit $code); + umount /tmp/parallels; + rm -rf /tmp/parallels; + rm -f $HOME_DIR/*.iso; + ;; +esac diff --git a/scripts/common/virtualbox.sh b/scripts/common/virtualbox.sh new file mode 100644 index 000000000..916564043 --- /dev/null +++ b/scripts/common/virtualbox.sh @@ -0,0 +1,18 @@ +#!/bin/sh -eux + +case "$PACKER_BUILDER_TYPE" in +virtualbox-iso|virtualbox-ovf) + VER="`cat /home/vagrant/.vbox_version`"; + + echo "Virtualbox Tools Version: $VER"; + + mkdir -p /tmp/vbox; + mount -o loop $HOME_DIR/VBoxGuestAdditions_${VER}.iso /tmp/vbox; + sh /tmp/vbox/VBoxLinuxAdditions.run \ + || echo "VBoxLinuxAdditions.run exited $? and is suppressed." \ + "For more read https://www.virtualbox.org/ticket/12479"; + umount /tmp/vbox; + rm -rf /tmp/vbox; + rm -f $HOME_DIR/*.iso; + ;; +esac diff --git a/scripts/common/vmtools.sh b/scripts/common/vmtools.sh deleted file mode 100644 index be01e42ef..000000000 --- a/scripts/common/vmtools.sh +++ /dev/null @@ -1,82 +0,0 @@ -#!/bin/sh -eux - -# set a default HOME_DIR environment variable if not set -HOME_DIR="${HOME_DIR:-/home/vagrant}"; - -case "$PACKER_BUILDER_TYPE" in - -virtualbox-iso|virtualbox-ovf) - VER="`cat /home/vagrant/.vbox_version`"; - - echo "Virtualbox Tools Version: $VER"; - - mkdir -p /tmp/vbox; - mount -o loop $HOME_DIR/VBoxGuestAdditions_${VER}.iso /tmp/vbox; - sh /tmp/vbox/VBoxLinuxAdditions.run \ - || echo "VBoxLinuxAdditions.run exited $? and is suppressed." \ - "For more read https://www.virtualbox.org/ticket/12479"; - umount /tmp/vbox; - rm -rf /tmp/vbox; - rm -f $HOME_DIR/*.iso; - ;; - -vmware-iso|vmware-vmx) - ubuntu_version="`lsb_release -r | awk '{print $2}'`"; - ubuntu_major_version="`echo $ubuntu_version | awk -F. '{print $1}'`"; - - # Use open-vm-tools - if [ "$ubuntu_version" = "16.04" ]; then - apt-get install -y open-vm-tools; - mkdir /mnt/hgfs; - else - mkdir -p /tmp/vmware; - mkdir -p /tmp/vmware-archive; - mount -o loop $HOME_DIR/linux.iso /tmp/vmware; - - TOOLS_PATH="`ls /tmp/vmware/VMwareTools-*.tar.gz`"; - VER="`echo "${TOOLS_PATH}" | cut -f2 -d'-'`"; - MAJ_VER="`echo ${VER} | cut -d '.' -f 1`"; - - echo "VMware Tools Version: $VER"; - - tar xzf ${TOOLS_PATH} -C /tmp/vmware-archive; - if [ "${MAJ_VER}" -lt "10" ]; then - /tmp/vmware-archive/vmware-tools-distrib/vmware-install.pl --default; - else - /tmp/vmware-archive/vmware-tools-distrib/vmware-install.pl --force-install; - fi - umount /tmp/vmware; - rm -rf /tmp/vmware; - rm -rf /tmp/vmware-archive; - rm -f $HOME_DIR/*.iso; - fi - ;; - -parallels-iso|parallels-pvm) - mkdir -p /tmp/parallels; - mount -o loop $HOME_DIR/prl-tools-lin.iso /tmp/parallels; - VER="`cat /tmp/parallels/version`"; - - echo "Parallels Tools Version: $VER"; - - /tmp/parallels/install --install-unattended-with-deps \ - || (code="$?"; \ - echo "Parallels tools installation exited $code, attempting" \ - "to output /var/log/parallels-tools-install.log"; \ - cat /var/log/parallels-tools-install.log; \ - exit $code); - umount /tmp/parallels; - rm -rf /tmp/parallels; - rm -f $HOME_DIR/*.iso; - ;; - -qemu) - echo "Don't need anything for this one" - ;; - -*) - echo "Unknown Packer Builder Type >>$PACKER_BUILDER_TYPE<< selected."; - echo "Known are virtualbox-iso|virtualbox-ovf|vmware-iso|vmware-vmx|parallels-iso|parallels-pvm."; - ;; - -esac diff --git a/scripts/common/vmware.sh b/scripts/common/vmware.sh new file mode 100644 index 000000000..33e949698 --- /dev/null +++ b/scripts/common/vmware.sh @@ -0,0 +1,29 @@ +#!/bin/sh -eux + +# set a default HOME_DIR environment variable if not set +HOME_DIR="${HOME_DIR:-/home/vagrant}"; + +case "$PACKER_BUILDER_TYPE" in +vmware-iso|vmware-vmx) + mkdir -p /tmp/vmware; + mkdir -p /tmp/vmware-archive; + mount -o loop $HOME_DIR/linux.iso /tmp/vmware; + + TOOLS_PATH="`ls /tmp/vmware/VMwareTools-*.tar.gz`"; + VER="`echo "${TOOLS_PATH}" | cut -f2 -d'-'`"; + MAJ_VER="`echo ${VER} | cut -d '.' -f 1`"; + + echo "VMware Tools Version: $VER"; + + tar xzf ${TOOLS_PATH} -C /tmp/vmware-archive; + if [ "${MAJ_VER}" -lt "10" ]; then + /tmp/vmware-archive/vmware-tools-distrib/vmware-install.pl --default; + else + /tmp/vmware-archive/vmware-tools-distrib/vmware-install.pl --force-install; + fi + umount /tmp/vmware; + rm -rf /tmp/vmware; + rm -rf /tmp/vmware-archive; + rm -f $HOME_DIR/*.iso; + ;; +esac diff --git a/scripts/ubuntu/vmware.sh b/scripts/ubuntu/vmware.sh new file mode 100644 index 000000000..fed591315 --- /dev/null +++ b/scripts/ubuntu/vmware.sh @@ -0,0 +1,8 @@ +#!/bin/sh -eux + +case "$PACKER_BUILDER_TYPE" in +vmware-iso|vmware-vmx) + apt-get install -y open-vm-tools; + mkdir /mnt/hgfs; + echo "platform specific vmware.sh executed"; +esac diff --git a/sles-12-x86_64.json b/sles-12-x86_64.json index c55108180..f8215c5ba 100644 --- a/sles-12-x86_64.json +++ b/sles-12-x86_64.json @@ -163,7 +163,9 @@ "scripts/common/sshd.sh", "scripts/common/vagrant.sh", "scripts/sles/unsupported-modules.sh", - "scripts/common/vmtools.sh", + "scripts/common/virtualbox.sh", + "scripts/common/vmware.sh", + "scripts/common/parallels.sh", "scripts/sles/sudoers.sh", "scripts/sles/zypper-locks.sh", "scripts/sles/remove-dvd-source.sh", diff --git a/ubuntu-12.04-amd64.json b/ubuntu-12.04-amd64.json index 70a1b92c1..86a86568e 100644 --- a/ubuntu-12.04-amd64.json +++ b/ubuntu-12.04-amd64.json @@ -233,7 +233,9 @@ "scripts/ubuntu/networking.sh", "scripts/ubuntu/sudoers.sh", "scripts/ubuntu/vagrant.sh", - "scripts/common/vmtools.sh", + "scripts/common/virtualbox.sh", + "scripts/common/vmware.sh", + "scripts/common/parallels.sh", "scripts/ubuntu/cleanup.sh", "scripts/common/minimize.sh" ], diff --git a/ubuntu-12.04-i386.json b/ubuntu-12.04-i386.json index f7d264780..4bc3e7b44 100644 --- a/ubuntu-12.04-i386.json +++ b/ubuntu-12.04-i386.json @@ -233,7 +233,9 @@ "scripts/ubuntu/networking.sh", "scripts/ubuntu/sudoers.sh", "scripts/ubuntu/vagrant.sh", - "scripts/common/vmtools.sh", + "scripts/common/virtualbox.sh", + "scripts/common/vmware.sh", + "scripts/common/parallels.sh", "scripts/ubuntu/cleanup.sh", "scripts/common/minimize.sh" ], diff --git a/ubuntu-14.04-amd64.json b/ubuntu-14.04-amd64.json index 2c6dbeff4..d73149466 100644 --- a/ubuntu-14.04-amd64.json +++ b/ubuntu-14.04-amd64.json @@ -233,7 +233,9 @@ "scripts/ubuntu/networking.sh", "scripts/ubuntu/sudoers.sh", "scripts/ubuntu/vagrant.sh", - "scripts/common/vmtools.sh", + "scripts/common/virtualbox.sh", + "scripts/common/vmware.sh", + "scripts/common/parallels.sh", "scripts/ubuntu/cleanup.sh", "scripts/common/minimize.sh" ], diff --git a/ubuntu-14.04-i386.json b/ubuntu-14.04-i386.json index 6535db6c4..ff7e559ad 100644 --- a/ubuntu-14.04-i386.json +++ b/ubuntu-14.04-i386.json @@ -233,7 +233,9 @@ "scripts/ubuntu/networking.sh", "scripts/ubuntu/sudoers.sh", "scripts/ubuntu/vagrant.sh", - "scripts/common/vmtools.sh", + "scripts/common/virtualbox.sh", + "scripts/common/vmware.sh", + "scripts/common/parallels.sh", "scripts/ubuntu/cleanup.sh", "scripts/common/minimize.sh" ], diff --git a/ubuntu-15.10-amd64.json b/ubuntu-15.10-amd64.json index bd3bb4f81..53707ffc5 100644 --- a/ubuntu-15.10-amd64.json +++ b/ubuntu-15.10-amd64.json @@ -242,7 +242,9 @@ "scripts/ubuntu/networking.sh", "scripts/ubuntu/sudoers.sh", "scripts/ubuntu/vagrant.sh", - "scripts/common/vmtools.sh", + "scripts/common/virtualbox.sh", + "scripts/common/vmware.sh", + "scripts/common/parallels.sh", "scripts/ubuntu/cleanup.sh", "scripts/common/minimize.sh" ], diff --git a/ubuntu-15.10-i386.json b/ubuntu-15.10-i386.json index c844423f6..52c14a620 100644 --- a/ubuntu-15.10-i386.json +++ b/ubuntu-15.10-i386.json @@ -242,7 +242,9 @@ "scripts/ubuntu/networking.sh", "scripts/ubuntu/sudoers.sh", "scripts/ubuntu/vagrant.sh", - "scripts/common/vmtools.sh", + "scripts/common/virtualbox.sh", + "scripts/common/vmware.sh", + "scripts/common/parallels.sh", "scripts/ubuntu/cleanup.sh", "scripts/common/minimize.sh" ], diff --git a/ubuntu-16.04-amd64.json b/ubuntu-16.04-amd64.json index 9c0dee88f..5167cb95d 100644 --- a/ubuntu-16.04-amd64.json +++ b/ubuntu-16.04-amd64.json @@ -242,7 +242,9 @@ "scripts/ubuntu/networking.sh", "scripts/ubuntu/sudoers.sh", "scripts/ubuntu/vagrant.sh", - "scripts/common/vmtools.sh", + "scripts/common/virtualbox.sh", + "scripts/ubuntu/vmware.sh", + "scripts/common/parallels.sh", "scripts/ubuntu/cleanup.sh", "scripts/common/minimize.sh" ], diff --git a/ubuntu-16.04-i386.json b/ubuntu-16.04-i386.json index 22b86dc61..bac363d74 100644 --- a/ubuntu-16.04-i386.json +++ b/ubuntu-16.04-i386.json @@ -242,7 +242,9 @@ "scripts/ubuntu/networking.sh", "scripts/ubuntu/sudoers.sh", "scripts/ubuntu/vagrant.sh", - "scripts/common/vmtools.sh", + "scripts/common/virtualbox.sh", + "scripts/ubuntu/vmware.sh", + "scripts/common/parallels.sh", "scripts/ubuntu/cleanup.sh", "scripts/common/minimize.sh" ], From 8cebf3894478432d128cffc49809e4a723e8822d Mon Sep 17 00:00:00 2001 From: Seth Thomas <sthomas@chef.io> Date: Mon, 1 Aug 2016 09:24:20 -0400 Subject: [PATCH 0528/1622] Release 2.2.9 --- CHANGELOG.md | 55 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 55 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0d87b5f2d..582e79c49 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,9 +1,64 @@ # Change Log +## [2.2.9](https://github.com/chef/bento/tree/2.2.9) (2016-08-01) +[Full Changelog](https://github.com/chef/bento/compare/2.2.8...2.2.9) + +**Improvements:** + +- OpenSUSE Leap 42.1: requires 768 Mb memory. [\#632](https://github.com/chef/bento/pull/632) ([rickard-von-essen](https://github.com/rickard-von-essen)) +- Update for 16.04.1 iso [\#629](https://github.com/chef/bento/pull/629) +- For reals fixed 16.04 pkg lock bug [\#637](https://github.com/chef/bento/pull/637) ([cheeseplus](https://github.com/cheeseplus)) + +**Fixed bugs:** + +- VMware: HGFS not working - Ubuntu 16.04 [\#591](https://github.com/chef/bento/issues/591) + +**EOL** + + - Fedora 22 + + **Tool Versions:** + + - Packer 0.10.1 + - VirtualBox 5.0.26 + - VMware Fusion 8.1.1 + - VMware Workstation 12.1.1 + - Parallels Pro 11.2.1 + +## [2.2.8](https://github.com/chef/bento/tree/2.2.8) (2016-07-22) +[Full Changelog](https://github.com/chef/bento/compare/2.2.7...2.2.8) + +**Improvements:** + +- Archiving all non-current builds [\#622](https://github.com/chef/bento/pull/622) ([cheeseplus](https://github.com/cheeseplus)) +- Add Fedora 24 and dedupe kickstart scripts [\#623](https://github.com/chef/bento/pull/623) ([tas50](https://github.com/tas50)) +- 16.04 should use open-vm-tools [\#621](https://github.com/chef/bento/pull/621) ([cheeseplus](https://github.com/cheeseplus)) +- Updated Debian 7 to 7.11 [\#608](https://github.com/chef/bento/pull/608) ([rickard-von-essen](https://github.com/rickard-von-essen)) +- Updated Debian 8 to 8.5 [\#607](https://github.com/chef/bento/pull/607) ([rickard-von-essen](https://github.com/rickard-von-essen)) +- Updated CentOS and RHEL to 6.8 [\#605](https://github.com/chef/bento/pull/605) ([rickard-von-essen](https://github.com/rickard-von-essen)) +- Disable automated package upgrades on Debian-like boxes [\#612](https://github.com/chef/bento/pull/612) ([jrb](https://github.com/jrb)) +- Fix new-style device naming from Network Manager on RHEL/CentOS 7 [\#617](https://github.com/chef/bento/pull/617) ([legal90](https://github.com/legal90)) +- update apt sources to use archive.debian.org for packages [\#614](https://github.com/chef/bento/pull/614) ([apollocatlin](https://github.com/apollocatlin)) + +**Fixed bugs:** + +- apt.systemd.daily creates conflict in xenial64 box [\#616](https://github.com/chef/bento/issues/616) +- FreeBSD: Root password not set! [\#610](https://github.com/chef/bento/issues/610) +- ubuntu-16.04: unattended updates locking dpkg [\#609](https://github.com/chef/bento/issues/609) +- Fix vagrant.sh failing on Solaris nodes [\#606](https://github.com/chef/bento/pull/606) ([tas50](https://github.com/tas50)) + +**Tool Versions:** + +- Packer 0.10.1 +- VirtualBox 5.0.24 +- VMware Fusion 8.1.1 +- Parallels Pro 11.2.0 + ## [2.2.7](https://github.com/chef/bento/tree/2.2.7) (2016-05-20) [Full Changelog](https://github.com/chef/bento/compare/2.2.6...2.2.7) **Improvements:** + - Ubuntu: HWE BEGONE! pt 1 - Fix for VMware HGFS on 14.04 [\#584](https://github.com/chef/bento/pull/584) ([davidmnoriega](https://github.com/davidmnoriega)) - Ubuntu: HWE BEGONE! pt 2 - The Pangolining [\#587](https://github.com/chef/bento/pull/587) ([cheeseplus](https://github.com/cheeseplus)) - OpenSuSE: Switching to more reliable mirror [\#583](https://github.com/chef/bento/pull/583) ([cheeseplus](https://github.com/cheeseplus)) From e884d4458f8f51e4c1a785e6bc077a14f886cbda Mon Sep 17 00:00:00 2001 From: Ove Gram Nipen <ove@nipen.no> Date: Mon, 1 Aug 2016 15:56:59 +0200 Subject: [PATCH 0529/1622] Add script for sles-12-sp1 --- http/sles-12/sles-12-sp1-x86_64-autoinst.xml | 325 +++++++++++++++++++ sles-12-sp1-x86_64.json | 197 +++++++++++ 2 files changed, 522 insertions(+) create mode 100644 http/sles-12/sles-12-sp1-x86_64-autoinst.xml create mode 100644 sles-12-sp1-x86_64.json diff --git a/http/sles-12/sles-12-sp1-x86_64-autoinst.xml b/http/sles-12/sles-12-sp1-x86_64-autoinst.xml new file mode 100644 index 000000000..00294916e --- /dev/null +++ b/http/sles-12/sles-12-sp1-x86_64-autoinst.xml @@ -0,0 +1,325 @@ +<?xml version="1.0"?> +<!DOCTYPE profile> +<profile xmlns="http://www.suse.com/1.0/yast2ns" xmlns:config="http://www.suse.com/1.0/configns"> + <add-on> + <add_on_products config:type="list"/> + </add-on> + <bootloader> + <global> + <activate>true</activate> + <append>splash=silent quiet showopts</append> + <append_failsafe>showopts apm=off noresume edd=off powersaved=off nohz=off highres=off processor.max_cstate=1 nomodeset x11failsafe</append_failsafe> + <boot_boot>false</boot_boot> + <boot_extended>false</boot_extended> + <boot_mbr>false</boot_mbr> + <boot_root>true</boot_root> + <default>0</default> + <distributor>SLES12</distributor> + <generic_mbr>true</generic_mbr> + <gfxmode>auto</gfxmode> + <os_prober>false</os_prober> + <timeout config:type="integer">8</timeout> + </global> + <initrd_modules config:type="list"> + <initrd_module> + <module>ahci</module> + </initrd_module> + <initrd_module> + <module>ata_piix</module> + </initrd_module> + <initrd_module> + <module>ata_generic</module> + </initrd_module> + <initrd_module> + <module>jbd</module> + </initrd_module> + <initrd_module> + <module>mbcache</module> + </initrd_module> + </initrd_modules> + <loader_type>grub2</loader_type> + <sections config:type="list"/> + </bootloader> + <deploy_image> + <image_installation config:type="boolean">false</image_installation> + </deploy_image> + <firewall> + <FW_ALLOW_FW_BROADCAST_DMZ>no</FW_ALLOW_FW_BROADCAST_DMZ> + <FW_ALLOW_FW_BROADCAST_EXT>no</FW_ALLOW_FW_BROADCAST_EXT> + <FW_ALLOW_FW_BROADCAST_INT>no</FW_ALLOW_FW_BROADCAST_INT> + <FW_CONFIGURATIONS_DMZ/> + <FW_CONFIGURATIONS_EXT/> + <FW_CONFIGURATIONS_INT/> + <FW_DEV_DMZ/> + <FW_DEV_EXT/> + <FW_DEV_INT/> + <FW_FORWARD_ALWAYS_INOUT_DEV/> + <FW_FORWARD_MASQ/> + <FW_IGNORE_FW_BROADCAST_DMZ>no</FW_IGNORE_FW_BROADCAST_DMZ> + <FW_IGNORE_FW_BROADCAST_EXT>yes</FW_IGNORE_FW_BROADCAST_EXT> + <FW_IGNORE_FW_BROADCAST_INT>no</FW_IGNORE_FW_BROADCAST_INT> + <FW_IPSEC_TRUST>no</FW_IPSEC_TRUST> + <FW_LOAD_MODULES/> + <FW_LOG_ACCEPT_ALL>no</FW_LOG_ACCEPT_ALL> + <FW_LOG_ACCEPT_CRIT>yes</FW_LOG_ACCEPT_CRIT> + <FW_LOG_DROP_ALL>no</FW_LOG_DROP_ALL> + <FW_LOG_DROP_CRIT>yes</FW_LOG_DROP_CRIT> + <FW_MASQUERADE>no</FW_MASQUERADE> + <FW_PROTECT_FROM_INT>no</FW_PROTECT_FROM_INT> + <FW_ROUTE>no</FW_ROUTE> + <FW_SERVICES_ACCEPT_DMZ/> + <FW_SERVICES_ACCEPT_EXT/> + <FW_SERVICES_ACCEPT_INT/> + <FW_SERVICES_ACCEPT_RELATED_DMZ/> + <FW_SERVICES_ACCEPT_RELATED_EXT/> + <FW_SERVICES_ACCEPT_RELATED_INT/> + <FW_SERVICES_DMZ_IP/> + <FW_SERVICES_DMZ_RPC/> + <FW_SERVICES_DMZ_TCP/> + <FW_SERVICES_DMZ_UDP/> + <FW_SERVICES_EXT_IP/> + <FW_SERVICES_EXT_RPC/> + <FW_SERVICES_EXT_TCP/> + <FW_SERVICES_EXT_UDP/> + <FW_SERVICES_INT_IP/> + <FW_SERVICES_INT_RPC/> + <FW_SERVICES_INT_TCP/> + <FW_SERVICES_INT_UDP/> + <enable_firewall config:type="boolean">false</enable_firewall> + <start_firewall config:type="boolean">false</start_firewall> + </firewall> + <general> + <ask-list config:type="list"/> + <mode> + <confirm config:type="boolean">false</confirm> + </mode> + <mouse> + <id>none</id> + </mouse> + <proposals config:type="list"/> + <signature-handling> + <accept_file_without_checksum config:type="boolean">true</accept_file_without_checksum> + <accept_non_trusted_gpg_key config:type="boolean">true</accept_non_trusted_gpg_key> + <accept_unknown_gpg_key config:type="boolean">true</accept_unknown_gpg_key> + <accept_unsigned_file config:type="boolean">true</accept_unsigned_file> + <accept_verification_failed config:type="boolean">false</accept_verification_failed> + <import_gpg_key config:type="boolean">true</import_gpg_key> + </signature-handling> + <storage/> + </general> + <login_settings/> + <networking> + <dhcp_options> + <dhclient_client_id/> + <dhclient_hostname_option>AUTO</dhclient_hostname_option> + </dhcp_options> + <dns> + <dhcp_hostname config:type="boolean">false</dhcp_hostname> + <domain>vagrantup.com</domain> + <hostname>vagrant-sles-12-x64</hostname> + <resolv_conf_policy>auto</resolv_conf_policy> + <searchlist config:type="list"> + <search>vagrantup.com</search> + </searchlist> + <write_hostname config:type="boolean">true</write_hostname> + </dns> + <interfaces config:type="list"> + <interface> + <bootproto>dhcp</bootproto> + <device>eth0</device> + <dhclient_set_default_route>yes</dhclient_set_default_route> + <startmode>auto</startmode> + <usercontrol>no</usercontrol> + </interface> + </interfaces> + <keep_install_network config:type="boolean">true</keep_install_network> + <managed config:type="boolean">false</managed> + <routing> + <ipv4_forward config:type="boolean">false</ipv4_forward> + <ipv6_forward config:type="boolean">false</ipv6_forward> + </routing> + </networking> + <partitioning config:type="list"> + <drive> + <!-- + definition of device not needed (starting with SLES 11 SP2 + YaST will pickup the first harddisk. + This is useful if someone wants to deploy using VirtualBox and/or KVM/virtio + --> + <!-- <device>/dev/sda</device> --> + <!-- This section may be removed entirely if we want to simply reuse YaST defaults --> + <initialize config:type="boolean">true</initialize> + <partitions config:type="list"> + <partition> + <create config:type="boolean">true</create> + <crypt_fs config:type="boolean">false</crypt_fs> + <filesystem config:type="symbol">swap</filesystem> + <format config:type="boolean">true</format> + <fstopt>defaults</fstopt> + <loop_fs config:type="boolean">false</loop_fs> + <mount>swap</mount> + <mountby config:type="symbol">device</mountby> + <partition_id config:type="integer">130</partition_id> + <partition_nr config:type="integer">1</partition_nr> + <raid_options/> + <resize config:type="boolean">false</resize> + <size>1561492992</size> + </partition> + <partition> + <create config:type="boolean">true</create> + <crypt_fs config:type="boolean">false</crypt_fs> + <filesystem config:type="symbol">btrfs</filesystem> + <format config:type="boolean">true</format> + <loop_fs config:type="boolean">false</loop_fs> + <mount>/</mount> + <mountby config:type="symbol">device</mountby> + <partition_id config:type="integer">131</partition_id> + <partition_nr config:type="integer">2</partition_nr> + <raid_options/> + <resize config:type="boolean">false</resize> + <size>19895844352</size> + <subvolumes config:type="list"> + <listentry>boot/grub2/i386-pc</listentry> + <listentry>boot/grub2/x86_64-efi</listentry> + <listentry>home</listentry> + <listentry>opt</listentry> + <listentry>srv</listentry> + <listentry>tmp</listentry> + <listentry>usr/local</listentry> + <listentry>var/crash</listentry> + <listentry>var/lib/mailman</listentry> + <listentry>var/lib/named</listentry> + <listentry>var/lib/pgsql</listentry> + <listentry>var/log</listentry> + <listentry>var/opt</listentry> + <listentry>var/spool</listentry> + <listentry>var/tmp</listentry> + </subvolumes> + </partition> + </partitions> + <pesize/> + <type config:type="symbol">CT_DISK</type> + <use>all</use> + </drive> + </partitioning> + <report> + <errors> + <log config:type="boolean">true</log> + <show config:type="boolean">true</show> + <timeout config:type="integer">0</timeout> + </errors> + <messages> + <log config:type="boolean">true</log> + <show config:type="boolean">true</show> + <timeout config:type="integer">0</timeout> + </messages> + <warnings> + <log config:type="boolean">true</log> + <show config:type="boolean">true</show> + <timeout config:type="integer">0</timeout> + </warnings> + <yesno_messages> + <log config:type="boolean">true</log> + <show config:type="boolean">true</show> + <timeout config:type="integer">0</timeout> + </yesno_messages> + </report> + <services-manager> + <default_target>graphical</default_target> + <services> + <disable config:type="list"/> + <enable config:type="list"> + <service>sshd</service> + </enable> + </services> + </services-manager> + <software> + <packages config:type="list"> + <package>glibc</package> + <package>openssh</package> + <package>grub2</package> + <package>syslinux</package> + <package>snapper</package> + <package>sles-release</package> + <package>SuSEfirewall2</package> + <package>kexec-tools</package> + <package>perl-Bootloader-YAML</package> + <package>kernel-default-devel</package> + <package>sudo</package> + <package>gcc</package> + <package>wget</package> + <package>perl</package> + <package>make</package> + </packages> + <patterns config:type="list"> + <pattern>Minimal</pattern> + <pattern>apparmor</pattern> + </patterns> + <remove-packages config:type="list"> + <package>adaptec-firmware</package> + <package>atmel-firmware</package> + <package>augeas-lenses</package> + <package>bash-completion</package> + <package>bash-doc</package> + <package>cifs-utils</package> + <package>cups-libs</package> + <package>ipw-firmware</package> + <package>mpt-firmware</package> + <package>postfix</package> + <package>samba-libs</package> + <package>ucode-intel</package> + </remove-packages> + </software> + <timezone> + <hwclock>UTC</hwclock> + <timezone>UTC</timezone> + </timezone> + <user_defaults> + <expire/> + <group>100</group> + <groups>video,dialout</groups> + <home>/home</home> + <inactive>-1</inactive> + <shell>/bin/bash</shell> + <skel>/etc/skel</skel> + <umask>022</umask> + </user_defaults> + <users config:type="list"> + <user> + <encrypted config:type="boolean">true</encrypted> + <fullname>vagrant</fullname> + <gid>100</gid> + <home>/home/vagrant</home> + <password_settings> + <expire/> + <flag/> + <inact/> + <max>99999</max> + <min>0</min> + <warn>7</warn> + </password_settings> + <shell>/bin/bash</shell> + <uid>1000</uid> + <user_password>$2y$05$NA1Li9ZKJOLRW5mMTXm6/e5r8dltWS5RpDZpvHrI82aLE00V51tdi</user_password> + <username>vagrant</username> + </user> + <user> + <encrypted config:type="boolean">true</encrypted> + <fullname>root</fullname> + <gid>0</gid> + <home>/root</home> + <password_settings> + <expire/> + <flag/> + <inact/> + <max/> + <min/> + <warn/> + </password_settings> + <shell>/bin/bash</shell> + <uid>0</uid> + <user_password>$6$UgKtUD0AUMIA$VWLyc2Uvl0Lk6xxfTuoRb0/jrhZ9IJG/Gtx/DkZUEWZm.JYO1Q1fvPo6gDxQAHp38kQ1DG1vNGRgu2T/z/vih.</user_password> + <username>root</username> + </user> + </users> +</profile> diff --git a/sles-12-sp1-x86_64.json b/sles-12-sp1-x86_64.json new file mode 100644 index 000000000..f024ba321 --- /dev/null +++ b/sles-12-sp1-x86_64.json @@ -0,0 +1,197 @@ +{ + "builders": [ + { + "boot_command": [ + "<esc><enter><wait>", + "linux netdevice=eth0 netsetup=dhcp install=cd:/<wait>", + " lang=en_US autoyast=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `autoinst_cfg`}}<wait>", + " textmode=1<wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": "{{user `disk_size`}}", + "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "guest_os_type": "OpenSUSE_64", + "hard_drive_interface": "sata", + "headless": "{{ user `headless` }}", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-virtualbox", + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "virtualbox-iso", + "vboxmanage": [ + [ + "modifyvm", + "{{.Name}}", + "--memory", + "{{ user `memory` }}" + ], + [ + "modifyvm", + "{{.Name}}", + "--cpus", + "{{ user `cpus` }}" + ] + ], + "virtualbox_version_file": ".vbox_version", + "vm_name": "{{ user `template` }}" + }, + { + "boot_command": [ + "<esc><enter><wait>", + "linux netdevice=eth0 netsetup=dhcp install=cd:/<wait>", + " lang=en_US autoyast=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `autoinst_cfg`}}<wait>", + " textmode=1<wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": "{{user `disk_size`}}", + "guest_os_type": "sles11-64", + "headless": "{{ user `headless` }}", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-vmware", + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "tools_upload_flavor": "linux", + "type": "vmware-iso", + "vm_name": "{{ user `template` }}", + "vmx_data": { + "cpuid.coresPerSocket": "1", + "memsize": "{{ user `memory` }}", + "numvcpus": "{{ user `cpus` }}" + } + }, + { + "boot_command": [ + "<esc><enter><wait>", + "linux netdevice=eth0 netsetup=dhcp install=cd:/<wait>", + " lang=en_US autoyast=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `autoinst_cfg`}}<wait>", + " textmode=1<wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": "{{user `disk_size`}}", + "guest_os_type": "suse", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-parallels", + "parallels_tools_flavor": "lin", + "prlctl": [ + [ + "set", + "{{.Name}}", + "--memsize", + "{{ user `memory` }}" + ], + [ + "set", + "{{.Name}}", + "--cpus", + "{{ user `cpus` }}" + ] + ], + "prlctl_version_file": ".prlctl_version", + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "parallels-iso", + "vm_name": "{{ user `template` }}" + }, + { + "boot_command": [ + "<esc><enter><wait>", + "linux netdevice=eth0 netsetup=dhcp install=cd:/<wait>", + " lang=en_US autoyast=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `autoinst_cfg`}}<wait>", + " textmode=1<wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": "{{user `disk_size`}}", + "headless": "{{ user `headless` }}", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-qemu", + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "qemu", + "vm_name": "{{ user `template` }}" + } + ], + "post-processors": [ + { + "output": "builds/{{user `box_basename`}}.{{.Provider}}.box", + "type": "vagrant" + } + ], + "provisioners": [ + { + "destination": "/tmp/bento-metadata.json", + "source": "{{user `metadata`}}", + "type": "file" + }, + { + "environment_vars": [ + "HOME_DIR=/home/vagrant", + "http_proxy={{user `http_proxy`}}", + "https_proxy={{user `https_proxy`}}", + "no_proxy={{user `no_proxy`}}" + ], + "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh '{{.Path}}'", + "scripts": [ + "scripts/common/metadata.sh", + "scripts/common/sshd.sh", + "scripts/common/vagrant.sh", + "scripts/sles/unsupported-modules.sh", + "scripts/common/vmtools.sh", + "scripts/sles/sudoers.sh", + "scripts/sles/zypper-locks.sh", + "scripts/sles/remove-dvd-source.sh", + "scripts/sles/cleanup.sh", + "scripts/common/minimize.sh" + ], + "type": "shell" + } + ], + "variables": { + "arch": "64", + "autoinst_cfg": "sles-12/sles-12-sp1-x86_64-autoinst.xml", + "box_basename": "sles-12-sp1", + "build_timestamp": "{{isotime \"20060102150405\"}}", + "cpus": "1", + "disk_size": "20480", + "git_revision": "__unknown_git_revision__", + "headless": "", + "http_proxy": "{{env `http_proxy`}}", + "https_proxy": "{{env `https_proxy`}}", + "iso_checksum": "e1c0ba860f593d60c2c138a0cd35e2a3c65304b4c988b4c9f6051bff89871f62", + "iso_checksum_type": "sha256", + "iso_name": "SLE-12-SP1-Server-DVD-x86_64-GM-DVD1.iso", + "memory": "1024", + "metadata": "floppy/dummy_metadata.json", + "mirror": "http://cdn.novell.com/prot/oq2T_Vmjsms~", + "name": "sles-12-sp1", + "template": "sles-12-sp1-x86_64", + "version": "2.2.TIMESTAMP" + } +} From 0ffe051007438212a75efdd42c63633b95fa5f77 Mon Sep 17 00:00:00 2001 From: Ove Gram Nipen <ove@nipen.no> Date: Tue, 2 Aug 2016 14:09:54 +0200 Subject: [PATCH 0530/1622] Removed unneccesary firewall config --- http/sles-12/sles-12-sp1-x86_64-autoinst.xml | 41 -------------------- 1 file changed, 41 deletions(-) diff --git a/http/sles-12/sles-12-sp1-x86_64-autoinst.xml b/http/sles-12/sles-12-sp1-x86_64-autoinst.xml index 00294916e..fded59a95 100644 --- a/http/sles-12/sles-12-sp1-x86_64-autoinst.xml +++ b/http/sles-12/sles-12-sp1-x86_64-autoinst.xml @@ -44,47 +44,6 @@ <image_installation config:type="boolean">false</image_installation> </deploy_image> <firewall> - <FW_ALLOW_FW_BROADCAST_DMZ>no</FW_ALLOW_FW_BROADCAST_DMZ> - <FW_ALLOW_FW_BROADCAST_EXT>no</FW_ALLOW_FW_BROADCAST_EXT> - <FW_ALLOW_FW_BROADCAST_INT>no</FW_ALLOW_FW_BROADCAST_INT> - <FW_CONFIGURATIONS_DMZ/> - <FW_CONFIGURATIONS_EXT/> - <FW_CONFIGURATIONS_INT/> - <FW_DEV_DMZ/> - <FW_DEV_EXT/> - <FW_DEV_INT/> - <FW_FORWARD_ALWAYS_INOUT_DEV/> - <FW_FORWARD_MASQ/> - <FW_IGNORE_FW_BROADCAST_DMZ>no</FW_IGNORE_FW_BROADCAST_DMZ> - <FW_IGNORE_FW_BROADCAST_EXT>yes</FW_IGNORE_FW_BROADCAST_EXT> - <FW_IGNORE_FW_BROADCAST_INT>no</FW_IGNORE_FW_BROADCAST_INT> - <FW_IPSEC_TRUST>no</FW_IPSEC_TRUST> - <FW_LOAD_MODULES/> - <FW_LOG_ACCEPT_ALL>no</FW_LOG_ACCEPT_ALL> - <FW_LOG_ACCEPT_CRIT>yes</FW_LOG_ACCEPT_CRIT> - <FW_LOG_DROP_ALL>no</FW_LOG_DROP_ALL> - <FW_LOG_DROP_CRIT>yes</FW_LOG_DROP_CRIT> - <FW_MASQUERADE>no</FW_MASQUERADE> - <FW_PROTECT_FROM_INT>no</FW_PROTECT_FROM_INT> - <FW_ROUTE>no</FW_ROUTE> - <FW_SERVICES_ACCEPT_DMZ/> - <FW_SERVICES_ACCEPT_EXT/> - <FW_SERVICES_ACCEPT_INT/> - <FW_SERVICES_ACCEPT_RELATED_DMZ/> - <FW_SERVICES_ACCEPT_RELATED_EXT/> - <FW_SERVICES_ACCEPT_RELATED_INT/> - <FW_SERVICES_DMZ_IP/> - <FW_SERVICES_DMZ_RPC/> - <FW_SERVICES_DMZ_TCP/> - <FW_SERVICES_DMZ_UDP/> - <FW_SERVICES_EXT_IP/> - <FW_SERVICES_EXT_RPC/> - <FW_SERVICES_EXT_TCP/> - <FW_SERVICES_EXT_UDP/> - <FW_SERVICES_INT_IP/> - <FW_SERVICES_INT_RPC/> - <FW_SERVICES_INT_TCP/> - <FW_SERVICES_INT_UDP/> <enable_firewall config:type="boolean">false</enable_firewall> <start_firewall config:type="boolean">false</start_firewall> </firewall> From f5d037dd7a6f75d0983558b0b1f1af2488fb4894 Mon Sep 17 00:00:00 2001 From: Seth Thomas <sthomas@chef.io> Date: Wed, 3 Aug 2016 12:29:34 -0400 Subject: [PATCH 0531/1622] Check to see if release has already taken place and skip if not needed --- bin/bento | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/bin/bento b/bin/bento index 29e5f6aab..0fc265f46 100755 --- a/bin/bento +++ b/bin/bento @@ -644,14 +644,26 @@ class ReleaseRunner private def release_version(boxname, version) - banner("Releasing version #{version} of box #{boxname}") - req = request('put', "#{atlas_api}/box/#{atlas_org}/#{boxname}/version/#{version}/release", { 'access_token' => atlas_token }, { 'Content-Type' => 'application/json' }) - if req.code == '200' - banner("Version #{version} of box #{boxname} has been successfully released") + case status(boxname, version) + when 'unreleased' + banner("Releasing version #{version} of box #{boxname}") + req = request('put', "#{atlas_api}/box/#{atlas_org}/#{boxname}/version/#{version}/release", { 'access_token' => atlas_token }, { 'Content-Type' => 'application/json' }) + if req.code == '200' + banner("Version #{version} of box #{boxname} has been successfully released") + else + warn("Something went wrong #{req.code}") + end + when 'active' + banner("Version #{version} of box #{boxname} has already been released - nothing to do") else - warn("Something went wrong #{req.code}") + warn("Unexpected status retrieved from Atlas") end end + + def status(boxname, version) + req = request('get', "#{atlas_api}/box/#{atlas_org}/#{boxname}/version/#{version}", { 'access_token' => atlas_token }, { 'Content-Type' => 'application/json' }) + status = JSON.parse(req.body)['status'] + end end class RevokeRunner From 826170041ed1096e9a629d49e20619270f3cb712 Mon Sep 17 00:00:00 2001 From: Andres Montalban <amontalban@devopx.com> Date: Wed, 24 Aug 2016 08:56:11 -0300 Subject: [PATCH 0532/1622] Speed up booting process for FreeBSD saving 10 seconds in boot time For more info check: https://www.freebsd.org/cgi/man.cgi?loader(8) autoboot_delay Number of seconds autoboot will wait before booting. Ifthis variableis not defined,autoboot will default to 10 seconds. If set to NO'', no autoboot will be automatically attempted after processing/boot/loader.rc, thoughexplicit autoboot's will be processed normally, defaulting to 10 seconds delay. If set to 0'',no delay will be inserted, but user still will be able to interrupt autoboot process and escapeinto the interactive modeby pressing some key onthe console while ker- nel and modules are being loaded. If set to -1'', no delay will be inserted and loader will engage interactive mode only if autoboothas failed for some reason. --- scripts/freebsd/vmtools.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/scripts/freebsd/vmtools.sh b/scripts/freebsd/vmtools.sh index ad5962ab4..766222d1a 100644 --- a/scripts/freebsd/vmtools.sh +++ b/scripts/freebsd/vmtools.sh @@ -23,6 +23,9 @@ virtualbox-iso|virtualbox-ovf) echo 'virtio_balloon_load="YES"' >>/boot/loader.conf; echo 'if_vtnet_load="YES"' >>/boot/loader.conf; + # Don't waste 10 seconds waiting for boot + echo 'autoboot_delay="-1"' >>/boot/loader.conf; + echo 'ifconfig_vtnet0_name="em0"' >>/etc/rc.conf; echo 'ifconfig_vtnet1_name="em1"' >>/etc/rc.conf; echo 'ifconfig_vtnet2_name="em2"' >>/etc/rc.conf; From 1cd0514dbb556f5e7ce27fc6e79ed81b5bd94827 Mon Sep 17 00:00:00 2001 From: Conor Schaefer <conor@freedom.press> Date: Mon, 29 Aug 2016 12:09:30 +0800 Subject: [PATCH 0533/1622] Renames "ubuntu-server" task -> "server" The Ubuntu 14.04 config was using tasksel to add the "ubuntu-server" task, which doesn't exist. Maybe it used to. The "server" task is actually what we want, and pulls in packages for a headless setup, such as tmux. --- http/ubuntu-14.04/preseed.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/http/ubuntu-14.04/preseed.cfg b/http/ubuntu-14.04/preseed.cfg index b1350ecef..56bfa6b1d 100644 --- a/http/ubuntu-14.04/preseed.cfg +++ b/http/ubuntu-14.04/preseed.cfg @@ -28,4 +28,4 @@ d-i pkgsel/upgrade select full-upgrade d-i time/zone string UTC d-i user-setup/allow-password-weak boolean true d-i user-setup/encrypt-home boolean false -tasksel tasksel/first multiselect standard, ubuntu-server +tasksel tasksel/first multiselect standard, server From ba638929b5aab618aa18c8a3d179ea794e58d698 Mon Sep 17 00:00:00 2001 From: Conor Schaefer <conor@freedom.press> Date: Mon, 29 Aug 2016 18:31:24 +0800 Subject: [PATCH 0534/1622] Renames task "ubuntu-server" -> "server" for Ubuntu 12.04 --- http/ubuntu-12.04/preseed.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/http/ubuntu-12.04/preseed.cfg b/http/ubuntu-12.04/preseed.cfg index d56685fa5..827099347 100644 --- a/http/ubuntu-12.04/preseed.cfg +++ b/http/ubuntu-12.04/preseed.cfg @@ -28,4 +28,4 @@ d-i pkgsel/upgrade select full-upgrade d-i time/zone string UTC d-i user-setup/allow-password-weak boolean true d-i user-setup/encrypt-home boolean false -tasksel tasksel/first multiselect standard, ubuntu-server +tasksel tasksel/first multiselect standard, server From b27f4067832eaf0ea94948f2ef432a96667752bb Mon Sep 17 00:00:00 2001 From: Conor Schaefer <conor@freedom.press> Date: Mon, 29 Aug 2016 18:32:11 +0800 Subject: [PATCH 0535/1622] Renames task "ubuntu-server" -> "server" for Ubuntu 15.10 Also affects Ubuntu 16.04, since the Packer config for 16.04 references the preseed file for 15.10. --- http/ubuntu-15.10/preseed.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/http/ubuntu-15.10/preseed.cfg b/http/ubuntu-15.10/preseed.cfg index b1350ecef..56bfa6b1d 100644 --- a/http/ubuntu-15.10/preseed.cfg +++ b/http/ubuntu-15.10/preseed.cfg @@ -28,4 +28,4 @@ d-i pkgsel/upgrade select full-upgrade d-i time/zone string UTC d-i user-setup/allow-password-weak boolean true d-i user-setup/encrypt-home boolean false -tasksel tasksel/first multiselect standard, ubuntu-server +tasksel tasksel/first multiselect standard, server From cb44d57ca02139a768b3c2cb16664e65542144c9 Mon Sep 17 00:00:00 2001 From: Christoph Blecker <admin@toph.ca> Date: Wed, 7 Sep 2016 10:51:27 -0700 Subject: [PATCH 0536/1622] Add script to disable system sleep for Mac OS X By default, Mac OS X will sleep after a certain time period. This isn't optimal for Vagrant boxes as you can't SSH to the box when it is sleeping. This change disables sleep at box creation. --- macosx-10.10.json | 1 + macosx-10.11.json | 1 + macosx-10.7.json | 1 + macosx-10.8.json | 1 + macosx-10.9.json | 1 + scripts/macosx/disablesleep.sh | 4 ++++ 6 files changed, 9 insertions(+) create mode 100644 scripts/macosx/disablesleep.sh diff --git a/macosx-10.10.json b/macosx-10.10.json index 23a877554..b0ff7c28f 100644 --- a/macosx-10.10.json +++ b/macosx-10.10.json @@ -202,6 +202,7 @@ "scripts/macosx/hostname.sh", "scripts/macosx/update.sh", "scripts/macosx/networking.sh", + "scripts/macosx/disablesleep.sh", "scripts/macosx/vagrant.sh", "scripts/macosx/vmtools.sh", "scripts/macosx/cleanup.sh", diff --git a/macosx-10.11.json b/macosx-10.11.json index 0ac3ce4f2..633d9a20c 100644 --- a/macosx-10.11.json +++ b/macosx-10.11.json @@ -202,6 +202,7 @@ "scripts/macosx/hostname.sh", "scripts/macosx/update.sh", "scripts/macosx/networking.sh", + "scripts/macosx/disablesleep.sh", "scripts/macosx/vagrant.sh", "scripts/macosx/vmtools.sh", "scripts/macosx/cleanup.sh", diff --git a/macosx-10.7.json b/macosx-10.7.json index 26166067e..eea9be96f 100644 --- a/macosx-10.7.json +++ b/macosx-10.7.json @@ -202,6 +202,7 @@ "scripts/macosx/hostname.sh", "scripts/macosx/update.sh", "scripts/macosx/networking.sh", + "scripts/macosx/disablesleep.sh", "scripts/macosx/vagrant.sh", "scripts/macosx/vmtools.sh", "scripts/macosx/cleanup.sh", diff --git a/macosx-10.8.json b/macosx-10.8.json index 75fb1b7db..635c28dcf 100644 --- a/macosx-10.8.json +++ b/macosx-10.8.json @@ -202,6 +202,7 @@ "scripts/macosx/hostname.sh", "scripts/macosx/update.sh", "scripts/macosx/networking.sh", + "scripts/macosx/disablesleep.sh", "scripts/macosx/vagrant.sh", "scripts/macosx/vmtools.sh", "scripts/macosx/cleanup.sh", diff --git a/macosx-10.9.json b/macosx-10.9.json index ba2722089..d19762d59 100644 --- a/macosx-10.9.json +++ b/macosx-10.9.json @@ -202,6 +202,7 @@ "scripts/macosx/hostname.sh", "scripts/macosx/update.sh", "scripts/macosx/networking.sh", + "scripts/macosx/disablesleep.sh", "scripts/macosx/vagrant.sh", "scripts/macosx/vmtools.sh", "scripts/macosx/cleanup.sh", diff --git a/scripts/macosx/disablesleep.sh b/scripts/macosx/disablesleep.sh new file mode 100644 index 000000000..215b42bb8 --- /dev/null +++ b/scripts/macosx/disablesleep.sh @@ -0,0 +1,4 @@ +#!/bin/sh -eux + +# disable system sleep +pmset -a sleep 0 From 76aa518e151b289b47f1e2c1968a64062bb4dd53 Mon Sep 17 00:00:00 2001 From: Seth Thomas <sthomas@chef.io> Date: Thu, 29 Sep 2016 11:16:17 -0400 Subject: [PATCH 0537/1622] Add Debian 8.6. Fix #669 --- .../debian-8.5-amd64.json | 0 .../debian-8.5-i386.json | 0 debian-8.6-amd64.json | 244 ++++++++++++++++++ debian-8.6-i386.json | 244 ++++++++++++++++++ 4 files changed, 488 insertions(+) rename debian-8.5-amd64.json => archive/debian-8.5-amd64.json (100%) rename debian-8.5-i386.json => archive/debian-8.5-i386.json (100%) create mode 100644 debian-8.6-amd64.json create mode 100644 debian-8.6-i386.json diff --git a/debian-8.5-amd64.json b/archive/debian-8.5-amd64.json similarity index 100% rename from debian-8.5-amd64.json rename to archive/debian-8.5-amd64.json diff --git a/debian-8.5-i386.json b/archive/debian-8.5-i386.json similarity index 100% rename from debian-8.5-i386.json rename to archive/debian-8.5-i386.json diff --git a/debian-8.6-amd64.json b/debian-8.6-amd64.json new file mode 100644 index 000000000..471ccec78 --- /dev/null +++ b/debian-8.6-amd64.json @@ -0,0 +1,244 @@ +{ + "builders": [ + { + "boot_command": [ + "<esc><wait>", + "install <wait>", + " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}} <wait>", + "debian-installer=en_US <wait>", + "auto <wait>", + "locale=en_US <wait>", + "kbd-chooser/method=us <wait>", + "keyboard-configuration/xkb-keymap=us <wait>", + "netcfg/get_hostname={{ .Name }} <wait>", + "netcfg/get_domain=vagrantup.com <wait>", + "fb=false <wait>", + "debconf/frontend=noninteractive <wait>", + "console-setup/ask_detect=false <wait>", + "console-keymaps-at/keymap=us <wait>", + "grub-installer/bootdev=/dev/sda <wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": "{{user `disk_size`}}", + "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "guest_os_type": "Debian_64", + "hard_drive_interface": "sata", + "headless": "{{ user `headless` }}", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-virtualbox", + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "virtualbox-iso", + "vboxmanage": [ + [ + "modifyvm", + "{{.Name}}", + "--memory", + "{{ user `memory` }}" + ], + [ + "modifyvm", + "{{.Name}}", + "--cpus", + "{{ user `cpus` }}" + ] + ], + "virtualbox_version_file": ".vbox_version", + "vm_name": "{{ user `template` }}" + }, + { + "boot_command": [ + "<esc><wait>", + "install <wait>", + " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}} <wait>", + "debian-installer=en_US <wait>", + "auto <wait>", + "locale=en_US <wait>", + "kbd-chooser/method=us <wait>", + "keyboard-configuration/xkb-keymap=us <wait>", + "netcfg/get_hostname={{ .Name }} <wait>", + "netcfg/get_domain=vagrantup.com <wait>", + "fb=false <wait>", + "debconf/frontend=noninteractive <wait>", + "console-setup/ask_detect=false <wait>", + "console-keymaps-at/keymap=us <wait>", + "grub-installer/bootdev=/dev/sda <wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": "{{user `disk_size`}}", + "guest_os_type": "debian8-64", + "headless": "{{ user `headless` }}", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-vmware", + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "tools_upload_flavor": "linux", + "type": "vmware-iso", + "vm_name": "{{ user `template` }}", + "vmx_data": { + "cpuid.coresPerSocket": "1", + "ethernet0.pciSlotNumber": "32", + "memsize": "{{ user `memory` }}", + "numvcpus": "{{ user `cpus` }}" + } + }, + { + "boot_command": [ + "<esc><wait>", + "install <wait>", + " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}} <wait>", + "debian-installer=en_US <wait>", + "auto <wait>", + "locale=en_US <wait>", + "kbd-chooser/method=us <wait>", + "keyboard-configuration/xkb-keymap=us <wait>", + "netcfg/get_hostname={{ .Name }} <wait>", + "netcfg/get_domain=vagrantup.com <wait>", + "fb=false <wait>", + "debconf/frontend=noninteractive <wait>", + "console-setup/ask_detect=false <wait>", + "console-keymaps-at/keymap=us <wait>", + "grub-installer/bootdev=/dev/sda <wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": "{{user `disk_size`}}", + "guest_os_type": "debian", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-parallels", + "parallels_tools_flavor": "lin", + "prlctl": [ + [ + "set", + "{{.Name}}", + "--memsize", + "{{ user `memory` }}" + ], + [ + "set", + "{{.Name}}", + "--cpus", + "{{ user `cpus` }}" + ] + ], + "prlctl_version_file": ".prlctl_version", + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "parallels-iso", + "vm_name": "{{ user `template` }}" + }, + { + "boot_command": [ + "<esc><wait>", + "install <wait>", + " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}} <wait>", + "debian-installer=en_US <wait>", + "auto <wait>", + "locale=en_US <wait>", + "kbd-chooser/method=us <wait>", + "keyboard-configuration/xkb-keymap=us <wait>", + "netcfg/get_hostname={{ .Name }} <wait>", + "netcfg/get_domain=vagrantup.com <wait>", + "fb=false <wait>", + "debconf/frontend=noninteractive <wait>", + "console-setup/ask_detect=false <wait>", + "console-keymaps-at/keymap=us <wait>", + "grub-installer/bootdev=/dev/vda <wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": "{{user `disk_size`}}", + "headless": "{{ user `headless` }}", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-qemu", + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "qemu", + "vm_name": "{{ user `template` }}" + } + ], + "post-processors": [ + { + "output": "builds/{{user `box_basename`}}.{{.Provider}}.box", + "type": "vagrant" + } + ], + "provisioners": [ + { + "destination": "/tmp/bento-metadata.json", + "source": "{{user `metadata`}}", + "type": "file" + }, + { + "environment_vars": [ + "HOME_DIR=/home/vagrant", + "http_proxy={{user `http_proxy`}}", + "https_proxy={{user `https_proxy`}}", + "no_proxy={{user `no_proxy`}}" + ], + "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", + "scripts": [ + "scripts/common/metadata.sh", + "scripts/debian/update.sh", + "scripts/common/sshd.sh", + "scripts/debian/networking.sh", + "scripts/debian/sudoers.sh", + "scripts/common/vagrant.sh", + "scripts/common/virtualbox.sh", + "scripts/common/vmware.sh", + "scripts/common/parallels.sh", + "scripts/debian/cleanup.sh", + "scripts/common/minimize.sh" + ], + "type": "shell" + } + ], + "variables": { + "box_basename": "debian-8.6", + "build_timestamp": "{{isotime \"20060102150405\"}}", + "cpus": "1", + "disk_size": "40960", + "git_revision": "__unknown_git_revision__", + "headless": "", + "http_proxy": "{{env `http_proxy`}}", + "https_proxy": "{{env `https_proxy`}}", + "iso_checksum": "e9cb144e486409b2ea1454dceae8d46e0ebab88435cf0b6e7a18f3aa3a51c538", + "iso_checksum_type": "sha256", + "iso_name": "debian-8.6.0-amd64-CD-1.iso", + "memory": "512", + "metadata": "floppy/dummy_metadata.json", + "mirror": "http://cdimage.debian.org/cdimage/release", + "mirror_directory": "8.6.0/amd64/iso-cd", + "name": "debian-8.6", + "no_proxy": "{{env `no_proxy`}}", + "preseed_path": "debian-8/preseed.cfg", + "template": "debian-8.6-amd64", + "version": "2.1.TIMESTAMP" + } +} diff --git a/debian-8.6-i386.json b/debian-8.6-i386.json new file mode 100644 index 000000000..5cc309ff8 --- /dev/null +++ b/debian-8.6-i386.json @@ -0,0 +1,244 @@ +{ + "builders": [ + { + "boot_command": [ + "<esc><wait>", + "install <wait>", + " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}} <wait>", + "debian-installer=en_US <wait>", + "auto <wait>", + "locale=en_US <wait>", + "kbd-chooser/method=us <wait>", + "keyboard-configuration/xkb-keymap=us <wait>", + "netcfg/get_hostname={{ .Name }} <wait>", + "netcfg/get_domain=vagrantup.com <wait>", + "fb=false <wait>", + "debconf/frontend=noninteractive <wait>", + "console-setup/ask_detect=false <wait>", + "console-keymaps-at/keymap=us <wait>", + "grub-installer/bootdev=/dev/sda <wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": "{{user `disk_size`}}", + "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "guest_os_type": "Debian", + "hard_drive_interface": "sata", + "headless": "{{ user `headless` }}", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-virtualbox", + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "virtualbox-iso", + "vboxmanage": [ + [ + "modifyvm", + "{{.Name}}", + "--memory", + "{{ user `memory` }}" + ], + [ + "modifyvm", + "{{.Name}}", + "--cpus", + "{{ user `cpus` }}" + ] + ], + "virtualbox_version_file": ".vbox_version", + "vm_name": "{{ user `template` }}" + }, + { + "boot_command": [ + "<esc><wait>", + "install <wait>", + " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}} <wait>", + "debian-installer=en_US <wait>", + "auto <wait>", + "locale=en_US <wait>", + "kbd-chooser/method=us <wait>", + "keyboard-configuration/xkb-keymap=us <wait>", + "netcfg/get_hostname={{ .Name }} <wait>", + "netcfg/get_domain=vagrantup.com <wait>", + "fb=false <wait>", + "debconf/frontend=noninteractive <wait>", + "console-setup/ask_detect=false <wait>", + "console-keymaps-at/keymap=us <wait>", + "grub-installer/bootdev=/dev/sda <wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": "{{user `disk_size`}}", + "guest_os_type": "debian8", + "headless": "{{ user `headless` }}", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-vmware", + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "tools_upload_flavor": "linux", + "type": "vmware-iso", + "vm_name": "{{ user `template` }}", + "vmx_data": { + "cpuid.coresPerSocket": "1", + "ethernet0.pciSlotNumber": "32", + "memsize": "{{ user `memory` }}", + "numvcpus": "{{ user `cpus` }}" + } + }, + { + "boot_command": [ + "<esc><wait>", + "install <wait>", + " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}} <wait>", + "debian-installer=en_US <wait>", + "auto <wait>", + "locale=en_US <wait>", + "kbd-chooser/method=us <wait>", + "keyboard-configuration/xkb-keymap=us <wait>", + "netcfg/get_hostname={{ .Name }} <wait>", + "netcfg/get_domain=vagrantup.com <wait>", + "fb=false <wait>", + "debconf/frontend=noninteractive <wait>", + "console-setup/ask_detect=false <wait>", + "console-keymaps-at/keymap=us <wait>", + "grub-installer/bootdev=/dev/sda <wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": "{{user `disk_size`}}", + "guest_os_type": "debian", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-parallels", + "parallels_tools_flavor": "lin", + "prlctl": [ + [ + "set", + "{{.Name}}", + "--memsize", + "{{ user `memory` }}" + ], + [ + "set", + "{{.Name}}", + "--cpus", + "{{ user `cpus` }}" + ] + ], + "prlctl_version_file": ".prlctl_version", + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "parallels-iso", + "vm_name": "{{ user `template` }}" + }, + { + "boot_command": [ + "<esc><wait>", + "install <wait>", + " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}} <wait>", + "debian-installer=en_US <wait>", + "auto <wait>", + "locale=en_US <wait>", + "kbd-chooser/method=us <wait>", + "keyboard-configuration/xkb-keymap=us <wait>", + "netcfg/get_hostname={{ .Name }} <wait>", + "netcfg/get_domain=vagrantup.com <wait>", + "fb=false <wait>", + "debconf/frontend=noninteractive <wait>", + "console-setup/ask_detect=false <wait>", + "console-keymaps-at/keymap=us <wait>", + "grub-installer/bootdev=/dev/vda <wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": "{{user `disk_size`}}", + "headless": "{{ user `headless` }}", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-qemu", + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "qemu", + "vm_name": "{{ user `template` }}" + } + ], + "post-processors": [ + { + "output": "builds/{{user `box_basename`}}.{{.Provider}}.box", + "type": "vagrant" + } + ], + "provisioners": [ + { + "destination": "/tmp/bento-metadata.json", + "source": "{{user `metadata`}}", + "type": "file" + }, + { + "environment_vars": [ + "HOME_DIR=/home/vagrant", + "http_proxy={{user `http_proxy`}}", + "https_proxy={{user `https_proxy`}}", + "no_proxy={{user `no_proxy`}}" + ], + "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", + "scripts": [ + "scripts/common/metadata.sh", + "scripts/debian/update.sh", + "scripts/common/sshd.sh", + "scripts/debian/networking.sh", + "scripts/debian/sudoers.sh", + "scripts/common/vagrant.sh", + "scripts/common/virtualbox.sh", + "scripts/common/vmware.sh", + "scripts/common/parallels.sh", + "scripts/debian/cleanup.sh", + "scripts/common/minimize.sh" + ], + "type": "shell" + } + ], + "variables": { + "box_basename": "debian-8.6-i386", + "build_timestamp": "{{isotime \"20060102150405\"}}", + "cpus": "1", + "disk_size": "40960", + "git_revision": "__unknown_git_revision__", + "headless": "", + "http_proxy": "{{env `http_proxy`}}", + "https_proxy": "{{env `https_proxy`}}", + "iso_checksum": "9f93c4f5981f14515221b6cf6b01b211af895dd120194d462f16cf0739457ff5", + "iso_checksum_type": "sha256", + "iso_name": "debian-8.6.0-i386-CD-1.iso", + "memory": "512", + "metadata": "floppy/dummy_metadata.json", + "mirror": "http://cdimage.debian.org/cdimage/release", + "mirror_directory": "8.6.0/i386/iso-cd", + "name": "debian-8.6-i386", + "no_proxy": "{{env `no_proxy`}}", + "preseed_path": "debian-8/preseed.cfg", + "template": "debian-8.6-i386", + "version": "2.1.TIMESTAMP" + } +} From c71fe369fd613dabb80dff824f55a5fe34c59494 Mon Sep 17 00:00:00 2001 From: Seth Thomas <sthomas@chef.io> Date: Thu, 29 Sep 2016 11:22:03 -0400 Subject: [PATCH 0538/1622] Partially revert #638. Fix #667 --- centos-7.2-x86_64.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/centos-7.2-x86_64.json b/centos-7.2-x86_64.json index 0566634c3..ed62d3d72 100644 --- a/centos-7.2-x86_64.json +++ b/centos-7.2-x86_64.json @@ -148,7 +148,7 @@ "scripts/centos/networking.sh", "scripts/common/vagrant.sh", "scripts/common/virtualbox.sh", - "scripts/centos/vmware.sh", + "scripts/common/vmware.sh", "scripts/common/parallels.sh", "scripts/centos/cleanup.sh", "scripts/common/minimize.sh" From c032f25f6dc0016211df31586fafab2e67dcd420 Mon Sep 17 00:00:00 2001 From: Seth Thomas <sthomas@chef.io> Date: Thu, 29 Sep 2016 15:15:43 -0400 Subject: [PATCH 0539/1622] Updating build.sh with more env vars --- build.sh | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/build.sh b/build.sh index 2345ede3c..41ec0eb6c 100644 --- a/build.sh +++ b/build.sh @@ -65,16 +65,23 @@ echo "--- Cleaning up after Packer" rake clean echo "--- Build $PLATFORM-$BENTO_PROVIDERS" -rake build_box[$PLATFORM] +./bin/bento build --headless --version $BENTO_VERSION --only $BENTO_PROVIDERS $PLATFORM echo "--- Test $PLATFORM-$BENTO_PROVIDERS" -rake test_all +if [ "$BENTO_TEST_SHARED_FOLDER" -eq 1 ] +then + echo "--- Testing Shared Folder Support" + ./bin/bento test -f +else + echo "--- NOT Testing Shared Folder Support" + ./bin/bento test +fi if [ "$BENTO_UPLOAD" -eq 1 ] then echo "--- Upload Boxes to Atlas and S3" - rake upload_all + ./bin/bento upload echo "--- Release Boxes on Atlas" - rake release_all + ./bin/bento release $ATLAS_NAME $BENTO_VERSION fi From 8e482441cd89eef8ca03b33c5792e8b9dd0b4e65 Mon Sep 17 00:00:00 2001 From: Seth Thomas <sthomas@chef.io> Date: Fri, 30 Sep 2016 11:46:01 -0400 Subject: [PATCH 0540/1622] Autodetection is for the birds --- bin/bento | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/bin/bento b/bin/bento index 0fc265f46..a4519b359 100755 --- a/bin/bento +++ b/bin/bento @@ -555,16 +555,12 @@ class TestRunner def test_box(boxname, providers) providers.each do |provider, provider_data| - plugin_list = Mixlib::ShellOut.new("vagrant plugin list | awk '{print $1}'") - plugin_list.run_command - plugins = plugin_list.stdout.split("\n") - if provider == 'vmware_desktop' - case - when plugins.include?('vagrant-vmware-workstation') - provider = 'vmware_workstation' - when plugins.include?('vagrant-vmware-fusion') + case RUBY_PLATFORM + when /darwin/ provider = 'vmware_fusion' + when /linux/ + provider = 'vmware_workstation' end end From 54855a0f6ee32852621644d2619936a79c3c3a7c Mon Sep 17 00:00:00 2001 From: Rickard von Essen <rickard.von.essen@gmail.com> Date: Fri, 30 Sep 2016 23:41:43 +0200 Subject: [PATCH 0541/1622] Changed the vagrant users UID from 900 to 1000 --- http/debian-6.0/preseed.cfg | 2 +- http/debian-7/preseed.cfg | 2 +- http/debian-8/preseed.cfg | 2 +- http/ubuntu-10.04/preseed.cfg | 2 +- http/ubuntu-12.04/preseed.cfg | 2 +- http/ubuntu-14.04/preseed.cfg | 2 +- http/ubuntu-14.10/preseed.cfg | 2 +- http/ubuntu-15.04/preseed.cfg | 2 +- http/ubuntu-15.10/preseed.cfg | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/http/debian-6.0/preseed.cfg b/http/debian-6.0/preseed.cfg index fcf343623..bdf87f186 100644 --- a/http/debian-6.0/preseed.cfg +++ b/http/debian-6.0/preseed.cfg @@ -26,7 +26,7 @@ d-i passwd/root-login boolean false d-i passwd/root-password-again password vagrant d-i passwd/root-password password vagrant d-i passwd/user-fullname string vagrant -d-i passwd/user-uid string 900 +d-i passwd/user-uid string 1000 d-i passwd/user-password password vagrant d-i passwd/user-password-again password vagrant d-i passwd/username string vagrant diff --git a/http/debian-7/preseed.cfg b/http/debian-7/preseed.cfg index 9b996d3e9..573d761b5 100644 --- a/http/debian-7/preseed.cfg +++ b/http/debian-7/preseed.cfg @@ -26,7 +26,7 @@ d-i passwd/root-login boolean false d-i passwd/root-password-again password vagrant d-i passwd/root-password password vagrant d-i passwd/user-fullname string vagrant -d-i passwd/user-uid string 900 +d-i passwd/user-uid string 1000 d-i passwd/user-password password vagrant d-i passwd/user-password-again password vagrant d-i passwd/username string vagrant diff --git a/http/debian-8/preseed.cfg b/http/debian-8/preseed.cfg index bde0adcbc..81ce1f450 100644 --- a/http/debian-8/preseed.cfg +++ b/http/debian-8/preseed.cfg @@ -26,7 +26,7 @@ d-i passwd/root-login boolean false d-i passwd/root-password-again password vagrant d-i passwd/root-password password vagrant d-i passwd/user-fullname string vagrant -d-i passwd/user-uid string 900 +d-i passwd/user-uid string 1000 d-i passwd/user-password password vagrant d-i passwd/user-password-again password vagrant d-i passwd/username string vagrant diff --git a/http/ubuntu-10.04/preseed.cfg b/http/ubuntu-10.04/preseed.cfg index a0b1ba1f9..b61fea3a1 100644 --- a/http/ubuntu-10.04/preseed.cfg +++ b/http/ubuntu-10.04/preseed.cfg @@ -17,7 +17,7 @@ d-i partman/confirm boolean true d-i partman/confirm_nooverwrite boolean true d-i partman/confirm_write_new_label boolean true d-i passwd/user-fullname string vagrant -d-i passwd/user-uid string 900 +d-i passwd/user-uid string 1000 d-i passwd/user-password password vagrant d-i passwd/user-password-again password vagrant d-i passwd/username string vagrant diff --git a/http/ubuntu-12.04/preseed.cfg b/http/ubuntu-12.04/preseed.cfg index 827099347..6fb68b78d 100644 --- a/http/ubuntu-12.04/preseed.cfg +++ b/http/ubuntu-12.04/preseed.cfg @@ -17,7 +17,7 @@ d-i partman/confirm boolean true d-i partman/confirm_nooverwrite boolean true d-i partman/confirm_write_new_label boolean true d-i passwd/user-fullname string vagrant -d-i passwd/user-uid string 900 +d-i passwd/user-uid string 1000 d-i passwd/user-password password vagrant d-i passwd/user-password-again password vagrant d-i passwd/username string vagrant diff --git a/http/ubuntu-14.04/preseed.cfg b/http/ubuntu-14.04/preseed.cfg index 56bfa6b1d..81b0abec5 100644 --- a/http/ubuntu-14.04/preseed.cfg +++ b/http/ubuntu-14.04/preseed.cfg @@ -17,7 +17,7 @@ d-i partman/confirm boolean true d-i partman/confirm_nooverwrite boolean true d-i partman/confirm_write_new_label boolean true d-i passwd/user-fullname string vagrant -d-i passwd/user-uid string 900 +d-i passwd/user-uid string 1000 d-i passwd/user-password password vagrant d-i passwd/user-password-again password vagrant d-i passwd/username string vagrant diff --git a/http/ubuntu-14.10/preseed.cfg b/http/ubuntu-14.10/preseed.cfg index a0b1ba1f9..b61fea3a1 100644 --- a/http/ubuntu-14.10/preseed.cfg +++ b/http/ubuntu-14.10/preseed.cfg @@ -17,7 +17,7 @@ d-i partman/confirm boolean true d-i partman/confirm_nooverwrite boolean true d-i partman/confirm_write_new_label boolean true d-i passwd/user-fullname string vagrant -d-i passwd/user-uid string 900 +d-i passwd/user-uid string 1000 d-i passwd/user-password password vagrant d-i passwd/user-password-again password vagrant d-i passwd/username string vagrant diff --git a/http/ubuntu-15.04/preseed.cfg b/http/ubuntu-15.04/preseed.cfg index a0b1ba1f9..b61fea3a1 100644 --- a/http/ubuntu-15.04/preseed.cfg +++ b/http/ubuntu-15.04/preseed.cfg @@ -17,7 +17,7 @@ d-i partman/confirm boolean true d-i partman/confirm_nooverwrite boolean true d-i partman/confirm_write_new_label boolean true d-i passwd/user-fullname string vagrant -d-i passwd/user-uid string 900 +d-i passwd/user-uid string 1000 d-i passwd/user-password password vagrant d-i passwd/user-password-again password vagrant d-i passwd/username string vagrant diff --git a/http/ubuntu-15.10/preseed.cfg b/http/ubuntu-15.10/preseed.cfg index 56bfa6b1d..81b0abec5 100644 --- a/http/ubuntu-15.10/preseed.cfg +++ b/http/ubuntu-15.10/preseed.cfg @@ -17,7 +17,7 @@ d-i partman/confirm boolean true d-i partman/confirm_nooverwrite boolean true d-i partman/confirm_write_new_label boolean true d-i passwd/user-fullname string vagrant -d-i passwd/user-uid string 900 +d-i passwd/user-uid string 1000 d-i passwd/user-password password vagrant d-i passwd/user-password-again password vagrant d-i passwd/username string vagrant From b13ba07bb76c5c4de6a512ab4876d186dacd3d31 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith@chef.io> Date: Wed, 5 Oct 2016 12:23:23 -0700 Subject: [PATCH 0542/1622] Fix SLES builds 1) Suse is Oracle style now and requires a token to download the image 2) Fix the vm tools installs Signed-off-by: Tim Smith <tsmith@chef.io> --- sles-12-sp1-x86_64.json | 8 ++++++-- sles-12-x86_64.json | 4 +++- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/sles-12-sp1-x86_64.json b/sles-12-sp1-x86_64.json index f024ba321..d8fdcd744 100644 --- a/sles-12-sp1-x86_64.json +++ b/sles-12-sp1-x86_64.json @@ -163,7 +163,9 @@ "scripts/common/sshd.sh", "scripts/common/vagrant.sh", "scripts/sles/unsupported-modules.sh", - "scripts/common/vmtools.sh", + "scripts/common/virtualbox.sh", + "scripts/common/vmware.sh", + "scripts/common/parallels.sh", "scripts/sles/sudoers.sh", "scripts/sles/zypper-locks.sh", "scripts/sles/remove-dvd-source.sh", @@ -174,6 +176,8 @@ } ], "variables": { + "_DOWNLOAD_SITE": "https://www.suse.com/products/server/download", + "_README": "You must download the automated installer iso from the following page, and then place it in the packer_cache dir", "arch": "64", "autoinst_cfg": "sles-12/sles-12-sp1-x86_64-autoinst.xml", "box_basename": "sles-12-sp1", @@ -189,7 +193,7 @@ "iso_name": "SLE-12-SP1-Server-DVD-x86_64-GM-DVD1.iso", "memory": "1024", "metadata": "floppy/dummy_metadata.json", - "mirror": "http://cdn.novell.com/prot/oq2T_Vmjsms~", + "mirror": "./packer_cache", "name": "sles-12-sp1", "template": "sles-12-sp1-x86_64", "version": "2.2.TIMESTAMP" diff --git a/sles-12-x86_64.json b/sles-12-x86_64.json index f8215c5ba..48abcf7df 100644 --- a/sles-12-x86_64.json +++ b/sles-12-x86_64.json @@ -176,6 +176,8 @@ } ], "variables": { + "_DOWNLOAD_SITE": "https://www.suse.com/products/server/download", + "_README": "You must download the automated installer iso from the following page, and then place it in the packer_cache dir", "arch": "64", "autoinst_cfg": "sles-12/sles-12-x86_64-autoinst.xml", "box_basename": "sles-12", @@ -191,7 +193,7 @@ "iso_name": "SLE-12-Server-DVD-x86_64-GM-DVD1.iso", "memory": "512", "metadata": "floppy/dummy_metadata.json", - "mirror": "http://cdn.novell.com/prot/1RBC-NrdggI~", + "mirror": "./packer_cache", "name": "sles-12", "template": "sles-12-x86_64", "version": "2.2.TIMESTAMP" From 174de8cb8da4e28110e7e37a4fc011ca2e3bf1f5 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith@chef.io> Date: Thu, 6 Oct 2016 00:28:36 -0700 Subject: [PATCH 0543/1622] Fix removing the DVD source We only do SLES 12 now so there's no need for the crazy logic Signed-off-by: Tim Smith <tsmith@chef.io> --- scripts/sles/remove-dvd-source.sh | 27 +-------------------------- 1 file changed, 1 insertion(+), 26 deletions(-) diff --git a/scripts/sles/remove-dvd-source.sh b/scripts/sles/remove-dvd-source.sh index 7eef549e7..669fcad8a 100644 --- a/scripts/sles/remove-dvd-source.sh +++ b/scripts/sles/remove-dvd-source.sh @@ -1,29 +1,4 @@ #!/bin/sh -eux -if [ 'x86_64' == `uname -m` ]; then - arch_suffix=x64 -else - arch_suffix=x86 -fi - -oslevel=`grep VERSION /etc/SuSE-release | awk '{ print $3 }'` -patchlevel=`grep PATCHLEVEL /etc/SuSE-release | awk '{ print $3 }'` - -if [ $oslevel == '11' ]; then - if [ $patchlevel == '2' ]; then - repo_ver="11.2.2-1.234" - elif [ $patchlevel == '3' ]; then - repo_ver="11.3.3-1.138" - elif [ $patchlevel == '4' ]; then - repo_ver="11.4.4-1.109" - else - echo "Failed to remove DVD source; don't know how to deal with patchlevel $patchlevel" - exit 1 - fi - zypper removerepo "SUSE-Linux-Enterprise-Server-11-SP$patchlevel $repo_ver" - -elif [ $oslevel == '12' ]; then - zypper removerepo "SLES12-12-$patchlevel"; -fi - +zypper removerepo `zypper repos | grep 'SLES' | awk '{ print $3 }'`; zypper refresh From 2eb1f595b2924829007e847826f1c3aefe4580b3 Mon Sep 17 00:00:00 2001 From: Justin Filip <jfilip@gmail.com> Date: Wed, 12 Oct 2016 15:57:46 -0400 Subject: [PATCH 0544/1622] Install libpam-systemd on systemd-enabled Debian versions. --- archive/debian-8.1-amd64.json | 1 + archive/debian-8.1-i386.json | 1 + archive/debian-8.2-amd64.json | 1 + archive/debian-8.2-i386.json | 1 + archive/debian-8.3-amd64.json | 1 + archive/debian-8.3-i386.json | 1 + archive/debian-8.4-amd64.json | 1 + archive/debian-8.4-i386.json | 1 + archive/debian-8.5-amd64.json | 1 + archive/debian-8.5-i386.json | 1 + debian-8.6-amd64.json | 1 + debian-8.6-i386.json | 1 + scripts/debian/systemd.sh | 4 ++++ 13 files changed, 16 insertions(+) create mode 100644 scripts/debian/systemd.sh diff --git a/archive/debian-8.1-amd64.json b/archive/debian-8.1-amd64.json index 6a39d1ee5..6fb2ead6e 100644 --- a/archive/debian-8.1-amd64.json +++ b/archive/debian-8.1-amd64.json @@ -209,6 +209,7 @@ "scripts/debian/networking.sh", "scripts/debian/sudoers.sh", "scripts/common/vagrant.sh", + "scripts/debian/systemd.sh", "scripts/common/vmtools.sh", "scripts/debian/cleanup.sh", "scripts/common/minimize.sh" diff --git a/archive/debian-8.1-i386.json b/archive/debian-8.1-i386.json index 34d6d0c35..a6b43bf48 100644 --- a/archive/debian-8.1-i386.json +++ b/archive/debian-8.1-i386.json @@ -209,6 +209,7 @@ "scripts/debian/networking.sh", "scripts/debian/sudoers.sh", "scripts/common/vagrant.sh", + "scripts/debian/systemd.sh", "scripts/common/vmtools.sh", "scripts/debian/cleanup.sh", "scripts/common/minimize.sh" diff --git a/archive/debian-8.2-amd64.json b/archive/debian-8.2-amd64.json index 32abf00c0..796861c09 100644 --- a/archive/debian-8.2-amd64.json +++ b/archive/debian-8.2-amd64.json @@ -209,6 +209,7 @@ "scripts/debian/networking.sh", "scripts/debian/sudoers.sh", "scripts/common/vagrant.sh", + "scripts/debian/systemd.sh", "scripts/common/vmtools.sh", "scripts/debian/cleanup.sh", "scripts/common/minimize.sh" diff --git a/archive/debian-8.2-i386.json b/archive/debian-8.2-i386.json index b221653de..d8db7f1a7 100644 --- a/archive/debian-8.2-i386.json +++ b/archive/debian-8.2-i386.json @@ -209,6 +209,7 @@ "scripts/debian/networking.sh", "scripts/debian/sudoers.sh", "scripts/common/vagrant.sh", + "scripts/debian/systemd.sh", "scripts/common/vmtools.sh", "scripts/debian/cleanup.sh", "scripts/common/minimize.sh" diff --git a/archive/debian-8.3-amd64.json b/archive/debian-8.3-amd64.json index 35daec1e4..2b49c553f 100644 --- a/archive/debian-8.3-amd64.json +++ b/archive/debian-8.3-amd64.json @@ -209,6 +209,7 @@ "scripts/debian/networking.sh", "scripts/debian/sudoers.sh", "scripts/common/vagrant.sh", + "scripts/debian/systemd.sh", "scripts/common/vmtools.sh", "scripts/debian/cleanup.sh", "scripts/common/minimize.sh" diff --git a/archive/debian-8.3-i386.json b/archive/debian-8.3-i386.json index a84b0e996..396e2062c 100644 --- a/archive/debian-8.3-i386.json +++ b/archive/debian-8.3-i386.json @@ -209,6 +209,7 @@ "scripts/debian/networking.sh", "scripts/debian/sudoers.sh", "scripts/common/vagrant.sh", + "scripts/debian/systemd.sh", "scripts/common/vmtools.sh", "scripts/debian/cleanup.sh", "scripts/common/minimize.sh" diff --git a/archive/debian-8.4-amd64.json b/archive/debian-8.4-amd64.json index c80a09114..fdcf1a690 100644 --- a/archive/debian-8.4-amd64.json +++ b/archive/debian-8.4-amd64.json @@ -210,6 +210,7 @@ "scripts/debian/networking.sh", "scripts/debian/sudoers.sh", "scripts/common/vagrant.sh", + "scripts/debian/systemd.sh", "scripts/common/vmtools.sh", "scripts/debian/cleanup.sh", "scripts/common/minimize.sh" diff --git a/archive/debian-8.4-i386.json b/archive/debian-8.4-i386.json index 325612345..3707caa1b 100644 --- a/archive/debian-8.4-i386.json +++ b/archive/debian-8.4-i386.json @@ -210,6 +210,7 @@ "scripts/debian/networking.sh", "scripts/debian/sudoers.sh", "scripts/common/vagrant.sh", + "scripts/debian/systemd.sh", "scripts/common/vmtools.sh", "scripts/debian/cleanup.sh", "scripts/common/minimize.sh" diff --git a/archive/debian-8.5-amd64.json b/archive/debian-8.5-amd64.json index 54c3eb9ca..2a3f1899e 100644 --- a/archive/debian-8.5-amd64.json +++ b/archive/debian-8.5-amd64.json @@ -212,6 +212,7 @@ "scripts/common/vagrant.sh", "scripts/common/virtualbox.sh", "scripts/common/vmware.sh", + "scripts/debian/systemd.sh", "scripts/common/parallels.sh", "scripts/debian/cleanup.sh", "scripts/common/minimize.sh" diff --git a/archive/debian-8.5-i386.json b/archive/debian-8.5-i386.json index 2c5b92f5f..de161a961 100644 --- a/archive/debian-8.5-i386.json +++ b/archive/debian-8.5-i386.json @@ -212,6 +212,7 @@ "scripts/common/vagrant.sh", "scripts/common/virtualbox.sh", "scripts/common/vmware.sh", + "scripts/debian/systemd.sh", "scripts/common/parallels.sh", "scripts/debian/cleanup.sh", "scripts/common/minimize.sh" diff --git a/debian-8.6-amd64.json b/debian-8.6-amd64.json index 471ccec78..b641efe92 100644 --- a/debian-8.6-amd64.json +++ b/debian-8.6-amd64.json @@ -210,6 +210,7 @@ "scripts/debian/networking.sh", "scripts/debian/sudoers.sh", "scripts/common/vagrant.sh", + "scripts/debian/systemd.sh", "scripts/common/virtualbox.sh", "scripts/common/vmware.sh", "scripts/common/parallels.sh", diff --git a/debian-8.6-i386.json b/debian-8.6-i386.json index 5cc309ff8..88c98da30 100644 --- a/debian-8.6-i386.json +++ b/debian-8.6-i386.json @@ -210,6 +210,7 @@ "scripts/debian/networking.sh", "scripts/debian/sudoers.sh", "scripts/common/vagrant.sh", + "scripts/debian/systemd.sh", "scripts/common/virtualbox.sh", "scripts/common/vmware.sh", "scripts/common/parallels.sh", diff --git a/scripts/debian/systemd.sh b/scripts/debian/systemd.sh new file mode 100644 index 000000000..2d1b5a71e --- /dev/null +++ b/scripts/debian/systemd.sh @@ -0,0 +1,4 @@ +#!/bin/sh -eux + +# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=751636 +apt-get install libpam-systemd From e21a6fad7595c1b5357b90865943f941cdb7e098 Mon Sep 17 00:00:00 2001 From: Rickard von Essen <rickard.von.essen@gmail.com> Date: Sat, 15 Oct 2016 15:07:52 +0200 Subject: [PATCH 0545/1622] Added Ubuntu 16.10 --- ubuntu-16.10-amd64.json | 273 ++++++++++++++++++++++++++++++++++++++++ ubuntu-16.10-i386.json | 272 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 545 insertions(+) create mode 100644 ubuntu-16.10-amd64.json create mode 100644 ubuntu-16.10-i386.json diff --git a/ubuntu-16.10-amd64.json b/ubuntu-16.10-amd64.json new file mode 100644 index 000000000..45298efe5 --- /dev/null +++ b/ubuntu-16.10-amd64.json @@ -0,0 +1,273 @@ +{ + "builders": [ + { + "boot_command": [ + "<esc><wait>", + "<esc><wait>", + "<enter><wait>", + "/install/vmlinuz<wait>", + " auto<wait>", + " console-setup/ask_detect=false<wait>", + " console-setup/layoutcode=us<wait>", + " console-setup/modelcode=pc105<wait>", + " debconf/frontend=noninteractive<wait>", + " debian-installer=en_US<wait>", + " fb=false<wait>", + " initrd=/install/initrd.gz<wait>", + " kbd-chooser/method=us<wait>", + " keyboard-configuration/layout=USA<wait>", + " keyboard-configuration/variant=USA<wait>", + " locale=en_US<wait>", + " netcfg/get_domain=vm<wait>", + " netcfg/get_hostname=vagrant<wait>", + " grub-installer/bootdev=/dev/sda<wait>", + " noapic<wait>", + " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}}<wait>", + " -- <wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": "{{user `disk_size`}}", + "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "guest_os_type": "Ubuntu_64", + "hard_drive_interface": "sata", + "headless": "{{ user `headless` }}", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-virtualbox", + "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "virtualbox-iso", + "vboxmanage": [ + [ + "modifyvm", + "{{.Name}}", + "--memory", + "{{ user `memory` }}" + ], + [ + "modifyvm", + "{{.Name}}", + "--cpus", + "{{ user `cpus` }}" + ] + ], + "virtualbox_version_file": ".vbox_version", + "vm_name": "{{ user `template` }}" + }, + { + "boot_command": [ + "<esc><wait>", + "<esc><wait>", + "<enter><wait>", + "/install/vmlinuz<wait>", + " auto<wait>", + " console-setup/ask_detect=false<wait>", + " console-setup/layoutcode=us<wait>", + " console-setup/modelcode=pc105<wait>", + " debconf/frontend=noninteractive<wait>", + " debian-installer=en_US<wait>", + " fb=false<wait>", + " initrd=/install/initrd.gz<wait>", + " kbd-chooser/method=us<wait>", + " keyboard-configuration/layout=USA<wait>", + " keyboard-configuration/variant=USA<wait>", + " locale=en_US<wait>", + " netcfg/get_domain=vm<wait>", + " netcfg/get_hostname=vagrant<wait>", + " grub-installer/bootdev=/dev/sda<wait>", + " noapic<wait>", + " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}}<wait>", + " -- <wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": "{{user `disk_size`}}", + "guest_os_type": "ubuntu-64", + "headless": "{{ user `headless` }}", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-vmware", + "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "tools_upload_flavor": "linux", + "type": "vmware-iso", + "vm_name": "{{ user `template` }}", + "vmx_data": { + "cpuid.coresPerSocket": "1", + "ethernet0.pciSlotNumber": "32", + "memsize": "{{ user `memory` }}", + "numvcpus": "{{ user `cpus` }}" + } + }, + { + "boot_command": [ + "<esc><wait>", + "<esc><wait>", + "<enter><wait>", + "/install/vmlinuz<wait>", + " auto<wait>", + " console-setup/ask_detect=false<wait>", + " console-setup/layoutcode=us<wait>", + " console-setup/modelcode=pc105<wait>", + " debconf/frontend=noninteractive<wait>", + " debian-installer=en_US<wait>", + " fb=false<wait>", + " initrd=/install/initrd.gz<wait>", + " kbd-chooser/method=us<wait>", + " keyboard-configuration/layout=USA<wait>", + " keyboard-configuration/variant=USA<wait>", + " locale=en_US<wait>", + " netcfg/get_domain=vm<wait>", + " netcfg/get_hostname=vagrant<wait>", + " grub-installer/bootdev=/dev/sda<wait>", + " noapic<wait>", + " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}}<wait>", + " -- <wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": "{{user `disk_size`}}", + "guest_os_type": "ubuntu", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-parallels", + "parallels_tools_flavor": "lin", + "prlctl": [ + [ + "set", + "{{.Name}}", + "--memsize", + "{{ user `memory` }}" + ], + [ + "set", + "{{.Name}}", + "--cpus", + "{{ user `cpus` }}" + ] + ], + "prlctl_version_file": ".prlctl_version", + "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "parallels-iso", + "vm_name": "{{ user `template` }}" + }, + { + "boot_command": [ + "<esc><wait>", + "<esc><wait>", + "<enter><wait>", + "/install/vmlinuz<wait>", + " auto<wait>", + " console-setup/ask_detect=false<wait>", + " console-setup/layoutcode=us<wait>", + " console-setup/modelcode=pc105<wait>", + " debconf/frontend=noninteractive<wait>", + " debian-installer=en_US<wait>", + " fb=false<wait>", + " initrd=/install/initrd.gz<wait>", + " kbd-chooser/method=us<wait>", + " keyboard-configuration/layout=USA<wait>", + " keyboard-configuration/variant=USA<wait>", + " locale=en_US<wait>", + " netcfg/get_domain=vm<wait>", + " netcfg/get_hostname=vagrant<wait>", + " grub-installer/bootdev=/dev/vda<wait>", + " noapic<wait>", + " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}}<wait>", + " -- <wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": "{{user `disk_size`}}", + "headless": "{{ user `headless` }}", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-qemu", + "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "qemu", + "vm_name": "{{ user `template` }}" + } + ], + "post-processors": [ + { + "output": "builds/{{user `box_basename`}}.{{.Provider}}.box", + "type": "vagrant" + } + ], + "provisioners": [ + { + "destination": "/tmp/bento-metadata.json", + "source": "{{user `metadata`}}", + "type": "file" + }, + { + "environment_vars": [ + "HOME_DIR=/home/vagrant", + "http_proxy={{user `http_proxy`}}", + "https_proxy={{user `https_proxy`}}", + "no_proxy={{user `no_proxy`}}" + ], + "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", + "scripts": [ + "scripts/common/metadata.sh", + "scripts/ubuntu/update.sh", + "scripts/common/sshd.sh", + "scripts/ubuntu/networking.sh", + "scripts/ubuntu/sudoers.sh", + "scripts/ubuntu/vagrant.sh", + "scripts/common/virtualbox.sh", + "scripts/ubuntu/vmware.sh", + "scripts/common/parallels.sh", + "scripts/ubuntu/cleanup.sh", + "scripts/common/minimize.sh" + ], + "type": "shell" + } + + ], + "variables": { + "box_basename": "ubuntu-16.10", + "build_timestamp": "{{isotime \"20060102150405\"}}", + "cpus": "1", + "disk_size": "40960", + "git_revision": "__unknown_git_revision__", + "headless": "", + "http_proxy": "{{env `http_proxy`}}", + "https_proxy": "{{env `https_proxy`}}", + "iso_checksum": "72b0d421da77f1e0c549b4efe6fc6c184e9909d6792f0d1e59b56d63e9705659", + "iso_checksum_type": "sha256", + "iso_name": "ubuntu-16.10-server-amd64.iso", + "memory": "512", + "metadata": "floppy/dummy_metadata.json", + "mirror": "http://releases.ubuntu.com", + "mirror_directory": "16.10", + "name": "ubuntu-16.10", + "no_proxy": "{{env `no_proxy`}}", + "preseed_path": "ubuntu-15.10/preseed.cfg", + "template": "ubuntu-16.10-amd64", + "version": "2.1.TIMESTAMP" + } +} diff --git a/ubuntu-16.10-i386.json b/ubuntu-16.10-i386.json new file mode 100644 index 000000000..12b0a5ef8 --- /dev/null +++ b/ubuntu-16.10-i386.json @@ -0,0 +1,272 @@ +{ + "builders": [ + { + "boot_command": [ + "<esc><wait>", + "<esc><wait>", + "<enter><wait>", + "/install/vmlinuz<wait>", + " auto<wait>", + " console-setup/ask_detect=false<wait>", + " console-setup/layoutcode=us<wait>", + " console-setup/modelcode=pc105<wait>", + " debconf/frontend=noninteractive<wait>", + " debian-installer=en_US<wait>", + " fb=false<wait>", + " initrd=/install/initrd.gz<wait>", + " kbd-chooser/method=us<wait>", + " keyboard-configuration/layout=USA<wait>", + " keyboard-configuration/variant=USA<wait>", + " locale=en_US<wait>", + " netcfg/get_domain=vm<wait>", + " netcfg/get_hostname=vagrant<wait>", + " grub-installer/bootdev=/dev/sda <wait>", + " noapic<wait>", + " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}}<wait>", + " -- <wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": "{{user `disk_size`}}", + "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "guest_os_type": "Ubuntu", + "hard_drive_interface": "sata", + "headless": "{{ user `headless` }}", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-virtualbox", + "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "virtualbox-iso", + "vboxmanage": [ + [ + "modifyvm", + "{{.Name}}", + "--memory", + "{{ user `memory` }}" + ], + [ + "modifyvm", + "{{.Name}}", + "--cpus", + "{{ user `cpus` }}" + ] + ], + "virtualbox_version_file": ".vbox_version", + "vm_name": "{{ user `template` }}" + }, + { + "boot_command": [ + "<esc><wait>", + "<esc><wait>", + "<enter><wait>", + "/install/vmlinuz<wait>", + " auto<wait>", + " console-setup/ask_detect=false<wait>", + " console-setup/layoutcode=us<wait>", + " console-setup/modelcode=pc105<wait>", + " debconf/frontend=noninteractive<wait>", + " debian-installer=en_US<wait>", + " fb=false<wait>", + " initrd=/install/initrd.gz<wait>", + " kbd-chooser/method=us<wait>", + " keyboard-configuration/layout=USA<wait>", + " keyboard-configuration/variant=USA<wait>", + " locale=en_US<wait>", + " netcfg/get_domain=vm<wait>", + " netcfg/get_hostname=vagrant<wait>", + " grub-installer/bootdev=/dev/sda <wait>", + " noapic<wait>", + " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}}<wait>", + " -- <wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": "{{user `disk_size`}}", + "guest_os_type": "ubuntu", + "headless": "{{ user `headless` }}", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-vmware", + "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "tools_upload_flavor": "linux", + "type": "vmware-iso", + "vm_name": "{{ user `template` }}", + "vmx_data": { + "cpuid.coresPerSocket": "1", + "ethernet0.pciSlotNumber": "32", + "memsize": "{{ user `memory` }}", + "numvcpus": "{{ user `cpus` }}" + } + }, + { + "boot_command": [ + "<esc><wait>", + "<esc><wait>", + "<enter><wait>", + "/install/vmlinuz<wait>", + " auto<wait>", + " console-setup/ask_detect=false<wait>", + " console-setup/layoutcode=us<wait>", + " console-setup/modelcode=pc105<wait>", + " debconf/frontend=noninteractive<wait>", + " debian-installer=en_US<wait>", + " fb=false<wait>", + " initrd=/install/initrd.gz<wait>", + " kbd-chooser/method=us<wait>", + " keyboard-configuration/layout=USA<wait>", + " keyboard-configuration/variant=USA<wait>", + " locale=en_US<wait>", + " netcfg/get_domain=vm<wait>", + " netcfg/get_hostname=vagrant<wait>", + " grub-installer/bootdev=/dev/sda <wait>", + " noapic<wait>", + " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}}<wait>", + " -- <wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": "{{user `disk_size`}}", + "guest_os_type": "ubuntu", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-parallels", + "parallels_tools_flavor": "lin", + "prlctl": [ + [ + "set", + "{{.Name}}", + "--memsize", + "{{ user `memory` }}" + ], + [ + "set", + "{{.Name}}", + "--cpus", + "{{ user `cpus` }}" + ] + ], + "prlctl_version_file": ".prlctl_version", + "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "parallels-iso", + "vm_name": "{{ user `template` }}" + }, + { + "boot_command": [ + "<esc><wait>", + "<esc><wait>", + "<enter><wait>", + "/install/vmlinuz<wait>", + " auto<wait>", + " console-setup/ask_detect=false<wait>", + " console-setup/layoutcode=us<wait>", + " console-setup/modelcode=pc105<wait>", + " debconf/frontend=noninteractive<wait>", + " debian-installer=en_US<wait>", + " fb=false<wait>", + " initrd=/install/initrd.gz<wait>", + " kbd-chooser/method=us<wait>", + " keyboard-configuration/layout=USA<wait>", + " keyboard-configuration/variant=USA<wait>", + " locale=en_US<wait>", + " netcfg/get_domain=vm<wait>", + " netcfg/get_hostname=vagrant<wait>", + " grub-installer/bootdev=/dev/vda <wait>", + " noapic<wait>", + " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}}<wait>", + " -- <wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": "{{user `disk_size`}}", + "headless": "{{ user `headless` }}", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-qemu", + "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "qemu", + "vm_name": "{{ user `template` }}" + } + ], + "post-processors": [ + { + "output": "builds/{{user `box_basename`}}.{{.Provider}}.box", + "type": "vagrant" + } + ], + "provisioners": [ + { + "destination": "/tmp/bento-metadata.json", + "source": "{{user `metadata`}}", + "type": "file" + }, + { + "environment_vars": [ + "HOME_DIR=/home/vagrant", + "http_proxy={{user `http_proxy`}}", + "https_proxy={{user `https_proxy`}}", + "no_proxy={{user `no_proxy`}}" + ], + "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", + "scripts": [ + "scripts/common/metadata.sh", + "scripts/ubuntu/update.sh", + "scripts/common/sshd.sh", + "scripts/ubuntu/networking.sh", + "scripts/ubuntu/sudoers.sh", + "scripts/ubuntu/vagrant.sh", + "scripts/common/virtualbox.sh", + "scripts/ubuntu/vmware.sh", + "scripts/common/parallels.sh", + "scripts/ubuntu/cleanup.sh", + "scripts/common/minimize.sh" + ], + "type": "shell" + } + ], + "variables": { + "box_basename": "ubuntu-16.10-i386", + "build_timestamp": "{{isotime \"20060102150405\"}}", + "cpus": "1", + "disk_size": "40960", + "git_revision": "__unknown_git_revision__", + "headless": "", + "http_proxy": "{{env `http_proxy`}}", + "https_proxy": "{{env `https_proxy`}}", + "iso_checksum": "0e52cc7c7c4cc9e91f4e984c1232192394c6caf8e7170c1aeefb37bdef1f0625", + "iso_checksum_type": "sha256", + "iso_name": "ubuntu-16.10-server-i386.iso", + "memory": "512", + "metadata": "floppy/dummy_metadata.json", + "mirror": "http://releases.ubuntu.com", + "mirror_directory": "16.10", + "name": "ubuntu-16.10-i386", + "no_proxy": "{{env `no_proxy`}}", + "preseed_path": "ubuntu-15.10/preseed.cfg", + "template": "ubuntu-16.10-i386", + "version": "2.1.TIMESTAMP" + } +} From 66125d349748b5201545adc763f5e4a13cd27941 Mon Sep 17 00:00:00 2001 From: Rickard von Essen <rickard.von.essen@gmail.com> Date: Mon, 17 Oct 2016 21:42:38 +0200 Subject: [PATCH 0546/1622] Remove unused scripts --- scripts/common/shutdown.sh | 1 - scripts/common/sudoers.sh | 4 ---- scripts/debian/debian6-apt.sh | 3 --- scripts/fedora/shutdown.sh | 1 - scripts/fedora/sudoers.sh | 4 ---- 5 files changed, 13 deletions(-) delete mode 100644 scripts/common/shutdown.sh delete mode 100644 scripts/common/sudoers.sh delete mode 100644 scripts/debian/debian6-apt.sh delete mode 100644 scripts/fedora/shutdown.sh delete mode 100644 scripts/fedora/sudoers.sh diff --git a/scripts/common/shutdown.sh b/scripts/common/shutdown.sh deleted file mode 100644 index 7d7aee557..000000000 --- a/scripts/common/shutdown.sh +++ /dev/null @@ -1 +0,0 @@ -shutdown -P now diff --git a/scripts/common/sudoers.sh b/scripts/common/sudoers.sh deleted file mode 100644 index 5fce3dd2c..000000000 --- a/scripts/common/sudoers.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash -eux - -sed -i -e '/Defaults\s\+env_reset/a Defaults\texempt_group=sudo' /etc/sudoers -sed -i -e 's/%sudo ALL=(ALL:ALL) ALL/%sudo ALL=NOPASSWD:ALL/g' /etc/sudoers diff --git a/scripts/debian/debian6-apt.sh b/scripts/debian/debian6-apt.sh deleted file mode 100644 index 6cd65e923..000000000 --- a/scripts/debian/debian6-apt.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh -eux - -sed -i 's/mirrors.kernel.org/archive.debian.org/g' /etc/apt/sources.list diff --git a/scripts/fedora/shutdown.sh b/scripts/fedora/shutdown.sh deleted file mode 100644 index bb7ec991b..000000000 --- a/scripts/fedora/shutdown.sh +++ /dev/null @@ -1 +0,0 @@ -/sbin/halt -h -p diff --git a/scripts/fedora/sudoers.sh b/scripts/fedora/sudoers.sh deleted file mode 100644 index da3af2d5a..000000000 --- a/scripts/fedora/sudoers.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash -eux - -sed -i -e '/Defaults\s\+env_reset/a Defaults\texempt_group=sudo' /etc/sudoers -sed -i -e 's/%admin ALL=(ALL) ALL/%sudo ALL=NOPASSWD:ALL/g' /etc/sudoers From de6802017e2c5e90e1f9faf40a91e2e4751611e9 Mon Sep 17 00:00:00 2001 From: Rickard von Essen <rickard.von.essen@gmail.com> Date: Mon, 17 Oct 2016 21:54:54 +0200 Subject: [PATCH 0547/1622] Remove unused http files --- http/debian-6.0/preseed.cfg | 48 - http/fedora-20/ks.cfg | 45 - http/fedora-21/ks.cfg | 45 - http/sles-11/sles-11-sp2-i386-autoinst.xml | 2562 ------------------ http/sles-11/sles-11-sp2-x86_64-autoinst.xml | 2562 ------------------ http/sles-11/sles-11-sp3-i386-autoinst.xml | 190 -- http/sles-11/sles-11-sp3-x86_64-autoinst.xml | 190 -- http/sles-11/sles-11-sp4-i386-autoinst.xml | 180 -- http/sles-11/sles-11-sp4-x86_64-autoinst.xml | 180 -- http/ubuntu-10.04/preseed.cfg | 31 - http/ubuntu-14.10/preseed.cfg | 31 - http/ubuntu-15.04/preseed.cfg | 31 - 12 files changed, 6095 deletions(-) delete mode 100644 http/debian-6.0/preseed.cfg delete mode 100644 http/fedora-20/ks.cfg delete mode 100644 http/fedora-21/ks.cfg delete mode 100644 http/sles-11/sles-11-sp2-i386-autoinst.xml delete mode 100644 http/sles-11/sles-11-sp2-x86_64-autoinst.xml delete mode 100644 http/sles-11/sles-11-sp3-i386-autoinst.xml delete mode 100644 http/sles-11/sles-11-sp3-x86_64-autoinst.xml delete mode 100644 http/sles-11/sles-11-sp4-i386-autoinst.xml delete mode 100644 http/sles-11/sles-11-sp4-x86_64-autoinst.xml delete mode 100644 http/ubuntu-10.04/preseed.cfg delete mode 100644 http/ubuntu-14.10/preseed.cfg delete mode 100644 http/ubuntu-15.04/preseed.cfg diff --git a/http/debian-6.0/preseed.cfg b/http/debian-6.0/preseed.cfg deleted file mode 100644 index bdf87f186..000000000 --- a/http/debian-6.0/preseed.cfg +++ /dev/null @@ -1,48 +0,0 @@ -choose-mirror-bin mirror/http/proxy string -d-i apt-setup/use_mirror boolean true -d-i base-installer/kernel/override-image string linux-server -d-i clock-setup/utc boolean true -d-i clock-setup/utc-auto boolean true -d-i finish-install/reboot_in_progress note -d-i grub-installer/only_debian boolean true -d-i grub-installer/with_other_os boolean true -d-i keymap select us -d-i mirror/country string manual -d-i mirror/http/directory string /debian -d-i mirror/http/hostname string mirrors.kernel.org -d-i mirror/http/proxy string -d-i partman-auto-lvm/guided_size string max -d-i partman-auto/choose_recipe select atomic -d-i partman-auto/method string lvm -d-i partman-lvm/confirm boolean true -d-i partman-lvm/confirm boolean true -d-i partman-lvm/confirm_nooverwrite boolean true -d-i partman-lvm/device_remove_lvm boolean true -d-i partman/choose_partition select finish -d-i partman/confirm boolean true -d-i partman/confirm_nooverwrite boolean true -d-i partman/confirm_write_new_label boolean true -d-i passwd/root-login boolean false -d-i passwd/root-password-again password vagrant -d-i passwd/root-password password vagrant -d-i passwd/user-fullname string vagrant -d-i passwd/user-uid string 1000 -d-i passwd/user-password password vagrant -d-i passwd/user-password-again password vagrant -d-i passwd/username string vagrant -d-i pkgsel/include string openssh-server sudo bzip2 acpid cryptsetup zlib1g-dev wget curl dkms make nfs-common -d-i pkgsel/install-language-support boolean false -d-i pkgsel/update-policy select none -d-i pkgsel/upgrade select full-upgrade -# Prevent packaged version of VirtualBox Guest Additions being installed: -d-i preseed/early_command string sed -i \ - '/in-target/idiscover(){/sbin/discover|grep -v VirtualBox;}' \ - /usr/lib/pre-pkgsel.d/20install-hwpackages -d-i time/zone string UTC -d-i user-setup/allow-password-weak boolean true -d-i user-setup/encrypt-home boolean false -d-i preseed/late_command string sed -i '/^deb cdrom:/s/^/#/' /target/etc/apt/sources.list -apt-cdrom-setup apt-setup/cdrom/set-first boolean false -apt-mirror-setup apt-setup/use_mirror boolean true -popularity-contest popularity-contest/participate boolean false -tasksel tasksel/first multiselect standard, ubuntu-server diff --git a/http/fedora-20/ks.cfg b/http/fedora-20/ks.cfg deleted file mode 100644 index 98f6de606..000000000 --- a/http/fedora-20/ks.cfg +++ /dev/null @@ -1,45 +0,0 @@ -install -cdrom -lang en_US.UTF-8 -keyboard us -network --bootproto=dhcp -rootpw vagrant -firewall --disabled -authconfig --enableshadow --passalgo=sha512 -selinux --permissive -timezone UTC -bootloader --location=mbr -text -skipx -zerombr -clearpart --all --initlabel -part /boot --fstype=ext4 --size=500 -part pv.2 --grow --size=500 -volgroup vg_vagrant --pesize=32768 pv.2 -logvol / --fstype=ext4 --name=lv_root --vgname=vg_vagrant --size=1024 --grow -logvol swap --fstype=swap --name=lv_swap --vgname=vg_vagrant --size=528 --grow --maxsize=1056 -bootloader --location=mbr --append="norhgb biosdevname=0" -firstboot --disabled -reboot -user --name=vagrant --plaintext --password vagrant - -%packages --nobase --ignoremissing --excludedocs -bzip2 -gcc -kernel-devel -kernel-headers -tar -wget -nfs-utils -net-tools --linux-firmware --plymouth --plymouth-core-libs -%end - -%post -# sudo -echo 'Defaults:vagrant !requiretty' > /etc/sudoers.d/vagrant -echo '%vagrant ALL=(ALL) NOPASSWD: ALL' >> /etc/sudoers.d/vagrant -chmod 440 /etc/sudoers.d/vagrant -%end diff --git a/http/fedora-21/ks.cfg b/http/fedora-21/ks.cfg deleted file mode 100644 index 98f6de606..000000000 --- a/http/fedora-21/ks.cfg +++ /dev/null @@ -1,45 +0,0 @@ -install -cdrom -lang en_US.UTF-8 -keyboard us -network --bootproto=dhcp -rootpw vagrant -firewall --disabled -authconfig --enableshadow --passalgo=sha512 -selinux --permissive -timezone UTC -bootloader --location=mbr -text -skipx -zerombr -clearpart --all --initlabel -part /boot --fstype=ext4 --size=500 -part pv.2 --grow --size=500 -volgroup vg_vagrant --pesize=32768 pv.2 -logvol / --fstype=ext4 --name=lv_root --vgname=vg_vagrant --size=1024 --grow -logvol swap --fstype=swap --name=lv_swap --vgname=vg_vagrant --size=528 --grow --maxsize=1056 -bootloader --location=mbr --append="norhgb biosdevname=0" -firstboot --disabled -reboot -user --name=vagrant --plaintext --password vagrant - -%packages --nobase --ignoremissing --excludedocs -bzip2 -gcc -kernel-devel -kernel-headers -tar -wget -nfs-utils -net-tools --linux-firmware --plymouth --plymouth-core-libs -%end - -%post -# sudo -echo 'Defaults:vagrant !requiretty' > /etc/sudoers.d/vagrant -echo '%vagrant ALL=(ALL) NOPASSWD: ALL' >> /etc/sudoers.d/vagrant -chmod 440 /etc/sudoers.d/vagrant -%end diff --git a/http/sles-11/sles-11-sp2-i386-autoinst.xml b/http/sles-11/sles-11-sp2-i386-autoinst.xml deleted file mode 100644 index ae4fa2c44..000000000 --- a/http/sles-11/sles-11-sp2-i386-autoinst.xml +++ /dev/null @@ -1,2562 +0,0 @@ -<?xml version="1.0"?> -<!DOCTYPE profile> -<profile xmlns="http://www.suse.com/1.0/yast2ns" xmlns:config="http://www.suse.com/1.0/configns"> - <add-on> - <add_on_products config:type="list"> - <listentry> - <media_url><![CDATA[http://demeter.uni-regensburg.de/SLE11SP2-SDK-x86/DVD1/]]></media_url> - <product>sle-sdk</product> - <product_dir>/</product_dir> - </listentry> - </add_on_products> - </add-on> - <bootloader> - <device_map config:type="list"> - <device_map_entry> - <firmware>hd0</firmware> - <linux>/dev/sda</linux> - </device_map_entry> - </device_map> - <global> - <activate>true</activate> - <boot_root>true</boot_root> - <default>SUSE Linux Enterprise Server 11 SP2 - 3.0.13-0.27</default> - <generic_mbr>true</generic_mbr> - <gfxmenu>/boot/message</gfxmenu> - <lines_cache_id>2</lines_cache_id> - <timeout config:type="integer">8</timeout> - </global> - <initrd_modules config:type="list"> - <initrd_module> - <module>ahci</module> - </initrd_module> - <initrd_module> - <module>ata_piix</module> - </initrd_module> - <initrd_module> - <module>ata_generic</module> - </initrd_module> - <initrd_module> - <module>jbd</module> - </initrd_module> - <initrd_module> - <module>mbcache</module> - </initrd_module> - <initrd_module> - <module>ext3</module> - </initrd_module> - </initrd_modules> - <loader_type>grub</loader_type> - <sections config:type="list"> - <section> - <append>resume=/dev/sda1 splash=silent crashkernel=128M-:64M showopts</append> - <image>(hd0,1)/boot/vmlinuz-3.0.13-0.27-default</image> - <initial>1</initial> - <initrd>(hd0,1)/boot/initrd-3.0.13-0.27-default</initrd> - <lines_cache_id>0</lines_cache_id> - <name>SUSE Linux Enterprise Server 11 SP2 - 3.0.13-0.27</name> - <original_name>linux</original_name> - <root>/dev/sda2</root> - <type>image</type> - <vgamode>0x314</vgamode> - </section> - <section> - <append>showopts ide=nodma apm=off noresume edd=off powersaved=off nohz=off highres=off processor.max_cstate=1 nomodeset x11failsafe</append> - <image>(hd0,1)/boot/vmlinuz-3.0.13-0.27-default</image> - <initrd>(hd0,1)/boot/initrd-3.0.13-0.27-default</initrd> - <lines_cache_id>1</lines_cache_id> - <name>Failsafe -- SUSE Linux Enterprise Server 11 SP2 - 3.0.13-0.27</name> - <original_name>failsafe</original_name> - <root>/dev/sda2</root> - <type>image</type> - <vgamode>0x314</vgamode> - </section> - </sections> - </bootloader> - <ca_mgm> - <CAName>YaST_Default_CA</CAName> - <ca_commonName>YaST Default CA (vagrant-sles-11sp2-x86)</ca_commonName> - <country>US</country> - <locality></locality> - <organisation></organisation> - <organisationUnit></organisationUnit> - <password>ENTER PASSWORD HERE</password> - <server_commonName>vagrant-sles-11sp2-x86.vagrantup.com</server_commonName> - <server_email>postmaster@vagrantup.com</server_email> - <state></state> - <takeLocalServerName config:type="boolean">false</takeLocalServerName> - </ca_mgm> - <deploy_image> - <image_installation config:type="boolean">false</image_installation> - </deploy_image> - <general> - <ask-list config:type="list"/> - <mode> - <confirm config:type="boolean">false</confirm> - </mode> - <mouse> - <id>none</id> - </mouse> - <proposals config:type="list"/> - <signature-handling> - <accept_file_without_checksum config:type="boolean">true</accept_file_without_checksum> - <accept_non_trusted_gpg_key config:type="boolean">true</accept_non_trusted_gpg_key> - <accept_unknown_gpg_key config:type="boolean">true</accept_unknown_gpg_key> - <accept_unsigned_file config:type="boolean">true</accept_unsigned_file> - <accept_verification_failed config:type="boolean">false</accept_verification_failed> - <import_gpg_key config:type="boolean">true</import_gpg_key> - </signature-handling> - <storage/> - </general> - <groups config:type="list"> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>100</gid> - <group_password>x</group_password> - <groupname>users</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>19</gid> - <group_password>x</group_password> - <groupname>floppy</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>1</gid> - <group_password>x</group_password> - <groupname>bin</groupname> - <userlist>daemon</userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>41</gid> - <group_password>x</group_password> - <groupname>xok</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>65533</gid> - <group_password>x</group_password> - <groupname>nobody</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>43</gid> - <group_password>x</group_password> - <groupname>modem</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>5</gid> - <group_password>x</group_password> - <groupname>tty</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>7</gid> - <group_password>x</group_password> - <groupname>lp</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>104</gid> - <group_password>!</group_password> - <groupname>uuidd</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>51</gid> - <group_password>!</group_password> - <groupname>postfix</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>112</gid> - <group_password>!</group_password> - <groupname>gdm</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>65534</gid> - <group_password>x</group_password> - <groupname>nogroup</groupname> - <userlist>nobody</userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>101</gid> - <group_password>!</group_password> - <groupname>messagebus</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>59</gid> - <group_password>!</group_password> - <groupname>maildrop</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>33</gid> - <group_password>x</group_password> - <groupname>video</groupname> - <userlist>vagrant</userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>3</gid> - <group_password>x</group_password> - <groupname>sys</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>15</gid> - <group_password>x</group_password> - <groupname>shadow</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>20</gid> - <group_password>x</group_password> - <groupname>cdrom</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>21</gid> - <group_password>x</group_password> - <groupname>console</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>42</gid> - <group_password>x</group_password> - <groupname>trusted</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>102</gid> - <group_password>!</group_password> - <groupname>haldaemon</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>106</gid> - <group_password>!</group_password> - <groupname>puppet</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>16</gid> - <group_password>x</group_password> - <groupname>dialout</groupname> - <userlist>vagrant</userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>107</gid> - <group_password>!</group_password> - <groupname>polkituser</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>10</gid> - <group_password>x</group_password> - <groupname>wheel</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>109</gid> - <group_password>!</group_password> - <groupname>pulse</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>8</gid> - <group_password>x</group_password> - <groupname>www</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>40</gid> - <group_password>x</group_password> - <groupname>games</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>6</gid> - <group_password>x</group_password> - <groupname>disk</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>17</gid> - <group_password>x</group_password> - <groupname>audio</groupname> - <userlist>pulse</userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>111</gid> - <group_password>!</group_password> - <groupname>suse-ncc</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>49</gid> - <group_password>x</group_password> - <groupname>ftp</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>103</gid> - <group_password>!</group_password> - <groupname>tape</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>25</gid> - <group_password>!</group_password> - <groupname>at</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>9</gid> - <group_password>x</group_password> - <groupname>kmem</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>32</gid> - <group_password>x</group_password> - <groupname>public</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>12</gid> - <group_password>x</group_password> - <groupname>mail</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>0</gid> - <group_password>x</group_password> - <groupname>root</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>2</gid> - <group_password>x</group_password> - <groupname>daemon</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>105</gid> - <group_password>!</group_password> - <groupname>sfcb</groupname> - <userlist>root</userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>108</gid> - <group_password>!</group_password> - <groupname>ntp</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>14</gid> - <group_password>x</group_password> - <groupname>uucp</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>110</gid> - <group_password>!</group_password> - <groupname>pulse-access</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>71</gid> - <group_password>!</group_password> - <groupname>ntadmin</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>62</gid> - <group_password>x</group_password> - <groupname>man</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>22</gid> - <group_password>x</group_password> - <groupname>utmp</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>13</gid> - <group_password>x</group_password> - <groupname>news</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>65</gid> - <group_password>!</group_password> - <groupname>sshd</groupname> - <userlist></userlist> - </group> - </groups> - <host> - <hosts config:type="list"> - <hosts_entry> - <host_address>127.0.0.1</host_address> - <names config:type="list"> - <name>localhost</name> - </names> - </hosts_entry> - <hosts_entry> - <host_address>::1</host_address> - <names config:type="list"> - <name>localhost ipv6-localhost ipv6-loopback</name> - </names> - </hosts_entry> - <hosts_entry> - <host_address>fe00::0</host_address> - <names config:type="list"> - <name>ipv6-localnet</name> - </names> - </hosts_entry> - <hosts_entry> - <host_address>ff00::0</host_address> - <names config:type="list"> - <name>ipv6-mcastprefix</name> - </names> - </hosts_entry> - <hosts_entry> - <host_address>ff02::1</host_address> - <names config:type="list"> - <name>ipv6-allnodes</name> - </names> - </hosts_entry> - <hosts_entry> - <host_address>ff02::2</host_address> - <names config:type="list"> - <name>ipv6-allrouters</name> - </names> - </hosts_entry> - <hosts_entry> - <host_address>ff02::3</host_address> - <names config:type="list"> - <name>ipv6-allhosts</name> - </names> - </hosts_entry> - </hosts> - </host> - <login_settings/> - <networking> - <dhcp_options> - <dhclient_client_id></dhclient_client_id> - <dhclient_hostname_option>AUTO</dhclient_hostname_option> - </dhcp_options> - <dns> - <dhcp_hostname config:type="boolean">false</dhcp_hostname> - <domain>vagrantup.com</domain> - <hostname>vagrant-sles-11sp2-x86</hostname> - <resolv_conf_policy>auto</resolv_conf_policy> - <searchlist config:type="list"> - <search>vagrantup.com</search> - </searchlist> - <write_hostname config:type="boolean">true</write_hostname> - </dns> - <interfaces config:type="list"> - <interface> - <bootproto>dhcp</bootproto> - <device>eth0</device> - <startmode>auto</startmode> - <usercontrol>no</usercontrol> - </interface> - </interfaces> - <keep_install_network config:type="boolean">true</keep_install_network> - <managed config:type="boolean">false</managed> - <routing> - <ip_forward config:type="boolean">false</ip_forward> - </routing> - </networking> - <partitioning config:type="list"> - <drive> - <device>/dev/sda</device> - <initialize config:type="boolean">true</initialize> - <partitions config:type="list"> - <partition> - <create config:type="boolean">true</create> - <crypt_fs config:type="boolean">false</crypt_fs> - <filesystem config:type="symbol">swap</filesystem> - <format config:type="boolean">true</format> - <fstopt>defaults</fstopt> - <loop_fs config:type="boolean">false</loop_fs> - <mount>swap</mount> - <mountby config:type="symbol">device</mountby> - <partition_id config:type="integer">130</partition_id> - <partition_nr config:type="integer">1</partition_nr> - <raid_options/> - <resize config:type="boolean">false</resize> - <size>1561492992</size> - </partition> - <partition> - <create config:type="boolean">true</create> - <crypt_fs config:type="boolean">false</crypt_fs> - <filesystem config:type="symbol">ext3</filesystem> - <format config:type="boolean">true</format> - <fstopt>acl,user_xattr</fstopt> - <loop_fs config:type="boolean">false</loop_fs> - <mount>/</mount> - <mountby config:type="symbol">device</mountby> - <partition_id config:type="integer">131</partition_id> - <partition_nr config:type="integer">2</partition_nr> - <raid_options/> - <resize config:type="boolean">false</resize> - <size>19895844352</size> - </partition> - </partitions> - <pesize></pesize> - <type config:type="symbol">CT_DISK</type> - <use>all</use> - </drive> - </partitioning> - <report> - <errors> - <log config:type="boolean">true</log> - <show config:type="boolean">true</show> - <timeout config:type="integer">0</timeout> - </errors> - <messages> - <log config:type="boolean">true</log> - <show config:type="boolean">true</show> - <timeout config:type="integer">0</timeout> - </messages> - <warnings> - <log config:type="boolean">true</log> - <show config:type="boolean">true</show> - <timeout config:type="integer">0</timeout> - </warnings> - <yesno_messages> - <log config:type="boolean">true</log> - <show config:type="boolean">true</show> - <timeout config:type="integer">0</timeout> - </yesno_messages> - </report> - <software> - - <packages config:type="list"> - <package>desktop-translations</package> - <package>gconf2-branding-SLES</package> - <package>libproxy0-config-gnome</package> - <package>sle-sdk-release</package> - <package>sle-sdk-release-SDK</package> - <package>sles-manuals_en</package> - <package>yast2-trans-en_US</package> - </packages> - <patterns config:type="list"> - <pattern>Basis-Devel</pattern> - <pattern>Minimal</pattern> - <pattern>apparmor</pattern> - <pattern>base</pattern> - <pattern>sdk_kernel</pattern> - </patterns> - <remove-packages config:type="list"> - <package>3ddiag</package> - <package>CASA</package> - <package>CASA-devel</package> - <package>CASA_auth_token_client</package> - <package>CASA_auth_token_client-devel</package> - <package>ConsoleKit-devel</package> - <package>ConsoleKit-x11</package> - <package>DirectFB-devel</package> - <package>FastCGI</package> - <package>IlmBase</package> - <package>IlmBase-devel</package> - <package>ImageMagick</package> - <package>ImageMagick-devel</package> - <package>LibVNCServer</package> - <package>LibVNCServer-devel</package> - <package>Mesa</package> - <package>Mesa-devel</package> - <package>ModemManager</package> - <package>Modules</package> - <package>NetworkManager</package> - <package>NetworkManager-devel</package> - <package>NetworkManager-glib</package> - <package>NetworkManager-gnome</package> - <package>NetworkManager-kde4</package> - <package>NetworkManager-kde4-lang</package> - <package>NetworkManager-kde4-libs</package> - <package>OpenEXR</package> - <package>OpenEXR-devel</package> - <package>OpenIPMI-devel</package> - <package>PackageKit</package> - <package>PackageKit-devel</package> - <package>PackageKit-lang</package> - <package>PolicyKit-devel</package> - <package>PolicyKit-gnome</package> - <package>PolicyKit-gnome-devel</package> - <package>PolicyKit-gnome-libs</package> - <package>SDL-devel</package> - <package>SDL_net</package> - <package>SDL_net-devel</package> - <package>TeX-Guy</package> - <package>TeX-Guy-devel</package> - <package>VFlib3</package> - <package>VFlib3-devel</package> - <package>WindowMaker</package> - <package>WindowMaker-devel</package> - <package>a2ps</package> - <package>aalib</package> - <package>aalib-devel</package> - <package>akonadi-runtime</package> - <package>akregator</package> - <package>alsa-devel</package> - <package>alsa-firmware</package> - <package>alsa-plugins-pulse</package> - <package>alsa-tools</package> - <package>alsa-tools-devel</package> - <package>anthy</package> - <package>anthy-devel</package> - <package>antlr</package> - <package>apache2</package> - <package>apache2-devel</package> - <package>apache2-mod_perl</package> - <package>apache2-mod_perl-devel</package> - <package>apache2-prefork</package> - <package>apache2-utils</package> - <package>apache2-worker</package> - <package>apparmor-profile-editor</package> - <package>art-sharp2</package> - <package>arts</package> - <package>arts-devel</package> - <package>aspell-devel</package> - <package>at-spi</package> - <package>at-spi-devel</package> - <package>at-spi-lang</package> - <package>atk-devel</package> - <package>audiofile</package> - <package>audiofile-devel</package> - <package>audit-devel</package> - <package>augeas-lenses</package> - <package>automoc4</package> - <package>avahi</package> - <package>avahi-compat-howl-devel</package> - <package>avahi-compat-mDNSResponder-devel</package> - <package>avahi-lang</package> - <package>babl-0_0</package> - <package>banshee-1</package> - <package>banshee-1-backend-engine-gstreamer</package> - <package>banshee-1-backend-platform-gnome</package> - <package>banshee-1-backend-platform-unix</package> - <package>banshee-1-devel</package> - <package>banshee-1-extensions-default</package> - <package>banshee-1-lang</package> - <package>beagle-devel</package> - <package>bind-devel</package> - <package>binutils-devel</package> - <package>bluez</package> - <package>bluez-devel</package> - <package>boo</package> - <package>boo-devel</package> - <package>boost-devel</package> - <package>bootsplash-branding-SLED</package> - <package>cairo-devel</package> - <package>cairomm</package> - <package>cairomm-devel</package> - <package>canna</package> - <package>canna-devel</package> - <package>canna-libs</package> - <package>cannadic</package> - <package>capi4linux</package> - <package>capi4linux-devel</package> - <package>cdk</package> - <package>cdk-devel</package> - <package>cdrdao</package> - <package>chasen</package> - <package>chasen-devel</package> - <package>check</package> - <package>check-devel</package> - <package>chmlib</package> - <package>chmlib-devel</package> - <package>cim-schema</package> - <package>clucene-core</package> - <package>clucene-core-devel</package> - <package>cmake</package> - <package>compiz</package> - <package>compiz-branding-SLE</package> - <package>compiz-devel</package> - <package>compiz-gnome</package> - <package>coolkey-devel</package> - <package>cracklib-devel</package> - <package>crash-devel</package> - <package>crimson</package> - <package>cscope</package> - <package>cups</package> - <package>cups-devel</package> - <package>cvsps</package> - <package>cyrus-imapd-devel</package> - <package>cyrus-sasl-crammd5</package> - <package>cyrus-sasl-devel</package> - <package>dante</package> - <package>dante-devel</package> - <package>db1</package> - <package>db1-devel</package> - <package>db43</package> - <package>db43-devel</package> - <package>dbus-1-devel</package> - <package>dbus-1-glib-devel</package> - <package>dbus-1-python-devel</package> - <package>dbus-1-qt3</package> - <package>dbus-1-qt3-devel</package> - <package>dbus-1-x11</package> - <package>dejagnu</package> - <package>dejavu</package> - <package>desktop-data-openSUSE</package> - <package>desktop-file-utils</package> - <package>devhelp</package> - <package>devhelp-devel</package> - <package>devhelp-lang</package> - <package>device-mapper-devel</package> - <package>dhcp</package> - <package>dhcp-client</package> - <package>dhcp-devel</package> - <package>diffstat</package> - <package>dmapi-devel</package> - <package>dnsmasq</package> - <package>docbook-xsl-stylesheets</package> - <package>docbook_4</package> - <package>doxygen</package> - <package>dvd+rw-tools</package> - <package>e2fsprogs-devel</package> - <package>emacs</package> - <package>emacs-nox</package> - <package>emacs-x11</package> - <package>enchant</package> - <package>enchant-devel</package> - <package>enscript</package> - <package>eog</package> - <package>eog-devel</package> - <package>eog-lang</package> - <package>espeak</package> - <package>evince</package> - <package>evince-devel</package> - <package>evince-lang</package> - <package>evoldap2-devel</package> - <package>evolution</package> - <package>evolution-data-server</package> - <package>evolution-data-server-devel</package> - <package>evolution-data-server-lang</package> - <package>evolution-devel</package> - <package>evolution-lang</package> - <package>expect-devel</package> - <package>facter</package> - <package>fam</package> - <package>fam-devel</package> - <package>farsight</package> - <package>farsight-devel</package> - <package>festival</package> - <package>festival-devel</package> - <package>fftw</package> - <package>fftw-devel</package> - <package>fftw-mpi</package> - <package>fftw-mpi-devel</package> - <package>fftw-threads</package> - <package>fftw-threads-devel</package> - <package>fftw3</package> - <package>fftw3-devel</package> - <package>fftw3-threads</package> - <package>fftw3-threads-devel</package> - <package>file-devel</package> - <package>fileshareset</package> - <package>finch</package> - <package>finch-devel</package> - <package>flac-devel</package> - <package>fltk</package> - <package>fltk-devel</package> - <package>fontconfig-devel</package> - <package>fonts-config</package> - <package>foomatic-filters</package> - <package>freeglut</package> - <package>freeglut-devel</package> - <package>freeradius-client-devel</package> - <package>freeradius-client-libs</package> - <package>freeradius-server-devel</package> - <package>freeradius-server-libs</package> - <package>freetype</package> - <package>freetype2-devel</package> - <package>fribidi</package> - <package>fribidi-devel</package> - <package>ft2demos</package> - <package>fuse-devel</package> - <package>fwnn-devel</package> - <package>fxload</package> - <package>gcc-gij</package> - <package>gcc-java</package> - <package>gcc43-gij</package> - <package>gcc43-java</package> - <package>gconf-sharp2</package> - <package>gconf2-devel</package> - <package>gconfmm</package> - <package>gconfmm-devel</package> - <package>gd</package> - <package>gd-devel</package> - <package>gdbm-32bit</package> - <package>gdk-pixbuf</package> - <package>gdk-pixbuf-devel</package> - <package>gegl-0_0</package> - <package>gettext-tools</package> - <package>gfxboot-branding-SLED</package> - <package>gfxboot-devel</package> - <package>ggz</package> - <package>ggz-client-libs</package> - <package>ggz-client-libs-devel</package> - <package>ggz-client-libs-lang</package> - <package>ghex</package> - <package>ghex-devel</package> - <package>ghex-lang</package> - <package>ghostscript-devel</package> - <package>ghostscript-fonts-other</package> - <package>ghostscript-fonts-std</package> - <package>ghostscript-ijs-devel</package> - <package>ghostscript-library</package> - <package>ghostscript-omni</package> - <package>ghostscript-x11</package> - <package>giflib-devel</package> - <package>gimp</package> - <package>gimp-branding-SLED</package> - <package>gimp-devel</package> - <package>gimp-lang</package> - <package>gimp-plugins-python</package> - <package>git</package> - <package>git-arch</package> - <package>git-core</package> - <package>git-cvs</package> - <package>git-daemon</package> - <package>git-email</package> - <package>git-gui</package> - <package>git-svn</package> - <package>git-web</package> - <package>gitk</package> - <package>gjdoc</package> - <package>glade-sharp2</package> - <package>glade3</package> - <package>glade3-lang</package> - <package>glib</package> - <package>glib-devel</package> - <package>glib-sharp2</package> - <package>glib2-devel</package> - <package>glibmm2</package> - <package>glibmm2-devel</package> - <package>glitz</package> - <package>glitz-devel</package> - <package>gltt</package> - <package>gltt-devel</package> - <package>gmime-2_4-devel</package> - <package>gmime-devel</package> - <package>gmp-devel</package> - <package>gnet</package> - <package>gnet-devel</package> - <package>gnokii</package> - <package>gnokii-devel</package> - <package>gnokii-smsd</package> - <package>gnome-certauth-devel</package> - <package>gnome-control-center</package> - <package>gnome-control-center-devel</package> - <package>gnome-control-center-lang</package> - <package>gnome-desktop</package> - <package>gnome-desktop-devel</package> - <package>gnome-desktop-lang</package> - <package>gnome-doc-utils</package> - <package>gnome-doc-utils-devel</package> - <package>gnome-doc-utils-lang</package> - <package>gnome-keyring-devel</package> - <package>gnome-keyring-sharp</package> - <package>gnome-keyring-sharp-devel</package> - <package>gnome-libs</package> - <package>gnome-libs-devel</package> - <package>gnome-mag</package> - <package>gnome-mag-devel</package> - <package>gnome-mag-lang</package> - <package>gnome-main-menu</package> - <package>gnome-main-menu-lang</package> - <package>gnome-media</package> - <package>gnome-media-devel</package> - <package>gnome-media-lang</package> - <package>gnome-menus</package> - <package>gnome-menus-branding-SLED</package> - <package>gnome-menus-devel</package> - <package>gnome-menus-lang</package> - <package>gnome-mount</package> - <package>gnome-mount-lang</package> - <package>gnome-panel</package> - <package>gnome-panel-devel</package> - <package>gnome-panel-lang</package> - <package>gnome-pilot</package> - <package>gnome-pilot-devel</package> - <package>gnome-pilot-lang</package> - <package>gnome-settings-daemon</package> - <package>gnome-settings-daemon-devel</package> - <package>gnome-settings-daemon-lang</package> - <package>gnome-sharp2</package> - <package>gnome-speech</package> - <package>gnome-speech-devel</package> - <package>gnome-themes</package> - <package>gnome-utils</package> - <package>gnome-utils-devel</package> - <package>gnome-utils-lang</package> - <package>gnome-vfs-sharp2</package> - <package>gnome-vfs2</package> - <package>gnome-vfs2-devel</package> - <package>gnome-vfs2-lang</package> - <package>gnome-vfsmm</package> - <package>gnome-vfsmm-devel</package> - <package>gnopernicus</package> - <package>gnopernicus-devel</package> - <package>gnopernicus-lang</package> - <package>gnutls</package> - <package>goffice</package> - <package>goffice-devel</package> - <package>goffice-lang</package> - <package>goocanvas</package> - <package>goocanvas-devel</package> - <package>goocanvas-lang</package> - <package>goom2k4</package> - <package>goom2k4-devel</package> - <package>graphviz</package> - <package>graphviz-devel</package> - <package>graphviz-gd</package> - <package>graphviz-gnome</package> - <package>gstreamer-0_10</package> - <package>gstreamer-0_10-devel</package> - <package>gstreamer-0_10-lang</package> - <package>gstreamer-0_10-plugins-base</package> - <package>gstreamer-0_10-plugins-base-devel</package> - <package>gstreamer-0_10-plugins-base-lang</package> - <package>gstreamer-0_10-plugins-good</package> - <package>gstreamer-0_10-plugins-good-lang</package> - <package>gstreamer-0_10-utils</package> - <package>gstreamer-utils</package> - <package>gtk</package> - <package>gtk-devel</package> - <package>gtk-lang</package> - <package>gtk-sharp2</package> - <package>gtk-vnc-devel</package> - <package>gtk2-devel</package> - <package>gtkglext</package> - <package>gtkglext-devel</package> - <package>gtkhtml2</package> - <package>gtkhtml2-devel</package> - <package>gtkhtml2-lang</package> - <package>gtkhtml314-sharp</package> - <package>gtkmm2</package> - <package>gtkmm2-devel</package> - <package>gtksourceview-devel</package> - <package>gtksourceview-lang</package> - <package>gtksourceview18</package> - <package>gtksourceview18-devel</package> - <package>gtkspell</package> - <package>gtkspell-devel</package> - <package>gtkspell-lang</package> - <package>gucharmap</package> - <package>gucharmap-devel</package> - <package>gucharmap-lang</package> - <package>guile</package> - <package>guile-devel</package> - <package>gutenprint</package> - <package>gutenprint-devel</package> - <package>gvfs-devel</package> - <package>gxmhtml</package> - <package>hal-devel</package> - <package>hal-palm</package> - <package>htdig</package> - <package>htdig-devel</package> - <package>hunspell</package> - <package>hunspell-devel</package> - <package>hunspell-tools</package> - <package>hwinfo-devel</package> - <package>i4l-base</package> - <package>icewm</package> - <package>icewm-lite</package> - <package>id3lib</package> - <package>id3lib-devel</package> - <package>imap-devel</package> - <package>imap-lib</package> - <package>imlib</package> - <package>imlib-devel</package> - <package>imlib2</package> - <package>imlib2-devel</package> - <package>indent</package> - <package>info2html</package> - <package>inn</package> - <package>inn-devel</package> - <package>intltool</package> - <package>ipadic</package> - <package>iptables-devel</package> - <package>iso-codes</package> - <package>iso-codes-devel</package> - <package>iso_ent</package> - <package>ispell</package> - <package>ispell-american</package> - <package>ispell-brazilian</package> - <package>ispell-british</package> - <package>ispell-czech</package> - <package>ispell-danish</package> - <package>ispell-finnish</package> - <package>ispell-french</package> - <package>ispell-german</package> - <package>ispell-hungarian</package> - <package>ispell-italian</package> - <package>ispell-ngerman</package> - <package>ispell-norsk</package> - <package>ispell-polish</package> - <package>ispell-portuguese</package> - <package>ispell-russian</package> - <package>ispell-slovak</package> - <package>ispell-spanish</package> - <package>ispell-swedish</package> - <package>itcl-devel</package> - <package>java-1_4_2-ibm</package> - <package>java-1_4_2-ibm-devel</package> - <package>java-1_5_0-gcj-compat</package> - <package>java-1_5_0-gcj-compat-devel</package> - <package>java-1_6_0-ibm</package> - <package>java-1_6_0-ibm-devel</package> - <package>joe</package> - <package>jpackage-utils</package> - <package>k3b</package> - <package>k3b-devel</package> - <package>k3b-lang</package> - <package>kaddressbook</package> - <package>kalarm</package> - <package>kde-susetranslations</package> - <package>kde4-filesystem</package> - <package>kde4-kgreeter-plugins</package> - <package>kdebase3</package> - <package>kdebase3-devel</package> - <package>kdebase3-runtime</package> - <package>kdebase4-SLED</package> - <package>kdebase4-SLED-lang</package> - <package>kdebase4-runtime</package> - <package>kdebase4-runtime-branding-SLED</package> - <package>kdebase4-workspace</package> - <package>kdebase4-workspace-branding-SLED</package> - <package>kdebase4-workspace-devel</package> - <package>kdebase4-workspace-ksysguardd</package> - <package>kdelibs3</package> - <package>kdelibs3-arts</package> - <package>kdelibs3-default-style</package> - <package>kdelibs3-devel</package> - <package>kdelibs3-doc</package> - <package>kdelibs4</package> - <package>kdelibs4-branding-SLED</package> - <package>kdelibs4-core</package> - <package>kdelibs4-doc</package> - <package>kdemultimedia3-arts</package> - <package>kdepim3</package> - <package>kdepim4</package> - <package>kdepim4-devel</package> - <package>kdepimlibs4</package> - <package>kdialog</package> - <package>kdm</package> - <package>kdm-branding-SLED</package> - <package>kernel-docs</package> - <package>kernel-syms</package> - <package>kernel-trace-devel</package> - <package>kernel-xen-devel</package> - <package>keyutils-devel</package> - <package>kio_sysinfo</package> - <package>kio_sysinfo-branding-SLED</package> - <package>kmail</package> - <package>knode</package> - <package>kontact</package> - <package>korganizer</package> - <package>kpilot</package> - <package>krb5-devel</package> - <package>ksh-devel</package> - <package>ktorrent</package> - <package>ktorrent-devel</package> - <package>ktorrent-lang</package> - <package>kwin</package> - <package>ladspa-devel</package> - <package>lib3ds-1-3</package> - <package>lib3ds-devel</package> - <package>libFLAC++6</package> - <package>libFLAC8</package> - <package>libHX-devel</package> - <package>libMagick++-devel</package> - <package>libMagick++1</package> - <package>libMagickWand1</package> - <package>libQtWebKit-devel</package> - <package>libQtWebKit4</package> - <package>libXerces-c-devel</package> - <package>libXerces-c28</package> - <package>libXiterm</package> - <package>libXiterm-devel</package> - <package>libacl-devel</package> - <package>libadns-devel</package> - <package>libadns1</package> - <package>libakode</package> - <package>libakode-devel</package> - <package>libakonadi4</package> - <package>libakonadiprotocolinternals-devel</package> - <package>libakonadiprotocolinternals1</package> - <package>libao</package> - <package>libao-devel</package> - <package>libapparmor-devel</package> - <package>libapr-util1</package> - <package>libapr-util1-devel</package> - <package>libapr1</package> - <package>libapr1-devel</package> - <package>libarchive-devel</package> - <package>libart_lgpl</package> - <package>libart_lgpl-devel</package> - <package>libassuan-devel</package> - <package>libatomic-ops-devel</package> - <package>libattr-devel</package> - <package>libavahi-core5</package> - <package>libavahi-devel</package> - <package>libavahi-glib-devel</package> - <package>libavahi-gobject-devel</package> - <package>libavahi-gobject0</package> - <package>libavahi-ui0</package> - <package>libavc1394-0</package> - <package>libavc1394-devel</package> - <package>libbabl-0_0-0</package> - <package>libbeagle-devel</package> - <package>libbeagle-python</package> - <package>libbeagle1</package> - <package>libbitmask-devel</package> - <package>libbitmask1</package> - <package>libblkid-devel</package> - <package>libblocxx-devel</package> - <package>libbonobo</package> - <package>libbonobo-devel</package> - <package>libbonobo-lang</package> - <package>libbonoboui</package> - <package>libbonoboui-devel</package> - <package>libbonoboui-lang</package> - <package>libboost_date_time1_36_0</package> - <package>libboost_filesystem1_36_0</package> - <package>libboost_graph1_36_0</package> - <package>libboost_iostreams1_36_0</package> - <package>libboost_math1_36_0</package> - <package>libboost_mpi1_36_0</package> - <package>libboost_program_options1_36_0</package> - <package>libboost_python1_36_0</package> - <package>libboost_serialization1_36_0</package> - <package>libboost_signals1_36_0</package> - <package>libboost_system1_36_0</package> - <package>libboost_test1_36_0</package> - <package>libboost_thread1_36_0</package> - <package>libboost_wave1_36_0</package> - <package>libbotan-1_6_4</package> - <package>libbotan-devel</package> - <package>libbtctl</package> - <package>libbtctl-devel</package> - <package>libbtctl-lang</package> - <package>libbtctl4</package> - <package>libbz2-devel</package> - <package>libcaca</package> - <package>libcaca-devel</package> - <package>libcanberra-gtk</package> - <package>libcanberra-gtk0</package> - <package>libcanberra0</package> - <package>libcap-devel</package> - <package>libcap-ng0</package> - <package>libcdda_interface0</package> - <package>libcdda_paranoia0</package> - <package>libcddb-devel</package> - <package>libcddb2</package> - <package>libcdio++0</package> - <package>libcdio-devel</package> - <package>libcgroup-devel</package> - <package>libcgroup1</package> - <package>libchewing</package> - <package>libchewing-devel</package> - <package>libcmpiutil</package> - <package>libcmpiutil-devel</package> - <package>libcolorblind0</package> - <package>libcom_err-devel</package> - <package>libcompizconfig</package> - <package>libcompizconfig-devel</package> - <package>libcppunit-1_12-0</package> - <package>libcppunit-devel</package> - <package>libcpuset-devel</package> - <package>libcpuset1</package> - <package>libcroco</package> - <package>libcroco-0_6-3</package> - <package>libcroco-devel</package> - <package>libcryptsetup-devel</package> - <package>libcsync-devel</package> - <package>libcsync0</package> - <package>libcurl-devel</package> - <package>libdaemon-devel</package> - <package>libdaemon0</package> - <package>libdatrie-devel</package> - <package>libdatrie0</package> - <package>libdb-4_5-32bit</package> - <package>libdb-4_5-devel</package> - <package>libdbus-1-qt3-0</package> - <package>libdbus-1-qt3-0-devel</package> - <package>libdc1394-22</package> - <package>libdc1394-devel</package> - <package>libdc1394_control12</package> - <package>libdc1394_control12-devel</package> - <package>libdhcp6client-1_0-2</package> - <package>libdhcp6client-devel</package> - <package>libdigikam-devel</package> - <package>libdiscid1</package> - <package>libdjvulibre-devel</package> - <package>libdjvulibre21</package> - <package>libdmxview-devel</package> - <package>libdmxview0</package> - <package>libdnet-devel</package> - <package>libdnet1</package> - <package>libdns_sd</package> - <package>libdrm</package> - <package>libdrm-devel</package> - <package>libdv-devel</package> - <package>libdv4</package> - <package>libdvdread4</package> - <package>libdw-devel</package> - <package>libebl-devel</package> - <package>libedit-devel</package> - <package>libedit0</package> - <package>libelf-devel</package> - <package>libenchant1</package> - <package>libesd-devel</package> - <package>libesd0</package> - <package>libesmtp-devel</package> - <package>libevoldap-2_4-2</package> - <package>libevtlog-devel</package> - <package>libevtlog0</package> - <package>libexempi-devel</package> - <package>libexempi3</package> - <package>libexif-devel</package> - <package>libexiv2-4</package> - <package>libexiv2-devel</package> - <package>libexpat-devel</package> - <package>libext2fs-devel</package> - <package>libfarsight-0_1-3</package> - <package>libffi-devel</package> - <package>libffi43</package> - <package>libffi43-devel</package> - <package>libflaim-devel</package> - <package>libfprint-devel</package> - <package>libfreebl3</package> - <package>libfreebob</package> - <package>libfreebob-devel</package> - <package>libgadu</package> - <package>libgadu-devel</package> - <package>libgail-gnome</package> - <package>libgail-gnome-devel</package> - <package>libgcj-devel</package> - <package>libgcj43</package> - <package>libgcj43-devel</package> - <package>libgcj43-jar</package> - <package>libgcj_bc43</package> - <package>libgcrypt-devel</package> - <package>libgda-3_0-3</package> - <package>libgda-3_0-devel</package> - <package>libgdiplus0</package> - <package>libgegl-0_0-0</package> - <package>libgeoclue0</package> - <package>libgfortran46</package> - <package>libggz2</package> - <package>libggz2-devel</package> - <package>libgimpprint</package> - <package>libgimpprint-devel</package> - <package>libglade2</package> - <package>libglade2-devel</package> - <package>libglademm</package> - <package>libglademm-2_4-1</package> - <package>libglademm-devel</package> - <package>libgladeui-1-9</package> - <package>libgladeui-1_0-devel</package> - <package>libgmime-2_0-3</package> - <package>libgmime-2_4-2</package> - <package>libgmm++-devel</package> - <package>libgnome</package> - <package>libgnome-certauth0</package> - <package>libgnome-desktop-2-11</package> - <package>libgnome-devel</package> - <package>libgnome-lang</package> - <package>libgnome-menu2</package> - <package>libgnome-window-settings1</package> - <package>libgnomecanvas</package> - <package>libgnomecanvas-devel</package> - <package>libgnomecanvas-lang</package> - <package>libgnomecanvasmm</package> - <package>libgnomecanvasmm-devel</package> - <package>libgnomecups</package> - <package>libgnomecups-devel</package> - <package>libgnomecups-lang</package> - <package>libgnomedb</package> - <package>libgnomedb-devel</package> - <package>libgnomedb-lang</package> - <package>libgnomekbd</package> - <package>libgnomekbd-devel</package> - <package>libgnomekbd-lang</package> - <package>libgnomeprint</package> - <package>libgnomeprint-devel</package> - <package>libgnomeprint-lang</package> - <package>libgnomeprintui</package> - <package>libgnomeprintui-devel</package> - <package>libgnomeprintui-lang</package> - <package>libgnomesu</package> - <package>libgnomesu-devel</package> - <package>libgnomesu-lang</package> - <package>libgnomesu0</package> - <package>libgnomeui</package> - <package>libgnomeui-devel</package> - <package>libgnomeui-lang</package> - <package>libgnomevfsmm-2_6-1</package> - <package>libgnutls-devel</package> - <package>libgnutls-extra-devel</package> - <package>libgnutls-extra26</package> - <package>libgoocanvas3</package> - <package>libgpg-error-devel</package> - <package>libgpgme-devel</package> - <package>libgphoto2-devel</package> - <package>libgpod-devel</package> - <package>libgsf</package> - <package>libgsf-1-114</package> - <package>libgsf-devel</package> - <package>libgsf-gnome</package> - <package>libgsm-devel</package> - <package>libgsm1</package> - <package>libgssglue-devel</package> - <package>libgstapp-0_10-0</package> - <package>libgstinterfaces-0_10-0</package> - <package>libgstreamer-0_10-0</package> - <package>libgtk-vnc-1_0-0</package> - <package>libgtkhtml</package> - <package>libgtkhtml-devel</package> - <package>libgtksourceview-2_0-0</package> - <package>libgtop</package> - <package>libgtop-2_0-7</package> - <package>libgtop-devel</package> - <package>libgtop-lang</package> - <package>libgudev-1_0-0</package> - <package>libgweather</package> - <package>libgweather-devel</package> - <package>libgweather-lang</package> - <package>libgweather1</package> - <package>libhangul</package> - <package>libhangul-devel</package> - <package>libhowl0</package> - <package>libical-devel</package> - <package>libical0</package> - <package>libicu-devel</package> - <package>libid3tag</package> - <package>libid3tag-devel</package> - <package>libidl-devel</package> - <package>libidn-devel</package> - <package>libiec61883</package> - <package>libiec61883-devel</package> - <package>libieee1284</package> - <package>libiniparser-devel</package> - <package>libiniparser0</package> - <package>libiptcdata</package> - <package>libiptcdata-devel</package> - <package>libiptcdata0</package> - <package>libiso9660-5</package> - <package>libiterm</package> - <package>libiterm-devel</package> - <package>libjack-devel</package> - <package>libjack0</package> - <package>libjasper</package> - <package>libjasper-devel</package> - <package>libjingle-0_3-0</package> - <package>libjingle-devel</package> - <package>libjpeg-devel</package> - <package>libkcal</package> - <package>libkcal-devel</package> - <package>libkcal2</package> - <package>libkcddb4</package> - <package>libkcddb4-devel</package> - <package>libkcompactdisc4</package> - <package>libkcompactdisc4-devel</package> - <package>libkdcraw3</package> - <package>libkdcraw3-devel</package> - <package>libkdcraw3-lang</package> - <package>libkde4</package> - <package>libkde4-devel</package> - <package>libkdecore4</package> - <package>libkdecore4-devel</package> - <package>libkdepim4</package> - <package>libkdepim4-devel</package> - <package>libkdepimlibs4</package> - <package>libkdepimlibs4-devel</package> - <package>libkexiv2-3</package> - <package>libkexiv2-3-devel</package> - <package>libkexiv2-7</package> - <package>libkipi-devel</package> - <package>libkipi6</package> - <package>libkmime-devel</package> - <package>libkmime2</package> - <package>libknotificationitem-1-1</package> - <package>libkonq-devel</package> - <package>libkonq5</package> - <package>libksba-devel</package> - <package>libktnef-devel</package> - <package>libktnef1</package> - <package>liblazy-devel</package> - <package>liblazy1</package> - <package>liblcms-devel</package> - <package>libldapcpp-devel</package> - <package>liblog4c-devel</package> - <package>liblog4c3</package> - <package>libloudmouth-1-0</package> - <package>liblpsolve55</package> - <package>liblua5_1</package> - <package>libmalaga-devel</package> - <package>libmalaga7</package> - <package>libmcrypt</package> - <package>libmcrypt-devel</package> - <package>libmikmod</package> - <package>libmikmod-devel</package> - <package>libmm-devel</package> - <package>libmm14</package> - <package>libmng-devel</package> - <package>libmpcdec-devel</package> - <package>libmpcdec5</package> - <package>libmspack-devel</package> - <package>libmtp-devel</package> - <package>libmtp8</package> - <package>libmusicbrainz-devel</package> - <package>libmusicbrainz3-6</package> - <package>libmusicbrainz3-devel</package> - <package>libmusicbrainz4</package> - <package>libmysqlclient-devel</package> - <package>libmysqlclient15</package> - <package>libmysqlclient_r15</package> - <package>libneon-devel</package> - <package>libneon27</package> - <package>libnetapi-devel</package> - <package>libnetapi0</package> - <package>libnetcontrol0</package> - <package>libnetpbm-devel</package> - <package>libnetpbm10</package> - <package>libnewt0_52</package> - <package>libnjb</package> - <package>libnjb-devel</package> - <package>libnjb5</package> - <package>libnl-devel</package> - <package>libnotify</package> - <package>libnotify-devel</package> - <package>libnotify1</package> - <package>libnscd-devel</package> - <package>libnsssharedhelper0</package> - <package>libnuma-devel</package> - <package>libofa-devel</package> - <package>libofa0</package> - <package>libogg-devel</package> - <package>libogg0</package> - <package>liboil</package> - <package>liboil-devel</package> - <package>libopenbabel-devel</package> - <package>libopenbabel3</package> - <package>libopencdk-devel</package> - <package>libopencdk10</package> - <package>libopenraw-devel</package> - <package>libopenraw1</package> - <package>libopenssl-devel</package> - <package>libopensync</package> - <package>libopensync-devel</package> - <package>libopensync-plugin-evolution2</package> - <package>libopensync-plugin-evolution2-devel</package> - <package>libopensync-plugin-palm</package> - <package>libopensync-plugin-palm-devel</package> - <package>liborc-0_4-0</package> - <package>libosip2</package> - <package>libosip2-devel</package> - <package>libotf</package> - <package>libotf-devel</package> - <package>libotr-devel</package> - <package>libotr2</package> - <package>libp11-1</package> - <package>libp11-devel</package> - <package>libpackagekit-glib10</package> - <package>libpackagekit-glib10-devel</package> - <package>libpangomm-1_4-1</package> - <package>libpcap-devel</package> - <package>libpciaccess0</package> - <package>libpciaccess0-devel</package> - <package>libphonon4</package> - <package>libpisock-devel</package> - <package>libpisock9</package> - <package>libpisync-devel</package> - <package>libpisync1</package> - <package>libpixman-1-0-devel</package> - <package>libpkcs11-helper1</package> - <package>libpng-devel</package> - <package>libpolkit-qt0</package> - <package>libpoppler-devel</package> - <package>libpoppler-glib-devel</package> - <package>libpoppler-glib4</package> - <package>libpoppler-qt2</package> - <package>libpoppler-qt3-devel</package> - <package>libpoppler-qt4-3</package> - <package>libpoppler-qt4-devel</package> - <package>libpoppler5</package> - <package>libpst4</package> - <package>libpt2</package> - <package>libpt2-devel</package> - <package>libpulse-browse0</package> - <package>libpulse-devel</package> - <package>libpulse-mainloop-glib0</package> - <package>libpulse0</package> - <package>libpurple</package> - <package>libpurple-devel</package> - <package>libpurple-lang</package> - <package>libqca2</package> - <package>libqca2-devel</package> - <package>libqdialogsolver1</package> - <package>libqdialogsolver1-devel</package> - <package>libqimageblitz-devel</package> - <package>libqimageblitz4</package> - <package>libqscintilla-devel</package> - <package>libqscintilla2-5</package> - <package>libqt4</package> - <package>libqt4-devel</package> - <package>libqt4-qt3support</package> - <package>libqt4-sql</package> - <package>libqt4-sql-mysql</package> - <package>libqt4-sql-postgresql</package> - <package>libqt4-sql-sqlite</package> - <package>libqt4-sql-unixODBC</package> - <package>libqt4-x11</package> - <package>libqtpod-devel</package> - <package>libqtpod0</package> - <package>libquadmath46</package> - <package>libquicktime</package> - <package>libquicktime-devel</package> - <package>libraptor-devel</package> - <package>libraptor1</package> - <package>librasqal-devel</package> - <package>librasqal1</package> - <package>libraw1394-11</package> - <package>libraw1394-8</package> - <package>libraw1394-devel</package> - <package>libredland-devel</package> - <package>libredland0</package> - <package>libreiserfs-devel</package> - <package>libreoffice</package> - <package>libreoffice-base</package> - <package>libreoffice-branding-SLED</package> - <package>libreoffice-branding-upstream</package> - <package>libreoffice-calc</package> - <package>libreoffice-icon-themes</package> - <package>libreoffice-impress</package> - <package>libreoffice-sdk</package> - <package>libreoffice-writer</package> - <package>librsvg</package> - <package>librsvg-devel</package> - <package>libsamplerate</package> - <package>libsamplerate-devel</package> - <package>libsatsolver-devel</package> - <package>libsblim-cmpiutil1</package> - <package>libselinux-devel</package> - <package>libsemanage-devel</package> - <package>libsemanage1</package> - <package>libsensors3-devel</package> - <package>libsensors4</package> - <package>libsepol-devel</package> - <package>libsexy</package> - <package>libsexy-devel</package> - <package>libshout-devel</package> - <package>libshout3</package> - <package>libsidplay1</package> - <package>libsidplay1-devel</package> - <package>libsigc++2</package> - <package>libsigc++2-devel</package> - <package>libslab-lang</package> - <package>libslab0</package> - <package>libsmbclient-devel</package> - <package>libsmbios-devel</package> - <package>libsmbsharemodes-devel</package> - <package>libsmbsharemodes0</package> - <package>libsndfile</package> - <package>libsndfile-devel</package> - <package>libsoprano-devel</package> - <package>libsoprano4</package> - <package>libsoup-devel</package> - <package>libspectre-devel</package> - <package>libspectre1</package> - <package>libspeex</package> - <package>libssh2-devel</package> - <package>libstrigi0</package> - <package>libstroke</package> - <package>libstroke-devel</package> - <package>libsyncml-devel</package> - <package>libsyncml0</package> - <package>libtalloc-devel</package> - <package>libtasn1-devel</package> - <package>libtdb-devel</package> - <package>libtelepathy</package> - <package>libtelepathy-devel</package> - <package>libtelepathy-glib0</package> - <package>libtheora-devel</package> - <package>libtheora0</package> - <package>libtidy</package> - <package>libtidy-devel</package> - <package>libtiff-devel</package> - <package>libtirpc-devel</package> - <package>libtomoe-gtk0</package> - <package>libtspi1</package> - <package>libtunepimp</package> - <package>libtunepimp-devel</package> - <package>libtunepimp5</package> - <package>libudev-devel</package> - <package>libudf0</package> - <package>libunique-1_0-0</package> - <package>libunwind</package> - <package>libunwind-devel</package> - <package>libupsclient1</package> - <package>libusb-devel</package> - <package>libusbpp-0_1-4</package> - <package>libustr-1_0-1</package> - <package>libustr-devel</package> - <package>libuuid-devel</package> - <package>libvirt-client</package> - <package>libvirt-devel</package> - <package>libvisual</package> - <package>libvisual-devel</package> - <package>libvoikko-devel</package> - <package>libvoikko1</package> - <package>libvorbis</package> - <package>libvorbis-devel</package> - <package>libwavpack1</package> - <package>libwbclient-devel</package> - <package>libwbxml2-0</package> - <package>libwbxml2-devel</package> - <package>libwebkit-1_0-1</package> - <package>libwebkit-1_0-2</package> - <package>libwebkit-devel</package> - <package>libwebkit-lang</package> - <package>libwmf</package> - <package>libwmf-devel</package> - <package>libwmf-gnome</package> - <package>libwnck</package> - <package>libwnck-1-22</package> - <package>libwnck-devel</package> - <package>libwnck-lang</package> - <package>libwpd-0_8-8</package> - <package>libwpd-devel</package> - <package>libwpg-0_1-1</package> - <package>libwpg-devel</package> - <package>libwps-0_1-1</package> - <package>libwps-devel</package> - <package>libwsman-devel</package> - <package>libwsman1</package> - <package>libxcrypt-devel</package> - <package>libxine-devel</package> - <package>libxine1</package> - <package>libxklavier-devel</package> - <package>libxklavier15</package> - <package>libxml2-devel</package> - <package>libxslt-devel</package> - <package>libyajl1</package> - <package>libzio-devel</package> - <package>libzip-devel</package> - <package>libzip1</package> - <package>libzvbi0</package> - <package>libzypp-devel</package> - <package>limal-apparmor-notifications</package> - <package>limal-apparmor-notifications-devel</package> - <package>limal-ca-mgm-devel</package> - <package>limal-devel</package> - <package>limal-devtools</package> - <package>limal-nfs-server-devel</package> - <package>linux-atm-devel</package> - <package>linux-atm-lib</package> - <package>lksctp-tools</package> - <package>lksctp-tools-devel</package> - <package>loudmouth-devel</package> - <package>lua</package> - <package>lua-devel</package> - <package>lzo-devel</package> - <package>m17n-db</package> - <package>m17n-lib</package> - <package>m17n-lib-devel</package> - <package>malaga-suomi</package> - <package>meanwhile</package> - <package>meanwhile-devel</package> - <package>metacity</package> - <package>metacity-devel</package> - <package>metacity-lang</package> - <package>mhash</package> - <package>mhash-devel</package> - <package>misc-console-font</package> - <package>mono-addins</package> - <package>mono-basic</package> - <package>mono-core</package> - <package>mono-data</package> - <package>mono-data-oracle</package> - <package>mono-data-sqlite</package> - <package>mono-devel</package> - <package>mono-extras</package> - <package>mono-jscript</package> - <package>mono-tools</package> - <package>mono-wcf</package> - <package>mono-web</package> - <package>mono-winforms</package> - <package>mono-zeroconf</package> - <package>mono-zeroconf-provider-avahi</package> - <package>monodevelop</package> - <package>monodoc-core</package> - <package>mozilla-nspr</package> - <package>mozilla-nspr-devel</package> - <package>mozilla-nss</package> - <package>mozilla-nss-devel</package> - <package>mozilla-xulrunner192</package> - <package>mozilla-xulrunner192-gnome</package> - <package>mpfr-devel</package> - <package>mpi-selector</package> - <package>mpich</package> - <package>mpich-devel</package> - <package>mysql</package> - <package>mysql-client</package> - <package>nagios</package> - <package>nagios-devel</package> - <package>nagios-www</package> - <package>nant</package> - <package>nautilus</package> - <package>nautilus-cd-burner</package> - <package>nautilus-cd-burner-devel</package> - <package>nautilus-cd-burner-lang</package> - <package>nautilus-devel</package> - <package>nautilus-lang</package> - <package>ndesk-dbus</package> - <package>ndesk-dbus-glib</package> - <package>ndesk-dbus-glib-devel</package> - <package>net-snmp</package> - <package>net-snmp-devel</package> - <package>netatalk</package> - <package>netatalk-devel</package> - <package>netcat-openbsd</package> - <package>newt</package> - <package>newt-devel</package> - <package>newt-static</package> - <package>nfsidmap-devel</package> - <package>notification-daemon</package> - <package>notification-daemon-lang</package> - <package>notify-sharp</package> - <package>nss-mdns</package> - <package>nss-shared-helper-devel</package> - <package>nut</package> - <package>nut-classic</package> - <package>nut-devel</package> - <package>opal</package> - <package>opal-devel</package> - <package>openCryptoki</package> - <package>openCryptoki-64bit</package> - <package>openCryptoki-devel</package> - <package>openct-devel</package> - <package>openhpi</package> - <package>openhpi-daemon</package> - <package>openhpi-devel</package> - <package>openjade</package> - <package>openjade-devel</package> - <package>openldap2-devel</package> - <package>openmotif-devel</package> - <package>openmotif-libs</package> - <package>openmpi</package> - <package>openobex-devel</package> - <package>openobex-glib-devel</package> - <package>opensc-devel</package> - <package>openslp-devel</package> - <package>opensp</package> - <package>opensp-devel</package> - <package>openwsman-client</package> - <package>openwsman-server</package> - <package>orbit</package> - <package>orbit-devel</package> - <package>orbit2-devel</package> - <package>oxygen-icon-theme</package> - <package>oxygen-icon-theme-scalable</package> - <package>ozerocdoff</package> - <package>pam-devel</package> - <package>pango-devel</package> - <package>pangomm-devel</package> - <package>parted-devel</package> - <package>patchutils</package> - <package>pciutils-devel</package> - <package>pcre-devel</package> - <package>pcsc-acr38</package> - <package>pcsc-acr38-devel</package> - <package>pcsc-lite-devel</package> - <package>perl-32bit</package> - <package>perl-Crypt-OpenSSL-RSA</package> - <package>perl-Mail-DKIM</package> - <package>perl-MailTools</package> - <package>perl-Net-DNS</package> - <package>perl-Net-IP</package> - <package>perl-NetAddr-IP</package> - <package>perl-SNMP</package> - <package>perl-Tie-IxHash</package> - <package>perl-Tk</package> - <package>perl-Tk-devel</package> - <package>perl-spamassassin</package> - <package>phonon</package> - <package>phonon-backend-gstreamer-0_10</package> - <package>phonon-devel</package> - <package>php5</package> - <package>php5-ctype</package> - <package>php5-devel</package> - <package>php5-dom</package> - <package>php5-hash</package> - <package>php5-iconv</package> - <package>php5-json</package> - <package>php5-pdo</package> - <package>php5-sqlite</package> - <package>php5-suhosin</package> - <package>php5-tokenizer</package> - <package>php5-xmlreader</package> - <package>php5-xmlwriter</package> - <package>php53</package> - <package>php53-ctype</package> - <package>php53-dom</package> - <package>php53-iconv</package> - <package>php53-json</package> - <package>php53-tokenizer</package> - <package>php53-xmlreader</package> - <package>php53-xmlwriter</package> - <package>pidgin</package> - <package>pidgin-devel</package> - <package>pilot-link</package> - <package>pkcs11-helper</package> - <package>pkcs11-helper-devel</package> - <package>planner</package> - <package>planner-devel</package> - <package>planner-lang</package> - <package>plasma-addons</package> - <package>plasma-theme-aya</package> - <package>plasmoid-networkmanagement</package> - <package>plasmoid-quickaccess</package> - <package>plotutils</package> - <package>poppler-data</package> - <package>poppler-tools</package> - <package>popt-devel</package> - <package>portmap</package> - <package>postfix-devel</package> - <package>postgresql-devel</package> - <package>postgresql-libs</package> - <package>ppp-devel</package> - <package>ppp-userpass</package> - <package>pstoedit</package> - <package>pstoedit-devel</package> - <package>pulseaudio</package> - <package>pulseaudio-esound-compat</package> - <package>pulseaudio-lang</package> - <package>puppet</package> - <package>python-cairo</package> - <package>python-cairo-devel</package> - <package>python-devel</package> - <package>python-gnome</package> - <package>python-gnome-devel</package> - <package>python-gobject2</package> - <package>python-gobject2-devel</package> - <package>python-gtk</package> - <package>python-gtk-devel</package> - <package>python-gtkglext</package> - <package>python-gtkglext-devel</package> - <package>python-gtksourceview</package> - <package>python-gtksourceview-devel</package> - <package>python-numeric</package> - <package>python-numpy</package> - <package>python-orbit</package> - <package>python-orbit-devel</package> - <package>pyxml</package> - <package>qt3</package> - <package>qt3-devel</package> - <package>quagga</package> - <package>quagga-devel</package> - <package>quilt</package> - <package>raptor</package> - <package>rarian</package> - <package>rarian-devel</package> - <package>re2c</package> - <package>readline-devel</package> - <package>recode-devel</package> - <package>rpm-devel</package> - <package>rrdtool</package> - <package>rrdtool-devel</package> - <package>rsyslog</package> - <package>ruby</package> - <package>rubygems</package> - <package>ruby-devel</package> - <package>ruby-doc-html</package> - <package>ruby-doc-ri</package> - <package>ruby-examples</package> - <package>ruby-fcgi</package> - <package>ruby-mysql</package> - <package>ruby-selinux</package> - <package>ruby-test-suite</package> - <package>ruby-tk</package> - <package>sablot</package> - <package>sablot-devel</package> - <package>samba-devel</package> - <package>sane-backends</package> - <package>sane-frontends</package> - <package>sax2-libsax</package> - <package>sax2-libsax-devel</package> - <package>sax2-libsax-perl</package> - <package>sax2-tools</package> - <package>sblim-cmpi-base</package> - <package>sblim-cmpi-base-devel</package> - <package>sblim-cmpi-devel</package> - <package>sblim-cmpiutil-devel</package> - <package>sblim-indication_helper</package> - <package>sblim-sfcb</package> - <package>sblim-sfcc</package> - <package>sblim-sfcc-devel</package> - <package>scim</package> - <package>scim-devel</package> - <package>scpm-devel</package> - <package>scrollkeeper</package> - <package>scrollkeeper-lang</package> - <package>seahorse</package> - <package>seahorse-devel</package> - <package>seahorse-lang</package> - <package>sendmail</package> - <package>sendmail-devel</package> - <package>sg3_utils-devel</package> - <package>sgml-skel</package> - <package>shared-mime-info</package> - <package>silc-toolkit</package> - <package>silc-toolkit-devel</package> - <package>slang</package> - <package>slang-devel</package> - <package>soprano</package> - <package>soprano-backend-redland</package> - <package>spamassassin</package> - <package>speex-devel</package> - <package>splashy-devel</package> - <package>sqlite2</package> - <package>sqlite3-devel</package> - <package>startup-notification</package> - <package>startup-notification-devel</package> - <package>strigi</package> - <package>strigi-devel</package> - <package>subversion</package> - <package>subversion-perl</package> - <package>susehelp</package> - <package>susehelp_cz</package> - <package>susehelp_de</package> - <package>susehelp_en</package> - <package>susehelp_es</package> - <package>susehelp_fr</package> - <package>susehelp_hu</package> - <package>susehelp_it</package> - <package>swig</package> - <package>syslogd</package> - <package>t1lib</package> - <package>t1lib-devel</package> - <package>taglib</package> - <package>taglib-devel</package> - <package>taglib-sharp</package> - <package>tango-icon-theme</package> - <package>tcl-devel</package> - <package>tcpd-devel</package> - <package>telepathy-glib-devel</package> - <package>telepathy-mission-control</package> - <package>telepathy-mission-control-devel</package> - <package>texlive-bin-devel</package> - <package>texlive-devel</package> - <package>tk-devel</package> - <package>tla</package> - <package>tn5250</package> - <package>tn5250-devel</package> - <package>tomoe</package> - <package>tomoe-devel</package> - <package>tomoe-gtk</package> - <package>tomoe-gtk-devel</package> - <package>tomoe-gtk-lang</package> - <package>totem-pl-parser</package> - <package>totem-pl-parser-devel</package> - <package>totem-pl-parser-lang</package> - <package>trousers</package> - <package>trousers-devel</package> - <package>tsclient</package> - <package>tsclient-devel</package> - <package>tsclient-lang</package> - <package>uim</package> - <package>uim-devel</package> - <package>unixODBC</package> - <package>unixODBC-devel</package> - <package>unsermake</package> - <package>update-desktop-files</package> - <package>usb_modeswitch</package> - <package>usb_modeswitch-data</package> - <package>valgrind</package> - <package>valgrind-devel</package> - <package>vte</package> - <package>vte-devel</package> - <package>vte-lang</package> - <package>wdiff</package> - <package>webkit-sharp</package> - <package>wireshark</package> - <package>wireshark-devel</package> - <package>wodim-devel</package> - <package>wordcut</package> - <package>wordcut-devel</package> - <package>words</package> - <package>wpa_supplicant</package> - <package>wvstreams</package> - <package>wvstreams-devel</package> - <package>wxGTK-compat</package> - <package>wxGTK-devel</package> - <package>wxGTK-gl</package> - <package>x11-input-wacom</package> - <package>x11-input-wacom-devel</package> - <package>x11-input-wacom-tools</package> - <package>xalan-j2</package> - <package>xaw3d-devel</package> - <package>xbase</package> - <package>xbase-devel</package> - <package>xdelta</package> - <package>xdelta-devel</package> - <package>xdg-menu</package> - <package>xen-devel</package> - <package>xen-libs</package> - <package>xerces-j2</package> - <package>xerces-j2-bootstrap</package> - <package>xerces-j2-xml-apis</package> - <package>xfsprogs-devel</package> - <package>xml-commons-apis-bootstrap</package> - <package>xml-commons-resolver-bootstrap</package> - <package>xml-commons-which-bootstrap</package> - <package>xmlcharent</package> - <package>xorg-x11</package> - <package>xorg-x11-devel</package> - <package>xorg-x11-fonts</package> - <package>xorg-x11-fonts-core</package> - <package>xorg-x11-fonts-devel</package> - <package>xorg-x11-libICE-devel</package> - <package>xorg-x11-libSM-devel</package> - <package>xorg-x11-libX11-devel</package> - <package>xorg-x11-libXau-devel</package> - <package>xorg-x11-libXdmcp-devel</package> - <package>xorg-x11-libXext-devel</package> - <package>xorg-x11-libXfixes-devel</package> - <package>xorg-x11-libXmu-devel</package> - <package>xorg-x11-libXp-devel</package> - <package>xorg-x11-libXpm-devel</package> - <package>xorg-x11-libXprintUtil-devel</package> - <package>xorg-x11-libXrender-devel</package> - <package>xorg-x11-libXt-devel</package> - <package>xorg-x11-libXv-devel</package> - <package>xorg-x11-libfontenc-devel</package> - <package>xorg-x11-libxcb-devel</package> - <package>xorg-x11-libxkbfile-devel</package> - <package>xorg-x11-proto-devel</package> - <package>xorg-x11-server</package> - <package>xorg-x11-util-devel</package> - <package>xorg-x11-xauth</package> - <package>xorg-x11-xtrans-devel</package> - <package>xosd</package> - <package>xosd-devel</package> - <package>xsp</package> - <package>xterm</package> - <package>xz-devel</package> - <package>yast2-core-devel</package> - <package>yast2-devtools</package> - <package>yast2-gtk</package> - <package>yast2-libyui-devel</package> - <package>yast2-ncurses-devel</package> - <package>yast2-qt</package> - <package>yast2-qt-devel</package> - <package>yast2-qt-pkg</package> - <package>yast2-storage-devel</package> - <package>yast2-ycp-ui-bindings-devel</package> - <package>yelp</package> - <package>yelp-lang</package> - <package>zenity</package> - <package>zenity-lang</package> - <package>zlib-devel</package> - <package>zsh</package> - <package>zvbi-devel</package> - </remove-packages> - - </software> - <user_defaults> - <expire></expire> - <group>100</group> - <groups>video,dialout</groups> - <home>/home</home> - <inactive>-1</inactive> - <shell>/bin/bash</shell> - <skel>/etc/skel</skel> - <umask>022</umask> - </user_defaults> - <users config:type="list"> - <user> - <encrypted config:type="boolean">true</encrypted> - <fullname>vagrant</fullname> - <gid>100</gid> - <home>/home/vagrant</home> - <password_settings> - <expire></expire> - <flag></flag> - <inact></inact> - <max>99999</max> - <min>0</min> - <warn>7</warn> - </password_settings> - <shell>/bin/bash</shell> - <uid>1000</uid> - <user_password>$2y$05$NA1Li9ZKJOLRW5mMTXm6/e5r8dltWS5RpDZpvHrI82aLE00V51tdi</user_password> - <username>vagrant</username> - </user> - <user> - <encrypted config:type="boolean">true</encrypted> - <fullname>Games account</fullname> - <gid>100</gid> - <home>/var/games</home> - <password_settings> - <expire></expire> - <flag></flag> - <inact></inact> - <max></max> - <min></min> - <warn></warn> - </password_settings> - <shell>/bin/bash</shell> - <uid>12</uid> - <user_password>*</user_password> - <username>games</username> - </user> - <user> - <encrypted config:type="boolean">true</encrypted> - <fullname>bin</fullname> - <gid>1</gid> - <home>/bin</home> - <password_settings> - <expire></expire> - <flag></flag> - <inact></inact> - <max></max> - <min></min> - <warn></warn> - </password_settings> - <shell>/bin/bash</shell> - <uid>1</uid> - <user_password>*</user_password> - <username>bin</username> - </user> - <user> - <encrypted config:type="boolean">true</encrypted> - <fullname>nobody</fullname> - <gid>65533</gid> - <home>/var/lib/nobody</home> - <password_settings> - <expire></expire> - <flag></flag> - <inact></inact> - <max></max> - <min></min> - <warn></warn> - </password_settings> - <shell>/bin/bash</shell> - <uid>65534</uid> - <user_password>*</user_password> - <username>nobody</username> - </user> - <user> - <encrypted config:type="boolean">true</encrypted> - <fullname>Printing daemon</fullname> - <gid>7</gid> - <home>/var/spool/lpd</home> - <password_settings> - <expire></expire> - <flag></flag> - <inact></inact> - <max></max> - <min></min> - <warn></warn> - </password_settings> - <shell>/bin/bash</shell> - <uid>4</uid> - <user_password>*</user_password> - <username>lp</username> - </user> - <user> - <encrypted config:type="boolean">true</encrypted> - <fullname>User for uuidd</fullname> - <gid>104</gid> - <home>/var/run/uuidd</home> - <password_settings> - <expire></expire> - <flag></flag> - <inact></inact> - <max>99999</max> - <min>0</min> - <warn>7</warn> - </password_settings> - <shell>/bin/false</shell> - <uid>102</uid> - <user_password>*</user_password> - <username>uuidd</username> - </user> - <user> - <encrypted config:type="boolean">true</encrypted> - <fullname>Postfix Daemon</fullname> - <gid>51</gid> - <home>/var/spool/postfix</home> - <password_settings> - <expire></expire> - <flag></flag> - <inact></inact> - <max>99999</max> - <min>0</min> - <warn>7</warn> - </password_settings> - <shell>/bin/false</shell> - <uid>51</uid> - <user_password>*</user_password> - <username>postfix</username> - </user> - <user> - <encrypted config:type="boolean">true</encrypted> - <fullname>Novell Customer Center User</fullname> - <gid>111</gid> - <home>/var/lib/YaST2/suse-ncc-fakehome</home> - <password_settings> - <expire></expire> - <flag></flag> - <inact></inact> - <max>99999</max> - <min>0</min> - <warn>7</warn> - </password_settings> - <shell>/bin/bash</shell> - <uid>106</uid> - <user_password>*</user_password> - <username>suse-ncc</username> - </user> - <user> - <encrypted config:type="boolean">true</encrypted> - <fullname>FTP account</fullname> - <gid>49</gid> - <home>/srv/ftp</home> - <password_settings> - <expire></expire> - <flag></flag> - <inact></inact> - <max></max> - <min></min> - <warn></warn> - </password_settings> - <shell>/bin/bash</shell> - <uid>40</uid> - <user_password>*</user_password> - <username>ftp</username> - </user> - <user> - <encrypted config:type="boolean">true</encrypted> - <fullname>Gnome Display Manager daemon</fullname> - <gid>112</gid> - <home>/var/lib/gdm</home> - <password_settings> - <expire></expire> - <flag></flag> - <inact></inact> - <max>99999</max> - <min>0</min> - <warn>7</warn> - </password_settings> - <shell>/bin/false</shell> - <uid>107</uid> - <user_password>*</user_password> - <username>gdm</username> - </user> - <user> - <encrypted config:type="boolean">true</encrypted> - <fullname>Batch jobs daemon</fullname> - <gid>25</gid> - <home>/var/spool/atjobs</home> - <password_settings> - <expire></expire> - <flag></flag> - <inact></inact> - <max>99999</max> - <min>0</min> - <warn>7</warn> - </password_settings> - <shell>/bin/bash</shell> - <uid>25</uid> - <user_password>*</user_password> - <username>at</username> - </user> - <user> - <encrypted config:type="boolean">true</encrypted> - <fullname>root</fullname> - <gid>0</gid> - <home>/root</home> - <password_settings> - <expire></expire> - <flag></flag> - <inact></inact> - <max></max> - <min></min> - <warn></warn> - </password_settings> - <shell>/bin/bash</shell> - <uid>0</uid> - <user_password>$2y$05$NA1Li9ZKJOLRW5mMTXm6/e5r8dltWS5RpDZpvHrI82aLE00V51tdi</user_password> - <username>root</username> - </user> - <user> - <encrypted config:type="boolean">true</encrypted> - <fullname>Mailer daemon</fullname> - <gid>12</gid> - <home>/var/spool/clientmqueue</home> - <password_settings> - <expire></expire> - <flag></flag> - <inact></inact> - <max></max> - <min></min> - <warn></warn> - </password_settings> - <shell>/bin/false</shell> - <uid>8</uid> - <user_password>*</user_password> - <username>mail</username> - </user> - <user> - <encrypted config:type="boolean">true</encrypted> - <fullname>Daemon</fullname> - <gid>2</gid> - <home>/sbin</home> - <password_settings> - <expire></expire> - <flag></flag> - <inact></inact> - <max></max> - <min></min> - <warn></warn> - </password_settings> - <shell>/bin/bash</shell> - <uid>2</uid> - <user_password>*</user_password> - <username>daemon</username> - </user> - <user> - <encrypted config:type="boolean">true</encrypted> - <fullname>NTP daemon</fullname> - <gid>108</gid> - <home>/var/lib/ntp</home> - <password_settings> - <expire></expire> - <flag></flag> - <inact></inact> - <max>99999</max> - <min>0</min> - <warn>7</warn> - </password_settings> - <shell>/bin/false</shell> - <uid>74</uid> - <user_password>*</user_password> - <username>ntp</username> - </user> - <user> - <encrypted config:type="boolean">true</encrypted> - <fullname>Unix-to-Unix CoPy system</fullname> - <gid>14</gid> - <home>/etc/uucp</home> - <password_settings> - <expire></expire> - <flag></flag> - <inact></inact> - <max></max> - <min></min> - <warn></warn> - </password_settings> - <shell>/bin/bash</shell> - <uid>10</uid> - <user_password>*</user_password> - <username>uucp</username> - </user> - <user> - <encrypted config:type="boolean">true</encrypted> - <fullname>User for D-Bus</fullname> - <gid>101</gid> - <home>/var/run/dbus</home> - <password_settings> - <expire></expire> - <flag></flag> - <inact></inact> - <max></max> - <min>0</min> - <warn>7</warn> - </password_settings> - <shell>/bin/false</shell> - <uid>100</uid> - <user_password>*</user_password> - <username>messagebus</username> - </user> - <user> - <encrypted config:type="boolean">true</encrypted> - <fullname>User for haldaemon</fullname> - <gid>102</gid> - <home>/var/run/hald</home> - <password_settings> - <expire></expire> - <flag></flag> - <inact></inact> - <max></max> - <min>0</min> - <warn>7</warn> - </password_settings> - <shell>/bin/false</shell> - <uid>101</uid> - <user_password>*</user_password> - <username>haldaemon</username> - </user> - <user> - <encrypted config:type="boolean">true</encrypted> - <fullname>WWW daemon apache</fullname> - <gid>8</gid> - <home>/var/lib/wwwrun</home> - <password_settings> - <expire></expire> - <flag></flag> - <inact></inact> - <max></max> - <min></min> - <warn></warn> - </password_settings> - <shell>/bin/false</shell> - <uid>30</uid> - <user_password>*</user_password> - <username>wwwrun</username> - </user> - <user> - <encrypted config:type="boolean">true</encrypted> - <fullname>Manual pages viewer</fullname> - <gid>62</gid> - <home>/var/cache/man</home> - <password_settings> - <expire></expire> - <flag></flag> - <inact></inact> - <max></max> - <min></min> - <warn></warn> - </password_settings> - <shell>/bin/bash</shell> - <uid>13</uid> - <user_password>*</user_password> - <username>man</username> - </user> - <user> - <encrypted config:type="boolean">true</encrypted> - <fullname>PolicyKit</fullname> - <gid>107</gid> - <home>/var/run/PolicyKit</home> - <password_settings> - <expire></expire> - <flag></flag> - <inact></inact> - <max>99999</max> - <min>0</min> - <warn>7</warn> - </password_settings> - <shell>/bin/false</shell> - <uid>104</uid> - <user_password>*</user_password> - <username>polkituser</username> - </user> - <user> - <encrypted config:type="boolean">true</encrypted> - <fullname>News system</fullname> - <gid>13</gid> - <home>/etc/news</home> - <password_settings> - <expire></expire> - <flag></flag> - <inact></inact> - <max></max> - <min></min> - <warn></warn> - </password_settings> - <shell>/bin/bash</shell> - <uid>9</uid> - <user_password>*</user_password> - <username>news</username> - </user> - <user> - <fullname>SSH daemon</fullname> - <gid>65</gid> - <home>/var/lib/sshd</home> - <shell>/bin/false</shell> - <uid>71</uid> - <username>sshd</username> - </user> - <user> - <encrypted config:type="boolean">true</encrypted> - <fullname>PulseAudio daemon</fullname> - <gid>109</gid> - <home>/var/lib/pulseaudio</home> - <password_settings> - <expire></expire> - <flag></flag> - <inact></inact> - <max>99999</max> - <min>0</min> - <warn>7</warn> - </password_settings> - <shell>/bin/false</shell> - <uid>105</uid> - <user_password>*</user_password> - <username>pulse</username> - </user> - </users> -</profile> diff --git a/http/sles-11/sles-11-sp2-x86_64-autoinst.xml b/http/sles-11/sles-11-sp2-x86_64-autoinst.xml deleted file mode 100644 index 152f6d02c..000000000 --- a/http/sles-11/sles-11-sp2-x86_64-autoinst.xml +++ /dev/null @@ -1,2562 +0,0 @@ -<?xml version="1.0"?> -<!DOCTYPE profile> -<profile xmlns="http://www.suse.com/1.0/yast2ns" xmlns:config="http://www.suse.com/1.0/configns"> - <add-on> - <add_on_products config:type="list"> - <listentry> - <media_url><![CDATA[http://demeter.uni-regensburg.de/SLE11SP2-SDK-x64/DVD1/]]></media_url> - <product>sle-sdk</product> - <product_dir>/</product_dir> - </listentry> - </add_on_products> - </add-on> - <bootloader> - <device_map config:type="list"> - <device_map_entry> - <firmware>hd0</firmware> - <linux>/dev/sda</linux> - </device_map_entry> - </device_map> - <global> - <activate>true</activate> - <boot_root>true</boot_root> - <default>SUSE Linux Enterprise Server 11 SP2 - 3.0.13-0.27</default> - <generic_mbr>true</generic_mbr> - <gfxmenu>/boot/message</gfxmenu> - <lines_cache_id>2</lines_cache_id> - <timeout config:type="integer">8</timeout> - </global> - <initrd_modules config:type="list"> - <initrd_module> - <module>ahci</module> - </initrd_module> - <initrd_module> - <module>ata_piix</module> - </initrd_module> - <initrd_module> - <module>ata_generic</module> - </initrd_module> - <initrd_module> - <module>jbd</module> - </initrd_module> - <initrd_module> - <module>mbcache</module> - </initrd_module> - <initrd_module> - <module>ext3</module> - </initrd_module> - </initrd_modules> - <loader_type>grub</loader_type> - <sections config:type="list"> - <section> - <append>resume=/dev/sda1 splash=silent crashkernel=128M-:64M showopts</append> - <image>(hd0,1)/boot/vmlinuz-3.0.13-0.27-default</image> - <initial>1</initial> - <initrd>(hd0,1)/boot/initrd-3.0.13-0.27-default</initrd> - <lines_cache_id>0</lines_cache_id> - <name>SUSE Linux Enterprise Server 11 SP2 - 3.0.13-0.27</name> - <original_name>linux</original_name> - <root>/dev/sda2</root> - <type>image</type> - <vgamode>0x314</vgamode> - </section> - <section> - <append>showopts ide=nodma apm=off noresume edd=off powersaved=off nohz=off highres=off processor.max_cstate=1 nomodeset x11failsafe</append> - <image>(hd0,1)/boot/vmlinuz-3.0.13-0.27-default</image> - <initrd>(hd0,1)/boot/initrd-3.0.13-0.27-default</initrd> - <lines_cache_id>1</lines_cache_id> - <name>Failsafe -- SUSE Linux Enterprise Server 11 SP2 - 3.0.13-0.27</name> - <original_name>failsafe</original_name> - <root>/dev/sda2</root> - <type>image</type> - <vgamode>0x314</vgamode> - </section> - </sections> - </bootloader> - <ca_mgm> - <CAName>YaST_Default_CA</CAName> - <ca_commonName>YaST Default CA (vagrant-sles-11sp2-x64)</ca_commonName> - <country>US</country> - <locality></locality> - <organisation></organisation> - <organisationUnit></organisationUnit> - <password>ENTER PASSWORD HERE</password> - <server_commonName>vagrant-sles-11sp2-x64.vagrantup.com</server_commonName> - <server_email>postmaster@vagrantup.com</server_email> - <state></state> - <takeLocalServerName config:type="boolean">false</takeLocalServerName> - </ca_mgm> - <deploy_image> - <image_installation config:type="boolean">false</image_installation> - </deploy_image> - <general> - <ask-list config:type="list"/> - <mode> - <confirm config:type="boolean">false</confirm> - </mode> - <mouse> - <id>none</id> - </mouse> - <proposals config:type="list"/> - <signature-handling> - <accept_file_without_checksum config:type="boolean">true</accept_file_without_checksum> - <accept_non_trusted_gpg_key config:type="boolean">true</accept_non_trusted_gpg_key> - <accept_unknown_gpg_key config:type="boolean">true</accept_unknown_gpg_key> - <accept_unsigned_file config:type="boolean">true</accept_unsigned_file> - <accept_verification_failed config:type="boolean">false</accept_verification_failed> - <import_gpg_key config:type="boolean">true</import_gpg_key> - </signature-handling> - <storage/> - </general> - <groups config:type="list"> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>100</gid> - <group_password>x</group_password> - <groupname>users</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>19</gid> - <group_password>x</group_password> - <groupname>floppy</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>1</gid> - <group_password>x</group_password> - <groupname>bin</groupname> - <userlist>daemon</userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>41</gid> - <group_password>x</group_password> - <groupname>xok</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>65533</gid> - <group_password>x</group_password> - <groupname>nobody</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>43</gid> - <group_password>x</group_password> - <groupname>modem</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>5</gid> - <group_password>x</group_password> - <groupname>tty</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>7</gid> - <group_password>x</group_password> - <groupname>lp</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>104</gid> - <group_password>!</group_password> - <groupname>uuidd</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>51</gid> - <group_password>!</group_password> - <groupname>postfix</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>112</gid> - <group_password>!</group_password> - <groupname>gdm</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>65534</gid> - <group_password>x</group_password> - <groupname>nogroup</groupname> - <userlist>nobody</userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>101</gid> - <group_password>!</group_password> - <groupname>messagebus</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>59</gid> - <group_password>!</group_password> - <groupname>maildrop</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>33</gid> - <group_password>x</group_password> - <groupname>video</groupname> - <userlist>vagrant</userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>3</gid> - <group_password>x</group_password> - <groupname>sys</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>15</gid> - <group_password>x</group_password> - <groupname>shadow</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>20</gid> - <group_password>x</group_password> - <groupname>cdrom</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>21</gid> - <group_password>x</group_password> - <groupname>console</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>42</gid> - <group_password>x</group_password> - <groupname>trusted</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>102</gid> - <group_password>!</group_password> - <groupname>haldaemon</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>106</gid> - <group_password>!</group_password> - <groupname>puppet</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>16</gid> - <group_password>x</group_password> - <groupname>dialout</groupname> - <userlist>vagrant</userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>107</gid> - <group_password>!</group_password> - <groupname>polkituser</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>10</gid> - <group_password>x</group_password> - <groupname>wheel</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>109</gid> - <group_password>!</group_password> - <groupname>pulse</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>8</gid> - <group_password>x</group_password> - <groupname>www</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>40</gid> - <group_password>x</group_password> - <groupname>games</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>6</gid> - <group_password>x</group_password> - <groupname>disk</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>17</gid> - <group_password>x</group_password> - <groupname>audio</groupname> - <userlist>pulse</userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>111</gid> - <group_password>!</group_password> - <groupname>suse-ncc</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>49</gid> - <group_password>x</group_password> - <groupname>ftp</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>103</gid> - <group_password>!</group_password> - <groupname>tape</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>25</gid> - <group_password>!</group_password> - <groupname>at</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>9</gid> - <group_password>x</group_password> - <groupname>kmem</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>32</gid> - <group_password>x</group_password> - <groupname>public</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>12</gid> - <group_password>x</group_password> - <groupname>mail</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>0</gid> - <group_password>x</group_password> - <groupname>root</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>2</gid> - <group_password>x</group_password> - <groupname>daemon</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>105</gid> - <group_password>!</group_password> - <groupname>sfcb</groupname> - <userlist>root</userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>108</gid> - <group_password>!</group_password> - <groupname>ntp</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>14</gid> - <group_password>x</group_password> - <groupname>uucp</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>110</gid> - <group_password>!</group_password> - <groupname>pulse-access</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>71</gid> - <group_password>!</group_password> - <groupname>ntadmin</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>62</gid> - <group_password>x</group_password> - <groupname>man</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>22</gid> - <group_password>x</group_password> - <groupname>utmp</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>13</gid> - <group_password>x</group_password> - <groupname>news</groupname> - <userlist></userlist> - </group> - <group> - <encrypted config:type="boolean">true</encrypted> - <gid>65</gid> - <group_password>!</group_password> - <groupname>sshd</groupname> - <userlist></userlist> - </group> - </groups> - <host> - <hosts config:type="list"> - <hosts_entry> - <host_address>127.0.0.1</host_address> - <names config:type="list"> - <name>localhost</name> - </names> - </hosts_entry> - <hosts_entry> - <host_address>::1</host_address> - <names config:type="list"> - <name>localhost ipv6-localhost ipv6-loopback</name> - </names> - </hosts_entry> - <hosts_entry> - <host_address>fe00::0</host_address> - <names config:type="list"> - <name>ipv6-localnet</name> - </names> - </hosts_entry> - <hosts_entry> - <host_address>ff00::0</host_address> - <names config:type="list"> - <name>ipv6-mcastprefix</name> - </names> - </hosts_entry> - <hosts_entry> - <host_address>ff02::1</host_address> - <names config:type="list"> - <name>ipv6-allnodes</name> - </names> - </hosts_entry> - <hosts_entry> - <host_address>ff02::2</host_address> - <names config:type="list"> - <name>ipv6-allrouters</name> - </names> - </hosts_entry> - <hosts_entry> - <host_address>ff02::3</host_address> - <names config:type="list"> - <name>ipv6-allhosts</name> - </names> - </hosts_entry> - </hosts> - </host> - <login_settings/> - <networking> - <dhcp_options> - <dhclient_client_id></dhclient_client_id> - <dhclient_hostname_option>AUTO</dhclient_hostname_option> - </dhcp_options> - <dns> - <dhcp_hostname config:type="boolean">false</dhcp_hostname> - <domain>vagrantup.com</domain> - <hostname>vagrant-sles-11sp2-x64</hostname> - <resolv_conf_policy>auto</resolv_conf_policy> - <searchlist config:type="list"> - <search>vagrantup.com</search> - </searchlist> - <write_hostname config:type="boolean">true</write_hostname> - </dns> - <interfaces config:type="list"> - <interface> - <bootproto>dhcp</bootproto> - <device>eth0</device> - <startmode>auto</startmode> - <usercontrol>no</usercontrol> - </interface> - </interfaces> - <keep_install_network config:type="boolean">true</keep_install_network> - <managed config:type="boolean">false</managed> - <routing> - <ip_forward config:type="boolean">false</ip_forward> - </routing> - </networking> - <partitioning config:type="list"> - <drive> - <device>/dev/sda</device> - <initialize config:type="boolean">true</initialize> - <partitions config:type="list"> - <partition> - <create config:type="boolean">true</create> - <crypt_fs config:type="boolean">false</crypt_fs> - <filesystem config:type="symbol">swap</filesystem> - <format config:type="boolean">true</format> - <fstopt>defaults</fstopt> - <loop_fs config:type="boolean">false</loop_fs> - <mount>swap</mount> - <mountby config:type="symbol">device</mountby> - <partition_id config:type="integer">130</partition_id> - <partition_nr config:type="integer">1</partition_nr> - <raid_options/> - <resize config:type="boolean">false</resize> - <size>1561492992</size> - </partition> - <partition> - <create config:type="boolean">true</create> - <crypt_fs config:type="boolean">false</crypt_fs> - <filesystem config:type="symbol">ext3</filesystem> - <format config:type="boolean">true</format> - <fstopt>acl,user_xattr</fstopt> - <loop_fs config:type="boolean">false</loop_fs> - <mount>/</mount> - <mountby config:type="symbol">device</mountby> - <partition_id config:type="integer">131</partition_id> - <partition_nr config:type="integer">2</partition_nr> - <raid_options/> - <resize config:type="boolean">false</resize> - <size>19895844352</size> - </partition> - </partitions> - <pesize></pesize> - <type config:type="symbol">CT_DISK</type> - <use>all</use> - </drive> - </partitioning> - <report> - <errors> - <log config:type="boolean">true</log> - <show config:type="boolean">true</show> - <timeout config:type="integer">0</timeout> - </errors> - <messages> - <log config:type="boolean">true</log> - <show config:type="boolean">true</show> - <timeout config:type="integer">0</timeout> - </messages> - <warnings> - <log config:type="boolean">true</log> - <show config:type="boolean">true</show> - <timeout config:type="integer">0</timeout> - </warnings> - <yesno_messages> - <log config:type="boolean">true</log> - <show config:type="boolean">true</show> - <timeout config:type="integer">0</timeout> - </yesno_messages> - </report> - <software> - - <packages config:type="list"> - <package>desktop-translations</package> - <package>gconf2-branding-SLES</package> - <package>libproxy0-config-gnome</package> - <package>sle-sdk-release</package> - <package>sle-sdk-release-SDK</package> - <package>sles-manuals_en</package> - <package>yast2-trans-en_US</package> - </packages> - <patterns config:type="list"> - <pattern>Basis-Devel</pattern> - <pattern>Minimal</pattern> - <pattern>apparmor</pattern> - <pattern>base</pattern> - <pattern>sdk_kernel</pattern> - </patterns> - <remove-packages config:type="list"> - <package>3ddiag</package> - <package>CASA</package> - <package>CASA-devel</package> - <package>CASA_auth_token_client</package> - <package>CASA_auth_token_client-devel</package> - <package>ConsoleKit-devel</package> - <package>ConsoleKit-x11</package> - <package>DirectFB-devel</package> - <package>FastCGI</package> - <package>IlmBase</package> - <package>IlmBase-devel</package> - <package>ImageMagick</package> - <package>ImageMagick-devel</package> - <package>LibVNCServer</package> - <package>LibVNCServer-devel</package> - <package>Mesa</package> - <package>Mesa-devel</package> - <package>ModemManager</package> - <package>Modules</package> - <package>NetworkManager</package> - <package>NetworkManager-devel</package> - <package>NetworkManager-glib</package> - <package>NetworkManager-gnome</package> - <package>NetworkManager-kde4</package> - <package>NetworkManager-kde4-lang</package> - <package>NetworkManager-kde4-libs</package> - <package>OpenEXR</package> - <package>OpenEXR-devel</package> - <package>OpenIPMI-devel</package> - <package>PackageKit</package> - <package>PackageKit-devel</package> - <package>PackageKit-lang</package> - <package>PolicyKit-devel</package> - <package>PolicyKit-gnome</package> - <package>PolicyKit-gnome-devel</package> - <package>PolicyKit-gnome-libs</package> - <package>SDL-devel</package> - <package>SDL_net</package> - <package>SDL_net-devel</package> - <package>TeX-Guy</package> - <package>TeX-Guy-devel</package> - <package>VFlib3</package> - <package>VFlib3-devel</package> - <package>WindowMaker</package> - <package>WindowMaker-devel</package> - <package>a2ps</package> - <package>aalib</package> - <package>aalib-devel</package> - <package>akonadi-runtime</package> - <package>akregator</package> - <package>alsa-devel</package> - <package>alsa-firmware</package> - <package>alsa-plugins-pulse</package> - <package>alsa-tools</package> - <package>alsa-tools-devel</package> - <package>anthy</package> - <package>anthy-devel</package> - <package>antlr</package> - <package>apache2</package> - <package>apache2-devel</package> - <package>apache2-mod_perl</package> - <package>apache2-mod_perl-devel</package> - <package>apache2-prefork</package> - <package>apache2-utils</package> - <package>apache2-worker</package> - <package>apparmor-profile-editor</package> - <package>art-sharp2</package> - <package>arts</package> - <package>arts-devel</package> - <package>aspell-devel</package> - <package>at-spi</package> - <package>at-spi-devel</package> - <package>at-spi-lang</package> - <package>atk-devel</package> - <package>audiofile</package> - <package>audiofile-devel</package> - <package>audit-devel</package> - <package>augeas-lenses</package> - <package>automoc4</package> - <package>avahi</package> - <package>avahi-compat-howl-devel</package> - <package>avahi-compat-mDNSResponder-devel</package> - <package>avahi-lang</package> - <package>babl-0_0</package> - <package>banshee-1</package> - <package>banshee-1-backend-engine-gstreamer</package> - <package>banshee-1-backend-platform-gnome</package> - <package>banshee-1-backend-platform-unix</package> - <package>banshee-1-devel</package> - <package>banshee-1-extensions-default</package> - <package>banshee-1-lang</package> - <package>beagle-devel</package> - <package>bind-devel</package> - <package>binutils-devel</package> - <package>bluez</package> - <package>bluez-devel</package> - <package>boo</package> - <package>boo-devel</package> - <package>boost-devel</package> - <package>bootsplash-branding-SLED</package> - <package>cairo-devel</package> - <package>cairomm</package> - <package>cairomm-devel</package> - <package>canna</package> - <package>canna-devel</package> - <package>canna-libs</package> - <package>cannadic</package> - <package>capi4linux</package> - <package>capi4linux-devel</package> - <package>cdk</package> - <package>cdk-devel</package> - <package>cdrdao</package> - <package>chasen</package> - <package>chasen-devel</package> - <package>check</package> - <package>check-devel</package> - <package>chmlib</package> - <package>chmlib-devel</package> - <package>cim-schema</package> - <package>clucene-core</package> - <package>clucene-core-devel</package> - <package>cmake</package> - <package>compiz</package> - <package>compiz-branding-SLE</package> - <package>compiz-devel</package> - <package>compiz-gnome</package> - <package>coolkey-devel</package> - <package>cracklib-devel</package> - <package>crash-devel</package> - <package>crimson</package> - <package>cscope</package> - <package>cups</package> - <package>cups-devel</package> - <package>cvsps</package> - <package>cyrus-imapd-devel</package> - <package>cyrus-sasl-crammd5</package> - <package>cyrus-sasl-devel</package> - <package>dante</package> - <package>dante-devel</package> - <package>db1</package> - <package>db1-devel</package> - <package>db43</package> - <package>db43-devel</package> - <package>dbus-1-devel</package> - <package>dbus-1-glib-devel</package> - <package>dbus-1-python-devel</package> - <package>dbus-1-qt3</package> - <package>dbus-1-qt3-devel</package> - <package>dbus-1-x11</package> - <package>dejagnu</package> - <package>dejavu</package> - <package>desktop-data-openSUSE</package> - <package>desktop-file-utils</package> - <package>devhelp</package> - <package>devhelp-devel</package> - <package>devhelp-lang</package> - <package>device-mapper-devel</package> - <package>dhcp</package> - <package>dhcp-client</package> - <package>dhcp-devel</package> - <package>diffstat</package> - <package>dmapi-devel</package> - <package>dnsmasq</package> - <package>docbook-xsl-stylesheets</package> - <package>docbook_4</package> - <package>doxygen</package> - <package>dvd+rw-tools</package> - <package>e2fsprogs-devel</package> - <package>emacs</package> - <package>emacs-nox</package> - <package>emacs-x11</package> - <package>enchant</package> - <package>enchant-devel</package> - <package>enscript</package> - <package>eog</package> - <package>eog-devel</package> - <package>eog-lang</package> - <package>espeak</package> - <package>evince</package> - <package>evince-devel</package> - <package>evince-lang</package> - <package>evoldap2-devel</package> - <package>evolution</package> - <package>evolution-data-server</package> - <package>evolution-data-server-devel</package> - <package>evolution-data-server-lang</package> - <package>evolution-devel</package> - <package>evolution-lang</package> - <package>expect-devel</package> - <package>facter</package> - <package>fam</package> - <package>fam-devel</package> - <package>farsight</package> - <package>farsight-devel</package> - <package>festival</package> - <package>festival-devel</package> - <package>fftw</package> - <package>fftw-devel</package> - <package>fftw-mpi</package> - <package>fftw-mpi-devel</package> - <package>fftw-threads</package> - <package>fftw-threads-devel</package> - <package>fftw3</package> - <package>fftw3-devel</package> - <package>fftw3-threads</package> - <package>fftw3-threads-devel</package> - <package>file-devel</package> - <package>fileshareset</package> - <package>finch</package> - <package>finch-devel</package> - <package>flac-devel</package> - <package>fltk</package> - <package>fltk-devel</package> - <package>fontconfig-devel</package> - <package>fonts-config</package> - <package>foomatic-filters</package> - <package>freeglut</package> - <package>freeglut-devel</package> - <package>freeradius-client-devel</package> - <package>freeradius-client-libs</package> - <package>freeradius-server-devel</package> - <package>freeradius-server-libs</package> - <package>freetype</package> - <package>freetype2-devel</package> - <package>fribidi</package> - <package>fribidi-devel</package> - <package>ft2demos</package> - <package>fuse-devel</package> - <package>fwnn-devel</package> - <package>fxload</package> - <package>gcc-gij</package> - <package>gcc-java</package> - <package>gcc43-gij</package> - <package>gcc43-java</package> - <package>gconf-sharp2</package> - <package>gconf2-devel</package> - <package>gconfmm</package> - <package>gconfmm-devel</package> - <package>gd</package> - <package>gd-devel</package> - <package>gdbm-32bit</package> - <package>gdk-pixbuf</package> - <package>gdk-pixbuf-devel</package> - <package>gegl-0_0</package> - <package>gettext-tools</package> - <package>gfxboot-branding-SLED</package> - <package>gfxboot-devel</package> - <package>ggz</package> - <package>ggz-client-libs</package> - <package>ggz-client-libs-devel</package> - <package>ggz-client-libs-lang</package> - <package>ghex</package> - <package>ghex-devel</package> - <package>ghex-lang</package> - <package>ghostscript-devel</package> - <package>ghostscript-fonts-other</package> - <package>ghostscript-fonts-std</package> - <package>ghostscript-ijs-devel</package> - <package>ghostscript-library</package> - <package>ghostscript-omni</package> - <package>ghostscript-x11</package> - <package>giflib-devel</package> - <package>gimp</package> - <package>gimp-branding-SLED</package> - <package>gimp-devel</package> - <package>gimp-lang</package> - <package>gimp-plugins-python</package> - <package>git</package> - <package>git-arch</package> - <package>git-core</package> - <package>git-cvs</package> - <package>git-daemon</package> - <package>git-email</package> - <package>git-gui</package> - <package>git-svn</package> - <package>git-web</package> - <package>gitk</package> - <package>gjdoc</package> - <package>glade-sharp2</package> - <package>glade3</package> - <package>glade3-lang</package> - <package>glib</package> - <package>glib-devel</package> - <package>glib-sharp2</package> - <package>glib2-devel</package> - <package>glibmm2</package> - <package>glibmm2-devel</package> - <package>glitz</package> - <package>glitz-devel</package> - <package>gltt</package> - <package>gltt-devel</package> - <package>gmime-2_4-devel</package> - <package>gmime-devel</package> - <package>gmp-devel</package> - <package>gnet</package> - <package>gnet-devel</package> - <package>gnokii</package> - <package>gnokii-devel</package> - <package>gnokii-smsd</package> - <package>gnome-certauth-devel</package> - <package>gnome-control-center</package> - <package>gnome-control-center-devel</package> - <package>gnome-control-center-lang</package> - <package>gnome-desktop</package> - <package>gnome-desktop-devel</package> - <package>gnome-desktop-lang</package> - <package>gnome-doc-utils</package> - <package>gnome-doc-utils-devel</package> - <package>gnome-doc-utils-lang</package> - <package>gnome-keyring-devel</package> - <package>gnome-keyring-sharp</package> - <package>gnome-keyring-sharp-devel</package> - <package>gnome-libs</package> - <package>gnome-libs-devel</package> - <package>gnome-mag</package> - <package>gnome-mag-devel</package> - <package>gnome-mag-lang</package> - <package>gnome-main-menu</package> - <package>gnome-main-menu-lang</package> - <package>gnome-media</package> - <package>gnome-media-devel</package> - <package>gnome-media-lang</package> - <package>gnome-menus</package> - <package>gnome-menus-branding-SLED</package> - <package>gnome-menus-devel</package> - <package>gnome-menus-lang</package> - <package>gnome-mount</package> - <package>gnome-mount-lang</package> - <package>gnome-panel</package> - <package>gnome-panel-devel</package> - <package>gnome-panel-lang</package> - <package>gnome-pilot</package> - <package>gnome-pilot-devel</package> - <package>gnome-pilot-lang</package> - <package>gnome-settings-daemon</package> - <package>gnome-settings-daemon-devel</package> - <package>gnome-settings-daemon-lang</package> - <package>gnome-sharp2</package> - <package>gnome-speech</package> - <package>gnome-speech-devel</package> - <package>gnome-themes</package> - <package>gnome-utils</package> - <package>gnome-utils-devel</package> - <package>gnome-utils-lang</package> - <package>gnome-vfs-sharp2</package> - <package>gnome-vfs2</package> - <package>gnome-vfs2-devel</package> - <package>gnome-vfs2-lang</package> - <package>gnome-vfsmm</package> - <package>gnome-vfsmm-devel</package> - <package>gnopernicus</package> - <package>gnopernicus-devel</package> - <package>gnopernicus-lang</package> - <package>gnutls</package> - <package>goffice</package> - <package>goffice-devel</package> - <package>goffice-lang</package> - <package>goocanvas</package> - <package>goocanvas-devel</package> - <package>goocanvas-lang</package> - <package>goom2k4</package> - <package>goom2k4-devel</package> - <package>graphviz</package> - <package>graphviz-devel</package> - <package>graphviz-gd</package> - <package>graphviz-gnome</package> - <package>gstreamer-0_10</package> - <package>gstreamer-0_10-devel</package> - <package>gstreamer-0_10-lang</package> - <package>gstreamer-0_10-plugins-base</package> - <package>gstreamer-0_10-plugins-base-devel</package> - <package>gstreamer-0_10-plugins-base-lang</package> - <package>gstreamer-0_10-plugins-good</package> - <package>gstreamer-0_10-plugins-good-lang</package> - <package>gstreamer-0_10-utils</package> - <package>gstreamer-utils</package> - <package>gtk</package> - <package>gtk-devel</package> - <package>gtk-lang</package> - <package>gtk-sharp2</package> - <package>gtk-vnc-devel</package> - <package>gtk2-devel</package> - <package>gtkglext</package> - <package>gtkglext-devel</package> - <package>gtkhtml2</package> - <package>gtkhtml2-devel</package> - <package>gtkhtml2-lang</package> - <package>gtkhtml314-sharp</package> - <package>gtkmm2</package> - <package>gtkmm2-devel</package> - <package>gtksourceview-devel</package> - <package>gtksourceview-lang</package> - <package>gtksourceview18</package> - <package>gtksourceview18-devel</package> - <package>gtkspell</package> - <package>gtkspell-devel</package> - <package>gtkspell-lang</package> - <package>gucharmap</package> - <package>gucharmap-devel</package> - <package>gucharmap-lang</package> - <package>guile</package> - <package>guile-devel</package> - <package>gutenprint</package> - <package>gutenprint-devel</package> - <package>gvfs-devel</package> - <package>gxmhtml</package> - <package>hal-devel</package> - <package>hal-palm</package> - <package>htdig</package> - <package>htdig-devel</package> - <package>hunspell</package> - <package>hunspell-devel</package> - <package>hunspell-tools</package> - <package>hwinfo-devel</package> - <package>i4l-base</package> - <package>icewm</package> - <package>icewm-lite</package> - <package>id3lib</package> - <package>id3lib-devel</package> - <package>imap-devel</package> - <package>imap-lib</package> - <package>imlib</package> - <package>imlib-devel</package> - <package>imlib2</package> - <package>imlib2-devel</package> - <package>indent</package> - <package>info2html</package> - <package>inn</package> - <package>inn-devel</package> - <package>intltool</package> - <package>ipadic</package> - <package>iptables-devel</package> - <package>iso-codes</package> - <package>iso-codes-devel</package> - <package>iso_ent</package> - <package>ispell</package> - <package>ispell-american</package> - <package>ispell-brazilian</package> - <package>ispell-british</package> - <package>ispell-czech</package> - <package>ispell-danish</package> - <package>ispell-finnish</package> - <package>ispell-french</package> - <package>ispell-german</package> - <package>ispell-hungarian</package> - <package>ispell-italian</package> - <package>ispell-ngerman</package> - <package>ispell-norsk</package> - <package>ispell-polish</package> - <package>ispell-portuguese</package> - <package>ispell-russian</package> - <package>ispell-slovak</package> - <package>ispell-spanish</package> - <package>ispell-swedish</package> - <package>itcl-devel</package> - <package>java-1_4_2-ibm</package> - <package>java-1_4_2-ibm-devel</package> - <package>java-1_5_0-gcj-compat</package> - <package>java-1_5_0-gcj-compat-devel</package> - <package>java-1_6_0-ibm</package> - <package>java-1_6_0-ibm-devel</package> - <package>joe</package> - <package>jpackage-utils</package> - <package>k3b</package> - <package>k3b-devel</package> - <package>k3b-lang</package> - <package>kaddressbook</package> - <package>kalarm</package> - <package>kde-susetranslations</package> - <package>kde4-filesystem</package> - <package>kde4-kgreeter-plugins</package> - <package>kdebase3</package> - <package>kdebase3-devel</package> - <package>kdebase3-runtime</package> - <package>kdebase4-SLED</package> - <package>kdebase4-SLED-lang</package> - <package>kdebase4-runtime</package> - <package>kdebase4-runtime-branding-SLED</package> - <package>kdebase4-workspace</package> - <package>kdebase4-workspace-branding-SLED</package> - <package>kdebase4-workspace-devel</package> - <package>kdebase4-workspace-ksysguardd</package> - <package>kdelibs3</package> - <package>kdelibs3-arts</package> - <package>kdelibs3-default-style</package> - <package>kdelibs3-devel</package> - <package>kdelibs3-doc</package> - <package>kdelibs4</package> - <package>kdelibs4-branding-SLED</package> - <package>kdelibs4-core</package> - <package>kdelibs4-doc</package> - <package>kdemultimedia3-arts</package> - <package>kdepim3</package> - <package>kdepim4</package> - <package>kdepim4-devel</package> - <package>kdepimlibs4</package> - <package>kdialog</package> - <package>kdm</package> - <package>kdm-branding-SLED</package> - <package>kernel-docs</package> - <package>kernel-syms</package> - <package>kernel-trace-devel</package> - <package>kernel-xen-devel</package> - <package>keyutils-devel</package> - <package>kio_sysinfo</package> - <package>kio_sysinfo-branding-SLED</package> - <package>kmail</package> - <package>knode</package> - <package>kontact</package> - <package>korganizer</package> - <package>kpilot</package> - <package>krb5-devel</package> - <package>ksh-devel</package> - <package>ktorrent</package> - <package>ktorrent-devel</package> - <package>ktorrent-lang</package> - <package>kwin</package> - <package>ladspa-devel</package> - <package>lib3ds-1-3</package> - <package>lib3ds-devel</package> - <package>libFLAC++6</package> - <package>libFLAC8</package> - <package>libHX-devel</package> - <package>libMagick++-devel</package> - <package>libMagick++1</package> - <package>libMagickWand1</package> - <package>libQtWebKit-devel</package> - <package>libQtWebKit4</package> - <package>libXerces-c-devel</package> - <package>libXerces-c28</package> - <package>libXiterm</package> - <package>libXiterm-devel</package> - <package>libacl-devel</package> - <package>libadns-devel</package> - <package>libadns1</package> - <package>libakode</package> - <package>libakode-devel</package> - <package>libakonadi4</package> - <package>libakonadiprotocolinternals-devel</package> - <package>libakonadiprotocolinternals1</package> - <package>libao</package> - <package>libao-devel</package> - <package>libapparmor-devel</package> - <package>libapr-util1</package> - <package>libapr-util1-devel</package> - <package>libapr1</package> - <package>libapr1-devel</package> - <package>libarchive-devel</package> - <package>libart_lgpl</package> - <package>libart_lgpl-devel</package> - <package>libassuan-devel</package> - <package>libatomic-ops-devel</package> - <package>libattr-devel</package> - <package>libavahi-core5</package> - <package>libavahi-devel</package> - <package>libavahi-glib-devel</package> - <package>libavahi-gobject-devel</package> - <package>libavahi-gobject0</package> - <package>libavahi-ui0</package> - <package>libavc1394-0</package> - <package>libavc1394-devel</package> - <package>libbabl-0_0-0</package> - <package>libbeagle-devel</package> - <package>libbeagle-python</package> - <package>libbeagle1</package> - <package>libbitmask-devel</package> - <package>libbitmask1</package> - <package>libblkid-devel</package> - <package>libblocxx-devel</package> - <package>libbonobo</package> - <package>libbonobo-devel</package> - <package>libbonobo-lang</package> - <package>libbonoboui</package> - <package>libbonoboui-devel</package> - <package>libbonoboui-lang</package> - <package>libboost_date_time1_36_0</package> - <package>libboost_filesystem1_36_0</package> - <package>libboost_graph1_36_0</package> - <package>libboost_iostreams1_36_0</package> - <package>libboost_math1_36_0</package> - <package>libboost_mpi1_36_0</package> - <package>libboost_program_options1_36_0</package> - <package>libboost_python1_36_0</package> - <package>libboost_serialization1_36_0</package> - <package>libboost_signals1_36_0</package> - <package>libboost_system1_36_0</package> - <package>libboost_test1_36_0</package> - <package>libboost_thread1_36_0</package> - <package>libboost_wave1_36_0</package> - <package>libbotan-1_6_4</package> - <package>libbotan-devel</package> - <package>libbtctl</package> - <package>libbtctl-devel</package> - <package>libbtctl-lang</package> - <package>libbtctl4</package> - <package>libbz2-devel</package> - <package>libcaca</package> - <package>libcaca-devel</package> - <package>libcanberra-gtk</package> - <package>libcanberra-gtk0</package> - <package>libcanberra0</package> - <package>libcap-devel</package> - <package>libcap-ng0</package> - <package>libcdda_interface0</package> - <package>libcdda_paranoia0</package> - <package>libcddb-devel</package> - <package>libcddb2</package> - <package>libcdio++0</package> - <package>libcdio-devel</package> - <package>libcgroup-devel</package> - <package>libcgroup1</package> - <package>libchewing</package> - <package>libchewing-devel</package> - <package>libcmpiutil</package> - <package>libcmpiutil-devel</package> - <package>libcolorblind0</package> - <package>libcom_err-devel</package> - <package>libcompizconfig</package> - <package>libcompizconfig-devel</package> - <package>libcppunit-1_12-0</package> - <package>libcppunit-devel</package> - <package>libcpuset-devel</package> - <package>libcpuset1</package> - <package>libcroco</package> - <package>libcroco-0_6-3</package> - <package>libcroco-devel</package> - <package>libcryptsetup-devel</package> - <package>libcsync-devel</package> - <package>libcsync0</package> - <package>libcurl-devel</package> - <package>libdaemon-devel</package> - <package>libdaemon0</package> - <package>libdatrie-devel</package> - <package>libdatrie0</package> - <package>libdb-4_5-32bit</package> - <package>libdb-4_5-devel</package> - <package>libdbus-1-qt3-0</package> - <package>libdbus-1-qt3-0-devel</package> - <package>libdc1394-22</package> - <package>libdc1394-devel</package> - <package>libdc1394_control12</package> - <package>libdc1394_control12-devel</package> - <package>libdhcp6client-1_0-2</package> - <package>libdhcp6client-devel</package> - <package>libdigikam-devel</package> - <package>libdiscid1</package> - <package>libdjvulibre-devel</package> - <package>libdjvulibre21</package> - <package>libdmxview-devel</package> - <package>libdmxview0</package> - <package>libdnet-devel</package> - <package>libdnet1</package> - <package>libdns_sd</package> - <package>libdrm</package> - <package>libdrm-devel</package> - <package>libdv-devel</package> - <package>libdv4</package> - <package>libdvdread4</package> - <package>libdw-devel</package> - <package>libebl-devel</package> - <package>libedit-devel</package> - <package>libedit0</package> - <package>libelf-devel</package> - <package>libenchant1</package> - <package>libesd-devel</package> - <package>libesd0</package> - <package>libesmtp-devel</package> - <package>libevoldap-2_4-2</package> - <package>libevtlog-devel</package> - <package>libevtlog0</package> - <package>libexempi-devel</package> - <package>libexempi3</package> - <package>libexif-devel</package> - <package>libexiv2-4</package> - <package>libexiv2-devel</package> - <package>libexpat-devel</package> - <package>libext2fs-devel</package> - <package>libfarsight-0_1-3</package> - <package>libffi-devel</package> - <package>libffi43</package> - <package>libffi43-devel</package> - <package>libflaim-devel</package> - <package>libfprint-devel</package> - <package>libfreebl3</package> - <package>libfreebob</package> - <package>libfreebob-devel</package> - <package>libgadu</package> - <package>libgadu-devel</package> - <package>libgail-gnome</package> - <package>libgail-gnome-devel</package> - <package>libgcj-devel</package> - <package>libgcj43</package> - <package>libgcj43-devel</package> - <package>libgcj43-jar</package> - <package>libgcj_bc43</package> - <package>libgcrypt-devel</package> - <package>libgda-3_0-3</package> - <package>libgda-3_0-devel</package> - <package>libgdiplus0</package> - <package>libgegl-0_0-0</package> - <package>libgeoclue0</package> - <package>libgfortran46</package> - <package>libggz2</package> - <package>libggz2-devel</package> - <package>libgimpprint</package> - <package>libgimpprint-devel</package> - <package>libglade2</package> - <package>libglade2-devel</package> - <package>libglademm</package> - <package>libglademm-2_4-1</package> - <package>libglademm-devel</package> - <package>libgladeui-1-9</package> - <package>libgladeui-1_0-devel</package> - <package>libgmime-2_0-3</package> - <package>libgmime-2_4-2</package> - <package>libgmm++-devel</package> - <package>libgnome</package> - <package>libgnome-certauth0</package> - <package>libgnome-desktop-2-11</package> - <package>libgnome-devel</package> - <package>libgnome-lang</package> - <package>libgnome-menu2</package> - <package>libgnome-window-settings1</package> - <package>libgnomecanvas</package> - <package>libgnomecanvas-devel</package> - <package>libgnomecanvas-lang</package> - <package>libgnomecanvasmm</package> - <package>libgnomecanvasmm-devel</package> - <package>libgnomecups</package> - <package>libgnomecups-devel</package> - <package>libgnomecups-lang</package> - <package>libgnomedb</package> - <package>libgnomedb-devel</package> - <package>libgnomedb-lang</package> - <package>libgnomekbd</package> - <package>libgnomekbd-devel</package> - <package>libgnomekbd-lang</package> - <package>libgnomeprint</package> - <package>libgnomeprint-devel</package> - <package>libgnomeprint-lang</package> - <package>libgnomeprintui</package> - <package>libgnomeprintui-devel</package> - <package>libgnomeprintui-lang</package> - <package>libgnomesu</package> - <package>libgnomesu-devel</package> - <package>libgnomesu-lang</package> - <package>libgnomesu0</package> - <package>libgnomeui</package> - <package>libgnomeui-devel</package> - <package>libgnomeui-lang</package> - <package>libgnomevfsmm-2_6-1</package> - <package>libgnutls-devel</package> - <package>libgnutls-extra-devel</package> - <package>libgnutls-extra26</package> - <package>libgoocanvas3</package> - <package>libgpg-error-devel</package> - <package>libgpgme-devel</package> - <package>libgphoto2-devel</package> - <package>libgpod-devel</package> - <package>libgsf</package> - <package>libgsf-1-114</package> - <package>libgsf-devel</package> - <package>libgsf-gnome</package> - <package>libgsm-devel</package> - <package>libgsm1</package> - <package>libgssglue-devel</package> - <package>libgstapp-0_10-0</package> - <package>libgstinterfaces-0_10-0</package> - <package>libgstreamer-0_10-0</package> - <package>libgtk-vnc-1_0-0</package> - <package>libgtkhtml</package> - <package>libgtkhtml-devel</package> - <package>libgtksourceview-2_0-0</package> - <package>libgtop</package> - <package>libgtop-2_0-7</package> - <package>libgtop-devel</package> - <package>libgtop-lang</package> - <package>libgudev-1_0-0</package> - <package>libgweather</package> - <package>libgweather-devel</package> - <package>libgweather-lang</package> - <package>libgweather1</package> - <package>libhangul</package> - <package>libhangul-devel</package> - <package>libhowl0</package> - <package>libical-devel</package> - <package>libical0</package> - <package>libicu-devel</package> - <package>libid3tag</package> - <package>libid3tag-devel</package> - <package>libidl-devel</package> - <package>libidn-devel</package> - <package>libiec61883</package> - <package>libiec61883-devel</package> - <package>libieee1284</package> - <package>libiniparser-devel</package> - <package>libiniparser0</package> - <package>libiptcdata</package> - <package>libiptcdata-devel</package> - <package>libiptcdata0</package> - <package>libiso9660-5</package> - <package>libiterm</package> - <package>libiterm-devel</package> - <package>libjack-devel</package> - <package>libjack0</package> - <package>libjasper</package> - <package>libjasper-devel</package> - <package>libjingle-0_3-0</package> - <package>libjingle-devel</package> - <package>libjpeg-devel</package> - <package>libkcal</package> - <package>libkcal-devel</package> - <package>libkcal2</package> - <package>libkcddb4</package> - <package>libkcddb4-devel</package> - <package>libkcompactdisc4</package> - <package>libkcompactdisc4-devel</package> - <package>libkdcraw3</package> - <package>libkdcraw3-devel</package> - <package>libkdcraw3-lang</package> - <package>libkde4</package> - <package>libkde4-devel</package> - <package>libkdecore4</package> - <package>libkdecore4-devel</package> - <package>libkdepim4</package> - <package>libkdepim4-devel</package> - <package>libkdepimlibs4</package> - <package>libkdepimlibs4-devel</package> - <package>libkexiv2-3</package> - <package>libkexiv2-3-devel</package> - <package>libkexiv2-7</package> - <package>libkipi-devel</package> - <package>libkipi6</package> - <package>libkmime-devel</package> - <package>libkmime2</package> - <package>libknotificationitem-1-1</package> - <package>libkonq-devel</package> - <package>libkonq5</package> - <package>libksba-devel</package> - <package>libktnef-devel</package> - <package>libktnef1</package> - <package>liblazy-devel</package> - <package>liblazy1</package> - <package>liblcms-devel</package> - <package>libldapcpp-devel</package> - <package>liblog4c-devel</package> - <package>liblog4c3</package> - <package>libloudmouth-1-0</package> - <package>liblpsolve55</package> - <package>liblua5_1</package> - <package>libmalaga-devel</package> - <package>libmalaga7</package> - <package>libmcrypt</package> - <package>libmcrypt-devel</package> - <package>libmikmod</package> - <package>libmikmod-devel</package> - <package>libmm-devel</package> - <package>libmm14</package> - <package>libmng-devel</package> - <package>libmpcdec-devel</package> - <package>libmpcdec5</package> - <package>libmspack-devel</package> - <package>libmtp-devel</package> - <package>libmtp8</package> - <package>libmusicbrainz-devel</package> - <package>libmusicbrainz3-6</package> - <package>libmusicbrainz3-devel</package> - <package>libmusicbrainz4</package> - <package>libmysqlclient-devel</package> - <package>libmysqlclient15</package> - <package>libmysqlclient_r15</package> - <package>libneon-devel</package> - <package>libneon27</package> - <package>libnetapi-devel</package> - <package>libnetapi0</package> - <package>libnetcontrol0</package> - <package>libnetpbm-devel</package> - <package>libnetpbm10</package> - <package>libnewt0_52</package> - <package>libnjb</package> - <package>libnjb-devel</package> - <package>libnjb5</package> - <package>libnl-devel</package> - <package>libnotify</package> - <package>libnotify-devel</package> - <package>libnotify1</package> - <package>libnscd-devel</package> - <package>libnsssharedhelper0</package> - <package>libnuma-devel</package> - <package>libofa-devel</package> - <package>libofa0</package> - <package>libogg-devel</package> - <package>libogg0</package> - <package>liboil</package> - <package>liboil-devel</package> - <package>libopenbabel-devel</package> - <package>libopenbabel3</package> - <package>libopencdk-devel</package> - <package>libopencdk10</package> - <package>libopenraw-devel</package> - <package>libopenraw1</package> - <package>libopenssl-devel</package> - <package>libopensync</package> - <package>libopensync-devel</package> - <package>libopensync-plugin-evolution2</package> - <package>libopensync-plugin-evolution2-devel</package> - <package>libopensync-plugin-palm</package> - <package>libopensync-plugin-palm-devel</package> - <package>liborc-0_4-0</package> - <package>libosip2</package> - <package>libosip2-devel</package> - <package>libotf</package> - <package>libotf-devel</package> - <package>libotr-devel</package> - <package>libotr2</package> - <package>libp11-1</package> - <package>libp11-devel</package> - <package>libpackagekit-glib10</package> - <package>libpackagekit-glib10-devel</package> - <package>libpangomm-1_4-1</package> - <package>libpcap-devel</package> - <package>libpciaccess0</package> - <package>libpciaccess0-devel</package> - <package>libphonon4</package> - <package>libpisock-devel</package> - <package>libpisock9</package> - <package>libpisync-devel</package> - <package>libpisync1</package> - <package>libpixman-1-0-devel</package> - <package>libpkcs11-helper1</package> - <package>libpng-devel</package> - <package>libpolkit-qt0</package> - <package>libpoppler-devel</package> - <package>libpoppler-glib-devel</package> - <package>libpoppler-glib4</package> - <package>libpoppler-qt2</package> - <package>libpoppler-qt3-devel</package> - <package>libpoppler-qt4-3</package> - <package>libpoppler-qt4-devel</package> - <package>libpoppler5</package> - <package>libpst4</package> - <package>libpt2</package> - <package>libpt2-devel</package> - <package>libpulse-browse0</package> - <package>libpulse-devel</package> - <package>libpulse-mainloop-glib0</package> - <package>libpulse0</package> - <package>libpurple</package> - <package>libpurple-devel</package> - <package>libpurple-lang</package> - <package>libqca2</package> - <package>libqca2-devel</package> - <package>libqdialogsolver1</package> - <package>libqdialogsolver1-devel</package> - <package>libqimageblitz-devel</package> - <package>libqimageblitz4</package> - <package>libqscintilla-devel</package> - <package>libqscintilla2-5</package> - <package>libqt4</package> - <package>libqt4-devel</package> - <package>libqt4-qt3support</package> - <package>libqt4-sql</package> - <package>libqt4-sql-mysql</package> - <package>libqt4-sql-postgresql</package> - <package>libqt4-sql-sqlite</package> - <package>libqt4-sql-unixODBC</package> - <package>libqt4-x11</package> - <package>libqtpod-devel</package> - <package>libqtpod0</package> - <package>libquadmath46</package> - <package>libquicktime</package> - <package>libquicktime-devel</package> - <package>libraptor-devel</package> - <package>libraptor1</package> - <package>librasqal-devel</package> - <package>librasqal1</package> - <package>libraw1394-11</package> - <package>libraw1394-8</package> - <package>libraw1394-devel</package> - <package>libredland-devel</package> - <package>libredland0</package> - <package>libreiserfs-devel</package> - <package>libreoffice</package> - <package>libreoffice-base</package> - <package>libreoffice-branding-SLED</package> - <package>libreoffice-branding-upstream</package> - <package>libreoffice-calc</package> - <package>libreoffice-icon-themes</package> - <package>libreoffice-impress</package> - <package>libreoffice-sdk</package> - <package>libreoffice-writer</package> - <package>librsvg</package> - <package>librsvg-devel</package> - <package>libsamplerate</package> - <package>libsamplerate-devel</package> - <package>libsatsolver-devel</package> - <package>libsblim-cmpiutil1</package> - <package>libselinux-devel</package> - <package>libsemanage-devel</package> - <package>libsemanage1</package> - <package>libsensors3-devel</package> - <package>libsensors4</package> - <package>libsepol-devel</package> - <package>libsexy</package> - <package>libsexy-devel</package> - <package>libshout-devel</package> - <package>libshout3</package> - <package>libsidplay1</package> - <package>libsidplay1-devel</package> - <package>libsigc++2</package> - <package>libsigc++2-devel</package> - <package>libslab-lang</package> - <package>libslab0</package> - <package>libsmbclient-devel</package> - <package>libsmbios-devel</package> - <package>libsmbsharemodes-devel</package> - <package>libsmbsharemodes0</package> - <package>libsndfile</package> - <package>libsndfile-devel</package> - <package>libsoprano-devel</package> - <package>libsoprano4</package> - <package>libsoup-devel</package> - <package>libspectre-devel</package> - <package>libspectre1</package> - <package>libspeex</package> - <package>libssh2-devel</package> - <package>libstrigi0</package> - <package>libstroke</package> - <package>libstroke-devel</package> - <package>libsyncml-devel</package> - <package>libsyncml0</package> - <package>libtalloc-devel</package> - <package>libtasn1-devel</package> - <package>libtdb-devel</package> - <package>libtelepathy</package> - <package>libtelepathy-devel</package> - <package>libtelepathy-glib0</package> - <package>libtheora-devel</package> - <package>libtheora0</package> - <package>libtidy</package> - <package>libtidy-devel</package> - <package>libtiff-devel</package> - <package>libtirpc-devel</package> - <package>libtomoe-gtk0</package> - <package>libtspi1</package> - <package>libtunepimp</package> - <package>libtunepimp-devel</package> - <package>libtunepimp5</package> - <package>libudev-devel</package> - <package>libudf0</package> - <package>libunique-1_0-0</package> - <package>libunwind</package> - <package>libunwind-devel</package> - <package>libupsclient1</package> - <package>libusb-devel</package> - <package>libusbpp-0_1-4</package> - <package>libustr-1_0-1</package> - <package>libustr-devel</package> - <package>libuuid-devel</package> - <package>libvirt-client</package> - <package>libvirt-devel</package> - <package>libvisual</package> - <package>libvisual-devel</package> - <package>libvoikko-devel</package> - <package>libvoikko1</package> - <package>libvorbis</package> - <package>libvorbis-devel</package> - <package>libwavpack1</package> - <package>libwbclient-devel</package> - <package>libwbxml2-0</package> - <package>libwbxml2-devel</package> - <package>libwebkit-1_0-1</package> - <package>libwebkit-1_0-2</package> - <package>libwebkit-devel</package> - <package>libwebkit-lang</package> - <package>libwmf</package> - <package>libwmf-devel</package> - <package>libwmf-gnome</package> - <package>libwnck</package> - <package>libwnck-1-22</package> - <package>libwnck-devel</package> - <package>libwnck-lang</package> - <package>libwpd-0_8-8</package> - <package>libwpd-devel</package> - <package>libwpg-0_1-1</package> - <package>libwpg-devel</package> - <package>libwps-0_1-1</package> - <package>libwps-devel</package> - <package>libwsman-devel</package> - <package>libwsman1</package> - <package>libxcrypt-devel</package> - <package>libxine-devel</package> - <package>libxine1</package> - <package>libxklavier-devel</package> - <package>libxklavier15</package> - <package>libxml2-devel</package> - <package>libxslt-devel</package> - <package>libyajl1</package> - <package>libzio-devel</package> - <package>libzip-devel</package> - <package>libzip1</package> - <package>libzvbi0</package> - <package>libzypp-devel</package> - <package>limal-apparmor-notifications</package> - <package>limal-apparmor-notifications-devel</package> - <package>limal-ca-mgm-devel</package> - <package>limal-devel</package> - <package>limal-devtools</package> - <package>limal-nfs-server-devel</package> - <package>linux-atm-devel</package> - <package>linux-atm-lib</package> - <package>lksctp-tools</package> - <package>lksctp-tools-devel</package> - <package>loudmouth-devel</package> - <package>lua</package> - <package>lua-devel</package> - <package>lzo-devel</package> - <package>m17n-db</package> - <package>m17n-lib</package> - <package>m17n-lib-devel</package> - <package>malaga-suomi</package> - <package>meanwhile</package> - <package>meanwhile-devel</package> - <package>metacity</package> - <package>metacity-devel</package> - <package>metacity-lang</package> - <package>mhash</package> - <package>mhash-devel</package> - <package>misc-console-font</package> - <package>mono-addins</package> - <package>mono-basic</package> - <package>mono-core</package> - <package>mono-data</package> - <package>mono-data-oracle</package> - <package>mono-data-sqlite</package> - <package>mono-devel</package> - <package>mono-extras</package> - <package>mono-jscript</package> - <package>mono-tools</package> - <package>mono-wcf</package> - <package>mono-web</package> - <package>mono-winforms</package> - <package>mono-zeroconf</package> - <package>mono-zeroconf-provider-avahi</package> - <package>monodevelop</package> - <package>monodoc-core</package> - <package>mozilla-nspr</package> - <package>mozilla-nspr-devel</package> - <package>mozilla-nss</package> - <package>mozilla-nss-devel</package> - <package>mozilla-xulrunner192</package> - <package>mozilla-xulrunner192-gnome</package> - <package>mpfr-devel</package> - <package>mpi-selector</package> - <package>mpich</package> - <package>mpich-devel</package> - <package>mysql</package> - <package>mysql-client</package> - <package>nagios</package> - <package>nagios-devel</package> - <package>nagios-www</package> - <package>nant</package> - <package>nautilus</package> - <package>nautilus-cd-burner</package> - <package>nautilus-cd-burner-devel</package> - <package>nautilus-cd-burner-lang</package> - <package>nautilus-devel</package> - <package>nautilus-lang</package> - <package>ndesk-dbus</package> - <package>ndesk-dbus-glib</package> - <package>ndesk-dbus-glib-devel</package> - <package>net-snmp</package> - <package>net-snmp-devel</package> - <package>netatalk</package> - <package>netatalk-devel</package> - <package>netcat-openbsd</package> - <package>newt</package> - <package>newt-devel</package> - <package>newt-static</package> - <package>nfsidmap-devel</package> - <package>notification-daemon</package> - <package>notification-daemon-lang</package> - <package>notify-sharp</package> - <package>nss-mdns</package> - <package>nss-shared-helper-devel</package> - <package>nut</package> - <package>nut-classic</package> - <package>nut-devel</package> - <package>opal</package> - <package>opal-devel</package> - <package>openCryptoki</package> - <package>openCryptoki-64bit</package> - <package>openCryptoki-devel</package> - <package>openct-devel</package> - <package>openhpi</package> - <package>openhpi-daemon</package> - <package>openhpi-devel</package> - <package>openjade</package> - <package>openjade-devel</package> - <package>openldap2-devel</package> - <package>openmotif-devel</package> - <package>openmotif-libs</package> - <package>openmpi</package> - <package>openobex-devel</package> - <package>openobex-glib-devel</package> - <package>opensc-devel</package> - <package>openslp-devel</package> - <package>opensp</package> - <package>opensp-devel</package> - <package>openwsman-client</package> - <package>openwsman-server</package> - <package>orbit</package> - <package>orbit-devel</package> - <package>orbit2-devel</package> - <package>oxygen-icon-theme</package> - <package>oxygen-icon-theme-scalable</package> - <package>ozerocdoff</package> - <package>pam-devel</package> - <package>pango-devel</package> - <package>pangomm-devel</package> - <package>parted-devel</package> - <package>patchutils</package> - <package>pciutils-devel</package> - <package>pcre-devel</package> - <package>pcsc-acr38</package> - <package>pcsc-acr38-devel</package> - <package>pcsc-lite-devel</package> - <package>perl-32bit</package> - <package>perl-Crypt-OpenSSL-RSA</package> - <package>perl-Mail-DKIM</package> - <package>perl-MailTools</package> - <package>perl-Net-DNS</package> - <package>perl-Net-IP</package> - <package>perl-NetAddr-IP</package> - <package>perl-SNMP</package> - <package>perl-Tie-IxHash</package> - <package>perl-Tk</package> - <package>perl-Tk-devel</package> - <package>perl-spamassassin</package> - <package>phonon</package> - <package>phonon-backend-gstreamer-0_10</package> - <package>phonon-devel</package> - <package>php5</package> - <package>php5-ctype</package> - <package>php5-devel</package> - <package>php5-dom</package> - <package>php5-hash</package> - <package>php5-iconv</package> - <package>php5-json</package> - <package>php5-pdo</package> - <package>php5-sqlite</package> - <package>php5-suhosin</package> - <package>php5-tokenizer</package> - <package>php5-xmlreader</package> - <package>php5-xmlwriter</package> - <package>php53</package> - <package>php53-ctype</package> - <package>php53-dom</package> - <package>php53-iconv</package> - <package>php53-json</package> - <package>php53-tokenizer</package> - <package>php53-xmlreader</package> - <package>php53-xmlwriter</package> - <package>pidgin</package> - <package>pidgin-devel</package> - <package>pilot-link</package> - <package>pkcs11-helper</package> - <package>pkcs11-helper-devel</package> - <package>planner</package> - <package>planner-devel</package> - <package>planner-lang</package> - <package>plasma-addons</package> - <package>plasma-theme-aya</package> - <package>plasmoid-networkmanagement</package> - <package>plasmoid-quickaccess</package> - <package>plotutils</package> - <package>poppler-data</package> - <package>poppler-tools</package> - <package>popt-devel</package> - <package>portmap</package> - <package>postfix-devel</package> - <package>postgresql-devel</package> - <package>postgresql-libs</package> - <package>ppp-devel</package> - <package>ppp-userpass</package> - <package>pstoedit</package> - <package>pstoedit-devel</package> - <package>pulseaudio</package> - <package>pulseaudio-esound-compat</package> - <package>pulseaudio-lang</package> - <package>puppet</package> - <package>python-cairo</package> - <package>python-cairo-devel</package> - <package>python-devel</package> - <package>python-gnome</package> - <package>python-gnome-devel</package> - <package>python-gobject2</package> - <package>python-gobject2-devel</package> - <package>python-gtk</package> - <package>python-gtk-devel</package> - <package>python-gtkglext</package> - <package>python-gtkglext-devel</package> - <package>python-gtksourceview</package> - <package>python-gtksourceview-devel</package> - <package>python-numeric</package> - <package>python-numpy</package> - <package>python-orbit</package> - <package>python-orbit-devel</package> - <package>pyxml</package> - <package>qt3</package> - <package>qt3-devel</package> - <package>quagga</package> - <package>quagga-devel</package> - <package>quilt</package> - <package>raptor</package> - <package>rarian</package> - <package>rarian-devel</package> - <package>re2c</package> - <package>readline-devel</package> - <package>recode-devel</package> - <package>rpm-devel</package> - <package>rrdtool</package> - <package>rrdtool-devel</package> - <package>rsyslog</package> - <package>ruby</package> - <package>rubygems</package> - <package>ruby-devel</package> - <package>ruby-doc-html</package> - <package>ruby-doc-ri</package> - <package>ruby-examples</package> - <package>ruby-fcgi</package> - <package>ruby-mysql</package> - <package>ruby-selinux</package> - <package>ruby-test-suite</package> - <package>ruby-tk</package> - <package>sablot</package> - <package>sablot-devel</package> - <package>samba-devel</package> - <package>sane-backends</package> - <package>sane-frontends</package> - <package>sax2-libsax</package> - <package>sax2-libsax-devel</package> - <package>sax2-libsax-perl</package> - <package>sax2-tools</package> - <package>sblim-cmpi-base</package> - <package>sblim-cmpi-base-devel</package> - <package>sblim-cmpi-devel</package> - <package>sblim-cmpiutil-devel</package> - <package>sblim-indication_helper</package> - <package>sblim-sfcb</package> - <package>sblim-sfcc</package> - <package>sblim-sfcc-devel</package> - <package>scim</package> - <package>scim-devel</package> - <package>scpm-devel</package> - <package>scrollkeeper</package> - <package>scrollkeeper-lang</package> - <package>seahorse</package> - <package>seahorse-devel</package> - <package>seahorse-lang</package> - <package>sendmail</package> - <package>sendmail-devel</package> - <package>sg3_utils-devel</package> - <package>sgml-skel</package> - <package>shared-mime-info</package> - <package>silc-toolkit</package> - <package>silc-toolkit-devel</package> - <package>slang</package> - <package>slang-devel</package> - <package>soprano</package> - <package>soprano-backend-redland</package> - <package>spamassassin</package> - <package>speex-devel</package> - <package>splashy-devel</package> - <package>sqlite2</package> - <package>sqlite3-devel</package> - <package>startup-notification</package> - <package>startup-notification-devel</package> - <package>strigi</package> - <package>strigi-devel</package> - <package>subversion</package> - <package>subversion-perl</package> - <package>susehelp</package> - <package>susehelp_cz</package> - <package>susehelp_de</package> - <package>susehelp_en</package> - <package>susehelp_es</package> - <package>susehelp_fr</package> - <package>susehelp_hu</package> - <package>susehelp_it</package> - <package>swig</package> - <package>syslogd</package> - <package>t1lib</package> - <package>t1lib-devel</package> - <package>taglib</package> - <package>taglib-devel</package> - <package>taglib-sharp</package> - <package>tango-icon-theme</package> - <package>tcl-devel</package> - <package>tcpd-devel</package> - <package>telepathy-glib-devel</package> - <package>telepathy-mission-control</package> - <package>telepathy-mission-control-devel</package> - <package>texlive-bin-devel</package> - <package>texlive-devel</package> - <package>tk-devel</package> - <package>tla</package> - <package>tn5250</package> - <package>tn5250-devel</package> - <package>tomoe</package> - <package>tomoe-devel</package> - <package>tomoe-gtk</package> - <package>tomoe-gtk-devel</package> - <package>tomoe-gtk-lang</package> - <package>totem-pl-parser</package> - <package>totem-pl-parser-devel</package> - <package>totem-pl-parser-lang</package> - <package>trousers</package> - <package>trousers-devel</package> - <package>tsclient</package> - <package>tsclient-devel</package> - <package>tsclient-lang</package> - <package>uim</package> - <package>uim-devel</package> - <package>unixODBC</package> - <package>unixODBC-devel</package> - <package>unsermake</package> - <package>update-desktop-files</package> - <package>usb_modeswitch</package> - <package>usb_modeswitch-data</package> - <package>valgrind</package> - <package>valgrind-devel</package> - <package>vte</package> - <package>vte-devel</package> - <package>vte-lang</package> - <package>wdiff</package> - <package>webkit-sharp</package> - <package>wireshark</package> - <package>wireshark-devel</package> - <package>wodim-devel</package> - <package>wordcut</package> - <package>wordcut-devel</package> - <package>words</package> - <package>wpa_supplicant</package> - <package>wvstreams</package> - <package>wvstreams-devel</package> - <package>wxGTK-compat</package> - <package>wxGTK-devel</package> - <package>wxGTK-gl</package> - <package>x11-input-wacom</package> - <package>x11-input-wacom-devel</package> - <package>x11-input-wacom-tools</package> - <package>xalan-j2</package> - <package>xaw3d-devel</package> - <package>xbase</package> - <package>xbase-devel</package> - <package>xdelta</package> - <package>xdelta-devel</package> - <package>xdg-menu</package> - <package>xen-devel</package> - <package>xen-libs</package> - <package>xerces-j2</package> - <package>xerces-j2-bootstrap</package> - <package>xerces-j2-xml-apis</package> - <package>xfsprogs-devel</package> - <package>xml-commons-apis-bootstrap</package> - <package>xml-commons-resolver-bootstrap</package> - <package>xml-commons-which-bootstrap</package> - <package>xmlcharent</package> - <package>xorg-x11</package> - <package>xorg-x11-devel</package> - <package>xorg-x11-fonts</package> - <package>xorg-x11-fonts-core</package> - <package>xorg-x11-fonts-devel</package> - <package>xorg-x11-libICE-devel</package> - <package>xorg-x11-libSM-devel</package> - <package>xorg-x11-libX11-devel</package> - <package>xorg-x11-libXau-devel</package> - <package>xorg-x11-libXdmcp-devel</package> - <package>xorg-x11-libXext-devel</package> - <package>xorg-x11-libXfixes-devel</package> - <package>xorg-x11-libXmu-devel</package> - <package>xorg-x11-libXp-devel</package> - <package>xorg-x11-libXpm-devel</package> - <package>xorg-x11-libXprintUtil-devel</package> - <package>xorg-x11-libXrender-devel</package> - <package>xorg-x11-libXt-devel</package> - <package>xorg-x11-libXv-devel</package> - <package>xorg-x11-libfontenc-devel</package> - <package>xorg-x11-libxcb-devel</package> - <package>xorg-x11-libxkbfile-devel</package> - <package>xorg-x11-proto-devel</package> - <package>xorg-x11-server</package> - <package>xorg-x11-util-devel</package> - <package>xorg-x11-xauth</package> - <package>xorg-x11-xtrans-devel</package> - <package>xosd</package> - <package>xosd-devel</package> - <package>xsp</package> - <package>xterm</package> - <package>xz-devel</package> - <package>yast2-core-devel</package> - <package>yast2-devtools</package> - <package>yast2-gtk</package> - <package>yast2-libyui-devel</package> - <package>yast2-ncurses-devel</package> - <package>yast2-qt</package> - <package>yast2-qt-devel</package> - <package>yast2-qt-pkg</package> - <package>yast2-storage-devel</package> - <package>yast2-ycp-ui-bindings-devel</package> - <package>yelp</package> - <package>yelp-lang</package> - <package>zenity</package> - <package>zenity-lang</package> - <package>zlib-devel</package> - <package>zsh</package> - <package>zvbi-devel</package> - </remove-packages> - - </software> - <user_defaults> - <expire></expire> - <group>100</group> - <groups>video,dialout</groups> - <home>/home</home> - <inactive>-1</inactive> - <shell>/bin/bash</shell> - <skel>/etc/skel</skel> - <umask>022</umask> - </user_defaults> - <users config:type="list"> - <user> - <encrypted config:type="boolean">true</encrypted> - <fullname>vagrant</fullname> - <gid>100</gid> - <home>/home/vagrant</home> - <password_settings> - <expire></expire> - <flag></flag> - <inact></inact> - <max>99999</max> - <min>0</min> - <warn>7</warn> - </password_settings> - <shell>/bin/bash</shell> - <uid>1000</uid> - <user_password>$2y$05$NA1Li9ZKJOLRW5mMTXm6/e5r8dltWS5RpDZpvHrI82aLE00V51tdi</user_password> - <username>vagrant</username> - </user> - <user> - <encrypted config:type="boolean">true</encrypted> - <fullname>Games account</fullname> - <gid>100</gid> - <home>/var/games</home> - <password_settings> - <expire></expire> - <flag></flag> - <inact></inact> - <max></max> - <min></min> - <warn></warn> - </password_settings> - <shell>/bin/bash</shell> - <uid>12</uid> - <user_password>*</user_password> - <username>games</username> - </user> - <user> - <encrypted config:type="boolean">true</encrypted> - <fullname>bin</fullname> - <gid>1</gid> - <home>/bin</home> - <password_settings> - <expire></expire> - <flag></flag> - <inact></inact> - <max></max> - <min></min> - <warn></warn> - </password_settings> - <shell>/bin/bash</shell> - <uid>1</uid> - <user_password>*</user_password> - <username>bin</username> - </user> - <user> - <encrypted config:type="boolean">true</encrypted> - <fullname>nobody</fullname> - <gid>65533</gid> - <home>/var/lib/nobody</home> - <password_settings> - <expire></expire> - <flag></flag> - <inact></inact> - <max></max> - <min></min> - <warn></warn> - </password_settings> - <shell>/bin/bash</shell> - <uid>65534</uid> - <user_password>*</user_password> - <username>nobody</username> - </user> - <user> - <encrypted config:type="boolean">true</encrypted> - <fullname>Printing daemon</fullname> - <gid>7</gid> - <home>/var/spool/lpd</home> - <password_settings> - <expire></expire> - <flag></flag> - <inact></inact> - <max></max> - <min></min> - <warn></warn> - </password_settings> - <shell>/bin/bash</shell> - <uid>4</uid> - <user_password>*</user_password> - <username>lp</username> - </user> - <user> - <encrypted config:type="boolean">true</encrypted> - <fullname>User for uuidd</fullname> - <gid>104</gid> - <home>/var/run/uuidd</home> - <password_settings> - <expire></expire> - <flag></flag> - <inact></inact> - <max>99999</max> - <min>0</min> - <warn>7</warn> - </password_settings> - <shell>/bin/false</shell> - <uid>102</uid> - <user_password>*</user_password> - <username>uuidd</username> - </user> - <user> - <encrypted config:type="boolean">true</encrypted> - <fullname>Postfix Daemon</fullname> - <gid>51</gid> - <home>/var/spool/postfix</home> - <password_settings> - <expire></expire> - <flag></flag> - <inact></inact> - <max>99999</max> - <min>0</min> - <warn>7</warn> - </password_settings> - <shell>/bin/false</shell> - <uid>51</uid> - <user_password>*</user_password> - <username>postfix</username> - </user> - <user> - <encrypted config:type="boolean">true</encrypted> - <fullname>Novell Customer Center User</fullname> - <gid>111</gid> - <home>/var/lib/YaST2/suse-ncc-fakehome</home> - <password_settings> - <expire></expire> - <flag></flag> - <inact></inact> - <max>99999</max> - <min>0</min> - <warn>7</warn> - </password_settings> - <shell>/bin/bash</shell> - <uid>106</uid> - <user_password>*</user_password> - <username>suse-ncc</username> - </user> - <user> - <encrypted config:type="boolean">true</encrypted> - <fullname>FTP account</fullname> - <gid>49</gid> - <home>/srv/ftp</home> - <password_settings> - <expire></expire> - <flag></flag> - <inact></inact> - <max></max> - <min></min> - <warn></warn> - </password_settings> - <shell>/bin/bash</shell> - <uid>40</uid> - <user_password>*</user_password> - <username>ftp</username> - </user> - <user> - <encrypted config:type="boolean">true</encrypted> - <fullname>Gnome Display Manager daemon</fullname> - <gid>112</gid> - <home>/var/lib/gdm</home> - <password_settings> - <expire></expire> - <flag></flag> - <inact></inact> - <max>99999</max> - <min>0</min> - <warn>7</warn> - </password_settings> - <shell>/bin/false</shell> - <uid>107</uid> - <user_password>*</user_password> - <username>gdm</username> - </user> - <user> - <encrypted config:type="boolean">true</encrypted> - <fullname>Batch jobs daemon</fullname> - <gid>25</gid> - <home>/var/spool/atjobs</home> - <password_settings> - <expire></expire> - <flag></flag> - <inact></inact> - <max>99999</max> - <min>0</min> - <warn>7</warn> - </password_settings> - <shell>/bin/bash</shell> - <uid>25</uid> - <user_password>*</user_password> - <username>at</username> - </user> - <user> - <encrypted config:type="boolean">true</encrypted> - <fullname>root</fullname> - <gid>0</gid> - <home>/root</home> - <password_settings> - <expire></expire> - <flag></flag> - <inact></inact> - <max></max> - <min></min> - <warn></warn> - </password_settings> - <shell>/bin/bash</shell> - <uid>0</uid> - <user_password>$2y$05$NA1Li9ZKJOLRW5mMTXm6/e5r8dltWS5RpDZpvHrI82aLE00V51tdi</user_password> - <username>root</username> - </user> - <user> - <encrypted config:type="boolean">true</encrypted> - <fullname>Mailer daemon</fullname> - <gid>12</gid> - <home>/var/spool/clientmqueue</home> - <password_settings> - <expire></expire> - <flag></flag> - <inact></inact> - <max></max> - <min></min> - <warn></warn> - </password_settings> - <shell>/bin/false</shell> - <uid>8</uid> - <user_password>*</user_password> - <username>mail</username> - </user> - <user> - <encrypted config:type="boolean">true</encrypted> - <fullname>Daemon</fullname> - <gid>2</gid> - <home>/sbin</home> - <password_settings> - <expire></expire> - <flag></flag> - <inact></inact> - <max></max> - <min></min> - <warn></warn> - </password_settings> - <shell>/bin/bash</shell> - <uid>2</uid> - <user_password>*</user_password> - <username>daemon</username> - </user> - <user> - <encrypted config:type="boolean">true</encrypted> - <fullname>NTP daemon</fullname> - <gid>108</gid> - <home>/var/lib/ntp</home> - <password_settings> - <expire></expire> - <flag></flag> - <inact></inact> - <max>99999</max> - <min>0</min> - <warn>7</warn> - </password_settings> - <shell>/bin/false</shell> - <uid>74</uid> - <user_password>*</user_password> - <username>ntp</username> - </user> - <user> - <encrypted config:type="boolean">true</encrypted> - <fullname>Unix-to-Unix CoPy system</fullname> - <gid>14</gid> - <home>/etc/uucp</home> - <password_settings> - <expire></expire> - <flag></flag> - <inact></inact> - <max></max> - <min></min> - <warn></warn> - </password_settings> - <shell>/bin/bash</shell> - <uid>10</uid> - <user_password>*</user_password> - <username>uucp</username> - </user> - <user> - <encrypted config:type="boolean">true</encrypted> - <fullname>User for D-Bus</fullname> - <gid>101</gid> - <home>/var/run/dbus</home> - <password_settings> - <expire></expire> - <flag></flag> - <inact></inact> - <max></max> - <min>0</min> - <warn>7</warn> - </password_settings> - <shell>/bin/false</shell> - <uid>100</uid> - <user_password>*</user_password> - <username>messagebus</username> - </user> - <user> - <encrypted config:type="boolean">true</encrypted> - <fullname>User for haldaemon</fullname> - <gid>102</gid> - <home>/var/run/hald</home> - <password_settings> - <expire></expire> - <flag></flag> - <inact></inact> - <max></max> - <min>0</min> - <warn>7</warn> - </password_settings> - <shell>/bin/false</shell> - <uid>101</uid> - <user_password>*</user_password> - <username>haldaemon</username> - </user> - <user> - <encrypted config:type="boolean">true</encrypted> - <fullname>WWW daemon apache</fullname> - <gid>8</gid> - <home>/var/lib/wwwrun</home> - <password_settings> - <expire></expire> - <flag></flag> - <inact></inact> - <max></max> - <min></min> - <warn></warn> - </password_settings> - <shell>/bin/false</shell> - <uid>30</uid> - <user_password>*</user_password> - <username>wwwrun</username> - </user> - <user> - <encrypted config:type="boolean">true</encrypted> - <fullname>Manual pages viewer</fullname> - <gid>62</gid> - <home>/var/cache/man</home> - <password_settings> - <expire></expire> - <flag></flag> - <inact></inact> - <max></max> - <min></min> - <warn></warn> - </password_settings> - <shell>/bin/bash</shell> - <uid>13</uid> - <user_password>*</user_password> - <username>man</username> - </user> - <user> - <encrypted config:type="boolean">true</encrypted> - <fullname>PolicyKit</fullname> - <gid>107</gid> - <home>/var/run/PolicyKit</home> - <password_settings> - <expire></expire> - <flag></flag> - <inact></inact> - <max>99999</max> - <min>0</min> - <warn>7</warn> - </password_settings> - <shell>/bin/false</shell> - <uid>104</uid> - <user_password>*</user_password> - <username>polkituser</username> - </user> - <user> - <encrypted config:type="boolean">true</encrypted> - <fullname>News system</fullname> - <gid>13</gid> - <home>/etc/news</home> - <password_settings> - <expire></expire> - <flag></flag> - <inact></inact> - <max></max> - <min></min> - <warn></warn> - </password_settings> - <shell>/bin/bash</shell> - <uid>9</uid> - <user_password>*</user_password> - <username>news</username> - </user> - <user> - <fullname>SSH daemon</fullname> - <gid>65</gid> - <home>/var/lib/sshd</home> - <shell>/bin/false</shell> - <uid>71</uid> - <username>sshd</username> - </user> - <user> - <encrypted config:type="boolean">true</encrypted> - <fullname>PulseAudio daemon</fullname> - <gid>109</gid> - <home>/var/lib/pulseaudio</home> - <password_settings> - <expire></expire> - <flag></flag> - <inact></inact> - <max>99999</max> - <min>0</min> - <warn>7</warn> - </password_settings> - <shell>/bin/false</shell> - <uid>105</uid> - <user_password>*</user_password> - <username>pulse</username> - </user> - </users> -</profile> diff --git a/http/sles-11/sles-11-sp3-i386-autoinst.xml b/http/sles-11/sles-11-sp3-i386-autoinst.xml deleted file mode 100644 index 38f6040dd..000000000 --- a/http/sles-11/sles-11-sp3-i386-autoinst.xml +++ /dev/null @@ -1,190 +0,0 @@ -<?xml version="1.0"?> -<!DOCTYPE profile> -<profile xmlns="http://www.suse.com/1.0/yast2ns" xmlns:config="http://www.suse.com/1.0/configns"> - <add-on> - <add_on_products config:type="list"> - <!-- should not be neccessary for a minimal installation --> - <!-- <listentry> - <media_url><![CDATA[http://demeter.uni-regensburg.de/SLE11SP3-SDK-x86/DVD1/]]></media_url> - <product>sle-sdk</product> - <product_dir>/</product_dir> - </listentry> --> - </add_on_products> - </add-on> - <general> - <ask-list config:type="list"/> - <mode> - <confirm config:type="boolean">false</confirm> - </mode> - <mouse> - <id>none</id> - </mouse> - <proposals config:type="list"/> - <signature-handling> - <accept_file_without_checksum config:type="boolean">true</accept_file_without_checksum> - <accept_non_trusted_gpg_key config:type="boolean">true</accept_non_trusted_gpg_key> - <accept_unknown_gpg_key config:type="boolean">true</accept_unknown_gpg_key> - <accept_unsigned_file config:type="boolean">true</accept_unsigned_file> - <accept_verification_failed config:type="boolean">false</accept_verification_failed> - <import_gpg_key config:type="boolean">true</import_gpg_key> - </signature-handling> - <storage/> - </general> - <login_settings/> - <networking> - <dhcp_options> - <dhclient_client_id></dhclient_client_id> - <dhclient_hostname_option>AUTO</dhclient_hostname_option> - </dhcp_options> - <dns> - <dhcp_hostname config:type="boolean">false</dhcp_hostname> - <domain>vagrantup.com</domain> - <hostname>vagrant-sles-11sp3-x86</hostname> - <resolv_conf_policy>auto</resolv_conf_policy> - <searchlist config:type="list"> - <search>vagrantup.com</search> - </searchlist> - <write_hostname config:type="boolean">true</write_hostname> - </dns> - <interfaces config:type="list"> - <interface> - <bootproto>dhcp</bootproto> - <device>eth0</device> - <startmode>auto</startmode> - <usercontrol>no</usercontrol> - </interface> - </interfaces> - <keep_install_network config:type="boolean">true</keep_install_network> - <managed config:type="boolean">false</managed> - <routing> - <ip_forward config:type="boolean">false</ip_forward> - </routing> - </networking> - <partitioning config:type="list"> - <drive> - <initialize config:type="boolean">true</initialize> - <partitions config:type="list"> - <partition> - <create config:type="boolean">true</create> - <crypt_fs config:type="boolean">false</crypt_fs> - <filesystem config:type="symbol">swap</filesystem> - <format config:type="boolean">true</format> - <fstopt>defaults</fstopt> - <loop_fs config:type="boolean">false</loop_fs> - <mount>swap</mount> - <mountby config:type="symbol">device</mountby> - <partition_id config:type="integer">130</partition_id> - <partition_nr config:type="integer">1</partition_nr> - <raid_options/> - <resize config:type="boolean">false</resize> - <size>1561492992</size> - </partition> - <partition> - <create config:type="boolean">true</create> - <crypt_fs config:type="boolean">false</crypt_fs> - <filesystem config:type="symbol">ext3</filesystem> - <format config:type="boolean">true</format> - <fstopt>acl,user_xattr</fstopt> - <loop_fs config:type="boolean">false</loop_fs> - <mount>/</mount> - <mountby config:type="symbol">device</mountby> - <partition_id config:type="integer">131</partition_id> - <partition_nr config:type="integer">2</partition_nr> - <raid_options/> - <resize config:type="boolean">false</resize> - <size>19895844352</size> - </partition> - </partitions> - <pesize></pesize> - <type config:type="symbol">CT_DISK</type> - <use>all</use> - </drive> - </partitioning> - <report> - <errors> - <log config:type="boolean">true</log> - <show config:type="boolean">true</show> - <timeout config:type="integer">0</timeout> - </errors> - <messages> - <log config:type="boolean">true</log> - <show config:type="boolean">true</show> - <timeout config:type="integer">0</timeout> - </messages> - <warnings> - <log config:type="boolean">true</log> - <show config:type="boolean">true</show> - <timeout config:type="integer">0</timeout> - </warnings> - <yesno_messages> - <log config:type="boolean">true</log> - <show config:type="boolean">true</show> - <timeout config:type="integer">0</timeout> - </yesno_messages> - </report> - <software> - - <packages config:type="list"> - <package>openssh</package> - <package>kernel-default-devel</package> - <package>sudo</package> - <package>gcc</package> - <package>wget</package> - <package>make</package> - </packages> - <patterns config:type="list"> - <pattern>Minimal</pattern> - <pattern>apparmor</pattern> - </patterns> - <remove-packages config:type="list"> - </remove-packages> - </software> - <user_defaults> - <expire></expire> - <group>100</group> - <groups>video,dialout</groups> - <home>/home</home> - <inactive>-1</inactive> - <shell>/bin/bash</shell> - <skel>/etc/skel</skel> - <umask>022</umask> - </user_defaults> - <users config:type="list"> - <user> - <encrypted config:type="boolean">true</encrypted> - <fullname>vagrant</fullname> - <gid>100</gid> - <home>/home/vagrant</home> - <password_settings> - <expire></expire> - <flag></flag> - <inact></inact> - <max>99999</max> - <min>0</min> - <warn>7</warn> - </password_settings> - <shell>/bin/bash</shell> - <uid>1000</uid> - <user_password>$2y$05$NA1Li9ZKJOLRW5mMTXm6/e5r8dltWS5RpDZpvHrI82aLE00V51tdi</user_password> - <username>vagrant</username> - </user> - <user> - <encrypted config:type="boolean">true</encrypted> - <fullname>root</fullname> - <gid>0</gid> - <home>/root</home> - <password_settings> - <expire></expire> - <flag></flag> - <inact></inact> - <max></max> - <min></min> - <warn></warn> - </password_settings> - <shell>/bin/bash</shell> - <uid>0</uid> - <user_password>$2y$05$NA1Li9ZKJOLRW5mMTXm6/e5r8dltWS5RpDZpvHrI82aLE00V51tdi</user_password> - <username>root</username> - </user> - </users> -</profile> diff --git a/http/sles-11/sles-11-sp3-x86_64-autoinst.xml b/http/sles-11/sles-11-sp3-x86_64-autoinst.xml deleted file mode 100644 index ab4dcbb37..000000000 --- a/http/sles-11/sles-11-sp3-x86_64-autoinst.xml +++ /dev/null @@ -1,190 +0,0 @@ -<?xml version="1.0"?> -<!DOCTYPE profile> -<profile xmlns="http://www.suse.com/1.0/yast2ns" xmlns:config="http://www.suse.com/1.0/configns"> - <add-on> - <add_on_products config:type="list"> - <!-- should not be neccessary for a minimal installation --> - <!-- <listentry> - <media_url><![CDATA[http://demeter.uni-regensburg.de/SLE11SP3-SDK-x64/DVD1/]]></media_url> - <product>sle-sdk</product> - <product_dir>/</product_dir> - </listentry> --> - </add_on_products> - </add-on> - <general> - <ask-list config:type="list"/> - <mode> - <confirm config:type="boolean">false</confirm> - </mode> - <mouse> - <id>none</id> - </mouse> - <proposals config:type="list"/> - <signature-handling> - <accept_file_without_checksum config:type="boolean">true</accept_file_without_checksum> - <accept_non_trusted_gpg_key config:type="boolean">true</accept_non_trusted_gpg_key> - <accept_unknown_gpg_key config:type="boolean">true</accept_unknown_gpg_key> - <accept_unsigned_file config:type="boolean">true</accept_unsigned_file> - <accept_verification_failed config:type="boolean">false</accept_verification_failed> - <import_gpg_key config:type="boolean">true</import_gpg_key> - </signature-handling> - <storage/> - </general> - <login_settings/> - <networking> - <dhcp_options> - <dhclient_client_id></dhclient_client_id> - <dhclient_hostname_option>AUTO</dhclient_hostname_option> - </dhcp_options> - <dns> - <dhcp_hostname config:type="boolean">false</dhcp_hostname> - <domain>vagrantup.com</domain> - <hostname>vagrant-sles-11sp3-x64</hostname> - <resolv_conf_policy>auto</resolv_conf_policy> - <searchlist config:type="list"> - <search>vagrantup.com</search> - </searchlist> - <write_hostname config:type="boolean">true</write_hostname> - </dns> - <interfaces config:type="list"> - <interface> - <bootproto>dhcp</bootproto> - <device>eth0</device> - <startmode>auto</startmode> - <usercontrol>no</usercontrol> - </interface> - </interfaces> - <keep_install_network config:type="boolean">true</keep_install_network> - <managed config:type="boolean">false</managed> - <routing> - <ip_forward config:type="boolean">false</ip_forward> - </routing> - </networking> - <partitioning config:type="list"> - <drive> - <initialize config:type="boolean">true</initialize> - <partitions config:type="list"> - <partition> - <create config:type="boolean">true</create> - <crypt_fs config:type="boolean">false</crypt_fs> - <filesystem config:type="symbol">swap</filesystem> - <format config:type="boolean">true</format> - <fstopt>defaults</fstopt> - <loop_fs config:type="boolean">false</loop_fs> - <mount>swap</mount> - <mountby config:type="symbol">device</mountby> - <partition_id config:type="integer">130</partition_id> - <partition_nr config:type="integer">1</partition_nr> - <raid_options/> - <resize config:type="boolean">false</resize> - <size>1561492992</size> - </partition> - <partition> - <create config:type="boolean">true</create> - <crypt_fs config:type="boolean">false</crypt_fs> - <filesystem config:type="symbol">ext3</filesystem> - <format config:type="boolean">true</format> - <fstopt>acl,user_xattr</fstopt> - <loop_fs config:type="boolean">false</loop_fs> - <mount>/</mount> - <mountby config:type="symbol">device</mountby> - <partition_id config:type="integer">131</partition_id> - <partition_nr config:type="integer">2</partition_nr> - <raid_options/> - <resize config:type="boolean">false</resize> - <size>19895844352</size> - </partition> - </partitions> - <pesize></pesize> - <type config:type="symbol">CT_DISK</type> - <use>all</use> - </drive> - </partitioning> - <report> - <errors> - <log config:type="boolean">true</log> - <show config:type="boolean">true</show> - <timeout config:type="integer">0</timeout> - </errors> - <messages> - <log config:type="boolean">true</log> - <show config:type="boolean">true</show> - <timeout config:type="integer">0</timeout> - </messages> - <warnings> - <log config:type="boolean">true</log> - <show config:type="boolean">true</show> - <timeout config:type="integer">0</timeout> - </warnings> - <yesno_messages> - <log config:type="boolean">true</log> - <show config:type="boolean">true</show> - <timeout config:type="integer">0</timeout> - </yesno_messages> - </report> - <software> - - <packages config:type="list"> - <package>openssh</package> - <package>kernel-default-devel</package> - <package>sudo</package> - <package>gcc</package> - <package>wget</package> - <package>make</package> - </packages> - <patterns config:type="list"> - <pattern>Minimal</pattern> - <pattern>apparmor</pattern> - </patterns> - <remove-packages config:type="list"> - </remove-packages> - </software> - <user_defaults> - <expire></expire> - <group>100</group> - <groups>video,dialout</groups> - <home>/home</home> - <inactive>-1</inactive> - <shell>/bin/bash</shell> - <skel>/etc/skel</skel> - <umask>022</umask> - </user_defaults> - <users config:type="list"> - <user> - <encrypted config:type="boolean">true</encrypted> - <fullname>vagrant</fullname> - <gid>100</gid> - <home>/home/vagrant</home> - <password_settings> - <expire></expire> - <flag></flag> - <inact></inact> - <max>99999</max> - <min>0</min> - <warn>7</warn> - </password_settings> - <shell>/bin/bash</shell> - <uid>1000</uid> - <user_password>$2y$05$NA1Li9ZKJOLRW5mMTXm6/e5r8dltWS5RpDZpvHrI82aLE00V51tdi</user_password> - <username>vagrant</username> - </user> - <user> - <encrypted config:type="boolean">true</encrypted> - <fullname>root</fullname> - <gid>0</gid> - <home>/root</home> - <password_settings> - <expire></expire> - <flag></flag> - <inact></inact> - <max></max> - <min></min> - <warn></warn> - </password_settings> - <shell>/bin/bash</shell> - <uid>0</uid> - <user_password>$2y$05$NA1Li9ZKJOLRW5mMTXm6/e5r8dltWS5RpDZpvHrI82aLE00V51tdi</user_password> - <username>root</username> - </user> - </users> -</profile> diff --git a/http/sles-11/sles-11-sp4-i386-autoinst.xml b/http/sles-11/sles-11-sp4-i386-autoinst.xml deleted file mode 100644 index 7a2b03d84..000000000 --- a/http/sles-11/sles-11-sp4-i386-autoinst.xml +++ /dev/null @@ -1,180 +0,0 @@ -<?xml version="1.0"?> -<!DOCTYPE profile> -<profile xmlns="http://www.suse.com/1.0/yast2ns" xmlns:config="http://www.suse.com/1.0/configns"> - <general> - <ask-list config:type="list"/> - <mode> - <confirm config:type="boolean">false</confirm> - </mode> - <mouse> - <id>none</id> - </mouse> - <proposals config:type="list"/> - <signature-handling> - <accept_file_without_checksum config:type="boolean">true</accept_file_without_checksum> - <accept_non_trusted_gpg_key config:type="boolean">true</accept_non_trusted_gpg_key> - <accept_unknown_gpg_key config:type="boolean">true</accept_unknown_gpg_key> - <accept_unsigned_file config:type="boolean">true</accept_unsigned_file> - <accept_verification_failed config:type="boolean">false</accept_verification_failed> - <import_gpg_key config:type="boolean">true</import_gpg_key> - </signature-handling> - <storage/> - </general> - <login_settings/> - <networking> - <dhcp_options> - <dhclient_client_id></dhclient_client_id> - <dhclient_hostname_option>AUTO</dhclient_hostname_option> - </dhcp_options> - <dns> - <dhcp_hostname config:type="boolean">false</dhcp_hostname> - <domain>vagrantup.com</domain> - <hostname>vagrant-sles-11sp4-x86</hostname> - <resolv_conf_policy>auto</resolv_conf_policy> - <searchlist config:type="list"> - <search>vagrantup.com</search> - </searchlist> - <write_hostname config:type="boolean">true</write_hostname> - </dns> - <interfaces config:type="list"> - <interface> - <bootproto>dhcp</bootproto> - <device>eth0</device> - <startmode>auto</startmode> - <usercontrol>no</usercontrol> - </interface> - </interfaces> - <keep_install_network config:type="boolean">true</keep_install_network> - <managed config:type="boolean">false</managed> - <routing> - <ip_forward config:type="boolean">false</ip_forward> - </routing> - </networking> - <partitioning config:type="list"> - <drive> - <initialize config:type="boolean">true</initialize> - <partitions config:type="list"> - <partition> - <create config:type="boolean">true</create> - <crypt_fs config:type="boolean">false</crypt_fs> - <filesystem config:type="symbol">swap</filesystem> - <format config:type="boolean">true</format> - <fstopt>defaults</fstopt> - <loop_fs config:type="boolean">false</loop_fs> - <mount>swap</mount> - <mountby config:type="symbol">device</mountby> - <partition_id config:type="integer">130</partition_id> - <partition_nr config:type="integer">1</partition_nr> - <raid_options/> - <resize config:type="boolean">false</resize> - <size>1561492992</size> - </partition> - <partition> - <create config:type="boolean">true</create> - <crypt_fs config:type="boolean">false</crypt_fs> - <filesystem config:type="symbol">ext3</filesystem> - <format config:type="boolean">true</format> - <fstopt>acl,user_xattr</fstopt> - <loop_fs config:type="boolean">false</loop_fs> - <mount>/</mount> - <mountby config:type="symbol">device</mountby> - <partition_id config:type="integer">131</partition_id> - <partition_nr config:type="integer">2</partition_nr> - <raid_options/> - <resize config:type="boolean">false</resize> - <size>19895844352</size> - </partition> - </partitions> - <pesize></pesize> - <type config:type="symbol">CT_DISK</type> - <use>all</use> - </drive> - </partitioning> - <report> - <errors> - <log config:type="boolean">true</log> - <show config:type="boolean">true</show> - <timeout config:type="integer">0</timeout> - </errors> - <messages> - <log config:type="boolean">true</log> - <show config:type="boolean">true</show> - <timeout config:type="integer">0</timeout> - </messages> - <warnings> - <log config:type="boolean">true</log> - <show config:type="boolean">true</show> - <timeout config:type="integer">0</timeout> - </warnings> - <yesno_messages> - <log config:type="boolean">true</log> - <show config:type="boolean">true</show> - <timeout config:type="integer">0</timeout> - </yesno_messages> - </report> - <software> - - <packages config:type="list"> - <package>openssh</package> - <package>kernel-default-devel</package> - <package>sudo</package> - <package>gcc</package> - <package>wget</package> - <package>make</package> - </packages> - <patterns config:type="list"> - <pattern>Minimal</pattern> - <pattern>apparmor</pattern> - </patterns> - <remove-packages config:type="list"> - </remove-packages> - </software> - <user_defaults> - <expire></expire> - <group>100</group> - <groups>video,dialout</groups> - <home>/home</home> - <inactive>-1</inactive> - <shell>/bin/bash</shell> - <skel>/etc/skel</skel> - <umask>022</umask> - </user_defaults> - <users config:type="list"> - <user> - <encrypted config:type="boolean">true</encrypted> - <fullname>vagrant</fullname> - <gid>100</gid> - <home>/home/vagrant</home> - <password_settings> - <expire></expire> - <flag></flag> - <inact></inact> - <max>99999</max> - <min>0</min> - <warn>7</warn> - </password_settings> - <shell>/bin/bash</shell> - <uid>1000</uid> - <user_password>$2y$05$NA1Li9ZKJOLRW5mMTXm6/e5r8dltWS5RpDZpvHrI82aLE00V51tdi</user_password> - <username>vagrant</username> - </user> - <user> - <encrypted config:type="boolean">true</encrypted> - <fullname>root</fullname> - <gid>0</gid> - <home>/root</home> - <password_settings> - <expire></expire> - <flag></flag> - <inact></inact> - <max></max> - <min></min> - <warn></warn> - </password_settings> - <shell>/bin/bash</shell> - <uid>0</uid> - <user_password>$2y$05$NA1Li9ZKJOLRW5mMTXm6/e5r8dltWS5RpDZpvHrI82aLE00V51tdi</user_password> - <username>root</username> - </user> - </users> -</profile> diff --git a/http/sles-11/sles-11-sp4-x86_64-autoinst.xml b/http/sles-11/sles-11-sp4-x86_64-autoinst.xml deleted file mode 100644 index ae21e9f85..000000000 --- a/http/sles-11/sles-11-sp4-x86_64-autoinst.xml +++ /dev/null @@ -1,180 +0,0 @@ -<?xml version="1.0"?> -<!DOCTYPE profile> -<profile xmlns="http://www.suse.com/1.0/yast2ns" xmlns:config="http://www.suse.com/1.0/configns"> - <general> - <ask-list config:type="list"/> - <mode> - <confirm config:type="boolean">false</confirm> - </mode> - <mouse> - <id>none</id> - </mouse> - <proposals config:type="list"/> - <signature-handling> - <accept_file_without_checksum config:type="boolean">true</accept_file_without_checksum> - <accept_non_trusted_gpg_key config:type="boolean">true</accept_non_trusted_gpg_key> - <accept_unknown_gpg_key config:type="boolean">true</accept_unknown_gpg_key> - <accept_unsigned_file config:type="boolean">true</accept_unsigned_file> - <accept_verification_failed config:type="boolean">false</accept_verification_failed> - <import_gpg_key config:type="boolean">true</import_gpg_key> - </signature-handling> - <storage/> - </general> - <login_settings/> - <networking> - <dhcp_options> - <dhclient_client_id></dhclient_client_id> - <dhclient_hostname_option>AUTO</dhclient_hostname_option> - </dhcp_options> - <dns> - <dhcp_hostname config:type="boolean">false</dhcp_hostname> - <domain>vagrantup.com</domain> - <hostname>vagrant-sles-11sp4-x64</hostname> - <resolv_conf_policy>auto</resolv_conf_policy> - <searchlist config:type="list"> - <search>vagrantup.com</search> - </searchlist> - <write_hostname config:type="boolean">true</write_hostname> - </dns> - <interfaces config:type="list"> - <interface> - <bootproto>dhcp</bootproto> - <device>eth0</device> - <startmode>auto</startmode> - <usercontrol>no</usercontrol> - </interface> - </interfaces> - <keep_install_network config:type="boolean">true</keep_install_network> - <managed config:type="boolean">false</managed> - <routing> - <ip_forward config:type="boolean">false</ip_forward> - </routing> - </networking> - <partitioning config:type="list"> - <drive> - <initialize config:type="boolean">true</initialize> - <partitions config:type="list"> - <partition> - <create config:type="boolean">true</create> - <crypt_fs config:type="boolean">false</crypt_fs> - <filesystem config:type="symbol">swap</filesystem> - <format config:type="boolean">true</format> - <fstopt>defaults</fstopt> - <loop_fs config:type="boolean">false</loop_fs> - <mount>swap</mount> - <mountby config:type="symbol">device</mountby> - <partition_id config:type="integer">130</partition_id> - <partition_nr config:type="integer">1</partition_nr> - <raid_options/> - <resize config:type="boolean">false</resize> - <size>1561492992</size> - </partition> - <partition> - <create config:type="boolean">true</create> - <crypt_fs config:type="boolean">false</crypt_fs> - <filesystem config:type="symbol">ext3</filesystem> - <format config:type="boolean">true</format> - <fstopt>acl,user_xattr</fstopt> - <loop_fs config:type="boolean">false</loop_fs> - <mount>/</mount> - <mountby config:type="symbol">device</mountby> - <partition_id config:type="integer">131</partition_id> - <partition_nr config:type="integer">2</partition_nr> - <raid_options/> - <resize config:type="boolean">false</resize> - <size>19895844352</size> - </partition> - </partitions> - <pesize></pesize> - <type config:type="symbol">CT_DISK</type> - <use>all</use> - </drive> - </partitioning> - <report> - <errors> - <log config:type="boolean">true</log> - <show config:type="boolean">true</show> - <timeout config:type="integer">0</timeout> - </errors> - <messages> - <log config:type="boolean">true</log> - <show config:type="boolean">true</show> - <timeout config:type="integer">0</timeout> - </messages> - <warnings> - <log config:type="boolean">true</log> - <show config:type="boolean">true</show> - <timeout config:type="integer">0</timeout> - </warnings> - <yesno_messages> - <log config:type="boolean">true</log> - <show config:type="boolean">true</show> - <timeout config:type="integer">0</timeout> - </yesno_messages> - </report> - <software> - - <packages config:type="list"> - <package>openssh</package> - <package>kernel-default-devel</package> - <package>sudo</package> - <package>gcc</package> - <package>wget</package> - <package>make</package> - </packages> - <patterns config:type="list"> - <pattern>Minimal</pattern> - <pattern>apparmor</pattern> - </patterns> - <remove-packages config:type="list"> - </remove-packages> - </software> - <user_defaults> - <expire></expire> - <group>100</group> - <groups>video,dialout</groups> - <home>/home</home> - <inactive>-1</inactive> - <shell>/bin/bash</shell> - <skel>/etc/skel</skel> - <umask>022</umask> - </user_defaults> - <users config:type="list"> - <user> - <encrypted config:type="boolean">true</encrypted> - <fullname>vagrant</fullname> - <gid>100</gid> - <home>/home/vagrant</home> - <password_settings> - <expire></expire> - <flag></flag> - <inact></inact> - <max>99999</max> - <min>0</min> - <warn>7</warn> - </password_settings> - <shell>/bin/bash</shell> - <uid>1000</uid> - <user_password>$2y$05$NA1Li9ZKJOLRW5mMTXm6/e5r8dltWS5RpDZpvHrI82aLE00V51tdi</user_password> - <username>vagrant</username> - </user> - <user> - <encrypted config:type="boolean">true</encrypted> - <fullname>root</fullname> - <gid>0</gid> - <home>/root</home> - <password_settings> - <expire></expire> - <flag></flag> - <inact></inact> - <max></max> - <min></min> - <warn></warn> - </password_settings> - <shell>/bin/bash</shell> - <uid>0</uid> - <user_password>$2y$05$NA1Li9ZKJOLRW5mMTXm6/e5r8dltWS5RpDZpvHrI82aLE00V51tdi</user_password> - <username>root</username> - </user> - </users> -</profile> diff --git a/http/ubuntu-10.04/preseed.cfg b/http/ubuntu-10.04/preseed.cfg deleted file mode 100644 index b61fea3a1..000000000 --- a/http/ubuntu-10.04/preseed.cfg +++ /dev/null @@ -1,31 +0,0 @@ -choose-mirror-bin mirror/http/proxy string -d-i base-installer/kernel/override-image string linux-server -d-i clock-setup/utc boolean true -d-i clock-setup/utc-auto boolean true -d-i finish-install/reboot_in_progress note -d-i grub-installer/only_debian boolean true -d-i grub-installer/with_other_os boolean true -d-i partman-auto-lvm/guided_size string max -d-i partman-auto/choose_recipe select atomic -d-i partman-auto/method string lvm -d-i partman-lvm/confirm boolean true -d-i partman-lvm/confirm boolean true -d-i partman-lvm/confirm_nooverwrite boolean true -d-i partman-lvm/device_remove_lvm boolean true -d-i partman/choose_partition select finish -d-i partman/confirm boolean true -d-i partman/confirm_nooverwrite boolean true -d-i partman/confirm_write_new_label boolean true -d-i passwd/user-fullname string vagrant -d-i passwd/user-uid string 1000 -d-i passwd/user-password password vagrant -d-i passwd/user-password-again password vagrant -d-i passwd/username string vagrant -d-i pkgsel/include string openssh-server cryptsetup build-essential libssl-dev libreadline-dev zlib1g-dev linux-source dkms nfs-common -d-i pkgsel/install-language-support boolean false -d-i pkgsel/update-policy select none -d-i pkgsel/upgrade select full-upgrade -d-i time/zone string UTC -d-i user-setup/allow-password-weak boolean true -d-i user-setup/encrypt-home boolean false -tasksel tasksel/first multiselect standard, ubuntu-server diff --git a/http/ubuntu-14.10/preseed.cfg b/http/ubuntu-14.10/preseed.cfg deleted file mode 100644 index b61fea3a1..000000000 --- a/http/ubuntu-14.10/preseed.cfg +++ /dev/null @@ -1,31 +0,0 @@ -choose-mirror-bin mirror/http/proxy string -d-i base-installer/kernel/override-image string linux-server -d-i clock-setup/utc boolean true -d-i clock-setup/utc-auto boolean true -d-i finish-install/reboot_in_progress note -d-i grub-installer/only_debian boolean true -d-i grub-installer/with_other_os boolean true -d-i partman-auto-lvm/guided_size string max -d-i partman-auto/choose_recipe select atomic -d-i partman-auto/method string lvm -d-i partman-lvm/confirm boolean true -d-i partman-lvm/confirm boolean true -d-i partman-lvm/confirm_nooverwrite boolean true -d-i partman-lvm/device_remove_lvm boolean true -d-i partman/choose_partition select finish -d-i partman/confirm boolean true -d-i partman/confirm_nooverwrite boolean true -d-i partman/confirm_write_new_label boolean true -d-i passwd/user-fullname string vagrant -d-i passwd/user-uid string 1000 -d-i passwd/user-password password vagrant -d-i passwd/user-password-again password vagrant -d-i passwd/username string vagrant -d-i pkgsel/include string openssh-server cryptsetup build-essential libssl-dev libreadline-dev zlib1g-dev linux-source dkms nfs-common -d-i pkgsel/install-language-support boolean false -d-i pkgsel/update-policy select none -d-i pkgsel/upgrade select full-upgrade -d-i time/zone string UTC -d-i user-setup/allow-password-weak boolean true -d-i user-setup/encrypt-home boolean false -tasksel tasksel/first multiselect standard, ubuntu-server diff --git a/http/ubuntu-15.04/preseed.cfg b/http/ubuntu-15.04/preseed.cfg deleted file mode 100644 index b61fea3a1..000000000 --- a/http/ubuntu-15.04/preseed.cfg +++ /dev/null @@ -1,31 +0,0 @@ -choose-mirror-bin mirror/http/proxy string -d-i base-installer/kernel/override-image string linux-server -d-i clock-setup/utc boolean true -d-i clock-setup/utc-auto boolean true -d-i finish-install/reboot_in_progress note -d-i grub-installer/only_debian boolean true -d-i grub-installer/with_other_os boolean true -d-i partman-auto-lvm/guided_size string max -d-i partman-auto/choose_recipe select atomic -d-i partman-auto/method string lvm -d-i partman-lvm/confirm boolean true -d-i partman-lvm/confirm boolean true -d-i partman-lvm/confirm_nooverwrite boolean true -d-i partman-lvm/device_remove_lvm boolean true -d-i partman/choose_partition select finish -d-i partman/confirm boolean true -d-i partman/confirm_nooverwrite boolean true -d-i partman/confirm_write_new_label boolean true -d-i passwd/user-fullname string vagrant -d-i passwd/user-uid string 1000 -d-i passwd/user-password password vagrant -d-i passwd/user-password-again password vagrant -d-i passwd/username string vagrant -d-i pkgsel/include string openssh-server cryptsetup build-essential libssl-dev libreadline-dev zlib1g-dev linux-source dkms nfs-common -d-i pkgsel/install-language-support boolean false -d-i pkgsel/update-policy select none -d-i pkgsel/upgrade select full-upgrade -d-i time/zone string UTC -d-i user-setup/allow-password-weak boolean true -d-i user-setup/encrypt-home boolean false -tasksel tasksel/first multiselect standard, ubuntu-server From ca99ea9f0c977432423f6dd1b9c0dccbe4f1dc14 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith@chef.io> Date: Wed, 5 Oct 2016 12:09:34 -0700 Subject: [PATCH 0548/1622] Get omnios boxes building again use the new scripts for VMs update the checksums since omniti keeps rereleasing ISOs without new versions Signed-off-by: Tim Smith <tsmith@chef.io> --- omnios-r151014.json | 6 ++++-- omnios-r151018.json | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/omnios-r151014.json b/omnios-r151014.json index 897d98b7a..de9e3c415 100644 --- a/omnios-r151014.json +++ b/omnios-r151014.json @@ -207,7 +207,9 @@ "execute_command": "export {{.Vars}} && sh '{{.Path}}'", "scripts": [ "scripts/common/metadata.sh", - "scripts/omnios/vmtools.sh", + "scripts/common/virtualbox.sh", + "scripts/common/vmware.sh", + "scripts/common/parallels.sh", "scripts/omnios/postinstall.sh" ], "type": "shell" @@ -223,7 +225,7 @@ "headless": "", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", - "iso_checksum": "16fd303c81521db72fe6b0b5e891cffb5f9caa60", + "iso_checksum": "a19c8b0c0b84d4903ea697c5038249dcfb64efd5", "iso_checksum_type": "sha1", "iso_name": "OmniOS_Text_r151014.iso", "memory": "1024", diff --git a/omnios-r151018.json b/omnios-r151018.json index e0893adb1..557c9a288 100644 --- a/omnios-r151018.json +++ b/omnios-r151018.json @@ -207,7 +207,9 @@ "execute_command": "export {{.Vars}} && sh '{{.Path}}'", "scripts": [ "scripts/common/metadata.sh", - "scripts/omnios/vmtools.sh", + "scripts/common/virtualbox.sh", + "scripts/common/vmware.sh", + "scripts/common/parallels.sh", "scripts/omnios/postinstall.sh" ], "type": "shell" @@ -223,7 +225,7 @@ "headless": "", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", - "iso_checksum": "5378cfdf9c7197c886231eb622bd9b19de597dba", + "iso_checksum": "accb4dec37021e47414c6b64929ef1b8e1f2d6d9", "iso_checksum_type": "sha1", "iso_name": "OmniOS_Text_r151018.iso", "memory": "1024", From 94b7331504a57f61c9131a5685b6bbdf20ca4016 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith@chef.io> Date: Thu, 6 Oct 2016 14:23:40 -0700 Subject: [PATCH 0549/1622] Get Solaris 11 to build again Signed-off-by: Tim Smith <tsmith@chef.io> --- solaris-11-x86.json | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/solaris-11-x86.json b/solaris-11-x86.json index 22bc85d7b..95b5435c1 100644 --- a/solaris-11-x86.json +++ b/solaris-11-x86.json @@ -132,8 +132,10 @@ "scripts": [ "scripts/common/metadata.sh", "scripts/solaris/update.sh", - "scripts/solaris/vmtools.sh", "scripts/solaris/vagrant.sh", + "scripts/common/virtualbox.sh", + "scripts/common/vmware.sh", + "scripts/common/parallels.sh", "scripts/solaris/minimize.sh" ], "type": "shell" From dd3b7e96ad051a7a47217d67f9b5da30154be0c5 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith@chef.io> Date: Fri, 21 Oct 2016 11:55:22 -0700 Subject: [PATCH 0550/1622] Only build on master Avoid double testing on PRs. Also test on 2.2.5 not 2.2.0 Signed-off-by: Tim Smith <tsmith@chef.io> --- .travis.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 96453d392..dc9ab0e85 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,11 @@ sudo: false rvm: - - 2.2 + - 2.2.5 + +branches: + only: + - master before_install: wget --no-check-certificate https://releases.hashicorp.com/packer/0.9.0/packer_0.9.0_linux_amd64.zip && unzip -d packer packer_0.9.0_linux_amd64.zip before_script: export PATH=$PATH:$PWD/packer From aec584798f1e73930eec71a8a910f733a68fef03 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith@chef.io> Date: Fri, 21 Oct 2016 13:08:49 -0700 Subject: [PATCH 0551/1622] Revert my vmtools change Signed-off-by: Tim Smith <tsmith@chef.io> --- omnios-r151014.json | 4 +--- omnios-r151018.json | 4 +--- solaris-11-x86.json | 4 +--- 3 files changed, 3 insertions(+), 9 deletions(-) diff --git a/omnios-r151014.json b/omnios-r151014.json index de9e3c415..23e2008d1 100644 --- a/omnios-r151014.json +++ b/omnios-r151014.json @@ -207,9 +207,7 @@ "execute_command": "export {{.Vars}} && sh '{{.Path}}'", "scripts": [ "scripts/common/metadata.sh", - "scripts/common/virtualbox.sh", - "scripts/common/vmware.sh", - "scripts/common/parallels.sh", + "scripts/omnios/vmtools.sh", "scripts/omnios/postinstall.sh" ], "type": "shell" diff --git a/omnios-r151018.json b/omnios-r151018.json index 557c9a288..251fab591 100644 --- a/omnios-r151018.json +++ b/omnios-r151018.json @@ -207,9 +207,7 @@ "execute_command": "export {{.Vars}} && sh '{{.Path}}'", "scripts": [ "scripts/common/metadata.sh", - "scripts/common/virtualbox.sh", - "scripts/common/vmware.sh", - "scripts/common/parallels.sh", + "scripts/omnios/vmtools.sh", "scripts/omnios/postinstall.sh" ], "type": "shell" diff --git a/solaris-11-x86.json b/solaris-11-x86.json index 95b5435c1..45fa6ae6c 100644 --- a/solaris-11-x86.json +++ b/solaris-11-x86.json @@ -133,9 +133,7 @@ "scripts/common/metadata.sh", "scripts/solaris/update.sh", "scripts/solaris/vagrant.sh", - "scripts/common/virtualbox.sh", - "scripts/common/vmware.sh", - "scripts/common/parallels.sh", + "scripts/solaris/vmtools.sh", "scripts/solaris/minimize.sh" ], "type": "shell" From a6520a6788815e60d1c6b7616bf982a68264d27b Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith@chef.io> Date: Fri, 21 Oct 2016 13:43:27 -0700 Subject: [PATCH 0552/1622] Use Ruby 2.3.1 and Packer 0.10.2 Signed-off-by: Tim Smith <tsmith@chef.io> --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index dc9ab0e85..f0b5d4694 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,13 +1,13 @@ sudo: false rvm: - - 2.2.5 + - 2.3.1 branches: only: - master -before_install: wget --no-check-certificate https://releases.hashicorp.com/packer/0.9.0/packer_0.9.0_linux_amd64.zip && unzip -d packer packer_0.9.0_linux_amd64.zip +before_install: wget --no-check-certificate https://releases.hashicorp.com/packer/0.10.2/packer_0.10.2_linux_amd64.zip && unzip -d packer packer_0.10.2_linux_amd64.zip before_script: export PATH=$PATH:$PWD/packer script: ./bin/bento normalize From ed60dc31f0696dc1c9aef5c93c6334a360833999 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith@chef.io> Date: Tue, 25 Oct 2016 15:25:18 -0700 Subject: [PATCH 0553/1622] Disable firewall on SLES 12 This matches SLES12 SP1 Signed-off-by: Tim Smith <tsmith@chef.io> --- http/sles-12/sles-12-x86_64-autoinst.xml | 47 ++---------------------- 1 file changed, 3 insertions(+), 44 deletions(-) diff --git a/http/sles-12/sles-12-x86_64-autoinst.xml b/http/sles-12/sles-12-x86_64-autoinst.xml index c7841bf18..b9649a7d4 100644 --- a/http/sles-12/sles-12-x86_64-autoinst.xml +++ b/http/sles-12/sles-12-x86_64-autoinst.xml @@ -44,49 +44,8 @@ <image_installation config:type="boolean">false</image_installation> </deploy_image> <firewall> - <FW_ALLOW_FW_BROADCAST_DMZ>no</FW_ALLOW_FW_BROADCAST_DMZ> - <FW_ALLOW_FW_BROADCAST_EXT>no</FW_ALLOW_FW_BROADCAST_EXT> - <FW_ALLOW_FW_BROADCAST_INT>no</FW_ALLOW_FW_BROADCAST_INT> - <FW_CONFIGURATIONS_DMZ/> - <FW_CONFIGURATIONS_EXT/> - <FW_CONFIGURATIONS_INT/> - <FW_DEV_DMZ/> - <FW_DEV_EXT/> - <FW_DEV_INT/> - <FW_FORWARD_ALWAYS_INOUT_DEV/> - <FW_FORWARD_MASQ/> - <FW_IGNORE_FW_BROADCAST_DMZ>no</FW_IGNORE_FW_BROADCAST_DMZ> - <FW_IGNORE_FW_BROADCAST_EXT>yes</FW_IGNORE_FW_BROADCAST_EXT> - <FW_IGNORE_FW_BROADCAST_INT>no</FW_IGNORE_FW_BROADCAST_INT> - <FW_IPSEC_TRUST>no</FW_IPSEC_TRUST> - <FW_LOAD_MODULES/> - <FW_LOG_ACCEPT_ALL>no</FW_LOG_ACCEPT_ALL> - <FW_LOG_ACCEPT_CRIT>yes</FW_LOG_ACCEPT_CRIT> - <FW_LOG_DROP_ALL>no</FW_LOG_DROP_ALL> - <FW_LOG_DROP_CRIT>yes</FW_LOG_DROP_CRIT> - <FW_MASQUERADE>no</FW_MASQUERADE> - <FW_PROTECT_FROM_INT>no</FW_PROTECT_FROM_INT> - <FW_ROUTE>no</FW_ROUTE> - <FW_SERVICES_ACCEPT_DMZ/> - <FW_SERVICES_ACCEPT_EXT/> - <FW_SERVICES_ACCEPT_INT/> - <FW_SERVICES_ACCEPT_RELATED_DMZ/> - <FW_SERVICES_ACCEPT_RELATED_EXT/> - <FW_SERVICES_ACCEPT_RELATED_INT/> - <FW_SERVICES_DMZ_IP/> - <FW_SERVICES_DMZ_RPC/> - <FW_SERVICES_DMZ_TCP/> - <FW_SERVICES_DMZ_UDP/> - <FW_SERVICES_EXT_IP/> - <FW_SERVICES_EXT_RPC/> - <FW_SERVICES_EXT_TCP/> - <FW_SERVICES_EXT_UDP/> - <FW_SERVICES_INT_IP/> - <FW_SERVICES_INT_RPC/> - <FW_SERVICES_INT_TCP/> - <FW_SERVICES_INT_UDP/> - <enable_firewall config:type="boolean">true</enable_firewall> - <start_firewall config:type="boolean">true</start_firewall> + <enable_firewall config:type="boolean">false</enable_firewall> + <start_firewall config:type="boolean">false</start_firewall> </firewall> <general> <ask-list config:type="list"/> @@ -142,7 +101,7 @@ <partitioning config:type="list"> <drive> <!-- - definition of device not needed (starting with SLES 11 SP2 + definition of device not needed (starting with SLES 11 SP2 YaST will pickup the first harddisk. This is useful if someone wants to deploy using VirtualBox and/or KVM/virtio --> From b79cb6893ae7789bf8c45e05af2d1e2ad5d0e5f3 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith@chef.io> Date: Tue, 25 Oct 2016 15:25:37 -0700 Subject: [PATCH 0554/1622] Properly remove the DVD source and only the DVD source Signed-off-by: Tim Smith <tsmith@chef.io> --- scripts/sles/remove-dvd-source.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/sles/remove-dvd-source.sh b/scripts/sles/remove-dvd-source.sh index 669fcad8a..198d23812 100644 --- a/scripts/sles/remove-dvd-source.sh +++ b/scripts/sles/remove-dvd-source.sh @@ -1,4 +1,4 @@ #!/bin/sh -eux -zypper removerepo `zypper repos | grep 'SLES' | awk '{ print $3 }'`; +zypper removerepo `zypper repos | grep 'SLES' | awk '{ print $3 }' | grep "^SLES"`; zypper refresh From 9ac74b5b7b4aa784aa3e3dcf4b80cf464fb0fda9 Mon Sep 17 00:00:00 2001 From: Artem Sidorenko <artem@posteo.de> Date: Thu, 27 Oct 2016 00:53:45 +0200 Subject: [PATCH 0555/1622] Avoid breaking of chef package resource via yum Signed-off-by: Artem Sidorenko <artem@posteo.de> --- fedora-23-i386.json | 1 + fedora-23-x86_64.json | 1 + fedora-24-i386.json | 1 + fedora-24-x86_64.json | 1 + scripts/fedora/yum.sh | 4 ++++ 5 files changed, 8 insertions(+) create mode 100644 scripts/fedora/yum.sh diff --git a/fedora-23-i386.json b/fedora-23-i386.json index bebadd145..002aecef1 100644 --- a/fedora-23-i386.json +++ b/fedora-23-i386.json @@ -143,6 +143,7 @@ "scripts/fedora/fix-slow-dns.sh", "scripts/common/sshd.sh", "scripts/fedora/build-tools.sh", + "scripts/fedora/yum.sh", "scripts/common/virtualbox.sh", "scripts/common/vmware.sh", "scripts/common/parallels.sh", diff --git a/fedora-23-x86_64.json b/fedora-23-x86_64.json index 82f5e088f..64908ce55 100644 --- a/fedora-23-x86_64.json +++ b/fedora-23-x86_64.json @@ -147,6 +147,7 @@ "scripts/common/metadata.sh", "scripts/fedora/fix-slow-dns.sh", "scripts/fedora/build-tools.sh", + "scripts/fedora/yum.sh", "scripts/common/sshd.sh", "scripts/common/virtualbox.sh", "scripts/common/vmware.sh", diff --git a/fedora-24-i386.json b/fedora-24-i386.json index 2dc50354f..d9f5c7baf 100644 --- a/fedora-24-i386.json +++ b/fedora-24-i386.json @@ -141,6 +141,7 @@ "scripts/common/metadata.sh", "scripts/fedora/fix-slow-dns.sh", "scripts/fedora/build-tools.sh", + "scripts/fedora/yum.sh", "scripts/common/sshd.sh", "scripts/common/virtualbox.sh", "scripts/common/vmware.sh", diff --git a/fedora-24-x86_64.json b/fedora-24-x86_64.json index a7ce8c5bb..a56c7f141 100644 --- a/fedora-24-x86_64.json +++ b/fedora-24-x86_64.json @@ -147,6 +147,7 @@ "scripts/common/metadata.sh", "scripts/fedora/fix-slow-dns.sh", "scripts/fedora/build-tools.sh", + "scripts/fedora/yum.sh", "scripts/common/sshd.sh", "scripts/common/virtualbox.sh", "scripts/common/vmware.sh", diff --git a/scripts/fedora/yum.sh b/scripts/fedora/yum.sh new file mode 100644 index 000000000..c28f7556b --- /dev/null +++ b/scripts/fedora/yum.sh @@ -0,0 +1,4 @@ +#!/bin/bash -eux +# Installing yum for compatibility, especially for chef/kitchen tests +# https://github.com/chef/chef/issues/5492 +dnf -y install yum From 79ecd8696f9140d4759ab3dc257dc72983ab649c Mon Sep 17 00:00:00 2001 From: Thadeus Fleming <thadeus.j.fleming@gmail.com> Date: Wed, 21 Sep 2016 22:01:46 -0500 Subject: [PATCH 0556/1622] Use UTF-8 locale. Obvious fix. --- archive/debian-8.5-amd64.json | 16 ++++++++-------- archive/debian-8.5-i386.json | 16 ++++++++-------- debian-7.11-amd64.json | 16 ++++++++-------- debian-7.11-i386.json | 16 ++++++++-------- debian-8.6-amd64.json | 16 ++++++++-------- debian-8.6-i386.json | 16 ++++++++-------- opensuse-13.2-i386.json | 8 ++++---- opensuse-13.2-x86_64.json | 8 ++++---- opensuse-leap-42.1-x86_64.json | 8 ++++---- sles-12-sp1-x86_64.json | 8 ++++---- sles-12-x86_64.json | 8 ++++---- ubuntu-12.04-amd64.json | 16 ++++++++-------- ubuntu-12.04-i386.json | 16 ++++++++-------- ubuntu-14.04-amd64.json | 16 ++++++++-------- ubuntu-14.04-i386.json | 16 ++++++++-------- ubuntu-15.10-amd64.json | 16 ++++++++-------- ubuntu-15.10-i386.json | 16 ++++++++-------- ubuntu-16.04-amd64.json | 16 ++++++++-------- ubuntu-16.04-i386.json | 16 ++++++++-------- 19 files changed, 132 insertions(+), 132 deletions(-) diff --git a/archive/debian-8.5-amd64.json b/archive/debian-8.5-amd64.json index 2a3f1899e..c1266423a 100644 --- a/archive/debian-8.5-amd64.json +++ b/archive/debian-8.5-amd64.json @@ -5,9 +5,9 @@ "<esc><wait>", "install <wait>", " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}} <wait>", - "debian-installer=en_US <wait>", + "debian-installer=en_US.UTF-8 <wait>", "auto <wait>", - "locale=en_US <wait>", + "locale=en_US.UTF-8 <wait>", "kbd-chooser/method=us <wait>", "keyboard-configuration/xkb-keymap=us <wait>", "netcfg/get_hostname={{ .Name }} <wait>", @@ -58,9 +58,9 @@ "<esc><wait>", "install <wait>", " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}} <wait>", - "debian-installer=en_US <wait>", + "debian-installer=en_US.UTF-8 <wait>", "auto <wait>", - "locale=en_US <wait>", + "locale=en_US.UTF-8 <wait>", "kbd-chooser/method=us <wait>", "keyboard-configuration/xkb-keymap=us <wait>", "netcfg/get_hostname={{ .Name }} <wait>", @@ -101,9 +101,9 @@ "<esc><wait>", "install <wait>", " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}} <wait>", - "debian-installer=en_US <wait>", + "debian-installer=en_US.UTF-8 <wait>", "auto <wait>", - "locale=en_US <wait>", + "locale=en_US.UTF-8 <wait>", "kbd-chooser/method=us <wait>", "keyboard-configuration/xkb-keymap=us <wait>", "netcfg/get_hostname={{ .Name }} <wait>", @@ -152,9 +152,9 @@ "<esc><wait>", "install <wait>", " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}} <wait>", - "debian-installer=en_US <wait>", + "debian-installer=en_US.UTF-8 <wait>", "auto <wait>", - "locale=en_US <wait>", + "locale=en_US.UTF-8 <wait>", "kbd-chooser/method=us <wait>", "keyboard-configuration/xkb-keymap=us <wait>", "netcfg/get_hostname={{ .Name }} <wait>", diff --git a/archive/debian-8.5-i386.json b/archive/debian-8.5-i386.json index de161a961..87897f8df 100644 --- a/archive/debian-8.5-i386.json +++ b/archive/debian-8.5-i386.json @@ -5,9 +5,9 @@ "<esc><wait>", "install <wait>", " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}} <wait>", - "debian-installer=en_US <wait>", + "debian-installer=en_US.UTF-8 <wait>", "auto <wait>", - "locale=en_US <wait>", + "locale=en_US.UTF-8 <wait>", "kbd-chooser/method=us <wait>", "keyboard-configuration/xkb-keymap=us <wait>", "netcfg/get_hostname={{ .Name }} <wait>", @@ -58,9 +58,9 @@ "<esc><wait>", "install <wait>", " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}} <wait>", - "debian-installer=en_US <wait>", + "debian-installer=en_US.UTF-8 <wait>", "auto <wait>", - "locale=en_US <wait>", + "locale=en_US.UTF-8 <wait>", "kbd-chooser/method=us <wait>", "keyboard-configuration/xkb-keymap=us <wait>", "netcfg/get_hostname={{ .Name }} <wait>", @@ -101,9 +101,9 @@ "<esc><wait>", "install <wait>", " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}} <wait>", - "debian-installer=en_US <wait>", + "debian-installer=en_US.UTF-8 <wait>", "auto <wait>", - "locale=en_US <wait>", + "locale=en_US.UTF-8 <wait>", "kbd-chooser/method=us <wait>", "keyboard-configuration/xkb-keymap=us <wait>", "netcfg/get_hostname={{ .Name }} <wait>", @@ -152,9 +152,9 @@ "<esc><wait>", "install <wait>", " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}} <wait>", - "debian-installer=en_US <wait>", + "debian-installer=en_US.UTF-8 <wait>", "auto <wait>", - "locale=en_US <wait>", + "locale=en_US.UTF-8 <wait>", "kbd-chooser/method=us <wait>", "keyboard-configuration/xkb-keymap=us <wait>", "netcfg/get_hostname={{ .Name }} <wait>", diff --git a/debian-7.11-amd64.json b/debian-7.11-amd64.json index 59725180a..030d101e2 100644 --- a/debian-7.11-amd64.json +++ b/debian-7.11-amd64.json @@ -5,9 +5,9 @@ "<esc><wait>", "install <wait>", " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}} <wait>", - "debian-installer=en_US <wait>", + "debian-installer=en_US.UTF-8 <wait>", "auto <wait>", - "locale=en_US <wait>", + "locale=en_US.UTF-8 <wait>", "kbd-chooser/method=us <wait>", "keyboard-configuration/xkb-keymap=us <wait>", "netcfg/get_hostname={{ .Name }} <wait>", @@ -57,9 +57,9 @@ "<esc><wait>", "install <wait>", " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}} <wait>", - "debian-installer=en_US <wait>", + "debian-installer=en_US.UTF-8 <wait>", "auto <wait>", - "locale=en_US <wait>", + "locale=en_US.UTF-8 <wait>", "kbd-chooser/method=us <wait>", "keyboard-configuration/xkb-keymap=us <wait>", "netcfg/get_hostname={{ .Name }} <wait>", @@ -98,9 +98,9 @@ "<esc><wait>", "install <wait>", " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}} <wait>", - "debian-installer=en_US <wait>", + "debian-installer=en_US.UTF-8 <wait>", "auto <wait>", - "locale=en_US <wait>", + "locale=en_US.UTF-8 <wait>", "kbd-chooser/method=us <wait>", "keyboard-configuration/xkb-keymap=us <wait>", "netcfg/get_hostname={{ .Name }} <wait>", @@ -148,9 +148,9 @@ "<esc><wait>", "install <wait>", "preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/debian-7/preseed.cfg <wait>", - "debian-installer=en_US <wait>", + "debian-installer=en_US.UTF-8 <wait>", "auto <wait>", - "locale=en_US <wait>", + "locale=en_US.UTF-8 <wait>", "kbd-chooser/method=us <wait>", "keyboard-configuration/xkb-keymap=us <wait>", "netcfg/get_hostname={{ .Name }} <wait>", diff --git a/debian-7.11-i386.json b/debian-7.11-i386.json index 83eec2a14..9b1ec8389 100644 --- a/debian-7.11-i386.json +++ b/debian-7.11-i386.json @@ -5,9 +5,9 @@ "<esc><wait>", "install <wait>", " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}} <wait>", - "debian-installer=en_US <wait>", + "debian-installer=en_US.UTF-8 <wait>", "auto <wait>", - "locale=en_US <wait>", + "locale=en_US.UTF-8 <wait>", "kbd-chooser/method=us <wait>", "keyboard-configuration/xkb-keymap=us <wait>", "netcfg/get_hostname={{ .Name }} <wait>", @@ -57,9 +57,9 @@ "<esc><wait>", "install <wait>", " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}} <wait>", - "debian-installer=en_US <wait>", + "debian-installer=en_US.UTF-8 <wait>", "auto <wait>", - "locale=en_US <wait>", + "locale=en_US.UTF-8 <wait>", "kbd-chooser/method=us <wait>", "keyboard-configuration/xkb-keymap=us <wait>", "netcfg/get_hostname={{ .Name }} <wait>", @@ -98,9 +98,9 @@ "<esc><wait>", "install <wait>", " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}} <wait>", - "debian-installer=en_US <wait>", + "debian-installer=en_US.UTF-8 <wait>", "auto <wait>", - "locale=en_US <wait>", + "locale=en_US.UTF-8 <wait>", "kbd-chooser/method=us <wait>", "keyboard-configuration/xkb-keymap=us <wait>", "netcfg/get_hostname={{ .Name }} <wait>", @@ -148,9 +148,9 @@ "<esc><wait>", "install <wait>", "preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/debian-7/preseed.cfg <wait>", - "debian-installer=en_US <wait>", + "debian-installer=en_US.UTF-8 <wait>", "auto <wait>", - "locale=en_US <wait>", + "locale=en_US.UTF-8 <wait>", "kbd-chooser/method=us <wait>", "keyboard-configuration/xkb-keymap=us <wait>", "netcfg/get_hostname={{ .Name }} <wait>", diff --git a/debian-8.6-amd64.json b/debian-8.6-amd64.json index b641efe92..ec6480d59 100644 --- a/debian-8.6-amd64.json +++ b/debian-8.6-amd64.json @@ -5,9 +5,9 @@ "<esc><wait>", "install <wait>", " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}} <wait>", - "debian-installer=en_US <wait>", + "debian-installer=en_US.UTF-8 <wait>", "auto <wait>", - "locale=en_US <wait>", + "locale=en_US.UTF-8 <wait>", "kbd-chooser/method=us <wait>", "keyboard-configuration/xkb-keymap=us <wait>", "netcfg/get_hostname={{ .Name }} <wait>", @@ -58,9 +58,9 @@ "<esc><wait>", "install <wait>", " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}} <wait>", - "debian-installer=en_US <wait>", + "debian-installer=en_US.UTF-8 <wait>", "auto <wait>", - "locale=en_US <wait>", + "locale=en_US.UTF-8 <wait>", "kbd-chooser/method=us <wait>", "keyboard-configuration/xkb-keymap=us <wait>", "netcfg/get_hostname={{ .Name }} <wait>", @@ -101,9 +101,9 @@ "<esc><wait>", "install <wait>", " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}} <wait>", - "debian-installer=en_US <wait>", + "debian-installer=en_US.UTF-8 <wait>", "auto <wait>", - "locale=en_US <wait>", + "locale=en_US.UTF-8 <wait>", "kbd-chooser/method=us <wait>", "keyboard-configuration/xkb-keymap=us <wait>", "netcfg/get_hostname={{ .Name }} <wait>", @@ -152,9 +152,9 @@ "<esc><wait>", "install <wait>", " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}} <wait>", - "debian-installer=en_US <wait>", + "debian-installer=en_US.UTF-8 <wait>", "auto <wait>", - "locale=en_US <wait>", + "locale=en_US.UTF-8 <wait>", "kbd-chooser/method=us <wait>", "keyboard-configuration/xkb-keymap=us <wait>", "netcfg/get_hostname={{ .Name }} <wait>", diff --git a/debian-8.6-i386.json b/debian-8.6-i386.json index 88c98da30..75931f857 100644 --- a/debian-8.6-i386.json +++ b/debian-8.6-i386.json @@ -5,9 +5,9 @@ "<esc><wait>", "install <wait>", " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}} <wait>", - "debian-installer=en_US <wait>", + "debian-installer=en_US.UTF-8 <wait>", "auto <wait>", - "locale=en_US <wait>", + "locale=en_US.UTF-8 <wait>", "kbd-chooser/method=us <wait>", "keyboard-configuration/xkb-keymap=us <wait>", "netcfg/get_hostname={{ .Name }} <wait>", @@ -58,9 +58,9 @@ "<esc><wait>", "install <wait>", " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}} <wait>", - "debian-installer=en_US <wait>", + "debian-installer=en_US.UTF-8 <wait>", "auto <wait>", - "locale=en_US <wait>", + "locale=en_US.UTF-8 <wait>", "kbd-chooser/method=us <wait>", "keyboard-configuration/xkb-keymap=us <wait>", "netcfg/get_hostname={{ .Name }} <wait>", @@ -101,9 +101,9 @@ "<esc><wait>", "install <wait>", " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}} <wait>", - "debian-installer=en_US <wait>", + "debian-installer=en_US.UTF-8 <wait>", "auto <wait>", - "locale=en_US <wait>", + "locale=en_US.UTF-8 <wait>", "kbd-chooser/method=us <wait>", "keyboard-configuration/xkb-keymap=us <wait>", "netcfg/get_hostname={{ .Name }} <wait>", @@ -152,9 +152,9 @@ "<esc><wait>", "install <wait>", " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}} <wait>", - "debian-installer=en_US <wait>", + "debian-installer=en_US.UTF-8 <wait>", "auto <wait>", - "locale=en_US <wait>", + "locale=en_US.UTF-8 <wait>", "kbd-chooser/method=us <wait>", "keyboard-configuration/xkb-keymap=us <wait>", "netcfg/get_hostname={{ .Name }} <wait>", diff --git a/opensuse-13.2-i386.json b/opensuse-13.2-i386.json index 051ee3368..8c0cc510a 100644 --- a/opensuse-13.2-i386.json +++ b/opensuse-13.2-i386.json @@ -4,7 +4,7 @@ "boot_command": [ "<esc><enter><wait>", "linux netsetup=dhcp install=cd:/<wait>", - " lang=en_US autoyast=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `autoinst_cfg`}}<wait>", + " lang=en_US.UTF-8 autoyast=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `autoinst_cfg`}}<wait>", " textmode=1<wait>", "<enter><wait>" ], @@ -46,7 +46,7 @@ "boot_command": [ "<esc><enter><wait>", "linux netsetup=dhcp install=cd:/<wait>", - " lang=en_US autoyast=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `autoinst_cfg`}}<wait>", + " lang=en_US.UTF-8 autoyast=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `autoinst_cfg`}}<wait>", " textmode=1<wait>", "<enter><wait>" ], @@ -77,7 +77,7 @@ "boot_command": [ "<esc><enter><wait>", "linux netsetup=dhcp netdevice=eth0 install=cd:/<wait>", - " lang=en_US autoyast=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `autoinst_cfg`}}<wait>", + " lang=en_US.UTF-8 autoyast=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `autoinst_cfg`}}<wait>", " textmode=1<wait>", "<enter><wait>" ], @@ -117,7 +117,7 @@ "boot_command": [ "<esc><enter><wait>", "linux netsetup=dhcp netdevice=eth0 install=cd:/<wait>", - " lang=en_US autoyast=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `autoinst_cfg`}}<wait>", + " lang=en_US.UTF-8 autoyast=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `autoinst_cfg`}}<wait>", " textmode=1<wait>", "<enter><wait>" ], diff --git a/opensuse-13.2-x86_64.json b/opensuse-13.2-x86_64.json index a7ab28574..bfbedfd8b 100644 --- a/opensuse-13.2-x86_64.json +++ b/opensuse-13.2-x86_64.json @@ -4,7 +4,7 @@ "boot_command": [ "<esc><enter><wait>", "linux netsetup=dhcp install=cd:/<wait>", - " lang=en_US autoyast=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `autoinst_cfg`}}<wait>", + " lang=en_US.UTF-8 autoyast=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `autoinst_cfg`}}<wait>", " textmode=1<wait>", "<enter><wait>" ], @@ -46,7 +46,7 @@ "boot_command": [ "<esc><enter><wait>", "linux netsetup=dhcp install=cd:/<wait>", - " lang=en_US autoyast=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `autoinst_cfg`}}<wait>", + " lang=en_US.UTF-8 autoyast=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `autoinst_cfg`}}<wait>", " textmode=1<wait>", "<enter><wait>" ], @@ -77,7 +77,7 @@ "boot_command": [ "<esc><enter><wait>", "linux netsetup=dhcp netdevice=eth0 install=cd:/<wait>", - " lang=en_US autoyast=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `autoinst_cfg`}}<wait>", + " lang=en_US.UTF-8 autoyast=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `autoinst_cfg`}}<wait>", " textmode=1<wait>", "<enter><wait>" ], @@ -117,7 +117,7 @@ "boot_command": [ "<esc><enter><wait>", "linux netsetup=dhcp netdevice=eth0 install=cd:/<wait>", - " lang=en_US autoyast=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `autoinst_cfg`}}<wait>", + " lang=en_US.UTF-8 autoyast=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `autoinst_cfg`}}<wait>", " textmode=1<wait>", "<enter><wait>" ], diff --git a/opensuse-leap-42.1-x86_64.json b/opensuse-leap-42.1-x86_64.json index ec3a3d9c5..ffa76abb4 100644 --- a/opensuse-leap-42.1-x86_64.json +++ b/opensuse-leap-42.1-x86_64.json @@ -4,7 +4,7 @@ "boot_command": [ "<esc><enter><wait>", "linux netsetup=dhcp install=cd:/<wait>", - " lang=en_US autoyast=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `autoinst_cfg`}}<wait>", + " lang=en_US.UTF-8 autoyast=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `autoinst_cfg`}}<wait>", " textmode=1<wait>", "<enter><wait>" ], @@ -46,7 +46,7 @@ "boot_command": [ "<esc><enter><wait>", "linux netsetup=dhcp install=cd:/<wait>", - " lang=en_US autoyast=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `autoinst_cfg`}}<wait>", + " lang=en_US.UTF-8 autoyast=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `autoinst_cfg`}}<wait>", " textmode=1<wait>", "<enter><wait>" ], @@ -77,7 +77,7 @@ "boot_command": [ "<esc><enter><wait>", "linux netsetup=dhcp netdevice=eth0 install=cd:/<wait>", - " lang=en_US autoyast=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `autoinst_cfg`}}<wait>", + " lang=en_US.UTF-8 autoyast=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `autoinst_cfg`}}<wait>", " textmode=1<wait>", "<enter><wait>" ], @@ -117,7 +117,7 @@ "boot_command": [ "<esc><enter><wait>", "linux netsetup=dhcp netdevice=eth0 install=cd:/<wait>", - " lang=en_US autoyast=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `autoinst_cfg`}}<wait>", + " lang=en_US.UTF-8 autoyast=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `autoinst_cfg`}}<wait>", " textmode=1<wait>", "<enter><wait>" ], diff --git a/sles-12-sp1-x86_64.json b/sles-12-sp1-x86_64.json index d8fdcd744..7930628e9 100644 --- a/sles-12-sp1-x86_64.json +++ b/sles-12-sp1-x86_64.json @@ -4,7 +4,7 @@ "boot_command": [ "<esc><enter><wait>", "linux netdevice=eth0 netsetup=dhcp install=cd:/<wait>", - " lang=en_US autoyast=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `autoinst_cfg`}}<wait>", + " lang=en_US.UTF-8 autoyast=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `autoinst_cfg`}}<wait>", " textmode=1<wait>", "<enter><wait>" ], @@ -46,7 +46,7 @@ "boot_command": [ "<esc><enter><wait>", "linux netdevice=eth0 netsetup=dhcp install=cd:/<wait>", - " lang=en_US autoyast=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `autoinst_cfg`}}<wait>", + " lang=en_US.UTF-8 autoyast=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `autoinst_cfg`}}<wait>", " textmode=1<wait>", "<enter><wait>" ], @@ -77,7 +77,7 @@ "boot_command": [ "<esc><enter><wait>", "linux netdevice=eth0 netsetup=dhcp install=cd:/<wait>", - " lang=en_US autoyast=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `autoinst_cfg`}}<wait>", + " lang=en_US.UTF-8 autoyast=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `autoinst_cfg`}}<wait>", " textmode=1<wait>", "<enter><wait>" ], @@ -117,7 +117,7 @@ "boot_command": [ "<esc><enter><wait>", "linux netdevice=eth0 netsetup=dhcp install=cd:/<wait>", - " lang=en_US autoyast=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `autoinst_cfg`}}<wait>", + " lang=en_US.UTF-8 autoyast=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `autoinst_cfg`}}<wait>", " textmode=1<wait>", "<enter><wait>" ], diff --git a/sles-12-x86_64.json b/sles-12-x86_64.json index 48abcf7df..f20d5ac46 100644 --- a/sles-12-x86_64.json +++ b/sles-12-x86_64.json @@ -4,7 +4,7 @@ "boot_command": [ "<esc><enter><wait>", "linux netdevice=eth0 netsetup=dhcp install=cd:/<wait>", - " lang=en_US autoyast=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `autoinst_cfg`}}<wait>", + " lang=en_US.UTF-8 autoyast=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `autoinst_cfg`}}<wait>", " textmode=1<wait>", "<enter><wait>" ], @@ -46,7 +46,7 @@ "boot_command": [ "<esc><enter><wait>", "linux netdevice=eth0 netsetup=dhcp install=cd:/<wait>", - " lang=en_US autoyast=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `autoinst_cfg`}}<wait>", + " lang=en_US.UTF-8 autoyast=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `autoinst_cfg`}}<wait>", " textmode=1<wait>", "<enter><wait>" ], @@ -77,7 +77,7 @@ "boot_command": [ "<esc><enter><wait>", "linux netdevice=eth0 netsetup=dhcp install=cd:/<wait>", - " lang=en_US autoyast=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `autoinst_cfg`}}<wait>", + " lang=en_US.UTF-8 autoyast=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `autoinst_cfg`}}<wait>", " textmode=1<wait>", "<enter><wait>" ], @@ -117,7 +117,7 @@ "boot_command": [ "<esc><enter><wait>", "linux netdevice=eth0 netsetup=dhcp install=cd:/<wait>", - " lang=en_US autoyast=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `autoinst_cfg`}}<wait>", + " lang=en_US.UTF-8 autoyast=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `autoinst_cfg`}}<wait>", " textmode=1<wait>", "<enter><wait>" ], diff --git a/ubuntu-12.04-amd64.json b/ubuntu-12.04-amd64.json index 86a86568e..509d73386 100644 --- a/ubuntu-12.04-amd64.json +++ b/ubuntu-12.04-amd64.json @@ -11,13 +11,13 @@ " console-setup/layoutcode=us<wait>", " console-setup/modelcode=pc105<wait>", " debconf/frontend=noninteractive<wait>", - " debian-installer=en_US<wait>", + " debian-installer=en_US.UTF-8<wait>", " fb=false<wait>", " initrd=/install/initrd.gz<wait>", " kbd-chooser/method=us<wait>", " keyboard-configuration/layout=USA<wait>", " keyboard-configuration/variant=USA<wait>", - " locale=en_US<wait>", + " locale=en_US.UTF-8<wait>", " netcfg/get_domain=vm<wait>", " netcfg/get_hostname=vagrant<wait>", " noapic<wait>", @@ -70,13 +70,13 @@ " console-setup/layoutcode=us<wait>", " console-setup/modelcode=pc105<wait>", " debconf/frontend=noninteractive<wait>", - " debian-installer=en_US<wait>", + " debian-installer=en_US.UTF-8<wait>", " fb=false<wait>", " initrd=/install/initrd.gz<wait>", " kbd-chooser/method=us<wait>", " keyboard-configuration/layout=USA<wait>", " keyboard-configuration/variant=USA<wait>", - " locale=en_US<wait>", + " locale=en_US.UTF-8<wait>", " netcfg/get_domain=vm<wait>", " netcfg/get_hostname=vagrant<wait>", " noapic<wait>", @@ -118,13 +118,13 @@ " console-setup/layoutcode=us<wait>", " console-setup/modelcode=pc105<wait>", " debconf/frontend=noninteractive<wait>", - " debian-installer=en_US<wait>", + " debian-installer=en_US.UTF-8<wait>", " fb=false<wait>", " initrd=/install/initrd.gz<wait>", " kbd-chooser/method=us<wait>", " keyboard-configuration/layout=USA<wait>", " keyboard-configuration/variant=USA<wait>", - " locale=en_US<wait>", + " locale=en_US.UTF-8<wait>", " netcfg/get_domain=vm<wait>", " netcfg/get_hostname=vagrant<wait>", " noapic<wait>", @@ -175,13 +175,13 @@ " console-setup/layoutcode=us<wait>", " console-setup/modelcode=pc105<wait>", " debconf/frontend=noninteractive<wait>", - " debian-installer=en_US<wait>", + " debian-installer=en_US.UTF-8<wait>", " fb=false<wait>", " initrd=/install/initrd.gz<wait>", " kbd-chooser/method=us<wait>", " keyboard-configuration/layout=USA<wait>", " keyboard-configuration/variant=USA<wait>", - " locale=en_US<wait>", + " locale=en_US.UTF-8<wait>", " netcfg/get_domain=vm<wait>", " netcfg/get_hostname=vagrant<wait>", " noapic<wait>", diff --git a/ubuntu-12.04-i386.json b/ubuntu-12.04-i386.json index 4bc3e7b44..04f0889ff 100644 --- a/ubuntu-12.04-i386.json +++ b/ubuntu-12.04-i386.json @@ -11,13 +11,13 @@ " console-setup/layoutcode=us<wait>", " console-setup/modelcode=pc105<wait>", " debconf/frontend=noninteractive<wait>", - " debian-installer=en_US<wait>", + " debian-installer=en_US.UTF-8<wait>", " fb=false<wait>", " initrd=/install/initrd.gz<wait>", " kbd-chooser/method=us<wait>", " keyboard-configuration/layout=USA<wait>", " keyboard-configuration/variant=USA<wait>", - " locale=en_US<wait>", + " locale=en_US.UTF-8<wait>", " netcfg/get_domain=vm<wait>", " netcfg/get_hostname=vagrant<wait>", " noapic<wait>", @@ -70,13 +70,13 @@ " console-setup/layoutcode=us<wait>", " console-setup/modelcode=pc105<wait>", " debconf/frontend=noninteractive<wait>", - " debian-installer=en_US<wait>", + " debian-installer=en_US.UTF-8<wait>", " fb=false<wait>", " initrd=/install/initrd.gz<wait>", " kbd-chooser/method=us<wait>", " keyboard-configuration/layout=USA<wait>", " keyboard-configuration/variant=USA<wait>", - " locale=en_US<wait>", + " locale=en_US.UTF-8<wait>", " netcfg/get_domain=vm<wait>", " netcfg/get_hostname=vagrant<wait>", " noapic<wait>", @@ -118,13 +118,13 @@ " console-setup/layoutcode=us<wait>", " console-setup/modelcode=pc105<wait>", " debconf/frontend=noninteractive<wait>", - " debian-installer=en_US<wait>", + " debian-installer=en_US.UTF-8<wait>", " fb=false<wait>", " initrd=/install/initrd.gz<wait>", " kbd-chooser/method=us<wait>", " keyboard-configuration/layout=USA<wait>", " keyboard-configuration/variant=USA<wait>", - " locale=en_US<wait>", + " locale=en_US.UTF-8<wait>", " netcfg/get_domain=vm<wait>", " netcfg/get_hostname=vagrant<wait>", " noapic<wait>", @@ -175,13 +175,13 @@ " console-setup/layoutcode=us<wait>", " console-setup/modelcode=pc105<wait>", " debconf/frontend=noninteractive<wait>", - " debian-installer=en_US<wait>", + " debian-installer=en_US.UTF-8<wait>", " fb=false<wait>", " initrd=/install/initrd.gz<wait>", " kbd-chooser/method=us<wait>", " keyboard-configuration/layout=USA<wait>", " keyboard-configuration/variant=USA<wait>", - " locale=en_US<wait>", + " locale=en_US.UTF-8<wait>", " netcfg/get_domain=vm<wait>", " netcfg/get_hostname=vagrant<wait>", " noapic<wait>", diff --git a/ubuntu-14.04-amd64.json b/ubuntu-14.04-amd64.json index d73149466..0c36fcc52 100644 --- a/ubuntu-14.04-amd64.json +++ b/ubuntu-14.04-amd64.json @@ -11,13 +11,13 @@ " console-setup/layoutcode=us<wait>", " console-setup/modelcode=pc105<wait>", " debconf/frontend=noninteractive<wait>", - " debian-installer=en_US<wait>", + " debian-installer=en_US.UTF-8<wait>", " fb=false<wait>", " initrd=/install/initrd.gz<wait>", " kbd-chooser/method=us<wait>", " keyboard-configuration/layout=USA<wait>", " keyboard-configuration/variant=USA<wait>", - " locale=en_US<wait>", + " locale=en_US.UTF-8<wait>", " netcfg/get_domain=vm<wait>", " netcfg/get_hostname=vagrant<wait>", " noapic<wait>", @@ -70,13 +70,13 @@ " console-setup/layoutcode=us<wait>", " console-setup/modelcode=pc105<wait>", " debconf/frontend=noninteractive<wait>", - " debian-installer=en_US<wait>", + " debian-installer=en_US.UTF-8<wait>", " fb=false<wait>", " initrd=/install/initrd.gz<wait>", " kbd-chooser/method=us<wait>", " keyboard-configuration/layout=USA<wait>", " keyboard-configuration/variant=USA<wait>", - " locale=en_US<wait>", + " locale=en_US.UTF-8<wait>", " netcfg/get_domain=vm<wait>", " netcfg/get_hostname=vagrant<wait>", " noapic<wait>", @@ -118,13 +118,13 @@ " console-setup/layoutcode=us<wait>", " console-setup/modelcode=pc105<wait>", " debconf/frontend=noninteractive<wait>", - " debian-installer=en_US<wait>", + " debian-installer=en_US.UTF-8<wait>", " fb=false<wait>", " initrd=/install/initrd.gz<wait>", " kbd-chooser/method=us<wait>", " keyboard-configuration/layout=USA<wait>", " keyboard-configuration/variant=USA<wait>", - " locale=en_US<wait>", + " locale=en_US.UTF-8<wait>", " netcfg/get_domain=vm<wait>", " netcfg/get_hostname=vagrant<wait>", " noapic<wait>", @@ -175,13 +175,13 @@ " console-setup/layoutcode=us<wait>", " console-setup/modelcode=pc105<wait>", " debconf/frontend=noninteractive<wait>", - " debian-installer=en_US<wait>", + " debian-installer=en_US.UTF-8<wait>", " fb=false<wait>", " initrd=/install/initrd.gz<wait>", " kbd-chooser/method=us<wait>", " keyboard-configuration/layout=USA<wait>", " keyboard-configuration/variant=USA<wait>", - " locale=en_US<wait>", + " locale=en_US.UTF-8<wait>", " netcfg/get_domain=vm<wait>", " netcfg/get_hostname=vagrant<wait>", " noapic<wait>", diff --git a/ubuntu-14.04-i386.json b/ubuntu-14.04-i386.json index ff7e559ad..930880372 100644 --- a/ubuntu-14.04-i386.json +++ b/ubuntu-14.04-i386.json @@ -11,13 +11,13 @@ " console-setup/layoutcode=us<wait>", " console-setup/modelcode=pc105<wait>", " debconf/frontend=noninteractive<wait>", - " debian-installer=en_US<wait>", + " debian-installer=en_US.UTF-8<wait>", " fb=false<wait>", " initrd=/install/initrd.gz<wait>", " kbd-chooser/method=us<wait>", " keyboard-configuration/layout=USA<wait>", " keyboard-configuration/variant=USA<wait>", - " locale=en_US<wait>", + " locale=en_US.UTF-8<wait>", " netcfg/get_domain=vm<wait>", " netcfg/get_hostname=vagrant<wait>", " noapic<wait>", @@ -70,13 +70,13 @@ " console-setup/layoutcode=us<wait>", " console-setup/modelcode=pc105<wait>", " debconf/frontend=noninteractive<wait>", - " debian-installer=en_US<wait>", + " debian-installer=en_US.UTF-8<wait>", " fb=false<wait>", " initrd=/install/initrd.gz<wait>", " kbd-chooser/method=us<wait>", " keyboard-configuration/layout=USA<wait>", " keyboard-configuration/variant=USA<wait>", - " locale=en_US<wait>", + " locale=en_US.UTF-8<wait>", " netcfg/get_domain=vm<wait>", " netcfg/get_hostname=vagrant<wait>", " noapic<wait>", @@ -118,13 +118,13 @@ " console-setup/layoutcode=us<wait>", " console-setup/modelcode=pc105<wait>", " debconf/frontend=noninteractive<wait>", - " debian-installer=en_US<wait>", + " debian-installer=en_US.UTF-8<wait>", " fb=false<wait>", " initrd=/install/initrd.gz<wait>", " kbd-chooser/method=us<wait>", " keyboard-configuration/layout=USA<wait>", " keyboard-configuration/variant=USA<wait>", - " locale=en_US<wait>", + " locale=en_US.UTF-8<wait>", " netcfg/get_domain=vm<wait>", " netcfg/get_hostname=vagrant<wait>", " noapic<wait>", @@ -175,13 +175,13 @@ " console-setup/layoutcode=us<wait>", " console-setup/modelcode=pc105<wait>", " debconf/frontend=noninteractive<wait>", - " debian-installer=en_US<wait>", + " debian-installer=en_US.UTF-8<wait>", " fb=false<wait>", " initrd=/install/initrd.gz<wait>", " kbd-chooser/method=us<wait>", " keyboard-configuration/layout=USA<wait>", " keyboard-configuration/variant=USA<wait>", - " locale=en_US<wait>", + " locale=en_US.UTF-8<wait>", " netcfg/get_domain=vm<wait>", " netcfg/get_hostname=vagrant<wait>", " noapic<wait>", diff --git a/ubuntu-15.10-amd64.json b/ubuntu-15.10-amd64.json index 53707ffc5..f137e6559 100644 --- a/ubuntu-15.10-amd64.json +++ b/ubuntu-15.10-amd64.json @@ -12,13 +12,13 @@ " console-setup/layoutcode=us<wait>", " console-setup/modelcode=pc105<wait>", " debconf/frontend=noninteractive<wait>", - " debian-installer=en_US<wait>", + " debian-installer=en_US.UTF-8<wait>", " fb=false<wait>", " initrd=/install/initrd.gz<wait>", " kbd-chooser/method=us<wait>", " keyboard-configuration/layout=USA<wait>", " keyboard-configuration/variant=USA<wait>", - " locale=en_US<wait>", + " locale=en_US.UTF-8<wait>", " netcfg/get_domain=vm<wait>", " netcfg/get_hostname=vagrant<wait>", " grub-installer/bootdev=/dev/sda<wait>", @@ -73,13 +73,13 @@ " console-setup/layoutcode=us<wait>", " console-setup/modelcode=pc105<wait>", " debconf/frontend=noninteractive<wait>", - " debian-installer=en_US<wait>", + " debian-installer=en_US.UTF-8<wait>", " fb=false<wait>", " initrd=/install/initrd.gz<wait>", " kbd-chooser/method=us<wait>", " keyboard-configuration/layout=USA<wait>", " keyboard-configuration/variant=USA<wait>", - " locale=en_US<wait>", + " locale=en_US.UTF-8<wait>", " netcfg/get_domain=vm<wait>", " netcfg/get_hostname=vagrant<wait>", " grub-installer/bootdev=/dev/sda<wait>", @@ -124,13 +124,13 @@ " console-setup/layoutcode=us<wait>", " console-setup/modelcode=pc105<wait>", " debconf/frontend=noninteractive<wait>", - " debian-installer=en_US<wait>", + " debian-installer=en_US.UTF-8<wait>", " fb=false<wait>", " initrd=/install/initrd.gz<wait>", " kbd-chooser/method=us<wait>", " keyboard-configuration/layout=USA<wait>", " keyboard-configuration/variant=USA<wait>", - " locale=en_US<wait>", + " locale=en_US.UTF-8<wait>", " netcfg/get_domain=vm<wait>", " netcfg/get_hostname=vagrant<wait>", " grub-installer/bootdev=/dev/sda<wait>", @@ -183,13 +183,13 @@ " console-setup/layoutcode=us<wait>", " console-setup/modelcode=pc105<wait>", " debconf/frontend=noninteractive<wait>", - " debian-installer=en_US<wait>", + " debian-installer=en_US.UTF-8<wait>", " fb=false<wait>", " initrd=/install/initrd.gz<wait>", " kbd-chooser/method=us<wait>", " keyboard-configuration/layout=USA<wait>", " keyboard-configuration/variant=USA<wait>", - " locale=en_US<wait>", + " locale=en_US.UTF-8<wait>", " netcfg/get_domain=vm<wait>", " netcfg/get_hostname=vagrant<wait>", " grub-installer/bootdev=/dev/vda<wait>", diff --git a/ubuntu-15.10-i386.json b/ubuntu-15.10-i386.json index 52c14a620..07bd12acd 100644 --- a/ubuntu-15.10-i386.json +++ b/ubuntu-15.10-i386.json @@ -12,13 +12,13 @@ " console-setup/layoutcode=us<wait>", " console-setup/modelcode=pc105<wait>", " debconf/frontend=noninteractive<wait>", - " debian-installer=en_US<wait>", + " debian-installer=en_US.UTF-8<wait>", " fb=false<wait>", " initrd=/install/initrd.gz<wait>", " kbd-chooser/method=us<wait>", " keyboard-configuration/layout=USA<wait>", " keyboard-configuration/variant=USA<wait>", - " locale=en_US<wait>", + " locale=en_US.UTF-8<wait>", " netcfg/get_domain=vm<wait>", " netcfg/get_hostname=vagrant<wait>", " grub-installer/bootdev=/dev/sda <wait>", @@ -73,13 +73,13 @@ " console-setup/layoutcode=us<wait>", " console-setup/modelcode=pc105<wait>", " debconf/frontend=noninteractive<wait>", - " debian-installer=en_US<wait>", + " debian-installer=en_US.UTF-8<wait>", " fb=false<wait>", " initrd=/install/initrd.gz<wait>", " kbd-chooser/method=us<wait>", " keyboard-configuration/layout=USA<wait>", " keyboard-configuration/variant=USA<wait>", - " locale=en_US<wait>", + " locale=en_US.UTF-8<wait>", " netcfg/get_domain=vm<wait>", " netcfg/get_hostname=vagrant<wait>", " grub-installer/bootdev=/dev/sda <wait>", @@ -124,13 +124,13 @@ " console-setup/layoutcode=us<wait>", " console-setup/modelcode=pc105<wait>", " debconf/frontend=noninteractive<wait>", - " debian-installer=en_US<wait>", + " debian-installer=en_US.UTF-8<wait>", " fb=false<wait>", " initrd=/install/initrd.gz<wait>", " kbd-chooser/method=us<wait>", " keyboard-configuration/layout=USA<wait>", " keyboard-configuration/variant=USA<wait>", - " locale=en_US<wait>", + " locale=en_US.UTF-8<wait>", " netcfg/get_domain=vm<wait>", " netcfg/get_hostname=vagrant<wait>", " grub-installer/bootdev=/dev/sda <wait>", @@ -183,13 +183,13 @@ " console-setup/layoutcode=us<wait>", " console-setup/modelcode=pc105<wait>", " debconf/frontend=noninteractive<wait>", - " debian-installer=en_US<wait>", + " debian-installer=en_US.UTF-8<wait>", " fb=false<wait>", " initrd=/install/initrd.gz<wait>", " kbd-chooser/method=us<wait>", " keyboard-configuration/layout=USA<wait>", " keyboard-configuration/variant=USA<wait>", - " locale=en_US<wait>", + " locale=en_US.UTF-8<wait>", " netcfg/get_domain=vm<wait>", " netcfg/get_hostname=vagrant<wait>", " grub-installer/bootdev=/dev/vda <wait>", diff --git a/ubuntu-16.04-amd64.json b/ubuntu-16.04-amd64.json index 49ce36c05..3adcfc235 100644 --- a/ubuntu-16.04-amd64.json +++ b/ubuntu-16.04-amd64.json @@ -12,13 +12,13 @@ " console-setup/layoutcode=us<wait>", " console-setup/modelcode=pc105<wait>", " debconf/frontend=noninteractive<wait>", - " debian-installer=en_US<wait>", + " debian-installer=en_US.UTF-8<wait>", " fb=false<wait>", " initrd=/install/initrd.gz<wait>", " kbd-chooser/method=us<wait>", " keyboard-configuration/layout=USA<wait>", " keyboard-configuration/variant=USA<wait>", - " locale=en_US<wait>", + " locale=en_US.UTF-8<wait>", " netcfg/get_domain=vm<wait>", " netcfg/get_hostname=vagrant<wait>", " grub-installer/bootdev=/dev/sda<wait>", @@ -73,13 +73,13 @@ " console-setup/layoutcode=us<wait>", " console-setup/modelcode=pc105<wait>", " debconf/frontend=noninteractive<wait>", - " debian-installer=en_US<wait>", + " debian-installer=en_US.UTF-8<wait>", " fb=false<wait>", " initrd=/install/initrd.gz<wait>", " kbd-chooser/method=us<wait>", " keyboard-configuration/layout=USA<wait>", " keyboard-configuration/variant=USA<wait>", - " locale=en_US<wait>", + " locale=en_US.UTF-8<wait>", " netcfg/get_domain=vm<wait>", " netcfg/get_hostname=vagrant<wait>", " grub-installer/bootdev=/dev/sda<wait>", @@ -124,13 +124,13 @@ " console-setup/layoutcode=us<wait>", " console-setup/modelcode=pc105<wait>", " debconf/frontend=noninteractive<wait>", - " debian-installer=en_US<wait>", + " debian-installer=en_US.UTF-8<wait>", " fb=false<wait>", " initrd=/install/initrd.gz<wait>", " kbd-chooser/method=us<wait>", " keyboard-configuration/layout=USA<wait>", " keyboard-configuration/variant=USA<wait>", - " locale=en_US<wait>", + " locale=en_US.UTF-8<wait>", " netcfg/get_domain=vm<wait>", " netcfg/get_hostname=vagrant<wait>", " grub-installer/bootdev=/dev/sda<wait>", @@ -183,13 +183,13 @@ " console-setup/layoutcode=us<wait>", " console-setup/modelcode=pc105<wait>", " debconf/frontend=noninteractive<wait>", - " debian-installer=en_US<wait>", + " debian-installer=en_US.UTF-8<wait>", " fb=false<wait>", " initrd=/install/initrd.gz<wait>", " kbd-chooser/method=us<wait>", " keyboard-configuration/layout=USA<wait>", " keyboard-configuration/variant=USA<wait>", - " locale=en_US<wait>", + " locale=en_US.UTF-8<wait>", " netcfg/get_domain=vm<wait>", " netcfg/get_hostname=vagrant<wait>", " grub-installer/bootdev=/dev/vda<wait>", diff --git a/ubuntu-16.04-i386.json b/ubuntu-16.04-i386.json index c40435672..74c5ef71b 100644 --- a/ubuntu-16.04-i386.json +++ b/ubuntu-16.04-i386.json @@ -12,13 +12,13 @@ " console-setup/layoutcode=us<wait>", " console-setup/modelcode=pc105<wait>", " debconf/frontend=noninteractive<wait>", - " debian-installer=en_US<wait>", + " debian-installer=en_US.UTF-8<wait>", " fb=false<wait>", " initrd=/install/initrd.gz<wait>", " kbd-chooser/method=us<wait>", " keyboard-configuration/layout=USA<wait>", " keyboard-configuration/variant=USA<wait>", - " locale=en_US<wait>", + " locale=en_US.UTF-8<wait>", " netcfg/get_domain=vm<wait>", " netcfg/get_hostname=vagrant<wait>", " grub-installer/bootdev=/dev/sda <wait>", @@ -73,13 +73,13 @@ " console-setup/layoutcode=us<wait>", " console-setup/modelcode=pc105<wait>", " debconf/frontend=noninteractive<wait>", - " debian-installer=en_US<wait>", + " debian-installer=en_US.UTF-8<wait>", " fb=false<wait>", " initrd=/install/initrd.gz<wait>", " kbd-chooser/method=us<wait>", " keyboard-configuration/layout=USA<wait>", " keyboard-configuration/variant=USA<wait>", - " locale=en_US<wait>", + " locale=en_US.UTF-8<wait>", " netcfg/get_domain=vm<wait>", " netcfg/get_hostname=vagrant<wait>", " grub-installer/bootdev=/dev/sda <wait>", @@ -124,13 +124,13 @@ " console-setup/layoutcode=us<wait>", " console-setup/modelcode=pc105<wait>", " debconf/frontend=noninteractive<wait>", - " debian-installer=en_US<wait>", + " debian-installer=en_US.UTF-8<wait>", " fb=false<wait>", " initrd=/install/initrd.gz<wait>", " kbd-chooser/method=us<wait>", " keyboard-configuration/layout=USA<wait>", " keyboard-configuration/variant=USA<wait>", - " locale=en_US<wait>", + " locale=en_US.UTF-8<wait>", " netcfg/get_domain=vm<wait>", " netcfg/get_hostname=vagrant<wait>", " grub-installer/bootdev=/dev/sda <wait>", @@ -183,13 +183,13 @@ " console-setup/layoutcode=us<wait>", " console-setup/modelcode=pc105<wait>", " debconf/frontend=noninteractive<wait>", - " debian-installer=en_US<wait>", + " debian-installer=en_US.UTF-8<wait>", " fb=false<wait>", " initrd=/install/initrd.gz<wait>", " kbd-chooser/method=us<wait>", " keyboard-configuration/layout=USA<wait>", " keyboard-configuration/variant=USA<wait>", - " locale=en_US<wait>", + " locale=en_US.UTF-8<wait>", " netcfg/get_domain=vm<wait>", " netcfg/get_hostname=vagrant<wait>", " grub-installer/bootdev=/dev/vda <wait>", From e30888eacd81beba5ae546ad511746198bd9ae8e Mon Sep 17 00:00:00 2001 From: Meg Cassidy <kameghamegha@users.noreply.github.com> Date: Fri, 11 Nov 2016 12:14:17 -0800 Subject: [PATCH 0557/1622] Created Sierra packer template Just duplicated the 10.11 template and changed the title to remove the x (since it's just MacOS now) and update the version. Also updated the version inside the variables section to the same. Virtualbox guest_os_type stays as MacOS1011_64 because there is no 1012 official support yet from virtualbox, but the 1011 os type works. Signed-off-by: Meg Cassidy <kameghamegha@users.noreply.github.com> --- macos-10.12.json | 234 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 234 insertions(+) create mode 100644 macos-10.12.json diff --git a/macos-10.12.json b/macos-10.12.json new file mode 100644 index 000000000..3ca874cc4 --- /dev/null +++ b/macos-10.12.json @@ -0,0 +1,234 @@ +{ + "builders": [ + { + "boot_wait": "2s", + "disk_size": "{{user `disk_size`}}", + "guest_os_type": "darwin12-64", + "headless": "{{ user `headless` }}", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `iso_url`}}", + "output_directory": "packer-{{user `template`}}-vmware", + "shutdown_command": "echo 'vagrant'| sudo -S shutdown -h now", + "skip_compaction": true, + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "tools_upload_flavor": "darwin", + "tools_upload_path": "/tmp/vmtools.iso", + "type": "vmware-iso", + "vm_name": "{{ user `template` }}", + "vmx_data": { + "cpuid.coresPerSocket": "1", + "ehci.present": "TRUE", + "firmware": "efi", + "hpet0.present": "TRUE", + "ich7m.present": "TRUE", + "keyboardAndMouseProfile": "macProfile", + "memsize": "{{ user `memory` }}", + "numvcpus": "{{ user `cpus` }}", + "smc.present": "TRUE", + "usb.present": "TRUE" + } + }, + { + "boot_wait": "2s", + "disk_size": "{{user `disk_size`}}", + "guest_additions_mode": "disable", + "guest_os_type": "MacOS1011_64", + "hard_drive_interface": "sata", + "headless": "{{ user `headless` }}", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `iso_url`}}", + "output_directory": "packer-{{user `template`}}-virtualbox", + "shutdown_command": "echo 'vagrant'| sudo -S shutdown -h now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "virtualbox-iso", + "vboxmanage": [ + [ + "modifyvm", + "{{.Name}}", + "--audiocontroller", + "hda" + ], + [ + "modifyvm", + "{{.Name}}", + "--boot1", + "dvd" + ], + [ + "modifyvm", + "{{.Name}}", + "--boot2", + "disk" + ], + [ + "modifyvm", + "{{.Name}}", + "--chipset", + "ich9" + ], + [ + "modifyvm", + "{{.Name}}", + "--cpus", + "{{ user `cpus` }}" + ], + [ + "modifyvm", + "{{.Name}}", + "--firmware", + "efi" + ], + [ + "modifyvm", + "{{.Name}}", + "--hpet", + "on" + ], + [ + "modifyvm", + "{{.Name}}", + "--keyboard", + "usb" + ], + [ + "modifyvm", + "{{.Name}}", + "--memory", + "{{ user `memory` }}" + ], + [ + "modifyvm", + "{{.Name}}", + "--mouse", + "usbtablet" + ], + [ + "modifyvm", + "{{.Name}}", + "--vram", + "9" + ], + [ + "storageattach", + "{{.Name}}", + "--storagectl", + "SATA Controller", + "--port", + "{{ user `cpus` }}", + "--type", + "dvddrive", + "--medium", + "{{user `iso_url`}}" + ] + ], + "vboxmanage_post": [ + [ + "storageattach", + "{{.Name}}", + "--storagectl", + "SATA Controller", + "--port", + "{{ user `cpus` }}", + "--type", + "dvddrive", + "--medium", + "none" + ], + [ + "storagectl", + "{{.Name}}", + "--name", + "IDE Controller", + "--remove" + ] + ], + "virtualbox_version_file": ".vbox_version", + "vm_name": "{{ user `template` }}" + }, + { + "boot_wait": "2s", + "disk_size": "{{user `disk_size`}}", + "guest_os_type": "macosx", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `iso_url`}}", + "output_directory": "packer-{{user `template`}}-parallels", + "parallels_tools_flavor": "mac", + "prlctl": [ + ["set", "{{.Name}}", "--memsize", "{{ user `memory` }}"], + ["set", "{{.Name}}", "--cpus", "{{ user `cpus` }}"], + ["set", "{{.Name}}", "--on-window-close", "keep-running"] + ], + "shutdown_command": "echo 'vagrant'| sudo -S shutdown -h now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "parallels-iso", + "vm_name": "{{ user `template` }}" + } + ], + "post-processors": [ + { + "output": "builds/{{user `box_basename`}}.{{.Provider}}.box", + "type": "vagrant", + "vagrantfile_template": "vagrantfile_templates/macosx.rb" + } + ], + "provisioners": [ + { + "destination": "/tmp/bento-metadata.json", + "source": "{{user `metadata`}}", + "type": "file" + }, + { + "environment_vars": [ + "HOME_DIR=/Users/vagrant", + "http_proxy={{user `http_proxy`}}", + "https_proxy={{user `https_proxy`}}", + "no_proxy={{user `no_proxy`}}" + ], + "execute_command": "echo 'vagrant'| {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", + "scripts": [ + "scripts/common/metadata.sh", + "scripts/macosx/hostname.sh", + "scripts/macosx/update.sh", + "scripts/macosx/networking.sh", + "scripts/macosx/disablesleep.sh", + "scripts/macosx/vagrant.sh", + "scripts/macosx/vmtools.sh", + "scripts/macosx/cleanup.sh", + "scripts/macosx/minimize.sh" + ], + "type": "shell" + } + ], + "variables": { + "_README": "You must provide a prepared Mac disk image (from https://github.com/timsutton/osx-vm-templates) and checksum value for this template to work. For more details, consult this project's README.md", + "box_basename": "macos-10.12", + "build_timestamp": "{{isotime \"20060102150405\"}}", + "cpus": "1", + "disk_size": "40960", + "git_revision": "__unknown_git_revision__", + "headless": "", + "http_proxy": "{{env `http_proxy`}}", + "https_proxy": "{{env `https_proxy`}}", + "iso_checksum": "__unset_iso_checksum__", + "iso_checksum_type": "md5", + "iso_url": "http://YOU-MUST-PROVIDE-YOUR-OWN-DMG.sorry", + "memory": "2048", + "metadata": "floppy/dummy_metadata.json", + "name": "macos-10.12", + "no_proxy": "{{env `no_proxy`}}", + "template": "macos-10.12", + "version": "2.1.TIMESTAMP" + } +} From 229eef56b53cd14673379ce35faf9bd4148e3aa1 Mon Sep 17 00:00:00 2001 From: Meg Cassidy <kameghamegha@users.noreply.github.com> Date: Fri, 11 Nov 2016 13:13:27 -0800 Subject: [PATCH 0558/1622] Fixed update.sh to work with Sierra This section would hang at the "Searching for Software Updates" prompt and never finish. To fix it, I had to add the --verbose and --force flags to be compatible with 10.12, as well as triggering a background scan. It would then fail during the vboxmanage_post command for the IDE Controller, because the shutdown was failing to complete properly (the background scan didn't seem to be finished). The sleep line fixes this. Signed-off-by: Meg Cassidy <kameghamegha@users.noreply.github.com> --- scripts/macosx/update.sh | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/scripts/macosx/update.sh b/scripts/macosx/update.sh index b4cd8ff93..e1415eb01 100644 --- a/scripts/macosx/update.sh +++ b/scripts/macosx/update.sh @@ -1,3 +1,16 @@ #!/bin/sh -eux -softwareupdate --install --all; +MACOS_VERS=$(sw_vers -productVersion | awk -F "." '{print $2}') + +if [ "$MACOS_VERS" -le 11 ] ; then + softwareupdate --install --all; +fi + +# --force became an option in 10.12 (Sierra) and will fail on other versions +if [ "$MACOS_VERS" -ge 12 ] ; then + softwareupdate --background --force --verbose; + softwareupdate --install --all --force --verbose; + # vboxmanage_post commands fail without this sleep because the system + # is not done with the softwareupdate background checks + sleep 3; +fi From 9200266ae9f7d71b8dc21537f9f5bf7fbfc6d3e5 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith@chef.io> Date: Wed, 16 Nov 2016 20:04:31 -0800 Subject: [PATCH 0559/1622] Clean up kernels on modern Ubuntu systems This drops the image size by about 50 megs Signed-off-by: Tim Smith <tsmith@chef.io> --- scripts/ubuntu/cleanup.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/ubuntu/cleanup.sh b/scripts/ubuntu/cleanup.sh index c2306880f..55ebc9de8 100644 --- a/scripts/ubuntu/cleanup.sh +++ b/scripts/ubuntu/cleanup.sh @@ -11,7 +11,7 @@ dpkg --list \ # e.g. 'linux-image-generic', etc. dpkg --list \ | awk '{ print $2 }' \ - | grep 'linux-image-3.*-generic' \ + | grep 'linux-image-.*-generic' \ | grep -v `uname -r` \ | xargs apt-get -y purge; From 57d9002267055c05fb99b08e169b97a316ef9d26 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith@chef.io> Date: Wed, 16 Nov 2016 21:16:22 -0800 Subject: [PATCH 0560/1622] =?UTF-8?q?Purge=20additional=20packages=20that?= =?UTF-8?q?=20don=E2=80=99t=20make=20sense=20on=20a=20test=20box?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit These packages are only relevant for pets. They don’t make sense here. Signed-off-by: Tim Smith <tsmith@chef.io> --- scripts/ubuntu/cleanup.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/ubuntu/cleanup.sh b/scripts/ubuntu/cleanup.sh index 55ebc9de8..abc09e55a 100644 --- a/scripts/ubuntu/cleanup.sh +++ b/scripts/ubuntu/cleanup.sh @@ -34,7 +34,7 @@ apt-get -y purge libx11-data xauth libxmuu1 libxcb1 libx11-6 libxext6; apt-get -y purge ppp pppconfig pppoeconf; # Delete oddities -apt-get -y purge popularity-contest; +apt-get -y purge popularity-contest installation-report command-not-found command-not-found-data friendly-recovery; apt-get -y autoremove; apt-get -y clean; From 4afad31c637f5c72f5e4b3165ae0c8c62ba52429 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith@chef.io> Date: Wed, 16 Nov 2016 21:18:26 -0800 Subject: [PATCH 0561/1622] Nuke the logs for /var/log MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It’s not much, but we might as well do it Signed-off-by: Tim Smith <tsmith@chef.io> --- scripts/ubuntu/cleanup.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/scripts/ubuntu/cleanup.sh b/scripts/ubuntu/cleanup.sh index abc09e55a..0f548aafb 100644 --- a/scripts/ubuntu/cleanup.sh +++ b/scripts/ubuntu/cleanup.sh @@ -40,3 +40,6 @@ apt-get -y autoremove; apt-get -y clean; rm -f VBoxGuestAdditions_*.iso VBoxGuestAdditions_*.iso.?; + +# delete any logs that have built up during the install +find /var/log/ -name *.log -exec rm -f {} \; From 83f93f37a205844d8cd196d0c12e50646db91d7f Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith@chef.io> Date: Wed, 16 Nov 2016 21:54:47 -0800 Subject: [PATCH 0562/1622] Remove docs packages This is currently just libssl-doc which is about 3 megs! Signed-off-by: Tim Smith <tsmith@chef.io> --- scripts/ubuntu/cleanup.sh | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/scripts/ubuntu/cleanup.sh b/scripts/ubuntu/cleanup.sh index 0f548aafb..1f128c115 100644 --- a/scripts/ubuntu/cleanup.sh +++ b/scripts/ubuntu/cleanup.sh @@ -27,6 +27,12 @@ dpkg --list \ | grep -- '-dev$' \ | xargs apt-get -y purge; +# delete docs packages +dpkg --list \ + | awk '{ print $2 }' \ + | grep -- '-doc$' \ + | xargs apt-get -y purge; + # Delete X11 libraries apt-get -y purge libx11-data xauth libxmuu1 libxcb1 libx11-6 libxext6; From eafd39b804dd67224776ea9e4fc4b5d31331fde7 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith@chef.io> Date: Thu, 17 Nov 2016 00:22:45 -0800 Subject: [PATCH 0563/1622] Remove docs Signed-off-by: Tim Smith <tsmith@chef.io> --- scripts/ubuntu/cleanup.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/scripts/ubuntu/cleanup.sh b/scripts/ubuntu/cleanup.sh index 1f128c115..8bfbf2aa5 100644 --- a/scripts/ubuntu/cleanup.sh +++ b/scripts/ubuntu/cleanup.sh @@ -47,5 +47,8 @@ apt-get -y clean; rm -f VBoxGuestAdditions_*.iso VBoxGuestAdditions_*.iso.?; +# Remove docs +rm -rf /usr/share/doc/* + # delete any logs that have built up during the install find /var/log/ -name *.log -exec rm -f {} \; From a5e552a0efbb63aa2f08430ca46dbdb771c51091 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith@chef.io> Date: Thu, 17 Nov 2016 00:22:55 -0800 Subject: [PATCH 0564/1622] Remove caches Signed-off-by: Tim Smith <tsmith@chef.io> --- scripts/ubuntu/cleanup.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/scripts/ubuntu/cleanup.sh b/scripts/ubuntu/cleanup.sh index 8bfbf2aa5..4b22ea875 100644 --- a/scripts/ubuntu/cleanup.sh +++ b/scripts/ubuntu/cleanup.sh @@ -50,5 +50,8 @@ rm -f VBoxGuestAdditions_*.iso VBoxGuestAdditions_*.iso.?; # Remove docs rm -rf /usr/share/doc/* +# Remove caches +find /var/cache -type f -exec rm -rf {} \; + # delete any logs that have built up during the install find /var/log/ -name *.log -exec rm -f {} \; From 8acb7837fd540452273243d9c6c333d30af6c56b Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith@chef.io> Date: Thu, 17 Nov 2016 11:57:32 -0800 Subject: [PATCH 0565/1622] Whiteout both / and /boot This is a modified version of the code from boxcutter Signed-off-by: Tim Smith <tsmith@chef.io> --- scripts/common/minimize.sh | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/scripts/common/minimize.sh b/scripts/common/minimize.sh index 045d7be43..0173b4233 100644 --- a/scripts/common/minimize.sh +++ b/scripts/common/minimize.sh @@ -4,6 +4,18 @@ case "$PACKER_BUILDER_TYPE" in qemu) exit 0 ;; esac +# Whiteout root +count=$(df --sync -kP / | tail -n1 | awk -F ' ' '{print $4}') +count=$(($count-1)) +dd if=/dev/zero of=/tmp/whitespace bs=1M count=$count || echo "dd exit code $? is suppressed"; +rm /tmp/whitespace + +# Whiteout /boot +count=$(df --sync -kP /boot | tail -n1 | awk -F ' ' '{print $4}') +count=$(($count-1)) +dd if=/dev/zero of=/boot/whitespace bs=1M count=$count || echo "dd exit code $? is suppressed"; +rm /boot/whitespace + set +e swapuuid="`/sbin/blkid -o value -l -s UUID -t TYPE=swap`"; case "$?" in @@ -21,8 +33,4 @@ if [ "x${swapuuid}" != "x" ]; then /sbin/mkswap -U "$swapuuid" "$swappart"; fi -dd if=/dev/zero of=/EMPTY bs=1M || echo "dd exit code $? is suppressed"; -rm -f /EMPTY; -# Block until the empty file has been removed, otherwise, Packer -# will try to kill the box while the disk is still full and that's bad sync; From 8b7db01ef4ce55538975cfaea9cbbd7d41ca373c Mon Sep 17 00:00:00 2001 From: Seth Thomas <sthomas@chef.io> Date: Fri, 18 Nov 2016 10:02:25 -0500 Subject: [PATCH 0566/1622] Update changelog and readme Signed-off-by: Seth Thomas <sthomas@chef.io> --- CHANGELOG.md | 36 ++++++++++ README.md | 192 +++++++++++++++++++++------------------------------ 2 files changed, 115 insertions(+), 113 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 582e79c49..aab87a7ac 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,41 @@ # Change Log +## [2.3.0](https://github.com/chef/bento/tree/2.3.0) (2016-09-30) +[Full Changelog](https://github.com/chef/bento/compare/2.2.9...2.3.0) + +**SPECIAL NOTE:** + +Due to issues with upstream projects that bento relies upon, the 2.3.0 release may appear to break. +Please ensure that Virtualbox is at least 5.1.6 and Vagrant at least 1.8.6 before reporting issues. + +**Added Platforms:** + +- add Debian 8.6 [\#669](https://github.com/chef/bento/issues/669) + +**Improvements:** + +- Changed the vagrant users UID from 900 to 1000. Fix \#688 [\#675](https://github.com/chef/bento/pull/675) ([rickard-von-essen](https://github.com/rickard-von-essen)) +- Updating build.sh with more env vars [\#672](https://github.com/chef/bento/pull/672) ([cheeseplus](https://github.com/cheeseplus)) +- Add script to disable system sleep for Mac OS X [\#656](https://github.com/chef/bento/pull/656) ([cblecker](https://github.com/cblecker)) +- Renames "ubuntu-server" task -\> "server" for Ubuntu 14.04 [\#654](https://github.com/chef/bento/pull/654) ([conorsch](https://github.com/conorsch)) +- Speed up booting process for FreeBSD saving 10 seconds in boot time [\#648](https://github.com/chef/bento/pull/648) ([amontalban](https://github.com/amontalban)) +- Check to see if release has already taken place [\#644](https://github.com/chef/bento/pull/644) ([cheeseplus](https://github.com/cheeseplus)) +- Add script for sles-12-sp1 [\#643](https://github.com/chef/bento/pull/643) ([oven](https://github.com/oven)) +- Refactored vmware tools scripts [\#638](https://github.com/chef/bento/pull/638) ([svpace](https://github.com/svpace)) + +**Known Issues:** + +- CentOS 5 guests in VirtualBox 5.1.x fatally exit with a guru mediation error so v2.3.0 does not exist on Atlas + +**Tool Versions:** + +- Packer 0.11.0 (master) +- VirtualBox 5.1.16 +- VMware Fusion 8.5.1 +- VMware Workstation 12.5.1 +- Parallels Pro 12.0.2 +- Vagrant 1.8.6 + ## [2.2.9](https://github.com/chef/bento/tree/2.2.9) (2016-08-01) [Full Changelog](https://github.com/chef/bento/compare/2.2.8...2.2.9) diff --git a/README.md b/README.md index b6969bf72..61dbc3203 100644 --- a/README.md +++ b/README.md @@ -14,23 +14,23 @@ This project is managed by the CHEF Release Engineering team. For more informati ## Pre-built Boxes The following boxes are built from this repository's templates for publicly available platforms and are currently hosted via Atlas in the [bento organization](https://atlas.hashicorp.com/bento/). +Boxes listed that are struck out (~~box~~) are broken/unreleased for the current version. ### 64 bit | | VirtualBox | VMware | Parallels | | ------------ | ------------- | ------------- | ------------- | -| centos-5.11 | [x86_64][centos_511_64_vbox] | [x86_64][centos_511_64_vmware] | [x86_64][centos_511_64_prl] | +| centos-5.11 | ~~[x86_64][centos_511_64_vbox]~~ | ~~[x86_64][centos_511_64_vmware]~~ | ~~[x86_64][centos_511_64_prl]~~ | | centos-6.8 | [x86_64][centos_68_64_vbox] | [x86_64][centos_68_64_vmware] | [x86_64][centos_68_64_prl] | | centos-7.2 | [x86_64][centos_72_64_vbox] | [x86_64][centos_72_64_vmware] | [x86_64][centos_72_64_prl] | | debian-7.11 | [amd64][debian_711_64_vbox] | [amd64][debian_711_64_vmware] | [amd64][debian_711_64_prl] | -| debian-8.5 | [amd64][debian_85_64_vbox] | [amd64][debian_85_64_vmware] | [amd64][debian_85_64_prl] | +| debian-8.6 | [amd64][debian_86_64_vbox] | [amd64][debian_86_64_vmware] | [amd64][debian_86_64_prl] | | fedora-23 | [x86_64][fedora_23_64_vbox] | [x86_64][fedora_23_64_vmware] | [x86_64][fedora_23_64_prl] | | fedora-24 | [x86_64][fedora_24_64_vbox] | [x86_64][fedora_24_64_vmware] | [x86_64][fedora_24_64_prl] | | freebsd-9.3 | [amd64][freebsd_93_64_vbox] | [amd64][freebsd_93_64_vmware] | [amd64][freebsd_93_64_prl] | | freebsd-10.3 | [amd64][freebsd_103_64_vbox] | [amd64][freebsd_103_64_vmware] | [amd64][freebsd_103_64_prl] | -| opensuse-13.2 | [x86_64][osuse_132_64_vbox] | [x86_64][osuse_132_64_vmware] | [x86_64][osuse_132_64_prl] | +| opensuse-13.2 | [x86_64][osuse_132_64_vbox] | ~~[x86_64][osuse_132_64_vmware]~~ | [x86_64][osuse_132_64_prl] | | ubuntu-12.04 | [amd64][ubuntu_1204_64_vbox] | [amd64][ubuntu_1204_64_vmware] | [amd64][ubuntu_1204_64_prl] | | ubuntu-14.04 | [amd64][ubuntu_1404_64_vbox] | [amd64][ubuntu_1404_64_vmware] | [amd64][ubuntu_1404_64_prl] | -| ubuntu-15.10 | [amd64][ubuntu_1510_64_vbox] | [amd64][ubuntu_1510_64_vmware] | [amd64][ubuntu_1510_64_prl] | | ubuntu-16.04 | [amd64][ubuntu_1604_64_vbox] | [amd64][ubuntu_1604_64_vmware] | [amd64][ubuntu_1604_64_prl] | ### 32 bit @@ -39,11 +39,10 @@ The following boxes are built from this repository's templates for publicly avai | centos-5.11 | [i386][centos_511_32_vbox] | [i386][centos_511_32_vmware] | [i386][centos_511_32_prl] | | centos-6.8 | [i386][centos_68_32_vbox] | [i386][centos_68_32_vmware] | [i386][centos_68_32_prl] | | debian-7.11 | [i386][debian_711_32_vbox] | [i386][debian_711_32_vmware] | [i386][debian_711_32_prl] | -| debian-8.5 | [i386][debian_85_32_vbox] | [i386][debian_85_32_vmware] | [i386][debian_85_32_prl] | -| opensuse-13.2 | [i386][osuse_132_32_vbox] | [i386][osuse_132_32_vmware] | [i386][osuse_132_32_prl] | +| debian-8.6 | [i386][debian_86_32_vbox] | [i386][debian_86_32_vmware] | [i386][debian_86_32_prl] | +| opensuse-13.2 | [i386][osuse_132_32_vbox] | ~~[i386][osuse_132_32_vmware]~~ | [i386][osuse_132_32_prl] | | ubuntu-12.04 | [i386][ubuntu_1204_32_vbox] | [i386][ubuntu_1204_32_vmware] | [i386][ubuntu_1204_32_prl] | | ubuntu-14.04 | [i386][ubuntu_1404_32_vbox] | [i386][ubuntu_1404_32_vmware] | [i386][ubuntu_1404_32_prl] | -| ubuntu-15.10 | [i386][ubuntu_1510_32_vbox] | [i386][ubuntu_1510_32_vmware] | [i386][ubuntu_1510_32_prl] | | ubuntu-16.04 | [i386][ubuntu_1604_32_vbox] | [i386][ubuntu_1604_32_vmware] | [i386][ubuntu_1604_32_prl] | @@ -55,15 +54,6 @@ guaranteed to be updated at this time. * If you're using the [Vagrant VMWare Fusion](https://www.vagrantup.com/vmware) provider, using `vagrant box add --provider vmware_desktop ...` will work for these boxes. Using `--provider vmware_fusion`, will not. -* The boxes are currently hosted on both Atlas and Amazon S3 to maintain backward -compatibility with [test-kitchen](https://github.com/test-kitchen/test-kitchen). -Once test-kitchen changes defaults the S3 buckets will no longer be updated. -* Tooling versions - * Packer: 0.10.1 - * VirtualBox: 5.0.26 - * VMware Fusion: 8.1.1 - * Parallels: 11.2.0 - #### VMWare Fusion 8, Packer, systemd @@ -89,13 +79,13 @@ new plugins. The full list of old boxes are available in the [old boxes file](ht Adding a bento box to vagrant: - $ vagrant box add bento/debian-8.5 + $ vagrant box add bento/debian-8.6 Using a bento box in a Vagrantfile: ``` Vagrant.configure("2") do |config| - config.vm.box = "bento/debian-8.5" + config.vm.box = "bento/debian-8.6" end ``` @@ -113,11 +103,11 @@ This is an opinionated tool that the project uses for building the hosted boxes To build multiple templates for all providers (VirtualBox, Fusion, Parallels, etc): - $ bin/bento build debian-8.5-amd64 debian-8.5-i386 + $ bin/bento build debian-8.6-amd64 debian-8.6-i386 To build a box for a single provider: - $ bin/bento build --only=virtualbox-iso debian-8.5-amd64 + $ bin/bento build --only=virtualbox-iso debian-8.6-amd64 ### Using `packer` @@ -125,24 +115,24 @@ Templates can still be built directly by `packer` To build a template for all providers (VirtualBox, Fusion, Parallels): - $ packer build debian-8.5-amd64.json + $ packer build debian-8.6-amd64.json To build a template only for a list of specific providers: - $ packer build -only=virtualbox-iso debian-8.5-amd64.json + $ packer build -only=virtualbox-iso debian-8.6-amd64.json To build a template for all providers except a list of specific providers: - $ packer build -except=parallels-iso,vmware-iso debian-8.5-amd64.json + $ packer build -except=parallels-iso,vmware-iso debian-8.6-amd64.json If you want to use a another mirror site, use the `mirror` user variable. - $ packer build -var 'mirror=http://ftp.jaist.ac.jp/pub/Linux/debian-cdimage/release' debian-8.5-amd64.json + $ packer build -var 'mirror=http://ftp.jaist.ac.jp/pub/Linux/debian-cdimage/release' debian-8.6-amd64.json Congratulations! You now have box(es) in the ../builds directory that you can then add to Vagrant and start testing cookbooks. Notes: -* The box_basename can be overridden like other Packer vars with ``-var 'box_basename=debian-8.5'`` +* The box_basename can be overridden like other Packer vars with ``-var 'box_basename=debian-8.6'`` ### Proprietary Boxes @@ -228,91 +218,67 @@ See the License for the specific language governing permissions and limitations under the License. ``` -[centos_511_32_vbox]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_centos-5.11-i386_chef-provisionerless.box -[centos_511_64_vbox]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_centos-5.11_chef-provisionerless.box -[centos_511_32_vmware]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_centos-5.11-i386_chef-provisionerless.box -[centos_511_64_vmware]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_centos-5.11_chef-provisionerless.box -[centos_511_32_prl]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/parallels/opscode_centos-5.11-i386_chef-provisionerless.box -[centos_511_64_prl]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/parallels/opscode_centos-5.11_chef-provisionerless.box - -[centos_68_32_vbox]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_centos-6.8-i386_chef-provisionerless.box -[centos_68_64_vbox]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_centos-6.8_chef-provisionerless.box -[centos_68_32_vmware]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_centos-6.8-i386_chef-provisionerless.box -[centos_68_64_vmware]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_centos-6.8_chef-provisionerless.box -[centos_68_32_prl]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/parallels/opscode_centos-6.8-i386_chef-provisionerless.box -[centos_68_64_prl]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/parallels/opscode_centos-6.8_chef-provisionerless.box - -[centos_72_64_vbox]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_centos-7.2_chef-provisionerless.box -[centos_72_64_vmware]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_centos-7.2_chef-provisionerless.box -[centos_72_64_prl]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/parallels/opscode_centos-7.2_chef-provisionerless.box - -[debian_711_32_vbox]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_debian-7.11-i386_chef-provisionerless.box -[debian_711_64_vbox]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_debian-7.11_chef-provisionerless.box -[debian_711_32_vmware]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_debian-7.11-i386_chef-provisionerless.box -[debian_711_64_vmware]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_debian-7.11_chef-provisionerless.box -[debian_711_32_prl]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/parallels/opscode_debian-7.11-i386_chef-provisionerless.box -[debian_711_64_prl]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/parallels/opscode_debian-7.11_chef-provisionerless.box - -[debian_85_32_vbox]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_debian-8.5-i386_chef-provisionerless.box -[debian_85_64_vbox]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_debian-8.5_chef-provisionerless.box -[debian_85_32_vmware]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_debian-8.5-i386_chef-provisionerless.box -[debian_85_64_vmware]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_debian-8.5_chef-provisionerless.box -[debian_85_32_prl]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/parallels/opscode_debian-8.5-i386_chef-provisionerless.box -[debian_85_64_prl]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/parallels/opscode_debian-8.5_chef-provisionerless.box - -[freebsd_93_32_vbox]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_freebsd-9.3-i386_chef-provisionerless.box -[freebsd_93_64_vbox]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_freebsd-9.3_chef-provisionerless.box -[freebsd_93_32_vmware]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_freebsd-9.3-i386_chef-provisionerless.box -[freebsd_93_64_vmware]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_freebsd-9.3_chef-provisionerless.box -[freebsd_93_32_prl]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/parallels/opscode_freebsd-9.3-i386_chef-provisionerless.box -[freebsd_93_64_prl]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/parallels/opscode_freebsd-9.3_chef-provisionerless.box - -[freebsd_103_32_vbox]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_freebsd-10.3-i386_chef-provisionerless.box -[freebsd_103_64_vbox]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_freebsd-10.3_chef-provisionerless.box -[freebsd_103_32_vmware]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_freebsd-10.3-i386_chef-provisionerless.box -[freebsd_103_64_vmware]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_freebsd-10.3_chef-provisionerless.box -[freebsd_103_32_prl]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/parallels/opscode_freebsd-10.3-i386_chef-provisionerless.box -[freebsd_103_64_prl]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/parallels/opscode_freebsd-10.3_chef-provisionerless.box - -[osuse_132_32_vbox]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_opensuse-13.2-i386_chef-provisionerless.box -[osuse_132_64_vbox]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_opensuse-13.2-x86_64_chef-provisionerless.box -[osuse_132_32_vmware]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_opensuse-13.2-i386_chef-provisionerless.box -[osuse_132_64_vmware]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_opensuse-13.2-x86_64_chef-provisionerless.box -[osuse_132_32_prl]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/parallels/opscode_opensuse-13.2-i386_chef-provisionerless.box -[osuse_132_64_prl]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/parallels/opscode_opensuse-13.2-x86_64_chef-provisionerless.box - -[ubuntu_1204_32_vbox]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_ubuntu-12.04-i386_chef-provisionerless.box -[ubuntu_1204_64_vbox]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_ubuntu-12.04_chef-provisionerless.box -[ubuntu_1204_32_vmware]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_ubuntu-12.04-i386_chef-provisionerless.box -[ubuntu_1204_64_vmware]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_ubuntu-12.04_chef-provisionerless.box -[ubuntu_1204_32_prl]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/parallels/opscode_ubuntu-12.04-i386_chef-provisionerless.box -[ubuntu_1204_64_prl]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/parallels/opscode_ubuntu-12.04_chef-provisionerless.box - -[ubuntu_1404_32_vbox]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_ubuntu-14.04-i386_chef-provisionerless.box -[ubuntu_1404_64_vbox]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_ubuntu-14.04_chef-provisionerless.box -[ubuntu_1404_32_vmware]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_ubuntu-14.04-i386_chef-provisionerless.box -[ubuntu_1404_64_vmware]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_ubuntu-14.04_chef-provisionerless.box -[ubuntu_1404_32_prl]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/parallels/opscode_ubuntu-14.04-i386_chef-provisionerless.box -[ubuntu_1404_64_prl]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/parallels/opscode_ubuntu-14.04_chef-provisionerless.box - -[ubuntu_1510_32_vbox]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_ubuntu-15.10-i386_chef-provisionerless.box -[ubuntu_1510_64_vbox]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_ubuntu-15.10_chef-provisionerless.box -[ubuntu_1510_32_vmware]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_ubuntu-15.10-i386_chef-provisionerless.box -[ubuntu_1510_64_vmware]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_ubuntu-15.10_chef-provisionerless.box -[ubuntu_1510_32_prl]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/parallels/opscode_ubuntu-15.10-i386_chef-provisionerless.box -[ubuntu_1510_64_prl]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/parallels/opscode_ubuntu-15.10_chef-provisionerless.box - -[ubuntu_1604_32_vbox]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_ubuntu-16.04-i386_chef-provisionerless.box -[ubuntu_1604_64_vbox]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_ubuntu-16.04_chef-provisionerless.box -[ubuntu_1604_32_vmware]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_ubuntu-16.04-i386_chef-provisionerless.box -[ubuntu_1604_64_vmware]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_ubuntu-16.04_chef-provisionerless.box -[ubuntu_1604_32_prl]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/parallels/opscode_ubuntu-16.04-i386_chef-provisionerless.box -[ubuntu_1604_64_prl]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/parallels/opscode_ubuntu-16.04_chef-provisionerless.box - -[fedora_23_64_vbox]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_fedora-23_chef-provisionerless.box -[fedora_23_64_vmware]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_fedora-23_chef-provisionerless.box -[fedora_23_64_prl]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/parallels/opscode_fedora-23_chef-provisionerless.box - -[fedora_24_64_vbox]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_fedora-24_chef-provisionerless.box -[fedora_24_64_vmware]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_fedora-24_chef-provisionerless.box -[fedora_24_64_prl]: http://opscode-vm-bento.s3.amazonaws.com/vagrant/parallels/opscode_fedora-24_chef-provisionerless.box +[centos_511_64_prl]: https://atlas.hashicorp.com/bento/boxes/centos-5.11/versions/2.3.0/providers/parallels.box +[centos_511_64_vbox]: https://atlas.hashicorp.com/bento/boxes/centos-5.11/versions/2.3.0/providers/virtualbox.box +[centos_511_64_vmware]: https://atlas.hashicorp.com/bento/boxes/centos-5.11/versions/2.3.0/providers/vmware_desktop.box +[centos_511_32_prl]: https://atlas.hashicorp.com/bento/boxes/centos-5.11-i386/versions/2.3.0/providers/parallels.box +[centos_511_32_vbox]: https://atlas.hashicorp.com/bento/boxes/centos-5.11-i386/versions/2.3.0/providers/virtualbox.box +[centos_511_32_vmware]: https://atlas.hashicorp.com/bento/boxes/centos-5.11-i386/versions/2.3.0/providers/vmware_desktop.box +[centos_68_64_prl]: https://atlas.hashicorp.com/bento/boxes/centos-6.8/versions/2.3.0/providers/parallels.box +[centos_68_64_vbox]: https://atlas.hashicorp.com/bento/boxes/centos-6.8/versions/2.3.0/providers/virtualbox.box +[centos_68_64_vmware]: https://atlas.hashicorp.com/bento/boxes/centos-6.8/versions/2.3.0/providers/vmware_desktop.box +[centos_68_32_prl]: https://atlas.hashicorp.com/bento/boxes/centos-6.8-i386/versions/2.3.0/providers/parallels.box +[centos_68_32_vbox]: https://atlas.hashicorp.com/bento/boxes/centos-6.8-i386/versions/2.3.0/providers/virtualbox.box +[centos_68_32_vmware]: https://atlas.hashicorp.com/bento/boxes/centos-6.8-i386/versions/2.3.0/providers/vmware_desktop.box +[centos_72_64_prl]: https://atlas.hashicorp.com/bento/boxes/centos-7.2/versions/2.3.0/providers/parallels.box +[centos_72_64_vbox]: https://atlas.hashicorp.com/bento/boxes/centos-7.2/versions/2.3.0/providers/virtualbox.box +[centos_72_64_vmware]: https://atlas.hashicorp.com/bento/boxes/centos-7.2/versions/2.3.0/providers/vmware_desktop.box +[debian_711_64_prl]: https://atlas.hashicorp.com/bento/boxes/debian-7.11/versions/2.3.0/providers/parallels.box +[debian_711_64_vbox]: https://atlas.hashicorp.com/bento/boxes/debian-7.11/versions/2.3.0/providers/virtualbox.box +[debian_711_64_vmware]: https://atlas.hashicorp.com/bento/boxes/debian-7.11/versions/2.3.0/providers/vmware_desktop.box +[debian_711_32_prl]: https://atlas.hashicorp.com/bento/boxes/debian-7.11-i386/versions/2.3.0/providers/parallels.box +[debian_711_32_vbox]: https://atlas.hashicorp.com/bento/boxes/debian-7.11-i386/versions/2.3.0/providers/virtualbox.box +[debian_711_32_vmware]: https://atlas.hashicorp.com/bento/boxes/debian-7.11-i386/versions/2.3.0/providers/vmware_desktop.box +[debian_86_64_prl]: https://atlas.hashicorp.com/bento/boxes/debian-8.6/versions/2.3.0/providers/parallels.box +[debian_86_64_vbox]: https://atlas.hashicorp.com/bento/boxes/debian-8.6/versions/2.3.0/providers/virtualbox.box +[debian_86_64_vmware]: https://atlas.hashicorp.com/bento/boxes/debian-8.6/versions/2.3.0/providers/vmware_desktop.box +[debian_86_32_prl]: https://atlas.hashicorp.com/bento/boxes/debian-8.6-i386/versions/2.3.0/providers/parallels.box +[debian_86_32_vbox]: https://atlas.hashicorp.com/bento/boxes/debian-8.6-i386/versions/2.3.0/providers/virtualbox.box +[debian_86_32_vmware]: https://atlas.hashicorp.com/bento/boxes/debian-8.6-i386/versions/2.3.0/providers/vmware_desktop.box +[fedora_23_64_prl]: https://atlas.hashicorp.com/bento/boxes/fedora-23/versions/2.3.0/providers/parallels.box +[fedora_23_64_vbox]: https://atlas.hashicorp.com/bento/boxes/fedora-23/versions/2.3.0/providers/virtualbox.box +[fedora_23_64_vmware]: https://atlas.hashicorp.com/bento/boxes/fedora-23/versions/2.3.0/providers/vmware_desktop.box +[fedora_24_64_prl]: https://atlas.hashicorp.com/bento/boxes/fedora-24/versions/2.3.0/providers/parallels.box +[fedora_24_64_vbox]: https://atlas.hashicorp.com/bento/boxes/fedora-24/versions/2.3.0/providers/virtualbox.box +[fedora_24_64_vmware]: https://atlas.hashicorp.com/bento/boxes/fedora-24/versions/2.3.0/providers/vmware_desktop.box +[freebsd_103_64_prl]: https://atlas.hashicorp.com/bento/boxes/freebsd-10.3/versions/2.3.0/providers/parallels.box +[freebsd_103_64_vbox]: https://atlas.hashicorp.com/bento/boxes/freebsd-10.3/versions/2.3.0/providers/virtualbox.box +[freebsd_103_64_vmware]: https://atlas.hashicorp.com/bento/boxes/freebsd-10.3/versions/2.3.0/providers/vmware_desktop.box +[freebsd_93_64_prl]: https://atlas.hashicorp.com/bento/boxes/freebsd-9.3/versions/2.3.0/providers/parallels.box +[freebsd_93_64_vbox]: https://atlas.hashicorp.com/bento/boxes/freebsd-9.3/versions/2.3.0/providers/virtualbox.box +[freebsd_93_64_vmware]: https://atlas.hashicorp.com/bento/boxes/freebsd-9.3/versions/2.3.0/providers/vmware_desktop.box +[omnios_r151018_64_vbox]: https://atlas.hashicorp.com/bento/boxes/omnios-r151018/versions/2.3.0/providers/virtualbox.box +[osuse_132_64_prl]: https://atlas.hashicorp.com/bento/boxes/opensuse-13.2/versions/2.3.0/providers/parallels.box +[osuse_132_64_vbox]: https://atlas.hashicorp.com/bento/boxes/opensuse-13.2/versions/2.3.0/providers/virtualbox.box +[osuse_132_64_vmware]: https://atlas.hashicorp.com/bento/boxes/opensuse-13.2/versions/2.3.0/providers/vmware_desktop.box +[osuse_132_32_prl]: https://atlas.hashicorp.com/bento/boxes/opensuse-13.2-i386/versions/2.3.0/providers/parallels.box +[osuse_132_32_vbox]: https://atlas.hashicorp.com/bento/boxes/opensuse-13.2-i386/versions/2.3.0/providers/virtualbox.box +[osuse_132_32_vmware]: https://atlas.hashicorp.com/bento/boxes/opensuse-13.2-i386/versions/2.3.0/providers/vmware.box +[ubuntu_1204_64_prl]: https://atlas.hashicorp.com/bento/boxes/ubuntu-12.04/versions/2.3.0/providers/parallels.box +[ubuntu_1204_64_vbox]: https://atlas.hashicorp.com/bento/boxes/ubuntu-12.04/versions/2.3.0/providers/virtualbox.box +[ubuntu_1204_64_vmware]: https://atlas.hashicorp.com/bento/boxes/ubuntu-12.04/versions/2.3.0/providers/vmware_desktop.box +[ubuntu_1204_32_prl]: https://atlas.hashicorp.com/bento/boxes/ubuntu-12.04-i386/versions/2.3.0/providers/parallels.box +[ubuntu_1204_32_vbox]: https://atlas.hashicorp.com/bento/boxes/ubuntu-12.04-i386/versions/2.3.0/providers/virtualbox.box +[ubuntu_1204_32_vmware]: https://atlas.hashicorp.com/bento/boxes/ubuntu-12.04-i386/versions/2.3.0/providers/vmware_desktop.box +[ubuntu_1404_64_prl]: https://atlas.hashicorp.com/bento/boxes/ubuntu-14.04/versions/2.3.0/providers/parallels.box +[ubuntu_1404_64_vbox]: https://atlas.hashicorp.com/bento/boxes/ubuntu-14.04/versions/2.3.0/providers/virtualbox.box +[ubuntu_1404_64_vmware]: https://atlas.hashicorp.com/bento/boxes/ubuntu-14.04/versions/2.3.0/providers/vmware_desktop.box +[ubuntu_1404_32_prl]: https://atlas.hashicorp.com/bento/boxes/ubuntu-14.04-i386/versions/2.3.0/providers/parallels.box +[ubuntu_1404_32_vbox]: https://atlas.hashicorp.com/bento/boxes/ubuntu-14.04-i386/versions/2.3.0/providers/virtualbox.box +[ubuntu_1404_32_vmware]: https://atlas.hashicorp.com/bento/boxes/ubuntu-14.04-i386/versions/2.3.0/providers/vmware_desktop.box +[ubuntu_1604_64_prl]: https://atlas.hashicorp.com/bento/boxes/ubuntu-16.04/versions/2.3.0/providers/parallels.box +[ubuntu_1604_64_vbox]: https://atlas.hashicorp.com/bento/boxes/ubuntu-16.04/versions/2.3.0/providers/virtualbox.box +[ubuntu_1604_64_vmware]: https://atlas.hashicorp.com/bento/boxes/ubuntu-16.04/versions/2.3.0/providers/vmware_desktop.box +[ubuntu_1604_32_prl]: https://atlas.hashicorp.com/bento/boxes/ubuntu-16.04-i386/versions/2.3.0/providers/parallels.box +[ubuntu_1604_32_vbox]: https://atlas.hashicorp.com/bento/boxes/ubuntu-16.04-i386/versions/2.3.0/providers/virtualbox.box +[ubuntu_1604_32_vmware]: https://atlas.hashicorp.com/bento/boxes/ubuntu-16.04-i386/versions/2.3.0/providers/vmware_desktop.box \ No newline at end of file From 5179930bc952e4e66ff08e95a14b23cc763dc6e1 Mon Sep 17 00:00:00 2001 From: Seth Thomas <sthomas@chef.io> Date: Fri, 18 Nov 2016 11:57:54 -0500 Subject: [PATCH 0567/1622] Pours one out for OLD-BOXES.md, fix #676 Signed-off-by: Seth Thomas <sthomas@chef.io> --- OLD-BOXES.md | 122 --------------------------------------------------- 1 file changed, 122 deletions(-) delete mode 100644 OLD-BOXES.md diff --git a/OLD-BOXES.md b/OLD-BOXES.md deleted file mode 100644 index f8c7c8345..000000000 --- a/OLD-BOXES.md +++ /dev/null @@ -1,122 +0,0 @@ -Old Bento Boxes -=============== - -Provisionerless ---------------- - -Boxes for obsolete operating systems will be placed here. - -### VirtualBox - -* [opscode-centos-5.10-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_centos-5.10-i386_chef-provisionerless.box) -* [opscode-centos-5.10](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_centos-5.10_chef-provisionerless.box) -* [opscode-centos-6.4-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_centos-6.4-i386_chef-provisionerless.box) -* [opscode-centos-6.4](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_centos-6.4_chef-provisionerless.box) -* [opscode-centos-6.5-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_centos-6.5-i386_chef-provisionerless.box) -* [opscode-centos-6.5](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_centos-6.5_chef-provisionerless.box) -* [opscode-centos-7.0](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_centos-7.0_chef-provisionerless.box) -* [opscode-debian-7.2.0-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_debian-7.2.0-i386_chef-provisionerless.box) -* [opscode-debian-7.2.0](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_debian-7.2.0_chef-provisionerless.box) -* [opscode-debian-7.6-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_debian-7.6-i386_chef-provisionerless.box) -* [opscode-debian-7.6](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_debian-7.6_chef-provisionerless.box) -* [opscode-debian-7.7-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_debian-7.7-i386_chef-provisionerless.box) -* [opscode-debian-7.7](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_debian-7.7_chef-provisionerless.box) -* [opscode-fedora-18-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_fedora-18-i386_chef-provisionerless.box) -* [opscode-fedora-18](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_fedora-18_chef-provisionerless.box) -* [opscode-fedora-19-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_fedora-19-i386_chef-provisionerless.box) -* [opscode-fedora-19](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_fedora-19_chef-provisionerless.box) -* [opscode-freebsd-9.2-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_freebsd-9.2-i386_chef-provisionerless.box) -* [opscode-freebsd-9.2](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_freebsd-9.2_chef-provisionerless.box) -* [opscode-ubuntu-12.10-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_ubuntu-12.10-i386_chef-provisionerless.box) -* [opscode-ubuntu-12.10](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_ubuntu-12.10_chef-provisionerless.box) -* [opscode-ubuntu-13.04-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_ubuntu-13.04-i386_chef-provisionerless.box) -* [opscode-ubuntu-13.04](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_ubuntu-13.04_chef-provisionerless.box) -* [opscode-ubuntu-13.10-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_ubuntu-13.10-i386_chef-provisionerless.box) -* [opscode-ubuntu-13.10](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_ubuntu-13.10_chef-provisionerless.box) - -### VMWare - -* [opscode-centos-5.10-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_centos-5.10-i386_chef-provisionerless.box) -* [opscode-centos-5.10](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_centos-5.10_chef-provisionerless.box) -* [opscode-centos-6.4-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_centos-6.4-i386_chef-provisionerless.box) -* [opscode-centos-6.4](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_centos-6.4_chef-provisionerless.box) -* [opscode-centos-6.5-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_centos-6.5-i386_chef-provisionerless.box) -* [opscode-centos-6.5](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_centos-6.5_chef-provisionerless.box) -* [opscode-centos-7.0](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_centos-7.0_chef-provisionerless.box) -* [opscode-debian-7.2.0-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_debian-7.2.0-i386_chef-provisionerless.box) -* [opscode-debian-7.2.0](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_debian-7.2.0_chef-provisionerless.box) -* [opscode-debian-7.6-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_debian-7.6-i386_chef-provisionerless.box) -* [opscode-debian-7.6](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_debian-7.6_chef-provisionerless.box) -* [opscode-debian-7.7-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_debian-7.7-i386_chef-provisionerless.box) -* [opscode-debian-7.7](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_debian-7.7_chef-provisionerless.box) -* [opscode-fedora-18-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_fedora-18-i386_chef-provisionerless.box) -* [opscode-fedora-18](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_fedora-18_chef-provisionerless.box) -* [opscode-fedora-19-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_fedora-19-i386_chef-provisionerless.box) -* [opscode-fedora-19](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_fedora-19_chef-provisionerless.box) -* [opscode-freebsd-9.2-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_freebsd-9.2-i386_chef-provisionerless.box) -* [opscode-freebsd-9.2](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_freebsd-9.2_chef-provisionerless.box) - -* [opscode-ubuntu-12.10-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_ubuntu-12.10-i386_chef-provisionerless.box) -* [opscode-ubuntu-12.10](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_ubuntu-12.10_chef-provisionerless.box) -* [opscode-ubuntu-13.04-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_ubuntu-13.04-i386_chef-provisionerless.box) -* [opscode-ubuntu-13.04](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_ubuntu-13.04_chef-provisionerless.box) -* [opscode-ubuntu-13.10-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_ubuntu-13.10-i386_chef-provisionerless.box) -* [opscode-ubuntu-13.10](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_ubuntu-13.10_chef-provisionerless.box) - -Chef 11.4.4 ------------ - -### 64-bit -* [opscode-centos-5.9](https://opscode-vm-bento.s3.amazonaws.com/vagrant/opscode_centos-5.9_chef-11.4.4.box) -* [opscode-centos-6.4](https://opscode-vm-bento.s3.amazonaws.com/vagrant/opscode_centos-6.4_chef-11.4.4.box) -* [opscode-ubuntu-10.04](https://opscode-vm-bento.s3.amazonaws.com/vagrant/opscode_ubuntu-10.04_chef-11.4.4.box) -* [opscode-ubuntu-12.04](https://opscode-vm-bento.s3.amazonaws.com/vagrant/opscode_ubuntu-12.04_chef-11.4.4.box) - -### 32-bit -* [opscode-centos-5.9-i386](https://opscode-vm-bento.s3.amazonaws.com/vagrant/opscode_centos-5.9-i386_chef-11.4.4.box) -* [opscode-centos-6.4-i386](https://opscode-vm-bento.s3.amazonaws.com/vagrant/opscode_centos-6.4-i386_chef-11.4.4.box) -* [opscode-ubuntu-10.04-i386](https://opscode-vm-bento.s3.amazonaws.com/vagrant/opscode_ubuntu-10.04-i386_chef-11.4.4.box) -* [opscode-ubuntu-12.04-i386](https://opscode-vm-bento.s3.amazonaws.com/vagrant/opscode_ubuntu-12.04-i386_chef-11.4.4.box) - -Chef 11.4.0 ------------ -### 64-bit -* [opscode-centos-5.9](https://opscode-vm-bento.s3.amazonaws.com/vagrant/opscode_centos-5.9_chef-11.4.0.box) -* [opscode-centos-6.4](https://opscode-vm-bento.s3.amazonaws.com/vagrant/opscode_centos-6.4_chef-11.4.0.box) -* [opscode-ubuntu-10.04](https://opscode-vm-bento.s3.amazonaws.com/vagrant/opscode_ubuntu-10.04_chef-11.4.0.box) -* [opscode-ubuntu-12.04](https://opscode-vm-bento.s3.amazonaws.com/vagrant/opscode_ubuntu-12.04_chef-11.4.0.box) - -### 32-bit -* [opscode-centos-5.9-i386](https://opscode-vm-bento.s3.amazonaws.com/vagrant/opscode_centos-5.9-i386_chef-11.4.0.box) -* [opscode-centos-6.4-i386](https://opscode-vm-bento.s3.amazonaws.com/vagrant/opscode_centos-6.4-i386_chef-11.4.0.box) -* [opscode-ubuntu-10.04-i386](https://opscode-vm-bento.s3.amazonaws.com/vagrant/opscode_ubuntu-10.04-i386_chef-11.4.0.box) -* [opscode-ubuntu-12.04-i386](https://opscode-vm-bento.s3.amazonaws.com/vagrant/opscode_ubuntu-12.04-i386_chef-11.4.0.box) - -Chef 11.2.0 ------------ -* [opscode-centos-5.8](https://opscode-vm-bento.s3.amazonaws.com/vagrant/opscode_centos-5.8_chef-11.2.0.box) -* [opscode-centos-6.3](https://opscode-vm-bento.s3.amazonaws.com/vagrant/opscode_centos-6.3_chef-11.2.0.box) -* [opscode-ubuntu-10.04](https://opscode-vm-bento.s3.amazonaws.com/vagrant/opscode_ubuntu-10.04_chef-11.2.0.box) -* [opscode-ubuntu-12.04](https://opscode-vm-bento.s3.amazonaws.com/vagrant/opscode_ubuntu-12.04_chef-11.2.0.box) - -Chef 10.18.2 ------------- -* [opscode-centos-5.8-i386](https://opscode-vm-bento.s3.amazonaws.com/vagrant/opscode_centos-5.8-i386_chef-10.18.2.box) -* [opscode-centos-5.8](https://opscode-vm-bento.s3.amazonaws.com/vagrant/opscode_centos-5.8_chef-10.18.2.box) -* [opscode-centos-6.3-i386](https://opscode-vm-bento.s3.amazonaws.com/vagrant/opscode_centos-6.3-i386_chef-10.18.2.box) -* [opscode-centos-6.3](https://opscode-vm-bento.s3.amazonaws.com/vagrant/opscode_centos-6.3_chef-10.18.2.box) -* [opscode-ubuntu-10.04-i386](https://opscode-vm-bento.s3.amazonaws.com/vagrant/opscode_ubuntu-10.04-i386_chef-10.18.2.box) -* [opscode-ubuntu-10.04](https://opscode-vm-bento.s3.amazonaws.com/vagrant/opscode_ubuntu-10.04_chef-10.18.2.box) -* [opscode-ubuntu-12.04-i386](https://opscode-vm-bento.s3.amazonaws.com/vagrant/opscode_ubuntu-12.04-i386_chef-10.18.2.box) -* [opscode-ubuntu-12.04](https://opscode-vm-bento.s3.amazonaws.com/vagrant/opscode_ubuntu-12.04_chef-10.18.2.box) - -Chef 10.14.4 ------------- -* [opscode-centos-5.8-i386](https://opscode-vm-bento.s3.amazonaws.com/vagrant/boxes/opscode-centos-5.8-i386.box) -* [opscode-centos-5.8](https://opscode-vm-bento.s3.amazonaws.com/vagrant/boxes/opscode-centos-5.8.box) -* [opscode-centos-6.3-i386](https://opscode-vm-bento.s3.amazonaws.com/vagrant/boxes/opscode-centos-6.3-i386.box) -* [opscode-centos-6.3](https://opscode-vm-bento.s3.amazonaws.com/vagrant/boxes/opscode-centos-6.3.box) -* [opscode-ubuntu-10.04](https://opscode-vm-bento.s3.amazonaws.com/vagrant/boxes/opscode-ubuntu-10.04.box) -* [opscode-ubuntu-10.04-i386](https://opscode-vm-bento.s3.amazonaws.com/vagrant/boxes/opscode-ubuntu-10.04-i386.box) -* [opscode-ubuntu-12.04](https://opscode-vm-bento.s3.amazonaws.com/vagrant/boxes/opscode-ubuntu-12.04.box) -* [opscode-ubuntu-12.04-i386](https://opscode-vm-bento.s3.amazonaws.com/vagrant/boxes/opscode-ubuntu-12.04-i386.box) From 91f771439ddf78191a215ca5eb2946347a9277e7 Mon Sep 17 00:00:00 2001 From: Rickard von Essen <rickard.von.essen@gmail.com> Date: Wed, 11 Nov 2015 15:36:59 +0100 Subject: [PATCH 0568/1622] Initial FreeBSD 11.0 support Changes compared with 10.2: 1) http/freebsd-11.0/install.sh start start and size have been adjusted to work: < gpart add -b 34 -s 94 -t freebsd-boot $DISKSLICE --- > gpart add -b 40 -s 88 -t freebsd-boot $DISKSLICE 2) scripts/freebsd/update.sh temporarly skip freebsd update/install for 11.0 since no updates exists and trying to run the command fails, see the NOTE in the script. pkg is automatically installed on "pkg update" at the end of the script. Signed-off-by: Rickard von Essen <rickard.von.essen@gmail.com> --- freebsd-11.0-CURRENT-amd64.json | 229 ++++++++++++++++++++++++++++++++ http/freebsd-11.0/install.sh | 110 +++++++++++++++ 2 files changed, 339 insertions(+) create mode 100644 freebsd-11.0-CURRENT-amd64.json create mode 100644 http/freebsd-11.0/install.sh diff --git a/freebsd-11.0-CURRENT-amd64.json b/freebsd-11.0-CURRENT-amd64.json new file mode 100644 index 000000000..0927c762c --- /dev/null +++ b/freebsd-11.0-CURRENT-amd64.json @@ -0,0 +1,229 @@ +{ + "builders": [ + { + "boot_command": [ + "<esc><wait>", + "boot -s<wait>", + "<enter><wait>", + "<wait10><wait10>", + "/bin/sh<enter><wait>", + "mdmfs -s 100m md1 /tmp<enter><wait>", + "mdmfs -s 100m md2 /mnt<enter><wait>", + "dhclient -l /tmp/dhclient.lease.em0 em0<enter><wait>", + "fetch -o /tmp/install.sh http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} && chmod +x /tmp/install.sh && /tmp/install.sh {{ .Name }}<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 10140, + "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "guest_os_type": "FreeBSD_64", + "headless": "{{ user `headless` }}", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-virtualbox", + "shutdown_command": "su -m root -c 'shutdown -p now'", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "virtualbox-iso", + "vboxmanage": [ + [ + "modifyvm", + "{{.Name}}", + "--memory", + "512" + ], + [ + "modifyvm", + "{{.Name}}", + "--cpus", + "1" + ] + ], + "virtualbox_version_file": ".vbox_version", + "vm_name": "{{ user `template` }}" + }, + { + "boot_command": [ + "<esc><wait>", + "boot -s<wait>", + "<enter><wait>", + "<wait10><wait10>", + "/bin/sh<enter><wait>", + "mdmfs -s 100m md1 /tmp<enter><wait>", + "mdmfs -s 100m md2 /mnt<enter><wait>", + "dhclient -l /tmp/dhclient.lease.em0 em0<enter><wait>", + "<wait5>", + "fetch -o /tmp/install.sh http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} && chmod +x /tmp/install.sh && /tmp/install.sh {{ .Name }}<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": 10140, + "guest_os_type": "freebsd-64", + "headless": "{{ user `headless` }}", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-vmare", + "shutdown_command": "su -m root -c 'shutdown -p now'", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "tools_upload_flavor": "freebsd", + "type": "vmware-iso", + "vm_name": "{{ user `template` }}", + "vmx_data": { + "cpuid.coresPerSocket": "1", + "memsize": "512", + "numvcpus": "1" + } + }, + { + "boot_command": [ + "<esc><wait>", + "boot -s<wait>", + "<enter><wait>", + "<wait10><wait10>", + "/bin/sh<enter><wait>", + "mdmfs -s 100m md1 /tmp<enter><wait>", + "mdmfs -s 100m md2 /mnt<enter><wait>", + "dhclient -l /tmp/dhclient.lease.em0 em0<enter><wait>", + "fetch -o /tmp/install.sh http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} && chmod +x /tmp/install.sh && /tmp/install.sh {{ .Name }} > /tmp/inst.log<enter><wait>" + ], + "boot_wait": "8s", + "disk_size": 10140, + "guest_os_type": "freebsd", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-parallels", + "parallels_tools_mode": "disable", + "prlctl": [ + [ + "set", + "{{.Name}}", + "--memsize", + "512" + ], + [ + "set", + "{{.Name}}", + "--cpus", + "1" + ], + [ + "set", + "{{.Name}}", + "--device-set", + "cdrom0", + "--iface", + "ide" + ], + [ + "set", + "{{.Name}}", + "--device-del", + "fdd0" + ], + [ + "set", + "{{.Name}}", + "--device-del", + "parallel0" + ] + ], + "prlctl_version_file": ".prlctl_version", + "shutdown_command": "su -m root -c 'shutdown -p now'", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "parallels-iso", + "vm_name": "{{ user `template` }}" + }, + { + "boot_command": [ + "<esc><wait>", + "boot -s<wait>", + "<enter><wait>", + "<wait10><wait10>", + "/bin/sh<enter><wait>", + "mdmfs -s 100m md1 /tmp<enter><wait>", + "mdmfs -s 100m md2 /mnt<enter><wait>", + "dhclient -l /tmp/dhclient.lease.vtnet0 vtnet0<enter><wait>", + "fetch -o /tmp/install.sh http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} && chmod +x /tmp/install.sh && /tmp/install.sh {{ .Name }} vtnet0<enter><wait>" + ], + "boot_wait": "7s", + "disk_size": 10140, + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-qemu", + "shutdown_command": "su -m root -c 'shutdown -p now'", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "qemu", + "vm_name": "{{ user `template` }}" + } + ], + "post-processors": [ + { + "output": "builds/{{user `box_basename`}}.{{.Provider}}.box", + "type": "vagrant", + "vagrantfile_template": "vagrantfile_templates/freebsd.rb" + } + ], + "provisioners": [ + { + "destination": "/tmp/bento-metadata.json", + "source": "{{user `metadata`}}", + "type": "file" + }, + { + "environment_vars": [ + "HOME_DIR=/home/vagrant", + "http_proxy={{user `http_proxy`}}", + "https_proxy={{user `https_proxy`}}", + "no_proxy={{user `no_proxy`}}" + ], + "execute_command": "{{.Vars}} su -m root -c 'sh -eux {{.Path}}'", + "scripts": [ + "scripts/common/metadata.sh", + "scripts/freebsd/update.sh", + "scripts/freebsd/postinstall.sh", + "scripts/freebsd/sudoers.sh", + "scripts/common/vagrant.sh", + "scripts/freebsd/vmtools.sh", + "scripts/freebsd/cleanup.sh", + "scripts/freebsd/minimize.sh" + ], + "type": "shell" + } + ], + "variables": { + "box_basename": "freebsd-11.0-CURRENT", + "build_timestamp": "{{isotime \"20060102150405\"}}", + "git_revision": "__unknown_git_revision__", + "headless": "", + "http_proxy": "{{env `http_proxy`}}", + "https_proxy": "{{env `https_proxy`}}", + "install_path": "freebsd-11.0/install.sh", + "iso_checksum": "a0955c01a26ec6b48dbd9fb6d77304fc33155c76dcb8f3b5ede285315619f0d5", + "iso_checksum_type": "sha256", + "iso_name": "FreeBSD-11.0-CURRENT-amd64-20151102-r290273-disc1.iso", + "metadata": "floppy/dummy_metadata.json", + "mirror": "http://ftp.freebsd.org/pub/FreeBSD", + "mirror_directory": "snapshots/amd64/amd64/ISO-IMAGES/11.0", + "name": "freebsd-11.0-CURRENT", + "no_proxy": "{{env `no_proxy`}}", + "template": "freebsd-11.0-amd64", + "version": "2.1.TIMESTAMP" + } +} diff --git a/http/freebsd-11.0/install.sh b/http/freebsd-11.0/install.sh new file mode 100644 index 000000000..e71320309 --- /dev/null +++ b/http/freebsd-11.0/install.sh @@ -0,0 +1,110 @@ +#!/bin/sh -x + +# Credit: http://www.aisecure.net/2011/05/01/root-on-zfs-freebsd-current/ +# +# Heavily re-adapted from https://wiki.freebsd.org/RootOnZFS/GPTZFSBoot +# by Julian Dunn (jdunn@opscode.com) to remove legacy junk + +NAME=$1 + +# create disks +# for variations in the root disk device name between VMware and Virtualbox +if [ -e /dev/ada0 ]; then + DISKSLICE=ada0 +elif [ -e /dev/da0 ]; then + DISKSLICE=da0 +elif [ -e /dev/vtbd0 ]; then + DISKSLICE=vtbd0 +else + echo "Unknown disk for install.sh to work with!" + exit -1 +fi + +gpart create -s gpt $DISKSLICE +gpart add -b 40 -s 88 -t freebsd-boot $DISKSLICE +gpart add -t freebsd-zfs -l disk0 $DISKSLICE +gpart bootcode -b /boot/pmbr -p /boot/gptzfsboot -i 1 $DISKSLICE + +zpool create -o altroot=/mnt -o cachefile=/tmp/zpool.cache zroot /dev/gpt/disk0 +zpool set bootfs=zroot zroot + +zfs set checksum=fletcher4 zroot + +# set up zfs pools +zfs create zroot/usr +zfs create zroot/usr/home +zfs create zroot/var +zfs create -o compression=on -o exec=on -o setuid=off zroot/tmp +zfs create -o compression=lzjb -o setuid=off zroot/usr/ports +zfs create -o compression=off -o exec=off -o setuid=off zroot/usr/ports/distfiles +zfs create -o compression=off -o exec=off -o setuid=off zroot/usr/ports/packages +zfs create -o compression=lzjb -o exec=off -o setuid=off zroot/usr/src +zfs create -o compression=lzjb -o exec=off -o setuid=off zroot/var/crash +zfs create -o exec=off -o setuid=off zroot/var/db +zfs create -o compression=lzjb -o exec=on -o setuid=off zroot/var/db/pkg +zfs create -o exec=off -o setuid=off zroot/var/empty +zfs create -o compression=lzjb -o exec=off -o setuid=off zroot/var/log +zfs create -o compression=gzip -o exec=off -o setuid=off zroot/var/mail +zfs create -o exec=off -o setuid=off zroot/var/run +zfs create -o compression=lzjb -o exec=on -o setuid=off zroot/var/tmp + +# fixup +chmod 1777 /mnt/zroot/tmp +cd /mnt/zroot ; ln -s usr/home home +chmod 1777 /mnt/zroot/var/tmp + +# set up swap +zfs create -V 2G zroot/swap +zfs set org.freebsd:swap=on zroot/swap +zfs set checksum=off zroot/swap +swapon /dev/zvol/zroot/swap + +# Install the OS +cd /usr/freebsd-dist +cat base.txz | tar --unlink -xpJf - -C /mnt/zroot +cat lib32.txz | tar --unlink -xpJf - -C /mnt/zroot +cat kernel.txz | tar --unlink -xpJf - -C /mnt/zroot +cat src.txz | tar --unlink -xpJf - -C /mnt/zroot + +cp /tmp/zpool.cache /mnt/zroot/boot/zfs/zpool.cache + +zfs set readonly=on zroot/var/empty + +ifdev=`ifconfig | grep '^[a-z]' | cut -d: -f1 | head -n 1` +# Enable required services +cat >> /mnt/zroot/etc/rc.conf << EOT +zfs_enable="YES" +hostname="${NAME}" +ifconfig_${ifdev}="dhcp" +sshd_enable="YES" +EOT + +# Tune and boot from zfs +cat >> /mnt/zroot/boot/loader.conf << EOT +zfs_load="YES" +vfs.root.mountfrom="zfs:zroot" +vm.kmem_size="200M" +vm.kmem_size_max="200M" +vfs.zfs.arc_max="40M" +vfs.zfs.vdev.cache.size="5M" +EOT + +# zfs doesn't use an fstab, but some rc scripts expect one +touch /mnt/zroot/etc/fstab + +# Set up user accounts +zfs create zroot/usr/home/vagrant +echo "vagrant" | pw -V /mnt/zroot/etc useradd vagrant -h 0 -s /bin/sh -G wheel -d /home/vagrant -c "Vagrant User" +echo "vagrant" | pw -V /mnt/zroot/etc usermod root + +chown 1001:1001 /mnt/zroot/home/vagrant + +zfs unmount -a +zfs set mountpoint=legacy zroot +zfs set mountpoint=/tmp zroot/tmp +zfs set mountpoint=/usr zroot/usr +zfs set mountpoint=/var zroot/var + +#echo "Troubleshooting!" +# Reboot +reboot From 54d47882fb09375df3cf1636459ed76c370d9a54 Mon Sep 17 00:00:00 2001 From: Rickard von Essen <rickard.von.essen@gmail.com> Date: Wed, 27 Jul 2016 22:06:12 +0200 Subject: [PATCH 0569/1622] FreeBSD 11.0: Updated to BETA2 and switched to bsdinstaller. Signed-off-by: Rickard von Essen <rickard.von.essen@gmail.com> --- ...RENT-amd64.json => freebsd-11.0-amd64.json | 55 +++++---- http/freebsd-11.0/install.sh | 110 ------------------ http/freebsd-11.0/installerconfig | 51 ++++++++ scripts/freebsd/minimize.sh | 4 + 4 files changed, 85 insertions(+), 135 deletions(-) rename freebsd-11.0-CURRENT-amd64.json => freebsd-11.0-amd64.json (76%) delete mode 100644 http/freebsd-11.0/install.sh create mode 100644 http/freebsd-11.0/installerconfig diff --git a/freebsd-11.0-CURRENT-amd64.json b/freebsd-11.0-amd64.json similarity index 76% rename from freebsd-11.0-CURRENT-amd64.json rename to freebsd-11.0-amd64.json index 0927c762c..d58715285 100644 --- a/freebsd-11.0-CURRENT-amd64.json +++ b/freebsd-11.0-amd64.json @@ -10,10 +10,10 @@ "mdmfs -s 100m md1 /tmp<enter><wait>", "mdmfs -s 100m md2 /mnt<enter><wait>", "dhclient -l /tmp/dhclient.lease.em0 em0<enter><wait>", - "fetch -o /tmp/install.sh http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} && chmod +x /tmp/install.sh && /tmp/install.sh {{ .Name }}<enter><wait>" + "fetch -o /tmp/installerconfig http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} && bsdinstall script /tmp/installerconfig<enter><wait>" ], "boot_wait": "10s", - "disk_size": 10140, + "disk_size": "{{user `disk_size`}}", "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "guest_os_type": "FreeBSD_64", "headless": "{{ user `headless` }}", @@ -22,7 +22,7 @@ "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", "output_directory": "packer-{{user `template`}}-virtualbox", - "shutdown_command": "su -m root -c 'shutdown -p now'", + "shutdown_command": "echo 'vagrant' | su -m root -c 'shutdown -p now'", "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", @@ -33,13 +33,13 @@ "modifyvm", "{{.Name}}", "--memory", - "512" + "{{ user `memory` }}" ], [ "modifyvm", "{{.Name}}", "--cpus", - "1" + "{{ user `cpus` }}" ] ], "virtualbox_version_file": ".vbox_version", @@ -56,10 +56,10 @@ "mdmfs -s 100m md2 /mnt<enter><wait>", "dhclient -l /tmp/dhclient.lease.em0 em0<enter><wait>", "<wait5>", - "fetch -o /tmp/install.sh http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} && chmod +x /tmp/install.sh && /tmp/install.sh {{ .Name }}<enter><wait>" + "fetch -o /tmp/installerconfig http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} && bsdinstall script /tmp/installerconfig<enter><wait>" ], "boot_wait": "10s", - "disk_size": 10140, + "disk_size": "{{user `disk_size`}}", "guest_os_type": "freebsd-64", "headless": "{{ user `headless` }}", "http_directory": "http", @@ -67,7 +67,7 @@ "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", "output_directory": "packer-{{user `template`}}-vmare", - "shutdown_command": "su -m root -c 'shutdown -p now'", + "shutdown_command": "echo 'vagrant' | su -m root -c 'shutdown -p now'", "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", @@ -77,8 +77,8 @@ "vm_name": "{{ user `template` }}", "vmx_data": { "cpuid.coresPerSocket": "1", - "memsize": "512", - "numvcpus": "1" + "memsize": "{{ user `memory` }}", + "numvcpus": "{{ user `cpus` }}" } }, { @@ -91,10 +91,11 @@ "mdmfs -s 100m md1 /tmp<enter><wait>", "mdmfs -s 100m md2 /mnt<enter><wait>", "dhclient -l /tmp/dhclient.lease.em0 em0<enter><wait>", - "fetch -o /tmp/install.sh http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} && chmod +x /tmp/install.sh && /tmp/install.sh {{ .Name }} > /tmp/inst.log<enter><wait>" + "fetch -o /tmp/installerconfig http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} && bsdinstall script /tmp/installerconfig<enter><wait>" ], "boot_wait": "8s", - "disk_size": 10140, + "disk_size": "{{user `disk_size`}}", + "hard_drive_interface": "scsi", "guest_os_type": "freebsd", "http_directory": "http", "iso_checksum": "{{user `iso_checksum`}}", @@ -107,13 +108,13 @@ "set", "{{.Name}}", "--memsize", - "512" + "{{ user `memory` }}" ], [ "set", "{{.Name}}", "--cpus", - "1" + "{{ user `cpus` }}" ], [ "set", @@ -137,7 +138,7 @@ ] ], "prlctl_version_file": ".prlctl_version", - "shutdown_command": "su -m root -c 'shutdown -p now'", + "shutdown_command": "echo 'vagrant' | su -m root -c 'shutdown -p now'", "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", @@ -155,16 +156,17 @@ "mdmfs -s 100m md1 /tmp<enter><wait>", "mdmfs -s 100m md2 /mnt<enter><wait>", "dhclient -l /tmp/dhclient.lease.vtnet0 vtnet0<enter><wait>", - "fetch -o /tmp/install.sh http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} && chmod +x /tmp/install.sh && /tmp/install.sh {{ .Name }} vtnet0<enter><wait>" + "fetch -o /tmp/installerconfig http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} && bsdinstall script /tmp/installerconfig<enter><wait>" ], "boot_wait": "7s", - "disk_size": 10140, + "disk_size": "{{user `disk_size`}}", + "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", "output_directory": "packer-{{user `template`}}-qemu", - "shutdown_command": "su -m root -c 'shutdown -p now'", + "shutdown_command": "echo 'vagrant' | su -m root -c 'shutdown -p now'", "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", @@ -193,7 +195,7 @@ "https_proxy={{user `https_proxy`}}", "no_proxy={{user `no_proxy`}}" ], - "execute_command": "{{.Vars}} su -m root -c 'sh -eux {{.Path}}'", + "execute_command": "echo 'vagrant' | {{.Vars}} su -m root -c 'sh -eux {{.Path}}'", "scripts": [ "scripts/common/metadata.sh", "scripts/freebsd/update.sh", @@ -208,20 +210,23 @@ } ], "variables": { - "box_basename": "freebsd-11.0-CURRENT", + "box_basename": "freebsd-11.0", "build_timestamp": "{{isotime \"20060102150405\"}}", + "cpus": "1", + "disk_size": "40960", "git_revision": "__unknown_git_revision__", "headless": "", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", - "install_path": "freebsd-11.0/install.sh", - "iso_checksum": "a0955c01a26ec6b48dbd9fb6d77304fc33155c76dcb8f3b5ede285315619f0d5", + "install_path": "freebsd-11.0/installerconfig", + "iso_checksum": "74490ca260ca544edb8956d72cf23b82650b7578569945a6a690a9a346cebfd7", "iso_checksum_type": "sha256", - "iso_name": "FreeBSD-11.0-CURRENT-amd64-20151102-r290273-disc1.iso", + "iso_name": "FreeBSD-11.0-BETA2-amd64-disc1.iso", + "memory": "512", "metadata": "floppy/dummy_metadata.json", "mirror": "http://ftp.freebsd.org/pub/FreeBSD", - "mirror_directory": "snapshots/amd64/amd64/ISO-IMAGES/11.0", - "name": "freebsd-11.0-CURRENT", + "mirror_directory": "releases/amd64/amd64/ISO-IMAGES/11.0", + "name": "freebsd-11.0", "no_proxy": "{{env `no_proxy`}}", "template": "freebsd-11.0-amd64", "version": "2.1.TIMESTAMP" diff --git a/http/freebsd-11.0/install.sh b/http/freebsd-11.0/install.sh deleted file mode 100644 index e71320309..000000000 --- a/http/freebsd-11.0/install.sh +++ /dev/null @@ -1,110 +0,0 @@ -#!/bin/sh -x - -# Credit: http://www.aisecure.net/2011/05/01/root-on-zfs-freebsd-current/ -# -# Heavily re-adapted from https://wiki.freebsd.org/RootOnZFS/GPTZFSBoot -# by Julian Dunn (jdunn@opscode.com) to remove legacy junk - -NAME=$1 - -# create disks -# for variations in the root disk device name between VMware and Virtualbox -if [ -e /dev/ada0 ]; then - DISKSLICE=ada0 -elif [ -e /dev/da0 ]; then - DISKSLICE=da0 -elif [ -e /dev/vtbd0 ]; then - DISKSLICE=vtbd0 -else - echo "Unknown disk for install.sh to work with!" - exit -1 -fi - -gpart create -s gpt $DISKSLICE -gpart add -b 40 -s 88 -t freebsd-boot $DISKSLICE -gpart add -t freebsd-zfs -l disk0 $DISKSLICE -gpart bootcode -b /boot/pmbr -p /boot/gptzfsboot -i 1 $DISKSLICE - -zpool create -o altroot=/mnt -o cachefile=/tmp/zpool.cache zroot /dev/gpt/disk0 -zpool set bootfs=zroot zroot - -zfs set checksum=fletcher4 zroot - -# set up zfs pools -zfs create zroot/usr -zfs create zroot/usr/home -zfs create zroot/var -zfs create -o compression=on -o exec=on -o setuid=off zroot/tmp -zfs create -o compression=lzjb -o setuid=off zroot/usr/ports -zfs create -o compression=off -o exec=off -o setuid=off zroot/usr/ports/distfiles -zfs create -o compression=off -o exec=off -o setuid=off zroot/usr/ports/packages -zfs create -o compression=lzjb -o exec=off -o setuid=off zroot/usr/src -zfs create -o compression=lzjb -o exec=off -o setuid=off zroot/var/crash -zfs create -o exec=off -o setuid=off zroot/var/db -zfs create -o compression=lzjb -o exec=on -o setuid=off zroot/var/db/pkg -zfs create -o exec=off -o setuid=off zroot/var/empty -zfs create -o compression=lzjb -o exec=off -o setuid=off zroot/var/log -zfs create -o compression=gzip -o exec=off -o setuid=off zroot/var/mail -zfs create -o exec=off -o setuid=off zroot/var/run -zfs create -o compression=lzjb -o exec=on -o setuid=off zroot/var/tmp - -# fixup -chmod 1777 /mnt/zroot/tmp -cd /mnt/zroot ; ln -s usr/home home -chmod 1777 /mnt/zroot/var/tmp - -# set up swap -zfs create -V 2G zroot/swap -zfs set org.freebsd:swap=on zroot/swap -zfs set checksum=off zroot/swap -swapon /dev/zvol/zroot/swap - -# Install the OS -cd /usr/freebsd-dist -cat base.txz | tar --unlink -xpJf - -C /mnt/zroot -cat lib32.txz | tar --unlink -xpJf - -C /mnt/zroot -cat kernel.txz | tar --unlink -xpJf - -C /mnt/zroot -cat src.txz | tar --unlink -xpJf - -C /mnt/zroot - -cp /tmp/zpool.cache /mnt/zroot/boot/zfs/zpool.cache - -zfs set readonly=on zroot/var/empty - -ifdev=`ifconfig | grep '^[a-z]' | cut -d: -f1 | head -n 1` -# Enable required services -cat >> /mnt/zroot/etc/rc.conf << EOT -zfs_enable="YES" -hostname="${NAME}" -ifconfig_${ifdev}="dhcp" -sshd_enable="YES" -EOT - -# Tune and boot from zfs -cat >> /mnt/zroot/boot/loader.conf << EOT -zfs_load="YES" -vfs.root.mountfrom="zfs:zroot" -vm.kmem_size="200M" -vm.kmem_size_max="200M" -vfs.zfs.arc_max="40M" -vfs.zfs.vdev.cache.size="5M" -EOT - -# zfs doesn't use an fstab, but some rc scripts expect one -touch /mnt/zroot/etc/fstab - -# Set up user accounts -zfs create zroot/usr/home/vagrant -echo "vagrant" | pw -V /mnt/zroot/etc useradd vagrant -h 0 -s /bin/sh -G wheel -d /home/vagrant -c "Vagrant User" -echo "vagrant" | pw -V /mnt/zroot/etc usermod root - -chown 1001:1001 /mnt/zroot/home/vagrant - -zfs unmount -a -zfs set mountpoint=legacy zroot -zfs set mountpoint=/tmp zroot/tmp -zfs set mountpoint=/usr zroot/usr -zfs set mountpoint=/var zroot/var - -#echo "Troubleshooting!" -# Reboot -reboot diff --git a/http/freebsd-11.0/installerconfig b/http/freebsd-11.0/installerconfig new file mode 100644 index 000000000..7f711c80a --- /dev/null +++ b/http/freebsd-11.0/installerconfig @@ -0,0 +1,51 @@ +DISTRIBUTIONS="base.txz lib32.txz kernel.txz src.txz" + +# for variations in the root disk device name between VMware and Virtualbox +if [ -e /dev/ada0 ]; then + DISKSLICE=ada0 +elif [ -e /dev/da0 ]; then + DISKSLICE=da0 +elif [ -e /dev/vtbd0 ]; then + DISKSLICE=vtbd0 +else + echo "Unknown disk for install.sh to work with!" + exit -1 +fi + +# Workaround for https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=203777 +export nonInteractive="YES" + +export ZFSBOOT_DISKS="$DISKSLICE" +export ZFSBOOT_CONFIRM_LAYOUT=0 + +HOSTNAME=freebsd + +#!/bin/sh -x + +ifdev=$(ifconfig | grep '^[a-z]' | cut -d: -f1 | head -n 1) +# Enable required services +cat >> /etc/rc.conf << EOT +ifconfig_${ifdev}="dhcp" +sshd_enable="YES" +EOT + +# Tune and boot from zfs +cat >> /boot/loader.conf << EOT +vm.kmem_size="200M" +vm.kmem_size_max="200M" +vfs.zfs.arc_max="40M" +vfs.zfs.vdev.cache.size="5M" +autoboot_delay=3 +EOT + +# zfs doesn't use an fstab, but some rc scripts expect one +touch /etc/fstab + +# Set up user accounts +echo "vagrant" | pw -V /etc useradd vagrant -h 0 -s /bin/sh -G wheel -d /home/vagrant -c "Vagrant User" +echo "vagrant" | pw -V /etc usermod root + +mkdir -p /home/vagrant +chown 1001:1001 /home/vagrant + +reboot diff --git a/scripts/freebsd/minimize.sh b/scripts/freebsd/minimize.sh index 4192113ba..2b84bba76 100644 --- a/scripts/freebsd/minimize.sh +++ b/scripts/freebsd/minimize.sh @@ -4,8 +4,12 @@ case "$PACKER_BUILDER_TYPE" in qemu) exit 0 ;; esac +COMPRESSION=$(zfs get -H compression zroot/ROOT/default | cut -f3); + +zfs set compression=off zroot/ROOT/default; dd if=/dev/zero of=/EMPTY bs=1M || echo "dd exit code $? is suppressed"; rm -f /EMPTY; # Block until the empty file has been removed, otherwise, Packer # will try to kill the box while the disk is still full and that's bad sync; +zfs set compression=$COMPRESSION zroot/ROOT/default; From 481456208a29c234f4f42fcd8077922ae5d028ae Mon Sep 17 00:00:00 2001 From: Rickard von Essen <rickard.von.essen@gmail.com> Date: Sun, 31 Jul 2016 17:19:59 +0200 Subject: [PATCH 0570/1622] FreeBSD 11.0: Updated to BETA3 and fixed the minimize script. Signed-off-by: Rickard von Essen <rickard.von.essen@gmail.com> --- freebsd-11.0-amd64.json | 4 ++-- scripts/freebsd/minimize.sh | 18 ++++++++++++++---- 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/freebsd-11.0-amd64.json b/freebsd-11.0-amd64.json index d58715285..c363fa1c5 100644 --- a/freebsd-11.0-amd64.json +++ b/freebsd-11.0-amd64.json @@ -219,9 +219,9 @@ "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", "install_path": "freebsd-11.0/installerconfig", - "iso_checksum": "74490ca260ca544edb8956d72cf23b82650b7578569945a6a690a9a346cebfd7", + "iso_checksum": "ba006b3ed7e0a875156977e25c19fc389c3fc3f42df62e6129f7a097d1011cdd", "iso_checksum_type": "sha256", - "iso_name": "FreeBSD-11.0-BETA2-amd64-disc1.iso", + "iso_name": "FreeBSD-11.0-BETA3-amd64-disc1.iso", "memory": "512", "metadata": "floppy/dummy_metadata.json", "mirror": "http://ftp.freebsd.org/pub/FreeBSD", diff --git a/scripts/freebsd/minimize.sh b/scripts/freebsd/minimize.sh index 2b84bba76..293926adb 100644 --- a/scripts/freebsd/minimize.sh +++ b/scripts/freebsd/minimize.sh @@ -4,12 +4,22 @@ case "$PACKER_BUILDER_TYPE" in qemu) exit 0 ;; esac -COMPRESSION=$(zfs get -H compression zroot/ROOT/default | cut -f3); +COMPRESSION=$(zfs get -H compression zroot | cut -f3); + +zfs set compression=off zroot; +dd if=/dev/zero of=/EMPTY bs=1m & +PID=$!; + +avail=$(zfs get -pH avail zroot/ROOT/default | cut -f3); +while [ "$avail" -ne 0 ]; do + sleep 15; + avail=$(zfs get -pH avail zroot/ROOT/default | cut -f3); +done + +kill $PID || echo "dd already exited"; -zfs set compression=off zroot/ROOT/default; -dd if=/dev/zero of=/EMPTY bs=1M || echo "dd exit code $? is suppressed"; rm -f /EMPTY; # Block until the empty file has been removed, otherwise, Packer # will try to kill the box while the disk is still full and that's bad sync; -zfs set compression=$COMPRESSION zroot/ROOT/default; +zfs set compression=$COMPRESSION zroot; From f9428ebbb5ecec36fb08bd17b30c8c445dff3567 Mon Sep 17 00:00:00 2001 From: Rickard von Essen <rickard.von.essen@gmail.com> Date: Tue, 11 Oct 2016 22:34:30 +0200 Subject: [PATCH 0571/1622] Updated to FreeBSD 11.0 RELEASE Signed-off-by: Rickard von Essen <rickard.von.essen@gmail.com> --- freebsd-11.0-amd64.json | 5 ++--- scripts/freebsd/update.sh | 2 +- scripts/freebsd/vmtools.sh | 2 +- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/freebsd-11.0-amd64.json b/freebsd-11.0-amd64.json index c363fa1c5..aade77e42 100644 --- a/freebsd-11.0-amd64.json +++ b/freebsd-11.0-amd64.json @@ -95,7 +95,6 @@ ], "boot_wait": "8s", "disk_size": "{{user `disk_size`}}", - "hard_drive_interface": "scsi", "guest_os_type": "freebsd", "http_directory": "http", "iso_checksum": "{{user `iso_checksum`}}", @@ -219,9 +218,9 @@ "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", "install_path": "freebsd-11.0/installerconfig", - "iso_checksum": "ba006b3ed7e0a875156977e25c19fc389c3fc3f42df62e6129f7a097d1011cdd", + "iso_checksum": "08b12f2dc378f7a61b5469219824c74a2f9faef580acc85ffab45365df79872d", "iso_checksum_type": "sha256", - "iso_name": "FreeBSD-11.0-BETA3-amd64-disc1.iso", + "iso_name": "FreeBSD-11.0-RELEASE-amd64-disc1.iso", "memory": "512", "metadata": "floppy/dummy_metadata.json", "mirror": "http://ftp.freebsd.org/pub/FreeBSD", diff --git a/scripts/freebsd/update.sh b/scripts/freebsd/update.sh index 5c17fcff6..36411fb66 100644 --- a/scripts/freebsd/update.sh +++ b/scripts/freebsd/update.sh @@ -19,7 +19,7 @@ fi # Update FreeBSD # NOTE: the install action fails if there are no updates so || true it -env PAGER=/bin/cat $freebsd_update fetch; +env PAGER=/bin/cat $freebsd_update fetch || true; env PAGER=/bin/cat $freebsd_update install || true; # Always use pkgng - pkg_add is EOL as of 1 September 2014 diff --git a/scripts/freebsd/vmtools.sh b/scripts/freebsd/vmtools.sh index ad5962ab4..8ad971857 100644 --- a/scripts/freebsd/vmtools.sh +++ b/scripts/freebsd/vmtools.sh @@ -44,7 +44,7 @@ vmware-iso|vmware-vmx) mdconfig -a -t vnode -f $HOME_DIR/freebsd.iso -u 0; mount -t cd9660 /dev/md0 /tmp/vmfusion; tar xzf /tmp/vmfusion/vmware-freebsd-tools.tar.gz -C /tmp/vmfusion-archive; - /tmp/vmfusion-archive/vmware-tools-distrib/vmware-install.pl --force-install; + /tmp/vmfusion-archive/vmware-tools-distrib/vmware-install.pl --default; echo 'ifconfig_vxn0="dhcp"' >>/etc/rc.conf; umount /tmp/vmfusion; rm -rf /tmp/vmfusion; From c91f28aad54ca77b943ab8ea75d79e2c8d2c3653 Mon Sep 17 00:00:00 2001 From: Rickard von Essen <rickard.von.essen@gmail.com> Date: Fri, 18 Nov 2016 22:14:19 +0100 Subject: [PATCH 0572/1622] Handle changed options for VMware Tools install Signed-off-by: Rickard von Essen <rickard.von.essen@gmail.com> --- scripts/freebsd/vmtools.sh | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/scripts/freebsd/vmtools.sh b/scripts/freebsd/vmtools.sh index 8ad971857..35e4e866d 100644 --- a/scripts/freebsd/vmtools.sh +++ b/scripts/freebsd/vmtools.sh @@ -44,7 +44,17 @@ vmware-iso|vmware-vmx) mdconfig -a -t vnode -f $HOME_DIR/freebsd.iso -u 0; mount -t cd9660 /dev/md0 /tmp/vmfusion; tar xzf /tmp/vmfusion/vmware-freebsd-tools.tar.gz -C /tmp/vmfusion-archive; - /tmp/vmfusion-archive/vmware-tools-distrib/vmware-install.pl --default; + + VER="`cat /tmp/vmfusion/manifest.txt | cut -f2 -d'"'`"; + MAJ_VER="`echo ${VER} | cut -d'.' -f1`"; + echo "VMware Tools Version: $VER"; + + if [ "${MAJ_VER}" -lt "10" ]; then + /tmp/vmfusion-archive/vmware-tools-distrib/vmware-install.pl --default; + else + /tmp/vmfusion-archive/vmware-tools-distrib/vmware-install.pl --force-install; + fi + echo 'ifconfig_vxn0="dhcp"' >>/etc/rc.conf; umount /tmp/vmfusion; rm -rf /tmp/vmfusion; From ab89d1b77665edf3b892a052625b57579c9188bb Mon Sep 17 00:00:00 2001 From: Rickard von Essen <rickard.von.essen@gmail.com> Date: Sat, 19 Nov 2016 22:58:39 +0100 Subject: [PATCH 0573/1622] Updated to OpenSUSE Leap 42.2 Signed-off-by: Rickard von Essen <rickard.von.essen@gmail.com> --- .../autoinst.xml | 2 +- ..._64.json => opensuse-leap-42.2-x86_64.json | 25 +++++++++---------- 2 files changed, 13 insertions(+), 14 deletions(-) rename http/{opensuse-leap-42.1 => opensuse-leap-42.2}/autoinst.xml (99%) rename opensuse-leap-42.1-x86_64.json => opensuse-leap-42.2-x86_64.json (87%) diff --git a/http/opensuse-leap-42.1/autoinst.xml b/http/opensuse-leap-42.2/autoinst.xml similarity index 99% rename from http/opensuse-leap-42.1/autoinst.xml rename to http/opensuse-leap-42.2/autoinst.xml index 3b5619238..8bf0c563e 100644 --- a/http/opensuse-leap-42.1/autoinst.xml +++ b/http/opensuse-leap-42.2/autoinst.xml @@ -108,7 +108,7 @@ <dhcp_hostname config:type="boolean">true</dhcp_hostname> <dhcp_resolv config:type="boolean">true</dhcp_resolv> <domain>vagrantup.com</domain> - <hostname>opensuse-leap-42.1-x64</hostname> + <hostname>opensuse-leap-42.2-x64</hostname> </dns> <interfaces config:type="list"> <interface> diff --git a/opensuse-leap-42.1-x86_64.json b/opensuse-leap-42.2-x86_64.json similarity index 87% rename from opensuse-leap-42.1-x86_64.json rename to opensuse-leap-42.2-x86_64.json index ffa76abb4..85c9e9fbe 100644 --- a/opensuse-leap-42.1-x86_64.json +++ b/opensuse-leap-42.2-x86_64.json @@ -4,7 +4,7 @@ "boot_command": [ "<esc><enter><wait>", "linux netsetup=dhcp install=cd:/<wait>", - " lang=en_US.UTF-8 autoyast=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `autoinst_cfg`}}<wait>", + " lang=en_US autoyast=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `autoinst_cfg`}}<wait>", " textmode=1<wait>", "<enter><wait>" ], @@ -46,7 +46,7 @@ "boot_command": [ "<esc><enter><wait>", "linux netsetup=dhcp install=cd:/<wait>", - " lang=en_US.UTF-8 autoyast=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `autoinst_cfg`}}<wait>", + " lang=en_US autoyast=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `autoinst_cfg`}}<wait>", " textmode=1<wait>", "<enter><wait>" ], @@ -77,7 +77,7 @@ "boot_command": [ "<esc><enter><wait>", "linux netsetup=dhcp netdevice=eth0 install=cd:/<wait>", - " lang=en_US.UTF-8 autoyast=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `autoinst_cfg`}}<wait>", + " lang=en_US autoyast=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `autoinst_cfg`}}<wait>", " textmode=1<wait>", "<enter><wait>" ], @@ -117,7 +117,7 @@ "boot_command": [ "<esc><enter><wait>", "linux netsetup=dhcp netdevice=eth0 install=cd:/<wait>", - " lang=en_US.UTF-8 autoyast=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `autoinst_cfg`}}<wait>", + " lang=en_US autoyast=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `autoinst_cfg`}}<wait>", " textmode=1<wait>", "<enter><wait>" ], @@ -168,16 +168,15 @@ "scripts/opensuse/sudoers.sh", "scripts/opensuse/zypper-locks.sh", "scripts/opensuse/remove-dvd-source.sh", - "scripts/opensuse/cleanup.sh", - "scripts/common/minimize.sh" + "scripts/opensuse/cleanup.sh" ], "type": "shell" } ], "variables": { "arch": "64", - "autoinst_cfg": "opensuse-leap-42.1/autoinst.xml", - "box_basename": "opensuse-leap-42.1", + "autoinst_cfg": "opensuse-leap-42.2/autoinst.xml", + "box_basename": "opensuse-leap-42.2", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", "disk_size": "20480", @@ -185,16 +184,16 @@ "headless": "", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", - "iso_checksum": "8576e84822cdbe566bf551e28a169fc028229831eba9f07a4c1f84302c5ddb09", + "iso_checksum": "ba5af6b0ac4d42d801de642304eb88ca9fd65a61b6c3ff25724182494f288f00", "iso_checksum_type": "sha256", - "iso_name": "openSUSE-Leap-42.1-DVD-x86_64.iso", + "iso_name": "openSUSE-Leap-42.2-DVD-x86_64.iso", "memory": "768", "metadata": "floppy/dummy_metadata.json", "mirror": "http://suse.mobile-central.org/distribution", - "mirror_directory": "leap/42.1/iso", - "name": "opensuse-leap-42.1", + "mirror_directory": "leap/42.2/iso", + "name": "opensuse-leap-42.2", "no_proxy": "{{env `no_proxy`}}", - "template": "opensuse-leap-42.1-x86_64", + "template": "opensuse-leap-42.2-x86_64", "version": "2.0.TIMESTAMP" } } From 889d8ccc2263b87ba0eb72e12a59cb1701f805ef Mon Sep 17 00:00:00 2001 From: Rickard von Essen <rickard.von.essen@gmail.com> Date: Sun, 20 Nov 2016 11:39:59 +0100 Subject: [PATCH 0574/1622] Adjusted OpenSUSE cleanup script Signed-off-by: Rickard von Essen <rickard.von.essen@gmail.com> --- opensuse-leap-42.2-x86_64.json | 3 ++- scripts/opensuse/cleanup.sh | 11 ++++++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/opensuse-leap-42.2-x86_64.json b/opensuse-leap-42.2-x86_64.json index 85c9e9fbe..11437d34c 100644 --- a/opensuse-leap-42.2-x86_64.json +++ b/opensuse-leap-42.2-x86_64.json @@ -168,7 +168,8 @@ "scripts/opensuse/sudoers.sh", "scripts/opensuse/zypper-locks.sh", "scripts/opensuse/remove-dvd-source.sh", - "scripts/opensuse/cleanup.sh" + "scripts/opensuse/cleanup.sh", + "scripts/common/minimize.sh" ], "type": "shell" } diff --git a/scripts/opensuse/cleanup.sh b/scripts/opensuse/cleanup.sh index f83c0b645..6d57712bd 100644 --- a/scripts/opensuse/cleanup.sh +++ b/scripts/opensuse/cleanup.sh @@ -1,3 +1,12 @@ #!/bin/bash -eux # These were only needed for building VMware/Virtualbox extensions: -zypper -n rm -u binutils gcc make perl ruby kernel-default-devel kernel-devel + +version=`grep VERSION= /etc/os-release | cut -f2 -d\" | cut -f1 -d\ ` + +if [[ $version =~ "13" ]]; then + zypper -n rm -u binutils gcc make perl ruby kernel-default-devel kernel-devel +fi + +if [[ $version =~ "4" ]]; then + zypper -n rm -u gcc make kernel-default-devel kernel-devel +fi From 191c899df7e5a2c6524accfa511d2d1161b5dbf6 Mon Sep 17 00:00:00 2001 From: Rickard von Essen <rickard.von.essen@gmail.com> Date: Tue, 22 Nov 2016 21:47:21 +0100 Subject: [PATCH 0575/1622] Updated to Fedora 25 Signed-off-by: Rickard von Essen <rickard.von.essen@gmail.com> --- fedora-23-i386.json => fedora-25-i386.json | 15 +++++++-------- fedora-23-x86_64.json => fedora-25-x86_64.json | 12 ++++++------ scripts/fedora/cleanup.sh | 4 ++-- scripts/fedora/fix-slow-dns.sh | 7 +------ 4 files changed, 16 insertions(+), 22 deletions(-) rename fedora-23-i386.json => fedora-25-i386.json (95%) rename fedora-23-x86_64.json => fedora-25-x86_64.json (95%) diff --git a/fedora-23-i386.json b/fedora-25-i386.json similarity index 95% rename from fedora-23-i386.json rename to fedora-25-i386.json index 002aecef1..f1e854b1b 100644 --- a/fedora-23-i386.json +++ b/fedora-25-i386.json @@ -1,4 +1,3 @@ - { "builders": [ { @@ -141,9 +140,9 @@ "scripts": [ "scripts/common/metadata.sh", "scripts/fedora/fix-slow-dns.sh", - "scripts/common/sshd.sh", "scripts/fedora/build-tools.sh", "scripts/fedora/yum.sh", + "scripts/common/sshd.sh", "scripts/common/virtualbox.sh", "scripts/common/vmware.sh", "scripts/common/parallels.sh", @@ -156,7 +155,7 @@ ], "variables": { "arch": "32", - "box_basename": "fedora-23-i386", + "box_basename": "fedora-25-i386", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", "disk_size": "40960", @@ -164,17 +163,17 @@ "headless": "", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", - "iso_checksum": "aa2125b6351480ce82ace619925d897d0588195a3287ef74fb203b6eb34cbccf", + "iso_checksum": "888ce3dd791854c8e0f62e9eac292a90cf9765a3f2de75b6ceb99eaa62d7f2cc", "iso_checksum_type": "sha256", - "iso_name": "Fedora-Server-DVD-i386-23.iso", + "iso_name": "Fedora-Server-dvd-i386-25-1.3.iso", "ks_path": "fedora-latest/ks.cfg", "memory": "512", "metadata": "floppy/dummy_metadata.json", "mirror": "http://download.fedoraproject.org/pub/fedora/linux", - "mirror_directory": "releases/23/Server/i386/iso", - "name": "fedora-23-i386", + "mirror_directory": "releases/25/Server/i386/iso", + "name": "fedora-25-i386", "no_proxy": "{{env `no_proxy`}}", - "template": "fedora-23-i386", + "template": "fedora-25-i386", "version": "2.0.TIMESTAMP" } } diff --git a/fedora-23-x86_64.json b/fedora-25-x86_64.json similarity index 95% rename from fedora-23-x86_64.json rename to fedora-25-x86_64.json index 64908ce55..96f192c03 100644 --- a/fedora-23-x86_64.json +++ b/fedora-25-x86_64.json @@ -161,7 +161,7 @@ ], "variables": { "arch": "64", - "box_basename": "fedora-23", + "box_basename": "fedora-25", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", "disk_size": "40960", @@ -169,17 +169,17 @@ "headless": "", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", - "iso_checksum": "30758dc821d1530de427c9e35212bd79b058bd4282e64b7b34ae1a40c87c05ae", + "iso_checksum": "524bd959dae09ad6fc8e0476ea478700d89f82ec5795d0b1a7b873613f3f26ac", "iso_checksum_type": "sha256", - "iso_name": "Fedora-Server-DVD-x86_64-23.iso", + "iso_name": "Fedora-Server-dvd-x86_64-25-1.3.iso", "ks_path": "fedora-latest/ks.cfg", "memory": "512", "metadata": "floppy/dummy_metadata.json", "mirror": "http://download.fedoraproject.org/pub/fedora/linux", - "mirror_directory": "releases/23/Server/x86_64/iso", - "name": "fedora-23", + "mirror_directory": "releases/25/Server/x86_64/iso", + "name": "fedora-25", "no_proxy": "{{env `no_proxy`}}", - "template": "fedora-23-x86_64", + "template": "fedora-25-x86_64", "version": "2.0.TIMESTAMP" } } diff --git a/scripts/fedora/cleanup.sh b/scripts/fedora/cleanup.sh index 13f3111e2..3ab13a04b 100644 --- a/scripts/fedora/cleanup.sh +++ b/scripts/fedora/cleanup.sh @@ -1,5 +1,5 @@ #!/bin/bash -eux -yum -y remove gcc cpp kernel-devel kernel-headers perl -yum -y clean all +dnf -y remove gcc cpp kernel-devel kernel-headers perl +dnf -y clean all rm -rf VBoxGuestAdditions_*.iso VBoxGuestAdditions_*.iso.? rm -f /tmp/chef*rpm diff --git a/scripts/fedora/fix-slow-dns.sh b/scripts/fedora/fix-slow-dns.sh index cd9ef8458..384632df3 100644 --- a/scripts/fedora/fix-slow-dns.sh +++ b/scripts/fedora/fix-slow-dns.sh @@ -1,11 +1,6 @@ #!/bin/bash -eux if [[ "$PACKER_BUILDER_TYPE" == virtualbox* ]]; then - # fix bug to enable nm-dispatcher on Fedora 19 https://bugzilla.redhat.com/show_bug.cgi?id=974811 - if [[ $(rpm -q --queryformat '%{VERSION}\n' fedora-release) == 19 ]]; then - yum -y upgrade NetworkManager - systemctl enable NetworkManager-dispatcher.service - fi ## https://access.redhat.com/site/solutions/58625 (subscription required) # add 'single-request-reopen' so it is included when /etc/resolv.conf is generated @@ -14,7 +9,7 @@ if [[ "$PACKER_BUILDER_TYPE" == virtualbox* ]]; then echo "options single-request-reopen" >> /etc/resolv.conf EOF chmod +x /etc/NetworkManager/dispatcher.d/fix-slow-dns - service NetworkManager restart + systemctl restart NetworkManager.service echo 'Slow DNS fix applied (single-request-reopen)' else echo 'Slow DNS fix not required for this platform, skipping' From 75676b66676ff6f4458add9bcd8dbb8f4aeeb656 Mon Sep 17 00:00:00 2001 From: Seth Thomas <sthomas@chef.io> Date: Tue, 29 Nov 2016 18:03:40 -0500 Subject: [PATCH 0576/1622] CentOS 5.11-x86_64 building w/ vbox 5.1.x. Fix #729. Signed-off-by: Seth Thomas <sthomas@chef.io> --- centos-5.11-x86_64.json | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/centos-5.11-x86_64.json b/centos-5.11-x86_64.json index 28ddd11ec..0756f4868 100644 --- a/centos-5.11-x86_64.json +++ b/centos-5.11-x86_64.json @@ -33,6 +33,12 @@ "{{.Name}}", "--cpus", "{{ user `cpus` }}" + ], + [ + "modifyvm", + "{{.Name}}", + "--paravirtprovider", + "none" ] ], "virtualbox_version_file": ".vbox_version", From 55799132ec86f59b62b4589c0fa4815385e2fdd3 Mon Sep 17 00:00:00 2001 From: Seth Thomas <sthomas@chef.io> Date: Wed, 30 Nov 2016 08:57:14 -0500 Subject: [PATCH 0577/1622] Provisionally keeping Perl. Redux of #714 Signed-off-by: Seth Thomas <sthomas@chef.io> --- scripts/centos/cleanup.sh | 2 +- scripts/fedora/cleanup.sh | 2 +- scripts/opensuse/cleanup.sh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/centos/cleanup.sh b/scripts/centos/cleanup.sh index 21065f708..acd404456 100644 --- a/scripts/centos/cleanup.sh +++ b/scripts/centos/cleanup.sh @@ -4,7 +4,7 @@ distro="`rpm -qf --queryformat '%{NAME}' /etc/redhat-release | cut -f 1 -d '-'`" # Remove development and kernel source packages -yum -y remove gcc cpp kernel-devel kernel-headers perl; +yum -y remove gcc cpp kernel-devel kernel-headers; if [ "$distro" != 'redhat' ]; then yum -y clean all; diff --git a/scripts/fedora/cleanup.sh b/scripts/fedora/cleanup.sh index 13f3111e2..ddf554083 100644 --- a/scripts/fedora/cleanup.sh +++ b/scripts/fedora/cleanup.sh @@ -1,5 +1,5 @@ #!/bin/bash -eux -yum -y remove gcc cpp kernel-devel kernel-headers perl +yum -y remove gcc cpp kernel-devel kernel-headers yum -y clean all rm -rf VBoxGuestAdditions_*.iso VBoxGuestAdditions_*.iso.? rm -f /tmp/chef*rpm diff --git a/scripts/opensuse/cleanup.sh b/scripts/opensuse/cleanup.sh index 6d57712bd..7e89c4519 100644 --- a/scripts/opensuse/cleanup.sh +++ b/scripts/opensuse/cleanup.sh @@ -4,7 +4,7 @@ version=`grep VERSION= /etc/os-release | cut -f2 -d\" | cut -f1 -d\ ` if [[ $version =~ "13" ]]; then - zypper -n rm -u binutils gcc make perl ruby kernel-default-devel kernel-devel + zypper -n rm -u binutils gcc make ruby kernel-default-devel kernel-devel fi if [[ $version =~ "4" ]]; then From 7a78efe5b82bb7eaef0a59bd16042894a23b05b3 Mon Sep 17 00:00:00 2001 From: Seth Thomas <sthomas@chef.io> Date: Wed, 30 Nov 2016 15:10:56 -0500 Subject: [PATCH 0578/1622] Update Oracle to 6.8, 7.3 Signed-off-by: Seth Thomas <sthomas@chef.io> --- .../oracle-6.7-i386.json | 0 .../oracle-6.7-x86_64.json | 0 .../oracle-7.2-x86_64.json | 0 oracle-5.11-x86_64.json | 6 + oracle-6.8-i386.json | 182 ++++++++++++++++++ oracle-6.8-x86_64.json | 182 ++++++++++++++++++ oracle-7.3-x86_64.json | 182 ++++++++++++++++++ rhel-5.11-x86_64.json | 6 + 8 files changed, 558 insertions(+) rename oracle-6.7-i386.json => archive/oracle-6.7-i386.json (100%) rename oracle-6.7-x86_64.json => archive/oracle-6.7-x86_64.json (100%) rename oracle-7.2-x86_64.json => archive/oracle-7.2-x86_64.json (100%) create mode 100644 oracle-6.8-i386.json create mode 100644 oracle-6.8-x86_64.json create mode 100644 oracle-7.3-x86_64.json diff --git a/oracle-6.7-i386.json b/archive/oracle-6.7-i386.json similarity index 100% rename from oracle-6.7-i386.json rename to archive/oracle-6.7-i386.json diff --git a/oracle-6.7-x86_64.json b/archive/oracle-6.7-x86_64.json similarity index 100% rename from oracle-6.7-x86_64.json rename to archive/oracle-6.7-x86_64.json diff --git a/oracle-7.2-x86_64.json b/archive/oracle-7.2-x86_64.json similarity index 100% rename from oracle-7.2-x86_64.json rename to archive/oracle-7.2-x86_64.json diff --git a/oracle-5.11-x86_64.json b/oracle-5.11-x86_64.json index e7a55455c..ba51714fe 100644 --- a/oracle-5.11-x86_64.json +++ b/oracle-5.11-x86_64.json @@ -33,6 +33,12 @@ "{{.Name}}", "--cpus", "{{ user `cpus` }}" + ], + [ + "modifyvm", + "{{.Name}}", + "--paravirtprovider", + "none" ] ], "virtualbox_version_file": ".vbox_version", diff --git a/oracle-6.8-i386.json b/oracle-6.8-i386.json new file mode 100644 index 000000000..019073760 --- /dev/null +++ b/oracle-6.8-i386.json @@ -0,0 +1,182 @@ +{ + "builders": [ + { + "boot_command": [ + "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": "{{user `disk_size`}}", + "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "guest_os_type": "Oracle", + "hard_drive_interface": "sata", + "headless": "{{ user `headless` }}", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-virtualbox", + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "virtualbox-iso", + "vboxmanage": [ + [ + "modifyvm", + "{{.Name}}", + "--memory", + "{{ user `memory` }}" + ], + [ + "modifyvm", + "{{.Name}}", + "--cpus", + "{{ user `cpus` }}" + ] + ], + "virtualbox_version_file": ".vbox_version", + "vm_name": "{{ user `template` }}" + }, + { + "boot_command": [ + "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": "{{user `disk_size`}}", + "guest_os_type": "oraclelinux", + "headless": "{{ user `headless` }}", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-vmware", + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "tools_upload_flavor": "linux", + "type": "vmware-iso", + "vm_name": "{{ user `template` }}", + "vmx_data": { + "cpuid.coresPerSocket": "1", + "memsize": "{{ user `memory` }}", + "numvcpus": "{{ user `cpus` }}" + } + }, + { + "boot_command": [ + "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": "{{user `disk_size`}}", + "guest_os_type": "centos", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-parallels", + "parallels_tools_flavor": "lin", + "prlctl": [ + [ + "set", + "{{.Name}}", + "--memsize", + "{{ user `memory` }}" + ], + [ + "set", + "{{.Name}}", + "--cpus", + "{{ user `cpus` }}" + ] + ], + "prlctl_version_file": ".prlctl_version", + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "parallels-iso", + "vm_name": "{{ user `template` }}" + }, + { + "boot_command": [ + "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": "{{user `disk_size`}}", + "headless": "{{ user `headless` }}", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-qemu", + "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "qemu", + "vm_name": "{{ user `template` }}" + } + ], + "post-processors": [ + { + "output": "builds/{{user `box_basename`}}.{{.Provider}}.box", + "type": "vagrant" + } + ], + "provisioners": [ + { + "destination": "/tmp/bento-metadata.json", + "source": "{{user `metadata`}}", + "type": "file" + }, + { + "environment_vars": [ + "HOME_DIR=/home/vagrant", + "http_proxy={{user `http_proxy`}}", + "https_proxy={{user `https_proxy`}}", + "no_proxy={{user `no_proxy`}}" + ], + "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", + "scripts": [ + "scripts/common/metadata.sh", + "scripts/centos/networking.sh", + "scripts/common/sshd.sh", + "scripts/common/vagrant.sh", + "scripts/common/virtualbox.sh", + "scripts/common/vmware.sh", + "scripts/common/parallels.sh", + "scripts/centos/cleanup.sh", + "scripts/common/minimize.sh" + ], + "type": "shell" + } + ], + "variables": { + "arch": "32", + "box_basename": "oracle-6.8-i386", + "build_timestamp": "{{isotime \"20060102150405\"}}", + "cpus": "1", + "disk_size": "40960", + "git_revision": "__unknown_git_revision__", + "headless": "", + "http_proxy": "{{env `http_proxy`}}", + "https_proxy": "{{env `https_proxy`}}", + "iso_checksum": "809eb9e9f44683ff875c64a00a85576ef93b679e98919f4fde8f856af9dac356", + "iso_checksum_type": "sha256", + "iso_name": "OracleLinux-R6-U8-Server-i386-dvd.iso", + "ks_path": "centos-6.8/ks.cfg", + "memory": "512", + "metadata": "floppy/dummy_metadata.json", + "mirror": "http://mirrors.dotsrc.org/oracle-linux", + "mirror_directory": "OL6/U8/i386", + "name": "oracle-6.8-i386", + "no_proxy": "{{env `no_proxy`}}", + "template": "oracle-6.8-i386", + "version": "2.2.TIMESTAMP" + } +} diff --git a/oracle-6.8-x86_64.json b/oracle-6.8-x86_64.json new file mode 100644 index 000000000..383db5de0 --- /dev/null +++ b/oracle-6.8-x86_64.json @@ -0,0 +1,182 @@ +{ + "builders": [ + { + "boot_command": [ + "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": "{{user `disk_size`}}", + "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "guest_os_type": "Oracle_64", + "hard_drive_interface": "sata", + "headless": "{{ user `headless` }}", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-virtualbox", + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "virtualbox-iso", + "vboxmanage": [ + [ + "modifyvm", + "{{.Name}}", + "--memory", + "{{ user `memory` }}" + ], + [ + "modifyvm", + "{{.Name}}", + "--cpus", + "{{ user `cpus` }}" + ] + ], + "virtualbox_version_file": ".vbox_version", + "vm_name": "{{ user `template` }}" + }, + { + "boot_command": [ + "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": "{{user `disk_size`}}", + "guest_os_type": "oraclelinux-64", + "headless": "{{ user `headless` }}", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-vmware", + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "tools_upload_flavor": "linux", + "type": "vmware-iso", + "vm_name": "{{ user `template` }}", + "vmx_data": { + "cpuid.coresPerSocket": "1", + "memsize": "{{ user `memory` }}", + "numvcpus": "{{ user `cpus` }}" + } + }, + { + "boot_command": [ + "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": "{{user `disk_size`}}", + "guest_os_type": "centos", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-parallels", + "parallels_tools_flavor": "lin", + "prlctl": [ + [ + "set", + "{{.Name}}", + "--memsize", + "{{ user `memory` }}" + ], + [ + "set", + "{{.Name}}", + "--cpus", + "{{ user `cpus` }}" + ] + ], + "prlctl_version_file": ".prlctl_version", + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "parallels-iso", + "vm_name": "{{ user `template` }}" + }, + { + "boot_command": [ + "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": "{{user `disk_size`}}", + "headless": "{{ user `headless` }}", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-qemu", + "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "qemu", + "vm_name": "{{ user `template` }}" + } + ], + "post-processors": [ + { + "output": "builds/{{user `box_basename`}}.{{.Provider}}.box", + "type": "vagrant" + } + ], + "provisioners": [ + { + "destination": "/tmp/bento-metadata.json", + "source": "{{user `metadata`}}", + "type": "file" + }, + { + "environment_vars": [ + "HOME_DIR=/home/vagrant", + "http_proxy={{user `http_proxy`}}", + "https_proxy={{user `https_proxy`}}", + "no_proxy={{user `no_proxy`}}" + ], + "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", + "scripts": [ + "scripts/common/metadata.sh", + "scripts/centos/networking.sh", + "scripts/common/sshd.sh", + "scripts/common/vagrant.sh", + "scripts/common/virtualbox.sh", + "scripts/common/vmware.sh", + "scripts/common/parallels.sh", + "scripts/centos/cleanup.sh", + "scripts/common/minimize.sh" + ], + "type": "shell" + } + ], + "variables": { + "arch": "64", + "box_basename": "oracle-6.7", + "build_timestamp": "{{isotime \"20060102150405\"}}", + "cpus": "1", + "disk_size": "40960", + "git_revision": "__unknown_git_revision__", + "headless": "", + "http_proxy": "{{env `http_proxy`}}", + "https_proxy": "{{env `https_proxy`}}", + "iso_checksum": "de114b9a108ad9b3c9a27764fddffbc1019b9b7913ee6d9b717f65041780c879", + "iso_checksum_type": "sha256", + "iso_name": "OracleLinux-R6-U8-Server-x86_64-dvd.iso", + "ks_path": "centos-6.8/ks.cfg", + "memory": "512", + "metadata": "floppy/dummy_metadata.json", + "mirror": "http://mirrors.dotsrc.org/oracle-linux", + "mirror_directory": "OL6/U8/x86_64", + "name": "oracle-6.8", + "no_proxy": "{{env `no_proxy`}}", + "template": "oracle-6.8-x86_64", + "version": "2.0.TIMESTAMP" + } +} diff --git a/oracle-7.3-x86_64.json b/oracle-7.3-x86_64.json new file mode 100644 index 000000000..aedb24cdc --- /dev/null +++ b/oracle-7.3-x86_64.json @@ -0,0 +1,182 @@ +{ + "builders": [ + { + "boot_command": [ + "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": "{{user `disk_size`}}", + "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "guest_os_type": "Oracle_64", + "hard_drive_interface": "sata", + "headless": "{{ user `headless` }}", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-virtualbox", + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "virtualbox-iso", + "vboxmanage": [ + [ + "modifyvm", + "{{.Name}}", + "--memory", + "{{ user `memory` }}" + ], + [ + "modifyvm", + "{{.Name}}", + "--cpus", + "{{ user `cpus` }}" + ] + ], + "virtualbox_version_file": ".vbox_version", + "vm_name": "{{ user `template` }}" + }, + { + "boot_command": [ + "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": "{{user `disk_size`}}", + "guest_os_type": "oraclelinux-64", + "headless": "{{ user `headless` }}", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-vmware", + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "tools_upload_flavor": "linux", + "type": "vmware-iso", + "vm_name": "{{ user `template` }}", + "vmx_data": { + "cpuid.coresPerSocket": "1", + "memsize": "{{ user `memory` }}", + "numvcpus": "{{ user `cpus` }}" + } + }, + { + "boot_command": [ + "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": "{{user `disk_size`}}", + "guest_os_type": "centos", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-parallels", + "parallels_tools_flavor": "lin", + "prlctl": [ + [ + "set", + "{{.Name}}", + "--memsize", + "{{ user `memory` }}" + ], + [ + "set", + "{{.Name}}", + "--cpus", + "{{ user `cpus` }}" + ] + ], + "prlctl_version_file": ".prlctl_version", + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "parallels-iso", + "vm_name": "{{ user `template` }}" + }, + { + "boot_command": [ + "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": "{{user `disk_size`}}", + "headless": "{{ user `headless` }}", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-qemu", + "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "qemu", + "vm_name": "{{ user `template` }}" + } + ], + "post-processors": [ + { + "output": "builds/{{user `box_basename`}}.{{.Provider}}.box", + "type": "vagrant" + } + ], + "provisioners": [ + { + "destination": "/tmp/bento-metadata.json", + "source": "{{user `metadata`}}", + "type": "file" + }, + { + "environment_vars": [ + "HOME_DIR=/home/vagrant", + "http_proxy={{user `http_proxy`}}", + "https_proxy={{user `https_proxy`}}", + "no_proxy={{user `no_proxy`}}" + ], + "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", + "scripts": [ + "scripts/common/metadata.sh", + "scripts/centos/networking.sh", + "scripts/common/sshd.sh", + "scripts/common/vagrant.sh", + "scripts/common/virtualbox.sh", + "scripts/common/vmware.sh", + "scripts/common/parallels.sh", + "scripts/centos/cleanup.sh", + "scripts/common/minimize.sh" + ], + "type": "shell" + } + ], + "variables": { + "arch": "64", + "box_basename": "oracle-7.3", + "build_timestamp": "{{isotime \"20060102150405\"}}", + "cpus": "1", + "disk_size": "40960", + "git_revision": "__unknown_git_revision__", + "headless": "", + "http_proxy": "{{env `http_proxy`}}", + "https_proxy": "{{env `https_proxy`}}", + "iso_checksum": "2ad5327428c44d505a7d882a273cb3f5fbac4e56e739cf18f895565dde987101", + "iso_checksum_type": "sha256", + "iso_name": "OracleLinux-R7-U3-Server-x86_64-dvd.iso", + "ks_path": "centos-7.2/ks.cfg", + "memory": "512", + "metadata": "floppy/dummy_metadata.json", + "mirror": "http://mirrors.dotsrc.org/oracle-linux", + "mirror_directory": "OL7/u3/x86_64", + "name": "oracle-7.3", + "no_proxy": "{{env `no_proxy`}}", + "template": "oracle-7.3-x86_64", + "version": "2.2.TIMESTAMP" + } +} diff --git a/rhel-5.11-x86_64.json b/rhel-5.11-x86_64.json index 1d893ff85..713c25df0 100644 --- a/rhel-5.11-x86_64.json +++ b/rhel-5.11-x86_64.json @@ -33,6 +33,12 @@ "{{.Name}}", "--cpus", "{{ user `cpus` }}" + ], + [ + "modifyvm", + "{{.Name}}", + "--paravirtprovider", + "none" ] ], "virtualbox_version_file": ".vbox_version", From db51d71c9a07ba7d4eec87d4e47de416d3ad3c12 Mon Sep 17 00:00:00 2001 From: Seth Thomas <sthomas@chef.io> Date: Thu, 1 Dec 2016 13:58:14 -0500 Subject: [PATCH 0579/1622] Prepping 2.3.1 Signed-off-by: Seth Thomas <sthomas@chef.io> --- CHANGELOG.md | 36 +++++++++++++++++++ README.md | 97 +++++++++++++++++++++++++++++++++++++--------------- 2 files changed, 105 insertions(+), 28 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index aab87a7ac..6d696e9f3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,41 @@ # Change Log +## [2.3.1](https://github.com/chef/bento/tree/2.3.1) (2016-11-30) +[Full Changelog](https://github.com/chef/bento/compare/2.3.0...2.3.1) + +**Added and Updated Platforms** +- Fedora 25 [\#725](https://github.com/chef/bento/pull/725) ([rickard-von-essen](https://github.com/rickard-von-essen)) +- FreeBSD 11.0 [\#492](https://github.com/chef/bento/pull/492) ([rickard-von-essen](https://github.com/rickard-von-essen)) +- macOS Sierra [\#715](https://github.com/chef/bento/pull/715) ([kameghamegha](https://github.com/kameghamegha)) +- OpenSUSE Leap 42.2 [\#723](https://github.com/chef/bento/pull/723) ([rickard-von-essen](https://github.com/rickard-von-essen)) +- Oracle Linux 6.8 [\#733](https://github.com/chef/bento/pull/733) ([cheeseplus](https://github.com/cheeseplus)) +- Oracle Linux 7.3 [\#733](https://github.com/chef/bento/pull/733) ([cheeseplus](https://github.com/cheeseplus)) +- Oracle Linux 5.11 +- Ubuntu 16.10 [\#697](https://github.com/chef/bento/pull/697) ([rickard-von-essen](https://github.com/rickard-von-essen)) + +**Improvements** + +- RFC: Switch FreeBSD installation to bsdinstall [\#558](https://github.com/chef/bento/issues/558) +- Reduce size of Linux images [\#718](https://github.com/chef/bento/pull/718) ([tas50](https://github.com/tas50)) +- Avoid breaking of chef package resource on fedora [\#709](https://github.com/chef/bento/pull/709) ([artem-sidorenko](https://github.com/artem-sidorenko)) +- Use UTF-8 locale on Debian / Ubuntu boxes [\#702](https://github.com/chef/bento/pull/702) ([iamthad](https://github.com/iamthad)) +- Install libpam-systemd on systemd-enabled Debian versions. Fix [\#712](https://github.com/chef/bento/issues/712). [\#693](https://github.com/chef/bento/pull/693) ([jfilip](https://github.com/jfilip)) +- Provisionally keeping Perl. Redux of \#714 [\#731](https://github.com/chef/bento/pull/731) ([cheeseplus](https://github.com/cheeseplus)) +- Remove unused http files [\#700](https://github.com/chef/bento/pull/700) ([rickard-von-essen](https://github.com/rickard-von-essen)) +- Remove unused scripts [\#698](https://github.com/chef/bento/pull/698) ([rickard-von-essen](https://github.com/rickard-von-essen)) + +**Fixed bugs** + +- CentOS 5.11-x86\_64 building w/ vbox 5.1.x. Fix \#729. [\#730](https://github.com/chef/bento/pull/730) ([cheeseplus](https://github.com/cheeseplus)) +- Get Solaris 11 to build again [\#687](https://github.com/chef/bento/pull/687) ([tas50](https://github.com/tas50)) +- Get OmniOS boxes building again [\#683](https://github.com/chef/bento/pull/683) ([tas50](https://github.com/tas50)) +- Fix SLES builds [\#684](https://github.com/chef/bento/pull/684), [\#707](https://github.com/chef/bento/pull/707) ([tas50](https://github.com/tas50)) + +**Known Issues** + +- OpenSuSE 13.2 builds for all providers but will not start properly under VMware Fusion/Workstation +- OpenSuSE Leap 42.2 builds for all providers but will _only_ start properly under VMware Fusion/Workstation + ## [2.3.0](https://github.com/chef/bento/tree/2.3.0) (2016-09-30) [Full Changelog](https://github.com/chef/bento/compare/2.2.9...2.3.0) diff --git a/README.md b/README.md index 61dbc3203..eb6aa72bd 100644 --- a/README.md +++ b/README.md @@ -19,19 +19,26 @@ Boxes listed that are struck out (~~box~~) are broken/unreleased for the current ### 64 bit | | VirtualBox | VMware | Parallels | | ------------ | ------------- | ------------- | ------------- | -| centos-5.11 | ~~[x86_64][centos_511_64_vbox]~~ | ~~[x86_64][centos_511_64_vmware]~~ | ~~[x86_64][centos_511_64_prl]~~ | +| centos-5.11 | [x86_64][centos_511_64_vbox] | [x86_64][centos_511_64_vmware] | [x86_64][centos_511_64_prl] | | centos-6.8 | [x86_64][centos_68_64_vbox] | [x86_64][centos_68_64_vmware] | [x86_64][centos_68_64_prl] | | centos-7.2 | [x86_64][centos_72_64_vbox] | [x86_64][centos_72_64_vmware] | [x86_64][centos_72_64_prl] | | debian-7.11 | [amd64][debian_711_64_vbox] | [amd64][debian_711_64_vmware] | [amd64][debian_711_64_prl] | | debian-8.6 | [amd64][debian_86_64_vbox] | [amd64][debian_86_64_vmware] | [amd64][debian_86_64_prl] | | fedora-23 | [x86_64][fedora_23_64_vbox] | [x86_64][fedora_23_64_vmware] | [x86_64][fedora_23_64_prl] | | fedora-24 | [x86_64][fedora_24_64_vbox] | [x86_64][fedora_24_64_vmware] | [x86_64][fedora_24_64_prl] | +| fedora-25 | [x86_64][fedora_25_64_vbox] | [x86_64][fedora_25_64_vmware] | [x86_64][fedora_25_64_prl] | | freebsd-9.3 | [amd64][freebsd_93_64_vbox] | [amd64][freebsd_93_64_vmware] | [amd64][freebsd_93_64_prl] | | freebsd-10.3 | [amd64][freebsd_103_64_vbox] | [amd64][freebsd_103_64_vmware] | [amd64][freebsd_103_64_prl] | +| freebsd-11.0 | [amd64][freebsd_110_64_vbox] | [amd64][freebsd_110_64_vmware] | [amd64][freebsd_110_64_prl] | | opensuse-13.2 | [x86_64][osuse_132_64_vbox] | ~~[x86_64][osuse_132_64_vmware]~~ | [x86_64][osuse_132_64_prl] | +| opensuse-leap-42.2 | ~~[x86_64][leap_422_64_vbox]~~ | [x86_64][leap_422_64_vmware] | ~~[x86_64][leap_422_64_prl]~~ | +| oracle-5.11 | [x86_64][oracle_511_64_vbox] | [x86_64][oracle_511_64_vmware] | [x86_64][oracle_511_64_prl] | +| oracle-6.8 | [x86_64][oracle_68_64_vbox] | [x86_64][oracle_68_64_vmware] | [x86_64][oracle_68_64_prl] | +| oracle-7.3 | [x86_64][oracle_73_64_vbox] | [x86_64][oracle_73_64_vmware] | [x86_64][oracle_73_64_prl] | | ubuntu-12.04 | [amd64][ubuntu_1204_64_vbox] | [amd64][ubuntu_1204_64_vmware] | [amd64][ubuntu_1204_64_prl] | | ubuntu-14.04 | [amd64][ubuntu_1404_64_vbox] | [amd64][ubuntu_1404_64_vmware] | [amd64][ubuntu_1404_64_prl] | | ubuntu-16.04 | [amd64][ubuntu_1604_64_vbox] | [amd64][ubuntu_1604_64_vmware] | [amd64][ubuntu_1604_64_prl] | +| ubuntu-16.10 | [amd64][ubuntu_1610_64_vbox] | [amd64][ubuntu_1610_64_vmware] | [amd64][ubuntu_1610_64_prl] | ### 32 bit | | VirtualBox | VMware | Parallels | @@ -41,9 +48,12 @@ Boxes listed that are struck out (~~box~~) are broken/unreleased for the current | debian-7.11 | [i386][debian_711_32_vbox] | [i386][debian_711_32_vmware] | [i386][debian_711_32_prl] | | debian-8.6 | [i386][debian_86_32_vbox] | [i386][debian_86_32_vmware] | [i386][debian_86_32_prl] | | opensuse-13.2 | [i386][osuse_132_32_vbox] | ~~[i386][osuse_132_32_vmware]~~ | [i386][osuse_132_32_prl] | +| oracle-5.11 | [x86_64][oracle_511_32_vbox] | [x86_64][oracle_511_32_vmware] | [x86_64][oracle_511_32_prl] | +| oracle-6.8 | [x86_64][oracle_68_32_vbox] | [x86_64][oracle_68_32_vmware] | [x86_64][oracle_68_32_prl] | | ubuntu-12.04 | [i386][ubuntu_1204_32_vbox] | [i386][ubuntu_1204_32_vmware] | [i386][ubuntu_1204_32_prl] | | ubuntu-14.04 | [i386][ubuntu_1404_32_vbox] | [i386][ubuntu_1404_32_vmware] | [i386][ubuntu_1404_32_prl] | | ubuntu-16.04 | [i386][ubuntu_1604_32_vbox] | [i386][ubuntu_1604_32_vmware] | [i386][ubuntu_1604_32_prl] | +| ubuntu-16.10 | [i386][ubuntu_1610_32_vbox] | [i386][ubuntu_1610_32_vmware] | [i386][ubuntu_1610_32_prl] | *NOTE* This table tracks only the latest release for a given version. Boxes may exist in Atlas or S3 but are not @@ -218,67 +228,98 @@ See the License for the specific language governing permissions and limitations under the License. ``` -[centos_511_64_prl]: https://atlas.hashicorp.com/bento/boxes/centos-5.11/versions/2.3.0/providers/parallels.box -[centos_511_64_vbox]: https://atlas.hashicorp.com/bento/boxes/centos-5.11/versions/2.3.0/providers/virtualbox.box -[centos_511_64_vmware]: https://atlas.hashicorp.com/bento/boxes/centos-5.11/versions/2.3.0/providers/vmware_desktop.box [centos_511_32_prl]: https://atlas.hashicorp.com/bento/boxes/centos-5.11-i386/versions/2.3.0/providers/parallels.box [centos_511_32_vbox]: https://atlas.hashicorp.com/bento/boxes/centos-5.11-i386/versions/2.3.0/providers/virtualbox.box [centos_511_32_vmware]: https://atlas.hashicorp.com/bento/boxes/centos-5.11-i386/versions/2.3.0/providers/vmware_desktop.box -[centos_68_64_prl]: https://atlas.hashicorp.com/bento/boxes/centos-6.8/versions/2.3.0/providers/parallels.box -[centos_68_64_vbox]: https://atlas.hashicorp.com/bento/boxes/centos-6.8/versions/2.3.0/providers/virtualbox.box -[centos_68_64_vmware]: https://atlas.hashicorp.com/bento/boxes/centos-6.8/versions/2.3.0/providers/vmware_desktop.box +[centos_511_64_prl]: https://atlas.hashicorp.com/bento/boxes/centos-5.11/versions/2.3.0/providers/parallels.box +[centos_511_64_vbox]: https://atlas.hashicorp.com/bento/boxes/centos-5.11/versions/2.3.0/providers/virtualbox.box +[centos_511_64_vmware]: https://atlas.hashicorp.com/bento/boxes/centos-5.11/versions/2.3.0/providers/vmware_desktop.box [centos_68_32_prl]: https://atlas.hashicorp.com/bento/boxes/centos-6.8-i386/versions/2.3.0/providers/parallels.box [centos_68_32_vbox]: https://atlas.hashicorp.com/bento/boxes/centos-6.8-i386/versions/2.3.0/providers/virtualbox.box [centos_68_32_vmware]: https://atlas.hashicorp.com/bento/boxes/centos-6.8-i386/versions/2.3.0/providers/vmware_desktop.box +[centos_68_64_prl]: https://atlas.hashicorp.com/bento/boxes/centos-6.8/versions/2.3.0/providers/parallels.box +[centos_68_64_vbox]: https://atlas.hashicorp.com/bento/boxes/centos-6.8/versions/2.3.0/providers/virtualbox.box +[centos_68_64_vmware]: https://atlas.hashicorp.com/bento/boxes/centos-6.8/versions/2.3.0/providers/vmware_desktop.box [centos_72_64_prl]: https://atlas.hashicorp.com/bento/boxes/centos-7.2/versions/2.3.0/providers/parallels.box [centos_72_64_vbox]: https://atlas.hashicorp.com/bento/boxes/centos-7.2/versions/2.3.0/providers/virtualbox.box [centos_72_64_vmware]: https://atlas.hashicorp.com/bento/boxes/centos-7.2/versions/2.3.0/providers/vmware_desktop.box -[debian_711_64_prl]: https://atlas.hashicorp.com/bento/boxes/debian-7.11/versions/2.3.0/providers/parallels.box -[debian_711_64_vbox]: https://atlas.hashicorp.com/bento/boxes/debian-7.11/versions/2.3.0/providers/virtualbox.box -[debian_711_64_vmware]: https://atlas.hashicorp.com/bento/boxes/debian-7.11/versions/2.3.0/providers/vmware_desktop.box [debian_711_32_prl]: https://atlas.hashicorp.com/bento/boxes/debian-7.11-i386/versions/2.3.0/providers/parallels.box [debian_711_32_vbox]: https://atlas.hashicorp.com/bento/boxes/debian-7.11-i386/versions/2.3.0/providers/virtualbox.box [debian_711_32_vmware]: https://atlas.hashicorp.com/bento/boxes/debian-7.11-i386/versions/2.3.0/providers/vmware_desktop.box -[debian_86_64_prl]: https://atlas.hashicorp.com/bento/boxes/debian-8.6/versions/2.3.0/providers/parallels.box -[debian_86_64_vbox]: https://atlas.hashicorp.com/bento/boxes/debian-8.6/versions/2.3.0/providers/virtualbox.box -[debian_86_64_vmware]: https://atlas.hashicorp.com/bento/boxes/debian-8.6/versions/2.3.0/providers/vmware_desktop.box +[debian_711_64_prl]: https://atlas.hashicorp.com/bento/boxes/debian-7.11/versions/2.3.0/providers/parallels.box +[debian_711_64_vbox]: https://atlas.hashicorp.com/bento/boxes/debian-7.11/versions/2.3.0/providers/virtualbox.box +[debian_711_64_vmware]: https://atlas.hashicorp.com/bento/boxes/debian-7.11/versions/2.3.0/providers/vmware_desktop.box [debian_86_32_prl]: https://atlas.hashicorp.com/bento/boxes/debian-8.6-i386/versions/2.3.0/providers/parallels.box [debian_86_32_vbox]: https://atlas.hashicorp.com/bento/boxes/debian-8.6-i386/versions/2.3.0/providers/virtualbox.box [debian_86_32_vmware]: https://atlas.hashicorp.com/bento/boxes/debian-8.6-i386/versions/2.3.0/providers/vmware_desktop.box +[debian_86_64_prl]: https://atlas.hashicorp.com/bento/boxes/debian-8.6/versions/2.3.0/providers/parallels.box +[debian_86_64_vbox]: https://atlas.hashicorp.com/bento/boxes/debian-8.6/versions/2.3.0/providers/virtualbox.box +[debian_86_64_vmware]: https://atlas.hashicorp.com/bento/boxes/debian-8.6/versions/2.3.0/providers/vmware_desktop.box [fedora_23_64_prl]: https://atlas.hashicorp.com/bento/boxes/fedora-23/versions/2.3.0/providers/parallels.box [fedora_23_64_vbox]: https://atlas.hashicorp.com/bento/boxes/fedora-23/versions/2.3.0/providers/virtualbox.box [fedora_23_64_vmware]: https://atlas.hashicorp.com/bento/boxes/fedora-23/versions/2.3.0/providers/vmware_desktop.box [fedora_24_64_prl]: https://atlas.hashicorp.com/bento/boxes/fedora-24/versions/2.3.0/providers/parallels.box [fedora_24_64_vbox]: https://atlas.hashicorp.com/bento/boxes/fedora-24/versions/2.3.0/providers/virtualbox.box [fedora_24_64_vmware]: https://atlas.hashicorp.com/bento/boxes/fedora-24/versions/2.3.0/providers/vmware_desktop.box -[freebsd_103_64_prl]: https://atlas.hashicorp.com/bento/boxes/freebsd-10.3/versions/2.3.0/providers/parallels.box -[freebsd_103_64_vbox]: https://atlas.hashicorp.com/bento/boxes/freebsd-10.3/versions/2.3.0/providers/virtualbox.box -[freebsd_103_64_vmware]: https://atlas.hashicorp.com/bento/boxes/freebsd-10.3/versions/2.3.0/providers/vmware_desktop.box +[fedora_25_64_prl]: https://atlas.hashicorp.com/bento/boxes/fedora-25/versions/2.3.0/providers/parallels.box +[fedora_25_64_vbox]: https://atlas.hashicorp.com/bento/boxes/fedora-25/versions/2.3.0/providers/virtualbox.box +[fedora_25_64_vmware]: https://atlas.hashicorp.com/bento/boxes/fedora-25/versions/2.3.0/providers/vmware_desktop.box [freebsd_93_64_prl]: https://atlas.hashicorp.com/bento/boxes/freebsd-9.3/versions/2.3.0/providers/parallels.box [freebsd_93_64_vbox]: https://atlas.hashicorp.com/bento/boxes/freebsd-9.3/versions/2.3.0/providers/virtualbox.box [freebsd_93_64_vmware]: https://atlas.hashicorp.com/bento/boxes/freebsd-9.3/versions/2.3.0/providers/vmware_desktop.box +[freebsd_103_64_prl]: https://atlas.hashicorp.com/bento/boxes/freebsd-10.3/versions/2.3.0/providers/parallels.box +[freebsd_103_64_vbox]: https://atlas.hashicorp.com/bento/boxes/freebsd-10.3/versions/2.3.0/providers/virtualbox.box +[freebsd_103_64_vmware]: https://atlas.hashicorp.com/bento/boxes/freebsd-10.3/versions/2.3.0/providers/vmware_desktop.box +[freebsd_110_64_prl]: https://atlas.hashicorp.com/bento/boxes/freebsd-11.0/versions/2.3.0/providers/parallels.box +[freebsd_110_64_vbox]: https://atlas.hashicorp.com/bento/boxes/freebsd-11.0/versions/2.3.0/providers/virtualbox.box +[freebsd_110_64_vmware]: https://atlas.hashicorp.com/bento/boxes/freebsd-11.0/versions/2.3.0/providers/vmware_desktop.box [omnios_r151018_64_vbox]: https://atlas.hashicorp.com/bento/boxes/omnios-r151018/versions/2.3.0/providers/virtualbox.box -[osuse_132_64_prl]: https://atlas.hashicorp.com/bento/boxes/opensuse-13.2/versions/2.3.0/providers/parallels.box -[osuse_132_64_vbox]: https://atlas.hashicorp.com/bento/boxes/opensuse-13.2/versions/2.3.0/providers/virtualbox.box -[osuse_132_64_vmware]: https://atlas.hashicorp.com/bento/boxes/opensuse-13.2/versions/2.3.0/providers/vmware_desktop.box +[oracle_511_32_prl]: https://atlas.hashicorp.com/bento/boxes/oracle-5.11-i386/versions/2.3.0/providers/parallels.box +[oracle_511_32_vbox]: https://atlas.hashicorp.com/bento/boxes/oracle-5.11-i386/versions/2.3.0/providers/virtualbox.box +[oracle_511_32_vmware]: https://atlas.hashicorp.com/bento/boxes/oracle-5.11-i386/versions/2.3.0/providers/vmware_desktop.box +[oracle_511_64_prl]: https://atlas.hashicorp.com/bento/boxes/oracle-5.11/versions/2.3.0/providers/parallels.box +[oracle_511_64_vbox]: https://atlas.hashicorp.com/bento/boxes/oracle-5.11/versions/2.3.0/providers/virtualbox.box +[oracle_511_64_vmware]: https://atlas.hashicorp.com/bento/boxes/oracle-5.11/versions/2.3.0/providers/vmware_desktop.box +[oracle_68_32_prl]: https://atlas.hashicorp.com/bento/boxes/oracle-6.8-i386/versions/2.3.0/providers/parallels.box +[oracle_68_32_vbox]: https://atlas.hashicorp.com/bento/boxes/oracle-6.8-i386/versions/2.3.0/providers/virtualbox.box +[oracle_68_32_vmware]: https://atlas.hashicorp.com/bento/boxes/oracle-6.8-i386/versions/2.3.0/providers/vmware_desktop.box +[oracle_68_64_prl]: https://atlas.hashicorp.com/bento/boxes/oracle-6.8/versions/2.3.0/providers/parallels.box +[oracle_68_64_vbox]: https://atlas.hashicorp.com/bento/boxes/oracle-6.8/versions/2.3.0/providers/virtualbox.box +[oracle_68_64_vmware]: https://atlas.hashicorp.com/bento/boxes/oracle-6.8/versions/2.3.0/providers/vmware_desktop.box +[oracle_73_64_prl]: https://atlas.hashicorp.com/bento/boxes/oracle-7.3/versions/2.3.0/providers/parallels.box +[oracle_73_64_vbox]: https://atlas.hashicorp.com/bento/boxes/oracle-7.3/versions/2.3.0/providers/virtualbox.box +[oracle_73_64_vmware]: https://atlas.hashicorp.com/bento/boxes/oracle-7.3/versions/2.3.0/providers/vmware_desktop.box [osuse_132_32_prl]: https://atlas.hashicorp.com/bento/boxes/opensuse-13.2-i386/versions/2.3.0/providers/parallels.box [osuse_132_32_vbox]: https://atlas.hashicorp.com/bento/boxes/opensuse-13.2-i386/versions/2.3.0/providers/virtualbox.box [osuse_132_32_vmware]: https://atlas.hashicorp.com/bento/boxes/opensuse-13.2-i386/versions/2.3.0/providers/vmware.box -[ubuntu_1204_64_prl]: https://atlas.hashicorp.com/bento/boxes/ubuntu-12.04/versions/2.3.0/providers/parallels.box -[ubuntu_1204_64_vbox]: https://atlas.hashicorp.com/bento/boxes/ubuntu-12.04/versions/2.3.0/providers/virtualbox.box -[ubuntu_1204_64_vmware]: https://atlas.hashicorp.com/bento/boxes/ubuntu-12.04/versions/2.3.0/providers/vmware_desktop.box +[osuse_132_64_prl]: https://atlas.hashicorp.com/bento/boxes/opensuse-13.2/versions/2.3.0/providers/parallels.box +[osuse_132_64_vbox]: https://atlas.hashicorp.com/bento/boxes/opensuse-13.2/versions/2.3.0/providers/virtualbox.box +[osuse_132_64_vmware]: https://atlas.hashicorp.com/bento/boxes/opensuse-13.2/versions/2.3.0/providers/vmware_desktop.box +[leap_422_64_prl]: https://atlas.hashicorp.com/bento/boxes/opensuse-leap-42.2/versions/2.3.0/providers/parallels.box +[leap_422_64_vbox]: https://atlas.hashicorp.com/bento/boxes/opensuse-leap-42.2/versions/2.3.0/providers/virtualbox.box +[leap_422_64_vmware]: https://atlas.hashicorp.com/bento/boxes/opensuse-leap-42.2/versions/2.3.0/providers/vmware_desktop.box [ubuntu_1204_32_prl]: https://atlas.hashicorp.com/bento/boxes/ubuntu-12.04-i386/versions/2.3.0/providers/parallels.box [ubuntu_1204_32_vbox]: https://atlas.hashicorp.com/bento/boxes/ubuntu-12.04-i386/versions/2.3.0/providers/virtualbox.box [ubuntu_1204_32_vmware]: https://atlas.hashicorp.com/bento/boxes/ubuntu-12.04-i386/versions/2.3.0/providers/vmware_desktop.box -[ubuntu_1404_64_prl]: https://atlas.hashicorp.com/bento/boxes/ubuntu-14.04/versions/2.3.0/providers/parallels.box -[ubuntu_1404_64_vbox]: https://atlas.hashicorp.com/bento/boxes/ubuntu-14.04/versions/2.3.0/providers/virtualbox.box -[ubuntu_1404_64_vmware]: https://atlas.hashicorp.com/bento/boxes/ubuntu-14.04/versions/2.3.0/providers/vmware_desktop.box +[ubuntu_1204_64_prl]: https://atlas.hashicorp.com/bento/boxes/ubuntu-12.04/versions/2.3.0/providers/parallels.box +[ubuntu_1204_64_vbox]: https://atlas.hashicorp.com/bento/boxes/ubuntu-12.04/versions/2.3.0/providers/virtualbox.box +[ubuntu_1204_64_vmware]: https://atlas.hashicorp.com/bento/boxes/ubuntu-12.04/versions/2.3.0/providers/vmware_desktop.box [ubuntu_1404_32_prl]: https://atlas.hashicorp.com/bento/boxes/ubuntu-14.04-i386/versions/2.3.0/providers/parallels.box [ubuntu_1404_32_vbox]: https://atlas.hashicorp.com/bento/boxes/ubuntu-14.04-i386/versions/2.3.0/providers/virtualbox.box [ubuntu_1404_32_vmware]: https://atlas.hashicorp.com/bento/boxes/ubuntu-14.04-i386/versions/2.3.0/providers/vmware_desktop.box +[ubuntu_1404_64_prl]: https://atlas.hashicorp.com/bento/boxes/ubuntu-14.04/versions/2.3.0/providers/parallels.box +[ubuntu_1404_64_vbox]: https://atlas.hashicorp.com/bento/boxes/ubuntu-14.04/versions/2.3.0/providers/virtualbox.box +[ubuntu_1404_64_vmware]: https://atlas.hashicorp.com/bento/boxes/ubuntu-14.04/versions/2.3.0/providers/vmware_desktop.box +[ubuntu_1604_32_prl]: https://atlas.hashicorp.com/bento/boxes/ubuntu-16.04-i386/versions/2.3.0/providers/parallels.box +[ubuntu_1604_32_vbox]: https://atlas.hashicorp.com/bento/boxes/ubuntu-16.04-i386/versions/2.3.0/providers/virtualbox.box +[ubuntu_1604_32_vmware]: https://atlas.hashicorp.com/bento/boxes/ubuntu-16.04-i386/versions/2.3.0/providers/vmware_desktop.box [ubuntu_1604_64_prl]: https://atlas.hashicorp.com/bento/boxes/ubuntu-16.04/versions/2.3.0/providers/parallels.box [ubuntu_1604_64_vbox]: https://atlas.hashicorp.com/bento/boxes/ubuntu-16.04/versions/2.3.0/providers/virtualbox.box [ubuntu_1604_64_vmware]: https://atlas.hashicorp.com/bento/boxes/ubuntu-16.04/versions/2.3.0/providers/vmware_desktop.box -[ubuntu_1604_32_prl]: https://atlas.hashicorp.com/bento/boxes/ubuntu-16.04-i386/versions/2.3.0/providers/parallels.box -[ubuntu_1604_32_vbox]: https://atlas.hashicorp.com/bento/boxes/ubuntu-16.04-i386/versions/2.3.0/providers/virtualbox.box -[ubuntu_1604_32_vmware]: https://atlas.hashicorp.com/bento/boxes/ubuntu-16.04-i386/versions/2.3.0/providers/vmware_desktop.box \ No newline at end of file +[ubuntu_1610_32_prl]: https://atlas.hashicorp.com/bento/boxes/ubuntu-16.10-i386/versions/2.3.0/providers/parallels.box +[ubuntu_1610_32_vbox]: https://atlas.hashicorp.com/bento/boxes/ubuntu-16.10-i386/versions/2.3.0/providers/virtualbox.box +[ubuntu_1610_32_vmware]: https://atlas.hashicorp.com/bento/boxes/ubuntu-16.10-i386/versions/2.3.0/providers/vmware_desktop.box +[ubuntu_1610_64_prl]: https://atlas.hashicorp.com/bento/boxes/ubuntu-16.10/versions/2.3.0/providers/parallels.box +[ubuntu_1610_64_vbox]: https://atlas.hashicorp.com/bento/boxes/ubuntu-16.10/versions/2.3.0/providers/virtualbox.box +[ubuntu_1610_64_vmware]: https://atlas.hashicorp.com/bento/boxes/ubuntu-16.10/versions/2.3.0/providers/vmware_desktop.box + From e4fc4250a48cae20f4be6389159df7fea90295e8 Mon Sep 17 00:00:00 2001 From: Mattias Giese <giese@b1-systems.de> Date: Fri, 2 Dec 2016 18:59:24 +0100 Subject: [PATCH 0580/1622] Initial support for SLES 12 SP2 Signed-off-by: Mattias Giese <giese@b1-systems.de> --- http/sles-12/sles-12-sp2-x86_64-autoinst.xml | 280 +++++++++++++++++++ sles-12-sp2-x86_64.json | 201 +++++++++++++ 2 files changed, 481 insertions(+) create mode 100644 http/sles-12/sles-12-sp2-x86_64-autoinst.xml create mode 100644 sles-12-sp2-x86_64.json diff --git a/http/sles-12/sles-12-sp2-x86_64-autoinst.xml b/http/sles-12/sles-12-sp2-x86_64-autoinst.xml new file mode 100644 index 000000000..e3df36036 --- /dev/null +++ b/http/sles-12/sles-12-sp2-x86_64-autoinst.xml @@ -0,0 +1,280 @@ +<?xml version="1.0"?> +<!DOCTYPE profile> +<profile xmlns="http://www.suse.com/1.0/yast2ns" xmlns:config="http://www.suse.com/1.0/configns"> + <add-on> + <add_on_products config:type="list"/> + </add-on> + <bootloader> + <global> + <activate>true</activate> + <append>splash=silent quiet showopts</append> + <append_failsafe>showopts apm=off noresume edd=off powersaved=off nohz=off highres=off processor.max_cstate=1 nomodeset x11failsafe</append_failsafe> + <boot_boot>false</boot_boot> + <boot_extended>false</boot_extended> + <boot_mbr>false</boot_mbr> + <boot_root>true</boot_root> + <default>0</default> + <distributor>SLES12</distributor> + <generic_mbr>true</generic_mbr> + <gfxmode>auto</gfxmode> + <os_prober>false</os_prober> + <timeout config:type="integer">8</timeout> + </global> + <initrd_modules config:type="list"> + <initrd_module> + <module>ahci</module> + </initrd_module> + <initrd_module> + <module>ata_piix</module> + </initrd_module> + <initrd_module> + <module>ata_generic</module> + </initrd_module> + <initrd_module> + <module>jbd</module> + </initrd_module> + <initrd_module> + <module>mbcache</module> + </initrd_module> + </initrd_modules> + <loader_type>grub2</loader_type> + <sections config:type="list"/> + </bootloader> + <deploy_image> + <image_installation config:type="boolean">false</image_installation> + </deploy_image> + <firewall> + <enable_firewall config:type="boolean">false</enable_firewall> + <start_firewall config:type="boolean">false</start_firewall> + </firewall> + <general> + <ask-list config:type="list"/> + <mode> + <confirm config:type="boolean">false</confirm> + </mode> + <mouse> + <id>none</id> + </mouse> + <proposals config:type="list"/> + <signature-handling> + <accept_file_without_checksum config:type="boolean">true</accept_file_without_checksum> + <accept_non_trusted_gpg_key config:type="boolean">true</accept_non_trusted_gpg_key> + <accept_unknown_gpg_key config:type="boolean">true</accept_unknown_gpg_key> + <accept_unsigned_file config:type="boolean">true</accept_unsigned_file> + <accept_verification_failed config:type="boolean">false</accept_verification_failed> + <import_gpg_key config:type="boolean">true</import_gpg_key> + </signature-handling> + <storage/> + </general> + <login_settings/> + <networking> + <dhcp_options> + <dhclient_client_id/> + <dhclient_hostname_option>AUTO</dhclient_hostname_option> + </dhcp_options> + <dns> + <dhcp_hostname config:type="boolean">false</dhcp_hostname> + <domain>vagrantup.com</domain> + <hostname>vagrant-sles-12-x64</hostname> + <resolv_conf_policy>auto</resolv_conf_policy> + <searchlist config:type="list"> + <search>vagrantup.com</search> + </searchlist> + <write_hostname config:type="boolean">true</write_hostname> + </dns> + <interfaces config:type="list"> + <interface> + <bootproto>dhcp</bootproto> + <device>eth0</device> + <dhclient_set_default_route>yes</dhclient_set_default_route> + <startmode>auto</startmode> + <usercontrol>no</usercontrol> + </interface> + </interfaces> + <keep_install_network config:type="boolean">true</keep_install_network> + <managed config:type="boolean">false</managed> + <routing> + <ipv4_forward config:type="boolean">false</ipv4_forward> + <ipv6_forward config:type="boolean">false</ipv6_forward> + </routing> + </networking> + <partitioning config:type="list"> + <drive> + <!-- + definition of device not needed (starting with SLES 11 SP2 + YaST will pickup the first harddisk. + This is useful if someone wants to deploy using VirtualBox and/or KVM/virtio + --> + <!-- <device>/dev/sda</device> --> + <!-- This section may be removed entirely if we want to simply reuse YaST defaults --> + <initialize config:type="boolean">true</initialize> + <partitions config:type="list"> + <partition> + <create config:type="boolean">true</create> + <crypt_fs config:type="boolean">false</crypt_fs> + <filesystem config:type="symbol">swap</filesystem> + <format config:type="boolean">true</format> + <fstopt>defaults</fstopt> + <loop_fs config:type="boolean">false</loop_fs> + <mount>swap</mount> + <mountby config:type="symbol">device</mountby> + <partition_id config:type="integer">130</partition_id> + <partition_nr config:type="integer">1</partition_nr> + <raid_options/> + <resize config:type="boolean">false</resize> + <size>1561492992</size> + </partition> + <partition> + <create config:type="boolean">true</create> + <crypt_fs config:type="boolean">false</crypt_fs> + <filesystem config:type="symbol">btrfs</filesystem> + <format config:type="boolean">true</format> + <loop_fs config:type="boolean">false</loop_fs> + <mount>/</mount> + <mountby config:type="symbol">device</mountby> + <partition_id config:type="integer">131</partition_id> + <partition_nr config:type="integer">2</partition_nr> + <raid_options/> + <resize config:type="boolean">false</resize> + <size>19895844352</size> + <subvolumes config:type="list"> + <listentry>boot/grub2/i386-pc</listentry> + <listentry>boot/grub2/x86_64-efi</listentry> + <listentry>home</listentry> + <listentry>opt</listentry> + <listentry>srv</listentry> + <listentry>tmp</listentry> + <listentry>usr/local</listentry> + <listentry>var/crash</listentry> + <listentry>var/lib/mailman</listentry> + <listentry>var/lib/named</listentry> + <listentry>var/lib/pgsql</listentry> + <listentry>var/log</listentry> + <listentry>var/opt</listentry> + <listentry>var/spool</listentry> + <listentry>var/tmp</listentry> + </subvolumes> + </partition> + </partitions> + <pesize/> + <type config:type="symbol">CT_DISK</type> + <use>all</use> + </drive> + </partitioning> + <report> + <errors> + <log config:type="boolean">true</log> + <show config:type="boolean">true</show> + <timeout config:type="integer">0</timeout> + </errors> + <messages> + <log config:type="boolean">true</log> + <show config:type="boolean">true</show> + <timeout config:type="integer">0</timeout> + </messages> + <warnings> + <log config:type="boolean">true</log> + <show config:type="boolean">true</show> + <timeout config:type="integer">0</timeout> + </warnings> + <yesno_messages> + <log config:type="boolean">true</log> + <show config:type="boolean">true</show> + <timeout config:type="integer">0</timeout> + </yesno_messages> + </report> + <services-manager> + <default_target>graphical</default_target> + <services> + <disable config:type="list"/> + <enable config:type="list"> + <service>sshd</service> + </enable> + </services> + </services-manager> + <software> + <packages config:type="list"> + <package>glibc</package> + <package>openssh</package> + <package>snapper</package> + <package>SuSEfirewall2</package> + <package>kexec-tools</package> + <package>perl-Bootloader-YAML</package> + <package>kernel-default-devel</package> + <package>sudo</package> + <package>gcc</package> + <package>wget</package> + <package>perl</package> + <package>make</package> + </packages> + <patterns config:type="list"> + <pattern>Minimal</pattern> + <pattern>apparmor</pattern> + </patterns> + <remove-packages config:type="list"> + <package>adaptec-firmware</package> + <package>atmel-firmware</package> + <package>bash-completion</package> + <package>bash-doc</package> + <package>cifs-utils</package> + <package>cups-libs</package> + <package>ipw-firmware</package> + <package>mpt-firmware</package> + <package>postfix</package> + <package>samba-libs</package> + <package>ucode-intel</package> + </remove-packages> + </software> + <timezone> + <hwclock>UTC</hwclock> + <timezone>UTC</timezone> + </timezone> + <user_defaults> + <expire/> + <group>100</group> + <groups>video,dialout</groups> + <home>/home</home> + <inactive>-1</inactive> + <shell>/bin/bash</shell> + <skel>/etc/skel</skel> + <umask>022</umask> + </user_defaults> + <users config:type="list"> + <user> + <encrypted config:type="boolean">true</encrypted> + <fullname>vagrant</fullname> + <gid>100</gid> + <home>/home/vagrant</home> + <password_settings> + <expire/> + <flag/> + <inact/> + <max>99999</max> + <min>0</min> + <warn>7</warn> + </password_settings> + <shell>/bin/bash</shell> + <uid>1000</uid> + <user_password>$2y$05$NA1Li9ZKJOLRW5mMTXm6/e5r8dltWS5RpDZpvHrI82aLE00V51tdi</user_password> + <username>vagrant</username> + </user> + <user> + <encrypted config:type="boolean">true</encrypted> + <fullname>root</fullname> + <gid>0</gid> + <home>/root</home> + <password_settings> + <expire/> + <flag/> + <inact/> + <max/> + <min/> + <warn/> + </password_settings> + <shell>/bin/bash</shell> + <uid>0</uid> + <user_password>$6$UgKtUD0AUMIA$VWLyc2Uvl0Lk6xxfTuoRb0/jrhZ9IJG/Gtx/DkZUEWZm.JYO1Q1fvPo6gDxQAHp38kQ1DG1vNGRgu2T/z/vih.</user_password> + <username>root</username> + </user> + </users> +</profile> diff --git a/sles-12-sp2-x86_64.json b/sles-12-sp2-x86_64.json new file mode 100644 index 000000000..57dea6c50 --- /dev/null +++ b/sles-12-sp2-x86_64.json @@ -0,0 +1,201 @@ +{ + "builders": [ + { + "boot_command": [ + "<esc><enter><wait>", + "linux netdevice=eth0 netsetup=dhcp install=cd:/<wait>", + " lang=en_US autoyast=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `autoinst_cfg`}}<wait>", + " textmode=1<wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": "{{user `disk_size`}}", + "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "guest_os_type": "OpenSUSE_64", + "hard_drive_interface": "sata", + "headless": "{{ user `headless` }}", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-virtualbox", + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "virtualbox-iso", + "vboxmanage": [ + [ + "modifyvm", + "{{.Name}}", + "--memory", + "{{ user `memory` }}" + ], + [ + "modifyvm", + "{{.Name}}", + "--cpus", + "{{ user `cpus` }}" + ] + ], + "virtualbox_version_file": ".vbox_version", + "vm_name": "{{ user `template` }}" + }, + { + "boot_command": [ + "<esc><enter><wait>", + "linux netdevice=eth0 netsetup=dhcp install=cd:/<wait>", + " lang=en_US-8 autoyast=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `autoinst_cfg`}}<wait>", + " textmode=1<wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": "{{user `disk_size`}}", + "guest_os_type": "sles11-64", + "headless": "{{ user `headless` }}", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-vmware", + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "tools_upload_flavor": "linux", + "type": "vmware-iso", + "vm_name": "{{ user `template` }}", + "vmx_data": { + "cpuid.coresPerSocket": "1", + "memsize": "{{ user `memory` }}", + "numvcpus": "{{ user `cpus` }}" + } + }, + { + "boot_command": [ + "<esc><enter><wait>", + "linux netdevice=eth0 netsetup=dhcp install=cd:/<wait>", + " lang=en_US autoyast=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `autoinst_cfg`}}<wait>", + " textmode=1<wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": "{{user `disk_size`}}", + "guest_os_type": "suse", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-parallels", + "parallels_tools_flavor": "lin", + "prlctl": [ + [ + "set", + "{{.Name}}", + "--memsize", + "{{ user `memory` }}" + ], + [ + "set", + "{{.Name}}", + "--cpus", + "{{ user `cpus` }}" + ] + ], + "prlctl_version_file": ".prlctl_version", + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "parallels-iso", + "vm_name": "{{ user `template` }}" + }, + { + "boot_command": [ + "<esc><enter><wait>", + "linux netdevice=eth0 netsetup=dhcp install=cd:/<wait>", + " lang=en_US autoyast=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `autoinst_cfg`}}<wait>", + " textmode=1<wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": "{{user `disk_size`}}", + "headless": "{{ user `headless` }}", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-qemu", + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "qemu", + "vm_name": "{{ user `template` }}" + } + ], + "post-processors": [ + { + "output": "builds/{{user `box_basename`}}.{{.Provider}}.box", + "type": "vagrant" + } + ], + "provisioners": [ + { + "destination": "/tmp/bento-metadata.json", + "source": "{{user `metadata`}}", + "type": "file" + }, + { + "environment_vars": [ + "HOME_DIR=/home/vagrant", + "http_proxy={{user `http_proxy`}}", + "https_proxy={{user `https_proxy`}}", + "no_proxy={{user `no_proxy`}}" + ], + "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh '{{.Path}}'", + "scripts": [ + "scripts/common/metadata.sh", + "scripts/common/sshd.sh", + "scripts/common/vagrant.sh", + "scripts/sles/unsupported-modules.sh", + "scripts/common/virtualbox.sh", + "scripts/common/vmware.sh", + "scripts/common/parallels.sh", + "scripts/sles/sudoers.sh", + "scripts/sles/zypper-locks.sh", + "scripts/sles/remove-dvd-source.sh", + "scripts/sles/cleanup.sh", + "scripts/common/minimize.sh" + ], + "type": "shell" + } + ], + "variables": { + "_DOWNLOAD_SITE": "https://www.suse.com/products/server/download", + "_README": "You must download the automated installer iso from the following page, and then place it in the packer_cache dir", + "arch": "64", + "autoinst_cfg": "sles-12/sles-12-sp2-x86_64-autoinst.xml", + "box_basename": "sles-12-sp2", + "build_timestamp": "{{isotime \"20060102150405\"}}", + "cpus": "1", + "disk_size": "20480", + "git_revision": "__unknown_git_revision__", + "headless": "", + "http_proxy": "{{env `http_proxy`}}", + "https_proxy": "{{env `https_proxy`}}", + "iso_checksum": "dd724e9248f2c3507e8e9d0050a4c8b6e9aeda7fdf0870858757cc6c01b7d47d", + "iso_checksum_type": "sha256", + "iso_name": "SLE-12-SP2-Server-DVD-x86_64-GM-DVD1.iso", + "memory": "1024", + "metadata": "floppy/dummy_metadata.json", + "mirror": "./packer_cache", + "name": "sles-12-sp2", + "template": "sles-12-sp2-x86_64", + "version": "2.2.TIMESTAMP" + } +} From 428d3d975dd2364ad2de245c037f0a3470bb2db0 Mon Sep 17 00:00:00 2001 From: Rickard von Essen <rickard.von.essen@gmail.com> Date: Tue, 13 Dec 2016 09:18:17 +0100 Subject: [PATCH 0581/1622] Updated to CentOS 7.3 Signed-off-by: Rickard von Essen <rickard.von.essen@gmail.com> --- centos-7.2-x86_64.json => centos-7.3-x86_64.json | 14 +++++++------- http/{centos-7.2 => centos-7.3}/ks.cfg | 0 2 files changed, 7 insertions(+), 7 deletions(-) rename centos-7.2-x86_64.json => centos-7.3-x86_64.json (94%) rename http/{centos-7.2 => centos-7.3}/ks.cfg (100%) diff --git a/centos-7.2-x86_64.json b/centos-7.3-x86_64.json similarity index 94% rename from centos-7.2-x86_64.json rename to centos-7.3-x86_64.json index ed62d3d72..d2725be9f 100644 --- a/centos-7.2-x86_64.json +++ b/centos-7.3-x86_64.json @@ -157,7 +157,7 @@ } ], "variables": { - "box_basename": "centos-7.2", + "box_basename": "centos-7.3", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", "disk_size": "40960", @@ -165,17 +165,17 @@ "headless": "", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", - "iso_checksum": "907e5755f824c5848b9c8efbb484f3cd945e93faa024bad6ba875226f9683b16", + "iso_checksum": "c455ee948e872ad2194bdddd39045b83634e8613249182b88f549bb2319d97eb", "iso_checksum_type": "sha256", - "iso_name": "CentOS-7-x86_64-DVD-1511.iso", - "ks_path": "centos-7.2/ks.cfg", + "iso_name": "CentOS-7-x86_64-DVD-1611.iso", + "ks_path": "centos-7.3/ks.cfg", "memory": "512", "metadata": "floppy/dummy_metadata.json", "mirror": "http://mirrors.kernel.org/centos", - "mirror_directory": "7.2.1511/isos/x86_64", - "name": "centos-7.2", + "mirror_directory": "7.3.1611/isos/x86_64", + "name": "centos-7.3", "no_proxy": "{{env `no_proxy`}}", - "template": "centos-7.2-x86_64", + "template": "centos-7.3-x86_64", "version": "2.1.TIMESTAMP" } } diff --git a/http/centos-7.2/ks.cfg b/http/centos-7.3/ks.cfg similarity index 100% rename from http/centos-7.2/ks.cfg rename to http/centos-7.3/ks.cfg From 048e28bc1eb96f3d85efe97aec178a95d7553f72 Mon Sep 17 00:00:00 2001 From: Rickard von Essen <rickard.von.essen@gmail.com> Date: Tue, 13 Dec 2016 09:13:00 +0100 Subject: [PATCH 0582/1622] Updated to RHEL 7.3 Signed-off-by: Rickard von Essen <rickard.von.essen@gmail.com> --- rhel-7.2-x86_64.json => rhel-7.3-x86_64.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) rename rhel-7.2-x86_64.json => rhel-7.3-x86_64.json (95%) diff --git a/rhel-7.2-x86_64.json b/rhel-7.3-x86_64.json similarity index 95% rename from rhel-7.2-x86_64.json rename to rhel-7.3-x86_64.json index f933d6d2f..a09ceaee4 100644 --- a/rhel-7.2-x86_64.json +++ b/rhel-7.3-x86_64.json @@ -158,7 +158,7 @@ ], "variables": { "arch": "64", - "box_basename": "rhel-7.2", + "box_basename": "rhel-7.3", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", "disk_size": "40960", @@ -166,17 +166,17 @@ "headless": "", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", - "iso_checksum": "03f3a0291634335f6995534d829bd21ffaa0d000004dfeb1b2fb81052d64a4d5", + "iso_checksum": "120acbca7b3d55465eb9f8ef53ad7365f2997d42d4f83d7cc285bf5c71e1131f", "iso_checksum_type": "sha256", - "iso_name": "rhel-server-7.2-x86_64-dvd.iso", - "ks_path": "centos-7.2/ks.cfg", + "iso_name": "rhel-server-7.3-x86_64-dvd.iso", + "ks_path": "centos-7.3/ks.cfg", "memory": "512", "metadata": "floppy/dummy_metadata.json", "mirror": "http://YOU-MUST-PROVIDE-YOUR-OWN-ISO.sorry", "mirror_directory": "rhel", - "name": "rhel-7.2", + "name": "rhel-7.3", "no_proxy": "{{env `no_proxy`}}", - "template": "rhel-7.2-x86_64", + "template": "rhel-7.3-x86_64", "version": "2.2.TIMESTAMP" } } From 9e4f4bcf582a8d621f8e70a842e8ddb380c4fc8d Mon Sep 17 00:00:00 2001 From: Rickard von Essen <rickard.von.essen@gmail.com> Date: Tue, 13 Dec 2016 09:14:09 +0100 Subject: [PATCH 0583/1622] Updated OEL 7.3 kickstart ref Signed-off-by: Rickard von Essen <rickard.von.essen@gmail.com> --- oracle-7.3-x86_64.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/oracle-7.3-x86_64.json b/oracle-7.3-x86_64.json index aedb24cdc..c9e34fa1f 100644 --- a/oracle-7.3-x86_64.json +++ b/oracle-7.3-x86_64.json @@ -169,7 +169,7 @@ "iso_checksum": "2ad5327428c44d505a7d882a273cb3f5fbac4e56e739cf18f895565dde987101", "iso_checksum_type": "sha256", "iso_name": "OracleLinux-R7-U3-Server-x86_64-dvd.iso", - "ks_path": "centos-7.2/ks.cfg", + "ks_path": "centos-7.3/ks.cfg", "memory": "512", "metadata": "floppy/dummy_metadata.json", "mirror": "http://mirrors.dotsrc.org/oracle-linux", From 6804a909e1cf723795975cfe48b24d17133e8130 Mon Sep 17 00:00:00 2001 From: mvermaes <mvermaes@gmail.com> Date: Tue, 13 Dec 2016 23:57:49 +0800 Subject: [PATCH 0584/1622] Remove code that disables requiretty, which is now the default CentOS 7.3 includes sudo-1.8.6p7-21 which disables requiretty by default. CentOS 6 has not required this since at least 6.8. Obvious fix. Signed-off-by: mvermaes <mvermaes@gmail.com> --- http/centos-6.8/ks.cfg | 1 - http/centos-7.3/ks.cfg | 1 - 2 files changed, 2 deletions(-) diff --git a/http/centos-6.8/ks.cfg b/http/centos-6.8/ks.cfg index eb559dbb3..90864b006 100644 --- a/http/centos-6.8/ks.cfg +++ b/http/centos-6.8/ks.cfg @@ -67,4 +67,3 @@ nfs-utils sed -i -e 's/\(^SELINUX=\).*$/\1permissive/' /etc/selinux/config # sudo echo "%vagrant ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers.d/vagrant -sed -i "s/^[^#].*requiretty/#Defaults requiretty/" /etc/sudoers diff --git a/http/centos-7.3/ks.cfg b/http/centos-7.3/ks.cfg index 1b2563dff..9a940f63c 100644 --- a/http/centos-7.3/ks.cfg +++ b/http/centos-7.3/ks.cfg @@ -77,5 +77,4 @@ bzip2 %post # sudo echo "%vagrant ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers.d/vagrant -sed -i "s/^[^#].*requiretty/#Defaults requiretty/" /etc/sudoers %end From 292a39f432702a857e86121a0ebfdd8292f0f21b Mon Sep 17 00:00:00 2001 From: Seth Thomas <sthomas@chef.io> Date: Mon, 19 Dec 2016 08:53:41 -0500 Subject: [PATCH 0585/1622] Update VMware tools to fix CentOS 7.3 build Signed-off-by: Seth Thomas <sthomas@chef.io> --- centos-7.3-x86_64.json | 8 +++++++- scripts/centos/vmware.sh | 24 +++++++++++++++++++++--- 2 files changed, 28 insertions(+), 4 deletions(-) diff --git a/centos-7.3-x86_64.json b/centos-7.3-x86_64.json index d2725be9f..d2c3783f4 100644 --- a/centos-7.3-x86_64.json +++ b/centos-7.3-x86_64.json @@ -134,6 +134,12 @@ "source": "{{user `metadata`}}", "type": "file" }, + { + "destination": "/tmp/VMwareTools-10.1.0-4449150.tar.gz", + "source": "VMwareTools-10.1.0-4449150.tar.gz", + "type": "file", + "only": ["vmware-iso"] + }, { "environment_vars": [ "HOME_DIR=/home/vagrant", @@ -148,7 +154,7 @@ "scripts/centos/networking.sh", "scripts/common/vagrant.sh", "scripts/common/virtualbox.sh", - "scripts/common/vmware.sh", + "scripts/centos/vmware.sh", "scripts/common/parallels.sh", "scripts/centos/cleanup.sh", "scripts/common/minimize.sh" diff --git a/scripts/centos/vmware.sh b/scripts/centos/vmware.sh index 05fc1f040..4f7c47fcc 100644 --- a/scripts/centos/vmware.sh +++ b/scripts/centos/vmware.sh @@ -1,8 +1,26 @@ #!/bin/sh -eux +# set a default HOME_DIR environment variable if not set +HOME_DIR="${HOME_DIR:-/home/vagrant}"; + case "$PACKER_BUILDER_TYPE" in vmware-iso|vmware-vmx) - yum install -y open-vm-tools; - mkdir /mnt/hgfs; - echo "platform specific vmware.sh executed"; + mkdir -p /tmp/vmware-archive; + TOOLS_PATH="/tmp/VMwareTools-10.1.0-4449150.tar.gz"; + VER="`echo "${TOOLS_PATH}" | cut -f2 -d'-'`"; + MAJ_VER="`echo ${VER} | cut -d '.' -f 1`"; + + echo "VMware Tools Version: $VER"; + + tar xzf ${TOOLS_PATH} -C /tmp/vmware-archive; + ls -alh /tmp/vmware-archive; + if [ "${MAJ_VER}" -lt "10" ]; then + /tmp/vmware-archive/vmware-tools-distrib/vmware-install.pl --default; + else + /tmp/vmware-archive/vmware-tools-distrib/vmware-install.pl --default --force-install; + fi + rm -rf /tmp/vmware-archive; + rm -rf /tmp/VMwareTools-10.1.0-4449150.tar.gz; + rm -f $HOME_DIR/*.iso; + ;; esac From 2c496977e2151507517a506c71540a17bfb85ee4 Mon Sep 17 00:00:00 2001 From: Seth Thomas <sthomas@chef.io> Date: Mon, 19 Dec 2016 11:38:04 -0500 Subject: [PATCH 0586/1622] Fixing tab Signed-off-by: Seth Thomas <sthomas@chef.io> --- scripts/centos/vmware.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/centos/vmware.sh b/scripts/centos/vmware.sh index 4f7c47fcc..5d0864bc9 100644 --- a/scripts/centos/vmware.sh +++ b/scripts/centos/vmware.sh @@ -20,7 +20,7 @@ vmware-iso|vmware-vmx) /tmp/vmware-archive/vmware-tools-distrib/vmware-install.pl --default --force-install; fi rm -rf /tmp/vmware-archive; - rm -rf /tmp/VMwareTools-10.1.0-4449150.tar.gz; + rm -rf /tmp/VMwareTools-10.1.0-4449150.tar.gz; rm -f $HOME_DIR/*.iso; ;; esac From d8a70120f420243fc0f0ff65a5fc6078067c28f6 Mon Sep 17 00:00:00 2001 From: Seth Thomas <sthomas@chef.io> Date: Mon, 19 Dec 2016 14:49:51 -0500 Subject: [PATCH 0587/1622] Use the bento-ya gem, add builds.yml Signed-off-by: Seth Thomas <sthomas@chef.io> --- .gitignore | 1 + Gemfile | 7 +- README.md | 12 +- Rakefile | 97 +++--- bin/bento | 941 ----------------------------------------------------- builds.yml | 94 ++++++ 6 files changed, 156 insertions(+), 996 deletions(-) delete mode 100755 bin/bento create mode 100644 builds.yml diff --git a/.gitignore b/.gitignore index 68bf87b99..b7286fe87 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ packer.log /builds/ .kitchen .kitchen.*.yml +Gemfile.lock diff --git a/Gemfile b/Gemfile index 9e215f7af..44a167e1d 100644 --- a/Gemfile +++ b/Gemfile @@ -1,8 +1,3 @@ source 'https://rubygems.org' -gem 'rake' -gem 'thor' -gem 'test-kitchen' -gem 'json' -gem 'mixlib-shellout' -gem 'aws-sdk' +gem 'bento-ya' diff --git a/README.md b/README.md index eb6aa72bd..ed601b3f4 100644 --- a/README.md +++ b/README.md @@ -108,16 +108,20 @@ end ### Using `bento` -In the `bin` directory of this repo is the `bento` utility which wraps `packer` as well as allowing other related functionality. -This is an opinionated tool that the project uses for building the hosted boxes listed above. +``` +$ gem install bento-ya +``` + +If you use Bundler, you can add run `bundle install` from the bento repo. +Prefix commands with `bundle exec` if doing so. To build multiple templates for all providers (VirtualBox, Fusion, Parallels, etc): - $ bin/bento build debian-8.6-amd64 debian-8.6-i386 + $ bento build debian-8.6-amd64 debian-8.6-i386 To build a box for a single provider: - $ bin/bento build --only=virtualbox-iso debian-8.6-amd64 + $ bento build --only=virtualbox-iso debian-8.6-amd64 ### Using `packer` diff --git a/Rakefile b/Rakefile index dc6c29090..607b1fc69 100644 --- a/Rakefile +++ b/Rakefile @@ -1,37 +1,49 @@ require 'json' +require 'yaml' # TODO: private boxes may need to specify a mirror # Enables `bundle exec rake do_all[ubuntu-12.04-amd64,centos-7.1-x86_64] # http://blog.stevenocchipinti.com/2013/10/18/rake-task-with-an-arbitrary-number-of-arguments/ -task :do_all do |_task, args| - args.extras.each do |a| - # build stage - Rake::Task['build_box'].invoke(a) - Rake::Task['build_box'].reenable +builds = YAML.load(File.read("builds.yml")) + +desc 'Do ALL THE THINGS' +task :do_all do + # build stage + builds['public'].each do |platform, versions| + versions.each do |version, archs| + archs.each do |arch| + builds['providers'].each do |provider| + # build stage + Rake::Task['build_box'].invoke("#{platform}-#{version}-#{arch}", "#{provider}") + Rake::Task['build_box'].reenable + puts "#{platform}-#{version}-#{arch}, #{provider}" + # verification stage + Rake::Task['test_all'].invoke + Rake::Task['test_all'].reenable + # publish stage + Rake::Task['upload_all'].invoke + Rake::Task['upload_all'].reenable + # release stage + Rake::Task['release_all'].invoke + Rake::Task['release_all'].reenable + # clean stage + Rake::Task['clean'].invoke + Rake::Task['clean'].reenable + end + end + end end - - # verification stage - Rake::Task['test_all'].invoke - Rake::Task['test_all'].reenable - - # publish stage - Rake::Task['upload_all'].invoke - Rake::Task['upload_all'].reenable - - # release stage - Rake::Task['release_all'].invoke - Rake::Task['release_all'].reenable end desc 'Test all boxes with Test Kitchen' task :test_all do - sh './bin/bento test' + sh 'bento test -f' end -desc 'Upload all boxes to Atlas and S3 for all providers' +desc 'Upload all boxes to Atlas for all providers' task :upload_all do - sh './bin/bento upload' + sh 'bento upload' end desc 'Release all' @@ -44,23 +56,30 @@ task :release_all do end desc 'Build a bento template' -task :build_box, :template do |_, args| - sh build_command(args[:template]) +task :build_box, :template, :provider do |_, args| + bento_provider = ENV['BENTO_PROVIDERS'] ? ENV['BENTO_PROVIDERS'] : args[:provider] + cmd = %W(bento build #{args[:template]}) + cmd.insert(2, "--only #{bento_provider}") + cmd.insert(2, "--mirror #{ENV['PACKER_MIRROR']}") if ENV['PACKER_MIRROR'] + cmd.insert(2, "--version #{ENV['BENTO_VERSION']}") if ENV['BENTO_VERSION'] + cmd.insert(2, "--headless") + cmd.join(' ') + sh a_to_s(cmd) end desc 'Release a version of a box' task :release, [:boxname, :version] do |_, args| - sh "./bin/bento release #{args[:boxname]} #{args[:version]}" + sh "bento release #{args[:boxname]} #{args[:version]}" end desc 'Revoke a version of a box' task :revoke, [:boxname, :version] do |_, args| - sh "./bin/bento revoke #{args[:boxname]} #{args[:version]}" + sh "bento revoke #{args[:boxname]} #{args[:version]}" end desc 'Delete a version of a box' task :delete, [:boxname, :version] do |_, args| - sh "./bin/bento delete #{args[:boxname]} #{args[:version]}" + sh "bento delete #{args[:boxname]} #{args[:version]}" end desc 'Clean the build directory' @@ -69,6 +88,14 @@ task :clean do `rm -rf builds/*.json builds/*.box packer-* .kitchen.*.yml` end +def a_to_s(*args) + clean_array(*args).join(" ") +end + +def clean_array(*args) + args.flatten.reject { |i| i.nil? || i == "" }.map(&:to_s) +end + def box_metadata(metadata_file) metadata = {} file = File.read(metadata_file) @@ -85,15 +112,6 @@ def box_metadata(metadata_file) metadata end -def build_command(template) - cmd = %W(./bin/bento build #{template}) - cmd.insert(2, "--only #{ENV['BENTO_PROVIDERS']}") if ENV['BENTO_PROVIDERS'] - cmd.insert(2, "--mirror #{ENV['PACKER_MIRROR']}") if ENV['PACKER_MIRROR'] - cmd.insert(2, "--version #{ENV['BENTO_VERSION']}") if ENV['BENTO_VERSION'] - cmd.insert(2, "--headless") - cmd.join(' ') -end - def metadata_files @metadata_files ||= compute_metadata_files end @@ -102,14 +120,3 @@ def compute_metadata_files `ls builds/*.json`.split("\n") end -# http://stackoverflow.com/questions/2108727/which-in-ruby-checking-if-program-exists-in-path-from-ruby -def which(cmd) - exts = ENV['PATHEXT'] ? ENV['PATHEXT'].split(';') : [''] - ENV['PATH'].split(File::PATH_SEPARATOR).each do |path| - exts.each do |ext| - exe = File.join(path, "#{cmd}#{ext}") - return exe if File.executable?(exe) && !File.directory?(exe) - end - end - false -end diff --git a/bin/bento b/bin/bento deleted file mode 100755 index a4519b359..000000000 --- a/bin/bento +++ /dev/null @@ -1,941 +0,0 @@ -#!/usr/bin/env ruby -# -*- encoding: utf-8 -*- - -Signal.trap("INT") { exit 1 } - -$stdout.sync = true -$stderr.sync = true - -require 'benchmark' -require 'digest' -require 'json' -require 'optparse' -require 'ostruct' -require 'tempfile' -require 'net/http' -require 'aws-sdk' -require 'kitchen' -require 'mixlib/shellout' -require 'erb' - -class Options - - NAME = File.basename($0).freeze - - def self.parse(args) - options = OpenStruct.new - options.templates = calculate_templates("*.json") - - global = OptionParser.new do |opts| - opts.banner = "Usage: #{NAME} [SUBCOMMAND [options]]" - opts.separator "" - opts.separator <<-COMMANDS.gsub(/^ {8}/, "") - build : build one or more templates - help : prints this help message - list : list all templates in project - normalize : normalize one or more templates - test : test one or more builds with kitchen - upload : upload one or more builds to Atlas and S3 - release : release a version of a box on Atlas - revoke : revoke a version of a box on Atlas - delete : delete a version of a box from Atlas - COMMANDS - end - - templates_argv_proc = proc { |options| - options.templates = calculate_templates(args) unless args.empty? - - options.templates.each do |t| - if !File.exists?("#{t}.json") - $stderr.puts "File #{t}.json does not exist for template '#{t}'" - exit(1) - end - end - } - - box_version_argv_proc = proc { |options| - options.box = ARGV[0] - options.version = ARGV[1] - } - - subcommand = { - help: { - parser: OptionParser.new {}, - argv: proc { |options| - puts global - exit(0) - } - }, - build: { - class: BuildRunner, - parser: OptionParser.new { |opts| - opts.banner = "Usage: #{NAME} build [options] TEMPLATE[ TEMPLATE ...]" - - opts.on("-n", "--[no-]dry-run", "Dry run (what would happen)") do |opt| - options.dry_run = opt - end - - opts.on("-d", "--[no-]debug", "Run packer with debug output") do |opt| - options.debug = opt - end - - opts.on("-o BUILDS", "--only BUILDS", "Only build some Packer builds") do |opt| - options.builds = opt - end - - opts.on("-e BUILDS", "--except BUILDS", "Build all Packer builds except these") do |opt| - options.except = opt - end - - opts.on("-m MIRROR", "--mirror MIRROR", "Look for isos at MIRROR") do |opt| - options.mirror = opt - end - - opts.on("-H", "--headless", "Run providers as headless") do |opt| - options.headless = opt - end - - opts.on("-v VERSION", "--version VERSION", "Override the version set in the template") do |opt| - options.override_version = opt - end - }, - argv: templates_argv_proc - }, - list: { - class: ListRunner, - parser: OptionParser.new { |opts| - opts.banner = "Usage: #{NAME} list [TEMPLATE ...]" - }, - argv: templates_argv_proc - }, - normalize: { - class: NormalizeRunner, - parser: OptionParser.new { |opts| - opts.banner = "Usage: #{NAME} normalize TEMPLATE[ TEMPLATE ...]" - - opts.on("-d", "--[no-]debug", "Run packer with debug output") do |opt| - options.debug = opt - end - }, - argv: templates_argv_proc - }, - test: { - class: TestRunner, - parser: OptionParser.new { |opts| - opts.banner = "Usage: #{NAME} test [options]" - - opts.on("-f", "--shared-folder", "Enable shared folder") do |opt| - options.shared_folder = opt - end - - opts.on("-p", "--provisioner PROVISIONER", "Use a specfic provisioner") do |opt| - options.provisioner = opt - end - }, - argv: Proc.new {} - }, - upload: { - class: UploadRunner, - parser: OptionParser.new { |opts| - opts.banner = "Usage: #{NAME} upload" - }, - argv: box_version_argv_proc - }, - release: { - class: ReleaseRunner, - parser: OptionParser.new { |opts| - opts.banner = "Usage: #{NAME} release BOX VERSION" - }, - argv: box_version_argv_proc - }, - revoke: { - class: RevokeRunner, - parser: OptionParser.new { |opts| - opts.banner = "Usage: #{NAME} revoke BOX VERSION" - }, - argv: box_version_argv_proc - }, - delete: { - class: DeleteRunner, - parser: OptionParser.new { |opts| - opts.banner = "Usage: #{NAME} delete BOX VERSION" - }, - argv: box_version_argv_proc - } - } - - global.order! - command = args.empty? ? :help : ARGV.shift.to_sym - subcommand.fetch(command).fetch(:parser).order! - subcommand.fetch(command).fetch(:argv).call(options) - - options.command = command - options.klass = subcommand.fetch(command).fetch(:class) - - options - end - - def self.calculate_templates(globs) - Array(globs). - map { |glob| result = Dir.glob(glob); result.empty? ? glob : result }. - flatten. - sort. - delete_if { |file| file =~ /\.variables\./ }. - map { |template| template.sub(/\.json$/, '') } - end -end - -module Common - - def banner(msg) - puts "==> #{msg}" - end - - def info(msg) - puts " #{msg}" - end - - def warn(msg) - puts ">>> #{msg}" - end - - def duration(total) - total = 0 if total.nil? - minutes = (total / 60).to_i - seconds = (total - (minutes * 60)) - format("%dm%.2fs", minutes, seconds) - end - - def box_metadata(metadata_file) - metadata = Hash.new - file = File.read(metadata_file) - json = JSON.parse(file) - - # metadata needed for upload: boxname, version, provider, box filename - metadata['name'] = json['name'] - metadata['version'] = json['version'] - metadata['box_basename'] = json['box_basename'] - metadata['providers'] = Hash.new - json['providers'].each do |provider| - metadata['providers'][provider['name']] = provider.reject { |k, _| k == 'name' } - end - metadata - end - - def metadata_files - @metadata_files ||= compute_metadata_files - end - - def compute_metadata_files - `ls builds/*.json`.split("\n") - end - - def atlas_api - @atlas_api ||= 'https://atlas.hashicorp.com/api/v1' - end - - def atlas_org - @atlas_org ||= ENV['ATLAS_ORG'] - end - - def atlas_token - @atlas_token ||= ENV['ATLAS_TOKEN'] - end - - def s3_endpoint - @s3_endpoint ||= ENV['BENTO_S3_ENDPOINT'] - end - - def s3_bucket - @s3_bucket ||= ENV['BENTO_S3_BUCKET'] - end - - def private_box?(boxname) - proprietary_os_list = %w(macosx sles solaris windows) - proprietary_os_list.any? { |p| boxname.include?(p) } - end -end - -module HttpStuff - - def class_for_request(verb) - Net::HTTP.const_get(verb.to_s.capitalize) - end - - def build_uri(verb, path, params = {}) - if %w(delete, get).include?(verb) - path = [path, to_query_string(params)].compact.join('?') - end - - # Parse the URI - uri = URI.parse(path) - - # Don't merge absolute URLs - uri = URI.parse(File.join(endpoint, path)) unless uri.absolute? - - # Return the URI object - uri - end - - def to_query_string(hash) - hash.map do |key, value| - "#{CGI.escape(key)}=#{CGI.escape(value)}" - end.join('&')[/.+/] - end - - def request(verb, url, data = {}, headers = {}) - uri = build_uri(verb, url, data) - - # Build the request. - request = class_for_request(verb).new(uri.request_uri) - if %w(patch post put delete).include?(verb) - if data.respond_to?(:read) - request.content_length = data.size - request.body_stream = data - elsif data.is_a?(Hash) - request.form_data = data - else - request.body = data - end - end - - # Add headers - headers.each do |key, value| - request.add_field(key, value) - end - - connection = Net::HTTP.new(uri.host, uri.port) - - if uri.scheme == 'https' - require 'net/https' unless defined?(Net::HTTPS) - - # Turn on SSL - connection.use_ssl = true - connection.verify_mode = OpenSSL::SSL::VERIFY_PEER - end - - connection.start do |http| - response = http.request(request) - - case response - when Net::HTTPRedirection - redirect = URI.parse(response['location']) - request(verb, redirect, data, headers) - else - response - end - end - end -end - -module PackerExec - - def for_packer_run_with(template) - Tempfile.open("#{template}-metadata.json") do |md_file| - Tempfile.open("#{template}-metadata-var-file") do |var_file| - write_box_metadata(template, md_file) - write_var_file(template, md_file, var_file) - yield md_file, var_file - end - end - end - - def write_box_metadata(template, io) - md = BuildMetadata.new(template, build_timestamp, override_version).read - - io.write(JSON.pretty_generate(md)) - io.close - end - - def write_var_file(template, md_file, io) - md = BuildMetadata.new(template, build_timestamp, override_version).read - - io.write(JSON.pretty_generate({ - box_basename: md[:box_basename], - build_timestamp: md[:build_timestamp], - git_revision: md[:git_revision], - metadata: md_file.path, - version: md[:version] - })) - io.close - end -end - -class BuildRunner - - include Common - include PackerExec - - attr_reader :templates, :dry_run, :debug, :builds, :except, :mirror, :headless, :override_version, :build_timestamp - - def initialize(opts) - @templates = opts.templates - @dry_run = opts.dry_run - @debug = opts.debug - @builds = opts.builds - @except = opts.except - @mirror = opts.mirror - @headless = opts.headless - @override_version = opts.override_version - @build_timestamp = Time.now.gmtime.strftime("%Y%m%d%H%M%S") - end - - def start - banner("Starting build for templates: #{templates}") - time = Benchmark.measure do - templates.each { |template| build(template) } - end - banner("Build finished in #{duration(time.real)}.") - end - - private - - def build(template) - for_packer_run_with(template) do |md_file, var_file| - cmd = packer_build_cmd(template, var_file.path) - banner("[#{template}] Building: '#{cmd.join(' ')}'") - time = Benchmark.measure do - system(*cmd) or raise "[#{template}] Error building, exited #{$?}" - write_final_metadata(template) - end - banner("[#{template}] Finished building in #{duration(time.real)}.") - end - end - - def packer_build_cmd(template, var_file) - vars = "#{template}.variables.json" - cmd = %W[packer build -var-file=#{var_file} #{template}.json] - cmd.insert(2, "-var-file=#{vars}") if File.exist?(vars) - cmd.insert(2, "-only=#{builds}") if builds - cmd.insert(2, "-except=#{except}") if except - # Build the command line in the correct order and without spaces as future input for the splat operator. - cmd.insert(2, "mirror=#{mirror}") if mirror - cmd.insert(2, "-var") if mirror - cmd.insert(2, "headless=true") if headless - cmd.insert(2, "-var") if headless - cmd.insert(2, "-debug") if debug - cmd.insert(0, "echo") if dry_run - cmd - end - - def write_final_metadata(template) - md = BuildMetadata.new(template, build_timestamp, override_version).read - path = File.join(File.dirname(__FILE__), "..", "builds") - filename = File.join(path, "#{md[:box_basename]}.metadata.json") - - md[:providers] = ProviderMetadata.new(path, md[:box_basename]).read - - if dry_run - banner("(Dry run) Metadata file contents would be something similar to:") - puts JSON.pretty_generate(md) - else - File.open(filename, "wb") { |file| file.write(JSON.pretty_generate(md)) } - end - end -end - -class NormalizeRunner - - include Common - include PackerExec - - attr_reader :templates, :build_timestamp, :debug, :override_version - - def initialize(opts) - @templates = opts.templates - @debug = opts.debug - @modified = [] - @build_timestamp = Time.now.gmtime.strftime("%Y%m%d%H%M%S") - end - - def start - banner("Normalizing for templates: #{templates}") - time = Benchmark.measure do - templates.each do |template| - validate(template) - fix(template) - end - end - if !@modified.empty? - info("") - info("The following templates were modified:") - @modified.sort.each { |template| info(" * #{template}")} - end - banner("Normalizing finished in #{duration(time.real)}.") - end - - private - - def checksum(file) - Digest::MD5.file(file).hexdigest - end - - def fix(template) - file = "#{template}.json" - - banner("[#{template}] Fixing") - original_checksum = checksum(file) - output = %x{packer fix #{file}} - raise "[#{template}] Error fixing, exited #{$?}" if $?.exitstatus != 0 - # preserve ampersands in shell commands, - # see: https://github.com/mitchellh/packer/issues/784 - output.gsub!("\\u0026", "&") - File.open(file, "wb") { |dest| dest.write(output) } - fixed_checksum = checksum(file) - - if original_checksum == fixed_checksum - puts("No changes made.") - else - warn("Template #{template} has been modified.") - @modified << template - end - end - - def packer_validate_cmd(template, var_file) - vars = "#{template}.variables.json" - cmd = %W[packer validate -var-file=#{var_file} #{template}.json] - cmd.insert(2, "-var-file=#{vars}") if File.exist?(vars) - cmd - end - - def validate(template) - for_packer_run_with(template) do |md_file, var_file| - cmd = packer_validate_cmd(template, var_file.path) - banner("[#{template}] Validating: '#{cmd.join(' ')}'") - if debug - banner("[#{template}] DEBUG: var_file(#{var_file.path}) is:") - puts IO.read(var_file.path) - banner("[#{template}] DEBUG: md_file(#{md_file.path}) is:") - puts IO.read(md_file.path) - end - system(*cmd) or raise "[#{template}] Error validating, exited #{$?}" - end - end -end - -class TestRunner - include Common - - attr_reader :shared_folder, :boxname, :provider, :box_url, :share_disabled, :provisioner - - def initialize(opts) - @debug = opts.debug - @shared_folder = opts.shared_folder - @provisioner = opts.provisioner.nil? ? "shell" : opts.provisioner - end - - def start - banner("Starting testing...") - time = Benchmark.measure do - metadata_files.each do |metadata_file| - m = box_metadata(metadata_file) - destroy_all_bento - test_box(m['name'], m['providers']) - destroy_all_bento - end - end - banner("Testing finished in #{duration(time.real)}.") - end - - private - - def destroy_all_bento - cmd = Mixlib::ShellOut.new("vagrant box list | grep 'bento-'") - cmd.run_command - boxes = cmd.stdout.split("\n") - - boxes.each do |box| - b = box.split(' ') - rm_cmd = Mixlib::ShellOut.new("vagrant box remove --force #{b[0]} --provider #{b[1].to_s.gsub(/(,|\()/, '')}") - banner("Removing #{b[0]} for provider #{b[1].to_s.gsub(/(,|\()/, '')}") - rm_cmd.run_command - end - end - - def test_box(boxname, providers) - providers.each do |provider, provider_data| - - if provider == 'vmware_desktop' - case RUBY_PLATFORM - when /darwin/ - provider = 'vmware_fusion' - when /linux/ - provider = 'vmware_workstation' - end - end - - @boxname = boxname - @provider = provider - @share_disabled = shared_folder ? false : true - @box_url = "file://#{ENV['PWD']}/builds/#{provider_data['file']}" - - kitchen_cfg = ERB.new(File.read('.kitchen.yml.erb'), nil, '-').result(binding) - File.open(".kitchen.#{provider}.yml", "w") { |f| f.puts kitchen_cfg } - - Kitchen.logger = Kitchen.default_file_logger - @loader = Kitchen::Loader::YAML.new(project_config: "./.kitchen.#{provider}.yml") - config = Kitchen::Config.new(loader: @loader) - config.instances.each do |instance| - instance.test(:always) - end - end - end -end - -class DeleteRunner - include Common - include HttpStuff - - attr_reader :boxname, :version - - def initialize(opts) - @boxname = opts.box - @version = opts.version - end - - def start - banner("Starting Delete...") - time = Benchmark.measure do - delete_version(boxname, version) - end - banner("Delete finished in #{duration(time.real)}.") - end - - private - - def delete_version(boxname, version) - banner("Deleting version #{version} of box #{boxname}") - req = request('delete', "#{atlas_api}/box/#{atlas_org}/#{boxname}/version/#{version}", { 'access_token' => atlas_token }, { 'Content-Type' => 'application/json' }) - - case req.code - when '200' - banner("Version #{version} of box #{boxname} has been successfully deleted") - when '404' - warn("No box exists for this version") - else - warn("Something went wrong #{req.code}") - end - end -end - -class ReleaseRunner - include Common - include HttpStuff - - attr_reader :boxname, :version - - def initialize(opts) - @boxname = opts.box - @version = opts.version - end - - def start - banner("Starting Release...") - time = Benchmark.measure do - release_version(boxname, version) - end - banner("Release finished in #{duration(time.real)}.") - end - - private - - def release_version(boxname, version) - case status(boxname, version) - when 'unreleased' - banner("Releasing version #{version} of box #{boxname}") - req = request('put', "#{atlas_api}/box/#{atlas_org}/#{boxname}/version/#{version}/release", { 'access_token' => atlas_token }, { 'Content-Type' => 'application/json' }) - if req.code == '200' - banner("Version #{version} of box #{boxname} has been successfully released") - else - warn("Something went wrong #{req.code}") - end - when 'active' - banner("Version #{version} of box #{boxname} has already been released - nothing to do") - else - warn("Unexpected status retrieved from Atlas") - end - end - - def status(boxname, version) - req = request('get', "#{atlas_api}/box/#{atlas_org}/#{boxname}/version/#{version}", { 'access_token' => atlas_token }, { 'Content-Type' => 'application/json' }) - status = JSON.parse(req.body)['status'] - end -end - -class RevokeRunner - include Common - include HttpStuff - - attr_reader :boxname, :version - - def initialize(opts) - @boxname = opts.box - @version = opts.version - end - - def start - banner("Starting Revoke...") - time = Benchmark.measure do - revoke_version(boxname, version) - end - banner("Revoke finished in #{duration(time.real)}.") - end - - private - - def revoke_version(boxname, version) - banner("Revoking version #{version} of box #{boxname}") - req = request('put', "#{atlas_api}/box/#{atlas_org}/#{boxname}/version/#{version}/revoke", { 'access_token' => atlas_token }, { 'Content-Type' => 'application/json' }) - if req.code == '200' - banner("Version #{version} of box #{boxname} has been successfully revoked") - else - banner("Something went wrong #{req.code}") - end - end -end - -class UploadRunner - include Common - include HttpStuff - - attr_reader :templates - - def initialize(opts) - @templates = opts.templates - end - - def start - banner("Starting uploads...") - time = Benchmark.measure do - metadata_files.each do |metadata_file| - metadata = box_metadata(metadata_file) - create_box(metadata['name']) - create_box_version(metadata['name'], metadata['version']) - create_providers(metadata['name'], metadata['version'], metadata['providers'].keys) - upload_to_atlas(metadata['name'], metadata['version'], metadata['providers']) - upload_to_s3(metadata['name'], metadata['version'], metadata['providers']) - end - end - banner("Atlas uploads finished in #{duration(time.real)}.") - end - - private - - def create_box(boxname) - req = request('get', "#{atlas_api}/box/#{atlas_org}/#{boxname}", { 'box[username]' => atlas_org, 'access_token' => atlas_token } ) - if req.code.eql?('404') - if private_box?(boxname) - banner("Creating the private box #{boxname} in Atlas.") - req = request('post', "#{atlas_api}/boxes", { 'box[name]' => boxname, 'box[username]' => atlas_org, 'access_token' => atlas_token }, { 'Content-Type' => 'application/json' } ) - else - banner("Creating the box #{boxname} in Atlas.") - req = request('post', "#{atlas_api}/boxes", { 'box[name]' => boxname, 'box[username]' => atlas_org, 'access_token' => atlas_token }, { 'Content-Type' => 'application/json' } ) - make_public(boxname) - end - else - banner("The box #{boxname} exists in atlas, continuing...") - end - end - - def make_public(boxname) - banner("Making #{boxname} public") - req = request('put', "#{atlas_api}/box/#{atlas_org}/#{boxname}", { 'box[is_private]' => false, 'access_token' => atlas_token }, { 'Content-Type' => 'application/json' } ) - banner("#{boxname} successfully made public") if req.code == '200' - end - - def create_box_version(boxname, version) - req = request('post', "#{atlas_api}/box/#{atlas_org}/#{boxname}/versions", { 'version[version]' => version, 'access_token' => atlas_token },{ 'Content-Type' => 'application/json' } ) - - banner("Created box version #{boxname} #{version}.") if req.code == '200' - banner("Box version #{boxname} #{version} already exists, continuing.") if req.code == '422' - end - - def create_providers(boxname, version, provider_names) - provider_names.each do |provider| - banner("Creating provider #{provider} for #{boxname} #{version}") - req = request('post', "#{atlas_api}/box/#{atlas_org}/#{boxname}/version/#{version}/providers", { 'provider[name]' => provider, 'access_token' => atlas_token }, { 'Content-Type' => 'application/json' } ) - banner("Created #{provider} for #{boxname} #{version}") if req.code == '200' - banner("Provider #{provider} for #{boxname} #{version} already exists, continuing.") if req.code == '422' - end - end - - def upload_to_atlas(boxname, version, providers) - providers.each do |provider, provider_data| - boxfile = provider_data['file'] - req = request('get', "#{atlas_api}/box/#{atlas_org}/#{boxname}/version/#{version}/provider/#{provider}/upload?access_token=#{atlas_token}") - upload_path = JSON.parse(req.body)['upload_path'] - token = JSON.parse(req.body)['token'] - - banner("Atlas: Uploading #{boxfile}") - info("Name: #{boxname}") - info("Version: #{version}") - info("Provider: #{provider}") - info("Upload Path: #{upload_path}") - upload_request = request('put', upload_path, File.open("builds/#{boxfile}")) - - req = request('get', "#{atlas_api}/box/#{atlas_org}/#{boxname}/version/#{version}/provider/#{provider}?access_token=#{atlas_token}") - hosted_token = JSON.parse(req.body)['hosted_token'] - - if token == hosted_token - banner("Successful upload of box #{boxfile}") - else - banner("Failed upload due to non-matching tokens of box #{boxfile} to atlas box: #{boxname}, version: #{version}, provider: #{provider}") - warn("Code: #{req.code}") - warn("Body: #{req.body}") - end - end - - def upload_to_s3(boxname, version, providers) - providers.each do |provider, provider_data| - boxfile = provider_data['file'] - provider = 'vmware' if provider == 'vmware_desktop' - box_path = "vagrant/#{provider}/opscode_#{boxname}_chef-provisionerless.box" - credentials = Aws::Credentials.new(ENV['AWS_ACCESS_KEY_ID'], ENV['AWS_SECRET_ACCESS_KEY']) - - s3 = Aws::S3::Resource.new(credentials: credentials, endpoint: s3_endpoint) - banner("S3: Uploading #{boxfile}") - info("Name: #{boxname}") - info("Version: #{version}") - info("Provider: #{provider}") - s3_object = s3.bucket(s3_bucket).object(box_path) - s3_object.upload_file("builds/#{boxfile}", acl:'public-read') - banner("Upload Path: #{s3_object.public_url}") - end - end - end -end - -class ListRunner - - include Common - - attr_reader :templates - - def initialize(opts) - @templates = opts.templates - end - - def start - templates.each { |template| puts template } - end -end - -class Runner - - attr_reader :options - - def initialize(options) - @options = options - end - - def start - options.klass.new(options).start - end -end - -class BuildMetadata - - def initialize(template, build_timestamp, override_version) - @template = template - @build_timestamp = build_timestamp - @override_version = override_version - end - - def read - { - name: name, - version: version, - build_timestamp: build_timestamp, - git_revision: git_revision, - box_basename: box_basename, - template: template_vars.fetch("template", UNKNOWN), - } - end - - private - - UNKNOWN = "__unknown__".freeze - - attr_reader :template, :build_timestamp, :override_version - - def box_basename - "#{name.gsub("/", "__")}-#{version}.git.#{git_revision}" - end - - def git_revision - sha = %x{git rev-parse HEAD}.strip - - git_clean? ? sha : "#{sha}_dirty" - end - - def git_clean? - %x{git status --porcelain}.strip.empty? - end - - def merged_vars - @merged_vars ||= begin - if File.exist?("#{template}.variables.json") - template_vars.merge(JSON.load(IO.read("#{template}.variables.json"))) - else - template_vars - end - end - end - - def name - merged_vars.fetch("name", template) - end - - def template_vars - @template_vars ||= JSON.load(IO.read("#{template}.json")).fetch("variables") - end - - def version - if override_version - override_version - else - merged_vars.fetch("version", "#{UNKNOWN}.TIMESTAMP"). - rpartition(".").first.concat(".#{build_timestamp}") - end - end -end - -class ProviderMetadata - - def initialize(path, box_basename) - @base = File.join(path, box_basename) - end - - def read - Dir.glob("#{base}.*.box").map do |file| - { - name: provider_from_file(file), - file: "#{File.basename(file)}", - checksum_type: "sha256", - checksum: shasum(file) - } - end - end - - private - - attr_reader :base - - def provider_from_file(file) - case provider = file.sub(/^.*\.([^.]+)\.box$/, '\1') - when /vmware/i then "vmware_desktop" - else provider - end - end - - def shasum(file) - Digest::SHA256.file(file).hexdigest - end -end - -begin - Runner.new(Options.parse(ARGV)).start -rescue => ex - $stderr.puts ">>> #{ex.message}" - exit(($? && $?.exitstatus) || 99) -end diff --git a/builds.yml b/builds.yml new file mode 100644 index 000000000..1b396a61e --- /dev/null +++ b/builds.yml @@ -0,0 +1,94 @@ +--- +providers: + - parallels-iso + - virtualbox-iso + - vmware-iso + +public: + centos: + '5.11': + - x86_64 + - i386 + '6.8': + - x86_64 + - i386 + '7.3': + - x86_64 + debian: + '7.11': + - amd64 + - i386 + '8.6': + - amd64 + - i386 + fedora: + '23': + - x86_64 + '24': + - x86_64 + '25': + - x86_64 + freebsd: + '9.3': + - amd64 + '10.3': + - amd64 + '11.0': + - amd64 + omnios: + r151018: + - amd64 + opensuse: + '13.2': + - x86_64 + - i386 + opensuse-leap: + '42.2': + - x86_64 + oracle: + '5.11': + - x86_64 + - i386 + '6.8': + - x86_64 + - i386 + '7.3': + - x86_64 + ubuntu: + '12.04': + - amd64 + - i386 + '14.04': + - amd64 + - i386 + '16.04': + - amd64 + - i386 + '16.10': + - amd64 + - i386 + +private: + rhel: + '5.11': + - x86_64 + - i386 + '6.8': + - x86_64 + - i386 + '7.3': + - x86_64 + +broken: + - omnios-r151018-vmware-iso + - omnios-r151018-parallels-iso + - opensuse-leap-42.1-x86_64-parallels-iso + - opensuse-13.2-i386-vmware-iso + - opensuse-13.2-x86_64-vmware-iso + - centos-5.11-x86_64-virtualbox-iso + - centos-5.11-i386-virtualbox-iso + +no_shared_folder: + - freebsd-10.3-amd64-all + - freebsd-9.3-amd64-all + - omnios-r151018-all From 6734005b7148652629a3e5c107df99b6b32bd5ab Mon Sep 17 00:00:00 2001 From: Seth Thomas <sthomas@chef.io> Date: Mon, 19 Dec 2016 15:14:18 -0500 Subject: [PATCH 0588/1622] Cutting 2.3.2 Signed-off-by: Seth Thomas <sthomas@chef.io> --- CHANGELOG.md | 14 ++++ README.md | 190 +++++++++++++++++++++++++-------------------------- 2 files changed, 109 insertions(+), 95 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6d696e9f3..fc149c65c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,19 @@ # Change Log +## [2.3.2](https://github.com/chef/bento/tree/2.3.2) (2016-12-19) +[Full Changelog](https://github.com/chef/bento/compare/2.3.1...2.3.2) + +**Added and Updated Platforms** +- CentOS and RHEL 7.3 [\#739](https://github.com/chef/bento/pull/739) ([rickard-von-essen](https://github.com/rickard-von-essen)) +- SLES 12 SP2 [\#735](https://github.com/chef/bento/pull/735) ([mattiasgiese](https://github.com/mattiasgiese)) + +**Improvements** +- Update VMware tools to fix CentOS 7.3 build [\#743](https://github.com/chef/bento/pull/743) ([cheeseplus](https://github.com/cheeseplus)) +- Remove CentOS requiretty sudoers workaround, this is now the default [\#740](https://github.com/chef/bento/pull/740) ([mvermaes](https://github.com/mvermaes)) + +**Pipeline** +- Use the bento-ya gem, add builds.yml [\#745](https://github.com/chef/bento/pull/745) ([cheeseplus](https://github.com/cheeseplus)) + ## [2.3.1](https://github.com/chef/bento/tree/2.3.1) (2016-11-30) [Full Changelog](https://github.com/chef/bento/compare/2.3.0...2.3.1) diff --git a/README.md b/README.md index ed601b3f4..4a09948ee 100644 --- a/README.md +++ b/README.md @@ -21,7 +21,7 @@ Boxes listed that are struck out (~~box~~) are broken/unreleased for the current | ------------ | ------------- | ------------- | ------------- | | centos-5.11 | [x86_64][centos_511_64_vbox] | [x86_64][centos_511_64_vmware] | [x86_64][centos_511_64_prl] | | centos-6.8 | [x86_64][centos_68_64_vbox] | [x86_64][centos_68_64_vmware] | [x86_64][centos_68_64_prl] | -| centos-7.2 | [x86_64][centos_72_64_vbox] | [x86_64][centos_72_64_vmware] | [x86_64][centos_72_64_prl] | +| centos-7.3 | [x86_64][centos_73_64_vbox] | [x86_64][centos_73_64_vmware] | [x86_64][centos_73_64_prl] | | debian-7.11 | [amd64][debian_711_64_vbox] | [amd64][debian_711_64_vmware] | [amd64][debian_711_64_prl] | | debian-8.6 | [amd64][debian_86_64_vbox] | [amd64][debian_86_64_vmware] | [amd64][debian_86_64_prl] | | fedora-23 | [x86_64][fedora_23_64_vbox] | [x86_64][fedora_23_64_vmware] | [x86_64][fedora_23_64_prl] | @@ -232,98 +232,98 @@ See the License for the specific language governing permissions and limitations under the License. ``` -[centos_511_32_prl]: https://atlas.hashicorp.com/bento/boxes/centos-5.11-i386/versions/2.3.0/providers/parallels.box -[centos_511_32_vbox]: https://atlas.hashicorp.com/bento/boxes/centos-5.11-i386/versions/2.3.0/providers/virtualbox.box -[centos_511_32_vmware]: https://atlas.hashicorp.com/bento/boxes/centos-5.11-i386/versions/2.3.0/providers/vmware_desktop.box -[centos_511_64_prl]: https://atlas.hashicorp.com/bento/boxes/centos-5.11/versions/2.3.0/providers/parallels.box -[centos_511_64_vbox]: https://atlas.hashicorp.com/bento/boxes/centos-5.11/versions/2.3.0/providers/virtualbox.box -[centos_511_64_vmware]: https://atlas.hashicorp.com/bento/boxes/centos-5.11/versions/2.3.0/providers/vmware_desktop.box -[centos_68_32_prl]: https://atlas.hashicorp.com/bento/boxes/centos-6.8-i386/versions/2.3.0/providers/parallels.box -[centos_68_32_vbox]: https://atlas.hashicorp.com/bento/boxes/centos-6.8-i386/versions/2.3.0/providers/virtualbox.box -[centos_68_32_vmware]: https://atlas.hashicorp.com/bento/boxes/centos-6.8-i386/versions/2.3.0/providers/vmware_desktop.box -[centos_68_64_prl]: https://atlas.hashicorp.com/bento/boxes/centos-6.8/versions/2.3.0/providers/parallels.box -[centos_68_64_vbox]: https://atlas.hashicorp.com/bento/boxes/centos-6.8/versions/2.3.0/providers/virtualbox.box -[centos_68_64_vmware]: https://atlas.hashicorp.com/bento/boxes/centos-6.8/versions/2.3.0/providers/vmware_desktop.box -[centos_72_64_prl]: https://atlas.hashicorp.com/bento/boxes/centos-7.2/versions/2.3.0/providers/parallels.box -[centos_72_64_vbox]: https://atlas.hashicorp.com/bento/boxes/centos-7.2/versions/2.3.0/providers/virtualbox.box -[centos_72_64_vmware]: https://atlas.hashicorp.com/bento/boxes/centos-7.2/versions/2.3.0/providers/vmware_desktop.box -[debian_711_32_prl]: https://atlas.hashicorp.com/bento/boxes/debian-7.11-i386/versions/2.3.0/providers/parallels.box -[debian_711_32_vbox]: https://atlas.hashicorp.com/bento/boxes/debian-7.11-i386/versions/2.3.0/providers/virtualbox.box -[debian_711_32_vmware]: https://atlas.hashicorp.com/bento/boxes/debian-7.11-i386/versions/2.3.0/providers/vmware_desktop.box -[debian_711_64_prl]: https://atlas.hashicorp.com/bento/boxes/debian-7.11/versions/2.3.0/providers/parallels.box -[debian_711_64_vbox]: https://atlas.hashicorp.com/bento/boxes/debian-7.11/versions/2.3.0/providers/virtualbox.box -[debian_711_64_vmware]: https://atlas.hashicorp.com/bento/boxes/debian-7.11/versions/2.3.0/providers/vmware_desktop.box -[debian_86_32_prl]: https://atlas.hashicorp.com/bento/boxes/debian-8.6-i386/versions/2.3.0/providers/parallels.box -[debian_86_32_vbox]: https://atlas.hashicorp.com/bento/boxes/debian-8.6-i386/versions/2.3.0/providers/virtualbox.box -[debian_86_32_vmware]: https://atlas.hashicorp.com/bento/boxes/debian-8.6-i386/versions/2.3.0/providers/vmware_desktop.box -[debian_86_64_prl]: https://atlas.hashicorp.com/bento/boxes/debian-8.6/versions/2.3.0/providers/parallels.box -[debian_86_64_vbox]: https://atlas.hashicorp.com/bento/boxes/debian-8.6/versions/2.3.0/providers/virtualbox.box -[debian_86_64_vmware]: https://atlas.hashicorp.com/bento/boxes/debian-8.6/versions/2.3.0/providers/vmware_desktop.box -[fedora_23_64_prl]: https://atlas.hashicorp.com/bento/boxes/fedora-23/versions/2.3.0/providers/parallels.box -[fedora_23_64_vbox]: https://atlas.hashicorp.com/bento/boxes/fedora-23/versions/2.3.0/providers/virtualbox.box -[fedora_23_64_vmware]: https://atlas.hashicorp.com/bento/boxes/fedora-23/versions/2.3.0/providers/vmware_desktop.box -[fedora_24_64_prl]: https://atlas.hashicorp.com/bento/boxes/fedora-24/versions/2.3.0/providers/parallels.box -[fedora_24_64_vbox]: https://atlas.hashicorp.com/bento/boxes/fedora-24/versions/2.3.0/providers/virtualbox.box -[fedora_24_64_vmware]: https://atlas.hashicorp.com/bento/boxes/fedora-24/versions/2.3.0/providers/vmware_desktop.box -[fedora_25_64_prl]: https://atlas.hashicorp.com/bento/boxes/fedora-25/versions/2.3.0/providers/parallels.box -[fedora_25_64_vbox]: https://atlas.hashicorp.com/bento/boxes/fedora-25/versions/2.3.0/providers/virtualbox.box -[fedora_25_64_vmware]: https://atlas.hashicorp.com/bento/boxes/fedora-25/versions/2.3.0/providers/vmware_desktop.box -[freebsd_93_64_prl]: https://atlas.hashicorp.com/bento/boxes/freebsd-9.3/versions/2.3.0/providers/parallels.box -[freebsd_93_64_vbox]: https://atlas.hashicorp.com/bento/boxes/freebsd-9.3/versions/2.3.0/providers/virtualbox.box -[freebsd_93_64_vmware]: https://atlas.hashicorp.com/bento/boxes/freebsd-9.3/versions/2.3.0/providers/vmware_desktop.box -[freebsd_103_64_prl]: https://atlas.hashicorp.com/bento/boxes/freebsd-10.3/versions/2.3.0/providers/parallels.box -[freebsd_103_64_vbox]: https://atlas.hashicorp.com/bento/boxes/freebsd-10.3/versions/2.3.0/providers/virtualbox.box -[freebsd_103_64_vmware]: https://atlas.hashicorp.com/bento/boxes/freebsd-10.3/versions/2.3.0/providers/vmware_desktop.box -[freebsd_110_64_prl]: https://atlas.hashicorp.com/bento/boxes/freebsd-11.0/versions/2.3.0/providers/parallels.box -[freebsd_110_64_vbox]: https://atlas.hashicorp.com/bento/boxes/freebsd-11.0/versions/2.3.0/providers/virtualbox.box -[freebsd_110_64_vmware]: https://atlas.hashicorp.com/bento/boxes/freebsd-11.0/versions/2.3.0/providers/vmware_desktop.box -[omnios_r151018_64_vbox]: https://atlas.hashicorp.com/bento/boxes/omnios-r151018/versions/2.3.0/providers/virtualbox.box -[oracle_511_32_prl]: https://atlas.hashicorp.com/bento/boxes/oracle-5.11-i386/versions/2.3.0/providers/parallels.box -[oracle_511_32_vbox]: https://atlas.hashicorp.com/bento/boxes/oracle-5.11-i386/versions/2.3.0/providers/virtualbox.box -[oracle_511_32_vmware]: https://atlas.hashicorp.com/bento/boxes/oracle-5.11-i386/versions/2.3.0/providers/vmware_desktop.box -[oracle_511_64_prl]: https://atlas.hashicorp.com/bento/boxes/oracle-5.11/versions/2.3.0/providers/parallels.box -[oracle_511_64_vbox]: https://atlas.hashicorp.com/bento/boxes/oracle-5.11/versions/2.3.0/providers/virtualbox.box -[oracle_511_64_vmware]: https://atlas.hashicorp.com/bento/boxes/oracle-5.11/versions/2.3.0/providers/vmware_desktop.box -[oracle_68_32_prl]: https://atlas.hashicorp.com/bento/boxes/oracle-6.8-i386/versions/2.3.0/providers/parallels.box -[oracle_68_32_vbox]: https://atlas.hashicorp.com/bento/boxes/oracle-6.8-i386/versions/2.3.0/providers/virtualbox.box -[oracle_68_32_vmware]: https://atlas.hashicorp.com/bento/boxes/oracle-6.8-i386/versions/2.3.0/providers/vmware_desktop.box -[oracle_68_64_prl]: https://atlas.hashicorp.com/bento/boxes/oracle-6.8/versions/2.3.0/providers/parallels.box -[oracle_68_64_vbox]: https://atlas.hashicorp.com/bento/boxes/oracle-6.8/versions/2.3.0/providers/virtualbox.box -[oracle_68_64_vmware]: https://atlas.hashicorp.com/bento/boxes/oracle-6.8/versions/2.3.0/providers/vmware_desktop.box -[oracle_73_64_prl]: https://atlas.hashicorp.com/bento/boxes/oracle-7.3/versions/2.3.0/providers/parallels.box -[oracle_73_64_vbox]: https://atlas.hashicorp.com/bento/boxes/oracle-7.3/versions/2.3.0/providers/virtualbox.box -[oracle_73_64_vmware]: https://atlas.hashicorp.com/bento/boxes/oracle-7.3/versions/2.3.0/providers/vmware_desktop.box -[osuse_132_32_prl]: https://atlas.hashicorp.com/bento/boxes/opensuse-13.2-i386/versions/2.3.0/providers/parallels.box -[osuse_132_32_vbox]: https://atlas.hashicorp.com/bento/boxes/opensuse-13.2-i386/versions/2.3.0/providers/virtualbox.box -[osuse_132_32_vmware]: https://atlas.hashicorp.com/bento/boxes/opensuse-13.2-i386/versions/2.3.0/providers/vmware.box -[osuse_132_64_prl]: https://atlas.hashicorp.com/bento/boxes/opensuse-13.2/versions/2.3.0/providers/parallels.box -[osuse_132_64_vbox]: https://atlas.hashicorp.com/bento/boxes/opensuse-13.2/versions/2.3.0/providers/virtualbox.box -[osuse_132_64_vmware]: https://atlas.hashicorp.com/bento/boxes/opensuse-13.2/versions/2.3.0/providers/vmware_desktop.box -[leap_422_64_prl]: https://atlas.hashicorp.com/bento/boxes/opensuse-leap-42.2/versions/2.3.0/providers/parallels.box -[leap_422_64_vbox]: https://atlas.hashicorp.com/bento/boxes/opensuse-leap-42.2/versions/2.3.0/providers/virtualbox.box -[leap_422_64_vmware]: https://atlas.hashicorp.com/bento/boxes/opensuse-leap-42.2/versions/2.3.0/providers/vmware_desktop.box -[ubuntu_1204_32_prl]: https://atlas.hashicorp.com/bento/boxes/ubuntu-12.04-i386/versions/2.3.0/providers/parallels.box -[ubuntu_1204_32_vbox]: https://atlas.hashicorp.com/bento/boxes/ubuntu-12.04-i386/versions/2.3.0/providers/virtualbox.box -[ubuntu_1204_32_vmware]: https://atlas.hashicorp.com/bento/boxes/ubuntu-12.04-i386/versions/2.3.0/providers/vmware_desktop.box -[ubuntu_1204_64_prl]: https://atlas.hashicorp.com/bento/boxes/ubuntu-12.04/versions/2.3.0/providers/parallels.box -[ubuntu_1204_64_vbox]: https://atlas.hashicorp.com/bento/boxes/ubuntu-12.04/versions/2.3.0/providers/virtualbox.box -[ubuntu_1204_64_vmware]: https://atlas.hashicorp.com/bento/boxes/ubuntu-12.04/versions/2.3.0/providers/vmware_desktop.box -[ubuntu_1404_32_prl]: https://atlas.hashicorp.com/bento/boxes/ubuntu-14.04-i386/versions/2.3.0/providers/parallels.box -[ubuntu_1404_32_vbox]: https://atlas.hashicorp.com/bento/boxes/ubuntu-14.04-i386/versions/2.3.0/providers/virtualbox.box -[ubuntu_1404_32_vmware]: https://atlas.hashicorp.com/bento/boxes/ubuntu-14.04-i386/versions/2.3.0/providers/vmware_desktop.box -[ubuntu_1404_64_prl]: https://atlas.hashicorp.com/bento/boxes/ubuntu-14.04/versions/2.3.0/providers/parallels.box -[ubuntu_1404_64_vbox]: https://atlas.hashicorp.com/bento/boxes/ubuntu-14.04/versions/2.3.0/providers/virtualbox.box -[ubuntu_1404_64_vmware]: https://atlas.hashicorp.com/bento/boxes/ubuntu-14.04/versions/2.3.0/providers/vmware_desktop.box -[ubuntu_1604_32_prl]: https://atlas.hashicorp.com/bento/boxes/ubuntu-16.04-i386/versions/2.3.0/providers/parallels.box -[ubuntu_1604_32_vbox]: https://atlas.hashicorp.com/bento/boxes/ubuntu-16.04-i386/versions/2.3.0/providers/virtualbox.box -[ubuntu_1604_32_vmware]: https://atlas.hashicorp.com/bento/boxes/ubuntu-16.04-i386/versions/2.3.0/providers/vmware_desktop.box -[ubuntu_1604_64_prl]: https://atlas.hashicorp.com/bento/boxes/ubuntu-16.04/versions/2.3.0/providers/parallels.box -[ubuntu_1604_64_vbox]: https://atlas.hashicorp.com/bento/boxes/ubuntu-16.04/versions/2.3.0/providers/virtualbox.box -[ubuntu_1604_64_vmware]: https://atlas.hashicorp.com/bento/boxes/ubuntu-16.04/versions/2.3.0/providers/vmware_desktop.box -[ubuntu_1610_32_prl]: https://atlas.hashicorp.com/bento/boxes/ubuntu-16.10-i386/versions/2.3.0/providers/parallels.box -[ubuntu_1610_32_vbox]: https://atlas.hashicorp.com/bento/boxes/ubuntu-16.10-i386/versions/2.3.0/providers/virtualbox.box -[ubuntu_1610_32_vmware]: https://atlas.hashicorp.com/bento/boxes/ubuntu-16.10-i386/versions/2.3.0/providers/vmware_desktop.box -[ubuntu_1610_64_prl]: https://atlas.hashicorp.com/bento/boxes/ubuntu-16.10/versions/2.3.0/providers/parallels.box -[ubuntu_1610_64_vbox]: https://atlas.hashicorp.com/bento/boxes/ubuntu-16.10/versions/2.3.0/providers/virtualbox.box -[ubuntu_1610_64_vmware]: https://atlas.hashicorp.com/bento/boxes/ubuntu-16.10/versions/2.3.0/providers/vmware_desktop.box +[centos_511_32_prl]: https://atlas.hashicorp.com/bento/boxes/centos-5.11-i386/versions/2.3.1/providers/parallels.box +[centos_511_32_vbox]: https://atlas.hashicorp.com/bento/boxes/centos-5.11-i386/versions/2.3.1/providers/virtualbox.box +[centos_511_32_vmware]: https://atlas.hashicorp.com/bento/boxes/centos-5.11-i386/versions/2.3.1/providers/vmware_desktop.box +[centos_511_64_prl]: https://atlas.hashicorp.com/bento/boxes/centos-5.11/versions/2.3.1/providers/parallels.box +[centos_511_64_vbox]: https://atlas.hashicorp.com/bento/boxes/centos-5.11/versions/2.3.1/providers/virtualbox.box +[centos_511_64_vmware]: https://atlas.hashicorp.com/bento/boxes/centos-5.11/versions/2.3.1/providers/vmware_desktop.box +[centos_68_32_prl]: https://atlas.hashicorp.com/bento/boxes/centos-6.8-i386/versions/2.3.1/providers/parallels.box +[centos_68_32_vbox]: https://atlas.hashicorp.com/bento/boxes/centos-6.8-i386/versions/2.3.1/providers/virtualbox.box +[centos_68_32_vmware]: https://atlas.hashicorp.com/bento/boxes/centos-6.8-i386/versions/2.3.1/providers/vmware_desktop.box +[centos_68_64_prl]: https://atlas.hashicorp.com/bento/boxes/centos-6.8/versions/2.3.1/providers/parallels.box +[centos_68_64_vbox]: https://atlas.hashicorp.com/bento/boxes/centos-6.8/versions/2.3.1/providers/virtualbox.box +[centos_68_64_vmware]: https://atlas.hashicorp.com/bento/boxes/centos-6.8/versions/2.3.1/providers/vmware_desktop.box +[centos_73_64_prl]: https://atlas.hashicorp.com/bento/boxes/centos-7.3/versions/2.3.2/providers/parallels.box +[centos_73_64_vbox]: https://atlas.hashicorp.com/bento/boxes/centos-7.3/versions/2.3.2/providers/virtualbox.box +[centos_73_64_vmware]: https://atlas.hashicorp.com/bento/boxes/centos-7.3/versions/2.3.2/providers/vmware_desktop.box +[debian_711_32_prl]: https://atlas.hashicorp.com/bento/boxes/debian-7.11-i386/versions/2.3.1/providers/parallels.box +[debian_711_32_vbox]: https://atlas.hashicorp.com/bento/boxes/debian-7.11-i386/versions/2.3.1/providers/virtualbox.box +[debian_711_32_vmware]: https://atlas.hashicorp.com/bento/boxes/debian-7.11-i386/versions/2.3.1/providers/vmware_desktop.box +[debian_711_64_prl]: https://atlas.hashicorp.com/bento/boxes/debian-7.11/versions/2.3.1/providers/parallels.box +[debian_711_64_vbox]: https://atlas.hashicorp.com/bento/boxes/debian-7.11/versions/2.3.1/providers/virtualbox.box +[debian_711_64_vmware]: https://atlas.hashicorp.com/bento/boxes/debian-7.11/versions/2.3.1/providers/vmware_desktop.box +[debian_86_32_prl]: https://atlas.hashicorp.com/bento/boxes/debian-8.6-i386/versions/2.3.1/providers/parallels.box +[debian_86_32_vbox]: https://atlas.hashicorp.com/bento/boxes/debian-8.6-i386/versions/2.3.1/providers/virtualbox.box +[debian_86_32_vmware]: https://atlas.hashicorp.com/bento/boxes/debian-8.6-i386/versions/2.3.1/providers/vmware_desktop.box +[debian_86_64_prl]: https://atlas.hashicorp.com/bento/boxes/debian-8.6/versions/2.3.1/providers/parallels.box +[debian_86_64_vbox]: https://atlas.hashicorp.com/bento/boxes/debian-8.6/versions/2.3.1/providers/virtualbox.box +[debian_86_64_vmware]: https://atlas.hashicorp.com/bento/boxes/debian-8.6/versions/2.3.1/providers/vmware_desktop.box +[fedora_23_64_prl]: https://atlas.hashicorp.com/bento/boxes/fedora-23/versions/2.3.1/providers/parallels.box +[fedora_23_64_vbox]: https://atlas.hashicorp.com/bento/boxes/fedora-23/versions/2.3.1/providers/virtualbox.box +[fedora_23_64_vmware]: https://atlas.hashicorp.com/bento/boxes/fedora-23/versions/2.3.1/providers/vmware_desktop.box +[fedora_24_64_prl]: https://atlas.hashicorp.com/bento/boxes/fedora-24/versions/2.3.1/providers/parallels.box +[fedora_24_64_vbox]: https://atlas.hashicorp.com/bento/boxes/fedora-24/versions/2.3.1/providers/virtualbox.box +[fedora_24_64_vmware]: https://atlas.hashicorp.com/bento/boxes/fedora-24/versions/2.3.1/providers/vmware_desktop.box +[fedora_25_64_prl]: https://atlas.hashicorp.com/bento/boxes/fedora-25/versions/2.3.1/providers/parallels.box +[fedora_25_64_vbox]: https://atlas.hashicorp.com/bento/boxes/fedora-25/versions/2.3.1/providers/virtualbox.box +[fedora_25_64_vmware]: https://atlas.hashicorp.com/bento/boxes/fedora-25/versions/2.3.1/providers/vmware_desktop.box +[freebsd_93_64_prl]: https://atlas.hashicorp.com/bento/boxes/freebsd-9.3/versions/2.3.1/providers/parallels.box +[freebsd_93_64_vbox]: https://atlas.hashicorp.com/bento/boxes/freebsd-9.3/versions/2.3.1/providers/virtualbox.box +[freebsd_93_64_vmware]: https://atlas.hashicorp.com/bento/boxes/freebsd-9.3/versions/2.3.1/providers/vmware_desktop.box +[freebsd_103_64_prl]: https://atlas.hashicorp.com/bento/boxes/freebsd-10.3/versions/2.3.1/providers/parallels.box +[freebsd_103_64_vbox]: https://atlas.hashicorp.com/bento/boxes/freebsd-10.3/versions/2.3.1/providers/virtualbox.box +[freebsd_103_64_vmware]: https://atlas.hashicorp.com/bento/boxes/freebsd-10.3/versions/2.3.1/providers/vmware_desktop.box +[freebsd_110_64_prl]: https://atlas.hashicorp.com/bento/boxes/freebsd-11.0/versions/2.3.1/providers/parallels.box +[freebsd_110_64_vbox]: https://atlas.hashicorp.com/bento/boxes/freebsd-11.0/versions/2.3.1/providers/virtualbox.box +[freebsd_110_64_vmware]: https://atlas.hashicorp.com/bento/boxes/freebsd-11.0/versions/2.3.1/providers/vmware_desktop.box +[omnios_r151018_64_vbox]: https://atlas.hashicorp.com/bento/boxes/omnios-r151018/versions/2.3.1/providers/virtualbox.box +[oracle_511_32_prl]: https://atlas.hashicorp.com/bento/boxes/oracle-5.11-i386/versions/2.3.1/providers/parallels.box +[oracle_511_32_vbox]: https://atlas.hashicorp.com/bento/boxes/oracle-5.11-i386/versions/2.3.1/providers/virtualbox.box +[oracle_511_32_vmware]: https://atlas.hashicorp.com/bento/boxes/oracle-5.11-i386/versions/2.3.1/providers/vmware_desktop.box +[oracle_511_64_prl]: https://atlas.hashicorp.com/bento/boxes/oracle-5.11/versions/2.3.1/providers/parallels.box +[oracle_511_64_vbox]: https://atlas.hashicorp.com/bento/boxes/oracle-5.11/versions/2.3.1/providers/virtualbox.box +[oracle_511_64_vmware]: https://atlas.hashicorp.com/bento/boxes/oracle-5.11/versions/2.3.1/providers/vmware_desktop.box +[oracle_68_32_prl]: https://atlas.hashicorp.com/bento/boxes/oracle-6.8-i386/versions/2.3.1/providers/parallels.box +[oracle_68_32_vbox]: https://atlas.hashicorp.com/bento/boxes/oracle-6.8-i386/versions/2.3.1/providers/virtualbox.box +[oracle_68_32_vmware]: https://atlas.hashicorp.com/bento/boxes/oracle-6.8-i386/versions/2.3.1/providers/vmware_desktop.box +[oracle_68_64_prl]: https://atlas.hashicorp.com/bento/boxes/oracle-6.8/versions/2.3.1/providers/parallels.box +[oracle_68_64_vbox]: https://atlas.hashicorp.com/bento/boxes/oracle-6.8/versions/2.3.1/providers/virtualbox.box +[oracle_68_64_vmware]: https://atlas.hashicorp.com/bento/boxes/oracle-6.8/versions/2.3.1/providers/vmware_desktop.box +[oracle_73_64_prl]: https://atlas.hashicorp.com/bento/boxes/oracle-7.3/versions/2.3.1/providers/parallels.box +[oracle_73_64_vbox]: https://atlas.hashicorp.com/bento/boxes/oracle-7.3/versions/2.3.1/providers/virtualbox.box +[oracle_73_64_vmware]: https://atlas.hashicorp.com/bento/boxes/oracle-7.3/versions/2.3.1/providers/vmware_desktop.box +[osuse_132_32_prl]: https://atlas.hashicorp.com/bento/boxes/opensuse-13.2-i386/versions/2.3.1/providers/parallels.box +[osuse_132_32_vbox]: https://atlas.hashicorp.com/bento/boxes/opensuse-13.2-i386/versions/2.3.1/providers/virtualbox.box +[osuse_132_32_vmware]: https://atlas.hashicorp.com/bento/boxes/opensuse-13.2-i386/versions/2.3.1/providers/vmware.box +[osuse_132_64_prl]: https://atlas.hashicorp.com/bento/boxes/opensuse-13.2/versions/2.3.1/providers/parallels.box +[osuse_132_64_vbox]: https://atlas.hashicorp.com/bento/boxes/opensuse-13.2/versions/2.3.1/providers/virtualbox.box +[osuse_132_64_vmware]: https://atlas.hashicorp.com/bento/boxes/opensuse-13.2/versions/2.3.1/providers/vmware_desktop.box +[leap_422_64_prl]: https://atlas.hashicorp.com/bento/boxes/opensuse-leap-42.2/versions/2.3.1/providers/parallels.box +[leap_422_64_vbox]: https://atlas.hashicorp.com/bento/boxes/opensuse-leap-42.2/versions/2.3.1/providers/virtualbox.box +[leap_422_64_vmware]: https://atlas.hashicorp.com/bento/boxes/opensuse-leap-42.2/versions/2.3.1/providers/vmware_desktop.box +[ubuntu_1204_32_prl]: https://atlas.hashicorp.com/bento/boxes/ubuntu-12.04-i386/versions/2.3.1/providers/parallels.box +[ubuntu_1204_32_vbox]: https://atlas.hashicorp.com/bento/boxes/ubuntu-12.04-i386/versions/2.3.1/providers/virtualbox.box +[ubuntu_1204_32_vmware]: https://atlas.hashicorp.com/bento/boxes/ubuntu-12.04-i386/versions/2.3.1/providers/vmware_desktop.box +[ubuntu_1204_64_prl]: https://atlas.hashicorp.com/bento/boxes/ubuntu-12.04/versions/2.3.1/providers/parallels.box +[ubuntu_1204_64_vbox]: https://atlas.hashicorp.com/bento/boxes/ubuntu-12.04/versions/2.3.1/providers/virtualbox.box +[ubuntu_1204_64_vmware]: https://atlas.hashicorp.com/bento/boxes/ubuntu-12.04/versions/2.3.1/providers/vmware_desktop.box +[ubuntu_1404_32_prl]: https://atlas.hashicorp.com/bento/boxes/ubuntu-14.04-i386/versions/2.3.1/providers/parallels.box +[ubuntu_1404_32_vbox]: https://atlas.hashicorp.com/bento/boxes/ubuntu-14.04-i386/versions/2.3.1/providers/virtualbox.box +[ubuntu_1404_32_vmware]: https://atlas.hashicorp.com/bento/boxes/ubuntu-14.04-i386/versions/2.3.1/providers/vmware_desktop.box +[ubuntu_1404_64_prl]: https://atlas.hashicorp.com/bento/boxes/ubuntu-14.04/versions/2.3.1/providers/parallels.box +[ubuntu_1404_64_vbox]: https://atlas.hashicorp.com/bento/boxes/ubuntu-14.04/versions/2.3.1/providers/virtualbox.box +[ubuntu_1404_64_vmware]: https://atlas.hashicorp.com/bento/boxes/ubuntu-14.04/versions/2.3.1/providers/vmware_desktop.box +[ubuntu_1604_32_prl]: https://atlas.hashicorp.com/bento/boxes/ubuntu-16.04-i386/versions/2.3.1/providers/parallels.box +[ubuntu_1604_32_vbox]: https://atlas.hashicorp.com/bento/boxes/ubuntu-16.04-i386/versions/2.3.1/providers/virtualbox.box +[ubuntu_1604_32_vmware]: https://atlas.hashicorp.com/bento/boxes/ubuntu-16.04-i386/versions/2.3.1/providers/vmware_desktop.box +[ubuntu_1604_64_prl]: https://atlas.hashicorp.com/bento/boxes/ubuntu-16.04/versions/2.3.1/providers/parallels.box +[ubuntu_1604_64_vbox]: https://atlas.hashicorp.com/bento/boxes/ubuntu-16.04/versions/2.3.1/providers/virtualbox.box +[ubuntu_1604_64_vmware]: https://atlas.hashicorp.com/bento/boxes/ubuntu-16.04/versions/2.3.1/providers/vmware_desktop.box +[ubuntu_1610_32_prl]: https://atlas.hashicorp.com/bento/boxes/ubuntu-16.10-i386/versions/2.3.1/providers/parallels.box +[ubuntu_1610_32_vbox]: https://atlas.hashicorp.com/bento/boxes/ubuntu-16.10-i386/versions/2.3.1/providers/virtualbox.box +[ubuntu_1610_32_vmware]: https://atlas.hashicorp.com/bento/boxes/ubuntu-16.10-i386/versions/2.3.1/providers/vmware_desktop.box +[ubuntu_1610_64_prl]: https://atlas.hashicorp.com/bento/boxes/ubuntu-16.10/versions/2.3.1/providers/parallels.box +[ubuntu_1610_64_vbox]: https://atlas.hashicorp.com/bento/boxes/ubuntu-16.10/versions/2.3.1/providers/virtualbox.box +[ubuntu_1610_64_vmware]: https://atlas.hashicorp.com/bento/boxes/ubuntu-16.10/versions/2.3.1/providers/vmware_desktop.box From ca0a1f6e5569f7040bd0e3c32df7a88d5efc5245 Mon Sep 17 00:00:00 2001 From: Kentaro Hayashi <hayashi@clear-code.com> Date: Sat, 21 Jan 2017 15:30:18 +0900 Subject: [PATCH 0589/1622] Support Debian 8.7.1 See https://lists.debian.org/debian-announce/2017/msg00000.html --- debian-8.7-amd64.json | 245 ++++++++++++++++++++++++++++++++++++++++++ debian-8.7-i386.json | 245 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 490 insertions(+) create mode 100644 debian-8.7-amd64.json create mode 100644 debian-8.7-i386.json diff --git a/debian-8.7-amd64.json b/debian-8.7-amd64.json new file mode 100644 index 000000000..405cd9664 --- /dev/null +++ b/debian-8.7-amd64.json @@ -0,0 +1,245 @@ +{ + "builders": [ + { + "boot_command": [ + "<esc><wait>", + "install <wait>", + " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}} <wait>", + "debian-installer=en_US.UTF-8 <wait>", + "auto <wait>", + "locale=en_US.UTF-8 <wait>", + "kbd-chooser/method=us <wait>", + "keyboard-configuration/xkb-keymap=us <wait>", + "netcfg/get_hostname={{ .Name }} <wait>", + "netcfg/get_domain=vagrantup.com <wait>", + "fb=false <wait>", + "debconf/frontend=noninteractive <wait>", + "console-setup/ask_detect=false <wait>", + "console-keymaps-at/keymap=us <wait>", + "grub-installer/bootdev=/dev/sda <wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": "{{user `disk_size`}}", + "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "guest_os_type": "Debian_64", + "hard_drive_interface": "sata", + "headless": "{{ user `headless` }}", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-virtualbox", + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "virtualbox-iso", + "vboxmanage": [ + [ + "modifyvm", + "{{.Name}}", + "--memory", + "{{ user `memory` }}" + ], + [ + "modifyvm", + "{{.Name}}", + "--cpus", + "{{ user `cpus` }}" + ] + ], + "virtualbox_version_file": ".vbox_version", + "vm_name": "{{ user `template` }}" + }, + { + "boot_command": [ + "<esc><wait>", + "install <wait>", + " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}} <wait>", + "debian-installer=en_US.UTF-8 <wait>", + "auto <wait>", + "locale=en_US.UTF-8 <wait>", + "kbd-chooser/method=us <wait>", + "keyboard-configuration/xkb-keymap=us <wait>", + "netcfg/get_hostname={{ .Name }} <wait>", + "netcfg/get_domain=vagrantup.com <wait>", + "fb=false <wait>", + "debconf/frontend=noninteractive <wait>", + "console-setup/ask_detect=false <wait>", + "console-keymaps-at/keymap=us <wait>", + "grub-installer/bootdev=/dev/sda <wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": "{{user `disk_size`}}", + "guest_os_type": "debian8-64", + "headless": "{{ user `headless` }}", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-vmware", + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "tools_upload_flavor": "linux", + "type": "vmware-iso", + "vm_name": "{{ user `template` }}", + "vmx_data": { + "cpuid.coresPerSocket": "1", + "ethernet0.pciSlotNumber": "32", + "memsize": "{{ user `memory` }}", + "numvcpus": "{{ user `cpus` }}" + } + }, + { + "boot_command": [ + "<esc><wait>", + "install <wait>", + " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}} <wait>", + "debian-installer=en_US.UTF-8 <wait>", + "auto <wait>", + "locale=en_US.UTF-8 <wait>", + "kbd-chooser/method=us <wait>", + "keyboard-configuration/xkb-keymap=us <wait>", + "netcfg/get_hostname={{ .Name }} <wait>", + "netcfg/get_domain=vagrantup.com <wait>", + "fb=false <wait>", + "debconf/frontend=noninteractive <wait>", + "console-setup/ask_detect=false <wait>", + "console-keymaps-at/keymap=us <wait>", + "grub-installer/bootdev=/dev/sda <wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": "{{user `disk_size`}}", + "guest_os_type": "debian", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-parallels", + "parallels_tools_flavor": "lin", + "prlctl": [ + [ + "set", + "{{.Name}}", + "--memsize", + "{{ user `memory` }}" + ], + [ + "set", + "{{.Name}}", + "--cpus", + "{{ user `cpus` }}" + ] + ], + "prlctl_version_file": ".prlctl_version", + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "parallels-iso", + "vm_name": "{{ user `template` }}" + }, + { + "boot_command": [ + "<esc><wait>", + "install <wait>", + " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}} <wait>", + "debian-installer=en_US.UTF-8 <wait>", + "auto <wait>", + "locale=en_US.UTF-8 <wait>", + "kbd-chooser/method=us <wait>", + "keyboard-configuration/xkb-keymap=us <wait>", + "netcfg/get_hostname={{ .Name }} <wait>", + "netcfg/get_domain=vagrantup.com <wait>", + "fb=false <wait>", + "debconf/frontend=noninteractive <wait>", + "console-setup/ask_detect=false <wait>", + "console-keymaps-at/keymap=us <wait>", + "grub-installer/bootdev=/dev/vda <wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": "{{user `disk_size`}}", + "headless": "{{ user `headless` }}", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-qemu", + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "qemu", + "vm_name": "{{ user `template` }}" + } + ], + "post-processors": [ + { + "output": "builds/{{user `box_basename`}}.{{.Provider}}.box", + "type": "vagrant" + } + ], + "provisioners": [ + { + "destination": "/tmp/bento-metadata.json", + "source": "{{user `metadata`}}", + "type": "file" + }, + { + "environment_vars": [ + "HOME_DIR=/home/vagrant", + "http_proxy={{user `http_proxy`}}", + "https_proxy={{user `https_proxy`}}", + "no_proxy={{user `no_proxy`}}" + ], + "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", + "scripts": [ + "scripts/common/metadata.sh", + "scripts/debian/update.sh", + "scripts/common/sshd.sh", + "scripts/debian/networking.sh", + "scripts/debian/sudoers.sh", + "scripts/common/vagrant.sh", + "scripts/debian/systemd.sh", + "scripts/common/virtualbox.sh", + "scripts/common/vmware.sh", + "scripts/common/parallels.sh", + "scripts/debian/cleanup.sh", + "scripts/common/minimize.sh" + ], + "type": "shell" + } + ], + "variables": { + "box_basename": "debian-8.7", + "build_timestamp": "{{isotime \"20060102150405\"}}", + "cpus": "1", + "disk_size": "40960", + "git_revision": "__unknown_git_revision__", + "headless": "", + "http_proxy": "{{env `http_proxy`}}", + "https_proxy": "{{env `https_proxy`}}", + "iso_checksum": "065c90fa72ed51b7ce06ecfdc660b083e7b0c40bbf63fd58559c8bf7df7752da", + "iso_checksum_type": "sha256", + "iso_name": "debian-8.7.1-amd64-CD-1.iso", + "memory": "512", + "metadata": "floppy/dummy_metadata.json", + "mirror": "http://cdimage.debian.org/cdimage/release", + "mirror_directory": "8.7.1/amd64/iso-cd", + "name": "debian-8.7", + "no_proxy": "{{env `no_proxy`}}", + "preseed_path": "debian-8/preseed.cfg", + "template": "debian-8.7-amd64", + "version": "2.1.TIMESTAMP" + } +} diff --git a/debian-8.7-i386.json b/debian-8.7-i386.json new file mode 100644 index 000000000..f17a8d80c --- /dev/null +++ b/debian-8.7-i386.json @@ -0,0 +1,245 @@ +{ + "builders": [ + { + "boot_command": [ + "<esc><wait>", + "install <wait>", + " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}} <wait>", + "debian-installer=en_US.UTF-8 <wait>", + "auto <wait>", + "locale=en_US.UTF-8 <wait>", + "kbd-chooser/method=us <wait>", + "keyboard-configuration/xkb-keymap=us <wait>", + "netcfg/get_hostname={{ .Name }} <wait>", + "netcfg/get_domain=vagrantup.com <wait>", + "fb=false <wait>", + "debconf/frontend=noninteractive <wait>", + "console-setup/ask_detect=false <wait>", + "console-keymaps-at/keymap=us <wait>", + "grub-installer/bootdev=/dev/sda <wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": "{{user `disk_size`}}", + "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "guest_os_type": "Debian", + "hard_drive_interface": "sata", + "headless": "{{ user `headless` }}", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-virtualbox", + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "virtualbox-iso", + "vboxmanage": [ + [ + "modifyvm", + "{{.Name}}", + "--memory", + "{{ user `memory` }}" + ], + [ + "modifyvm", + "{{.Name}}", + "--cpus", + "{{ user `cpus` }}" + ] + ], + "virtualbox_version_file": ".vbox_version", + "vm_name": "{{ user `template` }}" + }, + { + "boot_command": [ + "<esc><wait>", + "install <wait>", + " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}} <wait>", + "debian-installer=en_US.UTF-8 <wait>", + "auto <wait>", + "locale=en_US.UTF-8 <wait>", + "kbd-chooser/method=us <wait>", + "keyboard-configuration/xkb-keymap=us <wait>", + "netcfg/get_hostname={{ .Name }} <wait>", + "netcfg/get_domain=vagrantup.com <wait>", + "fb=false <wait>", + "debconf/frontend=noninteractive <wait>", + "console-setup/ask_detect=false <wait>", + "console-keymaps-at/keymap=us <wait>", + "grub-installer/bootdev=/dev/sda <wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": "{{user `disk_size`}}", + "guest_os_type": "debian8", + "headless": "{{ user `headless` }}", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-vmware", + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "tools_upload_flavor": "linux", + "type": "vmware-iso", + "vm_name": "{{ user `template` }}", + "vmx_data": { + "cpuid.coresPerSocket": "1", + "ethernet0.pciSlotNumber": "32", + "memsize": "{{ user `memory` }}", + "numvcpus": "{{ user `cpus` }}" + } + }, + { + "boot_command": [ + "<esc><wait>", + "install <wait>", + " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}} <wait>", + "debian-installer=en_US.UTF-8 <wait>", + "auto <wait>", + "locale=en_US.UTF-8 <wait>", + "kbd-chooser/method=us <wait>", + "keyboard-configuration/xkb-keymap=us <wait>", + "netcfg/get_hostname={{ .Name }} <wait>", + "netcfg/get_domain=vagrantup.com <wait>", + "fb=false <wait>", + "debconf/frontend=noninteractive <wait>", + "console-setup/ask_detect=false <wait>", + "console-keymaps-at/keymap=us <wait>", + "grub-installer/bootdev=/dev/sda <wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": "{{user `disk_size`}}", + "guest_os_type": "debian", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-parallels", + "parallels_tools_flavor": "lin", + "prlctl": [ + [ + "set", + "{{.Name}}", + "--memsize", + "{{ user `memory` }}" + ], + [ + "set", + "{{.Name}}", + "--cpus", + "{{ user `cpus` }}" + ] + ], + "prlctl_version_file": ".prlctl_version", + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "parallels-iso", + "vm_name": "{{ user `template` }}" + }, + { + "boot_command": [ + "<esc><wait>", + "install <wait>", + " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}} <wait>", + "debian-installer=en_US.UTF-8 <wait>", + "auto <wait>", + "locale=en_US.UTF-8 <wait>", + "kbd-chooser/method=us <wait>", + "keyboard-configuration/xkb-keymap=us <wait>", + "netcfg/get_hostname={{ .Name }} <wait>", + "netcfg/get_domain=vagrantup.com <wait>", + "fb=false <wait>", + "debconf/frontend=noninteractive <wait>", + "console-setup/ask_detect=false <wait>", + "console-keymaps-at/keymap=us <wait>", + "grub-installer/bootdev=/dev/vda <wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": "{{user `disk_size`}}", + "headless": "{{ user `headless` }}", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-qemu", + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "qemu", + "vm_name": "{{ user `template` }}" + } + ], + "post-processors": [ + { + "output": "builds/{{user `box_basename`}}.{{.Provider}}.box", + "type": "vagrant" + } + ], + "provisioners": [ + { + "destination": "/tmp/bento-metadata.json", + "source": "{{user `metadata`}}", + "type": "file" + }, + { + "environment_vars": [ + "HOME_DIR=/home/vagrant", + "http_proxy={{user `http_proxy`}}", + "https_proxy={{user `https_proxy`}}", + "no_proxy={{user `no_proxy`}}" + ], + "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", + "scripts": [ + "scripts/common/metadata.sh", + "scripts/debian/update.sh", + "scripts/common/sshd.sh", + "scripts/debian/networking.sh", + "scripts/debian/sudoers.sh", + "scripts/common/vagrant.sh", + "scripts/debian/systemd.sh", + "scripts/common/virtualbox.sh", + "scripts/common/vmware.sh", + "scripts/common/parallels.sh", + "scripts/debian/cleanup.sh", + "scripts/common/minimize.sh" + ], + "type": "shell" + } + ], + "variables": { + "box_basename": "debian-8.7-i386", + "build_timestamp": "{{isotime \"20060102150405\"}}", + "cpus": "1", + "disk_size": "40960", + "git_revision": "__unknown_git_revision__", + "headless": "", + "http_proxy": "{{env `http_proxy`}}", + "https_proxy": "{{env `https_proxy`}}", + "iso_checksum": "f3debfa96a024b9c1a4b342db96c6afcd0e9adb94a6144ed99e34bce110be2d5", + "iso_checksum_type": "sha256", + "iso_name": "debian-8.7.1-i386-CD-1.iso", + "memory": "512", + "metadata": "floppy/dummy_metadata.json", + "mirror": "http://cdimage.debian.org/cdimage/release", + "mirror_directory": "8.7.1/i386/iso-cd", + "name": "debian-8.7-i386", + "no_proxy": "{{env `no_proxy`}}", + "preseed_path": "debian-8/preseed.cfg", + "template": "debian-8.7-i386", + "version": "2.1.TIMESTAMP" + } +} From d07934b6a25c1b67e5526488b6efdd44a83a59be Mon Sep 17 00:00:00 2001 From: Andres Montalban <amontalban@devopx.com> Date: Tue, 31 Jan 2017 11:09:52 -0300 Subject: [PATCH 0590/1622] Fix the clean up script for FreeBSD 10.3 Signed-off-by: Andres Montalban <amontalban@devopx.com> --- scripts/freebsd/cleanup.sh | 2 ++ scripts/freebsd/minimize.sh | 18 +++++++++++++----- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/scripts/freebsd/cleanup.sh b/scripts/freebsd/cleanup.sh index 7451cc824..8b15f6feb 100644 --- a/scripts/freebsd/cleanup.sh +++ b/scripts/freebsd/cleanup.sh @@ -6,5 +6,7 @@ mkdir -p /var/db/freebsd-update/files; rm -f /var/db/freebsd-update/*-rollback; rm -rf /var/db/freebsd-update/install.*; rm -rf /boot/kernel.old; +rm -f /boot/kernel*/*.symbols; rm -rf /usr/src/*; rm -f /*.core; +rm -rf /var/cache/pkg; diff --git a/scripts/freebsd/minimize.sh b/scripts/freebsd/minimize.sh index 293926adb..4b041948f 100644 --- a/scripts/freebsd/minimize.sh +++ b/scripts/freebsd/minimize.sh @@ -4,16 +4,24 @@ case "$PACKER_BUILDER_TYPE" in qemu) exit 0 ;; esac -COMPRESSION=$(zfs get -H compression zroot | cut -f3); +major_version="`uname -r | awk -F. '{print $1}'`"; -zfs set compression=off zroot; +if [ "$major_version" -eq 10 ]; then + ZROOT="zroot" +else + ZROOT="zroot/ROOT/default" +fi + +COMPRESSION=$(zfs get -H compression $ZROOT | cut -f3); + +zfs set compression=off $ZROOT; dd if=/dev/zero of=/EMPTY bs=1m & PID=$!; -avail=$(zfs get -pH avail zroot/ROOT/default | cut -f3); +avail=$(zfs get -pH avail $ZROOT | cut -f3); while [ "$avail" -ne 0 ]; do sleep 15; - avail=$(zfs get -pH avail zroot/ROOT/default | cut -f3); + avail=$(zfs get -pH avail $ZROOT | cut -f3); done kill $PID || echo "dd already exited"; @@ -22,4 +30,4 @@ rm -f /EMPTY; # Block until the empty file has been removed, otherwise, Packer # will try to kill the box while the disk is still full and that's bad sync; -zfs set compression=$COMPRESSION zroot; +zfs set compression=$COMPRESSION $ZROOT; From 0971320b9b6060954848378745dbaf2068c9ad76 Mon Sep 17 00:00:00 2001 From: Andres Montalban <amontalban@devopx.com> Date: Tue, 31 Jan 2017 12:59:17 -0300 Subject: [PATCH 0591/1622] Fix Travis CI: travis-ci/travis-ci#5156 and travis-ci/travis-ci#5059 Signed-off-by: Andres Montalban <amontalban@devopx.com> --- .travis.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index f0b5d4694..8d53a9792 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,9 @@ +dist: trusty sudo: false +env: + - PACKER_VERSION="0.12.2" + rvm: - 2.3.1 @@ -7,7 +11,7 @@ branches: only: - master -before_install: wget --no-check-certificate https://releases.hashicorp.com/packer/0.10.2/packer_0.10.2_linux_amd64.zip && unzip -d packer packer_0.10.2_linux_amd64.zip +before_install: wget https://releases.hashicorp.com/packer/${PACKER_VERSION}/packer_${PACKER_VERSION}_linux_amd64.zip && unzip -d packer packer_${PACKER_VERSION}_linux_amd64.zip before_script: export PATH=$PATH:$PWD/packer -script: ./bin/bento normalize +script: bento normalize From 14ec246125dfcc5f194f26d4b95cd68cb7f6f7b4 Mon Sep 17 00:00:00 2001 From: Seth Thomas <cheeseplus@chef.io> Date: Wed, 22 Feb 2017 12:55:02 -0500 Subject: [PATCH 0592/1622] Normalizing (#760) * Normalizing Signed-off-by: Seth Thomas <sthomas@chef.io> * Whisper lies to TravisCI Signed-off-by: Seth Thomas <sthomas@chef.io> * Everybody do the normalize Signed-off-by: Seth Thomas <sthomas@chef.io> --- .travis.yml | 6 +- centos-5.11-i386.json | 1 + centos-5.11-x86_64.json | 1 + centos-6.8-i386.json | 1 + centos-6.8-x86_64.json | 1 + centos-7.3-x86_64.json | 7 +- debian-7.11-amd64.json | 5 +- debian-7.11-i386.json | 5 +- debian-8.6-amd64.json | 1 + debian-8.6-i386.json | 1 + debian-8.7-amd64.json | 1 + debian-8.7-i386.json | 1 + fedora-24-i386.json | 1 + fedora-24-x86_64.json | 1 + fedora-25-i386.json | 1 + fedora-25-x86_64.json | 1 + freebsd-10.3-amd64.json | 1 + freebsd-10.3-i386.json | 1 + freebsd-11.0-amd64.json | 1 + freebsd-9.3-amd64.json | 1 + freebsd-9.3-i386.json | 1 + macos-10.12.json | 22 +++++- macosx-10.10.json | 22 +++++- macosx-10.11.json | 22 +++++- macosx-10.7.json | 22 +++++- macosx-10.8.json | 22 +++++- macosx-10.9.json | 22 +++++- omnios-r151014.json | 1 + omnios-r151018.json | 1 + opensuse-13.2-i386.json | 1 + opensuse-13.2-x86_64.json | 1 + opensuse-leap-42.2-x86_64.json | 1 + oracle-5.11-i386.json | 1 + oracle-5.11-x86_64.json | 1 + oracle-6.8-i386.json | 1 + oracle-6.8-x86_64.json | 1 + oracle-7.3-x86_64.json | 1 + rhel-5.11-i386.json | 1 + rhel-5.11-x86_64.json | 1 + rhel-6.8-i386.json | 1 + rhel-6.8-x86_64.json | 1 + rhel-7.3-x86_64.json | 1 + sles-12-sp1-x86_64.json | 1 + sles-12-sp2-x86_64.json | 1 + sles-12-x86_64.json | 1 + solaris-10.11-x86.json | 1 + solaris-11-x86.json | 1 + ubuntu-12.04-amd64.json | 1 + ubuntu-12.04-i386.json | 1 + ubuntu-14.04-amd64.json | 1 + ubuntu-14.04-i386.json | 1 + ubuntu-15.10-amd64.json | 1 + ubuntu-15.10-i386.json | 1 + ubuntu-16.04-amd64.json | 1 + ubuntu-16.04-i386.json | 1 + ubuntu-16.10-amd64.json | 2 +- ubuntu-16.10-i386.json | 1 + windows-nano-tp3.json | 119 +++++++++++++++++---------------- 58 files changed, 238 insertions(+), 84 deletions(-) diff --git a/.travis.yml b/.travis.yml index 8d53a9792..f8e62ba45 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,7 +11,11 @@ branches: only: - master -before_install: wget https://releases.hashicorp.com/packer/${PACKER_VERSION}/packer_${PACKER_VERSION}_linux_amd64.zip && unzip -d packer packer_${PACKER_VERSION}_linux_amd64.zip +before_install: + - wget https://releases.hashicorp.com/packer/${PACKER_VERSION}/packer_${PACKER_VERSION}_linux_amd64.zip + - unzip -d packer packer_${PACKER_VERSION}_linux_amd64.zip + - touch VMwareTools-10.1.0-4449150.tar.gz + before_script: export PATH=$PATH:$PWD/packer script: bento normalize diff --git a/centos-5.11-i386.json b/centos-5.11-i386.json index 760b26593..0f5cbf318 100644 --- a/centos-5.11-i386.json +++ b/centos-5.11-i386.json @@ -179,3 +179,4 @@ "version": "2.1.TIMESTAMP" } } + diff --git a/centos-5.11-x86_64.json b/centos-5.11-x86_64.json index 0756f4868..54a623efb 100644 --- a/centos-5.11-x86_64.json +++ b/centos-5.11-x86_64.json @@ -185,3 +185,4 @@ "version": "2.1.TIMESTAMP" } } + diff --git a/centos-6.8-i386.json b/centos-6.8-i386.json index abf98f844..b915dfb9f 100644 --- a/centos-6.8-i386.json +++ b/centos-6.8-i386.json @@ -179,3 +179,4 @@ "version": "2.1.TIMESTAMP" } } + diff --git a/centos-6.8-x86_64.json b/centos-6.8-x86_64.json index a1ec1e8d5..883abb13b 100644 --- a/centos-6.8-x86_64.json +++ b/centos-6.8-x86_64.json @@ -179,3 +179,4 @@ "version": "2.1.TIMESTAMP" } } + diff --git a/centos-7.3-x86_64.json b/centos-7.3-x86_64.json index d2c3783f4..e77da56d1 100644 --- a/centos-7.3-x86_64.json +++ b/centos-7.3-x86_64.json @@ -136,9 +136,11 @@ }, { "destination": "/tmp/VMwareTools-10.1.0-4449150.tar.gz", + "only": [ + "vmware-iso" + ], "source": "VMwareTools-10.1.0-4449150.tar.gz", - "type": "file", - "only": ["vmware-iso"] + "type": "file" }, { "environment_vars": [ @@ -185,3 +187,4 @@ "version": "2.1.TIMESTAMP" } } + diff --git a/debian-7.11-amd64.json b/debian-7.11-amd64.json index 030d101e2..1ab8f8012 100644 --- a/debian-7.11-amd64.json +++ b/debian-7.11-amd64.json @@ -169,11 +169,11 @@ "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", "output_directory": "packer-{{user `template`}}-qemu", - "ssh_username": "vagrant", + "shutdown_command": "echo 'vagrant'|sudo -S /sbin/shutdown -hP now", "ssh_password": "vagrant", "ssh_port": 22, + "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", - "shutdown_command": "echo 'vagrant'|sudo -S /sbin/shutdown -hP now", "type": "qemu", "vm_name": "{{ user `template` }}" } @@ -237,3 +237,4 @@ "version": "2.1.TIMESTAMP" } } + diff --git a/debian-7.11-i386.json b/debian-7.11-i386.json index 9b1ec8389..89f7b154a 100644 --- a/debian-7.11-i386.json +++ b/debian-7.11-i386.json @@ -169,11 +169,11 @@ "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", "output_directory": "packer-{{user `template`}}-qemu", - "ssh_username": "vagrant", + "shutdown_command": "echo 'vagrant'|sudo -S /sbin/shutdown -hP now", "ssh_password": "vagrant", "ssh_port": 22, + "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", - "shutdown_command": "echo 'vagrant'|sudo -S /sbin/shutdown -hP now", "type": "qemu", "vm_name": "{{ user `template` }}" } @@ -237,3 +237,4 @@ "version": "2.1.TIMESTAMP" } } + diff --git a/debian-8.6-amd64.json b/debian-8.6-amd64.json index ec6480d59..508bd9ce3 100644 --- a/debian-8.6-amd64.json +++ b/debian-8.6-amd64.json @@ -243,3 +243,4 @@ "version": "2.1.TIMESTAMP" } } + diff --git a/debian-8.6-i386.json b/debian-8.6-i386.json index 75931f857..2a031c4f0 100644 --- a/debian-8.6-i386.json +++ b/debian-8.6-i386.json @@ -243,3 +243,4 @@ "version": "2.1.TIMESTAMP" } } + diff --git a/debian-8.7-amd64.json b/debian-8.7-amd64.json index 405cd9664..261b3d315 100644 --- a/debian-8.7-amd64.json +++ b/debian-8.7-amd64.json @@ -243,3 +243,4 @@ "version": "2.1.TIMESTAMP" } } + diff --git a/debian-8.7-i386.json b/debian-8.7-i386.json index f17a8d80c..926a01e2d 100644 --- a/debian-8.7-i386.json +++ b/debian-8.7-i386.json @@ -243,3 +243,4 @@ "version": "2.1.TIMESTAMP" } } + diff --git a/fedora-24-i386.json b/fedora-24-i386.json index d9f5c7baf..f36c4d6f6 100644 --- a/fedora-24-i386.json +++ b/fedora-24-i386.json @@ -177,3 +177,4 @@ "version": "2.0.TIMESTAMP" } } + diff --git a/fedora-24-x86_64.json b/fedora-24-x86_64.json index a56c7f141..5982d4551 100644 --- a/fedora-24-x86_64.json +++ b/fedora-24-x86_64.json @@ -183,3 +183,4 @@ "version": "2.0.TIMESTAMP" } } + diff --git a/fedora-25-i386.json b/fedora-25-i386.json index f1e854b1b..9d638fb16 100644 --- a/fedora-25-i386.json +++ b/fedora-25-i386.json @@ -177,3 +177,4 @@ "version": "2.0.TIMESTAMP" } } + diff --git a/fedora-25-x86_64.json b/fedora-25-x86_64.json index 96f192c03..3426e80a3 100644 --- a/fedora-25-x86_64.json +++ b/fedora-25-x86_64.json @@ -183,3 +183,4 @@ "version": "2.0.TIMESTAMP" } } + diff --git a/freebsd-10.3-amd64.json b/freebsd-10.3-amd64.json index 35f956959..167b20b48 100644 --- a/freebsd-10.3-amd64.json +++ b/freebsd-10.3-amd64.json @@ -231,3 +231,4 @@ "version": "2.1.TIMESTAMP" } } + diff --git a/freebsd-10.3-i386.json b/freebsd-10.3-i386.json index 1b6a2bd8c..004de5eb5 100644 --- a/freebsd-10.3-i386.json +++ b/freebsd-10.3-i386.json @@ -231,3 +231,4 @@ "version": "2.1.TIMESTAMP" } } + diff --git a/freebsd-11.0-amd64.json b/freebsd-11.0-amd64.json index aade77e42..5b71010f9 100644 --- a/freebsd-11.0-amd64.json +++ b/freebsd-11.0-amd64.json @@ -231,3 +231,4 @@ "version": "2.1.TIMESTAMP" } } + diff --git a/freebsd-9.3-amd64.json b/freebsd-9.3-amd64.json index 6055ccdfd..cf8d8ddbb 100644 --- a/freebsd-9.3-amd64.json +++ b/freebsd-9.3-amd64.json @@ -247,3 +247,4 @@ "version": "2.1.TIMESTAMP" } } + diff --git a/freebsd-9.3-i386.json b/freebsd-9.3-i386.json index 1582d6b79..8879d7c1f 100644 --- a/freebsd-9.3-i386.json +++ b/freebsd-9.3-i386.json @@ -247,3 +247,4 @@ "version": "2.1.TIMESTAMP" } } + diff --git a/macos-10.12.json b/macos-10.12.json index 3ca874cc4..82d78143f 100644 --- a/macos-10.12.json +++ b/macos-10.12.json @@ -163,9 +163,24 @@ "output_directory": "packer-{{user `template`}}-parallels", "parallels_tools_flavor": "mac", "prlctl": [ - ["set", "{{.Name}}", "--memsize", "{{ user `memory` }}"], - ["set", "{{.Name}}", "--cpus", "{{ user `cpus` }}"], - ["set", "{{.Name}}", "--on-window-close", "keep-running"] + [ + "set", + "{{.Name}}", + "--memsize", + "{{ user `memory` }}" + ], + [ + "set", + "{{.Name}}", + "--cpus", + "{{ user `cpus` }}" + ], + [ + "set", + "{{.Name}}", + "--on-window-close", + "keep-running" + ] ], "shutdown_command": "echo 'vagrant'| sudo -S shutdown -h now", "ssh_password": "vagrant", @@ -232,3 +247,4 @@ "version": "2.1.TIMESTAMP" } } + diff --git a/macosx-10.10.json b/macosx-10.10.json index b0ff7c28f..beb1fbd83 100644 --- a/macosx-10.10.json +++ b/macosx-10.10.json @@ -163,9 +163,24 @@ "output_directory": "packer-{{user `template`}}-parallels", "parallels_tools_flavor": "mac", "prlctl": [ - ["set", "{{.Name}}", "--memsize", "{{ user `memory` }}"], - ["set", "{{.Name}}", "--cpus", "{{ user `cpus` }}"], - ["set", "{{.Name}}", "--on-window-close", "keep-running"] + [ + "set", + "{{.Name}}", + "--memsize", + "{{ user `memory` }}" + ], + [ + "set", + "{{.Name}}", + "--cpus", + "{{ user `cpus` }}" + ], + [ + "set", + "{{.Name}}", + "--on-window-close", + "keep-running" + ] ], "shutdown_command": "echo 'vagrant'| sudo -S shutdown -h now", "ssh_password": "vagrant", @@ -232,3 +247,4 @@ "version": "2.1.TIMESTAMP" } } + diff --git a/macosx-10.11.json b/macosx-10.11.json index 633d9a20c..e495f2c97 100644 --- a/macosx-10.11.json +++ b/macosx-10.11.json @@ -163,9 +163,24 @@ "output_directory": "packer-{{user `template`}}-parallels", "parallels_tools_flavor": "mac", "prlctl": [ - ["set", "{{.Name}}", "--memsize", "{{ user `memory` }}"], - ["set", "{{.Name}}", "--cpus", "{{ user `cpus` }}"], - ["set", "{{.Name}}", "--on-window-close", "keep-running"] + [ + "set", + "{{.Name}}", + "--memsize", + "{{ user `memory` }}" + ], + [ + "set", + "{{.Name}}", + "--cpus", + "{{ user `cpus` }}" + ], + [ + "set", + "{{.Name}}", + "--on-window-close", + "keep-running" + ] ], "shutdown_command": "echo 'vagrant'| sudo -S shutdown -h now", "ssh_password": "vagrant", @@ -232,3 +247,4 @@ "version": "2.1.TIMESTAMP" } } + diff --git a/macosx-10.7.json b/macosx-10.7.json index eea9be96f..9dc23433b 100644 --- a/macosx-10.7.json +++ b/macosx-10.7.json @@ -163,9 +163,24 @@ "output_directory": "packer-{{user `template`}}-parallels", "parallels_tools_flavor": "mac", "prlctl": [ - ["set", "{{.Name}}", "--memsize", "{{ user `memory` }}"], - ["set", "{{.Name}}", "--cpus", "{{ user `cpus` }}"], - ["set", "{{.Name}}", "--on-window-close", "keep-running"] + [ + "set", + "{{.Name}}", + "--memsize", + "{{ user `memory` }}" + ], + [ + "set", + "{{.Name}}", + "--cpus", + "{{ user `cpus` }}" + ], + [ + "set", + "{{.Name}}", + "--on-window-close", + "keep-running" + ] ], "shutdown_command": "echo 'vagrant'| sudo -S shutdown -h now", "ssh_password": "vagrant", @@ -232,3 +247,4 @@ "version": "2.1.TIMESTAMP" } } + diff --git a/macosx-10.8.json b/macosx-10.8.json index 635c28dcf..010e4a8b6 100644 --- a/macosx-10.8.json +++ b/macosx-10.8.json @@ -163,9 +163,24 @@ "output_directory": "packer-{{user `template`}}-parallels", "parallels_tools_flavor": "mac", "prlctl": [ - ["set", "{{.Name}}", "--memsize", "{{ user `memory` }}"], - ["set", "{{.Name}}", "--cpus", "{{ user `cpus` }}"], - ["set", "{{.Name}}", "--on-window-close", "keep-running"] + [ + "set", + "{{.Name}}", + "--memsize", + "{{ user `memory` }}" + ], + [ + "set", + "{{.Name}}", + "--cpus", + "{{ user `cpus` }}" + ], + [ + "set", + "{{.Name}}", + "--on-window-close", + "keep-running" + ] ], "shutdown_command": "echo 'vagrant'| sudo -S shutdown -h now", "ssh_password": "vagrant", @@ -232,3 +247,4 @@ "version": "2.1.TIMESTAMP" } } + diff --git a/macosx-10.9.json b/macosx-10.9.json index d19762d59..cfd7df0af 100644 --- a/macosx-10.9.json +++ b/macosx-10.9.json @@ -163,9 +163,24 @@ "output_directory": "packer-{{user `template`}}-parallels", "parallels_tools_flavor": "mac", "prlctl": [ - ["set", "{{.Name}}", "--memsize", "{{ user `memory` }}"], - ["set", "{{.Name}}", "--cpus", "{{ user `cpus` }}"], - ["set", "{{.Name}}", "--on-window-close", "keep-running"] + [ + "set", + "{{.Name}}", + "--memsize", + "{{ user `memory` }}" + ], + [ + "set", + "{{.Name}}", + "--cpus", + "{{ user `cpus` }}" + ], + [ + "set", + "{{.Name}}", + "--on-window-close", + "keep-running" + ] ], "shutdown_command": "echo 'vagrant'| sudo -S shutdown -h now", "ssh_password": "vagrant", @@ -232,3 +247,4 @@ "version": "2.1.TIMESTAMP" } } + diff --git a/omnios-r151014.json b/omnios-r151014.json index 23e2008d1..2722dd48b 100644 --- a/omnios-r151014.json +++ b/omnios-r151014.json @@ -236,3 +236,4 @@ "version": "2.2.TIMESTAMP" } } + diff --git a/omnios-r151018.json b/omnios-r151018.json index 251fab591..ab7c19a9a 100644 --- a/omnios-r151018.json +++ b/omnios-r151018.json @@ -236,3 +236,4 @@ "version": "2.2.TIMESTAMP" } } + diff --git a/opensuse-13.2-i386.json b/opensuse-13.2-i386.json index 8c0cc510a..e1fe839c9 100644 --- a/opensuse-13.2-i386.json +++ b/opensuse-13.2-i386.json @@ -198,3 +198,4 @@ "version": "2.0.TIMESTAMP" } } + diff --git a/opensuse-13.2-x86_64.json b/opensuse-13.2-x86_64.json index bfbedfd8b..7a2a9fd1a 100644 --- a/opensuse-13.2-x86_64.json +++ b/opensuse-13.2-x86_64.json @@ -198,3 +198,4 @@ "version": "2.0.TIMESTAMP" } } + diff --git a/opensuse-leap-42.2-x86_64.json b/opensuse-leap-42.2-x86_64.json index 11437d34c..522f2b0b5 100644 --- a/opensuse-leap-42.2-x86_64.json +++ b/opensuse-leap-42.2-x86_64.json @@ -198,3 +198,4 @@ "version": "2.0.TIMESTAMP" } } + diff --git a/oracle-5.11-i386.json b/oracle-5.11-i386.json index 0c63d033d..948307ac6 100644 --- a/oracle-5.11-i386.json +++ b/oracle-5.11-i386.json @@ -179,3 +179,4 @@ "version": "2.2.TIMESTAMP" } } + diff --git a/oracle-5.11-x86_64.json b/oracle-5.11-x86_64.json index ba51714fe..6d329deca 100644 --- a/oracle-5.11-x86_64.json +++ b/oracle-5.11-x86_64.json @@ -185,3 +185,4 @@ "version": "2.2.TIMESTAMP" } } + diff --git a/oracle-6.8-i386.json b/oracle-6.8-i386.json index 019073760..c436fadc6 100644 --- a/oracle-6.8-i386.json +++ b/oracle-6.8-i386.json @@ -180,3 +180,4 @@ "version": "2.2.TIMESTAMP" } } + diff --git a/oracle-6.8-x86_64.json b/oracle-6.8-x86_64.json index 383db5de0..bbf065375 100644 --- a/oracle-6.8-x86_64.json +++ b/oracle-6.8-x86_64.json @@ -180,3 +180,4 @@ "version": "2.0.TIMESTAMP" } } + diff --git a/oracle-7.3-x86_64.json b/oracle-7.3-x86_64.json index c9e34fa1f..9fccd42f1 100644 --- a/oracle-7.3-x86_64.json +++ b/oracle-7.3-x86_64.json @@ -180,3 +180,4 @@ "version": "2.2.TIMESTAMP" } } + diff --git a/rhel-5.11-i386.json b/rhel-5.11-i386.json index 41b7cddd8..9de1b76f6 100644 --- a/rhel-5.11-i386.json +++ b/rhel-5.11-i386.json @@ -179,3 +179,4 @@ "version": "2.2.TIMESTAMP" } } + diff --git a/rhel-5.11-x86_64.json b/rhel-5.11-x86_64.json index 713c25df0..2bd05e2a2 100644 --- a/rhel-5.11-x86_64.json +++ b/rhel-5.11-x86_64.json @@ -185,3 +185,4 @@ "version": "2.2.TIMESTAMP" } } + diff --git a/rhel-6.8-i386.json b/rhel-6.8-i386.json index 7b2627caf..7968a43f9 100644 --- a/rhel-6.8-i386.json +++ b/rhel-6.8-i386.json @@ -180,3 +180,4 @@ "version": "2.2.TIMESTAMP" } } + diff --git a/rhel-6.8-x86_64.json b/rhel-6.8-x86_64.json index bbe9c7a79..0d14c820b 100644 --- a/rhel-6.8-x86_64.json +++ b/rhel-6.8-x86_64.json @@ -180,3 +180,4 @@ "version": "2.2.TIMESTAMP" } } + diff --git a/rhel-7.3-x86_64.json b/rhel-7.3-x86_64.json index a09ceaee4..f4f4c9138 100644 --- a/rhel-7.3-x86_64.json +++ b/rhel-7.3-x86_64.json @@ -180,3 +180,4 @@ "version": "2.2.TIMESTAMP" } } + diff --git a/sles-12-sp1-x86_64.json b/sles-12-sp1-x86_64.json index 7930628e9..964f5e9ba 100644 --- a/sles-12-sp1-x86_64.json +++ b/sles-12-sp1-x86_64.json @@ -199,3 +199,4 @@ "version": "2.2.TIMESTAMP" } } + diff --git a/sles-12-sp2-x86_64.json b/sles-12-sp2-x86_64.json index 57dea6c50..054c5e5da 100644 --- a/sles-12-sp2-x86_64.json +++ b/sles-12-sp2-x86_64.json @@ -199,3 +199,4 @@ "version": "2.2.TIMESTAMP" } } + diff --git a/sles-12-x86_64.json b/sles-12-x86_64.json index f20d5ac46..b75556dac 100644 --- a/sles-12-x86_64.json +++ b/sles-12-x86_64.json @@ -199,3 +199,4 @@ "version": "2.2.TIMESTAMP" } } + diff --git a/solaris-10.11-x86.json b/solaris-10.11-x86.json index 23c036146..a2e031590 100644 --- a/solaris-10.11-x86.json +++ b/solaris-10.11-x86.json @@ -135,3 +135,4 @@ "version": "2.0.TIMESTAMP" } } + diff --git a/solaris-11-x86.json b/solaris-11-x86.json index 45fa6ae6c..936f1eb38 100644 --- a/solaris-11-x86.json +++ b/solaris-11-x86.json @@ -157,3 +157,4 @@ "version": "2.0.TIMESTAMP" } } + diff --git a/ubuntu-12.04-amd64.json b/ubuntu-12.04-amd64.json index 509d73386..23cdb397c 100644 --- a/ubuntu-12.04-amd64.json +++ b/ubuntu-12.04-amd64.json @@ -265,3 +265,4 @@ "version": "2.1.TIMESTAMP" } } + diff --git a/ubuntu-12.04-i386.json b/ubuntu-12.04-i386.json index 04f0889ff..4bd781fa2 100644 --- a/ubuntu-12.04-i386.json +++ b/ubuntu-12.04-i386.json @@ -265,3 +265,4 @@ "version": "2.1.TIMESTAMP" } } + diff --git a/ubuntu-14.04-amd64.json b/ubuntu-14.04-amd64.json index 0c36fcc52..9adc1554f 100644 --- a/ubuntu-14.04-amd64.json +++ b/ubuntu-14.04-amd64.json @@ -265,3 +265,4 @@ "version": "2.1.TIMESTAMP" } } + diff --git a/ubuntu-14.04-i386.json b/ubuntu-14.04-i386.json index 930880372..b6f499003 100644 --- a/ubuntu-14.04-i386.json +++ b/ubuntu-14.04-i386.json @@ -265,3 +265,4 @@ "version": "2.1.TIMESTAMP" } } + diff --git a/ubuntu-15.10-amd64.json b/ubuntu-15.10-amd64.json index f137e6559..a8498660f 100644 --- a/ubuntu-15.10-amd64.json +++ b/ubuntu-15.10-amd64.json @@ -274,3 +274,4 @@ "version": "2.1.TIMESTAMP" } } + diff --git a/ubuntu-15.10-i386.json b/ubuntu-15.10-i386.json index 07bd12acd..7040ed96c 100644 --- a/ubuntu-15.10-i386.json +++ b/ubuntu-15.10-i386.json @@ -274,3 +274,4 @@ "version": "2.1.TIMESTAMP" } } + diff --git a/ubuntu-16.04-amd64.json b/ubuntu-16.04-amd64.json index 3adcfc235..bf7f0e00b 100644 --- a/ubuntu-16.04-amd64.json +++ b/ubuntu-16.04-amd64.json @@ -274,3 +274,4 @@ "version": "2.1.TIMESTAMP" } } + diff --git a/ubuntu-16.04-i386.json b/ubuntu-16.04-i386.json index 74c5ef71b..262d426d7 100644 --- a/ubuntu-16.04-i386.json +++ b/ubuntu-16.04-i386.json @@ -274,3 +274,4 @@ "version": "2.1.TIMESTAMP" } } + diff --git a/ubuntu-16.10-amd64.json b/ubuntu-16.10-amd64.json index 45298efe5..17aba8503 100644 --- a/ubuntu-16.10-amd64.json +++ b/ubuntu-16.10-amd64.json @@ -246,7 +246,6 @@ ], "type": "shell" } - ], "variables": { "box_basename": "ubuntu-16.10", @@ -271,3 +270,4 @@ "version": "2.1.TIMESTAMP" } } + diff --git a/ubuntu-16.10-i386.json b/ubuntu-16.10-i386.json index 12b0a5ef8..ba6aae616 100644 --- a/ubuntu-16.10-i386.json +++ b/ubuntu-16.10-i386.json @@ -270,3 +270,4 @@ "version": "2.1.TIMESTAMP" } } + diff --git a/windows-nano-tp3.json b/windows-nano-tp3.json index 2c0ea7066..2355ccb1c 100644 --- a/windows-nano-tp3.json +++ b/windows-nano-tp3.json @@ -1,66 +1,68 @@ { - "builders": [{ - "communicator": "winrm", - "disk_size": "{{user `disk_size`}}", - "floppy_files": [ - "scripts/windows/Autounattend.xml", - "scripts/windows/nano_create.ps1", - "scripts/windows/nano_cleanup.ps1", - "scripts/windows/SetupComplete.cmd", - "scripts/windows/postunattend.xml" - ], - "guest_additions_mode": "disable", - "guest_os_type": "Windows2012_64", - "headless": "{{ user `headless` }}", - "iso_url": "{{ user `iso_url` }}", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "output_directory": "packer-{{user `template`}}-virtualbox", - "shutdown_command": "shutdown /r /t 10 /f /d p:4:1 /c \"Packer Shutdown\"", - "shutdown_timeout": "1h", - "type": "virtualbox-iso", - "vboxmanage": [ - [ - "modifyvm", - "{{.Name}}", - "--natpf1", - "guest_winrm,tcp,,55985,,5985" - ], - [ - "modifyvm", - "{{.Name}}", - "--memory", - "{{ user `memory` }}" - ], - [ - "modifyvm", - "{{.Name}}", - "--vram", - "36" + "builders": [ + { + "communicator": "winrm", + "disk_size": "{{user `disk_size`}}", + "floppy_files": [ + "scripts/windows/Autounattend.xml", + "scripts/windows/nano_create.ps1", + "scripts/windows/nano_cleanup.ps1", + "scripts/windows/SetupComplete.cmd", + "scripts/windows/postunattend.xml" ], - [ - "modifyvm", - "{{.Name}}", - "--cpus", - "{{ user `cpus` }}" + "guest_additions_mode": "disable", + "guest_os_type": "Windows2012_64", + "headless": "{{ user `headless` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{ user `iso_url` }}", + "output_directory": "packer-{{user `template`}}-virtualbox", + "shutdown_command": "shutdown /r /t 10 /f /d p:4:1 /c \"Packer Shutdown\"", + "shutdown_timeout": "1h", + "type": "virtualbox-iso", + "vboxmanage": [ + [ + "modifyvm", + "{{.Name}}", + "--natpf1", + "guest_winrm,tcp,,55985,,5985" + ], + [ + "modifyvm", + "{{.Name}}", + "--memory", + "{{ user `memory` }}" + ], + [ + "modifyvm", + "{{.Name}}", + "--vram", + "36" + ], + [ + "modifyvm", + "{{.Name}}", + "--cpus", + "{{ user `cpus` }}" + ], + [ + "modifyvm", + "{{.Name}}", + "--hardwareuuid", + "02f110e7-369a-4bbc-bbe6-6f0b6864ccb6" + ] ], - [ - "modifyvm", - "{{.Name}}", - "--hardwareuuid", - "02f110e7-369a-4bbc-bbe6-6f0b6864ccb6" - ] - ], - "virtualbox_version_file": ".vbox_version", - "vm_name": "{{ user `template` }}", - "winrm_password": "vagrant", - "winrm_timeout": "2h", - "winrm_username": "vagrant" - }], - "post-processors": [ + "virtualbox_version_file": ".vbox_version", + "vm_name": "{{ user `template` }}", + "winrm_password": "vagrant", + "winrm_timeout": "2h", + "winrm_username": "vagrant" + } + ], + "post-processors": [ { - "type": "vagrant", "output": "builds/{{user `box_basename`}}.{{.Provider}}.box", + "type": "vagrant", "vagrantfile_template": "vagrantfile_templates/windows-nano.rb" } ], @@ -80,3 +82,4 @@ "version": "1.1.TIMESTAMP" } } + From bfa01a6d5321a4c14279e92f5d378c008b20335d Mon Sep 17 00:00:00 2001 From: Mischa ter Smitten <mischa@tersmitten.nl> Date: Fri, 3 Mar 2017 20:36:23 +0100 Subject: [PATCH 0593/1622] Fix Ubuntu 16.04 build (#765) Fixes #762 Signed-off-by: Mischa ter Smitten <mischa@tersmitten.nl> --- ubuntu-16.04-amd64.json | 4 ++-- ubuntu-16.04-i386.json | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ubuntu-16.04-amd64.json b/ubuntu-16.04-amd64.json index bf7f0e00b..8ce3accec 100644 --- a/ubuntu-16.04-amd64.json +++ b/ubuntu-16.04-amd64.json @@ -260,9 +260,9 @@ "headless": "", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", - "iso_checksum": "29a8b9009509b39d542ecb229787cdf48f05e739a932289de9e9858d7c487c80", + "iso_checksum": "737ae7041212c628de5751d15c3016058b0e833fdc32e7420209b76ca3d0a535", "iso_checksum_type": "sha256", - "iso_name": "ubuntu-16.04.1-server-amd64.iso", + "iso_name": "ubuntu-16.04.2-server-amd64.iso", "memory": "512", "metadata": "floppy/dummy_metadata.json", "mirror": "http://releases.ubuntu.com", diff --git a/ubuntu-16.04-i386.json b/ubuntu-16.04-i386.json index 262d426d7..cf7d1195b 100644 --- a/ubuntu-16.04-i386.json +++ b/ubuntu-16.04-i386.json @@ -260,9 +260,9 @@ "headless": "", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", - "iso_checksum": "62fc3e810c7631fbbd45d9c960ec749fc1eb66e5c56039423e3e94a5391a437a", + "iso_checksum": "736f2c5700313494a2282092ca0f8b0048883ed48c5fdcf585d6e1852a3a110f", "iso_checksum_type": "sha256", - "iso_name": "ubuntu-16.04.1-server-i386.iso", + "iso_name": "ubuntu-16.04.2-server-i386.iso", "memory": "512", "metadata": "floppy/dummy_metadata.json", "mirror": "http://releases.ubuntu.com", From 67015d049b7b4fdb40f8c679fc33402660153707 Mon Sep 17 00:00:00 2001 From: Mischa ter Smitten <mischa@tersmitten.nl> Date: Tue, 7 Mar 2017 14:37:51 +0100 Subject: [PATCH 0594/1622] Fix ubuntu 16.04 build (#766) * Fix Ubuntu 16.04 build Fixes #762 Signed-off-by: Mischa ter Smitten <mischa@tersmitten.nl> * Fix Ubuntu 16.04 build Fixes #762 Signed-off-by: Mischa ter Smitten <mischa@tersmitten.nl> --- ubuntu-16.04-amd64.json | 8 ++++---- ubuntu-16.04-i386.json | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/ubuntu-16.04-amd64.json b/ubuntu-16.04-amd64.json index 8ce3accec..f765459c9 100644 --- a/ubuntu-16.04-amd64.json +++ b/ubuntu-16.04-amd64.json @@ -260,13 +260,13 @@ "headless": "", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", - "iso_checksum": "737ae7041212c628de5751d15c3016058b0e833fdc32e7420209b76ca3d0a535", + "iso_checksum": "29a8b9009509b39d542ecb229787cdf48f05e739a932289de9e9858d7c487c80", "iso_checksum_type": "sha256", - "iso_name": "ubuntu-16.04.2-server-amd64.iso", + "iso_name": "ubuntu-16.04.1-server-amd64.iso", "memory": "512", "metadata": "floppy/dummy_metadata.json", - "mirror": "http://releases.ubuntu.com", - "mirror_directory": "16.04", + "mirror": "http://old-releases.ubuntu.com/releases", + "mirror_directory": "16.04.1", "name": "ubuntu-16.04", "no_proxy": "{{env `no_proxy`}}", "preseed_path": "ubuntu-15.10/preseed.cfg", diff --git a/ubuntu-16.04-i386.json b/ubuntu-16.04-i386.json index cf7d1195b..632e433a7 100644 --- a/ubuntu-16.04-i386.json +++ b/ubuntu-16.04-i386.json @@ -260,13 +260,13 @@ "headless": "", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", - "iso_checksum": "736f2c5700313494a2282092ca0f8b0048883ed48c5fdcf585d6e1852a3a110f", + "iso_checksum": "62fc3e810c7631fbbd45d9c960ec749fc1eb66e5c56039423e3e94a5391a437a", "iso_checksum_type": "sha256", - "iso_name": "ubuntu-16.04.2-server-i386.iso", + "iso_name": "ubuntu-16.04.1-server-i386.iso", "memory": "512", "metadata": "floppy/dummy_metadata.json", - "mirror": "http://releases.ubuntu.com", - "mirror_directory": "16.04", + "mirror": "http://old-releases.ubuntu.com/releases", + "mirror_directory": "16.04.1", "name": "ubuntu-16.04-i386", "no_proxy": "{{env `no_proxy`}}", "preseed_path": "ubuntu-15.10/preseed.cfg", From c69dc9635bbd710d946704255062b45b70ccebeb Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith@chef.io> Date: Mon, 13 Mar 2017 12:07:14 -0700 Subject: [PATCH 0595/1622] Archive macOS 10.7/10.8 and Debian 8.6 (#769) Signed-off-by: Tim Smith <tsmith@chef.io> --- debian-8.6-amd64.json => archive/debian-8.6-amd64.json | 0 debian-8.6-i386.json => archive/debian-8.6-i386.json | 0 macosx-10.7.json => archive/macosx-10.7.json | 0 macosx-10.8.json => archive/macosx-10.8.json | 0 4 files changed, 0 insertions(+), 0 deletions(-) rename debian-8.6-amd64.json => archive/debian-8.6-amd64.json (100%) rename debian-8.6-i386.json => archive/debian-8.6-i386.json (100%) rename macosx-10.7.json => archive/macosx-10.7.json (100%) rename macosx-10.8.json => archive/macosx-10.8.json (100%) diff --git a/debian-8.6-amd64.json b/archive/debian-8.6-amd64.json similarity index 100% rename from debian-8.6-amd64.json rename to archive/debian-8.6-amd64.json diff --git a/debian-8.6-i386.json b/archive/debian-8.6-i386.json similarity index 100% rename from debian-8.6-i386.json rename to archive/debian-8.6-i386.json diff --git a/macosx-10.7.json b/archive/macosx-10.7.json similarity index 100% rename from macosx-10.7.json rename to archive/macosx-10.7.json diff --git a/macosx-10.8.json b/archive/macosx-10.8.json similarity index 100% rename from macosx-10.8.json rename to archive/macosx-10.8.json From 1c5baa40c3e4b3011ee3c64c1783d57b1771851f Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith@chef.io> Date: Mon, 13 Mar 2017 12:44:22 -0700 Subject: [PATCH 0596/1622] Chefstyle and fail if build_box not used correctly (#770) Signed-off-by: Tim Smith <tsmith@chef.io> --- Gemfile | 4 +- Rakefile | 83 ++++++++++++++------------- Thorfile | 23 ++++---- buildkite.rb | 12 ++-- vagrantfile_templates/freebsd.rb | 6 +- vagrantfile_templates/macosx.rb | 6 +- vagrantfile_templates/windows-nano.rb | 2 +- 7 files changed, 69 insertions(+), 67 deletions(-) diff --git a/Gemfile b/Gemfile index 44a167e1d..2c1132169 100644 --- a/Gemfile +++ b/Gemfile @@ -1,3 +1,3 @@ -source 'https://rubygems.org' +source "https://rubygems.org" -gem 'bento-ya' +gem "bento-ya" diff --git a/Rakefile b/Rakefile index 607b1fc69..627661445 100644 --- a/Rakefile +++ b/Rakefile @@ -1,5 +1,5 @@ -require 'json' -require 'yaml' +require "json" +require "yaml" # TODO: private boxes may need to specify a mirror @@ -7,84 +7,88 @@ require 'yaml' # http://blog.stevenocchipinti.com/2013/10/18/rake-task-with-an-arbitrary-number-of-arguments/ builds = YAML.load(File.read("builds.yml")) -desc 'Do ALL THE THINGS' +desc "Do ALL THE THINGS" task :do_all do # build stage - builds['public'].each do |platform, versions| + builds["public"].each do |platform, versions| versions.each do |version, archs| archs.each do |arch| - builds['providers'].each do |provider| + builds["providers"].each do |provider| # build stage - Rake::Task['build_box'].invoke("#{platform}-#{version}-#{arch}", "#{provider}") - Rake::Task['build_box'].reenable + Rake::Task["build_box"].invoke("#{platform}-#{version}-#{arch}", "#{provider}") + Rake::Task["build_box"].reenable puts "#{platform}-#{version}-#{arch}, #{provider}" # verification stage - Rake::Task['test_all'].invoke - Rake::Task['test_all'].reenable + Rake::Task["test_all"].invoke + Rake::Task["test_all"].reenable # publish stage - Rake::Task['upload_all'].invoke - Rake::Task['upload_all'].reenable + Rake::Task["upload_all"].invoke + Rake::Task["upload_all"].reenable # release stage - Rake::Task['release_all'].invoke - Rake::Task['release_all'].reenable + Rake::Task["release_all"].invoke + Rake::Task["release_all"].reenable # clean stage - Rake::Task['clean'].invoke - Rake::Task['clean'].reenable + Rake::Task["clean"].invoke + Rake::Task["clean"].reenable end end end end end -desc 'Test all boxes with Test Kitchen' +desc "Test all boxes with Test Kitchen" task :test_all do - sh 'bento test -f' + sh "bento test -f" end -desc 'Upload all boxes to Atlas for all providers' +desc "Upload all boxes to Atlas for all providers" task :upload_all do - sh 'bento upload' + sh "bento upload" end -desc 'Release all' +desc "Release all" task :release_all do metadata_files.each do |metadata_file| metadata = box_metadata(metadata_file) - Rake::Task['release'].invoke(metadata['name'], metadata['version']) - Rake::Task['release'].reenable + Rake::Task["release"].invoke(metadata["name"], metadata["version"]) + Rake::Task["release"].reenable end end -desc 'Build a bento template' +desc "Build a bento template" task :build_box, :template, :provider do |_, args| - bento_provider = ENV['BENTO_PROVIDERS'] ? ENV['BENTO_PROVIDERS'] : args[:provider] - cmd = %W(bento build #{args[:template]}) + bento_provider = ENV["BENTO_PROVIDERS"] ? ENV["BENTO_PROVIDERS"] : args[:provider] + if bento_provider.nil? + puts "Invalid build arguments. Either set BENTO_PROVIDERS in ENV or pass provider argument. Example: rake build_box[debian-8.7-amd64, virtualbox-iso]" + exit 1 + end + cmd = %W{bento build #{args[:template]}} cmd.insert(2, "--only #{bento_provider}") - cmd.insert(2, "--mirror #{ENV['PACKER_MIRROR']}") if ENV['PACKER_MIRROR'] - cmd.insert(2, "--version #{ENV['BENTO_VERSION']}") if ENV['BENTO_VERSION'] + cmd.insert(2, "--mirror #{ENV['PACKER_MIRROR']}") if ENV["PACKER_MIRROR"] + cmd.insert(2, "--version #{ENV['BENTO_VERSION']}") if ENV["BENTO_VERSION"] cmd.insert(2, "--headless") - cmd.join(' ') + cmd.join(" ") sh a_to_s(cmd) end -desc 'Release a version of a box' +desc "Release a version of a box" task :release, [:boxname, :version] do |_, args| sh "bento release #{args[:boxname]} #{args[:version]}" end -desc 'Revoke a version of a box' +desc "Revoke a version of a box" task :revoke, [:boxname, :version] do |_, args| sh "bento revoke #{args[:boxname]} #{args[:version]}" end -desc 'Delete a version of a box' +desc "Delete a version of a box" task :delete, [:boxname, :version] do |_, args| sh "bento delete #{args[:boxname]} #{args[:version]}" end -desc 'Clean the build directory' +desc "Clean the build directory" task :clean do - puts 'Cleaning up...' + puts "Cleaning up..." `rm -rf builds/*.json builds/*.box packer-* .kitchen.*.yml` end @@ -102,12 +106,12 @@ def box_metadata(metadata_file) json = JSON.parse(file) # metadata needed for upload: boxname, version, provider, box filename - metadata['name'] = json['name'] - metadata['version'] = json['version'] - metadata['box_basename'] = json['box_basename'] - metadata['providers'] = {} - json['providers'].each do |provider| - metadata['providers'][provider['name']] = provider.reject { |k, _| k == 'name' } + metadata["name"] = json["name"] + metadata["version"] = json["version"] + metadata["box_basename"] = json["box_basename"] + metadata["providers"] = {} + json["providers"].each do |provider| + metadata["providers"][provider["name"]] = provider.reject { |k, _| k == "name" } end metadata end @@ -119,4 +123,3 @@ end def compute_metadata_files `ls builds/*.json`.split("\n") end - diff --git a/Thorfile b/Thorfile index 8cc90a6a5..733bd02ed 100644 --- a/Thorfile +++ b/Thorfile @@ -1,43 +1,42 @@ # vi: ft=ruby -require 'thor' -require 'fileutils' -require 'timeout' +require "thor" +require "fileutils" +require "timeout" class Packer < Thor - desc 'validate', "Validate all the packer templates" + desc "validate", "Validate all the packer templates" def validate - Dir.chdir './packer' do + Dir.chdir "./packer" do templates = Dir.glob("*.json") templates.each do |template| puts "#{template}" unless system "packer validate #{template}" - fail "Validation failed!" + raise "Validation failed!" end puts "\n" end end end - desc 'clean', "Description goes here" + desc "clean", "Description goes here" def clean(what) if what == "cache" - FileUtils.rm_rf(Dir.glob('./packer/packer_cache/*')) + FileUtils.rm_rf(Dir.glob("./packer/packer_cache/*")) elsif what == "boxes" - FileUtils.rm_rf(Dir.glob('./packer/*.box')) + FileUtils.rm_rf(Dir.glob("./packer/*.box")) end end - desc 'build', "Execute the packer builder" + desc "build", "Execute the packer builder" option :os, :banner => "<os>", :default => "*" option :ver, :banner => "<version>", :default => "*" option :bits, :banner => "<bits>" option :only, :banner => "<only>" - def build - if options[:bits] + if options[:bits] processor = options[:bits] == "64" ? "{amd64,x86_64}" : "i386" else processor = "*" diff --git a/buildkite.rb b/buildkite.rb index 361ab9310..677f8afe9 100644 --- a/buildkite.rb +++ b/buildkite.rb @@ -3,22 +3,22 @@ git_output = `git log -m -1 --name-only --pretty=format:%n` # TODO: decide what, if anything, is rebuilt if bin/bento, buildkite.rb, scripts/common change. -changed_files = git_output.split("\n").reject { |t| t.empty? || t.include?('gitignore') || t.include?('dummy_metadata') || t.include?('bin/bento') || t.include?('buildkite.rb') || t.include?('scripts/common') || t.include?('.md')} +changed_files = git_output.split("\n").reject { |t| t.empty? || t.include?("gitignore") || t.include?("dummy_metadata") || t.include?("bin/bento") || t.include?("buildkite.rb") || t.include?("scripts/common") || t.include?(".md") } # Compile the list of platforms whose boxes will be rebuilt. buildlist = [] -# If OS-specific scripts have changed, rebuild all boxes associated with that OS. -family = changed_files.select { |b| b.include?('scripts') || b.include?('floppy') || b.include?('http') } +# If OS-specific scripts have changed, rebuild all boxes associated with that OS. +family = changed_files.select { |b| b.include?("scripts") || b.include?("floppy") || b.include?("http") } unless family.empty? all_templates = `ls *.json`.split("\n") family.each do |f| - buildlist.concat(all_templates.collect { |a| a if a.include?(f.split('/')[1]) }.reject { |a| a.nil? }) + buildlist.concat(all_templates.collect { |a| a if a.include?(f.split("/")[1]) }.reject { |a| a.nil? }) end end -buildlist.concat(changed_files.select { |b| b.include?('.json') }) +buildlist.concat(changed_files.select { |b| b.include?(".json") }) buildlist.uniq! -buildlist.collect! { |b| b.gsub!('.json', '') } +buildlist.collect! { |b| b.gsub!(".json", "") } system "bundle exec rake do_all[#{buildlist.join(',')}]" diff --git a/vagrantfile_templates/freebsd.rb b/vagrantfile_templates/freebsd.rb index b32e741b2..2c1bed2d5 100644 --- a/vagrantfile_templates/freebsd.rb +++ b/vagrantfile_templates/freebsd.rb @@ -1,11 +1,11 @@ -Vagrant.require_version '>= 1.1.0' +Vagrant.require_version ">= 1.1.0" Vagrant.configure(2) do |config| - config.ssh.shell = 'sh' + config.ssh.shell = "sh" # Disable the base shared folder, Guest Tools supporting this feature are # unavailable for all providers. - config.vm.synced_folder '.', '/vagrant', disabled: true + config.vm.synced_folder ".", "/vagrant", disabled: true config.vm.provider :parallels do |prl, override| # Guest Tools are unavailable. diff --git a/vagrantfile_templates/macosx.rb b/vagrantfile_templates/macosx.rb index d17f4912a..33d06e14a 100644 --- a/vagrantfile_templates/macosx.rb +++ b/vagrantfile_templates/macosx.rb @@ -1,7 +1,7 @@ -Vagrant.require_version '>= 1.7.3' +Vagrant.require_version ">= 1.7.3" Vagrant.configure(2) do |config| - config.vm.provider 'virtualbox' do |_, override| - override.vm.synced_folder '.', '/vagrant', type: 'rsync' + config.vm.provider "virtualbox" do |_, override| + override.vm.synced_folder ".", "/vagrant", type: "rsync" end end diff --git a/vagrantfile_templates/windows-nano.rb b/vagrantfile_templates/windows-nano.rb index 0d46a8b5a..18f270395 100644 --- a/vagrantfile_templates/windows-nano.rb +++ b/vagrantfile_templates/windows-nano.rb @@ -12,7 +12,7 @@ vb.memory = "1024" end - config.vm.provider 'hyperv' do |hv| + config.vm.provider "hyperv" do |hv| hv.ip_address_timeout = 240 end end From 2041bd7e99e24a0a6c3c16d8e2b763303241a547 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith@chef.io> Date: Fri, 17 Mar 2017 07:38:43 -0700 Subject: [PATCH 0597/1622] Remove all EOL and previously archived distros (#772) * Remove all EOL and previously archived distros Signed-off-by: Tim Smith <tsmith@chef.io> * Remove reference to release eng team from readme Signed-off-by: Tim Smith <tsmith@chef.io> * Reformat the table Signed-off-by: Tim Smith <tsmith@chef.io> * Remove links to EOL distros Signed-off-by: Tim Smith <tsmith@chef.io> * Format the rest of the readme Signed-off-by: Tim Smith <tsmith@chef.io> * Update wording around the old bento boxes Signed-off-by: Tim Smith <tsmith@chef.io> --- README.md | 219 ++++++-------- archive/debian-6.0.10-amd64.json | 238 --------------- archive/debian-6.0.10-i386.json | 238 --------------- archive/debian-7.10-amd64.json | 237 --------------- archive/debian-7.10-i386.json | 237 --------------- archive/debian-7.8-amd64.json | 237 --------------- archive/debian-7.8-i386.json | 237 --------------- archive/debian-7.9-amd64.json | 237 --------------- archive/debian-7.9-i386.json | 237 --------------- archive/debian-8.1-amd64.json | 242 --------------- archive/debian-8.1-i386.json | 242 --------------- archive/debian-8.2-amd64.json | 242 --------------- archive/debian-8.2-i386.json | 242 --------------- archive/debian-8.3-amd64.json | 242 --------------- archive/debian-8.3-i386.json | 242 --------------- archive/debian-8.4-amd64.json | 243 --------------- archive/debian-8.4-i386.json | 243 --------------- archive/debian-8.5-amd64.json | 245 ---------------- archive/debian-8.5-i386.json | 245 ---------------- archive/debian-8.6-amd64.json | 246 ---------------- archive/debian-8.6-i386.json | 246 ---------------- archive/fedora-20-i386.json | 180 ------------ archive/fedora-20-x86_64.json | 180 ------------ archive/fedora-21-i386.json | 180 ------------ archive/fedora-21-x86_64.json | 180 ------------ archive/fedora-22-i386.json | 177 ----------- archive/fedora-22-x86_64.json | 181 ------------ archive/freebsd-10.2-amd64.json | 233 --------------- archive/freebsd-10.2-i386.json | 233 --------------- archive/macosx-10.7.json | 250 ---------------- archive/macosx-10.8.json | 250 ---------------- archive/omnios-r151010j.json | 226 -------------- archive/oracle-6.6-i386.json | 180 ------------ archive/oracle-6.6-x86_64.json | 180 ------------ archive/oracle-6.7-i386.json | 182 ------------ archive/oracle-6.7-x86_64.json | 182 ------------ archive/oracle-7.2-x86_64.json | 182 ------------ archive/rhel-6.7-i386.json | 180 ------------ archive/rhel-6.7-x86_64.json | 180 ------------ archive/sles-11-sp2-i386.json | 184 ------------ archive/sles-11-sp2-x86_64.json | 183 ------------ archive/sles-11-sp3-i386.json | 184 ------------ archive/sles-11-sp3-x86_64.json | 184 ------------ archive/sles-11-sp4-i386.json | 195 ------------ archive/sles-11-sp4-x86_64.json | 195 ------------ archive/ubuntu-10.04-amd64.json | 265 ----------------- archive/ubuntu-10.04-i386.json | 265 ----------------- archive/ubuntu-14.10-amd64.json | 265 ----------------- archive/ubuntu-14.10-i386.json | 265 ----------------- archive/ubuntu-15.04-amd64.json | 269 ----------------- archive/ubuntu-15.04-i386.json | 269 ----------------- freebsd-9.3-amd64.json | 250 ---------------- freebsd-9.3-i386.json | 250 ---------------- http/freebsd-9.3/install.sh | 109 ------- http/opensuse-13.2/autoinst.xml | 218 -------------- .../preseed.cfg | 0 opensuse-13.2-i386.json | 201 ------------- opensuse-13.2-x86_64.json | 201 ------------- scripts/opensuse/cleanup.sh | 10 +- scripts/opensuse/remove-dvd-source.sh | 17 +- scripts/ubuntu/networking.sh | 2 +- ubuntu-15.10-amd64.json | 277 ------------------ ubuntu-15.10-i386.json | 277 ------------------ ubuntu-16.04-amd64.json | 3 +- ubuntu-16.04-i386.json | 2 +- ubuntu-16.10-amd64.json | 2 +- ubuntu-16.10-i386.json | 2 +- 67 files changed, 106 insertions(+), 13011 deletions(-) delete mode 100644 archive/debian-6.0.10-amd64.json delete mode 100644 archive/debian-6.0.10-i386.json delete mode 100644 archive/debian-7.10-amd64.json delete mode 100644 archive/debian-7.10-i386.json delete mode 100644 archive/debian-7.8-amd64.json delete mode 100644 archive/debian-7.8-i386.json delete mode 100644 archive/debian-7.9-amd64.json delete mode 100644 archive/debian-7.9-i386.json delete mode 100644 archive/debian-8.1-amd64.json delete mode 100644 archive/debian-8.1-i386.json delete mode 100644 archive/debian-8.2-amd64.json delete mode 100644 archive/debian-8.2-i386.json delete mode 100644 archive/debian-8.3-amd64.json delete mode 100644 archive/debian-8.3-i386.json delete mode 100644 archive/debian-8.4-amd64.json delete mode 100644 archive/debian-8.4-i386.json delete mode 100644 archive/debian-8.5-amd64.json delete mode 100644 archive/debian-8.5-i386.json delete mode 100644 archive/debian-8.6-amd64.json delete mode 100644 archive/debian-8.6-i386.json delete mode 100644 archive/fedora-20-i386.json delete mode 100644 archive/fedora-20-x86_64.json delete mode 100644 archive/fedora-21-i386.json delete mode 100644 archive/fedora-21-x86_64.json delete mode 100644 archive/fedora-22-i386.json delete mode 100644 archive/fedora-22-x86_64.json delete mode 100644 archive/freebsd-10.2-amd64.json delete mode 100644 archive/freebsd-10.2-i386.json delete mode 100644 archive/macosx-10.7.json delete mode 100644 archive/macosx-10.8.json delete mode 100644 archive/omnios-r151010j.json delete mode 100644 archive/oracle-6.6-i386.json delete mode 100644 archive/oracle-6.6-x86_64.json delete mode 100644 archive/oracle-6.7-i386.json delete mode 100644 archive/oracle-6.7-x86_64.json delete mode 100644 archive/oracle-7.2-x86_64.json delete mode 100644 archive/rhel-6.7-i386.json delete mode 100644 archive/rhel-6.7-x86_64.json delete mode 100644 archive/sles-11-sp2-i386.json delete mode 100644 archive/sles-11-sp2-x86_64.json delete mode 100644 archive/sles-11-sp3-i386.json delete mode 100644 archive/sles-11-sp3-x86_64.json delete mode 100644 archive/sles-11-sp4-i386.json delete mode 100644 archive/sles-11-sp4-x86_64.json delete mode 100644 archive/ubuntu-10.04-amd64.json delete mode 100644 archive/ubuntu-10.04-i386.json delete mode 100644 archive/ubuntu-14.10-amd64.json delete mode 100644 archive/ubuntu-14.10-i386.json delete mode 100644 archive/ubuntu-15.04-amd64.json delete mode 100644 archive/ubuntu-15.04-i386.json delete mode 100644 freebsd-9.3-amd64.json delete mode 100644 freebsd-9.3-i386.json delete mode 100644 http/freebsd-9.3/install.sh delete mode 100644 http/opensuse-13.2/autoinst.xml rename http/{ubuntu-15.10 => ubuntu-16.04}/preseed.cfg (100%) delete mode 100644 opensuse-13.2-i386.json delete mode 100644 opensuse-13.2-x86_64.json delete mode 100644 ubuntu-15.10-amd64.json delete mode 100644 ubuntu-15.10-i386.json diff --git a/README.md b/README.md index 4a09948ee..ebdf2eb30 100644 --- a/README.md +++ b/README.md @@ -2,94 +2,76 @@ [![Build Status](http://img.shields.io/travis/chef/bento.svg)][travis] -[travis]: https://travis-ci.org/chef/bento - -Bento is a project that encapsulates [Packer](https://www.packer.io/) templates for building -[Vagrant](https://www.vagrantup.com/) base boxes. We use these boxes internally at Chef Software, Inc. for -testing Hosted Chef, Chef Server and our open source [cookbooks](https://supermarket.chef.io/users/chef) -via [test-kitchen](http://kitchen.ci/). - -This project is managed by the CHEF Release Engineering team. For more information on the Release Engineering team's contribution, triage, and release process, please consult the [CHEF Release Engineering OSS Management Guide](https://docs.google.com/a/opscode.com/document/d/1oJB0vZb_3bl7_ZU2YMDBkMFdL-EWplW1BJv_FXTUOzg/edit). +Bento is a project that encapsulates [Packer](https://www.packer.io/) templates for building [Vagrant](https://www.vagrantup.com/) base boxes. We use these boxes internally at Chef Software, Inc. for testing Hosted Chef, Chef Server and our open source [cookbooks](https://supermarket.chef.io/users/chef) via [test-kitchen](http://kitchen.ci/). ## Pre-built Boxes -The following boxes are built from this repository's templates for publicly available platforms and are currently hosted via Atlas in the [bento organization](https://atlas.hashicorp.com/bento/). -Boxes listed that are struck out (~~box~~) are broken/unreleased for the current version. +The following boxes are built from this repository's templates for publicly available platforms and are currently hosted via Atlas in the [bento organization](https://atlas.hashicorp.com/bento/). Boxes listed that are struck out (~~box~~) are broken/unreleased for the current version. ### 64 bit -| | VirtualBox | VMware | Parallels | -| ------------ | ------------- | ------------- | ------------- | -| centos-5.11 | [x86_64][centos_511_64_vbox] | [x86_64][centos_511_64_vmware] | [x86_64][centos_511_64_prl] | -| centos-6.8 | [x86_64][centos_68_64_vbox] | [x86_64][centos_68_64_vmware] | [x86_64][centos_68_64_prl] | -| centos-7.3 | [x86_64][centos_73_64_vbox] | [x86_64][centos_73_64_vmware] | [x86_64][centos_73_64_prl] | -| debian-7.11 | [amd64][debian_711_64_vbox] | [amd64][debian_711_64_vmware] | [amd64][debian_711_64_prl] | -| debian-8.6 | [amd64][debian_86_64_vbox] | [amd64][debian_86_64_vmware] | [amd64][debian_86_64_prl] | -| fedora-23 | [x86_64][fedora_23_64_vbox] | [x86_64][fedora_23_64_vmware] | [x86_64][fedora_23_64_prl] | -| fedora-24 | [x86_64][fedora_24_64_vbox] | [x86_64][fedora_24_64_vmware] | [x86_64][fedora_24_64_prl] | -| fedora-25 | [x86_64][fedora_25_64_vbox] | [x86_64][fedora_25_64_vmware] | [x86_64][fedora_25_64_prl] | -| freebsd-9.3 | [amd64][freebsd_93_64_vbox] | [amd64][freebsd_93_64_vmware] | [amd64][freebsd_93_64_prl] | -| freebsd-10.3 | [amd64][freebsd_103_64_vbox] | [amd64][freebsd_103_64_vmware] | [amd64][freebsd_103_64_prl] | -| freebsd-11.0 | [amd64][freebsd_110_64_vbox] | [amd64][freebsd_110_64_vmware] | [amd64][freebsd_110_64_prl] | -| opensuse-13.2 | [x86_64][osuse_132_64_vbox] | ~~[x86_64][osuse_132_64_vmware]~~ | [x86_64][osuse_132_64_prl] | -| opensuse-leap-42.2 | ~~[x86_64][leap_422_64_vbox]~~ | [x86_64][leap_422_64_vmware] | ~~[x86_64][leap_422_64_prl]~~ | -| oracle-5.11 | [x86_64][oracle_511_64_vbox] | [x86_64][oracle_511_64_vmware] | [x86_64][oracle_511_64_prl] | -| oracle-6.8 | [x86_64][oracle_68_64_vbox] | [x86_64][oracle_68_64_vmware] | [x86_64][oracle_68_64_prl] | -| oracle-7.3 | [x86_64][oracle_73_64_vbox] | [x86_64][oracle_73_64_vmware] | [x86_64][oracle_73_64_prl] | -| ubuntu-12.04 | [amd64][ubuntu_1204_64_vbox] | [amd64][ubuntu_1204_64_vmware] | [amd64][ubuntu_1204_64_prl] | -| ubuntu-14.04 | [amd64][ubuntu_1404_64_vbox] | [amd64][ubuntu_1404_64_vmware] | [amd64][ubuntu_1404_64_prl] | -| ubuntu-16.04 | [amd64][ubuntu_1604_64_vbox] | [amd64][ubuntu_1604_64_vmware] | [amd64][ubuntu_1604_64_prl] | -| ubuntu-16.10 | [amd64][ubuntu_1610_64_vbox] | [amd64][ubuntu_1610_64_vmware] | [amd64][ubuntu_1610_64_prl] | + + | VirtualBox | VMware | Parallels +------------------ | ------------------------------ | --------------------------------- | ----------------------------- +centos-5.11 | [x86_64][centos_511_64_vbox] | [x86_64][centos_511_64_vmware] | [x86_64][centos_511_64_prl] +centos-6.8 | [x86_64][centos_68_64_vbox] | [x86_64][centos_68_64_vmware] | [x86_64][centos_68_64_prl] +centos-7.3 | [x86_64][centos_73_64_vbox] | [x86_64][centos_73_64_vmware] | [x86_64][centos_73_64_prl] +debian-7.11 | [amd64][debian_711_64_vbox] | [amd64][debian_711_64_vmware] | [amd64][debian_711_64_prl] +debian-8.6 | [amd64][debian_86_64_vbox] | [amd64][debian_86_64_vmware] | [amd64][debian_86_64_prl] +fedora-24 | [x86_64][fedora_24_64_vbox] | [x86_64][fedora_24_64_vmware] | [x86_64][fedora_24_64_prl] +fedora-25 | [x86_64][fedora_25_64_vbox] | [x86_64][fedora_25_64_vmware] | [x86_64][fedora_25_64_prl] +freebsd-10.3 | [amd64][freebsd_103_64_vbox] | [amd64][freebsd_103_64_vmware] | [amd64][freebsd_103_64_prl] +freebsd-11.0 | [amd64][freebsd_110_64_vbox] | [amd64][freebsd_110_64_vmware] | [amd64][freebsd_110_64_prl] +opensuse-leap-42.2 | ~~[x86_64][leap_422_64_vbox]~~ | [x86_64][leap_422_64_vmware] | ~~[x86_64][leap_422_64_prl]~~ +oracle-5.11 | [x86_64][oracle_511_64_vbox] | [x86_64][oracle_511_64_vmware] | [x86_64][oracle_511_64_prl] +oracle-6.8 | [x86_64][oracle_68_64_vbox] | [x86_64][oracle_68_64_vmware] | [x86_64][oracle_68_64_prl] +oracle-7.3 | [x86_64][oracle_73_64_vbox] | [x86_64][oracle_73_64_vmware] | [x86_64][oracle_73_64_prl] +ubuntu-12.04 | [amd64][ubuntu_1204_64_vbox] | [amd64][ubuntu_1204_64_vmware] | [amd64][ubuntu_1204_64_prl] +ubuntu-14.04 | [amd64][ubuntu_1404_64_vbox] | [amd64][ubuntu_1404_64_vmware] | [amd64][ubuntu_1404_64_prl] +ubuntu-16.04 | [amd64][ubuntu_1604_64_vbox] | [amd64][ubuntu_1604_64_vmware] | [amd64][ubuntu_1604_64_prl] +ubuntu-16.10 | [amd64][ubuntu_1610_64_vbox] | [amd64][ubuntu_1610_64_vmware] | [amd64][ubuntu_1610_64_prl] ### 32 bit -| | VirtualBox | VMware | Parallels | -| ------------ | ------------- | ------------- | ------------- | -| centos-5.11 | [i386][centos_511_32_vbox] | [i386][centos_511_32_vmware] | [i386][centos_511_32_prl] | -| centos-6.8 | [i386][centos_68_32_vbox] | [i386][centos_68_32_vmware] | [i386][centos_68_32_prl] | -| debian-7.11 | [i386][debian_711_32_vbox] | [i386][debian_711_32_vmware] | [i386][debian_711_32_prl] | -| debian-8.6 | [i386][debian_86_32_vbox] | [i386][debian_86_32_vmware] | [i386][debian_86_32_prl] | -| opensuse-13.2 | [i386][osuse_132_32_vbox] | ~~[i386][osuse_132_32_vmware]~~ | [i386][osuse_132_32_prl] | -| oracle-5.11 | [x86_64][oracle_511_32_vbox] | [x86_64][oracle_511_32_vmware] | [x86_64][oracle_511_32_prl] | -| oracle-6.8 | [x86_64][oracle_68_32_vbox] | [x86_64][oracle_68_32_vmware] | [x86_64][oracle_68_32_prl] | -| ubuntu-12.04 | [i386][ubuntu_1204_32_vbox] | [i386][ubuntu_1204_32_vmware] | [i386][ubuntu_1204_32_prl] | -| ubuntu-14.04 | [i386][ubuntu_1404_32_vbox] | [i386][ubuntu_1404_32_vmware] | [i386][ubuntu_1404_32_prl] | -| ubuntu-16.04 | [i386][ubuntu_1604_32_vbox] | [i386][ubuntu_1604_32_vmware] | [i386][ubuntu_1604_32_prl] | -| ubuntu-16.10 | [i386][ubuntu_1610_32_vbox] | [i386][ubuntu_1610_32_vmware] | [i386][ubuntu_1610_32_prl] | - - -*NOTE* This table tracks only the latest release for a given version. Boxes may exist in Atlas or S3 but are not -guaranteed to be updated at this time. + + | VirtualBox | VMware | Parallels +------------- | ---------------------------- | ------------------------------- | --------------------------- +centos-5.11 | [i386][centos_511_32_vbox] | [i386][centos_511_32_vmware] | [i386][centos_511_32_prl] +centos-6.8 | [i386][centos_68_32_vbox] | [i386][centos_68_32_vmware] | [i386][centos_68_32_prl] +debian-7.11 | [i386][debian_711_32_vbox] | [i386][debian_711_32_vmware] | [i386][debian_711_32_prl] +debian-8.6 | [i386][debian_86_32_vbox] | [i386][debian_86_32_vmware] | [i386][debian_86_32_prl] +oracle-5.11 | [x86_64][oracle_511_32_vbox] | [x86_64][oracle_511_32_vmware] | [x86_64][oracle_511_32_prl] +oracle-6.8 | [x86_64][oracle_68_32_vbox] | [x86_64][oracle_68_32_vmware] | [x86_64][oracle_68_32_prl] +ubuntu-12.04 | [i386][ubuntu_1204_32_vbox] | [i386][ubuntu_1204_32_vmware] | [i386][ubuntu_1204_32_prl] +ubuntu-14.04 | [i386][ubuntu_1404_32_vbox] | [i386][ubuntu_1404_32_vmware] | [i386][ubuntu_1404_32_prl] +ubuntu-16.04 | [i386][ubuntu_1604_32_vbox] | [i386][ubuntu_1604_32_vmware] | [i386][ubuntu_1604_32_prl] +ubuntu-16.10 | [i386][ubuntu_1610_32_vbox] | [i386][ubuntu_1610_32_vmware] | [i386][ubuntu_1610_32_prl] + +_NOTE_ This table tracks only the latest release for a given version. Boxes may exist in Atlas or S3 but are not guaranteed to be updated at this time. ### Build Notes -* If you're using the [Vagrant VMWare Fusion](https://www.vagrantup.com/vmware) -provider, using `vagrant box add --provider vmware_desktop ...` will work for -these boxes. Using `--provider vmware_fusion`, will not. +- If you're using the [Vagrant VMWare Fusion](https://www.vagrantup.com/vmware) provider, using `vagrant box add --provider vmware_desktop ...` will work for these boxes. Using `--provider vmware_fusion`, will not. #### VMWare Fusion 8, Packer, systemd -Recent Linux distributions use [systemd's logic to predictably name network devices](https://www.freedesktop.org/wiki/Software/systemd/PredictableNetworkInterfaceNames/). In our scenario, this is tied to the PCI slot -id. For unknown reasons, boxes built with [the default vmx config provided by packer](https://github.com/mitchellh/packer/blob/e868f9b69c995cf8a681857aa68e9be286243630/builder/vmware/iso/step_create_vmx.go#L168) use a different -PCI slot id (32 instead of 33) once they got imported to VMWare Fusion 8, which results in a different device name and finally in broken -networking. This issue is documented in the following places: +Recent Linux distributions use [systemd's logic to predictably name network devices](https://www.freedesktop.org/wiki/Software/systemd/PredictableNetworkInterfaceNames/). In our scenario, this is tied to the PCI slot id. For unknown reasons, boxes built with [the default vmx config provided by packer](https://github.com/mitchellh/packer/blob/e868f9b69c995cf8a681857aa68e9be286243630/builder/vmware/iso/step_create_vmx.go#L168) use a different PCI slot id (32 instead of 33) once they got imported to VMWare Fusion 8, which results in a different device name and finally in broken networking. This issue is documented in the following places: -- https://github.com/chef/bento/issues/554 -- https://github.com/chef/bento/pull/545#issuecomment-202988690 -- https://github.com/mitchellh/vagrant/issues/4590 +- <https://github.com/chef/bento/issues/554> +- <https://github.com/chef/bento/pull/545#issuecomment-202988690> +- <https://github.com/mitchellh/vagrant/issues/4590> -As a workaround we've started to provide the changed PCI slot id as a custom value with the packer definitions with Ubuntu 15.10+ and Debian 8+. -However this is not yet tested, may not solve the issue and/or break compatibility with other VMWare -products/versions! +As a workaround we've started to provide the changed PCI slot id as a custom value with the packer definitions with Ubuntu 15.10+ and Debian 8+. However this is not yet tested, may not solve the issue and/or break compatibility with other VMWare products/versions! ## Older Boxes -Older boxes include Chef and therefore are not compatible with some -new plugins. The full list of old boxes are available in the [old boxes file](https://github.com/chef/bento/blob/master/OLD-BOXES.md). +The contents of this Github repository represent the current state of Bento and not every packer config that has ever existed in the Bento project. As a distribution is made end of life or a newer minor version of a distribution ships, we will remove the existing configurations. At the time of the next Bento release those deprecations will be noted in the release notes. If you'd like to build that release for some reason, your best course of action is to checkout the release tag in git and use the existing configs at their last known working state. ## Using Pre-built Boxes Adding a bento box to vagrant: - $ vagrant box add bento/debian-8.6 +``` +$ vagrant box add bento/debian-8.6 +``` Using a bento box in a Vagrantfile: @@ -101,8 +83,8 @@ end ## Requirements -* [Packer](https://www.packer.io/) -* At least one virtualization provider: Virtualbox, VMware Fusion, Parallels Desktop, etc +- [Packer](https://www.packer.io/) +- At least one virtualization provider: Virtualbox, VMware Fusion, Parallels Desktop, etc ## Build Your Own Bento Boxes @@ -112,16 +94,19 @@ end $ gem install bento-ya ``` -If you use Bundler, you can add run `bundle install` from the bento repo. -Prefix commands with `bundle exec` if doing so. +If you use Bundler, you can add run `bundle install` from the bento repo. Prefix commands with `bundle exec` if doing so. To build multiple templates for all providers (VirtualBox, Fusion, Parallels, etc): - $ bento build debian-8.6-amd64 debian-8.6-i386 +``` +$ bento build debian-8.6-amd64 debian-8.6-i386 +``` To build a box for a single provider: - $ bento build --only=virtualbox-iso debian-8.6-amd64 +``` +$ bento build --only=virtualbox-iso debian-8.6-amd64 +``` ### Using `packer` @@ -129,24 +114,33 @@ Templates can still be built directly by `packer` To build a template for all providers (VirtualBox, Fusion, Parallels): - $ packer build debian-8.6-amd64.json +``` +$ packer build debian-8.6-amd64.json +``` To build a template only for a list of specific providers: - $ packer build -only=virtualbox-iso debian-8.6-amd64.json +``` +$ packer build -only=virtualbox-iso debian-8.6-amd64.json +``` To build a template for all providers except a list of specific providers: - $ packer build -except=parallels-iso,vmware-iso debian-8.6-amd64.json +``` +$ packer build -except=parallels-iso,vmware-iso debian-8.6-amd64.json +``` If you want to use a another mirror site, use the `mirror` user variable. - $ packer build -var 'mirror=http://ftp.jaist.ac.jp/pub/Linux/debian-cdimage/release' debian-8.6-amd64.json +``` +$ packer build -var 'mirror=http://ftp.jaist.ac.jp/pub/Linux/debian-cdimage/release' debian-8.6-amd64.json +``` Congratulations! You now have box(es) in the ../builds directory that you can then add to Vagrant and start testing cookbooks. Notes: -* The box_basename can be overridden like other Packer vars with ``-var 'box_basename=debian-8.6'`` + +- The box_basename can be overridden like other Packer vars with `-var 'box_basename=debian-8.6'` ### Proprietary Boxes @@ -154,43 +148,37 @@ Mac OS X, Red Hat Enterprise Linux, and SUSE Linux Enterprise Server templates a #### Mac OS X -To build a Mac OS X box, you will need to start with an installer for your desired version of OS X. You will then need to use [Tim Sutton's osx-vm-templates](https://github.com/timsutton/osx-vm-templates)/) to modify that installer for use by packer. The output of that build will include the location of the ISO and its checksum, which you can substitute into your `packer build` command, e.g.: +To build a Mac OS X box, you will need to start with an installer for your desired version of OS X. You will then need to use [Tim Sutton's osx-vm-templates](https://github.com/timsutton/osx-vm-templates)/) to modify that installer for use by packer. The output of that build will include the location of the ISO and its checksum, which you can substitute into your `packer build` command, e.g.: - $ packer build -var 'iso_checksum=<checksum>' -var 'iso_url=<iso_url>' macosx-10.11.json +``` +$ packer build -var 'iso_checksum=<checksum>' -var 'iso_url=<iso_url>' macosx-10.11.json +``` -There is a known issue where [test-kitchen](http://kitchen.ci/) starts a Mac OS X box correctly, but `vagrant up` fails due to the absence of the HGFS kernel module. This is due to a silent failure during the VMware tools installation and can be corrected by installing the VMware tools on the Mac OS X box manually. +There is a known issue where [test-kitchen](http://kitchen.ci/) starts a Mac OS X box correctly, but `vagrant up` fails due to the absence of the HGFS kernel module. This is due to a silent failure during the VMware tools installation and can be corrected by installing the VMware tools on the Mac OS X box manually. Note that, while it is possible to build OS X boxes for VirtualBox, it may not be ideal. VirtualBox provides no "guest additions" for OS X. Boxes consequently have limited networking configurability and must rely on rsync for folder syncing. VMWare, when available, is generally preferred. ### Windows -Currently the project does not include any definitions for building Windows boxes. For other approaches to building Windows boxes, please see the following -community projects: +Currently the project does not include any definitions for building Windows boxes. For other approaches to building Windows boxes, please see the following community projects: -* [Mischa Taylor's Boxcutter project](https://github.com/boxcutter) -* [Vagrant Windows Boxes and Puppet](https://github.com/ferventcoder/vagrant-windows-puppet/tree/master/baseboxes) +- [Mischa Taylor's Boxcutter project](https://github.com/boxcutter) +- [Vagrant Windows Boxes and Puppet](https://github.com/ferventcoder/vagrant-windows-puppet/tree/master/baseboxes) ### Special Note About Building from Windows Hosts -When building boxes from a Windows host system, you must ensure that kickstart configuration files (`ks.cfg` for RHEL -based systems) and preseed files (`preseed.cfg` for Debian based systems) have Unix line endings (i.e. lines end with -LF character only). Moreover, it's also a good idea to have `*.sh` scripts with Unix line endings too. +When building boxes from a Windows host system, you must ensure that kickstart configuration files (`ks.cfg` for RHEL based systems) and preseed files (`preseed.cfg` for Debian based systems) have Unix line endings (i.e. lines end with LF character only). Moreover, it's also a good idea to have `*.sh` scripts with Unix line endings too. -When these files have Windows line endings, the group creation can fail in the pre-seed phase and in turn, prevents the -user `vagrant` to be created correctly. This ultimately results in Packer not being able to connect to the newly booted -up machine with an error message that looks like this: +When these files have Windows line endings, the group creation can fail in the pre-seed phase and in turn, prevents the user `vagrant` to be created correctly. This ultimately results in Packer not being able to connect to the newly booted up machine with an error message that looks like this: ``` ==> virtualbox-iso: Waiting for SSH to become available... ==> virtualbox-iso: Error waiting for SSH: handshake failed: ssh: unable to authenticate, attempted methods [none password], no support ``` -Since Packer tries to log in with user `vagrant` but it was not created successfully in the pre-seed phase, it is unable -to connect to the machine and the packaging process stops. +Since Packer tries to log in with user `vagrant` but it was not created successfully in the pre-seed phase, it is unable to connect to the machine and the packaging process stops. -By default, when cloning this repository, git should normalize `ks.cfg`, `preseed.cfg` and `*.sh` to Unix line endings -and `*.bat` to Windows line endings, thanks to the [.gitattributes](.gitattributes) file in the repository. However, if -it's not the case because you have overridden line-ending conversion in your own git configuration, convert the offending files so they have the correct line endings. +By default, when cloning this repository, git should normalize `ks.cfg`, `preseed.cfg` and `*.sh` to Unix line endings and `*.bat` to Windows line endings, thanks to the <.gitattributes> file in the repository. However, if it's not the case because you have overridden line-ending conversion in your own git configuration, convert the offending files so they have the correct line endings. ## Bugs and Issues @@ -198,22 +186,19 @@ Please use GitHub issues to report bugs, features, or other problems. ## License & Authors -These basebox templates were converted from [veewee](https://github.com/jedi4ever/veewee) -definitions originally based on -[work done by Tim Dysinger](https://github.com/dysinger/basebox) to -make "Don't Repeat Yourself" (DRY) modular baseboxes. Thanks Tim! +These basebox templates were converted from [veewee](https://github.com/jedi4ever/veewee) definitions originally based on [work done by Tim Dysinger](https://github.com/dysinger/basebox) to make "Don't Repeat Yourself" (DRY) modular baseboxes. Thanks Tim! Mac OS X templates were adopted wholesale from [Fletcher Nichol's packer templates](https://github.com/fnichol/packer-templates). -- Author: Seth Chisamore (<schisamo@chef.io>) -- Author: Stephen Delano (<stephen@chef.io>) -- Author: Joshua Timberman (<joshua@chef.io>) -- Author: Tim Dysinger (<tim@dysinger.net>) -- Author: Chris McClimans (<chris@hippiehacker.org>) -- Author: Julian Dunn (<jdunn@chef.io>) -- Author: Tom Duffield (<tom@chef.io>) -- Author: Ross Timson (<ross@rosstimson.com>) -- Author: Fletcher Nichol (<fnichol@nichol.ca>) +- Author: Seth Chisamore ([schisamo@chef.io](mailto:schisamo@chef.io)) +- Author: Stephen Delano ([stephen@chef.io](mailto:stephen@chef.io)) +- Author: Joshua Timberman ([joshua@chef.io](mailto:joshua@chef.io)) +- Author: Tim Dysinger ([tim@dysinger.net](mailto:tim@dysinger.net)) +- Author: Chris McClimans ([chris@hippiehacker.org](mailto:chris@hippiehacker.org)) +- Author: Julian Dunn ([jdunn@chef.io](mailto:jdunn@chef.io)) +- Author: Tom Duffield ([tom@chef.io](mailto:tom@chef.io)) +- Author: Ross Timson ([ross@rosstimson.com](mailto:ross@rosstimson.com)) +- Author: Fletcher Nichol ([fnichol@nichol.ca](mailto:fnichol@nichol.ca)) ```text Copyright 2012-2016, Chef Software, Inc. (<legal@chef.io>) @@ -259,24 +244,21 @@ limitations under the License. [debian_86_64_prl]: https://atlas.hashicorp.com/bento/boxes/debian-8.6/versions/2.3.1/providers/parallels.box [debian_86_64_vbox]: https://atlas.hashicorp.com/bento/boxes/debian-8.6/versions/2.3.1/providers/virtualbox.box [debian_86_64_vmware]: https://atlas.hashicorp.com/bento/boxes/debian-8.6/versions/2.3.1/providers/vmware_desktop.box -[fedora_23_64_prl]: https://atlas.hashicorp.com/bento/boxes/fedora-23/versions/2.3.1/providers/parallels.box -[fedora_23_64_vbox]: https://atlas.hashicorp.com/bento/boxes/fedora-23/versions/2.3.1/providers/virtualbox.box -[fedora_23_64_vmware]: https://atlas.hashicorp.com/bento/boxes/fedora-23/versions/2.3.1/providers/vmware_desktop.box [fedora_24_64_prl]: https://atlas.hashicorp.com/bento/boxes/fedora-24/versions/2.3.1/providers/parallels.box [fedora_24_64_vbox]: https://atlas.hashicorp.com/bento/boxes/fedora-24/versions/2.3.1/providers/virtualbox.box [fedora_24_64_vmware]: https://atlas.hashicorp.com/bento/boxes/fedora-24/versions/2.3.1/providers/vmware_desktop.box [fedora_25_64_prl]: https://atlas.hashicorp.com/bento/boxes/fedora-25/versions/2.3.1/providers/parallels.box [fedora_25_64_vbox]: https://atlas.hashicorp.com/bento/boxes/fedora-25/versions/2.3.1/providers/virtualbox.box [fedora_25_64_vmware]: https://atlas.hashicorp.com/bento/boxes/fedora-25/versions/2.3.1/providers/vmware_desktop.box -[freebsd_93_64_prl]: https://atlas.hashicorp.com/bento/boxes/freebsd-9.3/versions/2.3.1/providers/parallels.box -[freebsd_93_64_vbox]: https://atlas.hashicorp.com/bento/boxes/freebsd-9.3/versions/2.3.1/providers/virtualbox.box -[freebsd_93_64_vmware]: https://atlas.hashicorp.com/bento/boxes/freebsd-9.3/versions/2.3.1/providers/vmware_desktop.box [freebsd_103_64_prl]: https://atlas.hashicorp.com/bento/boxes/freebsd-10.3/versions/2.3.1/providers/parallels.box [freebsd_103_64_vbox]: https://atlas.hashicorp.com/bento/boxes/freebsd-10.3/versions/2.3.1/providers/virtualbox.box [freebsd_103_64_vmware]: https://atlas.hashicorp.com/bento/boxes/freebsd-10.3/versions/2.3.1/providers/vmware_desktop.box [freebsd_110_64_prl]: https://atlas.hashicorp.com/bento/boxes/freebsd-11.0/versions/2.3.1/providers/parallels.box [freebsd_110_64_vbox]: https://atlas.hashicorp.com/bento/boxes/freebsd-11.0/versions/2.3.1/providers/virtualbox.box [freebsd_110_64_vmware]: https://atlas.hashicorp.com/bento/boxes/freebsd-11.0/versions/2.3.1/providers/vmware_desktop.box +[leap_422_64_prl]: https://atlas.hashicorp.com/bento/boxes/opensuse-leap-42.2/versions/2.3.1/providers/parallels.box +[leap_422_64_vbox]: https://atlas.hashicorp.com/bento/boxes/opensuse-leap-42.2/versions/2.3.1/providers/virtualbox.box +[leap_422_64_vmware]: https://atlas.hashicorp.com/bento/boxes/opensuse-leap-42.2/versions/2.3.1/providers/vmware_desktop.box [omnios_r151018_64_vbox]: https://atlas.hashicorp.com/bento/boxes/omnios-r151018/versions/2.3.1/providers/virtualbox.box [oracle_511_32_prl]: https://atlas.hashicorp.com/bento/boxes/oracle-5.11-i386/versions/2.3.1/providers/parallels.box [oracle_511_32_vbox]: https://atlas.hashicorp.com/bento/boxes/oracle-5.11-i386/versions/2.3.1/providers/virtualbox.box @@ -293,15 +275,7 @@ limitations under the License. [oracle_73_64_prl]: https://atlas.hashicorp.com/bento/boxes/oracle-7.3/versions/2.3.1/providers/parallels.box [oracle_73_64_vbox]: https://atlas.hashicorp.com/bento/boxes/oracle-7.3/versions/2.3.1/providers/virtualbox.box [oracle_73_64_vmware]: https://atlas.hashicorp.com/bento/boxes/oracle-7.3/versions/2.3.1/providers/vmware_desktop.box -[osuse_132_32_prl]: https://atlas.hashicorp.com/bento/boxes/opensuse-13.2-i386/versions/2.3.1/providers/parallels.box -[osuse_132_32_vbox]: https://atlas.hashicorp.com/bento/boxes/opensuse-13.2-i386/versions/2.3.1/providers/virtualbox.box -[osuse_132_32_vmware]: https://atlas.hashicorp.com/bento/boxes/opensuse-13.2-i386/versions/2.3.1/providers/vmware.box -[osuse_132_64_prl]: https://atlas.hashicorp.com/bento/boxes/opensuse-13.2/versions/2.3.1/providers/parallels.box -[osuse_132_64_vbox]: https://atlas.hashicorp.com/bento/boxes/opensuse-13.2/versions/2.3.1/providers/virtualbox.box -[osuse_132_64_vmware]: https://atlas.hashicorp.com/bento/boxes/opensuse-13.2/versions/2.3.1/providers/vmware_desktop.box -[leap_422_64_prl]: https://atlas.hashicorp.com/bento/boxes/opensuse-leap-42.2/versions/2.3.1/providers/parallels.box -[leap_422_64_vbox]: https://atlas.hashicorp.com/bento/boxes/opensuse-leap-42.2/versions/2.3.1/providers/virtualbox.box -[leap_422_64_vmware]: https://atlas.hashicorp.com/bento/boxes/opensuse-leap-42.2/versions/2.3.1/providers/vmware_desktop.box +[travis]: https://travis-ci.org/chef/bento [ubuntu_1204_32_prl]: https://atlas.hashicorp.com/bento/boxes/ubuntu-12.04-i386/versions/2.3.1/providers/parallels.box [ubuntu_1204_32_vbox]: https://atlas.hashicorp.com/bento/boxes/ubuntu-12.04-i386/versions/2.3.1/providers/virtualbox.box [ubuntu_1204_32_vmware]: https://atlas.hashicorp.com/bento/boxes/ubuntu-12.04-i386/versions/2.3.1/providers/vmware_desktop.box @@ -326,4 +300,3 @@ limitations under the License. [ubuntu_1610_64_prl]: https://atlas.hashicorp.com/bento/boxes/ubuntu-16.10/versions/2.3.1/providers/parallels.box [ubuntu_1610_64_vbox]: https://atlas.hashicorp.com/bento/boxes/ubuntu-16.10/versions/2.3.1/providers/virtualbox.box [ubuntu_1610_64_vmware]: https://atlas.hashicorp.com/bento/boxes/ubuntu-16.10/versions/2.3.1/providers/vmware_desktop.box - diff --git a/archive/debian-6.0.10-amd64.json b/archive/debian-6.0.10-amd64.json deleted file mode 100644 index 30ebb36b5..000000000 --- a/archive/debian-6.0.10-amd64.json +++ /dev/null @@ -1,238 +0,0 @@ -{ - "builders": [ - { - "boot_command": [ - "<esc><wait>", - "install <wait>", - " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}} <wait>", - "debian-installer=en_US <wait>", - "auto <wait>", - "locale=en_US <wait>", - "kbd-chooser/method=us <wait>", - "keyboard-configuration/xkb-keymap=us <wait>", - "netcfg/get_hostname={{ .Name }} <wait>", - "netcfg/get_domain=vagrantup.com <wait>", - "fb=false <wait>", - "debconf/frontend=noninteractive <wait>", - "console-setup/ask_detect=false <wait>", - "console-keymaps-at/keymap=us <wait>", - "<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", - "guest_os_type": "Debian_64", - "hard_drive_interface": "sata", - "headless": "{{ user `headless` }}", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-virtualbox", - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "virtualbox-iso", - "vboxmanage": [ - [ - "modifyvm", - "{{.Name}}", - "--memory", - "{{ user `memory` }}" - ], - [ - "modifyvm", - "{{.Name}}", - "--cpus", - "{{ user `cpus` }}" - ] - ], - "virtualbox_version_file": ".vbox_version", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<esc><wait>", - "install <wait>", - " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}} <wait>", - "debian-installer=en_US <wait>", - "auto <wait>", - "locale=en_US <wait>", - "kbd-chooser/method=us <wait>", - "keyboard-configuration/xkb-keymap=us <wait>", - "netcfg/get_hostname={{ .Name }} <wait>", - "netcfg/get_domain=vagrantup.com <wait>", - "fb=false <wait>", - "debconf/frontend=noninteractive <wait>", - "console-setup/ask_detect=false <wait>", - "console-keymaps-at/keymap=us <wait>", - "<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "debian5-64", - "headless": "{{ user `headless` }}", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-vmware", - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "tools_upload_flavor": "linux", - "type": "vmware-iso", - "vm_name": "{{ user `template` }}", - "vmx_data": { - "cpuid.coresPerSocket": "1", - "memsize": "{{ user `memory` }}", - "numvcpus": "{{ user `cpus` }}" - } - }, - { - "boot_command": [ - "<esc><wait>", - "install <wait>", - " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}} <wait>", - "debian-installer=en_US <wait>", - "auto <wait>", - "locale=en_US <wait>", - "kbd-chooser/method=us <wait>", - "keyboard-configuration/xkb-keymap=us <wait>", - "netcfg/get_hostname={{ .Name }} <wait>", - "netcfg/get_domain=vagrantup.com <wait>", - "fb=false <wait>", - "debconf/frontend=noninteractive <wait>", - "console-setup/ask_detect=false <wait>", - "console-keymaps-at/keymap=us <wait>", - "<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "debian", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-parallels", - "parallels_tools_flavor": "lin", - "prlctl": [ - [ - "set", - "{{.Name}}", - "--memsize", - "{{ user `memory` }}" - ], - [ - "set", - "{{.Name}}", - "--cpus", - "{{ user `cpus` }}" - ] - ], - "prlctl_version_file": ".prlctl_version", - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "parallels-iso", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<esc><wait>", - "install <wait>", - " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}} <wait>", - "debian-installer=en_US <wait>", - "auto <wait>", - "locale=en_US <wait>", - "kbd-chooser/method=us <wait>", - "keyboard-configuration/xkb-keymap=us <wait>", - "netcfg/get_hostname={{ .Name }} <wait>", - "netcfg/get_domain=vagrantup.com <wait>", - "fb=false <wait>", - "debconf/frontend=noninteractive <wait>", - "console-setup/ask_detect=false <wait>", - "console-keymaps-at/keymap=us <wait>", - "<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "headless": "{{ user `headless` }}", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-qemu", - "ssh_username": "vagrant", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_wait_timeout": "10000s", - "shutdown_command": "echo 'vagrant'|sudo -S /sbin/shutdown -hP now", - "type": "qemu", - "vm_name": "{{ user `template` }}" - } - ], - "post-processors": [ - { - "output": "builds/{{user `box_basename`}}.{{.Provider}}.box", - "type": "vagrant" - } - ], - "provisioners": [ - { - "destination": "/tmp/bento-metadata.json", - "source": "{{user `metadata`}}", - "type": "file" - }, - { - "environment_vars": [ - "HOME_DIR=/home/vagrant", - "http_proxy={{user `http_proxy`}}", - "https_proxy={{user `https_proxy`}}", - "no_proxy={{user `no_proxy`}}" - ], - "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", - "scripts": [ - "scripts/common/metadata.sh", - "scripts/debian/debian6-apt.sh", - "scripts/debian/update.sh", - "scripts/common/sshd.sh", - "scripts/debian/networking.sh", - "scripts/debian/sudoers.sh", - "scripts/common/vagrant.sh", - "scripts/common/vmtools.sh", - "scripts/debian/cleanup.sh", - "scripts/common/minimize.sh" - ], - "type": "shell" - } - ], - "variables": { - "box_basename": "debian-6.0.10", - "build_timestamp": "{{isotime \"20060102150405\"}}", - "cpus": "1", - "disk_size": "40960", - "git_revision": "__unknown_git_revision__", - "headless": "", - "http_proxy": "{{env `http_proxy`}}", - "https_proxy": "{{env `https_proxy`}}", - "iso_checksum": "ee3bc7fd1a1bcbf49297fe305cec935cc8012ab6ec8d37e9428d0600b060c0d8", - "iso_checksum_type": "sha256", - "iso_name": "debian-6.0.10-amd64-CD-1.iso", - "memory": "512", - "metadata": "floppy/dummy_metadata.json", - "mirror": "http://cdimage.debian.org/cdimage/archive", - "mirror_directory": "6.0.10/amd64/iso-cd", - "name": "debian-6.0.10", - "no_proxy": "{{env `no_proxy`}}", - "preseed_path": "debian-6.0/preseed.cfg", - "template": "debian-6.0.10-amd64", - "version": "2.1.TIMESTAMP" - } -} diff --git a/archive/debian-6.0.10-i386.json b/archive/debian-6.0.10-i386.json deleted file mode 100644 index 4d45329cd..000000000 --- a/archive/debian-6.0.10-i386.json +++ /dev/null @@ -1,238 +0,0 @@ -{ - "builders": [ - { - "boot_command": [ - "<esc><wait>", - "install <wait>", - " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}} <wait>", - "debian-installer=en_US <wait>", - "auto <wait>", - "locale=en_US <wait>", - "kbd-chooser/method=us <wait>", - "keyboard-configuration/xkb-keymap=us <wait>", - "netcfg/get_hostname={{ .Name }} <wait>", - "netcfg/get_domain=vagrantup.com <wait>", - "fb=false <wait>", - "debconf/frontend=noninteractive <wait>", - "console-setup/ask_detect=false <wait>", - "console-keymaps-at/keymap=us <wait>", - "<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", - "guest_os_type": "Debian", - "hard_drive_interface": "sata", - "headless": "{{ user `headless` }}", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-virtualbox", - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "virtualbox-iso", - "vboxmanage": [ - [ - "modifyvm", - "{{.Name}}", - "--memory", - "{{ user `memory` }}" - ], - [ - "modifyvm", - "{{.Name}}", - "--cpus", - "{{ user `cpus` }}" - ] - ], - "virtualbox_version_file": ".vbox_version", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<esc><wait>", - "install <wait>", - " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}} <wait>", - "debian-installer=en_US <wait>", - "auto <wait>", - "locale=en_US <wait>", - "kbd-chooser/method=us <wait>", - "keyboard-configuration/xkb-keymap=us <wait>", - "netcfg/get_hostname={{ .Name }} <wait>", - "netcfg/get_domain=vagrantup.com <wait>", - "fb=false <wait>", - "debconf/frontend=noninteractive <wait>", - "console-setup/ask_detect=false <wait>", - "console-keymaps-at/keymap=us <wait>", - "<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "debian5", - "headless": "{{ user `headless` }}", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-vmware", - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "tools_upload_flavor": "linux", - "type": "vmware-iso", - "vm_name": "{{ user `template` }}", - "vmx_data": { - "cpuid.coresPerSocket": "1", - "memsize": "{{ user `memory` }}", - "numvcpus": "{{ user `cpus` }}" - } - }, - { - "boot_command": [ - "<esc><wait>", - "install <wait>", - " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}} <wait>", - "debian-installer=en_US <wait>", - "auto <wait>", - "locale=en_US <wait>", - "kbd-chooser/method=us <wait>", - "keyboard-configuration/xkb-keymap=us <wait>", - "netcfg/get_hostname={{ .Name }} <wait>", - "netcfg/get_domain=vagrantup.com <wait>", - "fb=false <wait>", - "debconf/frontend=noninteractive <wait>", - "console-setup/ask_detect=false <wait>", - "console-keymaps-at/keymap=us <wait>", - "<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "debian", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-parallels", - "parallels_tools_flavor": "lin", - "prlctl": [ - [ - "set", - "{{.Name}}", - "--memsize", - "{{ user `memory` }}" - ], - [ - "set", - "{{.Name}}", - "--cpus", - "{{ user `cpus` }}" - ] - ], - "prlctl_version_file": ".prlctl_version", - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "parallels-iso", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<esc><wait>", - "install <wait>", - " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}} <wait>", - "debian-installer=en_US <wait>", - "auto <wait>", - "locale=en_US <wait>", - "kbd-chooser/method=us <wait>", - "keyboard-configuration/xkb-keymap=us <wait>", - "netcfg/get_hostname={{ .Name }} <wait>", - "netcfg/get_domain=vagrantup.com <wait>", - "fb=false <wait>", - "debconf/frontend=noninteractive <wait>", - "console-setup/ask_detect=false <wait>", - "console-keymaps-at/keymap=us <wait>", - "<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "headless": "{{ user `headless` }}", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-qemu", - "ssh_username": "vagrant", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_wait_timeout": "10000s", - "shutdown_command": "echo 'vagrant'|sudo -S /sbin/shutdown -hP now", - "type": "qemu", - "vm_name": "{{ user `template` }}" - } - ], - "post-processors": [ - { - "output": "builds/{{user `box_basename`}}.{{.Provider}}.box", - "type": "vagrant" - } - ], - "provisioners": [ - { - "destination": "/tmp/bento-metadata.json", - "source": "{{user `metadata`}}", - "type": "file" - }, - { - "environment_vars": [ - "HOME_DIR=/home/vagrant", - "http_proxy={{user `http_proxy`}}", - "https_proxy={{user `https_proxy`}}", - "no_proxy={{user `no_proxy`}}" - ], - "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", - "scripts": [ - "scripts/common/metadata.sh", - "scripts/debian/debian6-apt.sh", - "scripts/debian/update.sh", - "scripts/common/sshd.sh", - "scripts/debian/networking.sh", - "scripts/debian/sudoers.sh", - "scripts/common/vagrant.sh", - "scripts/common/vmtools.sh", - "scripts/debian/cleanup.sh", - "scripts/common/minimize.sh" - ], - "type": "shell" - } - ], - "variables": { - "box_basename": "debian-6.0.10-i386", - "build_timestamp": "{{isotime \"20060102150405\"}}", - "cpus": "1", - "disk_size": "40960", - "git_revision": "__unknown_git_revision__", - "headless": "", - "http_proxy": "{{env `http_proxy`}}", - "https_proxy": "{{env `https_proxy`}}", - "iso_checksum": "d2740420ba52d397c453fbfea6f5d3bcdbfe27dee666ee63b0fb1e7df1d18633", - "iso_checksum_type": "sha256", - "iso_name": "debian-6.0.10-i386-CD-1.iso", - "memory": "512", - "metadata": "floppy/dummy_metadata.json", - "mirror": "http://cdimage.debian.org/cdimage/archive", - "mirror_directory": "6.0.10/i386/iso-cd", - "name": "debian-6.0.10-i386", - "no_proxy": "{{env `no_proxy`}}", - "preseed_path": "debian-6.0/preseed.cfg", - "template": "debian-6.0.10-i386", - "version": "2.1.TIMESTAMP" - } -} diff --git a/archive/debian-7.10-amd64.json b/archive/debian-7.10-amd64.json deleted file mode 100644 index 16534d95d..000000000 --- a/archive/debian-7.10-amd64.json +++ /dev/null @@ -1,237 +0,0 @@ -{ - "builders": [ - { - "boot_command": [ - "<esc><wait>", - "install <wait>", - " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}} <wait>", - "debian-installer=en_US <wait>", - "auto <wait>", - "locale=en_US <wait>", - "kbd-chooser/method=us <wait>", - "keyboard-configuration/xkb-keymap=us <wait>", - "netcfg/get_hostname={{ .Name }} <wait>", - "netcfg/get_domain=vagrantup.com <wait>", - "fb=false <wait>", - "debconf/frontend=noninteractive <wait>", - "console-setup/ask_detect=false <wait>", - "console-keymaps-at/keymap=us <wait>", - "<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", - "guest_os_type": "Debian_64", - "hard_drive_interface": "sata", - "headless": "{{ user `headless` }}", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-virtualbox", - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "virtualbox-iso", - "vboxmanage": [ - [ - "modifyvm", - "{{.Name}}", - "--memory", - "{{ user `memory` }}" - ], - [ - "modifyvm", - "{{.Name}}", - "--cpus", - "{{ user `cpus` }}" - ] - ], - "virtualbox_version_file": ".vbox_version", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<esc><wait>", - "install <wait>", - " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}} <wait>", - "debian-installer=en_US <wait>", - "auto <wait>", - "locale=en_US <wait>", - "kbd-chooser/method=us <wait>", - "keyboard-configuration/xkb-keymap=us <wait>", - "netcfg/get_hostname={{ .Name }} <wait>", - "netcfg/get_domain=vagrantup.com <wait>", - "fb=false <wait>", - "debconf/frontend=noninteractive <wait>", - "console-setup/ask_detect=false <wait>", - "console-keymaps-at/keymap=us <wait>", - "<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "debian7-64", - "headless": "{{ user `headless` }}", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-vmware", - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "tools_upload_flavor": "linux", - "type": "vmware-iso", - "vm_name": "{{ user `template` }}", - "vmx_data": { - "cpuid.coresPerSocket": "1", - "memsize": "{{ user `memory` }}", - "numvcpus": "{{ user `cpus` }}" - } - }, - { - "boot_command": [ - "<esc><wait>", - "install <wait>", - " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}} <wait>", - "debian-installer=en_US <wait>", - "auto <wait>", - "locale=en_US <wait>", - "kbd-chooser/method=us <wait>", - "keyboard-configuration/xkb-keymap=us <wait>", - "netcfg/get_hostname={{ .Name }} <wait>", - "netcfg/get_domain=vagrantup.com <wait>", - "fb=false <wait>", - "debconf/frontend=noninteractive <wait>", - "console-setup/ask_detect=false <wait>", - "console-keymaps-at/keymap=us <wait>", - "<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "debian", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-parallels", - "parallels_tools_flavor": "lin", - "prlctl": [ - [ - "set", - "{{.Name}}", - "--memsize", - "{{ user `memory` }}" - ], - [ - "set", - "{{.Name}}", - "--cpus", - "{{ user `cpus` }}" - ] - ], - "prlctl_version_file": ".prlctl_version", - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "parallels-iso", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<esc><wait>", - "install <wait>", - "preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/debian-7/preseed.cfg <wait>", - "debian-installer=en_US <wait>", - "auto <wait>", - "locale=en_US <wait>", - "kbd-chooser/method=us <wait>", - "keyboard-configuration/xkb-keymap=us <wait>", - "netcfg/get_hostname={{ .Name }} <wait>", - "netcfg/get_domain=vagrantup.com <wait>", - "fb=false <wait>", - "debconf/frontend=noninteractive <wait>", - "console-setup/ask_detect=false <wait>", - "console-keymaps-at/keymap=us <wait>", - "<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "headless": "{{ user `headless` }}", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-qemu", - "ssh_username": "vagrant", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_wait_timeout": "10000s", - "shutdown_command": "echo 'vagrant'|sudo -S /sbin/shutdown -hP now", - "type": "qemu", - "vm_name": "{{ user `template` }}" - } - ], - "post-processors": [ - { - "output": "builds/{{user `box_basename`}}.{{.Provider}}.box", - "type": "vagrant" - } - ], - "provisioners": [ - { - "destination": "/tmp/bento-metadata.json", - "source": "{{user `metadata`}}", - "type": "file" - }, - { - "environment_vars": [ - "HOME_DIR=/home/vagrant", - "http_proxy={{user `http_proxy`}}", - "https_proxy={{user `https_proxy`}}", - "no_proxy={{user `no_proxy`}}" - ], - "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", - "scripts": [ - "scripts/common/metadata.sh", - "scripts/debian/update.sh", - "scripts/common/sshd.sh", - "scripts/debian/networking.sh", - "scripts/debian/sudoers.sh", - "scripts/common/vagrant.sh", - "scripts/common/vmtools.sh", - "scripts/debian/cleanup.sh", - "scripts/common/minimize.sh" - ], - "type": "shell" - } - ], - "variables": { - "box_basename": "debian-7.10", - "build_timestamp": "{{isotime \"20060102150405\"}}", - "cpus": "1", - "disk_size": "40960", - "git_revision": "__unknown_git_revision__", - "headless": "", - "http_proxy": "{{env `http_proxy`}}", - "https_proxy": "{{env `https_proxy`}}", - "iso_checksum": "cc594c96126d39e33e83ba083c4bd61471ffd95bc1a0b5334ac58dec7a17a5f7", - "iso_checksum_type": "sha256", - "iso_name": "debian-7.10.0-amd64-CD-1.iso", - "memory": "512", - "metadata": "floppy/dummy_metadata.json", - "mirror": "http://cdimage.debian.org/cdimage/archive", - "mirror_directory": "7.10.0/amd64/iso-cd", - "name": "debian-7.10", - "no_proxy": "{{env `no_proxy`}}", - "preseed_path": "debian-7/preseed.cfg", - "template": "debian-7.10-amd64", - "version": "2.1.TIMESTAMP" - } -} diff --git a/archive/debian-7.10-i386.json b/archive/debian-7.10-i386.json deleted file mode 100644 index c9e808959..000000000 --- a/archive/debian-7.10-i386.json +++ /dev/null @@ -1,237 +0,0 @@ -{ - "builders": [ - { - "boot_command": [ - "<esc><wait>", - "install <wait>", - " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}} <wait>", - "debian-installer=en_US <wait>", - "auto <wait>", - "locale=en_US <wait>", - "kbd-chooser/method=us <wait>", - "keyboard-configuration/xkb-keymap=us <wait>", - "netcfg/get_hostname={{ .Name }} <wait>", - "netcfg/get_domain=vagrantup.com <wait>", - "fb=false <wait>", - "debconf/frontend=noninteractive <wait>", - "console-setup/ask_detect=false <wait>", - "console-keymaps-at/keymap=us <wait>", - "<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", - "guest_os_type": "Debian", - "hard_drive_interface": "sata", - "headless": "{{ user `headless` }}", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-virtualbox", - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "virtualbox-iso", - "vboxmanage": [ - [ - "modifyvm", - "{{.Name}}", - "--memory", - "{{ user `memory` }}" - ], - [ - "modifyvm", - "{{.Name}}", - "--cpus", - "{{ user `cpus` }}" - ] - ], - "virtualbox_version_file": ".vbox_version", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<esc><wait>", - "install <wait>", - " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}} <wait>", - "debian-installer=en_US <wait>", - "auto <wait>", - "locale=en_US <wait>", - "kbd-chooser/method=us <wait>", - "keyboard-configuration/xkb-keymap=us <wait>", - "netcfg/get_hostname={{ .Name }} <wait>", - "netcfg/get_domain=vagrantup.com <wait>", - "fb=false <wait>", - "debconf/frontend=noninteractive <wait>", - "console-setup/ask_detect=false <wait>", - "console-keymaps-at/keymap=us <wait>", - "<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "debian7", - "headless": "{{ user `headless` }}", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-vmware", - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "tools_upload_flavor": "linux", - "type": "vmware-iso", - "vm_name": "{{ user `template` }}", - "vmx_data": { - "cpuid.coresPerSocket": "1", - "memsize": "{{ user `memory` }}", - "numvcpus": "{{ user `cpus` }}" - } - }, - { - "boot_command": [ - "<esc><wait>", - "install <wait>", - " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}} <wait>", - "debian-installer=en_US <wait>", - "auto <wait>", - "locale=en_US <wait>", - "kbd-chooser/method=us <wait>", - "keyboard-configuration/xkb-keymap=us <wait>", - "netcfg/get_hostname={{ .Name }} <wait>", - "netcfg/get_domain=vagrantup.com <wait>", - "fb=false <wait>", - "debconf/frontend=noninteractive <wait>", - "console-setup/ask_detect=false <wait>", - "console-keymaps-at/keymap=us <wait>", - "<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "debian", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-parallels", - "parallels_tools_flavor": "lin", - "prlctl": [ - [ - "set", - "{{.Name}}", - "--memsize", - "{{ user `memory` }}" - ], - [ - "set", - "{{.Name}}", - "--cpus", - "{{ user `cpus` }}" - ] - ], - "prlctl_version_file": ".prlctl_version", - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "parallels-iso", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<esc><wait>", - "install <wait>", - "preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/debian-7/preseed.cfg <wait>", - "debian-installer=en_US <wait>", - "auto <wait>", - "locale=en_US <wait>", - "kbd-chooser/method=us <wait>", - "keyboard-configuration/xkb-keymap=us <wait>", - "netcfg/get_hostname={{ .Name }} <wait>", - "netcfg/get_domain=vagrantup.com <wait>", - "fb=false <wait>", - "debconf/frontend=noninteractive <wait>", - "console-setup/ask_detect=false <wait>", - "console-keymaps-at/keymap=us <wait>", - "<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "headless": "{{ user `headless` }}", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-qemu", - "ssh_username": "vagrant", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_wait_timeout": "10000s", - "shutdown_command": "echo 'vagrant'|sudo -S /sbin/shutdown -hP now", - "type": "qemu", - "vm_name": "{{ user `template` }}" - } - ], - "post-processors": [ - { - "output": "builds/{{user `box_basename`}}.{{.Provider}}.box", - "type": "vagrant" - } - ], - "provisioners": [ - { - "destination": "/tmp/bento-metadata.json", - "source": "{{user `metadata`}}", - "type": "file" - }, - { - "environment_vars": [ - "HOME_DIR=/home/vagrant", - "http_proxy={{user `http_proxy`}}", - "https_proxy={{user `https_proxy`}}", - "no_proxy={{user `no_proxy`}}" - ], - "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", - "scripts": [ - "scripts/common/metadata.sh", - "scripts/debian/update.sh", - "scripts/common/sshd.sh", - "scripts/debian/networking.sh", - "scripts/debian/sudoers.sh", - "scripts/common/vagrant.sh", - "scripts/common/vmtools.sh", - "scripts/debian/cleanup.sh", - "scripts/common/minimize.sh" - ], - "type": "shell" - } - ], - "variables": { - "box_basename": "debian-7.10-i386", - "build_timestamp": "{{isotime \"20060102150405\"}}", - "cpus": "1", - "disk_size": "40960", - "git_revision": "__unknown_git_revision__", - "headless": "", - "http_proxy": "{{env `http_proxy`}}", - "https_proxy": "{{env `https_proxy`}}", - "iso_checksum": "34f496893f7951cc3a35704f5776d652266595116937d46ba2562b1ed25eb4b0", - "iso_checksum_type": "sha256", - "iso_name": "debian-7.10.0-i386-CD-1.iso", - "memory": "512", - "metadata": "floppy/dummy_metadata.json", - "mirror": "http://cdimage.debian.org/cdimage/archive", - "mirror_directory": "7.10.0/i386/iso-cd", - "name": "debian-7.10-i386", - "no_proxy": "{{env `no_proxy`}}", - "preseed_path": "debian-7/preseed.cfg", - "template": "debian-7.10-i386", - "version": "2.1.TIMESTAMP" - } -} diff --git a/archive/debian-7.8-amd64.json b/archive/debian-7.8-amd64.json deleted file mode 100644 index 0535e9c5b..000000000 --- a/archive/debian-7.8-amd64.json +++ /dev/null @@ -1,237 +0,0 @@ -{ - "builders": [ - { - "boot_command": [ - "<esc><wait>", - "install <wait>", - " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}} <wait>", - "debian-installer=en_US <wait>", - "auto <wait>", - "locale=en_US <wait>", - "kbd-chooser/method=us <wait>", - "keyboard-configuration/xkb-keymap=us <wait>", - "netcfg/get_hostname={{ .Name }} <wait>", - "netcfg/get_domain=vagrantup.com <wait>", - "fb=false <wait>", - "debconf/frontend=noninteractive <wait>", - "console-setup/ask_detect=false <wait>", - "console-keymaps-at/keymap=us <wait>", - "<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", - "guest_os_type": "Debian_64", - "hard_drive_interface": "sata", - "headless": "{{ user `headless` }}", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-virtualbox", - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "virtualbox-iso", - "vboxmanage": [ - [ - "modifyvm", - "{{.Name}}", - "--memory", - "{{ user `memory` }}" - ], - [ - "modifyvm", - "{{.Name}}", - "--cpus", - "{{ user `cpus` }}" - ] - ], - "virtualbox_version_file": ".vbox_version", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<esc><wait>", - "install <wait>", - " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}} <wait>", - "debian-installer=en_US <wait>", - "auto <wait>", - "locale=en_US <wait>", - "kbd-chooser/method=us <wait>", - "keyboard-configuration/xkb-keymap=us <wait>", - "netcfg/get_hostname={{ .Name }} <wait>", - "netcfg/get_domain=vagrantup.com <wait>", - "fb=false <wait>", - "debconf/frontend=noninteractive <wait>", - "console-setup/ask_detect=false <wait>", - "console-keymaps-at/keymap=us <wait>", - "<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "debian7-64", - "headless": "{{ user `headless` }}", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-vmware", - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "tools_upload_flavor": "linux", - "type": "vmware-iso", - "vm_name": "{{ user `template` }}", - "vmx_data": { - "cpuid.coresPerSocket": "1", - "memsize": "{{ user `memory` }}", - "numvcpus": "{{ user `cpus` }}" - } - }, - { - "boot_command": [ - "<esc><wait>", - "install <wait>", - " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}} <wait>", - "debian-installer=en_US <wait>", - "auto <wait>", - "locale=en_US <wait>", - "kbd-chooser/method=us <wait>", - "keyboard-configuration/xkb-keymap=us <wait>", - "netcfg/get_hostname={{ .Name }} <wait>", - "netcfg/get_domain=vagrantup.com <wait>", - "fb=false <wait>", - "debconf/frontend=noninteractive <wait>", - "console-setup/ask_detect=false <wait>", - "console-keymaps-at/keymap=us <wait>", - "<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "debian", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-parallels", - "parallels_tools_flavor": "lin", - "prlctl": [ - [ - "set", - "{{.Name}}", - "--memsize", - "{{ user `memory` }}" - ], - [ - "set", - "{{.Name}}", - "--cpus", - "{{ user `cpus` }}" - ] - ], - "prlctl_version_file": ".prlctl_version", - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "parallels-iso", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<esc><wait>", - "install <wait>", - " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}} <wait>", - "debian-installer=en_US <wait>", - "auto <wait>", - "locale=en_US <wait>", - "kbd-chooser/method=us <wait>", - "keyboard-configuration/xkb-keymap=us <wait>", - "netcfg/get_hostname={{ .Name }} <wait>", - "netcfg/get_domain=vagrantup.com <wait>", - "fb=false <wait>", - "debconf/frontend=noninteractive <wait>", - "console-setup/ask_detect=false <wait>", - "console-keymaps-at/keymap=us <wait>", - "<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "headless": "{{ user `headless` }}", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-qemu", - "ssh_username": "vagrant", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_wait_timeout": "10000s", - "shutdown_command": "echo 'vagrant'|sudo -S /sbin/shutdown -hP now", - "type": "qemu", - "vm_name": "{{ user `template` }}" - } - ], - "post-processors": [ - { - "output": "builds/{{user `box_basename`}}.{{.Provider}}.box", - "type": "vagrant" - } - ], - "provisioners": [ - { - "destination": "/tmp/bento-metadata.json", - "source": "{{user `metadata`}}", - "type": "file" - }, - { - "environment_vars": [ - "HOME_DIR=/home/vagrant", - "http_proxy={{user `http_proxy`}}", - "https_proxy={{user `https_proxy`}}", - "no_proxy={{user `no_proxy`}}" - ], - "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", - "scripts": [ - "scripts/common/metadata.sh", - "scripts/debian/update.sh", - "scripts/common/sshd.sh", - "scripts/debian/networking.sh", - "scripts/debian/sudoers.sh", - "scripts/common/vagrant.sh", - "scripts/common/vmtools.sh", - "scripts/debian/cleanup.sh", - "scripts/common/minimize.sh" - ], - "type": "shell" - } - ], - "variables": { - "box_basename": "debian-7.8", - "build_timestamp": "{{isotime \"20060102150405\"}}", - "cpus": "1", - "disk_size": "40960", - "git_revision": "__unknown_git_revision__", - "headless": "", - "http_proxy": "{{env `http_proxy`}}", - "https_proxy": "{{env `https_proxy`}}", - "iso_checksum": "5f611b40b0803f8be1180da561cfbc159e381599", - "iso_checksum_type": "sha1", - "iso_name": "debian-7.8.0-amd64-CD-1.iso", - "memory": "512", - "metadata": "floppy/dummy_metadata.json", - "mirror": "http://cdimage.debian.org/cdimage/archive", - "mirror_directory": "7.8.0/amd64/iso-cd", - "name": "debian-7.8", - "no_proxy": "{{env `no_proxy`}}", - "preseed_path": "debian-7/preseed.cfg", - "template": "debian-7.8-amd64", - "version": "2.1.TIMESTAMP" - } -} diff --git a/archive/debian-7.8-i386.json b/archive/debian-7.8-i386.json deleted file mode 100644 index 38c601272..000000000 --- a/archive/debian-7.8-i386.json +++ /dev/null @@ -1,237 +0,0 @@ -{ - "builders": [ - { - "boot_command": [ - "<esc><wait>", - "install <wait>", - " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}} <wait>", - "debian-installer=en_US <wait>", - "auto <wait>", - "locale=en_US <wait>", - "kbd-chooser/method=us <wait>", - "keyboard-configuration/xkb-keymap=us <wait>", - "netcfg/get_hostname={{ .Name }} <wait>", - "netcfg/get_domain=vagrantup.com <wait>", - "fb=false <wait>", - "debconf/frontend=noninteractive <wait>", - "console-setup/ask_detect=false <wait>", - "console-keymaps-at/keymap=us <wait>", - "<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", - "guest_os_type": "Debian", - "hard_drive_interface": "sata", - "headless": "{{ user `headless` }}", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-virtualbox", - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "virtualbox-iso", - "vboxmanage": [ - [ - "modifyvm", - "{{.Name}}", - "--memory", - "{{ user `memory` }}" - ], - [ - "modifyvm", - "{{.Name}}", - "--cpus", - "{{ user `cpus` }}" - ] - ], - "virtualbox_version_file": ".vbox_version", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<esc><wait>", - "install <wait>", - " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}} <wait>", - "debian-installer=en_US <wait>", - "auto <wait>", - "locale=en_US <wait>", - "kbd-chooser/method=us <wait>", - "keyboard-configuration/xkb-keymap=us <wait>", - "netcfg/get_hostname={{ .Name }} <wait>", - "netcfg/get_domain=vagrantup.com <wait>", - "fb=false <wait>", - "debconf/frontend=noninteractive <wait>", - "console-setup/ask_detect=false <wait>", - "console-keymaps-at/keymap=us <wait>", - "<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "debian7", - "headless": "{{ user `headless` }}", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-vmware", - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "tools_upload_flavor": "linux", - "type": "vmware-iso", - "vm_name": "{{ user `template` }}", - "vmx_data": { - "cpuid.coresPerSocket": "1", - "memsize": "{{ user `memory` }}", - "numvcpus": "{{ user `cpus` }}" - } - }, - { - "boot_command": [ - "<esc><wait>", - "install <wait>", - " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}} <wait>", - "debian-installer=en_US <wait>", - "auto <wait>", - "locale=en_US <wait>", - "kbd-chooser/method=us <wait>", - "keyboard-configuration/xkb-keymap=us <wait>", - "netcfg/get_hostname={{ .Name }} <wait>", - "netcfg/get_domain=vagrantup.com <wait>", - "fb=false <wait>", - "debconf/frontend=noninteractive <wait>", - "console-setup/ask_detect=false <wait>", - "console-keymaps-at/keymap=us <wait>", - "<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "debian", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-parallels", - "parallels_tools_flavor": "lin", - "prlctl": [ - [ - "set", - "{{.Name}}", - "--memsize", - "{{ user `memory` }}" - ], - [ - "set", - "{{.Name}}", - "--cpus", - "{{ user `cpus` }}" - ] - ], - "prlctl_version_file": ".prlctl_version", - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "parallels-iso", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<esc><wait>", - "install <wait>", - " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}} <wait>", - "debian-installer=en_US <wait>", - "auto <wait>", - "locale=en_US <wait>", - "kbd-chooser/method=us <wait>", - "keyboard-configuration/xkb-keymap=us <wait>", - "netcfg/get_hostname={{ .Name }} <wait>", - "netcfg/get_domain=vagrantup.com <wait>", - "fb=false <wait>", - "debconf/frontend=noninteractive <wait>", - "console-setup/ask_detect=false <wait>", - "console-keymaps-at/keymap=us <wait>", - "<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "headless": "{{ user `headless` }}", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-qemu", - "ssh_username": "vagrant", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_wait_timeout": "10000s", - "shutdown_command": "echo 'vagrant'|sudo -S /sbin/shutdown -hP now", - "type": "qemu", - "vm_name": "{{ user `template` }}" - } - ], - "post-processors": [ - { - "output": "builds/{{user `box_basename`}}.{{.Provider}}.box", - "type": "vagrant" - } - ], - "provisioners": [ - { - "destination": "/tmp/bento-metadata.json", - "source": "{{user `metadata`}}", - "type": "file" - }, - { - "environment_vars": [ - "HOME_DIR=/home/vagrant", - "http_proxy={{user `http_proxy`}}", - "https_proxy={{user `https_proxy`}}", - "no_proxy={{user `no_proxy`}}" - ], - "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", - "scripts": [ - "scripts/common/metadata.sh", - "scripts/debian/update.sh", - "scripts/common/sshd.sh", - "scripts/debian/networking.sh", - "scripts/debian/sudoers.sh", - "scripts/common/vagrant.sh", - "scripts/common/vmtools.sh", - "scripts/debian/cleanup.sh", - "scripts/common/minimize.sh" - ], - "type": "shell" - } - ], - "variables": { - "box_basename": "debian-7.8-i386", - "build_timestamp": "{{isotime \"20060102150405\"}}", - "cpus": "1", - "disk_size": "40960", - "git_revision": "__unknown_git_revision__", - "headless": "", - "http_proxy": "{{env `http_proxy`}}", - "https_proxy": "{{env `https_proxy`}}", - "iso_checksum": "d87664e590f39aba725ec9705dc58a8c75417fef", - "iso_checksum_type": "sha1", - "iso_name": "debian-7.8.0-i386-CD-1.iso", - "memory": "512", - "metadata": "floppy/dummy_metadata.json", - "mirror": "http://cdimage.debian.org/cdimage/archive", - "mirror_directory": "7.8.0/i386/iso-cd", - "name": "debian-7.8-i386", - "no_proxy": "{{env `no_proxy`}}", - "preseed_path": "debian-7/preseed.cfg", - "template": "debian-7.8-i386", - "version": "2.1.TIMESTAMP" - } -} diff --git a/archive/debian-7.9-amd64.json b/archive/debian-7.9-amd64.json deleted file mode 100644 index 316dd40f2..000000000 --- a/archive/debian-7.9-amd64.json +++ /dev/null @@ -1,237 +0,0 @@ -{ - "builders": [ - { - "boot_command": [ - "<esc><wait>", - "install <wait>", - " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}} <wait>", - "debian-installer=en_US <wait>", - "auto <wait>", - "locale=en_US <wait>", - "kbd-chooser/method=us <wait>", - "keyboard-configuration/xkb-keymap=us <wait>", - "netcfg/get_hostname={{ .Name }} <wait>", - "netcfg/get_domain=vagrantup.com <wait>", - "fb=false <wait>", - "debconf/frontend=noninteractive <wait>", - "console-setup/ask_detect=false <wait>", - "console-keymaps-at/keymap=us <wait>", - "<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", - "guest_os_type": "Debian_64", - "hard_drive_interface": "sata", - "headless": "{{ user `headless` }}", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-virtualbox", - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "virtualbox-iso", - "vboxmanage": [ - [ - "modifyvm", - "{{.Name}}", - "--memory", - "{{ user `memory` }}" - ], - [ - "modifyvm", - "{{.Name}}", - "--cpus", - "{{ user `cpus` }}" - ] - ], - "virtualbox_version_file": ".vbox_version", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<esc><wait>", - "install <wait>", - " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}} <wait>", - "debian-installer=en_US <wait>", - "auto <wait>", - "locale=en_US <wait>", - "kbd-chooser/method=us <wait>", - "keyboard-configuration/xkb-keymap=us <wait>", - "netcfg/get_hostname={{ .Name }} <wait>", - "netcfg/get_domain=vagrantup.com <wait>", - "fb=false <wait>", - "debconf/frontend=noninteractive <wait>", - "console-setup/ask_detect=false <wait>", - "console-keymaps-at/keymap=us <wait>", - "<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "debian7-64", - "headless": "{{ user `headless` }}", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-vmware", - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "tools_upload_flavor": "linux", - "type": "vmware-iso", - "vm_name": "{{ user `template` }}", - "vmx_data": { - "cpuid.coresPerSocket": "1", - "memsize": "{{ user `memory` }}", - "numvcpus": "{{ user `cpus` }}" - } - }, - { - "boot_command": [ - "<esc><wait>", - "install <wait>", - " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}} <wait>", - "debian-installer=en_US <wait>", - "auto <wait>", - "locale=en_US <wait>", - "kbd-chooser/method=us <wait>", - "keyboard-configuration/xkb-keymap=us <wait>", - "netcfg/get_hostname={{ .Name }} <wait>", - "netcfg/get_domain=vagrantup.com <wait>", - "fb=false <wait>", - "debconf/frontend=noninteractive <wait>", - "console-setup/ask_detect=false <wait>", - "console-keymaps-at/keymap=us <wait>", - "<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "debian", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-parallels", - "parallels_tools_flavor": "lin", - "prlctl": [ - [ - "set", - "{{.Name}}", - "--memsize", - "{{ user `memory` }}" - ], - [ - "set", - "{{.Name}}", - "--cpus", - "{{ user `cpus` }}" - ] - ], - "prlctl_version_file": ".prlctl_version", - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "parallels-iso", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<esc><wait>", - "install <wait>", - "preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/debian-7/preseed.cfg <wait>", - "debian-installer=en_US <wait>", - "auto <wait>", - "locale=en_US <wait>", - "kbd-chooser/method=us <wait>", - "keyboard-configuration/xkb-keymap=us <wait>", - "netcfg/get_hostname={{ .Name }} <wait>", - "netcfg/get_domain=vagrantup.com <wait>", - "fb=false <wait>", - "debconf/frontend=noninteractive <wait>", - "console-setup/ask_detect=false <wait>", - "console-keymaps-at/keymap=us <wait>", - "<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "headless": "{{ user `headless` }}", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-qemu", - "ssh_username": "vagrant", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_wait_timeout": "10000s", - "shutdown_command": "echo 'vagrant'|sudo -S /sbin/shutdown -hP now", - "type": "qemu", - "vm_name": "{{ user `template` }}" - } - ], - "post-processors": [ - { - "output": "builds/{{user `box_basename`}}.{{.Provider}}.box", - "type": "vagrant" - } - ], - "provisioners": [ - { - "destination": "/tmp/bento-metadata.json", - "source": "{{user `metadata`}}", - "type": "file" - }, - { - "environment_vars": [ - "HOME_DIR=/home/vagrant", - "http_proxy={{user `http_proxy`}}", - "https_proxy={{user `https_proxy`}}", - "no_proxy={{user `no_proxy`}}" - ], - "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", - "scripts": [ - "scripts/common/metadata.sh", - "scripts/debian/update.sh", - "scripts/common/sshd.sh", - "scripts/debian/networking.sh", - "scripts/debian/sudoers.sh", - "scripts/common/vagrant.sh", - "scripts/common/vmtools.sh", - "scripts/debian/cleanup.sh", - "scripts/common/minimize.sh" - ], - "type": "shell" - } - ], - "variables": { - "box_basename": "debian-7.9", - "build_timestamp": "{{isotime \"20060102150405\"}}", - "cpus": "1", - "disk_size": "40960", - "git_revision": "__unknown_git_revision__", - "headless": "", - "http_proxy": "{{env `http_proxy`}}", - "https_proxy": "{{env `https_proxy`}}", - "iso_checksum": "86fc1138497ce37dc502383e0326614d9d102c75ea6b43d22a9c7580b26349f4", - "iso_checksum_type": "sha256", - "iso_name": "debian-7.9.0-amd64-CD-1.iso", - "memory": "512", - "metadata": "floppy/dummy_metadata.json", - "mirror": "http://cdimage.debian.org/cdimage/archive", - "mirror_directory": "7.9.0/amd64/iso-cd", - "name": "debian-7.9", - "no_proxy": "{{env `no_proxy`}}", - "preseed_path": "debian-7/preseed.cfg", - "template": "debian-7.9-amd64", - "version": "2.1.TIMESTAMP" - } -} diff --git a/archive/debian-7.9-i386.json b/archive/debian-7.9-i386.json deleted file mode 100644 index 8b4afcb06..000000000 --- a/archive/debian-7.9-i386.json +++ /dev/null @@ -1,237 +0,0 @@ -{ - "builders": [ - { - "boot_command": [ - "<esc><wait>", - "install <wait>", - " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}} <wait>", - "debian-installer=en_US <wait>", - "auto <wait>", - "locale=en_US <wait>", - "kbd-chooser/method=us <wait>", - "keyboard-configuration/xkb-keymap=us <wait>", - "netcfg/get_hostname={{ .Name }} <wait>", - "netcfg/get_domain=vagrantup.com <wait>", - "fb=false <wait>", - "debconf/frontend=noninteractive <wait>", - "console-setup/ask_detect=false <wait>", - "console-keymaps-at/keymap=us <wait>", - "<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", - "guest_os_type": "Debian", - "hard_drive_interface": "sata", - "headless": "{{ user `headless` }}", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-virtualbox", - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "virtualbox-iso", - "vboxmanage": [ - [ - "modifyvm", - "{{.Name}}", - "--memory", - "{{ user `memory` }}" - ], - [ - "modifyvm", - "{{.Name}}", - "--cpus", - "{{ user `cpus` }}" - ] - ], - "virtualbox_version_file": ".vbox_version", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<esc><wait>", - "install <wait>", - " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}} <wait>", - "debian-installer=en_US <wait>", - "auto <wait>", - "locale=en_US <wait>", - "kbd-chooser/method=us <wait>", - "keyboard-configuration/xkb-keymap=us <wait>", - "netcfg/get_hostname={{ .Name }} <wait>", - "netcfg/get_domain=vagrantup.com <wait>", - "fb=false <wait>", - "debconf/frontend=noninteractive <wait>", - "console-setup/ask_detect=false <wait>", - "console-keymaps-at/keymap=us <wait>", - "<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "debian7", - "headless": "{{ user `headless` }}", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-vmware", - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "tools_upload_flavor": "linux", - "type": "vmware-iso", - "vm_name": "{{ user `template` }}", - "vmx_data": { - "cpuid.coresPerSocket": "1", - "memsize": "{{ user `memory` }}", - "numvcpus": "{{ user `cpus` }}" - } - }, - { - "boot_command": [ - "<esc><wait>", - "install <wait>", - " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}} <wait>", - "debian-installer=en_US <wait>", - "auto <wait>", - "locale=en_US <wait>", - "kbd-chooser/method=us <wait>", - "keyboard-configuration/xkb-keymap=us <wait>", - "netcfg/get_hostname={{ .Name }} <wait>", - "netcfg/get_domain=vagrantup.com <wait>", - "fb=false <wait>", - "debconf/frontend=noninteractive <wait>", - "console-setup/ask_detect=false <wait>", - "console-keymaps-at/keymap=us <wait>", - "<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "debian", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-parallels", - "parallels_tools_flavor": "lin", - "prlctl": [ - [ - "set", - "{{.Name}}", - "--memsize", - "{{ user `memory` }}" - ], - [ - "set", - "{{.Name}}", - "--cpus", - "{{ user `cpus` }}" - ] - ], - "prlctl_version_file": ".prlctl_version", - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "parallels-iso", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<esc><wait>", - "install <wait>", - "preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/debian-7/preseed.cfg <wait>", - "debian-installer=en_US <wait>", - "auto <wait>", - "locale=en_US <wait>", - "kbd-chooser/method=us <wait>", - "keyboard-configuration/xkb-keymap=us <wait>", - "netcfg/get_hostname={{ .Name }} <wait>", - "netcfg/get_domain=vagrantup.com <wait>", - "fb=false <wait>", - "debconf/frontend=noninteractive <wait>", - "console-setup/ask_detect=false <wait>", - "console-keymaps-at/keymap=us <wait>", - "<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "headless": "{{ user `headless` }}", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-qemu", - "ssh_username": "vagrant", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_wait_timeout": "10000s", - "shutdown_command": "echo 'vagrant'|sudo -S /sbin/shutdown -hP now", - "type": "qemu", - "vm_name": "{{ user `template` }}" - } - ], - "post-processors": [ - { - "output": "builds/{{user `box_basename`}}.{{.Provider}}.box", - "type": "vagrant" - } - ], - "provisioners": [ - { - "destination": "/tmp/bento-metadata.json", - "source": "{{user `metadata`}}", - "type": "file" - }, - { - "environment_vars": [ - "HOME_DIR=/home/vagrant", - "http_proxy={{user `http_proxy`}}", - "https_proxy={{user `https_proxy`}}", - "no_proxy={{user `no_proxy`}}" - ], - "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", - "scripts": [ - "scripts/common/metadata.sh", - "scripts/debian/update.sh", - "scripts/common/sshd.sh", - "scripts/debian/networking.sh", - "scripts/debian/sudoers.sh", - "scripts/common/vagrant.sh", - "scripts/common/vmtools.sh", - "scripts/debian/cleanup.sh", - "scripts/common/minimize.sh" - ], - "type": "shell" - } - ], - "variables": { - "box_basename": "debian-7.9-i386", - "build_timestamp": "{{isotime \"20060102150405\"}}", - "cpus": "1", - "disk_size": "40960", - "git_revision": "__unknown_git_revision__", - "headless": "", - "http_proxy": "{{env `http_proxy`}}", - "https_proxy": "{{env `https_proxy`}}", - "iso_checksum": "b1168c5379b8b84bb700d146ca3c90f3cd8a43bd1ea77517a6176dbafa0063ab", - "iso_checksum_type": "sha256", - "iso_name": "debian-7.9.0-i386-CD-1.iso", - "memory": "512", - "metadata": "floppy/dummy_metadata.json", - "mirror": "http://cdimage.debian.org/cdimage/archive", - "mirror_directory": "7.9.0/i386/iso-cd", - "name": "debian-7.9-i386", - "no_proxy": "{{env `no_proxy`}}", - "preseed_path": "debian-7/preseed.cfg", - "template": "debian-7.9-i386", - "version": "2.1.TIMESTAMP" - } -} diff --git a/archive/debian-8.1-amd64.json b/archive/debian-8.1-amd64.json deleted file mode 100644 index 6fb2ead6e..000000000 --- a/archive/debian-8.1-amd64.json +++ /dev/null @@ -1,242 +0,0 @@ -{ - "builders": [ - { - "boot_command": [ - "<esc><wait>", - "install <wait>", - " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}} <wait>", - "debian-installer=en_US <wait>", - "auto <wait>", - "locale=en_US <wait>", - "kbd-chooser/method=us <wait>", - "keyboard-configuration/xkb-keymap=us <wait>", - "netcfg/get_hostname={{ .Name }} <wait>", - "netcfg/get_domain=vagrantup.com <wait>", - "fb=false <wait>", - "debconf/frontend=noninteractive <wait>", - "console-setup/ask_detect=false <wait>", - "console-keymaps-at/keymap=us <wait>", - "grub-installer/bootdev=/dev/sda <wait>", - "<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", - "guest_os_type": "Debian_64", - "hard_drive_interface": "sata", - "headless": "{{ user `headless` }}", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-virtualbox", - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "virtualbox-iso", - "vboxmanage": [ - [ - "modifyvm", - "{{.Name}}", - "--memory", - "{{ user `memory` }}" - ], - [ - "modifyvm", - "{{.Name}}", - "--cpus", - "{{ user `cpus` }}" - ] - ], - "virtualbox_version_file": ".vbox_version", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<esc><wait>", - "install <wait>", - " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}} <wait>", - "debian-installer=en_US <wait>", - "auto <wait>", - "locale=en_US <wait>", - "kbd-chooser/method=us <wait>", - "keyboard-configuration/xkb-keymap=us <wait>", - "netcfg/get_hostname={{ .Name }} <wait>", - "netcfg/get_domain=vagrantup.com <wait>", - "fb=false <wait>", - "debconf/frontend=noninteractive <wait>", - "console-setup/ask_detect=false <wait>", - "console-keymaps-at/keymap=us <wait>", - "grub-installer/bootdev=/dev/sda <wait>", - "<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "debian8-64", - "headless": "{{ user `headless` }}", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-vmware", - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "tools_upload_flavor": "linux", - "type": "vmware-iso", - "vm_name": "{{ user `template` }}", - "vmx_data": { - "cpuid.coresPerSocket": "1", - "memsize": "{{ user `memory` }}", - "numvcpus": "{{ user `cpus` }}" - } - }, - { - "boot_command": [ - "<esc><wait>", - "install <wait>", - " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}} <wait>", - "debian-installer=en_US <wait>", - "auto <wait>", - "locale=en_US <wait>", - "kbd-chooser/method=us <wait>", - "keyboard-configuration/xkb-keymap=us <wait>", - "netcfg/get_hostname={{ .Name }} <wait>", - "netcfg/get_domain=vagrantup.com <wait>", - "fb=false <wait>", - "debconf/frontend=noninteractive <wait>", - "console-setup/ask_detect=false <wait>", - "console-keymaps-at/keymap=us <wait>", - "grub-installer/bootdev=/dev/sda <wait>", - "<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "debian", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-parallels", - "parallels_tools_flavor": "lin", - "prlctl": [ - [ - "set", - "{{.Name}}", - "--memsize", - "{{ user `memory` }}" - ], - [ - "set", - "{{.Name}}", - "--cpus", - "{{ user `cpus` }}" - ] - ], - "prlctl_version_file": ".prlctl_version", - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "parallels-iso", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<esc><wait>", - "install <wait>", - " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}} <wait>", - "debian-installer=en_US <wait>", - "auto <wait>", - "locale=en_US <wait>", - "kbd-chooser/method=us <wait>", - "keyboard-configuration/xkb-keymap=us <wait>", - "netcfg/get_hostname={{ .Name }} <wait>", - "netcfg/get_domain=vagrantup.com <wait>", - "fb=false <wait>", - "debconf/frontend=noninteractive <wait>", - "console-setup/ask_detect=false <wait>", - "console-keymaps-at/keymap=us <wait>", - "grub-installer/bootdev=/dev/vda <wait>", - "<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "headless": "{{ user `headless` }}", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-qemu", - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "qemu", - "vm_name": "{{ user `template` }}" - } - ], - "post-processors": [ - { - "output": "builds/{{user `box_basename`}}.{{.Provider}}.box", - "type": "vagrant" - } - ], - "provisioners": [ - { - "destination": "/tmp/bento-metadata.json", - "source": "{{user `metadata`}}", - "type": "file" - }, - { - "environment_vars": [ - "HOME_DIR=/home/vagrant", - "http_proxy={{user `http_proxy`}}", - "https_proxy={{user `https_proxy`}}", - "no_proxy={{user `no_proxy`}}" - ], - "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", - "scripts": [ - "scripts/common/metadata.sh", - "scripts/debian/update.sh", - "scripts/common/sshd.sh", - "scripts/debian/networking.sh", - "scripts/debian/sudoers.sh", - "scripts/common/vagrant.sh", - "scripts/debian/systemd.sh", - "scripts/common/vmtools.sh", - "scripts/debian/cleanup.sh", - "scripts/common/minimize.sh" - ], - "type": "shell" - } - ], - "variables": { - "box_basename": "debian-8.1", - "build_timestamp": "{{isotime \"20060102150405\"}}", - "cpus": "1", - "disk_size": "40960", - "git_revision": "__unknown_git_revision__", - "headless": "", - "http_proxy": "{{env `http_proxy`}}", - "https_proxy": "{{env `https_proxy`}}", - "iso_checksum": "10adbdac17a25ad44d0241ae978140c70ddfebdd0597d4a4bfea9fef8eaa9075", - "iso_checksum_type": "sha256", - "iso_name": "debian-8.1.0-amd64-CD-1.iso", - "memory": "512", - "metadata": "floppy/dummy_metadata.json", - "mirror": "http://cdimage.debian.org/cdimage/archive", - "mirror_directory": "8.1.0/amd64/iso-cd", - "name": "debian-8.1", - "no_proxy": "{{env `no_proxy`}}", - "preseed_path": "debian-8/preseed.cfg", - "template": "debian-8.1-amd64", - "version": "2.1.TIMESTAMP" - } -} diff --git a/archive/debian-8.1-i386.json b/archive/debian-8.1-i386.json deleted file mode 100644 index a6b43bf48..000000000 --- a/archive/debian-8.1-i386.json +++ /dev/null @@ -1,242 +0,0 @@ -{ - "builders": [ - { - "boot_command": [ - "<esc><wait>", - "install <wait>", - " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}} <wait>", - "debian-installer=en_US <wait>", - "auto <wait>", - "locale=en_US <wait>", - "kbd-chooser/method=us <wait>", - "keyboard-configuration/xkb-keymap=us <wait>", - "netcfg/get_hostname={{ .Name }} <wait>", - "netcfg/get_domain=vagrantup.com <wait>", - "fb=false <wait>", - "debconf/frontend=noninteractive <wait>", - "console-setup/ask_detect=false <wait>", - "console-keymaps-at/keymap=us <wait>", - "grub-installer/bootdev=/dev/sda <wait>", - "<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", - "guest_os_type": "Debian", - "hard_drive_interface": "sata", - "headless": "{{ user `headless` }}", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-virtualbox", - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "virtualbox-iso", - "vboxmanage": [ - [ - "modifyvm", - "{{.Name}}", - "--memory", - "{{ user `memory` }}" - ], - [ - "modifyvm", - "{{.Name}}", - "--cpus", - "{{ user `cpus` }}" - ] - ], - "virtualbox_version_file": ".vbox_version", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<esc><wait>", - "install <wait>", - " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}} <wait>", - "debian-installer=en_US <wait>", - "auto <wait>", - "locale=en_US <wait>", - "kbd-chooser/method=us <wait>", - "keyboard-configuration/xkb-keymap=us <wait>", - "netcfg/get_hostname={{ .Name }} <wait>", - "netcfg/get_domain=vagrantup.com <wait>", - "fb=false <wait>", - "debconf/frontend=noninteractive <wait>", - "console-setup/ask_detect=false <wait>", - "console-keymaps-at/keymap=us <wait>", - "grub-installer/bootdev=/dev/sda <wait>", - "<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "debian8", - "headless": "{{ user `headless` }}", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-vmware", - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "tools_upload_flavor": "linux", - "type": "vmware-iso", - "vm_name": "{{ user `template` }}", - "vmx_data": { - "cpuid.coresPerSocket": "1", - "memsize": "{{ user `memory` }}", - "numvcpus": "{{ user `cpus` }}" - } - }, - { - "boot_command": [ - "<esc><wait>", - "install <wait>", - " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}} <wait>", - "debian-installer=en_US <wait>", - "auto <wait>", - "locale=en_US <wait>", - "kbd-chooser/method=us <wait>", - "keyboard-configuration/xkb-keymap=us <wait>", - "netcfg/get_hostname={{ .Name }} <wait>", - "netcfg/get_domain=vagrantup.com <wait>", - "fb=false <wait>", - "debconf/frontend=noninteractive <wait>", - "console-setup/ask_detect=false <wait>", - "console-keymaps-at/keymap=us <wait>", - "grub-installer/bootdev=/dev/sda <wait>", - "<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "debian", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-parallels", - "parallels_tools_flavor": "lin", - "prlctl": [ - [ - "set", - "{{.Name}}", - "--memsize", - "{{ user `memory` }}" - ], - [ - "set", - "{{.Name}}", - "--cpus", - "{{ user `cpus` }}" - ] - ], - "prlctl_version_file": ".prlctl_version", - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "parallels-iso", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<esc><wait>", - "install <wait>", - " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}} <wait>", - "debian-installer=en_US <wait>", - "auto <wait>", - "locale=en_US <wait>", - "kbd-chooser/method=us <wait>", - "keyboard-configuration/xkb-keymap=us <wait>", - "netcfg/get_hostname={{ .Name }} <wait>", - "netcfg/get_domain=vagrantup.com <wait>", - "fb=false <wait>", - "debconf/frontend=noninteractive <wait>", - "console-setup/ask_detect=false <wait>", - "console-keymaps-at/keymap=us <wait>", - "grub-installer/bootdev=/dev/vda <wait>", - "<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "headless": "{{ user `headless` }}", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-qemu", - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "qemu", - "vm_name": "{{ user `template` }}" - } - ], - "post-processors": [ - { - "output": "builds/{{user `box_basename`}}.{{.Provider}}.box", - "type": "vagrant" - } - ], - "provisioners": [ - { - "destination": "/tmp/bento-metadata.json", - "source": "{{user `metadata`}}", - "type": "file" - }, - { - "environment_vars": [ - "HOME_DIR=/home/vagrant", - "http_proxy={{user `http_proxy`}}", - "https_proxy={{user `https_proxy`}}", - "no_proxy={{user `no_proxy`}}" - ], - "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", - "scripts": [ - "scripts/common/metadata.sh", - "scripts/debian/update.sh", - "scripts/common/sshd.sh", - "scripts/debian/networking.sh", - "scripts/debian/sudoers.sh", - "scripts/common/vagrant.sh", - "scripts/debian/systemd.sh", - "scripts/common/vmtools.sh", - "scripts/debian/cleanup.sh", - "scripts/common/minimize.sh" - ], - "type": "shell" - } - ], - "variables": { - "box_basename": "debian-8.1-i386", - "build_timestamp": "{{isotime \"20060102150405\"}}", - "cpus": "1", - "disk_size": "40960", - "git_revision": "__unknown_git_revision__", - "headless": "", - "http_proxy": "{{env `http_proxy`}}", - "https_proxy": "{{env `https_proxy`}}", - "iso_checksum": "74343980870d5c2c73e3c1a9d92ea6546b76070ccceeae7842c809557d07d53b", - "iso_checksum_type": "sha256", - "iso_name": "debian-8.1.0-i386-CD-1.iso", - "memory": "512", - "metadata": "floppy/dummy_metadata.json", - "mirror": "http://cdimage.debian.org/cdimage/archive", - "mirror_directory": "8.1.0/i386/iso-cd", - "name": "debian-8.1-i386", - "no_proxy": "{{env `no_proxy`}}", - "preseed_path": "debian-8/preseed.cfg", - "template": "debian-8.1-i386", - "version": "2.1.TIMESTAMP" - } -} diff --git a/archive/debian-8.2-amd64.json b/archive/debian-8.2-amd64.json deleted file mode 100644 index 796861c09..000000000 --- a/archive/debian-8.2-amd64.json +++ /dev/null @@ -1,242 +0,0 @@ -{ - "builders": [ - { - "boot_command": [ - "<esc><wait>", - "install <wait>", - " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}} <wait>", - "debian-installer=en_US <wait>", - "auto <wait>", - "locale=en_US <wait>", - "kbd-chooser/method=us <wait>", - "keyboard-configuration/xkb-keymap=us <wait>", - "netcfg/get_hostname={{ .Name }} <wait>", - "netcfg/get_domain=vagrantup.com <wait>", - "fb=false <wait>", - "debconf/frontend=noninteractive <wait>", - "console-setup/ask_detect=false <wait>", - "console-keymaps-at/keymap=us <wait>", - "grub-installer/bootdev=/dev/sda <wait>", - "<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", - "guest_os_type": "Debian_64", - "hard_drive_interface": "sata", - "headless": "{{ user `headless` }}", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-virtualbox", - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "virtualbox-iso", - "vboxmanage": [ - [ - "modifyvm", - "{{.Name}}", - "--memory", - "{{ user `memory` }}" - ], - [ - "modifyvm", - "{{.Name}}", - "--cpus", - "{{ user `cpus` }}" - ] - ], - "virtualbox_version_file": ".vbox_version", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<esc><wait>", - "install <wait>", - " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}} <wait>", - "debian-installer=en_US <wait>", - "auto <wait>", - "locale=en_US <wait>", - "kbd-chooser/method=us <wait>", - "keyboard-configuration/xkb-keymap=us <wait>", - "netcfg/get_hostname={{ .Name }} <wait>", - "netcfg/get_domain=vagrantup.com <wait>", - "fb=false <wait>", - "debconf/frontend=noninteractive <wait>", - "console-setup/ask_detect=false <wait>", - "console-keymaps-at/keymap=us <wait>", - "grub-installer/bootdev=/dev/sda <wait>", - "<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "debian8-64", - "headless": "{{ user `headless` }}", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-vmware", - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "tools_upload_flavor": "linux", - "type": "vmware-iso", - "vm_name": "{{ user `template` }}", - "vmx_data": { - "cpuid.coresPerSocket": "1", - "memsize": "{{ user `memory` }}", - "numvcpus": "{{ user `cpus` }}" - } - }, - { - "boot_command": [ - "<esc><wait>", - "install <wait>", - " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}} <wait>", - "debian-installer=en_US <wait>", - "auto <wait>", - "locale=en_US <wait>", - "kbd-chooser/method=us <wait>", - "keyboard-configuration/xkb-keymap=us <wait>", - "netcfg/get_hostname={{ .Name }} <wait>", - "netcfg/get_domain=vagrantup.com <wait>", - "fb=false <wait>", - "debconf/frontend=noninteractive <wait>", - "console-setup/ask_detect=false <wait>", - "console-keymaps-at/keymap=us <wait>", - "grub-installer/bootdev=/dev/sda <wait>", - "<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "debian", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-parallels", - "parallels_tools_flavor": "lin", - "prlctl": [ - [ - "set", - "{{.Name}}", - "--memsize", - "{{ user `memory` }}" - ], - [ - "set", - "{{.Name}}", - "--cpus", - "{{ user `cpus` }}" - ] - ], - "prlctl_version_file": ".prlctl_version", - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "parallels-iso", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<esc><wait>", - "install <wait>", - " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}} <wait>", - "debian-installer=en_US <wait>", - "auto <wait>", - "locale=en_US <wait>", - "kbd-chooser/method=us <wait>", - "keyboard-configuration/xkb-keymap=us <wait>", - "netcfg/get_hostname={{ .Name }} <wait>", - "netcfg/get_domain=vagrantup.com <wait>", - "fb=false <wait>", - "debconf/frontend=noninteractive <wait>", - "console-setup/ask_detect=false <wait>", - "console-keymaps-at/keymap=us <wait>", - "grub-installer/bootdev=/dev/vda <wait>", - "<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "headless": "{{ user `headless` }}", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-qemu", - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "qemu", - "vm_name": "{{ user `template` }}" - } - ], - "post-processors": [ - { - "output": "builds/{{user `box_basename`}}.{{.Provider}}.box", - "type": "vagrant" - } - ], - "provisioners": [ - { - "destination": "/tmp/bento-metadata.json", - "source": "{{user `metadata`}}", - "type": "file" - }, - { - "environment_vars": [ - "HOME_DIR=/home/vagrant", - "http_proxy={{user `http_proxy`}}", - "https_proxy={{user `https_proxy`}}", - "no_proxy={{user `no_proxy`}}" - ], - "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", - "scripts": [ - "scripts/common/metadata.sh", - "scripts/debian/update.sh", - "scripts/common/sshd.sh", - "scripts/debian/networking.sh", - "scripts/debian/sudoers.sh", - "scripts/common/vagrant.sh", - "scripts/debian/systemd.sh", - "scripts/common/vmtools.sh", - "scripts/debian/cleanup.sh", - "scripts/common/minimize.sh" - ], - "type": "shell" - } - ], - "variables": { - "box_basename": "debian-8.2", - "build_timestamp": "{{isotime \"20060102150405\"}}", - "cpus": "1", - "disk_size": "40960", - "git_revision": "__unknown_git_revision__", - "headless": "", - "http_proxy": "{{env `http_proxy`}}", - "https_proxy": "{{env `https_proxy`}}", - "iso_checksum": "d3ac88ec064f9e941ee5d9cbfaa87ac48929b81471f96073305ccd7bd71ff521", - "iso_checksum_type": "sha256", - "iso_name": "debian-8.2.0-amd64-CD-1.iso", - "memory": "512", - "metadata": "floppy/dummy_metadata.json", - "mirror": "http://cdimage.debian.org/cdimage/archive", - "mirror_directory": "8.2.0/amd64/iso-cd", - "name": "debian-8.2", - "no_proxy": "{{env `no_proxy`}}", - "preseed_path": "debian-8/preseed.cfg", - "template": "debian-8.2-amd64", - "version": "2.1.TIMESTAMP" - } -} diff --git a/archive/debian-8.2-i386.json b/archive/debian-8.2-i386.json deleted file mode 100644 index d8db7f1a7..000000000 --- a/archive/debian-8.2-i386.json +++ /dev/null @@ -1,242 +0,0 @@ -{ - "builders": [ - { - "boot_command": [ - "<esc><wait>", - "install <wait>", - " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}} <wait>", - "debian-installer=en_US <wait>", - "auto <wait>", - "locale=en_US <wait>", - "kbd-chooser/method=us <wait>", - "keyboard-configuration/xkb-keymap=us <wait>", - "netcfg/get_hostname={{ .Name }} <wait>", - "netcfg/get_domain=vagrantup.com <wait>", - "fb=false <wait>", - "debconf/frontend=noninteractive <wait>", - "console-setup/ask_detect=false <wait>", - "console-keymaps-at/keymap=us <wait>", - "grub-installer/bootdev=/dev/sda <wait>", - "<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", - "guest_os_type": "Debian", - "hard_drive_interface": "sata", - "headless": "{{ user `headless` }}", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-virtualbox", - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "virtualbox-iso", - "vboxmanage": [ - [ - "modifyvm", - "{{.Name}}", - "--memory", - "{{ user `memory` }}" - ], - [ - "modifyvm", - "{{.Name}}", - "--cpus", - "{{ user `cpus` }}" - ] - ], - "virtualbox_version_file": ".vbox_version", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<esc><wait>", - "install <wait>", - " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}} <wait>", - "debian-installer=en_US <wait>", - "auto <wait>", - "locale=en_US <wait>", - "kbd-chooser/method=us <wait>", - "keyboard-configuration/xkb-keymap=us <wait>", - "netcfg/get_hostname={{ .Name }} <wait>", - "netcfg/get_domain=vagrantup.com <wait>", - "fb=false <wait>", - "debconf/frontend=noninteractive <wait>", - "console-setup/ask_detect=false <wait>", - "console-keymaps-at/keymap=us <wait>", - "grub-installer/bootdev=/dev/sda <wait>", - "<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "debian8", - "headless": "{{ user `headless` }}", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-vmware", - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "tools_upload_flavor": "linux", - "type": "vmware-iso", - "vm_name": "{{ user `template` }}", - "vmx_data": { - "cpuid.coresPerSocket": "1", - "memsize": "{{ user `memory` }}", - "numvcpus": "{{ user `cpus` }}" - } - }, - { - "boot_command": [ - "<esc><wait>", - "install <wait>", - " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}} <wait>", - "debian-installer=en_US <wait>", - "auto <wait>", - "locale=en_US <wait>", - "kbd-chooser/method=us <wait>", - "keyboard-configuration/xkb-keymap=us <wait>", - "netcfg/get_hostname={{ .Name }} <wait>", - "netcfg/get_domain=vagrantup.com <wait>", - "fb=false <wait>", - "debconf/frontend=noninteractive <wait>", - "console-setup/ask_detect=false <wait>", - "console-keymaps-at/keymap=us <wait>", - "grub-installer/bootdev=/dev/sda <wait>", - "<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "debian", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-parallels", - "parallels_tools_flavor": "lin", - "prlctl": [ - [ - "set", - "{{.Name}}", - "--memsize", - "{{ user `memory` }}" - ], - [ - "set", - "{{.Name}}", - "--cpus", - "{{ user `cpus` }}" - ] - ], - "prlctl_version_file": ".prlctl_version", - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "parallels-iso", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<esc><wait>", - "install <wait>", - " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}} <wait>", - "debian-installer=en_US <wait>", - "auto <wait>", - "locale=en_US <wait>", - "kbd-chooser/method=us <wait>", - "keyboard-configuration/xkb-keymap=us <wait>", - "netcfg/get_hostname={{ .Name }} <wait>", - "netcfg/get_domain=vagrantup.com <wait>", - "fb=false <wait>", - "debconf/frontend=noninteractive <wait>", - "console-setup/ask_detect=false <wait>", - "console-keymaps-at/keymap=us <wait>", - "grub-installer/bootdev=/dev/vda <wait>", - "<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "headless": "{{ user `headless` }}", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-qemu", - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "qemu", - "vm_name": "{{ user `template` }}" - } - ], - "post-processors": [ - { - "output": "builds/{{user `box_basename`}}.{{.Provider}}.box", - "type": "vagrant" - } - ], - "provisioners": [ - { - "destination": "/tmp/bento-metadata.json", - "source": "{{user `metadata`}}", - "type": "file" - }, - { - "environment_vars": [ - "HOME_DIR=/home/vagrant", - "http_proxy={{user `http_proxy`}}", - "https_proxy={{user `https_proxy`}}", - "no_proxy={{user `no_proxy`}}" - ], - "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", - "scripts": [ - "scripts/common/metadata.sh", - "scripts/debian/update.sh", - "scripts/common/sshd.sh", - "scripts/debian/networking.sh", - "scripts/debian/sudoers.sh", - "scripts/common/vagrant.sh", - "scripts/debian/systemd.sh", - "scripts/common/vmtools.sh", - "scripts/debian/cleanup.sh", - "scripts/common/minimize.sh" - ], - "type": "shell" - } - ], - "variables": { - "box_basename": "debian-8.2-i386", - "build_timestamp": "{{isotime \"20060102150405\"}}", - "cpus": "1", - "disk_size": "40960", - "git_revision": "__unknown_git_revision__", - "headless": "", - "http_proxy": "{{env `http_proxy`}}", - "https_proxy": "{{env `https_proxy`}}", - "iso_checksum": "87060c2777f55806e313db22ba8a78aee9f7119b6321448a1dfdaf0bbfcb67ce", - "iso_checksum_type": "sha256", - "iso_name": "debian-8.2.0-i386-CD-1.iso", - "memory": "512", - "metadata": "floppy/dummy_metadata.json", - "mirror": "http://cdimage.debian.org/cdimage/archive", - "mirror_directory": "8.2.0/i386/iso-cd", - "name": "debian-8.2-i386", - "no_proxy": "{{env `no_proxy`}}", - "preseed_path": "debian-8/preseed.cfg", - "template": "debian-8.2-i386", - "version": "2.1.TIMESTAMP" - } -} diff --git a/archive/debian-8.3-amd64.json b/archive/debian-8.3-amd64.json deleted file mode 100644 index 2b49c553f..000000000 --- a/archive/debian-8.3-amd64.json +++ /dev/null @@ -1,242 +0,0 @@ -{ - "builders": [ - { - "boot_command": [ - "<esc><wait>", - "install <wait>", - " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}} <wait>", - "debian-installer=en_US <wait>", - "auto <wait>", - "locale=en_US <wait>", - "kbd-chooser/method=us <wait>", - "keyboard-configuration/xkb-keymap=us <wait>", - "netcfg/get_hostname={{ .Name }} <wait>", - "netcfg/get_domain=vagrantup.com <wait>", - "fb=false <wait>", - "debconf/frontend=noninteractive <wait>", - "console-setup/ask_detect=false <wait>", - "console-keymaps-at/keymap=us <wait>", - "grub-installer/bootdev=/dev/sda <wait>", - "<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", - "guest_os_type": "Debian_64", - "hard_drive_interface": "sata", - "headless": "{{ user `headless` }}", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-virtualbox", - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "virtualbox-iso", - "vboxmanage": [ - [ - "modifyvm", - "{{.Name}}", - "--memory", - "{{ user `memory` }}" - ], - [ - "modifyvm", - "{{.Name}}", - "--cpus", - "{{ user `cpus` }}" - ] - ], - "virtualbox_version_file": ".vbox_version", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<esc><wait>", - "install <wait>", - " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}} <wait>", - "debian-installer=en_US <wait>", - "auto <wait>", - "locale=en_US <wait>", - "kbd-chooser/method=us <wait>", - "keyboard-configuration/xkb-keymap=us <wait>", - "netcfg/get_hostname={{ .Name }} <wait>", - "netcfg/get_domain=vagrantup.com <wait>", - "fb=false <wait>", - "debconf/frontend=noninteractive <wait>", - "console-setup/ask_detect=false <wait>", - "console-keymaps-at/keymap=us <wait>", - "grub-installer/bootdev=/dev/sda <wait>", - "<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "debian8-64", - "headless": "{{ user `headless` }}", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-vmware", - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "tools_upload_flavor": "linux", - "type": "vmware-iso", - "vm_name": "{{ user `template` }}", - "vmx_data": { - "cpuid.coresPerSocket": "1", - "memsize": "{{ user `memory` }}", - "numvcpus": "{{ user `cpus` }}" - } - }, - { - "boot_command": [ - "<esc><wait>", - "install <wait>", - " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}} <wait>", - "debian-installer=en_US <wait>", - "auto <wait>", - "locale=en_US <wait>", - "kbd-chooser/method=us <wait>", - "keyboard-configuration/xkb-keymap=us <wait>", - "netcfg/get_hostname={{ .Name }} <wait>", - "netcfg/get_domain=vagrantup.com <wait>", - "fb=false <wait>", - "debconf/frontend=noninteractive <wait>", - "console-setup/ask_detect=false <wait>", - "console-keymaps-at/keymap=us <wait>", - "grub-installer/bootdev=/dev/sda <wait>", - "<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "debian", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-parallels", - "parallels_tools_flavor": "lin", - "prlctl": [ - [ - "set", - "{{.Name}}", - "--memsize", - "{{ user `memory` }}" - ], - [ - "set", - "{{.Name}}", - "--cpus", - "{{ user `cpus` }}" - ] - ], - "prlctl_version_file": ".prlctl_version", - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "parallels-iso", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<esc><wait>", - "install <wait>", - " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}} <wait>", - "debian-installer=en_US <wait>", - "auto <wait>", - "locale=en_US <wait>", - "kbd-chooser/method=us <wait>", - "keyboard-configuration/xkb-keymap=us <wait>", - "netcfg/get_hostname={{ .Name }} <wait>", - "netcfg/get_domain=vagrantup.com <wait>", - "fb=false <wait>", - "debconf/frontend=noninteractive <wait>", - "console-setup/ask_detect=false <wait>", - "console-keymaps-at/keymap=us <wait>", - "grub-installer/bootdev=/dev/vda <wait>", - "<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "headless": "{{ user `headless` }}", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-qemu", - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "qemu", - "vm_name": "{{ user `template` }}" - } - ], - "post-processors": [ - { - "output": "builds/{{user `box_basename`}}.{{.Provider}}.box", - "type": "vagrant" - } - ], - "provisioners": [ - { - "destination": "/tmp/bento-metadata.json", - "source": "{{user `metadata`}}", - "type": "file" - }, - { - "environment_vars": [ - "HOME_DIR=/home/vagrant", - "http_proxy={{user `http_proxy`}}", - "https_proxy={{user `https_proxy`}}", - "no_proxy={{user `no_proxy`}}" - ], - "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", - "scripts": [ - "scripts/common/metadata.sh", - "scripts/debian/update.sh", - "scripts/common/sshd.sh", - "scripts/debian/networking.sh", - "scripts/debian/sudoers.sh", - "scripts/common/vagrant.sh", - "scripts/debian/systemd.sh", - "scripts/common/vmtools.sh", - "scripts/debian/cleanup.sh", - "scripts/common/minimize.sh" - ], - "type": "shell" - } - ], - "variables": { - "box_basename": "debian-8.3", - "build_timestamp": "{{isotime \"20060102150405\"}}", - "cpus": "1", - "disk_size": "40960", - "git_revision": "__unknown_git_revision__", - "headless": "", - "http_proxy": "{{env `http_proxy`}}", - "https_proxy": "{{env `https_proxy`}}", - "iso_checksum": "1dae8556e57bb04bf380b2dbf64f3e6c61f9c28cbb6518aabae95a003c89739a", - "iso_checksum_type": "sha256", - "iso_name": "debian-8.3.0-amd64-CD-1.iso", - "memory": "512", - "metadata": "floppy/dummy_metadata.json", - "mirror": "http://cdimage.debian.org/cdimage/release", - "mirror_directory": "8.3.0/amd64/iso-cd", - "name": "debian-8.3", - "no_proxy": "{{env `no_proxy`}}", - "preseed_path": "debian-8/preseed.cfg", - "template": "debian-8.3-amd64", - "version": "2.1.TIMESTAMP" - } -} diff --git a/archive/debian-8.3-i386.json b/archive/debian-8.3-i386.json deleted file mode 100644 index 396e2062c..000000000 --- a/archive/debian-8.3-i386.json +++ /dev/null @@ -1,242 +0,0 @@ -{ - "builders": [ - { - "boot_command": [ - "<esc><wait>", - "install <wait>", - " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}} <wait>", - "debian-installer=en_US <wait>", - "auto <wait>", - "locale=en_US <wait>", - "kbd-chooser/method=us <wait>", - "keyboard-configuration/xkb-keymap=us <wait>", - "netcfg/get_hostname={{ .Name }} <wait>", - "netcfg/get_domain=vagrantup.com <wait>", - "fb=false <wait>", - "debconf/frontend=noninteractive <wait>", - "console-setup/ask_detect=false <wait>", - "console-keymaps-at/keymap=us <wait>", - "grub-installer/bootdev=/dev/sda <wait>", - "<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", - "guest_os_type": "Debian", - "hard_drive_interface": "sata", - "headless": "{{ user `headless` }}", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-virtualbox", - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "virtualbox-iso", - "vboxmanage": [ - [ - "modifyvm", - "{{.Name}}", - "--memory", - "{{ user `memory` }}" - ], - [ - "modifyvm", - "{{.Name}}", - "--cpus", - "{{ user `cpus` }}" - ] - ], - "virtualbox_version_file": ".vbox_version", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<esc><wait>", - "install <wait>", - " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}} <wait>", - "debian-installer=en_US <wait>", - "auto <wait>", - "locale=en_US <wait>", - "kbd-chooser/method=us <wait>", - "keyboard-configuration/xkb-keymap=us <wait>", - "netcfg/get_hostname={{ .Name }} <wait>", - "netcfg/get_domain=vagrantup.com <wait>", - "fb=false <wait>", - "debconf/frontend=noninteractive <wait>", - "console-setup/ask_detect=false <wait>", - "console-keymaps-at/keymap=us <wait>", - "grub-installer/bootdev=/dev/sda <wait>", - "<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "debian8", - "headless": "{{ user `headless` }}", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-vmware", - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "tools_upload_flavor": "linux", - "type": "vmware-iso", - "vm_name": "{{ user `template` }}", - "vmx_data": { - "cpuid.coresPerSocket": "1", - "memsize": "{{ user `memory` }}", - "numvcpus": "{{ user `cpus` }}" - } - }, - { - "boot_command": [ - "<esc><wait>", - "install <wait>", - " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}} <wait>", - "debian-installer=en_US <wait>", - "auto <wait>", - "locale=en_US <wait>", - "kbd-chooser/method=us <wait>", - "keyboard-configuration/xkb-keymap=us <wait>", - "netcfg/get_hostname={{ .Name }} <wait>", - "netcfg/get_domain=vagrantup.com <wait>", - "fb=false <wait>", - "debconf/frontend=noninteractive <wait>", - "console-setup/ask_detect=false <wait>", - "console-keymaps-at/keymap=us <wait>", - "grub-installer/bootdev=/dev/sda <wait>", - "<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "debian", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-parallels", - "parallels_tools_flavor": "lin", - "prlctl": [ - [ - "set", - "{{.Name}}", - "--memsize", - "{{ user `memory` }}" - ], - [ - "set", - "{{.Name}}", - "--cpus", - "{{ user `cpus` }}" - ] - ], - "prlctl_version_file": ".prlctl_version", - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "parallels-iso", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<esc><wait>", - "install <wait>", - " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}} <wait>", - "debian-installer=en_US <wait>", - "auto <wait>", - "locale=en_US <wait>", - "kbd-chooser/method=us <wait>", - "keyboard-configuration/xkb-keymap=us <wait>", - "netcfg/get_hostname={{ .Name }} <wait>", - "netcfg/get_domain=vagrantup.com <wait>", - "fb=false <wait>", - "debconf/frontend=noninteractive <wait>", - "console-setup/ask_detect=false <wait>", - "console-keymaps-at/keymap=us <wait>", - "grub-installer/bootdev=/dev/vda <wait>", - "<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "headless": "{{ user `headless` }}", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-qemu", - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "qemu", - "vm_name": "{{ user `template` }}" - } - ], - "post-processors": [ - { - "output": "builds/{{user `box_basename`}}.{{.Provider}}.box", - "type": "vagrant" - } - ], - "provisioners": [ - { - "destination": "/tmp/bento-metadata.json", - "source": "{{user `metadata`}}", - "type": "file" - }, - { - "environment_vars": [ - "HOME_DIR=/home/vagrant", - "http_proxy={{user `http_proxy`}}", - "https_proxy={{user `https_proxy`}}", - "no_proxy={{user `no_proxy`}}" - ], - "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", - "scripts": [ - "scripts/common/metadata.sh", - "scripts/debian/update.sh", - "scripts/common/sshd.sh", - "scripts/debian/networking.sh", - "scripts/debian/sudoers.sh", - "scripts/common/vagrant.sh", - "scripts/debian/systemd.sh", - "scripts/common/vmtools.sh", - "scripts/debian/cleanup.sh", - "scripts/common/minimize.sh" - ], - "type": "shell" - } - ], - "variables": { - "box_basename": "debian-8.3-i386", - "build_timestamp": "{{isotime \"20060102150405\"}}", - "cpus": "1", - "disk_size": "40960", - "git_revision": "__unknown_git_revision__", - "headless": "", - "http_proxy": "{{env `http_proxy`}}", - "https_proxy": "{{env `https_proxy`}}", - "iso_checksum": "0838af9e9403f0cc37c95888eff805496c688cd7b7fab3fa0812857f0e4eaca4", - "iso_checksum_type": "sha256", - "iso_name": "debian-8.3.0-i386-CD-1.iso", - "memory": "512", - "metadata": "floppy/dummy_metadata.json", - "mirror": "http://cdimage.debian.org/cdimage/release", - "mirror_directory": "8.3.0/i386/iso-cd", - "name": "debian-8.3-i386", - "no_proxy": "{{env `no_proxy`}}", - "preseed_path": "debian-8/preseed.cfg", - "template": "debian-8.3-i386", - "version": "2.1.TIMESTAMP" - } -} diff --git a/archive/debian-8.4-amd64.json b/archive/debian-8.4-amd64.json deleted file mode 100644 index fdcf1a690..000000000 --- a/archive/debian-8.4-amd64.json +++ /dev/null @@ -1,243 +0,0 @@ -{ - "builders": [ - { - "boot_command": [ - "<esc><wait>", - "install <wait>", - " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}} <wait>", - "debian-installer=en_US <wait>", - "auto <wait>", - "locale=en_US <wait>", - "kbd-chooser/method=us <wait>", - "keyboard-configuration/xkb-keymap=us <wait>", - "netcfg/get_hostname={{ .Name }} <wait>", - "netcfg/get_domain=vagrantup.com <wait>", - "fb=false <wait>", - "debconf/frontend=noninteractive <wait>", - "console-setup/ask_detect=false <wait>", - "console-keymaps-at/keymap=us <wait>", - "grub-installer/bootdev=/dev/sda <wait>", - "<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", - "guest_os_type": "Debian_64", - "hard_drive_interface": "sata", - "headless": "{{ user `headless` }}", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-virtualbox", - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "virtualbox-iso", - "vboxmanage": [ - [ - "modifyvm", - "{{.Name}}", - "--memory", - "{{ user `memory` }}" - ], - [ - "modifyvm", - "{{.Name}}", - "--cpus", - "{{ user `cpus` }}" - ] - ], - "virtualbox_version_file": ".vbox_version", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<esc><wait>", - "install <wait>", - " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}} <wait>", - "debian-installer=en_US <wait>", - "auto <wait>", - "locale=en_US <wait>", - "kbd-chooser/method=us <wait>", - "keyboard-configuration/xkb-keymap=us <wait>", - "netcfg/get_hostname={{ .Name }} <wait>", - "netcfg/get_domain=vagrantup.com <wait>", - "fb=false <wait>", - "debconf/frontend=noninteractive <wait>", - "console-setup/ask_detect=false <wait>", - "console-keymaps-at/keymap=us <wait>", - "grub-installer/bootdev=/dev/sda <wait>", - "<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "debian8-64", - "headless": "{{ user `headless` }}", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-vmware", - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "tools_upload_flavor": "linux", - "type": "vmware-iso", - "vm_name": "{{ user `template` }}", - "vmx_data": { - "cpuid.coresPerSocket": "1", - "ethernet0.pciSlotNumber": "32", - "memsize": "{{ user `memory` }}", - "numvcpus": "{{ user `cpus` }}" - } - }, - { - "boot_command": [ - "<esc><wait>", - "install <wait>", - " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}} <wait>", - "debian-installer=en_US <wait>", - "auto <wait>", - "locale=en_US <wait>", - "kbd-chooser/method=us <wait>", - "keyboard-configuration/xkb-keymap=us <wait>", - "netcfg/get_hostname={{ .Name }} <wait>", - "netcfg/get_domain=vagrantup.com <wait>", - "fb=false <wait>", - "debconf/frontend=noninteractive <wait>", - "console-setup/ask_detect=false <wait>", - "console-keymaps-at/keymap=us <wait>", - "grub-installer/bootdev=/dev/sda <wait>", - "<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "debian", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-parallels", - "parallels_tools_flavor": "lin", - "prlctl": [ - [ - "set", - "{{.Name}}", - "--memsize", - "{{ user `memory` }}" - ], - [ - "set", - "{{.Name}}", - "--cpus", - "{{ user `cpus` }}" - ] - ], - "prlctl_version_file": ".prlctl_version", - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "parallels-iso", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<esc><wait>", - "install <wait>", - " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}} <wait>", - "debian-installer=en_US <wait>", - "auto <wait>", - "locale=en_US <wait>", - "kbd-chooser/method=us <wait>", - "keyboard-configuration/xkb-keymap=us <wait>", - "netcfg/get_hostname={{ .Name }} <wait>", - "netcfg/get_domain=vagrantup.com <wait>", - "fb=false <wait>", - "debconf/frontend=noninteractive <wait>", - "console-setup/ask_detect=false <wait>", - "console-keymaps-at/keymap=us <wait>", - "grub-installer/bootdev=/dev/vda <wait>", - "<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "headless": "{{ user `headless` }}", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-qemu", - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "qemu", - "vm_name": "{{ user `template` }}" - } - ], - "post-processors": [ - { - "output": "builds/{{user `box_basename`}}.{{.Provider}}.box", - "type": "vagrant" - } - ], - "provisioners": [ - { - "destination": "/tmp/bento-metadata.json", - "source": "{{user `metadata`}}", - "type": "file" - }, - { - "environment_vars": [ - "HOME_DIR=/home/vagrant", - "http_proxy={{user `http_proxy`}}", - "https_proxy={{user `https_proxy`}}", - "no_proxy={{user `no_proxy`}}" - ], - "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", - "scripts": [ - "scripts/common/metadata.sh", - "scripts/debian/update.sh", - "scripts/common/sshd.sh", - "scripts/debian/networking.sh", - "scripts/debian/sudoers.sh", - "scripts/common/vagrant.sh", - "scripts/debian/systemd.sh", - "scripts/common/vmtools.sh", - "scripts/debian/cleanup.sh", - "scripts/common/minimize.sh" - ], - "type": "shell" - } - ], - "variables": { - "box_basename": "debian-8.4", - "build_timestamp": "{{isotime \"20060102150405\"}}", - "cpus": "1", - "disk_size": "40960", - "git_revision": "__unknown_git_revision__", - "headless": "", - "http_proxy": "{{env `http_proxy`}}", - "https_proxy": "{{env `https_proxy`}}", - "iso_checksum": "e0d23bf95a16984cef5c04aeb8b1c810a0df20327984963e71bbd6a5d95fb0ee", - "iso_checksum_type": "sha256", - "iso_name": "debian-8.4.0-amd64-CD-1.iso", - "memory": "512", - "metadata": "floppy/dummy_metadata.json", - "mirror": "http://cdimage.debian.org/cdimage/release", - "mirror_directory": "8.4.0/amd64/iso-cd", - "name": "debian-8.4", - "no_proxy": "{{env `no_proxy`}}", - "preseed_path": "debian-8/preseed.cfg", - "template": "debian-8.4-amd64", - "version": "2.1.TIMESTAMP" - } -} diff --git a/archive/debian-8.4-i386.json b/archive/debian-8.4-i386.json deleted file mode 100644 index 3707caa1b..000000000 --- a/archive/debian-8.4-i386.json +++ /dev/null @@ -1,243 +0,0 @@ -{ - "builders": [ - { - "boot_command": [ - "<esc><wait>", - "install <wait>", - " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}} <wait>", - "debian-installer=en_US <wait>", - "auto <wait>", - "locale=en_US <wait>", - "kbd-chooser/method=us <wait>", - "keyboard-configuration/xkb-keymap=us <wait>", - "netcfg/get_hostname={{ .Name }} <wait>", - "netcfg/get_domain=vagrantup.com <wait>", - "fb=false <wait>", - "debconf/frontend=noninteractive <wait>", - "console-setup/ask_detect=false <wait>", - "console-keymaps-at/keymap=us <wait>", - "grub-installer/bootdev=/dev/sda <wait>", - "<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", - "guest_os_type": "Debian", - "hard_drive_interface": "sata", - "headless": "{{ user `headless` }}", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-virtualbox", - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "virtualbox-iso", - "vboxmanage": [ - [ - "modifyvm", - "{{.Name}}", - "--memory", - "{{ user `memory` }}" - ], - [ - "modifyvm", - "{{.Name}}", - "--cpus", - "{{ user `cpus` }}" - ] - ], - "virtualbox_version_file": ".vbox_version", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<esc><wait>", - "install <wait>", - " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}} <wait>", - "debian-installer=en_US <wait>", - "auto <wait>", - "locale=en_US <wait>", - "kbd-chooser/method=us <wait>", - "keyboard-configuration/xkb-keymap=us <wait>", - "netcfg/get_hostname={{ .Name }} <wait>", - "netcfg/get_domain=vagrantup.com <wait>", - "fb=false <wait>", - "debconf/frontend=noninteractive <wait>", - "console-setup/ask_detect=false <wait>", - "console-keymaps-at/keymap=us <wait>", - "grub-installer/bootdev=/dev/sda <wait>", - "<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "debian8", - "headless": "{{ user `headless` }}", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-vmware", - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "tools_upload_flavor": "linux", - "type": "vmware-iso", - "vm_name": "{{ user `template` }}", - "vmx_data": { - "cpuid.coresPerSocket": "1", - "ethernet0.pciSlotNumber": "32", - "memsize": "{{ user `memory` }}", - "numvcpus": "{{ user `cpus` }}" - } - }, - { - "boot_command": [ - "<esc><wait>", - "install <wait>", - " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}} <wait>", - "debian-installer=en_US <wait>", - "auto <wait>", - "locale=en_US <wait>", - "kbd-chooser/method=us <wait>", - "keyboard-configuration/xkb-keymap=us <wait>", - "netcfg/get_hostname={{ .Name }} <wait>", - "netcfg/get_domain=vagrantup.com <wait>", - "fb=false <wait>", - "debconf/frontend=noninteractive <wait>", - "console-setup/ask_detect=false <wait>", - "console-keymaps-at/keymap=us <wait>", - "grub-installer/bootdev=/dev/sda <wait>", - "<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "debian", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-parallels", - "parallels_tools_flavor": "lin", - "prlctl": [ - [ - "set", - "{{.Name}}", - "--memsize", - "{{ user `memory` }}" - ], - [ - "set", - "{{.Name}}", - "--cpus", - "{{ user `cpus` }}" - ] - ], - "prlctl_version_file": ".prlctl_version", - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "parallels-iso", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<esc><wait>", - "install <wait>", - " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}} <wait>", - "debian-installer=en_US <wait>", - "auto <wait>", - "locale=en_US <wait>", - "kbd-chooser/method=us <wait>", - "keyboard-configuration/xkb-keymap=us <wait>", - "netcfg/get_hostname={{ .Name }} <wait>", - "netcfg/get_domain=vagrantup.com <wait>", - "fb=false <wait>", - "debconf/frontend=noninteractive <wait>", - "console-setup/ask_detect=false <wait>", - "console-keymaps-at/keymap=us <wait>", - "grub-installer/bootdev=/dev/vda <wait>", - "<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "headless": "{{ user `headless` }}", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-qemu", - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "qemu", - "vm_name": "{{ user `template` }}" - } - ], - "post-processors": [ - { - "output": "builds/{{user `box_basename`}}.{{.Provider}}.box", - "type": "vagrant" - } - ], - "provisioners": [ - { - "destination": "/tmp/bento-metadata.json", - "source": "{{user `metadata`}}", - "type": "file" - }, - { - "environment_vars": [ - "HOME_DIR=/home/vagrant", - "http_proxy={{user `http_proxy`}}", - "https_proxy={{user `https_proxy`}}", - "no_proxy={{user `no_proxy`}}" - ], - "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", - "scripts": [ - "scripts/common/metadata.sh", - "scripts/debian/update.sh", - "scripts/common/sshd.sh", - "scripts/debian/networking.sh", - "scripts/debian/sudoers.sh", - "scripts/common/vagrant.sh", - "scripts/debian/systemd.sh", - "scripts/common/vmtools.sh", - "scripts/debian/cleanup.sh", - "scripts/common/minimize.sh" - ], - "type": "shell" - } - ], - "variables": { - "box_basename": "debian-8.4-i386", - "build_timestamp": "{{isotime \"20060102150405\"}}", - "cpus": "1", - "disk_size": "40960", - "git_revision": "__unknown_git_revision__", - "headless": "", - "http_proxy": "{{env `http_proxy`}}", - "https_proxy": "{{env `https_proxy`}}", - "iso_checksum": "180d4ff9bbf956518df7171490d57f77a96d99d123141b48d423f3c5241e0a68", - "iso_checksum_type": "sha256", - "iso_name": "debian-8.4.0-i386-CD-1.iso", - "memory": "512", - "metadata": "floppy/dummy_metadata.json", - "mirror": "http://cdimage.debian.org/cdimage/release", - "mirror_directory": "8.4.0/i386/iso-cd", - "name": "debian-8.4-i386", - "no_proxy": "{{env `no_proxy`}}", - "preseed_path": "debian-8/preseed.cfg", - "template": "debian-8.4-i386", - "version": "2.1.TIMESTAMP" - } -} diff --git a/archive/debian-8.5-amd64.json b/archive/debian-8.5-amd64.json deleted file mode 100644 index c1266423a..000000000 --- a/archive/debian-8.5-amd64.json +++ /dev/null @@ -1,245 +0,0 @@ -{ - "builders": [ - { - "boot_command": [ - "<esc><wait>", - "install <wait>", - " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}} <wait>", - "debian-installer=en_US.UTF-8 <wait>", - "auto <wait>", - "locale=en_US.UTF-8 <wait>", - "kbd-chooser/method=us <wait>", - "keyboard-configuration/xkb-keymap=us <wait>", - "netcfg/get_hostname={{ .Name }} <wait>", - "netcfg/get_domain=vagrantup.com <wait>", - "fb=false <wait>", - "debconf/frontend=noninteractive <wait>", - "console-setup/ask_detect=false <wait>", - "console-keymaps-at/keymap=us <wait>", - "grub-installer/bootdev=/dev/sda <wait>", - "<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", - "guest_os_type": "Debian_64", - "hard_drive_interface": "sata", - "headless": "{{ user `headless` }}", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-virtualbox", - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "virtualbox-iso", - "vboxmanage": [ - [ - "modifyvm", - "{{.Name}}", - "--memory", - "{{ user `memory` }}" - ], - [ - "modifyvm", - "{{.Name}}", - "--cpus", - "{{ user `cpus` }}" - ] - ], - "virtualbox_version_file": ".vbox_version", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<esc><wait>", - "install <wait>", - " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}} <wait>", - "debian-installer=en_US.UTF-8 <wait>", - "auto <wait>", - "locale=en_US.UTF-8 <wait>", - "kbd-chooser/method=us <wait>", - "keyboard-configuration/xkb-keymap=us <wait>", - "netcfg/get_hostname={{ .Name }} <wait>", - "netcfg/get_domain=vagrantup.com <wait>", - "fb=false <wait>", - "debconf/frontend=noninteractive <wait>", - "console-setup/ask_detect=false <wait>", - "console-keymaps-at/keymap=us <wait>", - "grub-installer/bootdev=/dev/sda <wait>", - "<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "debian8-64", - "headless": "{{ user `headless` }}", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-vmware", - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "tools_upload_flavor": "linux", - "type": "vmware-iso", - "vm_name": "{{ user `template` }}", - "vmx_data": { - "cpuid.coresPerSocket": "1", - "ethernet0.pciSlotNumber": "32", - "memsize": "{{ user `memory` }}", - "numvcpus": "{{ user `cpus` }}" - } - }, - { - "boot_command": [ - "<esc><wait>", - "install <wait>", - " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}} <wait>", - "debian-installer=en_US.UTF-8 <wait>", - "auto <wait>", - "locale=en_US.UTF-8 <wait>", - "kbd-chooser/method=us <wait>", - "keyboard-configuration/xkb-keymap=us <wait>", - "netcfg/get_hostname={{ .Name }} <wait>", - "netcfg/get_domain=vagrantup.com <wait>", - "fb=false <wait>", - "debconf/frontend=noninteractive <wait>", - "console-setup/ask_detect=false <wait>", - "console-keymaps-at/keymap=us <wait>", - "grub-installer/bootdev=/dev/sda <wait>", - "<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "debian", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-parallels", - "parallels_tools_flavor": "lin", - "prlctl": [ - [ - "set", - "{{.Name}}", - "--memsize", - "{{ user `memory` }}" - ], - [ - "set", - "{{.Name}}", - "--cpus", - "{{ user `cpus` }}" - ] - ], - "prlctl_version_file": ".prlctl_version", - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "parallels-iso", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<esc><wait>", - "install <wait>", - " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}} <wait>", - "debian-installer=en_US.UTF-8 <wait>", - "auto <wait>", - "locale=en_US.UTF-8 <wait>", - "kbd-chooser/method=us <wait>", - "keyboard-configuration/xkb-keymap=us <wait>", - "netcfg/get_hostname={{ .Name }} <wait>", - "netcfg/get_domain=vagrantup.com <wait>", - "fb=false <wait>", - "debconf/frontend=noninteractive <wait>", - "console-setup/ask_detect=false <wait>", - "console-keymaps-at/keymap=us <wait>", - "grub-installer/bootdev=/dev/vda <wait>", - "<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "headless": "{{ user `headless` }}", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-qemu", - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "qemu", - "vm_name": "{{ user `template` }}" - } - ], - "post-processors": [ - { - "output": "builds/{{user `box_basename`}}.{{.Provider}}.box", - "type": "vagrant" - } - ], - "provisioners": [ - { - "destination": "/tmp/bento-metadata.json", - "source": "{{user `metadata`}}", - "type": "file" - }, - { - "environment_vars": [ - "HOME_DIR=/home/vagrant", - "http_proxy={{user `http_proxy`}}", - "https_proxy={{user `https_proxy`}}", - "no_proxy={{user `no_proxy`}}" - ], - "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", - "scripts": [ - "scripts/common/metadata.sh", - "scripts/debian/update.sh", - "scripts/common/sshd.sh", - "scripts/debian/networking.sh", - "scripts/debian/sudoers.sh", - "scripts/common/vagrant.sh", - "scripts/common/virtualbox.sh", - "scripts/common/vmware.sh", - "scripts/debian/systemd.sh", - "scripts/common/parallels.sh", - "scripts/debian/cleanup.sh", - "scripts/common/minimize.sh" - ], - "type": "shell" - } - ], - "variables": { - "box_basename": "debian-8.5", - "build_timestamp": "{{isotime \"20060102150405\"}}", - "cpus": "1", - "disk_size": "40960", - "git_revision": "__unknown_git_revision__", - "headless": "", - "http_proxy": "{{env `http_proxy`}}", - "https_proxy": "{{env `https_proxy`}}", - "iso_checksum": "f8a71bb612a4c0bba85c676de8dbd63017692ff45b025206c3ec3530baa56964", - "iso_checksum_type": "sha256", - "iso_name": "debian-8.5.0-amd64-CD-1.iso", - "memory": "512", - "metadata": "floppy/dummy_metadata.json", - "mirror": "http://cdimage.debian.org/cdimage/release", - "mirror_directory": "8.5.0/amd64/iso-cd", - "name": "debian-8.5", - "no_proxy": "{{env `no_proxy`}}", - "preseed_path": "debian-8/preseed.cfg", - "template": "debian-8.5-amd64", - "version": "2.1.TIMESTAMP" - } -} diff --git a/archive/debian-8.5-i386.json b/archive/debian-8.5-i386.json deleted file mode 100644 index 87897f8df..000000000 --- a/archive/debian-8.5-i386.json +++ /dev/null @@ -1,245 +0,0 @@ -{ - "builders": [ - { - "boot_command": [ - "<esc><wait>", - "install <wait>", - " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}} <wait>", - "debian-installer=en_US.UTF-8 <wait>", - "auto <wait>", - "locale=en_US.UTF-8 <wait>", - "kbd-chooser/method=us <wait>", - "keyboard-configuration/xkb-keymap=us <wait>", - "netcfg/get_hostname={{ .Name }} <wait>", - "netcfg/get_domain=vagrantup.com <wait>", - "fb=false <wait>", - "debconf/frontend=noninteractive <wait>", - "console-setup/ask_detect=false <wait>", - "console-keymaps-at/keymap=us <wait>", - "grub-installer/bootdev=/dev/sda <wait>", - "<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", - "guest_os_type": "Debian", - "hard_drive_interface": "sata", - "headless": "{{ user `headless` }}", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-virtualbox", - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "virtualbox-iso", - "vboxmanage": [ - [ - "modifyvm", - "{{.Name}}", - "--memory", - "{{ user `memory` }}" - ], - [ - "modifyvm", - "{{.Name}}", - "--cpus", - "{{ user `cpus` }}" - ] - ], - "virtualbox_version_file": ".vbox_version", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<esc><wait>", - "install <wait>", - " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}} <wait>", - "debian-installer=en_US.UTF-8 <wait>", - "auto <wait>", - "locale=en_US.UTF-8 <wait>", - "kbd-chooser/method=us <wait>", - "keyboard-configuration/xkb-keymap=us <wait>", - "netcfg/get_hostname={{ .Name }} <wait>", - "netcfg/get_domain=vagrantup.com <wait>", - "fb=false <wait>", - "debconf/frontend=noninteractive <wait>", - "console-setup/ask_detect=false <wait>", - "console-keymaps-at/keymap=us <wait>", - "grub-installer/bootdev=/dev/sda <wait>", - "<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "debian8", - "headless": "{{ user `headless` }}", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-vmware", - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "tools_upload_flavor": "linux", - "type": "vmware-iso", - "vm_name": "{{ user `template` }}", - "vmx_data": { - "cpuid.coresPerSocket": "1", - "ethernet0.pciSlotNumber": "32", - "memsize": "{{ user `memory` }}", - "numvcpus": "{{ user `cpus` }}" - } - }, - { - "boot_command": [ - "<esc><wait>", - "install <wait>", - " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}} <wait>", - "debian-installer=en_US.UTF-8 <wait>", - "auto <wait>", - "locale=en_US.UTF-8 <wait>", - "kbd-chooser/method=us <wait>", - "keyboard-configuration/xkb-keymap=us <wait>", - "netcfg/get_hostname={{ .Name }} <wait>", - "netcfg/get_domain=vagrantup.com <wait>", - "fb=false <wait>", - "debconf/frontend=noninteractive <wait>", - "console-setup/ask_detect=false <wait>", - "console-keymaps-at/keymap=us <wait>", - "grub-installer/bootdev=/dev/sda <wait>", - "<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "debian", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-parallels", - "parallels_tools_flavor": "lin", - "prlctl": [ - [ - "set", - "{{.Name}}", - "--memsize", - "{{ user `memory` }}" - ], - [ - "set", - "{{.Name}}", - "--cpus", - "{{ user `cpus` }}" - ] - ], - "prlctl_version_file": ".prlctl_version", - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "parallels-iso", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<esc><wait>", - "install <wait>", - " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}} <wait>", - "debian-installer=en_US.UTF-8 <wait>", - "auto <wait>", - "locale=en_US.UTF-8 <wait>", - "kbd-chooser/method=us <wait>", - "keyboard-configuration/xkb-keymap=us <wait>", - "netcfg/get_hostname={{ .Name }} <wait>", - "netcfg/get_domain=vagrantup.com <wait>", - "fb=false <wait>", - "debconf/frontend=noninteractive <wait>", - "console-setup/ask_detect=false <wait>", - "console-keymaps-at/keymap=us <wait>", - "grub-installer/bootdev=/dev/vda <wait>", - "<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "headless": "{{ user `headless` }}", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-qemu", - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "qemu", - "vm_name": "{{ user `template` }}" - } - ], - "post-processors": [ - { - "output": "builds/{{user `box_basename`}}.{{.Provider}}.box", - "type": "vagrant" - } - ], - "provisioners": [ - { - "destination": "/tmp/bento-metadata.json", - "source": "{{user `metadata`}}", - "type": "file" - }, - { - "environment_vars": [ - "HOME_DIR=/home/vagrant", - "http_proxy={{user `http_proxy`}}", - "https_proxy={{user `https_proxy`}}", - "no_proxy={{user `no_proxy`}}" - ], - "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", - "scripts": [ - "scripts/common/metadata.sh", - "scripts/debian/update.sh", - "scripts/common/sshd.sh", - "scripts/debian/networking.sh", - "scripts/debian/sudoers.sh", - "scripts/common/vagrant.sh", - "scripts/common/virtualbox.sh", - "scripts/common/vmware.sh", - "scripts/debian/systemd.sh", - "scripts/common/parallels.sh", - "scripts/debian/cleanup.sh", - "scripts/common/minimize.sh" - ], - "type": "shell" - } - ], - "variables": { - "box_basename": "debian-8.5-i386", - "build_timestamp": "{{isotime \"20060102150405\"}}", - "cpus": "1", - "disk_size": "40960", - "git_revision": "__unknown_git_revision__", - "headless": "", - "http_proxy": "{{env `http_proxy`}}", - "https_proxy": "{{env `https_proxy`}}", - "iso_checksum": "c02042cc8602114cd2ad3a354fc37a73456443b38594b0259b1c62487b929567", - "iso_checksum_type": "sha256", - "iso_name": "debian-8.5.0-i386-CD-1.iso", - "memory": "512", - "metadata": "floppy/dummy_metadata.json", - "mirror": "http://cdimage.debian.org/cdimage/release", - "mirror_directory": "8.5.0/i386/iso-cd", - "name": "debian-8.5-i386", - "no_proxy": "{{env `no_proxy`}}", - "preseed_path": "debian-8/preseed.cfg", - "template": "debian-8.5-i386", - "version": "2.1.TIMESTAMP" - } -} diff --git a/archive/debian-8.6-amd64.json b/archive/debian-8.6-amd64.json deleted file mode 100644 index 508bd9ce3..000000000 --- a/archive/debian-8.6-amd64.json +++ /dev/null @@ -1,246 +0,0 @@ -{ - "builders": [ - { - "boot_command": [ - "<esc><wait>", - "install <wait>", - " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}} <wait>", - "debian-installer=en_US.UTF-8 <wait>", - "auto <wait>", - "locale=en_US.UTF-8 <wait>", - "kbd-chooser/method=us <wait>", - "keyboard-configuration/xkb-keymap=us <wait>", - "netcfg/get_hostname={{ .Name }} <wait>", - "netcfg/get_domain=vagrantup.com <wait>", - "fb=false <wait>", - "debconf/frontend=noninteractive <wait>", - "console-setup/ask_detect=false <wait>", - "console-keymaps-at/keymap=us <wait>", - "grub-installer/bootdev=/dev/sda <wait>", - "<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", - "guest_os_type": "Debian_64", - "hard_drive_interface": "sata", - "headless": "{{ user `headless` }}", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-virtualbox", - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "virtualbox-iso", - "vboxmanage": [ - [ - "modifyvm", - "{{.Name}}", - "--memory", - "{{ user `memory` }}" - ], - [ - "modifyvm", - "{{.Name}}", - "--cpus", - "{{ user `cpus` }}" - ] - ], - "virtualbox_version_file": ".vbox_version", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<esc><wait>", - "install <wait>", - " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}} <wait>", - "debian-installer=en_US.UTF-8 <wait>", - "auto <wait>", - "locale=en_US.UTF-8 <wait>", - "kbd-chooser/method=us <wait>", - "keyboard-configuration/xkb-keymap=us <wait>", - "netcfg/get_hostname={{ .Name }} <wait>", - "netcfg/get_domain=vagrantup.com <wait>", - "fb=false <wait>", - "debconf/frontend=noninteractive <wait>", - "console-setup/ask_detect=false <wait>", - "console-keymaps-at/keymap=us <wait>", - "grub-installer/bootdev=/dev/sda <wait>", - "<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "debian8-64", - "headless": "{{ user `headless` }}", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-vmware", - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "tools_upload_flavor": "linux", - "type": "vmware-iso", - "vm_name": "{{ user `template` }}", - "vmx_data": { - "cpuid.coresPerSocket": "1", - "ethernet0.pciSlotNumber": "32", - "memsize": "{{ user `memory` }}", - "numvcpus": "{{ user `cpus` }}" - } - }, - { - "boot_command": [ - "<esc><wait>", - "install <wait>", - " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}} <wait>", - "debian-installer=en_US.UTF-8 <wait>", - "auto <wait>", - "locale=en_US.UTF-8 <wait>", - "kbd-chooser/method=us <wait>", - "keyboard-configuration/xkb-keymap=us <wait>", - "netcfg/get_hostname={{ .Name }} <wait>", - "netcfg/get_domain=vagrantup.com <wait>", - "fb=false <wait>", - "debconf/frontend=noninteractive <wait>", - "console-setup/ask_detect=false <wait>", - "console-keymaps-at/keymap=us <wait>", - "grub-installer/bootdev=/dev/sda <wait>", - "<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "debian", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-parallels", - "parallels_tools_flavor": "lin", - "prlctl": [ - [ - "set", - "{{.Name}}", - "--memsize", - "{{ user `memory` }}" - ], - [ - "set", - "{{.Name}}", - "--cpus", - "{{ user `cpus` }}" - ] - ], - "prlctl_version_file": ".prlctl_version", - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "parallels-iso", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<esc><wait>", - "install <wait>", - " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}} <wait>", - "debian-installer=en_US.UTF-8 <wait>", - "auto <wait>", - "locale=en_US.UTF-8 <wait>", - "kbd-chooser/method=us <wait>", - "keyboard-configuration/xkb-keymap=us <wait>", - "netcfg/get_hostname={{ .Name }} <wait>", - "netcfg/get_domain=vagrantup.com <wait>", - "fb=false <wait>", - "debconf/frontend=noninteractive <wait>", - "console-setup/ask_detect=false <wait>", - "console-keymaps-at/keymap=us <wait>", - "grub-installer/bootdev=/dev/vda <wait>", - "<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "headless": "{{ user `headless` }}", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-qemu", - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "qemu", - "vm_name": "{{ user `template` }}" - } - ], - "post-processors": [ - { - "output": "builds/{{user `box_basename`}}.{{.Provider}}.box", - "type": "vagrant" - } - ], - "provisioners": [ - { - "destination": "/tmp/bento-metadata.json", - "source": "{{user `metadata`}}", - "type": "file" - }, - { - "environment_vars": [ - "HOME_DIR=/home/vagrant", - "http_proxy={{user `http_proxy`}}", - "https_proxy={{user `https_proxy`}}", - "no_proxy={{user `no_proxy`}}" - ], - "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", - "scripts": [ - "scripts/common/metadata.sh", - "scripts/debian/update.sh", - "scripts/common/sshd.sh", - "scripts/debian/networking.sh", - "scripts/debian/sudoers.sh", - "scripts/common/vagrant.sh", - "scripts/debian/systemd.sh", - "scripts/common/virtualbox.sh", - "scripts/common/vmware.sh", - "scripts/common/parallels.sh", - "scripts/debian/cleanup.sh", - "scripts/common/minimize.sh" - ], - "type": "shell" - } - ], - "variables": { - "box_basename": "debian-8.6", - "build_timestamp": "{{isotime \"20060102150405\"}}", - "cpus": "1", - "disk_size": "40960", - "git_revision": "__unknown_git_revision__", - "headless": "", - "http_proxy": "{{env `http_proxy`}}", - "https_proxy": "{{env `https_proxy`}}", - "iso_checksum": "e9cb144e486409b2ea1454dceae8d46e0ebab88435cf0b6e7a18f3aa3a51c538", - "iso_checksum_type": "sha256", - "iso_name": "debian-8.6.0-amd64-CD-1.iso", - "memory": "512", - "metadata": "floppy/dummy_metadata.json", - "mirror": "http://cdimage.debian.org/cdimage/release", - "mirror_directory": "8.6.0/amd64/iso-cd", - "name": "debian-8.6", - "no_proxy": "{{env `no_proxy`}}", - "preseed_path": "debian-8/preseed.cfg", - "template": "debian-8.6-amd64", - "version": "2.1.TIMESTAMP" - } -} - diff --git a/archive/debian-8.6-i386.json b/archive/debian-8.6-i386.json deleted file mode 100644 index 2a031c4f0..000000000 --- a/archive/debian-8.6-i386.json +++ /dev/null @@ -1,246 +0,0 @@ -{ - "builders": [ - { - "boot_command": [ - "<esc><wait>", - "install <wait>", - " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}} <wait>", - "debian-installer=en_US.UTF-8 <wait>", - "auto <wait>", - "locale=en_US.UTF-8 <wait>", - "kbd-chooser/method=us <wait>", - "keyboard-configuration/xkb-keymap=us <wait>", - "netcfg/get_hostname={{ .Name }} <wait>", - "netcfg/get_domain=vagrantup.com <wait>", - "fb=false <wait>", - "debconf/frontend=noninteractive <wait>", - "console-setup/ask_detect=false <wait>", - "console-keymaps-at/keymap=us <wait>", - "grub-installer/bootdev=/dev/sda <wait>", - "<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", - "guest_os_type": "Debian", - "hard_drive_interface": "sata", - "headless": "{{ user `headless` }}", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-virtualbox", - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "virtualbox-iso", - "vboxmanage": [ - [ - "modifyvm", - "{{.Name}}", - "--memory", - "{{ user `memory` }}" - ], - [ - "modifyvm", - "{{.Name}}", - "--cpus", - "{{ user `cpus` }}" - ] - ], - "virtualbox_version_file": ".vbox_version", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<esc><wait>", - "install <wait>", - " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}} <wait>", - "debian-installer=en_US.UTF-8 <wait>", - "auto <wait>", - "locale=en_US.UTF-8 <wait>", - "kbd-chooser/method=us <wait>", - "keyboard-configuration/xkb-keymap=us <wait>", - "netcfg/get_hostname={{ .Name }} <wait>", - "netcfg/get_domain=vagrantup.com <wait>", - "fb=false <wait>", - "debconf/frontend=noninteractive <wait>", - "console-setup/ask_detect=false <wait>", - "console-keymaps-at/keymap=us <wait>", - "grub-installer/bootdev=/dev/sda <wait>", - "<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "debian8", - "headless": "{{ user `headless` }}", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-vmware", - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "tools_upload_flavor": "linux", - "type": "vmware-iso", - "vm_name": "{{ user `template` }}", - "vmx_data": { - "cpuid.coresPerSocket": "1", - "ethernet0.pciSlotNumber": "32", - "memsize": "{{ user `memory` }}", - "numvcpus": "{{ user `cpus` }}" - } - }, - { - "boot_command": [ - "<esc><wait>", - "install <wait>", - " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}} <wait>", - "debian-installer=en_US.UTF-8 <wait>", - "auto <wait>", - "locale=en_US.UTF-8 <wait>", - "kbd-chooser/method=us <wait>", - "keyboard-configuration/xkb-keymap=us <wait>", - "netcfg/get_hostname={{ .Name }} <wait>", - "netcfg/get_domain=vagrantup.com <wait>", - "fb=false <wait>", - "debconf/frontend=noninteractive <wait>", - "console-setup/ask_detect=false <wait>", - "console-keymaps-at/keymap=us <wait>", - "grub-installer/bootdev=/dev/sda <wait>", - "<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "debian", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-parallels", - "parallels_tools_flavor": "lin", - "prlctl": [ - [ - "set", - "{{.Name}}", - "--memsize", - "{{ user `memory` }}" - ], - [ - "set", - "{{.Name}}", - "--cpus", - "{{ user `cpus` }}" - ] - ], - "prlctl_version_file": ".prlctl_version", - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "parallels-iso", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<esc><wait>", - "install <wait>", - " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}} <wait>", - "debian-installer=en_US.UTF-8 <wait>", - "auto <wait>", - "locale=en_US.UTF-8 <wait>", - "kbd-chooser/method=us <wait>", - "keyboard-configuration/xkb-keymap=us <wait>", - "netcfg/get_hostname={{ .Name }} <wait>", - "netcfg/get_domain=vagrantup.com <wait>", - "fb=false <wait>", - "debconf/frontend=noninteractive <wait>", - "console-setup/ask_detect=false <wait>", - "console-keymaps-at/keymap=us <wait>", - "grub-installer/bootdev=/dev/vda <wait>", - "<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "headless": "{{ user `headless` }}", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-qemu", - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "qemu", - "vm_name": "{{ user `template` }}" - } - ], - "post-processors": [ - { - "output": "builds/{{user `box_basename`}}.{{.Provider}}.box", - "type": "vagrant" - } - ], - "provisioners": [ - { - "destination": "/tmp/bento-metadata.json", - "source": "{{user `metadata`}}", - "type": "file" - }, - { - "environment_vars": [ - "HOME_DIR=/home/vagrant", - "http_proxy={{user `http_proxy`}}", - "https_proxy={{user `https_proxy`}}", - "no_proxy={{user `no_proxy`}}" - ], - "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", - "scripts": [ - "scripts/common/metadata.sh", - "scripts/debian/update.sh", - "scripts/common/sshd.sh", - "scripts/debian/networking.sh", - "scripts/debian/sudoers.sh", - "scripts/common/vagrant.sh", - "scripts/debian/systemd.sh", - "scripts/common/virtualbox.sh", - "scripts/common/vmware.sh", - "scripts/common/parallels.sh", - "scripts/debian/cleanup.sh", - "scripts/common/minimize.sh" - ], - "type": "shell" - } - ], - "variables": { - "box_basename": "debian-8.6-i386", - "build_timestamp": "{{isotime \"20060102150405\"}}", - "cpus": "1", - "disk_size": "40960", - "git_revision": "__unknown_git_revision__", - "headless": "", - "http_proxy": "{{env `http_proxy`}}", - "https_proxy": "{{env `https_proxy`}}", - "iso_checksum": "9f93c4f5981f14515221b6cf6b01b211af895dd120194d462f16cf0739457ff5", - "iso_checksum_type": "sha256", - "iso_name": "debian-8.6.0-i386-CD-1.iso", - "memory": "512", - "metadata": "floppy/dummy_metadata.json", - "mirror": "http://cdimage.debian.org/cdimage/release", - "mirror_directory": "8.6.0/i386/iso-cd", - "name": "debian-8.6-i386", - "no_proxy": "{{env `no_proxy`}}", - "preseed_path": "debian-8/preseed.cfg", - "template": "debian-8.6-i386", - "version": "2.1.TIMESTAMP" - } -} - diff --git a/archive/fedora-20-i386.json b/archive/fedora-20-i386.json deleted file mode 100644 index 47f18f5b9..000000000 --- a/archive/fedora-20-i386.json +++ /dev/null @@ -1,180 +0,0 @@ -{ - "builders": [ - { - "boot_command": [ - "<tab> linux ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", - "guest_os_type": "Fedora", - "hard_drive_interface": "sata", - "headless": "{{ user `headless` }}", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-virtualbox", - "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "virtualbox-iso", - "vboxmanage": [ - [ - "modifyvm", - "{{.Name}}", - "--memory", - "{{ user `memory` }}" - ], - [ - "modifyvm", - "{{.Name}}", - "--cpus", - "{{ user `cpus` }}" - ] - ], - "virtualbox_version_file": ".vbox_version", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<tab> linux ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "fedora", - "headless": "{{ user `headless` }}", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-vmware", - "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "tools_upload_flavor": "linux", - "type": "vmware-iso", - "vm_name": "{{ user `template` }}", - "vmx_data": { - "cpuid.coresPerSocket": "1", - "memsize": "{{ user `memory` }}", - "numvcpus": "{{ user `cpus` }}" - } - }, - { - "boot_command": [ - "<tab> linux ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "fedora-core", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-parallels", - "parallels_tools_flavor": "lin", - "prlctl": [ - [ - "set", - "{{.Name}}", - "--memsize", - "{{ user `memory` }}" - ], - [ - "set", - "{{.Name}}", - "--cpus", - "{{ user `cpus` }}" - ] - ], - "prlctl_version_file": ".prlctl_version", - "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "parallels-iso", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<tab> linux ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "headless": "{{ user `headless` }}", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-qemu", - "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "qemu", - "vm_name": "{{ user `template` }}" - } - ], - "post-processors": [ - { - "output": "builds/{{user `box_basename`}}.{{.Provider}}.box", - "type": "vagrant" - } - ], - "provisioners": [ - { - "destination": "/tmp/bento-metadata.json", - "source": "{{user `metadata`}}", - "type": "file" - }, - { - "environment_vars": [ - "HOME_DIR=/home/vagrant", - "http_proxy={{user `http_proxy`}}", - "https_proxy={{user `https_proxy`}}", - "no_proxy={{user `no_proxy`}}" - ], - "execute_command": "echo 'vagrant' | {{.Vars}} sudo -E -S bash '{{.Path}}'", - "scripts": [ - "scripts/common/metadata.sh", - "scripts/fedora/fix-slow-dns.sh", - "scripts/common/sshd.sh", - "scripts/common/vmtools.sh", - "scripts/common/vagrant.sh", - "scripts/fedora/cleanup.sh", - "scripts/common/minimize.sh" - ], - "type": "shell" - } - ], - "variables": { - "arch": "32", - "box_basename": "fedora-20-i386", - "build_timestamp": "{{isotime \"20060102150405\"}}", - "cpus": "1", - "disk_size": "40960", - "git_revision": "__unknown_git_revision__", - "headless": "", - "http_proxy": "{{env `http_proxy`}}", - "https_proxy": "{{env `https_proxy`}}", - "iso_checksum": "284ea30ddd50db1b30cd5cd9fae7495dad8714ef1e4428d69a8c8ce80e03b6a9", - "iso_checksum_type": "sha256", - "iso_name": "Fedora-20-i386-DVD.iso", - "ks_path": "fedora-20/ks.cfg", - "memory": "512", - "metadata": "floppy/dummy_metadata.json", - "mirror": "https://archive.fedoraproject.org/pub/archive/fedora/linux", - "mirror_directory": "releases/20/Fedora/x86_64/iso", - "name": "fedora-20-i386", - "no_proxy": "{{env `no_proxy`}}", - "template": "fedora-20-i386", - "version": "2.0.TIMESTAMP" - } -} diff --git a/archive/fedora-20-x86_64.json b/archive/fedora-20-x86_64.json deleted file mode 100644 index 4622e6862..000000000 --- a/archive/fedora-20-x86_64.json +++ /dev/null @@ -1,180 +0,0 @@ -{ - "builders": [ - { - "boot_command": [ - "<tab> linux ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", - "guest_os_type": "Fedora_64", - "hard_drive_interface": "sata", - "headless": "{{ user `headless` }}", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-virtualbox", - "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "virtualbox-iso", - "vboxmanage": [ - [ - "modifyvm", - "{{.Name}}", - "--memory", - "{{ user `memory` }}" - ], - [ - "modifyvm", - "{{.Name}}", - "--cpus", - "{{ user `cpus` }}" - ] - ], - "virtualbox_version_file": ".vbox_version", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<tab> linux ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "fedora-64", - "headless": "{{ user `headless` }}", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-vmware", - "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "tools_upload_flavor": "linux", - "type": "vmware-iso", - "vm_name": "{{ user `template` }}", - "vmx_data": { - "cpuid.coresPerSocket": "1", - "memsize": "{{ user `memory` }}", - "numvcpus": "{{ user `cpus` }}" - } - }, - { - "boot_command": [ - "<tab> linux ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "fedora-core", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-parallels", - "parallels_tools_flavor": "lin", - "prlctl": [ - [ - "set", - "{{.Name}}", - "--memsize", - "{{ user `memory` }}" - ], - [ - "set", - "{{.Name}}", - "--cpus", - "{{ user `cpus` }}" - ] - ], - "prlctl_version_file": ".prlctl_version", - "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "parallels-iso", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<tab> linux ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "headless": "{{ user `headless` }}", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-qemu", - "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "qemu", - "vm_name": "{{ user `template` }}" - } - ], - "post-processors": [ - { - "output": "builds/{{user `box_basename`}}.{{.Provider}}.box", - "type": "vagrant" - } - ], - "provisioners": [ - { - "destination": "/tmp/bento-metadata.json", - "source": "{{user `metadata`}}", - "type": "file" - }, - { - "environment_vars": [ - "HOME_DIR=/home/vagrant", - "http_proxy={{user `http_proxy`}}", - "https_proxy={{user `https_proxy`}}", - "no_proxy={{user `no_proxy`}}" - ], - "execute_command": "echo 'vagrant' | {{.Vars}} sudo -E -S bash '{{.Path}}'", - "scripts": [ - "scripts/common/metadata.sh", - "scripts/fedora/fix-slow-dns.sh", - "scripts/common/sshd.sh", - "scripts/common/vmtools.sh", - "scripts/common/vagrant.sh", - "scripts/fedora/cleanup.sh", - "scripts/common/minimize.sh" - ], - "type": "shell" - } - ], - "variables": { - "arch": "64", - "box_basename": "fedora-20", - "build_timestamp": "{{isotime \"20060102150405\"}}", - "cpus": "1", - "disk_size": "40960", - "git_revision": "__unknown_git_revision__", - "headless": "", - "http_proxy": "{{env `http_proxy`}}", - "https_proxy": "{{env `https_proxy`}}", - "iso_checksum": "f2eeed5102b8890e9e6f4b9053717fe73031e699c4b76dc7028749ab66e7f917", - "iso_checksum_type": "sha256", - "iso_name": "Fedora-20-x86_64-DVD.iso", - "ks_path": "fedora-20/ks.cfg", - "memory": "512", - "metadata": "floppy/dummy_metadata.json", - "mirror": "https://archive.fedoraproject.org/pub/archive/fedora/linux", - "mirror_directory": "releases/20/Fedora/x86_64/iso", - "name": "fedora-20", - "no_proxy": "{{env `no_proxy`}}", - "template": "fedora-20-x86_64", - "version": "2.0.TIMESTAMP" - } -} diff --git a/archive/fedora-21-i386.json b/archive/fedora-21-i386.json deleted file mode 100644 index f6f087382..000000000 --- a/archive/fedora-21-i386.json +++ /dev/null @@ -1,180 +0,0 @@ -{ - "builders": [ - { - "boot_command": [ - "<tab> linux ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", - "guest_os_type": "Fedora", - "hard_drive_interface": "sata", - "headless": "{{ user `headless` }}", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-virtualbox", - "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "virtualbox-iso", - "vboxmanage": [ - [ - "modifyvm", - "{{.Name}}", - "--memory", - "{{ user `memory` }}" - ], - [ - "modifyvm", - "{{.Name}}", - "--cpus", - "{{ user `cpus` }}" - ] - ], - "virtualbox_version_file": ".vbox_version", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<tab> linux ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "fedora", - "headless": "{{ user `headless` }}", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-vmware", - "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "tools_upload_flavor": "linux", - "type": "vmware-iso", - "vm_name": "{{ user `template` }}", - "vmx_data": { - "cpuid.coresPerSocket": "1", - "memsize": "{{ user `memory` }}", - "numvcpus": "{{ user `cpus` }}" - } - }, - { - "boot_command": [ - "<tab> linux ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "fedora-core", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-parallels", - "parallels_tools_flavor": "lin", - "prlctl": [ - [ - "set", - "{{.Name}}", - "--memsize", - "{{ user `memory` }}" - ], - [ - "set", - "{{.Name}}", - "--cpus", - "{{ user `cpus` }}" - ] - ], - "prlctl_version_file": ".prlctl_version", - "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "parallels-iso", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<tab> linux ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "headless": "{{ user `headless` }}", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-qemu", - "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "qemu", - "vm_name": "{{ user `template` }}" - } - ], - "post-processors": [ - { - "output": "builds/{{user `box_basename`}}.{{.Provider}}.box", - "type": "vagrant" - } - ], - "provisioners": [ - { - "destination": "/tmp/bento-metadata.json", - "source": "{{user `metadata`}}", - "type": "file" - }, - { - "environment_vars": [ - "HOME_DIR=/home/vagrant", - "http_proxy={{user `http_proxy`}}", - "https_proxy={{user `https_proxy`}}", - "no_proxy={{user `no_proxy`}}" - ], - "execute_command": "echo 'vagrant' | {{.Vars}} sudo -E -S bash '{{.Path}}'", - "scripts": [ - "scripts/common/metadata.sh", - "scripts/fedora/fix-slow-dns.sh", - "scripts/common/sshd.sh", - "scripts/common/vmtools.sh", - "scripts/common/vagrant.sh", - "scripts/fedora/cleanup.sh", - "scripts/common/minimize.sh" - ], - "type": "shell" - } - ], - "variables": { - "arch": "32", - "box_basename": "fedora-21-i386", - "build_timestamp": "{{isotime \"20060102150405\"}}", - "cpus": "1", - "disk_size": "40960", - "git_revision": "__unknown_git_revision__", - "headless": "", - "http_proxy": "{{env `http_proxy`}}", - "https_proxy": "{{env `https_proxy`}}", - "iso_checksum": "85e50a8a938996522bf1605b3578a2d6680362c1aa963d0560d59c2e4fc795ef", - "iso_checksum_type": "sha256", - "iso_name": "Fedora-Server-DVD-i386-21.iso", - "ks_path": "fedora-21/ks.cfg", - "memory": "512", - "metadata": "floppy/dummy_metadata.json", - "mirror": "http://download.fedoraproject.org/pub/fedora/linux", - "mirror_directory": "releases/21/Server/i386/iso", - "name": "fedora-21-i386", - "no_proxy": "{{env `no_proxy`}}", - "template": "fedora-21-i386", - "version": "2.0.TIMESTAMP" - } -} diff --git a/archive/fedora-21-x86_64.json b/archive/fedora-21-x86_64.json deleted file mode 100644 index 18a08c074..000000000 --- a/archive/fedora-21-x86_64.json +++ /dev/null @@ -1,180 +0,0 @@ -{ - "builders": [ - { - "boot_command": [ - "<tab> linux ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", - "guest_os_type": "Fedora_64", - "hard_drive_interface": "sata", - "headless": "{{ user `headless` }}", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-virtualbox", - "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "virtualbox-iso", - "vboxmanage": [ - [ - "modifyvm", - "{{.Name}}", - "--memory", - "{{ user `memory` }}" - ], - [ - "modifyvm", - "{{.Name}}", - "--cpus", - "{{ user `cpus` }}" - ] - ], - "virtualbox_version_file": ".vbox_version", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<tab> linux ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "fedora-64", - "headless": "{{ user `headless` }}", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-vmware", - "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "tools_upload_flavor": "linux", - "type": "vmware-iso", - "vm_name": "{{ user `template` }}", - "vmx_data": { - "cpuid.coresPerSocket": "1", - "memsize": "{{ user `memory` }}", - "numvcpus": "{{ user `cpus` }}" - } - }, - { - "boot_command": [ - "<tab> linux ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "fedora-core", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-parallels", - "parallels_tools_flavor": "lin", - "prlctl": [ - [ - "set", - "{{.Name}}", - "--memsize", - "{{ user `memory` }}" - ], - [ - "set", - "{{.Name}}", - "--cpus", - "{{ user `cpus` }}" - ] - ], - "prlctl_version_file": ".prlctl_version", - "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "parallels-iso", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<tab> linux ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "headless": "{{ user `headless` }}", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-qemu", - "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "qemu", - "vm_name": "{{ user `template` }}" - } - ], - "post-processors": [ - { - "output": "builds/{{user `box_basename`}}.{{.Provider}}.box", - "type": "vagrant" - } - ], - "provisioners": [ - { - "destination": "/tmp/bento-metadata.json", - "source": "{{user `metadata`}}", - "type": "file" - }, - { - "environment_vars": [ - "HOME_DIR=/home/vagrant", - "http_proxy={{user `http_proxy`}}", - "https_proxy={{user `https_proxy`}}", - "no_proxy={{user `no_proxy`}}" - ], - "execute_command": "echo 'vagrant' | {{.Vars}} sudo -E -S bash '{{.Path}}'", - "scripts": [ - "scripts/common/metadata.sh", - "scripts/fedora/fix-slow-dns.sh", - "scripts/common/sshd.sh", - "scripts/common/vmtools.sh", - "scripts/common/vagrant.sh", - "scripts/fedora/cleanup.sh", - "scripts/common/minimize.sh" - ], - "type": "shell" - } - ], - "variables": { - "arch": "64", - "box_basename": "fedora-21", - "build_timestamp": "{{isotime \"20060102150405\"}}", - "cpus": "1", - "disk_size": "40960", - "git_revision": "__unknown_git_revision__", - "headless": "", - "http_proxy": "{{env `http_proxy`}}", - "https_proxy": "{{env `https_proxy`}}", - "iso_checksum": "a6a2e83bb409d6b8ee3072ad07faac0a54d79c9ecbe3a40af91b773e2d843d8e", - "iso_checksum_type": "sha256", - "iso_name": "Fedora-Server-DVD-x86_64-21.iso", - "ks_path": "fedora-21/ks.cfg", - "memory": "512", - "metadata": "floppy/dummy_metadata.json", - "mirror": "http://download.fedoraproject.org/pub/fedora/linux", - "mirror_directory": "releases/21/Server/x86_64/iso", - "name": "fedora-21", - "no_proxy": "{{env `no_proxy`}}", - "template": "fedora-21-x86_64", - "version": "2.0.TIMESTAMP" - } -} diff --git a/archive/fedora-22-i386.json b/archive/fedora-22-i386.json deleted file mode 100644 index 8404a76c2..000000000 --- a/archive/fedora-22-i386.json +++ /dev/null @@ -1,177 +0,0 @@ - -{ - "builders": [ - { - "boot_command": [ - "<tab> linux ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", - "guest_os_type": "Fedora", - "hard_drive_interface": "sata", - "headless": "{{ user `headless` }}", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-virtualbox", - "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "virtualbox-iso", - "vboxmanage": [ - [ - "modifyvm", - "{{.Name}}", - "--memory", - "{{ user `memory` }}" - ], - [ - "modifyvm", - "{{.Name}}", - "--cpus", - "{{ user `cpus` }}" - ] - ], - "virtualbox_version_file": ".vbox_version", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<tab> linux ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "fedora", - "headless": "{{ user `headless` }}", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-vmware", - "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "tools_upload_flavor": "linux", - "type": "vmware-iso", - "vm_name": "{{ user `template` }}", - "vmx_data": { - "cpuid.coresPerSocket": "1", - "memsize": "{{ user `memory` }}", - "numvcpus": "{{ user `cpus` }}" - } - }, - { - "boot_command": [ - "<tab> linux ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "fedora-core", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-parallels", - "parallels_tools_flavor": "lin", - "prlctl": [ - [ - "set", - "{{.Name}}", - "--memsize", - "{{ user `memory` }}" - ], - [ - "set", - "{{.Name}}", - "--cpus", - "{{ user `cpus` }}" - ] - ], - "prlctl_version_file": ".prlctl_version", - "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "parallels-iso", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<tab> linux ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "headless": "{{ user `headless` }}", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-qemu", - "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "qemu", - "vm_name": "{{ user `template` }}" - } - ], - "post-processors": [ - { - "output": "builds/{{user `box_basename`}}.{{.Provider}}.box", - "type": "vagrant" - } - ], - "provisioners": [ - { - "destination": "/tmp/bento-metadata.json", - "source": "{{user `metadata`}}", - "type": "file" - }, - { - "environment_vars": [], - "execute_command": "echo 'vagrant' | {{.Vars}} sudo -E -S bash '{{.Path}}'", - "scripts": [ - "scripts/common/metadata.sh", - "scripts/fedora/fix-slow-dns.sh", - "scripts/common/sshd.sh", - "scripts/fedora/build-tools.sh", - "scripts/common/vmtools.sh", - "scripts/common/vagrant.sh", - "scripts/fedora/cleanup.sh", - "scripts/common/minimize.sh" - ], - "type": "shell" - } - ], - "variables": { - "arch": "32", - "box_basename": "fedora-22-i386", - "build_timestamp": "{{isotime \"20060102150405\"}}", - "cpus": "1", - "disk_size": "40960", - "git_revision": "__unknown_git_revision__", - "headless": "", - "http_proxy": "{{env `http_proxy`}}", - "https_proxy": "{{env `https_proxy`}}", - "iso_checksum": "5e3dfdff30667f3339d8b4e6ac0651c2e00c9417987848bef772cb92dbc823a5", - "iso_checksum_type": "sha256", - "iso_name": "Fedora-Server-DVD-i386-22.iso", - "ks_path": "fedora-latest/ks.cfg", - "memory": "512", - "metadata": "floppy/dummy_metadata.json", - "mirror": "http://download.fedoraproject.org/pub/fedora/linux", - "mirror_directory": "releases/22/Server/i386/iso", - "name": "fedora-22-i386", - "no_proxy": "{{env `no_proxy`}}", - "template": "fedora-22-i386", - "version": "2.0.TIMESTAMP" - } -} diff --git a/archive/fedora-22-x86_64.json b/archive/fedora-22-x86_64.json deleted file mode 100644 index ad0652c65..000000000 --- a/archive/fedora-22-x86_64.json +++ /dev/null @@ -1,181 +0,0 @@ -{ - "builders": [ - { - "boot_command": [ - "<tab> linux ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", - "guest_os_type": "Fedora_64", - "hard_drive_interface": "sata", - "headless": "{{ user `headless` }}", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-virtualbox", - "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "virtualbox-iso", - "vboxmanage": [ - [ - "modifyvm", - "{{.Name}}", - "--memory", - "{{ user `memory` }}" - ], - [ - "modifyvm", - "{{.Name}}", - "--cpus", - "{{ user `cpus` }}" - ] - ], - "virtualbox_version_file": ".vbox_version", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<tab> linux ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "fedora-64", - "headless": "{{ user `headless` }}", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-vmware", - "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "tools_upload_flavor": "linux", - "type": "vmware-iso", - "vm_name": "{{ user `template` }}", - "vmx_data": { - "cpuid.coresPerSocket": "1", - "memsize": "{{ user `memory` }}", - "numvcpus": "{{ user `cpus` }}" - } - }, - { - "boot_command": [ - "<tab> linux ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "fedora-core", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-parallels", - "parallels_tools_flavor": "lin", - "prlctl": [ - [ - "set", - "{{.Name}}", - "--memsize", - "{{ user `memory` }}" - ], - [ - "set", - "{{.Name}}", - "--cpus", - "{{ user `cpus` }}" - ] - ], - "prlctl_version_file": ".prlctl_version", - "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "parallels-iso", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<tab> linux ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "headless": "{{ user `headless` }}", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-qemu", - "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "qemu", - "vm_name": "{{ user `template` }}" - } - ], - "post-processors": [ - { - "output": "builds/{{user `box_basename`}}.{{.Provider}}.box", - "type": "vagrant" - } - ], - "provisioners": [ - { - "destination": "/tmp/bento-metadata.json", - "source": "{{user `metadata`}}", - "type": "file" - }, - { - "environment_vars": [ - "HOME_DIR=/home/vagrant", - "http_proxy={{user `http_proxy`}}", - "https_proxy={{user `https_proxy`}}", - "no_proxy={{user `no_proxy`}}" - ], - "execute_command": "echo 'vagrant' | {{.Vars}} sudo -E -S bash '{{.Path}}'", - "scripts": [ - "scripts/common/metadata.sh", - "scripts/fedora/fix-slow-dns.sh", - "scripts/common/sshd.sh", - "scripts/fedora/build-tools.sh", - "scripts/common/vmtools.sh", - "scripts/common/vagrant.sh", - "scripts/fedora/cleanup.sh", - "scripts/common/minimize.sh" - ], - "type": "shell" - } - ], - "variables": { - "arch": "64", - "box_basename": "fedora-22", - "build_timestamp": "{{isotime \"20060102150405\"}}", - "cpus": "1", - "disk_size": "40960", - "git_revision": "__unknown_git_revision__", - "headless": "", - "http_proxy": "{{env `http_proxy`}}", - "https_proxy": "{{env `https_proxy`}}", - "iso_checksum": "b2acfa7c7c6b5d2f51d3337600c2e52eeaa1a1084991181c28ca30343e52e0df", - "iso_checksum_type": "sha256", - "iso_name": "Fedora-Server-DVD-x86_64-22.iso", - "ks_path": "fedora-latest/ks.cfg", - "memory": "512", - "metadata": "floppy/dummy_metadata.json", - "mirror": "http://download.fedoraproject.org/pub/fedora/linux", - "mirror_directory": "releases/22/Server/x86_64/iso", - "name": "fedora-22", - "no_proxy": "{{env `no_proxy`}}", - "template": "fedora-22-x86_64", - "version": "2.0.TIMESTAMP" - } -} diff --git a/archive/freebsd-10.2-amd64.json b/archive/freebsd-10.2-amd64.json deleted file mode 100644 index c2081ad4f..000000000 --- a/archive/freebsd-10.2-amd64.json +++ /dev/null @@ -1,233 +0,0 @@ -{ - "builders": [ - { - "boot_command": [ - "<esc><wait>", - "boot -s<wait>", - "<enter><wait>", - "<wait10><wait10>", - "/bin/sh<enter><wait>", - "mdmfs -s 100m md1 /tmp<enter><wait>", - "mdmfs -s 100m md2 /mnt<enter><wait>", - "dhclient -l /tmp/dhclient.lease.em0 em0<enter><wait>", - "fetch -o /tmp/install.sh http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} && chmod +x /tmp/install.sh && /tmp/install.sh {{ .Name }}<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", - "guest_os_type": "FreeBSD_64", - "headless": "{{ user `headless` }}", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-virtualbox", - "shutdown_command": "echo 'vagrant' | su -m root -c 'shutdown -p now'", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "virtualbox-iso", - "vboxmanage": [ - [ - "modifyvm", - "{{.Name}}", - "--memory", - "{{ user `memory` }}" - ], - [ - "modifyvm", - "{{.Name}}", - "--cpus", - "{{ user `cpus` }}" - ] - ], - "virtualbox_version_file": ".vbox_version", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<esc><wait>", - "boot -s<wait>", - "<enter><wait>", - "<wait10><wait10>", - "/bin/sh<enter><wait>", - "mdmfs -s 100m md1 /tmp<enter><wait>", - "mdmfs -s 100m md2 /mnt<enter><wait>", - "dhclient -l /tmp/dhclient.lease.em0 em0<enter><wait>", - "<wait5>", - "fetch -o /tmp/install.sh http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} && chmod +x /tmp/install.sh && /tmp/install.sh {{ .Name }}<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "freebsd-64", - "headless": "{{ user `headless` }}", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-vmare", - "shutdown_command": "echo 'vagrant' | su -m root -c 'shutdown -p now'", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "tools_upload_flavor": "freebsd", - "type": "vmware-iso", - "vm_name": "{{ user `template` }}", - "vmx_data": { - "cpuid.coresPerSocket": "1", - "memsize": "{{ user `memory` }}", - "numvcpus": "{{ user `cpus` }}" - } - }, - { - "boot_command": [ - "<esc><wait>", - "boot -s<wait>", - "<enter><wait>", - "<wait10><wait10>", - "/bin/sh<enter><wait>", - "mdmfs -s 100m md1 /tmp<enter><wait>", - "mdmfs -s 100m md2 /mnt<enter><wait>", - "dhclient -l /tmp/dhclient.lease.em0 em0<enter><wait>", - "fetch -o /tmp/install.sh http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} && chmod +x /tmp/install.sh && /tmp/install.sh {{ .Name }}<enter><wait>" - ], - "boot_wait": "8s", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "freebsd", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-parallels", - "parallels_tools_mode": "disable", - "prlctl": [ - [ - "set", - "{{.Name}}", - "--memsize", - "{{ user `memory` }}" - ], - [ - "set", - "{{.Name}}", - "--cpus", - "{{ user `cpus` }}" - ], - [ - "set", - "{{.Name}}", - "--device-set", - "cdrom0", - "--iface", - "ide" - ], - [ - "set", - "{{.Name}}", - "--device-del", - "fdd0" - ], - [ - "set", - "{{.Name}}", - "--device-del", - "parallel0" - ] - ], - "prlctl_version_file": ".prlctl_version", - "shutdown_command": "echo 'vagrant' | su -m root -c 'shutdown -p now'", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "parallels-iso", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<esc><wait>", - "boot -s<wait>", - "<enter><wait>", - "<wait10><wait10>", - "/bin/sh<enter><wait>", - "mdmfs -s 100m md1 /tmp<enter><wait>", - "mdmfs -s 100m md2 /mnt<enter><wait>", - "dhclient -l /tmp/dhclient.lease.vtnet0 vtnet0<enter><wait>", - "fetch -o /tmp/install.sh http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} && chmod +x /tmp/install.sh && /tmp/install.sh {{ .Name }} vtnet0<enter><wait>" - ], - "boot_wait": "7s", - "disk_size": "{{user `disk_size`}}", - "headless": "{{ user `headless` }}", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-qemu", - "shutdown_command": "echo 'vagrant' | su -m root -c 'shutdown -p now'", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "qemu", - "vm_name": "{{ user `template` }}" - } - ], - "post-processors": [ - { - "output": "builds/{{user `box_basename`}}.{{.Provider}}.box", - "type": "vagrant", - "vagrantfile_template": "vagrantfile_templates/freebsd.rb" - } - ], - "provisioners": [ - { - "destination": "/tmp/bento-metadata.json", - "source": "{{user `metadata`}}", - "type": "file" - }, - { - "environment_vars": [ - "HOME_DIR=/home/vagrant", - "http_proxy={{user `http_proxy`}}", - "https_proxy={{user `https_proxy`}}", - "no_proxy={{user `no_proxy`}}" - ], - "execute_command": "echo 'vagrant' | {{.Vars}} su -m root -c 'sh -eux {{.Path}}'", - "scripts": [ - "scripts/common/metadata.sh", - "scripts/freebsd/update.sh", - "scripts/freebsd/postinstall.sh", - "scripts/freebsd/sudoers.sh", - "scripts/common/vagrant.sh", - "scripts/freebsd/vmtools.sh", - "scripts/freebsd/cleanup.sh", - "scripts/freebsd/minimize.sh" - ], - "type": "shell" - } - ], - "variables": { - "box_basename": "freebsd-10.2", - "build_timestamp": "{{isotime \"20060102150405\"}}", - "cpus": "1", - "disk_size": "10140", - "git_revision": "__unknown_git_revision__", - "headless": "", - "http_proxy": "{{env `http_proxy`}}", - "https_proxy": "{{env `https_proxy`}}", - "install_path": "freebsd-10/install.sh", - "iso_checksum": "97908f5cd00d86cafeb2c265bfabbd0aa79f87e9b6b31ecdb756bc96a4a62e93", - "iso_checksum_type": "sha256", - "iso_name": "FreeBSD-10.2-RELEASE-amd64-disc1.iso", - "memory": "512", - "metadata": "floppy/dummy_metadata.json", - "mirror": "http://ftp.freebsd.org/pub/FreeBSD", - "mirror_directory": "releases/amd64/amd64/ISO-IMAGES/10.2", - "name": "freebsd-10.2", - "no_proxy": "{{env `no_proxy`}}", - "template": "freebsd-10.2-amd64", - "version": "2.1.TIMESTAMP" - } -} diff --git a/archive/freebsd-10.2-i386.json b/archive/freebsd-10.2-i386.json deleted file mode 100644 index c45d41177..000000000 --- a/archive/freebsd-10.2-i386.json +++ /dev/null @@ -1,233 +0,0 @@ -{ - "builders": [ - { - "boot_command": [ - "<esc><wait>", - "boot -s<wait>", - "<enter><wait>", - "<wait10><wait10>", - "/bin/sh<enter><wait>", - "mdmfs -s 100m md1 /tmp<enter><wait>", - "mdmfs -s 100m md2 /mnt<enter><wait>", - "dhclient -l /tmp/dhclient.lease.em0 em0<enter><wait>", - "fetch -o /tmp/install.sh http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} && chmod +x /tmp/install.sh && /tmp/install.sh {{ .Name }}<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", - "guest_os_type": "FreeBSD", - "headless": "{{ user `headless` }}", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-virtualbox", - "shutdown_command": "echo 'vagrant' | su -m root -c 'shutdown -p now'", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "virtualbox-iso", - "vboxmanage": [ - [ - "modifyvm", - "{{.Name}}", - "--memory", - "{{ user `memory` }}" - ], - [ - "modifyvm", - "{{.Name}}", - "--cpus", - "{{ user `cpus` }}" - ] - ], - "virtualbox_version_file": ".vbox_version", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<esc><wait>", - "boot -s<wait>", - "<enter><wait>", - "<wait10><wait10>", - "/bin/sh<enter><wait>", - "mdmfs -s 100m md1 /tmp<enter><wait>", - "mdmfs -s 100m md2 /mnt<enter><wait>", - "dhclient -l /tmp/dhclient.lease.em0 em0<enter><wait>", - "<wait5>", - "fetch -o /tmp/install.sh http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} && chmod +x /tmp/install.sh && /tmp/install.sh {{ .Name }}<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "freebsd", - "headless": "{{ user `headless` }}", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-vmare", - "shutdown_command": "echo 'vagrant' | su -m root -c 'shutdown -p now'", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "tools_upload_flavor": "freebsd", - "type": "vmware-iso", - "vm_name": "{{ user `template` }}", - "vmx_data": { - "cpuid.coresPerSocket": "1", - "memsize": "{{ user `memory` }}", - "numvcpus": "{{ user `cpus` }}" - } - }, - { - "boot_command": [ - "<esc><wait>", - "boot -s<wait>", - "<enter><wait>", - "<wait10><wait10>", - "/bin/sh<enter><wait>", - "mdmfs -s 100m md1 /tmp<enter><wait>", - "mdmfs -s 100m md2 /mnt<enter><wait>", - "dhclient -l /tmp/dhclient.lease.em0 em0<enter><wait>", - "fetch -o /tmp/install.sh http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} && chmod +x /tmp/install.sh && /tmp/install.sh {{ .Name }}<enter><wait>" - ], - "boot_wait": "8s", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "freebsd", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-parallels", - "parallels_tools_mode": "disable", - "prlctl": [ - [ - "set", - "{{.Name}}", - "--memsize", - "{{ user `memory` }}" - ], - [ - "set", - "{{.Name}}", - "--cpus", - "{{ user `cpus` }}" - ], - [ - "set", - "{{.Name}}", - "--device-set", - "cdrom0", - "--iface", - "ide" - ], - [ - "set", - "{{.Name}}", - "--device-del", - "fdd0" - ], - [ - "set", - "{{.Name}}", - "--device-del", - "parallel0" - ] - ], - "prlctl_version_file": ".prlctl_version", - "shutdown_command": "echo 'vagrant' | su -m root -c 'shutdown -p now'", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "parallels-iso", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<esc><wait>", - "boot -s<wait>", - "<enter><wait>", - "<wait10><wait10>", - "/bin/sh<enter><wait>", - "mdmfs -s 100m md1 /tmp<enter><wait>", - "mdmfs -s 100m md2 /mnt<enter><wait>", - "dhclient -l /tmp/dhclient.lease.vtnet0 vtnet0<enter><wait>", - "fetch -o /tmp/install.sh http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} && chmod +x /tmp/install.sh && /tmp/install.sh {{ .Name }}<enter><wait>" - ], - "boot_wait": "7s", - "disk_size": "{{user `disk_size`}}", - "headless": "{{ user `headless` }}", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-qemu", - "shutdown_command": "echo 'vagrant' | su -m root -c 'shutdown -p now'", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "qemu", - "vm_name": "{{ user `template` }}" - } - ], - "post-processors": [ - { - "output": "builds/{{user `box_basename`}}.{{.Provider}}.box", - "type": "vagrant", - "vagrantfile_template": "vagrantfile_templates/freebsd.rb" - } - ], - "provisioners": [ - { - "destination": "/tmp/bento-metadata.json", - "source": "{{user `metadata`}}", - "type": "file" - }, - { - "environment_vars": [ - "HOME_DIR=/home/vagrant", - "http_proxy={{user `http_proxy`}}", - "https_proxy={{user `https_proxy`}}", - "no_proxy={{user `no_proxy`}}" - ], - "execute_command": "echo 'vagrant' | {{.Vars}} su -m root -c 'sh -eux {{.Path}}'", - "scripts": [ - "scripts/common/metadata.sh", - "scripts/freebsd/update.sh", - "scripts/freebsd/postinstall.sh", - "scripts/freebsd/sudoers.sh", - "scripts/common/vagrant.sh", - "scripts/freebsd/vmtools.sh", - "scripts/freebsd/cleanup.sh", - "scripts/freebsd/minimize.sh" - ], - "type": "shell" - } - ], - "variables": { - "box_basename": "freebsd-10.2-i386", - "build_timestamp": "{{isotime \"20060102150405\"}}", - "cpus": "1", - "disk_size": "40960", - "git_revision": "__unknown_git_revision__", - "headless": "", - "http_proxy": "{{env `http_proxy`}}", - "https_proxy": "{{env `https_proxy`}}", - "install_path": "freebsd-10/install.sh", - "iso_checksum": "0e7094ae9f4f79d8955f193a1f2f5ab4f8b300e57eccd3b9bd959951ee079020", - "iso_checksum_type": "sha256", - "iso_name": "FreeBSD-10.2-RELEASE-i386-disc1.iso", - "memory": "512", - "metadata": "floppy/dummy_metadata.json", - "mirror": "http://ftp.freebsd.org/pub/FreeBSD", - "mirror_directory": "releases/i386/i386/ISO-IMAGES/10.2", - "name": "freebsd-10.2-i386", - "no_proxy": "{{env `no_proxy`}}", - "template": "freebsd-10.2-i386", - "version": "2.1.TIMESTAMP" - } -} diff --git a/archive/macosx-10.7.json b/archive/macosx-10.7.json deleted file mode 100644 index 9dc23433b..000000000 --- a/archive/macosx-10.7.json +++ /dev/null @@ -1,250 +0,0 @@ -{ - "builders": [ - { - "boot_wait": "2s", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "darwin12-64", - "headless": "{{ user `headless` }}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `iso_url`}}", - "output_directory": "packer-{{user `template`}}-vmware", - "shutdown_command": "echo 'vagrant'| sudo -S shutdown -h now", - "skip_compaction": true, - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "tools_upload_flavor": "darwin", - "tools_upload_path": "/tmp/vmtools.iso", - "type": "vmware-iso", - "vm_name": "{{ user `template` }}", - "vmx_data": { - "cpuid.coresPerSocket": "1", - "ehci.present": "TRUE", - "firmware": "efi", - "hpet0.present": "TRUE", - "ich7m.present": "TRUE", - "keyboardAndMouseProfile": "macProfile", - "memsize": "{{ user `memory` }}", - "numvcpus": "{{ user `cpus` }}", - "smc.present": "TRUE", - "usb.present": "TRUE" - } - }, - { - "boot_wait": "2s", - "disk_size": "{{user `disk_size`}}", - "guest_additions_mode": "disable", - "guest_os_type": "MacOS107_64", - "hard_drive_interface": "sata", - "headless": "{{ user `headless` }}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `iso_url`}}", - "output_directory": "packer-{{user `template`}}-virtualbox", - "shutdown_command": "echo 'vagrant'| sudo -S shutdown -h now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "virtualbox-iso", - "vboxmanage": [ - [ - "modifyvm", - "{{.Name}}", - "--audiocontroller", - "hda" - ], - [ - "modifyvm", - "{{.Name}}", - "--boot1", - "dvd" - ], - [ - "modifyvm", - "{{.Name}}", - "--boot2", - "disk" - ], - [ - "modifyvm", - "{{.Name}}", - "--chipset", - "ich9" - ], - [ - "modifyvm", - "{{.Name}}", - "--cpus", - "{{ user `cpus` }}" - ], - [ - "modifyvm", - "{{.Name}}", - "--firmware", - "efi" - ], - [ - "modifyvm", - "{{.Name}}", - "--hpet", - "on" - ], - [ - "modifyvm", - "{{.Name}}", - "--keyboard", - "usb" - ], - [ - "modifyvm", - "{{.Name}}", - "--memory", - "{{ user `memory` }}" - ], - [ - "modifyvm", - "{{.Name}}", - "--mouse", - "usbtablet" - ], - [ - "modifyvm", - "{{.Name}}", - "--vram", - "9" - ], - [ - "storageattach", - "{{.Name}}", - "--storagectl", - "SATA Controller", - "--port", - "{{ user `cpus` }}", - "--type", - "dvddrive", - "--medium", - "{{user `iso_url`}}" - ] - ], - "vboxmanage_post": [ - [ - "storageattach", - "{{.Name}}", - "--storagectl", - "SATA Controller", - "--port", - "{{ user `cpus` }}", - "--type", - "dvddrive", - "--medium", - "none" - ], - [ - "storagectl", - "{{.Name}}", - "--name", - "IDE Controller", - "--remove" - ] - ], - "virtualbox_version_file": ".vbox_version", - "vm_name": "{{ user `template` }}" - }, - { - "boot_wait": "2s", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "macosx", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `iso_url`}}", - "output_directory": "packer-{{user `template`}}-parallels", - "parallels_tools_flavor": "mac", - "prlctl": [ - [ - "set", - "{{.Name}}", - "--memsize", - "{{ user `memory` }}" - ], - [ - "set", - "{{.Name}}", - "--cpus", - "{{ user `cpus` }}" - ], - [ - "set", - "{{.Name}}", - "--on-window-close", - "keep-running" - ] - ], - "shutdown_command": "echo 'vagrant'| sudo -S shutdown -h now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "parallels-iso", - "vm_name": "{{ user `template` }}" - } - ], - "post-processors": [ - { - "output": "builds/{{user `box_basename`}}.{{.Provider}}.box", - "type": "vagrant", - "vagrantfile_template": "vagrantfile_templates/macosx.rb" - } - ], - "provisioners": [ - { - "destination": "/tmp/bento-metadata.json", - "source": "{{user `metadata`}}", - "type": "file" - }, - { - "environment_vars": [ - "HOME_DIR=/Users/vagrant", - "http_proxy={{user `http_proxy`}}", - "https_proxy={{user `https_proxy`}}", - "no_proxy={{user `no_proxy`}}" - ], - "execute_command": "echo 'vagrant'| {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", - "scripts": [ - "scripts/common/metadata.sh", - "scripts/macosx/hostname.sh", - "scripts/macosx/update.sh", - "scripts/macosx/networking.sh", - "scripts/macosx/disablesleep.sh", - "scripts/macosx/vagrant.sh", - "scripts/macosx/vmtools.sh", - "scripts/macosx/cleanup.sh", - "scripts/macosx/minimize.sh" - ], - "type": "shell" - } - ], - "variables": { - "_README": "You must provide a prepared Mac disk image (from https://github.com/timsutton/osx-vm-templates) and checksum value for this template to work. For more details, consult this project's README.md", - "box_basename": "macosx-10.7", - "build_timestamp": "{{isotime \"20060102150405\"}}", - "cpus": "1", - "disk_size": "40960", - "git_revision": "__unknown_git_revision__", - "headless": "", - "http_proxy": "{{env `http_proxy`}}", - "https_proxy": "{{env `https_proxy`}}", - "iso_checksum": "__unset_iso_checksum__", - "iso_checksum_type": "md5", - "iso_url": "http://YOU-MUST-PROVIDE-YOUR-OWN-DMG.sorry", - "memory": "2048", - "metadata": "floppy/dummy_metadata.json", - "name": "macosx-10.7", - "no_proxy": "{{env `no_proxy`}}", - "template": "macosx-10.7", - "version": "2.1.TIMESTAMP" - } -} - diff --git a/archive/macosx-10.8.json b/archive/macosx-10.8.json deleted file mode 100644 index 010e4a8b6..000000000 --- a/archive/macosx-10.8.json +++ /dev/null @@ -1,250 +0,0 @@ -{ - "builders": [ - { - "boot_wait": "2s", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "darwin12-64", - "headless": "{{ user `headless` }}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `iso_url`}}", - "output_directory": "packer-{{user `template`}}-vmware", - "shutdown_command": "echo 'vagrant'| sudo -S shutdown -h now", - "skip_compaction": true, - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "tools_upload_flavor": "darwin", - "tools_upload_path": "/tmp/vmtools.iso", - "type": "vmware-iso", - "vm_name": "{{ user `template` }}", - "vmx_data": { - "cpuid.coresPerSocket": "1", - "ehci.present": "TRUE", - "firmware": "efi", - "hpet0.present": "TRUE", - "ich7m.present": "TRUE", - "keyboardAndMouseProfile": "macProfile", - "memsize": "{{ user `memory` }}", - "numvcpus": "{{ user `cpus` }}", - "smc.present": "TRUE", - "usb.present": "TRUE" - } - }, - { - "boot_wait": "2s", - "disk_size": "{{user `disk_size`}}", - "guest_additions_mode": "disable", - "guest_os_type": "MacOS108_64", - "hard_drive_interface": "sata", - "headless": "{{ user `headless` }}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `iso_url`}}", - "output_directory": "packer-{{user `template`}}-virtualbox", - "shutdown_command": "echo 'vagrant'| sudo -S shutdown -h now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "virtualbox-iso", - "vboxmanage": [ - [ - "modifyvm", - "{{.Name}}", - "--audiocontroller", - "hda" - ], - [ - "modifyvm", - "{{.Name}}", - "--boot1", - "dvd" - ], - [ - "modifyvm", - "{{.Name}}", - "--boot2", - "disk" - ], - [ - "modifyvm", - "{{.Name}}", - "--chipset", - "ich9" - ], - [ - "modifyvm", - "{{.Name}}", - "--cpus", - "{{ user `cpus` }}" - ], - [ - "modifyvm", - "{{.Name}}", - "--firmware", - "efi" - ], - [ - "modifyvm", - "{{.Name}}", - "--hpet", - "on" - ], - [ - "modifyvm", - "{{.Name}}", - "--keyboard", - "usb" - ], - [ - "modifyvm", - "{{.Name}}", - "--memory", - "{{ user `memory` }}" - ], - [ - "modifyvm", - "{{.Name}}", - "--mouse", - "usbtablet" - ], - [ - "modifyvm", - "{{.Name}}", - "--vram", - "9" - ], - [ - "storageattach", - "{{.Name}}", - "--storagectl", - "SATA Controller", - "--port", - "{{ user `cpus` }}", - "--type", - "dvddrive", - "--medium", - "{{user `iso_url`}}" - ] - ], - "vboxmanage_post": [ - [ - "storageattach", - "{{.Name}}", - "--storagectl", - "SATA Controller", - "--port", - "{{ user `cpus` }}", - "--type", - "dvddrive", - "--medium", - "none" - ], - [ - "storagectl", - "{{.Name}}", - "--name", - "IDE Controller", - "--remove" - ] - ], - "virtualbox_version_file": ".vbox_version", - "vm_name": "{{ user `template` }}" - }, - { - "boot_wait": "2s", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "macosx", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `iso_url`}}", - "output_directory": "packer-{{user `template`}}-parallels", - "parallels_tools_flavor": "mac", - "prlctl": [ - [ - "set", - "{{.Name}}", - "--memsize", - "{{ user `memory` }}" - ], - [ - "set", - "{{.Name}}", - "--cpus", - "{{ user `cpus` }}" - ], - [ - "set", - "{{.Name}}", - "--on-window-close", - "keep-running" - ] - ], - "shutdown_command": "echo 'vagrant'| sudo -S shutdown -h now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "parallels-iso", - "vm_name": "{{ user `template` }}" - } - ], - "post-processors": [ - { - "output": "builds/{{user `box_basename`}}.{{.Provider}}.box", - "type": "vagrant", - "vagrantfile_template": "vagrantfile_templates/macosx.rb" - } - ], - "provisioners": [ - { - "destination": "/tmp/bento-metadata.json", - "source": "{{user `metadata`}}", - "type": "file" - }, - { - "environment_vars": [ - "HOME_DIR=/Users/vagrant", - "http_proxy={{user `http_proxy`}}", - "https_proxy={{user `https_proxy`}}", - "no_proxy={{user `no_proxy`}}" - ], - "execute_command": "echo 'vagrant'| {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", - "scripts": [ - "scripts/common/metadata.sh", - "scripts/macosx/hostname.sh", - "scripts/macosx/update.sh", - "scripts/macosx/networking.sh", - "scripts/macosx/disablesleep.sh", - "scripts/macosx/vagrant.sh", - "scripts/macosx/vmtools.sh", - "scripts/macosx/cleanup.sh", - "scripts/macosx/minimize.sh" - ], - "type": "shell" - } - ], - "variables": { - "_README": "You must provide a prepared Mac disk image (from https://github.com/timsutton/osx-vm-templates) and checksum value for this template to work. For more details, consult this project's README.md", - "box_basename": "macosx-10.8", - "build_timestamp": "{{isotime \"20060102150405\"}}", - "cpus": "1", - "disk_size": "40960", - "git_revision": "__unknown_git_revision__", - "headless": "", - "http_proxy": "{{env `http_proxy`}}", - "https_proxy": "{{env `https_proxy`}}", - "iso_checksum": "__unset_iso_checksum__", - "iso_checksum_type": "md5", - "iso_url": "http://YOU-MUST-PROVIDE-YOUR-OWN-DMG.sorry", - "memory": "2048", - "metadata": "floppy/dummy_metadata.json", - "name": "macosx-10.8", - "no_proxy": "{{env `no_proxy`}}", - "template": "macosx-10.8", - "version": "2.1.TIMESTAMP" - } -} - diff --git a/archive/omnios-r151010j.json b/archive/omnios-r151010j.json deleted file mode 100644 index 2adc9605d..000000000 --- a/archive/omnios-r151010j.json +++ /dev/null @@ -1,226 +0,0 @@ -{ - "builders": [ - { - "boot_command": [ - "<enter><wait10><wait5>", - "1<enter><wait10>", - "<wait10>", - "<f2><wait>", - "<f2><wait>", - "<f2><wait>", - "<bs><bs><bs><bs><bs><bs><bs>omnios-vagrant", - "<f2><wait>", - "<f2><wait>", - "<f2><wait>", - "<wait10><wait10><wait10><wait10><wait10><wait10>", - "<wait10><wait10><wait10><wait10><wait10><wait10>", - "<wait10><wait10><wait10><wait10><wait10><wait10>", - "<wait10><wait10><wait10><wait10><wait10><wait10>", - "<f8><wait>", - "<wait10><wait10><wait10><wait10><wait10><wait10>", - "<wait10><wait10><wait10><wait10><wait10><wait10>", - "root<enter><wait><enter><wait5>", - "passwd<enter><wait>", - "vagrant<enter><wait>", - "vagrant<enter><wait>", - "ipadm create-if e1000g0<enter><wait>", - "ipadm create-addr -T dhcp e1000g0/v4<enter><wait>", - "echo 'nameserver 8.8.8.8' > /etc/resolv.conf<enter><wait>", - "cp /etc/nsswitch.dns /etc/nsswitch.conf<enter><wait>", - "sed -i -e 's/PermitRootLogin no/PermitRootLogin yes/' /etc/ssh/sshd_config<enter><wait>", - "svcadm restart ssh<enter><wait>" - ], - "boot_wait": "30s", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "OpenSolaris_64", - "headless": "{{ user `headless` }}", - "iso_checksum": "bc3f4c0d29a5da75174de62da00294e5ef826b5e", - "iso_checksum_type": "sha1", - "iso_url": "{{user `mirror`}}/OmniOS_Text_r151010j.iso", - "output_directory": "packer-omnios-r151010j-virtualbox", - "shutdown_command": "/usr/sbin/shutdown -g 0 -y -i 5", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "root", - "type": "virtualbox-iso", - "vboxmanage": [ - [ - "modifyvm", - "{{.Name}}", - "--memory", - "{{ user `memory` }}" - ], - [ - "modifyvm", - "{{.Name}}", - "--cpus", - "{{ user `cpus` }}" - ] - ], - "virtualbox_version_file": ".vbox_version", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<enter><wait10><wait5>", - "1<enter><wait10>", - "<wait10>", - "<f2><wait10>", - "<wait10><wait10><wait10><wait10><wait10><wait10>", - "<wait10><wait10><wait10><wait10><wait10><wait10>", - "<f2><wait>", - "<f2><wait>", - "<bs><bs><bs><bs><bs><bs><bs>omnios-vagrant", - "<f2><wait>", - "<f2><wait>", - "<f2><wait>", - "<wait10><wait10><wait10><wait10><wait10><wait10>", - "<wait10><wait10><wait10><wait10><wait10><wait10>", - "<wait10><wait10><wait10><wait10><wait10><wait10>", - "<wait10><wait10><wait10><wait10><wait10><wait10>", - "<f8><wait>", - "<wait10><wait10><wait10><wait10><wait10><wait10>", - "<wait10><wait10><wait10><wait10><wait10><wait10>", - "root<enter><wait><enter><wait5>", - "passwd<enter><wait>", - "vagrant<enter><wait>", - "vagrant<enter><wait>", - "ipadm create-if e1000g0<enter><wait>", - "ipadm create-addr -T dhcp e1000g0/v4<enter><wait>", - "echo 'nameserver 8.8.8.8' > /etc/resolv.conf<enter><wait>", - "cp /etc/nsswitch.dns /etc/nsswitch.conf<enter><wait>", - "sed -i -e 's/PermitRootLogin no/PermitRootLogin yes/' /etc/ssh/sshd_config<enter><wait>", - "svcadm restart ssh<enter><wait>" - ], - "boot_wait": "30s", - "disk_size": "{{user `disk_size`}}", - "floppy_files": [ - "floppy/omnios/README.TXT" - ], - "guest_os_type": "solaris11-64", - "headless": "{{ user `headless` }}", - "iso_checksum": "bc3f4c0d29a5da75174de62da00294e5ef826b5e", - "iso_checksum_type": "sha1", - "iso_url": "{{user `mirror`}}/OmniOS_Text_r151010j.iso", - "output_directory": "packer-omnios-r151010j-vmware", - "shutdown_command": "/usr/sbin/shutdown -g 0 -y -i 5", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "root", - "tools_upload_flavor": "solaris", - "type": "vmware-iso", - "vm_name": "{{ user `template` }}", - "vmx_data": { - "cpuid.coresPerSocket": "1", - "memsize": "{{ user `memory` }}", - "numvcpus": "{{ user `cpus` }}" - } - }, - { - "boot_command": [ - "<enter><wait10><wait5>", - "1<enter><wait10>", - "<wait10>", - "<f2><wait10>", - "<wait10><wait10><wait10><wait10><wait10><wait10>", - "<wait10><wait10><wait10><wait10><wait10><wait10>", - "<f2><wait>", - "<f2><wait>", - "<bs><bs><bs><bs><bs><bs><bs>omnios-vagrant", - "<f2><wait>", - "<f2><wait>", - "<f2><wait>", - "<wait10><wait10><wait10><wait10><wait10><wait10>", - "<wait10><wait10><wait10><wait10><wait10><wait10>", - "<wait10><wait10><wait10><wait10><wait10><wait10>", - "<wait10><wait10><wait10><wait10><wait10><wait10>", - "<f8><wait>", - "<wait10><wait10><wait10><wait10><wait10><wait10>", - "<wait10><wait10><wait10><wait10><wait10><wait10>", - "root<enter><wait><enter><wait5>", - "passwd<enter><wait>", - "vagrant<enter><wait>", - "vagrant<enter><wait>", - "ipadm create-if e1000g0<enter><wait>", - "ipadm create-addr -T dhcp e1000g0/v4<enter><wait>", - "echo 'nameserver 8.8.8.8' > /etc/resolv.conf<enter><wait>", - "cp /etc/nsswitch.dns /etc/nsswitch.conf<enter><wait>", - "sed -i -e 's/PermitRootLogin no/PermitRootLogin yes/' /etc/ssh/sshd_config<enter><wait>", - "svcadm restart ssh<enter><wait>" - ], - "boot_wait": "30s", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "opensolaris", - "hard_drive_interface": "ide", - "iso_checksum": "bc3f4c0d29a5da75174de62da00294e5ef826b5e", - "iso_checksum_type": "sha1", - "iso_url": "{{user `mirror`}}/OmniOS_Text_r151010j.iso", - "output_directory": "packer-omnios-r151010j-parallels", - "parallels_tools_mode": "disable", - "prlctl": [ - [ - "set", - "{{.Name}}", - "--memsize", - "{{ user `memory` }}" - ], - [ - "set", - "{{.Name}}", - "--cpus", - "{{ user `cpus` }}" - ] - ], - "shutdown_command": "/usr/sbin/shutdown -g 0 -y -i 5", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "root", - "type": "parallels-iso", - "vm_name": "{{ user `template` }}" - } - ], - "post-processors": [ - { - "compression_level": 9, - "output": "builds/{{user `box_basename`}}.{{.Provider}}.box", - "override": { - "parallels": { - "vagrantfile_template": "vagrantfile_templates/parallels/omnios.rb" - } - }, - "type": "vagrant" - } - ], - "provisioners": [ - { - "destination": "/tmp/bento-metadata.json", - "source": "{{user `metadata`}}", - "type": "file" - }, - { - "environment_vars": [], - "execute_command": "export {{.Vars}} && sh '{{.Path}}'", - "scripts": [ - "scripts/common/metadata.sh", - "scripts/omnios/vmtools.sh", - "scripts/omnios/postinstall.sh" - ], - "type": "shell" - } - ], - "variables": { - "arch": "64", - "box_basename": "omnios-r151010j", - "build_timestamp": "{{isotime \"20060102150405\"}}", - "cpus": "1", - "disk_size": "40960", - "git_revision": "__unknown_git_revision__", - "headless": "", - "memory": "1024", - "metadata": "floppy/dummy_metadata.json", - "mirror": "http://omnios.omniti.com/media", - "name": "omnios-r151010j", - "template": "omnios-r151010j", - "version": "2.0.TIMESTAMP" - } -} diff --git a/archive/oracle-6.6-i386.json b/archive/oracle-6.6-i386.json deleted file mode 100644 index 4e3eb21ad..000000000 --- a/archive/oracle-6.6-i386.json +++ /dev/null @@ -1,180 +0,0 @@ -{ - "builders": [ - { - "boot_command": [ - "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", - "guest_os_type": "Oracle", - "hard_drive_interface": "sata", - "headless": "{{ user `headless` }}", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-virtualbox", - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "virtualbox-iso", - "vboxmanage": [ - [ - "modifyvm", - "{{.Name}}", - "--memory", - "{{ user `memory` }}" - ], - [ - "modifyvm", - "{{.Name}}", - "--cpus", - "{{ user `cpus` }}" - ] - ], - "virtualbox_version_file": ".vbox_version", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "oraclelinux", - "headless": "{{ user `headless` }}", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-vmware", - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "tools_upload_flavor": "linux", - "type": "vmware-iso", - "vm_name": "{{ user `template` }}", - "vmx_data": { - "cpuid.coresPerSocket": "1", - "memsize": "{{ user `memory` }}", - "numvcpus": "{{ user `cpus` }}" - } - }, - { - "boot_command": [ - "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "centos", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-parallels", - "parallels_tools_flavor": "lin", - "prlctl": [ - [ - "set", - "{{.Name}}", - "--memsize", - "{{ user `memory` }}" - ], - [ - "set", - "{{.Name}}", - "--cpus", - "{{ user `cpus` }}" - ] - ], - "prlctl_version_file": ".prlctl_version", - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "parallels-iso", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "headless": "{{ user `headless` }}", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-qemu", - "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "qemu", - "vm_name": "{{ user `template` }}" - } - ], - "post-processors": [ - { - "output": "builds/{{user `box_basename`}}.{{.Provider}}.box", - "type": "vagrant" - } - ], - "provisioners": [ - { - "destination": "/tmp/bento-metadata.json", - "source": "{{user `metadata`}}", - "type": "file" - }, - { - "environment_vars": [ - "HOME_DIR=/home/vagrant", - "http_proxy={{user `http_proxy`}}", - "https_proxy={{user `https_proxy`}}", - "no_proxy={{user `no_proxy`}}" - ], - "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", - "scripts": [ - "scripts/common/metadata.sh", - "scripts/centos/networking.sh", - "scripts/common/sshd.sh", - "scripts/common/vagrant.sh", - "scripts/common/vmtools.sh", - "scripts/centos/cleanup.sh", - "scripts/common/minimize.sh" - ], - "type": "shell" - } - ], - "variables": { - "arch": "32", - "box_basename": "oracle-6.6-i386", - "build_timestamp": "{{isotime \"20060102150405\"}}", - "cpus": "1", - "disk_size": "40960", - "git_revision": "__unknown_git_revision__", - "headless": "", - "http_proxy": "{{env `http_proxy`}}", - "https_proxy": "{{env `https_proxy`}}", - "iso_checksum": "81F0C85217F40763DEA5053EC5594E4958498BBC", - "iso_checksum_type": "sha1", - "iso_name": "OracleLinux-R6-U6-Server-i386-dvd.iso", - "ks_path": "centos-6.7/ks.cfg", - "memory": "512", - "metadata": "floppy/dummy_metadata.json", - "mirror": "http://mirrors.dotsrc.org/oracle-linux", - "mirror_directory": "OL6/U6/i386", - "name": "oracle-6.6-i386", - "no_proxy": "{{env `no_proxy`}}", - "template": "oracle-6.6-i386", - "version": "2.2.TIMESTAMP" - } -} diff --git a/archive/oracle-6.6-x86_64.json b/archive/oracle-6.6-x86_64.json deleted file mode 100644 index c10d50566..000000000 --- a/archive/oracle-6.6-x86_64.json +++ /dev/null @@ -1,180 +0,0 @@ -{ - "builders": [ - { - "boot_command": [ - "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", - "guest_os_type": "Oracle_64", - "hard_drive_interface": "sata", - "headless": "{{ user `headless` }}", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-virtualbox", - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "virtualbox-iso", - "vboxmanage": [ - [ - "modifyvm", - "{{.Name}}", - "--memory", - "{{ user `memory` }}" - ], - [ - "modifyvm", - "{{.Name}}", - "--cpus", - "{{ user `cpus` }}" - ] - ], - "virtualbox_version_file": ".vbox_version", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "oraclelinux-64", - "headless": "{{ user `headless` }}", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-vmware", - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "tools_upload_flavor": "linux", - "type": "vmware-iso", - "vm_name": "{{ user `template` }}", - "vmx_data": { - "cpuid.coresPerSocket": "1", - "memsize": "{{ user `memory` }}", - "numvcpus": "{{ user `cpus` }}" - } - }, - { - "boot_command": [ - "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "centos", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-parallels", - "parallels_tools_flavor": "lin", - "prlctl": [ - [ - "set", - "{{.Name}}", - "--memsize", - "{{ user `memory` }}" - ], - [ - "set", - "{{.Name}}", - "--cpus", - "{{ user `cpus` }}" - ] - ], - "prlctl_version_file": ".prlctl_version", - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "parallels-iso", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "headless": "{{ user `headless` }}", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-qemu", - "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "qemu", - "vm_name": "{{ user `template` }}" - } - ], - "post-processors": [ - { - "output": "builds/{{user `box_basename`}}.{{.Provider}}.box", - "type": "vagrant" - } - ], - "provisioners": [ - { - "destination": "/tmp/bento-metadata.json", - "source": "{{user `metadata`}}", - "type": "file" - }, - { - "environment_vars": [ - "HOME_DIR=/home/vagrant", - "http_proxy={{user `http_proxy`}}", - "https_proxy={{user `https_proxy`}}", - "no_proxy={{user `no_proxy`}}" - ], - "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", - "scripts": [ - "scripts/common/metadata.sh", - "scripts/centos/networking.sh", - "scripts/common/sshd.sh", - "scripts/common/vagrant.sh", - "scripts/common/vmtools.sh", - "scripts/centos/cleanup.sh", - "scripts/common/minimize.sh" - ], - "type": "shell" - } - ], - "variables": { - "arch": "64", - "box_basename": "oracle-6.6", - "build_timestamp": "{{isotime \"20060102150405\"}}", - "cpus": "1", - "disk_size": "40960", - "git_revision": "__unknown_git_revision__", - "headless": "", - "http_proxy": "{{env `http_proxy`}}", - "https_proxy": "{{env `https_proxy`}}", - "iso_checksum": "5738F10A506D3630EDFD297EF179B553091C6A48", - "iso_checksum_type": "sha1", - "iso_name": "OracleLinux-R6-U6-Server-x86_64-dvd.iso", - "ks_path": "centos-6.7/ks.cfg", - "memory": "512", - "metadata": "floppy/dummy_metadata.json", - "mirror": "http://mirrors.dotsrc.org/oracle-linux", - "mirror_directory": "OL6/U6/x86_64", - "name": "oracle-6.6", - "no_proxy": "{{env `no_proxy`}}", - "template": "oracle-6.6-x86_64", - "version": "2.2.TIMESTAMP" - } -} diff --git a/archive/oracle-6.7-i386.json b/archive/oracle-6.7-i386.json deleted file mode 100644 index c26e478ac..000000000 --- a/archive/oracle-6.7-i386.json +++ /dev/null @@ -1,182 +0,0 @@ -{ - "builders": [ - { - "boot_command": [ - "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", - "guest_os_type": "Oracle", - "hard_drive_interface": "sata", - "headless": "{{ user `headless` }}", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-virtualbox", - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "virtualbox-iso", - "vboxmanage": [ - [ - "modifyvm", - "{{.Name}}", - "--memory", - "{{ user `memory` }}" - ], - [ - "modifyvm", - "{{.Name}}", - "--cpus", - "{{ user `cpus` }}" - ] - ], - "virtualbox_version_file": ".vbox_version", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "oraclelinux", - "headless": "{{ user `headless` }}", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-vmware", - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "tools_upload_flavor": "linux", - "type": "vmware-iso", - "vm_name": "{{ user `template` }}", - "vmx_data": { - "cpuid.coresPerSocket": "1", - "memsize": "{{ user `memory` }}", - "numvcpus": "{{ user `cpus` }}" - } - }, - { - "boot_command": [ - "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "centos", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-parallels", - "parallels_tools_flavor": "lin", - "prlctl": [ - [ - "set", - "{{.Name}}", - "--memsize", - "{{ user `memory` }}" - ], - [ - "set", - "{{.Name}}", - "--cpus", - "{{ user `cpus` }}" - ] - ], - "prlctl_version_file": ".prlctl_version", - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "parallels-iso", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "headless": "{{ user `headless` }}", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-qemu", - "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "qemu", - "vm_name": "{{ user `template` }}" - } - ], - "post-processors": [ - { - "output": "builds/{{user `box_basename`}}.{{.Provider}}.box", - "type": "vagrant" - } - ], - "provisioners": [ - { - "destination": "/tmp/bento-metadata.json", - "source": "{{user `metadata`}}", - "type": "file" - }, - { - "environment_vars": [ - "HOME_DIR=/home/vagrant", - "http_proxy={{user `http_proxy`}}", - "https_proxy={{user `https_proxy`}}", - "no_proxy={{user `no_proxy`}}" - ], - "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", - "scripts": [ - "scripts/common/metadata.sh", - "scripts/centos/networking.sh", - "scripts/common/sshd.sh", - "scripts/common/vagrant.sh", - "scripts/common/virtualbox.sh", - "scripts/common/vmware.sh", - "scripts/common/parallels.sh", - "scripts/centos/cleanup.sh", - "scripts/common/minimize.sh" - ], - "type": "shell" - } - ], - "variables": { - "arch": "32", - "box_basename": "oracle-6.7-i386", - "build_timestamp": "{{isotime \"20060102150405\"}}", - "cpus": "1", - "disk_size": "40960", - "git_revision": "__unknown_git_revision__", - "headless": "", - "http_proxy": "{{env `http_proxy`}}", - "https_proxy": "{{env `https_proxy`}}", - "iso_checksum": "F35C749FBDD7BF0FB0A676C477728D0B864E4D69", - "iso_checksum_type": "sha1", - "iso_name": "OracleLinux-R6-U7-Server-i386-dvd.iso", - "ks_path": "centos-6.7/ks.cfg", - "memory": "512", - "metadata": "floppy/dummy_metadata.json", - "mirror": "http://mirrors.dotsrc.org/oracle-linux", - "mirror_directory": "OL6/U7/i386", - "name": "oracle-6.7-i386", - "no_proxy": "{{env `no_proxy`}}", - "template": "oracle-6.7-i386", - "version": "2.2.TIMESTAMP" - } -} diff --git a/archive/oracle-6.7-x86_64.json b/archive/oracle-6.7-x86_64.json deleted file mode 100644 index dfd77f542..000000000 --- a/archive/oracle-6.7-x86_64.json +++ /dev/null @@ -1,182 +0,0 @@ -{ - "builders": [ - { - "boot_command": [ - "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", - "guest_os_type": "Oracle_64", - "hard_drive_interface": "sata", - "headless": "{{ user `headless` }}", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-virtualbox", - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "virtualbox-iso", - "vboxmanage": [ - [ - "modifyvm", - "{{.Name}}", - "--memory", - "{{ user `memory` }}" - ], - [ - "modifyvm", - "{{.Name}}", - "--cpus", - "{{ user `cpus` }}" - ] - ], - "virtualbox_version_file": ".vbox_version", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "oraclelinux-64", - "headless": "{{ user `headless` }}", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-vmware", - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "tools_upload_flavor": "linux", - "type": "vmware-iso", - "vm_name": "{{ user `template` }}", - "vmx_data": { - "cpuid.coresPerSocket": "1", - "memsize": "{{ user `memory` }}", - "numvcpus": "{{ user `cpus` }}" - } - }, - { - "boot_command": [ - "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "centos", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-parallels", - "parallels_tools_flavor": "lin", - "prlctl": [ - [ - "set", - "{{.Name}}", - "--memsize", - "{{ user `memory` }}" - ], - [ - "set", - "{{.Name}}", - "--cpus", - "{{ user `cpus` }}" - ] - ], - "prlctl_version_file": ".prlctl_version", - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "parallels-iso", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "headless": "{{ user `headless` }}", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-qemu", - "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "qemu", - "vm_name": "{{ user `template` }}" - } - ], - "post-processors": [ - { - "output": "builds/{{user `box_basename`}}.{{.Provider}}.box", - "type": "vagrant" - } - ], - "provisioners": [ - { - "destination": "/tmp/bento-metadata.json", - "source": "{{user `metadata`}}", - "type": "file" - }, - { - "environment_vars": [ - "HOME_DIR=/home/vagrant", - "http_proxy={{user `http_proxy`}}", - "https_proxy={{user `https_proxy`}}", - "no_proxy={{user `no_proxy`}}" - ], - "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", - "scripts": [ - "scripts/common/metadata.sh", - "scripts/centos/networking.sh", - "scripts/common/sshd.sh", - "scripts/common/vagrant.sh", - "scripts/common/virtualbox.sh", - "scripts/common/vmware.sh", - "scripts/common/parallels.sh", - "scripts/centos/cleanup.sh", - "scripts/common/minimize.sh" - ], - "type": "shell" - } - ], - "variables": { - "arch": "64", - "box_basename": "oracle-6.7", - "build_timestamp": "{{isotime \"20060102150405\"}}", - "cpus": "1", - "disk_size": "40960", - "git_revision": "__unknown_git_revision__", - "headless": "", - "http_proxy": "{{env `http_proxy`}}", - "https_proxy": "{{env `https_proxy`}}", - "iso_checksum": "DD7231B378F23E2E846AC78B0C5D8974A23631D5", - "iso_checksum_type": "sha1", - "iso_name": "OracleLinux-R6-U7-Server-x86_64-dvd.iso", - "ks_path": "centos-6.7/ks.cfg", - "memory": "512", - "metadata": "floppy/dummy_metadata.json", - "mirror": "http://mirrors.dotsrc.org/oracle-linux", - "mirror_directory": "OL6/U7/x86_64", - "name": "oracle-6.7", - "no_proxy": "{{env `no_proxy`}}", - "template": "oracle-6.7-x86_64", - "version": "2.0.TIMESTAMP" - } -} diff --git a/archive/oracle-7.2-x86_64.json b/archive/oracle-7.2-x86_64.json deleted file mode 100644 index c9068aaaf..000000000 --- a/archive/oracle-7.2-x86_64.json +++ /dev/null @@ -1,182 +0,0 @@ -{ - "builders": [ - { - "boot_command": [ - "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", - "guest_os_type": "Oracle_64", - "hard_drive_interface": "sata", - "headless": "{{ user `headless` }}", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-virtualbox", - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "virtualbox-iso", - "vboxmanage": [ - [ - "modifyvm", - "{{.Name}}", - "--memory", - "{{ user `memory` }}" - ], - [ - "modifyvm", - "{{.Name}}", - "--cpus", - "{{ user `cpus` }}" - ] - ], - "virtualbox_version_file": ".vbox_version", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "oraclelinux-64", - "headless": "{{ user `headless` }}", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-vmware", - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "tools_upload_flavor": "linux", - "type": "vmware-iso", - "vm_name": "{{ user `template` }}", - "vmx_data": { - "cpuid.coresPerSocket": "1", - "memsize": "{{ user `memory` }}", - "numvcpus": "{{ user `cpus` }}" - } - }, - { - "boot_command": [ - "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "centos", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-parallels", - "parallels_tools_flavor": "lin", - "prlctl": [ - [ - "set", - "{{.Name}}", - "--memsize", - "{{ user `memory` }}" - ], - [ - "set", - "{{.Name}}", - "--cpus", - "{{ user `cpus` }}" - ] - ], - "prlctl_version_file": ".prlctl_version", - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "parallels-iso", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "headless": "{{ user `headless` }}", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-qemu", - "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "qemu", - "vm_name": "{{ user `template` }}" - } - ], - "post-processors": [ - { - "output": "builds/{{user `box_basename`}}.{{.Provider}}.box", - "type": "vagrant" - } - ], - "provisioners": [ - { - "destination": "/tmp/bento-metadata.json", - "source": "{{user `metadata`}}", - "type": "file" - }, - { - "environment_vars": [ - "HOME_DIR=/home/vagrant", - "http_proxy={{user `http_proxy`}}", - "https_proxy={{user `https_proxy`}}", - "no_proxy={{user `no_proxy`}}" - ], - "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", - "scripts": [ - "scripts/common/metadata.sh", - "scripts/centos/networking.sh", - "scripts/common/sshd.sh", - "scripts/common/vagrant.sh", - "scripts/common/virtualbox.sh", - "scripts/common/vmware.sh", - "scripts/common/parallels.sh", - "scripts/centos/cleanup.sh", - "scripts/common/minimize.sh" - ], - "type": "shell" - } - ], - "variables": { - "arch": "64", - "box_basename": "oracle-7.2", - "build_timestamp": "{{isotime \"20060102150405\"}}", - "cpus": "1", - "disk_size": "40960", - "git_revision": "__unknown_git_revision__", - "headless": "", - "http_proxy": "{{env `http_proxy`}}", - "https_proxy": "{{env `https_proxy`}}", - "iso_checksum": "03E048F23D798C8E8E7935FAB76245C2F1341378", - "iso_checksum_type": "sha1", - "iso_name": "OracleLinux-R7-U2-Server-x86_64-dvd.iso", - "ks_path": "centos-7.2/ks.cfg", - "memory": "512", - "metadata": "floppy/dummy_metadata.json", - "mirror": "http://mirrors.dotsrc.org/oracle-linux", - "mirror_directory": "OL7/u2/x86_64", - "name": "oracle-7.2", - "no_proxy": "{{env `no_proxy`}}", - "template": "oracle-7.2-x86_64", - "version": "2.2.TIMESTAMP" - } -} diff --git a/archive/rhel-6.7-i386.json b/archive/rhel-6.7-i386.json deleted file mode 100644 index 5954b2d9c..000000000 --- a/archive/rhel-6.7-i386.json +++ /dev/null @@ -1,180 +0,0 @@ -{ - "builders": [ - { - "boot_command": [ - "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", - "guest_os_type": "RedHat", - "hard_drive_interface": "sata", - "headless": "{{ user `headless` }}", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-virtualbox", - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "virtualbox-iso", - "vboxmanage": [ - [ - "modifyvm", - "{{.Name}}", - "--memory", - "{{ user `memory` }}" - ], - [ - "modifyvm", - "{{.Name}}", - "--cpus", - "{{ user `cpus` }}" - ] - ], - "virtualbox_version_file": ".vbox_version", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "redhat", - "headless": "{{ user `headless` }}", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-vmware", - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "tools_upload_flavor": "linux", - "type": "vmware-iso", - "vm_name": "{{ user `template` }}", - "vmx_data": { - "cpuid.coresPerSocket": "1", - "memsize": "{{ user `memory` }}", - "numvcpus": "{{ user `cpus` }}" - } - }, - { - "boot_command": [ - "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "rhel", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-parallels", - "parallels_tools_flavor": "lin", - "prlctl": [ - [ - "set", - "{{.Name}}", - "--memsize", - "{{ user `memory` }}" - ], - [ - "set", - "{{.Name}}", - "--cpus", - "{{ user `cpus` }}" - ] - ], - "prlctl_version_file": ".prlctl_version", - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "parallels-iso", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "headless": "{{ user `headless` }}", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-qemu", - "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "qemu", - "vm_name": "{{ user `template` }}" - } - ], - "post-processors": [ - { - "output": "builds/{{user `box_basename`}}.{{.Provider}}.box", - "type": "vagrant" - } - ], - "provisioners": [ - { - "destination": "/tmp/bento-metadata.json", - "source": "{{user `metadata`}}", - "type": "file" - }, - { - "environment_vars": [ - "HOME_DIR=/home/vagrant", - "http_proxy={{user `http_proxy`}}", - "https_proxy={{user `https_proxy`}}", - "no_proxy={{user `no_proxy`}}" - ], - "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", - "scripts": [ - "scripts/common/metadata.sh", - "scripts/centos/networking.sh", - "scripts/common/sshd.sh", - "scripts/common/vagrant.sh", - "scripts/common/vmtools.sh", - "scripts/centos/cleanup.sh", - "scripts/common/minimize.sh" - ], - "type": "shell" - } - ], - "variables": { - "arch": "32", - "box_basename": "rhel-6.7-i386", - "build_timestamp": "{{isotime \"20060102150405\"}}", - "cpus": "1", - "disk_size": "40960", - "git_revision": "__unknown_git_revision__", - "headless": "", - "http_proxy": "{{env `http_proxy`}}", - "https_proxy": "{{env `https_proxy`}}", - "iso_checksum": "4f70a74d676c74609586d616648d7cd5720d48dcf789be10cc1da429d6734078", - "iso_checksum_type": "sha256", - "iso_name": "rhel-server-6.7-i386-dvd.iso", - "ks_path": "centos-6.7/ks.cfg", - "memory": "512", - "metadata": "floppy/dummy_metadata.json", - "mirror": "http://YOU-MUST-PROVIDE-YOUR-OWN-ISO.sorry", - "mirror_directory": "rhel", - "name": "rhel-6.7-i386", - "no_proxy": "{{env `no_proxy`}}", - "template": "rhel-6.7-i386", - "version": "2.2.TIMESTAMP" - } -} diff --git a/archive/rhel-6.7-x86_64.json b/archive/rhel-6.7-x86_64.json deleted file mode 100644 index fae4fb8b2..000000000 --- a/archive/rhel-6.7-x86_64.json +++ /dev/null @@ -1,180 +0,0 @@ -{ - "builders": [ - { - "boot_command": [ - "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", - "guest_os_type": "RedHat_64", - "hard_drive_interface": "sata", - "headless": "{{ user `headless` }}", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-virtualbox", - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "virtualbox-iso", - "vboxmanage": [ - [ - "modifyvm", - "{{.Name}}", - "--memory", - "{{ user `memory` }}" - ], - [ - "modifyvm", - "{{.Name}}", - "--cpus", - "{{ user `cpus` }}" - ] - ], - "virtualbox_version_file": ".vbox_version", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "rhel6-64", - "headless": "{{ user `headless` }}", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-vmware", - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "tools_upload_flavor": "linux", - "type": "vmware-iso", - "vm_name": "{{ user `template` }}", - "vmx_data": { - "cpuid.coresPerSocket": "1", - "memsize": "{{ user `memory` }}", - "numvcpus": "{{ user `cpus` }}" - } - }, - { - "boot_command": [ - "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "rhel", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-parallels", - "parallels_tools_flavor": "lin", - "prlctl": [ - [ - "set", - "{{.Name}}", - "--memsize", - "{{ user `memory` }}" - ], - [ - "set", - "{{.Name}}", - "--cpus", - "{{ user `cpus` }}" - ] - ], - "prlctl_version_file": ".prlctl_version", - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "parallels-iso", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "headless": "{{ user `headless` }}", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-qemu", - "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "qemu", - "vm_name": "{{ user `template` }}" - } - ], - "post-processors": [ - { - "output": "builds/{{user `box_basename`}}.{{.Provider}}.box", - "type": "vagrant" - } - ], - "provisioners": [ - { - "destination": "/tmp/bento-metadata.json", - "source": "{{user `metadata`}}", - "type": "file" - }, - { - "environment_vars": [ - "HOME_DIR=/home/vagrant", - "http_proxy={{user `http_proxy`}}", - "https_proxy={{user `https_proxy`}}", - "no_proxy={{user `no_proxy`}}" - ], - "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", - "scripts": [ - "scripts/common/metadata.sh", - "scripts/centos/networking.sh", - "scripts/common/sshd.sh", - "scripts/common/vagrant.sh", - "scripts/common/vmtools.sh", - "scripts/centos/cleanup.sh", - "scripts/common/minimize.sh" - ], - "type": "shell" - } - ], - "variables": { - "arch": "64", - "box_basename": "rhel-6.7", - "build_timestamp": "{{isotime \"20060102150405\"}}", - "cpus": "1", - "disk_size": "40960", - "git_revision": "__unknown_git_revision__", - "headless": "", - "http_proxy": "{{env `http_proxy`}}", - "https_proxy": "{{env `https_proxy`}}", - "iso_checksum": "0e0acb2a544f4d58f10292144161f40439734c6e98b13ba8c595372b20354bc5", - "iso_checksum_type": "sha256", - "iso_name": "rhel-server-6.7-x86_64-dvd.iso", - "ks_path": "centos-6.7/ks.cfg", - "memory": "512", - "metadata": "floppy/dummy_metadata.json", - "mirror": "http://YOU-MUST-PROVIDE-YOUR-OWN-ISO.sorry", - "mirror_directory": "rhel", - "name": "rhel-6.7", - "no_proxy": "{{env `no_proxy`}}", - "template": "rhel-6.7-x86_64", - "version": "2.2.TIMESTAMP" - } -} diff --git a/archive/sles-11-sp2-i386.json b/archive/sles-11-sp2-i386.json deleted file mode 100644 index 1f758228c..000000000 --- a/archive/sles-11-sp2-i386.json +++ /dev/null @@ -1,184 +0,0 @@ -{ - "builders": [ - { - "boot_command": [ - "<esc><enter><wait>", - "linux netdevice=eth0 netsetup=dhcp install=cd:/<wait>", - " lang=en_US autoyast=http://{{ .HTTPIP }}:{{ .HTTPPort }}/sles-11/sles-11-sp2-i386-autoinst.xml<wait>", - " textmode=1<wait>", - "<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", - "guest_os_type": "OpenSUSE", - "hard_drive_interface": "sata", - "headless": "{{ user `headless` }}", - "http_directory": "http", - "iso_checksum": "a0b34f6237b2b2a6b2174c82b40ed326", - "iso_checksum_type": "md5", - "iso_url": "{{user `mirror`}}/SLES-11-SP2-DVD-i586-GM-DVD1.iso", - "output_directory": "packer-sles-11-sp2-i386-virtualbox", - "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "virtualbox-iso", - "vboxmanage": [ - [ - "modifyvm", - "{{.Name}}", - "--memory", - "{{ user `memory` }}" - ], - [ - "modifyvm", - "{{.Name}}", - "--cpus", - "{{ user `cpus` }}" - ] - ], - "virtualbox_version_file": ".vbox_version", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<esc><enter><wait>", - "linux netdevice=eth0 netsetup=dhcp install=cd:/<wait>", - " lang=en_US autoyast=http://{{ .HTTPIP }}:{{ .HTTPPort }}/sles-11/sles-11-sp2-i386-autoinst.xml", - " textmode=1<wait>", - "<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "sles11", - "headless": "{{ user `headless` }}", - "http_directory": "http", - "iso_checksum": "a0b34f6237b2b2a6b2174c82b40ed326", - "iso_checksum_type": "md5", - "iso_url": "{{user `mirror`}}/SLES-11-SP2-DVD-i586-GM-DVD1.iso", - "output_directory": "packer-sles-11-sp2-i386-vmware", - "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "tools_upload_flavor": "linux", - "type": "vmware-iso", - "vm_name": "{{ user `template` }}", - "vmx_data": { - "cpuid.coresPerSocket": "1", - "memsize": "{{ user `memory` }}", - "numvcpus": "{{ user `cpus` }}" - } - }, - { - "boot_command": [ - "<esc><enter><wait>", - "linux netdevice=eth0 netsetup=dhcp install=cd:/<wait>", - " lang=en_US autoyast=http://{{ .HTTPIP }}:{{ .HTTPPort }}/sles-11/sles-11-sp2-i386-autoinst.xml<wait>", - " textmode=1<wait>", - "<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "suse", - "http_directory": "http", - "iso_checksum": "a0b34f6237b2b2a6b2174c82b40ed326", - "iso_checksum_type": "md5", - "iso_url": "{{user `mirror`}}/SLES-11-SP2-DVD-i586-GM-DVD1.iso", - "output_directory": "packer-sles-11-sp2-i386-parallels", - "parallels_tools_flavor": "lin", - "prlctl": [ - [ - "set", - "{{.Name}}", - "--memsize", - "{{ user `memory` }}" - ], - [ - "set", - "{{.Name}}", - "--cpus", - "{{ user `cpus` }}" - ] - ], - "prlctl_version_file": ".prlctl_version", - "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "parallels-iso", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<esc><enter><wait>", - "linux netdevice=eth0 netsetup=dhcp install=cd:/<wait>", - " lang=en_US autoyast=http://{{ .HTTPIP }}:{{ .HTTPPort }}/sles-11/sles-11-sp2-i386-autoinst.xml<wait>", - " textmode=1<wait>", - "<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "headless": "{{ user `headless` }}", - "http_directory": "http", - "iso_checksum": "a0b34f6237b2b2a6b2174c82b40ed326", - "iso_checksum_type": "md5", - "iso_url": "{{user `mirror`}}/SLES-11-SP2-DVD-i586-GM-DVD1.iso", - "output_directory": "packer-sles-11-sp2-i386-qemu", - "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "qemu", - "vm_name": "{{ user `template` }}" - } - ], - "post-processors": [ - { - "output": "builds/{{user `box_basename`}}.{{.Provider}}.box", - "type": "vagrant" - } - ], - "provisioners": [ - { - "destination": "/tmp/bento-metadata.json", - "source": "{{user `metadata`}}", - "type": "file" - }, - { - "environment_vars": [], - "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh '{{.Path}}'", - "scripts": [ - "scripts/common/metadata.sh", - "scripts/common/sshd.sh", - "scripts/common/vagrant.sh", - "scripts/common/vmtools.sh", - "scripts/sles/sudoers.sh", - "scripts/sles/zypper-locks.sh", - "scripts/sles/remove-dvd-source.sh", - "scripts/common/minimize.sh" - ], - "type": "shell" - } - ], - "variables": { - "arch": "32", - "box_basename": "sles-11-sp2-i386", - "build_timestamp": "{{isotime \"20060102150405\"}}", - "cpus": "1", - "disk_size": "20480", - "git_revision": "__unknown_git_revision__", - "headless": "", - "memory": "512", - "metadata": "floppy/dummy_metadata.json", - "mirror": "http://cdn2.novell.com/prot/FkjGyLMMiss~", - "name": "sles-11-sp2-i386", - "template": "sles-11-sp2-i386", - "version": "2.0.TIMESTAMP" - } -} diff --git a/archive/sles-11-sp2-x86_64.json b/archive/sles-11-sp2-x86_64.json deleted file mode 100644 index 931201871..000000000 --- a/archive/sles-11-sp2-x86_64.json +++ /dev/null @@ -1,183 +0,0 @@ -{ - "builders": [ - { - "boot_command": [ - "<esc><enter><wait>", - "linux netdevice=eth0 netsetup=dhcp install=cd:/<wait>", - " lang=en_US autoyast=http://{{ .HTTPIP }}:{{ .HTTPPort }}/sles-11/sles-11-sp2-x86_64-autoinst.xml<wait>", - " textmode=1<wait>", - "<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", - "guest_os_type": "OpenSUSE_64", - "hard_drive_interface": "sata", - "headless": "{{ user `headless` }}", - "http_directory": "http", - "iso_checksum": "461d82ae6e15062b0807c1338f040497", - "iso_checksum_type": "md5", - "iso_url": "{{user `mirror`}}/SLES-11-SP2-DVD-x86_64-GM-DVD1.iso", - "output_directory": "packer-sles-11-sp2-x86_64-virtualbox", - "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "virtualbox-iso", - "vboxmanage": [ - [ - "modifyvm", - "{{.Name}}", - "--memory", - "{{ user `memory` }}" - ], - [ - "modifyvm", - "{{.Name}}", - "--cpus", - "{{ user `cpus` }}" - ] - ], - "virtualbox_version_file": ".vbox_version", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<esc><enter><wait>", - "linux netdevice=eth0 netsetup=dhcp install=cd:/<wait>", - " lang=en_US autoyast=http://{{ .HTTPIP }}:{{ .HTTPPort }}/sles-11/sles-11-sp2-x86_64-autoinst.xml", - " textmode=1<wait>", - "<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "sles11-64", - "headless": "{{ user `headless` }}", - "http_directory": "http", - "iso_checksum": "461d82ae6e15062b0807c1338f040497", - "iso_checksum_type": "md5", - "iso_url": "{{user `mirror`}}/SLES-11-SP2-DVD-x86_64-GM-DVD1.iso", - "output_directory": "packer-sles-11-sp2-x86_64-vmware", - "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "tools_upload_flavor": "linux", - "type": "vmware-iso", - "vm_name": "{{ user `template` }}", - "vmx_data": { - "cpuid.coresPerSocket": "1", - "memsize": "{{ user `memory` }}", - "numvcpus": "{{ user `cpus` }}" - } - }, - { - "boot_command": [ - "<esc><enter><wait>", - "linux netdevice=eth0 netsetup=dhcp install=cd:/<wait>", - " lang=en_US autoyast=http://{{ .HTTPIP }}:{{ .HTTPPort }}/sles-11/sles-11-sp2-x86_64-autoinst.xml<wait>", - " textmode=1<wait>", - "<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "suse", - "http_directory": "http", - "iso_checksum": "461d82ae6e15062b0807c1338f040497", - "iso_checksum_type": "md5", - "iso_url": "{{user `mirror`}}/SLES-11-SP2-DVD-x86_64-GM-DVD1.iso", - "output_directory": "packer-sles-11-sp2-x86_64-parallels", - "parallels_tools_flavor": "lin", - "prlctl": [ - [ - "set", - "{{.Name}}", - "--memsize", - "{{ user `memory` }}" - ], - [ - "set", - "{{.Name}}", - "--cpus", - "{{ user `cpus` }}" - ] - ], - "prlctl_version_file": ".prlctl_version", - "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "parallels-iso", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<esc><enter><wait>", - "linux netdevice=eth0 netsetup=dhcp install=cd:/<wait>", - " lang=en_US autoyast=http://{{ .HTTPIP }}:{{ .HTTPPort }}/sles-11/sles-11-sp2-x86_64-autoinst.xml<wait>", - " textmode=1<wait>", - "<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "headless": "{{ user `headless` }}", - "http_directory": "http", - "iso_checksum": "461d82ae6e15062b0807c1338f040497", - "iso_checksum_type": "md5", - "iso_url": "{{user `mirror`}}/SLES-11-SP2-DVD-x86_64-GM-DVD1.iso", - "output_directory": "packer-sles-11-sp2-x86_64-qemu", - "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "qemu", - "vm_name": "{{ user `template` }}" - } - ], - "post-processors": [ - { - "output": "builds/{{user `box_basename`}}.{{.Provider}}.box", - "type": "vagrant" - } - ], - "provisioners": [ - { - "destination": "/tmp/bento-metadata.json", - "source": "{{user `metadata`}}", - "type": "file" - }, - { - "environment_vars": [], - "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh '{{.Path}}'", - "scripts": [ - "scripts/common/metadata.sh", - "scripts/common/sshd.sh", - "scripts/common/vagrant.sh", - "scripts/common/vmtools.sh", - "scripts/sles/sudoers.sh", - "scripts/sles/remove-dvd-source.sh", - "scripts/common/minimize.sh" - ], - "type": "shell" - } - ], - "variables": { - "arch": "64", - "box_basename": "sles-11-sp2", - "build_timestamp": "{{isotime \"20060102150405\"}}", - "cpus": "1", - "disk_size": "20480", - "git_revision": "__unknown_git_revision__", - "headless": "", - "memory": "512", - "metadata": "floppy/dummy_metadata.json", - "mirror": "http://cdn.novell.com/free/h0AOp5AT-18~", - "name": "sles-11-sp2", - "template": "sles-11-sp2-x86_64", - "version": "2.0.TIMESTAMP" - } -} diff --git a/archive/sles-11-sp3-i386.json b/archive/sles-11-sp3-i386.json deleted file mode 100644 index f998f3cfc..000000000 --- a/archive/sles-11-sp3-i386.json +++ /dev/null @@ -1,184 +0,0 @@ -{ - "builders": [ - { - "boot_command": [ - "<esc><enter><wait>", - "linux netdevice=eth0 netsetup=dhcp install=cd:/<wait>", - " lang=en_US autoyast=http://{{ .HTTPIP }}:{{ .HTTPPort }}/sles-11/sles-11-sp3-i386-autoinst.xml<wait>", - " textmode=1<wait>", - "<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", - "guest_os_type": "OpenSUSE", - "hard_drive_interface": "sata", - "headless": "{{ user `headless` }}", - "http_directory": "http", - "iso_checksum": "5c30a409fc8fb3343b4dc90d93ff2c89", - "iso_checksum_type": "md5", - "iso_url": "{{user `mirror`}}/SLES-11-SP3-DVD-i586-GM-DVD1.iso", - "output_directory": "packer-sles-11-sp3-i386-virtualbox", - "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "virtualbox-iso", - "vboxmanage": [ - [ - "modifyvm", - "{{.Name}}", - "--memory", - "{{ user `memory` }}" - ], - [ - "modifyvm", - "{{.Name}}", - "--cpus", - "{{ user `cpus` }}" - ] - ], - "virtualbox_version_file": ".vbox_version", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<esc><enter><wait>", - "linux netdevice=eth0 netsetup=dhcp install=cd:/<wait>", - " lang=en_US autoyast=http://{{ .HTTPIP }}:{{ .HTTPPort }}/sles-11/sles-11-sp3-i386-autoinst.xml", - " textmode=1<wait>", - "<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "sles11", - "headless": "{{ user `headless` }}", - "http_directory": "http", - "iso_checksum": "5c30a409fc8fb3343b4dc90d93ff2c89", - "iso_checksum_type": "md5", - "iso_url": "{{user `mirror`}}/SLES-11-SP3-DVD-i586-GM-DVD1.iso", - "output_directory": "packer-sles-11-sp3-i386-vmware", - "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "tools_upload_flavor": "linux", - "type": "vmware-iso", - "vm_name": "{{ user `template` }}", - "vmx_data": { - "cpuid.coresPerSocket": "1", - "memsize": "{{ user `memory` }}", - "numvcpus": "{{ user `cpus` }}" - } - }, - { - "boot_command": [ - "<esc><enter><wait>", - "linux netdevice=eth0 netsetup=dhcp install=cd:/<wait>", - " lang=en_US autoyast=http://{{ .HTTPIP }}:{{ .HTTPPort }}/sles-11/sles-11-sp3-i386-autoinst.xml<wait>", - " textmode=1<wait>", - "<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "suse", - "http_directory": "http", - "iso_checksum": "5c30a409fc8fb3343b4dc90d93ff2c89", - "iso_checksum_type": "md5", - "iso_url": "{{user `mirror`}}/SLES-11-SP3-DVD-i586-GM-DVD1.iso", - "output_directory": "packer-sles-11-sp3-i386-parallels", - "parallels_tools_flavor": "lin", - "prlctl": [ - [ - "set", - "{{.Name}}", - "--memsize", - "{{ user `memory` }}" - ], - [ - "set", - "{{.Name}}", - "--cpus", - "{{ user `cpus` }}" - ] - ], - "prlctl_version_file": ".prlctl_version", - "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "parallels-iso", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<esc><enter><wait>", - "linux netdevice=eth0 netsetup=dhcp install=cd:/<wait>", - " lang=en_US autoyast=http://{{ .HTTPIP }}:{{ .HTTPPort }}/sles-11/sles-11-sp3-i386-autoinst.xml<wait>", - " textmode=1<wait>", - "<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "headless": "{{ user `headless` }}", - "http_directory": "http", - "iso_checksum": "5c30a409fc8fb3343b4dc90d93ff2c89", - "iso_checksum_type": "md5", - "iso_url": "{{user `mirror`}}/SLES-11-SP3-DVD-i586-GM-DVD1.iso", - "output_directory": "packer-sles-11-sp3-i386-qemu", - "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "qemu", - "vm_name": "{{ user `template` }}" - } - ], - "post-processors": [ - { - "output": "builds/{{user `box_basename`}}.{{.Provider}}.box", - "type": "vagrant" - } - ], - "provisioners": [ - { - "destination": "/tmp/bento-metadata.json", - "source": "{{user `metadata`}}", - "type": "file" - }, - { - "environment_vars": [], - "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh '{{.Path}}'", - "scripts": [ - "scripts/common/metadata.sh", - "scripts/common/sshd.sh", - "scripts/common/vagrant.sh", - "scripts/common/vmtools.sh", - "scripts/sles/sudoers.sh", - "scripts/sles/zypper-locks.sh", - "scripts/sles/remove-dvd-source.sh", - "scripts/common/minimize.sh" - ], - "type": "shell" - } - ], - "variables": { - "arch": "32", - "box_basename": "sles-11-sp3-i386", - "build_timestamp": "{{isotime \"20060102150405\"}}", - "cpus": "1", - "disk_size": "20480", - "git_revision": "__unknown_git_revision__", - "headless": "", - "memory": "512", - "metadata": "floppy/dummy_metadata.json", - "mirror": "http://cdn2.novell.com/prot/4uiuDMzX0ck~", - "name": "sles-11-sp3-i386", - "template": "sles-11-sp3-i386", - "version": "2.0.TIMESTAMP" - } -} diff --git a/archive/sles-11-sp3-x86_64.json b/archive/sles-11-sp3-x86_64.json deleted file mode 100644 index 719798508..000000000 --- a/archive/sles-11-sp3-x86_64.json +++ /dev/null @@ -1,184 +0,0 @@ -{ - "builders": [ - { - "boot_command": [ - "<esc><enter><wait>", - "linux netdevice=eth0 netsetup=dhcp install=cd:/<wait>", - " lang=en_US autoyast=http://{{ .HTTPIP }}:{{ .HTTPPort }}/sles-11/sles-11-sp3-x86_64-autoinst.xml<wait>", - " textmode=1<wait>", - "<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", - "guest_os_type": "OpenSUSE_64", - "hard_drive_interface": "sata", - "headless": "{{ user `headless` }}", - "http_directory": "http", - "iso_checksum": "480b70d50cbb538382dc2b9325221e1b", - "iso_checksum_type": "md5", - "iso_url": "{{user `mirror`}}/SLES-11-SP3-DVD-x86_64-GM-DVD1.iso", - "output_directory": "packer-sles-11-sp3-x86_64-virtualbox", - "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "virtualbox-iso", - "vboxmanage": [ - [ - "modifyvm", - "{{.Name}}", - "--memory", - "{{ user `memory` }}" - ], - [ - "modifyvm", - "{{.Name}}", - "--cpus", - "{{ user `cpus` }}" - ] - ], - "virtualbox_version_file": ".vbox_version", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<esc><enter><wait>", - "linux netdevice=eth0 netsetup=dhcp install=cd:/<wait>", - " lang=en_US autoyast=http://{{ .HTTPIP }}:{{ .HTTPPort }}/sles-11/sles-11-sp3-x86_64-autoinst.xml", - " textmode=1<wait>", - "<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "sles11-64", - "headless": "{{ user `headless` }}", - "http_directory": "http", - "iso_checksum": "480b70d50cbb538382dc2b9325221e1b", - "iso_checksum_type": "md5", - "iso_url": "{{user `mirror`}}/SLES-11-SP3-DVD-x86_64-GM-DVD1.iso", - "output_directory": "packer-sles-11-sp3-x86_64-vmware", - "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "tools_upload_flavor": "linux", - "type": "vmware-iso", - "vm_name": "{{ user `template` }}", - "vmx_data": { - "cpuid.coresPerSocket": "1", - "memsize": "{{ user `memory` }}", - "numvcpus": "{{ user `cpus` }}" - } - }, - { - "boot_command": [ - "<esc><enter><wait>", - "linux netdevice=eth0 netsetup=dhcp install=cd:/<wait>", - " lang=en_US autoyast=http://{{ .HTTPIP }}:{{ .HTTPPort }}/sles-11/sles-11-sp3-x86_64-autoinst.xml<wait>", - " textmode=1<wait>", - "<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "suse", - "http_directory": "http", - "iso_checksum": "480b70d50cbb538382dc2b9325221e1b", - "iso_checksum_type": "md5", - "iso_url": "{{user `mirror`}}/SLES-11-SP3-DVD-x86_64-GM-DVD1.iso", - "output_directory": "packer-sles-11-sp3-x86_64-parallels", - "parallels_tools_flavor": "lin", - "prlctl": [ - [ - "set", - "{{.Name}}", - "--memsize", - "{{ user `memory` }}" - ], - [ - "set", - "{{.Name}}", - "--cpus", - "{{ user `cpus` }}" - ] - ], - "prlctl_version_file": ".prlctl_version", - "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "parallels-iso", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<esc><enter><wait>", - "linux netdevice=eth0 netsetup=dhcp install=cd:/<wait>", - " lang=en_US autoyast=http://{{ .HTTPIP }}:{{ .HTTPPort }}/sles-11/sles-11-sp3-x86_64-autoinst.xml<wait>", - " textmode=1<wait>", - "<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "headless": "{{ user `headless` }}", - "http_directory": "http", - "iso_checksum": "480b70d50cbb538382dc2b9325221e1b", - "iso_checksum_type": "md5", - "iso_url": "{{user `mirror`}}/SLES-11-SP3-DVD-x86_64-GM-DVD1.iso", - "output_directory": "packer-sles-11-sp3-x86_64-qemu", - "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "qemu", - "vm_name": "{{ user `template` }}" - } - ], - "post-processors": [ - { - "output": "builds/{{user `box_basename`}}.{{.Provider}}.box", - "type": "vagrant" - } - ], - "provisioners": [ - { - "destination": "/tmp/bento-metadata.json", - "source": "{{user `metadata`}}", - "type": "file" - }, - { - "environment_vars": [], - "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh '{{.Path}}'", - "scripts": [ - "scripts/common/metadata.sh", - "scripts/common/sshd.sh", - "scripts/common/vagrant.sh", - "scripts/common/vmtools.sh", - "scripts/sles/sudoers.sh", - "scripts/sles/zypper-locks.sh", - "scripts/sles/remove-dvd-source.sh", - "scripts/common/minimize.sh" - ], - "type": "shell" - } - ], - "variables": { - "arch": "64", - "box_basename": "sles-11-sp3", - "build_timestamp": "{{isotime \"20060102150405\"}}", - "cpus": "1", - "disk_size": "20480", - "git_revision": "__unknown_git_revision__", - "headless": "", - "memory": "512", - "metadata": "floppy/dummy_metadata.json", - "mirror": "http://cdn2.novell.com/prot/Q_VbW21BiB4~", - "name": "sles-11-sp3", - "template": "sles-11-sp3-x86_64", - "version": "2.0.TIMESTAMP" - } -} diff --git a/archive/sles-11-sp4-i386.json b/archive/sles-11-sp4-i386.json deleted file mode 100644 index 44b3b008f..000000000 --- a/archive/sles-11-sp4-i386.json +++ /dev/null @@ -1,195 +0,0 @@ -{ - "builders": [ - { - "boot_command": [ - "<esc><enter><wait>", - "linux netdevice=eth0 netsetup=dhcp install=cd:/<wait>", - " lang=en_US autoyast=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `autoinst_cfg`}}<wait>", - " textmode=1<wait>", - "<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", - "guest_os_type": "OpenSUSE", - "hard_drive_interface": "sata", - "headless": "{{ user `headless` }}", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-virtualbox", - "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "virtualbox-iso", - "vboxmanage": [ - [ - "modifyvm", - "{{.Name}}", - "--memory", - "{{ user `memory` }}" - ], - [ - "modifyvm", - "{{.Name}}", - "--cpus", - "{{ user `cpus` }}" - ] - ], - "virtualbox_version_file": ".vbox_version", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<esc><enter><wait>", - "linux netdevice=eth0 netsetup=dhcp install=cd:/<wait>", - " lang=en_US autoyast=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `autoinst_cfg`}}", - " textmode=1<wait>", - "<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "sles11", - "headless": "{{ user `headless` }}", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-vmware", - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "tools_upload_flavor": "linux", - "type": "vmware-iso", - "vm_name": "{{ user `template` }}", - "vmx_data": { - "cpuid.coresPerSocket": "1", - "memsize": "{{ user `memory` }}", - "numvcpus": "{{ user `cpus` }}" - } - }, - { - "boot_command": [ - "<esc><enter><wait>", - "linux netdevice=eth0 netsetup=dhcp install=cd:/<wait>", - " lang=en_US autoyast=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `autoinst_cfg`}}<wait>", - " textmode=1<wait>", - "<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "suse", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-parallels", - "parallels_tools_flavor": "lin", - "prlctl": [ - [ - "set", - "{{.Name}}", - "--memsize", - "{{ user `memory` }}" - ], - [ - "set", - "{{.Name}}", - "--cpus", - "{{ user `cpus` }}" - ] - ], - "prlctl_version_file": ".prlctl_version", - "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "parallels-iso", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<esc><enter><wait>", - "linux netdevice=eth0 netsetup=dhcp install=cd:/<wait>", - " lang=en_US autoyast=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `autoinst_cfg`}}<wait>", - " textmode=1<wait>", - "<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "headless": "{{ user `headless` }}", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-qemu", - "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "qemu", - "vm_name": "{{ user `template` }}" - } - ], - "post-processors": [ - { - "output": "builds/{{user `box_basename`}}.{{.Provider}}.box", - "type": "vagrant" - } - ], - "provisioners": [ - { - "destination": "/tmp/bento-metadata.json", - "source": "{{user `metadata`}}", - "type": "file" - }, - { - "environment_vars": [ - "HOME_DIR=/home/vagrant", - "http_proxy={{user `http_proxy`}}", - "https_proxy={{user `https_proxy`}}", - "no_proxy={{user `no_proxy`}}" - ], - "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh '{{.Path}}'", - "scripts": [ - "scripts/common/metadata.sh", - "scripts/common/sshd.sh", - "scripts/common/vagrant.sh", - "scripts/common/vmtools.sh", - "scripts/sles/sudoers.sh", - "scripts/sles/zypper-locks.sh", - "scripts/sles/remove-dvd-source.sh", - "scripts/common/minimize.sh" - ], - "type": "shell" - } - ], - "variables": { - "arch": "32", - "autoinst_cfg": "sles-11/sles-11-sp4-i386-autoinst.xml", - "box_basename": "sles-11-sp4-i386", - "build_timestamp": "{{isotime \"20060102150405\"}}", - "cpus": "1", - "disk_size": "20480", - "git_revision": "__unknown_git_revision__", - "headless": "", - "http_proxy": "{{env `http_proxy`}}", - "https_proxy": "{{env `https_proxy`}}", - "iso_checksum": "3e2f09b0a5dc04f4b8cafa174ab971b7355b8f6c22925aab1d1817fff5c7e549", - "iso_checksum_type": "sha256", - "iso_name": "SLES-11-SP4-DVD-i586-GM-DVD1.iso", - "memory": "512", - "metadata": "floppy/dummy_metadata.json", - "mirror": "http://cdn.novell.com/prot/46PZWZ91TPo~", - "name": "sles-11-sp4-i386", - "template": "sles-11-sp4-i386", - "version": "2.0.TIMESTAMP" - } -} diff --git a/archive/sles-11-sp4-x86_64.json b/archive/sles-11-sp4-x86_64.json deleted file mode 100644 index 75621fe4d..000000000 --- a/archive/sles-11-sp4-x86_64.json +++ /dev/null @@ -1,195 +0,0 @@ -{ - "builders": [ - { - "boot_command": [ - "<esc><enter><wait>", - "linux netdevice=eth0 netsetup=dhcp install=cd:/<wait>", - " lang=en_US autoyast=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `autoinst_cfg`}}<wait>", - " textmode=1<wait>", - "<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", - "guest_os_type": "OpenSUSE_64", - "hard_drive_interface": "sata", - "headless": "{{ user `headless` }}", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-virtualbox", - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "virtualbox-iso", - "vboxmanage": [ - [ - "modifyvm", - "{{.Name}}", - "--memory", - "{{ user `memory` }}" - ], - [ - "modifyvm", - "{{.Name}}", - "--cpus", - "{{ user `cpus` }}" - ] - ], - "virtualbox_version_file": ".vbox_version", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<esc><enter><wait>", - "linux netdevice=eth0 netsetup=dhcp install=cd:/<wait>", - " lang=en_US autoyast=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `autoinst_cfg`}}", - " textmode=1<wait>", - "<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "sles11-64", - "headless": "{{ user `headless` }}", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-vmware", - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "tools_upload_flavor": "linux", - "type": "vmware-iso", - "vm_name": "{{ user `template` }}", - "vmx_data": { - "cpuid.coresPerSocket": "1", - "memsize": "{{ user `memory` }}", - "numvcpus": "{{ user `cpus` }}" - } - }, - { - "boot_command": [ - "<esc><enter><wait>", - "linux netdevice=eth0 netsetup=dhcp install=cd:/<wait>", - " lang=en_US autoyast=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `autoinst_cfg`}}<wait>", - " textmode=1<wait>", - "<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "suse", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-parallels", - "parallels_tools_flavor": "lin", - "prlctl": [ - [ - "set", - "{{.Name}}", - "--memsize", - "{{ user `memory` }}" - ], - [ - "set", - "{{.Name}}", - "--cpus", - "{{ user `cpus` }}" - ] - ], - "prlctl_version_file": ".prlctl_version", - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "parallels-iso", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<esc><enter><wait>", - "linux netdevice=eth0 netsetup=dhcp install=cd:/<wait>", - " lang=en_US autoyast=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `autoinst_cfg`}}<wait>", - " textmode=1<wait>", - "<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "headless": "{{ user `headless` }}", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-qemu", - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "qemu", - "vm_name": "{{ user `template` }}" - } - ], - "post-processors": [ - { - "output": "builds/{{user `box_basename`}}.{{.Provider}}.box", - "type": "vagrant" - } - ], - "provisioners": [ - { - "destination": "/tmp/bento-metadata.json", - "source": "{{user `metadata`}}", - "type": "file" - }, - { - "environment_vars": [ - "HOME_DIR=/home/vagrant", - "http_proxy={{user `http_proxy`}}", - "https_proxy={{user `https_proxy`}}", - "no_proxy={{user `no_proxy`}}" - ], - "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh '{{.Path}}'", - "scripts": [ - "scripts/common/metadata.sh", - "scripts/common/sshd.sh", - "scripts/common/vagrant.sh", - "scripts/common/vmtools.sh", - "scripts/sles/sudoers.sh", - "scripts/sles/zypper-locks.sh", - "scripts/sles/remove-dvd-source.sh", - "scripts/common/minimize.sh" - ], - "type": "shell" - } - ], - "variables": { - "arch": "64", - "autoinst_cfg": "sles-11/sles-11-sp4-x86_64-autoinst.xml", - "box_basename": "sles-11-sp4", - "build_timestamp": "{{isotime \"20060102150405\"}}", - "cpus": "1", - "disk_size": "20480", - "git_revision": "__unknown_git_revision__", - "headless": "", - "http_proxy": "{{env `http_proxy`}}", - "https_proxy": "{{env `https_proxy`}}", - "iso_checksum": "4fbf22201876d571c719328f385d87d6d690fb3ceb5e093108cdf0373c43e855", - "iso_checksum_type": "sha256", - "iso_name": "SLES-11-SP4-DVD-x86_64-GM-DVD1.iso", - "memory": "512", - "metadata": "floppy/dummy_metadata.json", - "mirror": "http://cdn.novell.com/prot/l7C51hFz57E~", - "name": "sles-11-sp4", - "template": "sles-11-sp4-x86_64", - "version": "2.2.TIMESTAMP" - } -} diff --git a/archive/ubuntu-10.04-amd64.json b/archive/ubuntu-10.04-amd64.json deleted file mode 100644 index 0f03f028c..000000000 --- a/archive/ubuntu-10.04-amd64.json +++ /dev/null @@ -1,265 +0,0 @@ -{ - "builders": [ - { - "boot_command": [ - "<esc><wait>", - "<esc><wait>", - "<enter><wait>", - "/install/vmlinuz<wait>", - " auto<wait>", - " console-setup/ask_detect=false<wait>", - " console-setup/layoutcode=us<wait>", - " console-setup/modelcode=pc105<wait>", - " debconf/frontend=noninteractive<wait>", - " debian-installer=en_US<wait>", - " fb=false<wait>", - " initrd=/install/initrd.gz<wait>", - " kbd-chooser/method=us<wait>", - " keyboard-configuration/layout=USA<wait>", - " keyboard-configuration/variant=USA<wait>", - " locale=en_US<wait>", - " netcfg/get_domain=vm<wait>", - " netcfg/get_hostname=vagrant<wait>", - " noapic<wait>", - " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}}<wait>", - " -- <wait>", - "<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", - "guest_os_type": "Ubuntu_64", - "hard_drive_interface": "sata", - "headless": "{{ user `headless` }}", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-virtualbox", - "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "virtualbox-iso", - "vboxmanage": [ - [ - "modifyvm", - "{{.Name}}", - "--memory", - "{{ user `memory` }}" - ], - [ - "modifyvm", - "{{.Name}}", - "--cpus", - "{{ user `cpus` }}" - ] - ], - "virtualbox_version_file": ".vbox_version", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<esc><wait>", - "<esc><wait>", - "<enter><wait>", - "/install/vmlinuz<wait>", - " auto<wait>", - " console-setup/ask_detect=false<wait>", - " console-setup/layoutcode=us<wait>", - " console-setup/modelcode=pc105<wait>", - " debconf/frontend=noninteractive<wait>", - " debian-installer=en_US<wait>", - " fb=false<wait>", - " initrd=/install/initrd.gz<wait>", - " kbd-chooser/method=us<wait>", - " keyboard-configuration/layout=USA<wait>", - " keyboard-configuration/variant=USA<wait>", - " locale=en_US<wait>", - " netcfg/get_domain=vm<wait>", - " netcfg/get_hostname=vagrant<wait>", - " noapic<wait>", - " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}}<wait>", - " -- <wait>", - "<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "ubuntu-64", - "headless": "{{ user `headless` }}", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-vmware", - "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "tools_upload_flavor": "linux", - "type": "vmware-iso", - "vm_name": "{{ user `template` }}", - "vmx_data": { - "cpuid.coresPerSocket": "1", - "memsize": "{{ user `memory` }}", - "numvcpus": "{{ user `cpus` }}" - } - }, - { - "boot_command": [ - "<esc><wait>", - "<esc><wait>", - "<enter><wait>", - "/install/vmlinuz<wait>", - " auto<wait>", - " console-setup/ask_detect=false<wait>", - " console-setup/layoutcode=us<wait>", - " console-setup/modelcode=pc105<wait>", - " debconf/frontend=noninteractive<wait>", - " debian-installer=en_US<wait>", - " fb=false<wait>", - " initrd=/install/initrd.gz<wait>", - " kbd-chooser/method=us<wait>", - " keyboard-configuration/layout=USA<wait>", - " keyboard-configuration/variant=USA<wait>", - " locale=en_US<wait>", - " netcfg/get_domain=vm<wait>", - " netcfg/get_hostname=vagrant<wait>", - " noapic<wait>", - " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}}<wait>", - " -- <wait>", - "<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "ubuntu", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-parallels", - "parallels_tools_flavor": "lin", - "prlctl": [ - [ - "set", - "{{.Name}}", - "--memsize", - "{{ user `memory` }}" - ], - [ - "set", - "{{.Name}}", - "--cpus", - "{{ user `cpus` }}" - ] - ], - "prlctl_version_file": ".prlctl_version", - "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "parallels-iso", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<esc><wait>", - "<esc><wait>", - "<enter><wait>", - "/install/vmlinuz<wait>", - " auto<wait>", - " console-setup/ask_detect=false<wait>", - " console-setup/layoutcode=us<wait>", - " console-setup/modelcode=pc105<wait>", - " debconf/frontend=noninteractive<wait>", - " debian-installer=en_US<wait>", - " fb=false<wait>", - " initrd=/install/initrd.gz<wait>", - " kbd-chooser/method=us<wait>", - " keyboard-configuration/layout=USA<wait>", - " keyboard-configuration/variant=USA<wait>", - " locale=en_US<wait>", - " netcfg/get_domain=vm<wait>", - " netcfg/get_hostname=vagrant<wait>", - " noapic<wait>", - " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}}<wait>", - " -- <wait>", - "<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "headless": "{{ user `headless` }}", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-qemu", - "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "qemu", - "vm_name": "{{ user `template` }}" - } - ], - "post-processors": [ - { - "output": "builds/{{user `box_basename`}}.{{.Provider}}.box", - "type": "vagrant" - } - ], - "provisioners": [ - { - "destination": "/tmp/bento-metadata.json", - "source": "{{user `metadata`}}", - "type": "file" - }, - { - "environment_vars": [ - "HOME_DIR=/home/vagrant", - "http_proxy={{user `http_proxy`}}", - "https_proxy={{user `https_proxy`}}", - "no_proxy={{user `no_proxy`}}" - ], - "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", - "scripts": [ - "scripts/common/metadata.sh", - "scripts/ubuntu/update.sh", - "scripts/common/sshd.sh", - "scripts/ubuntu/networking.sh", - "scripts/ubuntu/sudoers.sh", - "scripts/ubuntu/vagrant.sh", - "scripts/common/vmtools.sh", - "scripts/ubuntu/cleanup.sh", - "scripts/common/minimize.sh" - ], - "type": "shell" - } - ], - "variables": { - "box_basename": "ubuntu-10.04", - "build_timestamp": "{{isotime \"20060102150405\"}}", - "cpus": "1", - "disk_size": "40960", - "git_revision": "__unknown_git_revision__", - "headless": "", - "http_proxy": "{{env `http_proxy`}}", - "https_proxy": "{{env `https_proxy`}}", - "iso_checksum": "3de19967318906fd57252ef67ed3ad411b89e3ea6b81205e26517530d7a8cd0b", - "iso_checksum_type": "sha256", - "iso_name": "ubuntu-10.04.4-server-amd64.iso", - "memory": "512", - "metadata": "floppy/dummy_metadata.json", - "mirror": "http://releases.ubuntu.com", - "mirror_directory": "10.04.4", - "name": "ubuntu-10.04", - "no_proxy": "{{env `no_proxy`}}", - "preseed_path": "ubuntu-10.04/preseed.cfg", - "template": "ubuntu-10.04-amd64", - "version": "2.1.TIMESTAMP" - } -} diff --git a/archive/ubuntu-10.04-i386.json b/archive/ubuntu-10.04-i386.json deleted file mode 100644 index f72e6fc16..000000000 --- a/archive/ubuntu-10.04-i386.json +++ /dev/null @@ -1,265 +0,0 @@ -{ - "builders": [ - { - "boot_command": [ - "<esc><wait>", - "<esc><wait>", - "<enter><wait>", - "/install/vmlinuz<wait>", - " auto<wait>", - " console-setup/ask_detect=false<wait>", - " console-setup/layoutcode=us<wait>", - " console-setup/modelcode=pc105<wait>", - " debconf/frontend=noninteractive<wait>", - " debian-installer=en_US<wait>", - " fb=false<wait>", - " initrd=/install/initrd.gz<wait>", - " kbd-chooser/method=us<wait>", - " keyboard-configuration/layout=USA<wait>", - " keyboard-configuration/variant=USA<wait>", - " locale=en_US<wait>", - " netcfg/get_domain=vm<wait>", - " netcfg/get_hostname=vagrant<wait>", - " noapic<wait>", - " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}}<wait>", - " -- <wait>", - "<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", - "guest_os_type": "Ubuntu", - "hard_drive_interface": "sata", - "headless": "{{ user `headless` }}", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-virtualbox", - "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "virtualbox-iso", - "vboxmanage": [ - [ - "modifyvm", - "{{.Name}}", - "--memory", - "{{ user `memory` }}" - ], - [ - "modifyvm", - "{{.Name}}", - "--cpus", - "{{ user `cpus` }}" - ] - ], - "virtualbox_version_file": ".vbox_version", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<esc><wait>", - "<esc><wait>", - "<enter><wait>", - "/install/vmlinuz<wait>", - " auto<wait>", - " console-setup/ask_detect=false<wait>", - " console-setup/layoutcode=us<wait>", - " console-setup/modelcode=pc105<wait>", - " debconf/frontend=noninteractive<wait>", - " debian-installer=en_US<wait>", - " fb=false<wait>", - " initrd=/install/initrd.gz<wait>", - " kbd-chooser/method=us<wait>", - " keyboard-configuration/layout=USA<wait>", - " keyboard-configuration/variant=USA<wait>", - " locale=en_US<wait>", - " netcfg/get_domain=vm<wait>", - " netcfg/get_hostname=vagrant<wait>", - " noapic<wait>", - " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}}<wait>", - " -- <wait>", - "<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "ubuntu", - "headless": "{{ user `headless` }}", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-vmware", - "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "tools_upload_flavor": "linux", - "type": "vmware-iso", - "vm_name": "{{ user `template` }}", - "vmx_data": { - "cpuid.coresPerSocket": "1", - "memsize": "{{ user `memory` }}", - "numvcpus": "{{ user `cpus` }}" - } - }, - { - "boot_command": [ - "<esc><wait>", - "<esc><wait>", - "<enter><wait>", - "/install/vmlinuz<wait>", - " auto<wait>", - " console-setup/ask_detect=false<wait>", - " console-setup/layoutcode=us<wait>", - " console-setup/modelcode=pc105<wait>", - " debconf/frontend=noninteractive<wait>", - " debian-installer=en_US<wait>", - " fb=false<wait>", - " initrd=/install/initrd.gz<wait>", - " kbd-chooser/method=us<wait>", - " keyboard-configuration/layout=USA<wait>", - " keyboard-configuration/variant=USA<wait>", - " locale=en_US<wait>", - " netcfg/get_domain=vm<wait>", - " netcfg/get_hostname=vagrant<wait>", - " noapic<wait>", - " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}}<wait>", - " -- <wait>", - "<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "ubuntu", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-parallels", - "parallels_tools_flavor": "lin", - "prlctl": [ - [ - "set", - "{{.Name}}", - "--memsize", - "{{ user `memory` }}" - ], - [ - "set", - "{{.Name}}", - "--cpus", - "{{ user `cpus` }}" - ] - ], - "prlctl_version_file": ".prlctl_version", - "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "parallels-iso", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<esc><wait>", - "<esc><wait>", - "<enter><wait>", - "/install/vmlinuz<wait>", - " auto<wait>", - " console-setup/ask_detect=false<wait>", - " console-setup/layoutcode=us<wait>", - " console-setup/modelcode=pc105<wait>", - " debconf/frontend=noninteractive<wait>", - " debian-installer=en_US<wait>", - " fb=false<wait>", - " initrd=/install/initrd.gz<wait>", - " kbd-chooser/method=us<wait>", - " keyboard-configuration/layout=USA<wait>", - " keyboard-configuration/variant=USA<wait>", - " locale=en_US<wait>", - " netcfg/get_domain=vm<wait>", - " netcfg/get_hostname=vagrant<wait>", - " noapic<wait>", - " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}}<wait>", - " -- <wait>", - "<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "headless": "{{ user `headless` }}", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-qemu", - "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "qemu", - "vm_name": "{{ user `template` }}" - } - ], - "post-processors": [ - { - "output": "builds/{{user `box_basename`}}.{{.Provider}}.box", - "type": "vagrant" - } - ], - "provisioners": [ - { - "destination": "/tmp/bento-metadata.json", - "source": "{{user `metadata`}}", - "type": "file" - }, - { - "environment_vars": [ - "HOME_DIR=/home/vagrant", - "http_proxy={{user `http_proxy`}}", - "https_proxy={{user `https_proxy`}}", - "no_proxy={{user `no_proxy`}}" - ], - "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", - "scripts": [ - "scripts/common/metadata.sh", - "scripts/ubuntu/update.sh", - "scripts/common/sshd.sh", - "scripts/ubuntu/networking.sh", - "scripts/ubuntu/sudoers.sh", - "scripts/ubuntu/vagrant.sh", - "scripts/common/vmtools.sh", - "scripts/ubuntu/cleanup.sh", - "scripts/common/minimize.sh" - ], - "type": "shell" - } - ], - "variables": { - "box_basename": "ubuntu-10.04-i386", - "build_timestamp": "{{isotime \"20060102150405\"}}", - "cpus": "1", - "disk_size": "40960", - "git_revision": "__unknown_git_revision__", - "headless": "", - "http_proxy": "{{env `http_proxy`}}", - "https_proxy": "{{env `https_proxy`}}", - "iso_checksum": "564eb67534ab64dbddd4b5bed54ec96f447cbbeb27a8a1354eae85658559503f", - "iso_checksum_type": "sha256", - "iso_name": "ubuntu-10.04.4-server-i386.iso", - "memory": "512", - "metadata": "floppy/dummy_metadata.json", - "mirror": "http://releases.ubuntu.com", - "mirror_directory": "10.04.4", - "name": "ubuntu-10.04-i386", - "no_proxy": "{{env `no_proxy`}}", - "preseed_path": "ubuntu-10.04/preseed.cfg", - "template": "ubuntu-10.04-i386", - "version": "2.1.TIMESTAMP" - } -} diff --git a/archive/ubuntu-14.10-amd64.json b/archive/ubuntu-14.10-amd64.json deleted file mode 100644 index 5e7e013e1..000000000 --- a/archive/ubuntu-14.10-amd64.json +++ /dev/null @@ -1,265 +0,0 @@ -{ - "builders": [ - { - "boot_command": [ - "<esc><wait>", - "<esc><wait>", - "<enter><wait>", - "/install/vmlinuz<wait>", - " auto<wait>", - " console-setup/ask_detect=false<wait>", - " console-setup/layoutcode=us<wait>", - " console-setup/modelcode=pc105<wait>", - " debconf/frontend=noninteractive<wait>", - " debian-installer=en_US<wait>", - " fb=false<wait>", - " initrd=/install/initrd.gz<wait>", - " kbd-chooser/method=us<wait>", - " keyboard-configuration/layout=USA<wait>", - " keyboard-configuration/variant=USA<wait>", - " locale=en_US<wait>", - " netcfg/get_domain=vm<wait>", - " netcfg/get_hostname=vagrant<wait>", - " noapic<wait>", - " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}}<wait>", - " -- <wait>", - "<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", - "guest_os_type": "Ubuntu_64", - "hard_drive_interface": "sata", - "headless": "{{ user `headless` }}", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-virtualbox", - "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "virtualbox-iso", - "vboxmanage": [ - [ - "modifyvm", - "{{.Name}}", - "--memory", - "{{ user `memory` }}" - ], - [ - "modifyvm", - "{{.Name}}", - "--cpus", - "{{ user `cpus` }}" - ] - ], - "virtualbox_version_file": ".vbox_version", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<esc><wait>", - "<esc><wait>", - "<enter><wait>", - "/install/vmlinuz<wait>", - " auto<wait>", - " console-setup/ask_detect=false<wait>", - " console-setup/layoutcode=us<wait>", - " console-setup/modelcode=pc105<wait>", - " debconf/frontend=noninteractive<wait>", - " debian-installer=en_US<wait>", - " fb=false<wait>", - " initrd=/install/initrd.gz<wait>", - " kbd-chooser/method=us<wait>", - " keyboard-configuration/layout=USA<wait>", - " keyboard-configuration/variant=USA<wait>", - " locale=en_US<wait>", - " netcfg/get_domain=vm<wait>", - " netcfg/get_hostname=vagrant<wait>", - " noapic<wait>", - " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}}<wait>", - " -- <wait>", - "<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "ubuntu-64", - "headless": "{{ user `headless` }}", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-vmware", - "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "tools_upload_flavor": "linux", - "type": "vmware-iso", - "vm_name": "{{ user `template` }}", - "vmx_data": { - "cpuid.coresPerSocket": "1", - "memsize": "{{ user `memory` }}", - "numvcpus": "{{ user `cpus` }}" - } - }, - { - "boot_command": [ - "<esc><wait>", - "<esc><wait>", - "<enter><wait>", - "/install/vmlinuz<wait>", - " auto<wait>", - " console-setup/ask_detect=false<wait>", - " console-setup/layoutcode=us<wait>", - " console-setup/modelcode=pc105<wait>", - " debconf/frontend=noninteractive<wait>", - " debian-installer=en_US<wait>", - " fb=false<wait>", - " initrd=/install/initrd.gz<wait>", - " kbd-chooser/method=us<wait>", - " keyboard-configuration/layout=USA<wait>", - " keyboard-configuration/variant=USA<wait>", - " locale=en_US<wait>", - " netcfg/get_domain=vm<wait>", - " netcfg/get_hostname=vagrant<wait>", - " noapic<wait>", - " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}}<wait>", - " -- <wait>", - "<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "ubuntu", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-parallels", - "parallels_tools_flavor": "lin", - "prlctl": [ - [ - "set", - "{{.Name}}", - "--memsize", - "{{ user `memory` }}" - ], - [ - "set", - "{{.Name}}", - "--cpus", - "{{ user `cpus` }}" - ] - ], - "prlctl_version_file": ".prlctl_version", - "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "parallels-iso", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<esc><wait>", - "<esc><wait>", - "<enter><wait>", - "/install/vmlinuz<wait>", - " auto<wait>", - " console-setup/ask_detect=false<wait>", - " console-setup/layoutcode=us<wait>", - " console-setup/modelcode=pc105<wait>", - " debconf/frontend=noninteractive<wait>", - " debian-installer=en_US<wait>", - " fb=false<wait>", - " initrd=/install/initrd.gz<wait>", - " kbd-chooser/method=us<wait>", - " keyboard-configuration/layout=USA<wait>", - " keyboard-configuration/variant=USA<wait>", - " locale=en_US<wait>", - " netcfg/get_domain=vm<wait>", - " netcfg/get_hostname=vagrant<wait>", - " noapic<wait>", - " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}}<wait>", - " -- <wait>", - "<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "headless": "{{ user `headless` }}", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-qemu", - "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "qemu", - "vm_name": "{{ user `template` }}" - } - ], - "post-processors": [ - { - "output": "builds/{{user `box_basename`}}.{{.Provider}}.box", - "type": "vagrant" - } - ], - "provisioners": [ - { - "destination": "/tmp/bento-metadata.json", - "source": "{{user `metadata`}}", - "type": "file" - }, - { - "environment_vars": [ - "HOME_DIR=/home/vagrant", - "http_proxy={{user `http_proxy`}}", - "https_proxy={{user `https_proxy`}}", - "no_proxy={{user `no_proxy`}}" - ], - "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", - "scripts": [ - "scripts/common/metadata.sh", - "scripts/ubuntu/update.sh", - "scripts/common/sshd.sh", - "scripts/ubuntu/networking.sh", - "scripts/ubuntu/sudoers.sh", - "scripts/ubuntu/vagrant.sh", - "scripts/common/vmtools.sh", - "scripts/ubuntu/cleanup.sh", - "scripts/common/minimize.sh" - ], - "type": "shell" - } - ], - "variables": { - "box_basename": "ubuntu-14.10", - "build_timestamp": "{{isotime \"20060102150405\"}}", - "cpus": "1", - "disk_size": "40960", - "git_revision": "__unknown_git_revision__", - "headless": "", - "http_proxy": "{{env `http_proxy`}}", - "https_proxy": "{{env `https_proxy`}}", - "iso_checksum": "f79edea19575e2cabb5ff9aeca787ea821fcfdbf81ce89823c26b020d9940956", - "iso_checksum_type": "sha256", - "iso_name": "ubuntu-14.10-server-amd64.iso", - "memory": "512", - "metadata": "floppy/dummy_metadata.json", - "mirror": "http://releases.ubuntu.com", - "mirror_directory": "14.10", - "name": "ubuntu-14.10", - "no_proxy": "{{env `no_proxy`}}", - "preseed_path": "ubuntu-14.10/preseed.cfg", - "template": "ubuntu-14.10-amd64", - "version": "2.1.TIMESTAMP" - } -} diff --git a/archive/ubuntu-14.10-i386.json b/archive/ubuntu-14.10-i386.json deleted file mode 100644 index 23cb502ae..000000000 --- a/archive/ubuntu-14.10-i386.json +++ /dev/null @@ -1,265 +0,0 @@ -{ - "builders": [ - { - "boot_command": [ - "<esc><wait>", - "<esc><wait>", - "<enter><wait>", - "/install/vmlinuz<wait>", - " auto<wait>", - " console-setup/ask_detect=false<wait>", - " console-setup/layoutcode=us<wait>", - " console-setup/modelcode=pc105<wait>", - " debconf/frontend=noninteractive<wait>", - " debian-installer=en_US<wait>", - " fb=false<wait>", - " initrd=/install/initrd.gz<wait>", - " kbd-chooser/method=us<wait>", - " keyboard-configuration/layout=USA<wait>", - " keyboard-configuration/variant=USA<wait>", - " locale=en_US<wait>", - " netcfg/get_domain=vm<wait>", - " netcfg/get_hostname=vagrant<wait>", - " noapic<wait>", - " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}}<wait>", - " -- <wait>", - "<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", - "guest_os_type": "Ubuntu", - "hard_drive_interface": "sata", - "headless": "{{ user `headless` }}", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-virtualbox", - "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "virtualbox-iso", - "vboxmanage": [ - [ - "modifyvm", - "{{.Name}}", - "--memory", - "{{ user `memory` }}" - ], - [ - "modifyvm", - "{{.Name}}", - "--cpus", - "{{ user `cpus` }}" - ] - ], - "virtualbox_version_file": ".vbox_version", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<esc><wait>", - "<esc><wait>", - "<enter><wait>", - "/install/vmlinuz<wait>", - " auto<wait>", - " console-setup/ask_detect=false<wait>", - " console-setup/layoutcode=us<wait>", - " console-setup/modelcode=pc105<wait>", - " debconf/frontend=noninteractive<wait>", - " debian-installer=en_US<wait>", - " fb=false<wait>", - " initrd=/install/initrd.gz<wait>", - " kbd-chooser/method=us<wait>", - " keyboard-configuration/layout=USA<wait>", - " keyboard-configuration/variant=USA<wait>", - " locale=en_US<wait>", - " netcfg/get_domain=vm<wait>", - " netcfg/get_hostname=vagrant<wait>", - " noapic<wait>", - " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}}<wait>", - " -- <wait>", - "<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "ubuntu", - "headless": "{{ user `headless` }}", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-vmware", - "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "tools_upload_flavor": "linux", - "type": "vmware-iso", - "vm_name": "{{ user `template` }}", - "vmx_data": { - "cpuid.coresPerSocket": "1", - "memsize": "{{ user `memory` }}", - "numvcpus": "{{ user `cpus` }}" - } - }, - { - "boot_command": [ - "<esc><wait>", - "<esc><wait>", - "<enter><wait>", - "/install/vmlinuz<wait>", - " auto<wait>", - " console-setup/ask_detect=false<wait>", - " console-setup/layoutcode=us<wait>", - " console-setup/modelcode=pc105<wait>", - " debconf/frontend=noninteractive<wait>", - " debian-installer=en_US<wait>", - " fb=false<wait>", - " initrd=/install/initrd.gz<wait>", - " kbd-chooser/method=us<wait>", - " keyboard-configuration/layout=USA<wait>", - " keyboard-configuration/variant=USA<wait>", - " locale=en_US<wait>", - " netcfg/get_domain=vm<wait>", - " netcfg/get_hostname=vagrant<wait>", - " noapic<wait>", - " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}}<wait>", - " -- <wait>", - "<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "ubuntu", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-parallels", - "parallels_tools_flavor": "lin", - "prlctl": [ - [ - "set", - "{{.Name}}", - "--memsize", - "{{ user `memory` }}" - ], - [ - "set", - "{{.Name}}", - "--cpus", - "{{ user `cpus` }}" - ] - ], - "prlctl_version_file": ".prlctl_version", - "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "parallels-iso", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<esc><wait>", - "<esc><wait>", - "<enter><wait>", - "/install/vmlinuz<wait>", - " auto<wait>", - " console-setup/ask_detect=false<wait>", - " console-setup/layoutcode=us<wait>", - " console-setup/modelcode=pc105<wait>", - " debconf/frontend=noninteractive<wait>", - " debian-installer=en_US<wait>", - " fb=false<wait>", - " initrd=/install/initrd.gz<wait>", - " kbd-chooser/method=us<wait>", - " keyboard-configuration/layout=USA<wait>", - " keyboard-configuration/variant=USA<wait>", - " locale=en_US<wait>", - " netcfg/get_domain=vm<wait>", - " netcfg/get_hostname=vagrant<wait>", - " noapic<wait>", - " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}}<wait>", - " -- <wait>", - "<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "headless": "{{ user `headless` }}", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-qemu", - "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "qemu", - "vm_name": "{{ user `template` }}" - } - ], - "post-processors": [ - { - "output": "builds/{{user `box_basename`}}.{{.Provider}}.box", - "type": "vagrant" - } - ], - "provisioners": [ - { - "destination": "/tmp/bento-metadata.json", - "source": "{{user `metadata`}}", - "type": "file" - }, - { - "environment_vars": [ - "HOME_DIR=/home/vagrant", - "http_proxy={{user `http_proxy`}}", - "https_proxy={{user `https_proxy`}}", - "no_proxy={{user `no_proxy`}}" - ], - "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", - "scripts": [ - "scripts/common/metadata.sh", - "scripts/ubuntu/update.sh", - "scripts/common/sshd.sh", - "scripts/ubuntu/networking.sh", - "scripts/ubuntu/sudoers.sh", - "scripts/ubuntu/vagrant.sh", - "scripts/common/vmtools.sh", - "scripts/ubuntu/cleanup.sh", - "scripts/common/minimize.sh" - ], - "type": "shell" - } - ], - "variables": { - "box_basename": "ubuntu-14.10-i386", - "build_timestamp": "{{isotime \"20060102150405\"}}", - "cpus": "1", - "disk_size": "40960", - "git_revision": "__unknown_git_revision__", - "headless": "", - "http_proxy": "{{env `http_proxy`}}", - "https_proxy": "{{env `https_proxy`}}", - "iso_checksum": "e1c74e163b06e28bfd71ef322ce986fb6098d03704408f9dc2eaf3ef6f7f86b9", - "iso_checksum_type": "sha256", - "iso_name": "ubuntu-14.10-server-i386.iso", - "memory": "512", - "metadata": "floppy/dummy_metadata.json", - "mirror": "http://releases.ubuntu.com", - "mirror_directory": "14.10", - "name": "ubuntu-14.10-i386", - "no_proxy": "{{env `no_proxy`}}", - "preseed_path": "ubuntu-14.10/preseed.cfg", - "template": "ubuntu-14.10-i386", - "version": "2.1.TIMESTAMP" - } -} diff --git a/archive/ubuntu-15.04-amd64.json b/archive/ubuntu-15.04-amd64.json deleted file mode 100644 index 38d9522cd..000000000 --- a/archive/ubuntu-15.04-amd64.json +++ /dev/null @@ -1,269 +0,0 @@ -{ - "builders": [ - { - "boot_command": [ - "<esc><wait>", - "<esc><wait>", - "<enter><wait>", - "/install/vmlinuz<wait>", - " auto<wait>", - " console-setup/ask_detect=false<wait>", - " console-setup/layoutcode=us<wait>", - " console-setup/modelcode=pc105<wait>", - " debconf/frontend=noninteractive<wait>", - " debian-installer=en_US<wait>", - " fb=false<wait>", - " initrd=/install/initrd.gz<wait>", - " kbd-chooser/method=us<wait>", - " keyboard-configuration/layout=USA<wait>", - " keyboard-configuration/variant=USA<wait>", - " locale=en_US<wait>", - " netcfg/get_domain=vm<wait>", - " netcfg/get_hostname=vagrant<wait>", - " grub-installer/bootdev=/dev/sda<wait>", - " noapic<wait>", - " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}}<wait>", - " -- <wait>", - "<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", - "guest_os_type": "Ubuntu_64", - "hard_drive_interface": "sata", - "headless": "{{ user `headless` }}", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-virtualbox", - "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "virtualbox-iso", - "vboxmanage": [ - [ - "modifyvm", - "{{.Name}}", - "--memory", - "{{ user `memory` }}" - ], - [ - "modifyvm", - "{{.Name}}", - "--cpus", - "{{ user `cpus` }}" - ] - ], - "virtualbox_version_file": ".vbox_version", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<esc><wait>", - "<esc><wait>", - "<enter><wait>", - "/install/vmlinuz<wait>", - " auto<wait>", - " console-setup/ask_detect=false<wait>", - " console-setup/layoutcode=us<wait>", - " console-setup/modelcode=pc105<wait>", - " debconf/frontend=noninteractive<wait>", - " debian-installer=en_US<wait>", - " fb=false<wait>", - " initrd=/install/initrd.gz<wait>", - " kbd-chooser/method=us<wait>", - " keyboard-configuration/layout=USA<wait>", - " keyboard-configuration/variant=USA<wait>", - " locale=en_US<wait>", - " netcfg/get_domain=vm<wait>", - " netcfg/get_hostname=vagrant<wait>", - " grub-installer/bootdev=/dev/sda<wait>", - " noapic<wait>", - " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}}<wait>", - " -- <wait>", - "<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "ubuntu-64", - "headless": "{{ user `headless` }}", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-vmware", - "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "tools_upload_flavor": "linux", - "type": "vmware-iso", - "vm_name": "{{ user `template` }}", - "vmx_data": { - "cpuid.coresPerSocket": "1", - "memsize": "{{ user `memory` }}", - "numvcpus": "{{ user `cpus` }}" - } - }, - { - "boot_command": [ - "<esc><wait>", - "<esc><wait>", - "<enter><wait>", - "/install/vmlinuz<wait>", - " auto<wait>", - " console-setup/ask_detect=false<wait>", - " console-setup/layoutcode=us<wait>", - " console-setup/modelcode=pc105<wait>", - " debconf/frontend=noninteractive<wait>", - " debian-installer=en_US<wait>", - " fb=false<wait>", - " initrd=/install/initrd.gz<wait>", - " kbd-chooser/method=us<wait>", - " keyboard-configuration/layout=USA<wait>", - " keyboard-configuration/variant=USA<wait>", - " locale=en_US<wait>", - " netcfg/get_domain=vm<wait>", - " netcfg/get_hostname=vagrant<wait>", - " grub-installer/bootdev=/dev/sda<wait>", - " noapic<wait>", - " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}}<wait>", - " -- <wait>", - "<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "ubuntu", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-parallels", - "parallels_tools_flavor": "lin", - "prlctl": [ - [ - "set", - "{{.Name}}", - "--memsize", - "{{ user `memory` }}" - ], - [ - "set", - "{{.Name}}", - "--cpus", - "{{ user `cpus` }}" - ] - ], - "prlctl_version_file": ".prlctl_version", - "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "parallels-iso", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<esc><wait>", - "<esc><wait>", - "<enter><wait>", - "/install/vmlinuz<wait>", - " auto<wait>", - " console-setup/ask_detect=false<wait>", - " console-setup/layoutcode=us<wait>", - " console-setup/modelcode=pc105<wait>", - " debconf/frontend=noninteractive<wait>", - " debian-installer=en_US<wait>", - " fb=false<wait>", - " initrd=/install/initrd.gz<wait>", - " kbd-chooser/method=us<wait>", - " keyboard-configuration/layout=USA<wait>", - " keyboard-configuration/variant=USA<wait>", - " locale=en_US<wait>", - " netcfg/get_domain=vm<wait>", - " netcfg/get_hostname=vagrant<wait>", - " grub-installer/bootdev=/dev/vda<wait>", - " noapic<wait>", - " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}}<wait>", - " -- <wait>", - "<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "headless": "{{ user `headless` }}", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-qemu", - "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "qemu", - "vm_name": "{{ user `template` }}" - } - ], - "post-processors": [ - { - "output": "builds/{{user `box_basename`}}.{{.Provider}}.box", - "type": "vagrant" - } - ], - "provisioners": [ - { - "destination": "/tmp/bento-metadata.json", - "source": "{{user `metadata`}}", - "type": "file" - }, - { - "environment_vars": [ - "HOME_DIR=/home/vagrant", - "http_proxy={{user `http_proxy`}}", - "https_proxy={{user `https_proxy`}}", - "no_proxy={{user `no_proxy`}}" - ], - "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", - "scripts": [ - "scripts/common/metadata.sh", - "scripts/ubuntu/update.sh", - "scripts/common/sshd.sh", - "scripts/ubuntu/networking.sh", - "scripts/ubuntu/sudoers.sh", - "scripts/ubuntu/vagrant.sh", - "scripts/common/vmtools.sh", - "scripts/ubuntu/cleanup.sh", - "scripts/common/minimize.sh" - ], - "type": "shell" - } - ], - "variables": { - "box_basename": "ubuntu-15.04", - "build_timestamp": "{{isotime \"20060102150405\"}}", - "cpus": "1", - "disk_size": "40960", - "git_revision": "__unknown_git_revision__", - "headless": "", - "http_proxy": "{{env `http_proxy`}}", - "https_proxy": "{{env `https_proxy`}}", - "iso_checksum": "6501c8545374665823384bbb6235f865108f56d8a30bbf69dd18df73c14ccb84", - "iso_checksum_type": "sha256", - "iso_name": "ubuntu-15.04-server-amd64.iso", - "memory": "512", - "metadata": "floppy/dummy_metadata.json", - "mirror": "http://releases.ubuntu.com", - "mirror_directory": "15.04", - "name": "ubuntu-15.04", - "no_proxy": "{{env `no_proxy`}}", - "preseed_path": "ubuntu-15.04/preseed.cfg", - "template": "ubuntu-15.04-amd64", - "version": "2.1.TIMESTAMP" - } -} diff --git a/archive/ubuntu-15.04-i386.json b/archive/ubuntu-15.04-i386.json deleted file mode 100644 index 43e9f732d..000000000 --- a/archive/ubuntu-15.04-i386.json +++ /dev/null @@ -1,269 +0,0 @@ -{ - "builders": [ - { - "boot_command": [ - "<esc><wait>", - "<esc><wait>", - "<enter><wait>", - "/install/vmlinuz<wait>", - " auto<wait>", - " console-setup/ask_detect=false<wait>", - " console-setup/layoutcode=us<wait>", - " console-setup/modelcode=pc105<wait>", - " debconf/frontend=noninteractive<wait>", - " debian-installer=en_US<wait>", - " fb=false<wait>", - " initrd=/install/initrd.gz<wait>", - " kbd-chooser/method=us<wait>", - " keyboard-configuration/layout=USA<wait>", - " keyboard-configuration/variant=USA<wait>", - " locale=en_US<wait>", - " netcfg/get_domain=vm<wait>", - " netcfg/get_hostname=vagrant<wait>", - " grub-installer/bootdev=/dev/sda <wait>", - " noapic<wait>", - " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}}<wait>", - " -- <wait>", - "<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", - "guest_os_type": "Ubuntu", - "hard_drive_interface": "sata", - "headless": "{{ user `headless` }}", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-virtualbox", - "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "virtualbox-iso", - "vboxmanage": [ - [ - "modifyvm", - "{{.Name}}", - "--memory", - "{{ user `memory` }}" - ], - [ - "modifyvm", - "{{.Name}}", - "--cpus", - "{{ user `cpus` }}" - ] - ], - "virtualbox_version_file": ".vbox_version", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<esc><wait>", - "<esc><wait>", - "<enter><wait>", - "/install/vmlinuz<wait>", - " auto<wait>", - " console-setup/ask_detect=false<wait>", - " console-setup/layoutcode=us<wait>", - " console-setup/modelcode=pc105<wait>", - " debconf/frontend=noninteractive<wait>", - " debian-installer=en_US<wait>", - " fb=false<wait>", - " initrd=/install/initrd.gz<wait>", - " kbd-chooser/method=us<wait>", - " keyboard-configuration/layout=USA<wait>", - " keyboard-configuration/variant=USA<wait>", - " locale=en_US<wait>", - " netcfg/get_domain=vm<wait>", - " netcfg/get_hostname=vagrant<wait>", - " grub-installer/bootdev=/dev/sda <wait>", - " noapic<wait>", - " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}}<wait>", - " -- <wait>", - "<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "ubuntu", - "headless": "{{ user `headless` }}", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-vmware", - "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "tools_upload_flavor": "linux", - "type": "vmware-iso", - "vm_name": "{{ user `template` }}", - "vmx_data": { - "cpuid.coresPerSocket": "1", - "memsize": "{{ user `memory` }}", - "numvcpus": "{{ user `cpus` }}" - } - }, - { - "boot_command": [ - "<esc><wait>", - "<esc><wait>", - "<enter><wait>", - "/install/vmlinuz<wait>", - " auto<wait>", - " console-setup/ask_detect=false<wait>", - " console-setup/layoutcode=us<wait>", - " console-setup/modelcode=pc105<wait>", - " debconf/frontend=noninteractive<wait>", - " debian-installer=en_US<wait>", - " fb=false<wait>", - " initrd=/install/initrd.gz<wait>", - " kbd-chooser/method=us<wait>", - " keyboard-configuration/layout=USA<wait>", - " keyboard-configuration/variant=USA<wait>", - " locale=en_US<wait>", - " netcfg/get_domain=vm<wait>", - " netcfg/get_hostname=vagrant<wait>", - " grub-installer/bootdev=/dev/sda <wait>", - " noapic<wait>", - " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}}<wait>", - " -- <wait>", - "<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "ubuntu", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-parallels", - "parallels_tools_flavor": "lin", - "prlctl": [ - [ - "set", - "{{.Name}}", - "--memsize", - "{{ user `memory` }}" - ], - [ - "set", - "{{.Name}}", - "--cpus", - "{{ user `cpus` }}" - ] - ], - "prlctl_version_file": ".prlctl_version", - "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "parallels-iso", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<esc><wait>", - "<esc><wait>", - "<enter><wait>", - "/install/vmlinuz<wait>", - " auto<wait>", - " console-setup/ask_detect=false<wait>", - " console-setup/layoutcode=us<wait>", - " console-setup/modelcode=pc105<wait>", - " debconf/frontend=noninteractive<wait>", - " debian-installer=en_US<wait>", - " fb=false<wait>", - " initrd=/install/initrd.gz<wait>", - " kbd-chooser/method=us<wait>", - " keyboard-configuration/layout=USA<wait>", - " keyboard-configuration/variant=USA<wait>", - " locale=en_US<wait>", - " netcfg/get_domain=vm<wait>", - " netcfg/get_hostname=vagrant<wait>", - " grub-installer/bootdev=/dev/vda <wait>", - " noapic<wait>", - " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}}<wait>", - " -- <wait>", - "<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "headless": "{{ user `headless` }}", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-qemu", - "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "qemu", - "vm_name": "{{ user `template` }}" - } - ], - "post-processors": [ - { - "output": "builds/{{user `box_basename`}}.{{.Provider}}.box", - "type": "vagrant" - } - ], - "provisioners": [ - { - "destination": "/tmp/bento-metadata.json", - "source": "{{user `metadata`}}", - "type": "file" - }, - { - "environment_vars": [ - "HOME_DIR=/home/vagrant", - "http_proxy={{user `http_proxy`}}", - "https_proxy={{user `https_proxy`}}", - "no_proxy={{user `no_proxy`}}" - ], - "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", - "scripts": [ - "scripts/common/metadata.sh", - "scripts/ubuntu/update.sh", - "scripts/common/sshd.sh", - "scripts/ubuntu/networking.sh", - "scripts/ubuntu/sudoers.sh", - "scripts/ubuntu/vagrant.sh", - "scripts/common/vmtools.sh", - "scripts/ubuntu/cleanup.sh", - "scripts/common/minimize.sh" - ], - "type": "shell" - } - ], - "variables": { - "box_basename": "ubuntu-15.04-i386", - "build_timestamp": "{{isotime \"20060102150405\"}}", - "cpus": "1", - "disk_size": "40960", - "git_revision": "__unknown_git_revision__", - "headless": "", - "http_proxy": "{{env `http_proxy`}}", - "https_proxy": "{{env `https_proxy`}}", - "iso_checksum": "f510169ddc03121d11a627ae3a231e1272d8e4d75f9ef76f73daa5b809c5b6d8", - "iso_checksum_type": "sha256", - "iso_name": "ubuntu-15.04-server-i386.iso", - "memory": "512", - "metadata": "floppy/dummy_metadata.json", - "mirror": "http://releases.ubuntu.com", - "mirror_directory": "15.04", - "name": "ubuntu-15.04-i386", - "no_proxy": "{{env `no_proxy`}}", - "preseed_path": "ubuntu-15.04/preseed.cfg", - "template": "ubuntu-15.04-i386", - "version": "2.1.TIMESTAMP" - } -} diff --git a/freebsd-9.3-amd64.json b/freebsd-9.3-amd64.json deleted file mode 100644 index cf8d8ddbb..000000000 --- a/freebsd-9.3-amd64.json +++ /dev/null @@ -1,250 +0,0 @@ -{ - "builders": [ - { - "boot_command": [ - "<esc><wait>", - "load geom_mbr<wait>", - "<enter><wait>", - "load zfs<wait>", - "<enter><wait>", - "boot -s<wait>", - "<enter><wait>", - "<wait10><wait10>", - "/bin/sh<enter><wait>", - "mdmfs -s 100m md1 /tmp<enter><wait>", - "mdmfs -s 100m md2 /mnt<enter><wait>", - "dhclient -l /tmp/dhclient.lease.em0 em0<enter><wait>", - "fetch -o /tmp/install.sh http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} && chmod +x /tmp/install.sh && /tmp/install.sh {{ .Name }}<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", - "guest_os_type": "FreeBSD_64", - "headless": "{{ user `headless` }}", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-virtualbox", - "shutdown_command": "echo 'vagrant' | su -m root -c 'shutdown -p now'", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "virtualbox-iso", - "vboxmanage": [ - [ - "modifyvm", - "{{.Name}}", - "--memory", - "{{ user `memory` }}" - ], - [ - "modifyvm", - "{{.Name}}", - "--cpus", - "{{ user `cpus` }}" - ] - ], - "virtualbox_version_file": ".vbox_version", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<esc><wait>", - "load geom_mbr<wait>", - "<enter><wait>", - "load zfs<wait>", - "<enter><wait>", - "boot -s<wait>", - "<enter><wait>", - "<wait10><wait10>", - "/bin/sh<enter><wait>", - "mdmfs -s 100m md1 /tmp<enter><wait>", - "mdmfs -s 100m md2 /mnt<enter><wait>", - "dhclient -l /tmp/dhclient.lease.em0 em0<enter><wait>", - "<wait5>", - "fetch -o /tmp/install.sh http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} && chmod +x /tmp/install.sh && /tmp/install.sh {{ .Name }}<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "freebsd-64", - "headless": "{{ user `headless` }}", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-vmare", - "shutdown_command": "echo 'vagrant' | su -m root -c 'shutdown -p now'", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "tools_upload_flavor": "freebsd", - "type": "vmware-iso", - "vm_name": "{{ user `template` }}", - "vmx_data": { - "cpuid.coresPerSocket": "1", - "memsize": "{{ user `memory` }}", - "numvcpus": "{{ user `cpus` }}" - } - }, - { - "boot_command": [ - "<esc><wait>", - "load geom_mbr<wait>", - "<enter><wait>", - "load zfs<wait>", - "<enter><wait>", - "boot -s<wait>", - "<enter><wait>", - "<wait10><wait10>", - "/bin/sh<enter><wait>", - "mdmfs -s 100m md1 /tmp<enter><wait>", - "mdmfs -s 100m md2 /mnt<enter><wait>", - "dhclient -l /tmp/dhclient.lease.em0 em0<enter><wait>", - "fetch -o /tmp/install.sh http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} && chmod +x /tmp/install.sh && /tmp/install.sh {{ .Name }}<enter><wait>" - ], - "boot_wait": "8s", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "freebsd", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-parallels", - "parallels_tools_mode": "disable", - "prlctl": [ - [ - "set", - "{{.Name}}", - "--memsize", - "{{ user `memory` }}" - ], - [ - "set", - "{{.Name}}", - "--cpus", - "{{ user `cpus` }}" - ], - [ - "set", - "{{.Name}}", - "--device-set", - "cdrom0", - "--iface", - "ide" - ], - [ - "set", - "{{.Name}}", - "--device-del", - "fdd0" - ], - [ - "set", - "{{.Name}}", - "--device-del", - "parallel0" - ] - ], - "prlctl_version_file": ".prlctl_version", - "shutdown_command": "echo 'vagrant' | su -m root -c 'shutdown -p now'", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "parallels-iso", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<esc><wait>", - "load geom_mbr<wait>", - "<enter><wait>", - "load zfs<wait>", - "<enter><wait>", - "boot -s<wait>", - "<enter><wait>", - "<wait10><wait10>", - "/bin/sh<enter><wait>", - "mdmfs -s 100m md1 /tmp<enter><wait>", - "mdmfs -s 100m md2 /mnt<enter><wait>", - "dhclient -l /tmp/dhclient.lease.vtnet0 vtnet0<enter><wait>", - "fetch -o /tmp/install.sh http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} && chmod +x /tmp/install.sh && /tmp/install.sh {{ .Name }}<enter><wait>" - ], - "boot_wait": "7s", - "disk_size": "{{user `disk_size`}}", - "headless": "{{ user `headless` }}", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-qemu", - "shutdown_command": "echo 'vagrant' | su -m root -c 'shutdown -p now'", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "qemu", - "vm_name": "{{ user `template` }}" - } - ], - "post-processors": [ - { - "output": "builds/{{user `box_basename`}}.{{.Provider}}.box", - "type": "vagrant", - "vagrantfile_template": "vagrantfile_templates/freebsd.rb" - } - ], - "provisioners": [ - { - "destination": "/tmp/bento-metadata.json", - "source": "{{user `metadata`}}", - "type": "file" - }, - { - "environment_vars": [ - "HOME_DIR=/home/vagrant", - "http_proxy={{user `http_proxy`}}", - "https_proxy={{user `https_proxy`}}", - "no_proxy={{user `no_proxy`}}" - ], - "execute_command": "echo 'vagrant' | {{.Vars}} su -m root -c 'sh -eux {{.Path}}'", - "scripts": [ - "scripts/common/metadata.sh", - "scripts/freebsd/update.sh", - "scripts/freebsd/postinstall.sh", - "scripts/freebsd/sudoers.sh", - "scripts/common/vagrant.sh", - "scripts/freebsd/vmtools.sh", - "scripts/freebsd/cleanup.sh", - "scripts/freebsd/minimize.sh" - ], - "type": "shell" - } - ], - "variables": { - "box_basename": "freebsd-9.3", - "build_timestamp": "{{isotime \"20060102150405\"}}", - "cpus": "1", - "disk_size": "40960", - "git_revision": "__unknown_git_revision__", - "headless": "", - "http_proxy": "{{env `http_proxy`}}", - "https_proxy": "{{env `https_proxy`}}", - "install_path": "freebsd-9.3/install.sh", - "iso_checksum": "5a3c82653d77bba7d7ded8bd7efbedc09d52cf4045d98ce52a82c9e0f8fa9b0e", - "iso_checksum_type": "sha256", - "iso_name": "FreeBSD-9.3-RELEASE-amd64-disc1.iso", - "memory": "512", - "metadata": "floppy/dummy_metadata.json", - "mirror": "http://ftp.freebsd.org/pub/FreeBSD", - "mirror_directory": "releases/amd64/amd64/ISO-IMAGES/9.3", - "name": "freebsd-9.3", - "no_proxy": "{{env `no_proxy`}}", - "template": "freebsd-9.3-amd64", - "version": "2.1.TIMESTAMP" - } -} - diff --git a/freebsd-9.3-i386.json b/freebsd-9.3-i386.json deleted file mode 100644 index 8879d7c1f..000000000 --- a/freebsd-9.3-i386.json +++ /dev/null @@ -1,250 +0,0 @@ -{ - "builders": [ - { - "boot_command": [ - "<esc><wait>", - "load geom_mbr<wait>", - "<enter><wait>", - "load zfs<wait>", - "<enter><wait>", - "boot -s<wait>", - "<enter><wait>", - "<wait10><wait10>", - "/bin/sh<enter><wait>", - "mdmfs -s 100m md1 /tmp<enter><wait>", - "mdmfs -s 100m md2 /mnt<enter><wait>", - "dhclient -l /tmp/dhclient.lease.em0 em0<enter><wait>", - "fetch -o /tmp/install.sh http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} && chmod +x /tmp/install.sh && /tmp/install.sh {{ .Name }}<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", - "guest_os_type": "FreeBSD", - "headless": "{{ user `headless` }}", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-virtualbox", - "shutdown_command": "echo 'vagrant' | su -m root -c 'shutdown -p now'", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "virtualbox-iso", - "vboxmanage": [ - [ - "modifyvm", - "{{.Name}}", - "--memory", - "{{ user `memory` }}" - ], - [ - "modifyvm", - "{{.Name}}", - "--cpus", - "{{ user `cpus` }}" - ] - ], - "virtualbox_version_file": ".vbox_version", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<esc><wait>", - "load geom_mbr<wait>", - "<enter><wait>", - "load zfs<wait>", - "<enter><wait>", - "boot -s<wait>", - "<enter><wait>", - "<wait10><wait10>", - "/bin/sh<enter><wait>", - "mdmfs -s 100m md1 /tmp<enter><wait>", - "mdmfs -s 100m md2 /mnt<enter><wait>", - "dhclient -l /tmp/dhclient.lease.em0 em0<enter><wait>", - "<wait5>", - "fetch -o /tmp/install.sh http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} && chmod +x /tmp/install.sh && /tmp/install.sh {{ .Name }}<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "freebsd", - "headless": "{{ user `headless` }}", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-vmare", - "shutdown_command": "echo 'vagrant' | su -m root -c 'shutdown -p now'", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "tools_upload_flavor": "freebsd", - "type": "vmware-iso", - "vm_name": "{{ user `template` }}", - "vmx_data": { - "cpuid.coresPerSocket": "1", - "memsize": "{{ user `memory` }}", - "numvcpus": "{{ user `cpus` }}" - } - }, - { - "boot_command": [ - "<esc><wait>", - "load geom_mbr<wait>", - "<enter><wait>", - "load zfs<wait>", - "<enter><wait>", - "boot -s<wait>", - "<enter><wait>", - "<wait10><wait10>", - "/bin/sh<enter><wait>", - "mdmfs -s 100m md1 /tmp<enter><wait>", - "mdmfs -s 100m md2 /mnt<enter><wait>", - "dhclient -l /tmp/dhclient.lease.em0 em0<enter><wait>", - "fetch -o /tmp/install.sh http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} && chmod +x /tmp/install.sh && /tmp/install.sh {{ .Name }}<enter><wait>" - ], - "boot_wait": "8s", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "freebsd", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-parallels", - "parallels_tools_mode": "disable", - "prlctl": [ - [ - "set", - "{{.Name}}", - "--memsize", - "{{ user `memory` }}" - ], - [ - "set", - "{{.Name}}", - "--cpus", - "{{ user `cpus` }}" - ], - [ - "set", - "{{.Name}}", - "--device-set", - "cdrom0", - "--iface", - "ide" - ], - [ - "set", - "{{.Name}}", - "--device-del", - "fdd0" - ], - [ - "set", - "{{.Name}}", - "--device-del", - "parallel0" - ] - ], - "prlctl_version_file": ".prlctl_version", - "shutdown_command": "echo 'vagrant' | su -m root -c 'shutdown -p now'", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "parallels-iso", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<esc><wait>", - "load geom_mbr<wait>", - "<enter><wait>", - "load zfs<wait>", - "<enter><wait>", - "boot -s<wait>", - "<enter><wait>", - "<wait10><wait10>", - "/bin/sh<enter><wait>", - "mdmfs -s 100m md1 /tmp<enter><wait>", - "mdmfs -s 100m md2 /mnt<enter><wait>", - "dhclient -l /tmp/dhclient.lease.vtnet0 vtnet0<enter><wait>", - "fetch -o /tmp/install.sh http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} && chmod +x /tmp/install.sh && /tmp/install.sh {{ .Name }}<enter><wait>" - ], - "boot_wait": "7s", - "disk_size": "{{user `disk_size`}}", - "headless": "{{ user `headless` }}", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-qemu", - "shutdown_command": "echo 'vagrant' | su -m root -c 'shutdown -p now'", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "qemu", - "vm_name": "{{ user `template` }}" - } - ], - "post-processors": [ - { - "output": "builds/{{user `box_basename`}}.{{.Provider}}.box", - "type": "vagrant", - "vagrantfile_template": "vagrantfile_templates/freebsd.rb" - } - ], - "provisioners": [ - { - "destination": "/tmp/bento-metadata.json", - "source": "{{user `metadata`}}", - "type": "file" - }, - { - "environment_vars": [ - "HOME_DIR=/home/vagrant", - "http_proxy={{user `http_proxy`}}", - "https_proxy={{user `https_proxy`}}", - "no_proxy={{user `no_proxy`}}" - ], - "execute_command": "echo 'vagrant' | {{.Vars}} su -m root -c 'sh -eux {{.Path}}'", - "scripts": [ - "scripts/common/metadata.sh", - "scripts/freebsd/update.sh", - "scripts/freebsd/postinstall.sh", - "scripts/freebsd/sudoers.sh", - "scripts/common/vagrant.sh", - "scripts/freebsd/vmtools.sh", - "scripts/freebsd/cleanup.sh", - "scripts/freebsd/minimize.sh" - ], - "type": "shell" - } - ], - "variables": { - "box_basename": "freebsd-9.3-i386", - "build_timestamp": "{{isotime \"20060102150405\"}}", - "cpus": "1", - "disk_size": "40960", - "git_revision": "__unknown_git_revision__", - "headless": "", - "http_proxy": "{{env `http_proxy`}}", - "https_proxy": "{{env `https_proxy`}}", - "install_path": "freebsd-9.3/install.sh", - "iso_checksum": "cab6aad9c3d5ea6a3fb4059f808225c67f1edaea730c555a86a9707ac41ba75d", - "iso_checksum_type": "sha256", - "iso_name": "FreeBSD-9.3-RELEASE-i386-disc1.iso", - "memory": "512", - "metadata": "floppy/dummy_metadata.json", - "mirror": "http://ftp.freebsd.org/pub/FreeBSD", - "mirror_directory": "releases/i386/i386/ISO-IMAGES/9.3", - "name": "freebsd-9.3", - "no_proxy": "{{env `no_proxy`}}", - "template": "freebsd-9.3-i386", - "version": "2.1.TIMESTAMP" - } -} - diff --git a/http/freebsd-9.3/install.sh b/http/freebsd-9.3/install.sh deleted file mode 100644 index e8fc9c106..000000000 --- a/http/freebsd-9.3/install.sh +++ /dev/null @@ -1,109 +0,0 @@ -#!/bin/sh -x - -# Credit: http://www.aisecure.net/2011/05/01/root-on-zfs-freebsd-current/ -# -# Heavily re-adapted from https://wiki.freebsd.org/RootOnZFS/GPTZFSBoot -# by Julian Dunn (jdunn@chef.io) to remove legacy junk - -NAME=$1 - -# create disks -# for variations in the root disk device name between VMware and Virtualbox -if [ -e /dev/ada0 ]; then - DISKSLICE=ada0 -elif [ -e /dev/da0 ]; then - DISKSLICE=da0 -elif [ -e /dev/vtbd0 ]; then - DISKSLICE=vtbd0 -else - echo "Unknown disk for install.sh to work with!" - exit -1 -fi - -gpart create -s gpt $DISKSLICE -gpart add -b 34 -s 94 -t freebsd-boot $DISKSLICE -gpart add -t freebsd-zfs -l disk0 $DISKSLICE -gpart bootcode -b /boot/pmbr -p /boot/gptzfsboot -i 1 $DISKSLICE - -zpool create -o altroot=/mnt -o cachefile=/tmp/zpool.cache zroot /dev/gpt/disk0 -zpool set bootfs=zroot zroot - -zfs set checksum=fletcher4 zroot - -# set up zfs pools -zfs create zroot/usr -zfs create zroot/usr/home -zfs create zroot/var -zfs create -o compression=on -o exec=on -o setuid=off zroot/tmp -zfs create -o compression=lzjb -o setuid=off zroot/usr/ports -zfs create -o compression=off -o exec=off -o setuid=off zroot/usr/ports/distfiles -zfs create -o compression=off -o exec=off -o setuid=off zroot/usr/ports/packages -zfs create -o compression=lzjb -o exec=off -o setuid=off zroot/usr/src -zfs create -o compression=lzjb -o exec=off -o setuid=off zroot/var/crash -zfs create -o exec=off -o setuid=off zroot/var/db -zfs create -o compression=lzjb -o exec=on -o setuid=off zroot/var/db/pkg -zfs create -o exec=off -o setuid=off zroot/var/empty -zfs create -o compression=lzjb -o exec=off -o setuid=off zroot/var/log -zfs create -o compression=gzip -o exec=off -o setuid=off zroot/var/mail -zfs create -o exec=off -o setuid=off zroot/var/run -zfs create -o compression=lzjb -o exec=on -o setuid=off zroot/var/tmp - -# fixup -chmod 1777 /mnt/zroot/tmp -cd /mnt/zroot ; ln -s usr/home home -chmod 1777 /mnt/zroot/var/tmp - -# set up swap -zfs create -V 2G zroot/swap -zfs set org.freebsd:swap=on zroot/swap -zfs set checksum=off zroot/swap -swapon /dev/zvol/zroot/swap - -# Install the OS -cd /usr/freebsd-dist -cat base.txz | tar --unlink -xpJf - -C /mnt/zroot -cat lib32.txz | tar --unlink -xpJf - -C /mnt/zroot -cat kernel.txz | tar --unlink -xpJf - -C /mnt/zroot -cat src.txz | tar --unlink -xpJf - -C /mnt/zroot - -cp /tmp/zpool.cache /mnt/zroot/boot/zfs/zpool.cache - -zfs set readonly=on zroot/var/empty - -ifdev=`ifconfig | grep '^[a-z]' | cut -d: -f1 | head -n 1` -# Enable required services -cat >> /mnt/zroot/etc/rc.conf << EOT -zfs_enable="YES" -hostname="${NAME}" -ifconfig_${ifdev}="dhcp" -sshd_enable="YES" -EOT - -# Tune and boot from zfs -cat >> /mnt/zroot/boot/loader.conf << EOT -zfs_load="YES" -vfs.root.mountfrom="zfs:zroot" -vm.kmem_size="200M" -vm.kmem_size_max="200M" -vfs.zfs.arc_max="40M" -vfs.zfs.vdev.cache.size="5M" -EOT - -# zfs doesn't use an fstab, but some rc scripts expect one -touch /mnt/zroot/etc/fstab - -# Set up user accounts -zfs create zroot/usr/home/vagrant -echo "vagrant" | pw -V /mnt/zroot/etc useradd vagrant -h 0 -s /bin/sh -G wheel -d /home/vagrant -c "Vagrant User" -echo "vagrant" | pw -V /mnt/zroot/etc usermod root -h 0 - -chown 1001:1001 /mnt/zroot/home/vagrant - -zfs unmount -a -zfs set mountpoint=legacy zroot -zfs set mountpoint=/tmp zroot/tmp -zfs set mountpoint=/usr zroot/usr -zfs set mountpoint=/var zroot/var - -# Reboot -reboot diff --git a/http/opensuse-13.2/autoinst.xml b/http/opensuse-13.2/autoinst.xml deleted file mode 100644 index 725f36257..000000000 --- a/http/opensuse-13.2/autoinst.xml +++ /dev/null @@ -1,218 +0,0 @@ -<?xml version="1.0"?> -<!DOCTYPE profile> - -<!-- http://doc.opensuse.org/projects/autoyast/configuration.html --> - -<profile xmlns="http://www.suse.com/1.0/yast2ns" xmlns:config="http://www.suse.com/1.0/configns"> - <general> - <mode> - <confirm config:type="boolean">false</confirm> - <forceboot config:type="boolean">true</forceboot> - <final_reboot config:type="boolean">false</final_reboot> - </mode> - </general> - <report> - <messages> - <show config:type="boolean">false</show> - <timeout config:type="integer">10</timeout> - <log config:type="boolean">true</log> - </messages> - <warnings> - <show config:type="boolean">false</show> - <timeout config:type="integer">10</timeout> - <log config:type="boolean">true</log> - </warnings> - <errors> - <show config:type="boolean">false</show> - <timeout config:type="integer">10</timeout> - <log config:type="boolean">true</log> - </errors> - </report> - - <keyboard> - <keymap>english-us</keymap> - </keyboard> - <language> - <language>en_US</language> - <languages>en_US</languages> - </language> - <timezone> - <hwclock>UTC</hwclock> - <timezone>Etc/UTC</timezone> - </timezone> - <partitioning config:type="list"> - <drive> - <initialize config:type="boolean">true</initialize> - <partitions config:type="list"> - <partition> - <create config:type="boolean">true</create> - <crypt_fs config:type="boolean">false</crypt_fs> - <filesystem config:type="symbol">swap</filesystem> - <format config:type="boolean">true</format> - <fstopt>defaults</fstopt> - <loop_fs config:type="boolean">false</loop_fs> - <mount>swap</mount> - <mountby config:type="symbol">device</mountby> - <partition_id config:type="integer">130</partition_id> - <partition_nr config:type="integer">1</partition_nr> - <raid_options/> - <resize config:type="boolean">false</resize> - <size>512M</size> - </partition> - <partition> - <create config:type="boolean">true</create> - <crypt_fs config:type="boolean">false</crypt_fs> - <filesystem config:type="symbol">btrfs</filesystem> - <format config:type="boolean">true</format> - <loop_fs config:type="boolean">false</loop_fs> - <mount>/</mount> - <mountby config:type="symbol">device</mountby> - <partition_id config:type="integer">131</partition_id> - <partition_nr config:type="integer">2</partition_nr> - <raid_options/> - <resize config:type="boolean">false</resize> - <size>max</size> - <subvolumes config:type="list"> - <listentry>boot/grub2/i386-pc</listentry> - <listentry>boot/grub2/x86_64-efi</listentry> - <listentry>home</listentry> - <listentry>opt</listentry> - <listentry>srv</listentry> - <listentry>tmp</listentry> - <listentry>usr/local</listentry> - <listentry>var/crash</listentry> - <listentry>var/lib/mailman</listentry> - <listentry>var/lib/named</listentry> - <listentry>var/lib/pgsql</listentry> - <listentry>var/log</listentry> - <listentry>var/opt</listentry> - <listentry>var/spool</listentry> - <listentry>var/tmp</listentry> - </subvolumes> - </partition> - </partitions> - <pesize/> - <type config:type="symbol">CT_DISK</type> - <use>all</use> - </drive> - </partitioning> - - <bootloader> - <loader_type>grub2</loader_type> - </bootloader> - - <networking> - <ipv6 config:type="boolean">false</ipv6> - <keep_install_network config:type="boolean">true</keep_install_network> - <dns> - <dhcp_hostname config:type="boolean">true</dhcp_hostname> - <dhcp_resolv config:type="boolean">true</dhcp_resolv> - <domain>vagrantup.com</domain> - <hostname>opensuse-13.2-x64</hostname> - </dns> - <interfaces config:type="list"> - <interface> - <bootproto>dhcp</bootproto> - <device>enp0s3</device> - <startmode>onboot</startmode> - </interface> - <interface> - <bootproto>dhcp</bootproto> - <device>ens33</device> - <startmode>onboot</startmode> - </interface> - </interfaces> - </networking> - - <firewall> - <enable_firewall config:type="boolean">true</enable_firewall> - <start_firewall config:type="boolean">true</start_firewall> - </firewall> - - <software> - <image/> - <instsource/> - <packages config:type="list"> - <package>grub2</package> - <package>glibc-locale</package> - <package>iputils</package> - <package>kernel-default</package> - <package>kernel-default-devel</package> - <package>gcc</package> - <package>make</package> - <package>sudo</package> - <package>yast2</package> - <package>yast2-firstboot</package> - <package>zypper</package> - <package>yast2-trans-en_US</package> - <package>wget</package> - <package>curl</package> - <package>grub2-branding-openSUSE</package> - </packages> - <patterns config:type="list"> - <pattern>sw_management</pattern> - <pattern>yast2_install_wf</pattern> - <pattern>minimal_base</pattern> - </patterns> - <remove-packages config:type="list"> - <package>bash-completion</package> - <package>telnet</package> - <package>virtualbox-guest-kmp-default</package> - <package>virtualbox-guest-tools</package> - </remove-packages> - </software> - <services-manager> - <default_target>graphical</default_target> - <services> - <disable config:type="list"/> - <enable config:type="list"> - <service>sshd</service> - </enable> - </services> - </services-manager> - <groups config:type="list"> - <group> - <gid>100</gid> - <groupname>users</groupname> - <userlist/> - </group> - </groups> - <user_defaults> - <expire/> - <group>100</group> - <groups/> - <home>/home</home> - <inactive>-1</inactive> - <no_groups config:type="boolean">true</no_groups> - <shell>/bin/bash</shell> - <skel>/etc/skel</skel> - <umask>022</umask> - </user_defaults> - - <users config:type="list"> - <user> - <user_password>vagrant</user_password> - <username>root</username> - </user> - <user> - <fullname>vagrant</fullname> - <gid>100</gid> - <home>/home/vagrant</home> - <password_settings> - <expire/> - <flag/> - <inact>-1</inact> - <max>99999</max> - <min>0</min> - <warn>7</warn> - </password_settings> - <shell>/bin/bash</shell> - <uid>1000</uid> - <user_password>vagrant</user_password> - <username>vagrant</username> - </user> - </users> - <kdump> - <add_crash_kernel config:type="boolean">false</add_crash_kernel> - </kdump> -</profile> diff --git a/http/ubuntu-15.10/preseed.cfg b/http/ubuntu-16.04/preseed.cfg similarity index 100% rename from http/ubuntu-15.10/preseed.cfg rename to http/ubuntu-16.04/preseed.cfg diff --git a/opensuse-13.2-i386.json b/opensuse-13.2-i386.json deleted file mode 100644 index e1fe839c9..000000000 --- a/opensuse-13.2-i386.json +++ /dev/null @@ -1,201 +0,0 @@ -{ - "builders": [ - { - "boot_command": [ - "<esc><enter><wait>", - "linux netsetup=dhcp install=cd:/<wait>", - " lang=en_US.UTF-8 autoyast=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `autoinst_cfg`}}<wait>", - " textmode=1<wait>", - "<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", - "guest_os_type": "OpenSUSE", - "hard_drive_interface": "sata", - "headless": "{{ user `headless` }}", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-virtualbox", - "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "virtualbox-iso", - "vboxmanage": [ - [ - "modifyvm", - "{{.Name}}", - "--memory", - "{{ user `memory` }}" - ], - [ - "modifyvm", - "{{.Name}}", - "--cpus", - "{{ user `cpus` }}" - ] - ], - "virtualbox_version_file": ".vbox_version", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<esc><enter><wait>", - "linux netsetup=dhcp install=cd:/<wait>", - " lang=en_US.UTF-8 autoyast=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `autoinst_cfg`}}<wait>", - " textmode=1<wait>", - "<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "opensuse", - "headless": "{{ user `headless` }}", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-vmware", - "shutdown_command": "echo 'vagrant'|sudo -S /sbin/shutdown -h 1", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "tools_upload_flavor": "linux", - "type": "vmware-iso", - "vm_name": "{{ user `template` }}", - "vmx_data": { - "cpuid.coresPerSocket": "1", - "memsize": "{{ user `memory` }}", - "numvcpus": "{{ user `cpus` }}" - } - }, - { - "boot_command": [ - "<esc><enter><wait>", - "linux netsetup=dhcp netdevice=eth0 install=cd:/<wait>", - " lang=en_US.UTF-8 autoyast=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `autoinst_cfg`}}<wait>", - " textmode=1<wait>", - "<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "opensuse", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-parallels", - "parallels_tools_flavor": "lin", - "prlctl": [ - [ - "set", - "{{.Name}}", - "--memsize", - "{{ user `memory` }}" - ], - [ - "set", - "{{.Name}}", - "--cpus", - "{{ user `cpus` }}" - ] - ], - "prlctl_version_file": ".prlctl_version", - "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "parallels-iso", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<esc><enter><wait>", - "linux netsetup=dhcp netdevice=eth0 install=cd:/<wait>", - " lang=en_US.UTF-8 autoyast=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `autoinst_cfg`}}<wait>", - " textmode=1<wait>", - "<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "headless": "{{ user `headless` }}", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-qemu", - "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "qemu", - "vm_name": "{{ user `template` }}" - } - ], - "post-processors": [ - { - "output": "builds/{{user `box_basename`}}.{{.Provider}}.box", - "type": "vagrant" - } - ], - "provisioners": [ - { - "destination": "/tmp/bento-metadata.json", - "source": "{{user `metadata`}}", - "type": "file" - }, - { - "environment_vars": [ - "HOME_DIR=/home/vagrant", - "http_proxy={{user `http_proxy`}}", - "https_proxy={{user `https_proxy`}}", - "no_proxy={{user `no_proxy`}}" - ], - "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh '{{.Path}}'", - "scripts": [ - "scripts/common/metadata.sh", - "scripts/common/sshd.sh", - "scripts/common/vagrant.sh", - "scripts/common/virtualbox.sh", - "scripts/common/vmware.sh", - "scripts/common/parallels.sh", - "scripts/opensuse/sudoers.sh", - "scripts/opensuse/zypper-locks.sh", - "scripts/opensuse/remove-dvd-source.sh", - "scripts/opensuse/cleanup.sh", - "scripts/common/minimize.sh" - ], - "type": "shell" - } - ], - "variables": { - "arch": "32", - "autoinst_cfg": "opensuse-13.2/autoinst.xml", - "box_basename": "opensuse-13.2-i386", - "build_timestamp": "{{isotime \"20060102150405\"}}", - "cpus": "1", - "disk_size": "20480", - "git_revision": "__unknown_git_revision__", - "headless": "", - "http_proxy": "{{env `http_proxy`}}", - "https_proxy": "{{env `https_proxy`}}", - "iso_checksum": "bada6d5b304a9ecbb9b27e0a02d0c347c72d91c32231c2594e4deb11a4d9ce55", - "iso_checksum_type": "sha256", - "iso_name": "openSUSE-13.2-DVD-i586.iso", - "memory": "512", - "metadata": "floppy/dummy_metadata.json", - "mirror": "http://suse.mobile-central.org/distribution", - "mirror_directory": "13.2/iso", - "name": "opensuse-13.2-i386", - "no_proxy": "{{env `no_proxy`}}", - "template": "opensuse-13.2-i386", - "version": "2.0.TIMESTAMP" - } -} - diff --git a/opensuse-13.2-x86_64.json b/opensuse-13.2-x86_64.json deleted file mode 100644 index 7a2a9fd1a..000000000 --- a/opensuse-13.2-x86_64.json +++ /dev/null @@ -1,201 +0,0 @@ -{ - "builders": [ - { - "boot_command": [ - "<esc><enter><wait>", - "linux netsetup=dhcp install=cd:/<wait>", - " lang=en_US.UTF-8 autoyast=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `autoinst_cfg`}}<wait>", - " textmode=1<wait>", - "<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", - "guest_os_type": "OpenSUSE_64", - "hard_drive_interface": "sata", - "headless": "{{ user `headless` }}", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-virtualbox", - "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "virtualbox-iso", - "vboxmanage": [ - [ - "modifyvm", - "{{.Name}}", - "--memory", - "{{ user `memory` }}" - ], - [ - "modifyvm", - "{{.Name}}", - "--cpus", - "{{ user `cpus` }}" - ] - ], - "virtualbox_version_file": ".vbox_version", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<esc><enter><wait>", - "linux netsetup=dhcp install=cd:/<wait>", - " lang=en_US.UTF-8 autoyast=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `autoinst_cfg`}}<wait>", - " textmode=1<wait>", - "<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "opensuse-64", - "headless": "{{ user `headless` }}", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-vmware", - "shutdown_command": "echo 'vagrant'|sudo -S /sbin/shutdown -h 1", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "tools_upload_flavor": "linux", - "type": "vmware-iso", - "vm_name": "{{ user `template` }}", - "vmx_data": { - "cpuid.coresPerSocket": "1", - "memsize": "{{ user `memory` }}", - "numvcpus": "{{ user `cpus` }}" - } - }, - { - "boot_command": [ - "<esc><enter><wait>", - "linux netsetup=dhcp netdevice=eth0 install=cd:/<wait>", - " lang=en_US.UTF-8 autoyast=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `autoinst_cfg`}}<wait>", - " textmode=1<wait>", - "<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "opensuse", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-parallels", - "parallels_tools_flavor": "lin", - "prlctl": [ - [ - "set", - "{{.Name}}", - "--memsize", - "{{ user `memory` }}" - ], - [ - "set", - "{{.Name}}", - "--cpus", - "{{ user `cpus` }}" - ] - ], - "prlctl_version_file": ".prlctl_version", - "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "parallels-iso", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<esc><enter><wait>", - "linux netsetup=dhcp netdevice=eth0 install=cd:/<wait>", - " lang=en_US.UTF-8 autoyast=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `autoinst_cfg`}}<wait>", - " textmode=1<wait>", - "<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "headless": "{{ user `headless` }}", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-qemu", - "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "qemu", - "vm_name": "{{ user `template` }}" - } - ], - "post-processors": [ - { - "output": "builds/{{user `box_basename`}}.{{.Provider}}.box", - "type": "vagrant" - } - ], - "provisioners": [ - { - "destination": "/tmp/bento-metadata.json", - "source": "{{user `metadata`}}", - "type": "file" - }, - { - "environment_vars": [ - "HOME_DIR=/home/vagrant", - "http_proxy={{user `http_proxy`}}", - "https_proxy={{user `https_proxy`}}", - "no_proxy={{user `no_proxy`}}" - ], - "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh '{{.Path}}'", - "scripts": [ - "scripts/common/metadata.sh", - "scripts/common/sshd.sh", - "scripts/common/vagrant.sh", - "scripts/common/virtualbox.sh", - "scripts/common/vmware.sh", - "scripts/common/parallels.sh", - "scripts/opensuse/sudoers.sh", - "scripts/opensuse/zypper-locks.sh", - "scripts/opensuse/remove-dvd-source.sh", - "scripts/opensuse/cleanup.sh", - "scripts/common/minimize.sh" - ], - "type": "shell" - } - ], - "variables": { - "arch": "64", - "autoinst_cfg": "opensuse-13.2/autoinst.xml", - "box_basename": "opensuse-13.2", - "build_timestamp": "{{isotime \"20060102150405\"}}", - "cpus": "1", - "disk_size": "20480", - "git_revision": "__unknown_git_revision__", - "headless": "", - "http_proxy": "{{env `http_proxy`}}", - "https_proxy": "{{env `https_proxy`}}", - "iso_checksum": "787b0a600e8304a9dda12a4f7ff89a08c9fc4b445215b9f91c52628eccdc3c40", - "iso_checksum_type": "sha256", - "iso_name": "openSUSE-13.2-DVD-x86_64.iso", - "memory": "512", - "metadata": "floppy/dummy_metadata.json", - "mirror": "http://suse.mobile-central.org/distribution", - "mirror_directory": "13.2/iso", - "name": "opensuse-13.2", - "no_proxy": "{{env `no_proxy`}}", - "template": "opensuse-13.2-x86_64", - "version": "2.0.TIMESTAMP" - } -} - diff --git a/scripts/opensuse/cleanup.sh b/scripts/opensuse/cleanup.sh index 7e89c4519..1e412afb8 100644 --- a/scripts/opensuse/cleanup.sh +++ b/scripts/opensuse/cleanup.sh @@ -1,12 +1,4 @@ #!/bin/bash -eux # These were only needed for building VMware/Virtualbox extensions: -version=`grep VERSION= /etc/os-release | cut -f2 -d\" | cut -f1 -d\ ` - -if [[ $version =~ "13" ]]; then - zypper -n rm -u binutils gcc make ruby kernel-default-devel kernel-devel -fi - -if [[ $version =~ "4" ]]; then - zypper -n rm -u gcc make kernel-default-devel kernel-devel -fi +zypper -n rm -u gcc make kernel-default-devel kernel-devel diff --git a/scripts/opensuse/remove-dvd-source.sh b/scripts/opensuse/remove-dvd-source.sh index 0889344fb..2ed2ad09a 100644 --- a/scripts/opensuse/remove-dvd-source.sh +++ b/scripts/opensuse/remove-dvd-source.sh @@ -4,18 +4,9 @@ version=`grep VERSION= /etc/os-release | cut -f2 -d\" | cut -f1 -d\ ` zypper removerepo "openSUSE-${version}-0" -if [[ $version =~ "13" ]]; then - zypper ar http://download.opensuse.org/distribution/${version}/repo/oss/ openSUSE-${version}-Oss - zypper ar http://download.opensuse.org/distribution/${version}/repo/non-oss/ openSUSE-${version}-Non-Oss - zypper ar http://download.opensuse.org/update/${version}/ openSUSE-${version}-Update - zypper ar http://download.opensuse.org/update/${version}-non-oss/ openSUSE-${version}-Update-Non-Oss -fi - -if [[ $version =~ "4" ]]; then - zypper ar http://download.opensuse.org/distribution/leap/${version}/repo/oss/ openSUSE-Leap-${version}-Oss - zypper ar http://download.opensuse.org/distribution/leap/${version}/repo/non-oss/ openSUSE-Leap-${version}-Non-Oss - zypper ar http://download.opensuse.org/update/leap/${version}/oss/ openSUSE-Leap-${version}-Update - zypper ar http://download.opensuse.org/update/leap/${version}/non-oss/ openSUSE-Leap-${version}-Update-Non-Oss -fi +zypper ar http://download.opensuse.org/distribution/leap/${version}/repo/oss/ openSUSE-Leap-${version}-Oss +zypper ar http://download.opensuse.org/distribution/leap/${version}/repo/non-oss/ openSUSE-Leap-${version}-Non-Oss +zypper ar http://download.opensuse.org/update/leap/${version}/oss/ openSUSE-Leap-${version}-Update +zypper ar http://download.opensuse.org/update/leap/${version}/non-oss/ openSUSE-Leap-${version}-Update-Non-Oss zypper refresh diff --git a/scripts/ubuntu/networking.sh b/scripts/ubuntu/networking.sh index 395904499..03fc0ecf1 100644 --- a/scripts/ubuntu/networking.sh +++ b/scripts/ubuntu/networking.sh @@ -3,7 +3,7 @@ ubuntu_version="`lsb_release -r | awk '{print $2}'`"; major_version="`echo $ubuntu_version | awk -F. '{print $1}'`"; -if [ "$major_version" -le "15" ] && [ "$ubuntu_version" != "15.10" ]; then +if [ "$major_version" -le "15" ]; then echo "Disabling automatic udev rules for network interfaces in Ubuntu" # Disable automatic udev rules for network interfaces in Ubuntu, # source: http://6.ptmc.org/164/ diff --git a/ubuntu-15.10-amd64.json b/ubuntu-15.10-amd64.json deleted file mode 100644 index a8498660f..000000000 --- a/ubuntu-15.10-amd64.json +++ /dev/null @@ -1,277 +0,0 @@ -{ - "builders": [ - { - "boot_command": [ - "<enter><wait><f6><esc><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs>", - "<bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs>", - "<bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs>", - "<bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs>", - "/install/vmlinuz<wait>", - " auto<wait>", - " console-setup/ask_detect=false<wait>", - " console-setup/layoutcode=us<wait>", - " console-setup/modelcode=pc105<wait>", - " debconf/frontend=noninteractive<wait>", - " debian-installer=en_US.UTF-8<wait>", - " fb=false<wait>", - " initrd=/install/initrd.gz<wait>", - " kbd-chooser/method=us<wait>", - " keyboard-configuration/layout=USA<wait>", - " keyboard-configuration/variant=USA<wait>", - " locale=en_US.UTF-8<wait>", - " netcfg/get_domain=vm<wait>", - " netcfg/get_hostname=vagrant<wait>", - " grub-installer/bootdev=/dev/sda<wait>", - " noapic<wait>", - " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}}<wait>", - " -- <wait>", - "<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", - "guest_os_type": "Ubuntu_64", - "hard_drive_interface": "sata", - "headless": "{{ user `headless` }}", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-virtualbox", - "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "virtualbox-iso", - "vboxmanage": [ - [ - "modifyvm", - "{{.Name}}", - "--memory", - "{{ user `memory` }}" - ], - [ - "modifyvm", - "{{.Name}}", - "--cpus", - "{{ user `cpus` }}" - ] - ], - "virtualbox_version_file": ".vbox_version", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<enter><wait><f6><esc><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs>", - "<bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs>", - "<bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs>", - "<bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs>", - "/install/vmlinuz<wait>", - " auto<wait>", - " console-setup/ask_detect=false<wait>", - " console-setup/layoutcode=us<wait>", - " console-setup/modelcode=pc105<wait>", - " debconf/frontend=noninteractive<wait>", - " debian-installer=en_US.UTF-8<wait>", - " fb=false<wait>", - " initrd=/install/initrd.gz<wait>", - " kbd-chooser/method=us<wait>", - " keyboard-configuration/layout=USA<wait>", - " keyboard-configuration/variant=USA<wait>", - " locale=en_US.UTF-8<wait>", - " netcfg/get_domain=vm<wait>", - " netcfg/get_hostname=vagrant<wait>", - " grub-installer/bootdev=/dev/sda<wait>", - " noapic<wait>", - " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}}<wait>", - " -- <wait>", - "<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "ubuntu-64", - "headless": "{{ user `headless` }}", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-vmware", - "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "tools_upload_flavor": "linux", - "type": "vmware-iso", - "vm_name": "{{ user `template` }}", - "vmx_data": { - "cpuid.coresPerSocket": "1", - "ethernet0.pciSlotNumber": "32", - "memsize": "{{ user `memory` }}", - "numvcpus": "{{ user `cpus` }}" - } - }, - { - "boot_command": [ - "<enter><wait><f6><esc><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs>", - "<bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs>", - "<bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs>", - "<bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs>", - "/install/vmlinuz<wait>", - " auto<wait>", - " console-setup/ask_detect=false<wait>", - " console-setup/layoutcode=us<wait>", - " console-setup/modelcode=pc105<wait>", - " debconf/frontend=noninteractive<wait>", - " debian-installer=en_US.UTF-8<wait>", - " fb=false<wait>", - " initrd=/install/initrd.gz<wait>", - " kbd-chooser/method=us<wait>", - " keyboard-configuration/layout=USA<wait>", - " keyboard-configuration/variant=USA<wait>", - " locale=en_US.UTF-8<wait>", - " netcfg/get_domain=vm<wait>", - " netcfg/get_hostname=vagrant<wait>", - " grub-installer/bootdev=/dev/sda<wait>", - " noapic<wait>", - " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}}<wait>", - " -- <wait>", - "<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "ubuntu", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-parallels", - "parallels_tools_flavor": "lin", - "prlctl": [ - [ - "set", - "{{.Name}}", - "--memsize", - "{{ user `memory` }}" - ], - [ - "set", - "{{.Name}}", - "--cpus", - "{{ user `cpus` }}" - ] - ], - "prlctl_version_file": ".prlctl_version", - "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "parallels-iso", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<enter><wait><f6><esc><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs>", - "<bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs>", - "<bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs>", - "<bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs>", - "/install/vmlinuz<wait>", - " auto<wait>", - " console-setup/ask_detect=false<wait>", - " console-setup/layoutcode=us<wait>", - " console-setup/modelcode=pc105<wait>", - " debconf/frontend=noninteractive<wait>", - " debian-installer=en_US.UTF-8<wait>", - " fb=false<wait>", - " initrd=/install/initrd.gz<wait>", - " kbd-chooser/method=us<wait>", - " keyboard-configuration/layout=USA<wait>", - " keyboard-configuration/variant=USA<wait>", - " locale=en_US.UTF-8<wait>", - " netcfg/get_domain=vm<wait>", - " netcfg/get_hostname=vagrant<wait>", - " grub-installer/bootdev=/dev/vda<wait>", - " noapic<wait>", - " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}}<wait>", - " -- <wait>", - "<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "headless": "{{ user `headless` }}", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-qemu", - "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "qemu", - "vm_name": "{{ user `template` }}" - } - ], - "post-processors": [ - { - "output": "builds/{{user `box_basename`}}.{{.Provider}}.box", - "type": "vagrant" - } - ], - "provisioners": [ - { - "destination": "/tmp/bento-metadata.json", - "source": "{{user `metadata`}}", - "type": "file" - }, - { - "environment_vars": [ - "HOME_DIR=/home/vagrant", - "http_proxy={{user `http_proxy`}}", - "https_proxy={{user `https_proxy`}}", - "no_proxy={{user `no_proxy`}}" - ], - "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", - "scripts": [ - "scripts/common/metadata.sh", - "scripts/ubuntu/update.sh", - "scripts/common/sshd.sh", - "scripts/ubuntu/networking.sh", - "scripts/ubuntu/sudoers.sh", - "scripts/ubuntu/vagrant.sh", - "scripts/common/virtualbox.sh", - "scripts/common/vmware.sh", - "scripts/common/parallels.sh", - "scripts/ubuntu/cleanup.sh", - "scripts/common/minimize.sh" - ], - "type": "shell" - } - ], - "variables": { - "box_basename": "ubuntu-15.10", - "build_timestamp": "{{isotime \"20060102150405\"}}", - "cpus": "1", - "disk_size": "40960", - "git_revision": "__unknown_git_revision__", - "headless": "", - "http_proxy": "{{env `http_proxy`}}", - "https_proxy": "{{env `https_proxy`}}", - "iso_checksum": "86aa35a986eba6e5ad30e3d486d57efe6803ae7ea4859b0216953e9e62871131", - "iso_checksum_type": "sha256", - "iso_name": "ubuntu-15.10-server-amd64.iso", - "memory": "512", - "metadata": "floppy/dummy_metadata.json", - "mirror": "http://releases.ubuntu.com", - "mirror_directory": "15.10", - "name": "ubuntu-15.10", - "no_proxy": "{{env `no_proxy`}}", - "preseed_path": "ubuntu-15.10/preseed.cfg", - "template": "ubuntu-15.10-amd64", - "version": "2.1.TIMESTAMP" - } -} - diff --git a/ubuntu-15.10-i386.json b/ubuntu-15.10-i386.json deleted file mode 100644 index 7040ed96c..000000000 --- a/ubuntu-15.10-i386.json +++ /dev/null @@ -1,277 +0,0 @@ -{ - "builders": [ - { - "boot_command": [ - "<enter><wait><f6><esc><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs>", - "<bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs>", - "<bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs>", - "<bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs>", - "/install/vmlinuz<wait>", - " auto<wait>", - " console-setup/ask_detect=false<wait>", - " console-setup/layoutcode=us<wait>", - " console-setup/modelcode=pc105<wait>", - " debconf/frontend=noninteractive<wait>", - " debian-installer=en_US.UTF-8<wait>", - " fb=false<wait>", - " initrd=/install/initrd.gz<wait>", - " kbd-chooser/method=us<wait>", - " keyboard-configuration/layout=USA<wait>", - " keyboard-configuration/variant=USA<wait>", - " locale=en_US.UTF-8<wait>", - " netcfg/get_domain=vm<wait>", - " netcfg/get_hostname=vagrant<wait>", - " grub-installer/bootdev=/dev/sda <wait>", - " noapic<wait>", - " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}}<wait>", - " -- <wait>", - "<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", - "guest_os_type": "Ubuntu", - "hard_drive_interface": "sata", - "headless": "{{ user `headless` }}", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-virtualbox", - "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "virtualbox-iso", - "vboxmanage": [ - [ - "modifyvm", - "{{.Name}}", - "--memory", - "{{ user `memory` }}" - ], - [ - "modifyvm", - "{{.Name}}", - "--cpus", - "{{ user `cpus` }}" - ] - ], - "virtualbox_version_file": ".vbox_version", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<enter><wait><f6><esc><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs>", - "<bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs>", - "<bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs>", - "<bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs>", - "/install/vmlinuz<wait>", - " auto<wait>", - " console-setup/ask_detect=false<wait>", - " console-setup/layoutcode=us<wait>", - " console-setup/modelcode=pc105<wait>", - " debconf/frontend=noninteractive<wait>", - " debian-installer=en_US.UTF-8<wait>", - " fb=false<wait>", - " initrd=/install/initrd.gz<wait>", - " kbd-chooser/method=us<wait>", - " keyboard-configuration/layout=USA<wait>", - " keyboard-configuration/variant=USA<wait>", - " locale=en_US.UTF-8<wait>", - " netcfg/get_domain=vm<wait>", - " netcfg/get_hostname=vagrant<wait>", - " grub-installer/bootdev=/dev/sda <wait>", - " noapic<wait>", - " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}}<wait>", - " -- <wait>", - "<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "ubuntu", - "headless": "{{ user `headless` }}", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-vmware", - "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "tools_upload_flavor": "linux", - "type": "vmware-iso", - "vm_name": "{{ user `template` }}", - "vmx_data": { - "cpuid.coresPerSocket": "1", - "ethernet0.pciSlotNumber": "32", - "memsize": "{{ user `memory` }}", - "numvcpus": "{{ user `cpus` }}" - } - }, - { - "boot_command": [ - "<enter><wait><f6><esc><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs>", - "<bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs>", - "<bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs>", - "<bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs>", - "/install/vmlinuz<wait>", - " auto<wait>", - " console-setup/ask_detect=false<wait>", - " console-setup/layoutcode=us<wait>", - " console-setup/modelcode=pc105<wait>", - " debconf/frontend=noninteractive<wait>", - " debian-installer=en_US.UTF-8<wait>", - " fb=false<wait>", - " initrd=/install/initrd.gz<wait>", - " kbd-chooser/method=us<wait>", - " keyboard-configuration/layout=USA<wait>", - " keyboard-configuration/variant=USA<wait>", - " locale=en_US.UTF-8<wait>", - " netcfg/get_domain=vm<wait>", - " netcfg/get_hostname=vagrant<wait>", - " grub-installer/bootdev=/dev/sda <wait>", - " noapic<wait>", - " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}}<wait>", - " -- <wait>", - "<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "ubuntu", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-parallels", - "parallels_tools_flavor": "lin", - "prlctl": [ - [ - "set", - "{{.Name}}", - "--memsize", - "{{ user `memory` }}" - ], - [ - "set", - "{{.Name}}", - "--cpus", - "{{ user `cpus` }}" - ] - ], - "prlctl_version_file": ".prlctl_version", - "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "parallels-iso", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<enter><wait><f6><esc><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs>", - "<bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs>", - "<bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs>", - "<bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs>", - "/install/vmlinuz<wait>", - " auto<wait>", - " console-setup/ask_detect=false<wait>", - " console-setup/layoutcode=us<wait>", - " console-setup/modelcode=pc105<wait>", - " debconf/frontend=noninteractive<wait>", - " debian-installer=en_US.UTF-8<wait>", - " fb=false<wait>", - " initrd=/install/initrd.gz<wait>", - " kbd-chooser/method=us<wait>", - " keyboard-configuration/layout=USA<wait>", - " keyboard-configuration/variant=USA<wait>", - " locale=en_US.UTF-8<wait>", - " netcfg/get_domain=vm<wait>", - " netcfg/get_hostname=vagrant<wait>", - " grub-installer/bootdev=/dev/vda <wait>", - " noapic<wait>", - " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}}<wait>", - " -- <wait>", - "<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "headless": "{{ user `headless` }}", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-qemu", - "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "qemu", - "vm_name": "{{ user `template` }}" - } - ], - "post-processors": [ - { - "output": "builds/{{user `box_basename`}}.{{.Provider}}.box", - "type": "vagrant" - } - ], - "provisioners": [ - { - "destination": "/tmp/bento-metadata.json", - "source": "{{user `metadata`}}", - "type": "file" - }, - { - "environment_vars": [ - "HOME_DIR=/home/vagrant", - "http_proxy={{user `http_proxy`}}", - "https_proxy={{user `https_proxy`}}", - "no_proxy={{user `no_proxy`}}" - ], - "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", - "scripts": [ - "scripts/common/metadata.sh", - "scripts/ubuntu/update.sh", - "scripts/common/sshd.sh", - "scripts/ubuntu/networking.sh", - "scripts/ubuntu/sudoers.sh", - "scripts/ubuntu/vagrant.sh", - "scripts/common/virtualbox.sh", - "scripts/common/vmware.sh", - "scripts/common/parallels.sh", - "scripts/ubuntu/cleanup.sh", - "scripts/common/minimize.sh" - ], - "type": "shell" - } - ], - "variables": { - "box_basename": "ubuntu-15.10-i386", - "build_timestamp": "{{isotime \"20060102150405\"}}", - "cpus": "1", - "disk_size": "40960", - "git_revision": "__unknown_git_revision__", - "headless": "", - "http_proxy": "{{env `http_proxy`}}", - "https_proxy": "{{env `https_proxy`}}", - "iso_checksum": "fa97768bdc3f198b82180d39bf0c26f021ab716f5da98094cd220771095e3394", - "iso_checksum_type": "sha256", - "iso_name": "ubuntu-15.10-server-i386.iso", - "memory": "512", - "metadata": "floppy/dummy_metadata.json", - "mirror": "http://releases.ubuntu.com", - "mirror_directory": "15.10", - "name": "ubuntu-15.10-i386", - "no_proxy": "{{env `no_proxy`}}", - "preseed_path": "ubuntu-15.10/preseed.cfg", - "template": "ubuntu-15.10-i386", - "version": "2.1.TIMESTAMP" - } -} - diff --git a/ubuntu-16.04-amd64.json b/ubuntu-16.04-amd64.json index f765459c9..5b910a923 100644 --- a/ubuntu-16.04-amd64.json +++ b/ubuntu-16.04-amd64.json @@ -269,9 +269,8 @@ "mirror_directory": "16.04.1", "name": "ubuntu-16.04", "no_proxy": "{{env `no_proxy`}}", - "preseed_path": "ubuntu-15.10/preseed.cfg", + "preseed_path": "ubuntu-16.04/preseed.cfg", "template": "ubuntu-16.04-amd64", "version": "2.1.TIMESTAMP" } } - diff --git a/ubuntu-16.04-i386.json b/ubuntu-16.04-i386.json index 632e433a7..707bfb20d 100644 --- a/ubuntu-16.04-i386.json +++ b/ubuntu-16.04-i386.json @@ -269,7 +269,7 @@ "mirror_directory": "16.04.1", "name": "ubuntu-16.04-i386", "no_proxy": "{{env `no_proxy`}}", - "preseed_path": "ubuntu-15.10/preseed.cfg", + "preseed_path": "ubuntu-16.04/preseed.cfg", "template": "ubuntu-16.04-i386", "version": "2.1.TIMESTAMP" } diff --git a/ubuntu-16.10-amd64.json b/ubuntu-16.10-amd64.json index 17aba8503..abf40aa29 100644 --- a/ubuntu-16.10-amd64.json +++ b/ubuntu-16.10-amd64.json @@ -265,7 +265,7 @@ "mirror_directory": "16.10", "name": "ubuntu-16.10", "no_proxy": "{{env `no_proxy`}}", - "preseed_path": "ubuntu-15.10/preseed.cfg", + "preseed_path": "ubuntu-16.04/preseed.cfg", "template": "ubuntu-16.10-amd64", "version": "2.1.TIMESTAMP" } diff --git a/ubuntu-16.10-i386.json b/ubuntu-16.10-i386.json index ba6aae616..3552293ff 100644 --- a/ubuntu-16.10-i386.json +++ b/ubuntu-16.10-i386.json @@ -265,7 +265,7 @@ "mirror_directory": "16.10", "name": "ubuntu-16.10-i386", "no_proxy": "{{env `no_proxy`}}", - "preseed_path": "ubuntu-15.10/preseed.cfg", + "preseed_path": "ubuntu-16.04/preseed.cfg", "template": "ubuntu-16.10-i386", "version": "2.1.TIMESTAMP" } From ee3f7c2ee6eeea6a69f849e4f07ce124a90269e2 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith@chef.io> Date: Fri, 17 Mar 2017 07:39:15 -0700 Subject: [PATCH 0598/1622] Better cleanup for the Fedora boxes (#773) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Don’t install yum on Fedora anymore Chef supports DNF natively so there’s no need for this and the install is massive Signed-off-by: Tim Smith <tsmith@chef.io> * More aggressively nuke files on Fedora systems Remove more of the dev packages we install Do a cleanup on all repos (this adds more package cache, but removes more packages) Nuke anything .log in var log Signed-off-by: Tim Smith <tsmith@chef.io> --- fedora-24-i386.json | 2 -- fedora-24-x86_64.json | 2 -- fedora-25-i386.json | 2 -- fedora-25-x86_64.json | 2 -- scripts/fedora/cleanup.sh | 14 ++++++++++++-- scripts/fedora/yum.sh | 4 ---- 6 files changed, 12 insertions(+), 14 deletions(-) delete mode 100644 scripts/fedora/yum.sh diff --git a/fedora-24-i386.json b/fedora-24-i386.json index f36c4d6f6..2dc50354f 100644 --- a/fedora-24-i386.json +++ b/fedora-24-i386.json @@ -141,7 +141,6 @@ "scripts/common/metadata.sh", "scripts/fedora/fix-slow-dns.sh", "scripts/fedora/build-tools.sh", - "scripts/fedora/yum.sh", "scripts/common/sshd.sh", "scripts/common/virtualbox.sh", "scripts/common/vmware.sh", @@ -177,4 +176,3 @@ "version": "2.0.TIMESTAMP" } } - diff --git a/fedora-24-x86_64.json b/fedora-24-x86_64.json index 5982d4551..a7ce8c5bb 100644 --- a/fedora-24-x86_64.json +++ b/fedora-24-x86_64.json @@ -147,7 +147,6 @@ "scripts/common/metadata.sh", "scripts/fedora/fix-slow-dns.sh", "scripts/fedora/build-tools.sh", - "scripts/fedora/yum.sh", "scripts/common/sshd.sh", "scripts/common/virtualbox.sh", "scripts/common/vmware.sh", @@ -183,4 +182,3 @@ "version": "2.0.TIMESTAMP" } } - diff --git a/fedora-25-i386.json b/fedora-25-i386.json index 9d638fb16..305093150 100644 --- a/fedora-25-i386.json +++ b/fedora-25-i386.json @@ -141,7 +141,6 @@ "scripts/common/metadata.sh", "scripts/fedora/fix-slow-dns.sh", "scripts/fedora/build-tools.sh", - "scripts/fedora/yum.sh", "scripts/common/sshd.sh", "scripts/common/virtualbox.sh", "scripts/common/vmware.sh", @@ -177,4 +176,3 @@ "version": "2.0.TIMESTAMP" } } - diff --git a/fedora-25-x86_64.json b/fedora-25-x86_64.json index 3426e80a3..88c728f0a 100644 --- a/fedora-25-x86_64.json +++ b/fedora-25-x86_64.json @@ -147,7 +147,6 @@ "scripts/common/metadata.sh", "scripts/fedora/fix-slow-dns.sh", "scripts/fedora/build-tools.sh", - "scripts/fedora/yum.sh", "scripts/common/sshd.sh", "scripts/common/virtualbox.sh", "scripts/common/vmware.sh", @@ -183,4 +182,3 @@ "version": "2.0.TIMESTAMP" } } - diff --git a/scripts/fedora/cleanup.sh b/scripts/fedora/cleanup.sh index 2ff553191..d789a01ec 100644 --- a/scripts/fedora/cleanup.sh +++ b/scripts/fedora/cleanup.sh @@ -1,5 +1,15 @@ #!/bin/bash -eux -dnf -y remove gcc cpp kernel-devel kernel-headers -dnf -y clean all +echo "Removing development packages and cleaning up DNF data" +dnf -y remove gcc cpp gc kernel-devel kernel-headers glibc-devel glibc-headers kernel-devel kernel-headers make perl +dnf -y autoremove +dnf -y clean all --enablerepo=\* + +# Avoid 32 meg firmware package we don't need +echo "Removing extra packages" +dnf -y remove linux-firmware + rm -rf VBoxGuestAdditions_*.iso VBoxGuestAdditions_*.iso.? rm -f /tmp/chef*rpm + +# delete any logs that have built up during the install +find /var/log/ -name *.log -exec rm -f {} \; diff --git a/scripts/fedora/yum.sh b/scripts/fedora/yum.sh deleted file mode 100644 index c28f7556b..000000000 --- a/scripts/fedora/yum.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash -eux -# Installing yum for compatibility, especially for chef/kitchen tests -# https://github.com/chef/chef/issues/5492 -dnf -y install yum From 2151c9539937a9781af33478bdbcf02712d389a1 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith@chef.io> Date: Fri, 17 Mar 2017 12:27:14 -0700 Subject: [PATCH 0599/1622] Fix the tables in the reamde --- README.md | 62 +++++++++++++++++++++++++++---------------------------- 1 file changed, 31 insertions(+), 31 deletions(-) diff --git a/README.md b/README.md index ebdf2eb30..fd80acc41 100644 --- a/README.md +++ b/README.md @@ -10,40 +10,40 @@ The following boxes are built from this repository's templates for publicly avai ### 64 bit - | VirtualBox | VMware | Parallels ------------------- | ------------------------------ | --------------------------------- | ----------------------------- -centos-5.11 | [x86_64][centos_511_64_vbox] | [x86_64][centos_511_64_vmware] | [x86_64][centos_511_64_prl] -centos-6.8 | [x86_64][centos_68_64_vbox] | [x86_64][centos_68_64_vmware] | [x86_64][centos_68_64_prl] -centos-7.3 | [x86_64][centos_73_64_vbox] | [x86_64][centos_73_64_vmware] | [x86_64][centos_73_64_prl] -debian-7.11 | [amd64][debian_711_64_vbox] | [amd64][debian_711_64_vmware] | [amd64][debian_711_64_prl] -debian-8.6 | [amd64][debian_86_64_vbox] | [amd64][debian_86_64_vmware] | [amd64][debian_86_64_prl] -fedora-24 | [x86_64][fedora_24_64_vbox] | [x86_64][fedora_24_64_vmware] | [x86_64][fedora_24_64_prl] -fedora-25 | [x86_64][fedora_25_64_vbox] | [x86_64][fedora_25_64_vmware] | [x86_64][fedora_25_64_prl] -freebsd-10.3 | [amd64][freebsd_103_64_vbox] | [amd64][freebsd_103_64_vmware] | [amd64][freebsd_103_64_prl] -freebsd-11.0 | [amd64][freebsd_110_64_vbox] | [amd64][freebsd_110_64_vmware] | [amd64][freebsd_110_64_prl] -opensuse-leap-42.2 | ~~[x86_64][leap_422_64_vbox]~~ | [x86_64][leap_422_64_vmware] | ~~[x86_64][leap_422_64_prl]~~ -oracle-5.11 | [x86_64][oracle_511_64_vbox] | [x86_64][oracle_511_64_vmware] | [x86_64][oracle_511_64_prl] -oracle-6.8 | [x86_64][oracle_68_64_vbox] | [x86_64][oracle_68_64_vmware] | [x86_64][oracle_68_64_prl] -oracle-7.3 | [x86_64][oracle_73_64_vbox] | [x86_64][oracle_73_64_vmware] | [x86_64][oracle_73_64_prl] -ubuntu-12.04 | [amd64][ubuntu_1204_64_vbox] | [amd64][ubuntu_1204_64_vmware] | [amd64][ubuntu_1204_64_prl] -ubuntu-14.04 | [amd64][ubuntu_1404_64_vbox] | [amd64][ubuntu_1404_64_vmware] | [amd64][ubuntu_1404_64_prl] -ubuntu-16.04 | [amd64][ubuntu_1604_64_vbox] | [amd64][ubuntu_1604_64_vmware] | [amd64][ubuntu_1604_64_prl] -ubuntu-16.10 | [amd64][ubuntu_1610_64_vbox] | [amd64][ubuntu_1610_64_vmware] | [amd64][ubuntu_1610_64_prl] +| | VirtualBox | VMware | Parallels | +|------------------- | ------------------------------ | --------------------------------- | ------------------------------| +| centos-5.11 | [x86_64][centos_511_64_vbox] | [x86_64][centos_511_64_vmware] | [x86_64][centos_511_64_prl] | +| centos-6.8 | [x86_64][centos_68_64_vbox] | [x86_64][centos_68_64_vmware] | [x86_64][centos_68_64_prl] | +| centos-7.3 | [x86_64][centos_73_64_vbox] | [x86_64][centos_73_64_vmware] | [x86_64][centos_73_64_prl] | +| debian-7.11 | [amd64][debian_711_64_vbox] | [amd64][debian_711_64_vmware] | [amd64][debian_711_64_prl] | +| debian-8.6 | [amd64][debian_86_64_vbox] | [amd64][debian_86_64_vmware] | [amd64][debian_86_64_prl] | +| fedora-24 | [x86_64][fedora_24_64_vbox] | [x86_64][fedora_24_64_vmware] | [x86_64][fedora_24_64_prl] | +| fedora-25 | [x86_64][fedora_25_64_vbox] | [x86_64][fedora_25_64_vmware] | [x86_64][fedora_25_64_prl] | +| freebsd-10.3 | [amd64][freebsd_103_64_vbox] | [amd64][freebsd_103_64_vmware] | [amd64][freebsd_103_64_prl] | +| freebsd-11.0 | [amd64][freebsd_110_64_vbox] | [amd64][freebsd_110_64_vmware] | [amd64][freebsd_110_64_prl] | +| opensuse-leap-42.2 | ~~[x86_64][leap_422_64_vbox]~~ | [x86_64][leap_422_64_vmware] | ~~[x86_64][leap_422_64_prl]~~ | +| oracle-5.11 | [x86_64][oracle_511_64_vbox] | [x86_64][oracle_511_64_vmware] | [x86_64][oracle_511_64_prl] | +| oracle-6.8 | [x86_64][oracle_68_64_vbox] | [x86_64][oracle_68_64_vmware] | [x86_64][oracle_68_64_prl] | +| oracle-7.3 | [x86_64][oracle_73_64_vbox] | [x86_64][oracle_73_64_vmware] | [x86_64][oracle_73_64_prl] | +| ubuntu-12.04 | [amd64][ubuntu_1204_64_vbox] | [amd64][ubuntu_1204_64_vmware] | [amd64][ubuntu_1204_64_prl] | +| ubuntu-14.04 | [amd64][ubuntu_1404_64_vbox] | [amd64][ubuntu_1404_64_vmware] | [amd64][ubuntu_1404_64_prl] | +| ubuntu-16.04 | [amd64][ubuntu_1604_64_vbox] | [amd64][ubuntu_1604_64_vmware] | [amd64][ubuntu_1604_64_prl] | +| ubuntu-16.10 | [amd64][ubuntu_1610_64_vbox] | [amd64][ubuntu_1610_64_vmware] | [amd64][ubuntu_1610_64_prl] | ### 32 bit - | VirtualBox | VMware | Parallels -------------- | ---------------------------- | ------------------------------- | --------------------------- -centos-5.11 | [i386][centos_511_32_vbox] | [i386][centos_511_32_vmware] | [i386][centos_511_32_prl] -centos-6.8 | [i386][centos_68_32_vbox] | [i386][centos_68_32_vmware] | [i386][centos_68_32_prl] -debian-7.11 | [i386][debian_711_32_vbox] | [i386][debian_711_32_vmware] | [i386][debian_711_32_prl] -debian-8.6 | [i386][debian_86_32_vbox] | [i386][debian_86_32_vmware] | [i386][debian_86_32_prl] -oracle-5.11 | [x86_64][oracle_511_32_vbox] | [x86_64][oracle_511_32_vmware] | [x86_64][oracle_511_32_prl] -oracle-6.8 | [x86_64][oracle_68_32_vbox] | [x86_64][oracle_68_32_vmware] | [x86_64][oracle_68_32_prl] -ubuntu-12.04 | [i386][ubuntu_1204_32_vbox] | [i386][ubuntu_1204_32_vmware] | [i386][ubuntu_1204_32_prl] -ubuntu-14.04 | [i386][ubuntu_1404_32_vbox] | [i386][ubuntu_1404_32_vmware] | [i386][ubuntu_1404_32_prl] -ubuntu-16.04 | [i386][ubuntu_1604_32_vbox] | [i386][ubuntu_1604_32_vmware] | [i386][ubuntu_1604_32_prl] -ubuntu-16.10 | [i386][ubuntu_1610_32_vbox] | [i386][ubuntu_1610_32_vmware] | [i386][ubuntu_1610_32_prl] +| | VirtualBox | VMware | Parallels | +|-------------- | ---------------------------- | ------------------------------- | ----------------------------| +| centos-5.11 | [i386][centos_511_32_vbox] | [i386][centos_511_32_vmware] | [i386][centos_511_32_prl] | +| centos-6.8 | [i386][centos_68_32_vbox] | [i386][centos_68_32_vmware] | [i386][centos_68_32_prl] | +| debian-7.11 | [i386][debian_711_32_vbox] | [i386][debian_711_32_vmware] | [i386][debian_711_32_prl] | +| debian-8.6 | [i386][debian_86_32_vbox] | [i386][debian_86_32_vmware] | [i386][debian_86_32_prl] | +| oracle-5.11 | [x86_64][oracle_511_32_vbox] | [x86_64][oracle_511_32_vmware] | [x86_64][oracle_511_32_prl] | +| oracle-6.8 | [x86_64][oracle_68_32_vbox] | [x86_64][oracle_68_32_vmware] | [x86_64][oracle_68_32_prl] | +| ubuntu-12.04 | [i386][ubuntu_1204_32_vbox] | [i386][ubuntu_1204_32_vmware] | [i386][ubuntu_1204_32_prl] | +| ubuntu-14.04 | [i386][ubuntu_1404_32_vbox] | [i386][ubuntu_1404_32_vmware] | [i386][ubuntu_1404_32_prl] | +| ubuntu-16.04 | [i386][ubuntu_1604_32_vbox] | [i386][ubuntu_1604_32_vmware] | [i386][ubuntu_1604_32_prl] | +| ubuntu-16.10 | [i386][ubuntu_1610_32_vbox] | [i386][ubuntu_1610_32_vmware] | [i386][ubuntu_1610_32_prl] | _NOTE_ This table tracks only the latest release for a given version. Boxes may exist in Atlas or S3 but are not guaranteed to be updated at this time. From c52465ea465c302c5a85953b3ebb1a837a3a4672 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith@chef.io> Date: Fri, 17 Mar 2017 12:30:11 -0700 Subject: [PATCH 0600/1622] Make sure we cleanup old logs Signed-off-by: Tim Smith <tsmith@chef.io> --- scripts/centos/cleanup.sh | 5 ++++- scripts/debian/cleanup.sh | 3 +++ scripts/opensuse/cleanup.sh | 3 +++ scripts/sles/cleanup.sh | 3 +++ 4 files changed, 13 insertions(+), 1 deletion(-) diff --git a/scripts/centos/cleanup.sh b/scripts/centos/cleanup.sh index acd404456..62d7d735b 100644 --- a/scripts/centos/cleanup.sh +++ b/scripts/centos/cleanup.sh @@ -1,7 +1,7 @@ #!/bin/sh -eux # should output one of 'redhat' 'centos' 'oraclelinux' -distro="`rpm -qf --queryformat '%{NAME}' /etc/redhat-release | cut -f 1 -d '-'`" +distro="`rpm -qf --queryformat '%{NAME}' /etc/redhat-release | cut -f 1 -d '-'`" # Remove development and kernel source packages yum -y remove gcc cpp kernel-devel kernel-headers; @@ -56,3 +56,6 @@ _EOF_ fi rm -f VBoxGuestAdditions_*.iso VBoxGuestAdditions_*.iso.?; + +# delete any logs that have built up during the install +find /var/log/ -name *.log -exec rm -f {} \; diff --git a/scripts/debian/cleanup.sh b/scripts/debian/cleanup.sh index 6ec0c7c0a..004965bc2 100644 --- a/scripts/debian/cleanup.sh +++ b/scripts/debian/cleanup.sh @@ -40,3 +40,6 @@ apt-get -y autoremove; apt-get -y clean; rm -f VBoxGuestAdditions_*.iso VBoxGuestAdditions_*.iso.? + +# delete any logs that have built up during the install +find /var/log/ -name *.log -exec rm -f {} \; diff --git a/scripts/opensuse/cleanup.sh b/scripts/opensuse/cleanup.sh index 1e412afb8..62f779c89 100644 --- a/scripts/opensuse/cleanup.sh +++ b/scripts/opensuse/cleanup.sh @@ -2,3 +2,6 @@ # These were only needed for building VMware/Virtualbox extensions: zypper -n rm -u gcc make kernel-default-devel kernel-devel + +# delete any logs that have built up during the install +find /var/log/ -name *.log -exec rm -f {} \; diff --git a/scripts/sles/cleanup.sh b/scripts/sles/cleanup.sh index 9bc9f828c..bee519b9c 100644 --- a/scripts/sles/cleanup.sh +++ b/scripts/sles/cleanup.sh @@ -4,3 +4,6 @@ zypper --non-interactive rm --clean-deps gcc kernel-default-devel zypper clean rm -rf VBoxGuestAdditions_*.iso VBoxGuestAdditions_*.iso.? rm -f /tmp/chef*rpm + +# delete any logs that have built up during the install +find /var/log/ -name *.log -exec rm -f {} \; From 4991607f0691aba27a779875bfc73afc81af0b02 Mon Sep 17 00:00:00 2001 From: Seth Thomas <cheeseplus@chef.io> Date: Thu, 23 Mar 2017 10:30:18 -0400 Subject: [PATCH 0601/1622] Don't need the hack after Fusion 8.5.5 (#779) Signed-off-by: Seth Thomas <sthomas@chef.io> --- centos-7.3-x86_64.json | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/centos-7.3-x86_64.json b/centos-7.3-x86_64.json index e77da56d1..d2725be9f 100644 --- a/centos-7.3-x86_64.json +++ b/centos-7.3-x86_64.json @@ -134,14 +134,6 @@ "source": "{{user `metadata`}}", "type": "file" }, - { - "destination": "/tmp/VMwareTools-10.1.0-4449150.tar.gz", - "only": [ - "vmware-iso" - ], - "source": "VMwareTools-10.1.0-4449150.tar.gz", - "type": "file" - }, { "environment_vars": [ "HOME_DIR=/home/vagrant", @@ -156,7 +148,7 @@ "scripts/centos/networking.sh", "scripts/common/vagrant.sh", "scripts/common/virtualbox.sh", - "scripts/centos/vmware.sh", + "scripts/common/vmware.sh", "scripts/common/parallels.sh", "scripts/centos/cleanup.sh", "scripts/common/minimize.sh" @@ -187,4 +179,3 @@ "version": "2.1.TIMESTAMP" } } - From 2dd7bba6312ec3ca0fe694e127bd45b430ae8461 Mon Sep 17 00:00:00 2001 From: Seth Thomas <cheeseplus@chef.io> Date: Thu, 23 Mar 2017 11:00:18 -0400 Subject: [PATCH 0602/1622] Release 2.3.4 (#780) * Release 2.3.4 Signed-off-by: Seth Thomas <sthomas@chef.io> * Typo fix Signed-off-by: Seth Thomas <sthomas@chef.io> --- CHANGELOG.md | 9 +++ README.md | 188 +++++++++++++++++++++++++-------------------------- builds.yml | 15 +--- 3 files changed, 105 insertions(+), 107 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index fc149c65c..9ef9c707c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,13 @@ # Change Log +## [2.3.4](https://github.com/chef/bento/tree/2.3.4) (2017-03-23) + +- Mostly rebuilt for updated hypervisors: VirtualBox 5.1.18 and VMware Fusion 8.5.5 +- Better cleanup for Fedora boxes + +## [2.3.3](https://github.com/chef/bento/tree/2.3.3) (2017-02-19) + +**Added and Updated Platforms** +- Debian 8.7 ## [2.3.2](https://github.com/chef/bento/tree/2.3.2) (2016-12-19) [Full Changelog](https://github.com/chef/bento/compare/2.3.1...2.3.2) diff --git a/README.md b/README.md index fd80acc41..ab6171fd4 100644 --- a/README.md +++ b/README.md @@ -16,12 +16,12 @@ The following boxes are built from this repository's templates for publicly avai | centos-6.8 | [x86_64][centos_68_64_vbox] | [x86_64][centos_68_64_vmware] | [x86_64][centos_68_64_prl] | | centos-7.3 | [x86_64][centos_73_64_vbox] | [x86_64][centos_73_64_vmware] | [x86_64][centos_73_64_prl] | | debian-7.11 | [amd64][debian_711_64_vbox] | [amd64][debian_711_64_vmware] | [amd64][debian_711_64_prl] | -| debian-8.6 | [amd64][debian_86_64_vbox] | [amd64][debian_86_64_vmware] | [amd64][debian_86_64_prl] | -| fedora-24 | [x86_64][fedora_24_64_vbox] | [x86_64][fedora_24_64_vmware] | [x86_64][fedora_24_64_prl] | +| debian-8.7 | [amd64][debian_87_64_vbox] | ~~[amd64][debian_87_64_vmware]~~ | [amd64][debian_87_64_prl] | +| fedora-24 | [x86_64][fedora_24_64_vbox] | [x86_64][fedora_24_64_vmware] | ~~[x86_64][fedora_24_64_prl]~~| | fedora-25 | [x86_64][fedora_25_64_vbox] | [x86_64][fedora_25_64_vmware] | [x86_64][fedora_25_64_prl] | -| freebsd-10.3 | [amd64][freebsd_103_64_vbox] | [amd64][freebsd_103_64_vmware] | [amd64][freebsd_103_64_prl] | +| freebsd-10.3 | [amd64][freebsd_103_64_vbox] | ~~[amd64][freebsd_103_64_vmware]~~ | [amd64][freebsd_103_64_prl] | | freebsd-11.0 | [amd64][freebsd_110_64_vbox] | [amd64][freebsd_110_64_vmware] | [amd64][freebsd_110_64_prl] | -| opensuse-leap-42.2 | ~~[x86_64][leap_422_64_vbox]~~ | [x86_64][leap_422_64_vmware] | ~~[x86_64][leap_422_64_prl]~~ | +| opensuse-leap-42.2 | [x86_64][leap_422_64_vbox] | ~~[x86_64][leap_422_64_vmware]~~ | ~~[x86_64][leap_422_64_prl]~~ | | oracle-5.11 | [x86_64][oracle_511_64_vbox] | [x86_64][oracle_511_64_vmware] | [x86_64][oracle_511_64_prl] | | oracle-6.8 | [x86_64][oracle_68_64_vbox] | [x86_64][oracle_68_64_vmware] | [x86_64][oracle_68_64_prl] | | oracle-7.3 | [x86_64][oracle_73_64_vbox] | [x86_64][oracle_73_64_vmware] | [x86_64][oracle_73_64_prl] | @@ -37,12 +37,12 @@ The following boxes are built from this repository's templates for publicly avai | centos-5.11 | [i386][centos_511_32_vbox] | [i386][centos_511_32_vmware] | [i386][centos_511_32_prl] | | centos-6.8 | [i386][centos_68_32_vbox] | [i386][centos_68_32_vmware] | [i386][centos_68_32_prl] | | debian-7.11 | [i386][debian_711_32_vbox] | [i386][debian_711_32_vmware] | [i386][debian_711_32_prl] | -| debian-8.6 | [i386][debian_86_32_vbox] | [i386][debian_86_32_vmware] | [i386][debian_86_32_prl] | +| debian-8.7 | [i386][debian_87_32_vbox] | ~~[i386][debian_87_32_vmware]~~ | [i386][debian_87_32_prl] | | oracle-5.11 | [x86_64][oracle_511_32_vbox] | [x86_64][oracle_511_32_vmware] | [x86_64][oracle_511_32_prl] | | oracle-6.8 | [x86_64][oracle_68_32_vbox] | [x86_64][oracle_68_32_vmware] | [x86_64][oracle_68_32_prl] | | ubuntu-12.04 | [i386][ubuntu_1204_32_vbox] | [i386][ubuntu_1204_32_vmware] | [i386][ubuntu_1204_32_prl] | | ubuntu-14.04 | [i386][ubuntu_1404_32_vbox] | [i386][ubuntu_1404_32_vmware] | [i386][ubuntu_1404_32_prl] | -| ubuntu-16.04 | [i386][ubuntu_1604_32_vbox] | [i386][ubuntu_1604_32_vmware] | [i386][ubuntu_1604_32_prl] | +| ubuntu-16.04 | [i386][ubuntu_1604_32_vbox] | [i386][ubuntu_1604_32_vmware] | ~~[i386][ubuntu_1604_32_prl]~~ | | ubuntu-16.10 | [i386][ubuntu_1610_32_vbox] | [i386][ubuntu_1610_32_vmware] | [i386][ubuntu_1610_32_prl] | _NOTE_ This table tracks only the latest release for a given version. Boxes may exist in Atlas or S3 but are not guaranteed to be updated at this time. @@ -70,14 +70,14 @@ The contents of this Github repository represent the current state of Bento and Adding a bento box to vagrant: ``` -$ vagrant box add bento/debian-8.6 +$ vagrant box add bento/debian-8.7 ``` Using a bento box in a Vagrantfile: ``` Vagrant.configure("2") do |config| - config.vm.box = "bento/debian-8.6" + config.vm.box = "bento/debian-8.7" end ``` @@ -99,13 +99,13 @@ If you use Bundler, you can add run `bundle install` from the bento repo. Prefix To build multiple templates for all providers (VirtualBox, Fusion, Parallels, etc): ``` -$ bento build debian-8.6-amd64 debian-8.6-i386 +$ bento build debian-8.7-amd64 debian-8.7-i386 ``` To build a box for a single provider: ``` -$ bento build --only=virtualbox-iso debian-8.6-amd64 +$ bento build --only=virtualbox-iso debian-8.7-amd64 ``` ### Using `packer` @@ -115,32 +115,32 @@ Templates can still be built directly by `packer` To build a template for all providers (VirtualBox, Fusion, Parallels): ``` -$ packer build debian-8.6-amd64.json +$ packer build debian-8.7-amd64.json ``` To build a template only for a list of specific providers: ``` -$ packer build -only=virtualbox-iso debian-8.6-amd64.json +$ packer build -only=virtualbox-iso debian-8.7-amd64.json ``` To build a template for all providers except a list of specific providers: ``` -$ packer build -except=parallels-iso,vmware-iso debian-8.6-amd64.json +$ packer build -except=parallels-iso,vmware-iso debian-8.7-amd64.json ``` If you want to use a another mirror site, use the `mirror` user variable. ``` -$ packer build -var 'mirror=http://ftp.jaist.ac.jp/pub/Linux/debian-cdimage/release' debian-8.6-amd64.json +$ packer build -var 'mirror=http://ftp.jaist.ac.jp/pub/Linux/debian-cdimage/release' debian-8.7-amd64.json ``` Congratulations! You now have box(es) in the ../builds directory that you can then add to Vagrant and start testing cookbooks. Notes: -- The box_basename can be overridden like other Packer vars with `-var 'box_basename=debian-8.6'` +- The box_basename can be overridden like other Packer vars with `-var 'box_basename=debian-8.7'` ### Proprietary Boxes @@ -217,86 +217,86 @@ See the License for the specific language governing permissions and limitations under the License. ``` -[centos_511_32_prl]: https://atlas.hashicorp.com/bento/boxes/centos-5.11-i386/versions/2.3.1/providers/parallels.box -[centos_511_32_vbox]: https://atlas.hashicorp.com/bento/boxes/centos-5.11-i386/versions/2.3.1/providers/virtualbox.box -[centos_511_32_vmware]: https://atlas.hashicorp.com/bento/boxes/centos-5.11-i386/versions/2.3.1/providers/vmware_desktop.box -[centos_511_64_prl]: https://atlas.hashicorp.com/bento/boxes/centos-5.11/versions/2.3.1/providers/parallels.box -[centos_511_64_vbox]: https://atlas.hashicorp.com/bento/boxes/centos-5.11/versions/2.3.1/providers/virtualbox.box -[centos_511_64_vmware]: https://atlas.hashicorp.com/bento/boxes/centos-5.11/versions/2.3.1/providers/vmware_desktop.box -[centos_68_32_prl]: https://atlas.hashicorp.com/bento/boxes/centos-6.8-i386/versions/2.3.1/providers/parallels.box -[centos_68_32_vbox]: https://atlas.hashicorp.com/bento/boxes/centos-6.8-i386/versions/2.3.1/providers/virtualbox.box -[centos_68_32_vmware]: https://atlas.hashicorp.com/bento/boxes/centos-6.8-i386/versions/2.3.1/providers/vmware_desktop.box -[centos_68_64_prl]: https://atlas.hashicorp.com/bento/boxes/centos-6.8/versions/2.3.1/providers/parallels.box -[centos_68_64_vbox]: https://atlas.hashicorp.com/bento/boxes/centos-6.8/versions/2.3.1/providers/virtualbox.box -[centos_68_64_vmware]: https://atlas.hashicorp.com/bento/boxes/centos-6.8/versions/2.3.1/providers/vmware_desktop.box +[centos_511_32_prl]: https://atlas.hashicorp.com/bento/boxes/centos-5.11-i386/versions/2.3.4/providers/parallels.box +[centos_511_32_vbox]: https://atlas.hashicorp.com/bento/boxes/centos-5.11-i386/versions/2.3.4/providers/virtualbox.box +[centos_511_32_vmware]: https://atlas.hashicorp.com/bento/boxes/centos-5.11-i386/versions/2.3.4/providers/vmware_desktop.box +[centos_511_64_prl]: https://atlas.hashicorp.com/bento/boxes/centos-5.11/versions/2.3.4/providers/parallels.box +[centos_511_64_vbox]: https://atlas.hashicorp.com/bento/boxes/centos-5.11/versions/2.3.4/providers/virtualbox.box +[centos_511_64_vmware]: https://atlas.hashicorp.com/bento/boxes/centos-5.11/versions/2.3.4/providers/vmware_desktop.box +[centos_68_32_prl]: https://atlas.hashicorp.com/bento/boxes/centos-6.8-i386/versions/2.3.4/providers/parallels.box +[centos_68_32_vbox]: https://atlas.hashicorp.com/bento/boxes/centos-6.8-i386/versions/2.3.4/providers/virtualbox.box +[centos_68_32_vmware]: https://atlas.hashicorp.com/bento/boxes/centos-6.8-i386/versions/2.3.4/providers/vmware_desktop.box +[centos_68_64_prl]: https://atlas.hashicorp.com/bento/boxes/centos-6.8/versions/2.3.4/providers/parallels.box +[centos_68_64_vbox]: https://atlas.hashicorp.com/bento/boxes/centos-6.8/versions/2.3.4/providers/virtualbox.box +[centos_68_64_vmware]: https://atlas.hashicorp.com/bento/boxes/centos-6.8/versions/2.3.4/providers/vmware_desktop.box [centos_73_64_prl]: https://atlas.hashicorp.com/bento/boxes/centos-7.3/versions/2.3.2/providers/parallels.box [centos_73_64_vbox]: https://atlas.hashicorp.com/bento/boxes/centos-7.3/versions/2.3.2/providers/virtualbox.box [centos_73_64_vmware]: https://atlas.hashicorp.com/bento/boxes/centos-7.3/versions/2.3.2/providers/vmware_desktop.box -[debian_711_32_prl]: https://atlas.hashicorp.com/bento/boxes/debian-7.11-i386/versions/2.3.1/providers/parallels.box -[debian_711_32_vbox]: https://atlas.hashicorp.com/bento/boxes/debian-7.11-i386/versions/2.3.1/providers/virtualbox.box -[debian_711_32_vmware]: https://atlas.hashicorp.com/bento/boxes/debian-7.11-i386/versions/2.3.1/providers/vmware_desktop.box -[debian_711_64_prl]: https://atlas.hashicorp.com/bento/boxes/debian-7.11/versions/2.3.1/providers/parallels.box -[debian_711_64_vbox]: https://atlas.hashicorp.com/bento/boxes/debian-7.11/versions/2.3.1/providers/virtualbox.box -[debian_711_64_vmware]: https://atlas.hashicorp.com/bento/boxes/debian-7.11/versions/2.3.1/providers/vmware_desktop.box -[debian_86_32_prl]: https://atlas.hashicorp.com/bento/boxes/debian-8.6-i386/versions/2.3.1/providers/parallels.box -[debian_86_32_vbox]: https://atlas.hashicorp.com/bento/boxes/debian-8.6-i386/versions/2.3.1/providers/virtualbox.box -[debian_86_32_vmware]: https://atlas.hashicorp.com/bento/boxes/debian-8.6-i386/versions/2.3.1/providers/vmware_desktop.box -[debian_86_64_prl]: https://atlas.hashicorp.com/bento/boxes/debian-8.6/versions/2.3.1/providers/parallels.box -[debian_86_64_vbox]: https://atlas.hashicorp.com/bento/boxes/debian-8.6/versions/2.3.1/providers/virtualbox.box -[debian_86_64_vmware]: https://atlas.hashicorp.com/bento/boxes/debian-8.6/versions/2.3.1/providers/vmware_desktop.box -[fedora_24_64_prl]: https://atlas.hashicorp.com/bento/boxes/fedora-24/versions/2.3.1/providers/parallels.box -[fedora_24_64_vbox]: https://atlas.hashicorp.com/bento/boxes/fedora-24/versions/2.3.1/providers/virtualbox.box -[fedora_24_64_vmware]: https://atlas.hashicorp.com/bento/boxes/fedora-24/versions/2.3.1/providers/vmware_desktop.box -[fedora_25_64_prl]: https://atlas.hashicorp.com/bento/boxes/fedora-25/versions/2.3.1/providers/parallels.box -[fedora_25_64_vbox]: https://atlas.hashicorp.com/bento/boxes/fedora-25/versions/2.3.1/providers/virtualbox.box -[fedora_25_64_vmware]: https://atlas.hashicorp.com/bento/boxes/fedora-25/versions/2.3.1/providers/vmware_desktop.box -[freebsd_103_64_prl]: https://atlas.hashicorp.com/bento/boxes/freebsd-10.3/versions/2.3.1/providers/parallels.box -[freebsd_103_64_vbox]: https://atlas.hashicorp.com/bento/boxes/freebsd-10.3/versions/2.3.1/providers/virtualbox.box -[freebsd_103_64_vmware]: https://atlas.hashicorp.com/bento/boxes/freebsd-10.3/versions/2.3.1/providers/vmware_desktop.box -[freebsd_110_64_prl]: https://atlas.hashicorp.com/bento/boxes/freebsd-11.0/versions/2.3.1/providers/parallels.box -[freebsd_110_64_vbox]: https://atlas.hashicorp.com/bento/boxes/freebsd-11.0/versions/2.3.1/providers/virtualbox.box -[freebsd_110_64_vmware]: https://atlas.hashicorp.com/bento/boxes/freebsd-11.0/versions/2.3.1/providers/vmware_desktop.box -[leap_422_64_prl]: https://atlas.hashicorp.com/bento/boxes/opensuse-leap-42.2/versions/2.3.1/providers/parallels.box -[leap_422_64_vbox]: https://atlas.hashicorp.com/bento/boxes/opensuse-leap-42.2/versions/2.3.1/providers/virtualbox.box -[leap_422_64_vmware]: https://atlas.hashicorp.com/bento/boxes/opensuse-leap-42.2/versions/2.3.1/providers/vmware_desktop.box -[omnios_r151018_64_vbox]: https://atlas.hashicorp.com/bento/boxes/omnios-r151018/versions/2.3.1/providers/virtualbox.box -[oracle_511_32_prl]: https://atlas.hashicorp.com/bento/boxes/oracle-5.11-i386/versions/2.3.1/providers/parallels.box -[oracle_511_32_vbox]: https://atlas.hashicorp.com/bento/boxes/oracle-5.11-i386/versions/2.3.1/providers/virtualbox.box -[oracle_511_32_vmware]: https://atlas.hashicorp.com/bento/boxes/oracle-5.11-i386/versions/2.3.1/providers/vmware_desktop.box -[oracle_511_64_prl]: https://atlas.hashicorp.com/bento/boxes/oracle-5.11/versions/2.3.1/providers/parallels.box -[oracle_511_64_vbox]: https://atlas.hashicorp.com/bento/boxes/oracle-5.11/versions/2.3.1/providers/virtualbox.box -[oracle_511_64_vmware]: https://atlas.hashicorp.com/bento/boxes/oracle-5.11/versions/2.3.1/providers/vmware_desktop.box -[oracle_68_32_prl]: https://atlas.hashicorp.com/bento/boxes/oracle-6.8-i386/versions/2.3.1/providers/parallels.box -[oracle_68_32_vbox]: https://atlas.hashicorp.com/bento/boxes/oracle-6.8-i386/versions/2.3.1/providers/virtualbox.box -[oracle_68_32_vmware]: https://atlas.hashicorp.com/bento/boxes/oracle-6.8-i386/versions/2.3.1/providers/vmware_desktop.box -[oracle_68_64_prl]: https://atlas.hashicorp.com/bento/boxes/oracle-6.8/versions/2.3.1/providers/parallels.box -[oracle_68_64_vbox]: https://atlas.hashicorp.com/bento/boxes/oracle-6.8/versions/2.3.1/providers/virtualbox.box -[oracle_68_64_vmware]: https://atlas.hashicorp.com/bento/boxes/oracle-6.8/versions/2.3.1/providers/vmware_desktop.box -[oracle_73_64_prl]: https://atlas.hashicorp.com/bento/boxes/oracle-7.3/versions/2.3.1/providers/parallels.box -[oracle_73_64_vbox]: https://atlas.hashicorp.com/bento/boxes/oracle-7.3/versions/2.3.1/providers/virtualbox.box -[oracle_73_64_vmware]: https://atlas.hashicorp.com/bento/boxes/oracle-7.3/versions/2.3.1/providers/vmware_desktop.box +[debian_711_32_prl]: https://atlas.hashicorp.com/bento/boxes/debian-7.11-i386/versions/2.3.4/providers/parallels.box +[debian_711_32_vbox]: https://atlas.hashicorp.com/bento/boxes/debian-7.11-i386/versions/2.3.4/providers/virtualbox.box +[debian_711_32_vmware]: https://atlas.hashicorp.com/bento/boxes/debian-7.11-i386/versions/2.3.4/providers/vmware_desktop.box +[debian_711_64_prl]: https://atlas.hashicorp.com/bento/boxes/debian-7.11/versions/2.3.4/providers/parallels.box +[debian_711_64_vbox]: https://atlas.hashicorp.com/bento/boxes/debian-7.11/versions/2.3.4/providers/virtualbox.box +[debian_711_64_vmware]: https://atlas.hashicorp.com/bento/boxes/debian-7.11/versions/2.3.4/providers/vmware_desktop.box +[debian_87_32_prl]: https://atlas.hashicorp.com/bento/boxes/debian-8.7-i386/versions/2.3.4/providers/parallels.box +[debian_87_32_vbox]: https://atlas.hashicorp.com/bento/boxes/debian-8.7-i386/versions/2.3.4/providers/virtualbox.box +[debian_87_32_vmware]: https://atlas.hashicorp.com/bento/boxes/debian-8.7-i386/versions/2.3.4/providers/vmware_desktop.box +[debian_87_64_prl]: https://atlas.hashicorp.com/bento/boxes/debian-8.7/versions/2.3.4/providers/parallels.box +[debian_87_64_vbox]: https://atlas.hashicorp.com/bento/boxes/debian-8.7/versions/2.3.4/providers/virtualbox.box +[debian_87_64_vmware]: https://atlas.hashicorp.com/bento/boxes/debian-8.7/versions/2.3.4/providers/vmware_desktop.box +[fedora_24_64_prl]: https://atlas.hashicorp.com/bento/boxes/fedora-24/versions/2.3.4/providers/parallels.box +[fedora_24_64_vbox]: https://atlas.hashicorp.com/bento/boxes/fedora-24/versions/2.3.4/providers/virtualbox.box +[fedora_24_64_vmware]: https://atlas.hashicorp.com/bento/boxes/fedora-24/versions/2.3.4/providers/vmware_desktop.box +[fedora_25_64_prl]: https://atlas.hashicorp.com/bento/boxes/fedora-25/versions/2.3.4/providers/parallels.box +[fedora_25_64_vbox]: https://atlas.hashicorp.com/bento/boxes/fedora-25/versions/2.3.4/providers/virtualbox.box +[fedora_25_64_vmware]: https://atlas.hashicorp.com/bento/boxes/fedora-25/versions/2.3.4/providers/vmware_desktop.box +[freebsd_103_64_prl]: https://atlas.hashicorp.com/bento/boxes/freebsd-10.3/versions/2.3.4/providers/parallels.box +[freebsd_103_64_vbox]: https://atlas.hashicorp.com/bento/boxes/freebsd-10.3/versions/2.3.4/providers/virtualbox.box +[freebsd_103_64_vmware]: https://atlas.hashicorp.com/bento/boxes/freebsd-10.3/versions/2.3.4/providers/vmware_desktop.box +[freebsd_110_64_prl]: https://atlas.hashicorp.com/bento/boxes/freebsd-11.0/versions/2.3.4/providers/parallels.box +[freebsd_110_64_vbox]: https://atlas.hashicorp.com/bento/boxes/freebsd-11.0/versions/2.3.4/providers/virtualbox.box +[freebsd_110_64_vmware]: https://atlas.hashicorp.com/bento/boxes/freebsd-11.0/versions/2.3.4/providers/vmware_desktop.box +[leap_422_64_prl]: https://atlas.hashicorp.com/bento/boxes/opensuse-leap-42.2/versions/2.3.4/providers/parallels.box +[leap_422_64_vbox]: https://atlas.hashicorp.com/bento/boxes/opensuse-leap-42.2/versions/2.3.4/providers/virtualbox.box +[leap_422_64_vmware]: https://atlas.hashicorp.com/bento/boxes/opensuse-leap-42.2/versions/2.3.4/providers/vmware_desktop.box +[omnios_r151018_64_vbox]: https://atlas.hashicorp.com/bento/boxes/omnios-r151018/versions/2.3.4/providers/virtualbox.box +[oracle_511_32_prl]: https://atlas.hashicorp.com/bento/boxes/oracle-5.11-i386/versions/2.3.4/providers/parallels.box +[oracle_511_32_vbox]: https://atlas.hashicorp.com/bento/boxes/oracle-5.11-i386/versions/2.3.4/providers/virtualbox.box +[oracle_511_32_vmware]: https://atlas.hashicorp.com/bento/boxes/oracle-5.11-i386/versions/2.3.4/providers/vmware_desktop.box +[oracle_511_64_prl]: https://atlas.hashicorp.com/bento/boxes/oracle-5.11/versions/2.3.4/providers/parallels.box +[oracle_511_64_vbox]: https://atlas.hashicorp.com/bento/boxes/oracle-5.11/versions/2.3.4/providers/virtualbox.box +[oracle_511_64_vmware]: https://atlas.hashicorp.com/bento/boxes/oracle-5.11/versions/2.3.4/providers/vmware_desktop.box +[oracle_68_32_prl]: https://atlas.hashicorp.com/bento/boxes/oracle-6.8-i386/versions/2.3.4/providers/parallels.box +[oracle_68_32_vbox]: https://atlas.hashicorp.com/bento/boxes/oracle-6.8-i386/versions/2.3.4/providers/virtualbox.box +[oracle_68_32_vmware]: https://atlas.hashicorp.com/bento/boxes/oracle-6.8-i386/versions/2.3.4/providers/vmware_desktop.box +[oracle_68_64_prl]: https://atlas.hashicorp.com/bento/boxes/oracle-6.8/versions/2.3.4/providers/parallels.box +[oracle_68_64_vbox]: https://atlas.hashicorp.com/bento/boxes/oracle-6.8/versions/2.3.4/providers/virtualbox.box +[oracle_68_64_vmware]: https://atlas.hashicorp.com/bento/boxes/oracle-6.8/versions/2.3.4/providers/vmware_desktop.box +[oracle_73_64_prl]: https://atlas.hashicorp.com/bento/boxes/oracle-7.3/versions/2.3.4/providers/parallels.box +[oracle_73_64_vbox]: https://atlas.hashicorp.com/bento/boxes/oracle-7.3/versions/2.3.4/providers/virtualbox.box +[oracle_73_64_vmware]: https://atlas.hashicorp.com/bento/boxes/oracle-7.3/versions/2.3.4/providers/vmware_desktop.box [travis]: https://travis-ci.org/chef/bento -[ubuntu_1204_32_prl]: https://atlas.hashicorp.com/bento/boxes/ubuntu-12.04-i386/versions/2.3.1/providers/parallels.box -[ubuntu_1204_32_vbox]: https://atlas.hashicorp.com/bento/boxes/ubuntu-12.04-i386/versions/2.3.1/providers/virtualbox.box -[ubuntu_1204_32_vmware]: https://atlas.hashicorp.com/bento/boxes/ubuntu-12.04-i386/versions/2.3.1/providers/vmware_desktop.box -[ubuntu_1204_64_prl]: https://atlas.hashicorp.com/bento/boxes/ubuntu-12.04/versions/2.3.1/providers/parallels.box -[ubuntu_1204_64_vbox]: https://atlas.hashicorp.com/bento/boxes/ubuntu-12.04/versions/2.3.1/providers/virtualbox.box -[ubuntu_1204_64_vmware]: https://atlas.hashicorp.com/bento/boxes/ubuntu-12.04/versions/2.3.1/providers/vmware_desktop.box -[ubuntu_1404_32_prl]: https://atlas.hashicorp.com/bento/boxes/ubuntu-14.04-i386/versions/2.3.1/providers/parallels.box -[ubuntu_1404_32_vbox]: https://atlas.hashicorp.com/bento/boxes/ubuntu-14.04-i386/versions/2.3.1/providers/virtualbox.box -[ubuntu_1404_32_vmware]: https://atlas.hashicorp.com/bento/boxes/ubuntu-14.04-i386/versions/2.3.1/providers/vmware_desktop.box -[ubuntu_1404_64_prl]: https://atlas.hashicorp.com/bento/boxes/ubuntu-14.04/versions/2.3.1/providers/parallels.box -[ubuntu_1404_64_vbox]: https://atlas.hashicorp.com/bento/boxes/ubuntu-14.04/versions/2.3.1/providers/virtualbox.box -[ubuntu_1404_64_vmware]: https://atlas.hashicorp.com/bento/boxes/ubuntu-14.04/versions/2.3.1/providers/vmware_desktop.box -[ubuntu_1604_32_prl]: https://atlas.hashicorp.com/bento/boxes/ubuntu-16.04-i386/versions/2.3.1/providers/parallels.box -[ubuntu_1604_32_vbox]: https://atlas.hashicorp.com/bento/boxes/ubuntu-16.04-i386/versions/2.3.1/providers/virtualbox.box -[ubuntu_1604_32_vmware]: https://atlas.hashicorp.com/bento/boxes/ubuntu-16.04-i386/versions/2.3.1/providers/vmware_desktop.box -[ubuntu_1604_64_prl]: https://atlas.hashicorp.com/bento/boxes/ubuntu-16.04/versions/2.3.1/providers/parallels.box -[ubuntu_1604_64_vbox]: https://atlas.hashicorp.com/bento/boxes/ubuntu-16.04/versions/2.3.1/providers/virtualbox.box -[ubuntu_1604_64_vmware]: https://atlas.hashicorp.com/bento/boxes/ubuntu-16.04/versions/2.3.1/providers/vmware_desktop.box -[ubuntu_1610_32_prl]: https://atlas.hashicorp.com/bento/boxes/ubuntu-16.10-i386/versions/2.3.1/providers/parallels.box -[ubuntu_1610_32_vbox]: https://atlas.hashicorp.com/bento/boxes/ubuntu-16.10-i386/versions/2.3.1/providers/virtualbox.box -[ubuntu_1610_32_vmware]: https://atlas.hashicorp.com/bento/boxes/ubuntu-16.10-i386/versions/2.3.1/providers/vmware_desktop.box -[ubuntu_1610_64_prl]: https://atlas.hashicorp.com/bento/boxes/ubuntu-16.10/versions/2.3.1/providers/parallels.box -[ubuntu_1610_64_vbox]: https://atlas.hashicorp.com/bento/boxes/ubuntu-16.10/versions/2.3.1/providers/virtualbox.box -[ubuntu_1610_64_vmware]: https://atlas.hashicorp.com/bento/boxes/ubuntu-16.10/versions/2.3.1/providers/vmware_desktop.box +[ubuntu_1204_32_prl]: https://atlas.hashicorp.com/bento/boxes/ubuntu-12.04-i386/versions/2.3.4/providers/parallels.box +[ubuntu_1204_32_vbox]: https://atlas.hashicorp.com/bento/boxes/ubuntu-12.04-i386/versions/2.3.4/providers/virtualbox.box +[ubuntu_1204_32_vmware]: https://atlas.hashicorp.com/bento/boxes/ubuntu-12.04-i386/versions/2.3.4/providers/vmware_desktop.box +[ubuntu_1204_64_prl]: https://atlas.hashicorp.com/bento/boxes/ubuntu-12.04/versions/2.3.4/providers/parallels.box +[ubuntu_1204_64_vbox]: https://atlas.hashicorp.com/bento/boxes/ubuntu-12.04/versions/2.3.4/providers/virtualbox.box +[ubuntu_1204_64_vmware]: https://atlas.hashicorp.com/bento/boxes/ubuntu-12.04/versions/2.3.4/providers/vmware_desktop.box +[ubuntu_1404_32_prl]: https://atlas.hashicorp.com/bento/boxes/ubuntu-14.04-i386/versions/2.3.4/providers/parallels.box +[ubuntu_1404_32_vbox]: https://atlas.hashicorp.com/bento/boxes/ubuntu-14.04-i386/versions/2.3.4/providers/virtualbox.box +[ubuntu_1404_32_vmware]: https://atlas.hashicorp.com/bento/boxes/ubuntu-14.04-i386/versions/2.3.4/providers/vmware_desktop.box +[ubuntu_1404_64_prl]: https://atlas.hashicorp.com/bento/boxes/ubuntu-14.04/versions/2.3.4/providers/parallels.box +[ubuntu_1404_64_vbox]: https://atlas.hashicorp.com/bento/boxes/ubuntu-14.04/versions/2.3.4/providers/virtualbox.box +[ubuntu_1404_64_vmware]: https://atlas.hashicorp.com/bento/boxes/ubuntu-14.04/versions/2.3.4/providers/vmware_desktop.box +[ubuntu_1604_32_prl]: https://atlas.hashicorp.com/bento/boxes/ubuntu-16.04-i386/versions/2.3.4/providers/parallels.box +[ubuntu_1604_32_vbox]: https://atlas.hashicorp.com/bento/boxes/ubuntu-16.04-i386/versions/2.3.4/providers/virtualbox.box +[ubuntu_1604_32_vmware]: https://atlas.hashicorp.com/bento/boxes/ubuntu-16.04-i386/versions/2.3.4/providers/vmware_desktop.box +[ubuntu_1604_64_prl]: https://atlas.hashicorp.com/bento/boxes/ubuntu-16.04/versions/2.3.4/providers/parallels.box +[ubuntu_1604_64_vbox]: https://atlas.hashicorp.com/bento/boxes/ubuntu-16.04/versions/2.3.4/providers/virtualbox.box +[ubuntu_1604_64_vmware]: https://atlas.hashicorp.com/bento/boxes/ubuntu-16.04/versions/2.3.4/providers/vmware_desktop.box +[ubuntu_1610_32_prl]: https://atlas.hashicorp.com/bento/boxes/ubuntu-16.10-i386/versions/2.3.4/providers/parallels.box +[ubuntu_1610_32_vbox]: https://atlas.hashicorp.com/bento/boxes/ubuntu-16.10-i386/versions/2.3.4/providers/virtualbox.box +[ubuntu_1610_32_vmware]: https://atlas.hashicorp.com/bento/boxes/ubuntu-16.10-i386/versions/2.3.4/providers/vmware_desktop.box +[ubuntu_1610_64_prl]: https://atlas.hashicorp.com/bento/boxes/ubuntu-16.10/versions/2.3.4/providers/parallels.box +[ubuntu_1610_64_vbox]: https://atlas.hashicorp.com/bento/boxes/ubuntu-16.10/versions/2.3.4/providers/virtualbox.box +[ubuntu_1610_64_vmware]: https://atlas.hashicorp.com/bento/boxes/ubuntu-16.10/versions/2.3.4/providers/vmware_desktop.box diff --git a/builds.yml b/builds.yml index 1b396a61e..174914c86 100644 --- a/builds.yml +++ b/builds.yml @@ -18,19 +18,15 @@ public: '7.11': - amd64 - i386 - '8.6': + '8.7': - amd64 - i386 fedora: - '23': - - x86_64 '24': - x86_64 '25': - x86_64 freebsd: - '9.3': - - amd64 '10.3': - amd64 '11.0': @@ -38,10 +34,6 @@ public: omnios: r151018: - amd64 - opensuse: - '13.2': - - x86_64 - - i386 opensuse-leap: '42.2': - x86_64 @@ -83,12 +75,9 @@ broken: - omnios-r151018-vmware-iso - omnios-r151018-parallels-iso - opensuse-leap-42.1-x86_64-parallels-iso - - opensuse-13.2-i386-vmware-iso - - opensuse-13.2-x86_64-vmware-iso - - centos-5.11-x86_64-virtualbox-iso - - centos-5.11-i386-virtualbox-iso no_shared_folder: + - freebsd-11.0-amd64-all - freebsd-10.3-amd64-all - freebsd-9.3-amd64-all - omnios-r151018-all From aa1774cd0bf4a268398b47b02ed626351ae0dfa2 Mon Sep 17 00:00:00 2001 From: "jsk.im" <jskim910118@gmail.com> Date: Wed, 29 Mar 2017 23:29:16 -0500 Subject: [PATCH 0603/1622] Fixing typo on box_basename for oracle linux 6.8 x86_64 Signed-off-by: JiSoo Kim <jskim910118@gmail.com> --- oracle-6.8-x86_64.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/oracle-6.8-x86_64.json b/oracle-6.8-x86_64.json index bbf065375..1e1d2eac1 100644 --- a/oracle-6.8-x86_64.json +++ b/oracle-6.8-x86_64.json @@ -158,7 +158,7 @@ ], "variables": { "arch": "64", - "box_basename": "oracle-6.7", + "box_basename": "oracle-6.8", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", "disk_size": "40960", From f071730328b2e6c252e060ca45df17a07bb8587d Mon Sep 17 00:00:00 2001 From: Fletcher Nichol <fnichol@nichol.ca> Date: Tue, 4 Apr 2017 14:44:14 +0200 Subject: [PATCH 0604/1622] [macos-10.12] Allow Packer to pick up memory user var. (#768) For some reason with Pack 0.12.3, the current `"memory"` user variable is not being picked up and a default value of `1024` is always being used, leading to macOS 10.12 not being able to finish its installation. For some reason, changing the user variable from `"memory"` to almost anything else (in this case, `"memsize"`) allows the user variable to be picked up. Note that this was observed with the `vmware-iso` builder and may be the only affected one. I verified this behavior by running: ``` env PACKER_LOG=1 bundle exec bento build --only=vmware-iso --debug macos-10.12 ``` Signed-off-by: Fletcher Nichol <fnichol@nichol.ca> --- macos-10.12.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/macos-10.12.json b/macos-10.12.json index 82d78143f..da4b0e8d5 100644 --- a/macos-10.12.json +++ b/macos-10.12.json @@ -26,7 +26,7 @@ "hpet0.present": "TRUE", "ich7m.present": "TRUE", "keyboardAndMouseProfile": "macProfile", - "memsize": "{{ user `memory` }}", + "memsize": "{{ user `memsize` }}", "numvcpus": "{{ user `cpus` }}", "smc.present": "TRUE", "usb.present": "TRUE" @@ -102,7 +102,7 @@ "modifyvm", "{{.Name}}", "--memory", - "{{ user `memory` }}" + "{{ user `memsize` }}" ], [ "modifyvm", @@ -167,7 +167,7 @@ "set", "{{.Name}}", "--memsize", - "{{ user `memory` }}" + "{{ user `memsize` }}" ], [ "set", @@ -239,7 +239,7 @@ "iso_checksum": "__unset_iso_checksum__", "iso_checksum_type": "md5", "iso_url": "http://YOU-MUST-PROVIDE-YOUR-OWN-DMG.sorry", - "memory": "2048", + "memsize": "2048", "metadata": "floppy/dummy_metadata.json", "name": "macos-10.12", "no_proxy": "{{env `no_proxy`}}", From d914f234cc9f9a3d23537969047a13b4a13a8a0a Mon Sep 17 00:00:00 2001 From: Ali Yahya <amyahya@gmail.com> Date: Sat, 15 Apr 2017 16:04:50 -0400 Subject: [PATCH 0605/1622] Add CentOS 6.9 boxes. Signed-off-by: Ali Yahya <amyahya@gmail.com> --- centos-6.9-i386.json | 182 +++++++++++++++++++++++++++++++++++++++++ centos-6.9-x86_64.json | 182 +++++++++++++++++++++++++++++++++++++++++ http/centos-6.9/ks.cfg | 69 ++++++++++++++++ 3 files changed, 433 insertions(+) create mode 100644 centos-6.9-i386.json create mode 100644 centos-6.9-x86_64.json create mode 100644 http/centos-6.9/ks.cfg diff --git a/centos-6.9-i386.json b/centos-6.9-i386.json new file mode 100644 index 000000000..a175ee948 --- /dev/null +++ b/centos-6.9-i386.json @@ -0,0 +1,182 @@ +{ + "builders": [ + { + "boot_command": [ + "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": "{{user `disk_size`}}", + "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "guest_os_type": "RedHat", + "hard_drive_interface": "sata", + "headless": "{{ user `headless` }}", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-virtualbox", + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "virtualbox-iso", + "vboxmanage": [ + [ + "modifyvm", + "{{.Name}}", + "--memory", + "{{ user `memory` }}" + ], + [ + "modifyvm", + "{{.Name}}", + "--cpus", + "{{ user `cpus` }}" + ] + ], + "virtualbox_version_file": ".vbox_version", + "vm_name": "{{ user `template` }}" + }, + { + "boot_command": [ + "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": "{{user `disk_size`}}", + "guest_os_type": "centos", + "headless": "{{ user `headless` }}", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-vmware", + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "tools_upload_flavor": "linux", + "type": "vmware-iso", + "vm_name": "{{ user `template` }}", + "vmx_data": { + "cpuid.coresPerSocket": "1", + "memsize": "{{ user `memory` }}", + "numvcpus": "{{ user `cpus` }}" + } + }, + { + "boot_command": [ + "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": "{{user `disk_size`}}", + "guest_os_type": "centos", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-parallels", + "parallels_tools_flavor": "lin", + "prlctl": [ + [ + "set", + "{{.Name}}", + "--memsize", + "{{ user `memory` }}" + ], + [ + "set", + "{{.Name}}", + "--cpus", + "{{ user `cpus` }}" + ] + ], + "prlctl_version_file": ".prlctl_version", + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "parallels-iso", + "vm_name": "{{ user `template` }}" + }, + { + "boot_command": [ + "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": "{{user `disk_size`}}", + "headless": "{{ user `headless` }}", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-qemu", + "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "qemu", + "vm_name": "{{ user `template` }}" + } + ], + "post-processors": [ + { + "output": "builds/{{user `box_basename`}}.{{.Provider}}.box", + "type": "vagrant" + } + ], + "provisioners": [ + { + "destination": "/tmp/bento-metadata.json", + "source": "{{user `metadata`}}", + "type": "file" + }, + { + "environment_vars": [ + "HOME_DIR=/home/vagrant", + "http_proxy={{user `http_proxy`}}", + "https_proxy={{user `https_proxy`}}", + "no_proxy={{user `no_proxy`}}" + ], + "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", + "scripts": [ + "scripts/common/metadata.sh", + "scripts/common/sshd.sh", + "scripts/centos/networking.sh", + "scripts/common/vagrant.sh", + "scripts/common/virtualbox.sh", + "scripts/common/vmware.sh", + "scripts/common/parallels.sh", + "scripts/centos/cleanup.sh", + "scripts/common/minimize.sh" + ], + "type": "shell" + } + ], + "variables": { + "box_basename": "centos-6.9-i386", + "build_timestamp": "{{isotime \"20060102150405\"}}", + "cpus": "1", + "disk_size": "40960", + "git_revision": "__unknown_git_revision__", + "headless": "", + "http_proxy": "{{env `http_proxy`}}", + "https_proxy": "{{env `https_proxy`}}", + "iso_checksum": "720d185fdf063383a4471657076b72fc162d3c3c3bca2e5e5ae13a25b3046519", + "iso_checksum_type": "sha256", + "iso_name": "CentOS-6.9-i386-bin-DVD1.iso", + "ks_path": "centos-6.9/ks.cfg", + "memory": "512", + "metadata": "floppy/dummy_metadata.json", + "mirror": "http://mirrors.kernel.org/centos", + "mirror_directory": "6.9/isos/i386", + "name": "centos-6.9-i386", + "no_proxy": "{{env `no_proxy`}}", + "template": "centos-6.9-i386", + "version": "2.1.TIMESTAMP" + } +} + diff --git a/centos-6.9-x86_64.json b/centos-6.9-x86_64.json new file mode 100644 index 000000000..a62e13ae1 --- /dev/null +++ b/centos-6.9-x86_64.json @@ -0,0 +1,182 @@ +{ + "builders": [ + { + "boot_command": [ + "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": "{{user `disk_size`}}", + "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "guest_os_type": "RedHat_64", + "hard_drive_interface": "sata", + "headless": "{{ user `headless` }}", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-virtualbox", + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "virtualbox-iso", + "vboxmanage": [ + [ + "modifyvm", + "{{.Name}}", + "--memory", + "{{ user `memory` }}" + ], + [ + "modifyvm", + "{{.Name}}", + "--cpus", + "{{ user `cpus` }}" + ] + ], + "virtualbox_version_file": ".vbox_version", + "vm_name": "{{ user `template` }}" + }, + { + "boot_command": [ + "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": "{{user `disk_size`}}", + "guest_os_type": "centos-64", + "headless": "{{ user `headless` }}", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-vmware", + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "tools_upload_flavor": "linux", + "type": "vmware-iso", + "vm_name": "{{ user `template` }}", + "vmx_data": { + "cpuid.coresPerSocket": "1", + "memsize": "{{ user `memory` }}", + "numvcpus": "{{ user `cpus` }}" + } + }, + { + "boot_command": [ + "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": "{{user `disk_size`}}", + "guest_os_type": "centos", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-parallels", + "parallels_tools_flavor": "lin", + "prlctl": [ + [ + "set", + "{{.Name}}", + "--memsize", + "{{ user `memory` }}" + ], + [ + "set", + "{{.Name}}", + "--cpus", + "{{ user `cpus` }}" + ] + ], + "prlctl_version_file": ".prlctl_version", + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "parallels-iso", + "vm_name": "{{ user `template` }}" + }, + { + "boot_command": [ + "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": "{{user `disk_size`}}", + "headless": "{{ user `headless` }}", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-qemu", + "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "qemu", + "vm_name": "{{ user `template` }}" + } + ], + "post-processors": [ + { + "output": "builds/{{user `box_basename`}}.{{.Provider}}.box", + "type": "vagrant" + } + ], + "provisioners": [ + { + "destination": "/tmp/bento-metadata.json", + "source": "{{user `metadata`}}", + "type": "file" + }, + { + "environment_vars": [ + "HOME_DIR=/home/vagrant", + "http_proxy={{user `http_proxy`}}", + "https_proxy={{user `https_proxy`}}", + "no_proxy={{user `no_proxy`}}" + ], + "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", + "scripts": [ + "scripts/common/metadata.sh", + "scripts/common/sshd.sh", + "scripts/centos/networking.sh", + "scripts/common/vagrant.sh", + "scripts/common/virtualbox.sh", + "scripts/common/vmware.sh", + "scripts/common/parallels.sh", + "scripts/centos/cleanup.sh", + "scripts/common/minimize.sh" + ], + "type": "shell" + } + ], + "variables": { + "box_basename": "centos-6.9", + "build_timestamp": "{{isotime \"20060102150405\"}}", + "cpus": "1", + "disk_size": "40960", + "git_revision": "__unknown_git_revision__", + "headless": "", + "http_proxy": "{{env `http_proxy`}}", + "https_proxy": "{{env `https_proxy`}}", + "iso_checksum": "1dda55622614a8b43b448a72f87d6cb7f79de1eff49ee8c5881a7d9db28d4e35", + "iso_checksum_type": "sha256", + "iso_name": "CentOS-6.9-x86_64-bin-DVD1.iso", + "ks_path": "centos-6.9/ks.cfg", + "memory": "512", + "metadata": "floppy/dummy_metadata.json", + "mirror": "http://mirrors.kernel.org/centos", + "mirror_directory": "6.9/isos/x86_64", + "name": "centos-6.9", + "no_proxy": "{{env `no_proxy`}}", + "template": "centos-6.9-x86_64", + "version": "2.1.TIMESTAMP" + } +} + diff --git a/http/centos-6.9/ks.cfg b/http/centos-6.9/ks.cfg new file mode 100644 index 000000000..90864b006 --- /dev/null +++ b/http/centos-6.9/ks.cfg @@ -0,0 +1,69 @@ +install +cdrom +lang en_US.UTF-8 +keyboard us +network --bootproto=dhcp +rootpw vagrant +firewall --disabled +selinux --permissive +timezone UTC +unsupported_hardware +bootloader --location=mbr +text +skipx +zerombr +clearpart --all --initlabel +autopart +auth --enableshadow --passalgo=sha512 --kickstart +firstboot --disabled +reboot +user --name=vagrant --plaintext --password vagrant +key --skip + +%packages --nobase --ignoremissing --excludedocs +# vagrant needs this to copy initial files via scp +openssh-clients +sudo +kernel-headers +kernel-devel +gcc +make +perl +wget +nfs-utils +-fprintd-pam +-intltool + +# unnecessary firmware +-aic94xx-firmware +-atmel-firmware +-b43-openfwwf +-bfa-firmware +-ipw2100-firmware +-ipw2200-firmware +-ivtv-firmware +-iwl100-firmware +-iwl1000-firmware +-iwl3945-firmware +-iwl4965-firmware +-iwl5000-firmware +-iwl5150-firmware +-iwl6000-firmware +-iwl6000g2a-firmware +-iwl6050-firmware +-libertas-usb8388-firmware +-ql2100-firmware +-ql2200-firmware +-ql23xx-firmware +-ql2400-firmware +-ql2500-firmware +-rt61pci-firmware +-rt73usb-firmware +-xorg-x11-drv-ati-firmware +-zd1211-firmware + +%post +# Force to set SELinux to a permissive mode +sed -i -e 's/\(^SELINUX=\).*$/\1permissive/' /etc/selinux/config +# sudo +echo "%vagrant ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers.d/vagrant From 57e33fa84a0d5040bd5d15149f642d3523b68933 Mon Sep 17 00:00:00 2001 From: Andreas Rammhold <andreas@rammhold.de> Date: Fri, 21 Apr 2017 15:46:09 +0200 Subject: [PATCH 0606/1622] Added debian-9-amd64 builds Signed-off-by: Andreas Rammhold <andreas@rammhold.de> --- builds.yml | 2 + debian-9-amd64.json | 246 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 248 insertions(+) create mode 100644 debian-9-amd64.json diff --git a/builds.yml b/builds.yml index 174914c86..08f406f31 100644 --- a/builds.yml +++ b/builds.yml @@ -21,6 +21,8 @@ public: '8.7': - amd64 - i386 + '9': + - amd64 fedora: '24': - x86_64 diff --git a/debian-9-amd64.json b/debian-9-amd64.json new file mode 100644 index 000000000..f3f61237e --- /dev/null +++ b/debian-9-amd64.json @@ -0,0 +1,246 @@ +{ + "builders": [ + { + "boot_command": [ + "<esc><wait>", + "install <wait>", + " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}} <wait>", + "debian-installer=en_US.UTF-8 <wait>", + "auto <wait>", + "locale=en_US.UTF-8 <wait>", + "kbd-chooser/method=us <wait>", + "keyboard-configuration/xkb-keymap=us <wait>", + "netcfg/get_hostname={{ .Name }} <wait>", + "netcfg/get_domain=vagrantup.com <wait>", + "fb=false <wait>", + "debconf/frontend=noninteractive <wait>", + "console-setup/ask_detect=false <wait>", + "console-keymaps-at/keymap=us <wait>", + "grub-installer/bootdev=/dev/sda <wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": "{{user `disk_size`}}", + "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "guest_os_type": "Debian_64", + "hard_drive_interface": "sata", + "headless": "{{ user `headless` }}", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-virtualbox", + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "virtualbox-iso", + "vboxmanage": [ + [ + "modifyvm", + "{{.Name}}", + "--memory", + "{{ user `memory` }}" + ], + [ + "modifyvm", + "{{.Name}}", + "--cpus", + "{{ user `cpus` }}" + ] + ], + "virtualbox_version_file": ".vbox_version", + "vm_name": "{{ user `template` }}" + }, + { + "boot_command": [ + "<esc><wait>", + "install <wait>", + " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}} <wait>", + "debian-installer=en_US.UTF-8 <wait>", + "auto <wait>", + "locale=en_US.UTF-8 <wait>", + "kbd-chooser/method=us <wait>", + "keyboard-configuration/xkb-keymap=us <wait>", + "netcfg/get_hostname={{ .Name }} <wait>", + "netcfg/get_domain=vagrantup.com <wait>", + "fb=false <wait>", + "debconf/frontend=noninteractive <wait>", + "console-setup/ask_detect=false <wait>", + "console-keymaps-at/keymap=us <wait>", + "grub-installer/bootdev=/dev/sda <wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": "{{user `disk_size`}}", + "guest_os_type": "debian8-64", + "headless": "{{ user `headless` }}", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-vmware", + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "tools_upload_flavor": "linux", + "type": "vmware-iso", + "vm_name": "{{ user `template` }}", + "vmx_data": { + "cpuid.coresPerSocket": "1", + "ethernet0.pciSlotNumber": "32", + "memsize": "{{ user `memory` }}", + "numvcpus": "{{ user `cpus` }}" + } + }, + { + "boot_command": [ + "<esc><wait>", + "install <wait>", + " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}} <wait>", + "debian-installer=en_US.UTF-8 <wait>", + "auto <wait>", + "locale=en_US.UTF-8 <wait>", + "kbd-chooser/method=us <wait>", + "keyboard-configuration/xkb-keymap=us <wait>", + "netcfg/get_hostname={{ .Name }} <wait>", + "netcfg/get_domain=vagrantup.com <wait>", + "fb=false <wait>", + "debconf/frontend=noninteractive <wait>", + "console-setup/ask_detect=false <wait>", + "console-keymaps-at/keymap=us <wait>", + "grub-installer/bootdev=/dev/sda <wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": "{{user `disk_size`}}", + "guest_os_type": "debian", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-parallels", + "parallels_tools_flavor": "lin", + "prlctl": [ + [ + "set", + "{{.Name}}", + "--memsize", + "{{ user `memory` }}" + ], + [ + "set", + "{{.Name}}", + "--cpus", + "{{ user `cpus` }}" + ] + ], + "prlctl_version_file": ".prlctl_version", + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "parallels-iso", + "vm_name": "{{ user `template` }}" + }, + { + "boot_command": [ + "<esc><wait>", + "install <wait>", + " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}} <wait>", + "debian-installer=en_US.UTF-8 <wait>", + "auto <wait>", + "locale=en_US.UTF-8 <wait>", + "kbd-chooser/method=us <wait>", + "keyboard-configuration/xkb-keymap=us <wait>", + "netcfg/get_hostname={{ .Name }} <wait>", + "netcfg/get_domain=vagrantup.com <wait>", + "fb=false <wait>", + "debconf/frontend=noninteractive <wait>", + "console-setup/ask_detect=false <wait>", + "console-keymaps-at/keymap=us <wait>", + "grub-installer/bootdev=/dev/vda <wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": "{{user `disk_size`}}", + "headless": "{{ user `headless` }}", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-qemu", + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "qemu", + "vm_name": "{{ user `template` }}" + } + ], + "post-processors": [ + { + "output": "builds/{{user `box_basename`}}.{{.Provider}}.box", + "type": "vagrant" + } + ], + "provisioners": [ + { + "destination": "/tmp/bento-metadata.json", + "source": "{{user `metadata`}}", + "type": "file" + }, + { + "environment_vars": [ + "HOME_DIR=/home/vagrant", + "http_proxy={{user `http_proxy`}}", + "https_proxy={{user `https_proxy`}}", + "no_proxy={{user `no_proxy`}}" + ], + "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", + "scripts": [ + "scripts/common/metadata.sh", + "scripts/debian/update.sh", + "scripts/common/sshd.sh", + "scripts/debian/networking.sh", + "scripts/debian/sudoers.sh", + "scripts/common/vagrant.sh", + "scripts/debian/systemd.sh", + "scripts/common/virtualbox.sh", + "scripts/common/vmware.sh", + "scripts/common/parallels.sh", + "scripts/debian/cleanup.sh", + "scripts/common/minimize.sh" + ], + "type": "shell" + } + ], + "variables": { + "box_basename": "debian-9", + "build_timestamp": "{{isotime \"20060102150405\"}}", + "cpus": "1", + "disk_size": "40960", + "git_revision": "__unknown_git_revision__", + "headless": "", + "http_proxy": "{{env `http_proxy`}}", + "https_proxy": "{{env `https_proxy`}}", + "iso_checksum": "b7e069fc493ffcb54912b16bb0116c760d102d1bb77bd92dae6dab0759cc0427", + "iso_checksum_type": "sha256", + "iso_name": "debian-testing-amd64-netinst.iso", + "memory": "512", + "metadata": "floppy/dummy_metadata.json", + "mirror": "http://cdimage.debian.org/cdimage/daily-builds/daily/20170421-3", + "mirror_directory": "amd64/iso-cd", + "name": "debian-9", + "no_proxy": "{{env `no_proxy`}}", + "preseed_path": "debian-8/preseed.cfg", + "template": "debian-9.0-amd64", + "version": "2.1.TIMESTAMP" + } +} + From a38fba79f9410f2f3bcb7d155bbc7714638a4b33 Mon Sep 17 00:00:00 2001 From: Seth Thomas <sthomas@chef.io> Date: Mon, 24 Apr 2017 09:39:45 -0400 Subject: [PATCH 0607/1622] Fixing checksums for CentOS 6.9 Signed-off-by: Seth Thomas <sthomas@chef.io> --- centos-6.9-i386.json | 3 +-- centos-6.9-x86_64.json | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/centos-6.9-i386.json b/centos-6.9-i386.json index a175ee948..cf5d3a62f 100644 --- a/centos-6.9-i386.json +++ b/centos-6.9-i386.json @@ -165,7 +165,7 @@ "headless": "", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", - "iso_checksum": "720d185fdf063383a4471657076b72fc162d3c3c3bca2e5e5ae13a25b3046519", + "iso_checksum": "0724a468ec0c4ac46ac6a1daba0273be697a37bb7f4e9fed8ad84ad270cdee2f", "iso_checksum_type": "sha256", "iso_name": "CentOS-6.9-i386-bin-DVD1.iso", "ks_path": "centos-6.9/ks.cfg", @@ -179,4 +179,3 @@ "version": "2.1.TIMESTAMP" } } - diff --git a/centos-6.9-x86_64.json b/centos-6.9-x86_64.json index a62e13ae1..b326a971f 100644 --- a/centos-6.9-x86_64.json +++ b/centos-6.9-x86_64.json @@ -165,7 +165,7 @@ "headless": "", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", - "iso_checksum": "1dda55622614a8b43b448a72f87d6cb7f79de1eff49ee8c5881a7d9db28d4e35", + "iso_checksum": "d27cf37a40509c17ad70f37bc743f038c1feba00476fe6b69682aa424c399ea6", "iso_checksum_type": "sha256", "iso_name": "CentOS-6.9-x86_64-bin-DVD1.iso", "ks_path": "centos-6.9/ks.cfg", @@ -179,4 +179,3 @@ "version": "2.1.TIMESTAMP" } } - From ddc2150a16a39c63f68d59d9fcb9596cf45df3c1 Mon Sep 17 00:00:00 2001 From: Seth Thomas <sthomas@chef.io> Date: Wed, 26 Apr 2017 11:55:06 -0400 Subject: [PATCH 0608/1622] Working around 5.1.20 vbox GA regression Signed-off-by: Seth Thomas <sthomas@chef.io> --- centos-5.11-i386.json | 3 ++- centos-5.11-x86_64.json | 3 ++- centos-6.8-i386.json | 3 ++- centos-6.8-x86_64.json | 3 ++- centos-6.9-i386.json | 3 ++- centos-6.9-x86_64.json | 3 ++- centos-7.3-x86_64.json | 3 ++- debian-7.11-amd64.json | 3 ++- debian-7.11-i386.json | 3 ++- debian-8.7-amd64.json | 3 ++- debian-8.7-i386.json | 3 ++- fedora-24-i386.json | 3 ++- fedora-24-x86_64.json | 3 ++- fedora-25-i386.json | 3 ++- fedora-25-x86_64.json | 3 ++- freebsd-10.3-amd64.json | 3 ++- freebsd-10.3-i386.json | 3 ++- freebsd-11.0-amd64.json | 3 ++- opensuse-leap-42.2-x86_64.json | 3 ++- oracle-5.11-i386.json | 3 ++- oracle-5.11-x86_64.json | 3 ++- oracle-6.8-i386.json | 4 ++-- oracle-6.8-x86_64.json | 3 ++- oracle-7.3-x86_64.json | 3 ++- rhel-5.11-i386.json | 3 ++- rhel-5.11-x86_64.json | 3 ++- rhel-6.8-i386.json | 3 ++- rhel-6.8-x86_64.json | 3 ++- rhel-7.3-x86_64.json | 3 ++- scripts/centos/cleanup.sh | 2 -- scripts/common/virtualbox.sh | 14 +++++++++----- scripts/debian/cleanup.sh | 2 -- scripts/fedora/cleanup.sh | 1 - scripts/sles/cleanup.sh | 2 +- scripts/ubuntu/cleanup.sh | 2 -- sles-12-sp1-x86_64.json | 3 ++- sles-12-sp2-x86_64.json | 3 ++- sles-12-x86_64.json | 3 ++- ubuntu-12.04-amd64.json | 3 ++- ubuntu-12.04-i386.json | 3 ++- ubuntu-14.04-amd64.json | 3 ++- ubuntu-14.04-i386.json | 3 ++- ubuntu-16.04-amd64.json | 3 ++- ubuntu-16.04-i386.json | 3 ++- ubuntu-16.10-amd64.json | 3 ++- ubuntu-16.10-i386.json | 3 ++- 46 files changed, 90 insertions(+), 54 deletions(-) diff --git a/centos-5.11-i386.json b/centos-5.11-i386.json index 0f5cbf318..086ff2151 100644 --- a/centos-5.11-i386.json +++ b/centos-5.11-i386.json @@ -6,7 +6,8 @@ ], "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", - "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "guest_additions_url": "https://www.virtualbox.org/download/testcase/VBoxGuestAdditions_5.1.21-115005.iso", + "guest_additions_sha256": "d348c2265b8ebae37ef3599dcbb839599093550ae1c60b0c7d471a48ecf70213", "guest_os_type": "RedHat", "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", diff --git a/centos-5.11-x86_64.json b/centos-5.11-x86_64.json index 54a623efb..47c53e8d7 100644 --- a/centos-5.11-x86_64.json +++ b/centos-5.11-x86_64.json @@ -6,7 +6,8 @@ ], "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", - "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "guest_additions_url": "https://www.virtualbox.org/download/testcase/VBoxGuestAdditions_5.1.21-115005.iso", + "guest_additions_sha256": "d348c2265b8ebae37ef3599dcbb839599093550ae1c60b0c7d471a48ecf70213", "guest_os_type": "RedHat_64", "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", diff --git a/centos-6.8-i386.json b/centos-6.8-i386.json index b915dfb9f..a719dcb14 100644 --- a/centos-6.8-i386.json +++ b/centos-6.8-i386.json @@ -6,7 +6,8 @@ ], "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", - "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "guest_additions_url": "https://www.virtualbox.org/download/testcase/VBoxGuestAdditions_5.1.21-115005.iso", + "guest_additions_sha256": "d348c2265b8ebae37ef3599dcbb839599093550ae1c60b0c7d471a48ecf70213", "guest_os_type": "RedHat", "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", diff --git a/centos-6.8-x86_64.json b/centos-6.8-x86_64.json index 883abb13b..4e53ec14f 100644 --- a/centos-6.8-x86_64.json +++ b/centos-6.8-x86_64.json @@ -6,7 +6,8 @@ ], "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", - "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "guest_additions_url": "https://www.virtualbox.org/download/testcase/VBoxGuestAdditions_5.1.21-115005.iso", + "guest_additions_sha256": "d348c2265b8ebae37ef3599dcbb839599093550ae1c60b0c7d471a48ecf70213", "guest_os_type": "RedHat_64", "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", diff --git a/centos-6.9-i386.json b/centos-6.9-i386.json index cf5d3a62f..8087a761f 100644 --- a/centos-6.9-i386.json +++ b/centos-6.9-i386.json @@ -6,7 +6,8 @@ ], "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", - "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "guest_additions_url": "https://www.virtualbox.org/download/testcase/VBoxGuestAdditions_5.1.21-115005.iso", + "guest_additions_sha256": "d348c2265b8ebae37ef3599dcbb839599093550ae1c60b0c7d471a48ecf70213", "guest_os_type": "RedHat", "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", diff --git a/centos-6.9-x86_64.json b/centos-6.9-x86_64.json index b326a971f..e56c67b49 100644 --- a/centos-6.9-x86_64.json +++ b/centos-6.9-x86_64.json @@ -6,7 +6,8 @@ ], "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", - "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "guest_additions_url": "https://www.virtualbox.org/download/testcase/VBoxGuestAdditions_5.1.21-115005.iso", + "guest_additions_sha256": "d348c2265b8ebae37ef3599dcbb839599093550ae1c60b0c7d471a48ecf70213", "guest_os_type": "RedHat_64", "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", diff --git a/centos-7.3-x86_64.json b/centos-7.3-x86_64.json index d2725be9f..c2d97bc38 100644 --- a/centos-7.3-x86_64.json +++ b/centos-7.3-x86_64.json @@ -6,7 +6,8 @@ ], "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", - "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "guest_additions_url": "https://www.virtualbox.org/download/testcase/VBoxGuestAdditions_5.1.21-115005.iso", + "guest_additions_sha256": "d348c2265b8ebae37ef3599dcbb839599093550ae1c60b0c7d471a48ecf70213", "guest_os_type": "RedHat_64", "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", diff --git a/debian-7.11-amd64.json b/debian-7.11-amd64.json index 1ab8f8012..75291b886 100644 --- a/debian-7.11-amd64.json +++ b/debian-7.11-amd64.json @@ -20,7 +20,8 @@ ], "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", - "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "guest_additions_url": "https://www.virtualbox.org/download/testcase/VBoxGuestAdditions_5.1.21-115005.iso", + "guest_additions_sha256": "d348c2265b8ebae37ef3599dcbb839599093550ae1c60b0c7d471a48ecf70213", "guest_os_type": "Debian_64", "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", diff --git a/debian-7.11-i386.json b/debian-7.11-i386.json index 89f7b154a..e36c90cd6 100644 --- a/debian-7.11-i386.json +++ b/debian-7.11-i386.json @@ -20,7 +20,8 @@ ], "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", - "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "guest_additions_url": "https://www.virtualbox.org/download/testcase/VBoxGuestAdditions_5.1.21-115005.iso", + "guest_additions_sha256": "d348c2265b8ebae37ef3599dcbb839599093550ae1c60b0c7d471a48ecf70213", "guest_os_type": "Debian", "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", diff --git a/debian-8.7-amd64.json b/debian-8.7-amd64.json index 261b3d315..9e5fdce93 100644 --- a/debian-8.7-amd64.json +++ b/debian-8.7-amd64.json @@ -21,7 +21,8 @@ ], "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", - "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "guest_additions_url": "https://www.virtualbox.org/download/testcase/VBoxGuestAdditions_5.1.21-115005.iso", + "guest_additions_sha256": "d348c2265b8ebae37ef3599dcbb839599093550ae1c60b0c7d471a48ecf70213", "guest_os_type": "Debian_64", "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", diff --git a/debian-8.7-i386.json b/debian-8.7-i386.json index 926a01e2d..8a6086972 100644 --- a/debian-8.7-i386.json +++ b/debian-8.7-i386.json @@ -21,7 +21,8 @@ ], "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", - "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "guest_additions_url": "https://www.virtualbox.org/download/testcase/VBoxGuestAdditions_5.1.21-115005.iso", + "guest_additions_sha256": "d348c2265b8ebae37ef3599dcbb839599093550ae1c60b0c7d471a48ecf70213", "guest_os_type": "Debian", "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", diff --git a/fedora-24-i386.json b/fedora-24-i386.json index 2dc50354f..d7dd50a20 100644 --- a/fedora-24-i386.json +++ b/fedora-24-i386.json @@ -6,7 +6,8 @@ ], "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", - "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "guest_additions_url": "https://www.virtualbox.org/download/testcase/VBoxGuestAdditions_5.1.21-115005.iso", + "guest_additions_sha256": "d348c2265b8ebae37ef3599dcbb839599093550ae1c60b0c7d471a48ecf70213", "guest_os_type": "Fedora", "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", diff --git a/fedora-24-x86_64.json b/fedora-24-x86_64.json index a7ce8c5bb..27a2164f8 100644 --- a/fedora-24-x86_64.json +++ b/fedora-24-x86_64.json @@ -6,7 +6,8 @@ ], "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", - "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "guest_additions_url": "https://www.virtualbox.org/download/testcase/VBoxGuestAdditions_5.1.21-115005.iso", + "guest_additions_sha256": "d348c2265b8ebae37ef3599dcbb839599093550ae1c60b0c7d471a48ecf70213", "guest_os_type": "Fedora_64", "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", diff --git a/fedora-25-i386.json b/fedora-25-i386.json index 305093150..60ceb35f7 100644 --- a/fedora-25-i386.json +++ b/fedora-25-i386.json @@ -6,7 +6,8 @@ ], "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", - "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "guest_additions_url": "https://www.virtualbox.org/download/testcase/VBoxGuestAdditions_5.1.21-115005.iso", + "guest_additions_sha256": "d348c2265b8ebae37ef3599dcbb839599093550ae1c60b0c7d471a48ecf70213", "guest_os_type": "Fedora", "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", diff --git a/fedora-25-x86_64.json b/fedora-25-x86_64.json index 88c728f0a..a73dc3220 100644 --- a/fedora-25-x86_64.json +++ b/fedora-25-x86_64.json @@ -6,7 +6,8 @@ ], "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", - "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "guest_additions_url": "https://www.virtualbox.org/download/testcase/VBoxGuestAdditions_5.1.21-115005.iso", + "guest_additions_sha256": "d348c2265b8ebae37ef3599dcbb839599093550ae1c60b0c7d471a48ecf70213", "guest_os_type": "Fedora_64", "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", diff --git a/freebsd-10.3-amd64.json b/freebsd-10.3-amd64.json index 167b20b48..c1925609a 100644 --- a/freebsd-10.3-amd64.json +++ b/freebsd-10.3-amd64.json @@ -14,7 +14,8 @@ ], "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", - "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "guest_additions_url": "https://www.virtualbox.org/download/testcase/VBoxGuestAdditions_5.1.21-115005.iso", + "guest_additions_sha256": "d348c2265b8ebae37ef3599dcbb839599093550ae1c60b0c7d471a48ecf70213", "guest_os_type": "FreeBSD_64", "headless": "{{ user `headless` }}", "http_directory": "http", diff --git a/freebsd-10.3-i386.json b/freebsd-10.3-i386.json index 004de5eb5..931f3fafe 100644 --- a/freebsd-10.3-i386.json +++ b/freebsd-10.3-i386.json @@ -14,7 +14,8 @@ ], "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", - "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "guest_additions_url": "https://www.virtualbox.org/download/testcase/VBoxGuestAdditions_5.1.21-115005.iso", + "guest_additions_sha256": "d348c2265b8ebae37ef3599dcbb839599093550ae1c60b0c7d471a48ecf70213", "guest_os_type": "FreeBSD", "headless": "{{ user `headless` }}", "http_directory": "http", diff --git a/freebsd-11.0-amd64.json b/freebsd-11.0-amd64.json index 5b71010f9..ec08b82db 100644 --- a/freebsd-11.0-amd64.json +++ b/freebsd-11.0-amd64.json @@ -14,7 +14,8 @@ ], "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", - "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "guest_additions_url": "https://www.virtualbox.org/download/testcase/VBoxGuestAdditions_5.1.21-115005.iso", + "guest_additions_sha256": "d348c2265b8ebae37ef3599dcbb839599093550ae1c60b0c7d471a48ecf70213", "guest_os_type": "FreeBSD_64", "headless": "{{ user `headless` }}", "http_directory": "http", diff --git a/opensuse-leap-42.2-x86_64.json b/opensuse-leap-42.2-x86_64.json index 522f2b0b5..24f7334a2 100644 --- a/opensuse-leap-42.2-x86_64.json +++ b/opensuse-leap-42.2-x86_64.json @@ -10,7 +10,8 @@ ], "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", - "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "guest_additions_url": "https://www.virtualbox.org/download/testcase/VBoxGuestAdditions_5.1.21-115005.iso", + "guest_additions_sha256": "d348c2265b8ebae37ef3599dcbb839599093550ae1c60b0c7d471a48ecf70213", "guest_os_type": "OpenSUSE_64", "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", diff --git a/oracle-5.11-i386.json b/oracle-5.11-i386.json index 948307ac6..a79277eeb 100644 --- a/oracle-5.11-i386.json +++ b/oracle-5.11-i386.json @@ -6,7 +6,8 @@ ], "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", - "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "guest_additions_url": "https://www.virtualbox.org/download/testcase/VBoxGuestAdditions_5.1.21-115005.iso", + "guest_additions_sha256": "d348c2265b8ebae37ef3599dcbb839599093550ae1c60b0c7d471a48ecf70213", "guest_os_type": "Oracle", "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", diff --git a/oracle-5.11-x86_64.json b/oracle-5.11-x86_64.json index 6d329deca..bc5b94976 100644 --- a/oracle-5.11-x86_64.json +++ b/oracle-5.11-x86_64.json @@ -6,7 +6,8 @@ ], "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", - "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "guest_additions_url": "https://www.virtualbox.org/download/testcase/VBoxGuestAdditions_5.1.21-115005.iso", + "guest_additions_sha256": "d348c2265b8ebae37ef3599dcbb839599093550ae1c60b0c7d471a48ecf70213", "guest_os_type": "Oracle_64", "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", diff --git a/oracle-6.8-i386.json b/oracle-6.8-i386.json index c436fadc6..89abc7d74 100644 --- a/oracle-6.8-i386.json +++ b/oracle-6.8-i386.json @@ -6,7 +6,8 @@ ], "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", - "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "guest_additions_url": "https://www.virtualbox.org/download/testcase/VBoxGuestAdditions_5.1.21-115005.iso", + "guest_additions_sha256": "d348c2265b8ebae37ef3599dcbb839599093550ae1c60b0c7d471a48ecf70213", "guest_os_type": "Oracle", "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", @@ -180,4 +181,3 @@ "version": "2.2.TIMESTAMP" } } - diff --git a/oracle-6.8-x86_64.json b/oracle-6.8-x86_64.json index 1e1d2eac1..d5d0889bd 100644 --- a/oracle-6.8-x86_64.json +++ b/oracle-6.8-x86_64.json @@ -6,7 +6,8 @@ ], "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", - "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "guest_additions_url": "https://www.virtualbox.org/download/testcase/VBoxGuestAdditions_5.1.21-115005.iso", + "guest_additions_sha256": "d348c2265b8ebae37ef3599dcbb839599093550ae1c60b0c7d471a48ecf70213", "guest_os_type": "Oracle_64", "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", diff --git a/oracle-7.3-x86_64.json b/oracle-7.3-x86_64.json index 9fccd42f1..527c8cce2 100644 --- a/oracle-7.3-x86_64.json +++ b/oracle-7.3-x86_64.json @@ -6,7 +6,8 @@ ], "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", - "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "guest_additions_url": "https://www.virtualbox.org/download/testcase/VBoxGuestAdditions_5.1.21-115005.iso", + "guest_additions_sha256": "d348c2265b8ebae37ef3599dcbb839599093550ae1c60b0c7d471a48ecf70213", "guest_os_type": "Oracle_64", "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", diff --git a/rhel-5.11-i386.json b/rhel-5.11-i386.json index 9de1b76f6..60f9e7e64 100644 --- a/rhel-5.11-i386.json +++ b/rhel-5.11-i386.json @@ -6,7 +6,8 @@ ], "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", - "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "guest_additions_url": "https://www.virtualbox.org/download/testcase/VBoxGuestAdditions_5.1.21-115005.iso", + "guest_additions_sha256": "d348c2265b8ebae37ef3599dcbb839599093550ae1c60b0c7d471a48ecf70213", "guest_os_type": "RedHat", "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", diff --git a/rhel-5.11-x86_64.json b/rhel-5.11-x86_64.json index 2bd05e2a2..7bff52931 100644 --- a/rhel-5.11-x86_64.json +++ b/rhel-5.11-x86_64.json @@ -6,7 +6,8 @@ ], "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", - "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "guest_additions_url": "https://www.virtualbox.org/download/testcase/VBoxGuestAdditions_5.1.21-115005.iso", + "guest_additions_sha256": "d348c2265b8ebae37ef3599dcbb839599093550ae1c60b0c7d471a48ecf70213", "guest_os_type": "RedHat_64", "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", diff --git a/rhel-6.8-i386.json b/rhel-6.8-i386.json index 7968a43f9..03e3b5688 100644 --- a/rhel-6.8-i386.json +++ b/rhel-6.8-i386.json @@ -6,7 +6,8 @@ ], "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", - "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "guest_additions_url": "https://www.virtualbox.org/download/testcase/VBoxGuestAdditions_5.1.21-115005.iso", + "guest_additions_sha256": "d348c2265b8ebae37ef3599dcbb839599093550ae1c60b0c7d471a48ecf70213", "guest_os_type": "RedHat", "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", diff --git a/rhel-6.8-x86_64.json b/rhel-6.8-x86_64.json index 0d14c820b..252e1cb5a 100644 --- a/rhel-6.8-x86_64.json +++ b/rhel-6.8-x86_64.json @@ -6,7 +6,8 @@ ], "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", - "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "guest_additions_url": "https://www.virtualbox.org/download/testcase/VBoxGuestAdditions_5.1.21-115005.iso", + "guest_additions_sha256": "d348c2265b8ebae37ef3599dcbb839599093550ae1c60b0c7d471a48ecf70213", "guest_os_type": "RedHat_64", "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", diff --git a/rhel-7.3-x86_64.json b/rhel-7.3-x86_64.json index f4f4c9138..3769bc857 100644 --- a/rhel-7.3-x86_64.json +++ b/rhel-7.3-x86_64.json @@ -6,7 +6,8 @@ ], "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", - "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "guest_additions_url": "https://www.virtualbox.org/download/testcase/VBoxGuestAdditions_5.1.21-115005.iso", + "guest_additions_sha256": "d348c2265b8ebae37ef3599dcbb839599093550ae1c60b0c7d471a48ecf70213", "guest_os_type": "RedHat_64", "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", diff --git a/scripts/centos/cleanup.sh b/scripts/centos/cleanup.sh index 62d7d735b..f4db8a1c4 100644 --- a/scripts/centos/cleanup.sh +++ b/scripts/centos/cleanup.sh @@ -55,7 +55,5 @@ _EOF_ chmod +x /etc/rc.d/rc.local fi -rm -f VBoxGuestAdditions_*.iso VBoxGuestAdditions_*.iso.?; - # delete any logs that have built up during the install find /var/log/ -name *.log -exec rm -f {} \; diff --git a/scripts/common/virtualbox.sh b/scripts/common/virtualbox.sh index 916564043..37b81a22e 100644 --- a/scripts/common/virtualbox.sh +++ b/scripts/common/virtualbox.sh @@ -3,14 +3,18 @@ case "$PACKER_BUILDER_TYPE" in virtualbox-iso|virtualbox-ovf) VER="`cat /home/vagrant/.vbox_version`"; - - echo "Virtualbox Tools Version: $VER"; + if [ $VER == '5.1.20' ]; then + echo "Working around regression in 5.1.20 guest additions" + echo "So we're using an updated test build" + echo "It's probably fine" + echo "Virtualbox Tools Version: 5.1.21"; + else + echo "Virtualbox Tools Version: $VER"; + fi mkdir -p /tmp/vbox; mount -o loop $HOME_DIR/VBoxGuestAdditions_${VER}.iso /tmp/vbox; - sh /tmp/vbox/VBoxLinuxAdditions.run \ - || echo "VBoxLinuxAdditions.run exited $? and is suppressed." \ - "For more read https://www.virtualbox.org/ticket/12479"; + sh /tmp/vbox/VBoxLinuxAdditions.run; umount /tmp/vbox; rm -rf /tmp/vbox; rm -f $HOME_DIR/*.iso; diff --git a/scripts/debian/cleanup.sh b/scripts/debian/cleanup.sh index 004965bc2..2e96024b0 100644 --- a/scripts/debian/cleanup.sh +++ b/scripts/debian/cleanup.sh @@ -39,7 +39,5 @@ apt-get -y purge popularity-contest; apt-get -y autoremove; apt-get -y clean; -rm -f VBoxGuestAdditions_*.iso VBoxGuestAdditions_*.iso.? - # delete any logs that have built up during the install find /var/log/ -name *.log -exec rm -f {} \; diff --git a/scripts/fedora/cleanup.sh b/scripts/fedora/cleanup.sh index d789a01ec..9e5af7e51 100644 --- a/scripts/fedora/cleanup.sh +++ b/scripts/fedora/cleanup.sh @@ -8,7 +8,6 @@ dnf -y clean all --enablerepo=\* echo "Removing extra packages" dnf -y remove linux-firmware -rm -rf VBoxGuestAdditions_*.iso VBoxGuestAdditions_*.iso.? rm -f /tmp/chef*rpm # delete any logs that have built up during the install diff --git a/scripts/sles/cleanup.sh b/scripts/sles/cleanup.sh index bee519b9c..1325c1b4f 100644 --- a/scripts/sles/cleanup.sh +++ b/scripts/sles/cleanup.sh @@ -2,7 +2,7 @@ # These were only needed for building VMware/Virtualbox extensions: zypper --non-interactive rm --clean-deps gcc kernel-default-devel zypper clean -rm -rf VBoxGuestAdditions_*.iso VBoxGuestAdditions_*.iso.? + rm -f /tmp/chef*rpm # delete any logs that have built up during the install diff --git a/scripts/ubuntu/cleanup.sh b/scripts/ubuntu/cleanup.sh index 4b22ea875..683a6502e 100644 --- a/scripts/ubuntu/cleanup.sh +++ b/scripts/ubuntu/cleanup.sh @@ -45,8 +45,6 @@ apt-get -y purge popularity-contest installation-report command-not-found comman apt-get -y autoremove; apt-get -y clean; -rm -f VBoxGuestAdditions_*.iso VBoxGuestAdditions_*.iso.?; - # Remove docs rm -rf /usr/share/doc/* diff --git a/sles-12-sp1-x86_64.json b/sles-12-sp1-x86_64.json index 964f5e9ba..bd9a4403b 100644 --- a/sles-12-sp1-x86_64.json +++ b/sles-12-sp1-x86_64.json @@ -10,7 +10,8 @@ ], "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", - "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "guest_additions_url": "https://www.virtualbox.org/download/testcase/VBoxGuestAdditions_5.1.21-115005.iso", + "guest_additions_sha256": "d348c2265b8ebae37ef3599dcbb839599093550ae1c60b0c7d471a48ecf70213", "guest_os_type": "OpenSUSE_64", "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", diff --git a/sles-12-sp2-x86_64.json b/sles-12-sp2-x86_64.json index 054c5e5da..28cb67546 100644 --- a/sles-12-sp2-x86_64.json +++ b/sles-12-sp2-x86_64.json @@ -10,7 +10,8 @@ ], "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", - "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "guest_additions_url": "https://www.virtualbox.org/download/testcase/VBoxGuestAdditions_5.1.21-115005.iso", + "guest_additions_sha256": "d348c2265b8ebae37ef3599dcbb839599093550ae1c60b0c7d471a48ecf70213", "guest_os_type": "OpenSUSE_64", "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", diff --git a/sles-12-x86_64.json b/sles-12-x86_64.json index b75556dac..8e1667dd2 100644 --- a/sles-12-x86_64.json +++ b/sles-12-x86_64.json @@ -10,7 +10,8 @@ ], "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", - "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "guest_additions_url": "https://www.virtualbox.org/download/testcase/VBoxGuestAdditions_5.1.21-115005.iso", + "guest_additions_sha256": "d348c2265b8ebae37ef3599dcbb839599093550ae1c60b0c7d471a48ecf70213", "guest_os_type": "OpenSUSE_64", "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", diff --git a/ubuntu-12.04-amd64.json b/ubuntu-12.04-amd64.json index 23cdb397c..66629403f 100644 --- a/ubuntu-12.04-amd64.json +++ b/ubuntu-12.04-amd64.json @@ -27,7 +27,8 @@ ], "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", - "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "guest_additions_url": "https://www.virtualbox.org/download/testcase/VBoxGuestAdditions_5.1.21-115005.iso", + "guest_additions_sha256": "d348c2265b8ebae37ef3599dcbb839599093550ae1c60b0c7d471a48ecf70213", "guest_os_type": "Ubuntu_64", "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", diff --git a/ubuntu-12.04-i386.json b/ubuntu-12.04-i386.json index 4bd781fa2..fce2ae975 100644 --- a/ubuntu-12.04-i386.json +++ b/ubuntu-12.04-i386.json @@ -27,7 +27,8 @@ ], "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", - "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "guest_additions_url": "https://www.virtualbox.org/download/testcase/VBoxGuestAdditions_5.1.21-115005.iso", + "guest_additions_sha256": "d348c2265b8ebae37ef3599dcbb839599093550ae1c60b0c7d471a48ecf70213", "guest_os_type": "Ubuntu", "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", diff --git a/ubuntu-14.04-amd64.json b/ubuntu-14.04-amd64.json index 9adc1554f..78c0da257 100644 --- a/ubuntu-14.04-amd64.json +++ b/ubuntu-14.04-amd64.json @@ -27,7 +27,8 @@ ], "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", - "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "guest_additions_url": "https://www.virtualbox.org/download/testcase/VBoxGuestAdditions_5.1.21-115005.iso", + "guest_additions_sha256": "d348c2265b8ebae37ef3599dcbb839599093550ae1c60b0c7d471a48ecf70213", "guest_os_type": "Ubuntu_64", "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", diff --git a/ubuntu-14.04-i386.json b/ubuntu-14.04-i386.json index b6f499003..8c2e250ca 100644 --- a/ubuntu-14.04-i386.json +++ b/ubuntu-14.04-i386.json @@ -27,7 +27,8 @@ ], "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", - "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "guest_additions_url": "https://www.virtualbox.org/download/testcase/VBoxGuestAdditions_5.1.21-115005.iso", + "guest_additions_sha256": "d348c2265b8ebae37ef3599dcbb839599093550ae1c60b0c7d471a48ecf70213", "guest_os_type": "Ubuntu", "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", diff --git a/ubuntu-16.04-amd64.json b/ubuntu-16.04-amd64.json index 5b910a923..97e823b20 100644 --- a/ubuntu-16.04-amd64.json +++ b/ubuntu-16.04-amd64.json @@ -29,7 +29,8 @@ ], "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", - "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "guest_additions_url": "https://www.virtualbox.org/download/testcase/VBoxGuestAdditions_5.1.21-115005.iso", + "guest_additions_sha256": "d348c2265b8ebae37ef3599dcbb839599093550ae1c60b0c7d471a48ecf70213", "guest_os_type": "Ubuntu_64", "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", diff --git a/ubuntu-16.04-i386.json b/ubuntu-16.04-i386.json index 707bfb20d..a995d7b23 100644 --- a/ubuntu-16.04-i386.json +++ b/ubuntu-16.04-i386.json @@ -29,7 +29,8 @@ ], "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", - "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "guest_additions_url": "https://www.virtualbox.org/download/testcase/VBoxGuestAdditions_5.1.21-115005.iso", + "guest_additions_sha256": "d348c2265b8ebae37ef3599dcbb839599093550ae1c60b0c7d471a48ecf70213", "guest_os_type": "Ubuntu", "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", diff --git a/ubuntu-16.10-amd64.json b/ubuntu-16.10-amd64.json index abf40aa29..5f6381753 100644 --- a/ubuntu-16.10-amd64.json +++ b/ubuntu-16.10-amd64.json @@ -28,7 +28,8 @@ ], "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", - "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "guest_additions_url": "https://www.virtualbox.org/download/testcase/VBoxGuestAdditions_5.1.21-115005.iso", + "guest_additions_sha256": "d348c2265b8ebae37ef3599dcbb839599093550ae1c60b0c7d471a48ecf70213", "guest_os_type": "Ubuntu_64", "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", diff --git a/ubuntu-16.10-i386.json b/ubuntu-16.10-i386.json index 3552293ff..2a8f49387 100644 --- a/ubuntu-16.10-i386.json +++ b/ubuntu-16.10-i386.json @@ -28,7 +28,8 @@ ], "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", - "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "guest_additions_url": "https://www.virtualbox.org/download/testcase/VBoxGuestAdditions_5.1.21-115005.iso", + "guest_additions_sha256": "d348c2265b8ebae37ef3599dcbb839599093550ae1c60b0c7d471a48ecf70213", "guest_os_type": "Ubuntu", "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", From 2d12506f38932a6abdf30c0cc0fdbc181ff8f3f7 Mon Sep 17 00:00:00 2001 From: Seth Thomas <sthomas@chef.io> Date: Wed, 26 Apr 2017 13:02:44 -0400 Subject: [PATCH 0609/1622] Fixing accidental revert and simplifying rakefile Signed-off-by: Seth Thomas <sthomas@chef.io> --- Rakefile | 82 ++++-------------------------------- scripts/common/virtualbox.sh | 16 +++---- 2 files changed, 15 insertions(+), 83 deletions(-) diff --git a/Rakefile b/Rakefile index 627661445..91bfc64cc 100644 --- a/Rakefile +++ b/Rakefile @@ -14,47 +14,26 @@ task :do_all do versions.each do |version, archs| archs.each do |arch| builds["providers"].each do |provider| + template = "#{platform}-#{version}-#{arch}" # build stage - Rake::Task["build_box"].invoke("#{platform}-#{version}-#{arch}", "#{provider}") + Rake::Task["build_box"].invoke(template, provider) Rake::Task["build_box"].reenable - puts "#{platform}-#{version}-#{arch}, #{provider}" # verification stage - Rake::Task["test_all"].invoke - Rake::Task["test_all"].reenable + sh "bento test -f" # publish stage - Rake::Task["upload_all"].invoke - Rake::Task["upload_all"].reenable + sh "bento upload" # release stage - Rake::Task["release_all"].invoke - Rake::Task["release_all"].reenable + atlas_name = template.match(/-x86_64|-amd64/) ? template.gsub(/-x86_64|-amd64/,'') : template + sh "bento release #{atlas_name} #{ENV['BENTO_VERSION']}" # clean stage - Rake::Task["clean"].invoke - Rake::Task["clean"].reenable + puts "Cleaning up..." + sh "rm -rf builds/*.json builds/*.box packer-* .kitchen.*.yml" end end end end end -desc "Test all boxes with Test Kitchen" -task :test_all do - sh "bento test -f" -end - -desc "Upload all boxes to Atlas for all providers" -task :upload_all do - sh "bento upload" -end - -desc "Release all" -task :release_all do - metadata_files.each do |metadata_file| - metadata = box_metadata(metadata_file) - Rake::Task["release"].invoke(metadata["name"], metadata["version"]) - Rake::Task["release"].reenable - end -end - desc "Build a bento template" task :build_box, :template, :provider do |_, args| bento_provider = ENV["BENTO_PROVIDERS"] ? ENV["BENTO_PROVIDERS"] : args[:provider] @@ -71,27 +50,6 @@ task :build_box, :template, :provider do |_, args| sh a_to_s(cmd) end -desc "Release a version of a box" -task :release, [:boxname, :version] do |_, args| - sh "bento release #{args[:boxname]} #{args[:version]}" -end - -desc "Revoke a version of a box" -task :revoke, [:boxname, :version] do |_, args| - sh "bento revoke #{args[:boxname]} #{args[:version]}" -end - -desc "Delete a version of a box" -task :delete, [:boxname, :version] do |_, args| - sh "bento delete #{args[:boxname]} #{args[:version]}" -end - -desc "Clean the build directory" -task :clean do - puts "Cleaning up..." - `rm -rf builds/*.json builds/*.box packer-* .kitchen.*.yml` -end - def a_to_s(*args) clean_array(*args).join(" ") end @@ -99,27 +57,3 @@ end def clean_array(*args) args.flatten.reject { |i| i.nil? || i == "" }.map(&:to_s) end - -def box_metadata(metadata_file) - metadata = {} - file = File.read(metadata_file) - json = JSON.parse(file) - - # metadata needed for upload: boxname, version, provider, box filename - metadata["name"] = json["name"] - metadata["version"] = json["version"] - metadata["box_basename"] = json["box_basename"] - metadata["providers"] = {} - json["providers"].each do |provider| - metadata["providers"][provider["name"]] = provider.reject { |k, _| k == "name" } - end - metadata -end - -def metadata_files - @metadata_files ||= compute_metadata_files -end - -def compute_metadata_files - `ls builds/*.json`.split("\n") -end diff --git a/scripts/common/virtualbox.sh b/scripts/common/virtualbox.sh index 37b81a22e..cd279752d 100644 --- a/scripts/common/virtualbox.sh +++ b/scripts/common/virtualbox.sh @@ -3,17 +3,15 @@ case "$PACKER_BUILDER_TYPE" in virtualbox-iso|virtualbox-ovf) VER="`cat /home/vagrant/.vbox_version`"; - if [ $VER == '5.1.20' ]; then - echo "Working around regression in 5.1.20 guest additions" - echo "So we're using an updated test build" - echo "It's probably fine" - echo "Virtualbox Tools Version: 5.1.21"; - else - echo "Virtualbox Tools Version: $VER"; - fi + ISO="VBoxGuestAdditions.iso"; + + echo "Working around regression in 5.1.20 guest additions"; + echo "So we're using an updated test build"; + echo "It's probably fine"; + echo "Virtualbox Tools Version: 5.1.21"; mkdir -p /tmp/vbox; - mount -o loop $HOME_DIR/VBoxGuestAdditions_${VER}.iso /tmp/vbox; + mount -o loop $HOME_DIR/$ISO /tmp/vbox; sh /tmp/vbox/VBoxLinuxAdditions.run; umount /tmp/vbox; rm -rf /tmp/vbox; From bafe94b61c76baf96bece892c88150b16472f503 Mon Sep 17 00:00:00 2001 From: Seth Thomas <sthomas@chef.io> Date: Mon, 1 May 2017 18:15:43 -0400 Subject: [PATCH 0610/1622] We definitely still need this for 16.04 Signed-off-by: Seth Thomas <sthomas@chef.io> --- scripts/common/virtualbox.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/scripts/common/virtualbox.sh b/scripts/common/virtualbox.sh index cd279752d..72cca52c8 100644 --- a/scripts/common/virtualbox.sh +++ b/scripts/common/virtualbox.sh @@ -12,7 +12,9 @@ virtualbox-iso|virtualbox-ovf) mkdir -p /tmp/vbox; mount -o loop $HOME_DIR/$ISO /tmp/vbox; - sh /tmp/vbox/VBoxLinuxAdditions.run; + sh /tmp/vbox/VBoxLinuxAdditions.run \ + || echo "VBoxLinuxAdditions.run exited $? and is suppressed." \ + "For more read https://www.virtualbox.org/ticket/12479"; umount /tmp/vbox; rm -rf /tmp/vbox; rm -f $HOME_DIR/*.iso; From 9bc28d9bd45f3a57070860f2b2f08a42a3791c53 Mon Sep 17 00:00:00 2001 From: Seth Thomas <sthomas@chef.io> Date: Mon, 1 May 2017 18:55:46 -0400 Subject: [PATCH 0611/1622] VirtualBox 5.1.22 fixes the regression in 5.1.20 Signed-off-by: Seth Thomas <sthomas@chef.io> --- centos-5.11-i386.json | 3 +-- centos-5.11-x86_64.json | 3 +-- centos-6.8-i386.json | 3 +-- centos-6.8-x86_64.json | 3 +-- centos-6.9-i386.json | 3 +-- centos-6.9-x86_64.json | 3 +-- centos-7.3-x86_64.json | 3 +-- debian-7.11-amd64.json | 3 +-- debian-7.11-i386.json | 3 +-- debian-8.7-amd64.json | 3 +-- debian-8.7-i386.json | 3 +-- fedora-24-i386.json | 3 +-- fedora-24-x86_64.json | 3 +-- fedora-25-i386.json | 3 +-- fedora-25-x86_64.json | 3 +-- freebsd-10.3-amd64.json | 3 +-- freebsd-10.3-i386.json | 3 +-- freebsd-11.0-amd64.json | 3 +-- opensuse-leap-42.2-x86_64.json | 3 +-- oracle-5.11-i386.json | 3 +-- oracle-5.11-x86_64.json | 3 +-- oracle-6.8-i386.json | 3 +-- oracle-6.8-x86_64.json | 3 +-- oracle-7.3-x86_64.json | 3 +-- rhel-5.11-i386.json | 3 +-- rhel-5.11-x86_64.json | 3 +-- rhel-6.8-i386.json | 3 +-- rhel-6.8-x86_64.json | 3 +-- rhel-7.3-x86_64.json | 3 +-- sles-12-sp1-x86_64.json | 3 +-- sles-12-sp2-x86_64.json | 3 +-- sles-12-x86_64.json | 3 +-- ubuntu-12.04-amd64.json | 3 +-- ubuntu-12.04-i386.json | 3 +-- ubuntu-14.04-amd64.json | 3 +-- ubuntu-14.04-i386.json | 3 +-- ubuntu-16.04-amd64.json | 3 +-- ubuntu-16.04-i386.json | 3 +-- ubuntu-16.10-amd64.json | 3 +-- ubuntu-16.10-i386.json | 3 +-- 40 files changed, 40 insertions(+), 80 deletions(-) diff --git a/centos-5.11-i386.json b/centos-5.11-i386.json index 086ff2151..0f5cbf318 100644 --- a/centos-5.11-i386.json +++ b/centos-5.11-i386.json @@ -6,8 +6,7 @@ ], "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", - "guest_additions_url": "https://www.virtualbox.org/download/testcase/VBoxGuestAdditions_5.1.21-115005.iso", - "guest_additions_sha256": "d348c2265b8ebae37ef3599dcbb839599093550ae1c60b0c7d471a48ecf70213", + "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "guest_os_type": "RedHat", "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", diff --git a/centos-5.11-x86_64.json b/centos-5.11-x86_64.json index 47c53e8d7..54a623efb 100644 --- a/centos-5.11-x86_64.json +++ b/centos-5.11-x86_64.json @@ -6,8 +6,7 @@ ], "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", - "guest_additions_url": "https://www.virtualbox.org/download/testcase/VBoxGuestAdditions_5.1.21-115005.iso", - "guest_additions_sha256": "d348c2265b8ebae37ef3599dcbb839599093550ae1c60b0c7d471a48ecf70213", + "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "guest_os_type": "RedHat_64", "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", diff --git a/centos-6.8-i386.json b/centos-6.8-i386.json index a719dcb14..b915dfb9f 100644 --- a/centos-6.8-i386.json +++ b/centos-6.8-i386.json @@ -6,8 +6,7 @@ ], "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", - "guest_additions_url": "https://www.virtualbox.org/download/testcase/VBoxGuestAdditions_5.1.21-115005.iso", - "guest_additions_sha256": "d348c2265b8ebae37ef3599dcbb839599093550ae1c60b0c7d471a48ecf70213", + "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "guest_os_type": "RedHat", "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", diff --git a/centos-6.8-x86_64.json b/centos-6.8-x86_64.json index 4e53ec14f..883abb13b 100644 --- a/centos-6.8-x86_64.json +++ b/centos-6.8-x86_64.json @@ -6,8 +6,7 @@ ], "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", - "guest_additions_url": "https://www.virtualbox.org/download/testcase/VBoxGuestAdditions_5.1.21-115005.iso", - "guest_additions_sha256": "d348c2265b8ebae37ef3599dcbb839599093550ae1c60b0c7d471a48ecf70213", + "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "guest_os_type": "RedHat_64", "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", diff --git a/centos-6.9-i386.json b/centos-6.9-i386.json index 8087a761f..cf5d3a62f 100644 --- a/centos-6.9-i386.json +++ b/centos-6.9-i386.json @@ -6,8 +6,7 @@ ], "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", - "guest_additions_url": "https://www.virtualbox.org/download/testcase/VBoxGuestAdditions_5.1.21-115005.iso", - "guest_additions_sha256": "d348c2265b8ebae37ef3599dcbb839599093550ae1c60b0c7d471a48ecf70213", + "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "guest_os_type": "RedHat", "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", diff --git a/centos-6.9-x86_64.json b/centos-6.9-x86_64.json index e56c67b49..b326a971f 100644 --- a/centos-6.9-x86_64.json +++ b/centos-6.9-x86_64.json @@ -6,8 +6,7 @@ ], "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", - "guest_additions_url": "https://www.virtualbox.org/download/testcase/VBoxGuestAdditions_5.1.21-115005.iso", - "guest_additions_sha256": "d348c2265b8ebae37ef3599dcbb839599093550ae1c60b0c7d471a48ecf70213", + "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "guest_os_type": "RedHat_64", "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", diff --git a/centos-7.3-x86_64.json b/centos-7.3-x86_64.json index c2d97bc38..d2725be9f 100644 --- a/centos-7.3-x86_64.json +++ b/centos-7.3-x86_64.json @@ -6,8 +6,7 @@ ], "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", - "guest_additions_url": "https://www.virtualbox.org/download/testcase/VBoxGuestAdditions_5.1.21-115005.iso", - "guest_additions_sha256": "d348c2265b8ebae37ef3599dcbb839599093550ae1c60b0c7d471a48ecf70213", + "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "guest_os_type": "RedHat_64", "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", diff --git a/debian-7.11-amd64.json b/debian-7.11-amd64.json index 75291b886..1ab8f8012 100644 --- a/debian-7.11-amd64.json +++ b/debian-7.11-amd64.json @@ -20,8 +20,7 @@ ], "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", - "guest_additions_url": "https://www.virtualbox.org/download/testcase/VBoxGuestAdditions_5.1.21-115005.iso", - "guest_additions_sha256": "d348c2265b8ebae37ef3599dcbb839599093550ae1c60b0c7d471a48ecf70213", + "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "guest_os_type": "Debian_64", "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", diff --git a/debian-7.11-i386.json b/debian-7.11-i386.json index e36c90cd6..89f7b154a 100644 --- a/debian-7.11-i386.json +++ b/debian-7.11-i386.json @@ -20,8 +20,7 @@ ], "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", - "guest_additions_url": "https://www.virtualbox.org/download/testcase/VBoxGuestAdditions_5.1.21-115005.iso", - "guest_additions_sha256": "d348c2265b8ebae37ef3599dcbb839599093550ae1c60b0c7d471a48ecf70213", + "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "guest_os_type": "Debian", "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", diff --git a/debian-8.7-amd64.json b/debian-8.7-amd64.json index 9e5fdce93..261b3d315 100644 --- a/debian-8.7-amd64.json +++ b/debian-8.7-amd64.json @@ -21,8 +21,7 @@ ], "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", - "guest_additions_url": "https://www.virtualbox.org/download/testcase/VBoxGuestAdditions_5.1.21-115005.iso", - "guest_additions_sha256": "d348c2265b8ebae37ef3599dcbb839599093550ae1c60b0c7d471a48ecf70213", + "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "guest_os_type": "Debian_64", "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", diff --git a/debian-8.7-i386.json b/debian-8.7-i386.json index 8a6086972..926a01e2d 100644 --- a/debian-8.7-i386.json +++ b/debian-8.7-i386.json @@ -21,8 +21,7 @@ ], "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", - "guest_additions_url": "https://www.virtualbox.org/download/testcase/VBoxGuestAdditions_5.1.21-115005.iso", - "guest_additions_sha256": "d348c2265b8ebae37ef3599dcbb839599093550ae1c60b0c7d471a48ecf70213", + "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "guest_os_type": "Debian", "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", diff --git a/fedora-24-i386.json b/fedora-24-i386.json index d7dd50a20..2dc50354f 100644 --- a/fedora-24-i386.json +++ b/fedora-24-i386.json @@ -6,8 +6,7 @@ ], "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", - "guest_additions_url": "https://www.virtualbox.org/download/testcase/VBoxGuestAdditions_5.1.21-115005.iso", - "guest_additions_sha256": "d348c2265b8ebae37ef3599dcbb839599093550ae1c60b0c7d471a48ecf70213", + "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "guest_os_type": "Fedora", "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", diff --git a/fedora-24-x86_64.json b/fedora-24-x86_64.json index 27a2164f8..a7ce8c5bb 100644 --- a/fedora-24-x86_64.json +++ b/fedora-24-x86_64.json @@ -6,8 +6,7 @@ ], "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", - "guest_additions_url": "https://www.virtualbox.org/download/testcase/VBoxGuestAdditions_5.1.21-115005.iso", - "guest_additions_sha256": "d348c2265b8ebae37ef3599dcbb839599093550ae1c60b0c7d471a48ecf70213", + "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "guest_os_type": "Fedora_64", "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", diff --git a/fedora-25-i386.json b/fedora-25-i386.json index 60ceb35f7..305093150 100644 --- a/fedora-25-i386.json +++ b/fedora-25-i386.json @@ -6,8 +6,7 @@ ], "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", - "guest_additions_url": "https://www.virtualbox.org/download/testcase/VBoxGuestAdditions_5.1.21-115005.iso", - "guest_additions_sha256": "d348c2265b8ebae37ef3599dcbb839599093550ae1c60b0c7d471a48ecf70213", + "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "guest_os_type": "Fedora", "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", diff --git a/fedora-25-x86_64.json b/fedora-25-x86_64.json index a73dc3220..88c728f0a 100644 --- a/fedora-25-x86_64.json +++ b/fedora-25-x86_64.json @@ -6,8 +6,7 @@ ], "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", - "guest_additions_url": "https://www.virtualbox.org/download/testcase/VBoxGuestAdditions_5.1.21-115005.iso", - "guest_additions_sha256": "d348c2265b8ebae37ef3599dcbb839599093550ae1c60b0c7d471a48ecf70213", + "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "guest_os_type": "Fedora_64", "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", diff --git a/freebsd-10.3-amd64.json b/freebsd-10.3-amd64.json index c1925609a..167b20b48 100644 --- a/freebsd-10.3-amd64.json +++ b/freebsd-10.3-amd64.json @@ -14,8 +14,7 @@ ], "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", - "guest_additions_url": "https://www.virtualbox.org/download/testcase/VBoxGuestAdditions_5.1.21-115005.iso", - "guest_additions_sha256": "d348c2265b8ebae37ef3599dcbb839599093550ae1c60b0c7d471a48ecf70213", + "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "guest_os_type": "FreeBSD_64", "headless": "{{ user `headless` }}", "http_directory": "http", diff --git a/freebsd-10.3-i386.json b/freebsd-10.3-i386.json index 931f3fafe..004de5eb5 100644 --- a/freebsd-10.3-i386.json +++ b/freebsd-10.3-i386.json @@ -14,8 +14,7 @@ ], "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", - "guest_additions_url": "https://www.virtualbox.org/download/testcase/VBoxGuestAdditions_5.1.21-115005.iso", - "guest_additions_sha256": "d348c2265b8ebae37ef3599dcbb839599093550ae1c60b0c7d471a48ecf70213", + "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "guest_os_type": "FreeBSD", "headless": "{{ user `headless` }}", "http_directory": "http", diff --git a/freebsd-11.0-amd64.json b/freebsd-11.0-amd64.json index ec08b82db..5b71010f9 100644 --- a/freebsd-11.0-amd64.json +++ b/freebsd-11.0-amd64.json @@ -14,8 +14,7 @@ ], "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", - "guest_additions_url": "https://www.virtualbox.org/download/testcase/VBoxGuestAdditions_5.1.21-115005.iso", - "guest_additions_sha256": "d348c2265b8ebae37ef3599dcbb839599093550ae1c60b0c7d471a48ecf70213", + "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "guest_os_type": "FreeBSD_64", "headless": "{{ user `headless` }}", "http_directory": "http", diff --git a/opensuse-leap-42.2-x86_64.json b/opensuse-leap-42.2-x86_64.json index 24f7334a2..522f2b0b5 100644 --- a/opensuse-leap-42.2-x86_64.json +++ b/opensuse-leap-42.2-x86_64.json @@ -10,8 +10,7 @@ ], "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", - "guest_additions_url": "https://www.virtualbox.org/download/testcase/VBoxGuestAdditions_5.1.21-115005.iso", - "guest_additions_sha256": "d348c2265b8ebae37ef3599dcbb839599093550ae1c60b0c7d471a48ecf70213", + "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "guest_os_type": "OpenSUSE_64", "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", diff --git a/oracle-5.11-i386.json b/oracle-5.11-i386.json index a79277eeb..948307ac6 100644 --- a/oracle-5.11-i386.json +++ b/oracle-5.11-i386.json @@ -6,8 +6,7 @@ ], "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", - "guest_additions_url": "https://www.virtualbox.org/download/testcase/VBoxGuestAdditions_5.1.21-115005.iso", - "guest_additions_sha256": "d348c2265b8ebae37ef3599dcbb839599093550ae1c60b0c7d471a48ecf70213", + "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "guest_os_type": "Oracle", "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", diff --git a/oracle-5.11-x86_64.json b/oracle-5.11-x86_64.json index bc5b94976..6d329deca 100644 --- a/oracle-5.11-x86_64.json +++ b/oracle-5.11-x86_64.json @@ -6,8 +6,7 @@ ], "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", - "guest_additions_url": "https://www.virtualbox.org/download/testcase/VBoxGuestAdditions_5.1.21-115005.iso", - "guest_additions_sha256": "d348c2265b8ebae37ef3599dcbb839599093550ae1c60b0c7d471a48ecf70213", + "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "guest_os_type": "Oracle_64", "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", diff --git a/oracle-6.8-i386.json b/oracle-6.8-i386.json index 89abc7d74..019073760 100644 --- a/oracle-6.8-i386.json +++ b/oracle-6.8-i386.json @@ -6,8 +6,7 @@ ], "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", - "guest_additions_url": "https://www.virtualbox.org/download/testcase/VBoxGuestAdditions_5.1.21-115005.iso", - "guest_additions_sha256": "d348c2265b8ebae37ef3599dcbb839599093550ae1c60b0c7d471a48ecf70213", + "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "guest_os_type": "Oracle", "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", diff --git a/oracle-6.8-x86_64.json b/oracle-6.8-x86_64.json index d5d0889bd..1e1d2eac1 100644 --- a/oracle-6.8-x86_64.json +++ b/oracle-6.8-x86_64.json @@ -6,8 +6,7 @@ ], "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", - "guest_additions_url": "https://www.virtualbox.org/download/testcase/VBoxGuestAdditions_5.1.21-115005.iso", - "guest_additions_sha256": "d348c2265b8ebae37ef3599dcbb839599093550ae1c60b0c7d471a48ecf70213", + "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "guest_os_type": "Oracle_64", "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", diff --git a/oracle-7.3-x86_64.json b/oracle-7.3-x86_64.json index 527c8cce2..9fccd42f1 100644 --- a/oracle-7.3-x86_64.json +++ b/oracle-7.3-x86_64.json @@ -6,8 +6,7 @@ ], "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", - "guest_additions_url": "https://www.virtualbox.org/download/testcase/VBoxGuestAdditions_5.1.21-115005.iso", - "guest_additions_sha256": "d348c2265b8ebae37ef3599dcbb839599093550ae1c60b0c7d471a48ecf70213", + "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "guest_os_type": "Oracle_64", "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", diff --git a/rhel-5.11-i386.json b/rhel-5.11-i386.json index 60f9e7e64..9de1b76f6 100644 --- a/rhel-5.11-i386.json +++ b/rhel-5.11-i386.json @@ -6,8 +6,7 @@ ], "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", - "guest_additions_url": "https://www.virtualbox.org/download/testcase/VBoxGuestAdditions_5.1.21-115005.iso", - "guest_additions_sha256": "d348c2265b8ebae37ef3599dcbb839599093550ae1c60b0c7d471a48ecf70213", + "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "guest_os_type": "RedHat", "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", diff --git a/rhel-5.11-x86_64.json b/rhel-5.11-x86_64.json index 7bff52931..2bd05e2a2 100644 --- a/rhel-5.11-x86_64.json +++ b/rhel-5.11-x86_64.json @@ -6,8 +6,7 @@ ], "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", - "guest_additions_url": "https://www.virtualbox.org/download/testcase/VBoxGuestAdditions_5.1.21-115005.iso", - "guest_additions_sha256": "d348c2265b8ebae37ef3599dcbb839599093550ae1c60b0c7d471a48ecf70213", + "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "guest_os_type": "RedHat_64", "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", diff --git a/rhel-6.8-i386.json b/rhel-6.8-i386.json index 03e3b5688..7968a43f9 100644 --- a/rhel-6.8-i386.json +++ b/rhel-6.8-i386.json @@ -6,8 +6,7 @@ ], "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", - "guest_additions_url": "https://www.virtualbox.org/download/testcase/VBoxGuestAdditions_5.1.21-115005.iso", - "guest_additions_sha256": "d348c2265b8ebae37ef3599dcbb839599093550ae1c60b0c7d471a48ecf70213", + "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "guest_os_type": "RedHat", "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", diff --git a/rhel-6.8-x86_64.json b/rhel-6.8-x86_64.json index 252e1cb5a..0d14c820b 100644 --- a/rhel-6.8-x86_64.json +++ b/rhel-6.8-x86_64.json @@ -6,8 +6,7 @@ ], "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", - "guest_additions_url": "https://www.virtualbox.org/download/testcase/VBoxGuestAdditions_5.1.21-115005.iso", - "guest_additions_sha256": "d348c2265b8ebae37ef3599dcbb839599093550ae1c60b0c7d471a48ecf70213", + "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "guest_os_type": "RedHat_64", "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", diff --git a/rhel-7.3-x86_64.json b/rhel-7.3-x86_64.json index 3769bc857..f4f4c9138 100644 --- a/rhel-7.3-x86_64.json +++ b/rhel-7.3-x86_64.json @@ -6,8 +6,7 @@ ], "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", - "guest_additions_url": "https://www.virtualbox.org/download/testcase/VBoxGuestAdditions_5.1.21-115005.iso", - "guest_additions_sha256": "d348c2265b8ebae37ef3599dcbb839599093550ae1c60b0c7d471a48ecf70213", + "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "guest_os_type": "RedHat_64", "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", diff --git a/sles-12-sp1-x86_64.json b/sles-12-sp1-x86_64.json index bd9a4403b..964f5e9ba 100644 --- a/sles-12-sp1-x86_64.json +++ b/sles-12-sp1-x86_64.json @@ -10,8 +10,7 @@ ], "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", - "guest_additions_url": "https://www.virtualbox.org/download/testcase/VBoxGuestAdditions_5.1.21-115005.iso", - "guest_additions_sha256": "d348c2265b8ebae37ef3599dcbb839599093550ae1c60b0c7d471a48ecf70213", + "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "guest_os_type": "OpenSUSE_64", "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", diff --git a/sles-12-sp2-x86_64.json b/sles-12-sp2-x86_64.json index 28cb67546..054c5e5da 100644 --- a/sles-12-sp2-x86_64.json +++ b/sles-12-sp2-x86_64.json @@ -10,8 +10,7 @@ ], "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", - "guest_additions_url": "https://www.virtualbox.org/download/testcase/VBoxGuestAdditions_5.1.21-115005.iso", - "guest_additions_sha256": "d348c2265b8ebae37ef3599dcbb839599093550ae1c60b0c7d471a48ecf70213", + "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "guest_os_type": "OpenSUSE_64", "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", diff --git a/sles-12-x86_64.json b/sles-12-x86_64.json index 8e1667dd2..b75556dac 100644 --- a/sles-12-x86_64.json +++ b/sles-12-x86_64.json @@ -10,8 +10,7 @@ ], "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", - "guest_additions_url": "https://www.virtualbox.org/download/testcase/VBoxGuestAdditions_5.1.21-115005.iso", - "guest_additions_sha256": "d348c2265b8ebae37ef3599dcbb839599093550ae1c60b0c7d471a48ecf70213", + "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "guest_os_type": "OpenSUSE_64", "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", diff --git a/ubuntu-12.04-amd64.json b/ubuntu-12.04-amd64.json index 66629403f..23cdb397c 100644 --- a/ubuntu-12.04-amd64.json +++ b/ubuntu-12.04-amd64.json @@ -27,8 +27,7 @@ ], "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", - "guest_additions_url": "https://www.virtualbox.org/download/testcase/VBoxGuestAdditions_5.1.21-115005.iso", - "guest_additions_sha256": "d348c2265b8ebae37ef3599dcbb839599093550ae1c60b0c7d471a48ecf70213", + "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "guest_os_type": "Ubuntu_64", "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", diff --git a/ubuntu-12.04-i386.json b/ubuntu-12.04-i386.json index fce2ae975..4bd781fa2 100644 --- a/ubuntu-12.04-i386.json +++ b/ubuntu-12.04-i386.json @@ -27,8 +27,7 @@ ], "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", - "guest_additions_url": "https://www.virtualbox.org/download/testcase/VBoxGuestAdditions_5.1.21-115005.iso", - "guest_additions_sha256": "d348c2265b8ebae37ef3599dcbb839599093550ae1c60b0c7d471a48ecf70213", + "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "guest_os_type": "Ubuntu", "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", diff --git a/ubuntu-14.04-amd64.json b/ubuntu-14.04-amd64.json index 78c0da257..9adc1554f 100644 --- a/ubuntu-14.04-amd64.json +++ b/ubuntu-14.04-amd64.json @@ -27,8 +27,7 @@ ], "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", - "guest_additions_url": "https://www.virtualbox.org/download/testcase/VBoxGuestAdditions_5.1.21-115005.iso", - "guest_additions_sha256": "d348c2265b8ebae37ef3599dcbb839599093550ae1c60b0c7d471a48ecf70213", + "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "guest_os_type": "Ubuntu_64", "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", diff --git a/ubuntu-14.04-i386.json b/ubuntu-14.04-i386.json index 8c2e250ca..b6f499003 100644 --- a/ubuntu-14.04-i386.json +++ b/ubuntu-14.04-i386.json @@ -27,8 +27,7 @@ ], "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", - "guest_additions_url": "https://www.virtualbox.org/download/testcase/VBoxGuestAdditions_5.1.21-115005.iso", - "guest_additions_sha256": "d348c2265b8ebae37ef3599dcbb839599093550ae1c60b0c7d471a48ecf70213", + "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "guest_os_type": "Ubuntu", "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", diff --git a/ubuntu-16.04-amd64.json b/ubuntu-16.04-amd64.json index 97e823b20..5b910a923 100644 --- a/ubuntu-16.04-amd64.json +++ b/ubuntu-16.04-amd64.json @@ -29,8 +29,7 @@ ], "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", - "guest_additions_url": "https://www.virtualbox.org/download/testcase/VBoxGuestAdditions_5.1.21-115005.iso", - "guest_additions_sha256": "d348c2265b8ebae37ef3599dcbb839599093550ae1c60b0c7d471a48ecf70213", + "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "guest_os_type": "Ubuntu_64", "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", diff --git a/ubuntu-16.04-i386.json b/ubuntu-16.04-i386.json index a995d7b23..707bfb20d 100644 --- a/ubuntu-16.04-i386.json +++ b/ubuntu-16.04-i386.json @@ -29,8 +29,7 @@ ], "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", - "guest_additions_url": "https://www.virtualbox.org/download/testcase/VBoxGuestAdditions_5.1.21-115005.iso", - "guest_additions_sha256": "d348c2265b8ebae37ef3599dcbb839599093550ae1c60b0c7d471a48ecf70213", + "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "guest_os_type": "Ubuntu", "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", diff --git a/ubuntu-16.10-amd64.json b/ubuntu-16.10-amd64.json index 5f6381753..abf40aa29 100644 --- a/ubuntu-16.10-amd64.json +++ b/ubuntu-16.10-amd64.json @@ -28,8 +28,7 @@ ], "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", - "guest_additions_url": "https://www.virtualbox.org/download/testcase/VBoxGuestAdditions_5.1.21-115005.iso", - "guest_additions_sha256": "d348c2265b8ebae37ef3599dcbb839599093550ae1c60b0c7d471a48ecf70213", + "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "guest_os_type": "Ubuntu_64", "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", diff --git a/ubuntu-16.10-i386.json b/ubuntu-16.10-i386.json index 2a8f49387..3552293ff 100644 --- a/ubuntu-16.10-i386.json +++ b/ubuntu-16.10-i386.json @@ -28,8 +28,7 @@ ], "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", - "guest_additions_url": "https://www.virtualbox.org/download/testcase/VBoxGuestAdditions_5.1.21-115005.iso", - "guest_additions_sha256": "d348c2265b8ebae37ef3599dcbb839599093550ae1c60b0c7d471a48ecf70213", + "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "guest_os_type": "Ubuntu", "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", From ffd07a4eb4ce088a7dcd32757512d59f770aa7ac Mon Sep 17 00:00:00 2001 From: Seth Thomas <sthomas@chef.io> Date: Wed, 3 May 2017 08:53:58 -0400 Subject: [PATCH 0612/1622] Adding back Signed-off-by: Seth Thomas <sthomas@chef.io> --- scripts/common/virtualbox.sh | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/scripts/common/virtualbox.sh b/scripts/common/virtualbox.sh index 72cca52c8..23edc9691 100644 --- a/scripts/common/virtualbox.sh +++ b/scripts/common/virtualbox.sh @@ -3,13 +3,7 @@ case "$PACKER_BUILDER_TYPE" in virtualbox-iso|virtualbox-ovf) VER="`cat /home/vagrant/.vbox_version`"; - ISO="VBoxGuestAdditions.iso"; - - echo "Working around regression in 5.1.20 guest additions"; - echo "So we're using an updated test build"; - echo "It's probably fine"; - echo "Virtualbox Tools Version: 5.1.21"; - + ISO="VBoxGuestAdditions_$VER.iso"; mkdir -p /tmp/vbox; mount -o loop $HOME_DIR/$ISO /tmp/vbox; sh /tmp/vbox/VBoxLinuxAdditions.run \ From 411c04b73afa918ddcfffcf75eaf7ead8c32f97c Mon Sep 17 00:00:00 2001 From: NoahO <noah.odonoghue@gmail.com> Date: Wed, 17 May 2017 16:27:33 +0700 Subject: [PATCH 0613/1622] Added Ubuntu 17.04 support --- builds.yml | 3 + ubuntu-17.04-amd64.json | 273 ++++++++++++++++++++++++++++++++++++++++ ubuntu-17.04-i386.json | 273 ++++++++++++++++++++++++++++++++++++++++ 3 files changed, 549 insertions(+) create mode 100644 ubuntu-17.04-amd64.json create mode 100644 ubuntu-17.04-i386.json diff --git a/builds.yml b/builds.yml index 174914c86..e2b687f0a 100644 --- a/builds.yml +++ b/builds.yml @@ -59,6 +59,9 @@ public: '16.10': - amd64 - i386 + '17.04': + - amd64 + - i386 private: rhel: diff --git a/ubuntu-17.04-amd64.json b/ubuntu-17.04-amd64.json new file mode 100644 index 000000000..c57841202 --- /dev/null +++ b/ubuntu-17.04-amd64.json @@ -0,0 +1,273 @@ +{ + "builders": [ + { + "boot_command": [ + "<esc><wait>", + "<esc><wait>", + "<enter><wait>", + "/install/vmlinuz<wait>", + " auto<wait>", + " console-setup/ask_detect=false<wait>", + " console-setup/layoutcode=us<wait>", + " console-setup/modelcode=pc105<wait>", + " debconf/frontend=noninteractive<wait>", + " debian-installer=en_US<wait>", + " fb=false<wait>", + " initrd=/install/initrd.gz<wait>", + " kbd-chooser/method=us<wait>", + " keyboard-configuration/layout=USA<wait>", + " keyboard-configuration/variant=USA<wait>", + " locale=en_US<wait>", + " netcfg/get_domain=vm<wait>", + " netcfg/get_hostname=vagrant<wait>", + " grub-installer/bootdev=/dev/sda<wait>", + " noapic<wait>", + " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}}<wait>", + " -- <wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": "{{user `disk_size`}}", + "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "guest_os_type": "Ubuntu_64", + "hard_drive_interface": "sata", + "headless": "{{ user `headless` }}", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-virtualbox", + "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "virtualbox-iso", + "vboxmanage": [ + [ + "modifyvm", + "{{.Name}}", + "--memory", + "{{ user `memory` }}" + ], + [ + "modifyvm", + "{{.Name}}", + "--cpus", + "{{ user `cpus` }}" + ] + ], + "virtualbox_version_file": ".vbox_version", + "vm_name": "{{ user `template` }}" + }, + { + "boot_command": [ + "<esc><wait>", + "<esc><wait>", + "<enter><wait>", + "/install/vmlinuz<wait>", + " auto<wait>", + " console-setup/ask_detect=false<wait>", + " console-setup/layoutcode=us<wait>", + " console-setup/modelcode=pc105<wait>", + " debconf/frontend=noninteractive<wait>", + " debian-installer=en_US<wait>", + " fb=false<wait>", + " initrd=/install/initrd.gz<wait>", + " kbd-chooser/method=us<wait>", + " keyboard-configuration/layout=USA<wait>", + " keyboard-configuration/variant=USA<wait>", + " locale=en_US<wait>", + " netcfg/get_domain=vm<wait>", + " netcfg/get_hostname=vagrant<wait>", + " grub-installer/bootdev=/dev/sda<wait>", + " noapic<wait>", + " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}}<wait>", + " -- <wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": "{{user `disk_size`}}", + "guest_os_type": "ubuntu-64", + "headless": "{{ user `headless` }}", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-vmware", + "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "tools_upload_flavor": "linux", + "type": "vmware-iso", + "vm_name": "{{ user `template` }}", + "vmx_data": { + "cpuid.coresPerSocket": "1", + "ethernet0.pciSlotNumber": "32", + "memsize": "{{ user `memory` }}", + "numvcpus": "{{ user `cpus` }}" + } + }, + { + "boot_command": [ + "<esc><wait>", + "<esc><wait>", + "<enter><wait>", + "/install/vmlinuz<wait>", + " auto<wait>", + " console-setup/ask_detect=false<wait>", + " console-setup/layoutcode=us<wait>", + " console-setup/modelcode=pc105<wait>", + " debconf/frontend=noninteractive<wait>", + " debian-installer=en_US<wait>", + " fb=false<wait>", + " initrd=/install/initrd.gz<wait>", + " kbd-chooser/method=us<wait>", + " keyboard-configuration/layout=USA<wait>", + " keyboard-configuration/variant=USA<wait>", + " locale=en_US<wait>", + " netcfg/get_domain=vm<wait>", + " netcfg/get_hostname=vagrant<wait>", + " grub-installer/bootdev=/dev/sda<wait>", + " noapic<wait>", + " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}}<wait>", + " -- <wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": "{{user `disk_size`}}", + "guest_os_type": "ubuntu", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-parallels", + "parallels_tools_flavor": "lin", + "prlctl": [ + [ + "set", + "{{.Name}}", + "--memsize", + "{{ user `memory` }}" + ], + [ + "set", + "{{.Name}}", + "--cpus", + "{{ user `cpus` }}" + ] + ], + "prlctl_version_file": ".prlctl_version", + "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "parallels-iso", + "vm_name": "{{ user `template` }}" + }, + { + "boot_command": [ + "<esc><wait>", + "<esc><wait>", + "<enter><wait>", + "/install/vmlinuz<wait>", + " auto<wait>", + " console-setup/ask_detect=false<wait>", + " console-setup/layoutcode=us<wait>", + " console-setup/modelcode=pc105<wait>", + " debconf/frontend=noninteractive<wait>", + " debian-installer=en_US<wait>", + " fb=false<wait>", + " initrd=/install/initrd.gz<wait>", + " kbd-chooser/method=us<wait>", + " keyboard-configuration/layout=USA<wait>", + " keyboard-configuration/variant=USA<wait>", + " locale=en_US<wait>", + " netcfg/get_domain=vm<wait>", + " netcfg/get_hostname=vagrant<wait>", + " grub-installer/bootdev=/dev/vda<wait>", + " noapic<wait>", + " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}}<wait>", + " -- <wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": "{{user `disk_size`}}", + "headless": "{{ user `headless` }}", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-qemu", + "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "qemu", + "vm_name": "{{ user `template` }}" + } + ], + "post-processors": [ + { + "output": "builds/{{user `box_basename`}}.{{.Provider}}.box", + "type": "vagrant" + } + ], + "provisioners": [ + { + "destination": "/tmp/bento-metadata.json", + "source": "{{user `metadata`}}", + "type": "file" + }, + { + "environment_vars": [ + "HOME_DIR=/home/vagrant", + "http_proxy={{user `http_proxy`}}", + "https_proxy={{user `https_proxy`}}", + "no_proxy={{user `no_proxy`}}" + ], + "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", + "scripts": [ + "scripts/common/metadata.sh", + "scripts/ubuntu/update.sh", + "scripts/common/sshd.sh", + "scripts/ubuntu/networking.sh", + "scripts/ubuntu/sudoers.sh", + "scripts/ubuntu/vagrant.sh", + "scripts/common/virtualbox.sh", + "scripts/ubuntu/vmware.sh", + "scripts/common/parallels.sh", + "scripts/ubuntu/cleanup.sh", + "scripts/common/minimize.sh" + ], + "type": "shell" + } + ], + "variables": { + "box_basename": "ubuntu-17.04", + "build_timestamp": "{{isotime \"20060102150405\"}}", + "cpus": "1", + "disk_size": "40960", + "git_revision": "__unknown_git_revision__", + "headless": "", + "http_proxy": "{{env `http_proxy`}}", + "https_proxy": "{{env `https_proxy`}}", + "iso_checksum": "ca5d9a8438e2434b9a3ac2be67b5c5fa2c1f8e3e40b954519462935195464034", + "iso_checksum_type": "sha256", + "iso_name": "ubuntu-17.04-server-amd64.iso", + "memory": "512", + "metadata": "floppy/dummy_metadata.json", + "mirror": "http://releases.ubuntu.com", + "mirror_directory": "17.04", + "name": "ubuntu-17.04", + "no_proxy": "{{env `no_proxy`}}", + "preseed_path": "ubuntu-16.04/preseed.cfg", + "template": "ubuntu-17.04-amd64", + "version": "2.1.TIMESTAMP" + } +} + diff --git a/ubuntu-17.04-i386.json b/ubuntu-17.04-i386.json new file mode 100644 index 000000000..7403c1ee9 --- /dev/null +++ b/ubuntu-17.04-i386.json @@ -0,0 +1,273 @@ +{ + "builders": [ + { + "boot_command": [ + "<esc><wait>", + "<esc><wait>", + "<enter><wait>", + "/install/vmlinuz<wait>", + " auto<wait>", + " console-setup/ask_detect=false<wait>", + " console-setup/layoutcode=us<wait>", + " console-setup/modelcode=pc105<wait>", + " debconf/frontend=noninteractive<wait>", + " debian-installer=en_US<wait>", + " fb=false<wait>", + " initrd=/install/initrd.gz<wait>", + " kbd-chooser/method=us<wait>", + " keyboard-configuration/layout=USA<wait>", + " keyboard-configuration/variant=USA<wait>", + " locale=en_US<wait>", + " netcfg/get_domain=vm<wait>", + " netcfg/get_hostname=vagrant<wait>", + " grub-installer/bootdev=/dev/sda <wait>", + " noapic<wait>", + " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}}<wait>", + " -- <wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": "{{user `disk_size`}}", + "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "guest_os_type": "Ubuntu", + "hard_drive_interface": "sata", + "headless": "{{ user `headless` }}", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-virtualbox", + "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "virtualbox-iso", + "vboxmanage": [ + [ + "modifyvm", + "{{.Name}}", + "--memory", + "{{ user `memory` }}" + ], + [ + "modifyvm", + "{{.Name}}", + "--cpus", + "{{ user `cpus` }}" + ] + ], + "virtualbox_version_file": ".vbox_version", + "vm_name": "{{ user `template` }}" + }, + { + "boot_command": [ + "<esc><wait>", + "<esc><wait>", + "<enter><wait>", + "/install/vmlinuz<wait>", + " auto<wait>", + " console-setup/ask_detect=false<wait>", + " console-setup/layoutcode=us<wait>", + " console-setup/modelcode=pc105<wait>", + " debconf/frontend=noninteractive<wait>", + " debian-installer=en_US<wait>", + " fb=false<wait>", + " initrd=/install/initrd.gz<wait>", + " kbd-chooser/method=us<wait>", + " keyboard-configuration/layout=USA<wait>", + " keyboard-configuration/variant=USA<wait>", + " locale=en_US<wait>", + " netcfg/get_domain=vm<wait>", + " netcfg/get_hostname=vagrant<wait>", + " grub-installer/bootdev=/dev/sda <wait>", + " noapic<wait>", + " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}}<wait>", + " -- <wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": "{{user `disk_size`}}", + "guest_os_type": "ubuntu", + "headless": "{{ user `headless` }}", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-vmware", + "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "tools_upload_flavor": "linux", + "type": "vmware-iso", + "vm_name": "{{ user `template` }}", + "vmx_data": { + "cpuid.coresPerSocket": "1", + "ethernet0.pciSlotNumber": "32", + "memsize": "{{ user `memory` }}", + "numvcpus": "{{ user `cpus` }}" + } + }, + { + "boot_command": [ + "<esc><wait>", + "<esc><wait>", + "<enter><wait>", + "/install/vmlinuz<wait>", + " auto<wait>", + " console-setup/ask_detect=false<wait>", + " console-setup/layoutcode=us<wait>", + " console-setup/modelcode=pc105<wait>", + " debconf/frontend=noninteractive<wait>", + " debian-installer=en_US<wait>", + " fb=false<wait>", + " initrd=/install/initrd.gz<wait>", + " kbd-chooser/method=us<wait>", + " keyboard-configuration/layout=USA<wait>", + " keyboard-configuration/variant=USA<wait>", + " locale=en_US<wait>", + " netcfg/get_domain=vm<wait>", + " netcfg/get_hostname=vagrant<wait>", + " grub-installer/bootdev=/dev/sda <wait>", + " noapic<wait>", + " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}}<wait>", + " -- <wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": "{{user `disk_size`}}", + "guest_os_type": "ubuntu", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-parallels", + "parallels_tools_flavor": "lin", + "prlctl": [ + [ + "set", + "{{.Name}}", + "--memsize", + "{{ user `memory` }}" + ], + [ + "set", + "{{.Name}}", + "--cpus", + "{{ user `cpus` }}" + ] + ], + "prlctl_version_file": ".prlctl_version", + "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "parallels-iso", + "vm_name": "{{ user `template` }}" + }, + { + "boot_command": [ + "<esc><wait>", + "<esc><wait>", + "<enter><wait>", + "/install/vmlinuz<wait>", + " auto<wait>", + " console-setup/ask_detect=false<wait>", + " console-setup/layoutcode=us<wait>", + " console-setup/modelcode=pc105<wait>", + " debconf/frontend=noninteractive<wait>", + " debian-installer=en_US<wait>", + " fb=false<wait>", + " initrd=/install/initrd.gz<wait>", + " kbd-chooser/method=us<wait>", + " keyboard-configuration/layout=USA<wait>", + " keyboard-configuration/variant=USA<wait>", + " locale=en_US<wait>", + " netcfg/get_domain=vm<wait>", + " netcfg/get_hostname=vagrant<wait>", + " grub-installer/bootdev=/dev/vda <wait>", + " noapic<wait>", + " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}}<wait>", + " -- <wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": "{{user `disk_size`}}", + "headless": "{{ user `headless` }}", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-qemu", + "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "qemu", + "vm_name": "{{ user `template` }}" + } + ], + "post-processors": [ + { + "output": "builds/{{user `box_basename`}}.{{.Provider}}.box", + "type": "vagrant" + } + ], + "provisioners": [ + { + "destination": "/tmp/bento-metadata.json", + "source": "{{user `metadata`}}", + "type": "file" + }, + { + "environment_vars": [ + "HOME_DIR=/home/vagrant", + "http_proxy={{user `http_proxy`}}", + "https_proxy={{user `https_proxy`}}", + "no_proxy={{user `no_proxy`}}" + ], + "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", + "scripts": [ + "scripts/common/metadata.sh", + "scripts/ubuntu/update.sh", + "scripts/common/sshd.sh", + "scripts/ubuntu/networking.sh", + "scripts/ubuntu/sudoers.sh", + "scripts/ubuntu/vagrant.sh", + "scripts/common/virtualbox.sh", + "scripts/ubuntu/vmware.sh", + "scripts/common/parallels.sh", + "scripts/ubuntu/cleanup.sh", + "scripts/common/minimize.sh" + ], + "type": "shell" + } + ], + "variables": { + "box_basename": "ubuntu-17.04-i386", + "build_timestamp": "{{isotime \"20060102150405\"}}", + "cpus": "1", + "disk_size": "40960", + "git_revision": "__unknown_git_revision__", + "headless": "", + "http_proxy": "{{env `http_proxy`}}", + "https_proxy": "{{env `https_proxy`}}", + "iso_checksum": "dd7879be4e2f9f31672f6e7681ecafeccfac294afd8ca1b04b78bc37fb44291c", + "iso_checksum_type": "sha256", + "iso_name": "ubuntu-17.04-server-i386.iso", + "memory": "512", + "metadata": "floppy/dummy_metadata.json", + "mirror": "http://releases.ubuntu.com", + "mirror_directory": "17.04", + "name": "ubuntu-17.04-i386", + "no_proxy": "{{env `no_proxy`}}", + "preseed_path": "ubuntu-16.04/preseed.cfg", + "template": "ubuntu-17.04-i386", + "version": "2.1.TIMESTAMP" + } +} + From 0f6b46ae0f46376984ee0d557ecc327630861bc4 Mon Sep 17 00:00:00 2001 From: Michael Juliano <juliano.michael@gmail.com> Date: Sun, 4 Jun 2017 21:30:25 -0400 Subject: [PATCH 0614/1622] Added Oracle Linux 6.9 boxes. Signed-off-by: Michael Juliano <juliano.michael@gmail.com> --- oracle-6.9-i386.json | 182 ++++++++++++++++++++++++++++++++++++++++ oracle-6.9-x86_64.json | 183 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 365 insertions(+) create mode 100644 oracle-6.9-i386.json create mode 100644 oracle-6.9-x86_64.json diff --git a/oracle-6.9-i386.json b/oracle-6.9-i386.json new file mode 100644 index 000000000..3e8eace19 --- /dev/null +++ b/oracle-6.9-i386.json @@ -0,0 +1,182 @@ +{ + "builders": [ + { + "boot_command": [ + "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": "{{user `disk_size`}}", + "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "guest_os_type": "Oracle", + "hard_drive_interface": "sata", + "headless": "{{ user `headless` }}", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-virtualbox", + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "virtualbox-iso", + "vboxmanage": [ + [ + "modifyvm", + "{{.Name}}", + "--memory", + "{{ user `memory` }}" + ], + [ + "modifyvm", + "{{.Name}}", + "--cpus", + "{{ user `cpus` }}" + ] + ], + "virtualbox_version_file": ".vbox_version", + "vm_name": "{{ user `template` }}" + }, + { + "boot_command": [ + "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": "{{user `disk_size`}}", + "guest_os_type": "oraclelinux", + "headless": "{{ user `headless` }}", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-vmware", + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "tools_upload_flavor": "linux", + "type": "vmware-iso", + "vm_name": "{{ user `template` }}", + "vmx_data": { + "cpuid.coresPerSocket": "1", + "memsize": "{{ user `memory` }}", + "numvcpus": "{{ user `cpus` }}" + } + }, + { + "boot_command": [ + "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": "{{user `disk_size`}}", + "guest_os_type": "centos", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-parallels", + "parallels_tools_flavor": "lin", + "prlctl": [ + [ + "set", + "{{.Name}}", + "--memsize", + "{{ user `memory` }}" + ], + [ + "set", + "{{.Name}}", + "--cpus", + "{{ user `cpus` }}" + ] + ], + "prlctl_version_file": ".prlctl_version", + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "parallels-iso", + "vm_name": "{{ user `template` }}" + }, + { + "boot_command": [ + "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": "{{user `disk_size`}}", + "headless": "{{ user `headless` }}", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-qemu", + "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "qemu", + "vm_name": "{{ user `template` }}" + } + ], + "post-processors": [ + { + "output": "builds/{{user `box_basename`}}.{{.Provider}}.box", + "type": "vagrant" + } + ], + "provisioners": [ + { + "destination": "/tmp/bento-metadata.json", + "source": "{{user `metadata`}}", + "type": "file" + }, + { + "environment_vars": [ + "HOME_DIR=/home/vagrant", + "http_proxy={{user `http_proxy`}}", + "https_proxy={{user `https_proxy`}}", + "no_proxy={{user `no_proxy`}}" + ], + "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", + "scripts": [ + "scripts/common/metadata.sh", + "scripts/centos/networking.sh", + "scripts/common/sshd.sh", + "scripts/common/vagrant.sh", + "scripts/common/virtualbox.sh", + "scripts/common/vmware.sh", + "scripts/common/parallels.sh", + "scripts/centos/cleanup.sh", + "scripts/common/minimize.sh" + ], + "type": "shell" + } + ], + "variables": { + "arch": "32", + "box_basename": "oracle-6.9-i386", + "build_timestamp": "{{isotime \"20060102150405\"}}", + "cpus": "1", + "disk_size": "40960", + "git_revision": "__unknown_git_revision__", + "headless": "", + "http_proxy": "{{env `http_proxy`}}", + "https_proxy": "{{env `https_proxy`}}", + "iso_checksum": "fd07f775e7fa52e9ab021eb7dccb78453fc61f3d3b712ec426f6b1bf5020318b", + "iso_checksum_type": "sha256", + "iso_name": "OracleLinux-R6-U9-Server-i386-dvd.iso", + "ks_path": "centos-6.9/ks.cfg", + "memory": "512", + "metadata": "floppy/dummy_metadata.json", + "mirror": "http://mirrors.dotsrc.org/oracle-linux", + "mirror_directory": "OL6/U9/i386", + "name": "oracle-6.9-i386", + "no_proxy": "{{env `no_proxy`}}", + "template": "oracle-6.9-i386", + "version": "2.2.TIMESTAMP" + } +} diff --git a/oracle-6.9-x86_64.json b/oracle-6.9-x86_64.json new file mode 100644 index 000000000..e6a3c5c0a --- /dev/null +++ b/oracle-6.9-x86_64.json @@ -0,0 +1,183 @@ +{ + "builders": [ + { + "boot_command": [ + "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": "{{user `disk_size`}}", + "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "guest_os_type": "Oracle_64", + "hard_drive_interface": "sata", + "headless": "{{ user `headless` }}", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-virtualbox", + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "virtualbox-iso", + "vboxmanage": [ + [ + "modifyvm", + "{{.Name}}", + "--memory", + "{{ user `memory` }}" + ], + [ + "modifyvm", + "{{.Name}}", + "--cpus", + "{{ user `cpus` }}" + ] + ], + "virtualbox_version_file": ".vbox_version", + "vm_name": "{{ user `template` }}" + }, + { + "boot_command": [ + "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": "{{user `disk_size`}}", + "guest_os_type": "oraclelinux-64", + "headless": "{{ user `headless` }}", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-vmware", + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "tools_upload_flavor": "linux", + "type": "vmware-iso", + "vm_name": "{{ user `template` }}", + "vmx_data": { + "cpuid.coresPerSocket": "1", + "memsize": "{{ user `memory` }}", + "numvcpus": "{{ user `cpus` }}" + } + }, + { + "boot_command": [ + "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": "{{user `disk_size`}}", + "guest_os_type": "centos", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-parallels", + "parallels_tools_flavor": "lin", + "prlctl": [ + [ + "set", + "{{.Name}}", + "--memsize", + "{{ user `memory` }}" + ], + [ + "set", + "{{.Name}}", + "--cpus", + "{{ user `cpus` }}" + ] + ], + "prlctl_version_file": ".prlctl_version", + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "parallels-iso", + "vm_name": "{{ user `template` }}" + }, + { + "boot_command": [ + "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": "{{user `disk_size`}}", + "headless": "{{ user `headless` }}", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-qemu", + "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "qemu", + "vm_name": "{{ user `template` }}" + } + ], + "post-processors": [ + { + "output": "builds/{{user `box_basename`}}.{{.Provider}}.box", + "type": "vagrant" + } + ], + "provisioners": [ + { + "destination": "/tmp/bento-metadata.json", + "source": "{{user `metadata`}}", + "type": "file" + }, + { + "environment_vars": [ + "HOME_DIR=/home/vagrant", + "http_proxy={{user `http_proxy`}}", + "https_proxy={{user `https_proxy`}}", + "no_proxy={{user `no_proxy`}}" + ], + "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", + "scripts": [ + "scripts/common/metadata.sh", + "scripts/centos/networking.sh", + "scripts/common/sshd.sh", + "scripts/common/vagrant.sh", + "scripts/common/virtualbox.sh", + "scripts/common/vmware.sh", + "scripts/common/parallels.sh", + "scripts/centos/cleanup.sh", + "scripts/common/minimize.sh" + ], + "type": "shell" + } + ], + "variables": { + "arch": "64", + "box_basename": "oracle-6.9", + "build_timestamp": "{{isotime \"20060102150405\"}}", + "cpus": "1", + "disk_size": "40960", + "git_revision": "__unknown_git_revision__", + "headless": "", + "http_proxy": "{{env `http_proxy`}}", + "https_proxy": "{{env `https_proxy`}}", + "iso_checksum": "c32e2a7c8eb471db731741f1a30be37e49deda8ce961710273a71b26c9a04a36", + "iso_checksum_type": "sha256", + "iso_name": "OracleLinux-R6-U9-Server-x86_64-dvd.iso", + "ks_path": "centos-6.9/ks.cfg", + "memory": "512", + "metadata": "floppy/dummy_metadata.json", + "mirror": "http://mirrors.dotsrc.org/oracle-linux", + "mirror_directory": "OL6/U9/x86_64", + "name": "oracle-6.9", + "no_proxy": "{{env `no_proxy`}}", + "template": "oracle-6.9-x86_64", + "version": "2.0.TIMESTAMP" + } +} + From e52b9c8caf0b6346399fcaee7153a1ffac2c94fc Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith@chef.io> Date: Mon, 19 Jun 2017 21:52:06 -0700 Subject: [PATCH 0615/1622] Remove the Oracle 6.8 configs Signed-off-by: Tim Smith <tsmith@chef.io> --- oracle-6.8-i386.json | 182 ---------------------------------------- oracle-6.8-x86_64.json | 183 ----------------------------------------- 2 files changed, 365 deletions(-) delete mode 100644 oracle-6.8-i386.json delete mode 100644 oracle-6.8-x86_64.json diff --git a/oracle-6.8-i386.json b/oracle-6.8-i386.json deleted file mode 100644 index 019073760..000000000 --- a/oracle-6.8-i386.json +++ /dev/null @@ -1,182 +0,0 @@ -{ - "builders": [ - { - "boot_command": [ - "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", - "guest_os_type": "Oracle", - "hard_drive_interface": "sata", - "headless": "{{ user `headless` }}", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-virtualbox", - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "virtualbox-iso", - "vboxmanage": [ - [ - "modifyvm", - "{{.Name}}", - "--memory", - "{{ user `memory` }}" - ], - [ - "modifyvm", - "{{.Name}}", - "--cpus", - "{{ user `cpus` }}" - ] - ], - "virtualbox_version_file": ".vbox_version", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "oraclelinux", - "headless": "{{ user `headless` }}", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-vmware", - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "tools_upload_flavor": "linux", - "type": "vmware-iso", - "vm_name": "{{ user `template` }}", - "vmx_data": { - "cpuid.coresPerSocket": "1", - "memsize": "{{ user `memory` }}", - "numvcpus": "{{ user `cpus` }}" - } - }, - { - "boot_command": [ - "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "centos", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-parallels", - "parallels_tools_flavor": "lin", - "prlctl": [ - [ - "set", - "{{.Name}}", - "--memsize", - "{{ user `memory` }}" - ], - [ - "set", - "{{.Name}}", - "--cpus", - "{{ user `cpus` }}" - ] - ], - "prlctl_version_file": ".prlctl_version", - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "parallels-iso", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "headless": "{{ user `headless` }}", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-qemu", - "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "qemu", - "vm_name": "{{ user `template` }}" - } - ], - "post-processors": [ - { - "output": "builds/{{user `box_basename`}}.{{.Provider}}.box", - "type": "vagrant" - } - ], - "provisioners": [ - { - "destination": "/tmp/bento-metadata.json", - "source": "{{user `metadata`}}", - "type": "file" - }, - { - "environment_vars": [ - "HOME_DIR=/home/vagrant", - "http_proxy={{user `http_proxy`}}", - "https_proxy={{user `https_proxy`}}", - "no_proxy={{user `no_proxy`}}" - ], - "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", - "scripts": [ - "scripts/common/metadata.sh", - "scripts/centos/networking.sh", - "scripts/common/sshd.sh", - "scripts/common/vagrant.sh", - "scripts/common/virtualbox.sh", - "scripts/common/vmware.sh", - "scripts/common/parallels.sh", - "scripts/centos/cleanup.sh", - "scripts/common/minimize.sh" - ], - "type": "shell" - } - ], - "variables": { - "arch": "32", - "box_basename": "oracle-6.8-i386", - "build_timestamp": "{{isotime \"20060102150405\"}}", - "cpus": "1", - "disk_size": "40960", - "git_revision": "__unknown_git_revision__", - "headless": "", - "http_proxy": "{{env `http_proxy`}}", - "https_proxy": "{{env `https_proxy`}}", - "iso_checksum": "809eb9e9f44683ff875c64a00a85576ef93b679e98919f4fde8f856af9dac356", - "iso_checksum_type": "sha256", - "iso_name": "OracleLinux-R6-U8-Server-i386-dvd.iso", - "ks_path": "centos-6.8/ks.cfg", - "memory": "512", - "metadata": "floppy/dummy_metadata.json", - "mirror": "http://mirrors.dotsrc.org/oracle-linux", - "mirror_directory": "OL6/U8/i386", - "name": "oracle-6.8-i386", - "no_proxy": "{{env `no_proxy`}}", - "template": "oracle-6.8-i386", - "version": "2.2.TIMESTAMP" - } -} diff --git a/oracle-6.8-x86_64.json b/oracle-6.8-x86_64.json deleted file mode 100644 index 1e1d2eac1..000000000 --- a/oracle-6.8-x86_64.json +++ /dev/null @@ -1,183 +0,0 @@ -{ - "builders": [ - { - "boot_command": [ - "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", - "guest_os_type": "Oracle_64", - "hard_drive_interface": "sata", - "headless": "{{ user `headless` }}", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-virtualbox", - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "virtualbox-iso", - "vboxmanage": [ - [ - "modifyvm", - "{{.Name}}", - "--memory", - "{{ user `memory` }}" - ], - [ - "modifyvm", - "{{.Name}}", - "--cpus", - "{{ user `cpus` }}" - ] - ], - "virtualbox_version_file": ".vbox_version", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "oraclelinux-64", - "headless": "{{ user `headless` }}", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-vmware", - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "tools_upload_flavor": "linux", - "type": "vmware-iso", - "vm_name": "{{ user `template` }}", - "vmx_data": { - "cpuid.coresPerSocket": "1", - "memsize": "{{ user `memory` }}", - "numvcpus": "{{ user `cpus` }}" - } - }, - { - "boot_command": [ - "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "centos", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-parallels", - "parallels_tools_flavor": "lin", - "prlctl": [ - [ - "set", - "{{.Name}}", - "--memsize", - "{{ user `memory` }}" - ], - [ - "set", - "{{.Name}}", - "--cpus", - "{{ user `cpus` }}" - ] - ], - "prlctl_version_file": ".prlctl_version", - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "parallels-iso", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "headless": "{{ user `headless` }}", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-qemu", - "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "qemu", - "vm_name": "{{ user `template` }}" - } - ], - "post-processors": [ - { - "output": "builds/{{user `box_basename`}}.{{.Provider}}.box", - "type": "vagrant" - } - ], - "provisioners": [ - { - "destination": "/tmp/bento-metadata.json", - "source": "{{user `metadata`}}", - "type": "file" - }, - { - "environment_vars": [ - "HOME_DIR=/home/vagrant", - "http_proxy={{user `http_proxy`}}", - "https_proxy={{user `https_proxy`}}", - "no_proxy={{user `no_proxy`}}" - ], - "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", - "scripts": [ - "scripts/common/metadata.sh", - "scripts/centos/networking.sh", - "scripts/common/sshd.sh", - "scripts/common/vagrant.sh", - "scripts/common/virtualbox.sh", - "scripts/common/vmware.sh", - "scripts/common/parallels.sh", - "scripts/centos/cleanup.sh", - "scripts/common/minimize.sh" - ], - "type": "shell" - } - ], - "variables": { - "arch": "64", - "box_basename": "oracle-6.8", - "build_timestamp": "{{isotime \"20060102150405\"}}", - "cpus": "1", - "disk_size": "40960", - "git_revision": "__unknown_git_revision__", - "headless": "", - "http_proxy": "{{env `http_proxy`}}", - "https_proxy": "{{env `https_proxy`}}", - "iso_checksum": "de114b9a108ad9b3c9a27764fddffbc1019b9b7913ee6d9b717f65041780c879", - "iso_checksum_type": "sha256", - "iso_name": "OracleLinux-R6-U8-Server-x86_64-dvd.iso", - "ks_path": "centos-6.8/ks.cfg", - "memory": "512", - "metadata": "floppy/dummy_metadata.json", - "mirror": "http://mirrors.dotsrc.org/oracle-linux", - "mirror_directory": "OL6/U8/x86_64", - "name": "oracle-6.8", - "no_proxy": "{{env `no_proxy`}}", - "template": "oracle-6.8-x86_64", - "version": "2.0.TIMESTAMP" - } -} - From 185123dea26b33593d97d35083f0260dbd400ec0 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith@chef.io> Date: Mon, 19 Jun 2017 21:52:32 -0700 Subject: [PATCH 0616/1622] Use the kernel.org mirror for Oracle Linux It's much faster and what we're using for CentOS Signed-off-by: Tim Smith <tsmith@chef.io> --- oracle-6.9-i386.json | 2 +- oracle-6.9-x86_64.json | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/oracle-6.9-i386.json b/oracle-6.9-i386.json index 3e8eace19..dbf418e98 100644 --- a/oracle-6.9-i386.json +++ b/oracle-6.9-i386.json @@ -172,7 +172,7 @@ "ks_path": "centos-6.9/ks.cfg", "memory": "512", "metadata": "floppy/dummy_metadata.json", - "mirror": "http://mirrors.dotsrc.org/oracle-linux", + "mirror": "http://mirrors.kernel.org/oracle/", "mirror_directory": "OL6/U9/i386", "name": "oracle-6.9-i386", "no_proxy": "{{env `no_proxy`}}", diff --git a/oracle-6.9-x86_64.json b/oracle-6.9-x86_64.json index e6a3c5c0a..459488121 100644 --- a/oracle-6.9-x86_64.json +++ b/oracle-6.9-x86_64.json @@ -172,12 +172,11 @@ "ks_path": "centos-6.9/ks.cfg", "memory": "512", "metadata": "floppy/dummy_metadata.json", - "mirror": "http://mirrors.dotsrc.org/oracle-linux", + "mirror": "http://mirrors.kernel.org/oracle/", "mirror_directory": "OL6/U9/x86_64", "name": "oracle-6.9", "no_proxy": "{{env `no_proxy`}}", "template": "oracle-6.9-x86_64", - "version": "2.0.TIMESTAMP" + "version": "2.2.TIMESTAMP" } } - From 6a0d6fdec22d6b31954d42fdca9641fe3ad8916a Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith@chef.io> Date: Mon, 19 Jun 2017 22:06:41 -0700 Subject: [PATCH 0617/1622] Remove CentOS 6.8 configs and update Oracle in builds.yml Signed-off-by: Tim Smith <tsmith@chef.io> --- builds.yml | 4 +- centos-6.8-i386.json | 182 ----------------------------------------- centos-6.8-x86_64.json | 182 ----------------------------------------- http/centos-6.8/ks.cfg | 69 ---------------- 4 files changed, 2 insertions(+), 435 deletions(-) delete mode 100644 centos-6.8-i386.json delete mode 100644 centos-6.8-x86_64.json delete mode 100644 http/centos-6.8/ks.cfg diff --git a/builds.yml b/builds.yml index 174914c86..c952f2747 100644 --- a/builds.yml +++ b/builds.yml @@ -9,7 +9,7 @@ public: '5.11': - x86_64 - i386 - '6.8': + '6.9': - x86_64 - i386 '7.3': @@ -41,7 +41,7 @@ public: '5.11': - x86_64 - i386 - '6.8': + '6.9': - x86_64 - i386 '7.3': diff --git a/centos-6.8-i386.json b/centos-6.8-i386.json deleted file mode 100644 index b915dfb9f..000000000 --- a/centos-6.8-i386.json +++ /dev/null @@ -1,182 +0,0 @@ -{ - "builders": [ - { - "boot_command": [ - "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", - "guest_os_type": "RedHat", - "hard_drive_interface": "sata", - "headless": "{{ user `headless` }}", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-virtualbox", - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "virtualbox-iso", - "vboxmanage": [ - [ - "modifyvm", - "{{.Name}}", - "--memory", - "{{ user `memory` }}" - ], - [ - "modifyvm", - "{{.Name}}", - "--cpus", - "{{ user `cpus` }}" - ] - ], - "virtualbox_version_file": ".vbox_version", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "centos", - "headless": "{{ user `headless` }}", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-vmware", - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "tools_upload_flavor": "linux", - "type": "vmware-iso", - "vm_name": "{{ user `template` }}", - "vmx_data": { - "cpuid.coresPerSocket": "1", - "memsize": "{{ user `memory` }}", - "numvcpus": "{{ user `cpus` }}" - } - }, - { - "boot_command": [ - "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "centos", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-parallels", - "parallels_tools_flavor": "lin", - "prlctl": [ - [ - "set", - "{{.Name}}", - "--memsize", - "{{ user `memory` }}" - ], - [ - "set", - "{{.Name}}", - "--cpus", - "{{ user `cpus` }}" - ] - ], - "prlctl_version_file": ".prlctl_version", - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "parallels-iso", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "headless": "{{ user `headless` }}", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-qemu", - "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "qemu", - "vm_name": "{{ user `template` }}" - } - ], - "post-processors": [ - { - "output": "builds/{{user `box_basename`}}.{{.Provider}}.box", - "type": "vagrant" - } - ], - "provisioners": [ - { - "destination": "/tmp/bento-metadata.json", - "source": "{{user `metadata`}}", - "type": "file" - }, - { - "environment_vars": [ - "HOME_DIR=/home/vagrant", - "http_proxy={{user `http_proxy`}}", - "https_proxy={{user `https_proxy`}}", - "no_proxy={{user `no_proxy`}}" - ], - "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", - "scripts": [ - "scripts/common/metadata.sh", - "scripts/common/sshd.sh", - "scripts/centos/networking.sh", - "scripts/common/vagrant.sh", - "scripts/common/virtualbox.sh", - "scripts/common/vmware.sh", - "scripts/common/parallels.sh", - "scripts/centos/cleanup.sh", - "scripts/common/minimize.sh" - ], - "type": "shell" - } - ], - "variables": { - "box_basename": "centos-6.8-i386", - "build_timestamp": "{{isotime \"20060102150405\"}}", - "cpus": "1", - "disk_size": "40960", - "git_revision": "__unknown_git_revision__", - "headless": "", - "http_proxy": "{{env `http_proxy`}}", - "https_proxy": "{{env `https_proxy`}}", - "iso_checksum": "720d185fdf063383a4471657076b72fc162d3c3c3bca2e5e5ae13a25b3046519", - "iso_checksum_type": "sha256", - "iso_name": "CentOS-6.8-i386-bin-DVD1.iso", - "ks_path": "centos-6.8/ks.cfg", - "memory": "512", - "metadata": "floppy/dummy_metadata.json", - "mirror": "http://mirrors.kernel.org/centos", - "mirror_directory": "6.8/isos/i386", - "name": "centos-6.8-i386", - "no_proxy": "{{env `no_proxy`}}", - "template": "centos-6.8-i386", - "version": "2.1.TIMESTAMP" - } -} - diff --git a/centos-6.8-x86_64.json b/centos-6.8-x86_64.json deleted file mode 100644 index 883abb13b..000000000 --- a/centos-6.8-x86_64.json +++ /dev/null @@ -1,182 +0,0 @@ -{ - "builders": [ - { - "boot_command": [ - "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", - "guest_os_type": "RedHat_64", - "hard_drive_interface": "sata", - "headless": "{{ user `headless` }}", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-virtualbox", - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "virtualbox-iso", - "vboxmanage": [ - [ - "modifyvm", - "{{.Name}}", - "--memory", - "{{ user `memory` }}" - ], - [ - "modifyvm", - "{{.Name}}", - "--cpus", - "{{ user `cpus` }}" - ] - ], - "virtualbox_version_file": ".vbox_version", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "centos-64", - "headless": "{{ user `headless` }}", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-vmware", - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "tools_upload_flavor": "linux", - "type": "vmware-iso", - "vm_name": "{{ user `template` }}", - "vmx_data": { - "cpuid.coresPerSocket": "1", - "memsize": "{{ user `memory` }}", - "numvcpus": "{{ user `cpus` }}" - } - }, - { - "boot_command": [ - "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "centos", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-parallels", - "parallels_tools_flavor": "lin", - "prlctl": [ - [ - "set", - "{{.Name}}", - "--memsize", - "{{ user `memory` }}" - ], - [ - "set", - "{{.Name}}", - "--cpus", - "{{ user `cpus` }}" - ] - ], - "prlctl_version_file": ".prlctl_version", - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "parallels-iso", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "headless": "{{ user `headless` }}", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-qemu", - "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "qemu", - "vm_name": "{{ user `template` }}" - } - ], - "post-processors": [ - { - "output": "builds/{{user `box_basename`}}.{{.Provider}}.box", - "type": "vagrant" - } - ], - "provisioners": [ - { - "destination": "/tmp/bento-metadata.json", - "source": "{{user `metadata`}}", - "type": "file" - }, - { - "environment_vars": [ - "HOME_DIR=/home/vagrant", - "http_proxy={{user `http_proxy`}}", - "https_proxy={{user `https_proxy`}}", - "no_proxy={{user `no_proxy`}}" - ], - "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", - "scripts": [ - "scripts/common/metadata.sh", - "scripts/common/sshd.sh", - "scripts/centos/networking.sh", - "scripts/common/vagrant.sh", - "scripts/common/virtualbox.sh", - "scripts/common/vmware.sh", - "scripts/common/parallels.sh", - "scripts/centos/cleanup.sh", - "scripts/common/minimize.sh" - ], - "type": "shell" - } - ], - "variables": { - "box_basename": "centos-6.8", - "build_timestamp": "{{isotime \"20060102150405\"}}", - "cpus": "1", - "disk_size": "40960", - "git_revision": "__unknown_git_revision__", - "headless": "", - "http_proxy": "{{env `http_proxy`}}", - "https_proxy": "{{env `https_proxy`}}", - "iso_checksum": "1dda55622614a8b43b448a72f87d6cb7f79de1eff49ee8c5881a7d9db28d4e35", - "iso_checksum_type": "sha256", - "iso_name": "CentOS-6.8-x86_64-bin-DVD1.iso", - "ks_path": "centos-6.8/ks.cfg", - "memory": "512", - "metadata": "floppy/dummy_metadata.json", - "mirror": "http://mirrors.kernel.org/centos", - "mirror_directory": "6.8/isos/x86_64", - "name": "centos-6.8", - "no_proxy": "{{env `no_proxy`}}", - "template": "centos-6.8-x86_64", - "version": "2.1.TIMESTAMP" - } -} - diff --git a/http/centos-6.8/ks.cfg b/http/centos-6.8/ks.cfg deleted file mode 100644 index 90864b006..000000000 --- a/http/centos-6.8/ks.cfg +++ /dev/null @@ -1,69 +0,0 @@ -install -cdrom -lang en_US.UTF-8 -keyboard us -network --bootproto=dhcp -rootpw vagrant -firewall --disabled -selinux --permissive -timezone UTC -unsupported_hardware -bootloader --location=mbr -text -skipx -zerombr -clearpart --all --initlabel -autopart -auth --enableshadow --passalgo=sha512 --kickstart -firstboot --disabled -reboot -user --name=vagrant --plaintext --password vagrant -key --skip - -%packages --nobase --ignoremissing --excludedocs -# vagrant needs this to copy initial files via scp -openssh-clients -sudo -kernel-headers -kernel-devel -gcc -make -perl -wget -nfs-utils --fprintd-pam --intltool - -# unnecessary firmware --aic94xx-firmware --atmel-firmware --b43-openfwwf --bfa-firmware --ipw2100-firmware --ipw2200-firmware --ivtv-firmware --iwl100-firmware --iwl1000-firmware --iwl3945-firmware --iwl4965-firmware --iwl5000-firmware --iwl5150-firmware --iwl6000-firmware --iwl6000g2a-firmware --iwl6050-firmware --libertas-usb8388-firmware --ql2100-firmware --ql2200-firmware --ql23xx-firmware --ql2400-firmware --ql2500-firmware --rt61pci-firmware --rt73usb-firmware --xorg-x11-drv-ati-firmware --zd1211-firmware - -%post -# Force to set SELinux to a permissive mode -sed -i -e 's/\(^SELINUX=\).*$/\1permissive/' /etc/selinux/config -# sudo -echo "%vagrant ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers.d/vagrant From 2701df7962aa7228f6bd6a8738e19b89e04826bb Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith@chef.io> Date: Mon, 19 Jun 2017 22:44:40 -0700 Subject: [PATCH 0618/1622] Remove Ubuntu 12.04 / 16.10 This can be merged once 16.10 goes EoL in July. Removing 12.04 cleans up some conditionals in the various scripts as well. Signed-off-by: Tim Smith <tsmith@chef.io> --- README.md | 18 +-- builds.yml | 6 - http/ubuntu-12.04/preseed.cfg | 31 ---- scripts/ubuntu/sudoers.sh | 11 +- scripts/ubuntu/update.sh | 11 -- ubuntu-12.04-amd64.json | 268 --------------------------------- ubuntu-12.04-i386.json | 268 --------------------------------- ubuntu-16.10-amd64.json | 273 ---------------------------------- ubuntu-16.10-i386.json | 273 ---------------------------------- 9 files changed, 3 insertions(+), 1156 deletions(-) delete mode 100644 http/ubuntu-12.04/preseed.cfg delete mode 100644 ubuntu-12.04-amd64.json delete mode 100644 ubuntu-12.04-i386.json delete mode 100644 ubuntu-16.10-amd64.json delete mode 100644 ubuntu-16.10-i386.json diff --git a/README.md b/README.md index ab6171fd4..2b0bd8b65 100644 --- a/README.md +++ b/README.md @@ -25,10 +25,8 @@ The following boxes are built from this repository's templates for publicly avai | oracle-5.11 | [x86_64][oracle_511_64_vbox] | [x86_64][oracle_511_64_vmware] | [x86_64][oracle_511_64_prl] | | oracle-6.8 | [x86_64][oracle_68_64_vbox] | [x86_64][oracle_68_64_vmware] | [x86_64][oracle_68_64_prl] | | oracle-7.3 | [x86_64][oracle_73_64_vbox] | [x86_64][oracle_73_64_vmware] | [x86_64][oracle_73_64_prl] | -| ubuntu-12.04 | [amd64][ubuntu_1204_64_vbox] | [amd64][ubuntu_1204_64_vmware] | [amd64][ubuntu_1204_64_prl] | | ubuntu-14.04 | [amd64][ubuntu_1404_64_vbox] | [amd64][ubuntu_1404_64_vmware] | [amd64][ubuntu_1404_64_prl] | | ubuntu-16.04 | [amd64][ubuntu_1604_64_vbox] | [amd64][ubuntu_1604_64_vmware] | [amd64][ubuntu_1604_64_prl] | -| ubuntu-16.10 | [amd64][ubuntu_1610_64_vbox] | [amd64][ubuntu_1610_64_vmware] | [amd64][ubuntu_1610_64_prl] | ### 32 bit @@ -40,10 +38,8 @@ The following boxes are built from this repository's templates for publicly avai | debian-8.7 | [i386][debian_87_32_vbox] | ~~[i386][debian_87_32_vmware]~~ | [i386][debian_87_32_prl] | | oracle-5.11 | [x86_64][oracle_511_32_vbox] | [x86_64][oracle_511_32_vmware] | [x86_64][oracle_511_32_prl] | | oracle-6.8 | [x86_64][oracle_68_32_vbox] | [x86_64][oracle_68_32_vmware] | [x86_64][oracle_68_32_prl] | -| ubuntu-12.04 | [i386][ubuntu_1204_32_vbox] | [i386][ubuntu_1204_32_vmware] | [i386][ubuntu_1204_32_prl] | | ubuntu-14.04 | [i386][ubuntu_1404_32_vbox] | [i386][ubuntu_1404_32_vmware] | [i386][ubuntu_1404_32_prl] | | ubuntu-16.04 | [i386][ubuntu_1604_32_vbox] | [i386][ubuntu_1604_32_vmware] | ~~[i386][ubuntu_1604_32_prl]~~ | -| ubuntu-16.10 | [i386][ubuntu_1610_32_vbox] | [i386][ubuntu_1610_32_vmware] | [i386][ubuntu_1610_32_prl] | _NOTE_ This table tracks only the latest release for a given version. Boxes may exist in Atlas or S3 but are not guaranteed to be updated at this time. @@ -201,7 +197,7 @@ Mac OS X templates were adopted wholesale from [Fletcher Nichol's packer templat - Author: Fletcher Nichol ([fnichol@nichol.ca](mailto:fnichol@nichol.ca)) ```text -Copyright 2012-2016, Chef Software, Inc. (<legal@chef.io>) +Copyright 2012-2017, Chef Software, Inc. (<legal@chef.io>) Copyright 2011-2012, Tim Dysinger (<tim@dysinger.net>) Licensed under the Apache License, Version 2.0 (the "License"); @@ -276,12 +272,6 @@ limitations under the License. [oracle_73_64_vbox]: https://atlas.hashicorp.com/bento/boxes/oracle-7.3/versions/2.3.4/providers/virtualbox.box [oracle_73_64_vmware]: https://atlas.hashicorp.com/bento/boxes/oracle-7.3/versions/2.3.4/providers/vmware_desktop.box [travis]: https://travis-ci.org/chef/bento -[ubuntu_1204_32_prl]: https://atlas.hashicorp.com/bento/boxes/ubuntu-12.04-i386/versions/2.3.4/providers/parallels.box -[ubuntu_1204_32_vbox]: https://atlas.hashicorp.com/bento/boxes/ubuntu-12.04-i386/versions/2.3.4/providers/virtualbox.box -[ubuntu_1204_32_vmware]: https://atlas.hashicorp.com/bento/boxes/ubuntu-12.04-i386/versions/2.3.4/providers/vmware_desktop.box -[ubuntu_1204_64_prl]: https://atlas.hashicorp.com/bento/boxes/ubuntu-12.04/versions/2.3.4/providers/parallels.box -[ubuntu_1204_64_vbox]: https://atlas.hashicorp.com/bento/boxes/ubuntu-12.04/versions/2.3.4/providers/virtualbox.box -[ubuntu_1204_64_vmware]: https://atlas.hashicorp.com/bento/boxes/ubuntu-12.04/versions/2.3.4/providers/vmware_desktop.box [ubuntu_1404_32_prl]: https://atlas.hashicorp.com/bento/boxes/ubuntu-14.04-i386/versions/2.3.4/providers/parallels.box [ubuntu_1404_32_vbox]: https://atlas.hashicorp.com/bento/boxes/ubuntu-14.04-i386/versions/2.3.4/providers/virtualbox.box [ubuntu_1404_32_vmware]: https://atlas.hashicorp.com/bento/boxes/ubuntu-14.04-i386/versions/2.3.4/providers/vmware_desktop.box @@ -294,9 +284,3 @@ limitations under the License. [ubuntu_1604_64_prl]: https://atlas.hashicorp.com/bento/boxes/ubuntu-16.04/versions/2.3.4/providers/parallels.box [ubuntu_1604_64_vbox]: https://atlas.hashicorp.com/bento/boxes/ubuntu-16.04/versions/2.3.4/providers/virtualbox.box [ubuntu_1604_64_vmware]: https://atlas.hashicorp.com/bento/boxes/ubuntu-16.04/versions/2.3.4/providers/vmware_desktop.box -[ubuntu_1610_32_prl]: https://atlas.hashicorp.com/bento/boxes/ubuntu-16.10-i386/versions/2.3.4/providers/parallels.box -[ubuntu_1610_32_vbox]: https://atlas.hashicorp.com/bento/boxes/ubuntu-16.10-i386/versions/2.3.4/providers/virtualbox.box -[ubuntu_1610_32_vmware]: https://atlas.hashicorp.com/bento/boxes/ubuntu-16.10-i386/versions/2.3.4/providers/vmware_desktop.box -[ubuntu_1610_64_prl]: https://atlas.hashicorp.com/bento/boxes/ubuntu-16.10/versions/2.3.4/providers/parallels.box -[ubuntu_1610_64_vbox]: https://atlas.hashicorp.com/bento/boxes/ubuntu-16.10/versions/2.3.4/providers/virtualbox.box -[ubuntu_1610_64_vmware]: https://atlas.hashicorp.com/bento/boxes/ubuntu-16.10/versions/2.3.4/providers/vmware_desktop.box diff --git a/builds.yml b/builds.yml index e2b687f0a..3e86cb1ba 100644 --- a/builds.yml +++ b/builds.yml @@ -47,18 +47,12 @@ public: '7.3': - x86_64 ubuntu: - '12.04': - - amd64 - - i386 '14.04': - amd64 - i386 '16.04': - amd64 - i386 - '16.10': - - amd64 - - i386 '17.04': - amd64 - i386 diff --git a/http/ubuntu-12.04/preseed.cfg b/http/ubuntu-12.04/preseed.cfg deleted file mode 100644 index 6fb68b78d..000000000 --- a/http/ubuntu-12.04/preseed.cfg +++ /dev/null @@ -1,31 +0,0 @@ -choose-mirror-bin mirror/http/proxy string -d-i base-installer/kernel/override-image string linux-server -d-i clock-setup/utc boolean true -d-i clock-setup/utc-auto boolean true -d-i finish-install/reboot_in_progress note -d-i grub-installer/only_debian boolean true -d-i grub-installer/with_other_os boolean true -d-i partman-auto-lvm/guided_size string max -d-i partman-auto/choose_recipe select atomic -d-i partman-auto/method string lvm -d-i partman-lvm/confirm boolean true -d-i partman-lvm/confirm boolean true -d-i partman-lvm/confirm_nooverwrite boolean true -d-i partman-lvm/device_remove_lvm boolean true -d-i partman/choose_partition select finish -d-i partman/confirm boolean true -d-i partman/confirm_nooverwrite boolean true -d-i partman/confirm_write_new_label boolean true -d-i passwd/user-fullname string vagrant -d-i passwd/user-uid string 1000 -d-i passwd/user-password password vagrant -d-i passwd/user-password-again password vagrant -d-i passwd/username string vagrant -d-i pkgsel/include string openssh-server cryptsetup build-essential libssl-dev zlib1g-dev linux-source nfs-common linux-headers-$(uname -r) perl -d-i pkgsel/install-language-support boolean false -d-i pkgsel/update-policy select none -d-i pkgsel/upgrade select full-upgrade -d-i time/zone string UTC -d-i user-setup/allow-password-weak boolean true -d-i user-setup/encrypt-home boolean false -tasksel tasksel/first multiselect standard, server diff --git a/scripts/ubuntu/sudoers.sh b/scripts/ubuntu/sudoers.sh index 657b14468..d51c3bf13 100644 --- a/scripts/ubuntu/sudoers.sh +++ b/scripts/ubuntu/sudoers.sh @@ -1,11 +1,4 @@ #!/bin/sh -eux -major_version="`lsb_release -r | awk '{print $2}' | awk -F. '{print $1}'`"; - -if [ ! -z "$major_version" -a "$major_version" -lt 12 ]; then - sed -i -e '/Defaults\s\+env_reset/a Defaults\texempt_group=admin' /etc/sudoers; - sed -i -e 's/%admin\s*ALL=(ALL) ALL/%admin\tALL=(ALL) NOPASSWD:ALL/g' /etc/sudoers; -else - sed -i -e '/Defaults\s\+env_reset/a Defaults\texempt_group=sudo' /etc/sudoers; - sed -i -e 's/%sudo\s*ALL=(ALL:ALL) ALL/%sudo\tALL=(ALL) NOPASSWD:ALL/g' /etc/sudoers; -fi +sed -i -e '/Defaults\s\+env_reset/a Defaults\texempt_group=sudo' /etc/sudoers; +sed -i -e 's/%sudo\s*ALL=(ALL:ALL) ALL/%sudo\tALL=(ALL) NOPASSWD:ALL/g' /etc/sudoers; diff --git a/scripts/ubuntu/update.sh b/scripts/ubuntu/update.sh index e4582b7ef..daeeca4af 100644 --- a/scripts/ubuntu/update.sh +++ b/scripts/ubuntu/update.sh @@ -3,12 +3,6 @@ ubuntu_version="`lsb_release -r | awk '{print $2}'`"; ubuntu_major_version="`echo $ubuntu_version | awk -F. '{print $1}'`"; -# Work around bad cached lists on Ubuntu 12.04 -if [ "$ubuntu_version" = "12.04" ]; then - apt-get clean; - rm -rf /var/lib/apt/lists; -fi - # Disable release-upgrades sed -i.bak 's/^Prompt=.*$/Prompt=never/' /etc/update-manager/release-upgrades; @@ -23,11 +17,6 @@ task exec /usr/bin/apt-get update EOF -# Manage broken indexes on distro disc 12.04.5 -if [ "$ubuntu_version" = "12.04" ]; then - apt-get -y install libreadline-dev dpkg; -fi - # Disable periodic activities of apt cat <<EOF >/etc/apt/apt.conf.d/10disable-periodic; APT::Periodic::Enable "0"; diff --git a/ubuntu-12.04-amd64.json b/ubuntu-12.04-amd64.json deleted file mode 100644 index 23cdb397c..000000000 --- a/ubuntu-12.04-amd64.json +++ /dev/null @@ -1,268 +0,0 @@ -{ - "builders": [ - { - "boot_command": [ - "<esc><wait>", - "<esc><wait>", - "<enter><wait>", - "/install/vmlinuz<wait>", - " auto<wait>", - " console-setup/ask_detect=false<wait>", - " console-setup/layoutcode=us<wait>", - " console-setup/modelcode=pc105<wait>", - " debconf/frontend=noninteractive<wait>", - " debian-installer=en_US.UTF-8<wait>", - " fb=false<wait>", - " initrd=/install/initrd.gz<wait>", - " kbd-chooser/method=us<wait>", - " keyboard-configuration/layout=USA<wait>", - " keyboard-configuration/variant=USA<wait>", - " locale=en_US.UTF-8<wait>", - " netcfg/get_domain=vm<wait>", - " netcfg/get_hostname=vagrant<wait>", - " noapic<wait>", - " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}}<wait>", - " -- <wait>", - "<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", - "guest_os_type": "Ubuntu_64", - "hard_drive_interface": "sata", - "headless": "{{ user `headless` }}", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-virtualbox", - "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "virtualbox-iso", - "vboxmanage": [ - [ - "modifyvm", - "{{.Name}}", - "--memory", - "{{ user `memory` }}" - ], - [ - "modifyvm", - "{{.Name}}", - "--cpus", - "{{ user `cpus` }}" - ] - ], - "virtualbox_version_file": ".vbox_version", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<esc><wait>", - "<esc><wait>", - "<enter><wait>", - "/install/vmlinuz<wait>", - " auto<wait>", - " console-setup/ask_detect=false<wait>", - " console-setup/layoutcode=us<wait>", - " console-setup/modelcode=pc105<wait>", - " debconf/frontend=noninteractive<wait>", - " debian-installer=en_US.UTF-8<wait>", - " fb=false<wait>", - " initrd=/install/initrd.gz<wait>", - " kbd-chooser/method=us<wait>", - " keyboard-configuration/layout=USA<wait>", - " keyboard-configuration/variant=USA<wait>", - " locale=en_US.UTF-8<wait>", - " netcfg/get_domain=vm<wait>", - " netcfg/get_hostname=vagrant<wait>", - " noapic<wait>", - " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}}<wait>", - " -- <wait>", - "<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "ubuntu-64", - "headless": "{{ user `headless` }}", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-vmware", - "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "tools_upload_flavor": "linux", - "type": "vmware-iso", - "vm_name": "{{ user `template` }}", - "vmx_data": { - "cpuid.coresPerSocket": "1", - "memsize": "{{ user `memory` }}", - "numvcpus": "{{ user `cpus` }}" - } - }, - { - "boot_command": [ - "<esc><wait>", - "<esc><wait>", - "<enter><wait>", - "/install/vmlinuz<wait>", - " auto<wait>", - " console-setup/ask_detect=false<wait>", - " console-setup/layoutcode=us<wait>", - " console-setup/modelcode=pc105<wait>", - " debconf/frontend=noninteractive<wait>", - " debian-installer=en_US.UTF-8<wait>", - " fb=false<wait>", - " initrd=/install/initrd.gz<wait>", - " kbd-chooser/method=us<wait>", - " keyboard-configuration/layout=USA<wait>", - " keyboard-configuration/variant=USA<wait>", - " locale=en_US.UTF-8<wait>", - " netcfg/get_domain=vm<wait>", - " netcfg/get_hostname=vagrant<wait>", - " noapic<wait>", - " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}}<wait>", - " -- <wait>", - "<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "ubuntu", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-parallels", - "parallels_tools_flavor": "lin", - "prlctl": [ - [ - "set", - "{{.Name}}", - "--memsize", - "{{ user `memory` }}" - ], - [ - "set", - "{{.Name}}", - "--cpus", - "{{ user `cpus` }}" - ] - ], - "prlctl_version_file": ".prlctl_version", - "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "parallels-iso", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<esc><wait>", - "<esc><wait>", - "<enter><wait>", - "/install/vmlinuz<wait>", - " auto<wait>", - " console-setup/ask_detect=false<wait>", - " console-setup/layoutcode=us<wait>", - " console-setup/modelcode=pc105<wait>", - " debconf/frontend=noninteractive<wait>", - " debian-installer=en_US.UTF-8<wait>", - " fb=false<wait>", - " initrd=/install/initrd.gz<wait>", - " kbd-chooser/method=us<wait>", - " keyboard-configuration/layout=USA<wait>", - " keyboard-configuration/variant=USA<wait>", - " locale=en_US.UTF-8<wait>", - " netcfg/get_domain=vm<wait>", - " netcfg/get_hostname=vagrant<wait>", - " noapic<wait>", - " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}}<wait>", - " -- <wait>", - "<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "headless": "{{ user `headless` }}", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-qemu", - "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "qemu", - "vm_name": "{{ user `template` }}" - } - ], - "post-processors": [ - { - "output": "builds/{{user `box_basename`}}.{{.Provider}}.box", - "type": "vagrant" - } - ], - "provisioners": [ - { - "destination": "/tmp/bento-metadata.json", - "source": "{{user `metadata`}}", - "type": "file" - }, - { - "environment_vars": [ - "HOME_DIR=/home/vagrant", - "http_proxy={{user `http_proxy`}}", - "https_proxy={{user `https_proxy`}}", - "no_proxy={{user `no_proxy`}}" - ], - "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", - "scripts": [ - "scripts/common/metadata.sh", - "scripts/ubuntu/update.sh", - "scripts/common/sshd.sh", - "scripts/ubuntu/networking.sh", - "scripts/ubuntu/sudoers.sh", - "scripts/ubuntu/vagrant.sh", - "scripts/common/virtualbox.sh", - "scripts/common/vmware.sh", - "scripts/common/parallels.sh", - "scripts/ubuntu/cleanup.sh", - "scripts/common/minimize.sh" - ], - "type": "shell" - } - ], - "variables": { - "box_basename": "ubuntu-12.04", - "build_timestamp": "{{isotime \"20060102150405\"}}", - "cpus": "1", - "disk_size": "40960", - "git_revision": "__unknown_git_revision__", - "headless": "", - "http_proxy": "{{env `http_proxy`}}", - "https_proxy": "{{env `https_proxy`}}", - "iso_checksum": "9c21c99bab91462b6ca779bfcaccb1de466b9ad0309a9dbd6d196b4918cc72ef", - "iso_checksum_type": "sha256", - "iso_name": "ubuntu-12.04.1-server-amd64.iso", - "memory": "512", - "metadata": "floppy/dummy_metadata.json", - "mirror": "http://old-releases.ubuntu.com/releases", - "mirror_directory": "12.04.1", - "name": "ubuntu-12.04", - "no_proxy": "{{env `no_proxy`}}", - "preseed_path": "ubuntu-12.04/preseed.cfg", - "template": "ubuntu-12.04-amd64", - "version": "2.1.TIMESTAMP" - } -} - diff --git a/ubuntu-12.04-i386.json b/ubuntu-12.04-i386.json deleted file mode 100644 index 4bd781fa2..000000000 --- a/ubuntu-12.04-i386.json +++ /dev/null @@ -1,268 +0,0 @@ -{ - "builders": [ - { - "boot_command": [ - "<esc><wait>", - "<esc><wait>", - "<enter><wait>", - "/install/vmlinuz<wait>", - " auto<wait>", - " console-setup/ask_detect=false<wait>", - " console-setup/layoutcode=us<wait>", - " console-setup/modelcode=pc105<wait>", - " debconf/frontend=noninteractive<wait>", - " debian-installer=en_US.UTF-8<wait>", - " fb=false<wait>", - " initrd=/install/initrd.gz<wait>", - " kbd-chooser/method=us<wait>", - " keyboard-configuration/layout=USA<wait>", - " keyboard-configuration/variant=USA<wait>", - " locale=en_US.UTF-8<wait>", - " netcfg/get_domain=vm<wait>", - " netcfg/get_hostname=vagrant<wait>", - " noapic<wait>", - " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}}<wait>", - " -- <wait>", - "<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", - "guest_os_type": "Ubuntu", - "hard_drive_interface": "sata", - "headless": "{{ user `headless` }}", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-virtualbox", - "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "virtualbox-iso", - "vboxmanage": [ - [ - "modifyvm", - "{{.Name}}", - "--memory", - "{{ user `memory` }}" - ], - [ - "modifyvm", - "{{.Name}}", - "--cpus", - "{{ user `cpus` }}" - ] - ], - "virtualbox_version_file": ".vbox_version", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<esc><wait>", - "<esc><wait>", - "<enter><wait>", - "/install/vmlinuz<wait>", - " auto<wait>", - " console-setup/ask_detect=false<wait>", - " console-setup/layoutcode=us<wait>", - " console-setup/modelcode=pc105<wait>", - " debconf/frontend=noninteractive<wait>", - " debian-installer=en_US.UTF-8<wait>", - " fb=false<wait>", - " initrd=/install/initrd.gz<wait>", - " kbd-chooser/method=us<wait>", - " keyboard-configuration/layout=USA<wait>", - " keyboard-configuration/variant=USA<wait>", - " locale=en_US.UTF-8<wait>", - " netcfg/get_domain=vm<wait>", - " netcfg/get_hostname=vagrant<wait>", - " noapic<wait>", - " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}}<wait>", - " -- <wait>", - "<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "ubuntu", - "headless": "{{ user `headless` }}", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-vmware", - "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "tools_upload_flavor": "linux", - "type": "vmware-iso", - "vm_name": "{{ user `template` }}", - "vmx_data": { - "cpuid.coresPerSocket": "1", - "memsize": "{{ user `memory` }}", - "numvcpus": "{{ user `cpus` }}" - } - }, - { - "boot_command": [ - "<esc><wait>", - "<esc><wait>", - "<enter><wait>", - "/install/vmlinuz<wait>", - " auto<wait>", - " console-setup/ask_detect=false<wait>", - " console-setup/layoutcode=us<wait>", - " console-setup/modelcode=pc105<wait>", - " debconf/frontend=noninteractive<wait>", - " debian-installer=en_US.UTF-8<wait>", - " fb=false<wait>", - " initrd=/install/initrd.gz<wait>", - " kbd-chooser/method=us<wait>", - " keyboard-configuration/layout=USA<wait>", - " keyboard-configuration/variant=USA<wait>", - " locale=en_US.UTF-8<wait>", - " netcfg/get_domain=vm<wait>", - " netcfg/get_hostname=vagrant<wait>", - " noapic<wait>", - " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}}<wait>", - " -- <wait>", - "<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "ubuntu", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-parallels", - "parallels_tools_flavor": "lin", - "prlctl": [ - [ - "set", - "{{.Name}}", - "--memsize", - "{{ user `memory` }}" - ], - [ - "set", - "{{.Name}}", - "--cpus", - "{{ user `cpus` }}" - ] - ], - "prlctl_version_file": ".prlctl_version", - "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "parallels-iso", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<esc><wait>", - "<esc><wait>", - "<enter><wait>", - "/install/vmlinuz<wait>", - " auto<wait>", - " console-setup/ask_detect=false<wait>", - " console-setup/layoutcode=us<wait>", - " console-setup/modelcode=pc105<wait>", - " debconf/frontend=noninteractive<wait>", - " debian-installer=en_US.UTF-8<wait>", - " fb=false<wait>", - " initrd=/install/initrd.gz<wait>", - " kbd-chooser/method=us<wait>", - " keyboard-configuration/layout=USA<wait>", - " keyboard-configuration/variant=USA<wait>", - " locale=en_US.UTF-8<wait>", - " netcfg/get_domain=vm<wait>", - " netcfg/get_hostname=vagrant<wait>", - " noapic<wait>", - " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}}<wait>", - " -- <wait>", - "<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "headless": "{{ user `headless` }}", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-qemu", - "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "qemu", - "vm_name": "{{ user `template` }}" - } - ], - "post-processors": [ - { - "output": "builds/{{user `box_basename`}}.{{.Provider}}.box", - "type": "vagrant" - } - ], - "provisioners": [ - { - "destination": "/tmp/bento-metadata.json", - "source": "{{user `metadata`}}", - "type": "file" - }, - { - "environment_vars": [ - "HOME_DIR=/home/vagrant", - "http_proxy={{user `http_proxy`}}", - "https_proxy={{user `https_proxy`}}", - "no_proxy={{user `no_proxy`}}" - ], - "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", - "scripts": [ - "scripts/common/metadata.sh", - "scripts/ubuntu/update.sh", - "scripts/common/sshd.sh", - "scripts/ubuntu/networking.sh", - "scripts/ubuntu/sudoers.sh", - "scripts/ubuntu/vagrant.sh", - "scripts/common/virtualbox.sh", - "scripts/common/vmware.sh", - "scripts/common/parallels.sh", - "scripts/ubuntu/cleanup.sh", - "scripts/common/minimize.sh" - ], - "type": "shell" - } - ], - "variables": { - "box_basename": "ubuntu-12.04-i386", - "build_timestamp": "{{isotime \"20060102150405\"}}", - "cpus": "1", - "disk_size": "40960", - "git_revision": "__unknown_git_revision__", - "headless": "", - "http_proxy": "{{env `http_proxy`}}", - "https_proxy": "{{env `https_proxy`}}", - "iso_checksum": "77f43bc3332ce7a678b7b6b2fe9190e15276fd14d121be479f00bc18e570d323", - "iso_checksum_type": "sha256", - "iso_name": "ubuntu-12.04.1-server-i386.iso", - "memory": "512", - "metadata": "floppy/dummy_metadata.json", - "mirror": "http://old-releases.ubuntu.com/releases", - "mirror_directory": "12.04.1", - "name": "ubuntu-12.04-i386", - "no_proxy": "{{env `no_proxy`}}", - "preseed_path": "ubuntu-12.04/preseed.cfg", - "template": "ubuntu-12.04-i386", - "version": "2.1.TIMESTAMP" - } -} - diff --git a/ubuntu-16.10-amd64.json b/ubuntu-16.10-amd64.json deleted file mode 100644 index abf40aa29..000000000 --- a/ubuntu-16.10-amd64.json +++ /dev/null @@ -1,273 +0,0 @@ -{ - "builders": [ - { - "boot_command": [ - "<esc><wait>", - "<esc><wait>", - "<enter><wait>", - "/install/vmlinuz<wait>", - " auto<wait>", - " console-setup/ask_detect=false<wait>", - " console-setup/layoutcode=us<wait>", - " console-setup/modelcode=pc105<wait>", - " debconf/frontend=noninteractive<wait>", - " debian-installer=en_US<wait>", - " fb=false<wait>", - " initrd=/install/initrd.gz<wait>", - " kbd-chooser/method=us<wait>", - " keyboard-configuration/layout=USA<wait>", - " keyboard-configuration/variant=USA<wait>", - " locale=en_US<wait>", - " netcfg/get_domain=vm<wait>", - " netcfg/get_hostname=vagrant<wait>", - " grub-installer/bootdev=/dev/sda<wait>", - " noapic<wait>", - " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}}<wait>", - " -- <wait>", - "<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", - "guest_os_type": "Ubuntu_64", - "hard_drive_interface": "sata", - "headless": "{{ user `headless` }}", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-virtualbox", - "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "virtualbox-iso", - "vboxmanage": [ - [ - "modifyvm", - "{{.Name}}", - "--memory", - "{{ user `memory` }}" - ], - [ - "modifyvm", - "{{.Name}}", - "--cpus", - "{{ user `cpus` }}" - ] - ], - "virtualbox_version_file": ".vbox_version", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<esc><wait>", - "<esc><wait>", - "<enter><wait>", - "/install/vmlinuz<wait>", - " auto<wait>", - " console-setup/ask_detect=false<wait>", - " console-setup/layoutcode=us<wait>", - " console-setup/modelcode=pc105<wait>", - " debconf/frontend=noninteractive<wait>", - " debian-installer=en_US<wait>", - " fb=false<wait>", - " initrd=/install/initrd.gz<wait>", - " kbd-chooser/method=us<wait>", - " keyboard-configuration/layout=USA<wait>", - " keyboard-configuration/variant=USA<wait>", - " locale=en_US<wait>", - " netcfg/get_domain=vm<wait>", - " netcfg/get_hostname=vagrant<wait>", - " grub-installer/bootdev=/dev/sda<wait>", - " noapic<wait>", - " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}}<wait>", - " -- <wait>", - "<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "ubuntu-64", - "headless": "{{ user `headless` }}", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-vmware", - "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "tools_upload_flavor": "linux", - "type": "vmware-iso", - "vm_name": "{{ user `template` }}", - "vmx_data": { - "cpuid.coresPerSocket": "1", - "ethernet0.pciSlotNumber": "32", - "memsize": "{{ user `memory` }}", - "numvcpus": "{{ user `cpus` }}" - } - }, - { - "boot_command": [ - "<esc><wait>", - "<esc><wait>", - "<enter><wait>", - "/install/vmlinuz<wait>", - " auto<wait>", - " console-setup/ask_detect=false<wait>", - " console-setup/layoutcode=us<wait>", - " console-setup/modelcode=pc105<wait>", - " debconf/frontend=noninteractive<wait>", - " debian-installer=en_US<wait>", - " fb=false<wait>", - " initrd=/install/initrd.gz<wait>", - " kbd-chooser/method=us<wait>", - " keyboard-configuration/layout=USA<wait>", - " keyboard-configuration/variant=USA<wait>", - " locale=en_US<wait>", - " netcfg/get_domain=vm<wait>", - " netcfg/get_hostname=vagrant<wait>", - " grub-installer/bootdev=/dev/sda<wait>", - " noapic<wait>", - " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}}<wait>", - " -- <wait>", - "<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "ubuntu", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-parallels", - "parallels_tools_flavor": "lin", - "prlctl": [ - [ - "set", - "{{.Name}}", - "--memsize", - "{{ user `memory` }}" - ], - [ - "set", - "{{.Name}}", - "--cpus", - "{{ user `cpus` }}" - ] - ], - "prlctl_version_file": ".prlctl_version", - "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "parallels-iso", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<esc><wait>", - "<esc><wait>", - "<enter><wait>", - "/install/vmlinuz<wait>", - " auto<wait>", - " console-setup/ask_detect=false<wait>", - " console-setup/layoutcode=us<wait>", - " console-setup/modelcode=pc105<wait>", - " debconf/frontend=noninteractive<wait>", - " debian-installer=en_US<wait>", - " fb=false<wait>", - " initrd=/install/initrd.gz<wait>", - " kbd-chooser/method=us<wait>", - " keyboard-configuration/layout=USA<wait>", - " keyboard-configuration/variant=USA<wait>", - " locale=en_US<wait>", - " netcfg/get_domain=vm<wait>", - " netcfg/get_hostname=vagrant<wait>", - " grub-installer/bootdev=/dev/vda<wait>", - " noapic<wait>", - " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}}<wait>", - " -- <wait>", - "<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "headless": "{{ user `headless` }}", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-qemu", - "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "qemu", - "vm_name": "{{ user `template` }}" - } - ], - "post-processors": [ - { - "output": "builds/{{user `box_basename`}}.{{.Provider}}.box", - "type": "vagrant" - } - ], - "provisioners": [ - { - "destination": "/tmp/bento-metadata.json", - "source": "{{user `metadata`}}", - "type": "file" - }, - { - "environment_vars": [ - "HOME_DIR=/home/vagrant", - "http_proxy={{user `http_proxy`}}", - "https_proxy={{user `https_proxy`}}", - "no_proxy={{user `no_proxy`}}" - ], - "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", - "scripts": [ - "scripts/common/metadata.sh", - "scripts/ubuntu/update.sh", - "scripts/common/sshd.sh", - "scripts/ubuntu/networking.sh", - "scripts/ubuntu/sudoers.sh", - "scripts/ubuntu/vagrant.sh", - "scripts/common/virtualbox.sh", - "scripts/ubuntu/vmware.sh", - "scripts/common/parallels.sh", - "scripts/ubuntu/cleanup.sh", - "scripts/common/minimize.sh" - ], - "type": "shell" - } - ], - "variables": { - "box_basename": "ubuntu-16.10", - "build_timestamp": "{{isotime \"20060102150405\"}}", - "cpus": "1", - "disk_size": "40960", - "git_revision": "__unknown_git_revision__", - "headless": "", - "http_proxy": "{{env `http_proxy`}}", - "https_proxy": "{{env `https_proxy`}}", - "iso_checksum": "72b0d421da77f1e0c549b4efe6fc6c184e9909d6792f0d1e59b56d63e9705659", - "iso_checksum_type": "sha256", - "iso_name": "ubuntu-16.10-server-amd64.iso", - "memory": "512", - "metadata": "floppy/dummy_metadata.json", - "mirror": "http://releases.ubuntu.com", - "mirror_directory": "16.10", - "name": "ubuntu-16.10", - "no_proxy": "{{env `no_proxy`}}", - "preseed_path": "ubuntu-16.04/preseed.cfg", - "template": "ubuntu-16.10-amd64", - "version": "2.1.TIMESTAMP" - } -} - diff --git a/ubuntu-16.10-i386.json b/ubuntu-16.10-i386.json deleted file mode 100644 index 3552293ff..000000000 --- a/ubuntu-16.10-i386.json +++ /dev/null @@ -1,273 +0,0 @@ -{ - "builders": [ - { - "boot_command": [ - "<esc><wait>", - "<esc><wait>", - "<enter><wait>", - "/install/vmlinuz<wait>", - " auto<wait>", - " console-setup/ask_detect=false<wait>", - " console-setup/layoutcode=us<wait>", - " console-setup/modelcode=pc105<wait>", - " debconf/frontend=noninteractive<wait>", - " debian-installer=en_US<wait>", - " fb=false<wait>", - " initrd=/install/initrd.gz<wait>", - " kbd-chooser/method=us<wait>", - " keyboard-configuration/layout=USA<wait>", - " keyboard-configuration/variant=USA<wait>", - " locale=en_US<wait>", - " netcfg/get_domain=vm<wait>", - " netcfg/get_hostname=vagrant<wait>", - " grub-installer/bootdev=/dev/sda <wait>", - " noapic<wait>", - " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}}<wait>", - " -- <wait>", - "<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", - "guest_os_type": "Ubuntu", - "hard_drive_interface": "sata", - "headless": "{{ user `headless` }}", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-virtualbox", - "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "virtualbox-iso", - "vboxmanage": [ - [ - "modifyvm", - "{{.Name}}", - "--memory", - "{{ user `memory` }}" - ], - [ - "modifyvm", - "{{.Name}}", - "--cpus", - "{{ user `cpus` }}" - ] - ], - "virtualbox_version_file": ".vbox_version", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<esc><wait>", - "<esc><wait>", - "<enter><wait>", - "/install/vmlinuz<wait>", - " auto<wait>", - " console-setup/ask_detect=false<wait>", - " console-setup/layoutcode=us<wait>", - " console-setup/modelcode=pc105<wait>", - " debconf/frontend=noninteractive<wait>", - " debian-installer=en_US<wait>", - " fb=false<wait>", - " initrd=/install/initrd.gz<wait>", - " kbd-chooser/method=us<wait>", - " keyboard-configuration/layout=USA<wait>", - " keyboard-configuration/variant=USA<wait>", - " locale=en_US<wait>", - " netcfg/get_domain=vm<wait>", - " netcfg/get_hostname=vagrant<wait>", - " grub-installer/bootdev=/dev/sda <wait>", - " noapic<wait>", - " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}}<wait>", - " -- <wait>", - "<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "ubuntu", - "headless": "{{ user `headless` }}", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-vmware", - "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "tools_upload_flavor": "linux", - "type": "vmware-iso", - "vm_name": "{{ user `template` }}", - "vmx_data": { - "cpuid.coresPerSocket": "1", - "ethernet0.pciSlotNumber": "32", - "memsize": "{{ user `memory` }}", - "numvcpus": "{{ user `cpus` }}" - } - }, - { - "boot_command": [ - "<esc><wait>", - "<esc><wait>", - "<enter><wait>", - "/install/vmlinuz<wait>", - " auto<wait>", - " console-setup/ask_detect=false<wait>", - " console-setup/layoutcode=us<wait>", - " console-setup/modelcode=pc105<wait>", - " debconf/frontend=noninteractive<wait>", - " debian-installer=en_US<wait>", - " fb=false<wait>", - " initrd=/install/initrd.gz<wait>", - " kbd-chooser/method=us<wait>", - " keyboard-configuration/layout=USA<wait>", - " keyboard-configuration/variant=USA<wait>", - " locale=en_US<wait>", - " netcfg/get_domain=vm<wait>", - " netcfg/get_hostname=vagrant<wait>", - " grub-installer/bootdev=/dev/sda <wait>", - " noapic<wait>", - " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}}<wait>", - " -- <wait>", - "<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "ubuntu", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-parallels", - "parallels_tools_flavor": "lin", - "prlctl": [ - [ - "set", - "{{.Name}}", - "--memsize", - "{{ user `memory` }}" - ], - [ - "set", - "{{.Name}}", - "--cpus", - "{{ user `cpus` }}" - ] - ], - "prlctl_version_file": ".prlctl_version", - "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "parallels-iso", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<esc><wait>", - "<esc><wait>", - "<enter><wait>", - "/install/vmlinuz<wait>", - " auto<wait>", - " console-setup/ask_detect=false<wait>", - " console-setup/layoutcode=us<wait>", - " console-setup/modelcode=pc105<wait>", - " debconf/frontend=noninteractive<wait>", - " debian-installer=en_US<wait>", - " fb=false<wait>", - " initrd=/install/initrd.gz<wait>", - " kbd-chooser/method=us<wait>", - " keyboard-configuration/layout=USA<wait>", - " keyboard-configuration/variant=USA<wait>", - " locale=en_US<wait>", - " netcfg/get_domain=vm<wait>", - " netcfg/get_hostname=vagrant<wait>", - " grub-installer/bootdev=/dev/vda <wait>", - " noapic<wait>", - " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}}<wait>", - " -- <wait>", - "<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "headless": "{{ user `headless` }}", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-qemu", - "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "qemu", - "vm_name": "{{ user `template` }}" - } - ], - "post-processors": [ - { - "output": "builds/{{user `box_basename`}}.{{.Provider}}.box", - "type": "vagrant" - } - ], - "provisioners": [ - { - "destination": "/tmp/bento-metadata.json", - "source": "{{user `metadata`}}", - "type": "file" - }, - { - "environment_vars": [ - "HOME_DIR=/home/vagrant", - "http_proxy={{user `http_proxy`}}", - "https_proxy={{user `https_proxy`}}", - "no_proxy={{user `no_proxy`}}" - ], - "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", - "scripts": [ - "scripts/common/metadata.sh", - "scripts/ubuntu/update.sh", - "scripts/common/sshd.sh", - "scripts/ubuntu/networking.sh", - "scripts/ubuntu/sudoers.sh", - "scripts/ubuntu/vagrant.sh", - "scripts/common/virtualbox.sh", - "scripts/ubuntu/vmware.sh", - "scripts/common/parallels.sh", - "scripts/ubuntu/cleanup.sh", - "scripts/common/minimize.sh" - ], - "type": "shell" - } - ], - "variables": { - "box_basename": "ubuntu-16.10-i386", - "build_timestamp": "{{isotime \"20060102150405\"}}", - "cpus": "1", - "disk_size": "40960", - "git_revision": "__unknown_git_revision__", - "headless": "", - "http_proxy": "{{env `http_proxy`}}", - "https_proxy": "{{env `https_proxy`}}", - "iso_checksum": "0e52cc7c7c4cc9e91f4e984c1232192394c6caf8e7170c1aeefb37bdef1f0625", - "iso_checksum_type": "sha256", - "iso_name": "ubuntu-16.10-server-i386.iso", - "memory": "512", - "metadata": "floppy/dummy_metadata.json", - "mirror": "http://releases.ubuntu.com", - "mirror_directory": "16.10", - "name": "ubuntu-16.10-i386", - "no_proxy": "{{env `no_proxy`}}", - "preseed_path": "ubuntu-16.04/preseed.cfg", - "template": "ubuntu-16.10-i386", - "version": "2.1.TIMESTAMP" - } -} - From 5b6b09b3b25a7b27dd96de824bda48254d9a8054 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith@chef.io> Date: Tue, 20 Jun 2017 09:39:43 -0700 Subject: [PATCH 0619/1622] Update download URLs for the final Debian 9 release Signed-off-by: Tim Smith <tsmith@chef.io> --- debian-9-amd64.json | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/debian-9-amd64.json b/debian-9-amd64.json index f3f61237e..8c9a128b0 100644 --- a/debian-9-amd64.json +++ b/debian-9-amd64.json @@ -229,13 +229,13 @@ "headless": "", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", - "iso_checksum": "b7e069fc493ffcb54912b16bb0116c760d102d1bb77bd92dae6dab0759cc0427", + "iso_checksum": "9d98f339016dc2a3998881949a8f0678baede26b5106f18ef1168d7e13606773", "iso_checksum_type": "sha256", - "iso_name": "debian-testing-amd64-netinst.iso", + "iso_name": "debian-9.0.0-amd64-netinst.iso", "memory": "512", "metadata": "floppy/dummy_metadata.json", - "mirror": "http://cdimage.debian.org/cdimage/daily-builds/daily/20170421-3", - "mirror_directory": "amd64/iso-cd", + "mirror": "http://cdimage.debian.org/cdimage/release", + "mirror_directory": "9.0.0/amd64/iso-cd", "name": "debian-9", "no_proxy": "{{env `no_proxy`}}", "preseed_path": "debian-8/preseed.cfg", @@ -243,4 +243,3 @@ "version": "2.1.TIMESTAMP" } } - From d338b8d277cdaf4db27da282d86244640197fe27 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith@chef.io> Date: Tue, 20 Jun 2017 10:56:15 -0700 Subject: [PATCH 0620/1622] Rename debian-9 to debian-9.0 There's going to be 10 more releases of debian 9 before they're done. Signed-off-by: Tim Smith <tsmith@chef.io> --- debian-9-amd64.json => debian-9.0-amd64.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename debian-9-amd64.json => debian-9.0-amd64.json (99%) diff --git a/debian-9-amd64.json b/debian-9.0-amd64.json similarity index 99% rename from debian-9-amd64.json rename to debian-9.0-amd64.json index 8c9a128b0..82168f80f 100644 --- a/debian-9-amd64.json +++ b/debian-9.0-amd64.json @@ -221,7 +221,7 @@ } ], "variables": { - "box_basename": "debian-9", + "box_basename": "debian-9.0", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", "disk_size": "40960", @@ -236,7 +236,7 @@ "metadata": "floppy/dummy_metadata.json", "mirror": "http://cdimage.debian.org/cdimage/release", "mirror_directory": "9.0.0/amd64/iso-cd", - "name": "debian-9", + "name": "debian-9.0", "no_proxy": "{{env `no_proxy`}}", "preseed_path": "debian-8/preseed.cfg", "template": "debian-9.0-amd64", From d2c8a32aa167b62480cba15296e8210a326f3d74 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith@chef.io> Date: Tue, 20 Jun 2017 10:57:01 -0700 Subject: [PATCH 0621/1622] Remove OmniOS They publish their own boxes and the latest release completely changes how the install works which breaks all these configs. Signed-off-by: Tim Smith <tsmith@chef.io> --- omnios-r151014.json | 239 -------------------------------------------- omnios-r151018.json | 239 -------------------------------------------- 2 files changed, 478 deletions(-) delete mode 100644 omnios-r151014.json delete mode 100644 omnios-r151018.json diff --git a/omnios-r151014.json b/omnios-r151014.json deleted file mode 100644 index 2722dd48b..000000000 --- a/omnios-r151014.json +++ /dev/null @@ -1,239 +0,0 @@ -{ - "builders": [ - { - "boot_command": [ - "<enter><wait10><wait5>", - "1<enter><wait10>", - "<wait10>", - "<f2><wait>", - "<f2><wait>", - "<f2><wait>", - "<bs><bs><bs><bs><bs><bs><bs>omnios-vagrant", - "<f2><wait>", - "<f2><wait>", - "<f2><wait>", - "<wait10><wait10><wait10><wait10><wait10><wait10>", - "<wait10><wait10><wait10><wait10><wait10><wait10>", - "<wait10><wait10><wait10><wait10><wait10><wait10>", - "<wait10><wait10><wait10><wait10><wait10><wait10>", - "<f8><wait>", - "<wait10><wait10><wait10><wait10><wait10><wait10>", - "<wait10><wait10><wait10><wait10><wait10><wait10>", - "root<enter><wait><enter><wait5>", - "passwd<enter><wait>", - "vagrant<enter><wait>", - "vagrant<enter><wait>", - "ipadm create-if e1000g0<enter><wait>", - "ipadm create-addr -T dhcp e1000g0/v4<enter><wait>", - "echo 'nameserver 8.8.8.8' > /etc/resolv.conf<enter><wait>", - "cp /etc/nsswitch.dns /etc/nsswitch.conf<enter><wait>", - "sed -i -e 's/PermitRootLogin no/PermitRootLogin yes/' /etc/ssh/sshd_config<enter><wait>", - "svcadm restart ssh<enter><wait>" - ], - "boot_wait": "30s", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "OpenSolaris_64", - "headless": "{{ user `headless` }}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-virtualbox", - "shutdown_command": "/usr/sbin/shutdown -g 0 -y -i 5", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "root", - "type": "virtualbox-iso", - "vboxmanage": [ - [ - "modifyvm", - "{{.Name}}", - "--memory", - "{{ user `memory` }}" - ], - [ - "modifyvm", - "{{.Name}}", - "--cpus", - "{{ user `cpus` }}" - ] - ], - "virtualbox_version_file": ".vbox_version", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<enter><wait10><wait5>", - "1<enter><wait10>", - "<wait10>", - "<f2><wait10>", - "<wait10><wait10><wait10><wait10><wait10><wait10>", - "<wait10><wait10><wait10><wait10><wait10><wait10>", - "<f2><wait>", - "<f2><wait>", - "<bs><bs><bs><bs><bs><bs><bs>omnios-vagrant", - "<f2><wait>", - "<f2><wait>", - "<f2><wait>", - "<wait10><wait10><wait10><wait10><wait10><wait10>", - "<wait10><wait10><wait10><wait10><wait10><wait10>", - "<wait10><wait10><wait10><wait10><wait10><wait10>", - "<wait10><wait10><wait10><wait10><wait10><wait10>", - "<f8><wait>", - "<wait10><wait10><wait10><wait10><wait10><wait10>", - "<wait10><wait10><wait10><wait10><wait10><wait10>", - "root<enter><wait><enter><wait5>", - "passwd<enter><wait>", - "vagrant<enter><wait>", - "vagrant<enter><wait>", - "ipadm create-if e1000g0<enter><wait>", - "ipadm create-addr -T dhcp e1000g0/v4<enter><wait>", - "echo 'nameserver 8.8.8.8' > /etc/resolv.conf<enter><wait>", - "cp /etc/nsswitch.dns /etc/nsswitch.conf<enter><wait>", - "sed -i -e 's/PermitRootLogin no/PermitRootLogin yes/' /etc/ssh/sshd_config<enter><wait>", - "svcadm restart ssh<enter><wait>" - ], - "boot_wait": "30s", - "disk_size": "{{user `disk_size`}}", - "floppy_files": [ - "floppy/omnios/README.TXT" - ], - "guest_os_type": "solaris11-64", - "headless": "{{ user `headless` }}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-vmware", - "shutdown_command": "/usr/sbin/shutdown -g 0 -y -i 5", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "root", - "tools_upload_flavor": "solaris", - "type": "vmware-iso", - "vm_name": "{{ user `template` }}", - "vmx_data": { - "cpuid.coresPerSocket": "1", - "memsize": "{{ user `memory` }}", - "numvcpus": "{{ user `cpus` }}" - } - }, - { - "boot_command": [ - "<enter><wait10><wait5>", - "1<enter><wait10>", - "<wait10>", - "<f2><wait10>", - "<wait10><wait10><wait10><wait10><wait10><wait10>", - "<wait10><wait10><wait10><wait10><wait10><wait10>", - "<f2><wait>", - "<f2><wait>", - "<bs><bs><bs><bs><bs><bs><bs>omnios-vagrant", - "<f2><wait>", - "<f2><wait>", - "<f2><wait>", - "<wait10><wait10><wait10><wait10><wait10><wait10>", - "<wait10><wait10><wait10><wait10><wait10><wait10>", - "<wait10><wait10><wait10><wait10><wait10><wait10>", - "<wait10><wait10><wait10><wait10><wait10><wait10>", - "<f8><wait>", - "<wait10><wait10><wait10><wait10><wait10><wait10>", - "<wait10><wait10><wait10><wait10><wait10><wait10>", - "root<enter><wait><enter><wait5>", - "passwd<enter><wait>", - "vagrant<enter><wait>", - "vagrant<enter><wait>", - "ipadm create-if e1000g0<enter><wait>", - "ipadm create-addr -T dhcp e1000g0/v4<enter><wait>", - "echo 'nameserver 8.8.8.8' > /etc/resolv.conf<enter><wait>", - "cp /etc/nsswitch.dns /etc/nsswitch.conf<enter><wait>", - "sed -i -e 's/PermitRootLogin no/PermitRootLogin yes/' /etc/ssh/sshd_config<enter><wait>", - "svcadm restart ssh<enter><wait>" - ], - "boot_wait": "30s", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "opensolaris", - "hard_drive_interface": "ide", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-parallels", - "parallels_tools_mode": "disable", - "prlctl": [ - [ - "set", - "{{.Name}}", - "--memsize", - "{{ user `memory` }}" - ], - [ - "set", - "{{.Name}}", - "--cpus", - "{{ user `cpus` }}" - ] - ], - "shutdown_command": "/usr/sbin/shutdown -g 0 -y -i 5", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "root", - "type": "parallels-iso", - "vm_name": "{{ user `template` }}" - } - ], - "post-processors": [ - { - "compression_level": 9, - "output": "builds/{{user `box_basename`}}.{{.Provider}}.box", - "override": { - "parallels": { - "vagrantfile_template": "vagrantfile_templates/parallels/omnios.rb" - } - }, - "type": "vagrant" - } - ], - "provisioners": [ - { - "destination": "/tmp/bento-metadata.json", - "source": "{{user `metadata`}}", - "type": "file" - }, - { - "environment_vars": [ - "HOME_DIR=/home/vagrant", - "http_proxy={{user `http_proxy`}}", - "https_proxy={{user `https_proxy`}}", - "no_proxy={{user `no_proxy`}}" - ], - "execute_command": "export {{.Vars}} && sh '{{.Path}}'", - "scripts": [ - "scripts/common/metadata.sh", - "scripts/omnios/vmtools.sh", - "scripts/omnios/postinstall.sh" - ], - "type": "shell" - } - ], - "variables": { - "arch": "64", - "box_basename": "omnios-r151014", - "build_timestamp": "{{isotime \"20060102150405\"}}", - "cpus": "1", - "disk_size": "40960", - "git_revision": "__unknown_git_revision__", - "headless": "", - "http_proxy": "{{env `http_proxy`}}", - "https_proxy": "{{env `https_proxy`}}", - "iso_checksum": "a19c8b0c0b84d4903ea697c5038249dcfb64efd5", - "iso_checksum_type": "sha1", - "iso_name": "OmniOS_Text_r151014.iso", - "memory": "1024", - "metadata": "floppy/dummy_metadata.json", - "mirror": "http://omnios.omniti.com", - "mirror_directory": "media", - "name": "omnios-r151014", - "no_proxy": "{{env `no_proxy`}}", - "template": "omnios-r151014", - "version": "2.2.TIMESTAMP" - } -} - diff --git a/omnios-r151018.json b/omnios-r151018.json deleted file mode 100644 index ab7c19a9a..000000000 --- a/omnios-r151018.json +++ /dev/null @@ -1,239 +0,0 @@ -{ - "builders": [ - { - "boot_command": [ - "<enter><wait10><wait5>", - "1<enter><wait10>", - "<wait10>", - "<f2><wait>", - "<f2><wait>", - "<f2><wait>", - "<bs><bs><bs><bs><bs><bs><bs>omnios-vagrant", - "<f2><wait>", - "<f2><wait>", - "<f2><wait>", - "<wait10><wait10><wait10><wait10><wait10><wait10>", - "<wait10><wait10><wait10><wait10><wait10><wait10>", - "<wait10><wait10><wait10><wait10><wait10><wait10>", - "<wait10><wait10><wait10><wait10><wait10><wait10>", - "<f8><wait>", - "<wait10><wait10><wait10><wait10><wait10><wait10>", - "<wait10><wait10><wait10><wait10><wait10><wait10>", - "root<enter><wait><enter><wait5>", - "passwd<enter><wait>", - "vagrant<enter><wait>", - "vagrant<enter><wait>", - "ipadm create-if e1000g0<enter><wait>", - "ipadm create-addr -T dhcp e1000g0/v4<enter><wait>", - "echo 'nameserver 8.8.8.8' > /etc/resolv.conf<enter><wait>", - "cp /etc/nsswitch.dns /etc/nsswitch.conf<enter><wait>", - "sed -i -e 's/PermitRootLogin no/PermitRootLogin yes/' /etc/ssh/sshd_config<enter><wait>", - "svcadm restart ssh<enter><wait>" - ], - "boot_wait": "30s", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "OpenSolaris_64", - "headless": "{{ user `headless` }}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-virtualbox", - "shutdown_command": "/usr/sbin/shutdown -g 0 -y -i 5", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "root", - "type": "virtualbox-iso", - "vboxmanage": [ - [ - "modifyvm", - "{{.Name}}", - "--memory", - "{{ user `memory` }}" - ], - [ - "modifyvm", - "{{.Name}}", - "--cpus", - "{{ user `cpus` }}" - ] - ], - "virtualbox_version_file": ".vbox_version", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<enter><wait10><wait5>", - "1<enter><wait10>", - "<wait10>", - "<f2><wait10>", - "<wait10><wait10><wait10><wait10><wait10><wait10>", - "<wait10><wait10><wait10><wait10><wait10><wait10>", - "<f2><wait>", - "<f2><wait>", - "<bs><bs><bs><bs><bs><bs><bs>omnios-vagrant", - "<f2><wait>", - "<f2><wait>", - "<f2><wait>", - "<wait10><wait10><wait10><wait10><wait10><wait10>", - "<wait10><wait10><wait10><wait10><wait10><wait10>", - "<wait10><wait10><wait10><wait10><wait10><wait10>", - "<wait10><wait10><wait10><wait10><wait10><wait10>", - "<f8><wait>", - "<wait10><wait10><wait10><wait10><wait10><wait10>", - "<wait10><wait10><wait10><wait10><wait10><wait10>", - "root<enter><wait><enter><wait5>", - "passwd<enter><wait>", - "vagrant<enter><wait>", - "vagrant<enter><wait>", - "ipadm create-if e1000g0<enter><wait>", - "ipadm create-addr -T dhcp e1000g0/v4<enter><wait>", - "echo 'nameserver 8.8.8.8' > /etc/resolv.conf<enter><wait>", - "cp /etc/nsswitch.dns /etc/nsswitch.conf<enter><wait>", - "sed -i -e 's/PermitRootLogin no/PermitRootLogin yes/' /etc/ssh/sshd_config<enter><wait>", - "svcadm restart ssh<enter><wait>" - ], - "boot_wait": "30s", - "disk_size": "{{user `disk_size`}}", - "floppy_files": [ - "floppy/omnios/README.TXT" - ], - "guest_os_type": "solaris11-64", - "headless": "{{ user `headless` }}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-vmware", - "shutdown_command": "/usr/sbin/shutdown -g 0 -y -i 5", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "root", - "tools_upload_flavor": "solaris", - "type": "vmware-iso", - "vm_name": "{{ user `template` }}", - "vmx_data": { - "cpuid.coresPerSocket": "1", - "memsize": "{{ user `memory` }}", - "numvcpus": "{{ user `cpus` }}" - } - }, - { - "boot_command": [ - "<enter><wait10><wait5>", - "1<enter><wait10>", - "<wait10>", - "<f2><wait10>", - "<wait10><wait10><wait10><wait10><wait10><wait10>", - "<wait10><wait10><wait10><wait10><wait10><wait10>", - "<f2><wait>", - "<f2><wait>", - "<bs><bs><bs><bs><bs><bs><bs>omnios-vagrant", - "<f2><wait>", - "<f2><wait>", - "<f2><wait>", - "<wait10><wait10><wait10><wait10><wait10><wait10>", - "<wait10><wait10><wait10><wait10><wait10><wait10>", - "<wait10><wait10><wait10><wait10><wait10><wait10>", - "<wait10><wait10><wait10><wait10><wait10><wait10>", - "<f8><wait>", - "<wait10><wait10><wait10><wait10><wait10><wait10>", - "<wait10><wait10><wait10><wait10><wait10><wait10>", - "root<enter><wait><enter><wait5>", - "passwd<enter><wait>", - "vagrant<enter><wait>", - "vagrant<enter><wait>", - "ipadm create-if e1000g0<enter><wait>", - "ipadm create-addr -T dhcp e1000g0/v4<enter><wait>", - "echo 'nameserver 8.8.8.8' > /etc/resolv.conf<enter><wait>", - "cp /etc/nsswitch.dns /etc/nsswitch.conf<enter><wait>", - "sed -i -e 's/PermitRootLogin no/PermitRootLogin yes/' /etc/ssh/sshd_config<enter><wait>", - "svcadm restart ssh<enter><wait>" - ], - "boot_wait": "30s", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "opensolaris", - "hard_drive_interface": "ide", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-parallels", - "parallels_tools_mode": "disable", - "prlctl": [ - [ - "set", - "{{.Name}}", - "--memsize", - "{{ user `memory` }}" - ], - [ - "set", - "{{.Name}}", - "--cpus", - "{{ user `cpus` }}" - ] - ], - "shutdown_command": "/usr/sbin/shutdown -g 0 -y -i 5", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "root", - "type": "parallels-iso", - "vm_name": "{{ user `template` }}" - } - ], - "post-processors": [ - { - "compression_level": 9, - "output": "builds/{{user `box_basename`}}.{{.Provider}}.box", - "override": { - "parallels": { - "vagrantfile_template": "vagrantfile_templates/parallels/omnios.rb" - } - }, - "type": "vagrant" - } - ], - "provisioners": [ - { - "destination": "/tmp/bento-metadata.json", - "source": "{{user `metadata`}}", - "type": "file" - }, - { - "environment_vars": [ - "HOME_DIR=/home/vagrant", - "http_proxy={{user `http_proxy`}}", - "https_proxy={{user `https_proxy`}}", - "no_proxy={{user `no_proxy`}}" - ], - "execute_command": "export {{.Vars}} && sh '{{.Path}}'", - "scripts": [ - "scripts/common/metadata.sh", - "scripts/omnios/vmtools.sh", - "scripts/omnios/postinstall.sh" - ], - "type": "shell" - } - ], - "variables": { - "arch": "64", - "box_basename": "omnios-r151018", - "build_timestamp": "{{isotime \"20060102150405\"}}", - "cpus": "1", - "disk_size": "40960", - "git_revision": "__unknown_git_revision__", - "headless": "", - "http_proxy": "{{env `http_proxy`}}", - "https_proxy": "{{env `https_proxy`}}", - "iso_checksum": "accb4dec37021e47414c6b64929ef1b8e1f2d6d9", - "iso_checksum_type": "sha1", - "iso_name": "OmniOS_Text_r151018.iso", - "memory": "1024", - "metadata": "floppy/dummy_metadata.json", - "mirror": "http://omnios.omniti.com", - "mirror_directory": "media", - "name": "omnios-r151018", - "no_proxy": "{{env `no_proxy`}}", - "template": "omnios-r151018", - "version": "2.2.TIMESTAMP" - } -} - From 82eecc9c24533f42acf7ea6a643cacfe0cb751f2 Mon Sep 17 00:00:00 2001 From: Vincent AUBERT <vincentaubert88@gmail.com> Date: Mon, 22 May 2017 00:16:52 +0200 Subject: [PATCH 0622/1622] update debian to 8.8 Signed-off-by: Vincent AUBERT <vincentaubert88@gmail.com> --- README.md | 2 +- debian-8.7-amd64.json => debian-8.8-amd64.json | 14 +++++++------- debian-8.7-i386.json => debian-8.8-i386.json | 14 +++++++------- 3 files changed, 15 insertions(+), 15 deletions(-) rename debian-8.7-amd64.json => debian-8.8-amd64.json (96%) rename debian-8.7-i386.json => debian-8.8-i386.json (96%) diff --git a/README.md b/README.md index ab6171fd4..14ad6e192 100644 --- a/README.md +++ b/README.md @@ -37,7 +37,7 @@ The following boxes are built from this repository's templates for publicly avai | centos-5.11 | [i386][centos_511_32_vbox] | [i386][centos_511_32_vmware] | [i386][centos_511_32_prl] | | centos-6.8 | [i386][centos_68_32_vbox] | [i386][centos_68_32_vmware] | [i386][centos_68_32_prl] | | debian-7.11 | [i386][debian_711_32_vbox] | [i386][debian_711_32_vmware] | [i386][debian_711_32_prl] | -| debian-8.7 | [i386][debian_87_32_vbox] | ~~[i386][debian_87_32_vmware]~~ | [i386][debian_87_32_prl] | +| debian-8.8 | [i386][debian_88_32_vbox] | ~~[i386][debian_88_32_vmware]~~ | [i386][debian_88_32_prl] | | oracle-5.11 | [x86_64][oracle_511_32_vbox] | [x86_64][oracle_511_32_vmware] | [x86_64][oracle_511_32_prl] | | oracle-6.8 | [x86_64][oracle_68_32_vbox] | [x86_64][oracle_68_32_vmware] | [x86_64][oracle_68_32_prl] | | ubuntu-12.04 | [i386][ubuntu_1204_32_vbox] | [i386][ubuntu_1204_32_vmware] | [i386][ubuntu_1204_32_prl] | diff --git a/debian-8.7-amd64.json b/debian-8.8-amd64.json similarity index 96% rename from debian-8.7-amd64.json rename to debian-8.8-amd64.json index 261b3d315..212eed1c1 100644 --- a/debian-8.7-amd64.json +++ b/debian-8.8-amd64.json @@ -221,7 +221,7 @@ } ], "variables": { - "box_basename": "debian-8.7", + "box_basename": "debian-8.8", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", "disk_size": "40960", @@ -229,17 +229,17 @@ "headless": "", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", - "iso_checksum": "065c90fa72ed51b7ce06ecfdc660b083e7b0c40bbf63fd58559c8bf7df7752da", + "iso_checksum": "673079527fdf3a91e8bfc9e0312f94316820ca795bb6a1b2af1e8461eb78179c", "iso_checksum_type": "sha256", - "iso_name": "debian-8.7.1-amd64-CD-1.iso", + "iso_name": "debian-8.8.0-amd64-CD-1.iso", "memory": "512", "metadata": "floppy/dummy_metadata.json", - "mirror": "http://cdimage.debian.org/cdimage/release", - "mirror_directory": "8.7.1/amd64/iso-cd", - "name": "debian-8.7", + "mirror": "http://cdimage.debian.org/cdimage/archive", + "mirror_directory": "8.8.0/amd64/iso-cd", + "name": "debian-8.8", "no_proxy": "{{env `no_proxy`}}", "preseed_path": "debian-8/preseed.cfg", - "template": "debian-8.7-amd64", + "template": "debian-8.8-amd64", "version": "2.1.TIMESTAMP" } } diff --git a/debian-8.7-i386.json b/debian-8.8-i386.json similarity index 96% rename from debian-8.7-i386.json rename to debian-8.8-i386.json index 926a01e2d..3d159cff6 100644 --- a/debian-8.7-i386.json +++ b/debian-8.8-i386.json @@ -221,7 +221,7 @@ } ], "variables": { - "box_basename": "debian-8.7-i386", + "box_basename": "debian-8.8-i386", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", "disk_size": "40960", @@ -229,17 +229,17 @@ "headless": "", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", - "iso_checksum": "f3debfa96a024b9c1a4b342db96c6afcd0e9adb94a6144ed99e34bce110be2d5", + "iso_checksum": "0834db8a6c6eab749be5d25b0451fa46ea96dfb91134df8f26323ff8b79b01ca", "iso_checksum_type": "sha256", - "iso_name": "debian-8.7.1-i386-CD-1.iso", + "iso_name": "debian-8.8.0-i386-CD-1.iso", "memory": "512", "metadata": "floppy/dummy_metadata.json", - "mirror": "http://cdimage.debian.org/cdimage/release", - "mirror_directory": "8.7.1/i386/iso-cd", - "name": "debian-8.7-i386", + "mirror": "http://cdimage.debian.org/cdimage/archive", + "mirror_directory": "8.8.0/i386/iso-cd", + "name": "debian-8.8-i386", "no_proxy": "{{env `no_proxy`}}", "preseed_path": "debian-8/preseed.cfg", - "template": "debian-8.7-i386", + "template": "debian-8.8-i386", "version": "2.1.TIMESTAMP" } } From c424fd78d69e479d7b8429e16657d9950c9b71f9 Mon Sep 17 00:00:00 2001 From: Wicked Viking <wickedvikingstudios@gmail.com> Date: Thu, 22 Jun 2017 22:35:46 -0500 Subject: [PATCH 0623/1622] Hyper-V Support for CentOS 7.3 build --- README.md | 38 +++++++++++++++++++------------------- centos-7.3-x86_64.json | 32 ++++++++++++++++++++++++++++++++ http/centos-7.3/ks.cfg | 14 +++++++++++--- 3 files changed, 62 insertions(+), 22 deletions(-) diff --git a/README.md b/README.md index 14ad6e192..6db16f682 100644 --- a/README.md +++ b/README.md @@ -10,25 +10,25 @@ The following boxes are built from this repository's templates for publicly avai ### 64 bit -| | VirtualBox | VMware | Parallels | -|------------------- | ------------------------------ | --------------------------------- | ------------------------------| -| centos-5.11 | [x86_64][centos_511_64_vbox] | [x86_64][centos_511_64_vmware] | [x86_64][centos_511_64_prl] | -| centos-6.8 | [x86_64][centos_68_64_vbox] | [x86_64][centos_68_64_vmware] | [x86_64][centos_68_64_prl] | -| centos-7.3 | [x86_64][centos_73_64_vbox] | [x86_64][centos_73_64_vmware] | [x86_64][centos_73_64_prl] | -| debian-7.11 | [amd64][debian_711_64_vbox] | [amd64][debian_711_64_vmware] | [amd64][debian_711_64_prl] | -| debian-8.7 | [amd64][debian_87_64_vbox] | ~~[amd64][debian_87_64_vmware]~~ | [amd64][debian_87_64_prl] | -| fedora-24 | [x86_64][fedora_24_64_vbox] | [x86_64][fedora_24_64_vmware] | ~~[x86_64][fedora_24_64_prl]~~| -| fedora-25 | [x86_64][fedora_25_64_vbox] | [x86_64][fedora_25_64_vmware] | [x86_64][fedora_25_64_prl] | -| freebsd-10.3 | [amd64][freebsd_103_64_vbox] | ~~[amd64][freebsd_103_64_vmware]~~ | [amd64][freebsd_103_64_prl] | -| freebsd-11.0 | [amd64][freebsd_110_64_vbox] | [amd64][freebsd_110_64_vmware] | [amd64][freebsd_110_64_prl] | -| opensuse-leap-42.2 | [x86_64][leap_422_64_vbox] | ~~[x86_64][leap_422_64_vmware]~~ | ~~[x86_64][leap_422_64_prl]~~ | -| oracle-5.11 | [x86_64][oracle_511_64_vbox] | [x86_64][oracle_511_64_vmware] | [x86_64][oracle_511_64_prl] | -| oracle-6.8 | [x86_64][oracle_68_64_vbox] | [x86_64][oracle_68_64_vmware] | [x86_64][oracle_68_64_prl] | -| oracle-7.3 | [x86_64][oracle_73_64_vbox] | [x86_64][oracle_73_64_vmware] | [x86_64][oracle_73_64_prl] | -| ubuntu-12.04 | [amd64][ubuntu_1204_64_vbox] | [amd64][ubuntu_1204_64_vmware] | [amd64][ubuntu_1204_64_prl] | -| ubuntu-14.04 | [amd64][ubuntu_1404_64_vbox] | [amd64][ubuntu_1404_64_vmware] | [amd64][ubuntu_1404_64_prl] | -| ubuntu-16.04 | [amd64][ubuntu_1604_64_vbox] | [amd64][ubuntu_1604_64_vmware] | [amd64][ubuntu_1604_64_prl] | -| ubuntu-16.10 | [amd64][ubuntu_1610_64_vbox] | [amd64][ubuntu_1610_64_vmware] | [amd64][ubuntu_1610_64_prl] | +| | VirtualBox | VMware | Parallels |Hyper-V | +|------------------- | ------------------------------ | --------------------------------- | ------------------------------|------------------------------| +| centos-5.11 | [x86_64][centos_511_64_vbox] | [x86_64][centos_511_64_vmware] | [x86_64][centos_511_64_prl] || +| centos-6.8 | [x86_64][centos_68_64_vbox] | [x86_64][centos_68_64_vmware] | [x86_64][centos_68_64_prl] || +| centos-7.3 | [x86_64][centos_73_64_vbox] | [x86_64][centos_73_64_vmware] | [x86_64][centos_73_64_prl] |[x86_64][centos_73_64_hyperv] | +| debian-7.11 | [amd64][debian_711_64_vbox] | [amd64][debian_711_64_vmware] | [amd64][debian_711_64_prl] || +| debian-8.7 | [amd64][debian_87_64_vbox] | ~~[amd64][debian_87_64_vmware]~~ | [amd64][debian_87_64_prl] || +| fedora-24 | [x86_64][fedora_24_64_vbox] | [x86_64][fedora_24_64_vmware] | ~~[x86_64][fedora_24_64_prl]~~|| +| fedora-25 | [x86_64][fedora_25_64_vbox] | [x86_64][fedora_25_64_vmware] | [x86_64][fedora_25_64_prl] || +| freebsd-10.3 | [amd64][freebsd_103_64_vbox] | ~~[amd64][freebsd_103_64_vmware]~~ | [amd64][freebsd_103_64_prl] || +| freebsd-11.0 | [amd64][freebsd_110_64_vbox] | [amd64][freebsd_110_64_vmware] | [amd64][freebsd_110_64_prl] || +| opensuse-leap-42.2 | [x86_64][leap_422_64_vbox] | ~~[x86_64][leap_422_64_vmware]~~ | ~~[x86_64][leap_422_64_prl]~~ || +| oracle-5.11 | [x86_64][oracle_511_64_vbox] | [x86_64][oracle_511_64_vmware] | [x86_64][oracle_511_64_prl] || +| oracle-6.8 | [x86_64][oracle_68_64_vbox] | [x86_64][oracle_68_64_vmware] | [x86_64][oracle_68_64_prl] || +| oracle-7.3 | [x86_64][oracle_73_64_vbox] | [x86_64][oracle_73_64_vmware] | [x86_64][oracle_73_64_prl] || +| ubuntu-12.04 | [amd64][ubuntu_1204_64_vbox] | [amd64][ubuntu_1204_64_vmware] | [amd64][ubuntu_1204_64_prl] || +| ubuntu-14.04 | [amd64][ubuntu_1404_64_vbox] | [amd64][ubuntu_1404_64_vmware] | [amd64][ubuntu_1404_64_prl] || +| ubuntu-16.04 | [amd64][ubuntu_1604_64_vbox] | [amd64][ubuntu_1604_64_vmware] | [amd64][ubuntu_1604_64_prl] || +| ubuntu-16.10 | [amd64][ubuntu_1610_64_vbox] | [amd64][ubuntu_1610_64_vmware] | [amd64][ubuntu_1610_64_prl] || ### 32 bit diff --git a/centos-7.3-x86_64.json b/centos-7.3-x86_64.json index d2725be9f..9dde318aa 100644 --- a/centos-7.3-x86_64.json +++ b/centos-7.3-x86_64.json @@ -101,6 +101,34 @@ "type": "parallels-iso", "vm_name": "{{ user `template` }}" }, + { + "boot_command": [ + "<wait5><tab> text ks=hd:fd0:/ks.cfg<enter><wait5><esc>" + ], + "boot_wait": "10s", + "cpu": "{{ user `cpus` }}", + "disk_size": "{{user `disk_size`}}", + "floppy_files": [ + "http/centos-7.3/ks.cfg" + ], + "generation": "{{user `hyperv_generation`}}", + "guest_additions_mode": "{{user `hyperv_guest_additions_mode`}}", + "guest_additions_path": "{{user `hyperv_guest_additions_path`}}", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-hyperv", + "ram_size": "{{ user `memory` }}", + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_timeout": "10000s", + "switch_name":"{{ user `hyperv_switch`}}", + "type": "hyperv-iso", + "vm_name": "{{ user `template` }}" + }, { "boot_command": [ "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" @@ -165,6 +193,10 @@ "headless": "", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", + "hyperv_generation": "1" , + "hyperv_guest_additions_mode": "disable", + "hyperv_guest_additions_path": "https://download.microsoft.com/download/6/8/F/68FE11B8-FAA4-4F8D-8C7D-74DA7F2CFC8C/LinuxIC-4.2.1.iso", + "hyperv_switch": "{{env `hyperv_switch`}}", "iso_checksum": "c455ee948e872ad2194bdddd39045b83634e8613249182b88f549bb2319d97eb", "iso_checksum_type": "sha256", "iso_name": "CentOS-7-x86_64-DVD-1611.iso", diff --git a/http/centos-7.3/ks.cfg b/http/centos-7.3/ks.cfg index 9a940f63c..811e4f13c 100644 --- a/http/centos-7.3/ks.cfg +++ b/http/centos-7.3/ks.cfg @@ -2,7 +2,7 @@ install cdrom lang en_US.UTF-8 keyboard us -network --bootproto=dhcp +network --bootproto=dhcp --onboot=on --device=eth0 rootpw vagrant firewall --disabled selinux --permissive @@ -16,7 +16,7 @@ clearpart --all --initlabel autopart auth --enableshadow --passalgo=sha512 --kickstart firstboot --disabled -reboot +reboot --eject user --name=vagrant --plaintext --password vagrant %packages --nobase --ignoremissing --excludedocs @@ -74,7 +74,15 @@ bzip2 -zd1211-firmware %end -%post +%post --log=/root/ks-post.log # sudo echo "%vagrant ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers.d/vagrant + +#Enable hyper-v daemons only if using hyper-v virtualization +if [ $(virt-what) == "hyperv" ]; then + yum -y install hyperv-daemons + systemctl enable hypervvssd + systemctl enable hypervkvpd +fi + %end From df34dcf6090dd5b3767ee3574a95746e2ae348c4 Mon Sep 17 00:00:00 2001 From: Wicked Viking <wickedvikingstudios@gmail.com> Date: Thu, 22 Jun 2017 22:39:44 -0500 Subject: [PATCH 0624/1622] remove ks-post.log --- http/centos-7.3/ks.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/http/centos-7.3/ks.cfg b/http/centos-7.3/ks.cfg index 811e4f13c..15e566cdd 100644 --- a/http/centos-7.3/ks.cfg +++ b/http/centos-7.3/ks.cfg @@ -74,7 +74,7 @@ bzip2 -zd1211-firmware %end -%post --log=/root/ks-post.log +%post # sudo echo "%vagrant ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers.d/vagrant From 4ec59e8673540f8ae3c6cacddfb8d1140873356a Mon Sep 17 00:00:00 2001 From: Wicked Viking <wickedvikingstudios@gmail.com> Date: Fri, 23 Jun 2017 01:51:54 -0500 Subject: [PATCH 0625/1622] removed unnecessary variables and redundant config --- centos-7.3-x86_64.json | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/centos-7.3-x86_64.json b/centos-7.3-x86_64.json index 9dde318aa..ac725a983 100644 --- a/centos-7.3-x86_64.json +++ b/centos-7.3-x86_64.json @@ -112,8 +112,7 @@ "http/centos-7.3/ks.cfg" ], "generation": "{{user `hyperv_generation`}}", - "guest_additions_mode": "{{user `hyperv_guest_additions_mode`}}", - "guest_additions_path": "{{user `hyperv_guest_additions_path`}}", + "guest_additions_mode": "disable", "http_directory": "http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", @@ -194,8 +193,6 @@ "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", "hyperv_generation": "1" , - "hyperv_guest_additions_mode": "disable", - "hyperv_guest_additions_path": "https://download.microsoft.com/download/6/8/F/68FE11B8-FAA4-4F8D-8C7D-74DA7F2CFC8C/LinuxIC-4.2.1.iso", "hyperv_switch": "{{env `hyperv_switch`}}", "iso_checksum": "c455ee948e872ad2194bdddd39045b83634e8613249182b88f549bb2319d97eb", "iso_checksum_type": "sha256", From a920f5c64b181ddf4a92bc258dee5f3018167b50 Mon Sep 17 00:00:00 2001 From: Kentaro Hayashi <kenhys@gmail.com> Date: Fri, 23 Jun 2017 23:54:29 +0900 Subject: [PATCH 0626/1622] Support Debian 9 i386 Signed-off-by: Kentaro Hayashi <kenhys@gmail.com> --- debian-9.0-i386.json | 246 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 246 insertions(+) create mode 100644 debian-9.0-i386.json diff --git a/debian-9.0-i386.json b/debian-9.0-i386.json new file mode 100644 index 000000000..aa82095b7 --- /dev/null +++ b/debian-9.0-i386.json @@ -0,0 +1,246 @@ +{ + "builders": [ + { + "boot_command": [ + "<esc><wait>", + "install <wait>", + " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}} <wait>", + "debian-installer=en_US.UTF-8 <wait>", + "auto <wait>", + "locale=en_US.UTF-8 <wait>", + "kbd-chooser/method=us <wait>", + "keyboard-configuration/xkb-keymap=us <wait>", + "netcfg/get_hostname={{ .Name }} <wait>", + "netcfg/get_domain=vagrantup.com <wait>", + "fb=false <wait>", + "debconf/frontend=noninteractive <wait>", + "console-setup/ask_detect=false <wait>", + "console-keymaps-at/keymap=us <wait>", + "grub-installer/bootdev=/dev/sda <wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": "{{user `disk_size`}}", + "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "guest_os_type": "Debian", + "hard_drive_interface": "sata", + "headless": "{{ user `headless` }}", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-virtualbox", + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "virtualbox-iso", + "vboxmanage": [ + [ + "modifyvm", + "{{.Name}}", + "--memory", + "{{ user `memory` }}" + ], + [ + "modifyvm", + "{{.Name}}", + "--cpus", + "{{ user `cpus` }}" + ] + ], + "virtualbox_version_file": ".vbox_version", + "vm_name": "{{ user `template` }}" + }, + { + "boot_command": [ + "<esc><wait>", + "install <wait>", + " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}} <wait>", + "debian-installer=en_US.UTF-8 <wait>", + "auto <wait>", + "locale=en_US.UTF-8 <wait>", + "kbd-chooser/method=us <wait>", + "keyboard-configuration/xkb-keymap=us <wait>", + "netcfg/get_hostname={{ .Name }} <wait>", + "netcfg/get_domain=vagrantup.com <wait>", + "fb=false <wait>", + "debconf/frontend=noninteractive <wait>", + "console-setup/ask_detect=false <wait>", + "console-keymaps-at/keymap=us <wait>", + "grub-installer/bootdev=/dev/sda <wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": "{{user `disk_size`}}", + "guest_os_type": "debian8", + "headless": "{{ user `headless` }}", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-vmware", + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "tools_upload_flavor": "linux", + "type": "vmware-iso", + "vm_name": "{{ user `template` }}", + "vmx_data": { + "cpuid.coresPerSocket": "1", + "ethernet0.pciSlotNumber": "32", + "memsize": "{{ user `memory` }}", + "numvcpus": "{{ user `cpus` }}" + } + }, + { + "boot_command": [ + "<esc><wait>", + "install <wait>", + " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}} <wait>", + "debian-installer=en_US.UTF-8 <wait>", + "auto <wait>", + "locale=en_US.UTF-8 <wait>", + "kbd-chooser/method=us <wait>", + "keyboard-configuration/xkb-keymap=us <wait>", + "netcfg/get_hostname={{ .Name }} <wait>", + "netcfg/get_domain=vagrantup.com <wait>", + "fb=false <wait>", + "debconf/frontend=noninteractive <wait>", + "console-setup/ask_detect=false <wait>", + "console-keymaps-at/keymap=us <wait>", + "grub-installer/bootdev=/dev/sda <wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": "{{user `disk_size`}}", + "guest_os_type": "debian", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-parallels", + "parallels_tools_flavor": "lin", + "prlctl": [ + [ + "set", + "{{.Name}}", + "--memsize", + "{{ user `memory` }}" + ], + [ + "set", + "{{.Name}}", + "--cpus", + "{{ user `cpus` }}" + ] + ], + "prlctl_version_file": ".prlctl_version", + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "parallels-iso", + "vm_name": "{{ user `template` }}" + }, + { + "boot_command": [ + "<esc><wait>", + "install <wait>", + " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}} <wait>", + "debian-installer=en_US.UTF-8 <wait>", + "auto <wait>", + "locale=en_US.UTF-8 <wait>", + "kbd-chooser/method=us <wait>", + "keyboard-configuration/xkb-keymap=us <wait>", + "netcfg/get_hostname={{ .Name }} <wait>", + "netcfg/get_domain=vagrantup.com <wait>", + "fb=false <wait>", + "debconf/frontend=noninteractive <wait>", + "console-setup/ask_detect=false <wait>", + "console-keymaps-at/keymap=us <wait>", + "grub-installer/bootdev=/dev/vda <wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": "{{user `disk_size`}}", + "headless": "{{ user `headless` }}", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-qemu", + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "qemu", + "vm_name": "{{ user `template` }}" + } + ], + "post-processors": [ + { + "output": "builds/{{user `box_basename`}}.{{.Provider}}.box", + "type": "vagrant" + } + ], + "provisioners": [ + { + "destination": "/tmp/bento-metadata.json", + "source": "{{user `metadata`}}", + "type": "file" + }, + { + "environment_vars": [ + "HOME_DIR=/home/vagrant", + "http_proxy={{user `http_proxy`}}", + "https_proxy={{user `https_proxy`}}", + "no_proxy={{user `no_proxy`}}" + ], + "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", + "scripts": [ + "scripts/common/metadata.sh", + "scripts/debian/update.sh", + "scripts/common/sshd.sh", + "scripts/debian/networking.sh", + "scripts/debian/sudoers.sh", + "scripts/common/vagrant.sh", + "scripts/debian/systemd.sh", + "scripts/common/virtualbox.sh", + "scripts/common/vmware.sh", + "scripts/common/parallels.sh", + "scripts/debian/cleanup.sh", + "scripts/common/minimize.sh" + ], + "type": "shell" + } + ], + "variables": { + "box_basename": "debian-9.0-i386", + "build_timestamp": "{{isotime \"20060102150405\"}}", + "cpus": "1", + "disk_size": "40960", + "git_revision": "__unknown_git_revision__", + "headless": "", + "http_proxy": "{{env `http_proxy`}}", + "https_proxy": "{{env `https_proxy`}}", + "iso_checksum": "3bf78f7b003203a6b771b05fa1790e74ee3ea15d6245a01683f90c02b95c0315", + "iso_checksum_type": "sha256", + "iso_name": "debian-9.0.0-i386-netinst.iso", + "memory": "512", + "metadata": "floppy/dummy_metadata.json", + "mirror": "http://cdimage.debian.org/cdimage/release", + "mirror_directory": "9.0.0/i386/iso-cd", + "name": "debian-9.0-i386", + "no_proxy": "{{env `no_proxy`}}", + "preseed_path": "debian-8/preseed.cfg", + "template": "debian-9.0-i386", + "version": "2.1.TIMESTAMP" + } +} + From 5e3c953778337265f7a66beb19808218bcaf20f0 Mon Sep 17 00:00:00 2001 From: Wicked Viking <wickedvikingstudios@gmail.com> Date: Fri, 23 Jun 2017 01:51:54 -0500 Subject: [PATCH 0627/1622] removed unnecessary variables and redundant config Signed-off-by: Wicked Viking <wickedvikingstudios@gmail.com> --- README.md | 38 +++++++++++++++++++------------------- centos-7.3-x86_64.json | 5 +---- 2 files changed, 20 insertions(+), 23 deletions(-) diff --git a/README.md b/README.md index 6db16f682..14ad6e192 100644 --- a/README.md +++ b/README.md @@ -10,25 +10,25 @@ The following boxes are built from this repository's templates for publicly avai ### 64 bit -| | VirtualBox | VMware | Parallels |Hyper-V | -|------------------- | ------------------------------ | --------------------------------- | ------------------------------|------------------------------| -| centos-5.11 | [x86_64][centos_511_64_vbox] | [x86_64][centos_511_64_vmware] | [x86_64][centos_511_64_prl] || -| centos-6.8 | [x86_64][centos_68_64_vbox] | [x86_64][centos_68_64_vmware] | [x86_64][centos_68_64_prl] || -| centos-7.3 | [x86_64][centos_73_64_vbox] | [x86_64][centos_73_64_vmware] | [x86_64][centos_73_64_prl] |[x86_64][centos_73_64_hyperv] | -| debian-7.11 | [amd64][debian_711_64_vbox] | [amd64][debian_711_64_vmware] | [amd64][debian_711_64_prl] || -| debian-8.7 | [amd64][debian_87_64_vbox] | ~~[amd64][debian_87_64_vmware]~~ | [amd64][debian_87_64_prl] || -| fedora-24 | [x86_64][fedora_24_64_vbox] | [x86_64][fedora_24_64_vmware] | ~~[x86_64][fedora_24_64_prl]~~|| -| fedora-25 | [x86_64][fedora_25_64_vbox] | [x86_64][fedora_25_64_vmware] | [x86_64][fedora_25_64_prl] || -| freebsd-10.3 | [amd64][freebsd_103_64_vbox] | ~~[amd64][freebsd_103_64_vmware]~~ | [amd64][freebsd_103_64_prl] || -| freebsd-11.0 | [amd64][freebsd_110_64_vbox] | [amd64][freebsd_110_64_vmware] | [amd64][freebsd_110_64_prl] || -| opensuse-leap-42.2 | [x86_64][leap_422_64_vbox] | ~~[x86_64][leap_422_64_vmware]~~ | ~~[x86_64][leap_422_64_prl]~~ || -| oracle-5.11 | [x86_64][oracle_511_64_vbox] | [x86_64][oracle_511_64_vmware] | [x86_64][oracle_511_64_prl] || -| oracle-6.8 | [x86_64][oracle_68_64_vbox] | [x86_64][oracle_68_64_vmware] | [x86_64][oracle_68_64_prl] || -| oracle-7.3 | [x86_64][oracle_73_64_vbox] | [x86_64][oracle_73_64_vmware] | [x86_64][oracle_73_64_prl] || -| ubuntu-12.04 | [amd64][ubuntu_1204_64_vbox] | [amd64][ubuntu_1204_64_vmware] | [amd64][ubuntu_1204_64_prl] || -| ubuntu-14.04 | [amd64][ubuntu_1404_64_vbox] | [amd64][ubuntu_1404_64_vmware] | [amd64][ubuntu_1404_64_prl] || -| ubuntu-16.04 | [amd64][ubuntu_1604_64_vbox] | [amd64][ubuntu_1604_64_vmware] | [amd64][ubuntu_1604_64_prl] || -| ubuntu-16.10 | [amd64][ubuntu_1610_64_vbox] | [amd64][ubuntu_1610_64_vmware] | [amd64][ubuntu_1610_64_prl] || +| | VirtualBox | VMware | Parallels | +|------------------- | ------------------------------ | --------------------------------- | ------------------------------| +| centos-5.11 | [x86_64][centos_511_64_vbox] | [x86_64][centos_511_64_vmware] | [x86_64][centos_511_64_prl] | +| centos-6.8 | [x86_64][centos_68_64_vbox] | [x86_64][centos_68_64_vmware] | [x86_64][centos_68_64_prl] | +| centos-7.3 | [x86_64][centos_73_64_vbox] | [x86_64][centos_73_64_vmware] | [x86_64][centos_73_64_prl] | +| debian-7.11 | [amd64][debian_711_64_vbox] | [amd64][debian_711_64_vmware] | [amd64][debian_711_64_prl] | +| debian-8.7 | [amd64][debian_87_64_vbox] | ~~[amd64][debian_87_64_vmware]~~ | [amd64][debian_87_64_prl] | +| fedora-24 | [x86_64][fedora_24_64_vbox] | [x86_64][fedora_24_64_vmware] | ~~[x86_64][fedora_24_64_prl]~~| +| fedora-25 | [x86_64][fedora_25_64_vbox] | [x86_64][fedora_25_64_vmware] | [x86_64][fedora_25_64_prl] | +| freebsd-10.3 | [amd64][freebsd_103_64_vbox] | ~~[amd64][freebsd_103_64_vmware]~~ | [amd64][freebsd_103_64_prl] | +| freebsd-11.0 | [amd64][freebsd_110_64_vbox] | [amd64][freebsd_110_64_vmware] | [amd64][freebsd_110_64_prl] | +| opensuse-leap-42.2 | [x86_64][leap_422_64_vbox] | ~~[x86_64][leap_422_64_vmware]~~ | ~~[x86_64][leap_422_64_prl]~~ | +| oracle-5.11 | [x86_64][oracle_511_64_vbox] | [x86_64][oracle_511_64_vmware] | [x86_64][oracle_511_64_prl] | +| oracle-6.8 | [x86_64][oracle_68_64_vbox] | [x86_64][oracle_68_64_vmware] | [x86_64][oracle_68_64_prl] | +| oracle-7.3 | [x86_64][oracle_73_64_vbox] | [x86_64][oracle_73_64_vmware] | [x86_64][oracle_73_64_prl] | +| ubuntu-12.04 | [amd64][ubuntu_1204_64_vbox] | [amd64][ubuntu_1204_64_vmware] | [amd64][ubuntu_1204_64_prl] | +| ubuntu-14.04 | [amd64][ubuntu_1404_64_vbox] | [amd64][ubuntu_1404_64_vmware] | [amd64][ubuntu_1404_64_prl] | +| ubuntu-16.04 | [amd64][ubuntu_1604_64_vbox] | [amd64][ubuntu_1604_64_vmware] | [amd64][ubuntu_1604_64_prl] | +| ubuntu-16.10 | [amd64][ubuntu_1610_64_vbox] | [amd64][ubuntu_1610_64_vmware] | [amd64][ubuntu_1610_64_prl] | ### 32 bit diff --git a/centos-7.3-x86_64.json b/centos-7.3-x86_64.json index 9dde318aa..ac725a983 100644 --- a/centos-7.3-x86_64.json +++ b/centos-7.3-x86_64.json @@ -112,8 +112,7 @@ "http/centos-7.3/ks.cfg" ], "generation": "{{user `hyperv_generation`}}", - "guest_additions_mode": "{{user `hyperv_guest_additions_mode`}}", - "guest_additions_path": "{{user `hyperv_guest_additions_path`}}", + "guest_additions_mode": "disable", "http_directory": "http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", @@ -194,8 +193,6 @@ "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", "hyperv_generation": "1" , - "hyperv_guest_additions_mode": "disable", - "hyperv_guest_additions_path": "https://download.microsoft.com/download/6/8/F/68FE11B8-FAA4-4F8D-8C7D-74DA7F2CFC8C/LinuxIC-4.2.1.iso", "hyperv_switch": "{{env `hyperv_switch`}}", "iso_checksum": "c455ee948e872ad2194bdddd39045b83634e8613249182b88f549bb2319d97eb", "iso_checksum_type": "sha256", From a6f13fd694e5caa29a4ad14d111abec762c51d26 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith@chef.io> Date: Mon, 26 Jun 2017 22:17:50 -0700 Subject: [PATCH 0628/1622] Update RHEL from 6.8 to 6.9 Signed-off-by: Tim Smith <tsmith@chef.io> --- rhel-6.8-i386.json => rhel-6.9-i386.json | 13 ++++++------- rhel-6.8-x86_64.json => rhel-6.9-x86_64.json | 13 ++++++------- 2 files changed, 12 insertions(+), 14 deletions(-) rename rhel-6.8-i386.json => rhel-6.9-i386.json (95%) rename rhel-6.8-x86_64.json => rhel-6.9-x86_64.json (95%) diff --git a/rhel-6.8-i386.json b/rhel-6.9-i386.json similarity index 95% rename from rhel-6.8-i386.json rename to rhel-6.9-i386.json index 7968a43f9..91d3dc70a 100644 --- a/rhel-6.8-i386.json +++ b/rhel-6.9-i386.json @@ -158,7 +158,7 @@ ], "variables": { "arch": "32", - "box_basename": "rhel-6.8-i386", + "box_basename": "rhel-6.9-i386", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", "disk_size": "40960", @@ -166,18 +166,17 @@ "headless": "", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", - "iso_checksum": "22d1754f3e642c2b60234c3f97d1d6689b33bef4dd2252e3f52cd9aa823bb5f3", + "iso_checksum": "1977d26df16ad2802728dafa3cbfd015895cfcf364fb20e8974123addce03021", "iso_checksum_type": "sha256", - "iso_name": "rhel-server-6.8-i386-dvd.iso", - "ks_path": "centos-6.8/ks.cfg", + "iso_name": "rhel-server-6.9-i386-dvd.iso", + "ks_path": "centos-6.9/ks.cfg", "memory": "512", "metadata": "floppy/dummy_metadata.json", "mirror": "http://YOU-MUST-PROVIDE-YOUR-OWN-ISO.sorry", "mirror_directory": "rhel", - "name": "rhel-6.8-i386", + "name": "rhel-6.9-i386", "no_proxy": "{{env `no_proxy`}}", - "template": "rhel-6.8-i386", + "template": "rhel-6.9-i386", "version": "2.2.TIMESTAMP" } } - diff --git a/rhel-6.8-x86_64.json b/rhel-6.9-x86_64.json similarity index 95% rename from rhel-6.8-x86_64.json rename to rhel-6.9-x86_64.json index 0d14c820b..f9cf530af 100644 --- a/rhel-6.8-x86_64.json +++ b/rhel-6.9-x86_64.json @@ -158,7 +158,7 @@ ], "variables": { "arch": "64", - "box_basename": "rhel-6.8", + "box_basename": "rhel-6.9", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", "disk_size": "40960", @@ -166,18 +166,17 @@ "headless": "", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", - "iso_checksum": "d35fd1af20f6adef9b11b46c2534ae8b6e18de7754889e2b51808b436dff2804", + "iso_checksum": "3f961576e9f81ea118566f73f98d7bdf3287671c35436a13787c1ffd5078cf8e", "iso_checksum_type": "sha256", - "iso_name": "rhel-server-6.8-x86_64-dvd.iso", - "ks_path": "centos-6.8/ks.cfg", + "iso_name": "rhel-server-6.9-x86_64-dvd.iso", + "ks_path": "centos-6.9/ks.cfg", "memory": "512", "metadata": "floppy/dummy_metadata.json", "mirror": "http://YOU-MUST-PROVIDE-YOUR-OWN-ISO.sorry", "mirror_directory": "rhel", - "name": "rhel-6.8", + "name": "rhel-6.9", "no_proxy": "{{env `no_proxy`}}", - "template": "rhel-6.8-x86_64", + "template": "rhel-6.9-x86_64", "version": "2.2.TIMESTAMP" } } - From 03dddacdc10c00187e8188bb0f8611012f1a09b6 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith@chef.io> Date: Mon, 26 Jun 2017 22:23:53 -0700 Subject: [PATCH 0629/1622] Remove SLES 12 / 12 SP1 12.0 went EOL at the end of 2016 and SP1 went EOL last month. Signed-off-by: Tim Smith <tsmith@chef.io> --- http/sles-12/sles-12-sp1-x86_64-autoinst.xml | 284 ------------------- http/sles-12/sles-12-x86_64-autoinst.xml | 284 ------------------- sles-12-sp1-x86_64.json | 202 ------------- sles-12-x86_64.json | 202 ------------- 4 files changed, 972 deletions(-) delete mode 100644 http/sles-12/sles-12-sp1-x86_64-autoinst.xml delete mode 100644 http/sles-12/sles-12-x86_64-autoinst.xml delete mode 100644 sles-12-sp1-x86_64.json delete mode 100644 sles-12-x86_64.json diff --git a/http/sles-12/sles-12-sp1-x86_64-autoinst.xml b/http/sles-12/sles-12-sp1-x86_64-autoinst.xml deleted file mode 100644 index fded59a95..000000000 --- a/http/sles-12/sles-12-sp1-x86_64-autoinst.xml +++ /dev/null @@ -1,284 +0,0 @@ -<?xml version="1.0"?> -<!DOCTYPE profile> -<profile xmlns="http://www.suse.com/1.0/yast2ns" xmlns:config="http://www.suse.com/1.0/configns"> - <add-on> - <add_on_products config:type="list"/> - </add-on> - <bootloader> - <global> - <activate>true</activate> - <append>splash=silent quiet showopts</append> - <append_failsafe>showopts apm=off noresume edd=off powersaved=off nohz=off highres=off processor.max_cstate=1 nomodeset x11failsafe</append_failsafe> - <boot_boot>false</boot_boot> - <boot_extended>false</boot_extended> - <boot_mbr>false</boot_mbr> - <boot_root>true</boot_root> - <default>0</default> - <distributor>SLES12</distributor> - <generic_mbr>true</generic_mbr> - <gfxmode>auto</gfxmode> - <os_prober>false</os_prober> - <timeout config:type="integer">8</timeout> - </global> - <initrd_modules config:type="list"> - <initrd_module> - <module>ahci</module> - </initrd_module> - <initrd_module> - <module>ata_piix</module> - </initrd_module> - <initrd_module> - <module>ata_generic</module> - </initrd_module> - <initrd_module> - <module>jbd</module> - </initrd_module> - <initrd_module> - <module>mbcache</module> - </initrd_module> - </initrd_modules> - <loader_type>grub2</loader_type> - <sections config:type="list"/> - </bootloader> - <deploy_image> - <image_installation config:type="boolean">false</image_installation> - </deploy_image> - <firewall> - <enable_firewall config:type="boolean">false</enable_firewall> - <start_firewall config:type="boolean">false</start_firewall> - </firewall> - <general> - <ask-list config:type="list"/> - <mode> - <confirm config:type="boolean">false</confirm> - </mode> - <mouse> - <id>none</id> - </mouse> - <proposals config:type="list"/> - <signature-handling> - <accept_file_without_checksum config:type="boolean">true</accept_file_without_checksum> - <accept_non_trusted_gpg_key config:type="boolean">true</accept_non_trusted_gpg_key> - <accept_unknown_gpg_key config:type="boolean">true</accept_unknown_gpg_key> - <accept_unsigned_file config:type="boolean">true</accept_unsigned_file> - <accept_verification_failed config:type="boolean">false</accept_verification_failed> - <import_gpg_key config:type="boolean">true</import_gpg_key> - </signature-handling> - <storage/> - </general> - <login_settings/> - <networking> - <dhcp_options> - <dhclient_client_id/> - <dhclient_hostname_option>AUTO</dhclient_hostname_option> - </dhcp_options> - <dns> - <dhcp_hostname config:type="boolean">false</dhcp_hostname> - <domain>vagrantup.com</domain> - <hostname>vagrant-sles-12-x64</hostname> - <resolv_conf_policy>auto</resolv_conf_policy> - <searchlist config:type="list"> - <search>vagrantup.com</search> - </searchlist> - <write_hostname config:type="boolean">true</write_hostname> - </dns> - <interfaces config:type="list"> - <interface> - <bootproto>dhcp</bootproto> - <device>eth0</device> - <dhclient_set_default_route>yes</dhclient_set_default_route> - <startmode>auto</startmode> - <usercontrol>no</usercontrol> - </interface> - </interfaces> - <keep_install_network config:type="boolean">true</keep_install_network> - <managed config:type="boolean">false</managed> - <routing> - <ipv4_forward config:type="boolean">false</ipv4_forward> - <ipv6_forward config:type="boolean">false</ipv6_forward> - </routing> - </networking> - <partitioning config:type="list"> - <drive> - <!-- - definition of device not needed (starting with SLES 11 SP2 - YaST will pickup the first harddisk. - This is useful if someone wants to deploy using VirtualBox and/or KVM/virtio - --> - <!-- <device>/dev/sda</device> --> - <!-- This section may be removed entirely if we want to simply reuse YaST defaults --> - <initialize config:type="boolean">true</initialize> - <partitions config:type="list"> - <partition> - <create config:type="boolean">true</create> - <crypt_fs config:type="boolean">false</crypt_fs> - <filesystem config:type="symbol">swap</filesystem> - <format config:type="boolean">true</format> - <fstopt>defaults</fstopt> - <loop_fs config:type="boolean">false</loop_fs> - <mount>swap</mount> - <mountby config:type="symbol">device</mountby> - <partition_id config:type="integer">130</partition_id> - <partition_nr config:type="integer">1</partition_nr> - <raid_options/> - <resize config:type="boolean">false</resize> - <size>1561492992</size> - </partition> - <partition> - <create config:type="boolean">true</create> - <crypt_fs config:type="boolean">false</crypt_fs> - <filesystem config:type="symbol">btrfs</filesystem> - <format config:type="boolean">true</format> - <loop_fs config:type="boolean">false</loop_fs> - <mount>/</mount> - <mountby config:type="symbol">device</mountby> - <partition_id config:type="integer">131</partition_id> - <partition_nr config:type="integer">2</partition_nr> - <raid_options/> - <resize config:type="boolean">false</resize> - <size>19895844352</size> - <subvolumes config:type="list"> - <listentry>boot/grub2/i386-pc</listentry> - <listentry>boot/grub2/x86_64-efi</listentry> - <listentry>home</listentry> - <listentry>opt</listentry> - <listentry>srv</listentry> - <listentry>tmp</listentry> - <listentry>usr/local</listentry> - <listentry>var/crash</listentry> - <listentry>var/lib/mailman</listentry> - <listentry>var/lib/named</listentry> - <listentry>var/lib/pgsql</listentry> - <listentry>var/log</listentry> - <listentry>var/opt</listentry> - <listentry>var/spool</listentry> - <listentry>var/tmp</listentry> - </subvolumes> - </partition> - </partitions> - <pesize/> - <type config:type="symbol">CT_DISK</type> - <use>all</use> - </drive> - </partitioning> - <report> - <errors> - <log config:type="boolean">true</log> - <show config:type="boolean">true</show> - <timeout config:type="integer">0</timeout> - </errors> - <messages> - <log config:type="boolean">true</log> - <show config:type="boolean">true</show> - <timeout config:type="integer">0</timeout> - </messages> - <warnings> - <log config:type="boolean">true</log> - <show config:type="boolean">true</show> - <timeout config:type="integer">0</timeout> - </warnings> - <yesno_messages> - <log config:type="boolean">true</log> - <show config:type="boolean">true</show> - <timeout config:type="integer">0</timeout> - </yesno_messages> - </report> - <services-manager> - <default_target>graphical</default_target> - <services> - <disable config:type="list"/> - <enable config:type="list"> - <service>sshd</service> - </enable> - </services> - </services-manager> - <software> - <packages config:type="list"> - <package>glibc</package> - <package>openssh</package> - <package>grub2</package> - <package>syslinux</package> - <package>snapper</package> - <package>sles-release</package> - <package>SuSEfirewall2</package> - <package>kexec-tools</package> - <package>perl-Bootloader-YAML</package> - <package>kernel-default-devel</package> - <package>sudo</package> - <package>gcc</package> - <package>wget</package> - <package>perl</package> - <package>make</package> - </packages> - <patterns config:type="list"> - <pattern>Minimal</pattern> - <pattern>apparmor</pattern> - </patterns> - <remove-packages config:type="list"> - <package>adaptec-firmware</package> - <package>atmel-firmware</package> - <package>augeas-lenses</package> - <package>bash-completion</package> - <package>bash-doc</package> - <package>cifs-utils</package> - <package>cups-libs</package> - <package>ipw-firmware</package> - <package>mpt-firmware</package> - <package>postfix</package> - <package>samba-libs</package> - <package>ucode-intel</package> - </remove-packages> - </software> - <timezone> - <hwclock>UTC</hwclock> - <timezone>UTC</timezone> - </timezone> - <user_defaults> - <expire/> - <group>100</group> - <groups>video,dialout</groups> - <home>/home</home> - <inactive>-1</inactive> - <shell>/bin/bash</shell> - <skel>/etc/skel</skel> - <umask>022</umask> - </user_defaults> - <users config:type="list"> - <user> - <encrypted config:type="boolean">true</encrypted> - <fullname>vagrant</fullname> - <gid>100</gid> - <home>/home/vagrant</home> - <password_settings> - <expire/> - <flag/> - <inact/> - <max>99999</max> - <min>0</min> - <warn>7</warn> - </password_settings> - <shell>/bin/bash</shell> - <uid>1000</uid> - <user_password>$2y$05$NA1Li9ZKJOLRW5mMTXm6/e5r8dltWS5RpDZpvHrI82aLE00V51tdi</user_password> - <username>vagrant</username> - </user> - <user> - <encrypted config:type="boolean">true</encrypted> - <fullname>root</fullname> - <gid>0</gid> - <home>/root</home> - <password_settings> - <expire/> - <flag/> - <inact/> - <max/> - <min/> - <warn/> - </password_settings> - <shell>/bin/bash</shell> - <uid>0</uid> - <user_password>$6$UgKtUD0AUMIA$VWLyc2Uvl0Lk6xxfTuoRb0/jrhZ9IJG/Gtx/DkZUEWZm.JYO1Q1fvPo6gDxQAHp38kQ1DG1vNGRgu2T/z/vih.</user_password> - <username>root</username> - </user> - </users> -</profile> diff --git a/http/sles-12/sles-12-x86_64-autoinst.xml b/http/sles-12/sles-12-x86_64-autoinst.xml deleted file mode 100644 index b9649a7d4..000000000 --- a/http/sles-12/sles-12-x86_64-autoinst.xml +++ /dev/null @@ -1,284 +0,0 @@ -<?xml version="1.0"?> -<!DOCTYPE profile> -<profile xmlns="http://www.suse.com/1.0/yast2ns" xmlns:config="http://www.suse.com/1.0/configns"> - <add-on> - <add_on_products config:type="list"/> - </add-on> - <bootloader> - <global> - <activate>true</activate> - <append>splash=silent quiet showopts</append> - <append_failsafe>showopts apm=off noresume edd=off powersaved=off nohz=off highres=off processor.max_cstate=1 nomodeset x11failsafe</append_failsafe> - <boot_boot>false</boot_boot> - <boot_extended>false</boot_extended> - <boot_mbr>false</boot_mbr> - <boot_root>true</boot_root> - <default>0</default> - <distributor>SLES12</distributor> - <generic_mbr>true</generic_mbr> - <gfxmode>auto</gfxmode> - <os_prober>false</os_prober> - <timeout config:type="integer">8</timeout> - </global> - <initrd_modules config:type="list"> - <initrd_module> - <module>ahci</module> - </initrd_module> - <initrd_module> - <module>ata_piix</module> - </initrd_module> - <initrd_module> - <module>ata_generic</module> - </initrd_module> - <initrd_module> - <module>jbd</module> - </initrd_module> - <initrd_module> - <module>mbcache</module> - </initrd_module> - </initrd_modules> - <loader_type>grub2</loader_type> - <sections config:type="list"/> - </bootloader> - <deploy_image> - <image_installation config:type="boolean">false</image_installation> - </deploy_image> - <firewall> - <enable_firewall config:type="boolean">false</enable_firewall> - <start_firewall config:type="boolean">false</start_firewall> - </firewall> - <general> - <ask-list config:type="list"/> - <mode> - <confirm config:type="boolean">false</confirm> - </mode> - <mouse> - <id>none</id> - </mouse> - <proposals config:type="list"/> - <signature-handling> - <accept_file_without_checksum config:type="boolean">true</accept_file_without_checksum> - <accept_non_trusted_gpg_key config:type="boolean">true</accept_non_trusted_gpg_key> - <accept_unknown_gpg_key config:type="boolean">true</accept_unknown_gpg_key> - <accept_unsigned_file config:type="boolean">true</accept_unsigned_file> - <accept_verification_failed config:type="boolean">false</accept_verification_failed> - <import_gpg_key config:type="boolean">true</import_gpg_key> - </signature-handling> - <storage/> - </general> - <login_settings/> - <networking> - <dhcp_options> - <dhclient_client_id/> - <dhclient_hostname_option>AUTO</dhclient_hostname_option> - </dhcp_options> - <dns> - <dhcp_hostname config:type="boolean">false</dhcp_hostname> - <domain>vagrantup.com</domain> - <hostname>vagrant-sles-12-x64</hostname> - <resolv_conf_policy>auto</resolv_conf_policy> - <searchlist config:type="list"> - <search>vagrantup.com</search> - </searchlist> - <write_hostname config:type="boolean">true</write_hostname> - </dns> - <interfaces config:type="list"> - <interface> - <bootproto>dhcp</bootproto> - <device>eth0</device> - <dhclient_set_default_route>yes</dhclient_set_default_route> - <startmode>auto</startmode> - <usercontrol>no</usercontrol> - </interface> - </interfaces> - <keep_install_network config:type="boolean">true</keep_install_network> - <managed config:type="boolean">false</managed> - <routing> - <ipv4_forward config:type="boolean">false</ipv4_forward> - <ipv6_forward config:type="boolean">false</ipv6_forward> - </routing> - </networking> - <partitioning config:type="list"> - <drive> - <!-- - definition of device not needed (starting with SLES 11 SP2 - YaST will pickup the first harddisk. - This is useful if someone wants to deploy using VirtualBox and/or KVM/virtio - --> - <!-- <device>/dev/sda</device> --> - <!-- This section may be removed entirely if we want to simply reuse YaST defaults --> - <initialize config:type="boolean">true</initialize> - <partitions config:type="list"> - <partition> - <create config:type="boolean">true</create> - <crypt_fs config:type="boolean">false</crypt_fs> - <filesystem config:type="symbol">swap</filesystem> - <format config:type="boolean">true</format> - <fstopt>defaults</fstopt> - <loop_fs config:type="boolean">false</loop_fs> - <mount>swap</mount> - <mountby config:type="symbol">device</mountby> - <partition_id config:type="integer">130</partition_id> - <partition_nr config:type="integer">1</partition_nr> - <raid_options/> - <resize config:type="boolean">false</resize> - <size>1561492992</size> - </partition> - <partition> - <create config:type="boolean">true</create> - <crypt_fs config:type="boolean">false</crypt_fs> - <filesystem config:type="symbol">btrfs</filesystem> - <format config:type="boolean">true</format> - <loop_fs config:type="boolean">false</loop_fs> - <mount>/</mount> - <mountby config:type="symbol">device</mountby> - <partition_id config:type="integer">131</partition_id> - <partition_nr config:type="integer">2</partition_nr> - <raid_options/> - <resize config:type="boolean">false</resize> - <size>19895844352</size> - <subvolumes config:type="list"> - <listentry>boot/grub2/i386-pc</listentry> - <listentry>boot/grub2/x86_64-efi</listentry> - <listentry>home</listentry> - <listentry>opt</listentry> - <listentry>srv</listentry> - <listentry>tmp</listentry> - <listentry>usr/local</listentry> - <listentry>var/crash</listentry> - <listentry>var/lib/mailman</listentry> - <listentry>var/lib/named</listentry> - <listentry>var/lib/pgsql</listentry> - <listentry>var/log</listentry> - <listentry>var/opt</listentry> - <listentry>var/spool</listentry> - <listentry>var/tmp</listentry> - </subvolumes> - </partition> - </partitions> - <pesize/> - <type config:type="symbol">CT_DISK</type> - <use>all</use> - </drive> - </partitioning> - <report> - <errors> - <log config:type="boolean">true</log> - <show config:type="boolean">true</show> - <timeout config:type="integer">0</timeout> - </errors> - <messages> - <log config:type="boolean">true</log> - <show config:type="boolean">true</show> - <timeout config:type="integer">0</timeout> - </messages> - <warnings> - <log config:type="boolean">true</log> - <show config:type="boolean">true</show> - <timeout config:type="integer">0</timeout> - </warnings> - <yesno_messages> - <log config:type="boolean">true</log> - <show config:type="boolean">true</show> - <timeout config:type="integer">0</timeout> - </yesno_messages> - </report> - <services-manager> - <default_target>graphical</default_target> - <services> - <disable config:type="list"/> - <enable config:type="list"> - <service>sshd</service> - </enable> - </services> - </services-manager> - <software> - <packages config:type="list"> - <package>glibc</package> - <package>openssh</package> - <package>grub2</package> - <package>syslinux</package> - <package>snapper</package> - <package>sles-release</package> - <package>SuSEfirewall2</package> - <package>kexec-tools</package> - <package>perl-Bootloader-YAML</package> - <package>kernel-default-devel</package> - <package>sudo</package> - <package>gcc</package> - <package>wget</package> - <package>perl</package> - <package>make</package> - </packages> - <patterns config:type="list"> - <pattern>Minimal</pattern> - <pattern>apparmor</pattern> - </patterns> - <remove-packages config:type="list"> - <package>adaptec-firmware</package> - <package>atmel-firmware</package> - <package>augeas-lenses</package> - <package>bash-completion</package> - <package>bash-doc</package> - <package>cifs-utils</package> - <package>cups-libs</package> - <package>ipw-firmware</package> - <package>mpt-firmware</package> - <package>postfix</package> - <package>samba-libs</package> - <package>ucode-intel</package> - </remove-packages> - </software> - <timezone> - <hwclock>UTC</hwclock> - <timezone>UTC</timezone> - </timezone> - <user_defaults> - <expire/> - <group>100</group> - <groups>video,dialout</groups> - <home>/home</home> - <inactive>-1</inactive> - <shell>/bin/bash</shell> - <skel>/etc/skel</skel> - <umask>022</umask> - </user_defaults> - <users config:type="list"> - <user> - <encrypted config:type="boolean">true</encrypted> - <fullname>vagrant</fullname> - <gid>100</gid> - <home>/home/vagrant</home> - <password_settings> - <expire/> - <flag/> - <inact/> - <max>99999</max> - <min>0</min> - <warn>7</warn> - </password_settings> - <shell>/bin/bash</shell> - <uid>1000</uid> - <user_password>$2y$05$NA1Li9ZKJOLRW5mMTXm6/e5r8dltWS5RpDZpvHrI82aLE00V51tdi</user_password> - <username>vagrant</username> - </user> - <user> - <encrypted config:type="boolean">true</encrypted> - <fullname>root</fullname> - <gid>0</gid> - <home>/root</home> - <password_settings> - <expire/> - <flag/> - <inact/> - <max/> - <min/> - <warn/> - </password_settings> - <shell>/bin/bash</shell> - <uid>0</uid> - <user_password>$6$UgKtUD0AUMIA$VWLyc2Uvl0Lk6xxfTuoRb0/jrhZ9IJG/Gtx/DkZUEWZm.JYO1Q1fvPo6gDxQAHp38kQ1DG1vNGRgu2T/z/vih.</user_password> - <username>root</username> - </user> - </users> -</profile> diff --git a/sles-12-sp1-x86_64.json b/sles-12-sp1-x86_64.json deleted file mode 100644 index 964f5e9ba..000000000 --- a/sles-12-sp1-x86_64.json +++ /dev/null @@ -1,202 +0,0 @@ -{ - "builders": [ - { - "boot_command": [ - "<esc><enter><wait>", - "linux netdevice=eth0 netsetup=dhcp install=cd:/<wait>", - " lang=en_US.UTF-8 autoyast=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `autoinst_cfg`}}<wait>", - " textmode=1<wait>", - "<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", - "guest_os_type": "OpenSUSE_64", - "hard_drive_interface": "sata", - "headless": "{{ user `headless` }}", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-virtualbox", - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "virtualbox-iso", - "vboxmanage": [ - [ - "modifyvm", - "{{.Name}}", - "--memory", - "{{ user `memory` }}" - ], - [ - "modifyvm", - "{{.Name}}", - "--cpus", - "{{ user `cpus` }}" - ] - ], - "virtualbox_version_file": ".vbox_version", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<esc><enter><wait>", - "linux netdevice=eth0 netsetup=dhcp install=cd:/<wait>", - " lang=en_US.UTF-8 autoyast=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `autoinst_cfg`}}<wait>", - " textmode=1<wait>", - "<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "sles11-64", - "headless": "{{ user `headless` }}", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-vmware", - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "tools_upload_flavor": "linux", - "type": "vmware-iso", - "vm_name": "{{ user `template` }}", - "vmx_data": { - "cpuid.coresPerSocket": "1", - "memsize": "{{ user `memory` }}", - "numvcpus": "{{ user `cpus` }}" - } - }, - { - "boot_command": [ - "<esc><enter><wait>", - "linux netdevice=eth0 netsetup=dhcp install=cd:/<wait>", - " lang=en_US.UTF-8 autoyast=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `autoinst_cfg`}}<wait>", - " textmode=1<wait>", - "<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "suse", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-parallels", - "parallels_tools_flavor": "lin", - "prlctl": [ - [ - "set", - "{{.Name}}", - "--memsize", - "{{ user `memory` }}" - ], - [ - "set", - "{{.Name}}", - "--cpus", - "{{ user `cpus` }}" - ] - ], - "prlctl_version_file": ".prlctl_version", - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "parallels-iso", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<esc><enter><wait>", - "linux netdevice=eth0 netsetup=dhcp install=cd:/<wait>", - " lang=en_US.UTF-8 autoyast=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `autoinst_cfg`}}<wait>", - " textmode=1<wait>", - "<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "headless": "{{ user `headless` }}", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-qemu", - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "qemu", - "vm_name": "{{ user `template` }}" - } - ], - "post-processors": [ - { - "output": "builds/{{user `box_basename`}}.{{.Provider}}.box", - "type": "vagrant" - } - ], - "provisioners": [ - { - "destination": "/tmp/bento-metadata.json", - "source": "{{user `metadata`}}", - "type": "file" - }, - { - "environment_vars": [ - "HOME_DIR=/home/vagrant", - "http_proxy={{user `http_proxy`}}", - "https_proxy={{user `https_proxy`}}", - "no_proxy={{user `no_proxy`}}" - ], - "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh '{{.Path}}'", - "scripts": [ - "scripts/common/metadata.sh", - "scripts/common/sshd.sh", - "scripts/common/vagrant.sh", - "scripts/sles/unsupported-modules.sh", - "scripts/common/virtualbox.sh", - "scripts/common/vmware.sh", - "scripts/common/parallels.sh", - "scripts/sles/sudoers.sh", - "scripts/sles/zypper-locks.sh", - "scripts/sles/remove-dvd-source.sh", - "scripts/sles/cleanup.sh", - "scripts/common/minimize.sh" - ], - "type": "shell" - } - ], - "variables": { - "_DOWNLOAD_SITE": "https://www.suse.com/products/server/download", - "_README": "You must download the automated installer iso from the following page, and then place it in the packer_cache dir", - "arch": "64", - "autoinst_cfg": "sles-12/sles-12-sp1-x86_64-autoinst.xml", - "box_basename": "sles-12-sp1", - "build_timestamp": "{{isotime \"20060102150405\"}}", - "cpus": "1", - "disk_size": "20480", - "git_revision": "__unknown_git_revision__", - "headless": "", - "http_proxy": "{{env `http_proxy`}}", - "https_proxy": "{{env `https_proxy`}}", - "iso_checksum": "e1c0ba860f593d60c2c138a0cd35e2a3c65304b4c988b4c9f6051bff89871f62", - "iso_checksum_type": "sha256", - "iso_name": "SLE-12-SP1-Server-DVD-x86_64-GM-DVD1.iso", - "memory": "1024", - "metadata": "floppy/dummy_metadata.json", - "mirror": "./packer_cache", - "name": "sles-12-sp1", - "template": "sles-12-sp1-x86_64", - "version": "2.2.TIMESTAMP" - } -} - diff --git a/sles-12-x86_64.json b/sles-12-x86_64.json deleted file mode 100644 index b75556dac..000000000 --- a/sles-12-x86_64.json +++ /dev/null @@ -1,202 +0,0 @@ -{ - "builders": [ - { - "boot_command": [ - "<esc><enter><wait>", - "linux netdevice=eth0 netsetup=dhcp install=cd:/<wait>", - " lang=en_US.UTF-8 autoyast=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `autoinst_cfg`}}<wait>", - " textmode=1<wait>", - "<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", - "guest_os_type": "OpenSUSE_64", - "hard_drive_interface": "sata", - "headless": "{{ user `headless` }}", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-virtualbox", - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "virtualbox-iso", - "vboxmanage": [ - [ - "modifyvm", - "{{.Name}}", - "--memory", - "{{ user `memory` }}" - ], - [ - "modifyvm", - "{{.Name}}", - "--cpus", - "{{ user `cpus` }}" - ] - ], - "virtualbox_version_file": ".vbox_version", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<esc><enter><wait>", - "linux netdevice=eth0 netsetup=dhcp install=cd:/<wait>", - " lang=en_US.UTF-8 autoyast=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `autoinst_cfg`}}<wait>", - " textmode=1<wait>", - "<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "sles11-64", - "headless": "{{ user `headless` }}", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-vmware", - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "tools_upload_flavor": "linux", - "type": "vmware-iso", - "vm_name": "{{ user `template` }}", - "vmx_data": { - "cpuid.coresPerSocket": "1", - "memsize": "{{ user `memory` }}", - "numvcpus": "{{ user `cpus` }}" - } - }, - { - "boot_command": [ - "<esc><enter><wait>", - "linux netdevice=eth0 netsetup=dhcp install=cd:/<wait>", - " lang=en_US.UTF-8 autoyast=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `autoinst_cfg`}}<wait>", - " textmode=1<wait>", - "<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "suse", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-parallels", - "parallels_tools_flavor": "lin", - "prlctl": [ - [ - "set", - "{{.Name}}", - "--memsize", - "{{ user `memory` }}" - ], - [ - "set", - "{{.Name}}", - "--cpus", - "{{ user `cpus` }}" - ] - ], - "prlctl_version_file": ".prlctl_version", - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "parallels-iso", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<esc><enter><wait>", - "linux netdevice=eth0 netsetup=dhcp install=cd:/<wait>", - " lang=en_US.UTF-8 autoyast=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `autoinst_cfg`}}<wait>", - " textmode=1<wait>", - "<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "headless": "{{ user `headless` }}", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-qemu", - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "qemu", - "vm_name": "{{ user `template` }}" - } - ], - "post-processors": [ - { - "output": "builds/{{user `box_basename`}}.{{.Provider}}.box", - "type": "vagrant" - } - ], - "provisioners": [ - { - "destination": "/tmp/bento-metadata.json", - "source": "{{user `metadata`}}", - "type": "file" - }, - { - "environment_vars": [ - "HOME_DIR=/home/vagrant", - "http_proxy={{user `http_proxy`}}", - "https_proxy={{user `https_proxy`}}", - "no_proxy={{user `no_proxy`}}" - ], - "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh '{{.Path}}'", - "scripts": [ - "scripts/common/metadata.sh", - "scripts/common/sshd.sh", - "scripts/common/vagrant.sh", - "scripts/sles/unsupported-modules.sh", - "scripts/common/virtualbox.sh", - "scripts/common/vmware.sh", - "scripts/common/parallels.sh", - "scripts/sles/sudoers.sh", - "scripts/sles/zypper-locks.sh", - "scripts/sles/remove-dvd-source.sh", - "scripts/sles/cleanup.sh", - "scripts/common/minimize.sh" - ], - "type": "shell" - } - ], - "variables": { - "_DOWNLOAD_SITE": "https://www.suse.com/products/server/download", - "_README": "You must download the automated installer iso from the following page, and then place it in the packer_cache dir", - "arch": "64", - "autoinst_cfg": "sles-12/sles-12-x86_64-autoinst.xml", - "box_basename": "sles-12", - "build_timestamp": "{{isotime \"20060102150405\"}}", - "cpus": "1", - "disk_size": "20480", - "git_revision": "__unknown_git_revision__", - "headless": "", - "http_proxy": "{{env `http_proxy`}}", - "https_proxy": "{{env `https_proxy`}}", - "iso_checksum": "58086fca0441b1d44c7a51c5ee64e1bd4365466fcee48ec92c4f39d07739aeed", - "iso_checksum_type": "sha256", - "iso_name": "SLE-12-Server-DVD-x86_64-GM-DVD1.iso", - "memory": "512", - "metadata": "floppy/dummy_metadata.json", - "mirror": "./packer_cache", - "name": "sles-12", - "template": "sles-12-x86_64", - "version": "2.2.TIMESTAMP" - } -} - From 2ad60246a6052cd6487fde8df7b1271a2900ed57 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith@chef.io> Date: Mon, 26 Jun 2017 22:24:57 -0700 Subject: [PATCH 0630/1622] Remove the omnios scripts We nuked the configs already Signed-off-by: Tim Smith <tsmith@chef.io> --- scripts/omnios/postinstall.sh | 54 ----------------------------------- scripts/omnios/vmtools.sh | 30 ------------------- 2 files changed, 84 deletions(-) delete mode 100644 scripts/omnios/postinstall.sh delete mode 100644 scripts/omnios/vmtools.sh diff --git a/scripts/omnios/postinstall.sh b/scripts/omnios/postinstall.sh deleted file mode 100644 index 07fe0c488..000000000 --- a/scripts/omnios/postinstall.sh +++ /dev/null @@ -1,54 +0,0 @@ -#!/bin/sh - -echo "Creating vagrant user" -useradd -m -k /etc/skel/ -b /export/home -s /usr/bin/bash vagrant -passwd -N vagrant - -echo "Adding Vagrant user to sudoers" -echo "vagrant ALL=(ALL) NOPASSWD: ALL" > /etc/sudoers -echo 'Defaults env_keep += "SSH_AUTH_SOCK"' >> /etc/sudoers -chmod 0440 /etc/sudoers - -# add paths and other options to vagrant user's shell -echo "Setting Vagrant user's and root's environment" -echo "export PATH=\$PATH:/opt/omni/bin" >> /export/home/vagrant/.profile -echo "export PATH=\$PATH:/opt/omni/bin" >> /root/.profile - -# move /usr/gnu/bin to end of PATH for root and vagrant, since its presence at -# the front breaks vagrant 1.1+ -echo "Moving GNU path in Vagrant user's and root's environment" -sed -i -e 's/PATH=\/usr\/gnu\/bin:\(.*\)/PATH=\1:\/usr\/gnu\/bin/' \ - /export/home/vagrant/.profile -sed -i -e 's/PATH=\/usr\/gnu\/bin:\(.*\)/PATH=\1:\/usr\/gnu\/bin/' \ - /root/.profile - -# setup the vagrant key -# you can replace this key-pair with your own generated ssh key-pair -echo "Setting the vagrant ssh pub key" -mkdir /export/home/vagrant/.ssh -chmod 700 /export/home/vagrant/.ssh -chown vagrant:root /export/home/vagrant/.ssh -touch /export/home/vagrant/.ssh/authorized_keys -curl -sL http://github.com/mitchellh/vagrant/raw/master/keys/vagrant.pub > \ - /export/home/vagrant/.ssh/authorized_keys -chmod 600 /export/home/vagrant/.ssh/authorized_keys -chown vagrant:root /export/home/vagrant/.ssh/authorized_keys - -# formally add omniti-ms publisher -echo "Adding omniti-ms publisher" -pkg set-publisher -g http://pkg.omniti.com/omniti-ms/ ms.omniti.com - -# remove root login from sshd -echo "Removing root login over SSH" -sed -i -e "s/PermitRootLogin yes/PermitRootLogin no/" /etc/ssh/sshd_config -svcadm restart ssh - -# update grub menu to lower timeout and remove unnecessary second entry -echo "Updating Grub boot menu" -sed -i -e 's/^timeout.*$/timeout 5/' -e "/^title omniosvar/,`wc -l /rpool/boot/grub/menu.lst | awk '{ print $1 }'` d" /rpool/boot/grub/menu.lst - -# Reset resolv.conf -echo "Resetting resolv.conf" -echo "nameserver 8.8.8.8" > /etc/resolv.conf - -echo "Post-install done" diff --git a/scripts/omnios/vmtools.sh b/scripts/omnios/vmtools.sh deleted file mode 100644 index 7fa684c32..000000000 --- a/scripts/omnios/vmtools.sh +++ /dev/null @@ -1,30 +0,0 @@ -#!/bin/sh - -if [ $PACKER_BUILDER_TYPE == 'virtualbox' ]; then - echo "Installing VirtualBox Guest Additions" - echo "mail=\ninstance=overwrite\npartial=quit" > /tmp/noask.admin - echo "runlevel=nocheck\nidepend=quit\nrdepend=quit" >> /tmp/noask.admin - echo "space=quit\nsetuid=nocheck\nconflict=nocheck" >> /tmp/noask.admin - echo "action=nocheck\nbasedir=default" >> /tmp/noask.admin - mkdir /mnt/vbga - VBGADEV=`lofiadm -a VBoxGuestAdditions.iso` - mount -o ro -F hsfs $VBGADEV /mnt/vbga - pkgadd -a /tmp/noask.admin -G -d /mnt/vbga/VBoxSolarisAdditions.pkg all - umount /mnt/vbga - lofiadm -d $VBGADEV - rm -f VBoxGuestAdditions.iso -fi - -if [ $PACKER_BUILDER_TYPE == 'vmware' ]; then - mkdir /mnt/vmtools - VMTOOLSDEV=`lofiadm -a solaris.iso` - mount -o ro -F hsfs $VMTOOLSDEV /mnt/vmtools - mkdir /tmp/vmfusion-archive - tar zxvf /mnt/vmtools/vmware-solaris-tools.tar.gz -C /tmp/vmfusion-archive - /tmp/vmfusion-archive/vmware-tools-distrib/vmware-install.pl --force-install - umount /mnt/vmtools - lofiadm -d $VMTOOLSDEV - rmdir /mnt/vmtools - rm -rf /tmp/vmfusion-archive - rm -f solaris.iso -fi From 4a0ccbe400a8770121db0eb3904f2f7706daf702 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith@chef.io> Date: Mon, 26 Jun 2017 22:30:46 -0700 Subject: [PATCH 0631/1622] Move Ubuntu to a single preseed file The 14.04 and 16.04 files are identical Signed-off-by: Tim Smith <tsmith@chef.io> --- http/ubuntu-16.04/preseed.cfg | 31 ----------------------- http/{ubuntu-14.04 => ubuntu}/preseed.cfg | 0 ubuntu-14.04-amd64.json | 2 +- ubuntu-14.04-i386.json | 2 +- ubuntu-16.04-amd64.json | 2 +- ubuntu-16.04-i386.json | 2 +- ubuntu-17.04-amd64.json | 3 +-- ubuntu-17.04-i386.json | 3 +-- 8 files changed, 6 insertions(+), 39 deletions(-) delete mode 100644 http/ubuntu-16.04/preseed.cfg rename http/{ubuntu-14.04 => ubuntu}/preseed.cfg (100%) diff --git a/http/ubuntu-16.04/preseed.cfg b/http/ubuntu-16.04/preseed.cfg deleted file mode 100644 index 81b0abec5..000000000 --- a/http/ubuntu-16.04/preseed.cfg +++ /dev/null @@ -1,31 +0,0 @@ -choose-mirror-bin mirror/http/proxy string -d-i base-installer/kernel/override-image string linux-server -d-i clock-setup/utc boolean true -d-i clock-setup/utc-auto boolean true -d-i finish-install/reboot_in_progress note -d-i grub-installer/only_debian boolean true -d-i grub-installer/with_other_os boolean true -d-i partman-auto-lvm/guided_size string max -d-i partman-auto/choose_recipe select atomic -d-i partman-auto/method string lvm -d-i partman-lvm/confirm boolean true -d-i partman-lvm/confirm boolean true -d-i partman-lvm/confirm_nooverwrite boolean true -d-i partman-lvm/device_remove_lvm boolean true -d-i partman/choose_partition select finish -d-i partman/confirm boolean true -d-i partman/confirm_nooverwrite boolean true -d-i partman/confirm_write_new_label boolean true -d-i passwd/user-fullname string vagrant -d-i passwd/user-uid string 1000 -d-i passwd/user-password password vagrant -d-i passwd/user-password-again password vagrant -d-i passwd/username string vagrant -d-i pkgsel/include string openssh-server cryptsetup build-essential libssl-dev libreadline-dev zlib1g-dev linux-source dkms nfs-common linux-headers-$(uname -r) perl -d-i pkgsel/install-language-support boolean false -d-i pkgsel/update-policy select none -d-i pkgsel/upgrade select full-upgrade -d-i time/zone string UTC -d-i user-setup/allow-password-weak boolean true -d-i user-setup/encrypt-home boolean false -tasksel tasksel/first multiselect standard, server diff --git a/http/ubuntu-14.04/preseed.cfg b/http/ubuntu/preseed.cfg similarity index 100% rename from http/ubuntu-14.04/preseed.cfg rename to http/ubuntu/preseed.cfg diff --git a/ubuntu-14.04-amd64.json b/ubuntu-14.04-amd64.json index 9adc1554f..20f44c1d4 100644 --- a/ubuntu-14.04-amd64.json +++ b/ubuntu-14.04-amd64.json @@ -260,7 +260,7 @@ "mirror_directory": "14.04.1", "name": "ubuntu-14.04", "no_proxy": "{{env `no_proxy`}}", - "preseed_path": "ubuntu-14.04/preseed.cfg", + "preseed_path": "ubuntu/preseed.cfg", "template": "ubuntu-14.04-amd64", "version": "2.1.TIMESTAMP" } diff --git a/ubuntu-14.04-i386.json b/ubuntu-14.04-i386.json index b6f499003..76ada00b4 100644 --- a/ubuntu-14.04-i386.json +++ b/ubuntu-14.04-i386.json @@ -260,7 +260,7 @@ "mirror_directory": "14.04.1", "name": "ubuntu-14.04-i386", "no_proxy": "{{env `no_proxy`}}", - "preseed_path": "ubuntu-14.04/preseed.cfg", + "preseed_path": "ubuntu/preseed.cfg", "template": "ubuntu-14.04-i386", "version": "2.1.TIMESTAMP" } diff --git a/ubuntu-16.04-amd64.json b/ubuntu-16.04-amd64.json index 5b910a923..7a2446daa 100644 --- a/ubuntu-16.04-amd64.json +++ b/ubuntu-16.04-amd64.json @@ -269,7 +269,7 @@ "mirror_directory": "16.04.1", "name": "ubuntu-16.04", "no_proxy": "{{env `no_proxy`}}", - "preseed_path": "ubuntu-16.04/preseed.cfg", + "preseed_path": "ubuntu/preseed.cfg", "template": "ubuntu-16.04-amd64", "version": "2.1.TIMESTAMP" } diff --git a/ubuntu-16.04-i386.json b/ubuntu-16.04-i386.json index 707bfb20d..76579a3c7 100644 --- a/ubuntu-16.04-i386.json +++ b/ubuntu-16.04-i386.json @@ -269,7 +269,7 @@ "mirror_directory": "16.04.1", "name": "ubuntu-16.04-i386", "no_proxy": "{{env `no_proxy`}}", - "preseed_path": "ubuntu-16.04/preseed.cfg", + "preseed_path": "ubuntu/preseed.cfg", "template": "ubuntu-16.04-i386", "version": "2.1.TIMESTAMP" } diff --git a/ubuntu-17.04-amd64.json b/ubuntu-17.04-amd64.json index c57841202..9a6439dea 100644 --- a/ubuntu-17.04-amd64.json +++ b/ubuntu-17.04-amd64.json @@ -265,9 +265,8 @@ "mirror_directory": "17.04", "name": "ubuntu-17.04", "no_proxy": "{{env `no_proxy`}}", - "preseed_path": "ubuntu-16.04/preseed.cfg", + "preseed_path": "ubuntu/preseed.cfg", "template": "ubuntu-17.04-amd64", "version": "2.1.TIMESTAMP" } } - diff --git a/ubuntu-17.04-i386.json b/ubuntu-17.04-i386.json index 7403c1ee9..551d4048c 100644 --- a/ubuntu-17.04-i386.json +++ b/ubuntu-17.04-i386.json @@ -265,9 +265,8 @@ "mirror_directory": "17.04", "name": "ubuntu-17.04-i386", "no_proxy": "{{env `no_proxy`}}", - "preseed_path": "ubuntu-16.04/preseed.cfg", + "preseed_path": "ubuntu/preseed.cfg", "template": "ubuntu-17.04-i386", "version": "2.1.TIMESTAMP" } } - From bc21c97d351cbdc00f19d4731aded03f02ebf3d8 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith@chef.io> Date: Mon, 26 Jun 2017 22:38:01 -0700 Subject: [PATCH 0632/1622] Move the fedora kickstart file Signed-off-by: Tim Smith <tsmith@chef.io> --- fedora-24-i386.json | 2 +- fedora-24-x86_64.json | 2 +- fedora-25-i386.json | 2 +- fedora-25-x86_64.json | 2 +- http/{fedora-latest => fedora}/ks.cfg | 0 5 files changed, 4 insertions(+), 4 deletions(-) rename http/{fedora-latest => fedora}/ks.cfg (100%) diff --git a/fedora-24-i386.json b/fedora-24-i386.json index 2dc50354f..c9adb409d 100644 --- a/fedora-24-i386.json +++ b/fedora-24-i386.json @@ -165,7 +165,7 @@ "iso_checksum": "93c0bfe6e6bf23ca22cc1a85636ed15834336ee40a57bfe374f0044ad2d864b0", "iso_checksum_type": "sha256", "iso_name": "Fedora-Server-dvd-i386-24-1.2.iso", - "ks_path": "fedora-latest/ks.cfg", + "ks_path": "fedora/ks.cfg", "memory": "512", "metadata": "floppy/dummy_metadata.json", "mirror": "http://download.fedoraproject.org/pub/fedora/linux", diff --git a/fedora-24-x86_64.json b/fedora-24-x86_64.json index a7ce8c5bb..faaab5173 100644 --- a/fedora-24-x86_64.json +++ b/fedora-24-x86_64.json @@ -171,7 +171,7 @@ "iso_checksum": "1c0971d4c1a37bb06ec603ed3ded0af79e22069499443bb2d47e501c9ef42ae8", "iso_checksum_type": "sha256", "iso_name": "Fedora-Server-dvd-x86_64-24-1.2.iso", - "ks_path": "fedora-latest/ks.cfg", + "ks_path": "fedora/ks.cfg", "memory": "512", "metadata": "floppy/dummy_metadata.json", "mirror": "http://download.fedoraproject.org/pub/fedora/linux", diff --git a/fedora-25-i386.json b/fedora-25-i386.json index 305093150..6893796dd 100644 --- a/fedora-25-i386.json +++ b/fedora-25-i386.json @@ -165,7 +165,7 @@ "iso_checksum": "888ce3dd791854c8e0f62e9eac292a90cf9765a3f2de75b6ceb99eaa62d7f2cc", "iso_checksum_type": "sha256", "iso_name": "Fedora-Server-dvd-i386-25-1.3.iso", - "ks_path": "fedora-latest/ks.cfg", + "ks_path": "fedora/ks.cfg", "memory": "512", "metadata": "floppy/dummy_metadata.json", "mirror": "http://download.fedoraproject.org/pub/fedora/linux", diff --git a/fedora-25-x86_64.json b/fedora-25-x86_64.json index 88c728f0a..9bb59b569 100644 --- a/fedora-25-x86_64.json +++ b/fedora-25-x86_64.json @@ -171,7 +171,7 @@ "iso_checksum": "524bd959dae09ad6fc8e0476ea478700d89f82ec5795d0b1a7b873613f3f26ac", "iso_checksum_type": "sha256", "iso_name": "Fedora-Server-dvd-x86_64-25-1.3.iso", - "ks_path": "fedora-latest/ks.cfg", + "ks_path": "fedora/ks.cfg", "memory": "512", "metadata": "floppy/dummy_metadata.json", "mirror": "http://download.fedoraproject.org/pub/fedora/linux", diff --git a/http/fedora-latest/ks.cfg b/http/fedora/ks.cfg similarity index 100% rename from http/fedora-latest/ks.cfg rename to http/fedora/ks.cfg From 476d676910fbf16b66539b82662b1d293f78d546 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith@chef.io> Date: Mon, 26 Jun 2017 23:56:38 -0700 Subject: [PATCH 0633/1622] Setup Fedora with a single partition to shrink the image This seems to allow the compression to work better on the virtual disk. The vbox image goes from 703 megs to 317 megs. I also removed some hardware related package while I was in there and the DNF yum compatibility, which I think still gets pulled in due to other deps, but we don't need to explicitly set that. Signed-off-by: Tim Smith <tsmith@chef.io> --- http/fedora/ks.cfg | 8 ++++++-- scripts/fedora/cleanup.sh | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/http/fedora/ks.cfg b/http/fedora/ks.cfg index fceea35a8..41c8557e8 100644 --- a/http/fedora/ks.cfg +++ b/http/fedora/ks.cfg @@ -13,7 +13,7 @@ text skipx zerombr clearpart --all --initlabel -autopart +part / --fstype=ext4 --ondisk=sda --grow --label=root firstboot --disabled reboot user --name=vagrant --plaintext --password vagrant @@ -28,10 +28,14 @@ tar wget nfs-utils net-tools -dnf-yum -linux-firmware -plymouth -plymouth-core-libs +-fedora-release-notes +-mcelog +-smartmontools +-usbutils +-man-pages %end %post diff --git a/scripts/fedora/cleanup.sh b/scripts/fedora/cleanup.sh index 9e5af7e51..2fc55f970 100644 --- a/scripts/fedora/cleanup.sh +++ b/scripts/fedora/cleanup.sh @@ -4,7 +4,7 @@ dnf -y remove gcc cpp gc kernel-devel kernel-headers glibc-devel glibc-headers k dnf -y autoremove dnf -y clean all --enablerepo=\* -# Avoid 32 meg firmware package we don't need +# Avoid 150 meg firmware package we don't need echo "Removing extra packages" dnf -y remove linux-firmware From 44105e75aee69590bc3d0a32208d6ca1d68e1885 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith@chef.io> Date: Tue, 27 Jun 2017 09:03:41 -0700 Subject: [PATCH 0634/1622] Make sure we still setup swap even w/o a swap partition Make a swap file instead. Having this on the same root partition seems to allow the compression to still work nicely. Signed-off-by: Tim Smith <tsmith@chef.io> --- fedora-24-i386.json | 1 + fedora-24-x86_64.json | 1 + fedora-25-i386.json | 1 + fedora-25-x86_64.json | 1 + scripts/fedora/swap.sh | 7 +++++++ 5 files changed, 11 insertions(+) create mode 100644 scripts/fedora/swap.sh diff --git a/fedora-24-i386.json b/fedora-24-i386.json index c9adb409d..d8e584f3b 100644 --- a/fedora-24-i386.json +++ b/fedora-24-i386.json @@ -139,6 +139,7 @@ "execute_command": "echo 'vagrant' | {{.Vars}} sudo -E -S bash '{{.Path}}'", "scripts": [ "scripts/common/metadata.sh", + "scripts/fedora/swap.sh", "scripts/fedora/fix-slow-dns.sh", "scripts/fedora/build-tools.sh", "scripts/common/sshd.sh", diff --git a/fedora-24-x86_64.json b/fedora-24-x86_64.json index faaab5173..4e4a7b74c 100644 --- a/fedora-24-x86_64.json +++ b/fedora-24-x86_64.json @@ -145,6 +145,7 @@ "execute_command": "echo 'vagrant' | {{.Vars}} sudo -E -S bash '{{.Path}}'", "scripts": [ "scripts/common/metadata.sh", + "scripts/fedora/swap.sh", "scripts/fedora/fix-slow-dns.sh", "scripts/fedora/build-tools.sh", "scripts/common/sshd.sh", diff --git a/fedora-25-i386.json b/fedora-25-i386.json index 6893796dd..82f38216f 100644 --- a/fedora-25-i386.json +++ b/fedora-25-i386.json @@ -139,6 +139,7 @@ "execute_command": "echo 'vagrant' | {{.Vars}} sudo -E -S bash '{{.Path}}'", "scripts": [ "scripts/common/metadata.sh", + "scripts/fedora/swap.sh", "scripts/fedora/fix-slow-dns.sh", "scripts/fedora/build-tools.sh", "scripts/common/sshd.sh", diff --git a/fedora-25-x86_64.json b/fedora-25-x86_64.json index 9bb59b569..7474ff361 100644 --- a/fedora-25-x86_64.json +++ b/fedora-25-x86_64.json @@ -145,6 +145,7 @@ "execute_command": "echo 'vagrant' | {{.Vars}} sudo -E -S bash '{{.Path}}'", "scripts": [ "scripts/common/metadata.sh", + "scripts/fedora/swap.sh", "scripts/fedora/fix-slow-dns.sh", "scripts/fedora/build-tools.sh", "scripts/common/sshd.sh", diff --git a/scripts/fedora/swap.sh b/scripts/fedora/swap.sh new file mode 100644 index 000000000..965edf145 --- /dev/null +++ b/scripts/fedora/swap.sh @@ -0,0 +1,7 @@ +#!/bin/bash -eux + +# add 2GB swap file since we didn't setup a swap partition +dd if=/dev/zero of=/swapfile bs=1M count=2048 +mkswap /swapfile +swapon /swapfile +echo -e "/swapfile\tswap\tswap\tdefaults\t0\t0" >> /etc/fstab From 28a9c5b0045c00d984fa3d113f53f1bf6c4424b0 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith@chef.io> Date: Wed, 28 Jun 2017 23:52:32 -0700 Subject: [PATCH 0635/1622] Drop 100 megs from the Ubuntu images linux-firmware is the killer fix here, but we get maybe another meg from the others Signed-off-by: Tim Smith <tsmith@chef.io> --- scripts/ubuntu/cleanup.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/scripts/ubuntu/cleanup.sh b/scripts/ubuntu/cleanup.sh index 683a6502e..2ca262fa6 100644 --- a/scripts/ubuntu/cleanup.sh +++ b/scripts/ubuntu/cleanup.sh @@ -40,7 +40,10 @@ apt-get -y purge libx11-data xauth libxmuu1 libxcb1 libx11-6 libxext6; apt-get -y purge ppp pppconfig pppoeconf; # Delete oddities -apt-get -y purge popularity-contest installation-report command-not-found command-not-found-data friendly-recovery; +apt-get -y purge popularity-contest installation-report command-not-found command-not-found-data friendly-recovery bash-completion fonts-ubuntu-font-family-console laptop-detect; + +# Delete the massive firmware packages +apt-get -y purge linux-firmware apt-get -y autoremove; apt-get -y clean; From 91119fe16567232e5e0c9aaf14c604cd26efd0e4 Mon Sep 17 00:00:00 2001 From: Brian Knight <brianknight10@gmail.com> Date: Fri, 30 Jun 2017 08:39:20 -0400 Subject: [PATCH 0636/1622] Move vagrant user settings into sudoers.d Signed-off-by: Brian Knight <brianknight10@gmail.com> --- scripts/ubuntu/sudoers.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/scripts/ubuntu/sudoers.sh b/scripts/ubuntu/sudoers.sh index d51c3bf13..e56537fea 100644 --- a/scripts/ubuntu/sudoers.sh +++ b/scripts/ubuntu/sudoers.sh @@ -1,4 +1,7 @@ #!/bin/sh -eux sed -i -e '/Defaults\s\+env_reset/a Defaults\texempt_group=sudo' /etc/sudoers; -sed -i -e 's/%sudo\s*ALL=(ALL:ALL) ALL/%sudo\tALL=(ALL) NOPASSWD:ALL/g' /etc/sudoers; + +# Set up password-less sudo for the vagrant user +echo 'vagrant ALL=(ALL) NOPASSWD:ALL' >/etc/sudoers.d/99_vagrant; +chmod 440 /etc/sudoers.d/99_vagrant; From 8d4c46e26adc2f12225a0451d17d9ced225e83c4 Mon Sep 17 00:00:00 2001 From: Seth Thomas <sthomas@chef.io> Date: Mon, 3 Jul 2017 09:04:37 -0400 Subject: [PATCH 0637/1622] Update Packer version Signed-off-by: Seth Thomas <sthomas@chef.io> --- .travis.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index f8e62ba45..a15c255f4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,10 +2,10 @@ dist: trusty sudo: false env: - - PACKER_VERSION="0.12.2" + - PACKER_VERSION="1.0.2" rvm: - - 2.3.1 + - 2.4.1 branches: only: @@ -14,7 +14,6 @@ branches: before_install: - wget https://releases.hashicorp.com/packer/${PACKER_VERSION}/packer_${PACKER_VERSION}_linux_amd64.zip - unzip -d packer packer_${PACKER_VERSION}_linux_amd64.zip - - touch VMwareTools-10.1.0-4449150.tar.gz before_script: export PATH=$PATH:$PWD/packer From c9906aa8ba4f2df4bc5dc48eebefbdca9e798d68 Mon Sep 17 00:00:00 2001 From: Seth Thomas <sthomas@chef.io> Date: Mon, 3 Jul 2017 12:16:45 -0400 Subject: [PATCH 0638/1622] Fix #834 Signed-off-by: Seth Thomas <sthomas@chef.io> --- CHANGELOG.md | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9ef9c707c..f22c2f480 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,36 @@ # Change Log + +## [2.3.7](https://github.com/chef/bento/tree/2.3.7) (2017-07-03) + +**New** +- Debian 8.8 +- Debian 9.0 [\#818](https://github.com/chef/bento/pull/818) +- Oracle 6.9 +- Ubuntu 17.04 [\#808](https://github.com/chef/bento/pull/808) + +**Removed** +- OmniOS +- Ubuntu 12.04 +- SLES 12 / 12 SP1 + +**Fixes** +- Fedora cleanup and size reduction + +## [2.3.6](https://github.com/chef/bento/tree/2.3.6) (2017-05-03) + +- Release for fixed VirtualBox 5.1.22 + +## [2.3.5](https://github.com/chef/bento/tree/2.3.5) (2017-04-24) + +- Release primarily around broken VirtualBox 5.1.20/21 (fixed) + +**New** +- CentOS 6.9 [\#788](https://github.com/chef/bento/pull/788) + +**Fixes** +- Oracle 6.8 `box_basename` [\#784](https://github.com/chef/bento/pull/784) +- MacOS 10.12 issue w/ memory var [\#768](https://github.com/chef/bento/pull/768) + ## [2.3.4](https://github.com/chef/bento/tree/2.3.4) (2017-03-23) - Mostly rebuilt for updated hypervisors: VirtualBox 5.1.18 and VMware Fusion 8.5.5 From 1f81080f466d0e09ba4a10697cb7fc5bd100dfcf Mon Sep 17 00:00:00 2001 From: Ed Morley <edmorley@users.noreply.github.com> Date: Tue, 4 Jul 2017 04:16:36 +0100 Subject: [PATCH 0639/1622] Make Ubuntu APT use archive.ubuntu.com rather than the US domain By default the Ubuntu installer sets the repository hostnames in `/etc/apt/sources.list` to the country-specific mirrors based on the locale chosen, which for this image is `us.archive.ubuntu.com`. The US mirror is slow for users outside the US, so a better option is to use `archive.ubuntu.com`, which automatically resolves to the closest official country mirror to them. This is also the hostname used in the official Ubuntu Docker images. Fixes #810. Signed-off-by: Ed Morley <edmorley@users.noreply.github.com> --- http/ubuntu/preseed.cfg | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/http/ubuntu/preseed.cfg b/http/ubuntu/preseed.cfg index 81b0abec5..7b4a3235f 100644 --- a/http/ubuntu/preseed.cfg +++ b/http/ubuntu/preseed.cfg @@ -5,6 +5,10 @@ d-i clock-setup/utc-auto boolean true d-i finish-install/reboot_in_progress note d-i grub-installer/only_debian boolean true d-i grub-installer/with_other_os boolean true +d-i mirror/country string manual +d-i mirror/http/directory string /ubuntu/ +d-i mirror/http/hostname string archive.ubuntu.com +d-i mirror/http/proxy string d-i partman-auto-lvm/guided_size string max d-i partman-auto/choose_recipe select atomic d-i partman-auto/method string lvm From 9808ae8de2c0818faf6b260b0b7b2c16bc67ff96 Mon Sep 17 00:00:00 2001 From: Seth Thomas <sthomas@chef.io> Date: Wed, 5 Jul 2017 13:33:32 -0400 Subject: [PATCH 0640/1622] Update Readme, normalize templates Signed-off-by: Seth Thomas <sthomas@chef.io> --- .gitignore | 2 +- .kitchen.yml.erb | 16 --- README.md | 231 ++++++---------------------------------- Rakefile | 120 ++++++++++++++------- Thorfile | 59 ---------- builds.yml | 38 ++----- centos-6.9-i386.json | 1 + centos-6.9-x86_64.json | 1 + centos-7.3-x86_64.json | 7 +- debian-9.0-amd64.json | 1 + fedora-24-i386.json | 1 + fedora-24-x86_64.json | 1 + fedora-25-i386.json | 1 + fedora-25-x86_64.json | 1 + oracle-6.9-i386.json | 1 + oracle-6.9-x86_64.json | 1 + rhel-6.9-i386.json | 1 + rhel-6.9-x86_64.json | 1 + ubuntu-16.04-amd64.json | 1 + ubuntu-17.04-amd64.json | 1 + ubuntu-17.04-i386.json | 1 + 21 files changed, 143 insertions(+), 344 deletions(-) delete mode 100644 .kitchen.yml.erb delete mode 100644 Thorfile diff --git a/.gitignore b/.gitignore index b7286fe87..3c1d96ad0 100644 --- a/.gitignore +++ b/.gitignore @@ -9,5 +9,5 @@ packer.log *.variables.json /builds/ .kitchen -.kitchen.*.yml +.kitchen.yml Gemfile.lock diff --git a/.kitchen.yml.erb b/.kitchen.yml.erb deleted file mode 100644 index 15881fe27..000000000 --- a/.kitchen.yml.erb +++ /dev/null @@ -1,16 +0,0 @@ ---- -provisioner: - name: <%= @provisioner %> - -platforms: -- name: "<%= @boxname %>" - driver: - name: vagrant - synced_folders: - - [".", "/vagrant", "disabled: <%= @share_disabled %>"] - provider: <%= @provider %> - box: bento-<%= @boxname %> - box_url: <%= @box_url %> - -suites: -- name: default diff --git a/README.md b/README.md index 215583faf..f7c50ef05 100644 --- a/README.md +++ b/README.md @@ -2,180 +2,81 @@ [![Build Status](http://img.shields.io/travis/chef/bento.svg)][travis] -Bento is a project that encapsulates [Packer](https://www.packer.io/) templates for building [Vagrant](https://www.vagrantup.com/) base boxes. We use these boxes internally at Chef Software, Inc. for testing Hosted Chef, Chef Server and our open source [cookbooks](https://supermarket.chef.io/users/chef) via [test-kitchen](http://kitchen.ci/). +Bento is a project that encapsulates [Packer](https://www.packer.io/) templates for building [Vagrant](https://www.vagrantup.com/) base boxes. A subset of templates are built and published to the [bento org](https://app.vagrantup.com/bento) on Vagrant Cloud. The boxes also serve as default boxes for [kitchen-vagrant](https://github.com/test-kitchen/kitchen-vagrant/). -## Pre-built Boxes +### Using Public Boxes -The following boxes are built from this repository's templates for publicly available platforms and are currently hosted via Atlas in the [bento organization](https://atlas.hashicorp.com/bento/). Boxes listed that are struck out (~~box~~) are broken/unreleased for the current version. - -### 64 bit - -| | VirtualBox | VMware | Parallels | -|------------------- | ------------------------------ | --------------------------------- | ------------------------------| -| centos-5.11 | [x86_64][centos_511_64_vbox] | [x86_64][centos_511_64_vmware] | [x86_64][centos_511_64_prl] | -| centos-6.8 | [x86_64][centos_68_64_vbox] | [x86_64][centos_68_64_vmware] | [x86_64][centos_68_64_prl] | -| centos-7.3 | [x86_64][centos_73_64_vbox] | [x86_64][centos_73_64_vmware] | [x86_64][centos_73_64_prl] | -| debian-7.11 | [amd64][debian_711_64_vbox] | [amd64][debian_711_64_vmware] | [amd64][debian_711_64_prl] | -| debian-8.7 | [amd64][debian_87_64_vbox] | ~~[amd64][debian_87_64_vmware]~~ | [amd64][debian_87_64_prl] | -| fedora-24 | [x86_64][fedora_24_64_vbox] | [x86_64][fedora_24_64_vmware] | ~~[x86_64][fedora_24_64_prl]~~| -| fedora-25 | [x86_64][fedora_25_64_vbox] | [x86_64][fedora_25_64_vmware] | [x86_64][fedora_25_64_prl] | -| freebsd-10.3 | [amd64][freebsd_103_64_vbox] | ~~[amd64][freebsd_103_64_vmware]~~ | [amd64][freebsd_103_64_prl] | -| freebsd-11.0 | [amd64][freebsd_110_64_vbox] | [amd64][freebsd_110_64_vmware] | [amd64][freebsd_110_64_prl] | -| opensuse-leap-42.2 | [x86_64][leap_422_64_vbox] | ~~[x86_64][leap_422_64_vmware]~~ | ~~[x86_64][leap_422_64_prl]~~ | -| oracle-5.11 | [x86_64][oracle_511_64_vbox] | [x86_64][oracle_511_64_vmware] | [x86_64][oracle_511_64_prl] | -| oracle-6.8 | [x86_64][oracle_68_64_vbox] | [x86_64][oracle_68_64_vmware] | [x86_64][oracle_68_64_prl] | -| oracle-7.3 | [x86_64][oracle_73_64_vbox] | [x86_64][oracle_73_64_vmware] | [x86_64][oracle_73_64_prl] | -| ubuntu-14.04 | [amd64][ubuntu_1404_64_vbox] | [amd64][ubuntu_1404_64_vmware] | [amd64][ubuntu_1404_64_prl] | -| ubuntu-16.04 | [amd64][ubuntu_1604_64_vbox] | [amd64][ubuntu_1604_64_vmware] | [amd64][ubuntu_1604_64_prl] | - -### 32 bit - -| | VirtualBox | VMware | Parallels | -|-------------- | ---------------------------- | ------------------------------- | ----------------------------| -| centos-5.11 | [i386][centos_511_32_vbox] | [i386][centos_511_32_vmware] | [i386][centos_511_32_prl] | -| centos-6.8 | [i386][centos_68_32_vbox] | [i386][centos_68_32_vmware] | [i386][centos_68_32_prl] | -| debian-7.11 | [i386][debian_711_32_vbox] | [i386][debian_711_32_vmware] | [i386][debian_711_32_prl] | -| debian-8.8 | [i386][debian_88_32_vbox] | ~~[i386][debian_88_32_vmware]~~ | [i386][debian_88_32_prl] | -| oracle-5.11 | [x86_64][oracle_511_32_vbox] | [x86_64][oracle_511_32_vmware] | [x86_64][oracle_511_32_prl] | -| oracle-6.8 | [x86_64][oracle_68_32_vbox] | [x86_64][oracle_68_32_vmware] | [x86_64][oracle_68_32_prl] | -| ubuntu-14.04 | [i386][ubuntu_1404_32_vbox] | [i386][ubuntu_1404_32_vmware] | [i386][ubuntu_1404_32_prl] | -| ubuntu-16.04 | [i386][ubuntu_1604_32_vbox] | [i386][ubuntu_1604_32_vmware] | ~~[i386][ubuntu_1604_32_prl]~~ | - -_NOTE_ This table tracks only the latest release for a given version. Boxes may exist in Atlas or S3 but are not guaranteed to be updated at this time. - -### Build Notes - -- If you're using the [Vagrant VMWare Fusion](https://www.vagrantup.com/vmware) provider, using `vagrant box add --provider vmware_desktop ...` will work for these boxes. Using `--provider vmware_fusion`, will not. - -#### VMWare Fusion 8, Packer, systemd - -Recent Linux distributions use [systemd's logic to predictably name network devices](https://www.freedesktop.org/wiki/Software/systemd/PredictableNetworkInterfaceNames/). In our scenario, this is tied to the PCI slot id. For unknown reasons, boxes built with [the default vmx config provided by packer](https://github.com/mitchellh/packer/blob/e868f9b69c995cf8a681857aa68e9be286243630/builder/vmware/iso/step_create_vmx.go#L168) use a different PCI slot id (32 instead of 33) once they got imported to VMWare Fusion 8, which results in a different device name and finally in broken networking. This issue is documented in the following places: - -- <https://github.com/chef/bento/issues/554> -- <https://github.com/chef/bento/pull/545#issuecomment-202988690> -- <https://github.com/mitchellh/vagrant/issues/4590> - -As a workaround we've started to provide the changed PCI slot id as a custom value with the packer definitions with Ubuntu 15.10+ and Debian 8+. However this is not yet tested, may not solve the issue and/or break compatibility with other VMWare products/versions! - -## Older Boxes - -The contents of this Github repository represent the current state of Bento and not every packer config that has ever existed in the Bento project. As a distribution is made end of life or a newer minor version of a distribution ships, we will remove the existing configurations. At the time of the next Bento release those deprecations will be noted in the release notes. If you'd like to build that release for some reason, your best course of action is to checkout the release tag in git and use the existing configs at their last known working state. - -## Using Pre-built Boxes - -Adding a bento box to vagrant: +Adding a bento box to Vagrant ``` -$ vagrant box add bento/debian-8.7 +$ vagrant box add bento/ubuntu-16.04 ``` -Using a bento box in a Vagrantfile: +Using a bento box in a Vagrantfile ``` Vagrant.configure("2") do |config| - config.vm.box = "bento/debian-8.7" + config.vm.box = "bento/ubuntu-16.04" end ``` -## Requirements - -- [Packer](https://www.packer.io/) -- At least one virtualization provider: Virtualbox, VMware Fusion, Parallels Desktop, etc - -## Build Your Own Bento Boxes - -### Using `bento` - -``` -$ gem install bento-ya -``` - -If you use Bundler, you can add run `bundle install` from the bento repo. Prefix commands with `bundle exec` if doing so. +### Building Templates -To build multiple templates for all providers (VirtualBox, Fusion, Parallels, etc): +#### Requirements -``` -$ bento build debian-8.7-amd64 debian-8.7-i386 -``` - -To build a box for a single provider: - -``` -$ bento build --only=virtualbox-iso debian-8.7-amd64 -``` - -### Using `packer` +- [Packer](https://www.packer.io/) +- At least one virtualization provider: + - [VirtualBox](https://www.virtualbox.org/) + - [VMware Fusion](https://www.vmware.com/products/fusion.html) + - [Parallels Desktop](http://www.parallels.com/products/desktop/) -Templates can still be built directly by `packer` +#### Using `packer` -To build a template for all providers (VirtualBox, Fusion, Parallels): +To build a template for all providers simultaneously ``` -$ packer build debian-8.7-amd64.json +$ packer build ubuntu-16.04-amd64.json ``` -To build a template only for a list of specific providers: +To build a template only for a list of specific providers ``` -$ packer build -only=virtualbox-iso debian-8.7-amd64.json +$ packer build -only=virtualbox-iso ubuntu-16.04-amd64.json ``` -To build a template for all providers except a list of specific providers: +To build a template for all providers except a list of specific providers ``` -$ packer build -except=parallels-iso,vmware-iso debian-8.7-amd64.json +$ packer build -except=parallels-iso,vmware-iso ubuntu-16.04-amd64.json ``` -If you want to use a another mirror site, use the `mirror` user variable. +To use an alternate mirror ``` -$ packer build -var 'mirror=http://ftp.jaist.ac.jp/pub/Linux/debian-cdimage/release' debian-8.7-amd64.json +$ packer build -var 'mirror=http://ftp.jaist.ac.jp/pub/Linux/debian-cdimage/release' ubuntu-16.04-amd64.json ``` -Congratulations! You now have box(es) in the ../builds directory that you can then add to Vagrant and start testing cookbooks. +Congratulations! Ready to import box files should be in the ../builds directory. Notes: -- The box_basename can be overridden like other Packer vars with `-var 'box_basename=debian-8.7'` - -### Proprietary Boxes - -Mac OS X, Red Hat Enterprise Linux, and SUSE Linux Enterprise Server templates are provided. However, their ISOs are not publicly retrievable and as such, the URLs in those templates are bogus. For RHEL and SLES, substitute a server where the ISOs are hosted, using the mirror variable as above. - -#### Mac OS X +- The box_basename can be overridden like other Packer vars with `-var 'box_basename=ubuntu-16.04'` -To build a Mac OS X box, you will need to start with an installer for your desired version of OS X. You will then need to use [Tim Sutton's osx-vm-templates](https://github.com/timsutton/osx-vm-templates)/) to modify that installer for use by packer. The output of that build will include the location of the ISO and its checksum, which you can substitute into your `packer build` command, e.g.: +### Proprietary Templates -``` -$ packer build -var 'iso_checksum=<checksum>' -var 'iso_url=<iso_url>' macosx-10.11.json -``` +Templates for operating systems only available via license or subscription are also available in the repository, these include but are not limited to: Mac OS X, Red Hat Enterprise Linux, and SUSE Linux Enterprise. As the ISOs are not publicly available the URL values will need to be overridden as appropriate. We rely on the efforts of those with access to licensed versions of the operating systems to keep these up-to-date. -There is a known issue where [test-kitchen](http://kitchen.ci/) starts a Mac OS X box correctly, but `vagrant up` fails due to the absence of the HGFS kernel module. This is due to a silent failure during the VMware tools installation and can be corrected by installing the VMware tools on the Mac OS X box manually. +#### macOS / OSX -Note that, while it is possible to build OS X boxes for VirtualBox, it may not be ideal. VirtualBox provides no "guest additions" for OS X. Boxes consequently have limited networking configurability and must rely on rsync for folder syncing. VMWare, when available, is generally preferred. +See our [wiki page](https://github.com/chef/bento/wiki/macOS) -### Windows +#### Windows -Currently the project does not include any definitions for building Windows boxes. For other approaches to building Windows boxes, please see the following community projects: +The project does not include many definitions for building Windows boxes. For other approaches to building Windows boxes, please see the following community projects: - [Mischa Taylor's Boxcutter project](https://github.com/boxcutter) - [Vagrant Windows Boxes and Puppet](https://github.com/ferventcoder/vagrant-windows-puppet/tree/master/baseboxes) -### Special Note About Building from Windows Hosts - -When building boxes from a Windows host system, you must ensure that kickstart configuration files (`ks.cfg` for RHEL based systems) and preseed files (`preseed.cfg` for Debian based systems) have Unix line endings (i.e. lines end with LF character only). Moreover, it's also a good idea to have `*.sh` scripts with Unix line endings too. - -When these files have Windows line endings, the group creation can fail in the pre-seed phase and in turn, prevents the user `vagrant` to be created correctly. This ultimately results in Packer not being able to connect to the newly booted up machine with an error message that looks like this: - -``` -==> virtualbox-iso: Waiting for SSH to become available... -==> virtualbox-iso: Error waiting for SSH: handshake failed: ssh: unable to authenticate, attempted methods [none password], no support -``` - -Since Packer tries to log in with user `vagrant` but it was not created successfully in the pre-seed phase, it is unable to connect to the machine and the packaging process stops. - -By default, when cloning this repository, git should normalize `ks.cfg`, `preseed.cfg` and `*.sh` to Unix line endings and `*.bat` to Windows line endings, thanks to the <.gitattributes> file in the repository. However, if it's not the case because you have overridden line-ending conversion in your own git configuration, convert the offending files so they have the correct line endings. - ## Bugs and Issues Please use GitHub issues to report bugs, features, or other problems. @@ -212,75 +113,3 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ``` - -[centos_511_32_prl]: https://atlas.hashicorp.com/bento/boxes/centos-5.11-i386/versions/2.3.4/providers/parallels.box -[centos_511_32_vbox]: https://atlas.hashicorp.com/bento/boxes/centos-5.11-i386/versions/2.3.4/providers/virtualbox.box -[centos_511_32_vmware]: https://atlas.hashicorp.com/bento/boxes/centos-5.11-i386/versions/2.3.4/providers/vmware_desktop.box -[centos_511_64_prl]: https://atlas.hashicorp.com/bento/boxes/centos-5.11/versions/2.3.4/providers/parallels.box -[centos_511_64_vbox]: https://atlas.hashicorp.com/bento/boxes/centos-5.11/versions/2.3.4/providers/virtualbox.box -[centos_511_64_vmware]: https://atlas.hashicorp.com/bento/boxes/centos-5.11/versions/2.3.4/providers/vmware_desktop.box -[centos_68_32_prl]: https://atlas.hashicorp.com/bento/boxes/centos-6.8-i386/versions/2.3.4/providers/parallels.box -[centos_68_32_vbox]: https://atlas.hashicorp.com/bento/boxes/centos-6.8-i386/versions/2.3.4/providers/virtualbox.box -[centos_68_32_vmware]: https://atlas.hashicorp.com/bento/boxes/centos-6.8-i386/versions/2.3.4/providers/vmware_desktop.box -[centos_68_64_prl]: https://atlas.hashicorp.com/bento/boxes/centos-6.8/versions/2.3.4/providers/parallels.box -[centos_68_64_vbox]: https://atlas.hashicorp.com/bento/boxes/centos-6.8/versions/2.3.4/providers/virtualbox.box -[centos_68_64_vmware]: https://atlas.hashicorp.com/bento/boxes/centos-6.8/versions/2.3.4/providers/vmware_desktop.box -[centos_73_64_prl]: https://atlas.hashicorp.com/bento/boxes/centos-7.3/versions/2.3.2/providers/parallels.box -[centos_73_64_vbox]: https://atlas.hashicorp.com/bento/boxes/centos-7.3/versions/2.3.2/providers/virtualbox.box -[centos_73_64_vmware]: https://atlas.hashicorp.com/bento/boxes/centos-7.3/versions/2.3.2/providers/vmware_desktop.box -[debian_711_32_prl]: https://atlas.hashicorp.com/bento/boxes/debian-7.11-i386/versions/2.3.4/providers/parallels.box -[debian_711_32_vbox]: https://atlas.hashicorp.com/bento/boxes/debian-7.11-i386/versions/2.3.4/providers/virtualbox.box -[debian_711_32_vmware]: https://atlas.hashicorp.com/bento/boxes/debian-7.11-i386/versions/2.3.4/providers/vmware_desktop.box -[debian_711_64_prl]: https://atlas.hashicorp.com/bento/boxes/debian-7.11/versions/2.3.4/providers/parallels.box -[debian_711_64_vbox]: https://atlas.hashicorp.com/bento/boxes/debian-7.11/versions/2.3.4/providers/virtualbox.box -[debian_711_64_vmware]: https://atlas.hashicorp.com/bento/boxes/debian-7.11/versions/2.3.4/providers/vmware_desktop.box -[debian_87_32_prl]: https://atlas.hashicorp.com/bento/boxes/debian-8.7-i386/versions/2.3.4/providers/parallels.box -[debian_87_32_vbox]: https://atlas.hashicorp.com/bento/boxes/debian-8.7-i386/versions/2.3.4/providers/virtualbox.box -[debian_87_32_vmware]: https://atlas.hashicorp.com/bento/boxes/debian-8.7-i386/versions/2.3.4/providers/vmware_desktop.box -[debian_87_64_prl]: https://atlas.hashicorp.com/bento/boxes/debian-8.7/versions/2.3.4/providers/parallels.box -[debian_87_64_vbox]: https://atlas.hashicorp.com/bento/boxes/debian-8.7/versions/2.3.4/providers/virtualbox.box -[debian_87_64_vmware]: https://atlas.hashicorp.com/bento/boxes/debian-8.7/versions/2.3.4/providers/vmware_desktop.box -[fedora_24_64_prl]: https://atlas.hashicorp.com/bento/boxes/fedora-24/versions/2.3.4/providers/parallels.box -[fedora_24_64_vbox]: https://atlas.hashicorp.com/bento/boxes/fedora-24/versions/2.3.4/providers/virtualbox.box -[fedora_24_64_vmware]: https://atlas.hashicorp.com/bento/boxes/fedora-24/versions/2.3.4/providers/vmware_desktop.box -[fedora_25_64_prl]: https://atlas.hashicorp.com/bento/boxes/fedora-25/versions/2.3.4/providers/parallels.box -[fedora_25_64_vbox]: https://atlas.hashicorp.com/bento/boxes/fedora-25/versions/2.3.4/providers/virtualbox.box -[fedora_25_64_vmware]: https://atlas.hashicorp.com/bento/boxes/fedora-25/versions/2.3.4/providers/vmware_desktop.box -[freebsd_103_64_prl]: https://atlas.hashicorp.com/bento/boxes/freebsd-10.3/versions/2.3.4/providers/parallels.box -[freebsd_103_64_vbox]: https://atlas.hashicorp.com/bento/boxes/freebsd-10.3/versions/2.3.4/providers/virtualbox.box -[freebsd_103_64_vmware]: https://atlas.hashicorp.com/bento/boxes/freebsd-10.3/versions/2.3.4/providers/vmware_desktop.box -[freebsd_110_64_prl]: https://atlas.hashicorp.com/bento/boxes/freebsd-11.0/versions/2.3.4/providers/parallels.box -[freebsd_110_64_vbox]: https://atlas.hashicorp.com/bento/boxes/freebsd-11.0/versions/2.3.4/providers/virtualbox.box -[freebsd_110_64_vmware]: https://atlas.hashicorp.com/bento/boxes/freebsd-11.0/versions/2.3.4/providers/vmware_desktop.box -[leap_422_64_prl]: https://atlas.hashicorp.com/bento/boxes/opensuse-leap-42.2/versions/2.3.4/providers/parallels.box -[leap_422_64_vbox]: https://atlas.hashicorp.com/bento/boxes/opensuse-leap-42.2/versions/2.3.4/providers/virtualbox.box -[leap_422_64_vmware]: https://atlas.hashicorp.com/bento/boxes/opensuse-leap-42.2/versions/2.3.4/providers/vmware_desktop.box -[omnios_r151018_64_vbox]: https://atlas.hashicorp.com/bento/boxes/omnios-r151018/versions/2.3.4/providers/virtualbox.box -[oracle_511_32_prl]: https://atlas.hashicorp.com/bento/boxes/oracle-5.11-i386/versions/2.3.4/providers/parallels.box -[oracle_511_32_vbox]: https://atlas.hashicorp.com/bento/boxes/oracle-5.11-i386/versions/2.3.4/providers/virtualbox.box -[oracle_511_32_vmware]: https://atlas.hashicorp.com/bento/boxes/oracle-5.11-i386/versions/2.3.4/providers/vmware_desktop.box -[oracle_511_64_prl]: https://atlas.hashicorp.com/bento/boxes/oracle-5.11/versions/2.3.4/providers/parallels.box -[oracle_511_64_vbox]: https://atlas.hashicorp.com/bento/boxes/oracle-5.11/versions/2.3.4/providers/virtualbox.box -[oracle_511_64_vmware]: https://atlas.hashicorp.com/bento/boxes/oracle-5.11/versions/2.3.4/providers/vmware_desktop.box -[oracle_68_32_prl]: https://atlas.hashicorp.com/bento/boxes/oracle-6.8-i386/versions/2.3.4/providers/parallels.box -[oracle_68_32_vbox]: https://atlas.hashicorp.com/bento/boxes/oracle-6.8-i386/versions/2.3.4/providers/virtualbox.box -[oracle_68_32_vmware]: https://atlas.hashicorp.com/bento/boxes/oracle-6.8-i386/versions/2.3.4/providers/vmware_desktop.box -[oracle_68_64_prl]: https://atlas.hashicorp.com/bento/boxes/oracle-6.8/versions/2.3.4/providers/parallels.box -[oracle_68_64_vbox]: https://atlas.hashicorp.com/bento/boxes/oracle-6.8/versions/2.3.4/providers/virtualbox.box -[oracle_68_64_vmware]: https://atlas.hashicorp.com/bento/boxes/oracle-6.8/versions/2.3.4/providers/vmware_desktop.box -[oracle_73_64_prl]: https://atlas.hashicorp.com/bento/boxes/oracle-7.3/versions/2.3.4/providers/parallels.box -[oracle_73_64_vbox]: https://atlas.hashicorp.com/bento/boxes/oracle-7.3/versions/2.3.4/providers/virtualbox.box -[oracle_73_64_vmware]: https://atlas.hashicorp.com/bento/boxes/oracle-7.3/versions/2.3.4/providers/vmware_desktop.box -[travis]: https://travis-ci.org/chef/bento -[ubuntu_1404_32_prl]: https://atlas.hashicorp.com/bento/boxes/ubuntu-14.04-i386/versions/2.3.4/providers/parallels.box -[ubuntu_1404_32_vbox]: https://atlas.hashicorp.com/bento/boxes/ubuntu-14.04-i386/versions/2.3.4/providers/virtualbox.box -[ubuntu_1404_32_vmware]: https://atlas.hashicorp.com/bento/boxes/ubuntu-14.04-i386/versions/2.3.4/providers/vmware_desktop.box -[ubuntu_1404_64_prl]: https://atlas.hashicorp.com/bento/boxes/ubuntu-14.04/versions/2.3.4/providers/parallels.box -[ubuntu_1404_64_vbox]: https://atlas.hashicorp.com/bento/boxes/ubuntu-14.04/versions/2.3.4/providers/virtualbox.box -[ubuntu_1404_64_vmware]: https://atlas.hashicorp.com/bento/boxes/ubuntu-14.04/versions/2.3.4/providers/vmware_desktop.box -[ubuntu_1604_32_prl]: https://atlas.hashicorp.com/bento/boxes/ubuntu-16.04-i386/versions/2.3.4/providers/parallels.box -[ubuntu_1604_32_vbox]: https://atlas.hashicorp.com/bento/boxes/ubuntu-16.04-i386/versions/2.3.4/providers/virtualbox.box -[ubuntu_1604_32_vmware]: https://atlas.hashicorp.com/bento/boxes/ubuntu-16.04-i386/versions/2.3.4/providers/vmware_desktop.box -[ubuntu_1604_64_prl]: https://atlas.hashicorp.com/bento/boxes/ubuntu-16.04/versions/2.3.4/providers/parallels.box -[ubuntu_1604_64_vbox]: https://atlas.hashicorp.com/bento/boxes/ubuntu-16.04/versions/2.3.4/providers/virtualbox.box -[ubuntu_1604_64_vmware]: https://atlas.hashicorp.com/bento/boxes/ubuntu-16.04/versions/2.3.4/providers/vmware_desktop.box diff --git a/Rakefile b/Rakefile index 91bfc64cc..ea974a1b0 100644 --- a/Rakefile +++ b/Rakefile @@ -1,59 +1,107 @@ -require "json" require "yaml" -# TODO: private boxes may need to specify a mirror +desc "clean, build, test, upload" +task :do_all do + check_env + templates.each do |template| + Rake::Task["clean"].invoke + Rake::Task["clean"].reenable -# Enables `bundle exec rake do_all[ubuntu-12.04-amd64,centos-7.1-x86_64] -# http://blog.stevenocchipinti.com/2013/10/18/rake-task-with-an-arbitrary-number-of-arguments/ -builds = YAML.load(File.read("builds.yml")) + Rake::Task["build"].invoke(template) + Rake::Task["build"].reenable -desc "Do ALL THE THINGS" -task :do_all do - # build stage - builds["public"].each do |platform, versions| - versions.each do |version, archs| - archs.each do |arch| - builds["providers"].each do |provider| - template = "#{platform}-#{version}-#{arch}" - # build stage - Rake::Task["build_box"].invoke(template, provider) - Rake::Task["build_box"].reenable - # verification stage - sh "bento test -f" - # publish stage - sh "bento upload" - # release stage - atlas_name = template.match(/-x86_64|-amd64/) ? template.gsub(/-x86_64|-amd64/,'') : template - sh "bento release #{atlas_name} #{ENV['BENTO_VERSION']}" - # clean stage - puts "Cleaning up..." - sh "rm -rf builds/*.json builds/*.box packer-* .kitchen.*.yml" - end - end + Rake::Task["test"].invoke + Rake::Task["test"].reenable + + Rake::Task["upload"].invoke + Rake::Task["upload"].reenable + + unless ENV["BENTO_AUTO_RELEASE"].nil? + Rake::Task["release"].invoke(template) + Rake::Task["release"].reenable end end end desc "Build a bento template" -task :build_box, :template, :provider do |_, args| - bento_provider = ENV["BENTO_PROVIDERS"] ? ENV["BENTO_PROVIDERS"] : args[:provider] - if bento_provider.nil? - puts "Invalid build arguments. Either set BENTO_PROVIDERS in ENV or pass provider argument. Example: rake build_box[debian-8.7-amd64, virtualbox-iso]" - exit 1 - end +task :build, :template do |_, args| cmd = %W{bento build #{args[:template]}} - cmd.insert(2, "--only #{bento_provider}") + cmd.insert(2, "--only #{providers}") cmd.insert(2, "--mirror #{ENV['PACKER_MIRROR']}") if ENV["PACKER_MIRROR"] cmd.insert(2, "--version #{ENV['BENTO_VERSION']}") if ENV["BENTO_VERSION"] - cmd.insert(2, "--headless") cmd.join(" ") sh a_to_s(cmd) end +desc "release" +task :release, :template do |_, args| + puts "bento release #{box_name(args[:template])} #{ENV['BENTO_VERSION']}" +end + +desc "test" +task :test do + sh "bento test" +end + +desc "upload" +task :upload do + sh "bento upload" +end + +desc "Clean" +task :clean do + sh "rm -rf builds/*.json builds/*.box packer-* .kitchen.yml" +end + def a_to_s(*args) clean_array(*args).join(" ") end +def box_name(template) + template.match(/-x86_64|-amd64/) ? template.gsub(/-x86_64|-amd64/,'') : template +end + +def builds + YAML.load(File.read("builds.yml")) +end + +def check_env + if ENV["BENTO_VERSION"].nil? + puts "Please set the BENTO_VERSION env variable" + exit 1 + end +end + +def providers + if ENV["BENTO_PROVIDERS"] + ENV["BENTO_PROVIDERS"] + elsif builds['providers'] + builds['providers'].join(',') + else + puts "No Providers Specified." + puts "Set BENTO_PROVIDERS in ENV or `providers` in builds.yml" + exit 1 + end +end + def clean_array(*args) args.flatten.reject { |i| i.nil? || i == "" }.map(&:to_s) end + +def templates + bit32 = [] + bit64 = [] + builds['public'].each do |platform, versions| + versions.each do |version, archs| + archs.each do |arch| + case arch + when "i386" + bit32 << "#{platform}-#{version}-#{arch}" + else + bit64 << "#{platform}-#{version}-#{arch}" + end + end + end + end + bit64 + bit32 +end diff --git a/Thorfile b/Thorfile deleted file mode 100644 index 733bd02ed..000000000 --- a/Thorfile +++ /dev/null @@ -1,59 +0,0 @@ -# vi: ft=ruby - -require "thor" -require "fileutils" -require "timeout" - -class Packer < Thor - - desc "validate", "Validate all the packer templates" - def validate - Dir.chdir "./packer" do - templates = Dir.glob("*.json") - templates.each do |template| - puts "#{template}" - unless system "packer validate #{template}" - raise "Validation failed!" - end - puts "\n" - end - end - end - - desc "clean", "Description goes here" - def clean(what) - if what == "cache" - FileUtils.rm_rf(Dir.glob("./packer/packer_cache/*")) - elsif what == "boxes" - FileUtils.rm_rf(Dir.glob("./packer/*.box")) - end - end - - desc "build", "Execute the packer builder" - option :os, :banner => "<os>", :default => "*" - option :ver, :banner => "<version>", :default => "*" - option :bits, :banner => "<bits>" - option :only, :banner => "<only>" - - def build - if options[:bits] - processor = options[:bits] == "64" ? "{amd64,x86_64}" : "i386" - else - processor = "*" - end - - templates = Dir.glob("#{options[:os]}-#{options[:ver]}-#{processor}.json") - - if options[:only] - templates.each do |template| - name = template.chomp(".json").split("-") - system "packer build -only=#{name[0]}-#{name[1]}-#{name[2]}-#{options[:only]} #{template}" - end - else - templates.each do |template| - system "packer build #{template}" - end - end - end - -end diff --git a/builds.yml b/builds.yml index 3db73e913..08b488efa 100644 --- a/builds.yml +++ b/builds.yml @@ -6,9 +6,12 @@ providers: public: centos: - '5.11': + '6.9': - x86_64 - i386 + '7.3': + - x86_64 + oracle: '6.9': - x86_64 - i386 @@ -18,10 +21,10 @@ public: '7.11': - amd64 - i386 - '8.7': + '8.8': - amd64 - i386 - '9': + '9.0': - amd64 fedora: '24': @@ -33,21 +36,9 @@ public: - amd64 '11.0': - amd64 - omnios: - r151018: - - amd64 opensuse-leap: '42.2': - x86_64 - oracle: - '5.11': - - x86_64 - - i386 - '6.9': - - x86_64 - - i386 - '7.3': - - x86_64 ubuntu: '14.04': - amd64 @@ -61,22 +52,13 @@ public: private: rhel: - '5.11': - - x86_64 - - i386 - '6.8': + '6.9': - x86_64 - i386 '7.3': - x86_64 broken: - - omnios-r151018-vmware-iso - - omnios-r151018-parallels-iso - - opensuse-leap-42.1-x86_64-parallels-iso - -no_shared_folder: - - freebsd-11.0-amd64-all - - freebsd-10.3-amd64-all - - freebsd-9.3-amd64-all - - omnios-r151018-all + - opensuse-leap-42.2-x86_64-parallels-iso + - opensuse-leap-42.2-x86_64-vmware-iso + - debian-9.0-x86_64-vmware-iso diff --git a/centos-6.9-i386.json b/centos-6.9-i386.json index cf5d3a62f..ec5664bf9 100644 --- a/centos-6.9-i386.json +++ b/centos-6.9-i386.json @@ -179,3 +179,4 @@ "version": "2.1.TIMESTAMP" } } + diff --git a/centos-6.9-x86_64.json b/centos-6.9-x86_64.json index b326a971f..5437c06ba 100644 --- a/centos-6.9-x86_64.json +++ b/centos-6.9-x86_64.json @@ -179,3 +179,4 @@ "version": "2.1.TIMESTAMP" } } + diff --git a/centos-7.3-x86_64.json b/centos-7.3-x86_64.json index ac725a983..a9f2f57e7 100644 --- a/centos-7.3-x86_64.json +++ b/centos-7.3-x86_64.json @@ -122,9 +122,9 @@ "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, - "ssh_username": "vagrant", "ssh_timeout": "10000s", - "switch_name":"{{ user `hyperv_switch`}}", + "ssh_username": "vagrant", + "switch_name": "{{ user `hyperv_switch`}}", "type": "hyperv-iso", "vm_name": "{{ user `template` }}" }, @@ -192,7 +192,7 @@ "headless": "", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", - "hyperv_generation": "1" , + "hyperv_generation": "1", "hyperv_switch": "{{env `hyperv_switch`}}", "iso_checksum": "c455ee948e872ad2194bdddd39045b83634e8613249182b88f549bb2319d97eb", "iso_checksum_type": "sha256", @@ -208,3 +208,4 @@ "version": "2.1.TIMESTAMP" } } + diff --git a/debian-9.0-amd64.json b/debian-9.0-amd64.json index 82168f80f..b867f0c7a 100644 --- a/debian-9.0-amd64.json +++ b/debian-9.0-amd64.json @@ -243,3 +243,4 @@ "version": "2.1.TIMESTAMP" } } + diff --git a/fedora-24-i386.json b/fedora-24-i386.json index d8e584f3b..4cfa14f32 100644 --- a/fedora-24-i386.json +++ b/fedora-24-i386.json @@ -177,3 +177,4 @@ "version": "2.0.TIMESTAMP" } } + diff --git a/fedora-24-x86_64.json b/fedora-24-x86_64.json index 4e4a7b74c..e56910be4 100644 --- a/fedora-24-x86_64.json +++ b/fedora-24-x86_64.json @@ -183,3 +183,4 @@ "version": "2.0.TIMESTAMP" } } + diff --git a/fedora-25-i386.json b/fedora-25-i386.json index 82f38216f..435a1eb09 100644 --- a/fedora-25-i386.json +++ b/fedora-25-i386.json @@ -177,3 +177,4 @@ "version": "2.0.TIMESTAMP" } } + diff --git a/fedora-25-x86_64.json b/fedora-25-x86_64.json index 7474ff361..d36e9fd9d 100644 --- a/fedora-25-x86_64.json +++ b/fedora-25-x86_64.json @@ -183,3 +183,4 @@ "version": "2.0.TIMESTAMP" } } + diff --git a/oracle-6.9-i386.json b/oracle-6.9-i386.json index dbf418e98..6a9d10737 100644 --- a/oracle-6.9-i386.json +++ b/oracle-6.9-i386.json @@ -180,3 +180,4 @@ "version": "2.2.TIMESTAMP" } } + diff --git a/oracle-6.9-x86_64.json b/oracle-6.9-x86_64.json index 459488121..df2a56581 100644 --- a/oracle-6.9-x86_64.json +++ b/oracle-6.9-x86_64.json @@ -180,3 +180,4 @@ "version": "2.2.TIMESTAMP" } } + diff --git a/rhel-6.9-i386.json b/rhel-6.9-i386.json index 91d3dc70a..795437ab0 100644 --- a/rhel-6.9-i386.json +++ b/rhel-6.9-i386.json @@ -180,3 +180,4 @@ "version": "2.2.TIMESTAMP" } } + diff --git a/rhel-6.9-x86_64.json b/rhel-6.9-x86_64.json index f9cf530af..8bd3dae64 100644 --- a/rhel-6.9-x86_64.json +++ b/rhel-6.9-x86_64.json @@ -180,3 +180,4 @@ "version": "2.2.TIMESTAMP" } } + diff --git a/ubuntu-16.04-amd64.json b/ubuntu-16.04-amd64.json index 7a2446daa..2760d9723 100644 --- a/ubuntu-16.04-amd64.json +++ b/ubuntu-16.04-amd64.json @@ -274,3 +274,4 @@ "version": "2.1.TIMESTAMP" } } + diff --git a/ubuntu-17.04-amd64.json b/ubuntu-17.04-amd64.json index 9a6439dea..33c611848 100644 --- a/ubuntu-17.04-amd64.json +++ b/ubuntu-17.04-amd64.json @@ -270,3 +270,4 @@ "version": "2.1.TIMESTAMP" } } + diff --git a/ubuntu-17.04-i386.json b/ubuntu-17.04-i386.json index 551d4048c..17dda0e58 100644 --- a/ubuntu-17.04-i386.json +++ b/ubuntu-17.04-i386.json @@ -270,3 +270,4 @@ "version": "2.1.TIMESTAMP" } } + From 93f9486cacce299ace18efa2f71ad4b24dffc8f1 Mon Sep 17 00:00:00 2001 From: Seth Thomas <sthomas@chef.io> Date: Wed, 5 Jul 2017 15:11:07 -0400 Subject: [PATCH 0641/1622] Fix Travis link Signed-off-by: Seth Thomas <sthomas@chef.io> --- README.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/README.md b/README.md index f7c50ef05..3553aec48 100644 --- a/README.md +++ b/README.md @@ -113,3 +113,6 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ``` + +[travis]: https://travis-ci.org/chef/bento + From 8c87e66cdb18b2ef7145873db6fa88a78022f28f Mon Sep 17 00:00:00 2001 From: Seth Thomas <sthomas@chef.io> Date: Thu, 6 Jul 2017 13:21:30 -0400 Subject: [PATCH 0642/1622] TravisCI - print packer version Signed-off-by: Seth Thomas <sthomas@chef.io> --- .travis.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index a15c255f4..a7683de63 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,6 +15,8 @@ before_install: - wget https://releases.hashicorp.com/packer/${PACKER_VERSION}/packer_${PACKER_VERSION}_linux_amd64.zip - unzip -d packer packer_${PACKER_VERSION}_linux_amd64.zip -before_script: export PATH=$PATH:$PWD/packer +before_script: + - export PATH=$PATH:$PWD/packer + - packer --version script: bento normalize From 521574db3e92bc88cb306d888a60c183834457bf Mon Sep 17 00:00:00 2001 From: Seth Thomas <sthomas@chef.io> Date: Thu, 6 Jul 2017 13:38:05 -0400 Subject: [PATCH 0643/1622] Make sure we use the packer we downloaded Signed-off-by: Seth Thomas <sthomas@chef.io> --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index a7683de63..06ad2bab4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,6 +3,7 @@ sudo: false env: - PACKER_VERSION="1.0.2" + - PATH=$HOME/bin:$PATH rvm: - 2.4.1 @@ -13,10 +14,9 @@ branches: before_install: - wget https://releases.hashicorp.com/packer/${PACKER_VERSION}/packer_${PACKER_VERSION}_linux_amd64.zip - - unzip -d packer packer_${PACKER_VERSION}_linux_amd64.zip + - unzip -d ~/bin packer_${PACKER_VERSION}_linux_amd64.zip before_script: - - export PATH=$PATH:$PWD/packer - packer --version script: bento normalize From 093ac5d706fa39f358fec9b50e49494c3a388f94 Mon Sep 17 00:00:00 2001 From: Seth Thomas <sthomas@chef.io> Date: Thu, 6 Jul 2017 15:13:59 -0400 Subject: [PATCH 0644/1622] Use global namespace for Travis env Signed-off-by: Seth Thomas <sthomas@chef.io> --- .travis.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 06ad2bab4..ebaa5b6a7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,8 +2,9 @@ dist: trusty sudo: false env: - - PACKER_VERSION="1.0.2" - - PATH=$HOME/bin:$PATH + global: + - PACKER_VERSION="1.0.2" + - PATH=$HOME/bin:$PATH rvm: - 2.4.1 From 77a985ed644c04d688a6c597661d9218295872e0 Mon Sep 17 00:00:00 2001 From: Wicked Viking <wickedvikingstudios@gmail.com> Date: Sat, 8 Jul 2017 02:41:59 -0500 Subject: [PATCH 0645/1622] centos 6.9 x86_64 hyperv support Signed-off-by: Wicked Viking <wickedvikingstudios@gmail.com> --- centos-6.9-x86_64.json | 29 ++++++++++++++++++++++++++++- http/centos-6.9/ks.cfg | 15 ++++++++++++--- 2 files changed, 40 insertions(+), 4 deletions(-) diff --git a/centos-6.9-x86_64.json b/centos-6.9-x86_64.json index 5437c06ba..032f19ee0 100644 --- a/centos-6.9-x86_64.json +++ b/centos-6.9-x86_64.json @@ -101,6 +101,33 @@ "type": "parallels-iso", "vm_name": "{{ user `template` }}" }, + { + "boot_command": [ + "<wait5><tab> text ks=hd:fd0:/ks.cfg<enter><wait5><esc>" + ], + "boot_wait": "10s", + "cpu": "{{ user `cpus` }}", + "disk_size": "{{user `disk_size`}}", + "floppy_files": [ + "http/centos-6.9/ks.cfg" + ], + "generation": "{{user `hyperv_generation`}}", + "guest_additions_mode": "disable", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-hyperv", + "ram_size": "{{ user `memory` }}", + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_timeout": "10000s", + "ssh_username": "vagrant", + "switch_name": "{{ user `hyperv_switch`}}", + "type": "hyperv-iso", + "vm_name": "{{ user `template` }}" + }, { "boot_command": [ "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" @@ -165,6 +192,7 @@ "headless": "", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", + "hyperv_generation": "1", "iso_checksum": "d27cf37a40509c17ad70f37bc743f038c1feba00476fe6b69682aa424c399ea6", "iso_checksum_type": "sha256", "iso_name": "CentOS-6.9-x86_64-bin-DVD1.iso", @@ -179,4 +207,3 @@ "version": "2.1.TIMESTAMP" } } - diff --git a/http/centos-6.9/ks.cfg b/http/centos-6.9/ks.cfg index 90864b006..689c89d4d 100644 --- a/http/centos-6.9/ks.cfg +++ b/http/centos-6.9/ks.cfg @@ -2,7 +2,7 @@ install cdrom lang en_US.UTF-8 keyboard us -network --bootproto=dhcp +network --bootproto=dhcp --onboot=on --device=eth0 rootpw vagrant firewall --disabled selinux --permissive @@ -16,7 +16,7 @@ clearpart --all --initlabel autopart auth --enableshadow --passalgo=sha512 --kickstart firstboot --disabled -reboot +reboot --eject user --name=vagrant --plaintext --password vagrant key --skip @@ -31,6 +31,7 @@ make perl wget nfs-utils +virt-what -fprintd-pam -intltool @@ -62,8 +63,16 @@ nfs-utils -xorg-x11-drv-ati-firmware -zd1211-firmware -%post +%post --log=/root/my-post-log # Force to set SELinux to a permissive mode sed -i -e 's/\(^SELINUX=\).*$/\1permissive/' /etc/selinux/config # sudo echo "%vagrant ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers.d/vagrant + +#Enable hyper-v daemons only if using hyper-v virtualization +if [ $(virt-what) == "hyperv" ]; then + ifup eth0 + yum -y install hyperv-daemons + chkconfig hypervvssd on + chkconfig hypervkvpd on +fi From a38eef90b34a3e78c6e1145be3d79f0bf5b435ab Mon Sep 17 00:00:00 2001 From: Wicked Viking <wickedvikingstudios@gmail.com> Date: Sat, 8 Jul 2017 02:44:46 -0500 Subject: [PATCH 0646/1622] remove post log Signed-off-by: Wicked Viking <wickedvikingstudios@gmail.com> --- http/centos-6.9/ks.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/http/centos-6.9/ks.cfg b/http/centos-6.9/ks.cfg index 689c89d4d..edf63ccda 100644 --- a/http/centos-6.9/ks.cfg +++ b/http/centos-6.9/ks.cfg @@ -63,7 +63,7 @@ virt-what -xorg-x11-drv-ati-firmware -zd1211-firmware -%post --log=/root/my-post-log +%post # Force to set SELinux to a permissive mode sed -i -e 's/\(^SELINUX=\).*$/\1permissive/' /etc/selinux/config # sudo From 7440528e483244bf8ed3b756d94669d947217003 Mon Sep 17 00:00:00 2001 From: Wicked Viking <wickedvikingstudios@gmail.com> Date: Sat, 8 Jul 2017 03:12:17 -0500 Subject: [PATCH 0647/1622] centos 6.9 i386 hyperv support Signed-off-by: Wicked Viking <wickedvikingstudios@gmail.com> --- centos-6.9-i386.json | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/centos-6.9-i386.json b/centos-6.9-i386.json index ec5664bf9..1cde75142 100644 --- a/centos-6.9-i386.json +++ b/centos-6.9-i386.json @@ -101,6 +101,33 @@ "type": "parallels-iso", "vm_name": "{{ user `template` }}" }, + { + "boot_command": [ + "<wait5><tab> text ks=hd:fd0:/ks.cfg<enter><wait5><esc>" + ], + "boot_wait": "10s", + "cpu": "{{ user `cpus` }}", + "disk_size": "{{user `disk_size`}}", + "floppy_files": [ + "http/centos-6.9/ks.cfg" + ], + "generation": "{{user `hyperv_generation`}}", + "guest_additions_mode": "disable", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-hyperv", + "ram_size": "{{ user `memory` }}", + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_timeout": "10000s", + "ssh_username": "vagrant", + "switch_name": "{{ user `hyperv_switch`}}", + "type": "hyperv-iso", + "vm_name": "{{ user `template` }}" + }, { "boot_command": [ "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" @@ -165,6 +192,7 @@ "headless": "", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", + "hyperv_generation": "1", "iso_checksum": "0724a468ec0c4ac46ac6a1daba0273be697a37bb7f4e9fed8ad84ad270cdee2f", "iso_checksum_type": "sha256", "iso_name": "CentOS-6.9-i386-bin-DVD1.iso", From 5efa9c09762c3974ca35b4d90a83578f3ce4b131 Mon Sep 17 00:00:00 2001 From: Seth Thomas <sthomas@chef.io> Date: Tue, 11 Jul 2017 06:53:34 -0400 Subject: [PATCH 0648/1622] Adding Hyper-V for 64bit Ubuntus Signed-off-by: Seth Thomas <sthomas@chef.io> --- http/ubuntu/preseed-hyperv.cfg | 34 +++++++++++++++++++++++ scripts/ubuntu/hyperv.sh | 14 ++++++++++ ubuntu-14.04-amd64.json | 40 ++++++++++++++++++++++++++- ubuntu-16.04-amd64.json | 50 ++++++++++++++++++++++++++++++---- ubuntu-17.04-amd64.json | 40 ++++++++++++++++++++++++++- 5 files changed, 170 insertions(+), 8 deletions(-) create mode 100755 http/ubuntu/preseed-hyperv.cfg create mode 100755 scripts/ubuntu/hyperv.sh mode change 100644 => 100755 ubuntu-14.04-amd64.json mode change 100644 => 100755 ubuntu-16.04-amd64.json diff --git a/http/ubuntu/preseed-hyperv.cfg b/http/ubuntu/preseed-hyperv.cfg new file mode 100755 index 000000000..54f1fb4f5 --- /dev/null +++ b/http/ubuntu/preseed-hyperv.cfg @@ -0,0 +1,34 @@ +choose-mirror-bin mirror/http/proxy string +d-i base-installer/kernel/override-image string linux-server +d-i clock-setup/utc boolean true +d-i clock-setup/utc-auto boolean true +d-i finish-install/reboot_in_progress note +d-i grub-installer/only_debian boolean true +d-i grub-installer/with_other_os boolean true +d-i partman-auto-lvm/guided_size string max +d-i partman-auto/choose_recipe select atomic +d-i partman-auto/method string lvm +d-i partman-lvm/confirm boolean true +d-i partman-lvm/confirm boolean true +d-i partman-lvm/confirm_nooverwrite boolean true +d-i partman-lvm/device_remove_lvm boolean true +d-i partman/choose_partition select finish +d-i partman/confirm boolean true +d-i partman/confirm_nooverwrite boolean true +d-i partman/confirm_write_new_label boolean true +d-i partman-partitioning/no_bootable_gpt_biosgrub boolean false +d-i partman-partitioning/no_bootable_gpt_efi boolean false +d-i partman-efi/non_efi_system boolean true +d-i passwd/user-fullname string vagrant +d-i passwd/user-uid string 1000 +d-i passwd/user-password password vagrant +d-i passwd/user-password-again password vagrant +d-i passwd/username string vagrant +d-i pkgsel/include string openssh-server ntp linux-tools-$(uname -r) linux-cloud-tools-$(uname -r) linux-cloud-tools-common +d-i pkgsel/install-language-support boolean false +d-i pkgsel/update-policy select none +d-i pkgsel/upgrade select full-upgrade +d-i time/zone string UTC +d-i user-setup/allow-password-weak boolean true +d-i user-setup/encrypt-home boolean false +tasksel tasksel/first multiselect standard, server diff --git a/scripts/ubuntu/hyperv.sh b/scripts/ubuntu/hyperv.sh new file mode 100755 index 000000000..76e5a38a2 --- /dev/null +++ b/scripts/ubuntu/hyperv.sh @@ -0,0 +1,14 @@ +#!/bin/sh -eux +ubuntu_version="`lsb_release -r | awk '{print $2}'`"; +major_version="`echo $ubuntu_version | awk -F. '{print $1}'`"; + +case "$PACKER_BUILDER_TYPE" in +hyperv-iso) + if [ "$major_version" -eq "14" ]; then + apt-get install -y hv-kvp-daemon-init linux-tools-virtual-lts-xenial linux-cloud-tools-virtual-lts-xenial; + elif [ "$major_version" -eq "16" ]; then + apt-get install -y linux-tools-virtual-lts-xenial linux-cloud-tools-virtual-lts-xenial; + elif [ "$major_version" -eq "17" ]; then + apt-get -y install linux-image-virtual linux-tools-virtual linux-cloud-tools-virtual; + fi +esac diff --git a/ubuntu-14.04-amd64.json b/ubuntu-14.04-amd64.json old mode 100644 new mode 100755 index 20f44c1d4..06f9265b3 --- a/ubuntu-14.04-amd64.json +++ b/ubuntu-14.04-amd64.json @@ -204,6 +204,41 @@ "ssh_wait_timeout": "10000s", "type": "qemu", "vm_name": "{{ user `template` }}" + }, + { + "boot_command": [ + "<esc><wait10><esc><esc><enter><wait>", + "set gfxpayload=keep<enter><wait>", + "linux /install/vmlinuz ", + "preseed/url=http://{{.HTTPIP}}:{{.HTTPPort}}/ubuntu/preseed-hyperv.cfg ", + "debian-installer=en_US auto locale=en_US kbd-chooser/method=us ", + "hostname={{.Name}} ", + "fb=false debconf/frontend=noninteractive ", + "keyboard-configuration/modelcode=SKIP keyboard-configuration/layout=USA ", + "keyboard-configuration/variant=USA console-setup/ask_detect=false <enter><wait>", + "initrd /install/initrd.gz<enter><wait>", + "boot<enter>" + ], + "boot_wait": "10s", + "communicator": "ssh", + "cpu": "{{ user `cpus` }}", + "disk_size": "{{user `disk_size`}}", + "enable_secure_boot": false, + "generation": "{{user `hyperv_generation`}}", + "http_directory": "http", + "iso_checksum": "5E567024C385CC8F90C83D6763C6E4F1CD5DEB6F", + "iso_checksum_type": "sha1", + "iso_url": "http://releases.ubuntu.com/14.04/ubuntu-14.04.5-server-amd64.iso", + "output_directory": "packer-{{user `template`}}-hyperv", + "ram_size": "{{user `memory`}}", + "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_timeout": "10000s", + "ssh_username": "vagrant", + "switch_name": "{{user `hyperv_switch`}}", + "type": "hyperv-iso", + "vm_name": "{{ user `template` }}" } ], "post-processors": [ @@ -236,6 +271,7 @@ "scripts/common/virtualbox.sh", "scripts/common/vmware.sh", "scripts/common/parallels.sh", + "scripts/ubuntu/hyperv.sh", "scripts/ubuntu/cleanup.sh", "scripts/common/minimize.sh" ], @@ -251,10 +287,12 @@ "headless": "", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", + "hyperv_generation": "2", + "hyperv_switch": "{{env `hyperv_switch`}}", "iso_checksum": "946a6077af6f5f95a51f82fdc44051c7aa19f9cfc5f737954845a6050543d7c2", "iso_checksum_type": "sha256", "iso_name": "ubuntu-14.04.1-server-amd64.iso", - "memory": "512", + "memory": "1024", "metadata": "floppy/dummy_metadata.json", "mirror": "http://old-releases.ubuntu.com/releases", "mirror_directory": "14.04.1", diff --git a/ubuntu-16.04-amd64.json b/ubuntu-16.04-amd64.json old mode 100644 new mode 100755 index 2760d9723..1c5d68841 --- a/ubuntu-16.04-amd64.json +++ b/ubuntu-16.04-amd64.json @@ -213,6 +213,41 @@ "ssh_wait_timeout": "10000s", "type": "qemu", "vm_name": "{{ user `template` }}" + }, + { + "boot_command": [ + "<esc><wait10><esc><esc><enter><wait>", + "set gfxpayload=1024x768<enter>", + "linux /install/vmlinuz ", + "preseed/url=http://{{.HTTPIP}}:{{.HTTPPort}}/ubuntu/preseed-hyperv.cfg ", + "debian-installer=en_US auto locale=en_US kbd-chooser/method=us ", + "hostname={{.Name}} ", + "fb=false debconf/frontend=noninteractive ", + "keyboard-configuration/modelcode=SKIP keyboard-configuration/layout=USA ", + "keyboard-configuration/variant=USA console-setup/ask_detect=false <enter>", + "initrd /install/initrd.gz<enter>", + "boot<enter>" + ], + "boot_wait": "10s", + "communicator": "ssh", + "cpu": "{{ user `cpus` }}", + "disk_size": "{{user `disk_size`}}", + "enable_secure_boot": false, + "generation": "{{user `hyperv_generation`}}", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-hyperv", + "ram_size": "{{user `memory`}}", + "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_timeout": "10000s", + "ssh_username": "vagrant", + "switch_name": "{{user `hyperv_switch`}}", + "type": "hyperv-iso", + "vm_name": "{{ user `template` }}" } ], "post-processors": [ @@ -245,6 +280,7 @@ "scripts/common/virtualbox.sh", "scripts/ubuntu/vmware.sh", "scripts/common/parallels.sh", + "scripts/ubuntu/hyperv.sh", "scripts/ubuntu/cleanup.sh", "scripts/common/minimize.sh" ], @@ -260,16 +296,18 @@ "headless": "", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", - "iso_checksum": "29a8b9009509b39d542ecb229787cdf48f05e739a932289de9e9858d7c487c80", + "hyperv_generation": "2", + "hyperv_switch": "{{env `hyperv_switch`}}", + "iso_checksum": "737ae7041212c628de5751d15c3016058b0e833fdc32e7420209b76ca3d0a535", "iso_checksum_type": "sha256", - "iso_name": "ubuntu-16.04.1-server-amd64.iso", - "memory": "512", + "iso_name": "ubuntu-16.04.2-server-amd64.iso", + "memory": "2048", "metadata": "floppy/dummy_metadata.json", - "mirror": "http://old-releases.ubuntu.com/releases", - "mirror_directory": "16.04.1", + "mirror": "http://releases.ubuntu.com", + "mirror_directory": "16.04.2", "name": "ubuntu-16.04", "no_proxy": "{{env `no_proxy`}}", - "preseed_path": "ubuntu/preseed.cfg", + "preseed_path": "ubuntu/preseed-hyperv.cfg", "template": "ubuntu-16.04-amd64", "version": "2.1.TIMESTAMP" } diff --git a/ubuntu-17.04-amd64.json b/ubuntu-17.04-amd64.json index 33c611848..e904ed4c5 100644 --- a/ubuntu-17.04-amd64.json +++ b/ubuntu-17.04-amd64.json @@ -202,13 +202,48 @@ "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", "output_directory": "packer-{{user `template`}}-qemu", - "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", + "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", "type": "qemu", "vm_name": "{{ user `template` }}" + }, + { + "boot_command": [ + "<esc><wait10><esc><esc><enter><wait>", + "set gfxpayload=1024x768<enter>", + "linux /install/vmlinuz ", + "preseed/url=http://{{.HTTPIP}}:{{.HTTPPort}}/ubuntu/preseed-hyperv.cfg ", + "debian-installer=en_US auto locale=en_US kbd-chooser/method=us ", + "hostname={{.Name}} ", + "fb=false debconf/frontend=noninteractive ", + "keyboard-configuration/modelcode=SKIP keyboard-configuration/layout=USA ", + "keyboard-configuration/variant=USA console-setup/ask_detect=false <enter>", + "initrd /install/initrd.gz<enter>", + "boot<enter>" + ], + "boot_wait": "10s", + "communicator": "ssh", + "cpu": "{{ user `cpus` }}", + "disk_size": "{{user `disk_size`}}", + "enable_secure_boot": false, + "generation": "{{user `hyperv_generation`}}", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-hyperv", + "ram_size": "{{user `memory`}}", + "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_timeout": "10000s", + "ssh_username": "vagrant", + "switch_name": "{{user `hyperv_switch`}}", + "type": "hyperv-iso", + "vm_name": "{{ user `template` }}" } ], "post-processors": [ @@ -241,6 +276,7 @@ "scripts/common/virtualbox.sh", "scripts/ubuntu/vmware.sh", "scripts/common/parallels.sh", + "scripts/ubuntu/hyperv.sh", "scripts/ubuntu/cleanup.sh", "scripts/common/minimize.sh" ], @@ -256,6 +292,8 @@ "headless": "", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", + "hyperv_generation": "2", + "hyperv_switch": "{{env `hyperv_switch`}}", "iso_checksum": "ca5d9a8438e2434b9a3ac2be67b5c5fa2c1f8e3e40b954519462935195464034", "iso_checksum_type": "sha256", "iso_name": "ubuntu-17.04-server-amd64.iso", From d5f988732e207c0c86c1e44334bb164b8cf77836 Mon Sep 17 00:00:00 2001 From: Seth Thomas <sthomas@chef.io> Date: Tue, 11 Jul 2017 07:17:56 -0400 Subject: [PATCH 0649/1622] 1024 is the new 512 Signed-off-by: Seth Thomas <sthomas@chef.io> --- centos-5.11-i386.json | 2 +- centos-5.11-x86_64.json | 2 +- centos-6.9-i386.json | 2 +- centos-6.9-x86_64.json | 3 ++- centos-7.3-x86_64.json | 2 +- debian-7.11-amd64.json | 2 +- debian-7.11-i386.json | 2 +- debian-8.8-amd64.json | 2 +- debian-8.8-i386.json | 2 +- debian-9.0-amd64.json | 2 +- debian-9.0-i386.json | 2 +- fedora-24-i386.json | 2 +- fedora-24-x86_64.json | 2 +- fedora-25-i386.json | 2 +- fedora-25-x86_64.json | 2 +- freebsd-10.3-amd64.json | 2 +- freebsd-10.3-i386.json | 2 +- freebsd-11.0-amd64.json | 2 +- oracle-5.11-i386.json | 2 +- oracle-5.11-x86_64.json | 2 +- oracle-6.9-i386.json | 2 +- oracle-6.9-x86_64.json | 2 +- oracle-7.3-x86_64.json | 2 +- rhel-5.11-i386.json | 2 +- rhel-5.11-x86_64.json | 2 +- rhel-6.9-i386.json | 2 +- rhel-6.9-x86_64.json | 2 +- rhel-7.3-x86_64.json | 2 +- ubuntu-14.04-i386.json | 2 +- ubuntu-16.04-amd64.json | 2 +- ubuntu-16.04-i386.json | 2 +- ubuntu-17.04-amd64.json | 2 +- ubuntu-17.04-i386.json | 2 +- 33 files changed, 34 insertions(+), 33 deletions(-) diff --git a/centos-5.11-i386.json b/centos-5.11-i386.json index 0f5cbf318..7b1dbb1ef 100644 --- a/centos-5.11-i386.json +++ b/centos-5.11-i386.json @@ -169,7 +169,7 @@ "iso_checksum_type": "sha256", "iso_name": "CentOS-5.11-i386-bin-DVD-1of2.iso", "ks_path": "centos-5.11/ks.cfg", - "memory": "512", + "memory": "1024", "metadata": "floppy/dummy_metadata.json", "mirror": "http://mirrors.kernel.org/centos", "mirror_directory": "5.11/isos/i386", diff --git a/centos-5.11-x86_64.json b/centos-5.11-x86_64.json index 54a623efb..985eb8431 100644 --- a/centos-5.11-x86_64.json +++ b/centos-5.11-x86_64.json @@ -175,7 +175,7 @@ "iso_checksum_type": "sha256", "iso_name": "CentOS-5.11-x86_64-bin-DVD-1of2.iso", "ks_path": "centos-5.11/ks.cfg", - "memory": "512", + "memory": "1024", "metadata": "floppy/dummy_metadata.json", "mirror": "http://mirrors.kernel.org/centos", "mirror_directory": "5.11/isos/x86_64", diff --git a/centos-6.9-i386.json b/centos-6.9-i386.json index 1cde75142..0a7215fcd 100644 --- a/centos-6.9-i386.json +++ b/centos-6.9-i386.json @@ -197,7 +197,7 @@ "iso_checksum_type": "sha256", "iso_name": "CentOS-6.9-i386-bin-DVD1.iso", "ks_path": "centos-6.9/ks.cfg", - "memory": "512", + "memory": "1024", "metadata": "floppy/dummy_metadata.json", "mirror": "http://mirrors.kernel.org/centos", "mirror_directory": "6.9/isos/i386", diff --git a/centos-6.9-x86_64.json b/centos-6.9-x86_64.json index 032f19ee0..b950c4bc8 100644 --- a/centos-6.9-x86_64.json +++ b/centos-6.9-x86_64.json @@ -197,7 +197,7 @@ "iso_checksum_type": "sha256", "iso_name": "CentOS-6.9-x86_64-bin-DVD1.iso", "ks_path": "centos-6.9/ks.cfg", - "memory": "512", + "memory": "1024", "metadata": "floppy/dummy_metadata.json", "mirror": "http://mirrors.kernel.org/centos", "mirror_directory": "6.9/isos/x86_64", @@ -207,3 +207,4 @@ "version": "2.1.TIMESTAMP" } } + diff --git a/centos-7.3-x86_64.json b/centos-7.3-x86_64.json index a9f2f57e7..a3946e63d 100644 --- a/centos-7.3-x86_64.json +++ b/centos-7.3-x86_64.json @@ -198,7 +198,7 @@ "iso_checksum_type": "sha256", "iso_name": "CentOS-7-x86_64-DVD-1611.iso", "ks_path": "centos-7.3/ks.cfg", - "memory": "512", + "memory": "1024", "metadata": "floppy/dummy_metadata.json", "mirror": "http://mirrors.kernel.org/centos", "mirror_directory": "7.3.1611/isos/x86_64", diff --git a/debian-7.11-amd64.json b/debian-7.11-amd64.json index 1ab8f8012..67d355aa8 100644 --- a/debian-7.11-amd64.json +++ b/debian-7.11-amd64.json @@ -226,7 +226,7 @@ "iso_checksum": "cbae9d679dbe2d37828a5abb9d3ea8c40183972952180843d8b07f7b33e09877", "iso_checksum_type": "sha256", "iso_name": "debian-7.11.0-amd64-CD-1.iso", - "memory": "512", + "memory": "1024", "metadata": "floppy/dummy_metadata.json", "mirror": "http://cdimage.debian.org/cdimage/archive", "mirror_directory": "7.11.0/amd64/iso-cd", diff --git a/debian-7.11-i386.json b/debian-7.11-i386.json index 89f7b154a..ddc0f9ffd 100644 --- a/debian-7.11-i386.json +++ b/debian-7.11-i386.json @@ -226,7 +226,7 @@ "iso_checksum": "9486d582a9d6cbce3e68dd8f8734425bea02dba9da5c484028e3c7f52ad28845", "iso_checksum_type": "sha256", "iso_name": "debian-7.11.0-i386-CD-1.iso", - "memory": "512", + "memory": "1024", "metadata": "floppy/dummy_metadata.json", "mirror": "http://cdimage.debian.org/cdimage/archive", "mirror_directory": "7.11.0/i386/iso-cd", diff --git a/debian-8.8-amd64.json b/debian-8.8-amd64.json index 212eed1c1..ec5d59382 100644 --- a/debian-8.8-amd64.json +++ b/debian-8.8-amd64.json @@ -232,7 +232,7 @@ "iso_checksum": "673079527fdf3a91e8bfc9e0312f94316820ca795bb6a1b2af1e8461eb78179c", "iso_checksum_type": "sha256", "iso_name": "debian-8.8.0-amd64-CD-1.iso", - "memory": "512", + "memory": "1024", "metadata": "floppy/dummy_metadata.json", "mirror": "http://cdimage.debian.org/cdimage/archive", "mirror_directory": "8.8.0/amd64/iso-cd", diff --git a/debian-8.8-i386.json b/debian-8.8-i386.json index 3d159cff6..fa131f593 100644 --- a/debian-8.8-i386.json +++ b/debian-8.8-i386.json @@ -232,7 +232,7 @@ "iso_checksum": "0834db8a6c6eab749be5d25b0451fa46ea96dfb91134df8f26323ff8b79b01ca", "iso_checksum_type": "sha256", "iso_name": "debian-8.8.0-i386-CD-1.iso", - "memory": "512", + "memory": "1024", "metadata": "floppy/dummy_metadata.json", "mirror": "http://cdimage.debian.org/cdimage/archive", "mirror_directory": "8.8.0/i386/iso-cd", diff --git a/debian-9.0-amd64.json b/debian-9.0-amd64.json index b867f0c7a..7ac44cdc5 100644 --- a/debian-9.0-amd64.json +++ b/debian-9.0-amd64.json @@ -232,7 +232,7 @@ "iso_checksum": "9d98f339016dc2a3998881949a8f0678baede26b5106f18ef1168d7e13606773", "iso_checksum_type": "sha256", "iso_name": "debian-9.0.0-amd64-netinst.iso", - "memory": "512", + "memory": "1024", "metadata": "floppy/dummy_metadata.json", "mirror": "http://cdimage.debian.org/cdimage/release", "mirror_directory": "9.0.0/amd64/iso-cd", diff --git a/debian-9.0-i386.json b/debian-9.0-i386.json index aa82095b7..5fddfabb9 100644 --- a/debian-9.0-i386.json +++ b/debian-9.0-i386.json @@ -232,7 +232,7 @@ "iso_checksum": "3bf78f7b003203a6b771b05fa1790e74ee3ea15d6245a01683f90c02b95c0315", "iso_checksum_type": "sha256", "iso_name": "debian-9.0.0-i386-netinst.iso", - "memory": "512", + "memory": "1024", "metadata": "floppy/dummy_metadata.json", "mirror": "http://cdimage.debian.org/cdimage/release", "mirror_directory": "9.0.0/i386/iso-cd", diff --git a/fedora-24-i386.json b/fedora-24-i386.json index 4cfa14f32..081855f4d 100644 --- a/fedora-24-i386.json +++ b/fedora-24-i386.json @@ -167,7 +167,7 @@ "iso_checksum_type": "sha256", "iso_name": "Fedora-Server-dvd-i386-24-1.2.iso", "ks_path": "fedora/ks.cfg", - "memory": "512", + "memory": "1024", "metadata": "floppy/dummy_metadata.json", "mirror": "http://download.fedoraproject.org/pub/fedora/linux", "mirror_directory": "releases/24/Server/i386/iso", diff --git a/fedora-24-x86_64.json b/fedora-24-x86_64.json index e56910be4..93bf64809 100644 --- a/fedora-24-x86_64.json +++ b/fedora-24-x86_64.json @@ -173,7 +173,7 @@ "iso_checksum_type": "sha256", "iso_name": "Fedora-Server-dvd-x86_64-24-1.2.iso", "ks_path": "fedora/ks.cfg", - "memory": "512", + "memory": "1024", "metadata": "floppy/dummy_metadata.json", "mirror": "http://download.fedoraproject.org/pub/fedora/linux", "mirror_directory": "releases/24/Server/x86_64/iso", diff --git a/fedora-25-i386.json b/fedora-25-i386.json index 435a1eb09..60fe0efbd 100644 --- a/fedora-25-i386.json +++ b/fedora-25-i386.json @@ -167,7 +167,7 @@ "iso_checksum_type": "sha256", "iso_name": "Fedora-Server-dvd-i386-25-1.3.iso", "ks_path": "fedora/ks.cfg", - "memory": "512", + "memory": "1024", "metadata": "floppy/dummy_metadata.json", "mirror": "http://download.fedoraproject.org/pub/fedora/linux", "mirror_directory": "releases/25/Server/i386/iso", diff --git a/fedora-25-x86_64.json b/fedora-25-x86_64.json index d36e9fd9d..4d2000d11 100644 --- a/fedora-25-x86_64.json +++ b/fedora-25-x86_64.json @@ -173,7 +173,7 @@ "iso_checksum_type": "sha256", "iso_name": "Fedora-Server-dvd-x86_64-25-1.3.iso", "ks_path": "fedora/ks.cfg", - "memory": "512", + "memory": "1024", "metadata": "floppy/dummy_metadata.json", "mirror": "http://download.fedoraproject.org/pub/fedora/linux", "mirror_directory": "releases/25/Server/x86_64/iso", diff --git a/freebsd-10.3-amd64.json b/freebsd-10.3-amd64.json index 167b20b48..56d13316f 100644 --- a/freebsd-10.3-amd64.json +++ b/freebsd-10.3-amd64.json @@ -221,7 +221,7 @@ "iso_checksum": "fef068cf6dea26923ab84b62ba9f21461ca0bdec90a0741c8ffb0e1ca29e410d", "iso_checksum_type": "sha256", "iso_name": "FreeBSD-10.3-RELEASE-amd64-disc1.iso", - "memory": "512", + "memory": "1024", "metadata": "floppy/dummy_metadata.json", "mirror": "http://ftp.freebsd.org/pub/FreeBSD", "mirror_directory": "releases/amd64/amd64/ISO-IMAGES/10.3", diff --git a/freebsd-10.3-i386.json b/freebsd-10.3-i386.json index 004de5eb5..5468e9f0f 100644 --- a/freebsd-10.3-i386.json +++ b/freebsd-10.3-i386.json @@ -221,7 +221,7 @@ "iso_checksum": "8329ee2ca4779892edbb001c303670d74642e4353e97d02f4521895023cacd5d", "iso_checksum_type": "sha256", "iso_name": "FreeBSD-10.3-RELEASE-i386-disc1.iso", - "memory": "512", + "memory": "1024", "metadata": "floppy/dummy_metadata.json", "mirror": "http://ftp.freebsd.org/pub/FreeBSD", "mirror_directory": "releases/i386/i386/ISO-IMAGES/10.3", diff --git a/freebsd-11.0-amd64.json b/freebsd-11.0-amd64.json index 5b71010f9..7f55fbf22 100644 --- a/freebsd-11.0-amd64.json +++ b/freebsd-11.0-amd64.json @@ -221,7 +221,7 @@ "iso_checksum": "08b12f2dc378f7a61b5469219824c74a2f9faef580acc85ffab45365df79872d", "iso_checksum_type": "sha256", "iso_name": "FreeBSD-11.0-RELEASE-amd64-disc1.iso", - "memory": "512", + "memory": "1024", "metadata": "floppy/dummy_metadata.json", "mirror": "http://ftp.freebsd.org/pub/FreeBSD", "mirror_directory": "releases/amd64/amd64/ISO-IMAGES/11.0", diff --git a/oracle-5.11-i386.json b/oracle-5.11-i386.json index 948307ac6..5217892a6 100644 --- a/oracle-5.11-i386.json +++ b/oracle-5.11-i386.json @@ -169,7 +169,7 @@ "iso_checksum_type": "sha1", "iso_name": "Enterprise-R5-U11-Server-i386-dvd.iso", "ks_path": "centos-5.11/ks.cfg", - "memory": "512", + "memory": "1024", "metadata": "floppy/dummy_metadata.json", "mirror": "http://mirrors.dotsrc.org/oracle-linux", "mirror_directory": "EL5/U11/i386", diff --git a/oracle-5.11-x86_64.json b/oracle-5.11-x86_64.json index 6d329deca..dd9bcea37 100644 --- a/oracle-5.11-x86_64.json +++ b/oracle-5.11-x86_64.json @@ -175,7 +175,7 @@ "iso_checksum_type": "sha1", "iso_name": "Enterprise-R5-U11-Server-x86_64-dvd.iso", "ks_path": "centos-5.11/ks.cfg", - "memory": "512", + "memory": "1024", "metadata": "floppy/dummy_metadata.json", "mirror": "http://mirrors.dotsrc.org/oracle-linux", "mirror_directory": "EL5/U11/x86_64", diff --git a/oracle-6.9-i386.json b/oracle-6.9-i386.json index 6a9d10737..4a5283a24 100644 --- a/oracle-6.9-i386.json +++ b/oracle-6.9-i386.json @@ -170,7 +170,7 @@ "iso_checksum_type": "sha256", "iso_name": "OracleLinux-R6-U9-Server-i386-dvd.iso", "ks_path": "centos-6.9/ks.cfg", - "memory": "512", + "memory": "1024", "metadata": "floppy/dummy_metadata.json", "mirror": "http://mirrors.kernel.org/oracle/", "mirror_directory": "OL6/U9/i386", diff --git a/oracle-6.9-x86_64.json b/oracle-6.9-x86_64.json index df2a56581..3c38c54a8 100644 --- a/oracle-6.9-x86_64.json +++ b/oracle-6.9-x86_64.json @@ -170,7 +170,7 @@ "iso_checksum_type": "sha256", "iso_name": "OracleLinux-R6-U9-Server-x86_64-dvd.iso", "ks_path": "centos-6.9/ks.cfg", - "memory": "512", + "memory": "1024", "metadata": "floppy/dummy_metadata.json", "mirror": "http://mirrors.kernel.org/oracle/", "mirror_directory": "OL6/U9/x86_64", diff --git a/oracle-7.3-x86_64.json b/oracle-7.3-x86_64.json index 9fccd42f1..4e32cff8a 100644 --- a/oracle-7.3-x86_64.json +++ b/oracle-7.3-x86_64.json @@ -170,7 +170,7 @@ "iso_checksum_type": "sha256", "iso_name": "OracleLinux-R7-U3-Server-x86_64-dvd.iso", "ks_path": "centos-7.3/ks.cfg", - "memory": "512", + "memory": "1024", "metadata": "floppy/dummy_metadata.json", "mirror": "http://mirrors.dotsrc.org/oracle-linux", "mirror_directory": "OL7/u3/x86_64", diff --git a/rhel-5.11-i386.json b/rhel-5.11-i386.json index 9de1b76f6..03b6121df 100644 --- a/rhel-5.11-i386.json +++ b/rhel-5.11-i386.json @@ -169,7 +169,7 @@ "iso_checksum_type": "sha256", "iso_name": "rhel-server-5.11-i386-dvd.iso", "ks_path": "centos-5.11/ks.cfg", - "memory": "512", + "memory": "1024", "metadata": "floppy/dummy_metadata.json", "mirror": "http://YOU-MUST-PROVIDE-YOUR-OWN-ISO.sorry", "mirror_directory": "rhel", diff --git a/rhel-5.11-x86_64.json b/rhel-5.11-x86_64.json index 2bd05e2a2..0846d1455 100644 --- a/rhel-5.11-x86_64.json +++ b/rhel-5.11-x86_64.json @@ -175,7 +175,7 @@ "iso_checksum_type": "sha256", "iso_name": "rhel-server-5.11-x86_64-dvd.iso", "ks_path": "centos-5.11/ks.cfg", - "memory": "512", + "memory": "1024", "metadata": "floppy/dummy_metadata.json", "mirror": "http://YOU-MUST-PROVIDE-YOUR-OWN-ISO.sorry", "mirror_directory": "rhel", diff --git a/rhel-6.9-i386.json b/rhel-6.9-i386.json index 795437ab0..7cc84f3e1 100644 --- a/rhel-6.9-i386.json +++ b/rhel-6.9-i386.json @@ -170,7 +170,7 @@ "iso_checksum_type": "sha256", "iso_name": "rhel-server-6.9-i386-dvd.iso", "ks_path": "centos-6.9/ks.cfg", - "memory": "512", + "memory": "1024", "metadata": "floppy/dummy_metadata.json", "mirror": "http://YOU-MUST-PROVIDE-YOUR-OWN-ISO.sorry", "mirror_directory": "rhel", diff --git a/rhel-6.9-x86_64.json b/rhel-6.9-x86_64.json index 8bd3dae64..2b2a985ee 100644 --- a/rhel-6.9-x86_64.json +++ b/rhel-6.9-x86_64.json @@ -170,7 +170,7 @@ "iso_checksum_type": "sha256", "iso_name": "rhel-server-6.9-x86_64-dvd.iso", "ks_path": "centos-6.9/ks.cfg", - "memory": "512", + "memory": "1024", "metadata": "floppy/dummy_metadata.json", "mirror": "http://YOU-MUST-PROVIDE-YOUR-OWN-ISO.sorry", "mirror_directory": "rhel", diff --git a/rhel-7.3-x86_64.json b/rhel-7.3-x86_64.json index f4f4c9138..593236bf4 100644 --- a/rhel-7.3-x86_64.json +++ b/rhel-7.3-x86_64.json @@ -170,7 +170,7 @@ "iso_checksum_type": "sha256", "iso_name": "rhel-server-7.3-x86_64-dvd.iso", "ks_path": "centos-7.3/ks.cfg", - "memory": "512", + "memory": "1024", "metadata": "floppy/dummy_metadata.json", "mirror": "http://YOU-MUST-PROVIDE-YOUR-OWN-ISO.sorry", "mirror_directory": "rhel", diff --git a/ubuntu-14.04-i386.json b/ubuntu-14.04-i386.json index 76ada00b4..5026e12e2 100644 --- a/ubuntu-14.04-i386.json +++ b/ubuntu-14.04-i386.json @@ -254,7 +254,7 @@ "iso_checksum": "976044842804eafc18390505508958b559c131211160ecae5e60694bdf171f78", "iso_checksum_type": "sha256", "iso_name": "ubuntu-14.04.1-server-i386.iso", - "memory": "512", + "memory": "1024", "metadata": "floppy/dummy_metadata.json", "mirror": "http://old-releases.ubuntu.com/releases", "mirror_directory": "14.04.1", diff --git a/ubuntu-16.04-amd64.json b/ubuntu-16.04-amd64.json index 1c5d68841..432e88bdf 100755 --- a/ubuntu-16.04-amd64.json +++ b/ubuntu-16.04-amd64.json @@ -301,7 +301,7 @@ "iso_checksum": "737ae7041212c628de5751d15c3016058b0e833fdc32e7420209b76ca3d0a535", "iso_checksum_type": "sha256", "iso_name": "ubuntu-16.04.2-server-amd64.iso", - "memory": "2048", + "memory": "1024", "metadata": "floppy/dummy_metadata.json", "mirror": "http://releases.ubuntu.com", "mirror_directory": "16.04.2", diff --git a/ubuntu-16.04-i386.json b/ubuntu-16.04-i386.json index 76579a3c7..3a5675cf7 100644 --- a/ubuntu-16.04-i386.json +++ b/ubuntu-16.04-i386.json @@ -263,7 +263,7 @@ "iso_checksum": "62fc3e810c7631fbbd45d9c960ec749fc1eb66e5c56039423e3e94a5391a437a", "iso_checksum_type": "sha256", "iso_name": "ubuntu-16.04.1-server-i386.iso", - "memory": "512", + "memory": "1024", "metadata": "floppy/dummy_metadata.json", "mirror": "http://old-releases.ubuntu.com/releases", "mirror_directory": "16.04.1", diff --git a/ubuntu-17.04-amd64.json b/ubuntu-17.04-amd64.json index e904ed4c5..0aea7f2d8 100644 --- a/ubuntu-17.04-amd64.json +++ b/ubuntu-17.04-amd64.json @@ -297,7 +297,7 @@ "iso_checksum": "ca5d9a8438e2434b9a3ac2be67b5c5fa2c1f8e3e40b954519462935195464034", "iso_checksum_type": "sha256", "iso_name": "ubuntu-17.04-server-amd64.iso", - "memory": "512", + "memory": "1024", "metadata": "floppy/dummy_metadata.json", "mirror": "http://releases.ubuntu.com", "mirror_directory": "17.04", diff --git a/ubuntu-17.04-i386.json b/ubuntu-17.04-i386.json index 17dda0e58..e2b41f33d 100644 --- a/ubuntu-17.04-i386.json +++ b/ubuntu-17.04-i386.json @@ -259,7 +259,7 @@ "iso_checksum": "dd7879be4e2f9f31672f6e7681ecafeccfac294afd8ca1b04b78bc37fb44291c", "iso_checksum_type": "sha256", "iso_name": "ubuntu-17.04-server-i386.iso", - "memory": "512", + "memory": "1024", "metadata": "floppy/dummy_metadata.json", "mirror": "http://releases.ubuntu.com", "mirror_directory": "17.04", From 8cc4cf0568db2f8bd75764ab704b62944c3bbff9 Mon Sep 17 00:00:00 2001 From: Seth Thomas <sthomas@chef.io> Date: Tue, 11 Jul 2017 07:47:28 -0400 Subject: [PATCH 0650/1622] Aligning this since the values were meaningless Signed-off-by: Seth Thomas <sthomas@chef.io> --- centos-5.11-i386.json | 2 +- centos-5.11-x86_64.json | 2 +- centos-6.9-i386.json | 2 +- centos-6.9-x86_64.json | 2 +- centos-7.3-x86_64.json | 2 +- debian-7.11-amd64.json | 2 +- debian-7.11-i386.json | 2 +- debian-8.8-amd64.json | 2 +- debian-8.8-i386.json | 2 +- debian-9.0-amd64.json | 2 +- debian-9.0-i386.json | 2 +- fedora-24-i386.json | 2 +- fedora-24-x86_64.json | 2 +- fedora-25-i386.json | 2 +- fedora-25-x86_64.json | 2 +- freebsd-10.3-amd64.json | 2 +- freebsd-10.3-i386.json | 2 +- freebsd-11.0-amd64.json | 2 +- macos-10.12.json | 2 +- macosx-10.10.json | 2 +- macosx-10.11.json | 2 +- macosx-10.9.json | 2 +- opensuse-leap-42.2-x86_64.json | 2 +- oracle-5.11-i386.json | 2 +- oracle-5.11-x86_64.json | 2 +- oracle-6.9-i386.json | 2 +- oracle-6.9-x86_64.json | 2 +- oracle-7.3-x86_64.json | 2 +- rhel-5.11-i386.json | 2 +- rhel-5.11-x86_64.json | 2 +- rhel-6.9-i386.json | 2 +- rhel-6.9-x86_64.json | 2 +- rhel-7.3-x86_64.json | 2 +- sles-12-sp2-x86_64.json | 2 +- solaris-10.11-x86.json | 2 +- solaris-11-x86.json | 2 +- ubuntu-14.04-amd64.json | 2 +- ubuntu-14.04-i386.json | 2 +- ubuntu-16.04-amd64.json | 2 +- ubuntu-16.04-i386.json | 2 +- ubuntu-17.04-amd64.json | 2 +- ubuntu-17.04-i386.json | 2 +- 42 files changed, 42 insertions(+), 42 deletions(-) diff --git a/centos-5.11-i386.json b/centos-5.11-i386.json index 7b1dbb1ef..a0eac6c42 100644 --- a/centos-5.11-i386.json +++ b/centos-5.11-i386.json @@ -176,7 +176,7 @@ "name": "centos-5.11-i386", "no_proxy": "{{env `no_proxy`}}", "template": "centos-5.11-i386", - "version": "2.1.TIMESTAMP" + "version": "TIMESTAMP" } } diff --git a/centos-5.11-x86_64.json b/centos-5.11-x86_64.json index 985eb8431..dd31f8c24 100644 --- a/centos-5.11-x86_64.json +++ b/centos-5.11-x86_64.json @@ -182,7 +182,7 @@ "name": "centos-5.11", "no_proxy": "{{env `no_proxy`}}", "template": "centos-5.11-x86_64", - "version": "2.1.TIMESTAMP" + "version": "TIMESTAMP" } } diff --git a/centos-6.9-i386.json b/centos-6.9-i386.json index 0a7215fcd..fb0646516 100644 --- a/centos-6.9-i386.json +++ b/centos-6.9-i386.json @@ -204,7 +204,7 @@ "name": "centos-6.9-i386", "no_proxy": "{{env `no_proxy`}}", "template": "centos-6.9-i386", - "version": "2.1.TIMESTAMP" + "version": "TIMESTAMP" } } diff --git a/centos-6.9-x86_64.json b/centos-6.9-x86_64.json index b950c4bc8..ef3edfe08 100644 --- a/centos-6.9-x86_64.json +++ b/centos-6.9-x86_64.json @@ -204,7 +204,7 @@ "name": "centos-6.9", "no_proxy": "{{env `no_proxy`}}", "template": "centos-6.9-x86_64", - "version": "2.1.TIMESTAMP" + "version": "TIMESTAMP" } } diff --git a/centos-7.3-x86_64.json b/centos-7.3-x86_64.json index a3946e63d..0ab229589 100644 --- a/centos-7.3-x86_64.json +++ b/centos-7.3-x86_64.json @@ -205,7 +205,7 @@ "name": "centos-7.3", "no_proxy": "{{env `no_proxy`}}", "template": "centos-7.3-x86_64", - "version": "2.1.TIMESTAMP" + "version": "TIMESTAMP" } } diff --git a/debian-7.11-amd64.json b/debian-7.11-amd64.json index 67d355aa8..d4c250715 100644 --- a/debian-7.11-amd64.json +++ b/debian-7.11-amd64.json @@ -234,7 +234,7 @@ "no_proxy": "{{env `no_proxy`}}", "preseed_path": "debian-7/preseed.cfg", "template": "debian-7.11-amd64", - "version": "2.1.TIMESTAMP" + "version": "TIMESTAMP" } } diff --git a/debian-7.11-i386.json b/debian-7.11-i386.json index ddc0f9ffd..a57c5b974 100644 --- a/debian-7.11-i386.json +++ b/debian-7.11-i386.json @@ -234,7 +234,7 @@ "no_proxy": "{{env `no_proxy`}}", "preseed_path": "debian-7/preseed.cfg", "template": "debian-7.11-i386", - "version": "2.1.TIMESTAMP" + "version": "TIMESTAMP" } } diff --git a/debian-8.8-amd64.json b/debian-8.8-amd64.json index ec5d59382..78d905699 100644 --- a/debian-8.8-amd64.json +++ b/debian-8.8-amd64.json @@ -240,7 +240,7 @@ "no_proxy": "{{env `no_proxy`}}", "preseed_path": "debian-8/preseed.cfg", "template": "debian-8.8-amd64", - "version": "2.1.TIMESTAMP" + "version": "TIMESTAMP" } } diff --git a/debian-8.8-i386.json b/debian-8.8-i386.json index fa131f593..c72e472b6 100644 --- a/debian-8.8-i386.json +++ b/debian-8.8-i386.json @@ -240,7 +240,7 @@ "no_proxy": "{{env `no_proxy`}}", "preseed_path": "debian-8/preseed.cfg", "template": "debian-8.8-i386", - "version": "2.1.TIMESTAMP" + "version": "TIMESTAMP" } } diff --git a/debian-9.0-amd64.json b/debian-9.0-amd64.json index 7ac44cdc5..eedae18ef 100644 --- a/debian-9.0-amd64.json +++ b/debian-9.0-amd64.json @@ -240,7 +240,7 @@ "no_proxy": "{{env `no_proxy`}}", "preseed_path": "debian-8/preseed.cfg", "template": "debian-9.0-amd64", - "version": "2.1.TIMESTAMP" + "version": "TIMESTAMP" } } diff --git a/debian-9.0-i386.json b/debian-9.0-i386.json index 5fddfabb9..b4c56f05b 100644 --- a/debian-9.0-i386.json +++ b/debian-9.0-i386.json @@ -240,7 +240,7 @@ "no_proxy": "{{env `no_proxy`}}", "preseed_path": "debian-8/preseed.cfg", "template": "debian-9.0-i386", - "version": "2.1.TIMESTAMP" + "version": "TIMESTAMP" } } diff --git a/fedora-24-i386.json b/fedora-24-i386.json index 081855f4d..fe9f0f293 100644 --- a/fedora-24-i386.json +++ b/fedora-24-i386.json @@ -174,7 +174,7 @@ "name": "fedora-24-i386", "no_proxy": "{{env `no_proxy`}}", "template": "fedora-24-i386", - "version": "2.0.TIMESTAMP" + "version": "TIMESTAMP" } } diff --git a/fedora-24-x86_64.json b/fedora-24-x86_64.json index 93bf64809..7280df9c1 100644 --- a/fedora-24-x86_64.json +++ b/fedora-24-x86_64.json @@ -180,7 +180,7 @@ "name": "fedora-24", "no_proxy": "{{env `no_proxy`}}", "template": "fedora-24-x86_64", - "version": "2.0.TIMESTAMP" + "version": "TIMESTAMP" } } diff --git a/fedora-25-i386.json b/fedora-25-i386.json index 60fe0efbd..14c3e619d 100644 --- a/fedora-25-i386.json +++ b/fedora-25-i386.json @@ -174,7 +174,7 @@ "name": "fedora-25-i386", "no_proxy": "{{env `no_proxy`}}", "template": "fedora-25-i386", - "version": "2.0.TIMESTAMP" + "version": "TIMESTAMP" } } diff --git a/fedora-25-x86_64.json b/fedora-25-x86_64.json index 4d2000d11..9be3eee71 100644 --- a/fedora-25-x86_64.json +++ b/fedora-25-x86_64.json @@ -180,7 +180,7 @@ "name": "fedora-25", "no_proxy": "{{env `no_proxy`}}", "template": "fedora-25-x86_64", - "version": "2.0.TIMESTAMP" + "version": "TIMESTAMP" } } diff --git a/freebsd-10.3-amd64.json b/freebsd-10.3-amd64.json index 56d13316f..25c13e073 100644 --- a/freebsd-10.3-amd64.json +++ b/freebsd-10.3-amd64.json @@ -228,7 +228,7 @@ "name": "freebsd-10.3", "no_proxy": "{{env `no_proxy`}}", "template": "freebsd-10.3-amd64", - "version": "2.1.TIMESTAMP" + "version": "TIMESTAMP" } } diff --git a/freebsd-10.3-i386.json b/freebsd-10.3-i386.json index 5468e9f0f..625bfaa52 100644 --- a/freebsd-10.3-i386.json +++ b/freebsd-10.3-i386.json @@ -228,7 +228,7 @@ "name": "freebsd-10.3-i386", "no_proxy": "{{env `no_proxy`}}", "template": "freebsd-10.3-i386", - "version": "2.1.TIMESTAMP" + "version": "TIMESTAMP" } } diff --git a/freebsd-11.0-amd64.json b/freebsd-11.0-amd64.json index 7f55fbf22..f3ef41edf 100644 --- a/freebsd-11.0-amd64.json +++ b/freebsd-11.0-amd64.json @@ -228,7 +228,7 @@ "name": "freebsd-11.0", "no_proxy": "{{env `no_proxy`}}", "template": "freebsd-11.0-amd64", - "version": "2.1.TIMESTAMP" + "version": "TIMESTAMP" } } diff --git a/macos-10.12.json b/macos-10.12.json index da4b0e8d5..10ac3ef22 100644 --- a/macos-10.12.json +++ b/macos-10.12.json @@ -244,7 +244,7 @@ "name": "macos-10.12", "no_proxy": "{{env `no_proxy`}}", "template": "macos-10.12", - "version": "2.1.TIMESTAMP" + "version": "TIMESTAMP" } } diff --git a/macosx-10.10.json b/macosx-10.10.json index beb1fbd83..769df987c 100644 --- a/macosx-10.10.json +++ b/macosx-10.10.json @@ -244,7 +244,7 @@ "name": "macosx-10.10", "no_proxy": "{{env `no_proxy`}}", "template": "macosx-10.10", - "version": "2.1.TIMESTAMP" + "version": "TIMESTAMP" } } diff --git a/macosx-10.11.json b/macosx-10.11.json index e495f2c97..aec226ef1 100644 --- a/macosx-10.11.json +++ b/macosx-10.11.json @@ -244,7 +244,7 @@ "name": "macosx-10.11", "no_proxy": "{{env `no_proxy`}}", "template": "macosx-10.11", - "version": "2.1.TIMESTAMP" + "version": "TIMESTAMP" } } diff --git a/macosx-10.9.json b/macosx-10.9.json index cfd7df0af..683ce5319 100644 --- a/macosx-10.9.json +++ b/macosx-10.9.json @@ -244,7 +244,7 @@ "name": "macosx-10.9", "no_proxy": "{{env `no_proxy`}}", "template": "macosx-10.9", - "version": "2.1.TIMESTAMP" + "version": "TIMESTAMP" } } diff --git a/opensuse-leap-42.2-x86_64.json b/opensuse-leap-42.2-x86_64.json index 522f2b0b5..080c8ea22 100644 --- a/opensuse-leap-42.2-x86_64.json +++ b/opensuse-leap-42.2-x86_64.json @@ -195,7 +195,7 @@ "name": "opensuse-leap-42.2", "no_proxy": "{{env `no_proxy`}}", "template": "opensuse-leap-42.2-x86_64", - "version": "2.0.TIMESTAMP" + "version": "TIMESTAMP" } } diff --git a/oracle-5.11-i386.json b/oracle-5.11-i386.json index 5217892a6..f89e73d7a 100644 --- a/oracle-5.11-i386.json +++ b/oracle-5.11-i386.json @@ -176,7 +176,7 @@ "name": "oracle-5.11-i386", "no_proxy": "{{env `no_proxy`}}", "template": "oracle-5.11-i386", - "version": "2.2.TIMESTAMP" + "version": "TIMESTAMP" } } diff --git a/oracle-5.11-x86_64.json b/oracle-5.11-x86_64.json index dd9bcea37..9f315bec5 100644 --- a/oracle-5.11-x86_64.json +++ b/oracle-5.11-x86_64.json @@ -182,7 +182,7 @@ "name": "oracle-5.11", "no_proxy": "{{env `no_proxy`}}", "template": "oracle-5.11-x86_64", - "version": "2.2.TIMESTAMP" + "version": "TIMESTAMP" } } diff --git a/oracle-6.9-i386.json b/oracle-6.9-i386.json index 4a5283a24..1ce194de0 100644 --- a/oracle-6.9-i386.json +++ b/oracle-6.9-i386.json @@ -177,7 +177,7 @@ "name": "oracle-6.9-i386", "no_proxy": "{{env `no_proxy`}}", "template": "oracle-6.9-i386", - "version": "2.2.TIMESTAMP" + "version": "TIMESTAMP" } } diff --git a/oracle-6.9-x86_64.json b/oracle-6.9-x86_64.json index 3c38c54a8..621ae5e90 100644 --- a/oracle-6.9-x86_64.json +++ b/oracle-6.9-x86_64.json @@ -177,7 +177,7 @@ "name": "oracle-6.9", "no_proxy": "{{env `no_proxy`}}", "template": "oracle-6.9-x86_64", - "version": "2.2.TIMESTAMP" + "version": "TIMESTAMP" } } diff --git a/oracle-7.3-x86_64.json b/oracle-7.3-x86_64.json index 4e32cff8a..64e364555 100644 --- a/oracle-7.3-x86_64.json +++ b/oracle-7.3-x86_64.json @@ -177,7 +177,7 @@ "name": "oracle-7.3", "no_proxy": "{{env `no_proxy`}}", "template": "oracle-7.3-x86_64", - "version": "2.2.TIMESTAMP" + "version": "TIMESTAMP" } } diff --git a/rhel-5.11-i386.json b/rhel-5.11-i386.json index 03b6121df..911192e7f 100644 --- a/rhel-5.11-i386.json +++ b/rhel-5.11-i386.json @@ -176,7 +176,7 @@ "name": "rhel-5.11-i386", "no_proxy": "{{env `no_proxy`}}", "template": "rhel-5.11-i386", - "version": "2.2.TIMESTAMP" + "version": "TIMESTAMP" } } diff --git a/rhel-5.11-x86_64.json b/rhel-5.11-x86_64.json index 0846d1455..f26118abb 100644 --- a/rhel-5.11-x86_64.json +++ b/rhel-5.11-x86_64.json @@ -182,7 +182,7 @@ "name": "rhel-5.11", "no_proxy": "{{env `no_proxy`}}", "template": "rhel-5.11-x86_64", - "version": "2.2.TIMESTAMP" + "version": "TIMESTAMP" } } diff --git a/rhel-6.9-i386.json b/rhel-6.9-i386.json index 7cc84f3e1..9e9855d0c 100644 --- a/rhel-6.9-i386.json +++ b/rhel-6.9-i386.json @@ -177,7 +177,7 @@ "name": "rhel-6.9-i386", "no_proxy": "{{env `no_proxy`}}", "template": "rhel-6.9-i386", - "version": "2.2.TIMESTAMP" + "version": "TIMESTAMP" } } diff --git a/rhel-6.9-x86_64.json b/rhel-6.9-x86_64.json index 2b2a985ee..3fdc4a04d 100644 --- a/rhel-6.9-x86_64.json +++ b/rhel-6.9-x86_64.json @@ -177,7 +177,7 @@ "name": "rhel-6.9", "no_proxy": "{{env `no_proxy`}}", "template": "rhel-6.9-x86_64", - "version": "2.2.TIMESTAMP" + "version": "TIMESTAMP" } } diff --git a/rhel-7.3-x86_64.json b/rhel-7.3-x86_64.json index 593236bf4..52acdf363 100644 --- a/rhel-7.3-x86_64.json +++ b/rhel-7.3-x86_64.json @@ -177,7 +177,7 @@ "name": "rhel-7.3", "no_proxy": "{{env `no_proxy`}}", "template": "rhel-7.3-x86_64", - "version": "2.2.TIMESTAMP" + "version": "TIMESTAMP" } } diff --git a/sles-12-sp2-x86_64.json b/sles-12-sp2-x86_64.json index 054c5e5da..89e35b20e 100644 --- a/sles-12-sp2-x86_64.json +++ b/sles-12-sp2-x86_64.json @@ -196,7 +196,7 @@ "mirror": "./packer_cache", "name": "sles-12-sp2", "template": "sles-12-sp2-x86_64", - "version": "2.2.TIMESTAMP" + "version": "TIMESTAMP" } } diff --git a/solaris-10.11-x86.json b/solaris-10.11-x86.json index a2e031590..1a436d644 100644 --- a/solaris-10.11-x86.json +++ b/solaris-10.11-x86.json @@ -132,7 +132,7 @@ "mirror": "./packer_cache", "name": "solaris-10.11", "template": "solaris-10.11-x86", - "version": "2.0.TIMESTAMP" + "version": "TIMESTAMP" } } diff --git a/solaris-11-x86.json b/solaris-11-x86.json index 936f1eb38..82a60957b 100644 --- a/solaris-11-x86.json +++ b/solaris-11-x86.json @@ -154,7 +154,7 @@ "mirror": "./packer_cache", "name": "solaris-11.3", "template": "solaris-11.3-x86", - "version": "2.0.TIMESTAMP" + "version": "TIMESTAMP" } } diff --git a/ubuntu-14.04-amd64.json b/ubuntu-14.04-amd64.json index 06f9265b3..d9a758c41 100755 --- a/ubuntu-14.04-amd64.json +++ b/ubuntu-14.04-amd64.json @@ -300,7 +300,7 @@ "no_proxy": "{{env `no_proxy`}}", "preseed_path": "ubuntu/preseed.cfg", "template": "ubuntu-14.04-amd64", - "version": "2.1.TIMESTAMP" + "version": "TIMESTAMP" } } diff --git a/ubuntu-14.04-i386.json b/ubuntu-14.04-i386.json index 5026e12e2..ae7e7740e 100644 --- a/ubuntu-14.04-i386.json +++ b/ubuntu-14.04-i386.json @@ -262,7 +262,7 @@ "no_proxy": "{{env `no_proxy`}}", "preseed_path": "ubuntu/preseed.cfg", "template": "ubuntu-14.04-i386", - "version": "2.1.TIMESTAMP" + "version": "TIMESTAMP" } } diff --git a/ubuntu-16.04-amd64.json b/ubuntu-16.04-amd64.json index 432e88bdf..29bac0bba 100755 --- a/ubuntu-16.04-amd64.json +++ b/ubuntu-16.04-amd64.json @@ -309,7 +309,7 @@ "no_proxy": "{{env `no_proxy`}}", "preseed_path": "ubuntu/preseed-hyperv.cfg", "template": "ubuntu-16.04-amd64", - "version": "2.1.TIMESTAMP" + "version": "TIMESTAMP" } } diff --git a/ubuntu-16.04-i386.json b/ubuntu-16.04-i386.json index 3a5675cf7..19ee32c91 100644 --- a/ubuntu-16.04-i386.json +++ b/ubuntu-16.04-i386.json @@ -271,7 +271,7 @@ "no_proxy": "{{env `no_proxy`}}", "preseed_path": "ubuntu/preseed.cfg", "template": "ubuntu-16.04-i386", - "version": "2.1.TIMESTAMP" + "version": "TIMESTAMP" } } diff --git a/ubuntu-17.04-amd64.json b/ubuntu-17.04-amd64.json index 0aea7f2d8..1a5c52081 100644 --- a/ubuntu-17.04-amd64.json +++ b/ubuntu-17.04-amd64.json @@ -305,7 +305,7 @@ "no_proxy": "{{env `no_proxy`}}", "preseed_path": "ubuntu/preseed.cfg", "template": "ubuntu-17.04-amd64", - "version": "2.1.TIMESTAMP" + "version": "TIMESTAMP" } } diff --git a/ubuntu-17.04-i386.json b/ubuntu-17.04-i386.json index e2b41f33d..4124cf41f 100644 --- a/ubuntu-17.04-i386.json +++ b/ubuntu-17.04-i386.json @@ -267,7 +267,7 @@ "no_proxy": "{{env `no_proxy`}}", "preseed_path": "ubuntu/preseed.cfg", "template": "ubuntu-17.04-i386", - "version": "2.1.TIMESTAMP" + "version": "TIMESTAMP" } } From 618cc2e861e02c4798f71cd1c0c21b4454a9f4f5 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith@chef.io> Date: Tue, 11 Jul 2017 09:27:07 -0700 Subject: [PATCH 0651/1622] Remove CentOS 5 definitions CentOS 5 is EOL Signed-off-by: Tim Smith <tsmith@chef.io> --- centos-5.11-i386.json | 182 -------------------------------------- centos-5.11-x86_64.json | 188 ---------------------------------------- 2 files changed, 370 deletions(-) delete mode 100644 centos-5.11-i386.json delete mode 100644 centos-5.11-x86_64.json diff --git a/centos-5.11-i386.json b/centos-5.11-i386.json deleted file mode 100644 index a0eac6c42..000000000 --- a/centos-5.11-i386.json +++ /dev/null @@ -1,182 +0,0 @@ -{ - "builders": [ - { - "boot_command": [ - "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", - "guest_os_type": "RedHat", - "hard_drive_interface": "sata", - "headless": "{{ user `headless` }}", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-virtualbox", - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "virtualbox-iso", - "vboxmanage": [ - [ - "modifyvm", - "{{.Name}}", - "--memory", - "{{ user `memory` }}" - ], - [ - "modifyvm", - "{{.Name}}", - "--cpus", - "{{ user `cpus` }}" - ] - ], - "virtualbox_version_file": ".vbox_version", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "centos", - "headless": "{{ user `headless` }}", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-vmware", - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "tools_upload_flavor": "linux", - "type": "vmware-iso", - "vm_name": "{{ user `template` }}", - "vmx_data": { - "cpuid.coresPerSocket": "1", - "memsize": "{{ user `memory` }}", - "numvcpus": "{{ user `cpus` }}" - } - }, - { - "boot_command": [ - "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "centos", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-parallels", - "parallels_tools_flavor": "lin", - "prlctl": [ - [ - "set", - "{{.Name}}", - "--memsize", - "{{ user `memory` }}" - ], - [ - "set", - "{{.Name}}", - "--cpus", - "{{ user `cpus` }}" - ] - ], - "prlctl_version_file": ".prlctl_version", - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "parallels-iso", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "headless": "{{ user `headless` }}", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-qemu", - "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "qemu", - "vm_name": "{{ user `template` }}" - } - ], - "post-processors": [ - { - "output": "builds/{{user `box_basename`}}.{{.Provider}}.box", - "type": "vagrant" - } - ], - "provisioners": [ - { - "destination": "/tmp/bento-metadata.json", - "source": "{{user `metadata`}}", - "type": "file" - }, - { - "environment_vars": [ - "HOME_DIR=/home/vagrant", - "http_proxy={{user `http_proxy`}}", - "https_proxy={{user `https_proxy`}}", - "no_proxy={{user `no_proxy`}}" - ], - "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", - "scripts": [ - "scripts/common/metadata.sh", - "scripts/common/sshd.sh", - "scripts/centos/networking.sh", - "scripts/common/vagrant.sh", - "scripts/common/virtualbox.sh", - "scripts/common/vmware.sh", - "scripts/common/parallels.sh", - "scripts/centos/cleanup.sh", - "scripts/common/minimize.sh" - ], - "type": "shell" - } - ], - "variables": { - "box_basename": "centos-5.11-i386", - "build_timestamp": "{{isotime \"20060102150405\"}}", - "cpus": "1", - "disk_size": "40960", - "git_revision": "__unknown_git_revision__", - "headless": "", - "http_proxy": "{{env `http_proxy`}}", - "https_proxy": "{{env `https_proxy`}}", - "iso_checksum": "66d7aa1be7f7aa327b823a706b04b37e219cea67c4eadd9185e8de5e3c4fb08d", - "iso_checksum_type": "sha256", - "iso_name": "CentOS-5.11-i386-bin-DVD-1of2.iso", - "ks_path": "centos-5.11/ks.cfg", - "memory": "1024", - "metadata": "floppy/dummy_metadata.json", - "mirror": "http://mirrors.kernel.org/centos", - "mirror_directory": "5.11/isos/i386", - "name": "centos-5.11-i386", - "no_proxy": "{{env `no_proxy`}}", - "template": "centos-5.11-i386", - "version": "TIMESTAMP" - } -} - diff --git a/centos-5.11-x86_64.json b/centos-5.11-x86_64.json deleted file mode 100644 index dd31f8c24..000000000 --- a/centos-5.11-x86_64.json +++ /dev/null @@ -1,188 +0,0 @@ -{ - "builders": [ - { - "boot_command": [ - "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", - "guest_os_type": "RedHat_64", - "hard_drive_interface": "sata", - "headless": "{{ user `headless` }}", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-virtualbox", - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "virtualbox-iso", - "vboxmanage": [ - [ - "modifyvm", - "{{.Name}}", - "--memory", - "{{ user `memory` }}" - ], - [ - "modifyvm", - "{{.Name}}", - "--cpus", - "{{ user `cpus` }}" - ], - [ - "modifyvm", - "{{.Name}}", - "--paravirtprovider", - "none" - ] - ], - "virtualbox_version_file": ".vbox_version", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "centos-64", - "headless": "{{ user `headless` }}", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-vmware", - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "tools_upload_flavor": "linux", - "type": "vmware-iso", - "vm_name": "{{ user `template` }}", - "vmx_data": { - "cpuid.coresPerSocket": "1", - "memsize": "{{ user `memory` }}", - "numvcpus": "{{ user `cpus` }}" - } - }, - { - "boot_command": [ - "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "centos", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-parallels", - "parallels_tools_flavor": "lin", - "prlctl": [ - [ - "set", - "{{.Name}}", - "--memsize", - "{{ user `memory` }}" - ], - [ - "set", - "{{.Name}}", - "--cpus", - "{{ user `cpus` }}" - ] - ], - "prlctl_version_file": ".prlctl_version", - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "parallels-iso", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "headless": "{{ user `headless` }}", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-qemu", - "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "qemu", - "vm_name": "{{ user `template` }}" - } - ], - "post-processors": [ - { - "output": "builds/{{user `box_basename`}}.{{.Provider}}.box", - "type": "vagrant" - } - ], - "provisioners": [ - { - "destination": "/tmp/bento-metadata.json", - "source": "{{user `metadata`}}", - "type": "file" - }, - { - "environment_vars": [ - "HOME_DIR=/home/vagrant", - "http_proxy={{user `http_proxy`}}", - "https_proxy={{user `https_proxy`}}", - "no_proxy={{user `no_proxy`}}" - ], - "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", - "scripts": [ - "scripts/common/metadata.sh", - "scripts/common/sshd.sh", - "scripts/centos/networking.sh", - "scripts/common/vagrant.sh", - "scripts/common/virtualbox.sh", - "scripts/common/vmware.sh", - "scripts/common/parallels.sh", - "scripts/centos/cleanup.sh", - "scripts/common/minimize.sh" - ], - "type": "shell" - } - ], - "variables": { - "box_basename": "centos-5.11", - "build_timestamp": "{{isotime \"20060102150405\"}}", - "cpus": "1", - "disk_size": "40960", - "git_revision": "__unknown_git_revision__", - "headless": "", - "http_proxy": "{{env `http_proxy`}}", - "https_proxy": "{{env `https_proxy`}}", - "iso_checksum": "b6eb0565b636513b90663ff01c6ec4da5058baff0d7d4007d187be997dd985f8", - "iso_checksum_type": "sha256", - "iso_name": "CentOS-5.11-x86_64-bin-DVD-1of2.iso", - "ks_path": "centos-5.11/ks.cfg", - "memory": "1024", - "metadata": "floppy/dummy_metadata.json", - "mirror": "http://mirrors.kernel.org/centos", - "mirror_directory": "5.11/isos/x86_64", - "name": "centos-5.11", - "no_proxy": "{{env `no_proxy`}}", - "template": "centos-5.11-x86_64", - "version": "TIMESTAMP" - } -} - From dc9037bb7f105b943e3ed0c8c5ff842a55e5a6fb Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith@chef.io> Date: Tue, 11 Jul 2017 09:33:15 -0700 Subject: [PATCH 0652/1622] Add Fedora 26 Signed-off-by: Tim Smith <tsmith@chef.io> --- builds.yml | 2 + fedora-26-x86_64.json | 185 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 187 insertions(+) create mode 100644 fedora-26-x86_64.json diff --git a/builds.yml b/builds.yml index 08b488efa..04bf6f478 100644 --- a/builds.yml +++ b/builds.yml @@ -31,6 +31,8 @@ public: - x86_64 '25': - x86_64 + '26': + - x86_64 freebsd: '10.3': - amd64 diff --git a/fedora-26-x86_64.json b/fedora-26-x86_64.json new file mode 100644 index 000000000..10fa93586 --- /dev/null +++ b/fedora-26-x86_64.json @@ -0,0 +1,185 @@ +{ + "builders": [ + { + "boot_command": [ + "<tab> linux ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": "{{user `disk_size`}}", + "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "guest_os_type": "Fedora_64", + "hard_drive_interface": "sata", + "headless": "{{ user `headless` }}", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-virtualbox", + "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "virtualbox-iso", + "vboxmanage": [ + [ + "modifyvm", + "{{.Name}}", + "--memory", + "{{ user `memory` }}" + ], + [ + "modifyvm", + "{{.Name}}", + "--cpus", + "{{ user `cpus` }}" + ] + ], + "virtualbox_version_file": ".vbox_version", + "vm_name": "{{ user `template` }}" + }, + { + "boot_command": [ + "<tab> linux ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": "{{user `disk_size`}}", + "guest_os_type": "fedora-64", + "headless": "{{ user `headless` }}", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-vmware", + "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "tools_upload_flavor": "linux", + "type": "vmware-iso", + "vm_name": "{{ user `template` }}", + "vmx_data": { + "cpuid.coresPerSocket": "1", + "ethernet0.pciSlotNumber": "32", + "memsize": "{{ user `memory` }}", + "numvcpus": "{{ user `cpus` }}" + } + }, + { + "boot_command": [ + "<tab> linux ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": "{{user `disk_size`}}", + "guest_os_type": "fedora-core", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-parallels", + "parallels_tools_flavor": "lin", + "prlctl": [ + [ + "set", + "{{.Name}}", + "--memsize", + "{{ user `memory` }}" + ], + [ + "set", + "{{.Name}}", + "--cpus", + "{{ user `cpus` }}" + ] + ], + "prlctl_version_file": ".prlctl_version", + "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "parallels-iso", + "vm_name": "{{ user `template` }}" + }, + { + "boot_command": [ + "<tab> linux ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": "{{user `disk_size`}}", + "headless": "{{ user `headless` }}", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-qemu", + "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "qemu", + "vm_name": "{{ user `template` }}" + } + ], + "post-processors": [ + { + "output": "builds/{{user `box_basename`}}.{{.Provider}}.box", + "type": "vagrant" + } + ], + "provisioners": [ + { + "destination": "/tmp/bento-metadata.json", + "source": "{{user `metadata`}}", + "type": "file" + }, + { + "environment_vars": [ + "HOME_DIR=/home/vagrant", + "http_proxy={{user `http_proxy`}}", + "https_proxy={{user `https_proxy`}}", + "no_proxy={{user `no_proxy`}}" + ], + "execute_command": "echo 'vagrant' | {{.Vars}} sudo -E -S bash '{{.Path}}'", + "scripts": [ + "scripts/common/metadata.sh", + "scripts/fedora/swap.sh", + "scripts/fedora/fix-slow-dns.sh", + "scripts/fedora/build-tools.sh", + "scripts/common/sshd.sh", + "scripts/common/virtualbox.sh", + "scripts/common/vmware.sh", + "scripts/common/parallels.sh", + "scripts/common/vagrant.sh", + "scripts/fedora/cleanup.sh", + "scripts/common/minimize.sh" + ], + "type": "shell" + } + ], + "variables": { + "arch": "64", + "box_basename": "fedora-26", + "build_timestamp": "{{isotime \"20060102150405\"}}", + "cpus": "1", + "disk_size": "40960", + "git_revision": "__unknown_git_revision__", + "headless": "", + "http_proxy": "{{env `http_proxy`}}", + "https_proxy": "{{env `https_proxy`}}", + "iso_checksum": "fad18a43b9cec152fc8a1fd368950eaf59be66b1a15438149a0c3a509c56cf2f", + "iso_checksum_type": "sha256", + "iso_name": "Fedora-Server-dvd-x86_64-26-1.5.iso", + "ks_path": "fedora/ks.cfg", + "memory": "1024", + "metadata": "floppy/dummy_metadata.json", + "mirror": "http://download.fedoraproject.org/pub/fedora/linux", + "mirror_directory": "releases/26/Server/x86_64/iso", + "name": "fedora-26", + "no_proxy": "{{env `no_proxy`}}", + "template": "fedora-26-x86_64", + "version": "TIMESTAMP" + } +} From e8dfefd93d56f0a2ebea7ed210bc42adea3b633f Mon Sep 17 00:00:00 2001 From: Seth Thomas <sthomas@chef.io> Date: Thu, 13 Jul 2017 10:31:00 -0400 Subject: [PATCH 0653/1622] Remove VMX interface, address #775 warning Signed-off-by: Seth Thomas <sthomas@chef.io> --- centos-6.9-i386.json | 3 ++- centos-6.9-x86_64.json | 3 ++- centos-7.3-x86_64.json | 3 ++- debian-7.11-amd64.json | 3 ++- debian-7.11-i386.json | 3 ++- debian-8.8-amd64.json | 3 ++- debian-8.8-i386.json | 3 ++- debian-9.0-amd64.json | 4 ++-- debian-9.0-i386.json | 3 ++- fedora-24-i386.json | 3 ++- fedora-24-x86_64.json | 3 ++- fedora-25-i386.json | 3 ++- fedora-25-x86_64.json | 3 ++- fedora-26-x86_64.json | 4 +++- freebsd-10.3-amd64.json | 3 ++- freebsd-10.3-i386.json | 3 ++- freebsd-11.0-amd64.json | 3 ++- http/debian-8/preseed.cfg | 2 +- macos-10.12.json | 3 ++- macosx-10.10.json | 3 ++- macosx-10.11.json | 3 ++- macosx-10.9.json | 3 ++- opensuse-leap-42.2-x86_64.json | 3 ++- oracle-5.11-i386.json | 3 ++- oracle-5.11-x86_64.json | 3 ++- oracle-6.9-i386.json | 3 ++- oracle-6.9-x86_64.json | 3 ++- oracle-7.3-x86_64.json | 3 ++- rhel-5.11-i386.json | 3 ++- rhel-5.11-x86_64.json | 3 ++- rhel-6.9-i386.json | 3 ++- rhel-6.9-x86_64.json | 3 ++- rhel-7.3-x86_64.json | 3 ++- sles-12-sp2-x86_64.json | 3 ++- solaris-10.11-x86.json | 3 ++- solaris-11-x86.json | 3 ++- ubuntu-14.04-amd64.json | 3 ++- ubuntu-14.04-i386.json | 3 ++- ubuntu-16.04-amd64.json | 3 ++- ubuntu-16.04-i386.json | 4 ++-- ubuntu-17.04-amd64.json | 4 ++-- ubuntu-17.04-i386.json | 3 ++- 42 files changed, 84 insertions(+), 45 deletions(-) mode change 100755 => 100644 ubuntu-14.04-amd64.json mode change 100755 => 100644 ubuntu-16.04-amd64.json diff --git a/centos-6.9-i386.json b/centos-6.9-i386.json index fb0646516..127fe9efd 100644 --- a/centos-6.9-i386.json +++ b/centos-6.9-i386.json @@ -63,7 +63,8 @@ "cpuid.coresPerSocket": "1", "memsize": "{{ user `memory` }}", "numvcpus": "{{ user `cpus` }}" - } + }, + "vmx_remove_ethernet_interfaces": true }, { "boot_command": [ diff --git a/centos-6.9-x86_64.json b/centos-6.9-x86_64.json index ef3edfe08..4018af388 100644 --- a/centos-6.9-x86_64.json +++ b/centos-6.9-x86_64.json @@ -63,7 +63,8 @@ "cpuid.coresPerSocket": "1", "memsize": "{{ user `memory` }}", "numvcpus": "{{ user `cpus` }}" - } + }, + "vmx_remove_ethernet_interfaces": true }, { "boot_command": [ diff --git a/centos-7.3-x86_64.json b/centos-7.3-x86_64.json index 0ab229589..c190f24a3 100644 --- a/centos-7.3-x86_64.json +++ b/centos-7.3-x86_64.json @@ -63,7 +63,8 @@ "cpuid.coresPerSocket": "1", "memsize": "{{ user `memory` }}", "numvcpus": "{{ user `cpus` }}" - } + }, + "vmx_remove_ethernet_interfaces": true }, { "boot_command": [ diff --git a/debian-7.11-amd64.json b/debian-7.11-amd64.json index d4c250715..03b9049fe 100644 --- a/debian-7.11-amd64.json +++ b/debian-7.11-amd64.json @@ -91,7 +91,8 @@ "cpuid.coresPerSocket": "1", "memsize": "{{ user `memory` }}", "numvcpus": "{{ user `cpus` }}" - } + }, + "vmx_remove_ethernet_interfaces": true }, { "boot_command": [ diff --git a/debian-7.11-i386.json b/debian-7.11-i386.json index a57c5b974..a0f18b0fe 100644 --- a/debian-7.11-i386.json +++ b/debian-7.11-i386.json @@ -91,7 +91,8 @@ "cpuid.coresPerSocket": "1", "memsize": "{{ user `memory` }}", "numvcpus": "{{ user `cpus` }}" - } + }, + "vmx_remove_ethernet_interfaces": true }, { "boot_command": [ diff --git a/debian-8.8-amd64.json b/debian-8.8-amd64.json index 78d905699..6f7c303dd 100644 --- a/debian-8.8-amd64.json +++ b/debian-8.8-amd64.json @@ -94,7 +94,8 @@ "ethernet0.pciSlotNumber": "32", "memsize": "{{ user `memory` }}", "numvcpus": "{{ user `cpus` }}" - } + }, + "vmx_remove_ethernet_interfaces": true }, { "boot_command": [ diff --git a/debian-8.8-i386.json b/debian-8.8-i386.json index c72e472b6..d1e19c12f 100644 --- a/debian-8.8-i386.json +++ b/debian-8.8-i386.json @@ -94,7 +94,8 @@ "ethernet0.pciSlotNumber": "32", "memsize": "{{ user `memory` }}", "numvcpus": "{{ user `cpus` }}" - } + }, + "vmx_remove_ethernet_interfaces": true }, { "boot_command": [ diff --git a/debian-9.0-amd64.json b/debian-9.0-amd64.json index eedae18ef..c34e8e472 100644 --- a/debian-9.0-amd64.json +++ b/debian-9.0-amd64.json @@ -94,7 +94,8 @@ "ethernet0.pciSlotNumber": "32", "memsize": "{{ user `memory` }}", "numvcpus": "{{ user `cpus` }}" - } + }, + "vmx_remove_ethernet_interfaces": true }, { "boot_command": [ @@ -243,4 +244,3 @@ "version": "TIMESTAMP" } } - diff --git a/debian-9.0-i386.json b/debian-9.0-i386.json index b4c56f05b..46f60f0d7 100644 --- a/debian-9.0-i386.json +++ b/debian-9.0-i386.json @@ -94,7 +94,8 @@ "ethernet0.pciSlotNumber": "32", "memsize": "{{ user `memory` }}", "numvcpus": "{{ user `cpus` }}" - } + }, + "vmx_remove_ethernet_interfaces": true }, { "boot_command": [ diff --git a/fedora-24-i386.json b/fedora-24-i386.json index fe9f0f293..2a0ceeda8 100644 --- a/fedora-24-i386.json +++ b/fedora-24-i386.json @@ -63,7 +63,8 @@ "cpuid.coresPerSocket": "1", "memsize": "{{ user `memory` }}", "numvcpus": "{{ user `cpus` }}" - } + }, + "vmx_remove_ethernet_interfaces": true }, { "boot_command": [ diff --git a/fedora-24-x86_64.json b/fedora-24-x86_64.json index 7280df9c1..de4843d3a 100644 --- a/fedora-24-x86_64.json +++ b/fedora-24-x86_64.json @@ -64,7 +64,8 @@ "ethernet0.pciSlotNumber": "32", "memsize": "{{ user `memory` }}", "numvcpus": "{{ user `cpus` }}" - } + }, + "vmx_remove_ethernet_interfaces": true }, { "boot_command": [ diff --git a/fedora-25-i386.json b/fedora-25-i386.json index 14c3e619d..8aabad30b 100644 --- a/fedora-25-i386.json +++ b/fedora-25-i386.json @@ -63,7 +63,8 @@ "cpuid.coresPerSocket": "1", "memsize": "{{ user `memory` }}", "numvcpus": "{{ user `cpus` }}" - } + }, + "vmx_remove_ethernet_interfaces": true }, { "boot_command": [ diff --git a/fedora-25-x86_64.json b/fedora-25-x86_64.json index 9be3eee71..18d00f12c 100644 --- a/fedora-25-x86_64.json +++ b/fedora-25-x86_64.json @@ -64,7 +64,8 @@ "ethernet0.pciSlotNumber": "32", "memsize": "{{ user `memory` }}", "numvcpus": "{{ user `cpus` }}" - } + }, + "vmx_remove_ethernet_interfaces": true }, { "boot_command": [ diff --git a/fedora-26-x86_64.json b/fedora-26-x86_64.json index 10fa93586..122275983 100644 --- a/fedora-26-x86_64.json +++ b/fedora-26-x86_64.json @@ -64,7 +64,8 @@ "ethernet0.pciSlotNumber": "32", "memsize": "{{ user `memory` }}", "numvcpus": "{{ user `cpus` }}" - } + }, + "vmx_remove_ethernet_interfaces": true }, { "boot_command": [ @@ -183,3 +184,4 @@ "version": "TIMESTAMP" } } + diff --git a/freebsd-10.3-amd64.json b/freebsd-10.3-amd64.json index 25c13e073..efbf4c587 100644 --- a/freebsd-10.3-amd64.json +++ b/freebsd-10.3-amd64.json @@ -79,7 +79,8 @@ "cpuid.coresPerSocket": "1", "memsize": "{{ user `memory` }}", "numvcpus": "{{ user `cpus` }}" - } + }, + "vmx_remove_ethernet_interfaces": true }, { "boot_command": [ diff --git a/freebsd-10.3-i386.json b/freebsd-10.3-i386.json index 625bfaa52..3e8b01151 100644 --- a/freebsd-10.3-i386.json +++ b/freebsd-10.3-i386.json @@ -79,7 +79,8 @@ "cpuid.coresPerSocket": "1", "memsize": "{{ user `memory` }}", "numvcpus": "{{ user `cpus` }}" - } + }, + "vmx_remove_ethernet_interfaces": true }, { "boot_command": [ diff --git a/freebsd-11.0-amd64.json b/freebsd-11.0-amd64.json index f3ef41edf..814c66b2a 100644 --- a/freebsd-11.0-amd64.json +++ b/freebsd-11.0-amd64.json @@ -79,7 +79,8 @@ "cpuid.coresPerSocket": "1", "memsize": "{{ user `memory` }}", "numvcpus": "{{ user `cpus` }}" - } + }, + "vmx_remove_ethernet_interfaces": true }, { "boot_command": [ diff --git a/http/debian-8/preseed.cfg b/http/debian-8/preseed.cfg index 81ce1f450..9799b633d 100644 --- a/http/debian-8/preseed.cfg +++ b/http/debian-8/preseed.cfg @@ -30,7 +30,7 @@ d-i passwd/user-uid string 1000 d-i passwd/user-password password vagrant d-i passwd/user-password-again password vagrant d-i passwd/username string vagrant -d-i pkgsel/include string sudo bzip2 acpid cryptsetup zlib1g-dev wget curl dkms make nfs-common +d-i pkgsel/include string sudo bzip2 acpid cryptsetup zlib1g-dev wget curl dkms make nfs-common net-tools d-i pkgsel/install-language-support boolean false d-i pkgsel/update-policy select none d-i pkgsel/upgrade select full-upgrade diff --git a/macos-10.12.json b/macos-10.12.json index 10ac3ef22..cd3d75c9e 100644 --- a/macos-10.12.json +++ b/macos-10.12.json @@ -30,7 +30,8 @@ "numvcpus": "{{ user `cpus` }}", "smc.present": "TRUE", "usb.present": "TRUE" - } + }, + "vmx_remove_ethernet_interfaces": true }, { "boot_wait": "2s", diff --git a/macosx-10.10.json b/macosx-10.10.json index 769df987c..f75ef6d71 100644 --- a/macosx-10.10.json +++ b/macosx-10.10.json @@ -30,7 +30,8 @@ "numvcpus": "{{ user `cpus` }}", "smc.present": "TRUE", "usb.present": "TRUE" - } + }, + "vmx_remove_ethernet_interfaces": true }, { "boot_wait": "2s", diff --git a/macosx-10.11.json b/macosx-10.11.json index aec226ef1..e92d1278c 100644 --- a/macosx-10.11.json +++ b/macosx-10.11.json @@ -30,7 +30,8 @@ "numvcpus": "{{ user `cpus` }}", "smc.present": "TRUE", "usb.present": "TRUE" - } + }, + "vmx_remove_ethernet_interfaces": true }, { "boot_wait": "2s", diff --git a/macosx-10.9.json b/macosx-10.9.json index 683ce5319..a6a52b033 100644 --- a/macosx-10.9.json +++ b/macosx-10.9.json @@ -30,7 +30,8 @@ "numvcpus": "{{ user `cpus` }}", "smc.present": "TRUE", "usb.present": "TRUE" - } + }, + "vmx_remove_ethernet_interfaces": true }, { "boot_wait": "2s", diff --git a/opensuse-leap-42.2-x86_64.json b/opensuse-leap-42.2-x86_64.json index 080c8ea22..81cf163b8 100644 --- a/opensuse-leap-42.2-x86_64.json +++ b/opensuse-leap-42.2-x86_64.json @@ -71,7 +71,8 @@ "cpuid.coresPerSocket": "1", "memsize": "{{ user `memory` }}", "numvcpus": "{{ user `cpus` }}" - } + }, + "vmx_remove_ethernet_interfaces": true }, { "boot_command": [ diff --git a/oracle-5.11-i386.json b/oracle-5.11-i386.json index f89e73d7a..305789b45 100644 --- a/oracle-5.11-i386.json +++ b/oracle-5.11-i386.json @@ -63,7 +63,8 @@ "cpuid.coresPerSocket": "1", "memsize": "{{ user `memory` }}", "numvcpus": "{{ user `cpus` }}" - } + }, + "vmx_remove_ethernet_interfaces": true }, { "boot_command": [ diff --git a/oracle-5.11-x86_64.json b/oracle-5.11-x86_64.json index 9f315bec5..f00a51ea7 100644 --- a/oracle-5.11-x86_64.json +++ b/oracle-5.11-x86_64.json @@ -69,7 +69,8 @@ "cpuid.coresPerSocket": "1", "memsize": "{{ user `memory` }}", "numvcpus": "{{ user `cpus` }}" - } + }, + "vmx_remove_ethernet_interfaces": true }, { "boot_command": [ diff --git a/oracle-6.9-i386.json b/oracle-6.9-i386.json index 1ce194de0..a239c16fe 100644 --- a/oracle-6.9-i386.json +++ b/oracle-6.9-i386.json @@ -63,7 +63,8 @@ "cpuid.coresPerSocket": "1", "memsize": "{{ user `memory` }}", "numvcpus": "{{ user `cpus` }}" - } + }, + "vmx_remove_ethernet_interfaces": true }, { "boot_command": [ diff --git a/oracle-6.9-x86_64.json b/oracle-6.9-x86_64.json index 621ae5e90..85e60433c 100644 --- a/oracle-6.9-x86_64.json +++ b/oracle-6.9-x86_64.json @@ -63,7 +63,8 @@ "cpuid.coresPerSocket": "1", "memsize": "{{ user `memory` }}", "numvcpus": "{{ user `cpus` }}" - } + }, + "vmx_remove_ethernet_interfaces": true }, { "boot_command": [ diff --git a/oracle-7.3-x86_64.json b/oracle-7.3-x86_64.json index 64e364555..a31320b23 100644 --- a/oracle-7.3-x86_64.json +++ b/oracle-7.3-x86_64.json @@ -63,7 +63,8 @@ "cpuid.coresPerSocket": "1", "memsize": "{{ user `memory` }}", "numvcpus": "{{ user `cpus` }}" - } + }, + "vmx_remove_ethernet_interfaces": true }, { "boot_command": [ diff --git a/rhel-5.11-i386.json b/rhel-5.11-i386.json index 911192e7f..468f14e8f 100644 --- a/rhel-5.11-i386.json +++ b/rhel-5.11-i386.json @@ -63,7 +63,8 @@ "cpuid.coresPerSocket": "1", "memsize": "{{ user `memory` }}", "numvcpus": "{{ user `cpus` }}" - } + }, + "vmx_remove_ethernet_interfaces": true }, { "boot_command": [ diff --git a/rhel-5.11-x86_64.json b/rhel-5.11-x86_64.json index f26118abb..945688188 100644 --- a/rhel-5.11-x86_64.json +++ b/rhel-5.11-x86_64.json @@ -69,7 +69,8 @@ "cpuid.coresPerSocket": "1", "memsize": "{{ user `memory` }}", "numvcpus": "{{ user `cpus` }}" - } + }, + "vmx_remove_ethernet_interfaces": true }, { "boot_command": [ diff --git a/rhel-6.9-i386.json b/rhel-6.9-i386.json index 9e9855d0c..decf8da77 100644 --- a/rhel-6.9-i386.json +++ b/rhel-6.9-i386.json @@ -63,7 +63,8 @@ "cpuid.coresPerSocket": "1", "memsize": "{{ user `memory` }}", "numvcpus": "{{ user `cpus` }}" - } + }, + "vmx_remove_ethernet_interfaces": true }, { "boot_command": [ diff --git a/rhel-6.9-x86_64.json b/rhel-6.9-x86_64.json index 3fdc4a04d..c0a4cebce 100644 --- a/rhel-6.9-x86_64.json +++ b/rhel-6.9-x86_64.json @@ -63,7 +63,8 @@ "cpuid.coresPerSocket": "1", "memsize": "{{ user `memory` }}", "numvcpus": "{{ user `cpus` }}" - } + }, + "vmx_remove_ethernet_interfaces": true }, { "boot_command": [ diff --git a/rhel-7.3-x86_64.json b/rhel-7.3-x86_64.json index 52acdf363..cc8153bb0 100644 --- a/rhel-7.3-x86_64.json +++ b/rhel-7.3-x86_64.json @@ -63,7 +63,8 @@ "cpuid.coresPerSocket": "1", "memsize": "{{ user `memory` }}", "numvcpus": "{{ user `cpus` }}" - } + }, + "vmx_remove_ethernet_interfaces": true }, { "boot_command": [ diff --git a/sles-12-sp2-x86_64.json b/sles-12-sp2-x86_64.json index 89e35b20e..7d37456bf 100644 --- a/sles-12-sp2-x86_64.json +++ b/sles-12-sp2-x86_64.json @@ -71,7 +71,8 @@ "cpuid.coresPerSocket": "1", "memsize": "{{ user `memory` }}", "numvcpus": "{{ user `cpus` }}" - } + }, + "vmx_remove_ethernet_interfaces": true }, { "boot_command": [ diff --git a/solaris-10.11-x86.json b/solaris-10.11-x86.json index 1a436d644..9d4d52d71 100644 --- a/solaris-10.11-x86.json +++ b/solaris-10.11-x86.json @@ -91,7 +91,8 @@ "cpuid.coresPerSocket": "1", "memsize": "{{ user `memory` }}", "numvcpus": "{{ user `cpus` }}" - } + }, + "vmx_remove_ethernet_interfaces": true } ], "post-processors": [ diff --git a/solaris-11-x86.json b/solaris-11-x86.json index 82a60957b..674677a6e 100644 --- a/solaris-11-x86.json +++ b/solaris-11-x86.json @@ -111,7 +111,8 @@ "cpuid.coresPerSocket": "1", "memsize": "{{ user `memory` }}", "numvcpus": "{{ user `cpus` }}" - } + }, + "vmx_remove_ethernet_interfaces": true } ], "post-processors": [ diff --git a/ubuntu-14.04-amd64.json b/ubuntu-14.04-amd64.json old mode 100755 new mode 100644 index d9a758c41..ce6288231 --- a/ubuntu-14.04-amd64.json +++ b/ubuntu-14.04-amd64.json @@ -105,7 +105,8 @@ "cpuid.coresPerSocket": "1", "memsize": "{{ user `memory` }}", "numvcpus": "{{ user `cpus` }}" - } + }, + "vmx_remove_ethernet_interfaces": true }, { "boot_command": [ diff --git a/ubuntu-14.04-i386.json b/ubuntu-14.04-i386.json index ae7e7740e..ea3d3558e 100644 --- a/ubuntu-14.04-i386.json +++ b/ubuntu-14.04-i386.json @@ -105,7 +105,8 @@ "cpuid.coresPerSocket": "1", "memsize": "{{ user `memory` }}", "numvcpus": "{{ user `cpus` }}" - } + }, + "vmx_remove_ethernet_interfaces": true }, { "boot_command": [ diff --git a/ubuntu-16.04-amd64.json b/ubuntu-16.04-amd64.json old mode 100755 new mode 100644 index 29bac0bba..32936cbf5 --- a/ubuntu-16.04-amd64.json +++ b/ubuntu-16.04-amd64.json @@ -110,7 +110,8 @@ "ethernet0.pciSlotNumber": "32", "memsize": "{{ user `memory` }}", "numvcpus": "{{ user `cpus` }}" - } + }, + "vmx_remove_ethernet_interfaces": true }, { "boot_command": [ diff --git a/ubuntu-16.04-i386.json b/ubuntu-16.04-i386.json index 19ee32c91..39621ba58 100644 --- a/ubuntu-16.04-i386.json +++ b/ubuntu-16.04-i386.json @@ -107,10 +107,10 @@ "vm_name": "{{ user `template` }}", "vmx_data": { "cpuid.coresPerSocket": "1", - "ethernet0.pciSlotNumber": "32", "memsize": "{{ user `memory` }}", "numvcpus": "{{ user `cpus` }}" - } + }, + "vmx_remove_ethernet_interfaces": true }, { "boot_command": [ diff --git a/ubuntu-17.04-amd64.json b/ubuntu-17.04-amd64.json index 1a5c52081..534bab389 100644 --- a/ubuntu-17.04-amd64.json +++ b/ubuntu-17.04-amd64.json @@ -108,7 +108,8 @@ "ethernet0.pciSlotNumber": "32", "memsize": "{{ user `memory` }}", "numvcpus": "{{ user `cpus` }}" - } + }, + "vmx_remove_ethernet_interfaces": true }, { "boot_command": [ @@ -308,4 +309,3 @@ "version": "TIMESTAMP" } } - diff --git a/ubuntu-17.04-i386.json b/ubuntu-17.04-i386.json index 4124cf41f..1368c58af 100644 --- a/ubuntu-17.04-i386.json +++ b/ubuntu-17.04-i386.json @@ -108,7 +108,8 @@ "ethernet0.pciSlotNumber": "32", "memsize": "{{ user `memory` }}", "numvcpus": "{{ user `cpus` }}" - } + }, + "vmx_remove_ethernet_interfaces": true }, { "boot_command": [ From adbc81ba4fc327de6080aa2eaad2e03816d91002 Mon Sep 17 00:00:00 2001 From: Seth Thomas <sthomas@chef.io> Date: Thu, 20 Jul 2017 21:20:34 -0700 Subject: [PATCH 0654/1622] Release 2.3.8 Signed-off-by: Seth Thomas <sthomas@chef.io> --- CHANGELOG.md | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index f22c2f480..7c0c71576 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,19 @@ # Change Log +## [2.3.8](https://github.com/chef/bento/tree/2.3.8) (2017-07-20) + +**New** +- Fedora 26 + +**Improvements** +- Suppress VMX whitelisting warning by removing interfaces at end of build +- Use archive.ubuntu.com instead of US specific domain +- Latest Tooling + - VirtualBox 5.1.24 + - VMware Fusion 8.5.8 + - Parallels 12.2.1 + - Parallels 1.0.3 + ## [2.3.7](https://github.com/chef/bento/tree/2.3.7) (2017-07-03) **New** From 935a36270dd2c39478a499726b0122a1e24d7a13 Mon Sep 17 00:00:00 2001 From: Seth Thomas <sthomas@chef.io> Date: Sun, 23 Jul 2017 21:37:40 -0700 Subject: [PATCH 0655/1622] Bumping for Debian 9.1 Signed-off-by: Seth Thomas <sthomas@chef.io> --- debian-9.0-amd64.json => debian-9.1-amd64.json | 12 ++++++------ debian-9.0-i386.json => debian-9.1-i386.json | 13 ++++++------- 2 files changed, 12 insertions(+), 13 deletions(-) rename debian-9.0-amd64.json => debian-9.1-amd64.json (96%) rename debian-9.0-i386.json => debian-9.1-i386.json (96%) diff --git a/debian-9.0-amd64.json b/debian-9.1-amd64.json similarity index 96% rename from debian-9.0-amd64.json rename to debian-9.1-amd64.json index c34e8e472..4ed0984df 100644 --- a/debian-9.0-amd64.json +++ b/debian-9.1-amd64.json @@ -222,7 +222,7 @@ } ], "variables": { - "box_basename": "debian-9.0", + "box_basename": "debian-9.1", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", "disk_size": "40960", @@ -230,17 +230,17 @@ "headless": "", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", - "iso_checksum": "9d98f339016dc2a3998881949a8f0678baede26b5106f18ef1168d7e13606773", + "iso_checksum": "c9e070074de83aa22e141f59a423e5210a5019b369ef1efe61a2afd44ba8f371", "iso_checksum_type": "sha256", - "iso_name": "debian-9.0.0-amd64-netinst.iso", + "iso_name": "debian-9.1.0-amd64-netinst.iso", "memory": "1024", "metadata": "floppy/dummy_metadata.json", "mirror": "http://cdimage.debian.org/cdimage/release", - "mirror_directory": "9.0.0/amd64/iso-cd", - "name": "debian-9.0", + "mirror_directory": "9.1.0/amd64/iso-cd", + "name": "debian-9.1", "no_proxy": "{{env `no_proxy`}}", "preseed_path": "debian-8/preseed.cfg", - "template": "debian-9.0-amd64", + "template": "debian-9.1-amd64", "version": "TIMESTAMP" } } diff --git a/debian-9.0-i386.json b/debian-9.1-i386.json similarity index 96% rename from debian-9.0-i386.json rename to debian-9.1-i386.json index 46f60f0d7..8687c1dc5 100644 --- a/debian-9.0-i386.json +++ b/debian-9.1-i386.json @@ -222,7 +222,7 @@ } ], "variables": { - "box_basename": "debian-9.0-i386", + "box_basename": "debian-9.1-i386", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", "disk_size": "40960", @@ -230,18 +230,17 @@ "headless": "", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", - "iso_checksum": "3bf78f7b003203a6b771b05fa1790e74ee3ea15d6245a01683f90c02b95c0315", + "iso_checksum": "66ae877bb9e19bd8364db2a62e1657376ab4f56f70a833f28724de6a2133b25a", "iso_checksum_type": "sha256", - "iso_name": "debian-9.0.0-i386-netinst.iso", + "iso_name": "debian-9.1.0-i386-netinst.iso", "memory": "1024", "metadata": "floppy/dummy_metadata.json", "mirror": "http://cdimage.debian.org/cdimage/release", - "mirror_directory": "9.0.0/i386/iso-cd", - "name": "debian-9.0-i386", + "mirror_directory": "9.1.0/i386/iso-cd", + "name": "debian-9.1-i386", "no_proxy": "{{env `no_proxy`}}", "preseed_path": "debian-8/preseed.cfg", - "template": "debian-9.0-i386", + "template": "debian-9.1-i386", "version": "TIMESTAMP" } } - From 2d9cc12d43604955848869a0d1d84a895d5ec6cc Mon Sep 17 00:00:00 2001 From: Seth Thomas <sthomas@chef.io> Date: Mon, 24 Jul 2017 15:58:42 -0700 Subject: [PATCH 0656/1622] Changelog typo fix Signed-off-by: Seth Thomas <sthomas@chef.io> --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7c0c71576..5b8fec9a4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,7 +12,7 @@ - VirtualBox 5.1.24 - VMware Fusion 8.5.8 - Parallels 12.2.1 - - Parallels 1.0.3 + - Packer 1.0.3 ## [2.3.7](https://github.com/chef/bento/tree/2.3.7) (2017-07-03) From 76eac83f7c9a67534c3f549474ee168d06b97908 Mon Sep 17 00:00:00 2001 From: Rickard von Essen <rickard.von.essen@gmail.com> Date: Wed, 26 Jul 2017 06:49:39 +0200 Subject: [PATCH 0657/1622] Updated to FreeBSD 11.1 Signed-off-by: Rickard von Essen <rickard.von.essen@gmail.com> --- ...bsd-11.0-amd64.json => freebsd-11.1-amd64.json | 15 +++++++-------- http/{freebsd-11.0 => freebsd-11}/installerconfig | 0 2 files changed, 7 insertions(+), 8 deletions(-) rename freebsd-11.0-amd64.json => freebsd-11.1-amd64.json (95%) rename http/{freebsd-11.0 => freebsd-11}/installerconfig (100%) diff --git a/freebsd-11.0-amd64.json b/freebsd-11.1-amd64.json similarity index 95% rename from freebsd-11.0-amd64.json rename to freebsd-11.1-amd64.json index 814c66b2a..2e647fea4 100644 --- a/freebsd-11.0-amd64.json +++ b/freebsd-11.1-amd64.json @@ -210,7 +210,7 @@ } ], "variables": { - "box_basename": "freebsd-11.0", + "box_basename": "freebsd-11.1", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", "disk_size": "40960", @@ -218,18 +218,17 @@ "headless": "", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", - "install_path": "freebsd-11.0/installerconfig", - "iso_checksum": "08b12f2dc378f7a61b5469219824c74a2f9faef580acc85ffab45365df79872d", + "install_path": "freebsd-11/installerconfig", + "iso_checksum": "ff4c749ea0aaaceedb2432ba3e0fd0c1b64f5a72141b1ec06b9ced52b5de0dbf", "iso_checksum_type": "sha256", - "iso_name": "FreeBSD-11.0-RELEASE-amd64-disc1.iso", + "iso_name": "FreeBSD-11.1-RELEASE-amd64-disc1.iso", "memory": "1024", "metadata": "floppy/dummy_metadata.json", "mirror": "http://ftp.freebsd.org/pub/FreeBSD", - "mirror_directory": "releases/amd64/amd64/ISO-IMAGES/11.0", - "name": "freebsd-11.0", + "mirror_directory": "releases/amd64/amd64/ISO-IMAGES/11.1", "no_proxy": "{{env `no_proxy`}}", - "template": "freebsd-11.0-amd64", - "version": "TIMESTAMP" + "template": "freebsd-11.1-amd64", + "version": "2.1.TIMESTAMP" } } diff --git a/http/freebsd-11.0/installerconfig b/http/freebsd-11/installerconfig similarity index 100% rename from http/freebsd-11.0/installerconfig rename to http/freebsd-11/installerconfig From 2547e646e793fe11b62b1f113a2b6b37d711905a Mon Sep 17 00:00:00 2001 From: Rickard von Essen <rickard.von.essen@gmail.com> Date: Thu, 27 Jul 2017 07:44:36 +0200 Subject: [PATCH 0658/1622] Removed some OmniOS left overs Signed-off-by: Rickard von Essen <rickard.von.essen@gmail.com> --- floppy/omnios/README.TXT | 1 - vagrantfile_templates/parallels/omnios.rb | 15 --------------- 2 files changed, 16 deletions(-) delete mode 100644 floppy/omnios/README.TXT delete mode 100644 vagrantfile_templates/parallels/omnios.rb diff --git a/floppy/omnios/README.TXT b/floppy/omnios/README.TXT deleted file mode 100644 index 4249186cf..000000000 --- a/floppy/omnios/README.TXT +++ /dev/null @@ -1 +0,0 @@ -A floppy is needed to install under VMware. See: http://omnios.omniti.com/wiki.php/VMwareNotes diff --git a/vagrantfile_templates/parallels/omnios.rb b/vagrantfile_templates/parallels/omnios.rb deleted file mode 100644 index 3ae4c28e9..000000000 --- a/vagrantfile_templates/parallels/omnios.rb +++ /dev/null @@ -1,15 +0,0 @@ -# -*- mode: ruby -*- -# # vi: set ft=ruby : - -Vagrant.require_version ">= 1.1.0" - -Vagrant.configure("2") do |config| - # Disable the base shared folder, Guest Tools are unavailable. - config.vm.synced_folder ".", "/vagrant", disabled: true - - config.vm.provider :parallels do |prl| - # Guest Tools are unavailable. - prl.check_guest_tools = false - prl.functional_psf = false - end -end From 71abf57d8aa31823134f99c2da6474193d7c399b Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith@chef.io> Date: Mon, 31 Jul 2017 16:23:12 -0700 Subject: [PATCH 0659/1622] Update Debian 8.8 -> 8.9 Signed-off-by: Tim Smith <tsmith@chef.io> --- builds.yml | 2 +- debian-8.8-amd64.json => debian-8.9-amd64.json | 13 ++++++------- debian-8.8-i386.json => debian-8.9-i386.json | 13 ++++++------- 3 files changed, 13 insertions(+), 15 deletions(-) rename debian-8.8-amd64.json => debian-8.9-amd64.json (96%) rename debian-8.8-i386.json => debian-8.9-i386.json (96%) diff --git a/builds.yml b/builds.yml index 04bf6f478..3b129da32 100644 --- a/builds.yml +++ b/builds.yml @@ -21,7 +21,7 @@ public: '7.11': - amd64 - i386 - '8.8': + '8.9': - amd64 - i386 '9.0': diff --git a/debian-8.8-amd64.json b/debian-8.9-amd64.json similarity index 96% rename from debian-8.8-amd64.json rename to debian-8.9-amd64.json index 6f7c303dd..63c711b3a 100644 --- a/debian-8.8-amd64.json +++ b/debian-8.9-amd64.json @@ -222,7 +222,7 @@ } ], "variables": { - "box_basename": "debian-8.8", + "box_basename": "debian-8.9", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", "disk_size": "40960", @@ -230,18 +230,17 @@ "headless": "", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", - "iso_checksum": "673079527fdf3a91e8bfc9e0312f94316820ca795bb6a1b2af1e8461eb78179c", + "iso_checksum": "0d55d42629676f2516ae6edfc8af5134194dd5d89ae791329d24fceba2cc3fd8", "iso_checksum_type": "sha256", - "iso_name": "debian-8.8.0-amd64-CD-1.iso", + "iso_name": "debian-8.9.0-amd64-CD-1.iso", "memory": "1024", "metadata": "floppy/dummy_metadata.json", "mirror": "http://cdimage.debian.org/cdimage/archive", - "mirror_directory": "8.8.0/amd64/iso-cd", - "name": "debian-8.8", + "mirror_directory": "8.9.0/amd64/iso-cd", + "name": "debian-8.9", "no_proxy": "{{env `no_proxy`}}", "preseed_path": "debian-8/preseed.cfg", - "template": "debian-8.8-amd64", + "template": "debian-8.9-amd64", "version": "TIMESTAMP" } } - diff --git a/debian-8.8-i386.json b/debian-8.9-i386.json similarity index 96% rename from debian-8.8-i386.json rename to debian-8.9-i386.json index d1e19c12f..d57121084 100644 --- a/debian-8.8-i386.json +++ b/debian-8.9-i386.json @@ -222,7 +222,7 @@ } ], "variables": { - "box_basename": "debian-8.8-i386", + "box_basename": "debian-8.9-i386", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", "disk_size": "40960", @@ -230,18 +230,17 @@ "headless": "", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", - "iso_checksum": "0834db8a6c6eab749be5d25b0451fa46ea96dfb91134df8f26323ff8b79b01ca", + "iso_checksum": "7fd13800ab4446c77cbb6341fbd1cddb9d977fdc4357a0a01eea809a2e7c03b7", "iso_checksum_type": "sha256", - "iso_name": "debian-8.8.0-i386-CD-1.iso", + "iso_name": "debian-8.9.0-i386-CD-1.iso", "memory": "1024", "metadata": "floppy/dummy_metadata.json", "mirror": "http://cdimage.debian.org/cdimage/archive", - "mirror_directory": "8.8.0/i386/iso-cd", - "name": "debian-8.8-i386", + "mirror_directory": "8.9.0/i386/iso-cd", + "name": "debian-8.9-i386", "no_proxy": "{{env `no_proxy`}}", "preseed_path": "debian-8/preseed.cfg", - "template": "debian-8.8-i386", + "template": "debian-8.9-i386", "version": "TIMESTAMP" } } - From cc1dc1e99e7f2dcd6ee8042e8380c95d5a73bac2 Mon Sep 17 00:00:00 2001 From: Li-Wen Hsu <lwhsu@lwhsu.org> Date: Mon, 31 Jul 2017 23:56:27 +0100 Subject: [PATCH 0660/1622] Use https download link Signed-off-by: Li-Wen Hsu <lwhsu@lwhsu.org> --- freebsd-10.3-amd64.json | 2 +- freebsd-10.3-i386.json | 2 +- freebsd-11.1-amd64.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/freebsd-10.3-amd64.json b/freebsd-10.3-amd64.json index efbf4c587..962569c88 100644 --- a/freebsd-10.3-amd64.json +++ b/freebsd-10.3-amd64.json @@ -224,7 +224,7 @@ "iso_name": "FreeBSD-10.3-RELEASE-amd64-disc1.iso", "memory": "1024", "metadata": "floppy/dummy_metadata.json", - "mirror": "http://ftp.freebsd.org/pub/FreeBSD", + "mirror": "https://download.freebsd.org/ftp", "mirror_directory": "releases/amd64/amd64/ISO-IMAGES/10.3", "name": "freebsd-10.3", "no_proxy": "{{env `no_proxy`}}", diff --git a/freebsd-10.3-i386.json b/freebsd-10.3-i386.json index 3e8b01151..ead6b5ff5 100644 --- a/freebsd-10.3-i386.json +++ b/freebsd-10.3-i386.json @@ -224,7 +224,7 @@ "iso_name": "FreeBSD-10.3-RELEASE-i386-disc1.iso", "memory": "1024", "metadata": "floppy/dummy_metadata.json", - "mirror": "http://ftp.freebsd.org/pub/FreeBSD", + "mirror": "https://download.freebsd.org/ftp", "mirror_directory": "releases/i386/i386/ISO-IMAGES/10.3", "name": "freebsd-10.3-i386", "no_proxy": "{{env `no_proxy`}}", diff --git a/freebsd-11.1-amd64.json b/freebsd-11.1-amd64.json index 2e647fea4..0d05c2153 100644 --- a/freebsd-11.1-amd64.json +++ b/freebsd-11.1-amd64.json @@ -224,7 +224,7 @@ "iso_name": "FreeBSD-11.1-RELEASE-amd64-disc1.iso", "memory": "1024", "metadata": "floppy/dummy_metadata.json", - "mirror": "http://ftp.freebsd.org/pub/FreeBSD", + "mirror": "https://download.freebsd.org/ftp", "mirror_directory": "releases/amd64/amd64/ISO-IMAGES/11.1", "no_proxy": "{{env `no_proxy`}}", "template": "freebsd-11.1-amd64", From 63e8601760e0aafe9637659a42aed7ff7dc697a4 Mon Sep 17 00:00:00 2001 From: Li-Wen Hsu <lwhsu@lwhsu.org> Date: Mon, 31 Jul 2017 23:57:53 +0100 Subject: [PATCH 0661/1622] Use virtualbox-ose-additions-nox11 to minimize box size Signed-off-by: Li-Wen Hsu <lwhsu@lwhsu.org> --- scripts/freebsd/vmtools.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/freebsd/vmtools.sh b/scripts/freebsd/vmtools.sh index 96ed21fcc..bb3b7409f 100644 --- a/scripts/freebsd/vmtools.sh +++ b/scripts/freebsd/vmtools.sh @@ -8,7 +8,7 @@ virtualbox-iso|virtualbox-ovf) # Disable X11 because vagrants are (usually) headless echo 'WITHOUT_X11="YES"' >> /etc/make.conf; - pkg install -y virtualbox-ose-additions; + pkg install -y virtualbox-ose-additions-nox11; echo 'vboxdrv_load="YES"' >>/boot/loader.conf; echo 'vboxnet_enable="YES"' >>/etc/rc.conf; From 6359e62d05b5e080fa841993f20a0b4ec4ebd061 Mon Sep 17 00:00:00 2001 From: Mattias Giese <giese@b1-systems.de> Date: Wed, 2 Aug 2017 10:32:09 +0200 Subject: [PATCH 0662/1622] Add instructions for RHEL 7.4 Signed-off-by: Mattias Giese <giese@b1-systems.de> --- rhel-7.4-x86_64.json | 184 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 184 insertions(+) create mode 100644 rhel-7.4-x86_64.json diff --git a/rhel-7.4-x86_64.json b/rhel-7.4-x86_64.json new file mode 100644 index 000000000..3c501356e --- /dev/null +++ b/rhel-7.4-x86_64.json @@ -0,0 +1,184 @@ +{ + "builders": [ + { + "boot_command": [ + "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": "{{user `disk_size`}}", + "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "guest_os_type": "RedHat_64", + "hard_drive_interface": "sata", + "headless": "{{ user `headless` }}", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-virtualbox", + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "virtualbox-iso", + "vboxmanage": [ + [ + "modifyvm", + "{{.Name}}", + "--memory", + "{{ user `memory` }}" + ], + [ + "modifyvm", + "{{.Name}}", + "--cpus", + "{{ user `cpus` }}" + ] + ], + "virtualbox_version_file": ".vbox_version", + "vm_name": "{{ user `template` }}" + }, + { + "boot_command": [ + "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": "{{user `disk_size`}}", + "guest_os_type": "rhel7-64", + "headless": "{{ user `headless` }}", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-vmware", + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "tools_upload_flavor": "linux", + "type": "vmware-iso", + "vm_name": "{{ user `template` }}", + "vmx_data": { + "cpuid.coresPerSocket": "1", + "memsize": "{{ user `memory` }}", + "numvcpus": "{{ user `cpus` }}" + }, + "vmx_remove_ethernet_interfaces": true + }, + { + "boot_command": [ + "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": "{{user `disk_size`}}", + "guest_os_type": "rhel", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-parallels", + "parallels_tools_flavor": "lin", + "prlctl": [ + [ + "set", + "{{.Name}}", + "--memsize", + "{{ user `memory` }}" + ], + [ + "set", + "{{.Name}}", + "--cpus", + "{{ user `cpus` }}" + ] + ], + "prlctl_version_file": ".prlctl_version", + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "parallels-iso", + "vm_name": "{{ user `template` }}" + }, + { + "boot_command": [ + "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": "{{user `disk_size`}}", + "headless": "{{ user `headless` }}", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-qemu", + "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "qemu", + "vm_name": "{{ user `template` }}" + } + ], + "post-processors": [ + { + "output": "builds/{{user `box_basename`}}.{{.Provider}}.box", + "type": "vagrant" + } + ], + "provisioners": [ + { + "destination": "/tmp/bento-metadata.json", + "source": "{{user `metadata`}}", + "type": "file" + }, + { + "environment_vars": [ + "HOME_DIR=/home/vagrant", + "http_proxy={{user `http_proxy`}}", + "https_proxy={{user `https_proxy`}}", + "no_proxy={{user `no_proxy`}}" + ], + "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", + "scripts": [ + "scripts/common/metadata.sh", + "scripts/centos/networking.sh", + "scripts/common/sshd.sh", + "scripts/common/vagrant.sh", + "scripts/common/virtualbox.sh", + "scripts/common/vmware.sh", + "scripts/common/parallels.sh", + "scripts/centos/cleanup.sh", + "scripts/common/minimize.sh" + ], + "type": "shell" + } + ], + "variables": { + "arch": "64", + "box_basename": "rhel-7.4", + "build_timestamp": "{{isotime \"20060102150405\"}}", + "cpus": "1", + "disk_size": "40960", + "git_revision": "__unknown_git_revision__", + "headless": "", + "http_proxy": "{{env `http_proxy`}}", + "https_proxy": "{{env `https_proxy`}}", + "iso_checksum": "431a58c8c0351803a608ffa56948c5a7861876f78ccbe784724dd8c987ff7000", + "iso_checksum_type": "sha256", + "iso_name": "rhel-server-7.4-x86_64-dvd.iso", + "ks_path": "centos-7.3/ks.cfg", + "memory": "1024", + "metadata": "floppy/dummy_metadata.json", + "mirror": "http://YOU-MUST-PROVIDE-YOUR-OWN-ISO.sorry", + "mirror_directory": "rhel", + "name": "rhel-7.4", + "no_proxy": "{{env `no_proxy`}}", + "template": "rhel-7.4-x86_64", + "version": "TIMESTAMP" + } +} + From 0eaec071779d8de7404e58e78d6ef262c80a157e Mon Sep 17 00:00:00 2001 From: Ed Morley <edmorley@users.noreply.github.com> Date: Fri, 4 Aug 2017 10:52:28 +0100 Subject: [PATCH 0663/1622] Don't use Hyper-V preseed on virtualbox/vmware Ubuntu 16.04 boxes This reverts the change inadvertently made in #844. Fixes #864. Signed-off-by: Ed Morley <edmorley@users.noreply.github.com> --- ubuntu-16.04-amd64.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ubuntu-16.04-amd64.json b/ubuntu-16.04-amd64.json index 32936cbf5..2754b6fad 100644 --- a/ubuntu-16.04-amd64.json +++ b/ubuntu-16.04-amd64.json @@ -308,7 +308,7 @@ "mirror_directory": "16.04.2", "name": "ubuntu-16.04", "no_proxy": "{{env `no_proxy`}}", - "preseed_path": "ubuntu/preseed-hyperv.cfg", + "preseed_path": "ubuntu/preseed.cfg", "template": "ubuntu-16.04-amd64", "version": "TIMESTAMP" } From 15b3af70cecb2482da4992a70d803cb74324b90d Mon Sep 17 00:00:00 2001 From: Ed Morley <edmorley@users.noreply.github.com> Date: Fri, 4 Aug 2017 10:54:29 +0100 Subject: [PATCH 0664/1622] Make Hyper-V Ubuntu boxes use archive.ubuntu.com too Applies the fix from #838 to the Hyper-V preseed config added in #844. Refs #864. Signed-off-by: Ed Morley <edmorley@users.noreply.github.com> --- http/ubuntu/preseed-hyperv.cfg | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/http/ubuntu/preseed-hyperv.cfg b/http/ubuntu/preseed-hyperv.cfg index 54f1fb4f5..0422b5b9e 100755 --- a/http/ubuntu/preseed-hyperv.cfg +++ b/http/ubuntu/preseed-hyperv.cfg @@ -5,6 +5,10 @@ d-i clock-setup/utc-auto boolean true d-i finish-install/reboot_in_progress note d-i grub-installer/only_debian boolean true d-i grub-installer/with_other_os boolean true +d-i mirror/country string manual +d-i mirror/http/directory string /ubuntu/ +d-i mirror/http/hostname string archive.ubuntu.com +d-i mirror/http/proxy string d-i partman-auto-lvm/guided_size string max d-i partman-auto/choose_recipe select atomic d-i partman-auto/method string lvm From f707129344bab35bdba12ca25ec2cf52042eb76b Mon Sep 17 00:00:00 2001 From: Mattias Giese <giese@b1-systems.de> Date: Mon, 7 Aug 2017 14:49:00 +0200 Subject: [PATCH 0665/1622] Remove old definition for RHEL 7.3 Signed-off-by: Mattias Giese <giese@b1-systems.de> --- rhel-7.3-x86_64.json | 184 ------------------------------------------- 1 file changed, 184 deletions(-) delete mode 100644 rhel-7.3-x86_64.json diff --git a/rhel-7.3-x86_64.json b/rhel-7.3-x86_64.json deleted file mode 100644 index cc8153bb0..000000000 --- a/rhel-7.3-x86_64.json +++ /dev/null @@ -1,184 +0,0 @@ -{ - "builders": [ - { - "boot_command": [ - "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", - "guest_os_type": "RedHat_64", - "hard_drive_interface": "sata", - "headless": "{{ user `headless` }}", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-virtualbox", - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "virtualbox-iso", - "vboxmanage": [ - [ - "modifyvm", - "{{.Name}}", - "--memory", - "{{ user `memory` }}" - ], - [ - "modifyvm", - "{{.Name}}", - "--cpus", - "{{ user `cpus` }}" - ] - ], - "virtualbox_version_file": ".vbox_version", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "rhel7-64", - "headless": "{{ user `headless` }}", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-vmware", - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "tools_upload_flavor": "linux", - "type": "vmware-iso", - "vm_name": "{{ user `template` }}", - "vmx_data": { - "cpuid.coresPerSocket": "1", - "memsize": "{{ user `memory` }}", - "numvcpus": "{{ user `cpus` }}" - }, - "vmx_remove_ethernet_interfaces": true - }, - { - "boot_command": [ - "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "rhel", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-parallels", - "parallels_tools_flavor": "lin", - "prlctl": [ - [ - "set", - "{{.Name}}", - "--memsize", - "{{ user `memory` }}" - ], - [ - "set", - "{{.Name}}", - "--cpus", - "{{ user `cpus` }}" - ] - ], - "prlctl_version_file": ".prlctl_version", - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "parallels-iso", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "headless": "{{ user `headless` }}", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-qemu", - "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "qemu", - "vm_name": "{{ user `template` }}" - } - ], - "post-processors": [ - { - "output": "builds/{{user `box_basename`}}.{{.Provider}}.box", - "type": "vagrant" - } - ], - "provisioners": [ - { - "destination": "/tmp/bento-metadata.json", - "source": "{{user `metadata`}}", - "type": "file" - }, - { - "environment_vars": [ - "HOME_DIR=/home/vagrant", - "http_proxy={{user `http_proxy`}}", - "https_proxy={{user `https_proxy`}}", - "no_proxy={{user `no_proxy`}}" - ], - "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", - "scripts": [ - "scripts/common/metadata.sh", - "scripts/centos/networking.sh", - "scripts/common/sshd.sh", - "scripts/common/vagrant.sh", - "scripts/common/virtualbox.sh", - "scripts/common/vmware.sh", - "scripts/common/parallels.sh", - "scripts/centos/cleanup.sh", - "scripts/common/minimize.sh" - ], - "type": "shell" - } - ], - "variables": { - "arch": "64", - "box_basename": "rhel-7.3", - "build_timestamp": "{{isotime \"20060102150405\"}}", - "cpus": "1", - "disk_size": "40960", - "git_revision": "__unknown_git_revision__", - "headless": "", - "http_proxy": "{{env `http_proxy`}}", - "https_proxy": "{{env `https_proxy`}}", - "iso_checksum": "120acbca7b3d55465eb9f8ef53ad7365f2997d42d4f83d7cc285bf5c71e1131f", - "iso_checksum_type": "sha256", - "iso_name": "rhel-server-7.3-x86_64-dvd.iso", - "ks_path": "centos-7.3/ks.cfg", - "memory": "1024", - "metadata": "floppy/dummy_metadata.json", - "mirror": "http://YOU-MUST-PROVIDE-YOUR-OWN-ISO.sorry", - "mirror_directory": "rhel", - "name": "rhel-7.3", - "no_proxy": "{{env `no_proxy`}}", - "template": "rhel-7.3-x86_64", - "version": "TIMESTAMP" - } -} - From 851119d41f0bc064d5cb4cfabe3703fc20c9d9f6 Mon Sep 17 00:00:00 2001 From: Rickard von Essen <rickard.von.essen@gmail.com> Date: Wed, 9 Aug 2017 06:17:05 +0200 Subject: [PATCH 0666/1622] Fedora 24 EOL yesterday Signed-off-by: Rickard von Essen <rickard.von.essen@gmail.com> --- fedora-24-i386.json | 181 ---------------------------------------- fedora-24-x86_64.json | 187 ------------------------------------------ 2 files changed, 368 deletions(-) delete mode 100644 fedora-24-i386.json delete mode 100644 fedora-24-x86_64.json diff --git a/fedora-24-i386.json b/fedora-24-i386.json deleted file mode 100644 index 2a0ceeda8..000000000 --- a/fedora-24-i386.json +++ /dev/null @@ -1,181 +0,0 @@ -{ - "builders": [ - { - "boot_command": [ - "<tab> linux ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", - "guest_os_type": "Fedora", - "hard_drive_interface": "sata", - "headless": "{{ user `headless` }}", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-virtualbox", - "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "virtualbox-iso", - "vboxmanage": [ - [ - "modifyvm", - "{{.Name}}", - "--memory", - "{{ user `memory` }}" - ], - [ - "modifyvm", - "{{.Name}}", - "--cpus", - "{{ user `cpus` }}" - ] - ], - "virtualbox_version_file": ".vbox_version", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<tab> linux ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "fedora", - "headless": "{{ user `headless` }}", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-vmware", - "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "tools_upload_flavor": "linux", - "type": "vmware-iso", - "vm_name": "{{ user `template` }}", - "vmx_data": { - "cpuid.coresPerSocket": "1", - "memsize": "{{ user `memory` }}", - "numvcpus": "{{ user `cpus` }}" - }, - "vmx_remove_ethernet_interfaces": true - }, - { - "boot_command": [ - "<tab> linux ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "fedora-core", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-parallels", - "parallels_tools_flavor": "lin", - "prlctl": [ - [ - "set", - "{{.Name}}", - "--memsize", - "{{ user `memory` }}" - ], - [ - "set", - "{{.Name}}", - "--cpus", - "{{ user `cpus` }}" - ] - ], - "prlctl_version_file": ".prlctl_version", - "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "parallels-iso", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<tab> linux ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "headless": "{{ user `headless` }}", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-qemu", - "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "qemu", - "vm_name": "{{ user `template` }}" - } - ], - "post-processors": [ - { - "output": "builds/{{user `box_basename`}}.{{.Provider}}.box", - "type": "vagrant" - } - ], - "provisioners": [ - { - "destination": "/tmp/bento-metadata.json", - "source": "{{user `metadata`}}", - "type": "file" - }, - { - "environment_vars": [], - "execute_command": "echo 'vagrant' | {{.Vars}} sudo -E -S bash '{{.Path}}'", - "scripts": [ - "scripts/common/metadata.sh", - "scripts/fedora/swap.sh", - "scripts/fedora/fix-slow-dns.sh", - "scripts/fedora/build-tools.sh", - "scripts/common/sshd.sh", - "scripts/common/virtualbox.sh", - "scripts/common/vmware.sh", - "scripts/common/parallels.sh", - "scripts/common/vagrant.sh", - "scripts/fedora/cleanup.sh", - "scripts/common/minimize.sh" - ], - "type": "shell" - } - ], - "variables": { - "arch": "32", - "box_basename": "fedora-24-i386", - "build_timestamp": "{{isotime \"20060102150405\"}}", - "cpus": "1", - "disk_size": "40960", - "git_revision": "__unknown_git_revision__", - "headless": "", - "http_proxy": "{{env `http_proxy`}}", - "https_proxy": "{{env `https_proxy`}}", - "iso_checksum": "93c0bfe6e6bf23ca22cc1a85636ed15834336ee40a57bfe374f0044ad2d864b0", - "iso_checksum_type": "sha256", - "iso_name": "Fedora-Server-dvd-i386-24-1.2.iso", - "ks_path": "fedora/ks.cfg", - "memory": "1024", - "metadata": "floppy/dummy_metadata.json", - "mirror": "http://download.fedoraproject.org/pub/fedora/linux", - "mirror_directory": "releases/24/Server/i386/iso", - "name": "fedora-24-i386", - "no_proxy": "{{env `no_proxy`}}", - "template": "fedora-24-i386", - "version": "TIMESTAMP" - } -} - diff --git a/fedora-24-x86_64.json b/fedora-24-x86_64.json deleted file mode 100644 index de4843d3a..000000000 --- a/fedora-24-x86_64.json +++ /dev/null @@ -1,187 +0,0 @@ -{ - "builders": [ - { - "boot_command": [ - "<tab> linux ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", - "guest_os_type": "Fedora_64", - "hard_drive_interface": "sata", - "headless": "{{ user `headless` }}", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-virtualbox", - "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "virtualbox-iso", - "vboxmanage": [ - [ - "modifyvm", - "{{.Name}}", - "--memory", - "{{ user `memory` }}" - ], - [ - "modifyvm", - "{{.Name}}", - "--cpus", - "{{ user `cpus` }}" - ] - ], - "virtualbox_version_file": ".vbox_version", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<tab> linux ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "fedora-64", - "headless": "{{ user `headless` }}", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-vmware", - "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "tools_upload_flavor": "linux", - "type": "vmware-iso", - "vm_name": "{{ user `template` }}", - "vmx_data": { - "cpuid.coresPerSocket": "1", - "ethernet0.pciSlotNumber": "32", - "memsize": "{{ user `memory` }}", - "numvcpus": "{{ user `cpus` }}" - }, - "vmx_remove_ethernet_interfaces": true - }, - { - "boot_command": [ - "<tab> linux ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "fedora-core", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-parallels", - "parallels_tools_flavor": "lin", - "prlctl": [ - [ - "set", - "{{.Name}}", - "--memsize", - "{{ user `memory` }}" - ], - [ - "set", - "{{.Name}}", - "--cpus", - "{{ user `cpus` }}" - ] - ], - "prlctl_version_file": ".prlctl_version", - "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "parallels-iso", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<tab> linux ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "headless": "{{ user `headless` }}", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-qemu", - "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "qemu", - "vm_name": "{{ user `template` }}" - } - ], - "post-processors": [ - { - "output": "builds/{{user `box_basename`}}.{{.Provider}}.box", - "type": "vagrant" - } - ], - "provisioners": [ - { - "destination": "/tmp/bento-metadata.json", - "source": "{{user `metadata`}}", - "type": "file" - }, - { - "environment_vars": [ - "HOME_DIR=/home/vagrant", - "http_proxy={{user `http_proxy`}}", - "https_proxy={{user `https_proxy`}}", - "no_proxy={{user `no_proxy`}}" - ], - "execute_command": "echo 'vagrant' | {{.Vars}} sudo -E -S bash '{{.Path}}'", - "scripts": [ - "scripts/common/metadata.sh", - "scripts/fedora/swap.sh", - "scripts/fedora/fix-slow-dns.sh", - "scripts/fedora/build-tools.sh", - "scripts/common/sshd.sh", - "scripts/common/virtualbox.sh", - "scripts/common/vmware.sh", - "scripts/common/parallels.sh", - "scripts/common/vagrant.sh", - "scripts/fedora/cleanup.sh", - "scripts/common/minimize.sh" - ], - "type": "shell" - } - ], - "variables": { - "arch": "64", - "box_basename": "fedora-24", - "build_timestamp": "{{isotime \"20060102150405\"}}", - "cpus": "1", - "disk_size": "40960", - "git_revision": "__unknown_git_revision__", - "headless": "", - "http_proxy": "{{env `http_proxy`}}", - "https_proxy": "{{env `https_proxy`}}", - "iso_checksum": "1c0971d4c1a37bb06ec603ed3ded0af79e22069499443bb2d47e501c9ef42ae8", - "iso_checksum_type": "sha256", - "iso_name": "Fedora-Server-dvd-x86_64-24-1.2.iso", - "ks_path": "fedora/ks.cfg", - "memory": "1024", - "metadata": "floppy/dummy_metadata.json", - "mirror": "http://download.fedoraproject.org/pub/fedora/linux", - "mirror_directory": "releases/24/Server/x86_64/iso", - "name": "fedora-24", - "no_proxy": "{{env `no_proxy`}}", - "template": "fedora-24-x86_64", - "version": "TIMESTAMP" - } -} - From 93b1ddf2a9a77c826361da633fab28a0f06fa316 Mon Sep 17 00:00:00 2001 From: Jakob Weisblat <jakobw@yubico.com> Date: Wed, 9 Aug 2017 14:51:41 +0200 Subject: [PATCH 0667/1622] scripts/debian: disable udev hack on stretch+ Signed-off-by: Jakob Weisblat <jakobw@yubico.com> --- scripts/debian/networking.sh | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/scripts/debian/networking.sh b/scripts/debian/networking.sh index d66092ad8..83e03a278 100644 --- a/scripts/debian/networking.sh +++ b/scripts/debian/networking.sh @@ -1,11 +1,18 @@ #!/bin/sh -eux -# Disable automatic udev rules for network interfaces in Ubuntu, -# source: http://6.ptmc.org/164/ -rm -f /etc/udev/rules.d/70-persistent-net.rules; -mkdir -p /etc/udev/rules.d/70-persistent-net.rules; -rm -f /lib/udev/rules.d/75-persistent-net-generator.rules; -rm -rf /dev/.udev/ /var/lib/dhcp/*; +debian_version="`lsb_release -r | awk '{print $2}'`"; +major_version="`echo $debian_version | awk -F. '{print $1}'`"; + + +if [ "$major_version" -le "8" ]; then + echo "Disabling automatic udev rules for network interfaces in Debian" + # Disable automatic udev rules for network interfaces in Ubuntu, + # source: http://6.ptmc.org/164/ + rm -f /etc/udev/rules.d/70-persistent-net.rules; + mkdir -p /etc/udev/rules.d/70-persistent-net.rules; + rm -f /lib/udev/rules.d/75-persistent-net-generator.rules; + rm -rf /dev/.udev/ /var/lib/dhcp/*; +fi # Adding a 2 sec delay to the interface up, to make the dhclient happy echo "pre-up sleep 2" >> /etc/network/interfaces From 92be4737223d79ede50511cf5ab887c392b5c5a0 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith@chef.io> Date: Wed, 9 Aug 2017 10:49:29 -0700 Subject: [PATCH 0668/1622] Update for opensuse 42.3 and use a generic autoinst dir Signed-off-by: Tim Smith <tsmith@chef.io> --- builds.yml | 6 +++--- .../autoinst.xml | 2 +- ...2-x86_64.json => opensuse-leap-42.3-x86_64.json | 14 +++++++------- 3 files changed, 11 insertions(+), 11 deletions(-) rename http/{opensuse-leap-42.2 => opensuse-leap}/autoinst.xml (99%) rename opensuse-leap-42.2-x86_64.json => opensuse-leap-42.3-x86_64.json (94%) diff --git a/builds.yml b/builds.yml index 3b129da32..2d6655ff8 100644 --- a/builds.yml +++ b/builds.yml @@ -39,7 +39,7 @@ public: '11.0': - amd64 opensuse-leap: - '42.2': + '42.3': - x86_64 ubuntu: '14.04': @@ -61,6 +61,6 @@ private: - x86_64 broken: - - opensuse-leap-42.2-x86_64-parallels-iso - - opensuse-leap-42.2-x86_64-vmware-iso + - opensuse-leap-42.3-x86_64-parallels-iso + - opensuse-leap-42.3-x86_64-vmware-iso - debian-9.0-x86_64-vmware-iso diff --git a/http/opensuse-leap-42.2/autoinst.xml b/http/opensuse-leap/autoinst.xml similarity index 99% rename from http/opensuse-leap-42.2/autoinst.xml rename to http/opensuse-leap/autoinst.xml index 8bf0c563e..cdcefc3a8 100644 --- a/http/opensuse-leap-42.2/autoinst.xml +++ b/http/opensuse-leap/autoinst.xml @@ -108,7 +108,7 @@ <dhcp_hostname config:type="boolean">true</dhcp_hostname> <dhcp_resolv config:type="boolean">true</dhcp_resolv> <domain>vagrantup.com</domain> - <hostname>opensuse-leap-42.2-x64</hostname> + <hostname>opensuse-leap-x64</hostname> </dns> <interfaces config:type="list"> <interface> diff --git a/opensuse-leap-42.2-x86_64.json b/opensuse-leap-42.3-x86_64.json similarity index 94% rename from opensuse-leap-42.2-x86_64.json rename to opensuse-leap-42.3-x86_64.json index 81cf163b8..5a8bbbf53 100644 --- a/opensuse-leap-42.2-x86_64.json +++ b/opensuse-leap-42.3-x86_64.json @@ -177,8 +177,8 @@ ], "variables": { "arch": "64", - "autoinst_cfg": "opensuse-leap-42.2/autoinst.xml", - "box_basename": "opensuse-leap-42.2", + "autoinst_cfg": "opensuse-leap/autoinst.xml", + "box_basename": "opensuse-leap-42.3", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", "disk_size": "20480", @@ -186,16 +186,16 @@ "headless": "", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", - "iso_checksum": "ba5af6b0ac4d42d801de642304eb88ca9fd65a61b6c3ff25724182494f288f00", + "iso_checksum": "195baca6c5f3b7f3ad4d7984a7f7bd5c4a37be2eb67e58b65d07ac3a2b599e83", "iso_checksum_type": "sha256", - "iso_name": "openSUSE-Leap-42.2-DVD-x86_64.iso", + "iso_name": "openSUSE-Leap-42.3-DVD-x86_64.iso", "memory": "768", "metadata": "floppy/dummy_metadata.json", "mirror": "http://suse.mobile-central.org/distribution", - "mirror_directory": "leap/42.2/iso", - "name": "opensuse-leap-42.2", + "mirror_directory": "leap/42.3/iso", + "name": "opensuse-leap-42.3", "no_proxy": "{{env `no_proxy`}}", - "template": "opensuse-leap-42.2-x86_64", + "template": "opensuse-leap-42.3-x86_64", "version": "TIMESTAMP" } } From b0977b227c5c02c614c8dfc7b02ba2f7c7fa366f Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith@chef.io> Date: Thu, 29 Jun 2017 12:46:26 -0700 Subject: [PATCH 0669/1622] Remove additional firmware files on CentOS 6/7 Signed-off-by: Tim Smith <tsmith@chef.io> --- http/centos-6.9/ks.cfg | 1 + http/centos-7.3/ks.cfg | 3 +++ 2 files changed, 4 insertions(+) diff --git a/http/centos-6.9/ks.cfg b/http/centos-6.9/ks.cfg index edf63ccda..f39b0e123 100644 --- a/http/centos-6.9/ks.cfg +++ b/http/centos-6.9/ks.cfg @@ -62,6 +62,7 @@ virt-what -rt73usb-firmware -xorg-x11-drv-ati-firmware -zd1211-firmware +-kernel-firmware %post # Force to set SELinux to a permissive mode diff --git a/http/centos-7.3/ks.cfg b/http/centos-7.3/ks.cfg index 15e566cdd..32a780b3c 100644 --- a/http/centos-7.3/ks.cfg +++ b/http/centos-7.3/ks.cfg @@ -60,6 +60,7 @@ bzip2 -iwl6000g2b-firmware -iwl6050-firmware -iwl7260-firmware +-iwl7265-firmware -libertas-usb8388-firmware -libertas-sd8686-firmware -libertas-sd8787-firmware @@ -72,6 +73,8 @@ bzip2 -rt73usb-firmware -xorg-x11-drv-ati-firmware -zd1211-firmware +-alsa-tools-firmware +-alsa-firmware %end %post From 25b311db076b106be0968ba9eebeee1749924ff3 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith@chef.io> Date: Thu, 29 Jun 2017 15:35:51 -0700 Subject: [PATCH 0670/1622] Make sure firmware isn't installed on centos 7 Signed-off-by: Tim Smith <tsmith@chef.io> --- http/centos-7.3/ks.cfg | 1 + 1 file changed, 1 insertion(+) diff --git a/http/centos-7.3/ks.cfg b/http/centos-7.3/ks.cfg index 32a780b3c..fce03f92a 100644 --- a/http/centos-7.3/ks.cfg +++ b/http/centos-7.3/ks.cfg @@ -75,6 +75,7 @@ bzip2 -zd1211-firmware -alsa-tools-firmware -alsa-firmware +-kernel-firmware %end %post From a988a4b202b8ac84b8b23404d9ce5337aefcf460 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith@chef.io> Date: Thu, 29 Jun 2017 16:45:15 -0700 Subject: [PATCH 0671/1622] Avoid the media checking during the centos builds The default boot menu option is media check & install. If we arrow up first we get just the install option. This shaves a bit of time off the install. Signed-off-by: Tim Smith <tsmith@chef.io> --- centos-7.3-x86_64.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/centos-7.3-x86_64.json b/centos-7.3-x86_64.json index c190f24a3..15e574734 100644 --- a/centos-7.3-x86_64.json +++ b/centos-7.3-x86_64.json @@ -2,7 +2,7 @@ "builders": [ { "boot_command": [ - "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" + "<up><wait><tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", @@ -40,7 +40,7 @@ }, { "boot_command": [ - "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" + "<up><wait><tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", @@ -68,7 +68,7 @@ }, { "boot_command": [ - "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" + "<up><wait><tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", @@ -131,7 +131,7 @@ }, { "boot_command": [ - "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" + "<up><wait><tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", From af623adeadffa06f162f9c7b3df302dbd76413c9 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith@chef.io> Date: Wed, 9 Aug 2017 09:27:54 -0700 Subject: [PATCH 0672/1622] Use more generic named KS paths for RHEL This avoids us having to move these files every time a point release comes out. Signed-off-by: Tim Smith <tsmith@chef.io> --- centos-6.9-i386.json | 5 ++--- centos-6.9-x86_64.json | 5 ++--- centos-7.3-x86_64.json | 5 ++--- http/{centos-5.11 => rhel-5}/ks.cfg | 0 http/{centos-6.9 => rhel-6}/ks.cfg | 0 http/{centos-7.3 => rhel-7}/ks.cfg | 0 oracle-5.11-i386.json | 2 +- oracle-5.11-x86_64.json | 2 +- oracle-6.9-i386.json | 2 +- oracle-6.9-x86_64.json | 2 +- oracle-7.3-x86_64.json | 3 +-- rhel-5.11-i386.json | 2 +- rhel-5.11-x86_64.json | 2 +- rhel-6.9-i386.json | 2 +- rhel-6.9-x86_64.json | 2 +- rhel-7.4-x86_64.json | 2 +- 16 files changed, 16 insertions(+), 20 deletions(-) rename http/{centos-5.11 => rhel-5}/ks.cfg (100%) rename http/{centos-6.9 => rhel-6}/ks.cfg (100%) rename http/{centos-7.3 => rhel-7}/ks.cfg (100%) diff --git a/centos-6.9-i386.json b/centos-6.9-i386.json index 127fe9efd..651cf916c 100644 --- a/centos-6.9-i386.json +++ b/centos-6.9-i386.json @@ -110,7 +110,7 @@ "cpu": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "floppy_files": [ - "http/centos-6.9/ks.cfg" + "http/rhel-6/ks.cfg" ], "generation": "{{user `hyperv_generation`}}", "guest_additions_mode": "disable", @@ -197,7 +197,7 @@ "iso_checksum": "0724a468ec0c4ac46ac6a1daba0273be697a37bb7f4e9fed8ad84ad270cdee2f", "iso_checksum_type": "sha256", "iso_name": "CentOS-6.9-i386-bin-DVD1.iso", - "ks_path": "centos-6.9/ks.cfg", + "ks_path": "rhel-6/ks.cfg", "memory": "1024", "metadata": "floppy/dummy_metadata.json", "mirror": "http://mirrors.kernel.org/centos", @@ -208,4 +208,3 @@ "version": "TIMESTAMP" } } - diff --git a/centos-6.9-x86_64.json b/centos-6.9-x86_64.json index 4018af388..5f988e857 100644 --- a/centos-6.9-x86_64.json +++ b/centos-6.9-x86_64.json @@ -110,7 +110,7 @@ "cpu": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "floppy_files": [ - "http/centos-6.9/ks.cfg" + "http/rhel-6/ks.cfg" ], "generation": "{{user `hyperv_generation`}}", "guest_additions_mode": "disable", @@ -197,7 +197,7 @@ "iso_checksum": "d27cf37a40509c17ad70f37bc743f038c1feba00476fe6b69682aa424c399ea6", "iso_checksum_type": "sha256", "iso_name": "CentOS-6.9-x86_64-bin-DVD1.iso", - "ks_path": "centos-6.9/ks.cfg", + "ks_path": "rhel-6/ks.cfg", "memory": "1024", "metadata": "floppy/dummy_metadata.json", "mirror": "http://mirrors.kernel.org/centos", @@ -208,4 +208,3 @@ "version": "TIMESTAMP" } } - diff --git a/centos-7.3-x86_64.json b/centos-7.3-x86_64.json index 15e574734..5dbfe1994 100644 --- a/centos-7.3-x86_64.json +++ b/centos-7.3-x86_64.json @@ -110,7 +110,7 @@ "cpu": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "floppy_files": [ - "http/centos-7.3/ks.cfg" + "http/rhel-7/ks.cfg" ], "generation": "{{user `hyperv_generation`}}", "guest_additions_mode": "disable", @@ -198,7 +198,7 @@ "iso_checksum": "c455ee948e872ad2194bdddd39045b83634e8613249182b88f549bb2319d97eb", "iso_checksum_type": "sha256", "iso_name": "CentOS-7-x86_64-DVD-1611.iso", - "ks_path": "centos-7.3/ks.cfg", + "ks_path": "rhel-7/ks.cfg", "memory": "1024", "metadata": "floppy/dummy_metadata.json", "mirror": "http://mirrors.kernel.org/centos", @@ -209,4 +209,3 @@ "version": "TIMESTAMP" } } - diff --git a/http/centos-5.11/ks.cfg b/http/rhel-5/ks.cfg similarity index 100% rename from http/centos-5.11/ks.cfg rename to http/rhel-5/ks.cfg diff --git a/http/centos-6.9/ks.cfg b/http/rhel-6/ks.cfg similarity index 100% rename from http/centos-6.9/ks.cfg rename to http/rhel-6/ks.cfg diff --git a/http/centos-7.3/ks.cfg b/http/rhel-7/ks.cfg similarity index 100% rename from http/centos-7.3/ks.cfg rename to http/rhel-7/ks.cfg diff --git a/oracle-5.11-i386.json b/oracle-5.11-i386.json index 305789b45..33f56b31c 100644 --- a/oracle-5.11-i386.json +++ b/oracle-5.11-i386.json @@ -169,7 +169,7 @@ "iso_checksum": "E60962C4EBF8920BBD828EFE32A78A7CC8F28E3B", "iso_checksum_type": "sha1", "iso_name": "Enterprise-R5-U11-Server-i386-dvd.iso", - "ks_path": "centos-5.11/ks.cfg", + "ks_path": "rhel-5/ks.cfg", "memory": "1024", "metadata": "floppy/dummy_metadata.json", "mirror": "http://mirrors.dotsrc.org/oracle-linux", diff --git a/oracle-5.11-x86_64.json b/oracle-5.11-x86_64.json index f00a51ea7..254e56a39 100644 --- a/oracle-5.11-x86_64.json +++ b/oracle-5.11-x86_64.json @@ -175,7 +175,7 @@ "iso_checksum": "2D38F76652CBC1367FDF30024F13CDE5F6BF34DF", "iso_checksum_type": "sha1", "iso_name": "Enterprise-R5-U11-Server-x86_64-dvd.iso", - "ks_path": "centos-5.11/ks.cfg", + "ks_path": "rhel-5/ks.cfg", "memory": "1024", "metadata": "floppy/dummy_metadata.json", "mirror": "http://mirrors.dotsrc.org/oracle-linux", diff --git a/oracle-6.9-i386.json b/oracle-6.9-i386.json index a239c16fe..a2211422c 100644 --- a/oracle-6.9-i386.json +++ b/oracle-6.9-i386.json @@ -170,7 +170,7 @@ "iso_checksum": "fd07f775e7fa52e9ab021eb7dccb78453fc61f3d3b712ec426f6b1bf5020318b", "iso_checksum_type": "sha256", "iso_name": "OracleLinux-R6-U9-Server-i386-dvd.iso", - "ks_path": "centos-6.9/ks.cfg", + "ks_path": "rhel-6/ks.cfg", "memory": "1024", "metadata": "floppy/dummy_metadata.json", "mirror": "http://mirrors.kernel.org/oracle/", diff --git a/oracle-6.9-x86_64.json b/oracle-6.9-x86_64.json index 85e60433c..8ca6dffd0 100644 --- a/oracle-6.9-x86_64.json +++ b/oracle-6.9-x86_64.json @@ -170,7 +170,7 @@ "iso_checksum": "c32e2a7c8eb471db731741f1a30be37e49deda8ce961710273a71b26c9a04a36", "iso_checksum_type": "sha256", "iso_name": "OracleLinux-R6-U9-Server-x86_64-dvd.iso", - "ks_path": "centos-6.9/ks.cfg", + "ks_path": "rhel-6/ks.cfg", "memory": "1024", "metadata": "floppy/dummy_metadata.json", "mirror": "http://mirrors.kernel.org/oracle/", diff --git a/oracle-7.3-x86_64.json b/oracle-7.3-x86_64.json index a31320b23..95ac237b5 100644 --- a/oracle-7.3-x86_64.json +++ b/oracle-7.3-x86_64.json @@ -170,7 +170,7 @@ "iso_checksum": "2ad5327428c44d505a7d882a273cb3f5fbac4e56e739cf18f895565dde987101", "iso_checksum_type": "sha256", "iso_name": "OracleLinux-R7-U3-Server-x86_64-dvd.iso", - "ks_path": "centos-7.3/ks.cfg", + "ks_path": "rhel-7/ks.cfg", "memory": "1024", "metadata": "floppy/dummy_metadata.json", "mirror": "http://mirrors.dotsrc.org/oracle-linux", @@ -181,4 +181,3 @@ "version": "TIMESTAMP" } } - diff --git a/rhel-5.11-i386.json b/rhel-5.11-i386.json index 468f14e8f..19ec2b49d 100644 --- a/rhel-5.11-i386.json +++ b/rhel-5.11-i386.json @@ -169,7 +169,7 @@ "iso_checksum": "4e38e4ed06d83efb10446e7db19d96761715cdbdbf0bbfacb978b44ce368bbe2", "iso_checksum_type": "sha256", "iso_name": "rhel-server-5.11-i386-dvd.iso", - "ks_path": "centos-5.11/ks.cfg", + "ks_path": "rhel-5/ks.cfg", "memory": "1024", "metadata": "floppy/dummy_metadata.json", "mirror": "http://YOU-MUST-PROVIDE-YOUR-OWN-ISO.sorry", diff --git a/rhel-5.11-x86_64.json b/rhel-5.11-x86_64.json index 945688188..ea8350859 100644 --- a/rhel-5.11-x86_64.json +++ b/rhel-5.11-x86_64.json @@ -175,7 +175,7 @@ "iso_checksum": "36565fe0c8a97207d63234d10123daeedb29d509576dbd7b34e71958ac2f9050", "iso_checksum_type": "sha256", "iso_name": "rhel-server-5.11-x86_64-dvd.iso", - "ks_path": "centos-5.11/ks.cfg", + "ks_path": "rhel-5/ks.cfg", "memory": "1024", "metadata": "floppy/dummy_metadata.json", "mirror": "http://YOU-MUST-PROVIDE-YOUR-OWN-ISO.sorry", diff --git a/rhel-6.9-i386.json b/rhel-6.9-i386.json index decf8da77..1e994cc9c 100644 --- a/rhel-6.9-i386.json +++ b/rhel-6.9-i386.json @@ -170,7 +170,7 @@ "iso_checksum": "1977d26df16ad2802728dafa3cbfd015895cfcf364fb20e8974123addce03021", "iso_checksum_type": "sha256", "iso_name": "rhel-server-6.9-i386-dvd.iso", - "ks_path": "centos-6.9/ks.cfg", + "ks_path": "rhel-6/ks.cfg", "memory": "1024", "metadata": "floppy/dummy_metadata.json", "mirror": "http://YOU-MUST-PROVIDE-YOUR-OWN-ISO.sorry", diff --git a/rhel-6.9-x86_64.json b/rhel-6.9-x86_64.json index c0a4cebce..9ef115f12 100644 --- a/rhel-6.9-x86_64.json +++ b/rhel-6.9-x86_64.json @@ -170,7 +170,7 @@ "iso_checksum": "3f961576e9f81ea118566f73f98d7bdf3287671c35436a13787c1ffd5078cf8e", "iso_checksum_type": "sha256", "iso_name": "rhel-server-6.9-x86_64-dvd.iso", - "ks_path": "centos-6.9/ks.cfg", + "ks_path": "rhel-6/ks.cfg", "memory": "1024", "metadata": "floppy/dummy_metadata.json", "mirror": "http://YOU-MUST-PROVIDE-YOUR-OWN-ISO.sorry", diff --git a/rhel-7.4-x86_64.json b/rhel-7.4-x86_64.json index 3c501356e..0bee7b1db 100644 --- a/rhel-7.4-x86_64.json +++ b/rhel-7.4-x86_64.json @@ -170,7 +170,7 @@ "iso_checksum": "431a58c8c0351803a608ffa56948c5a7861876f78ccbe784724dd8c987ff7000", "iso_checksum_type": "sha256", "iso_name": "rhel-server-7.4-x86_64-dvd.iso", - "ks_path": "centos-7.3/ks.cfg", + "ks_path": "rhel-7/ks.cfg", "memory": "1024", "metadata": "floppy/dummy_metadata.json", "mirror": "http://YOU-MUST-PROVIDE-YOUR-OWN-ISO.sorry", From 337f070ceea1e9589ef6fd2f978d399c56ddea55 Mon Sep 17 00:00:00 2001 From: Seth Thomas <sthomas@chef.io> Date: Tue, 15 Aug 2017 14:50:45 -0400 Subject: [PATCH 0673/1622] Fixes #858 Signed-off-by: Seth Thomas <sthomas@chef.io> --- http/debian-7/preseed.cfg | 2 +- http/debian-8/preseed.cfg | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/http/debian-7/preseed.cfg b/http/debian-7/preseed.cfg index 573d761b5..3fa5f5bed 100644 --- a/http/debian-7/preseed.cfg +++ b/http/debian-7/preseed.cfg @@ -9,7 +9,7 @@ d-i grub-installer/with_other_os boolean true d-i keymap select us d-i mirror/country string manual d-i mirror/http/directory string /debian -d-i mirror/http/hostname string httpredir.debian.org +d-i mirror/http/hostname string deb.debian.org d-i mirror/http/proxy string d-i partman-auto-lvm/guided_size string max d-i partman-auto/choose_recipe select atomic diff --git a/http/debian-8/preseed.cfg b/http/debian-8/preseed.cfg index 9799b633d..6efee7d55 100644 --- a/http/debian-8/preseed.cfg +++ b/http/debian-8/preseed.cfg @@ -9,7 +9,7 @@ d-i grub-installer/with_other_os boolean true d-i keymap select us d-i mirror/country string manual d-i mirror/http/directory string /debian -d-i mirror/http/hostname string httpredir.debian.org +d-i mirror/http/hostname string deb.debian.org d-i mirror/http/proxy string d-i partman-auto-lvm/guided_size string max d-i partman-auto/choose_recipe select atomic From 80b1bed4069b5ae16d71eec5cb476f17ad842b4c Mon Sep 17 00:00:00 2001 From: Seth Thomas <sthomas@chef.io> Date: Mon, 21 Aug 2017 09:28:37 -0400 Subject: [PATCH 0674/1622] Fixes #873 Signed-off-by: Seth Thomas <sthomas@chef.io> --- http/debian-8/preseed.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/http/debian-8/preseed.cfg b/http/debian-8/preseed.cfg index 6efee7d55..d196e6b5c 100644 --- a/http/debian-8/preseed.cfg +++ b/http/debian-8/preseed.cfg @@ -30,7 +30,7 @@ d-i passwd/user-uid string 1000 d-i passwd/user-password password vagrant d-i passwd/user-password-again password vagrant d-i passwd/username string vagrant -d-i pkgsel/include string sudo bzip2 acpid cryptsetup zlib1g-dev wget curl dkms make nfs-common net-tools +d-i pkgsel/include string sudo bzip2 acpid cryptsetup zlib1g-dev wget curl dkms fuse make nfs-common net-tools d-i pkgsel/install-language-support boolean false d-i pkgsel/update-policy select none d-i pkgsel/upgrade select full-upgrade From c9ddaae31bda7e657b21bfe1e3a593383f487305 Mon Sep 17 00:00:00 2001 From: Seth Thomas <sthomas@chef.io> Date: Mon, 21 Aug 2017 10:00:22 -0400 Subject: [PATCH 0675/1622] Update/remove EOL platforms Signed-off-by: Seth Thomas <sthomas@chef.io> --- builds.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/builds.yml b/builds.yml index 2d6655ff8..e93425d8f 100644 --- a/builds.yml +++ b/builds.yml @@ -27,8 +27,6 @@ public: '9.0': - amd64 fedora: - '24': - - x86_64 '25': - x86_64 '26': @@ -36,7 +34,7 @@ public: freebsd: '10.3': - amd64 - '11.0': + '11.1': - amd64 opensuse-leap: '42.3': @@ -63,4 +61,3 @@ private: broken: - opensuse-leap-42.3-x86_64-parallels-iso - opensuse-leap-42.3-x86_64-vmware-iso - - debian-9.0-x86_64-vmware-iso From 7a0b69b965560505d25dddf13f2e8e6bee93c2f9 Mon Sep 17 00:00:00 2001 From: Seth Thomas <sthomas@chef.io> Date: Mon, 21 Aug 2017 10:18:34 -0400 Subject: [PATCH 0676/1622] 9.0->9.1 Signed-off-by: Seth Thomas <sthomas@chef.io> --- builds.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/builds.yml b/builds.yml index e93425d8f..132621695 100644 --- a/builds.yml +++ b/builds.yml @@ -24,7 +24,7 @@ public: '8.9': - amd64 - i386 - '9.0': + '9.1': - amd64 fedora: '25': From a43245e56b42facac19e19a59913913ea3a770e2 Mon Sep 17 00:00:00 2001 From: Ettore Simone <esimone74@users.noreply.github.com> Date: Mon, 21 Aug 2017 16:55:22 +0200 Subject: [PATCH 0677/1622] Fix wrong en_US-8 boot parameter Replaced "en_US-8" to "en_US" to avoid manual intervention during unattended build. Signed-off-by: Ettore Simone <ettore.simone@gmail.com> --- sles-12-sp2-x86_64.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sles-12-sp2-x86_64.json b/sles-12-sp2-x86_64.json index 7d37456bf..ed6dac9b8 100644 --- a/sles-12-sp2-x86_64.json +++ b/sles-12-sp2-x86_64.json @@ -46,7 +46,7 @@ "boot_command": [ "<esc><enter><wait>", "linux netdevice=eth0 netsetup=dhcp install=cd:/<wait>", - " lang=en_US-8 autoyast=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `autoinst_cfg`}}<wait>", + " lang=en_US autoyast=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `autoinst_cfg`}}<wait>", " textmode=1<wait>", "<enter><wait>" ], From d67bda72a4043822a2b211546980ba11feb59f29 Mon Sep 17 00:00:00 2001 From: Seth Thomas <sthomas@chef.io> Date: Mon, 21 Aug 2017 11:33:48 -0400 Subject: [PATCH 0678/1622] Fix #639 - run for RHELish platforms Signed-off-by: Seth Thomas <sthomas@chef.io> --- centos-6.9-i386.json | 1 + centos-6.9-x86_64.json | 1 + centos-7.3-x86_64.json | 1 + oracle-5.11-i386.json | 1 + oracle-5.11-x86_64.json | 1 + oracle-6.9-i386.json | 1 + oracle-6.9-x86_64.json | 1 + oracle-7.3-x86_64.json | 1 + rhel-5.11-i386.json | 1 + rhel-5.11-x86_64.json | 1 + rhel-6.9-i386.json | 1 + rhel-6.9-x86_64.json | 1 + rhel-7.4-x86_64.json | 1 + scripts/centos/update.sh | 5 +++++ 14 files changed, 18 insertions(+) create mode 100644 scripts/centos/update.sh diff --git a/centos-6.9-i386.json b/centos-6.9-i386.json index 651cf916c..8c636f206 100644 --- a/centos-6.9-i386.json +++ b/centos-6.9-i386.json @@ -172,6 +172,7 @@ "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", "scripts": [ "scripts/common/metadata.sh", + "scripts/centos/update.sh", "scripts/common/sshd.sh", "scripts/centos/networking.sh", "scripts/common/vagrant.sh", diff --git a/centos-6.9-x86_64.json b/centos-6.9-x86_64.json index 5f988e857..96208e106 100644 --- a/centos-6.9-x86_64.json +++ b/centos-6.9-x86_64.json @@ -172,6 +172,7 @@ "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", "scripts": [ "scripts/common/metadata.sh", + "scripts/centos/update.sh", "scripts/common/sshd.sh", "scripts/centos/networking.sh", "scripts/common/vagrant.sh", diff --git a/centos-7.3-x86_64.json b/centos-7.3-x86_64.json index 5dbfe1994..8be488cfa 100644 --- a/centos-7.3-x86_64.json +++ b/centos-7.3-x86_64.json @@ -172,6 +172,7 @@ "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", "scripts": [ "scripts/common/metadata.sh", + "scripts/centos/update.sh", "scripts/common/sshd.sh", "scripts/centos/networking.sh", "scripts/common/vagrant.sh", diff --git a/oracle-5.11-i386.json b/oracle-5.11-i386.json index 33f56b31c..1c7ef7928 100644 --- a/oracle-5.11-i386.json +++ b/oracle-5.11-i386.json @@ -145,6 +145,7 @@ "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", "scripts": [ "scripts/common/metadata.sh", + "scripts/centos/update.sh", "scripts/common/vagrant.sh", "scripts/common/sshd.sh", "scripts/common/virtualbox.sh", diff --git a/oracle-5.11-x86_64.json b/oracle-5.11-x86_64.json index 254e56a39..d93955132 100644 --- a/oracle-5.11-x86_64.json +++ b/oracle-5.11-x86_64.json @@ -151,6 +151,7 @@ "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", "scripts": [ "scripts/common/metadata.sh", + "scripts/centos/update.sh", "scripts/common/vagrant.sh", "scripts/common/sshd.sh", "scripts/common/virtualbox.sh", diff --git a/oracle-6.9-i386.json b/oracle-6.9-i386.json index a2211422c..8f4eeddad 100644 --- a/oracle-6.9-i386.json +++ b/oracle-6.9-i386.json @@ -145,6 +145,7 @@ "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", "scripts": [ "scripts/common/metadata.sh", + "scripts/centos/update.sh", "scripts/centos/networking.sh", "scripts/common/sshd.sh", "scripts/common/vagrant.sh", diff --git a/oracle-6.9-x86_64.json b/oracle-6.9-x86_64.json index 8ca6dffd0..aab4c5a99 100644 --- a/oracle-6.9-x86_64.json +++ b/oracle-6.9-x86_64.json @@ -145,6 +145,7 @@ "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", "scripts": [ "scripts/common/metadata.sh", + "scripts/centos/update.sh", "scripts/centos/networking.sh", "scripts/common/sshd.sh", "scripts/common/vagrant.sh", diff --git a/oracle-7.3-x86_64.json b/oracle-7.3-x86_64.json index 95ac237b5..d6ace9e50 100644 --- a/oracle-7.3-x86_64.json +++ b/oracle-7.3-x86_64.json @@ -145,6 +145,7 @@ "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", "scripts": [ "scripts/common/metadata.sh", + "scripts/centos/update.sh", "scripts/centos/networking.sh", "scripts/common/sshd.sh", "scripts/common/vagrant.sh", diff --git a/rhel-5.11-i386.json b/rhel-5.11-i386.json index 19ec2b49d..34dde0290 100644 --- a/rhel-5.11-i386.json +++ b/rhel-5.11-i386.json @@ -145,6 +145,7 @@ "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", "scripts": [ "scripts/common/metadata.sh", + "scripts/centos/update.sh", "scripts/common/vagrant.sh", "scripts/common/sshd.sh", "scripts/common/virtualbox.sh", diff --git a/rhel-5.11-x86_64.json b/rhel-5.11-x86_64.json index ea8350859..fdf19c333 100644 --- a/rhel-5.11-x86_64.json +++ b/rhel-5.11-x86_64.json @@ -151,6 +151,7 @@ "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", "scripts": [ "scripts/common/metadata.sh", + "scripts/centos/update.sh", "scripts/common/vagrant.sh", "scripts/common/sshd.sh", "scripts/common/virtualbox.sh", diff --git a/rhel-6.9-i386.json b/rhel-6.9-i386.json index 1e994cc9c..0fa688867 100644 --- a/rhel-6.9-i386.json +++ b/rhel-6.9-i386.json @@ -145,6 +145,7 @@ "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", "scripts": [ "scripts/common/metadata.sh", + "scripts/centos/update.sh", "scripts/centos/networking.sh", "scripts/common/sshd.sh", "scripts/common/vagrant.sh", diff --git a/rhel-6.9-x86_64.json b/rhel-6.9-x86_64.json index 9ef115f12..4749f5637 100644 --- a/rhel-6.9-x86_64.json +++ b/rhel-6.9-x86_64.json @@ -145,6 +145,7 @@ "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", "scripts": [ "scripts/common/metadata.sh", + "scripts/centos/update.sh", "scripts/centos/networking.sh", "scripts/common/sshd.sh", "scripts/common/vagrant.sh", diff --git a/rhel-7.4-x86_64.json b/rhel-7.4-x86_64.json index 0bee7b1db..cbb7738a8 100644 --- a/rhel-7.4-x86_64.json +++ b/rhel-7.4-x86_64.json @@ -145,6 +145,7 @@ "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", "scripts": [ "scripts/common/metadata.sh", + "scripts/centos/update.sh", "scripts/centos/networking.sh", "scripts/common/sshd.sh", "scripts/common/vagrant.sh", diff --git a/scripts/centos/update.sh b/scripts/centos/update.sh new file mode 100644 index 000000000..131d8cdb9 --- /dev/null +++ b/scripts/centos/update.sh @@ -0,0 +1,5 @@ +#!/bin/sh -eux + +yum -y update; +reboot; +sleep 60; From b9a883d8633b38770afd8663d638eee3990df993 Mon Sep 17 00:00:00 2001 From: Seth Thomas <sthomas@chef.io> Date: Thu, 24 Aug 2017 13:39:02 -0400 Subject: [PATCH 0679/1622] Updating rake tasks and build order Signed-off-by: Seth Thomas <sthomas@chef.io> --- Rakefile | 20 ++++++++++++++------ builds.yml | 23 +++++++++++------------ 2 files changed, 25 insertions(+), 18 deletions(-) diff --git a/Rakefile b/Rakefile index ea974a1b0..bb1263ff9 100644 --- a/Rakefile +++ b/Rakefile @@ -7,7 +7,7 @@ task :do_all do Rake::Task["clean"].invoke Rake::Task["clean"].reenable - Rake::Task["build"].invoke(template) + Rake::Task["build"].invoke(template, ENV["BENTO_VERSION"]) Rake::Task["build"].reenable Rake::Task["test"].invoke @@ -17,25 +17,33 @@ task :do_all do Rake::Task["upload"].reenable unless ENV["BENTO_AUTO_RELEASE"].nil? - Rake::Task["release"].invoke(template) + Rake::Task["release"].invoke(template, ENV["BENTO_VERSION"]) Rake::Task["release"].reenable end end end desc "Build a bento template" -task :build, :template do |_, args| +task :build, :template, :version do |_, args| cmd = %W{bento build #{args[:template]}} cmd.insert(2, "--only #{providers}") cmd.insert(2, "--mirror #{ENV['PACKER_MIRROR']}") if ENV["PACKER_MIRROR"] - cmd.insert(2, "--version #{ENV['BENTO_VERSION']}") if ENV["BENTO_VERSION"] + cmd.insert(2, "--version #{args[:version]}") if args[:version] cmd.join(" ") sh a_to_s(cmd) end desc "release" -task :release, :template do |_, args| - puts "bento release #{box_name(args[:template])} #{ENV['BENTO_VERSION']}" +task :release, :template, :version do |_, args| + sh "bento release #{box_name(args[:template])} #{args[:version]}" +end + +desc "release all" +task :release_all, :version do |_, args| + templates.each do |template| + Rake::Task["release"].invoke(template, args[:version]) + Rake::Task["release"].reenable + end end desc "test" diff --git a/builds.yml b/builds.yml index 132621695..9b4f6440e 100644 --- a/builds.yml +++ b/builds.yml @@ -17,6 +17,16 @@ public: - i386 '7.3': - x86_64 + ubuntu: + '14.04': + - amd64 + - i386 + '16.04': + - amd64 + - i386 + '17.04': + - amd64 + - i386 debian: '7.11': - amd64 @@ -39,16 +49,6 @@ public: opensuse-leap: '42.3': - x86_64 - ubuntu: - '14.04': - - amd64 - - i386 - '16.04': - - amd64 - - i386 - '17.04': - - amd64 - - i386 private: rhel: @@ -59,5 +59,4 @@ private: - x86_64 broken: - - opensuse-leap-42.3-x86_64-parallels-iso - - opensuse-leap-42.3-x86_64-vmware-iso + - opensuse-leap-42.3-x86_64-all From 1e2d6e6af716f8aa3b6335d9b248db95d5193632 Mon Sep 17 00:00:00 2001 From: Seth Thomas <sthomas@chef.io> Date: Thu, 24 Aug 2017 13:41:22 -0400 Subject: [PATCH 0680/1622] Release 201708.22.0 Signed-off-by: Seth Thomas <sthomas@chef.io> --- CHANGELOG.md | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5b8fec9a4..70d2a0ff9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,24 @@ # Change Log +## [201708.22.0](https://github.com/chef/bento/tree/201708.22.0) (2017-08-22) + +**New** +- Debian 9.1 +- Debian 8.9 +- FreeBSD 11.1 + +**Improvements** +- Top level slugs for point release platforms, i.e. centos-7 -> centos-7.3 +- Move to date based versioning scheme `YYYYMM.DD.PATCH` +- Automatically update RHEL-ish platforms as we do with other platforms + +**Tooling** +- VirtualBox 5.1.26 +- VMware Fusion 8.5.8 +- VMware Workstation 12.5.7 +- Parallels 13.0.0 +- Packer 1.0.4 + ## [2.3.8](https://github.com/chef/bento/tree/2.3.8) (2017-07-20) **New** From e8d3c3aaffc95b630084ec8ebc37bef66b1e5c79 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith@chef.io> Date: Thu, 24 Aug 2017 21:09:53 -0700 Subject: [PATCH 0681/1622] Remove the update script from RHEL boxes They won't be activated to perform updates necessarily Signed-off-by: Tim Smith <tsmith@chef.io> --- rhel-5.11-i386.json | 2 -- rhel-5.11-x86_64.json | 2 -- rhel-6.9-i386.json | 2 -- rhel-6.9-x86_64.json | 2 -- rhel-7.4-x86_64.json | 2 -- 5 files changed, 10 deletions(-) diff --git a/rhel-5.11-i386.json b/rhel-5.11-i386.json index 34dde0290..d6c1b736d 100644 --- a/rhel-5.11-i386.json +++ b/rhel-5.11-i386.json @@ -145,7 +145,6 @@ "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", "scripts": [ "scripts/common/metadata.sh", - "scripts/centos/update.sh", "scripts/common/vagrant.sh", "scripts/common/sshd.sh", "scripts/common/virtualbox.sh", @@ -181,4 +180,3 @@ "version": "TIMESTAMP" } } - diff --git a/rhel-5.11-x86_64.json b/rhel-5.11-x86_64.json index fdf19c333..e9e9ef83d 100644 --- a/rhel-5.11-x86_64.json +++ b/rhel-5.11-x86_64.json @@ -151,7 +151,6 @@ "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", "scripts": [ "scripts/common/metadata.sh", - "scripts/centos/update.sh", "scripts/common/vagrant.sh", "scripts/common/sshd.sh", "scripts/common/virtualbox.sh", @@ -187,4 +186,3 @@ "version": "TIMESTAMP" } } - diff --git a/rhel-6.9-i386.json b/rhel-6.9-i386.json index 0fa688867..a321da774 100644 --- a/rhel-6.9-i386.json +++ b/rhel-6.9-i386.json @@ -145,7 +145,6 @@ "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", "scripts": [ "scripts/common/metadata.sh", - "scripts/centos/update.sh", "scripts/centos/networking.sh", "scripts/common/sshd.sh", "scripts/common/vagrant.sh", @@ -182,4 +181,3 @@ "version": "TIMESTAMP" } } - diff --git a/rhel-6.9-x86_64.json b/rhel-6.9-x86_64.json index 4749f5637..75a00b2e8 100644 --- a/rhel-6.9-x86_64.json +++ b/rhel-6.9-x86_64.json @@ -145,7 +145,6 @@ "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", "scripts": [ "scripts/common/metadata.sh", - "scripts/centos/update.sh", "scripts/centos/networking.sh", "scripts/common/sshd.sh", "scripts/common/vagrant.sh", @@ -182,4 +181,3 @@ "version": "TIMESTAMP" } } - diff --git a/rhel-7.4-x86_64.json b/rhel-7.4-x86_64.json index cbb7738a8..8fa81c7da 100644 --- a/rhel-7.4-x86_64.json +++ b/rhel-7.4-x86_64.json @@ -145,7 +145,6 @@ "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", "scripts": [ "scripts/common/metadata.sh", - "scripts/centos/update.sh", "scripts/centos/networking.sh", "scripts/common/sshd.sh", "scripts/common/vagrant.sh", @@ -182,4 +181,3 @@ "version": "TIMESTAMP" } } - From 711ee901f9bf23489a58c09c50e4d552b0313b12 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith@chef.io> Date: Thu, 24 Aug 2017 21:50:11 -0700 Subject: [PATCH 0682/1622] Remove the waits from the opensuse boot command These waits weren't doing anything Signed-off-by: Tim Smith <tsmith@chef.io> --- opensuse-leap-42.3-x86_64.json | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/opensuse-leap-42.3-x86_64.json b/opensuse-leap-42.3-x86_64.json index 5a8bbbf53..93c98a7e5 100644 --- a/opensuse-leap-42.3-x86_64.json +++ b/opensuse-leap-42.3-x86_64.json @@ -3,10 +3,7 @@ { "boot_command": [ "<esc><enter><wait>", - "linux netsetup=dhcp install=cd:/<wait>", - " lang=en_US autoyast=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `autoinst_cfg`}}<wait>", - " textmode=1<wait>", - "<enter><wait>" + "linux netsetup=dhcp install=cd:/ lang=en_US autoyast=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `autoinst_cfg`}} textmode=1<enter>" ], "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", From 2e6076608cc5e7b634f285d9e9f3fa01d440ddd4 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith@chef.io> Date: Thu, 24 Aug 2017 22:23:31 -0700 Subject: [PATCH 0683/1622] Use the boot commands from the official opensuse definitions Signed-off-by: Tim Smith <tsmith@chef.io> --- opensuse-leap-42.3-x86_64.json | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/opensuse-leap-42.3-x86_64.json b/opensuse-leap-42.3-x86_64.json index 93c98a7e5..a36cbc0e4 100644 --- a/opensuse-leap-42.3-x86_64.json +++ b/opensuse-leap-42.3-x86_64.json @@ -1,9 +1,18 @@ { "builders": [ { + "boot_command": [ "<esc><enter><wait>", - "linux netsetup=dhcp install=cd:/ lang=en_US autoyast=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `autoinst_cfg`}} textmode=1<enter>" + "linux ", + "biosdevname=0 ", + "net.ifnames=0 ", + "netdevice=eth0 ", + "netsetup=dhcp ", + "lang=en_US ", + "textmode=1 ", + "autoyast=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `autoinst_cfg`}}", + "<enter><wait>" ], "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", @@ -196,4 +205,3 @@ "version": "TIMESTAMP" } } - From d860c547f682b3a6fa763153fa01cae5a8c320c0 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith@chef.io> Date: Thu, 24 Aug 2017 22:23:48 -0700 Subject: [PATCH 0684/1622] Use eth0 in the yast config Signed-off-by: Tim Smith <tsmith@chef.io> --- http/opensuse-leap/autoinst.xml | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/http/opensuse-leap/autoinst.xml b/http/opensuse-leap/autoinst.xml index cdcefc3a8..961e206fe 100644 --- a/http/opensuse-leap/autoinst.xml +++ b/http/opensuse-leap/autoinst.xml @@ -113,13 +113,9 @@ <interfaces config:type="list"> <interface> <bootproto>dhcp</bootproto> - <device>enp0s3</device> - <startmode>onboot</startmode> - </interface> - <interface> - <bootproto>dhcp</bootproto> - <device>ens33</device> - <startmode>onboot</startmode> + <device>eth0</device> + <startmode>auto</startmode> + <usercontrol>no</usercontrol> </interface> </interfaces> </networking> From 71b86809fbb3a03a01acf87d78ad3e354eeb14f6 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith@chef.io> Date: Thu, 24 Aug 2017 22:25:35 -0700 Subject: [PATCH 0685/1622] Update the remaining boot command blocks Signed-off-by: Tim Smith <tsmith@chef.io> --- opensuse-leap-42.3-x86_64.json | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/opensuse-leap-42.3-x86_64.json b/opensuse-leap-42.3-x86_64.json index a36cbc0e4..20368d71b 100644 --- a/opensuse-leap-42.3-x86_64.json +++ b/opensuse-leap-42.3-x86_64.json @@ -1,7 +1,6 @@ { "builders": [ { - "boot_command": [ "<esc><enter><wait>", "linux ", @@ -51,9 +50,14 @@ { "boot_command": [ "<esc><enter><wait>", - "linux netsetup=dhcp install=cd:/<wait>", - " lang=en_US autoyast=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `autoinst_cfg`}}<wait>", - " textmode=1<wait>", + "linux ", + "biosdevname=0 ", + "net.ifnames=0 ", + "netdevice=eth0 ", + "netsetup=dhcp ", + "lang=en_US ", + "textmode=1 ", + "autoyast=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `autoinst_cfg`}}", "<enter><wait>" ], "boot_wait": "10s", @@ -83,9 +87,14 @@ { "boot_command": [ "<esc><enter><wait>", - "linux netsetup=dhcp netdevice=eth0 install=cd:/<wait>", - " lang=en_US autoyast=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `autoinst_cfg`}}<wait>", - " textmode=1<wait>", + "linux ", + "biosdevname=0 ", + "net.ifnames=0 ", + "netdevice=eth0 ", + "netsetup=dhcp ", + "lang=en_US ", + "textmode=1 ", + "autoyast=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `autoinst_cfg`}}", "<enter><wait>" ], "boot_wait": "10s", From 345f9f72d474a54960a8ea8a49b899facb9614f8 Mon Sep 17 00:00:00 2001 From: Seth Thomas <sthomas@chef.io> Date: Sun, 27 Aug 2017 12:54:43 -0400 Subject: [PATCH 0686/1622] Standardizing on 1024MB as default memory Signed-off-by: Seth Thomas <sthomas@chef.io> --- opensuse-leap-42.3-x86_64.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/opensuse-leap-42.3-x86_64.json b/opensuse-leap-42.3-x86_64.json index 20368d71b..ad95418e1 100644 --- a/opensuse-leap-42.3-x86_64.json +++ b/opensuse-leap-42.3-x86_64.json @@ -204,7 +204,7 @@ "iso_checksum": "195baca6c5f3b7f3ad4d7984a7f7bd5c4a37be2eb67e58b65d07ac3a2b599e83", "iso_checksum_type": "sha256", "iso_name": "openSUSE-Leap-42.3-DVD-x86_64.iso", - "memory": "768", + "memory": "1024", "metadata": "floppy/dummy_metadata.json", "mirror": "http://suse.mobile-central.org/distribution", "mirror_directory": "leap/42.3/iso", From 2e7856883d2c75220f6223b866c2580b74ead407 Mon Sep 17 00:00:00 2001 From: Seth Thomas <sthomas@chef.io> Date: Mon, 28 Aug 2017 11:46:05 -0400 Subject: [PATCH 0687/1622] Update packer version for TravisCI, remove old build scripts Signed-off-by: Seth Thomas <sthomas@chef.io> --- .travis.yml | 7 ++++- build.sh | 87 ---------------------------------------------------- buildkite.rb | 24 --------------- 3 files changed, 6 insertions(+), 112 deletions(-) delete mode 100644 build.sh delete mode 100644 buildkite.rb diff --git a/.travis.yml b/.travis.yml index ebaa5b6a7..61c54a64c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,11 +3,16 @@ sudo: false env: global: - - PACKER_VERSION="1.0.2" + - PACKER_VERSION="1.0.4" - PATH=$HOME/bin:$PATH rvm: - 2.4.1 + - ruby-head + +matrix: + allow_failures: + - rvm: ruby-head branches: only: diff --git a/build.sh b/build.sh deleted file mode 100644 index 41ec0eb6c..000000000 --- a/build.sh +++ /dev/null @@ -1,87 +0,0 @@ -#!/usr/bin/env bash - -set -eo pipefail - -source ~/.bashrc - -env - -function inline_image { - printf '\033]1338;url='%s';alt='%s'\a\n' "$1" "$2" -} - -inline_image 'https://oaxacaborn.files.wordpress.com/2012/02/clean-all-the-things-via-hyperbole-and-a-half.png' 'Clean All The Things' - - -echo "--- Cleaning up after VirtualBox" - -for i in $(vboxmanage list runningvms | awk '{print $1}' | sed 's/"//g') -do - echo "Powering off $i" - vboxmanage controlvm "$i" poweroff -done - -for i in $(vboxmanage list vms | awk '{print $1}' | sed 's/"//g') -do - echo "Unregistering $i" - sleep 10 - vboxmanage unregistervm "$i" -done - -for i in ~/VirtualBox\ VMs/* -do - echo "Removing $i" - rm -rf ~/VirtualBox\ VMs/"$i" -done - -echo "--- Cleaning up after Parallels" - -for i in $(prlctl list --no-header --output name) -do - echo "Powering off $i" - prlctl stop "$i" --kill - sleep 10 -done - -for i in $(prlctl list --all --no-header --output uuid) -do - echo "Unregistering $i" - prlctl unregister "$i" -done - -echo "--- Cleaning up after VMware" - -for i in $(vmrun list | grep -v "Total") -do - echo "Stopping $i" - vmrun stop "$i" - sleep 10 - - echo "Deleting $i" - vmrun deleteVM "$i" -done - -echo "--- Cleaning up after Packer" -rake clean - -echo "--- Build $PLATFORM-$BENTO_PROVIDERS" -./bin/bento build --headless --version $BENTO_VERSION --only $BENTO_PROVIDERS $PLATFORM - -echo "--- Test $PLATFORM-$BENTO_PROVIDERS" -if [ "$BENTO_TEST_SHARED_FOLDER" -eq 1 ] -then - echo "--- Testing Shared Folder Support" - ./bin/bento test -f -else - echo "--- NOT Testing Shared Folder Support" - ./bin/bento test -fi - -if [ "$BENTO_UPLOAD" -eq 1 ] -then - echo "--- Upload Boxes to Atlas and S3" - ./bin/bento upload - - echo "--- Release Boxes on Atlas" - ./bin/bento release $ATLAS_NAME $BENTO_VERSION -fi diff --git a/buildkite.rb b/buildkite.rb deleted file mode 100644 index 677f8afe9..000000000 --- a/buildkite.rb +++ /dev/null @@ -1,24 +0,0 @@ -#!/usr/bin/env ruby - -git_output = `git log -m -1 --name-only --pretty=format:%n` - -# TODO: decide what, if anything, is rebuilt if bin/bento, buildkite.rb, scripts/common change. -changed_files = git_output.split("\n").reject { |t| t.empty? || t.include?("gitignore") || t.include?("dummy_metadata") || t.include?("bin/bento") || t.include?("buildkite.rb") || t.include?("scripts/common") || t.include?(".md") } - -# Compile the list of platforms whose boxes will be rebuilt. -buildlist = [] - -# If OS-specific scripts have changed, rebuild all boxes associated with that OS. -family = changed_files.select { |b| b.include?("scripts") || b.include?("floppy") || b.include?("http") } -unless family.empty? - all_templates = `ls *.json`.split("\n") - - family.each do |f| - buildlist.concat(all_templates.collect { |a| a if a.include?(f.split("/")[1]) }.reject { |a| a.nil? }) - end -end - -buildlist.concat(changed_files.select { |b| b.include?(".json") }) -buildlist.uniq! -buildlist.collect! { |b| b.gsub!(".json", "") } -system "bundle exec rake do_all[#{buildlist.join(',')}]" From 18735fb775f41fd3536cdbdd0f4647dcfe92581a Mon Sep 17 00:00:00 2001 From: Seth Thomas <sthomas@chef.io> Date: Wed, 30 Aug 2017 12:31:03 -0400 Subject: [PATCH 0688/1622] Moving boostrap.sh to bento-ya Signed-off-by: Seth Thomas <sthomas@chef.io> --- .gitignore | 1 + bootstrap.sh | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) delete mode 100644 bootstrap.sh diff --git a/.gitignore b/.gitignore index 3c1d96ad0..8f5686503 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ packer.log .kitchen .kitchen.yml Gemfile.lock +bootstrap.sh diff --git a/bootstrap.sh b/bootstrap.sh deleted file mode 100644 index 99d3975e1..000000000 --- a/bootstrap.sh +++ /dev/null @@ -1 +0,0 @@ -echo "Shell Provisioner Says What" From 202403024fd62c7002ec10e19b095ef3cac3a12c Mon Sep 17 00:00:00 2001 From: Seth Thomas <sthomas@chef.io> Date: Wed, 30 Aug 2017 14:37:59 -0400 Subject: [PATCH 0689/1622] Organize into platform family(ish) folders Signed-off-by: Seth Thomas <sthomas@chef.io> --- {scripts/common => _common}/metadata.sh | 0 {scripts/common => _common}/minimize.sh | 0 {scripts/common => _common}/parallels.sh | 0 {scripts/common => _common}/sshd.sh | 0 {scripts/common => _common}/vagrant.sh | 0 {scripts/common => _common}/virtualbox.sh | 0 {scripts/common => _common}/vmware.sh | 0 centos-6.9-i386.json => centos/centos-6.9-i386.json | 0 centos-6.9-x86_64.json => centos/centos-6.9-x86_64.json | 0 centos-7.3-x86_64.json => centos/centos-7.3-x86_64.json | 0 {scripts/centos => centos/scripts}/cleanup.sh | 0 {scripts/centos => centos/scripts}/networking.sh | 0 {scripts/centos => centos/scripts}/update.sh | 0 {scripts/centos => centos/scripts}/vmware.sh | 0 debian-7.11-amd64.json => debian/debian-7.11-amd64.json | 0 debian-7.11-i386.json => debian/debian-7.11-i386.json | 0 debian-8.9-amd64.json => debian/debian-8.9-amd64.json | 0 debian-8.9-i386.json => debian/debian-8.9-i386.json | 0 debian-9.1-amd64.json => debian/debian-9.1-amd64.json | 0 debian-9.1-i386.json => debian/debian-9.1-i386.json | 0 {http => debian/http}/debian-7/preseed.cfg | 0 {http => debian/http}/debian-8/preseed.cfg | 0 {scripts/debian => debian/scripts}/cleanup.sh | 0 {scripts/debian => debian/scripts}/networking.sh | 0 {scripts/debian => debian/scripts}/sudoers.sh | 0 {scripts/debian => debian/scripts}/systemd.sh | 0 {scripts/debian => debian/scripts}/update.sh | 0 fedora-25-i386.json => fedora/fedora-25-i386.json | 0 fedora-25-x86_64.json => fedora/fedora-25-x86_64.json | 0 fedora-26-x86_64.json => fedora/fedora-26-x86_64.json | 0 {http/fedora => fedora/http}/ks.cfg | 0 {scripts/fedora => fedora/scripts}/build-tools.sh | 0 {scripts/fedora => fedora/scripts}/cleanup.sh | 0 {scripts/fedora => fedora/scripts}/fix-slow-dns.sh | 0 {scripts/fedora => fedora/scripts}/swap.sh | 0 freebsd-10.3-amd64.json => freebsd/freebsd-10.3-amd64.json | 0 freebsd-10.3-i386.json => freebsd/freebsd-10.3-i386.json | 0 freebsd-11.1-amd64.json => freebsd/freebsd-11.1-amd64.json | 0 {http => freebsd/http}/freebsd-10/install.sh | 0 {http => freebsd/http}/freebsd-11/installerconfig | 0 {scripts/freebsd => freebsd/scripts}/cleanup.sh | 0 {scripts/freebsd => freebsd/scripts}/minimize.sh | 0 {scripts/freebsd => freebsd/scripts}/postinstall.sh | 0 {scripts/freebsd => freebsd/scripts}/sudoers.sh | 0 {scripts/freebsd => freebsd/scripts}/update.sh | 0 {scripts/freebsd => freebsd/scripts}/vmtools.sh | 0 .../vagrantfile_templates}/freebsd.rb | 0 macos-10.12.json => macos/macos-10.12.json | 0 macosx-10.10.json => macos/macosx-10.10.json | 0 macosx-10.11.json => macos/macosx-10.11.json | 0 macosx-10.9.json => macos/macosx-10.9.json | 0 {scripts/macosx => macos/scripts}/cleanup.sh | 0 {scripts/macosx => macos/scripts}/disablesleep.sh | 0 {scripts/macosx => macos/scripts}/hostname.sh | 0 {scripts/macosx => macos/scripts}/minimize.sh | 0 {scripts/macosx => macos/scripts}/networking.sh | 0 {scripts/macosx => macos/scripts}/update.sh | 0 {scripts/macosx => macos/scripts}/vagrant.sh | 0 {scripts/macosx => macos/scripts}/vmtools.sh | 0 {vagrantfile_templates => macos/vagrantfile_templates}/macosx.rb | 0 {http/opensuse-leap => opensuse/http}/autoinst.xml | 0 .../opensuse-leap-42.3-x86_64.json | 0 {scripts/opensuse => opensuse/scripts}/cleanup.sh | 0 {scripts/opensuse => opensuse/scripts}/remove-dvd-source.sh | 0 {scripts/opensuse => opensuse/scripts}/sudoers.sh | 0 {scripts/opensuse => opensuse/scripts}/zypper-locks.sh | 0 oracle-5.11-i386.json => oraclelinux/oracle-5.11-i386.json | 0 oracle-5.11-x86_64.json => oraclelinux/oracle-5.11-x86_64.json | 0 oracle-6.9-i386.json => oraclelinux/oracle-6.9-i386.json | 0 oracle-6.9-x86_64.json => oraclelinux/oracle-6.9-x86_64.json | 0 oracle-7.3-x86_64.json => oraclelinux/oracle-7.3-x86_64.json | 0 {http => rhel/http}/rhel-5/ks.cfg | 0 {http => rhel/http}/rhel-6/ks.cfg | 0 {http => rhel/http}/rhel-7/ks.cfg | 0 rhel-5.11-i386.json => rhel/rhel-5.11-i386.json | 0 rhel-5.11-x86_64.json => rhel/rhel-5.11-x86_64.json | 0 rhel-6.9-i386.json => rhel/rhel-6.9-i386.json | 0 rhel-6.9-x86_64.json => rhel/rhel-6.9-x86_64.json | 0 rhel-7.4-x86_64.json => rhel/rhel-7.4-x86_64.json | 0 {http/sles-12 => sles/http}/sles-12-sp2-x86_64-autoinst.xml | 0 {scripts/sles => sles/scripts}/cleanup.sh | 0 {scripts/sles => sles/scripts}/remove-dvd-source.sh | 0 {scripts/sles => sles/scripts}/sudoers.sh | 0 {scripts/sles => sles/scripts}/unsupported-modules.sh | 0 {scripts/sles => sles/scripts}/zypper-locks.sh | 0 sles-12-sp2-x86_64.json => sles/sles-12-sp2-x86_64.json | 0 {floppy => solaris/floppy}/dummy_metadata.json | 0 {floppy => solaris/floppy}/solaris10/S99startup.sh | 0 {floppy => solaris/floppy}/solaris10/awesome_prof | 0 {floppy => solaris/floppy}/solaris10/finish.sh | 0 {floppy => solaris/floppy}/solaris10/rules.ok | 0 {floppy => solaris/floppy}/solaris10/sysidcfg | 0 {http/solaris-11 => solaris/http}/default.xml | 0 {http/solaris-11 => solaris/http}/profile.xml | 0 {scripts/solaris => solaris/scripts}/minimize.sh | 0 {scripts/solaris10 => solaris/scripts/solaris-10}/minimize.sh | 0 {scripts/solaris10 => solaris/scripts/solaris-10}/vmtools.sh | 0 {scripts/solaris => solaris/scripts}/update.sh | 0 {scripts/solaris => solaris/scripts}/vagrant.sh | 0 {scripts/solaris => solaris/scripts}/vmtools.sh | 0 solaris-10.11-x86.json => solaris/solaris-10.11-x86.json | 0 solaris-11-x86.json => solaris/solaris-11-x86.json | 0 {http/ubuntu => ubuntu/http}/preseed-hyperv.cfg | 0 {http/ubuntu => ubuntu/http}/preseed.cfg | 0 {scripts/ubuntu => ubuntu/scripts}/cleanup.sh | 0 {scripts/ubuntu => ubuntu/scripts}/hyperv.sh | 0 {scripts/ubuntu => ubuntu/scripts}/networking.sh | 0 {scripts/ubuntu => ubuntu/scripts}/sudoers.sh | 0 {scripts/ubuntu => ubuntu/scripts}/update.sh | 0 {scripts/ubuntu => ubuntu/scripts}/vagrant.sh | 0 {scripts/ubuntu => ubuntu/scripts}/vmware.sh | 0 ubuntu-14.04-amd64.json => ubuntu/ubuntu-14.04-amd64.json | 0 ubuntu-14.04-i386.json => ubuntu/ubuntu-14.04-i386.json | 0 ubuntu-16.04-amd64.json => ubuntu/ubuntu-16.04-amd64.json | 0 ubuntu-16.04-i386.json => ubuntu/ubuntu-16.04-i386.json | 0 ubuntu-17.04-amd64.json => ubuntu/ubuntu-17.04-amd64.json | 0 ubuntu-17.04-i386.json => ubuntu/ubuntu-17.04-i386.json | 0 {scripts/windows => windows/scripts}/Autounattend.xml | 0 {scripts/windows => windows/scripts}/SetupComplete.cmd | 0 {scripts/windows => windows/scripts}/nano_cleanup.ps1 | 0 {scripts/windows => windows/scripts}/nano_create.ps1 | 0 {scripts/windows => windows/scripts}/postunattend.xml | 0 .../vagrantfile_templates}/windows-nano.rb | 0 windows-nano-tp3.json => windows/windows-nano-tp3.json | 0 124 files changed, 0 insertions(+), 0 deletions(-) rename {scripts/common => _common}/metadata.sh (100%) rename {scripts/common => _common}/minimize.sh (100%) rename {scripts/common => _common}/parallels.sh (100%) rename {scripts/common => _common}/sshd.sh (100%) rename {scripts/common => _common}/vagrant.sh (100%) rename {scripts/common => _common}/virtualbox.sh (100%) rename {scripts/common => _common}/vmware.sh (100%) rename centos-6.9-i386.json => centos/centos-6.9-i386.json (100%) rename centos-6.9-x86_64.json => centos/centos-6.9-x86_64.json (100%) rename centos-7.3-x86_64.json => centos/centos-7.3-x86_64.json (100%) rename {scripts/centos => centos/scripts}/cleanup.sh (100%) rename {scripts/centos => centos/scripts}/networking.sh (100%) rename {scripts/centos => centos/scripts}/update.sh (100%) rename {scripts/centos => centos/scripts}/vmware.sh (100%) rename debian-7.11-amd64.json => debian/debian-7.11-amd64.json (100%) rename debian-7.11-i386.json => debian/debian-7.11-i386.json (100%) rename debian-8.9-amd64.json => debian/debian-8.9-amd64.json (100%) rename debian-8.9-i386.json => debian/debian-8.9-i386.json (100%) rename debian-9.1-amd64.json => debian/debian-9.1-amd64.json (100%) rename debian-9.1-i386.json => debian/debian-9.1-i386.json (100%) rename {http => debian/http}/debian-7/preseed.cfg (100%) rename {http => debian/http}/debian-8/preseed.cfg (100%) rename {scripts/debian => debian/scripts}/cleanup.sh (100%) rename {scripts/debian => debian/scripts}/networking.sh (100%) rename {scripts/debian => debian/scripts}/sudoers.sh (100%) rename {scripts/debian => debian/scripts}/systemd.sh (100%) rename {scripts/debian => debian/scripts}/update.sh (100%) rename fedora-25-i386.json => fedora/fedora-25-i386.json (100%) rename fedora-25-x86_64.json => fedora/fedora-25-x86_64.json (100%) rename fedora-26-x86_64.json => fedora/fedora-26-x86_64.json (100%) rename {http/fedora => fedora/http}/ks.cfg (100%) rename {scripts/fedora => fedora/scripts}/build-tools.sh (100%) rename {scripts/fedora => fedora/scripts}/cleanup.sh (100%) rename {scripts/fedora => fedora/scripts}/fix-slow-dns.sh (100%) rename {scripts/fedora => fedora/scripts}/swap.sh (100%) rename freebsd-10.3-amd64.json => freebsd/freebsd-10.3-amd64.json (100%) rename freebsd-10.3-i386.json => freebsd/freebsd-10.3-i386.json (100%) rename freebsd-11.1-amd64.json => freebsd/freebsd-11.1-amd64.json (100%) rename {http => freebsd/http}/freebsd-10/install.sh (100%) rename {http => freebsd/http}/freebsd-11/installerconfig (100%) rename {scripts/freebsd => freebsd/scripts}/cleanup.sh (100%) rename {scripts/freebsd => freebsd/scripts}/minimize.sh (100%) rename {scripts/freebsd => freebsd/scripts}/postinstall.sh (100%) rename {scripts/freebsd => freebsd/scripts}/sudoers.sh (100%) rename {scripts/freebsd => freebsd/scripts}/update.sh (100%) rename {scripts/freebsd => freebsd/scripts}/vmtools.sh (100%) rename {vagrantfile_templates => freebsd/vagrantfile_templates}/freebsd.rb (100%) rename macos-10.12.json => macos/macos-10.12.json (100%) rename macosx-10.10.json => macos/macosx-10.10.json (100%) rename macosx-10.11.json => macos/macosx-10.11.json (100%) rename macosx-10.9.json => macos/macosx-10.9.json (100%) rename {scripts/macosx => macos/scripts}/cleanup.sh (100%) rename {scripts/macosx => macos/scripts}/disablesleep.sh (100%) rename {scripts/macosx => macos/scripts}/hostname.sh (100%) rename {scripts/macosx => macos/scripts}/minimize.sh (100%) rename {scripts/macosx => macos/scripts}/networking.sh (100%) rename {scripts/macosx => macos/scripts}/update.sh (100%) rename {scripts/macosx => macos/scripts}/vagrant.sh (100%) rename {scripts/macosx => macos/scripts}/vmtools.sh (100%) rename {vagrantfile_templates => macos/vagrantfile_templates}/macosx.rb (100%) rename {http/opensuse-leap => opensuse/http}/autoinst.xml (100%) rename opensuse-leap-42.3-x86_64.json => opensuse/opensuse-leap-42.3-x86_64.json (100%) rename {scripts/opensuse => opensuse/scripts}/cleanup.sh (100%) rename {scripts/opensuse => opensuse/scripts}/remove-dvd-source.sh (100%) rename {scripts/opensuse => opensuse/scripts}/sudoers.sh (100%) rename {scripts/opensuse => opensuse/scripts}/zypper-locks.sh (100%) rename oracle-5.11-i386.json => oraclelinux/oracle-5.11-i386.json (100%) rename oracle-5.11-x86_64.json => oraclelinux/oracle-5.11-x86_64.json (100%) rename oracle-6.9-i386.json => oraclelinux/oracle-6.9-i386.json (100%) rename oracle-6.9-x86_64.json => oraclelinux/oracle-6.9-x86_64.json (100%) rename oracle-7.3-x86_64.json => oraclelinux/oracle-7.3-x86_64.json (100%) rename {http => rhel/http}/rhel-5/ks.cfg (100%) rename {http => rhel/http}/rhel-6/ks.cfg (100%) rename {http => rhel/http}/rhel-7/ks.cfg (100%) rename rhel-5.11-i386.json => rhel/rhel-5.11-i386.json (100%) rename rhel-5.11-x86_64.json => rhel/rhel-5.11-x86_64.json (100%) rename rhel-6.9-i386.json => rhel/rhel-6.9-i386.json (100%) rename rhel-6.9-x86_64.json => rhel/rhel-6.9-x86_64.json (100%) rename rhel-7.4-x86_64.json => rhel/rhel-7.4-x86_64.json (100%) rename {http/sles-12 => sles/http}/sles-12-sp2-x86_64-autoinst.xml (100%) rename {scripts/sles => sles/scripts}/cleanup.sh (100%) rename {scripts/sles => sles/scripts}/remove-dvd-source.sh (100%) rename {scripts/sles => sles/scripts}/sudoers.sh (100%) rename {scripts/sles => sles/scripts}/unsupported-modules.sh (100%) rename {scripts/sles => sles/scripts}/zypper-locks.sh (100%) rename sles-12-sp2-x86_64.json => sles/sles-12-sp2-x86_64.json (100%) rename {floppy => solaris/floppy}/dummy_metadata.json (100%) rename {floppy => solaris/floppy}/solaris10/S99startup.sh (100%) rename {floppy => solaris/floppy}/solaris10/awesome_prof (100%) rename {floppy => solaris/floppy}/solaris10/finish.sh (100%) rename {floppy => solaris/floppy}/solaris10/rules.ok (100%) rename {floppy => solaris/floppy}/solaris10/sysidcfg (100%) rename {http/solaris-11 => solaris/http}/default.xml (100%) rename {http/solaris-11 => solaris/http}/profile.xml (100%) rename {scripts/solaris => solaris/scripts}/minimize.sh (100%) rename {scripts/solaris10 => solaris/scripts/solaris-10}/minimize.sh (100%) rename {scripts/solaris10 => solaris/scripts/solaris-10}/vmtools.sh (100%) rename {scripts/solaris => solaris/scripts}/update.sh (100%) rename {scripts/solaris => solaris/scripts}/vagrant.sh (100%) rename {scripts/solaris => solaris/scripts}/vmtools.sh (100%) rename solaris-10.11-x86.json => solaris/solaris-10.11-x86.json (100%) rename solaris-11-x86.json => solaris/solaris-11-x86.json (100%) rename {http/ubuntu => ubuntu/http}/preseed-hyperv.cfg (100%) rename {http/ubuntu => ubuntu/http}/preseed.cfg (100%) rename {scripts/ubuntu => ubuntu/scripts}/cleanup.sh (100%) rename {scripts/ubuntu => ubuntu/scripts}/hyperv.sh (100%) rename {scripts/ubuntu => ubuntu/scripts}/networking.sh (100%) rename {scripts/ubuntu => ubuntu/scripts}/sudoers.sh (100%) rename {scripts/ubuntu => ubuntu/scripts}/update.sh (100%) rename {scripts/ubuntu => ubuntu/scripts}/vagrant.sh (100%) rename {scripts/ubuntu => ubuntu/scripts}/vmware.sh (100%) rename ubuntu-14.04-amd64.json => ubuntu/ubuntu-14.04-amd64.json (100%) rename ubuntu-14.04-i386.json => ubuntu/ubuntu-14.04-i386.json (100%) rename ubuntu-16.04-amd64.json => ubuntu/ubuntu-16.04-amd64.json (100%) rename ubuntu-16.04-i386.json => ubuntu/ubuntu-16.04-i386.json (100%) rename ubuntu-17.04-amd64.json => ubuntu/ubuntu-17.04-amd64.json (100%) rename ubuntu-17.04-i386.json => ubuntu/ubuntu-17.04-i386.json (100%) rename {scripts/windows => windows/scripts}/Autounattend.xml (100%) rename {scripts/windows => windows/scripts}/SetupComplete.cmd (100%) rename {scripts/windows => windows/scripts}/nano_cleanup.ps1 (100%) rename {scripts/windows => windows/scripts}/nano_create.ps1 (100%) rename {scripts/windows => windows/scripts}/postunattend.xml (100%) rename {vagrantfile_templates => windows/vagrantfile_templates}/windows-nano.rb (100%) rename windows-nano-tp3.json => windows/windows-nano-tp3.json (100%) diff --git a/scripts/common/metadata.sh b/_common/metadata.sh similarity index 100% rename from scripts/common/metadata.sh rename to _common/metadata.sh diff --git a/scripts/common/minimize.sh b/_common/minimize.sh similarity index 100% rename from scripts/common/minimize.sh rename to _common/minimize.sh diff --git a/scripts/common/parallels.sh b/_common/parallels.sh similarity index 100% rename from scripts/common/parallels.sh rename to _common/parallels.sh diff --git a/scripts/common/sshd.sh b/_common/sshd.sh similarity index 100% rename from scripts/common/sshd.sh rename to _common/sshd.sh diff --git a/scripts/common/vagrant.sh b/_common/vagrant.sh similarity index 100% rename from scripts/common/vagrant.sh rename to _common/vagrant.sh diff --git a/scripts/common/virtualbox.sh b/_common/virtualbox.sh similarity index 100% rename from scripts/common/virtualbox.sh rename to _common/virtualbox.sh diff --git a/scripts/common/vmware.sh b/_common/vmware.sh similarity index 100% rename from scripts/common/vmware.sh rename to _common/vmware.sh diff --git a/centos-6.9-i386.json b/centos/centos-6.9-i386.json similarity index 100% rename from centos-6.9-i386.json rename to centos/centos-6.9-i386.json diff --git a/centos-6.9-x86_64.json b/centos/centos-6.9-x86_64.json similarity index 100% rename from centos-6.9-x86_64.json rename to centos/centos-6.9-x86_64.json diff --git a/centos-7.3-x86_64.json b/centos/centos-7.3-x86_64.json similarity index 100% rename from centos-7.3-x86_64.json rename to centos/centos-7.3-x86_64.json diff --git a/scripts/centos/cleanup.sh b/centos/scripts/cleanup.sh similarity index 100% rename from scripts/centos/cleanup.sh rename to centos/scripts/cleanup.sh diff --git a/scripts/centos/networking.sh b/centos/scripts/networking.sh similarity index 100% rename from scripts/centos/networking.sh rename to centos/scripts/networking.sh diff --git a/scripts/centos/update.sh b/centos/scripts/update.sh similarity index 100% rename from scripts/centos/update.sh rename to centos/scripts/update.sh diff --git a/scripts/centos/vmware.sh b/centos/scripts/vmware.sh similarity index 100% rename from scripts/centos/vmware.sh rename to centos/scripts/vmware.sh diff --git a/debian-7.11-amd64.json b/debian/debian-7.11-amd64.json similarity index 100% rename from debian-7.11-amd64.json rename to debian/debian-7.11-amd64.json diff --git a/debian-7.11-i386.json b/debian/debian-7.11-i386.json similarity index 100% rename from debian-7.11-i386.json rename to debian/debian-7.11-i386.json diff --git a/debian-8.9-amd64.json b/debian/debian-8.9-amd64.json similarity index 100% rename from debian-8.9-amd64.json rename to debian/debian-8.9-amd64.json diff --git a/debian-8.9-i386.json b/debian/debian-8.9-i386.json similarity index 100% rename from debian-8.9-i386.json rename to debian/debian-8.9-i386.json diff --git a/debian-9.1-amd64.json b/debian/debian-9.1-amd64.json similarity index 100% rename from debian-9.1-amd64.json rename to debian/debian-9.1-amd64.json diff --git a/debian-9.1-i386.json b/debian/debian-9.1-i386.json similarity index 100% rename from debian-9.1-i386.json rename to debian/debian-9.1-i386.json diff --git a/http/debian-7/preseed.cfg b/debian/http/debian-7/preseed.cfg similarity index 100% rename from http/debian-7/preseed.cfg rename to debian/http/debian-7/preseed.cfg diff --git a/http/debian-8/preseed.cfg b/debian/http/debian-8/preseed.cfg similarity index 100% rename from http/debian-8/preseed.cfg rename to debian/http/debian-8/preseed.cfg diff --git a/scripts/debian/cleanup.sh b/debian/scripts/cleanup.sh similarity index 100% rename from scripts/debian/cleanup.sh rename to debian/scripts/cleanup.sh diff --git a/scripts/debian/networking.sh b/debian/scripts/networking.sh similarity index 100% rename from scripts/debian/networking.sh rename to debian/scripts/networking.sh diff --git a/scripts/debian/sudoers.sh b/debian/scripts/sudoers.sh similarity index 100% rename from scripts/debian/sudoers.sh rename to debian/scripts/sudoers.sh diff --git a/scripts/debian/systemd.sh b/debian/scripts/systemd.sh similarity index 100% rename from scripts/debian/systemd.sh rename to debian/scripts/systemd.sh diff --git a/scripts/debian/update.sh b/debian/scripts/update.sh similarity index 100% rename from scripts/debian/update.sh rename to debian/scripts/update.sh diff --git a/fedora-25-i386.json b/fedora/fedora-25-i386.json similarity index 100% rename from fedora-25-i386.json rename to fedora/fedora-25-i386.json diff --git a/fedora-25-x86_64.json b/fedora/fedora-25-x86_64.json similarity index 100% rename from fedora-25-x86_64.json rename to fedora/fedora-25-x86_64.json diff --git a/fedora-26-x86_64.json b/fedora/fedora-26-x86_64.json similarity index 100% rename from fedora-26-x86_64.json rename to fedora/fedora-26-x86_64.json diff --git a/http/fedora/ks.cfg b/fedora/http/ks.cfg similarity index 100% rename from http/fedora/ks.cfg rename to fedora/http/ks.cfg diff --git a/scripts/fedora/build-tools.sh b/fedora/scripts/build-tools.sh similarity index 100% rename from scripts/fedora/build-tools.sh rename to fedora/scripts/build-tools.sh diff --git a/scripts/fedora/cleanup.sh b/fedora/scripts/cleanup.sh similarity index 100% rename from scripts/fedora/cleanup.sh rename to fedora/scripts/cleanup.sh diff --git a/scripts/fedora/fix-slow-dns.sh b/fedora/scripts/fix-slow-dns.sh similarity index 100% rename from scripts/fedora/fix-slow-dns.sh rename to fedora/scripts/fix-slow-dns.sh diff --git a/scripts/fedora/swap.sh b/fedora/scripts/swap.sh similarity index 100% rename from scripts/fedora/swap.sh rename to fedora/scripts/swap.sh diff --git a/freebsd-10.3-amd64.json b/freebsd/freebsd-10.3-amd64.json similarity index 100% rename from freebsd-10.3-amd64.json rename to freebsd/freebsd-10.3-amd64.json diff --git a/freebsd-10.3-i386.json b/freebsd/freebsd-10.3-i386.json similarity index 100% rename from freebsd-10.3-i386.json rename to freebsd/freebsd-10.3-i386.json diff --git a/freebsd-11.1-amd64.json b/freebsd/freebsd-11.1-amd64.json similarity index 100% rename from freebsd-11.1-amd64.json rename to freebsd/freebsd-11.1-amd64.json diff --git a/http/freebsd-10/install.sh b/freebsd/http/freebsd-10/install.sh similarity index 100% rename from http/freebsd-10/install.sh rename to freebsd/http/freebsd-10/install.sh diff --git a/http/freebsd-11/installerconfig b/freebsd/http/freebsd-11/installerconfig similarity index 100% rename from http/freebsd-11/installerconfig rename to freebsd/http/freebsd-11/installerconfig diff --git a/scripts/freebsd/cleanup.sh b/freebsd/scripts/cleanup.sh similarity index 100% rename from scripts/freebsd/cleanup.sh rename to freebsd/scripts/cleanup.sh diff --git a/scripts/freebsd/minimize.sh b/freebsd/scripts/minimize.sh similarity index 100% rename from scripts/freebsd/minimize.sh rename to freebsd/scripts/minimize.sh diff --git a/scripts/freebsd/postinstall.sh b/freebsd/scripts/postinstall.sh similarity index 100% rename from scripts/freebsd/postinstall.sh rename to freebsd/scripts/postinstall.sh diff --git a/scripts/freebsd/sudoers.sh b/freebsd/scripts/sudoers.sh similarity index 100% rename from scripts/freebsd/sudoers.sh rename to freebsd/scripts/sudoers.sh diff --git a/scripts/freebsd/update.sh b/freebsd/scripts/update.sh similarity index 100% rename from scripts/freebsd/update.sh rename to freebsd/scripts/update.sh diff --git a/scripts/freebsd/vmtools.sh b/freebsd/scripts/vmtools.sh similarity index 100% rename from scripts/freebsd/vmtools.sh rename to freebsd/scripts/vmtools.sh diff --git a/vagrantfile_templates/freebsd.rb b/freebsd/vagrantfile_templates/freebsd.rb similarity index 100% rename from vagrantfile_templates/freebsd.rb rename to freebsd/vagrantfile_templates/freebsd.rb diff --git a/macos-10.12.json b/macos/macos-10.12.json similarity index 100% rename from macos-10.12.json rename to macos/macos-10.12.json diff --git a/macosx-10.10.json b/macos/macosx-10.10.json similarity index 100% rename from macosx-10.10.json rename to macos/macosx-10.10.json diff --git a/macosx-10.11.json b/macos/macosx-10.11.json similarity index 100% rename from macosx-10.11.json rename to macos/macosx-10.11.json diff --git a/macosx-10.9.json b/macos/macosx-10.9.json similarity index 100% rename from macosx-10.9.json rename to macos/macosx-10.9.json diff --git a/scripts/macosx/cleanup.sh b/macos/scripts/cleanup.sh similarity index 100% rename from scripts/macosx/cleanup.sh rename to macos/scripts/cleanup.sh diff --git a/scripts/macosx/disablesleep.sh b/macos/scripts/disablesleep.sh similarity index 100% rename from scripts/macosx/disablesleep.sh rename to macos/scripts/disablesleep.sh diff --git a/scripts/macosx/hostname.sh b/macos/scripts/hostname.sh similarity index 100% rename from scripts/macosx/hostname.sh rename to macos/scripts/hostname.sh diff --git a/scripts/macosx/minimize.sh b/macos/scripts/minimize.sh similarity index 100% rename from scripts/macosx/minimize.sh rename to macos/scripts/minimize.sh diff --git a/scripts/macosx/networking.sh b/macos/scripts/networking.sh similarity index 100% rename from scripts/macosx/networking.sh rename to macos/scripts/networking.sh diff --git a/scripts/macosx/update.sh b/macos/scripts/update.sh similarity index 100% rename from scripts/macosx/update.sh rename to macos/scripts/update.sh diff --git a/scripts/macosx/vagrant.sh b/macos/scripts/vagrant.sh similarity index 100% rename from scripts/macosx/vagrant.sh rename to macos/scripts/vagrant.sh diff --git a/scripts/macosx/vmtools.sh b/macos/scripts/vmtools.sh similarity index 100% rename from scripts/macosx/vmtools.sh rename to macos/scripts/vmtools.sh diff --git a/vagrantfile_templates/macosx.rb b/macos/vagrantfile_templates/macosx.rb similarity index 100% rename from vagrantfile_templates/macosx.rb rename to macos/vagrantfile_templates/macosx.rb diff --git a/http/opensuse-leap/autoinst.xml b/opensuse/http/autoinst.xml similarity index 100% rename from http/opensuse-leap/autoinst.xml rename to opensuse/http/autoinst.xml diff --git a/opensuse-leap-42.3-x86_64.json b/opensuse/opensuse-leap-42.3-x86_64.json similarity index 100% rename from opensuse-leap-42.3-x86_64.json rename to opensuse/opensuse-leap-42.3-x86_64.json diff --git a/scripts/opensuse/cleanup.sh b/opensuse/scripts/cleanup.sh similarity index 100% rename from scripts/opensuse/cleanup.sh rename to opensuse/scripts/cleanup.sh diff --git a/scripts/opensuse/remove-dvd-source.sh b/opensuse/scripts/remove-dvd-source.sh similarity index 100% rename from scripts/opensuse/remove-dvd-source.sh rename to opensuse/scripts/remove-dvd-source.sh diff --git a/scripts/opensuse/sudoers.sh b/opensuse/scripts/sudoers.sh similarity index 100% rename from scripts/opensuse/sudoers.sh rename to opensuse/scripts/sudoers.sh diff --git a/scripts/opensuse/zypper-locks.sh b/opensuse/scripts/zypper-locks.sh similarity index 100% rename from scripts/opensuse/zypper-locks.sh rename to opensuse/scripts/zypper-locks.sh diff --git a/oracle-5.11-i386.json b/oraclelinux/oracle-5.11-i386.json similarity index 100% rename from oracle-5.11-i386.json rename to oraclelinux/oracle-5.11-i386.json diff --git a/oracle-5.11-x86_64.json b/oraclelinux/oracle-5.11-x86_64.json similarity index 100% rename from oracle-5.11-x86_64.json rename to oraclelinux/oracle-5.11-x86_64.json diff --git a/oracle-6.9-i386.json b/oraclelinux/oracle-6.9-i386.json similarity index 100% rename from oracle-6.9-i386.json rename to oraclelinux/oracle-6.9-i386.json diff --git a/oracle-6.9-x86_64.json b/oraclelinux/oracle-6.9-x86_64.json similarity index 100% rename from oracle-6.9-x86_64.json rename to oraclelinux/oracle-6.9-x86_64.json diff --git a/oracle-7.3-x86_64.json b/oraclelinux/oracle-7.3-x86_64.json similarity index 100% rename from oracle-7.3-x86_64.json rename to oraclelinux/oracle-7.3-x86_64.json diff --git a/http/rhel-5/ks.cfg b/rhel/http/rhel-5/ks.cfg similarity index 100% rename from http/rhel-5/ks.cfg rename to rhel/http/rhel-5/ks.cfg diff --git a/http/rhel-6/ks.cfg b/rhel/http/rhel-6/ks.cfg similarity index 100% rename from http/rhel-6/ks.cfg rename to rhel/http/rhel-6/ks.cfg diff --git a/http/rhel-7/ks.cfg b/rhel/http/rhel-7/ks.cfg similarity index 100% rename from http/rhel-7/ks.cfg rename to rhel/http/rhel-7/ks.cfg diff --git a/rhel-5.11-i386.json b/rhel/rhel-5.11-i386.json similarity index 100% rename from rhel-5.11-i386.json rename to rhel/rhel-5.11-i386.json diff --git a/rhel-5.11-x86_64.json b/rhel/rhel-5.11-x86_64.json similarity index 100% rename from rhel-5.11-x86_64.json rename to rhel/rhel-5.11-x86_64.json diff --git a/rhel-6.9-i386.json b/rhel/rhel-6.9-i386.json similarity index 100% rename from rhel-6.9-i386.json rename to rhel/rhel-6.9-i386.json diff --git a/rhel-6.9-x86_64.json b/rhel/rhel-6.9-x86_64.json similarity index 100% rename from rhel-6.9-x86_64.json rename to rhel/rhel-6.9-x86_64.json diff --git a/rhel-7.4-x86_64.json b/rhel/rhel-7.4-x86_64.json similarity index 100% rename from rhel-7.4-x86_64.json rename to rhel/rhel-7.4-x86_64.json diff --git a/http/sles-12/sles-12-sp2-x86_64-autoinst.xml b/sles/http/sles-12-sp2-x86_64-autoinst.xml similarity index 100% rename from http/sles-12/sles-12-sp2-x86_64-autoinst.xml rename to sles/http/sles-12-sp2-x86_64-autoinst.xml diff --git a/scripts/sles/cleanup.sh b/sles/scripts/cleanup.sh similarity index 100% rename from scripts/sles/cleanup.sh rename to sles/scripts/cleanup.sh diff --git a/scripts/sles/remove-dvd-source.sh b/sles/scripts/remove-dvd-source.sh similarity index 100% rename from scripts/sles/remove-dvd-source.sh rename to sles/scripts/remove-dvd-source.sh diff --git a/scripts/sles/sudoers.sh b/sles/scripts/sudoers.sh similarity index 100% rename from scripts/sles/sudoers.sh rename to sles/scripts/sudoers.sh diff --git a/scripts/sles/unsupported-modules.sh b/sles/scripts/unsupported-modules.sh similarity index 100% rename from scripts/sles/unsupported-modules.sh rename to sles/scripts/unsupported-modules.sh diff --git a/scripts/sles/zypper-locks.sh b/sles/scripts/zypper-locks.sh similarity index 100% rename from scripts/sles/zypper-locks.sh rename to sles/scripts/zypper-locks.sh diff --git a/sles-12-sp2-x86_64.json b/sles/sles-12-sp2-x86_64.json similarity index 100% rename from sles-12-sp2-x86_64.json rename to sles/sles-12-sp2-x86_64.json diff --git a/floppy/dummy_metadata.json b/solaris/floppy/dummy_metadata.json similarity index 100% rename from floppy/dummy_metadata.json rename to solaris/floppy/dummy_metadata.json diff --git a/floppy/solaris10/S99startup.sh b/solaris/floppy/solaris10/S99startup.sh similarity index 100% rename from floppy/solaris10/S99startup.sh rename to solaris/floppy/solaris10/S99startup.sh diff --git a/floppy/solaris10/awesome_prof b/solaris/floppy/solaris10/awesome_prof similarity index 100% rename from floppy/solaris10/awesome_prof rename to solaris/floppy/solaris10/awesome_prof diff --git a/floppy/solaris10/finish.sh b/solaris/floppy/solaris10/finish.sh similarity index 100% rename from floppy/solaris10/finish.sh rename to solaris/floppy/solaris10/finish.sh diff --git a/floppy/solaris10/rules.ok b/solaris/floppy/solaris10/rules.ok similarity index 100% rename from floppy/solaris10/rules.ok rename to solaris/floppy/solaris10/rules.ok diff --git a/floppy/solaris10/sysidcfg b/solaris/floppy/solaris10/sysidcfg similarity index 100% rename from floppy/solaris10/sysidcfg rename to solaris/floppy/solaris10/sysidcfg diff --git a/http/solaris-11/default.xml b/solaris/http/default.xml similarity index 100% rename from http/solaris-11/default.xml rename to solaris/http/default.xml diff --git a/http/solaris-11/profile.xml b/solaris/http/profile.xml similarity index 100% rename from http/solaris-11/profile.xml rename to solaris/http/profile.xml diff --git a/scripts/solaris/minimize.sh b/solaris/scripts/minimize.sh similarity index 100% rename from scripts/solaris/minimize.sh rename to solaris/scripts/minimize.sh diff --git a/scripts/solaris10/minimize.sh b/solaris/scripts/solaris-10/minimize.sh similarity index 100% rename from scripts/solaris10/minimize.sh rename to solaris/scripts/solaris-10/minimize.sh diff --git a/scripts/solaris10/vmtools.sh b/solaris/scripts/solaris-10/vmtools.sh similarity index 100% rename from scripts/solaris10/vmtools.sh rename to solaris/scripts/solaris-10/vmtools.sh diff --git a/scripts/solaris/update.sh b/solaris/scripts/update.sh similarity index 100% rename from scripts/solaris/update.sh rename to solaris/scripts/update.sh diff --git a/scripts/solaris/vagrant.sh b/solaris/scripts/vagrant.sh similarity index 100% rename from scripts/solaris/vagrant.sh rename to solaris/scripts/vagrant.sh diff --git a/scripts/solaris/vmtools.sh b/solaris/scripts/vmtools.sh similarity index 100% rename from scripts/solaris/vmtools.sh rename to solaris/scripts/vmtools.sh diff --git a/solaris-10.11-x86.json b/solaris/solaris-10.11-x86.json similarity index 100% rename from solaris-10.11-x86.json rename to solaris/solaris-10.11-x86.json diff --git a/solaris-11-x86.json b/solaris/solaris-11-x86.json similarity index 100% rename from solaris-11-x86.json rename to solaris/solaris-11-x86.json diff --git a/http/ubuntu/preseed-hyperv.cfg b/ubuntu/http/preseed-hyperv.cfg similarity index 100% rename from http/ubuntu/preseed-hyperv.cfg rename to ubuntu/http/preseed-hyperv.cfg diff --git a/http/ubuntu/preseed.cfg b/ubuntu/http/preseed.cfg similarity index 100% rename from http/ubuntu/preseed.cfg rename to ubuntu/http/preseed.cfg diff --git a/scripts/ubuntu/cleanup.sh b/ubuntu/scripts/cleanup.sh similarity index 100% rename from scripts/ubuntu/cleanup.sh rename to ubuntu/scripts/cleanup.sh diff --git a/scripts/ubuntu/hyperv.sh b/ubuntu/scripts/hyperv.sh similarity index 100% rename from scripts/ubuntu/hyperv.sh rename to ubuntu/scripts/hyperv.sh diff --git a/scripts/ubuntu/networking.sh b/ubuntu/scripts/networking.sh similarity index 100% rename from scripts/ubuntu/networking.sh rename to ubuntu/scripts/networking.sh diff --git a/scripts/ubuntu/sudoers.sh b/ubuntu/scripts/sudoers.sh similarity index 100% rename from scripts/ubuntu/sudoers.sh rename to ubuntu/scripts/sudoers.sh diff --git a/scripts/ubuntu/update.sh b/ubuntu/scripts/update.sh similarity index 100% rename from scripts/ubuntu/update.sh rename to ubuntu/scripts/update.sh diff --git a/scripts/ubuntu/vagrant.sh b/ubuntu/scripts/vagrant.sh similarity index 100% rename from scripts/ubuntu/vagrant.sh rename to ubuntu/scripts/vagrant.sh diff --git a/scripts/ubuntu/vmware.sh b/ubuntu/scripts/vmware.sh similarity index 100% rename from scripts/ubuntu/vmware.sh rename to ubuntu/scripts/vmware.sh diff --git a/ubuntu-14.04-amd64.json b/ubuntu/ubuntu-14.04-amd64.json similarity index 100% rename from ubuntu-14.04-amd64.json rename to ubuntu/ubuntu-14.04-amd64.json diff --git a/ubuntu-14.04-i386.json b/ubuntu/ubuntu-14.04-i386.json similarity index 100% rename from ubuntu-14.04-i386.json rename to ubuntu/ubuntu-14.04-i386.json diff --git a/ubuntu-16.04-amd64.json b/ubuntu/ubuntu-16.04-amd64.json similarity index 100% rename from ubuntu-16.04-amd64.json rename to ubuntu/ubuntu-16.04-amd64.json diff --git a/ubuntu-16.04-i386.json b/ubuntu/ubuntu-16.04-i386.json similarity index 100% rename from ubuntu-16.04-i386.json rename to ubuntu/ubuntu-16.04-i386.json diff --git a/ubuntu-17.04-amd64.json b/ubuntu/ubuntu-17.04-amd64.json similarity index 100% rename from ubuntu-17.04-amd64.json rename to ubuntu/ubuntu-17.04-amd64.json diff --git a/ubuntu-17.04-i386.json b/ubuntu/ubuntu-17.04-i386.json similarity index 100% rename from ubuntu-17.04-i386.json rename to ubuntu/ubuntu-17.04-i386.json diff --git a/scripts/windows/Autounattend.xml b/windows/scripts/Autounattend.xml similarity index 100% rename from scripts/windows/Autounattend.xml rename to windows/scripts/Autounattend.xml diff --git a/scripts/windows/SetupComplete.cmd b/windows/scripts/SetupComplete.cmd similarity index 100% rename from scripts/windows/SetupComplete.cmd rename to windows/scripts/SetupComplete.cmd diff --git a/scripts/windows/nano_cleanup.ps1 b/windows/scripts/nano_cleanup.ps1 similarity index 100% rename from scripts/windows/nano_cleanup.ps1 rename to windows/scripts/nano_cleanup.ps1 diff --git a/scripts/windows/nano_create.ps1 b/windows/scripts/nano_create.ps1 similarity index 100% rename from scripts/windows/nano_create.ps1 rename to windows/scripts/nano_create.ps1 diff --git a/scripts/windows/postunattend.xml b/windows/scripts/postunattend.xml similarity index 100% rename from scripts/windows/postunattend.xml rename to windows/scripts/postunattend.xml diff --git a/vagrantfile_templates/windows-nano.rb b/windows/vagrantfile_templates/windows-nano.rb similarity index 100% rename from vagrantfile_templates/windows-nano.rb rename to windows/vagrantfile_templates/windows-nano.rb diff --git a/windows-nano-tp3.json b/windows/windows-nano-tp3.json similarity index 100% rename from windows-nano-tp3.json rename to windows/windows-nano-tp3.json From 9663f93ce619349608ed1332c331ee51985c2183 Mon Sep 17 00:00:00 2001 From: Seth Thomas <sthomas@chef.io> Date: Thu, 31 Aug 2017 15:15:06 -0400 Subject: [PATCH 0690/1622] Update templates to reflect re-organization Signed-off-by: Seth Thomas <sthomas@chef.io> --- MAINTAINERS.md | 12 ++----- README.md | 37 ++++++++++++-------- centos/centos-6.9-i386.json | 29 ++++++--------- centos/centos-6.9-x86_64.json | 29 ++++++--------- centos/centos-7.3-x86_64.json | 32 +++++++---------- {rhel/http/rhel-5 => centos/http/5}/ks.cfg | 0 {rhel/http/rhel-6 => centos/http/6}/ks.cfg | 0 {rhel/http/rhel-7 => centos/http/7}/ks.cfg | 0 debian/debian-7.11-amd64.json | 29 ++++++--------- debian/debian-7.11-i386.json | 29 ++++++--------- debian/debian-8.9-amd64.json | 31 +++++++--------- debian/debian-8.9-i386.json | 31 +++++++--------- debian/debian-9.1-amd64.json | 31 +++++++--------- debian/debian-9.1-i386.json | 31 +++++++--------- fedora/fedora-25-i386.json | 31 +++++++--------- fedora/fedora-25-x86_64.json | 31 +++++++--------- fedora/fedora-26-x86_64.json | 31 +++++++--------- freebsd/freebsd-10.3-amd64.json | 23 +++++------- freebsd/freebsd-10.3-i386.json | 23 +++++------- freebsd/freebsd-11.1-amd64.json | 25 +++++-------- macos/macos-10.12.json | 25 +++++-------- macos/macosx-10.10.json | 25 +++++-------- macos/macosx-10.11.json | 25 +++++-------- macos/macosx-10.9.json | 25 +++++-------- opensuse/opensuse-leap-42.3-x86_64.json | 26 +++++++------- oraclelinux/oracle-5.11-i386.json | 35 ++++++++---------- oraclelinux/oracle-5.11-x86_64.json | 35 ++++++++---------- oraclelinux/oracle-6.9-i386.json | 37 ++++++++------------ oraclelinux/oracle-6.9-x86_64.json | 37 ++++++++------------ oraclelinux/oracle-7.3-x86_64.json | 37 ++++++++------------ rhel/rhel-5.11-i386.json | 33 +++++++---------- rhel/rhel-5.11-x86_64.json | 33 +++++++---------- rhel/rhel-6.9-i386.json | 35 ++++++++---------- rhel/rhel-6.9-x86_64.json | 35 ++++++++---------- rhel/rhel-7.4-x86_64.json | 35 ++++++++---------- sles/sles-12-sp2-x86_64.json | 31 +++++++--------- solaris/floppy/{solaris10 => }/S99startup.sh | 0 solaris/floppy/{solaris10 => }/awesome_prof | 0 solaris/floppy/dummy_metadata.json | 3 -- solaris/floppy/{solaris10 => }/finish.sh | 0 solaris/floppy/{solaris10 => }/rules.ok | 0 solaris/floppy/{solaris10 => }/sysidcfg | 0 solaris/solaris-10.11-x86.json | 37 ++++++++------------ solaris/solaris-11-x86.json | 21 ++++------- ubuntu/ubuntu-14.04-amd64.json | 33 +++++++---------- ubuntu/ubuntu-14.04-i386.json | 31 +++++++--------- ubuntu/ubuntu-16.04-amd64.json | 33 +++++++---------- ubuntu/ubuntu-16.04-i386.json | 31 +++++++--------- ubuntu/ubuntu-17.04-amd64.json | 33 +++++++---------- ubuntu/ubuntu-17.04-i386.json | 26 +++++++------- windows/windows-nano-tp3.json | 15 ++++---- 51 files changed, 495 insertions(+), 762 deletions(-) rename {rhel/http/rhel-5 => centos/http/5}/ks.cfg (100%) rename {rhel/http/rhel-6 => centos/http/6}/ks.cfg (100%) rename {rhel/http/rhel-7 => centos/http/7}/ks.cfg (100%) rename solaris/floppy/{solaris10 => }/S99startup.sh (100%) rename solaris/floppy/{solaris10 => }/awesome_prof (100%) delete mode 100644 solaris/floppy/dummy_metadata.json rename solaris/floppy/{solaris10 => }/finish.sh (100%) rename solaris/floppy/{solaris10 => }/rules.ok (100%) rename solaris/floppy/{solaris10 => }/sysidcfg (100%) diff --git a/MAINTAINERS.md b/MAINTAINERS.md index b9bcdce3e..3d3935c11 100644 --- a/MAINTAINERS.md +++ b/MAINTAINERS.md @@ -6,7 +6,7 @@ Check out [How Chef is Maintained](https://github.com/chef/chef-rfc/blob/master/ # Project Lead -[Fletcher Nichol](http://github.com/fnichol) +[Seth Thomas](http://github.com/cheeseplus) # Components @@ -16,16 +16,8 @@ Covers the Bento project repository which is responsible for building Vagrant bo ### Lieutenants -* [Seth Chisamore](https://github.com/schisamo) -* [Yvonne Lam](https://github.com/yzl) -* [Seth Thomas](https://github.com/cheeseplus) +* [Tim Smith](https://github.com/tas50) ### Maintainers * [Rickard von Essen](https://github.com/rickard-von-essen) -* [Mikhail Zholobov](https://github.com/legal90) -* [Brian Flad](https://github.com/bflad) -* [Tim Smith](https://github.com/tas50) -* [Seth Vargo](https://github.com/sethvargo) -* [William Tisäter](https://github.com/tiwilliam) -* [Josh Hudson](https://github.com/itmustbejj) diff --git a/README.md b/README.md index 3553aec48..ea73543ab 100644 --- a/README.md +++ b/README.md @@ -20,47 +20,54 @@ Vagrant.configure("2") do |config| end ``` -### Building Templates +### Building Boxes #### Requirements - [Packer](https://www.packer.io/) -- At least one virtualization provider: - - [VirtualBox](https://www.virtualbox.org/) +- At least one of the following virtualization providers: + - [VirtualBox](https://www.virtualbox.org) - [VMware Fusion](https://www.vmware.com/products/fusion.html) - - [Parallels Desktop](http://www.parallels.com/products/desktop/) + - [VMware Workstation](https://www.vmware.com/products/workstation.html) + - [Parallels Desktop](http://www.parallels.com/products/desktop) + - [KVM](https://www.linux-kvm.org/page/Main_Page) * + - [Hyper-V](https://technet.microsoft.com/en-us/library/hh831531(v=ws.11).aspx) * + +\***NOTE:** support for these providers is considered experimental and corresponding Vagrant Cloud images may or may not exist. #### Using `packer` -To build a template for all providers simultaneously +To build an Ubuntu 16.04 box for only the VirtualBox provider ``` -$ packer build ubuntu-16.04-amd64.json +cd ubuntu +$ packer build -only=virtualbox-iso ubuntu-16.04-amd64.json ``` -To build a template only for a list of specific providers +To build Debian 9.1 32bit boxes for all possible providers (simultaneously) ``` -$ packer build -only=virtualbox-iso ubuntu-16.04-amd64.json +$ cd debian +$ packer build debian-9.1-i386.json ``` -To build a template for all providers except a list of specific providers +To build CentOS 7.3 boxes for all providers except VMware and Parallels ``` -$ packer build -except=parallels-iso,vmware-iso ubuntu-16.04-amd64.json +cd centos +$ packer build -except=parallels-iso,vmware-iso centos-7.3-x86_64.json ``` To use an alternate mirror ``` -$ packer build -var 'mirror=http://ftp.jaist.ac.jp/pub/Linux/debian-cdimage/release' ubuntu-16.04-amd64.json +cd fedora +$ packer build -var 'mirror=http://mirror.utexas.edu/fedora/linux' fedora-26-x86_64.json ``` -Congratulations! Ready to import box files should be in the ../builds directory. - -Notes: +If the build is successful, ready to import box files will be in the `builds` directory at the root of the repository. -- The box_basename can be overridden like other Packer vars with `-var 'box_basename=ubuntu-16.04'` +\***NOTE:** box_basename can be overridden like other Packer vars with `-var 'box_basename=ubuntu-16.04'` ### Proprietary Templates diff --git a/centos/centos-6.9-i386.json b/centos/centos-6.9-i386.json index 8c636f206..9367c0d81 100644 --- a/centos/centos-6.9-i386.json +++ b/centos/centos-6.9-i386.json @@ -152,16 +152,11 @@ ], "post-processors": [ { - "output": "builds/{{user `box_basename`}}.{{.Provider}}.box", + "output": "../builds/{{user `box_basename`}}.{{.Provider}}.box", "type": "vagrant" } ], "provisioners": [ - { - "destination": "/tmp/bento-metadata.json", - "source": "{{user `metadata`}}", - "type": "file" - }, { "environment_vars": [ "HOME_DIR=/home/vagrant", @@ -171,16 +166,15 @@ ], "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", "scripts": [ - "scripts/common/metadata.sh", - "scripts/centos/update.sh", - "scripts/common/sshd.sh", - "scripts/centos/networking.sh", - "scripts/common/vagrant.sh", - "scripts/common/virtualbox.sh", - "scripts/common/vmware.sh", - "scripts/common/parallels.sh", - "scripts/centos/cleanup.sh", - "scripts/common/minimize.sh" + "scripts/update.sh", + "../_common/sshd.sh", + "scripts/networking.sh", + "../_common/vagrant.sh", + "../_common/virtualbox.sh", + "../_common/vmware.sh", + "../_common/parallels.sh", + "scripts/cleanup.sh", + "../_common/minimize.sh" ], "type": "shell" } @@ -198,9 +192,8 @@ "iso_checksum": "0724a468ec0c4ac46ac6a1daba0273be697a37bb7f4e9fed8ad84ad270cdee2f", "iso_checksum_type": "sha256", "iso_name": "CentOS-6.9-i386-bin-DVD1.iso", - "ks_path": "rhel-6/ks.cfg", + "ks_path": "6/ks.cfg", "memory": "1024", - "metadata": "floppy/dummy_metadata.json", "mirror": "http://mirrors.kernel.org/centos", "mirror_directory": "6.9/isos/i386", "name": "centos-6.9-i386", diff --git a/centos/centos-6.9-x86_64.json b/centos/centos-6.9-x86_64.json index 96208e106..77d6c46e5 100644 --- a/centos/centos-6.9-x86_64.json +++ b/centos/centos-6.9-x86_64.json @@ -152,16 +152,11 @@ ], "post-processors": [ { - "output": "builds/{{user `box_basename`}}.{{.Provider}}.box", + "output": "../builds/{{user `box_basename`}}.{{.Provider}}.box", "type": "vagrant" } ], "provisioners": [ - { - "destination": "/tmp/bento-metadata.json", - "source": "{{user `metadata`}}", - "type": "file" - }, { "environment_vars": [ "HOME_DIR=/home/vagrant", @@ -171,16 +166,15 @@ ], "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", "scripts": [ - "scripts/common/metadata.sh", - "scripts/centos/update.sh", - "scripts/common/sshd.sh", - "scripts/centos/networking.sh", - "scripts/common/vagrant.sh", - "scripts/common/virtualbox.sh", - "scripts/common/vmware.sh", - "scripts/common/parallels.sh", - "scripts/centos/cleanup.sh", - "scripts/common/minimize.sh" + "scripts/update.sh", + "../_common/sshd.sh", + "scripts/networking.sh", + "../_common/vagrant.sh", + "../_common/virtualbox.sh", + "../_common/vmware.sh", + "../_common/parallels.sh", + "scripts/cleanup.sh", + "../_common/minimize.sh" ], "type": "shell" } @@ -198,9 +192,8 @@ "iso_checksum": "d27cf37a40509c17ad70f37bc743f038c1feba00476fe6b69682aa424c399ea6", "iso_checksum_type": "sha256", "iso_name": "CentOS-6.9-x86_64-bin-DVD1.iso", - "ks_path": "rhel-6/ks.cfg", + "ks_path": "6/ks.cfg", "memory": "1024", - "metadata": "floppy/dummy_metadata.json", "mirror": "http://mirrors.kernel.org/centos", "mirror_directory": "6.9/isos/x86_64", "name": "centos-6.9", diff --git a/centos/centos-7.3-x86_64.json b/centos/centos-7.3-x86_64.json index 8be488cfa..e68631abd 100644 --- a/centos/centos-7.3-x86_64.json +++ b/centos/centos-7.3-x86_64.json @@ -110,7 +110,7 @@ "cpu": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "floppy_files": [ - "http/rhel-7/ks.cfg" + "http/7/ks.cfg" ], "generation": "{{user `hyperv_generation`}}", "guest_additions_mode": "disable", @@ -152,16 +152,11 @@ ], "post-processors": [ { - "output": "builds/{{user `box_basename`}}.{{.Provider}}.box", + "output": "../builds/{{user `box_basename`}}.{{.Provider}}.box", "type": "vagrant" } ], "provisioners": [ - { - "destination": "/tmp/bento-metadata.json", - "source": "{{user `metadata`}}", - "type": "file" - }, { "environment_vars": [ "HOME_DIR=/home/vagrant", @@ -171,16 +166,16 @@ ], "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", "scripts": [ - "scripts/common/metadata.sh", - "scripts/centos/update.sh", - "scripts/common/sshd.sh", - "scripts/centos/networking.sh", - "scripts/common/vagrant.sh", - "scripts/common/virtualbox.sh", - "scripts/common/vmware.sh", - "scripts/common/parallels.sh", - "scripts/centos/cleanup.sh", - "scripts/common/minimize.sh" + + "scripts/update.sh", + "../_common/sshd.sh", + "scripts/networking.sh", + "../_common/vagrant.sh", + "../_common/virtualbox.sh", + "../_common/vmware.sh", + "../_common/parallels.sh", + "scripts/cleanup.sh", + "../_common/minimize.sh" ], "type": "shell" } @@ -199,9 +194,8 @@ "iso_checksum": "c455ee948e872ad2194bdddd39045b83634e8613249182b88f549bb2319d97eb", "iso_checksum_type": "sha256", "iso_name": "CentOS-7-x86_64-DVD-1611.iso", - "ks_path": "rhel-7/ks.cfg", + "ks_path": "7/ks.cfg", "memory": "1024", - "metadata": "floppy/dummy_metadata.json", "mirror": "http://mirrors.kernel.org/centos", "mirror_directory": "7.3.1611/isos/x86_64", "name": "centos-7.3", diff --git a/rhel/http/rhel-5/ks.cfg b/centos/http/5/ks.cfg similarity index 100% rename from rhel/http/rhel-5/ks.cfg rename to centos/http/5/ks.cfg diff --git a/rhel/http/rhel-6/ks.cfg b/centos/http/6/ks.cfg similarity index 100% rename from rhel/http/rhel-6/ks.cfg rename to centos/http/6/ks.cfg diff --git a/rhel/http/rhel-7/ks.cfg b/centos/http/7/ks.cfg similarity index 100% rename from rhel/http/rhel-7/ks.cfg rename to centos/http/7/ks.cfg diff --git a/debian/debian-7.11-amd64.json b/debian/debian-7.11-amd64.json index 03b9049fe..459a91083 100644 --- a/debian/debian-7.11-amd64.json +++ b/debian/debian-7.11-amd64.json @@ -181,16 +181,11 @@ ], "post-processors": [ { - "output": "builds/{{user `box_basename`}}.{{.Provider}}.box", + "output": "../builds/{{user `box_basename`}}.{{.Provider}}.box", "type": "vagrant" } ], "provisioners": [ - { - "destination": "/tmp/bento-metadata.json", - "source": "{{user `metadata`}}", - "type": "file" - }, { "environment_vars": [ "HOME_DIR=/home/vagrant", @@ -200,17 +195,16 @@ ], "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", "scripts": [ - "scripts/common/metadata.sh", - "scripts/debian/update.sh", - "scripts/common/sshd.sh", - "scripts/debian/networking.sh", - "scripts/debian/sudoers.sh", - "scripts/common/vagrant.sh", - "scripts/common/virtualbox.sh", - "scripts/common/vmware.sh", - "scripts/common/parallels.sh", - "scripts/debian/cleanup.sh", - "scripts/common/minimize.sh" + "scripts/update.sh", + "../_common/sshd.sh", + "scripts/networking.sh", + "scripts/sudoers.sh", + "../_common/vagrant.sh", + "../_common/virtualbox.sh", + "../_common/vmware.sh", + "../_common/parallels.sh", + "scripts/cleanup.sh", + "../_common/minimize.sh" ], "type": "shell" } @@ -228,7 +222,6 @@ "iso_checksum_type": "sha256", "iso_name": "debian-7.11.0-amd64-CD-1.iso", "memory": "1024", - "metadata": "floppy/dummy_metadata.json", "mirror": "http://cdimage.debian.org/cdimage/archive", "mirror_directory": "7.11.0/amd64/iso-cd", "name": "debian-7.11", diff --git a/debian/debian-7.11-i386.json b/debian/debian-7.11-i386.json index a0f18b0fe..d4168812d 100644 --- a/debian/debian-7.11-i386.json +++ b/debian/debian-7.11-i386.json @@ -181,16 +181,11 @@ ], "post-processors": [ { - "output": "builds/{{user `box_basename`}}.{{.Provider}}.box", + "output": "../builds/{{user `box_basename`}}.{{.Provider}}.box", "type": "vagrant" } ], "provisioners": [ - { - "destination": "/tmp/bento-metadata.json", - "source": "{{user `metadata`}}", - "type": "file" - }, { "environment_vars": [ "HOME_DIR=/home/vagrant", @@ -200,17 +195,16 @@ ], "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", "scripts": [ - "scripts/common/metadata.sh", - "scripts/debian/update.sh", - "scripts/common/sshd.sh", - "scripts/debian/networking.sh", - "scripts/debian/sudoers.sh", - "scripts/common/vagrant.sh", - "scripts/common/virtualbox.sh", - "scripts/common/vmware.sh", - "scripts/common/parallels.sh", - "scripts/debian/cleanup.sh", - "scripts/common/minimize.sh" + "scripts/update.sh", + "../_common/sshd.sh", + "scripts/networking.sh", + "scripts/sudoers.sh", + "../_common/vagrant.sh", + "../_common/virtualbox.sh", + "../_common/vmware.sh", + "../_common/parallels.sh", + "scripts/cleanup.sh", + "../_common/minimize.sh" ], "type": "shell" } @@ -228,7 +222,6 @@ "iso_checksum_type": "sha256", "iso_name": "debian-7.11.0-i386-CD-1.iso", "memory": "1024", - "metadata": "floppy/dummy_metadata.json", "mirror": "http://cdimage.debian.org/cdimage/archive", "mirror_directory": "7.11.0/i386/iso-cd", "name": "debian-7.11-i386", diff --git a/debian/debian-8.9-amd64.json b/debian/debian-8.9-amd64.json index 63c711b3a..f39ad5f0e 100644 --- a/debian/debian-8.9-amd64.json +++ b/debian/debian-8.9-amd64.json @@ -186,16 +186,11 @@ ], "post-processors": [ { - "output": "builds/{{user `box_basename`}}.{{.Provider}}.box", + "output": "../builds/{{user `box_basename`}}.{{.Provider}}.box", "type": "vagrant" } ], "provisioners": [ - { - "destination": "/tmp/bento-metadata.json", - "source": "{{user `metadata`}}", - "type": "file" - }, { "environment_vars": [ "HOME_DIR=/home/vagrant", @@ -205,18 +200,17 @@ ], "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", "scripts": [ - "scripts/common/metadata.sh", - "scripts/debian/update.sh", - "scripts/common/sshd.sh", - "scripts/debian/networking.sh", - "scripts/debian/sudoers.sh", - "scripts/common/vagrant.sh", - "scripts/debian/systemd.sh", - "scripts/common/virtualbox.sh", - "scripts/common/vmware.sh", - "scripts/common/parallels.sh", - "scripts/debian/cleanup.sh", - "scripts/common/minimize.sh" + "scripts/update.sh", + "../_common/sshd.sh", + "scripts/networking.sh", + "scripts/sudoers.sh", + "../_common/vagrant.sh", + "scripts/systemd.sh", + "../_common/virtualbox.sh", + "../_common/vmware.sh", + "../_common/parallels.sh", + "scripts/cleanup.sh", + "../_common/minimize.sh" ], "type": "shell" } @@ -234,7 +228,6 @@ "iso_checksum_type": "sha256", "iso_name": "debian-8.9.0-amd64-CD-1.iso", "memory": "1024", - "metadata": "floppy/dummy_metadata.json", "mirror": "http://cdimage.debian.org/cdimage/archive", "mirror_directory": "8.9.0/amd64/iso-cd", "name": "debian-8.9", diff --git a/debian/debian-8.9-i386.json b/debian/debian-8.9-i386.json index d57121084..f8753be2d 100644 --- a/debian/debian-8.9-i386.json +++ b/debian/debian-8.9-i386.json @@ -186,16 +186,11 @@ ], "post-processors": [ { - "output": "builds/{{user `box_basename`}}.{{.Provider}}.box", + "output": "../builds/{{user `box_basename`}}.{{.Provider}}.box", "type": "vagrant" } ], "provisioners": [ - { - "destination": "/tmp/bento-metadata.json", - "source": "{{user `metadata`}}", - "type": "file" - }, { "environment_vars": [ "HOME_DIR=/home/vagrant", @@ -205,18 +200,17 @@ ], "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", "scripts": [ - "scripts/common/metadata.sh", - "scripts/debian/update.sh", - "scripts/common/sshd.sh", - "scripts/debian/networking.sh", - "scripts/debian/sudoers.sh", - "scripts/common/vagrant.sh", - "scripts/debian/systemd.sh", - "scripts/common/virtualbox.sh", - "scripts/common/vmware.sh", - "scripts/common/parallels.sh", - "scripts/debian/cleanup.sh", - "scripts/common/minimize.sh" + "scripts/update.sh", + "../_common/sshd.sh", + "scripts/networking.sh", + "scripts/sudoers.sh", + "../_common/vagrant.sh", + "scripts/systemd.sh", + "../_common/virtualbox.sh", + "../_common/vmware.sh", + "../_common/parallels.sh", + "scripts/cleanup.sh", + "../_common/minimize.sh" ], "type": "shell" } @@ -234,7 +228,6 @@ "iso_checksum_type": "sha256", "iso_name": "debian-8.9.0-i386-CD-1.iso", "memory": "1024", - "metadata": "floppy/dummy_metadata.json", "mirror": "http://cdimage.debian.org/cdimage/archive", "mirror_directory": "8.9.0/i386/iso-cd", "name": "debian-8.9-i386", diff --git a/debian/debian-9.1-amd64.json b/debian/debian-9.1-amd64.json index 4ed0984df..a048ff5f1 100644 --- a/debian/debian-9.1-amd64.json +++ b/debian/debian-9.1-amd64.json @@ -186,16 +186,11 @@ ], "post-processors": [ { - "output": "builds/{{user `box_basename`}}.{{.Provider}}.box", + "output": "../builds/{{user `box_basename`}}.{{.Provider}}.box", "type": "vagrant" } ], "provisioners": [ - { - "destination": "/tmp/bento-metadata.json", - "source": "{{user `metadata`}}", - "type": "file" - }, { "environment_vars": [ "HOME_DIR=/home/vagrant", @@ -205,18 +200,17 @@ ], "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", "scripts": [ - "scripts/common/metadata.sh", - "scripts/debian/update.sh", - "scripts/common/sshd.sh", - "scripts/debian/networking.sh", - "scripts/debian/sudoers.sh", - "scripts/common/vagrant.sh", - "scripts/debian/systemd.sh", - "scripts/common/virtualbox.sh", - "scripts/common/vmware.sh", - "scripts/common/parallels.sh", - "scripts/debian/cleanup.sh", - "scripts/common/minimize.sh" + "scripts/update.sh", + "../_common/sshd.sh", + "scripts/networking.sh", + "scripts/sudoers.sh", + "../_common/vagrant.sh", + "scripts/systemd.sh", + "../_common/virtualbox.sh", + "../_common/vmware.sh", + "../_common/parallels.sh", + "scripts/cleanup.sh", + "../_common/minimize.sh" ], "type": "shell" } @@ -234,7 +228,6 @@ "iso_checksum_type": "sha256", "iso_name": "debian-9.1.0-amd64-netinst.iso", "memory": "1024", - "metadata": "floppy/dummy_metadata.json", "mirror": "http://cdimage.debian.org/cdimage/release", "mirror_directory": "9.1.0/amd64/iso-cd", "name": "debian-9.1", diff --git a/debian/debian-9.1-i386.json b/debian/debian-9.1-i386.json index 8687c1dc5..f65653769 100644 --- a/debian/debian-9.1-i386.json +++ b/debian/debian-9.1-i386.json @@ -186,16 +186,11 @@ ], "post-processors": [ { - "output": "builds/{{user `box_basename`}}.{{.Provider}}.box", + "output": "../builds/{{user `box_basename`}}.{{.Provider}}.box", "type": "vagrant" } ], "provisioners": [ - { - "destination": "/tmp/bento-metadata.json", - "source": "{{user `metadata`}}", - "type": "file" - }, { "environment_vars": [ "HOME_DIR=/home/vagrant", @@ -205,18 +200,17 @@ ], "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", "scripts": [ - "scripts/common/metadata.sh", - "scripts/debian/update.sh", - "scripts/common/sshd.sh", - "scripts/debian/networking.sh", - "scripts/debian/sudoers.sh", - "scripts/common/vagrant.sh", - "scripts/debian/systemd.sh", - "scripts/common/virtualbox.sh", - "scripts/common/vmware.sh", - "scripts/common/parallels.sh", - "scripts/debian/cleanup.sh", - "scripts/common/minimize.sh" + "scripts/update.sh", + "../_common/sshd.sh", + "scripts/networking.sh", + "scripts/sudoers.sh", + "../_common/vagrant.sh", + "scripts/systemd.sh", + "../_common/virtualbox.sh", + "../_common/vmware.sh", + "../_common/parallels.sh", + "scripts/cleanup.sh", + "../_common/minimize.sh" ], "type": "shell" } @@ -234,7 +228,6 @@ "iso_checksum_type": "sha256", "iso_name": "debian-9.1.0-i386-netinst.iso", "memory": "1024", - "metadata": "floppy/dummy_metadata.json", "mirror": "http://cdimage.debian.org/cdimage/release", "mirror_directory": "9.1.0/i386/iso-cd", "name": "debian-9.1-i386", diff --git a/fedora/fedora-25-i386.json b/fedora/fedora-25-i386.json index 8aabad30b..1c6c7d033 100644 --- a/fedora/fedora-25-i386.json +++ b/fedora/fedora-25-i386.json @@ -125,31 +125,25 @@ ], "post-processors": [ { - "output": "builds/{{user `box_basename`}}.{{.Provider}}.box", + "output": "../builds/{{user `box_basename`}}.{{.Provider}}.box", "type": "vagrant" } ], "provisioners": [ - { - "destination": "/tmp/bento-metadata.json", - "source": "{{user `metadata`}}", - "type": "file" - }, { "environment_vars": [], "execute_command": "echo 'vagrant' | {{.Vars}} sudo -E -S bash '{{.Path}}'", "scripts": [ - "scripts/common/metadata.sh", - "scripts/fedora/swap.sh", - "scripts/fedora/fix-slow-dns.sh", - "scripts/fedora/build-tools.sh", - "scripts/common/sshd.sh", - "scripts/common/virtualbox.sh", - "scripts/common/vmware.sh", - "scripts/common/parallels.sh", - "scripts/common/vagrant.sh", - "scripts/fedora/cleanup.sh", - "scripts/common/minimize.sh" + "scripts/swap.sh", + "scripts/fix-slow-dns.sh", + "scripts/build-tools.sh", + "../_common/sshd.sh", + "../_common/virtualbox.sh", + "../_common/vmware.sh", + "../_common/parallels.sh", + "../_common/vagrant.sh", + "scripts/cleanup.sh", + "../_common/minimize.sh" ], "type": "shell" } @@ -167,9 +161,8 @@ "iso_checksum": "888ce3dd791854c8e0f62e9eac292a90cf9765a3f2de75b6ceb99eaa62d7f2cc", "iso_checksum_type": "sha256", "iso_name": "Fedora-Server-dvd-i386-25-1.3.iso", - "ks_path": "fedora/ks.cfg", + "ks_path": "ks.cfg", "memory": "1024", - "metadata": "floppy/dummy_metadata.json", "mirror": "http://download.fedoraproject.org/pub/fedora/linux", "mirror_directory": "releases/25/Server/i386/iso", "name": "fedora-25-i386", diff --git a/fedora/fedora-25-x86_64.json b/fedora/fedora-25-x86_64.json index 18d00f12c..63d52bd89 100644 --- a/fedora/fedora-25-x86_64.json +++ b/fedora/fedora-25-x86_64.json @@ -126,16 +126,11 @@ ], "post-processors": [ { - "output": "builds/{{user `box_basename`}}.{{.Provider}}.box", + "output": "../builds/{{user `box_basename`}}.{{.Provider}}.box", "type": "vagrant" } ], "provisioners": [ - { - "destination": "/tmp/bento-metadata.json", - "source": "{{user `metadata`}}", - "type": "file" - }, { "environment_vars": [ "HOME_DIR=/home/vagrant", @@ -145,17 +140,16 @@ ], "execute_command": "echo 'vagrant' | {{.Vars}} sudo -E -S bash '{{.Path}}'", "scripts": [ - "scripts/common/metadata.sh", - "scripts/fedora/swap.sh", - "scripts/fedora/fix-slow-dns.sh", - "scripts/fedora/build-tools.sh", - "scripts/common/sshd.sh", - "scripts/common/virtualbox.sh", - "scripts/common/vmware.sh", - "scripts/common/parallels.sh", - "scripts/common/vagrant.sh", - "scripts/fedora/cleanup.sh", - "scripts/common/minimize.sh" + "scripts/swap.sh", + "scripts/fix-slow-dns.sh", + "scripts/build-tools.sh", + "../_common/sshd.sh", + "../_common/virtualbox.sh", + "../_common/vmware.sh", + "../_common/parallels.sh", + "../_common/vagrant.sh", + "scripts/cleanup.sh", + "../_common/minimize.sh" ], "type": "shell" } @@ -173,9 +167,8 @@ "iso_checksum": "524bd959dae09ad6fc8e0476ea478700d89f82ec5795d0b1a7b873613f3f26ac", "iso_checksum_type": "sha256", "iso_name": "Fedora-Server-dvd-x86_64-25-1.3.iso", - "ks_path": "fedora/ks.cfg", + "ks_path": "ks.cfg", "memory": "1024", - "metadata": "floppy/dummy_metadata.json", "mirror": "http://download.fedoraproject.org/pub/fedora/linux", "mirror_directory": "releases/25/Server/x86_64/iso", "name": "fedora-25", diff --git a/fedora/fedora-26-x86_64.json b/fedora/fedora-26-x86_64.json index 122275983..cbfd75111 100644 --- a/fedora/fedora-26-x86_64.json +++ b/fedora/fedora-26-x86_64.json @@ -126,16 +126,11 @@ ], "post-processors": [ { - "output": "builds/{{user `box_basename`}}.{{.Provider}}.box", + "output": "../builds/{{user `box_basename`}}.{{.Provider}}.box", "type": "vagrant" } ], "provisioners": [ - { - "destination": "/tmp/bento-metadata.json", - "source": "{{user `metadata`}}", - "type": "file" - }, { "environment_vars": [ "HOME_DIR=/home/vagrant", @@ -145,17 +140,16 @@ ], "execute_command": "echo 'vagrant' | {{.Vars}} sudo -E -S bash '{{.Path}}'", "scripts": [ - "scripts/common/metadata.sh", - "scripts/fedora/swap.sh", - "scripts/fedora/fix-slow-dns.sh", - "scripts/fedora/build-tools.sh", - "scripts/common/sshd.sh", - "scripts/common/virtualbox.sh", - "scripts/common/vmware.sh", - "scripts/common/parallels.sh", - "scripts/common/vagrant.sh", - "scripts/fedora/cleanup.sh", - "scripts/common/minimize.sh" + "scripts/swap.sh", + "scripts/fix-slow-dns.sh", + "scripts/build-tools.sh", + "../_common/sshd.sh", + "../_common/virtualbox.sh", + "../_common/vmware.sh", + "../_common/parallels.sh", + "../_common/vagrant.sh", + "scripts/cleanup.sh", + "../_common/minimize.sh" ], "type": "shell" } @@ -173,9 +167,8 @@ "iso_checksum": "fad18a43b9cec152fc8a1fd368950eaf59be66b1a15438149a0c3a509c56cf2f", "iso_checksum_type": "sha256", "iso_name": "Fedora-Server-dvd-x86_64-26-1.5.iso", - "ks_path": "fedora/ks.cfg", + "ks_path": "ks.cfg", "memory": "1024", - "metadata": "floppy/dummy_metadata.json", "mirror": "http://download.fedoraproject.org/pub/fedora/linux", "mirror_directory": "releases/26/Server/x86_64/iso", "name": "fedora-26", diff --git a/freebsd/freebsd-10.3-amd64.json b/freebsd/freebsd-10.3-amd64.json index 962569c88..b713cbab5 100644 --- a/freebsd/freebsd-10.3-amd64.json +++ b/freebsd/freebsd-10.3-amd64.json @@ -177,17 +177,12 @@ ], "post-processors": [ { - "output": "builds/{{user `box_basename`}}.{{.Provider}}.box", + "output": "../builds/{{user `box_basename`}}.{{.Provider}}.box", "type": "vagrant", "vagrantfile_template": "vagrantfile_templates/freebsd.rb" } ], "provisioners": [ - { - "destination": "/tmp/bento-metadata.json", - "source": "{{user `metadata`}}", - "type": "file" - }, { "environment_vars": [ "HOME_DIR=/home/vagrant", @@ -197,14 +192,13 @@ ], "execute_command": "echo 'vagrant' | {{.Vars}} su -m root -c 'sh -eux {{.Path}}'", "scripts": [ - "scripts/common/metadata.sh", - "scripts/freebsd/update.sh", - "scripts/freebsd/postinstall.sh", - "scripts/freebsd/sudoers.sh", - "scripts/common/vagrant.sh", - "scripts/freebsd/vmtools.sh", - "scripts/freebsd/cleanup.sh", - "scripts/freebsd/minimize.sh" + "scripts/update.sh", + "scripts/postinstall.sh", + "scripts/sudoers.sh", + "../_common/vagrant.sh", + "scripts/vmtools.sh", + "scripts/cleanup.sh", + "scripts/minimize.sh" ], "type": "shell" } @@ -223,7 +217,6 @@ "iso_checksum_type": "sha256", "iso_name": "FreeBSD-10.3-RELEASE-amd64-disc1.iso", "memory": "1024", - "metadata": "floppy/dummy_metadata.json", "mirror": "https://download.freebsd.org/ftp", "mirror_directory": "releases/amd64/amd64/ISO-IMAGES/10.3", "name": "freebsd-10.3", diff --git a/freebsd/freebsd-10.3-i386.json b/freebsd/freebsd-10.3-i386.json index ead6b5ff5..aec44312f 100644 --- a/freebsd/freebsd-10.3-i386.json +++ b/freebsd/freebsd-10.3-i386.json @@ -177,17 +177,12 @@ ], "post-processors": [ { - "output": "builds/{{user `box_basename`}}.{{.Provider}}.box", + "output": "../builds/{{user `box_basename`}}.{{.Provider}}.box", "type": "vagrant", "vagrantfile_template": "vagrantfile_templates/freebsd.rb" } ], "provisioners": [ - { - "destination": "/tmp/bento-metadata.json", - "source": "{{user `metadata`}}", - "type": "file" - }, { "environment_vars": [ "HOME_DIR=/home/vagrant", @@ -197,14 +192,13 @@ ], "execute_command": "echo 'vagrant' | {{.Vars}} su -m root -c 'sh -eux {{.Path}}'", "scripts": [ - "scripts/common/metadata.sh", - "scripts/freebsd/update.sh", - "scripts/freebsd/postinstall.sh", - "scripts/freebsd/sudoers.sh", - "scripts/common/vagrant.sh", - "scripts/freebsd/vmtools.sh", - "scripts/freebsd/cleanup.sh", - "scripts/freebsd/minimize.sh" + "scripts/update.sh", + "scripts/postinstall.sh", + "scripts/sudoers.sh", + "../_common/vagrant.sh", + "scripts/vmtools.sh", + "scripts/cleanup.sh", + "scripts/minimize.sh" ], "type": "shell" } @@ -223,7 +217,6 @@ "iso_checksum_type": "sha256", "iso_name": "FreeBSD-10.3-RELEASE-i386-disc1.iso", "memory": "1024", - "metadata": "floppy/dummy_metadata.json", "mirror": "https://download.freebsd.org/ftp", "mirror_directory": "releases/i386/i386/ISO-IMAGES/10.3", "name": "freebsd-10.3-i386", diff --git a/freebsd/freebsd-11.1-amd64.json b/freebsd/freebsd-11.1-amd64.json index 0d05c2153..d53b8afc8 100644 --- a/freebsd/freebsd-11.1-amd64.json +++ b/freebsd/freebsd-11.1-amd64.json @@ -177,17 +177,12 @@ ], "post-processors": [ { - "output": "builds/{{user `box_basename`}}.{{.Provider}}.box", + "output": "../builds/{{user `box_basename`}}.{{.Provider}}.box", "type": "vagrant", "vagrantfile_template": "vagrantfile_templates/freebsd.rb" } ], "provisioners": [ - { - "destination": "/tmp/bento-metadata.json", - "source": "{{user `metadata`}}", - "type": "file" - }, { "environment_vars": [ "HOME_DIR=/home/vagrant", @@ -197,14 +192,13 @@ ], "execute_command": "echo 'vagrant' | {{.Vars}} su -m root -c 'sh -eux {{.Path}}'", "scripts": [ - "scripts/common/metadata.sh", - "scripts/freebsd/update.sh", - "scripts/freebsd/postinstall.sh", - "scripts/freebsd/sudoers.sh", - "scripts/common/vagrant.sh", - "scripts/freebsd/vmtools.sh", - "scripts/freebsd/cleanup.sh", - "scripts/freebsd/minimize.sh" + "scripts/update.sh", + "scripts/postinstall.sh", + "scripts/sudoers.sh", + "../_common/vagrant.sh", + "scripts/vmtools.sh", + "scripts/cleanup.sh", + "scripts/minimize.sh" ], "type": "shell" } @@ -223,12 +217,11 @@ "iso_checksum_type": "sha256", "iso_name": "FreeBSD-11.1-RELEASE-amd64-disc1.iso", "memory": "1024", - "metadata": "floppy/dummy_metadata.json", "mirror": "https://download.freebsd.org/ftp", "mirror_directory": "releases/amd64/amd64/ISO-IMAGES/11.1", "no_proxy": "{{env `no_proxy`}}", "template": "freebsd-11.1-amd64", - "version": "2.1.TIMESTAMP" + "version": "TIMESTAMP" } } diff --git a/macos/macos-10.12.json b/macos/macos-10.12.json index cd3d75c9e..81b78fc1b 100644 --- a/macos/macos-10.12.json +++ b/macos/macos-10.12.json @@ -194,17 +194,12 @@ ], "post-processors": [ { - "output": "builds/{{user `box_basename`}}.{{.Provider}}.box", + "output": "../builds/{{user `box_basename`}}.{{.Provider}}.box", "type": "vagrant", "vagrantfile_template": "vagrantfile_templates/macosx.rb" } ], "provisioners": [ - { - "destination": "/tmp/bento-metadata.json", - "source": "{{user `metadata`}}", - "type": "file" - }, { "environment_vars": [ "HOME_DIR=/Users/vagrant", @@ -214,15 +209,14 @@ ], "execute_command": "echo 'vagrant'| {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", "scripts": [ - "scripts/common/metadata.sh", - "scripts/macosx/hostname.sh", - "scripts/macosx/update.sh", - "scripts/macosx/networking.sh", - "scripts/macosx/disablesleep.sh", - "scripts/macosx/vagrant.sh", - "scripts/macosx/vmtools.sh", - "scripts/macosx/cleanup.sh", - "scripts/macosx/minimize.sh" + "scripts/hostname.sh", + "scripts/update.sh", + "scripts/networking.sh", + "scripts/disablesleep.sh", + "scripts/vagrant.sh", + "scripts/vmtools.sh", + "scripts/cleanup.sh", + "scripts/minimize.sh" ], "type": "shell" } @@ -241,7 +235,6 @@ "iso_checksum_type": "md5", "iso_url": "http://YOU-MUST-PROVIDE-YOUR-OWN-DMG.sorry", "memsize": "2048", - "metadata": "floppy/dummy_metadata.json", "name": "macos-10.12", "no_proxy": "{{env `no_proxy`}}", "template": "macos-10.12", diff --git a/macos/macosx-10.10.json b/macos/macosx-10.10.json index f75ef6d71..53917d3ce 100644 --- a/macos/macosx-10.10.json +++ b/macos/macosx-10.10.json @@ -194,17 +194,12 @@ ], "post-processors": [ { - "output": "builds/{{user `box_basename`}}.{{.Provider}}.box", + "output": "../builds/{{user `box_basename`}}.{{.Provider}}.box", "type": "vagrant", "vagrantfile_template": "vagrantfile_templates/macosx.rb" } ], "provisioners": [ - { - "destination": "/tmp/bento-metadata.json", - "source": "{{user `metadata`}}", - "type": "file" - }, { "environment_vars": [ "HOME_DIR=/Users/vagrant", @@ -214,15 +209,14 @@ ], "execute_command": "echo 'vagrant'| {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", "scripts": [ - "scripts/common/metadata.sh", - "scripts/macosx/hostname.sh", - "scripts/macosx/update.sh", - "scripts/macosx/networking.sh", - "scripts/macosx/disablesleep.sh", - "scripts/macosx/vagrant.sh", - "scripts/macosx/vmtools.sh", - "scripts/macosx/cleanup.sh", - "scripts/macosx/minimize.sh" + "scripts/hostname.sh", + "scripts/update.sh", + "scripts/networking.sh", + "scripts/disablesleep.sh", + "scripts/vagrant.sh", + "scripts/vmtools.sh", + "scripts/cleanup.sh", + "scripts/minimize.sh" ], "type": "shell" } @@ -241,7 +235,6 @@ "iso_checksum_type": "md5", "iso_url": "http://YOU-MUST-PROVIDE-YOUR-OWN-DMG.sorry", "memory": "2048", - "metadata": "floppy/dummy_metadata.json", "name": "macosx-10.10", "no_proxy": "{{env `no_proxy`}}", "template": "macosx-10.10", diff --git a/macos/macosx-10.11.json b/macos/macosx-10.11.json index e92d1278c..59df3ea86 100644 --- a/macos/macosx-10.11.json +++ b/macos/macosx-10.11.json @@ -194,17 +194,12 @@ ], "post-processors": [ { - "output": "builds/{{user `box_basename`}}.{{.Provider}}.box", + "output": "../builds/{{user `box_basename`}}.{{.Provider}}.box", "type": "vagrant", "vagrantfile_template": "vagrantfile_templates/macosx.rb" } ], "provisioners": [ - { - "destination": "/tmp/bento-metadata.json", - "source": "{{user `metadata`}}", - "type": "file" - }, { "environment_vars": [ "HOME_DIR=/Users/vagrant", @@ -214,15 +209,14 @@ ], "execute_command": "echo 'vagrant'| {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", "scripts": [ - "scripts/common/metadata.sh", - "scripts/macosx/hostname.sh", - "scripts/macosx/update.sh", - "scripts/macosx/networking.sh", - "scripts/macosx/disablesleep.sh", - "scripts/macosx/vagrant.sh", - "scripts/macosx/vmtools.sh", - "scripts/macosx/cleanup.sh", - "scripts/macosx/minimize.sh" + "scripts/hostname.sh", + "scripts/update.sh", + "scripts/networking.sh", + "scripts/disablesleep.sh", + "scripts/vagrant.sh", + "scripts/vmtools.sh", + "scripts/cleanup.sh", + "scripts/minimize.sh" ], "type": "shell" } @@ -241,7 +235,6 @@ "iso_checksum_type": "md5", "iso_url": "http://YOU-MUST-PROVIDE-YOUR-OWN-DMG.sorry", "memory": "2048", - "metadata": "floppy/dummy_metadata.json", "name": "macosx-10.11", "no_proxy": "{{env `no_proxy`}}", "template": "macosx-10.11", diff --git a/macos/macosx-10.9.json b/macos/macosx-10.9.json index a6a52b033..a112a55e1 100644 --- a/macos/macosx-10.9.json +++ b/macos/macosx-10.9.json @@ -194,17 +194,12 @@ ], "post-processors": [ { - "output": "builds/{{user `box_basename`}}.{{.Provider}}.box", + "output": "../builds/{{user `box_basename`}}.{{.Provider}}.box", "type": "vagrant", "vagrantfile_template": "vagrantfile_templates/macosx.rb" } ], "provisioners": [ - { - "destination": "/tmp/bento-metadata.json", - "source": "{{user `metadata`}}", - "type": "file" - }, { "environment_vars": [ "HOME_DIR=/Users/vagrant", @@ -214,15 +209,14 @@ ], "execute_command": "echo 'vagrant'| {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", "scripts": [ - "scripts/common/metadata.sh", - "scripts/macosx/hostname.sh", - "scripts/macosx/update.sh", - "scripts/macosx/networking.sh", - "scripts/macosx/disablesleep.sh", - "scripts/macosx/vagrant.sh", - "scripts/macosx/vmtools.sh", - "scripts/macosx/cleanup.sh", - "scripts/macosx/minimize.sh" + "scripts/hostname.sh", + "scripts/update.sh", + "scripts/networking.sh", + "scripts/disablesleep.sh", + "scripts/vagrant.sh", + "scripts/vmtools.sh", + "scripts/cleanup.sh", + "scripts/minimize.sh" ], "type": "shell" } @@ -241,7 +235,6 @@ "iso_checksum_type": "md5", "iso_url": "http://YOU-MUST-PROVIDE-YOUR-OWN-DMG.sorry", "memory": "2048", - "metadata": "floppy/dummy_metadata.json", "name": "macosx-10.9", "no_proxy": "{{env `no_proxy`}}", "template": "macosx-10.9", diff --git a/opensuse/opensuse-leap-42.3-x86_64.json b/opensuse/opensuse-leap-42.3-x86_64.json index ad95418e1..7e74eda58 100644 --- a/opensuse/opensuse-leap-42.3-x86_64.json +++ b/opensuse/opensuse-leap-42.3-x86_64.json @@ -156,7 +156,7 @@ ], "post-processors": [ { - "output": "builds/{{user `box_basename`}}.{{.Provider}}.box", + "output": "../builds/{{user `box_basename`}}.{{.Provider}}.box", "type": "vagrant" } ], @@ -175,24 +175,23 @@ ], "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh '{{.Path}}'", "scripts": [ - "scripts/common/metadata.sh", - "scripts/common/sshd.sh", - "scripts/common/vagrant.sh", - "scripts/common/virtualbox.sh", - "scripts/common/vmware.sh", - "scripts/common/parallels.sh", - "scripts/opensuse/sudoers.sh", - "scripts/opensuse/zypper-locks.sh", - "scripts/opensuse/remove-dvd-source.sh", - "scripts/opensuse/cleanup.sh", - "scripts/common/minimize.sh" + "../_common/sshd.sh", + "../_common/vagrant.sh", + "../_common/virtualbox.sh", + "../_common/vmware.sh", + "../_common/parallels.sh", + "scripts/sudoers.sh", + "scripts/zypper-locks.sh", + "scripts/remove-dvd-source.sh", + "scripts/cleanup.sh", + "../_common/minimize.sh" ], "type": "shell" } ], "variables": { "arch": "64", - "autoinst_cfg": "opensuse-leap/autoinst.xml", + "autoinst_cfg": "autoinst.xml", "box_basename": "opensuse-leap-42.3", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", @@ -205,7 +204,6 @@ "iso_checksum_type": "sha256", "iso_name": "openSUSE-Leap-42.3-DVD-x86_64.iso", "memory": "1024", - "metadata": "floppy/dummy_metadata.json", "mirror": "http://suse.mobile-central.org/distribution", "mirror_directory": "leap/42.3/iso", "name": "opensuse-leap-42.3", diff --git a/oraclelinux/oracle-5.11-i386.json b/oraclelinux/oracle-5.11-i386.json index 1c7ef7928..a466a3aeb 100644 --- a/oraclelinux/oracle-5.11-i386.json +++ b/oraclelinux/oracle-5.11-i386.json @@ -10,7 +10,7 @@ "guest_os_type": "Oracle", "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", - "http_directory": "http", + "http_directory": "../centos/http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -46,7 +46,7 @@ "disk_size": "{{user `disk_size`}}", "guest_os_type": "oraclelinux", "headless": "{{ user `headless` }}", - "http_directory": "http", + "http_directory": "../centos/http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -73,7 +73,7 @@ "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", "guest_os_type": "centos", - "http_directory": "http", + "http_directory": "../centos/http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -109,7 +109,7 @@ "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", - "http_directory": "http", + "http_directory": "../centos/http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -125,16 +125,11 @@ ], "post-processors": [ { - "output": "builds/{{user `box_basename`}}.{{.Provider}}.box", + "output": "../builds/{{user `box_basename`}}.{{.Provider}}.box", "type": "vagrant" } ], "provisioners": [ - { - "destination": "/tmp/bento-metadata.json", - "source": "{{user `metadata`}}", - "type": "file" - }, { "environment_vars": [ "HOME_DIR=/home/vagrant", @@ -144,15 +139,14 @@ ], "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", "scripts": [ - "scripts/common/metadata.sh", - "scripts/centos/update.sh", - "scripts/common/vagrant.sh", - "scripts/common/sshd.sh", - "scripts/common/virtualbox.sh", - "scripts/common/vmware.sh", - "scripts/common/parallels.sh", - "scripts/centos/cleanup.sh", - "scripts/common/minimize.sh" + "../centos/scripts/update.sh", + "../_common/vagrant.sh", + "../_common/sshd.sh", + "../_common/virtualbox.sh", + "../_common/vmware.sh", + "../_common/parallels.sh", + "../centos/scripts/cleanup.sh", + "../_common/minimize.sh" ], "type": "shell" } @@ -170,9 +164,8 @@ "iso_checksum": "E60962C4EBF8920BBD828EFE32A78A7CC8F28E3B", "iso_checksum_type": "sha1", "iso_name": "Enterprise-R5-U11-Server-i386-dvd.iso", - "ks_path": "rhel-5/ks.cfg", + "ks_path": "5/ks.cfg", "memory": "1024", - "metadata": "floppy/dummy_metadata.json", "mirror": "http://mirrors.dotsrc.org/oracle-linux", "mirror_directory": "EL5/U11/i386", "name": "oracle-5.11-i386", diff --git a/oraclelinux/oracle-5.11-x86_64.json b/oraclelinux/oracle-5.11-x86_64.json index d93955132..e005d31c3 100644 --- a/oraclelinux/oracle-5.11-x86_64.json +++ b/oraclelinux/oracle-5.11-x86_64.json @@ -10,7 +10,7 @@ "guest_os_type": "Oracle_64", "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", - "http_directory": "http", + "http_directory": "../centos/http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -52,7 +52,7 @@ "disk_size": "{{user `disk_size`}}", "guest_os_type": "oraclelinux-64", "headless": "{{ user `headless` }}", - "http_directory": "http", + "http_directory": "../centos/http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -79,7 +79,7 @@ "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", "guest_os_type": "centos", - "http_directory": "http", + "http_directory": "../centos/http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -115,7 +115,7 @@ "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", - "http_directory": "http", + "http_directory": "../centos/http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -131,16 +131,11 @@ ], "post-processors": [ { - "output": "builds/{{user `box_basename`}}.{{.Provider}}.box", + "output": "../builds/{{user `box_basename`}}.{{.Provider}}.box", "type": "vagrant" } ], "provisioners": [ - { - "destination": "/tmp/bento-metadata.json", - "source": "{{user `metadata`}}", - "type": "file" - }, { "environment_vars": [ "HOME_DIR=/home/vagrant", @@ -150,15 +145,14 @@ ], "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", "scripts": [ - "scripts/common/metadata.sh", - "scripts/centos/update.sh", - "scripts/common/vagrant.sh", - "scripts/common/sshd.sh", - "scripts/common/virtualbox.sh", - "scripts/common/vmware.sh", - "scripts/common/parallels.sh", - "scripts/centos/cleanup.sh", - "scripts/common/minimize.sh" + "../centos/scripts/update.sh", + "../_common/vagrant.sh", + "../_common/sshd.sh", + "../_common/virtualbox.sh", + "../_common/vmware.sh", + "../_common/parallels.sh", + "../centos/scripts/cleanup.sh", + "../_common/minimize.sh" ], "type": "shell" } @@ -176,9 +170,8 @@ "iso_checksum": "2D38F76652CBC1367FDF30024F13CDE5F6BF34DF", "iso_checksum_type": "sha1", "iso_name": "Enterprise-R5-U11-Server-x86_64-dvd.iso", - "ks_path": "rhel-5/ks.cfg", + "ks_path": "5/ks.cfg", "memory": "1024", - "metadata": "floppy/dummy_metadata.json", "mirror": "http://mirrors.dotsrc.org/oracle-linux", "mirror_directory": "EL5/U11/x86_64", "name": "oracle-5.11", diff --git a/oraclelinux/oracle-6.9-i386.json b/oraclelinux/oracle-6.9-i386.json index 8f4eeddad..2d18adc22 100644 --- a/oraclelinux/oracle-6.9-i386.json +++ b/oraclelinux/oracle-6.9-i386.json @@ -10,7 +10,7 @@ "guest_os_type": "Oracle", "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", - "http_directory": "http", + "http_directory": "../centos/http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -46,7 +46,7 @@ "disk_size": "{{user `disk_size`}}", "guest_os_type": "oraclelinux", "headless": "{{ user `headless` }}", - "http_directory": "http", + "http_directory": "../centos/http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -73,7 +73,7 @@ "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", "guest_os_type": "centos", - "http_directory": "http", + "http_directory": "../centos/http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -109,7 +109,7 @@ "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", - "http_directory": "http", + "http_directory": "../centos/http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -125,16 +125,11 @@ ], "post-processors": [ { - "output": "builds/{{user `box_basename`}}.{{.Provider}}.box", + "output": "../builds/{{user `box_basename`}}.{{.Provider}}.box", "type": "vagrant" } ], "provisioners": [ - { - "destination": "/tmp/bento-metadata.json", - "source": "{{user `metadata`}}", - "type": "file" - }, { "environment_vars": [ "HOME_DIR=/home/vagrant", @@ -144,16 +139,15 @@ ], "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", "scripts": [ - "scripts/common/metadata.sh", - "scripts/centos/update.sh", - "scripts/centos/networking.sh", - "scripts/common/sshd.sh", - "scripts/common/vagrant.sh", - "scripts/common/virtualbox.sh", - "scripts/common/vmware.sh", - "scripts/common/parallels.sh", - "scripts/centos/cleanup.sh", - "scripts/common/minimize.sh" + "../centos/scripts/update.sh", + "../centos/scripts/networking.sh", + "../_common/sshd.sh", + "../_common/vagrant.sh", + "../_common/virtualbox.sh", + "../_common/vmware.sh", + "../_common/parallels.sh", + "../centos/scripts/cleanup.sh", + "../_common/minimize.sh" ], "type": "shell" } @@ -171,9 +165,8 @@ "iso_checksum": "fd07f775e7fa52e9ab021eb7dccb78453fc61f3d3b712ec426f6b1bf5020318b", "iso_checksum_type": "sha256", "iso_name": "OracleLinux-R6-U9-Server-i386-dvd.iso", - "ks_path": "rhel-6/ks.cfg", + "ks_path": "6/ks.cfg", "memory": "1024", - "metadata": "floppy/dummy_metadata.json", "mirror": "http://mirrors.kernel.org/oracle/", "mirror_directory": "OL6/U9/i386", "name": "oracle-6.9-i386", diff --git a/oraclelinux/oracle-6.9-x86_64.json b/oraclelinux/oracle-6.9-x86_64.json index aab4c5a99..9c7df6ab2 100644 --- a/oraclelinux/oracle-6.9-x86_64.json +++ b/oraclelinux/oracle-6.9-x86_64.json @@ -10,7 +10,7 @@ "guest_os_type": "Oracle_64", "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", - "http_directory": "http", + "http_directory": "../centos/http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -46,7 +46,7 @@ "disk_size": "{{user `disk_size`}}", "guest_os_type": "oraclelinux-64", "headless": "{{ user `headless` }}", - "http_directory": "http", + "http_directory": "../centos/http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -73,7 +73,7 @@ "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", "guest_os_type": "centos", - "http_directory": "http", + "http_directory": "../centos/http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -109,7 +109,7 @@ "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", - "http_directory": "http", + "http_directory": "../centos/http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -125,16 +125,11 @@ ], "post-processors": [ { - "output": "builds/{{user `box_basename`}}.{{.Provider}}.box", + "output": "../builds/{{user `box_basename`}}.{{.Provider}}.box", "type": "vagrant" } ], "provisioners": [ - { - "destination": "/tmp/bento-metadata.json", - "source": "{{user `metadata`}}", - "type": "file" - }, { "environment_vars": [ "HOME_DIR=/home/vagrant", @@ -144,16 +139,15 @@ ], "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", "scripts": [ - "scripts/common/metadata.sh", - "scripts/centos/update.sh", - "scripts/centos/networking.sh", - "scripts/common/sshd.sh", - "scripts/common/vagrant.sh", - "scripts/common/virtualbox.sh", - "scripts/common/vmware.sh", - "scripts/common/parallels.sh", - "scripts/centos/cleanup.sh", - "scripts/common/minimize.sh" + "../centos/scripts/update.sh", + "../centos/scripts/networking.sh", + "../_common/sshd.sh", + "../_common/vagrant.sh", + "../_common/virtualbox.sh", + "../_common/vmware.sh", + "../_common/parallels.sh", + "../centos/scripts/cleanup.sh", + "../_common/minimize.sh" ], "type": "shell" } @@ -171,9 +165,8 @@ "iso_checksum": "c32e2a7c8eb471db731741f1a30be37e49deda8ce961710273a71b26c9a04a36", "iso_checksum_type": "sha256", "iso_name": "OracleLinux-R6-U9-Server-x86_64-dvd.iso", - "ks_path": "rhel-6/ks.cfg", + "ks_path": "6/ks.cfg", "memory": "1024", - "metadata": "floppy/dummy_metadata.json", "mirror": "http://mirrors.kernel.org/oracle/", "mirror_directory": "OL6/U9/x86_64", "name": "oracle-6.9", diff --git a/oraclelinux/oracle-7.3-x86_64.json b/oraclelinux/oracle-7.3-x86_64.json index d6ace9e50..740e0f970 100644 --- a/oraclelinux/oracle-7.3-x86_64.json +++ b/oraclelinux/oracle-7.3-x86_64.json @@ -10,7 +10,7 @@ "guest_os_type": "Oracle_64", "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", - "http_directory": "http", + "http_directory": "../centos/http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -46,7 +46,7 @@ "disk_size": "{{user `disk_size`}}", "guest_os_type": "oraclelinux-64", "headless": "{{ user `headless` }}", - "http_directory": "http", + "http_directory": "../centos/http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -73,7 +73,7 @@ "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", "guest_os_type": "centos", - "http_directory": "http", + "http_directory": "../centos/http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -109,7 +109,7 @@ "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", - "http_directory": "http", + "http_directory": "../centos/http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -125,16 +125,11 @@ ], "post-processors": [ { - "output": "builds/{{user `box_basename`}}.{{.Provider}}.box", + "output": "../builds/{{user `box_basename`}}.{{.Provider}}.box", "type": "vagrant" } ], "provisioners": [ - { - "destination": "/tmp/bento-metadata.json", - "source": "{{user `metadata`}}", - "type": "file" - }, { "environment_vars": [ "HOME_DIR=/home/vagrant", @@ -144,16 +139,15 @@ ], "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", "scripts": [ - "scripts/common/metadata.sh", - "scripts/centos/update.sh", - "scripts/centos/networking.sh", - "scripts/common/sshd.sh", - "scripts/common/vagrant.sh", - "scripts/common/virtualbox.sh", - "scripts/common/vmware.sh", - "scripts/common/parallels.sh", - "scripts/centos/cleanup.sh", - "scripts/common/minimize.sh" + "../centos/scripts/update.sh", + "../centos/scripts/networking.sh", + "../_common/sshd.sh", + "../_common/vagrant.sh", + "../_common/virtualbox.sh", + "../_common/vmware.sh", + "../_common/parallels.sh", + "../centos/scripts/cleanup.sh", + "../_common/minimize.sh" ], "type": "shell" } @@ -171,9 +165,8 @@ "iso_checksum": "2ad5327428c44d505a7d882a273cb3f5fbac4e56e739cf18f895565dde987101", "iso_checksum_type": "sha256", "iso_name": "OracleLinux-R7-U3-Server-x86_64-dvd.iso", - "ks_path": "rhel-7/ks.cfg", + "ks_path": "7/ks.cfg", "memory": "1024", - "metadata": "floppy/dummy_metadata.json", "mirror": "http://mirrors.dotsrc.org/oracle-linux", "mirror_directory": "OL7/u3/x86_64", "name": "oracle-7.3", diff --git a/rhel/rhel-5.11-i386.json b/rhel/rhel-5.11-i386.json index d6c1b736d..1e1230d45 100644 --- a/rhel/rhel-5.11-i386.json +++ b/rhel/rhel-5.11-i386.json @@ -10,7 +10,7 @@ "guest_os_type": "RedHat", "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", - "http_directory": "http", + "http_directory": "../centos/http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -46,7 +46,7 @@ "disk_size": "{{user `disk_size`}}", "guest_os_type": "redhat", "headless": "{{ user `headless` }}", - "http_directory": "http", + "http_directory": "../centos/http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -73,7 +73,7 @@ "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", "guest_os_type": "rhel", - "http_directory": "http", + "http_directory": "../centos/http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -109,7 +109,7 @@ "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", - "http_directory": "http", + "http_directory": "../centos/http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -125,16 +125,11 @@ ], "post-processors": [ { - "output": "builds/{{user `box_basename`}}.{{.Provider}}.box", + "output": "../builds/{{user `box_basename`}}.{{.Provider}}.box", "type": "vagrant" } ], "provisioners": [ - { - "destination": "/tmp/bento-metadata.json", - "source": "{{user `metadata`}}", - "type": "file" - }, { "environment_vars": [ "HOME_DIR=/home/vagrant", @@ -144,14 +139,13 @@ ], "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", "scripts": [ - "scripts/common/metadata.sh", - "scripts/common/vagrant.sh", - "scripts/common/sshd.sh", - "scripts/common/virtualbox.sh", - "scripts/common/vmware.sh", - "scripts/common/parallels.sh", - "scripts/centos/cleanup.sh", - "scripts/common/minimize.sh" + "../_common/vagrant.sh", + "../_common/sshd.sh", + "../_common/virtualbox.sh", + "../_common/vmware.sh", + "../_common/parallels.sh", + "../centos/scripts/cleanup.sh", + "../_common/minimize.sh" ], "type": "shell" } @@ -169,9 +163,8 @@ "iso_checksum": "4e38e4ed06d83efb10446e7db19d96761715cdbdbf0bbfacb978b44ce368bbe2", "iso_checksum_type": "sha256", "iso_name": "rhel-server-5.11-i386-dvd.iso", - "ks_path": "rhel-5/ks.cfg", + "ks_path": "5/ks.cfg", "memory": "1024", - "metadata": "floppy/dummy_metadata.json", "mirror": "http://YOU-MUST-PROVIDE-YOUR-OWN-ISO.sorry", "mirror_directory": "rhel", "name": "rhel-5.11-i386", diff --git a/rhel/rhel-5.11-x86_64.json b/rhel/rhel-5.11-x86_64.json index e9e9ef83d..a60b7f4a4 100644 --- a/rhel/rhel-5.11-x86_64.json +++ b/rhel/rhel-5.11-x86_64.json @@ -10,7 +10,7 @@ "guest_os_type": "RedHat_64", "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", - "http_directory": "http", + "http_directory": "../centos/http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -52,7 +52,7 @@ "disk_size": "{{user `disk_size`}}", "guest_os_type": "rhel5-64", "headless": "{{ user `headless` }}", - "http_directory": "http", + "http_directory": "../centos/http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -79,7 +79,7 @@ "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", "guest_os_type": "rhel", - "http_directory": "http", + "http_directory": "../centos/http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -115,7 +115,7 @@ "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", - "http_directory": "http", + "http_directory": "../centos/http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -131,16 +131,11 @@ ], "post-processors": [ { - "output": "builds/{{user `box_basename`}}.{{.Provider}}.box", + "output": "../builds/{{user `box_basename`}}.{{.Provider}}.box", "type": "vagrant" } ], "provisioners": [ - { - "destination": "/tmp/bento-metadata.json", - "source": "{{user `metadata`}}", - "type": "file" - }, { "environment_vars": [ "HOME_DIR=/home/vagrant", @@ -150,14 +145,13 @@ ], "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", "scripts": [ - "scripts/common/metadata.sh", - "scripts/common/vagrant.sh", - "scripts/common/sshd.sh", - "scripts/common/virtualbox.sh", - "scripts/common/vmware.sh", - "scripts/common/parallels.sh", - "scripts/centos/cleanup.sh", - "scripts/common/minimize.sh" + "../_common/vagrant.sh", + "../_common/sshd.sh", + "../_common/virtualbox.sh", + "../_common/vmware.sh", + "../_common/parallels.sh", + "../centos/scripts/cleanup.sh", + "../_common/minimize.sh" ], "type": "shell" } @@ -175,9 +169,8 @@ "iso_checksum": "36565fe0c8a97207d63234d10123daeedb29d509576dbd7b34e71958ac2f9050", "iso_checksum_type": "sha256", "iso_name": "rhel-server-5.11-x86_64-dvd.iso", - "ks_path": "rhel-5/ks.cfg", + "ks_path": "5/ks.cfg", "memory": "1024", - "metadata": "floppy/dummy_metadata.json", "mirror": "http://YOU-MUST-PROVIDE-YOUR-OWN-ISO.sorry", "mirror_directory": "rhel", "name": "rhel-5.11", diff --git a/rhel/rhel-6.9-i386.json b/rhel/rhel-6.9-i386.json index a321da774..1251eeee8 100644 --- a/rhel/rhel-6.9-i386.json +++ b/rhel/rhel-6.9-i386.json @@ -10,7 +10,7 @@ "guest_os_type": "RedHat", "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", - "http_directory": "http", + "http_directory": "../centos/http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -46,7 +46,7 @@ "disk_size": "{{user `disk_size`}}", "guest_os_type": "redhat", "headless": "{{ user `headless` }}", - "http_directory": "http", + "http_directory": "../centos/http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -73,7 +73,7 @@ "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", "guest_os_type": "rhel", - "http_directory": "http", + "http_directory": "../centos/http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -109,7 +109,7 @@ "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", - "http_directory": "http", + "http_directory": "../centos/http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -125,16 +125,11 @@ ], "post-processors": [ { - "output": "builds/{{user `box_basename`}}.{{.Provider}}.box", + "output": "../builds/{{user `box_basename`}}.{{.Provider}}.box", "type": "vagrant" } ], "provisioners": [ - { - "destination": "/tmp/bento-metadata.json", - "source": "{{user `metadata`}}", - "type": "file" - }, { "environment_vars": [ "HOME_DIR=/home/vagrant", @@ -144,15 +139,14 @@ ], "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", "scripts": [ - "scripts/common/metadata.sh", - "scripts/centos/networking.sh", - "scripts/common/sshd.sh", - "scripts/common/vagrant.sh", - "scripts/common/virtualbox.sh", - "scripts/common/vmware.sh", - "scripts/common/parallels.sh", - "scripts/centos/cleanup.sh", - "scripts/common/minimize.sh" + "../centos/scripts/networking.sh", + "../_common/sshd.sh", + "../_common/vagrant.sh", + "../_common/virtualbox.sh", + "../_common/vmware.sh", + "../_common/parallels.sh", + "../centos/scripts/cleanup.sh", + "../_common/minimize.sh" ], "type": "shell" } @@ -170,9 +164,8 @@ "iso_checksum": "1977d26df16ad2802728dafa3cbfd015895cfcf364fb20e8974123addce03021", "iso_checksum_type": "sha256", "iso_name": "rhel-server-6.9-i386-dvd.iso", - "ks_path": "rhel-6/ks.cfg", + "ks_path": "6/ks.cfg", "memory": "1024", - "metadata": "floppy/dummy_metadata.json", "mirror": "http://YOU-MUST-PROVIDE-YOUR-OWN-ISO.sorry", "mirror_directory": "rhel", "name": "rhel-6.9-i386", diff --git a/rhel/rhel-6.9-x86_64.json b/rhel/rhel-6.9-x86_64.json index 75a00b2e8..5b969c38c 100644 --- a/rhel/rhel-6.9-x86_64.json +++ b/rhel/rhel-6.9-x86_64.json @@ -10,7 +10,7 @@ "guest_os_type": "RedHat_64", "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", - "http_directory": "http", + "http_directory": "../centos/http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -46,7 +46,7 @@ "disk_size": "{{user `disk_size`}}", "guest_os_type": "rhel6-64", "headless": "{{ user `headless` }}", - "http_directory": "http", + "http_directory": "../centos/http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -73,7 +73,7 @@ "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", "guest_os_type": "rhel", - "http_directory": "http", + "http_directory": "../centos/http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -109,7 +109,7 @@ "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", - "http_directory": "http", + "http_directory": "../centos/http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -125,16 +125,11 @@ ], "post-processors": [ { - "output": "builds/{{user `box_basename`}}.{{.Provider}}.box", + "output": "../builds/{{user `box_basename`}}.{{.Provider}}.box", "type": "vagrant" } ], "provisioners": [ - { - "destination": "/tmp/bento-metadata.json", - "source": "{{user `metadata`}}", - "type": "file" - }, { "environment_vars": [ "HOME_DIR=/home/vagrant", @@ -144,15 +139,14 @@ ], "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", "scripts": [ - "scripts/common/metadata.sh", - "scripts/centos/networking.sh", - "scripts/common/sshd.sh", - "scripts/common/vagrant.sh", - "scripts/common/virtualbox.sh", - "scripts/common/vmware.sh", - "scripts/common/parallels.sh", - "scripts/centos/cleanup.sh", - "scripts/common/minimize.sh" + "../centos/scripts/networking.sh", + "../_common/sshd.sh", + "../_common/vagrant.sh", + "../_common/virtualbox.sh", + "../_common/vmware.sh", + "../_common/parallels.sh", + "../centos/scripts/cleanup.sh", + "../_common/minimize.sh" ], "type": "shell" } @@ -170,9 +164,8 @@ "iso_checksum": "3f961576e9f81ea118566f73f98d7bdf3287671c35436a13787c1ffd5078cf8e", "iso_checksum_type": "sha256", "iso_name": "rhel-server-6.9-x86_64-dvd.iso", - "ks_path": "rhel-6/ks.cfg", + "ks_path": "6/ks.cfg", "memory": "1024", - "metadata": "floppy/dummy_metadata.json", "mirror": "http://YOU-MUST-PROVIDE-YOUR-OWN-ISO.sorry", "mirror_directory": "rhel", "name": "rhel-6.9", diff --git a/rhel/rhel-7.4-x86_64.json b/rhel/rhel-7.4-x86_64.json index 8fa81c7da..41c92e455 100644 --- a/rhel/rhel-7.4-x86_64.json +++ b/rhel/rhel-7.4-x86_64.json @@ -10,7 +10,7 @@ "guest_os_type": "RedHat_64", "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", - "http_directory": "http", + "http_directory": "../centos/http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -46,7 +46,7 @@ "disk_size": "{{user `disk_size`}}", "guest_os_type": "rhel7-64", "headless": "{{ user `headless` }}", - "http_directory": "http", + "http_directory": "../centos/http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -73,7 +73,7 @@ "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", "guest_os_type": "rhel", - "http_directory": "http", + "http_directory": "../centos/http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -109,7 +109,7 @@ "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", - "http_directory": "http", + "http_directory": "../centos/http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -125,16 +125,11 @@ ], "post-processors": [ { - "output": "builds/{{user `box_basename`}}.{{.Provider}}.box", + "output": "../builds/{{user `box_basename`}}.{{.Provider}}.box", "type": "vagrant" } ], "provisioners": [ - { - "destination": "/tmp/bento-metadata.json", - "source": "{{user `metadata`}}", - "type": "file" - }, { "environment_vars": [ "HOME_DIR=/home/vagrant", @@ -144,15 +139,14 @@ ], "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", "scripts": [ - "scripts/common/metadata.sh", - "scripts/centos/networking.sh", - "scripts/common/sshd.sh", - "scripts/common/vagrant.sh", - "scripts/common/virtualbox.sh", - "scripts/common/vmware.sh", - "scripts/common/parallels.sh", - "scripts/centos/cleanup.sh", - "scripts/common/minimize.sh" + "../centos/scripts/networking.sh", + "../_common/sshd.sh", + "../_common/vagrant.sh", + "../_common/virtualbox.sh", + "../_common/vmware.sh", + "../_common/parallels.sh", + "../centos/scripts/cleanup.sh", + "../_common/minimize.sh" ], "type": "shell" } @@ -170,9 +164,8 @@ "iso_checksum": "431a58c8c0351803a608ffa56948c5a7861876f78ccbe784724dd8c987ff7000", "iso_checksum_type": "sha256", "iso_name": "rhel-server-7.4-x86_64-dvd.iso", - "ks_path": "rhel-7/ks.cfg", + "ks_path": "7/ks.cfg", "memory": "1024", - "metadata": "floppy/dummy_metadata.json", "mirror": "http://YOU-MUST-PROVIDE-YOUR-OWN-ISO.sorry", "mirror_directory": "rhel", "name": "rhel-7.4", diff --git a/sles/sles-12-sp2-x86_64.json b/sles/sles-12-sp2-x86_64.json index ed6dac9b8..753f1a2b8 100644 --- a/sles/sles-12-sp2-x86_64.json +++ b/sles/sles-12-sp2-x86_64.json @@ -141,16 +141,11 @@ ], "post-processors": [ { - "output": "builds/{{user `box_basename`}}.{{.Provider}}.box", + "output": "../builds/{{user `box_basename`}}.{{.Provider}}.box", "type": "vagrant" } ], "provisioners": [ - { - "destination": "/tmp/bento-metadata.json", - "source": "{{user `metadata`}}", - "type": "file" - }, { "environment_vars": [ "HOME_DIR=/home/vagrant", @@ -160,18 +155,17 @@ ], "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh '{{.Path}}'", "scripts": [ - "scripts/common/metadata.sh", - "scripts/common/sshd.sh", - "scripts/common/vagrant.sh", - "scripts/sles/unsupported-modules.sh", - "scripts/common/virtualbox.sh", - "scripts/common/vmware.sh", - "scripts/common/parallels.sh", - "scripts/sles/sudoers.sh", - "scripts/sles/zypper-locks.sh", - "scripts/sles/remove-dvd-source.sh", - "scripts/sles/cleanup.sh", - "scripts/common/minimize.sh" + "../_common/sshd.sh", + "../_common/vagrant.sh", + "scripts/unsupported-modules.sh", + "../_common/virtualbox.sh", + "../_common/vmware.sh", + "../_common/parallels.sh", + "scripts/sudoers.sh", + "scripts/zypper-locks.sh", + "scripts/remove-dvd-source.sh", + "scripts/cleanup.sh", + "../_common/minimize.sh" ], "type": "shell" } @@ -193,7 +187,6 @@ "iso_checksum_type": "sha256", "iso_name": "SLE-12-SP2-Server-DVD-x86_64-GM-DVD1.iso", "memory": "1024", - "metadata": "floppy/dummy_metadata.json", "mirror": "./packer_cache", "name": "sles-12-sp2", "template": "sles-12-sp2-x86_64", diff --git a/solaris/floppy/solaris10/S99startup.sh b/solaris/floppy/S99startup.sh similarity index 100% rename from solaris/floppy/solaris10/S99startup.sh rename to solaris/floppy/S99startup.sh diff --git a/solaris/floppy/solaris10/awesome_prof b/solaris/floppy/awesome_prof similarity index 100% rename from solaris/floppy/solaris10/awesome_prof rename to solaris/floppy/awesome_prof diff --git a/solaris/floppy/dummy_metadata.json b/solaris/floppy/dummy_metadata.json deleted file mode 100644 index 5a3288a37..000000000 --- a/solaris/floppy/dummy_metadata.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "metadata": "not provided" -} diff --git a/solaris/floppy/solaris10/finish.sh b/solaris/floppy/finish.sh similarity index 100% rename from solaris/floppy/solaris10/finish.sh rename to solaris/floppy/finish.sh diff --git a/solaris/floppy/solaris10/rules.ok b/solaris/floppy/rules.ok similarity index 100% rename from solaris/floppy/solaris10/rules.ok rename to solaris/floppy/rules.ok diff --git a/solaris/floppy/solaris10/sysidcfg b/solaris/floppy/sysidcfg similarity index 100% rename from solaris/floppy/solaris10/sysidcfg rename to solaris/floppy/sysidcfg diff --git a/solaris/solaris-10.11-x86.json b/solaris/solaris-10.11-x86.json index 9d4d52d71..883367f11 100644 --- a/solaris/solaris-10.11-x86.json +++ b/solaris/solaris-10.11-x86.json @@ -13,16 +13,16 @@ "boot_wait": "5s", "disk_size": "{{user `disk_size`}}", "floppy_files": [ - "floppy/solaris10/sysidcfg", - "floppy/solaris10/awesome_prof", - "floppy/solaris10/rules.ok", - "floppy/solaris10/S99startup.sh", - "floppy/solaris10/finish.sh" + "floppy/sysidcfg", + "floppy/awesome_prof", + "floppy/rules.ok", + "floppy/S99startup.sh", + "floppy/finish.sh" ], "guest_additions_mode": "upload", "guest_os_type": "Solaris_64", "headless": "{{ user `headless` }}", - "http_directory": "http/solaris-10", + "http_directory": "http", "iso_checksum": "aae1452bb3d56baa3dcb8866ce7e4a08", "iso_checksum_type": "md5", "iso_url": "{{user `mirror`}}/sol-10-u11-ga-x86-dvd.iso", @@ -64,15 +64,15 @@ "boot_wait": "5s", "disk_size": "{{user `disk_size`}}", "floppy_files": [ - "floppy/solaris10/sysidcfg", - "floppy/solaris10/awesome_prof", - "floppy/solaris10/rules.ok", - "floppy/solaris10/S99startup.sh", - "floppy/solaris10/finish.sh" + "floppy/sysidcfg", + "floppy/awesome_prof", + "floppy/rules.ok", + "floppy/S99startup.sh", + "floppy/finish.sh" ], "guest_os_type": "solaris10-64", "headless": "{{ user `headless` }}", - "http_directory": "http/solaris-10", + "http_directory": "http", "iso_checksum": "aae1452bb3d56baa3dcb8866ce7e4a08", "iso_checksum_type": "md5", "iso_url": "{{user `mirror`}}/sol-10-u11-ga-x86-dvd.iso", @@ -97,23 +97,17 @@ ], "post-processors": [ { - "output": "builds/{{user `box_basename`}}.{{.Provider}}.box", + "output": "../builds/{{user `box_basename`}}.{{.Provider}}.box", "type": "vagrant" } ], "provisioners": [ - { - "destination": "/tmp/bento-metadata.json", - "source": "{{user `metadata`}}", - "type": "file" - }, { "environment_vars": [], "execute_command": "/usr/local/bin/sudo {{.Path}}", "scripts": [ - "scripts/common/metadata.sh", - "scripts/solaris10/vmtools.sh", - "scripts/solaris10/minimize.sh" + "scripts/solaris-10/vmtools.sh", + "scripts/solaris-10/minimize.sh" ], "type": "shell" } @@ -129,7 +123,6 @@ "git_revision": "__unknown_git_revision__", "headless": "", "memory": "1536", - "metadata": "floppy/dummy_metadata.json", "mirror": "./packer_cache", "name": "solaris-10.11", "template": "solaris-10.11-x86", diff --git a/solaris/solaris-11-x86.json b/solaris/solaris-11-x86.json index 674677a6e..2549765e6 100644 --- a/solaris/solaris-11-x86.json +++ b/solaris/solaris-11-x86.json @@ -33,7 +33,7 @@ "guest_additions_mode": "attach", "guest_os_type": "Solaris11_64", "headless": "{{ user `headless` }}", - "http_directory": "http/solaris-11", + "http_directory": "http", "iso_checksum": "30d9ae857f62938c21307722d031e0dc", "iso_checksum_type": "md5", "iso_url": "{{user `mirror`}}/sol-11_3-ai-x86.iso", @@ -94,7 +94,7 @@ "disk_size": "{{user `disk_size`}}", "guest_os_type": "solaris11-64", "headless": "{{ user `headless` }}", - "http_directory": "http/solaris-11", + "http_directory": "http", "iso_checksum": "30d9ae857f62938c21307722d031e0dc", "iso_checksum_type": "md5", "iso_url": "{{user `mirror`}}/sol-11_3-ai-x86.iso", @@ -117,25 +117,19 @@ ], "post-processors": [ { - "output": "builds/{{user `box_basename`}}.{{.Provider}}.box", + "output": "../builds/{{user `box_basename`}}.{{.Provider}}.box", "type": "vagrant" } ], "provisioners": [ - { - "destination": "/tmp/bento-metadata.json", - "source": "{{user `metadata`}}", - "type": "file" - }, { "environment_vars": [], "execute_command": "echo 'vagrant'|sudo -S bash {{.Path}}", "scripts": [ - "scripts/common/metadata.sh", - "scripts/solaris/update.sh", - "scripts/solaris/vagrant.sh", - "scripts/solaris/vmtools.sh", - "scripts/solaris/minimize.sh" + "scripts/update.sh", + "scripts/vagrant.sh", + "scripts/vmtools.sh", + "scripts/minimize.sh" ], "type": "shell" } @@ -151,7 +145,6 @@ "git_revision": "__unknown_git_revision__", "headless": "", "memory": "2048", - "metadata": "floppy/dummy_metadata.json", "mirror": "./packer_cache", "name": "solaris-11.3", "template": "solaris-11.3-x86", diff --git a/ubuntu/ubuntu-14.04-amd64.json b/ubuntu/ubuntu-14.04-amd64.json index ce6288231..983fe1ca8 100644 --- a/ubuntu/ubuntu-14.04-amd64.json +++ b/ubuntu/ubuntu-14.04-amd64.json @@ -244,16 +244,11 @@ ], "post-processors": [ { - "output": "builds/{{user `box_basename`}}.{{.Provider}}.box", + "output": "../builds/{{user `box_basename`}}.{{.Provider}}.box", "type": "vagrant" } ], "provisioners": [ - { - "destination": "/tmp/bento-metadata.json", - "source": "{{user `metadata`}}", - "type": "file" - }, { "environment_vars": [ "HOME_DIR=/home/vagrant", @@ -263,18 +258,17 @@ ], "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", "scripts": [ - "scripts/common/metadata.sh", - "scripts/ubuntu/update.sh", - "scripts/common/sshd.sh", - "scripts/ubuntu/networking.sh", - "scripts/ubuntu/sudoers.sh", - "scripts/ubuntu/vagrant.sh", - "scripts/common/virtualbox.sh", - "scripts/common/vmware.sh", - "scripts/common/parallels.sh", - "scripts/ubuntu/hyperv.sh", - "scripts/ubuntu/cleanup.sh", - "scripts/common/minimize.sh" + "scripts/update.sh", + "../_common/sshd.sh", + "scripts/networking.sh", + "scripts/sudoers.sh", + "scripts/vagrant.sh", + "../_common/virtualbox.sh", + "../_common/vmware.sh", + "../_common/parallels.sh", + "scripts/hyperv.sh", + "scripts/cleanup.sh", + "../_common/minimize.sh" ], "type": "shell" } @@ -294,12 +288,11 @@ "iso_checksum_type": "sha256", "iso_name": "ubuntu-14.04.1-server-amd64.iso", "memory": "1024", - "metadata": "floppy/dummy_metadata.json", "mirror": "http://old-releases.ubuntu.com/releases", "mirror_directory": "14.04.1", "name": "ubuntu-14.04", "no_proxy": "{{env `no_proxy`}}", - "preseed_path": "ubuntu/preseed.cfg", + "preseed_path": "preseed.cfg", "template": "ubuntu-14.04-amd64", "version": "TIMESTAMP" } diff --git a/ubuntu/ubuntu-14.04-i386.json b/ubuntu/ubuntu-14.04-i386.json index ea3d3558e..bcd988149 100644 --- a/ubuntu/ubuntu-14.04-i386.json +++ b/ubuntu/ubuntu-14.04-i386.json @@ -209,16 +209,11 @@ ], "post-processors": [ { - "output": "builds/{{user `box_basename`}}.{{.Provider}}.box", + "output": "../builds/{{user `box_basename`}}.{{.Provider}}.box", "type": "vagrant" } ], "provisioners": [ - { - "destination": "/tmp/bento-metadata.json", - "source": "{{user `metadata`}}", - "type": "file" - }, { "environment_vars": [ "HOME_DIR=/home/vagrant", @@ -228,17 +223,16 @@ ], "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", "scripts": [ - "scripts/common/metadata.sh", - "scripts/ubuntu/update.sh", - "scripts/common/sshd.sh", - "scripts/ubuntu/networking.sh", - "scripts/ubuntu/sudoers.sh", - "scripts/ubuntu/vagrant.sh", - "scripts/common/virtualbox.sh", - "scripts/common/vmware.sh", - "scripts/common/parallels.sh", - "scripts/ubuntu/cleanup.sh", - "scripts/common/minimize.sh" + "scripts/update.sh", + "../_common/sshd.sh", + "scripts/networking.sh", + "scripts/sudoers.sh", + "scripts/vagrant.sh", + "../_common/virtualbox.sh", + "../_common/vmware.sh", + "../_common/parallels.sh", + "scripts/cleanup.sh", + "../_common/minimize.sh" ], "type": "shell" } @@ -256,12 +250,11 @@ "iso_checksum_type": "sha256", "iso_name": "ubuntu-14.04.1-server-i386.iso", "memory": "1024", - "metadata": "floppy/dummy_metadata.json", "mirror": "http://old-releases.ubuntu.com/releases", "mirror_directory": "14.04.1", "name": "ubuntu-14.04-i386", "no_proxy": "{{env `no_proxy`}}", - "preseed_path": "ubuntu/preseed.cfg", + "preseed_path": "preseed.cfg", "template": "ubuntu-14.04-i386", "version": "TIMESTAMP" } diff --git a/ubuntu/ubuntu-16.04-amd64.json b/ubuntu/ubuntu-16.04-amd64.json index 2754b6fad..62483951b 100644 --- a/ubuntu/ubuntu-16.04-amd64.json +++ b/ubuntu/ubuntu-16.04-amd64.json @@ -253,16 +253,11 @@ ], "post-processors": [ { - "output": "builds/{{user `box_basename`}}.{{.Provider}}.box", + "output": "../builds/{{user `box_basename`}}.{{.Provider}}.box", "type": "vagrant" } ], "provisioners": [ - { - "destination": "/tmp/bento-metadata.json", - "source": "{{user `metadata`}}", - "type": "file" - }, { "environment_vars": [ "HOME_DIR=/home/vagrant", @@ -272,18 +267,17 @@ ], "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", "scripts": [ - "scripts/common/metadata.sh", - "scripts/ubuntu/update.sh", - "scripts/common/sshd.sh", - "scripts/ubuntu/networking.sh", - "scripts/ubuntu/sudoers.sh", - "scripts/ubuntu/vagrant.sh", - "scripts/common/virtualbox.sh", - "scripts/ubuntu/vmware.sh", - "scripts/common/parallels.sh", - "scripts/ubuntu/hyperv.sh", - "scripts/ubuntu/cleanup.sh", - "scripts/common/minimize.sh" + "scripts/update.sh", + "../_common/sshd.sh", + "scripts/networking.sh", + "scripts/sudoers.sh", + "scripts/vagrant.sh", + "../_common/virtualbox.sh", + "scripts/vmware.sh", + "../_common/parallels.sh", + "scripts/hyperv.sh", + "scripts/cleanup.sh", + "../_common/minimize.sh" ], "type": "shell" } @@ -303,12 +297,11 @@ "iso_checksum_type": "sha256", "iso_name": "ubuntu-16.04.2-server-amd64.iso", "memory": "1024", - "metadata": "floppy/dummy_metadata.json", "mirror": "http://releases.ubuntu.com", "mirror_directory": "16.04.2", "name": "ubuntu-16.04", "no_proxy": "{{env `no_proxy`}}", - "preseed_path": "ubuntu/preseed.cfg", + "preseed_path": "preseed.cfg", "template": "ubuntu-16.04-amd64", "version": "TIMESTAMP" } diff --git a/ubuntu/ubuntu-16.04-i386.json b/ubuntu/ubuntu-16.04-i386.json index 39621ba58..f2297168a 100644 --- a/ubuntu/ubuntu-16.04-i386.json +++ b/ubuntu/ubuntu-16.04-i386.json @@ -217,16 +217,11 @@ ], "post-processors": [ { - "output": "builds/{{user `box_basename`}}.{{.Provider}}.box", + "output": "../builds/{{user `box_basename`}}.{{.Provider}}.box", "type": "vagrant" } ], "provisioners": [ - { - "destination": "/tmp/bento-metadata.json", - "source": "{{user `metadata`}}", - "type": "file" - }, { "environment_vars": [ "HOME_DIR=/home/vagrant", @@ -236,17 +231,16 @@ ], "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", "scripts": [ - "scripts/common/metadata.sh", - "scripts/ubuntu/update.sh", - "scripts/common/sshd.sh", - "scripts/ubuntu/networking.sh", - "scripts/ubuntu/sudoers.sh", - "scripts/ubuntu/vagrant.sh", - "scripts/common/virtualbox.sh", - "scripts/ubuntu/vmware.sh", - "scripts/common/parallels.sh", - "scripts/ubuntu/cleanup.sh", - "scripts/common/minimize.sh" + "scripts/update.sh", + "../_common/sshd.sh", + "scripts/networking.sh", + "scripts/sudoers.sh", + "scripts/vagrant.sh", + "../_common/virtualbox.sh", + "scripts/vmware.sh", + "../_common/parallels.sh", + "scripts/cleanup.sh", + "../_common/minimize.sh" ], "type": "shell" } @@ -264,12 +258,11 @@ "iso_checksum_type": "sha256", "iso_name": "ubuntu-16.04.1-server-i386.iso", "memory": "1024", - "metadata": "floppy/dummy_metadata.json", "mirror": "http://old-releases.ubuntu.com/releases", "mirror_directory": "16.04.1", "name": "ubuntu-16.04-i386", "no_proxy": "{{env `no_proxy`}}", - "preseed_path": "ubuntu/preseed.cfg", + "preseed_path": "preseed.cfg", "template": "ubuntu-16.04-i386", "version": "TIMESTAMP" } diff --git a/ubuntu/ubuntu-17.04-amd64.json b/ubuntu/ubuntu-17.04-amd64.json index 534bab389..8a9d62ebc 100644 --- a/ubuntu/ubuntu-17.04-amd64.json +++ b/ubuntu/ubuntu-17.04-amd64.json @@ -249,16 +249,11 @@ ], "post-processors": [ { - "output": "builds/{{user `box_basename`}}.{{.Provider}}.box", + "output": "../builds/{{user `box_basename`}}.{{.Provider}}.box", "type": "vagrant" } ], "provisioners": [ - { - "destination": "/tmp/bento-metadata.json", - "source": "{{user `metadata`}}", - "type": "file" - }, { "environment_vars": [ "HOME_DIR=/home/vagrant", @@ -268,18 +263,17 @@ ], "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", "scripts": [ - "scripts/common/metadata.sh", - "scripts/ubuntu/update.sh", - "scripts/common/sshd.sh", - "scripts/ubuntu/networking.sh", - "scripts/ubuntu/sudoers.sh", - "scripts/ubuntu/vagrant.sh", - "scripts/common/virtualbox.sh", - "scripts/ubuntu/vmware.sh", - "scripts/common/parallels.sh", - "scripts/ubuntu/hyperv.sh", - "scripts/ubuntu/cleanup.sh", - "scripts/common/minimize.sh" + "scripts/update.sh", + "../_common/sshd.sh", + "scripts/networking.sh", + "scripts/sudoers.sh", + "scripts/vagrant.sh", + "../_common/virtualbox.sh", + "scripts/vmware.sh", + "../_common/parallels.sh", + "scripts/hyperv.sh", + "scripts/cleanup.sh", + "../_common/minimize.sh" ], "type": "shell" } @@ -299,12 +293,11 @@ "iso_checksum_type": "sha256", "iso_name": "ubuntu-17.04-server-amd64.iso", "memory": "1024", - "metadata": "floppy/dummy_metadata.json", "mirror": "http://releases.ubuntu.com", "mirror_directory": "17.04", "name": "ubuntu-17.04", "no_proxy": "{{env `no_proxy`}}", - "preseed_path": "ubuntu/preseed.cfg", + "preseed_path": "preseed.cfg", "template": "ubuntu-17.04-amd64", "version": "TIMESTAMP" } diff --git a/ubuntu/ubuntu-17.04-i386.json b/ubuntu/ubuntu-17.04-i386.json index 1368c58af..55aa4c482 100644 --- a/ubuntu/ubuntu-17.04-i386.json +++ b/ubuntu/ubuntu-17.04-i386.json @@ -214,7 +214,7 @@ ], "post-processors": [ { - "output": "builds/{{user `box_basename`}}.{{.Provider}}.box", + "output": "../builds/{{user `box_basename`}}.{{.Provider}}.box", "type": "vagrant" } ], @@ -233,17 +233,16 @@ ], "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", "scripts": [ - "scripts/common/metadata.sh", - "scripts/ubuntu/update.sh", - "scripts/common/sshd.sh", - "scripts/ubuntu/networking.sh", - "scripts/ubuntu/sudoers.sh", - "scripts/ubuntu/vagrant.sh", - "scripts/common/virtualbox.sh", - "scripts/ubuntu/vmware.sh", - "scripts/common/parallels.sh", - "scripts/ubuntu/cleanup.sh", - "scripts/common/minimize.sh" + "scripts/update.sh", + "../_common/sshd.sh", + "scripts/networking.sh", + "scripts/sudoers.sh", + "scripts/vagrant.sh", + "../_common/virtualbox.sh", + "scripts/vmware.sh", + "../_common/parallels.sh", + "scripts/cleanup.sh", + "../_common/minimize.sh" ], "type": "shell" } @@ -261,12 +260,11 @@ "iso_checksum_type": "sha256", "iso_name": "ubuntu-17.04-server-i386.iso", "memory": "1024", - "metadata": "floppy/dummy_metadata.json", "mirror": "http://releases.ubuntu.com", "mirror_directory": "17.04", "name": "ubuntu-17.04-i386", "no_proxy": "{{env `no_proxy`}}", - "preseed_path": "ubuntu/preseed.cfg", + "preseed_path": "preseed.cfg", "template": "ubuntu-17.04-i386", "version": "TIMESTAMP" } diff --git a/windows/windows-nano-tp3.json b/windows/windows-nano-tp3.json index 2355ccb1c..572ffb089 100644 --- a/windows/windows-nano-tp3.json +++ b/windows/windows-nano-tp3.json @@ -4,11 +4,11 @@ "communicator": "winrm", "disk_size": "{{user `disk_size`}}", "floppy_files": [ - "scripts/windows/Autounattend.xml", - "scripts/windows/nano_create.ps1", - "scripts/windows/nano_cleanup.ps1", - "scripts/windows/SetupComplete.cmd", - "scripts/windows/postunattend.xml" + "scripts/Autounattend.xml", + "scripts/nano_create.ps1", + "scripts/nano_cleanup.ps1", + "scripts/SetupComplete.cmd", + "scripts/postunattend.xml" ], "guest_additions_mode": "disable", "guest_os_type": "Windows2012_64", @@ -61,7 +61,7 @@ ], "post-processors": [ { - "output": "builds/{{user `box_basename`}}.{{.Provider}}.box", + "output": "../builds/{{user `box_basename`}}.{{.Provider}}.box", "type": "vagrant", "vagrantfile_template": "vagrantfile_templates/windows-nano.rb" } @@ -77,9 +77,8 @@ "iso_checksum_type": "md5", "iso_url": "http://care.dlservice.microsoft.com/dl/download/7/3/C/73C250BE-67C4-440B-A69B-D0E8EE77F01C/10514.0.150808-1529.TH2_RELEASE_SERVER_OEMRET_X64FRE_EN-US.ISO", "memory": "2048", - "metadata": "floppy/dummy_metadata.json", "template": "windows-nano-tp3", - "version": "1.1.TIMESTAMP" + "version": "TIMESTAMP" } } From 204b2342d6c82799fe6cbaae59d6acbd7d7676fa Mon Sep 17 00:00:00 2001 From: Mattias Giese <giese@b1-systems.de> Date: Fri, 8 Sep 2017 11:59:44 +0200 Subject: [PATCH 0691/1622] Add support for SLES 12 SP3 Signed-off-by: Mattias Giese <giese@b1-systems.de> --- ...-autoinst.xml => sles-12-sp3-x86_64-autoinst.xml} | 0 sles-12-sp2-x86_64.json => sles-12-sp3-x86_64.json | 12 ++++++------ 2 files changed, 6 insertions(+), 6 deletions(-) rename http/sles-12/{sles-12-sp2-x86_64-autoinst.xml => sles-12-sp3-x86_64-autoinst.xml} (100%) rename sles-12-sp2-x86_64.json => sles-12-sp3-x86_64.json (95%) diff --git a/http/sles-12/sles-12-sp2-x86_64-autoinst.xml b/http/sles-12/sles-12-sp3-x86_64-autoinst.xml similarity index 100% rename from http/sles-12/sles-12-sp2-x86_64-autoinst.xml rename to http/sles-12/sles-12-sp3-x86_64-autoinst.xml diff --git a/sles-12-sp2-x86_64.json b/sles-12-sp3-x86_64.json similarity index 95% rename from sles-12-sp2-x86_64.json rename to sles-12-sp3-x86_64.json index 7d37456bf..831b6c804 100644 --- a/sles-12-sp2-x86_64.json +++ b/sles-12-sp3-x86_64.json @@ -180,8 +180,8 @@ "_DOWNLOAD_SITE": "https://www.suse.com/products/server/download", "_README": "You must download the automated installer iso from the following page, and then place it in the packer_cache dir", "arch": "64", - "autoinst_cfg": "sles-12/sles-12-sp2-x86_64-autoinst.xml", - "box_basename": "sles-12-sp2", + "autoinst_cfg": "sles-12/sles-12-sp3-x86_64-autoinst.xml", + "box_basename": "sles-12-sp3", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", "disk_size": "20480", @@ -189,14 +189,14 @@ "headless": "", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", - "iso_checksum": "dd724e9248f2c3507e8e9d0050a4c8b6e9aeda7fdf0870858757cc6c01b7d47d", + "iso_checksum": "48408157ef667100671b22f92c3e20771ccf2100108b96e3ae83d8df30abddd5", "iso_checksum_type": "sha256", - "iso_name": "SLE-12-SP2-Server-DVD-x86_64-GM-DVD1.iso", + "iso_name": "SLE-12-SP3-Server-DVD-x86_64-GM-DVD1.iso", "memory": "1024", "metadata": "floppy/dummy_metadata.json", "mirror": "./packer_cache", - "name": "sles-12-sp2", - "template": "sles-12-sp2-x86_64", + "name": "sles-12-sp3", + "template": "sles-12-sp3-x86_64", "version": "TIMESTAMP" } } From 3ff44df6a3914928a1998f3407e0e7f2ecab3fee Mon Sep 17 00:00:00 2001 From: Seth Thomas <sthomas@chef.io> Date: Tue, 12 Sep 2017 15:16:56 -0400 Subject: [PATCH 0692/1622] Moving this into appropriate folder Signed-off-by: Seth Thomas <sthomas@chef.io> --- sles-12-sp3-x86_64.json => sles/sles-12-sp3-x86_64.json | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename sles-12-sp3-x86_64.json => sles/sles-12-sp3-x86_64.json (100%) diff --git a/sles-12-sp3-x86_64.json b/sles/sles-12-sp3-x86_64.json similarity index 100% rename from sles-12-sp3-x86_64.json rename to sles/sles-12-sp3-x86_64.json From e8b0c45d5ab0a9a81524cf029765931075c3520d Mon Sep 17 00:00:00 2001 From: Seth Thomas <sthomas@chef.io> Date: Tue, 12 Sep 2017 15:22:31 -0400 Subject: [PATCH 0693/1622] Update template for folder move Signed-off-by: Seth Thomas <sthomas@chef.io> --- sles/sles-12-sp3-x86_64.json | 30 ++++++++++++------------------ 1 file changed, 12 insertions(+), 18 deletions(-) diff --git a/sles/sles-12-sp3-x86_64.json b/sles/sles-12-sp3-x86_64.json index 831b6c804..2722c28b7 100644 --- a/sles/sles-12-sp3-x86_64.json +++ b/sles/sles-12-sp3-x86_64.json @@ -141,16 +141,11 @@ ], "post-processors": [ { - "output": "builds/{{user `box_basename`}}.{{.Provider}}.box", + "output": "../builds/{{user `box_basename`}}.{{.Provider}}.box", "type": "vagrant" } ], "provisioners": [ - { - "destination": "/tmp/bento-metadata.json", - "source": "{{user `metadata`}}", - "type": "file" - }, { "environment_vars": [ "HOME_DIR=/home/vagrant", @@ -160,18 +155,17 @@ ], "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh '{{.Path}}'", "scripts": [ - "scripts/common/metadata.sh", - "scripts/common/sshd.sh", - "scripts/common/vagrant.sh", - "scripts/sles/unsupported-modules.sh", - "scripts/common/virtualbox.sh", - "scripts/common/vmware.sh", - "scripts/common/parallels.sh", - "scripts/sles/sudoers.sh", - "scripts/sles/zypper-locks.sh", - "scripts/sles/remove-dvd-source.sh", - "scripts/sles/cleanup.sh", - "scripts/common/minimize.sh" + "../_common/sshd.sh", + "../_common/vagrant.sh", + "scripts/unsupported-modules.sh", + "../_common/virtualbox.sh", + "../_common/vmware.sh", + "../_common/parallels.sh", + "scripts/sudoers.sh", + "scripts/zypper-locks.sh", + "scripts/remove-dvd-source.sh", + "scripts/cleanup.sh", + "../_common/minimize.sh" ], "type": "shell" } From cffc78107e71efe747a76ee5911bd9331cea458d Mon Sep 17 00:00:00 2001 From: Seth Thomas <sthomas@chef.io> Date: Tue, 12 Sep 2017 15:48:51 -0400 Subject: [PATCH 0694/1622] Hopefully this is the last move Signed-off-by: Seth Thomas <sthomas@chef.io> --- {http/sles-12 => sles/http}/sles-12-sp3-x86_64-autoinst.xml | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename {http/sles-12 => sles/http}/sles-12-sp3-x86_64-autoinst.xml (100%) diff --git a/http/sles-12/sles-12-sp3-x86_64-autoinst.xml b/sles/http/sles-12-sp3-x86_64-autoinst.xml similarity index 100% rename from http/sles-12/sles-12-sp3-x86_64-autoinst.xml rename to sles/http/sles-12-sp3-x86_64-autoinst.xml From 22c8e0b70180e24f6a19cf6366342610f5e85d5f Mon Sep 17 00:00:00 2001 From: Seth Thomas <sthomas@chef.io> Date: Tue, 12 Sep 2017 15:51:19 -0400 Subject: [PATCH 0695/1622] Adding missing cd command to readme Signed-off-by: Seth Thomas <sthomas@chef.io> --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index ea73543ab..997fe12f8 100644 --- a/README.md +++ b/README.md @@ -40,7 +40,7 @@ end To build an Ubuntu 16.04 box for only the VirtualBox provider ``` -cd ubuntu +$ cd ubuntu $ packer build -only=virtualbox-iso ubuntu-16.04-amd64.json ``` @@ -54,14 +54,14 @@ $ packer build debian-9.1-i386.json To build CentOS 7.3 boxes for all providers except VMware and Parallels ``` -cd centos +$ cd centos $ packer build -except=parallels-iso,vmware-iso centos-7.3-x86_64.json ``` To use an alternate mirror ``` -cd fedora +$ cd fedora $ packer build -var 'mirror=http://mirror.utexas.edu/fedora/linux' fedora-26-x86_64.json ``` From b2402ccf5d00c146f0b9de68bc4e0ddb4ef07a8d Mon Sep 17 00:00:00 2001 From: Seth Thomas <sthomas@chef.io> Date: Tue, 12 Sep 2017 15:52:50 -0400 Subject: [PATCH 0696/1622] Fixing centos template validation for hyperv Signed-off-by: Seth Thomas <sthomas@chef.io> --- centos/centos-6.9-i386.json | 2 +- centos/centos-6.9-x86_64.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/centos/centos-6.9-i386.json b/centos/centos-6.9-i386.json index 9367c0d81..2f0dc9e54 100644 --- a/centos/centos-6.9-i386.json +++ b/centos/centos-6.9-i386.json @@ -110,7 +110,7 @@ "cpu": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "floppy_files": [ - "http/rhel-6/ks.cfg" + "../centos/http/{{user `ks_path`}}" ], "generation": "{{user `hyperv_generation`}}", "guest_additions_mode": "disable", diff --git a/centos/centos-6.9-x86_64.json b/centos/centos-6.9-x86_64.json index 77d6c46e5..32b3229cb 100644 --- a/centos/centos-6.9-x86_64.json +++ b/centos/centos-6.9-x86_64.json @@ -110,7 +110,7 @@ "cpu": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "floppy_files": [ - "http/rhel-6/ks.cfg" + "../centos/http/{{user `ks_path`}}" ], "generation": "{{user `hyperv_generation`}}", "guest_additions_mode": "disable", From 9528151047e7396d08fb3ce3b8f24478038244ad Mon Sep 17 00:00:00 2001 From: Florian Limberger <florian.limberger@inovex.de> Date: Tue, 12 Sep 2017 23:27:34 +0200 Subject: [PATCH 0697/1622] Use the zroot/usr/home file system as location for the vagrant home directory Also use a symlink from /home to /usr/home to provide the default location. --- freebsd/http/freebsd-11/installerconfig | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/freebsd/http/freebsd-11/installerconfig b/freebsd/http/freebsd-11/installerconfig index 7f711c80a..74fba1236 100644 --- a/freebsd/http/freebsd-11/installerconfig +++ b/freebsd/http/freebsd-11/installerconfig @@ -42,10 +42,11 @@ EOT touch /etc/fstab # Set up user accounts -echo "vagrant" | pw -V /etc useradd vagrant -h 0 -s /bin/sh -G wheel -d /home/vagrant -c "Vagrant User" +echo "vagrant" | pw -V /etc useradd vagrant -h 0 -s /bin/sh -G wheel -d /usr/home/vagrant -c "Vagrant User" echo "vagrant" | pw -V /etc usermod root -mkdir -p /home/vagrant -chown 1001:1001 /home/vagrant +mkdir -p /usr/home/vagrant +chown 1001:1001 /usr/home/vagrant +ln -s /usr/home /home reboot From c2b6a7c676ca4ecf7b9717d4c80fef497434113b Mon Sep 17 00:00:00 2001 From: Kaurin <milos.kaurin@gmail.com> Date: Thu, 14 Sep 2017 03:22:51 +0100 Subject: [PATCH 0698/1622] Fixed two breaking issues: * Ensuring updated packages configs get updated too without prompt * Removed the reboot from script --- ubuntu/scripts/update.sh | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/ubuntu/scripts/update.sh b/ubuntu/scripts/update.sh index daeeca4af..9e872b68c 100644 --- a/ubuntu/scripts/update.sh +++ b/ubuntu/scripts/update.sh @@ -1,4 +1,5 @@ #!/bin/sh -eux +export DEBIAN_FRONTEND=noninteractive ubuntu_version="`lsb_release -r | awk '{print $2}'`"; ubuntu_major_version="`echo $ubuntu_version | awk -F. '{print $1}'`"; @@ -23,6 +24,4 @@ APT::Periodic::Enable "0"; EOF # Upgrade all installed packages incl. kernel and kernel headers -apt-get -y dist-upgrade; -reboot; -sleep 60; +apt-get -y dist-upgrade -o Dpkg::Options::="--force-confnew"; From 854ed7696da1114af967bf086a94c57a7ace256b Mon Sep 17 00:00:00 2001 From: Kaurin <milos.kaurin@gmail.com> Date: Thu, 14 Sep 2017 03:24:44 +0100 Subject: [PATCH 0699/1622] Two changes: * Removed waits as they aren't necessary and are time consuming * Forcing 1GB ram for the qemu virt. Breaks with less --- ubuntu/ubuntu-16.04-amd64.json | 49 +++++++++++++++++++--------------- 1 file changed, 27 insertions(+), 22 deletions(-) diff --git a/ubuntu/ubuntu-16.04-amd64.json b/ubuntu/ubuntu-16.04-amd64.json index 62483951b..f4abf4aff 100644 --- a/ubuntu/ubuntu-16.04-amd64.json +++ b/ubuntu/ubuntu-16.04-amd64.json @@ -178,26 +178,26 @@ "<bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs>", "<bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs>", "<bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs>", - "/install/vmlinuz<wait>", - " auto<wait>", - " console-setup/ask_detect=false<wait>", - " console-setup/layoutcode=us<wait>", - " console-setup/modelcode=pc105<wait>", - " debconf/frontend=noninteractive<wait>", - " debian-installer=en_US.UTF-8<wait>", - " fb=false<wait>", - " initrd=/install/initrd.gz<wait>", - " kbd-chooser/method=us<wait>", - " keyboard-configuration/layout=USA<wait>", - " keyboard-configuration/variant=USA<wait>", - " locale=en_US.UTF-8<wait>", - " netcfg/get_domain=vm<wait>", - " netcfg/get_hostname=vagrant<wait>", - " grub-installer/bootdev=/dev/vda<wait>", - " noapic<wait>", - " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}}<wait>", - " -- <wait>", - "<enter><wait>" + "/install/vmlinuz", + " auto", + " console-setup/ask_detect=false", + " console-setup/layoutcode=us", + " console-setup/modelcode=pc105", + " debconf/frontend=noninteractive", + " debian-installer=en_US.UTF-8", + " fb=false", + " initrd=/install/initrd.gz", + " kbd-chooser/method=us", + " keyboard-configuration/layout=USA", + " keyboard-configuration/variant=USA", + " locale=en_US.UTF-8", + " netcfg/get_domain=vm", + " netcfg/get_hostname=vagrant", + " grub-installer/bootdev=/dev/vda", + " noapic", + " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}}", + " -- ", + "<enter>" ], "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", @@ -213,7 +213,13 @@ "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", "type": "qemu", - "vm_name": "{{ user `template` }}" + "vm_name": "{{ user `template` }}", + "qemuargs": [ + [ + "-m", + "1024M" + ] + ] }, { "boot_command": [ @@ -306,4 +312,3 @@ "version": "TIMESTAMP" } } - From f9c8ff95e6ff0ac89810ab12f1a5e362c3c13f5f Mon Sep 17 00:00:00 2001 From: Seth Thomas <sthomas@chef.io> Date: Thu, 14 Sep 2017 19:17:33 -0400 Subject: [PATCH 0700/1622] CentOS 7.4 Signed-off-by: Seth Thomas <sthomas@chef.io> --- ...centos-7.3-x86_64.json => centos-7.4-x86_64.json} | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) rename centos/{centos-7.3-x86_64.json => centos-7.4-x86_64.json} (95%) diff --git a/centos/centos-7.3-x86_64.json b/centos/centos-7.4-x86_64.json similarity index 95% rename from centos/centos-7.3-x86_64.json rename to centos/centos-7.4-x86_64.json index e68631abd..dcb4fb68f 100644 --- a/centos/centos-7.3-x86_64.json +++ b/centos/centos-7.4-x86_64.json @@ -181,7 +181,7 @@ } ], "variables": { - "box_basename": "centos-7.3", + "box_basename": "centos-7.4", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", "disk_size": "40960", @@ -191,16 +191,16 @@ "https_proxy": "{{env `https_proxy`}}", "hyperv_generation": "1", "hyperv_switch": "{{env `hyperv_switch`}}", - "iso_checksum": "c455ee948e872ad2194bdddd39045b83634e8613249182b88f549bb2319d97eb", + "iso_checksum": "ec7500d4b006702af6af023b1f8f1b890b6c7ee54400bb98cef968b883cd6546", "iso_checksum_type": "sha256", - "iso_name": "CentOS-7-x86_64-DVD-1611.iso", + "iso_name": "CentOS-7-x86_64-DVD-1708.iso", "ks_path": "7/ks.cfg", "memory": "1024", "mirror": "http://mirrors.kernel.org/centos", - "mirror_directory": "7.3.1611/isos/x86_64", - "name": "centos-7.3", + "mirror_directory": "7.4.1708/isos/x86_64", + "name": "centos-7.4", "no_proxy": "{{env `no_proxy`}}", - "template": "centos-7.3-x86_64", + "template": "centos-7.4-x86_64", "version": "TIMESTAMP" } } From cca0acf7ed4e877fe0b7842f3a6e0627246593af Mon Sep 17 00:00:00 2001 From: Kaurin <milos.kaurin@gmail.com> Date: Fri, 15 Sep 2017 01:41:51 +0100 Subject: [PATCH 0701/1622] Add the eth0 config into interfaces.d --- ubuntu/scripts/networking.sh | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/ubuntu/scripts/networking.sh b/ubuntu/scripts/networking.sh index 03fc0ecf1..98d54072b 100644 --- a/ubuntu/scripts/networking.sh +++ b/ubuntu/scripts/networking.sh @@ -13,5 +13,11 @@ if [ "$major_version" -le "15" ]; then rm -rf /dev/.udev/ /var/lib/dhcp3/* /var/lib/dhcp/*; fi +# Set up eth0 +echo "auto eth0\niface eth0 inet dhcp" >> /etc/network/interfaces.d/eth0.cfg + # Adding a 2 sec delay to the interface up, to make the dhclient happy echo "pre-up sleep 2" >>/etc/network/interfaces; + +sed -ie 's/GRUB_CMDLINE_LINUX="\(.*\)"/GRUB_CMDLINE_LINUX="net.ifnames=0 biosdevname=0 \1"/g' /etc/default/grub +update-grub From 27cdbd5ce2d8cc5f14f6a4d927c3847e51c8e0db Mon Sep 17 00:00:00 2001 From: Kaurin <milos.kaurin@gmail.com> Date: Fri, 15 Sep 2017 01:42:55 +0100 Subject: [PATCH 0702/1622] Bump to 16.04.03, add 'cpus' support and variable-ize memory (both for qemu) --- ubuntu/ubuntu-16.04-amd64.json | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/ubuntu/ubuntu-16.04-amd64.json b/ubuntu/ubuntu-16.04-amd64.json index f4abf4aff..bd30f8e76 100644 --- a/ubuntu/ubuntu-16.04-amd64.json +++ b/ubuntu/ubuntu-16.04-amd64.json @@ -217,7 +217,11 @@ "qemuargs": [ [ "-m", - "1024M" + "{{ user `memory` }}M" + ], + [ + "-smp", + "{{ user `cpus` }}" ] ] }, @@ -299,12 +303,12 @@ "https_proxy": "{{env `https_proxy`}}", "hyperv_generation": "2", "hyperv_switch": "{{env `hyperv_switch`}}", - "iso_checksum": "737ae7041212c628de5751d15c3016058b0e833fdc32e7420209b76ca3d0a535", + "iso_checksum": "a06cd926f5855d4f21fb4bc9978a35312f815fbda0d0ef7fdc846861f4fc4600", "iso_checksum_type": "sha256", - "iso_name": "ubuntu-16.04.2-server-amd64.iso", + "iso_name": "ubuntu-16.04.3-server-amd64.iso", "memory": "1024", "mirror": "http://releases.ubuntu.com", - "mirror_directory": "16.04.2", + "mirror_directory": "16.04.3", "name": "ubuntu-16.04", "no_proxy": "{{env `no_proxy`}}", "preseed_path": "preseed.cfg", From ee7f0cb88baefa99adf45e73172773bb8ecc325d Mon Sep 17 00:00:00 2001 From: Seth Thomas <sthomas@chef.io> Date: Fri, 15 Sep 2017 13:51:47 -0400 Subject: [PATCH 0703/1622] Bump for 7.4 Signed-off-by: Seth Thomas <sthomas@chef.io> --- builds.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/builds.yml b/builds.yml index 9b4f6440e..8e5735016 100644 --- a/builds.yml +++ b/builds.yml @@ -9,7 +9,7 @@ public: '6.9': - x86_64 - i386 - '7.3': + '7.4': - x86_64 oracle: '6.9': From 6b5d66f7f98690722337d128d0b9bbb8cb34cefd Mon Sep 17 00:00:00 2001 From: Kaurin <milos.kaurin@gmail.com> Date: Fri, 15 Sep 2017 21:58:27 +0100 Subject: [PATCH 0704/1622] Putting back the wait blocks --- ubuntu/ubuntu-16.04-amd64.json | 40 +++++++++++++++++----------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/ubuntu/ubuntu-16.04-amd64.json b/ubuntu/ubuntu-16.04-amd64.json index bd30f8e76..e705e264b 100644 --- a/ubuntu/ubuntu-16.04-amd64.json +++ b/ubuntu/ubuntu-16.04-amd64.json @@ -178,26 +178,26 @@ "<bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs>", "<bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs>", "<bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs>", - "/install/vmlinuz", - " auto", - " console-setup/ask_detect=false", - " console-setup/layoutcode=us", - " console-setup/modelcode=pc105", - " debconf/frontend=noninteractive", - " debian-installer=en_US.UTF-8", - " fb=false", - " initrd=/install/initrd.gz", - " kbd-chooser/method=us", - " keyboard-configuration/layout=USA", - " keyboard-configuration/variant=USA", - " locale=en_US.UTF-8", - " netcfg/get_domain=vm", - " netcfg/get_hostname=vagrant", - " grub-installer/bootdev=/dev/vda", - " noapic", - " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}}", - " -- ", - "<enter>" + "/install/vmlinuz<wait>", + " auto<wait>", + " console-setup/ask_detect=false<wait>", + " console-setup/layoutcode=us<wait>", + " console-setup/modelcode=pc105<wait>", + " debconf/frontend=noninteractive<wait>", + " debian-installer=en_US.UTF-8<wait>", + " fb=false<wait>", + " initrd=/install/initrd.gz<wait>", + " kbd-chooser/method=us<wait>", + " keyboard-configuration/layout=USA<wait>", + " keyboard-configuration/variant=USA<wait>", + " locale=en_US.UTF-8<wait>", + " netcfg/get_domain=vm<wait>", + " netcfg/get_hostname=vagrant<wait>", + " grub-installer/bootdev=/dev/vda<wait>", + " noapic<wait>", + " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}}<wait>", + " -- <wait>", + "<enter><wait>" ], "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", From 0413677e07142af821b1be5369367c5c0947daf4 Mon Sep 17 00:00:00 2001 From: Kaurin <milos.kaurin@gmail.com> Date: Sat, 16 Sep 2017 20:54:45 +0100 Subject: [PATCH 0705/1622] Removed unecessary deletions Tested on i386/amd64 ubuntu 14.04, 16.04 and 17.04 --- ubuntu/scripts/networking.sh | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/ubuntu/scripts/networking.sh b/ubuntu/scripts/networking.sh index 98d54072b..8913fc407 100644 --- a/ubuntu/scripts/networking.sh +++ b/ubuntu/scripts/networking.sh @@ -1,17 +1,17 @@ #!/bin/sh -eux -ubuntu_version="`lsb_release -r | awk '{print $2}'`"; -major_version="`echo $ubuntu_version | awk -F. '{print $1}'`"; +# ubuntu_version="`lsb_release -r | awk '{print $2}'`"; +# major_version="`echo $ubuntu_version | awk -F. '{print $1}'`"; -if [ "$major_version" -le "15" ]; then - echo "Disabling automatic udev rules for network interfaces in Ubuntu" - # Disable automatic udev rules for network interfaces in Ubuntu, - # source: http://6.ptmc.org/164/ - rm -f /etc/udev/rules.d/70-persistent-net.rules; - mkdir -p /etc/udev/rules.d/70-persistent-net.rules; - rm -f /lib/udev/rules.d/75-persistent-net-generator.rules; - rm -rf /dev/.udev/ /var/lib/dhcp3/* /var/lib/dhcp/*; -fi +# if [ "$major_version" -le "15" ]; then +# echo "Disabling automatic udev rules for network interfaces in Ubuntu" +# # Disable automatic udev rules for network interfaces in Ubuntu, +# # source: http://6.ptmc.org/164/ +# rm -f /etc/udev/rules.d/70-persistent-net.rules; +# mkdir -p /etc/udev/rules.d/70-persistent-net.rules; +# rm -f /lib/udev/rules.d/75-persistent-net-generator.rules; +# rm -rf /dev/.udev/ /var/lib/dhcp3/* /var/lib/dhcp/*; +# fi # Set up eth0 echo "auto eth0\niface eth0 inet dhcp" >> /etc/network/interfaces.d/eth0.cfg From 6c8a2b22cd66b447b6d0ce6935be0a60915a13f0 Mon Sep 17 00:00:00 2001 From: Kaurin <milos.kaurin@gmail.com> Date: Sat, 16 Sep 2017 20:56:41 +0100 Subject: [PATCH 0706/1622] Parameterized all qemu entries in all ubuntu json files Bumped old versions to their most recent subversions (checksums updated, too) Removed a file provisioner from ubuntu 17.04 i386. Re: removed provisioner - packer wouldn't run witout specifying the "metadata" custom variable. Default for "metadata" doesn't exist. Tested and working with removed lines --- ubuntu/ubuntu-14.04-amd64.json | 19 ++++++++++++++----- ubuntu/ubuntu-14.04-i386.json | 19 ++++++++++++++----- ubuntu/ubuntu-16.04-i386.json | 19 ++++++++++++++----- ubuntu/ubuntu-17.04-amd64.json | 12 +++++++++++- ubuntu/ubuntu-17.04-i386.json | 18 +++++++++++------- 5 files changed, 64 insertions(+), 23 deletions(-) diff --git a/ubuntu/ubuntu-14.04-amd64.json b/ubuntu/ubuntu-14.04-amd64.json index 983fe1ca8..b3e96797b 100644 --- a/ubuntu/ubuntu-14.04-amd64.json +++ b/ubuntu/ubuntu-14.04-amd64.json @@ -204,7 +204,17 @@ "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", "type": "qemu", - "vm_name": "{{ user `template` }}" + "vm_name": "{{ user `template` }}", + "qemuargs": [ + [ + "-m", + "{{ user `memory` }}M" + ], + [ + "-smp", + "{{ user `cpus` }}" + ] + ] }, { "boot_command": [ @@ -284,12 +294,12 @@ "https_proxy": "{{env `https_proxy`}}", "hyperv_generation": "2", "hyperv_switch": "{{env `hyperv_switch`}}", - "iso_checksum": "946a6077af6f5f95a51f82fdc44051c7aa19f9cfc5f737954845a6050543d7c2", + "iso_checksum": "07e4bb5569814eab41fafac882ba127893e3ff0bdb7ec931c9b2d040e3e94e7a", "iso_checksum_type": "sha256", - "iso_name": "ubuntu-14.04.1-server-amd64.iso", + "iso_name": "ubuntu-14.04.4-server-amd64.iso", "memory": "1024", "mirror": "http://old-releases.ubuntu.com/releases", - "mirror_directory": "14.04.1", + "mirror_directory": "14.04.4", "name": "ubuntu-14.04", "no_proxy": "{{env `no_proxy`}}", "preseed_path": "preseed.cfg", @@ -297,4 +307,3 @@ "version": "TIMESTAMP" } } - diff --git a/ubuntu/ubuntu-14.04-i386.json b/ubuntu/ubuntu-14.04-i386.json index bcd988149..e9c025d6d 100644 --- a/ubuntu/ubuntu-14.04-i386.json +++ b/ubuntu/ubuntu-14.04-i386.json @@ -204,7 +204,17 @@ "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", "type": "qemu", - "vm_name": "{{ user `template` }}" + "vm_name": "{{ user `template` }}", + "qemuargs": [ + [ + "-m", + "{{ user `memory` }}M" + ], + [ + "-smp", + "{{ user `cpus` }}" + ] + ] } ], "post-processors": [ @@ -246,12 +256,12 @@ "headless": "", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", - "iso_checksum": "976044842804eafc18390505508958b559c131211160ecae5e60694bdf171f78", + "iso_checksum": "e20cf9e0812b52287ca22ac1815bc933c0cfef2be88191110b697d8943bef19e", "iso_checksum_type": "sha256", - "iso_name": "ubuntu-14.04.1-server-i386.iso", + "iso_name": "ubuntu-14.04.4-server-i386.iso", "memory": "1024", "mirror": "http://old-releases.ubuntu.com/releases", - "mirror_directory": "14.04.1", + "mirror_directory": "14.04.4", "name": "ubuntu-14.04-i386", "no_proxy": "{{env `no_proxy`}}", "preseed_path": "preseed.cfg", @@ -259,4 +269,3 @@ "version": "TIMESTAMP" } } - diff --git a/ubuntu/ubuntu-16.04-i386.json b/ubuntu/ubuntu-16.04-i386.json index f2297168a..0b2b8515c 100644 --- a/ubuntu/ubuntu-16.04-i386.json +++ b/ubuntu/ubuntu-16.04-i386.json @@ -212,7 +212,17 @@ "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", "type": "qemu", - "vm_name": "{{ user `template` }}" + "vm_name": "{{ user `template` }}", + "qemuargs": [ + [ + "-m", + "{{ user `memory` }}M" + ], + [ + "-smp", + "{{ user `cpus` }}" + ] + ] } ], "post-processors": [ @@ -254,12 +264,12 @@ "headless": "", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", - "iso_checksum": "62fc3e810c7631fbbd45d9c960ec749fc1eb66e5c56039423e3e94a5391a437a", + "iso_checksum": "e20cf9e0812b52287ca22ac1815bc933c0cfef2be88191110b697d8943bef19e", "iso_checksum_type": "sha256", - "iso_name": "ubuntu-16.04.1-server-i386.iso", + "iso_name": "ubuntu-16.04.4-server-i386.iso", "memory": "1024", "mirror": "http://old-releases.ubuntu.com/releases", - "mirror_directory": "16.04.1", + "mirror_directory": "16.04.4", "name": "ubuntu-16.04-i386", "no_proxy": "{{env `no_proxy`}}", "preseed_path": "preseed.cfg", @@ -267,4 +277,3 @@ "version": "TIMESTAMP" } } - diff --git a/ubuntu/ubuntu-17.04-amd64.json b/ubuntu/ubuntu-17.04-amd64.json index 8a9d62ebc..c63040545 100644 --- a/ubuntu/ubuntu-17.04-amd64.json +++ b/ubuntu/ubuntu-17.04-amd64.json @@ -209,7 +209,17 @@ "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", "type": "qemu", - "vm_name": "{{ user `template` }}" + "vm_name": "{{ user `template` }}", + "qemuargs": [ + [ + "-m", + "{{ user `memory` }}M" + ], + [ + "-smp", + "{{ user `cpus` }}" + ] + ] }, { "boot_command": [ diff --git a/ubuntu/ubuntu-17.04-i386.json b/ubuntu/ubuntu-17.04-i386.json index 55aa4c482..d1fd6e297 100644 --- a/ubuntu/ubuntu-17.04-i386.json +++ b/ubuntu/ubuntu-17.04-i386.json @@ -209,7 +209,17 @@ "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", "type": "qemu", - "vm_name": "{{ user `template` }}" + "vm_name": "{{ user `template` }}", + "qemuargs": [ + [ + "-m", + "{{ user `memory` }}M" + ], + [ + "-smp", + "{{ user `cpus` }}" + ] + ] } ], "post-processors": [ @@ -219,11 +229,6 @@ } ], "provisioners": [ - { - "destination": "/tmp/bento-metadata.json", - "source": "{{user `metadata`}}", - "type": "file" - }, { "environment_vars": [ "HOME_DIR=/home/vagrant", @@ -269,4 +274,3 @@ "version": "TIMESTAMP" } } - From 7d4777fb56b523eae5fbd0dba43c0f4adc05914d Mon Sep 17 00:00:00 2001 From: Seth Thomas <sthomas@chef.io> Date: Sat, 16 Sep 2017 17:46:51 -0400 Subject: [PATCH 0707/1622] Updating all templates for Packer 1.1.0 Signed-off-by: Seth Thomas <sthomas@chef.io> --- centos/centos-6.9-i386.json | 1 + centos/centos-6.9-x86_64.json | 1 + centos/centos-7.4-x86_64.json | 2 +- debian/debian-7.11-amd64.json | 1 + debian/debian-7.11-i386.json | 1 + debian/debian-8.9-amd64.json | 1 + debian/debian-8.9-i386.json | 1 + debian/debian-9.1-amd64.json | 1 + debian/debian-9.1-i386.json | 1 + fedora/fedora-25-i386.json | 1 + fedora/fedora-25-x86_64.json | 1 + fedora/fedora-26-x86_64.json | 1 + freebsd/freebsd-10.3-amd64.json | 1 + freebsd/freebsd-10.3-i386.json | 1 + freebsd/freebsd-11.1-amd64.json | 1 + macos/macos-10.12.json | 1 + macos/macosx-10.10.json | 1 + macos/macosx-10.11.json | 1 + macos/macosx-10.9.json | 1 + opensuse/opensuse-leap-42.3-x86_64.json | 1 + oraclelinux/oracle-5.11-i386.json | 1 + oraclelinux/oracle-5.11-x86_64.json | 1 + oraclelinux/oracle-6.9-i386.json | 1 + oraclelinux/oracle-6.9-x86_64.json | 1 + oraclelinux/oracle-7.3-x86_64.json | 1 + rhel/rhel-5.11-i386.json | 1 + rhel/rhel-5.11-x86_64.json | 1 + rhel/rhel-6.9-i386.json | 1 + rhel/rhel-6.9-x86_64.json | 1 + rhel/rhel-7.4-x86_64.json | 1 + sles/sles-12-sp2-x86_64.json | 1 + sles/sles-12-sp3-x86_64.json | 1 + solaris/solaris-10.11-x86.json | 1 + solaris/solaris-11-x86.json | 1 + ubuntu/ubuntu-14.04-amd64.json | 1 + ubuntu/ubuntu-14.04-i386.json | 1 + ubuntu/ubuntu-16.04-amd64.json | 1 + ubuntu/ubuntu-16.04-i386.json | 1 + ubuntu/ubuntu-17.04-amd64.json | 1 + ubuntu/ubuntu-17.04-i386.json | 1 + 40 files changed, 40 insertions(+), 1 deletion(-) diff --git a/centos/centos-6.9-i386.json b/centos/centos-6.9-i386.json index 2f0dc9e54..6a2b81f98 100644 --- a/centos/centos-6.9-i386.json +++ b/centos/centos-6.9-i386.json @@ -165,6 +165,7 @@ "no_proxy={{user `no_proxy`}}" ], "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", + "expect_disconnect": true, "scripts": [ "scripts/update.sh", "../_common/sshd.sh", diff --git a/centos/centos-6.9-x86_64.json b/centos/centos-6.9-x86_64.json index 32b3229cb..8fc3f39f1 100644 --- a/centos/centos-6.9-x86_64.json +++ b/centos/centos-6.9-x86_64.json @@ -165,6 +165,7 @@ "no_proxy={{user `no_proxy`}}" ], "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", + "expect_disconnect": true, "scripts": [ "scripts/update.sh", "../_common/sshd.sh", diff --git a/centos/centos-7.4-x86_64.json b/centos/centos-7.4-x86_64.json index dcb4fb68f..5f2747f30 100644 --- a/centos/centos-7.4-x86_64.json +++ b/centos/centos-7.4-x86_64.json @@ -165,8 +165,8 @@ "no_proxy={{user `no_proxy`}}" ], "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", + "expect_disconnect": true, "scripts": [ - "scripts/update.sh", "../_common/sshd.sh", "scripts/networking.sh", diff --git a/debian/debian-7.11-amd64.json b/debian/debian-7.11-amd64.json index 459a91083..f426dff80 100644 --- a/debian/debian-7.11-amd64.json +++ b/debian/debian-7.11-amd64.json @@ -194,6 +194,7 @@ "no_proxy={{user `no_proxy`}}" ], "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", + "expect_disconnect": true, "scripts": [ "scripts/update.sh", "../_common/sshd.sh", diff --git a/debian/debian-7.11-i386.json b/debian/debian-7.11-i386.json index d4168812d..0860c7a74 100644 --- a/debian/debian-7.11-i386.json +++ b/debian/debian-7.11-i386.json @@ -194,6 +194,7 @@ "no_proxy={{user `no_proxy`}}" ], "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", + "expect_disconnect": true, "scripts": [ "scripts/update.sh", "../_common/sshd.sh", diff --git a/debian/debian-8.9-amd64.json b/debian/debian-8.9-amd64.json index f39ad5f0e..ed5b40636 100644 --- a/debian/debian-8.9-amd64.json +++ b/debian/debian-8.9-amd64.json @@ -199,6 +199,7 @@ "no_proxy={{user `no_proxy`}}" ], "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", + "expect_disconnect": true, "scripts": [ "scripts/update.sh", "../_common/sshd.sh", diff --git a/debian/debian-8.9-i386.json b/debian/debian-8.9-i386.json index f8753be2d..3d6ace8cc 100644 --- a/debian/debian-8.9-i386.json +++ b/debian/debian-8.9-i386.json @@ -199,6 +199,7 @@ "no_proxy={{user `no_proxy`}}" ], "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", + "expect_disconnect": true, "scripts": [ "scripts/update.sh", "../_common/sshd.sh", diff --git a/debian/debian-9.1-amd64.json b/debian/debian-9.1-amd64.json index a048ff5f1..be51261b0 100644 --- a/debian/debian-9.1-amd64.json +++ b/debian/debian-9.1-amd64.json @@ -199,6 +199,7 @@ "no_proxy={{user `no_proxy`}}" ], "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", + "expect_disconnect": true, "scripts": [ "scripts/update.sh", "../_common/sshd.sh", diff --git a/debian/debian-9.1-i386.json b/debian/debian-9.1-i386.json index f65653769..14d99d0f1 100644 --- a/debian/debian-9.1-i386.json +++ b/debian/debian-9.1-i386.json @@ -199,6 +199,7 @@ "no_proxy={{user `no_proxy`}}" ], "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", + "expect_disconnect": true, "scripts": [ "scripts/update.sh", "../_common/sshd.sh", diff --git a/fedora/fedora-25-i386.json b/fedora/fedora-25-i386.json index 1c6c7d033..11aa6e5a5 100644 --- a/fedora/fedora-25-i386.json +++ b/fedora/fedora-25-i386.json @@ -133,6 +133,7 @@ { "environment_vars": [], "execute_command": "echo 'vagrant' | {{.Vars}} sudo -E -S bash '{{.Path}}'", + "expect_disconnect": true, "scripts": [ "scripts/swap.sh", "scripts/fix-slow-dns.sh", diff --git a/fedora/fedora-25-x86_64.json b/fedora/fedora-25-x86_64.json index 63d52bd89..7db47dce2 100644 --- a/fedora/fedora-25-x86_64.json +++ b/fedora/fedora-25-x86_64.json @@ -139,6 +139,7 @@ "no_proxy={{user `no_proxy`}}" ], "execute_command": "echo 'vagrant' | {{.Vars}} sudo -E -S bash '{{.Path}}'", + "expect_disconnect": true, "scripts": [ "scripts/swap.sh", "scripts/fix-slow-dns.sh", diff --git a/fedora/fedora-26-x86_64.json b/fedora/fedora-26-x86_64.json index cbfd75111..ff527980e 100644 --- a/fedora/fedora-26-x86_64.json +++ b/fedora/fedora-26-x86_64.json @@ -139,6 +139,7 @@ "no_proxy={{user `no_proxy`}}" ], "execute_command": "echo 'vagrant' | {{.Vars}} sudo -E -S bash '{{.Path}}'", + "expect_disconnect": true, "scripts": [ "scripts/swap.sh", "scripts/fix-slow-dns.sh", diff --git a/freebsd/freebsd-10.3-amd64.json b/freebsd/freebsd-10.3-amd64.json index b713cbab5..613d6e2c8 100644 --- a/freebsd/freebsd-10.3-amd64.json +++ b/freebsd/freebsd-10.3-amd64.json @@ -191,6 +191,7 @@ "no_proxy={{user `no_proxy`}}" ], "execute_command": "echo 'vagrant' | {{.Vars}} su -m root -c 'sh -eux {{.Path}}'", + "expect_disconnect": true, "scripts": [ "scripts/update.sh", "scripts/postinstall.sh", diff --git a/freebsd/freebsd-10.3-i386.json b/freebsd/freebsd-10.3-i386.json index aec44312f..d10d58f31 100644 --- a/freebsd/freebsd-10.3-i386.json +++ b/freebsd/freebsd-10.3-i386.json @@ -191,6 +191,7 @@ "no_proxy={{user `no_proxy`}}" ], "execute_command": "echo 'vagrant' | {{.Vars}} su -m root -c 'sh -eux {{.Path}}'", + "expect_disconnect": true, "scripts": [ "scripts/update.sh", "scripts/postinstall.sh", diff --git a/freebsd/freebsd-11.1-amd64.json b/freebsd/freebsd-11.1-amd64.json index d53b8afc8..3b9015e90 100644 --- a/freebsd/freebsd-11.1-amd64.json +++ b/freebsd/freebsd-11.1-amd64.json @@ -191,6 +191,7 @@ "no_proxy={{user `no_proxy`}}" ], "execute_command": "echo 'vagrant' | {{.Vars}} su -m root -c 'sh -eux {{.Path}}'", + "expect_disconnect": true, "scripts": [ "scripts/update.sh", "scripts/postinstall.sh", diff --git a/macos/macos-10.12.json b/macos/macos-10.12.json index 81b78fc1b..11d26b5f7 100644 --- a/macos/macos-10.12.json +++ b/macos/macos-10.12.json @@ -208,6 +208,7 @@ "no_proxy={{user `no_proxy`}}" ], "execute_command": "echo 'vagrant'| {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", + "expect_disconnect": true, "scripts": [ "scripts/hostname.sh", "scripts/update.sh", diff --git a/macos/macosx-10.10.json b/macos/macosx-10.10.json index 53917d3ce..ddee78252 100644 --- a/macos/macosx-10.10.json +++ b/macos/macosx-10.10.json @@ -208,6 +208,7 @@ "no_proxy={{user `no_proxy`}}" ], "execute_command": "echo 'vagrant'| {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", + "expect_disconnect": true, "scripts": [ "scripts/hostname.sh", "scripts/update.sh", diff --git a/macos/macosx-10.11.json b/macos/macosx-10.11.json index 59df3ea86..d62b275a4 100644 --- a/macos/macosx-10.11.json +++ b/macos/macosx-10.11.json @@ -208,6 +208,7 @@ "no_proxy={{user `no_proxy`}}" ], "execute_command": "echo 'vagrant'| {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", + "expect_disconnect": true, "scripts": [ "scripts/hostname.sh", "scripts/update.sh", diff --git a/macos/macosx-10.9.json b/macos/macosx-10.9.json index a112a55e1..1835c608d 100644 --- a/macos/macosx-10.9.json +++ b/macos/macosx-10.9.json @@ -208,6 +208,7 @@ "no_proxy={{user `no_proxy`}}" ], "execute_command": "echo 'vagrant'| {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", + "expect_disconnect": true, "scripts": [ "scripts/hostname.sh", "scripts/update.sh", diff --git a/opensuse/opensuse-leap-42.3-x86_64.json b/opensuse/opensuse-leap-42.3-x86_64.json index 7e74eda58..a960f872a 100644 --- a/opensuse/opensuse-leap-42.3-x86_64.json +++ b/opensuse/opensuse-leap-42.3-x86_64.json @@ -174,6 +174,7 @@ "no_proxy={{user `no_proxy`}}" ], "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh '{{.Path}}'", + "expect_disconnect": true, "scripts": [ "../_common/sshd.sh", "../_common/vagrant.sh", diff --git a/oraclelinux/oracle-5.11-i386.json b/oraclelinux/oracle-5.11-i386.json index a466a3aeb..a2ac3c2fe 100644 --- a/oraclelinux/oracle-5.11-i386.json +++ b/oraclelinux/oracle-5.11-i386.json @@ -138,6 +138,7 @@ "no_proxy={{user `no_proxy`}}" ], "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", + "expect_disconnect": true, "scripts": [ "../centos/scripts/update.sh", "../_common/vagrant.sh", diff --git a/oraclelinux/oracle-5.11-x86_64.json b/oraclelinux/oracle-5.11-x86_64.json index e005d31c3..0c50ccaf1 100644 --- a/oraclelinux/oracle-5.11-x86_64.json +++ b/oraclelinux/oracle-5.11-x86_64.json @@ -144,6 +144,7 @@ "no_proxy={{user `no_proxy`}}" ], "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", + "expect_disconnect": true, "scripts": [ "../centos/scripts/update.sh", "../_common/vagrant.sh", diff --git a/oraclelinux/oracle-6.9-i386.json b/oraclelinux/oracle-6.9-i386.json index 2d18adc22..fb26ce3a8 100644 --- a/oraclelinux/oracle-6.9-i386.json +++ b/oraclelinux/oracle-6.9-i386.json @@ -138,6 +138,7 @@ "no_proxy={{user `no_proxy`}}" ], "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", + "expect_disconnect": true, "scripts": [ "../centos/scripts/update.sh", "../centos/scripts/networking.sh", diff --git a/oraclelinux/oracle-6.9-x86_64.json b/oraclelinux/oracle-6.9-x86_64.json index 9c7df6ab2..bf6918d7a 100644 --- a/oraclelinux/oracle-6.9-x86_64.json +++ b/oraclelinux/oracle-6.9-x86_64.json @@ -138,6 +138,7 @@ "no_proxy={{user `no_proxy`}}" ], "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", + "expect_disconnect": true, "scripts": [ "../centos/scripts/update.sh", "../centos/scripts/networking.sh", diff --git a/oraclelinux/oracle-7.3-x86_64.json b/oraclelinux/oracle-7.3-x86_64.json index 740e0f970..8e77024b8 100644 --- a/oraclelinux/oracle-7.3-x86_64.json +++ b/oraclelinux/oracle-7.3-x86_64.json @@ -138,6 +138,7 @@ "no_proxy={{user `no_proxy`}}" ], "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", + "expect_disconnect": true, "scripts": [ "../centos/scripts/update.sh", "../centos/scripts/networking.sh", diff --git a/rhel/rhel-5.11-i386.json b/rhel/rhel-5.11-i386.json index 1e1230d45..36bfd9f2c 100644 --- a/rhel/rhel-5.11-i386.json +++ b/rhel/rhel-5.11-i386.json @@ -138,6 +138,7 @@ "no_proxy={{user `no_proxy`}}" ], "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", + "expect_disconnect": true, "scripts": [ "../_common/vagrant.sh", "../_common/sshd.sh", diff --git a/rhel/rhel-5.11-x86_64.json b/rhel/rhel-5.11-x86_64.json index a60b7f4a4..00ae129bc 100644 --- a/rhel/rhel-5.11-x86_64.json +++ b/rhel/rhel-5.11-x86_64.json @@ -144,6 +144,7 @@ "no_proxy={{user `no_proxy`}}" ], "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", + "expect_disconnect": true, "scripts": [ "../_common/vagrant.sh", "../_common/sshd.sh", diff --git a/rhel/rhel-6.9-i386.json b/rhel/rhel-6.9-i386.json index 1251eeee8..f6a3c4dc5 100644 --- a/rhel/rhel-6.9-i386.json +++ b/rhel/rhel-6.9-i386.json @@ -138,6 +138,7 @@ "no_proxy={{user `no_proxy`}}" ], "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", + "expect_disconnect": true, "scripts": [ "../centos/scripts/networking.sh", "../_common/sshd.sh", diff --git a/rhel/rhel-6.9-x86_64.json b/rhel/rhel-6.9-x86_64.json index 5b969c38c..4d0c8a099 100644 --- a/rhel/rhel-6.9-x86_64.json +++ b/rhel/rhel-6.9-x86_64.json @@ -138,6 +138,7 @@ "no_proxy={{user `no_proxy`}}" ], "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", + "expect_disconnect": true, "scripts": [ "../centos/scripts/networking.sh", "../_common/sshd.sh", diff --git a/rhel/rhel-7.4-x86_64.json b/rhel/rhel-7.4-x86_64.json index 41c92e455..b4d8ad1a3 100644 --- a/rhel/rhel-7.4-x86_64.json +++ b/rhel/rhel-7.4-x86_64.json @@ -138,6 +138,7 @@ "no_proxy={{user `no_proxy`}}" ], "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", + "expect_disconnect": true, "scripts": [ "../centos/scripts/networking.sh", "../_common/sshd.sh", diff --git a/sles/sles-12-sp2-x86_64.json b/sles/sles-12-sp2-x86_64.json index 753f1a2b8..622a02eff 100644 --- a/sles/sles-12-sp2-x86_64.json +++ b/sles/sles-12-sp2-x86_64.json @@ -154,6 +154,7 @@ "no_proxy={{user `no_proxy`}}" ], "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh '{{.Path}}'", + "expect_disconnect": true, "scripts": [ "../_common/sshd.sh", "../_common/vagrant.sh", diff --git a/sles/sles-12-sp3-x86_64.json b/sles/sles-12-sp3-x86_64.json index 2722c28b7..997db1605 100644 --- a/sles/sles-12-sp3-x86_64.json +++ b/sles/sles-12-sp3-x86_64.json @@ -154,6 +154,7 @@ "no_proxy={{user `no_proxy`}}" ], "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh '{{.Path}}'", + "expect_disconnect": true, "scripts": [ "../_common/sshd.sh", "../_common/vagrant.sh", diff --git a/solaris/solaris-10.11-x86.json b/solaris/solaris-10.11-x86.json index 883367f11..3e522580f 100644 --- a/solaris/solaris-10.11-x86.json +++ b/solaris/solaris-10.11-x86.json @@ -105,6 +105,7 @@ { "environment_vars": [], "execute_command": "/usr/local/bin/sudo {{.Path}}", + "expect_disconnect": true, "scripts": [ "scripts/solaris-10/vmtools.sh", "scripts/solaris-10/minimize.sh" diff --git a/solaris/solaris-11-x86.json b/solaris/solaris-11-x86.json index 2549765e6..c2ca788b6 100644 --- a/solaris/solaris-11-x86.json +++ b/solaris/solaris-11-x86.json @@ -125,6 +125,7 @@ { "environment_vars": [], "execute_command": "echo 'vagrant'|sudo -S bash {{.Path}}", + "expect_disconnect": true, "scripts": [ "scripts/update.sh", "scripts/vagrant.sh", diff --git a/ubuntu/ubuntu-14.04-amd64.json b/ubuntu/ubuntu-14.04-amd64.json index 983fe1ca8..51a8cac5d 100644 --- a/ubuntu/ubuntu-14.04-amd64.json +++ b/ubuntu/ubuntu-14.04-amd64.json @@ -257,6 +257,7 @@ "no_proxy={{user `no_proxy`}}" ], "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", + "expect_disconnect": true, "scripts": [ "scripts/update.sh", "../_common/sshd.sh", diff --git a/ubuntu/ubuntu-14.04-i386.json b/ubuntu/ubuntu-14.04-i386.json index bcd988149..1b15fffd2 100644 --- a/ubuntu/ubuntu-14.04-i386.json +++ b/ubuntu/ubuntu-14.04-i386.json @@ -222,6 +222,7 @@ "no_proxy={{user `no_proxy`}}" ], "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", + "expect_disconnect": true, "scripts": [ "scripts/update.sh", "../_common/sshd.sh", diff --git a/ubuntu/ubuntu-16.04-amd64.json b/ubuntu/ubuntu-16.04-amd64.json index 62483951b..1e279c83e 100644 --- a/ubuntu/ubuntu-16.04-amd64.json +++ b/ubuntu/ubuntu-16.04-amd64.json @@ -266,6 +266,7 @@ "no_proxy={{user `no_proxy`}}" ], "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", + "expect_disconnect": true, "scripts": [ "scripts/update.sh", "../_common/sshd.sh", diff --git a/ubuntu/ubuntu-16.04-i386.json b/ubuntu/ubuntu-16.04-i386.json index f2297168a..5792914eb 100644 --- a/ubuntu/ubuntu-16.04-i386.json +++ b/ubuntu/ubuntu-16.04-i386.json @@ -230,6 +230,7 @@ "no_proxy={{user `no_proxy`}}" ], "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", + "expect_disconnect": true, "scripts": [ "scripts/update.sh", "../_common/sshd.sh", diff --git a/ubuntu/ubuntu-17.04-amd64.json b/ubuntu/ubuntu-17.04-amd64.json index 8a9d62ebc..a060e3a4b 100644 --- a/ubuntu/ubuntu-17.04-amd64.json +++ b/ubuntu/ubuntu-17.04-amd64.json @@ -262,6 +262,7 @@ "no_proxy={{user `no_proxy`}}" ], "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", + "expect_disconnect": true, "scripts": [ "scripts/update.sh", "../_common/sshd.sh", diff --git a/ubuntu/ubuntu-17.04-i386.json b/ubuntu/ubuntu-17.04-i386.json index 55aa4c482..a62ee6d8f 100644 --- a/ubuntu/ubuntu-17.04-i386.json +++ b/ubuntu/ubuntu-17.04-i386.json @@ -232,6 +232,7 @@ "no_proxy={{user `no_proxy`}}" ], "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", + "expect_disconnect": true, "scripts": [ "scripts/update.sh", "../_common/sshd.sh", From e2ac0095c61b5cd8314443a5beb28ab053081450 Mon Sep 17 00:00:00 2001 From: Kaurin <milos.kaurin@gmail.com> Date: Sun, 17 Sep 2017 01:02:01 +0100 Subject: [PATCH 0708/1622] Removed unecessary comments --- ubuntu/scripts/networking.sh | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/ubuntu/scripts/networking.sh b/ubuntu/scripts/networking.sh index 8913fc407..f58d9af5c 100644 --- a/ubuntu/scripts/networking.sh +++ b/ubuntu/scripts/networking.sh @@ -1,18 +1,5 @@ #!/bin/sh -eux -# ubuntu_version="`lsb_release -r | awk '{print $2}'`"; -# major_version="`echo $ubuntu_version | awk -F. '{print $1}'`"; - -# if [ "$major_version" -le "15" ]; then -# echo "Disabling automatic udev rules for network interfaces in Ubuntu" -# # Disable automatic udev rules for network interfaces in Ubuntu, -# # source: http://6.ptmc.org/164/ -# rm -f /etc/udev/rules.d/70-persistent-net.rules; -# mkdir -p /etc/udev/rules.d/70-persistent-net.rules; -# rm -f /lib/udev/rules.d/75-persistent-net-generator.rules; -# rm -rf /dev/.udev/ /var/lib/dhcp3/* /var/lib/dhcp/*; -# fi - # Set up eth0 echo "auto eth0\niface eth0 inet dhcp" >> /etc/network/interfaces.d/eth0.cfg From 96a1e48a405d5e94320c8752a745cc6b645ad5b8 Mon Sep 17 00:00:00 2001 From: Kaurin <milos.kaurin@gmail.com> Date: Mon, 18 Sep 2017 17:30:50 +0100 Subject: [PATCH 0709/1622] Reverting ubuntu to 14.04.01 due to HWE reasons --- ubuntu/ubuntu-14.04-amd64.json | 6 +++--- ubuntu/ubuntu-14.04-i386.json | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/ubuntu/ubuntu-14.04-amd64.json b/ubuntu/ubuntu-14.04-amd64.json index b3e96797b..f8616b77a 100644 --- a/ubuntu/ubuntu-14.04-amd64.json +++ b/ubuntu/ubuntu-14.04-amd64.json @@ -294,12 +294,12 @@ "https_proxy": "{{env `https_proxy`}}", "hyperv_generation": "2", "hyperv_switch": "{{env `hyperv_switch`}}", - "iso_checksum": "07e4bb5569814eab41fafac882ba127893e3ff0bdb7ec931c9b2d040e3e94e7a", + "iso_checksum": "946a6077af6f5f95a51f82fdc44051c7aa19f9cfc5f737954845a6050543d7c2", "iso_checksum_type": "sha256", - "iso_name": "ubuntu-14.04.4-server-amd64.iso", + "iso_name": "ubuntu-14.04.1-server-amd64.iso", "memory": "1024", "mirror": "http://old-releases.ubuntu.com/releases", - "mirror_directory": "14.04.4", + "mirror_directory": "14.04.1", "name": "ubuntu-14.04", "no_proxy": "{{env `no_proxy`}}", "preseed_path": "preseed.cfg", diff --git a/ubuntu/ubuntu-14.04-i386.json b/ubuntu/ubuntu-14.04-i386.json index e9c025d6d..ac0501c01 100644 --- a/ubuntu/ubuntu-14.04-i386.json +++ b/ubuntu/ubuntu-14.04-i386.json @@ -256,12 +256,12 @@ "headless": "", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", - "iso_checksum": "e20cf9e0812b52287ca22ac1815bc933c0cfef2be88191110b697d8943bef19e", + "iso_checksum": "976044842804eafc18390505508958b559c131211160ecae5e60694bdf171f78", "iso_checksum_type": "sha256", - "iso_name": "ubuntu-14.04.4-server-i386.iso", + "iso_name": "ubuntu-14.04.1-server-i386.iso", "memory": "1024", "mirror": "http://old-releases.ubuntu.com/releases", - "mirror_directory": "14.04.4", + "mirror_directory": "14.04.1", "name": "ubuntu-14.04-i386", "no_proxy": "{{env `no_proxy`}}", "preseed_path": "preseed.cfg", From 6ffe3ee79f2d0a2619bf8cdf3913c151c894788a Mon Sep 17 00:00:00 2001 From: Jason McNew <foonix@yahoo.com> Date: Tue, 3 Oct 2017 12:11:46 -0700 Subject: [PATCH 0710/1622] Fix SLES autoinst xml path. --- sles/sles-12-sp2-x86_64.json | 2 +- sles/sles-12-sp3-x86_64.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sles/sles-12-sp2-x86_64.json b/sles/sles-12-sp2-x86_64.json index 622a02eff..f29a37c64 100644 --- a/sles/sles-12-sp2-x86_64.json +++ b/sles/sles-12-sp2-x86_64.json @@ -175,7 +175,7 @@ "_DOWNLOAD_SITE": "https://www.suse.com/products/server/download", "_README": "You must download the automated installer iso from the following page, and then place it in the packer_cache dir", "arch": "64", - "autoinst_cfg": "sles-12/sles-12-sp2-x86_64-autoinst.xml", + "autoinst_cfg": "sles-12-sp2-x86_64-autoinst.xml", "box_basename": "sles-12-sp2", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", diff --git a/sles/sles-12-sp3-x86_64.json b/sles/sles-12-sp3-x86_64.json index 997db1605..19099ff6f 100644 --- a/sles/sles-12-sp3-x86_64.json +++ b/sles/sles-12-sp3-x86_64.json @@ -175,7 +175,7 @@ "_DOWNLOAD_SITE": "https://www.suse.com/products/server/download", "_README": "You must download the automated installer iso from the following page, and then place it in the packer_cache dir", "arch": "64", - "autoinst_cfg": "sles-12/sles-12-sp3-x86_64-autoinst.xml", + "autoinst_cfg": "sles-12-sp3-x86_64-autoinst.xml", "box_basename": "sles-12-sp3", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", From 7d9f7eb74ee485b14dcfd01fa3ec5592ebb2742b Mon Sep 17 00:00:00 2001 From: Seth Thomas <sthomas@chef.io> Date: Wed, 4 Oct 2017 13:42:41 -0700 Subject: [PATCH 0711/1622] Fixing #909 Signed-off-by: Seth Thomas <sthomas@chef.io> --- sles/sles-12-sp3-x86_64.json | 1 - 1 file changed, 1 deletion(-) diff --git a/sles/sles-12-sp3-x86_64.json b/sles/sles-12-sp3-x86_64.json index 997db1605..be1b87908 100644 --- a/sles/sles-12-sp3-x86_64.json +++ b/sles/sles-12-sp3-x86_64.json @@ -188,7 +188,6 @@ "iso_checksum_type": "sha256", "iso_name": "SLE-12-SP3-Server-DVD-x86_64-GM-DVD1.iso", "memory": "1024", - "metadata": "floppy/dummy_metadata.json", "mirror": "./packer_cache", "name": "sles-12-sp3", "template": "sles-12-sp3-x86_64", From 955f7a16f73089430c8c78fde02b6ab80388e2c0 Mon Sep 17 00:00:00 2001 From: Daniel Mai <daniel@danielmai.net> Date: Sat, 7 Oct 2017 00:57:26 -0700 Subject: [PATCH 0712/1622] Set default HOME_DIR in virtualbox.sh This is consistent with the other builder scripts. Also, removing the hardcoded /home/vagrant string allows non-vagrant user images to be created. --- _common/virtualbox.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/_common/virtualbox.sh b/_common/virtualbox.sh index 23edc9691..c1e34095c 100644 --- a/_common/virtualbox.sh +++ b/_common/virtualbox.sh @@ -1,8 +1,11 @@ #!/bin/sh -eux +# set a default HOME_DIR environment variable if not set +HOME_DIR="${HOME_DIR:-/home/vagrant}"; + case "$PACKER_BUILDER_TYPE" in virtualbox-iso|virtualbox-ovf) - VER="`cat /home/vagrant/.vbox_version`"; + VER="`cat $HOME_DIR/.vbox_version`"; ISO="VBoxGuestAdditions_$VER.iso"; mkdir -p /tmp/vbox; mount -o loop $HOME_DIR/$ISO /tmp/vbox; From 41ebad39fa92ce4b4761f195c5326a601a3cd0fb Mon Sep 17 00:00:00 2001 From: Kentaro Hayashi <hayashi@clear-code.com> Date: Thu, 12 Oct 2017 15:50:12 +0900 Subject: [PATCH 0713/1622] Support Debian 9.2 point release See https://www.debian.org/News/2017/20171007 Signed-off-by: Kentaro Hayashi <hayashi@clear-code.com> --- .../{debian-9.1-amd64.json => debian-9.2-amd64.json} | 12 ++++++------ .../{debian-9.1-i386.json => debian-9.2-i386.json} | 12 ++++++------ 2 files changed, 12 insertions(+), 12 deletions(-) rename debian/{debian-9.1-amd64.json => debian-9.2-amd64.json} (96%) rename debian/{debian-9.1-i386.json => debian-9.2-i386.json} (96%) diff --git a/debian/debian-9.1-amd64.json b/debian/debian-9.2-amd64.json similarity index 96% rename from debian/debian-9.1-amd64.json rename to debian/debian-9.2-amd64.json index be51261b0..9fc21333c 100644 --- a/debian/debian-9.1-amd64.json +++ b/debian/debian-9.2-amd64.json @@ -217,7 +217,7 @@ } ], "variables": { - "box_basename": "debian-9.1", + "box_basename": "debian-9.2", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", "disk_size": "40960", @@ -225,16 +225,16 @@ "headless": "", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", - "iso_checksum": "c9e070074de83aa22e141f59a423e5210a5019b369ef1efe61a2afd44ba8f371", + "iso_checksum": "bfe87c28bc842956cb31cd06737e821cdb67efcd043f64384c3688634bf6914a", "iso_checksum_type": "sha256", - "iso_name": "debian-9.1.0-amd64-netinst.iso", + "iso_name": "debian-9.2.0-amd64-netinst.iso", "memory": "1024", "mirror": "http://cdimage.debian.org/cdimage/release", - "mirror_directory": "9.1.0/amd64/iso-cd", - "name": "debian-9.1", + "mirror_directory": "9.2.0/amd64/iso-cd", + "name": "debian-9.2", "no_proxy": "{{env `no_proxy`}}", "preseed_path": "debian-8/preseed.cfg", - "template": "debian-9.1-amd64", + "template": "debian-9.2-amd64", "version": "TIMESTAMP" } } diff --git a/debian/debian-9.1-i386.json b/debian/debian-9.2-i386.json similarity index 96% rename from debian/debian-9.1-i386.json rename to debian/debian-9.2-i386.json index 14d99d0f1..eceed88bb 100644 --- a/debian/debian-9.1-i386.json +++ b/debian/debian-9.2-i386.json @@ -217,7 +217,7 @@ } ], "variables": { - "box_basename": "debian-9.1-i386", + "box_basename": "debian-9.2-i386", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", "disk_size": "40960", @@ -225,16 +225,16 @@ "headless": "", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", - "iso_checksum": "66ae877bb9e19bd8364db2a62e1657376ab4f56f70a833f28724de6a2133b25a", + "iso_checksum": "c038d9a004f45d5d9272e24733b70af303a6e2f32192f684df7014877ba22d99", "iso_checksum_type": "sha256", - "iso_name": "debian-9.1.0-i386-netinst.iso", + "iso_name": "debian-9.2.0-i386-netinst.iso", "memory": "1024", "mirror": "http://cdimage.debian.org/cdimage/release", - "mirror_directory": "9.1.0/i386/iso-cd", - "name": "debian-9.1-i386", + "mirror_directory": "9.2.0/i386/iso-cd", + "name": "debian-9.2-i386", "no_proxy": "{{env `no_proxy`}}", "preseed_path": "debian-8/preseed.cfg", - "template": "debian-9.1-i386", + "template": "debian-9.2-i386", "version": "TIMESTAMP" } } From 45117a11edbe80c6514e14c031406a5325d82acc Mon Sep 17 00:00:00 2001 From: Seth Thomas <sthomas@chef.io> Date: Tue, 17 Oct 2017 09:09:44 -0400 Subject: [PATCH 0714/1622] Fix #912 - remove unneeded script Signed-off-by: Seth Thomas <sthomas@chef.io> --- centos/scripts/vmware.sh | 26 -------------------------- 1 file changed, 26 deletions(-) delete mode 100644 centos/scripts/vmware.sh diff --git a/centos/scripts/vmware.sh b/centos/scripts/vmware.sh deleted file mode 100644 index 5d0864bc9..000000000 --- a/centos/scripts/vmware.sh +++ /dev/null @@ -1,26 +0,0 @@ -#!/bin/sh -eux - -# set a default HOME_DIR environment variable if not set -HOME_DIR="${HOME_DIR:-/home/vagrant}"; - -case "$PACKER_BUILDER_TYPE" in -vmware-iso|vmware-vmx) - mkdir -p /tmp/vmware-archive; - TOOLS_PATH="/tmp/VMwareTools-10.1.0-4449150.tar.gz"; - VER="`echo "${TOOLS_PATH}" | cut -f2 -d'-'`"; - MAJ_VER="`echo ${VER} | cut -d '.' -f 1`"; - - echo "VMware Tools Version: $VER"; - - tar xzf ${TOOLS_PATH} -C /tmp/vmware-archive; - ls -alh /tmp/vmware-archive; - if [ "${MAJ_VER}" -lt "10" ]; then - /tmp/vmware-archive/vmware-tools-distrib/vmware-install.pl --default; - else - /tmp/vmware-archive/vmware-tools-distrib/vmware-install.pl --default --force-install; - fi - rm -rf /tmp/vmware-archive; - rm -rf /tmp/VMwareTools-10.1.0-4449150.tar.gz; - rm -f $HOME_DIR/*.iso; - ;; -esac From 57d5fa695f882c5a6109d5c357934be7d4947427 Mon Sep 17 00:00:00 2001 From: Seth Thomas <sthomas@chef.io> Date: Tue, 17 Oct 2017 20:03:12 -0400 Subject: [PATCH 0715/1622] Add FreeBSD 10.4 Signed-off-by: Seth Thomas <sthomas@chef.io> --- builds.yml | 4 +- freebsd/freebsd-10.4-amd64.json | 229 ++++++++++++++++++++++++++++++++ freebsd/freebsd-10.4-i386.json | 229 ++++++++++++++++++++++++++++++++ 3 files changed, 461 insertions(+), 1 deletion(-) create mode 100644 freebsd/freebsd-10.4-amd64.json create mode 100644 freebsd/freebsd-10.4-i386.json diff --git a/builds.yml b/builds.yml index 8e5735016..0e960794c 100644 --- a/builds.yml +++ b/builds.yml @@ -34,7 +34,7 @@ public: '8.9': - amd64 - i386 - '9.1': + '9.2': - amd64 fedora: '25': @@ -44,6 +44,8 @@ public: freebsd: '10.3': - amd64 + '10.4': + - amd64 '11.1': - amd64 opensuse-leap: diff --git a/freebsd/freebsd-10.4-amd64.json b/freebsd/freebsd-10.4-amd64.json new file mode 100644 index 000000000..43786a8e4 --- /dev/null +++ b/freebsd/freebsd-10.4-amd64.json @@ -0,0 +1,229 @@ +{ + "builders": [ + { + "boot_command": [ + "<esc><wait>", + "boot -s<wait>", + "<enter><wait>", + "<wait10><wait10>", + "/bin/sh<enter><wait>", + "mdmfs -s 100m md1 /tmp<enter><wait>", + "mdmfs -s 100m md2 /mnt<enter><wait>", + "dhclient -l /tmp/dhclient.lease.em0 em0<enter><wait>", + "fetch -o /tmp/install.sh http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} && chmod +x /tmp/install.sh && /tmp/install.sh {{ .Name }}<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": "{{user `disk_size`}}", + "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "guest_os_type": "FreeBSD_64", + "headless": "{{ user `headless` }}", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-virtualbox", + "shutdown_command": "echo 'vagrant' | su -m root -c 'shutdown -p now'", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "virtualbox-iso", + "vboxmanage": [ + [ + "modifyvm", + "{{.Name}}", + "--memory", + "{{ user `memory` }}" + ], + [ + "modifyvm", + "{{.Name}}", + "--cpus", + "{{ user `cpus` }}" + ] + ], + "virtualbox_version_file": ".vbox_version", + "vm_name": "{{ user `template` }}" + }, + { + "boot_command": [ + "<esc><wait>", + "boot -s<wait>", + "<enter><wait>", + "<wait10><wait10>", + "/bin/sh<enter><wait>", + "mdmfs -s 100m md1 /tmp<enter><wait>", + "mdmfs -s 100m md2 /mnt<enter><wait>", + "dhclient -l /tmp/dhclient.lease.em0 em0<enter><wait>", + "<wait5>", + "fetch -o /tmp/install.sh http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} && chmod +x /tmp/install.sh && /tmp/install.sh {{ .Name }}<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": "{{user `disk_size`}}", + "guest_os_type": "freebsd-64", + "headless": "{{ user `headless` }}", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-vmare", + "shutdown_command": "echo 'vagrant' | su -m root -c 'shutdown -p now'", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "tools_upload_flavor": "freebsd", + "type": "vmware-iso", + "vm_name": "{{ user `template` }}", + "vmx_data": { + "cpuid.coresPerSocket": "1", + "memsize": "{{ user `memory` }}", + "numvcpus": "{{ user `cpus` }}" + }, + "vmx_remove_ethernet_interfaces": true + }, + { + "boot_command": [ + "<esc><wait>", + "boot -s<wait>", + "<enter><wait>", + "<wait10><wait10>", + "/bin/sh<enter><wait>", + "mdmfs -s 100m md1 /tmp<enter><wait>", + "mdmfs -s 100m md2 /mnt<enter><wait>", + "dhclient -l /tmp/dhclient.lease.em0 em0<enter><wait>", + "fetch -o /tmp/install.sh http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} && chmod +x /tmp/install.sh && /tmp/install.sh {{ .Name }}<enter><wait>" + ], + "boot_wait": "8s", + "disk_size": "{{user `disk_size`}}", + "guest_os_type": "freebsd", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-parallels", + "parallels_tools_mode": "disable", + "prlctl": [ + [ + "set", + "{{.Name}}", + "--memsize", + "{{ user `memory` }}" + ], + [ + "set", + "{{.Name}}", + "--cpus", + "{{ user `cpus` }}" + ], + [ + "set", + "{{.Name}}", + "--device-set", + "cdrom0", + "--iface", + "ide" + ], + [ + "set", + "{{.Name}}", + "--device-del", + "fdd0" + ], + [ + "set", + "{{.Name}}", + "--device-del", + "parallel0" + ] + ], + "prlctl_version_file": ".prlctl_version", + "shutdown_command": "echo 'vagrant' | su -m root -c 'shutdown -p now'", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "parallels-iso", + "vm_name": "{{ user `template` }}" + }, + { + "boot_command": [ + "<esc><wait>", + "boot -s<wait>", + "<enter><wait>", + "<wait10><wait10>", + "/bin/sh<enter><wait>", + "mdmfs -s 100m md1 /tmp<enter><wait>", + "mdmfs -s 100m md2 /mnt<enter><wait>", + "dhclient -l /tmp/dhclient.lease.vtnet0 vtnet0<enter><wait>", + "fetch -o /tmp/install.sh http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} && chmod +x /tmp/install.sh && /tmp/install.sh {{ .Name }} vtnet0<enter><wait>" + ], + "boot_wait": "7s", + "disk_size": "{{user `disk_size`}}", + "headless": "{{ user `headless` }}", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-qemu", + "shutdown_command": "echo 'vagrant' | su -m root -c 'shutdown -p now'", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "qemu", + "vm_name": "{{ user `template` }}" + } + ], + "post-processors": [ + { + "output": "../builds/{{user `box_basename`}}.{{.Provider}}.box", + "type": "vagrant", + "vagrantfile_template": "vagrantfile_templates/freebsd.rb" + } + ], + "provisioners": [ + { + "environment_vars": [ + "HOME_DIR=/home/vagrant", + "http_proxy={{user `http_proxy`}}", + "https_proxy={{user `https_proxy`}}", + "no_proxy={{user `no_proxy`}}" + ], + "execute_command": "echo 'vagrant' | {{.Vars}} su -m root -c 'sh -eux {{.Path}}'", + "expect_disconnect": true, + "scripts": [ + "scripts/update.sh", + "scripts/postinstall.sh", + "scripts/sudoers.sh", + "../_common/vagrant.sh", + "scripts/vmtools.sh", + "scripts/cleanup.sh", + "scripts/minimize.sh" + ], + "type": "shell" + } + ], + "variables": { + "box_basename": "freebsd-10.4", + "build_timestamp": "{{isotime \"20060102150405\"}}", + "cpus": "1", + "disk_size": "40960", + "git_revision": "__unknown_git_revision__", + "headless": "", + "http_proxy": "{{env `http_proxy`}}", + "https_proxy": "{{env `https_proxy`}}", + "install_path": "freebsd-10/install.sh", + "iso_checksum": "195a270b4fd2db4f9e3a1451384f2d3bfa699696d110873b62bcf7540524da0d", + "iso_checksum_type": "sha256", + "iso_name": "FreeBSD-10.4-RELEASE-amd64-dvd1.iso", + "memory": "1024", + "mirror": "https://download.freebsd.org/ftp", + "mirror_directory": "releases/amd64/amd64/ISO-IMAGES/10.4", + "name": "freebsd-10.4", + "no_proxy": "{{env `no_proxy`}}", + "template": "freebsd-10.4-amd64", + "version": "TIMESTAMP" + } +} + diff --git a/freebsd/freebsd-10.4-i386.json b/freebsd/freebsd-10.4-i386.json new file mode 100644 index 000000000..b47808207 --- /dev/null +++ b/freebsd/freebsd-10.4-i386.json @@ -0,0 +1,229 @@ +{ + "builders": [ + { + "boot_command": [ + "<esc><wait>", + "boot -s<wait>", + "<enter><wait>", + "<wait10><wait10>", + "/bin/sh<enter><wait>", + "mdmfs -s 100m md1 /tmp<enter><wait>", + "mdmfs -s 100m md2 /mnt<enter><wait>", + "dhclient -l /tmp/dhclient.lease.em0 em0<enter><wait>", + "fetch -o /tmp/install.sh http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} && chmod +x /tmp/install.sh && /tmp/install.sh {{ .Name }}<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": "{{user `disk_size`}}", + "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "guest_os_type": "FreeBSD", + "headless": "{{ user `headless` }}", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-virtualbox", + "shutdown_command": "echo 'vagrant' | su -m root -c 'shutdown -p now'", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "virtualbox-iso", + "vboxmanage": [ + [ + "modifyvm", + "{{.Name}}", + "--memory", + "{{ user `memory` }}" + ], + [ + "modifyvm", + "{{.Name}}", + "--cpus", + "{{ user `cpus` }}" + ] + ], + "virtualbox_version_file": ".vbox_version", + "vm_name": "{{ user `template` }}" + }, + { + "boot_command": [ + "<esc><wait>", + "boot -s<wait>", + "<enter><wait>", + "<wait10><wait10>", + "/bin/sh<enter><wait>", + "mdmfs -s 100m md1 /tmp<enter><wait>", + "mdmfs -s 100m md2 /mnt<enter><wait>", + "dhclient -l /tmp/dhclient.lease.em0 em0<enter><wait>", + "<wait5>", + "fetch -o /tmp/install.sh http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} && chmod +x /tmp/install.sh && /tmp/install.sh {{ .Name }}<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": "{{user `disk_size`}}", + "guest_os_type": "freebsd", + "headless": "{{ user `headless` }}", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-vmare", + "shutdown_command": "echo 'vagrant' | su -m root -c 'shutdown -p now'", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "tools_upload_flavor": "freebsd", + "type": "vmware-iso", + "vm_name": "{{ user `template` }}", + "vmx_data": { + "cpuid.coresPerSocket": "1", + "memsize": "{{ user `memory` }}", + "numvcpus": "{{ user `cpus` }}" + }, + "vmx_remove_ethernet_interfaces": true + }, + { + "boot_command": [ + "<esc><wait>", + "boot -s<wait>", + "<enter><wait>", + "<wait10><wait10>", + "/bin/sh<enter><wait>", + "mdmfs -s 100m md1 /tmp<enter><wait>", + "mdmfs -s 100m md2 /mnt<enter><wait>", + "dhclient -l /tmp/dhclient.lease.em0 em0<enter><wait>", + "fetch -o /tmp/install.sh http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} && chmod +x /tmp/install.sh && /tmp/install.sh {{ .Name }}<enter><wait>" + ], + "boot_wait": "8s", + "disk_size": "{{user `disk_size`}}", + "guest_os_type": "freebsd", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-parallels", + "parallels_tools_mode": "disable", + "prlctl": [ + [ + "set", + "{{.Name}}", + "--memsize", + "{{ user `memory` }}" + ], + [ + "set", + "{{.Name}}", + "--cpus", + "{{ user `cpus` }}" + ], + [ + "set", + "{{.Name}}", + "--device-set", + "cdrom0", + "--iface", + "ide" + ], + [ + "set", + "{{.Name}}", + "--device-del", + "fdd0" + ], + [ + "set", + "{{.Name}}", + "--device-del", + "parallel0" + ] + ], + "prlctl_version_file": ".prlctl_version", + "shutdown_command": "echo 'vagrant' | su -m root -c 'shutdown -p now'", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "parallels-iso", + "vm_name": "{{ user `template` }}" + }, + { + "boot_command": [ + "<esc><wait>", + "boot -s<wait>", + "<enter><wait>", + "<wait10><wait10>", + "/bin/sh<enter><wait>", + "mdmfs -s 100m md1 /tmp<enter><wait>", + "mdmfs -s 100m md2 /mnt<enter><wait>", + "dhclient -l /tmp/dhclient.lease.vtnet0 vtnet0<enter><wait>", + "fetch -o /tmp/install.sh http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} && chmod +x /tmp/install.sh && /tmp/install.sh {{ .Name }}<enter><wait>" + ], + "boot_wait": "7s", + "disk_size": "{{user `disk_size`}}", + "headless": "{{ user `headless` }}", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-qemu", + "shutdown_command": "echo 'vagrant' | su -m root -c 'shutdown -p now'", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "qemu", + "vm_name": "{{ user `template` }}" + } + ], + "post-processors": [ + { + "output": "../builds/{{user `box_basename`}}.{{.Provider}}.box", + "type": "vagrant", + "vagrantfile_template": "vagrantfile_templates/freebsd.rb" + } + ], + "provisioners": [ + { + "environment_vars": [ + "HOME_DIR=/home/vagrant", + "http_proxy={{user `http_proxy`}}", + "https_proxy={{user `https_proxy`}}", + "no_proxy={{user `no_proxy`}}" + ], + "execute_command": "echo 'vagrant' | {{.Vars}} su -m root -c 'sh -eux {{.Path}}'", + "expect_disconnect": true, + "scripts": [ + "scripts/update.sh", + "scripts/postinstall.sh", + "scripts/sudoers.sh", + "../_common/vagrant.sh", + "scripts/vmtools.sh", + "scripts/cleanup.sh", + "scripts/minimize.sh" + ], + "type": "shell" + } + ], + "variables": { + "box_basename": "freebsd-10.4-i386", + "build_timestamp": "{{isotime \"20060102150405\"}}", + "cpus": "1", + "disk_size": "40960", + "git_revision": "__unknown_git_revision__", + "headless": "", + "http_proxy": "{{env `http_proxy`}}", + "https_proxy": "{{env `https_proxy`}}", + "install_path": "freebsd-10/install.sh", + "iso_checksum": "006a0f77b2d5ddfc1491a72b04b7246971ac35adb4da47a766228b36650a56c6", + "iso_checksum_type": "sha256", + "iso_name": "FreeBSD-10.4-RELEASE-i386-dvd1.iso", + "memory": "1024", + "mirror": "https://download.freebsd.org/ftp", + "mirror_directory": "releases/i386/i386/ISO-IMAGES/10.4", + "name": "freebsd-10.4-i386", + "no_proxy": "{{env `no_proxy`}}", + "template": "freebsd-10.4-i386", + "version": "TIMESTAMP" + } +} + From c0a2fd6db3b4fcc67c638fbdef696e061033c778 Mon Sep 17 00:00:00 2001 From: Joe Ferguson <joe@joeferguson.me> Date: Tue, 24 Oct 2017 09:12:10 -0500 Subject: [PATCH 0716/1622] =?UTF-8?q?=F0=9F=9A=91=20Update=20path=20to=20p?= =?UTF-8?q?reseed-hyperv.cfg=20to=20remove=20ubuntu/=20folder=20path?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ubuntu/ubuntu-14.04-amd64.json | 2 +- ubuntu/ubuntu-16.04-amd64.json | 2 +- ubuntu/ubuntu-17.04-amd64.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ubuntu/ubuntu-14.04-amd64.json b/ubuntu/ubuntu-14.04-amd64.json index 593b31c49..a3aa93b11 100644 --- a/ubuntu/ubuntu-14.04-amd64.json +++ b/ubuntu/ubuntu-14.04-amd64.json @@ -221,7 +221,7 @@ "<esc><wait10><esc><esc><enter><wait>", "set gfxpayload=keep<enter><wait>", "linux /install/vmlinuz ", - "preseed/url=http://{{.HTTPIP}}:{{.HTTPPort}}/ubuntu/preseed-hyperv.cfg ", + "preseed/url=http://{{.HTTPIP}}:{{.HTTPPort}}/preseed-hyperv.cfg ", "debian-installer=en_US auto locale=en_US kbd-chooser/method=us ", "hostname={{.Name}} ", "fb=false debconf/frontend=noninteractive ", diff --git a/ubuntu/ubuntu-16.04-amd64.json b/ubuntu/ubuntu-16.04-amd64.json index 3d627860f..27bb0fe3c 100644 --- a/ubuntu/ubuntu-16.04-amd64.json +++ b/ubuntu/ubuntu-16.04-amd64.json @@ -230,7 +230,7 @@ "<esc><wait10><esc><esc><enter><wait>", "set gfxpayload=1024x768<enter>", "linux /install/vmlinuz ", - "preseed/url=http://{{.HTTPIP}}:{{.HTTPPort}}/ubuntu/preseed-hyperv.cfg ", + "preseed/url=http://{{.HTTPIP}}:{{.HTTPPort}}/preseed-hyperv.cfg ", "debian-installer=en_US auto locale=en_US kbd-chooser/method=us ", "hostname={{.Name}} ", "fb=false debconf/frontend=noninteractive ", diff --git a/ubuntu/ubuntu-17.04-amd64.json b/ubuntu/ubuntu-17.04-amd64.json index 3486cf938..3f67f43ce 100644 --- a/ubuntu/ubuntu-17.04-amd64.json +++ b/ubuntu/ubuntu-17.04-amd64.json @@ -226,7 +226,7 @@ "<esc><wait10><esc><esc><enter><wait>", "set gfxpayload=1024x768<enter>", "linux /install/vmlinuz ", - "preseed/url=http://{{.HTTPIP}}:{{.HTTPPort}}/ubuntu/preseed-hyperv.cfg ", + "preseed/url=http://{{.HTTPIP}}:{{.HTTPPort}}/preseed-hyperv.cfg ", "debian-installer=en_US auto locale=en_US kbd-chooser/method=us ", "hostname={{.Name}} ", "fb=false debconf/frontend=noninteractive ", From cf3e064e56d618d82c85f9c2ea7b90473dd3e209 Mon Sep 17 00:00:00 2001 From: Seth Thomas <sthomas@chef.io> Date: Tue, 24 Oct 2017 11:36:32 -0400 Subject: [PATCH 0717/1622] Updating for 9.2.1 hotfix release Signed-off-by: Seth Thomas <sthomas@chef.io> --- debian/debian-9.2-amd64.json | 6 +++--- debian/debian-9.2-i386.json | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/debian/debian-9.2-amd64.json b/debian/debian-9.2-amd64.json index 9fc21333c..1a07b0501 100644 --- a/debian/debian-9.2-amd64.json +++ b/debian/debian-9.2-amd64.json @@ -225,12 +225,12 @@ "headless": "", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", - "iso_checksum": "bfe87c28bc842956cb31cd06737e821cdb67efcd043f64384c3688634bf6914a", + "iso_checksum": "ec78bc48b48d676775b60eda41528ec33c151c2ce7414a12b13d9b73d34de544", "iso_checksum_type": "sha256", - "iso_name": "debian-9.2.0-amd64-netinst.iso", + "iso_name": "debian-9.2.1-amd64-netinst.iso", "memory": "1024", "mirror": "http://cdimage.debian.org/cdimage/release", - "mirror_directory": "9.2.0/amd64/iso-cd", + "mirror_directory": "9.2.1/amd64/iso-cd", "name": "debian-9.2", "no_proxy": "{{env `no_proxy`}}", "preseed_path": "debian-8/preseed.cfg", diff --git a/debian/debian-9.2-i386.json b/debian/debian-9.2-i386.json index eceed88bb..f274bbf81 100644 --- a/debian/debian-9.2-i386.json +++ b/debian/debian-9.2-i386.json @@ -225,12 +225,12 @@ "headless": "", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", - "iso_checksum": "c038d9a004f45d5d9272e24733b70af303a6e2f32192f684df7014877ba22d99", + "iso_checksum": "464e2b960a556e7640d239d1268c51a3ae59c0a8c295cd0f4175cff0a1302095", "iso_checksum_type": "sha256", - "iso_name": "debian-9.2.0-i386-netinst.iso", + "iso_name": "debian-9.2.1-i386-netinst.iso", "memory": "1024", "mirror": "http://cdimage.debian.org/cdimage/release", - "mirror_directory": "9.2.0/i386/iso-cd", + "mirror_directory": "9.2.1/i386/iso-cd", "name": "debian-9.2-i386", "no_proxy": "{{env `no_proxy`}}", "preseed_path": "debian-8/preseed.cfg", From f8b7367d3757c5dd4f16b075f671413891dbf1f0 Mon Sep 17 00:00:00 2001 From: Seth Thomas <sthomas@chef.io> Date: Tue, 24 Oct 2017 12:38:18 -0400 Subject: [PATCH 0718/1622] Put packer build folders back under Signed-off-by: Seth Thomas <sthomas@chef.io> --- centos/centos-6.9-i386.json | 10 +++++----- centos/centos-6.9-x86_64.json | 10 +++++----- centos/centos-7.4-x86_64.json | 10 +++++----- debian/debian-7.11-amd64.json | 8 ++++---- debian/debian-7.11-i386.json | 8 ++++---- debian/debian-8.9-amd64.json | 8 ++++---- debian/debian-8.9-i386.json | 8 ++++---- debian/debian-9.2-amd64.json | 8 ++++---- debian/debian-9.2-i386.json | 8 ++++---- fedora/fedora-25-i386.json | 8 ++++---- fedora/fedora-25-x86_64.json | 8 ++++---- fedora/fedora-26-x86_64.json | 8 ++++---- freebsd/freebsd-10.3-amd64.json | 8 ++++---- freebsd/freebsd-10.3-i386.json | 8 ++++---- freebsd/freebsd-10.4-amd64.json | 8 ++++---- freebsd/freebsd-10.4-i386.json | 8 ++++---- freebsd/freebsd-11.1-amd64.json | 8 ++++---- macos/macos-10.12.json | 6 +++--- macos/macosx-10.10.json | 6 +++--- macos/macosx-10.11.json | 6 +++--- macos/macosx-10.9.json | 6 +++--- opensuse/opensuse-leap-42.3-x86_64.json | 8 ++++---- oraclelinux/oracle-5.11-i386.json | 8 ++++---- oraclelinux/oracle-5.11-x86_64.json | 8 ++++---- oraclelinux/oracle-6.9-i386.json | 8 ++++---- oraclelinux/oracle-6.9-x86_64.json | 8 ++++---- oraclelinux/oracle-7.3-x86_64.json | 8 ++++---- rhel/rhel-5.11-i386.json | 8 ++++---- rhel/rhel-5.11-x86_64.json | 8 ++++---- rhel/rhel-6.9-i386.json | 8 ++++---- rhel/rhel-6.9-x86_64.json | 8 ++++---- rhel/rhel-7.4-x86_64.json | 8 ++++---- sles/sles-12-sp2-x86_64.json | 8 ++++---- sles/sles-12-sp3-x86_64.json | 8 ++++---- ubuntu/ubuntu-14.04-amd64.json | 10 +++++----- ubuntu/ubuntu-14.04-i386.json | 8 ++++---- ubuntu/ubuntu-16.04-amd64.json | 10 +++++----- ubuntu/ubuntu-16.04-i386.json | 8 ++++---- ubuntu/ubuntu-17.04-amd64.json | 10 +++++----- ubuntu/ubuntu-17.04-i386.json | 8 ++++---- windows/windows-nano-tp3.json | 2 +- 41 files changed, 163 insertions(+), 163 deletions(-) diff --git a/centos/centos-6.9-i386.json b/centos/centos-6.9-i386.json index 6a2b81f98..491164c7e 100644 --- a/centos/centos-6.9-i386.json +++ b/centos/centos-6.9-i386.json @@ -14,7 +14,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-virtualbox", + "output_directory": "../builds/packer-{{user `template`}}-virtualbox", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, @@ -50,7 +50,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-vmware", + "output_directory": "../builds/packer-{{user `template`}}-vmware", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, @@ -77,7 +77,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-parallels", + "output_directory": "../builds/packer-{{user `template`}}-parallels", "parallels_tools_flavor": "lin", "prlctl": [ [ @@ -118,7 +118,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-hyperv", + "output_directory": "../builds/packer-{{user `template`}}-hyperv", "ram_size": "{{ user `memory` }}", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", @@ -140,7 +140,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-qemu", + "output_directory": "../builds/packer-{{user `template`}}-qemu", "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, diff --git a/centos/centos-6.9-x86_64.json b/centos/centos-6.9-x86_64.json index 8fc3f39f1..f64496996 100644 --- a/centos/centos-6.9-x86_64.json +++ b/centos/centos-6.9-x86_64.json @@ -14,7 +14,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-virtualbox", + "output_directory": "../builds/packer-{{user `template`}}-virtualbox", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, @@ -50,7 +50,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-vmware", + "output_directory": "../builds/packer-{{user `template`}}-vmware", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, @@ -77,7 +77,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-parallels", + "output_directory": "../builds/packer-{{user `template`}}-parallels", "parallels_tools_flavor": "lin", "prlctl": [ [ @@ -118,7 +118,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-hyperv", + "output_directory": "../builds/packer-{{user `template`}}-hyperv", "ram_size": "{{ user `memory` }}", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", @@ -140,7 +140,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-qemu", + "output_directory": "../builds/packer-{{user `template`}}-qemu", "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, diff --git a/centos/centos-7.4-x86_64.json b/centos/centos-7.4-x86_64.json index 5f2747f30..831927382 100644 --- a/centos/centos-7.4-x86_64.json +++ b/centos/centos-7.4-x86_64.json @@ -14,7 +14,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-virtualbox", + "output_directory": "../builds/packer-{{user `template`}}-virtualbox", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, @@ -50,7 +50,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-vmware", + "output_directory": "../builds/packer-{{user `template`}}-vmware", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, @@ -77,7 +77,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-parallels", + "output_directory": "../builds/packer-{{user `template`}}-parallels", "parallels_tools_flavor": "lin", "prlctl": [ [ @@ -118,7 +118,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-hyperv", + "output_directory": "../builds/packer-{{user `template`}}-hyperv", "ram_size": "{{ user `memory` }}", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", @@ -140,7 +140,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-qemu", + "output_directory": "../builds/packer-{{user `template`}}-qemu", "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, diff --git a/debian/debian-7.11-amd64.json b/debian/debian-7.11-amd64.json index f426dff80..7c2663d49 100644 --- a/debian/debian-7.11-amd64.json +++ b/debian/debian-7.11-amd64.json @@ -28,7 +28,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-virtualbox", + "output_directory": "../builds/packer-{{user `template`}}-virtualbox", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", "ssh_password": "vagrant", "ssh_port": 22, @@ -78,7 +78,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-vmware", + "output_directory": "../builds/packer-{{user `template`}}-vmware", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", "ssh_password": "vagrant", "ssh_port": 22, @@ -119,7 +119,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-parallels", + "output_directory": "../builds/packer-{{user `template`}}-parallels", "parallels_tools_flavor": "lin", "prlctl": [ [ @@ -169,7 +169,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-qemu", + "output_directory": "../builds/packer-{{user `template`}}-qemu", "shutdown_command": "echo 'vagrant'|sudo -S /sbin/shutdown -hP now", "ssh_password": "vagrant", "ssh_port": 22, diff --git a/debian/debian-7.11-i386.json b/debian/debian-7.11-i386.json index 0860c7a74..61b91603c 100644 --- a/debian/debian-7.11-i386.json +++ b/debian/debian-7.11-i386.json @@ -28,7 +28,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-virtualbox", + "output_directory": "../builds/packer-{{user `template`}}-virtualbox", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", "ssh_password": "vagrant", "ssh_port": 22, @@ -78,7 +78,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-vmware", + "output_directory": "../builds/packer-{{user `template`}}-vmware", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", "ssh_password": "vagrant", "ssh_port": 22, @@ -119,7 +119,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-parallels", + "output_directory": "../builds/packer-{{user `template`}}-parallels", "parallels_tools_flavor": "lin", "prlctl": [ [ @@ -169,7 +169,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-qemu", + "output_directory": "../builds/packer-{{user `template`}}-qemu", "shutdown_command": "echo 'vagrant'|sudo -S /sbin/shutdown -hP now", "ssh_password": "vagrant", "ssh_port": 22, diff --git a/debian/debian-8.9-amd64.json b/debian/debian-8.9-amd64.json index ed5b40636..01b22b0d1 100644 --- a/debian/debian-8.9-amd64.json +++ b/debian/debian-8.9-amd64.json @@ -29,7 +29,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-virtualbox", + "output_directory": "../builds/packer-{{user `template`}}-virtualbox", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", "ssh_password": "vagrant", "ssh_port": 22, @@ -80,7 +80,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-vmware", + "output_directory": "../builds/packer-{{user `template`}}-vmware", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", "ssh_password": "vagrant", "ssh_port": 22, @@ -123,7 +123,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-parallels", + "output_directory": "../builds/packer-{{user `template`}}-parallels", "parallels_tools_flavor": "lin", "prlctl": [ [ @@ -174,7 +174,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-qemu", + "output_directory": "../builds/packer-{{user `template`}}-qemu", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", "ssh_password": "vagrant", "ssh_port": 22, diff --git a/debian/debian-8.9-i386.json b/debian/debian-8.9-i386.json index 3d6ace8cc..9164f8159 100644 --- a/debian/debian-8.9-i386.json +++ b/debian/debian-8.9-i386.json @@ -29,7 +29,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-virtualbox", + "output_directory": "../builds/packer-{{user `template`}}-virtualbox", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", "ssh_password": "vagrant", "ssh_port": 22, @@ -80,7 +80,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-vmware", + "output_directory": "../builds/packer-{{user `template`}}-vmware", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", "ssh_password": "vagrant", "ssh_port": 22, @@ -123,7 +123,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-parallels", + "output_directory": "../builds/packer-{{user `template`}}-parallels", "parallels_tools_flavor": "lin", "prlctl": [ [ @@ -174,7 +174,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-qemu", + "output_directory": "../builds/packer-{{user `template`}}-qemu", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", "ssh_password": "vagrant", "ssh_port": 22, diff --git a/debian/debian-9.2-amd64.json b/debian/debian-9.2-amd64.json index 1a07b0501..2e6a666b2 100644 --- a/debian/debian-9.2-amd64.json +++ b/debian/debian-9.2-amd64.json @@ -29,7 +29,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-virtualbox", + "output_directory": "../builds/packer-{{user `template`}}-virtualbox", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", "ssh_password": "vagrant", "ssh_port": 22, @@ -80,7 +80,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-vmware", + "output_directory": "../builds/packer-{{user `template`}}-vmware", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", "ssh_password": "vagrant", "ssh_port": 22, @@ -123,7 +123,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-parallels", + "output_directory": "../builds/packer-{{user `template`}}-parallels", "parallels_tools_flavor": "lin", "prlctl": [ [ @@ -174,7 +174,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-qemu", + "output_directory": "../builds/packer-{{user `template`}}-qemu", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", "ssh_password": "vagrant", "ssh_port": 22, diff --git a/debian/debian-9.2-i386.json b/debian/debian-9.2-i386.json index f274bbf81..8ef8d6957 100644 --- a/debian/debian-9.2-i386.json +++ b/debian/debian-9.2-i386.json @@ -29,7 +29,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-virtualbox", + "output_directory": "../builds/packer-{{user `template`}}-virtualbox", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", "ssh_password": "vagrant", "ssh_port": 22, @@ -80,7 +80,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-vmware", + "output_directory": "../builds/packer-{{user `template`}}-vmware", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", "ssh_password": "vagrant", "ssh_port": 22, @@ -123,7 +123,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-parallels", + "output_directory": "../builds/packer-{{user `template`}}-parallels", "parallels_tools_flavor": "lin", "prlctl": [ [ @@ -174,7 +174,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-qemu", + "output_directory": "../builds/packer-{{user `template`}}-qemu", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", "ssh_password": "vagrant", "ssh_port": 22, diff --git a/fedora/fedora-25-i386.json b/fedora/fedora-25-i386.json index 11aa6e5a5..f47d1c93c 100644 --- a/fedora/fedora-25-i386.json +++ b/fedora/fedora-25-i386.json @@ -14,7 +14,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-virtualbox", + "output_directory": "../builds/packer-{{user `template`}}-virtualbox", "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", "ssh_password": "vagrant", "ssh_port": 22, @@ -50,7 +50,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-vmware", + "output_directory": "../builds/packer-{{user `template`}}-vmware", "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", "ssh_password": "vagrant", "ssh_port": 22, @@ -77,7 +77,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-parallels", + "output_directory": "../builds/packer-{{user `template`}}-parallels", "parallels_tools_flavor": "lin", "prlctl": [ [ @@ -113,7 +113,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-qemu", + "output_directory": "../builds/packer-{{user `template`}}-qemu", "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", "ssh_password": "vagrant", "ssh_port": 22, diff --git a/fedora/fedora-25-x86_64.json b/fedora/fedora-25-x86_64.json index 7db47dce2..b75003420 100644 --- a/fedora/fedora-25-x86_64.json +++ b/fedora/fedora-25-x86_64.json @@ -14,7 +14,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-virtualbox", + "output_directory": "../builds/packer-{{user `template`}}-virtualbox", "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", "ssh_password": "vagrant", "ssh_port": 22, @@ -50,7 +50,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-vmware", + "output_directory": "../builds/packer-{{user `template`}}-vmware", "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", "ssh_password": "vagrant", "ssh_port": 22, @@ -78,7 +78,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-parallels", + "output_directory": "../builds/packer-{{user `template`}}-parallels", "parallels_tools_flavor": "lin", "prlctl": [ [ @@ -114,7 +114,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-qemu", + "output_directory": "../builds/packer-{{user `template`}}-qemu", "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", "ssh_password": "vagrant", "ssh_port": 22, diff --git a/fedora/fedora-26-x86_64.json b/fedora/fedora-26-x86_64.json index ff527980e..1c6cefc7a 100644 --- a/fedora/fedora-26-x86_64.json +++ b/fedora/fedora-26-x86_64.json @@ -14,7 +14,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-virtualbox", + "output_directory": "../builds/packer-{{user `template`}}-virtualbox", "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", "ssh_password": "vagrant", "ssh_port": 22, @@ -50,7 +50,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-vmware", + "output_directory": "../builds/packer-{{user `template`}}-vmware", "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", "ssh_password": "vagrant", "ssh_port": 22, @@ -78,7 +78,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-parallels", + "output_directory": "../builds/packer-{{user `template`}}-parallels", "parallels_tools_flavor": "lin", "prlctl": [ [ @@ -114,7 +114,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-qemu", + "output_directory": "../builds/packer-{{user `template`}}-qemu", "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", "ssh_password": "vagrant", "ssh_port": 22, diff --git a/freebsd/freebsd-10.3-amd64.json b/freebsd/freebsd-10.3-amd64.json index 613d6e2c8..a340e8542 100644 --- a/freebsd/freebsd-10.3-amd64.json +++ b/freebsd/freebsd-10.3-amd64.json @@ -21,7 +21,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-virtualbox", + "output_directory": "../builds/packer-{{user `template`}}-virtualbox", "shutdown_command": "echo 'vagrant' | su -m root -c 'shutdown -p now'", "ssh_password": "vagrant", "ssh_port": 22, @@ -66,7 +66,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-vmare", + "output_directory": "../builds/packer-{{user `template`}}-vmare", "shutdown_command": "echo 'vagrant' | su -m root -c 'shutdown -p now'", "ssh_password": "vagrant", "ssh_port": 22, @@ -101,7 +101,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-parallels", + "output_directory": "../builds/packer-{{user `template`}}-parallels", "parallels_tools_mode": "disable", "prlctl": [ [ @@ -165,7 +165,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-qemu", + "output_directory": "../builds/packer-{{user `template`}}-qemu", "shutdown_command": "echo 'vagrant' | su -m root -c 'shutdown -p now'", "ssh_password": "vagrant", "ssh_port": 22, diff --git a/freebsd/freebsd-10.3-i386.json b/freebsd/freebsd-10.3-i386.json index d10d58f31..523c3304a 100644 --- a/freebsd/freebsd-10.3-i386.json +++ b/freebsd/freebsd-10.3-i386.json @@ -21,7 +21,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-virtualbox", + "output_directory": "../builds/packer-{{user `template`}}-virtualbox", "shutdown_command": "echo 'vagrant' | su -m root -c 'shutdown -p now'", "ssh_password": "vagrant", "ssh_port": 22, @@ -66,7 +66,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-vmare", + "output_directory": "../builds/packer-{{user `template`}}-vmare", "shutdown_command": "echo 'vagrant' | su -m root -c 'shutdown -p now'", "ssh_password": "vagrant", "ssh_port": 22, @@ -101,7 +101,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-parallels", + "output_directory": "../builds/packer-{{user `template`}}-parallels", "parallels_tools_mode": "disable", "prlctl": [ [ @@ -165,7 +165,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-qemu", + "output_directory": "../builds/packer-{{user `template`}}-qemu", "shutdown_command": "echo 'vagrant' | su -m root -c 'shutdown -p now'", "ssh_password": "vagrant", "ssh_port": 22, diff --git a/freebsd/freebsd-10.4-amd64.json b/freebsd/freebsd-10.4-amd64.json index 43786a8e4..771791509 100644 --- a/freebsd/freebsd-10.4-amd64.json +++ b/freebsd/freebsd-10.4-amd64.json @@ -21,7 +21,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-virtualbox", + "output_directory": "../builds/packer-{{user `template`}}-virtualbox", "shutdown_command": "echo 'vagrant' | su -m root -c 'shutdown -p now'", "ssh_password": "vagrant", "ssh_port": 22, @@ -66,7 +66,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-vmare", + "output_directory": "../builds/packer-{{user `template`}}-vmare", "shutdown_command": "echo 'vagrant' | su -m root -c 'shutdown -p now'", "ssh_password": "vagrant", "ssh_port": 22, @@ -101,7 +101,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-parallels", + "output_directory": "../builds/packer-{{user `template`}}-parallels", "parallels_tools_mode": "disable", "prlctl": [ [ @@ -165,7 +165,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-qemu", + "output_directory": "../builds/packer-{{user `template`}}-qemu", "shutdown_command": "echo 'vagrant' | su -m root -c 'shutdown -p now'", "ssh_password": "vagrant", "ssh_port": 22, diff --git a/freebsd/freebsd-10.4-i386.json b/freebsd/freebsd-10.4-i386.json index b47808207..c7fdf123b 100644 --- a/freebsd/freebsd-10.4-i386.json +++ b/freebsd/freebsd-10.4-i386.json @@ -21,7 +21,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-virtualbox", + "output_directory": "../builds/packer-{{user `template`}}-virtualbox", "shutdown_command": "echo 'vagrant' | su -m root -c 'shutdown -p now'", "ssh_password": "vagrant", "ssh_port": 22, @@ -66,7 +66,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-vmare", + "output_directory": "../builds/packer-{{user `template`}}-vmare", "shutdown_command": "echo 'vagrant' | su -m root -c 'shutdown -p now'", "ssh_password": "vagrant", "ssh_port": 22, @@ -101,7 +101,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-parallels", + "output_directory": "../builds/packer-{{user `template`}}-parallels", "parallels_tools_mode": "disable", "prlctl": [ [ @@ -165,7 +165,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-qemu", + "output_directory": "../builds/packer-{{user `template`}}-qemu", "shutdown_command": "echo 'vagrant' | su -m root -c 'shutdown -p now'", "ssh_password": "vagrant", "ssh_port": 22, diff --git a/freebsd/freebsd-11.1-amd64.json b/freebsd/freebsd-11.1-amd64.json index 3b9015e90..f50ae681d 100644 --- a/freebsd/freebsd-11.1-amd64.json +++ b/freebsd/freebsd-11.1-amd64.json @@ -21,7 +21,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-virtualbox", + "output_directory": "../builds/packer-{{user `template`}}-virtualbox", "shutdown_command": "echo 'vagrant' | su -m root -c 'shutdown -p now'", "ssh_password": "vagrant", "ssh_port": 22, @@ -66,7 +66,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-vmare", + "output_directory": "../builds/packer-{{user `template`}}-vmare", "shutdown_command": "echo 'vagrant' | su -m root -c 'shutdown -p now'", "ssh_password": "vagrant", "ssh_port": 22, @@ -101,7 +101,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-parallels", + "output_directory": "../builds/packer-{{user `template`}}-parallels", "parallels_tools_mode": "disable", "prlctl": [ [ @@ -165,7 +165,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-qemu", + "output_directory": "../builds/packer-{{user `template`}}-qemu", "shutdown_command": "echo 'vagrant' | su -m root -c 'shutdown -p now'", "ssh_password": "vagrant", "ssh_port": 22, diff --git a/macos/macos-10.12.json b/macos/macos-10.12.json index 11d26b5f7..f85f13bcd 100644 --- a/macos/macos-10.12.json +++ b/macos/macos-10.12.json @@ -8,7 +8,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `iso_url`}}", - "output_directory": "packer-{{user `template`}}-vmware", + "output_directory": "../builds/packer-{{user `template`}}-vmware", "shutdown_command": "echo 'vagrant'| sudo -S shutdown -h now", "skip_compaction": true, "ssh_password": "vagrant", @@ -43,7 +43,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `iso_url`}}", - "output_directory": "packer-{{user `template`}}-virtualbox", + "output_directory": "../builds/packer-{{user `template`}}-virtualbox", "shutdown_command": "echo 'vagrant'| sudo -S shutdown -h now", "ssh_password": "vagrant", "ssh_port": 22, @@ -161,7 +161,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `iso_url`}}", - "output_directory": "packer-{{user `template`}}-parallels", + "output_directory": "../builds/packer-{{user `template`}}-parallels", "parallels_tools_flavor": "mac", "prlctl": [ [ diff --git a/macos/macosx-10.10.json b/macos/macosx-10.10.json index ddee78252..ed90bdd68 100644 --- a/macos/macosx-10.10.json +++ b/macos/macosx-10.10.json @@ -8,7 +8,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `iso_url`}}", - "output_directory": "packer-{{user `template`}}-vmware", + "output_directory": "../builds/packer-{{user `template`}}-vmware", "shutdown_command": "echo 'vagrant'| sudo -S shutdown -h now", "skip_compaction": true, "ssh_password": "vagrant", @@ -43,7 +43,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `iso_url`}}", - "output_directory": "packer-{{user `template`}}-virtualbox", + "output_directory": "../builds/packer-{{user `template`}}-virtualbox", "shutdown_command": "echo 'vagrant'| sudo -S shutdown -h now", "ssh_password": "vagrant", "ssh_port": 22, @@ -161,7 +161,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `iso_url`}}", - "output_directory": "packer-{{user `template`}}-parallels", + "output_directory": "../builds/packer-{{user `template`}}-parallels", "parallels_tools_flavor": "mac", "prlctl": [ [ diff --git a/macos/macosx-10.11.json b/macos/macosx-10.11.json index d62b275a4..bbcbc8e6b 100644 --- a/macos/macosx-10.11.json +++ b/macos/macosx-10.11.json @@ -8,7 +8,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `iso_url`}}", - "output_directory": "packer-{{user `template`}}-vmware", + "output_directory": "../builds/packer-{{user `template`}}-vmware", "shutdown_command": "echo 'vagrant'| sudo -S shutdown -h now", "skip_compaction": true, "ssh_password": "vagrant", @@ -43,7 +43,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `iso_url`}}", - "output_directory": "packer-{{user `template`}}-virtualbox", + "output_directory": "../builds/packer-{{user `template`}}-virtualbox", "shutdown_command": "echo 'vagrant'| sudo -S shutdown -h now", "ssh_password": "vagrant", "ssh_port": 22, @@ -161,7 +161,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `iso_url`}}", - "output_directory": "packer-{{user `template`}}-parallels", + "output_directory": "../builds/packer-{{user `template`}}-parallels", "parallels_tools_flavor": "mac", "prlctl": [ [ diff --git a/macos/macosx-10.9.json b/macos/macosx-10.9.json index 1835c608d..e95a78549 100644 --- a/macos/macosx-10.9.json +++ b/macos/macosx-10.9.json @@ -8,7 +8,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `iso_url`}}", - "output_directory": "packer-{{user `template`}}-vmware", + "output_directory": "../builds/packer-{{user `template`}}-vmware", "shutdown_command": "echo 'vagrant'| sudo -S shutdown -h now", "skip_compaction": true, "ssh_password": "vagrant", @@ -43,7 +43,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `iso_url`}}", - "output_directory": "packer-{{user `template`}}-virtualbox", + "output_directory": "../builds/packer-{{user `template`}}-virtualbox", "shutdown_command": "echo 'vagrant'| sudo -S shutdown -h now", "ssh_password": "vagrant", "ssh_port": 22, @@ -161,7 +161,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `iso_url`}}", - "output_directory": "packer-{{user `template`}}-parallels", + "output_directory": "../builds/packer-{{user `template`}}-parallels", "parallels_tools_flavor": "mac", "prlctl": [ [ diff --git a/opensuse/opensuse-leap-42.3-x86_64.json b/opensuse/opensuse-leap-42.3-x86_64.json index a960f872a..0ced8c8d6 100644 --- a/opensuse/opensuse-leap-42.3-x86_64.json +++ b/opensuse/opensuse-leap-42.3-x86_64.json @@ -23,7 +23,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-virtualbox", + "output_directory": "../builds/packer-{{user `template`}}-virtualbox", "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, @@ -68,7 +68,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-vmware", + "output_directory": "../builds/packer-{{user `template`}}-vmware", "shutdown_command": "echo 'vagrant'|sudo -S /sbin/shutdown -h 1", "ssh_password": "vagrant", "ssh_port": 22, @@ -104,7 +104,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-parallels", + "output_directory": "../builds/packer-{{user `template`}}-parallels", "parallels_tools_flavor": "lin", "prlctl": [ [ @@ -144,7 +144,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-qemu", + "output_directory": "../builds/packer-{{user `template`}}-qemu", "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, diff --git a/oraclelinux/oracle-5.11-i386.json b/oraclelinux/oracle-5.11-i386.json index a2ac3c2fe..a41f472e7 100644 --- a/oraclelinux/oracle-5.11-i386.json +++ b/oraclelinux/oracle-5.11-i386.json @@ -14,7 +14,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-virtualbox", + "output_directory": "../builds/packer-{{user `template`}}-virtualbox", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, @@ -50,7 +50,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-vmware", + "output_directory": "../builds/packer-{{user `template`}}-vmware", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, @@ -77,7 +77,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-parallels", + "output_directory": "../builds/packer-{{user `template`}}-parallels", "parallels_tools_flavor": "lin", "prlctl": [ [ @@ -113,7 +113,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-qemu", + "output_directory": "../builds/packer-{{user `template`}}-qemu", "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, diff --git a/oraclelinux/oracle-5.11-x86_64.json b/oraclelinux/oracle-5.11-x86_64.json index 0c50ccaf1..fd3ad127e 100644 --- a/oraclelinux/oracle-5.11-x86_64.json +++ b/oraclelinux/oracle-5.11-x86_64.json @@ -14,7 +14,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-virtualbox", + "output_directory": "../builds/packer-{{user `template`}}-virtualbox", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, @@ -56,7 +56,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-vmware", + "output_directory": "../builds/packer-{{user `template`}}-vmware", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, @@ -83,7 +83,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-parallels", + "output_directory": "../builds/packer-{{user `template`}}-parallels", "parallels_tools_flavor": "lin", "prlctl": [ [ @@ -119,7 +119,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-qemu", + "output_directory": "../builds/packer-{{user `template`}}-qemu", "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, diff --git a/oraclelinux/oracle-6.9-i386.json b/oraclelinux/oracle-6.9-i386.json index fb26ce3a8..ae1615223 100644 --- a/oraclelinux/oracle-6.9-i386.json +++ b/oraclelinux/oracle-6.9-i386.json @@ -14,7 +14,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-virtualbox", + "output_directory": "../builds/packer-{{user `template`}}-virtualbox", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, @@ -50,7 +50,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-vmware", + "output_directory": "../builds/packer-{{user `template`}}-vmware", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, @@ -77,7 +77,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-parallels", + "output_directory": "../builds/packer-{{user `template`}}-parallels", "parallels_tools_flavor": "lin", "prlctl": [ [ @@ -113,7 +113,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-qemu", + "output_directory": "../builds/packer-{{user `template`}}-qemu", "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, diff --git a/oraclelinux/oracle-6.9-x86_64.json b/oraclelinux/oracle-6.9-x86_64.json index bf6918d7a..67a1ad9eb 100644 --- a/oraclelinux/oracle-6.9-x86_64.json +++ b/oraclelinux/oracle-6.9-x86_64.json @@ -14,7 +14,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-virtualbox", + "output_directory": "../builds/packer-{{user `template`}}-virtualbox", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, @@ -50,7 +50,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-vmware", + "output_directory": "../builds/packer-{{user `template`}}-vmware", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, @@ -77,7 +77,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-parallels", + "output_directory": "../builds/packer-{{user `template`}}-parallels", "parallels_tools_flavor": "lin", "prlctl": [ [ @@ -113,7 +113,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-qemu", + "output_directory": "../builds/packer-{{user `template`}}-qemu", "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, diff --git a/oraclelinux/oracle-7.3-x86_64.json b/oraclelinux/oracle-7.3-x86_64.json index 8e77024b8..00a4f2fd3 100644 --- a/oraclelinux/oracle-7.3-x86_64.json +++ b/oraclelinux/oracle-7.3-x86_64.json @@ -14,7 +14,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-virtualbox", + "output_directory": "../builds/packer-{{user `template`}}-virtualbox", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, @@ -50,7 +50,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-vmware", + "output_directory": "../builds/packer-{{user `template`}}-vmware", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, @@ -77,7 +77,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-parallels", + "output_directory": "../builds/packer-{{user `template`}}-parallels", "parallels_tools_flavor": "lin", "prlctl": [ [ @@ -113,7 +113,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-qemu", + "output_directory": "../builds/packer-{{user `template`}}-qemu", "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, diff --git a/rhel/rhel-5.11-i386.json b/rhel/rhel-5.11-i386.json index 36bfd9f2c..9a2a40087 100644 --- a/rhel/rhel-5.11-i386.json +++ b/rhel/rhel-5.11-i386.json @@ -14,7 +14,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-virtualbox", + "output_directory": "../builds/packer-{{user `template`}}-virtualbox", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, @@ -50,7 +50,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-vmware", + "output_directory": "../builds/packer-{{user `template`}}-vmware", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, @@ -77,7 +77,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-parallels", + "output_directory": "../builds/packer-{{user `template`}}-parallels", "parallels_tools_flavor": "lin", "prlctl": [ [ @@ -113,7 +113,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-qemu", + "output_directory": "../builds/packer-{{user `template`}}-qemu", "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, diff --git a/rhel/rhel-5.11-x86_64.json b/rhel/rhel-5.11-x86_64.json index 00ae129bc..2e665857e 100644 --- a/rhel/rhel-5.11-x86_64.json +++ b/rhel/rhel-5.11-x86_64.json @@ -14,7 +14,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-virtualbox", + "output_directory": "../builds/packer-{{user `template`}}-virtualbox", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, @@ -56,7 +56,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-vmware", + "output_directory": "../builds/packer-{{user `template`}}-vmware", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, @@ -83,7 +83,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-parallels", + "output_directory": "../builds/packer-{{user `template`}}-parallels", "parallels_tools_flavor": "lin", "prlctl": [ [ @@ -119,7 +119,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-qemu", + "output_directory": "../builds/packer-{{user `template`}}-qemu", "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, diff --git a/rhel/rhel-6.9-i386.json b/rhel/rhel-6.9-i386.json index f6a3c4dc5..74e805835 100644 --- a/rhel/rhel-6.9-i386.json +++ b/rhel/rhel-6.9-i386.json @@ -14,7 +14,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-virtualbox", + "output_directory": "../builds/packer-{{user `template`}}-virtualbox", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, @@ -50,7 +50,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-vmware", + "output_directory": "../builds/packer-{{user `template`}}-vmware", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, @@ -77,7 +77,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-parallels", + "output_directory": "../builds/packer-{{user `template`}}-parallels", "parallels_tools_flavor": "lin", "prlctl": [ [ @@ -113,7 +113,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-qemu", + "output_directory": "../builds/packer-{{user `template`}}-qemu", "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, diff --git a/rhel/rhel-6.9-x86_64.json b/rhel/rhel-6.9-x86_64.json index 4d0c8a099..a02108d1a 100644 --- a/rhel/rhel-6.9-x86_64.json +++ b/rhel/rhel-6.9-x86_64.json @@ -14,7 +14,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-virtualbox", + "output_directory": "../builds/packer-{{user `template`}}-virtualbox", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, @@ -50,7 +50,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-vmware", + "output_directory": "../builds/packer-{{user `template`}}-vmware", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, @@ -77,7 +77,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-parallels", + "output_directory": "../builds/packer-{{user `template`}}-parallels", "parallels_tools_flavor": "lin", "prlctl": [ [ @@ -113,7 +113,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-qemu", + "output_directory": "../builds/packer-{{user `template`}}-qemu", "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, diff --git a/rhel/rhel-7.4-x86_64.json b/rhel/rhel-7.4-x86_64.json index b4d8ad1a3..0ba37f010 100644 --- a/rhel/rhel-7.4-x86_64.json +++ b/rhel/rhel-7.4-x86_64.json @@ -14,7 +14,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-virtualbox", + "output_directory": "../builds/packer-{{user `template`}}-virtualbox", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, @@ -50,7 +50,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-vmware", + "output_directory": "../builds/packer-{{user `template`}}-vmware", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, @@ -77,7 +77,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-parallels", + "output_directory": "../builds/packer-{{user `template`}}-parallels", "parallels_tools_flavor": "lin", "prlctl": [ [ @@ -113,7 +113,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-qemu", + "output_directory": "../builds/packer-{{user `template`}}-qemu", "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, diff --git a/sles/sles-12-sp2-x86_64.json b/sles/sles-12-sp2-x86_64.json index f29a37c64..fcbfac29f 100644 --- a/sles/sles-12-sp2-x86_64.json +++ b/sles/sles-12-sp2-x86_64.json @@ -18,7 +18,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-virtualbox", + "output_directory": "../builds/packer-{{user `template`}}-virtualbox", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, @@ -58,7 +58,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-vmware", + "output_directory": "../builds/packer-{{user `template`}}-vmware", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, @@ -89,7 +89,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-parallels", + "output_directory": "../builds/packer-{{user `template`}}-parallels", "parallels_tools_flavor": "lin", "prlctl": [ [ @@ -129,7 +129,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-qemu", + "output_directory": "../builds/packer-{{user `template`}}-qemu", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, diff --git a/sles/sles-12-sp3-x86_64.json b/sles/sles-12-sp3-x86_64.json index 046eb1ece..ce26769d3 100644 --- a/sles/sles-12-sp3-x86_64.json +++ b/sles/sles-12-sp3-x86_64.json @@ -18,7 +18,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-virtualbox", + "output_directory": "../builds/packer-{{user `template`}}-virtualbox", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, @@ -58,7 +58,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-vmware", + "output_directory": "../builds/packer-{{user `template`}}-vmware", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, @@ -89,7 +89,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-parallels", + "output_directory": "../builds/packer-{{user `template`}}-parallels", "parallels_tools_flavor": "lin", "prlctl": [ [ @@ -129,7 +129,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-qemu", + "output_directory": "../builds/packer-{{user `template`}}-qemu", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, diff --git a/ubuntu/ubuntu-14.04-amd64.json b/ubuntu/ubuntu-14.04-amd64.json index a3aa93b11..a2d42405c 100644 --- a/ubuntu/ubuntu-14.04-amd64.json +++ b/ubuntu/ubuntu-14.04-amd64.json @@ -35,7 +35,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-virtualbox", + "output_directory": "../builds/packer-{{user `template`}}-virtualbox", "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", "ssh_password": "vagrant", "ssh_port": 22, @@ -92,7 +92,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-vmware", + "output_directory": "../builds/packer-{{user `template`}}-vmware", "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", "ssh_password": "vagrant", "ssh_port": 22, @@ -140,7 +140,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-parallels", + "output_directory": "../builds/packer-{{user `template`}}-parallels", "parallels_tools_flavor": "lin", "prlctl": [ [ @@ -197,7 +197,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-qemu", + "output_directory": "../builds/packer-{{user `template`}}-qemu", "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", "ssh_password": "vagrant", "ssh_port": 22, @@ -240,7 +240,7 @@ "iso_checksum": "5E567024C385CC8F90C83D6763C6E4F1CD5DEB6F", "iso_checksum_type": "sha1", "iso_url": "http://releases.ubuntu.com/14.04/ubuntu-14.04.5-server-amd64.iso", - "output_directory": "packer-{{user `template`}}-hyperv", + "output_directory": "../builds/packer-{{user `template`}}-hyperv", "ram_size": "{{user `memory`}}", "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", "ssh_password": "vagrant", diff --git a/ubuntu/ubuntu-14.04-i386.json b/ubuntu/ubuntu-14.04-i386.json index 68db968d5..703b38fdc 100644 --- a/ubuntu/ubuntu-14.04-i386.json +++ b/ubuntu/ubuntu-14.04-i386.json @@ -35,7 +35,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-virtualbox", + "output_directory": "../builds/packer-{{user `template`}}-virtualbox", "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", "ssh_password": "vagrant", "ssh_port": 22, @@ -92,7 +92,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-vmware", + "output_directory": "../builds/packer-{{user `template`}}-vmware", "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", "ssh_password": "vagrant", "ssh_port": 22, @@ -140,7 +140,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-parallels", + "output_directory": "../builds/packer-{{user `template`}}-parallels", "parallels_tools_flavor": "lin", "prlctl": [ [ @@ -197,7 +197,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-qemu", + "output_directory": "../builds/packer-{{user `template`}}-qemu", "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", "ssh_password": "vagrant", "ssh_port": 22, diff --git a/ubuntu/ubuntu-16.04-amd64.json b/ubuntu/ubuntu-16.04-amd64.json index 27bb0fe3c..4cbc17472 100644 --- a/ubuntu/ubuntu-16.04-amd64.json +++ b/ubuntu/ubuntu-16.04-amd64.json @@ -37,7 +37,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-virtualbox", + "output_directory": "../builds/packer-{{user `template`}}-virtualbox", "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", "ssh_password": "vagrant", "ssh_port": 22, @@ -96,7 +96,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-vmware", + "output_directory": "../builds/packer-{{user `template`}}-vmware", "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", "ssh_password": "vagrant", "ssh_port": 22, @@ -147,7 +147,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-parallels", + "output_directory": "../builds/packer-{{user `template`}}-parallels", "parallels_tools_flavor": "lin", "prlctl": [ [ @@ -206,7 +206,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-qemu", + "output_directory": "../builds/packer-{{user `template`}}-qemu", "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", "ssh_password": "vagrant", "ssh_port": 22, @@ -249,7 +249,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-hyperv", + "output_directory": "../builds/packer-{{user `template`}}-hyperv", "ram_size": "{{user `memory`}}", "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", "ssh_password": "vagrant", diff --git a/ubuntu/ubuntu-16.04-i386.json b/ubuntu/ubuntu-16.04-i386.json index a3861941c..147ed2de7 100644 --- a/ubuntu/ubuntu-16.04-i386.json +++ b/ubuntu/ubuntu-16.04-i386.json @@ -37,7 +37,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-virtualbox", + "output_directory": "../builds/packer-{{user `template`}}-virtualbox", "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", "ssh_password": "vagrant", "ssh_port": 22, @@ -96,7 +96,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-vmware", + "output_directory": "../builds/packer-{{user `template`}}-vmware", "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", "ssh_password": "vagrant", "ssh_port": 22, @@ -146,7 +146,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-parallels", + "output_directory": "../builds/packer-{{user `template`}}-parallels", "parallels_tools_flavor": "lin", "prlctl": [ [ @@ -205,7 +205,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-qemu", + "output_directory": "../builds/packer-{{user `template`}}-qemu", "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", "ssh_password": "vagrant", "ssh_port": 22, diff --git a/ubuntu/ubuntu-17.04-amd64.json b/ubuntu/ubuntu-17.04-amd64.json index 3f67f43ce..a3457c5d5 100644 --- a/ubuntu/ubuntu-17.04-amd64.json +++ b/ubuntu/ubuntu-17.04-amd64.json @@ -36,7 +36,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-virtualbox", + "output_directory": "../builds/packer-{{user `template`}}-virtualbox", "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", "ssh_password": "vagrant", "ssh_port": 22, @@ -94,7 +94,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-vmware", + "output_directory": "../builds/packer-{{user `template`}}-vmware", "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", "ssh_password": "vagrant", "ssh_port": 22, @@ -144,7 +144,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-parallels", + "output_directory": "../builds/packer-{{user `template`}}-parallels", "parallels_tools_flavor": "lin", "prlctl": [ [ @@ -202,7 +202,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-qemu", + "output_directory": "../builds/packer-{{user `template`}}-qemu", "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", "ssh_password": "vagrant", "ssh_port": 22, @@ -245,7 +245,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-hyperv", + "output_directory": "../builds/packer-{{user `template`}}-hyperv", "ram_size": "{{user `memory`}}", "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", "ssh_password": "vagrant", diff --git a/ubuntu/ubuntu-17.04-i386.json b/ubuntu/ubuntu-17.04-i386.json index a70113b9a..04543bacf 100644 --- a/ubuntu/ubuntu-17.04-i386.json +++ b/ubuntu/ubuntu-17.04-i386.json @@ -36,7 +36,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-virtualbox", + "output_directory": "../builds/packer-{{user `template`}}-virtualbox", "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", "ssh_password": "vagrant", "ssh_port": 22, @@ -94,7 +94,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-vmware", + "output_directory": "../builds/packer-{{user `template`}}-vmware", "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", "ssh_password": "vagrant", "ssh_port": 22, @@ -144,7 +144,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-parallels", + "output_directory": "../builds/packer-{{user `template`}}-parallels", "parallels_tools_flavor": "lin", "prlctl": [ [ @@ -202,7 +202,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-qemu", + "output_directory": "../builds/packer-{{user `template`}}-qemu", "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", "ssh_password": "vagrant", "ssh_port": 22, diff --git a/windows/windows-nano-tp3.json b/windows/windows-nano-tp3.json index 572ffb089..d6ced88c5 100644 --- a/windows/windows-nano-tp3.json +++ b/windows/windows-nano-tp3.json @@ -16,7 +16,7 @@ "iso_checksum": "{{ user `iso_checksum` }}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{ user `iso_url` }}", - "output_directory": "packer-{{user `template`}}-virtualbox", + "output_directory": "../builds/packer-{{user `template`}}-virtualbox", "shutdown_command": "shutdown /r /t 10 /f /d p:4:1 /c \"Packer Shutdown\"", "shutdown_timeout": "1h", "type": "virtualbox-iso", From 87bcfe8568978eb3b812d644a72f86ebc6dd3001 Mon Sep 17 00:00:00 2001 From: Seth Thomas <cheeseplus@chef.io> Date: Tue, 24 Oct 2017 16:54:57 -0400 Subject: [PATCH 0719/1622] Adds Ubuntu 17.10 (#924) * Adds Ubuntu 17.10 Signed-off-by: Seth Thomas <sthomas@chef.io> * Fixing spacing Signed-off-by: Seth Thomas <sthomas@chef.io> --- builds.yml | 3 + ubuntu/scripts/networking.sh | 22 ++- ubuntu/ubuntu-17.10-amd64.json | 315 +++++++++++++++++++++++++++++++++ ubuntu/ubuntu-17.10-i386.json | 277 +++++++++++++++++++++++++++++ 4 files changed, 612 insertions(+), 5 deletions(-) create mode 100644 ubuntu/ubuntu-17.10-amd64.json create mode 100644 ubuntu/ubuntu-17.10-i386.json diff --git a/builds.yml b/builds.yml index 0e960794c..cac88d201 100644 --- a/builds.yml +++ b/builds.yml @@ -27,6 +27,9 @@ public: '17.04': - amd64 - i386 + '17.10': + - amd64 + - i386 debian: '7.11': - amd64 diff --git a/ubuntu/scripts/networking.sh b/ubuntu/scripts/networking.sh index f58d9af5c..4293923fb 100644 --- a/ubuntu/scripts/networking.sh +++ b/ubuntu/scripts/networking.sh @@ -1,10 +1,22 @@ #!/bin/sh -eux +ubuntu_version="`lsb_release -r | awk '{print $2}'`"; -# Set up eth0 -echo "auto eth0\niface eth0 inet dhcp" >> /etc/network/interfaces.d/eth0.cfg - -# Adding a 2 sec delay to the interface up, to make the dhclient happy -echo "pre-up sleep 2" >>/etc/network/interfaces; +if [ "$ubuntu_version" = '17.10' ]; then +echo "Create netplan config for eth0" +cat <<EOF >/etc/netplan/01-netcfg.yaml; +network: + version: 2 + ethernets: + eth0: + dhcp4: true +EOF +else + # Set up eth0 for pre-17.10 + echo "auto eth0\niface eth0 inet dhcp" >> /etc/network/interfaces.d/eth0.cfg + # Adding a 2 sec delay to the interface up, to make the dhclient happy + echo "pre-up sleep 2" >>/etc/network/interfaces; +fi +# Seriously though eth0 sed -ie 's/GRUB_CMDLINE_LINUX="\(.*\)"/GRUB_CMDLINE_LINUX="net.ifnames=0 biosdevname=0 \1"/g' /etc/default/grub update-grub diff --git a/ubuntu/ubuntu-17.10-amd64.json b/ubuntu/ubuntu-17.10-amd64.json new file mode 100644 index 000000000..640440908 --- /dev/null +++ b/ubuntu/ubuntu-17.10-amd64.json @@ -0,0 +1,315 @@ +{ + "builders": [ + { + "boot_command": [ + "<esc><wait>", + "<esc><wait>", + "<enter><wait>", + "/install/vmlinuz<wait>", + " auto<wait>", + " console-setup/ask_detect=false<wait>", + " console-setup/layoutcode=us<wait>", + " console-setup/modelcode=pc105<wait>", + " debconf/frontend=noninteractive<wait>", + " debian-installer=en_US<wait>", + " fb=false<wait>", + " initrd=/install/initrd.gz<wait>", + " kbd-chooser/method=us<wait>", + " keyboard-configuration/layout=USA<wait>", + " keyboard-configuration/variant=USA<wait>", + " locale=en_US<wait>", + " netcfg/get_domain=vm<wait>", + " netcfg/get_hostname=vagrant<wait>", + " grub-installer/bootdev=/dev/sda<wait>", + " noapic<wait>", + " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}}<wait>", + " -- <wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": "{{user `disk_size`}}", + "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "guest_os_type": "Ubuntu_64", + "hard_drive_interface": "sata", + "headless": "{{ user `headless` }}", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "../builds/packer-{{user `template`}}-virtualbox", + "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "virtualbox-iso", + "vboxmanage": [ + [ + "modifyvm", + "{{.Name}}", + "--memory", + "{{ user `memory` }}" + ], + [ + "modifyvm", + "{{.Name}}", + "--cpus", + "{{ user `cpus` }}" + ] + ], + "virtualbox_version_file": ".vbox_version", + "vm_name": "{{ user `template` }}" + }, + { + "boot_command": [ + "<esc><wait>", + "<esc><wait>", + "<enter><wait>", + "/install/vmlinuz<wait>", + " auto<wait>", + " console-setup/ask_detect=false<wait>", + " console-setup/layoutcode=us<wait>", + " console-setup/modelcode=pc105<wait>", + " debconf/frontend=noninteractive<wait>", + " debian-installer=en_US<wait>", + " fb=false<wait>", + " initrd=/install/initrd.gz<wait>", + " kbd-chooser/method=us<wait>", + " keyboard-configuration/layout=USA<wait>", + " keyboard-configuration/variant=USA<wait>", + " locale=en_US<wait>", + " netcfg/get_domain=vm<wait>", + " netcfg/get_hostname=vagrant<wait>", + " grub-installer/bootdev=/dev/sda<wait>", + " noapic<wait>", + " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}}<wait>", + " -- <wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": "{{user `disk_size`}}", + "guest_os_type": "ubuntu-64", + "headless": "{{ user `headless` }}", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "../builds/packer-{{user `template`}}-vmware", + "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "tools_upload_flavor": "linux", + "type": "vmware-iso", + "vm_name": "{{ user `template` }}", + "vmx_data": { + "cpuid.coresPerSocket": "1", + "ethernet0.pciSlotNumber": "32", + "memsize": "{{ user `memory` }}", + "numvcpus": "{{ user `cpus` }}" + }, + "vmx_remove_ethernet_interfaces": true + }, + { + "boot_command": [ + "<esc><wait>", + "<esc><wait>", + "<enter><wait>", + "/install/vmlinuz<wait>", + " auto<wait>", + " console-setup/ask_detect=false<wait>", + " console-setup/layoutcode=us<wait>", + " console-setup/modelcode=pc105<wait>", + " debconf/frontend=noninteractive<wait>", + " debian-installer=en_US<wait>", + " fb=false<wait>", + " initrd=/install/initrd.gz<wait>", + " kbd-chooser/method=us<wait>", + " keyboard-configuration/layout=USA<wait>", + " keyboard-configuration/variant=USA<wait>", + " locale=en_US<wait>", + " netcfg/get_domain=vm<wait>", + " netcfg/get_hostname=vagrant<wait>", + " grub-installer/bootdev=/dev/sda<wait>", + " noapic<wait>", + " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}}<wait>", + " -- <wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": "{{user `disk_size`}}", + "guest_os_type": "ubuntu", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "../builds/packer-{{user `template`}}-parallels", + "parallels_tools_flavor": "lin", + "prlctl": [ + [ + "set", + "{{.Name}}", + "--memsize", + "{{ user `memory` }}" + ], + [ + "set", + "{{.Name}}", + "--cpus", + "{{ user `cpus` }}" + ] + ], + "prlctl_version_file": ".prlctl_version", + "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "parallels-iso", + "vm_name": "{{ user `template` }}" + }, + { + "boot_command": [ + "<esc><wait>", + "<esc><wait>", + "<enter><wait>", + "/install/vmlinuz<wait>", + " auto<wait>", + " console-setup/ask_detect=false<wait>", + " console-setup/layoutcode=us<wait>", + " console-setup/modelcode=pc105<wait>", + " debconf/frontend=noninteractive<wait>", + " debian-installer=en_US<wait>", + " fb=false<wait>", + " initrd=/install/initrd.gz<wait>", + " kbd-chooser/method=us<wait>", + " keyboard-configuration/layout=USA<wait>", + " keyboard-configuration/variant=USA<wait>", + " locale=en_US<wait>", + " netcfg/get_domain=vm<wait>", + " netcfg/get_hostname=vagrant<wait>", + " grub-installer/bootdev=/dev/vda<wait>", + " noapic<wait>", + " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}}<wait>", + " -- <wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": "{{user `disk_size`}}", + "headless": "{{ user `headless` }}", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "../builds/packer-{{user `template`}}-qemu", + "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "qemu", + "vm_name": "{{ user `template` }}", + "qemuargs": [ + [ + "-m", + "{{ user `memory` }}M" + ], + [ + "-smp", + "{{ user `cpus` }}" + ] + ] + }, + { + "boot_command": [ + "<esc><wait10><esc><esc><enter><wait>", + "set gfxpayload=1024x768<enter>", + "linux /install/vmlinuz ", + "preseed/url=http://{{.HTTPIP}}:{{.HTTPPort}}/preseed-hyperv.cfg ", + "debian-installer=en_US auto locale=en_US kbd-chooser/method=us ", + "hostname={{.Name}} ", + "fb=false debconf/frontend=noninteractive ", + "keyboard-configuration/modelcode=SKIP keyboard-configuration/layout=USA ", + "keyboard-configuration/variant=USA console-setup/ask_detect=false <enter>", + "initrd /install/initrd.gz<enter>", + "boot<enter>" + ], + "boot_wait": "10s", + "communicator": "ssh", + "cpu": "{{ user `cpus` }}", + "disk_size": "{{user `disk_size`}}", + "enable_secure_boot": false, + "generation": "{{user `hyperv_generation`}}", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "../builds/packer-{{user `template`}}-hyperv", + "ram_size": "{{user `memory`}}", + "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_timeout": "10000s", + "ssh_username": "vagrant", + "switch_name": "{{user `hyperv_switch`}}", + "type": "hyperv-iso", + "vm_name": "{{ user `template` }}" + } + ], + "post-processors": [ + { + "output": "../builds/{{user `box_basename`}}.{{.Provider}}.box", + "type": "vagrant" + } + ], + "provisioners": [ + { + "environment_vars": [ + "HOME_DIR=/home/vagrant", + "http_proxy={{user `http_proxy`}}", + "https_proxy={{user `https_proxy`}}", + "no_proxy={{user `no_proxy`}}" + ], + "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", + "expect_disconnect": true, + "scripts": [ + "scripts/update.sh", + "../_common/sshd.sh", + "scripts/networking.sh", + "scripts/sudoers.sh", + "scripts/vagrant.sh", + "../_common/virtualbox.sh", + "scripts/vmware.sh", + "../_common/parallels.sh", + "scripts/hyperv.sh", + "scripts/cleanup.sh", + "../_common/minimize.sh" + ], + "type": "shell" + } + ], + "variables": { + "box_basename": "ubuntu-17.10", + "build_timestamp": "{{isotime \"20060102150405\"}}", + "cpus": "1", + "disk_size": "40960", + "git_revision": "__unknown_git_revision__", + "headless": "", + "http_proxy": "{{env `http_proxy`}}", + "https_proxy": "{{env `https_proxy`}}", + "hyperv_generation": "2", + "hyperv_switch": "{{env `hyperv_switch`}}", + "iso_checksum": "af913c00296eb0cfece99b8a02ae6db035ae173ed240241e780c8d7db96914b1", + "iso_checksum_type": "sha256", + "iso_name": "ubuntu-17.10-server-amd64.iso", + "memory": "1024", + "mirror": "http://releases.ubuntu.com", + "mirror_directory": "17.10", + "name": "ubuntu-17.10", + "no_proxy": "{{env `no_proxy`}}", + "preseed_path": "preseed.cfg", + "template": "ubuntu-17.10-amd64", + "version": "TIMESTAMP" + } +} diff --git a/ubuntu/ubuntu-17.10-i386.json b/ubuntu/ubuntu-17.10-i386.json new file mode 100644 index 000000000..594264099 --- /dev/null +++ b/ubuntu/ubuntu-17.10-i386.json @@ -0,0 +1,277 @@ +{ + "builders": [ + { + "boot_command": [ + "<esc><wait>", + "<esc><wait>", + "<enter><wait>", + "/install/vmlinuz<wait>", + " auto<wait>", + " console-setup/ask_detect=false<wait>", + " console-setup/layoutcode=us<wait>", + " console-setup/modelcode=pc105<wait>", + " debconf/frontend=noninteractive<wait>", + " debian-installer=en_US<wait>", + " fb=false<wait>", + " initrd=/install/initrd.gz<wait>", + " kbd-chooser/method=us<wait>", + " keyboard-configuration/layout=USA<wait>", + " keyboard-configuration/variant=USA<wait>", + " locale=en_US<wait>", + " netcfg/get_domain=vm<wait>", + " netcfg/get_hostname=vagrant<wait>", + " grub-installer/bootdev=/dev/sda <wait>", + " noapic<wait>", + " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}}<wait>", + " -- <wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": "{{user `disk_size`}}", + "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "guest_os_type": "Ubuntu", + "hard_drive_interface": "sata", + "headless": "{{ user `headless` }}", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "../builds/packer-{{user `template`}}-virtualbox", + "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "virtualbox-iso", + "vboxmanage": [ + [ + "modifyvm", + "{{.Name}}", + "--memory", + "{{ user `memory` }}" + ], + [ + "modifyvm", + "{{.Name}}", + "--cpus", + "{{ user `cpus` }}" + ] + ], + "virtualbox_version_file": ".vbox_version", + "vm_name": "{{ user `template` }}" + }, + { + "boot_command": [ + "<esc><wait>", + "<esc><wait>", + "<enter><wait>", + "/install/vmlinuz<wait>", + " auto<wait>", + " console-setup/ask_detect=false<wait>", + " console-setup/layoutcode=us<wait>", + " console-setup/modelcode=pc105<wait>", + " debconf/frontend=noninteractive<wait>", + " debian-installer=en_US<wait>", + " fb=false<wait>", + " initrd=/install/initrd.gz<wait>", + " kbd-chooser/method=us<wait>", + " keyboard-configuration/layout=USA<wait>", + " keyboard-configuration/variant=USA<wait>", + " locale=en_US<wait>", + " netcfg/get_domain=vm<wait>", + " netcfg/get_hostname=vagrant<wait>", + " grub-installer/bootdev=/dev/sda <wait>", + " noapic<wait>", + " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}}<wait>", + " -- <wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": "{{user `disk_size`}}", + "guest_os_type": "ubuntu", + "headless": "{{ user `headless` }}", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "../builds/packer-{{user `template`}}-vmware", + "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "tools_upload_flavor": "linux", + "type": "vmware-iso", + "vm_name": "{{ user `template` }}", + "vmx_data": { + "cpuid.coresPerSocket": "1", + "ethernet0.pciSlotNumber": "32", + "memsize": "{{ user `memory` }}", + "numvcpus": "{{ user `cpus` }}" + }, + "vmx_remove_ethernet_interfaces": true + }, + { + "boot_command": [ + "<esc><wait>", + "<esc><wait>", + "<enter><wait>", + "/install/vmlinuz<wait>", + " auto<wait>", + " console-setup/ask_detect=false<wait>", + " console-setup/layoutcode=us<wait>", + " console-setup/modelcode=pc105<wait>", + " debconf/frontend=noninteractive<wait>", + " debian-installer=en_US<wait>", + " fb=false<wait>", + " initrd=/install/initrd.gz<wait>", + " kbd-chooser/method=us<wait>", + " keyboard-configuration/layout=USA<wait>", + " keyboard-configuration/variant=USA<wait>", + " locale=en_US<wait>", + " netcfg/get_domain=vm<wait>", + " netcfg/get_hostname=vagrant<wait>", + " grub-installer/bootdev=/dev/sda <wait>", + " noapic<wait>", + " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}}<wait>", + " -- <wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": "{{user `disk_size`}}", + "guest_os_type": "ubuntu", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "../builds/packer-{{user `template`}}-parallels", + "parallels_tools_flavor": "lin", + "prlctl": [ + [ + "set", + "{{.Name}}", + "--memsize", + "{{ user `memory` }}" + ], + [ + "set", + "{{.Name}}", + "--cpus", + "{{ user `cpus` }}" + ] + ], + "prlctl_version_file": ".prlctl_version", + "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "parallels-iso", + "vm_name": "{{ user `template` }}" + }, + { + "boot_command": [ + "<esc><wait>", + "<esc><wait>", + "<enter><wait>", + "/install/vmlinuz<wait>", + " auto<wait>", + " console-setup/ask_detect=false<wait>", + " console-setup/layoutcode=us<wait>", + " console-setup/modelcode=pc105<wait>", + " debconf/frontend=noninteractive<wait>", + " debian-installer=en_US<wait>", + " fb=false<wait>", + " initrd=/install/initrd.gz<wait>", + " kbd-chooser/method=us<wait>", + " keyboard-configuration/layout=USA<wait>", + " keyboard-configuration/variant=USA<wait>", + " locale=en_US<wait>", + " netcfg/get_domain=vm<wait>", + " netcfg/get_hostname=vagrant<wait>", + " grub-installer/bootdev=/dev/vda <wait>", + " noapic<wait>", + " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}}<wait>", + " -- <wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": "{{user `disk_size`}}", + "headless": "{{ user `headless` }}", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "../builds/packer-{{user `template`}}-qemu", + "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "qemu", + "vm_name": "{{ user `template` }}", + "qemuargs": [ + [ + "-m", + "{{ user `memory` }}M" + ], + [ + "-smp", + "{{ user `cpus` }}" + ] + ] + } + ], + "post-processors": [ + { + "output": "../builds/{{user `box_basename`}}.{{.Provider}}.box", + "type": "vagrant" + } + ], + "provisioners": [ + { + "environment_vars": [ + "HOME_DIR=/home/vagrant", + "http_proxy={{user `http_proxy`}}", + "https_proxy={{user `https_proxy`}}", + "no_proxy={{user `no_proxy`}}" + ], + "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", + "expect_disconnect": true, + "scripts": [ + "scripts/update.sh", + "../_common/sshd.sh", + "scripts/networking.sh", + "scripts/sudoers.sh", + "scripts/vagrant.sh", + "../_common/virtualbox.sh", + "scripts/vmware.sh", + "../_common/parallels.sh", + "scripts/cleanup.sh", + "../_common/minimize.sh" + ], + "type": "shell" + } + ], + "variables": { + "box_basename": "ubuntu-17.10-i386", + "build_timestamp": "{{isotime \"20060102150405\"}}", + "cpus": "1", + "disk_size": "40960", + "git_revision": "__unknown_git_revision__", + "headless": "", + "http_proxy": "{{env `http_proxy`}}", + "https_proxy": "{{env `https_proxy`}}", + "iso_checksum": "d8fc9cea7eadeec39253fe62c215111314c582ef9ec10b6a70959265bac73cc4", + "iso_checksum_type": "sha256", + "iso_name": "ubuntu-17.10-server-i386.iso", + "memory": "1024", + "mirror": "http://releases.ubuntu.com", + "mirror_directory": "17.10", + "name": "ubuntu-17.10-i386", + "no_proxy": "{{env `no_proxy`}}", + "preseed_path": "preseed.cfg", + "template": "ubuntu-17.10-i386", + "version": "TIMESTAMP" + } +} From 1d42c3ba6294fafcfafe2b78f55cd5f219661879 Mon Sep 17 00:00:00 2001 From: Seth Thomas <sthomas@chef.io> Date: Tue, 24 Oct 2017 17:23:27 -0400 Subject: [PATCH 0720/1622] Fix #919 Signed-off-by: Seth Thomas <sthomas@chef.io> --- opensuse/opensuse-leap-42.3-x86_64.json | 5 ----- 1 file changed, 5 deletions(-) diff --git a/opensuse/opensuse-leap-42.3-x86_64.json b/opensuse/opensuse-leap-42.3-x86_64.json index 0ced8c8d6..e9c953901 100644 --- a/opensuse/opensuse-leap-42.3-x86_64.json +++ b/opensuse/opensuse-leap-42.3-x86_64.json @@ -161,11 +161,6 @@ } ], "provisioners": [ - { - "destination": "/tmp/bento-metadata.json", - "source": "{{user `metadata`}}", - "type": "file" - }, { "environment_vars": [ "HOME_DIR=/home/vagrant", From e7e225e266381da1ed82963ea7a55fd4dcab3da9 Mon Sep 17 00:00:00 2001 From: Seth Thomas <sthomas@chef.io> Date: Tue, 24 Oct 2017 17:55:56 -0400 Subject: [PATCH 0721/1622] Simplifying rake tasks Signed-off-by: Seth Thomas <sthomas@chef.io> --- Rakefile | 92 +++++++++++++++++--------------------------------------- 1 file changed, 27 insertions(+), 65 deletions(-) diff --git a/Rakefile b/Rakefile index bb1263ff9..9e8ec6f0c 100644 --- a/Rakefile +++ b/Rakefile @@ -6,71 +6,27 @@ task :do_all do templates.each do |template| Rake::Task["clean"].invoke Rake::Task["clean"].reenable - - Rake::Task["build"].invoke(template, ENV["BENTO_VERSION"]) - Rake::Task["build"].reenable - - Rake::Task["test"].invoke - Rake::Task["test"].reenable - - Rake::Task["upload"].invoke - Rake::Task["upload"].reenable - + sh build_cmd(template) + sh "bento test" unless ENV["BENTO_AUTO_RELEASE"].nil? - Rake::Task["release"].invoke(template, ENV["BENTO_VERSION"]) - Rake::Task["release"].reenable + sh "bento upload" + sh "bento release #{template} #{ENV["BENTO_VERSION"]}" end end end -desc "Build a bento template" -task :build, :template, :version do |_, args| - cmd = %W{bento build #{args[:template]}} - cmd.insert(2, "--only #{providers}") - cmd.insert(2, "--mirror #{ENV['PACKER_MIRROR']}") if ENV["PACKER_MIRROR"] - cmd.insert(2, "--version #{args[:version]}") if args[:version] - cmd.join(" ") - sh a_to_s(cmd) -end - -desc "release" -task :release, :template, :version do |_, args| - sh "bento release #{box_name(args[:template])} #{args[:version]}" -end - -desc "release all" -task :release_all, :version do |_, args| - templates.each do |template| - Rake::Task["release"].invoke(template, args[:version]) - Rake::Task["release"].reenable - end -end - -desc "test" -task :test do - sh "bento test" -end - -desc "upload" -task :upload do - sh "bento upload" -end - -desc "Clean" +desc "clean" task :clean do - sh "rm -rf builds/*.json builds/*.box packer-* .kitchen.yml" -end - -def a_to_s(*args) - clean_array(*args).join(" ") + sh "rm -rf builds/* .kitchen.yml" end -def box_name(template) - template.match(/-x86_64|-amd64/) ? template.gsub(/-x86_64|-amd64/,'') : template -end - -def builds - YAML.load(File.read("builds.yml")) +def build_cmd(template) + cmd = %W{bento build #{template}.json} + cmd.insert(2, "--only #{providers}") + cmd.insert(2, "--mirror #{ENV['PACKER_MIRROR']}") if ENV["PACKER_MIRROR"] + cmd.insert(2, "--version #{ENV['BENTO_VERSION']}") + cmd.join(" ") + a_to_s(cmd) end def check_env @@ -81,17 +37,23 @@ def check_env end def providers - if ENV["BENTO_PROVIDERS"] - ENV["BENTO_PROVIDERS"] - elsif builds['providers'] - builds['providers'].join(',') + if config['providers'] + config['providers'].join(',') else puts "No Providers Specified." - puts "Set BENTO_PROVIDERS in ENV or `providers` in builds.yml" + puts "Set `providers` in builds.yml" exit 1 end end +def a_to_s(*args) + clean_array(*args).join(" ") +end + +def config + YAML.load(File.read("builds.yml")) +end + def clean_array(*args) args.flatten.reject { |i| i.nil? || i == "" }.map(&:to_s) end @@ -99,14 +61,14 @@ end def templates bit32 = [] bit64 = [] - builds['public'].each do |platform, versions| + config['public'].each do |platform, versions| versions.each do |version, archs| archs.each do |arch| case arch when "i386" - bit32 << "#{platform}-#{version}-#{arch}" + bit32 << "#{platform}/#{platform}-#{version}-#{arch}" else - bit64 << "#{platform}-#{version}-#{arch}" + bit64 << "#{platform}/#{platform}-#{version}-#{arch}" end end end From 4b230a630f97e8f40eb404eaeab5e53bc76b9982 Mon Sep 17 00:00:00 2001 From: Seth Thomas <sthomas@chef.io> Date: Wed, 25 Oct 2017 15:15:45 -0400 Subject: [PATCH 0722/1622] Templates from config now matched against file location more intelligently Signed-off-by: Seth Thomas <sthomas@chef.io> --- Rakefile | 29 ++++++++++++++++++----------- 1 file changed, 18 insertions(+), 11 deletions(-) diff --git a/Rakefile b/Rakefile index 9e8ec6f0c..f7592d31c 100644 --- a/Rakefile +++ b/Rakefile @@ -21,7 +21,7 @@ task :clean do end def build_cmd(template) - cmd = %W{bento build #{template}.json} + cmd = %W{bento build #{template}} cmd.insert(2, "--only #{providers}") cmd.insert(2, "--mirror #{ENV['PACKER_MIRROR']}") if ENV["PACKER_MIRROR"] cmd.insert(2, "--version #{ENV['BENTO_VERSION']}") @@ -58,20 +58,27 @@ def clean_array(*args) args.flatten.reject { |i| i.nil? || i == "" }.map(&:to_s) end +# create sorted list of builds matched against available templates +# ignoring known private images and working dir +# TODO: move this logic to bento-ya def templates - bit32 = [] - bit64 = [] - config['public'].each do |platform, versions| - versions.each do |version, archs| - archs.each do |arch| - case arch - when "i386" - bit32 << "#{platform}/#{platform}-#{version}-#{arch}" + ts = Dir.glob('**/*.json').reject{ |f| f['builds'] } + ts.reject{ |f| f[/macos|rhel|sles|solaris|windows/] } + + b32 = [] + b64 = [] + config['public'].each do |p, vs| + vs.each do |v, as| + as.each do |a| + case a + when "i386", "i686" + b32 << ts.select{ |i| i[/#{p}-#{v}-#{a}/] } else - bit64 << "#{platform}/#{platform}-#{version}-#{arch}" + b64 << ts.select{ |i| i[/#{p}-#{v}-#{a}/] } end end end end - bit64 + bit32 + list = b64 + b32 + list.flatten end From 06037b018bbcd5edb2ebec8f8eeb9cbc9fed9693 Mon Sep 17 00:00:00 2001 From: Seth Thomas <sthomas@chef.io> Date: Tue, 31 Oct 2017 09:35:25 -0400 Subject: [PATCH 0723/1622] Fixing bad replace Signed-off-by: Seth Thomas <sthomas@chef.io> --- ubuntu/ubuntu-16.04-i386.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ubuntu/ubuntu-16.04-i386.json b/ubuntu/ubuntu-16.04-i386.json index 147ed2de7..047f0f1da 100644 --- a/ubuntu/ubuntu-16.04-i386.json +++ b/ubuntu/ubuntu-16.04-i386.json @@ -265,12 +265,12 @@ "headless": "", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", - "iso_checksum": "e20cf9e0812b52287ca22ac1815bc933c0cfef2be88191110b697d8943bef19e", + "iso_checksum": "2e763f7f3546be33ebc9a59311b2eee3b0b0c8e021fae65431c219b531d26d32", "iso_checksum_type": "sha256", - "iso_name": "ubuntu-16.04.4-server-i386.iso", + "iso_name": "ubuntu-16.04.3-server-i386.iso", "memory": "1024", - "mirror": "http://old-releases.ubuntu.com/releases", - "mirror_directory": "16.04.4", + "mirror": "http://releases.ubuntu.com/releases", + "mirror_directory": "16.04.3", "name": "ubuntu-16.04-i386", "no_proxy": "{{env `no_proxy`}}", "preseed_path": "preseed.cfg", From 5483e2d606a01f55f33701bb18a1edcd405d8168 Mon Sep 17 00:00:00 2001 From: Carsten Dumke <cdumke@cdumke.de> Date: Wed, 8 Nov 2017 21:11:43 +0100 Subject: [PATCH 0724/1622] fixing bad language-setting in vmware-iso builder of sles/sles12-sp3-x86_64 * this fixes issue #932 --- sles/sles-12-sp3-x86_64.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sles/sles-12-sp3-x86_64.json b/sles/sles-12-sp3-x86_64.json index ce26769d3..95adfbfc2 100644 --- a/sles/sles-12-sp3-x86_64.json +++ b/sles/sles-12-sp3-x86_64.json @@ -46,7 +46,7 @@ "boot_command": [ "<esc><enter><wait>", "linux netdevice=eth0 netsetup=dhcp install=cd:/<wait>", - " lang=en_US-8 autoyast=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `autoinst_cfg`}}<wait>", + " lang=en_US autoyast=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `autoinst_cfg`}}<wait>", " textmode=1<wait>", "<enter><wait>" ], From ebc95484a2c1a15c5f8321200bbb456074cb7ba9 Mon Sep 17 00:00:00 2001 From: Carsten Dumke <cdumke@cdumke.de> Date: Wed, 8 Nov 2017 21:55:51 +0100 Subject: [PATCH 0725/1622] fixing guest_os_type for sles-12-sp(2|3)-x86_64 setting it to sles12-64 * fixing issue #936 * tested on VMware Workstation 12 Pro (for sles-12-sp3-x86_64) --- sles/sles-12-sp2-x86_64.json | 2 +- sles/sles-12-sp3-x86_64.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sles/sles-12-sp2-x86_64.json b/sles/sles-12-sp2-x86_64.json index fcbfac29f..5154531f7 100644 --- a/sles/sles-12-sp2-x86_64.json +++ b/sles/sles-12-sp2-x86_64.json @@ -52,7 +52,7 @@ ], "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", - "guest_os_type": "sles11-64", + "guest_os_type": "sles12-64", "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "{{user `iso_checksum`}}", diff --git a/sles/sles-12-sp3-x86_64.json b/sles/sles-12-sp3-x86_64.json index 95adfbfc2..8b03eca44 100644 --- a/sles/sles-12-sp3-x86_64.json +++ b/sles/sles-12-sp3-x86_64.json @@ -52,7 +52,7 @@ ], "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", - "guest_os_type": "sles11-64", + "guest_os_type": "sles12-64", "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "{{user `iso_checksum`}}", From 9e08c43858d47e6720bdcb9408e1e824149e553b Mon Sep 17 00:00:00 2001 From: Benjamin Konick <bkonick@gmail.com> Date: Tue, 28 Nov 2017 12:27:54 -0500 Subject: [PATCH 0726/1622] Fix network persistence on openSUSE --- opensuse/scripts/cleanup.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/opensuse/scripts/cleanup.sh b/opensuse/scripts/cleanup.sh index 62f779c89..e05f9d723 100644 --- a/opensuse/scripts/cleanup.sh +++ b/opensuse/scripts/cleanup.sh @@ -3,5 +3,9 @@ zypper -n rm -u gcc make kernel-default-devel kernel-devel +# Clean up network interface persistence +rm -f /etc/udev/rules.d/70-persistent-net.rules; +touch /etc/udev/rules.d/75-persistent-net-generator.rules; + # delete any logs that have built up during the install find /var/log/ -name *.log -exec rm -f {} \; From 74953faaae677c252bc3afba956e8b731924402d Mon Sep 17 00:00:00 2001 From: Kentaro Hayashi <hayashi@clear-code.com> Date: Tue, 12 Dec 2017 21:31:56 +0900 Subject: [PATCH 0727/1622] Support Debian 9.3 point release see https://www.debian.org/News/2017/2017120902 --- .../{debian-9.2-amd64.json => debian-9.3-amd64.json} | 10 +++++----- .../{debian-9.2-i386.json => debian-9.3-i386.json} | 12 ++++++------ 2 files changed, 11 insertions(+), 11 deletions(-) rename debian/{debian-9.2-amd64.json => debian-9.3-amd64.json} (97%) rename debian/{debian-9.2-i386.json => debian-9.3-i386.json} (96%) diff --git a/debian/debian-9.2-amd64.json b/debian/debian-9.3-amd64.json similarity index 97% rename from debian/debian-9.2-amd64.json rename to debian/debian-9.3-amd64.json index 2e6a666b2..8bc660733 100644 --- a/debian/debian-9.2-amd64.json +++ b/debian/debian-9.3-amd64.json @@ -217,7 +217,7 @@ } ], "variables": { - "box_basename": "debian-9.2", + "box_basename": "debian-9.3", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", "disk_size": "40960", @@ -225,16 +225,16 @@ "headless": "", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", - "iso_checksum": "ec78bc48b48d676775b60eda41528ec33c151c2ce7414a12b13d9b73d34de544", + "iso_checksum": "83480be837710a76fd4e75a6573ca110e06f5a7589d2d3852bdb0f45749800b3", "iso_checksum_type": "sha256", - "iso_name": "debian-9.2.1-amd64-netinst.iso", + "iso_name": "debian-9.3.0-amd64-netinst.iso", "memory": "1024", "mirror": "http://cdimage.debian.org/cdimage/release", - "mirror_directory": "9.2.1/amd64/iso-cd", + "mirror_directory": "9.3.0/amd64/iso-cd", "name": "debian-9.2", "no_proxy": "{{env `no_proxy`}}", "preseed_path": "debian-8/preseed.cfg", - "template": "debian-9.2-amd64", + "template": "debian-9.3-amd64", "version": "TIMESTAMP" } } diff --git a/debian/debian-9.2-i386.json b/debian/debian-9.3-i386.json similarity index 96% rename from debian/debian-9.2-i386.json rename to debian/debian-9.3-i386.json index 8ef8d6957..a990cd8c6 100644 --- a/debian/debian-9.2-i386.json +++ b/debian/debian-9.3-i386.json @@ -217,7 +217,7 @@ } ], "variables": { - "box_basename": "debian-9.2-i386", + "box_basename": "debian-9.3-i386", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", "disk_size": "40960", @@ -225,16 +225,16 @@ "headless": "", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", - "iso_checksum": "464e2b960a556e7640d239d1268c51a3ae59c0a8c295cd0f4175cff0a1302095", + "iso_checksum": "7a00a366465c9d75c0961a09a6f625859f594eb6afc18461ab6b3f11ca5930ad", "iso_checksum_type": "sha256", - "iso_name": "debian-9.2.1-i386-netinst.iso", + "iso_name": "debian-9.3.0-i386-netinst.iso", "memory": "1024", "mirror": "http://cdimage.debian.org/cdimage/release", - "mirror_directory": "9.2.1/i386/iso-cd", - "name": "debian-9.2-i386", + "mirror_directory": "9.3.0/i386/iso-cd", + "name": "debian-9.3-i386", "no_proxy": "{{env `no_proxy`}}", "preseed_path": "debian-8/preseed.cfg", - "template": "debian-9.2-i386", + "template": "debian-9.3-i386", "version": "TIMESTAMP" } } From 0c7ad61bbf1c92a596646600222a327c709be997 Mon Sep 17 00:00:00 2001 From: Kentaro Hayashi <hayashi@clear-code.com> Date: Tue, 12 Dec 2017 22:14:16 +0900 Subject: [PATCH 0728/1622] Support Debian 8.10 point release see https://www.debian.org/News/2017/20171209 --- ...{debian-8.9-amd64.json => debian-8.10-amd64.json} | 12 ++++++------ .../{debian-8.9-i386.json => debian-8.10-i386.json} | 12 ++++++------ 2 files changed, 12 insertions(+), 12 deletions(-) rename debian/{debian-8.9-amd64.json => debian-8.10-amd64.json} (96%) rename debian/{debian-8.9-i386.json => debian-8.10-i386.json} (96%) diff --git a/debian/debian-8.9-amd64.json b/debian/debian-8.10-amd64.json similarity index 96% rename from debian/debian-8.9-amd64.json rename to debian/debian-8.10-amd64.json index 01b22b0d1..ec1307f75 100644 --- a/debian/debian-8.9-amd64.json +++ b/debian/debian-8.10-amd64.json @@ -217,7 +217,7 @@ } ], "variables": { - "box_basename": "debian-8.9", + "box_basename": "debian-8.10", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", "disk_size": "40960", @@ -225,16 +225,16 @@ "headless": "", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", - "iso_checksum": "0d55d42629676f2516ae6edfc8af5134194dd5d89ae791329d24fceba2cc3fd8", + "iso_checksum": "039a2669fecfb06949251cf32834b9d8a8eb0a660d9bb21332ac264a2c5e7435", "iso_checksum_type": "sha256", - "iso_name": "debian-8.9.0-amd64-CD-1.iso", + "iso_name": "debian-8.10.0-amd64-CD-1.iso", "memory": "1024", "mirror": "http://cdimage.debian.org/cdimage/archive", - "mirror_directory": "8.9.0/amd64/iso-cd", - "name": "debian-8.9", + "mirror_directory": "8.10.0/amd64/iso-cd", + "name": "debian-8.10", "no_proxy": "{{env `no_proxy`}}", "preseed_path": "debian-8/preseed.cfg", - "template": "debian-8.9-amd64", + "template": "debian-8.10-amd64", "version": "TIMESTAMP" } } diff --git a/debian/debian-8.9-i386.json b/debian/debian-8.10-i386.json similarity index 96% rename from debian/debian-8.9-i386.json rename to debian/debian-8.10-i386.json index 9164f8159..8177ac8c1 100644 --- a/debian/debian-8.9-i386.json +++ b/debian/debian-8.10-i386.json @@ -217,7 +217,7 @@ } ], "variables": { - "box_basename": "debian-8.9-i386", + "box_basename": "debian-8.10-i386", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", "disk_size": "40960", @@ -225,16 +225,16 @@ "headless": "", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", - "iso_checksum": "7fd13800ab4446c77cbb6341fbd1cddb9d977fdc4357a0a01eea809a2e7c03b7", + "iso_checksum": "1d837e8551ac01807f3ab908045f9f34281184259e9562eab95c74b07a676fba", "iso_checksum_type": "sha256", - "iso_name": "debian-8.9.0-i386-CD-1.iso", + "iso_name": "debian-8.10.0-i386-CD-1.iso", "memory": "1024", "mirror": "http://cdimage.debian.org/cdimage/archive", - "mirror_directory": "8.9.0/i386/iso-cd", - "name": "debian-8.9-i386", + "mirror_directory": "8.10.0/i386/iso-cd", + "name": "debian-8.10-i386", "no_proxy": "{{env `no_proxy`}}", "preseed_path": "debian-8/preseed.cfg", - "template": "debian-8.9-i386", + "template": "debian-8.10-i386", "version": "TIMESTAMP" } } From 7218c3801f945263e711fb267e9ff2942ad7e344 Mon Sep 17 00:00:00 2001 From: "Christopher P. Maher" <defilan@gmail.com> Date: Fri, 15 Dec 2017 14:09:45 -0800 Subject: [PATCH 0729/1622] Added fedora-27 Signed-off-by: Christopher P. Maher <defilan@gmail.com> --- fedora/fedora-27-x86_64.json | 180 +++++++++++++++++++++++++++++++++++ 1 file changed, 180 insertions(+) create mode 100644 fedora/fedora-27-x86_64.json diff --git a/fedora/fedora-27-x86_64.json b/fedora/fedora-27-x86_64.json new file mode 100644 index 000000000..1f02bcbce --- /dev/null +++ b/fedora/fedora-27-x86_64.json @@ -0,0 +1,180 @@ +{ + "builders": [ + { + "boot_command": [ + "<tab> linux ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": "{{user `disk_size`}}", + "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "guest_os_type": "Fedora_64", + "hard_drive_interface": "sata", + "headless": "{{ user `headless` }}", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "../builds/packer-{{user `template`}}-virtualbox", + "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "virtualbox-iso", + "vboxmanage": [ + [ + "modifyvm", + "{{.Name}}", + "--memory", + "{{ user `memory` }}" + ], + [ + "modifyvm", + "{{.Name}}", + "--cpus", + "{{ user `cpus` }}" + ] + ], + "virtualbox_version_file": ".vbox_version", + "vm_name": "{{ user `template` }}" + }, + { + "boot_command": [ + "<tab> linux ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": "{{user `disk_size`}}", + "guest_os_type": "fedora-64", + "headless": "{{ user `headless` }}", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "../builds/packer-{{user `template`}}-vmware", + "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "tools_upload_flavor": "linux", + "type": "vmware-iso", + "vm_name": "{{ user `template` }}", + "vmx_data": { + "cpuid.coresPerSocket": "1", + "ethernet0.pciSlotNumber": "32", + "memsize": "{{ user `memory` }}", + "numvcpus": "{{ user `cpus` }}" + }, + "vmx_remove_ethernet_interfaces": true + }, + { + "boot_command": [ + "<tab> linux ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": "{{user `disk_size`}}", + "guest_os_type": "fedora-core", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "../builds/packer-{{user `template`}}-parallels", + "parallels_tools_flavor": "lin", + "prlctl": [ + [ + "set", + "{{.Name}}", + "--memsize", + "{{ user `memory` }}" + ], + [ + "set", + "{{.Name}}", + "--cpus", + "{{ user `cpus` }}" + ] + ], + "prlctl_version_file": ".prlctl_version", + "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "parallels-iso", + "vm_name": "{{ user `template` }}" + }, + { + "boot_command": [ + "<tab> linux ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": "{{user `disk_size`}}", + "headless": "{{ user `headless` }}", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "../builds/packer-{{user `template`}}-qemu", + "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "qemu", + "vm_name": "{{ user `template` }}" + } + ], + "post-processors": [ + { + "output": "../builds/{{user `box_basename`}}.{{.Provider}}.box", + "type": "vagrant" + } + ], + "provisioners": [ + { + "environment_vars": [ + "HOME_DIR=/home/vagrant", + "http_proxy={{user `http_proxy`}}", + "https_proxy={{user `https_proxy`}}", + "no_proxy={{user `no_proxy`}}" + ], + "execute_command": "echo 'vagrant' | {{.Vars}} sudo -E -S bash '{{.Path}}'", + "expect_disconnect": true, + "scripts": [ + "scripts/swap.sh", + "scripts/fix-slow-dns.sh", + "scripts/build-tools.sh", + "../_common/sshd.sh", + "../_common/virtualbox.sh", + "../_common/vmware.sh", + "../_common/parallels.sh", + "../_common/vagrant.sh", + "scripts/cleanup.sh", + "../_common/minimize.sh" + ], + "type": "shell" + } + ], + "variables": { + "arch": "64", + "box_basename": "fedora-27", + "build_timestamp": "{{isotime \"20060102150405\"}}", + "cpus": "1", + "disk_size": "40960", + "git_revision": "__unknown_git_revision__", + "headless": "", + "http_proxy": "{{env `http_proxy`}}", + "https_proxy": "{{env `https_proxy`}}", + "iso_checksum": "e383dd414bb57231b20cbed11c4953cac71785f7d4f5990b0df5ad534a0ba95c", + "iso_checksum_type": "sha256", + "iso_name": "Fedora-Server-dvd-x86_64-27-1.6.iso", + "ks_path": "ks.cfg", + "memory": "1024", + "mirror": "http://download.fedoraproject.org/pub/fedora/linux", + "mirror_directory": "releases/27/Server/x86_64/iso", + "name": "fedora-27", + "no_proxy": "{{env `no_proxy`}}", + "template": "fedora-27-x86_64", + "version": "TIMESTAMP" + } +} From d8e7e9e9841763938df1bef2d486f90a690c9d4f Mon Sep 17 00:00:00 2001 From: Li-Wen Hsu <lwhsu@lwhsu.org> Date: Mon, 18 Dec 2017 00:26:09 +0800 Subject: [PATCH 0730/1622] Don't install src while creating box This speeds up box creation a lot. The box creation is using pkg(1) to install software so doesn't need source files. It doesn't make much sense installing all the source files and then deleting them during cleanup stage. --- freebsd/http/freebsd-11/installerconfig | 2 +- freebsd/scripts/cleanup.sh | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/freebsd/http/freebsd-11/installerconfig b/freebsd/http/freebsd-11/installerconfig index 74fba1236..6e16df1c5 100644 --- a/freebsd/http/freebsd-11/installerconfig +++ b/freebsd/http/freebsd-11/installerconfig @@ -1,4 +1,4 @@ -DISTRIBUTIONS="base.txz lib32.txz kernel.txz src.txz" +DISTRIBUTIONS="base.txz lib32.txz kernel.txz" # for variations in the root disk device name between VMware and Virtualbox if [ -e /dev/ada0 ]; then diff --git a/freebsd/scripts/cleanup.sh b/freebsd/scripts/cleanup.sh index 8b15f6feb..81d2016c6 100644 --- a/freebsd/scripts/cleanup.sh +++ b/freebsd/scripts/cleanup.sh @@ -7,6 +7,5 @@ rm -f /var/db/freebsd-update/*-rollback; rm -rf /var/db/freebsd-update/install.*; rm -rf /boot/kernel.old; rm -f /boot/kernel*/*.symbols; -rm -rf /usr/src/*; rm -f /*.core; rm -rf /var/cache/pkg; From 2e79c7fe1201e9689578189a19839f07b931a33f Mon Sep 17 00:00:00 2001 From: Li-Wen Hsu <lwhsu@lwhsu.org> Date: Mon, 18 Dec 2017 01:50:18 +0800 Subject: [PATCH 0731/1622] Add config for FreeBSD-11.1-i386 --- freebsd/freebsd-11.1-i386.json | 228 +++++++++++++++++++++++++++++++++ 1 file changed, 228 insertions(+) create mode 100644 freebsd/freebsd-11.1-i386.json diff --git a/freebsd/freebsd-11.1-i386.json b/freebsd/freebsd-11.1-i386.json new file mode 100644 index 000000000..be70c2b93 --- /dev/null +++ b/freebsd/freebsd-11.1-i386.json @@ -0,0 +1,228 @@ +{ + "builders": [ + { + "boot_command": [ + "<esc><wait>", + "boot -s<wait>", + "<enter><wait>", + "<wait10><wait10>", + "/bin/sh<enter><wait>", + "mdmfs -s 100m md1 /tmp<enter><wait>", + "mdmfs -s 100m md2 /mnt<enter><wait>", + "dhclient -l /tmp/dhclient.lease.em0 em0<enter><wait>", + "fetch -o /tmp/installerconfig http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} && bsdinstall script /tmp/installerconfig<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": "{{user `disk_size`}}", + "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "guest_os_type": "FreeBSD", + "headless": "{{ user `headless` }}", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "../builds/packer-{{user `template`}}-virtualbox", + "shutdown_command": "echo 'vagrant' | su -m root -c 'shutdown -p now'", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "virtualbox-iso", + "vboxmanage": [ + [ + "modifyvm", + "{{.Name}}", + "--memory", + "{{ user `memory` }}" + ], + [ + "modifyvm", + "{{.Name}}", + "--cpus", + "{{ user `cpus` }}" + ] + ], + "virtualbox_version_file": ".vbox_version", + "vm_name": "{{ user `template` }}" + }, + { + "boot_command": [ + "<esc><wait>", + "boot -s<wait>", + "<enter><wait>", + "<wait10><wait10>", + "/bin/sh<enter><wait>", + "mdmfs -s 100m md1 /tmp<enter><wait>", + "mdmfs -s 100m md2 /mnt<enter><wait>", + "dhclient -l /tmp/dhclient.lease.em0 em0<enter><wait>", + "<wait5>", + "fetch -o /tmp/installerconfig http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} && bsdinstall script /tmp/installerconfig<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": "{{user `disk_size`}}", + "guest_os_type": "freebsd", + "headless": "{{ user `headless` }}", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "../builds/packer-{{user `template`}}-vmare", + "shutdown_command": "echo 'vagrant' | su -m root -c 'shutdown -p now'", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "tools_upload_flavor": "freebsd", + "type": "vmware-iso", + "vm_name": "{{ user `template` }}", + "vmx_data": { + "cpuid.coresPerSocket": "1", + "memsize": "{{ user `memory` }}", + "numvcpus": "{{ user `cpus` }}" + }, + "vmx_remove_ethernet_interfaces": true + }, + { + "boot_command": [ + "<esc><wait>", + "boot -s<wait>", + "<enter><wait>", + "<wait10><wait10>", + "/bin/sh<enter><wait>", + "mdmfs -s 100m md1 /tmp<enter><wait>", + "mdmfs -s 100m md2 /mnt<enter><wait>", + "dhclient -l /tmp/dhclient.lease.em0 em0<enter><wait>", + "fetch -o /tmp/installerconfig http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} && bsdinstall script /tmp/installerconfig<enter><wait>" + ], + "boot_wait": "8s", + "disk_size": "{{user `disk_size`}}", + "guest_os_type": "freebsd", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "../builds/packer-{{user `template`}}-parallels", + "parallels_tools_mode": "disable", + "prlctl": [ + [ + "set", + "{{.Name}}", + "--memsize", + "{{ user `memory` }}" + ], + [ + "set", + "{{.Name}}", + "--cpus", + "{{ user `cpus` }}" + ], + [ + "set", + "{{.Name}}", + "--device-set", + "cdrom0", + "--iface", + "ide" + ], + [ + "set", + "{{.Name}}", + "--device-del", + "fdd0" + ], + [ + "set", + "{{.Name}}", + "--device-del", + "parallel0" + ] + ], + "prlctl_version_file": ".prlctl_version", + "shutdown_command": "echo 'vagrant' | su -m root -c 'shutdown -p now'", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "parallels-iso", + "vm_name": "{{ user `template` }}" + }, + { + "boot_command": [ + "<esc><wait>", + "boot -s<wait>", + "<enter><wait>", + "<wait10><wait10>", + "/bin/sh<enter><wait>", + "mdmfs -s 100m md1 /tmp<enter><wait>", + "mdmfs -s 100m md2 /mnt<enter><wait>", + "dhclient -l /tmp/dhclient.lease.vtnet0 vtnet0<enter><wait>", + "fetch -o /tmp/installerconfig http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} && bsdinstall script /tmp/installerconfig<enter><wait>" + ], + "boot_wait": "7s", + "disk_size": "{{user `disk_size`}}", + "headless": "{{ user `headless` }}", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "../builds/packer-{{user `template`}}-qemu", + "shutdown_command": "echo 'vagrant' | su -m root -c 'shutdown -p now'", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "qemu", + "vm_name": "{{ user `template` }}" + } + ], + "post-processors": [ + { + "output": "../builds/{{user `box_basename`}}.{{.Provider}}.box", + "type": "vagrant", + "vagrantfile_template": "vagrantfile_templates/freebsd.rb" + } + ], + "provisioners": [ + { + "environment_vars": [ + "HOME_DIR=/home/vagrant", + "http_proxy={{user `http_proxy`}}", + "https_proxy={{user `https_proxy`}}", + "no_proxy={{user `no_proxy`}}" + ], + "execute_command": "echo 'vagrant' | {{.Vars}} su -m root -c 'sh -eux {{.Path}}'", + "expect_disconnect": true, + "scripts": [ + "scripts/update.sh", + "scripts/postinstall.sh", + "scripts/sudoers.sh", + "../_common/vagrant.sh", + "scripts/vmtools.sh", + "scripts/cleanup.sh", + "scripts/minimize.sh" + ], + "type": "shell" + } + ], + "variables": { + "box_basename": "freebsd-11.1-i386", + "build_timestamp": "{{isotime \"20060102150405\"}}", + "cpus": "1", + "disk_size": "40960", + "git_revision": "__unknown_git_revision__", + "headless": "", + "http_proxy": "{{env `http_proxy`}}", + "https_proxy": "{{env `https_proxy`}}", + "install_path": "freebsd-11/installerconfig", + "iso_checksum": "e53ae5fc58fd2e28643ba4c64e2c49505cf9d84d22396e3633ee9670782aab57", + "iso_checksum_type": "sha256", + "iso_name": "FreeBSD-11.1-RELEASE-i386-disc1.iso", + "memory": "1024", + "mirror": "https://download.freebsd.org/ftp", + "mirror_directory": "releases/i386/i386/ISO-IMAGES/11.1", + "no_proxy": "{{env `no_proxy`}}", + "template": "freebsd-11.1-i386", + "version": "TIMESTAMP" + } +} + From e70250d850be393046736128acd3de9dee7b6616 Mon Sep 17 00:00:00 2001 From: Li-Wen Hsu <lwhsu@lwhsu.org> Date: Mon, 18 Dec 2017 01:51:13 +0800 Subject: [PATCH 0732/1622] Install lib32.txz conditionally --- freebsd/http/freebsd-11/installerconfig | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/freebsd/http/freebsd-11/installerconfig b/freebsd/http/freebsd-11/installerconfig index 74fba1236..89102f8cf 100644 --- a/freebsd/http/freebsd-11/installerconfig +++ b/freebsd/http/freebsd-11/installerconfig @@ -1,4 +1,7 @@ -DISTRIBUTIONS="base.txz lib32.txz kernel.txz src.txz" +DISTRIBUTIONS="base.txz kernel.txz src.txz" +if [ `uname -m` = "amd64" ]; then + DISTRIBUTIONS="${DISTRIBUTIONS} lib32.txz" +fi # for variations in the root disk device name between VMware and Virtualbox if [ -e /dev/ada0 ]; then From 25c5e63f8bbb64e5b572e3c04b73890bf8c81030 Mon Sep 17 00:00:00 2001 From: Li-Wen Hsu <lwhsu@lwhsu.org> Date: Mon, 18 Dec 2017 23:43:23 +0800 Subject: [PATCH 0733/1622] Use open-vm-tools-nox11 from pkg, this is suggested by vmware-install.pl --- freebsd/scripts/vmtools.sh | 28 +--------------------------- 1 file changed, 1 insertion(+), 27 deletions(-) diff --git a/freebsd/scripts/vmtools.sh b/freebsd/scripts/vmtools.sh index bb3b7409f..ff92c689c 100644 --- a/freebsd/scripts/vmtools.sh +++ b/freebsd/scripts/vmtools.sh @@ -36,35 +36,9 @@ virtualbox-iso|virtualbox-ovf) ;; vmware-iso|vmware-vmx) - # Install Perl and other software needed by vmware-install.pl - pkg install -y perl5; - pkg install -y compat6x-`uname -m`; - # the install script is very picky about location of perl command - ln -s /usr/local/bin/perl /usr/bin/perl; - - mkdir -p /tmp/vmfusion; - mkdir -p /tmp/vmfusion-archive; - mdconfig -a -t vnode -f $HOME_DIR/freebsd.iso -u 0; - mount -t cd9660 /dev/md0 /tmp/vmfusion; - tar xzf /tmp/vmfusion/vmware-freebsd-tools.tar.gz -C /tmp/vmfusion-archive; - - VER="`cat /tmp/vmfusion/manifest.txt | cut -f2 -d'"'`"; - MAJ_VER="`echo ${VER} | cut -d'.' -f1`"; - echo "VMware Tools Version: $VER"; - - if [ "${MAJ_VER}" -lt "10" ]; then - /tmp/vmfusion-archive/vmware-tools-distrib/vmware-install.pl --default; - else - /tmp/vmfusion-archive/vmware-tools-distrib/vmware-install.pl --force-install; - fi + pkg install -y open-vm-tools-nox11; echo 'ifconfig_vxn0="dhcp"' >>/etc/rc.conf; - umount /tmp/vmfusion; - rm -rf /tmp/vmfusion; - rm -rf /tmp/vmfusion-archive; - rm -f $HOME_DIR/*.iso; - - rm -f /usr/bin/perl; ;; parallels-iso|parallels-pvm) From abe10776d635738977874ab978441a1bc1e00e06 Mon Sep 17 00:00:00 2001 From: Li-Wen Hsu <lwhsu@lwhsu.org> Date: Tue, 19 Dec 2017 17:14:21 +0800 Subject: [PATCH 0734/1622] Restore and adjust turnings along with install vmtools - Load FUSE kernel module for shared folder - Reduce autoboot delay - Use built-in vmx(4) to replace vxn(4) --- freebsd/scripts/vmtools.sh | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/freebsd/scripts/vmtools.sh b/freebsd/scripts/vmtools.sh index ff92c689c..0522426fa 100644 --- a/freebsd/scripts/vmtools.sh +++ b/freebsd/scripts/vmtools.sh @@ -38,7 +38,13 @@ virtualbox-iso|virtualbox-ovf) vmware-iso|vmware-vmx) pkg install -y open-vm-tools-nox11; - echo 'ifconfig_vxn0="dhcp"' >>/etc/rc.conf; + # for shared folder + echo 'fuse_load="YES"' >>/boot/loader.conf; + + # Don't waste 10 seconds waiting for boot + echo 'autoboot_delay="-1"' >>/boot/loader.conf; + + echo 'ifconfig_vmx0="dhcp"' >>/etc/rc.conf; ;; parallels-iso|parallels-pvm) From 2f860deb06f2e173caf02f7c33ff64f55f739b93 Mon Sep 17 00:00:00 2001 From: Seth Thomas <sthomas@chef.io> Date: Wed, 20 Dec 2017 18:38:13 -0500 Subject: [PATCH 0735/1622] Set disk_dize to 64GB Signed-off-by: Seth Thomas <sthomas@chef.io> --- centos/centos-6.9-i386.json | 2 +- centos/centos-6.9-x86_64.json | 2 +- centos/centos-7.4-x86_64.json | 2 +- debian/debian-7.11-amd64.json | 2 +- debian/debian-7.11-i386.json | 2 +- debian/debian-8.10-amd64.json | 2 +- debian/debian-8.10-i386.json | 2 +- debian/debian-9.3-amd64.json | 2 +- debian/debian-9.3-i386.json | 2 +- fedora/fedora-25-i386.json | 2 +- fedora/fedora-25-x86_64.json | 2 +- fedora/fedora-26-x86_64.json | 2 +- fedora/fedora-27-x86_64.json | 2 +- freebsd/freebsd-10.3-amd64.json | 2 +- freebsd/freebsd-10.3-i386.json | 2 +- freebsd/freebsd-10.4-amd64.json | 2 +- freebsd/freebsd-10.4-i386.json | 2 +- freebsd/freebsd-11.1-amd64.json | 2 +- macos/macos-10.12.json | 2 +- macos/macosx-10.10.json | 2 +- macos/macosx-10.11.json | 2 +- macos/macosx-10.9.json | 2 +- oraclelinux/oracle-5.11-i386.json | 2 +- oraclelinux/oracle-5.11-x86_64.json | 2 +- oraclelinux/oracle-6.9-i386.json | 2 +- oraclelinux/oracle-6.9-x86_64.json | 2 +- oraclelinux/oracle-7.3-x86_64.json | 2 +- rhel/rhel-5.11-i386.json | 2 +- rhel/rhel-5.11-x86_64.json | 2 +- rhel/rhel-6.9-i386.json | 2 +- rhel/rhel-6.9-x86_64.json | 2 +- rhel/rhel-7.4-x86_64.json | 2 +- ubuntu/ubuntu-14.04-amd64.json | 2 +- ubuntu/ubuntu-14.04-i386.json | 2 +- ubuntu/ubuntu-16.04-amd64.json | 2 +- ubuntu/ubuntu-16.04-i386.json | 2 +- ubuntu/ubuntu-17.04-amd64.json | 2 +- ubuntu/ubuntu-17.04-i386.json | 2 +- ubuntu/ubuntu-17.10-amd64.json | 2 +- ubuntu/ubuntu-17.10-i386.json | 2 +- 40 files changed, 40 insertions(+), 40 deletions(-) diff --git a/centos/centos-6.9-i386.json b/centos/centos-6.9-i386.json index 491164c7e..5ae9896a5 100644 --- a/centos/centos-6.9-i386.json +++ b/centos/centos-6.9-i386.json @@ -184,7 +184,7 @@ "box_basename": "centos-6.9-i386", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", - "disk_size": "40960", + "disk_size": "65536", "git_revision": "__unknown_git_revision__", "headless": "", "http_proxy": "{{env `http_proxy`}}", diff --git a/centos/centos-6.9-x86_64.json b/centos/centos-6.9-x86_64.json index f64496996..dc1088a5f 100644 --- a/centos/centos-6.9-x86_64.json +++ b/centos/centos-6.9-x86_64.json @@ -184,7 +184,7 @@ "box_basename": "centos-6.9", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", - "disk_size": "40960", + "disk_size": "65536", "git_revision": "__unknown_git_revision__", "headless": "", "http_proxy": "{{env `http_proxy`}}", diff --git a/centos/centos-7.4-x86_64.json b/centos/centos-7.4-x86_64.json index 831927382..ae84cefcf 100644 --- a/centos/centos-7.4-x86_64.json +++ b/centos/centos-7.4-x86_64.json @@ -184,7 +184,7 @@ "box_basename": "centos-7.4", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", - "disk_size": "40960", + "disk_size": "65536", "git_revision": "__unknown_git_revision__", "headless": "", "http_proxy": "{{env `http_proxy`}}", diff --git a/debian/debian-7.11-amd64.json b/debian/debian-7.11-amd64.json index 7c2663d49..0e4d83d62 100644 --- a/debian/debian-7.11-amd64.json +++ b/debian/debian-7.11-amd64.json @@ -214,7 +214,7 @@ "box_basename": "debian-7.11", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", - "disk_size": "40960", + "disk_size": "65536", "git_revision": "__unknown_git_revision__", "headless": "", "http_proxy": "{{env `http_proxy`}}", diff --git a/debian/debian-7.11-i386.json b/debian/debian-7.11-i386.json index 61b91603c..e9542db8b 100644 --- a/debian/debian-7.11-i386.json +++ b/debian/debian-7.11-i386.json @@ -214,7 +214,7 @@ "box_basename": "debian-7.11-i386", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", - "disk_size": "40960", + "disk_size": "65536", "git_revision": "__unknown_git_revision__", "headless": "", "http_proxy": "{{env `http_proxy`}}", diff --git a/debian/debian-8.10-amd64.json b/debian/debian-8.10-amd64.json index ec1307f75..2d57feb87 100644 --- a/debian/debian-8.10-amd64.json +++ b/debian/debian-8.10-amd64.json @@ -220,7 +220,7 @@ "box_basename": "debian-8.10", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", - "disk_size": "40960", + "disk_size": "65536", "git_revision": "__unknown_git_revision__", "headless": "", "http_proxy": "{{env `http_proxy`}}", diff --git a/debian/debian-8.10-i386.json b/debian/debian-8.10-i386.json index 8177ac8c1..86f538420 100644 --- a/debian/debian-8.10-i386.json +++ b/debian/debian-8.10-i386.json @@ -220,7 +220,7 @@ "box_basename": "debian-8.10-i386", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", - "disk_size": "40960", + "disk_size": "65536", "git_revision": "__unknown_git_revision__", "headless": "", "http_proxy": "{{env `http_proxy`}}", diff --git a/debian/debian-9.3-amd64.json b/debian/debian-9.3-amd64.json index 8bc660733..29dcf0eb2 100644 --- a/debian/debian-9.3-amd64.json +++ b/debian/debian-9.3-amd64.json @@ -220,7 +220,7 @@ "box_basename": "debian-9.3", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", - "disk_size": "40960", + "disk_size": "65536", "git_revision": "__unknown_git_revision__", "headless": "", "http_proxy": "{{env `http_proxy`}}", diff --git a/debian/debian-9.3-i386.json b/debian/debian-9.3-i386.json index a990cd8c6..8e24aa832 100644 --- a/debian/debian-9.3-i386.json +++ b/debian/debian-9.3-i386.json @@ -220,7 +220,7 @@ "box_basename": "debian-9.3-i386", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", - "disk_size": "40960", + "disk_size": "65536", "git_revision": "__unknown_git_revision__", "headless": "", "http_proxy": "{{env `http_proxy`}}", diff --git a/fedora/fedora-25-i386.json b/fedora/fedora-25-i386.json index f47d1c93c..82a8f13fd 100644 --- a/fedora/fedora-25-i386.json +++ b/fedora/fedora-25-i386.json @@ -154,7 +154,7 @@ "box_basename": "fedora-25-i386", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", - "disk_size": "40960", + "disk_size": "65536", "git_revision": "__unknown_git_revision__", "headless": "", "http_proxy": "{{env `http_proxy`}}", diff --git a/fedora/fedora-25-x86_64.json b/fedora/fedora-25-x86_64.json index b75003420..f0380e10d 100644 --- a/fedora/fedora-25-x86_64.json +++ b/fedora/fedora-25-x86_64.json @@ -160,7 +160,7 @@ "box_basename": "fedora-25", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", - "disk_size": "40960", + "disk_size": "65536", "git_revision": "__unknown_git_revision__", "headless": "", "http_proxy": "{{env `http_proxy`}}", diff --git a/fedora/fedora-26-x86_64.json b/fedora/fedora-26-x86_64.json index 1c6cefc7a..09056908c 100644 --- a/fedora/fedora-26-x86_64.json +++ b/fedora/fedora-26-x86_64.json @@ -160,7 +160,7 @@ "box_basename": "fedora-26", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", - "disk_size": "40960", + "disk_size": "65536", "git_revision": "__unknown_git_revision__", "headless": "", "http_proxy": "{{env `http_proxy`}}", diff --git a/fedora/fedora-27-x86_64.json b/fedora/fedora-27-x86_64.json index 1f02bcbce..74f127c04 100644 --- a/fedora/fedora-27-x86_64.json +++ b/fedora/fedora-27-x86_64.json @@ -160,7 +160,7 @@ "box_basename": "fedora-27", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", - "disk_size": "40960", + "disk_size": "65536", "git_revision": "__unknown_git_revision__", "headless": "", "http_proxy": "{{env `http_proxy`}}", diff --git a/freebsd/freebsd-10.3-amd64.json b/freebsd/freebsd-10.3-amd64.json index a340e8542..cb776639f 100644 --- a/freebsd/freebsd-10.3-amd64.json +++ b/freebsd/freebsd-10.3-amd64.json @@ -208,7 +208,7 @@ "box_basename": "freebsd-10.3", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", - "disk_size": "40960", + "disk_size": "65536", "git_revision": "__unknown_git_revision__", "headless": "", "http_proxy": "{{env `http_proxy`}}", diff --git a/freebsd/freebsd-10.3-i386.json b/freebsd/freebsd-10.3-i386.json index 523c3304a..aeb14a066 100644 --- a/freebsd/freebsd-10.3-i386.json +++ b/freebsd/freebsd-10.3-i386.json @@ -208,7 +208,7 @@ "box_basename": "freebsd-10.3-i386", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", - "disk_size": "40960", + "disk_size": "65536", "git_revision": "__unknown_git_revision__", "headless": "", "http_proxy": "{{env `http_proxy`}}", diff --git a/freebsd/freebsd-10.4-amd64.json b/freebsd/freebsd-10.4-amd64.json index 771791509..d2c7a0136 100644 --- a/freebsd/freebsd-10.4-amd64.json +++ b/freebsd/freebsd-10.4-amd64.json @@ -208,7 +208,7 @@ "box_basename": "freebsd-10.4", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", - "disk_size": "40960", + "disk_size": "65536", "git_revision": "__unknown_git_revision__", "headless": "", "http_proxy": "{{env `http_proxy`}}", diff --git a/freebsd/freebsd-10.4-i386.json b/freebsd/freebsd-10.4-i386.json index c7fdf123b..80d16fcf2 100644 --- a/freebsd/freebsd-10.4-i386.json +++ b/freebsd/freebsd-10.4-i386.json @@ -208,7 +208,7 @@ "box_basename": "freebsd-10.4-i386", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", - "disk_size": "40960", + "disk_size": "65536", "git_revision": "__unknown_git_revision__", "headless": "", "http_proxy": "{{env `http_proxy`}}", diff --git a/freebsd/freebsd-11.1-amd64.json b/freebsd/freebsd-11.1-amd64.json index f50ae681d..dfd491c58 100644 --- a/freebsd/freebsd-11.1-amd64.json +++ b/freebsd/freebsd-11.1-amd64.json @@ -208,7 +208,7 @@ "box_basename": "freebsd-11.1", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", - "disk_size": "40960", + "disk_size": "65536", "git_revision": "__unknown_git_revision__", "headless": "", "http_proxy": "{{env `http_proxy`}}", diff --git a/macos/macos-10.12.json b/macos/macos-10.12.json index f85f13bcd..ed697aae8 100644 --- a/macos/macos-10.12.json +++ b/macos/macos-10.12.json @@ -227,7 +227,7 @@ "box_basename": "macos-10.12", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", - "disk_size": "40960", + "disk_size": "65536", "git_revision": "__unknown_git_revision__", "headless": "", "http_proxy": "{{env `http_proxy`}}", diff --git a/macos/macosx-10.10.json b/macos/macosx-10.10.json index ed90bdd68..694752402 100644 --- a/macos/macosx-10.10.json +++ b/macos/macosx-10.10.json @@ -227,7 +227,7 @@ "box_basename": "macosx-10.10", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", - "disk_size": "40960", + "disk_size": "65536", "git_revision": "__unknown_git_revision__", "headless": "", "http_proxy": "{{env `http_proxy`}}", diff --git a/macos/macosx-10.11.json b/macos/macosx-10.11.json index bbcbc8e6b..fc0ed42d9 100644 --- a/macos/macosx-10.11.json +++ b/macos/macosx-10.11.json @@ -227,7 +227,7 @@ "box_basename": "macosx-10.11", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", - "disk_size": "40960", + "disk_size": "65536", "git_revision": "__unknown_git_revision__", "headless": "", "http_proxy": "{{env `http_proxy`}}", diff --git a/macos/macosx-10.9.json b/macos/macosx-10.9.json index e95a78549..4a345e3dd 100644 --- a/macos/macosx-10.9.json +++ b/macos/macosx-10.9.json @@ -227,7 +227,7 @@ "box_basename": "macosx-10.9", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", - "disk_size": "40960", + "disk_size": "65536", "git_revision": "__unknown_git_revision__", "headless": "", "http_proxy": "{{env `http_proxy`}}", diff --git a/oraclelinux/oracle-5.11-i386.json b/oraclelinux/oracle-5.11-i386.json index a41f472e7..c28ddd429 100644 --- a/oraclelinux/oracle-5.11-i386.json +++ b/oraclelinux/oracle-5.11-i386.json @@ -157,7 +157,7 @@ "box_basename": "oracle-5.11-i386", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", - "disk_size": "40960", + "disk_size": "65536", "git_revision": "__unknown_git_revision__", "headless": "", "http_proxy": "{{env `http_proxy`}}", diff --git a/oraclelinux/oracle-5.11-x86_64.json b/oraclelinux/oracle-5.11-x86_64.json index fd3ad127e..856da8d78 100644 --- a/oraclelinux/oracle-5.11-x86_64.json +++ b/oraclelinux/oracle-5.11-x86_64.json @@ -163,7 +163,7 @@ "box_basename": "oracle-5.11", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", - "disk_size": "40960", + "disk_size": "65536", "git_revision": "__unknown_git_revision__", "headless": "", "http_proxy": "{{env `http_proxy`}}", diff --git a/oraclelinux/oracle-6.9-i386.json b/oraclelinux/oracle-6.9-i386.json index ae1615223..72c9ae6b2 100644 --- a/oraclelinux/oracle-6.9-i386.json +++ b/oraclelinux/oracle-6.9-i386.json @@ -158,7 +158,7 @@ "box_basename": "oracle-6.9-i386", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", - "disk_size": "40960", + "disk_size": "65536", "git_revision": "__unknown_git_revision__", "headless": "", "http_proxy": "{{env `http_proxy`}}", diff --git a/oraclelinux/oracle-6.9-x86_64.json b/oraclelinux/oracle-6.9-x86_64.json index 67a1ad9eb..26174fa77 100644 --- a/oraclelinux/oracle-6.9-x86_64.json +++ b/oraclelinux/oracle-6.9-x86_64.json @@ -158,7 +158,7 @@ "box_basename": "oracle-6.9", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", - "disk_size": "40960", + "disk_size": "65536", "git_revision": "__unknown_git_revision__", "headless": "", "http_proxy": "{{env `http_proxy`}}", diff --git a/oraclelinux/oracle-7.3-x86_64.json b/oraclelinux/oracle-7.3-x86_64.json index 00a4f2fd3..ea69f94c4 100644 --- a/oraclelinux/oracle-7.3-x86_64.json +++ b/oraclelinux/oracle-7.3-x86_64.json @@ -158,7 +158,7 @@ "box_basename": "oracle-7.3", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", - "disk_size": "40960", + "disk_size": "65536", "git_revision": "__unknown_git_revision__", "headless": "", "http_proxy": "{{env `http_proxy`}}", diff --git a/rhel/rhel-5.11-i386.json b/rhel/rhel-5.11-i386.json index 9a2a40087..78f04e231 100644 --- a/rhel/rhel-5.11-i386.json +++ b/rhel/rhel-5.11-i386.json @@ -156,7 +156,7 @@ "box_basename": "rhel-5.11-i386", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", - "disk_size": "40960", + "disk_size": "65536", "git_revision": "__unknown_git_revision__", "headless": "", "http_proxy": "{{env `http_proxy`}}", diff --git a/rhel/rhel-5.11-x86_64.json b/rhel/rhel-5.11-x86_64.json index 2e665857e..a0bec8ef5 100644 --- a/rhel/rhel-5.11-x86_64.json +++ b/rhel/rhel-5.11-x86_64.json @@ -162,7 +162,7 @@ "box_basename": "rhel-5.11", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", - "disk_size": "40960", + "disk_size": "65536", "git_revision": "__unknown_git_revision__", "headless": "", "http_proxy": "{{env `http_proxy`}}", diff --git a/rhel/rhel-6.9-i386.json b/rhel/rhel-6.9-i386.json index 74e805835..0da1f82dd 100644 --- a/rhel/rhel-6.9-i386.json +++ b/rhel/rhel-6.9-i386.json @@ -157,7 +157,7 @@ "box_basename": "rhel-6.9-i386", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", - "disk_size": "40960", + "disk_size": "65536", "git_revision": "__unknown_git_revision__", "headless": "", "http_proxy": "{{env `http_proxy`}}", diff --git a/rhel/rhel-6.9-x86_64.json b/rhel/rhel-6.9-x86_64.json index a02108d1a..0559bface 100644 --- a/rhel/rhel-6.9-x86_64.json +++ b/rhel/rhel-6.9-x86_64.json @@ -157,7 +157,7 @@ "box_basename": "rhel-6.9", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", - "disk_size": "40960", + "disk_size": "65536", "git_revision": "__unknown_git_revision__", "headless": "", "http_proxy": "{{env `http_proxy`}}", diff --git a/rhel/rhel-7.4-x86_64.json b/rhel/rhel-7.4-x86_64.json index 0ba37f010..bdc88c006 100644 --- a/rhel/rhel-7.4-x86_64.json +++ b/rhel/rhel-7.4-x86_64.json @@ -157,7 +157,7 @@ "box_basename": "rhel-7.4", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", - "disk_size": "40960", + "disk_size": "65536", "git_revision": "__unknown_git_revision__", "headless": "", "http_proxy": "{{env `http_proxy`}}", diff --git a/ubuntu/ubuntu-14.04-amd64.json b/ubuntu/ubuntu-14.04-amd64.json index a2d42405c..38d3070ab 100644 --- a/ubuntu/ubuntu-14.04-amd64.json +++ b/ubuntu/ubuntu-14.04-amd64.json @@ -288,7 +288,7 @@ "box_basename": "ubuntu-14.04", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", - "disk_size": "40960", + "disk_size": "65536", "git_revision": "__unknown_git_revision__", "headless": "", "http_proxy": "{{env `http_proxy`}}", diff --git a/ubuntu/ubuntu-14.04-i386.json b/ubuntu/ubuntu-14.04-i386.json index 703b38fdc..432f165ff 100644 --- a/ubuntu/ubuntu-14.04-i386.json +++ b/ubuntu/ubuntu-14.04-i386.json @@ -252,7 +252,7 @@ "box_basename": "ubuntu-14.04-i386", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", - "disk_size": "40960", + "disk_size": "65536", "git_revision": "__unknown_git_revision__", "headless": "", "http_proxy": "{{env `http_proxy`}}", diff --git a/ubuntu/ubuntu-16.04-amd64.json b/ubuntu/ubuntu-16.04-amd64.json index 4cbc17472..8a587b421 100644 --- a/ubuntu/ubuntu-16.04-amd64.json +++ b/ubuntu/ubuntu-16.04-amd64.json @@ -297,7 +297,7 @@ "box_basename": "ubuntu-16.04", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", - "disk_size": "40960", + "disk_size": "65536", "git_revision": "__unknown_git_revision__", "headless": "", "http_proxy": "{{env `http_proxy`}}", diff --git a/ubuntu/ubuntu-16.04-i386.json b/ubuntu/ubuntu-16.04-i386.json index 047f0f1da..907d79f4e 100644 --- a/ubuntu/ubuntu-16.04-i386.json +++ b/ubuntu/ubuntu-16.04-i386.json @@ -260,7 +260,7 @@ "box_basename": "ubuntu-16.04-i386", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", - "disk_size": "40960", + "disk_size": "65536", "git_revision": "__unknown_git_revision__", "headless": "", "http_proxy": "{{env `http_proxy`}}", diff --git a/ubuntu/ubuntu-17.04-amd64.json b/ubuntu/ubuntu-17.04-amd64.json index a3457c5d5..8724f041f 100644 --- a/ubuntu/ubuntu-17.04-amd64.json +++ b/ubuntu/ubuntu-17.04-amd64.json @@ -293,7 +293,7 @@ "box_basename": "ubuntu-17.04", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", - "disk_size": "40960", + "disk_size": "65536", "git_revision": "__unknown_git_revision__", "headless": "", "http_proxy": "{{env `http_proxy`}}", diff --git a/ubuntu/ubuntu-17.04-i386.json b/ubuntu/ubuntu-17.04-i386.json index 04543bacf..bddb90c77 100644 --- a/ubuntu/ubuntu-17.04-i386.json +++ b/ubuntu/ubuntu-17.04-i386.json @@ -257,7 +257,7 @@ "box_basename": "ubuntu-17.04-i386", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", - "disk_size": "40960", + "disk_size": "65536", "git_revision": "__unknown_git_revision__", "headless": "", "http_proxy": "{{env `http_proxy`}}", diff --git a/ubuntu/ubuntu-17.10-amd64.json b/ubuntu/ubuntu-17.10-amd64.json index 640440908..76d7cfcab 100644 --- a/ubuntu/ubuntu-17.10-amd64.json +++ b/ubuntu/ubuntu-17.10-amd64.json @@ -293,7 +293,7 @@ "box_basename": "ubuntu-17.10", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", - "disk_size": "40960", + "disk_size": "65536", "git_revision": "__unknown_git_revision__", "headless": "", "http_proxy": "{{env `http_proxy`}}", diff --git a/ubuntu/ubuntu-17.10-i386.json b/ubuntu/ubuntu-17.10-i386.json index 594264099..fc30d50ad 100644 --- a/ubuntu/ubuntu-17.10-i386.json +++ b/ubuntu/ubuntu-17.10-i386.json @@ -257,7 +257,7 @@ "box_basename": "ubuntu-17.10-i386", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", - "disk_size": "40960", + "disk_size": "65536", "git_revision": "__unknown_git_revision__", "headless": "", "http_proxy": "{{env `http_proxy`}}", From 1f279ca50d72b91542668c6c658cc0a05041092b Mon Sep 17 00:00:00 2001 From: Seth Thomas <sthomas@chef.io> Date: Wed, 20 Dec 2017 18:45:24 -0500 Subject: [PATCH 0736/1622] Add cifs-utils to CentOS7 under Hyper-V Signed-off-by: Seth Thomas <sthomas@chef.io> --- centos/http/7/ks.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/centos/http/7/ks.cfg b/centos/http/7/ks.cfg index fce03f92a..1caa16a9c 100644 --- a/centos/http/7/ks.cfg +++ b/centos/http/7/ks.cfg @@ -84,7 +84,7 @@ echo "%vagrant ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers.d/vagrant #Enable hyper-v daemons only if using hyper-v virtualization if [ $(virt-what) == "hyperv" ]; then - yum -y install hyperv-daemons + yum -y install hyperv-daemons cifs-utils systemctl enable hypervvssd systemctl enable hypervkvpd fi From 2f53791ff3bb842539a0e0f6a9ba9fea44510185 Mon Sep 17 00:00:00 2001 From: Seth Thomas <sthomas@chef.io> Date: Wed, 20 Dec 2017 19:07:44 -0500 Subject: [PATCH 0737/1622] Fix #879 Signed-off-by: Seth Thomas <sthomas@chef.io> --- solaris/http/default.xml | 2 ++ solaris/solaris-10.11-x86.json | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/solaris/http/default.xml b/solaris/http/default.xml index 077d8defb..09f50871c 100644 --- a/solaris/http/default.xml +++ b/solaris/http/default.xml @@ -50,6 +50,8 @@ --> <software_data action="install"> <name>pkg:/server_install</name> + <name>pkg:/library/python/six</name> + <name>pkg:/library/python/cryptography</name> </software_data> <!-- babel_install and slim_install are group packages used to diff --git a/solaris/solaris-10.11-x86.json b/solaris/solaris-10.11-x86.json index 3e522580f..61dc1f593 100644 --- a/solaris/solaris-10.11-x86.json +++ b/solaris/solaris-10.11-x86.json @@ -120,7 +120,7 @@ "box_basename": "solaris-10.11", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", - "disk_size": "20000", + "disk_size": "65536", "git_revision": "__unknown_git_revision__", "headless": "", "memory": "1536", From 4ac9434ae2c07de141cdae7fb600213ea5daee62 Mon Sep 17 00:00:00 2001 From: Seth Thomas <sthomas@chef.io> Date: Wed, 20 Dec 2017 19:09:54 -0500 Subject: [PATCH 0738/1622] Fixing disk in both Solari Signed-off-by: Seth Thomas <sthomas@chef.io> --- solaris/solaris-11-x86.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/solaris/solaris-11-x86.json b/solaris/solaris-11-x86.json index c2ca788b6..da83c577e 100644 --- a/solaris/solaris-11-x86.json +++ b/solaris/solaris-11-x86.json @@ -142,7 +142,7 @@ "box_basename": "solaris-11.3", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", - "disk_size": "10360", + "disk_size": "65536", "git_revision": "__unknown_git_revision__", "headless": "", "memory": "2048", From 3b252f0dc76678c33a9b158c779b0751d73acdc3 Mon Sep 17 00:00:00 2001 From: Seth Thomas <sthomas@chef.io> Date: Wed, 20 Dec 2017 19:11:58 -0500 Subject: [PATCH 0739/1622] Fedora 25 EOL Signed-off-by: Seth Thomas <sthomas@chef.io> --- fedora/fedora-25-i386.json | 175 --------------------------------- fedora/fedora-25-x86_64.json | 181 ----------------------------------- 2 files changed, 356 deletions(-) delete mode 100644 fedora/fedora-25-i386.json delete mode 100644 fedora/fedora-25-x86_64.json diff --git a/fedora/fedora-25-i386.json b/fedora/fedora-25-i386.json deleted file mode 100644 index 82a8f13fd..000000000 --- a/fedora/fedora-25-i386.json +++ /dev/null @@ -1,175 +0,0 @@ -{ - "builders": [ - { - "boot_command": [ - "<tab> linux ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", - "guest_os_type": "Fedora", - "hard_drive_interface": "sata", - "headless": "{{ user `headless` }}", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../builds/packer-{{user `template`}}-virtualbox", - "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "virtualbox-iso", - "vboxmanage": [ - [ - "modifyvm", - "{{.Name}}", - "--memory", - "{{ user `memory` }}" - ], - [ - "modifyvm", - "{{.Name}}", - "--cpus", - "{{ user `cpus` }}" - ] - ], - "virtualbox_version_file": ".vbox_version", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<tab> linux ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "fedora", - "headless": "{{ user `headless` }}", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../builds/packer-{{user `template`}}-vmware", - "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "tools_upload_flavor": "linux", - "type": "vmware-iso", - "vm_name": "{{ user `template` }}", - "vmx_data": { - "cpuid.coresPerSocket": "1", - "memsize": "{{ user `memory` }}", - "numvcpus": "{{ user `cpus` }}" - }, - "vmx_remove_ethernet_interfaces": true - }, - { - "boot_command": [ - "<tab> linux ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "fedora-core", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../builds/packer-{{user `template`}}-parallels", - "parallels_tools_flavor": "lin", - "prlctl": [ - [ - "set", - "{{.Name}}", - "--memsize", - "{{ user `memory` }}" - ], - [ - "set", - "{{.Name}}", - "--cpus", - "{{ user `cpus` }}" - ] - ], - "prlctl_version_file": ".prlctl_version", - "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "parallels-iso", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<tab> linux ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "headless": "{{ user `headless` }}", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../builds/packer-{{user `template`}}-qemu", - "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "qemu", - "vm_name": "{{ user `template` }}" - } - ], - "post-processors": [ - { - "output": "../builds/{{user `box_basename`}}.{{.Provider}}.box", - "type": "vagrant" - } - ], - "provisioners": [ - { - "environment_vars": [], - "execute_command": "echo 'vagrant' | {{.Vars}} sudo -E -S bash '{{.Path}}'", - "expect_disconnect": true, - "scripts": [ - "scripts/swap.sh", - "scripts/fix-slow-dns.sh", - "scripts/build-tools.sh", - "../_common/sshd.sh", - "../_common/virtualbox.sh", - "../_common/vmware.sh", - "../_common/parallels.sh", - "../_common/vagrant.sh", - "scripts/cleanup.sh", - "../_common/minimize.sh" - ], - "type": "shell" - } - ], - "variables": { - "arch": "32", - "box_basename": "fedora-25-i386", - "build_timestamp": "{{isotime \"20060102150405\"}}", - "cpus": "1", - "disk_size": "65536", - "git_revision": "__unknown_git_revision__", - "headless": "", - "http_proxy": "{{env `http_proxy`}}", - "https_proxy": "{{env `https_proxy`}}", - "iso_checksum": "888ce3dd791854c8e0f62e9eac292a90cf9765a3f2de75b6ceb99eaa62d7f2cc", - "iso_checksum_type": "sha256", - "iso_name": "Fedora-Server-dvd-i386-25-1.3.iso", - "ks_path": "ks.cfg", - "memory": "1024", - "mirror": "http://download.fedoraproject.org/pub/fedora/linux", - "mirror_directory": "releases/25/Server/i386/iso", - "name": "fedora-25-i386", - "no_proxy": "{{env `no_proxy`}}", - "template": "fedora-25-i386", - "version": "TIMESTAMP" - } -} - diff --git a/fedora/fedora-25-x86_64.json b/fedora/fedora-25-x86_64.json deleted file mode 100644 index f0380e10d..000000000 --- a/fedora/fedora-25-x86_64.json +++ /dev/null @@ -1,181 +0,0 @@ -{ - "builders": [ - { - "boot_command": [ - "<tab> linux ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", - "guest_os_type": "Fedora_64", - "hard_drive_interface": "sata", - "headless": "{{ user `headless` }}", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../builds/packer-{{user `template`}}-virtualbox", - "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "virtualbox-iso", - "vboxmanage": [ - [ - "modifyvm", - "{{.Name}}", - "--memory", - "{{ user `memory` }}" - ], - [ - "modifyvm", - "{{.Name}}", - "--cpus", - "{{ user `cpus` }}" - ] - ], - "virtualbox_version_file": ".vbox_version", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<tab> linux ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "fedora-64", - "headless": "{{ user `headless` }}", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../builds/packer-{{user `template`}}-vmware", - "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "tools_upload_flavor": "linux", - "type": "vmware-iso", - "vm_name": "{{ user `template` }}", - "vmx_data": { - "cpuid.coresPerSocket": "1", - "ethernet0.pciSlotNumber": "32", - "memsize": "{{ user `memory` }}", - "numvcpus": "{{ user `cpus` }}" - }, - "vmx_remove_ethernet_interfaces": true - }, - { - "boot_command": [ - "<tab> linux ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "fedora-core", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../builds/packer-{{user `template`}}-parallels", - "parallels_tools_flavor": "lin", - "prlctl": [ - [ - "set", - "{{.Name}}", - "--memsize", - "{{ user `memory` }}" - ], - [ - "set", - "{{.Name}}", - "--cpus", - "{{ user `cpus` }}" - ] - ], - "prlctl_version_file": ".prlctl_version", - "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "parallels-iso", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<tab> linux ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "headless": "{{ user `headless` }}", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../builds/packer-{{user `template`}}-qemu", - "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "qemu", - "vm_name": "{{ user `template` }}" - } - ], - "post-processors": [ - { - "output": "../builds/{{user `box_basename`}}.{{.Provider}}.box", - "type": "vagrant" - } - ], - "provisioners": [ - { - "environment_vars": [ - "HOME_DIR=/home/vagrant", - "http_proxy={{user `http_proxy`}}", - "https_proxy={{user `https_proxy`}}", - "no_proxy={{user `no_proxy`}}" - ], - "execute_command": "echo 'vagrant' | {{.Vars}} sudo -E -S bash '{{.Path}}'", - "expect_disconnect": true, - "scripts": [ - "scripts/swap.sh", - "scripts/fix-slow-dns.sh", - "scripts/build-tools.sh", - "../_common/sshd.sh", - "../_common/virtualbox.sh", - "../_common/vmware.sh", - "../_common/parallels.sh", - "../_common/vagrant.sh", - "scripts/cleanup.sh", - "../_common/minimize.sh" - ], - "type": "shell" - } - ], - "variables": { - "arch": "64", - "box_basename": "fedora-25", - "build_timestamp": "{{isotime \"20060102150405\"}}", - "cpus": "1", - "disk_size": "65536", - "git_revision": "__unknown_git_revision__", - "headless": "", - "http_proxy": "{{env `http_proxy`}}", - "https_proxy": "{{env `https_proxy`}}", - "iso_checksum": "524bd959dae09ad6fc8e0476ea478700d89f82ec5795d0b1a7b873613f3f26ac", - "iso_checksum_type": "sha256", - "iso_name": "Fedora-Server-dvd-x86_64-25-1.3.iso", - "ks_path": "ks.cfg", - "memory": "1024", - "mirror": "http://download.fedoraproject.org/pub/fedora/linux", - "mirror_directory": "releases/25/Server/x86_64/iso", - "name": "fedora-25", - "no_proxy": "{{env `no_proxy`}}", - "template": "fedora-25-x86_64", - "version": "TIMESTAMP" - } -} - From 6431e472c93c1f5e970d3fec1f04ad5d6618eb08 Mon Sep 17 00:00:00 2001 From: Li-Wen Hsu <lwhsu@lwhsu.org> Date: Thu, 21 Dec 2017 17:12:54 +0800 Subject: [PATCH 0740/1622] Use the NTP server pool from /etc/ntp.conf instead of a regional pool --- freebsd/scripts/postinstall.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/freebsd/scripts/postinstall.sh b/freebsd/scripts/postinstall.sh index 649e90ee1..e91211e5d 100644 --- a/freebsd/scripts/postinstall.sh +++ b/freebsd/scripts/postinstall.sh @@ -1,7 +1,7 @@ #!/bin/sh -eux # Set the time correctly -ntpdate -v -b in.pool.ntp.org; +ntpdate -v -b 0.freebsd.pool.ntp.org # Install curl and ca_root_nss pkg install -y curl; From e68706e733eb41f6c887ea0d700acbc013a3f09f Mon Sep 17 00:00:00 2001 From: Seth Thomas <sthomas@chef.io> Date: Sun, 31 Dec 2017 14:24:37 -0500 Subject: [PATCH 0741/1622] Fix name for debian 9.3 Signed-off-by: Seth Thomas <sthomas@chef.io> --- debian/debian-9.3-amd64.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/debian-9.3-amd64.json b/debian/debian-9.3-amd64.json index 29dcf0eb2..59d365702 100644 --- a/debian/debian-9.3-amd64.json +++ b/debian/debian-9.3-amd64.json @@ -231,7 +231,7 @@ "memory": "1024", "mirror": "http://cdimage.debian.org/cdimage/release", "mirror_directory": "9.3.0/amd64/iso-cd", - "name": "debian-9.2", + "name": "debian-9.3", "no_proxy": "{{env `no_proxy`}}", "preseed_path": "debian-8/preseed.cfg", "template": "debian-9.3-amd64", From 375b90f7162382390cbbf9c08d43ab652b3ca6cb Mon Sep 17 00:00:00 2001 From: Ali Rizvi-Santiago <arizvisa@gmail.com> Date: Wed, 20 Dec 2017 06:32:21 -0500 Subject: [PATCH 0742/1622] Added support for specifying the guest_additions_url as a variable to all the json templates to allow the user to specify a custom VirtualBox Guest Additions ISO if necessary. --- centos/centos-6.9-i386.json | 2 ++ centos/centos-6.9-x86_64.json | 2 ++ centos/centos-7.4-x86_64.json | 2 ++ debian/debian-7.11-amd64.json | 2 ++ debian/debian-7.11-i386.json | 2 ++ debian/debian-8.10-amd64.json | 2 ++ debian/debian-8.10-i386.json | 2 ++ debian/debian-9.3-amd64.json | 2 ++ debian/debian-9.3-i386.json | 2 ++ fedora/fedora-26-x86_64.json | 2 ++ fedora/fedora-27-x86_64.json | 2 ++ freebsd/freebsd-10.3-amd64.json | 2 ++ freebsd/freebsd-10.3-i386.json | 2 ++ freebsd/freebsd-10.4-amd64.json | 2 ++ freebsd/freebsd-10.4-i386.json | 2 ++ freebsd/freebsd-11.1-amd64.json | 2 ++ macos/macos-10.12.json | 2 ++ macos/macosx-10.10.json | 2 ++ macos/macosx-10.11.json | 2 ++ macos/macosx-10.9.json | 2 ++ opensuse/opensuse-leap-42.3-x86_64.json | 2 ++ oraclelinux/oracle-5.11-i386.json | 2 ++ oraclelinux/oracle-5.11-x86_64.json | 2 ++ oraclelinux/oracle-6.9-i386.json | 2 ++ oraclelinux/oracle-6.9-x86_64.json | 2 ++ oraclelinux/oracle-7.3-x86_64.json | 2 ++ rhel/rhel-5.11-i386.json | 2 ++ rhel/rhel-5.11-x86_64.json | 2 ++ rhel/rhel-6.9-i386.json | 2 ++ rhel/rhel-6.9-x86_64.json | 2 ++ rhel/rhel-7.4-x86_64.json | 2 ++ sles/sles-12-sp2-x86_64.json | 2 ++ sles/sles-12-sp3-x86_64.json | 2 ++ solaris/solaris-10.11-x86.json | 2 ++ solaris/solaris-11-x86.json | 2 ++ ubuntu/ubuntu-14.04-amd64.json | 2 ++ ubuntu/ubuntu-14.04-i386.json | 2 ++ ubuntu/ubuntu-16.04-amd64.json | 2 ++ ubuntu/ubuntu-16.04-i386.json | 2 ++ ubuntu/ubuntu-17.04-amd64.json | 2 ++ ubuntu/ubuntu-17.04-i386.json | 2 ++ ubuntu/ubuntu-17.10-amd64.json | 2 ++ ubuntu/ubuntu-17.10-i386.json | 2 ++ windows/windows-nano-tp3.json | 2 ++ 44 files changed, 88 insertions(+) diff --git a/centos/centos-6.9-i386.json b/centos/centos-6.9-i386.json index 5ae9896a5..b5183d46a 100644 --- a/centos/centos-6.9-i386.json +++ b/centos/centos-6.9-i386.json @@ -7,6 +7,7 @@ "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "guest_additions_url": "{{user `guest_additions_url`}}", "guest_os_type": "RedHat", "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", @@ -181,6 +182,7 @@ } ], "variables": { + "guest_additions_url": "", "box_basename": "centos-6.9-i386", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", diff --git a/centos/centos-6.9-x86_64.json b/centos/centos-6.9-x86_64.json index dc1088a5f..85b2327fb 100644 --- a/centos/centos-6.9-x86_64.json +++ b/centos/centos-6.9-x86_64.json @@ -7,6 +7,7 @@ "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "guest_additions_url": "{{user `guest_additions_url`}}", "guest_os_type": "RedHat_64", "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", @@ -181,6 +182,7 @@ } ], "variables": { + "guest_additions_url": "", "box_basename": "centos-6.9", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", diff --git a/centos/centos-7.4-x86_64.json b/centos/centos-7.4-x86_64.json index ae84cefcf..b272321cc 100644 --- a/centos/centos-7.4-x86_64.json +++ b/centos/centos-7.4-x86_64.json @@ -7,6 +7,7 @@ "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "guest_additions_url": "{{user `guest_additions_url`}}", "guest_os_type": "RedHat_64", "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", @@ -181,6 +182,7 @@ } ], "variables": { + "guest_additions_url": "", "box_basename": "centos-7.4", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", diff --git a/debian/debian-7.11-amd64.json b/debian/debian-7.11-amd64.json index 0e4d83d62..c1a6c1e33 100644 --- a/debian/debian-7.11-amd64.json +++ b/debian/debian-7.11-amd64.json @@ -21,6 +21,7 @@ "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "guest_additions_url": "{{user `guest_additions_url`}}", "guest_os_type": "Debian_64", "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", @@ -211,6 +212,7 @@ } ], "variables": { + "guest_additions_url": "", "box_basename": "debian-7.11", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", diff --git a/debian/debian-7.11-i386.json b/debian/debian-7.11-i386.json index e9542db8b..1a5d38c65 100644 --- a/debian/debian-7.11-i386.json +++ b/debian/debian-7.11-i386.json @@ -21,6 +21,7 @@ "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "guest_additions_url": "{{user `guest_additions_url`}}", "guest_os_type": "Debian", "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", @@ -211,6 +212,7 @@ } ], "variables": { + "guest_additions_url": "", "box_basename": "debian-7.11-i386", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", diff --git a/debian/debian-8.10-amd64.json b/debian/debian-8.10-amd64.json index 2d57feb87..f68fb386d 100644 --- a/debian/debian-8.10-amd64.json +++ b/debian/debian-8.10-amd64.json @@ -22,6 +22,7 @@ "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "guest_additions_url": "{{user `guest_additions_url`}}", "guest_os_type": "Debian_64", "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", @@ -217,6 +218,7 @@ } ], "variables": { + "guest_additions_url": "", "box_basename": "debian-8.10", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", diff --git a/debian/debian-8.10-i386.json b/debian/debian-8.10-i386.json index 86f538420..156e6df7d 100644 --- a/debian/debian-8.10-i386.json +++ b/debian/debian-8.10-i386.json @@ -22,6 +22,7 @@ "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "guest_additions_url": "{{user `guest_additions_url`}}", "guest_os_type": "Debian", "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", @@ -217,6 +218,7 @@ } ], "variables": { + "guest_additions_url": "", "box_basename": "debian-8.10-i386", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", diff --git a/debian/debian-9.3-amd64.json b/debian/debian-9.3-amd64.json index 59d365702..f6e2df2e0 100644 --- a/debian/debian-9.3-amd64.json +++ b/debian/debian-9.3-amd64.json @@ -22,6 +22,7 @@ "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "guest_additions_url": "{{user `guest_additions_url`}}", "guest_os_type": "Debian_64", "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", @@ -217,6 +218,7 @@ } ], "variables": { + "guest_additions_url": "", "box_basename": "debian-9.3", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", diff --git a/debian/debian-9.3-i386.json b/debian/debian-9.3-i386.json index 8e24aa832..1a8e025a2 100644 --- a/debian/debian-9.3-i386.json +++ b/debian/debian-9.3-i386.json @@ -22,6 +22,7 @@ "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "guest_additions_url": "{{user `guest_additions_url`}}", "guest_os_type": "Debian", "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", @@ -217,6 +218,7 @@ } ], "variables": { + "guest_additions_url": "", "box_basename": "debian-9.3-i386", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", diff --git a/fedora/fedora-26-x86_64.json b/fedora/fedora-26-x86_64.json index 09056908c..24053061e 100644 --- a/fedora/fedora-26-x86_64.json +++ b/fedora/fedora-26-x86_64.json @@ -7,6 +7,7 @@ "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "guest_additions_url": "{{user `guest_additions_url`}}", "guest_os_type": "Fedora_64", "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", @@ -156,6 +157,7 @@ } ], "variables": { + "guest_additions_url": "", "arch": "64", "box_basename": "fedora-26", "build_timestamp": "{{isotime \"20060102150405\"}}", diff --git a/fedora/fedora-27-x86_64.json b/fedora/fedora-27-x86_64.json index 74f127c04..489eb1765 100644 --- a/fedora/fedora-27-x86_64.json +++ b/fedora/fedora-27-x86_64.json @@ -7,6 +7,7 @@ "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "guest_additions_url": "{{user `guest_additions_url`}}", "guest_os_type": "Fedora_64", "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", @@ -156,6 +157,7 @@ } ], "variables": { + "guest_additions_url": "", "arch": "64", "box_basename": "fedora-27", "build_timestamp": "{{isotime \"20060102150405\"}}", diff --git a/freebsd/freebsd-10.3-amd64.json b/freebsd/freebsd-10.3-amd64.json index cb776639f..fe12806db 100644 --- a/freebsd/freebsd-10.3-amd64.json +++ b/freebsd/freebsd-10.3-amd64.json @@ -15,6 +15,7 @@ "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "guest_additions_url": "{{user `guest_additions_url`}}", "guest_os_type": "FreeBSD_64", "headless": "{{ user `headless` }}", "http_directory": "http", @@ -205,6 +206,7 @@ } ], "variables": { + "guest_additions_url": "", "box_basename": "freebsd-10.3", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", diff --git a/freebsd/freebsd-10.3-i386.json b/freebsd/freebsd-10.3-i386.json index aeb14a066..66a58ba07 100644 --- a/freebsd/freebsd-10.3-i386.json +++ b/freebsd/freebsd-10.3-i386.json @@ -15,6 +15,7 @@ "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "guest_additions_url": "{{user `guest_additions_url`}}", "guest_os_type": "FreeBSD", "headless": "{{ user `headless` }}", "http_directory": "http", @@ -205,6 +206,7 @@ } ], "variables": { + "guest_additions_url": "", "box_basename": "freebsd-10.3-i386", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", diff --git a/freebsd/freebsd-10.4-amd64.json b/freebsd/freebsd-10.4-amd64.json index d2c7a0136..a0f92ebde 100644 --- a/freebsd/freebsd-10.4-amd64.json +++ b/freebsd/freebsd-10.4-amd64.json @@ -15,6 +15,7 @@ "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "guest_additions_url": "{{user `guest_additions_url`}}", "guest_os_type": "FreeBSD_64", "headless": "{{ user `headless` }}", "http_directory": "http", @@ -205,6 +206,7 @@ } ], "variables": { + "guest_additions_url": "", "box_basename": "freebsd-10.4", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", diff --git a/freebsd/freebsd-10.4-i386.json b/freebsd/freebsd-10.4-i386.json index 80d16fcf2..098f33068 100644 --- a/freebsd/freebsd-10.4-i386.json +++ b/freebsd/freebsd-10.4-i386.json @@ -15,6 +15,7 @@ "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "guest_additions_url": "{{user `guest_additions_url`}}", "guest_os_type": "FreeBSD", "headless": "{{ user `headless` }}", "http_directory": "http", @@ -205,6 +206,7 @@ } ], "variables": { + "guest_additions_url": "", "box_basename": "freebsd-10.4-i386", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", diff --git a/freebsd/freebsd-11.1-amd64.json b/freebsd/freebsd-11.1-amd64.json index dfd491c58..83f754784 100644 --- a/freebsd/freebsd-11.1-amd64.json +++ b/freebsd/freebsd-11.1-amd64.json @@ -15,6 +15,7 @@ "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "guest_additions_url": "{{user `guest_additions_url`}}", "guest_os_type": "FreeBSD_64", "headless": "{{ user `headless` }}", "http_directory": "http", @@ -205,6 +206,7 @@ } ], "variables": { + "guest_additions_url": "", "box_basename": "freebsd-11.1", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", diff --git a/macos/macos-10.12.json b/macos/macos-10.12.json index ed697aae8..cf9cd6a32 100644 --- a/macos/macos-10.12.json +++ b/macos/macos-10.12.json @@ -37,6 +37,7 @@ "boot_wait": "2s", "disk_size": "{{user `disk_size`}}", "guest_additions_mode": "disable", + "guest_additions_url": "{{user `guest_additions_url`}}", "guest_os_type": "MacOS1011_64", "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", @@ -223,6 +224,7 @@ } ], "variables": { + "guest_additions_url": "", "_README": "You must provide a prepared Mac disk image (from https://github.com/timsutton/osx-vm-templates) and checksum value for this template to work. For more details, consult this project's README.md", "box_basename": "macos-10.12", "build_timestamp": "{{isotime \"20060102150405\"}}", diff --git a/macos/macosx-10.10.json b/macos/macosx-10.10.json index 694752402..88bd89a97 100644 --- a/macos/macosx-10.10.json +++ b/macos/macosx-10.10.json @@ -37,6 +37,7 @@ "boot_wait": "2s", "disk_size": "{{user `disk_size`}}", "guest_additions_mode": "disable", + "guest_additions_url": "{{user `guest_additions_url`}}", "guest_os_type": "MacOS109_64", "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", @@ -223,6 +224,7 @@ } ], "variables": { + "guest_additions_url": "", "_README": "You must provide a prepared Mac disk image (from https://github.com/timsutton/osx-vm-templates) and checksum value for this template to work. For more details, consult this project's README.md", "box_basename": "macosx-10.10", "build_timestamp": "{{isotime \"20060102150405\"}}", diff --git a/macos/macosx-10.11.json b/macos/macosx-10.11.json index fc0ed42d9..f7c6c0a50 100644 --- a/macos/macosx-10.11.json +++ b/macos/macosx-10.11.json @@ -37,6 +37,7 @@ "boot_wait": "2s", "disk_size": "{{user `disk_size`}}", "guest_additions_mode": "disable", + "guest_additions_url": "{{user `guest_additions_url`}}", "guest_os_type": "MacOS1011_64", "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", @@ -223,6 +224,7 @@ } ], "variables": { + "guest_additions_url": "", "_README": "You must provide a prepared Mac disk image (from https://github.com/timsutton/osx-vm-templates) and checksum value for this template to work. For more details, consult this project's README.md", "box_basename": "macosx-10.11", "build_timestamp": "{{isotime \"20060102150405\"}}", diff --git a/macos/macosx-10.9.json b/macos/macosx-10.9.json index 4a345e3dd..56ef77ace 100644 --- a/macos/macosx-10.9.json +++ b/macos/macosx-10.9.json @@ -37,6 +37,7 @@ "boot_wait": "2s", "disk_size": "{{user `disk_size`}}", "guest_additions_mode": "disable", + "guest_additions_url": "{{user `guest_additions_url`}}", "guest_os_type": "MacOS109_64", "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", @@ -223,6 +224,7 @@ } ], "variables": { + "guest_additions_url": "", "_README": "You must provide a prepared Mac disk image (from https://github.com/timsutton/osx-vm-templates) and checksum value for this template to work. For more details, consult this project's README.md", "box_basename": "macosx-10.9", "build_timestamp": "{{isotime \"20060102150405\"}}", diff --git a/opensuse/opensuse-leap-42.3-x86_64.json b/opensuse/opensuse-leap-42.3-x86_64.json index e9c953901..16abc55ed 100644 --- a/opensuse/opensuse-leap-42.3-x86_64.json +++ b/opensuse/opensuse-leap-42.3-x86_64.json @@ -16,6 +16,7 @@ "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "guest_additions_url": "{{user `guest_additions_url`}}", "guest_os_type": "OpenSUSE_64", "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", @@ -186,6 +187,7 @@ } ], "variables": { + "guest_additions_url": "", "arch": "64", "autoinst_cfg": "autoinst.xml", "box_basename": "opensuse-leap-42.3", diff --git a/oraclelinux/oracle-5.11-i386.json b/oraclelinux/oracle-5.11-i386.json index c28ddd429..f46d8e370 100644 --- a/oraclelinux/oracle-5.11-i386.json +++ b/oraclelinux/oracle-5.11-i386.json @@ -7,6 +7,7 @@ "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "guest_additions_url": "{{user `guest_additions_url`}}", "guest_os_type": "Oracle", "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", @@ -153,6 +154,7 @@ } ], "variables": { + "guest_additions_url": "", "arch": "32", "box_basename": "oracle-5.11-i386", "build_timestamp": "{{isotime \"20060102150405\"}}", diff --git a/oraclelinux/oracle-5.11-x86_64.json b/oraclelinux/oracle-5.11-x86_64.json index 856da8d78..35acb918b 100644 --- a/oraclelinux/oracle-5.11-x86_64.json +++ b/oraclelinux/oracle-5.11-x86_64.json @@ -7,6 +7,7 @@ "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "guest_additions_url": "{{user `guest_additions_url`}}", "guest_os_type": "Oracle_64", "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", @@ -159,6 +160,7 @@ } ], "variables": { + "guest_additions_url": "", "arch": "64", "box_basename": "oracle-5.11", "build_timestamp": "{{isotime \"20060102150405\"}}", diff --git a/oraclelinux/oracle-6.9-i386.json b/oraclelinux/oracle-6.9-i386.json index 72c9ae6b2..3327fa58e 100644 --- a/oraclelinux/oracle-6.9-i386.json +++ b/oraclelinux/oracle-6.9-i386.json @@ -7,6 +7,7 @@ "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "guest_additions_url": "{{user `guest_additions_url`}}", "guest_os_type": "Oracle", "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", @@ -154,6 +155,7 @@ } ], "variables": { + "guest_additions_url": "", "arch": "32", "box_basename": "oracle-6.9-i386", "build_timestamp": "{{isotime \"20060102150405\"}}", diff --git a/oraclelinux/oracle-6.9-x86_64.json b/oraclelinux/oracle-6.9-x86_64.json index 26174fa77..e51f4c1f0 100644 --- a/oraclelinux/oracle-6.9-x86_64.json +++ b/oraclelinux/oracle-6.9-x86_64.json @@ -7,6 +7,7 @@ "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "guest_additions_url": "{{user `guest_additions_url`}}", "guest_os_type": "Oracle_64", "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", @@ -154,6 +155,7 @@ } ], "variables": { + "guest_additions_url": "", "arch": "64", "box_basename": "oracle-6.9", "build_timestamp": "{{isotime \"20060102150405\"}}", diff --git a/oraclelinux/oracle-7.3-x86_64.json b/oraclelinux/oracle-7.3-x86_64.json index ea69f94c4..ad4b7e3d1 100644 --- a/oraclelinux/oracle-7.3-x86_64.json +++ b/oraclelinux/oracle-7.3-x86_64.json @@ -7,6 +7,7 @@ "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "guest_additions_url": "{{user `guest_additions_url`}}", "guest_os_type": "Oracle_64", "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", @@ -154,6 +155,7 @@ } ], "variables": { + "guest_additions_url": "", "arch": "64", "box_basename": "oracle-7.3", "build_timestamp": "{{isotime \"20060102150405\"}}", diff --git a/rhel/rhel-5.11-i386.json b/rhel/rhel-5.11-i386.json index 78f04e231..d5189188e 100644 --- a/rhel/rhel-5.11-i386.json +++ b/rhel/rhel-5.11-i386.json @@ -7,6 +7,7 @@ "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "guest_additions_url": "{{user `guest_additions_url`}}", "guest_os_type": "RedHat", "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", @@ -152,6 +153,7 @@ } ], "variables": { + "guest_additions_url": "", "arch": "32", "box_basename": "rhel-5.11-i386", "build_timestamp": "{{isotime \"20060102150405\"}}", diff --git a/rhel/rhel-5.11-x86_64.json b/rhel/rhel-5.11-x86_64.json index a0bec8ef5..53a97af3e 100644 --- a/rhel/rhel-5.11-x86_64.json +++ b/rhel/rhel-5.11-x86_64.json @@ -7,6 +7,7 @@ "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "guest_additions_url": "{{user `guest_additions_url`}}", "guest_os_type": "RedHat_64", "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", @@ -158,6 +159,7 @@ } ], "variables": { + "guest_additions_url": "", "arch": "64", "box_basename": "rhel-5.11", "build_timestamp": "{{isotime \"20060102150405\"}}", diff --git a/rhel/rhel-6.9-i386.json b/rhel/rhel-6.9-i386.json index 0da1f82dd..c696310b2 100644 --- a/rhel/rhel-6.9-i386.json +++ b/rhel/rhel-6.9-i386.json @@ -7,6 +7,7 @@ "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "guest_additions_url": "{{user `guest_additions_url`}}", "guest_os_type": "RedHat", "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", @@ -153,6 +154,7 @@ } ], "variables": { + "guest_additions_url": "", "arch": "32", "box_basename": "rhel-6.9-i386", "build_timestamp": "{{isotime \"20060102150405\"}}", diff --git a/rhel/rhel-6.9-x86_64.json b/rhel/rhel-6.9-x86_64.json index 0559bface..059feaba6 100644 --- a/rhel/rhel-6.9-x86_64.json +++ b/rhel/rhel-6.9-x86_64.json @@ -7,6 +7,7 @@ "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "guest_additions_url": "{{user `guest_additions_url`}}", "guest_os_type": "RedHat_64", "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", @@ -153,6 +154,7 @@ } ], "variables": { + "guest_additions_url": "", "arch": "64", "box_basename": "rhel-6.9", "build_timestamp": "{{isotime \"20060102150405\"}}", diff --git a/rhel/rhel-7.4-x86_64.json b/rhel/rhel-7.4-x86_64.json index bdc88c006..21fad578e 100644 --- a/rhel/rhel-7.4-x86_64.json +++ b/rhel/rhel-7.4-x86_64.json @@ -7,6 +7,7 @@ "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "guest_additions_url": "{{user `guest_additions_url`}}", "guest_os_type": "RedHat_64", "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", @@ -153,6 +154,7 @@ } ], "variables": { + "guest_additions_url": "", "arch": "64", "box_basename": "rhel-7.4", "build_timestamp": "{{isotime \"20060102150405\"}}", diff --git a/sles/sles-12-sp2-x86_64.json b/sles/sles-12-sp2-x86_64.json index 5154531f7..83d703332 100644 --- a/sles/sles-12-sp2-x86_64.json +++ b/sles/sles-12-sp2-x86_64.json @@ -11,6 +11,7 @@ "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "guest_additions_url": "{{user `guest_additions_url`}}", "guest_os_type": "OpenSUSE_64", "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", @@ -172,6 +173,7 @@ } ], "variables": { + "guest_additions_url": "", "_DOWNLOAD_SITE": "https://www.suse.com/products/server/download", "_README": "You must download the automated installer iso from the following page, and then place it in the packer_cache dir", "arch": "64", diff --git a/sles/sles-12-sp3-x86_64.json b/sles/sles-12-sp3-x86_64.json index 8b03eca44..64ea34678 100644 --- a/sles/sles-12-sp3-x86_64.json +++ b/sles/sles-12-sp3-x86_64.json @@ -11,6 +11,7 @@ "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "guest_additions_url": "{{user `guest_additions_url`}}", "guest_os_type": "OpenSUSE_64", "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", @@ -172,6 +173,7 @@ } ], "variables": { + "guest_additions_url": "", "_DOWNLOAD_SITE": "https://www.suse.com/products/server/download", "_README": "You must download the automated installer iso from the following page, and then place it in the packer_cache dir", "arch": "64", diff --git a/solaris/solaris-10.11-x86.json b/solaris/solaris-10.11-x86.json index 61dc1f593..e85be965c 100644 --- a/solaris/solaris-10.11-x86.json +++ b/solaris/solaris-10.11-x86.json @@ -20,6 +20,7 @@ "floppy/finish.sh" ], "guest_additions_mode": "upload", + "guest_additions_url": "{{user `guest_additions_url`}}", "guest_os_type": "Solaris_64", "headless": "{{ user `headless` }}", "http_directory": "http", @@ -114,6 +115,7 @@ } ], "variables": { + "guest_additions_url": "", "_DOWNLOAD_SITE": "http://www.oracle.com/technetwork/server-storage/solaris10/downloads/index.html", "_README": "You must download the automated installer iso from the following page, and then place it somewhere that packer can fetch it", "arch": "64", diff --git a/solaris/solaris-11-x86.json b/solaris/solaris-11-x86.json index da83c577e..9d50ef1a5 100644 --- a/solaris/solaris-11-x86.json +++ b/solaris/solaris-11-x86.json @@ -31,6 +31,7 @@ "boot_wait": "5s", "disk_size": "{{user `disk_size`}}", "guest_additions_mode": "attach", + "guest_additions_url": "{{user `guest_additions_url`}}", "guest_os_type": "Solaris11_64", "headless": "{{ user `headless` }}", "http_directory": "http", @@ -136,6 +137,7 @@ } ], "variables": { + "guest_additions_url": "", "_DOWNLOAD_SITE": "http://www.oracle.com/technetwork/server-storage/solaris11/downloads/index.html", "_README": "You must download the automated installer iso from the following page, and then place it in the packer_cache dir", "arch": "64", diff --git a/ubuntu/ubuntu-14.04-amd64.json b/ubuntu/ubuntu-14.04-amd64.json index 38d3070ab..d888ed3a4 100644 --- a/ubuntu/ubuntu-14.04-amd64.json +++ b/ubuntu/ubuntu-14.04-amd64.json @@ -28,6 +28,7 @@ "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "guest_additions_url": "{{user `guest_additions_url`}}", "guest_os_type": "Ubuntu_64", "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", @@ -285,6 +286,7 @@ } ], "variables": { + "guest_additions_url": "", "box_basename": "ubuntu-14.04", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", diff --git a/ubuntu/ubuntu-14.04-i386.json b/ubuntu/ubuntu-14.04-i386.json index 432f165ff..91d63ab0a 100644 --- a/ubuntu/ubuntu-14.04-i386.json +++ b/ubuntu/ubuntu-14.04-i386.json @@ -28,6 +28,7 @@ "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "guest_additions_url": "{{user `guest_additions_url`}}", "guest_os_type": "Ubuntu", "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", @@ -249,6 +250,7 @@ } ], "variables": { + "guest_additions_url": "", "box_basename": "ubuntu-14.04-i386", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", diff --git a/ubuntu/ubuntu-16.04-amd64.json b/ubuntu/ubuntu-16.04-amd64.json index 8a587b421..c9857761a 100644 --- a/ubuntu/ubuntu-16.04-amd64.json +++ b/ubuntu/ubuntu-16.04-amd64.json @@ -30,6 +30,7 @@ "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "guest_additions_url": "{{user `guest_additions_url`}}", "guest_os_type": "Ubuntu_64", "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", @@ -294,6 +295,7 @@ } ], "variables": { + "guest_additions_url": "", "box_basename": "ubuntu-16.04", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", diff --git a/ubuntu/ubuntu-16.04-i386.json b/ubuntu/ubuntu-16.04-i386.json index 907d79f4e..ea2328f03 100644 --- a/ubuntu/ubuntu-16.04-i386.json +++ b/ubuntu/ubuntu-16.04-i386.json @@ -30,6 +30,7 @@ "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "guest_additions_url": "{{user `guest_additions_url`}}", "guest_os_type": "Ubuntu", "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", @@ -257,6 +258,7 @@ } ], "variables": { + "guest_additions_url": "", "box_basename": "ubuntu-16.04-i386", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", diff --git a/ubuntu/ubuntu-17.04-amd64.json b/ubuntu/ubuntu-17.04-amd64.json index 8724f041f..68f56ea42 100644 --- a/ubuntu/ubuntu-17.04-amd64.json +++ b/ubuntu/ubuntu-17.04-amd64.json @@ -29,6 +29,7 @@ "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "guest_additions_url": "{{user `guest_additions_url`}}", "guest_os_type": "Ubuntu_64", "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", @@ -290,6 +291,7 @@ } ], "variables": { + "guest_additions_url": "", "box_basename": "ubuntu-17.04", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", diff --git a/ubuntu/ubuntu-17.04-i386.json b/ubuntu/ubuntu-17.04-i386.json index bddb90c77..a588903ae 100644 --- a/ubuntu/ubuntu-17.04-i386.json +++ b/ubuntu/ubuntu-17.04-i386.json @@ -29,6 +29,7 @@ "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "guest_additions_url": "{{user `guest_additions_url`}}", "guest_os_type": "Ubuntu", "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", @@ -254,6 +255,7 @@ } ], "variables": { + "guest_additions_url": "", "box_basename": "ubuntu-17.04-i386", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", diff --git a/ubuntu/ubuntu-17.10-amd64.json b/ubuntu/ubuntu-17.10-amd64.json index 76d7cfcab..7101a1d47 100644 --- a/ubuntu/ubuntu-17.10-amd64.json +++ b/ubuntu/ubuntu-17.10-amd64.json @@ -29,6 +29,7 @@ "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "guest_additions_url": "{{user `guest_additions_url`}}", "guest_os_type": "Ubuntu_64", "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", @@ -290,6 +291,7 @@ } ], "variables": { + "guest_additions_url": "", "box_basename": "ubuntu-17.10", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", diff --git a/ubuntu/ubuntu-17.10-i386.json b/ubuntu/ubuntu-17.10-i386.json index fc30d50ad..d6b67912a 100644 --- a/ubuntu/ubuntu-17.10-i386.json +++ b/ubuntu/ubuntu-17.10-i386.json @@ -29,6 +29,7 @@ "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "guest_additions_url": "{{user `guest_additions_url`}}", "guest_os_type": "Ubuntu", "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", @@ -254,6 +255,7 @@ } ], "variables": { + "guest_additions_url": "", "box_basename": "ubuntu-17.10-i386", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", diff --git a/windows/windows-nano-tp3.json b/windows/windows-nano-tp3.json index d6ced88c5..ed90b2bb3 100644 --- a/windows/windows-nano-tp3.json +++ b/windows/windows-nano-tp3.json @@ -11,6 +11,7 @@ "scripts/postunattend.xml" ], "guest_additions_mode": "disable", + "guest_additions_url": "{{user `guest_additions_url`}}", "guest_os_type": "Windows2012_64", "headless": "{{ user `headless` }}", "iso_checksum": "{{ user `iso_checksum` }}", @@ -67,6 +68,7 @@ } ], "variables": { + "guest_additions_url": "", "box_basename": "windows-nano", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "2", From 94044bd786fdb455ecdb1630a243eebcd4cdf96d Mon Sep 17 00:00:00 2001 From: Ali Rizvi-Santiago <arizvisa@gmail.com> Date: Sun, 31 Dec 2017 17:26:42 -0600 Subject: [PATCH 0743/1622] Fixed a mis-spelling of "vmware" in the FreeBSD templates for the "output_directory". --- freebsd/freebsd-10.3-amd64.json | 2 +- freebsd/freebsd-10.3-i386.json | 2 +- freebsd/freebsd-10.4-amd64.json | 2 +- freebsd/freebsd-10.4-i386.json | 2 +- freebsd/freebsd-11.1-amd64.json | 2 +- freebsd/freebsd-11.1-i386.json | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/freebsd/freebsd-10.3-amd64.json b/freebsd/freebsd-10.3-amd64.json index cb776639f..3b2d282f8 100644 --- a/freebsd/freebsd-10.3-amd64.json +++ b/freebsd/freebsd-10.3-amd64.json @@ -66,7 +66,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../builds/packer-{{user `template`}}-vmare", + "output_directory": "../builds/packer-{{user `template`}}-vmware", "shutdown_command": "echo 'vagrant' | su -m root -c 'shutdown -p now'", "ssh_password": "vagrant", "ssh_port": 22, diff --git a/freebsd/freebsd-10.3-i386.json b/freebsd/freebsd-10.3-i386.json index aeb14a066..b080b7f5e 100644 --- a/freebsd/freebsd-10.3-i386.json +++ b/freebsd/freebsd-10.3-i386.json @@ -66,7 +66,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../builds/packer-{{user `template`}}-vmare", + "output_directory": "../builds/packer-{{user `template`}}-vmware", "shutdown_command": "echo 'vagrant' | su -m root -c 'shutdown -p now'", "ssh_password": "vagrant", "ssh_port": 22, diff --git a/freebsd/freebsd-10.4-amd64.json b/freebsd/freebsd-10.4-amd64.json index d2c7a0136..ec3e7d3eb 100644 --- a/freebsd/freebsd-10.4-amd64.json +++ b/freebsd/freebsd-10.4-amd64.json @@ -66,7 +66,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../builds/packer-{{user `template`}}-vmare", + "output_directory": "../builds/packer-{{user `template`}}-vmware", "shutdown_command": "echo 'vagrant' | su -m root -c 'shutdown -p now'", "ssh_password": "vagrant", "ssh_port": 22, diff --git a/freebsd/freebsd-10.4-i386.json b/freebsd/freebsd-10.4-i386.json index 80d16fcf2..ad267aae2 100644 --- a/freebsd/freebsd-10.4-i386.json +++ b/freebsd/freebsd-10.4-i386.json @@ -66,7 +66,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../builds/packer-{{user `template`}}-vmare", + "output_directory": "../builds/packer-{{user `template`}}-vmware", "shutdown_command": "echo 'vagrant' | su -m root -c 'shutdown -p now'", "ssh_password": "vagrant", "ssh_port": 22, diff --git a/freebsd/freebsd-11.1-amd64.json b/freebsd/freebsd-11.1-amd64.json index dfd491c58..c5d59ad68 100644 --- a/freebsd/freebsd-11.1-amd64.json +++ b/freebsd/freebsd-11.1-amd64.json @@ -66,7 +66,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../builds/packer-{{user `template`}}-vmare", + "output_directory": "../builds/packer-{{user `template`}}-vmware", "shutdown_command": "echo 'vagrant' | su -m root -c 'shutdown -p now'", "ssh_password": "vagrant", "ssh_port": 22, diff --git a/freebsd/freebsd-11.1-i386.json b/freebsd/freebsd-11.1-i386.json index be70c2b93..b41c826d3 100644 --- a/freebsd/freebsd-11.1-i386.json +++ b/freebsd/freebsd-11.1-i386.json @@ -66,7 +66,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../builds/packer-{{user `template`}}-vmare", + "output_directory": "../builds/packer-{{user `template`}}-vmware", "shutdown_command": "echo 'vagrant' | su -m root -c 'shutdown -p now'", "ssh_password": "vagrant", "ssh_port": 22, From 2f2feddbcc13c43e60619b1920474e96eb3c5dc9 Mon Sep 17 00:00:00 2001 From: Seth Thomas <sthomas@chef.io> Date: Tue, 2 Jan 2018 12:13:31 -0500 Subject: [PATCH 0744/1622] Switching to a simpler build list Signed-off-by: Seth Thomas <sthomas@chef.io> --- builds.yml | 87 +++++++++++++++++++++--------------------------------- 1 file changed, 34 insertions(+), 53 deletions(-) diff --git a/builds.yml b/builds.yml index cac88d201..79324db98 100644 --- a/builds.yml +++ b/builds.yml @@ -6,62 +6,43 @@ providers: public: centos: - '6.9': - - x86_64 - - i386 - '7.4': - - x86_64 + - '7.4' + - '6.9' + - '6.9-i386' oracle: - '6.9': - - x86_64 - - i386 - '7.3': - - x86_64 + - '7.3' + - '6.9' + - '6.9-i386' ubuntu: - '14.04': - - amd64 - - i386 - '16.04': - - amd64 - - i386 - '17.04': - - amd64 - - i386 - '17.10': - - amd64 - - i386 + - '17.10' + - '17.10-i386' + - '17.04' + - '17.04-i386' + - '16.04' + - '16.04-i386' + - '14.04' + - '14.04-i386' debian: - '7.11': - - amd64 - - i386 - '8.9': - - amd64 - - i386 - '9.2': - - amd64 + - '9.3' + - '8.10' + - '8.10-i386' + - '7.11' + - '7.11-i386' fedora: - '25': - - x86_64 - '26': - - x86_64 - freebsd: - '10.3': - - amd64 - '10.4': - - amd64 - '11.1': - - amd64 + - '27' + - '26' opensuse-leap: - '42.3': - - x86_64 - -private: - rhel: - '6.9': - - x86_64 - - i386 - '7.3': - - x86_64 + - '42.3' + freebsd: + - '11.1' + - '10.4' -broken: - - opensuse-leap-42.3-x86_64-all +slugs: + 'centos-7': 'centos-7.4' + 'centos-6': 'centos-6.9' + 'debian-9': 'debian-9.3' + 'debian-8': 'debian-8.10' + 'debian-7': 'debian-7.11' + 'freebsd-11': 'freebsd-11.1' + 'freebsd-10': 'freebsd-10.4' + 'opensuse-leap-42': 'opensuse-leap-42.3' From c4844e66305c4b41d4a8e9b33d50a5b4c8e17ac1 Mon Sep 17 00:00:00 2001 From: Seth Thomas <cheeseplus@chef.io> Date: Tue, 2 Jan 2018 14:29:17 -0500 Subject: [PATCH 0745/1622] Revert "Added guest_additions_url as a user-variable for VirtualBox builds." --- centos/centos-6.9-i386.json | 2 -- centos/centos-6.9-x86_64.json | 2 -- centos/centos-7.4-x86_64.json | 2 -- debian/debian-7.11-amd64.json | 2 -- debian/debian-7.11-i386.json | 2 -- debian/debian-8.10-amd64.json | 2 -- debian/debian-8.10-i386.json | 2 -- debian/debian-9.3-amd64.json | 2 -- debian/debian-9.3-i386.json | 2 -- fedora/fedora-26-x86_64.json | 2 -- fedora/fedora-27-x86_64.json | 2 -- freebsd/freebsd-10.3-amd64.json | 2 -- freebsd/freebsd-10.3-i386.json | 2 -- freebsd/freebsd-10.4-amd64.json | 2 -- freebsd/freebsd-10.4-i386.json | 2 -- freebsd/freebsd-11.1-amd64.json | 2 -- macos/macos-10.12.json | 2 -- macos/macosx-10.10.json | 2 -- macos/macosx-10.11.json | 2 -- macos/macosx-10.9.json | 2 -- opensuse/opensuse-leap-42.3-x86_64.json | 2 -- oraclelinux/oracle-5.11-i386.json | 2 -- oraclelinux/oracle-5.11-x86_64.json | 2 -- oraclelinux/oracle-6.9-i386.json | 2 -- oraclelinux/oracle-6.9-x86_64.json | 2 -- oraclelinux/oracle-7.3-x86_64.json | 2 -- rhel/rhel-5.11-i386.json | 2 -- rhel/rhel-5.11-x86_64.json | 2 -- rhel/rhel-6.9-i386.json | 2 -- rhel/rhel-6.9-x86_64.json | 2 -- rhel/rhel-7.4-x86_64.json | 2 -- sles/sles-12-sp2-x86_64.json | 2 -- sles/sles-12-sp3-x86_64.json | 2 -- solaris/solaris-10.11-x86.json | 2 -- solaris/solaris-11-x86.json | 2 -- ubuntu/ubuntu-14.04-amd64.json | 2 -- ubuntu/ubuntu-14.04-i386.json | 2 -- ubuntu/ubuntu-16.04-amd64.json | 2 -- ubuntu/ubuntu-16.04-i386.json | 2 -- ubuntu/ubuntu-17.04-amd64.json | 2 -- ubuntu/ubuntu-17.04-i386.json | 2 -- ubuntu/ubuntu-17.10-amd64.json | 2 -- ubuntu/ubuntu-17.10-i386.json | 2 -- windows/windows-nano-tp3.json | 2 -- 44 files changed, 88 deletions(-) diff --git a/centos/centos-6.9-i386.json b/centos/centos-6.9-i386.json index b5183d46a..5ae9896a5 100644 --- a/centos/centos-6.9-i386.json +++ b/centos/centos-6.9-i386.json @@ -7,7 +7,6 @@ "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", - "guest_additions_url": "{{user `guest_additions_url`}}", "guest_os_type": "RedHat", "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", @@ -182,7 +181,6 @@ } ], "variables": { - "guest_additions_url": "", "box_basename": "centos-6.9-i386", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", diff --git a/centos/centos-6.9-x86_64.json b/centos/centos-6.9-x86_64.json index 85b2327fb..dc1088a5f 100644 --- a/centos/centos-6.9-x86_64.json +++ b/centos/centos-6.9-x86_64.json @@ -7,7 +7,6 @@ "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", - "guest_additions_url": "{{user `guest_additions_url`}}", "guest_os_type": "RedHat_64", "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", @@ -182,7 +181,6 @@ } ], "variables": { - "guest_additions_url": "", "box_basename": "centos-6.9", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", diff --git a/centos/centos-7.4-x86_64.json b/centos/centos-7.4-x86_64.json index b272321cc..ae84cefcf 100644 --- a/centos/centos-7.4-x86_64.json +++ b/centos/centos-7.4-x86_64.json @@ -7,7 +7,6 @@ "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", - "guest_additions_url": "{{user `guest_additions_url`}}", "guest_os_type": "RedHat_64", "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", @@ -182,7 +181,6 @@ } ], "variables": { - "guest_additions_url": "", "box_basename": "centos-7.4", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", diff --git a/debian/debian-7.11-amd64.json b/debian/debian-7.11-amd64.json index c1a6c1e33..0e4d83d62 100644 --- a/debian/debian-7.11-amd64.json +++ b/debian/debian-7.11-amd64.json @@ -21,7 +21,6 @@ "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", - "guest_additions_url": "{{user `guest_additions_url`}}", "guest_os_type": "Debian_64", "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", @@ -212,7 +211,6 @@ } ], "variables": { - "guest_additions_url": "", "box_basename": "debian-7.11", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", diff --git a/debian/debian-7.11-i386.json b/debian/debian-7.11-i386.json index 1a5d38c65..e9542db8b 100644 --- a/debian/debian-7.11-i386.json +++ b/debian/debian-7.11-i386.json @@ -21,7 +21,6 @@ "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", - "guest_additions_url": "{{user `guest_additions_url`}}", "guest_os_type": "Debian", "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", @@ -212,7 +211,6 @@ } ], "variables": { - "guest_additions_url": "", "box_basename": "debian-7.11-i386", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", diff --git a/debian/debian-8.10-amd64.json b/debian/debian-8.10-amd64.json index f68fb386d..2d57feb87 100644 --- a/debian/debian-8.10-amd64.json +++ b/debian/debian-8.10-amd64.json @@ -22,7 +22,6 @@ "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", - "guest_additions_url": "{{user `guest_additions_url`}}", "guest_os_type": "Debian_64", "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", @@ -218,7 +217,6 @@ } ], "variables": { - "guest_additions_url": "", "box_basename": "debian-8.10", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", diff --git a/debian/debian-8.10-i386.json b/debian/debian-8.10-i386.json index 156e6df7d..86f538420 100644 --- a/debian/debian-8.10-i386.json +++ b/debian/debian-8.10-i386.json @@ -22,7 +22,6 @@ "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", - "guest_additions_url": "{{user `guest_additions_url`}}", "guest_os_type": "Debian", "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", @@ -218,7 +217,6 @@ } ], "variables": { - "guest_additions_url": "", "box_basename": "debian-8.10-i386", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", diff --git a/debian/debian-9.3-amd64.json b/debian/debian-9.3-amd64.json index f6e2df2e0..59d365702 100644 --- a/debian/debian-9.3-amd64.json +++ b/debian/debian-9.3-amd64.json @@ -22,7 +22,6 @@ "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", - "guest_additions_url": "{{user `guest_additions_url`}}", "guest_os_type": "Debian_64", "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", @@ -218,7 +217,6 @@ } ], "variables": { - "guest_additions_url": "", "box_basename": "debian-9.3", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", diff --git a/debian/debian-9.3-i386.json b/debian/debian-9.3-i386.json index 1a8e025a2..8e24aa832 100644 --- a/debian/debian-9.3-i386.json +++ b/debian/debian-9.3-i386.json @@ -22,7 +22,6 @@ "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", - "guest_additions_url": "{{user `guest_additions_url`}}", "guest_os_type": "Debian", "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", @@ -218,7 +217,6 @@ } ], "variables": { - "guest_additions_url": "", "box_basename": "debian-9.3-i386", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", diff --git a/fedora/fedora-26-x86_64.json b/fedora/fedora-26-x86_64.json index 24053061e..09056908c 100644 --- a/fedora/fedora-26-x86_64.json +++ b/fedora/fedora-26-x86_64.json @@ -7,7 +7,6 @@ "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", - "guest_additions_url": "{{user `guest_additions_url`}}", "guest_os_type": "Fedora_64", "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", @@ -157,7 +156,6 @@ } ], "variables": { - "guest_additions_url": "", "arch": "64", "box_basename": "fedora-26", "build_timestamp": "{{isotime \"20060102150405\"}}", diff --git a/fedora/fedora-27-x86_64.json b/fedora/fedora-27-x86_64.json index 489eb1765..74f127c04 100644 --- a/fedora/fedora-27-x86_64.json +++ b/fedora/fedora-27-x86_64.json @@ -7,7 +7,6 @@ "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", - "guest_additions_url": "{{user `guest_additions_url`}}", "guest_os_type": "Fedora_64", "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", @@ -157,7 +156,6 @@ } ], "variables": { - "guest_additions_url": "", "arch": "64", "box_basename": "fedora-27", "build_timestamp": "{{isotime \"20060102150405\"}}", diff --git a/freebsd/freebsd-10.3-amd64.json b/freebsd/freebsd-10.3-amd64.json index 5711e1f50..3b2d282f8 100644 --- a/freebsd/freebsd-10.3-amd64.json +++ b/freebsd/freebsd-10.3-amd64.json @@ -15,7 +15,6 @@ "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", - "guest_additions_url": "{{user `guest_additions_url`}}", "guest_os_type": "FreeBSD_64", "headless": "{{ user `headless` }}", "http_directory": "http", @@ -206,7 +205,6 @@ } ], "variables": { - "guest_additions_url": "", "box_basename": "freebsd-10.3", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", diff --git a/freebsd/freebsd-10.3-i386.json b/freebsd/freebsd-10.3-i386.json index 746e9eb83..b080b7f5e 100644 --- a/freebsd/freebsd-10.3-i386.json +++ b/freebsd/freebsd-10.3-i386.json @@ -15,7 +15,6 @@ "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", - "guest_additions_url": "{{user `guest_additions_url`}}", "guest_os_type": "FreeBSD", "headless": "{{ user `headless` }}", "http_directory": "http", @@ -206,7 +205,6 @@ } ], "variables": { - "guest_additions_url": "", "box_basename": "freebsd-10.3-i386", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", diff --git a/freebsd/freebsd-10.4-amd64.json b/freebsd/freebsd-10.4-amd64.json index 294f54890..ec3e7d3eb 100644 --- a/freebsd/freebsd-10.4-amd64.json +++ b/freebsd/freebsd-10.4-amd64.json @@ -15,7 +15,6 @@ "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", - "guest_additions_url": "{{user `guest_additions_url`}}", "guest_os_type": "FreeBSD_64", "headless": "{{ user `headless` }}", "http_directory": "http", @@ -206,7 +205,6 @@ } ], "variables": { - "guest_additions_url": "", "box_basename": "freebsd-10.4", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", diff --git a/freebsd/freebsd-10.4-i386.json b/freebsd/freebsd-10.4-i386.json index 16bd2a7e4..ad267aae2 100644 --- a/freebsd/freebsd-10.4-i386.json +++ b/freebsd/freebsd-10.4-i386.json @@ -15,7 +15,6 @@ "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", - "guest_additions_url": "{{user `guest_additions_url`}}", "guest_os_type": "FreeBSD", "headless": "{{ user `headless` }}", "http_directory": "http", @@ -206,7 +205,6 @@ } ], "variables": { - "guest_additions_url": "", "box_basename": "freebsd-10.4-i386", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", diff --git a/freebsd/freebsd-11.1-amd64.json b/freebsd/freebsd-11.1-amd64.json index cdb855a4b..c5d59ad68 100644 --- a/freebsd/freebsd-11.1-amd64.json +++ b/freebsd/freebsd-11.1-amd64.json @@ -15,7 +15,6 @@ "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", - "guest_additions_url": "{{user `guest_additions_url`}}", "guest_os_type": "FreeBSD_64", "headless": "{{ user `headless` }}", "http_directory": "http", @@ -206,7 +205,6 @@ } ], "variables": { - "guest_additions_url": "", "box_basename": "freebsd-11.1", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", diff --git a/macos/macos-10.12.json b/macos/macos-10.12.json index cf9cd6a32..ed697aae8 100644 --- a/macos/macos-10.12.json +++ b/macos/macos-10.12.json @@ -37,7 +37,6 @@ "boot_wait": "2s", "disk_size": "{{user `disk_size`}}", "guest_additions_mode": "disable", - "guest_additions_url": "{{user `guest_additions_url`}}", "guest_os_type": "MacOS1011_64", "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", @@ -224,7 +223,6 @@ } ], "variables": { - "guest_additions_url": "", "_README": "You must provide a prepared Mac disk image (from https://github.com/timsutton/osx-vm-templates) and checksum value for this template to work. For more details, consult this project's README.md", "box_basename": "macos-10.12", "build_timestamp": "{{isotime \"20060102150405\"}}", diff --git a/macos/macosx-10.10.json b/macos/macosx-10.10.json index 88bd89a97..694752402 100644 --- a/macos/macosx-10.10.json +++ b/macos/macosx-10.10.json @@ -37,7 +37,6 @@ "boot_wait": "2s", "disk_size": "{{user `disk_size`}}", "guest_additions_mode": "disable", - "guest_additions_url": "{{user `guest_additions_url`}}", "guest_os_type": "MacOS109_64", "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", @@ -224,7 +223,6 @@ } ], "variables": { - "guest_additions_url": "", "_README": "You must provide a prepared Mac disk image (from https://github.com/timsutton/osx-vm-templates) and checksum value for this template to work. For more details, consult this project's README.md", "box_basename": "macosx-10.10", "build_timestamp": "{{isotime \"20060102150405\"}}", diff --git a/macos/macosx-10.11.json b/macos/macosx-10.11.json index f7c6c0a50..fc0ed42d9 100644 --- a/macos/macosx-10.11.json +++ b/macos/macosx-10.11.json @@ -37,7 +37,6 @@ "boot_wait": "2s", "disk_size": "{{user `disk_size`}}", "guest_additions_mode": "disable", - "guest_additions_url": "{{user `guest_additions_url`}}", "guest_os_type": "MacOS1011_64", "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", @@ -224,7 +223,6 @@ } ], "variables": { - "guest_additions_url": "", "_README": "You must provide a prepared Mac disk image (from https://github.com/timsutton/osx-vm-templates) and checksum value for this template to work. For more details, consult this project's README.md", "box_basename": "macosx-10.11", "build_timestamp": "{{isotime \"20060102150405\"}}", diff --git a/macos/macosx-10.9.json b/macos/macosx-10.9.json index 56ef77ace..4a345e3dd 100644 --- a/macos/macosx-10.9.json +++ b/macos/macosx-10.9.json @@ -37,7 +37,6 @@ "boot_wait": "2s", "disk_size": "{{user `disk_size`}}", "guest_additions_mode": "disable", - "guest_additions_url": "{{user `guest_additions_url`}}", "guest_os_type": "MacOS109_64", "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", @@ -224,7 +223,6 @@ } ], "variables": { - "guest_additions_url": "", "_README": "You must provide a prepared Mac disk image (from https://github.com/timsutton/osx-vm-templates) and checksum value for this template to work. For more details, consult this project's README.md", "box_basename": "macosx-10.9", "build_timestamp": "{{isotime \"20060102150405\"}}", diff --git a/opensuse/opensuse-leap-42.3-x86_64.json b/opensuse/opensuse-leap-42.3-x86_64.json index 16abc55ed..e9c953901 100644 --- a/opensuse/opensuse-leap-42.3-x86_64.json +++ b/opensuse/opensuse-leap-42.3-x86_64.json @@ -16,7 +16,6 @@ "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", - "guest_additions_url": "{{user `guest_additions_url`}}", "guest_os_type": "OpenSUSE_64", "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", @@ -187,7 +186,6 @@ } ], "variables": { - "guest_additions_url": "", "arch": "64", "autoinst_cfg": "autoinst.xml", "box_basename": "opensuse-leap-42.3", diff --git a/oraclelinux/oracle-5.11-i386.json b/oraclelinux/oracle-5.11-i386.json index f46d8e370..c28ddd429 100644 --- a/oraclelinux/oracle-5.11-i386.json +++ b/oraclelinux/oracle-5.11-i386.json @@ -7,7 +7,6 @@ "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", - "guest_additions_url": "{{user `guest_additions_url`}}", "guest_os_type": "Oracle", "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", @@ -154,7 +153,6 @@ } ], "variables": { - "guest_additions_url": "", "arch": "32", "box_basename": "oracle-5.11-i386", "build_timestamp": "{{isotime \"20060102150405\"}}", diff --git a/oraclelinux/oracle-5.11-x86_64.json b/oraclelinux/oracle-5.11-x86_64.json index 35acb918b..856da8d78 100644 --- a/oraclelinux/oracle-5.11-x86_64.json +++ b/oraclelinux/oracle-5.11-x86_64.json @@ -7,7 +7,6 @@ "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", - "guest_additions_url": "{{user `guest_additions_url`}}", "guest_os_type": "Oracle_64", "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", @@ -160,7 +159,6 @@ } ], "variables": { - "guest_additions_url": "", "arch": "64", "box_basename": "oracle-5.11", "build_timestamp": "{{isotime \"20060102150405\"}}", diff --git a/oraclelinux/oracle-6.9-i386.json b/oraclelinux/oracle-6.9-i386.json index 3327fa58e..72c9ae6b2 100644 --- a/oraclelinux/oracle-6.9-i386.json +++ b/oraclelinux/oracle-6.9-i386.json @@ -7,7 +7,6 @@ "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", - "guest_additions_url": "{{user `guest_additions_url`}}", "guest_os_type": "Oracle", "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", @@ -155,7 +154,6 @@ } ], "variables": { - "guest_additions_url": "", "arch": "32", "box_basename": "oracle-6.9-i386", "build_timestamp": "{{isotime \"20060102150405\"}}", diff --git a/oraclelinux/oracle-6.9-x86_64.json b/oraclelinux/oracle-6.9-x86_64.json index e51f4c1f0..26174fa77 100644 --- a/oraclelinux/oracle-6.9-x86_64.json +++ b/oraclelinux/oracle-6.9-x86_64.json @@ -7,7 +7,6 @@ "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", - "guest_additions_url": "{{user `guest_additions_url`}}", "guest_os_type": "Oracle_64", "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", @@ -155,7 +154,6 @@ } ], "variables": { - "guest_additions_url": "", "arch": "64", "box_basename": "oracle-6.9", "build_timestamp": "{{isotime \"20060102150405\"}}", diff --git a/oraclelinux/oracle-7.3-x86_64.json b/oraclelinux/oracle-7.3-x86_64.json index ad4b7e3d1..ea69f94c4 100644 --- a/oraclelinux/oracle-7.3-x86_64.json +++ b/oraclelinux/oracle-7.3-x86_64.json @@ -7,7 +7,6 @@ "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", - "guest_additions_url": "{{user `guest_additions_url`}}", "guest_os_type": "Oracle_64", "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", @@ -155,7 +154,6 @@ } ], "variables": { - "guest_additions_url": "", "arch": "64", "box_basename": "oracle-7.3", "build_timestamp": "{{isotime \"20060102150405\"}}", diff --git a/rhel/rhel-5.11-i386.json b/rhel/rhel-5.11-i386.json index d5189188e..78f04e231 100644 --- a/rhel/rhel-5.11-i386.json +++ b/rhel/rhel-5.11-i386.json @@ -7,7 +7,6 @@ "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", - "guest_additions_url": "{{user `guest_additions_url`}}", "guest_os_type": "RedHat", "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", @@ -153,7 +152,6 @@ } ], "variables": { - "guest_additions_url": "", "arch": "32", "box_basename": "rhel-5.11-i386", "build_timestamp": "{{isotime \"20060102150405\"}}", diff --git a/rhel/rhel-5.11-x86_64.json b/rhel/rhel-5.11-x86_64.json index 53a97af3e..a0bec8ef5 100644 --- a/rhel/rhel-5.11-x86_64.json +++ b/rhel/rhel-5.11-x86_64.json @@ -7,7 +7,6 @@ "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", - "guest_additions_url": "{{user `guest_additions_url`}}", "guest_os_type": "RedHat_64", "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", @@ -159,7 +158,6 @@ } ], "variables": { - "guest_additions_url": "", "arch": "64", "box_basename": "rhel-5.11", "build_timestamp": "{{isotime \"20060102150405\"}}", diff --git a/rhel/rhel-6.9-i386.json b/rhel/rhel-6.9-i386.json index c696310b2..0da1f82dd 100644 --- a/rhel/rhel-6.9-i386.json +++ b/rhel/rhel-6.9-i386.json @@ -7,7 +7,6 @@ "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", - "guest_additions_url": "{{user `guest_additions_url`}}", "guest_os_type": "RedHat", "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", @@ -154,7 +153,6 @@ } ], "variables": { - "guest_additions_url": "", "arch": "32", "box_basename": "rhel-6.9-i386", "build_timestamp": "{{isotime \"20060102150405\"}}", diff --git a/rhel/rhel-6.9-x86_64.json b/rhel/rhel-6.9-x86_64.json index 059feaba6..0559bface 100644 --- a/rhel/rhel-6.9-x86_64.json +++ b/rhel/rhel-6.9-x86_64.json @@ -7,7 +7,6 @@ "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", - "guest_additions_url": "{{user `guest_additions_url`}}", "guest_os_type": "RedHat_64", "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", @@ -154,7 +153,6 @@ } ], "variables": { - "guest_additions_url": "", "arch": "64", "box_basename": "rhel-6.9", "build_timestamp": "{{isotime \"20060102150405\"}}", diff --git a/rhel/rhel-7.4-x86_64.json b/rhel/rhel-7.4-x86_64.json index 21fad578e..bdc88c006 100644 --- a/rhel/rhel-7.4-x86_64.json +++ b/rhel/rhel-7.4-x86_64.json @@ -7,7 +7,6 @@ "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", - "guest_additions_url": "{{user `guest_additions_url`}}", "guest_os_type": "RedHat_64", "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", @@ -154,7 +153,6 @@ } ], "variables": { - "guest_additions_url": "", "arch": "64", "box_basename": "rhel-7.4", "build_timestamp": "{{isotime \"20060102150405\"}}", diff --git a/sles/sles-12-sp2-x86_64.json b/sles/sles-12-sp2-x86_64.json index 83d703332..5154531f7 100644 --- a/sles/sles-12-sp2-x86_64.json +++ b/sles/sles-12-sp2-x86_64.json @@ -11,7 +11,6 @@ "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", - "guest_additions_url": "{{user `guest_additions_url`}}", "guest_os_type": "OpenSUSE_64", "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", @@ -173,7 +172,6 @@ } ], "variables": { - "guest_additions_url": "", "_DOWNLOAD_SITE": "https://www.suse.com/products/server/download", "_README": "You must download the automated installer iso from the following page, and then place it in the packer_cache dir", "arch": "64", diff --git a/sles/sles-12-sp3-x86_64.json b/sles/sles-12-sp3-x86_64.json index 64ea34678..8b03eca44 100644 --- a/sles/sles-12-sp3-x86_64.json +++ b/sles/sles-12-sp3-x86_64.json @@ -11,7 +11,6 @@ "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", - "guest_additions_url": "{{user `guest_additions_url`}}", "guest_os_type": "OpenSUSE_64", "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", @@ -173,7 +172,6 @@ } ], "variables": { - "guest_additions_url": "", "_DOWNLOAD_SITE": "https://www.suse.com/products/server/download", "_README": "You must download the automated installer iso from the following page, and then place it in the packer_cache dir", "arch": "64", diff --git a/solaris/solaris-10.11-x86.json b/solaris/solaris-10.11-x86.json index e85be965c..61dc1f593 100644 --- a/solaris/solaris-10.11-x86.json +++ b/solaris/solaris-10.11-x86.json @@ -20,7 +20,6 @@ "floppy/finish.sh" ], "guest_additions_mode": "upload", - "guest_additions_url": "{{user `guest_additions_url`}}", "guest_os_type": "Solaris_64", "headless": "{{ user `headless` }}", "http_directory": "http", @@ -115,7 +114,6 @@ } ], "variables": { - "guest_additions_url": "", "_DOWNLOAD_SITE": "http://www.oracle.com/technetwork/server-storage/solaris10/downloads/index.html", "_README": "You must download the automated installer iso from the following page, and then place it somewhere that packer can fetch it", "arch": "64", diff --git a/solaris/solaris-11-x86.json b/solaris/solaris-11-x86.json index 9d50ef1a5..da83c577e 100644 --- a/solaris/solaris-11-x86.json +++ b/solaris/solaris-11-x86.json @@ -31,7 +31,6 @@ "boot_wait": "5s", "disk_size": "{{user `disk_size`}}", "guest_additions_mode": "attach", - "guest_additions_url": "{{user `guest_additions_url`}}", "guest_os_type": "Solaris11_64", "headless": "{{ user `headless` }}", "http_directory": "http", @@ -137,7 +136,6 @@ } ], "variables": { - "guest_additions_url": "", "_DOWNLOAD_SITE": "http://www.oracle.com/technetwork/server-storage/solaris11/downloads/index.html", "_README": "You must download the automated installer iso from the following page, and then place it in the packer_cache dir", "arch": "64", diff --git a/ubuntu/ubuntu-14.04-amd64.json b/ubuntu/ubuntu-14.04-amd64.json index d888ed3a4..38d3070ab 100644 --- a/ubuntu/ubuntu-14.04-amd64.json +++ b/ubuntu/ubuntu-14.04-amd64.json @@ -28,7 +28,6 @@ "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", - "guest_additions_url": "{{user `guest_additions_url`}}", "guest_os_type": "Ubuntu_64", "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", @@ -286,7 +285,6 @@ } ], "variables": { - "guest_additions_url": "", "box_basename": "ubuntu-14.04", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", diff --git a/ubuntu/ubuntu-14.04-i386.json b/ubuntu/ubuntu-14.04-i386.json index 91d63ab0a..432f165ff 100644 --- a/ubuntu/ubuntu-14.04-i386.json +++ b/ubuntu/ubuntu-14.04-i386.json @@ -28,7 +28,6 @@ "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", - "guest_additions_url": "{{user `guest_additions_url`}}", "guest_os_type": "Ubuntu", "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", @@ -250,7 +249,6 @@ } ], "variables": { - "guest_additions_url": "", "box_basename": "ubuntu-14.04-i386", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", diff --git a/ubuntu/ubuntu-16.04-amd64.json b/ubuntu/ubuntu-16.04-amd64.json index c9857761a..8a587b421 100644 --- a/ubuntu/ubuntu-16.04-amd64.json +++ b/ubuntu/ubuntu-16.04-amd64.json @@ -30,7 +30,6 @@ "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", - "guest_additions_url": "{{user `guest_additions_url`}}", "guest_os_type": "Ubuntu_64", "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", @@ -295,7 +294,6 @@ } ], "variables": { - "guest_additions_url": "", "box_basename": "ubuntu-16.04", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", diff --git a/ubuntu/ubuntu-16.04-i386.json b/ubuntu/ubuntu-16.04-i386.json index ea2328f03..907d79f4e 100644 --- a/ubuntu/ubuntu-16.04-i386.json +++ b/ubuntu/ubuntu-16.04-i386.json @@ -30,7 +30,6 @@ "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", - "guest_additions_url": "{{user `guest_additions_url`}}", "guest_os_type": "Ubuntu", "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", @@ -258,7 +257,6 @@ } ], "variables": { - "guest_additions_url": "", "box_basename": "ubuntu-16.04-i386", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", diff --git a/ubuntu/ubuntu-17.04-amd64.json b/ubuntu/ubuntu-17.04-amd64.json index 68f56ea42..8724f041f 100644 --- a/ubuntu/ubuntu-17.04-amd64.json +++ b/ubuntu/ubuntu-17.04-amd64.json @@ -29,7 +29,6 @@ "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", - "guest_additions_url": "{{user `guest_additions_url`}}", "guest_os_type": "Ubuntu_64", "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", @@ -291,7 +290,6 @@ } ], "variables": { - "guest_additions_url": "", "box_basename": "ubuntu-17.04", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", diff --git a/ubuntu/ubuntu-17.04-i386.json b/ubuntu/ubuntu-17.04-i386.json index a588903ae..bddb90c77 100644 --- a/ubuntu/ubuntu-17.04-i386.json +++ b/ubuntu/ubuntu-17.04-i386.json @@ -29,7 +29,6 @@ "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", - "guest_additions_url": "{{user `guest_additions_url`}}", "guest_os_type": "Ubuntu", "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", @@ -255,7 +254,6 @@ } ], "variables": { - "guest_additions_url": "", "box_basename": "ubuntu-17.04-i386", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", diff --git a/ubuntu/ubuntu-17.10-amd64.json b/ubuntu/ubuntu-17.10-amd64.json index 7101a1d47..76d7cfcab 100644 --- a/ubuntu/ubuntu-17.10-amd64.json +++ b/ubuntu/ubuntu-17.10-amd64.json @@ -29,7 +29,6 @@ "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", - "guest_additions_url": "{{user `guest_additions_url`}}", "guest_os_type": "Ubuntu_64", "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", @@ -291,7 +290,6 @@ } ], "variables": { - "guest_additions_url": "", "box_basename": "ubuntu-17.10", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", diff --git a/ubuntu/ubuntu-17.10-i386.json b/ubuntu/ubuntu-17.10-i386.json index d6b67912a..fc30d50ad 100644 --- a/ubuntu/ubuntu-17.10-i386.json +++ b/ubuntu/ubuntu-17.10-i386.json @@ -29,7 +29,6 @@ "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", - "guest_additions_url": "{{user `guest_additions_url`}}", "guest_os_type": "Ubuntu", "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", @@ -255,7 +254,6 @@ } ], "variables": { - "guest_additions_url": "", "box_basename": "ubuntu-17.10-i386", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", diff --git a/windows/windows-nano-tp3.json b/windows/windows-nano-tp3.json index ed90b2bb3..d6ced88c5 100644 --- a/windows/windows-nano-tp3.json +++ b/windows/windows-nano-tp3.json @@ -11,7 +11,6 @@ "scripts/postunattend.xml" ], "guest_additions_mode": "disable", - "guest_additions_url": "{{user `guest_additions_url`}}", "guest_os_type": "Windows2012_64", "headless": "{{ user `headless` }}", "iso_checksum": "{{ user `iso_checksum` }}", @@ -68,7 +67,6 @@ } ], "variables": { - "guest_additions_url": "", "box_basename": "windows-nano", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "2", From 1d267ee4c351a2d258be06bb931223ae9d9e0686 Mon Sep 17 00:00:00 2001 From: Seth Thomas <sthomas@chef.io> Date: Fri, 5 Jan 2018 11:20:39 -0500 Subject: [PATCH 0746/1622] Release 201801.02.0 Signed-off-by: Seth Thomas <sthomas@chef.io> --- CHANGELOG.md | 47 ++++++++++++++++++++++++++++++++++++++++++++ Rakefile | 48 ++++++++++++++++----------------------------- builds.yml | 55 +++++++++++++++++++++++----------------------------- 3 files changed, 88 insertions(+), 62 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 70d2a0ff9..39637a976 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,52 @@ # Change Log +## [201801.02.0](https://github.com/chef/bento/tree/201801.02.0) (2018-01-02) + +**New Platforms** +- Debian 9.3 +- Debian 8.10 +- Fedora 27 + +**Hyper-V Boxes (experimental) +- centos-7.4 +- centos-6.9 +- ubuntu-17.10 +- ubuntu-17.04 +- ubuntu-16.04 +- ubuntu-14.04 + +**Tooling** +- VirtualBox 5.2.4 +- VMware Fusion 10.1.0 +- Parallels 13.2.0 +- Hyper-V 10.0.16299.15 +- Packer 1.1.3 +- Vagrant 2.0.1 + +## [201710.31.0](https://github.com/chef/bento/tree/201710.31.0) (2017-10-31) + +**New Platforms** +- Ubuntu 17.10 +- Debian 9.2 +- Debian 8.10 +- FreeBSD 10.4 +- CentOS 7.4 + +**Tooling** +- VirtualBox 5.1.30 +- VMware Fusion 10.0.1 +- Parallels 13.1.1 +- Packer 1.1.1 +- Vagrant 2.0.0 + +**Fixes/Updates** +- SLES fixes +- 1GB of RAM as default for boxen +- re-organized into platform folders +- hyper-V fixes +- qemu fixes + + ## [201708.22.0](https://github.com/chef/bento/tree/201708.22.0) (2017-08-22) **New** diff --git a/Rakefile b/Rakefile index f7592d31c..20295f288 100644 --- a/Rakefile +++ b/Rakefile @@ -1,23 +1,24 @@ require "yaml" +require "fileutils" desc "clean, build, test, upload" task :do_all do check_env - templates.each do |template| - Rake::Task["clean"].invoke - Rake::Task["clean"].reenable - sh build_cmd(template) - sh "bento test" - unless ENV["BENTO_AUTO_RELEASE"].nil? - sh "bento upload" - sh "bento release #{template} #{ENV["BENTO_VERSION"]}" + public_templates.each do |template| + if config['public'].include?(box_name(template)) + sh build_cmd(template) + sh "bento test" + unless ENV["BENTO_AUTO_RELEASE"].nil? + sh "bento upload" + sh "bento release #{template} #{ENV["BENTO_VERSION"]}" + end end end end desc "clean" task :clean do - sh "rm -rf builds/* .kitchen.yml" + FileUtils.rm_rf(['.kitchen.yml', Dir.glob('builds/*')]) end def build_cmd(template) @@ -58,27 +59,12 @@ def clean_array(*args) args.flatten.reject { |i| i.nil? || i == "" }.map(&:to_s) end -# create sorted list of builds matched against available templates -# ignoring known private images and working dir -# TODO: move this logic to bento-ya -def templates - ts = Dir.glob('**/*.json').reject{ |f| f['builds'] } - ts.reject{ |f| f[/macos|rhel|sles|solaris|windows/] } +def box_name(template) + bn = template.split('/')[1].gsub!(/\.json/,'') + bn.match(/-x86_64|-amd64/) ? bn.gsub(/-x86_64|-amd64/,'') : bn +end - b32 = [] - b64 = [] - config['public'].each do |p, vs| - vs.each do |v, as| - as.each do |a| - case a - when "i386", "i686" - b32 << ts.select{ |i| i[/#{p}-#{v}-#{a}/] } - else - b64 << ts.select{ |i| i[/#{p}-#{v}-#{a}/] } - end - end - end - end - list = b64 + b32 - list.flatten +def public_templates + templates = Dir.glob('**/*.json').reject{ |d| d['builds'] } + templates.reject{ |f| f[/macos|rhel|sles|solaris|windows/] } end diff --git a/builds.yml b/builds.yml index 79324db98..61f3268c3 100644 --- a/builds.yml +++ b/builds.yml @@ -5,37 +5,30 @@ providers: - vmware-iso public: - centos: - - '7.4' - - '6.9' - - '6.9-i386' - oracle: - - '7.3' - - '6.9' - - '6.9-i386' - ubuntu: - - '17.10' - - '17.10-i386' - - '17.04' - - '17.04-i386' - - '16.04' - - '16.04-i386' - - '14.04' - - '14.04-i386' - debian: - - '9.3' - - '8.10' - - '8.10-i386' - - '7.11' - - '7.11-i386' - fedora: - - '27' - - '26' - opensuse-leap: - - '42.3' - freebsd: - - '11.1' - - '10.4' +- 'centos-7.4' +- 'centos-6.9' +- 'centos-6.9-i386' +- 'oracle-7.3' +- 'oracle-6.9' +- 'oracle-6.9-i386' +- 'ubuntu-17.10' +- 'ubuntu-17.10-i386' +- 'ubuntu-17.04' +- 'ubuntu-17.04-i386' +- 'ubuntu-16.04' +- 'ubuntu-16.04-i386' +- 'ubuntu-14.04' +- 'ubuntu-14.04-i386' +- 'debian-9.3' +- 'debian-8.10' +- 'debian-8.10-i386' +- 'debian-7.11' +- 'debian-7.11-i386' +- 'fedora-27' +- 'fedora-26' +- 'opensuse-leap-42.3' +- 'freebsd-11.1' +- 'freebsd-10.4' slugs: 'centos-7': 'centos-7.4' From 092351b7d1078a5fee67f10efe34a5e3ffb65212 Mon Sep 17 00:00:00 2001 From: Seth Thomas <cheeseplus@chef.io> Date: Fri, 5 Jan 2018 12:38:52 -0500 Subject: [PATCH 0747/1622] Minor formatting fix --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 39637a976..5f06dcc39 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,7 +7,7 @@ - Debian 8.10 - Fedora 27 -**Hyper-V Boxes (experimental) +**Hyper-V Boxes (experimental)** - centos-7.4 - centos-6.9 - ubuntu-17.10 From 4e0faca993ce95daaf1821655ec108695973ce7d Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith@chef.io> Date: Fri, 5 Jan 2018 12:41:11 -0800 Subject: [PATCH 0748/1622] Update Oracle 7 to 7.4 Signed-off-by: Tim Smith <tsmith@chef.io> --- builds.yml | 2 +- ...oracle-7.3-x86_64.json => oracle-7.4-x86_64.json} | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) rename oraclelinux/{oracle-7.3-x86_64.json => oracle-7.4-x86_64.json} (95%) diff --git a/builds.yml b/builds.yml index 61f3268c3..6a396ee55 100644 --- a/builds.yml +++ b/builds.yml @@ -8,7 +8,7 @@ public: - 'centos-7.4' - 'centos-6.9' - 'centos-6.9-i386' -- 'oracle-7.3' +- 'oracle-7.4' - 'oracle-6.9' - 'oracle-6.9-i386' - 'ubuntu-17.10' diff --git a/oraclelinux/oracle-7.3-x86_64.json b/oraclelinux/oracle-7.4-x86_64.json similarity index 95% rename from oraclelinux/oracle-7.3-x86_64.json rename to oraclelinux/oracle-7.4-x86_64.json index ea69f94c4..4911cd4e8 100644 --- a/oraclelinux/oracle-7.3-x86_64.json +++ b/oraclelinux/oracle-7.4-x86_64.json @@ -155,7 +155,7 @@ ], "variables": { "arch": "64", - "box_basename": "oracle-7.3", + "box_basename": "oracle-7.4", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", "disk_size": "65536", @@ -163,16 +163,16 @@ "headless": "", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", - "iso_checksum": "2ad5327428c44d505a7d882a273cb3f5fbac4e56e739cf18f895565dde987101", + "iso_checksum": "f2e11a2fceba8e285490c8df7c2172336cc23eb4bab95924b98d1029dce7eb0b", "iso_checksum_type": "sha256", - "iso_name": "OracleLinux-R7-U3-Server-x86_64-dvd.iso", + "iso_name": "OracleLinux-R7-U4-Server-x86_64-dvd.iso", "ks_path": "7/ks.cfg", "memory": "1024", "mirror": "http://mirrors.dotsrc.org/oracle-linux", - "mirror_directory": "OL7/u3/x86_64", - "name": "oracle-7.3", + "mirror_directory": "OL7/u4/x86_64", + "name": "oracle-7.4", "no_proxy": "{{env `no_proxy`}}", - "template": "oracle-7.3-x86_64", + "template": "oracle-7.4-x86_64", "version": "TIMESTAMP" } } From ae74191f5ad58f29edf72ebf8c011a8edb921313 Mon Sep 17 00:00:00 2001 From: Seth Thomas <sthomas@chef.io> Date: Sat, 6 Jan 2018 10:55:23 -0500 Subject: [PATCH 0749/1622] Release 201801.05.0 Signed-off-by: Seth Thomas <sthomas@chef.io> --- CHANGELOG.md | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5f06dcc39..777ebe5dc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,16 @@ # Change Log +## [201801.05.0](https://github.com/chef/bento/tree/201801.05.0) (2018-01-05) + +**New Platforms** +- Oracle Linux 7.4 + +**Tooling** +- VirtualBox 5.2.4 +- Parallels 13.2.0 +- Packer 1.1.3 +- Vagrant 2.0.1 + ## [201801.02.0](https://github.com/chef/bento/tree/201801.02.0) (2018-01-02) **New Platforms** From 31b08a4499f4ebce5d01c9c76fb72ed4057ab730 Mon Sep 17 00:00:00 2001 From: Mikhail Zholobov <legal90@gmail.com> Date: Wed, 17 Jan 2018 16:24:21 +0100 Subject: [PATCH 0750/1622] Enable autologin for vagrant user on macOS Scripts are taken from the project https://github.com/boxcutter/macos Having "autologin" set to "true" (the default behaviour), we will get the "vagrant" user's GUI session started automatically on the VM boot. --- macos/macos-10.12.json | 8 ++++++ macos/macosx-10.10.json | 8 ++++++ macos/macosx-10.11.json | 8 ++++++ macos/macosx-10.9.json | 8 ++++++ macos/scripts/autologin.sh | 12 +++++++++ macos/scripts/support/set_kcpassword.py | 36 +++++++++++++++++++++++++ 6 files changed, 80 insertions(+) create mode 100644 macos/scripts/autologin.sh create mode 100644 macos/scripts/support/set_kcpassword.py diff --git a/macos/macos-10.12.json b/macos/macos-10.12.json index ed697aae8..ead66f553 100644 --- a/macos/macos-10.12.json +++ b/macos/macos-10.12.json @@ -200,9 +200,15 @@ } ], "provisioners": [ + { + "destination": "/private/tmp/set_kcpassword.py", + "source": "scripts/support/set_kcpassword.py", + "type": "file" + }, { "environment_vars": [ "HOME_DIR=/Users/vagrant", + "AUTOLOGIN={{user `autologin`}}", "http_proxy={{user `http_proxy`}}", "https_proxy={{user `https_proxy`}}", "no_proxy={{user `no_proxy`}}" @@ -215,6 +221,7 @@ "scripts/networking.sh", "scripts/disablesleep.sh", "scripts/vagrant.sh", + "scripts/autologin.sh", "scripts/vmtools.sh", "scripts/cleanup.sh", "scripts/minimize.sh" @@ -224,6 +231,7 @@ ], "variables": { "_README": "You must provide a prepared Mac disk image (from https://github.com/timsutton/osx-vm-templates) and checksum value for this template to work. For more details, consult this project's README.md", + "autologin": "true", "box_basename": "macos-10.12", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", diff --git a/macos/macosx-10.10.json b/macos/macosx-10.10.json index 694752402..b56c0b2e4 100644 --- a/macos/macosx-10.10.json +++ b/macos/macosx-10.10.json @@ -200,9 +200,15 @@ } ], "provisioners": [ + { + "destination": "/private/tmp/set_kcpassword.py", + "source": "scripts/support/set_kcpassword.py", + "type": "file" + }, { "environment_vars": [ "HOME_DIR=/Users/vagrant", + "AUTOLOGIN={{user `autologin`}}", "http_proxy={{user `http_proxy`}}", "https_proxy={{user `https_proxy`}}", "no_proxy={{user `no_proxy`}}" @@ -215,6 +221,7 @@ "scripts/networking.sh", "scripts/disablesleep.sh", "scripts/vagrant.sh", + "scripts/autologin.sh", "scripts/vmtools.sh", "scripts/cleanup.sh", "scripts/minimize.sh" @@ -224,6 +231,7 @@ ], "variables": { "_README": "You must provide a prepared Mac disk image (from https://github.com/timsutton/osx-vm-templates) and checksum value for this template to work. For more details, consult this project's README.md", + "autologin": "true", "box_basename": "macosx-10.10", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", diff --git a/macos/macosx-10.11.json b/macos/macosx-10.11.json index fc0ed42d9..c3b47724c 100644 --- a/macos/macosx-10.11.json +++ b/macos/macosx-10.11.json @@ -200,9 +200,15 @@ } ], "provisioners": [ + { + "destination": "/private/tmp/set_kcpassword.py", + "source": "scripts/support/set_kcpassword.py", + "type": "file" + }, { "environment_vars": [ "HOME_DIR=/Users/vagrant", + "AUTOLOGIN={{user `autologin`}}", "http_proxy={{user `http_proxy`}}", "https_proxy={{user `https_proxy`}}", "no_proxy={{user `no_proxy`}}" @@ -215,6 +221,7 @@ "scripts/networking.sh", "scripts/disablesleep.sh", "scripts/vagrant.sh", + "scripts/autologin.sh", "scripts/vmtools.sh", "scripts/cleanup.sh", "scripts/minimize.sh" @@ -224,6 +231,7 @@ ], "variables": { "_README": "You must provide a prepared Mac disk image (from https://github.com/timsutton/osx-vm-templates) and checksum value for this template to work. For more details, consult this project's README.md", + "autologin": "true", "box_basename": "macosx-10.11", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", diff --git a/macos/macosx-10.9.json b/macos/macosx-10.9.json index 4a345e3dd..5c2c0c6e2 100644 --- a/macos/macosx-10.9.json +++ b/macos/macosx-10.9.json @@ -200,9 +200,15 @@ } ], "provisioners": [ + { + "destination": "/private/tmp/set_kcpassword.py", + "source": "scripts/support/set_kcpassword.py", + "type": "file" + }, { "environment_vars": [ "HOME_DIR=/Users/vagrant", + "AUTOLOGIN={{user `autologin`}}", "http_proxy={{user `http_proxy`}}", "https_proxy={{user `https_proxy`}}", "no_proxy={{user `no_proxy`}}" @@ -215,6 +221,7 @@ "scripts/networking.sh", "scripts/disablesleep.sh", "scripts/vagrant.sh", + "scripts/autologin.sh", "scripts/vmtools.sh", "scripts/cleanup.sh", "scripts/minimize.sh" @@ -224,6 +231,7 @@ ], "variables": { "_README": "You must provide a prepared Mac disk image (from https://github.com/timsutton/osx-vm-templates) and checksum value for this template to work. For more details, consult this project's README.md", + "autologin": "true", "box_basename": "macosx-10.9", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", diff --git a/macos/scripts/autologin.sh b/macos/scripts/autologin.sh new file mode 100644 index 000000000..f1ff1a102 --- /dev/null +++ b/macos/scripts/autologin.sh @@ -0,0 +1,12 @@ +#!/bin/sh -eux + +if [ "$AUTOLOGIN" != "true" ] && [ "$AUTOLOGIN" != "1" ] ; then + exit +fi + +# Generate /etc/kcpassword. It contains an encrypted password and allows to run +# the next command without a password prompt. +python /private/tmp/set_kcpassword.py "vagrant" + +# Enable the autologin for the 'vagrant' user +/usr/bin/defaults write /Library/Preferences/com.apple.loginwindow autoLoginUser "vagrant" diff --git a/macos/scripts/support/set_kcpassword.py b/macos/scripts/support/set_kcpassword.py new file mode 100644 index 000000000..efa077e97 --- /dev/null +++ b/macos/scripts/support/set_kcpassword.py @@ -0,0 +1,36 @@ +#!/usr/bin/env python + +# Port of Gavin Brock's Perl kcpassword generator to Python, by Tom Taylor +# <tom@tomtaylor.co.uk>. +# Perl version: http://www.brock-family.org/gavin/perl/kcpassword.html + +import sys +import os + +def kcpassword(passwd): + # The magic 11 bytes - these are just repeated + # 0x7D 0x89 0x52 0x23 0xD2 0xBC 0xDD 0xEA 0xA3 0xB9 0x1F + key = [125,137,82,35,210,188,221,234,163,185,31] + key_len = len(key) + + passwd = [ord(x) for x in list(passwd)] + # pad passwd length out to an even multiple of key length + r = len(passwd) % key_len + if (r > 0): + passwd = passwd + [0] * (key_len - r) + + for n in range(0, len(passwd), len(key)): + ki = 0 + for j in range(n, min(n+len(key), len(passwd))): + passwd[j] = passwd[j] ^ key[ki] + ki += 1 + + passwd = [chr(x) for x in passwd] + return "".join(passwd) + +if __name__ == "__main__": + passwd = kcpassword(sys.argv[1]) + fd = os.open('/etc/kcpassword', os.O_WRONLY | os.O_CREAT, 0o600) + file = os.fdopen(fd, 'w') + file.write(passwd) + file.close() From 52a83bd084d39c71575330e87f77175e5c46f972 Mon Sep 17 00:00:00 2001 From: Seth Thomas <sthomas@chef.io> Date: Tue, 23 Jan 2018 15:06:47 -0500 Subject: [PATCH 0751/1622] So long Nano Signed-off-by: Seth Thomas <sthomas@chef.io> --- windows/scripts/Autounattend.xml | 158 ------------------ windows/scripts/SetupComplete.cmd | 7 - windows/scripts/nano_cleanup.ps1 | 37 ---- windows/scripts/nano_create.ps1 | 39 ----- windows/scripts/postunattend.xml | 49 ------ windows/vagrantfile_templates/windows-nano.rb | 18 -- windows/windows-nano-tp3.json | 84 ---------- 7 files changed, 392 deletions(-) delete mode 100644 windows/scripts/Autounattend.xml delete mode 100644 windows/scripts/SetupComplete.cmd delete mode 100644 windows/scripts/nano_cleanup.ps1 delete mode 100644 windows/scripts/nano_create.ps1 delete mode 100644 windows/scripts/postunattend.xml delete mode 100644 windows/vagrantfile_templates/windows-nano.rb delete mode 100644 windows/windows-nano-tp3.json diff --git a/windows/scripts/Autounattend.xml b/windows/scripts/Autounattend.xml deleted file mode 100644 index 044f1af44..000000000 --- a/windows/scripts/Autounattend.xml +++ /dev/null @@ -1,158 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<unattend xmlns="urn:schemas-microsoft-com:unattend"> - <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-International-Core-WinPE" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> - <SetupUILanguage> - <UILanguage>en-US</UILanguage> - </SetupUILanguage> - <InputLocale>en-US</InputLocale> - <SystemLocale>en-US</SystemLocale> - <UILanguage>en-US</UILanguage> - <UILanguageFallback>en-US</UILanguageFallback> - <UserLocale>en-US</UserLocale> - </component> - <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"> - <CreatePartitions> - <CreatePartition wcm:action="add"> - <Type>Primary</Type> - <Order>1</Order> - <Size>350</Size> - </CreatePartition> - <CreatePartition wcm:action="add"> - <Order>2</Order> - <Type>Primary</Type> - <Size>15360</Size> - </CreatePartition> - <CreatePartition wcm:action="add"> - <Order>3</Order> - <Type>Primary</Type> - <Extend>true</Extend> - </CreatePartition> - </CreatePartitions> - <ModifyPartitions> - <ModifyPartition wcm:action="add"> - <Active>true</Active> - <Format>NTFS</Format> - <Label>boot</Label> - <Order>1</Order> - <PartitionID>1</PartitionID> - </ModifyPartition> - <ModifyPartition wcm:action="add"> - <Format>NTFS</Format> - <Label>nano</Label> - <Letter>E</Letter> - <Order>2</Order> - <PartitionID>2</PartitionID> - </ModifyPartition> - <ModifyPartition wcm:action="add"> - <Format>NTFS</Format> - <Label>2016</Label> - <Letter>C</Letter> - <Order>3</Order> - <PartitionID>3</PartitionID> - </ModifyPartition> - </ModifyPartitions> - <DiskID>0</DiskID> - <WillWipeDisk>true</WillWipeDisk> - </Disk> - </DiskConfiguration> - <ImageInstall> - <OSImage> - <InstallFrom> - <MetaData wcm:action="add"> - <Key>/IMAGE/NAME </Key> - <Value>Windows Server 2012 R2 SERVERDATACENTERCORE</Value> - </MetaData> - </InstallFrom> - <InstallTo> - <DiskID>0</DiskID> - <PartitionID>3</PartitionID> - </InstallTo> - </OSImage> - </ImageInstall> - <UserData> - <ProductKey> - <WillShowUI>OnError</WillShowUI> - </ProductKey> - <AcceptEula>true</AcceptEula> - <FullName>Vagrant</FullName> - <Organization>Vagrant</Organization> - </UserData> - </component> - </settings> - <settings pass="generalize"> - <component name="Microsoft-Windows-Security-SPP" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - <SkipRearm>1</SkipRearm> - </component> - <component name="Microsoft-Windows-PnpSysprep" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - <PersistAllDeviceInstalls>false</PersistAllDeviceInstalls> - <DoNotCleanUpNonPresentDevices>false</DoNotCleanUpNonPresentDevices> - </component> - </settings> - <settings pass="oobeSystem"> - <component name="Microsoft-Windows-International-Core" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - <InputLocale>en-US</InputLocale> - <SystemLocale>en-US</SystemLocale> - <UILanguage>en-US</UILanguage> - <UserLocale>en-US</UserLocale> - </component> - <component name="Microsoft-Windows-Shell-Setup" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - <OOBE> - <HideEULAPage>true</HideEULAPage> - <HideLocalAccountScreen>true</HideLocalAccountScreen> - <HideOEMRegistrationScreen>true</HideOEMRegistrationScreen> - <HideOnlineAccountScreens>true</HideOnlineAccountScreens> - <HideWirelessSetupInOOBE>true</HideWirelessSetupInOOBE> - <NetworkLocation>Home</NetworkLocation> - <ProtectYourPC>1</ProtectYourPC> - </OOBE> - <TimeZone>UTC</TimeZone> - <UserAccounts> - <AdministratorPassword> - <Value>vagrant</Value> - <PlainText>true</PlainText> - </AdministratorPassword> - <LocalAccounts> - <LocalAccount wcm:action="add"> - <Password> - <Value>vagrant</Value> - <PlainText>true</PlainText> - </Password> - <Group>administrators</Group> - <DisplayName>Vagrant</DisplayName> - <Name>vagrant</Name> - <Description>Vagrant User</Description> - </LocalAccount> - </LocalAccounts> - </UserAccounts> - <AutoLogon> - <Password> - <Value>vagrant</Value> - <PlainText>true</PlainText> - </Password> - <Enabled>true</Enabled> - <Username>vagrant</Username> - </AutoLogon> - <FirstLogonCommands> - <SynchronousCommand wcm:action="add"> - <CommandLine>cmd.exe /c C:\Windows\System32\WindowsPowerShell\v1.0\powershell.exe -File a:\nano_create.ps1</CommandLine> - <Order>1</Order> - </SynchronousCommand> - </FirstLogonCommands> - </component> - </settings> - <settings pass="specialize"> - <component xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" name="Microsoft-Windows-ServerManager-SvrMgrNc" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> - <DoNotOpenServerManagerAtLogon>true</DoNotOpenServerManagerAtLogon> - </component> - <component xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" name="Microsoft-Windows-IE-ESC" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> - <IEHardenAdmin>false</IEHardenAdmin> - <IEHardenUser>false</IEHardenUser> - </component> - <component xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" name="Microsoft-Windows-OutOfBoxExperience" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> - <DoNotOpenInitialConfigurationTasksAtLogon>true</DoNotOpenInitialConfigurationTasksAtLogon> - </component> - </settings> -</unattend> diff --git a/windows/scripts/SetupComplete.cmd b/windows/scripts/SetupComplete.cmd deleted file mode 100644 index 1061ac3d2..000000000 --- a/windows/scripts/SetupComplete.cmd +++ /dev/null @@ -1,7 +0,0 @@ -REG ADD HKLM\Software\Microsoft\Windows\CurrentVersion\WSMAN\Service /v allow_unencrypted /t REG_DWORD /d 1 /f -REG ADD HKLM\Software\Microsoft\Windows\CurrentVersion\WSMAN\Service /v auth_basic /t REG_DWORD /d 1 /f -REG ADD HKLM\Software\Microsoft\Windows\CurrentVersion\WSMAN\Client /v auth_basic /t REG_DWORD /d 1 /f - -netsh advfirewall firewall set rule group="File and Printer Sharing" new enable=yes - -cmd.exe /c C:\Windows\System32\WindowsPowerShell\v1.0\powershell.exe -command . c:\windows\setup\scripts\nano_cleanup.ps1 > c:\windows\setup\scripts\cleanup.txt \ No newline at end of file diff --git a/windows/scripts/nano_cleanup.ps1 b/windows/scripts/nano_cleanup.ps1 deleted file mode 100644 index b8d976b25..000000000 --- a/windows/scripts/nano_cleanup.ps1 +++ /dev/null @@ -1,37 +0,0 @@ -Import-Module C:\windows\system32\windowspowershell\v1.0\Modules\Microsoft.PowerShell.Utility\Microsoft.PowerShell.Utility.psd1 -Import-Module C:\windows\system32\windowspowershell\v1.0\Modules\Microsoft.PowerShell.Management\Microsoft.PowerShell.Management.psd1 -Import-Module C:\windows\system32\windowspowershell\v1.0\Modules\Storage\Storage.psd1 - -$partition = Get-Partition -DriveLetter C -$c_size = $partition.size -$partition = Get-Partition -DriveLetter D -$d_size = $partition.size - -Remove-Partition -DriveLetter D -Confirm:$false -Resize-Partition -DriveLetter C -Size ($c_size + $d_size) - -Optimize-Volume -DriveLetter C - -$FilePath="c:\zero.tmp" -$Volume= Get-Volume -DriveLetter C -$ArraySize= 64kb -$SpaceToLeave= $Volume.Size * 0.05 -$FileSize= $Volume.SizeRemaining - $SpacetoLeave -$ZeroArray= new-object byte[]($ArraySize) - -$Stream= [io.File]::OpenWrite($FilePath) -try { - $CurFileSize = 0 - while($CurFileSize -lt $FileSize) { - $Stream.Write($ZeroArray,0, $ZeroArray.Length) - $CurFileSize +=$ZeroArray.Length - } -} finally { - if($Stream) { - $Stream.Close() - } -} - -Del $FilePath - -shutdown /s /t 0 \ No newline at end of file diff --git a/windows/scripts/nano_create.ps1 b/windows/scripts/nano_create.ps1 deleted file mode 100644 index 306ec3333..000000000 --- a/windows/scripts/nano_create.ps1 +++ /dev/null @@ -1,39 +0,0 @@ -start-transcript -path $env:temp\transcript0.txt -noclobber - -mkdir c:\NanoServer -cd c:\NanoServer -xcopy /s d:\NanoServer\*.* . -. .\new-nanoserverimage.ps1 -$adminPassword = ConvertTo-SecureString "Pass@word1" -AsPlainText -Force - -New-NanoServerImage ` - -MediaPath D:\ ` - -BasePath .\Base ` - -TargetPath .\Nano ` - -ComputerName Nano ` - -OEMDrivers ` - -ReverseForwarders ` - -AdministratorPassword $adminPassword - -Mount-DiskImage -ImagePath "c:\NanoServer\nano\Nano.vhd" - -Copy-Item ` - -Path "F:\*" ` - -Destination "E:\" ` - -Force ` - -Recurse ` - -Exclude "System Volume Information" ` - -ErrorAction SilentlyContinue - -mkdir E:\Windows\setup\scripts -copy-item a:\postunattend.xml E:\Windows\Panther\unattend.xml -Force -copy-item a:\SetupComplete.cmd E:\Windows\setup\scripts\SetupComplete.cmd -Force -copy-item a:\nano_cleanup.ps1 E:\Windows\setup\scripts\nano_cleanup.ps1 -Force - -bcdedit /set "{current}" device "partition=E:" -bcdedit /set "{current}" osdevice "partition=E:" -bcdedit /set "{current}" path \windows\system32\boot\winload.exe - -winrm set winrm/config/client/auth '@{Basic="true"}' -winrm set winrm/config/service/auth '@{Basic="true"}' -winrm set winrm/config/service '@{AllowUnencrypted="true"}' diff --git a/windows/scripts/postunattend.xml b/windows/scripts/postunattend.xml deleted file mode 100644 index e5189cc9d..000000000 --- a/windows/scripts/postunattend.xml +++ /dev/null @@ -1,49 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<unattend xmlns="urn:schemas-microsoft-com:unattend"> - <settings pass="generalize"> - <component name="Microsoft-Windows-Security-SPP" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - <SkipRearm>1</SkipRearm> - </component> - <component name="Microsoft-Windows-PnpSysprep" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - <PersistAllDeviceInstalls>false</PersistAllDeviceInstalls> - <DoNotCleanUpNonPresentDevices>false</DoNotCleanUpNonPresentDevices> - </component> - </settings> - <settings pass="oobeSystem"> - <component name="Microsoft-Windows-International-Core" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - <InputLocale>en-US</InputLocale> - <SystemLocale>en-US</SystemLocale> - <UILanguage>en-US</UILanguage> - <UserLocale>en-US</UserLocale> - </component> - <component name="Microsoft-Windows-Shell-Setup" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - <OOBE> - <HideEULAPage>true</HideEULAPage> - <ProtectYourPC>1</ProtectYourPC> - <NetworkLocation>Home</NetworkLocation> - <HideWirelessSetupInOOBE>true</HideWirelessSetupInOOBE> - </OOBE> - <TimeZone>UTC</TimeZone> - <UserAccounts> - <AdministratorPassword> - <Value>vagrant</Value> - <PlainText>true</PlainText> - </AdministratorPassword> - <LocalAccounts> - <LocalAccount wcm:action="add"> - <Password> - <Value>vagrant</Value> - <PlainText>true</PlainText> - </Password> - <Group>administrators</Group> - <DisplayName>Vagrant</DisplayName> - <Name>vagrant</Name> - <Description>Vagrant User</Description> - </LocalAccount> - </LocalAccounts> - </UserAccounts> - </component> - </settings> - <settings pass="specialize"> - </settings> -</unattend> diff --git a/windows/vagrantfile_templates/windows-nano.rb b/windows/vagrantfile_templates/windows-nano.rb deleted file mode 100644 index 18f270395..000000000 --- a/windows/vagrantfile_templates/windows-nano.rb +++ /dev/null @@ -1,18 +0,0 @@ -# -*- mode: ruby -*- -# vi: set ft=ruby : - -Vagrant.configure(2) do |config| - config.vm.guest = :windows - config.vm.communicator = "winrm" - config.vm.network "private_network", type: "dhcp" - - config.vm.provider "virtualbox" do |vb| - vb.customize ["modifyvm", :id, "--hardwareuuid", "02f110e7-369a-4bbc-bbe6-6f0b6864ccb6"] - vb.gui = true - vb.memory = "1024" - end - - config.vm.provider "hyperv" do |hv| - hv.ip_address_timeout = 240 - end -end diff --git a/windows/windows-nano-tp3.json b/windows/windows-nano-tp3.json deleted file mode 100644 index d6ced88c5..000000000 --- a/windows/windows-nano-tp3.json +++ /dev/null @@ -1,84 +0,0 @@ -{ - "builders": [ - { - "communicator": "winrm", - "disk_size": "{{user `disk_size`}}", - "floppy_files": [ - "scripts/Autounattend.xml", - "scripts/nano_create.ps1", - "scripts/nano_cleanup.ps1", - "scripts/SetupComplete.cmd", - "scripts/postunattend.xml" - ], - "guest_additions_mode": "disable", - "guest_os_type": "Windows2012_64", - "headless": "{{ user `headless` }}", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{ user `iso_url` }}", - "output_directory": "../builds/packer-{{user `template`}}-virtualbox", - "shutdown_command": "shutdown /r /t 10 /f /d p:4:1 /c \"Packer Shutdown\"", - "shutdown_timeout": "1h", - "type": "virtualbox-iso", - "vboxmanage": [ - [ - "modifyvm", - "{{.Name}}", - "--natpf1", - "guest_winrm,tcp,,55985,,5985" - ], - [ - "modifyvm", - "{{.Name}}", - "--memory", - "{{ user `memory` }}" - ], - [ - "modifyvm", - "{{.Name}}", - "--vram", - "36" - ], - [ - "modifyvm", - "{{.Name}}", - "--cpus", - "{{ user `cpus` }}" - ], - [ - "modifyvm", - "{{.Name}}", - "--hardwareuuid", - "02f110e7-369a-4bbc-bbe6-6f0b6864ccb6" - ] - ], - "virtualbox_version_file": ".vbox_version", - "vm_name": "{{ user `template` }}", - "winrm_password": "vagrant", - "winrm_timeout": "2h", - "winrm_username": "vagrant" - } - ], - "post-processors": [ - { - "output": "../builds/{{user `box_basename`}}.{{.Provider}}.box", - "type": "vagrant", - "vagrantfile_template": "vagrantfile_templates/windows-nano.rb" - } - ], - "variables": { - "box_basename": "windows-nano", - "build_timestamp": "{{isotime \"20060102150405\"}}", - "cpus": "2", - "disk_size": "61440", - "git_revision": "__unknown_git_revision__", - "headless": "", - "iso_checksum": "7003c2a4f9abe672c570ff018fbf3a27", - "iso_checksum_type": "md5", - "iso_url": "http://care.dlservice.microsoft.com/dl/download/7/3/C/73C250BE-67C4-440B-A69B-D0E8EE77F01C/10514.0.150808-1529.TH2_RELEASE_SERVER_OEMRET_X64FRE_EN-US.ISO", - "memory": "2048", - "template": "windows-nano-tp3", - "version": "TIMESTAMP" - } -} - From 8ea5c5782a0f97235982cdfb2d2670cb8d6fb81f Mon Sep 17 00:00:00 2001 From: Seth Thomas <sthomas@chef.io> Date: Tue, 23 Jan 2018 15:27:30 -0500 Subject: [PATCH 0752/1622] Using more reliable debian mirror Signed-off-by: Seth Thomas <sthomas@chef.io> --- debian/http/debian-7/preseed.cfg | 2 +- debian/http/debian-8/preseed.cfg | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/http/debian-7/preseed.cfg b/debian/http/debian-7/preseed.cfg index 3fa5f5bed..573d761b5 100644 --- a/debian/http/debian-7/preseed.cfg +++ b/debian/http/debian-7/preseed.cfg @@ -9,7 +9,7 @@ d-i grub-installer/with_other_os boolean true d-i keymap select us d-i mirror/country string manual d-i mirror/http/directory string /debian -d-i mirror/http/hostname string deb.debian.org +d-i mirror/http/hostname string httpredir.debian.org d-i mirror/http/proxy string d-i partman-auto-lvm/guided_size string max d-i partman-auto/choose_recipe select atomic diff --git a/debian/http/debian-8/preseed.cfg b/debian/http/debian-8/preseed.cfg index d196e6b5c..78b1c7ba2 100644 --- a/debian/http/debian-8/preseed.cfg +++ b/debian/http/debian-8/preseed.cfg @@ -9,7 +9,7 @@ d-i grub-installer/with_other_os boolean true d-i keymap select us d-i mirror/country string manual d-i mirror/http/directory string /debian -d-i mirror/http/hostname string deb.debian.org +d-i mirror/http/hostname string httpredir.debian.org d-i mirror/http/proxy string d-i partman-auto-lvm/guided_size string max d-i partman-auto/choose_recipe select atomic From 39cd7600c4c0411d97e3756bcc3c9e012fc72768 Mon Sep 17 00:00:00 2001 From: Seth Thomas <sthomas@chef.io> Date: Tue, 23 Jan 2018 19:28:01 -0500 Subject: [PATCH 0753/1622] Bye 17.04 Signed-off-by: Seth Thomas <sthomas@chef.io> --- builds.yml | 3 +- ubuntu/ubuntu-17.04-amd64.json | 315 --------------------------------- ubuntu/ubuntu-17.04-i386.json | 277 ----------------------------- 3 files changed, 1 insertion(+), 594 deletions(-) delete mode 100644 ubuntu/ubuntu-17.04-amd64.json delete mode 100644 ubuntu/ubuntu-17.04-i386.json diff --git a/builds.yml b/builds.yml index 6a396ee55..bbc6b3f77 100644 --- a/builds.yml +++ b/builds.yml @@ -13,13 +13,12 @@ public: - 'oracle-6.9-i386' - 'ubuntu-17.10' - 'ubuntu-17.10-i386' -- 'ubuntu-17.04' -- 'ubuntu-17.04-i386' - 'ubuntu-16.04' - 'ubuntu-16.04-i386' - 'ubuntu-14.04' - 'ubuntu-14.04-i386' - 'debian-9.3' +- 'debian-9.3-i386' - 'debian-8.10' - 'debian-8.10-i386' - 'debian-7.11' diff --git a/ubuntu/ubuntu-17.04-amd64.json b/ubuntu/ubuntu-17.04-amd64.json deleted file mode 100644 index 8724f041f..000000000 --- a/ubuntu/ubuntu-17.04-amd64.json +++ /dev/null @@ -1,315 +0,0 @@ -{ - "builders": [ - { - "boot_command": [ - "<esc><wait>", - "<esc><wait>", - "<enter><wait>", - "/install/vmlinuz<wait>", - " auto<wait>", - " console-setup/ask_detect=false<wait>", - " console-setup/layoutcode=us<wait>", - " console-setup/modelcode=pc105<wait>", - " debconf/frontend=noninteractive<wait>", - " debian-installer=en_US<wait>", - " fb=false<wait>", - " initrd=/install/initrd.gz<wait>", - " kbd-chooser/method=us<wait>", - " keyboard-configuration/layout=USA<wait>", - " keyboard-configuration/variant=USA<wait>", - " locale=en_US<wait>", - " netcfg/get_domain=vm<wait>", - " netcfg/get_hostname=vagrant<wait>", - " grub-installer/bootdev=/dev/sda<wait>", - " noapic<wait>", - " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}}<wait>", - " -- <wait>", - "<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", - "guest_os_type": "Ubuntu_64", - "hard_drive_interface": "sata", - "headless": "{{ user `headless` }}", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../builds/packer-{{user `template`}}-virtualbox", - "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "virtualbox-iso", - "vboxmanage": [ - [ - "modifyvm", - "{{.Name}}", - "--memory", - "{{ user `memory` }}" - ], - [ - "modifyvm", - "{{.Name}}", - "--cpus", - "{{ user `cpus` }}" - ] - ], - "virtualbox_version_file": ".vbox_version", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<esc><wait>", - "<esc><wait>", - "<enter><wait>", - "/install/vmlinuz<wait>", - " auto<wait>", - " console-setup/ask_detect=false<wait>", - " console-setup/layoutcode=us<wait>", - " console-setup/modelcode=pc105<wait>", - " debconf/frontend=noninteractive<wait>", - " debian-installer=en_US<wait>", - " fb=false<wait>", - " initrd=/install/initrd.gz<wait>", - " kbd-chooser/method=us<wait>", - " keyboard-configuration/layout=USA<wait>", - " keyboard-configuration/variant=USA<wait>", - " locale=en_US<wait>", - " netcfg/get_domain=vm<wait>", - " netcfg/get_hostname=vagrant<wait>", - " grub-installer/bootdev=/dev/sda<wait>", - " noapic<wait>", - " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}}<wait>", - " -- <wait>", - "<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "ubuntu-64", - "headless": "{{ user `headless` }}", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../builds/packer-{{user `template`}}-vmware", - "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "tools_upload_flavor": "linux", - "type": "vmware-iso", - "vm_name": "{{ user `template` }}", - "vmx_data": { - "cpuid.coresPerSocket": "1", - "ethernet0.pciSlotNumber": "32", - "memsize": "{{ user `memory` }}", - "numvcpus": "{{ user `cpus` }}" - }, - "vmx_remove_ethernet_interfaces": true - }, - { - "boot_command": [ - "<esc><wait>", - "<esc><wait>", - "<enter><wait>", - "/install/vmlinuz<wait>", - " auto<wait>", - " console-setup/ask_detect=false<wait>", - " console-setup/layoutcode=us<wait>", - " console-setup/modelcode=pc105<wait>", - " debconf/frontend=noninteractive<wait>", - " debian-installer=en_US<wait>", - " fb=false<wait>", - " initrd=/install/initrd.gz<wait>", - " kbd-chooser/method=us<wait>", - " keyboard-configuration/layout=USA<wait>", - " keyboard-configuration/variant=USA<wait>", - " locale=en_US<wait>", - " netcfg/get_domain=vm<wait>", - " netcfg/get_hostname=vagrant<wait>", - " grub-installer/bootdev=/dev/sda<wait>", - " noapic<wait>", - " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}}<wait>", - " -- <wait>", - "<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "ubuntu", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../builds/packer-{{user `template`}}-parallels", - "parallels_tools_flavor": "lin", - "prlctl": [ - [ - "set", - "{{.Name}}", - "--memsize", - "{{ user `memory` }}" - ], - [ - "set", - "{{.Name}}", - "--cpus", - "{{ user `cpus` }}" - ] - ], - "prlctl_version_file": ".prlctl_version", - "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "parallels-iso", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<esc><wait>", - "<esc><wait>", - "<enter><wait>", - "/install/vmlinuz<wait>", - " auto<wait>", - " console-setup/ask_detect=false<wait>", - " console-setup/layoutcode=us<wait>", - " console-setup/modelcode=pc105<wait>", - " debconf/frontend=noninteractive<wait>", - " debian-installer=en_US<wait>", - " fb=false<wait>", - " initrd=/install/initrd.gz<wait>", - " kbd-chooser/method=us<wait>", - " keyboard-configuration/layout=USA<wait>", - " keyboard-configuration/variant=USA<wait>", - " locale=en_US<wait>", - " netcfg/get_domain=vm<wait>", - " netcfg/get_hostname=vagrant<wait>", - " grub-installer/bootdev=/dev/vda<wait>", - " noapic<wait>", - " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}}<wait>", - " -- <wait>", - "<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "headless": "{{ user `headless` }}", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../builds/packer-{{user `template`}}-qemu", - "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "qemu", - "vm_name": "{{ user `template` }}", - "qemuargs": [ - [ - "-m", - "{{ user `memory` }}M" - ], - [ - "-smp", - "{{ user `cpus` }}" - ] - ] - }, - { - "boot_command": [ - "<esc><wait10><esc><esc><enter><wait>", - "set gfxpayload=1024x768<enter>", - "linux /install/vmlinuz ", - "preseed/url=http://{{.HTTPIP}}:{{.HTTPPort}}/preseed-hyperv.cfg ", - "debian-installer=en_US auto locale=en_US kbd-chooser/method=us ", - "hostname={{.Name}} ", - "fb=false debconf/frontend=noninteractive ", - "keyboard-configuration/modelcode=SKIP keyboard-configuration/layout=USA ", - "keyboard-configuration/variant=USA console-setup/ask_detect=false <enter>", - "initrd /install/initrd.gz<enter>", - "boot<enter>" - ], - "boot_wait": "10s", - "communicator": "ssh", - "cpu": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "enable_secure_boot": false, - "generation": "{{user `hyperv_generation`}}", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../builds/packer-{{user `template`}}-hyperv", - "ram_size": "{{user `memory`}}", - "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "switch_name": "{{user `hyperv_switch`}}", - "type": "hyperv-iso", - "vm_name": "{{ user `template` }}" - } - ], - "post-processors": [ - { - "output": "../builds/{{user `box_basename`}}.{{.Provider}}.box", - "type": "vagrant" - } - ], - "provisioners": [ - { - "environment_vars": [ - "HOME_DIR=/home/vagrant", - "http_proxy={{user `http_proxy`}}", - "https_proxy={{user `https_proxy`}}", - "no_proxy={{user `no_proxy`}}" - ], - "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", - "expect_disconnect": true, - "scripts": [ - "scripts/update.sh", - "../_common/sshd.sh", - "scripts/networking.sh", - "scripts/sudoers.sh", - "scripts/vagrant.sh", - "../_common/virtualbox.sh", - "scripts/vmware.sh", - "../_common/parallels.sh", - "scripts/hyperv.sh", - "scripts/cleanup.sh", - "../_common/minimize.sh" - ], - "type": "shell" - } - ], - "variables": { - "box_basename": "ubuntu-17.04", - "build_timestamp": "{{isotime \"20060102150405\"}}", - "cpus": "1", - "disk_size": "65536", - "git_revision": "__unknown_git_revision__", - "headless": "", - "http_proxy": "{{env `http_proxy`}}", - "https_proxy": "{{env `https_proxy`}}", - "hyperv_generation": "2", - "hyperv_switch": "{{env `hyperv_switch`}}", - "iso_checksum": "ca5d9a8438e2434b9a3ac2be67b5c5fa2c1f8e3e40b954519462935195464034", - "iso_checksum_type": "sha256", - "iso_name": "ubuntu-17.04-server-amd64.iso", - "memory": "1024", - "mirror": "http://releases.ubuntu.com", - "mirror_directory": "17.04", - "name": "ubuntu-17.04", - "no_proxy": "{{env `no_proxy`}}", - "preseed_path": "preseed.cfg", - "template": "ubuntu-17.04-amd64", - "version": "TIMESTAMP" - } -} diff --git a/ubuntu/ubuntu-17.04-i386.json b/ubuntu/ubuntu-17.04-i386.json deleted file mode 100644 index bddb90c77..000000000 --- a/ubuntu/ubuntu-17.04-i386.json +++ /dev/null @@ -1,277 +0,0 @@ -{ - "builders": [ - { - "boot_command": [ - "<esc><wait>", - "<esc><wait>", - "<enter><wait>", - "/install/vmlinuz<wait>", - " auto<wait>", - " console-setup/ask_detect=false<wait>", - " console-setup/layoutcode=us<wait>", - " console-setup/modelcode=pc105<wait>", - " debconf/frontend=noninteractive<wait>", - " debian-installer=en_US<wait>", - " fb=false<wait>", - " initrd=/install/initrd.gz<wait>", - " kbd-chooser/method=us<wait>", - " keyboard-configuration/layout=USA<wait>", - " keyboard-configuration/variant=USA<wait>", - " locale=en_US<wait>", - " netcfg/get_domain=vm<wait>", - " netcfg/get_hostname=vagrant<wait>", - " grub-installer/bootdev=/dev/sda <wait>", - " noapic<wait>", - " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}}<wait>", - " -- <wait>", - "<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", - "guest_os_type": "Ubuntu", - "hard_drive_interface": "sata", - "headless": "{{ user `headless` }}", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../builds/packer-{{user `template`}}-virtualbox", - "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "virtualbox-iso", - "vboxmanage": [ - [ - "modifyvm", - "{{.Name}}", - "--memory", - "{{ user `memory` }}" - ], - [ - "modifyvm", - "{{.Name}}", - "--cpus", - "{{ user `cpus` }}" - ] - ], - "virtualbox_version_file": ".vbox_version", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<esc><wait>", - "<esc><wait>", - "<enter><wait>", - "/install/vmlinuz<wait>", - " auto<wait>", - " console-setup/ask_detect=false<wait>", - " console-setup/layoutcode=us<wait>", - " console-setup/modelcode=pc105<wait>", - " debconf/frontend=noninteractive<wait>", - " debian-installer=en_US<wait>", - " fb=false<wait>", - " initrd=/install/initrd.gz<wait>", - " kbd-chooser/method=us<wait>", - " keyboard-configuration/layout=USA<wait>", - " keyboard-configuration/variant=USA<wait>", - " locale=en_US<wait>", - " netcfg/get_domain=vm<wait>", - " netcfg/get_hostname=vagrant<wait>", - " grub-installer/bootdev=/dev/sda <wait>", - " noapic<wait>", - " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}}<wait>", - " -- <wait>", - "<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "ubuntu", - "headless": "{{ user `headless` }}", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../builds/packer-{{user `template`}}-vmware", - "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "tools_upload_flavor": "linux", - "type": "vmware-iso", - "vm_name": "{{ user `template` }}", - "vmx_data": { - "cpuid.coresPerSocket": "1", - "ethernet0.pciSlotNumber": "32", - "memsize": "{{ user `memory` }}", - "numvcpus": "{{ user `cpus` }}" - }, - "vmx_remove_ethernet_interfaces": true - }, - { - "boot_command": [ - "<esc><wait>", - "<esc><wait>", - "<enter><wait>", - "/install/vmlinuz<wait>", - " auto<wait>", - " console-setup/ask_detect=false<wait>", - " console-setup/layoutcode=us<wait>", - " console-setup/modelcode=pc105<wait>", - " debconf/frontend=noninteractive<wait>", - " debian-installer=en_US<wait>", - " fb=false<wait>", - " initrd=/install/initrd.gz<wait>", - " kbd-chooser/method=us<wait>", - " keyboard-configuration/layout=USA<wait>", - " keyboard-configuration/variant=USA<wait>", - " locale=en_US<wait>", - " netcfg/get_domain=vm<wait>", - " netcfg/get_hostname=vagrant<wait>", - " grub-installer/bootdev=/dev/sda <wait>", - " noapic<wait>", - " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}}<wait>", - " -- <wait>", - "<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "ubuntu", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../builds/packer-{{user `template`}}-parallels", - "parallels_tools_flavor": "lin", - "prlctl": [ - [ - "set", - "{{.Name}}", - "--memsize", - "{{ user `memory` }}" - ], - [ - "set", - "{{.Name}}", - "--cpus", - "{{ user `cpus` }}" - ] - ], - "prlctl_version_file": ".prlctl_version", - "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "parallels-iso", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<esc><wait>", - "<esc><wait>", - "<enter><wait>", - "/install/vmlinuz<wait>", - " auto<wait>", - " console-setup/ask_detect=false<wait>", - " console-setup/layoutcode=us<wait>", - " console-setup/modelcode=pc105<wait>", - " debconf/frontend=noninteractive<wait>", - " debian-installer=en_US<wait>", - " fb=false<wait>", - " initrd=/install/initrd.gz<wait>", - " kbd-chooser/method=us<wait>", - " keyboard-configuration/layout=USA<wait>", - " keyboard-configuration/variant=USA<wait>", - " locale=en_US<wait>", - " netcfg/get_domain=vm<wait>", - " netcfg/get_hostname=vagrant<wait>", - " grub-installer/bootdev=/dev/vda <wait>", - " noapic<wait>", - " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}}<wait>", - " -- <wait>", - "<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "headless": "{{ user `headless` }}", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../builds/packer-{{user `template`}}-qemu", - "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "qemu", - "vm_name": "{{ user `template` }}", - "qemuargs": [ - [ - "-m", - "{{ user `memory` }}M" - ], - [ - "-smp", - "{{ user `cpus` }}" - ] - ] - } - ], - "post-processors": [ - { - "output": "../builds/{{user `box_basename`}}.{{.Provider}}.box", - "type": "vagrant" - } - ], - "provisioners": [ - { - "environment_vars": [ - "HOME_DIR=/home/vagrant", - "http_proxy={{user `http_proxy`}}", - "https_proxy={{user `https_proxy`}}", - "no_proxy={{user `no_proxy`}}" - ], - "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", - "expect_disconnect": true, - "scripts": [ - "scripts/update.sh", - "../_common/sshd.sh", - "scripts/networking.sh", - "scripts/sudoers.sh", - "scripts/vagrant.sh", - "../_common/virtualbox.sh", - "scripts/vmware.sh", - "../_common/parallels.sh", - "scripts/cleanup.sh", - "../_common/minimize.sh" - ], - "type": "shell" - } - ], - "variables": { - "box_basename": "ubuntu-17.04-i386", - "build_timestamp": "{{isotime \"20060102150405\"}}", - "cpus": "1", - "disk_size": "65536", - "git_revision": "__unknown_git_revision__", - "headless": "", - "http_proxy": "{{env `http_proxy`}}", - "https_proxy": "{{env `https_proxy`}}", - "iso_checksum": "dd7879be4e2f9f31672f6e7681ecafeccfac294afd8ca1b04b78bc37fb44291c", - "iso_checksum_type": "sha256", - "iso_name": "ubuntu-17.04-server-i386.iso", - "memory": "1024", - "mirror": "http://releases.ubuntu.com", - "mirror_directory": "17.04", - "name": "ubuntu-17.04-i386", - "no_proxy": "{{env `no_proxy`}}", - "preseed_path": "preseed.cfg", - "template": "ubuntu-17.04-i386", - "version": "TIMESTAMP" - } -} From 6400a700fe9266e0b2a0a4365c2233108708e86c Mon Sep 17 00:00:00 2001 From: Seth Thomas <sthomas@chef.io> Date: Mon, 29 Jan 2018 10:12:43 -0500 Subject: [PATCH 0754/1622] Exclude firmware files w/o removing linux-firmware Signed-off-by: Seth Thomas <sthomas@chef.io> --- ubuntu/scripts/cleanup.sh | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/ubuntu/scripts/cleanup.sh b/ubuntu/scripts/cleanup.sh index 2ca262fa6..99781543e 100644 --- a/ubuntu/scripts/cleanup.sh +++ b/ubuntu/scripts/cleanup.sh @@ -42,8 +42,18 @@ apt-get -y purge ppp pppconfig pppoeconf; # Delete oddities apt-get -y purge popularity-contest installation-report command-not-found command-not-found-data friendly-recovery bash-completion fonts-ubuntu-font-family-console laptop-detect; +# Exlude the files we don't need w/o uninstalling linux-firmware +echo "==> Setup dpkg excludes for linux-firmware" +cat <<_EOF_ | cat >> /etc/dpkg/dpkg.cfg.d/excludes +#BENTO-BEGIN +path-exclude=/lib/firmware/* +path-exclude=/usr/share/doc/linux-firmware/* +#BENTO-END +_EOF_ + # Delete the massive firmware packages -apt-get -y purge linux-firmware +rm -rf /lib/firmware/* +rm -rf /usr/share/doc/linux-firmware/* apt-get -y autoremove; apt-get -y clean; From e8638bcb8ab4eac4b2906ab85f1068f718422816 Mon Sep 17 00:00:00 2001 From: Seth Thomas <sthomas@chef.io> Date: Wed, 31 Jan 2018 14:13:08 -0500 Subject: [PATCH 0755/1622] Bumping for 17.10.1 Signed-off-by: Seth Thomas <sthomas@chef.io> --- ubuntu/ubuntu-17.10-amd64.json | 4 ++-- ubuntu/ubuntu-17.10-i386.json | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ubuntu/ubuntu-17.10-amd64.json b/ubuntu/ubuntu-17.10-amd64.json index 76d7cfcab..a16d3a3f5 100644 --- a/ubuntu/ubuntu-17.10-amd64.json +++ b/ubuntu/ubuntu-17.10-amd64.json @@ -300,9 +300,9 @@ "https_proxy": "{{env `https_proxy`}}", "hyperv_generation": "2", "hyperv_switch": "{{env `hyperv_switch`}}", - "iso_checksum": "af913c00296eb0cfece99b8a02ae6db035ae173ed240241e780c8d7db96914b1", + "iso_checksum": "8ff73f1b622276758475c3bd5190b382774626de5a82c50930519381f6c3a3f8", "iso_checksum_type": "sha256", - "iso_name": "ubuntu-17.10-server-amd64.iso", + "iso_name": "ubuntu-17.10.1-server-amd64.iso ", "memory": "1024", "mirror": "http://releases.ubuntu.com", "mirror_directory": "17.10", diff --git a/ubuntu/ubuntu-17.10-i386.json b/ubuntu/ubuntu-17.10-i386.json index fc30d50ad..689ddb98b 100644 --- a/ubuntu/ubuntu-17.10-i386.json +++ b/ubuntu/ubuntu-17.10-i386.json @@ -262,9 +262,9 @@ "headless": "", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", - "iso_checksum": "d8fc9cea7eadeec39253fe62c215111314c582ef9ec10b6a70959265bac73cc4", + "iso_checksum": "eb921425349d2a51f90edc3977f83fb6fd8aed082b31515f1bde00d46b260492", "iso_checksum_type": "sha256", - "iso_name": "ubuntu-17.10-server-i386.iso", + "iso_name": "ubuntu-17.10.1-server-i386.iso", "memory": "1024", "mirror": "http://releases.ubuntu.com", "mirror_directory": "17.10", From e04986dea27570867cc64f416903640e280714dc Mon Sep 17 00:00:00 2001 From: Seth Thomas <sthomas@chef.io> Date: Wed, 31 Jan 2018 14:24:20 -0500 Subject: [PATCH 0756/1622] Spaces considered harmful Signed-off-by: Seth Thomas <sthomas@chef.io> --- ubuntu/ubuntu-17.10-amd64.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ubuntu/ubuntu-17.10-amd64.json b/ubuntu/ubuntu-17.10-amd64.json index a16d3a3f5..9d657c8a9 100644 --- a/ubuntu/ubuntu-17.10-amd64.json +++ b/ubuntu/ubuntu-17.10-amd64.json @@ -302,7 +302,7 @@ "hyperv_switch": "{{env `hyperv_switch`}}", "iso_checksum": "8ff73f1b622276758475c3bd5190b382774626de5a82c50930519381f6c3a3f8", "iso_checksum_type": "sha256", - "iso_name": "ubuntu-17.10.1-server-amd64.iso ", + "iso_name": "ubuntu-17.10.1-server-amd64.iso", "memory": "1024", "mirror": "http://releases.ubuntu.com", "mirror_directory": "17.10", From 01ee8ece274b96d2e218f192458d22ad7ce1f6b5 Mon Sep 17 00:00:00 2001 From: Li-Wen Hsu <lwhsu@lwhsu.org> Date: Tue, 6 Feb 2018 13:35:20 +0800 Subject: [PATCH 0757/1622] Disable uploading vbox guest additions ISO, which is installed via pkg --- freebsd/freebsd-10.3-amd64.json | 2 +- freebsd/freebsd-10.3-i386.json | 2 +- freebsd/freebsd-10.4-amd64.json | 2 +- freebsd/freebsd-10.4-i386.json | 2 +- freebsd/freebsd-11.1-amd64.json | 2 +- freebsd/freebsd-11.1-i386.json | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/freebsd/freebsd-10.3-amd64.json b/freebsd/freebsd-10.3-amd64.json index 3b2d282f8..f242f21ff 100644 --- a/freebsd/freebsd-10.3-amd64.json +++ b/freebsd/freebsd-10.3-amd64.json @@ -14,7 +14,7 @@ ], "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", - "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "guest_additions_mode": "disable", "guest_os_type": "FreeBSD_64", "headless": "{{ user `headless` }}", "http_directory": "http", diff --git a/freebsd/freebsd-10.3-i386.json b/freebsd/freebsd-10.3-i386.json index b080b7f5e..9155586fd 100644 --- a/freebsd/freebsd-10.3-i386.json +++ b/freebsd/freebsd-10.3-i386.json @@ -14,7 +14,7 @@ ], "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", - "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "guest_additions_mode": "disable", "guest_os_type": "FreeBSD", "headless": "{{ user `headless` }}", "http_directory": "http", diff --git a/freebsd/freebsd-10.4-amd64.json b/freebsd/freebsd-10.4-amd64.json index ec3e7d3eb..029b2b91d 100644 --- a/freebsd/freebsd-10.4-amd64.json +++ b/freebsd/freebsd-10.4-amd64.json @@ -14,7 +14,7 @@ ], "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", - "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "guest_additions_mode": "disable", "guest_os_type": "FreeBSD_64", "headless": "{{ user `headless` }}", "http_directory": "http", diff --git a/freebsd/freebsd-10.4-i386.json b/freebsd/freebsd-10.4-i386.json index ad267aae2..67f16f959 100644 --- a/freebsd/freebsd-10.4-i386.json +++ b/freebsd/freebsd-10.4-i386.json @@ -14,7 +14,7 @@ ], "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", - "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "guest_additions_mode": "disable", "guest_os_type": "FreeBSD", "headless": "{{ user `headless` }}", "http_directory": "http", diff --git a/freebsd/freebsd-11.1-amd64.json b/freebsd/freebsd-11.1-amd64.json index c5d59ad68..17d14f112 100644 --- a/freebsd/freebsd-11.1-amd64.json +++ b/freebsd/freebsd-11.1-amd64.json @@ -14,7 +14,7 @@ ], "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", - "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "guest_additions_mode": "disable", "guest_os_type": "FreeBSD_64", "headless": "{{ user `headless` }}", "http_directory": "http", diff --git a/freebsd/freebsd-11.1-i386.json b/freebsd/freebsd-11.1-i386.json index b41c826d3..52cdb3c4c 100644 --- a/freebsd/freebsd-11.1-i386.json +++ b/freebsd/freebsd-11.1-i386.json @@ -14,7 +14,7 @@ ], "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", - "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "guest_additions_mode": "disable", "guest_os_type": "FreeBSD", "headless": "{{ user `headless` }}", "http_directory": "http", From 07d60b4147af870d7d88abf17769c614355e2c29 Mon Sep 17 00:00:00 2001 From: Seth Thomas <cheeseplus@chef.io> Date: Tue, 6 Feb 2018 15:15:06 -0500 Subject: [PATCH 0758/1622] Release 201802.02.0 (#993) * Release 201802.02.0 Signed-off-by: Seth Thomas <sthomas@chef.io> --- CHANGELOG.md | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 777ebe5dc..5f87735bb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,22 @@ # Change Log +## [201802.02.0](https://github.com/chef/bento/tree/201802.02.0) (2018-02-02) + +**Improvements** +- Ubuntu: remove linux-firmware bloat w/o removing package and breaking upgrades +- macOS: enable autologin for vagrant user + +**EOL** +- Ubuntu 17.04 +- Windows Nano TP3 + +**Tooling** +- VirtualBox 5.2.6 +- Parallels 13.2.0 +- VMware Fusion 10.1.1 +- Packer 1.1.3 +- Vagrant 2.0.1 + ## [201801.05.0](https://github.com/chef/bento/tree/201801.05.0) (2018-01-05) **New Platforms** From 7a2c5b2e390e1a7ffc75c42af70db9fd3f4ce8cb Mon Sep 17 00:00:00 2001 From: Seth Thomas <sthomas@chef.io> Date: Mon, 12 Feb 2018 09:34:02 -0500 Subject: [PATCH 0759/1622] Add cifs-utils for debian/ubuntu Signed-off-by: Seth Thomas <sthomas@chef.io> --- debian/http/debian-7/preseed.cfg | 2 +- debian/http/debian-8/preseed.cfg | 2 +- ubuntu/http/preseed-hyperv.cfg | 2 +- ubuntu/http/preseed.cfg | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/debian/http/debian-7/preseed.cfg b/debian/http/debian-7/preseed.cfg index 573d761b5..d6191052e 100644 --- a/debian/http/debian-7/preseed.cfg +++ b/debian/http/debian-7/preseed.cfg @@ -30,7 +30,7 @@ d-i passwd/user-uid string 1000 d-i passwd/user-password password vagrant d-i passwd/user-password-again password vagrant d-i passwd/username string vagrant -d-i pkgsel/include string openssh-server sudo bzip2 acpid cryptsetup zlib1g-dev wget curl dkms make nfs-common +d-i pkgsel/include string openssh-server sudo bzip2 acpid cryptsetup zlib1g-dev wget curl dkms make nfs-common cifs-utils d-i pkgsel/install-language-support boolean false d-i pkgsel/update-policy select none d-i pkgsel/upgrade select full-upgrade diff --git a/debian/http/debian-8/preseed.cfg b/debian/http/debian-8/preseed.cfg index 78b1c7ba2..a4cda4342 100644 --- a/debian/http/debian-8/preseed.cfg +++ b/debian/http/debian-8/preseed.cfg @@ -30,7 +30,7 @@ d-i passwd/user-uid string 1000 d-i passwd/user-password password vagrant d-i passwd/user-password-again password vagrant d-i passwd/username string vagrant -d-i pkgsel/include string sudo bzip2 acpid cryptsetup zlib1g-dev wget curl dkms fuse make nfs-common net-tools +d-i pkgsel/include string sudo bzip2 acpid cryptsetup zlib1g-dev wget curl dkms fuse make nfs-common net-tools cifs-utils d-i pkgsel/install-language-support boolean false d-i pkgsel/update-policy select none d-i pkgsel/upgrade select full-upgrade diff --git a/ubuntu/http/preseed-hyperv.cfg b/ubuntu/http/preseed-hyperv.cfg index 0422b5b9e..8fc1c8474 100755 --- a/ubuntu/http/preseed-hyperv.cfg +++ b/ubuntu/http/preseed-hyperv.cfg @@ -28,7 +28,7 @@ d-i passwd/user-uid string 1000 d-i passwd/user-password password vagrant d-i passwd/user-password-again password vagrant d-i passwd/username string vagrant -d-i pkgsel/include string openssh-server ntp linux-tools-$(uname -r) linux-cloud-tools-$(uname -r) linux-cloud-tools-common +d-i pkgsel/include string openssh-server ntp linux-tools-$(uname -r) linux-cloud-tools-$(uname -r) linux-cloud-tools-common cifs-utils d-i pkgsel/install-language-support boolean false d-i pkgsel/update-policy select none d-i pkgsel/upgrade select full-upgrade diff --git a/ubuntu/http/preseed.cfg b/ubuntu/http/preseed.cfg index 7b4a3235f..34e65be13 100644 --- a/ubuntu/http/preseed.cfg +++ b/ubuntu/http/preseed.cfg @@ -25,7 +25,7 @@ d-i passwd/user-uid string 1000 d-i passwd/user-password password vagrant d-i passwd/user-password-again password vagrant d-i passwd/username string vagrant -d-i pkgsel/include string openssh-server cryptsetup build-essential libssl-dev libreadline-dev zlib1g-dev linux-source dkms nfs-common linux-headers-$(uname -r) perl +d-i pkgsel/include string openssh-server cryptsetup build-essential libssl-dev libreadline-dev zlib1g-dev linux-source dkms nfs-common linux-headers-$(uname -r) perl cifs-utils d-i pkgsel/install-language-support boolean false d-i pkgsel/update-policy select none d-i pkgsel/upgrade select full-upgrade From 68f9910cd9fe43131752f131dd35b8d7f0b6bac3 Mon Sep 17 00:00:00 2001 From: Li-Wen Hsu <lwhsu@lwhsu.org> Date: Tue, 13 Feb 2018 12:25:16 +0800 Subject: [PATCH 0760/1622] Use smaller install media --- freebsd/freebsd-10.4-amd64.json | 4 ++-- freebsd/freebsd-10.4-i386.json | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/freebsd/freebsd-10.4-amd64.json b/freebsd/freebsd-10.4-amd64.json index 029b2b91d..c9e037893 100644 --- a/freebsd/freebsd-10.4-amd64.json +++ b/freebsd/freebsd-10.4-amd64.json @@ -214,9 +214,9 @@ "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", "install_path": "freebsd-10/install.sh", - "iso_checksum": "195a270b4fd2db4f9e3a1451384f2d3bfa699696d110873b62bcf7540524da0d", + "iso_checksum": "7ac73b2a899024e1d9e71e55b5c9b9ac13938468206c72c5a1cf23c7e0a715b4", "iso_checksum_type": "sha256", - "iso_name": "FreeBSD-10.4-RELEASE-amd64-dvd1.iso", + "iso_name": "FreeBSD-10.4-RELEASE-amd64-disc1.iso", "memory": "1024", "mirror": "https://download.freebsd.org/ftp", "mirror_directory": "releases/amd64/amd64/ISO-IMAGES/10.4", diff --git a/freebsd/freebsd-10.4-i386.json b/freebsd/freebsd-10.4-i386.json index 67f16f959..ee1227b4f 100644 --- a/freebsd/freebsd-10.4-i386.json +++ b/freebsd/freebsd-10.4-i386.json @@ -214,9 +214,9 @@ "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", "install_path": "freebsd-10/install.sh", - "iso_checksum": "006a0f77b2d5ddfc1491a72b04b7246971ac35adb4da47a766228b36650a56c6", + "iso_checksum": "719ea971deb508936953be78ae9963caa9247d3ee437d0941b08fc7df7ce37b0", "iso_checksum_type": "sha256", - "iso_name": "FreeBSD-10.4-RELEASE-i386-dvd1.iso", + "iso_name": "FreeBSD-10.4-RELEASE-i386-disc1.iso", "memory": "1024", "mirror": "https://download.freebsd.org/ftp", "mirror_directory": "releases/i386/i386/ISO-IMAGES/10.4", From 77b639856a68e6e37b739424d59a26d523efcf51 Mon Sep 17 00:00:00 2001 From: Li-Wen Hsu <lwhsu@lwhsu.org> Date: Wed, 14 Feb 2018 13:15:26 +0800 Subject: [PATCH 0761/1622] Add new variable pkg_branch for choosing pkg branch --- freebsd/freebsd-10.3-amd64.json | 4 +++- freebsd/freebsd-10.3-i386.json | 4 +++- freebsd/freebsd-10.4-amd64.json | 4 +++- freebsd/freebsd-10.4-i386.json | 4 +++- freebsd/freebsd-11.1-amd64.json | 4 +++- freebsd/freebsd-11.1-i386.json | 4 +++- freebsd/scripts/update.sh | 5 +++++ 7 files changed, 23 insertions(+), 6 deletions(-) diff --git a/freebsd/freebsd-10.3-amd64.json b/freebsd/freebsd-10.3-amd64.json index f242f21ff..b8591ae47 100644 --- a/freebsd/freebsd-10.3-amd64.json +++ b/freebsd/freebsd-10.3-amd64.json @@ -188,7 +188,8 @@ "HOME_DIR=/home/vagrant", "http_proxy={{user `http_proxy`}}", "https_proxy={{user `https_proxy`}}", - "no_proxy={{user `no_proxy`}}" + "no_proxy={{user `no_proxy`}}", + "pkg_branch={{user `pkg_branch`}}" ], "execute_command": "echo 'vagrant' | {{.Vars}} su -m root -c 'sh -eux {{.Path}}'", "expect_disconnect": true, @@ -222,6 +223,7 @@ "mirror_directory": "releases/amd64/amd64/ISO-IMAGES/10.3", "name": "freebsd-10.3", "no_proxy": "{{env `no_proxy`}}", + "pkg_branch": "quarterly", "template": "freebsd-10.3-amd64", "version": "TIMESTAMP" } diff --git a/freebsd/freebsd-10.3-i386.json b/freebsd/freebsd-10.3-i386.json index 9155586fd..815000170 100644 --- a/freebsd/freebsd-10.3-i386.json +++ b/freebsd/freebsd-10.3-i386.json @@ -188,7 +188,8 @@ "HOME_DIR=/home/vagrant", "http_proxy={{user `http_proxy`}}", "https_proxy={{user `https_proxy`}}", - "no_proxy={{user `no_proxy`}}" + "no_proxy={{user `no_proxy`}}", + "pkg_branch={{user `pkg_branch`}}" ], "execute_command": "echo 'vagrant' | {{.Vars}} su -m root -c 'sh -eux {{.Path}}'", "expect_disconnect": true, @@ -222,6 +223,7 @@ "mirror_directory": "releases/i386/i386/ISO-IMAGES/10.3", "name": "freebsd-10.3-i386", "no_proxy": "{{env `no_proxy`}}", + "pkg_branch": "quarterly", "template": "freebsd-10.3-i386", "version": "TIMESTAMP" } diff --git a/freebsd/freebsd-10.4-amd64.json b/freebsd/freebsd-10.4-amd64.json index c9e037893..56583671b 100644 --- a/freebsd/freebsd-10.4-amd64.json +++ b/freebsd/freebsd-10.4-amd64.json @@ -188,7 +188,8 @@ "HOME_DIR=/home/vagrant", "http_proxy={{user `http_proxy`}}", "https_proxy={{user `https_proxy`}}", - "no_proxy={{user `no_proxy`}}" + "no_proxy={{user `no_proxy`}}", + "pkg_branch={{user `pkg_branch`}}" ], "execute_command": "echo 'vagrant' | {{.Vars}} su -m root -c 'sh -eux {{.Path}}'", "expect_disconnect": true, @@ -222,6 +223,7 @@ "mirror_directory": "releases/amd64/amd64/ISO-IMAGES/10.4", "name": "freebsd-10.4", "no_proxy": "{{env `no_proxy`}}", + "pkg_branch": "quarterly", "template": "freebsd-10.4-amd64", "version": "TIMESTAMP" } diff --git a/freebsd/freebsd-10.4-i386.json b/freebsd/freebsd-10.4-i386.json index ee1227b4f..98477b81a 100644 --- a/freebsd/freebsd-10.4-i386.json +++ b/freebsd/freebsd-10.4-i386.json @@ -188,7 +188,8 @@ "HOME_DIR=/home/vagrant", "http_proxy={{user `http_proxy`}}", "https_proxy={{user `https_proxy`}}", - "no_proxy={{user `no_proxy`}}" + "no_proxy={{user `no_proxy`}}", + "pkg_branch={{user `pkg_branch`}}" ], "execute_command": "echo 'vagrant' | {{.Vars}} su -m root -c 'sh -eux {{.Path}}'", "expect_disconnect": true, @@ -222,6 +223,7 @@ "mirror_directory": "releases/i386/i386/ISO-IMAGES/10.4", "name": "freebsd-10.4-i386", "no_proxy": "{{env `no_proxy`}}", + "pkg_branch": "quarterly", "template": "freebsd-10.4-i386", "version": "TIMESTAMP" } diff --git a/freebsd/freebsd-11.1-amd64.json b/freebsd/freebsd-11.1-amd64.json index 17d14f112..814053389 100644 --- a/freebsd/freebsd-11.1-amd64.json +++ b/freebsd/freebsd-11.1-amd64.json @@ -188,7 +188,8 @@ "HOME_DIR=/home/vagrant", "http_proxy={{user `http_proxy`}}", "https_proxy={{user `https_proxy`}}", - "no_proxy={{user `no_proxy`}}" + "no_proxy={{user `no_proxy`}}", + "pkg_branch={{user `pkg_branch`}}" ], "execute_command": "echo 'vagrant' | {{.Vars}} su -m root -c 'sh -eux {{.Path}}'", "expect_disconnect": true, @@ -221,6 +222,7 @@ "mirror": "https://download.freebsd.org/ftp", "mirror_directory": "releases/amd64/amd64/ISO-IMAGES/11.1", "no_proxy": "{{env `no_proxy`}}", + "pkg_branch": "quarterly", "template": "freebsd-11.1-amd64", "version": "TIMESTAMP" } diff --git a/freebsd/freebsd-11.1-i386.json b/freebsd/freebsd-11.1-i386.json index 52cdb3c4c..8c5174b74 100644 --- a/freebsd/freebsd-11.1-i386.json +++ b/freebsd/freebsd-11.1-i386.json @@ -188,7 +188,8 @@ "HOME_DIR=/home/vagrant", "http_proxy={{user `http_proxy`}}", "https_proxy={{user `https_proxy`}}", - "no_proxy={{user `no_proxy`}}" + "no_proxy={{user `no_proxy`}}", + "pkg_branch={{user `pkg_branch`}}" ], "execute_command": "echo 'vagrant' | {{.Vars}} su -m root -c 'sh -eux {{.Path}}'", "expect_disconnect": true, @@ -221,6 +222,7 @@ "mirror": "https://download.freebsd.org/ftp", "mirror_directory": "releases/i386/i386/ISO-IMAGES/11.1", "no_proxy": "{{env `no_proxy`}}", + "pkg_branch": "quarterly", "template": "freebsd-11.1-i386", "version": "TIMESTAMP" } diff --git a/freebsd/scripts/update.sh b/freebsd/scripts/update.sh index 36411fb66..d396fcd6f 100644 --- a/freebsd/scripts/update.sh +++ b/freebsd/scripts/update.sh @@ -22,6 +22,11 @@ fi env PAGER=/bin/cat $freebsd_update fetch || true; env PAGER=/bin/cat $freebsd_update install || true; +if [ "$pkg_branch" != "quarterly" ]; then + sed -i.bak -e "s,pkg+http://pkg.FreeBSD.org/\${ABI}/quarterly,pkg+http://pkg.FreeBSD.org/\${ABI}/${pkg_branch}," /etc/pkg/FreeBSD.conf + rm -f /etc/pkg/FreeBSD.conf.bak +fi + # Always use pkgng - pkg_add is EOL as of 1 September 2014 env ASSUME_ALWAYS_YES=true pkg bootstrap; if [ "$major_version" -lt 10 ]; then From 838cb29bc4a090ed424958266e6f9a48c4fd229e Mon Sep 17 00:00:00 2001 From: Li-Wen Hsu <lwhsu@lwhsu.org> Date: Wed, 14 Feb 2018 13:19:52 +0800 Subject: [PATCH 0762/1622] Drop < 10.x bits, not officially supported anymore --- freebsd/scripts/update.sh | 17 +---------------- freebsd/scripts/vmtools.sh | 5 +---- 2 files changed, 2 insertions(+), 20 deletions(-) diff --git a/freebsd/scripts/update.sh b/freebsd/scripts/update.sh index d396fcd6f..34803cfd5 100644 --- a/freebsd/scripts/update.sh +++ b/freebsd/scripts/update.sh @@ -5,17 +5,7 @@ [ -z "$http_proxy" ] && unset http_proxy [ -z "$https_proxy" ] && unset https_proxy -major_version="`uname -r | awk -F. '{print $1}'`"; - -if [ "$major_version" -lt 10 ]; then - # Allow freebsd-update to run fetch without stdin attached to a terminal - sed 's/\[ ! -t 0 \]/false/' /usr/sbin/freebsd-update >/tmp/freebsd-update; - chmod +x /tmp/freebsd-update; - - freebsd_update="/tmp/freebsd-update"; -else - freebsd_update="/usr/sbin/freebsd-update --not-running-from-cron"; -fi +freebsd_update="/usr/sbin/freebsd-update --not-running-from-cron"; # Update FreeBSD # NOTE: the install action fails if there are no updates so || true it @@ -27,10 +17,5 @@ if [ "$pkg_branch" != "quarterly" ]; then rm -f /etc/pkg/FreeBSD.conf.bak fi -# Always use pkgng - pkg_add is EOL as of 1 September 2014 env ASSUME_ALWAYS_YES=true pkg bootstrap; -if [ "$major_version" -lt 10 ]; then - echo "WITH_PKGNG=yes" >>/etc/make.conf; -fi - pkg update; diff --git a/freebsd/scripts/vmtools.sh b/freebsd/scripts/vmtools.sh index 0522426fa..a065cae25 100644 --- a/freebsd/scripts/vmtools.sh +++ b/freebsd/scripts/vmtools.sh @@ -16,10 +16,7 @@ virtualbox-iso|virtualbox-ovf) echo 'vboxservice_enable="YES"' >>/etc/rc.conf; echo 'virtio_blk_load="YES"' >>/boot/loader.conf; - if [ "$freebsd_major" -gt 9 ]; then - # Appeared in FreeBSD 10 - echo 'virtio_scsi_load="YES"' >>/boot/loader.conf; - fi + echo 'virtio_scsi_load="YES"' >>/boot/loader.conf; echo 'virtio_balloon_load="YES"' >>/boot/loader.conf; echo 'if_vtnet_load="YES"' >>/boot/loader.conf; From 74f15e3648bde007e1acd380eb53480a42952a54 Mon Sep 17 00:00:00 2001 From: Li-Wen Hsu <lwhsu@lwhsu.org> Date: Wed, 14 Feb 2018 13:25:04 +0800 Subject: [PATCH 0763/1622] Combine pkg invocations --- freebsd/scripts/postinstall.sh | 3 +-- freebsd/scripts/update.sh | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/freebsd/scripts/postinstall.sh b/freebsd/scripts/postinstall.sh index e91211e5d..8107039f6 100644 --- a/freebsd/scripts/postinstall.sh +++ b/freebsd/scripts/postinstall.sh @@ -4,8 +4,7 @@ ntpdate -v -b 0.freebsd.pool.ntp.org # Install curl and ca_root_nss -pkg install -y curl; -pkg install -y ca_root_nss; +pkg install -y curl ca_root_nss; # Emulate the ETCSYMLINK behavior of ca_root_nss; this is for FreeBSD 10, # where fetch(1) was massively refactored and doesn't come with diff --git a/freebsd/scripts/update.sh b/freebsd/scripts/update.sh index 34803cfd5..fad1e85e1 100644 --- a/freebsd/scripts/update.sh +++ b/freebsd/scripts/update.sh @@ -17,5 +17,4 @@ if [ "$pkg_branch" != "quarterly" ]; then rm -f /etc/pkg/FreeBSD.conf.bak fi -env ASSUME_ALWAYS_YES=true pkg bootstrap; -pkg update; +env ASSUME_ALWAYS_YES=true pkg update; From 9e0a5aedb20f5a343bf78f0d721b134f3b93146e Mon Sep 17 00:00:00 2001 From: Mikhail Zholobov <legal90@gmail.com> Date: Tue, 20 Feb 2018 12:11:27 +0100 Subject: [PATCH 0764/1622] Install VMware Tools on OS X 10.10 and earlier from a specific ISO Starting since VMware Tools 10.0.12, there is a dedicated image for guest OS X 10.10 and older: "darwinPre15.iso" https://docs.vmware.com/en/VMware-Tools/10.0/rn/vmware-tools-10012-release-notes.html --- macos/macosx-10.10.json | 2 +- macos/macosx-10.9.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/macos/macosx-10.10.json b/macos/macosx-10.10.json index b56c0b2e4..1e68b13c6 100644 --- a/macos/macosx-10.10.json +++ b/macos/macosx-10.10.json @@ -15,7 +15,7 @@ "ssh_port": 22, "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", - "tools_upload_flavor": "darwin", + "tools_upload_flavor": "darwinPre15", "tools_upload_path": "/tmp/vmtools.iso", "type": "vmware-iso", "vm_name": "{{ user `template` }}", diff --git a/macos/macosx-10.9.json b/macos/macosx-10.9.json index 5c2c0c6e2..23447b12c 100644 --- a/macos/macosx-10.9.json +++ b/macos/macosx-10.9.json @@ -15,7 +15,7 @@ "ssh_port": 22, "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", - "tools_upload_flavor": "darwin", + "tools_upload_flavor": "darwinPre15", "tools_upload_path": "/tmp/vmtools.iso", "type": "vmware-iso", "vm_name": "{{ user `template` }}", From c1cb11f9cee03716e22e834886a583f6d38cbae0 Mon Sep 17 00:00:00 2001 From: svpace <svpace@gmail.com> Date: Tue, 20 Feb 2018 11:35:25 -0300 Subject: [PATCH 0765/1622] Clean up old firmwares. Closes #998 --- centos/http/7/ks.cfg | 22 ++-------------------- 1 file changed, 2 insertions(+), 20 deletions(-) diff --git a/centos/http/7/ks.cfg b/centos/http/7/ks.cfg index 1caa16a9c..c826c681a 100644 --- a/centos/http/7/ks.cfg +++ b/centos/http/7/ks.cfg @@ -38,11 +38,8 @@ bzip2 # unnecessary firmware -aic94xx-firmware --atmel-firmware --b43-openfwwf --bfa-firmware --ipw2100-firmware --ipw2200-firmware +-alsa-firmware +-alsa-tools-firmware -ivtv-firmware -iwl100-firmware -iwl105-firmware @@ -61,21 +58,6 @@ bzip2 -iwl6050-firmware -iwl7260-firmware -iwl7265-firmware --libertas-usb8388-firmware --libertas-sd8686-firmware --libertas-sd8787-firmware --ql2100-firmware --ql2200-firmware --ql23xx-firmware --ql2400-firmware --ql2500-firmware --rt61pci-firmware --rt73usb-firmware --xorg-x11-drv-ati-firmware --zd1211-firmware --alsa-tools-firmware --alsa-firmware --kernel-firmware %end %post From f7b857a55102ecde57e657462c435a38a29b6f51 Mon Sep 17 00:00:00 2001 From: nusenu <nusenu-github@riseup.net> Date: Sun, 11 Mar 2018 17:12:30 +0000 Subject: [PATCH 0766/1622] add new platform: HardenedBSD 11 These new files are based on the files in the freebsd folder. The new platform is also added to builds.yml. --- builds.yml | 1 + hardenedbsd/hardenedbsd-11-amd64.json | 227 ++++++++++++++++++ .../http/hardenedbsd-11/installerconfig | 52 ++++ hardenedbsd/scripts/cleanup.sh | 11 + hardenedbsd/scripts/minimize.sh | 33 +++ hardenedbsd/scripts/postinstall.sh | 24 ++ hardenedbsd/scripts/sudoers.sh | 4 + hardenedbsd/scripts/update.sh | 15 ++ .../vagrantfile_templates/hardenedbsd.rb | 15 ++ 9 files changed, 382 insertions(+) create mode 100644 hardenedbsd/hardenedbsd-11-amd64.json create mode 100644 hardenedbsd/http/hardenedbsd-11/installerconfig create mode 100644 hardenedbsd/scripts/cleanup.sh create mode 100644 hardenedbsd/scripts/minimize.sh create mode 100644 hardenedbsd/scripts/postinstall.sh create mode 100644 hardenedbsd/scripts/sudoers.sh create mode 100644 hardenedbsd/scripts/update.sh create mode 100644 hardenedbsd/vagrantfile_templates/hardenedbsd.rb diff --git a/builds.yml b/builds.yml index bbc6b3f77..2a88a15b7 100644 --- a/builds.yml +++ b/builds.yml @@ -28,6 +28,7 @@ public: - 'opensuse-leap-42.3' - 'freebsd-11.1' - 'freebsd-10.4' +- 'hardenedbsd-11' slugs: 'centos-7': 'centos-7.4' diff --git a/hardenedbsd/hardenedbsd-11-amd64.json b/hardenedbsd/hardenedbsd-11-amd64.json new file mode 100644 index 000000000..709c01a9c --- /dev/null +++ b/hardenedbsd/hardenedbsd-11-amd64.json @@ -0,0 +1,227 @@ +{ + "builders": [ + { + "boot_command": [ + "<esc><wait>", + "boot -s<wait>", + "<enter><wait>", + "<wait10><wait10>", + "/bin/sh<enter><wait>", + "mdmfs -s 100m md1 /tmp<enter><wait>", + "mdmfs -s 100m md2 /mnt<enter><wait>", + "dhclient -l /tmp/dhclient.lease.em0 em0<enter><wait10>", + "fetch -o /tmp/installerconfig http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} && bsdinstall script /tmp/installerconfig<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": "{{user `disk_size`}}", + "guest_additions_mode": "disable", + "guest_os_type": "FreeBSD_64", + "headless": "{{ user `headless` }}", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "../builds/packer-{{user `template`}}-virtualbox", + "shutdown_command": "echo 'vagrant' | su -m root -c 'shutdown -p now'", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "virtualbox-iso", + "vboxmanage": [ + [ + "modifyvm", + "{{.Name}}", + "--memory", + "{{ user `memory` }}" + ], + [ + "modifyvm", + "{{.Name}}", + "--cpus", + "{{ user `cpus` }}" + ] + ], + "virtualbox_version_file": ".vbox_version", + "vm_name": "{{ user `template` }}" + }, + { + "boot_command": [ + "<esc><wait>", + "boot -s<wait>", + "<enter><wait>", + "<wait10><wait10>", + "/bin/sh<enter><wait>", + "mdmfs -s 100m md1 /tmp<enter><wait>", + "mdmfs -s 100m md2 /mnt<enter><wait>", + "dhclient -l /tmp/dhclient.lease.em0 em0<enter><wait>", + "<wait5>", + "fetch -o /tmp/installerconfig http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} && bsdinstall script /tmp/installerconfig<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": "{{user `disk_size`}}", + "guest_os_type": "freebsd-64", + "headless": "{{ user `headless` }}", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "../builds/packer-{{user `template`}}-vmware", + "shutdown_command": "echo 'vagrant' | su -m root -c 'shutdown -p now'", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "tools_upload_flavor": "freebsd", + "type": "vmware-iso", + "vm_name": "{{ user `template` }}", + "vmx_data": { + "cpuid.coresPerSocket": "1", + "memsize": "{{ user `memory` }}", + "numvcpus": "{{ user `cpus` }}" + }, + "vmx_remove_ethernet_interfaces": true + }, + { + "boot_command": [ + "<esc><wait>", + "boot -s<wait>", + "<enter><wait>", + "<wait10><wait10>", + "/bin/sh<enter><wait>", + "mdmfs -s 100m md1 /tmp<enter><wait>", + "mdmfs -s 100m md2 /mnt<enter><wait>", + "dhclient -l /tmp/dhclient.lease.em0 em0<enter><wait>", + "fetch -o /tmp/installerconfig http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} && bsdinstall script /tmp/installerconfig<enter><wait>" + ], + "boot_wait": "8s", + "disk_size": "{{user `disk_size`}}", + "guest_os_type": "freebsd", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "../builds/packer-{{user `template`}}-parallels", + "parallels_tools_mode": "disable", + "prlctl": [ + [ + "set", + "{{.Name}}", + "--memsize", + "{{ user `memory` }}" + ], + [ + "set", + "{{.Name}}", + "--cpus", + "{{ user `cpus` }}" + ], + [ + "set", + "{{.Name}}", + "--device-set", + "cdrom0", + "--iface", + "ide" + ], + [ + "set", + "{{.Name}}", + "--device-del", + "fdd0" + ], + [ + "set", + "{{.Name}}", + "--device-del", + "parallel0" + ] + ], + "prlctl_version_file": ".prlctl_version", + "shutdown_command": "echo 'vagrant' | su -m root -c 'shutdown -p now'", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "parallels-iso", + "vm_name": "{{ user `template` }}" + }, + { + "boot_command": [ + "<esc><wait>", + "boot -s<wait>", + "<enter><wait>", + "<wait10><wait10>", + "/bin/sh<enter><wait>", + "mdmfs -s 100m md1 /tmp<enter><wait>", + "mdmfs -s 100m md2 /mnt<enter><wait>", + "dhclient -l /tmp/dhclient.lease.vtnet0 vtnet0<enter><wait>", + "fetch -o /tmp/installerconfig http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} && bsdinstall script /tmp/installerconfig<enter><wait>" + ], + "boot_wait": "7s", + "disk_size": "{{user `disk_size`}}", + "headless": "{{ user `headless` }}", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "../builds/packer-{{user `template`}}-qemu", + "shutdown_command": "echo 'vagrant' | su -m root -c 'shutdown -p now'", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "qemu", + "vm_name": "{{ user `template` }}" + } + ], + "post-processors": [ + { + "output": "../builds/{{user `box_basename`}}.{{.Provider}}.box", + "type": "vagrant", + "vagrantfile_template": "vagrantfile_templates/hardenedbsd.rb" + } + ], + "provisioners": [ + { + "environment_vars": [ + "HOME_DIR=/home/vagrant", + "http_proxy={{user `http_proxy`}}", + "https_proxy={{user `https_proxy`}}", + "no_proxy={{user `no_proxy`}}" + ], + "execute_command": "echo 'vagrant' | {{.Vars}} su -m root -c 'sh -eux {{.Path}}'", + "expect_disconnect": true, + "scripts": [ + "scripts/update.sh", + "scripts/postinstall.sh", + "scripts/sudoers.sh", + "../_common/vagrant.sh", + "scripts/cleanup.sh", + "scripts/minimize.sh" + ], + "type": "shell" + } + ], + "variables": { + "box_basename": "hardenedbsd-11", + "build_timestamp": "{{isotime \"20060102150405\"}}", + "cpus": "1", + "disk_size": "65536", + "git_revision": "__unknown_git_revision__", + "headless": "", + "http_proxy": "{{env `http_proxy`}}", + "https_proxy": "{{env `https_proxy`}}", + "install_path": "hardenedbsd-11/installerconfig", + "iso_checksum": "6ffb4b87868e91e557e8971e068c5a22a764fc676c004c80b9cb781c3973c7b0", + "iso_checksum_type": "sha256", + "iso_name": "HardenedBSD-11-STABLE-v1100055-amd64-disc1.iso", + "memory": "1024", + "mirror": "https://installer.hardenedbsd.org", + "mirror_directory": "hardened_11_stable_master-LAST", + "no_proxy": "{{env `no_proxy`}}", + "template": "hardenedbsd-11-amd64", + "version": "TIMESTAMP" + } +} + diff --git a/hardenedbsd/http/hardenedbsd-11/installerconfig b/hardenedbsd/http/hardenedbsd-11/installerconfig new file mode 100644 index 000000000..1e6c0bbe6 --- /dev/null +++ b/hardenedbsd/http/hardenedbsd-11/installerconfig @@ -0,0 +1,52 @@ +DISTRIBUTIONS="base.txz kernel.txz" + +# for variations in the root disk device name between VMware and Virtualbox +if [ -e /dev/ada0 ]; then + DISKSLICE=ada0 +elif [ -e /dev/da0 ]; then + DISKSLICE=da0 +elif [ -e /dev/vtbd0 ]; then + DISKSLICE=vtbd0 +else + echo "Unknown disk for install.sh to work with!" + exit -1 +fi + +# Workaround for https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=203777 +export nonInteractive="YES" + +export ZFSBOOT_DISKS="$DISKSLICE" +export ZFSBOOT_CONFIRM_LAYOUT=0 + +HOSTNAME=hardenedbsd + +#!/bin/sh -x + +ifdev=$(ifconfig | grep '^[a-z]' | cut -d: -f1 | head -n 1) +# Enable required services +cat >> /etc/rc.conf << EOT +ifconfig_${ifdev}="dhcp" +sshd_enable="YES" +EOT + +# Tune and boot from zfs +cat >> /boot/loader.conf << EOT +vm.kmem_size="200M" +vm.kmem_size_max="200M" +vfs.zfs.arc_max="40M" +vfs.zfs.vdev.cache.size="5M" +autoboot_delay=3 +EOT + +# zfs doesn't use an fstab, but some rc scripts expect one +touch /etc/fstab + +# Set up user accounts +echo "vagrant" | pw -V /etc useradd vagrant -h 0 -s /bin/sh -G wheel -d /usr/home/vagrant -c "Vagrant User" +echo "vagrant" | pw -V /etc usermod root + +mkdir -p /usr/home/vagrant +chown 1001:1001 /usr/home/vagrant +ln -s /usr/home /home + +reboot diff --git a/hardenedbsd/scripts/cleanup.sh b/hardenedbsd/scripts/cleanup.sh new file mode 100644 index 000000000..8d0127bbd --- /dev/null +++ b/hardenedbsd/scripts/cleanup.sh @@ -0,0 +1,11 @@ +#!/bin/sh -eux + +# Purge files we don't need any longer +rm -rf /var/db/hbsd-update/files; +mkdir -p /var/db/hbsd-update/files; +rm -f /var/db/hbsd-update/*-rollback; +rm -rf /var/db/hbsd-update/install.*; +rm -rf /boot/kernel.old; +rm -f /boot/kernel*/*.symbols; +rm -f /*.core; +rm -rf /var/cache/pkg; diff --git a/hardenedbsd/scripts/minimize.sh b/hardenedbsd/scripts/minimize.sh new file mode 100644 index 000000000..4b041948f --- /dev/null +++ b/hardenedbsd/scripts/minimize.sh @@ -0,0 +1,33 @@ +#!/bin/sh -eux + +case "$PACKER_BUILDER_TYPE" in + qemu) exit 0 ;; +esac + +major_version="`uname -r | awk -F. '{print $1}'`"; + +if [ "$major_version" -eq 10 ]; then + ZROOT="zroot" +else + ZROOT="zroot/ROOT/default" +fi + +COMPRESSION=$(zfs get -H compression $ZROOT | cut -f3); + +zfs set compression=off $ZROOT; +dd if=/dev/zero of=/EMPTY bs=1m & +PID=$!; + +avail=$(zfs get -pH avail $ZROOT | cut -f3); +while [ "$avail" -ne 0 ]; do + sleep 15; + avail=$(zfs get -pH avail $ZROOT | cut -f3); +done + +kill $PID || echo "dd already exited"; + +rm -f /EMPTY; +# Block until the empty file has been removed, otherwise, Packer +# will try to kill the box while the disk is still full and that's bad +sync; +zfs set compression=$COMPRESSION $ZROOT; diff --git a/hardenedbsd/scripts/postinstall.sh b/hardenedbsd/scripts/postinstall.sh new file mode 100644 index 000000000..8107039f6 --- /dev/null +++ b/hardenedbsd/scripts/postinstall.sh @@ -0,0 +1,24 @@ +#!/bin/sh -eux + +# Set the time correctly +ntpdate -v -b 0.freebsd.pool.ntp.org + +# Install curl and ca_root_nss +pkg install -y curl ca_root_nss; + +# Emulate the ETCSYMLINK behavior of ca_root_nss; this is for FreeBSD 10, +# where fetch(1) was massively refactored and doesn't come with +# SSL CAcerts anymore +ln -sf /usr/local/share/certs/ca-root-nss.crt /etc/ssl/cert.pem; + +# As sharedfolders are not in defaults ports tree, we will use NFS sharing +cat >>/etc/rc.conf << RC_CONF +rpcbind_enable="YES" +nfs_server_enable="YES" +mountd_flags="-r" +RC_CONF + +# Disable X11 because Vagrants VMs are (usually) headless +cat >>/etc/make.conf << MAKE_CONF +WITHOUT_X11="YES" +MAKE_CONF diff --git a/hardenedbsd/scripts/sudoers.sh b/hardenedbsd/scripts/sudoers.sh new file mode 100644 index 000000000..d8c2032b4 --- /dev/null +++ b/hardenedbsd/scripts/sudoers.sh @@ -0,0 +1,4 @@ +#!/bin/sh -eux + +pkg install -y sudo; +echo "vagrant ALL=(ALL) NOPASSWD: ALL" >>/usr/local/etc/sudoers; diff --git a/hardenedbsd/scripts/update.sh b/hardenedbsd/scripts/update.sh new file mode 100644 index 000000000..03b36df56 --- /dev/null +++ b/hardenedbsd/scripts/update.sh @@ -0,0 +1,15 @@ +#!/bin/sh -eux + +# Unset these as if they're empty +[ -z "$no_proxy" ] && unset no_proxy +[ -z "$http_proxy" ] && unset http_proxy +[ -z "$https_proxy" ] && unset https_proxy + +hbsd_update="/usr/sbin/hbsd-update"; + +# Update HardenedBSD +# NOTE: the install action fails if there are no updates so || true it +env PAGER=/bin/cat $hbsd_update fetch || true; +env PAGER=/bin/cat $hbsd_update install || true; + +env ASSUME_ALWAYS_YES=true pkg update; diff --git a/hardenedbsd/vagrantfile_templates/hardenedbsd.rb b/hardenedbsd/vagrantfile_templates/hardenedbsd.rb new file mode 100644 index 000000000..2c1bed2d5 --- /dev/null +++ b/hardenedbsd/vagrantfile_templates/hardenedbsd.rb @@ -0,0 +1,15 @@ +Vagrant.require_version ">= 1.1.0" + +Vagrant.configure(2) do |config| + config.ssh.shell = "sh" + + # Disable the base shared folder, Guest Tools supporting this feature are + # unavailable for all providers. + config.vm.synced_folder ".", "/vagrant", disabled: true + + config.vm.provider :parallels do |prl, override| + # Guest Tools are unavailable. + prl.check_guest_tools = false + prl.functional_psf = false + end +end From 2ed30e28eb20e30a7f1f0f04942ebe813ddbf1f7 Mon Sep 17 00:00:00 2001 From: Kentaro Hayashi <kenhys@gmail.com> Date: Wed, 14 Mar 2018 22:44:42 +0900 Subject: [PATCH 0767/1622] Support Debian 9.4 ref. https://www.debian.org/News/2018/20180310 --- .../{debian-9.3-amd64.json => debian-9.4-amd64.json} | 12 ++++++------ .../{debian-9.3-i386.json => debian-9.4-i386.json} | 12 ++++++------ 2 files changed, 12 insertions(+), 12 deletions(-) rename debian/{debian-9.3-amd64.json => debian-9.4-amd64.json} (96%) rename debian/{debian-9.3-i386.json => debian-9.4-i386.json} (96%) diff --git a/debian/debian-9.3-amd64.json b/debian/debian-9.4-amd64.json similarity index 96% rename from debian/debian-9.3-amd64.json rename to debian/debian-9.4-amd64.json index 59d365702..743a7840e 100644 --- a/debian/debian-9.3-amd64.json +++ b/debian/debian-9.4-amd64.json @@ -217,7 +217,7 @@ } ], "variables": { - "box_basename": "debian-9.3", + "box_basename": "debian-9.4", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", "disk_size": "65536", @@ -225,16 +225,16 @@ "headless": "", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", - "iso_checksum": "83480be837710a76fd4e75a6573ca110e06f5a7589d2d3852bdb0f45749800b3", + "iso_checksum": "124d270006703f2111224dec3bf7a9d01450168be41d4834f88fdd035552b044", "iso_checksum_type": "sha256", - "iso_name": "debian-9.3.0-amd64-netinst.iso", + "iso_name": "debian-9.4.0-amd64-netinst.iso", "memory": "1024", "mirror": "http://cdimage.debian.org/cdimage/release", - "mirror_directory": "9.3.0/amd64/iso-cd", - "name": "debian-9.3", + "mirror_directory": "9.4.0/amd64/iso-cd", + "name": "debian-9.4", "no_proxy": "{{env `no_proxy`}}", "preseed_path": "debian-8/preseed.cfg", - "template": "debian-9.3-amd64", + "template": "debian-9.4-amd64", "version": "TIMESTAMP" } } diff --git a/debian/debian-9.3-i386.json b/debian/debian-9.4-i386.json similarity index 96% rename from debian/debian-9.3-i386.json rename to debian/debian-9.4-i386.json index 8e24aa832..ae5de564a 100644 --- a/debian/debian-9.3-i386.json +++ b/debian/debian-9.4-i386.json @@ -217,7 +217,7 @@ } ], "variables": { - "box_basename": "debian-9.3-i386", + "box_basename": "debian-9.4-i386", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", "disk_size": "65536", @@ -225,16 +225,16 @@ "headless": "", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", - "iso_checksum": "7a00a366465c9d75c0961a09a6f625859f594eb6afc18461ab6b3f11ca5930ad", + "iso_checksum": "f1da6c11c7e0ca4399a703e32c330261258bb4ba05f81d7a6f67402d182c8bf8", "iso_checksum_type": "sha256", - "iso_name": "debian-9.3.0-i386-netinst.iso", + "iso_name": "debian-9.4.0-i386-netinst.iso", "memory": "1024", "mirror": "http://cdimage.debian.org/cdimage/release", - "mirror_directory": "9.3.0/i386/iso-cd", - "name": "debian-9.3-i386", + "mirror_directory": "9.4.0/i386/iso-cd", + "name": "debian-9.4-i386", "no_proxy": "{{env `no_proxy`}}", "preseed_path": "debian-8/preseed.cfg", - "template": "debian-9.3-i386", + "template": "debian-9.4-i386", "version": "TIMESTAMP" } } From c4aa06cb4f25ae8c174487fd4427a4928e97aeb8 Mon Sep 17 00:00:00 2001 From: nusenu <nusenu-github@riseup.net> Date: Wed, 14 Mar 2018 23:26:23 +0000 Subject: [PATCH 0768/1622] HardenedBSD: fetch from a mirror directory that works in the future Previously we fetched the ISO from the LAST folder, which will not contain the current ISO file after the next release. --- hardenedbsd/hardenedbsd-11-amd64.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hardenedbsd/hardenedbsd-11-amd64.json b/hardenedbsd/hardenedbsd-11-amd64.json index 709c01a9c..1870b330d 100644 --- a/hardenedbsd/hardenedbsd-11-amd64.json +++ b/hardenedbsd/hardenedbsd-11-amd64.json @@ -218,7 +218,7 @@ "iso_name": "HardenedBSD-11-STABLE-v1100055-amd64-disc1.iso", "memory": "1024", "mirror": "https://installer.hardenedbsd.org", - "mirror_directory": "hardened_11_stable_master-LAST", + "mirror_directory": "pub/HardenedBSD/releases/amd64/amd64/ISO-IMAGES/hardenedbsd-11-stable-20180307-1", "no_proxy": "{{env `no_proxy`}}", "template": "hardenedbsd-11-amd64", "version": "TIMESTAMP" From 2cc6acf7a8dec03d70e66de4c8de41dd52e50354 Mon Sep 17 00:00:00 2001 From: Seth Thomas <sthomas@chef.io> Date: Mon, 19 Mar 2018 20:17:35 -0400 Subject: [PATCH 0769/1622] Don't upload ISO for VMware and cleanup any ISOs Signed-off-by: Seth Thomas <sthomas@chef.io> --- freebsd/freebsd-10.3-amd64.json | 1 - freebsd/freebsd-10.3-i386.json | 1 - freebsd/freebsd-10.4-amd64.json | 1 - freebsd/freebsd-10.4-i386.json | 1 - freebsd/freebsd-11.1-amd64.json | 1 - freebsd/freebsd-11.1-i386.json | 1 - freebsd/scripts/cleanup.sh | 1 + 7 files changed, 1 insertion(+), 6 deletions(-) diff --git a/freebsd/freebsd-10.3-amd64.json b/freebsd/freebsd-10.3-amd64.json index b8591ae47..0076eedfc 100644 --- a/freebsd/freebsd-10.3-amd64.json +++ b/freebsd/freebsd-10.3-amd64.json @@ -72,7 +72,6 @@ "ssh_port": 22, "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", - "tools_upload_flavor": "freebsd", "type": "vmware-iso", "vm_name": "{{ user `template` }}", "vmx_data": { diff --git a/freebsd/freebsd-10.3-i386.json b/freebsd/freebsd-10.3-i386.json index 815000170..337e3bdb7 100644 --- a/freebsd/freebsd-10.3-i386.json +++ b/freebsd/freebsd-10.3-i386.json @@ -72,7 +72,6 @@ "ssh_port": 22, "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", - "tools_upload_flavor": "freebsd", "type": "vmware-iso", "vm_name": "{{ user `template` }}", "vmx_data": { diff --git a/freebsd/freebsd-10.4-amd64.json b/freebsd/freebsd-10.4-amd64.json index 56583671b..f4f524362 100644 --- a/freebsd/freebsd-10.4-amd64.json +++ b/freebsd/freebsd-10.4-amd64.json @@ -72,7 +72,6 @@ "ssh_port": 22, "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", - "tools_upload_flavor": "freebsd", "type": "vmware-iso", "vm_name": "{{ user `template` }}", "vmx_data": { diff --git a/freebsd/freebsd-10.4-i386.json b/freebsd/freebsd-10.4-i386.json index 98477b81a..be8e60f16 100644 --- a/freebsd/freebsd-10.4-i386.json +++ b/freebsd/freebsd-10.4-i386.json @@ -72,7 +72,6 @@ "ssh_port": 22, "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", - "tools_upload_flavor": "freebsd", "type": "vmware-iso", "vm_name": "{{ user `template` }}", "vmx_data": { diff --git a/freebsd/freebsd-11.1-amd64.json b/freebsd/freebsd-11.1-amd64.json index 814053389..c365e0907 100644 --- a/freebsd/freebsd-11.1-amd64.json +++ b/freebsd/freebsd-11.1-amd64.json @@ -72,7 +72,6 @@ "ssh_port": 22, "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", - "tools_upload_flavor": "freebsd", "type": "vmware-iso", "vm_name": "{{ user `template` }}", "vmx_data": { diff --git a/freebsd/freebsd-11.1-i386.json b/freebsd/freebsd-11.1-i386.json index 8c5174b74..0b78967e5 100644 --- a/freebsd/freebsd-11.1-i386.json +++ b/freebsd/freebsd-11.1-i386.json @@ -72,7 +72,6 @@ "ssh_port": 22, "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", - "tools_upload_flavor": "freebsd", "type": "vmware-iso", "vm_name": "{{ user `template` }}", "vmx_data": { diff --git a/freebsd/scripts/cleanup.sh b/freebsd/scripts/cleanup.sh index 81d2016c6..701bd8bab 100644 --- a/freebsd/scripts/cleanup.sh +++ b/freebsd/scripts/cleanup.sh @@ -9,3 +9,4 @@ rm -rf /boot/kernel.old; rm -f /boot/kernel*/*.symbols; rm -f /*.core; rm -rf /var/cache/pkg; +rm -f /usr/home/vagrant/*.iso; From f3da3e1898bf6d18235d320085d93ad486080861 Mon Sep 17 00:00:00 2001 From: Li-Wen Hsu <lwhsu@lwhsu.org> Date: Tue, 20 Mar 2018 14:39:09 +0800 Subject: [PATCH 0770/1622] Add FreeBSD i386 to builds --- builds.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/builds.yml b/builds.yml index 2a88a15b7..56cab0d33 100644 --- a/builds.yml +++ b/builds.yml @@ -27,7 +27,9 @@ public: - 'fedora-26' - 'opensuse-leap-42.3' - 'freebsd-11.1' +- 'freebsd-11.1-i386' - 'freebsd-10.4' +- 'freebsd-10.4-i386' - 'hardenedbsd-11' slugs: From 0751e0e071b4e720a84cded67ff513f13e904525 Mon Sep 17 00:00:00 2001 From: Seth Thomas <sthomas@chef.io> Date: Tue, 20 Mar 2018 17:57:12 -0400 Subject: [PATCH 0771/1622] Simplify and cleanup issues with disabling Predicatable Interface Naming Signed-off-by: Seth Thomas <sthomas@chef.io> --- debian/scripts/networking.sh | 7 +++++++ ubuntu/scripts/networking.sh | 15 +++++++++------ 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/debian/scripts/networking.sh b/debian/scripts/networking.sh index 83e03a278..50d7a4369 100644 --- a/debian/scripts/networking.sh +++ b/debian/scripts/networking.sh @@ -14,5 +14,12 @@ if [ "$major_version" -le "8" ]; then rm -rf /dev/.udev/ /var/lib/dhcp/*; fi +if [ "$major_version" -ge "9" ]; then + # Disable Predictable Network Interface names and use eth0 + sed -i 's/en[[:alnum:]]*/eth0/g' /etc/network/interfaces; + sed -ie 's/GRUB_CMDLINE_LINUX="\(.*\)"/GRUB_CMDLINE_LINUX="net.ifnames=0 biosdevname=0 \1"/g' /etc/default/grub; + update-grub; +fi + # Adding a 2 sec delay to the interface up, to make the dhclient happy echo "pre-up sleep 2" >> /etc/network/interfaces diff --git a/ubuntu/scripts/networking.sh b/ubuntu/scripts/networking.sh index 4293923fb..ca1d41a0c 100644 --- a/ubuntu/scripts/networking.sh +++ b/ubuntu/scripts/networking.sh @@ -1,5 +1,7 @@ #!/bin/sh -eux + ubuntu_version="`lsb_release -r | awk '{print $2}'`"; +major_version="`echo $ubuntu_version | awk -F. '{print $1}'`"; if [ "$ubuntu_version" = '17.10' ]; then echo "Create netplan config for eth0" @@ -11,12 +13,13 @@ network: dhcp4: true EOF else - # Set up eth0 for pre-17.10 - echo "auto eth0\niface eth0 inet dhcp" >> /etc/network/interfaces.d/eth0.cfg # Adding a 2 sec delay to the interface up, to make the dhclient happy - echo "pre-up sleep 2" >>/etc/network/interfaces; + echo "pre-up sleep 2" >> /etc/network/interfaces; fi -# Seriously though eth0 -sed -ie 's/GRUB_CMDLINE_LINUX="\(.*\)"/GRUB_CMDLINE_LINUX="net.ifnames=0 biosdevname=0 \1"/g' /etc/default/grub -update-grub +if [ "$major_version" -ge "16" ]; then + # Disable Predictable Network Interface names and use eth0 + sed -i 's/en[[:alnum:]]*/eth0/g' /etc/network/interfaces; + sed -ie 's/GRUB_CMDLINE_LINUX="\(.*\)"/GRUB_CMDLINE_LINUX="net.ifnames=0 biosdevname=0 \1"/g' /etc/default/grub; + update-grub; +fi From c7822add3d07753be4d8d48ca54bc373f4224aad Mon Sep 17 00:00:00 2001 From: Seth Thomas <sthomas@chef.io> Date: Thu, 22 Mar 2018 19:48:09 -0400 Subject: [PATCH 0772/1622] Fix #942 - nuke unattended-upgrades from orbit Signed-off-by: Seth Thomas <sthomas@chef.io> --- debian/scripts/update.sh | 32 ++++++++++++++++++++++---------- ubuntu/scripts/update.sh | 29 ++++++++++++++++++++--------- 2 files changed, 42 insertions(+), 19 deletions(-) diff --git a/debian/scripts/update.sh b/debian/scripts/update.sh index 8aa08ed73..7b3a533e1 100644 --- a/debian/scripts/update.sh +++ b/debian/scripts/update.sh @@ -1,18 +1,30 @@ #!/bin/sh -eux arch="`uname -r | sed 's/^.*[0-9]\{1,\}\.[0-9]\{1,\}\.[0-9]\{1,\}\(-[0-9]\{1,2\}\)-//'`" +debian_version="`lsb_release -r | awk '{print $2}'`"; +major_version="`echo $debian_version | awk -F. '{print $1}'`"; apt-get update; -apt-get -y upgrade linux-image-$arch; -apt-get -y install linux-headers-`uname -r`; +# Disable systemd apt timers/services +if [ "$major_version" -ge "9" ]; then + systemctl stop apt-daily.timer; + systemctl stop apt-daily-upgrade.timer; + systemctl disable apt-daily.timer; + systemctl disable apt-daily-upgrade.timer; + systemctl mask apt-daily.service; + systemctl mask apt-daily-upgrade.service; + systemctl daemon-reload; +fi -if [ -d /etc/init ]; then - # update package index on boot - cat <<EOF >/etc/init/refresh-apt.conf; -description "update package index" -start on networking -task -exec /usr/bin/apt-get update +# Disable periodic activities of apt +cat <<EOF >/etc/apt/apt.conf.d/10periodic; +APT::Periodic::Enable "0"; +APT::Periodic::Update-Package-Lists "0"; +APT::Periodic::Download-Upgradeable-Packages "0"; +APT::Periodic::AutocleanInterval "0"; +APT::Periodic::Unattended-Upgrade "0"; EOF -fi + +apt-get -y upgrade linux-image-$arch; +apt-get -y install linux-headers-`uname -r`; diff --git a/ubuntu/scripts/update.sh b/ubuntu/scripts/update.sh index 9e872b68c..07c1a89bc 100644 --- a/ubuntu/scripts/update.sh +++ b/ubuntu/scripts/update.sh @@ -10,18 +10,29 @@ sed -i.bak 's/^Prompt=.*$/Prompt=never/' /etc/update-manager/release-upgrades; # Update the package list apt-get -y update; -# update package index on boot -cat <<EOF >/etc/init/refresh-apt.conf; -description "update package index" -start on networking -task -exec /usr/bin/apt-get update -EOF +# Disable systemd apt timers/services +if [ "$major_version" -ge "16" ]; then + systemctl stop apt-daily.timer; + systemctl stop apt-daily-upgrade.timer; + systemctl disable apt-daily.timer; + systemctl disable apt-daily-upgrade.timer; + systemctl mask apt-daily.service; + systemctl mask apt-daily-upgrade.service; + systemctl daemon-reload; +fi -# Disable periodic activities of apt -cat <<EOF >/etc/apt/apt.conf.d/10disable-periodic; +# Disable periodic activities of apt to be safe +cat <<EOF >/etc/apt/apt.conf.d/10periodic; APT::Periodic::Enable "0"; +APT::Periodic::Update-Package-Lists "0"; +APT::Periodic::Download-Upgradeable-Packages "0"; +APT::Periodic::AutocleanInterval "0"; +APT::Periodic::Unattended-Upgrade "0"; EOF +# Clean and nuke the package from orbit +rm -rf /var/log/unattended-upgrades; +apt-get -y purge unattended-upgrades; + # Upgrade all installed packages incl. kernel and kernel headers apt-get -y dist-upgrade -o Dpkg::Options::="--force-confnew"; From a3d923c05cc1d7977d008a2db163edf2b823f672 Mon Sep 17 00:00:00 2001 From: Seth Thomas <sthomas@chef.io> Date: Fri, 23 Mar 2018 16:21:42 -0400 Subject: [PATCH 0773/1622] Fix #985 - Disable snapshots Signed-off-by: Seth Thomas <sthomas@chef.io> --- opensuse/http/autoinst.xml | 2 ++ opensuse/opensuse-leap-42.3-x86_64.json | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/opensuse/http/autoinst.xml b/opensuse/http/autoinst.xml index 961e206fe..3dbc20272 100644 --- a/opensuse/http/autoinst.xml +++ b/opensuse/http/autoinst.xml @@ -42,6 +42,7 @@ </timezone> <partitioning config:type="list"> <drive> + <enable_snapshots config:type="boolean">false</enable_snapshots> <initialize config:type="boolean">true</initialize> <partitions config:type="list"> <partition> @@ -155,6 +156,7 @@ <package>telnet</package> <package>virtualbox-guest-kmp-default</package> <package>virtualbox-guest-tools</package> + <package>snapper-zypp-plugin</package> </remove-packages> </software> <services-manager> diff --git a/opensuse/opensuse-leap-42.3-x86_64.json b/opensuse/opensuse-leap-42.3-x86_64.json index e9c953901..3ff644de7 100644 --- a/opensuse/opensuse-leap-42.3-x86_64.json +++ b/opensuse/opensuse-leap-42.3-x86_64.json @@ -191,7 +191,7 @@ "box_basename": "opensuse-leap-42.3", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", - "disk_size": "20480", + "disk_size": "65536", "git_revision": "__unknown_git_revision__", "headless": "", "http_proxy": "{{env `http_proxy`}}", From b4c6a3b89d2067a93983f81f4af46414f9ddb40f Mon Sep 17 00:00:00 2001 From: Seth Thomas <sthomas@chef.io> Date: Sat, 24 Mar 2018 09:25:42 -0400 Subject: [PATCH 0774/1622] Add ubuntu 18.04 support Signed-off-by: Seth Thomas <sthomas@chef.io> --- ubuntu/scripts/hyperv.sh | 2 +- ubuntu/scripts/networking.sh | 2 +- ubuntu/ubuntu-18.04-amd64.json | 314 +++++++++++++++++++++++++++++++++ 3 files changed, 316 insertions(+), 2 deletions(-) create mode 100644 ubuntu/ubuntu-18.04-amd64.json diff --git a/ubuntu/scripts/hyperv.sh b/ubuntu/scripts/hyperv.sh index 76e5a38a2..43d149d00 100755 --- a/ubuntu/scripts/hyperv.sh +++ b/ubuntu/scripts/hyperv.sh @@ -8,7 +8,7 @@ hyperv-iso) apt-get install -y hv-kvp-daemon-init linux-tools-virtual-lts-xenial linux-cloud-tools-virtual-lts-xenial; elif [ "$major_version" -eq "16" ]; then apt-get install -y linux-tools-virtual-lts-xenial linux-cloud-tools-virtual-lts-xenial; - elif [ "$major_version" -eq "17" ]; then + elif [ "$major_version" -ge "17" ]; then apt-get -y install linux-image-virtual linux-tools-virtual linux-cloud-tools-virtual; fi esac diff --git a/ubuntu/scripts/networking.sh b/ubuntu/scripts/networking.sh index ca1d41a0c..58515d4ec 100644 --- a/ubuntu/scripts/networking.sh +++ b/ubuntu/scripts/networking.sh @@ -3,7 +3,7 @@ ubuntu_version="`lsb_release -r | awk '{print $2}'`"; major_version="`echo $ubuntu_version | awk -F. '{print $1}'`"; -if [ "$ubuntu_version" = '17.10' ]; then +if [ "$ubuntu_version" = '17.10' ] || [ "$major_version" -ge "18" ]; then echo "Create netplan config for eth0" cat <<EOF >/etc/netplan/01-netcfg.yaml; network: diff --git a/ubuntu/ubuntu-18.04-amd64.json b/ubuntu/ubuntu-18.04-amd64.json new file mode 100644 index 000000000..171e9e8df --- /dev/null +++ b/ubuntu/ubuntu-18.04-amd64.json @@ -0,0 +1,314 @@ +{ + "builders": [ + { + "boot_command": [ + "<esc><wait>", + "<esc><wait>", + "<enter><wait>", + "/install/vmlinuz<wait>", + " auto<wait>", + " console-setup/ask_detect=false<wait>", + " console-setup/layoutcode=us<wait>", + " console-setup/modelcode=pc105<wait>", + " debconf/frontend=noninteractive<wait>", + " debian-installer=en_US<wait>", + " fb=false<wait>", + " initrd=/install/initrd.gz<wait>", + " kbd-chooser/method=us<wait>", + " keyboard-configuration/layout=USA<wait>", + " keyboard-configuration/variant=USA<wait>", + " locale=en_US<wait>", + " netcfg/get_domain=vm<wait>", + " netcfg/get_hostname=vagrant<wait>", + " grub-installer/bootdev=/dev/sda<wait>", + " noapic<wait>", + " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}}<wait>", + " -- <wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": "{{user `disk_size`}}", + "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "guest_os_type": "Ubuntu_64", + "hard_drive_interface": "sata", + "headless": "{{ user `headless` }}", + "http_directory": "http", + "iso_checksum_url": "{{user `mirror`}}/{{user `mirror_directory`}}/SHA256SUMS", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "../builds/packer-{{user `template`}}-virtualbox", + "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "virtualbox-iso", + "vboxmanage": [ + [ + "modifyvm", + "{{.Name}}", + "--memory", + "{{ user `memory` }}" + ], + [ + "modifyvm", + "{{.Name}}", + "--cpus", + "{{ user `cpus` }}" + ] + ], + "virtualbox_version_file": ".vbox_version", + "vm_name": "{{ user `template` }}" + }, + { + "boot_command": [ + "<esc><wait>", + "<esc><wait>", + "<enter><wait>", + "/install/vmlinuz<wait>", + " auto<wait>", + " console-setup/ask_detect=false<wait>", + " console-setup/layoutcode=us<wait>", + " console-setup/modelcode=pc105<wait>", + " debconf/frontend=noninteractive<wait>", + " debian-installer=en_US<wait>", + " fb=false<wait>", + " initrd=/install/initrd.gz<wait>", + " kbd-chooser/method=us<wait>", + " keyboard-configuration/layout=USA<wait>", + " keyboard-configuration/variant=USA<wait>", + " locale=en_US<wait>", + " netcfg/get_domain=vm<wait>", + " netcfg/get_hostname=vagrant<wait>", + " grub-installer/bootdev=/dev/sda<wait>", + " noapic<wait>", + " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}}<wait>", + " -- <wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": "{{user `disk_size`}}", + "guest_os_type": "ubuntu-64", + "headless": "{{ user `headless` }}", + "http_directory": "http", + "iso_checksum_url": "{{user `mirror`}}/{{user `mirror_directory`}}/SHA256SUMS", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "../builds/packer-{{user `template`}}-vmware", + "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "tools_upload_flavor": "linux", + "type": "vmware-iso", + "vm_name": "{{ user `template` }}", + "vmx_data": { + "cpuid.coresPerSocket": "1", + "ethernet0.pciSlotNumber": "32", + "memsize": "{{ user `memory` }}", + "numvcpus": "{{ user `cpus` }}" + }, + "vmx_remove_ethernet_interfaces": true + }, + { + "boot_command": [ + "<esc><wait>", + "<esc><wait>", + "<enter><wait>", + "/install/vmlinuz<wait>", + " auto<wait>", + " console-setup/ask_detect=false<wait>", + " console-setup/layoutcode=us<wait>", + " console-setup/modelcode=pc105<wait>", + " debconf/frontend=noninteractive<wait>", + " debian-installer=en_US<wait>", + " fb=false<wait>", + " initrd=/install/initrd.gz<wait>", + " kbd-chooser/method=us<wait>", + " keyboard-configuration/layout=USA<wait>", + " keyboard-configuration/variant=USA<wait>", + " locale=en_US<wait>", + " netcfg/get_domain=vm<wait>", + " netcfg/get_hostname=vagrant<wait>", + " grub-installer/bootdev=/dev/sda<wait>", + " noapic<wait>", + " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}}<wait>", + " -- <wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": "{{user `disk_size`}}", + "guest_os_type": "ubuntu", + "http_directory": "http", + "iso_checksum_url": "{{user `mirror`}}/{{user `mirror_directory`}}/SHA256SUMS", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "../builds/packer-{{user `template`}}-parallels", + "parallels_tools_flavor": "lin", + "prlctl": [ + [ + "set", + "{{.Name}}", + "--memsize", + "{{ user `memory` }}" + ], + [ + "set", + "{{.Name}}", + "--cpus", + "{{ user `cpus` }}" + ] + ], + "prlctl_version_file": ".prlctl_version", + "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "parallels-iso", + "vm_name": "{{ user `template` }}" + }, + { + "boot_command": [ + "<esc><wait>", + "<esc><wait>", + "<enter><wait>", + "/install/vmlinuz<wait>", + " auto<wait>", + " console-setup/ask_detect=false<wait>", + " console-setup/layoutcode=us<wait>", + " console-setup/modelcode=pc105<wait>", + " debconf/frontend=noninteractive<wait>", + " debian-installer=en_US<wait>", + " fb=false<wait>", + " initrd=/install/initrd.gz<wait>", + " kbd-chooser/method=us<wait>", + " keyboard-configuration/layout=USA<wait>", + " keyboard-configuration/variant=USA<wait>", + " locale=en_US<wait>", + " netcfg/get_domain=vm<wait>", + " netcfg/get_hostname=vagrant<wait>", + " grub-installer/bootdev=/dev/vda<wait>", + " noapic<wait>", + " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}}<wait>", + " -- <wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": "{{user `disk_size`}}", + "headless": "{{ user `headless` }}", + "http_directory": "http", + "iso_checksum_url": "{{user `mirror`}}/{{user `mirror_directory`}}/SHA256SUMS", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "../builds/packer-{{user `template`}}-qemu", + "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "qemu", + "vm_name": "{{ user `template` }}", + "qemuargs": [ + [ + "-m", + "{{ user `memory` }}M" + ], + [ + "-smp", + "{{ user `cpus` }}" + ] + ] + }, + { + "boot_command": [ + "<esc><wait10><esc><esc><enter><wait>", + "set gfxpayload=1024x768<enter>", + "linux /install/vmlinuz ", + "preseed/url=http://{{.HTTPIP}}:{{.HTTPPort}}/preseed-hyperv.cfg ", + "debian-installer=en_US auto locale=en_US kbd-chooser/method=us ", + "hostname={{.Name}} ", + "fb=false debconf/frontend=noninteractive ", + "keyboard-configuration/modelcode=SKIP keyboard-configuration/layout=USA ", + "keyboard-configuration/variant=USA console-setup/ask_detect=false <enter>", + "initrd /install/initrd.gz<enter>", + "boot<enter>" + ], + "boot_wait": "10s", + "communicator": "ssh", + "cpu": "{{ user `cpus` }}", + "disk_size": "{{user `disk_size`}}", + "enable_secure_boot": false, + "generation": "{{user `hyperv_generation`}}", + "http_directory": "http", + "iso_checksum_url": "{{user `mirror`}}/{{user `mirror_directory`}}/SHA256SUMS", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "../builds/packer-{{user `template`}}-hyperv", + "ram_size": "{{user `memory`}}", + "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_timeout": "10000s", + "ssh_username": "vagrant", + "switch_name": "{{user `hyperv_switch`}}", + "type": "hyperv-iso", + "vm_name": "{{ user `template` }}" + } + ], + "post-processors": [ + { + "output": "../builds/{{user `box_basename`}}.{{.Provider}}.box", + "type": "vagrant" + } + ], + "provisioners": [ + { + "environment_vars": [ + "HOME_DIR=/home/vagrant", + "http_proxy={{user `http_proxy`}}", + "https_proxy={{user `https_proxy`}}", + "no_proxy={{user `no_proxy`}}" + ], + "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", + "expect_disconnect": true, + "scripts": [ + "scripts/update.sh", + "../_common/sshd.sh", + "scripts/networking.sh", + "scripts/sudoers.sh", + "scripts/vagrant.sh", + "../_common/virtualbox.sh", + "scripts/vmware.sh", + "../_common/parallels.sh", + "scripts/hyperv.sh", + "scripts/cleanup.sh", + "../_common/minimize.sh" + ], + "type": "shell" + } + ], + "variables": { + "box_basename": "ubuntu-18.04", + "build_timestamp": "{{isotime \"20060102150405\"}}", + "cpus": "1", + "disk_size": "65536", + "git_revision": "__unknown_git_revision__", + "headless": "", + "http_proxy": "{{env `http_proxy`}}", + "https_proxy": "{{env `https_proxy`}}", + "hyperv_generation": "2", + "hyperv_switch": "{{env `hyperv_switch`}}", + "iso_checksum_type": "sha256", + "iso_name": "bionic-server-amd64.iso", + "memory": "1024", + "mirror": "http://cdimage.ubuntu.com", + "mirror_directory": "ubuntu-server/daily/current", + "name": "ubuntu-18.04", + "no_proxy": "{{env `no_proxy`}}", + "preseed_path": "preseed.cfg", + "template": "ubuntu-18.04-amd64", + "version": "TIMESTAMP" + } +} From f0eb793e91b081167b82eddbe73c1724c0f2fcee Mon Sep 17 00:00:00 2001 From: Seth Thomas <sthomas@chef.io> Date: Sat, 24 Mar 2018 15:50:06 -0400 Subject: [PATCH 0775/1622] Add 18.04 to build list Signed-off-by: Seth Thomas <sthomas@chef.io> --- builds.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/builds.yml b/builds.yml index 56cab0d33..2352ff5ee 100644 --- a/builds.yml +++ b/builds.yml @@ -11,6 +11,7 @@ public: - 'oracle-7.4' - 'oracle-6.9' - 'oracle-6.9-i386' +- 'ubuntu-18.04' - 'ubuntu-17.10' - 'ubuntu-17.10-i386' - 'ubuntu-16.04' From 077dccd176afebdcde512d08d3d8ea05b2ad2f7e Mon Sep 17 00:00:00 2001 From: Seth Thomas <sthomas@chef.io> Date: Sat, 24 Mar 2018 15:52:58 -0400 Subject: [PATCH 0776/1622] Adding release_all action, clean before build Signed-off-by: Seth Thomas <sthomas@chef.io> --- Rakefile | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/Rakefile b/Rakefile index 20295f288..132f73fe2 100644 --- a/Rakefile +++ b/Rakefile @@ -6,6 +6,7 @@ task :do_all do check_env public_templates.each do |template| if config['public'].include?(box_name(template)) + Rake::Task[:clean].execute sh build_cmd(template) sh "bento test" unless ENV["BENTO_AUTO_RELEASE"].nil? @@ -16,8 +17,15 @@ task :do_all do end end +task :release_all do + config['public'].each do |template| + sh "bento release #{template} #{ENV["BENTO_VERSION"]}" + end +end + desc "clean" task :clean do + puts "Removing .kitchen.yml and builds/*" FileUtils.rm_rf(['.kitchen.yml', Dir.glob('builds/*')]) end From 072404b31453b0772e868da3bcb749f50435d607 Mon Sep 17 00:00:00 2001 From: Seth Thomas <sthomas@chef.io> Date: Sat, 24 Mar 2018 16:05:43 -0400 Subject: [PATCH 0777/1622] Release 201803.24.0 Signed-off-by: Seth Thomas <sthomas@chef.io> --- CHANGELOG.md | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5f87735bb..a9c1333c4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,25 @@ # Change Log +## [201803.22.0](https://github.com/chef/bento/tree/201803.22.0) (2018-03-22) + +**New Platforms** +- Ubuntu 18.04 (pre-release) +- HardenedBSD 11 +- FreeBSD 10/11 32bit + +**Improvements** +- Ubuntu 16.04+ and Debian 9: fix issues with disabling predictable interface names +- Multiple platforms: cleanup errant *.iso files +- OpenSUSE Leap: disable Snappter/btrfs snapshots, increase disk size + +**Tooling** +- VirtualBox 5.2.6 (Note: we are not using 5.2.8) +- Parallels 13.3.0 +- VMware Fusion 10.1.1 +- Packer 1.2.1 +- Vagrant 2.0.3 +- Hyper-V 10.0.16299.15 + ## [201802.02.0](https://github.com/chef/bento/tree/201802.02.0) (2018-02-02) **Improvements** From b9418b12c1898740482ab80e9465d2977ce68260 Mon Sep 17 00:00:00 2001 From: Seth Thomas <sthomas@chef.io> Date: Sat, 24 Mar 2018 16:06:48 -0400 Subject: [PATCH 0778/1622] Escape * Signed-off-by: Seth Thomas <sthomas@chef.io> --- CHANGELOG.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a9c1333c4..331b49a9f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,6 @@ # Change Log -## [201803.22.0](https://github.com/chef/bento/tree/201803.22.0) (2018-03-22) +## [201803.24.0](https://github.com/chef/bento/tree/201803.24.0) (2018-03-24) **New Platforms** - Ubuntu 18.04 (pre-release) @@ -9,7 +9,8 @@ **Improvements** - Ubuntu 16.04+ and Debian 9: fix issues with disabling predictable interface names -- Multiple platforms: cleanup errant *.iso files +- Ubuntu/Debian: further mitigate apt locks at startup +- Multiple platforms: cleanup errant \*.iso files - OpenSUSE Leap: disable Snappter/btrfs snapshots, increase disk size **Tooling** From 1b32984646d0082ba82d965aa2872120ab139110 Mon Sep 17 00:00:00 2001 From: Seth Thomas <sthomas@chef.io> Date: Sat, 24 Mar 2018 23:39:14 -0400 Subject: [PATCH 0779/1622] Fixing ubuntu builds, update builds.yml Signed-off-by: Seth Thomas <sthomas@chef.io> --- builds.yml | 6 +++--- ubuntu/scripts/update.sh | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/builds.yml b/builds.yml index 2352ff5ee..06c428f21 100644 --- a/builds.yml +++ b/builds.yml @@ -18,8 +18,8 @@ public: - 'ubuntu-16.04-i386' - 'ubuntu-14.04' - 'ubuntu-14.04-i386' -- 'debian-9.3' -- 'debian-9.3-i386' +- 'debian-9.4' +- 'debian-9.4-i386' - 'debian-8.10' - 'debian-8.10-i386' - 'debian-7.11' @@ -36,7 +36,7 @@ public: slugs: 'centos-7': 'centos-7.4' 'centos-6': 'centos-6.9' - 'debian-9': 'debian-9.3' + 'debian-9': 'debian-9.4' 'debian-8': 'debian-8.10' 'debian-7': 'debian-7.11' 'freebsd-11': 'freebsd-11.1' diff --git a/ubuntu/scripts/update.sh b/ubuntu/scripts/update.sh index 07c1a89bc..81dd53065 100644 --- a/ubuntu/scripts/update.sh +++ b/ubuntu/scripts/update.sh @@ -2,7 +2,7 @@ export DEBIAN_FRONTEND=noninteractive ubuntu_version="`lsb_release -r | awk '{print $2}'`"; -ubuntu_major_version="`echo $ubuntu_version | awk -F. '{print $1}'`"; +major_version="`echo $ubuntu_version | awk -F. '{print $1}'`"; # Disable release-upgrades sed -i.bak 's/^Prompt=.*$/Prompt=never/' /etc/update-manager/release-upgrades; From df5cab9f3b265b4c26fe8667aeadde03aabe05eb Mon Sep 17 00:00:00 2001 From: Markos Chandras <mchandras@suse.de> Date: Mon, 26 Mar 2018 09:51:26 +0100 Subject: [PATCH 0780/1622] opensuse: Create a new 'vagrant' group for vagrant user openSUSE does not create a group with the same name as the user and this breaks some assumptions that user files are owned by 'vagrant:vagrant'. As such, lets create such a group and put the vagrant user in it. --- opensuse/opensuse-leap-42.3-x86_64.json | 1 + opensuse/scripts/vagrant_group.sh | 7 +++++++ 2 files changed, 8 insertions(+) create mode 100644 opensuse/scripts/vagrant_group.sh diff --git a/opensuse/opensuse-leap-42.3-x86_64.json b/opensuse/opensuse-leap-42.3-x86_64.json index 3ff644de7..9e59e1c12 100644 --- a/opensuse/opensuse-leap-42.3-x86_64.json +++ b/opensuse/opensuse-leap-42.3-x86_64.json @@ -176,6 +176,7 @@ "../_common/virtualbox.sh", "../_common/vmware.sh", "../_common/parallels.sh", + "scripts/vagrant_group.sh", "scripts/sudoers.sh", "scripts/zypper-locks.sh", "scripts/remove-dvd-source.sh", diff --git a/opensuse/scripts/vagrant_group.sh b/opensuse/scripts/vagrant_group.sh new file mode 100644 index 000000000..ad82963f8 --- /dev/null +++ b/opensuse/scripts/vagrant_group.sh @@ -0,0 +1,7 @@ +#!/bin/sh -eux + +# User 'vagrant' belogs to the 'users' group by default so we need to +# create a new group 'vagrant' and put our user there. + +groupadd -f vagrant +gpasswd -a vagrant vagrant From 62e8118d473c24766948a472c323089fec03313a Mon Sep 17 00:00:00 2001 From: Superdawg <andy@e-walsh.net> Date: Thu, 12 Apr 2018 11:10:25 -0400 Subject: [PATCH 0781/1622] Clean up network configs When using a box generated from the fedora-27.json, the network.service fails to restart cleanly because there are leftover network configuration files for non-existent devices. This update removes anything that is non-loopback related. --- fedora/scripts/cleanup.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/fedora/scripts/cleanup.sh b/fedora/scripts/cleanup.sh index 2fc55f970..95b7320f5 100644 --- a/fedora/scripts/cleanup.sh +++ b/fedora/scripts/cleanup.sh @@ -12,3 +12,6 @@ rm -f /tmp/chef*rpm # delete any logs that have built up during the install find /var/log/ -name *.log -exec rm -f {} \; + +# Remove any non-loopback network configs +find /etc/sysconfig/network-scripts -name "ifcfg-*" -not -name "ifcfg-lo" -exec rm -f {} \; From d80b5f5c185254e55f32faf9be960512624defe7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bernd=20M=C3=BCller?= <mueller@b1-systems.de> Date: Sun, 29 Apr 2018 14:15:30 +0200 Subject: [PATCH 0782/1622] fedora, centos, rhel: added deltarpm to kickstart files --- centos/http/7/ks.cfg | 1 + fedora/http/ks.cfg | 1 + 2 files changed, 2 insertions(+) diff --git a/centos/http/7/ks.cfg b/centos/http/7/ks.cfg index c826c681a..2b32f982d 100644 --- a/centos/http/7/ks.cfg +++ b/centos/http/7/ks.cfg @@ -33,6 +33,7 @@ wget nfs-utils net-tools bzip2 +deltarpm -fprintd-pam -intltool diff --git a/fedora/http/ks.cfg b/fedora/http/ks.cfg index 41c8557e8..40221d5a1 100644 --- a/fedora/http/ks.cfg +++ b/fedora/http/ks.cfg @@ -28,6 +28,7 @@ tar wget nfs-utils net-tools +deltarpm -linux-firmware -plymouth -plymouth-core-libs From e03b8a0c32e50c8dbb6724b20ff0364ee60d2d1f Mon Sep 17 00:00:00 2001 From: nusenu <nusenu-github@riseup.net> Date: Sat, 5 May 2018 16:09:51 +0000 Subject: [PATCH 0783/1622] Update HardenedBSD to v1100055.2 --- hardenedbsd/hardenedbsd-11-amd64.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/hardenedbsd/hardenedbsd-11-amd64.json b/hardenedbsd/hardenedbsd-11-amd64.json index 1870b330d..1d426b33d 100644 --- a/hardenedbsd/hardenedbsd-11-amd64.json +++ b/hardenedbsd/hardenedbsd-11-amd64.json @@ -213,12 +213,12 @@ "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", "install_path": "hardenedbsd-11/installerconfig", - "iso_checksum": "6ffb4b87868e91e557e8971e068c5a22a764fc676c004c80b9cb781c3973c7b0", + "iso_checksum": "c720ebf3989397a6703fa11f36679a277c2cc2eb5637dac9e404adf005bd6b9b", "iso_checksum_type": "sha256", - "iso_name": "HardenedBSD-11-STABLE-v1100055-amd64-disc1.iso", + "iso_name": "HardenedBSD-11-STABLE-v1100055.2-amd64-disc1.iso", "memory": "1024", "mirror": "https://installer.hardenedbsd.org", - "mirror_directory": "pub/HardenedBSD/releases/amd64/amd64/ISO-IMAGES/hardenedbsd-11-stable-20180307-1", + "mirror_directory": "pub/HardenedBSD/releases/amd64/amd64/ISO-IMAGES/hardenedbsd-11-stable-20180420-1", "no_proxy": "{{env `no_proxy`}}", "template": "hardenedbsd-11-amd64", "version": "TIMESTAMP" From 0eb3906027fa4140643d15feba35d00fb26e58e5 Mon Sep 17 00:00:00 2001 From: Felix Krull <f_krull@gmx.de> Date: Sun, 6 May 2018 17:51:30 +0200 Subject: [PATCH 0784/1622] Add Fedora 28 config --- fedora/fedora-28-x86_64.json | 180 +++++++++++++++++++++++++++++++++++ 1 file changed, 180 insertions(+) create mode 100644 fedora/fedora-28-x86_64.json diff --git a/fedora/fedora-28-x86_64.json b/fedora/fedora-28-x86_64.json new file mode 100644 index 000000000..e8a81b11c --- /dev/null +++ b/fedora/fedora-28-x86_64.json @@ -0,0 +1,180 @@ +{ + "builders": [ + { + "boot_command": [ + "<tab> linux ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": "{{user `disk_size`}}", + "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "guest_os_type": "Fedora_64", + "hard_drive_interface": "sata", + "headless": "{{ user `headless` }}", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "../builds/packer-{{user `template`}}-virtualbox", + "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "virtualbox-iso", + "vboxmanage": [ + [ + "modifyvm", + "{{.Name}}", + "--memory", + "{{ user `memory` }}" + ], + [ + "modifyvm", + "{{.Name}}", + "--cpus", + "{{ user `cpus` }}" + ] + ], + "virtualbox_version_file": ".vbox_version", + "vm_name": "{{ user `template` }}" + }, + { + "boot_command": [ + "<tab> linux ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": "{{user `disk_size`}}", + "guest_os_type": "fedora-64", + "headless": "{{ user `headless` }}", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "../builds/packer-{{user `template`}}-vmware", + "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "tools_upload_flavor": "linux", + "type": "vmware-iso", + "vm_name": "{{ user `template` }}", + "vmx_data": { + "cpuid.coresPerSocket": "1", + "ethernet0.pciSlotNumber": "32", + "memsize": "{{ user `memory` }}", + "numvcpus": "{{ user `cpus` }}" + }, + "vmx_remove_ethernet_interfaces": true + }, + { + "boot_command": [ + "<tab> linux ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": "{{user `disk_size`}}", + "guest_os_type": "fedora-core", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "../builds/packer-{{user `template`}}-parallels", + "parallels_tools_flavor": "lin", + "prlctl": [ + [ + "set", + "{{.Name}}", + "--memsize", + "{{ user `memory` }}" + ], + [ + "set", + "{{.Name}}", + "--cpus", + "{{ user `cpus` }}" + ] + ], + "prlctl_version_file": ".prlctl_version", + "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "parallels-iso", + "vm_name": "{{ user `template` }}" + }, + { + "boot_command": [ + "<tab> linux ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": "{{user `disk_size`}}", + "headless": "{{ user `headless` }}", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "../builds/packer-{{user `template`}}-qemu", + "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "qemu", + "vm_name": "{{ user `template` }}" + } + ], + "post-processors": [ + { + "output": "../builds/{{user `box_basename`}}.{{.Provider}}.box", + "type": "vagrant" + } + ], + "provisioners": [ + { + "environment_vars": [ + "HOME_DIR=/home/vagrant", + "http_proxy={{user `http_proxy`}}", + "https_proxy={{user `https_proxy`}}", + "no_proxy={{user `no_proxy`}}" + ], + "execute_command": "echo 'vagrant' | {{.Vars}} sudo -E -S bash '{{.Path}}'", + "expect_disconnect": true, + "scripts": [ + "scripts/swap.sh", + "scripts/fix-slow-dns.sh", + "scripts/build-tools.sh", + "../_common/sshd.sh", + "../_common/virtualbox.sh", + "../_common/vmware.sh", + "../_common/parallels.sh", + "../_common/vagrant.sh", + "scripts/cleanup.sh", + "../_common/minimize.sh" + ], + "type": "shell" + } + ], + "variables": { + "arch": "64", + "box_basename": "fedora-28", + "build_timestamp": "{{isotime \"20060102150405\"}}", + "cpus": "1", + "disk_size": "65536", + "git_revision": "__unknown_git_revision__", + "headless": "", + "http_proxy": "{{env `http_proxy`}}", + "https_proxy": "{{env `https_proxy`}}", + "iso_checksum": "8d59a25052e05758c15fe9daa3bc472b5619791b442e752450bba7f1eeca9c1a", + "iso_checksum_type": "sha256", + "iso_name": "Fedora-Server-dvd-x86_64-28-1.1.iso", + "ks_path": "ks.cfg", + "memory": "1024", + "mirror": "http://download.fedoraproject.org/pub/fedora/linux", + "mirror_directory": "releases/28/Server/x86_64/iso", + "name": "fedora-27", + "no_proxy": "{{env `no_proxy`}}", + "template": "fedora-28-x86_64", + "version": "TIMESTAMP" + } +} From 32dd06e9c742184e08e7d7934ad680f3728a36f1 Mon Sep 17 00:00:00 2001 From: Felix Krull <f_krull@gmx.de> Date: Sun, 6 May 2018 17:53:21 +0200 Subject: [PATCH 0785/1622] fedora: Install elfutils-libelf-devel This is needed to build Virtualbox guest additions now (and might have been for some time). --- fedora/scripts/build-tools.sh | 2 +- fedora/scripts/cleanup.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/fedora/scripts/build-tools.sh b/fedora/scripts/build-tools.sh index 1a128e981..10b5a09fc 100644 --- a/fedora/scripts/build-tools.sh +++ b/fedora/scripts/build-tools.sh @@ -1,3 +1,3 @@ #!/bin/bash -eux # Installing build tools here because Fedora 22+ will not do so during kickstart -dnf -y install kernel-headers-$(uname -r) kernel-devel-$(uname -r) gcc make perl +dnf -y install kernel-headers-$(uname -r) kernel-devel-$(uname -r) elfutils-libelf-devel gcc make perl diff --git a/fedora/scripts/cleanup.sh b/fedora/scripts/cleanup.sh index 95b7320f5..7067bcc74 100644 --- a/fedora/scripts/cleanup.sh +++ b/fedora/scripts/cleanup.sh @@ -1,6 +1,6 @@ #!/bin/bash -eux echo "Removing development packages and cleaning up DNF data" -dnf -y remove gcc cpp gc kernel-devel kernel-headers glibc-devel glibc-headers kernel-devel kernel-headers make perl +dnf -y remove gcc cpp gc kernel-devel kernel-headers glibc-devel elfutils-libelf-devel glibc-headers kernel-devel kernel-headers make perl dnf -y autoremove dnf -y clean all --enablerepo=\* From 5f4b0bcfb9c3c28edf28769a62d1f21fc018d05b Mon Sep 17 00:00:00 2001 From: Felix Krull <f_krull@gmx.de> Date: Sun, 6 May 2018 17:55:56 +0200 Subject: [PATCH 0786/1622] fedora28: Don't exclude linux-firmware Fedora 28 installation fails if it's not allowed to install linux-firmware. This is the only difference in the Kickstart files. --- fedora/fedora-28-x86_64.json | 2 +- fedora/http/ks-fedora28.cfg | 45 ++++++++++++++++++++++++++++++++++++ 2 files changed, 46 insertions(+), 1 deletion(-) create mode 100644 fedora/http/ks-fedora28.cfg diff --git a/fedora/fedora-28-x86_64.json b/fedora/fedora-28-x86_64.json index e8a81b11c..4a67fc8d9 100644 --- a/fedora/fedora-28-x86_64.json +++ b/fedora/fedora-28-x86_64.json @@ -168,7 +168,7 @@ "iso_checksum": "8d59a25052e05758c15fe9daa3bc472b5619791b442e752450bba7f1eeca9c1a", "iso_checksum_type": "sha256", "iso_name": "Fedora-Server-dvd-x86_64-28-1.1.iso", - "ks_path": "ks.cfg", + "ks_path": "ks-fedora28.cfg", "memory": "1024", "mirror": "http://download.fedoraproject.org/pub/fedora/linux", "mirror_directory": "releases/28/Server/x86_64/iso", diff --git a/fedora/http/ks-fedora28.cfg b/fedora/http/ks-fedora28.cfg new file mode 100644 index 000000000..7a57bc581 --- /dev/null +++ b/fedora/http/ks-fedora28.cfg @@ -0,0 +1,45 @@ +install +cdrom +lang en_US.UTF-8 +keyboard us +network --bootproto=dhcp +rootpw vagrant +firewall --disabled +authconfig --enableshadow --passalgo=sha512 +selinux --permissive +timezone UTC +bootloader --location=mbr +text +skipx +zerombr +clearpart --all --initlabel +part / --fstype=ext4 --ondisk=sda --grow --label=root +firstboot --disabled +reboot +user --name=vagrant --plaintext --password vagrant + +%packages --ignoremissing --excludedocs +bzip2 +# GCC won't install during kickstart +# gcc +kernel-devel +kernel-headers +tar +wget +nfs-utils +net-tools +-plymouth +-plymouth-core-libs +-fedora-release-notes +-mcelog +-smartmontools +-usbutils +-man-pages +%end + +%post +# sudo +echo 'Defaults:vagrant !requiretty' > /etc/sudoers.d/vagrant +echo '%vagrant ALL=(ALL) NOPASSWD: ALL' >> /etc/sudoers.d/vagrant +chmod 440 /etc/sudoers.d/vagrant +%end From 6ae37abacc242c9945ce37d9a8ee00c54bc54cc5 Mon Sep 17 00:00:00 2001 From: github foam <lequestionis@gmail.com> Date: Tue, 8 May 2018 10:06:52 +0300 Subject: [PATCH 0787/1622] Scientific Linux packer built vagrant box https://www.scientificlinux.org/ --- scientificlinux/SL-7-x86_64.json | 93 +++++++++++++++++++++++++++ scientificlinux/http/7/ks.cfg | 92 ++++++++++++++++++++++++++ scientificlinux/scripts/cleanup.sh | 59 +++++++++++++++++ scientificlinux/scripts/networking.sh | 19 ++++++ scientificlinux/scripts/update.sh | 5 ++ 5 files changed, 268 insertions(+) create mode 100644 scientificlinux/SL-7-x86_64.json create mode 100644 scientificlinux/http/7/ks.cfg create mode 100644 scientificlinux/scripts/cleanup.sh create mode 100644 scientificlinux/scripts/networking.sh create mode 100644 scientificlinux/scripts/update.sh diff --git a/scientificlinux/SL-7-x86_64.json b/scientificlinux/SL-7-x86_64.json new file mode 100644 index 000000000..a5083dab3 --- /dev/null +++ b/scientificlinux/SL-7-x86_64.json @@ -0,0 +1,93 @@ +{ + "builders": [ + { + "boot_command": [ + "<up><wait><tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": "{{user `disk_size`}}", + "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "guest_os_type": "RedHat_64", + "hard_drive_interface": "sata", + "headless": "{{ user `headless` }}", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "../builds/packer-{{user `template`}}-virtualbox", + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "virtualbox-iso", + "vboxmanage": [ + [ + "modifyvm", + "{{.Name}}", + "--memory", + "{{ user `memory` }}" + ], + [ + "modifyvm", + "{{.Name}}", + "--cpus", + "{{ user `cpus` }}" + ] + ], + "virtualbox_version_file": ".vbox_version", + "vm_name": "{{ user `template` }}" + } + ], + "post-processors": [ + { + "output": "../builds/{{user `box_basename`}}.{{.Provider}}.box", + "type": "vagrant" + } + ], + "provisioners": [ + { + "environment_vars": [ + "HOME_DIR=/home/vagrant", + "http_proxy={{user `http_proxy`}}", + "https_proxy={{user `https_proxy`}}", + "no_proxy={{user `no_proxy`}}" + ], + "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", + "expect_disconnect": true, + "scripts": [ + "scripts/update.sh", + "../_common/sshd.sh", + "scripts/networking.sh", + "../_common/vagrant.sh", + "../_common/virtualbox.sh", + "scripts/cleanup.sh", + "../_common/minimize.sh" + ], + "type": "shell" + } + ], + "variables": { + "box_basename": "SL-7.3", + "build_timestamp": "{{isotime \"20080506150405\"}}", + "cpus": "1", + "disk_size": "65536", + "git_revision": "__unknown_git_revision__", + "headless": "", + "http_proxy": "{{env `http_proxy`}}", + "https_proxy": "{{env `https_proxy`}}", + "hyperv_generation": "1", + "hyperv_switch": "{{env `hyperv_switch`}}", + "iso_checksum": "ef3dd1b2a45c81b682a42d39ed3088e8649f836c32900331935f7a26e6ee316a", + "iso_checksum_type": "sha256", + "iso_name": "SL-7-DVD-x86_64.iso", + "ks_path": "7/ks.cfg", + "memory": "1024", + "mirror": "http://mirrors.up.pt/pub/scientific/", + "mirror_directory": "7.3/x86_64/iso", + "name": "SL-7.3", + "no_proxy": "{{env `no_proxy`}}", + "template": "SL-7-x86_64", + "version": "TIMESTAMP" + } +} diff --git a/scientificlinux/http/7/ks.cfg b/scientificlinux/http/7/ks.cfg new file mode 100644 index 000000000..1caa16a9c --- /dev/null +++ b/scientificlinux/http/7/ks.cfg @@ -0,0 +1,92 @@ +install +cdrom +lang en_US.UTF-8 +keyboard us +network --bootproto=dhcp --onboot=on --device=eth0 +rootpw vagrant +firewall --disabled +selinux --permissive +timezone UTC +unsupported_hardware +bootloader --location=mbr +text +skipx +zerombr +clearpart --all --initlabel +autopart +auth --enableshadow --passalgo=sha512 --kickstart +firstboot --disabled +reboot --eject +user --name=vagrant --plaintext --password vagrant + +%packages --nobase --ignoremissing --excludedocs +# vagrant needs this to copy initial files via scp +openssh-clients +sudo +kernel-headers +kernel-devel +gcc +make +perl +selinux-policy-devel +wget +nfs-utils +net-tools +bzip2 +-fprintd-pam +-intltool + +# unnecessary firmware +-aic94xx-firmware +-atmel-firmware +-b43-openfwwf +-bfa-firmware +-ipw2100-firmware +-ipw2200-firmware +-ivtv-firmware +-iwl100-firmware +-iwl105-firmware +-iwl135-firmware +-iwl1000-firmware +-iwl2000-firmware +-iwl2030-firmware +-iwl3160-firmware +-iwl3945-firmware +-iwl4965-firmware +-iwl5000-firmware +-iwl5150-firmware +-iwl6000-firmware +-iwl6000g2a-firmware +-iwl6000g2b-firmware +-iwl6050-firmware +-iwl7260-firmware +-iwl7265-firmware +-libertas-usb8388-firmware +-libertas-sd8686-firmware +-libertas-sd8787-firmware +-ql2100-firmware +-ql2200-firmware +-ql23xx-firmware +-ql2400-firmware +-ql2500-firmware +-rt61pci-firmware +-rt73usb-firmware +-xorg-x11-drv-ati-firmware +-zd1211-firmware +-alsa-tools-firmware +-alsa-firmware +-kernel-firmware +%end + +%post +# sudo +echo "%vagrant ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers.d/vagrant + +#Enable hyper-v daemons only if using hyper-v virtualization +if [ $(virt-what) == "hyperv" ]; then + yum -y install hyperv-daemons cifs-utils + systemctl enable hypervvssd + systemctl enable hypervkvpd +fi + +%end diff --git a/scientificlinux/scripts/cleanup.sh b/scientificlinux/scripts/cleanup.sh new file mode 100644 index 000000000..f4db8a1c4 --- /dev/null +++ b/scientificlinux/scripts/cleanup.sh @@ -0,0 +1,59 @@ +#!/bin/sh -eux + +# should output one of 'redhat' 'centos' 'oraclelinux' +distro="`rpm -qf --queryformat '%{NAME}' /etc/redhat-release | cut -f 1 -d '-'`" + +# Remove development and kernel source packages +yum -y remove gcc cpp kernel-devel kernel-headers; + +if [ "$distro" != 'redhat' ]; then + yum -y clean all; +fi + +# Clean up network interface persistence +rm -f /etc/udev/rules.d/70-persistent-net.rules; +mkdir -p /etc/udev/rules.d/70-persistent-net.rules; +rm -f /lib/udev/rules.d/75-persistent-net-generator.rules; +rm -rf /dev/.udev/; + +for ndev in `ls -1 /etc/sysconfig/network-scripts/ifcfg-*`; do + if [ "`basename $ndev`" != "ifcfg-lo" ]; then + sed -i '/^HWADDR/d' "$ndev"; + sed -i '/^UUID/d' "$ndev"; + fi +done + +# new-style network device naming for centos7 +if grep -q -i "release 7" /etc/redhat-release ; then + # radio off & remove all interface configration + nmcli radio all off + /bin/systemctl stop NetworkManager.service + for ifcfg in `ls /etc/sysconfig/network-scripts/ifcfg-* |grep -v ifcfg-lo` ; do + rm -f $ifcfg + done + rm -rf /var/lib/NetworkManager/* + + echo "==> Setup /etc/rc.d/rc.local for CentOS7" + cat <<_EOF_ | cat >> /etc/rc.d/rc.local +#BENTO-BEGIN +LANG=C +# delete all connection +for con in \`nmcli -t -f uuid con\`; do + if [ "\$con" != "" ]; then + nmcli con del \$con + fi +done +# add gateway interface connection. +gwdev=\`nmcli dev | grep ethernet | egrep -v 'unmanaged' | head -n 1 | awk '{print \$1}'\` +if [ "\$gwdev" != "" ]; then + nmcli c add type eth ifname \$gwdev con-name \$gwdev +fi +sed -i "/^#BENTO-BEGIN/,/^#BENTO-END/d" /etc/rc.d/rc.local +chmod -x /etc/rc.d/rc.local +#BENTO-END +_EOF_ + chmod +x /etc/rc.d/rc.local +fi + +# delete any logs that have built up during the install +find /var/log/ -name *.log -exec rm -f {} \; diff --git a/scientificlinux/scripts/networking.sh b/scientificlinux/scripts/networking.sh new file mode 100644 index 000000000..e61cf3502 --- /dev/null +++ b/scientificlinux/scripts/networking.sh @@ -0,0 +1,19 @@ +#!/bin/sh -eux + +case "$PACKER_BUILDER_TYPE" in + +virtualbox-iso|virtualbox-ovf) + major_version="`sed 's/^.\+ release \([.0-9]\+\).*/\1/' /etc/redhat-release | awk -F. '{print $1}'`"; + + if [ "$major_version" -ge 6 ]; then + # Fix slow DNS: + # Add 'single-request-reopen' so it is included when /etc/resolv.conf is + # generated + # https://access.redhat.com/site/solutions/58625 (subscription required) + echo 'RES_OPTIONS="single-request-reopen"' >>/etc/sysconfig/network; + service network restart; + echo 'Slow DNS fix applied (single-request-reopen)'; + fi + ;; + +esac diff --git a/scientificlinux/scripts/update.sh b/scientificlinux/scripts/update.sh new file mode 100644 index 000000000..131d8cdb9 --- /dev/null +++ b/scientificlinux/scripts/update.sh @@ -0,0 +1,5 @@ +#!/bin/sh -eux + +yum -y update; +reboot; +sleep 60; From 6dadcdbd461c5e713cee71151f13f71896c1a76a Mon Sep 17 00:00:00 2001 From: Artem Sidorenko <artem@posteo.de> Date: Thu, 10 May 2018 10:30:49 +0200 Subject: [PATCH 0788/1622] CentOS 7.5 Signed-off-by: Artem Sidorenko <artem@posteo.de> --- ...centos-7.4-x86_64.json => centos-7.5-x86_64.json} | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) rename centos/{centos-7.4-x86_64.json => centos-7.5-x86_64.json} (96%) diff --git a/centos/centos-7.4-x86_64.json b/centos/centos-7.5-x86_64.json similarity index 96% rename from centos/centos-7.4-x86_64.json rename to centos/centos-7.5-x86_64.json index ae84cefcf..af5df4880 100644 --- a/centos/centos-7.4-x86_64.json +++ b/centos/centos-7.5-x86_64.json @@ -181,7 +181,7 @@ } ], "variables": { - "box_basename": "centos-7.4", + "box_basename": "centos-7.5", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", "disk_size": "65536", @@ -191,16 +191,16 @@ "https_proxy": "{{env `https_proxy`}}", "hyperv_generation": "1", "hyperv_switch": "{{env `hyperv_switch`}}", - "iso_checksum": "ec7500d4b006702af6af023b1f8f1b890b6c7ee54400bb98cef968b883cd6546", + "iso_checksum": "506e4e06abf778c3435b4e5745df13e79ebfc86565d7ea1e128067ef6b5a6345", "iso_checksum_type": "sha256", - "iso_name": "CentOS-7-x86_64-DVD-1708.iso", + "iso_name": "CentOS-7-x86_64-DVD-1804.iso", "ks_path": "7/ks.cfg", "memory": "1024", "mirror": "http://mirrors.kernel.org/centos", - "mirror_directory": "7.4.1708/isos/x86_64", - "name": "centos-7.4", + "mirror_directory": "7.5.1804/isos/x86_64", + "name": "centos-7.5", "no_proxy": "{{env `no_proxy`}}", - "template": "centos-7.4-x86_64", + "template": "centos-7.5-x86_64", "version": "TIMESTAMP" } } From 225a5c5b0106b0cddf3932cdf0ce95d1ed27c5ca Mon Sep 17 00:00:00 2001 From: Seth Thomas <sthomas@chef.io> Date: Tue, 15 May 2018 15:56:00 -0700 Subject: [PATCH 0789/1622] Update builds.yml for CentOS 7.5 Signed-off-by: Seth Thomas <sthomas@chef.io> --- builds.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/builds.yml b/builds.yml index 06c428f21..797d1af68 100644 --- a/builds.yml +++ b/builds.yml @@ -5,7 +5,7 @@ providers: - vmware-iso public: -- 'centos-7.4' +- 'centos-7.5' - 'centos-6.9' - 'centos-6.9-i386' - 'oracle-7.4' @@ -34,7 +34,7 @@ public: - 'hardenedbsd-11' slugs: - 'centos-7': 'centos-7.4' + 'centos-7': 'centos-7.5' 'centos-6': 'centos-6.9' 'debian-9': 'debian-9.4' 'debian-8': 'debian-8.10' From c62d3f1c9a8c2af302e3a0db3867461187a58fe9 Mon Sep 17 00:00:00 2001 From: Seth Thomas <sthomas@chef.io> Date: Tue, 15 May 2018 19:49:40 -0700 Subject: [PATCH 0790/1622] Use release url for 18.04 Signed-off-by: Seth Thomas <sthomas@chef.io> --- ubuntu/ubuntu-18.04-amd64.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ubuntu/ubuntu-18.04-amd64.json b/ubuntu/ubuntu-18.04-amd64.json index 171e9e8df..5a234d705 100644 --- a/ubuntu/ubuntu-18.04-amd64.json +++ b/ubuntu/ubuntu-18.04-amd64.json @@ -301,10 +301,10 @@ "hyperv_generation": "2", "hyperv_switch": "{{env `hyperv_switch`}}", "iso_checksum_type": "sha256", - "iso_name": "bionic-server-amd64.iso", + "iso_name": "ubuntu-18.04-server-amd64.iso", "memory": "1024", "mirror": "http://cdimage.ubuntu.com", - "mirror_directory": "ubuntu-server/daily/current", + "mirror_directory": "ubuntu/releases/18.04/release", "name": "ubuntu-18.04", "no_proxy": "{{env `no_proxy`}}", "preseed_path": "preseed.cfg", From 55cc1ffbb286f8189ec4cd51d1ff14b71959a751 Mon Sep 17 00:00:00 2001 From: Seth Thomas <sthomas@chef.io> Date: Wed, 16 May 2018 14:31:17 -0700 Subject: [PATCH 0791/1622] Fix Fedora 28 name and add to builds Signed-off-by: Seth Thomas <sthomas@chef.io> --- builds.yml | 1 + fedora/fedora-28-x86_64.json | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/builds.yml b/builds.yml index 797d1af68..8ad242f7d 100644 --- a/builds.yml +++ b/builds.yml @@ -24,6 +24,7 @@ public: - 'debian-8.10-i386' - 'debian-7.11' - 'debian-7.11-i386' +- 'fedora-28' - 'fedora-27' - 'fedora-26' - 'opensuse-leap-42.3' diff --git a/fedora/fedora-28-x86_64.json b/fedora/fedora-28-x86_64.json index 4a67fc8d9..2f22c7d91 100644 --- a/fedora/fedora-28-x86_64.json +++ b/fedora/fedora-28-x86_64.json @@ -172,7 +172,7 @@ "memory": "1024", "mirror": "http://download.fedoraproject.org/pub/fedora/linux", "mirror_directory": "releases/28/Server/x86_64/iso", - "name": "fedora-27", + "name": "fedora-28", "no_proxy": "{{env `no_proxy`}}", "template": "fedora-28-x86_64", "version": "TIMESTAMP" From 095b980a8285418a0985d274758602de4894d9be Mon Sep 17 00:00:00 2001 From: Seth Thomas <sthomas@chef.io> Date: Wed, 16 May 2018 17:04:49 -0700 Subject: [PATCH 0792/1622] Update for Oracle Linux 7.5 Signed-off-by: Seth Thomas <sthomas@chef.io> --- ...oracle-7.4-x86_64.json => oracle-7.5-x86_64.json} | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) rename oraclelinux/{oracle-7.4-x86_64.json => oracle-7.5-x86_64.json} (95%) diff --git a/oraclelinux/oracle-7.4-x86_64.json b/oraclelinux/oracle-7.5-x86_64.json similarity index 95% rename from oraclelinux/oracle-7.4-x86_64.json rename to oraclelinux/oracle-7.5-x86_64.json index 4911cd4e8..9ff4e022d 100644 --- a/oraclelinux/oracle-7.4-x86_64.json +++ b/oraclelinux/oracle-7.5-x86_64.json @@ -155,7 +155,7 @@ ], "variables": { "arch": "64", - "box_basename": "oracle-7.4", + "box_basename": "oracle-7.5", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", "disk_size": "65536", @@ -163,16 +163,16 @@ "headless": "", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", - "iso_checksum": "f2e11a2fceba8e285490c8df7c2172336cc23eb4bab95924b98d1029dce7eb0b", + "iso_checksum": "d0cc4493db10c2a49084f872083ed9ed6a09cc065064c009734712b9ef357886", "iso_checksum_type": "sha256", - "iso_name": "OracleLinux-R7-U4-Server-x86_64-dvd.iso", + "iso_name": "OracleLinux-R7-U5-Server-x86_64-dvd.iso", "ks_path": "7/ks.cfg", "memory": "1024", "mirror": "http://mirrors.dotsrc.org/oracle-linux", - "mirror_directory": "OL7/u4/x86_64", - "name": "oracle-7.4", + "mirror_directory": "OL7/u5/x86_64", + "name": "oracle-7.5", "no_proxy": "{{env `no_proxy`}}", - "template": "oracle-7.4-x86_64", + "template": "oracle-7.5-x86_64", "version": "TIMESTAMP" } } From 04fcd11750a150b79b35a56cfa20bd045d1a033c Mon Sep 17 00:00:00 2001 From: Seth Thomas <sthomas@chef.io> Date: Wed, 16 May 2018 17:06:20 -0700 Subject: [PATCH 0793/1622] Update builds for Oracle Linux 7.5 Signed-off-by: Seth Thomas <sthomas@chef.io> --- builds.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/builds.yml b/builds.yml index 8ad242f7d..f8b5b115c 100644 --- a/builds.yml +++ b/builds.yml @@ -8,7 +8,7 @@ public: - 'centos-7.5' - 'centos-6.9' - 'centos-6.9-i386' -- 'oracle-7.4' +- 'oracle-7.5' - 'oracle-6.9' - 'oracle-6.9-i386' - 'ubuntu-18.04' From eb23e12cb19c4904786d8311e5f360ba8c7ec05b Mon Sep 17 00:00:00 2001 From: Martin Gruner <martin.gruner@otrs.com> Date: Fri, 18 May 2018 10:29:39 +0200 Subject: [PATCH 0794/1622] Fix Fedora cleanup script not to cause unintended software removal. We install additional software during the build process, such as Perl modules. Removing Perl at cleanup causes an unintended removal of those packages, therefore I changed cleanup.sh to not remove "make" and "perl". This is in line with other cleanup scripts like that from centos. --- fedora/scripts/cleanup.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fedora/scripts/cleanup.sh b/fedora/scripts/cleanup.sh index 7067bcc74..ab741486c 100644 --- a/fedora/scripts/cleanup.sh +++ b/fedora/scripts/cleanup.sh @@ -1,6 +1,6 @@ #!/bin/bash -eux echo "Removing development packages and cleaning up DNF data" -dnf -y remove gcc cpp gc kernel-devel kernel-headers glibc-devel elfutils-libelf-devel glibc-headers kernel-devel kernel-headers make perl +dnf -y remove gcc cpp gc kernel-devel kernel-headers glibc-devel elfutils-libelf-devel glibc-headers kernel-devel kernel-headers dnf -y autoremove dnf -y clean all --enablerepo=\* From 8d7711709d452c7f9dc2cc4bca6f05fec834d6e7 Mon Sep 17 00:00:00 2001 From: ceetav <ceetav@gmail.com> Date: Thu, 24 May 2018 00:13:49 +0300 Subject: [PATCH 0795/1622] centos, rhel, oracle: remove previous kernels to minimize image size `yum update` keeps several kernel versions installed at the same time (installonly_limit). Removing previous kernels drops the image size by about 50 megs. --- centos/scripts/cleanup.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/centos/scripts/cleanup.sh b/centos/scripts/cleanup.sh index f4db8a1c4..d1f960de1 100644 --- a/centos/scripts/cleanup.sh +++ b/centos/scripts/cleanup.sh @@ -57,3 +57,7 @@ fi # delete any logs that have built up during the install find /var/log/ -name *.log -exec rm -f {} \; + +# remove previous kernels that yum preserved for rollback +yum install -y yum-utils +package-cleanup --oldkernels --count=1 -y From 9b2588bec31134977267fb0d66135dfd4ec94547 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith@chef.io> Date: Fri, 1 Jun 2018 12:43:02 -0700 Subject: [PATCH 0796/1622] Initial dump of windows templates from mwrock's work This has been hacked up a bit from Matt's initial work. I'm going to continue to hack it up to meet our needs Signed-off-by: Tim Smith <tsmith@chef.io> --- windows/2008r2.json | 48 ++++ windows/2012r2.json | 51 ++++ windows/2016.json | 96 +++++++ windows/7.json | 41 +++ windows/answer_files/2008_r2/Autounattend.xml | 162 ++++++++++++ windows/answer_files/2012_r2/Autounattend.xml | 246 ++++++++++++++++++ windows/answer_files/2016/Autounattend.xml | 155 +++++++++++ windows/answer_files/win7/Autounattend.xml | 129 +++++++++ windows/answer_files/win7/postunattend.xml | 53 ++++ windows/cookbooks/packer-templates/Berksfile | 3 + .../cookbooks/packer-templates/metadata.rb | 9 + .../packer-templates/recipes/add_pagefile.rb | 4 + .../recipes/add_postunattend.rb | 18 ++ .../recipes/add_setup_complete.rb | 21 ++ .../packer-templates/recipes/clean_sxs.rb | 4 + .../packer-templates/recipes/default.rb | 88 +++++++ .../recipes/delete_pagefile.rb | 7 + .../recipes/enable_file_sharing.rb | 13 + .../recipes/install_ps_modules.rb | 11 + .../packer-templates/recipes/psgallery.rb | 3 + .../recipes/remote_desktop.rb | 12 + .../packer-templates/recipes/remove_dirs.rb | 20 ++ .../set_local_account_token_filter_policy.rb | 7 + .../recipes/uninstall_powershell_ise.rb | 5 + .../recipes/vbox_guest_additions.rb | 12 + .../templates/packer_shutdown.bat.erb | 5 + .../templates/postunattend.xml.erb | 49 ++++ windows/scripts/after-reboot.ps1 | 22 ++ windows/scripts/cleanup.ps1 | 38 +++ windows/scripts/oracle.cer | Bin 0 -> 1419 bytes windows/vagrantfile-windows.template | 24 ++ 31 files changed, 1356 insertions(+) create mode 100644 windows/2008r2.json create mode 100644 windows/2012r2.json create mode 100644 windows/2016.json create mode 100644 windows/7.json create mode 100644 windows/answer_files/2008_r2/Autounattend.xml create mode 100644 windows/answer_files/2012_r2/Autounattend.xml create mode 100644 windows/answer_files/2016/Autounattend.xml create mode 100644 windows/answer_files/win7/Autounattend.xml create mode 100644 windows/answer_files/win7/postunattend.xml create mode 100644 windows/cookbooks/packer-templates/Berksfile create mode 100644 windows/cookbooks/packer-templates/metadata.rb create mode 100644 windows/cookbooks/packer-templates/recipes/add_pagefile.rb create mode 100644 windows/cookbooks/packer-templates/recipes/add_postunattend.rb create mode 100644 windows/cookbooks/packer-templates/recipes/add_setup_complete.rb create mode 100644 windows/cookbooks/packer-templates/recipes/clean_sxs.rb create mode 100644 windows/cookbooks/packer-templates/recipes/default.rb create mode 100644 windows/cookbooks/packer-templates/recipes/delete_pagefile.rb create mode 100644 windows/cookbooks/packer-templates/recipes/enable_file_sharing.rb create mode 100644 windows/cookbooks/packer-templates/recipes/install_ps_modules.rb create mode 100644 windows/cookbooks/packer-templates/recipes/psgallery.rb create mode 100644 windows/cookbooks/packer-templates/recipes/remote_desktop.rb create mode 100644 windows/cookbooks/packer-templates/recipes/remove_dirs.rb create mode 100644 windows/cookbooks/packer-templates/recipes/set_local_account_token_filter_policy.rb create mode 100644 windows/cookbooks/packer-templates/recipes/uninstall_powershell_ise.rb create mode 100644 windows/cookbooks/packer-templates/recipes/vbox_guest_additions.rb create mode 100644 windows/cookbooks/packer-templates/templates/packer_shutdown.bat.erb create mode 100644 windows/cookbooks/packer-templates/templates/postunattend.xml.erb create mode 100644 windows/scripts/after-reboot.ps1 create mode 100644 windows/scripts/cleanup.ps1 create mode 100644 windows/scripts/oracle.cer create mode 100644 windows/vagrantfile-windows.template diff --git a/windows/2008r2.json b/windows/2008r2.json new file mode 100644 index 000000000..69bfcfb89 --- /dev/null +++ b/windows/2008r2.json @@ -0,0 +1,48 @@ +{ + "builders": [{ + "type": "virtualbox-iso", + "vboxmanage": [ + ["modifyvm", "{{.Name}}", "--memory", "2048"], + ["modifyvm", "{{.Name}}", "--vram", "48"], + ["modifyvm", "{{.Name}}", "--cpus", "2"] + ], + "guest_additions_mode": "{{ user `guest_additions_mode` }}", + "guest_additions_path": "C:/users/vagrant/VBoxGuestAdditions.iso", + "guest_os_type": "Windows2008_64", + "headless": "{{ user `headless` }}", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_checksum_type": "sha1", + "communicator": "winrm", + "winrm_username": "vagrant", + "winrm_password": "vagrant", + "winrm_timeout": "12h", + "shutdown_command": "a:/PackerShutdown.bat", + "shutdown_timeout": "15m", + "floppy_files": [ + "answer_files/2008_r2{{user `core`}}/Autounattend.xml", + "scripts/package.ps1", + "scripts/winrm.cmd", + "scripts/SetupComplete.cmd", + ] + }], + "provisioners": [{ + "type": "powershell", + "script": "scripts/provision.ps1" + }], + "post-processors": [ + [{ + "type": "vagrant", + "keep_input_artifact": true, + "output": "windows2008r2-{{.Provider}}.box", + "vagrantfile_template": "vagrantfile-windows.template" + }] + ], + "variables": { + "core": "", + "guest_additions_mode": "attach", + "headless": "false", + "iso_checksum": "beed231a34e90e1dd9a04b3afabec31d62ce3889", + "iso_url": "http://download.microsoft.com/download/7/5/E/75EC4E54-5B02-42D6-8879-D8D3A25FBEF7/7601.17514.101119-1850_x64fre_server_eval_en-us-GRMSXEVAL_EN_DVD.iso" + } +} diff --git a/windows/2012r2.json b/windows/2012r2.json new file mode 100644 index 000000000..d12f40971 --- /dev/null +++ b/windows/2012r2.json @@ -0,0 +1,51 @@ +{ + "builders": [{ + "type": "virtualbox-iso", + "vboxmanage": [ + ["modifyvm", "{{.Name}}", "--memory", "2048"], + ["modifyvm", "{{.Name}}", "--vram", "48"], + ["modifyvm", "{{.Name}}", "--cpus", "2"] + ], + "guest_additions_mode": "{{ user `guest_additions_mode` }}", + "guest_additions_path": "C:/users/vagrant/VBoxGuestAdditions.iso", + "guest_os_type": "Windows2012_64", + "headless": "{{ user `headless` }}", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_checksum_type": "sha1", + "communicator": "winrm", + "winrm_username": "vagrant", + "winrm_password": "vagrant", + "winrm_timeout": "12h", + "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"", + "shutdown_timeout": "15m", + "floppy_files": [ + "answer_files/2012_r2/Autounattend.xml" + ] + }], + "provisioners": [{ + "type": "chef-solo", + "cookbook_paths": ["cookbooks"], + "guest_os_type": "windows", + "run_list": [ + "packer-templates::install_ps_modules", + "packer-templates::vbox_guest_additions", + "packer-templates::uninstall_powershell_ise", + "packer-templates::delete_pagefile" + ] + }], + "post-processors": [ + [{ + "type": "vagrant", + "keep_input_artifact": true, + "output": "windows2012r2-{{.Provider}}.box", + "vagrantfile_template": "vagrantfile-windows.template" + }] + ], + "variables": { + "guest_additions_mode": "attach", + "headless": "false", + "iso_checksum": "849734f37346385dac2c101e4aacba4626bb141c", + "iso_url": "http://care.dlservice.microsoft.com/dl/download/6/2/A/62A76ABB-9990-4EFC-A4FE-C7D698DAEB96/9600.17050.WINBLUE_REFRESH.140317-1640_X64FRE_SERVER_EVAL_EN-US-IR3_SSS_X64FREE_EN-US_DV9.ISO" + } +} diff --git a/windows/2016.json b/windows/2016.json new file mode 100644 index 000000000..4dd76a338 --- /dev/null +++ b/windows/2016.json @@ -0,0 +1,96 @@ +{ + "builders": [ + { + "type": "virtualbox-iso", + "vboxmanage": [ + [ "modifyvm", "{{.Name}}", "--memory", "2048" ], + [ "modifyvm", "{{.Name}}", "--vram", "48" ], + [ "modifyvm", "{{.Name}}", "--cpus", "2" ] + ], + "guest_additions_mode": "{{ user `guest_additions_mode` }}", + "guest_os_type": "Windows2016_64", + "headless": "{{ user `headless` }}", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_checksum_type": "md5", + "communicator": "winrm", + "winrm_username": "vagrant", + "winrm_password": "vagrant", + "winrm_timeout": "12h", + "shutdown_command": "C:/Windows/Panther/Unattend/packer_shutdown.bat", + "shutdown_timeout": "15m", + "floppy_files": [ + "answer_files/2016/Autounattend.xml", + "scripts/winrm.cmd" + ] + } + ], + "provisioners": [ + { + "type": "chef-solo", + "cookbook_paths": ["cookbooks", "vendor/cookbooks"], + "guest_os_type": "windows", + "run_list": [ + "packer-templates::install_ps_modules", + "packer-templates::vbox_guest_additions", + "packer-templates::uninstall_powershell_ise", + "packer-templates::delete_pagefile" + ] + }, + { + "type": "powershell", + "script": "scripts/windows-updates.ps1", + "elevated_user": "vagrant", + "elevated_password": "vagrant" + }, + { + "type": "windows-restart", + "restart_timeout": "15m" + }, + { + "type": "powershell", + "script": "scripts/after-reboot.ps1", + "elevated_user": "vagrant", + "elevated_password": "vagrant" + }, + { + "type": "chef-solo", + "remote_cookbook_paths": [ + "c:/windows/temp/packer-chef-solo/cookbooks-0", + "c:/windows/temp/packer-chef-solo/cookbooks-1" + ], + "guest_os_type": "windows", + "skip_install": "true", + "run_list": [ + "packer-templates::enable_file_sharing", + "packer-templates::remote_desktop", + "packer-templates::clean_sxs", + "packer-templates::add_postunattend", + "packer-templates::add_pagefile", + "packer-templates::set_local_account_token_filter_policy", + "packer-templates::remove_dirs", + "packer-templates::add_setup_complete" + ] + }, + { + "type": "powershell", + "script": "scripts/cleanup.ps1", + "elevated_user": "vagrant", + "elevated_password": "vagrant" + } + ], + "post-processors": [ + { + "type": "vagrant", + "keep_input_artifact": true, + "output": "windows2016min-{{.Provider}}.box", + "vagrantfile_template": "vagrantfile-windows.template" + } + ], + "variables": { + "guest_additions_mode": "attach", + "headless": "true", + "iso_checksum": "18a4f00a675b0338f3c7c93c4f131beb", + "iso_url": "http://care.dlservice.microsoft.com/dl/download/1/6/F/16FA20E6-4662-482A-920B-1A45CF5AAE3C/14393.0.160715-1616.RS1_RELEASE_SERVER_EVAL_X64FRE_EN-US.ISO" + } +} diff --git a/windows/7.json b/windows/7.json new file mode 100644 index 000000000..15a58f3e7 --- /dev/null +++ b/windows/7.json @@ -0,0 +1,41 @@ +{ + "builders": [{ + "type": "virtualbox-iso", + "vboxmanage": [ + [ "modifyvm", "{{.Name}}", "--memory", "5120" ], + [ "modifyvm", "{{.Name}}", "--vram", "36" ], + [ "modifyvm", "{{.Name}}", "--cpus", "2" ] + ], + "guest_os_type": "Windows7_64", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_checksum_type": "sha1", + "communicator": "winrm", + "headless": "{{ user `headless` }}", + "winrm_username": "vagrant", + "winrm_password": "vagrant", + "winrm_timeout": "24h", + "shutdown_command": "C:/windows/system32/sysprep/sysprep.exe /generalize /oobe /unattend:C:/Windows/Panther/Unattend/unattend.xml /quiet /shutdown", + "shutdown_timeout": "15m", + "floppy_files": [ + "answer_files/win7/Autounattend.xml", + "answer_files/win7/postunattend.xml", + "scripts/boxstarter.ps1", + "scripts/package.ps1", + "scripts/Test-Command.ps1" + ] + }], + "post-processors": [ + { + "type": "vagrant", + "keep_input_artifact": true, + "output": "windows7-{{.Provider}}.box", + "vagrantfile_template": "vagrantfile-windows.template" + } + ], + "variables": { + "headless": "false", + "iso_checksum": "36ae90defbad9d9539e649b193ae573b77a71c83", + "iso_url": "iso/en_windows_7_ultimate_with_sp1_x64_dvd_u_677332.iso" + } +} diff --git a/windows/answer_files/2008_r2/Autounattend.xml b/windows/answer_files/2008_r2/Autounattend.xml new file mode 100644 index 000000000..3ac7fe3ab --- /dev/null +++ b/windows/answer_files/2008_r2/Autounattend.xml @@ -0,0 +1,162 @@ +<?xml version="1.0" encoding="utf-8"?> +<unattend xmlns="urn:schemas-microsoft-com:unattend"> + <servicing/> + <settings pass="windowsPE"> + <component name="Microsoft-Windows-PnpCustomizationsWinPE" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <DriverPaths> + <PathAndCredentials wcm:keyValue="1" wcm:action="add"> + <Path>A:\</Path> + </PathAndCredentials> + </DriverPaths> + </component> + <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"> + <CreatePartitions> + <CreatePartition wcm:action="add"> + <Order>1</Order> + <Type>Primary</Type> + <Extend>true</Extend> + </CreatePartition> + </CreatePartitions> + <ModifyPartitions> + <ModifyPartition wcm:action="add"> + <Extend>false</Extend> + <Format>NTFS</Format> + <Letter>C</Letter> + <Order>1</Order> + <PartitionID>1</PartitionID> + <Label>Windows 2008R2</Label> + </ModifyPartition> + </ModifyPartitions> + <DiskID>0</DiskID> + <WillWipeDisk>true</WillWipeDisk> + </Disk> + <WillShowUI>OnError</WillShowUI> + </DiskConfiguration> + <UserData> + <AcceptEula>true</AcceptEula> + <FullName>Vagrant Administrator</FullName> + <Organization>Vagrant Inc.</Organization> + <!-- Product Key from http://technet.microsoft.com/en-us/library/jj612867.aspx --> + <ProductKey> + <!-- Do not uncomment the Key element if you are using trial ISOs --> + <!-- You must uncomment the Key element (and optionally insert your own key) if you are using retail or volume license ISOs --> + <!--<Key>YC6KT-GKW9T-YTKYR-T4X34-R7VHC</Key>--> + <WillShowUI>Never</WillShowUI> + </ProductKey> + </UserData> + <ImageInstall> + <OSImage> + <InstallTo> + <DiskID>0</DiskID> + <PartitionID>1</PartitionID> + </InstallTo> + <WillShowUI>OnError</WillShowUI> + <InstallToAvailablePartition>false</InstallToAvailablePartition> + <InstallFrom> + <MetaData wcm:action="add"> + <Key>/IMAGE/NAME</Key> + <Value>Windows Server 2008 R2 SERVERSTANDARD</Value> + </MetaData> + </InstallFrom> + </OSImage> + </ImageInstall> + </component> + <component xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" name="Microsoft-Windows-International-Core-WinPE" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> + <SetupUILanguage> + <UILanguage>en-US</UILanguage> + </SetupUILanguage> + <InputLocale>en-US</InputLocale> + <SystemLocale>en-US</SystemLocale> + <UILanguage>en-US</UILanguage> + <UILanguageFallback>en-US</UILanguageFallback> + <UserLocale>en-US</UserLocale> + </component> + </settings> + <settings pass="offlineServicing"> + <component name="Microsoft-Windows-LUA-Settings" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> + <EnableLUA>false</EnableLUA> + </component> + </settings> + <settings pass="oobeSystem"> + <component xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" name="Microsoft-Windows-Shell-Setup" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> + <UserAccounts> + <AdministratorPassword> + <Value>vagrant</Value> + <PlainText>true</PlainText> + </AdministratorPassword> + <LocalAccounts> + <LocalAccount wcm:action="add"> + <Password> + <Value>vagrant</Value> + <PlainText>true</PlainText> + </Password> + <Description>Vagrant User</Description> + <DisplayName>vagrant</DisplayName> + <Group>administrators</Group> + <Name>vagrant</Name> + </LocalAccount> + </LocalAccounts> + </UserAccounts> + <OOBE> + <HideEULAPage>true</HideEULAPage> + <HideWirelessSetupInOOBE>true</HideWirelessSetupInOOBE> + <NetworkLocation>Home</NetworkLocation> + </OOBE> + <AutoLogon> + <Password> + <Value>vagrant</Value> + <PlainText>true</PlainText> + </Password> + <Username>vagrant</Username> + <Enabled>true</Enabled> + </AutoLogon> + <FirstLogonCommands> + <SynchronousCommand wcm:action="add"> + <CommandLine>cmd.exe /c powershell -Command "Set-ExecutionPolicy -ExecutionPolicy RemoteSigned -Force"</CommandLine> + <Description>Set Execution Policy 64 Bit</Description> + <Order>1</Order> + <RequiresUserInput>true</RequiresUserInput> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <CommandLine>C:\Windows\SysWOW64\cmd.exe /c powershell -Command "Set-ExecutionPolicy -ExecutionPolicy RemoteSigned -Force"</CommandLine> + <Description>Set Execution Policy 32 Bit</Description> + <Order>2</Order> + <RequiresUserInput>true</RequiresUserInput> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <CommandLine>cmd.exe /c C:\Windows\System32\WindowsPowerShell\v1.0\powershell.exe -File a:\boxstarter.ps1</CommandLine> + <Order>3</Order> + </SynchronousCommand> + </FirstLogonCommands> + <ShowWindowsLive>false</ShowWindowsLive> + </component> + </settings> + <settings pass="specialize"> + <component name="Microsoft-Windows-Shell-Setup" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> + <OEMInformation> + <HelpCustomized>false</HelpCustomized> + </OEMInformation> + <!-- Rename computer here. --> + <ComputerName>vagrant-2008R2</ComputerName> + <TimeZone>Pacific Standard Time</TimeZone> + <RegisteredOwner/> + </component> + <component xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" name="Microsoft-Windows-ServerManager-SvrMgrNc" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> + <DoNotOpenServerManagerAtLogon>true</DoNotOpenServerManagerAtLogon> + </component> + <component xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" name="Microsoft-Windows-IE-ESC" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> + <!-- Disable IE ESC. --> + <IEHardenAdmin>false</IEHardenAdmin> + <IEHardenUser>false</IEHardenUser> + </component> + <component xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" name="Microsoft-Windows-OutOfBoxExperience" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> + <DoNotOpenInitialConfigurationTasksAtLogon>true</DoNotOpenInitialConfigurationTasksAtLogon> + </component> + <component xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" name="Microsoft-Windows-Security-SPP-UX" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> + <SkipAutoActivation>true</SkipAutoActivation> + </component> + </settings> + <cpi:offlineImage xmlns:cpi="urn:schemas-microsoft-com:cpi" cpi:source="catalog:d:/sources/install_windows server 2008 r2 serverdatacenter.clg"/> +</unattend> diff --git a/windows/answer_files/2012_r2/Autounattend.xml b/windows/answer_files/2012_r2/Autounattend.xml new file mode 100644 index 000000000..4b641388e --- /dev/null +++ b/windows/answer_files/2012_r2/Autounattend.xml @@ -0,0 +1,246 @@ +<?xml version="1.0" encoding="utf-8"?> +<unattend xmlns="urn:schemas-microsoft-com:unattend"> + <settings pass="windowsPE"> + <!-- look for drivers on floppy --> + <component name="Microsoft-Windows-PnpCustomizationsWinPE" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <DriverPaths> + <PathAndCredentials wcm:keyValue="1" wcm:action="add"> + <Path>A:\</Path> + </PathAndCredentials> + </DriverPaths> + </component> + + <component xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" name="Microsoft-Windows-International-Core-WinPE" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> + <SetupUILanguage> + <UILanguage>en-US</UILanguage> + </SetupUILanguage> + <InputLocale>en-US</InputLocale> + <SystemLocale>en-US</SystemLocale> + <UILanguage>en-US</UILanguage> + <UILanguageFallback>en-US</UILanguageFallback> + <UserLocale>en-US</UserLocale> + </component> + <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"> + <CreatePartitions> + <CreatePartition wcm:action="add"> + <Type>Primary</Type> + <Order>1</Order> + <Size>350</Size> + </CreatePartition> + <CreatePartition wcm:action="add"> + <Order>2</Order> + <Type>Primary</Type> + <Extend>true</Extend> + </CreatePartition> + </CreatePartitions> + <ModifyPartitions> + <ModifyPartition wcm:action="add"> + <Active>true</Active> + <Format>NTFS</Format> + <Label>boot</Label> + <Order>1</Order> + <PartitionID>1</PartitionID> + </ModifyPartition> + <ModifyPartition wcm:action="add"> + <Format>NTFS</Format> + <Label>Windows 2012 R2</Label> + <Letter>C</Letter> + <Order>2</Order> + <PartitionID>2</PartitionID> + </ModifyPartition> + </ModifyPartitions> + <DiskID>0</DiskID> + <WillWipeDisk>true</WillWipeDisk> + </Disk> + </DiskConfiguration> + <ImageInstall> + <OSImage> + <InstallFrom> + <MetaData wcm:action="add"> + <Key>/IMAGE/NAME </Key> + <Value>Windows Server 2012 R2 SERVERSTANDARD</Value> + </MetaData> + </InstallFrom> + <InstallTo> + <DiskID>0</DiskID> + <PartitionID>2</PartitionID> + </InstallTo> + </OSImage> + </ImageInstall> + <UserData> + <ProductKey> + <WillShowUI>OnError</WillShowUI> + </ProductKey> + <AcceptEula>true</AcceptEula> + <FullName>Vagrant</FullName> + <Organization>Vagrant</Organization> + </UserData> + </component> + </settings> + <settings pass="generalize"> + <component name="Microsoft-Windows-Security-SPP" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <SkipRearm>1</SkipRearm> + </component> + <component name="Microsoft-Windows-PnpSysprep" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <PersistAllDeviceInstalls>false</PersistAllDeviceInstalls> + <DoNotCleanUpNonPresentDevices>false</DoNotCleanUpNonPresentDevices> + </component> + </settings> + <settings pass="oobeSystem"> + <component name="Microsoft-Windows-International-Core" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <InputLocale>en-US</InputLocale> + <SystemLocale>en-US</SystemLocale> + <UILanguage>en-US</UILanguage> + <UserLocale>en-US</UserLocale> + </component> + <component name="Microsoft-Windows-Shell-Setup" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <OOBE> + <HideEULAPage>true</HideEULAPage> + <HideLocalAccountScreen>true</HideLocalAccountScreen> + <HideOEMRegistrationScreen>true</HideOEMRegistrationScreen> + <HideOnlineAccountScreens>true</HideOnlineAccountScreens> + <HideWirelessSetupInOOBE>true</HideWirelessSetupInOOBE> + <NetworkLocation>Home</NetworkLocation> + <ProtectYourPC>1</ProtectYourPC> + </OOBE> + <TimeZone>UTC</TimeZone> + <UserAccounts> + <AdministratorPassword> + <Value>vagrant</Value> + <PlainText>true</PlainText> + </AdministratorPassword> + <LocalAccounts> + <LocalAccount wcm:action="add"> + <Password> + <Value>vagrant</Value> + <PlainText>true</PlainText> + </Password> + <Group>Administrators</Group> + <DisplayName>Vagrant</DisplayName> + <Name>vagrant</Name> + <Description>Vagrant User</Description> + </LocalAccount> + </LocalAccounts> + </UserAccounts> + <AutoLogon> + <Password> + <Value>vagrant</Value> + <PlainText>true</PlainText> + </Password> + <Enabled>true</Enabled> + <Username>vagrant</Username> + </AutoLogon> + <FirstLogonCommands> + <SynchronousCommand wcm:action="add"> + <CommandLine>cmd.exe /c powershell -Command "Set-ExecutionPolicy -ExecutionPolicy RemoteSigned -Force"</CommandLine> + <Description>Set Execution Policy 64 Bit</Description> + <Order>1</Order> + <RequiresUserInput>true</RequiresUserInput> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <CommandLine>C:\Windows\SysWOW64\cmd.exe /c powershell -Command "Set-ExecutionPolicy -ExecutionPolicy RemoteSigned -Force"</CommandLine> + <Description>Set Execution Policy 32 Bit</Description> + <Order>2</Order> + <RequiresUserInput>true</RequiresUserInput> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <CommandLine>cmd.exe /c winrm quickconfig -q</CommandLine> + <Description>winrm quickconfig -q</Description> + <Order>3</Order> + <RequiresUserInput>true</RequiresUserInput> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <CommandLine>cmd.exe /c winrm quickconfig -transport:http</CommandLine> + <Description>winrm quickconfig -transport:http</Description> + <Order>4</Order> + <RequiresUserInput>true</RequiresUserInput> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <CommandLine>cmd.exe /c winrm set winrm/config @{MaxTimeoutms="1800000"}</CommandLine> + <Description>Win RM MaxTimoutms</Description> + <Order>5</Order> + <RequiresUserInput>true</RequiresUserInput> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <CommandLine>cmd.exe /c winrm set winrm/config/winrs @{MaxMemoryPerShellMB="800"}</CommandLine> + <Description>Win RM MaxMemoryPerShellMB</Description> + <Order>6</Order> + <RequiresUserInput>true</RequiresUserInput> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <CommandLine>cmd.exe /c winrm set winrm/config/service @{AllowUnencrypted="true"}</CommandLine> + <Description>Win RM AllowUnencrypted</Description> + <Order>7</Order> + <RequiresUserInput>true</RequiresUserInput> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <CommandLine>cmd.exe /c winrm set winrm/config/service/auth @{Basic="true"}</CommandLine> + <Description>Win RM auth Basic</Description> + <Order>8</Order> + <RequiresUserInput>true</RequiresUserInput> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <CommandLine>cmd.exe /c winrm set winrm/config/client/auth @{Basic="true"}</CommandLine> + <Description>Win RM client auth Basic</Description> + <Order>9</Order> + <RequiresUserInput>true</RequiresUserInput> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <CommandLine>cmd.exe /c winrm set winrm/config/listener?Address=*+Transport=HTTP @{Port="5985"} </CommandLine> + <Description>Win RM listener Address/Port</Description> + <Order>10</Order> + <RequiresUserInput>true</RequiresUserInput> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <CommandLine>cmd.exe /c netsh advfirewall firewall set rule group="remote administration" new enable=yes </CommandLine> + <Description>Win RM adv firewall enable</Description> + <Order>11</Order> + <RequiresUserInput>true</RequiresUserInput> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <CommandLine>cmd.exe /c netsh firewall add portopening TCP 5985 "Port 5985" </CommandLine> + <Description>Win RM port open</Description> + <Order>12</Order> + <RequiresUserInput>true</RequiresUserInput> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <CommandLine>cmd.exe /c net stop winrm </CommandLine> + <Description>Stop Win RM Service </Description> + <Order>13</Order> + <RequiresUserInput>true</RequiresUserInput> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <CommandLine>cmd.exe /c sc config winrm start= auto</CommandLine> + <Description>Win RM Autostart</Description> + <Order>14</Order> + <RequiresUserInput>true</RequiresUserInput> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <CommandLine>cmd.exe /c net start winrm</CommandLine> + <Description>Start Win RM Service</Description> + <Order>15</Order> + <RequiresUserInput>true</RequiresUserInput> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <CommandLine>cmd.exe /c wmic useraccount where "name='vagrant'" set PasswordExpires=FALSE</CommandLine> + <Order>16</Order> + <Description>Disable password expiration for vagrant user</Description> + </SynchronousCommand> + </FirstLogonCommands> + </component> + </settings> + <settings pass="specialize"> + <component xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" name="Microsoft-Windows-ServerManager-SvrMgrNc" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> + <DoNotOpenServerManagerAtLogon>true</DoNotOpenServerManagerAtLogon> + </component> + <component xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" name="Microsoft-Windows-IE-ESC" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> + <IEHardenAdmin>false</IEHardenAdmin> + <IEHardenUser>false</IEHardenUser> + </component> + <component xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" name="Microsoft-Windows-OutOfBoxExperience" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> + <DoNotOpenInitialConfigurationTasksAtLogon>true</DoNotOpenInitialConfigurationTasksAtLogon> + </component> + </settings> +</unattend> diff --git a/windows/answer_files/2016/Autounattend.xml b/windows/answer_files/2016/Autounattend.xml new file mode 100644 index 000000000..09a5671cf --- /dev/null +++ b/windows/answer_files/2016/Autounattend.xml @@ -0,0 +1,155 @@ +<?xml version="1.0" encoding="utf-8"?> +<unattend xmlns="urn:schemas-microsoft-com:unattend"> + <settings pass="windowsPE"> + <!-- look for drivers on floppy --> + <component name="Microsoft-Windows-PnpCustomizationsWinPE" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <DriverPaths> + <PathAndCredentials wcm:keyValue="1" wcm:action="add"> + <Path>A:\</Path> + </PathAndCredentials> + </DriverPaths> + </component> + + <component xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" name="Microsoft-Windows-International-Core-WinPE" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> + <SetupUILanguage> + <UILanguage>en-US</UILanguage> + </SetupUILanguage> + <InputLocale>en-US</InputLocale> + <SystemLocale>en-US</SystemLocale> + <UILanguage>en-US</UILanguage> + <UILanguageFallback>en-US</UILanguageFallback> + <UserLocale>en-US</UserLocale> + </component> + <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"> + <CreatePartitions> + <CreatePartition wcm:action="add"> + <Type>Primary</Type> + <Order>1</Order> + <Size>350</Size> + </CreatePartition> + <CreatePartition wcm:action="add"> + <Order>2</Order> + <Type>Primary</Type> + <Extend>true</Extend> + </CreatePartition> + </CreatePartitions> + <ModifyPartitions> + <ModifyPartition wcm:action="add"> + <Active>true</Active> + <Format>NTFS</Format> + <Label>boot</Label> + <Order>1</Order> + <PartitionID>1</PartitionID> + </ModifyPartition> + <ModifyPartition wcm:action="add"> + <Format>NTFS</Format> + <Label>Windows 2016</Label> + <Letter>C</Letter> + <Order>2</Order> + <PartitionID>2</PartitionID> + </ModifyPartition> + </ModifyPartitions> + <DiskID>0</DiskID> + <WillWipeDisk>true</WillWipeDisk> + </Disk> + </DiskConfiguration> + <ImageInstall> + <OSImage> + <InstallFrom> + <MetaData wcm:action="add"> + <Key>/IMAGE/NAME </Key> + <Value>Windows Server 2016 SERVERDATACENTER</Value> + </MetaData> + </InstallFrom> + <InstallTo> + <DiskID>0</DiskID> + <PartitionID>2</PartitionID> + </InstallTo> + </OSImage> + </ImageInstall> + <UserData> + <ProductKey> + <WillShowUI>OnError</WillShowUI> + </ProductKey> + <AcceptEula>true</AcceptEula> + <FullName>Vagrant</FullName> + <Organization>Vagrant</Organization> + </UserData> + </component> + </settings> + <settings pass="generalize"> + <component name="Microsoft-Windows-Security-SPP" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <SkipRearm>1</SkipRearm> + </component> + <component name="Microsoft-Windows-PnpSysprep" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <PersistAllDeviceInstalls>false</PersistAllDeviceInstalls> + <DoNotCleanUpNonPresentDevices>false</DoNotCleanUpNonPresentDevices> + </component> + </settings> + <settings pass="oobeSystem"> + <component name="Microsoft-Windows-International-Core" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <InputLocale>en-US</InputLocale> + <SystemLocale>en-US</SystemLocale> + <UILanguage>en-US</UILanguage> + <UserLocale>en-US</UserLocale> + </component> + <component name="Microsoft-Windows-Shell-Setup" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <OOBE> + <HideEULAPage>true</HideEULAPage> + <HideLocalAccountScreen>true</HideLocalAccountScreen> + <HideOEMRegistrationScreen>true</HideOEMRegistrationScreen> + <HideOnlineAccountScreens>true</HideOnlineAccountScreens> + <HideWirelessSetupInOOBE>true</HideWirelessSetupInOOBE> + <NetworkLocation>Home</NetworkLocation> + <ProtectYourPC>1</ProtectYourPC> + </OOBE> + <TimeZone>UTC</TimeZone> + <UserAccounts> + <AdministratorPassword> + <Value>vagrant</Value> + <PlainText>true</PlainText> + </AdministratorPassword> + <LocalAccounts> + <LocalAccount wcm:action="add"> + <Password> + <Value>vagrant</Value> + <PlainText>true</PlainText> + </Password> + <Group>administrators</Group> + <DisplayName>Vagrant</DisplayName> + <Name>vagrant</Name> + <Description>Vagrant User</Description> + </LocalAccount> + </LocalAccounts> + </UserAccounts> + <AutoLogon> + <Password> + <Value>vagrant</Value> + <PlainText>true</PlainText> + </Password> + <Enabled>true</Enabled> + <Username>vagrant</Username> + </AutoLogon> + <FirstLogonCommands> + <SynchronousCommand wcm:action="add"> + <CommandLine>cmd.exe /c A:\winrm.cmd</CommandLine> + <Order>1</Order> + </SynchronousCommand> + </FirstLogonCommands> + </component> + </settings> + <settings pass="specialize"> + <component xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" name="Microsoft-Windows-ServerManager-SvrMgrNc" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> + <DoNotOpenServerManagerAtLogon>true</DoNotOpenServerManagerAtLogon> + </component> + <component xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" name="Microsoft-Windows-IE-ESC" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> + <IEHardenAdmin>false</IEHardenAdmin> + <IEHardenUser>false</IEHardenUser> + </component> + <component xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" name="Microsoft-Windows-OutOfBoxExperience" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> + <DoNotOpenInitialConfigurationTasksAtLogon>true</DoNotOpenInitialConfigurationTasksAtLogon> + </component> + </settings> +</unattend> diff --git a/windows/answer_files/win7/Autounattend.xml b/windows/answer_files/win7/Autounattend.xml new file mode 100644 index 000000000..d62421cd0 --- /dev/null +++ b/windows/answer_files/win7/Autounattend.xml @@ -0,0 +1,129 @@ +<?xml version="1.0" encoding="utf-8"?> +<unattend xmlns="urn:schemas-microsoft-com:unattend"> + <servicing/> + <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"> + <CreatePartitions> + <CreatePartition wcm:action="add"> + <Order>1</Order> + <Type>Primary</Type> + <Extend>true</Extend> + </CreatePartition> + </CreatePartitions> + <ModifyPartitions> + <ModifyPartition wcm:action="add"> + <Extend>false</Extend> + <Format>NTFS</Format> + <Letter>C</Letter> + <Order>1</Order> + <PartitionID>1</PartitionID> + <Label>Windows 7</Label> + </ModifyPartition> + </ModifyPartitions> + <DiskID>0</DiskID> + <WillWipeDisk>true</WillWipeDisk> + </Disk> + <WillShowUI>OnError</WillShowUI> + </DiskConfiguration> + <UserData> + <AcceptEula>true</AcceptEula> + <FullName>Vagrant Administrator</FullName> + <Organization>Vagrant Inc.</Organization> + <ProductKey> + <!--<Key>your key here</Key>--> + <WillShowUI>Never</WillShowUI> + </ProductKey> + </UserData> + <ImageInstall> + <OSImage> + <InstallTo> + <DiskID>0</DiskID> + <PartitionID>1</PartitionID> + </InstallTo> + <WillShowUI>OnError</WillShowUI> + <InstallToAvailablePartition>false</InstallToAvailablePartition> + <InstallFrom> + <MetaData wcm:action="add"> + <Key>/IMAGE/NAME</Key> + <Value>Windows 7 ULTIMATE</Value> + </MetaData> + </InstallFrom> + </OSImage> + </ImageInstall> + </component> + <component xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" name="Microsoft-Windows-International-Core-WinPE" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> + <SetupUILanguage> + <UILanguage>en-US</UILanguage> + </SetupUILanguage> + <InputLocale>en-US</InputLocale> + <SystemLocale>en-US</SystemLocale> + <UILanguage>en-US</UILanguage> + <UILanguageFallback>en-US</UILanguageFallback> + <UserLocale>en-US</UserLocale> + </component> + </settings> + <settings pass="offlineServicing"> + <component name="Microsoft-Windows-LUA-Settings" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> + <EnableLUA>false</EnableLUA> + </component> + </settings> + <settings pass="oobeSystem"> + <component xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" name="Microsoft-Windows-Shell-Setup" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> + <UserAccounts> + <AdministratorPassword> + <Value>vagrant</Value> + <PlainText>true</PlainText> + </AdministratorPassword> + <LocalAccounts> + <LocalAccount wcm:action="add"> + <Password> + <Value>vagrant</Value> + <PlainText>true</PlainText> + </Password> + <Description>Vagrant User</Description> + <DisplayName>vagrant</DisplayName> + <Group>administrators</Group> + <Name>vagrant</Name> + </LocalAccount> + </LocalAccounts> + </UserAccounts> + <OOBE> + <HideEULAPage>true</HideEULAPage> + <HideWirelessSetupInOOBE>true</HideWirelessSetupInOOBE> + <NetworkLocation>Home</NetworkLocation> + <ProtectYourPC>1</ProtectYourPC> + </OOBE> + <AutoLogon> + <Password> + <Value>vagrant</Value> + <PlainText>true</PlainText> + </Password> + <Username>vagrant</Username> + <Enabled>true</Enabled> + </AutoLogon> + <FirstLogonCommands> + <SynchronousCommand wcm:action="add"> + <CommandLine>cmd.exe /c C:\Windows\System32\WindowsPowerShell\v1.0\powershell.exe -ExecutionPolicy Bypass -File a:\boxstarter.ps1</CommandLine> + <Order>1</Order> + </SynchronousCommand> + </FirstLogonCommands> + <ShowWindowsLive>false</ShowWindowsLive> + </component> + </settings> + <settings pass="specialize"> + <component name="Microsoft-Windows-Shell-Setup" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> + <OEMInformation> + <HelpCustomized>false</HelpCustomized> + </OEMInformation> + <!-- Rename computer here. --> + <ComputerName>vagrant-7</ComputerName> + <TimeZone>Pacific Standard Time</TimeZone> + <RegisteredOwner/> + </component> + <component xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" name="Microsoft-Windows-Security-SPP-UX" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> + <SkipAutoActivation>true</SkipAutoActivation> + </component> + </settings> +</unattend> \ No newline at end of file diff --git a/windows/answer_files/win7/postunattend.xml b/windows/answer_files/win7/postunattend.xml new file mode 100644 index 000000000..76d1f79c7 --- /dev/null +++ b/windows/answer_files/win7/postunattend.xml @@ -0,0 +1,53 @@ +<?xml version="1.0" encoding="utf-8"?> +<unattend xmlns="urn:schemas-microsoft-com:unattend"> + <settings pass="generalize"> + <component name="Microsoft-Windows-Security-SPP" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <SkipRearm>1</SkipRearm> + </component> + <component name="Microsoft-Windows-PnpSysprep" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <PersistAllDeviceInstalls>false</PersistAllDeviceInstalls> + <DoNotCleanUpNonPresentDevices>false</DoNotCleanUpNonPresentDevices> + </component> + </settings> + <settings pass="oobeSystem"> + <component name="Microsoft-Windows-International-Core" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <InputLocale>en-US</InputLocale> + <SystemLocale>en-US</SystemLocale> + <UILanguage>en-US</UILanguage> + <UserLocale>en-US</UserLocale> + </component> + <component name="Microsoft-Windows-Shell-Setup" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <OOBE> + <HideEULAPage>true</HideEULAPage> + <ProtectYourPC>1</ProtectYourPC> + <NetworkLocation>Home</NetworkLocation> + <HideWirelessSetupInOOBE>true</HideWirelessSetupInOOBE> + </OOBE> + <TimeZone>UTC</TimeZone> + <UserAccounts> + <AdministratorPassword> + <Value>vagrant</Value> + <PlainText>true</PlainText> + </AdministratorPassword> + <LocalAccounts> + <LocalAccount wcm:action="add"> + <Password> + <Value>vagrant</Value> + <PlainText>true</PlainText> + </Password> + <Group>administrators</Group> + <DisplayName>Vagrant</DisplayName> + <Name>vagrant</Name> + <Description>Vagrant User</Description> + </LocalAccount> + </LocalAccounts> + </UserAccounts> + </component> + </settings> + <settings pass="specialize"> + <component name="Microsoft-Windows-Shell-Setup" processorArchitecture="x86" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <!--<ProductKey>your key here</ProductKey>--> + <ComputerName>vagrant-7</ComputerName> + </component> + </settings> +</unattend> diff --git a/windows/cookbooks/packer-templates/Berksfile b/windows/cookbooks/packer-templates/Berksfile new file mode 100644 index 000000000..34fea2166 --- /dev/null +++ b/windows/cookbooks/packer-templates/Berksfile @@ -0,0 +1,3 @@ +source 'https://supermarket.chef.io' + +metadata diff --git a/windows/cookbooks/packer-templates/metadata.rb b/windows/cookbooks/packer-templates/metadata.rb new file mode 100644 index 000000000..cec6ea58b --- /dev/null +++ b/windows/cookbooks/packer-templates/metadata.rb @@ -0,0 +1,9 @@ +name 'packer-templates' +maintainer 'Matt Wrock' +maintainer_email 'matt@mattwrock.com' +license 'Apache-2.0' +description 'Resources run during packer builds' +long_description 'Resources run during packer builds' +version '0.1.0' + +chef_version '>= 14.0' diff --git a/windows/cookbooks/packer-templates/recipes/add_pagefile.rb b/windows/cookbooks/packer-templates/recipes/add_pagefile.rb new file mode 100644 index 000000000..65bac7757 --- /dev/null +++ b/windows/cookbooks/packer-templates/recipes/add_pagefile.rb @@ -0,0 +1,4 @@ +windows_pagefile 'add pagefile' do + automatic_managed true + action :set +end diff --git a/windows/cookbooks/packer-templates/recipes/add_postunattend.rb b/windows/cookbooks/packer-templates/recipes/add_postunattend.rb new file mode 100644 index 000000000..32f00727b --- /dev/null +++ b/windows/cookbooks/packer-templates/recipes/add_postunattend.rb @@ -0,0 +1,18 @@ +directory 'Remove old panther directory' do + path 'C:\Windows\Panther' + recursive true + action :delete +end + +directory 'create unattend directory' do + path 'C:\Windows\Panther\Unattend' + recursive true +end + +template 'C:/Windows/Panther/Unattend/unattend.xml' do + source 'postunattend.xml.erb' +end + +template 'C:/Windows/Panther/Unattend/packer_shutdown.bat' do + source 'packer_shutdown.bat.erb' +end diff --git a/windows/cookbooks/packer-templates/recipes/add_setup_complete.rb b/windows/cookbooks/packer-templates/recipes/add_setup_complete.rb new file mode 100644 index 000000000..3e7f0f894 --- /dev/null +++ b/windows/cookbooks/packer-templates/recipes/add_setup_complete.rb @@ -0,0 +1,21 @@ +# On first boot, the WinRM and other services are starting +# and stopping and restarting and somewhere in the middle of +# all of that vagrant finds that WinRM is accessible but +# something is shutdown in the middle of its connection attempt +# sometimes resulting in an error. + +# To work around this we disable the WinRM firewall in the +# shutdown command and turn it back on in SetupComplete.cmd +# file. This way while the box is going through its first boot +# cycles of restarting services, it cant get to WinRM. +# Then once its fully up it runs SetupComplete and the WinRM +# port is made accessible. + +directory "C:/Windows/setup/scripts" do + recursive true +end + +file "restart winmgmt on first boot" do + content "netsh advfirewall firewall set rule name=\"WinRM-HTTP\" new action=allow" + path "C:/Windows/setup/scripts/SetupComplete.cmd" +end diff --git a/windows/cookbooks/packer-templates/recipes/clean_sxs.rb b/windows/cookbooks/packer-templates/recipes/clean_sxs.rb new file mode 100644 index 000000000..a2f67eaa7 --- /dev/null +++ b/windows/cookbooks/packer-templates/recipes/clean_sxs.rb @@ -0,0 +1,4 @@ +batch 'clean SxS' do + code 'Dism.exe /online /Cleanup-Image /StartComponentCleanup /ResetBase' + ignore_failure true +end diff --git a/windows/cookbooks/packer-templates/recipes/default.rb b/windows/cookbooks/packer-templates/recipes/default.rb new file mode 100644 index 000000000..1a242ff9b --- /dev/null +++ b/windows/cookbooks/packer-templates/recipes/default.rb @@ -0,0 +1,88 @@ +powershell_script 'lots of stuff' do + code <<-EOH + $ErrorActionPreference = "Stop" + . a:/Test-Command.ps1 + + Write-Host "Enabling file sharing firewall rules" + netsh advfirewall firewall set rule group="File and Printer Sharing" new enable=yes + + if(Test-Path "C:/Users/vagrant/VBoxGuestAdditions.iso") { + Write-Host "Installing Guest Additions" + certutil -addstore -f "TrustedPublisher" A:/oracle.cer + cinst 7zip.commandline -y + Move-Item C:/Users/vagrant/VBoxGuestAdditions.iso C:/Windows/Temp + ."C:/ProgramData/chocolatey/lib/7zip.commandline/tools/7z.exe" x C:/Windows/Temp/VBoxGuestAdditions.iso -oC:/Windows/Temp/virtualbox + + Start-Process -FilePath "C:/Windows/Temp/virtualbox/VBoxWindowsAdditions.exe" -ArgumentList "/S" -WorkingDirectory "C:/Windows/Temp/virtualbox" -Wait + + Remove-Item C:/Windows/Temp/virtualbox -Recurse -Force + Remove-Item C:/Windows/Temp/VBoxGuestAdditions.iso -Force + } + + Write-Host "Cleaning SxS..." + Dism.exe /online /Cleanup-Image /StartComponentCleanup /ResetBase + + @( + "$env:localappdata/Nuget", + "$env:localappdata/temp/*", + "$env:windir/logs", + "$env:windir/panther", + "$env:windir/temp/*", + "$env:windir/winsxs/manifestcache" + ) | % { + if(Test-Path $_) { + Write-Host "Removing $_" + try { + Takeown /d Y /R /f $_ + Icacls $_ /GRANT:r administrators:F /T /c /q 2>&1 | Out-Null + Remove-Item $_ -Recurse -Force | Out-Null + } catch { $global:error.RemoveAt(0) } + } + } + + Write-Host "defragging..." + if (Test-Command -cmdname 'Optimize-Volume') { + Optimize-Volume -DriveLetter C + } else { + Defrag.exe c: /H + } + + Write-Host "0ing out empty space..." + $FilePath="c:/zero.tmp" + $Volume = Get-WmiObject win32_logicaldisk -filter "DeviceID='C:'" + $ArraySize= 64kb + $SpaceToLeave= $Volume.Size * 0.05 + $FileSize= $Volume.FreeSpace - $SpacetoLeave + $ZeroArray= new-object byte[]($ArraySize) + + $Stream= [io.File]::OpenWrite($FilePath) + try { + $CurFileSize = 0 + while($CurFileSize -lt $FileSize) { + $Stream.Write($ZeroArray,0, $ZeroArray.Length) + $CurFileSize +=$ZeroArray.Length + } + } + finally { + if($Stream) { + $Stream.Close() + } + } + + Del $FilePath + + Write-Host "copying auto unattend file" + mkdir C:/Windows/setup/scripts + copy-item a:/SetupComplete-2012.cmd C:/Windows/setup/scripts/SetupComplete.cmd -Force + + mkdir C:/Windows/Panther/Unattend + copy-item a:/postunattend.xml C:/Windows/Panther/Unattend/unattend.xml + + Write-Host "Recreate pagefile after sysprep" + $System = GWMI Win32_ComputerSystem -EnableAllPrivileges + if ($system -ne $null) { + $System.AutomaticManagedPagefile = $true + $System.Put() + } + EOH +end diff --git a/windows/cookbooks/packer-templates/recipes/delete_pagefile.rb b/windows/cookbooks/packer-templates/recipes/delete_pagefile.rb new file mode 100644 index 000000000..13e26b9a5 --- /dev/null +++ b/windows/cookbooks/packer-templates/recipes/delete_pagefile.rb @@ -0,0 +1,7 @@ +registry_key 'HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Session Manager\Memory Management' do + values [{ + :name => 'PagingFiles', + :type => :string, + :data => '' + }] +end diff --git a/windows/cookbooks/packer-templates/recipes/enable_file_sharing.rb b/windows/cookbooks/packer-templates/recipes/enable_file_sharing.rb new file mode 100644 index 000000000..5f19f720a --- /dev/null +++ b/windows/cookbooks/packer-templates/recipes/enable_file_sharing.rb @@ -0,0 +1,13 @@ +dsc_resource "File sharing firewall rule (SMB-In)" do + resource :xfirewall + property :name, "File and Printer Sharing (SMB-In)" + property :ensure, "Present" + property :enabled, "True" +end + +dsc_resource "File sharing firewall rule (NB-Session-In)" do + resource :xfirewall + property :name, "File and Printer Sharing (NB-Session-In)" + property :ensure, "Present" + property :enabled, "True" +end diff --git a/windows/cookbooks/packer-templates/recipes/install_ps_modules.rb b/windows/cookbooks/packer-templates/recipes/install_ps_modules.rb new file mode 100644 index 000000000..e4c027bad --- /dev/null +++ b/windows/cookbooks/packer-templates/recipes/install_ps_modules.rb @@ -0,0 +1,11 @@ +powershell_script 'install Nuget package provider' do + code 'Install-PackageProvider -Name NuGet -Force' + not_if '(Get-PackageProvider -Name Nuget -ListAvailable -ErrorAction SilentlyContinue) -ne $null' +end + +%w{PSWindowsUpdate xNetworking xRemoteDesktopAdmin xCertificate}.each do |ps_module| + powershell_script "install #{ps_module} module" do + code "Install-Module #{ps_module} -Force" + not_if "(Get-Module #{ps_module} -list) -ne $null" + end +end \ No newline at end of file diff --git a/windows/cookbooks/packer-templates/recipes/psgallery.rb b/windows/cookbooks/packer-templates/recipes/psgallery.rb new file mode 100644 index 000000000..59cf81e3c --- /dev/null +++ b/windows/cookbooks/packer-templates/recipes/psgallery.rb @@ -0,0 +1,3 @@ +package 'powershell gallery' do + source 'https://download.microsoft.com/download/C/4/1/C41378D4-7F41-4BBE-9D0D-0E4F98585C61/PackageManagement_x64.msi' +end diff --git a/windows/cookbooks/packer-templates/recipes/remote_desktop.rb b/windows/cookbooks/packer-templates/recipes/remote_desktop.rb new file mode 100644 index 000000000..bf8edc720 --- /dev/null +++ b/windows/cookbooks/packer-templates/recipes/remote_desktop.rb @@ -0,0 +1,12 @@ +dsc_resource "Enable RDP" do + resource :xRemoteDesktopAdmin + property :UserAuthentication, "Secure" + property :ensure, "Present" +end + +dsc_resource "Allow RDP firewall rule" do + resource :xfirewall + property :name, "Remote Desktop" + property :ensure, "Present" + property :enabled, "True" +end diff --git a/windows/cookbooks/packer-templates/recipes/remove_dirs.rb b/windows/cookbooks/packer-templates/recipes/remove_dirs.rb new file mode 100644 index 000000000..03dd0a6f8 --- /dev/null +++ b/windows/cookbooks/packer-templates/recipes/remove_dirs.rb @@ -0,0 +1,20 @@ +powershell_script 'remove unnecesary directories' do + code <<-EOH + @( + "C:\\Recovery", + "$env:localappdata\\Nuget", + "$env:localappdata\\temp\\*", + "$env:windir\\logs", + "$env:windir\\winsxs\\manifestcache" + ) | % { + if(Test-Path $_) { + Write-Host "Removing $_" + try { + Takeown /d Y /R /f $_ + Icacls $_ /GRANT:r administrators:F /T /c /q 2>&1 | Out-Null + Remove-Item $_ -Recurse -Force | Out-Null + } catch { $global:error.RemoveAt(0) } + } + } + EOH +end diff --git a/windows/cookbooks/packer-templates/recipes/set_local_account_token_filter_policy.rb b/windows/cookbooks/packer-templates/recipes/set_local_account_token_filter_policy.rb new file mode 100644 index 000000000..53d98ace8 --- /dev/null +++ b/windows/cookbooks/packer-templates/recipes/set_local_account_token_filter_policy.rb @@ -0,0 +1,7 @@ +registry_key 'HKEY_LOCAL_MACHINE\software\Microsoft\Windows\CurrentVersion\Policies\system' do + values [{ + :name => 'LocalAccountTokenFilterPolicy', + :type => :dword, + :data => 1 + }] +end diff --git a/windows/cookbooks/packer-templates/recipes/uninstall_powershell_ise.rb b/windows/cookbooks/packer-templates/recipes/uninstall_powershell_ise.rb new file mode 100644 index 000000000..c00be97a0 --- /dev/null +++ b/windows/cookbooks/packer-templates/recipes/uninstall_powershell_ise.rb @@ -0,0 +1,5 @@ +node.default['windows']['feature_provider'] = 'dism' + +windows_feature 'MicrosoftWindowsPowerShellISE' do + action :remove +end diff --git a/windows/cookbooks/packer-templates/recipes/vbox_guest_additions.rb b/windows/cookbooks/packer-templates/recipes/vbox_guest_additions.rb new file mode 100644 index 000000000..2e1e44f7b --- /dev/null +++ b/windows/cookbooks/packer-templates/recipes/vbox_guest_additions.rb @@ -0,0 +1,12 @@ +powershell_script 'install vbox guest additions' do + code <<-EOH + Get-ChildItem E:/cert/ -Filter vbox*.cer | ForEach-Object { + E:/cert/VBoxCertUtil.exe add-trusted-publisher $_.FullName --root $_.FullName + } + + mkdir "C:/Windows/Temp/virtualbox" -ErrorAction SilentlyContinue + Start-Process -FilePath "e:/VBoxWindowsAdditions.exe" -ArgumentList "/S" -WorkingDirectory "C:/Windows/Temp/virtualbox" -Wait + + Remove-Item C:/Windows/Temp/virtualbox -Recurse -Force + EOH +end diff --git a/windows/cookbooks/packer-templates/templates/packer_shutdown.bat.erb b/windows/cookbooks/packer-templates/templates/packer_shutdown.bat.erb new file mode 100644 index 000000000..9a13b4618 --- /dev/null +++ b/windows/cookbooks/packer-templates/templates/packer_shutdown.bat.erb @@ -0,0 +1,5 @@ +call winrm set winrm/config/service/auth @{Basic="false"} +call winrm set winrm/config/service @{AllowUnencrypted="false"} +netsh advfirewall firewall set rule name="WinRM-HTTP" new action=block + +C:/windows/system32/sysprep/sysprep.exe /generalize /oobe /unattend:C:/Windows/Panther/Unattend/unattend.xml /quiet /shutdown diff --git a/windows/cookbooks/packer-templates/templates/postunattend.xml.erb b/windows/cookbooks/packer-templates/templates/postunattend.xml.erb new file mode 100644 index 000000000..8f6b52bea --- /dev/null +++ b/windows/cookbooks/packer-templates/templates/postunattend.xml.erb @@ -0,0 +1,49 @@ +<?xml version="1.0" encoding="utf-8"?> +<unattend xmlns="urn:schemas-microsoft-com:unattend"> + <settings pass="generalize"> + <component name="Microsoft-Windows-Security-SPP" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <SkipRearm>1</SkipRearm> + </component> + <component name="Microsoft-Windows-PnpSysprep" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <PersistAllDeviceInstalls>false</PersistAllDeviceInstalls> + <DoNotCleanUpNonPresentDevices>false</DoNotCleanUpNonPresentDevices> + </component> + </settings> + <settings pass="oobeSystem"> + <component name="Microsoft-Windows-International-Core" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <InputLocale>en-US</InputLocale> + <SystemLocale>en-US</SystemLocale> + <UILanguage>en-US</UILanguage> + <UserLocale>en-US</UserLocale> + </component> + <component name="Microsoft-Windows-Shell-Setup" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <OOBE> + <HideEULAPage>true</HideEULAPage> + <ProtectYourPC>1</ProtectYourPC> + <NetworkLocation>Home</NetworkLocation> + <HideWirelessSetupInOOBE>true</HideWirelessSetupInOOBE> + </OOBE> + <TimeZone>UTC</TimeZone> + <UserAccounts> + <AdministratorPassword> + <Value>vagrant</Value> + <PlainText>true</PlainText> + </AdministratorPassword> + <LocalAccounts> + <LocalAccount wcm:action="add"> + <Password> + <Value>vagrant</Value> + <PlainText>true</PlainText> + </Password> + <Group>administrators</Group> + <DisplayName>Vagrant</DisplayName> + <Name>vagrant</Name> + <Description>Vagrant User</Description> + </LocalAccount> + </LocalAccounts> + </UserAccounts> + </component> + </settings> + <settings pass="specialize"> + </settings> +</unattend> diff --git a/windows/scripts/after-reboot.ps1 b/windows/scripts/after-reboot.ps1 new file mode 100644 index 000000000..d583c8cfa --- /dev/null +++ b/windows/scripts/after-reboot.ps1 @@ -0,0 +1,22 @@ +$ProgressPreference='SilentlyContinue' +Get-WUInstall -WindowsUpdate -AcceptAll -UpdateType Software -IgnoreReboot + +# The sleeps may seem whacky because they are +# Might be able to remove after 2016 RTMs +# For now after much trial and error, this is what works +Write-Host "waiting 5 minutes" +Start-Sleep -Seconds 300 + +$uninstallSuccess = $false +while(!$uninstallSuccess) { + Write-Host "Attempting to uninstall features..." + try { + Get-WindowsFeature | ? { $_.InstallState -eq 'Available' } | Uninstall-WindowsFeature -Remove -ErrorAction Stop + Write-Host "Uninstall succeeded!" + $uninstallSuccess = $true + } + catch { + Write-Host "Waiting two minutes before next attempt" + Start-Sleep -Seconds 120 + } +} diff --git a/windows/scripts/cleanup.ps1 b/windows/scripts/cleanup.ps1 new file mode 100644 index 000000000..00394b3ed --- /dev/null +++ b/windows/scripts/cleanup.ps1 @@ -0,0 +1,38 @@ +Write-Host "Uninstall Chef..." +if(Test-Path "c:\windows\temp\chef.msi") { + Start-Process MSIEXEC.exe '/uninstall c:\windows\temp\chef.msi /quiet' -Wait +} + +Write-Host "Cleaning Temp Files" +try { + Takeown /d Y /R /f "C:\Windows\Temp\*" + Icacls "C:\Windows\Temp\*" /GRANT:r administrators:F /T /c /q 2>&1 + Remove-Item "C:\Windows\Temp\*" -Recurse -Force -ErrorAction SilentlyContinue +} catch { } + +Write-Host "Optimizing Drive" +Optimize-Volume -DriveLetter C + +Write-Host "Wiping empty space on disk..." +$FilePath="c:\zero.tmp" +$Volume = Get-WmiObject win32_logicaldisk -filter "DeviceID='C:'" +$ArraySize= 64kb +$SpaceToLeave= $Volume.Size * 0.05 +$FileSize= $Volume.FreeSpace - $SpacetoLeave +$ZeroArray= new-object byte[]($ArraySize) + +$Stream= [io.File]::OpenWrite($FilePath) +try { + $CurFileSize = 0 + while($CurFileSize -lt $FileSize) { + $Stream.Write($ZeroArray,0, $ZeroArray.Length) + $CurFileSize +=$ZeroArray.Length + } +} +finally { + if($Stream) { + $Stream.Close() + } +} + +Remove-Item $FilePath diff --git a/windows/scripts/oracle.cer b/windows/scripts/oracle.cer new file mode 100644 index 0000000000000000000000000000000000000000..abb6ee6358d80de0ced2d1143b50476430a3cbf6 GIT binary patch literal 1419 zcmXqLVr@5QV#!~?%*4pVBoKItVTRb>y$v4~9*DjxZL%}qW#iOp^Jx3d%gD&e%3#pA z#gN;8lZ`o)g-w_#G}utwKorE`66Om_Ey@heOwZF%@XSlrGn6-w1xauVi@_umLW)X@ zOBDQ4OUm<$vJI^bEFlVvLQ;!zixu+I6iSOz6%tDnGD=DcimmkZ%gf94%7CU815MRS z&d=2^Do9k&NY*qoFw`^90cmCyR)w4HoRe5wtYEC*oS%}a0CGrXUb=#jfuVtdv!j8W zIIp3xp^=fX0T@I9xn@8vP{7pE)H2GT@f51Jgbf5i=5q*hIVa|1rsWsqWhTP>$}Y?o zl$uhWpP!--oRMFYT5Kq7APG{<B_iZsl$e~83UotJL4HwUNoIbYp`C#Z#Gj@vndzA& zi8%_ME($Qm>MHnVCKu%w=ckn@1Otik#G+J%FrbwwV9g3;Mut$QaEow-Wfql`CgwQh zSHNs!#%7~I6QdGxv@x<WFgG#sGXTZ8n3@<F8Sb#CpWS8g-K3OjMcd~WA6{j*E%~Oa zZ@r-8r<TH&#aABfs&V?6$WmxkrQdVh?aYc-+0PlQE?!kWytL6ZU*hk%GNIldlP(y1 zxOe(~vS(DOwYfs({f+l*=h&X@{XR!6rq?)QPlsmt{x4Ra{2Sh;6$i5yma81_oAJF< zJ$&Ys#~o8ymSh?0Y8A)-HM+Scy`?RP<=D^Z83L;gdrW&QTGTD-upxZ)shiCDDd*K? z&MY-#eDg48O|NbLmL<=-*Y-}9pSJM7{hUQFUp<`h+(9LxMIuYt_9@TWovVBHo{N`0 znSW?uoP5BxJy#O{rM@<`SjQ_{cXH0N@BCMGgiM)bzRqIf{xz4ynV1<F7#BA&Rs%z% z9GsYCg;|&k7!3G;5hcsd$oQXyg_()H!N38;muImwFgGw=V7$PvO&^prfhjY&IN4Yi zl(uw}i*iuYsB^G0L`n}RW#9rbL4n2A0F>If6WTl&+kUt*vWqhtXc=g*acHvvGZi}% zqnHf7G;bgbGDVez$AAl_g_+r)5XNR?WJxthHc)}_4H(-bpzh31E-pZEo`E%76%!WU zBxWX}DAz~wO=^*WJjfl&ED{D{4I<}fu6$Lk_Qm^TU;p(FtZMHcUs^sFm}xj6eslsl z3K)hg0tRAiTtHv4FgBSpF-o&=7_b2oATWfH6DY7;0VYsJhJ{CX_qnNbZ3^0b(#!PZ z-f#a8WbfTMDbzTnH)D<x+lvYI)AePhT(o9SIl0kp!<`@U@4D0q=B_-zZSeF*W5kKI zr;2VHvOJc&%^tjE)5%9duJ4{Uyk77r_E?I&j_LVG_TPHenhSTw^M>*?oIJhvLs{m| z{^e!vdd3e8dw)bqJq!8Nmc}$w=A+Fln>LN<x#7$2DsuXSMcA2qUv|f&`=?~?!<Q_+ z-&wD2J;45--B8*x?rP0`ms334=RH$a7_aORZ2h(<d&TS{OGJLJ)1TPyUD>hHxLr5= z{h8+mRuQkCvT(G1f4S$&-*?x3Y`WgLUh(6-E2(T7|DIX@V|sqny?IJ;mXD8q1pvu- B@Du<5 literal 0 HcmV?d00001 diff --git a/windows/vagrantfile-windows.template b/windows/vagrantfile-windows.template new file mode 100644 index 000000000..a1b6594af --- /dev/null +++ b/windows/vagrantfile-windows.template @@ -0,0 +1,24 @@ +# -*- mode: ruby -*- +# vi: set ft=ruby : + +Vagrant.configure(2) do |config| + config.vm.guest = :windows + config.vm.communicator = "winrm" + config.vm.boot_timeout = 300 + config.vm.network :forwarded_port, guest: 3389, host: 3389, id: 'rdp', auto_correct: true + + config.vm.provider "virtualbox" do |vb| + vb.gui = true + vb.memory = 1024 + end + + config.vm.provider 'hyperv' do |hv| + hv.ip_address_timeout = 240 + hv.memory = 1024 + end + + config.vm.provider :libvirt do |domain| + domain.memory = 2028 + domain.cpus = 2 + end +end From d0b01aefd0b5338243194a209de4393649ce78a6 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith@chef.io> Date: Fri, 1 Jun 2018 15:04:47 -0700 Subject: [PATCH 0797/1622] Remove more scripts and tweak the cookbook Signed-off-by: Tim Smith <tsmith@chef.io> --- windows/2012r2.json | 1 - .../cookbooks/packer-templates/metadata.rb | 1 - .../packer-templates/recipes/default.rb | 88 ------------------- .../recipes/install_ps_modules.rb | 11 --- .../packer-templates/recipes/psgallery.rb | 3 - 5 files changed, 104 deletions(-) delete mode 100644 windows/cookbooks/packer-templates/recipes/default.rb delete mode 100644 windows/cookbooks/packer-templates/recipes/install_ps_modules.rb delete mode 100644 windows/cookbooks/packer-templates/recipes/psgallery.rb diff --git a/windows/2012r2.json b/windows/2012r2.json index d12f40971..a0de937ab 100644 --- a/windows/2012r2.json +++ b/windows/2012r2.json @@ -28,7 +28,6 @@ "cookbook_paths": ["cookbooks"], "guest_os_type": "windows", "run_list": [ - "packer-templates::install_ps_modules", "packer-templates::vbox_guest_additions", "packer-templates::uninstall_powershell_ise", "packer-templates::delete_pagefile" diff --git a/windows/cookbooks/packer-templates/metadata.rb b/windows/cookbooks/packer-templates/metadata.rb index cec6ea58b..38b6585af 100644 --- a/windows/cookbooks/packer-templates/metadata.rb +++ b/windows/cookbooks/packer-templates/metadata.rb @@ -3,7 +3,6 @@ maintainer_email 'matt@mattwrock.com' license 'Apache-2.0' description 'Resources run during packer builds' -long_description 'Resources run during packer builds' version '0.1.0' chef_version '>= 14.0' diff --git a/windows/cookbooks/packer-templates/recipes/default.rb b/windows/cookbooks/packer-templates/recipes/default.rb deleted file mode 100644 index 1a242ff9b..000000000 --- a/windows/cookbooks/packer-templates/recipes/default.rb +++ /dev/null @@ -1,88 +0,0 @@ -powershell_script 'lots of stuff' do - code <<-EOH - $ErrorActionPreference = "Stop" - . a:/Test-Command.ps1 - - Write-Host "Enabling file sharing firewall rules" - netsh advfirewall firewall set rule group="File and Printer Sharing" new enable=yes - - if(Test-Path "C:/Users/vagrant/VBoxGuestAdditions.iso") { - Write-Host "Installing Guest Additions" - certutil -addstore -f "TrustedPublisher" A:/oracle.cer - cinst 7zip.commandline -y - Move-Item C:/Users/vagrant/VBoxGuestAdditions.iso C:/Windows/Temp - ."C:/ProgramData/chocolatey/lib/7zip.commandline/tools/7z.exe" x C:/Windows/Temp/VBoxGuestAdditions.iso -oC:/Windows/Temp/virtualbox - - Start-Process -FilePath "C:/Windows/Temp/virtualbox/VBoxWindowsAdditions.exe" -ArgumentList "/S" -WorkingDirectory "C:/Windows/Temp/virtualbox" -Wait - - Remove-Item C:/Windows/Temp/virtualbox -Recurse -Force - Remove-Item C:/Windows/Temp/VBoxGuestAdditions.iso -Force - } - - Write-Host "Cleaning SxS..." - Dism.exe /online /Cleanup-Image /StartComponentCleanup /ResetBase - - @( - "$env:localappdata/Nuget", - "$env:localappdata/temp/*", - "$env:windir/logs", - "$env:windir/panther", - "$env:windir/temp/*", - "$env:windir/winsxs/manifestcache" - ) | % { - if(Test-Path $_) { - Write-Host "Removing $_" - try { - Takeown /d Y /R /f $_ - Icacls $_ /GRANT:r administrators:F /T /c /q 2>&1 | Out-Null - Remove-Item $_ -Recurse -Force | Out-Null - } catch { $global:error.RemoveAt(0) } - } - } - - Write-Host "defragging..." - if (Test-Command -cmdname 'Optimize-Volume') { - Optimize-Volume -DriveLetter C - } else { - Defrag.exe c: /H - } - - Write-Host "0ing out empty space..." - $FilePath="c:/zero.tmp" - $Volume = Get-WmiObject win32_logicaldisk -filter "DeviceID='C:'" - $ArraySize= 64kb - $SpaceToLeave= $Volume.Size * 0.05 - $FileSize= $Volume.FreeSpace - $SpacetoLeave - $ZeroArray= new-object byte[]($ArraySize) - - $Stream= [io.File]::OpenWrite($FilePath) - try { - $CurFileSize = 0 - while($CurFileSize -lt $FileSize) { - $Stream.Write($ZeroArray,0, $ZeroArray.Length) - $CurFileSize +=$ZeroArray.Length - } - } - finally { - if($Stream) { - $Stream.Close() - } - } - - Del $FilePath - - Write-Host "copying auto unattend file" - mkdir C:/Windows/setup/scripts - copy-item a:/SetupComplete-2012.cmd C:/Windows/setup/scripts/SetupComplete.cmd -Force - - mkdir C:/Windows/Panther/Unattend - copy-item a:/postunattend.xml C:/Windows/Panther/Unattend/unattend.xml - - Write-Host "Recreate pagefile after sysprep" - $System = GWMI Win32_ComputerSystem -EnableAllPrivileges - if ($system -ne $null) { - $System.AutomaticManagedPagefile = $true - $System.Put() - } - EOH -end diff --git a/windows/cookbooks/packer-templates/recipes/install_ps_modules.rb b/windows/cookbooks/packer-templates/recipes/install_ps_modules.rb deleted file mode 100644 index e4c027bad..000000000 --- a/windows/cookbooks/packer-templates/recipes/install_ps_modules.rb +++ /dev/null @@ -1,11 +0,0 @@ -powershell_script 'install Nuget package provider' do - code 'Install-PackageProvider -Name NuGet -Force' - not_if '(Get-PackageProvider -Name Nuget -ListAvailable -ErrorAction SilentlyContinue) -ne $null' -end - -%w{PSWindowsUpdate xNetworking xRemoteDesktopAdmin xCertificate}.each do |ps_module| - powershell_script "install #{ps_module} module" do - code "Install-Module #{ps_module} -Force" - not_if "(Get-Module #{ps_module} -list) -ne $null" - end -end \ No newline at end of file diff --git a/windows/cookbooks/packer-templates/recipes/psgallery.rb b/windows/cookbooks/packer-templates/recipes/psgallery.rb deleted file mode 100644 index 59cf81e3c..000000000 --- a/windows/cookbooks/packer-templates/recipes/psgallery.rb +++ /dev/null @@ -1,3 +0,0 @@ -package 'powershell gallery' do - source 'https://download.microsoft.com/download/C/4/1/C41378D4-7F41-4BBE-9D0D-0E4F98585C61/PackageManagement_x64.msi' -end From 0853bbf6810d2f899225c96fac6f51b128199d44 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith@chef.io> Date: Fri, 1 Jun 2018 16:49:56 -0700 Subject: [PATCH 0798/1622] First part of getting 2k8r2 and updates to the cookbook Signed-off-by: Tim Smith <tsmith@chef.io> --- windows/2008r2.json | 33 ++-- windows/2012r2.json | 33 ++-- windows/2016.json | 149 +++++++----------- windows/7.json | 2 +- windows/answer_files/2008_r2/Autounattend.xml | 99 ++++++++++-- .../cookbooks/packer-templates/metadata.rb | 1 - .../packer-templates/recipes/add_pagefile.rb | 4 - .../recipes/add_postunattend.rb | 18 --- .../recipes/add_setup_complete.rb | 21 --- .../packer-templates/recipes/clean_sxs.rb | 4 - .../packer-templates/recipes/cleanup.rb | 40 +++++ .../recipes/delete_pagefile.rb | 7 - .../recipes/disable_windows_update.rb | 10 ++ .../recipes/enable_remote_desktop.rb | 7 + .../packer-templates/recipes/power.rb | 15 ++ .../recipes/remote_desktop.rb | 12 -- .../packer-templates/recipes/remove_dirs.rb | 20 --- .../packer-templates/recipes/ui_tweaks.rb | 13 ++ .../recipes/vbox_guest_additions.rb | 12 -- .../packer-templates/recipes/vm_tools.rb | 21 +++ .../templates/packer_shutdown.bat.erb | 5 - .../templates/postunattend.xml.erb | 49 ------ 22 files changed, 297 insertions(+), 278 deletions(-) delete mode 100644 windows/cookbooks/packer-templates/recipes/add_pagefile.rb delete mode 100644 windows/cookbooks/packer-templates/recipes/add_postunattend.rb delete mode 100644 windows/cookbooks/packer-templates/recipes/add_setup_complete.rb delete mode 100644 windows/cookbooks/packer-templates/recipes/clean_sxs.rb create mode 100644 windows/cookbooks/packer-templates/recipes/cleanup.rb delete mode 100644 windows/cookbooks/packer-templates/recipes/delete_pagefile.rb create mode 100644 windows/cookbooks/packer-templates/recipes/disable_windows_update.rb create mode 100644 windows/cookbooks/packer-templates/recipes/enable_remote_desktop.rb create mode 100644 windows/cookbooks/packer-templates/recipes/power.rb delete mode 100644 windows/cookbooks/packer-templates/recipes/remote_desktop.rb delete mode 100644 windows/cookbooks/packer-templates/recipes/remove_dirs.rb create mode 100644 windows/cookbooks/packer-templates/recipes/ui_tweaks.rb delete mode 100644 windows/cookbooks/packer-templates/recipes/vbox_guest_additions.rb create mode 100644 windows/cookbooks/packer-templates/recipes/vm_tools.rb delete mode 100644 windows/cookbooks/packer-templates/templates/packer_shutdown.bat.erb delete mode 100644 windows/cookbooks/packer-templates/templates/postunattend.xml.erb diff --git a/windows/2008r2.json b/windows/2008r2.json index 69bfcfb89..d478e51f4 100644 --- a/windows/2008r2.json +++ b/windows/2008r2.json @@ -13,23 +13,36 @@ "iso_url": "{{ user `iso_url` }}", "iso_checksum": "{{ user `iso_checksum` }}", "iso_checksum_type": "sha1", + "output_directory": "../builds/packer-{{user `template`}}-virtualbox", "communicator": "winrm", "winrm_username": "vagrant", "winrm_password": "vagrant", "winrm_timeout": "12h", - "shutdown_command": "a:/PackerShutdown.bat", + "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"", "shutdown_timeout": "15m", "floppy_files": [ - "answer_files/2008_r2{{user `core`}}/Autounattend.xml", - "scripts/package.ps1", - "scripts/winrm.cmd", - "scripts/SetupComplete.cmd", + "answer_files/2008_r2/Autounattend.xml" ] }], "provisioners": [{ - "type": "powershell", - "script": "scripts/provision.ps1" - }], + "type": "chef-solo", + "cookbook_paths": ["cookbooks"], + "guest_os_type": "windows", + "run_list": [ + "packer-templates::vbox_guest_additions", + "packer-templates::uninstall_powershell_ise", + "packer-templates::enable_file_sharing", + "packer-templates::enable_remote_desktop", + "packer-templates::cleanup" + ] + }, + { + "type": "powershell", + "script": "scripts/cleanup.ps1", + "elevated_user": "vagrant", + "elevated_password": "vagrant" + } + ], "post-processors": [ [{ "type": "vagrant", @@ -39,10 +52,10 @@ }] ], "variables": { - "core": "", "guest_additions_mode": "attach", "headless": "false", "iso_checksum": "beed231a34e90e1dd9a04b3afabec31d62ce3889", - "iso_url": "http://download.microsoft.com/download/7/5/E/75EC4E54-5B02-42D6-8879-D8D3A25FBEF7/7601.17514.101119-1850_x64fre_server_eval_en-us-GRMSXEVAL_EN_DVD.iso" + "iso_url": "http://download.microsoft.com/download/7/5/E/75EC4E54-5B02-42D6-8879-D8D3A25FBEF7/7601.17514.101119-1850_x64fre_server_eval_en-us-GRMSXEVAL_EN_DVD.iso", + "template": "windows-2008r2-standard" } } diff --git a/windows/2012r2.json b/windows/2012r2.json index a0de937ab..10c2623ad 100644 --- a/windows/2012r2.json +++ b/windows/2012r2.json @@ -13,6 +13,7 @@ "iso_url": "{{ user `iso_url` }}", "iso_checksum": "{{ user `iso_checksum` }}", "iso_checksum_type": "sha1", + "output_directory": "../builds/packer-{{user `template`}}-virtualbox", "communicator": "winrm", "winrm_username": "vagrant", "winrm_password": "vagrant", @@ -24,15 +25,26 @@ ] }], "provisioners": [{ - "type": "chef-solo", - "cookbook_paths": ["cookbooks"], - "guest_os_type": "windows", - "run_list": [ - "packer-templates::vbox_guest_additions", - "packer-templates::uninstall_powershell_ise", - "packer-templates::delete_pagefile" - ] - }], + "type": "chef-solo", + "cookbook_paths": ["cookbooks"], + "guest_os_type": "windows", + "run_list": [ + "packer-templates::vm_tools", + "packer-templates::uninstall_powershell_ise", + "packer-templates::enable_file_sharing", + "packer-templates::enable_remote_desktop", + "packer-templates::ui_tweaks", + "packer-templates::power", + "packer-templates::cleanup" + ] + }, + { + "type": "powershell", + "script": "scripts/cleanup.ps1", + "elevated_user": "vagrant", + "elevated_password": "vagrant" + } + ], "post-processors": [ [{ "type": "vagrant", @@ -45,6 +57,7 @@ "guest_additions_mode": "attach", "headless": "false", "iso_checksum": "849734f37346385dac2c101e4aacba4626bb141c", - "iso_url": "http://care.dlservice.microsoft.com/dl/download/6/2/A/62A76ABB-9990-4EFC-A4FE-C7D698DAEB96/9600.17050.WINBLUE_REFRESH.140317-1640_X64FRE_SERVER_EVAL_EN-US-IR3_SSS_X64FREE_EN-US_DV9.ISO" + "iso_url": "http://care.dlservice.microsoft.com/dl/download/6/2/A/62A76ABB-9990-4EFC-A4FE-C7D698DAEB96/9600.17050.WINBLUE_REFRESH.140317-1640_X64FRE_SERVER_EVAL_EN-US-IR3_SSS_X64FREE_EN-US_DV9.ISO", + "template": "windows-2012r2-standard" } } diff --git a/windows/2016.json b/windows/2016.json index 4dd76a338..9c70f9b7d 100644 --- a/windows/2016.json +++ b/windows/2016.json @@ -1,96 +1,57 @@ { - "builders": [ - { - "type": "virtualbox-iso", - "vboxmanage": [ - [ "modifyvm", "{{.Name}}", "--memory", "2048" ], - [ "modifyvm", "{{.Name}}", "--vram", "48" ], - [ "modifyvm", "{{.Name}}", "--cpus", "2" ] - ], - "guest_additions_mode": "{{ user `guest_additions_mode` }}", - "guest_os_type": "Windows2016_64", - "headless": "{{ user `headless` }}", - "iso_url": "{{ user `iso_url` }}", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "md5", - "communicator": "winrm", - "winrm_username": "vagrant", - "winrm_password": "vagrant", - "winrm_timeout": "12h", - "shutdown_command": "C:/Windows/Panther/Unattend/packer_shutdown.bat", - "shutdown_timeout": "15m", - "floppy_files": [ - "answer_files/2016/Autounattend.xml", - "scripts/winrm.cmd" - ] - } - ], - "provisioners": [ - { - "type": "chef-solo", - "cookbook_paths": ["cookbooks", "vendor/cookbooks"], - "guest_os_type": "windows", - "run_list": [ - "packer-templates::install_ps_modules", - "packer-templates::vbox_guest_additions", - "packer-templates::uninstall_powershell_ise", - "packer-templates::delete_pagefile" - ] - }, - { - "type": "powershell", - "script": "scripts/windows-updates.ps1", - "elevated_user": "vagrant", - "elevated_password": "vagrant" - }, - { - "type": "windows-restart", - "restart_timeout": "15m" - }, - { - "type": "powershell", - "script": "scripts/after-reboot.ps1", - "elevated_user": "vagrant", - "elevated_password": "vagrant" - }, - { - "type": "chef-solo", - "remote_cookbook_paths": [ - "c:/windows/temp/packer-chef-solo/cookbooks-0", - "c:/windows/temp/packer-chef-solo/cookbooks-1" - ], - "guest_os_type": "windows", - "skip_install": "true", - "run_list": [ - "packer-templates::enable_file_sharing", - "packer-templates::remote_desktop", - "packer-templates::clean_sxs", - "packer-templates::add_postunattend", - "packer-templates::add_pagefile", - "packer-templates::set_local_account_token_filter_policy", - "packer-templates::remove_dirs", - "packer-templates::add_setup_complete" - ] - }, - { - "type": "powershell", - "script": "scripts/cleanup.ps1", - "elevated_user": "vagrant", - "elevated_password": "vagrant" - } - ], - "post-processors": [ - { - "type": "vagrant", - "keep_input_artifact": true, - "output": "windows2016min-{{.Provider}}.box", - "vagrantfile_template": "vagrantfile-windows.template" - } - ], - "variables": { - "guest_additions_mode": "attach", - "headless": "true", - "iso_checksum": "18a4f00a675b0338f3c7c93c4f131beb", - "iso_url": "http://care.dlservice.microsoft.com/dl/download/1/6/F/16FA20E6-4662-482A-920B-1A45CF5AAE3C/14393.0.160715-1616.RS1_RELEASE_SERVER_EVAL_X64FRE_EN-US.ISO" - } + "builders": [{ + "type": "virtualbox-iso", + "vboxmanage": [ + ["modifyvm", "{{.Name}}", "--memory", "2048"], + ["modifyvm", "{{.Name}}", "--vram", "48"], + ["modifyvm", "{{.Name}}", "--cpus", "2"] + ], + "guest_additions_mode": "{{ user `guest_additions_mode` }}", + "guest_os_type": "Windows2016_64", + "headless": "{{ user `headless` }}", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_checksum_type": "md5", + "communicator": "winrm", + "winrm_username": "vagrant", + "winrm_password": "vagrant", + "winrm_timeout": "12h", + "shutdown_command": "C:/Windows/Panther/Unattend/packer_shutdown.bat", + "shutdown_timeout": "15m", + "floppy_files": [ + "answer_files/2016/Autounattend.xml", + "scripts/winrm.cmd" + ] + }], + "provisioners": [{ + "type": "chef-solo", + "cookbook_paths": ["cookbooks"], + "guest_os_type": "windows", + "run_list": [ + "packer-templates::vbox_guest_additions", + "packer-templates::uninstall_powershell_ise", + "packer-templates::enable_file_sharing", + "packer-templates::enable_remote_desktop", + "packer-templates::cleanup" + ] + }, + { + "type": "powershell", + "script": "scripts/cleanup.ps1", + "elevated_user": "vagrant", + "elevated_password": "vagrant" + } + ], + "post-processors": [{ + "type": "vagrant", + "keep_input_artifact": true, + "output": "windows2016min-{{.Provider}}.box", + "vagrantfile_template": "vagrantfile-windows.template" + }], + "variables": { + "guest_additions_mode": "attach", + "headless": "true", + "iso_checksum": "18a4f00a675b0338f3c7c93c4f131beb", + "iso_url": "http://care.dlservice.microsoft.com/dl/download/1/6/F/16FA20E6-4662-482A-920B-1A45CF5AAE3C/14393.0.160715-1616.RS1_RELEASE_SERVER_EVAL_X64FRE_EN-US.ISO" + } } diff --git a/windows/7.json b/windows/7.json index 15a58f3e7..0e6f4f13e 100644 --- a/windows/7.json +++ b/windows/7.json @@ -11,7 +11,7 @@ "iso_checksum": "{{ user `iso_checksum` }}", "iso_checksum_type": "sha1", "communicator": "winrm", - "headless": "{{ user `headless` }}", + "headless": "{{ user `headless` }}", "winrm_username": "vagrant", "winrm_password": "vagrant", "winrm_timeout": "24h", diff --git a/windows/answer_files/2008_r2/Autounattend.xml b/windows/answer_files/2008_r2/Autounattend.xml index 3ac7fe3ab..cdbb6eab7 100644 --- a/windows/answer_files/2008_r2/Autounattend.xml +++ b/windows/answer_files/2008_r2/Autounattend.xml @@ -113,21 +113,100 @@ <Enabled>true</Enabled> </AutoLogon> <FirstLogonCommands> - <SynchronousCommand wcm:action="add"> - <CommandLine>cmd.exe /c powershell -Command "Set-ExecutionPolicy -ExecutionPolicy RemoteSigned -Force"</CommandLine> - <Description>Set Execution Policy 64 Bit</Description> - <Order>1</Order> + <SynchronousCommand wcm:action="add"> + <CommandLine>cmd.exe /c powershell -Command "Set-ExecutionPolicy -ExecutionPolicy RemoteSigned -Force"</CommandLine> + <Description>Set Execution Policy 64 Bit</Description> + <Order>1</Order> + <RequiresUserInput>true</RequiresUserInput> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <CommandLine>C:\Windows\SysWOW64\cmd.exe /c powershell -Command "Set-ExecutionPolicy -ExecutionPolicy RemoteSigned -Force"</CommandLine> + <Description>Set Execution Policy 32 Bit</Description> + <Order>2</Order> + <RequiresUserInput>true</RequiresUserInput> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <CommandLine>cmd.exe /c winrm quickconfig -q</CommandLine> + <Description>winrm quickconfig -q</Description> + <Order>3</Order> <RequiresUserInput>true</RequiresUserInput> </SynchronousCommand> <SynchronousCommand wcm:action="add"> - <CommandLine>C:\Windows\SysWOW64\cmd.exe /c powershell -Command "Set-ExecutionPolicy -ExecutionPolicy RemoteSigned -Force"</CommandLine> - <Description>Set Execution Policy 32 Bit</Description> - <Order>2</Order> + <CommandLine>cmd.exe /c winrm quickconfig -transport:http</CommandLine> + <Description>winrm quickconfig -transport:http</Description> + <Order>4</Order> <RequiresUserInput>true</RequiresUserInput> </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <CommandLine>cmd.exe /c C:\Windows\System32\WindowsPowerShell\v1.0\powershell.exe -File a:\boxstarter.ps1</CommandLine> - <Order>3</Order> + <SynchronousCommand wcm:action="add"> + <CommandLine>cmd.exe /c winrm set winrm/config @{MaxTimeoutms="1800000"}</CommandLine> + <Description>Win RM MaxTimoutms</Description> + <Order>5</Order> + <RequiresUserInput>true</RequiresUserInput> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <CommandLine>cmd.exe /c winrm set winrm/config/winrs @{MaxMemoryPerShellMB="800"}</CommandLine> + <Description>Win RM MaxMemoryPerShellMB</Description> + <Order>6</Order> + <RequiresUserInput>true</RequiresUserInput> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <CommandLine>cmd.exe /c winrm set winrm/config/service @{AllowUnencrypted="true"}</CommandLine> + <Description>Win RM AllowUnencrypted</Description> + <Order>7</Order> + <RequiresUserInput>true</RequiresUserInput> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <CommandLine>cmd.exe /c winrm set winrm/config/service/auth @{Basic="true"}</CommandLine> + <Description>Win RM auth Basic</Description> + <Order>8</Order> + <RequiresUserInput>true</RequiresUserInput> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <CommandLine>cmd.exe /c winrm set winrm/config/client/auth @{Basic="true"}</CommandLine> + <Description>Win RM client auth Basic</Description> + <Order>9</Order> + <RequiresUserInput>true</RequiresUserInput> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <CommandLine>cmd.exe /c winrm set winrm/config/listener?Address=*+Transport=HTTP @{Port="5985"} </CommandLine> + <Description>Win RM listener Address/Port</Description> + <Order>10</Order> + <RequiresUserInput>true</RequiresUserInput> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <CommandLine>cmd.exe /c netsh advfirewall firewall set rule group="remote administration" new enable=yes </CommandLine> + <Description>Win RM adv firewall enable</Description> + <Order>11</Order> + <RequiresUserInput>true</RequiresUserInput> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <CommandLine>cmd.exe /c netsh firewall add portopening TCP 5985 "Port 5985" </CommandLine> + <Description>Win RM port open</Description> + <Order>12</Order> + <RequiresUserInput>true</RequiresUserInput> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <CommandLine>cmd.exe /c net stop winrm </CommandLine> + <Description>Stop Win RM Service </Description> + <Order>13</Order> + <RequiresUserInput>true</RequiresUserInput> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <CommandLine>cmd.exe /c sc config winrm start= auto</CommandLine> + <Description>Win RM Autostart</Description> + <Order>14</Order> + <RequiresUserInput>true</RequiresUserInput> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <CommandLine>cmd.exe /c net start winrm</CommandLine> + <Description>Start Win RM Service</Description> + <Order>15</Order> + <RequiresUserInput>true</RequiresUserInput> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <CommandLine>cmd.exe /c wmic useraccount where "name='vagrant'" set PasswordExpires=FALSE</CommandLine> + <Order>16</Order> + <Description>Disable password expiration for vagrant user</Description> </SynchronousCommand> </FirstLogonCommands> <ShowWindowsLive>false</ShowWindowsLive> diff --git a/windows/cookbooks/packer-templates/metadata.rb b/windows/cookbooks/packer-templates/metadata.rb index 38b6585af..235708388 100644 --- a/windows/cookbooks/packer-templates/metadata.rb +++ b/windows/cookbooks/packer-templates/metadata.rb @@ -4,5 +4,4 @@ license 'Apache-2.0' description 'Resources run during packer builds' version '0.1.0' - chef_version '>= 14.0' diff --git a/windows/cookbooks/packer-templates/recipes/add_pagefile.rb b/windows/cookbooks/packer-templates/recipes/add_pagefile.rb deleted file mode 100644 index 65bac7757..000000000 --- a/windows/cookbooks/packer-templates/recipes/add_pagefile.rb +++ /dev/null @@ -1,4 +0,0 @@ -windows_pagefile 'add pagefile' do - automatic_managed true - action :set -end diff --git a/windows/cookbooks/packer-templates/recipes/add_postunattend.rb b/windows/cookbooks/packer-templates/recipes/add_postunattend.rb deleted file mode 100644 index 32f00727b..000000000 --- a/windows/cookbooks/packer-templates/recipes/add_postunattend.rb +++ /dev/null @@ -1,18 +0,0 @@ -directory 'Remove old panther directory' do - path 'C:\Windows\Panther' - recursive true - action :delete -end - -directory 'create unattend directory' do - path 'C:\Windows\Panther\Unattend' - recursive true -end - -template 'C:/Windows/Panther/Unattend/unattend.xml' do - source 'postunattend.xml.erb' -end - -template 'C:/Windows/Panther/Unattend/packer_shutdown.bat' do - source 'packer_shutdown.bat.erb' -end diff --git a/windows/cookbooks/packer-templates/recipes/add_setup_complete.rb b/windows/cookbooks/packer-templates/recipes/add_setup_complete.rb deleted file mode 100644 index 3e7f0f894..000000000 --- a/windows/cookbooks/packer-templates/recipes/add_setup_complete.rb +++ /dev/null @@ -1,21 +0,0 @@ -# On first boot, the WinRM and other services are starting -# and stopping and restarting and somewhere in the middle of -# all of that vagrant finds that WinRM is accessible but -# something is shutdown in the middle of its connection attempt -# sometimes resulting in an error. - -# To work around this we disable the WinRM firewall in the -# shutdown command and turn it back on in SetupComplete.cmd -# file. This way while the box is going through its first boot -# cycles of restarting services, it cant get to WinRM. -# Then once its fully up it runs SetupComplete and the WinRM -# port is made accessible. - -directory "C:/Windows/setup/scripts" do - recursive true -end - -file "restart winmgmt on first boot" do - content "netsh advfirewall firewall set rule name=\"WinRM-HTTP\" new action=allow" - path "C:/Windows/setup/scripts/SetupComplete.cmd" -end diff --git a/windows/cookbooks/packer-templates/recipes/clean_sxs.rb b/windows/cookbooks/packer-templates/recipes/clean_sxs.rb deleted file mode 100644 index a2f67eaa7..000000000 --- a/windows/cookbooks/packer-templates/recipes/clean_sxs.rb +++ /dev/null @@ -1,4 +0,0 @@ -batch 'clean SxS' do - code 'Dism.exe /online /Cleanup-Image /StartComponentCleanup /ResetBase' - ignore_failure true -end diff --git a/windows/cookbooks/packer-templates/recipes/cleanup.rb b/windows/cookbooks/packer-templates/recipes/cleanup.rb new file mode 100644 index 000000000..2c9923252 --- /dev/null +++ b/windows/cookbooks/packer-templates/recipes/cleanup.rb @@ -0,0 +1,40 @@ +execute "run cleanmgr" do + command 'C:\Windows\System32\cleanmgr.exe /sagerun:10' + ignore_failure true + only_if "" +end + +execute 'clean SxS' do + command 'Dism.exe /online /Cleanup-Image /StartComponentCleanup /ResetBase' + ignore_failure true + only_if { node['platform_version'].to_f > 6.1 } # command not present on Windows 7 +end + +powershell_script 'remove unnecesary directories' do + code <<-EOH + @( + "C:\\Recovery", + "$env:localappdata\\temp\\*", + "$env:windir\\logs", + "$env:windir\\winsxs\\manifestcache"s + ) | % { + if(Test-Path $_) { + Write-Host "Removing $_" + try { + Takeown /d Y /R /f $_ + Icacls $_ /GRANT:r administrators:F /T /c /q 2>&1 | Out-Null + Remove-Item $_ -Recurse -Force | Out-Null + } catch { $global:error.RemoveAt(0) } + } + } + EOH +end + +# remove pagefile +registry_key 'HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Session Manager\Memory Management' do + values [{ + :name => 'PagingFiles', + :type => :string, + :data => '' + }] +end diff --git a/windows/cookbooks/packer-templates/recipes/delete_pagefile.rb b/windows/cookbooks/packer-templates/recipes/delete_pagefile.rb deleted file mode 100644 index 13e26b9a5..000000000 --- a/windows/cookbooks/packer-templates/recipes/delete_pagefile.rb +++ /dev/null @@ -1,7 +0,0 @@ -registry_key 'HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Session Manager\Memory Management' do - values [{ - :name => 'PagingFiles', - :type => :string, - :data => '' - }] -end diff --git a/windows/cookbooks/packer-templates/recipes/disable_windows_update.rb b/windows/cookbooks/packer-templates/recipes/disable_windows_update.rb new file mode 100644 index 000000000..fc03117f2 --- /dev/null +++ b/windows/cookbooks/packer-templates/recipes/disable_windows_update.rb @@ -0,0 +1,10 @@ +# reg add reg add "HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows\WindowsUpdate\AU" /v AUOptions /t REG_DWORD /d 2 /f +# +# :: turn the whole thing off +# reg add "HKEY_LOCAL_MACHINE\Software\Policies\Microsoft\Windows\WindowsUpdate" /v DisableWindowsUpdateAccess /t REG_DWORD /d 1 /f +# reg add "HKEY_LOCAL_MACHINE\Software\Policies\Microsoft\Windows\WindowsUpdate\AU" /v NoAutoUpdate /t REG_DWORD /d 1 /f +# +# :: disable the update prompt scheduled tasks +# schtasks.exe /change /tn "\Microsoft\Windows\UpdateOrchestrator\USO_UxBroker_Display" /disable +# schtasks.exe /change /tn "\Microsoft\Windows\UpdateOrchestrator\MusUx_UpdateInterval" /disable +# schtasks.exe /change /tn "\Microsoft\Windows\WindowsUpdate\sih" /disable diff --git a/windows/cookbooks/packer-templates/recipes/enable_remote_desktop.rb b/windows/cookbooks/packer-templates/recipes/enable_remote_desktop.rb new file mode 100644 index 000000000..ae54e149b --- /dev/null +++ b/windows/cookbooks/packer-templates/recipes/enable_remote_desktop.rb @@ -0,0 +1,7 @@ +execute 'Enable RDP' do + command 'reg add "HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Terminal Server" /v fDenyTSConnections /t REG_DWORD /d 0 /f' +end + +execute 'Enable RDP firewall rule' do + command 'netsh advfirewall firewall add rule name="Open Port 3389" dir=in action=allow protocol=TCP localport=3389' +end diff --git a/windows/cookbooks/packer-templates/recipes/power.rb b/windows/cookbooks/packer-templates/recipes/power.rb new file mode 100644 index 000000000..bd8909713 --- /dev/null +++ b/windows/cookbooks/packer-templates/recipes/power.rb @@ -0,0 +1,15 @@ +execute "Set high performance power profile" do + command "powercfg -setactive 8c5e7fda-e8bf-4a96-9a85-a6e23a8c635c" +end + +execute 'Turn off Hibernation' do + command 'powercfg -h off' +end + +execute 'Turn off monitor timeout on AC power' do + command 'powercfg -Change -monitor-timeout-ac 0' +end + +execute 'Turn off monitor timeout on DC power' do + command 'powercfg -Change -monitor-timeout-dc 0' +end diff --git a/windows/cookbooks/packer-templates/recipes/remote_desktop.rb b/windows/cookbooks/packer-templates/recipes/remote_desktop.rb deleted file mode 100644 index bf8edc720..000000000 --- a/windows/cookbooks/packer-templates/recipes/remote_desktop.rb +++ /dev/null @@ -1,12 +0,0 @@ -dsc_resource "Enable RDP" do - resource :xRemoteDesktopAdmin - property :UserAuthentication, "Secure" - property :ensure, "Present" -end - -dsc_resource "Allow RDP firewall rule" do - resource :xfirewall - property :name, "Remote Desktop" - property :ensure, "Present" - property :enabled, "True" -end diff --git a/windows/cookbooks/packer-templates/recipes/remove_dirs.rb b/windows/cookbooks/packer-templates/recipes/remove_dirs.rb deleted file mode 100644 index 03dd0a6f8..000000000 --- a/windows/cookbooks/packer-templates/recipes/remove_dirs.rb +++ /dev/null @@ -1,20 +0,0 @@ -powershell_script 'remove unnecesary directories' do - code <<-EOH - @( - "C:\\Recovery", - "$env:localappdata\\Nuget", - "$env:localappdata\\temp\\*", - "$env:windir\\logs", - "$env:windir\\winsxs\\manifestcache" - ) | % { - if(Test-Path $_) { - Write-Host "Removing $_" - try { - Takeown /d Y /R /f $_ - Icacls $_ /GRANT:r administrators:F /T /c /q 2>&1 | Out-Null - Remove-Item $_ -Recurse -Force | Out-Null - } catch { $global:error.RemoveAt(0) } - } - } - EOH -end diff --git a/windows/cookbooks/packer-templates/recipes/ui_tweaks.rb b/windows/cookbooks/packer-templates/recipes/ui_tweaks.rb new file mode 100644 index 000000000..460b21f3a --- /dev/null +++ b/windows/cookbooks/packer-templates/recipes/ui_tweaks.rb @@ -0,0 +1,13 @@ +# echo ==^> Show file extensions +# :: Default is 1 - hide file extensions +# reg add "HKCU\Software\Microsoft\Windows\CurrentVersion\Explorer\Advanced" /f /v HideFileExt /t REG_DWORD /d 0 +# echo ==^> Show hidden files and folders +# :: Default is 2 - do not show hidden files and folders +# reg add "HKCU\Software\Microsoft\Windows\CurrentVersion\Explorer\Advanced" /f /v Hidden /t REG_DWORD /d 1 +# echo ==^> Display Full path +# :: Default FullPath 0 and FullPathAddress 0 +# reg add "HKCU\Software\Microsoft\Windows\CurrentVersion\Explorer\Advanced" /f /v FullPath /t REG_DWORD /d 1 +# reg add "HKCU\Software\Microsoft\Windows\CurrentVersion\Explorer\Advanced" /f /v FullPathAddress /t REG_DWORD /d 1 + +# echo ==^> Disabling new network prompt +# reg add "HKLM\System\CurrentControlSet\Control\Network\NewNetworkWindowOff" diff --git a/windows/cookbooks/packer-templates/recipes/vbox_guest_additions.rb b/windows/cookbooks/packer-templates/recipes/vbox_guest_additions.rb deleted file mode 100644 index 2e1e44f7b..000000000 --- a/windows/cookbooks/packer-templates/recipes/vbox_guest_additions.rb +++ /dev/null @@ -1,12 +0,0 @@ -powershell_script 'install vbox guest additions' do - code <<-EOH - Get-ChildItem E:/cert/ -Filter vbox*.cer | ForEach-Object { - E:/cert/VBoxCertUtil.exe add-trusted-publisher $_.FullName --root $_.FullName - } - - mkdir "C:/Windows/Temp/virtualbox" -ErrorAction SilentlyContinue - Start-Process -FilePath "e:/VBoxWindowsAdditions.exe" -ArgumentList "/S" -WorkingDirectory "C:/Windows/Temp/virtualbox" -Wait - - Remove-Item C:/Windows/Temp/virtualbox -Recurse -Force - EOH -end diff --git a/windows/cookbooks/packer-templates/recipes/vm_tools.rb b/windows/cookbooks/packer-templates/recipes/vm_tools.rb new file mode 100644 index 000000000..8d2297b44 --- /dev/null +++ b/windows/cookbooks/packer-templates/recipes/vm_tools.rb @@ -0,0 +1,21 @@ +# install the correct tools per virtualization system +case node['virtualization']['system'] +when 'vbox' + directory 'C:/Windows/Temp/virtualbox' do + recursive true + end + + powershell_script 'install vbox guest additions' do + code <<-EOH + Get-ChildItem E:/cert/ -Filter vbox*.cer | ForEach-Object { + E:/cert/VBoxCertUtil.exe add-trusted-publisher $_.FullName --root $_.FullName + } + + Start-Process -FilePath "e:/VBoxWindowsAdditions.exe" -ArgumentList "/S" -WorkingDirectory "C:/Windows/Temp/virtualbox" -Wait + EOH + end + + directory 'C:/Windows/Temp/virtualbox' do + action :remove + end +end diff --git a/windows/cookbooks/packer-templates/templates/packer_shutdown.bat.erb b/windows/cookbooks/packer-templates/templates/packer_shutdown.bat.erb deleted file mode 100644 index 9a13b4618..000000000 --- a/windows/cookbooks/packer-templates/templates/packer_shutdown.bat.erb +++ /dev/null @@ -1,5 +0,0 @@ -call winrm set winrm/config/service/auth @{Basic="false"} -call winrm set winrm/config/service @{AllowUnencrypted="false"} -netsh advfirewall firewall set rule name="WinRM-HTTP" new action=block - -C:/windows/system32/sysprep/sysprep.exe /generalize /oobe /unattend:C:/Windows/Panther/Unattend/unattend.xml /quiet /shutdown diff --git a/windows/cookbooks/packer-templates/templates/postunattend.xml.erb b/windows/cookbooks/packer-templates/templates/postunattend.xml.erb deleted file mode 100644 index 8f6b52bea..000000000 --- a/windows/cookbooks/packer-templates/templates/postunattend.xml.erb +++ /dev/null @@ -1,49 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<unattend xmlns="urn:schemas-microsoft-com:unattend"> - <settings pass="generalize"> - <component name="Microsoft-Windows-Security-SPP" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - <SkipRearm>1</SkipRearm> - </component> - <component name="Microsoft-Windows-PnpSysprep" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - <PersistAllDeviceInstalls>false</PersistAllDeviceInstalls> - <DoNotCleanUpNonPresentDevices>false</DoNotCleanUpNonPresentDevices> - </component> - </settings> - <settings pass="oobeSystem"> - <component name="Microsoft-Windows-International-Core" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - <InputLocale>en-US</InputLocale> - <SystemLocale>en-US</SystemLocale> - <UILanguage>en-US</UILanguage> - <UserLocale>en-US</UserLocale> - </component> - <component name="Microsoft-Windows-Shell-Setup" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - <OOBE> - <HideEULAPage>true</HideEULAPage> - <ProtectYourPC>1</ProtectYourPC> - <NetworkLocation>Home</NetworkLocation> - <HideWirelessSetupInOOBE>true</HideWirelessSetupInOOBE> - </OOBE> - <TimeZone>UTC</TimeZone> - <UserAccounts> - <AdministratorPassword> - <Value>vagrant</Value> - <PlainText>true</PlainText> - </AdministratorPassword> - <LocalAccounts> - <LocalAccount wcm:action="add"> - <Password> - <Value>vagrant</Value> - <PlainText>true</PlainText> - </Password> - <Group>administrators</Group> - <DisplayName>Vagrant</DisplayName> - <Name>vagrant</Name> - <Description>Vagrant User</Description> - </LocalAccount> - </LocalAccounts> - </UserAccounts> - </component> - </settings> - <settings pass="specialize"> - </settings> -</unattend> From 114db84d1e3a8ceb2fca7dd083fb8b1a40d28f32 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith@chef.io> Date: Fri, 1 Jun 2018 17:07:37 -0700 Subject: [PATCH 0799/1622] Windows 7 cleanup cookbook fixes Signed-off-by: Tim Smith <tsmith@chef.io> --- windows/2012r2.json | 2 +- windows/7.json | 100 +++++++++++------- .../answer_files/{win7 => 7}/Autounattend.xml | 0 windows/answer_files/win7/postunattend.xml | 53 ---------- .../packer-templates/recipes/cleanup.rb | 10 +- .../recipes/enable_file_sharing.rb | 14 +-- .../packer-templates/recipes/power.rb | 4 +- .../set_local_account_token_filter_policy.rb | 6 +- .../packer-templates/recipes/vm_tools.rb | 2 +- 9 files changed, 75 insertions(+), 116 deletions(-) rename windows/answer_files/{win7 => 7}/Autounattend.xml (100%) delete mode 100644 windows/answer_files/win7/postunattend.xml diff --git a/windows/2012r2.json b/windows/2012r2.json index 10c2623ad..443cb757d 100644 --- a/windows/2012r2.json +++ b/windows/2012r2.json @@ -49,7 +49,7 @@ [{ "type": "vagrant", "keep_input_artifact": true, - "output": "windows2012r2-{{.Provider}}.box", + "output": "{{ user `template` }}-{{.Provider}}.box", "vagrantfile_template": "vagrantfile-windows.template" }] ], diff --git a/windows/7.json b/windows/7.json index 0e6f4f13e..83692f84e 100644 --- a/windows/7.json +++ b/windows/7.json @@ -1,41 +1,63 @@ { - "builders": [{ - "type": "virtualbox-iso", - "vboxmanage": [ - [ "modifyvm", "{{.Name}}", "--memory", "5120" ], - [ "modifyvm", "{{.Name}}", "--vram", "36" ], - [ "modifyvm", "{{.Name}}", "--cpus", "2" ] - ], - "guest_os_type": "Windows7_64", - "iso_url": "{{ user `iso_url` }}", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "sha1", - "communicator": "winrm", - "headless": "{{ user `headless` }}", - "winrm_username": "vagrant", - "winrm_password": "vagrant", - "winrm_timeout": "24h", - "shutdown_command": "C:/windows/system32/sysprep/sysprep.exe /generalize /oobe /unattend:C:/Windows/Panther/Unattend/unattend.xml /quiet /shutdown", - "shutdown_timeout": "15m", - "floppy_files": [ - "answer_files/win7/Autounattend.xml", - "answer_files/win7/postunattend.xml", - "scripts/boxstarter.ps1", - "scripts/package.ps1", - "scripts/Test-Command.ps1" - ] - }], - "post-processors": [ - { - "type": "vagrant", - "keep_input_artifact": true, - "output": "windows7-{{.Provider}}.box", - "vagrantfile_template": "vagrantfile-windows.template" - } - ], - "variables": { - "headless": "false", - "iso_checksum": "36ae90defbad9d9539e649b193ae573b77a71c83", - "iso_url": "iso/en_windows_7_ultimate_with_sp1_x64_dvd_u_677332.iso" - } + "builders": [{ + "type": "virtualbox-iso", + "vboxmanage": [ + ["modifyvm", "{{.Name}}", "--memory", "5120"], + ["modifyvm", "{{.Name}}", "--vram", "36"], + ["modifyvm", "{{.Name}}", "--cpus", "2"] + ], + "guest_additions_mode": "{{ user `guest_additions_mode` }}", + "guest_additions_path": "C:/users/vagrant/VBoxGuestAdditions.iso", + "guest_os_type": "Windows7_64", + "headless": "{{ user `headless` }}", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_checksum_type": "sha1", + "output_directory": "../builds/packer-{{user `template`}}-virtualbox", + "communicator": "winrm", + "winrm_username": "vagrant", + "winrm_password": "vagrant", + "winrm_timeout": "12h", + "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"", + "shutdown_timeout": "15m", + "floppy_files": [ + "answer_files/7/Autounattend.xml" + ] + }], + "provisioners": [{ + "type": "chef-solo", + "cookbook_paths": ["cookbooks"], + "guest_os_type": "windows", + "run_list": [ + "packer-templates::vm_tools", + "packer-templates::uninstall_powershell_ise", + "packer-templates::enable_file_sharing", + "packer-templates::enable_remote_desktop", + "packer-templates::ui_tweaks", + "packer-templates::power", + "packer-templates::cleanup" + ] + }, + { + "type": "powershell", + "script": "scripts/cleanup.ps1", + "elevated_user": "vagrant", + "elevated_password": "vagrant" + } + ], + "post-processors": [ + [{ + "type": "vagrant", + "keep_input_artifact": true, + "output": "{{ user `template` }}-{{.Provider}}.box", + "vagrantfile_template": "vagrantfile-windows.template" + }] + ], + "variables": { + "guest_additions_mode": "attach", + "headless": "false", + "iso_checksum": "36ae90defbad9d9539e649b193ae573b77a71c83", + "iso_url": "iso/en_windows_7_ultimate_with_sp1_x64_dvd_u_677332.iso" + "template": "windows-7" + } } diff --git a/windows/answer_files/win7/Autounattend.xml b/windows/answer_files/7/Autounattend.xml similarity index 100% rename from windows/answer_files/win7/Autounattend.xml rename to windows/answer_files/7/Autounattend.xml diff --git a/windows/answer_files/win7/postunattend.xml b/windows/answer_files/win7/postunattend.xml deleted file mode 100644 index 76d1f79c7..000000000 --- a/windows/answer_files/win7/postunattend.xml +++ /dev/null @@ -1,53 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<unattend xmlns="urn:schemas-microsoft-com:unattend"> - <settings pass="generalize"> - <component name="Microsoft-Windows-Security-SPP" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - <SkipRearm>1</SkipRearm> - </component> - <component name="Microsoft-Windows-PnpSysprep" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - <PersistAllDeviceInstalls>false</PersistAllDeviceInstalls> - <DoNotCleanUpNonPresentDevices>false</DoNotCleanUpNonPresentDevices> - </component> - </settings> - <settings pass="oobeSystem"> - <component name="Microsoft-Windows-International-Core" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - <InputLocale>en-US</InputLocale> - <SystemLocale>en-US</SystemLocale> - <UILanguage>en-US</UILanguage> - <UserLocale>en-US</UserLocale> - </component> - <component name="Microsoft-Windows-Shell-Setup" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - <OOBE> - <HideEULAPage>true</HideEULAPage> - <ProtectYourPC>1</ProtectYourPC> - <NetworkLocation>Home</NetworkLocation> - <HideWirelessSetupInOOBE>true</HideWirelessSetupInOOBE> - </OOBE> - <TimeZone>UTC</TimeZone> - <UserAccounts> - <AdministratorPassword> - <Value>vagrant</Value> - <PlainText>true</PlainText> - </AdministratorPassword> - <LocalAccounts> - <LocalAccount wcm:action="add"> - <Password> - <Value>vagrant</Value> - <PlainText>true</PlainText> - </Password> - <Group>administrators</Group> - <DisplayName>Vagrant</DisplayName> - <Name>vagrant</Name> - <Description>Vagrant User</Description> - </LocalAccount> - </LocalAccounts> - </UserAccounts> - </component> - </settings> - <settings pass="specialize"> - <component name="Microsoft-Windows-Shell-Setup" processorArchitecture="x86" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - <!--<ProductKey>your key here</ProductKey>--> - <ComputerName>vagrant-7</ComputerName> - </component> - </settings> -</unattend> diff --git a/windows/cookbooks/packer-templates/recipes/cleanup.rb b/windows/cookbooks/packer-templates/recipes/cleanup.rb index 2c9923252..3485ccb94 100644 --- a/windows/cookbooks/packer-templates/recipes/cleanup.rb +++ b/windows/cookbooks/packer-templates/recipes/cleanup.rb @@ -1,7 +1,7 @@ -execute "run cleanmgr" do +execute 'run cleanmgr' do command 'C:\Windows\System32\cleanmgr.exe /sagerun:10' ignore_failure true - only_if "" + only_if { node['kernel']['product_type'] == 'Workstaton' } # cleanmgr isn't on servers end execute 'clean SxS' do @@ -33,8 +33,8 @@ # remove pagefile registry_key 'HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Session Manager\Memory Management' do values [{ - :name => 'PagingFiles', - :type => :string, - :data => '' + name: 'PagingFiles', + type: :string, + data: '', }] end diff --git a/windows/cookbooks/packer-templates/recipes/enable_file_sharing.rb b/windows/cookbooks/packer-templates/recipes/enable_file_sharing.rb index 5f19f720a..072797aad 100644 --- a/windows/cookbooks/packer-templates/recipes/enable_file_sharing.rb +++ b/windows/cookbooks/packer-templates/recipes/enable_file_sharing.rb @@ -1,13 +1,3 @@ -dsc_resource "File sharing firewall rule (SMB-In)" do - resource :xfirewall - property :name, "File and Printer Sharing (SMB-In)" - property :ensure, "Present" - property :enabled, "True" -end - -dsc_resource "File sharing firewall rule (NB-Session-In)" do - resource :xfirewall - property :name, "File and Printer Sharing (NB-Session-In)" - property :ensure, "Present" - property :enabled, "True" +execute 'enable filesharing' do + command 'netsh advfirewall firewall set rule group="File and Printer Sharing" new enable=Yes' end diff --git a/windows/cookbooks/packer-templates/recipes/power.rb b/windows/cookbooks/packer-templates/recipes/power.rb index bd8909713..f6b4b686b 100644 --- a/windows/cookbooks/packer-templates/recipes/power.rb +++ b/windows/cookbooks/packer-templates/recipes/power.rb @@ -1,5 +1,5 @@ -execute "Set high performance power profile" do - command "powercfg -setactive 8c5e7fda-e8bf-4a96-9a85-a6e23a8c635c" +execute 'Set high performance power profile' do + command 'powercfg -setactive 8c5e7fda-e8bf-4a96-9a85-a6e23a8c635c' end execute 'Turn off Hibernation' do diff --git a/windows/cookbooks/packer-templates/recipes/set_local_account_token_filter_policy.rb b/windows/cookbooks/packer-templates/recipes/set_local_account_token_filter_policy.rb index 53d98ace8..63dbfa241 100644 --- a/windows/cookbooks/packer-templates/recipes/set_local_account_token_filter_policy.rb +++ b/windows/cookbooks/packer-templates/recipes/set_local_account_token_filter_policy.rb @@ -1,7 +1,7 @@ registry_key 'HKEY_LOCAL_MACHINE\software\Microsoft\Windows\CurrentVersion\Policies\system' do values [{ - :name => 'LocalAccountTokenFilterPolicy', - :type => :dword, - :data => 1 + name: 'LocalAccountTokenFilterPolicy', + type: :dword, + data: 1, }] end diff --git a/windows/cookbooks/packer-templates/recipes/vm_tools.rb b/windows/cookbooks/packer-templates/recipes/vm_tools.rb index 8d2297b44..96cfdc391 100644 --- a/windows/cookbooks/packer-templates/recipes/vm_tools.rb +++ b/windows/cookbooks/packer-templates/recipes/vm_tools.rb @@ -16,6 +16,6 @@ end directory 'C:/Windows/Temp/virtualbox' do - action :remove + action :delete end end From 17299f8bfb48dc5edb704922607a9f543b7c18c9 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith@chef.io> Date: Fri, 1 Jun 2018 17:30:48 -0700 Subject: [PATCH 0800/1622] Add kitchen config so we can test the cookbook Signed-off-by: Tim Smith <tsmith@chef.io> --- .../cookbooks/packer-templates/kitchen.yml | 29 +++++++++++++++++++ .../packer-templates/recipes/cleanup.rb | 2 +- .../recipes/enable_remote_desktop.rb | 2 +- 3 files changed, 31 insertions(+), 2 deletions(-) create mode 100644 windows/cookbooks/packer-templates/kitchen.yml diff --git a/windows/cookbooks/packer-templates/kitchen.yml b/windows/cookbooks/packer-templates/kitchen.yml new file mode 100644 index 000000000..9e98f700f --- /dev/null +++ b/windows/cookbooks/packer-templates/kitchen.yml @@ -0,0 +1,29 @@ +driver: + name: vagrant + customize: + cpus: 2 + memory: 4096 + +transport: + name: winrm + elevated: true + +provisioner: + name: chef_zero + deprecations_as_errors: true + +platforms: + - name: windows-2012r2 + driver_config: + box: chef/windows-server-2012r2-standard + +suites: + - name: default + run_list: + - recipe[packer-templates::vm_tools] + - recipe[packer-templates::uninstall_powershell_ise] + - recipe[packer-templates::enable_file_sharing] + - recipe[packer-templates::enable_remote_desktop] + - recipe[packer-templates::ui_tweaks] + - recipe[packer-templates::power] + - recipe[packer-templates::cleanup] diff --git a/windows/cookbooks/packer-templates/recipes/cleanup.rb b/windows/cookbooks/packer-templates/recipes/cleanup.rb index 3485ccb94..1bce5ec2d 100644 --- a/windows/cookbooks/packer-templates/recipes/cleanup.rb +++ b/windows/cookbooks/packer-templates/recipes/cleanup.rb @@ -16,7 +16,7 @@ "C:\\Recovery", "$env:localappdata\\temp\\*", "$env:windir\\logs", - "$env:windir\\winsxs\\manifestcache"s + "$env:windir\\winsxs\\manifestcache" ) | % { if(Test-Path $_) { Write-Host "Removing $_" diff --git a/windows/cookbooks/packer-templates/recipes/enable_remote_desktop.rb b/windows/cookbooks/packer-templates/recipes/enable_remote_desktop.rb index ae54e149b..38d8cc8ff 100644 --- a/windows/cookbooks/packer-templates/recipes/enable_remote_desktop.rb +++ b/windows/cookbooks/packer-templates/recipes/enable_remote_desktop.rb @@ -3,5 +3,5 @@ end execute 'Enable RDP firewall rule' do - command 'netsh advfirewall firewall add rule name="Open Port 3389" dir=in action=allow protocol=TCP localport=3389' + command 'netsh advfirewall firewall set rule group="Remote Desktop" new enable=Yes' end From 9459c56ce92671b1df4da118f7c45ed572d5a4bf Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith@chef.io> Date: Fri, 1 Jun 2018 18:13:02 -0700 Subject: [PATCH 0801/1622] Add UI tweaks for folder views Signed-off-by: Tim Smith <tsmith@chef.io> --- .../packer-templates/recipes/ui_tweaks.rb | Bin 817 -> 1017 bytes .../packer-templates/recipes/vm_tools.rb | 1 + 2 files changed, 1 insertion(+) diff --git a/windows/cookbooks/packer-templates/recipes/ui_tweaks.rb b/windows/cookbooks/packer-templates/recipes/ui_tweaks.rb index 460b21f3a709997649e1590a4d26f10c0a68219c..772e5dd1be6e77c29a32276905e09d213e871a0f 100644 GIT binary patch literal 1017 zcmd6m!Ab)$5QaVPQw;5)7Y}+ZRH*BgLT#09tBBDOH?!T)G!v3+w~P4hrrin!55<Gx zA!H`QWIlfWX@e`Mf?O&D+<Mebl6H~BrF7obixt+;8IIyPODXpix5&mav*bd?9;Fsk zITn}JqV^AHcik-68buZ@>x&K78H%$G2#NqUT$SkH`8~t{ny;}NK9>RqVSKXno%4Oc z*CrIYq9QAr7r{O6!o@E6c!^MpC~7z0g%kqyp8v0@!`u_Vm&d?=DCwY7>Yn@JpX2p~ zu;|=RDBFNpLD1{HUcrrY{7p%{1dUZVKKNw?#?spOV2_|Ta3P>I9NmstT04*HFQ>+& zy(N{RXNQnYn*MNChp=(?U7ojgZWH@y2%5aiWyXDQIv6sg`R=>qX%Ww-(_}JR%+qB0 WYpav!AOK!-rHJ%Qnp099FVH8^wpH~2 literal 817 zcmcJNO=|)%6h-&`ii@txXqSQoakN5fEe@@l(2|-LCp0EQ5*_{b&8P$QgRbf#<bxOP zIgi%@Epm%q@8bbkZc9j|3A7Dlyt2kOTIhC>lH_Y0pgcObL#_l}DRi_17Xr=k)8LI| zR)&&0ViUD+*2f#0D<f>_*<kG)nea}o%3#B7p{*mw`eMV)f<zOEM6$s+=8PiGa2t>W z%!ZGj>3lj%kqERS*%^Ao5@hyZ9^42>t3}MXaJY{S!ot`9UpfEr@fJ=M<hf4gL?>0g z(0qr{T5A+M<fjVN^J{!Xd#_nv`$9PKe&3pZ=dMGplHV+?R=RB0dB6CVR%Qu9Wn7`O u?i+=(t0Kh0UwF?GmhF6?RXv0QYl5>nqri?w_Hy_i_wsl=4DM9QX5$A6x);R& diff --git a/windows/cookbooks/packer-templates/recipes/vm_tools.rb b/windows/cookbooks/packer-templates/recipes/vm_tools.rb index 96cfdc391..72c73adf5 100644 --- a/windows/cookbooks/packer-templates/recipes/vm_tools.rb +++ b/windows/cookbooks/packer-templates/recipes/vm_tools.rb @@ -13,6 +13,7 @@ Start-Process -FilePath "e:/VBoxWindowsAdditions.exe" -ArgumentList "/S" -WorkingDirectory "C:/Windows/Temp/virtualbox" -Wait EOH + ignore_failure true end directory 'C:/Windows/Temp/virtualbox' do From 66b53a990e8dc206e6b9ca64e14cbcac1cc38046 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith@chef.io> Date: Fri, 1 Jun 2018 20:35:45 -0700 Subject: [PATCH 0802/1622] More UI tweaks Signed-off-by: Tim Smith <tsmith@chef.io> --- .../packer-templates/recipes/ui_tweaks.rb | Bin 1017 -> 1327 bytes .../recipes/uninstall_powershell_ise.rb | 2 -- 2 files changed, 2 deletions(-) diff --git a/windows/cookbooks/packer-templates/recipes/ui_tweaks.rb b/windows/cookbooks/packer-templates/recipes/ui_tweaks.rb index 772e5dd1be6e77c29a32276905e09d213e871a0f..7185cd3fe20843cdba042d71aa7c486c359b8d5f 100644 GIT binary patch delta 337 zcmey#zMgAC7Ndr;LQZ07UUG&)YDGa#eo<<XLP@?tNk*zdfU`ngehHXaTAW%m@k|bf z4_IYL{$xAG`IBpyOebqH>rA{GJ$Wy)jTD!%LP}<FVp2}3LTXV_evv{^YC(QcNoHR9 zWLsuw3m<=HN1u3KM`sUDKi8OGf47iu#~{}j-^}Eq{Nntyl9&KzkJQARl8hKvknSM3 z<^{~M94`3~{^WDa+Vw~l6%^&?7J#f!NCR4!s8F0yT9T4qo(Hr$u{b}Et0*-+v$&+F zGCn)CQbFCr+ch#ChdToDb25`NQ;U%t6rPy}G^<#_FC-=?H77GMDKjUtq*8tIB4%lU PV5mhwV0--YKn?={U-Ee? delta 178 zcmZ3_^^<)=7UN_irsB!^Eb^0M8F_*174@mf8TksfwsCd}E}6xNNjaH$=?ZzN<v?6g zo?n!$P*9YgTTsHKtWcDiu8^3LqM+pA?c*C0Tv=R_nj7O>T2z#pSK^$XS5lOp6P#KS z17*heLG%OZaws!AGcP5-+&?W%i3@043fQ*P$q$)S`CTL9okN3yT>V1gLxWv|Cf<*n IoXBhg0OI>UUH||9 diff --git a/windows/cookbooks/packer-templates/recipes/uninstall_powershell_ise.rb b/windows/cookbooks/packer-templates/recipes/uninstall_powershell_ise.rb index c00be97a0..8fb9548e5 100644 --- a/windows/cookbooks/packer-templates/recipes/uninstall_powershell_ise.rb +++ b/windows/cookbooks/packer-templates/recipes/uninstall_powershell_ise.rb @@ -1,5 +1,3 @@ -node.default['windows']['feature_provider'] = 'dism' - windows_feature 'MicrosoftWindowsPowerShellISE' do action :remove end From cb84de18a741f5d897bb934db515b7d685be7c81 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith@chef.io> Date: Fri, 1 Jun 2018 23:17:38 -0700 Subject: [PATCH 0803/1622] More UI tweaks Signed-off-by: Tim Smith <tsmith@chef.io> --- .../packer-templates/recipes/ui_tweaks.rb | Bin 1327 -> 3865 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/windows/cookbooks/packer-templates/recipes/ui_tweaks.rb b/windows/cookbooks/packer-templates/recipes/ui_tweaks.rb index 7185cd3fe20843cdba042d71aa7c486c359b8d5f..ac26e6fd393666ffd898c2f3675863db294c1b0a 100644 GIT binary patch literal 3865 zcmc&%O>^5g4BfMT1!i*aC5NP^-P~M9p558F_4p&{&Z?7vM9AitA~huCkM8up7o_aA zc2YY@Q}4-^MFa1FzyojwZf2HHNJT&^PufYNUCYu`I&atab6P|D&%e8qbYu#@L`!L3 z=GHiVO7El=X6e#yZ7pekOE&yFO;(jMmTcM)3)DG@-`XHd3t)k&CI|oi$KL@omUP9& zrJx?WPgcHt9$)x%#V@YJ(pb^_BGBU%T!e?uA6ukFt98}@pGhG|NBpNo&3=ynzT5?@ zu-5sE!`y@iya7KW7<54!AHUX)>?vb^6A_Kgb9kIEHF~vD1N5_w5SE;K4$3nS(qYC~ z&9Rk*%+YgdLS?GDI%%RLI-q!qN*SZavO30MFUhwo$Xa8;Qe~`{dio<G$v^kq$#9sw z8{bbx$?#CoZi*L@XnDA`e6UupjrJqfi^*R{?&1e5Dr?Fr;xCvDatYU-6+|;JbVff& z{hNL|dfyx0b%segFiPf<+(Z3=cjI(ON@6CJ^y@=nGuk*DMt|>*74RO75qVfhSEB+d z3d+3;HJp+2P?2RyWstiEEM6v_x6x73_&LO>IoSKa=t5|Z+{~L@P2wAEdtlw!5_5j7 zSfjaCmW{dtY5`g8{ZIFW@r+99qsA%OLxkeFPVVJ`j*!_A*q;)nUySVxz6ClrWy#_7 z=;jV2_b#IZcg|Nzn<w?$JIZb)EssQZFZ&w?aa`~gwNrJ@O&=U7u7n`2mOoKX)oWG2 zuci{RURYDH3}KjK_$DmKoS7)hNW~%u4O)<!dsChAf^K;FTJQ~xBC?m<Qy_<sVLqQ) zQ*#N+lIt!~B;+Zi$vOzL*8f554n474+WAYkImI($ET9bS>uA&SX4Wy+F1zk%4r)mK zXEybwk}&?8zUu69#)E7r`B(WVwD_RAC9XD)k6lui+p#qY2B=A;*G-ykrt&^{D|2_S zo%f|~DD3GhPyP(x!07#*6f|7|xN3NL;D)%Ig;hdWoKD%slTjbUdCk_sEVvn2c2nkw zU`M4fo`-KS4c)B(ms<*p1LJ;FdLNDLL6p5P97Qh=y6_V*x&|XdGfIJC4S>w7$nmnX ziFizWQ!#MvA{oyfJFg4mvS1Bs>Z2rGhX%tVN|2IoM#93kl{{7kvQU~J7nR||ynt-I z?V9t(D9`ijBNm&3wTIvmq^HsW7HkS~p4sLh54JXA``B|HaK28WOn849SSpCu(VSeL g%XBwcGO5w7zt8OU9~bABZ_Y0+&wsy&XEzJx7s#6iR{#J2 delta 99 zcmbO!x1MXmC1!mee`iOZcwa|n4^KbWm|%amkZ{K!*BIZ-<f8oI{Irso0B4WX#GI0h s7}uhr{G!PmEE;S<sRj8(C6gPu^d>K0=9rwvVj$oe8INMp<OM8U0F7!O{Qv*} From 123645f4cdd2b14144876d3513840b342ed4d222 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith@chef.io> Date: Fri, 1 Jun 2018 23:51:02 -0700 Subject: [PATCH 0804/1622] Add defrag capability Signed-off-by: Tim Smith <tsmith@chef.io> --- windows/2012r2.json | 3 ++- .../cookbooks/packer-templates/kitchen.yml | 1 + .../cookbooks/packer-templates/metadata.rb | 1 + .../packer-templates/recipes/defrag.rb | 20 +++++++++++++++++++ 4 files changed, 24 insertions(+), 1 deletion(-) create mode 100644 windows/cookbooks/packer-templates/recipes/defrag.rb diff --git a/windows/2012r2.json b/windows/2012r2.json index 443cb757d..eb5994dbe 100644 --- a/windows/2012r2.json +++ b/windows/2012r2.json @@ -35,7 +35,8 @@ "packer-templates::enable_remote_desktop", "packer-templates::ui_tweaks", "packer-templates::power", - "packer-templates::cleanup" + "packer-templates::cleanup", + "packer-templates::defrag" ] }, { diff --git a/windows/cookbooks/packer-templates/kitchen.yml b/windows/cookbooks/packer-templates/kitchen.yml index 9e98f700f..0b1e94dcc 100644 --- a/windows/cookbooks/packer-templates/kitchen.yml +++ b/windows/cookbooks/packer-templates/kitchen.yml @@ -27,3 +27,4 @@ suites: - recipe[packer-templates::ui_tweaks] - recipe[packer-templates::power] - recipe[packer-templates::cleanup] + - recipe[packer-templates::defrag] diff --git a/windows/cookbooks/packer-templates/metadata.rb b/windows/cookbooks/packer-templates/metadata.rb index 235708388..f24a769b8 100644 --- a/windows/cookbooks/packer-templates/metadata.rb +++ b/windows/cookbooks/packer-templates/metadata.rb @@ -4,4 +4,5 @@ license 'Apache-2.0' description 'Resources run during packer builds' version '0.1.0' +depends 'windows' # unzipping files chef_version '>= 14.0' diff --git a/windows/cookbooks/packer-templates/recipes/defrag.rb b/windows/cookbooks/packer-templates/recipes/defrag.rb new file mode 100644 index 000000000..02ee4ba71 --- /dev/null +++ b/windows/cookbooks/packer-templates/recipes/defrag.rb @@ -0,0 +1,20 @@ +remote_file ::File.join(Chef::Config[:file_cache_path], 'ultradefrag.zip') do + source 'http://downloads.sourceforge.net/ultradefrag/ultradefrag-portable-7.0.2.bin.amd64.zip' + action :create +end + +windows_zipfile 'Decompress ultradefrag' do + source ::File.join(Chef::Config[:file_cache_path], 'ultradefrag.zip') + path ::File.join(Chef::Config[:file_cache_path]) + action :unzip +end + +execute 'Rename ultradefrag' do + command "move #{::File.join(Chef::Config[:file_cache_path])}\\ultradefrag-* #{::File.join(Chef::Config[:file_cache_path], 'ultradefrag')}" + not_if { ::File.exist?(::File.join(Chef::Config[:file_cache_path], 'ultradefrag')) } +end + +execute 'Run ultradefrag' do + command "#{::File.join(Chef::Config[:file_cache_path], 'ultradefrag', 'udefrag.exe')} --optimize --repeat %SystemDrive%" + action :run +end From 94269424beff6e680b9cb1968bef6909c61c54ed Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith@chef.io> Date: Sat, 2 Jun 2018 12:46:20 -0700 Subject: [PATCH 0805/1622] Move zipfile into the recipe so we can avoid berkshelf mess Signed-off-by: Tim Smith <tsmith@chef.io> --- .../libraries/windows_helper.rb | 166 ++++++++++++++++++ .../cookbooks/packer-templates/metadata.rb | 1 - .../packer-templates/resources/zipfile.rb | 127 ++++++++++++++ 3 files changed, 293 insertions(+), 1 deletion(-) create mode 100644 windows/cookbooks/packer-templates/libraries/windows_helper.rb create mode 100644 windows/cookbooks/packer-templates/resources/zipfile.rb diff --git a/windows/cookbooks/packer-templates/libraries/windows_helper.rb b/windows/cookbooks/packer-templates/libraries/windows_helper.rb new file mode 100644 index 000000000..f305950b2 --- /dev/null +++ b/windows/cookbooks/packer-templates/libraries/windows_helper.rb @@ -0,0 +1,166 @@ +# +# Author:: Seth Chisamore (<schisamo@chef.io>) +# Cookbook:: windows +# Library:: windows_helper +# +# Copyright:: 2011-2018, Chef Software, Inc. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +require 'uri' +require 'Win32API' if Chef::Platform.windows? +require 'chef/exceptions' +require 'openssl' +require 'chef/mixin/powershell_out' + +module Windows + module Helper + AUTO_RUN_KEY = 'HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Run'.freeze unless defined?(AUTO_RUN_KEY) + ENV_KEY = 'HKLM\SYSTEM\CurrentControlSet\Control\Session Manager\Environment'.freeze unless defined?(ENV_KEY) + ExpandEnvironmentStrings = Win32API.new('kernel32', 'ExpandEnvironmentStrings', %w(P P L), 'L') if Chef::Platform.windows? && !defined?(ExpandEnvironmentStrings) + + # returns windows friendly version of the provided path, + # ensures backslashes are used everywhere + def win_friendly_path(path) + path.gsub(::File::SEPARATOR, ::File::ALT_SEPARATOR || '\\') if path + end + + # account for Window's wacky File System Redirector + # http://msdn.microsoft.com/en-us/library/aa384187(v=vs.85).aspx + # especially important for 32-bit processes (like Ruby) on a + # 64-bit instance of Windows. + def locate_sysnative_cmd(cmd) + if ::File.exist?("#{ENV['WINDIR']}\\sysnative\\#{cmd}") + "#{ENV['WINDIR']}\\sysnative\\#{cmd}" + elsif ::File.exist?("#{ENV['WINDIR']}\\system32\\#{cmd}") + "#{ENV['WINDIR']}\\system32\\#{cmd}" + else + cmd + end + end + + # singleton instance of the Windows Version checker + def win_version + @win_version ||= Windows::Version.new + end + + # Helper function to properly parse a URI + def as_uri(source) + URI.parse(source) + rescue URI::InvalidURIError + Chef::Log.warn("#{source} was an invalid URI. Trying to escape invalid characters") + URI.parse(URI.escape(source)) + end + + # if a file is local it returns a windows friendly path version + # if a file is remote it caches it locally + def cached_file(source, checksum = nil, windows_path = true) + @installer_file_path ||= begin + + if source =~ %r{^(file|ftp|http|https):\/\/} + uri = as_uri(source) + cache_file_path = "#{Chef::Config[:file_cache_path]}/#{::File.basename(::URI.unescape(uri.path))}" + Chef::Log.debug("Caching a copy of file #{source} at #{cache_file_path}") + remote_file cache_file_path do + source source + backup false + checksum checksum unless checksum.nil? + end.run_action(:create) + else + cache_file_path = source + end + + windows_path ? win_friendly_path(cache_file_path) : cache_file_path + end + end + + # Expands the environment variables + def expand_env_vars(path) + # We pick 32k because that is the largest it could be: + # http://msdn.microsoft.com/en-us/library/windows/desktop/ms724265%28v=vs.85%29.aspx + buf = 0.chr * 32 * 1024 # 32k + if ExpandEnvironmentStrings.call(path.dup, buf, buf.length) == 0 + raise Chef::Exceptions::Win32APIError, 'Failed calling ExpandEnvironmentStrings (received 0)' + end + buf.strip + end + + def is_package_installed?(package_name) # rubocop:disable Naming/PredicateName + installed_packages.include?(package_name) + end + + def installed_packages + @installed_packages || begin + installed_packages = {} + # Computer\HKEY_LOCAL_MACHINE\Software\Microsoft\Windows\CurrentVersion\Uninstall + installed_packages.merge!(extract_installed_packages_from_key(::Win32::Registry::HKEY_LOCAL_MACHINE)) # rescue nil + # 64-bit registry view + # Computer\HKEY_LOCAL_MACHINE\Software\Wow6464Node\Microsoft\Windows\CurrentVersion\Uninstall + installed_packages.merge!(extract_installed_packages_from_key(::Win32::Registry::HKEY_LOCAL_MACHINE, (::Win32::Registry::Constants::KEY_READ | 0x0100))) # rescue nil + # 32-bit registry view + # Computer\HKEY_LOCAL_MACHINE\Software\Wow6432Node\Microsoft\Windows\CurrentVersion\Uninstall + installed_packages.merge!(extract_installed_packages_from_key(::Win32::Registry::HKEY_LOCAL_MACHINE, (::Win32::Registry::Constants::KEY_READ | 0x0200))) # rescue nil + # Computer\HKEY_CURRENT_USER\Software\Microsoft\Windows\CurrentVersion\Uninstall + installed_packages.merge!(extract_installed_packages_from_key(::Win32::Registry::HKEY_CURRENT_USER)) # rescue nil + installed_packages + end + end + + # Returns an array + def to_array(var) + var = var.is_a?(Array) ? var : [var] + var.reject(&:nil?) + end + + private + + def extract_installed_packages_from_key(hkey = ::Win32::Registry::HKEY_LOCAL_MACHINE, desired = ::Win32::Registry::Constants::KEY_READ) + uninstall_subkey = 'Software\Microsoft\Windows\CurrentVersion\Uninstall' + packages = {} + begin + ::Win32::Registry.open(hkey, uninstall_subkey, desired) do |reg| + reg.each_key do |key, _wtime| + begin + k = reg.open(key, desired) + display_name = begin + k['DisplayName'] + rescue + nil + end + version = begin + k['DisplayVersion'] + rescue + 'NO VERSION' + end + uninstall_string = begin + k['UninstallString'] + rescue + nil + end + if display_name + packages[display_name] = { name: display_name, + version: version, + uninstall_string: uninstall_string } + end + rescue ::Win32::Registry::Error + end + end + end + rescue ::Win32::Registry::Error + end + packages + end + end +end + +Chef::Recipe.send(:include, Windows::Helper) diff --git a/windows/cookbooks/packer-templates/metadata.rb b/windows/cookbooks/packer-templates/metadata.rb index f24a769b8..235708388 100644 --- a/windows/cookbooks/packer-templates/metadata.rb +++ b/windows/cookbooks/packer-templates/metadata.rb @@ -4,5 +4,4 @@ license 'Apache-2.0' description 'Resources run during packer builds' version '0.1.0' -depends 'windows' # unzipping files chef_version '>= 14.0' diff --git a/windows/cookbooks/packer-templates/resources/zipfile.rb b/windows/cookbooks/packer-templates/resources/zipfile.rb new file mode 100644 index 000000000..be8d66939 --- /dev/null +++ b/windows/cookbooks/packer-templates/resources/zipfile.rb @@ -0,0 +1,127 @@ +# +# Author:: Doug MacEachern (<dougm@vmware.com>) +# Author:: Seth Chisamore (<schisamo@chef.io>) +# Author:: Wade Peacock (<wade.peacock@visioncritical.com>) +# Cookbook:: windows +# Resource:: zipfile +# +# Copyright:: 2010-2017, VMware, Inc. +# Copyright:: 2011-2018, Chef Software, Inc. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +provides :windows_zipfile + +property :path, String, name_property: true +property :source, String +property :overwrite, [true, false], default: false +property :checksum, String + +action :unzip do + ensure_rubyzip_gem_installed + Chef::Log.debug("unzip #{new_resource.source} => #{new_resource.path} (overwrite=#{new_resource.overwrite})") + + cache_file_path = if new_resource.source =~ %r{^(file|ftp|http|https):\/\/} # http://rubular.com/r/DGoIWjLfGI + uri = as_uri(new_resource.source) + local_cache_path = "#{Chef::Config[:file_cache_path]}/#{::File.basename(::URI.unescape(uri.path))}" + Chef::Log.debug("Caching a copy of file #{new_resource.source} at #{cache_file_path}") + + remote_file local_cache_path do + source new_resource.source + backup false + checksum new_resource.checksum unless new_resource.checksum.nil? + end + + local_cache_path + else + new_resource.source + end + + cache_file_path = win_friendly_path(cache_file_path) + + converge_by("unzip #{new_resource.source}") do + ruby_block 'Unzipping' do + block do + Zip::File.open(cache_file_path) do |zip| + zip.each do |entry| + path = ::File.join(new_resource.path, entry.name) + FileUtils.mkdir_p(::File.dirname(path)) + if new_resource.overwrite && ::File.exist?(path) && !::File.directory?(path) + FileUtils.rm(path) + end + zip.extract(entry, path) unless ::File.exist?(path) + end + end + end + action :run + end + end +end + +action :zip do + ensure_rubyzip_gem_installed + # sanitize paths for windows. + new_resource.source.downcase.gsub!(::File::SEPARATOR, ::File::ALT_SEPARATOR) + new_resource.path.downcase.gsub!(::File::SEPARATOR, ::File::ALT_SEPARATOR) + Chef::Log.debug("zip #{new_resource.source} => #{new_resource.path} (overwrite=#{new_resource.overwrite})") + + if new_resource.overwrite == false && ::File.exist?(new_resource.path) + Chef::Log.info("file #{new_resource.path} already exists and overwrite is set to false, exiting") + else + # delete the archive if it already exists, because we are recreating it. + if ::File.exist?(new_resource.path) + converge_by("delete existing file at #{new_resource.path}") do + ::File.unlink(new_resource.path) + end + end + + # only supporting compression of a single directory (recursively). + if ::File.directory?(new_resource.source) + converge_by("zipping #{new_resource.source} to #{new_resource.path}") do + z = Zip::File.new(new_resource.path, true) + unless new_resource.source =~ /::File::ALT_SEPARATOR$/ + new_resource.source << ::File::ALT_SEPARATOR + end + Find.find(new_resource.source) do |f| + f.downcase.gsub!(::File::SEPARATOR, ::File::ALT_SEPARATOR) + # don't add root directory to the zipfile. + next if f == new_resource.source + # strip the root directory from the filename before adding it to the zipfile. + zip_fname = f.sub(new_resource.source, '') + Chef::Log.debug("adding #{zip_fname} to archive, sourcefile is: #{f}") + z.add(zip_fname, f) + end + z.close + end + else + Chef::Log.info("Single directory must be specified for compression, and #{new_resource.source} does not meet that criteria.") + end + end +end + +action_class do + include Windows::Helper + require 'find' + + def ensure_rubyzip_gem_installed + require 'zip' + rescue LoadError + Chef::Log.info("Missing gem 'rubyzip'...installing now.") + chef_gem 'rubyzip' do + action :install + compile_time true + end + require 'zip' + end +end From 16176cca2b44f03f396ee47a20485897312ea5f1 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith@chef.io> Date: Sat, 2 Jun 2018 22:14:39 -0700 Subject: [PATCH 0806/1622] Fix chef download on 2k8r2 and other misc fixes Signed-off-by: Tim Smith <tsmith@chef.io> --- windows/2008r2.json | 10 +++++++--- windows/2016.json | 33 ++++++++++++++++++++------------- windows/7.json | 4 +++- 3 files changed, 30 insertions(+), 17 deletions(-) diff --git a/windows/2008r2.json b/windows/2008r2.json index d478e51f4..f6357d3d3 100644 --- a/windows/2008r2.json +++ b/windows/2008r2.json @@ -28,12 +28,16 @@ "type": "chef-solo", "cookbook_paths": ["cookbooks"], "guest_os_type": "windows", + "install_command": "powershell.exe -Command \"(new-object Net.WebClient).DownloadString('https://omnitruck.chef.io/install.ps1') | iex; install\"", "run_list": [ - "packer-templates::vbox_guest_additions", + "packer-templates::vm_tools", "packer-templates::uninstall_powershell_ise", "packer-templates::enable_file_sharing", "packer-templates::enable_remote_desktop", - "packer-templates::cleanup" + "packer-templates::ui_tweaks", + "packer-templates::power", + "packer-templates::cleanup", + "packer-templates::defrag" ] }, { @@ -47,7 +51,7 @@ [{ "type": "vagrant", "keep_input_artifact": true, - "output": "windows2008r2-{{.Provider}}.box", + "output": "{{ user `template` }}-{{.Provider}}.box", "vagrantfile_template": "vagrantfile-windows.template" }] ], diff --git a/windows/2016.json b/windows/2016.json index 9c70f9b7d..fcce5e5fa 100644 --- a/windows/2016.json +++ b/windows/2016.json @@ -7,20 +7,21 @@ ["modifyvm", "{{.Name}}", "--cpus", "2"] ], "guest_additions_mode": "{{ user `guest_additions_mode` }}", + "guest_additions_path": "C:/users/vagrant/VBoxGuestAdditions.iso", "guest_os_type": "Windows2016_64", "headless": "{{ user `headless` }}", "iso_url": "{{ user `iso_url` }}", "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "md5", + "iso_checksum_type": "sha1", + "output_directory": "../builds/packer-{{user `template`}}-virtualbox", "communicator": "winrm", "winrm_username": "vagrant", "winrm_password": "vagrant", "winrm_timeout": "12h", - "shutdown_command": "C:/Windows/Panther/Unattend/packer_shutdown.bat", + "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"", "shutdown_timeout": "15m", "floppy_files": [ - "answer_files/2016/Autounattend.xml", - "scripts/winrm.cmd" + "answer_files/2012_r2/Autounattend.xml" ] }], "provisioners": [{ @@ -28,11 +29,14 @@ "cookbook_paths": ["cookbooks"], "guest_os_type": "windows", "run_list": [ - "packer-templates::vbox_guest_additions", + "packer-templates::vm_tools", "packer-templates::uninstall_powershell_ise", "packer-templates::enable_file_sharing", "packer-templates::enable_remote_desktop", - "packer-templates::cleanup" + "packer-templates::ui_tweaks", + "packer-templates::power", + "packer-templates::cleanup", + "packer-templates::defrag" ] }, { @@ -42,16 +46,19 @@ "elevated_password": "vagrant" } ], - "post-processors": [{ - "type": "vagrant", - "keep_input_artifact": true, - "output": "windows2016min-{{.Provider}}.box", - "vagrantfile_template": "vagrantfile-windows.template" - }], + "post-processors": [ + [{ + "type": "vagrant", + "keep_input_artifact": true, + "output": "{{ user `template` }}-{{.Provider}}.box", + "vagrantfile_template": "vagrantfile-windows.template" + }] + ], "variables": { "guest_additions_mode": "attach", "headless": "true", "iso_checksum": "18a4f00a675b0338f3c7c93c4f131beb", - "iso_url": "http://care.dlservice.microsoft.com/dl/download/1/6/F/16FA20E6-4662-482A-920B-1A45CF5AAE3C/14393.0.160715-1616.RS1_RELEASE_SERVER_EVAL_X64FRE_EN-US.ISO" + "iso_url": "http://care.dlservice.microsoft.com/dl/download/1/6/F/16FA20E6-4662-482A-920B-1A45CF5AAE3C/14393.0.160715-1616.RS1_RELEASE_SERVER_EVAL_X64FRE_EN-US.ISO", + "template": "windows-2016-standard" } } diff --git a/windows/7.json b/windows/7.json index 83692f84e..4853d9bbe 100644 --- a/windows/7.json +++ b/windows/7.json @@ -28,6 +28,7 @@ "type": "chef-solo", "cookbook_paths": ["cookbooks"], "guest_os_type": "windows", + "install_command": "powershell.exe -Command \"(new-object Net.WebClient).DownloadString('https://omnitruck.chef.io/install.ps1') | iex; install\"", "run_list": [ "packer-templates::vm_tools", "packer-templates::uninstall_powershell_ise", @@ -35,7 +36,8 @@ "packer-templates::enable_remote_desktop", "packer-templates::ui_tweaks", "packer-templates::power", - "packer-templates::cleanup" + "packer-templates::cleanup", + "packer-templates::defrag" ] }, { From 46eec79ea2e3cf855d0384f1d788e950b711e686 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith@chef.io> Date: Sat, 2 Jun 2018 22:15:59 -0700 Subject: [PATCH 0807/1622] Setup winrm on 2016 as well Signed-off-by: Tim Smith <tsmith@chef.io> --- windows/answer_files/2016/Autounattend.xml | 97 +++++++++++++++++++++- 1 file changed, 94 insertions(+), 3 deletions(-) diff --git a/windows/answer_files/2016/Autounattend.xml b/windows/answer_files/2016/Autounattend.xml index 09a5671cf..058117db3 100644 --- a/windows/answer_files/2016/Autounattend.xml +++ b/windows/answer_files/2016/Autounattend.xml @@ -117,7 +117,7 @@ <Value>vagrant</Value> <PlainText>true</PlainText> </Password> - <Group>administrators</Group> + <Group>Administrators</Group> <DisplayName>Vagrant</DisplayName> <Name>vagrant</Name> <Description>Vagrant User</Description> @@ -134,9 +134,100 @@ </AutoLogon> <FirstLogonCommands> <SynchronousCommand wcm:action="add"> - <CommandLine>cmd.exe /c A:\winrm.cmd</CommandLine> - <Order>1</Order> + <CommandLine>cmd.exe /c powershell -Command "Set-ExecutionPolicy -ExecutionPolicy RemoteSigned -Force"</CommandLine> + <Description>Set Execution Policy 64 Bit</Description> + <Order>1</Order> + <RequiresUserInput>true</RequiresUserInput> </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <CommandLine>C:\Windows\SysWOW64\cmd.exe /c powershell -Command "Set-ExecutionPolicy -ExecutionPolicy RemoteSigned -Force"</CommandLine> + <Description>Set Execution Policy 32 Bit</Description> + <Order>2</Order> + <RequiresUserInput>true</RequiresUserInput> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <CommandLine>cmd.exe /c winrm quickconfig -q</CommandLine> + <Description>winrm quickconfig -q</Description> + <Order>3</Order> + <RequiresUserInput>true</RequiresUserInput> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <CommandLine>cmd.exe /c winrm quickconfig -transport:http</CommandLine> + <Description>winrm quickconfig -transport:http</Description> + <Order>4</Order> + <RequiresUserInput>true</RequiresUserInput> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <CommandLine>cmd.exe /c winrm set winrm/config @{MaxTimeoutms="1800000"}</CommandLine> + <Description>Win RM MaxTimoutms</Description> + <Order>5</Order> + <RequiresUserInput>true</RequiresUserInput> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <CommandLine>cmd.exe /c winrm set winrm/config/winrs @{MaxMemoryPerShellMB="800"}</CommandLine> + <Description>Win RM MaxMemoryPerShellMB</Description> + <Order>6</Order> + <RequiresUserInput>true</RequiresUserInput> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <CommandLine>cmd.exe /c winrm set winrm/config/service @{AllowUnencrypted="true"}</CommandLine> + <Description>Win RM AllowUnencrypted</Description> + <Order>7</Order> + <RequiresUserInput>true</RequiresUserInput> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <CommandLine>cmd.exe /c winrm set winrm/config/service/auth @{Basic="true"}</CommandLine> + <Description>Win RM auth Basic</Description> + <Order>8</Order> + <RequiresUserInput>true</RequiresUserInput> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <CommandLine>cmd.exe /c winrm set winrm/config/client/auth @{Basic="true"}</CommandLine> + <Description>Win RM client auth Basic</Description> + <Order>9</Order> + <RequiresUserInput>true</RequiresUserInput> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <CommandLine>cmd.exe /c winrm set winrm/config/listener?Address=*+Transport=HTTP @{Port="5985"} </CommandLine> + <Description>Win RM listener Address/Port</Description> + <Order>10</Order> + <RequiresUserInput>true</RequiresUserInput> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <CommandLine>cmd.exe /c netsh advfirewall firewall set rule group="remote administration" new enable=yes </CommandLine> + <Description>Win RM adv firewall enable</Description> + <Order>11</Order> + <RequiresUserInput>true</RequiresUserInput> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <CommandLine>cmd.exe /c netsh firewall add portopening TCP 5985 "Port 5985" </CommandLine> + <Description>Win RM port open</Description> + <Order>12</Order> + <RequiresUserInput>true</RequiresUserInput> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <CommandLine>cmd.exe /c net stop winrm </CommandLine> + <Description>Stop Win RM Service </Description> + <Order>13</Order> + <RequiresUserInput>true</RequiresUserInput> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <CommandLine>cmd.exe /c sc config winrm start= auto</CommandLine> + <Description>Win RM Autostart</Description> + <Order>14</Order> + <RequiresUserInput>true</RequiresUserInput> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <CommandLine>cmd.exe /c net start winrm</CommandLine> + <Description>Start Win RM Service</Description> + <Order>15</Order> + <RequiresUserInput>true</RequiresUserInput> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <CommandLine>cmd.exe /c wmic useraccount where "name='vagrant'" set PasswordExpires=FALSE</CommandLine> + <Order>16</Order> + <Description>Disable password expiration for vagrant user</Description> + </SynchronousCommand> </FirstLogonCommands> </component> </settings> From 0d9448963190f434bc829a2a03bdd169c3c56fac Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith@chef.io> Date: Sat, 2 Jun 2018 22:53:39 -0700 Subject: [PATCH 0808/1622] Rename the chef cookbook and avoid 2k8r2 hibernation failure Signed-off-by: Tim Smith <tsmith@chef.io> --- windows/2008r2.json | 16 ++++----- windows/2012r2.json | 16 ++++----- windows/2016.json | 16 ++++----- windows/7.json | 16 ++++----- .../cookbooks/packer-templates/kitchen.yml | 30 ---------------- .../{packer-templates => packer}/Berksfile | 0 windows/cookbooks/packer/kitchen.yml | 33 ++++++++++++++++++ .../libraries/windows_helper.rb | 0 .../{packer-templates => packer}/metadata.rb | 2 +- .../recipes/cleanup.rb | 0 .../recipes/defrag.rb | 0 .../recipes/disable_windows_update.rb | 0 .../recipes/enable_file_sharing.rb | 0 .../recipes/enable_remote_desktop.rb | 0 .../recipes/power.rb | 3 +- .../set_local_account_token_filter_policy.rb | 0 .../recipes/ui_tweaks.rb | Bin .../recipes/uninstall_powershell_ise.rb | 0 .../recipes/vm_tools.rb | 0 .../resources/zipfile.rb | 0 20 files changed, 68 insertions(+), 64 deletions(-) delete mode 100644 windows/cookbooks/packer-templates/kitchen.yml rename windows/cookbooks/{packer-templates => packer}/Berksfile (100%) create mode 100644 windows/cookbooks/packer/kitchen.yml rename windows/cookbooks/{packer-templates => packer}/libraries/windows_helper.rb (100%) rename windows/cookbooks/{packer-templates => packer}/metadata.rb (87%) rename windows/cookbooks/{packer-templates => packer}/recipes/cleanup.rb (100%) rename windows/cookbooks/{packer-templates => packer}/recipes/defrag.rb (100%) rename windows/cookbooks/{packer-templates => packer}/recipes/disable_windows_update.rb (100%) rename windows/cookbooks/{packer-templates => packer}/recipes/enable_file_sharing.rb (100%) rename windows/cookbooks/{packer-templates => packer}/recipes/enable_remote_desktop.rb (100%) rename windows/cookbooks/{packer-templates => packer}/recipes/power.rb (77%) rename windows/cookbooks/{packer-templates => packer}/recipes/set_local_account_token_filter_policy.rb (100%) rename windows/cookbooks/{packer-templates => packer}/recipes/ui_tweaks.rb (100%) rename windows/cookbooks/{packer-templates => packer}/recipes/uninstall_powershell_ise.rb (100%) rename windows/cookbooks/{packer-templates => packer}/recipes/vm_tools.rb (100%) rename windows/cookbooks/{packer-templates => packer}/resources/zipfile.rb (100%) diff --git a/windows/2008r2.json b/windows/2008r2.json index f6357d3d3..8b0ab5143 100644 --- a/windows/2008r2.json +++ b/windows/2008r2.json @@ -30,14 +30,14 @@ "guest_os_type": "windows", "install_command": "powershell.exe -Command \"(new-object Net.WebClient).DownloadString('https://omnitruck.chef.io/install.ps1') | iex; install\"", "run_list": [ - "packer-templates::vm_tools", - "packer-templates::uninstall_powershell_ise", - "packer-templates::enable_file_sharing", - "packer-templates::enable_remote_desktop", - "packer-templates::ui_tweaks", - "packer-templates::power", - "packer-templates::cleanup", - "packer-templates::defrag" + "packer::vm_tools", + "packer::uninstall_powershell_ise", + "packer::enable_file_sharing", + "packer::enable_remote_desktop", + "packer::ui_tweaks", + "packer::power", + "packer::cleanup", + "packer::defrag" ] }, { diff --git a/windows/2012r2.json b/windows/2012r2.json index eb5994dbe..61857f96a 100644 --- a/windows/2012r2.json +++ b/windows/2012r2.json @@ -29,14 +29,14 @@ "cookbook_paths": ["cookbooks"], "guest_os_type": "windows", "run_list": [ - "packer-templates::vm_tools", - "packer-templates::uninstall_powershell_ise", - "packer-templates::enable_file_sharing", - "packer-templates::enable_remote_desktop", - "packer-templates::ui_tweaks", - "packer-templates::power", - "packer-templates::cleanup", - "packer-templates::defrag" + "packer::vm_tools", + "packer::uninstall_powershell_ise", + "packer::enable_file_sharing", + "packer::enable_remote_desktop", + "packer::ui_tweaks", + "packer::power", + "packer::cleanup", + "packer::defrag" ] }, { diff --git a/windows/2016.json b/windows/2016.json index fcce5e5fa..8615707ac 100644 --- a/windows/2016.json +++ b/windows/2016.json @@ -29,14 +29,14 @@ "cookbook_paths": ["cookbooks"], "guest_os_type": "windows", "run_list": [ - "packer-templates::vm_tools", - "packer-templates::uninstall_powershell_ise", - "packer-templates::enable_file_sharing", - "packer-templates::enable_remote_desktop", - "packer-templates::ui_tweaks", - "packer-templates::power", - "packer-templates::cleanup", - "packer-templates::defrag" + "packer::vm_tools", + "packer::uninstall_powershell_ise", + "packer::enable_file_sharing", + "packer::enable_remote_desktop", + "packer::ui_tweaks", + "packer::power", + "packer::cleanup", + "packer::defrag" ] }, { diff --git a/windows/7.json b/windows/7.json index 4853d9bbe..1dc345b5a 100644 --- a/windows/7.json +++ b/windows/7.json @@ -30,14 +30,14 @@ "guest_os_type": "windows", "install_command": "powershell.exe -Command \"(new-object Net.WebClient).DownloadString('https://omnitruck.chef.io/install.ps1') | iex; install\"", "run_list": [ - "packer-templates::vm_tools", - "packer-templates::uninstall_powershell_ise", - "packer-templates::enable_file_sharing", - "packer-templates::enable_remote_desktop", - "packer-templates::ui_tweaks", - "packer-templates::power", - "packer-templates::cleanup", - "packer-templates::defrag" + "packer::vm_tools", + "packer::uninstall_powershell_ise", + "packer::enable_file_sharing", + "packer::enable_remote_desktop", + "packer::ui_tweaks", + "packer::power", + "packer::cleanup", + "packer::defrag" ] }, { diff --git a/windows/cookbooks/packer-templates/kitchen.yml b/windows/cookbooks/packer-templates/kitchen.yml deleted file mode 100644 index 0b1e94dcc..000000000 --- a/windows/cookbooks/packer-templates/kitchen.yml +++ /dev/null @@ -1,30 +0,0 @@ -driver: - name: vagrant - customize: - cpus: 2 - memory: 4096 - -transport: - name: winrm - elevated: true - -provisioner: - name: chef_zero - deprecations_as_errors: true - -platforms: - - name: windows-2012r2 - driver_config: - box: chef/windows-server-2012r2-standard - -suites: - - name: default - run_list: - - recipe[packer-templates::vm_tools] - - recipe[packer-templates::uninstall_powershell_ise] - - recipe[packer-templates::enable_file_sharing] - - recipe[packer-templates::enable_remote_desktop] - - recipe[packer-templates::ui_tweaks] - - recipe[packer-templates::power] - - recipe[packer-templates::cleanup] - - recipe[packer-templates::defrag] diff --git a/windows/cookbooks/packer-templates/Berksfile b/windows/cookbooks/packer/Berksfile similarity index 100% rename from windows/cookbooks/packer-templates/Berksfile rename to windows/cookbooks/packer/Berksfile diff --git a/windows/cookbooks/packer/kitchen.yml b/windows/cookbooks/packer/kitchen.yml new file mode 100644 index 000000000..cc10a7a3d --- /dev/null +++ b/windows/cookbooks/packer/kitchen.yml @@ -0,0 +1,33 @@ +driver: + name: vagrant + customize: + cpus: 2 + memory: 4096 + +transport: + name: winrm + elevated: true + +provisioner: + name: chef_zero + deprecations_as_errors: true + +platforms: + - name: windows-2012r2 + driver_config: + box: chef/windows-server-2012r2-standard + - name: windows-2008r2 + driver_config: + box: chef/windows-server-2008r2-standard + +suites: + - name: default + run_list: + - recipe[packer::vm_tools] + - recipe[packer::uninstall_powershell_ise] + - recipe[packer::enable_file_sharing] + - recipe[packer::enable_remote_desktop] + - recipe[packer::ui_tweaks] + - recipe[packer::power] + - recipe[packer::cleanup] + - recipe[packer::defrag] diff --git a/windows/cookbooks/packer-templates/libraries/windows_helper.rb b/windows/cookbooks/packer/libraries/windows_helper.rb similarity index 100% rename from windows/cookbooks/packer-templates/libraries/windows_helper.rb rename to windows/cookbooks/packer/libraries/windows_helper.rb diff --git a/windows/cookbooks/packer-templates/metadata.rb b/windows/cookbooks/packer/metadata.rb similarity index 87% rename from windows/cookbooks/packer-templates/metadata.rb rename to windows/cookbooks/packer/metadata.rb index 235708388..94b18bf0e 100644 --- a/windows/cookbooks/packer-templates/metadata.rb +++ b/windows/cookbooks/packer/metadata.rb @@ -1,4 +1,4 @@ -name 'packer-templates' +name 'packer' maintainer 'Matt Wrock' maintainer_email 'matt@mattwrock.com' license 'Apache-2.0' diff --git a/windows/cookbooks/packer-templates/recipes/cleanup.rb b/windows/cookbooks/packer/recipes/cleanup.rb similarity index 100% rename from windows/cookbooks/packer-templates/recipes/cleanup.rb rename to windows/cookbooks/packer/recipes/cleanup.rb diff --git a/windows/cookbooks/packer-templates/recipes/defrag.rb b/windows/cookbooks/packer/recipes/defrag.rb similarity index 100% rename from windows/cookbooks/packer-templates/recipes/defrag.rb rename to windows/cookbooks/packer/recipes/defrag.rb diff --git a/windows/cookbooks/packer-templates/recipes/disable_windows_update.rb b/windows/cookbooks/packer/recipes/disable_windows_update.rb similarity index 100% rename from windows/cookbooks/packer-templates/recipes/disable_windows_update.rb rename to windows/cookbooks/packer/recipes/disable_windows_update.rb diff --git a/windows/cookbooks/packer-templates/recipes/enable_file_sharing.rb b/windows/cookbooks/packer/recipes/enable_file_sharing.rb similarity index 100% rename from windows/cookbooks/packer-templates/recipes/enable_file_sharing.rb rename to windows/cookbooks/packer/recipes/enable_file_sharing.rb diff --git a/windows/cookbooks/packer-templates/recipes/enable_remote_desktop.rb b/windows/cookbooks/packer/recipes/enable_remote_desktop.rb similarity index 100% rename from windows/cookbooks/packer-templates/recipes/enable_remote_desktop.rb rename to windows/cookbooks/packer/recipes/enable_remote_desktop.rb diff --git a/windows/cookbooks/packer-templates/recipes/power.rb b/windows/cookbooks/packer/recipes/power.rb similarity index 77% rename from windows/cookbooks/packer-templates/recipes/power.rb rename to windows/cookbooks/packer/recipes/power.rb index f6b4b686b..1dd845482 100644 --- a/windows/cookbooks/packer-templates/recipes/power.rb +++ b/windows/cookbooks/packer/recipes/power.rb @@ -3,7 +3,8 @@ end execute 'Turn off Hibernation' do - command 'powercfg -h off' + command 'owercfg.exe /hibernate off' + ignore_failure :quiet # if unsupported on the hardware it errors end execute 'Turn off monitor timeout on AC power' do diff --git a/windows/cookbooks/packer-templates/recipes/set_local_account_token_filter_policy.rb b/windows/cookbooks/packer/recipes/set_local_account_token_filter_policy.rb similarity index 100% rename from windows/cookbooks/packer-templates/recipes/set_local_account_token_filter_policy.rb rename to windows/cookbooks/packer/recipes/set_local_account_token_filter_policy.rb diff --git a/windows/cookbooks/packer-templates/recipes/ui_tweaks.rb b/windows/cookbooks/packer/recipes/ui_tweaks.rb similarity index 100% rename from windows/cookbooks/packer-templates/recipes/ui_tweaks.rb rename to windows/cookbooks/packer/recipes/ui_tweaks.rb diff --git a/windows/cookbooks/packer-templates/recipes/uninstall_powershell_ise.rb b/windows/cookbooks/packer/recipes/uninstall_powershell_ise.rb similarity index 100% rename from windows/cookbooks/packer-templates/recipes/uninstall_powershell_ise.rb rename to windows/cookbooks/packer/recipes/uninstall_powershell_ise.rb diff --git a/windows/cookbooks/packer-templates/recipes/vm_tools.rb b/windows/cookbooks/packer/recipes/vm_tools.rb similarity index 100% rename from windows/cookbooks/packer-templates/recipes/vm_tools.rb rename to windows/cookbooks/packer/recipes/vm_tools.rb diff --git a/windows/cookbooks/packer-templates/resources/zipfile.rb b/windows/cookbooks/packer/resources/zipfile.rb similarity index 100% rename from windows/cookbooks/packer-templates/resources/zipfile.rb rename to windows/cookbooks/packer/resources/zipfile.rb From 06a2486b946334e63f0e92b9b55c989ce511894f Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith@chef.io> Date: Sat, 2 Jun 2018 23:04:15 -0700 Subject: [PATCH 0809/1622] Fix typo Signed-off-by: Tim Smith <tsmith@chef.io> --- windows/cookbooks/packer/recipes/power.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/windows/cookbooks/packer/recipes/power.rb b/windows/cookbooks/packer/recipes/power.rb index 1dd845482..15279ba0c 100644 --- a/windows/cookbooks/packer/recipes/power.rb +++ b/windows/cookbooks/packer/recipes/power.rb @@ -3,7 +3,7 @@ end execute 'Turn off Hibernation' do - command 'owercfg.exe /hibernate off' + command 'powercfg.exe /hibernate off' ignore_failure :quiet # if unsupported on the hardware it errors end From 445ac6d80d8a8c98d1c8868d15eb3d29cab2ab9a Mon Sep 17 00:00:00 2001 From: Jordan Piel <Jordan.Piel@lasp.colorado.edu> Date: Mon, 4 Jun 2018 08:19:23 -0600 Subject: [PATCH 0810/1622] Update for Ubuntu 16.04.4 --- ubuntu/ubuntu-16.04-amd64.json | 6 +++--- ubuntu/ubuntu-16.04-i386.json | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/ubuntu/ubuntu-16.04-amd64.json b/ubuntu/ubuntu-16.04-amd64.json index 8a587b421..b1c11ad48 100644 --- a/ubuntu/ubuntu-16.04-amd64.json +++ b/ubuntu/ubuntu-16.04-amd64.json @@ -304,12 +304,12 @@ "https_proxy": "{{env `https_proxy`}}", "hyperv_generation": "2", "hyperv_switch": "{{env `hyperv_switch`}}", - "iso_checksum": "a06cd926f5855d4f21fb4bc9978a35312f815fbda0d0ef7fdc846861f4fc4600", + "iso_checksum": "0a03608988cfd2e50567990dc8be96fb3c501e198e2e6efcb846d89efc7b89f2", "iso_checksum_type": "sha256", - "iso_name": "ubuntu-16.04.3-server-amd64.iso", + "iso_name": "ubuntu-16.04.4-server-amd64.iso", "memory": "1024", "mirror": "http://releases.ubuntu.com", - "mirror_directory": "16.04.3", + "mirror_directory": "16.04.4", "name": "ubuntu-16.04", "no_proxy": "{{env `no_proxy`}}", "preseed_path": "preseed.cfg", diff --git a/ubuntu/ubuntu-16.04-i386.json b/ubuntu/ubuntu-16.04-i386.json index 907d79f4e..021eeac6c 100644 --- a/ubuntu/ubuntu-16.04-i386.json +++ b/ubuntu/ubuntu-16.04-i386.json @@ -265,12 +265,12 @@ "headless": "", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", - "iso_checksum": "2e763f7f3546be33ebc9a59311b2eee3b0b0c8e021fae65431c219b531d26d32", + "iso_checksum": "e514191df0c633e92966b1b4f39966d8a4e4c30665dcc2e5a774a6bfb881ac87", "iso_checksum_type": "sha256", - "iso_name": "ubuntu-16.04.3-server-i386.iso", + "iso_name": "ubuntu-16.04.4-server-i386.iso", "memory": "1024", "mirror": "http://releases.ubuntu.com/releases", - "mirror_directory": "16.04.3", + "mirror_directory": "16.04.4", "name": "ubuntu-16.04-i386", "no_proxy": "{{env `no_proxy`}}", "preseed_path": "preseed.cfg", From 2229c77c7ca45090125da7e7f0aa280cd9f7b4b9 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith@chef.io> Date: Mon, 4 Jun 2018 11:20:35 -0700 Subject: [PATCH 0811/1622] Update cookbook testing Signed-off-by: Tim Smith <tsmith@chef.io> --- windows/cookbooks/packer/kitchen.yml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/windows/cookbooks/packer/kitchen.yml b/windows/cookbooks/packer/kitchen.yml index cc10a7a3d..e6efb0235 100644 --- a/windows/cookbooks/packer/kitchen.yml +++ b/windows/cookbooks/packer/kitchen.yml @@ -13,12 +13,15 @@ provisioner: deprecations_as_errors: true platforms: + - name: windows-2016 + driver_config: + box: chef/windows-server-2016-standard - name: windows-2012r2 driver_config: - box: chef/windows-server-2012r2-standard + box: tas50/windows-2012r2 - name: windows-2008r2 driver_config: - box: chef/windows-server-2008r2-standard + box: tas50/windows-2008r2 suites: - name: default From 526a84b05ec4b039f1a70dd96220f65fb14021d3 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith@chef.io> Date: Mon, 4 Jun 2018 11:20:45 -0700 Subject: [PATCH 0812/1622] Fix bad json in the windows 7 def Signed-off-by: Tim Smith <tsmith@chef.io> --- windows/7.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/windows/7.json b/windows/7.json index 1dc345b5a..30f96b53a 100644 --- a/windows/7.json +++ b/windows/7.json @@ -59,7 +59,7 @@ "guest_additions_mode": "attach", "headless": "false", "iso_checksum": "36ae90defbad9d9539e649b193ae573b77a71c83", - "iso_url": "iso/en_windows_7_ultimate_with_sp1_x64_dvd_u_677332.iso" + "iso_url": "iso/en_windows_7_ultimate_with_sp1_x64_dvd_u_677332.iso", "template": "windows-7" } } From f3d5c692ccbd32c43b457f561b383d86ff24fc0d Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith@chef.io> Date: Mon, 4 Jun 2018 11:55:35 -0700 Subject: [PATCH 0813/1622] Update the URL / checksum for windows 2016 Signed-off-by: Tim Smith <tsmith@chef.io> --- windows/2016.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/windows/2016.json b/windows/2016.json index 8615707ac..87f95562d 100644 --- a/windows/2016.json +++ b/windows/2016.json @@ -57,8 +57,8 @@ "variables": { "guest_additions_mode": "attach", "headless": "true", - "iso_checksum": "18a4f00a675b0338f3c7c93c4f131beb", - "iso_url": "http://care.dlservice.microsoft.com/dl/download/1/6/F/16FA20E6-4662-482A-920B-1A45CF5AAE3C/14393.0.160715-1616.RS1_RELEASE_SERVER_EVAL_X64FRE_EN-US.ISO", + "iso_checksum": "772700802951b36c8cb26a61c040b9a8dc3816a3", + "iso_url": "https://software-download.microsoft.com/download/pr/Windows_Server_2016_Datacenter_EVAL_en-us_14393_refresh.ISO", "template": "windows-2016-standard" } } From 1d9a9ca20e227922dc3ab0e6ec7cac9573bb2adb Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith@chef.io> Date: Mon, 4 Jun 2018 22:58:35 -0700 Subject: [PATCH 0814/1622] Clean up some more files Signed-off-by: Tim Smith <tsmith@chef.io> --- windows/cookbooks/packer/recipes/cleanup.rb | 10 +++++++++- windows/scripts/cleanup.ps1 | 12 ++++++++---- 2 files changed, 17 insertions(+), 5 deletions(-) diff --git a/windows/cookbooks/packer/recipes/cleanup.rb b/windows/cookbooks/packer/recipes/cleanup.rb index 1bce5ec2d..e1cc92f70 100644 --- a/windows/cookbooks/packer/recipes/cleanup.rb +++ b/windows/cookbooks/packer/recipes/cleanup.rb @@ -16,7 +16,8 @@ "C:\\Recovery", "$env:localappdata\\temp\\*", "$env:windir\\logs", - "$env:windir\\winsxs\\manifestcache" + "$env:windir\\winsxs\\manifestcache", + "C:\\Users\\vagrant\Favorites\\*" ) | % { if(Test-Path $_) { Write-Host "Removing $_" @@ -30,6 +31,13 @@ EOH end +# clean all of the event logs +%w(Application Security Setup System).each do |log| + execute "Cleaning the #{log} event log" do + command "wevtutil clear-log #{log}" + end +end + # remove pagefile registry_key 'HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Session Manager\Memory Management' do values [{ diff --git a/windows/scripts/cleanup.ps1 b/windows/scripts/cleanup.ps1 index 00394b3ed..490e7c9d3 100644 --- a/windows/scripts/cleanup.ps1 +++ b/windows/scripts/cleanup.ps1 @@ -1,9 +1,13 @@ -Write-Host "Uninstall Chef..." +Write-Host "Uninstalling Chef..." if(Test-Path "c:\windows\temp\chef.msi") { Start-Process MSIEXEC.exe '/uninstall c:\windows\temp\chef.msi /quiet' -Wait } -Write-Host "Cleaning Temp Files" +Write-Host "Removing leftover Chef files..." +Remove-Item "C:\Opscode\" -Recurse -Force -ErrorAction SilentlyContinue +Remove-Item "C:\Chef\" -Recurse -Force -ErrorAction SilentlyContinue + +Write-Host "Cleaning Temp Files..." try { Takeown /d Y /R /f "C:\Windows\Temp\*" Icacls "C:\Windows\Temp\*" /GRANT:r administrators:F /T /c /q 2>&1 @@ -20,7 +24,7 @@ $ArraySize= 64kb $SpaceToLeave= $Volume.Size * 0.05 $FileSize= $Volume.FreeSpace - $SpacetoLeave $ZeroArray= new-object byte[]($ArraySize) - + $Stream= [io.File]::OpenWrite($FilePath) try { $CurFileSize = 0 @@ -34,5 +38,5 @@ finally { $Stream.Close() } } - + Remove-Item $FilePath From c84f9936d1515616bf7fcc3384dcfc59de5bf931 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith@chef.io> Date: Mon, 4 Jun 2018 23:29:07 -0700 Subject: [PATCH 0815/1622] Add updates recipe Signed-off-by: Tim Smith <tsmith@chef.io> --- windows/cookbooks/packer/recipes/updates.rb | 22 +++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 windows/cookbooks/packer/recipes/updates.rb diff --git a/windows/cookbooks/packer/recipes/updates.rb b/windows/cookbooks/packer/recipes/updates.rb new file mode 100644 index 000000000..42a0abeef --- /dev/null +++ b/windows/cookbooks/packer/recipes/updates.rb @@ -0,0 +1,22 @@ +# Don't check for updates automatically. This needs to be configured before you can install updates +registry_key 'HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\WindowsUpdate\Auto Update' do + values [{ + name: 'AUOptions', + type: :dword, + data: 1, + }] +end + +if node['platform_version'].to_f == 6.1 # 2008R2 + # + # msu_package 'Powershell 3.0' do + # source 'https://download.microsoft.com/download/E/7/6/E76850B8-DA6E-4FF5-8CCE-A24FC513FD16/Windows6.1-KB2506143-x64.msu' + # action :install + # end + # + + msu_package '2018-05 monthly rollup' do + source 'http://download.windowsupdate.com/d/msdownload/update/software/secu/2018/05/windows6.1-kb4103718-x64_c051268978faef39e21863a95ea2452ecbc0936d.msu' + action :install + end +end From b465cc5d271b783abb08d7177955b94ce5716f76 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith@chef.io> Date: Mon, 4 Jun 2018 23:31:44 -0700 Subject: [PATCH 0816/1622] Install .NET 3.5 / Monthly rollup on 2k8r2 Install .NET 3.5.1 feature Install 5/2018 monthly update Reboot then run chef again to do the defrag / initial cleanup Signed-off-by: Tim Smith <tsmith@chef.io> --- windows/2008r2.json | 18 +++++++++++++++--- windows/2012r2.json | 2 +- windows/2016.json | 2 +- windows/7.json | 2 +- windows/cookbooks/packer/kitchen.yml | 2 +- windows/cookbooks/packer/recipes/features.rb | 8 ++++++++ .../packer/recipes/uninstall_powershell_ise.rb | 3 --- 7 files changed, 27 insertions(+), 10 deletions(-) create mode 100644 windows/cookbooks/packer/recipes/features.rb delete mode 100644 windows/cookbooks/packer/recipes/uninstall_powershell_ise.rb diff --git a/windows/2008r2.json b/windows/2008r2.json index 8b0ab5143..551d5505f 100644 --- a/windows/2008r2.json +++ b/windows/2008r2.json @@ -31,15 +31,27 @@ "install_command": "powershell.exe -Command \"(new-object Net.WebClient).DownloadString('https://omnitruck.chef.io/install.ps1') | iex; install\"", "run_list": [ "packer::vm_tools", - "packer::uninstall_powershell_ise", + "packer::features", "packer::enable_file_sharing", "packer::enable_remote_desktop", "packer::ui_tweaks", "packer::power", - "packer::cleanup", - "packer::defrag" + "packer::updates" ] }, + { + "type": "windows-restart" + }, + { + "type": "chef-solo", + "cookbook_paths": ["cookbooks"], + "guest_os_type": "windows", + "install_command": "powershell.exe -Command \"(new-object Net.WebClient).DownloadString('https://omnitruck.chef.io/install.ps1') | iex; install\"", + "run_list": [ + "packer::cleanup", + "packer::defrag" + ] + }, { "type": "powershell", "script": "scripts/cleanup.ps1", diff --git a/windows/2012r2.json b/windows/2012r2.json index 61857f96a..1c38cf75d 100644 --- a/windows/2012r2.json +++ b/windows/2012r2.json @@ -30,7 +30,7 @@ "guest_os_type": "windows", "run_list": [ "packer::vm_tools", - "packer::uninstall_powershell_ise", + "packer::features", "packer::enable_file_sharing", "packer::enable_remote_desktop", "packer::ui_tweaks", diff --git a/windows/2016.json b/windows/2016.json index 87f95562d..aab76e685 100644 --- a/windows/2016.json +++ b/windows/2016.json @@ -30,7 +30,7 @@ "guest_os_type": "windows", "run_list": [ "packer::vm_tools", - "packer::uninstall_powershell_ise", + "packer::features", "packer::enable_file_sharing", "packer::enable_remote_desktop", "packer::ui_tweaks", diff --git a/windows/7.json b/windows/7.json index 30f96b53a..e644328ab 100644 --- a/windows/7.json +++ b/windows/7.json @@ -31,7 +31,7 @@ "install_command": "powershell.exe -Command \"(new-object Net.WebClient).DownloadString('https://omnitruck.chef.io/install.ps1') | iex; install\"", "run_list": [ "packer::vm_tools", - "packer::uninstall_powershell_ise", + "packer::features", "packer::enable_file_sharing", "packer::enable_remote_desktop", "packer::ui_tweaks", diff --git a/windows/cookbooks/packer/kitchen.yml b/windows/cookbooks/packer/kitchen.yml index e6efb0235..62ff53cb5 100644 --- a/windows/cookbooks/packer/kitchen.yml +++ b/windows/cookbooks/packer/kitchen.yml @@ -27,7 +27,7 @@ suites: - name: default run_list: - recipe[packer::vm_tools] - - recipe[packer::uninstall_powershell_ise] + - recipe[packer::features] - recipe[packer::enable_file_sharing] - recipe[packer::enable_remote_desktop] - recipe[packer::ui_tweaks] diff --git a/windows/cookbooks/packer/recipes/features.rb b/windows/cookbooks/packer/recipes/features.rb new file mode 100644 index 000000000..b701d31fc --- /dev/null +++ b/windows/cookbooks/packer/recipes/features.rb @@ -0,0 +1,8 @@ +windows_feature 'NetFx3' do + action :install + only_if { node['platform_version'].to_f == 6.1 } +end + +windows_feature 'MicrosoftWindowsPowerShellISE' do + action :remove +end diff --git a/windows/cookbooks/packer/recipes/uninstall_powershell_ise.rb b/windows/cookbooks/packer/recipes/uninstall_powershell_ise.rb deleted file mode 100644 index 8fb9548e5..000000000 --- a/windows/cookbooks/packer/recipes/uninstall_powershell_ise.rb +++ /dev/null @@ -1,3 +0,0 @@ -windows_feature 'MicrosoftWindowsPowerShellISE' do - action :remove -end From d5fc07884c8c689896d374b86e7c93d92b5d411f Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith@chef.io> Date: Wed, 6 Jun 2018 10:34:20 -0700 Subject: [PATCH 0817/1622] Fix indentation Signed-off-by: Tim Smith <tsmith@chef.io> --- windows/2008r2.json | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/windows/2008r2.json b/windows/2008r2.json index 551d5505f..d661d423e 100644 --- a/windows/2008r2.json +++ b/windows/2008r2.json @@ -43,14 +43,14 @@ "type": "windows-restart" }, { - "type": "chef-solo", - "cookbook_paths": ["cookbooks"], - "guest_os_type": "windows", - "install_command": "powershell.exe -Command \"(new-object Net.WebClient).DownloadString('https://omnitruck.chef.io/install.ps1') | iex; install\"", - "run_list": [ - "packer::cleanup", - "packer::defrag" - ] + "type": "chef-solo", + "cookbook_paths": ["cookbooks"], + "guest_os_type": "windows", + "install_command": "powershell.exe -Command \"(new-object Net.WebClient).DownloadString('https://omnitruck.chef.io/install.ps1') | iex; install\"", + "run_list": [ + "packer::cleanup", + "packer::defrag" + ] }, { "type": "powershell", From 7504dbe7f3054b4f71db1d0798c06c4eab0c5528 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith@chef.io> Date: Wed, 6 Jun 2018 10:45:15 -0700 Subject: [PATCH 0818/1622] Remove the commented out PS3 install We're going to have to do this differently Signed-off-by: Tim Smith <tsmith@chef.io> --- windows/cookbooks/packer/recipes/updates.rb | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/windows/cookbooks/packer/recipes/updates.rb b/windows/cookbooks/packer/recipes/updates.rb index 42a0abeef..a7a0abad6 100644 --- a/windows/cookbooks/packer/recipes/updates.rb +++ b/windows/cookbooks/packer/recipes/updates.rb @@ -8,13 +8,8 @@ end if node['platform_version'].to_f == 6.1 # 2008R2 - # - # msu_package 'Powershell 3.0' do - # source 'https://download.microsoft.com/download/E/7/6/E76850B8-DA6E-4FF5-8CCE-A24FC513FD16/Windows6.1-KB2506143-x64.msu' - # action :install - # end - # + # This is basically a service pack and we should install it to fix a giant pile of bugs msu_package '2018-05 monthly rollup' do source 'http://download.windowsupdate.com/d/msdownload/update/software/secu/2018/05/windows6.1-kb4103718-x64_c051268978faef39e21863a95ea2452ecbc0936d.msu' action :install From 134d3c6832d213f19f9f6883e3a0dc87536ed806 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith@chef.io> Date: Wed, 6 Jun 2018 10:55:20 -0700 Subject: [PATCH 0819/1622] Remove EOL Debian 7 Debian 7 went EOL. Signed-off-by: Tim Smith <tsmith@chef.io> --- debian/debian-7.11-amd64.json | 235 ------------------------------- debian/debian-7.11-i386.json | 235 ------------------------------- debian/http/debian-7/preseed.cfg | 48 ------- debian/scripts/sudoers.sh | 3 +- 4 files changed, 1 insertion(+), 520 deletions(-) delete mode 100644 debian/debian-7.11-amd64.json delete mode 100644 debian/debian-7.11-i386.json delete mode 100644 debian/http/debian-7/preseed.cfg diff --git a/debian/debian-7.11-amd64.json b/debian/debian-7.11-amd64.json deleted file mode 100644 index 0e4d83d62..000000000 --- a/debian/debian-7.11-amd64.json +++ /dev/null @@ -1,235 +0,0 @@ -{ - "builders": [ - { - "boot_command": [ - "<esc><wait>", - "install <wait>", - " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}} <wait>", - "debian-installer=en_US.UTF-8 <wait>", - "auto <wait>", - "locale=en_US.UTF-8 <wait>", - "kbd-chooser/method=us <wait>", - "keyboard-configuration/xkb-keymap=us <wait>", - "netcfg/get_hostname={{ .Name }} <wait>", - "netcfg/get_domain=vagrantup.com <wait>", - "fb=false <wait>", - "debconf/frontend=noninteractive <wait>", - "console-setup/ask_detect=false <wait>", - "console-keymaps-at/keymap=us <wait>", - "<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", - "guest_os_type": "Debian_64", - "hard_drive_interface": "sata", - "headless": "{{ user `headless` }}", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../builds/packer-{{user `template`}}-virtualbox", - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "virtualbox-iso", - "vboxmanage": [ - [ - "modifyvm", - "{{.Name}}", - "--memory", - "{{ user `memory` }}" - ], - [ - "modifyvm", - "{{.Name}}", - "--cpus", - "{{ user `cpus` }}" - ] - ], - "virtualbox_version_file": ".vbox_version", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<esc><wait>", - "install <wait>", - " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}} <wait>", - "debian-installer=en_US.UTF-8 <wait>", - "auto <wait>", - "locale=en_US.UTF-8 <wait>", - "kbd-chooser/method=us <wait>", - "keyboard-configuration/xkb-keymap=us <wait>", - "netcfg/get_hostname={{ .Name }} <wait>", - "netcfg/get_domain=vagrantup.com <wait>", - "fb=false <wait>", - "debconf/frontend=noninteractive <wait>", - "console-setup/ask_detect=false <wait>", - "console-keymaps-at/keymap=us <wait>", - "<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "debian7-64", - "headless": "{{ user `headless` }}", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../builds/packer-{{user `template`}}-vmware", - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "tools_upload_flavor": "linux", - "type": "vmware-iso", - "vm_name": "{{ user `template` }}", - "vmx_data": { - "cpuid.coresPerSocket": "1", - "memsize": "{{ user `memory` }}", - "numvcpus": "{{ user `cpus` }}" - }, - "vmx_remove_ethernet_interfaces": true - }, - { - "boot_command": [ - "<esc><wait>", - "install <wait>", - " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}} <wait>", - "debian-installer=en_US.UTF-8 <wait>", - "auto <wait>", - "locale=en_US.UTF-8 <wait>", - "kbd-chooser/method=us <wait>", - "keyboard-configuration/xkb-keymap=us <wait>", - "netcfg/get_hostname={{ .Name }} <wait>", - "netcfg/get_domain=vagrantup.com <wait>", - "fb=false <wait>", - "debconf/frontend=noninteractive <wait>", - "console-setup/ask_detect=false <wait>", - "console-keymaps-at/keymap=us <wait>", - "<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "debian", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../builds/packer-{{user `template`}}-parallels", - "parallels_tools_flavor": "lin", - "prlctl": [ - [ - "set", - "{{.Name}}", - "--memsize", - "{{ user `memory` }}" - ], - [ - "set", - "{{.Name}}", - "--cpus", - "{{ user `cpus` }}" - ] - ], - "prlctl_version_file": ".prlctl_version", - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "parallels-iso", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<esc><wait>", - "install <wait>", - "preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/debian-7/preseed.cfg <wait>", - "debian-installer=en_US.UTF-8 <wait>", - "auto <wait>", - "locale=en_US.UTF-8 <wait>", - "kbd-chooser/method=us <wait>", - "keyboard-configuration/xkb-keymap=us <wait>", - "netcfg/get_hostname={{ .Name }} <wait>", - "netcfg/get_domain=vagrantup.com <wait>", - "fb=false <wait>", - "debconf/frontend=noninteractive <wait>", - "console-setup/ask_detect=false <wait>", - "console-keymaps-at/keymap=us <wait>", - "<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "headless": "{{ user `headless` }}", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../builds/packer-{{user `template`}}-qemu", - "shutdown_command": "echo 'vagrant'|sudo -S /sbin/shutdown -hP now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "qemu", - "vm_name": "{{ user `template` }}" - } - ], - "post-processors": [ - { - "output": "../builds/{{user `box_basename`}}.{{.Provider}}.box", - "type": "vagrant" - } - ], - "provisioners": [ - { - "environment_vars": [ - "HOME_DIR=/home/vagrant", - "http_proxy={{user `http_proxy`}}", - "https_proxy={{user `https_proxy`}}", - "no_proxy={{user `no_proxy`}}" - ], - "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", - "expect_disconnect": true, - "scripts": [ - "scripts/update.sh", - "../_common/sshd.sh", - "scripts/networking.sh", - "scripts/sudoers.sh", - "../_common/vagrant.sh", - "../_common/virtualbox.sh", - "../_common/vmware.sh", - "../_common/parallels.sh", - "scripts/cleanup.sh", - "../_common/minimize.sh" - ], - "type": "shell" - } - ], - "variables": { - "box_basename": "debian-7.11", - "build_timestamp": "{{isotime \"20060102150405\"}}", - "cpus": "1", - "disk_size": "65536", - "git_revision": "__unknown_git_revision__", - "headless": "", - "http_proxy": "{{env `http_proxy`}}", - "https_proxy": "{{env `https_proxy`}}", - "iso_checksum": "cbae9d679dbe2d37828a5abb9d3ea8c40183972952180843d8b07f7b33e09877", - "iso_checksum_type": "sha256", - "iso_name": "debian-7.11.0-amd64-CD-1.iso", - "memory": "1024", - "mirror": "http://cdimage.debian.org/cdimage/archive", - "mirror_directory": "7.11.0/amd64/iso-cd", - "name": "debian-7.11", - "no_proxy": "{{env `no_proxy`}}", - "preseed_path": "debian-7/preseed.cfg", - "template": "debian-7.11-amd64", - "version": "TIMESTAMP" - } -} - diff --git a/debian/debian-7.11-i386.json b/debian/debian-7.11-i386.json deleted file mode 100644 index e9542db8b..000000000 --- a/debian/debian-7.11-i386.json +++ /dev/null @@ -1,235 +0,0 @@ -{ - "builders": [ - { - "boot_command": [ - "<esc><wait>", - "install <wait>", - " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}} <wait>", - "debian-installer=en_US.UTF-8 <wait>", - "auto <wait>", - "locale=en_US.UTF-8 <wait>", - "kbd-chooser/method=us <wait>", - "keyboard-configuration/xkb-keymap=us <wait>", - "netcfg/get_hostname={{ .Name }} <wait>", - "netcfg/get_domain=vagrantup.com <wait>", - "fb=false <wait>", - "debconf/frontend=noninteractive <wait>", - "console-setup/ask_detect=false <wait>", - "console-keymaps-at/keymap=us <wait>", - "<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", - "guest_os_type": "Debian", - "hard_drive_interface": "sata", - "headless": "{{ user `headless` }}", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../builds/packer-{{user `template`}}-virtualbox", - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "virtualbox-iso", - "vboxmanage": [ - [ - "modifyvm", - "{{.Name}}", - "--memory", - "{{ user `memory` }}" - ], - [ - "modifyvm", - "{{.Name}}", - "--cpus", - "{{ user `cpus` }}" - ] - ], - "virtualbox_version_file": ".vbox_version", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<esc><wait>", - "install <wait>", - " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}} <wait>", - "debian-installer=en_US.UTF-8 <wait>", - "auto <wait>", - "locale=en_US.UTF-8 <wait>", - "kbd-chooser/method=us <wait>", - "keyboard-configuration/xkb-keymap=us <wait>", - "netcfg/get_hostname={{ .Name }} <wait>", - "netcfg/get_domain=vagrantup.com <wait>", - "fb=false <wait>", - "debconf/frontend=noninteractive <wait>", - "console-setup/ask_detect=false <wait>", - "console-keymaps-at/keymap=us <wait>", - "<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "debian7", - "headless": "{{ user `headless` }}", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../builds/packer-{{user `template`}}-vmware", - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "tools_upload_flavor": "linux", - "type": "vmware-iso", - "vm_name": "{{ user `template` }}", - "vmx_data": { - "cpuid.coresPerSocket": "1", - "memsize": "{{ user `memory` }}", - "numvcpus": "{{ user `cpus` }}" - }, - "vmx_remove_ethernet_interfaces": true - }, - { - "boot_command": [ - "<esc><wait>", - "install <wait>", - " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}} <wait>", - "debian-installer=en_US.UTF-8 <wait>", - "auto <wait>", - "locale=en_US.UTF-8 <wait>", - "kbd-chooser/method=us <wait>", - "keyboard-configuration/xkb-keymap=us <wait>", - "netcfg/get_hostname={{ .Name }} <wait>", - "netcfg/get_domain=vagrantup.com <wait>", - "fb=false <wait>", - "debconf/frontend=noninteractive <wait>", - "console-setup/ask_detect=false <wait>", - "console-keymaps-at/keymap=us <wait>", - "<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "debian", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../builds/packer-{{user `template`}}-parallels", - "parallels_tools_flavor": "lin", - "prlctl": [ - [ - "set", - "{{.Name}}", - "--memsize", - "{{ user `memory` }}" - ], - [ - "set", - "{{.Name}}", - "--cpus", - "{{ user `cpus` }}" - ] - ], - "prlctl_version_file": ".prlctl_version", - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "parallels-iso", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<esc><wait>", - "install <wait>", - "preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/debian-7/preseed.cfg <wait>", - "debian-installer=en_US.UTF-8 <wait>", - "auto <wait>", - "locale=en_US.UTF-8 <wait>", - "kbd-chooser/method=us <wait>", - "keyboard-configuration/xkb-keymap=us <wait>", - "netcfg/get_hostname={{ .Name }} <wait>", - "netcfg/get_domain=vagrantup.com <wait>", - "fb=false <wait>", - "debconf/frontend=noninteractive <wait>", - "console-setup/ask_detect=false <wait>", - "console-keymaps-at/keymap=us <wait>", - "<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "headless": "{{ user `headless` }}", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../builds/packer-{{user `template`}}-qemu", - "shutdown_command": "echo 'vagrant'|sudo -S /sbin/shutdown -hP now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "qemu", - "vm_name": "{{ user `template` }}" - } - ], - "post-processors": [ - { - "output": "../builds/{{user `box_basename`}}.{{.Provider}}.box", - "type": "vagrant" - } - ], - "provisioners": [ - { - "environment_vars": [ - "HOME_DIR=/home/vagrant", - "http_proxy={{user `http_proxy`}}", - "https_proxy={{user `https_proxy`}}", - "no_proxy={{user `no_proxy`}}" - ], - "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", - "expect_disconnect": true, - "scripts": [ - "scripts/update.sh", - "../_common/sshd.sh", - "scripts/networking.sh", - "scripts/sudoers.sh", - "../_common/vagrant.sh", - "../_common/virtualbox.sh", - "../_common/vmware.sh", - "../_common/parallels.sh", - "scripts/cleanup.sh", - "../_common/minimize.sh" - ], - "type": "shell" - } - ], - "variables": { - "box_basename": "debian-7.11-i386", - "build_timestamp": "{{isotime \"20060102150405\"}}", - "cpus": "1", - "disk_size": "65536", - "git_revision": "__unknown_git_revision__", - "headless": "", - "http_proxy": "{{env `http_proxy`}}", - "https_proxy": "{{env `https_proxy`}}", - "iso_checksum": "9486d582a9d6cbce3e68dd8f8734425bea02dba9da5c484028e3c7f52ad28845", - "iso_checksum_type": "sha256", - "iso_name": "debian-7.11.0-i386-CD-1.iso", - "memory": "1024", - "mirror": "http://cdimage.debian.org/cdimage/archive", - "mirror_directory": "7.11.0/i386/iso-cd", - "name": "debian-7.11-i386", - "no_proxy": "{{env `no_proxy`}}", - "preseed_path": "debian-7/preseed.cfg", - "template": "debian-7.11-i386", - "version": "TIMESTAMP" - } -} - diff --git a/debian/http/debian-7/preseed.cfg b/debian/http/debian-7/preseed.cfg deleted file mode 100644 index d6191052e..000000000 --- a/debian/http/debian-7/preseed.cfg +++ /dev/null @@ -1,48 +0,0 @@ -choose-mirror-bin mirror/http/proxy string -d-i apt-setup/use_mirror boolean true -d-i base-installer/kernel/override-image string linux-server -d-i clock-setup/utc boolean true -d-i clock-setup/utc-auto boolean true -d-i finish-install/reboot_in_progress note -d-i grub-installer/only_debian boolean true -d-i grub-installer/with_other_os boolean true -d-i keymap select us -d-i mirror/country string manual -d-i mirror/http/directory string /debian -d-i mirror/http/hostname string httpredir.debian.org -d-i mirror/http/proxy string -d-i partman-auto-lvm/guided_size string max -d-i partman-auto/choose_recipe select atomic -d-i partman-auto/method string lvm -d-i partman-lvm/confirm boolean true -d-i partman-lvm/confirm boolean true -d-i partman-lvm/confirm_nooverwrite boolean true -d-i partman-lvm/device_remove_lvm boolean true -d-i partman/choose_partition select finish -d-i partman/confirm boolean true -d-i partman/confirm_nooverwrite boolean true -d-i partman/confirm_write_new_label boolean true -d-i passwd/root-login boolean false -d-i passwd/root-password-again password vagrant -d-i passwd/root-password password vagrant -d-i passwd/user-fullname string vagrant -d-i passwd/user-uid string 1000 -d-i passwd/user-password password vagrant -d-i passwd/user-password-again password vagrant -d-i passwd/username string vagrant -d-i pkgsel/include string openssh-server sudo bzip2 acpid cryptsetup zlib1g-dev wget curl dkms make nfs-common cifs-utils -d-i pkgsel/install-language-support boolean false -d-i pkgsel/update-policy select none -d-i pkgsel/upgrade select full-upgrade -# Prevent packaged version of VirtualBox Guest Additions being installed: -d-i preseed/early_command string sed -i \ - '/in-target/idiscover(){/sbin/discover|grep -v VirtualBox;}' \ - /usr/lib/pre-pkgsel.d/20install-hwpackages -d-i time/zone string UTC -d-i user-setup/allow-password-weak boolean true -d-i user-setup/encrypt-home boolean false -d-i preseed/late_command string sed -i '/^deb cdrom:/s/^/#/' /target/etc/apt/sources.list -apt-cdrom-setup apt-setup/cdrom/set-first boolean false -apt-mirror-setup apt-setup/use_mirror boolean true -popularity-contest popularity-contest/participate boolean false -tasksel tasksel/first multiselect standard, ubuntu-server diff --git a/debian/scripts/sudoers.sh b/debian/scripts/sudoers.sh index 0e83852b7..00aa3b9f5 100644 --- a/debian/scripts/sudoers.sh +++ b/debian/scripts/sudoers.sh @@ -1,7 +1,6 @@ #!/bin/sh -eux -# Only add the secure path line if it is not already present - Debian 7 -# includes it by default. +# Only add the secure path line if it is not already present grep -q 'secure_path' /etc/sudoers \ || sed -i -e '/Defaults\s\+env_reset/a Defaults\tsecure_path="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"' /etc/sudoers; From a172ab3d08c8a1f4b63ad3635add81b39fa2d2b1 Mon Sep 17 00:00:00 2001 From: Li-Wen Hsu <lwhsu@lwhsu.org> Date: Thu, 7 Jun 2018 03:15:30 +0000 Subject: [PATCH 0820/1622] Remove EOL'd FreeBSD-10.3 --- freebsd/freebsd-10.3-amd64.json | 230 -------------------------------- freebsd/freebsd-10.3-i386.json | 230 -------------------------------- 2 files changed, 460 deletions(-) delete mode 100644 freebsd/freebsd-10.3-amd64.json delete mode 100644 freebsd/freebsd-10.3-i386.json diff --git a/freebsd/freebsd-10.3-amd64.json b/freebsd/freebsd-10.3-amd64.json deleted file mode 100644 index 0076eedfc..000000000 --- a/freebsd/freebsd-10.3-amd64.json +++ /dev/null @@ -1,230 +0,0 @@ -{ - "builders": [ - { - "boot_command": [ - "<esc><wait>", - "boot -s<wait>", - "<enter><wait>", - "<wait10><wait10>", - "/bin/sh<enter><wait>", - "mdmfs -s 100m md1 /tmp<enter><wait>", - "mdmfs -s 100m md2 /mnt<enter><wait>", - "dhclient -l /tmp/dhclient.lease.em0 em0<enter><wait>", - "fetch -o /tmp/install.sh http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} && chmod +x /tmp/install.sh && /tmp/install.sh {{ .Name }}<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "guest_additions_mode": "disable", - "guest_os_type": "FreeBSD_64", - "headless": "{{ user `headless` }}", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../builds/packer-{{user `template`}}-virtualbox", - "shutdown_command": "echo 'vagrant' | su -m root -c 'shutdown -p now'", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "virtualbox-iso", - "vboxmanage": [ - [ - "modifyvm", - "{{.Name}}", - "--memory", - "{{ user `memory` }}" - ], - [ - "modifyvm", - "{{.Name}}", - "--cpus", - "{{ user `cpus` }}" - ] - ], - "virtualbox_version_file": ".vbox_version", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<esc><wait>", - "boot -s<wait>", - "<enter><wait>", - "<wait10><wait10>", - "/bin/sh<enter><wait>", - "mdmfs -s 100m md1 /tmp<enter><wait>", - "mdmfs -s 100m md2 /mnt<enter><wait>", - "dhclient -l /tmp/dhclient.lease.em0 em0<enter><wait>", - "<wait5>", - "fetch -o /tmp/install.sh http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} && chmod +x /tmp/install.sh && /tmp/install.sh {{ .Name }}<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "freebsd-64", - "headless": "{{ user `headless` }}", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../builds/packer-{{user `template`}}-vmware", - "shutdown_command": "echo 'vagrant' | su -m root -c 'shutdown -p now'", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "vmware-iso", - "vm_name": "{{ user `template` }}", - "vmx_data": { - "cpuid.coresPerSocket": "1", - "memsize": "{{ user `memory` }}", - "numvcpus": "{{ user `cpus` }}" - }, - "vmx_remove_ethernet_interfaces": true - }, - { - "boot_command": [ - "<esc><wait>", - "boot -s<wait>", - "<enter><wait>", - "<wait10><wait10>", - "/bin/sh<enter><wait>", - "mdmfs -s 100m md1 /tmp<enter><wait>", - "mdmfs -s 100m md2 /mnt<enter><wait>", - "dhclient -l /tmp/dhclient.lease.em0 em0<enter><wait>", - "fetch -o /tmp/install.sh http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} && chmod +x /tmp/install.sh && /tmp/install.sh {{ .Name }}<enter><wait>" - ], - "boot_wait": "8s", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "freebsd", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../builds/packer-{{user `template`}}-parallels", - "parallels_tools_mode": "disable", - "prlctl": [ - [ - "set", - "{{.Name}}", - "--memsize", - "{{ user `memory` }}" - ], - [ - "set", - "{{.Name}}", - "--cpus", - "{{ user `cpus` }}" - ], - [ - "set", - "{{.Name}}", - "--device-set", - "cdrom0", - "--iface", - "ide" - ], - [ - "set", - "{{.Name}}", - "--device-del", - "fdd0" - ], - [ - "set", - "{{.Name}}", - "--device-del", - "parallel0" - ] - ], - "prlctl_version_file": ".prlctl_version", - "shutdown_command": "echo 'vagrant' | su -m root -c 'shutdown -p now'", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "parallels-iso", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<esc><wait>", - "boot -s<wait>", - "<enter><wait>", - "<wait10><wait10>", - "/bin/sh<enter><wait>", - "mdmfs -s 100m md1 /tmp<enter><wait>", - "mdmfs -s 100m md2 /mnt<enter><wait>", - "dhclient -l /tmp/dhclient.lease.vtnet0 vtnet0<enter><wait>", - "fetch -o /tmp/install.sh http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} && chmod +x /tmp/install.sh && /tmp/install.sh {{ .Name }} vtnet0<enter><wait>" - ], - "boot_wait": "7s", - "disk_size": "{{user `disk_size`}}", - "headless": "{{ user `headless` }}", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../builds/packer-{{user `template`}}-qemu", - "shutdown_command": "echo 'vagrant' | su -m root -c 'shutdown -p now'", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "qemu", - "vm_name": "{{ user `template` }}" - } - ], - "post-processors": [ - { - "output": "../builds/{{user `box_basename`}}.{{.Provider}}.box", - "type": "vagrant", - "vagrantfile_template": "vagrantfile_templates/freebsd.rb" - } - ], - "provisioners": [ - { - "environment_vars": [ - "HOME_DIR=/home/vagrant", - "http_proxy={{user `http_proxy`}}", - "https_proxy={{user `https_proxy`}}", - "no_proxy={{user `no_proxy`}}", - "pkg_branch={{user `pkg_branch`}}" - ], - "execute_command": "echo 'vagrant' | {{.Vars}} su -m root -c 'sh -eux {{.Path}}'", - "expect_disconnect": true, - "scripts": [ - "scripts/update.sh", - "scripts/postinstall.sh", - "scripts/sudoers.sh", - "../_common/vagrant.sh", - "scripts/vmtools.sh", - "scripts/cleanup.sh", - "scripts/minimize.sh" - ], - "type": "shell" - } - ], - "variables": { - "box_basename": "freebsd-10.3", - "build_timestamp": "{{isotime \"20060102150405\"}}", - "cpus": "1", - "disk_size": "65536", - "git_revision": "__unknown_git_revision__", - "headless": "", - "http_proxy": "{{env `http_proxy`}}", - "https_proxy": "{{env `https_proxy`}}", - "install_path": "freebsd-10/install.sh", - "iso_checksum": "fef068cf6dea26923ab84b62ba9f21461ca0bdec90a0741c8ffb0e1ca29e410d", - "iso_checksum_type": "sha256", - "iso_name": "FreeBSD-10.3-RELEASE-amd64-disc1.iso", - "memory": "1024", - "mirror": "https://download.freebsd.org/ftp", - "mirror_directory": "releases/amd64/amd64/ISO-IMAGES/10.3", - "name": "freebsd-10.3", - "no_proxy": "{{env `no_proxy`}}", - "pkg_branch": "quarterly", - "template": "freebsd-10.3-amd64", - "version": "TIMESTAMP" - } -} - diff --git a/freebsd/freebsd-10.3-i386.json b/freebsd/freebsd-10.3-i386.json deleted file mode 100644 index 337e3bdb7..000000000 --- a/freebsd/freebsd-10.3-i386.json +++ /dev/null @@ -1,230 +0,0 @@ -{ - "builders": [ - { - "boot_command": [ - "<esc><wait>", - "boot -s<wait>", - "<enter><wait>", - "<wait10><wait10>", - "/bin/sh<enter><wait>", - "mdmfs -s 100m md1 /tmp<enter><wait>", - "mdmfs -s 100m md2 /mnt<enter><wait>", - "dhclient -l /tmp/dhclient.lease.em0 em0<enter><wait>", - "fetch -o /tmp/install.sh http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} && chmod +x /tmp/install.sh && /tmp/install.sh {{ .Name }}<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "guest_additions_mode": "disable", - "guest_os_type": "FreeBSD", - "headless": "{{ user `headless` }}", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../builds/packer-{{user `template`}}-virtualbox", - "shutdown_command": "echo 'vagrant' | su -m root -c 'shutdown -p now'", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "virtualbox-iso", - "vboxmanage": [ - [ - "modifyvm", - "{{.Name}}", - "--memory", - "{{ user `memory` }}" - ], - [ - "modifyvm", - "{{.Name}}", - "--cpus", - "{{ user `cpus` }}" - ] - ], - "virtualbox_version_file": ".vbox_version", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<esc><wait>", - "boot -s<wait>", - "<enter><wait>", - "<wait10><wait10>", - "/bin/sh<enter><wait>", - "mdmfs -s 100m md1 /tmp<enter><wait>", - "mdmfs -s 100m md2 /mnt<enter><wait>", - "dhclient -l /tmp/dhclient.lease.em0 em0<enter><wait>", - "<wait5>", - "fetch -o /tmp/install.sh http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} && chmod +x /tmp/install.sh && /tmp/install.sh {{ .Name }}<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "freebsd", - "headless": "{{ user `headless` }}", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../builds/packer-{{user `template`}}-vmware", - "shutdown_command": "echo 'vagrant' | su -m root -c 'shutdown -p now'", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "vmware-iso", - "vm_name": "{{ user `template` }}", - "vmx_data": { - "cpuid.coresPerSocket": "1", - "memsize": "{{ user `memory` }}", - "numvcpus": "{{ user `cpus` }}" - }, - "vmx_remove_ethernet_interfaces": true - }, - { - "boot_command": [ - "<esc><wait>", - "boot -s<wait>", - "<enter><wait>", - "<wait10><wait10>", - "/bin/sh<enter><wait>", - "mdmfs -s 100m md1 /tmp<enter><wait>", - "mdmfs -s 100m md2 /mnt<enter><wait>", - "dhclient -l /tmp/dhclient.lease.em0 em0<enter><wait>", - "fetch -o /tmp/install.sh http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} && chmod +x /tmp/install.sh && /tmp/install.sh {{ .Name }}<enter><wait>" - ], - "boot_wait": "8s", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "freebsd", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../builds/packer-{{user `template`}}-parallels", - "parallels_tools_mode": "disable", - "prlctl": [ - [ - "set", - "{{.Name}}", - "--memsize", - "{{ user `memory` }}" - ], - [ - "set", - "{{.Name}}", - "--cpus", - "{{ user `cpus` }}" - ], - [ - "set", - "{{.Name}}", - "--device-set", - "cdrom0", - "--iface", - "ide" - ], - [ - "set", - "{{.Name}}", - "--device-del", - "fdd0" - ], - [ - "set", - "{{.Name}}", - "--device-del", - "parallel0" - ] - ], - "prlctl_version_file": ".prlctl_version", - "shutdown_command": "echo 'vagrant' | su -m root -c 'shutdown -p now'", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "parallels-iso", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<esc><wait>", - "boot -s<wait>", - "<enter><wait>", - "<wait10><wait10>", - "/bin/sh<enter><wait>", - "mdmfs -s 100m md1 /tmp<enter><wait>", - "mdmfs -s 100m md2 /mnt<enter><wait>", - "dhclient -l /tmp/dhclient.lease.vtnet0 vtnet0<enter><wait>", - "fetch -o /tmp/install.sh http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} && chmod +x /tmp/install.sh && /tmp/install.sh {{ .Name }}<enter><wait>" - ], - "boot_wait": "7s", - "disk_size": "{{user `disk_size`}}", - "headless": "{{ user `headless` }}", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../builds/packer-{{user `template`}}-qemu", - "shutdown_command": "echo 'vagrant' | su -m root -c 'shutdown -p now'", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "qemu", - "vm_name": "{{ user `template` }}" - } - ], - "post-processors": [ - { - "output": "../builds/{{user `box_basename`}}.{{.Provider}}.box", - "type": "vagrant", - "vagrantfile_template": "vagrantfile_templates/freebsd.rb" - } - ], - "provisioners": [ - { - "environment_vars": [ - "HOME_DIR=/home/vagrant", - "http_proxy={{user `http_proxy`}}", - "https_proxy={{user `https_proxy`}}", - "no_proxy={{user `no_proxy`}}", - "pkg_branch={{user `pkg_branch`}}" - ], - "execute_command": "echo 'vagrant' | {{.Vars}} su -m root -c 'sh -eux {{.Path}}'", - "expect_disconnect": true, - "scripts": [ - "scripts/update.sh", - "scripts/postinstall.sh", - "scripts/sudoers.sh", - "../_common/vagrant.sh", - "scripts/vmtools.sh", - "scripts/cleanup.sh", - "scripts/minimize.sh" - ], - "type": "shell" - } - ], - "variables": { - "box_basename": "freebsd-10.3-i386", - "build_timestamp": "{{isotime \"20060102150405\"}}", - "cpus": "1", - "disk_size": "65536", - "git_revision": "__unknown_git_revision__", - "headless": "", - "http_proxy": "{{env `http_proxy`}}", - "https_proxy": "{{env `https_proxy`}}", - "install_path": "freebsd-10/install.sh", - "iso_checksum": "8329ee2ca4779892edbb001c303670d74642e4353e97d02f4521895023cacd5d", - "iso_checksum_type": "sha256", - "iso_name": "FreeBSD-10.3-RELEASE-i386-disc1.iso", - "memory": "1024", - "mirror": "https://download.freebsd.org/ftp", - "mirror_directory": "releases/i386/i386/ISO-IMAGES/10.3", - "name": "freebsd-10.3-i386", - "no_proxy": "{{env `no_proxy`}}", - "pkg_branch": "quarterly", - "template": "freebsd-10.3-i386", - "version": "TIMESTAMP" - } -} - From 1ea30e8aa3823207f81dbfb68a8f520b28fc1518 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith@chef.io> Date: Wed, 6 Jun 2018 15:12:21 -0700 Subject: [PATCH 0821/1622] Increase built time memory to 4GB Avoid OOM issues Signed-off-by: Tim Smith <tsmith@chef.io> --- windows/2008r2.json | 2 +- windows/2012r2.json | 2 +- windows/2016.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/windows/2008r2.json b/windows/2008r2.json index d661d423e..b02c269e4 100644 --- a/windows/2008r2.json +++ b/windows/2008r2.json @@ -2,7 +2,7 @@ "builders": [{ "type": "virtualbox-iso", "vboxmanage": [ - ["modifyvm", "{{.Name}}", "--memory", "2048"], + ["modifyvm", "{{.Name}}", "--memory", "4096"], ["modifyvm", "{{.Name}}", "--vram", "48"], ["modifyvm", "{{.Name}}", "--cpus", "2"] ], diff --git a/windows/2012r2.json b/windows/2012r2.json index 1c38cf75d..2d00aee45 100644 --- a/windows/2012r2.json +++ b/windows/2012r2.json @@ -2,7 +2,7 @@ "builders": [{ "type": "virtualbox-iso", "vboxmanage": [ - ["modifyvm", "{{.Name}}", "--memory", "2048"], + ["modifyvm", "{{.Name}}", "--memory", "4096"], ["modifyvm", "{{.Name}}", "--vram", "48"], ["modifyvm", "{{.Name}}", "--cpus", "2"] ], diff --git a/windows/2016.json b/windows/2016.json index aab76e685..e4d4b3111 100644 --- a/windows/2016.json +++ b/windows/2016.json @@ -2,7 +2,7 @@ "builders": [{ "type": "virtualbox-iso", "vboxmanage": [ - ["modifyvm", "{{.Name}}", "--memory", "2048"], + ["modifyvm", "{{.Name}}", "--memory", "4096"], ["modifyvm", "{{.Name}}", "--vram", "48"], ["modifyvm", "{{.Name}}", "--cpus", "2"] ], From d4e1735762f3a04d550bbae0722c57bc09c2520b Mon Sep 17 00:00:00 2001 From: Kentaro Hayashi <hayashi@clear-code.com> Date: Mon, 25 Jun 2018 13:31:09 +0900 Subject: [PATCH 0822/1622] Support Debian 8.11 See https://www.debian.org/News/2018/20180623 Signed-off-by: Kentaro Hayashi <hayashi@clear-code.com> --- ...debian-8.10-amd64.json => debian-8.11-amd64.json} | 12 ++++++------ .../{debian-8.10-i386.json => debian-8.11-i386.json} | 12 ++++++------ 2 files changed, 12 insertions(+), 12 deletions(-) rename debian/{debian-8.10-amd64.json => debian-8.11-amd64.json} (96%) rename debian/{debian-8.10-i386.json => debian-8.11-i386.json} (96%) diff --git a/debian/debian-8.10-amd64.json b/debian/debian-8.11-amd64.json similarity index 96% rename from debian/debian-8.10-amd64.json rename to debian/debian-8.11-amd64.json index 2d57feb87..42623dc5e 100644 --- a/debian/debian-8.10-amd64.json +++ b/debian/debian-8.11-amd64.json @@ -217,7 +217,7 @@ } ], "variables": { - "box_basename": "debian-8.10", + "box_basename": "debian-8.11", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", "disk_size": "65536", @@ -225,16 +225,16 @@ "headless": "", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", - "iso_checksum": "039a2669fecfb06949251cf32834b9d8a8eb0a660d9bb21332ac264a2c5e7435", + "iso_checksum": "166868369a8094a69b2766b46a9a28869ac921bac5697e525d0ec5be14a9d373", "iso_checksum_type": "sha256", - "iso_name": "debian-8.10.0-amd64-CD-1.iso", + "iso_name": "debian-8.11.0-amd64-CD-1.iso", "memory": "1024", "mirror": "http://cdimage.debian.org/cdimage/archive", - "mirror_directory": "8.10.0/amd64/iso-cd", - "name": "debian-8.10", + "mirror_directory": "8.11.0/amd64/iso-cd", + "name": "debian-8.11", "no_proxy": "{{env `no_proxy`}}", "preseed_path": "debian-8/preseed.cfg", - "template": "debian-8.10-amd64", + "template": "debian-8.11-amd64", "version": "TIMESTAMP" } } diff --git a/debian/debian-8.10-i386.json b/debian/debian-8.11-i386.json similarity index 96% rename from debian/debian-8.10-i386.json rename to debian/debian-8.11-i386.json index 86f538420..1ff5c81c5 100644 --- a/debian/debian-8.10-i386.json +++ b/debian/debian-8.11-i386.json @@ -217,7 +217,7 @@ } ], "variables": { - "box_basename": "debian-8.10-i386", + "box_basename": "debian-8.11-i386", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", "disk_size": "65536", @@ -225,16 +225,16 @@ "headless": "", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", - "iso_checksum": "1d837e8551ac01807f3ab908045f9f34281184259e9562eab95c74b07a676fba", + "iso_checksum": "4c56c06d2ba489409f50cbf073bf3656460336dd805b0245f9b419585680b7cd", "iso_checksum_type": "sha256", - "iso_name": "debian-8.10.0-i386-CD-1.iso", + "iso_name": "debian-8.11.0-i386-CD-1.iso", "memory": "1024", "mirror": "http://cdimage.debian.org/cdimage/archive", - "mirror_directory": "8.10.0/i386/iso-cd", - "name": "debian-8.10-i386", + "mirror_directory": "8.11.0/i386/iso-cd", + "name": "debian-8.11-i386", "no_proxy": "{{env `no_proxy`}}", "preseed_path": "debian-8/preseed.cfg", - "template": "debian-8.10-i386", + "template": "debian-8.11-i386", "version": "TIMESTAMP" } } From cf0347622ded5c2c4621da9df3ff6e453fed669f Mon Sep 17 00:00:00 2001 From: Seth Thomas <sthomas@chef.io> Date: Mon, 25 Jun 2018 16:14:34 -0500 Subject: [PATCH 0823/1622] Fix 1031, document firewall/networking Signed-off-by: Seth Thomas <sthomas@chef.io> --- README.md | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/README.md b/README.md index 997fe12f8..1deddf985 100644 --- a/README.md +++ b/README.md @@ -73,6 +73,18 @@ If the build is successful, ready to import box files will be in the `builds` di Templates for operating systems only available via license or subscription are also available in the repository, these include but are not limited to: Mac OS X, Red Hat Enterprise Linux, and SUSE Linux Enterprise. As the ISOs are not publicly available the URL values will need to be overridden as appropriate. We rely on the efforts of those with access to licensed versions of the operating systems to keep these up-to-date. +### Networking/Firewalls + +Most of the providers need somewhat unrestricted access to networking in order to build as expected. We can't enumerate all possible firewall configurations but include some snippets below that might be useful to users. + +#### Windows + +``` +$VS = "Standardswitch" +$IF_ALIAS = (Get-NetAdapter -Name "vEthernet ($VS)").ifAlias +New-NetFirewallRule -Displayname "Allow incomming from $VS" -Direction Inbound -InterfaceAlias $IF_ALIAS -Action Allow +``` + #### macOS / OSX See our [wiki page](https://github.com/chef/bento/wiki/macOS) From 831a00d7b6a5bc19e9f45bfec10ae2497c08574f Mon Sep 17 00:00:00 2001 From: dj <davejagoda@users.noreply.github.com> Date: Mon, 25 Jun 2018 15:58:11 -0700 Subject: [PATCH 0824/1622] Use en_US.UTF-8 locale instead of en_US (which uses ISO-8859-1 codeset) --- ubuntu/ubuntu-18.04-amd64.json | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/ubuntu/ubuntu-18.04-amd64.json b/ubuntu/ubuntu-18.04-amd64.json index 5a234d705..1d8fc8844 100644 --- a/ubuntu/ubuntu-18.04-amd64.json +++ b/ubuntu/ubuntu-18.04-amd64.json @@ -11,13 +11,13 @@ " console-setup/layoutcode=us<wait>", " console-setup/modelcode=pc105<wait>", " debconf/frontend=noninteractive<wait>", - " debian-installer=en_US<wait>", + " debian-installer=en_US.UTF-8<wait>", " fb=false<wait>", " initrd=/install/initrd.gz<wait>", " kbd-chooser/method=us<wait>", " keyboard-configuration/layout=USA<wait>", " keyboard-configuration/variant=USA<wait>", - " locale=en_US<wait>", + " locale=en_US.UTF-8<wait>", " netcfg/get_domain=vm<wait>", " netcfg/get_hostname=vagrant<wait>", " grub-installer/bootdev=/dev/sda<wait>", @@ -71,13 +71,13 @@ " console-setup/layoutcode=us<wait>", " console-setup/modelcode=pc105<wait>", " debconf/frontend=noninteractive<wait>", - " debian-installer=en_US<wait>", + " debian-installer=en_US.UTF-8<wait>", " fb=false<wait>", " initrd=/install/initrd.gz<wait>", " kbd-chooser/method=us<wait>", " keyboard-configuration/layout=USA<wait>", " keyboard-configuration/variant=USA<wait>", - " locale=en_US<wait>", + " locale=en_US.UTF-8<wait>", " netcfg/get_domain=vm<wait>", " netcfg/get_hostname=vagrant<wait>", " grub-installer/bootdev=/dev/sda<wait>", @@ -122,13 +122,13 @@ " console-setup/layoutcode=us<wait>", " console-setup/modelcode=pc105<wait>", " debconf/frontend=noninteractive<wait>", - " debian-installer=en_US<wait>", + " debian-installer=en_US.UTF-8<wait>", " fb=false<wait>", " initrd=/install/initrd.gz<wait>", " kbd-chooser/method=us<wait>", " keyboard-configuration/layout=USA<wait>", " keyboard-configuration/variant=USA<wait>", - " locale=en_US<wait>", + " locale=en_US.UTF-8<wait>", " netcfg/get_domain=vm<wait>", " netcfg/get_hostname=vagrant<wait>", " grub-installer/bootdev=/dev/sda<wait>", @@ -180,13 +180,13 @@ " console-setup/layoutcode=us<wait>", " console-setup/modelcode=pc105<wait>", " debconf/frontend=noninteractive<wait>", - " debian-installer=en_US<wait>", + " debian-installer=en_US.UTF-8<wait>", " fb=false<wait>", " initrd=/install/initrd.gz<wait>", " kbd-chooser/method=us<wait>", " keyboard-configuration/layout=USA<wait>", " keyboard-configuration/variant=USA<wait>", - " locale=en_US<wait>", + " locale=en_US.UTF-8<wait>", " netcfg/get_domain=vm<wait>", " netcfg/get_hostname=vagrant<wait>", " grub-installer/bootdev=/dev/vda<wait>", @@ -227,7 +227,7 @@ "set gfxpayload=1024x768<enter>", "linux /install/vmlinuz ", "preseed/url=http://{{.HTTPIP}}:{{.HTTPPort}}/preseed-hyperv.cfg ", - "debian-installer=en_US auto locale=en_US kbd-chooser/method=us ", + "debian-installer=en_US.UTF-8 auto locale=en_US.UTF-8 kbd-chooser/method=us ", "hostname={{.Name}} ", "fb=false debconf/frontend=noninteractive ", "keyboard-configuration/modelcode=SKIP keyboard-configuration/layout=USA ", From 7f74581b60c6a5e0dc3f9f0b83073df81c1a6ad9 Mon Sep 17 00:00:00 2001 From: Kevin Pease <kevin.pease@hpe.com> Date: Tue, 26 Jun 2018 10:52:41 -0400 Subject: [PATCH 0825/1622] Set correct permissions on /etc/sudoers.d/vagrant 'visudo -c' reports that /etc/sudoers.d/vagrant should have its mode set to 0440, but it is set to 0644. --- centos/http/6/ks.cfg | 1 + centos/http/7/ks.cfg | 1 + 2 files changed, 2 insertions(+) diff --git a/centos/http/6/ks.cfg b/centos/http/6/ks.cfg index f39b0e123..931bea276 100644 --- a/centos/http/6/ks.cfg +++ b/centos/http/6/ks.cfg @@ -69,6 +69,7 @@ virt-what sed -i -e 's/\(^SELINUX=\).*$/\1permissive/' /etc/selinux/config # sudo echo "%vagrant ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers.d/vagrant +chmod 0440 /etc/sudoers.d/vagrant #Enable hyper-v daemons only if using hyper-v virtualization if [ $(virt-what) == "hyperv" ]; then diff --git a/centos/http/7/ks.cfg b/centos/http/7/ks.cfg index 2b32f982d..c8cef2a43 100644 --- a/centos/http/7/ks.cfg +++ b/centos/http/7/ks.cfg @@ -64,6 +64,7 @@ deltarpm %post # sudo echo "%vagrant ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers.d/vagrant +chmod 0440 /etc/sudoers.d/vagrant #Enable hyper-v daemons only if using hyper-v virtualization if [ $(virt-what) == "hyperv" ]; then From b4a43734f7779098861dd11cd42a76636b6d1539 Mon Sep 17 00:00:00 2001 From: Li-Wen Hsu <lwhsu@lwhsu.org> Date: Sun, 1 Jul 2018 15:46:16 +0100 Subject: [PATCH 0826/1622] Add FreeBSD 11.2-RELEASE --- freebsd/freebsd-11.2-amd64.json | 229 ++++++++++++++++++++++++++++++++ freebsd/freebsd-11.2-i386.json | 229 ++++++++++++++++++++++++++++++++ 2 files changed, 458 insertions(+) create mode 100644 freebsd/freebsd-11.2-amd64.json create mode 100644 freebsd/freebsd-11.2-i386.json diff --git a/freebsd/freebsd-11.2-amd64.json b/freebsd/freebsd-11.2-amd64.json new file mode 100644 index 000000000..e99a7383e --- /dev/null +++ b/freebsd/freebsd-11.2-amd64.json @@ -0,0 +1,229 @@ +{ + "builders": [ + { + "boot_command": [ + "<esc><wait>", + "boot -s<wait>", + "<enter><wait>", + "<wait10><wait10>", + "/bin/sh<enter><wait>", + "mdmfs -s 100m md1 /tmp<enter><wait>", + "mdmfs -s 100m md2 /mnt<enter><wait>", + "dhclient -l /tmp/dhclient.lease.em0 em0<enter><wait>", + "fetch -o /tmp/installerconfig http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} && bsdinstall script /tmp/installerconfig<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": "{{user `disk_size`}}", + "guest_additions_mode": "disable", + "guest_os_type": "FreeBSD_64", + "headless": "{{ user `headless` }}", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "../builds/packer-{{user `template`}}-virtualbox", + "shutdown_command": "echo 'vagrant' | su -m root -c 'shutdown -p now'", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "virtualbox-iso", + "vboxmanage": [ + [ + "modifyvm", + "{{.Name}}", + "--memory", + "{{ user `memory` }}" + ], + [ + "modifyvm", + "{{.Name}}", + "--cpus", + "{{ user `cpus` }}" + ] + ], + "virtualbox_version_file": ".vbox_version", + "vm_name": "{{ user `template` }}" + }, + { + "boot_command": [ + "<esc><wait>", + "boot -s<wait>", + "<enter><wait>", + "<wait10><wait10>", + "/bin/sh<enter><wait>", + "mdmfs -s 100m md1 /tmp<enter><wait>", + "mdmfs -s 100m md2 /mnt<enter><wait>", + "dhclient -l /tmp/dhclient.lease.em0 em0<enter><wait>", + "<wait5>", + "fetch -o /tmp/installerconfig http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} && bsdinstall script /tmp/installerconfig<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": "{{user `disk_size`}}", + "guest_os_type": "freebsd-64", + "headless": "{{ user `headless` }}", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "../builds/packer-{{user `template`}}-vmware", + "shutdown_command": "echo 'vagrant' | su -m root -c 'shutdown -p now'", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "vmware-iso", + "vm_name": "{{ user `template` }}", + "vmx_data": { + "cpuid.coresPerSocket": "1", + "memsize": "{{ user `memory` }}", + "numvcpus": "{{ user `cpus` }}" + }, + "vmx_remove_ethernet_interfaces": true + }, + { + "boot_command": [ + "<esc><wait>", + "boot -s<wait>", + "<enter><wait>", + "<wait10><wait10>", + "/bin/sh<enter><wait>", + "mdmfs -s 100m md1 /tmp<enter><wait>", + "mdmfs -s 100m md2 /mnt<enter><wait>", + "dhclient -l /tmp/dhclient.lease.em0 em0<enter><wait>", + "fetch -o /tmp/installerconfig http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} && bsdinstall script /tmp/installerconfig<enter><wait>" + ], + "boot_wait": "8s", + "disk_size": "{{user `disk_size`}}", + "guest_os_type": "freebsd", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "../builds/packer-{{user `template`}}-parallels", + "parallels_tools_mode": "disable", + "prlctl": [ + [ + "set", + "{{.Name}}", + "--memsize", + "{{ user `memory` }}" + ], + [ + "set", + "{{.Name}}", + "--cpus", + "{{ user `cpus` }}" + ], + [ + "set", + "{{.Name}}", + "--device-set", + "cdrom0", + "--iface", + "ide" + ], + [ + "set", + "{{.Name}}", + "--device-del", + "fdd0" + ], + [ + "set", + "{{.Name}}", + "--device-del", + "parallel0" + ] + ], + "prlctl_version_file": ".prlctl_version", + "shutdown_command": "echo 'vagrant' | su -m root -c 'shutdown -p now'", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "parallels-iso", + "vm_name": "{{ user `template` }}" + }, + { + "boot_command": [ + "<esc><wait>", + "boot -s<wait>", + "<enter><wait>", + "<wait10><wait10>", + "/bin/sh<enter><wait>", + "mdmfs -s 100m md1 /tmp<enter><wait>", + "mdmfs -s 100m md2 /mnt<enter><wait>", + "dhclient -l /tmp/dhclient.lease.vtnet0 vtnet0<enter><wait>", + "fetch -o /tmp/installerconfig http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} && bsdinstall script /tmp/installerconfig<enter><wait>" + ], + "boot_wait": "7s", + "disk_size": "{{user `disk_size`}}", + "headless": "{{ user `headless` }}", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "../builds/packer-{{user `template`}}-qemu", + "shutdown_command": "echo 'vagrant' | su -m root -c 'shutdown -p now'", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "qemu", + "vm_name": "{{ user `template` }}" + } + ], + "post-processors": [ + { + "output": "../builds/{{user `box_basename`}}.{{.Provider}}.box", + "type": "vagrant", + "vagrantfile_template": "vagrantfile_templates/freebsd.rb" + } + ], + "provisioners": [ + { + "environment_vars": [ + "HOME_DIR=/home/vagrant", + "http_proxy={{user `http_proxy`}}", + "https_proxy={{user `https_proxy`}}", + "no_proxy={{user `no_proxy`}}", + "pkg_branch={{user `pkg_branch`}}" + ], + "execute_command": "echo 'vagrant' | {{.Vars}} su -m root -c 'sh -eux {{.Path}}'", + "expect_disconnect": true, + "scripts": [ + "scripts/update.sh", + "scripts/postinstall.sh", + "scripts/sudoers.sh", + "../_common/vagrant.sh", + "scripts/vmtools.sh", + "scripts/cleanup.sh", + "scripts/minimize.sh" + ], + "type": "shell" + } + ], + "variables": { + "box_basename": "freebsd-11.2", + "build_timestamp": "{{isotime \"20060102150405\"}}", + "cpus": "1", + "disk_size": "65536", + "git_revision": "__unknown_git_revision__", + "headless": "", + "http_proxy": "{{env `http_proxy`}}", + "https_proxy": "{{env `https_proxy`}}", + "install_path": "freebsd-11/installerconfig", + "iso_checksum": "710d237907f1753dbfbecb1186e401d9635156eeef6914f24f632f3219e59d3b", + "iso_checksum_type": "sha256", + "iso_name": "FreeBSD-11.2-RELEASE-amd64-disc1.iso", + "memory": "1024", + "mirror": "https://download.freebsd.org/ftp", + "mirror_directory": "releases/amd64/amd64/ISO-IMAGES/11.2", + "no_proxy": "{{env `no_proxy`}}", + "pkg_branch": "quarterly", + "template": "freebsd-11.2-amd64", + "version": "TIMESTAMP" + } +} + diff --git a/freebsd/freebsd-11.2-i386.json b/freebsd/freebsd-11.2-i386.json new file mode 100644 index 000000000..7e456e1e4 --- /dev/null +++ b/freebsd/freebsd-11.2-i386.json @@ -0,0 +1,229 @@ +{ + "builders": [ + { + "boot_command": [ + "<esc><wait>", + "boot -s<wait>", + "<enter><wait>", + "<wait10><wait10>", + "/bin/sh<enter><wait>", + "mdmfs -s 100m md1 /tmp<enter><wait>", + "mdmfs -s 100m md2 /mnt<enter><wait>", + "dhclient -l /tmp/dhclient.lease.em0 em0<enter><wait>", + "fetch -o /tmp/installerconfig http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} && bsdinstall script /tmp/installerconfig<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": "{{user `disk_size`}}", + "guest_additions_mode": "disable", + "guest_os_type": "FreeBSD", + "headless": "{{ user `headless` }}", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "../builds/packer-{{user `template`}}-virtualbox", + "shutdown_command": "echo 'vagrant' | su -m root -c 'shutdown -p now'", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "virtualbox-iso", + "vboxmanage": [ + [ + "modifyvm", + "{{.Name}}", + "--memory", + "{{ user `memory` }}" + ], + [ + "modifyvm", + "{{.Name}}", + "--cpus", + "{{ user `cpus` }}" + ] + ], + "virtualbox_version_file": ".vbox_version", + "vm_name": "{{ user `template` }}" + }, + { + "boot_command": [ + "<esc><wait>", + "boot -s<wait>", + "<enter><wait>", + "<wait10><wait10>", + "/bin/sh<enter><wait>", + "mdmfs -s 100m md1 /tmp<enter><wait>", + "mdmfs -s 100m md2 /mnt<enter><wait>", + "dhclient -l /tmp/dhclient.lease.em0 em0<enter><wait>", + "<wait5>", + "fetch -o /tmp/installerconfig http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} && bsdinstall script /tmp/installerconfig<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": "{{user `disk_size`}}", + "guest_os_type": "freebsd", + "headless": "{{ user `headless` }}", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "../builds/packer-{{user `template`}}-vmware", + "shutdown_command": "echo 'vagrant' | su -m root -c 'shutdown -p now'", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "vmware-iso", + "vm_name": "{{ user `template` }}", + "vmx_data": { + "cpuid.coresPerSocket": "1", + "memsize": "{{ user `memory` }}", + "numvcpus": "{{ user `cpus` }}" + }, + "vmx_remove_ethernet_interfaces": true + }, + { + "boot_command": [ + "<esc><wait>", + "boot -s<wait>", + "<enter><wait>", + "<wait10><wait10>", + "/bin/sh<enter><wait>", + "mdmfs -s 100m md1 /tmp<enter><wait>", + "mdmfs -s 100m md2 /mnt<enter><wait>", + "dhclient -l /tmp/dhclient.lease.em0 em0<enter><wait>", + "fetch -o /tmp/installerconfig http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} && bsdinstall script /tmp/installerconfig<enter><wait>" + ], + "boot_wait": "8s", + "disk_size": "{{user `disk_size`}}", + "guest_os_type": "freebsd", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "../builds/packer-{{user `template`}}-parallels", + "parallels_tools_mode": "disable", + "prlctl": [ + [ + "set", + "{{.Name}}", + "--memsize", + "{{ user `memory` }}" + ], + [ + "set", + "{{.Name}}", + "--cpus", + "{{ user `cpus` }}" + ], + [ + "set", + "{{.Name}}", + "--device-set", + "cdrom0", + "--iface", + "ide" + ], + [ + "set", + "{{.Name}}", + "--device-del", + "fdd0" + ], + [ + "set", + "{{.Name}}", + "--device-del", + "parallel0" + ] + ], + "prlctl_version_file": ".prlctl_version", + "shutdown_command": "echo 'vagrant' | su -m root -c 'shutdown -p now'", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "parallels-iso", + "vm_name": "{{ user `template` }}" + }, + { + "boot_command": [ + "<esc><wait>", + "boot -s<wait>", + "<enter><wait>", + "<wait10><wait10>", + "/bin/sh<enter><wait>", + "mdmfs -s 100m md1 /tmp<enter><wait>", + "mdmfs -s 100m md2 /mnt<enter><wait>", + "dhclient -l /tmp/dhclient.lease.vtnet0 vtnet0<enter><wait>", + "fetch -o /tmp/installerconfig http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} && bsdinstall script /tmp/installerconfig<enter><wait>" + ], + "boot_wait": "7s", + "disk_size": "{{user `disk_size`}}", + "headless": "{{ user `headless` }}", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "../builds/packer-{{user `template`}}-qemu", + "shutdown_command": "echo 'vagrant' | su -m root -c 'shutdown -p now'", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "qemu", + "vm_name": "{{ user `template` }}" + } + ], + "post-processors": [ + { + "output": "../builds/{{user `box_basename`}}.{{.Provider}}.box", + "type": "vagrant", + "vagrantfile_template": "vagrantfile_templates/freebsd.rb" + } + ], + "provisioners": [ + { + "environment_vars": [ + "HOME_DIR=/home/vagrant", + "http_proxy={{user `http_proxy`}}", + "https_proxy={{user `https_proxy`}}", + "no_proxy={{user `no_proxy`}}", + "pkg_branch={{user `pkg_branch`}}" + ], + "execute_command": "echo 'vagrant' | {{.Vars}} su -m root -c 'sh -eux {{.Path}}'", + "expect_disconnect": true, + "scripts": [ + "scripts/update.sh", + "scripts/postinstall.sh", + "scripts/sudoers.sh", + "../_common/vagrant.sh", + "scripts/vmtools.sh", + "scripts/cleanup.sh", + "scripts/minimize.sh" + ], + "type": "shell" + } + ], + "variables": { + "box_basename": "freebsd-11.2-i386", + "build_timestamp": "{{isotime \"20060102150405\"}}", + "cpus": "1", + "disk_size": "40960", + "git_revision": "__unknown_git_revision__", + "headless": "", + "http_proxy": "{{env `http_proxy`}}", + "https_proxy": "{{env `https_proxy`}}", + "install_path": "freebsd-11/installerconfig", + "iso_checksum": "676ca4ca873b210a52a01c3c24fb2d114ea47ae77e7d86b445f459407d7a0a8d", + "iso_checksum_type": "sha256", + "iso_name": "FreeBSD-11.2-RELEASE-i386-disc1.iso", + "memory": "1024", + "mirror": "https://download.freebsd.org/ftp", + "mirror_directory": "releases/i386/i386/ISO-IMAGES/11.2", + "no_proxy": "{{env `no_proxy`}}", + "pkg_branch": "quarterly", + "template": "freebsd-11.2-i386", + "version": "TIMESTAMP" + } +} + From f0284276719531192bc077a0c570f860f5327bbd Mon Sep 17 00:00:00 2001 From: Li-Wen Hsu <lwhsu@lwhsu.org> Date: Sun, 1 Jul 2018 16:01:26 +0100 Subject: [PATCH 0827/1622] Add FreeBSD 11.2-RELEASE to builds --- builds.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/builds.yml b/builds.yml index f8b5b115c..5f6462cf8 100644 --- a/builds.yml +++ b/builds.yml @@ -28,6 +28,8 @@ public: - 'fedora-27' - 'fedora-26' - 'opensuse-leap-42.3' +- 'freebsd-11.2' +- 'freebsd-11.2-i386' - 'freebsd-11.1' - 'freebsd-11.1-i386' - 'freebsd-10.4' @@ -40,6 +42,6 @@ slugs: 'debian-9': 'debian-9.4' 'debian-8': 'debian-8.10' 'debian-7': 'debian-7.11' - 'freebsd-11': 'freebsd-11.1' + 'freebsd-11': 'freebsd-11.2' 'freebsd-10': 'freebsd-10.4' 'opensuse-leap-42': 'opensuse-leap-42.3' From bc4b8a99992093ad35444999301b07de53c5ffee Mon Sep 17 00:00:00 2001 From: Ben Konick <bkonick@gmail.com> Date: Thu, 5 Jul 2018 15:23:04 -0400 Subject: [PATCH 0828/1622] remove snapper Signed-off-by: Ben Konick <bkonick@gmail.com> --- opensuse/http/autoinst.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/opensuse/http/autoinst.xml b/opensuse/http/autoinst.xml index 3dbc20272..fff6e48b4 100644 --- a/opensuse/http/autoinst.xml +++ b/opensuse/http/autoinst.xml @@ -156,6 +156,7 @@ <package>telnet</package> <package>virtualbox-guest-kmp-default</package> <package>virtualbox-guest-tools</package> + <package>snapper</package> <package>snapper-zypp-plugin</package> </remove-packages> </software> From 5d612f509b0fd86c32e3108157f1ad6e7ee61919 Mon Sep 17 00:00:00 2001 From: Ben Konick <bkonick@gmail.com> Date: Thu, 5 Jul 2018 15:26:31 -0400 Subject: [PATCH 0829/1622] Fix network persistence on SLES - same as #943 for openSUSE Signed-off-by: Ben Konick <bkonick@gmail.com> --- sles/scripts/cleanup.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sles/scripts/cleanup.sh b/sles/scripts/cleanup.sh index 1325c1b4f..5acb7eb0d 100644 --- a/sles/scripts/cleanup.sh +++ b/sles/scripts/cleanup.sh @@ -5,5 +5,9 @@ zypper clean rm -f /tmp/chef*rpm +# Clean up network interface persistence +rm -f /etc/udev/rules.d/70-persistent-net.rules; +touch /etc/udev/rules.d/75-persistent-net-generator.rules; + # delete any logs that have built up during the install find /var/log/ -name *.log -exec rm -f {} \; From 9428b7fd08f1386536a058d20f056fa535bbf18d Mon Sep 17 00:00:00 2001 From: Noah O'Donoghue <noah.odonoghue@gmail.com> Date: Fri, 6 Jul 2018 12:15:43 +0700 Subject: [PATCH 0830/1622] Clean up Ubuntu netplan DUID so machines get unique ID generated --- ubuntu/scripts/cleanup.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/ubuntu/scripts/cleanup.sh b/ubuntu/scripts/cleanup.sh index 99781543e..bdcd82857 100644 --- a/ubuntu/scripts/cleanup.sh +++ b/ubuntu/scripts/cleanup.sh @@ -66,3 +66,6 @@ find /var/cache -type f -exec rm -rf {} \; # delete any logs that have built up during the install find /var/log/ -name *.log -exec rm -f {} \; + +# Remove netplan machine-id (DUID) so machines get unique ID generated on boot. +rm -rf /etc/machine-id From 62042afce60bfe50a1a040031b9da164f77348ac Mon Sep 17 00:00:00 2001 From: Noah O'Donoghue <noah.odonoghue@gmail.com> Date: Fri, 6 Jul 2018 14:50:06 +0700 Subject: [PATCH 0831/1622] Blank netplan machine-id (DUID) so machines get unique ID generated on boot. --- ubuntu/scripts/cleanup.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ubuntu/scripts/cleanup.sh b/ubuntu/scripts/cleanup.sh index bdcd82857..68988348d 100644 --- a/ubuntu/scripts/cleanup.sh +++ b/ubuntu/scripts/cleanup.sh @@ -67,5 +67,5 @@ find /var/cache -type f -exec rm -rf {} \; # delete any logs that have built up during the install find /var/log/ -name *.log -exec rm -f {} \; -# Remove netplan machine-id (DUID) so machines get unique ID generated on boot. -rm -rf /etc/machine-id +# Blank netplan machine-id (DUID) so machines get unique ID generated on boot. +truncate -s 0 /etc/machine-id From 15ea3d3cf559005374406859372851d46d84abeb Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith@chef.io> Date: Sat, 7 Jul 2018 22:10:55 -0700 Subject: [PATCH 0832/1622] Test on Ruby 2.5 Signed-off-by: Tim Smith <tsmith@chef.io> --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 61c54a64c..8930f9d68 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,7 +7,7 @@ env: - PATH=$HOME/bin:$PATH rvm: - - 2.4.1 + - 2.5.1 - ruby-head matrix: From d1061b5856e4c27674f9b8af7449325a8178ac97 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith@chef.io> Date: Sat, 7 Jul 2018 22:11:22 -0700 Subject: [PATCH 0833/1622] Remove EOL Fedora 26 Signed-off-by: Tim Smith <tsmith@chef.io> --- builds.yml | 1 - fedora/fedora-26-x86_64.json | 181 ----------------------------------- 2 files changed, 182 deletions(-) delete mode 100644 fedora/fedora-26-x86_64.json diff --git a/builds.yml b/builds.yml index 5f6462cf8..90c42dbb5 100644 --- a/builds.yml +++ b/builds.yml @@ -26,7 +26,6 @@ public: - 'debian-7.11-i386' - 'fedora-28' - 'fedora-27' -- 'fedora-26' - 'opensuse-leap-42.3' - 'freebsd-11.2' - 'freebsd-11.2-i386' diff --git a/fedora/fedora-26-x86_64.json b/fedora/fedora-26-x86_64.json deleted file mode 100644 index 09056908c..000000000 --- a/fedora/fedora-26-x86_64.json +++ /dev/null @@ -1,181 +0,0 @@ -{ - "builders": [ - { - "boot_command": [ - "<tab> linux ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", - "guest_os_type": "Fedora_64", - "hard_drive_interface": "sata", - "headless": "{{ user `headless` }}", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../builds/packer-{{user `template`}}-virtualbox", - "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "virtualbox-iso", - "vboxmanage": [ - [ - "modifyvm", - "{{.Name}}", - "--memory", - "{{ user `memory` }}" - ], - [ - "modifyvm", - "{{.Name}}", - "--cpus", - "{{ user `cpus` }}" - ] - ], - "virtualbox_version_file": ".vbox_version", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<tab> linux ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "fedora-64", - "headless": "{{ user `headless` }}", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../builds/packer-{{user `template`}}-vmware", - "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "tools_upload_flavor": "linux", - "type": "vmware-iso", - "vm_name": "{{ user `template` }}", - "vmx_data": { - "cpuid.coresPerSocket": "1", - "ethernet0.pciSlotNumber": "32", - "memsize": "{{ user `memory` }}", - "numvcpus": "{{ user `cpus` }}" - }, - "vmx_remove_ethernet_interfaces": true - }, - { - "boot_command": [ - "<tab> linux ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "fedora-core", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../builds/packer-{{user `template`}}-parallels", - "parallels_tools_flavor": "lin", - "prlctl": [ - [ - "set", - "{{.Name}}", - "--memsize", - "{{ user `memory` }}" - ], - [ - "set", - "{{.Name}}", - "--cpus", - "{{ user `cpus` }}" - ] - ], - "prlctl_version_file": ".prlctl_version", - "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "parallels-iso", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<tab> linux ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "headless": "{{ user `headless` }}", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../builds/packer-{{user `template`}}-qemu", - "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "qemu", - "vm_name": "{{ user `template` }}" - } - ], - "post-processors": [ - { - "output": "../builds/{{user `box_basename`}}.{{.Provider}}.box", - "type": "vagrant" - } - ], - "provisioners": [ - { - "environment_vars": [ - "HOME_DIR=/home/vagrant", - "http_proxy={{user `http_proxy`}}", - "https_proxy={{user `https_proxy`}}", - "no_proxy={{user `no_proxy`}}" - ], - "execute_command": "echo 'vagrant' | {{.Vars}} sudo -E -S bash '{{.Path}}'", - "expect_disconnect": true, - "scripts": [ - "scripts/swap.sh", - "scripts/fix-slow-dns.sh", - "scripts/build-tools.sh", - "../_common/sshd.sh", - "../_common/virtualbox.sh", - "../_common/vmware.sh", - "../_common/parallels.sh", - "../_common/vagrant.sh", - "scripts/cleanup.sh", - "../_common/minimize.sh" - ], - "type": "shell" - } - ], - "variables": { - "arch": "64", - "box_basename": "fedora-26", - "build_timestamp": "{{isotime \"20060102150405\"}}", - "cpus": "1", - "disk_size": "65536", - "git_revision": "__unknown_git_revision__", - "headless": "", - "http_proxy": "{{env `http_proxy`}}", - "https_proxy": "{{env `https_proxy`}}", - "iso_checksum": "fad18a43b9cec152fc8a1fd368950eaf59be66b1a15438149a0c3a509c56cf2f", - "iso_checksum_type": "sha256", - "iso_name": "Fedora-Server-dvd-x86_64-26-1.5.iso", - "ks_path": "ks.cfg", - "memory": "1024", - "mirror": "http://download.fedoraproject.org/pub/fedora/linux", - "mirror_directory": "releases/26/Server/x86_64/iso", - "name": "fedora-26", - "no_proxy": "{{env `no_proxy`}}", - "template": "fedora-26-x86_64", - "version": "TIMESTAMP" - } -} - From 9227993e94329d45a3eb90d8d94237202441ecc2 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith@chef.io> Date: Sat, 7 Jul 2018 22:11:59 -0700 Subject: [PATCH 0834/1622] Remove EOL macOS 10.9 Signed-off-by: Tim Smith <tsmith@chef.io> --- macos/macosx-10.9.json | 253 ----------------------------------------- 1 file changed, 253 deletions(-) delete mode 100644 macos/macosx-10.9.json diff --git a/macos/macosx-10.9.json b/macos/macosx-10.9.json deleted file mode 100644 index 23447b12c..000000000 --- a/macos/macosx-10.9.json +++ /dev/null @@ -1,253 +0,0 @@ -{ - "builders": [ - { - "boot_wait": "2s", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "darwin12-64", - "headless": "{{ user `headless` }}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `iso_url`}}", - "output_directory": "../builds/packer-{{user `template`}}-vmware", - "shutdown_command": "echo 'vagrant'| sudo -S shutdown -h now", - "skip_compaction": true, - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "tools_upload_flavor": "darwinPre15", - "tools_upload_path": "/tmp/vmtools.iso", - "type": "vmware-iso", - "vm_name": "{{ user `template` }}", - "vmx_data": { - "cpuid.coresPerSocket": "1", - "ehci.present": "TRUE", - "firmware": "efi", - "hpet0.present": "TRUE", - "ich7m.present": "TRUE", - "keyboardAndMouseProfile": "macProfile", - "memsize": "{{ user `memory` }}", - "numvcpus": "{{ user `cpus` }}", - "smc.present": "TRUE", - "usb.present": "TRUE" - }, - "vmx_remove_ethernet_interfaces": true - }, - { - "boot_wait": "2s", - "disk_size": "{{user `disk_size`}}", - "guest_additions_mode": "disable", - "guest_os_type": "MacOS109_64", - "hard_drive_interface": "sata", - "headless": "{{ user `headless` }}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `iso_url`}}", - "output_directory": "../builds/packer-{{user `template`}}-virtualbox", - "shutdown_command": "echo 'vagrant'| sudo -S shutdown -h now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "virtualbox-iso", - "vboxmanage": [ - [ - "modifyvm", - "{{.Name}}", - "--audiocontroller", - "hda" - ], - [ - "modifyvm", - "{{.Name}}", - "--boot1", - "dvd" - ], - [ - "modifyvm", - "{{.Name}}", - "--boot2", - "disk" - ], - [ - "modifyvm", - "{{.Name}}", - "--chipset", - "ich9" - ], - [ - "modifyvm", - "{{.Name}}", - "--cpus", - "{{ user `cpus` }}" - ], - [ - "modifyvm", - "{{.Name}}", - "--firmware", - "efi" - ], - [ - "modifyvm", - "{{.Name}}", - "--hpet", - "on" - ], - [ - "modifyvm", - "{{.Name}}", - "--keyboard", - "usb" - ], - [ - "modifyvm", - "{{.Name}}", - "--memory", - "{{ user `memory` }}" - ], - [ - "modifyvm", - "{{.Name}}", - "--mouse", - "usbtablet" - ], - [ - "modifyvm", - "{{.Name}}", - "--vram", - "9" - ], - [ - "storageattach", - "{{.Name}}", - "--storagectl", - "SATA Controller", - "--port", - "{{ user `cpus` }}", - "--type", - "dvddrive", - "--medium", - "{{user `iso_url`}}" - ] - ], - "vboxmanage_post": [ - [ - "storageattach", - "{{.Name}}", - "--storagectl", - "SATA Controller", - "--port", - "{{ user `cpus` }}", - "--type", - "dvddrive", - "--medium", - "none" - ], - [ - "storagectl", - "{{.Name}}", - "--name", - "IDE Controller", - "--remove" - ] - ], - "virtualbox_version_file": ".vbox_version", - "vm_name": "{{ user `template` }}" - }, - { - "boot_wait": "2s", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "macosx", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `iso_url`}}", - "output_directory": "../builds/packer-{{user `template`}}-parallels", - "parallels_tools_flavor": "mac", - "prlctl": [ - [ - "set", - "{{.Name}}", - "--memsize", - "{{ user `memory` }}" - ], - [ - "set", - "{{.Name}}", - "--cpus", - "{{ user `cpus` }}" - ], - [ - "set", - "{{.Name}}", - "--on-window-close", - "keep-running" - ] - ], - "shutdown_command": "echo 'vagrant'| sudo -S shutdown -h now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "parallels-iso", - "vm_name": "{{ user `template` }}" - } - ], - "post-processors": [ - { - "output": "../builds/{{user `box_basename`}}.{{.Provider}}.box", - "type": "vagrant", - "vagrantfile_template": "vagrantfile_templates/macosx.rb" - } - ], - "provisioners": [ - { - "destination": "/private/tmp/set_kcpassword.py", - "source": "scripts/support/set_kcpassword.py", - "type": "file" - }, - { - "environment_vars": [ - "HOME_DIR=/Users/vagrant", - "AUTOLOGIN={{user `autologin`}}", - "http_proxy={{user `http_proxy`}}", - "https_proxy={{user `https_proxy`}}", - "no_proxy={{user `no_proxy`}}" - ], - "execute_command": "echo 'vagrant'| {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", - "expect_disconnect": true, - "scripts": [ - "scripts/hostname.sh", - "scripts/update.sh", - "scripts/networking.sh", - "scripts/disablesleep.sh", - "scripts/vagrant.sh", - "scripts/autologin.sh", - "scripts/vmtools.sh", - "scripts/cleanup.sh", - "scripts/minimize.sh" - ], - "type": "shell" - } - ], - "variables": { - "_README": "You must provide a prepared Mac disk image (from https://github.com/timsutton/osx-vm-templates) and checksum value for this template to work. For more details, consult this project's README.md", - "autologin": "true", - "box_basename": "macosx-10.9", - "build_timestamp": "{{isotime \"20060102150405\"}}", - "cpus": "1", - "disk_size": "65536", - "git_revision": "__unknown_git_revision__", - "headless": "", - "http_proxy": "{{env `http_proxy`}}", - "https_proxy": "{{env `https_proxy`}}", - "iso_checksum": "__unset_iso_checksum__", - "iso_checksum_type": "md5", - "iso_url": "http://YOU-MUST-PROVIDE-YOUR-OWN-DMG.sorry", - "memory": "2048", - "name": "macosx-10.9", - "no_proxy": "{{env `no_proxy`}}", - "template": "macosx-10.9", - "version": "TIMESTAMP" - } -} - From 197f1930990fbf5fcb337cea6bb827138d2cbce8 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith@chef.io> Date: Sat, 7 Jul 2018 22:12:19 -0700 Subject: [PATCH 0835/1622] Remove EOL Ubuntu 17.10 Signed-off-by: Tim Smith <tsmith@chef.io> --- builds.yml | 9 +- ubuntu/ubuntu-17.10-amd64.json | 315 --------------------------------- ubuntu/ubuntu-17.10-i386.json | 277 ----------------------------- 3 files changed, 2 insertions(+), 599 deletions(-) delete mode 100644 ubuntu/ubuntu-17.10-amd64.json delete mode 100644 ubuntu/ubuntu-17.10-i386.json diff --git a/builds.yml b/builds.yml index 5f6462cf8..4247196be 100644 --- a/builds.yml +++ b/builds.yml @@ -12,18 +12,14 @@ public: - 'oracle-6.9' - 'oracle-6.9-i386' - 'ubuntu-18.04' -- 'ubuntu-17.10' -- 'ubuntu-17.10-i386' - 'ubuntu-16.04' - 'ubuntu-16.04-i386' - 'ubuntu-14.04' - 'ubuntu-14.04-i386' - 'debian-9.4' - 'debian-9.4-i386' -- 'debian-8.10' -- 'debian-8.10-i386' -- 'debian-7.11' -- 'debian-7.11-i386' +- 'debian-8.11' +- 'debian-8.11-i386' - 'fedora-28' - 'fedora-27' - 'fedora-26' @@ -41,7 +37,6 @@ slugs: 'centos-6': 'centos-6.9' 'debian-9': 'debian-9.4' 'debian-8': 'debian-8.10' - 'debian-7': 'debian-7.11' 'freebsd-11': 'freebsd-11.2' 'freebsd-10': 'freebsd-10.4' 'opensuse-leap-42': 'opensuse-leap-42.3' diff --git a/ubuntu/ubuntu-17.10-amd64.json b/ubuntu/ubuntu-17.10-amd64.json deleted file mode 100644 index 9d657c8a9..000000000 --- a/ubuntu/ubuntu-17.10-amd64.json +++ /dev/null @@ -1,315 +0,0 @@ -{ - "builders": [ - { - "boot_command": [ - "<esc><wait>", - "<esc><wait>", - "<enter><wait>", - "/install/vmlinuz<wait>", - " auto<wait>", - " console-setup/ask_detect=false<wait>", - " console-setup/layoutcode=us<wait>", - " console-setup/modelcode=pc105<wait>", - " debconf/frontend=noninteractive<wait>", - " debian-installer=en_US<wait>", - " fb=false<wait>", - " initrd=/install/initrd.gz<wait>", - " kbd-chooser/method=us<wait>", - " keyboard-configuration/layout=USA<wait>", - " keyboard-configuration/variant=USA<wait>", - " locale=en_US<wait>", - " netcfg/get_domain=vm<wait>", - " netcfg/get_hostname=vagrant<wait>", - " grub-installer/bootdev=/dev/sda<wait>", - " noapic<wait>", - " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}}<wait>", - " -- <wait>", - "<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", - "guest_os_type": "Ubuntu_64", - "hard_drive_interface": "sata", - "headless": "{{ user `headless` }}", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../builds/packer-{{user `template`}}-virtualbox", - "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "virtualbox-iso", - "vboxmanage": [ - [ - "modifyvm", - "{{.Name}}", - "--memory", - "{{ user `memory` }}" - ], - [ - "modifyvm", - "{{.Name}}", - "--cpus", - "{{ user `cpus` }}" - ] - ], - "virtualbox_version_file": ".vbox_version", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<esc><wait>", - "<esc><wait>", - "<enter><wait>", - "/install/vmlinuz<wait>", - " auto<wait>", - " console-setup/ask_detect=false<wait>", - " console-setup/layoutcode=us<wait>", - " console-setup/modelcode=pc105<wait>", - " debconf/frontend=noninteractive<wait>", - " debian-installer=en_US<wait>", - " fb=false<wait>", - " initrd=/install/initrd.gz<wait>", - " kbd-chooser/method=us<wait>", - " keyboard-configuration/layout=USA<wait>", - " keyboard-configuration/variant=USA<wait>", - " locale=en_US<wait>", - " netcfg/get_domain=vm<wait>", - " netcfg/get_hostname=vagrant<wait>", - " grub-installer/bootdev=/dev/sda<wait>", - " noapic<wait>", - " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}}<wait>", - " -- <wait>", - "<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "ubuntu-64", - "headless": "{{ user `headless` }}", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../builds/packer-{{user `template`}}-vmware", - "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "tools_upload_flavor": "linux", - "type": "vmware-iso", - "vm_name": "{{ user `template` }}", - "vmx_data": { - "cpuid.coresPerSocket": "1", - "ethernet0.pciSlotNumber": "32", - "memsize": "{{ user `memory` }}", - "numvcpus": "{{ user `cpus` }}" - }, - "vmx_remove_ethernet_interfaces": true - }, - { - "boot_command": [ - "<esc><wait>", - "<esc><wait>", - "<enter><wait>", - "/install/vmlinuz<wait>", - " auto<wait>", - " console-setup/ask_detect=false<wait>", - " console-setup/layoutcode=us<wait>", - " console-setup/modelcode=pc105<wait>", - " debconf/frontend=noninteractive<wait>", - " debian-installer=en_US<wait>", - " fb=false<wait>", - " initrd=/install/initrd.gz<wait>", - " kbd-chooser/method=us<wait>", - " keyboard-configuration/layout=USA<wait>", - " keyboard-configuration/variant=USA<wait>", - " locale=en_US<wait>", - " netcfg/get_domain=vm<wait>", - " netcfg/get_hostname=vagrant<wait>", - " grub-installer/bootdev=/dev/sda<wait>", - " noapic<wait>", - " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}}<wait>", - " -- <wait>", - "<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "ubuntu", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../builds/packer-{{user `template`}}-parallels", - "parallels_tools_flavor": "lin", - "prlctl": [ - [ - "set", - "{{.Name}}", - "--memsize", - "{{ user `memory` }}" - ], - [ - "set", - "{{.Name}}", - "--cpus", - "{{ user `cpus` }}" - ] - ], - "prlctl_version_file": ".prlctl_version", - "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "parallels-iso", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<esc><wait>", - "<esc><wait>", - "<enter><wait>", - "/install/vmlinuz<wait>", - " auto<wait>", - " console-setup/ask_detect=false<wait>", - " console-setup/layoutcode=us<wait>", - " console-setup/modelcode=pc105<wait>", - " debconf/frontend=noninteractive<wait>", - " debian-installer=en_US<wait>", - " fb=false<wait>", - " initrd=/install/initrd.gz<wait>", - " kbd-chooser/method=us<wait>", - " keyboard-configuration/layout=USA<wait>", - " keyboard-configuration/variant=USA<wait>", - " locale=en_US<wait>", - " netcfg/get_domain=vm<wait>", - " netcfg/get_hostname=vagrant<wait>", - " grub-installer/bootdev=/dev/vda<wait>", - " noapic<wait>", - " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}}<wait>", - " -- <wait>", - "<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "headless": "{{ user `headless` }}", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../builds/packer-{{user `template`}}-qemu", - "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "qemu", - "vm_name": "{{ user `template` }}", - "qemuargs": [ - [ - "-m", - "{{ user `memory` }}M" - ], - [ - "-smp", - "{{ user `cpus` }}" - ] - ] - }, - { - "boot_command": [ - "<esc><wait10><esc><esc><enter><wait>", - "set gfxpayload=1024x768<enter>", - "linux /install/vmlinuz ", - "preseed/url=http://{{.HTTPIP}}:{{.HTTPPort}}/preseed-hyperv.cfg ", - "debian-installer=en_US auto locale=en_US kbd-chooser/method=us ", - "hostname={{.Name}} ", - "fb=false debconf/frontend=noninteractive ", - "keyboard-configuration/modelcode=SKIP keyboard-configuration/layout=USA ", - "keyboard-configuration/variant=USA console-setup/ask_detect=false <enter>", - "initrd /install/initrd.gz<enter>", - "boot<enter>" - ], - "boot_wait": "10s", - "communicator": "ssh", - "cpu": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "enable_secure_boot": false, - "generation": "{{user `hyperv_generation`}}", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../builds/packer-{{user `template`}}-hyperv", - "ram_size": "{{user `memory`}}", - "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "switch_name": "{{user `hyperv_switch`}}", - "type": "hyperv-iso", - "vm_name": "{{ user `template` }}" - } - ], - "post-processors": [ - { - "output": "../builds/{{user `box_basename`}}.{{.Provider}}.box", - "type": "vagrant" - } - ], - "provisioners": [ - { - "environment_vars": [ - "HOME_DIR=/home/vagrant", - "http_proxy={{user `http_proxy`}}", - "https_proxy={{user `https_proxy`}}", - "no_proxy={{user `no_proxy`}}" - ], - "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", - "expect_disconnect": true, - "scripts": [ - "scripts/update.sh", - "../_common/sshd.sh", - "scripts/networking.sh", - "scripts/sudoers.sh", - "scripts/vagrant.sh", - "../_common/virtualbox.sh", - "scripts/vmware.sh", - "../_common/parallels.sh", - "scripts/hyperv.sh", - "scripts/cleanup.sh", - "../_common/minimize.sh" - ], - "type": "shell" - } - ], - "variables": { - "box_basename": "ubuntu-17.10", - "build_timestamp": "{{isotime \"20060102150405\"}}", - "cpus": "1", - "disk_size": "65536", - "git_revision": "__unknown_git_revision__", - "headless": "", - "http_proxy": "{{env `http_proxy`}}", - "https_proxy": "{{env `https_proxy`}}", - "hyperv_generation": "2", - "hyperv_switch": "{{env `hyperv_switch`}}", - "iso_checksum": "8ff73f1b622276758475c3bd5190b382774626de5a82c50930519381f6c3a3f8", - "iso_checksum_type": "sha256", - "iso_name": "ubuntu-17.10.1-server-amd64.iso", - "memory": "1024", - "mirror": "http://releases.ubuntu.com", - "mirror_directory": "17.10", - "name": "ubuntu-17.10", - "no_proxy": "{{env `no_proxy`}}", - "preseed_path": "preseed.cfg", - "template": "ubuntu-17.10-amd64", - "version": "TIMESTAMP" - } -} diff --git a/ubuntu/ubuntu-17.10-i386.json b/ubuntu/ubuntu-17.10-i386.json deleted file mode 100644 index 689ddb98b..000000000 --- a/ubuntu/ubuntu-17.10-i386.json +++ /dev/null @@ -1,277 +0,0 @@ -{ - "builders": [ - { - "boot_command": [ - "<esc><wait>", - "<esc><wait>", - "<enter><wait>", - "/install/vmlinuz<wait>", - " auto<wait>", - " console-setup/ask_detect=false<wait>", - " console-setup/layoutcode=us<wait>", - " console-setup/modelcode=pc105<wait>", - " debconf/frontend=noninteractive<wait>", - " debian-installer=en_US<wait>", - " fb=false<wait>", - " initrd=/install/initrd.gz<wait>", - " kbd-chooser/method=us<wait>", - " keyboard-configuration/layout=USA<wait>", - " keyboard-configuration/variant=USA<wait>", - " locale=en_US<wait>", - " netcfg/get_domain=vm<wait>", - " netcfg/get_hostname=vagrant<wait>", - " grub-installer/bootdev=/dev/sda <wait>", - " noapic<wait>", - " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}}<wait>", - " -- <wait>", - "<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", - "guest_os_type": "Ubuntu", - "hard_drive_interface": "sata", - "headless": "{{ user `headless` }}", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../builds/packer-{{user `template`}}-virtualbox", - "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "virtualbox-iso", - "vboxmanage": [ - [ - "modifyvm", - "{{.Name}}", - "--memory", - "{{ user `memory` }}" - ], - [ - "modifyvm", - "{{.Name}}", - "--cpus", - "{{ user `cpus` }}" - ] - ], - "virtualbox_version_file": ".vbox_version", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<esc><wait>", - "<esc><wait>", - "<enter><wait>", - "/install/vmlinuz<wait>", - " auto<wait>", - " console-setup/ask_detect=false<wait>", - " console-setup/layoutcode=us<wait>", - " console-setup/modelcode=pc105<wait>", - " debconf/frontend=noninteractive<wait>", - " debian-installer=en_US<wait>", - " fb=false<wait>", - " initrd=/install/initrd.gz<wait>", - " kbd-chooser/method=us<wait>", - " keyboard-configuration/layout=USA<wait>", - " keyboard-configuration/variant=USA<wait>", - " locale=en_US<wait>", - " netcfg/get_domain=vm<wait>", - " netcfg/get_hostname=vagrant<wait>", - " grub-installer/bootdev=/dev/sda <wait>", - " noapic<wait>", - " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}}<wait>", - " -- <wait>", - "<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "ubuntu", - "headless": "{{ user `headless` }}", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../builds/packer-{{user `template`}}-vmware", - "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "tools_upload_flavor": "linux", - "type": "vmware-iso", - "vm_name": "{{ user `template` }}", - "vmx_data": { - "cpuid.coresPerSocket": "1", - "ethernet0.pciSlotNumber": "32", - "memsize": "{{ user `memory` }}", - "numvcpus": "{{ user `cpus` }}" - }, - "vmx_remove_ethernet_interfaces": true - }, - { - "boot_command": [ - "<esc><wait>", - "<esc><wait>", - "<enter><wait>", - "/install/vmlinuz<wait>", - " auto<wait>", - " console-setup/ask_detect=false<wait>", - " console-setup/layoutcode=us<wait>", - " console-setup/modelcode=pc105<wait>", - " debconf/frontend=noninteractive<wait>", - " debian-installer=en_US<wait>", - " fb=false<wait>", - " initrd=/install/initrd.gz<wait>", - " kbd-chooser/method=us<wait>", - " keyboard-configuration/layout=USA<wait>", - " keyboard-configuration/variant=USA<wait>", - " locale=en_US<wait>", - " netcfg/get_domain=vm<wait>", - " netcfg/get_hostname=vagrant<wait>", - " grub-installer/bootdev=/dev/sda <wait>", - " noapic<wait>", - " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}}<wait>", - " -- <wait>", - "<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "ubuntu", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../builds/packer-{{user `template`}}-parallels", - "parallels_tools_flavor": "lin", - "prlctl": [ - [ - "set", - "{{.Name}}", - "--memsize", - "{{ user `memory` }}" - ], - [ - "set", - "{{.Name}}", - "--cpus", - "{{ user `cpus` }}" - ] - ], - "prlctl_version_file": ".prlctl_version", - "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "parallels-iso", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<esc><wait>", - "<esc><wait>", - "<enter><wait>", - "/install/vmlinuz<wait>", - " auto<wait>", - " console-setup/ask_detect=false<wait>", - " console-setup/layoutcode=us<wait>", - " console-setup/modelcode=pc105<wait>", - " debconf/frontend=noninteractive<wait>", - " debian-installer=en_US<wait>", - " fb=false<wait>", - " initrd=/install/initrd.gz<wait>", - " kbd-chooser/method=us<wait>", - " keyboard-configuration/layout=USA<wait>", - " keyboard-configuration/variant=USA<wait>", - " locale=en_US<wait>", - " netcfg/get_domain=vm<wait>", - " netcfg/get_hostname=vagrant<wait>", - " grub-installer/bootdev=/dev/vda <wait>", - " noapic<wait>", - " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}}<wait>", - " -- <wait>", - "<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "headless": "{{ user `headless` }}", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../builds/packer-{{user `template`}}-qemu", - "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "qemu", - "vm_name": "{{ user `template` }}", - "qemuargs": [ - [ - "-m", - "{{ user `memory` }}M" - ], - [ - "-smp", - "{{ user `cpus` }}" - ] - ] - } - ], - "post-processors": [ - { - "output": "../builds/{{user `box_basename`}}.{{.Provider}}.box", - "type": "vagrant" - } - ], - "provisioners": [ - { - "environment_vars": [ - "HOME_DIR=/home/vagrant", - "http_proxy={{user `http_proxy`}}", - "https_proxy={{user `https_proxy`}}", - "no_proxy={{user `no_proxy`}}" - ], - "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", - "expect_disconnect": true, - "scripts": [ - "scripts/update.sh", - "../_common/sshd.sh", - "scripts/networking.sh", - "scripts/sudoers.sh", - "scripts/vagrant.sh", - "../_common/virtualbox.sh", - "scripts/vmware.sh", - "../_common/parallels.sh", - "scripts/cleanup.sh", - "../_common/minimize.sh" - ], - "type": "shell" - } - ], - "variables": { - "box_basename": "ubuntu-17.10-i386", - "build_timestamp": "{{isotime \"20060102150405\"}}", - "cpus": "1", - "disk_size": "65536", - "git_revision": "__unknown_git_revision__", - "headless": "", - "http_proxy": "{{env `http_proxy`}}", - "https_proxy": "{{env `https_proxy`}}", - "iso_checksum": "eb921425349d2a51f90edc3977f83fb6fd8aed082b31515f1bde00d46b260492", - "iso_checksum_type": "sha256", - "iso_name": "ubuntu-17.10.1-server-i386.iso", - "memory": "1024", - "mirror": "http://releases.ubuntu.com", - "mirror_directory": "17.10", - "name": "ubuntu-17.10-i386", - "no_proxy": "{{env `no_proxy`}}", - "preseed_path": "preseed.cfg", - "template": "ubuntu-17.10-i386", - "version": "TIMESTAMP" - } -} From 84fd4f51a8f90cc212bf99a9188fcbf49be3f0ee Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith@chef.io> Date: Sat, 7 Jul 2018 23:19:58 -0700 Subject: [PATCH 0836/1622] Update RHELs to 6.10 / 7.5 Also remove the duplicate scripts for Scientific. Just use the CentOS scripts which were the same. Signed-off-by: Tim Smith <tsmith@chef.io> --- ...le-6.9-i386.json => oracle-6.10-i386.json} | 11 ++-- ....9-x86_64.json => oracle-6.10-x86_64.json} | 11 ++-- ...rhel-6.9-i386.json => rhel-6.10-i386.json} | 10 ++-- ...-6.9-x86_64.json => rhel-6.10-x86_64.json} | 10 ++-- ...l-7.4-x86_64.json => rhel-7.5-x86_64.json} | 10 ++-- .../{SL-7-x86_64.json => SL-7.5-x86_64.json} | 14 ++--- scientificlinux/scripts/cleanup.sh | 59 ------------------- scientificlinux/scripts/networking.sh | 19 ------ scientificlinux/scripts/update.sh | 5 -- 9 files changed, 32 insertions(+), 117 deletions(-) rename oraclelinux/{oracle-6.9-i386.json => oracle-6.10-i386.json} (95%) rename oraclelinux/{oracle-6.9-x86_64.json => oracle-6.10-x86_64.json} (95%) rename rhel/{rhel-6.9-i386.json => rhel-6.10-i386.json} (95%) rename rhel/{rhel-6.9-x86_64.json => rhel-6.10-x86_64.json} (96%) rename rhel/{rhel-7.4-x86_64.json => rhel-7.5-x86_64.json} (96%) rename scientificlinux/{SL-7-x86_64.json => SL-7.5-x86_64.json} (89%) delete mode 100644 scientificlinux/scripts/cleanup.sh delete mode 100644 scientificlinux/scripts/networking.sh delete mode 100644 scientificlinux/scripts/update.sh diff --git a/oraclelinux/oracle-6.9-i386.json b/oraclelinux/oracle-6.10-i386.json similarity index 95% rename from oraclelinux/oracle-6.9-i386.json rename to oraclelinux/oracle-6.10-i386.json index 72c9ae6b2..8d213d59b 100644 --- a/oraclelinux/oracle-6.9-i386.json +++ b/oraclelinux/oracle-6.10-i386.json @@ -155,7 +155,7 @@ ], "variables": { "arch": "32", - "box_basename": "oracle-6.9-i386", + "box_basename": "oracle-6.10-i386", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", "disk_size": "65536", @@ -163,17 +163,16 @@ "headless": "", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", - "iso_checksum": "fd07f775e7fa52e9ab021eb7dccb78453fc61f3d3b712ec426f6b1bf5020318b", + "iso_checksum": "73755329985c96805c1d3ef31dfcb7f7561cd139cc8fe9226b8e794ad7ea4bd4", "iso_checksum_type": "sha256", - "iso_name": "OracleLinux-R6-U9-Server-i386-dvd.iso", + "iso_name": "OracleLinux-R6-U10-Server-i386-dvd.iso", "ks_path": "6/ks.cfg", "memory": "1024", "mirror": "http://mirrors.kernel.org/oracle/", "mirror_directory": "OL6/U9/i386", - "name": "oracle-6.9-i386", + "name": "oracle-6.10-i386", "no_proxy": "{{env `no_proxy`}}", - "template": "oracle-6.9-i386", + "template": "oracle-6.10-i386", "version": "TIMESTAMP" } } - diff --git a/oraclelinux/oracle-6.9-x86_64.json b/oraclelinux/oracle-6.10-x86_64.json similarity index 95% rename from oraclelinux/oracle-6.9-x86_64.json rename to oraclelinux/oracle-6.10-x86_64.json index 26174fa77..5296d72b0 100644 --- a/oraclelinux/oracle-6.9-x86_64.json +++ b/oraclelinux/oracle-6.10-x86_64.json @@ -155,7 +155,7 @@ ], "variables": { "arch": "64", - "box_basename": "oracle-6.9", + "box_basename": "oracle-6.10", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", "disk_size": "65536", @@ -163,17 +163,16 @@ "headless": "", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", - "iso_checksum": "c32e2a7c8eb471db731741f1a30be37e49deda8ce961710273a71b26c9a04a36", + "iso_checksum": "625044388ee60a031965a42a32f4c1de0c029268975edcd542fd14160e0dadcb", "iso_checksum_type": "sha256", - "iso_name": "OracleLinux-R6-U9-Server-x86_64-dvd.iso", + "iso_name": "OracleLinux-R6-U10-Server-x86_64-dvd.iso", "ks_path": "6/ks.cfg", "memory": "1024", "mirror": "http://mirrors.kernel.org/oracle/", "mirror_directory": "OL6/U9/x86_64", - "name": "oracle-6.9", + "name": "oracle-6.10", "no_proxy": "{{env `no_proxy`}}", - "template": "oracle-6.9-x86_64", + "template": "oracle-6.10-x86_64", "version": "TIMESTAMP" } } - diff --git a/rhel/rhel-6.9-i386.json b/rhel/rhel-6.10-i386.json similarity index 95% rename from rhel/rhel-6.9-i386.json rename to rhel/rhel-6.10-i386.json index 0da1f82dd..24bb84265 100644 --- a/rhel/rhel-6.9-i386.json +++ b/rhel/rhel-6.10-i386.json @@ -154,7 +154,7 @@ ], "variables": { "arch": "32", - "box_basename": "rhel-6.9-i386", + "box_basename": "rhel-6.10-i386", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", "disk_size": "65536", @@ -162,16 +162,16 @@ "headless": "", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", - "iso_checksum": "1977d26df16ad2802728dafa3cbfd015895cfcf364fb20e8974123addce03021", + "iso_checksum": "715c382b2c0484087654281446dce058d9eeb930d7dcc92a2130d52328df87b8", "iso_checksum_type": "sha256", - "iso_name": "rhel-server-6.9-i386-dvd.iso", + "iso_name": "rhel-server-6.10-i386-dvd.iso", "ks_path": "6/ks.cfg", "memory": "1024", "mirror": "http://YOU-MUST-PROVIDE-YOUR-OWN-ISO.sorry", "mirror_directory": "rhel", - "name": "rhel-6.9-i386", + "name": "rhel-6.10-i386", "no_proxy": "{{env `no_proxy`}}", - "template": "rhel-6.9-i386", + "template": "rhel-6.10-i386", "version": "TIMESTAMP" } } diff --git a/rhel/rhel-6.9-x86_64.json b/rhel/rhel-6.10-x86_64.json similarity index 96% rename from rhel/rhel-6.9-x86_64.json rename to rhel/rhel-6.10-x86_64.json index 0559bface..8eb984ecd 100644 --- a/rhel/rhel-6.9-x86_64.json +++ b/rhel/rhel-6.10-x86_64.json @@ -154,7 +154,7 @@ ], "variables": { "arch": "64", - "box_basename": "rhel-6.9", + "box_basename": "rhel-6.10", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", "disk_size": "65536", @@ -162,16 +162,16 @@ "headless": "", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", - "iso_checksum": "3f961576e9f81ea118566f73f98d7bdf3287671c35436a13787c1ffd5078cf8e", + "iso_checksum": "1e15f9202d2cdd4b2bdf9d6503a8543347f0cb8cc06ba9a0dfd2df4fdef5c727", "iso_checksum_type": "sha256", - "iso_name": "rhel-server-6.9-x86_64-dvd.iso", + "iso_name": "rhel-server-6.10-x86_64-dvd.iso", "ks_path": "6/ks.cfg", "memory": "1024", "mirror": "http://YOU-MUST-PROVIDE-YOUR-OWN-ISO.sorry", "mirror_directory": "rhel", - "name": "rhel-6.9", + "name": "rhel-6.10", "no_proxy": "{{env `no_proxy`}}", - "template": "rhel-6.9-x86_64", + "template": "rhel-6.10-x86_64", "version": "TIMESTAMP" } } diff --git a/rhel/rhel-7.4-x86_64.json b/rhel/rhel-7.5-x86_64.json similarity index 96% rename from rhel/rhel-7.4-x86_64.json rename to rhel/rhel-7.5-x86_64.json index bdc88c006..3d5d479b9 100644 --- a/rhel/rhel-7.4-x86_64.json +++ b/rhel/rhel-7.5-x86_64.json @@ -154,7 +154,7 @@ ], "variables": { "arch": "64", - "box_basename": "rhel-7.4", + "box_basename": "rhel-7.5", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", "disk_size": "65536", @@ -162,16 +162,16 @@ "headless": "", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", - "iso_checksum": "431a58c8c0351803a608ffa56948c5a7861876f78ccbe784724dd8c987ff7000", + "iso_checksum": "d0dd6ae5e001fb050dafefdfd871e7e648b147fb2d35f0e106e0b34a0163e8f5", "iso_checksum_type": "sha256", - "iso_name": "rhel-server-7.4-x86_64-dvd.iso", + "iso_name": "rhel-server-7.5-x86_64-dvd.iso", "ks_path": "7/ks.cfg", "memory": "1024", "mirror": "http://YOU-MUST-PROVIDE-YOUR-OWN-ISO.sorry", "mirror_directory": "rhel", - "name": "rhel-7.4", + "name": "rhel-7.5", "no_proxy": "{{env `no_proxy`}}", - "template": "rhel-7.4-x86_64", + "template": "rhel-7.5-x86_64", "version": "TIMESTAMP" } } diff --git a/scientificlinux/SL-7-x86_64.json b/scientificlinux/SL-7.5-x86_64.json similarity index 89% rename from scientificlinux/SL-7-x86_64.json rename to scientificlinux/SL-7.5-x86_64.json index a5083dab3..0cadc2a8c 100644 --- a/scientificlinux/SL-7-x86_64.json +++ b/scientificlinux/SL-7.5-x86_64.json @@ -56,19 +56,19 @@ "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", "expect_disconnect": true, "scripts": [ - "scripts/update.sh", + "../centos/scripts/update.sh", "../_common/sshd.sh", - "scripts/networking.sh", + "../centos/scripts/networking.sh", "../_common/vagrant.sh", "../_common/virtualbox.sh", - "scripts/cleanup.sh", + "../centos/scripts/cleanup.sh", "../_common/minimize.sh" ], "type": "shell" } ], "variables": { - "box_basename": "SL-7.3", + "box_basename": "SL-7.5", "build_timestamp": "{{isotime \"20080506150405\"}}", "cpus": "1", "disk_size": "65536", @@ -78,14 +78,14 @@ "https_proxy": "{{env `https_proxy`}}", "hyperv_generation": "1", "hyperv_switch": "{{env `hyperv_switch`}}", - "iso_checksum": "ef3dd1b2a45c81b682a42d39ed3088e8649f836c32900331935f7a26e6ee316a", + "iso_checksum": "b59f60e6cc287058667086bcf95da4ef5d4a12efba1b01711c26d6587ffc190a", "iso_checksum_type": "sha256", "iso_name": "SL-7-DVD-x86_64.iso", "ks_path": "7/ks.cfg", "memory": "1024", "mirror": "http://mirrors.up.pt/pub/scientific/", - "mirror_directory": "7.3/x86_64/iso", - "name": "SL-7.3", + "mirror_directory": "7.5/x86_64/iso", + "name": "SL-7.5", "no_proxy": "{{env `no_proxy`}}", "template": "SL-7-x86_64", "version": "TIMESTAMP" diff --git a/scientificlinux/scripts/cleanup.sh b/scientificlinux/scripts/cleanup.sh deleted file mode 100644 index f4db8a1c4..000000000 --- a/scientificlinux/scripts/cleanup.sh +++ /dev/null @@ -1,59 +0,0 @@ -#!/bin/sh -eux - -# should output one of 'redhat' 'centos' 'oraclelinux' -distro="`rpm -qf --queryformat '%{NAME}' /etc/redhat-release | cut -f 1 -d '-'`" - -# Remove development and kernel source packages -yum -y remove gcc cpp kernel-devel kernel-headers; - -if [ "$distro" != 'redhat' ]; then - yum -y clean all; -fi - -# Clean up network interface persistence -rm -f /etc/udev/rules.d/70-persistent-net.rules; -mkdir -p /etc/udev/rules.d/70-persistent-net.rules; -rm -f /lib/udev/rules.d/75-persistent-net-generator.rules; -rm -rf /dev/.udev/; - -for ndev in `ls -1 /etc/sysconfig/network-scripts/ifcfg-*`; do - if [ "`basename $ndev`" != "ifcfg-lo" ]; then - sed -i '/^HWADDR/d' "$ndev"; - sed -i '/^UUID/d' "$ndev"; - fi -done - -# new-style network device naming for centos7 -if grep -q -i "release 7" /etc/redhat-release ; then - # radio off & remove all interface configration - nmcli radio all off - /bin/systemctl stop NetworkManager.service - for ifcfg in `ls /etc/sysconfig/network-scripts/ifcfg-* |grep -v ifcfg-lo` ; do - rm -f $ifcfg - done - rm -rf /var/lib/NetworkManager/* - - echo "==> Setup /etc/rc.d/rc.local for CentOS7" - cat <<_EOF_ | cat >> /etc/rc.d/rc.local -#BENTO-BEGIN -LANG=C -# delete all connection -for con in \`nmcli -t -f uuid con\`; do - if [ "\$con" != "" ]; then - nmcli con del \$con - fi -done -# add gateway interface connection. -gwdev=\`nmcli dev | grep ethernet | egrep -v 'unmanaged' | head -n 1 | awk '{print \$1}'\` -if [ "\$gwdev" != "" ]; then - nmcli c add type eth ifname \$gwdev con-name \$gwdev -fi -sed -i "/^#BENTO-BEGIN/,/^#BENTO-END/d" /etc/rc.d/rc.local -chmod -x /etc/rc.d/rc.local -#BENTO-END -_EOF_ - chmod +x /etc/rc.d/rc.local -fi - -# delete any logs that have built up during the install -find /var/log/ -name *.log -exec rm -f {} \; diff --git a/scientificlinux/scripts/networking.sh b/scientificlinux/scripts/networking.sh deleted file mode 100644 index e61cf3502..000000000 --- a/scientificlinux/scripts/networking.sh +++ /dev/null @@ -1,19 +0,0 @@ -#!/bin/sh -eux - -case "$PACKER_BUILDER_TYPE" in - -virtualbox-iso|virtualbox-ovf) - major_version="`sed 's/^.\+ release \([.0-9]\+\).*/\1/' /etc/redhat-release | awk -F. '{print $1}'`"; - - if [ "$major_version" -ge 6 ]; then - # Fix slow DNS: - # Add 'single-request-reopen' so it is included when /etc/resolv.conf is - # generated - # https://access.redhat.com/site/solutions/58625 (subscription required) - echo 'RES_OPTIONS="single-request-reopen"' >>/etc/sysconfig/network; - service network restart; - echo 'Slow DNS fix applied (single-request-reopen)'; - fi - ;; - -esac diff --git a/scientificlinux/scripts/update.sh b/scientificlinux/scripts/update.sh deleted file mode 100644 index 131d8cdb9..000000000 --- a/scientificlinux/scripts/update.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/sh -eux - -yum -y update; -reboot; -sleep 60; From 8629ef825e242616b5f56397b0b00c35782b0d50 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith@chef.io> Date: Sun, 8 Jul 2018 15:38:45 -0700 Subject: [PATCH 0837/1622] Use a faster scientific mirror That old one is horribly slow Signed-off-by: Tim Smith <tsmith@chef.io> --- scientificlinux/SL-7.5-x86_64.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scientificlinux/SL-7.5-x86_64.json b/scientificlinux/SL-7.5-x86_64.json index 0cadc2a8c..e71ae9aa7 100644 --- a/scientificlinux/SL-7.5-x86_64.json +++ b/scientificlinux/SL-7.5-x86_64.json @@ -83,7 +83,7 @@ "iso_name": "SL-7-DVD-x86_64.iso", "ks_path": "7/ks.cfg", "memory": "1024", - "mirror": "http://mirrors.up.pt/pub/scientific/", + "mirror": "http://www.gtlib.gatech.edu/pub/scientific", "mirror_directory": "7.5/x86_64/iso", "name": "SL-7.5", "no_proxy": "{{env `no_proxy`}}", From 9efe5cfb4ed618d423d17782d6d14de156d36409 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith@chef.io> Date: Sun, 8 Jul 2018 17:49:18 -0700 Subject: [PATCH 0838/1622] Install the latest rollup update for 2k8r2 Signed-off-by: Tim Smith <tsmith@chef.io> --- windows/cookbooks/packer/recipes/updates.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/windows/cookbooks/packer/recipes/updates.rb b/windows/cookbooks/packer/recipes/updates.rb index a7a0abad6..d12f2ba06 100644 --- a/windows/cookbooks/packer/recipes/updates.rb +++ b/windows/cookbooks/packer/recipes/updates.rb @@ -10,8 +10,8 @@ if node['platform_version'].to_f == 6.1 # 2008R2 # This is basically a service pack and we should install it to fix a giant pile of bugs - msu_package '2018-05 monthly rollup' do - source 'http://download.windowsupdate.com/d/msdownload/update/software/secu/2018/05/windows6.1-kb4103718-x64_c051268978faef39e21863a95ea2452ecbc0936d.msu' + msu_package '2018-06 monthly rollup' do + source 'http://download.windowsupdate.com/d/msdownload/update/software/secu/2018/06/windows6.1-kb4284826-x64_9e172f5bb50206dd65d4f60ac07a82baa1aef525.msu' action :install end end From f41702f997e49a5aa5c3e2e3c30ba65edf2a11ef Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith@chef.io> Date: Sun, 8 Jul 2018 17:58:31 -0700 Subject: [PATCH 0839/1622] Use my vagrant boxes for cookbook testing Signed-off-by: Tim Smith <tsmith@chef.io> --- windows/cookbooks/packer/kitchen.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/windows/cookbooks/packer/kitchen.yml b/windows/cookbooks/packer/kitchen.yml index 62ff53cb5..252daf292 100644 --- a/windows/cookbooks/packer/kitchen.yml +++ b/windows/cookbooks/packer/kitchen.yml @@ -15,13 +15,13 @@ provisioner: platforms: - name: windows-2016 driver_config: - box: chef/windows-server-2016-standard + box: tas50/windows_2016 - name: windows-2012r2 driver_config: - box: tas50/windows-2012r2 + box: tas50/windows_2012r2 - name: windows-2008r2 driver_config: - box: tas50/windows-2008r2 + box: tas50/windows_2008r2 suites: - name: default From c8939f1bd9c173813f256becfd9971cfa4477132 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith@chef.io> Date: Sun, 8 Jul 2018 20:38:34 -0700 Subject: [PATCH 0840/1622] Fix the uninstall of Chef when we're done with the image Signed-off-by: Tim Smith <tsmith@chef.io> --- windows/scripts/cleanup.ps1 | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/windows/scripts/cleanup.ps1 b/windows/scripts/cleanup.ps1 index 490e7c9d3..23b3e0707 100644 --- a/windows/scripts/cleanup.ps1 +++ b/windows/scripts/cleanup.ps1 @@ -1,7 +1,8 @@ Write-Host "Uninstalling Chef..." -if(Test-Path "c:\windows\temp\chef.msi") { - Start-Process MSIEXEC.exe '/uninstall c:\windows\temp\chef.msi /quiet' -Wait +$app = Get-WmiObject -Class Win32_Product | Where-Object { + $_.Name -match "Chef" } +$app.Uninstall() Write-Host "Removing leftover Chef files..." Remove-Item "C:\Opscode\" -Recurse -Force -ErrorAction SilentlyContinue From 2cb91975bfc3cb6fbc90419377f71d58b6bdaba2 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith@chef.io> Date: Mon, 9 Jul 2018 20:43:29 -0700 Subject: [PATCH 0841/1622] Update CentOS 6.9 -> 6.10 The last CentOS 6...can't come soon enough. Signed-off-by: Tim Smith <tsmith@chef.io> --- builds.yml | 10 +++++----- .../{centos-6.9-i386.json => centos-6.10-i386.json} | 12 ++++++------ ...entos-6.9-x86_64.json => centos-6.10-x86_64.json} | 12 ++++++------ 3 files changed, 17 insertions(+), 17 deletions(-) rename centos/{centos-6.9-i386.json => centos-6.10-i386.json} (95%) rename centos/{centos-6.9-x86_64.json => centos-6.10-x86_64.json} (95%) diff --git a/builds.yml b/builds.yml index affa621d2..541cea34e 100644 --- a/builds.yml +++ b/builds.yml @@ -6,11 +6,11 @@ providers: public: - 'centos-7.5' -- 'centos-6.9' -- 'centos-6.9-i386' +- 'centos-6.10' +- 'centos-6.10-i386' - 'oracle-7.5' -- 'oracle-6.9' -- 'oracle-6.9-i386' +- 'oracle-6.10' +- 'oracle-6.10-i386' - 'ubuntu-18.04' - 'ubuntu-16.04' - 'ubuntu-16.04-i386' @@ -33,7 +33,7 @@ public: slugs: 'centos-7': 'centos-7.5' - 'centos-6': 'centos-6.9' + 'centos-6': 'centos-6.10' 'debian-9': 'debian-9.4' 'debian-8': 'debian-8.10' 'freebsd-11': 'freebsd-11.2' diff --git a/centos/centos-6.9-i386.json b/centos/centos-6.10-i386.json similarity index 95% rename from centos/centos-6.9-i386.json rename to centos/centos-6.10-i386.json index 5ae9896a5..147998a60 100644 --- a/centos/centos-6.9-i386.json +++ b/centos/centos-6.10-i386.json @@ -181,7 +181,7 @@ } ], "variables": { - "box_basename": "centos-6.9-i386", + "box_basename": "centos-6.10-i386", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", "disk_size": "65536", @@ -190,16 +190,16 @@ "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", "hyperv_generation": "1", - "iso_checksum": "0724a468ec0c4ac46ac6a1daba0273be697a37bb7f4e9fed8ad84ad270cdee2f", + "iso_checksum": "25d95b3f178e59bd672fa97e043a9191cbf73bb6cd12f5df9b540fa88076cae8", "iso_checksum_type": "sha256", - "iso_name": "CentOS-6.9-i386-bin-DVD1.iso", + "iso_name": "CentOS-6.10-i386-bin-DVD1.iso", "ks_path": "6/ks.cfg", "memory": "1024", "mirror": "http://mirrors.kernel.org/centos", - "mirror_directory": "6.9/isos/i386", - "name": "centos-6.9-i386", + "mirror_directory": "6.10/isos/i386", + "name": "centos-6.10-i386", "no_proxy": "{{env `no_proxy`}}", - "template": "centos-6.9-i386", + "template": "centos-6.10-i386", "version": "TIMESTAMP" } } diff --git a/centos/centos-6.9-x86_64.json b/centos/centos-6.10-x86_64.json similarity index 95% rename from centos/centos-6.9-x86_64.json rename to centos/centos-6.10-x86_64.json index dc1088a5f..9b128b618 100644 --- a/centos/centos-6.9-x86_64.json +++ b/centos/centos-6.10-x86_64.json @@ -181,7 +181,7 @@ } ], "variables": { - "box_basename": "centos-6.9", + "box_basename": "centos-6.10", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", "disk_size": "65536", @@ -190,16 +190,16 @@ "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", "hyperv_generation": "1", - "iso_checksum": "d27cf37a40509c17ad70f37bc743f038c1feba00476fe6b69682aa424c399ea6", + "iso_checksum": "a68e46970678d4d297d46086ae2efdd3e994322d6d862ff51dcce25a0759e41c", "iso_checksum_type": "sha256", - "iso_name": "CentOS-6.9-x86_64-bin-DVD1.iso", + "iso_name": "CentOS-6.10-x86_64-bin-DVD1.iso", "ks_path": "6/ks.cfg", "memory": "1024", "mirror": "http://mirrors.kernel.org/centos", - "mirror_directory": "6.9/isos/x86_64", - "name": "centos-6.9", + "mirror_directory": "6.10/isos/x86_64", + "name": "centos-6.10", "no_proxy": "{{env `no_proxy`}}", - "template": "centos-6.9-x86_64", + "template": "centos-6.10-x86_64", "version": "TIMESTAMP" } } From 7e5d6605efc48c8f98f1bd79033a2317c042cf85 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith@chef.io> Date: Mon, 9 Jul 2018 20:46:11 -0700 Subject: [PATCH 0842/1622] Test with the latest packer Signed-off-by: Tim Smith <tsmith@chef.io> --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 8930f9d68..ae3f79a8a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,7 +3,7 @@ sudo: false env: global: - - PACKER_VERSION="1.0.4" + - PACKER_VERSION="1.2.4" - PATH=$HOME/bin:$PATH rvm: From e7115e7e3100e90c9ecda9e5925df1328626db33 Mon Sep 17 00:00:00 2001 From: Seth Thomas <sthomas@chef.io> Date: Tue, 10 Jul 2018 02:00:13 -0600 Subject: [PATCH 0843/1622] Adding missing changelog entries Signed-off-by: Seth Thomas <sthomas@chef.io> --- CHANGELOG.md | 57 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 57 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 331b49a9f..3411ac63a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,62 @@ # Change Log +## [Unreleased](https://github.com/chef/bento/tree/HEAD) + +[Full Changelog](https://github.com/chef/bento/compare/v201806.08.0...HEAD) + +**New Platforms** + +- FreeBSD 11.2-RELEASE [\#1068](https://github.com/chef/bento/pull/1068) ([lwhsu](https://github.com/lwhsu)) + +**Deprecated Platforms** + +- Debian 7 [\#1059](https://github.com/chef/bento/pull/1059) ([tas50](https://github.com/tas50)) +- Debian 8.11 [\#1064](https://github.com/chef/bento/pull/1064) ([kenhys](https://github.com/kenhys)) +- Fedora 26 [\#1074](https://github.com/chef/bento/pull/1074) ([tas50](https://github.com/tas50)) +- Ubuntu 17.10 [\#1077](https://github.com/chef/bento/pull/1077) ([tas50](https://github.com/tas50)) +- macOS 10.9 [\#1076](https://github.com/chef/bento/pull/1076) ([tas50](https://github.com/tas50)) + +**Fixes and Improvements** +- Use a faster scientific mirror [\#1081](https://github.com/chef/bento/pull/1081) ([tas50](https://github.com/tas50)) +- Install the latest 2008-06 update for 2k8r2 [\#1080](https://github.com/chef/bento/pull/1080) ([tas50](https://github.com/tas50)) +- Update RHELs to 6.10 / 7.5 [\#1079](https://github.com/chef/bento/pull/1079) ([tas50](https://github.com/tas50)) +- Blank netplan machine-id \(DUID\) so Ubuntu machines get unique ID generated on boot. [\#1073](https://github.com/chef/bento/pull/1073) ([NoahO](https://github.com/NoahO)) +- openSUSE: no space issue and SLES network persistence [\#1072](https://github.com/chef/bento/pull/1072) ([bkonick](https://github.com/bkonick)) +- Set correct permissions on /etc/sudoers.d/vagrant [\#1067](https://github.com/chef/bento/pull/1067) ([kbpease](https://github.com/kbpease)) +- Ubuntu 18.04: Use en\_US.UTF-8 locale instead of en\_US [\#1066](https://github.com/chef/bento/pull/1066) ([davejagoda](https://github.com/davejagoda)) +- Increase build time memory to 4GB on Windows boxes [\#1061](https://github.com/chef/bento/pull/1061) ([tas50](https://github.com/tas50)) + +## [v201806.08.0](https://github.com/chef/bento/tree/v201806.08.0) (2018-06-07) +[Full Changelog](https://github.com/chef/bento/compare/201803.24.0...v201806.08.0) + +**New Platforms** + +- Ubuntu 18.04 (Release version) +- CentOS 7.5 [\#1037](https://github.com/chef/bento/pull/1037) ([artem-sidorenko](https://github.com/artem-sidorenko)) +- Fedora 28 [\#1035](https://github.com/chef/bento/pull/1035) ([fkrull](https://github.com/fkrull)) +- HardenedBSD v1100055.2 [\#1033](https://github.com/chef/bento/pull/1033) ([nusenu](https://github.com/nusenu)) + +**Deprecated Platforms** +- Remove EOL'd FreeBSD-10.3 [\#1060](https://github.com/chef/bento/pull/1060) ([lwhsu](https://github.com/lwhsu)) + +**Fixes and Improvements** +- fedora, centos, rhel: added deltarpm to kickstart files [\#1030](https://github.com/chef/bento/pull/1030) ([muellerbe](https://github.com/muellerbe)) +- Clean up network configs [\#1025](https://github.com/chef/bento/pull/1025) ([Superdawg](https://github.com/Superdawg)) +- OpenSuse: Create a new 'vagrant' group for vagrant user [\#1020](https://github.com/chef/bento/pull/1020) ([hwoarang](https://github.com/hwoarang)) +- Improvements for Windows 2008 R2 [\#1057](https://github.com/chef/bento/pull/1057) ([tas50](https://github.com/tas50)) +- Update for Ubuntu 16.04.4 [\#1056](https://github.com/chef/bento/pull/1056) ([JBenPiel](https://github.com/JBenPiel)) +- Initial windows support [\#1053](https://github.com/chef/bento/pull/1053) ([tas50](https://github.com/tas50)) +- centos, rhel, oracle: remove previous kernels to minimize image size [\#1052](https://github.com/chef/bento/pull/1052) ([ceetav](https://github.com/ceetav)) +- Scientific Linux templates [\#1051](https://github.com/chef/bento/pull/1051) ([githubfoam](https://github.com/githubfoam)) +- Fix Fedora cleanup script not to cause unintended software removal. [\#1050](https://github.com/chef/bento/pull/1050) ([mgruner](https://github.com/mgruner)) + +**Tooling** +- VirtualBox 5.2.12 +- Parallels 13.3.1 +- VMware Fusion 10.1.2 +- Packer 1.2.3 +- Vagrant 2.1.1 + ## [201803.24.0](https://github.com/chef/bento/tree/201803.24.0) (2018-03-24) **New Platforms** From 0e84c6a65c4036a41ac34851d4a0d7ba6b6b8f18 Mon Sep 17 00:00:00 2001 From: Seth Thomas <sthomas@chef.io> Date: Tue, 10 Jul 2018 02:09:22 -0600 Subject: [PATCH 0844/1622] Ubuntu: add back software-properties-common Signed-off-by: Seth Thomas <sthomas@chef.io> --- ubuntu/http/preseed-hyperv.cfg | 2 +- ubuntu/http/preseed.cfg | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ubuntu/http/preseed-hyperv.cfg b/ubuntu/http/preseed-hyperv.cfg index 8fc1c8474..7f554b86c 100755 --- a/ubuntu/http/preseed-hyperv.cfg +++ b/ubuntu/http/preseed-hyperv.cfg @@ -28,7 +28,7 @@ d-i passwd/user-uid string 1000 d-i passwd/user-password password vagrant d-i passwd/user-password-again password vagrant d-i passwd/username string vagrant -d-i pkgsel/include string openssh-server ntp linux-tools-$(uname -r) linux-cloud-tools-$(uname -r) linux-cloud-tools-common cifs-utils +d-i pkgsel/include string openssh-server ntp linux-tools-$(uname -r) linux-cloud-tools-$(uname -r) linux-cloud-tools-common cifs-utils software-properties-common d-i pkgsel/install-language-support boolean false d-i pkgsel/update-policy select none d-i pkgsel/upgrade select full-upgrade diff --git a/ubuntu/http/preseed.cfg b/ubuntu/http/preseed.cfg index 34e65be13..b13ca7437 100644 --- a/ubuntu/http/preseed.cfg +++ b/ubuntu/http/preseed.cfg @@ -25,7 +25,7 @@ d-i passwd/user-uid string 1000 d-i passwd/user-password password vagrant d-i passwd/user-password-again password vagrant d-i passwd/username string vagrant -d-i pkgsel/include string openssh-server cryptsetup build-essential libssl-dev libreadline-dev zlib1g-dev linux-source dkms nfs-common linux-headers-$(uname -r) perl cifs-utils +d-i pkgsel/include string openssh-server cryptsetup build-essential libssl-dev libreadline-dev zlib1g-dev linux-source dkms nfs-common linux-headers-$(uname -r) perl cifs-utils software-properties-common d-i pkgsel/install-language-support boolean false d-i pkgsel/update-policy select none d-i pkgsel/upgrade select full-upgrade From 340337e845108e4ec0fd20ae2f21c7f1873e9988 Mon Sep 17 00:00:00 2001 From: Ben Konick <bkonick@gmail.com> Date: Fri, 13 Jul 2018 12:20:47 -0400 Subject: [PATCH 0845/1622] fix space issues in sles just like opensuse --- sles/http/sles-12-sp2-x86_64-autoinst.xml | 5 ++++- sles/http/sles-12-sp3-x86_64-autoinst.xml | 5 ++++- sles/sles-12-sp2-x86_64.json | 3 +-- sles/sles-12-sp3-x86_64.json | 3 +-- 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/sles/http/sles-12-sp2-x86_64-autoinst.xml b/sles/http/sles-12-sp2-x86_64-autoinst.xml index e3df36036..ffaa03806 100644 --- a/sles/http/sles-12-sp2-x86_64-autoinst.xml +++ b/sles/http/sles-12-sp2-x86_64-autoinst.xml @@ -101,12 +101,13 @@ <partitioning config:type="list"> <drive> <!-- - definition of device not needed (starting with SLES 11 SP2 + definition of device not needed (starting with SLES 11 SP2 YaST will pickup the first harddisk. This is useful if someone wants to deploy using VirtualBox and/or KVM/virtio --> <!-- <device>/dev/sda</device> --> <!-- This section may be removed entirely if we want to simply reuse YaST defaults --> + <enable_snapshots config:type="boolean">false</enable_snapshots> <initialize config:type="boolean">true</initialize> <partitions config:type="list"> <partition> @@ -223,6 +224,8 @@ <package>postfix</package> <package>samba-libs</package> <package>ucode-intel</package> + <package>snapper</package> + <package>snapper-zypp-plugin</package> </remove-packages> </software> <timezone> diff --git a/sles/http/sles-12-sp3-x86_64-autoinst.xml b/sles/http/sles-12-sp3-x86_64-autoinst.xml index e3df36036..ffaa03806 100644 --- a/sles/http/sles-12-sp3-x86_64-autoinst.xml +++ b/sles/http/sles-12-sp3-x86_64-autoinst.xml @@ -101,12 +101,13 @@ <partitioning config:type="list"> <drive> <!-- - definition of device not needed (starting with SLES 11 SP2 + definition of device not needed (starting with SLES 11 SP2 YaST will pickup the first harddisk. This is useful if someone wants to deploy using VirtualBox and/or KVM/virtio --> <!-- <device>/dev/sda</device> --> <!-- This section may be removed entirely if we want to simply reuse YaST defaults --> + <enable_snapshots config:type="boolean">false</enable_snapshots> <initialize config:type="boolean">true</initialize> <partitions config:type="list"> <partition> @@ -223,6 +224,8 @@ <package>postfix</package> <package>samba-libs</package> <package>ucode-intel</package> + <package>snapper</package> + <package>snapper-zypp-plugin</package> </remove-packages> </software> <timezone> diff --git a/sles/sles-12-sp2-x86_64.json b/sles/sles-12-sp2-x86_64.json index 5154531f7..a7fbf32f9 100644 --- a/sles/sles-12-sp2-x86_64.json +++ b/sles/sles-12-sp2-x86_64.json @@ -179,7 +179,7 @@ "box_basename": "sles-12-sp2", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", - "disk_size": "20480", + "disk_size": "65536", "git_revision": "__unknown_git_revision__", "headless": "", "http_proxy": "{{env `http_proxy`}}", @@ -194,4 +194,3 @@ "version": "TIMESTAMP" } } - diff --git a/sles/sles-12-sp3-x86_64.json b/sles/sles-12-sp3-x86_64.json index 8b03eca44..aa3ae0c19 100644 --- a/sles/sles-12-sp3-x86_64.json +++ b/sles/sles-12-sp3-x86_64.json @@ -179,7 +179,7 @@ "box_basename": "sles-12-sp3", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", - "disk_size": "20480", + "disk_size": "65536", "git_revision": "__unknown_git_revision__", "headless": "", "http_proxy": "{{env `http_proxy`}}", @@ -194,4 +194,3 @@ "version": "TIMESTAMP" } } - From 3b266ef4d150feb1042008b63b508411c65be51f Mon Sep 17 00:00:00 2001 From: Ben Konick <bkonick@gmail.com> Date: Fri, 13 Jul 2018 12:52:39 -0400 Subject: [PATCH 0846/1622] restore SLES 11 SP4 --- sles/http/sles-11-sp4-x86_64-autoinst.xml | 180 ++++++++++++++++++++ sles/sles-11-sp4-x86_64.json | 196 ++++++++++++++++++++++ 2 files changed, 376 insertions(+) create mode 100644 sles/http/sles-11-sp4-x86_64-autoinst.xml create mode 100644 sles/sles-11-sp4-x86_64.json diff --git a/sles/http/sles-11-sp4-x86_64-autoinst.xml b/sles/http/sles-11-sp4-x86_64-autoinst.xml new file mode 100644 index 000000000..164c19319 --- /dev/null +++ b/sles/http/sles-11-sp4-x86_64-autoinst.xml @@ -0,0 +1,180 @@ +<?xml version="1.0"?> +<!DOCTYPE profile> +<profile xmlns="http://www.suse.com/1.0/yast2ns" xmlns:config="http://www.suse.com/1.0/configns"> + <general> + <ask-list config:type="list"/> + <mode> + <confirm config:type="boolean">false</confirm> + </mode> + <mouse> + <id>none</id> + </mouse> + <proposals config:type="list"/> + <signature-handling> + <accept_file_without_checksum config:type="boolean">true</accept_file_without_checksum> + <accept_non_trusted_gpg_key config:type="boolean">true</accept_non_trusted_gpg_key> + <accept_unknown_gpg_key config:type="boolean">true</accept_unknown_gpg_key> + <accept_unsigned_file config:type="boolean">true</accept_unsigned_file> + <accept_verification_failed config:type="boolean">false</accept_verification_failed> + <import_gpg_key config:type="boolean">true</import_gpg_key> + </signature-handling> + <storage/> + </general> + <login_settings/> + <networking> + <dhcp_options> + <dhclient_client_id></dhclient_client_id> + <dhclient_hostname_option>AUTO</dhclient_hostname_option> + </dhcp_options> + <dns> + <dhcp_hostname config:type="boolean">false</dhcp_hostname> + <domain>vagrantup.com</domain> + <hostname>vagrant-sles-11sp4-x64</hostname> + <resolv_conf_policy>auto</resolv_conf_policy> + <searchlist config:type="list"> + <search>vagrantup.com</search> + </searchlist> + <write_hostname config:type="boolean">true</write_hostname> + </dns> + <interfaces config:type="list"> + <interface> + <bootproto>dhcp</bootproto> + <device>eth0</device> + <startmode>auto</startmode> + <usercontrol>no</usercontrol> + </interface> + </interfaces> + <keep_install_network config:type="boolean">true</keep_install_network> + <managed config:type="boolean">false</managed> + <routing> + <ip_forward config:type="boolean">false</ip_forward> + </routing> + </networking> + <partitioning config:type="list"> + <drive> + <initialize config:type="boolean">true</initialize> + <partitions config:type="list"> + <partition> + <create config:type="boolean">true</create> + <crypt_fs config:type="boolean">false</crypt_fs> + <filesystem config:type="symbol">swap</filesystem> + <format config:type="boolean">true</format> + <fstopt>defaults</fstopt> + <loop_fs config:type="boolean">false</loop_fs> + <mount>swap</mount> + <mountby config:type="symbol">device</mountby> + <partition_id config:type="integer">130</partition_id> + <partition_nr config:type="integer">1</partition_nr> + <raid_options/> + <resize config:type="boolean">false</resize> + <size>1561492992</size> + </partition> + <partition> + <create config:type="boolean">true</create> + <crypt_fs config:type="boolean">false</crypt_fs> + <filesystem config:type="symbol">ext3</filesystem> + <format config:type="boolean">true</format> + <fstopt>acl,user_xattr</fstopt> + <loop_fs config:type="boolean">false</loop_fs> + <mount>/</mount> + <mountby config:type="symbol">device</mountby> + <partition_id config:type="integer">131</partition_id> + <partition_nr config:type="integer">2</partition_nr> + <raid_options/> + <resize config:type="boolean">false</resize> + <size>64424509440</size> + </partition> + </partitions> + <pesize></pesize> + <type config:type="symbol">CT_DISK</type> + <use>all</use> + </drive> + </partitioning> + <report> + <errors> + <log config:type="boolean">true</log> + <show config:type="boolean">true</show> + <timeout config:type="integer">0</timeout> + </errors> + <messages> + <log config:type="boolean">true</log> + <show config:type="boolean">true</show> + <timeout config:type="integer">0</timeout> + </messages> + <warnings> + <log config:type="boolean">true</log> + <show config:type="boolean">true</show> + <timeout config:type="integer">0</timeout> + </warnings> + <yesno_messages> + <log config:type="boolean">true</log> + <show config:type="boolean">true</show> + <timeout config:type="integer">0</timeout> + </yesno_messages> + </report> + <software> + + <packages config:type="list"> + <package>openssh</package> + <package>kernel-default-devel</package> + <package>sudo</package> + <package>gcc</package> + <package>wget</package> + <package>make</package> + </packages> + <patterns config:type="list"> + <pattern>Minimal</pattern> + <pattern>apparmor</pattern> + </patterns> + <remove-packages config:type="list"> + </remove-packages> + </software> + <user_defaults> + <expire></expire> + <group>100</group> + <groups>video,dialout</groups> + <home>/home</home> + <inactive>-1</inactive> + <shell>/bin/bash</shell> + <skel>/etc/skel</skel> + <umask>022</umask> + </user_defaults> + <users config:type="list"> + <user> + <encrypted config:type="boolean">true</encrypted> + <fullname>vagrant</fullname> + <gid>100</gid> + <home>/home/vagrant</home> + <password_settings> + <expire></expire> + <flag></flag> + <inact></inact> + <max>99999</max> + <min>0</min> + <warn>7</warn> + </password_settings> + <shell>/bin/bash</shell> + <uid>1000</uid> + <user_password>$2y$05$NA1Li9ZKJOLRW5mMTXm6/e5r8dltWS5RpDZpvHrI82aLE00V51tdi</user_password> + <username>vagrant</username> + </user> + <user> + <encrypted config:type="boolean">true</encrypted> + <fullname>root</fullname> + <gid>0</gid> + <home>/root</home> + <password_settings> + <expire></expire> + <flag></flag> + <inact></inact> + <max></max> + <min></min> + <warn></warn> + </password_settings> + <shell>/bin/bash</shell> + <uid>0</uid> + <user_password>$2y$05$NA1Li9ZKJOLRW5mMTXm6/e5r8dltWS5RpDZpvHrI82aLE00V51tdi</user_password> + <username>root</username> + </user> + </users> +</profile> diff --git a/sles/sles-11-sp4-x86_64.json b/sles/sles-11-sp4-x86_64.json new file mode 100644 index 000000000..0401faee5 --- /dev/null +++ b/sles/sles-11-sp4-x86_64.json @@ -0,0 +1,196 @@ +{ + "builders": [ + { + "boot_command": [ + "<esc><enter><wait>", + "linux netdevice=eth0 netsetup=dhcp install=cd:/<wait>", + " lang=en_US autoyast=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `autoinst_cfg`}}<wait>", + " textmode=1<wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": "{{user `disk_size`}}", + "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "guest_os_type": "OpenSUSE_64", + "hard_drive_interface": "sata", + "headless": "{{ user `headless` }}", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-virtualbox", + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "virtualbox-iso", + "vboxmanage": [ + [ + "modifyvm", + "{{.Name}}", + "--memory", + "{{ user `memory` }}" + ], + [ + "modifyvm", + "{{.Name}}", + "--cpus", + "{{ user `cpus` }}" + ] + ], + "virtualbox_version_file": ".vbox_version", + "vm_name": "{{ user `template` }}" + }, + { + "boot_command": [ + "<esc><enter><wait>", + "linux netdevice=eth0 netsetup=dhcp install=cd:/<wait>", + " lang=en_US autoyast=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `autoinst_cfg`}}", + " textmode=1<wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": "{{user `disk_size`}}", + "guest_os_type": "sles11-64", + "headless": "{{ user `headless` }}", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-vmware", + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "tools_upload_flavor": "linux", + "type": "vmware-iso", + "vm_name": "{{ user `template` }}", + "vmx_data": { + "cpuid.coresPerSocket": "1", + "memsize": "{{ user `memory` }}", + "numvcpus": "{{ user `cpus` }}" + } + }, + { + "boot_command": [ + "<esc><enter><wait>", + "linux netdevice=eth0 netsetup=dhcp install=cd:/<wait>", + " lang=en_US autoyast=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `autoinst_cfg`}}<wait>", + " textmode=1<wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": "{{user `disk_size`}}", + "guest_os_type": "suse", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-parallels", + "parallels_tools_flavor": "lin", + "prlctl": [ + [ + "set", + "{{.Name}}", + "--memsize", + "{{ user `memory` }}" + ], + [ + "set", + "{{.Name}}", + "--cpus", + "{{ user `cpus` }}" + ] + ], + "prlctl_version_file": ".prlctl_version", + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "parallels-iso", + "vm_name": "{{ user `template` }}" + }, + { + "boot_command": [ + "<esc><enter><wait>", + "linux netdevice=eth0 netsetup=dhcp install=cd:/<wait>", + " lang=en_US autoyast=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `autoinst_cfg`}}<wait>", + " textmode=1<wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": "{{user `disk_size`}}", + "headless": "{{ user `headless` }}", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `iso_name`}}", + "output_directory": "packer-{{user `template`}}-qemu", + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "qemu", + "vm_name": "{{ user `template` }}" + } + ], + "post-processors": [ + { + "output": "builds/{{user `box_basename`}}.{{.Provider}}.box", + "type": "vagrant" + } + ], + "provisioners": [ + { + "destination": "/tmp/bento-metadata.json", + "source": "{{user `metadata`}}", + "type": "file" + }, + { + "environment_vars": [ + "HOME_DIR=/home/vagrant", + "http_proxy={{user `http_proxy`}}", + "https_proxy={{user `https_proxy`}}", + "no_proxy={{user `no_proxy`}}" + ], + "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh '{{.Path}}'", + "scripts": [ + "scripts/common/metadata.sh", + "scripts/common/sshd.sh", + "scripts/common/vagrant.sh", + "scripts/common/vmtools.sh", + "scripts/sles/sudoers.sh", + "scripts/sles/zypper-locks.sh", + "scripts/sles/remove-dvd-source.sh", + "scripts/common/minimize.sh" + ], + "type": "shell" + } + ], + "variables": { + "_DOWNLOAD_SITE": "https://www.suse.com/products/server/download", + "_README": "You must download the automated installer iso from the following page, and then place it in the packer_cache dir", + "arch": "64", + "autoinst_cfg": "sles-11-sp4-x86_64-autoinst.xml", + "box_basename": "sles-11-sp4", + "build_timestamp": "{{isotime \"20060102150405\"}}", + "cpus": "1", + "disk_size": "65536", + "git_revision": "__unknown_git_revision__", + "headless": "", + "http_proxy": "{{env `http_proxy`}}", + "https_proxy": "{{env `https_proxy`}}", + "iso_checksum": "4fbf22201876d571c719328f385d87d6d690fb3ceb5e093108cdf0373c43e855", + "iso_checksum_type": "sha256", + "iso_name": "SLES-11-SP4-DVD-x86_64-GM-DVD1.iso", + "memory": "1024", + "mirror": "./packer_cache", + "name": "sles-11-sp4", + "template": "sles-11-sp4-x86_64", + "version": "TIMESTAMP" + } +} From b500dc102f4b1c40c32203cde920c2fb4df86d11 Mon Sep 17 00:00:00 2001 From: Ben Konick <bkonick@gmail.com> Date: Fri, 13 Jul 2018 13:12:23 -0400 Subject: [PATCH 0847/1622] make this fit the latest bento structure --- sles/sles-11-sp4-x86_64.json | 38 ++++++++++++++++++------------------ 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/sles/sles-11-sp4-x86_64.json b/sles/sles-11-sp4-x86_64.json index 0401faee5..bcd322ba9 100644 --- a/sles/sles-11-sp4-x86_64.json +++ b/sles/sles-11-sp4-x86_64.json @@ -18,7 +18,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-virtualbox", + "output_directory": "../builds/packer-{{user `template`}}-virtualbox", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, @@ -58,7 +58,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-vmware", + "output_directory": "../builds/packer-{{user `template`}}-vmware", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, @@ -71,7 +71,8 @@ "cpuid.coresPerSocket": "1", "memsize": "{{ user `memory` }}", "numvcpus": "{{ user `cpus` }}" - } + }, + "vmx_remove_ethernet_interfaces": true }, { "boot_command": [ @@ -88,7 +89,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-parallels", + "output_directory": "../builds/packer-{{user `template`}}-parallels", "parallels_tools_flavor": "lin", "prlctl": [ [ @@ -128,7 +129,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `iso_name`}}", - "output_directory": "packer-{{user `template`}}-qemu", + "output_directory": "../builds/packer-{{user `template`}}-qemu", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, @@ -140,16 +141,11 @@ ], "post-processors": [ { - "output": "builds/{{user `box_basename`}}.{{.Provider}}.box", + "output": "../builds/{{user `box_basename`}}.{{.Provider}}.box", "type": "vagrant" } ], "provisioners": [ - { - "destination": "/tmp/bento-metadata.json", - "source": "{{user `metadata`}}", - "type": "file" - }, { "environment_vars": [ "HOME_DIR=/home/vagrant", @@ -158,15 +154,19 @@ "no_proxy={{user `no_proxy`}}" ], "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh '{{.Path}}'", + "expect_disconnect": true, "scripts": [ - "scripts/common/metadata.sh", - "scripts/common/sshd.sh", - "scripts/common/vagrant.sh", - "scripts/common/vmtools.sh", - "scripts/sles/sudoers.sh", - "scripts/sles/zypper-locks.sh", - "scripts/sles/remove-dvd-source.sh", - "scripts/common/minimize.sh" + "../_common/sshd.sh", + "../_common/vagrant.sh", + "scripts/unsupported-modules.sh", + "../_common/virtualbox.sh", + "../_common/vmware.sh", + "../_common/parallels.sh", + "scripts/sudoers.sh", + "scripts/zypper-locks.sh", + "scripts/remove-dvd-source.sh", + "scripts/cleanup.sh", + "../_common/minimize.sh" ], "type": "shell" } From 86062ee2d31d06e6c615fc33924a0727b09c316a Mon Sep 17 00:00:00 2001 From: Ben Konick <bkonick@gmail.com> Date: Fri, 13 Jul 2018 13:12:49 -0400 Subject: [PATCH 0848/1622] max size --- sles/http/sles-11-sp4-x86_64-autoinst.xml | 2 +- sles/http/sles-12-sp2-x86_64-autoinst.xml | 2 +- sles/http/sles-12-sp3-x86_64-autoinst.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sles/http/sles-11-sp4-x86_64-autoinst.xml b/sles/http/sles-11-sp4-x86_64-autoinst.xml index 164c19319..bce1a8a9e 100644 --- a/sles/http/sles-11-sp4-x86_64-autoinst.xml +++ b/sles/http/sles-11-sp4-x86_64-autoinst.xml @@ -82,7 +82,7 @@ <partition_nr config:type="integer">2</partition_nr> <raid_options/> <resize config:type="boolean">false</resize> - <size>64424509440</size> + <size>max</size> </partition> </partitions> <pesize></pesize> diff --git a/sles/http/sles-12-sp2-x86_64-autoinst.xml b/sles/http/sles-12-sp2-x86_64-autoinst.xml index ffaa03806..40126e7b0 100644 --- a/sles/http/sles-12-sp2-x86_64-autoinst.xml +++ b/sles/http/sles-12-sp2-x86_64-autoinst.xml @@ -137,7 +137,7 @@ <partition_nr config:type="integer">2</partition_nr> <raid_options/> <resize config:type="boolean">false</resize> - <size>19895844352</size> + <size>max</size> <subvolumes config:type="list"> <listentry>boot/grub2/i386-pc</listentry> <listentry>boot/grub2/x86_64-efi</listentry> diff --git a/sles/http/sles-12-sp3-x86_64-autoinst.xml b/sles/http/sles-12-sp3-x86_64-autoinst.xml index ffaa03806..40126e7b0 100644 --- a/sles/http/sles-12-sp3-x86_64-autoinst.xml +++ b/sles/http/sles-12-sp3-x86_64-autoinst.xml @@ -137,7 +137,7 @@ <partition_nr config:type="integer">2</partition_nr> <raid_options/> <resize config:type="boolean">false</resize> - <size>19895844352</size> + <size>max</size> <subvolumes config:type="list"> <listentry>boot/grub2/i386-pc</listentry> <listentry>boot/grub2/x86_64-efi</listentry> From def6b858baca636bf8219d8bb40850a993f8afcb Mon Sep 17 00:00:00 2001 From: Ben Konick <bkonick@gmail.com> Date: Fri, 13 Jul 2018 13:42:47 -0400 Subject: [PATCH 0849/1622] this doesn't work on sles 11 --- sles/sles-11-sp4-x86_64.json | 1 - 1 file changed, 1 deletion(-) diff --git a/sles/sles-11-sp4-x86_64.json b/sles/sles-11-sp4-x86_64.json index bcd322ba9..2957f3ca9 100644 --- a/sles/sles-11-sp4-x86_64.json +++ b/sles/sles-11-sp4-x86_64.json @@ -158,7 +158,6 @@ "scripts": [ "../_common/sshd.sh", "../_common/vagrant.sh", - "scripts/unsupported-modules.sh", "../_common/virtualbox.sh", "../_common/vmware.sh", "../_common/parallels.sh", From 39f3ba10101c2630e83c5bd2d32e5ea95eb3da76 Mon Sep 17 00:00:00 2001 From: Jordan Piel <Jordan.Piel@lasp.colorado.edu> Date: Mon, 16 Jul 2018 08:15:55 -0600 Subject: [PATCH 0850/1622] Update for Debian 9.5 --- .../{debian-9.4-amd64.json => debian-9.5-amd64.json} | 12 ++++++------ .../{debian-9.4-i386.json => debian-9.5-i386.json} | 12 ++++++------ 2 files changed, 12 insertions(+), 12 deletions(-) rename debian/{debian-9.4-amd64.json => debian-9.5-amd64.json} (96%) rename debian/{debian-9.4-i386.json => debian-9.5-i386.json} (96%) diff --git a/debian/debian-9.4-amd64.json b/debian/debian-9.5-amd64.json similarity index 96% rename from debian/debian-9.4-amd64.json rename to debian/debian-9.5-amd64.json index 743a7840e..ee3e11681 100644 --- a/debian/debian-9.4-amd64.json +++ b/debian/debian-9.5-amd64.json @@ -217,7 +217,7 @@ } ], "variables": { - "box_basename": "debian-9.4", + "box_basename": "debian-9.5", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", "disk_size": "65536", @@ -225,16 +225,16 @@ "headless": "", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", - "iso_checksum": "124d270006703f2111224dec3bf7a9d01450168be41d4834f88fdd035552b044", + "iso_checksum": "1f97a4b8dee7c3def5cd8215ff01b9edef27c901b28fa8b1ef4f022eff7c36c2", "iso_checksum_type": "sha256", - "iso_name": "debian-9.4.0-amd64-netinst.iso", + "iso_name": "debian-9.5.0-amd64-netinst.iso", "memory": "1024", "mirror": "http://cdimage.debian.org/cdimage/release", - "mirror_directory": "9.4.0/amd64/iso-cd", - "name": "debian-9.4", + "mirror_directory": "9.5.0/amd64/iso-cd", + "name": "debian-9.5", "no_proxy": "{{env `no_proxy`}}", "preseed_path": "debian-8/preseed.cfg", - "template": "debian-9.4-amd64", + "template": "debian-9.5-amd64", "version": "TIMESTAMP" } } diff --git a/debian/debian-9.4-i386.json b/debian/debian-9.5-i386.json similarity index 96% rename from debian/debian-9.4-i386.json rename to debian/debian-9.5-i386.json index ae5de564a..4d1583d80 100644 --- a/debian/debian-9.4-i386.json +++ b/debian/debian-9.5-i386.json @@ -217,7 +217,7 @@ } ], "variables": { - "box_basename": "debian-9.4-i386", + "box_basename": "debian-9.5-i386", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", "disk_size": "65536", @@ -225,16 +225,16 @@ "headless": "", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", - "iso_checksum": "f1da6c11c7e0ca4399a703e32c330261258bb4ba05f81d7a6f67402d182c8bf8", + "iso_checksum": "fb27b64cda4beb2c723ed73042e0cd431500be06315efef9e4e311d6cc798d08", "iso_checksum_type": "sha256", - "iso_name": "debian-9.4.0-i386-netinst.iso", + "iso_name": "debian-9.5.0-i386-netinst.iso", "memory": "1024", "mirror": "http://cdimage.debian.org/cdimage/release", - "mirror_directory": "9.4.0/i386/iso-cd", - "name": "debian-9.4-i386", + "mirror_directory": "9.5.0/i386/iso-cd", + "name": "debian-9.5-i386", "no_proxy": "{{env `no_proxy`}}", "preseed_path": "debian-8/preseed.cfg", - "template": "debian-9.4-i386", + "template": "debian-9.5-i386", "version": "TIMESTAMP" } } From 7f4d02a718f8c8a505ccfd61ce0f4a5de4a31f64 Mon Sep 17 00:00:00 2001 From: Seth Thomas <sthomas@chef.io> Date: Mon, 16 Jul 2018 21:47:24 -0600 Subject: [PATCH 0851/1622] Release v201807.12.0 Signed-off-by: Seth Thomas <sthomas@chef.io> --- CHANGELOG.md | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3411ac63a..aa0f61f80 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,17 +1,19 @@ # Change Log -## [Unreleased](https://github.com/chef/bento/tree/HEAD) +## ## [v201807.12.0](https://github.com/chef/bento/tree/v201807.12.0) (2018-07-16) -[Full Changelog](https://github.com/chef/bento/compare/v201806.08.0...HEAD) +[Full Changelog](https://github.com/chef/bento/compare/v201806.08.0...v201807.12.0) **New Platforms** - FreeBSD 11.2-RELEASE [\#1068](https://github.com/chef/bento/pull/1068) ([lwhsu](https://github.com/lwhsu)) +- Debian 8.11 [\#1064](https://github.com/chef/bento/pull/1064) ([kenhys](https://github.com/kenhys)) +- Debian 9.5 +- CentOS 6.10 **Deprecated Platforms** - Debian 7 [\#1059](https://github.com/chef/bento/pull/1059) ([tas50](https://github.com/tas50)) -- Debian 8.11 [\#1064](https://github.com/chef/bento/pull/1064) ([kenhys](https://github.com/kenhys)) - Fedora 26 [\#1074](https://github.com/chef/bento/pull/1074) ([tas50](https://github.com/tas50)) - Ubuntu 17.10 [\#1077](https://github.com/chef/bento/pull/1077) ([tas50](https://github.com/tas50)) - macOS 10.9 [\#1076](https://github.com/chef/bento/pull/1076) ([tas50](https://github.com/tas50)) From 88f61266cb805aa20b3eda5530278ce226aaabfe Mon Sep 17 00:00:00 2001 From: Jordan Piel <Jordan.Piel@lasp.colorado.edu> Date: Thu, 26 Jul 2018 13:02:04 -0600 Subject: [PATCH 0852/1622] Update for Ubuntu 18.04.1 --- ubuntu/ubuntu-18.04-amd64.json | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/ubuntu/ubuntu-18.04-amd64.json b/ubuntu/ubuntu-18.04-amd64.json index 1d8fc8844..8021285d2 100644 --- a/ubuntu/ubuntu-18.04-amd64.json +++ b/ubuntu/ubuntu-18.04-amd64.json @@ -300,12 +300,13 @@ "https_proxy": "{{env `https_proxy`}}", "hyperv_generation": "2", "hyperv_switch": "{{env `hyperv_switch`}}", + "iso_checksum": "a5b0ea5918f850124f3d72ef4b85bda82f0fcd02ec721be19c1a6952791c8ee8", "iso_checksum_type": "sha256", - "iso_name": "ubuntu-18.04-server-amd64.iso", + "iso_name": "ubuntu-18.04.1-server-amd64.iso", "memory": "1024", "mirror": "http://cdimage.ubuntu.com", - "mirror_directory": "ubuntu/releases/18.04/release", - "name": "ubuntu-18.04", + "mirror_directory": "ubuntu/releases/18.04.1/release", + "name": "ubuntu-18.04.1", "no_proxy": "{{env `no_proxy`}}", "preseed_path": "preseed.cfg", "template": "ubuntu-18.04-amd64", From f72f0d1e6e2fe108d9b11e70a26e3510993f8ffa Mon Sep 17 00:00:00 2001 From: Seth Thomas <sthomas@chef.io> Date: Sat, 28 Jul 2018 17:03:44 -0600 Subject: [PATCH 0853/1622] Reorder and update build list/slugs Signed-off-by: Seth Thomas <sthomas@chef.io> --- builds.yml | 29 ++++++++++++++--------------- 1 file changed, 14 insertions(+), 15 deletions(-) diff --git a/builds.yml b/builds.yml index 541cea34e..807dc8643 100644 --- a/builds.yml +++ b/builds.yml @@ -7,35 +7,34 @@ providers: public: - 'centos-7.5' - 'centos-6.10' -- 'centos-6.10-i386' -- 'oracle-7.5' -- 'oracle-6.10' -- 'oracle-6.10-i386' - 'ubuntu-18.04' - 'ubuntu-16.04' -- 'ubuntu-16.04-i386' - 'ubuntu-14.04' -- 'ubuntu-14.04-i386' -- 'debian-9.4' -- 'debian-9.4-i386' +- 'debian-9.5' - 'debian-8.11' -- 'debian-8.11-i386' +- 'oracle-7.5' +- 'oracle-6.10' - 'fedora-28' - 'fedora-27' - 'opensuse-leap-42.3' - 'freebsd-11.2' -- 'freebsd-11.2-i386' -- 'freebsd-11.1' -- 'freebsd-11.1-i386' - 'freebsd-10.4' -- 'freebsd-10.4-i386' - 'hardenedbsd-11' +- 'centos-6.10-i386' +- 'oracle-6.10-i386' +- 'ubuntu-16.04-i386' +- 'ubuntu-14.04-i386' +- 'debian-8.11-i386' +- 'debian-9.5-i386' +- 'freebsd-11.2-i386' slugs: 'centos-7': 'centos-7.5' 'centos-6': 'centos-6.10' - 'debian-9': 'debian-9.4' - 'debian-8': 'debian-8.10' + 'debian-9': 'debian-9.5' + 'debian-8': 'debian-8.11' + 'oracle-7': 'oracle-7.5' + 'centos-6': 'oracle-6.10' 'freebsd-11': 'freebsd-11.2' 'freebsd-10': 'freebsd-10.4' 'opensuse-leap-42': 'opensuse-leap-42.3' From a058358a3ddb50bc3c0dd3598afb3daa33337fd5 Mon Sep 17 00:00:00 2001 From: John Jelinek <jjelinek@containerstore.com> Date: Fri, 3 Aug 2018 14:59:58 -0500 Subject: [PATCH 0854/1622] Windows 2016: Point to the correct Autounattend.xml This fixes an issue where an unattended install was failing. Signed-off-by: John Jelinek <jjelinek@containerstore.com> --- windows/2016.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/windows/2016.json b/windows/2016.json index e4d4b3111..05da80676 100644 --- a/windows/2016.json +++ b/windows/2016.json @@ -21,7 +21,7 @@ "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"", "shutdown_timeout": "15m", "floppy_files": [ - "answer_files/2012_r2/Autounattend.xml" + "answer_files/2016/Autounattend.xml" ] }], "provisioners": [{ From 27e45470182138affe7d5b44a2f56d3b2ae25cad Mon Sep 17 00:00:00 2001 From: Joshua Kugler <joshua@azariah.com> Date: Thu, 9 Aug 2018 12:34:32 -0800 Subject: [PATCH 0855/1622] Disable consistent naming in RHEL/CentOS 7 so we always have an eth0 interface. --- centos/http/7/ks.cfg | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/centos/http/7/ks.cfg b/centos/http/7/ks.cfg index c8cef2a43..064288110 100644 --- a/centos/http/7/ks.cfg +++ b/centos/http/7/ks.cfg @@ -8,7 +8,7 @@ firewall --disabled selinux --permissive timezone UTC unsupported_hardware -bootloader --location=mbr +bootloader --location=mbr --append="net.ifnames=0 biosdevname=0" text skipx zerombr @@ -73,4 +73,26 @@ if [ $(virt-what) == "hyperv" ]; then systemctl enable hypervkvpd fi +# Since we disable consistent network naming, we need to make sure the eth0 +# configuration file is in place so it will come up. +# Delete other network configuration first because RHEL/C7 networking will not +# restart successfully if there are configuration files for devices that do not +# exist. +rm -f /etc/sysconfig/network-scripts/ifcfg-e* +cat > /etc/sysconfig/network-scripts/ifcfg-eth0 << _EOF_ +TYPE=Ethernet +PROXY_METHOD=none +BROWSER_ONLY=no +BOOTPROTO=dhcp +DEFROUTE=yes +IPV4_FAILURE_FATAL=no +IPV6INIT=yes +IPV6_AUTOCONF=yes +IPV6_DEFROUTE=yes +IPV6_FAILURE_FATAL=no +IPV6_ADDR_GEN_MODE=stable-privacy +NAME=eth0 +DEVICE=eth0 +ONBOOT=yes +_EOF_ %end From 2f5c9597ba07773fabd9be31a6fa9e68b200b4d9 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith@chef.io> Date: Fri, 10 Aug 2018 16:42:54 -0700 Subject: [PATCH 0856/1622] Add github templates Signed-off-by: Tim Smith <tsmith@chef.io> --- .github/ISSUE_TEMPLATE.md | 21 +++++++++++++++++++++ .github/PULL_REQUEST_TEMPLATE.md | 8 ++++++++ 2 files changed, 29 insertions(+) create mode 100644 .github/ISSUE_TEMPLATE.md create mode 100644 .github/PULL_REQUEST_TEMPLATE.md diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md new file mode 100644 index 000000000..f229e13f2 --- /dev/null +++ b/.github/ISSUE_TEMPLATE.md @@ -0,0 +1,21 @@ +# Version: + +[Version of the project installed] + +# Environment: [Details about the environment such as the Operating System, cookbook details, etc...] + +# Scenario: + +[What you are trying to achieve and you can't?] + +# Steps to Reproduce: + +[If you are filing an issue what are the things we need to do in order to repro your problem?] + +# Expected Result: + +[What are you expecting to happen as the consequence of above reproduction steps?] + +# Actual Result: + +[What actually happens after the reproduction steps?] diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md new file mode 100644 index 000000000..c1aab3fda --- /dev/null +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -0,0 +1,8 @@ +### Description + +[Please describe what this change achieves] + +### Issues Resolved + +[List any existing issues this PR resolves, or any Discourse or +StackOverflow discussion that's relevant] From 6686f83e60ac4e7b19cd66db90f3dfa32c4720d8 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith@chef.io> Date: Fri, 10 Aug 2018 16:54:54 -0700 Subject: [PATCH 0857/1622] Add openSUSE leap 15.0 This is the current stable release. Signed-off-by: Tim Smith <tsmith@chef.io> --- opensuse/opensuse-leap-15.0-x86_64.json | 211 ++++++++++++++++++++++++ 1 file changed, 211 insertions(+) create mode 100644 opensuse/opensuse-leap-15.0-x86_64.json diff --git a/opensuse/opensuse-leap-15.0-x86_64.json b/opensuse/opensuse-leap-15.0-x86_64.json new file mode 100644 index 000000000..8d4633ea3 --- /dev/null +++ b/opensuse/opensuse-leap-15.0-x86_64.json @@ -0,0 +1,211 @@ +{ + "builders": [ + { + "boot_command": [ + "<esc><enter><wait>", + "linux ", + "biosdevname=0 ", + "net.ifnames=0 ", + "netdevice=eth0 ", + "netsetup=dhcp ", + "lang=en_US ", + "textmode=1 ", + "autoyast=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `autoinst_cfg`}}", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": "{{user `disk_size`}}", + "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "guest_os_type": "OpenSUSE_64", + "hard_drive_interface": "sata", + "headless": "{{ user `headless` }}", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "../builds/packer-{{user `template`}}-virtualbox", + "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "virtualbox-iso", + "vboxmanage": [ + [ + "modifyvm", + "{{.Name}}", + "--memory", + "{{ user `memory` }}" + ], + [ + "modifyvm", + "{{.Name}}", + "--cpus", + "{{ user `cpus` }}" + ] + ], + "virtualbox_version_file": ".vbox_version", + "vm_name": "{{ user `template` }}" + }, + { + "boot_command": [ + "<esc><enter><wait>", + "linux ", + "biosdevname=0 ", + "net.ifnames=0 ", + "netdevice=eth0 ", + "netsetup=dhcp ", + "lang=en_US ", + "textmode=1 ", + "autoyast=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `autoinst_cfg`}}", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": "{{user `disk_size`}}", + "guest_os_type": "opensuse-64", + "headless": "{{ user `headless` }}", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "../builds/packer-{{user `template`}}-vmware", + "shutdown_command": "echo 'vagrant'|sudo -S /sbin/shutdown -h 1", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "tools_upload_flavor": "linux", + "type": "vmware-iso", + "vm_name": "{{ user `template` }}", + "vmx_data": { + "cpuid.coresPerSocket": "1", + "memsize": "{{ user `memory` }}", + "numvcpus": "{{ user `cpus` }}" + }, + "vmx_remove_ethernet_interfaces": true + }, + { + "boot_command": [ + "<esc><enter><wait>", + "linux ", + "biosdevname=0 ", + "net.ifnames=0 ", + "netdevice=eth0 ", + "netsetup=dhcp ", + "lang=en_US ", + "textmode=1 ", + "autoyast=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `autoinst_cfg`}}", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": "{{user `disk_size`}}", + "guest_os_type": "opensuse", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "../builds/packer-{{user `template`}}-parallels", + "parallels_tools_flavor": "lin", + "prlctl": [ + [ + "set", + "{{.Name}}", + "--memsize", + "{{ user `memory` }}" + ], + [ + "set", + "{{.Name}}", + "--cpus", + "{{ user `cpus` }}" + ] + ], + "prlctl_version_file": ".prlctl_version", + "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "parallels-iso", + "vm_name": "{{ user `template` }}" + }, + { + "boot_command": [ + "<esc><enter><wait>", + "linux netsetup=dhcp netdevice=eth0 install=cd:/<wait>", + " lang=en_US autoyast=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `autoinst_cfg`}}<wait>", + " textmode=1<wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": "{{user `disk_size`}}", + "headless": "{{ user `headless` }}", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "../builds/packer-{{user `template`}}-qemu", + "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "qemu", + "vm_name": "{{ user `template` }}" + } + ], + "post-processors": [ + { + "output": "../builds/{{user `box_basename`}}.{{.Provider}}.box", + "type": "vagrant" + } + ], + "provisioners": [ + { + "environment_vars": [ + "HOME_DIR=/home/vagrant", + "http_proxy={{user `http_proxy`}}", + "https_proxy={{user `https_proxy`}}", + "no_proxy={{user `no_proxy`}}" + ], + "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh '{{.Path}}'", + "expect_disconnect": true, + "scripts": [ + "../_common/sshd.sh", + "../_common/vagrant.sh", + "../_common/virtualbox.sh", + "../_common/vmware.sh", + "../_common/parallels.sh", + "scripts/vagrant_group.sh", + "scripts/sudoers.sh", + "scripts/zypper-locks.sh", + "scripts/remove-dvd-source.sh", + "scripts/cleanup.sh", + "../_common/minimize.sh" + ], + "type": "shell" + } + ], + "variables": { + "arch": "64", + "autoinst_cfg": "autoinst.xml", + "box_basename": "opensuse-leap-15.0", + "build_timestamp": "{{isotime \"20060102150405\"}}", + "cpus": "1", + "disk_size": "65536", + "git_revision": "__unknown_git_revision__", + "headless": "", + "http_proxy": "{{env `http_proxy`}}", + "https_proxy": "{{env `https_proxy`}}", + "iso_checksum": "c477428c7830ca76762d2f78603e13067c33952b936ff100189523e1fabe5a77", + "iso_checksum_type": "sha256", + "iso_name": "openSUSE-Leap-15.0-DVD-x86_64.iso", + "memory": "1024", + "mirror": "http://suse.mobile-central.org/distribution", + "mirror_directory": "leap/15.0/iso", + "name": "opensuse-leap-15.0", + "no_proxy": "{{env `no_proxy`}}", + "template": "opensuse-leap-15.0-x86_64", + "version": "TIMESTAMP" + } +} From 5477b1c05b3ff78171db6467bdd7dd65a6cb6373 Mon Sep 17 00:00:00 2001 From: Joshua Kugler <joshua@azariah.com> Date: Mon, 13 Aug 2018 10:10:48 -0800 Subject: [PATCH 0858/1622] Add CentOS 5 to the repo again Adds CentOS 5 once again, since some still must test on it Excludes SELinux Configures yum to use the Vault repos to install packages --- centos/centos-5.11-x86_64.json | 159 +++++++++++++++++++++++++++++++++ centos/http/5/ks.cfg | 3 + centos/scripts/enable_vault.sh | 38 ++++++++ 3 files changed, 200 insertions(+) create mode 100644 centos/centos-5.11-x86_64.json create mode 100644 centos/scripts/enable_vault.sh diff --git a/centos/centos-5.11-x86_64.json b/centos/centos-5.11-x86_64.json new file mode 100644 index 000000000..4954cef90 --- /dev/null +++ b/centos/centos-5.11-x86_64.json @@ -0,0 +1,159 @@ +{ + "builders": [ + { + "boot_command": [ + "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": "{{user `disk_size`}}", + "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "guest_os_type": "RedHat_64", + "hard_drive_interface": "sata", + "headless": "{{ user `headless` }}", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "../builds/packer-{{user `template`}}-virtualbox", + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "virtualbox-iso", + "vboxmanage": [ + [ + "modifyvm", + "{{.Name}}", + "--memory", + "{{ user `memory` }}" + ], + [ + "modifyvm", + "{{.Name}}", + "--cpus", + "1" + ] + ], + "virtualbox_version_file": ".vbox_version", + "vm_name": "{{ user `template` }}" + }, + { + "boot_command": [ + "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": "{{user `disk_size`}}", + "guest_os_type": "centos-64", + "headless": "{{ user `headless` }}", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "../builds/packer-{{user `template`}}-vmware", + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "tools_upload_flavor": "linux", + "type": "vmware-iso", + "vm_name": "{{ user `template` }}", + "vmx_data": { + "cpuid.coresPerSocket": "1", + "memsize": "{{ user `memory` }}", + "numvcpus": "{{ user `cpus` }}" + }, + "vmx_remove_ethernet_interfaces": true + }, + { + "boot_command": [ + "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": "{{user `disk_size`}}", + "guest_os_type": "centos", + "headless": "{{ user `headless` }}", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "../builds/packer-{{user `template`}}-parallels", + "parallels_tools_flavor": "lin", + "prlctl": [ + [ + "set", + "{{.Name}}", + "--memsize", + "{{ user `memory` }}" + ], + [ + "set", + "{{.Name}}", + "--cpus", + "{{ user `cpus` }}" + ] + ], + "prlctl_version_file": ".prlctl_version", + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "parallels-iso", + "vm_name": "{{ user `template` }}" + } + ], + "post-processors": [ + { + "output": "../builds/{{user `box_basename`}}.{{.Provider}}.box", + "type": "vagrant" + } + ], + "provisioners": [ + { + "environment_vars": [ + "HOME_DIR=/home/vagrant", + "http_proxy={{user `http_proxy`}}", + "https_proxy={{user `https_proxy`}}", + "no_proxy={{user `no_proxy`}}" + ], + "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", + "expect_disconnect": true, + "scripts": [ + "scripts/enable_vault.sh", + "scripts/update.sh", + "../_common/sshd.sh", + "scripts/networking.sh", + "../_common/vagrant.sh", + "../_common/virtualbox.sh", + "../_common/vmware.sh", + "../_common/parallels.sh", + "scripts/cleanup.sh", + "../_common/minimize.sh" + ], + "type": "shell" + } + ], + "variables": { + "box_basename": "centos-5.11", + "build_timestamp": "{{isotime \"20060102150405\"}}", + "cpus": "1", + "disk_size": "65536", + "git_revision": "__unknown_git_revision__", + "headless": "", + "http_proxy": "{{env `http_proxy`}}", + "https_proxy": "{{env `https_proxy`}}", + "iso_checksum": "b6eb0565b636513b90663ff01c6ec4da5058baff0d7d4007d187be997dd985f8", + "iso_checksum_type": "sha256", + "iso_name": "CentOS-5.11-x86_64-bin-DVD-1of2.iso", + "ks_path": "5/ks.cfg", + "memory": "1024", + "mirror": "https://archive.kernel.org/", + "mirror_directory": "centos-vault/5.11/isos/x86_64", + "name": "centos-5.11", + "no_proxy": "{{env `no_proxy`}}", + "template": "centos-5.11-x86_64", + "version": "TIMESTAMP" + } +} diff --git a/centos/http/5/ks.cfg b/centos/http/5/ks.cfg index 6fe9828ab..febcf7c2d 100644 --- a/centos/http/5/ks.cfg +++ b/centos/http/5/ks.cfg @@ -67,6 +67,9 @@ yum -rt73usb-firmware -xorg-x11-drv-ati-firmware -zd1211-firmware +# Not Needed +-selinux-policy +-selinux-policy-targeted %post # sudo diff --git a/centos/scripts/enable_vault.sh b/centos/scripts/enable_vault.sh new file mode 100644 index 000000000..8f352353f --- /dev/null +++ b/centos/scripts/enable_vault.sh @@ -0,0 +1,38 @@ +#!/bin/sh -eux + +for F in /etc/yum.repos.d/*.repo; do + #sed --in-place=.orig 's/enabled=1/enabled=0/' $F + echo "# EOL DISTRO - SETTINGS IN Bento-Vault.repo" > $F +done + +cat <<_EOF_ | cat > /etc/yum.repos.d/Bento-Vault.repo +#BENTO-BEGIN +[C5.11-base] +name=CentOS-5.11 - Base +baseurl=http://vault.centos.org/5.11/os/\$basearch/ +gpgcheck=1 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-5 +enabled=1 + +[C5.11-updates] +name=CentOS-5.11 - Updates +baseurl=http://vault.centos.org/5.11/updates/\$basearch/ +gpgcheck=1 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-5 +enabled=1 + +[C5.11-extras] +name=CentOS-5.11 - Extras +baseurl=http://vault.centos.org/5.11/extras/\$basearch/ +gpgcheck=1 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-5 +enabled=1 + +[C5.11-centosplus] +name=CentOS-5.11 - Plus +baseurl=http://vault.centos.org/5.11/centosplus/\$basearch/ +gpgcheck=1 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-5 +enabled=1 +#BENTO-END +_EOF_ From e9d69fe259a36304398d444e5c89f1c8eac2ba34 Mon Sep 17 00:00:00 2001 From: Joshua Kugler <joshua@azariah.com> Date: Mon, 13 Aug 2018 10:53:21 -0800 Subject: [PATCH 0859/1622] Additional fixes Added qemu and hyperv Removed the "headless" option from the parallels build since it is invalid. --- centos/centos-5.11-x86_64.json | 49 +++++++++++++++++++++++++++++++++- 1 file changed, 48 insertions(+), 1 deletion(-) diff --git a/centos/centos-5.11-x86_64.json b/centos/centos-5.11-x86_64.json index 4954cef90..3f104fa0a 100644 --- a/centos/centos-5.11-x86_64.json +++ b/centos/centos-5.11-x86_64.json @@ -73,7 +73,6 @@ "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", "guest_os_type": "centos", - "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", @@ -102,6 +101,53 @@ "ssh_wait_timeout": "10000s", "type": "parallels-iso", "vm_name": "{{ user `template` }}" + }, + { + "boot_command": [ + "<wait5><tab> text ks=hd:fd0:/ks.cfg<enter><wait5><esc>" + ], + "boot_wait": "10s", + "cpu": "{{ user `cpus` }}", + "disk_size": "{{user `disk_size`}}", + "floppy_files": [ + "../centos/http/{{user `ks_path`}}" + ], + "generation": "{{user `hyperv_generation`}}", + "guest_additions_mode": "disable", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "../builds/packer-{{user `template`}}-hyperv", + "ram_size": "{{ user `memory` }}", + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_timeout": "10000s", + "ssh_username": "vagrant", + "switch_name": "{{ user `hyperv_switch`}}", + "type": "hyperv-iso", + "vm_name": "{{ user `template` }}" + }, + { + "boot_command": [ + "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": "{{user `disk_size`}}", + "headless": "{{ user `headless` }}", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "../builds/packer-{{user `template`}}-qemu", + "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "qemu", + "vm_name": "{{ user `template` }}" } ], "post-processors": [ @@ -144,6 +190,7 @@ "headless": "", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", + "hyperv_generation": "1", "iso_checksum": "b6eb0565b636513b90663ff01c6ec4da5058baff0d7d4007d187be997dd985f8", "iso_checksum_type": "sha256", "iso_name": "CentOS-5.11-x86_64-bin-DVD-1of2.iso", From 27762c7bd527616edf7a016d947779d1c395e5e6 Mon Sep 17 00:00:00 2001 From: Joshua Kugler <joshua@azariah.com> Date: Mon, 13 Aug 2018 22:09:27 -0800 Subject: [PATCH 0860/1622] Add the i386 C5 template back in --- centos/centos-5.11-i386.json | 206 +++++++++++++++++++++++++++++++++++ 1 file changed, 206 insertions(+) create mode 100644 centos/centos-5.11-i386.json diff --git a/centos/centos-5.11-i386.json b/centos/centos-5.11-i386.json new file mode 100644 index 000000000..5c22d6d03 --- /dev/null +++ b/centos/centos-5.11-i386.json @@ -0,0 +1,206 @@ +{ + "builders": [ + { + "boot_command": [ + "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": "{{user `disk_size`}}", + "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "guest_os_type": "RedHat", + "hard_drive_interface": "sata", + "headless": "{{ user `headless` }}", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "../builds/packer-{{user `template`}}-virtualbox", + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "virtualbox-iso", + "vboxmanage": [ + [ + "modifyvm", + "{{.Name}}", + "--memory", + "{{ user `memory` }}" + ], + [ + "modifyvm", + "{{.Name}}", + "--cpus", + "1" + ] + ], + "virtualbox_version_file": ".vbox_version", + "vm_name": "{{ user `template` }}" + }, + { + "boot_command": [ + "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": "{{user `disk_size`}}", + "guest_os_type": "centos", + "headless": "{{ user `headless` }}", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "../builds/packer-{{user `template`}}-vmware", + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "tools_upload_flavor": "linux", + "type": "vmware-iso", + "vm_name": "{{ user `template` }}", + "vmx_data": { + "cpuid.coresPerSocket": "1", + "memsize": "{{ user `memory` }}", + "numvcpus": "{{ user `cpus` }}" + }, + "vmx_remove_ethernet_interfaces": true + }, + { + "boot_command": [ + "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": "{{user `disk_size`}}", + "guest_os_type": "centos", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "../builds/packer-{{user `template`}}-parallels", + "parallels_tools_flavor": "lin", + "prlctl": [ + [ + "set", + "{{.Name}}", + "--memsize", + "{{ user `memory` }}" + ], + [ + "set", + "{{.Name}}", + "--cpus", + "{{ user `cpus` }}" + ] + ], + "prlctl_version_file": ".prlctl_version", + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "parallels-iso", + "vm_name": "{{ user `template` }}" + }, + { + "boot_command": [ + "<wait5><tab> text ks=hd:fd0:/ks.cfg<enter><wait5><esc>" + ], + "boot_wait": "10s", + "cpu": "{{ user `cpus` }}", + "disk_size": "{{user `disk_size`}}", + "floppy_files": [ + "../centos/http/{{user `ks_path`}}" + ], + "generation": "{{user `hyperv_generation`}}", + "guest_additions_mode": "disable", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "../builds/packer-{{user `template`}}-hyperv", + "ram_size": "{{ user `memory` }}", + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_timeout": "10000s", + "ssh_username": "vagrant", + "switch_name": "{{ user `hyperv_switch`}}", + "type": "hyperv-iso", + "vm_name": "{{ user `template` }}" + }, + { + "boot_command": [ + "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": "{{user `disk_size`}}", + "headless": "{{ user `headless` }}", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "../builds/packer-{{user `template`}}-qemu", + "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "qemu", + "vm_name": "{{ user `template` }}" + } + ], + "post-processors": [ + { + "output": "../builds/{{user `box_basename`}}.{{.Provider}}.box", + "type": "vagrant" + } + ], + "provisioners": [ + { + "environment_vars": [ + "HOME_DIR=/home/vagrant", + "http_proxy={{user `http_proxy`}}", + "https_proxy={{user `https_proxy`}}", + "no_proxy={{user `no_proxy`}}" + ], + "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", + "expect_disconnect": true, + "scripts": [ + "scripts/enable_vault.sh", + "scripts/update.sh", + "../_common/sshd.sh", + "scripts/networking.sh", + "../_common/vagrant.sh", + "../_common/virtualbox.sh", + "../_common/vmware.sh", + "../_common/parallels.sh", + "scripts/cleanup.sh", + "../_common/minimize.sh" + ], + "type": "shell" + } + ], + "variables": { + "box_basename": "centos-5.11-i386", + "build_timestamp": "{{isotime \"20060102150405\"}}", + "cpus": "1", + "disk_size": "65536", + "git_revision": "__unknown_git_revision__", + "headless": "", + "http_proxy": "{{env `http_proxy`}}", + "https_proxy": "{{env `https_proxy`}}", + "hyperv_generation": "1", + "iso_checksum": "66d7aa1be7f7aa327b823a706b04b37e219cea67c4eadd9185e8de5e3c4fb08d", + "iso_checksum_type": "sha256", + "iso_name": "CentOS-5.11-i386-bin-DVD-1of2.iso", + "ks_path": "5/ks.cfg", + "memory": "1024", + "mirror": "https://archive.kernel.org/", + "mirror_directory": "centos-vault/5.11/isos/i386", + "name": "centos-5.11-i386", + "no_proxy": "{{env `no_proxy`}}", + "template": "centos-5.11-i386", + "version": "TIMESTAMP" + } +} From 9978421c40124a768d896e2f00534e816836efa0 Mon Sep 17 00:00:00 2001 From: Seth Thomas <sthomas@chef.io> Date: Tue, 14 Aug 2018 09:24:42 -0600 Subject: [PATCH 0861/1622] Don't need to use checksum_url for release builds Signed-off-by: Seth Thomas <sthomas@chef.io> --- ubuntu/ubuntu-18.04-amd64.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/ubuntu/ubuntu-18.04-amd64.json b/ubuntu/ubuntu-18.04-amd64.json index 8021285d2..57d0a9fa8 100644 --- a/ubuntu/ubuntu-18.04-amd64.json +++ b/ubuntu/ubuntu-18.04-amd64.json @@ -33,7 +33,7 @@ "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", "http_directory": "http", - "iso_checksum_url": "{{user `mirror`}}/{{user `mirror_directory`}}/SHA256SUMS", + "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", "output_directory": "../builds/packer-{{user `template`}}-virtualbox", @@ -91,7 +91,7 @@ "guest_os_type": "ubuntu-64", "headless": "{{ user `headless` }}", "http_directory": "http", - "iso_checksum_url": "{{user `mirror`}}/{{user `mirror_directory`}}/SHA256SUMS", + "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", "output_directory": "../builds/packer-{{user `template`}}-vmware", @@ -141,7 +141,7 @@ "disk_size": "{{user `disk_size`}}", "guest_os_type": "ubuntu", "http_directory": "http", - "iso_checksum_url": "{{user `mirror`}}/{{user `mirror_directory`}}/SHA256SUMS", + "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", "output_directory": "../builds/packer-{{user `template`}}-parallels", @@ -199,7 +199,7 @@ "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", "http_directory": "http", - "iso_checksum_url": "{{user `mirror`}}/{{user `mirror_directory`}}/SHA256SUMS", + "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", "output_directory": "../builds/packer-{{user `template`}}-qemu", @@ -242,7 +242,7 @@ "enable_secure_boot": false, "generation": "{{user `hyperv_generation`}}", "http_directory": "http", - "iso_checksum_url": "{{user `mirror`}}/{{user `mirror_directory`}}/SHA256SUMS", + "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", "output_directory": "../builds/packer-{{user `template`}}-hyperv", From 367a287839757524f6d0ab46465d3b1eae8b3a31 Mon Sep 17 00:00:00 2001 From: Seth Thomas <sthomas@chef.io> Date: Tue, 14 Aug 2018 11:26:10 -0600 Subject: [PATCH 0862/1622] Add the name key for FreeBSD 11.2, fix build/upload Signed-off-by: Seth Thomas <sthomas@chef.io> --- freebsd/freebsd-11.2-amd64.json | 1 + 1 file changed, 1 insertion(+) diff --git a/freebsd/freebsd-11.2-amd64.json b/freebsd/freebsd-11.2-amd64.json index e99a7383e..09814d8d7 100644 --- a/freebsd/freebsd-11.2-amd64.json +++ b/freebsd/freebsd-11.2-amd64.json @@ -220,6 +220,7 @@ "memory": "1024", "mirror": "https://download.freebsd.org/ftp", "mirror_directory": "releases/amd64/amd64/ISO-IMAGES/11.2", + "name": "freebsd-11.2", "no_proxy": "{{env `no_proxy`}}", "pkg_branch": "quarterly", "template": "freebsd-11.2-amd64", From 7000387b9f2a56de6e551da9e3a510a99002972f Mon Sep 17 00:00:00 2001 From: Seth Thomas <sthomas@chef.io> Date: Tue, 14 Aug 2018 12:24:04 -0600 Subject: [PATCH 0863/1622] Don't include the patch release in name Signed-off-by: Seth Thomas <sthomas@chef.io> --- ubuntu/ubuntu-18.04-amd64.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ubuntu/ubuntu-18.04-amd64.json b/ubuntu/ubuntu-18.04-amd64.json index 57d0a9fa8..881abdd36 100644 --- a/ubuntu/ubuntu-18.04-amd64.json +++ b/ubuntu/ubuntu-18.04-amd64.json @@ -306,7 +306,7 @@ "memory": "1024", "mirror": "http://cdimage.ubuntu.com", "mirror_directory": "ubuntu/releases/18.04.1/release", - "name": "ubuntu-18.04.1", + "name": "ubuntu-18.04", "no_proxy": "{{env `no_proxy`}}", "preseed_path": "preseed.cfg", "template": "ubuntu-18.04-amd64", From 3b59bd4451c90d048f4f7c8e5c969f6a63ee263e Mon Sep 17 00:00:00 2001 From: Joshua Kugler <joshua@azariah.com> Date: Wed, 22 Aug 2018 16:38:59 -0800 Subject: [PATCH 0864/1622] Add curl to CentOS 5 install It is already installed in 6 and 7 by default. Adding it to the CentOS 5 kickstart so it will be installed there too. --- centos/http/5/ks.cfg | 1 + 1 file changed, 1 insertion(+) diff --git a/centos/http/5/ks.cfg b/centos/http/5/ks.cfg index febcf7c2d..2884f561f 100644 --- a/centos/http/5/ks.cfg +++ b/centos/http/5/ks.cfg @@ -24,6 +24,7 @@ key --skip openssh-clients openssh-server bzip2 +curl dhclient gcc kernel-devel From 9eacaf024114ab1f0d690b7ebb9cc52a6b1ecfd6 Mon Sep 17 00:00:00 2001 From: Seth Thomas <sthomas@chef.io> Date: Thu, 23 Aug 2018 11:07:31 -0600 Subject: [PATCH 0865/1622] Update builds: add centos 5.11 and opensuse 15, remove provider section Signed-off-by: Seth Thomas <sthomas@chef.io> --- builds.yml | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/builds.yml b/builds.yml index 807dc8643..26f4b9655 100644 --- a/builds.yml +++ b/builds.yml @@ -1,12 +1,8 @@ --- -providers: - - parallels-iso - - virtualbox-iso - - vmware-iso - public: - 'centos-7.5' - 'centos-6.10' +- 'centos-5.11' - 'ubuntu-18.04' - 'ubuntu-16.04' - 'ubuntu-14.04' @@ -17,20 +13,22 @@ public: - 'fedora-28' - 'fedora-27' - 'opensuse-leap-42.3' +- 'opensuse-leap-15.0' - 'freebsd-11.2' - 'freebsd-10.4' - 'hardenedbsd-11' - 'centos-6.10-i386' +- 'centos-5.11-i386' - 'oracle-6.10-i386' - 'ubuntu-16.04-i386' - 'ubuntu-14.04-i386' - 'debian-8.11-i386' - 'debian-9.5-i386' -- 'freebsd-11.2-i386' slugs: 'centos-7': 'centos-7.5' 'centos-6': 'centos-6.10' + 'centos-5': 'centos-5.11' 'debian-9': 'debian-9.5' 'debian-8': 'debian-8.11' 'oracle-7': 'oracle-7.5' @@ -38,3 +36,4 @@ slugs: 'freebsd-11': 'freebsd-11.2' 'freebsd-10': 'freebsd-10.4' 'opensuse-leap-42': 'opensuse-leap-42.3' + 'opensuse-leap-15': 'opensuse-leap-15.0' From cc1d6351a9a726a512d858f6edf9372a09744c9a Mon Sep 17 00:00:00 2001 From: Seth Thomas <sthomas@chef.io> Date: Fri, 24 Aug 2018 21:01:03 -0600 Subject: [PATCH 0866/1622] Adding name field to fix build/upload Signed-off-by: Seth Thomas <sthomas@chef.io> --- hardenedbsd/hardenedbsd-11-amd64.json | 1 + 1 file changed, 1 insertion(+) diff --git a/hardenedbsd/hardenedbsd-11-amd64.json b/hardenedbsd/hardenedbsd-11-amd64.json index 1d426b33d..b4938d74d 100644 --- a/hardenedbsd/hardenedbsd-11-amd64.json +++ b/hardenedbsd/hardenedbsd-11-amd64.json @@ -219,6 +219,7 @@ "memory": "1024", "mirror": "https://installer.hardenedbsd.org", "mirror_directory": "pub/HardenedBSD/releases/amd64/amd64/ISO-IMAGES/hardenedbsd-11-stable-20180420-1", + "name": "hardenedbsd-11", "no_proxy": "{{env `no_proxy`}}", "template": "hardenedbsd-11-amd64", "version": "TIMESTAMP" From 8eef8e85011cd940e9a5566acec73c44997594fc Mon Sep 17 00:00:00 2001 From: Seth Thomas <sthomas@chef.io> Date: Sun, 26 Aug 2018 19:47:43 -0600 Subject: [PATCH 0867/1622] Fix oracle-6 slug Signed-off-by: Seth Thomas <sthomas@chef.io> --- builds.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/builds.yml b/builds.yml index 26f4b9655..4e09a21cc 100644 --- a/builds.yml +++ b/builds.yml @@ -32,7 +32,7 @@ slugs: 'debian-9': 'debian-9.5' 'debian-8': 'debian-8.11' 'oracle-7': 'oracle-7.5' - 'centos-6': 'oracle-6.10' + 'oracle-6': 'oracle-6.10' 'freebsd-11': 'freebsd-11.2' 'freebsd-10': 'freebsd-10.4' 'opensuse-leap-42': 'opensuse-leap-42.3' From 6e5dbcf604e401a4c0dc9123b4de41fe03be6981 Mon Sep 17 00:00:00 2001 From: Seth Thomas <sthomas@chef.io> Date: Sun, 2 Sep 2018 13:46:42 -0600 Subject: [PATCH 0868/1622] Release v201808.24.0 Signed-off-by: Seth Thomas <sthomas@chef.io> --- CHANGELOG.md | 11 ++++++++++- README.md | 20 ++++++++++---------- 2 files changed, 20 insertions(+), 11 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index aa0f61f80..cac11ec07 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,15 @@ # Change Log -## ## [v201807.12.0](https://github.com/chef/bento/tree/v201807.12.0) (2018-07-16) +## [v201808.24.0](https://github.com/chef/bento/tree/v201808.24.0) (2018-09-02) + +[Full Changelog](https://github.com/chef/bento/compare/v201807.12.0...v201808.24.0) + +**New Platforms** + +- CentOS 5.11 (resurrected) +- OpenSUSE 15 + +## [v201807.12.0](https://github.com/chef/bento/tree/v201807.12.0) (2018-07-16) [Full Changelog](https://github.com/chef/bento/compare/v201806.08.0...v201807.12.0) diff --git a/README.md b/README.md index 1deddf985..7ea979821 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ [![Build Status](http://img.shields.io/travis/chef/bento.svg)][travis] -Bento is a project that encapsulates [Packer](https://www.packer.io/) templates for building [Vagrant](https://www.vagrantup.com/) base boxes. A subset of templates are built and published to the [bento org](https://app.vagrantup.com/bento) on Vagrant Cloud. The boxes also serve as default boxes for [kitchen-vagrant](https://github.com/test-kitchen/kitchen-vagrant/). +Bento is a project that encapsulates [Packer](https://www.packer.io/) templates for building [Vagrant](https://www.vagrantup.com/) base boxes. A subset of templates are built and published to the [bento org](https://app.vagrantup.com/bento) on Vagrant Cloud. These published boxes serve as the default boxes for [kitchen-vagrant](https://github.com/test-kitchen/kitchen-vagrant/). ### Using Public Boxes @@ -75,7 +75,7 @@ Templates for operating systems only available via license or subscription are a ### Networking/Firewalls -Most of the providers need somewhat unrestricted access to networking in order to build as expected. We can't enumerate all possible firewall configurations but include some snippets below that might be useful to users. +Most of the providers expect unrestricted access to networking in order to build as expected. We can't enumerate all possible firewall configurations but include some snippets below that might be useful to users. #### Windows @@ -87,19 +87,19 @@ New-NetFirewallRule -Displayname "Allow incomming from $VS" -Direction Inbound - #### macOS / OSX -See our [wiki page](https://github.com/chef/bento/wiki/macOS) - -#### Windows - -The project does not include many definitions for building Windows boxes. For other approaches to building Windows boxes, please see the following community projects: - -- [Mischa Taylor's Boxcutter project](https://github.com/boxcutter) -- [Vagrant Windows Boxes and Puppet](https://github.com/ferventcoder/vagrant-windows-puppet/tree/master/baseboxes) +See this [wiki page](https://github.com/chef/bento/wiki/macOS) ## Bugs and Issues Please use GitHub issues to report bugs, features, or other problems. +## Related projects + +* https://github.com/boxcutter +* https://github.com/mcandre/packer-templates +* https://github.com/timsutton/osx-vm-templates +* https://github.com/ferventcoder/vagrant-windows-puppet/tree/master/baseboxes + ## License & Authors These basebox templates were converted from [veewee](https://github.com/jedi4ever/veewee) definitions originally based on [work done by Tim Dysinger](https://github.com/dysinger/basebox) to make "Don't Repeat Yourself" (DRY) modular baseboxes. Thanks Tim! From 8f43413dc7886052bf545cfb01f0ca2807bffa3d Mon Sep 17 00:00:00 2001 From: "Julian C. Dunn" <jdunn@chef.io> Date: Wed, 3 Oct 2018 10:16:24 -0500 Subject: [PATCH 0869/1622] Remove EOL FreeBSD 11.1 Signed-off-by: Julian C. Dunn <jdunn@chef.io> --- freebsd/freebsd-11.1-amd64.json | 229 -------------------------------- freebsd/freebsd-11.1-i386.json | 229 -------------------------------- 2 files changed, 458 deletions(-) delete mode 100644 freebsd/freebsd-11.1-amd64.json delete mode 100644 freebsd/freebsd-11.1-i386.json diff --git a/freebsd/freebsd-11.1-amd64.json b/freebsd/freebsd-11.1-amd64.json deleted file mode 100644 index c365e0907..000000000 --- a/freebsd/freebsd-11.1-amd64.json +++ /dev/null @@ -1,229 +0,0 @@ -{ - "builders": [ - { - "boot_command": [ - "<esc><wait>", - "boot -s<wait>", - "<enter><wait>", - "<wait10><wait10>", - "/bin/sh<enter><wait>", - "mdmfs -s 100m md1 /tmp<enter><wait>", - "mdmfs -s 100m md2 /mnt<enter><wait>", - "dhclient -l /tmp/dhclient.lease.em0 em0<enter><wait>", - "fetch -o /tmp/installerconfig http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} && bsdinstall script /tmp/installerconfig<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "guest_additions_mode": "disable", - "guest_os_type": "FreeBSD_64", - "headless": "{{ user `headless` }}", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../builds/packer-{{user `template`}}-virtualbox", - "shutdown_command": "echo 'vagrant' | su -m root -c 'shutdown -p now'", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "virtualbox-iso", - "vboxmanage": [ - [ - "modifyvm", - "{{.Name}}", - "--memory", - "{{ user `memory` }}" - ], - [ - "modifyvm", - "{{.Name}}", - "--cpus", - "{{ user `cpus` }}" - ] - ], - "virtualbox_version_file": ".vbox_version", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<esc><wait>", - "boot -s<wait>", - "<enter><wait>", - "<wait10><wait10>", - "/bin/sh<enter><wait>", - "mdmfs -s 100m md1 /tmp<enter><wait>", - "mdmfs -s 100m md2 /mnt<enter><wait>", - "dhclient -l /tmp/dhclient.lease.em0 em0<enter><wait>", - "<wait5>", - "fetch -o /tmp/installerconfig http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} && bsdinstall script /tmp/installerconfig<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "freebsd-64", - "headless": "{{ user `headless` }}", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../builds/packer-{{user `template`}}-vmware", - "shutdown_command": "echo 'vagrant' | su -m root -c 'shutdown -p now'", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "vmware-iso", - "vm_name": "{{ user `template` }}", - "vmx_data": { - "cpuid.coresPerSocket": "1", - "memsize": "{{ user `memory` }}", - "numvcpus": "{{ user `cpus` }}" - }, - "vmx_remove_ethernet_interfaces": true - }, - { - "boot_command": [ - "<esc><wait>", - "boot -s<wait>", - "<enter><wait>", - "<wait10><wait10>", - "/bin/sh<enter><wait>", - "mdmfs -s 100m md1 /tmp<enter><wait>", - "mdmfs -s 100m md2 /mnt<enter><wait>", - "dhclient -l /tmp/dhclient.lease.em0 em0<enter><wait>", - "fetch -o /tmp/installerconfig http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} && bsdinstall script /tmp/installerconfig<enter><wait>" - ], - "boot_wait": "8s", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "freebsd", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../builds/packer-{{user `template`}}-parallels", - "parallels_tools_mode": "disable", - "prlctl": [ - [ - "set", - "{{.Name}}", - "--memsize", - "{{ user `memory` }}" - ], - [ - "set", - "{{.Name}}", - "--cpus", - "{{ user `cpus` }}" - ], - [ - "set", - "{{.Name}}", - "--device-set", - "cdrom0", - "--iface", - "ide" - ], - [ - "set", - "{{.Name}}", - "--device-del", - "fdd0" - ], - [ - "set", - "{{.Name}}", - "--device-del", - "parallel0" - ] - ], - "prlctl_version_file": ".prlctl_version", - "shutdown_command": "echo 'vagrant' | su -m root -c 'shutdown -p now'", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "parallels-iso", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<esc><wait>", - "boot -s<wait>", - "<enter><wait>", - "<wait10><wait10>", - "/bin/sh<enter><wait>", - "mdmfs -s 100m md1 /tmp<enter><wait>", - "mdmfs -s 100m md2 /mnt<enter><wait>", - "dhclient -l /tmp/dhclient.lease.vtnet0 vtnet0<enter><wait>", - "fetch -o /tmp/installerconfig http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} && bsdinstall script /tmp/installerconfig<enter><wait>" - ], - "boot_wait": "7s", - "disk_size": "{{user `disk_size`}}", - "headless": "{{ user `headless` }}", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../builds/packer-{{user `template`}}-qemu", - "shutdown_command": "echo 'vagrant' | su -m root -c 'shutdown -p now'", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "qemu", - "vm_name": "{{ user `template` }}" - } - ], - "post-processors": [ - { - "output": "../builds/{{user `box_basename`}}.{{.Provider}}.box", - "type": "vagrant", - "vagrantfile_template": "vagrantfile_templates/freebsd.rb" - } - ], - "provisioners": [ - { - "environment_vars": [ - "HOME_DIR=/home/vagrant", - "http_proxy={{user `http_proxy`}}", - "https_proxy={{user `https_proxy`}}", - "no_proxy={{user `no_proxy`}}", - "pkg_branch={{user `pkg_branch`}}" - ], - "execute_command": "echo 'vagrant' | {{.Vars}} su -m root -c 'sh -eux {{.Path}}'", - "expect_disconnect": true, - "scripts": [ - "scripts/update.sh", - "scripts/postinstall.sh", - "scripts/sudoers.sh", - "../_common/vagrant.sh", - "scripts/vmtools.sh", - "scripts/cleanup.sh", - "scripts/minimize.sh" - ], - "type": "shell" - } - ], - "variables": { - "box_basename": "freebsd-11.1", - "build_timestamp": "{{isotime \"20060102150405\"}}", - "cpus": "1", - "disk_size": "65536", - "git_revision": "__unknown_git_revision__", - "headless": "", - "http_proxy": "{{env `http_proxy`}}", - "https_proxy": "{{env `https_proxy`}}", - "install_path": "freebsd-11/installerconfig", - "iso_checksum": "ff4c749ea0aaaceedb2432ba3e0fd0c1b64f5a72141b1ec06b9ced52b5de0dbf", - "iso_checksum_type": "sha256", - "iso_name": "FreeBSD-11.1-RELEASE-amd64-disc1.iso", - "memory": "1024", - "mirror": "https://download.freebsd.org/ftp", - "mirror_directory": "releases/amd64/amd64/ISO-IMAGES/11.1", - "no_proxy": "{{env `no_proxy`}}", - "pkg_branch": "quarterly", - "template": "freebsd-11.1-amd64", - "version": "TIMESTAMP" - } -} - diff --git a/freebsd/freebsd-11.1-i386.json b/freebsd/freebsd-11.1-i386.json deleted file mode 100644 index 0b78967e5..000000000 --- a/freebsd/freebsd-11.1-i386.json +++ /dev/null @@ -1,229 +0,0 @@ -{ - "builders": [ - { - "boot_command": [ - "<esc><wait>", - "boot -s<wait>", - "<enter><wait>", - "<wait10><wait10>", - "/bin/sh<enter><wait>", - "mdmfs -s 100m md1 /tmp<enter><wait>", - "mdmfs -s 100m md2 /mnt<enter><wait>", - "dhclient -l /tmp/dhclient.lease.em0 em0<enter><wait>", - "fetch -o /tmp/installerconfig http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} && bsdinstall script /tmp/installerconfig<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "guest_additions_mode": "disable", - "guest_os_type": "FreeBSD", - "headless": "{{ user `headless` }}", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../builds/packer-{{user `template`}}-virtualbox", - "shutdown_command": "echo 'vagrant' | su -m root -c 'shutdown -p now'", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "virtualbox-iso", - "vboxmanage": [ - [ - "modifyvm", - "{{.Name}}", - "--memory", - "{{ user `memory` }}" - ], - [ - "modifyvm", - "{{.Name}}", - "--cpus", - "{{ user `cpus` }}" - ] - ], - "virtualbox_version_file": ".vbox_version", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<esc><wait>", - "boot -s<wait>", - "<enter><wait>", - "<wait10><wait10>", - "/bin/sh<enter><wait>", - "mdmfs -s 100m md1 /tmp<enter><wait>", - "mdmfs -s 100m md2 /mnt<enter><wait>", - "dhclient -l /tmp/dhclient.lease.em0 em0<enter><wait>", - "<wait5>", - "fetch -o /tmp/installerconfig http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} && bsdinstall script /tmp/installerconfig<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "freebsd", - "headless": "{{ user `headless` }}", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../builds/packer-{{user `template`}}-vmware", - "shutdown_command": "echo 'vagrant' | su -m root -c 'shutdown -p now'", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "vmware-iso", - "vm_name": "{{ user `template` }}", - "vmx_data": { - "cpuid.coresPerSocket": "1", - "memsize": "{{ user `memory` }}", - "numvcpus": "{{ user `cpus` }}" - }, - "vmx_remove_ethernet_interfaces": true - }, - { - "boot_command": [ - "<esc><wait>", - "boot -s<wait>", - "<enter><wait>", - "<wait10><wait10>", - "/bin/sh<enter><wait>", - "mdmfs -s 100m md1 /tmp<enter><wait>", - "mdmfs -s 100m md2 /mnt<enter><wait>", - "dhclient -l /tmp/dhclient.lease.em0 em0<enter><wait>", - "fetch -o /tmp/installerconfig http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} && bsdinstall script /tmp/installerconfig<enter><wait>" - ], - "boot_wait": "8s", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "freebsd", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../builds/packer-{{user `template`}}-parallels", - "parallels_tools_mode": "disable", - "prlctl": [ - [ - "set", - "{{.Name}}", - "--memsize", - "{{ user `memory` }}" - ], - [ - "set", - "{{.Name}}", - "--cpus", - "{{ user `cpus` }}" - ], - [ - "set", - "{{.Name}}", - "--device-set", - "cdrom0", - "--iface", - "ide" - ], - [ - "set", - "{{.Name}}", - "--device-del", - "fdd0" - ], - [ - "set", - "{{.Name}}", - "--device-del", - "parallel0" - ] - ], - "prlctl_version_file": ".prlctl_version", - "shutdown_command": "echo 'vagrant' | su -m root -c 'shutdown -p now'", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "parallels-iso", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<esc><wait>", - "boot -s<wait>", - "<enter><wait>", - "<wait10><wait10>", - "/bin/sh<enter><wait>", - "mdmfs -s 100m md1 /tmp<enter><wait>", - "mdmfs -s 100m md2 /mnt<enter><wait>", - "dhclient -l /tmp/dhclient.lease.vtnet0 vtnet0<enter><wait>", - "fetch -o /tmp/installerconfig http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} && bsdinstall script /tmp/installerconfig<enter><wait>" - ], - "boot_wait": "7s", - "disk_size": "{{user `disk_size`}}", - "headless": "{{ user `headless` }}", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../builds/packer-{{user `template`}}-qemu", - "shutdown_command": "echo 'vagrant' | su -m root -c 'shutdown -p now'", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "qemu", - "vm_name": "{{ user `template` }}" - } - ], - "post-processors": [ - { - "output": "../builds/{{user `box_basename`}}.{{.Provider}}.box", - "type": "vagrant", - "vagrantfile_template": "vagrantfile_templates/freebsd.rb" - } - ], - "provisioners": [ - { - "environment_vars": [ - "HOME_DIR=/home/vagrant", - "http_proxy={{user `http_proxy`}}", - "https_proxy={{user `https_proxy`}}", - "no_proxy={{user `no_proxy`}}", - "pkg_branch={{user `pkg_branch`}}" - ], - "execute_command": "echo 'vagrant' | {{.Vars}} su -m root -c 'sh -eux {{.Path}}'", - "expect_disconnect": true, - "scripts": [ - "scripts/update.sh", - "scripts/postinstall.sh", - "scripts/sudoers.sh", - "../_common/vagrant.sh", - "scripts/vmtools.sh", - "scripts/cleanup.sh", - "scripts/minimize.sh" - ], - "type": "shell" - } - ], - "variables": { - "box_basename": "freebsd-11.1-i386", - "build_timestamp": "{{isotime \"20060102150405\"}}", - "cpus": "1", - "disk_size": "40960", - "git_revision": "__unknown_git_revision__", - "headless": "", - "http_proxy": "{{env `http_proxy`}}", - "https_proxy": "{{env `https_proxy`}}", - "install_path": "freebsd-11/installerconfig", - "iso_checksum": "e53ae5fc58fd2e28643ba4c64e2c49505cf9d84d22396e3633ee9670782aab57", - "iso_checksum_type": "sha256", - "iso_name": "FreeBSD-11.1-RELEASE-i386-disc1.iso", - "memory": "1024", - "mirror": "https://download.freebsd.org/ftp", - "mirror_directory": "releases/i386/i386/ISO-IMAGES/11.1", - "no_proxy": "{{env `no_proxy`}}", - "pkg_branch": "quarterly", - "template": "freebsd-11.1-i386", - "version": "TIMESTAMP" - } -} - From f7bc4690260d4ce2384f4920c4b870b78eff9d68 Mon Sep 17 00:00:00 2001 From: Max Arnold <arnold.maxim@gmail.com> Date: Tue, 9 Oct 2018 08:54:47 +0700 Subject: [PATCH 0870/1622] Fix startup mount error on Parallels 14 guest tools --- _common/parallels.sh | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/_common/parallels.sh b/_common/parallels.sh index 16b36442e..1b2a6896a 100644 --- a/_common/parallels.sh +++ b/_common/parallels.sh @@ -20,5 +20,16 @@ parallels-iso|parallels-pvm) umount /tmp/parallels; rm -rf /tmp/parallels; rm -f $HOME_DIR/*.iso; + + # Parallels Tools for Linux includes native auto-mount script, + # which causes losing some of Vagrant-relative shared folders. + # So, we should disable this behavior. + # https://github.com/Parallels/vagrant-parallels/issues/325#issuecomment-418727113 + auto_mount_script='/usr/bin/prlfsmountd' + if [ -f "${auto_mount_script}" ]; then + echo -e '#!/bin/sh\n'\ + '# Shared folders auto-mount is disabled by Vagrant ' \ + > "${auto_mount_script}" + fi ;; esac From 39568986895b86c33b2f4d705d60b0303ffff615 Mon Sep 17 00:00:00 2001 From: "Chen-Han Hsiao (Stanley)" <chenhan.hsiao.tw@gmail.com> Date: Fri, 19 Oct 2018 12:51:40 +0800 Subject: [PATCH 0871/1622] Add ubuntu 18.10 support --- ubuntu/ubuntu-18.10-amd64.json | 315 +++++++++++++++++++++++++++++++++ 1 file changed, 315 insertions(+) create mode 100644 ubuntu/ubuntu-18.10-amd64.json diff --git a/ubuntu/ubuntu-18.10-amd64.json b/ubuntu/ubuntu-18.10-amd64.json new file mode 100644 index 000000000..f442c0835 --- /dev/null +++ b/ubuntu/ubuntu-18.10-amd64.json @@ -0,0 +1,315 @@ +{ + "builders": [ + { + "boot_command": [ + "<esc><wait>", + "<esc><wait>", + "<enter><wait>", + "/install/vmlinuz<wait>", + " auto<wait>", + " console-setup/ask_detect=false<wait>", + " console-setup/layoutcode=us<wait>", + " console-setup/modelcode=pc105<wait>", + " debconf/frontend=noninteractive<wait>", + " debian-installer=en_US.UTF-8<wait>", + " fb=false<wait>", + " initrd=/install/initrd.gz<wait>", + " kbd-chooser/method=us<wait>", + " keyboard-configuration/layout=USA<wait>", + " keyboard-configuration/variant=USA<wait>", + " locale=en_US.UTF-8<wait>", + " netcfg/get_domain=vm<wait>", + " netcfg/get_hostname=vagrant<wait>", + " grub-installer/bootdev=/dev/sda<wait>", + " noapic<wait>", + " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}}<wait>", + " -- <wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": "{{user `disk_size`}}", + "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "guest_os_type": "Ubuntu_64", + "hard_drive_interface": "sata", + "headless": "{{ user `headless` }}", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "../builds/packer-{{user `template`}}-virtualbox", + "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "virtualbox-iso", + "vboxmanage": [ + [ + "modifyvm", + "{{.Name}}", + "--memory", + "{{ user `memory` }}" + ], + [ + "modifyvm", + "{{.Name}}", + "--cpus", + "{{ user `cpus` }}" + ] + ], + "virtualbox_version_file": ".vbox_version", + "vm_name": "{{ user `template` }}" + }, + { + "boot_command": [ + "<esc><wait>", + "<esc><wait>", + "<enter><wait>", + "/install/vmlinuz<wait>", + " auto<wait>", + " console-setup/ask_detect=false<wait>", + " console-setup/layoutcode=us<wait>", + " console-setup/modelcode=pc105<wait>", + " debconf/frontend=noninteractive<wait>", + " debian-installer=en_US.UTF-8<wait>", + " fb=false<wait>", + " initrd=/install/initrd.gz<wait>", + " kbd-chooser/method=us<wait>", + " keyboard-configuration/layout=USA<wait>", + " keyboard-configuration/variant=USA<wait>", + " locale=en_US.UTF-8<wait>", + " netcfg/get_domain=vm<wait>", + " netcfg/get_hostname=vagrant<wait>", + " grub-installer/bootdev=/dev/sda<wait>", + " noapic<wait>", + " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}}<wait>", + " -- <wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": "{{user `disk_size`}}", + "guest_os_type": "ubuntu-64", + "headless": "{{ user `headless` }}", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "../builds/packer-{{user `template`}}-vmware", + "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "tools_upload_flavor": "linux", + "type": "vmware-iso", + "vm_name": "{{ user `template` }}", + "vmx_data": { + "cpuid.coresPerSocket": "1", + "ethernet0.pciSlotNumber": "32", + "memsize": "{{ user `memory` }}", + "numvcpus": "{{ user `cpus` }}" + }, + "vmx_remove_ethernet_interfaces": true + }, + { + "boot_command": [ + "<esc><wait>", + "<esc><wait>", + "<enter><wait>", + "/install/vmlinuz<wait>", + " auto<wait>", + " console-setup/ask_detect=false<wait>", + " console-setup/layoutcode=us<wait>", + " console-setup/modelcode=pc105<wait>", + " debconf/frontend=noninteractive<wait>", + " debian-installer=en_US.UTF-8<wait>", + " fb=false<wait>", + " initrd=/install/initrd.gz<wait>", + " kbd-chooser/method=us<wait>", + " keyboard-configuration/layout=USA<wait>", + " keyboard-configuration/variant=USA<wait>", + " locale=en_US.UTF-8<wait>", + " netcfg/get_domain=vm<wait>", + " netcfg/get_hostname=vagrant<wait>", + " grub-installer/bootdev=/dev/sda<wait>", + " noapic<wait>", + " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}}<wait>", + " -- <wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": "{{user `disk_size`}}", + "guest_os_type": "ubuntu", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "../builds/packer-{{user `template`}}-parallels", + "parallels_tools_flavor": "lin", + "prlctl": [ + [ + "set", + "{{.Name}}", + "--memsize", + "{{ user `memory` }}" + ], + [ + "set", + "{{.Name}}", + "--cpus", + "{{ user `cpus` }}" + ] + ], + "prlctl_version_file": ".prlctl_version", + "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "parallels-iso", + "vm_name": "{{ user `template` }}" + }, + { + "boot_command": [ + "<esc><wait>", + "<esc><wait>", + "<enter><wait>", + "/install/vmlinuz<wait>", + " auto<wait>", + " console-setup/ask_detect=false<wait>", + " console-setup/layoutcode=us<wait>", + " console-setup/modelcode=pc105<wait>", + " debconf/frontend=noninteractive<wait>", + " debian-installer=en_US.UTF-8<wait>", + " fb=false<wait>", + " initrd=/install/initrd.gz<wait>", + " kbd-chooser/method=us<wait>", + " keyboard-configuration/layout=USA<wait>", + " keyboard-configuration/variant=USA<wait>", + " locale=en_US.UTF-8<wait>", + " netcfg/get_domain=vm<wait>", + " netcfg/get_hostname=vagrant<wait>", + " grub-installer/bootdev=/dev/vda<wait>", + " noapic<wait>", + " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}}<wait>", + " -- <wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": "{{user `disk_size`}}", + "headless": "{{ user `headless` }}", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "../builds/packer-{{user `template`}}-qemu", + "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "qemu", + "vm_name": "{{ user `template` }}", + "qemuargs": [ + [ + "-m", + "{{ user `memory` }}M" + ], + [ + "-smp", + "{{ user `cpus` }}" + ] + ] + }, + { + "boot_command": [ + "<esc><wait10><esc><esc><enter><wait>", + "set gfxpayload=1024x768<enter>", + "linux /install/vmlinuz ", + "preseed/url=http://{{.HTTPIP}}:{{.HTTPPort}}/preseed-hyperv.cfg ", + "debian-installer=en_US.UTF-8 auto locale=en_US.UTF-8 kbd-chooser/method=us ", + "hostname={{.Name}} ", + "fb=false debconf/frontend=noninteractive ", + "keyboard-configuration/modelcode=SKIP keyboard-configuration/layout=USA ", + "keyboard-configuration/variant=USA console-setup/ask_detect=false <enter>", + "initrd /install/initrd.gz<enter>", + "boot<enter>" + ], + "boot_wait": "10s", + "communicator": "ssh", + "cpu": "{{ user `cpus` }}", + "disk_size": "{{user `disk_size`}}", + "enable_secure_boot": false, + "generation": "{{user `hyperv_generation`}}", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "../builds/packer-{{user `template`}}-hyperv", + "ram_size": "{{user `memory`}}", + "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_timeout": "10000s", + "ssh_username": "vagrant", + "switch_name": "{{user `hyperv_switch`}}", + "type": "hyperv-iso", + "vm_name": "{{ user `template` }}" + } + ], + "post-processors": [ + { + "output": "../builds/{{user `box_basename`}}.{{.Provider}}.box", + "type": "vagrant" + } + ], + "provisioners": [ + { + "environment_vars": [ + "HOME_DIR=/home/vagrant", + "http_proxy={{user `http_proxy`}}", + "https_proxy={{user `https_proxy`}}", + "no_proxy={{user `no_proxy`}}" + ], + "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", + "expect_disconnect": true, + "scripts": [ + "scripts/update.sh", + "../_common/sshd.sh", + "scripts/networking.sh", + "scripts/sudoers.sh", + "scripts/vagrant.sh", + "../_common/virtualbox.sh", + "scripts/vmware.sh", + "../_common/parallels.sh", + "scripts/hyperv.sh", + "scripts/cleanup.sh", + "../_common/minimize.sh" + ], + "type": "shell" + } + ], + "variables": { + "box_basename": "ubuntu-18.10", + "build_timestamp": "{{isotime \"20060102150405\"}}", + "cpus": "1", + "disk_size": "65536", + "git_revision": "__unknown_git_revision__", + "headless": "", + "http_proxy": "{{env `http_proxy`}}", + "https_proxy": "{{env `https_proxy`}}", + "hyperv_generation": "2", + "hyperv_switch": "{{env `hyperv_switch`}}", + "iso_checksum": "cf9250781dadd919f23c9d9612212cad653e35fccc2fbcf6853f67ad09e067ba", + "iso_checksum_type": "sha256", + "iso_name": "ubuntu-18.10-server-amd64.iso", + "memory": "1024", + "mirror": "http://cdimage.ubuntu.com", + "mirror_directory": "ubuntu/releases/18.10/release", + "name": "ubuntu-18.10", + "no_proxy": "{{env `no_proxy`}}", + "preseed_path": "preseed.cfg", + "template": "ubuntu-18.10-amd64", + "version": "TIMESTAMP" + } +} From 8bbd65368e5117aefae4eb044ff3215d80019758 Mon Sep 17 00:00:00 2001 From: Gabriel Avanzi <gabriel.avanzi@gmail.com> Date: Wed, 31 Oct 2018 09:28:51 -0300 Subject: [PATCH 0872/1622] Add Fedora 29 support. --- fedora/fedora-29-x86_64.json | 180 +++++++++++++++++++++++++++++++++++ fedora/http/ks-fedora29.cfg | 45 +++++++++ 2 files changed, 225 insertions(+) create mode 100644 fedora/fedora-29-x86_64.json create mode 100644 fedora/http/ks-fedora29.cfg diff --git a/fedora/fedora-29-x86_64.json b/fedora/fedora-29-x86_64.json new file mode 100644 index 000000000..c56f70da4 --- /dev/null +++ b/fedora/fedora-29-x86_64.json @@ -0,0 +1,180 @@ +{ + "builders": [ + { + "boot_command": [ + "<tab> linux ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": "{{user `disk_size`}}", + "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "guest_os_type": "Fedora_64", + "hard_drive_interface": "sata", + "headless": "{{ user `headless` }}", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "../builds/packer-{{user `template`}}-virtualbox", + "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "virtualbox-iso", + "vboxmanage": [ + [ + "modifyvm", + "{{.Name}}", + "--memory", + "{{ user `memory` }}" + ], + [ + "modifyvm", + "{{.Name}}", + "--cpus", + "{{ user `cpus` }}" + ] + ], + "virtualbox_version_file": ".vbox_version", + "vm_name": "{{ user `template` }}" + }, + { + "boot_command": [ + "<tab> linux ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": "{{user `disk_size`}}", + "guest_os_type": "fedora-64", + "headless": "{{ user `headless` }}", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "../builds/packer-{{user `template`}}-vmware", + "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "tools_upload_flavor": "linux", + "type": "vmware-iso", + "vm_name": "{{ user `template` }}", + "vmx_data": { + "cpuid.coresPerSocket": "1", + "ethernet0.pciSlotNumber": "32", + "memsize": "{{ user `memory` }}", + "numvcpus": "{{ user `cpus` }}" + }, + "vmx_remove_ethernet_interfaces": true + }, + { + "boot_command": [ + "<tab> linux ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": "{{user `disk_size`}}", + "guest_os_type": "fedora-core", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "../builds/packer-{{user `template`}}-parallels", + "parallels_tools_flavor": "lin", + "prlctl": [ + [ + "set", + "{{.Name}}", + "--memsize", + "{{ user `memory` }}" + ], + [ + "set", + "{{.Name}}", + "--cpus", + "{{ user `cpus` }}" + ] + ], + "prlctl_version_file": ".prlctl_version", + "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "parallels-iso", + "vm_name": "{{ user `template` }}" + }, + { + "boot_command": [ + "<tab> linux ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": "{{user `disk_size`}}", + "headless": "{{ user `headless` }}", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "../builds/packer-{{user `template`}}-qemu", + "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "qemu", + "vm_name": "{{ user `template` }}" + } + ], + "post-processors": [ + { + "output": "../builds/{{user `box_basename`}}.{{.Provider}}.box", + "type": "vagrant" + } + ], + "provisioners": [ + { + "environment_vars": [ + "HOME_DIR=/home/vagrant", + "http_proxy={{user `http_proxy`}}", + "https_proxy={{user `https_proxy`}}", + "no_proxy={{user `no_proxy`}}" + ], + "execute_command": "echo 'vagrant' | {{.Vars}} sudo -E -S bash '{{.Path}}'", + "expect_disconnect": true, + "scripts": [ + "scripts/swap.sh", + "scripts/fix-slow-dns.sh", + "scripts/build-tools.sh", + "../_common/sshd.sh", + "../_common/virtualbox.sh", + "../_common/vmware.sh", + "../_common/parallels.sh", + "../_common/vagrant.sh", + "scripts/cleanup.sh", + "../_common/minimize.sh" + ], + "type": "shell" + } + ], + "variables": { + "arch": "64", + "box_basename": "fedora-29", + "build_timestamp": "{{isotime \"20060102150405\"}}", + "cpus": "1", + "disk_size": "65536", + "git_revision": "__unknown_git_revision__", + "headless": "", + "http_proxy": "{{env `http_proxy`}}", + "https_proxy": "{{env `https_proxy`}}", + "iso_checksum": "129d131a55e5bd518f593f0eacdce095f7c795fe7ccbef1f3f6aeb2ff9f99f35", + "iso_checksum_type": "sha256", + "iso_name": "Fedora-Server-dvd-x86_64-29-1.2.iso", + "ks_path": "ks-fedora29.cfg", + "memory": "1024", + "mirror": "http://download.fedoraproject.org/pub/fedora/linux", + "mirror_directory": "releases/29/Server/x86_64/iso", + "name": "fedora-29", + "no_proxy": "{{env `no_proxy`}}", + "template": "fedora-29-x86_64", + "version": "TIMESTAMP" + } +} diff --git a/fedora/http/ks-fedora29.cfg b/fedora/http/ks-fedora29.cfg new file mode 100644 index 000000000..7a57bc581 --- /dev/null +++ b/fedora/http/ks-fedora29.cfg @@ -0,0 +1,45 @@ +install +cdrom +lang en_US.UTF-8 +keyboard us +network --bootproto=dhcp +rootpw vagrant +firewall --disabled +authconfig --enableshadow --passalgo=sha512 +selinux --permissive +timezone UTC +bootloader --location=mbr +text +skipx +zerombr +clearpart --all --initlabel +part / --fstype=ext4 --ondisk=sda --grow --label=root +firstboot --disabled +reboot +user --name=vagrant --plaintext --password vagrant + +%packages --ignoremissing --excludedocs +bzip2 +# GCC won't install during kickstart +# gcc +kernel-devel +kernel-headers +tar +wget +nfs-utils +net-tools +-plymouth +-plymouth-core-libs +-fedora-release-notes +-mcelog +-smartmontools +-usbutils +-man-pages +%end + +%post +# sudo +echo 'Defaults:vagrant !requiretty' > /etc/sudoers.d/vagrant +echo '%vagrant ALL=(ALL) NOPASSWD: ALL' >> /etc/sudoers.d/vagrant +chmod 440 /etc/sudoers.d/vagrant +%end From 4f4d75d8cde2e558cdb4ccac28582ec0a308f4d7 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith@chef.io> Date: Mon, 5 Nov 2018 22:16:58 -0800 Subject: [PATCH 0873/1622] Fix the download link for Windows 2012R2 Signed-off-by: Tim Smith <tsmith@chef.io> --- windows/2012r2.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/windows/2012r2.json b/windows/2012r2.json index 2d00aee45..ab7336df3 100644 --- a/windows/2012r2.json +++ b/windows/2012r2.json @@ -58,7 +58,7 @@ "guest_additions_mode": "attach", "headless": "false", "iso_checksum": "849734f37346385dac2c101e4aacba4626bb141c", - "iso_url": "http://care.dlservice.microsoft.com/dl/download/6/2/A/62A76ABB-9990-4EFC-A4FE-C7D698DAEB96/9600.17050.WINBLUE_REFRESH.140317-1640_X64FRE_SERVER_EVAL_EN-US-IR3_SSS_X64FREE_EN-US_DV9.ISO", + "iso_url": "http://download.microsoft.com/download/6/2/A/62A76ABB-9990-4EFC-A4FE-C7D698DAEB96/9600.17050.WINBLUE_REFRESH.140317-1640_X64FRE_SERVER_EVAL_EN-US-IR3_SSS_X64FREE_EN-US_DV9.ISO", "template": "windows-2012r2-standard" } } From 927fd15660074bc05aa2d3b73d59562a6292a446 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith@chef.io> Date: Tue, 6 Nov 2018 10:09:49 -0800 Subject: [PATCH 0874/1622] Disable UAC Signed-off-by: Tim Smith <tsmith@chef.io> --- windows/2008r2.json | 1 + windows/2012r2.json | 1 + windows/2016.json | 1 + windows/7.json | 1 + windows/cookbooks/packer/recipes/disable_uac.rb | 6 ++++++ 5 files changed, 10 insertions(+) create mode 100644 windows/cookbooks/packer/recipes/disable_uac.rb diff --git a/windows/2008r2.json b/windows/2008r2.json index b02c269e4..bab83a945 100644 --- a/windows/2008r2.json +++ b/windows/2008r2.json @@ -48,6 +48,7 @@ "guest_os_type": "windows", "install_command": "powershell.exe -Command \"(new-object Net.WebClient).DownloadString('https://omnitruck.chef.io/install.ps1') | iex; install\"", "run_list": [ + "packer::disable_uac", "packer::cleanup", "packer::defrag" ] diff --git a/windows/2012r2.json b/windows/2012r2.json index ab7336df3..6157fb17a 100644 --- a/windows/2012r2.json +++ b/windows/2012r2.json @@ -29,6 +29,7 @@ "cookbook_paths": ["cookbooks"], "guest_os_type": "windows", "run_list": [ + "packer::disable_uac", "packer::vm_tools", "packer::features", "packer::enable_file_sharing", diff --git a/windows/2016.json b/windows/2016.json index 05da80676..b829dce4d 100644 --- a/windows/2016.json +++ b/windows/2016.json @@ -29,6 +29,7 @@ "cookbook_paths": ["cookbooks"], "guest_os_type": "windows", "run_list": [ + "packer::disable_uac", "packer::vm_tools", "packer::features", "packer::enable_file_sharing", diff --git a/windows/7.json b/windows/7.json index e644328ab..d9f7ee73d 100644 --- a/windows/7.json +++ b/windows/7.json @@ -30,6 +30,7 @@ "guest_os_type": "windows", "install_command": "powershell.exe -Command \"(new-object Net.WebClient).DownloadString('https://omnitruck.chef.io/install.ps1') | iex; install\"", "run_list": [ + "packer::disable_uac", "packer::vm_tools", "packer::features", "packer::enable_file_sharing", diff --git a/windows/cookbooks/packer/recipes/disable_uac.rb b/windows/cookbooks/packer/recipes/disable_uac.rb new file mode 100644 index 000000000..dc80105dd --- /dev/null +++ b/windows/cookbooks/packer/recipes/disable_uac.rb @@ -0,0 +1,6 @@ +registry_key 'HKEY_LOCAL_MACHINE\software\Microsoft\Windows\CurrentVersion\Policies\system' do + values [{ + name: 'EnableLUA', + type: :dword, + data: 0, }] +end From 4b7f10e546ce4a85ff4de9597672b35e532ddd98 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith@chef.io> Date: Tue, 6 Nov 2018 10:10:06 -0800 Subject: [PATCH 0875/1622] Use the registry resource instead of execute Signed-off-by: Tim Smith <tsmith@chef.io> --- windows/cookbooks/packer/recipes/enable_remote_desktop.rb | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/windows/cookbooks/packer/recipes/enable_remote_desktop.rb b/windows/cookbooks/packer/recipes/enable_remote_desktop.rb index 38d8cc8ff..92f6db963 100644 --- a/windows/cookbooks/packer/recipes/enable_remote_desktop.rb +++ b/windows/cookbooks/packer/recipes/enable_remote_desktop.rb @@ -1,5 +1,8 @@ -execute 'Enable RDP' do - command 'reg add "HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Terminal Server" /v fDenyTSConnections /t REG_DWORD /d 0 /f' +registry_key 'HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Terminal Server' do + values [{ + name: 'fDenyTSConnections', + type: :dword, + data: 0, }] end execute 'Enable RDP firewall rule' do From 5cc16e178a7c379aeacac3f048611c25556bd2f9 Mon Sep 17 00:00:00 2001 From: Tao <tao@huangtao.me> Date: Wed, 7 Nov 2018 23:32:29 +0800 Subject: [PATCH 0876/1622] update debian provision: purge installation-report in cleanup.sh --- debian/scripts/cleanup.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/debian/scripts/cleanup.sh b/debian/scripts/cleanup.sh index 2e96024b0..8b8deeaf8 100644 --- a/debian/scripts/cleanup.sh +++ b/debian/scripts/cleanup.sh @@ -35,6 +35,7 @@ apt-get -y purge ppp pppconfig pppoeconf; # Delete oddities apt-get -y purge popularity-contest; +apt-get -y purge installation-report; apt-get -y autoremove; apt-get -y clean; From 9d86a3ce556308a6a9aaddde67a84d51dd584fd2 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith@chef.io> Date: Wed, 7 Nov 2018 12:13:46 -0800 Subject: [PATCH 0877/1622] Update to the latest monthly rollup Signed-off-by: Tim Smith <tsmith@chef.io> --- windows/cookbooks/packer/recipes/updates.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/windows/cookbooks/packer/recipes/updates.rb b/windows/cookbooks/packer/recipes/updates.rb index d12f2ba06..a826fa4b2 100644 --- a/windows/cookbooks/packer/recipes/updates.rb +++ b/windows/cookbooks/packer/recipes/updates.rb @@ -10,8 +10,8 @@ if node['platform_version'].to_f == 6.1 # 2008R2 # This is basically a service pack and we should install it to fix a giant pile of bugs - msu_package '2018-06 monthly rollup' do - source 'http://download.windowsupdate.com/d/msdownload/update/software/secu/2018/06/windows6.1-kb4284826-x64_9e172f5bb50206dd65d4f60ac07a82baa1aef525.msu' + msu_package '2018-10 monthly rollup' do + source 'http://download.windowsupdate.com/d/msdownload/update/software/secu/2018/09/windows6.1-kb4462923-x64_5c4506692214692bf846da33052edb1dc5752156.msu' action :install end end From 7a4648d34edf2e6f5fbc2391b8db81483b099cee Mon Sep 17 00:00:00 2001 From: Mike Kinney <mike.kinney@gmail.com> Date: Thu, 8 Nov 2018 16:55:24 -0800 Subject: [PATCH 0878/1622] add vmware-iso to windows 2016 --- windows/2016.json | 31 ++++++++++++++++++++++++++++--- 1 file changed, 28 insertions(+), 3 deletions(-) diff --git a/windows/2016.json b/windows/2016.json index b829dce4d..da5473a0b 100644 --- a/windows/2016.json +++ b/windows/2016.json @@ -1,5 +1,6 @@ { - "builders": [{ + "builders": [ + { "type": "virtualbox-iso", "vboxmanage": [ ["modifyvm", "{{.Name}}", "--memory", "4096"], @@ -23,13 +24,37 @@ "floppy_files": [ "answer_files/2016/Autounattend.xml" ] - }], + }, + { + "type": "vmware-iso", + "vmx_data": { + "memsize": "4096", + "numvcpus": "2", + "scsi0.virtualDev": "lsisas1068", + "scsi0.present": "TRUE" + }, + "guest_os_type": "windows9srv-64", + "headless": "{{ user `headless` }}", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_checksum_type": "sha1", + "output_directory": "../builds/packer-{{user `template`}}-vmware", + "communicator": "winrm", + "winrm_username": "vagrant", + "winrm_password": "vagrant", + "winrm_timeout": "12h", + "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"", + "shutdown_timeout": "15m", + "floppy_files": [ + "answer_files/2016/Autounattend.xml" + ] + } + ], "provisioners": [{ "type": "chef-solo", "cookbook_paths": ["cookbooks"], "guest_os_type": "windows", "run_list": [ - "packer::disable_uac", "packer::vm_tools", "packer::features", "packer::enable_file_sharing", From 3722684f589fde029cf9499acead6b85266b4fb5 Mon Sep 17 00:00:00 2001 From: Shiloh Heurich <shiloh@heurich.com> Date: Mon, 12 Nov 2018 11:23:42 -0500 Subject: [PATCH 0879/1622] Update for Ubuntu 16.04.5 amd64 --- ubuntu/ubuntu-16.04-amd64.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ubuntu/ubuntu-16.04-amd64.json b/ubuntu/ubuntu-16.04-amd64.json index b1c11ad48..93fed7b26 100644 --- a/ubuntu/ubuntu-16.04-amd64.json +++ b/ubuntu/ubuntu-16.04-amd64.json @@ -306,10 +306,10 @@ "hyperv_switch": "{{env `hyperv_switch`}}", "iso_checksum": "0a03608988cfd2e50567990dc8be96fb3c501e198e2e6efcb846d89efc7b89f2", "iso_checksum_type": "sha256", - "iso_name": "ubuntu-16.04.4-server-amd64.iso", + "iso_name": "ubuntu-16.04.5-server-amd64.iso", "memory": "1024", "mirror": "http://releases.ubuntu.com", - "mirror_directory": "16.04.4", + "mirror_directory": "16.04.5", "name": "ubuntu-16.04", "no_proxy": "{{env `no_proxy`}}", "preseed_path": "preseed.cfg", From f3c5a1d4d802220c974cd8421d3cdb41d7172187 Mon Sep 17 00:00:00 2001 From: Shiloh Heurich <shiloh@heurich.com> Date: Mon, 12 Nov 2018 11:24:20 -0500 Subject: [PATCH 0880/1622] Update for Ubuntu 16.04.5 i386 --- ubuntu/ubuntu-16.04-i386.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ubuntu/ubuntu-16.04-i386.json b/ubuntu/ubuntu-16.04-i386.json index 021eeac6c..c49d71932 100644 --- a/ubuntu/ubuntu-16.04-i386.json +++ b/ubuntu/ubuntu-16.04-i386.json @@ -267,10 +267,10 @@ "https_proxy": "{{env `https_proxy`}}", "iso_checksum": "e514191df0c633e92966b1b4f39966d8a4e4c30665dcc2e5a774a6bfb881ac87", "iso_checksum_type": "sha256", - "iso_name": "ubuntu-16.04.4-server-i386.iso", + "iso_name": "ubuntu-16.04.5-server-i386.iso", "memory": "1024", "mirror": "http://releases.ubuntu.com/releases", - "mirror_directory": "16.04.4", + "mirror_directory": "16.04.5", "name": "ubuntu-16.04-i386", "no_proxy": "{{env `no_proxy`}}", "preseed_path": "preseed.cfg", From bd56bc9fd747814cc9b81a07f8e2867882911402 Mon Sep 17 00:00:00 2001 From: Shiloh Heurich <shiloh@heurich.com> Date: Mon, 12 Nov 2018 13:32:12 -0500 Subject: [PATCH 0881/1622] Update ISO checksum --- ubuntu/ubuntu-16.04-i386.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ubuntu/ubuntu-16.04-i386.json b/ubuntu/ubuntu-16.04-i386.json index c49d71932..2608030ab 100644 --- a/ubuntu/ubuntu-16.04-i386.json +++ b/ubuntu/ubuntu-16.04-i386.json @@ -265,7 +265,7 @@ "headless": "", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", - "iso_checksum": "e514191df0c633e92966b1b4f39966d8a4e4c30665dcc2e5a774a6bfb881ac87", + "iso_checksum": "76006856dddc7dee2bf82d3cbcc593ae0a9912218077f8cb6cced41b2d3f2c2d", "iso_checksum_type": "sha256", "iso_name": "ubuntu-16.04.5-server-i386.iso", "memory": "1024", From a84568ef9e26b09f86f3d78eb9b491b1c7dc4cdd Mon Sep 17 00:00:00 2001 From: Shiloh Heurich <shiloh@heurich.com> Date: Mon, 12 Nov 2018 13:32:55 -0500 Subject: [PATCH 0882/1622] Update ISO checksum --- ubuntu/ubuntu-16.04-amd64.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ubuntu/ubuntu-16.04-amd64.json b/ubuntu/ubuntu-16.04-amd64.json index 93fed7b26..421de1193 100644 --- a/ubuntu/ubuntu-16.04-amd64.json +++ b/ubuntu/ubuntu-16.04-amd64.json @@ -304,7 +304,7 @@ "https_proxy": "{{env `https_proxy`}}", "hyperv_generation": "2", "hyperv_switch": "{{env `hyperv_switch`}}", - "iso_checksum": "0a03608988cfd2e50567990dc8be96fb3c501e198e2e6efcb846d89efc7b89f2", + "iso_checksum": "c94de1cc2e10160f325eb54638a5b5aa38f181d60ee33dae9578d96d932ee5f8", "iso_checksum_type": "sha256", "iso_name": "ubuntu-16.04.5-server-amd64.iso", "memory": "1024", From 5c1bf40dd2abccbaf000835633ab3db156fc46bf Mon Sep 17 00:00:00 2001 From: Aman Gupta <aman@tmm1.net> Date: Mon, 12 Nov 2018 18:57:05 -0800 Subject: [PATCH 0883/1622] Fix build/upload of freebsd-11.2-i386 --- freebsd/freebsd-11.2-i386.json | 1 + 1 file changed, 1 insertion(+) diff --git a/freebsd/freebsd-11.2-i386.json b/freebsd/freebsd-11.2-i386.json index 7e456e1e4..63dce8b00 100644 --- a/freebsd/freebsd-11.2-i386.json +++ b/freebsd/freebsd-11.2-i386.json @@ -220,6 +220,7 @@ "memory": "1024", "mirror": "https://download.freebsd.org/ftp", "mirror_directory": "releases/i386/i386/ISO-IMAGES/11.2", + "name": "freebsd-11.2-i386", "no_proxy": "{{env `no_proxy`}}", "pkg_branch": "quarterly", "template": "freebsd-11.2-i386", From 019b38da07ac00ebec2924aff63af04421591860 Mon Sep 17 00:00:00 2001 From: Aman Gupta <aman@tmm1.net> Date: Mon, 12 Nov 2018 19:00:55 -0800 Subject: [PATCH 0884/1622] Build freebsd-11.2-i386 too --- builds.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/builds.yml b/builds.yml index 4e09a21cc..50175e36b 100644 --- a/builds.yml +++ b/builds.yml @@ -15,6 +15,7 @@ public: - 'opensuse-leap-42.3' - 'opensuse-leap-15.0' - 'freebsd-11.2' +- 'freebsd-11.2-i386' - 'freebsd-10.4' - 'hardenedbsd-11' - 'centos-6.10-i386' From 1946163bfaf267d3d03e3e3c6ad4d0d069c0634b Mon Sep 17 00:00:00 2001 From: Gabriel Avanzi <gabriel.avanzi@gmail.com> Date: Wed, 14 Nov 2018 08:27:27 -0200 Subject: [PATCH 0885/1622] Added libvirt support in fedora29. Changed part to autopart in kickstart because device name in libvirt is not sda. Added --noipv6 in network to prevent waiting for ssh hang. --- fedora/fedora-29-x86_64.json | 38 ++++++++++++++++++++++++++++++++++++ fedora/http/ks-fedora29.cfg | 8 ++++---- 2 files changed, 42 insertions(+), 4 deletions(-) diff --git a/fedora/fedora-29-x86_64.json b/fedora/fedora-29-x86_64.json index c56f70da4..495d22657 100644 --- a/fedora/fedora-29-x86_64.json +++ b/fedora/fedora-29-x86_64.json @@ -1,5 +1,43 @@ { "builders": [ + { + "type": "qemu", + "vm_name": "{{ user `template` }}", + "name": "{{ user `template` }}", + "output_directory": "../builds/packer-{{user `template`}}-libvirt", + "accelerator": "kvm", + "boot_wait": "10s", + "boot_command": [ + "<tab> linux ks=http://{{.HTTPIP}}:{{.HTTPPort}}/{{user `ks_path`}}<enter><wait>" + ], + "format": "qcow2", + "disk_size": "{{user `disk_size`}}", + "disk_discard": "unmap", + "disk_cache": "unsafe", + "disk_compression": true, + "disk_interface": "virtio-scsi", + "net_device": "virtio-net", + "qemuargs": [ + [ + "-m", + "{{ user `memory` }}" + ], + [ + "-smp", + "cpus={{ user `cpus` }}" + ] + ], + "http_directory": "http", + "headless": "{{ user `headless` }}", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "ssh_username": "vagrant", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_wait_timeout": "3600s", + "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now" + }, { "boot_command": [ "<tab> linux ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" diff --git a/fedora/http/ks-fedora29.cfg b/fedora/http/ks-fedora29.cfg index 7a57bc581..eb75f84a3 100644 --- a/fedora/http/ks-fedora29.cfg +++ b/fedora/http/ks-fedora29.cfg @@ -2,8 +2,8 @@ install cdrom lang en_US.UTF-8 keyboard us -network --bootproto=dhcp -rootpw vagrant +network --bootproto=dhcp --noipv6 +rootpw --plaintext vagrant firewall --disabled authconfig --enableshadow --passalgo=sha512 selinux --permissive @@ -13,9 +13,9 @@ text skipx zerombr clearpart --all --initlabel -part / --fstype=ext4 --ondisk=sda --grow --label=root +autopart --nohome --nolvm --noboot --fstype=ext4 firstboot --disabled -reboot +reboot --eject user --name=vagrant --plaintext --password vagrant %packages --ignoremissing --excludedocs From 6b5a9917eed51ff0e32bbbcbc529a79545b9bace Mon Sep 17 00:00:00 2001 From: Gabriel Avanzi <gabriel.avanzi@gmail.com> Date: Wed, 14 Nov 2018 09:44:02 -0200 Subject: [PATCH 0886/1622] Added fedora-29 in builds.yml for public releases. --- builds.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/builds.yml b/builds.yml index 4e09a21cc..c221833eb 100644 --- a/builds.yml +++ b/builds.yml @@ -10,6 +10,7 @@ public: - 'debian-8.11' - 'oracle-7.5' - 'oracle-6.10' +- 'fedora-29' - 'fedora-28' - 'fedora-27' - 'opensuse-leap-42.3' From 9b2fb82f51c61162048041c263ce313a4fb7d72c Mon Sep 17 00:00:00 2001 From: Seth Thomas <sthomas@chef.io> Date: Wed, 14 Nov 2018 07:44:00 -0700 Subject: [PATCH 0887/1622] Debian 9.6 Signed-off-by: Seth Thomas <sthomas@chef.io> --- .../{debian-9.5-amd64.json => debian-9.6-amd64.json} | 12 ++++++------ .../{debian-9.5-i386.json => debian-9.6-i386.json} | 12 ++++++------ 2 files changed, 12 insertions(+), 12 deletions(-) rename debian/{debian-9.5-amd64.json => debian-9.6-amd64.json} (96%) rename debian/{debian-9.5-i386.json => debian-9.6-i386.json} (96%) diff --git a/debian/debian-9.5-amd64.json b/debian/debian-9.6-amd64.json similarity index 96% rename from debian/debian-9.5-amd64.json rename to debian/debian-9.6-amd64.json index ee3e11681..2f01a3df1 100644 --- a/debian/debian-9.5-amd64.json +++ b/debian/debian-9.6-amd64.json @@ -217,7 +217,7 @@ } ], "variables": { - "box_basename": "debian-9.5", + "box_basename": "debian-9.6", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", "disk_size": "65536", @@ -225,16 +225,16 @@ "headless": "", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", - "iso_checksum": "1f97a4b8dee7c3def5cd8215ff01b9edef27c901b28fa8b1ef4f022eff7c36c2", + "iso_checksum": "c51d84019c3637ae9d12aa6658ea8c613860c776bd84c6a71eaaf765a0dd60fe", "iso_checksum_type": "sha256", - "iso_name": "debian-9.5.0-amd64-netinst.iso", + "iso_name": "debian-9.6.0-amd64-netinst.iso", "memory": "1024", "mirror": "http://cdimage.debian.org/cdimage/release", - "mirror_directory": "9.5.0/amd64/iso-cd", - "name": "debian-9.5", + "mirror_directory": "9.6.0/amd64/iso-cd", + "name": "debian-9.6", "no_proxy": "{{env `no_proxy`}}", "preseed_path": "debian-8/preseed.cfg", - "template": "debian-9.5-amd64", + "template": "debian-9.6-amd64", "version": "TIMESTAMP" } } diff --git a/debian/debian-9.5-i386.json b/debian/debian-9.6-i386.json similarity index 96% rename from debian/debian-9.5-i386.json rename to debian/debian-9.6-i386.json index 4d1583d80..d151d6397 100644 --- a/debian/debian-9.5-i386.json +++ b/debian/debian-9.6-i386.json @@ -217,7 +217,7 @@ } ], "variables": { - "box_basename": "debian-9.5-i386", + "box_basename": "debian-9.6-i386", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", "disk_size": "65536", @@ -225,16 +225,16 @@ "headless": "", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", - "iso_checksum": "fb27b64cda4beb2c723ed73042e0cd431500be06315efef9e4e311d6cc798d08", + "iso_checksum": "7f0bda2afc4b3689a3590600e117f8e72aafd8cdd64b2a8089214b1edfb2b89b", "iso_checksum_type": "sha256", - "iso_name": "debian-9.5.0-i386-netinst.iso", + "iso_name": "debian-9.6.0-i386-netinst.iso", "memory": "1024", "mirror": "http://cdimage.debian.org/cdimage/release", - "mirror_directory": "9.5.0/i386/iso-cd", - "name": "debian-9.5-i386", + "mirror_directory": "9.6.0/i386/iso-cd", + "name": "debian-9.6-i386", "no_proxy": "{{env `no_proxy`}}", "preseed_path": "debian-8/preseed.cfg", - "template": "debian-9.5-i386", + "template": "debian-9.6-i386", "version": "TIMESTAMP" } } From fa5659a110fc4e6560a1d48be9ab4c9b5d731d62 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith@chef.io> Date: Mon, 19 Nov 2018 19:04:24 -0800 Subject: [PATCH 0888/1622] Remove EOL FreeBSD 10.4 images FreeBSD 10.4 went EOL Oct 31st 2018. Signed-off-by: Tim Smith <tsmith@chef.io> --- freebsd/freebsd-10.4-amd64.json | 230 ----------------------------- freebsd/freebsd-10.4-i386.json | 230 ----------------------------- freebsd/http/freebsd-10/install.sh | 109 -------------- 3 files changed, 569 deletions(-) delete mode 100644 freebsd/freebsd-10.4-amd64.json delete mode 100644 freebsd/freebsd-10.4-i386.json delete mode 100644 freebsd/http/freebsd-10/install.sh diff --git a/freebsd/freebsd-10.4-amd64.json b/freebsd/freebsd-10.4-amd64.json deleted file mode 100644 index f4f524362..000000000 --- a/freebsd/freebsd-10.4-amd64.json +++ /dev/null @@ -1,230 +0,0 @@ -{ - "builders": [ - { - "boot_command": [ - "<esc><wait>", - "boot -s<wait>", - "<enter><wait>", - "<wait10><wait10>", - "/bin/sh<enter><wait>", - "mdmfs -s 100m md1 /tmp<enter><wait>", - "mdmfs -s 100m md2 /mnt<enter><wait>", - "dhclient -l /tmp/dhclient.lease.em0 em0<enter><wait>", - "fetch -o /tmp/install.sh http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} && chmod +x /tmp/install.sh && /tmp/install.sh {{ .Name }}<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "guest_additions_mode": "disable", - "guest_os_type": "FreeBSD_64", - "headless": "{{ user `headless` }}", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../builds/packer-{{user `template`}}-virtualbox", - "shutdown_command": "echo 'vagrant' | su -m root -c 'shutdown -p now'", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "virtualbox-iso", - "vboxmanage": [ - [ - "modifyvm", - "{{.Name}}", - "--memory", - "{{ user `memory` }}" - ], - [ - "modifyvm", - "{{.Name}}", - "--cpus", - "{{ user `cpus` }}" - ] - ], - "virtualbox_version_file": ".vbox_version", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<esc><wait>", - "boot -s<wait>", - "<enter><wait>", - "<wait10><wait10>", - "/bin/sh<enter><wait>", - "mdmfs -s 100m md1 /tmp<enter><wait>", - "mdmfs -s 100m md2 /mnt<enter><wait>", - "dhclient -l /tmp/dhclient.lease.em0 em0<enter><wait>", - "<wait5>", - "fetch -o /tmp/install.sh http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} && chmod +x /tmp/install.sh && /tmp/install.sh {{ .Name }}<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "freebsd-64", - "headless": "{{ user `headless` }}", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../builds/packer-{{user `template`}}-vmware", - "shutdown_command": "echo 'vagrant' | su -m root -c 'shutdown -p now'", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "vmware-iso", - "vm_name": "{{ user `template` }}", - "vmx_data": { - "cpuid.coresPerSocket": "1", - "memsize": "{{ user `memory` }}", - "numvcpus": "{{ user `cpus` }}" - }, - "vmx_remove_ethernet_interfaces": true - }, - { - "boot_command": [ - "<esc><wait>", - "boot -s<wait>", - "<enter><wait>", - "<wait10><wait10>", - "/bin/sh<enter><wait>", - "mdmfs -s 100m md1 /tmp<enter><wait>", - "mdmfs -s 100m md2 /mnt<enter><wait>", - "dhclient -l /tmp/dhclient.lease.em0 em0<enter><wait>", - "fetch -o /tmp/install.sh http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} && chmod +x /tmp/install.sh && /tmp/install.sh {{ .Name }}<enter><wait>" - ], - "boot_wait": "8s", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "freebsd", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../builds/packer-{{user `template`}}-parallels", - "parallels_tools_mode": "disable", - "prlctl": [ - [ - "set", - "{{.Name}}", - "--memsize", - "{{ user `memory` }}" - ], - [ - "set", - "{{.Name}}", - "--cpus", - "{{ user `cpus` }}" - ], - [ - "set", - "{{.Name}}", - "--device-set", - "cdrom0", - "--iface", - "ide" - ], - [ - "set", - "{{.Name}}", - "--device-del", - "fdd0" - ], - [ - "set", - "{{.Name}}", - "--device-del", - "parallel0" - ] - ], - "prlctl_version_file": ".prlctl_version", - "shutdown_command": "echo 'vagrant' | su -m root -c 'shutdown -p now'", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "parallels-iso", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<esc><wait>", - "boot -s<wait>", - "<enter><wait>", - "<wait10><wait10>", - "/bin/sh<enter><wait>", - "mdmfs -s 100m md1 /tmp<enter><wait>", - "mdmfs -s 100m md2 /mnt<enter><wait>", - "dhclient -l /tmp/dhclient.lease.vtnet0 vtnet0<enter><wait>", - "fetch -o /tmp/install.sh http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} && chmod +x /tmp/install.sh && /tmp/install.sh {{ .Name }} vtnet0<enter><wait>" - ], - "boot_wait": "7s", - "disk_size": "{{user `disk_size`}}", - "headless": "{{ user `headless` }}", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../builds/packer-{{user `template`}}-qemu", - "shutdown_command": "echo 'vagrant' | su -m root -c 'shutdown -p now'", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "qemu", - "vm_name": "{{ user `template` }}" - } - ], - "post-processors": [ - { - "output": "../builds/{{user `box_basename`}}.{{.Provider}}.box", - "type": "vagrant", - "vagrantfile_template": "vagrantfile_templates/freebsd.rb" - } - ], - "provisioners": [ - { - "environment_vars": [ - "HOME_DIR=/home/vagrant", - "http_proxy={{user `http_proxy`}}", - "https_proxy={{user `https_proxy`}}", - "no_proxy={{user `no_proxy`}}", - "pkg_branch={{user `pkg_branch`}}" - ], - "execute_command": "echo 'vagrant' | {{.Vars}} su -m root -c 'sh -eux {{.Path}}'", - "expect_disconnect": true, - "scripts": [ - "scripts/update.sh", - "scripts/postinstall.sh", - "scripts/sudoers.sh", - "../_common/vagrant.sh", - "scripts/vmtools.sh", - "scripts/cleanup.sh", - "scripts/minimize.sh" - ], - "type": "shell" - } - ], - "variables": { - "box_basename": "freebsd-10.4", - "build_timestamp": "{{isotime \"20060102150405\"}}", - "cpus": "1", - "disk_size": "65536", - "git_revision": "__unknown_git_revision__", - "headless": "", - "http_proxy": "{{env `http_proxy`}}", - "https_proxy": "{{env `https_proxy`}}", - "install_path": "freebsd-10/install.sh", - "iso_checksum": "7ac73b2a899024e1d9e71e55b5c9b9ac13938468206c72c5a1cf23c7e0a715b4", - "iso_checksum_type": "sha256", - "iso_name": "FreeBSD-10.4-RELEASE-amd64-disc1.iso", - "memory": "1024", - "mirror": "https://download.freebsd.org/ftp", - "mirror_directory": "releases/amd64/amd64/ISO-IMAGES/10.4", - "name": "freebsd-10.4", - "no_proxy": "{{env `no_proxy`}}", - "pkg_branch": "quarterly", - "template": "freebsd-10.4-amd64", - "version": "TIMESTAMP" - } -} - diff --git a/freebsd/freebsd-10.4-i386.json b/freebsd/freebsd-10.4-i386.json deleted file mode 100644 index be8e60f16..000000000 --- a/freebsd/freebsd-10.4-i386.json +++ /dev/null @@ -1,230 +0,0 @@ -{ - "builders": [ - { - "boot_command": [ - "<esc><wait>", - "boot -s<wait>", - "<enter><wait>", - "<wait10><wait10>", - "/bin/sh<enter><wait>", - "mdmfs -s 100m md1 /tmp<enter><wait>", - "mdmfs -s 100m md2 /mnt<enter><wait>", - "dhclient -l /tmp/dhclient.lease.em0 em0<enter><wait>", - "fetch -o /tmp/install.sh http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} && chmod +x /tmp/install.sh && /tmp/install.sh {{ .Name }}<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "guest_additions_mode": "disable", - "guest_os_type": "FreeBSD", - "headless": "{{ user `headless` }}", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../builds/packer-{{user `template`}}-virtualbox", - "shutdown_command": "echo 'vagrant' | su -m root -c 'shutdown -p now'", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "virtualbox-iso", - "vboxmanage": [ - [ - "modifyvm", - "{{.Name}}", - "--memory", - "{{ user `memory` }}" - ], - [ - "modifyvm", - "{{.Name}}", - "--cpus", - "{{ user `cpus` }}" - ] - ], - "virtualbox_version_file": ".vbox_version", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<esc><wait>", - "boot -s<wait>", - "<enter><wait>", - "<wait10><wait10>", - "/bin/sh<enter><wait>", - "mdmfs -s 100m md1 /tmp<enter><wait>", - "mdmfs -s 100m md2 /mnt<enter><wait>", - "dhclient -l /tmp/dhclient.lease.em0 em0<enter><wait>", - "<wait5>", - "fetch -o /tmp/install.sh http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} && chmod +x /tmp/install.sh && /tmp/install.sh {{ .Name }}<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "freebsd", - "headless": "{{ user `headless` }}", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../builds/packer-{{user `template`}}-vmware", - "shutdown_command": "echo 'vagrant' | su -m root -c 'shutdown -p now'", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "vmware-iso", - "vm_name": "{{ user `template` }}", - "vmx_data": { - "cpuid.coresPerSocket": "1", - "memsize": "{{ user `memory` }}", - "numvcpus": "{{ user `cpus` }}" - }, - "vmx_remove_ethernet_interfaces": true - }, - { - "boot_command": [ - "<esc><wait>", - "boot -s<wait>", - "<enter><wait>", - "<wait10><wait10>", - "/bin/sh<enter><wait>", - "mdmfs -s 100m md1 /tmp<enter><wait>", - "mdmfs -s 100m md2 /mnt<enter><wait>", - "dhclient -l /tmp/dhclient.lease.em0 em0<enter><wait>", - "fetch -o /tmp/install.sh http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} && chmod +x /tmp/install.sh && /tmp/install.sh {{ .Name }}<enter><wait>" - ], - "boot_wait": "8s", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "freebsd", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../builds/packer-{{user `template`}}-parallels", - "parallels_tools_mode": "disable", - "prlctl": [ - [ - "set", - "{{.Name}}", - "--memsize", - "{{ user `memory` }}" - ], - [ - "set", - "{{.Name}}", - "--cpus", - "{{ user `cpus` }}" - ], - [ - "set", - "{{.Name}}", - "--device-set", - "cdrom0", - "--iface", - "ide" - ], - [ - "set", - "{{.Name}}", - "--device-del", - "fdd0" - ], - [ - "set", - "{{.Name}}", - "--device-del", - "parallel0" - ] - ], - "prlctl_version_file": ".prlctl_version", - "shutdown_command": "echo 'vagrant' | su -m root -c 'shutdown -p now'", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "parallels-iso", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<esc><wait>", - "boot -s<wait>", - "<enter><wait>", - "<wait10><wait10>", - "/bin/sh<enter><wait>", - "mdmfs -s 100m md1 /tmp<enter><wait>", - "mdmfs -s 100m md2 /mnt<enter><wait>", - "dhclient -l /tmp/dhclient.lease.vtnet0 vtnet0<enter><wait>", - "fetch -o /tmp/install.sh http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} && chmod +x /tmp/install.sh && /tmp/install.sh {{ .Name }}<enter><wait>" - ], - "boot_wait": "7s", - "disk_size": "{{user `disk_size`}}", - "headless": "{{ user `headless` }}", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../builds/packer-{{user `template`}}-qemu", - "shutdown_command": "echo 'vagrant' | su -m root -c 'shutdown -p now'", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "qemu", - "vm_name": "{{ user `template` }}" - } - ], - "post-processors": [ - { - "output": "../builds/{{user `box_basename`}}.{{.Provider}}.box", - "type": "vagrant", - "vagrantfile_template": "vagrantfile_templates/freebsd.rb" - } - ], - "provisioners": [ - { - "environment_vars": [ - "HOME_DIR=/home/vagrant", - "http_proxy={{user `http_proxy`}}", - "https_proxy={{user `https_proxy`}}", - "no_proxy={{user `no_proxy`}}", - "pkg_branch={{user `pkg_branch`}}" - ], - "execute_command": "echo 'vagrant' | {{.Vars}} su -m root -c 'sh -eux {{.Path}}'", - "expect_disconnect": true, - "scripts": [ - "scripts/update.sh", - "scripts/postinstall.sh", - "scripts/sudoers.sh", - "../_common/vagrant.sh", - "scripts/vmtools.sh", - "scripts/cleanup.sh", - "scripts/minimize.sh" - ], - "type": "shell" - } - ], - "variables": { - "box_basename": "freebsd-10.4-i386", - "build_timestamp": "{{isotime \"20060102150405\"}}", - "cpus": "1", - "disk_size": "65536", - "git_revision": "__unknown_git_revision__", - "headless": "", - "http_proxy": "{{env `http_proxy`}}", - "https_proxy": "{{env `https_proxy`}}", - "install_path": "freebsd-10/install.sh", - "iso_checksum": "719ea971deb508936953be78ae9963caa9247d3ee437d0941b08fc7df7ce37b0", - "iso_checksum_type": "sha256", - "iso_name": "FreeBSD-10.4-RELEASE-i386-disc1.iso", - "memory": "1024", - "mirror": "https://download.freebsd.org/ftp", - "mirror_directory": "releases/i386/i386/ISO-IMAGES/10.4", - "name": "freebsd-10.4-i386", - "no_proxy": "{{env `no_proxy`}}", - "pkg_branch": "quarterly", - "template": "freebsd-10.4-i386", - "version": "TIMESTAMP" - } -} - diff --git a/freebsd/http/freebsd-10/install.sh b/freebsd/http/freebsd-10/install.sh deleted file mode 100644 index e8fc9c106..000000000 --- a/freebsd/http/freebsd-10/install.sh +++ /dev/null @@ -1,109 +0,0 @@ -#!/bin/sh -x - -# Credit: http://www.aisecure.net/2011/05/01/root-on-zfs-freebsd-current/ -# -# Heavily re-adapted from https://wiki.freebsd.org/RootOnZFS/GPTZFSBoot -# by Julian Dunn (jdunn@chef.io) to remove legacy junk - -NAME=$1 - -# create disks -# for variations in the root disk device name between VMware and Virtualbox -if [ -e /dev/ada0 ]; then - DISKSLICE=ada0 -elif [ -e /dev/da0 ]; then - DISKSLICE=da0 -elif [ -e /dev/vtbd0 ]; then - DISKSLICE=vtbd0 -else - echo "Unknown disk for install.sh to work with!" - exit -1 -fi - -gpart create -s gpt $DISKSLICE -gpart add -b 34 -s 94 -t freebsd-boot $DISKSLICE -gpart add -t freebsd-zfs -l disk0 $DISKSLICE -gpart bootcode -b /boot/pmbr -p /boot/gptzfsboot -i 1 $DISKSLICE - -zpool create -o altroot=/mnt -o cachefile=/tmp/zpool.cache zroot /dev/gpt/disk0 -zpool set bootfs=zroot zroot - -zfs set checksum=fletcher4 zroot - -# set up zfs pools -zfs create zroot/usr -zfs create zroot/usr/home -zfs create zroot/var -zfs create -o compression=on -o exec=on -o setuid=off zroot/tmp -zfs create -o compression=lzjb -o setuid=off zroot/usr/ports -zfs create -o compression=off -o exec=off -o setuid=off zroot/usr/ports/distfiles -zfs create -o compression=off -o exec=off -o setuid=off zroot/usr/ports/packages -zfs create -o compression=lzjb -o exec=off -o setuid=off zroot/usr/src -zfs create -o compression=lzjb -o exec=off -o setuid=off zroot/var/crash -zfs create -o exec=off -o setuid=off zroot/var/db -zfs create -o compression=lzjb -o exec=on -o setuid=off zroot/var/db/pkg -zfs create -o exec=off -o setuid=off zroot/var/empty -zfs create -o compression=lzjb -o exec=off -o setuid=off zroot/var/log -zfs create -o compression=gzip -o exec=off -o setuid=off zroot/var/mail -zfs create -o exec=off -o setuid=off zroot/var/run -zfs create -o compression=lzjb -o exec=on -o setuid=off zroot/var/tmp - -# fixup -chmod 1777 /mnt/zroot/tmp -cd /mnt/zroot ; ln -s usr/home home -chmod 1777 /mnt/zroot/var/tmp - -# set up swap -zfs create -V 2G zroot/swap -zfs set org.freebsd:swap=on zroot/swap -zfs set checksum=off zroot/swap -swapon /dev/zvol/zroot/swap - -# Install the OS -cd /usr/freebsd-dist -cat base.txz | tar --unlink -xpJf - -C /mnt/zroot -cat lib32.txz | tar --unlink -xpJf - -C /mnt/zroot -cat kernel.txz | tar --unlink -xpJf - -C /mnt/zroot -cat src.txz | tar --unlink -xpJf - -C /mnt/zroot - -cp /tmp/zpool.cache /mnt/zroot/boot/zfs/zpool.cache - -zfs set readonly=on zroot/var/empty - -ifdev=`ifconfig | grep '^[a-z]' | cut -d: -f1 | head -n 1` -# Enable required services -cat >> /mnt/zroot/etc/rc.conf << EOT -zfs_enable="YES" -hostname="${NAME}" -ifconfig_${ifdev}="dhcp" -sshd_enable="YES" -EOT - -# Tune and boot from zfs -cat >> /mnt/zroot/boot/loader.conf << EOT -zfs_load="YES" -vfs.root.mountfrom="zfs:zroot" -vm.kmem_size="200M" -vm.kmem_size_max="200M" -vfs.zfs.arc_max="40M" -vfs.zfs.vdev.cache.size="5M" -EOT - -# zfs doesn't use an fstab, but some rc scripts expect one -touch /mnt/zroot/etc/fstab - -# Set up user accounts -zfs create zroot/usr/home/vagrant -echo "vagrant" | pw -V /mnt/zroot/etc useradd vagrant -h 0 -s /bin/sh -G wheel -d /home/vagrant -c "Vagrant User" -echo "vagrant" | pw -V /mnt/zroot/etc usermod root -h 0 - -chown 1001:1001 /mnt/zroot/home/vagrant - -zfs unmount -a -zfs set mountpoint=legacy zroot -zfs set mountpoint=/tmp zroot/tmp -zfs set mountpoint=/usr zroot/usr -zfs set mountpoint=/var zroot/var - -# Reboot -reboot From c9cfd7604a9b6a5c25cfda5cfdbc3a6db9b878a5 Mon Sep 17 00:00:00 2001 From: Chris Poupart <chris.poupart@mcgill.ca> Date: Tue, 20 Nov 2018 14:00:43 -0500 Subject: [PATCH 0889/1622] Update from rhel 7.5 to 7.6 --- rhel/{rhel-7.5-x86_64.json => rhel-7.6-x86_64.json} | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) rename rhel/{rhel-7.5-x86_64.json => rhel-7.6-x86_64.json} (96%) diff --git a/rhel/rhel-7.5-x86_64.json b/rhel/rhel-7.6-x86_64.json similarity index 96% rename from rhel/rhel-7.5-x86_64.json rename to rhel/rhel-7.6-x86_64.json index 3d5d479b9..19299c6ea 100644 --- a/rhel/rhel-7.5-x86_64.json +++ b/rhel/rhel-7.6-x86_64.json @@ -154,7 +154,7 @@ ], "variables": { "arch": "64", - "box_basename": "rhel-7.5", + "box_basename": "rhel-7.6", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", "disk_size": "65536", @@ -162,16 +162,16 @@ "headless": "", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", - "iso_checksum": "d0dd6ae5e001fb050dafefdfd871e7e648b147fb2d35f0e106e0b34a0163e8f5", + "iso_checksum": "60a0be5aeed1f08f2bb7599a578c89ec134b4016cd62a8604b29f15d543a469c", "iso_checksum_type": "sha256", - "iso_name": "rhel-server-7.5-x86_64-dvd.iso", + "iso_name": "rhel-server-7.6-x86_64-dvd.iso", "ks_path": "7/ks.cfg", "memory": "1024", "mirror": "http://YOU-MUST-PROVIDE-YOUR-OWN-ISO.sorry", "mirror_directory": "rhel", - "name": "rhel-7.5", + "name": "rhel-7.6", "no_proxy": "{{env `no_proxy`}}", - "template": "rhel-7.5-x86_64", + "template": "rhel-7.6-x86_64", "version": "TIMESTAMP" } } From 794142666e1af97bf2754699c5edc03c04ab134c Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith@chef.io> Date: Tue, 20 Nov 2018 15:05:27 -0800 Subject: [PATCH 0890/1622] Add the script to automate creating the Amazon Linux OVF file Amazon provides a disk image and expects you to create an ISO with cloud-init files, which will be read when the disk boots. This automates creating the ISO, creating the VM from the disk and exporting the OVF file. Next step is consuming that file in a packer template and then we have a system. Signed-off-by: Tim Smith <tsmith@chef.io> --- .gitignore | 5 +++- amazon/STEP1_build_ovf.sh | 48 +++++++++++++++++++++++++++++++++++++++ amazon/seed_iso/meta-data | 1 + amazon/seed_iso/user-data | 16 +++++++++++++ 4 files changed, 69 insertions(+), 1 deletion(-) create mode 100755 amazon/STEP1_build_ovf.sh create mode 100644 amazon/seed_iso/meta-data create mode 100644 amazon/seed_iso/user-data diff --git a/.gitignore b/.gitignore index 8f5686503..f897110ee 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,9 @@ .bundle/ -iso +*.iso *.box +*.ovf +*.vmdk +*.vdi virtualfloppy.vfd packer_cache packer.log diff --git a/amazon/STEP1_build_ovf.sh b/amazon/STEP1_build_ovf.sh new file mode 100755 index 000000000..831530d3c --- /dev/null +++ b/amazon/STEP1_build_ovf.sh @@ -0,0 +1,48 @@ +#!/bin/bash + +if [ ! -f amazon.vdi ]; then + echo There must be a file named amazon.vdi in this directory! + echo You can download the vdi file at https://cdn.amazonlinux.com/os-images/latest/ + exit 1 +fi + +echo "Cleaning up old files" +rm seed.iso +rm amazon.ovf +rm *.vmdk + +echo "Creating ISO" +hdiutil makehybrid -o seed.iso -hfs -joliet -iso -default-volume-name cidata seed_iso + +VM="AmazonLinuxBento" +echo Powering off and deleting any existing VMs name $VM +VBoxManage controlvm $VM poweroff --type gui 2> /dev/null +vboxmanage unregistervm $VM 2> /dev/null +sleep 5 + +echo "Creating the VM" +# from https://www.perkin.org.uk/posts/create-virtualbox-vm-from-the-command-line.html +VBoxManage createvm --name $VM --ostype "RedHat_64" --register +VBoxManage storagectl $VM --name "SATA Controller" --add sata --controller IntelAHCI +VBoxManage storageattach $VM --storagectl "SATA Controller" --port 0 --device 0 --type hdd --medium amazon.vdi +VBoxManage storagectl $VM --name "IDE Controller" --add ide +VBoxManage storageattach $VM --storagectl "IDE Controller" --port 0 --device 0 --type dvddrive --medium seed.iso +VBoxManage modifyvm $VM --memory 1024 +VBoxManage modifyvm $VM --cpus 2 +VBoxManage modifyvm $VM --audio none +VBoxManage modifyvm $VM --ioapic on +sleep 5 + +echo Sleeping for 100 seconds to let the system boot and cloud-init to run +VBoxManage startvm $VM --type gui +sleep 100 +VBoxManage controlvm $VM poweroff --type gui +VBoxManage storageattach $VM --storagectl "IDE Controller" --port 0 --device 0 --type dvddrive --medium none +sleep 5 + +echo Exporting the VM to an OVF file +vboxmanage export $VM -o amazon.ovf +sleep 5 + +echo Deleting the VM +vboxmanage unregistervm $VM diff --git a/amazon/seed_iso/meta-data b/amazon/seed_iso/meta-data new file mode 100644 index 000000000..d84db1587 --- /dev/null +++ b/amazon/seed_iso/meta-data @@ -0,0 +1 @@ +local-hostname: vagrant diff --git a/amazon/seed_iso/user-data b/amazon/seed_iso/user-data new file mode 100644 index 000000000..8eeeff49e --- /dev/null +++ b/amazon/seed_iso/user-data @@ -0,0 +1,16 @@ +#cloud-config +#vim:syntax=yaml +users: +# A user by the name `ec2-user` is created in the image by default. + - default +chpasswd: + list: | + ec2-user:vagrant + +# make sure we don't setup the network on every boot +write_files: + - path: /etc/cloud/cloud.cfg.d/80_disable_network_after_firstboot.cfg + content: | + # Disable network configuration after first boot + network: + config: disabled From da8684272694d747ba9412c69b19937aaaf94633 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith@chef.io> Date: Tue, 20 Nov 2018 15:36:32 -0800 Subject: [PATCH 0891/1622] Add basic scripts we'll need and a packer config Signed-off-by: Tim Smith <tsmith@chef.io> --- amazon/amazon-2-x86_64.json | 76 ++++++++++++++++++++++++++++++++++++ amazon/scripts/cleanup.sh | 59 ++++++++++++++++++++++++++++ amazon/scripts/networking.sh | 15 +++++++ amazon/scripts/update.sh | 5 +++ 4 files changed, 155 insertions(+) create mode 100644 amazon/amazon-2-x86_64.json create mode 100644 amazon/scripts/cleanup.sh create mode 100644 amazon/scripts/networking.sh create mode 100644 amazon/scripts/update.sh diff --git a/amazon/amazon-2-x86_64.json b/amazon/amazon-2-x86_64.json new file mode 100644 index 000000000..03425c6e5 --- /dev/null +++ b/amazon/amazon-2-x86_64.json @@ -0,0 +1,76 @@ +{ + "builders": [ + { + "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "headless": "{{ user `headless` }}", + "http_directory": "http", + "output_directory": "../builds/packer-{{user `template`}}-virtualbox", + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", + "ssh_wait_timeout": "10000s", + "ssh_port": 22, + "type": "virtualbox-ovf", + "source_path": "amazon.ovf", + "ssh_username": "ec2-user", + "ssh_password": "vagrant", + "vboxmanage": [ + [ + "modifyvm", + "{{.Name}}", + "--memory", + "{{ user `memory` }}" + ], + [ + "modifyvm", + "{{.Name}}", + "--cpus", + "{{ user `cpus` }}" + ] + ], + "virtualbox_version_file": ".vbox_version", + "vm_name": "{{ user `template` }}" + } + ], + "post-processors": [ + { + "output": "../builds/{{user `box_basename`}}.{{.Provider}}.box", + "type": "vagrant" + } + ], + "provisioners": [ + { + "environment_vars": [ + "HOME_DIR=/home/vagrant", + "http_proxy={{user `http_proxy`}}", + "https_proxy={{user `https_proxy`}}", + "no_proxy={{user `no_proxy`}}" + ], + "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", + "expect_disconnect": true, + "scripts": [ + "scripts/update.sh", + "../_common/sshd.sh", + "scripts/networking.sh", + "../_common/vagrant.sh", + "../_common/virtualbox.sh", + "scripts/cleanup.sh", + "../_common/minimize.sh" + ], + "type": "shell" + } + ], + "variables": { + "box_basename": "amazon-2", + "build_timestamp": "{{isotime \"20060102150405\"}}", + "cpus": "1", + "disk_size": "65536", + "git_revision": "__unknown_git_revision__", + "headless": "", + "http_proxy": "{{env `http_proxy`}}", + "https_proxy": "{{env `https_proxy`}}", + "memory": "1024", + "name": "amazon-2", + "no_proxy": "{{env `no_proxy`}}", + "template": "amazon-2-x86_64", + "version": "TIMESTAMP" + } +} diff --git a/amazon/scripts/cleanup.sh b/amazon/scripts/cleanup.sh new file mode 100644 index 000000000..5d4b2cc9d --- /dev/null +++ b/amazon/scripts/cleanup.sh @@ -0,0 +1,59 @@ +#!/bin/sh -eux + +# should output one of 'redhat' 'centos' 'oraclelinux' +distro="`rpm -qf --queryformat '%{NAME}' /etc/redhat-release | cut -f 1 -d '-'`" + +# Remove development and kernel source packages +yum -y remove gcc cpp kernel-devel kernel-headers; + +# Clean up network interface persistence +rm -f /etc/udev/rules.d/70-persistent-net.rules; +mkdir -p /etc/udev/rules.d/70-persistent-net.rules; +rm -f /lib/udev/rules.d/75-persistent-net-generator.rules; +rm -rf /dev/.udev/; + +for ndev in `ls -1 /etc/sysconfig/network-scripts/ifcfg-*`; do + if [ "`basename $ndev`" != "ifcfg-lo" ]; then + sed -i '/^HWADDR/d' "$ndev"; + sed -i '/^UUID/d' "$ndev"; + fi +done + +# new-style network device naming for centos7 +if grep -q -i "release 7" /etc/redhat-release ; then + # radio off & remove all interface configration + nmcli radio all off + /bin/systemctl stop NetworkManager.service + for ifcfg in `ls /etc/sysconfig/network-scripts/ifcfg-* |grep -v ifcfg-lo` ; do + rm -f $ifcfg + done + rm -rf /var/lib/NetworkManager/* + + echo "==> Setup /etc/rc.d/rc.local for CentOS7" + cat <<_EOF_ | cat >> /etc/rc.d/rc.local +#BENTO-BEGIN +LANG=C +# delete all connection +for con in \`nmcli -t -f uuid con\`; do + if [ "\$con" != "" ]; then + nmcli con del \$con + fi +done +# add gateway interface connection. +gwdev=\`nmcli dev | grep ethernet | egrep -v 'unmanaged' | head -n 1 | awk '{print \$1}'\` +if [ "\$gwdev" != "" ]; then + nmcli c add type eth ifname \$gwdev con-name \$gwdev +fi +sed -i "/^#BENTO-BEGIN/,/^#BENTO-END/d" /etc/rc.d/rc.local +chmod -x /etc/rc.d/rc.local +#BENTO-END +_EOF_ + chmod +x /etc/rc.d/rc.local +fi + +# delete any logs that have built up during the install +find /var/log/ -name *.log -exec rm -f {} \; + +# remove previous kernels that yum preserved for rollback +yum install -y yum-utils +package-cleanup --oldkernels --count=1 -y diff --git a/amazon/scripts/networking.sh b/amazon/scripts/networking.sh new file mode 100644 index 000000000..285079cf8 --- /dev/null +++ b/amazon/scripts/networking.sh @@ -0,0 +1,15 @@ +#!/bin/sh -eux + +case "$PACKER_BUILDER_TYPE" in + +virtualbox-iso|virtualbox-ovf) + # Fix slow DNS: + # Add 'single-request-reopen' so it is included when /etc/resolv.conf is + # generated + # https://access.redhat.com/site/solutions/58625 (subscription required) + echo 'RES_OPTIONS="single-request-reopen"' >>/etc/sysconfig/network; + service network restart; + echo 'Slow DNS fix applied (single-request-reopen)'; + ;; + +esac diff --git a/amazon/scripts/update.sh b/amazon/scripts/update.sh new file mode 100644 index 000000000..131d8cdb9 --- /dev/null +++ b/amazon/scripts/update.sh @@ -0,0 +1,5 @@ +#!/bin/sh -eux + +yum -y update; +reboot; +sleep 60; From d19497fff0b1d4b52a0c36899d3e7dde62d5ca7a Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith@chef.io> Date: Fri, 30 Nov 2018 13:16:46 -0800 Subject: [PATCH 0892/1622] Update Oracle Linux 7.5 -> 7.6 Use the latest release Signed-off-by: Tim Smith <tsmith@chef.io> --- ...oracle-7.5-x86_64.json => oracle-7.6-x86_64.json} | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) rename oraclelinux/{oracle-7.5-x86_64.json => oracle-7.6-x86_64.json} (95%) diff --git a/oraclelinux/oracle-7.5-x86_64.json b/oraclelinux/oracle-7.6-x86_64.json similarity index 95% rename from oraclelinux/oracle-7.5-x86_64.json rename to oraclelinux/oracle-7.6-x86_64.json index 9ff4e022d..c54cfeab4 100644 --- a/oraclelinux/oracle-7.5-x86_64.json +++ b/oraclelinux/oracle-7.6-x86_64.json @@ -155,7 +155,7 @@ ], "variables": { "arch": "64", - "box_basename": "oracle-7.5", + "box_basename": "oracle-7.6", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", "disk_size": "65536", @@ -163,16 +163,16 @@ "headless": "", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", - "iso_checksum": "d0cc4493db10c2a49084f872083ed9ed6a09cc065064c009734712b9ef357886", + "iso_checksum": "a3156e9dc53ace74b81f6e37f284b74498057efd02babebd88aa2a51cc44d7e7", "iso_checksum_type": "sha256", - "iso_name": "OracleLinux-R7-U5-Server-x86_64-dvd.iso", + "iso_name": "OracleLinux-R7-U6-Server-x86_64-dvd.iso", "ks_path": "7/ks.cfg", "memory": "1024", "mirror": "http://mirrors.dotsrc.org/oracle-linux", - "mirror_directory": "OL7/u5/x86_64", - "name": "oracle-7.5", + "mirror_directory": "OL7/u6/x86_64", + "name": "oracle-7.6", "no_proxy": "{{env `no_proxy`}}", - "template": "oracle-7.5-x86_64", + "template": "oracle-7.6-x86_64", "version": "TIMESTAMP" } } From 2d8740de23d19c994c2aff28ac86dae30891bf09 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith@chef.io> Date: Fri, 30 Nov 2018 13:49:33 -0800 Subject: [PATCH 0893/1622] Update Travis to use Ruby 2.5.3 and Packer 1.3.2 Update to the latest versions in Travis Signed-off-by: Tim Smith <tsmith@chef.io> --- .travis.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index ae3f79a8a..1b243456e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,13 +1,13 @@ -dist: trusty +dist: xenial sudo: false env: global: - - PACKER_VERSION="1.2.4" + - PACKER_VERSION="1.3.2" - PATH=$HOME/bin:$PATH rvm: - - 2.5.1 + - 2.5.3 - ruby-head matrix: From cecaee41864d9e8100f0159e61d96a6149323589 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith@chef.io> Date: Fri, 30 Nov 2018 13:54:02 -0800 Subject: [PATCH 0894/1622] Add a basically empty expeditor config This will start notifying on merges and it'll clean up branches. Signed-off-by: Tim Smith <tsmith@chef.io> --- .expeditor/config.yml | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 .expeditor/config.yml diff --git a/.expeditor/config.yml b/.expeditor/config.yml new file mode 100644 index 000000000..3f47288bb --- /dev/null +++ b/.expeditor/config.yml @@ -0,0 +1,8 @@ +# Documentation available at https://expeditor.chef.io/docs/getting-started/ + +# Slack channel in Chef Software slack to send notifications about build failures, etc +slack: + notify_channel: chef-notify + +github: + delete_branch_on_merge: true From d7901bb6d9641db29d49718f702b2653bfed596c Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith@chef.io> Date: Fri, 30 Nov 2018 14:50:49 -0800 Subject: [PATCH 0895/1622] Add providers and update builds Signed-off-by: Tim Smith <tsmith@chef.io> --- builds.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/builds.yml b/builds.yml index 60663f7a0..5aea7a95b 100644 --- a/builds.yml +++ b/builds.yml @@ -6,18 +6,16 @@ public: - 'ubuntu-18.04' - 'ubuntu-16.04' - 'ubuntu-14.04' -- 'debian-9.5' +- 'debian-9.6' - 'debian-8.11' -- 'oracle-7.5' +- 'oracle-7.6' - 'oracle-6.10' - 'fedora-29' - 'fedora-28' -- 'fedora-27' - 'opensuse-leap-42.3' - 'opensuse-leap-15.0' - 'freebsd-11.2' - 'freebsd-11.2-i386' -- 'freebsd-10.4' - 'hardenedbsd-11' - 'centos-6.10-i386' - 'centos-5.11-i386' @@ -25,17 +23,19 @@ public: - 'ubuntu-16.04-i386' - 'ubuntu-14.04-i386' - 'debian-8.11-i386' -- 'debian-9.5-i386' +- 'debian-9.6-i386' slugs: 'centos-7': 'centos-7.5' 'centos-6': 'centos-6.10' 'centos-5': 'centos-5.11' - 'debian-9': 'debian-9.5' + 'debian-9': 'debian-9.6' 'debian-8': 'debian-8.11' - 'oracle-7': 'oracle-7.5' + 'oracle-7': 'oracle-7.6' 'oracle-6': 'oracle-6.10' 'freebsd-11': 'freebsd-11.2' - 'freebsd-10': 'freebsd-10.4' 'opensuse-leap-42': 'opensuse-leap-42.3' 'opensuse-leap-15': 'opensuse-leap-15.0' + +providers: +- virtualbox-iso From ac3247c1aa5a4c7b6b085766fae913dbe26425fc Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith@chef.io> Date: Fri, 30 Nov 2018 15:01:40 -0800 Subject: [PATCH 0896/1622] Fail better if the bento-ya gem isn't installed Signed-off-by: Tim Smith <tsmith@chef.io> --- Rakefile | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/Rakefile b/Rakefile index 132f73fe2..91cdb7906 100644 --- a/Rakefile +++ b/Rakefile @@ -1,6 +1,14 @@ require "yaml" require "fileutils" +# we load the bento gem here just so we can make sure it was installed +begin + require "bento" +rescue LoadError + puts "bento-ya gem does't appear to be installed. Either install the gem or bundle install first." + exit! +end + desc "clean, build, test, upload" task :do_all do check_env From b95097cbc67d423b0bd4ae1affd9ea9ddf6a5dcd Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith@chef.io> Date: Fri, 30 Nov 2018 15:38:26 -0800 Subject: [PATCH 0897/1622] Sort the builds Signed-off-by: Tim Smith <tsmith@chef.io> --- builds.yml | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/builds.yml b/builds.yml index 5aea7a95b..1faea06f7 100644 --- a/builds.yml +++ b/builds.yml @@ -1,29 +1,29 @@ --- public: -- 'centos-7.5' -- 'centos-6.10' +- 'centos-5.11-i386' - 'centos-5.11' -- 'ubuntu-18.04' -- 'ubuntu-16.04' -- 'ubuntu-14.04' -- 'debian-9.6' +- 'centos-6.10-i386' +- 'centos-6.10' +- 'centos-7.5' +- 'debian-8.11-i386' - 'debian-8.11' -- 'oracle-7.6' -- 'oracle-6.10' -- 'fedora-29' +- 'debian-9.6-i386' +- 'debian-9.6' - 'fedora-28' -- 'opensuse-leap-42.3' -- 'opensuse-leap-15.0' -- 'freebsd-11.2' +- 'fedora-29' - 'freebsd-11.2-i386' +- 'freebsd-11.2' - 'hardenedbsd-11' -- 'centos-6.10-i386' -- 'centos-5.11-i386' +- 'opensuse-leap-15.0' +- 'opensuse-leap-42.3' - 'oracle-6.10-i386' -- 'ubuntu-16.04-i386' +- 'oracle-6.10' +- 'oracle-7.6' - 'ubuntu-14.04-i386' -- 'debian-8.11-i386' -- 'debian-9.6-i386' +- 'ubuntu-14.04' +- 'ubuntu-16.04-i386' +- 'ubuntu-16.04' +- 'ubuntu-18.04' slugs: 'centos-7': 'centos-7.5' @@ -38,4 +38,4 @@ slugs: 'opensuse-leap-15': 'opensuse-leap-15.0' providers: -- virtualbox-iso +- virtualbox-iso From a29be9d13dbefa7e1a2082326bfa566a8c86a4b1 Mon Sep 17 00:00:00 2001 From: Bogdan Soroka <sorbog@gmail.com> Date: Mon, 3 Dec 2018 15:31:55 +0200 Subject: [PATCH 0898/1622] Reduce locale size Signed-off-by: Bogdan Soroka <sorbog@gmail.com> --- centos/http/5/ks.cfg | 2 +- centos/http/6/ks.cfg | 2 +- centos/http/7/ks.cfg | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/centos/http/5/ks.cfg b/centos/http/5/ks.cfg index 2884f561f..c6abf1929 100644 --- a/centos/http/5/ks.cfg +++ b/centos/http/5/ks.cfg @@ -19,7 +19,7 @@ reboot user --name=vagrant --password vagrant key --skip -%packages --nobase --ignoremissing --excludedocs +%packages --nobase --ignoremissing --excludedocs --instLangs=en_US.utf8 # vagrant needs this to copy initial files via scp openssh-clients openssh-server diff --git a/centos/http/6/ks.cfg b/centos/http/6/ks.cfg index 931bea276..dc01aa1de 100644 --- a/centos/http/6/ks.cfg +++ b/centos/http/6/ks.cfg @@ -20,7 +20,7 @@ reboot --eject user --name=vagrant --plaintext --password vagrant key --skip -%packages --nobase --ignoremissing --excludedocs +%packages --nobase --ignoremissing --excludedocs --instLangs=en_US.utf8 # vagrant needs this to copy initial files via scp openssh-clients sudo diff --git a/centos/http/7/ks.cfg b/centos/http/7/ks.cfg index 064288110..51c0acc21 100644 --- a/centos/http/7/ks.cfg +++ b/centos/http/7/ks.cfg @@ -19,7 +19,7 @@ firstboot --disabled reboot --eject user --name=vagrant --plaintext --password vagrant -%packages --nobase --ignoremissing --excludedocs +%packages --nobase --ignoremissing --excludedocs --instLangs=en_US.utf8 # vagrant needs this to copy initial files via scp openssh-clients sudo From 5d1643638a05f280aa0afc118aa3ca73d0716f13 Mon Sep 17 00:00:00 2001 From: Bogdan Soroka <sorbog@gmail.com> Date: Mon, 3 Dec 2018 16:14:14 +0200 Subject: [PATCH 0899/1622] Whiteout all spaces Signed-off-by: Bogdan Soroka <sorbog@gmail.com> --- _common/minimize.sh | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/_common/minimize.sh b/_common/minimize.sh index 0173b4233..dec8a5694 100644 --- a/_common/minimize.sh +++ b/_common/minimize.sh @@ -4,17 +4,22 @@ case "$PACKER_BUILDER_TYPE" in qemu) exit 0 ;; esac -# Whiteout root -count=$(df --sync -kP / | tail -n1 | awk -F ' ' '{print $4}') -count=$(($count-1)) -dd if=/dev/zero of=/tmp/whitespace bs=1M count=$count || echo "dd exit code $? is suppressed"; -rm /tmp/whitespace +# Whiteout all spaces +spaces=( + '/' + '/usr/' + '/tmp/' + '/var/' + '/home/' + '/boot/' +); -# Whiteout /boot -count=$(df --sync -kP /boot | tail -n1 | awk -F ' ' '{print $4}') -count=$(($count-1)) -dd if=/dev/zero of=/boot/whitespace bs=1M count=$count || echo "dd exit code $? is suppressed"; -rm /boot/whitespace +for space in "${spaces[@]}"; do + count=$(df --sync -kP ${space} | tail -n1 | awk -F ' ' '{print $4}') + count=$(($count-1)) + dd if=/dev/zero of=${space}whitespace bs=1M count=${count} || echo "dd exit code $? is suppressed"; + rm -f ${space}whitespace +done set +e swapuuid="`/sbin/blkid -o value -l -s UUID -t TYPE=swap`"; From c0da2b59bb65ac25d07b498637635c9be32b0eee Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith@chef.io> Date: Fri, 7 Dec 2018 11:22:15 -0800 Subject: [PATCH 0900/1622] Add a code of conduct file Signed-off-by: Tim Smith <tsmith@chef.io> --- CODE_OF_CONDUCT.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 CODE_OF_CONDUCT.md diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md new file mode 100644 index 000000000..980c1341a --- /dev/null +++ b/CODE_OF_CONDUCT.md @@ -0,0 +1 @@ +Please refer to the Chef Community Code of Conduct at https://www.chef.io/code-of-conduct/ From 97e31673fd4b6c09ecc1a737740dcd6ef82de82b Mon Sep 17 00:00:00 2001 From: Artem Sidorenko <artem@posteo.de> Date: Tue, 11 Dec 2018 16:29:54 +0100 Subject: [PATCH 0901/1622] CentOS 7.6 Signed-off-by: Artem Sidorenko <artem@posteo.de> --- .../{centos-7.5-x86_64.json => centos-7.6-x86_64.json} | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) rename centos/{centos-7.5-x86_64.json => centos-7.6-x86_64.json} (96%) diff --git a/centos/centos-7.5-x86_64.json b/centos/centos-7.6-x86_64.json similarity index 96% rename from centos/centos-7.5-x86_64.json rename to centos/centos-7.6-x86_64.json index af5df4880..2c59406fc 100644 --- a/centos/centos-7.5-x86_64.json +++ b/centos/centos-7.6-x86_64.json @@ -181,7 +181,7 @@ } ], "variables": { - "box_basename": "centos-7.5", + "box_basename": "centos-7.6", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", "disk_size": "65536", @@ -191,16 +191,16 @@ "https_proxy": "{{env `https_proxy`}}", "hyperv_generation": "1", "hyperv_switch": "{{env `hyperv_switch`}}", - "iso_checksum": "506e4e06abf778c3435b4e5745df13e79ebfc86565d7ea1e128067ef6b5a6345", + "iso_checksum": "6d44331cc4f6c506c7bbe9feb8468fad6c51a88ca1393ca6b8b486ea04bec3c1", "iso_checksum_type": "sha256", - "iso_name": "CentOS-7-x86_64-DVD-1804.iso", + "iso_name": "CentOS-7-x86_64-DVD-1810.iso", "ks_path": "7/ks.cfg", "memory": "1024", "mirror": "http://mirrors.kernel.org/centos", - "mirror_directory": "7.5.1804/isos/x86_64", + "mirror_directory": "7.6.1810/isos/x86_64", "name": "centos-7.5", "no_proxy": "{{env `no_proxy`}}", - "template": "centos-7.5-x86_64", + "template": "centos-7.6-x86_64", "version": "TIMESTAMP" } } From 83935e4e30d2b46666efb05f085e28f222739898 Mon Sep 17 00:00:00 2001 From: Li-Wen Hsu <lwhsu@lwhsu.org> Date: Wed, 12 Dec 2018 03:17:00 +0800 Subject: [PATCH 0902/1622] Add FreeBSD 12.0-RELEASE Signed-off-by: Li-Wen Hsu <lwhsu@lwhsu.org> --- builds.yml | 3 + freebsd/freebsd-12.0-amd64.json | 229 ++++++++++++++++++++++++++++++++ freebsd/freebsd-12.0-i386.json | 229 ++++++++++++++++++++++++++++++++ 3 files changed, 461 insertions(+) create mode 100644 freebsd/freebsd-12.0-amd64.json create mode 100644 freebsd/freebsd-12.0-i386.json diff --git a/builds.yml b/builds.yml index 1faea06f7..2c6149d63 100644 --- a/builds.yml +++ b/builds.yml @@ -13,6 +13,8 @@ public: - 'fedora-29' - 'freebsd-11.2-i386' - 'freebsd-11.2' +- 'freebsd-12.0-i386' +- 'freebsd-12.0' - 'hardenedbsd-11' - 'opensuse-leap-15.0' - 'opensuse-leap-42.3' @@ -34,6 +36,7 @@ slugs: 'oracle-7': 'oracle-7.6' 'oracle-6': 'oracle-6.10' 'freebsd-11': 'freebsd-11.2' + 'freebsd-12': 'freebsd-12.0' 'opensuse-leap-42': 'opensuse-leap-42.3' 'opensuse-leap-15': 'opensuse-leap-15.0' diff --git a/freebsd/freebsd-12.0-amd64.json b/freebsd/freebsd-12.0-amd64.json new file mode 100644 index 000000000..fa2f5cb46 --- /dev/null +++ b/freebsd/freebsd-12.0-amd64.json @@ -0,0 +1,229 @@ +{ + "builders": [ + { + "boot_command": [ + "<esc><wait>", + "boot -s<wait>", + "<enter><wait>", + "<wait10><wait10>", + "/bin/sh<enter><wait>", + "mdmfs -s 100m md1 /tmp<enter><wait>", + "mdmfs -s 100m md2 /mnt<enter><wait>", + "dhclient -l /tmp/dhclient.lease.em0 em0<enter><wait>", + "fetch -o /tmp/installerconfig http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} && bsdinstall script /tmp/installerconfig<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": "{{user `disk_size`}}", + "guest_additions_mode": "disable", + "guest_os_type": "FreeBSD_64", + "headless": "{{ user `headless` }}", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "../builds/packer-{{user `template`}}-virtualbox", + "shutdown_command": "echo 'vagrant' | su -m root -c 'shutdown -p now'", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "virtualbox-iso", + "vboxmanage": [ + [ + "modifyvm", + "{{.Name}}", + "--memory", + "{{ user `memory` }}" + ], + [ + "modifyvm", + "{{.Name}}", + "--cpus", + "{{ user `cpus` }}" + ] + ], + "virtualbox_version_file": ".vbox_version", + "vm_name": "{{ user `template` }}" + }, + { + "boot_command": [ + "<esc><wait>", + "boot -s<wait>", + "<enter><wait>", + "<wait10><wait10>", + "/bin/sh<enter><wait>", + "mdmfs -s 100m md1 /tmp<enter><wait>", + "mdmfs -s 100m md2 /mnt<enter><wait>", + "dhclient -l /tmp/dhclient.lease.em0 em0<enter><wait>", + "<wait5>", + "fetch -o /tmp/installerconfig http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} && bsdinstall script /tmp/installerconfig<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": "{{user `disk_size`}}", + "guest_os_type": "freebsd-64", + "headless": "{{ user `headless` }}", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "../builds/packer-{{user `template`}}-vmware", + "shutdown_command": "echo 'vagrant' | su -m root -c 'shutdown -p now'", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "vmware-iso", + "vm_name": "{{ user `template` }}", + "vmx_data": { + "cpuid.coresPerSocket": "1", + "memsize": "{{ user `memory` }}", + "numvcpus": "{{ user `cpus` }}" + }, + "vmx_remove_ethernet_interfaces": true + }, + { + "boot_command": [ + "<esc><wait>", + "boot -s<wait>", + "<enter><wait>", + "<wait10><wait10>", + "/bin/sh<enter><wait>", + "mdmfs -s 100m md1 /tmp<enter><wait>", + "mdmfs -s 100m md2 /mnt<enter><wait>", + "dhclient -l /tmp/dhclient.lease.em0 em0<enter><wait>", + "fetch -o /tmp/installerconfig http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} && bsdinstall script /tmp/installerconfig<enter><wait>" + ], + "boot_wait": "8s", + "disk_size": "{{user `disk_size`}}", + "guest_os_type": "freebsd", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "../builds/packer-{{user `template`}}-parallels", + "parallels_tools_mode": "disable", + "prlctl": [ + [ + "set", + "{{.Name}}", + "--memsize", + "{{ user `memory` }}" + ], + [ + "set", + "{{.Name}}", + "--cpus", + "{{ user `cpus` }}" + ], + [ + "set", + "{{.Name}}", + "--device-set", + "cdrom0", + "--iface", + "ide" + ], + [ + "set", + "{{.Name}}", + "--device-del", + "fdd0" + ], + [ + "set", + "{{.Name}}", + "--device-del", + "parallel0" + ] + ], + "prlctl_version_file": ".prlctl_version", + "shutdown_command": "echo 'vagrant' | su -m root -c 'shutdown -p now'", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "parallels-iso", + "vm_name": "{{ user `template` }}" + }, + { + "boot_command": [ + "<esc><wait>", + "boot -s<wait>", + "<enter><wait>", + "<wait10><wait10>", + "/bin/sh<enter><wait>", + "mdmfs -s 100m md1 /tmp<enter><wait>", + "mdmfs -s 100m md2 /mnt<enter><wait>", + "dhclient -l /tmp/dhclient.lease.vtnet0 vtnet0<enter><wait>", + "fetch -o /tmp/installerconfig http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} && bsdinstall script /tmp/installerconfig<enter><wait>" + ], + "boot_wait": "7s", + "disk_size": "{{user `disk_size`}}", + "headless": "{{ user `headless` }}", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "../builds/packer-{{user `template`}}-qemu", + "shutdown_command": "echo 'vagrant' | su -m root -c 'shutdown -p now'", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "qemu", + "vm_name": "{{ user `template` }}" + } + ], + "post-processors": [ + { + "output": "../builds/{{user `box_basename`}}.{{.Provider}}.box", + "type": "vagrant", + "vagrantfile_template": "vagrantfile_templates/freebsd.rb" + } + ], + "provisioners": [ + { + "environment_vars": [ + "HOME_DIR=/home/vagrant", + "http_proxy={{user `http_proxy`}}", + "https_proxy={{user `https_proxy`}}", + "no_proxy={{user `no_proxy`}}", + "pkg_branch={{user `pkg_branch`}}" + ], + "execute_command": "echo 'vagrant' | {{.Vars}} su -m root -c 'sh -eux {{.Path}}'", + "expect_disconnect": true, + "scripts": [ + "scripts/update.sh", + "scripts/postinstall.sh", + "scripts/sudoers.sh", + "../_common/vagrant.sh", + "scripts/vmtools.sh", + "scripts/cleanup.sh", + "scripts/minimize.sh" + ], + "type": "shell" + } + ], + "variables": { + "box_basename": "freebsd-12.0", + "build_timestamp": "{{isotime \"20060102150405\"}}", + "cpus": "1", + "disk_size": "65536", + "git_revision": "__unknown_git_revision__", + "headless": "", + "http_proxy": "{{env `http_proxy`}}", + "https_proxy": "{{env `https_proxy`}}", + "install_path": "freebsd-11/installerconfig", + "iso_checksum": "63abec8aeb915f1a021dd2df6c7767251f9b6e87f403b7ddf9a423446d0a5453", + "iso_checksum_type": "sha256", + "iso_name": "FreeBSD-12.0-RELEASE-amd64-disc1.iso", + "memory": "1024", + "mirror": "https://download.freebsd.org/ftp", + "mirror_directory": "releases/amd64/amd64/ISO-IMAGES/12.0", + "name": "freebsd-12.0", + "no_proxy": "{{env `no_proxy`}}", + "pkg_branch": "quarterly", + "template": "freebsd-12.0-amd64", + "version": "TIMESTAMP" + } +} diff --git a/freebsd/freebsd-12.0-i386.json b/freebsd/freebsd-12.0-i386.json new file mode 100644 index 000000000..64eda4c38 --- /dev/null +++ b/freebsd/freebsd-12.0-i386.json @@ -0,0 +1,229 @@ +{ + "builders": [ + { + "boot_command": [ + "<esc><wait>", + "boot -s<wait>", + "<enter><wait>", + "<wait10><wait10>", + "/bin/sh<enter><wait>", + "mdmfs -s 100m md1 /tmp<enter><wait>", + "mdmfs -s 100m md2 /mnt<enter><wait>", + "dhclient -l /tmp/dhclient.lease.em0 em0<enter><wait>", + "fetch -o /tmp/installerconfig http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} && bsdinstall script /tmp/installerconfig<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": "{{user `disk_size`}}", + "guest_additions_mode": "disable", + "guest_os_type": "FreeBSD", + "headless": "{{ user `headless` }}", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "../builds/packer-{{user `template`}}-virtualbox", + "shutdown_command": "echo 'vagrant' | su -m root -c 'shutdown -p now'", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "virtualbox-iso", + "vboxmanage": [ + [ + "modifyvm", + "{{.Name}}", + "--memory", + "{{ user `memory` }}" + ], + [ + "modifyvm", + "{{.Name}}", + "--cpus", + "{{ user `cpus` }}" + ] + ], + "virtualbox_version_file": ".vbox_version", + "vm_name": "{{ user `template` }}" + }, + { + "boot_command": [ + "<esc><wait>", + "boot -s<wait>", + "<enter><wait>", + "<wait10><wait10>", + "/bin/sh<enter><wait>", + "mdmfs -s 100m md1 /tmp<enter><wait>", + "mdmfs -s 100m md2 /mnt<enter><wait>", + "dhclient -l /tmp/dhclient.lease.em0 em0<enter><wait>", + "<wait5>", + "fetch -o /tmp/installerconfig http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} && bsdinstall script /tmp/installerconfig<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": "{{user `disk_size`}}", + "guest_os_type": "freebsd", + "headless": "{{ user `headless` }}", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "../builds/packer-{{user `template`}}-vmware", + "shutdown_command": "echo 'vagrant' | su -m root -c 'shutdown -p now'", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "vmware-iso", + "vm_name": "{{ user `template` }}", + "vmx_data": { + "cpuid.coresPerSocket": "1", + "memsize": "{{ user `memory` }}", + "numvcpus": "{{ user `cpus` }}" + }, + "vmx_remove_ethernet_interfaces": true + }, + { + "boot_command": [ + "<esc><wait>", + "boot -s<wait>", + "<enter><wait>", + "<wait10><wait10>", + "/bin/sh<enter><wait>", + "mdmfs -s 100m md1 /tmp<enter><wait>", + "mdmfs -s 100m md2 /mnt<enter><wait>", + "dhclient -l /tmp/dhclient.lease.em0 em0<enter><wait>", + "fetch -o /tmp/installerconfig http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} && bsdinstall script /tmp/installerconfig<enter><wait>" + ], + "boot_wait": "8s", + "disk_size": "{{user `disk_size`}}", + "guest_os_type": "freebsd", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "../builds/packer-{{user `template`}}-parallels", + "parallels_tools_mode": "disable", + "prlctl": [ + [ + "set", + "{{.Name}}", + "--memsize", + "{{ user `memory` }}" + ], + [ + "set", + "{{.Name}}", + "--cpus", + "{{ user `cpus` }}" + ], + [ + "set", + "{{.Name}}", + "--device-set", + "cdrom0", + "--iface", + "ide" + ], + [ + "set", + "{{.Name}}", + "--device-del", + "fdd0" + ], + [ + "set", + "{{.Name}}", + "--device-del", + "parallel0" + ] + ], + "prlctl_version_file": ".prlctl_version", + "shutdown_command": "echo 'vagrant' | su -m root -c 'shutdown -p now'", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "parallels-iso", + "vm_name": "{{ user `template` }}" + }, + { + "boot_command": [ + "<esc><wait>", + "boot -s<wait>", + "<enter><wait>", + "<wait10><wait10>", + "/bin/sh<enter><wait>", + "mdmfs -s 100m md1 /tmp<enter><wait>", + "mdmfs -s 100m md2 /mnt<enter><wait>", + "dhclient -l /tmp/dhclient.lease.vtnet0 vtnet0<enter><wait>", + "fetch -o /tmp/installerconfig http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} && bsdinstall script /tmp/installerconfig<enter><wait>" + ], + "boot_wait": "7s", + "disk_size": "{{user `disk_size`}}", + "headless": "{{ user `headless` }}", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "../builds/packer-{{user `template`}}-qemu", + "shutdown_command": "echo 'vagrant' | su -m root -c 'shutdown -p now'", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "qemu", + "vm_name": "{{ user `template` }}" + } + ], + "post-processors": [ + { + "output": "../builds/{{user `box_basename`}}.{{.Provider}}.box", + "type": "vagrant", + "vagrantfile_template": "vagrantfile_templates/freebsd.rb" + } + ], + "provisioners": [ + { + "environment_vars": [ + "HOME_DIR=/home/vagrant", + "http_proxy={{user `http_proxy`}}", + "https_proxy={{user `https_proxy`}}", + "no_proxy={{user `no_proxy`}}", + "pkg_branch={{user `pkg_branch`}}" + ], + "execute_command": "echo 'vagrant' | {{.Vars}} su -m root -c 'sh -eux {{.Path}}'", + "expect_disconnect": true, + "scripts": [ + "scripts/update.sh", + "scripts/postinstall.sh", + "scripts/sudoers.sh", + "../_common/vagrant.sh", + "scripts/vmtools.sh", + "scripts/cleanup.sh", + "scripts/minimize.sh" + ], + "type": "shell" + } + ], + "variables": { + "box_basename": "freebsd-12.0-i386", + "build_timestamp": "{{isotime \"20060102150405\"}}", + "cpus": "1", + "disk_size": "40960", + "git_revision": "__unknown_git_revision__", + "headless": "", + "http_proxy": "{{env `http_proxy`}}", + "https_proxy": "{{env `https_proxy`}}", + "install_path": "freebsd-11/installerconfig", + "iso_checksum": "c2a2a18e9e803e1849533c5c7640f1eec058ef1426fb8fa62769d2fcbd58d485", + "iso_checksum_type": "sha256", + "iso_name": "FreeBSD-12.0-RELEASE-i386-disc1.iso", + "memory": "1024", + "mirror": "https://download.freebsd.org/ftp", + "mirror_directory": "releases/i386/i386/ISO-IMAGES/12.0", + "name": "freebsd-12.0-i386", + "no_proxy": "{{env `no_proxy`}}", + "pkg_branch": "quarterly", + "template": "freebsd-12.0-i386", + "version": "TIMESTAMP" + } +} From f253152150ee578e237ef2f69283b8c7e73e3cc8 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith@chef.io> Date: Tue, 11 Dec 2018 12:43:34 -0800 Subject: [PATCH 0903/1622] Revert "Whiteout all spaces" This reverts commit 5d1643638a05f280aa0afc118aa3ca73d0716f13. --- _common/minimize.sh | 25 ++++++++++--------------- 1 file changed, 10 insertions(+), 15 deletions(-) diff --git a/_common/minimize.sh b/_common/minimize.sh index dec8a5694..0173b4233 100644 --- a/_common/minimize.sh +++ b/_common/minimize.sh @@ -4,22 +4,17 @@ case "$PACKER_BUILDER_TYPE" in qemu) exit 0 ;; esac -# Whiteout all spaces -spaces=( - '/' - '/usr/' - '/tmp/' - '/var/' - '/home/' - '/boot/' -); +# Whiteout root +count=$(df --sync -kP / | tail -n1 | awk -F ' ' '{print $4}') +count=$(($count-1)) +dd if=/dev/zero of=/tmp/whitespace bs=1M count=$count || echo "dd exit code $? is suppressed"; +rm /tmp/whitespace -for space in "${spaces[@]}"; do - count=$(df --sync -kP ${space} | tail -n1 | awk -F ' ' '{print $4}') - count=$(($count-1)) - dd if=/dev/zero of=${space}whitespace bs=1M count=${count} || echo "dd exit code $? is suppressed"; - rm -f ${space}whitespace -done +# Whiteout /boot +count=$(df --sync -kP /boot | tail -n1 | awk -F ' ' '{print $4}') +count=$(($count-1)) +dd if=/dev/zero of=/boot/whitespace bs=1M count=$count || echo "dd exit code $? is suppressed"; +rm /boot/whitespace set +e swapuuid="`/sbin/blkid -o value -l -s UUID -t TYPE=swap`"; From eafdd6514581666bbf788ef8c154367abfb0d8e5 Mon Sep 17 00:00:00 2001 From: J Lynn <j@jaesharp.com> Date: Tue, 18 Dec 2018 07:58:32 +1100 Subject: [PATCH 0904/1622] Build Debian 9 image using qemu builder for ppc64le Signed-off-by: J Lynn <j@jaesharp.com> --- debian/debian-9.6-ppc64el.json | 103 +++++++++++++++++++++++++++++++++ 1 file changed, 103 insertions(+) create mode 100644 debian/debian-9.6-ppc64el.json diff --git a/debian/debian-9.6-ppc64el.json b/debian/debian-9.6-ppc64el.json new file mode 100644 index 000000000..d9e4783eb --- /dev/null +++ b/debian/debian-9.6-ppc64el.json @@ -0,0 +1,103 @@ +{ + "builders": [ + { + "boot_command": [ + "e<wait>", + "<del><del><del><del><del><del><del><del><del><del>", + "<del><del><del><del><del><del><del><del><del><del>", + "<del><del><del><del><del><del><del><del><del><del>", + "<del><del><del><del><del><del><del><del><del><del>", + "<del><del><del><del><del><del><del><del><del><del><wait>", + "setparams 'Automated install'<enter><wait>", + "<enter><wait>", + "set options=\" preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}} <wait>", + "debian-installer=en_US.UTF-8 <wait>", + "auto <wait>", + "locale=en_US.UTF-8 <wait>", + "kbd-chooser/method=us <wait>", + "keyboard-configuration/xkb-keymap=us <wait>", + "netcfg/get_hostname={{ .Name }} <wait>", + "netcfg/get_domain=vagrantup.com <wait>", + "fb=false <wait>", + "debconf/frontend=noninteractive <wait>", + "console-setup/ask_detect=false <wait>", + "console-keymaps-at/keymap=us <wait>", + "grub-installer/bootdev=/dev/vda1 <wait>", + "\"", + "<enter><wait>", + "boot_one<wait>", + "<f10>" + ], + "boot_wait": "10s", + "disk_size": "{{user `disk_size`}}", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "../builds/packer-{{user `template`}}-qemu", + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "qemu", + "qemu_binary": "qemu-system-ppc64le", + "machine_type": "pseries", + "use_default_display": true, + "accelerator": "kvm", + "vm_name": "{{ user `template` }}" + } + ], + "post-processors": [ + { + "output": "../builds/{{user `box_basename`}}.{{.Provider}}.box", + "type": "vagrant" + } + ], + "provisioners": [ + { + "environment_vars": [ + "HOME_DIR=/home/vagrant", + "http_proxy={{user `http_proxy`}}", + "https_proxy={{user `https_proxy`}}", + "no_proxy={{user `no_proxy`}}" + ], + "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", + "expect_disconnect": true, + "scripts": [ + "scripts/update.sh", + "../_common/sshd.sh", + "scripts/networking.sh", + "scripts/sudoers.sh", + "../_common/vagrant.sh", + "scripts/systemd.sh", + "../_common/virtualbox.sh", + "../_common/vmware.sh", + "../_common/parallels.sh", + "scripts/cleanup.sh", + "../_common/minimize.sh" + ], + "type": "shell" + } + ], + "variables": { + "box_basename": "debian-9.6", + "build_timestamp": "{{isotime \"20060102150405\"}}", + "cpus": "1", + "disk_size": "65536", + "git_revision": "__unknown_git_revision__", + "http_proxy": "{{env `http_proxy`}}", + "https_proxy": "{{env `https_proxy`}}", + "iso_checksum": "07a9ddd57826558478b414b5d0b9be15bc793fffcc25e8a10be71b9e109e362e", + "iso_checksum_type": "sha256", + "iso_name": "debian-9.6.0-ppc64el-netinst.iso", + "memory": "1024", + "mirror": "http://cdimage.debian.org/cdimage/release", + "mirror_directory": "9.6.0/ppc64el/iso-cd", + "name": "debian-9.6", + "no_proxy": "{{env `no_proxy`}}", + "preseed_path": "debian-8/preseed.cfg", + "template": "debian-9.6-ppc64el", + "version": "TIMESTAMP" + } +} From 5e8596feca7183946240a7299cd581d6476e4acb Mon Sep 17 00:00:00 2001 From: J Lynn <j@jaesharp.com> Date: Wed, 19 Dec 2018 02:55:24 +1100 Subject: [PATCH 0905/1622] Switch to command-line interface for grub booting Signed-off-by: J Lynn <j@jaesharp.com> --- debian/debian-9.6-ppc64el.json | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/debian/debian-9.6-ppc64el.json b/debian/debian-9.6-ppc64el.json index d9e4783eb..4592d6004 100644 --- a/debian/debian-9.6-ppc64el.json +++ b/debian/debian-9.6-ppc64el.json @@ -2,12 +2,7 @@ "builders": [ { "boot_command": [ - "e<wait>", - "<del><del><del><del><del><del><del><del><del><del>", - "<del><del><del><del><del><del><del><del><del><del>", - "<del><del><del><del><del><del><del><del><del><del>", - "<del><del><del><del><del><del><del><del><del><del>", - "<del><del><del><del><del><del><del><del><del><del><wait>", + "c<wait>", "setparams 'Automated install'<enter><wait>", "<enter><wait>", "set options=\" preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}} <wait>", @@ -26,7 +21,8 @@ "\"", "<enter><wait>", "boot_one<wait>", - "<f10>" + "<enter><wait>", + "boot<enter>" ], "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", From a0fc03c6031c0c6a448f3456d25ff9c3bdda6060 Mon Sep 17 00:00:00 2001 From: J Lynn <j@jaesharp.com> Date: Wed, 19 Dec 2018 02:56:39 +1100 Subject: [PATCH 0906/1622] Add headless option for ppc64el Signed-off-by: J Lynn <j@jaesharp.com> --- debian/debian-9.6-ppc64el.json | 2 ++ 1 file changed, 2 insertions(+) diff --git a/debian/debian-9.6-ppc64el.json b/debian/debian-9.6-ppc64el.json index 4592d6004..d097c1c4f 100644 --- a/debian/debian-9.6-ppc64el.json +++ b/debian/debian-9.6-ppc64el.json @@ -26,6 +26,7 @@ ], "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", + "headless": "{{ user `headless` }}", "http_directory": "http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", @@ -82,6 +83,7 @@ "cpus": "1", "disk_size": "65536", "git_revision": "__unknown_git_revision__", + "headless": "", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", "iso_checksum": "07a9ddd57826558478b414b5d0b9be15bc793fffcc25e8a10be71b9e109e362e", From 8b7d31fc2e4ad43de6fdb90729f63d27264340d0 Mon Sep 17 00:00:00 2001 From: Seth Thomas <sthomas@chef.io> Date: Wed, 26 Dec 2018 20:57:42 -0700 Subject: [PATCH 0907/1622] Fix CentOS 7.6 name field and add to builds Signed-off-by: Seth Thomas <seth.g.thomas@gmail.com> --- builds.yml | 4 ++-- centos/centos-7.6-x86_64.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/builds.yml b/builds.yml index 2c6149d63..d2a82744c 100644 --- a/builds.yml +++ b/builds.yml @@ -4,7 +4,7 @@ public: - 'centos-5.11' - 'centos-6.10-i386' - 'centos-6.10' -- 'centos-7.5' +- 'centos-7.6' - 'debian-8.11-i386' - 'debian-8.11' - 'debian-9.6-i386' @@ -28,7 +28,7 @@ public: - 'ubuntu-18.04' slugs: - 'centos-7': 'centos-7.5' + 'centos-7': 'centos-7.6' 'centos-6': 'centos-6.10' 'centos-5': 'centos-5.11' 'debian-9': 'debian-9.6' diff --git a/centos/centos-7.6-x86_64.json b/centos/centos-7.6-x86_64.json index 2c59406fc..b3bce0221 100644 --- a/centos/centos-7.6-x86_64.json +++ b/centos/centos-7.6-x86_64.json @@ -198,7 +198,7 @@ "memory": "1024", "mirror": "http://mirrors.kernel.org/centos", "mirror_directory": "7.6.1810/isos/x86_64", - "name": "centos-7.5", + "name": "centos-7.6", "no_proxy": "{{env `no_proxy`}}", "template": "centos-7.6-x86_64", "version": "TIMESTAMP" From bd0fbb6dee7fe22b2a2f71938c2906e071f8c6da Mon Sep 17 00:00:00 2001 From: Seth Thomas <seth.g.thomas@gmail.com> Date: Thu, 27 Dec 2018 18:48:49 -0700 Subject: [PATCH 0908/1622] Remove unsupported arg from CentOS 5 kickstart Signed-off-by: Seth Thomas <seth.g.thomas@gmail.com> --- centos/http/5/ks.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/centos/http/5/ks.cfg b/centos/http/5/ks.cfg index c6abf1929..2884f561f 100644 --- a/centos/http/5/ks.cfg +++ b/centos/http/5/ks.cfg @@ -19,7 +19,7 @@ reboot user --name=vagrant --password vagrant key --skip -%packages --nobase --ignoremissing --excludedocs --instLangs=en_US.utf8 +%packages --nobase --ignoremissing --excludedocs # vagrant needs this to copy initial files via scp openssh-clients openssh-server From cdc4b8ebc7ea65ff1a440e3a003921e750bd9599 Mon Sep 17 00:00:00 2001 From: Seth Thomas <seth.g.thomas@gmail.com> Date: Wed, 16 Jan 2019 10:19:19 -0700 Subject: [PATCH 0909/1622] Adding changelog for 201812.27.0 release Signed-off-by: Seth Thomas <seth.g.thomas@gmail.com> --- CHANGELOG.md | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index cac11ec07..5d2ac798c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,37 @@ # Change Log +## [v201812.27.0](https://github.com/chef/bento/tree/v201812.27.0) (2019-01-16) +[Full Changelog](https://github.com/chef/bento/compare/v201808.24.0...v201812.27.0) + +**New Platforms:** + +- Debian 9.6 [\#1138](https://github.com/chef/bento/pull/1138) ([cheeseplus](https://github.com/cheeseplus)) +- Fedora 29 [\#1126](https://github.com/chef/bento/pull/1126) ([avanzzzi](https://github.com/avanzzzi)) +- CentOS 7.6 [\#1152](https://github.com/chef/bento/pull/1152) ([artem-sidorenko](https://github.com/artem-sidorenko)) +- Oracle Linux 7.6 [\#1146](https://github.com/chef/bento/pull/1146) ([tas50](https://github.com/tas50)) +- FreeBSD 12.0-RELEASE [\#1153](https://github.com/chef/bento/pull/1153) ([lwhsu](https://github.com/lwhsu)) +- Ubuntu 18.10 [\#1124](https://github.com/chef/bento/pull/1124) ([chenhan1218](https://github.com/chenhan1218)) + +**Deprecated Platforms:** + +- FreeBSD 11.1 [\#1120](https://github.com/chef/bento/pull/1120) ([juliandunn](https://github.com/juliandunn)) +- FreeBSD 10.4 [\#1142](https://github.com/chef/bento/pull/1142) ([tas50](https://github.com/tas50)) + +**Fixes and updates:** + +- Whiteout all spaces [\#1151](https://github.com/chef/bento/pull/1151) ([Sorbog](https://github.com/Sorbog)) +- Reduce centos locale size [\#1149](https://github.com/chef/bento/pull/1149) ([Sorbog](https://github.com/Sorbog)) +- Update from rhel 7.5 to 7.6 [\#1143](https://github.com/chef/bento/pull/1143) ([chrispoupart](https://github.com/chrispoupart)) +- Support for fedora29 in libvirt and public release [\#1137](https://github.com/chef/bento/pull/1137) ([avanzzzi](https://github.com/avanzzzi)) +- Fix build/upload of freebsd-11.2-i386 [\#1136](https://github.com/chef/bento/pull/1136) ([tmm1](https://github.com/tmm1)) +- Update for Ubuntu 16.04.5 i386 [\#1134](https://github.com/chef/bento/pull/1134) ([sheurich](https://github.com/sheurich)) +- Update for Ubuntu 16.04.5 amd64 [\#1133](https://github.com/chef/bento/pull/1133) ([sheurich](https://github.com/sheurich)) +- add vmware-iso to windows 2016 [\#1132](https://github.com/chef/bento/pull/1132) ([mkinney](https://github.com/mkinney)) +- update debian provision: purge installation-report in cleanup.sh [\#1131](https://github.com/chef/bento/pull/1131) ([UniIsland](https://github.com/UniIsland)) +- Make sure to disable UAC on windows [\#1130](https://github.com/chef/bento/pull/1130) ([tas50](https://github.com/tas50)) +- Fix the download link for Windows 2012R2 [\#1128](https://github.com/chef/bento/pull/1128) ([tas50](https://github.com/tas50)) +- Fix startup mount error on Parallels 14 guest tools [\#1122](https://github.com/chef/bento/pull/1122) ([max-arnold](https://github.com/max-arnold)) + ## [v201808.24.0](https://github.com/chef/bento/tree/v201808.24.0) (2018-09-02) [Full Changelog](https://github.com/chef/bento/compare/v201807.12.0...v201808.24.0) From 3b6fc841daad7eb72392c6ab31b708819234c7f4 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith@chef.io> Date: Fri, 18 Jan 2019 21:56:29 -0800 Subject: [PATCH 0910/1622] Turn off ProtectYourPC and set the org Turn off all the out of the box setup, disable all the protection junk, and set the org to Bento not Vagrant. Signed-off-by: Tim Smith <tsmith@chef.io> --- .gitignore | 1 + windows/answer_files/2008_r2/Autounattend.xml | 3 +-- windows/answer_files/2012_r2/Autounattend.xml | 6 ++++-- windows/answer_files/2016/Autounattend.xml | 6 ++++-- 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 8f5686503..01c400311 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,4 @@ packer.log .kitchen.yml Gemfile.lock bootstrap.sh +Berksfile.lock diff --git a/windows/answer_files/2008_r2/Autounattend.xml b/windows/answer_files/2008_r2/Autounattend.xml index cdbb6eab7..04ef491b3 100644 --- a/windows/answer_files/2008_r2/Autounattend.xml +++ b/windows/answer_files/2008_r2/Autounattend.xml @@ -1,6 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> <unattend xmlns="urn:schemas-microsoft-com:unattend"> - <servicing/> <settings pass="windowsPE"> <component name="Microsoft-Windows-PnpCustomizationsWinPE" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> <DriverPaths> @@ -37,7 +36,7 @@ <UserData> <AcceptEula>true</AcceptEula> <FullName>Vagrant Administrator</FullName> - <Organization>Vagrant Inc.</Organization> + <Organization>Bento by Chef</Organization> <!-- Product Key from http://technet.microsoft.com/en-us/library/jj612867.aspx --> <ProductKey> <!-- Do not uncomment the Key element if you are using trial ISOs --> diff --git a/windows/answer_files/2012_r2/Autounattend.xml b/windows/answer_files/2012_r2/Autounattend.xml index 4b641388e..1d3296913 100644 --- a/windows/answer_files/2012_r2/Autounattend.xml +++ b/windows/answer_files/2012_r2/Autounattend.xml @@ -75,7 +75,7 @@ </ProductKey> <AcceptEula>true</AcceptEula> <FullName>Vagrant</FullName> - <Organization>Vagrant</Organization> + <Organization>Bento by Chef</Organization> </UserData> </component> </settings> @@ -103,7 +103,9 @@ <HideOnlineAccountScreens>true</HideOnlineAccountScreens> <HideWirelessSetupInOOBE>true</HideWirelessSetupInOOBE> <NetworkLocation>Home</NetworkLocation> - <ProtectYourPC>1</ProtectYourPC> + <ProtectYourPC>3</ProtectYourPC> + <SkipUserOOBE>true</SkipUserOOBE> + <SkipMachineOOBE>true</SkipMachineOOBE> </OOBE> <TimeZone>UTC</TimeZone> <UserAccounts> diff --git a/windows/answer_files/2016/Autounattend.xml b/windows/answer_files/2016/Autounattend.xml index 058117db3..de1ef7cf1 100644 --- a/windows/answer_files/2016/Autounattend.xml +++ b/windows/answer_files/2016/Autounattend.xml @@ -75,7 +75,7 @@ </ProductKey> <AcceptEula>true</AcceptEula> <FullName>Vagrant</FullName> - <Organization>Vagrant</Organization> + <Organization>Bento by Chef</Organization> </UserData> </component> </settings> @@ -103,7 +103,9 @@ <HideOnlineAccountScreens>true</HideOnlineAccountScreens> <HideWirelessSetupInOOBE>true</HideWirelessSetupInOOBE> <NetworkLocation>Home</NetworkLocation> - <ProtectYourPC>1</ProtectYourPC> + <ProtectYourPC>3</ProtectYourPC> + <SkipMachineOOBE>true</SkipMachineOOBE> + <SkipUserOOBE>true</SkipUserOOBE> </OOBE> <TimeZone>UTC</TimeZone> <UserAccounts> From d67b0e4d43d2a8a52499d823eb133636491f683d Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith@chef.io> Date: Fri, 18 Jan 2019 22:22:05 -0800 Subject: [PATCH 0911/1622] Initial Windows 2019 definition It could be tweaked further, but it works. Signed-off-by: Tim Smith <tsmith@chef.io> --- windows/2019.json | 90 ++++++++ windows/answer_files/2019/Autounattend.xml | 239 +++++++++++++++++++++ 2 files changed, 329 insertions(+) create mode 100644 windows/2019.json create mode 100644 windows/answer_files/2019/Autounattend.xml diff --git a/windows/2019.json b/windows/2019.json new file mode 100644 index 000000000..e0ea5dcad --- /dev/null +++ b/windows/2019.json @@ -0,0 +1,90 @@ +{ + "builders": [ + { + "type": "virtualbox-iso", + "vboxmanage": [ + ["modifyvm", "{{.Name}}", "--memory", "4096"], + ["modifyvm", "{{.Name}}", "--vram", "48"], + ["modifyvm", "{{.Name}}", "--cpus", "2"] + ], + "guest_additions_mode": "{{ user `guest_additions_mode` }}", + "guest_additions_path": "C:/users/vagrant/VBoxGuestAdditions.iso", + "guest_os_type": "Windows2016_64", + "headless": "{{ user `headless` }}", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_checksum_type": "sha1", + "output_directory": "../builds/packer-{{user `template`}}-virtualbox", + "communicator": "winrm", + "winrm_username": "vagrant", + "winrm_password": "vagrant", + "winrm_timeout": "12h", + "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"", + "shutdown_timeout": "15m", + "floppy_files": [ + "answer_files/2019/Autounattend.xml" + ] + }, + { + "type": "vmware-iso", + "vmx_data": { + "memsize": "4096", + "numvcpus": "2", + "scsi0.virtualDev": "lsisas1068", + "scsi0.present": "TRUE" + }, + "guest_os_type": "windows9srv-64", + "headless": "{{ user `headless` }}", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_checksum_type": "sha1", + "output_directory": "../builds/packer-{{user `template`}}-vmware", + "communicator": "winrm", + "winrm_username": "vagrant", + "winrm_password": "vagrant", + "winrm_timeout": "12h", + "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"", + "shutdown_timeout": "15m", + "floppy_files": [ + "answer_files/2019/Autounattend.xml" + ] + } + ], + "provisioners": [{ + "type": "chef-solo", + "cookbook_paths": ["cookbooks"], + "guest_os_type": "windows", + "run_list": [ + "packer::vm_tools", + "packer::features", + "packer::enable_file_sharing", + "packer::enable_remote_desktop", + "packer::ui_tweaks", + "packer::power", + "packer::cleanup", + "packer::defrag" + ] + }, + { + "type": "powershell", + "script": "scripts/cleanup.ps1", + "elevated_user": "vagrant", + "elevated_password": "vagrant" + } + ], + "post-processors": [ + [{ + "type": "vagrant", + "keep_input_artifact": true, + "output": "{{ user `template` }}-{{.Provider}}.box", + "vagrantfile_template": "vagrantfile-windows.template" + }] + ], + "variables": { + "guest_additions_mode": "attach", + "headless": "true", + "iso_checksum": "91e3a2f1acc39af21353c7cc105c799494d7539f", + "iso_url": "https://software-download.microsoft.com/download/sg/17763.253.190108-0006.rs5_release_svc_refresh_SERVER_EVAL_x64FRE_en-us.iso", + "template": "windows-2019-standard" + } +} diff --git a/windows/answer_files/2019/Autounattend.xml b/windows/answer_files/2019/Autounattend.xml new file mode 100644 index 000000000..f5fb5a3d0 --- /dev/null +++ b/windows/answer_files/2019/Autounattend.xml @@ -0,0 +1,239 @@ +<?xml version="1.0" encoding="utf-8"?> +<unattend xmlns="urn:schemas-microsoft-com:unattend"> + <settings pass="windowsPE"> + <component name="Microsoft-Windows-International-Core-WinPE" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <SetupUILanguage> + <UILanguage>en-US</UILanguage> + </SetupUILanguage> + <InputLocale>en-US</InputLocale> + <SystemLocale>en-US</SystemLocale> + <UILanguage>en-US</UILanguage> + <UILanguageFallback>en-US</UILanguageFallback> + <UserLocale>en-US</UserLocale> + </component> + <component name="Microsoft-Windows-Setup" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <DiskConfiguration> + <Disk wcm:action="add"> + <CreatePartitions> + <CreatePartition wcm:action="add"> + <Type>Primary</Type> + <Order>1</Order> + <Size>350</Size> + </CreatePartition> + <CreatePartition wcm:action="add"> + <Order>2</Order> + <Type>Primary</Type> + <Extend>true</Extend> + </CreatePartition> + </CreatePartitions> + <ModifyPartitions> + <ModifyPartition wcm:action="add"> + <Active>true</Active> + <Format>NTFS</Format> + <Label>boot</Label> + <Order>1</Order> + <PartitionID>1</PartitionID> + </ModifyPartition> + <ModifyPartition wcm:action="add"> + <Format>NTFS</Format> + <Label>Windows 2019</Label> + <Letter>C</Letter> + <Order>2</Order> + <PartitionID>2</PartitionID> + </ModifyPartition> + </ModifyPartitions> + <DiskID>0</DiskID> + <WillWipeDisk>true</WillWipeDisk> + </Disk> + </DiskConfiguration> + <ImageInstall> + <OSImage> + <InstallFrom> + <MetaData wcm:action="add"> + <Key>/IMAGE/NAME</Key> + <Value>Windows Server 2019 SERVERDATACENTER</Value> + </MetaData> + </InstallFrom> + <InstallTo> + <DiskID>0</DiskID> + <PartitionID>2</PartitionID> + </InstallTo> + </OSImage> + </ImageInstall> + <UserData> + <ProductKey> + <WillShowUI>OnError</WillShowUI> + </ProductKey> + <AcceptEula>true</AcceptEula> + <FullName>Vagrant</FullName> + <Organization>Bento by Chef Software, Inc.</Organization> + </UserData> + </component> + </settings> + <settings pass="generalize"> + <component name="Microsoft-Windows-Security-SPP" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <SkipRearm>1</SkipRearm> + </component> + <component name="Microsoft-Windows-PnpSysprep" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <PersistAllDeviceInstalls>false</PersistAllDeviceInstalls> + <DoNotCleanUpNonPresentDevices>false</DoNotCleanUpNonPresentDevices> + </component> + </settings> + <settings pass="oobeSystem"> + <component name="Microsoft-Windows-International-Core" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <InputLocale>en-US</InputLocale> + <SystemLocale>en-US</SystemLocale> + <UILanguage>en-US</UILanguage> + <UserLocale>en-US</UserLocale> + </component> + <component name="Microsoft-Windows-Shell-Setup" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <OOBE> + <HideEULAPage>true</HideEULAPage> + <HideLocalAccountScreen>true</HideLocalAccountScreen> + <HideOEMRegistrationScreen>true</HideOEMRegistrationScreen> + <HideOnlineAccountScreens>true</HideOnlineAccountScreens> + <HideWirelessSetupInOOBE>true</HideWirelessSetupInOOBE> + <NetworkLocation>Home</NetworkLocation> + <ProtectYourPC>3</ProtectYourPC> + <SkipMachineOOBE>true</SkipMachineOOBE> + <SkipUserOOBE>true</SkipUserOOBE> + </OOBE> + <TimeZone>UTC</TimeZone> + <UserAccounts> + <AdministratorPassword> + <Value>vagrant</Value> + <PlainText>true</PlainText> + </AdministratorPassword> + <LocalAccounts> + <LocalAccount wcm:action="add"> + <Password> + <Value>vagrant</Value> + <PlainText>true</PlainText> + </Password> + <Group>Administrators</Group> + <DisplayName>Vagrant</DisplayName> + <Name>vagrant</Name> + <Description>Vagrant User</Description> + </LocalAccount> + </LocalAccounts> + </UserAccounts> + <AutoLogon> + <Password> + <Value>vagrant</Value> + <PlainText>true</PlainText> + </Password> + <Enabled>true</Enabled> + <Username>vagrant</Username> + </AutoLogon> + <FirstLogonCommands> + <SynchronousCommand wcm:action="add"> + <CommandLine>cmd.exe /c powershell -Command "Set-ExecutionPolicy -ExecutionPolicy RemoteSigned -Force"</CommandLine> + <Description>Set Execution Policy 64 Bit</Description> + <Order>1</Order> + <RequiresUserInput>true</RequiresUserInput> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <CommandLine>C:\Windows\SysWOW64\cmd.exe /c powershell -Command "Set-ExecutionPolicy -ExecutionPolicy RemoteSigned -Force"</CommandLine> + <Description>Set Execution Policy 32 Bit</Description> + <Order>2</Order> + <RequiresUserInput>true</RequiresUserInput> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <CommandLine>cmd.exe /c winrm quickconfig -q</CommandLine> + <Description>winrm quickconfig -q</Description> + <Order>3</Order> + <RequiresUserInput>true</RequiresUserInput> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <CommandLine>cmd.exe /c winrm quickconfig -transport:http</CommandLine> + <Description>winrm quickconfig -transport:http</Description> + <Order>4</Order> + <RequiresUserInput>true</RequiresUserInput> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <CommandLine>cmd.exe /c winrm set winrm/config @{MaxTimeoutms="1800000"}</CommandLine> + <Description>Win RM MaxTimoutms</Description> + <Order>5</Order> + <RequiresUserInput>true</RequiresUserInput> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <CommandLine>cmd.exe /c winrm set winrm/config/winrs @{MaxMemoryPerShellMB="800"}</CommandLine> + <Description>Win RM MaxMemoryPerShellMB</Description> + <Order>6</Order> + <RequiresUserInput>true</RequiresUserInput> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <CommandLine>cmd.exe /c winrm set winrm/config/service @{AllowUnencrypted="true"}</CommandLine> + <Description>Win RM AllowUnencrypted</Description> + <Order>7</Order> + <RequiresUserInput>true</RequiresUserInput> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <CommandLine>cmd.exe /c winrm set winrm/config/service/auth @{Basic="true"}</CommandLine> + <Description>Win RM auth Basic</Description> + <Order>8</Order> + <RequiresUserInput>true</RequiresUserInput> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <CommandLine>cmd.exe /c winrm set winrm/config/client/auth @{Basic="true"}</CommandLine> + <Description>Win RM client auth Basic</Description> + <Order>9</Order> + <RequiresUserInput>true</RequiresUserInput> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <CommandLine>cmd.exe /c winrm set winrm/config/listener?Address=*+Transport=HTTP @{Port="5985"} </CommandLine> + <Description>Win RM listener Address/Port</Description> + <Order>10</Order> + <RequiresUserInput>true</RequiresUserInput> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <CommandLine>cmd.exe /c netsh advfirewall firewall set rule group="remote administration" new enable=yes </CommandLine> + <Description>Win RM adv firewall enable</Description> + <Order>11</Order> + <RequiresUserInput>true</RequiresUserInput> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <CommandLine>cmd.exe /c netsh firewall add portopening TCP 5985 "Port 5985" </CommandLine> + <Description>Win RM port open</Description> + <Order>12</Order> + <RequiresUserInput>true</RequiresUserInput> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <CommandLine>cmd.exe /c net stop winrm </CommandLine> + <Description>Stop Win RM Service </Description> + <Order>13</Order> + <RequiresUserInput>true</RequiresUserInput> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <CommandLine>cmd.exe /c sc config winrm start= auto</CommandLine> + <Description>Win RM Autostart</Description> + <Order>14</Order> + <RequiresUserInput>true</RequiresUserInput> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <CommandLine>cmd.exe /c net start winrm</CommandLine> + <Description>Start Win RM Service</Description> + <Order>15</Order> + <RequiresUserInput>true</RequiresUserInput> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <CommandLine>cmd.exe /c wmic useraccount where "name='vagrant'" set PasswordExpires=FALSE</CommandLine> + <Order>16</Order> + <Description>Disable password expiration for vagrant user</Description> + </SynchronousCommand> + </FirstLogonCommands> + </component> + </settings> + <settings pass="specialize"> + <component xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" name="Microsoft-Windows-ServerManager-SvrMgrNc" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> + <DoNotOpenServerManagerAtLogon>true</DoNotOpenServerManagerAtLogon> + </component> + <component xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" name="Microsoft-Windows-IE-ESC" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> + <IEHardenAdmin>false</IEHardenAdmin> + <IEHardenUser>false</IEHardenUser> + </component> + <component xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" name="Microsoft-Windows-OutOfBoxExperience" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> + <DoNotOpenInitialConfigurationTasksAtLogon>true</DoNotOpenInitialConfigurationTasksAtLogon> + </component> + </settings> +</unattend> From 8d5b338ae01a39898d71f7ee9b9b63a68208d6d3 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith@chef.io> Date: Fri, 1 Feb 2019 14:34:35 -0800 Subject: [PATCH 0912/1622] Remove EOL Fedora 27 Bye bye Fedora 27. Signed-off-by: Tim Smith <tsmith@chef.io> --- fedora/fedora-27-x86_64.json | 180 ----------------------------------- fedora/http/ks.cfg | 47 --------- 2 files changed, 227 deletions(-) delete mode 100644 fedora/fedora-27-x86_64.json delete mode 100644 fedora/http/ks.cfg diff --git a/fedora/fedora-27-x86_64.json b/fedora/fedora-27-x86_64.json deleted file mode 100644 index 74f127c04..000000000 --- a/fedora/fedora-27-x86_64.json +++ /dev/null @@ -1,180 +0,0 @@ -{ - "builders": [ - { - "boot_command": [ - "<tab> linux ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", - "guest_os_type": "Fedora_64", - "hard_drive_interface": "sata", - "headless": "{{ user `headless` }}", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../builds/packer-{{user `template`}}-virtualbox", - "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "virtualbox-iso", - "vboxmanage": [ - [ - "modifyvm", - "{{.Name}}", - "--memory", - "{{ user `memory` }}" - ], - [ - "modifyvm", - "{{.Name}}", - "--cpus", - "{{ user `cpus` }}" - ] - ], - "virtualbox_version_file": ".vbox_version", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<tab> linux ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "fedora-64", - "headless": "{{ user `headless` }}", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../builds/packer-{{user `template`}}-vmware", - "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "tools_upload_flavor": "linux", - "type": "vmware-iso", - "vm_name": "{{ user `template` }}", - "vmx_data": { - "cpuid.coresPerSocket": "1", - "ethernet0.pciSlotNumber": "32", - "memsize": "{{ user `memory` }}", - "numvcpus": "{{ user `cpus` }}" - }, - "vmx_remove_ethernet_interfaces": true - }, - { - "boot_command": [ - "<tab> linux ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "fedora-core", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../builds/packer-{{user `template`}}-parallels", - "parallels_tools_flavor": "lin", - "prlctl": [ - [ - "set", - "{{.Name}}", - "--memsize", - "{{ user `memory` }}" - ], - [ - "set", - "{{.Name}}", - "--cpus", - "{{ user `cpus` }}" - ] - ], - "prlctl_version_file": ".prlctl_version", - "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "parallels-iso", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<tab> linux ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "headless": "{{ user `headless` }}", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../builds/packer-{{user `template`}}-qemu", - "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "qemu", - "vm_name": "{{ user `template` }}" - } - ], - "post-processors": [ - { - "output": "../builds/{{user `box_basename`}}.{{.Provider}}.box", - "type": "vagrant" - } - ], - "provisioners": [ - { - "environment_vars": [ - "HOME_DIR=/home/vagrant", - "http_proxy={{user `http_proxy`}}", - "https_proxy={{user `https_proxy`}}", - "no_proxy={{user `no_proxy`}}" - ], - "execute_command": "echo 'vagrant' | {{.Vars}} sudo -E -S bash '{{.Path}}'", - "expect_disconnect": true, - "scripts": [ - "scripts/swap.sh", - "scripts/fix-slow-dns.sh", - "scripts/build-tools.sh", - "../_common/sshd.sh", - "../_common/virtualbox.sh", - "../_common/vmware.sh", - "../_common/parallels.sh", - "../_common/vagrant.sh", - "scripts/cleanup.sh", - "../_common/minimize.sh" - ], - "type": "shell" - } - ], - "variables": { - "arch": "64", - "box_basename": "fedora-27", - "build_timestamp": "{{isotime \"20060102150405\"}}", - "cpus": "1", - "disk_size": "65536", - "git_revision": "__unknown_git_revision__", - "headless": "", - "http_proxy": "{{env `http_proxy`}}", - "https_proxy": "{{env `https_proxy`}}", - "iso_checksum": "e383dd414bb57231b20cbed11c4953cac71785f7d4f5990b0df5ad534a0ba95c", - "iso_checksum_type": "sha256", - "iso_name": "Fedora-Server-dvd-x86_64-27-1.6.iso", - "ks_path": "ks.cfg", - "memory": "1024", - "mirror": "http://download.fedoraproject.org/pub/fedora/linux", - "mirror_directory": "releases/27/Server/x86_64/iso", - "name": "fedora-27", - "no_proxy": "{{env `no_proxy`}}", - "template": "fedora-27-x86_64", - "version": "TIMESTAMP" - } -} diff --git a/fedora/http/ks.cfg b/fedora/http/ks.cfg deleted file mode 100644 index 40221d5a1..000000000 --- a/fedora/http/ks.cfg +++ /dev/null @@ -1,47 +0,0 @@ -install -cdrom -lang en_US.UTF-8 -keyboard us -network --bootproto=dhcp -rootpw vagrant -firewall --disabled -authconfig --enableshadow --passalgo=sha512 -selinux --permissive -timezone UTC -bootloader --location=mbr -text -skipx -zerombr -clearpart --all --initlabel -part / --fstype=ext4 --ondisk=sda --grow --label=root -firstboot --disabled -reboot -user --name=vagrant --plaintext --password vagrant - -%packages --ignoremissing --excludedocs -bzip2 -# GCC won't install during kickstart -# gcc -kernel-devel -kernel-headers -tar -wget -nfs-utils -net-tools -deltarpm --linux-firmware --plymouth --plymouth-core-libs --fedora-release-notes --mcelog --smartmontools --usbutils --man-pages -%end - -%post -# sudo -echo 'Defaults:vagrant !requiretty' > /etc/sudoers.d/vagrant -echo '%vagrant ALL=(ALL) NOPASSWD: ALL' >> /etc/sudoers.d/vagrant -chmod 440 /etc/sudoers.d/vagrant -%end From fabc7dd8e544060b250e369417b68a40d8bb1753 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith@chef.io> Date: Thu, 7 Feb 2019 20:00:30 -0800 Subject: [PATCH 0913/1622] Fully disable UAC Expand the keys we set. Signed-off-by: Tim Smith <tsmith@chef.io> --- windows/2016.json | 1 + windows/2019.json | 1 + windows/cookbooks/packer/recipes/disable_uac.rb | 11 ++++++----- .../cookbooks/packer/recipes/enable_remote_desktop.rb | 2 +- 4 files changed, 9 insertions(+), 6 deletions(-) diff --git a/windows/2016.json b/windows/2016.json index da5473a0b..040ed2a08 100644 --- a/windows/2016.json +++ b/windows/2016.json @@ -55,6 +55,7 @@ "cookbook_paths": ["cookbooks"], "guest_os_type": "windows", "run_list": [ + "packer::disable_uac", "packer::vm_tools", "packer::features", "packer::enable_file_sharing", diff --git a/windows/2019.json b/windows/2019.json index e0ea5dcad..95f80742b 100644 --- a/windows/2019.json +++ b/windows/2019.json @@ -55,6 +55,7 @@ "cookbook_paths": ["cookbooks"], "guest_os_type": "windows", "run_list": [ + "packer::disable_uac", "packer::vm_tools", "packer::features", "packer::enable_file_sharing", diff --git a/windows/cookbooks/packer/recipes/disable_uac.rb b/windows/cookbooks/packer/recipes/disable_uac.rb index dc80105dd..628b92eeb 100644 --- a/windows/cookbooks/packer/recipes/disable_uac.rb +++ b/windows/cookbooks/packer/recipes/disable_uac.rb @@ -1,6 +1,7 @@ -registry_key 'HKEY_LOCAL_MACHINE\software\Microsoft\Windows\CurrentVersion\Policies\system' do - values [{ - name: 'EnableLUA', - type: :dword, - data: 0, }] +registry_key 'HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Policies\System' do + values [{ name: 'EnableLUA', type: :dword, data: 0 }, + { name: 'PromptOnSecureDesktop', type: :dword, data: 0 }, + { name: 'ConsentPromptBehaviorAdmin', type: :dword, data: 0 }, + ] + action :create end diff --git a/windows/cookbooks/packer/recipes/enable_remote_desktop.rb b/windows/cookbooks/packer/recipes/enable_remote_desktop.rb index 92f6db963..293c729f3 100644 --- a/windows/cookbooks/packer/recipes/enable_remote_desktop.rb +++ b/windows/cookbooks/packer/recipes/enable_remote_desktop.rb @@ -2,7 +2,7 @@ values [{ name: 'fDenyTSConnections', type: :dword, - data: 0, }] + data: 0 }] end execute 'Enable RDP firewall rule' do From 72ee92701b91d39042f19e183eb70167816c880c Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith@chef.io> Date: Mon, 11 Feb 2019 14:34:34 -0800 Subject: [PATCH 0914/1622] Add recipes for disabling windows update, system restore, and windows defender Turning these off greatly speeds up the system and reduces memory usage Signed-off-by: Tim Smith <tsmith@chef.io> --- .../packer/recipes/disable_restore.rb | 5 +++++ .../packer/recipes/disable_windows_update.rb | 18 ++++++++---------- .../packer/recipes/remove_defender.rb | 3 +++ 3 files changed, 16 insertions(+), 10 deletions(-) create mode 100644 windows/cookbooks/packer/recipes/disable_restore.rb create mode 100644 windows/cookbooks/packer/recipes/remove_defender.rb diff --git a/windows/cookbooks/packer/recipes/disable_restore.rb b/windows/cookbooks/packer/recipes/disable_restore.rb new file mode 100644 index 000000000..1e0ece679 --- /dev/null +++ b/windows/cookbooks/packer/recipes/disable_restore.rb @@ -0,0 +1,5 @@ +# don't bother saving data for a system restore +registry_key 'HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows NT\SystemRestore' do + values [{ name: 'DisableSR', type: :dword, data: 0 }] # disable + action :create +end diff --git a/windows/cookbooks/packer/recipes/disable_windows_update.rb b/windows/cookbooks/packer/recipes/disable_windows_update.rb index fc03117f2..4d275e698 100644 --- a/windows/cookbooks/packer/recipes/disable_windows_update.rb +++ b/windows/cookbooks/packer/recipes/disable_windows_update.rb @@ -1,10 +1,8 @@ -# reg add reg add "HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows\WindowsUpdate\AU" /v AUOptions /t REG_DWORD /d 2 /f -# -# :: turn the whole thing off -# reg add "HKEY_LOCAL_MACHINE\Software\Policies\Microsoft\Windows\WindowsUpdate" /v DisableWindowsUpdateAccess /t REG_DWORD /d 1 /f -# reg add "HKEY_LOCAL_MACHINE\Software\Policies\Microsoft\Windows\WindowsUpdate\AU" /v NoAutoUpdate /t REG_DWORD /d 1 /f -# -# :: disable the update prompt scheduled tasks -# schtasks.exe /change /tn "\Microsoft\Windows\UpdateOrchestrator\USO_UxBroker_Display" /disable -# schtasks.exe /change /tn "\Microsoft\Windows\UpdateOrchestrator\MusUx_UpdateInterval" /disable -# schtasks.exe /change /tn "\Microsoft\Windows\WindowsUpdate\sih" /disable +# don't waste CPU / network bandwidth checking for updates +registry_key 'HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows\WindowsUpdate\AU' do + values [{ name: 'AUOptions', type: :dword, data: 1 }, # disable keep my computer up to date + { name: 'NoAutoUpdate', type: :dword, data: 1 } # disable auto updates + ] + action :create + recursive true +end diff --git a/windows/cookbooks/packer/recipes/remove_defender.rb b/windows/cookbooks/packer/recipes/remove_defender.rb new file mode 100644 index 000000000..1784f568f --- /dev/null +++ b/windows/cookbooks/packer/recipes/remove_defender.rb @@ -0,0 +1,3 @@ +windows_feature 'Windows-Defender' do + action :remove +end From a5f81ece12a3148177493b8c1659450eafafb49d Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith@chef.io> Date: Mon, 11 Feb 2019 14:35:44 -0800 Subject: [PATCH 0915/1622] Use the new recipes and add restarts in between work Once we install features we need to reboot the system to complete the full setup. Without this the first boot has to perform this same work. Signed-off-by: Tim Smith <tsmith@chef.io> --- windows/2008r2.json | 1 + windows/2012r2.json | 15 +++- windows/2016.json | 119 ++++++++++++++++----------- windows/2019.json | 119 ++++++++++++++++----------- windows/7.json | 3 +- windows/cookbooks/packer/kitchen.yml | 3 + 6 files changed, 159 insertions(+), 101 deletions(-) diff --git a/windows/2008r2.json b/windows/2008r2.json index bab83a945..7d2f05cf4 100644 --- a/windows/2008r2.json +++ b/windows/2008r2.json @@ -30,6 +30,7 @@ "guest_os_type": "windows", "install_command": "powershell.exe -Command \"(new-object Net.WebClient).DownloadString('https://omnitruck.chef.io/install.ps1') | iex; install\"", "run_list": [ + "packer::disable_windows_update", "packer::vm_tools", "packer::features", "packer::enable_file_sharing", diff --git a/windows/2012r2.json b/windows/2012r2.json index 6157fb17a..29372aa29 100644 --- a/windows/2012r2.json +++ b/windows/2012r2.json @@ -30,12 +30,23 @@ "guest_os_type": "windows", "run_list": [ "packer::disable_uac", + "packer::disable_windows_update", "packer::vm_tools", "packer::features", "packer::enable_file_sharing", "packer::enable_remote_desktop", "packer::ui_tweaks", - "packer::power", + "packer::power" + ] + }, + { + "type": "windows-restart" + }, + { + "type": "chef-solo", + "cookbook_paths": ["cookbooks"], + "guest_os_type": "windows", + "run_list": [ "packer::cleanup", "packer::defrag" ] @@ -62,4 +73,4 @@ "iso_url": "http://download.microsoft.com/download/6/2/A/62A76ABB-9990-4EFC-A4FE-C7D698DAEB96/9600.17050.WINBLUE_REFRESH.140317-1640_X64FRE_SERVER_EVAL_EN-US-IR3_SSS_X64FREE_EN-US_DV9.ISO", "template": "windows-2012r2-standard" } -} +} \ No newline at end of file diff --git a/windows/2016.json b/windows/2016.json index 040ed2a08..bd1b4c368 100644 --- a/windows/2016.json +++ b/windows/2016.json @@ -1,53 +1,52 @@ { - "builders": [ - { - "type": "virtualbox-iso", - "vboxmanage": [ - ["modifyvm", "{{.Name}}", "--memory", "4096"], - ["modifyvm", "{{.Name}}", "--vram", "48"], - ["modifyvm", "{{.Name}}", "--cpus", "2"] - ], - "guest_additions_mode": "{{ user `guest_additions_mode` }}", - "guest_additions_path": "C:/users/vagrant/VBoxGuestAdditions.iso", - "guest_os_type": "Windows2016_64", - "headless": "{{ user `headless` }}", - "iso_url": "{{ user `iso_url` }}", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "sha1", - "output_directory": "../builds/packer-{{user `template`}}-virtualbox", - "communicator": "winrm", - "winrm_username": "vagrant", - "winrm_password": "vagrant", - "winrm_timeout": "12h", - "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"", - "shutdown_timeout": "15m", - "floppy_files": [ - "answer_files/2016/Autounattend.xml" - ] + "builders": [{ + "type": "virtualbox-iso", + "vboxmanage": [ + ["modifyvm", "{{.Name}}", "--memory", "4096"], + ["modifyvm", "{{.Name}}", "--vram", "48"], + ["modifyvm", "{{.Name}}", "--cpus", "2"] + ], + "guest_additions_mode": "{{ user `guest_additions_mode` }}", + "guest_additions_path": "C:/users/vagrant/VBoxGuestAdditions.iso", + "guest_os_type": "Windows2016_64", + "headless": "{{ user `headless` }}", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_checksum_type": "sha1", + "output_directory": "../builds/packer-{{user `template`}}-virtualbox", + "communicator": "winrm", + "winrm_username": "vagrant", + "winrm_password": "vagrant", + "winrm_timeout": "12h", + "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"", + "shutdown_timeout": "15m", + "floppy_files": [ + "answer_files/2016/Autounattend.xml" + ] }, { - "type": "vmware-iso", - "vmx_data": { - "memsize": "4096", - "numvcpus": "2", - "scsi0.virtualDev": "lsisas1068", - "scsi0.present": "TRUE" - }, - "guest_os_type": "windows9srv-64", - "headless": "{{ user `headless` }}", - "iso_url": "{{ user `iso_url` }}", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "sha1", - "output_directory": "../builds/packer-{{user `template`}}-vmware", - "communicator": "winrm", - "winrm_username": "vagrant", - "winrm_password": "vagrant", - "winrm_timeout": "12h", - "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"", - "shutdown_timeout": "15m", - "floppy_files": [ - "answer_files/2016/Autounattend.xml" - ] + "type": "vmware-iso", + "vmx_data": { + "memsize": "4096", + "numvcpus": "2", + "scsi0.virtualDev": "lsisas1068", + "scsi0.present": "TRUE" + }, + "guest_os_type": "windows9srv-64", + "headless": "{{ user `headless` }}", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_checksum_type": "sha1", + "output_directory": "../builds/packer-{{user `template`}}-vmware", + "communicator": "winrm", + "winrm_username": "vagrant", + "winrm_password": "vagrant", + "winrm_timeout": "12h", + "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"", + "shutdown_timeout": "15m", + "floppy_files": [ + "answer_files/2016/Autounattend.xml" + ] } ], "provisioners": [{ @@ -56,12 +55,34 @@ "guest_os_type": "windows", "run_list": [ "packer::disable_uac", + "packer::disable_windows_update", + "packer::remove_defender" + ] + }, + { + "type": "windows-restart" + }, + { + "type": "chef-solo", + "cookbook_paths": ["cookbooks"], + "guest_os_type": "windows", + "run_list": [ "packer::vm_tools", "packer::features", "packer::enable_file_sharing", "packer::enable_remote_desktop", "packer::ui_tweaks", - "packer::power", + "packer::power" + ] + }, + { + "type": "windows-restart" + }, + { + "type": "chef-solo", + "cookbook_paths": ["cookbooks"], + "guest_os_type": "windows", + "run_list": [ "packer::cleanup", "packer::defrag" ] @@ -88,4 +109,4 @@ "iso_url": "https://software-download.microsoft.com/download/pr/Windows_Server_2016_Datacenter_EVAL_en-us_14393_refresh.ISO", "template": "windows-2016-standard" } -} +} \ No newline at end of file diff --git a/windows/2019.json b/windows/2019.json index 95f80742b..6ea55f359 100644 --- a/windows/2019.json +++ b/windows/2019.json @@ -1,53 +1,52 @@ { - "builders": [ - { - "type": "virtualbox-iso", - "vboxmanage": [ - ["modifyvm", "{{.Name}}", "--memory", "4096"], - ["modifyvm", "{{.Name}}", "--vram", "48"], - ["modifyvm", "{{.Name}}", "--cpus", "2"] - ], - "guest_additions_mode": "{{ user `guest_additions_mode` }}", - "guest_additions_path": "C:/users/vagrant/VBoxGuestAdditions.iso", - "guest_os_type": "Windows2016_64", - "headless": "{{ user `headless` }}", - "iso_url": "{{ user `iso_url` }}", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "sha1", - "output_directory": "../builds/packer-{{user `template`}}-virtualbox", - "communicator": "winrm", - "winrm_username": "vagrant", - "winrm_password": "vagrant", - "winrm_timeout": "12h", - "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"", - "shutdown_timeout": "15m", - "floppy_files": [ - "answer_files/2019/Autounattend.xml" - ] + "builders": [{ + "type": "virtualbox-iso", + "vboxmanage": [ + ["modifyvm", "{{.Name}}", "--memory", "4096"], + ["modifyvm", "{{.Name}}", "--vram", "48"], + ["modifyvm", "{{.Name}}", "--cpus", "2"] + ], + "guest_additions_mode": "{{ user `guest_additions_mode` }}", + "guest_additions_path": "C:/users/vagrant/VBoxGuestAdditions.iso", + "guest_os_type": "Windows2016_64", + "headless": "{{ user `headless` }}", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_checksum_type": "sha1", + "output_directory": "../builds/packer-{{user `template`}}-virtualbox", + "communicator": "winrm", + "winrm_username": "vagrant", + "winrm_password": "vagrant", + "winrm_timeout": "12h", + "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"", + "shutdown_timeout": "15m", + "floppy_files": [ + "answer_files/2019/Autounattend.xml" + ] }, { - "type": "vmware-iso", - "vmx_data": { - "memsize": "4096", - "numvcpus": "2", - "scsi0.virtualDev": "lsisas1068", - "scsi0.present": "TRUE" - }, - "guest_os_type": "windows9srv-64", - "headless": "{{ user `headless` }}", - "iso_url": "{{ user `iso_url` }}", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "sha1", - "output_directory": "../builds/packer-{{user `template`}}-vmware", - "communicator": "winrm", - "winrm_username": "vagrant", - "winrm_password": "vagrant", - "winrm_timeout": "12h", - "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"", - "shutdown_timeout": "15m", - "floppy_files": [ - "answer_files/2019/Autounattend.xml" - ] + "type": "vmware-iso", + "vmx_data": { + "memsize": "4096", + "numvcpus": "2", + "scsi0.virtualDev": "lsisas1068", + "scsi0.present": "TRUE" + }, + "guest_os_type": "windows9srv-64", + "headless": "{{ user `headless` }}", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_checksum_type": "sha1", + "output_directory": "../builds/packer-{{user `template`}}-vmware", + "communicator": "winrm", + "winrm_username": "vagrant", + "winrm_password": "vagrant", + "winrm_timeout": "12h", + "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"", + "shutdown_timeout": "15m", + "floppy_files": [ + "answer_files/2019/Autounattend.xml" + ] } ], "provisioners": [{ @@ -56,12 +55,34 @@ "guest_os_type": "windows", "run_list": [ "packer::disable_uac", + "packer::disable_windows_update", + "packer::remove_defender" + ] + }, + { + "type": "windows-restart" + }, + { + "type": "chef-solo", + "cookbook_paths": ["cookbooks"], + "guest_os_type": "windows", + "run_list": [ "packer::vm_tools", "packer::features", "packer::enable_file_sharing", "packer::enable_remote_desktop", "packer::ui_tweaks", - "packer::power", + "packer::power" + ] + }, + { + "type": "windows-restart" + }, + { + "type": "chef-solo", + "cookbook_paths": ["cookbooks"], + "guest_os_type": "windows", + "run_list": [ "packer::cleanup", "packer::defrag" ] @@ -88,4 +109,4 @@ "iso_url": "https://software-download.microsoft.com/download/sg/17763.253.190108-0006.rs5_release_svc_refresh_SERVER_EVAL_x64FRE_en-us.iso", "template": "windows-2019-standard" } -} +} \ No newline at end of file diff --git a/windows/7.json b/windows/7.json index d9f7ee73d..89f7aff1e 100644 --- a/windows/7.json +++ b/windows/7.json @@ -31,6 +31,7 @@ "install_command": "powershell.exe -Command \"(new-object Net.WebClient).DownloadString('https://omnitruck.chef.io/install.ps1') | iex; install\"", "run_list": [ "packer::disable_uac", + "packer::disable_windows_update", "packer::vm_tools", "packer::features", "packer::enable_file_sharing", @@ -63,4 +64,4 @@ "iso_url": "iso/en_windows_7_ultimate_with_sp1_x64_dvd_u_677332.iso", "template": "windows-7" } -} +} \ No newline at end of file diff --git a/windows/cookbooks/packer/kitchen.yml b/windows/cookbooks/packer/kitchen.yml index 252daf292..8f66b93b5 100644 --- a/windows/cookbooks/packer/kitchen.yml +++ b/windows/cookbooks/packer/kitchen.yml @@ -26,6 +26,9 @@ platforms: suites: - name: default run_list: + - recipe[packer::disable_uac] + - recipe[packer::disable_windows_update] + - recipe[packer::remove_defender] - recipe[packer::vm_tools] - recipe[packer::features] - recipe[packer::enable_file_sharing] From 853657c008ff8f59f28d794c8eeaca823302830b Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith@chef.io> Date: Mon, 11 Feb 2019 14:37:35 -0800 Subject: [PATCH 0916/1622] Fix indentation in the windows configs Signed-off-by: Tim Smith <tsmith@chef.io> --- windows/2008r2.json | 2 +- windows/7.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/windows/2008r2.json b/windows/2008r2.json index 7d2f05cf4..19fe55c63 100644 --- a/windows/2008r2.json +++ b/windows/2008r2.json @@ -30,7 +30,7 @@ "guest_os_type": "windows", "install_command": "powershell.exe -Command \"(new-object Net.WebClient).DownloadString('https://omnitruck.chef.io/install.ps1') | iex; install\"", "run_list": [ - "packer::disable_windows_update", + "packer::disable_windows_update", "packer::vm_tools", "packer::features", "packer::enable_file_sharing", diff --git a/windows/7.json b/windows/7.json index 89f7aff1e..ca4ec1e70 100644 --- a/windows/7.json +++ b/windows/7.json @@ -64,4 +64,4 @@ "iso_url": "iso/en_windows_7_ultimate_with_sp1_x64_dvd_u_677332.iso", "template": "windows-7" } -} \ No newline at end of file +} From feb5867ebfe70a0ba0e4495a0b41adfda344634a Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith@chef.io> Date: Mon, 11 Feb 2019 20:19:22 -0800 Subject: [PATCH 0917/1622] Disable system restore on all windows server releases Might as well Signed-off-by: Tim Smith <tsmith@chef.io> --- windows/2008r2.json | 2 ++ windows/2012r2.json | 3 ++- windows/2016.json | 3 ++- windows/2019.json | 3 ++- 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/windows/2008r2.json b/windows/2008r2.json index 19fe55c63..65f30dd79 100644 --- a/windows/2008r2.json +++ b/windows/2008r2.json @@ -30,6 +30,8 @@ "guest_os_type": "windows", "install_command": "powershell.exe -Command \"(new-object Net.WebClient).DownloadString('https://omnitruck.chef.io/install.ps1') | iex; install\"", "run_list": [ + "packer::disable_uac", + "packer::disable_restore", "packer::disable_windows_update", "packer::vm_tools", "packer::features", diff --git a/windows/2012r2.json b/windows/2012r2.json index 29372aa29..f4df4c7dc 100644 --- a/windows/2012r2.json +++ b/windows/2012r2.json @@ -30,6 +30,7 @@ "guest_os_type": "windows", "run_list": [ "packer::disable_uac", + "packer::disable_restore", "packer::disable_windows_update", "packer::vm_tools", "packer::features", @@ -73,4 +74,4 @@ "iso_url": "http://download.microsoft.com/download/6/2/A/62A76ABB-9990-4EFC-A4FE-C7D698DAEB96/9600.17050.WINBLUE_REFRESH.140317-1640_X64FRE_SERVER_EVAL_EN-US-IR3_SSS_X64FREE_EN-US_DV9.ISO", "template": "windows-2012r2-standard" } -} \ No newline at end of file +} diff --git a/windows/2016.json b/windows/2016.json index bd1b4c368..d05a22475 100644 --- a/windows/2016.json +++ b/windows/2016.json @@ -55,6 +55,7 @@ "guest_os_type": "windows", "run_list": [ "packer::disable_uac", + "packer::disable_restore", "packer::disable_windows_update", "packer::remove_defender" ] @@ -109,4 +110,4 @@ "iso_url": "https://software-download.microsoft.com/download/pr/Windows_Server_2016_Datacenter_EVAL_en-us_14393_refresh.ISO", "template": "windows-2016-standard" } -} \ No newline at end of file +} diff --git a/windows/2019.json b/windows/2019.json index 6ea55f359..b7b64ad12 100644 --- a/windows/2019.json +++ b/windows/2019.json @@ -55,6 +55,7 @@ "guest_os_type": "windows", "run_list": [ "packer::disable_uac", + "packer::disable_restore", "packer::disable_windows_update", "packer::remove_defender" ] @@ -109,4 +110,4 @@ "iso_url": "https://software-download.microsoft.com/download/sg/17763.253.190108-0006.rs5_release_svc_refresh_SERVER_EVAL_x64FRE_en-us.iso", "template": "windows-2019-standard" } -} \ No newline at end of file +} From d33cb49bddacd0d8fab5d864c73dcf0b4813e42c Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith@chef.io> Date: Tue, 12 Feb 2019 12:35:46 -0800 Subject: [PATCH 0918/1622] Add initial Windows 10 packer config Pretty similar to Windows 2016 / 2019 except I broke out the WinRM setup steps into a script. I'll move that same script onto the server side since it makes it a lot easier to manage. Signed-off-by: Tim Smith <tsmith@chef.io> --- windows/10.json | 114 ++++++++++++++++ windows/answer_files/10/Autounattend.xml | 167 +++++++++++++++++++++++ windows/scripts/base_setup.ps1 | 32 +++++ 3 files changed, 313 insertions(+) create mode 100644 windows/10.json create mode 100644 windows/answer_files/10/Autounattend.xml create mode 100644 windows/scripts/base_setup.ps1 diff --git a/windows/10.json b/windows/10.json new file mode 100644 index 000000000..ba44d14c7 --- /dev/null +++ b/windows/10.json @@ -0,0 +1,114 @@ +{ + "builders": [{ + "type": "virtualbox-iso", + "vboxmanage": [ + ["modifyvm", "{{.Name}}", "--memory", "4096"], + ["modifyvm", "{{.Name}}", "--vram", "48"], + ["modifyvm", "{{.Name}}", "--cpus", "2"] + ], + "guest_additions_mode": "{{ user `guest_additions_mode` }}", + "guest_additions_path": "C:/users/vagrant/VBoxGuestAdditions.iso", + "guest_os_type": "Windows10_64", + "headless": "{{ user `headless` }}", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_checksum_type": "sha1", + "output_directory": "../builds/packer-{{user `template`}}-virtualbox", + "communicator": "winrm", + "winrm_username": "vagrant", + "winrm_password": "vagrant", + "winrm_timeout": "12h", + "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"", + "shutdown_timeout": "15m", + "floppy_files": [ + "answer_files/10/Autounattend.xml", + "scripts/base_setup.ps1" + ] + }, + { + "type": "vmware-iso", + "vmx_data": { + "memsize": "4096", + "numvcpus": "2", + "scsi0.virtualDev": "lsisas1068", + "scsi0.present": "TRUE" + }, + "guest_os_type": "windows9srv-64", + "headless": "{{ user `headless` }}", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_checksum_type": "sha1", + "output_directory": "../builds/packer-{{user `template`}}-vmware", + "communicator": "winrm", + "winrm_username": "vagrant", + "winrm_password": "vagrant", + "winrm_timeout": "12h", + "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"", + "shutdown_timeout": "15m", + "floppy_files": [ + "answer_files/10/Autounattend.xml" + ] + } + ], + "provisioners": [{ + "type": "chef-solo", + "cookbook_paths": ["cookbooks"], + "guest_os_type": "windows", + "run_list": [ + "packer::disable_uac", + "packer::disable_restore", + "packer::disable_windows_update", + "packer::remove_defender" + ] + }, + { + "type": "windows-restart" + }, + { + "type": "chef-solo", + "cookbook_paths": ["cookbooks"], + "guest_os_type": "windows", + "run_list": [ + "packer::vm_tools", + "packer::features", + "packer::enable_file_sharing", + "packer::enable_remote_desktop", + "packer::ui_tweaks", + "packer::power" + ] + }, + { + "type": "windows-restart" + }, + { + "type": "chef-solo", + "cookbook_paths": ["cookbooks"], + "guest_os_type": "windows", + "run_list": [ + "packer::cleanup", + "packer::defrag" + ] + }, + { + "type": "powershell", + "script": "scripts/cleanup.ps1", + "elevated_user": "vagrant", + "elevated_password": "vagrant" + } + ], + "post-processors": [ + [{ + "type": "vagrant", + "keep_input_artifact": true, + "output": "{{ user `template` }}-{{.Provider}}.box", + "vagrantfile_template": "vagrantfile-windows.template" + }] + ], + "variables": { + "guest_additions_mode": "attach", + "headless": "true", + "iso_checksum": "164f022a22d2305e6fbd82f6e35d530b6bbadca8", + "iso_url": "https://software-download.microsoft.com/download/sg/17763.107.101029-1455.rs5_release_svc_refresh_CLIENTENTERPRISEEVAL_OEMRET_x64FRE_en-us.iso", + "template": "windows-10" + } +} diff --git a/windows/answer_files/10/Autounattend.xml b/windows/answer_files/10/Autounattend.xml new file mode 100644 index 000000000..0b229409b --- /dev/null +++ b/windows/answer_files/10/Autounattend.xml @@ -0,0 +1,167 @@ +<?xml version="1.0" encoding="utf-8"?> +<unattend xmlns="urn:schemas-microsoft-com:unattend"> + <settings pass="windowsPE"> + <component name="Microsoft-Windows-International-Core-WinPE" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <SetupUILanguage> + <UILanguage>en-US</UILanguage> + </SetupUILanguage> + <InputLocale>en-US</InputLocale> + <SystemLocale>en-US</SystemLocale> + <UILanguage>en-US</UILanguage> + <UILanguageFallback>en-US</UILanguageFallback> + <UserLocale>en-US</UserLocale> + </component> + <component name="Microsoft-Windows-Setup" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <DiskConfiguration> + <Disk wcm:action="add"> + <CreatePartitions> + <CreatePartition wcm:action="add"> + <Type>Primary</Type> + <Order>1</Order> + <Size>350</Size> + </CreatePartition> + <CreatePartition wcm:action="add"> + <Order>2</Order> + <Type>Primary</Type> + <Extend>true</Extend> + </CreatePartition> + </CreatePartitions> + <ModifyPartitions> + <ModifyPartition wcm:action="add"> + <Active>true</Active> + <Format>NTFS</Format> + <Label>boot</Label> + <Order>1</Order> + <PartitionID>1</PartitionID> + </ModifyPartition> + <ModifyPartition wcm:action="add"> + <Format>NTFS</Format> + <Label>Windows 10</Label> + <Letter>C</Letter> + <Order>2</Order> + <PartitionID>2</PartitionID> + </ModifyPartition> + </ModifyPartitions> + <DiskID>0</DiskID> + <WillWipeDisk>true</WillWipeDisk> + </Disk> + </DiskConfiguration> + <ImageInstall> + <OSImage> + <InstallFrom> + <MetaData wcm:action="add"> + <Key>/IMAGE/NAME</Key> + <Value>Windows 10 Enterprise Evaluation</Value> + </MetaData> + </InstallFrom> + <InstallTo> + <DiskID>0</DiskID> + <PartitionID>2</PartitionID> + </InstallTo> + </OSImage> + </ImageInstall> + <UserData> + <ProductKey> + <WillShowUI>OnError</WillShowUI> + </ProductKey> + <AcceptEula>true</AcceptEula> + <FullName>Vagrant</FullName> + <Organization>Bento by Chef Software, Inc.</Organization> + </UserData> + </component> + </settings> + <settings pass="generalize"> + <component name="Microsoft-Windows-Security-SPP" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <SkipRearm>1</SkipRearm> + </component> + <component name="Microsoft-Windows-PnpSysprep" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <PersistAllDeviceInstalls>false</PersistAllDeviceInstalls> + <DoNotCleanUpNonPresentDevices>false</DoNotCleanUpNonPresentDevices> + </component> + </settings> + <settings pass="oobeSystem"> + <component name="Microsoft-Windows-International-Core" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <InputLocale>en-US</InputLocale> + <SystemLocale>en-US</SystemLocale> + <UILanguage>en-US</UILanguage> + <UserLocale>en-US</UserLocale> + </component> + <component name="Microsoft-Windows-Shell-Setup" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <OOBE> + <HideEULAPage>true</HideEULAPage> + <HideLocalAccountScreen>true</HideLocalAccountScreen> + <HideOEMRegistrationScreen>true</HideOEMRegistrationScreen> + <HideOnlineAccountScreens>true</HideOnlineAccountScreens> + <HideWirelessSetupInOOBE>true</HideWirelessSetupInOOBE> + <NetworkLocation>Home</NetworkLocation> + <ProtectYourPC>3</ProtectYourPC> + <SkipMachineOOBE>true</SkipMachineOOBE> + <SkipUserOOBE>true</SkipUserOOBE> + </OOBE> + <TimeZone>UTC</TimeZone> + <UserAccounts> + <AdministratorPassword> + <Value>vagrant</Value> + <PlainText>true</PlainText> + </AdministratorPassword> + <LocalAccounts> + <LocalAccount wcm:action="add"> + <Password> + <Value>vagrant</Value> + <PlainText>true</PlainText> + </Password> + <Group>Administrators</Group> + <DisplayName>Vagrant</DisplayName> + <Name>vagrant</Name> + <Description>Vagrant User</Description> + </LocalAccount> + </LocalAccounts> + </UserAccounts> + <AutoLogon> + <Password> + <Value>vagrant</Value> + <PlainText>true</PlainText> + </Password> + <Enabled>true</Enabled> + <Username>vagrant</Username> + </AutoLogon> + <FirstLogonCommands> + <SynchronousCommand wcm:action="add"> + <CommandLine>PowerShell "Set-ExecutionPolicy -ExecutionPolicy RemoteSigned -Force"</CommandLine> + <Description>Set Execution Policy 64 Bit</Description> + <Order>1</Order> + <RequiresUserInput>true</RequiresUserInput> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <CommandLine>C:\Windows\SysWOW64\cmd /c PowerShell -Command "Set-ExecutionPolicy -ExecutionPolicy RemoteSigned -Force"</CommandLine> + <Description>Set Execution Policy 32 Bit</Description> + <Order>2</Order> + <RequiresUserInput>true</RequiresUserInput> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <CommandLine>powershell -NoLogo -ExecutionPolicy RemoteSigned -File a:\base_setup.ps1</CommandLine> + <Description>Configure WinRM so packer can connect to run Chef</Description> + <Order>3</Order> + <RequiresUserInput>false</RequiresUserInput> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <CommandLine>cmd.exe /c wmic useraccount where "name='vagrant'" set PasswordExpires=FALSE</CommandLine> + <Order>4</Order> + <Description>Disable password expiration for vagrant user</Description> + </SynchronousCommand> + </FirstLogonCommands> + </component> + </settings> + <settings pass="specialize"> + <component xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" name="Microsoft-Windows-ServerManager-SvrMgrNc" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> + <DoNotOpenServerManagerAtLogon>true</DoNotOpenServerManagerAtLogon> + </component> + <component xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" name="Microsoft-Windows-IE-ESC" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> + <IEHardenAdmin>false</IEHardenAdmin> + <IEHardenUser>false</IEHardenUser> + </component> + <component xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" name="Microsoft-Windows-OutOfBoxExperience" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> + <DoNotOpenInitialConfigurationTasksAtLogon>true</DoNotOpenInitialConfigurationTasksAtLogon> + </component> + </settings> +</unattend> diff --git a/windows/scripts/base_setup.ps1 b/windows/scripts/base_setup.ps1 new file mode 100644 index 000000000..8dc9f6663 --- /dev/null +++ b/windows/scripts/base_setup.ps1 @@ -0,0 +1,32 @@ +Write-Host "Performing the WinRM setup necessary to get the host ready for packer to run Chef..." + +# this is from https://github.com/luciusbono/Packer-Windows10/blob/master/configure-winrm.ps1 +# and https://github.com/rgl/windows-2016-vagrant/blob/master/winrm.ps1 + +# Supress network location Prompt +New-Item -Path "HKLM:\SYSTEM\CurrentControlSet\Control\Network\NewNetworkWindowOff" -Force + +# Set network to private as required by WinRM +Get-NetConnectionProfile ` + | Where-Object {$_.NetworkCategory -ne 'DomainAuthenticated'} ` + | Set-NetConnectionProfile -NetworkCategory Private + +winrm quickconfig -q +winrm set "winrm/config" '@{MaxTimeoutms="1800000"}' +winrm set "winrm/config/winrs" '@{MaxMemoryPerShellMB="2048"}' +winrm set "winrm/config/service" '@{AllowUnencrypted="true"}' +winrm set "winrm/config/service/auth" '@{Basic="true"}' + +# Enable the WinRM Firewall rules +$winRmFirewallRuleNames = @( + 'WINRM-HTTP-In-TCP', # Windows Remote Management (HTTP-In) + 'WINRM-HTTP-In-TCP-PUBLIC' # Windows Remote Management (HTTP-In) # Windows Server + 'WINRM-HTTP-In-TCP-NoScope' # Windows Remote Management (HTTP-In) # Windows 10 +) +Get-NetFirewallRule -Direction Inbound -Enabled False ` + | Where-Object {$winRmFirewallRuleNames -contains $_.Name} ` +| Set-NetFirewallRule -Enable True + +sc.exe config WinRM start= delayed-auto + +exit 0 From ef8be6d5fa13dce620bba4cc22580e0402b0990a Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith@chef.io> Date: Tue, 12 Feb 2019 12:36:14 -0800 Subject: [PATCH 0919/1622] Remove extra unused powershell script on the Windows side No need for this anymore Signed-off-by: Tim Smith <tsmith@chef.io> --- windows/scripts/after-reboot.ps1 | 22 ---------------------- 1 file changed, 22 deletions(-) delete mode 100644 windows/scripts/after-reboot.ps1 diff --git a/windows/scripts/after-reboot.ps1 b/windows/scripts/after-reboot.ps1 deleted file mode 100644 index d583c8cfa..000000000 --- a/windows/scripts/after-reboot.ps1 +++ /dev/null @@ -1,22 +0,0 @@ -$ProgressPreference='SilentlyContinue' -Get-WUInstall -WindowsUpdate -AcceptAll -UpdateType Software -IgnoreReboot - -# The sleeps may seem whacky because they are -# Might be able to remove after 2016 RTMs -# For now after much trial and error, this is what works -Write-Host "waiting 5 minutes" -Start-Sleep -Seconds 300 - -$uninstallSuccess = $false -while(!$uninstallSuccess) { - Write-Host "Attempting to uninstall features..." - try { - Get-WindowsFeature | ? { $_.InstallState -eq 'Available' } | Uninstall-WindowsFeature -Remove -ErrorAction Stop - Write-Host "Uninstall succeeded!" - $uninstallSuccess = $true - } - catch { - Write-Host "Waiting two minutes before next attempt" - Start-Sleep -Seconds 120 - } -} From f9c0012047918c0dda10901daf3c7cc5b2c7059e Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith@chef.io> Date: Tue, 12 Feb 2019 12:37:23 -0800 Subject: [PATCH 0920/1622] Add a recipe for disabling hibernation on WIndows No need to have this in a vagrant box Signed-off-by: Tim Smith <tsmith@chef.io> --- windows/cookbooks/packer/recipes/disable_hibernation.rb | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 windows/cookbooks/packer/recipes/disable_hibernation.rb diff --git a/windows/cookbooks/packer/recipes/disable_hibernation.rb b/windows/cookbooks/packer/recipes/disable_hibernation.rb new file mode 100644 index 000000000..64f099c4b --- /dev/null +++ b/windows/cookbooks/packer/recipes/disable_hibernation.rb @@ -0,0 +1,6 @@ +registry_key 'HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Power' do + values [{ name: 'HiberFileSizePercent', type: :dword, data: 0 }, + { name: 'HibernateEnabled', type: :dword, data: 0 }, + ] + action :create +end \ No newline at end of file From e8c18ce29647af8099627c418db3c8ce29e7af13 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith@chef.io> Date: Tue, 12 Feb 2019 15:20:56 -0800 Subject: [PATCH 0921/1622] Refine how we enable WinRM / disable hiberation on Windows 10 Enable-PSremoting does 99% of what we need now days. This also makes sure we setup the system without audio enabled and with the SATA disk which should speed things up a tiny bit. Signed-off-by: Tim Smith <tsmith@chef.io> --- windows/10.json | 5 ++++- windows/cookbooks/packer/kitchen.yml | 2 ++ windows/scripts/base_setup.ps1 | 22 ++++------------------ 3 files changed, 10 insertions(+), 19 deletions(-) diff --git a/windows/10.json b/windows/10.json index ba44d14c7..8483dadee 100644 --- a/windows/10.json +++ b/windows/10.json @@ -4,11 +4,13 @@ "vboxmanage": [ ["modifyvm", "{{.Name}}", "--memory", "4096"], ["modifyvm", "{{.Name}}", "--vram", "48"], - ["modifyvm", "{{.Name}}", "--cpus", "2"] + ["modifyvm", "{{.Name}}", "--cpus", "2"], + ["modifyvm", "{{.Name}}", "--audio", "none"] ], "guest_additions_mode": "{{ user `guest_additions_mode` }}", "guest_additions_path": "C:/users/vagrant/VBoxGuestAdditions.iso", "guest_os_type": "Windows10_64", + "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", "iso_url": "{{ user `iso_url` }}", "iso_checksum": "{{ user `iso_checksum` }}", @@ -57,6 +59,7 @@ "run_list": [ "packer::disable_uac", "packer::disable_restore", + "packer::disable_hibernation", "packer::disable_windows_update", "packer::remove_defender" ] diff --git a/windows/cookbooks/packer/kitchen.yml b/windows/cookbooks/packer/kitchen.yml index 8f66b93b5..ce2d1f69d 100644 --- a/windows/cookbooks/packer/kitchen.yml +++ b/windows/cookbooks/packer/kitchen.yml @@ -28,6 +28,8 @@ suites: run_list: - recipe[packer::disable_uac] - recipe[packer::disable_windows_update] + - recipe[packer::disable_restore] + - recipe[packer::disable_hibernation] - recipe[packer::remove_defender] - recipe[packer::vm_tools] - recipe[packer::features] diff --git a/windows/scripts/base_setup.ps1 b/windows/scripts/base_setup.ps1 index 8dc9f6663..dc8743425 100644 --- a/windows/scripts/base_setup.ps1 +++ b/windows/scripts/base_setup.ps1 @@ -1,32 +1,18 @@ Write-Host "Performing the WinRM setup necessary to get the host ready for packer to run Chef..." -# this is from https://github.com/luciusbono/Packer-Windows10/blob/master/configure-winrm.ps1 +# parts of this are from https://github.com/luciusbono/Packer-Windows10/blob/master/configure-winrm.ps1 # and https://github.com/rgl/windows-2016-vagrant/blob/master/winrm.ps1 # Supress network location Prompt New-Item -Path "HKLM:\SYSTEM\CurrentControlSet\Control\Network\NewNetworkWindowOff" -Force -# Set network to private as required by WinRM -Get-NetConnectionProfile ` - | Where-Object {$_.NetworkCategory -ne 'DomainAuthenticated'} ` - | Set-NetConnectionProfile -NetworkCategory Private +# Does a lot: https://docs.microsoft.com/en-us/powershell/module/microsoft.powershell.core/enable-psremoting?view=powershell-6 +Enable-PSRemoting -SkipNetworkProfileCheck -Force +Set-NetFirewallRule -Name "WINRM-HTTP-In-TCP" -RemoteAddress Any # allow winrm over public profile interfaces -winrm quickconfig -q winrm set "winrm/config" '@{MaxTimeoutms="1800000"}' winrm set "winrm/config/winrs" '@{MaxMemoryPerShellMB="2048"}' winrm set "winrm/config/service" '@{AllowUnencrypted="true"}' winrm set "winrm/config/service/auth" '@{Basic="true"}' -# Enable the WinRM Firewall rules -$winRmFirewallRuleNames = @( - 'WINRM-HTTP-In-TCP', # Windows Remote Management (HTTP-In) - 'WINRM-HTTP-In-TCP-PUBLIC' # Windows Remote Management (HTTP-In) # Windows Server - 'WINRM-HTTP-In-TCP-NoScope' # Windows Remote Management (HTTP-In) # Windows 10 -) -Get-NetFirewallRule -Direction Inbound -Enabled False ` - | Where-Object {$winRmFirewallRuleNames -contains $_.Name} ` -| Set-NetFirewallRule -Enable True - -sc.exe config WinRM start= delayed-auto - exit 0 From 7bb764433f9a54a8d824b4d3651b394144c3ce09 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith@chef.io> Date: Tue, 12 Feb 2019 15:47:19 -0800 Subject: [PATCH 0922/1622] Add onedrive disable recipe for Windows 10 Onedrive consumes a lot of CPU Signed-off-by: Tim Smith <tsmith@chef.io> --- windows/10.json | 1 + windows/cookbooks/packer/recipes/disable_onedrive.rb | 5 +++++ 2 files changed, 6 insertions(+) create mode 100644 windows/cookbooks/packer/recipes/disable_onedrive.rb diff --git a/windows/10.json b/windows/10.json index 8483dadee..c09117a1e 100644 --- a/windows/10.json +++ b/windows/10.json @@ -58,6 +58,7 @@ "guest_os_type": "windows", "run_list": [ "packer::disable_uac", + "packer::disable_onedrive", "packer::disable_restore", "packer::disable_hibernation", "packer::disable_windows_update", diff --git a/windows/cookbooks/packer/recipes/disable_onedrive.rb b/windows/cookbooks/packer/recipes/disable_onedrive.rb new file mode 100644 index 000000000..a6d719c02 --- /dev/null +++ b/windows/cookbooks/packer/recipes/disable_onedrive.rb @@ -0,0 +1,5 @@ +# this causes onedrive to load then instantly exit +registry_key 'HKEY_LOCAL_MACHINE\Software\Policies\Microsoft\Windows\OneDrive' do + values [{ name: 'DisableFileSyncNGSC', type: :dword, data: 1 }] + action :create +end From 6ab6872994b0debfd3ced0b63e4781c547b5fbbd Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith@chef.io> Date: Tue, 12 Feb 2019 17:07:57 -0800 Subject: [PATCH 0923/1622] Format the windows 7 JSON Signed-off-by: Tim Smith <tsmith@chef.io> --- windows/7.json | 31 ++++++++++++++++++++++++++----- 1 file changed, 26 insertions(+), 5 deletions(-) diff --git a/windows/7.json b/windows/7.json index ca4ec1e70..f824889c2 100644 --- a/windows/7.json +++ b/windows/7.json @@ -24,20 +24,41 @@ "answer_files/7/Autounattend.xml" ] }], - "provisioners": [{ + "provisioners": [{ "type": "chef-solo", "cookbook_paths": ["cookbooks"], "guest_os_type": "windows", - "install_command": "powershell.exe -Command \"(new-object Net.WebClient).DownloadString('https://omnitruck.chef.io/install.ps1') | iex; install\"", "run_list": [ "packer::disable_uac", + "packer::disable_restore", "packer::disable_windows_update", + "packer::remove_defender" + ] + }, + { + "type": "windows-restart" + }, + { + "type": "chef-solo", + "cookbook_paths": ["cookbooks"], + "guest_os_type": "windows", + "run_list": [ "packer::vm_tools", "packer::features", "packer::enable_file_sharing", "packer::enable_remote_desktop", "packer::ui_tweaks", - "packer::power", + "packer::power" + ] + }, + { + "type": "windows-restart" + }, + { + "type": "chef-solo", + "cookbook_paths": ["cookbooks"], + "guest_os_type": "windows", + "run_list": [ "packer::cleanup", "packer::defrag" ] @@ -60,8 +81,8 @@ "variables": { "guest_additions_mode": "attach", "headless": "false", - "iso_checksum": "36ae90defbad9d9539e649b193ae573b77a71c83", - "iso_url": "iso/en_windows_7_ultimate_with_sp1_x64_dvd_u_677332.iso", + "iso_checksum": "971fc00183a52c152fe924a6b99fdec011a871c2", + "iso_url": "http://care.dlservice.microsoft.com/dl/download/evalx/win7/x86/EN/7600.16385.090713-1255_x86fre_enterprise_en-us_EVAL_Eval_Enterprise-GRMCENEVAL_EN_DVD.iso", "template": "windows-7" } } From 0a9f529c61a874aa7f2c2206e4f3bb36c333b743 Mon Sep 17 00:00:00 2001 From: Noah O'Donoghue <noah.odonoghue@gmail.com> Date: Sat, 16 Feb 2019 23:26:30 +0700 Subject: [PATCH 0924/1622] Add Ubuntu 18.04.2 --- ubuntu/ubuntu-18.04-amd64.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ubuntu/ubuntu-18.04-amd64.json b/ubuntu/ubuntu-18.04-amd64.json index 881abdd36..49361ab86 100644 --- a/ubuntu/ubuntu-18.04-amd64.json +++ b/ubuntu/ubuntu-18.04-amd64.json @@ -300,12 +300,12 @@ "https_proxy": "{{env `https_proxy`}}", "hyperv_generation": "2", "hyperv_switch": "{{env `hyperv_switch`}}", - "iso_checksum": "a5b0ea5918f850124f3d72ef4b85bda82f0fcd02ec721be19c1a6952791c8ee8", + "iso_checksum": "a2cb36dc010d98ad9253ea5ad5a07fd6b409e3412c48f1860536970b073c98f5", "iso_checksum_type": "sha256", - "iso_name": "ubuntu-18.04.1-server-amd64.iso", + "iso_name": "ubuntu-18.04.2-server-amd64.iso", "memory": "1024", "mirror": "http://cdimage.ubuntu.com", - "mirror_directory": "ubuntu/releases/18.04.1/release", + "mirror_directory": "ubuntu/releases/18.04.2/release", "name": "ubuntu-18.04", "no_proxy": "{{env `no_proxy`}}", "preseed_path": "preseed.cfg", From e68771e8e69b8e71d3acbca9268c12c374122823 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith@chef.io> Date: Sat, 16 Feb 2019 20:03:04 -0800 Subject: [PATCH 0925/1622] Add template validation in Travis We should know we have the correct format on merge Signed-off-by: Tim Smith <tsmith@chef.io> --- .travis.yml | 14 +++++--------- Rakefile | 16 ++++++++++++++-- 2 files changed, 19 insertions(+), 11 deletions(-) diff --git a/.travis.yml b/.travis.yml index 1b243456e..123985029 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,18 +1,14 @@ dist: xenial -sudo: false +language: ruby +cache: bundler env: global: - - PACKER_VERSION="1.3.2" + - PACKER_VERSION="1.3.4" - PATH=$HOME/bin:$PATH rvm: - - 2.5.3 - - ruby-head - -matrix: - allow_failures: - - rvm: ruby-head + - 2.6.1 branches: only: @@ -25,4 +21,4 @@ before_install: before_script: - packer --version -script: bento normalize +script: rake validate diff --git a/Rakefile b/Rakefile index 91cdb7906..67dff1b6a 100644 --- a/Rakefile +++ b/Rakefile @@ -9,6 +9,18 @@ rescue LoadError exit! end +desc "Validate all templates using Packer" +task :validate do + Dir.glob("**/*.json").each do |template_path| + template_dir = File.dirname(template_path) + filename = File.basename(template_path) + + puts "\n\e[32mValidating #{template_path}\e[0m\n\n" + result = system("packer validate #{filename}", chdir: template_dir) + raise "Validation for #{template_path} failed" unless result + end +end + desc "clean, build, test, upload" task :do_all do check_env @@ -33,8 +45,8 @@ end desc "clean" task :clean do - puts "Removing .kitchen.yml and builds/*" - FileUtils.rm_rf(['.kitchen.yml', Dir.glob('builds/*')]) + puts "Removing kitchen.yml and builds/*" + FileUtils.rm_rf(['kitchen.yml', Dir.glob('builds/*')]) end def build_cmd(template) From d56f3883be5fbc00fcd0206cc624fed26729980e Mon Sep 17 00:00:00 2001 From: Michael Geiger <info@mgeiger.de> Date: Sun, 17 Feb 2019 15:22:34 +0100 Subject: [PATCH 0926/1622] Separate autoyast file for different os version Rename repository script and run it first Update all packages to newest version Install some packages after adding repos as they are no longer on installer image (Leap 15) Signed-off-by: Michael Geiger <info@mgeiger.de> --- opensuse/http/15/autoinst.xml | 216 ++++++++++++++++++ opensuse/http/{ => 42}/autoinst.xml | 0 opensuse/opensuse-leap-15.0-x86_64.json | 6 +- opensuse/opensuse-leap-42.3-x86_64.json | 5 +- opensuse/scripts/add_packages.sh | 4 + .../{remove-dvd-source.sh => repositories.sh} | 0 opensuse/scripts/update.sh | 5 + 7 files changed, 232 insertions(+), 4 deletions(-) create mode 100644 opensuse/http/15/autoinst.xml rename opensuse/http/{ => 42}/autoinst.xml (100%) create mode 100644 opensuse/scripts/add_packages.sh rename opensuse/scripts/{remove-dvd-source.sh => repositories.sh} (100%) create mode 100644 opensuse/scripts/update.sh diff --git a/opensuse/http/15/autoinst.xml b/opensuse/http/15/autoinst.xml new file mode 100644 index 000000000..d6587d230 --- /dev/null +++ b/opensuse/http/15/autoinst.xml @@ -0,0 +1,216 @@ +<?xml version="1.0"?> +<!DOCTYPE profile> + +<!-- http://doc.opensuse.org/projects/autoyast/configuration.html --> + +<profile xmlns="http://www.suse.com/1.0/yast2ns" xmlns:config="http://www.suse.com/1.0/configns"> + <general> + <mode> + <confirm config:type="boolean">false</confirm> + <forceboot config:type="boolean">true</forceboot> + <final_reboot config:type="boolean">false</final_reboot> + </mode> + </general> + <report> + <messages> + <show config:type="boolean">false</show> + <timeout config:type="integer">10</timeout> + <log config:type="boolean">true</log> + </messages> + <warnings> + <show config:type="boolean">false</show> + <timeout config:type="integer">10</timeout> + <log config:type="boolean">true</log> + </warnings> + <errors> + <show config:type="boolean">false</show> + <timeout config:type="integer">10</timeout> + <log config:type="boolean">true</log> + </errors> + </report> + + <keyboard> + <keymap>english-us</keymap> + </keyboard> + <language> + <language>en_US</language> + <languages>en_US</languages> + </language> + <timezone> + <hwclock>UTC</hwclock> + <timezone>Etc/UTC</timezone> + </timezone> + <partitioning config:type="list"> + <drive> + <enable_snapshots config:type="boolean">false</enable_snapshots> + <initialize config:type="boolean">true</initialize> + <partitions config:type="list"> + <partition> + <create config:type="boolean">true</create> + <crypt_fs config:type="boolean">false</crypt_fs> + <filesystem config:type="symbol">swap</filesystem> + <format config:type="boolean">true</format> + <fstopt>defaults</fstopt> + <loop_fs config:type="boolean">false</loop_fs> + <mount>swap</mount> + <mountby config:type="symbol">device</mountby> + <partition_id config:type="integer">130</partition_id> + <partition_nr config:type="integer">1</partition_nr> + <raid_options/> + <resize config:type="boolean">false</resize> + <size>512M</size> + </partition> + <partition> + <create config:type="boolean">true</create> + <crypt_fs config:type="boolean">false</crypt_fs> + <filesystem config:type="symbol">btrfs</filesystem> + <format config:type="boolean">true</format> + <loop_fs config:type="boolean">false</loop_fs> + <mount>/</mount> + <mountby config:type="symbol">device</mountby> + <partition_id config:type="integer">131</partition_id> + <partition_nr config:type="integer">2</partition_nr> + <raid_options/> + <resize config:type="boolean">false</resize> + <size>max</size> + <subvolumes config:type="list"> + <listentry>boot/grub2/i386-pc</listentry> + <listentry>boot/grub2/x86_64-efi</listentry> + <listentry>home</listentry> + <listentry>opt</listentry> + <listentry>srv</listentry> + <listentry>tmp</listentry> + <listentry>usr/local</listentry> + <listentry>var/crash</listentry> + <listentry>var/lib/mailman</listentry> + <listentry>var/lib/named</listentry> + <listentry>var/lib/pgsql</listentry> + <listentry>var/log</listentry> + <listentry>var/opt</listentry> + <listentry>var/spool</listentry> + <listentry>var/tmp</listentry> + </subvolumes> + </partition> + </partitions> + <pesize/> + <type config:type="symbol">CT_DISK</type> + <use>all</use> + </drive> + </partitioning> + + <bootloader> + <loader_type>grub2</loader_type> + </bootloader> + + <networking> + <ipv6 config:type="boolean">false</ipv6> + <keep_install_network config:type="boolean">true</keep_install_network> + <dns> + <dhcp_hostname config:type="boolean">true</dhcp_hostname> + <dhcp_resolv config:type="boolean">true</dhcp_resolv> + <domain>vagrantup.com</domain> + <hostname>opensuse-leap-x64</hostname> + </dns> + <interfaces config:type="list"> + <interface> + <bootproto>dhcp</bootproto> + <device>eth0</device> + <startmode>auto</startmode> + <usercontrol>no</usercontrol> + </interface> + </interfaces> + </networking> + + <firewall> + <enable_firewall config:type="boolean">true</enable_firewall> + <start_firewall config:type="boolean">true</start_firewall> + </firewall> + + <software> + <image/> + <instsource/> + <packages config:type="list"> + <package>grub2</package> + <package>glibc-locale</package> + <package>iputils</package> + <package>kernel-default</package> + <package>make</package> + <package>sudo</package> + <package>yast2</package> + <package>yast2-firstboot</package> + <package>zypper</package> + <package>yast2-trans-en_US</package> + <package>wget</package> + <package>curl</package> + <package>grub2-branding-openSUSE</package> + <package>less</package> + </packages> + <patterns config:type="list"> + <pattern>sw_management</pattern> + <pattern>yast2_install_wf</pattern> + <pattern>minimal_base</pattern> + </patterns> + <remove-packages config:type="list"> + <package>bash-completion</package> + <package>telnet</package> + <package>virtualbox-guest-kmp-default</package> + <package>virtualbox-guest-tools</package> + <package>snapper</package> + <package>snapper-zypp-plugin</package> + </remove-packages> + </software> + <services-manager> + <default_target>graphical</default_target> + <services> + <disable config:type="list"/> + <enable config:type="list"> + <service>sshd</service> + </enable> + </services> + </services-manager> + <groups config:type="list"> + <group> + <gid>100</gid> + <groupname>users</groupname> + <userlist/> + </group> + </groups> + <user_defaults> + <expire/> + <group>100</group> + <groups/> + <home>/home</home> + <inactive>-1</inactive> + <no_groups config:type="boolean">true</no_groups> + <shell>/bin/bash</shell> + <skel>/etc/skel</skel> + <umask>022</umask> + </user_defaults> + + <users config:type="list"> + <user> + <user_password>vagrant</user_password> + <username>root</username> + </user> + <user> + <fullname>vagrant</fullname> + <gid>100</gid> + <home>/home/vagrant</home> + <password_settings> + <expire/> + <flag/> + <inact>-1</inact> + <max>99999</max> + <min>0</min> + <warn>7</warn> + </password_settings> + <shell>/bin/bash</shell> + <uid>1000</uid> + <user_password>vagrant</user_password> + <username>vagrant</username> + </user> + </users> + <kdump> + <add_crash_kernel config:type="boolean">false</add_crash_kernel> + </kdump> +</profile> diff --git a/opensuse/http/autoinst.xml b/opensuse/http/42/autoinst.xml similarity index 100% rename from opensuse/http/autoinst.xml rename to opensuse/http/42/autoinst.xml diff --git a/opensuse/opensuse-leap-15.0-x86_64.json b/opensuse/opensuse-leap-15.0-x86_64.json index 8d4633ea3..f03fc726c 100644 --- a/opensuse/opensuse-leap-15.0-x86_64.json +++ b/opensuse/opensuse-leap-15.0-x86_64.json @@ -171,6 +171,9 @@ "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh '{{.Path}}'", "expect_disconnect": true, "scripts": [ + "scripts/repositories.sh", + "scripts/update.sh", + "scripts/add_packages.sh", "../_common/sshd.sh", "../_common/vagrant.sh", "../_common/virtualbox.sh", @@ -179,7 +182,6 @@ "scripts/vagrant_group.sh", "scripts/sudoers.sh", "scripts/zypper-locks.sh", - "scripts/remove-dvd-source.sh", "scripts/cleanup.sh", "../_common/minimize.sh" ], @@ -188,7 +190,7 @@ ], "variables": { "arch": "64", - "autoinst_cfg": "autoinst.xml", + "autoinst_cfg": "15/autoinst.xml", "box_basename": "opensuse-leap-15.0", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", diff --git a/opensuse/opensuse-leap-42.3-x86_64.json b/opensuse/opensuse-leap-42.3-x86_64.json index 9e59e1c12..e2139f779 100644 --- a/opensuse/opensuse-leap-42.3-x86_64.json +++ b/opensuse/opensuse-leap-42.3-x86_64.json @@ -171,6 +171,8 @@ "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh '{{.Path}}'", "expect_disconnect": true, "scripts": [ + "scripts/repositories.sh", + "scripts/update.sh", "../_common/sshd.sh", "../_common/vagrant.sh", "../_common/virtualbox.sh", @@ -179,7 +181,6 @@ "scripts/vagrant_group.sh", "scripts/sudoers.sh", "scripts/zypper-locks.sh", - "scripts/remove-dvd-source.sh", "scripts/cleanup.sh", "../_common/minimize.sh" ], @@ -188,7 +189,7 @@ ], "variables": { "arch": "64", - "autoinst_cfg": "autoinst.xml", + "autoinst_cfg": "42/autoinst.xml", "box_basename": "opensuse-leap-42.3", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", diff --git a/opensuse/scripts/add_packages.sh b/opensuse/scripts/add_packages.sh new file mode 100644 index 000000000..1698de837 --- /dev/null +++ b/opensuse/scripts/add_packages.sh @@ -0,0 +1,4 @@ +#!/bin/sh -eux + +# Install missing packages +zypper install -y kernel-default-devel gcc diff --git a/opensuse/scripts/remove-dvd-source.sh b/opensuse/scripts/repositories.sh similarity index 100% rename from opensuse/scripts/remove-dvd-source.sh rename to opensuse/scripts/repositories.sh diff --git a/opensuse/scripts/update.sh b/opensuse/scripts/update.sh new file mode 100644 index 000000000..11a0dce28 --- /dev/null +++ b/opensuse/scripts/update.sh @@ -0,0 +1,5 @@ +#!/bin/sh -eux + +# Update all packages +zypper update -y +reboot From f8921ab99c405be521a46196fe3f77f29b6a2b5f Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith@chef.io> Date: Mon, 18 Feb 2019 10:14:31 -0800 Subject: [PATCH 0927/1622] Update Debian to 9.8 Signed-off-by: Tim Smith <tsmith@chef.io> --- builds.yml | 6 +++--- .../{debian-9.6-amd64.json => debian-9.8-amd64.json} | 12 ++++++------ .../{debian-9.6-i386.json => debian-9.8-i386.json} | 12 ++++++------ ...bian-9.6-ppc64el.json => debian-9.8-ppc64el.json} | 12 ++++++------ 4 files changed, 21 insertions(+), 21 deletions(-) rename debian/{debian-9.6-amd64.json => debian-9.8-amd64.json} (96%) rename debian/{debian-9.6-i386.json => debian-9.8-i386.json} (96%) rename debian/{debian-9.6-ppc64el.json => debian-9.8-ppc64el.json} (91%) diff --git a/builds.yml b/builds.yml index d2a82744c..4d1063ad0 100644 --- a/builds.yml +++ b/builds.yml @@ -7,8 +7,8 @@ public: - 'centos-7.6' - 'debian-8.11-i386' - 'debian-8.11' -- 'debian-9.6-i386' -- 'debian-9.6' +- 'debian-9.8-i386' +- 'debian-9.8' - 'fedora-28' - 'fedora-29' - 'freebsd-11.2-i386' @@ -31,7 +31,7 @@ slugs: 'centos-7': 'centos-7.6' 'centos-6': 'centos-6.10' 'centos-5': 'centos-5.11' - 'debian-9': 'debian-9.6' + 'debian-9': 'debian-9.8' 'debian-8': 'debian-8.11' 'oracle-7': 'oracle-7.6' 'oracle-6': 'oracle-6.10' diff --git a/debian/debian-9.6-amd64.json b/debian/debian-9.8-amd64.json similarity index 96% rename from debian/debian-9.6-amd64.json rename to debian/debian-9.8-amd64.json index 2f01a3df1..ff8c0868c 100644 --- a/debian/debian-9.6-amd64.json +++ b/debian/debian-9.8-amd64.json @@ -217,7 +217,7 @@ } ], "variables": { - "box_basename": "debian-9.6", + "box_basename": "debian-9.8", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", "disk_size": "65536", @@ -225,16 +225,16 @@ "headless": "", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", - "iso_checksum": "c51d84019c3637ae9d12aa6658ea8c613860c776bd84c6a71eaaf765a0dd60fe", + "iso_checksum": "73bd56fb4548efa384bf32fd25808b99198f81c23cf19ab9e6507d898cd58dce", "iso_checksum_type": "sha256", - "iso_name": "debian-9.6.0-amd64-netinst.iso", + "iso_name": "debian-9.8.0-amd64-netinst.iso", "memory": "1024", "mirror": "http://cdimage.debian.org/cdimage/release", - "mirror_directory": "9.6.0/amd64/iso-cd", - "name": "debian-9.6", + "mirror_directory": "9.8.0/amd64/iso-cd", + "name": "debian-9.8", "no_proxy": "{{env `no_proxy`}}", "preseed_path": "debian-8/preseed.cfg", - "template": "debian-9.6-amd64", + "template": "debian-9.8-amd64", "version": "TIMESTAMP" } } diff --git a/debian/debian-9.6-i386.json b/debian/debian-9.8-i386.json similarity index 96% rename from debian/debian-9.6-i386.json rename to debian/debian-9.8-i386.json index d151d6397..42fd8d17e 100644 --- a/debian/debian-9.6-i386.json +++ b/debian/debian-9.8-i386.json @@ -217,7 +217,7 @@ } ], "variables": { - "box_basename": "debian-9.6-i386", + "box_basename": "debian-9.8-i386", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", "disk_size": "65536", @@ -225,16 +225,16 @@ "headless": "", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", - "iso_checksum": "7f0bda2afc4b3689a3590600e117f8e72aafd8cdd64b2a8089214b1edfb2b89b", + "iso_checksum": "8156cc4ce7a06facf69d4f7161f89431a794cdaba8e2b4eb91b2c43a302e4614", "iso_checksum_type": "sha256", - "iso_name": "debian-9.6.0-i386-netinst.iso", + "iso_name": "debian-9.8.0-i386-netinst.iso", "memory": "1024", "mirror": "http://cdimage.debian.org/cdimage/release", - "mirror_directory": "9.6.0/i386/iso-cd", - "name": "debian-9.6-i386", + "mirror_directory": "9.8.0/i386/iso-cd", + "name": "debian-9.8-i386", "no_proxy": "{{env `no_proxy`}}", "preseed_path": "debian-8/preseed.cfg", - "template": "debian-9.6-i386", + "template": "debian-9.8-i386", "version": "TIMESTAMP" } } diff --git a/debian/debian-9.6-ppc64el.json b/debian/debian-9.8-ppc64el.json similarity index 91% rename from debian/debian-9.6-ppc64el.json rename to debian/debian-9.8-ppc64el.json index d097c1c4f..6247cfd03 100644 --- a/debian/debian-9.6-ppc64el.json +++ b/debian/debian-9.8-ppc64el.json @@ -78,7 +78,7 @@ } ], "variables": { - "box_basename": "debian-9.6", + "box_basename": "debian-9.8", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", "disk_size": "65536", @@ -86,16 +86,16 @@ "headless": "", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", - "iso_checksum": "07a9ddd57826558478b414b5d0b9be15bc793fffcc25e8a10be71b9e109e362e", + "iso_checksum": "5ebf80f35af9e5b4c85240763c044854c408c77a68a6cb757f99306ba227b701", "iso_checksum_type": "sha256", - "iso_name": "debian-9.6.0-ppc64el-netinst.iso", + "iso_name": "debian-9.8.0-ppc64el-netinst.iso", "memory": "1024", "mirror": "http://cdimage.debian.org/cdimage/release", - "mirror_directory": "9.6.0/ppc64el/iso-cd", - "name": "debian-9.6", + "mirror_directory": "9.8.0/ppc64el/iso-cd", + "name": "debian-9.8", "no_proxy": "{{env `no_proxy`}}", "preseed_path": "debian-8/preseed.cfg", - "template": "debian-9.6-ppc64el", + "template": "debian-9.8-ppc64el", "version": "TIMESTAMP" } } From d83a2a229512679e31bcd7054a22abfca5d8d754 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith@chef.io> Date: Mon, 18 Feb 2019 10:33:40 -0800 Subject: [PATCH 0928/1622] Remove zypper download cache in the cleanup script This drops the box size by 20 megs Signed-off-by: Tim Smith <tsmith@chef.io> --- opensuse/scripts/cleanup.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/opensuse/scripts/cleanup.sh b/opensuse/scripts/cleanup.sh index e05f9d723..c7cb08725 100644 --- a/opensuse/scripts/cleanup.sh +++ b/opensuse/scripts/cleanup.sh @@ -1,8 +1,11 @@ #!/bin/bash -eux -# These were only needed for building VMware/Virtualbox extensions: +# These were only needed for building VMware/Virtualbox extensions: zypper -n rm -u gcc make kernel-default-devel kernel-devel +# cleanup all the downloaded RPMs +zypper clean --all + # Clean up network interface persistence rm -f /etc/udev/rules.d/70-persistent-net.rules; touch /etc/udev/rules.d/75-persistent-net-generator.rules; From 2c8a5b96aeecff0085c84fd52204c49ed04342aa Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith@chef.io> Date: Mon, 18 Feb 2019 10:34:13 -0800 Subject: [PATCH 0929/1622] Disable the firewall on opensuse 15 to fix SSH not connecting Signed-off-by: Tim Smith <tsmith@chef.io> --- opensuse/http/15/autoinst.xml | 36 ++++++++++++++--------------------- 1 file changed, 14 insertions(+), 22 deletions(-) diff --git a/opensuse/http/15/autoinst.xml b/opensuse/http/15/autoinst.xml index d6587d230..49e1998e1 100644 --- a/opensuse/http/15/autoinst.xml +++ b/opensuse/http/15/autoinst.xml @@ -1,8 +1,6 @@ -<?xml version="1.0"?> +<?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE profile> - <!-- http://doc.opensuse.org/projects/autoyast/configuration.html --> - <profile xmlns="http://www.suse.com/1.0/yast2ns" xmlns:config="http://www.suse.com/1.0/configns"> <general> <mode> @@ -28,7 +26,6 @@ <log config:type="boolean">true</log> </errors> </report> - <keyboard> <keymap>english-us</keymap> </keyboard> @@ -56,7 +53,7 @@ <mountby config:type="symbol">device</mountby> <partition_id config:type="integer">130</partition_id> <partition_nr config:type="integer">1</partition_nr> - <raid_options/> + <raid_options /> <resize config:type="boolean">false</resize> <size>512M</size> </partition> @@ -70,7 +67,7 @@ <mountby config:type="symbol">device</mountby> <partition_id config:type="integer">131</partition_id> <partition_nr config:type="integer">2</partition_nr> - <raid_options/> + <raid_options /> <resize config:type="boolean">false</resize> <size>max</size> <subvolumes config:type="list"> @@ -92,16 +89,14 @@ </subvolumes> </partition> </partitions> - <pesize/> + <pesize /> <type config:type="symbol">CT_DISK</type> <use>all</use> </drive> </partitioning> - <bootloader> <loader_type>grub2</loader_type> </bootloader> - <networking> <ipv6 config:type="boolean">false</ipv6> <keep_install_network config:type="boolean">true</keep_install_network> @@ -120,15 +115,13 @@ </interface> </interfaces> </networking> - <firewall> - <enable_firewall config:type="boolean">true</enable_firewall> - <start_firewall config:type="boolean">true</start_firewall> + <enable_firewall config:type="boolean">false</enable_firewall> + <start_firewall config:type="boolean">false</start_firewall> </firewall> - <software> - <image/> - <instsource/> + <image /> + <instsource /> <packages config:type="list"> <package>grub2</package> <package>glibc-locale</package> @@ -162,7 +155,7 @@ <services-manager> <default_target>graphical</default_target> <services> - <disable config:type="list"/> + <disable config:type="list" /> <enable config:type="list"> <service>sshd</service> </enable> @@ -172,13 +165,13 @@ <group> <gid>100</gid> <groupname>users</groupname> - <userlist/> + <userlist /> </group> </groups> <user_defaults> - <expire/> + <expire /> <group>100</group> - <groups/> + <groups /> <home>/home</home> <inactive>-1</inactive> <no_groups config:type="boolean">true</no_groups> @@ -186,7 +179,6 @@ <skel>/etc/skel</skel> <umask>022</umask> </user_defaults> - <users config:type="list"> <user> <user_password>vagrant</user_password> @@ -197,8 +189,8 @@ <gid>100</gid> <home>/home/vagrant</home> <password_settings> - <expire/> - <flag/> + <expire /> + <flag /> <inact>-1</inact> <max>99999</max> <min>0</min> From bb9404c7fed775edb70220f6b8c477458fe479e2 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith@chef.io> Date: Tue, 5 Mar 2019 12:16:38 -0800 Subject: [PATCH 0930/1622] Update Ubuntu 14.04.1 to 14.04.4 to resolve virtualbox crashes I've confirmed we can build a 14.04 box again after this fix. Signed-off-by: Tim Smith <tsmith@chef.io> --- ubuntu/ubuntu-14.04-amd64.json | 8 ++++---- ubuntu/ubuntu-14.04-i386.json | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/ubuntu/ubuntu-14.04-amd64.json b/ubuntu/ubuntu-14.04-amd64.json index 38d3070ab..f38e13232 100644 --- a/ubuntu/ubuntu-14.04-amd64.json +++ b/ubuntu/ubuntu-14.04-amd64.json @@ -295,12 +295,12 @@ "https_proxy": "{{env `https_proxy`}}", "hyperv_generation": "2", "hyperv_switch": "{{env `hyperv_switch`}}", - "iso_checksum": "946a6077af6f5f95a51f82fdc44051c7aa19f9cfc5f737954845a6050543d7c2", + "iso_checksum": "07e4bb5569814eab41fafac882ba127893e3ff0bdb7ec931c9b2d040e3e94e7a", "iso_checksum_type": "sha256", - "iso_name": "ubuntu-14.04.1-server-amd64.iso", - "memory": "1024", + "iso_name": "ubuntu-14.04.4-server-amd64.iso", + "memory": "1536", "mirror": "http://old-releases.ubuntu.com/releases", - "mirror_directory": "14.04.1", + "mirror_directory": "14.04.4", "name": "ubuntu-14.04", "no_proxy": "{{env `no_proxy`}}", "preseed_path": "preseed.cfg", diff --git a/ubuntu/ubuntu-14.04-i386.json b/ubuntu/ubuntu-14.04-i386.json index 432f165ff..e851831d9 100644 --- a/ubuntu/ubuntu-14.04-i386.json +++ b/ubuntu/ubuntu-14.04-i386.json @@ -257,12 +257,12 @@ "headless": "", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", - "iso_checksum": "976044842804eafc18390505508958b559c131211160ecae5e60694bdf171f78", + "iso_checksum": "e20cf9e0812b52287ca22ac1815bc933c0cfef2be88191110b697d8943bef19e", "iso_checksum_type": "sha256", - "iso_name": "ubuntu-14.04.1-server-i386.iso", - "memory": "1024", + "iso_name": "ubuntu-14.04.4-server-i386.iso", + "memory": "1536", "mirror": "http://old-releases.ubuntu.com/releases", - "mirror_directory": "14.04.1", + "mirror_directory": "14.04.4", "name": "ubuntu-14.04-i386", "no_proxy": "{{env `no_proxy`}}", "preseed_path": "preseed.cfg", From 5d16ed7ae43246f5de3e218ff648143e32d4b415 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith@chef.io> Date: Tue, 5 Mar 2019 12:24:47 -0800 Subject: [PATCH 0931/1622] Update Ubuntu to 16.04.6 Signed-off-by: Tim Smith <tsmith@chef.io> --- ubuntu/ubuntu-16.04-amd64.json | 6 +++--- ubuntu/ubuntu-16.04-i386.json | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/ubuntu/ubuntu-16.04-amd64.json b/ubuntu/ubuntu-16.04-amd64.json index 421de1193..bf787c7c2 100644 --- a/ubuntu/ubuntu-16.04-amd64.json +++ b/ubuntu/ubuntu-16.04-amd64.json @@ -304,12 +304,12 @@ "https_proxy": "{{env `https_proxy`}}", "hyperv_generation": "2", "hyperv_switch": "{{env `hyperv_switch`}}", - "iso_checksum": "c94de1cc2e10160f325eb54638a5b5aa38f181d60ee33dae9578d96d932ee5f8", + "iso_checksum": "16afb1375372c57471ea5e29803a89a5a6bd1f6aabea2e5e34ac1ab7eb9786ac", "iso_checksum_type": "sha256", - "iso_name": "ubuntu-16.04.5-server-amd64.iso", + "iso_name": "ubuntu-16.04.6-server-amd64.iso", "memory": "1024", "mirror": "http://releases.ubuntu.com", - "mirror_directory": "16.04.5", + "mirror_directory": "16.04.6", "name": "ubuntu-16.04", "no_proxy": "{{env `no_proxy`}}", "preseed_path": "preseed.cfg", diff --git a/ubuntu/ubuntu-16.04-i386.json b/ubuntu/ubuntu-16.04-i386.json index 2608030ab..9597020ad 100644 --- a/ubuntu/ubuntu-16.04-i386.json +++ b/ubuntu/ubuntu-16.04-i386.json @@ -265,12 +265,12 @@ "headless": "", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", - "iso_checksum": "76006856dddc7dee2bf82d3cbcc593ae0a9912218077f8cb6cced41b2d3f2c2d", + "iso_checksum": "7509cabb2f9f6ba0a95f8454d432be2ef26679d31ce35baa626acc5321460fab", "iso_checksum_type": "sha256", - "iso_name": "ubuntu-16.04.5-server-i386.iso", + "iso_name": "ubuntu-16.04.6-server-i386.iso", "memory": "1024", "mirror": "http://releases.ubuntu.com/releases", - "mirror_directory": "16.04.5", + "mirror_directory": "16.04.6", "name": "ubuntu-16.04-i386", "no_proxy": "{{env `no_proxy`}}", "preseed_path": "preseed.cfg", From 569741c3b14e9f67b64b0dd556ffe9f4ac6968b3 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith@chef.io> Date: Tue, 5 Mar 2019 12:28:03 -0800 Subject: [PATCH 0932/1622] Update Scientific Linux to 7.6 Signed-off-by: Tim Smith <tsmith@chef.io> --- scientificlinux/{SL-7.5-x86_64.json => SL-7.6-x86_64.json} | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) rename scientificlinux/{SL-7.5-x86_64.json => SL-7.6-x86_64.json} (96%) diff --git a/scientificlinux/SL-7.5-x86_64.json b/scientificlinux/SL-7.6-x86_64.json similarity index 96% rename from scientificlinux/SL-7.5-x86_64.json rename to scientificlinux/SL-7.6-x86_64.json index e71ae9aa7..3291eb9a5 100644 --- a/scientificlinux/SL-7.5-x86_64.json +++ b/scientificlinux/SL-7.6-x86_64.json @@ -68,7 +68,7 @@ } ], "variables": { - "box_basename": "SL-7.5", + "box_basename": "SL-7.6", "build_timestamp": "{{isotime \"20080506150405\"}}", "cpus": "1", "disk_size": "65536", @@ -84,8 +84,8 @@ "ks_path": "7/ks.cfg", "memory": "1024", "mirror": "http://www.gtlib.gatech.edu/pub/scientific", - "mirror_directory": "7.5/x86_64/iso", - "name": "SL-7.5", + "mirror_directory": "7.6/x86_64/iso", + "name": "SL-7.6", "no_proxy": "{{env `no_proxy`}}", "template": "SL-7-x86_64", "version": "TIMESTAMP" From 5a71ba682230d0eb665a07351aa62124ffd4d09b Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith@chef.io> Date: Tue, 5 Mar 2019 12:33:33 -0800 Subject: [PATCH 0933/1622] Fix the ISO URLs for Oracle Linux 6.10 6.10 is actually update 9. Signed-off-by: Tim Smith <tsmith@chef.io> --- oraclelinux/oracle-6.10-i386.json | 2 +- oraclelinux/oracle-6.10-x86_64.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/oraclelinux/oracle-6.10-i386.json b/oraclelinux/oracle-6.10-i386.json index 8d213d59b..61364a72f 100644 --- a/oraclelinux/oracle-6.10-i386.json +++ b/oraclelinux/oracle-6.10-i386.json @@ -165,7 +165,7 @@ "https_proxy": "{{env `https_proxy`}}", "iso_checksum": "73755329985c96805c1d3ef31dfcb7f7561cd139cc8fe9226b8e794ad7ea4bd4", "iso_checksum_type": "sha256", - "iso_name": "OracleLinux-R6-U10-Server-i386-dvd.iso", + "iso_name": "OracleLinux-R6-U9-Server-i386-dvd.iso", "ks_path": "6/ks.cfg", "memory": "1024", "mirror": "http://mirrors.kernel.org/oracle/", diff --git a/oraclelinux/oracle-6.10-x86_64.json b/oraclelinux/oracle-6.10-x86_64.json index 5296d72b0..1fb4dde29 100644 --- a/oraclelinux/oracle-6.10-x86_64.json +++ b/oraclelinux/oracle-6.10-x86_64.json @@ -165,7 +165,7 @@ "https_proxy": "{{env `https_proxy`}}", "iso_checksum": "625044388ee60a031965a42a32f4c1de0c029268975edcd542fd14160e0dadcb", "iso_checksum_type": "sha256", - "iso_name": "OracleLinux-R6-U10-Server-x86_64-dvd.iso", + "iso_name": "OracleLinux-R6-U9-Server-x86_64-dvd.iso", "ks_path": "6/ks.cfg", "memory": "1024", "mirror": "http://mirrors.kernel.org/oracle/", From c7feb4b2c6c12edb9c3ec6d689ca2ea4b677ba6a Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith@chef.io> Date: Tue, 5 Mar 2019 13:37:19 -0800 Subject: [PATCH 0934/1622] Fix Oracle Linux 6.10 checksums Signed-off-by: Tim Smith <tsmith@chef.io> --- oraclelinux/oracle-6.10-i386.json | 2 +- oraclelinux/oracle-6.10-x86_64.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/oraclelinux/oracle-6.10-i386.json b/oraclelinux/oracle-6.10-i386.json index 61364a72f..ed87c8e13 100644 --- a/oraclelinux/oracle-6.10-i386.json +++ b/oraclelinux/oracle-6.10-i386.json @@ -163,7 +163,7 @@ "headless": "", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", - "iso_checksum": "73755329985c96805c1d3ef31dfcb7f7561cd139cc8fe9226b8e794ad7ea4bd4", + "iso_checksum": "fd07f775e7fa52e9ab021eb7dccb78453fc61f3d3b712ec426f6b1bf5020318b", "iso_checksum_type": "sha256", "iso_name": "OracleLinux-R6-U9-Server-i386-dvd.iso", "ks_path": "6/ks.cfg", diff --git a/oraclelinux/oracle-6.10-x86_64.json b/oraclelinux/oracle-6.10-x86_64.json index 1fb4dde29..6631bdeb7 100644 --- a/oraclelinux/oracle-6.10-x86_64.json +++ b/oraclelinux/oracle-6.10-x86_64.json @@ -163,7 +163,7 @@ "headless": "", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", - "iso_checksum": "625044388ee60a031965a42a32f4c1de0c029268975edcd542fd14160e0dadcb", + "iso_checksum": "c32e2a7c8eb471db731741f1a30be37e49deda8ce961710273a71b26c9a04a36", "iso_checksum_type": "sha256", "iso_name": "OracleLinux-R6-U9-Server-x86_64-dvd.iso", "ks_path": "6/ks.cfg", From 0deb5d645e54f3b659b5ac29268d0d1608404a97 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith@chef.io> Date: Tue, 5 Mar 2019 14:04:18 -0800 Subject: [PATCH 0935/1622] Fix the Scientific Linux checksum It changed Signed-off-by: Tim Smith <tsmith@chef.io> --- scientificlinux/SL-7.6-x86_64.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scientificlinux/SL-7.6-x86_64.json b/scientificlinux/SL-7.6-x86_64.json index 3291eb9a5..9448b80d5 100644 --- a/scientificlinux/SL-7.6-x86_64.json +++ b/scientificlinux/SL-7.6-x86_64.json @@ -78,7 +78,7 @@ "https_proxy": "{{env `https_proxy`}}", "hyperv_generation": "1", "hyperv_switch": "{{env `hyperv_switch`}}", - "iso_checksum": "b59f60e6cc287058667086bcf95da4ef5d4a12efba1b01711c26d6587ffc190a", + "iso_checksum": "2fdecb713bdaf3e253a9b8a11c54be6d17be38bb0c59b4346ff23a10c249bed1", "iso_checksum_type": "sha256", "iso_name": "SL-7-DVD-x86_64.iso", "ks_path": "7/ks.cfg", From 1c04d66fcd1e849103bf58519cb40e3582d6170c Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith@chef.io> Date: Tue, 5 Mar 2019 15:21:01 -0800 Subject: [PATCH 0936/1622] Rename the scientific linux template Signed-off-by: Tim Smith <tsmith@chef.io> --- .../{SL-7.6-x86_64.json => scientific-7.6-x86_64.json} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename scientificlinux/{SL-7.6-x86_64.json => scientific-7.6-x86_64.json} (98%) diff --git a/scientificlinux/SL-7.6-x86_64.json b/scientificlinux/scientific-7.6-x86_64.json similarity index 98% rename from scientificlinux/SL-7.6-x86_64.json rename to scientificlinux/scientific-7.6-x86_64.json index 9448b80d5..4028b5bf4 100644 --- a/scientificlinux/SL-7.6-x86_64.json +++ b/scientificlinux/scientific-7.6-x86_64.json @@ -87,7 +87,7 @@ "mirror_directory": "7.6/x86_64/iso", "name": "SL-7.6", "no_proxy": "{{env `no_proxy`}}", - "template": "SL-7-x86_64", + "template": "scientific-7-x86_64", "version": "TIMESTAMP" } } From 57efd2deb3ec82b13b9e0d0fdf7ee83cc39fc7a4 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith@chef.io> Date: Tue, 5 Mar 2019 15:21:22 -0800 Subject: [PATCH 0937/1622] Add scientific 7.6 and ubuntu 18.10 to the builds.yml file Signed-off-by: Tim Smith <tsmith@chef.io> --- builds.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/builds.yml b/builds.yml index 4d1063ad0..4cb2a7d36 100644 --- a/builds.yml +++ b/builds.yml @@ -21,11 +21,13 @@ public: - 'oracle-6.10-i386' - 'oracle-6.10' - 'oracle-7.6' +- 'scientific-7.6' - 'ubuntu-14.04-i386' - 'ubuntu-14.04' - 'ubuntu-16.04-i386' - 'ubuntu-16.04' - 'ubuntu-18.04' +- 'ubuntu-18.10' slugs: 'centos-7': 'centos-7.6' @@ -35,6 +37,7 @@ slugs: 'debian-8': 'debian-8.11' 'oracle-7': 'oracle-7.6' 'oracle-6': 'oracle-6.10' + 'scientific-7': 'scientific-7.6' 'freebsd-11': 'freebsd-11.2' 'freebsd-12': 'freebsd-12.0' 'opensuse-leap-42': 'opensuse-leap-42.3' From badc2b6f6f6aa0791295b7c7f8c98a6280b9f63a Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith@chef.io> Date: Tue, 5 Mar 2019 15:22:03 -0800 Subject: [PATCH 0938/1622] Add a description o the rake release all task This way it shows up Signed-off-by: Tim Smith <tsmith@chef.io> --- Rakefile | 1 + 1 file changed, 1 insertion(+) diff --git a/Rakefile b/Rakefile index 67dff1b6a..37c947171 100644 --- a/Rakefile +++ b/Rakefile @@ -37,6 +37,7 @@ task :do_all do end end +desc "release all built boxes on vagrant cloud" task :release_all do config['public'].each do |template| sh "bento release #{template} #{ENV["BENTO_VERSION"]}" From 520bd8a02076d99e77329805d7d9748db3c8d704 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith@chef.io> Date: Tue, 5 Mar 2019 15:22:20 -0800 Subject: [PATCH 0939/1622] Update the copyright in the notice file Signed-off-by: Tim Smith <tsmith@chef.io> --- NOTICE.md | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/NOTICE.md b/NOTICE.md index 91ecbbc40..b26c591ba 100644 --- a/NOTICE.md +++ b/NOTICE.md @@ -1,8 +1,7 @@ -Bento NOTICE -============ +# Bento NOTICE Chef Bento -Copyright 2012-2015, Chef Software, Inc. +Copyright 2012-2019, Chef Software, Inc. The baseboxes in the "definitions" directory is from Tim Dysinger's "basebox" project. From 1db1fdac094daafa554fea122f952f6ae05cf13f Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith@chef.io> Date: Tue, 5 Mar 2019 16:27:11 -0800 Subject: [PATCH 0940/1622] Help those that have never ran the rake tasks Better describe how they'll use this Signed-off-by: Tim Smith <tsmith@chef.io> --- Rakefile | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Rakefile b/Rakefile index 37c947171..435632a8f 100644 --- a/Rakefile +++ b/Rakefile @@ -21,7 +21,7 @@ task :validate do end end -desc "clean, build, test, upload" +desc "clean repo, build boxes, test, and upload/release" task :do_all do check_env public_templates.each do |template| @@ -29,7 +29,9 @@ task :do_all do Rake::Task[:clean].execute sh build_cmd(template) sh "bento test" - unless ENV["BENTO_AUTO_RELEASE"].nil? + if ENV["BENTO_AUTO_RELEASE"].nil? || ENV["BENTO_VERSION"].nil? + puts "skipping the upload / release of #{template} as BENTO_AUTO_RELEASE and BENTO_VERSION env vars were not set" + else sh "bento upload" sh "bento release #{template} #{ENV["BENTO_VERSION"]}" end From 9976fedbc569c1d0bb41650ae42024646b8c034c Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith@chef.io> Date: Tue, 5 Mar 2019 16:32:15 -0800 Subject: [PATCH 0941/1622] Prevent failures on Oracle 5 and properly cleanup all the firmware This script wasn't compatible with RHEL 5 so it failed Signed-off-by: Tim Smith <tsmith@chef.io> --- centos/scripts/cleanup.sh | 31 +++++++++++++++++++++++++++++-- 1 file changed, 29 insertions(+), 2 deletions(-) diff --git a/centos/scripts/cleanup.sh b/centos/scripts/cleanup.sh index d1f960de1..bd677c772 100644 --- a/centos/scripts/cleanup.sh +++ b/centos/scripts/cleanup.sh @@ -59,5 +59,32 @@ fi find /var/log/ -name *.log -exec rm -f {} \; # remove previous kernels that yum preserved for rollback -yum install -y yum-utils -package-cleanup --oldkernels --count=1 -y +# yum-utils isn't in RHEL 5 so don't try to run this +if ! lsb_release -a | grep -qE '^Release:\s*5'; then + yum install -y yum-utils + package-cleanup --oldkernels --count=1 -y +fi + +# we try to remove these in the ks file, but they're still there +# in the builds so let's remove them here to be sure :shrug: +yum remove -y \ + aic94xx-firmware \ + atmel-firmware \ + bfa-firmware \ + ipw2100-firmware \ + ipw2200-firmware \ + ivtv-firmware \ + iwl1000-firmware \ + iwl3945-firmware \ + iwl4965-firmware \ + iwl5000-firmware \ + iwl5150-firmware \ + iwl6000-firmware \ + iwl6050-firmware \ + kernel-uek-firmware \ + libertas-usb8388-firmware \ + netxen-firmware \ + ql2xxx-firmware \ + rt61pci-firmware \ + rt73usb-firmware \ + zd1211-firmware From 81e128243a585f3cf54b17ac9088329c3b9c6bc7 Mon Sep 17 00:00:00 2001 From: John Jelinek <jjelinek@containerstore.com> Date: Wed, 13 Mar 2019 17:47:27 -0500 Subject: [PATCH 0942/1622] Increase time to export ovf from 100 to 200 seconds This change was necessary for me to get the ovf to boot. Without increasing the time, it would export too early and then packer would only boot to grub. Signed-off-by: John Jelinek <jjelinek@containerstore.com> --- amazon/STEP1_build_ovf.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/amazon/STEP1_build_ovf.sh b/amazon/STEP1_build_ovf.sh index 831530d3c..31d192b2d 100755 --- a/amazon/STEP1_build_ovf.sh +++ b/amazon/STEP1_build_ovf.sh @@ -33,9 +33,9 @@ VBoxManage modifyvm $VM --audio none VBoxManage modifyvm $VM --ioapic on sleep 5 -echo Sleeping for 100 seconds to let the system boot and cloud-init to run +echo Sleeping for 200 seconds to let the system boot and cloud-init to run VBoxManage startvm $VM --type gui -sleep 100 +sleep 200 VBoxManage controlvm $VM poweroff --type gui VBoxManage storageattach $VM --storagectl "IDE Controller" --port 0 --device 0 --type dvddrive --medium none sleep 5 From f79ed91d3272ff0868e7aa5338a83b3b2edeb385 Mon Sep 17 00:00:00 2001 From: John Jelinek <jjelinek@containerstore.com> Date: Wed, 13 Mar 2019 17:49:43 -0500 Subject: [PATCH 0943/1622] Create `vagrant` user as Default EC2 User This leaves the old `ec2-user` in place, but it's unused. You can `sudo su - ec2-user` if you want to become that user from the `vagrant` user. Signed-off-by: John Jelinek <jjelinek@containerstore.com> --- amazon/amazon-2-x86_64.json | 2 +- amazon/seed_iso/user-data | 9 +++------ 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/amazon/amazon-2-x86_64.json b/amazon/amazon-2-x86_64.json index 03425c6e5..0eba7008e 100644 --- a/amazon/amazon-2-x86_64.json +++ b/amazon/amazon-2-x86_64.json @@ -10,7 +10,7 @@ "ssh_port": 22, "type": "virtualbox-ovf", "source_path": "amazon.ovf", - "ssh_username": "ec2-user", + "ssh_username": "vagrant", "ssh_password": "vagrant", "vboxmanage": [ [ diff --git a/amazon/seed_iso/user-data b/amazon/seed_iso/user-data index 8eeeff49e..2d91f26a5 100644 --- a/amazon/seed_iso/user-data +++ b/amazon/seed_iso/user-data @@ -1,11 +1,8 @@ #cloud-config #vim:syntax=yaml -users: -# A user by the name `ec2-user` is created in the image by default. - - default -chpasswd: - list: | - ec2-user:vagrant +user: vagrant +password: vagrant + # make sure we don't setup the network on every boot write_files: From 8628961ee11fb36c41b4436da61ddc567542c987 Mon Sep 17 00:00:00 2001 From: John Jelinek <jjelinek@containerstore.com> Date: Wed, 13 Mar 2019 17:50:29 -0500 Subject: [PATCH 0944/1622] Add dependencies for VBox Guest Additions VBox Guest Additions was failing to install without these deps. Signed-off-by: John Jelinek <jjelinek@containerstore.com> --- amazon/seed_iso/user-data | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/amazon/seed_iso/user-data b/amazon/seed_iso/user-data index 2d91f26a5..d5099c386 100644 --- a/amazon/seed_iso/user-data +++ b/amazon/seed_iso/user-data @@ -3,6 +3,15 @@ user: vagrant password: vagrant +# install packages for vbox guest additions to complete +packages: + - gcc + - kernel-devel + - kernel-headers + - dkms + - make + - bzip2 + - perl # make sure we don't setup the network on every boot write_files: From 3125dae6c05a24689327661c7f45cb8964bbd929 Mon Sep 17 00:00:00 2001 From: John Jelinek <jjelinek@containerstore.com> Date: Wed, 13 Mar 2019 17:51:08 -0500 Subject: [PATCH 0945/1622] Add `runcmd` commands These commands allow packer to SSH in with the vagrant user and password to continue provisioning. Maybe `/etc/cloud/cloud.cfg.d/90_enable_ssh_pwauth.cfg` can be removed as part of `cleanup.sh`? Signed-off-by: John Jelinek <jjelinek@containerstore.com> --- amazon/seed_iso/user-data | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/amazon/seed_iso/user-data b/amazon/seed_iso/user-data index d5099c386..222eb4e59 100644 --- a/amazon/seed_iso/user-data +++ b/amazon/seed_iso/user-data @@ -20,3 +20,10 @@ write_files: # Disable network configuration after first boot network: config: disabled + + - path: /etc/cloud/cloud.cfg.d/90_enable_ssh_pwauth.cfg + content: | + runcmd: + - sed -i "s/^PasswordAuthentication.*/PasswordAuthentication yes/" /etc/ssh/sshd_config + - sed -i "/^HWADDR/d" /etc/sysconfig/network-scripts/ifcfg-eth0 + - systemctl restart network sshd From f73cecbfdba870bfb8b6497c33367178e1ba5328 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith@chef.io> Date: Wed, 13 Mar 2019 16:53:12 -0700 Subject: [PATCH 0946/1622] Add instructions for how to use the amazon scripts Signed-off-by: Tim Smith <tsmith@chef.io> --- amazon/README_FIRST.md | 8 ++++++++ amazon/STEP1_build_ovf.sh | 4 ++-- amazon/amazon-2-x86_64.json | 2 +- 3 files changed, 11 insertions(+), 3 deletions(-) create mode 100644 amazon/README_FIRST.md diff --git a/amazon/README_FIRST.md b/amazon/README_FIRST.md new file mode 100644 index 000000000..1a6005a68 --- /dev/null +++ b/amazon/README_FIRST.md @@ -0,0 +1,8 @@ +This is not your normal Bento box. Instead of building a system from an ISO we're building a system from an Amazon provided VirtualBox VDI file. This means the process is a bit different than usual. + +## Building this box + +1. Download the VirtualBox .vdi file for Amazon Linux 2 and place it in the same directory as this readme file. Amazon hosts these at https://cdn.amazonlinux.com/os-images/latest/virtualbox/. Make sure to name it amazon.vdi instead of the version specific name that Amazon gives it on their site. +2. Run the STEP1_build_ovf.sh script to prepare this VDI file for packer and export it as a OVF file. +3. Run the packer definition as usual +4. OPTIONAL: Cleanup the leftover files in the directory diff --git a/amazon/STEP1_build_ovf.sh b/amazon/STEP1_build_ovf.sh index 31d192b2d..404f5fd24 100755 --- a/amazon/STEP1_build_ovf.sh +++ b/amazon/STEP1_build_ovf.sh @@ -2,7 +2,7 @@ if [ ! -f amazon.vdi ]; then echo There must be a file named amazon.vdi in this directory! - echo You can download the vdi file at https://cdn.amazonlinux.com/os-images/latest/ + echo You can download the vdi file at https://cdn.amazonlinux.com/os-images/latest/virtualbox/ exit 1 fi @@ -41,7 +41,7 @@ VBoxManage storageattach $VM --storagectl "IDE Controller" --port 0 --device 0 - sleep 5 echo Exporting the VM to an OVF file -vboxmanage export $VM -o amazon.ovf +vboxmanage export $VM -o amazon2.ovf sleep 5 echo Deleting the VM diff --git a/amazon/amazon-2-x86_64.json b/amazon/amazon-2-x86_64.json index 0eba7008e..5188c70ac 100644 --- a/amazon/amazon-2-x86_64.json +++ b/amazon/amazon-2-x86_64.json @@ -9,7 +9,7 @@ "ssh_wait_timeout": "10000s", "ssh_port": 22, "type": "virtualbox-ovf", - "source_path": "amazon.ovf", + "source_path": "amazon2.ovf", "ssh_username": "vagrant", "ssh_password": "vagrant", "vboxmanage": [ From 84fa41cc8718c96da5d2bd7193f32511ab5f9272 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith@chef.io> Date: Wed, 13 Mar 2019 20:49:33 -0700 Subject: [PATCH 0947/1622] Rename the amazon files to amazonlinux This matches our other distros Signed-off-by: Tim Smith <tsmith@chef.io> --- {amazon => amazonlinux}/README_FIRST.md | 0 {amazon => amazonlinux}/STEP1_build_ovf.sh | 0 {amazon => amazonlinux}/amazon-2-x86_64.json | 0 {amazon => amazonlinux}/scripts/cleanup.sh | 0 {amazon => amazonlinux}/scripts/networking.sh | 0 {amazon => amazonlinux}/scripts/update.sh | 0 {amazon => amazonlinux}/seed_iso/meta-data | 0 {amazon => amazonlinux}/seed_iso/user-data | 0 8 files changed, 0 insertions(+), 0 deletions(-) rename {amazon => amazonlinux}/README_FIRST.md (100%) rename {amazon => amazonlinux}/STEP1_build_ovf.sh (100%) rename {amazon => amazonlinux}/amazon-2-x86_64.json (100%) rename {amazon => amazonlinux}/scripts/cleanup.sh (100%) rename {amazon => amazonlinux}/scripts/networking.sh (100%) rename {amazon => amazonlinux}/scripts/update.sh (100%) rename {amazon => amazonlinux}/seed_iso/meta-data (100%) rename {amazon => amazonlinux}/seed_iso/user-data (100%) diff --git a/amazon/README_FIRST.md b/amazonlinux/README_FIRST.md similarity index 100% rename from amazon/README_FIRST.md rename to amazonlinux/README_FIRST.md diff --git a/amazon/STEP1_build_ovf.sh b/amazonlinux/STEP1_build_ovf.sh similarity index 100% rename from amazon/STEP1_build_ovf.sh rename to amazonlinux/STEP1_build_ovf.sh diff --git a/amazon/amazon-2-x86_64.json b/amazonlinux/amazon-2-x86_64.json similarity index 100% rename from amazon/amazon-2-x86_64.json rename to amazonlinux/amazon-2-x86_64.json diff --git a/amazon/scripts/cleanup.sh b/amazonlinux/scripts/cleanup.sh similarity index 100% rename from amazon/scripts/cleanup.sh rename to amazonlinux/scripts/cleanup.sh diff --git a/amazon/scripts/networking.sh b/amazonlinux/scripts/networking.sh similarity index 100% rename from amazon/scripts/networking.sh rename to amazonlinux/scripts/networking.sh diff --git a/amazon/scripts/update.sh b/amazonlinux/scripts/update.sh similarity index 100% rename from amazon/scripts/update.sh rename to amazonlinux/scripts/update.sh diff --git a/amazon/seed_iso/meta-data b/amazonlinux/seed_iso/meta-data similarity index 100% rename from amazon/seed_iso/meta-data rename to amazonlinux/seed_iso/meta-data diff --git a/amazon/seed_iso/user-data b/amazonlinux/seed_iso/user-data similarity index 100% rename from amazon/seed_iso/user-data rename to amazonlinux/seed_iso/user-data From 5e91150ad0d2a71d7563577d504e072bbc55a76c Mon Sep 17 00:00:00 2001 From: Joe Ferguson <joe@joeferguson.me> Date: Fri, 15 Mar 2019 08:38:01 -0400 Subject: [PATCH 0948/1622] Add homestead script to git ignore Signed-off-by: Joe Ferguson <joe@joeferguson.me> --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index c89dade75..b2e11ac29 100644 --- a/.gitignore +++ b/.gitignore @@ -16,3 +16,4 @@ packer.log Gemfile.lock bootstrap.sh Berksfile.lock +ubuntu/scripts/homestead.sh From f25e25cdcfcff8d40895eb35a54d7789836709a8 Mon Sep 17 00:00:00 2001 From: Marcus Furlong <furlongm@gmail.com> Date: Wed, 3 Apr 2019 18:38:38 -0400 Subject: [PATCH 0949/1622] remove sed -ie option command that leaves /etc/default/grube For justification, see https://github.com/sipwise/netscript/commit/4844134152e5195e3162c4df28d6fc3175866787 Signed-off-by: Marcus Furlong <furlongm@gmail.com> --- debian/scripts/networking.sh | 2 +- ubuntu/scripts/networking.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/scripts/networking.sh b/debian/scripts/networking.sh index 50d7a4369..28b5726b3 100644 --- a/debian/scripts/networking.sh +++ b/debian/scripts/networking.sh @@ -17,7 +17,7 @@ fi if [ "$major_version" -ge "9" ]; then # Disable Predictable Network Interface names and use eth0 sed -i 's/en[[:alnum:]]*/eth0/g' /etc/network/interfaces; - sed -ie 's/GRUB_CMDLINE_LINUX="\(.*\)"/GRUB_CMDLINE_LINUX="net.ifnames=0 biosdevname=0 \1"/g' /etc/default/grub; + sed -i 's/GRUB_CMDLINE_LINUX="\(.*\)"/GRUB_CMDLINE_LINUX="net.ifnames=0 biosdevname=0 \1"/g' /etc/default/grub; update-grub; fi diff --git a/ubuntu/scripts/networking.sh b/ubuntu/scripts/networking.sh index 58515d4ec..27186f0ea 100644 --- a/ubuntu/scripts/networking.sh +++ b/ubuntu/scripts/networking.sh @@ -20,6 +20,6 @@ fi if [ "$major_version" -ge "16" ]; then # Disable Predictable Network Interface names and use eth0 sed -i 's/en[[:alnum:]]*/eth0/g' /etc/network/interfaces; - sed -ie 's/GRUB_CMDLINE_LINUX="\(.*\)"/GRUB_CMDLINE_LINUX="net.ifnames=0 biosdevname=0 \1"/g' /etc/default/grub; + sed -i 's/GRUB_CMDLINE_LINUX="\(.*\)"/GRUB_CMDLINE_LINUX="net.ifnames=0 biosdevname=0 \1"/g' /etc/default/grub; update-grub; fi From 466553de22dce348ced4f98526dfdaf85731fe09 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith@chef.io> Date: Fri, 5 Apr 2019 17:11:55 -0700 Subject: [PATCH 0950/1622] Update github templates and expeditor config Signed-off-by: Tim Smith <tsmith@chef.io> --- .expeditor/config.yml | 3 +- .github/CODEOWNERS | 7 ++++ .../BUG_TEMPLATE.md} | 10 ++++- .github/ISSUE_TEMPLATE/DESIGN_PROPOSAL.md | 40 +++++++++++++++++++ .../ENHANCEMENT_REQUEST_TEMPLATE.md | 17 ++++++++ .github/ISSUE_TEMPLATE/SUPPORT_QUESTION.md | 12 ++++++ .github/PULL_REQUEST_TEMPLATE.md | 2 +- .github/lock.yml | 1 + 8 files changed, 89 insertions(+), 3 deletions(-) create mode 100644 .github/CODEOWNERS rename .github/{ISSUE_TEMPLATE.md => ISSUE_TEMPLATE/BUG_TEMPLATE.md} (65%) create mode 100644 .github/ISSUE_TEMPLATE/DESIGN_PROPOSAL.md create mode 100644 .github/ISSUE_TEMPLATE/ENHANCEMENT_REQUEST_TEMPLATE.md create mode 100644 .github/ISSUE_TEMPLATE/SUPPORT_QUESTION.md create mode 100644 .github/lock.yml diff --git a/.expeditor/config.yml b/.expeditor/config.yml index 3f47288bb..851574196 100644 --- a/.expeditor/config.yml +++ b/.expeditor/config.yml @@ -1,8 +1,9 @@ # Documentation available at https://expeditor.chef.io/docs/getting-started/ - +--- # Slack channel in Chef Software slack to send notifications about build failures, etc slack: notify_channel: chef-notify github: + # This deletes the GitHub PR branch after successfully merged into the release branch delete_branch_on_merge: true diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS new file mode 100644 index 000000000..67a82fe3c --- /dev/null +++ b/.github/CODEOWNERS @@ -0,0 +1,7 @@ +# Order is important. The last matching pattern has the most precedence. + +* @chef/chef-workstation +.expeditor/** @chef/jex-team +README.md @chef/docs-team +RELEASE_NOTES.md @chef/docs-team +.github/ISSUE_TEMPLATE/** @chef/docs-team diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE/BUG_TEMPLATE.md similarity index 65% rename from .github/ISSUE_TEMPLATE.md rename to .github/ISSUE_TEMPLATE/BUG_TEMPLATE.md index f229e13f2..f28915b72 100644 --- a/.github/ISSUE_TEMPLATE.md +++ b/.github/ISSUE_TEMPLATE/BUG_TEMPLATE.md @@ -1,8 +1,16 @@ +--- +name: � Bug Report +about: If something isn't working as expected �. +labels: "Status: Untriaged" +--- + # Version: [Version of the project installed] -# Environment: [Details about the environment such as the Operating System, cookbook details, etc...] +# Environment: + +[Details about the environment such as the Operating System, cookbook details, etc...] # Scenario: diff --git a/.github/ISSUE_TEMPLATE/DESIGN_PROPOSAL.md b/.github/ISSUE_TEMPLATE/DESIGN_PROPOSAL.md new file mode 100644 index 000000000..9f4a958fe --- /dev/null +++ b/.github/ISSUE_TEMPLATE/DESIGN_PROPOSAL.md @@ -0,0 +1,40 @@ +--- +name: Design Proposal +about: I have a significant change I would like to propose and discuss before starting +labels: "Status: Untriaged" +--- + +### When a Change Needs a Design Proposal + +A design proposal should be opened any time a change meets one of the following qualifications: + +- Significantly changes the user experience of a project in a way that impacts users. +- Significantly changes the underlying architecture of the project in a way that impacts other developers. +- Changes the development or testing process of the project such as a change of CI systems or test frameworks. + +### Why We Use This Process + +- Allows all interested parties (including any community member) to discuss large impact changes to a project. +- Serves as a durable paper trail for discussions regarding project architecture. +- Forces design discussions to occur before PRs are created. +- Reduces PR refactoring and rejected PRs. + +--- + +<!--- Proposal description and rationale. --> + +## Motivation + +<!--- + As a <<user_profile>>, + I want to <<functionality>>, + so that <<benefit>>. + --> + +## Specification + +<!--- A detailed description of the planned implementation. --> + +## Downstream Impact + +<!--- Which other tools will be impacted by this work? --> diff --git a/.github/ISSUE_TEMPLATE/ENHANCEMENT_REQUEST_TEMPLATE.md b/.github/ISSUE_TEMPLATE/ENHANCEMENT_REQUEST_TEMPLATE.md new file mode 100644 index 000000000..65bf5a06b --- /dev/null +++ b/.github/ISSUE_TEMPLATE/ENHANCEMENT_REQUEST_TEMPLATE.md @@ -0,0 +1,17 @@ +--- +name: 🚀 Enhancement Request +about: I have a suggestion (and may want to implement it 🙂)! +labels: "Status: Untriaged" +--- + +### Describe the Enhancement: +<!--- What you are trying to achieve that you can't? --> + +### Describe the Need: +<!--- What kind of user do you believe would utilize this enhancement, and how many users might want this functionality --> + +### Current Alternative +<!--- Is there a current alternative that you can utilize to workaround the lack of this enhancement --> + +### Can We Help You Implement This?: +<!--- The best way to ensure your enhancement is built is to help implement the enhancement yourself. If you're interested in helping out we'd love to give you a hand to make this possible. Let us know if there's something you need. --> diff --git a/.github/ISSUE_TEMPLATE/SUPPORT_QUESTION.md b/.github/ISSUE_TEMPLATE/SUPPORT_QUESTION.md new file mode 100644 index 000000000..68c566479 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/SUPPORT_QUESTION.md @@ -0,0 +1,12 @@ +--- +name: 🤗 Support Question +about: If you have a question 💬, please check out our Slack! +--- + +We use GitHub issues to track bugs and feature requests. If you need help please post to our Mailing List or join the Chef Community Slack. + + * Chef Community Slack at http://community-slack.chef.io/. + * Chef Mailing List https://discourse.chef.io/ + + + Support issues opened here will be closed and redirected to Slack or Discourse. diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index c1aab3fda..f9c16c0d3 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -5,4 +5,4 @@ ### Issues Resolved [List any existing issues this PR resolves, or any Discourse or -StackOverflow discussion that's relevant] +StackOverflow discussions that are relevant] diff --git a/.github/lock.yml b/.github/lock.yml new file mode 100644 index 000000000..66d5d4962 --- /dev/null +++ b/.github/lock.yml @@ -0,0 +1 @@ +daysUntilLock: 60 From ec9005051d3fd12ecf80544a947b9cccdb083a4b Mon Sep 17 00:00:00 2001 From: Michael Rosile <mike@rosile.com> Date: Tue, 16 Apr 2019 23:17:41 -0400 Subject: [PATCH 0951/1622] Added SLES 15 build config --- sles/http/sles-15-x86_64-autoinst.xml | 297 ++++++++++++++++++++++++++ sles/sles-15.json | 211 ++++++++++++++++++ 2 files changed, 508 insertions(+) create mode 100644 sles/http/sles-15-x86_64-autoinst.xml create mode 100644 sles/sles-15.json diff --git a/sles/http/sles-15-x86_64-autoinst.xml b/sles/http/sles-15-x86_64-autoinst.xml new file mode 100644 index 000000000..be735a9a3 --- /dev/null +++ b/sles/http/sles-15-x86_64-autoinst.xml @@ -0,0 +1,297 @@ +<?xml version="1.0"?> +<!DOCTYPE profile> +<profile xmlns="http://www.suse.com/1.0/yast2ns" xmlns:config="http://www.suse.com/1.0/configns"> + <add-on> + <add_on_products config:type="list"> + <listentry> + <media_url><![CDATA[dvd:///?devices=/dev/sr0]]></media_url> + <product>sle-module-basesystem-release</product> + <product_dir>/Module-Basesystem</product_dir> + </listentry> + </add_on_products> + </add-on> + <bootloader> + <global> + <activate>true</activate> + <append>splash=silent quiet showopts</append> + <append_failsafe>showopts apm=off noresume edd=off powersaved=off nohz=off highres=off processor.max_cstate=1 nomodeset x11failsafe</append_failsafe> + <boot_boot>false</boot_boot> + <boot_extended>false</boot_extended> + <boot_mbr>false</boot_mbr> + <boot_root>true</boot_root> + <default>0</default> + <distributor>SLES15</distributor> + <generic_mbr>true</generic_mbr> + <gfxmode>auto</gfxmode> + <os_prober>false</os_prober> + <timeout config:type="integer">8</timeout> + </global> + <initrd_modules config:type="list"> + <initrd_module> + <module>ahci</module> + </initrd_module> + <initrd_module> + <module>ata_piix</module> + </initrd_module> + <initrd_module> + <module>ata_generic</module> + </initrd_module> + <initrd_module> + <module>jbd</module> + </initrd_module> + <initrd_module> + <module>mbcache</module> + </initrd_module> + </initrd_modules> + <loader_type>grub2</loader_type> + <sections config:type="list"/> + </bootloader> + <deploy_image> + <image_installation config:type="boolean">false</image_installation> + </deploy_image> + <firewall> + <enable_firewall config:type="boolean">false</enable_firewall> + <start_firewall config:type="boolean">false</start_firewall> + </firewall> + <general> + <ask-list config:type="list"/> + <mode> + <confirm config:type="boolean">false</confirm> + </mode> + <mouse> + <id>none</id> + </mouse> + <proposals config:type="list"/> + <signature-handling> + <accept_file_without_checksum config:type="boolean">true</accept_file_without_checksum> + <accept_non_trusted_gpg_key config:type="boolean">true</accept_non_trusted_gpg_key> + <accept_unknown_gpg_key config:type="boolean">true</accept_unknown_gpg_key> + <accept_unsigned_file config:type="boolean">true</accept_unsigned_file> + <accept_verification_failed config:type="boolean">false</accept_verification_failed> + <import_gpg_key config:type="boolean">true</import_gpg_key> + </signature-handling> + <storage/> + </general> + <login_settings/> + <networking> + <dhcp_options> + <dhclient_client_id/> + <dhclient_hostname_option>AUTO</dhclient_hostname_option> + </dhcp_options> + <dns> + <dhcp_hostname config:type="boolean">false</dhcp_hostname> + <domain>vagrantup.com</domain> + <hostname>vagrant-sles-15-x64</hostname> + <resolv_conf_policy>auto</resolv_conf_policy> + <searchlist config:type="list"> + <search>vagrantup.com</search> + </searchlist> + <write_hostname config:type="boolean">true</write_hostname> + </dns> + <interfaces config:type="list"> + <interface> + <bootproto>dhcp</bootproto> + <device>eth0</device> + <dhclient_set_default_route>yes</dhclient_set_default_route> + <startmode>auto</startmode> + <usercontrol>no</usercontrol> + </interface> + </interfaces> + <keep_install_network config:type="boolean">true</keep_install_network> + <managed config:type="boolean">false</managed> + <routing> + <ipv4_forward config:type="boolean">false</ipv4_forward> + <ipv6_forward config:type="boolean">false</ipv6_forward> + </routing> + </networking> + <partitioning config:type="list"> + <drive> + <!-- + definition of device not needed (starting with SLES 11 SP2 + YaST will pickup the first harddisk. + This is useful if someone wants to deploy using VirtualBox and/or KVM/virtio + --> + <!-- <device>/dev/sda</device> --> + <!-- This section may be removed entirely if we want to simply reuse YaST defaults --> + <enable_snapshots config:type="boolean">false</enable_snapshots> + <initialize config:type="boolean">true</initialize> + <partitions config:type="list"> + <partition> + <create config:type="boolean">true</create> + <crypt_fs config:type="boolean">false</crypt_fs> + <filesystem config:type="symbol">swap</filesystem> + <format config:type="boolean">true</format> + <fstopt>defaults</fstopt> + <loop_fs config:type="boolean">false</loop_fs> + <mount>swap</mount> + <mountby config:type="symbol">device</mountby> + <partition_id config:type="integer">130</partition_id> + <partition_nr config:type="integer">1</partition_nr> + <raid_options/> + <resize config:type="boolean">false</resize> + <size>1561492992</size> + </partition> + <partition> + <create config:type="boolean">true</create> + <crypt_fs config:type="boolean">false</crypt_fs> + <filesystem config:type="symbol">btrfs</filesystem> + <format config:type="boolean">true</format> + <loop_fs config:type="boolean">false</loop_fs> + <mount>/</mount> + <mountby config:type="symbol">device</mountby> + <partition_id config:type="integer">131</partition_id> + <partition_nr config:type="integer">2</partition_nr> + <raid_options/> + <resize config:type="boolean">false</resize> + <size>max</size> + <subvolumes config:type="list"> + <listentry>boot/grub2/i386-pc</listentry> + <listentry>boot/grub2/x86_64-efi</listentry> + <listentry>home</listentry> + <listentry>opt</listentry> + <listentry>srv</listentry> + <listentry>tmp</listentry> + <listentry>usr/local</listentry> + <listentry>var/crash</listentry> + <listentry>var/lib/mailman</listentry> + <listentry>var/lib/named</listentry> + <listentry>var/lib/pgsql</listentry> + <listentry>var/log</listentry> + <listentry>var/opt</listentry> + <listentry>var/spool</listentry> + <listentry>var/tmp</listentry> + </subvolumes> + </partition> + </partitions> + <pesize/> + <type config:type="symbol">CT_DISK</type> + <use>all</use> + </drive> + </partitioning> + <report> + <errors> + <log config:type="boolean">true</log> + <show config:type="boolean">true</show> + <timeout config:type="integer">0</timeout> + </errors> + <messages> + <log config:type="boolean">true</log> + <show config:type="boolean">true</show> + <timeout config:type="integer">0</timeout> + </messages> + <warnings> + <log config:type="boolean">true</log> + <show config:type="boolean">true</show> + <timeout config:type="integer">0</timeout> + </warnings> + <yesno_messages> + <log config:type="boolean">true</log> + <show config:type="boolean">true</show> + <timeout config:type="integer">0</timeout> + </yesno_messages> + </report> + <services-manager> + <default_target>graphical</default_target> + <services> + <disable config:type="list"/> + <enable config:type="list"> + <service>sshd</service> + </enable> + </services> + </services-manager> + <software> + <products config:type="list"> + <product>SLES</product> + </products> + <packages config:type="list"> + <package>glibc</package> + <package>openssh</package> + <package>snapper</package> +<!-- <package>SuSEfirewall2</package> --> + <package>kexec-tools</package> +<!-- <package>perl-Bootloader-YAML</package> --> +<!-- <package>kernel-default-devel</package> --> + <package>sudo</package> +<!-- <package>gcc</package> --> + <package>wget</package> + <package>perl</package> +<!-- <package>make</package> --> + </packages> +<!-- + <patterns config:type="list"> + <pattern>Minimal</pattern> + <pattern>apparmor</pattern> + </patterns> +--> + <remove-packages config:type="list"> + <package>adaptec-firmware</package> + <package>atmel-firmware</package> + <package>bash-completion</package> + <package>bash-doc</package> + <package>cifs-utils</package> + <package>cups-libs</package> + <package>ipw-firmware</package> + <package>mpt-firmware</package> + <package>postfix</package> + <package>samba-libs</package> + <package>ucode-intel</package> + <package>snapper</package> + <package>snapper-zypp-plugin</package> + </remove-packages> + </software> + <timezone> + <hwclock>UTC</hwclock> + <timezone>UTC</timezone> + </timezone> + <user_defaults> + <expire/> + <group>100</group> + <groups>video,dialout</groups> + <home>/home</home> + <inactive>-1</inactive> + <shell>/bin/bash</shell> + <skel>/etc/skel</skel> + <umask>022</umask> + </user_defaults> + <users config:type="list"> + <user> + <encrypted config:type="boolean">true</encrypted> + <fullname>vagrant</fullname> + <gid>100</gid> + <home>/home/vagrant</home> + <password_settings> + <expire/> + <flag/> + <inact/> + <max>99999</max> + <min>0</min> + <warn>7</warn> + </password_settings> + <shell>/bin/bash</shell> + <uid>1000</uid> + <user_password>$2y$05$NA1Li9ZKJOLRW5mMTXm6/e5r8dltWS5RpDZpvHrI82aLE00V51tdi</user_password> + <username>vagrant</username> + </user> + <user> + <encrypted config:type="boolean">true</encrypted> + <fullname>root</fullname> + <gid>0</gid> + <home>/root</home> + <password_settings> + <expire/> + <flag/> + <inact/> + <max/> + <min/> + <warn/> + </password_settings> + <shell>/bin/bash</shell> + <uid>0</uid> + <user_password>$6$UgKtUD0AUMIA$VWLyc2Uvl0Lk6xxfTuoRb0/jrhZ9IJG/Gtx/DkZUEWZm.JYO1Q1fvPo6gDxQAHp38kQ1DG1vNGRgu2T/z/vih.</user_password> + <username>root</username> + </user> + </users> + <suse_register> + <do_registration config:type="boolean">false</do_registration> + </suse_register> +</profile> diff --git a/sles/sles-15.json b/sles/sles-15.json new file mode 100644 index 000000000..99a7e1f6f --- /dev/null +++ b/sles/sles-15.json @@ -0,0 +1,211 @@ +{ + "builders": [ + { + "boot_command": [ + "<esc><enter><wait>", + "linux netdevice=eth0 netsetup=dhcp install=cd:/<wait>", + " lang=en_US autoyast=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `autoinst_cfg`}}<wait>", + " textmode=1<wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": "{{user `disk_size`}}", + "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "guest_os_type": "OpenSUSE_64", + "hard_drive_interface": "sata", + "headless": "{{ user `headless` }}", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `iso_name`}}", + "output_directory": "../builds/packer-{{user `template`}}-virtualbox", + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "virtualbox-iso", + "vboxmanage": [ + [ + "modifyvm", + "{{.Name}}", + "--memory", + "{{ user `memory` }}" + ], + [ + "modifyvm", + "{{.Name}}", + "--cpus", + "{{ user `cpus` }}" + ], + [ + "storageattach", + "{{.Name}}", + "--storagectl", + "SATA Controller", + "--port", + "1", + "--device", + "0", + "--type", + "dvddrive", + "--medium", + "{{user `mirror`}}/{{user `packages_iso`}}" + ] + ], + "virtualbox_version_file": ".vbox_version", + "vm_name": "{{ user `template` }}" + }, + { + "boot_command": [ + "<esc><enter><wait>", + "linux netdevice=eth0 netsetup=dhcp install=cd:/<wait>", + " lang=en_US autoyast=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `autoinst_cfg`}}<wait>", + " textmode=1<wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": "{{user `disk_size`}}", + "guest_os_type": "sles12-64", + "headless": "{{ user `headless` }}", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `iso_name`}}", + "output_directory": "../builds/packer-{{user `template`}}-vmware", + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "tools_upload_flavor": "linux", + "type": "vmware-iso", + "vm_name": "{{ user `template` }}", + "vmx_data": { + "cpuid.coresPerSocket": "1", + "memsize": "{{ user `memory` }}", + "numvcpus": "{{ user `cpus` }}" + }, + "vmx_remove_ethernet_interfaces": true + }, + { + "boot_command": [ + "<esc><enter><wait>", + "linux netdevice=eth0 netsetup=dhcp install=cd:/<wait>", + " lang=en_US autoyast=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `autoinst_cfg`}}<wait>", + " textmode=1<wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": "{{user `disk_size`}}", + "guest_os_type": "suse", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `iso_name`}}", + "output_directory": "../builds/packer-{{user `template`}}-parallels", + "parallels_tools_flavor": "lin", + "prlctl": [ + [ + "set", + "{{.Name}}", + "--memsize", + "{{ user `memory` }}" + ], + [ + "set", + "{{.Name}}", + "--cpus", + "{{ user `cpus` }}" + ] + ], + "prlctl_version_file": ".prlctl_version", + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "parallels-iso", + "vm_name": "{{ user `template` }}" + }, + { + "boot_command": [ + "<esc><enter><wait>", + "linux netdevice=eth0 netsetup=dhcp install=cd:/<wait>", + " lang=en_US autoyast=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `autoinst_cfg`}}<wait>", + " textmode=1<wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": "{{user `disk_size`}}", + "headless": "{{ user `headless` }}", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `iso_name`}}", + "output_directory": "../builds/packer-{{user `template`}}-qemu", + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "qemu", + "vm_name": "{{ user `template` }}" + } + ], + "post-processors": [ + { + "output": "../builds/{{user `box_basename`}}.{{.Provider}}.box", + "type": "vagrant" + } + ], + "provisioners": [ + { + "environment_vars": [ + "HOME_DIR=/home/vagrant", + "http_proxy={{user `http_proxy`}}", + "https_proxy={{user `https_proxy`}}", + "no_proxy={{user `no_proxy`}}" + ], + "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh '{{.Path}}'", + "expect_disconnect": true, + "scripts": [ + "../_common/sshd.sh", + "../_common/vagrant.sh", + "scripts/unsupported-modules.sh", + "../_common/virtualbox.sh", + "../_common/vmware.sh", + "../_common/parallels.sh", + "scripts/sudoers.sh", + "scripts/zypper-locks.sh", + "scripts/remove-dvd-source.sh", + "scripts/cleanup.sh", + "../_common/minimize.sh" + ], + "type": "shell" + } + ], + "variables": { + "_DOWNLOAD_SITE": "https://www.suse.com/products/server/download", + "_README": "You must download the installer (DVD1) and Packages (DVD1) iso from the following page, and then place them in the packer_cache dir", + "arch": "64", + "autoinst_cfg": "sles-15-x86_64-autoinst.xml", + "box_basename": "sles-15", + "build_timestamp": "{{isotime \"20060102150405\"}}", + "cpus": "1", + "disk_size": "65536", + "git_revision": "__unknown_git_revision__", + "headless": "", + "http_proxy": "{{env `http_proxy`}}", + "https_proxy": "{{env `https_proxy`}}", + "iso_checksum": "06bd8b78ef0ca6d5ff5000688727953e894805dc3de59060d74441f0fd0539ab", + "iso_checksum_type": "sha256", + "iso_name": "SLE-15-Installer-DVD-x86_64-GM-DVD1.iso", + "memory": "1024", + "mirror": "./packer_cache", + "name": "sles-15", + "packages_iso": "SLE-15-Packages-x86_64-GM-DVD1.iso", + "template": "sles-15-x86_64", + "version": "TIMESTAMP" + } +} From c47d0f4bb0e975d00540a3460ea8d8030a6b451e Mon Sep 17 00:00:00 2001 From: Michael Rosile <mike@rosile.com> Date: Tue, 16 Apr 2019 23:32:31 -0400 Subject: [PATCH 0952/1622] added additional packages, similar to sles-12 config --- sles/http/sles-15-x86_64-autoinst.xml | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/sles/http/sles-15-x86_64-autoinst.xml b/sles/http/sles-15-x86_64-autoinst.xml index be735a9a3..9921b0eab 100644 --- a/sles/http/sles-15-x86_64-autoinst.xml +++ b/sles/http/sles-15-x86_64-autoinst.xml @@ -210,19 +210,16 @@ <!-- <package>SuSEfirewall2</package> --> <package>kexec-tools</package> <!-- <package>perl-Bootloader-YAML</package> --> -<!-- <package>kernel-default-devel</package> --> + <package>kernel-default-devel</package> <package>sudo</package> -<!-- <package>gcc</package> --> + <package>gcc</package> <package>wget</package> <package>perl</package> -<!-- <package>make</package> --> + <package>make</package> </packages> -<!-- <patterns config:type="list"> - <pattern>Minimal</pattern> <pattern>apparmor</pattern> </patterns> ---> <remove-packages config:type="list"> <package>adaptec-firmware</package> <package>atmel-firmware</package> From a9348676cbe7bd43a074a6aeaba36667d77dac3d Mon Sep 17 00:00:00 2001 From: Michael Rosile <mike@rosile.com> Date: Tue, 16 Apr 2019 23:32:31 -0400 Subject: [PATCH 0953/1622] added additional packages, similar to sles-12 config Signed-off-by: Michael Rosile <mike@rosile.com> --- sles/http/sles-15-x86_64-autoinst.xml | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/sles/http/sles-15-x86_64-autoinst.xml b/sles/http/sles-15-x86_64-autoinst.xml index be735a9a3..9921b0eab 100644 --- a/sles/http/sles-15-x86_64-autoinst.xml +++ b/sles/http/sles-15-x86_64-autoinst.xml @@ -210,19 +210,16 @@ <!-- <package>SuSEfirewall2</package> --> <package>kexec-tools</package> <!-- <package>perl-Bootloader-YAML</package> --> -<!-- <package>kernel-default-devel</package> --> + <package>kernel-default-devel</package> <package>sudo</package> -<!-- <package>gcc</package> --> + <package>gcc</package> <package>wget</package> <package>perl</package> -<!-- <package>make</package> --> + <package>make</package> </packages> -<!-- <patterns config:type="list"> - <pattern>Minimal</pattern> <pattern>apparmor</pattern> </patterns> ---> <remove-packages config:type="list"> <package>adaptec-firmware</package> <package>atmel-firmware</package> From 49ea51862668b4b3e772fd09008f18c8104e1687 Mon Sep 17 00:00:00 2001 From: Pavel Martynov <pavel.martynov@kaspersky.com> Date: Fri, 19 Apr 2019 08:17:49 +0300 Subject: [PATCH 0954/1622] Add Ubuntu 19.04 Signed-off-by: Pavel Martynov <mr.xkurt@gmail.com> --- ubuntu/ubuntu-19.04-amd64.json | 315 +++++++++++++++++++++++++++++++++ 1 file changed, 315 insertions(+) create mode 100644 ubuntu/ubuntu-19.04-amd64.json diff --git a/ubuntu/ubuntu-19.04-amd64.json b/ubuntu/ubuntu-19.04-amd64.json new file mode 100644 index 000000000..f5d0759ae --- /dev/null +++ b/ubuntu/ubuntu-19.04-amd64.json @@ -0,0 +1,315 @@ +{ + "builders": [ + { + "boot_command": [ + "<esc><wait>", + "<esc><wait>", + "<enter><wait>", + "/install/vmlinuz<wait>", + " auto<wait>", + " console-setup/ask_detect=false<wait>", + " console-setup/layoutcode=us<wait>", + " console-setup/modelcode=pc105<wait>", + " debconf/frontend=noninteractive<wait>", + " debian-installer=en_US.UTF-8<wait>", + " fb=false<wait>", + " initrd=/install/initrd.gz<wait>", + " kbd-chooser/method=us<wait>", + " keyboard-configuration/layout=USA<wait>", + " keyboard-configuration/variant=USA<wait>", + " locale=en_US.UTF-8<wait>", + " netcfg/get_domain=vm<wait>", + " netcfg/get_hostname=vagrant<wait>", + " grub-installer/bootdev=/dev/sda<wait>", + " noapic<wait>", + " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}}<wait>", + " -- <wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": "{{user `disk_size`}}", + "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "guest_os_type": "Ubuntu_64", + "hard_drive_interface": "sata", + "headless": "{{ user `headless` }}", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "../builds/packer-{{user `template`}}-virtualbox", + "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "virtualbox-iso", + "vboxmanage": [ + [ + "modifyvm", + "{{.Name}}", + "--memory", + "{{ user `memory` }}" + ], + [ + "modifyvm", + "{{.Name}}", + "--cpus", + "{{ user `cpus` }}" + ] + ], + "virtualbox_version_file": ".vbox_version", + "vm_name": "{{ user `template` }}" + }, + { + "boot_command": [ + "<esc><wait>", + "<esc><wait>", + "<enter><wait>", + "/install/vmlinuz<wait>", + " auto<wait>", + " console-setup/ask_detect=false<wait>", + " console-setup/layoutcode=us<wait>", + " console-setup/modelcode=pc105<wait>", + " debconf/frontend=noninteractive<wait>", + " debian-installer=en_US.UTF-8<wait>", + " fb=false<wait>", + " initrd=/install/initrd.gz<wait>", + " kbd-chooser/method=us<wait>", + " keyboard-configuration/layout=USA<wait>", + " keyboard-configuration/variant=USA<wait>", + " locale=en_US.UTF-8<wait>", + " netcfg/get_domain=vm<wait>", + " netcfg/get_hostname=vagrant<wait>", + " grub-installer/bootdev=/dev/sda<wait>", + " noapic<wait>", + " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}}<wait>", + " -- <wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": "{{user `disk_size`}}", + "guest_os_type": "ubuntu-64", + "headless": "{{ user `headless` }}", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "../builds/packer-{{user `template`}}-vmware", + "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "tools_upload_flavor": "linux", + "type": "vmware-iso", + "vm_name": "{{ user `template` }}", + "vmx_data": { + "cpuid.coresPerSocket": "1", + "ethernet0.pciSlotNumber": "32", + "memsize": "{{ user `memory` }}", + "numvcpus": "{{ user `cpus` }}" + }, + "vmx_remove_ethernet_interfaces": true + }, + { + "boot_command": [ + "<esc><wait>", + "<esc><wait>", + "<enter><wait>", + "/install/vmlinuz<wait>", + " auto<wait>", + " console-setup/ask_detect=false<wait>", + " console-setup/layoutcode=us<wait>", + " console-setup/modelcode=pc105<wait>", + " debconf/frontend=noninteractive<wait>", + " debian-installer=en_US.UTF-8<wait>", + " fb=false<wait>", + " initrd=/install/initrd.gz<wait>", + " kbd-chooser/method=us<wait>", + " keyboard-configuration/layout=USA<wait>", + " keyboard-configuration/variant=USA<wait>", + " locale=en_US.UTF-8<wait>", + " netcfg/get_domain=vm<wait>", + " netcfg/get_hostname=vagrant<wait>", + " grub-installer/bootdev=/dev/sda<wait>", + " noapic<wait>", + " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}}<wait>", + " -- <wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": "{{user `disk_size`}}", + "guest_os_type": "ubuntu", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "../builds/packer-{{user `template`}}-parallels", + "parallels_tools_flavor": "lin", + "prlctl": [ + [ + "set", + "{{.Name}}", + "--memsize", + "{{ user `memory` }}" + ], + [ + "set", + "{{.Name}}", + "--cpus", + "{{ user `cpus` }}" + ] + ], + "prlctl_version_file": ".prlctl_version", + "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "parallels-iso", + "vm_name": "{{ user `template` }}" + }, + { + "boot_command": [ + "<esc><wait>", + "<esc><wait>", + "<enter><wait>", + "/install/vmlinuz<wait>", + " auto<wait>", + " console-setup/ask_detect=false<wait>", + " console-setup/layoutcode=us<wait>", + " console-setup/modelcode=pc105<wait>", + " debconf/frontend=noninteractive<wait>", + " debian-installer=en_US.UTF-8<wait>", + " fb=false<wait>", + " initrd=/install/initrd.gz<wait>", + " kbd-chooser/method=us<wait>", + " keyboard-configuration/layout=USA<wait>", + " keyboard-configuration/variant=USA<wait>", + " locale=en_US.UTF-8<wait>", + " netcfg/get_domain=vm<wait>", + " netcfg/get_hostname=vagrant<wait>", + " grub-installer/bootdev=/dev/vda<wait>", + " noapic<wait>", + " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}}<wait>", + " -- <wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": "{{user `disk_size`}}", + "headless": "{{ user `headless` }}", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "../builds/packer-{{user `template`}}-qemu", + "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "qemu", + "vm_name": "{{ user `template` }}", + "qemuargs": [ + [ + "-m", + "{{ user `memory` }}M" + ], + [ + "-smp", + "{{ user `cpus` }}" + ] + ] + }, + { + "boot_command": [ + "<esc><wait10><esc><esc><enter><wait>", + "set gfxpayload=1024x768<enter>", + "linux /install/vmlinuz ", + "preseed/url=http://{{.HTTPIP}}:{{.HTTPPort}}/preseed-hyperv.cfg ", + "debian-installer=en_US.UTF-8 auto locale=en_US.UTF-8 kbd-chooser/method=us ", + "hostname={{.Name}} ", + "fb=false debconf/frontend=noninteractive ", + "keyboard-configuration/modelcode=SKIP keyboard-configuration/layout=USA ", + "keyboard-configuration/variant=USA console-setup/ask_detect=false <enter>", + "initrd /install/initrd.gz<enter>", + "boot<enter>" + ], + "boot_wait": "10s", + "communicator": "ssh", + "cpu": "{{ user `cpus` }}", + "disk_size": "{{user `disk_size`}}", + "enable_secure_boot": false, + "generation": "{{user `hyperv_generation`}}", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "../builds/packer-{{user `template`}}-hyperv", + "ram_size": "{{user `memory`}}", + "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_timeout": "10000s", + "ssh_username": "vagrant", + "switch_name": "{{user `hyperv_switch`}}", + "type": "hyperv-iso", + "vm_name": "{{ user `template` }}" + } + ], + "post-processors": [ + { + "output": "../builds/{{user `box_basename`}}.{{.Provider}}.box", + "type": "vagrant" + } + ], + "provisioners": [ + { + "environment_vars": [ + "HOME_DIR=/home/vagrant", + "http_proxy={{user `http_proxy`}}", + "https_proxy={{user `https_proxy`}}", + "no_proxy={{user `no_proxy`}}" + ], + "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", + "expect_disconnect": true, + "scripts": [ + "scripts/update.sh", + "../_common/sshd.sh", + "scripts/networking.sh", + "scripts/sudoers.sh", + "scripts/vagrant.sh", + "../_common/virtualbox.sh", + "scripts/vmware.sh", + "../_common/parallels.sh", + "scripts/hyperv.sh", + "scripts/cleanup.sh", + "../_common/minimize.sh" + ], + "type": "shell" + } + ], + "variables": { + "box_basename": "ubuntu-19.04", + "build_timestamp": "{{isotime \"20060102150405\"}}", + "cpus": "1", + "disk_size": "65536", + "git_revision": "__unknown_git_revision__", + "headless": "", + "http_proxy": "{{env `http_proxy`}}", + "https_proxy": "{{env `https_proxy`}}", + "hyperv_generation": "2", + "hyperv_switch": "{{env `hyperv_switch`}}", + "iso_checksum": "7e8a0d07522f591dfee9bc9fcd7c05466763161e6cb0117906655bce1750b2fa", + "iso_checksum_type": "sha256", + "iso_name": "ubuntu-19.04-server-amd64.iso", + "memory": "1024", + "mirror": "http://cdimage.ubuntu.com", + "mirror_directory": "ubuntu/releases/19.04/release", + "name": "ubuntu-19.04", + "no_proxy": "{{env `no_proxy`}}", + "preseed_path": "preseed.cfg", + "template": "ubuntu-19.04-amd64", + "version": "TIMESTAMP" + } +} From 3fadc03512479a49590d250310b8c1fa49bb150e Mon Sep 17 00:00:00 2001 From: Vinson Lee <vlee@freedesktop.org> Date: Mon, 22 Apr 2019 14:03:28 -0700 Subject: [PATCH 0955/1622] Disable apt-daily earlier. There is a race to disable apt-daily before it can trigger its own apt process that grabs the apt lock. Running apt-get update first adds more time for apt-daily to trigger before it gets disabled. Then a subsequent apt command after the disablement of apt-daily can fail grabbing the apt lock. Move the apt-get update later and disable apt-daily earlier to give us a better chance of winning the race. Signed-off-by: Vinson Lee <vlee@freedesktop.org> --- debian/scripts/update.sh | 4 ++-- ubuntu/scripts/update.sh | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/debian/scripts/update.sh b/debian/scripts/update.sh index 7b3a533e1..4b0de4373 100644 --- a/debian/scripts/update.sh +++ b/debian/scripts/update.sh @@ -4,8 +4,6 @@ arch="`uname -r | sed 's/^.*[0-9]\{1,\}\.[0-9]\{1,\}\.[0-9]\{1,\}\(-[0-9]\{1,2\} debian_version="`lsb_release -r | awk '{print $2}'`"; major_version="`echo $debian_version | awk -F. '{print $1}'`"; -apt-get update; - # Disable systemd apt timers/services if [ "$major_version" -ge "9" ]; then systemctl stop apt-daily.timer; @@ -26,5 +24,7 @@ APT::Periodic::AutocleanInterval "0"; APT::Periodic::Unattended-Upgrade "0"; EOF +apt-get update; + apt-get -y upgrade linux-image-$arch; apt-get -y install linux-headers-`uname -r`; diff --git a/ubuntu/scripts/update.sh b/ubuntu/scripts/update.sh index 81dd53065..774a414d1 100644 --- a/ubuntu/scripts/update.sh +++ b/ubuntu/scripts/update.sh @@ -7,9 +7,6 @@ major_version="`echo $ubuntu_version | awk -F. '{print $1}'`"; # Disable release-upgrades sed -i.bak 's/^Prompt=.*$/Prompt=never/' /etc/update-manager/release-upgrades; -# Update the package list -apt-get -y update; - # Disable systemd apt timers/services if [ "$major_version" -ge "16" ]; then systemctl stop apt-daily.timer; @@ -34,5 +31,8 @@ EOF rm -rf /var/log/unattended-upgrades; apt-get -y purge unattended-upgrades; +# Update the package list +apt-get -y update; + # Upgrade all installed packages incl. kernel and kernel headers apt-get -y dist-upgrade -o Dpkg::Options::="--force-confnew"; From 355911471088d81ab00dda94c47c8ef2b48076c5 Mon Sep 17 00:00:00 2001 From: Martin Gruner <martin.gruner@otrs.com> Date: Mon, 3 Jun 2019 14:55:23 +0200 Subject: [PATCH 0956/1622] Fix Debian 8 builds to not ask for confirmation, and use a separate preseed file for Debian 9. Signed-off-by: Martin Gruner <martin.gruner@otrs.com> --- debian/debian-9.8-amd64.json | 2 +- debian/debian-9.8-i386.json | 2 +- debian/debian-9.8-ppc64el.json | 2 +- debian/http/debian-8/preseed.cfg | 2 ++ debian/http/debian-9/preseed.cfg | 48 ++++++++++++++++++++++++++++++++ 5 files changed, 53 insertions(+), 3 deletions(-) create mode 100644 debian/http/debian-9/preseed.cfg diff --git a/debian/debian-9.8-amd64.json b/debian/debian-9.8-amd64.json index ff8c0868c..d536b4dc2 100644 --- a/debian/debian-9.8-amd64.json +++ b/debian/debian-9.8-amd64.json @@ -233,7 +233,7 @@ "mirror_directory": "9.8.0/amd64/iso-cd", "name": "debian-9.8", "no_proxy": "{{env `no_proxy`}}", - "preseed_path": "debian-8/preseed.cfg", + "preseed_path": "debian-9/preseed.cfg", "template": "debian-9.8-amd64", "version": "TIMESTAMP" } diff --git a/debian/debian-9.8-i386.json b/debian/debian-9.8-i386.json index 42fd8d17e..dc0e7f858 100644 --- a/debian/debian-9.8-i386.json +++ b/debian/debian-9.8-i386.json @@ -233,7 +233,7 @@ "mirror_directory": "9.8.0/i386/iso-cd", "name": "debian-9.8-i386", "no_proxy": "{{env `no_proxy`}}", - "preseed_path": "debian-8/preseed.cfg", + "preseed_path": "debian-9/preseed.cfg", "template": "debian-9.8-i386", "version": "TIMESTAMP" } diff --git a/debian/debian-9.8-ppc64el.json b/debian/debian-9.8-ppc64el.json index 6247cfd03..0722311cb 100644 --- a/debian/debian-9.8-ppc64el.json +++ b/debian/debian-9.8-ppc64el.json @@ -94,7 +94,7 @@ "mirror_directory": "9.8.0/ppc64el/iso-cd", "name": "debian-9.8", "no_proxy": "{{env `no_proxy`}}", - "preseed_path": "debian-8/preseed.cfg", + "preseed_path": "debian-9/preseed.cfg", "template": "debian-9.8-ppc64el", "version": "TIMESTAMP" } diff --git a/debian/http/debian-8/preseed.cfg b/debian/http/debian-8/preseed.cfg index a4cda4342..eeeea7af9 100644 --- a/debian/http/debian-8/preseed.cfg +++ b/debian/http/debian-8/preseed.cfg @@ -46,3 +46,5 @@ apt-cdrom-setup apt-setup/cdrom/set-first boolean false apt-mirror-setup apt-setup/use_mirror boolean true popularity-contest popularity-contest/participate boolean false tasksel tasksel/first multiselect standard, ssh-server +# Fix "Debian 8 build is stuck, asking for user input" - https://github.com/chef/bento/issues/1190 +d-i apt-setup/services-select multiselect security diff --git a/debian/http/debian-9/preseed.cfg b/debian/http/debian-9/preseed.cfg new file mode 100644 index 000000000..a4cda4342 --- /dev/null +++ b/debian/http/debian-9/preseed.cfg @@ -0,0 +1,48 @@ +choose-mirror-bin mirror/http/proxy string +d-i apt-setup/use_mirror boolean true +d-i base-installer/kernel/override-image string linux-server +d-i clock-setup/utc boolean true +d-i clock-setup/utc-auto boolean true +d-i finish-install/reboot_in_progress note +d-i grub-installer/only_debian boolean true +d-i grub-installer/with_other_os boolean true +d-i keymap select us +d-i mirror/country string manual +d-i mirror/http/directory string /debian +d-i mirror/http/hostname string httpredir.debian.org +d-i mirror/http/proxy string +d-i partman-auto-lvm/guided_size string max +d-i partman-auto/choose_recipe select atomic +d-i partman-auto/method string lvm +d-i partman-lvm/confirm boolean true +d-i partman-lvm/confirm boolean true +d-i partman-lvm/confirm_nooverwrite boolean true +d-i partman-lvm/device_remove_lvm boolean true +d-i partman/choose_partition select finish +d-i partman/confirm boolean true +d-i partman/confirm_nooverwrite boolean true +d-i partman/confirm_write_new_label boolean true +d-i passwd/root-login boolean false +d-i passwd/root-password-again password vagrant +d-i passwd/root-password password vagrant +d-i passwd/user-fullname string vagrant +d-i passwd/user-uid string 1000 +d-i passwd/user-password password vagrant +d-i passwd/user-password-again password vagrant +d-i passwd/username string vagrant +d-i pkgsel/include string sudo bzip2 acpid cryptsetup zlib1g-dev wget curl dkms fuse make nfs-common net-tools cifs-utils +d-i pkgsel/install-language-support boolean false +d-i pkgsel/update-policy select none +d-i pkgsel/upgrade select full-upgrade +# Prevent packaged version of VirtualBox Guest Additions being installed: +d-i preseed/early_command string sed -i \ + '/in-target/idiscover(){/sbin/discover|grep -v VirtualBox;}' \ + /usr/lib/pre-pkgsel.d/20install-hwpackages +d-i time/zone string UTC +d-i user-setup/allow-password-weak boolean true +d-i user-setup/encrypt-home boolean false +d-i preseed/late_command string sed -i '/^deb cdrom:/s/^/#/' /target/etc/apt/sources.list +apt-cdrom-setup apt-setup/cdrom/set-first boolean false +apt-mirror-setup apt-setup/use_mirror boolean true +popularity-contest popularity-contest/participate boolean false +tasksel tasksel/first multiselect standard, ssh-server From 28b4410c6248e621875938f4bcf000fa552fb248 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith@chef.io> Date: Wed, 12 Jun 2019 16:49:41 -0700 Subject: [PATCH 0957/1622] Update Debian 9.8 -> 9.9 The old paths are now broken since there's a new release out Signed-off-by: Tim Smith <tsmith@chef.io> --- debian/debian-9.8-amd64.json | 6 +++--- debian/debian-9.8-i386.json | 6 +++--- debian/debian-9.8-ppc64el.json | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/debian/debian-9.8-amd64.json b/debian/debian-9.8-amd64.json index d536b4dc2..f0bf413fd 100644 --- a/debian/debian-9.8-amd64.json +++ b/debian/debian-9.8-amd64.json @@ -225,12 +225,12 @@ "headless": "", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", - "iso_checksum": "73bd56fb4548efa384bf32fd25808b99198f81c23cf19ab9e6507d898cd58dce", + "iso_checksum": "4de26144286993ac6f4f244ff332fdd80e11ec230906e7997aa426e775fac1fb", "iso_checksum_type": "sha256", - "iso_name": "debian-9.8.0-amd64-netinst.iso", + "iso_name": "debian-9.9.0-amd64-netinst.iso", "memory": "1024", "mirror": "http://cdimage.debian.org/cdimage/release", - "mirror_directory": "9.8.0/amd64/iso-cd", + "mirror_directory": "9.9.0/amd64/iso-cd", "name": "debian-9.8", "no_proxy": "{{env `no_proxy`}}", "preseed_path": "debian-9/preseed.cfg", diff --git a/debian/debian-9.8-i386.json b/debian/debian-9.8-i386.json index dc0e7f858..259a6ca5f 100644 --- a/debian/debian-9.8-i386.json +++ b/debian/debian-9.8-i386.json @@ -225,12 +225,12 @@ "headless": "", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", - "iso_checksum": "8156cc4ce7a06facf69d4f7161f89431a794cdaba8e2b4eb91b2c43a302e4614", + "iso_checksum": "44dc843e39ab0b24dd6aa552bb93acd66c08cb3c95e64c614532d95db531a8c1", "iso_checksum_type": "sha256", - "iso_name": "debian-9.8.0-i386-netinst.iso", + "iso_name": "debian-9.9.0-i386-netinst.iso", "memory": "1024", "mirror": "http://cdimage.debian.org/cdimage/release", - "mirror_directory": "9.8.0/i386/iso-cd", + "mirror_directory": "9.9.0/i386/iso-cd", "name": "debian-9.8-i386", "no_proxy": "{{env `no_proxy`}}", "preseed_path": "debian-9/preseed.cfg", diff --git a/debian/debian-9.8-ppc64el.json b/debian/debian-9.8-ppc64el.json index 0722311cb..8a6157b05 100644 --- a/debian/debian-9.8-ppc64el.json +++ b/debian/debian-9.8-ppc64el.json @@ -86,12 +86,12 @@ "headless": "", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", - "iso_checksum": "5ebf80f35af9e5b4c85240763c044854c408c77a68a6cb757f99306ba227b701", + "iso_checksum": "3ecde213fabd4d8ebec02b745970942c177793c939ef6e3fe679a436bf2e104d", "iso_checksum_type": "sha256", - "iso_name": "debian-9.8.0-ppc64el-netinst.iso", + "iso_name": "debian-9.9.0-ppc64el-netinst.iso", "memory": "1024", "mirror": "http://cdimage.debian.org/cdimage/release", - "mirror_directory": "9.8.0/ppc64el/iso-cd", + "mirror_directory": "9.9.0/ppc64el/iso-cd", "name": "debian-9.8", "no_proxy": "{{env `no_proxy`}}", "preseed_path": "debian-9/preseed.cfg", From 0c939fecb42f4bfb875fed4ce8a1339ddb9d1ecb Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith@chef.io> Date: Thu, 13 Jun 2019 09:57:19 -0700 Subject: [PATCH 0958/1622] Rename the files for the new version Signed-off-by: Tim Smith <tsmith@chef.io> --- debian/{debian-9.8-amd64.json => debian-9.9-amd64.json} | 0 debian/{debian-9.8-i386.json => debian-9.9-i386.json} | 0 debian/{debian-9.8-ppc64el.json => debian-9.9-ppc64el.json} | 0 3 files changed, 0 insertions(+), 0 deletions(-) rename debian/{debian-9.8-amd64.json => debian-9.9-amd64.json} (100%) rename debian/{debian-9.8-i386.json => debian-9.9-i386.json} (100%) rename debian/{debian-9.8-ppc64el.json => debian-9.9-ppc64el.json} (100%) diff --git a/debian/debian-9.8-amd64.json b/debian/debian-9.9-amd64.json similarity index 100% rename from debian/debian-9.8-amd64.json rename to debian/debian-9.9-amd64.json diff --git a/debian/debian-9.8-i386.json b/debian/debian-9.9-i386.json similarity index 100% rename from debian/debian-9.8-i386.json rename to debian/debian-9.9-i386.json diff --git a/debian/debian-9.8-ppc64el.json b/debian/debian-9.9-ppc64el.json similarity index 100% rename from debian/debian-9.8-ppc64el.json rename to debian/debian-9.9-ppc64el.json From 350224bdea411f780b815042b5378dc23903a229 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith@chef.io> Date: Wed, 6 Mar 2019 21:19:02 -0800 Subject: [PATCH 0959/1622] Merge bento-ya back into bento Move all the templates into their own directory. This starts the process of shipping a binary that can be run to build and ship the boxes. This will replace Rake and will be used in Travis to validate the configs as well. Signed-off-by: Tim Smith <tsmith@chef.io> --- .travis.yml | 2 +- Gemfile | 7 +- bin/bento | 15 ++ lib/bento.rb | 2 + lib/bento/build.rb | 97 +++++++ lib/bento/buildmetadata.rb | 83 ++++++ lib/bento/cli.rb | 228 +++++++++++++++++ lib/bento/common.rb | 102 ++++++++ lib/bento/delete.rb | 22 ++ lib/bento/normalize.rb | 85 +++++++ lib/bento/packerexec.rb | 30 +++ lib/bento/providermetadata.rb | 84 ++++++ lib/bento/release.rb | 22 ++ lib/bento/revoke.rb | 22 ++ lib/bento/test.rb | 60 +++++ lib/bento/upload.rb | 49 ++++ lib/bento/version.rb | 3 + .../_common}/metadata.sh | 0 .../_common}/minimize.sh | 0 .../_common}/parallels.sh | 0 {_common => packer_templates/_common}/sshd.sh | 0 .../_common}/vagrant.sh | 0 .../_common}/virtualbox.sh | 0 .../_common}/vmware.sh | 0 {builds => packer_templates/builds}/.gitkeep | 0 .../centos}/centos-5.11-i386.json | 0 .../centos}/centos-5.11-x86_64.json | 0 .../centos}/centos-6.10-i386.json | 0 .../centos}/centos-6.10-x86_64.json | 0 .../centos}/centos-7.6-x86_64.json | 0 .../centos}/http/5/ks.cfg | 0 .../centos}/http/6/ks.cfg | 0 .../centos}/http/7/ks.cfg | 0 .../centos}/scripts/cleanup.sh | 0 .../centos}/scripts/enable_vault.sh | 0 .../centos}/scripts/networking.sh | 0 .../centos}/scripts/update.sh | 0 .../debian}/debian-8.11-amd64.json | 0 .../debian}/debian-8.11-i386.json | 0 packer_templates/debian/debian-9.9-amd64.json | 240 ++++++++++++++++++ packer_templates/debian/debian-9.9-i386.json | 240 ++++++++++++++++++ .../debian/debian-9.9-ppc64el.json | 101 ++++++++ .../debian}/http/debian-8/preseed.cfg | 0 .../debian}/scripts/cleanup.sh | 0 .../debian}/scripts/networking.sh | 0 .../debian}/scripts/sudoers.sh | 0 .../debian}/scripts/systemd.sh | 0 .../debian}/scripts/update.sh | 0 .../fedora}/fedora-28-x86_64.json | 0 .../fedora}/fedora-29-x86_64.json | 0 .../fedora}/http/ks-fedora28.cfg | 0 .../fedora}/http/ks-fedora29.cfg | 0 .../fedora}/scripts/build-tools.sh | 0 .../fedora}/scripts/cleanup.sh | 0 .../fedora}/scripts/fix-slow-dns.sh | 0 .../fedora}/scripts/swap.sh | 0 .../freebsd}/freebsd-11.2-amd64.json | 0 .../freebsd}/freebsd-11.2-i386.json | 0 .../freebsd}/freebsd-12.0-amd64.json | 0 .../freebsd}/freebsd-12.0-i386.json | 0 .../freebsd}/http/freebsd-11/installerconfig | 0 .../freebsd}/scripts/cleanup.sh | 0 .../freebsd}/scripts/minimize.sh | 0 .../freebsd}/scripts/postinstall.sh | 0 .../freebsd}/scripts/sudoers.sh | 0 .../freebsd}/scripts/update.sh | 0 .../freebsd}/scripts/vmtools.sh | 0 .../freebsd}/vagrantfile_templates/freebsd.rb | 0 .../hardenedbsd}/hardenedbsd-11-amd64.json | 0 .../http/hardenedbsd-11/installerconfig | 0 .../hardenedbsd}/scripts/cleanup.sh | 0 .../hardenedbsd}/scripts/minimize.sh | 0 .../hardenedbsd}/scripts/postinstall.sh | 0 .../hardenedbsd}/scripts/sudoers.sh | 0 .../hardenedbsd}/scripts/update.sh | 0 .../vagrantfile_templates/hardenedbsd.rb | 0 .../macos}/macos-10.12.json | 0 .../macos}/macosx-10.10.json | 0 .../macos}/macosx-10.11.json | 0 .../macos}/scripts/autologin.sh | 0 .../macos}/scripts/cleanup.sh | 0 .../macos}/scripts/disablesleep.sh | 0 .../macos}/scripts/hostname.sh | 0 .../macos}/scripts/minimize.sh | 0 .../macos}/scripts/networking.sh | 0 .../macos}/scripts/support/set_kcpassword.py | 0 .../macos}/scripts/update.sh | 0 .../macos}/scripts/vagrant.sh | 0 .../macos}/scripts/vmtools.sh | 0 .../macos}/vagrantfile_templates/macosx.rb | 0 .../opensuse}/http/15/autoinst.xml | 0 .../opensuse}/http/42/autoinst.xml | 0 .../opensuse}/opensuse-leap-15.0-x86_64.json | 0 .../opensuse}/opensuse-leap-42.3-x86_64.json | 0 .../opensuse}/scripts/add_packages.sh | 0 .../opensuse}/scripts/cleanup.sh | 0 .../opensuse}/scripts/repositories.sh | 0 .../opensuse}/scripts/sudoers.sh | 0 .../opensuse}/scripts/update.sh | 0 .../opensuse}/scripts/vagrant_group.sh | 0 .../opensuse}/scripts/zypper-locks.sh | 0 .../oraclelinux}/oracle-5.11-i386.json | 0 .../oraclelinux}/oracle-5.11-x86_64.json | 0 .../oraclelinux}/oracle-6.10-i386.json | 0 .../oraclelinux}/oracle-6.10-x86_64.json | 0 .../oraclelinux}/oracle-7.6-x86_64.json | 0 .../rhel}/rhel-5.11-i386.json | 0 .../rhel}/rhel-5.11-x86_64.json | 0 .../rhel}/rhel-6.10-i386.json | 0 .../rhel}/rhel-6.10-x86_64.json | 0 .../rhel}/rhel-7.6-x86_64.json | 0 .../scientificlinux}/http/7/ks.cfg | 0 .../scientific-7.6-x86_64.json | 0 .../http/sles-11-sp4-x86_64-autoinst.xml | 0 .../http/sles-12-sp2-x86_64-autoinst.xml | 0 .../http/sles-12-sp3-x86_64-autoinst.xml | 0 .../sles}/scripts/cleanup.sh | 0 .../sles}/scripts/remove-dvd-source.sh | 0 .../sles}/scripts/sudoers.sh | 0 .../sles}/scripts/unsupported-modules.sh | 0 .../sles}/scripts/zypper-locks.sh | 0 .../sles}/sles-11-sp4-x86_64.json | 0 .../sles}/sles-12-sp2-x86_64.json | 0 .../sles}/sles-12-sp3-x86_64.json | 0 .../solaris}/floppy/S99startup.sh | 0 .../solaris}/floppy/awesome_prof | 0 .../solaris}/floppy/finish.sh | 0 .../solaris}/floppy/rules.ok | 0 .../solaris}/floppy/sysidcfg | 0 .../solaris}/http/default.xml | 0 .../solaris}/http/profile.xml | 0 .../solaris}/scripts/minimize.sh | 0 .../solaris}/scripts/solaris-10/minimize.sh | 0 .../solaris}/scripts/solaris-10/vmtools.sh | 0 .../solaris}/scripts/update.sh | 0 .../solaris}/scripts/vagrant.sh | 0 .../solaris}/scripts/vmtools.sh | 0 .../solaris}/solaris-10.11-x86.json | 0 .../solaris}/solaris-11-x86.json | 0 .../ubuntu}/http/preseed-hyperv.cfg | 0 .../ubuntu}/http/preseed.cfg | 0 .../ubuntu}/scripts/cleanup.sh | 0 .../ubuntu}/scripts/hyperv.sh | 0 .../ubuntu}/scripts/networking.sh | 0 .../ubuntu}/scripts/sudoers.sh | 0 .../ubuntu}/scripts/update.sh | 2 + .../ubuntu}/scripts/vagrant.sh | 0 .../ubuntu}/scripts/vmware.sh | 0 .../ubuntu}/ubuntu-14.04-amd64.json | 0 .../ubuntu}/ubuntu-14.04-i386.json | 0 .../ubuntu}/ubuntu-16.04-amd64.json | 0 .../ubuntu}/ubuntu-16.04-i386.json | 0 .../ubuntu}/ubuntu-18.04-amd64.json | 0 .../ubuntu}/ubuntu-18.10-amd64.json | 0 {windows => packer_templates/windows}/10.json | 0 .../windows}/2008r2.json | 0 .../windows}/2012r2.json | 0 .../windows}/2016.json | 0 .../windows}/2019.json | 0 {windows => packer_templates/windows}/7.json | 0 .../windows}/answer_files/10/Autounattend.xml | 0 .../answer_files/2008_r2/Autounattend.xml | 0 .../answer_files/2012_r2/Autounattend.xml | 0 .../answer_files/2016/Autounattend.xml | 0 .../answer_files/2019/Autounattend.xml | 0 .../windows}/answer_files/7/Autounattend.xml | 0 .../windows}/cookbooks/packer/Berksfile | 0 .../windows}/cookbooks/packer/kitchen.yml | 0 .../packer/libraries/windows_helper.rb | 0 .../windows}/cookbooks/packer/metadata.rb | 0 .../cookbooks/packer/recipes/cleanup.rb | 0 .../cookbooks/packer/recipes/defrag.rb | 0 .../packer/recipes/disable_hibernation.rb | 0 .../packer/recipes/disable_onedrive.rb | 0 .../packer/recipes/disable_restore.rb | 0 .../cookbooks/packer/recipes/disable_uac.rb | 0 .../packer/recipes/disable_windows_update.rb | 0 .../packer/recipes/enable_file_sharing.rb | 0 .../packer/recipes/enable_remote_desktop.rb | 0 .../cookbooks/packer/recipes/features.rb | 0 .../cookbooks/packer/recipes/power.rb | 0 .../packer/recipes/remove_defender.rb | 0 .../set_local_account_token_filter_policy.rb | 0 .../cookbooks/packer/recipes/ui_tweaks.rb | Bin .../cookbooks/packer/recipes/updates.rb | 0 .../cookbooks/packer/recipes/vm_tools.rb | 0 .../cookbooks/packer/resources/zipfile.rb | 0 .../windows}/scripts/base_setup.ps1 | 0 .../windows}/scripts/cleanup.ps1 | 0 .../windows}/scripts/oracle.cer | Bin .../windows}/vagrantfile-windows.template | 0 test_templates/bootstrap.sh.erb | 1 + test_templates/kitchen.yml.erb | 29 +++ 193 files changed, 1524 insertions(+), 2 deletions(-) create mode 100755 bin/bento create mode 100644 lib/bento.rb create mode 100644 lib/bento/build.rb create mode 100644 lib/bento/buildmetadata.rb create mode 100644 lib/bento/cli.rb create mode 100644 lib/bento/common.rb create mode 100644 lib/bento/delete.rb create mode 100644 lib/bento/normalize.rb create mode 100644 lib/bento/packerexec.rb create mode 100644 lib/bento/providermetadata.rb create mode 100644 lib/bento/release.rb create mode 100644 lib/bento/revoke.rb create mode 100644 lib/bento/test.rb create mode 100644 lib/bento/upload.rb create mode 100644 lib/bento/version.rb rename {_common => packer_templates/_common}/metadata.sh (100%) rename {_common => packer_templates/_common}/minimize.sh (100%) rename {_common => packer_templates/_common}/parallels.sh (100%) rename {_common => packer_templates/_common}/sshd.sh (100%) rename {_common => packer_templates/_common}/vagrant.sh (100%) rename {_common => packer_templates/_common}/virtualbox.sh (100%) rename {_common => packer_templates/_common}/vmware.sh (100%) rename {builds => packer_templates/builds}/.gitkeep (100%) rename {centos => packer_templates/centos}/centos-5.11-i386.json (100%) rename {centos => packer_templates/centos}/centos-5.11-x86_64.json (100%) rename {centos => packer_templates/centos}/centos-6.10-i386.json (100%) rename {centos => packer_templates/centos}/centos-6.10-x86_64.json (100%) rename {centos => packer_templates/centos}/centos-7.6-x86_64.json (100%) rename {centos => packer_templates/centos}/http/5/ks.cfg (100%) rename {centos => packer_templates/centos}/http/6/ks.cfg (100%) rename {centos => packer_templates/centos}/http/7/ks.cfg (100%) rename {centos => packer_templates/centos}/scripts/cleanup.sh (100%) rename {centos => packer_templates/centos}/scripts/enable_vault.sh (100%) rename {centos => packer_templates/centos}/scripts/networking.sh (100%) rename {centos => packer_templates/centos}/scripts/update.sh (100%) rename {debian => packer_templates/debian}/debian-8.11-amd64.json (100%) rename {debian => packer_templates/debian}/debian-8.11-i386.json (100%) create mode 100644 packer_templates/debian/debian-9.9-amd64.json create mode 100644 packer_templates/debian/debian-9.9-i386.json create mode 100644 packer_templates/debian/debian-9.9-ppc64el.json rename {debian => packer_templates/debian}/http/debian-8/preseed.cfg (100%) rename {debian => packer_templates/debian}/scripts/cleanup.sh (100%) rename {debian => packer_templates/debian}/scripts/networking.sh (100%) rename {debian => packer_templates/debian}/scripts/sudoers.sh (100%) rename {debian => packer_templates/debian}/scripts/systemd.sh (100%) rename {debian => packer_templates/debian}/scripts/update.sh (100%) rename {fedora => packer_templates/fedora}/fedora-28-x86_64.json (100%) rename {fedora => packer_templates/fedora}/fedora-29-x86_64.json (100%) rename {fedora => packer_templates/fedora}/http/ks-fedora28.cfg (100%) rename {fedora => packer_templates/fedora}/http/ks-fedora29.cfg (100%) rename {fedora => packer_templates/fedora}/scripts/build-tools.sh (100%) rename {fedora => packer_templates/fedora}/scripts/cleanup.sh (100%) rename {fedora => packer_templates/fedora}/scripts/fix-slow-dns.sh (100%) rename {fedora => packer_templates/fedora}/scripts/swap.sh (100%) rename {freebsd => packer_templates/freebsd}/freebsd-11.2-amd64.json (100%) rename {freebsd => packer_templates/freebsd}/freebsd-11.2-i386.json (100%) rename {freebsd => packer_templates/freebsd}/freebsd-12.0-amd64.json (100%) rename {freebsd => packer_templates/freebsd}/freebsd-12.0-i386.json (100%) rename {freebsd => packer_templates/freebsd}/http/freebsd-11/installerconfig (100%) rename {freebsd => packer_templates/freebsd}/scripts/cleanup.sh (100%) rename {freebsd => packer_templates/freebsd}/scripts/minimize.sh (100%) rename {freebsd => packer_templates/freebsd}/scripts/postinstall.sh (100%) rename {freebsd => packer_templates/freebsd}/scripts/sudoers.sh (100%) rename {freebsd => packer_templates/freebsd}/scripts/update.sh (100%) rename {freebsd => packer_templates/freebsd}/scripts/vmtools.sh (100%) rename {freebsd => packer_templates/freebsd}/vagrantfile_templates/freebsd.rb (100%) rename {hardenedbsd => packer_templates/hardenedbsd}/hardenedbsd-11-amd64.json (100%) rename {hardenedbsd => packer_templates/hardenedbsd}/http/hardenedbsd-11/installerconfig (100%) rename {hardenedbsd => packer_templates/hardenedbsd}/scripts/cleanup.sh (100%) rename {hardenedbsd => packer_templates/hardenedbsd}/scripts/minimize.sh (100%) rename {hardenedbsd => packer_templates/hardenedbsd}/scripts/postinstall.sh (100%) rename {hardenedbsd => packer_templates/hardenedbsd}/scripts/sudoers.sh (100%) rename {hardenedbsd => packer_templates/hardenedbsd}/scripts/update.sh (100%) rename {hardenedbsd => packer_templates/hardenedbsd}/vagrantfile_templates/hardenedbsd.rb (100%) rename {macos => packer_templates/macos}/macos-10.12.json (100%) rename {macos => packer_templates/macos}/macosx-10.10.json (100%) rename {macos => packer_templates/macos}/macosx-10.11.json (100%) rename {macos => packer_templates/macos}/scripts/autologin.sh (100%) rename {macos => packer_templates/macos}/scripts/cleanup.sh (100%) rename {macos => packer_templates/macos}/scripts/disablesleep.sh (100%) rename {macos => packer_templates/macos}/scripts/hostname.sh (100%) rename {macos => packer_templates/macos}/scripts/minimize.sh (100%) rename {macos => packer_templates/macos}/scripts/networking.sh (100%) rename {macos => packer_templates/macos}/scripts/support/set_kcpassword.py (100%) rename {macos => packer_templates/macos}/scripts/update.sh (100%) rename {macos => packer_templates/macos}/scripts/vagrant.sh (100%) rename {macos => packer_templates/macos}/scripts/vmtools.sh (100%) rename {macos => packer_templates/macos}/vagrantfile_templates/macosx.rb (100%) rename {opensuse => packer_templates/opensuse}/http/15/autoinst.xml (100%) rename {opensuse => packer_templates/opensuse}/http/42/autoinst.xml (100%) rename {opensuse => packer_templates/opensuse}/opensuse-leap-15.0-x86_64.json (100%) rename {opensuse => packer_templates/opensuse}/opensuse-leap-42.3-x86_64.json (100%) rename {opensuse => packer_templates/opensuse}/scripts/add_packages.sh (100%) rename {opensuse => packer_templates/opensuse}/scripts/cleanup.sh (100%) rename {opensuse => packer_templates/opensuse}/scripts/repositories.sh (100%) rename {opensuse => packer_templates/opensuse}/scripts/sudoers.sh (100%) rename {opensuse => packer_templates/opensuse}/scripts/update.sh (100%) rename {opensuse => packer_templates/opensuse}/scripts/vagrant_group.sh (100%) rename {opensuse => packer_templates/opensuse}/scripts/zypper-locks.sh (100%) rename {oraclelinux => packer_templates/oraclelinux}/oracle-5.11-i386.json (100%) rename {oraclelinux => packer_templates/oraclelinux}/oracle-5.11-x86_64.json (100%) rename {oraclelinux => packer_templates/oraclelinux}/oracle-6.10-i386.json (100%) rename {oraclelinux => packer_templates/oraclelinux}/oracle-6.10-x86_64.json (100%) rename {oraclelinux => packer_templates/oraclelinux}/oracle-7.6-x86_64.json (100%) rename {rhel => packer_templates/rhel}/rhel-5.11-i386.json (100%) rename {rhel => packer_templates/rhel}/rhel-5.11-x86_64.json (100%) rename {rhel => packer_templates/rhel}/rhel-6.10-i386.json (100%) rename {rhel => packer_templates/rhel}/rhel-6.10-x86_64.json (100%) rename {rhel => packer_templates/rhel}/rhel-7.6-x86_64.json (100%) rename {scientificlinux => packer_templates/scientificlinux}/http/7/ks.cfg (100%) rename {scientificlinux => packer_templates/scientificlinux}/scientific-7.6-x86_64.json (100%) rename {sles => packer_templates/sles}/http/sles-11-sp4-x86_64-autoinst.xml (100%) rename {sles => packer_templates/sles}/http/sles-12-sp2-x86_64-autoinst.xml (100%) rename {sles => packer_templates/sles}/http/sles-12-sp3-x86_64-autoinst.xml (100%) rename {sles => packer_templates/sles}/scripts/cleanup.sh (100%) rename {sles => packer_templates/sles}/scripts/remove-dvd-source.sh (100%) rename {sles => packer_templates/sles}/scripts/sudoers.sh (100%) rename {sles => packer_templates/sles}/scripts/unsupported-modules.sh (100%) rename {sles => packer_templates/sles}/scripts/zypper-locks.sh (100%) rename {sles => packer_templates/sles}/sles-11-sp4-x86_64.json (100%) rename {sles => packer_templates/sles}/sles-12-sp2-x86_64.json (100%) rename {sles => packer_templates/sles}/sles-12-sp3-x86_64.json (100%) rename {solaris => packer_templates/solaris}/floppy/S99startup.sh (100%) rename {solaris => packer_templates/solaris}/floppy/awesome_prof (100%) rename {solaris => packer_templates/solaris}/floppy/finish.sh (100%) rename {solaris => packer_templates/solaris}/floppy/rules.ok (100%) rename {solaris => packer_templates/solaris}/floppy/sysidcfg (100%) rename {solaris => packer_templates/solaris}/http/default.xml (100%) rename {solaris => packer_templates/solaris}/http/profile.xml (100%) rename {solaris => packer_templates/solaris}/scripts/minimize.sh (100%) rename {solaris => packer_templates/solaris}/scripts/solaris-10/minimize.sh (100%) rename {solaris => packer_templates/solaris}/scripts/solaris-10/vmtools.sh (100%) rename {solaris => packer_templates/solaris}/scripts/update.sh (100%) rename {solaris => packer_templates/solaris}/scripts/vagrant.sh (100%) rename {solaris => packer_templates/solaris}/scripts/vmtools.sh (100%) rename {solaris => packer_templates/solaris}/solaris-10.11-x86.json (100%) rename {solaris => packer_templates/solaris}/solaris-11-x86.json (100%) rename {ubuntu => packer_templates/ubuntu}/http/preseed-hyperv.cfg (100%) rename {ubuntu => packer_templates/ubuntu}/http/preseed.cfg (100%) rename {ubuntu => packer_templates/ubuntu}/scripts/cleanup.sh (100%) rename {ubuntu => packer_templates/ubuntu}/scripts/hyperv.sh (100%) rename {ubuntu => packer_templates/ubuntu}/scripts/networking.sh (100%) rename {ubuntu => packer_templates/ubuntu}/scripts/sudoers.sh (100%) rename {ubuntu => packer_templates/ubuntu}/scripts/update.sh (99%) rename {ubuntu => packer_templates/ubuntu}/scripts/vagrant.sh (100%) rename {ubuntu => packer_templates/ubuntu}/scripts/vmware.sh (100%) rename {ubuntu => packer_templates/ubuntu}/ubuntu-14.04-amd64.json (100%) rename {ubuntu => packer_templates/ubuntu}/ubuntu-14.04-i386.json (100%) rename {ubuntu => packer_templates/ubuntu}/ubuntu-16.04-amd64.json (100%) rename {ubuntu => packer_templates/ubuntu}/ubuntu-16.04-i386.json (100%) rename {ubuntu => packer_templates/ubuntu}/ubuntu-18.04-amd64.json (100%) rename {ubuntu => packer_templates/ubuntu}/ubuntu-18.10-amd64.json (100%) rename {windows => packer_templates/windows}/10.json (100%) rename {windows => packer_templates/windows}/2008r2.json (100%) rename {windows => packer_templates/windows}/2012r2.json (100%) rename {windows => packer_templates/windows}/2016.json (100%) rename {windows => packer_templates/windows}/2019.json (100%) rename {windows => packer_templates/windows}/7.json (100%) rename {windows => packer_templates/windows}/answer_files/10/Autounattend.xml (100%) rename {windows => packer_templates/windows}/answer_files/2008_r2/Autounattend.xml (100%) rename {windows => packer_templates/windows}/answer_files/2012_r2/Autounattend.xml (100%) rename {windows => packer_templates/windows}/answer_files/2016/Autounattend.xml (100%) rename {windows => packer_templates/windows}/answer_files/2019/Autounattend.xml (100%) rename {windows => packer_templates/windows}/answer_files/7/Autounattend.xml (100%) rename {windows => packer_templates/windows}/cookbooks/packer/Berksfile (100%) rename {windows => packer_templates/windows}/cookbooks/packer/kitchen.yml (100%) rename {windows => packer_templates/windows}/cookbooks/packer/libraries/windows_helper.rb (100%) rename {windows => packer_templates/windows}/cookbooks/packer/metadata.rb (100%) rename {windows => packer_templates/windows}/cookbooks/packer/recipes/cleanup.rb (100%) rename {windows => packer_templates/windows}/cookbooks/packer/recipes/defrag.rb (100%) rename {windows => packer_templates/windows}/cookbooks/packer/recipes/disable_hibernation.rb (100%) rename {windows => packer_templates/windows}/cookbooks/packer/recipes/disable_onedrive.rb (100%) rename {windows => packer_templates/windows}/cookbooks/packer/recipes/disable_restore.rb (100%) rename {windows => packer_templates/windows}/cookbooks/packer/recipes/disable_uac.rb (100%) rename {windows => packer_templates/windows}/cookbooks/packer/recipes/disable_windows_update.rb (100%) rename {windows => packer_templates/windows}/cookbooks/packer/recipes/enable_file_sharing.rb (100%) rename {windows => packer_templates/windows}/cookbooks/packer/recipes/enable_remote_desktop.rb (100%) rename {windows => packer_templates/windows}/cookbooks/packer/recipes/features.rb (100%) rename {windows => packer_templates/windows}/cookbooks/packer/recipes/power.rb (100%) rename {windows => packer_templates/windows}/cookbooks/packer/recipes/remove_defender.rb (100%) rename {windows => packer_templates/windows}/cookbooks/packer/recipes/set_local_account_token_filter_policy.rb (100%) rename {windows => packer_templates/windows}/cookbooks/packer/recipes/ui_tweaks.rb (100%) rename {windows => packer_templates/windows}/cookbooks/packer/recipes/updates.rb (100%) rename {windows => packer_templates/windows}/cookbooks/packer/recipes/vm_tools.rb (100%) rename {windows => packer_templates/windows}/cookbooks/packer/resources/zipfile.rb (100%) rename {windows => packer_templates/windows}/scripts/base_setup.ps1 (100%) rename {windows => packer_templates/windows}/scripts/cleanup.ps1 (100%) rename {windows => packer_templates/windows}/scripts/oracle.cer (100%) rename {windows => packer_templates/windows}/vagrantfile-windows.template (100%) create mode 100644 test_templates/bootstrap.sh.erb create mode 100644 test_templates/kitchen.yml.erb diff --git a/.travis.yml b/.travis.yml index 123985029..7ea3c90ba 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,7 +4,7 @@ cache: bundler env: global: - - PACKER_VERSION="1.3.4" + - PACKER_VERSION="1.3.5" - PATH=$HOME/bin:$PATH rvm: diff --git a/Gemfile b/Gemfile index 2c1132169..817c65b79 100644 --- a/Gemfile +++ b/Gemfile @@ -1,3 +1,8 @@ source "https://rubygems.org" -gem "bento-ya" +group :development do + gem "chefstyle" + gem "rake", ">= 12" + gem "mixlib-shellout", ">= 2.3.2" + gem "vagrant_cloud", "~> 2.0" +end diff --git a/bin/bento b/bin/bento new file mode 100755 index 000000000..aaef099cc --- /dev/null +++ b/bin/bento @@ -0,0 +1,15 @@ +#!/usr/bin/env ruby +Signal.trap("INT") { exit 1 } + +$stdout.sync = true +$stderr.sync = true + +$LOAD_PATH.unshift File.join(__dir__, %w{.. lib}) +require "bento/cli" + +begin + Runner.new(Options.parse(ARGV)).start +rescue => ex + warn ">>> #{ex.message}" + exit(($CHILD_STATUS && $CHILD_STATUS.exitstatus) || 99) +end diff --git a/lib/bento.rb b/lib/bento.rb new file mode 100644 index 000000000..572e1b141 --- /dev/null +++ b/lib/bento.rb @@ -0,0 +1,2 @@ +require "bento/common" +require "bento/version" diff --git a/lib/bento/build.rb b/lib/bento/build.rb new file mode 100644 index 000000000..36eafc295 --- /dev/null +++ b/lib/bento/build.rb @@ -0,0 +1,97 @@ +require "bento/common" +require "bento/buildmetadata" +require "bento/providermetadata" +require "bento/packerexec" + +class BuildRunner + include Common + include PackerExec + + attr_reader :template_files, :config, :dry_run, :debug, :only, :except, :mirror, :headed, :single, + :override_version, :build_timestamp, :cpus, :mem + + def initialize(opts) + @template_files = opts.template_files + @config = opts.config ||= false + @dry_run = opts.dry_run + @debug = opts.debug + @only = opts.only ||= "parallels-iso,virtualbox-iso,vmware-iso" + @except = opts.except + @mirror = opts.mirror + @headed = opts.headed ||= false + @single = opts.single ||= false + @override_version = opts.override_version + @build_timestamp = Time.now.gmtime.strftime("%Y%m%d%H%M%S") + @cpus = opts.cpus + @mem = opts.mem + end + + def start + templates = config ? build_list : template_files + banner("Starting build for templates:") + templates.each { |t| puts "- #{t}" } + time = Benchmark.measure do + templates.each { |template| build(template) } + end + banner("Build finished in #{duration(time.real)}.") + end + + private + + def build(file) + bento_dir = Dir.pwd + dir = File.dirname(file) + template = File.basename(file) + Dir.chdir dir + for_packer_run_with(template) do |md_file, _var_file| + cmd = packer_build_cmd(template, md_file.path) + banner("[#{template}] Building: '#{cmd.join(' ')}'") + time = Benchmark.measure do + system(*cmd) || raise("[#{template}] Error building, exited #{$CHILD_STATUS}") + end + write_final_metadata(template, time.real.ceil) + banner("[#{template}] Finished building in #{duration(time.real)}.") + end + Dir.chdir(bento_dir) + end + + def packer_build_cmd(template, var_file) + vars = "#{template}.variables.json" + cmd = %W{packer build -var-file=#{var_file} #{template}.json} + cmd.insert(2, "-var-file=#{vars}") if File.exist?(vars) + cmd.insert(2, "-only=#{only}") + cmd.insert(2, "-except=#{except}") if except + # Build the command line in the correct order and without spaces as future input for the splat operator. + cmd.insert(2, "cpus=#{cpus}") if cpus + cmd.insert(2, "-var") if cpus + cmd.insert(2, "memory=#{mem}") if mem + cmd.insert(2, "-var") if mem + cmd.insert(2, "mirror=#{mirror}") if mirror + cmd.insert(2, "-var") if mirror + cmd.insert(2, "headless=true") unless headed + cmd.insert(2, "-var") unless headed + cmd.insert(2, "-parallel=false") if single + cmd.insert(2, "-debug") if debug + cmd.insert(0, "echo") if dry_run + cmd + end + + def write_final_metadata(template, buildtime) + md = BuildMetadata.new(template, build_timestamp, override_version).read + path = File.join("../builds") + filename = File.join(path, "#{md[:box_basename]}.metadata.json") + md[:providers] = ProviderMetadata.new(path, md[:box_basename]).read + md[:providers].each do |p| + p[:build_time] = buildtime + p[:build_cpus] = cpus unless cpus.nil? + p[:build_mem] = mem unless mem.nil? + end + + if dry_run + banner("(Dry run) Metadata file contents would be something similar to:") + puts JSON.pretty_generate(md) + else + File.open(filename, "wb") { |file| file.write(JSON.pretty_generate(md)) } + end + end +end diff --git a/lib/bento/buildmetadata.rb b/lib/bento/buildmetadata.rb new file mode 100644 index 000000000..bfbf2b376 --- /dev/null +++ b/lib/bento/buildmetadata.rb @@ -0,0 +1,83 @@ +require "bento/common" +require "mixlib/shellout" + +class BuildMetadata + include Common + + def initialize(template, build_timestamp, override_version) + @template = template + @build_timestamp = build_timestamp + @override_version = override_version + end + + def read + { + name: name, + version: version, + build_timestamp: build_timestamp, + git_revision: git_revision, + git_status: git_clean? ? "clean" : "dirty", + box_basename: box_basename, + template: template_vars.fetch("template", UNKNOWN), + packer: packer_ver, + vagrant: vagrant_ver, + } + end + + private + + UNKNOWN = "__unknown__".freeze + + attr_reader :template, :build_timestamp, :override_version + + def box_basename + "#{name.gsub("/", "__")}-#{version}" + end + + def git_revision + `git rev-parse HEAD`.strip + end + + def git_clean? + `git status --porcelain`.strip.empty? + end + + def merged_vars + @merged_vars ||= begin + if File.exist?("#{template}.variables.json") + template_vars.merge(JSON.load(IO.read("#{template}.variables.json"))) + else + template_vars + end + end + end + + def name + merged_vars.fetch("name", template) + end + + def template_vars + @template_vars ||= JSON.load(IO.read("#{template}.json")).fetch("variables") + end + + def version + override_version || merged_vars.fetch("version", "#{UNKNOWN}.TIMESTAMP") + .rpartition(".").first.concat(build_timestamp.to_s) + end + + def packer_ver + cmd = Mixlib::ShellOut.new("packer --version") + cmd.run_command + cmd.stdout.split("\n")[0] + end + + def vagrant_ver + if ENV["TRAVIS"] + "travis" + else + cmd = Mixlib::ShellOut.new("vagrant --version") + cmd.run_command + cmd.stdout.split(" ")[1] + end + end +end diff --git a/lib/bento/cli.rb b/lib/bento/cli.rb new file mode 100644 index 000000000..05c313dad --- /dev/null +++ b/lib/bento/cli.rb @@ -0,0 +1,228 @@ +require "optparse" +require "ostruct" + +require "bento/common" +require "bento/build" +require "bento/delete" +require "bento/normalize" +require "bento/release" +require "bento/revoke" +require "bento/test" +require "bento/upload" + +class Options + NAME = File.basename($PROGRAM_NAME).freeze + + def self.parse(args) + options = OpenStruct.new + options.template_files = calculate_templates("packer_templates/**/*.json") + + global = OptionParser.new do |opts| + opts.banner = "Usage: #{NAME} [SUBCOMMAND [options]]" + opts.separator "" + opts.separator <<-COMMANDS.gsub(/^ {8}/, "") + build : build one or more templates + help : prints this help message + list : list all templates in project + normalize : normalize one or more templates + test : test one or more builds with kitchen + upload : upload one or more builds to Vagrant Cloud and S3 + release : release a version of a box on Vagrant Cloud + revoke : revoke a version of a box on Vagrant Cloud + delete : delete a version of a box from Vagrant Cloud + COMMANDS + end + + # @tas50: commenting this out since it's unused 11/30/2018 + # platforms_argv_proc = proc { |opts| + # opts.platforms = builds["public"] unless args.empty? + # } + + templates_argv_proc = proc { |opts| + opts.template_files = calculate_templates(args) unless args.empty? + + opts.template_files.each do |t| + unless File.exist?("#{t}.json") + warn "File #{t}.json does not exist for template '#{t}'" + exit(1) + end + end + } + + box_version_argv_proc = proc { |opts| + opts.box = ARGV[0] + opts.version = ARGV[1] + } + + md_json_argv_proc = proc { |opts| + opts.md_json = ARGV[0] + } + + subcommand = { + help: { + parser: OptionParser.new {}, + argv: proc { |_opts| + puts global + exit(0) + }, + }, + build: { + class: BuildRunner, + parser: OptionParser.new do |opts| + opts.banner = "Usage: #{NAME} build [options] TEMPLATE[ TEMPLATE ...]" + + opts.on("-n", "--dry-run", "Dry run (what would happen)") do |opt| + options.dry_run = opt + end + + opts.on("-c BUILD_YML", "--config BUILD_YML", "Use a configuration file") do |opt| + options.config = opt + end + + opts.on("-d", "--[no-]debug", "Run packer with debug output") do |opt| + options.debug = opt + end + + opts.on("-o BUILDS", "--only BUILDS", "Only build some Packer builds (ex: parallels-iso,virtualbox-iso,vmware-iso)") do |opt| + options.only = opt + end + + opts.on("-e BUILDS", "--except BUILDS", "Build all Packer builds except these (ex: parallels-iso,virtualbox-iso,vmware-iso)") do |opt| + options.except = opt + end + + opts.on("-m MIRROR", "--mirror MIRROR", "Look for isos at MIRROR") do |opt| + options.mirror = opt + end + + opts.on("-C cpus", "--cpus CPUS", "# of CPUs per provider") do |opt| + options.cpus = opt + end + + opts.on("-M MEMORY", "--memory MEMORY", "Memory (MB) per provider") do |opt| + options.mem = opt + end + + opts.on("-H", "--headed", "Display provider UI windows") do |opt| + options.headed = opt + end + + opts.on("-S", "--single", "Disable parallelization of Packer builds") do |opt| + options.single = opt + end + + opts.on("-v VERSION", "--version VERSION", "Override the version set in the template") do |opt| + options.override_version = opt + end + end, + argv: templates_argv_proc, + }, + list: { + class: ListRunner, + parser: OptionParser.new do |opts| + opts.banner = "Usage: #{NAME} list [TEMPLATE ...]" + end, + argv: templates_argv_proc, + }, + normalize: { + class: NormalizeRunner, + parser: OptionParser.new do |opts| + opts.banner = "Usage: #{NAME} normalize TEMPLATE[ TEMPLATE ...]" + + opts.on("-d", "--[no-]debug", "Run packer with debug output") do |opt| + options.debug = opt + end + end, + argv: templates_argv_proc, + }, + test: { + class: TestRunner, + parser: OptionParser.new do |opts| + opts.banner = "Usage: #{NAME} test [options]" + + opts.on("--no-shared-folder", "Disable shared folder testing") do |opt| + options.no_shared = opt + end + + opts.on("-p", "--provisioner PROVISIONER", "Use a specfic provisioner") do |opt| + options.provisioner = opt + end + end, + argv: proc {}, + }, + upload: { + class: UploadRunner, + parser: OptionParser.new do |opts| + opts.banner = "Usage: #{NAME} upload" + end, + argv: md_json_argv_proc, + }, + release: { + class: ReleaseRunner, + parser: OptionParser.new do |opts| + opts.banner = "Usage: #{NAME} release BOX VERSION" + end, + argv: box_version_argv_proc, + }, + revoke: { + class: RevokeRunner, + parser: OptionParser.new do |opts| + opts.banner = "Usage: #{NAME} revoke BOX VERSION" + end, + argv: box_version_argv_proc, + }, + delete: { + class: DeleteRunner, + parser: OptionParser.new do |opts| + opts.banner = "Usage: #{NAME} delete BOX VERSION" + end, + argv: box_version_argv_proc, + }, + } + + global.order! + command = args.empty? ? :help : ARGV.shift.to_sym + subcommand.fetch(command).fetch(:parser).order! + subcommand.fetch(command).fetch(:argv).call(options) + + options.command = command + options.klass = subcommand.fetch(command).fetch(:class) + + options + end + + def self.calculate_templates(globs) + Array(globs) + .map { |glob| result = Dir.glob(glob); result.empty? ? glob : result } + .flatten + .sort + .delete_if { |file| file =~ /\.(variables||metadata)\.json/ } + .map { |template| template.sub(/\.json$/, "") } + end +end + +class ListRunner + include Common + + attr_reader :templates + + def initialize(opts) + @templates = opts.template_files + end + + def start + templates.each { |template| puts template } + end +end + +class Runner + attr_reader :options + + def initialize(options) + @options = options + end + + def start + options.klass.new(options).start + end +end diff --git a/lib/bento/common.rb b/lib/bento/common.rb new file mode 100644 index 000000000..bb692c9df --- /dev/null +++ b/lib/bento/common.rb @@ -0,0 +1,102 @@ +require "benchmark" +require "fileutils" +require "json" +require "tempfile" +require "yaml" +require "vagrant_cloud" + +MEGABYTE = 1024.0 * 1024.0 + +module Common + def vc_account + raise "You must set the 'VAGRANT_CLOUD_ORG' and 'VAGRANT_CLOUD_TOKEN' tokens to interact with the Vagrant Cloud!" unless ENV["VAGRANT_CLOUD_ORG"] && ENV["VAGRANT_CLOUD_TOKEN"] + VagrantCloud::Account.new(ENV["VAGRANT_CLOUD_ORG"], ENV["VAGRANT_CLOUD_TOKEN"]) + end + + def banner(msg) + puts "==> #{msg}" + end + + def info(msg) + puts " #{msg}" + end + + def warn(msg) + puts ">>> #{msg}" + end + + def duration(total) + total = 0 if total.nil? + minutes = (total / 60).to_i + seconds = (total - (minutes * 60)) + format("%dm%.2fs", minutes, seconds) + end + + def box_metadata(metadata_file) + metadata = {} + file = File.read(metadata_file) + json = JSON.parse(file) + + # metadata needed for upload: boxname, version, provider, box filename + metadata["name"] = json["name"] + metadata["version"] = json["version"] + metadata["box_basename"] = json["box_basename"] + metadata["tools"] = json["tools"] + metadata["providers"] = {} + json["providers"].each do |provider| + metadata["providers"][provider["name"]] = provider.reject { |k, _| k == "name" } + end + metadata + end + + def metadata_files + @metadata_files ||= Dir.glob("builds/*.json") + end + + def builds_yml + YAML.load(File.read("builds.yml")) + end + + def build_list + bit32 = [] + bit64 = [] + builds_yml["public"].each do |platform, versions| + versions.each do |version, archs| + archs.each do |arch| + folder = case platform + when "opensuse-leap" + "opensuse" + when "oracle" + "oraclelinux" + else + platform + end + case arch + when "i386" + bit32 << "#{folder}/#{platform}-#{version}-#{arch}" + else + bit64 << "#{folder}/#{platform}-#{version}-#{arch}" + end + end + end + end + bit64 + bit32 + end + + def private_box?(boxname) + proprietary_os_list = %w{macos windows sles solaris rhel} + proprietary_os_list.any? { |p| boxname.include?(p) } + end + + def macos? + !!(RUBY_PLATFORM =~ /darwin/) + end + + def unix? + !windows? + end + + def windows? + !!(RUBY_PLATFORM =~ /mswin|mingw|windows/) + end +end diff --git a/lib/bento/delete.rb b/lib/bento/delete.rb new file mode 100644 index 000000000..fdf50ada0 --- /dev/null +++ b/lib/bento/delete.rb @@ -0,0 +1,22 @@ +require "bento/common" + +class DeleteRunner + include Common + + attr_reader :box, :version + + def initialize(opts) + @box = opts.box + @version = opts.version + end + + def start + banner("Starting Delete...") + time = Benchmark.measure do + box = vc_account.get_box(box) + version = box.get_version(version) + version.delete + end + banner("Delete finished in #{duration(time.real)}.") + end +end diff --git a/lib/bento/normalize.rb b/lib/bento/normalize.rb new file mode 100644 index 000000000..ffb7b5487 --- /dev/null +++ b/lib/bento/normalize.rb @@ -0,0 +1,85 @@ +require "bento/common" + +class NormalizeRunner + include Common + include PackerExec + + attr_reader :templates, :build_timestamp, :debug, :override_version + + def initialize(opts) + @templates = opts.template_files + @debug = opts.debug + @modified = [] + @build_timestamp = Time.now.gmtime.strftime("%Y%m%d%H%M%S") + end + + def start + banner("Normalizing for templates:") + templates.each { |t| puts "- #{t}" } + time = Benchmark.measure do + templates.each do |file| + bento_dir = Dir.pwd + dir = File.dirname(file) + template = File.basename(file) + Dir.chdir dir + validate(template) + Dir.chdir(bento_dir) + end + end + unless @modified.empty? + info("") + info("The following templates were modified:") + @modified.sort.each { |template| info(" * #{template}") } + end + banner("Normalizing finished in #{duration(time.real)}.") + end + + private + + def checksum(file) + Digest::MD5.file(file).hexdigest + end + + def fix(template) + file = "#{template}.json" + + banner("[#{template}] Fixing") + original_checksum = checksum(file) + output = `packer fix #{file}` + raise "[#{template}] Error fixing, exited #{$CHILD_STATUS}" if $CHILD_STATUS.exitstatus != 0 + + # preserve ampersands in shell commands, + # see: https://github.com/mitchellh/packer/issues/784 + output.gsub!("\\u0026", "&") + File.open(file, "wb") { |dest| dest.write(output) } + fixed_checksum = checksum(file) + + if original_checksum == fixed_checksum + puts("No changes made.") + else + warn("Template #{template} has been modified.") + @modified << template + end + end + + def packer_validate_cmd(template, var_file) + vars = "#{template}.variables.json" + cmd = %W{packer validate -var-file=#{var_file} #{template}.json} + cmd.insert(2, "-var-file=#{vars}") if File.exist?(vars) + cmd + end + + def validate(template) + for_packer_run_with(template) do |md_file, var_file| + cmd = packer_validate_cmd(template, var_file.path) + banner("[#{template}] Validating: '#{cmd.join(' ')}'") + if debug + banner("[#{template}] DEBUG: var_file(#{var_file.path}) is:") + puts IO.read(var_file.path) + banner("[#{template}] DEBUG: md_file(#{md_file.path}) is:") + puts IO.read(md_file.path) + end + system(*cmd) || raise("[#{template}] Error validating, exited #{$CHILD_STATUS}") + end + end +end diff --git a/lib/bento/packerexec.rb b/lib/bento/packerexec.rb new file mode 100644 index 000000000..8fbd7bba6 --- /dev/null +++ b/lib/bento/packerexec.rb @@ -0,0 +1,30 @@ +module PackerExec + def for_packer_run_with(template) + Tempfile.open("#{template}-metadata.json") do |md_file| + Tempfile.open("#{template}-metadata-var-file") do |var_file| + write_box_metadata(template, md_file) + write_var_file(template, md_file, var_file) + yield md_file, var_file + end + end + end + + def write_box_metadata(template, io) + md = BuildMetadata.new(template, build_timestamp, override_version).read + io.write(JSON.pretty_generate(md)) + io.close + end + + def write_var_file(template, md_file, io) + md = BuildMetadata.new(template, build_timestamp, override_version).read + + io.write(JSON.pretty_generate({ + box_basename: md[:box_basename], + build_timestamp: md[:build_timestamp], + git_revision: md[:git_revision], + metadata: md_file.path, + version: md[:version], + })) + io.close + end +end diff --git a/lib/bento/providermetadata.rb b/lib/bento/providermetadata.rb new file mode 100644 index 000000000..d050d7ed2 --- /dev/null +++ b/lib/bento/providermetadata.rb @@ -0,0 +1,84 @@ +require "digest" +require "bento/common" + +class ProviderMetadata + include Common + + def initialize(path, box_basename) + @base = File.join(path, box_basename) + end + + def read + Dir.glob("#{base}.*.box").map do |file| + { + name: provider_from_file(file), + version: version(provider_from_file(file)), + file: "#{File.basename(file)}", + checksum_type: "sha256", + checksum: shasum(file), + size: "#{size_in_mb(file)} MB", + } + end + end + + private + + attr_reader :base + + def provider_from_file(file) + provider = file.sub(/^.*\.([^.]+)\.box$/, '\1') + if provider == "vmware" + "vmware_desktop" + else + provider + end + end + + def shasum(file) + Digest::SHA256.file(file).hexdigest + end + + def size_in_mb(file) + size = File.size(file) + size_mb = size / MEGABYTE + size_mb.ceil.to_s + end + + def version(provider) + case provider + when /vmware/ + ver_vmware + when /virtualbox/ + ver_vbox + when /parallels/ + ver_parallels + end + end + + def ver_vmware + if macos? + path = File.join('/Applications/VMware\ Fusion.app/Contents/Library') + fusion_cmd = File.join(path, "vmware-vmx -v") + cmd = Mixlib::ShellOut.new(fusion_cmd) + cmd.run_command + cmd.stderr.split(" ")[5] + else + cmd = Mixlib::ShellOut.new("vmware --version") + cmd.run_command + cmd.stdout.split(" ")[2] + end + end + + def ver_parallels + raise "Platform is not macOS, exiting..." unless macos? + cmd = Mixlib::ShellOut.new("prlctl --version") + cmd.run_command + cmd.stdout.split(" ")[2] + end + + def ver_vbox + cmd = Mixlib::ShellOut.new("VBoxManage --version") + cmd.run_command + cmd.stdout.split("r")[0] + end +end diff --git a/lib/bento/release.rb b/lib/bento/release.rb new file mode 100644 index 000000000..d6e8bf9c3 --- /dev/null +++ b/lib/bento/release.rb @@ -0,0 +1,22 @@ +require "bento/common" + +class ReleaseRunner + include Common + + attr_reader :box, :version + + def initialize(opts) + @box = opts.box + @version = opts.version + end + + def start + banner("Releasing #{box}/#{version}...") + time = Benchmark.measure do + b = vc_account.get_box(box) + v = b.get_version(version) + v.release + end + banner("Release finished in #{duration(time.real)}.") + end +end diff --git a/lib/bento/revoke.rb b/lib/bento/revoke.rb new file mode 100644 index 000000000..9e9a0cf2a --- /dev/null +++ b/lib/bento/revoke.rb @@ -0,0 +1,22 @@ +require "bento/common" + +class RevokeRunner + include Common + + attr_reader :box, :version + + def initialize(opts) + @box = opts.box + @version = opts.version + end + + def start + banner("Revoking #{box}/#{version}...") + time = Benchmark.measure do + box = vc_account.get_box(box) + version = box.get_version(version) + version.revoke + end + banner("Revoke finished in #{duration(time.real)}.") + end +end diff --git a/lib/bento/test.rb b/lib/bento/test.rb new file mode 100644 index 000000000..ba88e0b00 --- /dev/null +++ b/lib/bento/test.rb @@ -0,0 +1,60 @@ +require "bento/common" +require "mixlib/shellout" +require "erb" + +class TestRunner + include Common + + attr_reader :shared_folder, :boxname, :provider, :box_url, :no_shared, :provisioner + + def initialize(opts) + @debug = opts.debug + @no_shared = opts.no_shared + @provisioner = opts.provisioner.nil? ? "shell" : opts.provisioner + end + + def start + banner("Starting testing...") + time = Benchmark.measure do + metadata_files.each do |metadata_file| + destroy_all_bento + test_box(metadata_file) + destroy_all_bento + end + end + banner("Testing finished in #{duration(time.real)}.") + end + + private + + def destroy_all_bento + cmd = Mixlib::ShellOut.new("vagrant box list | grep 'bento-'") + cmd.run_command + boxes = cmd.stdout.split("\n") + + boxes.each do |box| + b = box.split(" ") + rm_cmd = Mixlib::ShellOut.new("vagrant box remove --force #{b[0]} --provider #{b[1].to_s.gsub(/(,|\()/, '')}") + banner("Removing #{b[0]} for provider #{b[1].to_s.gsub(/(,|\()/, '')}") + rm_cmd.run_command + end + end + + def test_box(md_json) + md = box_metadata(md_json) + @boxname = md["name"] + @providers = md["providers"] + @share_disabled = no_shared || /(bsd|opensuse)/.match(boxname) ? true : false + + dir = "#{File.expand_path("../../", File.dirname(__FILE__))}/templates" + %w{.kitchen.yml bootstrap.sh}.each do |file| + t = file =~ /kitchen/ ? "kitchen.yml.erb" : "#{file}.erb" + erb = ERB.new(File.read(dir + "/#{t}"), nil, "-").result(binding) + File.open(file, "w") { |f| f.puts erb } + end + + test = Mixlib::ShellOut.new("kitchen test", timeout: 900, live_stream: STDOUT) + test.run_command + test.error! + end +end diff --git a/lib/bento/upload.rb b/lib/bento/upload.rb new file mode 100644 index 000000000..e19f90871 --- /dev/null +++ b/lib/bento/upload.rb @@ -0,0 +1,49 @@ +require "bento/common" + +class UploadRunner + include Common + + attr_reader :md_json + + def initialize(opts) + @md_json = opts.md_json + end + + def start + banner("Starting uploads...") + time = Benchmark.measure do + files = md_json ? [md_json] : metadata_files + files.each do |md_file| + upload(md_file) + end + end + banner("Uploads finished in #{duration(time.real)}.") + end + + def upload(md_file) + puts "Attempting to upload #{md_file}" + md = box_metadata(md_file) + box_desc = "a bento box for #{md['name']}" + box = vc_account.ensure_box(md["name"], {short_description: box_desc, is_private: private_box?(md["name"])}) + box_ver = box.ensure_version(md["version"], File.read(md_file)) + + if builds_yml["slugs"].value?(box.name) + slug_desc = "a bento box for #{builds_yml['slugs'].key(box.name)}" + slug = vc_account.ensure_box(builds_yml["slugs"].key(box.name), {short_description: slug_desc, is_private: false}) + slug_ver = slug.ensure_version(md["version"], File.read(md_file)) + end + + md["providers"].each do |k, v| + provider = box_ver.ensure_provider(k, nil) + banner("Uploading #{box.name}/#{box_ver.version}/#{provider.name}...") + provider.upload_file("builds/#{v['file']}") + banner(provider.download_url.to_s) + next unless builds_yml["slugs"].value?(box.name) + + slug_provider = slug_ver.ensure_provider(k, nil) + banner("Uploading #{slug.name}/#{slug_ver.version}/#{slug_provider.name}...") + slug_provider.upload_file("builds/#{v['file']}") + banner(slug_provider.download_url.to_s) + end + end +end diff --git a/lib/bento/version.rb b/lib/bento/version.rb new file mode 100644 index 000000000..8e8ba24da --- /dev/null +++ b/lib/bento/version.rb @@ -0,0 +1,3 @@ +module Bento + VERSION = "1.4.0".freeze +end diff --git a/_common/metadata.sh b/packer_templates/_common/metadata.sh similarity index 100% rename from _common/metadata.sh rename to packer_templates/_common/metadata.sh diff --git a/_common/minimize.sh b/packer_templates/_common/minimize.sh similarity index 100% rename from _common/minimize.sh rename to packer_templates/_common/minimize.sh diff --git a/_common/parallels.sh b/packer_templates/_common/parallels.sh similarity index 100% rename from _common/parallels.sh rename to packer_templates/_common/parallels.sh diff --git a/_common/sshd.sh b/packer_templates/_common/sshd.sh similarity index 100% rename from _common/sshd.sh rename to packer_templates/_common/sshd.sh diff --git a/_common/vagrant.sh b/packer_templates/_common/vagrant.sh similarity index 100% rename from _common/vagrant.sh rename to packer_templates/_common/vagrant.sh diff --git a/_common/virtualbox.sh b/packer_templates/_common/virtualbox.sh similarity index 100% rename from _common/virtualbox.sh rename to packer_templates/_common/virtualbox.sh diff --git a/_common/vmware.sh b/packer_templates/_common/vmware.sh similarity index 100% rename from _common/vmware.sh rename to packer_templates/_common/vmware.sh diff --git a/builds/.gitkeep b/packer_templates/builds/.gitkeep similarity index 100% rename from builds/.gitkeep rename to packer_templates/builds/.gitkeep diff --git a/centos/centos-5.11-i386.json b/packer_templates/centos/centos-5.11-i386.json similarity index 100% rename from centos/centos-5.11-i386.json rename to packer_templates/centos/centos-5.11-i386.json diff --git a/centos/centos-5.11-x86_64.json b/packer_templates/centos/centos-5.11-x86_64.json similarity index 100% rename from centos/centos-5.11-x86_64.json rename to packer_templates/centos/centos-5.11-x86_64.json diff --git a/centos/centos-6.10-i386.json b/packer_templates/centos/centos-6.10-i386.json similarity index 100% rename from centos/centos-6.10-i386.json rename to packer_templates/centos/centos-6.10-i386.json diff --git a/centos/centos-6.10-x86_64.json b/packer_templates/centos/centos-6.10-x86_64.json similarity index 100% rename from centos/centos-6.10-x86_64.json rename to packer_templates/centos/centos-6.10-x86_64.json diff --git a/centos/centos-7.6-x86_64.json b/packer_templates/centos/centos-7.6-x86_64.json similarity index 100% rename from centos/centos-7.6-x86_64.json rename to packer_templates/centos/centos-7.6-x86_64.json diff --git a/centos/http/5/ks.cfg b/packer_templates/centos/http/5/ks.cfg similarity index 100% rename from centos/http/5/ks.cfg rename to packer_templates/centos/http/5/ks.cfg diff --git a/centos/http/6/ks.cfg b/packer_templates/centos/http/6/ks.cfg similarity index 100% rename from centos/http/6/ks.cfg rename to packer_templates/centos/http/6/ks.cfg diff --git a/centos/http/7/ks.cfg b/packer_templates/centos/http/7/ks.cfg similarity index 100% rename from centos/http/7/ks.cfg rename to packer_templates/centos/http/7/ks.cfg diff --git a/centos/scripts/cleanup.sh b/packer_templates/centos/scripts/cleanup.sh similarity index 100% rename from centos/scripts/cleanup.sh rename to packer_templates/centos/scripts/cleanup.sh diff --git a/centos/scripts/enable_vault.sh b/packer_templates/centos/scripts/enable_vault.sh similarity index 100% rename from centos/scripts/enable_vault.sh rename to packer_templates/centos/scripts/enable_vault.sh diff --git a/centos/scripts/networking.sh b/packer_templates/centos/scripts/networking.sh similarity index 100% rename from centos/scripts/networking.sh rename to packer_templates/centos/scripts/networking.sh diff --git a/centos/scripts/update.sh b/packer_templates/centos/scripts/update.sh similarity index 100% rename from centos/scripts/update.sh rename to packer_templates/centos/scripts/update.sh diff --git a/debian/debian-8.11-amd64.json b/packer_templates/debian/debian-8.11-amd64.json similarity index 100% rename from debian/debian-8.11-amd64.json rename to packer_templates/debian/debian-8.11-amd64.json diff --git a/debian/debian-8.11-i386.json b/packer_templates/debian/debian-8.11-i386.json similarity index 100% rename from debian/debian-8.11-i386.json rename to packer_templates/debian/debian-8.11-i386.json diff --git a/packer_templates/debian/debian-9.9-amd64.json b/packer_templates/debian/debian-9.9-amd64.json new file mode 100644 index 000000000..f0bf413fd --- /dev/null +++ b/packer_templates/debian/debian-9.9-amd64.json @@ -0,0 +1,240 @@ +{ + "builders": [ + { + "boot_command": [ + "<esc><wait>", + "install <wait>", + " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}} <wait>", + "debian-installer=en_US.UTF-8 <wait>", + "auto <wait>", + "locale=en_US.UTF-8 <wait>", + "kbd-chooser/method=us <wait>", + "keyboard-configuration/xkb-keymap=us <wait>", + "netcfg/get_hostname={{ .Name }} <wait>", + "netcfg/get_domain=vagrantup.com <wait>", + "fb=false <wait>", + "debconf/frontend=noninteractive <wait>", + "console-setup/ask_detect=false <wait>", + "console-keymaps-at/keymap=us <wait>", + "grub-installer/bootdev=/dev/sda <wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": "{{user `disk_size`}}", + "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "guest_os_type": "Debian_64", + "hard_drive_interface": "sata", + "headless": "{{ user `headless` }}", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "../builds/packer-{{user `template`}}-virtualbox", + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "virtualbox-iso", + "vboxmanage": [ + [ + "modifyvm", + "{{.Name}}", + "--memory", + "{{ user `memory` }}" + ], + [ + "modifyvm", + "{{.Name}}", + "--cpus", + "{{ user `cpus` }}" + ] + ], + "virtualbox_version_file": ".vbox_version", + "vm_name": "{{ user `template` }}" + }, + { + "boot_command": [ + "<esc><wait>", + "install <wait>", + " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}} <wait>", + "debian-installer=en_US.UTF-8 <wait>", + "auto <wait>", + "locale=en_US.UTF-8 <wait>", + "kbd-chooser/method=us <wait>", + "keyboard-configuration/xkb-keymap=us <wait>", + "netcfg/get_hostname={{ .Name }} <wait>", + "netcfg/get_domain=vagrantup.com <wait>", + "fb=false <wait>", + "debconf/frontend=noninteractive <wait>", + "console-setup/ask_detect=false <wait>", + "console-keymaps-at/keymap=us <wait>", + "grub-installer/bootdev=/dev/sda <wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": "{{user `disk_size`}}", + "guest_os_type": "debian8-64", + "headless": "{{ user `headless` }}", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "../builds/packer-{{user `template`}}-vmware", + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "tools_upload_flavor": "linux", + "type": "vmware-iso", + "vm_name": "{{ user `template` }}", + "vmx_data": { + "cpuid.coresPerSocket": "1", + "ethernet0.pciSlotNumber": "32", + "memsize": "{{ user `memory` }}", + "numvcpus": "{{ user `cpus` }}" + }, + "vmx_remove_ethernet_interfaces": true + }, + { + "boot_command": [ + "<esc><wait>", + "install <wait>", + " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}} <wait>", + "debian-installer=en_US.UTF-8 <wait>", + "auto <wait>", + "locale=en_US.UTF-8 <wait>", + "kbd-chooser/method=us <wait>", + "keyboard-configuration/xkb-keymap=us <wait>", + "netcfg/get_hostname={{ .Name }} <wait>", + "netcfg/get_domain=vagrantup.com <wait>", + "fb=false <wait>", + "debconf/frontend=noninteractive <wait>", + "console-setup/ask_detect=false <wait>", + "console-keymaps-at/keymap=us <wait>", + "grub-installer/bootdev=/dev/sda <wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": "{{user `disk_size`}}", + "guest_os_type": "debian", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "../builds/packer-{{user `template`}}-parallels", + "parallels_tools_flavor": "lin", + "prlctl": [ + [ + "set", + "{{.Name}}", + "--memsize", + "{{ user `memory` }}" + ], + [ + "set", + "{{.Name}}", + "--cpus", + "{{ user `cpus` }}" + ] + ], + "prlctl_version_file": ".prlctl_version", + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "parallels-iso", + "vm_name": "{{ user `template` }}" + }, + { + "boot_command": [ + "<esc><wait>", + "install <wait>", + " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}} <wait>", + "debian-installer=en_US.UTF-8 <wait>", + "auto <wait>", + "locale=en_US.UTF-8 <wait>", + "kbd-chooser/method=us <wait>", + "keyboard-configuration/xkb-keymap=us <wait>", + "netcfg/get_hostname={{ .Name }} <wait>", + "netcfg/get_domain=vagrantup.com <wait>", + "fb=false <wait>", + "debconf/frontend=noninteractive <wait>", + "console-setup/ask_detect=false <wait>", + "console-keymaps-at/keymap=us <wait>", + "grub-installer/bootdev=/dev/vda <wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": "{{user `disk_size`}}", + "headless": "{{ user `headless` }}", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "../builds/packer-{{user `template`}}-qemu", + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "qemu", + "vm_name": "{{ user `template` }}" + } + ], + "post-processors": [ + { + "output": "../builds/{{user `box_basename`}}.{{.Provider}}.box", + "type": "vagrant" + } + ], + "provisioners": [ + { + "environment_vars": [ + "HOME_DIR=/home/vagrant", + "http_proxy={{user `http_proxy`}}", + "https_proxy={{user `https_proxy`}}", + "no_proxy={{user `no_proxy`}}" + ], + "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", + "expect_disconnect": true, + "scripts": [ + "scripts/update.sh", + "../_common/sshd.sh", + "scripts/networking.sh", + "scripts/sudoers.sh", + "../_common/vagrant.sh", + "scripts/systemd.sh", + "../_common/virtualbox.sh", + "../_common/vmware.sh", + "../_common/parallels.sh", + "scripts/cleanup.sh", + "../_common/minimize.sh" + ], + "type": "shell" + } + ], + "variables": { + "box_basename": "debian-9.8", + "build_timestamp": "{{isotime \"20060102150405\"}}", + "cpus": "1", + "disk_size": "65536", + "git_revision": "__unknown_git_revision__", + "headless": "", + "http_proxy": "{{env `http_proxy`}}", + "https_proxy": "{{env `https_proxy`}}", + "iso_checksum": "4de26144286993ac6f4f244ff332fdd80e11ec230906e7997aa426e775fac1fb", + "iso_checksum_type": "sha256", + "iso_name": "debian-9.9.0-amd64-netinst.iso", + "memory": "1024", + "mirror": "http://cdimage.debian.org/cdimage/release", + "mirror_directory": "9.9.0/amd64/iso-cd", + "name": "debian-9.8", + "no_proxy": "{{env `no_proxy`}}", + "preseed_path": "debian-9/preseed.cfg", + "template": "debian-9.8-amd64", + "version": "TIMESTAMP" + } +} diff --git a/packer_templates/debian/debian-9.9-i386.json b/packer_templates/debian/debian-9.9-i386.json new file mode 100644 index 000000000..259a6ca5f --- /dev/null +++ b/packer_templates/debian/debian-9.9-i386.json @@ -0,0 +1,240 @@ +{ + "builders": [ + { + "boot_command": [ + "<esc><wait>", + "install <wait>", + " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}} <wait>", + "debian-installer=en_US.UTF-8 <wait>", + "auto <wait>", + "locale=en_US.UTF-8 <wait>", + "kbd-chooser/method=us <wait>", + "keyboard-configuration/xkb-keymap=us <wait>", + "netcfg/get_hostname={{ .Name }} <wait>", + "netcfg/get_domain=vagrantup.com <wait>", + "fb=false <wait>", + "debconf/frontend=noninteractive <wait>", + "console-setup/ask_detect=false <wait>", + "console-keymaps-at/keymap=us <wait>", + "grub-installer/bootdev=/dev/sda <wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": "{{user `disk_size`}}", + "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "guest_os_type": "Debian", + "hard_drive_interface": "sata", + "headless": "{{ user `headless` }}", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "../builds/packer-{{user `template`}}-virtualbox", + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "virtualbox-iso", + "vboxmanage": [ + [ + "modifyvm", + "{{.Name}}", + "--memory", + "{{ user `memory` }}" + ], + [ + "modifyvm", + "{{.Name}}", + "--cpus", + "{{ user `cpus` }}" + ] + ], + "virtualbox_version_file": ".vbox_version", + "vm_name": "{{ user `template` }}" + }, + { + "boot_command": [ + "<esc><wait>", + "install <wait>", + " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}} <wait>", + "debian-installer=en_US.UTF-8 <wait>", + "auto <wait>", + "locale=en_US.UTF-8 <wait>", + "kbd-chooser/method=us <wait>", + "keyboard-configuration/xkb-keymap=us <wait>", + "netcfg/get_hostname={{ .Name }} <wait>", + "netcfg/get_domain=vagrantup.com <wait>", + "fb=false <wait>", + "debconf/frontend=noninteractive <wait>", + "console-setup/ask_detect=false <wait>", + "console-keymaps-at/keymap=us <wait>", + "grub-installer/bootdev=/dev/sda <wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": "{{user `disk_size`}}", + "guest_os_type": "debian8", + "headless": "{{ user `headless` }}", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "../builds/packer-{{user `template`}}-vmware", + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "tools_upload_flavor": "linux", + "type": "vmware-iso", + "vm_name": "{{ user `template` }}", + "vmx_data": { + "cpuid.coresPerSocket": "1", + "ethernet0.pciSlotNumber": "32", + "memsize": "{{ user `memory` }}", + "numvcpus": "{{ user `cpus` }}" + }, + "vmx_remove_ethernet_interfaces": true + }, + { + "boot_command": [ + "<esc><wait>", + "install <wait>", + " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}} <wait>", + "debian-installer=en_US.UTF-8 <wait>", + "auto <wait>", + "locale=en_US.UTF-8 <wait>", + "kbd-chooser/method=us <wait>", + "keyboard-configuration/xkb-keymap=us <wait>", + "netcfg/get_hostname={{ .Name }} <wait>", + "netcfg/get_domain=vagrantup.com <wait>", + "fb=false <wait>", + "debconf/frontend=noninteractive <wait>", + "console-setup/ask_detect=false <wait>", + "console-keymaps-at/keymap=us <wait>", + "grub-installer/bootdev=/dev/sda <wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": "{{user `disk_size`}}", + "guest_os_type": "debian", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "../builds/packer-{{user `template`}}-parallels", + "parallels_tools_flavor": "lin", + "prlctl": [ + [ + "set", + "{{.Name}}", + "--memsize", + "{{ user `memory` }}" + ], + [ + "set", + "{{.Name}}", + "--cpus", + "{{ user `cpus` }}" + ] + ], + "prlctl_version_file": ".prlctl_version", + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "parallels-iso", + "vm_name": "{{ user `template` }}" + }, + { + "boot_command": [ + "<esc><wait>", + "install <wait>", + " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}} <wait>", + "debian-installer=en_US.UTF-8 <wait>", + "auto <wait>", + "locale=en_US.UTF-8 <wait>", + "kbd-chooser/method=us <wait>", + "keyboard-configuration/xkb-keymap=us <wait>", + "netcfg/get_hostname={{ .Name }} <wait>", + "netcfg/get_domain=vagrantup.com <wait>", + "fb=false <wait>", + "debconf/frontend=noninteractive <wait>", + "console-setup/ask_detect=false <wait>", + "console-keymaps-at/keymap=us <wait>", + "grub-installer/bootdev=/dev/vda <wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": "{{user `disk_size`}}", + "headless": "{{ user `headless` }}", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "../builds/packer-{{user `template`}}-qemu", + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "qemu", + "vm_name": "{{ user `template` }}" + } + ], + "post-processors": [ + { + "output": "../builds/{{user `box_basename`}}.{{.Provider}}.box", + "type": "vagrant" + } + ], + "provisioners": [ + { + "environment_vars": [ + "HOME_DIR=/home/vagrant", + "http_proxy={{user `http_proxy`}}", + "https_proxy={{user `https_proxy`}}", + "no_proxy={{user `no_proxy`}}" + ], + "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", + "expect_disconnect": true, + "scripts": [ + "scripts/update.sh", + "../_common/sshd.sh", + "scripts/networking.sh", + "scripts/sudoers.sh", + "../_common/vagrant.sh", + "scripts/systemd.sh", + "../_common/virtualbox.sh", + "../_common/vmware.sh", + "../_common/parallels.sh", + "scripts/cleanup.sh", + "../_common/minimize.sh" + ], + "type": "shell" + } + ], + "variables": { + "box_basename": "debian-9.8-i386", + "build_timestamp": "{{isotime \"20060102150405\"}}", + "cpus": "1", + "disk_size": "65536", + "git_revision": "__unknown_git_revision__", + "headless": "", + "http_proxy": "{{env `http_proxy`}}", + "https_proxy": "{{env `https_proxy`}}", + "iso_checksum": "44dc843e39ab0b24dd6aa552bb93acd66c08cb3c95e64c614532d95db531a8c1", + "iso_checksum_type": "sha256", + "iso_name": "debian-9.9.0-i386-netinst.iso", + "memory": "1024", + "mirror": "http://cdimage.debian.org/cdimage/release", + "mirror_directory": "9.9.0/i386/iso-cd", + "name": "debian-9.8-i386", + "no_proxy": "{{env `no_proxy`}}", + "preseed_path": "debian-9/preseed.cfg", + "template": "debian-9.8-i386", + "version": "TIMESTAMP" + } +} diff --git a/packer_templates/debian/debian-9.9-ppc64el.json b/packer_templates/debian/debian-9.9-ppc64el.json new file mode 100644 index 000000000..8a6157b05 --- /dev/null +++ b/packer_templates/debian/debian-9.9-ppc64el.json @@ -0,0 +1,101 @@ +{ + "builders": [ + { + "boot_command": [ + "c<wait>", + "setparams 'Automated install'<enter><wait>", + "<enter><wait>", + "set options=\" preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}} <wait>", + "debian-installer=en_US.UTF-8 <wait>", + "auto <wait>", + "locale=en_US.UTF-8 <wait>", + "kbd-chooser/method=us <wait>", + "keyboard-configuration/xkb-keymap=us <wait>", + "netcfg/get_hostname={{ .Name }} <wait>", + "netcfg/get_domain=vagrantup.com <wait>", + "fb=false <wait>", + "debconf/frontend=noninteractive <wait>", + "console-setup/ask_detect=false <wait>", + "console-keymaps-at/keymap=us <wait>", + "grub-installer/bootdev=/dev/vda1 <wait>", + "\"", + "<enter><wait>", + "boot_one<wait>", + "<enter><wait>", + "boot<enter>" + ], + "boot_wait": "10s", + "disk_size": "{{user `disk_size`}}", + "headless": "{{ user `headless` }}", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "../builds/packer-{{user `template`}}-qemu", + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "qemu", + "qemu_binary": "qemu-system-ppc64le", + "machine_type": "pseries", + "use_default_display": true, + "accelerator": "kvm", + "vm_name": "{{ user `template` }}" + } + ], + "post-processors": [ + { + "output": "../builds/{{user `box_basename`}}.{{.Provider}}.box", + "type": "vagrant" + } + ], + "provisioners": [ + { + "environment_vars": [ + "HOME_DIR=/home/vagrant", + "http_proxy={{user `http_proxy`}}", + "https_proxy={{user `https_proxy`}}", + "no_proxy={{user `no_proxy`}}" + ], + "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", + "expect_disconnect": true, + "scripts": [ + "scripts/update.sh", + "../_common/sshd.sh", + "scripts/networking.sh", + "scripts/sudoers.sh", + "../_common/vagrant.sh", + "scripts/systemd.sh", + "../_common/virtualbox.sh", + "../_common/vmware.sh", + "../_common/parallels.sh", + "scripts/cleanup.sh", + "../_common/minimize.sh" + ], + "type": "shell" + } + ], + "variables": { + "box_basename": "debian-9.8", + "build_timestamp": "{{isotime \"20060102150405\"}}", + "cpus": "1", + "disk_size": "65536", + "git_revision": "__unknown_git_revision__", + "headless": "", + "http_proxy": "{{env `http_proxy`}}", + "https_proxy": "{{env `https_proxy`}}", + "iso_checksum": "3ecde213fabd4d8ebec02b745970942c177793c939ef6e3fe679a436bf2e104d", + "iso_checksum_type": "sha256", + "iso_name": "debian-9.9.0-ppc64el-netinst.iso", + "memory": "1024", + "mirror": "http://cdimage.debian.org/cdimage/release", + "mirror_directory": "9.9.0/ppc64el/iso-cd", + "name": "debian-9.8", + "no_proxy": "{{env `no_proxy`}}", + "preseed_path": "debian-9/preseed.cfg", + "template": "debian-9.8-ppc64el", + "version": "TIMESTAMP" + } +} diff --git a/debian/http/debian-8/preseed.cfg b/packer_templates/debian/http/debian-8/preseed.cfg similarity index 100% rename from debian/http/debian-8/preseed.cfg rename to packer_templates/debian/http/debian-8/preseed.cfg diff --git a/debian/scripts/cleanup.sh b/packer_templates/debian/scripts/cleanup.sh similarity index 100% rename from debian/scripts/cleanup.sh rename to packer_templates/debian/scripts/cleanup.sh diff --git a/debian/scripts/networking.sh b/packer_templates/debian/scripts/networking.sh similarity index 100% rename from debian/scripts/networking.sh rename to packer_templates/debian/scripts/networking.sh diff --git a/debian/scripts/sudoers.sh b/packer_templates/debian/scripts/sudoers.sh similarity index 100% rename from debian/scripts/sudoers.sh rename to packer_templates/debian/scripts/sudoers.sh diff --git a/debian/scripts/systemd.sh b/packer_templates/debian/scripts/systemd.sh similarity index 100% rename from debian/scripts/systemd.sh rename to packer_templates/debian/scripts/systemd.sh diff --git a/debian/scripts/update.sh b/packer_templates/debian/scripts/update.sh similarity index 100% rename from debian/scripts/update.sh rename to packer_templates/debian/scripts/update.sh diff --git a/fedora/fedora-28-x86_64.json b/packer_templates/fedora/fedora-28-x86_64.json similarity index 100% rename from fedora/fedora-28-x86_64.json rename to packer_templates/fedora/fedora-28-x86_64.json diff --git a/fedora/fedora-29-x86_64.json b/packer_templates/fedora/fedora-29-x86_64.json similarity index 100% rename from fedora/fedora-29-x86_64.json rename to packer_templates/fedora/fedora-29-x86_64.json diff --git a/fedora/http/ks-fedora28.cfg b/packer_templates/fedora/http/ks-fedora28.cfg similarity index 100% rename from fedora/http/ks-fedora28.cfg rename to packer_templates/fedora/http/ks-fedora28.cfg diff --git a/fedora/http/ks-fedora29.cfg b/packer_templates/fedora/http/ks-fedora29.cfg similarity index 100% rename from fedora/http/ks-fedora29.cfg rename to packer_templates/fedora/http/ks-fedora29.cfg diff --git a/fedora/scripts/build-tools.sh b/packer_templates/fedora/scripts/build-tools.sh similarity index 100% rename from fedora/scripts/build-tools.sh rename to packer_templates/fedora/scripts/build-tools.sh diff --git a/fedora/scripts/cleanup.sh b/packer_templates/fedora/scripts/cleanup.sh similarity index 100% rename from fedora/scripts/cleanup.sh rename to packer_templates/fedora/scripts/cleanup.sh diff --git a/fedora/scripts/fix-slow-dns.sh b/packer_templates/fedora/scripts/fix-slow-dns.sh similarity index 100% rename from fedora/scripts/fix-slow-dns.sh rename to packer_templates/fedora/scripts/fix-slow-dns.sh diff --git a/fedora/scripts/swap.sh b/packer_templates/fedora/scripts/swap.sh similarity index 100% rename from fedora/scripts/swap.sh rename to packer_templates/fedora/scripts/swap.sh diff --git a/freebsd/freebsd-11.2-amd64.json b/packer_templates/freebsd/freebsd-11.2-amd64.json similarity index 100% rename from freebsd/freebsd-11.2-amd64.json rename to packer_templates/freebsd/freebsd-11.2-amd64.json diff --git a/freebsd/freebsd-11.2-i386.json b/packer_templates/freebsd/freebsd-11.2-i386.json similarity index 100% rename from freebsd/freebsd-11.2-i386.json rename to packer_templates/freebsd/freebsd-11.2-i386.json diff --git a/freebsd/freebsd-12.0-amd64.json b/packer_templates/freebsd/freebsd-12.0-amd64.json similarity index 100% rename from freebsd/freebsd-12.0-amd64.json rename to packer_templates/freebsd/freebsd-12.0-amd64.json diff --git a/freebsd/freebsd-12.0-i386.json b/packer_templates/freebsd/freebsd-12.0-i386.json similarity index 100% rename from freebsd/freebsd-12.0-i386.json rename to packer_templates/freebsd/freebsd-12.0-i386.json diff --git a/freebsd/http/freebsd-11/installerconfig b/packer_templates/freebsd/http/freebsd-11/installerconfig similarity index 100% rename from freebsd/http/freebsd-11/installerconfig rename to packer_templates/freebsd/http/freebsd-11/installerconfig diff --git a/freebsd/scripts/cleanup.sh b/packer_templates/freebsd/scripts/cleanup.sh similarity index 100% rename from freebsd/scripts/cleanup.sh rename to packer_templates/freebsd/scripts/cleanup.sh diff --git a/freebsd/scripts/minimize.sh b/packer_templates/freebsd/scripts/minimize.sh similarity index 100% rename from freebsd/scripts/minimize.sh rename to packer_templates/freebsd/scripts/minimize.sh diff --git a/freebsd/scripts/postinstall.sh b/packer_templates/freebsd/scripts/postinstall.sh similarity index 100% rename from freebsd/scripts/postinstall.sh rename to packer_templates/freebsd/scripts/postinstall.sh diff --git a/freebsd/scripts/sudoers.sh b/packer_templates/freebsd/scripts/sudoers.sh similarity index 100% rename from freebsd/scripts/sudoers.sh rename to packer_templates/freebsd/scripts/sudoers.sh diff --git a/freebsd/scripts/update.sh b/packer_templates/freebsd/scripts/update.sh similarity index 100% rename from freebsd/scripts/update.sh rename to packer_templates/freebsd/scripts/update.sh diff --git a/freebsd/scripts/vmtools.sh b/packer_templates/freebsd/scripts/vmtools.sh similarity index 100% rename from freebsd/scripts/vmtools.sh rename to packer_templates/freebsd/scripts/vmtools.sh diff --git a/freebsd/vagrantfile_templates/freebsd.rb b/packer_templates/freebsd/vagrantfile_templates/freebsd.rb similarity index 100% rename from freebsd/vagrantfile_templates/freebsd.rb rename to packer_templates/freebsd/vagrantfile_templates/freebsd.rb diff --git a/hardenedbsd/hardenedbsd-11-amd64.json b/packer_templates/hardenedbsd/hardenedbsd-11-amd64.json similarity index 100% rename from hardenedbsd/hardenedbsd-11-amd64.json rename to packer_templates/hardenedbsd/hardenedbsd-11-amd64.json diff --git a/hardenedbsd/http/hardenedbsd-11/installerconfig b/packer_templates/hardenedbsd/http/hardenedbsd-11/installerconfig similarity index 100% rename from hardenedbsd/http/hardenedbsd-11/installerconfig rename to packer_templates/hardenedbsd/http/hardenedbsd-11/installerconfig diff --git a/hardenedbsd/scripts/cleanup.sh b/packer_templates/hardenedbsd/scripts/cleanup.sh similarity index 100% rename from hardenedbsd/scripts/cleanup.sh rename to packer_templates/hardenedbsd/scripts/cleanup.sh diff --git a/hardenedbsd/scripts/minimize.sh b/packer_templates/hardenedbsd/scripts/minimize.sh similarity index 100% rename from hardenedbsd/scripts/minimize.sh rename to packer_templates/hardenedbsd/scripts/minimize.sh diff --git a/hardenedbsd/scripts/postinstall.sh b/packer_templates/hardenedbsd/scripts/postinstall.sh similarity index 100% rename from hardenedbsd/scripts/postinstall.sh rename to packer_templates/hardenedbsd/scripts/postinstall.sh diff --git a/hardenedbsd/scripts/sudoers.sh b/packer_templates/hardenedbsd/scripts/sudoers.sh similarity index 100% rename from hardenedbsd/scripts/sudoers.sh rename to packer_templates/hardenedbsd/scripts/sudoers.sh diff --git a/hardenedbsd/scripts/update.sh b/packer_templates/hardenedbsd/scripts/update.sh similarity index 100% rename from hardenedbsd/scripts/update.sh rename to packer_templates/hardenedbsd/scripts/update.sh diff --git a/hardenedbsd/vagrantfile_templates/hardenedbsd.rb b/packer_templates/hardenedbsd/vagrantfile_templates/hardenedbsd.rb similarity index 100% rename from hardenedbsd/vagrantfile_templates/hardenedbsd.rb rename to packer_templates/hardenedbsd/vagrantfile_templates/hardenedbsd.rb diff --git a/macos/macos-10.12.json b/packer_templates/macos/macos-10.12.json similarity index 100% rename from macos/macos-10.12.json rename to packer_templates/macos/macos-10.12.json diff --git a/macos/macosx-10.10.json b/packer_templates/macos/macosx-10.10.json similarity index 100% rename from macos/macosx-10.10.json rename to packer_templates/macos/macosx-10.10.json diff --git a/macos/macosx-10.11.json b/packer_templates/macos/macosx-10.11.json similarity index 100% rename from macos/macosx-10.11.json rename to packer_templates/macos/macosx-10.11.json diff --git a/macos/scripts/autologin.sh b/packer_templates/macos/scripts/autologin.sh similarity index 100% rename from macos/scripts/autologin.sh rename to packer_templates/macos/scripts/autologin.sh diff --git a/macos/scripts/cleanup.sh b/packer_templates/macos/scripts/cleanup.sh similarity index 100% rename from macos/scripts/cleanup.sh rename to packer_templates/macos/scripts/cleanup.sh diff --git a/macos/scripts/disablesleep.sh b/packer_templates/macos/scripts/disablesleep.sh similarity index 100% rename from macos/scripts/disablesleep.sh rename to packer_templates/macos/scripts/disablesleep.sh diff --git a/macos/scripts/hostname.sh b/packer_templates/macos/scripts/hostname.sh similarity index 100% rename from macos/scripts/hostname.sh rename to packer_templates/macos/scripts/hostname.sh diff --git a/macos/scripts/minimize.sh b/packer_templates/macos/scripts/minimize.sh similarity index 100% rename from macos/scripts/minimize.sh rename to packer_templates/macos/scripts/minimize.sh diff --git a/macos/scripts/networking.sh b/packer_templates/macos/scripts/networking.sh similarity index 100% rename from macos/scripts/networking.sh rename to packer_templates/macos/scripts/networking.sh diff --git a/macos/scripts/support/set_kcpassword.py b/packer_templates/macos/scripts/support/set_kcpassword.py similarity index 100% rename from macos/scripts/support/set_kcpassword.py rename to packer_templates/macos/scripts/support/set_kcpassword.py diff --git a/macos/scripts/update.sh b/packer_templates/macos/scripts/update.sh similarity index 100% rename from macos/scripts/update.sh rename to packer_templates/macos/scripts/update.sh diff --git a/macos/scripts/vagrant.sh b/packer_templates/macos/scripts/vagrant.sh similarity index 100% rename from macos/scripts/vagrant.sh rename to packer_templates/macos/scripts/vagrant.sh diff --git a/macos/scripts/vmtools.sh b/packer_templates/macos/scripts/vmtools.sh similarity index 100% rename from macos/scripts/vmtools.sh rename to packer_templates/macos/scripts/vmtools.sh diff --git a/macos/vagrantfile_templates/macosx.rb b/packer_templates/macos/vagrantfile_templates/macosx.rb similarity index 100% rename from macos/vagrantfile_templates/macosx.rb rename to packer_templates/macos/vagrantfile_templates/macosx.rb diff --git a/opensuse/http/15/autoinst.xml b/packer_templates/opensuse/http/15/autoinst.xml similarity index 100% rename from opensuse/http/15/autoinst.xml rename to packer_templates/opensuse/http/15/autoinst.xml diff --git a/opensuse/http/42/autoinst.xml b/packer_templates/opensuse/http/42/autoinst.xml similarity index 100% rename from opensuse/http/42/autoinst.xml rename to packer_templates/opensuse/http/42/autoinst.xml diff --git a/opensuse/opensuse-leap-15.0-x86_64.json b/packer_templates/opensuse/opensuse-leap-15.0-x86_64.json similarity index 100% rename from opensuse/opensuse-leap-15.0-x86_64.json rename to packer_templates/opensuse/opensuse-leap-15.0-x86_64.json diff --git a/opensuse/opensuse-leap-42.3-x86_64.json b/packer_templates/opensuse/opensuse-leap-42.3-x86_64.json similarity index 100% rename from opensuse/opensuse-leap-42.3-x86_64.json rename to packer_templates/opensuse/opensuse-leap-42.3-x86_64.json diff --git a/opensuse/scripts/add_packages.sh b/packer_templates/opensuse/scripts/add_packages.sh similarity index 100% rename from opensuse/scripts/add_packages.sh rename to packer_templates/opensuse/scripts/add_packages.sh diff --git a/opensuse/scripts/cleanup.sh b/packer_templates/opensuse/scripts/cleanup.sh similarity index 100% rename from opensuse/scripts/cleanup.sh rename to packer_templates/opensuse/scripts/cleanup.sh diff --git a/opensuse/scripts/repositories.sh b/packer_templates/opensuse/scripts/repositories.sh similarity index 100% rename from opensuse/scripts/repositories.sh rename to packer_templates/opensuse/scripts/repositories.sh diff --git a/opensuse/scripts/sudoers.sh b/packer_templates/opensuse/scripts/sudoers.sh similarity index 100% rename from opensuse/scripts/sudoers.sh rename to packer_templates/opensuse/scripts/sudoers.sh diff --git a/opensuse/scripts/update.sh b/packer_templates/opensuse/scripts/update.sh similarity index 100% rename from opensuse/scripts/update.sh rename to packer_templates/opensuse/scripts/update.sh diff --git a/opensuse/scripts/vagrant_group.sh b/packer_templates/opensuse/scripts/vagrant_group.sh similarity index 100% rename from opensuse/scripts/vagrant_group.sh rename to packer_templates/opensuse/scripts/vagrant_group.sh diff --git a/opensuse/scripts/zypper-locks.sh b/packer_templates/opensuse/scripts/zypper-locks.sh similarity index 100% rename from opensuse/scripts/zypper-locks.sh rename to packer_templates/opensuse/scripts/zypper-locks.sh diff --git a/oraclelinux/oracle-5.11-i386.json b/packer_templates/oraclelinux/oracle-5.11-i386.json similarity index 100% rename from oraclelinux/oracle-5.11-i386.json rename to packer_templates/oraclelinux/oracle-5.11-i386.json diff --git a/oraclelinux/oracle-5.11-x86_64.json b/packer_templates/oraclelinux/oracle-5.11-x86_64.json similarity index 100% rename from oraclelinux/oracle-5.11-x86_64.json rename to packer_templates/oraclelinux/oracle-5.11-x86_64.json diff --git a/oraclelinux/oracle-6.10-i386.json b/packer_templates/oraclelinux/oracle-6.10-i386.json similarity index 100% rename from oraclelinux/oracle-6.10-i386.json rename to packer_templates/oraclelinux/oracle-6.10-i386.json diff --git a/oraclelinux/oracle-6.10-x86_64.json b/packer_templates/oraclelinux/oracle-6.10-x86_64.json similarity index 100% rename from oraclelinux/oracle-6.10-x86_64.json rename to packer_templates/oraclelinux/oracle-6.10-x86_64.json diff --git a/oraclelinux/oracle-7.6-x86_64.json b/packer_templates/oraclelinux/oracle-7.6-x86_64.json similarity index 100% rename from oraclelinux/oracle-7.6-x86_64.json rename to packer_templates/oraclelinux/oracle-7.6-x86_64.json diff --git a/rhel/rhel-5.11-i386.json b/packer_templates/rhel/rhel-5.11-i386.json similarity index 100% rename from rhel/rhel-5.11-i386.json rename to packer_templates/rhel/rhel-5.11-i386.json diff --git a/rhel/rhel-5.11-x86_64.json b/packer_templates/rhel/rhel-5.11-x86_64.json similarity index 100% rename from rhel/rhel-5.11-x86_64.json rename to packer_templates/rhel/rhel-5.11-x86_64.json diff --git a/rhel/rhel-6.10-i386.json b/packer_templates/rhel/rhel-6.10-i386.json similarity index 100% rename from rhel/rhel-6.10-i386.json rename to packer_templates/rhel/rhel-6.10-i386.json diff --git a/rhel/rhel-6.10-x86_64.json b/packer_templates/rhel/rhel-6.10-x86_64.json similarity index 100% rename from rhel/rhel-6.10-x86_64.json rename to packer_templates/rhel/rhel-6.10-x86_64.json diff --git a/rhel/rhel-7.6-x86_64.json b/packer_templates/rhel/rhel-7.6-x86_64.json similarity index 100% rename from rhel/rhel-7.6-x86_64.json rename to packer_templates/rhel/rhel-7.6-x86_64.json diff --git a/scientificlinux/http/7/ks.cfg b/packer_templates/scientificlinux/http/7/ks.cfg similarity index 100% rename from scientificlinux/http/7/ks.cfg rename to packer_templates/scientificlinux/http/7/ks.cfg diff --git a/scientificlinux/scientific-7.6-x86_64.json b/packer_templates/scientificlinux/scientific-7.6-x86_64.json similarity index 100% rename from scientificlinux/scientific-7.6-x86_64.json rename to packer_templates/scientificlinux/scientific-7.6-x86_64.json diff --git a/sles/http/sles-11-sp4-x86_64-autoinst.xml b/packer_templates/sles/http/sles-11-sp4-x86_64-autoinst.xml similarity index 100% rename from sles/http/sles-11-sp4-x86_64-autoinst.xml rename to packer_templates/sles/http/sles-11-sp4-x86_64-autoinst.xml diff --git a/sles/http/sles-12-sp2-x86_64-autoinst.xml b/packer_templates/sles/http/sles-12-sp2-x86_64-autoinst.xml similarity index 100% rename from sles/http/sles-12-sp2-x86_64-autoinst.xml rename to packer_templates/sles/http/sles-12-sp2-x86_64-autoinst.xml diff --git a/sles/http/sles-12-sp3-x86_64-autoinst.xml b/packer_templates/sles/http/sles-12-sp3-x86_64-autoinst.xml similarity index 100% rename from sles/http/sles-12-sp3-x86_64-autoinst.xml rename to packer_templates/sles/http/sles-12-sp3-x86_64-autoinst.xml diff --git a/sles/scripts/cleanup.sh b/packer_templates/sles/scripts/cleanup.sh similarity index 100% rename from sles/scripts/cleanup.sh rename to packer_templates/sles/scripts/cleanup.sh diff --git a/sles/scripts/remove-dvd-source.sh b/packer_templates/sles/scripts/remove-dvd-source.sh similarity index 100% rename from sles/scripts/remove-dvd-source.sh rename to packer_templates/sles/scripts/remove-dvd-source.sh diff --git a/sles/scripts/sudoers.sh b/packer_templates/sles/scripts/sudoers.sh similarity index 100% rename from sles/scripts/sudoers.sh rename to packer_templates/sles/scripts/sudoers.sh diff --git a/sles/scripts/unsupported-modules.sh b/packer_templates/sles/scripts/unsupported-modules.sh similarity index 100% rename from sles/scripts/unsupported-modules.sh rename to packer_templates/sles/scripts/unsupported-modules.sh diff --git a/sles/scripts/zypper-locks.sh b/packer_templates/sles/scripts/zypper-locks.sh similarity index 100% rename from sles/scripts/zypper-locks.sh rename to packer_templates/sles/scripts/zypper-locks.sh diff --git a/sles/sles-11-sp4-x86_64.json b/packer_templates/sles/sles-11-sp4-x86_64.json similarity index 100% rename from sles/sles-11-sp4-x86_64.json rename to packer_templates/sles/sles-11-sp4-x86_64.json diff --git a/sles/sles-12-sp2-x86_64.json b/packer_templates/sles/sles-12-sp2-x86_64.json similarity index 100% rename from sles/sles-12-sp2-x86_64.json rename to packer_templates/sles/sles-12-sp2-x86_64.json diff --git a/sles/sles-12-sp3-x86_64.json b/packer_templates/sles/sles-12-sp3-x86_64.json similarity index 100% rename from sles/sles-12-sp3-x86_64.json rename to packer_templates/sles/sles-12-sp3-x86_64.json diff --git a/solaris/floppy/S99startup.sh b/packer_templates/solaris/floppy/S99startup.sh similarity index 100% rename from solaris/floppy/S99startup.sh rename to packer_templates/solaris/floppy/S99startup.sh diff --git a/solaris/floppy/awesome_prof b/packer_templates/solaris/floppy/awesome_prof similarity index 100% rename from solaris/floppy/awesome_prof rename to packer_templates/solaris/floppy/awesome_prof diff --git a/solaris/floppy/finish.sh b/packer_templates/solaris/floppy/finish.sh similarity index 100% rename from solaris/floppy/finish.sh rename to packer_templates/solaris/floppy/finish.sh diff --git a/solaris/floppy/rules.ok b/packer_templates/solaris/floppy/rules.ok similarity index 100% rename from solaris/floppy/rules.ok rename to packer_templates/solaris/floppy/rules.ok diff --git a/solaris/floppy/sysidcfg b/packer_templates/solaris/floppy/sysidcfg similarity index 100% rename from solaris/floppy/sysidcfg rename to packer_templates/solaris/floppy/sysidcfg diff --git a/solaris/http/default.xml b/packer_templates/solaris/http/default.xml similarity index 100% rename from solaris/http/default.xml rename to packer_templates/solaris/http/default.xml diff --git a/solaris/http/profile.xml b/packer_templates/solaris/http/profile.xml similarity index 100% rename from solaris/http/profile.xml rename to packer_templates/solaris/http/profile.xml diff --git a/solaris/scripts/minimize.sh b/packer_templates/solaris/scripts/minimize.sh similarity index 100% rename from solaris/scripts/minimize.sh rename to packer_templates/solaris/scripts/minimize.sh diff --git a/solaris/scripts/solaris-10/minimize.sh b/packer_templates/solaris/scripts/solaris-10/minimize.sh similarity index 100% rename from solaris/scripts/solaris-10/minimize.sh rename to packer_templates/solaris/scripts/solaris-10/minimize.sh diff --git a/solaris/scripts/solaris-10/vmtools.sh b/packer_templates/solaris/scripts/solaris-10/vmtools.sh similarity index 100% rename from solaris/scripts/solaris-10/vmtools.sh rename to packer_templates/solaris/scripts/solaris-10/vmtools.sh diff --git a/solaris/scripts/update.sh b/packer_templates/solaris/scripts/update.sh similarity index 100% rename from solaris/scripts/update.sh rename to packer_templates/solaris/scripts/update.sh diff --git a/solaris/scripts/vagrant.sh b/packer_templates/solaris/scripts/vagrant.sh similarity index 100% rename from solaris/scripts/vagrant.sh rename to packer_templates/solaris/scripts/vagrant.sh diff --git a/solaris/scripts/vmtools.sh b/packer_templates/solaris/scripts/vmtools.sh similarity index 100% rename from solaris/scripts/vmtools.sh rename to packer_templates/solaris/scripts/vmtools.sh diff --git a/solaris/solaris-10.11-x86.json b/packer_templates/solaris/solaris-10.11-x86.json similarity index 100% rename from solaris/solaris-10.11-x86.json rename to packer_templates/solaris/solaris-10.11-x86.json diff --git a/solaris/solaris-11-x86.json b/packer_templates/solaris/solaris-11-x86.json similarity index 100% rename from solaris/solaris-11-x86.json rename to packer_templates/solaris/solaris-11-x86.json diff --git a/ubuntu/http/preseed-hyperv.cfg b/packer_templates/ubuntu/http/preseed-hyperv.cfg similarity index 100% rename from ubuntu/http/preseed-hyperv.cfg rename to packer_templates/ubuntu/http/preseed-hyperv.cfg diff --git a/ubuntu/http/preseed.cfg b/packer_templates/ubuntu/http/preseed.cfg similarity index 100% rename from ubuntu/http/preseed.cfg rename to packer_templates/ubuntu/http/preseed.cfg diff --git a/ubuntu/scripts/cleanup.sh b/packer_templates/ubuntu/scripts/cleanup.sh similarity index 100% rename from ubuntu/scripts/cleanup.sh rename to packer_templates/ubuntu/scripts/cleanup.sh diff --git a/ubuntu/scripts/hyperv.sh b/packer_templates/ubuntu/scripts/hyperv.sh similarity index 100% rename from ubuntu/scripts/hyperv.sh rename to packer_templates/ubuntu/scripts/hyperv.sh diff --git a/ubuntu/scripts/networking.sh b/packer_templates/ubuntu/scripts/networking.sh similarity index 100% rename from ubuntu/scripts/networking.sh rename to packer_templates/ubuntu/scripts/networking.sh diff --git a/ubuntu/scripts/sudoers.sh b/packer_templates/ubuntu/scripts/sudoers.sh similarity index 100% rename from ubuntu/scripts/sudoers.sh rename to packer_templates/ubuntu/scripts/sudoers.sh diff --git a/ubuntu/scripts/update.sh b/packer_templates/ubuntu/scripts/update.sh similarity index 99% rename from ubuntu/scripts/update.sh rename to packer_templates/ubuntu/scripts/update.sh index 774a414d1..40b1ebfde 100644 --- a/ubuntu/scripts/update.sh +++ b/packer_templates/ubuntu/scripts/update.sh @@ -36,3 +36,5 @@ apt-get -y update; # Upgrade all installed packages incl. kernel and kernel headers apt-get -y dist-upgrade -o Dpkg::Options::="--force-confnew"; + +reboot diff --git a/ubuntu/scripts/vagrant.sh b/packer_templates/ubuntu/scripts/vagrant.sh similarity index 100% rename from ubuntu/scripts/vagrant.sh rename to packer_templates/ubuntu/scripts/vagrant.sh diff --git a/ubuntu/scripts/vmware.sh b/packer_templates/ubuntu/scripts/vmware.sh similarity index 100% rename from ubuntu/scripts/vmware.sh rename to packer_templates/ubuntu/scripts/vmware.sh diff --git a/ubuntu/ubuntu-14.04-amd64.json b/packer_templates/ubuntu/ubuntu-14.04-amd64.json similarity index 100% rename from ubuntu/ubuntu-14.04-amd64.json rename to packer_templates/ubuntu/ubuntu-14.04-amd64.json diff --git a/ubuntu/ubuntu-14.04-i386.json b/packer_templates/ubuntu/ubuntu-14.04-i386.json similarity index 100% rename from ubuntu/ubuntu-14.04-i386.json rename to packer_templates/ubuntu/ubuntu-14.04-i386.json diff --git a/ubuntu/ubuntu-16.04-amd64.json b/packer_templates/ubuntu/ubuntu-16.04-amd64.json similarity index 100% rename from ubuntu/ubuntu-16.04-amd64.json rename to packer_templates/ubuntu/ubuntu-16.04-amd64.json diff --git a/ubuntu/ubuntu-16.04-i386.json b/packer_templates/ubuntu/ubuntu-16.04-i386.json similarity index 100% rename from ubuntu/ubuntu-16.04-i386.json rename to packer_templates/ubuntu/ubuntu-16.04-i386.json diff --git a/ubuntu/ubuntu-18.04-amd64.json b/packer_templates/ubuntu/ubuntu-18.04-amd64.json similarity index 100% rename from ubuntu/ubuntu-18.04-amd64.json rename to packer_templates/ubuntu/ubuntu-18.04-amd64.json diff --git a/ubuntu/ubuntu-18.10-amd64.json b/packer_templates/ubuntu/ubuntu-18.10-amd64.json similarity index 100% rename from ubuntu/ubuntu-18.10-amd64.json rename to packer_templates/ubuntu/ubuntu-18.10-amd64.json diff --git a/windows/10.json b/packer_templates/windows/10.json similarity index 100% rename from windows/10.json rename to packer_templates/windows/10.json diff --git a/windows/2008r2.json b/packer_templates/windows/2008r2.json similarity index 100% rename from windows/2008r2.json rename to packer_templates/windows/2008r2.json diff --git a/windows/2012r2.json b/packer_templates/windows/2012r2.json similarity index 100% rename from windows/2012r2.json rename to packer_templates/windows/2012r2.json diff --git a/windows/2016.json b/packer_templates/windows/2016.json similarity index 100% rename from windows/2016.json rename to packer_templates/windows/2016.json diff --git a/windows/2019.json b/packer_templates/windows/2019.json similarity index 100% rename from windows/2019.json rename to packer_templates/windows/2019.json diff --git a/windows/7.json b/packer_templates/windows/7.json similarity index 100% rename from windows/7.json rename to packer_templates/windows/7.json diff --git a/windows/answer_files/10/Autounattend.xml b/packer_templates/windows/answer_files/10/Autounattend.xml similarity index 100% rename from windows/answer_files/10/Autounattend.xml rename to packer_templates/windows/answer_files/10/Autounattend.xml diff --git a/windows/answer_files/2008_r2/Autounattend.xml b/packer_templates/windows/answer_files/2008_r2/Autounattend.xml similarity index 100% rename from windows/answer_files/2008_r2/Autounattend.xml rename to packer_templates/windows/answer_files/2008_r2/Autounattend.xml diff --git a/windows/answer_files/2012_r2/Autounattend.xml b/packer_templates/windows/answer_files/2012_r2/Autounattend.xml similarity index 100% rename from windows/answer_files/2012_r2/Autounattend.xml rename to packer_templates/windows/answer_files/2012_r2/Autounattend.xml diff --git a/windows/answer_files/2016/Autounattend.xml b/packer_templates/windows/answer_files/2016/Autounattend.xml similarity index 100% rename from windows/answer_files/2016/Autounattend.xml rename to packer_templates/windows/answer_files/2016/Autounattend.xml diff --git a/windows/answer_files/2019/Autounattend.xml b/packer_templates/windows/answer_files/2019/Autounattend.xml similarity index 100% rename from windows/answer_files/2019/Autounattend.xml rename to packer_templates/windows/answer_files/2019/Autounattend.xml diff --git a/windows/answer_files/7/Autounattend.xml b/packer_templates/windows/answer_files/7/Autounattend.xml similarity index 100% rename from windows/answer_files/7/Autounattend.xml rename to packer_templates/windows/answer_files/7/Autounattend.xml diff --git a/windows/cookbooks/packer/Berksfile b/packer_templates/windows/cookbooks/packer/Berksfile similarity index 100% rename from windows/cookbooks/packer/Berksfile rename to packer_templates/windows/cookbooks/packer/Berksfile diff --git a/windows/cookbooks/packer/kitchen.yml b/packer_templates/windows/cookbooks/packer/kitchen.yml similarity index 100% rename from windows/cookbooks/packer/kitchen.yml rename to packer_templates/windows/cookbooks/packer/kitchen.yml diff --git a/windows/cookbooks/packer/libraries/windows_helper.rb b/packer_templates/windows/cookbooks/packer/libraries/windows_helper.rb similarity index 100% rename from windows/cookbooks/packer/libraries/windows_helper.rb rename to packer_templates/windows/cookbooks/packer/libraries/windows_helper.rb diff --git a/windows/cookbooks/packer/metadata.rb b/packer_templates/windows/cookbooks/packer/metadata.rb similarity index 100% rename from windows/cookbooks/packer/metadata.rb rename to packer_templates/windows/cookbooks/packer/metadata.rb diff --git a/windows/cookbooks/packer/recipes/cleanup.rb b/packer_templates/windows/cookbooks/packer/recipes/cleanup.rb similarity index 100% rename from windows/cookbooks/packer/recipes/cleanup.rb rename to packer_templates/windows/cookbooks/packer/recipes/cleanup.rb diff --git a/windows/cookbooks/packer/recipes/defrag.rb b/packer_templates/windows/cookbooks/packer/recipes/defrag.rb similarity index 100% rename from windows/cookbooks/packer/recipes/defrag.rb rename to packer_templates/windows/cookbooks/packer/recipes/defrag.rb diff --git a/windows/cookbooks/packer/recipes/disable_hibernation.rb b/packer_templates/windows/cookbooks/packer/recipes/disable_hibernation.rb similarity index 100% rename from windows/cookbooks/packer/recipes/disable_hibernation.rb rename to packer_templates/windows/cookbooks/packer/recipes/disable_hibernation.rb diff --git a/windows/cookbooks/packer/recipes/disable_onedrive.rb b/packer_templates/windows/cookbooks/packer/recipes/disable_onedrive.rb similarity index 100% rename from windows/cookbooks/packer/recipes/disable_onedrive.rb rename to packer_templates/windows/cookbooks/packer/recipes/disable_onedrive.rb diff --git a/windows/cookbooks/packer/recipes/disable_restore.rb b/packer_templates/windows/cookbooks/packer/recipes/disable_restore.rb similarity index 100% rename from windows/cookbooks/packer/recipes/disable_restore.rb rename to packer_templates/windows/cookbooks/packer/recipes/disable_restore.rb diff --git a/windows/cookbooks/packer/recipes/disable_uac.rb b/packer_templates/windows/cookbooks/packer/recipes/disable_uac.rb similarity index 100% rename from windows/cookbooks/packer/recipes/disable_uac.rb rename to packer_templates/windows/cookbooks/packer/recipes/disable_uac.rb diff --git a/windows/cookbooks/packer/recipes/disable_windows_update.rb b/packer_templates/windows/cookbooks/packer/recipes/disable_windows_update.rb similarity index 100% rename from windows/cookbooks/packer/recipes/disable_windows_update.rb rename to packer_templates/windows/cookbooks/packer/recipes/disable_windows_update.rb diff --git a/windows/cookbooks/packer/recipes/enable_file_sharing.rb b/packer_templates/windows/cookbooks/packer/recipes/enable_file_sharing.rb similarity index 100% rename from windows/cookbooks/packer/recipes/enable_file_sharing.rb rename to packer_templates/windows/cookbooks/packer/recipes/enable_file_sharing.rb diff --git a/windows/cookbooks/packer/recipes/enable_remote_desktop.rb b/packer_templates/windows/cookbooks/packer/recipes/enable_remote_desktop.rb similarity index 100% rename from windows/cookbooks/packer/recipes/enable_remote_desktop.rb rename to packer_templates/windows/cookbooks/packer/recipes/enable_remote_desktop.rb diff --git a/windows/cookbooks/packer/recipes/features.rb b/packer_templates/windows/cookbooks/packer/recipes/features.rb similarity index 100% rename from windows/cookbooks/packer/recipes/features.rb rename to packer_templates/windows/cookbooks/packer/recipes/features.rb diff --git a/windows/cookbooks/packer/recipes/power.rb b/packer_templates/windows/cookbooks/packer/recipes/power.rb similarity index 100% rename from windows/cookbooks/packer/recipes/power.rb rename to packer_templates/windows/cookbooks/packer/recipes/power.rb diff --git a/windows/cookbooks/packer/recipes/remove_defender.rb b/packer_templates/windows/cookbooks/packer/recipes/remove_defender.rb similarity index 100% rename from windows/cookbooks/packer/recipes/remove_defender.rb rename to packer_templates/windows/cookbooks/packer/recipes/remove_defender.rb diff --git a/windows/cookbooks/packer/recipes/set_local_account_token_filter_policy.rb b/packer_templates/windows/cookbooks/packer/recipes/set_local_account_token_filter_policy.rb similarity index 100% rename from windows/cookbooks/packer/recipes/set_local_account_token_filter_policy.rb rename to packer_templates/windows/cookbooks/packer/recipes/set_local_account_token_filter_policy.rb diff --git a/windows/cookbooks/packer/recipes/ui_tweaks.rb b/packer_templates/windows/cookbooks/packer/recipes/ui_tweaks.rb similarity index 100% rename from windows/cookbooks/packer/recipes/ui_tweaks.rb rename to packer_templates/windows/cookbooks/packer/recipes/ui_tweaks.rb diff --git a/windows/cookbooks/packer/recipes/updates.rb b/packer_templates/windows/cookbooks/packer/recipes/updates.rb similarity index 100% rename from windows/cookbooks/packer/recipes/updates.rb rename to packer_templates/windows/cookbooks/packer/recipes/updates.rb diff --git a/windows/cookbooks/packer/recipes/vm_tools.rb b/packer_templates/windows/cookbooks/packer/recipes/vm_tools.rb similarity index 100% rename from windows/cookbooks/packer/recipes/vm_tools.rb rename to packer_templates/windows/cookbooks/packer/recipes/vm_tools.rb diff --git a/windows/cookbooks/packer/resources/zipfile.rb b/packer_templates/windows/cookbooks/packer/resources/zipfile.rb similarity index 100% rename from windows/cookbooks/packer/resources/zipfile.rb rename to packer_templates/windows/cookbooks/packer/resources/zipfile.rb diff --git a/windows/scripts/base_setup.ps1 b/packer_templates/windows/scripts/base_setup.ps1 similarity index 100% rename from windows/scripts/base_setup.ps1 rename to packer_templates/windows/scripts/base_setup.ps1 diff --git a/windows/scripts/cleanup.ps1 b/packer_templates/windows/scripts/cleanup.ps1 similarity index 100% rename from windows/scripts/cleanup.ps1 rename to packer_templates/windows/scripts/cleanup.ps1 diff --git a/windows/scripts/oracle.cer b/packer_templates/windows/scripts/oracle.cer similarity index 100% rename from windows/scripts/oracle.cer rename to packer_templates/windows/scripts/oracle.cer diff --git a/windows/vagrantfile-windows.template b/packer_templates/windows/vagrantfile-windows.template similarity index 100% rename from windows/vagrantfile-windows.template rename to packer_templates/windows/vagrantfile-windows.template diff --git a/test_templates/bootstrap.sh.erb b/test_templates/bootstrap.sh.erb new file mode 100644 index 000000000..99d3975e1 --- /dev/null +++ b/test_templates/bootstrap.sh.erb @@ -0,0 +1 @@ +echo "Shell Provisioner Says What" diff --git a/test_templates/kitchen.yml.erb b/test_templates/kitchen.yml.erb new file mode 100644 index 000000000..204be755c --- /dev/null +++ b/test_templates/kitchen.yml.erb @@ -0,0 +1,29 @@ +--- +provisioner: + name: <%= @provisioner %> + +platforms: +<% @providers.each do |k,v| -%> +- name: <%= @boxname + '-' + k %> + driver: + name: vagrant +<% if k =~ /vmware/ -%> +<% if RUBY_PLATFORM.match(/darwin/) -%> + provider: <%= 'vmware_fusion' %> +<% else -%> + provider: <%= 'vmware_workstation' %> +<% end -%> +<% else -%> + provider: <%= k %> +<% end -%> + box: bento-<%= @boxname %> + box_url: file://<%= Dir.pwd %>/builds/<%= v['file'] %> + synced_folders: +<% if k =~ /hyperv/ -%> + - [".", "/vagrant", "disabled: true"] +<% else -%> + - [".", "/vagrant", "disabled: <%= @share_disabled %>"] +<% end -%> +<% end -%> +suites: +- name: default From 65988e8b57b5560d92a82016242bcd9ea4b29525 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith@chef.io> Date: Wed, 6 Mar 2019 23:00:05 -0800 Subject: [PATCH 0960/1622] Remove mention of S3 This is all vagrant cloud Signed-off-by: Tim Smith <tsmith@chef.io> --- lib/bento/cli.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/bento/cli.rb b/lib/bento/cli.rb index 05c313dad..b1de12869 100644 --- a/lib/bento/cli.rb +++ b/lib/bento/cli.rb @@ -26,7 +26,7 @@ def self.parse(args) list : list all templates in project normalize : normalize one or more templates test : test one or more builds with kitchen - upload : upload one or more builds to Vagrant Cloud and S3 + upload : upload one or more builds to Vagrant Cloud release : release a version of a box on Vagrant Cloud revoke : revoke a version of a box on Vagrant Cloud delete : delete a version of a box from Vagrant Cloud From 5ad41fca680f817930d109a80c9cde981b9726f8 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith@chef.io> Date: Tue, 18 Jun 2019 10:56:59 +0100 Subject: [PATCH 0961/1622] Fix a bad rebase These didn't make it into the new directory structure Signed-off-by: Tim Smith <tsmith@chef.io> --- debian/debian-9.9-amd64.json | 240 ------------------ debian/debian-9.9-i386.json | 240 ------------------ debian/debian-9.9-ppc64el.json | 101 -------- .../amazonlinux}/README_FIRST.md | 0 .../amazonlinux}/STEP1_build_ovf.sh | 0 .../amazonlinux}/amazon-2-x86_64.json | 0 .../amazonlinux}/scripts/cleanup.sh | 0 .../amazonlinux}/scripts/networking.sh | 0 .../amazonlinux}/scripts/update.sh | 0 .../amazonlinux}/seed_iso/meta-data | 0 .../amazonlinux}/seed_iso/user-data | 0 .../debian}/http/debian-9/preseed.cfg | 0 .../sles}/http/sles-15-x86_64-autoinst.xml | 0 {sles => packer_templates/sles}/sles-15.json | 0 .../ubuntu}/ubuntu-19.04-amd64.json | 0 15 files changed, 581 deletions(-) delete mode 100644 debian/debian-9.9-amd64.json delete mode 100644 debian/debian-9.9-i386.json delete mode 100644 debian/debian-9.9-ppc64el.json rename {amazonlinux => packer_templates/amazonlinux}/README_FIRST.md (100%) rename {amazonlinux => packer_templates/amazonlinux}/STEP1_build_ovf.sh (100%) rename {amazonlinux => packer_templates/amazonlinux}/amazon-2-x86_64.json (100%) rename {amazonlinux => packer_templates/amazonlinux}/scripts/cleanup.sh (100%) rename {amazonlinux => packer_templates/amazonlinux}/scripts/networking.sh (100%) rename {amazonlinux => packer_templates/amazonlinux}/scripts/update.sh (100%) rename {amazonlinux => packer_templates/amazonlinux}/seed_iso/meta-data (100%) rename {amazonlinux => packer_templates/amazonlinux}/seed_iso/user-data (100%) rename {debian => packer_templates/debian}/http/debian-9/preseed.cfg (100%) rename {sles => packer_templates/sles}/http/sles-15-x86_64-autoinst.xml (100%) rename {sles => packer_templates/sles}/sles-15.json (100%) rename {ubuntu => packer_templates/ubuntu}/ubuntu-19.04-amd64.json (100%) diff --git a/debian/debian-9.9-amd64.json b/debian/debian-9.9-amd64.json deleted file mode 100644 index f0bf413fd..000000000 --- a/debian/debian-9.9-amd64.json +++ /dev/null @@ -1,240 +0,0 @@ -{ - "builders": [ - { - "boot_command": [ - "<esc><wait>", - "install <wait>", - " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}} <wait>", - "debian-installer=en_US.UTF-8 <wait>", - "auto <wait>", - "locale=en_US.UTF-8 <wait>", - "kbd-chooser/method=us <wait>", - "keyboard-configuration/xkb-keymap=us <wait>", - "netcfg/get_hostname={{ .Name }} <wait>", - "netcfg/get_domain=vagrantup.com <wait>", - "fb=false <wait>", - "debconf/frontend=noninteractive <wait>", - "console-setup/ask_detect=false <wait>", - "console-keymaps-at/keymap=us <wait>", - "grub-installer/bootdev=/dev/sda <wait>", - "<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", - "guest_os_type": "Debian_64", - "hard_drive_interface": "sata", - "headless": "{{ user `headless` }}", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../builds/packer-{{user `template`}}-virtualbox", - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "virtualbox-iso", - "vboxmanage": [ - [ - "modifyvm", - "{{.Name}}", - "--memory", - "{{ user `memory` }}" - ], - [ - "modifyvm", - "{{.Name}}", - "--cpus", - "{{ user `cpus` }}" - ] - ], - "virtualbox_version_file": ".vbox_version", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<esc><wait>", - "install <wait>", - " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}} <wait>", - "debian-installer=en_US.UTF-8 <wait>", - "auto <wait>", - "locale=en_US.UTF-8 <wait>", - "kbd-chooser/method=us <wait>", - "keyboard-configuration/xkb-keymap=us <wait>", - "netcfg/get_hostname={{ .Name }} <wait>", - "netcfg/get_domain=vagrantup.com <wait>", - "fb=false <wait>", - "debconf/frontend=noninteractive <wait>", - "console-setup/ask_detect=false <wait>", - "console-keymaps-at/keymap=us <wait>", - "grub-installer/bootdev=/dev/sda <wait>", - "<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "debian8-64", - "headless": "{{ user `headless` }}", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../builds/packer-{{user `template`}}-vmware", - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "tools_upload_flavor": "linux", - "type": "vmware-iso", - "vm_name": "{{ user `template` }}", - "vmx_data": { - "cpuid.coresPerSocket": "1", - "ethernet0.pciSlotNumber": "32", - "memsize": "{{ user `memory` }}", - "numvcpus": "{{ user `cpus` }}" - }, - "vmx_remove_ethernet_interfaces": true - }, - { - "boot_command": [ - "<esc><wait>", - "install <wait>", - " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}} <wait>", - "debian-installer=en_US.UTF-8 <wait>", - "auto <wait>", - "locale=en_US.UTF-8 <wait>", - "kbd-chooser/method=us <wait>", - "keyboard-configuration/xkb-keymap=us <wait>", - "netcfg/get_hostname={{ .Name }} <wait>", - "netcfg/get_domain=vagrantup.com <wait>", - "fb=false <wait>", - "debconf/frontend=noninteractive <wait>", - "console-setup/ask_detect=false <wait>", - "console-keymaps-at/keymap=us <wait>", - "grub-installer/bootdev=/dev/sda <wait>", - "<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "debian", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../builds/packer-{{user `template`}}-parallels", - "parallels_tools_flavor": "lin", - "prlctl": [ - [ - "set", - "{{.Name}}", - "--memsize", - "{{ user `memory` }}" - ], - [ - "set", - "{{.Name}}", - "--cpus", - "{{ user `cpus` }}" - ] - ], - "prlctl_version_file": ".prlctl_version", - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "parallels-iso", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<esc><wait>", - "install <wait>", - " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}} <wait>", - "debian-installer=en_US.UTF-8 <wait>", - "auto <wait>", - "locale=en_US.UTF-8 <wait>", - "kbd-chooser/method=us <wait>", - "keyboard-configuration/xkb-keymap=us <wait>", - "netcfg/get_hostname={{ .Name }} <wait>", - "netcfg/get_domain=vagrantup.com <wait>", - "fb=false <wait>", - "debconf/frontend=noninteractive <wait>", - "console-setup/ask_detect=false <wait>", - "console-keymaps-at/keymap=us <wait>", - "grub-installer/bootdev=/dev/vda <wait>", - "<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "headless": "{{ user `headless` }}", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../builds/packer-{{user `template`}}-qemu", - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "qemu", - "vm_name": "{{ user `template` }}" - } - ], - "post-processors": [ - { - "output": "../builds/{{user `box_basename`}}.{{.Provider}}.box", - "type": "vagrant" - } - ], - "provisioners": [ - { - "environment_vars": [ - "HOME_DIR=/home/vagrant", - "http_proxy={{user `http_proxy`}}", - "https_proxy={{user `https_proxy`}}", - "no_proxy={{user `no_proxy`}}" - ], - "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", - "expect_disconnect": true, - "scripts": [ - "scripts/update.sh", - "../_common/sshd.sh", - "scripts/networking.sh", - "scripts/sudoers.sh", - "../_common/vagrant.sh", - "scripts/systemd.sh", - "../_common/virtualbox.sh", - "../_common/vmware.sh", - "../_common/parallels.sh", - "scripts/cleanup.sh", - "../_common/minimize.sh" - ], - "type": "shell" - } - ], - "variables": { - "box_basename": "debian-9.8", - "build_timestamp": "{{isotime \"20060102150405\"}}", - "cpus": "1", - "disk_size": "65536", - "git_revision": "__unknown_git_revision__", - "headless": "", - "http_proxy": "{{env `http_proxy`}}", - "https_proxy": "{{env `https_proxy`}}", - "iso_checksum": "4de26144286993ac6f4f244ff332fdd80e11ec230906e7997aa426e775fac1fb", - "iso_checksum_type": "sha256", - "iso_name": "debian-9.9.0-amd64-netinst.iso", - "memory": "1024", - "mirror": "http://cdimage.debian.org/cdimage/release", - "mirror_directory": "9.9.0/amd64/iso-cd", - "name": "debian-9.8", - "no_proxy": "{{env `no_proxy`}}", - "preseed_path": "debian-9/preseed.cfg", - "template": "debian-9.8-amd64", - "version": "TIMESTAMP" - } -} diff --git a/debian/debian-9.9-i386.json b/debian/debian-9.9-i386.json deleted file mode 100644 index 259a6ca5f..000000000 --- a/debian/debian-9.9-i386.json +++ /dev/null @@ -1,240 +0,0 @@ -{ - "builders": [ - { - "boot_command": [ - "<esc><wait>", - "install <wait>", - " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}} <wait>", - "debian-installer=en_US.UTF-8 <wait>", - "auto <wait>", - "locale=en_US.UTF-8 <wait>", - "kbd-chooser/method=us <wait>", - "keyboard-configuration/xkb-keymap=us <wait>", - "netcfg/get_hostname={{ .Name }} <wait>", - "netcfg/get_domain=vagrantup.com <wait>", - "fb=false <wait>", - "debconf/frontend=noninteractive <wait>", - "console-setup/ask_detect=false <wait>", - "console-keymaps-at/keymap=us <wait>", - "grub-installer/bootdev=/dev/sda <wait>", - "<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", - "guest_os_type": "Debian", - "hard_drive_interface": "sata", - "headless": "{{ user `headless` }}", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../builds/packer-{{user `template`}}-virtualbox", - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "virtualbox-iso", - "vboxmanage": [ - [ - "modifyvm", - "{{.Name}}", - "--memory", - "{{ user `memory` }}" - ], - [ - "modifyvm", - "{{.Name}}", - "--cpus", - "{{ user `cpus` }}" - ] - ], - "virtualbox_version_file": ".vbox_version", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<esc><wait>", - "install <wait>", - " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}} <wait>", - "debian-installer=en_US.UTF-8 <wait>", - "auto <wait>", - "locale=en_US.UTF-8 <wait>", - "kbd-chooser/method=us <wait>", - "keyboard-configuration/xkb-keymap=us <wait>", - "netcfg/get_hostname={{ .Name }} <wait>", - "netcfg/get_domain=vagrantup.com <wait>", - "fb=false <wait>", - "debconf/frontend=noninteractive <wait>", - "console-setup/ask_detect=false <wait>", - "console-keymaps-at/keymap=us <wait>", - "grub-installer/bootdev=/dev/sda <wait>", - "<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "debian8", - "headless": "{{ user `headless` }}", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../builds/packer-{{user `template`}}-vmware", - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "tools_upload_flavor": "linux", - "type": "vmware-iso", - "vm_name": "{{ user `template` }}", - "vmx_data": { - "cpuid.coresPerSocket": "1", - "ethernet0.pciSlotNumber": "32", - "memsize": "{{ user `memory` }}", - "numvcpus": "{{ user `cpus` }}" - }, - "vmx_remove_ethernet_interfaces": true - }, - { - "boot_command": [ - "<esc><wait>", - "install <wait>", - " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}} <wait>", - "debian-installer=en_US.UTF-8 <wait>", - "auto <wait>", - "locale=en_US.UTF-8 <wait>", - "kbd-chooser/method=us <wait>", - "keyboard-configuration/xkb-keymap=us <wait>", - "netcfg/get_hostname={{ .Name }} <wait>", - "netcfg/get_domain=vagrantup.com <wait>", - "fb=false <wait>", - "debconf/frontend=noninteractive <wait>", - "console-setup/ask_detect=false <wait>", - "console-keymaps-at/keymap=us <wait>", - "grub-installer/bootdev=/dev/sda <wait>", - "<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "debian", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../builds/packer-{{user `template`}}-parallels", - "parallels_tools_flavor": "lin", - "prlctl": [ - [ - "set", - "{{.Name}}", - "--memsize", - "{{ user `memory` }}" - ], - [ - "set", - "{{.Name}}", - "--cpus", - "{{ user `cpus` }}" - ] - ], - "prlctl_version_file": ".prlctl_version", - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "parallels-iso", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<esc><wait>", - "install <wait>", - " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}} <wait>", - "debian-installer=en_US.UTF-8 <wait>", - "auto <wait>", - "locale=en_US.UTF-8 <wait>", - "kbd-chooser/method=us <wait>", - "keyboard-configuration/xkb-keymap=us <wait>", - "netcfg/get_hostname={{ .Name }} <wait>", - "netcfg/get_domain=vagrantup.com <wait>", - "fb=false <wait>", - "debconf/frontend=noninteractive <wait>", - "console-setup/ask_detect=false <wait>", - "console-keymaps-at/keymap=us <wait>", - "grub-installer/bootdev=/dev/vda <wait>", - "<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "headless": "{{ user `headless` }}", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../builds/packer-{{user `template`}}-qemu", - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "qemu", - "vm_name": "{{ user `template` }}" - } - ], - "post-processors": [ - { - "output": "../builds/{{user `box_basename`}}.{{.Provider}}.box", - "type": "vagrant" - } - ], - "provisioners": [ - { - "environment_vars": [ - "HOME_DIR=/home/vagrant", - "http_proxy={{user `http_proxy`}}", - "https_proxy={{user `https_proxy`}}", - "no_proxy={{user `no_proxy`}}" - ], - "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", - "expect_disconnect": true, - "scripts": [ - "scripts/update.sh", - "../_common/sshd.sh", - "scripts/networking.sh", - "scripts/sudoers.sh", - "../_common/vagrant.sh", - "scripts/systemd.sh", - "../_common/virtualbox.sh", - "../_common/vmware.sh", - "../_common/parallels.sh", - "scripts/cleanup.sh", - "../_common/minimize.sh" - ], - "type": "shell" - } - ], - "variables": { - "box_basename": "debian-9.8-i386", - "build_timestamp": "{{isotime \"20060102150405\"}}", - "cpus": "1", - "disk_size": "65536", - "git_revision": "__unknown_git_revision__", - "headless": "", - "http_proxy": "{{env `http_proxy`}}", - "https_proxy": "{{env `https_proxy`}}", - "iso_checksum": "44dc843e39ab0b24dd6aa552bb93acd66c08cb3c95e64c614532d95db531a8c1", - "iso_checksum_type": "sha256", - "iso_name": "debian-9.9.0-i386-netinst.iso", - "memory": "1024", - "mirror": "http://cdimage.debian.org/cdimage/release", - "mirror_directory": "9.9.0/i386/iso-cd", - "name": "debian-9.8-i386", - "no_proxy": "{{env `no_proxy`}}", - "preseed_path": "debian-9/preseed.cfg", - "template": "debian-9.8-i386", - "version": "TIMESTAMP" - } -} diff --git a/debian/debian-9.9-ppc64el.json b/debian/debian-9.9-ppc64el.json deleted file mode 100644 index 8a6157b05..000000000 --- a/debian/debian-9.9-ppc64el.json +++ /dev/null @@ -1,101 +0,0 @@ -{ - "builders": [ - { - "boot_command": [ - "c<wait>", - "setparams 'Automated install'<enter><wait>", - "<enter><wait>", - "set options=\" preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}} <wait>", - "debian-installer=en_US.UTF-8 <wait>", - "auto <wait>", - "locale=en_US.UTF-8 <wait>", - "kbd-chooser/method=us <wait>", - "keyboard-configuration/xkb-keymap=us <wait>", - "netcfg/get_hostname={{ .Name }} <wait>", - "netcfg/get_domain=vagrantup.com <wait>", - "fb=false <wait>", - "debconf/frontend=noninteractive <wait>", - "console-setup/ask_detect=false <wait>", - "console-keymaps-at/keymap=us <wait>", - "grub-installer/bootdev=/dev/vda1 <wait>", - "\"", - "<enter><wait>", - "boot_one<wait>", - "<enter><wait>", - "boot<enter>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "headless": "{{ user `headless` }}", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../builds/packer-{{user `template`}}-qemu", - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "qemu", - "qemu_binary": "qemu-system-ppc64le", - "machine_type": "pseries", - "use_default_display": true, - "accelerator": "kvm", - "vm_name": "{{ user `template` }}" - } - ], - "post-processors": [ - { - "output": "../builds/{{user `box_basename`}}.{{.Provider}}.box", - "type": "vagrant" - } - ], - "provisioners": [ - { - "environment_vars": [ - "HOME_DIR=/home/vagrant", - "http_proxy={{user `http_proxy`}}", - "https_proxy={{user `https_proxy`}}", - "no_proxy={{user `no_proxy`}}" - ], - "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", - "expect_disconnect": true, - "scripts": [ - "scripts/update.sh", - "../_common/sshd.sh", - "scripts/networking.sh", - "scripts/sudoers.sh", - "../_common/vagrant.sh", - "scripts/systemd.sh", - "../_common/virtualbox.sh", - "../_common/vmware.sh", - "../_common/parallels.sh", - "scripts/cleanup.sh", - "../_common/minimize.sh" - ], - "type": "shell" - } - ], - "variables": { - "box_basename": "debian-9.8", - "build_timestamp": "{{isotime \"20060102150405\"}}", - "cpus": "1", - "disk_size": "65536", - "git_revision": "__unknown_git_revision__", - "headless": "", - "http_proxy": "{{env `http_proxy`}}", - "https_proxy": "{{env `https_proxy`}}", - "iso_checksum": "3ecde213fabd4d8ebec02b745970942c177793c939ef6e3fe679a436bf2e104d", - "iso_checksum_type": "sha256", - "iso_name": "debian-9.9.0-ppc64el-netinst.iso", - "memory": "1024", - "mirror": "http://cdimage.debian.org/cdimage/release", - "mirror_directory": "9.9.0/ppc64el/iso-cd", - "name": "debian-9.8", - "no_proxy": "{{env `no_proxy`}}", - "preseed_path": "debian-9/preseed.cfg", - "template": "debian-9.8-ppc64el", - "version": "TIMESTAMP" - } -} diff --git a/amazonlinux/README_FIRST.md b/packer_templates/amazonlinux/README_FIRST.md similarity index 100% rename from amazonlinux/README_FIRST.md rename to packer_templates/amazonlinux/README_FIRST.md diff --git a/amazonlinux/STEP1_build_ovf.sh b/packer_templates/amazonlinux/STEP1_build_ovf.sh similarity index 100% rename from amazonlinux/STEP1_build_ovf.sh rename to packer_templates/amazonlinux/STEP1_build_ovf.sh diff --git a/amazonlinux/amazon-2-x86_64.json b/packer_templates/amazonlinux/amazon-2-x86_64.json similarity index 100% rename from amazonlinux/amazon-2-x86_64.json rename to packer_templates/amazonlinux/amazon-2-x86_64.json diff --git a/amazonlinux/scripts/cleanup.sh b/packer_templates/amazonlinux/scripts/cleanup.sh similarity index 100% rename from amazonlinux/scripts/cleanup.sh rename to packer_templates/amazonlinux/scripts/cleanup.sh diff --git a/amazonlinux/scripts/networking.sh b/packer_templates/amazonlinux/scripts/networking.sh similarity index 100% rename from amazonlinux/scripts/networking.sh rename to packer_templates/amazonlinux/scripts/networking.sh diff --git a/amazonlinux/scripts/update.sh b/packer_templates/amazonlinux/scripts/update.sh similarity index 100% rename from amazonlinux/scripts/update.sh rename to packer_templates/amazonlinux/scripts/update.sh diff --git a/amazonlinux/seed_iso/meta-data b/packer_templates/amazonlinux/seed_iso/meta-data similarity index 100% rename from amazonlinux/seed_iso/meta-data rename to packer_templates/amazonlinux/seed_iso/meta-data diff --git a/amazonlinux/seed_iso/user-data b/packer_templates/amazonlinux/seed_iso/user-data similarity index 100% rename from amazonlinux/seed_iso/user-data rename to packer_templates/amazonlinux/seed_iso/user-data diff --git a/debian/http/debian-9/preseed.cfg b/packer_templates/debian/http/debian-9/preseed.cfg similarity index 100% rename from debian/http/debian-9/preseed.cfg rename to packer_templates/debian/http/debian-9/preseed.cfg diff --git a/sles/http/sles-15-x86_64-autoinst.xml b/packer_templates/sles/http/sles-15-x86_64-autoinst.xml similarity index 100% rename from sles/http/sles-15-x86_64-autoinst.xml rename to packer_templates/sles/http/sles-15-x86_64-autoinst.xml diff --git a/sles/sles-15.json b/packer_templates/sles/sles-15.json similarity index 100% rename from sles/sles-15.json rename to packer_templates/sles/sles-15.json diff --git a/ubuntu/ubuntu-19.04-amd64.json b/packer_templates/ubuntu/ubuntu-19.04-amd64.json similarity index 100% rename from ubuntu/ubuntu-19.04-amd64.json rename to packer_templates/ubuntu/ubuntu-19.04-amd64.json From d17b93b46f6608fcdee84dd168744e22f54a00c8 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith@chef.io> Date: Tue, 18 Jun 2019 11:30:12 +0100 Subject: [PATCH 0962/1622] Put the builds in the appropriate directory Signed-off-by: Tim Smith <tsmith@chef.io> --- lib/bento/build.rb | 2 +- packer_templates/amazonlinux/amazon-2-x86_64.json | 2 +- packer_templates/centos/centos-5.11-i386.json | 10 +++++----- packer_templates/centos/centos-5.11-x86_64.json | 10 +++++----- packer_templates/centos/centos-6.10-i386.json | 10 +++++----- packer_templates/centos/centos-6.10-x86_64.json | 10 +++++----- packer_templates/centos/centos-7.6-x86_64.json | 10 +++++----- packer_templates/debian/debian-8.11-amd64.json | 8 ++++---- packer_templates/debian/debian-8.11-i386.json | 8 ++++---- packer_templates/debian/debian-9.9-amd64.json | 8 ++++---- packer_templates/debian/debian-9.9-i386.json | 8 ++++---- packer_templates/debian/debian-9.9-ppc64el.json | 2 +- packer_templates/fedora/fedora-28-x86_64.json | 8 ++++---- packer_templates/fedora/fedora-29-x86_64.json | 10 +++++----- packer_templates/freebsd/freebsd-11.2-amd64.json | 8 ++++---- packer_templates/freebsd/freebsd-11.2-i386.json | 8 ++++---- packer_templates/freebsd/freebsd-12.0-amd64.json | 8 ++++---- packer_templates/freebsd/freebsd-12.0-i386.json | 8 ++++---- packer_templates/hardenedbsd/hardenedbsd-11-amd64.json | 8 ++++---- packer_templates/macos/macos-10.12.json | 6 +++--- packer_templates/macos/macosx-10.10.json | 6 +++--- packer_templates/macos/macosx-10.11.json | 6 +++--- .../opensuse/opensuse-leap-15.0-x86_64.json | 8 ++++---- .../opensuse/opensuse-leap-42.3-x86_64.json | 8 ++++---- packer_templates/oraclelinux/oracle-5.11-i386.json | 8 ++++---- packer_templates/oraclelinux/oracle-5.11-x86_64.json | 8 ++++---- packer_templates/oraclelinux/oracle-6.10-i386.json | 8 ++++---- packer_templates/oraclelinux/oracle-6.10-x86_64.json | 8 ++++---- packer_templates/oraclelinux/oracle-7.6-x86_64.json | 8 ++++---- packer_templates/rhel/rhel-5.11-i386.json | 8 ++++---- packer_templates/rhel/rhel-5.11-x86_64.json | 8 ++++---- packer_templates/rhel/rhel-6.10-i386.json | 8 ++++---- packer_templates/rhel/rhel-6.10-x86_64.json | 8 ++++---- packer_templates/rhel/rhel-7.6-x86_64.json | 8 ++++---- .../scientificlinux/scientific-7.6-x86_64.json | 2 +- packer_templates/sles/sles-11-sp4-x86_64.json | 8 ++++---- packer_templates/sles/sles-12-sp2-x86_64.json | 8 ++++---- packer_templates/sles/sles-12-sp3-x86_64.json | 8 ++++---- packer_templates/sles/sles-15.json | 8 ++++---- packer_templates/solaris/solaris-10.11-x86.json | 3 +-- packer_templates/solaris/solaris-11-x86.json | 3 +-- packer_templates/ubuntu/ubuntu-14.04-amd64.json | 10 +++++----- packer_templates/ubuntu/ubuntu-14.04-i386.json | 8 ++++---- packer_templates/ubuntu/ubuntu-16.04-amd64.json | 10 +++++----- packer_templates/ubuntu/ubuntu-16.04-i386.json | 8 ++++---- packer_templates/ubuntu/ubuntu-18.04-amd64.json | 10 +++++----- packer_templates/ubuntu/ubuntu-18.10-amd64.json | 10 +++++----- packer_templates/ubuntu/ubuntu-19.04-amd64.json | 10 +++++----- packer_templates/windows/10.json | 4 ++-- packer_templates/windows/2008r2.json | 2 +- packer_templates/windows/2012r2.json | 2 +- packer_templates/windows/2016.json | 4 ++-- packer_templates/windows/2019.json | 4 ++-- packer_templates/windows/7.json | 2 +- 54 files changed, 191 insertions(+), 193 deletions(-) diff --git a/lib/bento/build.rb b/lib/bento/build.rb index 36eafc295..2cc544768 100644 --- a/lib/bento/build.rb +++ b/lib/bento/build.rb @@ -78,7 +78,7 @@ def packer_build_cmd(template, var_file) def write_final_metadata(template, buildtime) md = BuildMetadata.new(template, build_timestamp, override_version).read - path = File.join("../builds") + path = File.join("../../builds") filename = File.join(path, "#{md[:box_basename]}.metadata.json") md[:providers] = ProviderMetadata.new(path, md[:box_basename]).read md[:providers].each do |p| diff --git a/packer_templates/amazonlinux/amazon-2-x86_64.json b/packer_templates/amazonlinux/amazon-2-x86_64.json index 5188c70ac..e2524b555 100644 --- a/packer_templates/amazonlinux/amazon-2-x86_64.json +++ b/packer_templates/amazonlinux/amazon-2-x86_64.json @@ -4,7 +4,7 @@ "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "headless": "{{ user `headless` }}", "http_directory": "http", - "output_directory": "../builds/packer-{{user `template`}}-virtualbox", + "output_directory": "../../builds/packer-{{user `template`}}-virtualbox", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_wait_timeout": "10000s", "ssh_port": 22, diff --git a/packer_templates/centos/centos-5.11-i386.json b/packer_templates/centos/centos-5.11-i386.json index 5c22d6d03..3aebf7917 100644 --- a/packer_templates/centos/centos-5.11-i386.json +++ b/packer_templates/centos/centos-5.11-i386.json @@ -14,7 +14,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../builds/packer-{{user `template`}}-virtualbox", + "output_directory": "../../builds/packer-{{user `template`}}-virtualbox", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, @@ -50,7 +50,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../builds/packer-{{user `template`}}-vmware", + "output_directory": "../../builds/packer-{{user `template`}}-vmware", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, @@ -77,7 +77,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../builds/packer-{{user `template`}}-parallels", + "output_directory": "../../builds/packer-{{user `template`}}-parallels", "parallels_tools_flavor": "lin", "prlctl": [ [ @@ -118,7 +118,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../builds/packer-{{user `template`}}-hyperv", + "output_directory": "../../builds/packer-{{user `template`}}-hyperv", "ram_size": "{{ user `memory` }}", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", @@ -140,7 +140,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../builds/packer-{{user `template`}}-qemu", + "output_directory": "../../builds/packer-{{user `template`}}-qemu", "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, diff --git a/packer_templates/centos/centos-5.11-x86_64.json b/packer_templates/centos/centos-5.11-x86_64.json index 3f104fa0a..a441bb826 100644 --- a/packer_templates/centos/centos-5.11-x86_64.json +++ b/packer_templates/centos/centos-5.11-x86_64.json @@ -14,7 +14,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../builds/packer-{{user `template`}}-virtualbox", + "output_directory": "../../builds/packer-{{user `template`}}-virtualbox", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, @@ -50,7 +50,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../builds/packer-{{user `template`}}-vmware", + "output_directory": "../../builds/packer-{{user `template`}}-vmware", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, @@ -77,7 +77,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../builds/packer-{{user `template`}}-parallels", + "output_directory": "../../builds/packer-{{user `template`}}-parallels", "parallels_tools_flavor": "lin", "prlctl": [ [ @@ -118,7 +118,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../builds/packer-{{user `template`}}-hyperv", + "output_directory": "../../builds/packer-{{user `template`}}-hyperv", "ram_size": "{{ user `memory` }}", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", @@ -140,7 +140,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../builds/packer-{{user `template`}}-qemu", + "output_directory": "../../builds/packer-{{user `template`}}-qemu", "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, diff --git a/packer_templates/centos/centos-6.10-i386.json b/packer_templates/centos/centos-6.10-i386.json index 147998a60..5b69ff870 100644 --- a/packer_templates/centos/centos-6.10-i386.json +++ b/packer_templates/centos/centos-6.10-i386.json @@ -14,7 +14,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../builds/packer-{{user `template`}}-virtualbox", + "output_directory": "../../builds/packer-{{user `template`}}-virtualbox", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, @@ -50,7 +50,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../builds/packer-{{user `template`}}-vmware", + "output_directory": "../../builds/packer-{{user `template`}}-vmware", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, @@ -77,7 +77,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../builds/packer-{{user `template`}}-parallels", + "output_directory": "../../builds/packer-{{user `template`}}-parallels", "parallels_tools_flavor": "lin", "prlctl": [ [ @@ -118,7 +118,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../builds/packer-{{user `template`}}-hyperv", + "output_directory": "../../builds/packer-{{user `template`}}-hyperv", "ram_size": "{{ user `memory` }}", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", @@ -140,7 +140,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../builds/packer-{{user `template`}}-qemu", + "output_directory": "../../builds/packer-{{user `template`}}-qemu", "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, diff --git a/packer_templates/centos/centos-6.10-x86_64.json b/packer_templates/centos/centos-6.10-x86_64.json index 9b128b618..57202a4e4 100644 --- a/packer_templates/centos/centos-6.10-x86_64.json +++ b/packer_templates/centos/centos-6.10-x86_64.json @@ -14,7 +14,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../builds/packer-{{user `template`}}-virtualbox", + "output_directory": "../../builds/packer-{{user `template`}}-virtualbox", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, @@ -50,7 +50,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../builds/packer-{{user `template`}}-vmware", + "output_directory": "../../builds/packer-{{user `template`}}-vmware", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, @@ -77,7 +77,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../builds/packer-{{user `template`}}-parallels", + "output_directory": "../../builds/packer-{{user `template`}}-parallels", "parallels_tools_flavor": "lin", "prlctl": [ [ @@ -118,7 +118,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../builds/packer-{{user `template`}}-hyperv", + "output_directory": "../../builds/packer-{{user `template`}}-hyperv", "ram_size": "{{ user `memory` }}", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", @@ -140,7 +140,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../builds/packer-{{user `template`}}-qemu", + "output_directory": "../../builds/packer-{{user `template`}}-qemu", "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, diff --git a/packer_templates/centos/centos-7.6-x86_64.json b/packer_templates/centos/centos-7.6-x86_64.json index b3bce0221..cc70e2c4b 100644 --- a/packer_templates/centos/centos-7.6-x86_64.json +++ b/packer_templates/centos/centos-7.6-x86_64.json @@ -14,7 +14,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../builds/packer-{{user `template`}}-virtualbox", + "output_directory": "../../builds/packer-{{user `template`}}-virtualbox", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, @@ -50,7 +50,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../builds/packer-{{user `template`}}-vmware", + "output_directory": "../../builds/packer-{{user `template`}}-vmware", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, @@ -77,7 +77,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../builds/packer-{{user `template`}}-parallels", + "output_directory": "../../builds/packer-{{user `template`}}-parallels", "parallels_tools_flavor": "lin", "prlctl": [ [ @@ -118,7 +118,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../builds/packer-{{user `template`}}-hyperv", + "output_directory": "../../builds/packer-{{user `template`}}-hyperv", "ram_size": "{{ user `memory` }}", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", @@ -140,7 +140,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../builds/packer-{{user `template`}}-qemu", + "output_directory": "../../builds/packer-{{user `template`}}-qemu", "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, diff --git a/packer_templates/debian/debian-8.11-amd64.json b/packer_templates/debian/debian-8.11-amd64.json index 42623dc5e..5134a1d68 100644 --- a/packer_templates/debian/debian-8.11-amd64.json +++ b/packer_templates/debian/debian-8.11-amd64.json @@ -29,7 +29,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../builds/packer-{{user `template`}}-virtualbox", + "output_directory": "../../builds/packer-{{user `template`}}-virtualbox", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", "ssh_password": "vagrant", "ssh_port": 22, @@ -80,7 +80,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../builds/packer-{{user `template`}}-vmware", + "output_directory": "../../builds/packer-{{user `template`}}-vmware", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", "ssh_password": "vagrant", "ssh_port": 22, @@ -123,7 +123,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../builds/packer-{{user `template`}}-parallels", + "output_directory": "../../builds/packer-{{user `template`}}-parallels", "parallels_tools_flavor": "lin", "prlctl": [ [ @@ -174,7 +174,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../builds/packer-{{user `template`}}-qemu", + "output_directory": "../../builds/packer-{{user `template`}}-qemu", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", "ssh_password": "vagrant", "ssh_port": 22, diff --git a/packer_templates/debian/debian-8.11-i386.json b/packer_templates/debian/debian-8.11-i386.json index 1ff5c81c5..276e6a311 100644 --- a/packer_templates/debian/debian-8.11-i386.json +++ b/packer_templates/debian/debian-8.11-i386.json @@ -29,7 +29,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../builds/packer-{{user `template`}}-virtualbox", + "output_directory": "../../builds/packer-{{user `template`}}-virtualbox", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", "ssh_password": "vagrant", "ssh_port": 22, @@ -80,7 +80,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../builds/packer-{{user `template`}}-vmware", + "output_directory": "../../builds/packer-{{user `template`}}-vmware", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", "ssh_password": "vagrant", "ssh_port": 22, @@ -123,7 +123,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../builds/packer-{{user `template`}}-parallels", + "output_directory": "../../builds/packer-{{user `template`}}-parallels", "parallels_tools_flavor": "lin", "prlctl": [ [ @@ -174,7 +174,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../builds/packer-{{user `template`}}-qemu", + "output_directory": "../../builds/packer-{{user `template`}}-qemu", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", "ssh_password": "vagrant", "ssh_port": 22, diff --git a/packer_templates/debian/debian-9.9-amd64.json b/packer_templates/debian/debian-9.9-amd64.json index f0bf413fd..09b9ff6c6 100644 --- a/packer_templates/debian/debian-9.9-amd64.json +++ b/packer_templates/debian/debian-9.9-amd64.json @@ -29,7 +29,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../builds/packer-{{user `template`}}-virtualbox", + "output_directory": "../../builds/packer-{{user `template`}}-virtualbox", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", "ssh_password": "vagrant", "ssh_port": 22, @@ -80,7 +80,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../builds/packer-{{user `template`}}-vmware", + "output_directory": "../../builds/packer-{{user `template`}}-vmware", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", "ssh_password": "vagrant", "ssh_port": 22, @@ -123,7 +123,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../builds/packer-{{user `template`}}-parallels", + "output_directory": "../../builds/packer-{{user `template`}}-parallels", "parallels_tools_flavor": "lin", "prlctl": [ [ @@ -174,7 +174,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../builds/packer-{{user `template`}}-qemu", + "output_directory": "../../builds/packer-{{user `template`}}-qemu", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", "ssh_password": "vagrant", "ssh_port": 22, diff --git a/packer_templates/debian/debian-9.9-i386.json b/packer_templates/debian/debian-9.9-i386.json index 259a6ca5f..a5fe2d19e 100644 --- a/packer_templates/debian/debian-9.9-i386.json +++ b/packer_templates/debian/debian-9.9-i386.json @@ -29,7 +29,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../builds/packer-{{user `template`}}-virtualbox", + "output_directory": "../../builds/packer-{{user `template`}}-virtualbox", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", "ssh_password": "vagrant", "ssh_port": 22, @@ -80,7 +80,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../builds/packer-{{user `template`}}-vmware", + "output_directory": "../../builds/packer-{{user `template`}}-vmware", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", "ssh_password": "vagrant", "ssh_port": 22, @@ -123,7 +123,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../builds/packer-{{user `template`}}-parallels", + "output_directory": "../../builds/packer-{{user `template`}}-parallels", "parallels_tools_flavor": "lin", "prlctl": [ [ @@ -174,7 +174,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../builds/packer-{{user `template`}}-qemu", + "output_directory": "../../builds/packer-{{user `template`}}-qemu", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", "ssh_password": "vagrant", "ssh_port": 22, diff --git a/packer_templates/debian/debian-9.9-ppc64el.json b/packer_templates/debian/debian-9.9-ppc64el.json index 8a6157b05..c3f2649f8 100644 --- a/packer_templates/debian/debian-9.9-ppc64el.json +++ b/packer_templates/debian/debian-9.9-ppc64el.json @@ -31,7 +31,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../builds/packer-{{user `template`}}-qemu", + "output_directory": "../../builds/packer-{{user `template`}}-qemu", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", "ssh_password": "vagrant", "ssh_port": 22, diff --git a/packer_templates/fedora/fedora-28-x86_64.json b/packer_templates/fedora/fedora-28-x86_64.json index 2f22c7d91..3b8a46924 100644 --- a/packer_templates/fedora/fedora-28-x86_64.json +++ b/packer_templates/fedora/fedora-28-x86_64.json @@ -14,7 +14,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../builds/packer-{{user `template`}}-virtualbox", + "output_directory": "../../builds/packer-{{user `template`}}-virtualbox", "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", "ssh_password": "vagrant", "ssh_port": 22, @@ -50,7 +50,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../builds/packer-{{user `template`}}-vmware", + "output_directory": "../../builds/packer-{{user `template`}}-vmware", "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", "ssh_password": "vagrant", "ssh_port": 22, @@ -78,7 +78,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../builds/packer-{{user `template`}}-parallels", + "output_directory": "../../builds/packer-{{user `template`}}-parallels", "parallels_tools_flavor": "lin", "prlctl": [ [ @@ -114,7 +114,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../builds/packer-{{user `template`}}-qemu", + "output_directory": "../../builds/packer-{{user `template`}}-qemu", "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", "ssh_password": "vagrant", "ssh_port": 22, diff --git a/packer_templates/fedora/fedora-29-x86_64.json b/packer_templates/fedora/fedora-29-x86_64.json index 495d22657..2208c2d36 100644 --- a/packer_templates/fedora/fedora-29-x86_64.json +++ b/packer_templates/fedora/fedora-29-x86_64.json @@ -4,7 +4,7 @@ "type": "qemu", "vm_name": "{{ user `template` }}", "name": "{{ user `template` }}", - "output_directory": "../builds/packer-{{user `template`}}-libvirt", + "output_directory": "../../builds/packer-{{user `template`}}-libvirt", "accelerator": "kvm", "boot_wait": "10s", "boot_command": [ @@ -52,7 +52,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../builds/packer-{{user `template`}}-virtualbox", + "output_directory": "../../builds/packer-{{user `template`}}-virtualbox", "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", "ssh_password": "vagrant", "ssh_port": 22, @@ -88,7 +88,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../builds/packer-{{user `template`}}-vmware", + "output_directory": "../../builds/packer-{{user `template`}}-vmware", "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", "ssh_password": "vagrant", "ssh_port": 22, @@ -116,7 +116,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../builds/packer-{{user `template`}}-parallels", + "output_directory": "../../builds/packer-{{user `template`}}-parallels", "parallels_tools_flavor": "lin", "prlctl": [ [ @@ -152,7 +152,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../builds/packer-{{user `template`}}-qemu", + "output_directory": "../../builds/packer-{{user `template`}}-qemu", "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", "ssh_password": "vagrant", "ssh_port": 22, diff --git a/packer_templates/freebsd/freebsd-11.2-amd64.json b/packer_templates/freebsd/freebsd-11.2-amd64.json index 09814d8d7..acb06cdc8 100644 --- a/packer_templates/freebsd/freebsd-11.2-amd64.json +++ b/packer_templates/freebsd/freebsd-11.2-amd64.json @@ -21,7 +21,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../builds/packer-{{user `template`}}-virtualbox", + "output_directory": "../../builds/packer-{{user `template`}}-virtualbox", "shutdown_command": "echo 'vagrant' | su -m root -c 'shutdown -p now'", "ssh_password": "vagrant", "ssh_port": 22, @@ -66,7 +66,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../builds/packer-{{user `template`}}-vmware", + "output_directory": "../../builds/packer-{{user `template`}}-vmware", "shutdown_command": "echo 'vagrant' | su -m root -c 'shutdown -p now'", "ssh_password": "vagrant", "ssh_port": 22, @@ -100,7 +100,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../builds/packer-{{user `template`}}-parallels", + "output_directory": "../../builds/packer-{{user `template`}}-parallels", "parallels_tools_mode": "disable", "prlctl": [ [ @@ -164,7 +164,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../builds/packer-{{user `template`}}-qemu", + "output_directory": "../../builds/packer-{{user `template`}}-qemu", "shutdown_command": "echo 'vagrant' | su -m root -c 'shutdown -p now'", "ssh_password": "vagrant", "ssh_port": 22, diff --git a/packer_templates/freebsd/freebsd-11.2-i386.json b/packer_templates/freebsd/freebsd-11.2-i386.json index 63dce8b00..e321f37d0 100644 --- a/packer_templates/freebsd/freebsd-11.2-i386.json +++ b/packer_templates/freebsd/freebsd-11.2-i386.json @@ -21,7 +21,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../builds/packer-{{user `template`}}-virtualbox", + "output_directory": "../../builds/packer-{{user `template`}}-virtualbox", "shutdown_command": "echo 'vagrant' | su -m root -c 'shutdown -p now'", "ssh_password": "vagrant", "ssh_port": 22, @@ -66,7 +66,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../builds/packer-{{user `template`}}-vmware", + "output_directory": "../../builds/packer-{{user `template`}}-vmware", "shutdown_command": "echo 'vagrant' | su -m root -c 'shutdown -p now'", "ssh_password": "vagrant", "ssh_port": 22, @@ -100,7 +100,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../builds/packer-{{user `template`}}-parallels", + "output_directory": "../../builds/packer-{{user `template`}}-parallels", "parallels_tools_mode": "disable", "prlctl": [ [ @@ -164,7 +164,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../builds/packer-{{user `template`}}-qemu", + "output_directory": "../../builds/packer-{{user `template`}}-qemu", "shutdown_command": "echo 'vagrant' | su -m root -c 'shutdown -p now'", "ssh_password": "vagrant", "ssh_port": 22, diff --git a/packer_templates/freebsd/freebsd-12.0-amd64.json b/packer_templates/freebsd/freebsd-12.0-amd64.json index fa2f5cb46..3ab56ce66 100644 --- a/packer_templates/freebsd/freebsd-12.0-amd64.json +++ b/packer_templates/freebsd/freebsd-12.0-amd64.json @@ -21,7 +21,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../builds/packer-{{user `template`}}-virtualbox", + "output_directory": "../../builds/packer-{{user `template`}}-virtualbox", "shutdown_command": "echo 'vagrant' | su -m root -c 'shutdown -p now'", "ssh_password": "vagrant", "ssh_port": 22, @@ -66,7 +66,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../builds/packer-{{user `template`}}-vmware", + "output_directory": "../../builds/packer-{{user `template`}}-vmware", "shutdown_command": "echo 'vagrant' | su -m root -c 'shutdown -p now'", "ssh_password": "vagrant", "ssh_port": 22, @@ -100,7 +100,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../builds/packer-{{user `template`}}-parallels", + "output_directory": "../../builds/packer-{{user `template`}}-parallels", "parallels_tools_mode": "disable", "prlctl": [ [ @@ -164,7 +164,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../builds/packer-{{user `template`}}-qemu", + "output_directory": "../../builds/packer-{{user `template`}}-qemu", "shutdown_command": "echo 'vagrant' | su -m root -c 'shutdown -p now'", "ssh_password": "vagrant", "ssh_port": 22, diff --git a/packer_templates/freebsd/freebsd-12.0-i386.json b/packer_templates/freebsd/freebsd-12.0-i386.json index 64eda4c38..860a631ed 100644 --- a/packer_templates/freebsd/freebsd-12.0-i386.json +++ b/packer_templates/freebsd/freebsd-12.0-i386.json @@ -21,7 +21,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../builds/packer-{{user `template`}}-virtualbox", + "output_directory": "../../builds/packer-{{user `template`}}-virtualbox", "shutdown_command": "echo 'vagrant' | su -m root -c 'shutdown -p now'", "ssh_password": "vagrant", "ssh_port": 22, @@ -66,7 +66,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../builds/packer-{{user `template`}}-vmware", + "output_directory": "../../builds/packer-{{user `template`}}-vmware", "shutdown_command": "echo 'vagrant' | su -m root -c 'shutdown -p now'", "ssh_password": "vagrant", "ssh_port": 22, @@ -100,7 +100,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../builds/packer-{{user `template`}}-parallels", + "output_directory": "../../builds/packer-{{user `template`}}-parallels", "parallels_tools_mode": "disable", "prlctl": [ [ @@ -164,7 +164,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../builds/packer-{{user `template`}}-qemu", + "output_directory": "../../builds/packer-{{user `template`}}-qemu", "shutdown_command": "echo 'vagrant' | su -m root -c 'shutdown -p now'", "ssh_password": "vagrant", "ssh_port": 22, diff --git a/packer_templates/hardenedbsd/hardenedbsd-11-amd64.json b/packer_templates/hardenedbsd/hardenedbsd-11-amd64.json index b4938d74d..e166c0c69 100644 --- a/packer_templates/hardenedbsd/hardenedbsd-11-amd64.json +++ b/packer_templates/hardenedbsd/hardenedbsd-11-amd64.json @@ -21,7 +21,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../builds/packer-{{user `template`}}-virtualbox", + "output_directory": "../../builds/packer-{{user `template`}}-virtualbox", "shutdown_command": "echo 'vagrant' | su -m root -c 'shutdown -p now'", "ssh_password": "vagrant", "ssh_port": 22, @@ -66,7 +66,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../builds/packer-{{user `template`}}-vmware", + "output_directory": "../../builds/packer-{{user `template`}}-vmware", "shutdown_command": "echo 'vagrant' | su -m root -c 'shutdown -p now'", "ssh_password": "vagrant", "ssh_port": 22, @@ -101,7 +101,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../builds/packer-{{user `template`}}-parallels", + "output_directory": "../../builds/packer-{{user `template`}}-parallels", "parallels_tools_mode": "disable", "prlctl": [ [ @@ -165,7 +165,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../builds/packer-{{user `template`}}-qemu", + "output_directory": "../../builds/packer-{{user `template`}}-qemu", "shutdown_command": "echo 'vagrant' | su -m root -c 'shutdown -p now'", "ssh_password": "vagrant", "ssh_port": 22, diff --git a/packer_templates/macos/macos-10.12.json b/packer_templates/macos/macos-10.12.json index ead66f553..fca1529c7 100644 --- a/packer_templates/macos/macos-10.12.json +++ b/packer_templates/macos/macos-10.12.json @@ -8,7 +8,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `iso_url`}}", - "output_directory": "../builds/packer-{{user `template`}}-vmware", + "output_directory": "../../builds/packer-{{user `template`}}-vmware", "shutdown_command": "echo 'vagrant'| sudo -S shutdown -h now", "skip_compaction": true, "ssh_password": "vagrant", @@ -43,7 +43,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `iso_url`}}", - "output_directory": "../builds/packer-{{user `template`}}-virtualbox", + "output_directory": "../../builds/packer-{{user `template`}}-virtualbox", "shutdown_command": "echo 'vagrant'| sudo -S shutdown -h now", "ssh_password": "vagrant", "ssh_port": 22, @@ -161,7 +161,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `iso_url`}}", - "output_directory": "../builds/packer-{{user `template`}}-parallels", + "output_directory": "../../builds/packer-{{user `template`}}-parallels", "parallels_tools_flavor": "mac", "prlctl": [ [ diff --git a/packer_templates/macos/macosx-10.10.json b/packer_templates/macos/macosx-10.10.json index 1e68b13c6..e6d01ea49 100644 --- a/packer_templates/macos/macosx-10.10.json +++ b/packer_templates/macos/macosx-10.10.json @@ -8,7 +8,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `iso_url`}}", - "output_directory": "../builds/packer-{{user `template`}}-vmware", + "output_directory": "../../builds/packer-{{user `template`}}-vmware", "shutdown_command": "echo 'vagrant'| sudo -S shutdown -h now", "skip_compaction": true, "ssh_password": "vagrant", @@ -43,7 +43,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `iso_url`}}", - "output_directory": "../builds/packer-{{user `template`}}-virtualbox", + "output_directory": "../../builds/packer-{{user `template`}}-virtualbox", "shutdown_command": "echo 'vagrant'| sudo -S shutdown -h now", "ssh_password": "vagrant", "ssh_port": 22, @@ -161,7 +161,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `iso_url`}}", - "output_directory": "../builds/packer-{{user `template`}}-parallels", + "output_directory": "../../builds/packer-{{user `template`}}-parallels", "parallels_tools_flavor": "mac", "prlctl": [ [ diff --git a/packer_templates/macos/macosx-10.11.json b/packer_templates/macos/macosx-10.11.json index c3b47724c..dbe71cdb3 100644 --- a/packer_templates/macos/macosx-10.11.json +++ b/packer_templates/macos/macosx-10.11.json @@ -8,7 +8,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `iso_url`}}", - "output_directory": "../builds/packer-{{user `template`}}-vmware", + "output_directory": "../../builds/packer-{{user `template`}}-vmware", "shutdown_command": "echo 'vagrant'| sudo -S shutdown -h now", "skip_compaction": true, "ssh_password": "vagrant", @@ -43,7 +43,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `iso_url`}}", - "output_directory": "../builds/packer-{{user `template`}}-virtualbox", + "output_directory": "../../builds/packer-{{user `template`}}-virtualbox", "shutdown_command": "echo 'vagrant'| sudo -S shutdown -h now", "ssh_password": "vagrant", "ssh_port": 22, @@ -161,7 +161,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `iso_url`}}", - "output_directory": "../builds/packer-{{user `template`}}-parallels", + "output_directory": "../../builds/packer-{{user `template`}}-parallels", "parallels_tools_flavor": "mac", "prlctl": [ [ diff --git a/packer_templates/opensuse/opensuse-leap-15.0-x86_64.json b/packer_templates/opensuse/opensuse-leap-15.0-x86_64.json index f03fc726c..8b0a9cedb 100644 --- a/packer_templates/opensuse/opensuse-leap-15.0-x86_64.json +++ b/packer_templates/opensuse/opensuse-leap-15.0-x86_64.json @@ -23,7 +23,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../builds/packer-{{user `template`}}-virtualbox", + "output_directory": "../../builds/packer-{{user `template`}}-virtualbox", "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, @@ -68,7 +68,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../builds/packer-{{user `template`}}-vmware", + "output_directory": "../../builds/packer-{{user `template`}}-vmware", "shutdown_command": "echo 'vagrant'|sudo -S /sbin/shutdown -h 1", "ssh_password": "vagrant", "ssh_port": 22, @@ -104,7 +104,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../builds/packer-{{user `template`}}-parallels", + "output_directory": "../../builds/packer-{{user `template`}}-parallels", "parallels_tools_flavor": "lin", "prlctl": [ [ @@ -144,7 +144,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../builds/packer-{{user `template`}}-qemu", + "output_directory": "../../builds/packer-{{user `template`}}-qemu", "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, diff --git a/packer_templates/opensuse/opensuse-leap-42.3-x86_64.json b/packer_templates/opensuse/opensuse-leap-42.3-x86_64.json index e2139f779..6a3b910af 100644 --- a/packer_templates/opensuse/opensuse-leap-42.3-x86_64.json +++ b/packer_templates/opensuse/opensuse-leap-42.3-x86_64.json @@ -23,7 +23,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../builds/packer-{{user `template`}}-virtualbox", + "output_directory": "../../builds/packer-{{user `template`}}-virtualbox", "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, @@ -68,7 +68,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../builds/packer-{{user `template`}}-vmware", + "output_directory": "../../builds/packer-{{user `template`}}-vmware", "shutdown_command": "echo 'vagrant'|sudo -S /sbin/shutdown -h 1", "ssh_password": "vagrant", "ssh_port": 22, @@ -104,7 +104,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../builds/packer-{{user `template`}}-parallels", + "output_directory": "../../builds/packer-{{user `template`}}-parallels", "parallels_tools_flavor": "lin", "prlctl": [ [ @@ -144,7 +144,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../builds/packer-{{user `template`}}-qemu", + "output_directory": "../../builds/packer-{{user `template`}}-qemu", "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, diff --git a/packer_templates/oraclelinux/oracle-5.11-i386.json b/packer_templates/oraclelinux/oracle-5.11-i386.json index c28ddd429..d8839467e 100644 --- a/packer_templates/oraclelinux/oracle-5.11-i386.json +++ b/packer_templates/oraclelinux/oracle-5.11-i386.json @@ -14,7 +14,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../builds/packer-{{user `template`}}-virtualbox", + "output_directory": "../../builds/packer-{{user `template`}}-virtualbox", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, @@ -50,7 +50,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../builds/packer-{{user `template`}}-vmware", + "output_directory": "../../builds/packer-{{user `template`}}-vmware", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, @@ -77,7 +77,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../builds/packer-{{user `template`}}-parallels", + "output_directory": "../../builds/packer-{{user `template`}}-parallels", "parallels_tools_flavor": "lin", "prlctl": [ [ @@ -113,7 +113,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../builds/packer-{{user `template`}}-qemu", + "output_directory": "../../builds/packer-{{user `template`}}-qemu", "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, diff --git a/packer_templates/oraclelinux/oracle-5.11-x86_64.json b/packer_templates/oraclelinux/oracle-5.11-x86_64.json index 856da8d78..703c2d80d 100644 --- a/packer_templates/oraclelinux/oracle-5.11-x86_64.json +++ b/packer_templates/oraclelinux/oracle-5.11-x86_64.json @@ -14,7 +14,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../builds/packer-{{user `template`}}-virtualbox", + "output_directory": "../../builds/packer-{{user `template`}}-virtualbox", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, @@ -56,7 +56,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../builds/packer-{{user `template`}}-vmware", + "output_directory": "../../builds/packer-{{user `template`}}-vmware", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, @@ -83,7 +83,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../builds/packer-{{user `template`}}-parallels", + "output_directory": "../../builds/packer-{{user `template`}}-parallels", "parallels_tools_flavor": "lin", "prlctl": [ [ @@ -119,7 +119,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../builds/packer-{{user `template`}}-qemu", + "output_directory": "../../builds/packer-{{user `template`}}-qemu", "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, diff --git a/packer_templates/oraclelinux/oracle-6.10-i386.json b/packer_templates/oraclelinux/oracle-6.10-i386.json index ed87c8e13..b12ca2c7d 100644 --- a/packer_templates/oraclelinux/oracle-6.10-i386.json +++ b/packer_templates/oraclelinux/oracle-6.10-i386.json @@ -14,7 +14,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../builds/packer-{{user `template`}}-virtualbox", + "output_directory": "../../builds/packer-{{user `template`}}-virtualbox", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, @@ -50,7 +50,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../builds/packer-{{user `template`}}-vmware", + "output_directory": "../../builds/packer-{{user `template`}}-vmware", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, @@ -77,7 +77,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../builds/packer-{{user `template`}}-parallels", + "output_directory": "../../builds/packer-{{user `template`}}-parallels", "parallels_tools_flavor": "lin", "prlctl": [ [ @@ -113,7 +113,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../builds/packer-{{user `template`}}-qemu", + "output_directory": "../../builds/packer-{{user `template`}}-qemu", "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, diff --git a/packer_templates/oraclelinux/oracle-6.10-x86_64.json b/packer_templates/oraclelinux/oracle-6.10-x86_64.json index 6631bdeb7..541d5a01e 100644 --- a/packer_templates/oraclelinux/oracle-6.10-x86_64.json +++ b/packer_templates/oraclelinux/oracle-6.10-x86_64.json @@ -14,7 +14,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../builds/packer-{{user `template`}}-virtualbox", + "output_directory": "../../builds/packer-{{user `template`}}-virtualbox", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, @@ -50,7 +50,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../builds/packer-{{user `template`}}-vmware", + "output_directory": "../../builds/packer-{{user `template`}}-vmware", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, @@ -77,7 +77,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../builds/packer-{{user `template`}}-parallels", + "output_directory": "../../builds/packer-{{user `template`}}-parallels", "parallels_tools_flavor": "lin", "prlctl": [ [ @@ -113,7 +113,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../builds/packer-{{user `template`}}-qemu", + "output_directory": "../../builds/packer-{{user `template`}}-qemu", "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, diff --git a/packer_templates/oraclelinux/oracle-7.6-x86_64.json b/packer_templates/oraclelinux/oracle-7.6-x86_64.json index c54cfeab4..952be9568 100644 --- a/packer_templates/oraclelinux/oracle-7.6-x86_64.json +++ b/packer_templates/oraclelinux/oracle-7.6-x86_64.json @@ -14,7 +14,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../builds/packer-{{user `template`}}-virtualbox", + "output_directory": "../../builds/packer-{{user `template`}}-virtualbox", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, @@ -50,7 +50,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../builds/packer-{{user `template`}}-vmware", + "output_directory": "../../builds/packer-{{user `template`}}-vmware", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, @@ -77,7 +77,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../builds/packer-{{user `template`}}-parallels", + "output_directory": "../../builds/packer-{{user `template`}}-parallels", "parallels_tools_flavor": "lin", "prlctl": [ [ @@ -113,7 +113,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../builds/packer-{{user `template`}}-qemu", + "output_directory": "../../builds/packer-{{user `template`}}-qemu", "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, diff --git a/packer_templates/rhel/rhel-5.11-i386.json b/packer_templates/rhel/rhel-5.11-i386.json index 78f04e231..3b90c974e 100644 --- a/packer_templates/rhel/rhel-5.11-i386.json +++ b/packer_templates/rhel/rhel-5.11-i386.json @@ -14,7 +14,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../builds/packer-{{user `template`}}-virtualbox", + "output_directory": "../../builds/packer-{{user `template`}}-virtualbox", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, @@ -50,7 +50,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../builds/packer-{{user `template`}}-vmware", + "output_directory": "../../builds/packer-{{user `template`}}-vmware", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, @@ -77,7 +77,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../builds/packer-{{user `template`}}-parallels", + "output_directory": "../../builds/packer-{{user `template`}}-parallels", "parallels_tools_flavor": "lin", "prlctl": [ [ @@ -113,7 +113,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../builds/packer-{{user `template`}}-qemu", + "output_directory": "../../builds/packer-{{user `template`}}-qemu", "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, diff --git a/packer_templates/rhel/rhel-5.11-x86_64.json b/packer_templates/rhel/rhel-5.11-x86_64.json index a0bec8ef5..675a2f84c 100644 --- a/packer_templates/rhel/rhel-5.11-x86_64.json +++ b/packer_templates/rhel/rhel-5.11-x86_64.json @@ -14,7 +14,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../builds/packer-{{user `template`}}-virtualbox", + "output_directory": "../../builds/packer-{{user `template`}}-virtualbox", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, @@ -56,7 +56,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../builds/packer-{{user `template`}}-vmware", + "output_directory": "../../builds/packer-{{user `template`}}-vmware", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, @@ -83,7 +83,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../builds/packer-{{user `template`}}-parallels", + "output_directory": "../../builds/packer-{{user `template`}}-parallels", "parallels_tools_flavor": "lin", "prlctl": [ [ @@ -119,7 +119,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../builds/packer-{{user `template`}}-qemu", + "output_directory": "../../builds/packer-{{user `template`}}-qemu", "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, diff --git a/packer_templates/rhel/rhel-6.10-i386.json b/packer_templates/rhel/rhel-6.10-i386.json index 24bb84265..ff2a4be02 100644 --- a/packer_templates/rhel/rhel-6.10-i386.json +++ b/packer_templates/rhel/rhel-6.10-i386.json @@ -14,7 +14,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../builds/packer-{{user `template`}}-virtualbox", + "output_directory": "../../builds/packer-{{user `template`}}-virtualbox", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, @@ -50,7 +50,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../builds/packer-{{user `template`}}-vmware", + "output_directory": "../../builds/packer-{{user `template`}}-vmware", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, @@ -77,7 +77,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../builds/packer-{{user `template`}}-parallels", + "output_directory": "../../builds/packer-{{user `template`}}-parallels", "parallels_tools_flavor": "lin", "prlctl": [ [ @@ -113,7 +113,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../builds/packer-{{user `template`}}-qemu", + "output_directory": "../../builds/packer-{{user `template`}}-qemu", "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, diff --git a/packer_templates/rhel/rhel-6.10-x86_64.json b/packer_templates/rhel/rhel-6.10-x86_64.json index 8eb984ecd..9d251d766 100644 --- a/packer_templates/rhel/rhel-6.10-x86_64.json +++ b/packer_templates/rhel/rhel-6.10-x86_64.json @@ -14,7 +14,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../builds/packer-{{user `template`}}-virtualbox", + "output_directory": "../../builds/packer-{{user `template`}}-virtualbox", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, @@ -50,7 +50,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../builds/packer-{{user `template`}}-vmware", + "output_directory": "../../builds/packer-{{user `template`}}-vmware", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, @@ -77,7 +77,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../builds/packer-{{user `template`}}-parallels", + "output_directory": "../../builds/packer-{{user `template`}}-parallels", "parallels_tools_flavor": "lin", "prlctl": [ [ @@ -113,7 +113,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../builds/packer-{{user `template`}}-qemu", + "output_directory": "../../builds/packer-{{user `template`}}-qemu", "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, diff --git a/packer_templates/rhel/rhel-7.6-x86_64.json b/packer_templates/rhel/rhel-7.6-x86_64.json index 19299c6ea..9e250f28f 100644 --- a/packer_templates/rhel/rhel-7.6-x86_64.json +++ b/packer_templates/rhel/rhel-7.6-x86_64.json @@ -14,7 +14,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../builds/packer-{{user `template`}}-virtualbox", + "output_directory": "../../builds/packer-{{user `template`}}-virtualbox", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, @@ -50,7 +50,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../builds/packer-{{user `template`}}-vmware", + "output_directory": "../../builds/packer-{{user `template`}}-vmware", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, @@ -77,7 +77,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../builds/packer-{{user `template`}}-parallels", + "output_directory": "../../builds/packer-{{user `template`}}-parallels", "parallels_tools_flavor": "lin", "prlctl": [ [ @@ -113,7 +113,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../builds/packer-{{user `template`}}-qemu", + "output_directory": "../../builds/packer-{{user `template`}}-qemu", "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, diff --git a/packer_templates/scientificlinux/scientific-7.6-x86_64.json b/packer_templates/scientificlinux/scientific-7.6-x86_64.json index 4028b5bf4..6cb732685 100644 --- a/packer_templates/scientificlinux/scientific-7.6-x86_64.json +++ b/packer_templates/scientificlinux/scientific-7.6-x86_64.json @@ -14,7 +14,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../builds/packer-{{user `template`}}-virtualbox", + "output_directory": "../../builds/packer-{{user `template`}}-virtualbox", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, diff --git a/packer_templates/sles/sles-11-sp4-x86_64.json b/packer_templates/sles/sles-11-sp4-x86_64.json index 2957f3ca9..cf76d6dc3 100644 --- a/packer_templates/sles/sles-11-sp4-x86_64.json +++ b/packer_templates/sles/sles-11-sp4-x86_64.json @@ -18,7 +18,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `iso_name`}}", - "output_directory": "../builds/packer-{{user `template`}}-virtualbox", + "output_directory": "../../builds/packer-{{user `template`}}-virtualbox", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, @@ -58,7 +58,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `iso_name`}}", - "output_directory": "../builds/packer-{{user `template`}}-vmware", + "output_directory": "../../builds/packer-{{user `template`}}-vmware", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, @@ -89,7 +89,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `iso_name`}}", - "output_directory": "../builds/packer-{{user `template`}}-parallels", + "output_directory": "../../builds/packer-{{user `template`}}-parallels", "parallels_tools_flavor": "lin", "prlctl": [ [ @@ -129,7 +129,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `iso_name`}}", - "output_directory": "../builds/packer-{{user `template`}}-qemu", + "output_directory": "../../builds/packer-{{user `template`}}-qemu", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, diff --git a/packer_templates/sles/sles-12-sp2-x86_64.json b/packer_templates/sles/sles-12-sp2-x86_64.json index a7fbf32f9..20c668caf 100644 --- a/packer_templates/sles/sles-12-sp2-x86_64.json +++ b/packer_templates/sles/sles-12-sp2-x86_64.json @@ -18,7 +18,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `iso_name`}}", - "output_directory": "../builds/packer-{{user `template`}}-virtualbox", + "output_directory": "../../builds/packer-{{user `template`}}-virtualbox", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, @@ -58,7 +58,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `iso_name`}}", - "output_directory": "../builds/packer-{{user `template`}}-vmware", + "output_directory": "../../builds/packer-{{user `template`}}-vmware", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, @@ -89,7 +89,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `iso_name`}}", - "output_directory": "../builds/packer-{{user `template`}}-parallels", + "output_directory": "../../builds/packer-{{user `template`}}-parallels", "parallels_tools_flavor": "lin", "prlctl": [ [ @@ -129,7 +129,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `iso_name`}}", - "output_directory": "../builds/packer-{{user `template`}}-qemu", + "output_directory": "../../builds/packer-{{user `template`}}-qemu", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, diff --git a/packer_templates/sles/sles-12-sp3-x86_64.json b/packer_templates/sles/sles-12-sp3-x86_64.json index aa3ae0c19..452b7fcf8 100644 --- a/packer_templates/sles/sles-12-sp3-x86_64.json +++ b/packer_templates/sles/sles-12-sp3-x86_64.json @@ -18,7 +18,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `iso_name`}}", - "output_directory": "../builds/packer-{{user `template`}}-virtualbox", + "output_directory": "../../builds/packer-{{user `template`}}-virtualbox", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, @@ -58,7 +58,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `iso_name`}}", - "output_directory": "../builds/packer-{{user `template`}}-vmware", + "output_directory": "../../builds/packer-{{user `template`}}-vmware", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, @@ -89,7 +89,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `iso_name`}}", - "output_directory": "../builds/packer-{{user `template`}}-parallels", + "output_directory": "../../builds/packer-{{user `template`}}-parallels", "parallels_tools_flavor": "lin", "prlctl": [ [ @@ -129,7 +129,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `iso_name`}}", - "output_directory": "../builds/packer-{{user `template`}}-qemu", + "output_directory": "../../builds/packer-{{user `template`}}-qemu", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, diff --git a/packer_templates/sles/sles-15.json b/packer_templates/sles/sles-15.json index 99a7e1f6f..fd4d0bcc4 100644 --- a/packer_templates/sles/sles-15.json +++ b/packer_templates/sles/sles-15.json @@ -18,7 +18,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `iso_name`}}", - "output_directory": "../builds/packer-{{user `template`}}-virtualbox", + "output_directory": "../../builds/packer-{{user `template`}}-virtualbox", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, @@ -72,7 +72,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `iso_name`}}", - "output_directory": "../builds/packer-{{user `template`}}-vmware", + "output_directory": "../../builds/packer-{{user `template`}}-vmware", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, @@ -103,7 +103,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `iso_name`}}", - "output_directory": "../builds/packer-{{user `template`}}-parallels", + "output_directory": "../../builds/packer-{{user `template`}}-parallels", "parallels_tools_flavor": "lin", "prlctl": [ [ @@ -143,7 +143,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `iso_name`}}", - "output_directory": "../builds/packer-{{user `template`}}-qemu", + "output_directory": "../../builds/packer-{{user `template`}}-qemu", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, diff --git a/packer_templates/solaris/solaris-10.11-x86.json b/packer_templates/solaris/solaris-10.11-x86.json index 61dc1f593..c695133c1 100644 --- a/packer_templates/solaris/solaris-10.11-x86.json +++ b/packer_templates/solaris/solaris-10.11-x86.json @@ -97,7 +97,7 @@ ], "post-processors": [ { - "output": "../builds/{{user `box_basename`}}.{{.Provider}}.box", + "output": "../../builds/{{user `box_basename`}}.{{.Provider}}.box", "type": "vagrant" } ], @@ -130,4 +130,3 @@ "version": "TIMESTAMP" } } - diff --git a/packer_templates/solaris/solaris-11-x86.json b/packer_templates/solaris/solaris-11-x86.json index da83c577e..75ca0d4e7 100644 --- a/packer_templates/solaris/solaris-11-x86.json +++ b/packer_templates/solaris/solaris-11-x86.json @@ -117,7 +117,7 @@ ], "post-processors": [ { - "output": "../builds/{{user `box_basename`}}.{{.Provider}}.box", + "output": "../../builds/{{user `box_basename`}}.{{.Provider}}.box", "type": "vagrant" } ], @@ -152,4 +152,3 @@ "version": "TIMESTAMP" } } - diff --git a/packer_templates/ubuntu/ubuntu-14.04-amd64.json b/packer_templates/ubuntu/ubuntu-14.04-amd64.json index f38e13232..016c8335b 100644 --- a/packer_templates/ubuntu/ubuntu-14.04-amd64.json +++ b/packer_templates/ubuntu/ubuntu-14.04-amd64.json @@ -35,7 +35,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../builds/packer-{{user `template`}}-virtualbox", + "output_directory": "../../builds/packer-{{user `template`}}-virtualbox", "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", "ssh_password": "vagrant", "ssh_port": 22, @@ -92,7 +92,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../builds/packer-{{user `template`}}-vmware", + "output_directory": "../../builds/packer-{{user `template`}}-vmware", "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", "ssh_password": "vagrant", "ssh_port": 22, @@ -140,7 +140,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../builds/packer-{{user `template`}}-parallels", + "output_directory": "../../builds/packer-{{user `template`}}-parallels", "parallels_tools_flavor": "lin", "prlctl": [ [ @@ -197,7 +197,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../builds/packer-{{user `template`}}-qemu", + "output_directory": "../../builds/packer-{{user `template`}}-qemu", "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", "ssh_password": "vagrant", "ssh_port": 22, @@ -240,7 +240,7 @@ "iso_checksum": "5E567024C385CC8F90C83D6763C6E4F1CD5DEB6F", "iso_checksum_type": "sha1", "iso_url": "http://releases.ubuntu.com/14.04/ubuntu-14.04.5-server-amd64.iso", - "output_directory": "../builds/packer-{{user `template`}}-hyperv", + "output_directory": "../../builds/packer-{{user `template`}}-hyperv", "ram_size": "{{user `memory`}}", "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", "ssh_password": "vagrant", diff --git a/packer_templates/ubuntu/ubuntu-14.04-i386.json b/packer_templates/ubuntu/ubuntu-14.04-i386.json index e851831d9..5fa04f325 100644 --- a/packer_templates/ubuntu/ubuntu-14.04-i386.json +++ b/packer_templates/ubuntu/ubuntu-14.04-i386.json @@ -35,7 +35,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../builds/packer-{{user `template`}}-virtualbox", + "output_directory": "../../builds/packer-{{user `template`}}-virtualbox", "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", "ssh_password": "vagrant", "ssh_port": 22, @@ -92,7 +92,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../builds/packer-{{user `template`}}-vmware", + "output_directory": "../../builds/packer-{{user `template`}}-vmware", "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", "ssh_password": "vagrant", "ssh_port": 22, @@ -140,7 +140,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../builds/packer-{{user `template`}}-parallels", + "output_directory": "../../builds/packer-{{user `template`}}-parallels", "parallels_tools_flavor": "lin", "prlctl": [ [ @@ -197,7 +197,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../builds/packer-{{user `template`}}-qemu", + "output_directory": "../../builds/packer-{{user `template`}}-qemu", "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", "ssh_password": "vagrant", "ssh_port": 22, diff --git a/packer_templates/ubuntu/ubuntu-16.04-amd64.json b/packer_templates/ubuntu/ubuntu-16.04-amd64.json index bf787c7c2..3b3032541 100644 --- a/packer_templates/ubuntu/ubuntu-16.04-amd64.json +++ b/packer_templates/ubuntu/ubuntu-16.04-amd64.json @@ -37,7 +37,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../builds/packer-{{user `template`}}-virtualbox", + "output_directory": "../../builds/packer-{{user `template`}}-virtualbox", "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", "ssh_password": "vagrant", "ssh_port": 22, @@ -96,7 +96,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../builds/packer-{{user `template`}}-vmware", + "output_directory": "../../builds/packer-{{user `template`}}-vmware", "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", "ssh_password": "vagrant", "ssh_port": 22, @@ -147,7 +147,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../builds/packer-{{user `template`}}-parallels", + "output_directory": "../../builds/packer-{{user `template`}}-parallels", "parallels_tools_flavor": "lin", "prlctl": [ [ @@ -206,7 +206,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../builds/packer-{{user `template`}}-qemu", + "output_directory": "../../builds/packer-{{user `template`}}-qemu", "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", "ssh_password": "vagrant", "ssh_port": 22, @@ -249,7 +249,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../builds/packer-{{user `template`}}-hyperv", + "output_directory": "../../builds/packer-{{user `template`}}-hyperv", "ram_size": "{{user `memory`}}", "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", "ssh_password": "vagrant", diff --git a/packer_templates/ubuntu/ubuntu-16.04-i386.json b/packer_templates/ubuntu/ubuntu-16.04-i386.json index 9597020ad..a9074534c 100644 --- a/packer_templates/ubuntu/ubuntu-16.04-i386.json +++ b/packer_templates/ubuntu/ubuntu-16.04-i386.json @@ -37,7 +37,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../builds/packer-{{user `template`}}-virtualbox", + "output_directory": "../../builds/packer-{{user `template`}}-virtualbox", "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", "ssh_password": "vagrant", "ssh_port": 22, @@ -96,7 +96,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../builds/packer-{{user `template`}}-vmware", + "output_directory": "../../builds/packer-{{user `template`}}-vmware", "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", "ssh_password": "vagrant", "ssh_port": 22, @@ -146,7 +146,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../builds/packer-{{user `template`}}-parallels", + "output_directory": "../../builds/packer-{{user `template`}}-parallels", "parallels_tools_flavor": "lin", "prlctl": [ [ @@ -205,7 +205,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../builds/packer-{{user `template`}}-qemu", + "output_directory": "../../builds/packer-{{user `template`}}-qemu", "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", "ssh_password": "vagrant", "ssh_port": 22, diff --git a/packer_templates/ubuntu/ubuntu-18.04-amd64.json b/packer_templates/ubuntu/ubuntu-18.04-amd64.json index 49361ab86..b278cb78c 100644 --- a/packer_templates/ubuntu/ubuntu-18.04-amd64.json +++ b/packer_templates/ubuntu/ubuntu-18.04-amd64.json @@ -36,7 +36,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../builds/packer-{{user `template`}}-virtualbox", + "output_directory": "../../builds/packer-{{user `template`}}-virtualbox", "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", "ssh_password": "vagrant", "ssh_port": 22, @@ -94,7 +94,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../builds/packer-{{user `template`}}-vmware", + "output_directory": "../../builds/packer-{{user `template`}}-vmware", "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", "ssh_password": "vagrant", "ssh_port": 22, @@ -144,7 +144,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../builds/packer-{{user `template`}}-parallels", + "output_directory": "../../builds/packer-{{user `template`}}-parallels", "parallels_tools_flavor": "lin", "prlctl": [ [ @@ -202,7 +202,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../builds/packer-{{user `template`}}-qemu", + "output_directory": "../../builds/packer-{{user `template`}}-qemu", "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", "ssh_password": "vagrant", "ssh_port": 22, @@ -245,7 +245,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../builds/packer-{{user `template`}}-hyperv", + "output_directory": "../../builds/packer-{{user `template`}}-hyperv", "ram_size": "{{user `memory`}}", "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", "ssh_password": "vagrant", diff --git a/packer_templates/ubuntu/ubuntu-18.10-amd64.json b/packer_templates/ubuntu/ubuntu-18.10-amd64.json index f442c0835..0f714099c 100644 --- a/packer_templates/ubuntu/ubuntu-18.10-amd64.json +++ b/packer_templates/ubuntu/ubuntu-18.10-amd64.json @@ -36,7 +36,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../builds/packer-{{user `template`}}-virtualbox", + "output_directory": "../../builds/packer-{{user `template`}}-virtualbox", "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", "ssh_password": "vagrant", "ssh_port": 22, @@ -94,7 +94,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../builds/packer-{{user `template`}}-vmware", + "output_directory": "../../builds/packer-{{user `template`}}-vmware", "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", "ssh_password": "vagrant", "ssh_port": 22, @@ -144,7 +144,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../builds/packer-{{user `template`}}-parallels", + "output_directory": "../../builds/packer-{{user `template`}}-parallels", "parallels_tools_flavor": "lin", "prlctl": [ [ @@ -202,7 +202,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../builds/packer-{{user `template`}}-qemu", + "output_directory": "../../builds/packer-{{user `template`}}-qemu", "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", "ssh_password": "vagrant", "ssh_port": 22, @@ -245,7 +245,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../builds/packer-{{user `template`}}-hyperv", + "output_directory": "../../builds/packer-{{user `template`}}-hyperv", "ram_size": "{{user `memory`}}", "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", "ssh_password": "vagrant", diff --git a/packer_templates/ubuntu/ubuntu-19.04-amd64.json b/packer_templates/ubuntu/ubuntu-19.04-amd64.json index f5d0759ae..bbf867f89 100644 --- a/packer_templates/ubuntu/ubuntu-19.04-amd64.json +++ b/packer_templates/ubuntu/ubuntu-19.04-amd64.json @@ -36,7 +36,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../builds/packer-{{user `template`}}-virtualbox", + "output_directory": "../../builds/packer-{{user `template`}}-virtualbox", "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", "ssh_password": "vagrant", "ssh_port": 22, @@ -94,7 +94,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../builds/packer-{{user `template`}}-vmware", + "output_directory": "../../builds/packer-{{user `template`}}-vmware", "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", "ssh_password": "vagrant", "ssh_port": 22, @@ -144,7 +144,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../builds/packer-{{user `template`}}-parallels", + "output_directory": "../../builds/packer-{{user `template`}}-parallels", "parallels_tools_flavor": "lin", "prlctl": [ [ @@ -202,7 +202,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../builds/packer-{{user `template`}}-qemu", + "output_directory": "../../builds/packer-{{user `template`}}-qemu", "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", "ssh_password": "vagrant", "ssh_port": 22, @@ -245,7 +245,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../builds/packer-{{user `template`}}-hyperv", + "output_directory": "../../builds/packer-{{user `template`}}-hyperv", "ram_size": "{{user `memory`}}", "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", "ssh_password": "vagrant", diff --git a/packer_templates/windows/10.json b/packer_templates/windows/10.json index c09117a1e..1e05c43f0 100644 --- a/packer_templates/windows/10.json +++ b/packer_templates/windows/10.json @@ -15,7 +15,7 @@ "iso_url": "{{ user `iso_url` }}", "iso_checksum": "{{ user `iso_checksum` }}", "iso_checksum_type": "sha1", - "output_directory": "../builds/packer-{{user `template`}}-virtualbox", + "output_directory": "../../builds/packer-{{user `template`}}-virtualbox", "communicator": "winrm", "winrm_username": "vagrant", "winrm_password": "vagrant", @@ -40,7 +40,7 @@ "iso_url": "{{ user `iso_url` }}", "iso_checksum": "{{ user `iso_checksum` }}", "iso_checksum_type": "sha1", - "output_directory": "../builds/packer-{{user `template`}}-vmware", + "output_directory": "../../builds/packer-{{user `template`}}-vmware", "communicator": "winrm", "winrm_username": "vagrant", "winrm_password": "vagrant", diff --git a/packer_templates/windows/2008r2.json b/packer_templates/windows/2008r2.json index 65f30dd79..015e913dd 100644 --- a/packer_templates/windows/2008r2.json +++ b/packer_templates/windows/2008r2.json @@ -13,7 +13,7 @@ "iso_url": "{{ user `iso_url` }}", "iso_checksum": "{{ user `iso_checksum` }}", "iso_checksum_type": "sha1", - "output_directory": "../builds/packer-{{user `template`}}-virtualbox", + "output_directory": "../../builds/packer-{{user `template`}}-virtualbox", "communicator": "winrm", "winrm_username": "vagrant", "winrm_password": "vagrant", diff --git a/packer_templates/windows/2012r2.json b/packer_templates/windows/2012r2.json index f4df4c7dc..cec4623a3 100644 --- a/packer_templates/windows/2012r2.json +++ b/packer_templates/windows/2012r2.json @@ -13,7 +13,7 @@ "iso_url": "{{ user `iso_url` }}", "iso_checksum": "{{ user `iso_checksum` }}", "iso_checksum_type": "sha1", - "output_directory": "../builds/packer-{{user `template`}}-virtualbox", + "output_directory": "../../builds/packer-{{user `template`}}-virtualbox", "communicator": "winrm", "winrm_username": "vagrant", "winrm_password": "vagrant", diff --git a/packer_templates/windows/2016.json b/packer_templates/windows/2016.json index d05a22475..74cd1db27 100644 --- a/packer_templates/windows/2016.json +++ b/packer_templates/windows/2016.json @@ -13,7 +13,7 @@ "iso_url": "{{ user `iso_url` }}", "iso_checksum": "{{ user `iso_checksum` }}", "iso_checksum_type": "sha1", - "output_directory": "../builds/packer-{{user `template`}}-virtualbox", + "output_directory": "../../builds/packer-{{user `template`}}-virtualbox", "communicator": "winrm", "winrm_username": "vagrant", "winrm_password": "vagrant", @@ -37,7 +37,7 @@ "iso_url": "{{ user `iso_url` }}", "iso_checksum": "{{ user `iso_checksum` }}", "iso_checksum_type": "sha1", - "output_directory": "../builds/packer-{{user `template`}}-vmware", + "output_directory": "../../builds/packer-{{user `template`}}-vmware", "communicator": "winrm", "winrm_username": "vagrant", "winrm_password": "vagrant", diff --git a/packer_templates/windows/2019.json b/packer_templates/windows/2019.json index b7b64ad12..9cd1509a7 100644 --- a/packer_templates/windows/2019.json +++ b/packer_templates/windows/2019.json @@ -13,7 +13,7 @@ "iso_url": "{{ user `iso_url` }}", "iso_checksum": "{{ user `iso_checksum` }}", "iso_checksum_type": "sha1", - "output_directory": "../builds/packer-{{user `template`}}-virtualbox", + "output_directory": "../../builds/packer-{{user `template`}}-virtualbox", "communicator": "winrm", "winrm_username": "vagrant", "winrm_password": "vagrant", @@ -37,7 +37,7 @@ "iso_url": "{{ user `iso_url` }}", "iso_checksum": "{{ user `iso_checksum` }}", "iso_checksum_type": "sha1", - "output_directory": "../builds/packer-{{user `template`}}-vmware", + "output_directory": "../../builds/packer-{{user `template`}}-vmware", "communicator": "winrm", "winrm_username": "vagrant", "winrm_password": "vagrant", diff --git a/packer_templates/windows/7.json b/packer_templates/windows/7.json index f824889c2..3b3a8f3e9 100644 --- a/packer_templates/windows/7.json +++ b/packer_templates/windows/7.json @@ -13,7 +13,7 @@ "iso_url": "{{ user `iso_url` }}", "iso_checksum": "{{ user `iso_checksum` }}", "iso_checksum_type": "sha1", - "output_directory": "../builds/packer-{{user `template`}}-virtualbox", + "output_directory": "../../builds/packer-{{user `template`}}-virtualbox", "communicator": "winrm", "winrm_username": "vagrant", "winrm_password": "vagrant", From 10655fed0ca365bf2b7252f3b7fcbcafee03d315 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith@chef.io> Date: Tue, 18 Jun 2019 11:41:26 +0100 Subject: [PATCH 0963/1622] Update Packer in Travis to the latest Why not Signed-off-by: Tim Smith <tsmith@chef.io> --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 7ea3c90ba..b75f4c98c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,7 +4,7 @@ cache: bundler env: global: - - PACKER_VERSION="1.3.5" + - PACKER_VERSION="1.4.1" - PATH=$HOME/bin:$PATH rvm: From 4839cdeef0c6014a9f7d66b7ea41d4d58a072053 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith@chef.io> Date: Tue, 18 Jun 2019 11:51:14 +0100 Subject: [PATCH 0964/1622] Move the builds directory to the root in git Signed-off-by: Tim Smith <tsmith@chef.io> --- {packer_templates/builds => builds}/.gitkeep | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename {packer_templates/builds => builds}/.gitkeep (100%) diff --git a/packer_templates/builds/.gitkeep b/builds/.gitkeep similarity index 100% rename from packer_templates/builds/.gitkeep rename to builds/.gitkeep From 15cb2ec52608271ad83776d3b456c6e39637c98f Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith@chef.io> Date: Tue, 18 Jun 2019 11:51:44 +0100 Subject: [PATCH 0965/1622] Remove EOL Ubuntu 14.04 No need to continue building this release Signed-off-by: Tim Smith <tsmith@chef.io> --- .../ubuntu/ubuntu-14.04-amd64.json | 310 ------------------ .../ubuntu/ubuntu-14.04-i386.json | 272 --------------- 2 files changed, 582 deletions(-) delete mode 100644 packer_templates/ubuntu/ubuntu-14.04-amd64.json delete mode 100644 packer_templates/ubuntu/ubuntu-14.04-i386.json diff --git a/packer_templates/ubuntu/ubuntu-14.04-amd64.json b/packer_templates/ubuntu/ubuntu-14.04-amd64.json deleted file mode 100644 index 016c8335b..000000000 --- a/packer_templates/ubuntu/ubuntu-14.04-amd64.json +++ /dev/null @@ -1,310 +0,0 @@ -{ - "builders": [ - { - "boot_command": [ - "<esc><wait>", - "<esc><wait>", - "<enter><wait>", - "/install/vmlinuz<wait>", - " auto<wait>", - " console-setup/ask_detect=false<wait>", - " console-setup/layoutcode=us<wait>", - " console-setup/modelcode=pc105<wait>", - " debconf/frontend=noninteractive<wait>", - " debian-installer=en_US.UTF-8<wait>", - " fb=false<wait>", - " initrd=/install/initrd.gz<wait>", - " kbd-chooser/method=us<wait>", - " keyboard-configuration/layout=USA<wait>", - " keyboard-configuration/variant=USA<wait>", - " locale=en_US.UTF-8<wait>", - " netcfg/get_domain=vm<wait>", - " netcfg/get_hostname=vagrant<wait>", - " noapic<wait>", - " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}}<wait>", - " -- <wait>", - "<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", - "guest_os_type": "Ubuntu_64", - "hard_drive_interface": "sata", - "headless": "{{ user `headless` }}", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../../builds/packer-{{user `template`}}-virtualbox", - "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "virtualbox-iso", - "vboxmanage": [ - [ - "modifyvm", - "{{.Name}}", - "--memory", - "{{ user `memory` }}" - ], - [ - "modifyvm", - "{{.Name}}", - "--cpus", - "{{ user `cpus` }}" - ] - ], - "virtualbox_version_file": ".vbox_version", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<esc><wait>", - "<esc><wait>", - "<enter><wait>", - "/install/vmlinuz<wait>", - " auto<wait>", - " console-setup/ask_detect=false<wait>", - " console-setup/layoutcode=us<wait>", - " console-setup/modelcode=pc105<wait>", - " debconf/frontend=noninteractive<wait>", - " debian-installer=en_US.UTF-8<wait>", - " fb=false<wait>", - " initrd=/install/initrd.gz<wait>", - " kbd-chooser/method=us<wait>", - " keyboard-configuration/layout=USA<wait>", - " keyboard-configuration/variant=USA<wait>", - " locale=en_US.UTF-8<wait>", - " netcfg/get_domain=vm<wait>", - " netcfg/get_hostname=vagrant<wait>", - " noapic<wait>", - " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}}<wait>", - " -- <wait>", - "<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "ubuntu-64", - "headless": "{{ user `headless` }}", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../../builds/packer-{{user `template`}}-vmware", - "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "tools_upload_flavor": "linux", - "type": "vmware-iso", - "vm_name": "{{ user `template` }}", - "vmx_data": { - "cpuid.coresPerSocket": "1", - "memsize": "{{ user `memory` }}", - "numvcpus": "{{ user `cpus` }}" - }, - "vmx_remove_ethernet_interfaces": true - }, - { - "boot_command": [ - "<esc><wait>", - "<esc><wait>", - "<enter><wait>", - "/install/vmlinuz<wait>", - " auto<wait>", - " console-setup/ask_detect=false<wait>", - " console-setup/layoutcode=us<wait>", - " console-setup/modelcode=pc105<wait>", - " debconf/frontend=noninteractive<wait>", - " debian-installer=en_US.UTF-8<wait>", - " fb=false<wait>", - " initrd=/install/initrd.gz<wait>", - " kbd-chooser/method=us<wait>", - " keyboard-configuration/layout=USA<wait>", - " keyboard-configuration/variant=USA<wait>", - " locale=en_US.UTF-8<wait>", - " netcfg/get_domain=vm<wait>", - " netcfg/get_hostname=vagrant<wait>", - " noapic<wait>", - " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}}<wait>", - " -- <wait>", - "<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "ubuntu", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../../builds/packer-{{user `template`}}-parallels", - "parallels_tools_flavor": "lin", - "prlctl": [ - [ - "set", - "{{.Name}}", - "--memsize", - "{{ user `memory` }}" - ], - [ - "set", - "{{.Name}}", - "--cpus", - "{{ user `cpus` }}" - ] - ], - "prlctl_version_file": ".prlctl_version", - "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "parallels-iso", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<esc><wait>", - "<esc><wait>", - "<enter><wait>", - "/install/vmlinuz<wait>", - " auto<wait>", - " console-setup/ask_detect=false<wait>", - " console-setup/layoutcode=us<wait>", - " console-setup/modelcode=pc105<wait>", - " debconf/frontend=noninteractive<wait>", - " debian-installer=en_US.UTF-8<wait>", - " fb=false<wait>", - " initrd=/install/initrd.gz<wait>", - " kbd-chooser/method=us<wait>", - " keyboard-configuration/layout=USA<wait>", - " keyboard-configuration/variant=USA<wait>", - " locale=en_US.UTF-8<wait>", - " netcfg/get_domain=vm<wait>", - " netcfg/get_hostname=vagrant<wait>", - " noapic<wait>", - " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}}<wait>", - " -- <wait>", - "<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "headless": "{{ user `headless` }}", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../../builds/packer-{{user `template`}}-qemu", - "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "qemu", - "vm_name": "{{ user `template` }}", - "qemuargs": [ - [ - "-m", - "{{ user `memory` }}M" - ], - [ - "-smp", - "{{ user `cpus` }}" - ] - ] - }, - { - "boot_command": [ - "<esc><wait10><esc><esc><enter><wait>", - "set gfxpayload=keep<enter><wait>", - "linux /install/vmlinuz ", - "preseed/url=http://{{.HTTPIP}}:{{.HTTPPort}}/preseed-hyperv.cfg ", - "debian-installer=en_US auto locale=en_US kbd-chooser/method=us ", - "hostname={{.Name}} ", - "fb=false debconf/frontend=noninteractive ", - "keyboard-configuration/modelcode=SKIP keyboard-configuration/layout=USA ", - "keyboard-configuration/variant=USA console-setup/ask_detect=false <enter><wait>", - "initrd /install/initrd.gz<enter><wait>", - "boot<enter>" - ], - "boot_wait": "10s", - "communicator": "ssh", - "cpu": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "enable_secure_boot": false, - "generation": "{{user `hyperv_generation`}}", - "http_directory": "http", - "iso_checksum": "5E567024C385CC8F90C83D6763C6E4F1CD5DEB6F", - "iso_checksum_type": "sha1", - "iso_url": "http://releases.ubuntu.com/14.04/ubuntu-14.04.5-server-amd64.iso", - "output_directory": "../../builds/packer-{{user `template`}}-hyperv", - "ram_size": "{{user `memory`}}", - "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "switch_name": "{{user `hyperv_switch`}}", - "type": "hyperv-iso", - "vm_name": "{{ user `template` }}" - } - ], - "post-processors": [ - { - "output": "../builds/{{user `box_basename`}}.{{.Provider}}.box", - "type": "vagrant" - } - ], - "provisioners": [ - { - "environment_vars": [ - "HOME_DIR=/home/vagrant", - "http_proxy={{user `http_proxy`}}", - "https_proxy={{user `https_proxy`}}", - "no_proxy={{user `no_proxy`}}" - ], - "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", - "expect_disconnect": true, - "scripts": [ - "scripts/update.sh", - "../_common/sshd.sh", - "scripts/networking.sh", - "scripts/sudoers.sh", - "scripts/vagrant.sh", - "../_common/virtualbox.sh", - "../_common/vmware.sh", - "../_common/parallels.sh", - "scripts/hyperv.sh", - "scripts/cleanup.sh", - "../_common/minimize.sh" - ], - "type": "shell" - } - ], - "variables": { - "box_basename": "ubuntu-14.04", - "build_timestamp": "{{isotime \"20060102150405\"}}", - "cpus": "1", - "disk_size": "65536", - "git_revision": "__unknown_git_revision__", - "headless": "", - "http_proxy": "{{env `http_proxy`}}", - "https_proxy": "{{env `https_proxy`}}", - "hyperv_generation": "2", - "hyperv_switch": "{{env `hyperv_switch`}}", - "iso_checksum": "07e4bb5569814eab41fafac882ba127893e3ff0bdb7ec931c9b2d040e3e94e7a", - "iso_checksum_type": "sha256", - "iso_name": "ubuntu-14.04.4-server-amd64.iso", - "memory": "1536", - "mirror": "http://old-releases.ubuntu.com/releases", - "mirror_directory": "14.04.4", - "name": "ubuntu-14.04", - "no_proxy": "{{env `no_proxy`}}", - "preseed_path": "preseed.cfg", - "template": "ubuntu-14.04-amd64", - "version": "TIMESTAMP" - } -} diff --git a/packer_templates/ubuntu/ubuntu-14.04-i386.json b/packer_templates/ubuntu/ubuntu-14.04-i386.json deleted file mode 100644 index 5fa04f325..000000000 --- a/packer_templates/ubuntu/ubuntu-14.04-i386.json +++ /dev/null @@ -1,272 +0,0 @@ -{ - "builders": [ - { - "boot_command": [ - "<esc><wait>", - "<esc><wait>", - "<enter><wait>", - "/install/vmlinuz<wait>", - " auto<wait>", - " console-setup/ask_detect=false<wait>", - " console-setup/layoutcode=us<wait>", - " console-setup/modelcode=pc105<wait>", - " debconf/frontend=noninteractive<wait>", - " debian-installer=en_US.UTF-8<wait>", - " fb=false<wait>", - " initrd=/install/initrd.gz<wait>", - " kbd-chooser/method=us<wait>", - " keyboard-configuration/layout=USA<wait>", - " keyboard-configuration/variant=USA<wait>", - " locale=en_US.UTF-8<wait>", - " netcfg/get_domain=vm<wait>", - " netcfg/get_hostname=vagrant<wait>", - " noapic<wait>", - " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}}<wait>", - " -- <wait>", - "<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", - "guest_os_type": "Ubuntu", - "hard_drive_interface": "sata", - "headless": "{{ user `headless` }}", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../../builds/packer-{{user `template`}}-virtualbox", - "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "virtualbox-iso", - "vboxmanage": [ - [ - "modifyvm", - "{{.Name}}", - "--memory", - "{{ user `memory` }}" - ], - [ - "modifyvm", - "{{.Name}}", - "--cpus", - "{{ user `cpus` }}" - ] - ], - "virtualbox_version_file": ".vbox_version", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<esc><wait>", - "<esc><wait>", - "<enter><wait>", - "/install/vmlinuz<wait>", - " auto<wait>", - " console-setup/ask_detect=false<wait>", - " console-setup/layoutcode=us<wait>", - " console-setup/modelcode=pc105<wait>", - " debconf/frontend=noninteractive<wait>", - " debian-installer=en_US.UTF-8<wait>", - " fb=false<wait>", - " initrd=/install/initrd.gz<wait>", - " kbd-chooser/method=us<wait>", - " keyboard-configuration/layout=USA<wait>", - " keyboard-configuration/variant=USA<wait>", - " locale=en_US.UTF-8<wait>", - " netcfg/get_domain=vm<wait>", - " netcfg/get_hostname=vagrant<wait>", - " noapic<wait>", - " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}}<wait>", - " -- <wait>", - "<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "ubuntu", - "headless": "{{ user `headless` }}", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../../builds/packer-{{user `template`}}-vmware", - "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "tools_upload_flavor": "linux", - "type": "vmware-iso", - "vm_name": "{{ user `template` }}", - "vmx_data": { - "cpuid.coresPerSocket": "1", - "memsize": "{{ user `memory` }}", - "numvcpus": "{{ user `cpus` }}" - }, - "vmx_remove_ethernet_interfaces": true - }, - { - "boot_command": [ - "<esc><wait>", - "<esc><wait>", - "<enter><wait>", - "/install/vmlinuz<wait>", - " auto<wait>", - " console-setup/ask_detect=false<wait>", - " console-setup/layoutcode=us<wait>", - " console-setup/modelcode=pc105<wait>", - " debconf/frontend=noninteractive<wait>", - " debian-installer=en_US.UTF-8<wait>", - " fb=false<wait>", - " initrd=/install/initrd.gz<wait>", - " kbd-chooser/method=us<wait>", - " keyboard-configuration/layout=USA<wait>", - " keyboard-configuration/variant=USA<wait>", - " locale=en_US.UTF-8<wait>", - " netcfg/get_domain=vm<wait>", - " netcfg/get_hostname=vagrant<wait>", - " noapic<wait>", - " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}}<wait>", - " -- <wait>", - "<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "ubuntu", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../../builds/packer-{{user `template`}}-parallels", - "parallels_tools_flavor": "lin", - "prlctl": [ - [ - "set", - "{{.Name}}", - "--memsize", - "{{ user `memory` }}" - ], - [ - "set", - "{{.Name}}", - "--cpus", - "{{ user `cpus` }}" - ] - ], - "prlctl_version_file": ".prlctl_version", - "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "parallels-iso", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<esc><wait>", - "<esc><wait>", - "<enter><wait>", - "/install/vmlinuz<wait>", - " auto<wait>", - " console-setup/ask_detect=false<wait>", - " console-setup/layoutcode=us<wait>", - " console-setup/modelcode=pc105<wait>", - " debconf/frontend=noninteractive<wait>", - " debian-installer=en_US.UTF-8<wait>", - " fb=false<wait>", - " initrd=/install/initrd.gz<wait>", - " kbd-chooser/method=us<wait>", - " keyboard-configuration/layout=USA<wait>", - " keyboard-configuration/variant=USA<wait>", - " locale=en_US.UTF-8<wait>", - " netcfg/get_domain=vm<wait>", - " netcfg/get_hostname=vagrant<wait>", - " noapic<wait>", - " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}}<wait>", - " -- <wait>", - "<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "headless": "{{ user `headless` }}", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../../builds/packer-{{user `template`}}-qemu", - "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "qemu", - "vm_name": "{{ user `template` }}", - "qemuargs": [ - [ - "-m", - "{{ user `memory` }}M" - ], - [ - "-smp", - "{{ user `cpus` }}" - ] - ] - } - ], - "post-processors": [ - { - "output": "../builds/{{user `box_basename`}}.{{.Provider}}.box", - "type": "vagrant" - } - ], - "provisioners": [ - { - "environment_vars": [ - "HOME_DIR=/home/vagrant", - "http_proxy={{user `http_proxy`}}", - "https_proxy={{user `https_proxy`}}", - "no_proxy={{user `no_proxy`}}" - ], - "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", - "expect_disconnect": true, - "scripts": [ - "scripts/update.sh", - "../_common/sshd.sh", - "scripts/networking.sh", - "scripts/sudoers.sh", - "scripts/vagrant.sh", - "../_common/virtualbox.sh", - "../_common/vmware.sh", - "../_common/parallels.sh", - "scripts/cleanup.sh", - "../_common/minimize.sh" - ], - "type": "shell" - } - ], - "variables": { - "box_basename": "ubuntu-14.04-i386", - "build_timestamp": "{{isotime \"20060102150405\"}}", - "cpus": "1", - "disk_size": "65536", - "git_revision": "__unknown_git_revision__", - "headless": "", - "http_proxy": "{{env `http_proxy`}}", - "https_proxy": "{{env `https_proxy`}}", - "iso_checksum": "e20cf9e0812b52287ca22ac1815bc933c0cfef2be88191110b697d8943bef19e", - "iso_checksum_type": "sha256", - "iso_name": "ubuntu-14.04.4-server-i386.iso", - "memory": "1536", - "mirror": "http://old-releases.ubuntu.com/releases", - "mirror_directory": "14.04.4", - "name": "ubuntu-14.04-i386", - "no_proxy": "{{env `no_proxy`}}", - "preseed_path": "preseed.cfg", - "template": "ubuntu-14.04-i386", - "version": "TIMESTAMP" - } -} From 86802078506a30c3314f8da7241149294766950d Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith@chef.io> Date: Tue, 18 Jun 2019 14:28:36 +0100 Subject: [PATCH 0966/1622] Remove EOL macOS 10.10 Apple doesn't support this anymore Signed-off-by: Tim Smith <tsmith@chef.io> --- packer_templates/macos/macosx-10.10.json | 253 ----------------------- 1 file changed, 253 deletions(-) delete mode 100644 packer_templates/macos/macosx-10.10.json diff --git a/packer_templates/macos/macosx-10.10.json b/packer_templates/macos/macosx-10.10.json deleted file mode 100644 index e6d01ea49..000000000 --- a/packer_templates/macos/macosx-10.10.json +++ /dev/null @@ -1,253 +0,0 @@ -{ - "builders": [ - { - "boot_wait": "2s", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "darwin12-64", - "headless": "{{ user `headless` }}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `iso_url`}}", - "output_directory": "../../builds/packer-{{user `template`}}-vmware", - "shutdown_command": "echo 'vagrant'| sudo -S shutdown -h now", - "skip_compaction": true, - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "tools_upload_flavor": "darwinPre15", - "tools_upload_path": "/tmp/vmtools.iso", - "type": "vmware-iso", - "vm_name": "{{ user `template` }}", - "vmx_data": { - "cpuid.coresPerSocket": "1", - "ehci.present": "TRUE", - "firmware": "efi", - "hpet0.present": "TRUE", - "ich7m.present": "TRUE", - "keyboardAndMouseProfile": "macProfile", - "memsize": "{{ user `memory` }}", - "numvcpus": "{{ user `cpus` }}", - "smc.present": "TRUE", - "usb.present": "TRUE" - }, - "vmx_remove_ethernet_interfaces": true - }, - { - "boot_wait": "2s", - "disk_size": "{{user `disk_size`}}", - "guest_additions_mode": "disable", - "guest_os_type": "MacOS109_64", - "hard_drive_interface": "sata", - "headless": "{{ user `headless` }}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `iso_url`}}", - "output_directory": "../../builds/packer-{{user `template`}}-virtualbox", - "shutdown_command": "echo 'vagrant'| sudo -S shutdown -h now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "virtualbox-iso", - "vboxmanage": [ - [ - "modifyvm", - "{{.Name}}", - "--audiocontroller", - "hda" - ], - [ - "modifyvm", - "{{.Name}}", - "--boot1", - "dvd" - ], - [ - "modifyvm", - "{{.Name}}", - "--boot2", - "disk" - ], - [ - "modifyvm", - "{{.Name}}", - "--chipset", - "ich9" - ], - [ - "modifyvm", - "{{.Name}}", - "--cpus", - "{{ user `cpus` }}" - ], - [ - "modifyvm", - "{{.Name}}", - "--firmware", - "efi" - ], - [ - "modifyvm", - "{{.Name}}", - "--hpet", - "on" - ], - [ - "modifyvm", - "{{.Name}}", - "--keyboard", - "usb" - ], - [ - "modifyvm", - "{{.Name}}", - "--memory", - "{{ user `memory` }}" - ], - [ - "modifyvm", - "{{.Name}}", - "--mouse", - "usbtablet" - ], - [ - "modifyvm", - "{{.Name}}", - "--vram", - "9" - ], - [ - "storageattach", - "{{.Name}}", - "--storagectl", - "SATA Controller", - "--port", - "{{ user `cpus` }}", - "--type", - "dvddrive", - "--medium", - "{{user `iso_url`}}" - ] - ], - "vboxmanage_post": [ - [ - "storageattach", - "{{.Name}}", - "--storagectl", - "SATA Controller", - "--port", - "{{ user `cpus` }}", - "--type", - "dvddrive", - "--medium", - "none" - ], - [ - "storagectl", - "{{.Name}}", - "--name", - "IDE Controller", - "--remove" - ] - ], - "virtualbox_version_file": ".vbox_version", - "vm_name": "{{ user `template` }}" - }, - { - "boot_wait": "2s", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "macosx", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `iso_url`}}", - "output_directory": "../../builds/packer-{{user `template`}}-parallels", - "parallels_tools_flavor": "mac", - "prlctl": [ - [ - "set", - "{{.Name}}", - "--memsize", - "{{ user `memory` }}" - ], - [ - "set", - "{{.Name}}", - "--cpus", - "{{ user `cpus` }}" - ], - [ - "set", - "{{.Name}}", - "--on-window-close", - "keep-running" - ] - ], - "shutdown_command": "echo 'vagrant'| sudo -S shutdown -h now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "parallels-iso", - "vm_name": "{{ user `template` }}" - } - ], - "post-processors": [ - { - "output": "../builds/{{user `box_basename`}}.{{.Provider}}.box", - "type": "vagrant", - "vagrantfile_template": "vagrantfile_templates/macosx.rb" - } - ], - "provisioners": [ - { - "destination": "/private/tmp/set_kcpassword.py", - "source": "scripts/support/set_kcpassword.py", - "type": "file" - }, - { - "environment_vars": [ - "HOME_DIR=/Users/vagrant", - "AUTOLOGIN={{user `autologin`}}", - "http_proxy={{user `http_proxy`}}", - "https_proxy={{user `https_proxy`}}", - "no_proxy={{user `no_proxy`}}" - ], - "execute_command": "echo 'vagrant'| {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", - "expect_disconnect": true, - "scripts": [ - "scripts/hostname.sh", - "scripts/update.sh", - "scripts/networking.sh", - "scripts/disablesleep.sh", - "scripts/vagrant.sh", - "scripts/autologin.sh", - "scripts/vmtools.sh", - "scripts/cleanup.sh", - "scripts/minimize.sh" - ], - "type": "shell" - } - ], - "variables": { - "_README": "You must provide a prepared Mac disk image (from https://github.com/timsutton/osx-vm-templates) and checksum value for this template to work. For more details, consult this project's README.md", - "autologin": "true", - "box_basename": "macosx-10.10", - "build_timestamp": "{{isotime \"20060102150405\"}}", - "cpus": "1", - "disk_size": "65536", - "git_revision": "__unknown_git_revision__", - "headless": "", - "http_proxy": "{{env `http_proxy`}}", - "https_proxy": "{{env `https_proxy`}}", - "iso_checksum": "__unset_iso_checksum__", - "iso_checksum_type": "md5", - "iso_url": "http://YOU-MUST-PROVIDE-YOUR-OWN-DMG.sorry", - "memory": "2048", - "name": "macosx-10.10", - "no_proxy": "{{env `no_proxy`}}", - "template": "macosx-10.10", - "version": "TIMESTAMP" - } -} - From 3141e91b1c0e64f749fa1a64af11c7b22f93c138 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith@chef.io> Date: Tue, 18 Jun 2019 15:13:34 +0100 Subject: [PATCH 0967/1622] Make sure the output directory for the boxes is updated too Not just the general output directory Signed-off-by: Tim Smith <tsmith@chef.io> --- packer_templates/amazonlinux/amazon-2-x86_64.json | 2 +- packer_templates/centos/centos-5.11-i386.json | 2 +- packer_templates/centos/centos-5.11-x86_64.json | 2 +- packer_templates/centos/centos-6.10-i386.json | 2 +- packer_templates/centos/centos-6.10-x86_64.json | 2 +- packer_templates/centos/centos-7.6-x86_64.json | 2 +- packer_templates/debian/debian-8.11-amd64.json | 2 +- packer_templates/debian/debian-8.11-i386.json | 2 +- packer_templates/debian/debian-9.9-amd64.json | 2 +- packer_templates/debian/debian-9.9-i386.json | 2 +- packer_templates/debian/debian-9.9-ppc64el.json | 2 +- packer_templates/fedora/fedora-28-x86_64.json | 2 +- packer_templates/fedora/fedora-29-x86_64.json | 2 +- packer_templates/freebsd/freebsd-11.2-amd64.json | 2 +- packer_templates/freebsd/freebsd-11.2-i386.json | 2 +- packer_templates/freebsd/freebsd-12.0-amd64.json | 2 +- packer_templates/freebsd/freebsd-12.0-i386.json | 2 +- packer_templates/hardenedbsd/hardenedbsd-11-amd64.json | 2 +- packer_templates/macos/macos-10.12.json | 2 +- packer_templates/macos/macosx-10.11.json | 2 +- packer_templates/opensuse/opensuse-leap-15.0-x86_64.json | 2 +- packer_templates/opensuse/opensuse-leap-42.3-x86_64.json | 2 +- packer_templates/oraclelinux/oracle-5.11-i386.json | 2 +- packer_templates/oraclelinux/oracle-5.11-x86_64.json | 2 +- packer_templates/oraclelinux/oracle-6.10-i386.json | 2 +- packer_templates/oraclelinux/oracle-6.10-x86_64.json | 2 +- packer_templates/oraclelinux/oracle-7.6-x86_64.json | 2 +- packer_templates/rhel/rhel-5.11-i386.json | 2 +- packer_templates/rhel/rhel-5.11-x86_64.json | 2 +- packer_templates/rhel/rhel-6.10-i386.json | 2 +- packer_templates/rhel/rhel-6.10-x86_64.json | 2 +- packer_templates/rhel/rhel-7.6-x86_64.json | 2 +- packer_templates/scientificlinux/scientific-7.6-x86_64.json | 2 +- packer_templates/sles/sles-11-sp4-x86_64.json | 2 +- packer_templates/sles/sles-12-sp2-x86_64.json | 2 +- packer_templates/sles/sles-12-sp3-x86_64.json | 2 +- packer_templates/sles/sles-15.json | 2 +- packer_templates/ubuntu/ubuntu-16.04-amd64.json | 2 +- packer_templates/ubuntu/ubuntu-16.04-i386.json | 2 +- packer_templates/ubuntu/ubuntu-18.04-amd64.json | 2 +- packer_templates/ubuntu/ubuntu-18.10-amd64.json | 2 +- packer_templates/ubuntu/ubuntu-19.04-amd64.json | 2 +- 42 files changed, 42 insertions(+), 42 deletions(-) diff --git a/packer_templates/amazonlinux/amazon-2-x86_64.json b/packer_templates/amazonlinux/amazon-2-x86_64.json index e2524b555..de3f1ab7e 100644 --- a/packer_templates/amazonlinux/amazon-2-x86_64.json +++ b/packer_templates/amazonlinux/amazon-2-x86_64.json @@ -32,7 +32,7 @@ ], "post-processors": [ { - "output": "../builds/{{user `box_basename`}}.{{.Provider}}.box", + "output": "../../builds/{{user `box_basename`}}.{{.Provider}}.box", "type": "vagrant" } ], diff --git a/packer_templates/centos/centos-5.11-i386.json b/packer_templates/centos/centos-5.11-i386.json index 3aebf7917..5a29745a9 100644 --- a/packer_templates/centos/centos-5.11-i386.json +++ b/packer_templates/centos/centos-5.11-i386.json @@ -152,7 +152,7 @@ ], "post-processors": [ { - "output": "../builds/{{user `box_basename`}}.{{.Provider}}.box", + "output": "../../builds/{{user `box_basename`}}.{{.Provider}}.box", "type": "vagrant" } ], diff --git a/packer_templates/centos/centos-5.11-x86_64.json b/packer_templates/centos/centos-5.11-x86_64.json index a441bb826..32b4b593f 100644 --- a/packer_templates/centos/centos-5.11-x86_64.json +++ b/packer_templates/centos/centos-5.11-x86_64.json @@ -152,7 +152,7 @@ ], "post-processors": [ { - "output": "../builds/{{user `box_basename`}}.{{.Provider}}.box", + "output": "../../builds/{{user `box_basename`}}.{{.Provider}}.box", "type": "vagrant" } ], diff --git a/packer_templates/centos/centos-6.10-i386.json b/packer_templates/centos/centos-6.10-i386.json index 5b69ff870..9f29c1d2c 100644 --- a/packer_templates/centos/centos-6.10-i386.json +++ b/packer_templates/centos/centos-6.10-i386.json @@ -152,7 +152,7 @@ ], "post-processors": [ { - "output": "../builds/{{user `box_basename`}}.{{.Provider}}.box", + "output": "../../builds/{{user `box_basename`}}.{{.Provider}}.box", "type": "vagrant" } ], diff --git a/packer_templates/centos/centos-6.10-x86_64.json b/packer_templates/centos/centos-6.10-x86_64.json index 57202a4e4..eaabb6365 100644 --- a/packer_templates/centos/centos-6.10-x86_64.json +++ b/packer_templates/centos/centos-6.10-x86_64.json @@ -152,7 +152,7 @@ ], "post-processors": [ { - "output": "../builds/{{user `box_basename`}}.{{.Provider}}.box", + "output": "../../builds/{{user `box_basename`}}.{{.Provider}}.box", "type": "vagrant" } ], diff --git a/packer_templates/centos/centos-7.6-x86_64.json b/packer_templates/centos/centos-7.6-x86_64.json index cc70e2c4b..51b9738da 100644 --- a/packer_templates/centos/centos-7.6-x86_64.json +++ b/packer_templates/centos/centos-7.6-x86_64.json @@ -152,7 +152,7 @@ ], "post-processors": [ { - "output": "../builds/{{user `box_basename`}}.{{.Provider}}.box", + "output": "../../builds/{{user `box_basename`}}.{{.Provider}}.box", "type": "vagrant" } ], diff --git a/packer_templates/debian/debian-8.11-amd64.json b/packer_templates/debian/debian-8.11-amd64.json index 5134a1d68..44922a621 100644 --- a/packer_templates/debian/debian-8.11-amd64.json +++ b/packer_templates/debian/debian-8.11-amd64.json @@ -186,7 +186,7 @@ ], "post-processors": [ { - "output": "../builds/{{user `box_basename`}}.{{.Provider}}.box", + "output": "../../builds/{{user `box_basename`}}.{{.Provider}}.box", "type": "vagrant" } ], diff --git a/packer_templates/debian/debian-8.11-i386.json b/packer_templates/debian/debian-8.11-i386.json index 276e6a311..cf88dba0a 100644 --- a/packer_templates/debian/debian-8.11-i386.json +++ b/packer_templates/debian/debian-8.11-i386.json @@ -186,7 +186,7 @@ ], "post-processors": [ { - "output": "../builds/{{user `box_basename`}}.{{.Provider}}.box", + "output": "../../builds/{{user `box_basename`}}.{{.Provider}}.box", "type": "vagrant" } ], diff --git a/packer_templates/debian/debian-9.9-amd64.json b/packer_templates/debian/debian-9.9-amd64.json index 09b9ff6c6..c374ef0d9 100644 --- a/packer_templates/debian/debian-9.9-amd64.json +++ b/packer_templates/debian/debian-9.9-amd64.json @@ -186,7 +186,7 @@ ], "post-processors": [ { - "output": "../builds/{{user `box_basename`}}.{{.Provider}}.box", + "output": "../../builds/{{user `box_basename`}}.{{.Provider}}.box", "type": "vagrant" } ], diff --git a/packer_templates/debian/debian-9.9-i386.json b/packer_templates/debian/debian-9.9-i386.json index a5fe2d19e..87e43a5aa 100644 --- a/packer_templates/debian/debian-9.9-i386.json +++ b/packer_templates/debian/debian-9.9-i386.json @@ -186,7 +186,7 @@ ], "post-processors": [ { - "output": "../builds/{{user `box_basename`}}.{{.Provider}}.box", + "output": "../../builds/{{user `box_basename`}}.{{.Provider}}.box", "type": "vagrant" } ], diff --git a/packer_templates/debian/debian-9.9-ppc64el.json b/packer_templates/debian/debian-9.9-ppc64el.json index c3f2649f8..4d861d133 100644 --- a/packer_templates/debian/debian-9.9-ppc64el.json +++ b/packer_templates/debian/debian-9.9-ppc64el.json @@ -47,7 +47,7 @@ ], "post-processors": [ { - "output": "../builds/{{user `box_basename`}}.{{.Provider}}.box", + "output": "../../builds/{{user `box_basename`}}.{{.Provider}}.box", "type": "vagrant" } ], diff --git a/packer_templates/fedora/fedora-28-x86_64.json b/packer_templates/fedora/fedora-28-x86_64.json index 3b8a46924..a84657b6d 100644 --- a/packer_templates/fedora/fedora-28-x86_64.json +++ b/packer_templates/fedora/fedora-28-x86_64.json @@ -126,7 +126,7 @@ ], "post-processors": [ { - "output": "../builds/{{user `box_basename`}}.{{.Provider}}.box", + "output": "../../builds/{{user `box_basename`}}.{{.Provider}}.box", "type": "vagrant" } ], diff --git a/packer_templates/fedora/fedora-29-x86_64.json b/packer_templates/fedora/fedora-29-x86_64.json index 2208c2d36..d49eaf85b 100644 --- a/packer_templates/fedora/fedora-29-x86_64.json +++ b/packer_templates/fedora/fedora-29-x86_64.json @@ -164,7 +164,7 @@ ], "post-processors": [ { - "output": "../builds/{{user `box_basename`}}.{{.Provider}}.box", + "output": "../../builds/{{user `box_basename`}}.{{.Provider}}.box", "type": "vagrant" } ], diff --git a/packer_templates/freebsd/freebsd-11.2-amd64.json b/packer_templates/freebsd/freebsd-11.2-amd64.json index acb06cdc8..6ffd10d07 100644 --- a/packer_templates/freebsd/freebsd-11.2-amd64.json +++ b/packer_templates/freebsd/freebsd-11.2-amd64.json @@ -176,7 +176,7 @@ ], "post-processors": [ { - "output": "../builds/{{user `box_basename`}}.{{.Provider}}.box", + "output": "../../builds/{{user `box_basename`}}.{{.Provider}}.box", "type": "vagrant", "vagrantfile_template": "vagrantfile_templates/freebsd.rb" } diff --git a/packer_templates/freebsd/freebsd-11.2-i386.json b/packer_templates/freebsd/freebsd-11.2-i386.json index e321f37d0..caadaae33 100644 --- a/packer_templates/freebsd/freebsd-11.2-i386.json +++ b/packer_templates/freebsd/freebsd-11.2-i386.json @@ -176,7 +176,7 @@ ], "post-processors": [ { - "output": "../builds/{{user `box_basename`}}.{{.Provider}}.box", + "output": "../../builds/{{user `box_basename`}}.{{.Provider}}.box", "type": "vagrant", "vagrantfile_template": "vagrantfile_templates/freebsd.rb" } diff --git a/packer_templates/freebsd/freebsd-12.0-amd64.json b/packer_templates/freebsd/freebsd-12.0-amd64.json index 3ab56ce66..576ce2d21 100644 --- a/packer_templates/freebsd/freebsd-12.0-amd64.json +++ b/packer_templates/freebsd/freebsd-12.0-amd64.json @@ -176,7 +176,7 @@ ], "post-processors": [ { - "output": "../builds/{{user `box_basename`}}.{{.Provider}}.box", + "output": "../../builds/{{user `box_basename`}}.{{.Provider}}.box", "type": "vagrant", "vagrantfile_template": "vagrantfile_templates/freebsd.rb" } diff --git a/packer_templates/freebsd/freebsd-12.0-i386.json b/packer_templates/freebsd/freebsd-12.0-i386.json index 860a631ed..7b82d6c7d 100644 --- a/packer_templates/freebsd/freebsd-12.0-i386.json +++ b/packer_templates/freebsd/freebsd-12.0-i386.json @@ -176,7 +176,7 @@ ], "post-processors": [ { - "output": "../builds/{{user `box_basename`}}.{{.Provider}}.box", + "output": "../../builds/{{user `box_basename`}}.{{.Provider}}.box", "type": "vagrant", "vagrantfile_template": "vagrantfile_templates/freebsd.rb" } diff --git a/packer_templates/hardenedbsd/hardenedbsd-11-amd64.json b/packer_templates/hardenedbsd/hardenedbsd-11-amd64.json index e166c0c69..53307f340 100644 --- a/packer_templates/hardenedbsd/hardenedbsd-11-amd64.json +++ b/packer_templates/hardenedbsd/hardenedbsd-11-amd64.json @@ -177,7 +177,7 @@ ], "post-processors": [ { - "output": "../builds/{{user `box_basename`}}.{{.Provider}}.box", + "output": "../../builds/{{user `box_basename`}}.{{.Provider}}.box", "type": "vagrant", "vagrantfile_template": "vagrantfile_templates/hardenedbsd.rb" } diff --git a/packer_templates/macos/macos-10.12.json b/packer_templates/macos/macos-10.12.json index fca1529c7..73042f397 100644 --- a/packer_templates/macos/macos-10.12.json +++ b/packer_templates/macos/macos-10.12.json @@ -194,7 +194,7 @@ ], "post-processors": [ { - "output": "../builds/{{user `box_basename`}}.{{.Provider}}.box", + "output": "../../builds/{{user `box_basename`}}.{{.Provider}}.box", "type": "vagrant", "vagrantfile_template": "vagrantfile_templates/macosx.rb" } diff --git a/packer_templates/macos/macosx-10.11.json b/packer_templates/macos/macosx-10.11.json index dbe71cdb3..4e572034f 100644 --- a/packer_templates/macos/macosx-10.11.json +++ b/packer_templates/macos/macosx-10.11.json @@ -194,7 +194,7 @@ ], "post-processors": [ { - "output": "../builds/{{user `box_basename`}}.{{.Provider}}.box", + "output": "../../builds/{{user `box_basename`}}.{{.Provider}}.box", "type": "vagrant", "vagrantfile_template": "vagrantfile_templates/macosx.rb" } diff --git a/packer_templates/opensuse/opensuse-leap-15.0-x86_64.json b/packer_templates/opensuse/opensuse-leap-15.0-x86_64.json index 8b0a9cedb..3f3f6c1c5 100644 --- a/packer_templates/opensuse/opensuse-leap-15.0-x86_64.json +++ b/packer_templates/opensuse/opensuse-leap-15.0-x86_64.json @@ -156,7 +156,7 @@ ], "post-processors": [ { - "output": "../builds/{{user `box_basename`}}.{{.Provider}}.box", + "output": "../../builds/{{user `box_basename`}}.{{.Provider}}.box", "type": "vagrant" } ], diff --git a/packer_templates/opensuse/opensuse-leap-42.3-x86_64.json b/packer_templates/opensuse/opensuse-leap-42.3-x86_64.json index 6a3b910af..7cee788d2 100644 --- a/packer_templates/opensuse/opensuse-leap-42.3-x86_64.json +++ b/packer_templates/opensuse/opensuse-leap-42.3-x86_64.json @@ -156,7 +156,7 @@ ], "post-processors": [ { - "output": "../builds/{{user `box_basename`}}.{{.Provider}}.box", + "output": "../../builds/{{user `box_basename`}}.{{.Provider}}.box", "type": "vagrant" } ], diff --git a/packer_templates/oraclelinux/oracle-5.11-i386.json b/packer_templates/oraclelinux/oracle-5.11-i386.json index d8839467e..26580040f 100644 --- a/packer_templates/oraclelinux/oracle-5.11-i386.json +++ b/packer_templates/oraclelinux/oracle-5.11-i386.json @@ -125,7 +125,7 @@ ], "post-processors": [ { - "output": "../builds/{{user `box_basename`}}.{{.Provider}}.box", + "output": "../../builds/{{user `box_basename`}}.{{.Provider}}.box", "type": "vagrant" } ], diff --git a/packer_templates/oraclelinux/oracle-5.11-x86_64.json b/packer_templates/oraclelinux/oracle-5.11-x86_64.json index 703c2d80d..83d7323e1 100644 --- a/packer_templates/oraclelinux/oracle-5.11-x86_64.json +++ b/packer_templates/oraclelinux/oracle-5.11-x86_64.json @@ -131,7 +131,7 @@ ], "post-processors": [ { - "output": "../builds/{{user `box_basename`}}.{{.Provider}}.box", + "output": "../../builds/{{user `box_basename`}}.{{.Provider}}.box", "type": "vagrant" } ], diff --git a/packer_templates/oraclelinux/oracle-6.10-i386.json b/packer_templates/oraclelinux/oracle-6.10-i386.json index b12ca2c7d..b5f777e60 100644 --- a/packer_templates/oraclelinux/oracle-6.10-i386.json +++ b/packer_templates/oraclelinux/oracle-6.10-i386.json @@ -125,7 +125,7 @@ ], "post-processors": [ { - "output": "../builds/{{user `box_basename`}}.{{.Provider}}.box", + "output": "../../builds/{{user `box_basename`}}.{{.Provider}}.box", "type": "vagrant" } ], diff --git a/packer_templates/oraclelinux/oracle-6.10-x86_64.json b/packer_templates/oraclelinux/oracle-6.10-x86_64.json index 541d5a01e..f8b4dc98e 100644 --- a/packer_templates/oraclelinux/oracle-6.10-x86_64.json +++ b/packer_templates/oraclelinux/oracle-6.10-x86_64.json @@ -125,7 +125,7 @@ ], "post-processors": [ { - "output": "../builds/{{user `box_basename`}}.{{.Provider}}.box", + "output": "../../builds/{{user `box_basename`}}.{{.Provider}}.box", "type": "vagrant" } ], diff --git a/packer_templates/oraclelinux/oracle-7.6-x86_64.json b/packer_templates/oraclelinux/oracle-7.6-x86_64.json index 952be9568..7fac20a57 100644 --- a/packer_templates/oraclelinux/oracle-7.6-x86_64.json +++ b/packer_templates/oraclelinux/oracle-7.6-x86_64.json @@ -125,7 +125,7 @@ ], "post-processors": [ { - "output": "../builds/{{user `box_basename`}}.{{.Provider}}.box", + "output": "../../builds/{{user `box_basename`}}.{{.Provider}}.box", "type": "vagrant" } ], diff --git a/packer_templates/rhel/rhel-5.11-i386.json b/packer_templates/rhel/rhel-5.11-i386.json index 3b90c974e..9312b1f98 100644 --- a/packer_templates/rhel/rhel-5.11-i386.json +++ b/packer_templates/rhel/rhel-5.11-i386.json @@ -125,7 +125,7 @@ ], "post-processors": [ { - "output": "../builds/{{user `box_basename`}}.{{.Provider}}.box", + "output": "../../builds/{{user `box_basename`}}.{{.Provider}}.box", "type": "vagrant" } ], diff --git a/packer_templates/rhel/rhel-5.11-x86_64.json b/packer_templates/rhel/rhel-5.11-x86_64.json index 675a2f84c..3a2566267 100644 --- a/packer_templates/rhel/rhel-5.11-x86_64.json +++ b/packer_templates/rhel/rhel-5.11-x86_64.json @@ -131,7 +131,7 @@ ], "post-processors": [ { - "output": "../builds/{{user `box_basename`}}.{{.Provider}}.box", + "output": "../../builds/{{user `box_basename`}}.{{.Provider}}.box", "type": "vagrant" } ], diff --git a/packer_templates/rhel/rhel-6.10-i386.json b/packer_templates/rhel/rhel-6.10-i386.json index ff2a4be02..c88af7812 100644 --- a/packer_templates/rhel/rhel-6.10-i386.json +++ b/packer_templates/rhel/rhel-6.10-i386.json @@ -125,7 +125,7 @@ ], "post-processors": [ { - "output": "../builds/{{user `box_basename`}}.{{.Provider}}.box", + "output": "../../builds/{{user `box_basename`}}.{{.Provider}}.box", "type": "vagrant" } ], diff --git a/packer_templates/rhel/rhel-6.10-x86_64.json b/packer_templates/rhel/rhel-6.10-x86_64.json index 9d251d766..86767a385 100644 --- a/packer_templates/rhel/rhel-6.10-x86_64.json +++ b/packer_templates/rhel/rhel-6.10-x86_64.json @@ -125,7 +125,7 @@ ], "post-processors": [ { - "output": "../builds/{{user `box_basename`}}.{{.Provider}}.box", + "output": "../../builds/{{user `box_basename`}}.{{.Provider}}.box", "type": "vagrant" } ], diff --git a/packer_templates/rhel/rhel-7.6-x86_64.json b/packer_templates/rhel/rhel-7.6-x86_64.json index 9e250f28f..e2f30702a 100644 --- a/packer_templates/rhel/rhel-7.6-x86_64.json +++ b/packer_templates/rhel/rhel-7.6-x86_64.json @@ -125,7 +125,7 @@ ], "post-processors": [ { - "output": "../builds/{{user `box_basename`}}.{{.Provider}}.box", + "output": "../../builds/{{user `box_basename`}}.{{.Provider}}.box", "type": "vagrant" } ], diff --git a/packer_templates/scientificlinux/scientific-7.6-x86_64.json b/packer_templates/scientificlinux/scientific-7.6-x86_64.json index 6cb732685..3e463267f 100644 --- a/packer_templates/scientificlinux/scientific-7.6-x86_64.json +++ b/packer_templates/scientificlinux/scientific-7.6-x86_64.json @@ -41,7 +41,7 @@ ], "post-processors": [ { - "output": "../builds/{{user `box_basename`}}.{{.Provider}}.box", + "output": "../../builds/{{user `box_basename`}}.{{.Provider}}.box", "type": "vagrant" } ], diff --git a/packer_templates/sles/sles-11-sp4-x86_64.json b/packer_templates/sles/sles-11-sp4-x86_64.json index cf76d6dc3..1ec37f788 100644 --- a/packer_templates/sles/sles-11-sp4-x86_64.json +++ b/packer_templates/sles/sles-11-sp4-x86_64.json @@ -141,7 +141,7 @@ ], "post-processors": [ { - "output": "../builds/{{user `box_basename`}}.{{.Provider}}.box", + "output": "../../builds/{{user `box_basename`}}.{{.Provider}}.box", "type": "vagrant" } ], diff --git a/packer_templates/sles/sles-12-sp2-x86_64.json b/packer_templates/sles/sles-12-sp2-x86_64.json index 20c668caf..02cabc859 100644 --- a/packer_templates/sles/sles-12-sp2-x86_64.json +++ b/packer_templates/sles/sles-12-sp2-x86_64.json @@ -141,7 +141,7 @@ ], "post-processors": [ { - "output": "../builds/{{user `box_basename`}}.{{.Provider}}.box", + "output": "../../builds/{{user `box_basename`}}.{{.Provider}}.box", "type": "vagrant" } ], diff --git a/packer_templates/sles/sles-12-sp3-x86_64.json b/packer_templates/sles/sles-12-sp3-x86_64.json index 452b7fcf8..9f2977d61 100644 --- a/packer_templates/sles/sles-12-sp3-x86_64.json +++ b/packer_templates/sles/sles-12-sp3-x86_64.json @@ -141,7 +141,7 @@ ], "post-processors": [ { - "output": "../builds/{{user `box_basename`}}.{{.Provider}}.box", + "output": "../../builds/{{user `box_basename`}}.{{.Provider}}.box", "type": "vagrant" } ], diff --git a/packer_templates/sles/sles-15.json b/packer_templates/sles/sles-15.json index fd4d0bcc4..70f489aa8 100644 --- a/packer_templates/sles/sles-15.json +++ b/packer_templates/sles/sles-15.json @@ -155,7 +155,7 @@ ], "post-processors": [ { - "output": "../builds/{{user `box_basename`}}.{{.Provider}}.box", + "output": "../../builds/{{user `box_basename`}}.{{.Provider}}.box", "type": "vagrant" } ], diff --git a/packer_templates/ubuntu/ubuntu-16.04-amd64.json b/packer_templates/ubuntu/ubuntu-16.04-amd64.json index 3b3032541..c061fec04 100644 --- a/packer_templates/ubuntu/ubuntu-16.04-amd64.json +++ b/packer_templates/ubuntu/ubuntu-16.04-amd64.json @@ -263,7 +263,7 @@ ], "post-processors": [ { - "output": "../builds/{{user `box_basename`}}.{{.Provider}}.box", + "output": "../../builds/{{user `box_basename`}}.{{.Provider}}.box", "type": "vagrant" } ], diff --git a/packer_templates/ubuntu/ubuntu-16.04-i386.json b/packer_templates/ubuntu/ubuntu-16.04-i386.json index a9074534c..550d28b6e 100644 --- a/packer_templates/ubuntu/ubuntu-16.04-i386.json +++ b/packer_templates/ubuntu/ubuntu-16.04-i386.json @@ -227,7 +227,7 @@ ], "post-processors": [ { - "output": "../builds/{{user `box_basename`}}.{{.Provider}}.box", + "output": "../../builds/{{user `box_basename`}}.{{.Provider}}.box", "type": "vagrant" } ], diff --git a/packer_templates/ubuntu/ubuntu-18.04-amd64.json b/packer_templates/ubuntu/ubuntu-18.04-amd64.json index b278cb78c..9f8a3fd48 100644 --- a/packer_templates/ubuntu/ubuntu-18.04-amd64.json +++ b/packer_templates/ubuntu/ubuntu-18.04-amd64.json @@ -259,7 +259,7 @@ ], "post-processors": [ { - "output": "../builds/{{user `box_basename`}}.{{.Provider}}.box", + "output": "../../builds/{{user `box_basename`}}.{{.Provider}}.box", "type": "vagrant" } ], diff --git a/packer_templates/ubuntu/ubuntu-18.10-amd64.json b/packer_templates/ubuntu/ubuntu-18.10-amd64.json index 0f714099c..96677156e 100644 --- a/packer_templates/ubuntu/ubuntu-18.10-amd64.json +++ b/packer_templates/ubuntu/ubuntu-18.10-amd64.json @@ -259,7 +259,7 @@ ], "post-processors": [ { - "output": "../builds/{{user `box_basename`}}.{{.Provider}}.box", + "output": "../../builds/{{user `box_basename`}}.{{.Provider}}.box", "type": "vagrant" } ], diff --git a/packer_templates/ubuntu/ubuntu-19.04-amd64.json b/packer_templates/ubuntu/ubuntu-19.04-amd64.json index bbf867f89..dcca08656 100644 --- a/packer_templates/ubuntu/ubuntu-19.04-amd64.json +++ b/packer_templates/ubuntu/ubuntu-19.04-amd64.json @@ -259,7 +259,7 @@ ], "post-processors": [ { - "output": "../builds/{{user `box_basename`}}.{{.Provider}}.box", + "output": "../../builds/{{user `box_basename`}}.{{.Provider}}.box", "type": "vagrant" } ], From 70b3b2081502008d7a23d8c9be02d84458e875a4 Mon Sep 17 00:00:00 2001 From: Tim Smith <> Date: Tue, 18 Jun 2019 15:45:56 +0100 Subject: [PATCH 0968/1622] Rename build to runner to match class name This makes it more clear what you're including Signed-off-by: Tim Smith <tsmith@chef.io> --- lib/bento/cli.rb | 2 +- lib/bento/{build.rb => runner.rb} | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename lib/bento/{build.rb => runner.rb} (100%) diff --git a/lib/bento/cli.rb b/lib/bento/cli.rb index b1de12869..00f293a31 100644 --- a/lib/bento/cli.rb +++ b/lib/bento/cli.rb @@ -2,7 +2,7 @@ require "ostruct" require "bento/common" -require "bento/build" +require "bento/runner" require "bento/delete" require "bento/normalize" require "bento/release" diff --git a/lib/bento/build.rb b/lib/bento/runner.rb similarity index 100% rename from lib/bento/build.rb rename to lib/bento/runner.rb From a424af9b7cc75f06299a725e042fd40bfb361eec Mon Sep 17 00:00:00 2001 From: Tim Smith <> Date: Wed, 19 Jun 2019 12:44:24 +0100 Subject: [PATCH 0969/1622] Fix RHEL 5 ISO URLs The double slash was killing these. Signed-off-by: Tim Smith <tsmith@chef.io> --- packer_templates/centos/centos-5.11-i386.json | 2 +- packer_templates/centos/centos-5.11-x86_64.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packer_templates/centos/centos-5.11-i386.json b/packer_templates/centos/centos-5.11-i386.json index 5a29745a9..8cc10ed97 100644 --- a/packer_templates/centos/centos-5.11-i386.json +++ b/packer_templates/centos/centos-5.11-i386.json @@ -196,7 +196,7 @@ "iso_name": "CentOS-5.11-i386-bin-DVD-1of2.iso", "ks_path": "5/ks.cfg", "memory": "1024", - "mirror": "https://archive.kernel.org/", + "mirror": "https://archive.kernel.org", "mirror_directory": "centos-vault/5.11/isos/i386", "name": "centos-5.11-i386", "no_proxy": "{{env `no_proxy`}}", diff --git a/packer_templates/centos/centos-5.11-x86_64.json b/packer_templates/centos/centos-5.11-x86_64.json index 32b4b593f..2afae1992 100644 --- a/packer_templates/centos/centos-5.11-x86_64.json +++ b/packer_templates/centos/centos-5.11-x86_64.json @@ -196,7 +196,7 @@ "iso_name": "CentOS-5.11-x86_64-bin-DVD-1of2.iso", "ks_path": "5/ks.cfg", "memory": "1024", - "mirror": "https://archive.kernel.org/", + "mirror": "https://archive.kernel.org", "mirror_directory": "centos-vault/5.11/isos/x86_64", "name": "centos-5.11", "no_proxy": "{{env `no_proxy`}}", From 88e14588994a57694c1444cc10a0621a368ef9ba Mon Sep 17 00:00:00 2001 From: Tim Smith <> Date: Thu, 20 Jun 2019 08:17:05 +0100 Subject: [PATCH 0970/1622] Fix Oracle URL for 6.10 The extra slash causes this to fail Signed-off-by: Tim Smith <tsmith@chef.io> --- packer_templates/oraclelinux/oracle-6.10-x86_64.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packer_templates/oraclelinux/oracle-6.10-x86_64.json b/packer_templates/oraclelinux/oracle-6.10-x86_64.json index f8b4dc98e..ad6f5dc2f 100644 --- a/packer_templates/oraclelinux/oracle-6.10-x86_64.json +++ b/packer_templates/oraclelinux/oracle-6.10-x86_64.json @@ -168,7 +168,7 @@ "iso_name": "OracleLinux-R6-U9-Server-x86_64-dvd.iso", "ks_path": "6/ks.cfg", "memory": "1024", - "mirror": "http://mirrors.kernel.org/oracle/", + "mirror": "http://mirrors.kernel.org/oracle", "mirror_directory": "OL6/U9/x86_64", "name": "oracle-6.10", "no_proxy": "{{env `no_proxy`}}", From 9991ec340bd88bdf46212b67d8813bbdda04f95f Mon Sep 17 00:00:00 2001 From: Tim Smith <> Date: Thu, 20 Jun 2019 11:45:16 +0100 Subject: [PATCH 0971/1622] Fix checksum for Debian 9.9 AMD64 Signed-off-by: Tim Smith <tsmith@chef.io> --- packer_templates/debian/debian-9.9-amd64.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packer_templates/debian/debian-9.9-amd64.json b/packer_templates/debian/debian-9.9-amd64.json index c374ef0d9..46cb5b794 100644 --- a/packer_templates/debian/debian-9.9-amd64.json +++ b/packer_templates/debian/debian-9.9-amd64.json @@ -225,7 +225,7 @@ "headless": "", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", - "iso_checksum": "4de26144286993ac6f4f244ff332fdd80e11ec230906e7997aa426e775fac1fb", + "iso_checksum": "d4a22c81c76a66558fb92e690ef70a5d67c685a08216701b15746586520f6e8e", "iso_checksum_type": "sha256", "iso_name": "debian-9.9.0-amd64-netinst.iso", "memory": "1024", From c1973a5e339032020da1afeb86e7a24f045834c3 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Sun, 7 Jul 2019 19:36:52 -0700 Subject: [PATCH 0972/1622] Remove EOL distros from the builds.yml file Signed-off-by: Tim Smith <tsmith@chef.io> --- builds.yml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/builds.yml b/builds.yml index 4cb2a7d36..326e707b2 100644 --- a/builds.yml +++ b/builds.yml @@ -9,7 +9,6 @@ public: - 'debian-8.11' - 'debian-9.8-i386' - 'debian-9.8' -- 'fedora-28' - 'fedora-29' - 'freebsd-11.2-i386' - 'freebsd-11.2' @@ -17,13 +16,10 @@ public: - 'freebsd-12.0' - 'hardenedbsd-11' - 'opensuse-leap-15.0' -- 'opensuse-leap-42.3' - 'oracle-6.10-i386' - 'oracle-6.10' - 'oracle-7.6' - 'scientific-7.6' -- 'ubuntu-14.04-i386' -- 'ubuntu-14.04' - 'ubuntu-16.04-i386' - 'ubuntu-16.04' - 'ubuntu-18.04' @@ -40,7 +36,6 @@ slugs: 'scientific-7': 'scientific-7.6' 'freebsd-11': 'freebsd-11.2' 'freebsd-12': 'freebsd-12.0' - 'opensuse-leap-42': 'opensuse-leap-42.3' 'opensuse-leap-15': 'opensuse-leap-15.0' providers: From dbcb3bdc48df24a42639ea8f19b68119443ed811 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Sun, 7 Jul 2019 19:37:31 -0700 Subject: [PATCH 0973/1622] Remove EOL Fedora 28 definition https://fedoramagazine.org/fedora-28-end-of-life/ Signed-off-by: Tim Smith <tsmith@chef.io> --- packer_templates/fedora/fedora-28-x86_64.json | 180 ------------------ packer_templates/fedora/http/ks-fedora28.cfg | 45 ----- 2 files changed, 225 deletions(-) delete mode 100644 packer_templates/fedora/fedora-28-x86_64.json delete mode 100644 packer_templates/fedora/http/ks-fedora28.cfg diff --git a/packer_templates/fedora/fedora-28-x86_64.json b/packer_templates/fedora/fedora-28-x86_64.json deleted file mode 100644 index a84657b6d..000000000 --- a/packer_templates/fedora/fedora-28-x86_64.json +++ /dev/null @@ -1,180 +0,0 @@ -{ - "builders": [ - { - "boot_command": [ - "<tab> linux ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", - "guest_os_type": "Fedora_64", - "hard_drive_interface": "sata", - "headless": "{{ user `headless` }}", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../../builds/packer-{{user `template`}}-virtualbox", - "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "virtualbox-iso", - "vboxmanage": [ - [ - "modifyvm", - "{{.Name}}", - "--memory", - "{{ user `memory` }}" - ], - [ - "modifyvm", - "{{.Name}}", - "--cpus", - "{{ user `cpus` }}" - ] - ], - "virtualbox_version_file": ".vbox_version", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<tab> linux ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "fedora-64", - "headless": "{{ user `headless` }}", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../../builds/packer-{{user `template`}}-vmware", - "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "tools_upload_flavor": "linux", - "type": "vmware-iso", - "vm_name": "{{ user `template` }}", - "vmx_data": { - "cpuid.coresPerSocket": "1", - "ethernet0.pciSlotNumber": "32", - "memsize": "{{ user `memory` }}", - "numvcpus": "{{ user `cpus` }}" - }, - "vmx_remove_ethernet_interfaces": true - }, - { - "boot_command": [ - "<tab> linux ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "fedora-core", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../../builds/packer-{{user `template`}}-parallels", - "parallels_tools_flavor": "lin", - "prlctl": [ - [ - "set", - "{{.Name}}", - "--memsize", - "{{ user `memory` }}" - ], - [ - "set", - "{{.Name}}", - "--cpus", - "{{ user `cpus` }}" - ] - ], - "prlctl_version_file": ".prlctl_version", - "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "parallels-iso", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<tab> linux ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "headless": "{{ user `headless` }}", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../../builds/packer-{{user `template`}}-qemu", - "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "qemu", - "vm_name": "{{ user `template` }}" - } - ], - "post-processors": [ - { - "output": "../../builds/{{user `box_basename`}}.{{.Provider}}.box", - "type": "vagrant" - } - ], - "provisioners": [ - { - "environment_vars": [ - "HOME_DIR=/home/vagrant", - "http_proxy={{user `http_proxy`}}", - "https_proxy={{user `https_proxy`}}", - "no_proxy={{user `no_proxy`}}" - ], - "execute_command": "echo 'vagrant' | {{.Vars}} sudo -E -S bash '{{.Path}}'", - "expect_disconnect": true, - "scripts": [ - "scripts/swap.sh", - "scripts/fix-slow-dns.sh", - "scripts/build-tools.sh", - "../_common/sshd.sh", - "../_common/virtualbox.sh", - "../_common/vmware.sh", - "../_common/parallels.sh", - "../_common/vagrant.sh", - "scripts/cleanup.sh", - "../_common/minimize.sh" - ], - "type": "shell" - } - ], - "variables": { - "arch": "64", - "box_basename": "fedora-28", - "build_timestamp": "{{isotime \"20060102150405\"}}", - "cpus": "1", - "disk_size": "65536", - "git_revision": "__unknown_git_revision__", - "headless": "", - "http_proxy": "{{env `http_proxy`}}", - "https_proxy": "{{env `https_proxy`}}", - "iso_checksum": "8d59a25052e05758c15fe9daa3bc472b5619791b442e752450bba7f1eeca9c1a", - "iso_checksum_type": "sha256", - "iso_name": "Fedora-Server-dvd-x86_64-28-1.1.iso", - "ks_path": "ks-fedora28.cfg", - "memory": "1024", - "mirror": "http://download.fedoraproject.org/pub/fedora/linux", - "mirror_directory": "releases/28/Server/x86_64/iso", - "name": "fedora-28", - "no_proxy": "{{env `no_proxy`}}", - "template": "fedora-28-x86_64", - "version": "TIMESTAMP" - } -} diff --git a/packer_templates/fedora/http/ks-fedora28.cfg b/packer_templates/fedora/http/ks-fedora28.cfg deleted file mode 100644 index 7a57bc581..000000000 --- a/packer_templates/fedora/http/ks-fedora28.cfg +++ /dev/null @@ -1,45 +0,0 @@ -install -cdrom -lang en_US.UTF-8 -keyboard us -network --bootproto=dhcp -rootpw vagrant -firewall --disabled -authconfig --enableshadow --passalgo=sha512 -selinux --permissive -timezone UTC -bootloader --location=mbr -text -skipx -zerombr -clearpart --all --initlabel -part / --fstype=ext4 --ondisk=sda --grow --label=root -firstboot --disabled -reboot -user --name=vagrant --plaintext --password vagrant - -%packages --ignoremissing --excludedocs -bzip2 -# GCC won't install during kickstart -# gcc -kernel-devel -kernel-headers -tar -wget -nfs-utils -net-tools --plymouth --plymouth-core-libs --fedora-release-notes --mcelog --smartmontools --usbutils --man-pages -%end - -%post -# sudo -echo 'Defaults:vagrant !requiretty' > /etc/sudoers.d/vagrant -echo '%vagrant ALL=(ALL) NOPASSWD: ALL' >> /etc/sudoers.d/vagrant -chmod 440 /etc/sudoers.d/vagrant -%end From d4ad8694eedf15610841ab716ebd265e5a0ae702 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Sun, 7 Jul 2019 19:38:18 -0700 Subject: [PATCH 0974/1622] Remove EOL openSUSE Leap 42.3 definition https://en.opensuse.org/Lifetime Signed-off-by: Tim Smith <tsmith@chef.io> --- .../opensuse/http/42/autoinst.xml | 217 ------------------ .../opensuse/opensuse-leap-42.3-x86_64.json | 212 ----------------- 2 files changed, 429 deletions(-) delete mode 100644 packer_templates/opensuse/http/42/autoinst.xml delete mode 100644 packer_templates/opensuse/opensuse-leap-42.3-x86_64.json diff --git a/packer_templates/opensuse/http/42/autoinst.xml b/packer_templates/opensuse/http/42/autoinst.xml deleted file mode 100644 index fff6e48b4..000000000 --- a/packer_templates/opensuse/http/42/autoinst.xml +++ /dev/null @@ -1,217 +0,0 @@ -<?xml version="1.0"?> -<!DOCTYPE profile> - -<!-- http://doc.opensuse.org/projects/autoyast/configuration.html --> - -<profile xmlns="http://www.suse.com/1.0/yast2ns" xmlns:config="http://www.suse.com/1.0/configns"> - <general> - <mode> - <confirm config:type="boolean">false</confirm> - <forceboot config:type="boolean">true</forceboot> - <final_reboot config:type="boolean">false</final_reboot> - </mode> - </general> - <report> - <messages> - <show config:type="boolean">false</show> - <timeout config:type="integer">10</timeout> - <log config:type="boolean">true</log> - </messages> - <warnings> - <show config:type="boolean">false</show> - <timeout config:type="integer">10</timeout> - <log config:type="boolean">true</log> - </warnings> - <errors> - <show config:type="boolean">false</show> - <timeout config:type="integer">10</timeout> - <log config:type="boolean">true</log> - </errors> - </report> - - <keyboard> - <keymap>english-us</keymap> - </keyboard> - <language> - <language>en_US</language> - <languages>en_US</languages> - </language> - <timezone> - <hwclock>UTC</hwclock> - <timezone>Etc/UTC</timezone> - </timezone> - <partitioning config:type="list"> - <drive> - <enable_snapshots config:type="boolean">false</enable_snapshots> - <initialize config:type="boolean">true</initialize> - <partitions config:type="list"> - <partition> - <create config:type="boolean">true</create> - <crypt_fs config:type="boolean">false</crypt_fs> - <filesystem config:type="symbol">swap</filesystem> - <format config:type="boolean">true</format> - <fstopt>defaults</fstopt> - <loop_fs config:type="boolean">false</loop_fs> - <mount>swap</mount> - <mountby config:type="symbol">device</mountby> - <partition_id config:type="integer">130</partition_id> - <partition_nr config:type="integer">1</partition_nr> - <raid_options/> - <resize config:type="boolean">false</resize> - <size>512M</size> - </partition> - <partition> - <create config:type="boolean">true</create> - <crypt_fs config:type="boolean">false</crypt_fs> - <filesystem config:type="symbol">btrfs</filesystem> - <format config:type="boolean">true</format> - <loop_fs config:type="boolean">false</loop_fs> - <mount>/</mount> - <mountby config:type="symbol">device</mountby> - <partition_id config:type="integer">131</partition_id> - <partition_nr config:type="integer">2</partition_nr> - <raid_options/> - <resize config:type="boolean">false</resize> - <size>max</size> - <subvolumes config:type="list"> - <listentry>boot/grub2/i386-pc</listentry> - <listentry>boot/grub2/x86_64-efi</listentry> - <listentry>home</listentry> - <listentry>opt</listentry> - <listentry>srv</listentry> - <listentry>tmp</listentry> - <listentry>usr/local</listentry> - <listentry>var/crash</listentry> - <listentry>var/lib/mailman</listentry> - <listentry>var/lib/named</listentry> - <listentry>var/lib/pgsql</listentry> - <listentry>var/log</listentry> - <listentry>var/opt</listentry> - <listentry>var/spool</listentry> - <listentry>var/tmp</listentry> - </subvolumes> - </partition> - </partitions> - <pesize/> - <type config:type="symbol">CT_DISK</type> - <use>all</use> - </drive> - </partitioning> - - <bootloader> - <loader_type>grub2</loader_type> - </bootloader> - - <networking> - <ipv6 config:type="boolean">false</ipv6> - <keep_install_network config:type="boolean">true</keep_install_network> - <dns> - <dhcp_hostname config:type="boolean">true</dhcp_hostname> - <dhcp_resolv config:type="boolean">true</dhcp_resolv> - <domain>vagrantup.com</domain> - <hostname>opensuse-leap-x64</hostname> - </dns> - <interfaces config:type="list"> - <interface> - <bootproto>dhcp</bootproto> - <device>eth0</device> - <startmode>auto</startmode> - <usercontrol>no</usercontrol> - </interface> - </interfaces> - </networking> - - <firewall> - <enable_firewall config:type="boolean">true</enable_firewall> - <start_firewall config:type="boolean">true</start_firewall> - </firewall> - - <software> - <image/> - <instsource/> - <packages config:type="list"> - <package>grub2</package> - <package>glibc-locale</package> - <package>iputils</package> - <package>kernel-default</package> - <package>kernel-default-devel</package> - <package>gcc</package> - <package>make</package> - <package>sudo</package> - <package>yast2</package> - <package>yast2-firstboot</package> - <package>zypper</package> - <package>yast2-trans-en_US</package> - <package>wget</package> - <package>curl</package> - <package>grub2-branding-openSUSE</package> - </packages> - <patterns config:type="list"> - <pattern>sw_management</pattern> - <pattern>yast2_install_wf</pattern> - <pattern>minimal_base</pattern> - </patterns> - <remove-packages config:type="list"> - <package>bash-completion</package> - <package>telnet</package> - <package>virtualbox-guest-kmp-default</package> - <package>virtualbox-guest-tools</package> - <package>snapper</package> - <package>snapper-zypp-plugin</package> - </remove-packages> - </software> - <services-manager> - <default_target>graphical</default_target> - <services> - <disable config:type="list"/> - <enable config:type="list"> - <service>sshd</service> - </enable> - </services> - </services-manager> - <groups config:type="list"> - <group> - <gid>100</gid> - <groupname>users</groupname> - <userlist/> - </group> - </groups> - <user_defaults> - <expire/> - <group>100</group> - <groups/> - <home>/home</home> - <inactive>-1</inactive> - <no_groups config:type="boolean">true</no_groups> - <shell>/bin/bash</shell> - <skel>/etc/skel</skel> - <umask>022</umask> - </user_defaults> - - <users config:type="list"> - <user> - <user_password>vagrant</user_password> - <username>root</username> - </user> - <user> - <fullname>vagrant</fullname> - <gid>100</gid> - <home>/home/vagrant</home> - <password_settings> - <expire/> - <flag/> - <inact>-1</inact> - <max>99999</max> - <min>0</min> - <warn>7</warn> - </password_settings> - <shell>/bin/bash</shell> - <uid>1000</uid> - <user_password>vagrant</user_password> - <username>vagrant</username> - </user> - </users> - <kdump> - <add_crash_kernel config:type="boolean">false</add_crash_kernel> - </kdump> -</profile> diff --git a/packer_templates/opensuse/opensuse-leap-42.3-x86_64.json b/packer_templates/opensuse/opensuse-leap-42.3-x86_64.json deleted file mode 100644 index 7cee788d2..000000000 --- a/packer_templates/opensuse/opensuse-leap-42.3-x86_64.json +++ /dev/null @@ -1,212 +0,0 @@ -{ - "builders": [ - { - "boot_command": [ - "<esc><enter><wait>", - "linux ", - "biosdevname=0 ", - "net.ifnames=0 ", - "netdevice=eth0 ", - "netsetup=dhcp ", - "lang=en_US ", - "textmode=1 ", - "autoyast=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `autoinst_cfg`}}", - "<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", - "guest_os_type": "OpenSUSE_64", - "hard_drive_interface": "sata", - "headless": "{{ user `headless` }}", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../../builds/packer-{{user `template`}}-virtualbox", - "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "virtualbox-iso", - "vboxmanage": [ - [ - "modifyvm", - "{{.Name}}", - "--memory", - "{{ user `memory` }}" - ], - [ - "modifyvm", - "{{.Name}}", - "--cpus", - "{{ user `cpus` }}" - ] - ], - "virtualbox_version_file": ".vbox_version", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<esc><enter><wait>", - "linux ", - "biosdevname=0 ", - "net.ifnames=0 ", - "netdevice=eth0 ", - "netsetup=dhcp ", - "lang=en_US ", - "textmode=1 ", - "autoyast=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `autoinst_cfg`}}", - "<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "opensuse-64", - "headless": "{{ user `headless` }}", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../../builds/packer-{{user `template`}}-vmware", - "shutdown_command": "echo 'vagrant'|sudo -S /sbin/shutdown -h 1", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "tools_upload_flavor": "linux", - "type": "vmware-iso", - "vm_name": "{{ user `template` }}", - "vmx_data": { - "cpuid.coresPerSocket": "1", - "memsize": "{{ user `memory` }}", - "numvcpus": "{{ user `cpus` }}" - }, - "vmx_remove_ethernet_interfaces": true - }, - { - "boot_command": [ - "<esc><enter><wait>", - "linux ", - "biosdevname=0 ", - "net.ifnames=0 ", - "netdevice=eth0 ", - "netsetup=dhcp ", - "lang=en_US ", - "textmode=1 ", - "autoyast=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `autoinst_cfg`}}", - "<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "opensuse", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../../builds/packer-{{user `template`}}-parallels", - "parallels_tools_flavor": "lin", - "prlctl": [ - [ - "set", - "{{.Name}}", - "--memsize", - "{{ user `memory` }}" - ], - [ - "set", - "{{.Name}}", - "--cpus", - "{{ user `cpus` }}" - ] - ], - "prlctl_version_file": ".prlctl_version", - "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "parallels-iso", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<esc><enter><wait>", - "linux netsetup=dhcp netdevice=eth0 install=cd:/<wait>", - " lang=en_US autoyast=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `autoinst_cfg`}}<wait>", - " textmode=1<wait>", - "<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "headless": "{{ user `headless` }}", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../../builds/packer-{{user `template`}}-qemu", - "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "qemu", - "vm_name": "{{ user `template` }}" - } - ], - "post-processors": [ - { - "output": "../../builds/{{user `box_basename`}}.{{.Provider}}.box", - "type": "vagrant" - } - ], - "provisioners": [ - { - "environment_vars": [ - "HOME_DIR=/home/vagrant", - "http_proxy={{user `http_proxy`}}", - "https_proxy={{user `https_proxy`}}", - "no_proxy={{user `no_proxy`}}" - ], - "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh '{{.Path}}'", - "expect_disconnect": true, - "scripts": [ - "scripts/repositories.sh", - "scripts/update.sh", - "../_common/sshd.sh", - "../_common/vagrant.sh", - "../_common/virtualbox.sh", - "../_common/vmware.sh", - "../_common/parallels.sh", - "scripts/vagrant_group.sh", - "scripts/sudoers.sh", - "scripts/zypper-locks.sh", - "scripts/cleanup.sh", - "../_common/minimize.sh" - ], - "type": "shell" - } - ], - "variables": { - "arch": "64", - "autoinst_cfg": "42/autoinst.xml", - "box_basename": "opensuse-leap-42.3", - "build_timestamp": "{{isotime \"20060102150405\"}}", - "cpus": "1", - "disk_size": "65536", - "git_revision": "__unknown_git_revision__", - "headless": "", - "http_proxy": "{{env `http_proxy`}}", - "https_proxy": "{{env `https_proxy`}}", - "iso_checksum": "195baca6c5f3b7f3ad4d7984a7f7bd5c4a37be2eb67e58b65d07ac3a2b599e83", - "iso_checksum_type": "sha256", - "iso_name": "openSUSE-Leap-42.3-DVD-x86_64.iso", - "memory": "1024", - "mirror": "http://suse.mobile-central.org/distribution", - "mirror_directory": "leap/42.3/iso", - "name": "opensuse-leap-42.3", - "no_proxy": "{{env `no_proxy`}}", - "template": "opensuse-leap-42.3-x86_64", - "version": "TIMESTAMP" - } -} From 6f39671b65c9272ee300c95928cd8d2a607ec411 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Sun, 7 Jul 2019 19:39:01 -0700 Subject: [PATCH 0975/1622] Rename the windows templates to match *nix This will help with CLI output Signed-off-by: Tim Smith <tsmith@chef.io> --- packer_templates/windows/{10.json => windows-10.json} | 0 packer_templates/windows/{2008r2.json => windows-2008r2.json} | 0 packer_templates/windows/{2012r2.json => windows-2012r2.json} | 0 packer_templates/windows/{2016.json => windows-2016.json} | 0 packer_templates/windows/{2019.json => windows-2019.json} | 0 packer_templates/windows/{7.json => windows-7.json} | 0 6 files changed, 0 insertions(+), 0 deletions(-) rename packer_templates/windows/{10.json => windows-10.json} (100%) rename packer_templates/windows/{2008r2.json => windows-2008r2.json} (100%) rename packer_templates/windows/{2012r2.json => windows-2012r2.json} (100%) rename packer_templates/windows/{2016.json => windows-2016.json} (100%) rename packer_templates/windows/{2019.json => windows-2019.json} (100%) rename packer_templates/windows/{7.json => windows-7.json} (100%) diff --git a/packer_templates/windows/10.json b/packer_templates/windows/windows-10.json similarity index 100% rename from packer_templates/windows/10.json rename to packer_templates/windows/windows-10.json diff --git a/packer_templates/windows/2008r2.json b/packer_templates/windows/windows-2008r2.json similarity index 100% rename from packer_templates/windows/2008r2.json rename to packer_templates/windows/windows-2008r2.json diff --git a/packer_templates/windows/2012r2.json b/packer_templates/windows/windows-2012r2.json similarity index 100% rename from packer_templates/windows/2012r2.json rename to packer_templates/windows/windows-2012r2.json diff --git a/packer_templates/windows/2016.json b/packer_templates/windows/windows-2016.json similarity index 100% rename from packer_templates/windows/2016.json rename to packer_templates/windows/windows-2016.json diff --git a/packer_templates/windows/2019.json b/packer_templates/windows/windows-2019.json similarity index 100% rename from packer_templates/windows/2019.json rename to packer_templates/windows/windows-2019.json diff --git a/packer_templates/windows/7.json b/packer_templates/windows/windows-7.json similarity index 100% rename from packer_templates/windows/7.json rename to packer_templates/windows/windows-7.json From 52949ed31016486a6b2a8da9dae6237ee21a4c4c Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Sun, 7 Jul 2019 20:06:14 -0700 Subject: [PATCH 0976/1622] Add definitions for Debian 10 Signed-off-by: Tim Smith <tsmith@chef.io> --- builds.yml | 3 + .../debian/debian-10.0-amd64.json | 240 ++++++++++++++++++ packer_templates/debian/debian-10.0-i386.json | 240 ++++++++++++++++++ 3 files changed, 483 insertions(+) create mode 100644 packer_templates/debian/debian-10.0-amd64.json create mode 100644 packer_templates/debian/debian-10.0-i386.json diff --git a/builds.yml b/builds.yml index 326e707b2..67791a9f9 100644 --- a/builds.yml +++ b/builds.yml @@ -9,6 +9,8 @@ public: - 'debian-8.11' - 'debian-9.8-i386' - 'debian-9.8' +- 'debian-10.0-i386' +- 'debian-10.0' - 'fedora-29' - 'freebsd-11.2-i386' - 'freebsd-11.2' @@ -32,6 +34,7 @@ slugs: 'debian-9': 'debian-9.8' 'debian-8': 'debian-8.11' 'oracle-7': 'oracle-7.6' + 'debian-10': 'debian-10.0' 'oracle-6': 'oracle-6.10' 'scientific-7': 'scientific-7.6' 'freebsd-11': 'freebsd-11.2' diff --git a/packer_templates/debian/debian-10.0-amd64.json b/packer_templates/debian/debian-10.0-amd64.json new file mode 100644 index 000000000..29d4125dd --- /dev/null +++ b/packer_templates/debian/debian-10.0-amd64.json @@ -0,0 +1,240 @@ +{ + "builders": [ + { + "boot_command": [ + "<esc><wait>", + "install <wait>", + " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}} <wait>", + "debian-installer=en_US.UTF-8 <wait>", + "auto <wait>", + "locale=en_US.UTF-8 <wait>", + "kbd-chooser/method=us <wait>", + "keyboard-configuration/xkb-keymap=us <wait>", + "netcfg/get_hostname={{ .Name }} <wait>", + "netcfg/get_domain=vagrantup.com <wait>", + "fb=false <wait>", + "debconf/frontend=noninteractive <wait>", + "console-setup/ask_detect=false <wait>", + "console-keymaps-at/keymap=us <wait>", + "grub-installer/bootdev=/dev/sda <wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": "{{user `disk_size`}}", + "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "guest_os_type": "Debian_64", + "hard_drive_interface": "sata", + "headless": "{{ user `headless` }}", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "../../builds/packer-{{user `template`}}-virtualbox", + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "virtualbox-iso", + "vboxmanage": [ + [ + "modifyvm", + "{{.Name}}", + "--memory", + "{{ user `memory` }}" + ], + [ + "modifyvm", + "{{.Name}}", + "--cpus", + "{{ user `cpus` }}" + ] + ], + "virtualbox_version_file": ".vbox_version", + "vm_name": "{{ user `template` }}" + }, + { + "boot_command": [ + "<esc><wait>", + "install <wait>", + " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}} <wait>", + "debian-installer=en_US.UTF-8 <wait>", + "auto <wait>", + "locale=en_US.UTF-8 <wait>", + "kbd-chooser/method=us <wait>", + "keyboard-configuration/xkb-keymap=us <wait>", + "netcfg/get_hostname={{ .Name }} <wait>", + "netcfg/get_domain=vagrantup.com <wait>", + "fb=false <wait>", + "debconf/frontend=noninteractive <wait>", + "console-setup/ask_detect=false <wait>", + "console-keymaps-at/keymap=us <wait>", + "grub-installer/bootdev=/dev/sda <wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": "{{user `disk_size`}}", + "guest_os_type": "debian8-64", + "headless": "{{ user `headless` }}", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "../../builds/packer-{{user `template`}}-vmware", + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "tools_upload_flavor": "linux", + "type": "vmware-iso", + "vm_name": "{{ user `template` }}", + "vmx_data": { + "cpuid.coresPerSocket": "1", + "ethernet0.pciSlotNumber": "32", + "memsize": "{{ user `memory` }}", + "numvcpus": "{{ user `cpus` }}" + }, + "vmx_remove_ethernet_interfaces": true + }, + { + "boot_command": [ + "<esc><wait>", + "install <wait>", + " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}} <wait>", + "debian-installer=en_US.UTF-8 <wait>", + "auto <wait>", + "locale=en_US.UTF-8 <wait>", + "kbd-chooser/method=us <wait>", + "keyboard-configuration/xkb-keymap=us <wait>", + "netcfg/get_hostname={{ .Name }} <wait>", + "netcfg/get_domain=vagrantup.com <wait>", + "fb=false <wait>", + "debconf/frontend=noninteractive <wait>", + "console-setup/ask_detect=false <wait>", + "console-keymaps-at/keymap=us <wait>", + "grub-installer/bootdev=/dev/sda <wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": "{{user `disk_size`}}", + "guest_os_type": "debian", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "../../builds/packer-{{user `template`}}-parallels", + "parallels_tools_flavor": "lin", + "prlctl": [ + [ + "set", + "{{.Name}}", + "--memsize", + "{{ user `memory` }}" + ], + [ + "set", + "{{.Name}}", + "--cpus", + "{{ user `cpus` }}" + ] + ], + "prlctl_version_file": ".prlctl_version", + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "parallels-iso", + "vm_name": "{{ user `template` }}" + }, + { + "boot_command": [ + "<esc><wait>", + "install <wait>", + " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}} <wait>", + "debian-installer=en_US.UTF-8 <wait>", + "auto <wait>", + "locale=en_US.UTF-8 <wait>", + "kbd-chooser/method=us <wait>", + "keyboard-configuration/xkb-keymap=us <wait>", + "netcfg/get_hostname={{ .Name }} <wait>", + "netcfg/get_domain=vagrantup.com <wait>", + "fb=false <wait>", + "debconf/frontend=noninteractive <wait>", + "console-setup/ask_detect=false <wait>", + "console-keymaps-at/keymap=us <wait>", + "grub-installer/bootdev=/dev/vda <wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": "{{user `disk_size`}}", + "headless": "{{ user `headless` }}", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "../../builds/packer-{{user `template`}}-qemu", + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "qemu", + "vm_name": "{{ user `template` }}" + } + ], + "post-processors": [ + { + "output": "../../builds/{{user `box_basename`}}.{{.Provider}}.box", + "type": "vagrant" + } + ], + "provisioners": [ + { + "environment_vars": [ + "HOME_DIR=/home/vagrant", + "http_proxy={{user `http_proxy`}}", + "https_proxy={{user `https_proxy`}}", + "no_proxy={{user `no_proxy`}}" + ], + "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", + "expect_disconnect": true, + "scripts": [ + "scripts/update.sh", + "../_common/sshd.sh", + "scripts/networking.sh", + "scripts/sudoers.sh", + "../_common/vagrant.sh", + "scripts/systemd.sh", + "../_common/virtualbox.sh", + "../_common/vmware.sh", + "../_common/parallels.sh", + "scripts/cleanup.sh", + "../_common/minimize.sh" + ], + "type": "shell" + } + ], + "variables": { + "box_basename": "debian-9.8", + "build_timestamp": "{{isotime \"20060102150405\"}}", + "cpus": "1", + "disk_size": "65536", + "git_revision": "__unknown_git_revision__", + "headless": "", + "http_proxy": "{{env `http_proxy`}}", + "https_proxy": "{{env `https_proxy`}}", + "iso_checksum": "3dbb597b7f11dbda71cda08d4c1339c1eb565e784c75409987fa2b91182d9240", + "iso_checksum_type": "sha256", + "iso_name": "debian-10.0.0-amd64-netinst.iso", + "memory": "1024", + "mirror": "http://cdimage.debian.org/cdimage/release", + "mirror_directory": "10.0.0/amd64/iso-cd", + "name": "debian-9.8", + "no_proxy": "{{env `no_proxy`}}", + "preseed_path": "debian-9/preseed.cfg", + "template": "debian-9.8-amd64", + "version": "TIMESTAMP" + } +} diff --git a/packer_templates/debian/debian-10.0-i386.json b/packer_templates/debian/debian-10.0-i386.json new file mode 100644 index 000000000..6c3cc5425 --- /dev/null +++ b/packer_templates/debian/debian-10.0-i386.json @@ -0,0 +1,240 @@ +{ + "builders": [ + { + "boot_command": [ + "<esc><wait>", + "install <wait>", + " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}} <wait>", + "debian-installer=en_US.UTF-8 <wait>", + "auto <wait>", + "locale=en_US.UTF-8 <wait>", + "kbd-chooser/method=us <wait>", + "keyboard-configuration/xkb-keymap=us <wait>", + "netcfg/get_hostname={{ .Name }} <wait>", + "netcfg/get_domain=vagrantup.com <wait>", + "fb=false <wait>", + "debconf/frontend=noninteractive <wait>", + "console-setup/ask_detect=false <wait>", + "console-keymaps-at/keymap=us <wait>", + "grub-installer/bootdev=/dev/sda <wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": "{{user `disk_size`}}", + "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "guest_os_type": "Debian", + "hard_drive_interface": "sata", + "headless": "{{ user `headless` }}", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "../../builds/packer-{{user `template`}}-virtualbox", + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "virtualbox-iso", + "vboxmanage": [ + [ + "modifyvm", + "{{.Name}}", + "--memory", + "{{ user `memory` }}" + ], + [ + "modifyvm", + "{{.Name}}", + "--cpus", + "{{ user `cpus` }}" + ] + ], + "virtualbox_version_file": ".vbox_version", + "vm_name": "{{ user `template` }}" + }, + { + "boot_command": [ + "<esc><wait>", + "install <wait>", + " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}} <wait>", + "debian-installer=en_US.UTF-8 <wait>", + "auto <wait>", + "locale=en_US.UTF-8 <wait>", + "kbd-chooser/method=us <wait>", + "keyboard-configuration/xkb-keymap=us <wait>", + "netcfg/get_hostname={{ .Name }} <wait>", + "netcfg/get_domain=vagrantup.com <wait>", + "fb=false <wait>", + "debconf/frontend=noninteractive <wait>", + "console-setup/ask_detect=false <wait>", + "console-keymaps-at/keymap=us <wait>", + "grub-installer/bootdev=/dev/sda <wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": "{{user `disk_size`}}", + "guest_os_type": "debian8", + "headless": "{{ user `headless` }}", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "../../builds/packer-{{user `template`}}-vmware", + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "tools_upload_flavor": "linux", + "type": "vmware-iso", + "vm_name": "{{ user `template` }}", + "vmx_data": { + "cpuid.coresPerSocket": "1", + "ethernet0.pciSlotNumber": "32", + "memsize": "{{ user `memory` }}", + "numvcpus": "{{ user `cpus` }}" + }, + "vmx_remove_ethernet_interfaces": true + }, + { + "boot_command": [ + "<esc><wait>", + "install <wait>", + " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}} <wait>", + "debian-installer=en_US.UTF-8 <wait>", + "auto <wait>", + "locale=en_US.UTF-8 <wait>", + "kbd-chooser/method=us <wait>", + "keyboard-configuration/xkb-keymap=us <wait>", + "netcfg/get_hostname={{ .Name }} <wait>", + "netcfg/get_domain=vagrantup.com <wait>", + "fb=false <wait>", + "debconf/frontend=noninteractive <wait>", + "console-setup/ask_detect=false <wait>", + "console-keymaps-at/keymap=us <wait>", + "grub-installer/bootdev=/dev/sda <wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": "{{user `disk_size`}}", + "guest_os_type": "debian", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "../../builds/packer-{{user `template`}}-parallels", + "parallels_tools_flavor": "lin", + "prlctl": [ + [ + "set", + "{{.Name}}", + "--memsize", + "{{ user `memory` }}" + ], + [ + "set", + "{{.Name}}", + "--cpus", + "{{ user `cpus` }}" + ] + ], + "prlctl_version_file": ".prlctl_version", + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "parallels-iso", + "vm_name": "{{ user `template` }}" + }, + { + "boot_command": [ + "<esc><wait>", + "install <wait>", + " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}} <wait>", + "debian-installer=en_US.UTF-8 <wait>", + "auto <wait>", + "locale=en_US.UTF-8 <wait>", + "kbd-chooser/method=us <wait>", + "keyboard-configuration/xkb-keymap=us <wait>", + "netcfg/get_hostname={{ .Name }} <wait>", + "netcfg/get_domain=vagrantup.com <wait>", + "fb=false <wait>", + "debconf/frontend=noninteractive <wait>", + "console-setup/ask_detect=false <wait>", + "console-keymaps-at/keymap=us <wait>", + "grub-installer/bootdev=/dev/vda <wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": "{{user `disk_size`}}", + "headless": "{{ user `headless` }}", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "../../builds/packer-{{user `template`}}-qemu", + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "qemu", + "vm_name": "{{ user `template` }}" + } + ], + "post-processors": [ + { + "output": "../../builds/{{user `box_basename`}}.{{.Provider}}.box", + "type": "vagrant" + } + ], + "provisioners": [ + { + "environment_vars": [ + "HOME_DIR=/home/vagrant", + "http_proxy={{user `http_proxy`}}", + "https_proxy={{user `https_proxy`}}", + "no_proxy={{user `no_proxy`}}" + ], + "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", + "expect_disconnect": true, + "scripts": [ + "scripts/update.sh", + "../_common/sshd.sh", + "scripts/networking.sh", + "scripts/sudoers.sh", + "../_common/vagrant.sh", + "scripts/systemd.sh", + "../_common/virtualbox.sh", + "../_common/vmware.sh", + "../_common/parallels.sh", + "scripts/cleanup.sh", + "../_common/minimize.sh" + ], + "type": "shell" + } + ], + "variables": { + "box_basename": "debian-9.8-i386", + "build_timestamp": "{{isotime \"20060102150405\"}}", + "cpus": "1", + "disk_size": "65536", + "git_revision": "__unknown_git_revision__", + "headless": "", + "http_proxy": "{{env `http_proxy`}}", + "https_proxy": "{{env `https_proxy`}}", + "iso_checksum": "1356e3aeb202533570031735c2ac4b8f2de718ce407df2895e1a5f4027d5db7c", + "iso_checksum_type": "sha256", + "iso_name": "debian-10.0.0-i386-netinst.iso", + "memory": "1024", + "mirror": "http://cdimage.debian.org/cdimage/release", + "mirror_directory": "10.0.0/i386/iso-cd", + "name": "debian-9.8-i386", + "no_proxy": "{{env `no_proxy`}}", + "preseed_path": "debian-9/preseed.cfg", + "template": "debian-9.8-i386", + "version": "TIMESTAMP" + } +} From baf8aff0bc8e9963b782e60f670525587eacd761 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Sun, 7 Jul 2019 20:06:38 -0700 Subject: [PATCH 0977/1622] Force the builds in the CLLI runner Signed-off-by: Tim Smith <tsmith@chef.io> --- lib/bento/runner.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/bento/runner.rb b/lib/bento/runner.rb index 2cc544768..b1e0f010a 100644 --- a/lib/bento/runner.rb +++ b/lib/bento/runner.rb @@ -57,7 +57,7 @@ def build(file) def packer_build_cmd(template, var_file) vars = "#{template}.variables.json" - cmd = %W{packer build -var-file=#{var_file} #{template}.json} + cmd = %W{packer build -force -var-file=#{var_file} #{template}.json} cmd.insert(2, "-var-file=#{vars}") if File.exist?(vars) cmd.insert(2, "-only=#{only}") cmd.insert(2, "-except=#{except}") if except From 63bf635001e7d3bbba389419eb1220c8aeedcc28 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Sun, 7 Jul 2019 20:06:49 -0700 Subject: [PATCH 0978/1622] Fix typo in the Amazon 2 script Signed-off-by: Tim Smith <tsmith@chef.io> --- packer_templates/amazonlinux/STEP1_build_ovf.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packer_templates/amazonlinux/STEP1_build_ovf.sh b/packer_templates/amazonlinux/STEP1_build_ovf.sh index 404f5fd24..f4cb87cd4 100755 --- a/packer_templates/amazonlinux/STEP1_build_ovf.sh +++ b/packer_templates/amazonlinux/STEP1_build_ovf.sh @@ -15,7 +15,7 @@ echo "Creating ISO" hdiutil makehybrid -o seed.iso -hfs -joliet -iso -default-volume-name cidata seed_iso VM="AmazonLinuxBento" -echo Powering off and deleting any existing VMs name $VM +echo Powering off and deleting any existing VMs named $VM VBoxManage controlvm $VM poweroff --type gui 2> /dev/null vboxmanage unregistervm $VM 2> /dev/null sleep 5 From e78497568f5c6065e3b86b57ee35de2b132a7a0d Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Sun, 7 Jul 2019 20:42:05 -0700 Subject: [PATCH 0979/1622] Update openSUSE definition to 15.1 Signed-off-by: Tim Smith <tsmith@chef.io> --- builds.yml | 2 +- ....0-x86_64.json => opensuse-leap-15.1-x86_64.json} | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) rename packer_templates/opensuse/{opensuse-leap-15.0-x86_64.json => opensuse-leap-15.1-x86_64.json} (95%) diff --git a/builds.yml b/builds.yml index 67791a9f9..0067766f7 100644 --- a/builds.yml +++ b/builds.yml @@ -17,7 +17,7 @@ public: - 'freebsd-12.0-i386' - 'freebsd-12.0' - 'hardenedbsd-11' -- 'opensuse-leap-15.0' +- 'opensuse-leap-15.1' - 'oracle-6.10-i386' - 'oracle-6.10' - 'oracle-7.6' diff --git a/packer_templates/opensuse/opensuse-leap-15.0-x86_64.json b/packer_templates/opensuse/opensuse-leap-15.1-x86_64.json similarity index 95% rename from packer_templates/opensuse/opensuse-leap-15.0-x86_64.json rename to packer_templates/opensuse/opensuse-leap-15.1-x86_64.json index 3f3f6c1c5..90632832d 100644 --- a/packer_templates/opensuse/opensuse-leap-15.0-x86_64.json +++ b/packer_templates/opensuse/opensuse-leap-15.1-x86_64.json @@ -191,7 +191,7 @@ "variables": { "arch": "64", "autoinst_cfg": "15/autoinst.xml", - "box_basename": "opensuse-leap-15.0", + "box_basename": "opensuse-leap-15.1", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", "disk_size": "65536", @@ -199,15 +199,15 @@ "headless": "", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", - "iso_checksum": "c477428c7830ca76762d2f78603e13067c33952b936ff100189523e1fabe5a77", + "iso_checksum": "c6d3ed19fe5cc25c4667bf0b46cc86aebcfbca3b0073aed0a288834600cb8b97", "iso_checksum_type": "sha256", - "iso_name": "openSUSE-Leap-15.0-DVD-x86_64.iso", + "iso_name": "openSUSE-Leap-15.1-DVD-x86_64.iso", "memory": "1024", "mirror": "http://suse.mobile-central.org/distribution", - "mirror_directory": "leap/15.0/iso", - "name": "opensuse-leap-15.0", + "mirror_directory": "leap/15.1/iso", + "name": "opensuse-leap-15.1", "no_proxy": "{{env `no_proxy`}}", - "template": "opensuse-leap-15.0-x86_64", + "template": "opensuse-leap-15.1-x86_64", "version": "TIMESTAMP" } } From 4e8874e96e403de84a064ffcd839e597dc8ff3e8 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Sun, 7 Jul 2019 21:13:13 -0700 Subject: [PATCH 0980/1622] Add Fedora 30 definition Signed-off-by: Tim Smith <tsmith@chef.io> --- builds.yml | 1 + packer_templates/fedora/fedora-30-x86_64.json | 218 ++++++++++++++++++ .../fedora/scripts/build-tools.sh | 2 +- 3 files changed, 220 insertions(+), 1 deletion(-) create mode 100644 packer_templates/fedora/fedora-30-x86_64.json diff --git a/builds.yml b/builds.yml index 0067766f7..3963d3897 100644 --- a/builds.yml +++ b/builds.yml @@ -12,6 +12,7 @@ public: - 'debian-10.0-i386' - 'debian-10.0' - 'fedora-29' +- 'fedora-30' - 'freebsd-11.2-i386' - 'freebsd-11.2' - 'freebsd-12.0-i386' diff --git a/packer_templates/fedora/fedora-30-x86_64.json b/packer_templates/fedora/fedora-30-x86_64.json new file mode 100644 index 000000000..eba291d9b --- /dev/null +++ b/packer_templates/fedora/fedora-30-x86_64.json @@ -0,0 +1,218 @@ +{ + "builders": [ + { + "type": "qemu", + "vm_name": "{{ user `template` }}", + "name": "{{ user `template` }}", + "output_directory": "../../builds/packer-{{user `template`}}-libvirt", + "accelerator": "kvm", + "boot_wait": "10s", + "boot_command": [ + "<tab> linux ks=http://{{.HTTPIP}}:{{.HTTPPort}}/{{user `ks_path`}}<enter><wait>" + ], + "format": "qcow2", + "disk_size": "{{user `disk_size`}}", + "disk_discard": "unmap", + "disk_cache": "unsafe", + "disk_compression": true, + "disk_interface": "virtio-scsi", + "net_device": "virtio-net", + "qemuargs": [ + [ + "-m", + "{{ user `memory` }}" + ], + [ + "-smp", + "cpus={{ user `cpus` }}" + ] + ], + "http_directory": "http", + "headless": "{{ user `headless` }}", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "ssh_username": "vagrant", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_wait_timeout": "3600s", + "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now" + }, + { + "boot_command": [ + "<tab> linux ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": "{{user `disk_size`}}", + "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "guest_os_type": "Fedora_64", + "hard_drive_interface": "sata", + "headless": "{{ user `headless` }}", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "../../builds/packer-{{user `template`}}-virtualbox", + "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "virtualbox-iso", + "vboxmanage": [ + [ + "modifyvm", + "{{.Name}}", + "--memory", + "{{ user `memory` }}" + ], + [ + "modifyvm", + "{{.Name}}", + "--cpus", + "{{ user `cpus` }}" + ] + ], + "virtualbox_version_file": ".vbox_version", + "vm_name": "{{ user `template` }}" + }, + { + "boot_command": [ + "<tab> linux ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": "{{user `disk_size`}}", + "guest_os_type": "fedora-64", + "headless": "{{ user `headless` }}", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "../../builds/packer-{{user `template`}}-vmware", + "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "tools_upload_flavor": "linux", + "type": "vmware-iso", + "vm_name": "{{ user `template` }}", + "vmx_data": { + "cpuid.coresPerSocket": "1", + "ethernet0.pciSlotNumber": "32", + "memsize": "{{ user `memory` }}", + "numvcpus": "{{ user `cpus` }}" + }, + "vmx_remove_ethernet_interfaces": true + }, + { + "boot_command": [ + "<tab> linux ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": "{{user `disk_size`}}", + "guest_os_type": "fedora-core", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "../../builds/packer-{{user `template`}}-parallels", + "parallels_tools_flavor": "lin", + "prlctl": [ + [ + "set", + "{{.Name}}", + "--memsize", + "{{ user `memory` }}" + ], + [ + "set", + "{{.Name}}", + "--cpus", + "{{ user `cpus` }}" + ] + ], + "prlctl_version_file": ".prlctl_version", + "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "parallels-iso", + "vm_name": "{{ user `template` }}" + }, + { + "boot_command": [ + "<tab> linux ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": "{{user `disk_size`}}", + "headless": "{{ user `headless` }}", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "../../builds/packer-{{user `template`}}-qemu", + "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "qemu", + "vm_name": "{{ user `template` }}" + } + ], + "post-processors": [ + { + "output": "../../builds/{{user `box_basename`}}.{{.Provider}}.box", + "type": "vagrant" + } + ], + "provisioners": [ + { + "environment_vars": [ + "HOME_DIR=/home/vagrant", + "http_proxy={{user `http_proxy`}}", + "https_proxy={{user `https_proxy`}}", + "no_proxy={{user `no_proxy`}}" + ], + "execute_command": "echo 'vagrant' | {{.Vars}} sudo -E -S bash '{{.Path}}'", + "expect_disconnect": true, + "scripts": [ + "scripts/swap.sh", + "scripts/fix-slow-dns.sh", + "scripts/build-tools.sh", + "../_common/sshd.sh", + "../_common/virtualbox.sh", + "../_common/vmware.sh", + "../_common/parallels.sh", + "../_common/vagrant.sh", + "scripts/cleanup.sh", + "../_common/minimize.sh" + ], + "type": "shell" + } + ], + "variables": { + "arch": "64", + "box_basename": "fedora-30", + "build_timestamp": "{{isotime \"20060102150405\"}}", + "cpus": "1", + "disk_size": "65536", + "git_revision": "__unknown_git_revision__", + "headless": "", + "http_proxy": "{{env `http_proxy`}}", + "https_proxy": "{{env `https_proxy`}}", + "iso_checksum": "bb0622b78449298e24a96b90b561b429edec71aae72b8f7a8c3da4d81e4df5b7", + "iso_checksum_type": "sha256", + "iso_name": "Fedora-Server-dvd-x86_64-30-1.2.iso", + "ks_path": "ks-fedora29.cfg", + "memory": "1024", + "mirror": "http://download.fedoraproject.org/pub/fedora/linux", + "mirror_directory": "releases/30/Server/x86_64/iso", + "name": "fedora-30", + "no_proxy": "{{env `no_proxy`}}", + "template": "fedora-30-x86_64", + "version": "TIMESTAMP" + } +} diff --git a/packer_templates/fedora/scripts/build-tools.sh b/packer_templates/fedora/scripts/build-tools.sh index 10b5a09fc..8e2c52eb7 100644 --- a/packer_templates/fedora/scripts/build-tools.sh +++ b/packer_templates/fedora/scripts/build-tools.sh @@ -1,3 +1,3 @@ #!/bin/bash -eux # Installing build tools here because Fedora 22+ will not do so during kickstart -dnf -y install kernel-headers-$(uname -r) kernel-devel-$(uname -r) elfutils-libelf-devel gcc make perl +dnf -y install kernel-headers kernel-devel-$(uname -r) elfutils-libelf-devel gcc make perl From fac1b4af785a4dc9582e68f753ead91a59341141 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Sun, 7 Jul 2019 21:17:57 -0700 Subject: [PATCH 0981/1622] Update builds.yml with the current systems Signed-off-by: Tim Smith <tsmith@chef.io> --- builds.yml | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/builds.yml b/builds.yml index 3963d3897..0ff7efbcc 100644 --- a/builds.yml +++ b/builds.yml @@ -7,8 +7,8 @@ public: - 'centos-7.6' - 'debian-8.11-i386' - 'debian-8.11' -- 'debian-9.8-i386' -- 'debian-9.8' +- 'debian-9.9-i386' +- 'debian-9.9' - 'debian-10.0-i386' - 'debian-10.0' - 'fedora-29' @@ -19,6 +19,8 @@ public: - 'freebsd-12.0' - 'hardenedbsd-11' - 'opensuse-leap-15.1' +- 'oracle-5.11-i386' +- 'oracle-5.11' - 'oracle-6.10-i386' - 'oracle-6.10' - 'oracle-7.6' @@ -27,20 +29,21 @@ public: - 'ubuntu-16.04' - 'ubuntu-18.04' - 'ubuntu-18.10' +- 'ubuntu-19.04' slugs: 'centos-7': 'centos-7.6' 'centos-6': 'centos-6.10' 'centos-5': 'centos-5.11' - 'debian-9': 'debian-9.8' 'debian-8': 'debian-8.11' - 'oracle-7': 'oracle-7.6' + 'debian-9': 'debian-9.8' 'debian-10': 'debian-10.0' 'oracle-6': 'oracle-6.10' + 'oracle-7': 'oracle-7.6' 'scientific-7': 'scientific-7.6' 'freebsd-11': 'freebsd-11.2' 'freebsd-12': 'freebsd-12.0' - 'opensuse-leap-15': 'opensuse-leap-15.0' + 'opensuse-leap-15': 'opensuse-leap-15.1' providers: - virtualbox-iso From 1204ddaf8c2e30470a88b59062a4ae0b9539b5d4 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Sun, 7 Jul 2019 21:36:55 -0700 Subject: [PATCH 0982/1622] Fix bad versions in the Debian configs Signed-off-by: Tim Smith <tsmith@chef.io> --- packer_templates/debian/debian-10.0-amd64.json | 6 +++--- packer_templates/debian/debian-10.0-i386.json | 6 +++--- packer_templates/debian/debian-9.9-amd64.json | 6 +++--- packer_templates/debian/debian-9.9-i386.json | 6 +++--- packer_templates/debian/debian-9.9-ppc64el.json | 6 +++--- 5 files changed, 15 insertions(+), 15 deletions(-) diff --git a/packer_templates/debian/debian-10.0-amd64.json b/packer_templates/debian/debian-10.0-amd64.json index 29d4125dd..8e2cda45c 100644 --- a/packer_templates/debian/debian-10.0-amd64.json +++ b/packer_templates/debian/debian-10.0-amd64.json @@ -217,7 +217,7 @@ } ], "variables": { - "box_basename": "debian-9.8", + "box_basename": "debian-10.0", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", "disk_size": "65536", @@ -231,10 +231,10 @@ "memory": "1024", "mirror": "http://cdimage.debian.org/cdimage/release", "mirror_directory": "10.0.0/amd64/iso-cd", - "name": "debian-9.8", + "name": "debian-10.0", "no_proxy": "{{env `no_proxy`}}", "preseed_path": "debian-9/preseed.cfg", - "template": "debian-9.8-amd64", + "template": "debian-10.0-amd64", "version": "TIMESTAMP" } } diff --git a/packer_templates/debian/debian-10.0-i386.json b/packer_templates/debian/debian-10.0-i386.json index 6c3cc5425..43632f29a 100644 --- a/packer_templates/debian/debian-10.0-i386.json +++ b/packer_templates/debian/debian-10.0-i386.json @@ -217,7 +217,7 @@ } ], "variables": { - "box_basename": "debian-9.8-i386", + "box_basename": "debian-10.0-i386", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", "disk_size": "65536", @@ -231,10 +231,10 @@ "memory": "1024", "mirror": "http://cdimage.debian.org/cdimage/release", "mirror_directory": "10.0.0/i386/iso-cd", - "name": "debian-9.8-i386", + "name": "debian-10.0-i386", "no_proxy": "{{env `no_proxy`}}", "preseed_path": "debian-9/preseed.cfg", - "template": "debian-9.8-i386", + "template": "debian-10.0-i386", "version": "TIMESTAMP" } } diff --git a/packer_templates/debian/debian-9.9-amd64.json b/packer_templates/debian/debian-9.9-amd64.json index 46cb5b794..7d0613b1d 100644 --- a/packer_templates/debian/debian-9.9-amd64.json +++ b/packer_templates/debian/debian-9.9-amd64.json @@ -217,7 +217,7 @@ } ], "variables": { - "box_basename": "debian-9.8", + "box_basename": "debian-9.9", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", "disk_size": "65536", @@ -231,10 +231,10 @@ "memory": "1024", "mirror": "http://cdimage.debian.org/cdimage/release", "mirror_directory": "9.9.0/amd64/iso-cd", - "name": "debian-9.8", + "name": "debian-9.9", "no_proxy": "{{env `no_proxy`}}", "preseed_path": "debian-9/preseed.cfg", - "template": "debian-9.8-amd64", + "template": "debian-9.9-amd64", "version": "TIMESTAMP" } } diff --git a/packer_templates/debian/debian-9.9-i386.json b/packer_templates/debian/debian-9.9-i386.json index 87e43a5aa..b4c474a89 100644 --- a/packer_templates/debian/debian-9.9-i386.json +++ b/packer_templates/debian/debian-9.9-i386.json @@ -217,7 +217,7 @@ } ], "variables": { - "box_basename": "debian-9.8-i386", + "box_basename": "debian-9.9-i386", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", "disk_size": "65536", @@ -231,10 +231,10 @@ "memory": "1024", "mirror": "http://cdimage.debian.org/cdimage/release", "mirror_directory": "9.9.0/i386/iso-cd", - "name": "debian-9.8-i386", + "name": "debian-9.9-i386", "no_proxy": "{{env `no_proxy`}}", "preseed_path": "debian-9/preseed.cfg", - "template": "debian-9.8-i386", + "template": "debian-9.9-i386", "version": "TIMESTAMP" } } diff --git a/packer_templates/debian/debian-9.9-ppc64el.json b/packer_templates/debian/debian-9.9-ppc64el.json index 4d861d133..dc17ba1b6 100644 --- a/packer_templates/debian/debian-9.9-ppc64el.json +++ b/packer_templates/debian/debian-9.9-ppc64el.json @@ -78,7 +78,7 @@ } ], "variables": { - "box_basename": "debian-9.8", + "box_basename": "debian-9.9", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", "disk_size": "65536", @@ -92,10 +92,10 @@ "memory": "1024", "mirror": "http://cdimage.debian.org/cdimage/release", "mirror_directory": "9.9.0/ppc64el/iso-cd", - "name": "debian-9.8", + "name": "debian-9.9", "no_proxy": "{{env `no_proxy`}}", "preseed_path": "debian-9/preseed.cfg", - "template": "debian-9.8-ppc64el", + "template": "debian-9.9-ppc64el", "version": "TIMESTAMP" } } From be2ca582a3908fd2ec4648bd02523cf90f261683 Mon Sep 17 00:00:00 2001 From: Lance Albertson <lance@osuosl.org> Date: Sun, 7 Jul 2019 22:34:34 -0700 Subject: [PATCH 0983/1622] Install rsync on popular boxes Installing rsync allows users to utilize kitchen-sync [1] to speed up test-kitchen sync tasks. Unfortunately, none of the bento boxes include rsync so this adds it. It should had a minimal amount of disk space (less than a few MBs) [1] https://github.com/coderanger/kitchen-sync Signed-off-by: Lance Albertson <lance@osuosl.org> --- packer_templates/centos/http/6/ks.cfg | 1 + packer_templates/centos/http/7/ks.cfg | 1 + packer_templates/debian/http/debian-8/preseed.cfg | 2 +- packer_templates/debian/http/debian-9/preseed.cfg | 2 +- packer_templates/fedora/http/ks-fedora29.cfg | 1 + packer_templates/ubuntu/http/preseed.cfg | 2 +- 6 files changed, 6 insertions(+), 3 deletions(-) diff --git a/packer_templates/centos/http/6/ks.cfg b/packer_templates/centos/http/6/ks.cfg index dc01aa1de..c24d3034d 100644 --- a/packer_templates/centos/http/6/ks.cfg +++ b/packer_templates/centos/http/6/ks.cfg @@ -32,6 +32,7 @@ perl wget nfs-utils virt-what +rsync -fprintd-pam -intltool diff --git a/packer_templates/centos/http/7/ks.cfg b/packer_templates/centos/http/7/ks.cfg index 51c0acc21..6e7e04c3a 100644 --- a/packer_templates/centos/http/7/ks.cfg +++ b/packer_templates/centos/http/7/ks.cfg @@ -34,6 +34,7 @@ nfs-utils net-tools bzip2 deltarpm +rsync -fprintd-pam -intltool diff --git a/packer_templates/debian/http/debian-8/preseed.cfg b/packer_templates/debian/http/debian-8/preseed.cfg index eeeea7af9..11f0e1525 100644 --- a/packer_templates/debian/http/debian-8/preseed.cfg +++ b/packer_templates/debian/http/debian-8/preseed.cfg @@ -30,7 +30,7 @@ d-i passwd/user-uid string 1000 d-i passwd/user-password password vagrant d-i passwd/user-password-again password vagrant d-i passwd/username string vagrant -d-i pkgsel/include string sudo bzip2 acpid cryptsetup zlib1g-dev wget curl dkms fuse make nfs-common net-tools cifs-utils +d-i pkgsel/include string sudo bzip2 acpid cryptsetup zlib1g-dev wget curl dkms fuse make nfs-common net-tools cifs-utils rsync d-i pkgsel/install-language-support boolean false d-i pkgsel/update-policy select none d-i pkgsel/upgrade select full-upgrade diff --git a/packer_templates/debian/http/debian-9/preseed.cfg b/packer_templates/debian/http/debian-9/preseed.cfg index a4cda4342..250463ecf 100644 --- a/packer_templates/debian/http/debian-9/preseed.cfg +++ b/packer_templates/debian/http/debian-9/preseed.cfg @@ -30,7 +30,7 @@ d-i passwd/user-uid string 1000 d-i passwd/user-password password vagrant d-i passwd/user-password-again password vagrant d-i passwd/username string vagrant -d-i pkgsel/include string sudo bzip2 acpid cryptsetup zlib1g-dev wget curl dkms fuse make nfs-common net-tools cifs-utils +d-i pkgsel/include string sudo bzip2 acpid cryptsetup zlib1g-dev wget curl dkms fuse make nfs-common net-tools cifs-utils rsync d-i pkgsel/install-language-support boolean false d-i pkgsel/update-policy select none d-i pkgsel/upgrade select full-upgrade diff --git a/packer_templates/fedora/http/ks-fedora29.cfg b/packer_templates/fedora/http/ks-fedora29.cfg index eb75f84a3..5e1784fe5 100644 --- a/packer_templates/fedora/http/ks-fedora29.cfg +++ b/packer_templates/fedora/http/ks-fedora29.cfg @@ -28,6 +28,7 @@ tar wget nfs-utils net-tools +rsync -plymouth -plymouth-core-libs -fedora-release-notes diff --git a/packer_templates/ubuntu/http/preseed.cfg b/packer_templates/ubuntu/http/preseed.cfg index b13ca7437..e215e37bd 100644 --- a/packer_templates/ubuntu/http/preseed.cfg +++ b/packer_templates/ubuntu/http/preseed.cfg @@ -25,7 +25,7 @@ d-i passwd/user-uid string 1000 d-i passwd/user-password password vagrant d-i passwd/user-password-again password vagrant d-i passwd/username string vagrant -d-i pkgsel/include string openssh-server cryptsetup build-essential libssl-dev libreadline-dev zlib1g-dev linux-source dkms nfs-common linux-headers-$(uname -r) perl cifs-utils software-properties-common +d-i pkgsel/include string openssh-server cryptsetup build-essential libssl-dev libreadline-dev zlib1g-dev linux-source dkms nfs-common linux-headers-$(uname -r) perl cifs-utils software-properties-common rsync d-i pkgsel/install-language-support boolean false d-i pkgsel/update-policy select none d-i pkgsel/upgrade select full-upgrade From 2598b38270369d7681a7cfc34de55b0b534c2d76 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Sun, 7 Jul 2019 23:20:41 -0700 Subject: [PATCH 0984/1622] Clean up the correct ovf file for Amazon Linux This prevents a failure if the file already exists Signed-off-by: Tim Smith <tsmith@chef.io> --- packer_templates/amazonlinux/STEP1_build_ovf.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packer_templates/amazonlinux/STEP1_build_ovf.sh b/packer_templates/amazonlinux/STEP1_build_ovf.sh index f4cb87cd4..35c24edc2 100755 --- a/packer_templates/amazonlinux/STEP1_build_ovf.sh +++ b/packer_templates/amazonlinux/STEP1_build_ovf.sh @@ -8,7 +8,7 @@ fi echo "Cleaning up old files" rm seed.iso -rm amazon.ovf +rm amazon2.ovf rm *.vmdk echo "Creating ISO" From 2f3e4c0864027268333ce9307bb4df8d543b4330 Mon Sep 17 00:00:00 2001 From: Andres Montalban <amontalban@perceptyx.com> Date: Fri, 12 Jul 2019 15:57:54 -0300 Subject: [PATCH 0985/1622] Add FreeBSD 11.3 Signed-off-by: Andres Montalban <amontalban@perceptyx.com> --- builds.yml | 4 +- .../freebsd/freebsd-11.3-amd64.json | 229 ++++++++++++++++++ .../freebsd/freebsd-11.3-i386.json | 229 ++++++++++++++++++ 3 files changed, 461 insertions(+), 1 deletion(-) create mode 100644 packer_templates/freebsd/freebsd-11.3-amd64.json create mode 100644 packer_templates/freebsd/freebsd-11.3-i386.json diff --git a/builds.yml b/builds.yml index 0ff7efbcc..c8fa04a25 100644 --- a/builds.yml +++ b/builds.yml @@ -15,6 +15,8 @@ public: - 'fedora-30' - 'freebsd-11.2-i386' - 'freebsd-11.2' +- 'freebsd-11.3-i386' +- 'freebsd-11.3' - 'freebsd-12.0-i386' - 'freebsd-12.0' - 'hardenedbsd-11' @@ -41,7 +43,7 @@ slugs: 'oracle-6': 'oracle-6.10' 'oracle-7': 'oracle-7.6' 'scientific-7': 'scientific-7.6' - 'freebsd-11': 'freebsd-11.2' + 'freebsd-11': 'freebsd-11.3' 'freebsd-12': 'freebsd-12.0' 'opensuse-leap-15': 'opensuse-leap-15.1' diff --git a/packer_templates/freebsd/freebsd-11.3-amd64.json b/packer_templates/freebsd/freebsd-11.3-amd64.json new file mode 100644 index 000000000..ecfb6d85b --- /dev/null +++ b/packer_templates/freebsd/freebsd-11.3-amd64.json @@ -0,0 +1,229 @@ +{ + "builders": [ + { + "boot_command": [ + "<esc><wait>", + "boot -s<wait>", + "<enter><wait>", + "<wait10><wait10>", + "/bin/sh<enter><wait>", + "mdmfs -s 100m md1 /tmp<enter><wait>", + "mdmfs -s 100m md2 /mnt<enter><wait>", + "dhclient -l /tmp/dhclient.lease.em0 em0<enter><wait>", + "fetch -o /tmp/installerconfig http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} && bsdinstall script /tmp/installerconfig<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": "{{user `disk_size`}}", + "guest_additions_mode": "disable", + "guest_os_type": "FreeBSD_64", + "headless": "{{ user `headless` }}", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "../../builds/packer-{{user `template`}}-virtualbox", + "shutdown_command": "echo 'vagrant' | su -m root -c 'shutdown -p now'", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "virtualbox-iso", + "vboxmanage": [ + [ + "modifyvm", + "{{.Name}}", + "--memory", + "{{ user `memory` }}" + ], + [ + "modifyvm", + "{{.Name}}", + "--cpus", + "{{ user `cpus` }}" + ] + ], + "virtualbox_version_file": ".vbox_version", + "vm_name": "{{ user `template` }}" + }, + { + "boot_command": [ + "<esc><wait>", + "boot -s<wait>", + "<enter><wait>", + "<wait10><wait10>", + "/bin/sh<enter><wait>", + "mdmfs -s 100m md1 /tmp<enter><wait>", + "mdmfs -s 100m md2 /mnt<enter><wait>", + "dhclient -l /tmp/dhclient.lease.em0 em0<enter><wait>", + "<wait5>", + "fetch -o /tmp/installerconfig http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} && bsdinstall script /tmp/installerconfig<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": "{{user `disk_size`}}", + "guest_os_type": "freebsd-64", + "headless": "{{ user `headless` }}", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "../../builds/packer-{{user `template`}}-vmware", + "shutdown_command": "echo 'vagrant' | su -m root -c 'shutdown -p now'", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "vmware-iso", + "vm_name": "{{ user `template` }}", + "vmx_data": { + "cpuid.coresPerSocket": "1", + "memsize": "{{ user `memory` }}", + "numvcpus": "{{ user `cpus` }}" + }, + "vmx_remove_ethernet_interfaces": true + }, + { + "boot_command": [ + "<esc><wait>", + "boot -s<wait>", + "<enter><wait>", + "<wait10><wait10>", + "/bin/sh<enter><wait>", + "mdmfs -s 100m md1 /tmp<enter><wait>", + "mdmfs -s 100m md2 /mnt<enter><wait>", + "dhclient -l /tmp/dhclient.lease.em0 em0<enter><wait>", + "fetch -o /tmp/installerconfig http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} && bsdinstall script /tmp/installerconfig<enter><wait>" + ], + "boot_wait": "8s", + "disk_size": "{{user `disk_size`}}", + "guest_os_type": "freebsd", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "../../builds/packer-{{user `template`}}-parallels", + "parallels_tools_mode": "disable", + "prlctl": [ + [ + "set", + "{{.Name}}", + "--memsize", + "{{ user `memory` }}" + ], + [ + "set", + "{{.Name}}", + "--cpus", + "{{ user `cpus` }}" + ], + [ + "set", + "{{.Name}}", + "--device-set", + "cdrom0", + "--iface", + "ide" + ], + [ + "set", + "{{.Name}}", + "--device-del", + "fdd0" + ], + [ + "set", + "{{.Name}}", + "--device-del", + "parallel0" + ] + ], + "prlctl_version_file": ".prlctl_version", + "shutdown_command": "echo 'vagrant' | su -m root -c 'shutdown -p now'", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "parallels-iso", + "vm_name": "{{ user `template` }}" + }, + { + "boot_command": [ + "<esc><wait>", + "boot -s<wait>", + "<enter><wait>", + "<wait10><wait10>", + "/bin/sh<enter><wait>", + "mdmfs -s 100m md1 /tmp<enter><wait>", + "mdmfs -s 100m md2 /mnt<enter><wait>", + "dhclient -l /tmp/dhclient.lease.vtnet0 vtnet0<enter><wait>", + "fetch -o /tmp/installerconfig http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} && bsdinstall script /tmp/installerconfig<enter><wait>" + ], + "boot_wait": "7s", + "disk_size": "{{user `disk_size`}}", + "headless": "{{ user `headless` }}", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "../../builds/packer-{{user `template`}}-qemu", + "shutdown_command": "echo 'vagrant' | su -m root -c 'shutdown -p now'", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "qemu", + "vm_name": "{{ user `template` }}" + } + ], + "post-processors": [ + { + "output": "../../builds/{{user `box_basename`}}.{{.Provider}}.box", + "type": "vagrant", + "vagrantfile_template": "vagrantfile_templates/freebsd.rb" + } + ], + "provisioners": [ + { + "environment_vars": [ + "HOME_DIR=/home/vagrant", + "http_proxy={{user `http_proxy`}}", + "https_proxy={{user `https_proxy`}}", + "no_proxy={{user `no_proxy`}}", + "pkg_branch={{user `pkg_branch`}}" + ], + "execute_command": "echo 'vagrant' | {{.Vars}} su -m root -c 'sh -eux {{.Path}}'", + "expect_disconnect": true, + "scripts": [ + "scripts/update.sh", + "scripts/postinstall.sh", + "scripts/sudoers.sh", + "../_common/vagrant.sh", + "scripts/vmtools.sh", + "scripts/cleanup.sh", + "scripts/minimize.sh" + ], + "type": "shell" + } + ], + "variables": { + "box_basename": "freebsd-11.3", + "build_timestamp": "{{isotime \"20060102150405\"}}", + "cpus": "1", + "disk_size": "65536", + "git_revision": "__unknown_git_revision__", + "headless": "", + "http_proxy": "{{env `http_proxy`}}", + "https_proxy": "{{env `https_proxy`}}", + "install_path": "freebsd-11/installerconfig", + "iso_checksum": "d268db365e26305ec3d51b29211caad903749c33a4a8f2cf661d671f8e0ba0b0", + "iso_checksum_type": "sha256", + "iso_name": "FreeBSD-11.3-RELEASE-amd64-disc1.iso", + "memory": "1024", + "mirror": "https://download.freebsd.org/ftp", + "mirror_directory": "releases/amd64/amd64/ISO-IMAGES/11.3", + "name": "freebsd-11.3", + "no_proxy": "{{env `no_proxy`}}", + "pkg_branch": "quarterly", + "template": "freebsd-11.3-amd64", + "version": "TIMESTAMP" + } +} diff --git a/packer_templates/freebsd/freebsd-11.3-i386.json b/packer_templates/freebsd/freebsd-11.3-i386.json new file mode 100644 index 000000000..17fe60e9b --- /dev/null +++ b/packer_templates/freebsd/freebsd-11.3-i386.json @@ -0,0 +1,229 @@ +{ + "builders": [ + { + "boot_command": [ + "<esc><wait>", + "boot -s<wait>", + "<enter><wait>", + "<wait10><wait10>", + "/bin/sh<enter><wait>", + "mdmfs -s 100m md1 /tmp<enter><wait>", + "mdmfs -s 100m md2 /mnt<enter><wait>", + "dhclient -l /tmp/dhclient.lease.em0 em0<enter><wait>", + "fetch -o /tmp/installerconfig http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} && bsdinstall script /tmp/installerconfig<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": "{{user `disk_size`}}", + "guest_additions_mode": "disable", + "guest_os_type": "FreeBSD", + "headless": "{{ user `headless` }}", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "../../builds/packer-{{user `template`}}-virtualbox", + "shutdown_command": "echo 'vagrant' | su -m root -c 'shutdown -p now'", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "virtualbox-iso", + "vboxmanage": [ + [ + "modifyvm", + "{{.Name}}", + "--memory", + "{{ user `memory` }}" + ], + [ + "modifyvm", + "{{.Name}}", + "--cpus", + "{{ user `cpus` }}" + ] + ], + "virtualbox_version_file": ".vbox_version", + "vm_name": "{{ user `template` }}" + }, + { + "boot_command": [ + "<esc><wait>", + "boot -s<wait>", + "<enter><wait>", + "<wait10><wait10>", + "/bin/sh<enter><wait>", + "mdmfs -s 100m md1 /tmp<enter><wait>", + "mdmfs -s 100m md2 /mnt<enter><wait>", + "dhclient -l /tmp/dhclient.lease.em0 em0<enter><wait>", + "<wait5>", + "fetch -o /tmp/installerconfig http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} && bsdinstall script /tmp/installerconfig<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": "{{user `disk_size`}}", + "guest_os_type": "freebsd", + "headless": "{{ user `headless` }}", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "../../builds/packer-{{user `template`}}-vmware", + "shutdown_command": "echo 'vagrant' | su -m root -c 'shutdown -p now'", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "vmware-iso", + "vm_name": "{{ user `template` }}", + "vmx_data": { + "cpuid.coresPerSocket": "1", + "memsize": "{{ user `memory` }}", + "numvcpus": "{{ user `cpus` }}" + }, + "vmx_remove_ethernet_interfaces": true + }, + { + "boot_command": [ + "<esc><wait>", + "boot -s<wait>", + "<enter><wait>", + "<wait10><wait10>", + "/bin/sh<enter><wait>", + "mdmfs -s 100m md1 /tmp<enter><wait>", + "mdmfs -s 100m md2 /mnt<enter><wait>", + "dhclient -l /tmp/dhclient.lease.em0 em0<enter><wait>", + "fetch -o /tmp/installerconfig http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} && bsdinstall script /tmp/installerconfig<enter><wait>" + ], + "boot_wait": "8s", + "disk_size": "{{user `disk_size`}}", + "guest_os_type": "freebsd", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "../../builds/packer-{{user `template`}}-parallels", + "parallels_tools_mode": "disable", + "prlctl": [ + [ + "set", + "{{.Name}}", + "--memsize", + "{{ user `memory` }}" + ], + [ + "set", + "{{.Name}}", + "--cpus", + "{{ user `cpus` }}" + ], + [ + "set", + "{{.Name}}", + "--device-set", + "cdrom0", + "--iface", + "ide" + ], + [ + "set", + "{{.Name}}", + "--device-del", + "fdd0" + ], + [ + "set", + "{{.Name}}", + "--device-del", + "parallel0" + ] + ], + "prlctl_version_file": ".prlctl_version", + "shutdown_command": "echo 'vagrant' | su -m root -c 'shutdown -p now'", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "parallels-iso", + "vm_name": "{{ user `template` }}" + }, + { + "boot_command": [ + "<esc><wait>", + "boot -s<wait>", + "<enter><wait>", + "<wait10><wait10>", + "/bin/sh<enter><wait>", + "mdmfs -s 100m md1 /tmp<enter><wait>", + "mdmfs -s 100m md2 /mnt<enter><wait>", + "dhclient -l /tmp/dhclient.lease.vtnet0 vtnet0<enter><wait>", + "fetch -o /tmp/installerconfig http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} && bsdinstall script /tmp/installerconfig<enter><wait>" + ], + "boot_wait": "7s", + "disk_size": "{{user `disk_size`}}", + "headless": "{{ user `headless` }}", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "../../builds/packer-{{user `template`}}-qemu", + "shutdown_command": "echo 'vagrant' | su -m root -c 'shutdown -p now'", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "qemu", + "vm_name": "{{ user `template` }}" + } + ], + "post-processors": [ + { + "output": "../../builds/{{user `box_basename`}}.{{.Provider}}.box", + "type": "vagrant", + "vagrantfile_template": "vagrantfile_templates/freebsd.rb" + } + ], + "provisioners": [ + { + "environment_vars": [ + "HOME_DIR=/home/vagrant", + "http_proxy={{user `http_proxy`}}", + "https_proxy={{user `https_proxy`}}", + "no_proxy={{user `no_proxy`}}", + "pkg_branch={{user `pkg_branch`}}" + ], + "execute_command": "echo 'vagrant' | {{.Vars}} su -m root -c 'sh -eux {{.Path}}'", + "expect_disconnect": true, + "scripts": [ + "scripts/update.sh", + "scripts/postinstall.sh", + "scripts/sudoers.sh", + "../_common/vagrant.sh", + "scripts/vmtools.sh", + "scripts/cleanup.sh", + "scripts/minimize.sh" + ], + "type": "shell" + } + ], + "variables": { + "box_basename": "freebsd-11.3-i386", + "build_timestamp": "{{isotime \"20060102150405\"}}", + "cpus": "1", + "disk_size": "40960", + "git_revision": "__unknown_git_revision__", + "headless": "", + "http_proxy": "{{env `http_proxy`}}", + "https_proxy": "{{env `https_proxy`}}", + "install_path": "freebsd-11/installerconfig", + "iso_checksum": "88860cc6ffd730dad3ee6d3eb1af88234430a26aca6f3e3e26a66521f1e66b74", + "iso_checksum_type": "sha256", + "iso_name": "FreeBSD-11.3-RELEASE-i386-disc1.iso", + "memory": "1024", + "mirror": "https://download.freebsd.org/ftp", + "mirror_directory": "releases/i386/i386/ISO-IMAGES/11.3", + "name": "freebsd-11.3-i386", + "no_proxy": "{{env `no_proxy`}}", + "pkg_branch": "quarterly", + "template": "freebsd-11.3-i386", + "version": "TIMESTAMP" + } +} From be3020f3cade519e764fde812f1dd11e57cca821 Mon Sep 17 00:00:00 2001 From: "Christopher A. Snapp" <csnapp@chef.io> Date: Wed, 17 Jul 2019 10:41:55 -0400 Subject: [PATCH 0986/1622] Modify Debian 9 URL to point to archive Signed-off-by: Christopher A. Snapp <csnapp@chef.io> --- packer_templates/debian/debian-9.9-amd64.json | 2 +- packer_templates/debian/debian-9.9-i386.json | 2 +- packer_templates/debian/debian-9.9-ppc64el.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packer_templates/debian/debian-9.9-amd64.json b/packer_templates/debian/debian-9.9-amd64.json index 7d0613b1d..5447eb631 100644 --- a/packer_templates/debian/debian-9.9-amd64.json +++ b/packer_templates/debian/debian-9.9-amd64.json @@ -229,7 +229,7 @@ "iso_checksum_type": "sha256", "iso_name": "debian-9.9.0-amd64-netinst.iso", "memory": "1024", - "mirror": "http://cdimage.debian.org/cdimage/release", + "mirror": "http://cdimage.debian.org/cdimage/archive", "mirror_directory": "9.9.0/amd64/iso-cd", "name": "debian-9.9", "no_proxy": "{{env `no_proxy`}}", diff --git a/packer_templates/debian/debian-9.9-i386.json b/packer_templates/debian/debian-9.9-i386.json index b4c474a89..06fe514df 100644 --- a/packer_templates/debian/debian-9.9-i386.json +++ b/packer_templates/debian/debian-9.9-i386.json @@ -229,7 +229,7 @@ "iso_checksum_type": "sha256", "iso_name": "debian-9.9.0-i386-netinst.iso", "memory": "1024", - "mirror": "http://cdimage.debian.org/cdimage/release", + "mirror": "http://cdimage.debian.org/cdimage/archive", "mirror_directory": "9.9.0/i386/iso-cd", "name": "debian-9.9-i386", "no_proxy": "{{env `no_proxy`}}", diff --git a/packer_templates/debian/debian-9.9-ppc64el.json b/packer_templates/debian/debian-9.9-ppc64el.json index dc17ba1b6..c588d9979 100644 --- a/packer_templates/debian/debian-9.9-ppc64el.json +++ b/packer_templates/debian/debian-9.9-ppc64el.json @@ -90,7 +90,7 @@ "iso_checksum_type": "sha256", "iso_name": "debian-9.9.0-ppc64el-netinst.iso", "memory": "1024", - "mirror": "http://cdimage.debian.org/cdimage/release", + "mirror": "http://cdimage.debian.org/cdimage/archive", "mirror_directory": "9.9.0/ppc64el/iso-cd", "name": "debian-9.9", "no_proxy": "{{env `no_proxy`}}", From 882fe8cd0a22f5b0cefd503bf092d3ffcf34e9bd Mon Sep 17 00:00:00 2001 From: "Christopher A. Snapp" <csnapp@chef.io> Date: Wed, 17 Jul 2019 10:38:20 -0400 Subject: [PATCH 0987/1622] Update box MOTD with Bento information Signed-off-by: Christopher A. Snapp <csnapp@chef.io> --- packer_templates/_common/motd.sh | 21 +++++++++++++++++++ .../amazonlinux/amazon-2-x86_64.json | 1 + packer_templates/centos/centos-5.11-i386.json | 1 + .../centos/centos-5.11-x86_64.json | 1 + packer_templates/centos/centos-6.10-i386.json | 1 + .../centos/centos-6.10-x86_64.json | 1 + .../centos/centos-7.6-x86_64.json | 1 + .../debian/debian-10.0-amd64.json | 1 + packer_templates/debian/debian-10.0-i386.json | 1 + .../debian/debian-8.11-amd64.json | 1 + packer_templates/debian/debian-8.11-i386.json | 1 + packer_templates/debian/debian-9.9-amd64.json | 1 + packer_templates/debian/debian-9.9-i386.json | 1 + .../debian/debian-9.9-ppc64el.json | 1 + packer_templates/fedora/fedora-29-x86_64.json | 1 + packer_templates/fedora/fedora-30-x86_64.json | 1 + .../opensuse/opensuse-leap-15.1-x86_64.json | 1 + .../oraclelinux/oracle-5.11-i386.json | 1 + .../oraclelinux/oracle-5.11-x86_64.json | 1 + .../oraclelinux/oracle-6.10-i386.json | 1 + .../oraclelinux/oracle-6.10-x86_64.json | 1 + .../oraclelinux/oracle-7.6-x86_64.json | 1 + packer_templates/rhel/rhel-5.11-i386.json | 1 + packer_templates/rhel/rhel-5.11-x86_64.json | 1 + packer_templates/rhel/rhel-6.10-i386.json | 1 + packer_templates/rhel/rhel-6.10-x86_64.json | 1 + packer_templates/rhel/rhel-7.6-x86_64.json | 1 + .../scientific-7.6-x86_64.json | 1 + packer_templates/sles/sles-11-sp4-x86_64.json | 1 + packer_templates/sles/sles-12-sp2-x86_64.json | 1 + packer_templates/sles/sles-12-sp3-x86_64.json | 1 + packer_templates/sles/sles-15.json | 1 + .../ubuntu/ubuntu-16.04-amd64.json | 1 + .../ubuntu/ubuntu-16.04-i386.json | 1 + .../ubuntu/ubuntu-18.04-amd64.json | 1 + .../ubuntu/ubuntu-18.10-amd64.json | 1 + .../ubuntu/ubuntu-19.04-amd64.json | 1 + 37 files changed, 57 insertions(+) create mode 100644 packer_templates/_common/motd.sh diff --git a/packer_templates/_common/motd.sh b/packer_templates/_common/motd.sh new file mode 100644 index 000000000..7079e9ccc --- /dev/null +++ b/packer_templates/_common/motd.sh @@ -0,0 +1,21 @@ +#!/bin/sh -eux + +bento=' +This system is built by the Bento project by Chef Software +More information can be found at https://github.com/chef/bento/README.md' + +if [ -d /etc/update-motd.d ]; then + MOTD_CONFIG='/etc/update-motd.d/99-bento' + + cat >> "$MOTD_CONFIG" <<BENTO +#!/bin/sh + +cat <<'EOF' +$bento +EOF +BENTO + + chmod 0755 "$MOTD_CONFIG" +else + echo "$bento" >> /etc/motd +fi diff --git a/packer_templates/amazonlinux/amazon-2-x86_64.json b/packer_templates/amazonlinux/amazon-2-x86_64.json index de3f1ab7e..049f7e71c 100644 --- a/packer_templates/amazonlinux/amazon-2-x86_64.json +++ b/packer_templates/amazonlinux/amazon-2-x86_64.json @@ -48,6 +48,7 @@ "expect_disconnect": true, "scripts": [ "scripts/update.sh", + "../_common/motd.sh", "../_common/sshd.sh", "scripts/networking.sh", "../_common/vagrant.sh", diff --git a/packer_templates/centos/centos-5.11-i386.json b/packer_templates/centos/centos-5.11-i386.json index 8cc10ed97..88be60302 100644 --- a/packer_templates/centos/centos-5.11-i386.json +++ b/packer_templates/centos/centos-5.11-i386.json @@ -169,6 +169,7 @@ "scripts": [ "scripts/enable_vault.sh", "scripts/update.sh", + "../_common/motd.sh", "../_common/sshd.sh", "scripts/networking.sh", "../_common/vagrant.sh", diff --git a/packer_templates/centos/centos-5.11-x86_64.json b/packer_templates/centos/centos-5.11-x86_64.json index 2afae1992..46951f490 100644 --- a/packer_templates/centos/centos-5.11-x86_64.json +++ b/packer_templates/centos/centos-5.11-x86_64.json @@ -169,6 +169,7 @@ "scripts": [ "scripts/enable_vault.sh", "scripts/update.sh", + "../_common/motd.sh", "../_common/sshd.sh", "scripts/networking.sh", "../_common/vagrant.sh", diff --git a/packer_templates/centos/centos-6.10-i386.json b/packer_templates/centos/centos-6.10-i386.json index 9f29c1d2c..e7b3d7408 100644 --- a/packer_templates/centos/centos-6.10-i386.json +++ b/packer_templates/centos/centos-6.10-i386.json @@ -168,6 +168,7 @@ "expect_disconnect": true, "scripts": [ "scripts/update.sh", + "../_common/motd.sh", "../_common/sshd.sh", "scripts/networking.sh", "../_common/vagrant.sh", diff --git a/packer_templates/centos/centos-6.10-x86_64.json b/packer_templates/centos/centos-6.10-x86_64.json index eaabb6365..da7adcb07 100644 --- a/packer_templates/centos/centos-6.10-x86_64.json +++ b/packer_templates/centos/centos-6.10-x86_64.json @@ -168,6 +168,7 @@ "expect_disconnect": true, "scripts": [ "scripts/update.sh", + "../_common/motd.sh", "../_common/sshd.sh", "scripts/networking.sh", "../_common/vagrant.sh", diff --git a/packer_templates/centos/centos-7.6-x86_64.json b/packer_templates/centos/centos-7.6-x86_64.json index 51b9738da..a9882390c 100644 --- a/packer_templates/centos/centos-7.6-x86_64.json +++ b/packer_templates/centos/centos-7.6-x86_64.json @@ -168,6 +168,7 @@ "expect_disconnect": true, "scripts": [ "scripts/update.sh", + "../_common/motd.sh", "../_common/sshd.sh", "scripts/networking.sh", "../_common/vagrant.sh", diff --git a/packer_templates/debian/debian-10.0-amd64.json b/packer_templates/debian/debian-10.0-amd64.json index 8e2cda45c..b01001d91 100644 --- a/packer_templates/debian/debian-10.0-amd64.json +++ b/packer_templates/debian/debian-10.0-amd64.json @@ -202,6 +202,7 @@ "expect_disconnect": true, "scripts": [ "scripts/update.sh", + "../_common/motd.sh", "../_common/sshd.sh", "scripts/networking.sh", "scripts/sudoers.sh", diff --git a/packer_templates/debian/debian-10.0-i386.json b/packer_templates/debian/debian-10.0-i386.json index 43632f29a..25cfe61ff 100644 --- a/packer_templates/debian/debian-10.0-i386.json +++ b/packer_templates/debian/debian-10.0-i386.json @@ -202,6 +202,7 @@ "expect_disconnect": true, "scripts": [ "scripts/update.sh", + "../_common/motd.sh", "../_common/sshd.sh", "scripts/networking.sh", "scripts/sudoers.sh", diff --git a/packer_templates/debian/debian-8.11-amd64.json b/packer_templates/debian/debian-8.11-amd64.json index 44922a621..6b520543e 100644 --- a/packer_templates/debian/debian-8.11-amd64.json +++ b/packer_templates/debian/debian-8.11-amd64.json @@ -202,6 +202,7 @@ "expect_disconnect": true, "scripts": [ "scripts/update.sh", + "../_common/motd.sh", "../_common/sshd.sh", "scripts/networking.sh", "scripts/sudoers.sh", diff --git a/packer_templates/debian/debian-8.11-i386.json b/packer_templates/debian/debian-8.11-i386.json index cf88dba0a..df1113438 100644 --- a/packer_templates/debian/debian-8.11-i386.json +++ b/packer_templates/debian/debian-8.11-i386.json @@ -202,6 +202,7 @@ "expect_disconnect": true, "scripts": [ "scripts/update.sh", + "../_common/motd.sh", "../_common/sshd.sh", "scripts/networking.sh", "scripts/sudoers.sh", diff --git a/packer_templates/debian/debian-9.9-amd64.json b/packer_templates/debian/debian-9.9-amd64.json index 5447eb631..f8101b5af 100644 --- a/packer_templates/debian/debian-9.9-amd64.json +++ b/packer_templates/debian/debian-9.9-amd64.json @@ -202,6 +202,7 @@ "expect_disconnect": true, "scripts": [ "scripts/update.sh", + "../_common/motd.sh", "../_common/sshd.sh", "scripts/networking.sh", "scripts/sudoers.sh", diff --git a/packer_templates/debian/debian-9.9-i386.json b/packer_templates/debian/debian-9.9-i386.json index 06fe514df..558ac3848 100644 --- a/packer_templates/debian/debian-9.9-i386.json +++ b/packer_templates/debian/debian-9.9-i386.json @@ -202,6 +202,7 @@ "expect_disconnect": true, "scripts": [ "scripts/update.sh", + "../_common/motd.sh", "../_common/sshd.sh", "scripts/networking.sh", "scripts/sudoers.sh", diff --git a/packer_templates/debian/debian-9.9-ppc64el.json b/packer_templates/debian/debian-9.9-ppc64el.json index c588d9979..6dedceec7 100644 --- a/packer_templates/debian/debian-9.9-ppc64el.json +++ b/packer_templates/debian/debian-9.9-ppc64el.json @@ -63,6 +63,7 @@ "expect_disconnect": true, "scripts": [ "scripts/update.sh", + "../_common/motd.sh", "../_common/sshd.sh", "scripts/networking.sh", "scripts/sudoers.sh", diff --git a/packer_templates/fedora/fedora-29-x86_64.json b/packer_templates/fedora/fedora-29-x86_64.json index d49eaf85b..d0ccafb63 100644 --- a/packer_templates/fedora/fedora-29-x86_64.json +++ b/packer_templates/fedora/fedora-29-x86_64.json @@ -182,6 +182,7 @@ "scripts/swap.sh", "scripts/fix-slow-dns.sh", "scripts/build-tools.sh", + "../_common/motd.sh", "../_common/sshd.sh", "../_common/virtualbox.sh", "../_common/vmware.sh", diff --git a/packer_templates/fedora/fedora-30-x86_64.json b/packer_templates/fedora/fedora-30-x86_64.json index eba291d9b..8d099ccc6 100644 --- a/packer_templates/fedora/fedora-30-x86_64.json +++ b/packer_templates/fedora/fedora-30-x86_64.json @@ -182,6 +182,7 @@ "scripts/swap.sh", "scripts/fix-slow-dns.sh", "scripts/build-tools.sh", + "../_common/motd.sh", "../_common/sshd.sh", "../_common/virtualbox.sh", "../_common/vmware.sh", diff --git a/packer_templates/opensuse/opensuse-leap-15.1-x86_64.json b/packer_templates/opensuse/opensuse-leap-15.1-x86_64.json index 90632832d..b2848bc31 100644 --- a/packer_templates/opensuse/opensuse-leap-15.1-x86_64.json +++ b/packer_templates/opensuse/opensuse-leap-15.1-x86_64.json @@ -174,6 +174,7 @@ "scripts/repositories.sh", "scripts/update.sh", "scripts/add_packages.sh", + "../_common/motd.sh", "../_common/sshd.sh", "../_common/vagrant.sh", "../_common/virtualbox.sh", diff --git a/packer_templates/oraclelinux/oracle-5.11-i386.json b/packer_templates/oraclelinux/oracle-5.11-i386.json index 26580040f..0c15075f0 100644 --- a/packer_templates/oraclelinux/oracle-5.11-i386.json +++ b/packer_templates/oraclelinux/oracle-5.11-i386.json @@ -142,6 +142,7 @@ "scripts": [ "../centos/scripts/update.sh", "../_common/vagrant.sh", + "../_common/motd.sh", "../_common/sshd.sh", "../_common/virtualbox.sh", "../_common/vmware.sh", diff --git a/packer_templates/oraclelinux/oracle-5.11-x86_64.json b/packer_templates/oraclelinux/oracle-5.11-x86_64.json index 83d7323e1..2997229f6 100644 --- a/packer_templates/oraclelinux/oracle-5.11-x86_64.json +++ b/packer_templates/oraclelinux/oracle-5.11-x86_64.json @@ -148,6 +148,7 @@ "scripts": [ "../centos/scripts/update.sh", "../_common/vagrant.sh", + "../_common/motd.sh", "../_common/sshd.sh", "../_common/virtualbox.sh", "../_common/vmware.sh", diff --git a/packer_templates/oraclelinux/oracle-6.10-i386.json b/packer_templates/oraclelinux/oracle-6.10-i386.json index b5f777e60..6b520fe75 100644 --- a/packer_templates/oraclelinux/oracle-6.10-i386.json +++ b/packer_templates/oraclelinux/oracle-6.10-i386.json @@ -142,6 +142,7 @@ "scripts": [ "../centos/scripts/update.sh", "../centos/scripts/networking.sh", + "../_common/motd.sh", "../_common/sshd.sh", "../_common/vagrant.sh", "../_common/virtualbox.sh", diff --git a/packer_templates/oraclelinux/oracle-6.10-x86_64.json b/packer_templates/oraclelinux/oracle-6.10-x86_64.json index ad6f5dc2f..ae3350542 100644 --- a/packer_templates/oraclelinux/oracle-6.10-x86_64.json +++ b/packer_templates/oraclelinux/oracle-6.10-x86_64.json @@ -142,6 +142,7 @@ "scripts": [ "../centos/scripts/update.sh", "../centos/scripts/networking.sh", + "../_common/motd.sh", "../_common/sshd.sh", "../_common/vagrant.sh", "../_common/virtualbox.sh", diff --git a/packer_templates/oraclelinux/oracle-7.6-x86_64.json b/packer_templates/oraclelinux/oracle-7.6-x86_64.json index 7fac20a57..9cfa97bdb 100644 --- a/packer_templates/oraclelinux/oracle-7.6-x86_64.json +++ b/packer_templates/oraclelinux/oracle-7.6-x86_64.json @@ -142,6 +142,7 @@ "scripts": [ "../centos/scripts/update.sh", "../centos/scripts/networking.sh", + "../_common/motd.sh", "../_common/sshd.sh", "../_common/vagrant.sh", "../_common/virtualbox.sh", diff --git a/packer_templates/rhel/rhel-5.11-i386.json b/packer_templates/rhel/rhel-5.11-i386.json index 9312b1f98..6aec63dce 100644 --- a/packer_templates/rhel/rhel-5.11-i386.json +++ b/packer_templates/rhel/rhel-5.11-i386.json @@ -141,6 +141,7 @@ "expect_disconnect": true, "scripts": [ "../_common/vagrant.sh", + "../_common/motd.sh", "../_common/sshd.sh", "../_common/virtualbox.sh", "../_common/vmware.sh", diff --git a/packer_templates/rhel/rhel-5.11-x86_64.json b/packer_templates/rhel/rhel-5.11-x86_64.json index 3a2566267..f0abb7707 100644 --- a/packer_templates/rhel/rhel-5.11-x86_64.json +++ b/packer_templates/rhel/rhel-5.11-x86_64.json @@ -147,6 +147,7 @@ "expect_disconnect": true, "scripts": [ "../_common/vagrant.sh", + "../_common/motd.sh", "../_common/sshd.sh", "../_common/virtualbox.sh", "../_common/vmware.sh", diff --git a/packer_templates/rhel/rhel-6.10-i386.json b/packer_templates/rhel/rhel-6.10-i386.json index c88af7812..ff66d122f 100644 --- a/packer_templates/rhel/rhel-6.10-i386.json +++ b/packer_templates/rhel/rhel-6.10-i386.json @@ -141,6 +141,7 @@ "expect_disconnect": true, "scripts": [ "../centos/scripts/networking.sh", + "../_common/motd.sh", "../_common/sshd.sh", "../_common/vagrant.sh", "../_common/virtualbox.sh", diff --git a/packer_templates/rhel/rhel-6.10-x86_64.json b/packer_templates/rhel/rhel-6.10-x86_64.json index 86767a385..05ab1ddda 100644 --- a/packer_templates/rhel/rhel-6.10-x86_64.json +++ b/packer_templates/rhel/rhel-6.10-x86_64.json @@ -141,6 +141,7 @@ "expect_disconnect": true, "scripts": [ "../centos/scripts/networking.sh", + "../_common/motd.sh", "../_common/sshd.sh", "../_common/vagrant.sh", "../_common/virtualbox.sh", diff --git a/packer_templates/rhel/rhel-7.6-x86_64.json b/packer_templates/rhel/rhel-7.6-x86_64.json index e2f30702a..5bc0d98ca 100644 --- a/packer_templates/rhel/rhel-7.6-x86_64.json +++ b/packer_templates/rhel/rhel-7.6-x86_64.json @@ -141,6 +141,7 @@ "expect_disconnect": true, "scripts": [ "../centos/scripts/networking.sh", + "../_common/motd.sh", "../_common/sshd.sh", "../_common/vagrant.sh", "../_common/virtualbox.sh", diff --git a/packer_templates/scientificlinux/scientific-7.6-x86_64.json b/packer_templates/scientificlinux/scientific-7.6-x86_64.json index 3e463267f..f6a1f58aa 100644 --- a/packer_templates/scientificlinux/scientific-7.6-x86_64.json +++ b/packer_templates/scientificlinux/scientific-7.6-x86_64.json @@ -57,6 +57,7 @@ "expect_disconnect": true, "scripts": [ "../centos/scripts/update.sh", + "../_common/motd.sh", "../_common/sshd.sh", "../centos/scripts/networking.sh", "../_common/vagrant.sh", diff --git a/packer_templates/sles/sles-11-sp4-x86_64.json b/packer_templates/sles/sles-11-sp4-x86_64.json index 1ec37f788..ae093b44b 100644 --- a/packer_templates/sles/sles-11-sp4-x86_64.json +++ b/packer_templates/sles/sles-11-sp4-x86_64.json @@ -156,6 +156,7 @@ "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh '{{.Path}}'", "expect_disconnect": true, "scripts": [ + "../_common/motd.sh", "../_common/sshd.sh", "../_common/vagrant.sh", "../_common/virtualbox.sh", diff --git a/packer_templates/sles/sles-12-sp2-x86_64.json b/packer_templates/sles/sles-12-sp2-x86_64.json index 02cabc859..6cfd43bc7 100644 --- a/packer_templates/sles/sles-12-sp2-x86_64.json +++ b/packer_templates/sles/sles-12-sp2-x86_64.json @@ -156,6 +156,7 @@ "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh '{{.Path}}'", "expect_disconnect": true, "scripts": [ + "../_common/motd.sh", "../_common/sshd.sh", "../_common/vagrant.sh", "scripts/unsupported-modules.sh", diff --git a/packer_templates/sles/sles-12-sp3-x86_64.json b/packer_templates/sles/sles-12-sp3-x86_64.json index 9f2977d61..cd187c60d 100644 --- a/packer_templates/sles/sles-12-sp3-x86_64.json +++ b/packer_templates/sles/sles-12-sp3-x86_64.json @@ -156,6 +156,7 @@ "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh '{{.Path}}'", "expect_disconnect": true, "scripts": [ + "../_common/motd.sh", "../_common/sshd.sh", "../_common/vagrant.sh", "scripts/unsupported-modules.sh", diff --git a/packer_templates/sles/sles-15.json b/packer_templates/sles/sles-15.json index 70f489aa8..588534876 100644 --- a/packer_templates/sles/sles-15.json +++ b/packer_templates/sles/sles-15.json @@ -170,6 +170,7 @@ "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh '{{.Path}}'", "expect_disconnect": true, "scripts": [ + "../_common/motd.sh", "../_common/sshd.sh", "../_common/vagrant.sh", "scripts/unsupported-modules.sh", diff --git a/packer_templates/ubuntu/ubuntu-16.04-amd64.json b/packer_templates/ubuntu/ubuntu-16.04-amd64.json index c061fec04..dc7542d50 100644 --- a/packer_templates/ubuntu/ubuntu-16.04-amd64.json +++ b/packer_templates/ubuntu/ubuntu-16.04-amd64.json @@ -279,6 +279,7 @@ "expect_disconnect": true, "scripts": [ "scripts/update.sh", + "../_common/motd.sh", "../_common/sshd.sh", "scripts/networking.sh", "scripts/sudoers.sh", diff --git a/packer_templates/ubuntu/ubuntu-16.04-i386.json b/packer_templates/ubuntu/ubuntu-16.04-i386.json index 550d28b6e..311c3a3d2 100644 --- a/packer_templates/ubuntu/ubuntu-16.04-i386.json +++ b/packer_templates/ubuntu/ubuntu-16.04-i386.json @@ -243,6 +243,7 @@ "expect_disconnect": true, "scripts": [ "scripts/update.sh", + "../_common/motd.sh", "../_common/sshd.sh", "scripts/networking.sh", "scripts/sudoers.sh", diff --git a/packer_templates/ubuntu/ubuntu-18.04-amd64.json b/packer_templates/ubuntu/ubuntu-18.04-amd64.json index 9f8a3fd48..b67a9b3f7 100644 --- a/packer_templates/ubuntu/ubuntu-18.04-amd64.json +++ b/packer_templates/ubuntu/ubuntu-18.04-amd64.json @@ -275,6 +275,7 @@ "expect_disconnect": true, "scripts": [ "scripts/update.sh", + "../_common/motd.sh", "../_common/sshd.sh", "scripts/networking.sh", "scripts/sudoers.sh", diff --git a/packer_templates/ubuntu/ubuntu-18.10-amd64.json b/packer_templates/ubuntu/ubuntu-18.10-amd64.json index 96677156e..f0ae972f3 100644 --- a/packer_templates/ubuntu/ubuntu-18.10-amd64.json +++ b/packer_templates/ubuntu/ubuntu-18.10-amd64.json @@ -275,6 +275,7 @@ "expect_disconnect": true, "scripts": [ "scripts/update.sh", + "../_common/motd.sh", "../_common/sshd.sh", "scripts/networking.sh", "scripts/sudoers.sh", diff --git a/packer_templates/ubuntu/ubuntu-19.04-amd64.json b/packer_templates/ubuntu/ubuntu-19.04-amd64.json index dcca08656..47819d2ef 100644 --- a/packer_templates/ubuntu/ubuntu-19.04-amd64.json +++ b/packer_templates/ubuntu/ubuntu-19.04-amd64.json @@ -275,6 +275,7 @@ "expect_disconnect": true, "scripts": [ "scripts/update.sh", + "../_common/motd.sh", "../_common/sshd.sh", "scripts/networking.sh", "scripts/sudoers.sh", From 43bbc94ee3ab55edfcd59948273f15cb3fd3b886 Mon Sep 17 00:00:00 2001 From: Seth Thomas <seth.g.thomas@gmail.com> Date: Wed, 17 Jul 2019 18:47:13 -0600 Subject: [PATCH 0988/1622] Update requirements for Parallels builds --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 7ea979821..6216bd8f6 100644 --- a/README.md +++ b/README.md @@ -29,7 +29,7 @@ end - [VirtualBox](https://www.virtualbox.org) - [VMware Fusion](https://www.vmware.com/products/fusion.html) - [VMware Workstation](https://www.vmware.com/products/workstation.html) - - [Parallels Desktop](http://www.parallels.com/products/desktop) + - [Parallels Desktop](http://www.parallels.com/products/desktop) also requires [Parallels Virtualization SDK](https://www.parallels.com/products/desktop/download/) - [KVM](https://www.linux-kvm.org/page/Main_Page) * - [Hyper-V](https://technet.microsoft.com/en-us/library/hh831531(v=ws.11).aspx) * From 7263343bbbe5e705aef1f68271da2a2c4308681b Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Thu, 18 Jul 2019 12:43:16 -0700 Subject: [PATCH 0989/1622] Wire up Expeditor to handle PR testing with Buildkite This has to get merged before we can actually drop the real tests Signed-off-by: Tim Smith <tsmith@chef.io> --- .expeditor/config.yml | 8 +++++++- .expeditor/verify.pipeline.yml | 0 2 files changed, 7 insertions(+), 1 deletion(-) create mode 100644 .expeditor/verify.pipeline.yml diff --git a/.expeditor/config.yml b/.expeditor/config.yml index 851574196..60ee8e3b7 100644 --- a/.expeditor/config.yml +++ b/.expeditor/config.yml @@ -1,9 +1,15 @@ # Documentation available at https://expeditor.chef.io/docs/getting-started/ --- + # Slack channel in Chef Software slack to send notifications about build failures, etc slack: - notify_channel: chef-notify + notify_channel: chef-found-notify github: # This deletes the GitHub PR branch after successfully merged into the release branch delete_branch_on_merge: true + +pipelines: + - verify: + description: Pull Request validation tests + public: true diff --git a/.expeditor/verify.pipeline.yml b/.expeditor/verify.pipeline.yml new file mode 100644 index 000000000..e69de29bb From e052c90d068339d27371499c8fa962bed981783b Mon Sep 17 00:00:00 2001 From: Joe Ferguson <joe@joeferguson.me> Date: Mon, 22 Jul 2019 20:04:02 -0500 Subject: [PATCH 0990/1622] Ubuntu - Install ifup/ifdown utilities for private networks Signed-off-by: Joe Ferguson <joe@joeferguson.me> --- packer_templates/ubuntu/http/preseed-hyperv.cfg | 2 +- packer_templates/ubuntu/http/preseed.cfg | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packer_templates/ubuntu/http/preseed-hyperv.cfg b/packer_templates/ubuntu/http/preseed-hyperv.cfg index 7f554b86c..fafaccf2a 100755 --- a/packer_templates/ubuntu/http/preseed-hyperv.cfg +++ b/packer_templates/ubuntu/http/preseed-hyperv.cfg @@ -28,7 +28,7 @@ d-i passwd/user-uid string 1000 d-i passwd/user-password password vagrant d-i passwd/user-password-again password vagrant d-i passwd/username string vagrant -d-i pkgsel/include string openssh-server ntp linux-tools-$(uname -r) linux-cloud-tools-$(uname -r) linux-cloud-tools-common cifs-utils software-properties-common +d-i pkgsel/include string openssh-server ntp linux-tools-$(uname -r) linux-cloud-tools-$(uname -r) linux-cloud-tools-common cifs-utils software-properties-common ifupdown d-i pkgsel/install-language-support boolean false d-i pkgsel/update-policy select none d-i pkgsel/upgrade select full-upgrade diff --git a/packer_templates/ubuntu/http/preseed.cfg b/packer_templates/ubuntu/http/preseed.cfg index e215e37bd..5287ae089 100644 --- a/packer_templates/ubuntu/http/preseed.cfg +++ b/packer_templates/ubuntu/http/preseed.cfg @@ -25,7 +25,7 @@ d-i passwd/user-uid string 1000 d-i passwd/user-password password vagrant d-i passwd/user-password-again password vagrant d-i passwd/username string vagrant -d-i pkgsel/include string openssh-server cryptsetup build-essential libssl-dev libreadline-dev zlib1g-dev linux-source dkms nfs-common linux-headers-$(uname -r) perl cifs-utils software-properties-common rsync +d-i pkgsel/include string openssh-server cryptsetup build-essential libssl-dev libreadline-dev zlib1g-dev linux-source dkms nfs-common linux-headers-$(uname -r) perl cifs-utils software-properties-common rsync ifupdown d-i pkgsel/install-language-support boolean false d-i pkgsel/update-policy select none d-i pkgsel/upgrade select full-upgrade From a394b41f597d42e122ed2688addfb7852122a7e4 Mon Sep 17 00:00:00 2001 From: Joe Ferguson <joe@joeferguson.me> Date: Mon, 22 Jul 2019 20:53:12 -0500 Subject: [PATCH 0991/1622] Update Hyper-V Variables to new conventions Signed-off-by: Joe Ferguson <joe@joeferguson.me> --- packer_templates/centos/centos-5.11-i386.json | 4 ++-- .../centos/centos-5.11-x86_64.json | 4 ++-- packer_templates/centos/centos-6.10-i386.json | 4 ++-- .../centos/centos-6.10-x86_64.json | 4 ++-- .../centos/centos-7.6-x86_64.json | 4 ++-- .../ubuntu/ubuntu-16.04-amd64.json | 20 +++++++++---------- .../ubuntu/ubuntu-18.04-amd64.json | 20 +++++++++---------- .../ubuntu/ubuntu-18.10-amd64.json | 20 +++++++++---------- .../ubuntu/ubuntu-19.04-amd64.json | 20 +++++++++---------- 9 files changed, 50 insertions(+), 50 deletions(-) diff --git a/packer_templates/centos/centos-5.11-i386.json b/packer_templates/centos/centos-5.11-i386.json index 88be60302..b314d2d03 100644 --- a/packer_templates/centos/centos-5.11-i386.json +++ b/packer_templates/centos/centos-5.11-i386.json @@ -107,7 +107,7 @@ "<wait5><tab> text ks=hd:fd0:/ks.cfg<enter><wait5><esc>" ], "boot_wait": "10s", - "cpu": "{{ user `cpus` }}", + "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "floppy_files": [ "../centos/http/{{user `ks_path`}}" @@ -118,8 +118,8 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "memory": "{{ user `memory` }}", "output_directory": "../../builds/packer-{{user `template`}}-hyperv", - "ram_size": "{{ user `memory` }}", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, diff --git a/packer_templates/centos/centos-5.11-x86_64.json b/packer_templates/centos/centos-5.11-x86_64.json index 46951f490..a0e99e577 100644 --- a/packer_templates/centos/centos-5.11-x86_64.json +++ b/packer_templates/centos/centos-5.11-x86_64.json @@ -107,7 +107,7 @@ "<wait5><tab> text ks=hd:fd0:/ks.cfg<enter><wait5><esc>" ], "boot_wait": "10s", - "cpu": "{{ user `cpus` }}", + "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "floppy_files": [ "../centos/http/{{user `ks_path`}}" @@ -118,8 +118,8 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "memory": "{{ user `memory` }}", "output_directory": "../../builds/packer-{{user `template`}}-hyperv", - "ram_size": "{{ user `memory` }}", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, diff --git a/packer_templates/centos/centos-6.10-i386.json b/packer_templates/centos/centos-6.10-i386.json index e7b3d7408..2e0ccfed0 100644 --- a/packer_templates/centos/centos-6.10-i386.json +++ b/packer_templates/centos/centos-6.10-i386.json @@ -107,7 +107,7 @@ "<wait5><tab> text ks=hd:fd0:/ks.cfg<enter><wait5><esc>" ], "boot_wait": "10s", - "cpu": "{{ user `cpus` }}", + "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "floppy_files": [ "../centos/http/{{user `ks_path`}}" @@ -118,8 +118,8 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "memory": "{{ user `memory` }}", "output_directory": "../../builds/packer-{{user `template`}}-hyperv", - "ram_size": "{{ user `memory` }}", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, diff --git a/packer_templates/centos/centos-6.10-x86_64.json b/packer_templates/centos/centos-6.10-x86_64.json index da7adcb07..9d7676dc1 100644 --- a/packer_templates/centos/centos-6.10-x86_64.json +++ b/packer_templates/centos/centos-6.10-x86_64.json @@ -107,7 +107,7 @@ "<wait5><tab> text ks=hd:fd0:/ks.cfg<enter><wait5><esc>" ], "boot_wait": "10s", - "cpu": "{{ user `cpus` }}", + "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "floppy_files": [ "../centos/http/{{user `ks_path`}}" @@ -118,8 +118,8 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "memory": "{{ user `memory` }}", "output_directory": "../../builds/packer-{{user `template`}}-hyperv", - "ram_size": "{{ user `memory` }}", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, diff --git a/packer_templates/centos/centos-7.6-x86_64.json b/packer_templates/centos/centos-7.6-x86_64.json index a9882390c..a13d8fdfd 100644 --- a/packer_templates/centos/centos-7.6-x86_64.json +++ b/packer_templates/centos/centos-7.6-x86_64.json @@ -107,7 +107,7 @@ "<wait5><tab> text ks=hd:fd0:/ks.cfg<enter><wait5><esc>" ], "boot_wait": "10s", - "cpu": "{{ user `cpus` }}", + "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "floppy_files": [ "http/7/ks.cfg" @@ -118,8 +118,8 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "memory": "{{ user `memory` }}", "output_directory": "../../builds/packer-{{user `template`}}-hyperv", - "ram_size": "{{ user `memory` }}", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, diff --git a/packer_templates/ubuntu/ubuntu-16.04-amd64.json b/packer_templates/ubuntu/ubuntu-16.04-amd64.json index dc7542d50..a63113c26 100644 --- a/packer_templates/ubuntu/ubuntu-16.04-amd64.json +++ b/packer_templates/ubuntu/ubuntu-16.04-amd64.json @@ -207,13 +207,6 @@ "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", "output_directory": "../../builds/packer-{{user `template`}}-qemu", - "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "qemu", - "vm_name": "{{ user `template` }}", "qemuargs": [ [ "-m", @@ -223,7 +216,14 @@ "-smp", "{{ user `cpus` }}" ] - ] + ], + "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "qemu", + "vm_name": "{{ user `template` }}" }, { "boot_command": [ @@ -241,7 +241,7 @@ ], "boot_wait": "10s", "communicator": "ssh", - "cpu": "{{ user `cpus` }}", + "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "enable_secure_boot": false, "generation": "{{user `hyperv_generation`}}", @@ -249,8 +249,8 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "memory": "{{user `memory`}}", "output_directory": "../../builds/packer-{{user `template`}}-hyperv", - "ram_size": "{{user `memory`}}", "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", "ssh_password": "vagrant", "ssh_port": 22, diff --git a/packer_templates/ubuntu/ubuntu-18.04-amd64.json b/packer_templates/ubuntu/ubuntu-18.04-amd64.json index b67a9b3f7..b6e8e4fda 100644 --- a/packer_templates/ubuntu/ubuntu-18.04-amd64.json +++ b/packer_templates/ubuntu/ubuntu-18.04-amd64.json @@ -203,13 +203,6 @@ "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", "output_directory": "../../builds/packer-{{user `template`}}-qemu", - "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "qemu", - "vm_name": "{{ user `template` }}", "qemuargs": [ [ "-m", @@ -219,7 +212,14 @@ "-smp", "{{ user `cpus` }}" ] - ] + ], + "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "qemu", + "vm_name": "{{ user `template` }}" }, { "boot_command": [ @@ -237,7 +237,7 @@ ], "boot_wait": "10s", "communicator": "ssh", - "cpu": "{{ user `cpus` }}", + "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "enable_secure_boot": false, "generation": "{{user `hyperv_generation`}}", @@ -245,8 +245,8 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "memory": "{{user `memory`}}", "output_directory": "../../builds/packer-{{user `template`}}-hyperv", - "ram_size": "{{user `memory`}}", "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", "ssh_password": "vagrant", "ssh_port": 22, diff --git a/packer_templates/ubuntu/ubuntu-18.10-amd64.json b/packer_templates/ubuntu/ubuntu-18.10-amd64.json index f0ae972f3..ebb41eb48 100644 --- a/packer_templates/ubuntu/ubuntu-18.10-amd64.json +++ b/packer_templates/ubuntu/ubuntu-18.10-amd64.json @@ -203,13 +203,6 @@ "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", "output_directory": "../../builds/packer-{{user `template`}}-qemu", - "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "qemu", - "vm_name": "{{ user `template` }}", "qemuargs": [ [ "-m", @@ -219,7 +212,14 @@ "-smp", "{{ user `cpus` }}" ] - ] + ], + "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "qemu", + "vm_name": "{{ user `template` }}" }, { "boot_command": [ @@ -237,7 +237,7 @@ ], "boot_wait": "10s", "communicator": "ssh", - "cpu": "{{ user `cpus` }}", + "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "enable_secure_boot": false, "generation": "{{user `hyperv_generation`}}", @@ -245,8 +245,8 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "memory": "{{user `memory`}}", "output_directory": "../../builds/packer-{{user `template`}}-hyperv", - "ram_size": "{{user `memory`}}", "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", "ssh_password": "vagrant", "ssh_port": 22, diff --git a/packer_templates/ubuntu/ubuntu-19.04-amd64.json b/packer_templates/ubuntu/ubuntu-19.04-amd64.json index 47819d2ef..9ed1787f5 100644 --- a/packer_templates/ubuntu/ubuntu-19.04-amd64.json +++ b/packer_templates/ubuntu/ubuntu-19.04-amd64.json @@ -203,13 +203,6 @@ "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", "output_directory": "../../builds/packer-{{user `template`}}-qemu", - "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "qemu", - "vm_name": "{{ user `template` }}", "qemuargs": [ [ "-m", @@ -219,7 +212,14 @@ "-smp", "{{ user `cpus` }}" ] - ] + ], + "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "qemu", + "vm_name": "{{ user `template` }}" }, { "boot_command": [ @@ -237,7 +237,7 @@ ], "boot_wait": "10s", "communicator": "ssh", - "cpu": "{{ user `cpus` }}", + "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "enable_secure_boot": false, "generation": "{{user `hyperv_generation`}}", @@ -245,8 +245,8 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "memory": "{{user `memory`}}", "output_directory": "../../builds/packer-{{user `template`}}-hyperv", - "ram_size": "{{user `memory`}}", "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", "ssh_password": "vagrant", "ssh_port": 22, From 9f052c1e1921c22c487e4621344c36b7d050caca Mon Sep 17 00:00:00 2001 From: Joe Ferguson <joe@joeferguson.me> Date: Mon, 22 Jul 2019 21:20:48 -0500 Subject: [PATCH 0992/1622] Disable Windows Defender Signed-off-by: Joe Ferguson <joe@joeferguson.me> --- packer_templates/windows/cookbooks/packer/kitchen.yml | 1 + .../cookbooks/packer/recipes/disable_windows_defender.rb | 3 +++ 2 files changed, 4 insertions(+) create mode 100644 packer_templates/windows/cookbooks/packer/recipes/disable_windows_defender.rb diff --git a/packer_templates/windows/cookbooks/packer/kitchen.yml b/packer_templates/windows/cookbooks/packer/kitchen.yml index ce2d1f69d..e1933c582 100644 --- a/packer_templates/windows/cookbooks/packer/kitchen.yml +++ b/packer_templates/windows/cookbooks/packer/kitchen.yml @@ -27,6 +27,7 @@ suites: - name: default run_list: - recipe[packer::disable_uac] + - recipe[packer::disable_windows_defender] - recipe[packer::disable_windows_update] - recipe[packer::disable_restore] - recipe[packer::disable_hibernation] diff --git a/packer_templates/windows/cookbooks/packer/recipes/disable_windows_defender.rb b/packer_templates/windows/cookbooks/packer/recipes/disable_windows_defender.rb new file mode 100644 index 000000000..615737a5a --- /dev/null +++ b/packer_templates/windows/cookbooks/packer/recipes/disable_windows_defender.rb @@ -0,0 +1,3 @@ +powershell_script 'disable-windows-defender' do + code 'Set-MpPreference -DisableRealtimeMonitoring $false' +end From ba1f6df883910297193ea9df4a985476c93fbd6f Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Mon, 22 Jul 2019 19:16:20 -0700 Subject: [PATCH 0993/1622] Remove the duplicate GitHub PR templates This comes from our org so no need to do it here. Signed-off-by: Tim Smith <tsmith@chef.io> --- .github/ISSUE_TEMPLATE/SUPPORT_QUESTION.md | 1 - .github/PULL_REQUEST_TEMPLATE.md | 8 -------- 2 files changed, 9 deletions(-) delete mode 100644 .github/PULL_REQUEST_TEMPLATE.md diff --git a/.github/ISSUE_TEMPLATE/SUPPORT_QUESTION.md b/.github/ISSUE_TEMPLATE/SUPPORT_QUESTION.md index 68c566479..921a5f0bb 100644 --- a/.github/ISSUE_TEMPLATE/SUPPORT_QUESTION.md +++ b/.github/ISSUE_TEMPLATE/SUPPORT_QUESTION.md @@ -8,5 +8,4 @@ We use GitHub issues to track bugs and feature requests. If you need help please * Chef Community Slack at http://community-slack.chef.io/. * Chef Mailing List https://discourse.chef.io/ - Support issues opened here will be closed and redirected to Slack or Discourse. diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md deleted file mode 100644 index f9c16c0d3..000000000 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ /dev/null @@ -1,8 +0,0 @@ -### Description - -[Please describe what this change achieves] - -### Issues Resolved - -[List any existing issues this PR resolves, or any Discourse or -StackOverflow discussions that are relevant] From c2c87e7e994d2b9f5f50cb897d6cbfd8789a4574 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Mon, 22 Jul 2019 19:19:01 -0700 Subject: [PATCH 0994/1622] Swap the travis config for Buildkite Let's see if this works. Signed-off-by: Tim Smith <tsmith@chef.io> --- .expeditor/verify.pipeline.yml | 12 ++++++++++++ .travis.yml | 24 ------------------------ 2 files changed, 12 insertions(+), 24 deletions(-) delete mode 100644 .travis.yml diff --git a/.expeditor/verify.pipeline.yml b/.expeditor/verify.pipeline.yml index e69de29bb..dcdad408a 100644 --- a/.expeditor/verify.pipeline.yml +++ b/.expeditor/verify.pipeline.yml @@ -0,0 +1,12 @@ +steps: + +- label: run-packer-validate + command: + - bundle install + - wget https://releases.hashicorp.com/packer/1.4.2/packer_1.4.2_linux_amd64.zip + - unzip -d /usr/local/bin packer_1.4.2_linux_amd64.zip + - rake validate + expeditor: + executor: + docker: + image: ruby:2.6-stretch diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index b75f4c98c..000000000 --- a/.travis.yml +++ /dev/null @@ -1,24 +0,0 @@ -dist: xenial -language: ruby -cache: bundler - -env: - global: - - PACKER_VERSION="1.4.1" - - PATH=$HOME/bin:$PATH - -rvm: - - 2.6.1 - -branches: - only: - - master - -before_install: - - wget https://releases.hashicorp.com/packer/${PACKER_VERSION}/packer_${PACKER_VERSION}_linux_amd64.zip - - unzip -d ~/bin packer_${PACKER_VERSION}_linux_amd64.zip - -before_script: - - packer --version - -script: rake validate From 6d7985a6088d5c1ec5debd1f35bc0b6686d41bc0 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Mon, 22 Jul 2019 20:02:42 -0700 Subject: [PATCH 0995/1622] Don't bail on bento-ya in the rakefile We don't use this gem anymore Signed-off-by: Tim Smith <tsmith@chef.io> --- Rakefile | 8 -------- 1 file changed, 8 deletions(-) diff --git a/Rakefile b/Rakefile index 435632a8f..ac3a8b92c 100644 --- a/Rakefile +++ b/Rakefile @@ -1,14 +1,6 @@ require "yaml" require "fileutils" -# we load the bento gem here just so we can make sure it was installed -begin - require "bento" -rescue LoadError - puts "bento-ya gem does't appear to be installed. Either install the gem or bundle install first." - exit! -end - desc "Validate all templates using Packer" task :validate do Dir.glob("**/*.json").each do |template_path| From 141cc9aa6f7bfee5daa79139a79cc080f48b7c7a Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Mon, 22 Jul 2019 20:15:37 -0700 Subject: [PATCH 0996/1622] Don't try to validate the amazon linux config Signed-off-by: Tim Smith <tsmith@chef.io> --- Rakefile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Rakefile b/Rakefile index ac3a8b92c..4b9111b01 100644 --- a/Rakefile +++ b/Rakefile @@ -3,10 +3,13 @@ require "fileutils" desc "Validate all templates using Packer" task :validate do - Dir.glob("**/*.json").each do |template_path| + Dir.glob("**/*.json").sort.each do |template_path| template_dir = File.dirname(template_path) filename = File.basename(template_path) + # we can't validatem the amazon config with the ovf file + next if filename == "amazon-2-x86_64.json" + puts "\n\e[32mValidating #{template_path}\e[0m\n\n" result = system("packer validate #{filename}", chdir: template_dir) raise "Validation for #{template_path} failed" unless result From 9d8c15744ff82a24134e034fd8393d03eb25e428 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Mon, 22 Jul 2019 20:20:48 -0700 Subject: [PATCH 0997/1622] Add the BK badge to the readme + update authors Sort the list and add myself Signed-off-by: Tim Smith <tsmith@chef.io> --- README.md | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/README.md b/README.md index 6216bd8f6..a0b41bd98 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # Bento -[![Build Status](http://img.shields.io/travis/chef/bento.svg)][travis] +[![Build status](https://badge.buildkite.com/2d56b8ca08562a7d17fd25920a2e02079c5e6f28cbc6d426ee.svg?branch=master)](https://buildkite.com/chef-oss/chef-bento-master-verify) Bento is a project that encapsulates [Packer](https://www.packer.io/) templates for building [Vagrant](https://www.vagrantup.com/) base boxes. A subset of templates are built and published to the [bento org](https://app.vagrantup.com/bento) on Vagrant Cloud. These published boxes serve as the default boxes for [kitchen-vagrant](https://github.com/test-kitchen/kitchen-vagrant/). @@ -104,20 +104,21 @@ Please use GitHub issues to report bugs, features, or other problems. These basebox templates were converted from [veewee](https://github.com/jedi4ever/veewee) definitions originally based on [work done by Tim Dysinger](https://github.com/dysinger/basebox) to make "Don't Repeat Yourself" (DRY) modular baseboxes. Thanks Tim! -Mac OS X templates were adopted wholesale from [Fletcher Nichol's packer templates](https://github.com/fnichol/packer-templates). +macOS templates were adopted wholesale from [Fletcher Nichol's packer templates](https://github.com/fnichol/packer-templates). +- Author: Chris McClimans ([chris@hippiehacker.org](mailto:chris@hippiehacker.org)) +- Author: Fletcher Nichol ([fnichol@nichol.ca](mailto:fnichol@nichol.ca)) +- Author: Joshua Timberman ([joshua@chef.io](mailto:joshua@chef.io)) +- Author: Julian Dunn ([jdunn@chef.io](mailto:jdunn@chef.io)) +- Author: Ross Timson ([ross@rosstimson.com](mailto:ross@rosstimson.com)) - Author: Seth Chisamore ([schisamo@chef.io](mailto:schisamo@chef.io)) - Author: Stephen Delano ([stephen@chef.io](mailto:stephen@chef.io)) -- Author: Joshua Timberman ([joshua@chef.io](mailto:joshua@chef.io)) - Author: Tim Dysinger ([tim@dysinger.net](mailto:tim@dysinger.net)) -- Author: Chris McClimans ([chris@hippiehacker.org](mailto:chris@hippiehacker.org)) -- Author: Julian Dunn ([jdunn@chef.io](mailto:jdunn@chef.io)) +- Author: Tim Smith ([tsmith@chef.io](mailto:tsmith@chef.io)) - Author: Tom Duffield ([tom@chef.io](mailto:tom@chef.io)) -- Author: Ross Timson ([ross@rosstimson.com](mailto:ross@rosstimson.com)) -- Author: Fletcher Nichol ([fnichol@nichol.ca](mailto:fnichol@nichol.ca)) ```text -Copyright 2012-2017, Chef Software, Inc. (<legal@chef.io>) +Copyright 2012-2019, Chef Software, Inc. (<legal@chef.io>) Copyright 2011-2012, Tim Dysinger (<tim@dysinger.net>) Licensed under the Apache License, Version 2.0 (the "License"); @@ -132,6 +133,3 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ``` - -[travis]: https://travis-ci.org/chef/bento - From f9c6f1343d09292545021bff10b1211b60e405c7 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Tue, 23 Jul 2019 09:46:37 -0700 Subject: [PATCH 0998/1622] Update the windows cookbook to use archive_file in Chef 15+ We don't need to ship around the legacy windows_zipfile resource and the windows cookbook helper now that file archive functionality is fully baked into Chef. Just use that. Signed-off-by: Tim Smith <tsmith@chef.io> --- .../packer/libraries/windows_helper.rb | 166 ------------------ .../windows/cookbooks/packer/metadata.rb | 2 +- .../cookbooks/packer/recipes/defrag.rb | 10 +- .../cookbooks/packer/resources/zipfile.rb | 127 -------------- 4 files changed, 6 insertions(+), 299 deletions(-) delete mode 100644 packer_templates/windows/cookbooks/packer/libraries/windows_helper.rb delete mode 100644 packer_templates/windows/cookbooks/packer/resources/zipfile.rb diff --git a/packer_templates/windows/cookbooks/packer/libraries/windows_helper.rb b/packer_templates/windows/cookbooks/packer/libraries/windows_helper.rb deleted file mode 100644 index f305950b2..000000000 --- a/packer_templates/windows/cookbooks/packer/libraries/windows_helper.rb +++ /dev/null @@ -1,166 +0,0 @@ -# -# Author:: Seth Chisamore (<schisamo@chef.io>) -# Cookbook:: windows -# Library:: windows_helper -# -# Copyright:: 2011-2018, Chef Software, Inc. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -require 'uri' -require 'Win32API' if Chef::Platform.windows? -require 'chef/exceptions' -require 'openssl' -require 'chef/mixin/powershell_out' - -module Windows - module Helper - AUTO_RUN_KEY = 'HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Run'.freeze unless defined?(AUTO_RUN_KEY) - ENV_KEY = 'HKLM\SYSTEM\CurrentControlSet\Control\Session Manager\Environment'.freeze unless defined?(ENV_KEY) - ExpandEnvironmentStrings = Win32API.new('kernel32', 'ExpandEnvironmentStrings', %w(P P L), 'L') if Chef::Platform.windows? && !defined?(ExpandEnvironmentStrings) - - # returns windows friendly version of the provided path, - # ensures backslashes are used everywhere - def win_friendly_path(path) - path.gsub(::File::SEPARATOR, ::File::ALT_SEPARATOR || '\\') if path - end - - # account for Window's wacky File System Redirector - # http://msdn.microsoft.com/en-us/library/aa384187(v=vs.85).aspx - # especially important for 32-bit processes (like Ruby) on a - # 64-bit instance of Windows. - def locate_sysnative_cmd(cmd) - if ::File.exist?("#{ENV['WINDIR']}\\sysnative\\#{cmd}") - "#{ENV['WINDIR']}\\sysnative\\#{cmd}" - elsif ::File.exist?("#{ENV['WINDIR']}\\system32\\#{cmd}") - "#{ENV['WINDIR']}\\system32\\#{cmd}" - else - cmd - end - end - - # singleton instance of the Windows Version checker - def win_version - @win_version ||= Windows::Version.new - end - - # Helper function to properly parse a URI - def as_uri(source) - URI.parse(source) - rescue URI::InvalidURIError - Chef::Log.warn("#{source} was an invalid URI. Trying to escape invalid characters") - URI.parse(URI.escape(source)) - end - - # if a file is local it returns a windows friendly path version - # if a file is remote it caches it locally - def cached_file(source, checksum = nil, windows_path = true) - @installer_file_path ||= begin - - if source =~ %r{^(file|ftp|http|https):\/\/} - uri = as_uri(source) - cache_file_path = "#{Chef::Config[:file_cache_path]}/#{::File.basename(::URI.unescape(uri.path))}" - Chef::Log.debug("Caching a copy of file #{source} at #{cache_file_path}") - remote_file cache_file_path do - source source - backup false - checksum checksum unless checksum.nil? - end.run_action(:create) - else - cache_file_path = source - end - - windows_path ? win_friendly_path(cache_file_path) : cache_file_path - end - end - - # Expands the environment variables - def expand_env_vars(path) - # We pick 32k because that is the largest it could be: - # http://msdn.microsoft.com/en-us/library/windows/desktop/ms724265%28v=vs.85%29.aspx - buf = 0.chr * 32 * 1024 # 32k - if ExpandEnvironmentStrings.call(path.dup, buf, buf.length) == 0 - raise Chef::Exceptions::Win32APIError, 'Failed calling ExpandEnvironmentStrings (received 0)' - end - buf.strip - end - - def is_package_installed?(package_name) # rubocop:disable Naming/PredicateName - installed_packages.include?(package_name) - end - - def installed_packages - @installed_packages || begin - installed_packages = {} - # Computer\HKEY_LOCAL_MACHINE\Software\Microsoft\Windows\CurrentVersion\Uninstall - installed_packages.merge!(extract_installed_packages_from_key(::Win32::Registry::HKEY_LOCAL_MACHINE)) # rescue nil - # 64-bit registry view - # Computer\HKEY_LOCAL_MACHINE\Software\Wow6464Node\Microsoft\Windows\CurrentVersion\Uninstall - installed_packages.merge!(extract_installed_packages_from_key(::Win32::Registry::HKEY_LOCAL_MACHINE, (::Win32::Registry::Constants::KEY_READ | 0x0100))) # rescue nil - # 32-bit registry view - # Computer\HKEY_LOCAL_MACHINE\Software\Wow6432Node\Microsoft\Windows\CurrentVersion\Uninstall - installed_packages.merge!(extract_installed_packages_from_key(::Win32::Registry::HKEY_LOCAL_MACHINE, (::Win32::Registry::Constants::KEY_READ | 0x0200))) # rescue nil - # Computer\HKEY_CURRENT_USER\Software\Microsoft\Windows\CurrentVersion\Uninstall - installed_packages.merge!(extract_installed_packages_from_key(::Win32::Registry::HKEY_CURRENT_USER)) # rescue nil - installed_packages - end - end - - # Returns an array - def to_array(var) - var = var.is_a?(Array) ? var : [var] - var.reject(&:nil?) - end - - private - - def extract_installed_packages_from_key(hkey = ::Win32::Registry::HKEY_LOCAL_MACHINE, desired = ::Win32::Registry::Constants::KEY_READ) - uninstall_subkey = 'Software\Microsoft\Windows\CurrentVersion\Uninstall' - packages = {} - begin - ::Win32::Registry.open(hkey, uninstall_subkey, desired) do |reg| - reg.each_key do |key, _wtime| - begin - k = reg.open(key, desired) - display_name = begin - k['DisplayName'] - rescue - nil - end - version = begin - k['DisplayVersion'] - rescue - 'NO VERSION' - end - uninstall_string = begin - k['UninstallString'] - rescue - nil - end - if display_name - packages[display_name] = { name: display_name, - version: version, - uninstall_string: uninstall_string } - end - rescue ::Win32::Registry::Error - end - end - end - rescue ::Win32::Registry::Error - end - packages - end - end -end - -Chef::Recipe.send(:include, Windows::Helper) diff --git a/packer_templates/windows/cookbooks/packer/metadata.rb b/packer_templates/windows/cookbooks/packer/metadata.rb index 94b18bf0e..4bcc8d0e9 100644 --- a/packer_templates/windows/cookbooks/packer/metadata.rb +++ b/packer_templates/windows/cookbooks/packer/metadata.rb @@ -4,4 +4,4 @@ license 'Apache-2.0' description 'Resources run during packer builds' version '0.1.0' -chef_version '>= 14.0' +chef_version '>= 15.0' diff --git a/packer_templates/windows/cookbooks/packer/recipes/defrag.rb b/packer_templates/windows/cookbooks/packer/recipes/defrag.rb index 02ee4ba71..aff9ab268 100644 --- a/packer_templates/windows/cookbooks/packer/recipes/defrag.rb +++ b/packer_templates/windows/cookbooks/packer/recipes/defrag.rb @@ -3,14 +3,14 @@ action :create end -windows_zipfile 'Decompress ultradefrag' do - source ::File.join(Chef::Config[:file_cache_path], 'ultradefrag.zip') - path ::File.join(Chef::Config[:file_cache_path]) - action :unzip +archive_file 'Decompress ultradefrag' do + path ::File.join(Chef::Config[:file_cache_path], 'ultradefrag.zip') + destination ::File.join(Chef::Config[:file_cache_path], 'temp_defrag') + action :extract end execute 'Rename ultradefrag' do - command "move #{::File.join(Chef::Config[:file_cache_path])}\\ultradefrag-* #{::File.join(Chef::Config[:file_cache_path], 'ultradefrag')}" + command "move #{::File.join(Chef::Config[:file_cache_path])}\\temp_defrag\\ultradefrag-* #{::File.join(Chef::Config[:file_cache_path], 'ultradefrag')}" not_if { ::File.exist?(::File.join(Chef::Config[:file_cache_path], 'ultradefrag')) } end diff --git a/packer_templates/windows/cookbooks/packer/resources/zipfile.rb b/packer_templates/windows/cookbooks/packer/resources/zipfile.rb deleted file mode 100644 index be8d66939..000000000 --- a/packer_templates/windows/cookbooks/packer/resources/zipfile.rb +++ /dev/null @@ -1,127 +0,0 @@ -# -# Author:: Doug MacEachern (<dougm@vmware.com>) -# Author:: Seth Chisamore (<schisamo@chef.io>) -# Author:: Wade Peacock (<wade.peacock@visioncritical.com>) -# Cookbook:: windows -# Resource:: zipfile -# -# Copyright:: 2010-2017, VMware, Inc. -# Copyright:: 2011-2018, Chef Software, Inc. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -provides :windows_zipfile - -property :path, String, name_property: true -property :source, String -property :overwrite, [true, false], default: false -property :checksum, String - -action :unzip do - ensure_rubyzip_gem_installed - Chef::Log.debug("unzip #{new_resource.source} => #{new_resource.path} (overwrite=#{new_resource.overwrite})") - - cache_file_path = if new_resource.source =~ %r{^(file|ftp|http|https):\/\/} # http://rubular.com/r/DGoIWjLfGI - uri = as_uri(new_resource.source) - local_cache_path = "#{Chef::Config[:file_cache_path]}/#{::File.basename(::URI.unescape(uri.path))}" - Chef::Log.debug("Caching a copy of file #{new_resource.source} at #{cache_file_path}") - - remote_file local_cache_path do - source new_resource.source - backup false - checksum new_resource.checksum unless new_resource.checksum.nil? - end - - local_cache_path - else - new_resource.source - end - - cache_file_path = win_friendly_path(cache_file_path) - - converge_by("unzip #{new_resource.source}") do - ruby_block 'Unzipping' do - block do - Zip::File.open(cache_file_path) do |zip| - zip.each do |entry| - path = ::File.join(new_resource.path, entry.name) - FileUtils.mkdir_p(::File.dirname(path)) - if new_resource.overwrite && ::File.exist?(path) && !::File.directory?(path) - FileUtils.rm(path) - end - zip.extract(entry, path) unless ::File.exist?(path) - end - end - end - action :run - end - end -end - -action :zip do - ensure_rubyzip_gem_installed - # sanitize paths for windows. - new_resource.source.downcase.gsub!(::File::SEPARATOR, ::File::ALT_SEPARATOR) - new_resource.path.downcase.gsub!(::File::SEPARATOR, ::File::ALT_SEPARATOR) - Chef::Log.debug("zip #{new_resource.source} => #{new_resource.path} (overwrite=#{new_resource.overwrite})") - - if new_resource.overwrite == false && ::File.exist?(new_resource.path) - Chef::Log.info("file #{new_resource.path} already exists and overwrite is set to false, exiting") - else - # delete the archive if it already exists, because we are recreating it. - if ::File.exist?(new_resource.path) - converge_by("delete existing file at #{new_resource.path}") do - ::File.unlink(new_resource.path) - end - end - - # only supporting compression of a single directory (recursively). - if ::File.directory?(new_resource.source) - converge_by("zipping #{new_resource.source} to #{new_resource.path}") do - z = Zip::File.new(new_resource.path, true) - unless new_resource.source =~ /::File::ALT_SEPARATOR$/ - new_resource.source << ::File::ALT_SEPARATOR - end - Find.find(new_resource.source) do |f| - f.downcase.gsub!(::File::SEPARATOR, ::File::ALT_SEPARATOR) - # don't add root directory to the zipfile. - next if f == new_resource.source - # strip the root directory from the filename before adding it to the zipfile. - zip_fname = f.sub(new_resource.source, '') - Chef::Log.debug("adding #{zip_fname} to archive, sourcefile is: #{f}") - z.add(zip_fname, f) - end - z.close - end - else - Chef::Log.info("Single directory must be specified for compression, and #{new_resource.source} does not meet that criteria.") - end - end -end - -action_class do - include Windows::Helper - require 'find' - - def ensure_rubyzip_gem_installed - require 'zip' - rescue LoadError - Chef::Log.info("Missing gem 'rubyzip'...installing now.") - chef_gem 'rubyzip' do - action :install - compile_time true - end - require 'zip' - end -end From 9ff7baba8c5e341b5a9251d842e2d15c263ae262 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Tue, 23 Jul 2019 09:49:38 -0700 Subject: [PATCH 0999/1622] Cookstyle fixes Signed-off-by: Tim Smith <tsmith@chef.io> --- .../windows/cookbooks/packer/recipes/disable_hibernation.rb | 2 +- .../windows/cookbooks/packer/recipes/disable_windows_update.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packer_templates/windows/cookbooks/packer/recipes/disable_hibernation.rb b/packer_templates/windows/cookbooks/packer/recipes/disable_hibernation.rb index 64f099c4b..b34208074 100644 --- a/packer_templates/windows/cookbooks/packer/recipes/disable_hibernation.rb +++ b/packer_templates/windows/cookbooks/packer/recipes/disable_hibernation.rb @@ -3,4 +3,4 @@ { name: 'HibernateEnabled', type: :dword, data: 0 }, ] action :create -end \ No newline at end of file +end diff --git a/packer_templates/windows/cookbooks/packer/recipes/disable_windows_update.rb b/packer_templates/windows/cookbooks/packer/recipes/disable_windows_update.rb index 4d275e698..ac7848898 100644 --- a/packer_templates/windows/cookbooks/packer/recipes/disable_windows_update.rb +++ b/packer_templates/windows/cookbooks/packer/recipes/disable_windows_update.rb @@ -1,7 +1,7 @@ # don't waste CPU / network bandwidth checking for updates registry_key 'HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows\WindowsUpdate\AU' do values [{ name: 'AUOptions', type: :dword, data: 1 }, # disable keep my computer up to date - { name: 'NoAutoUpdate', type: :dword, data: 1 } # disable auto updates + { name: 'NoAutoUpdate', type: :dword, data: 1 }, # disable auto updates ] action :create recursive true From e3ec4290e921c0484fadfe2ec782a9fd7f9ee3d9 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Tue, 23 Jul 2019 09:51:53 -0700 Subject: [PATCH 1000/1622] Add cookstyle to the PR verification pipeline Signed-off-by: Tim Smith <tsmith@chef.io> --- .expeditor/verify.pipeline.yml | 9 +++++++++ Gemfile | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/.expeditor/verify.pipeline.yml b/.expeditor/verify.pipeline.yml index dcdad408a..dea83150a 100644 --- a/.expeditor/verify.pipeline.yml +++ b/.expeditor/verify.pipeline.yml @@ -10,3 +10,12 @@ steps: executor: docker: image: ruby:2.6-stretch + +- label: windows-build-cookbook-cookstyle + command: + - bundle install + - bundle exec cookstyle packer_templates/windows/cookbooks + expeditor: + executor: + docker: + image: ruby:2.6-stretch diff --git a/Gemfile b/Gemfile index 817c65b79..c5cec7e24 100644 --- a/Gemfile +++ b/Gemfile @@ -1,7 +1,7 @@ source "https://rubygems.org" group :development do - gem "chefstyle" + gem "cookstyle" gem "rake", ">= 12" gem "mixlib-shellout", ">= 2.3.2" gem "vagrant_cloud", "~> 2.0" From 486462fb72bacf28930a4e3eb2c71e400d252031 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Tue, 23 Jul 2019 11:08:13 -0700 Subject: [PATCH 1001/1622] Make all the windows builds headless by default Signed-off-by: Tim Smith <tsmith@chef.io> --- packer_templates/windows/windows-2012r2.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packer_templates/windows/windows-2012r2.json b/packer_templates/windows/windows-2012r2.json index cec4623a3..17ecd67bb 100644 --- a/packer_templates/windows/windows-2012r2.json +++ b/packer_templates/windows/windows-2012r2.json @@ -69,7 +69,7 @@ ], "variables": { "guest_additions_mode": "attach", - "headless": "false", + "headless": "true", "iso_checksum": "849734f37346385dac2c101e4aacba4626bb141c", "iso_url": "http://download.microsoft.com/download/6/2/A/62A76ABB-9990-4EFC-A4FE-C7D698DAEB96/9600.17050.WINBLUE_REFRESH.140317-1640_X64FRE_SERVER_EVAL_EN-US-IR3_SSS_X64FREE_EN-US_DV9.ISO", "template": "windows-2012r2-standard" From 8b4bf6c145891f2e8d769c5857339db584e3277f Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Tue, 23 Jul 2019 11:09:44 -0700 Subject: [PATCH 1002/1622] Restart after disabling UAC / WIndows updates on 2k12 Signed-off-by: Tim Smith <tsmith@chef.io> --- packer_templates/windows/windows-2012r2.json | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/packer_templates/windows/windows-2012r2.json b/packer_templates/windows/windows-2012r2.json index 17ecd67bb..4f69a5d1f 100644 --- a/packer_templates/windows/windows-2012r2.json +++ b/packer_templates/windows/windows-2012r2.json @@ -32,6 +32,16 @@ "packer::disable_uac", "packer::disable_restore", "packer::disable_windows_update", + ] + }, + { + "type": "windows-restart" + }, + { + "type": "chef-solo", + "cookbook_paths": ["cookbooks"], + "guest_os_type": "windows", + "run_list": [ "packer::vm_tools", "packer::features", "packer::enable_file_sharing", From 49a8a3e3cd66f57ccafaa439778cc99ad192b9d4 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Tue, 23 Jul 2019 11:10:09 -0700 Subject: [PATCH 1003/1622] Add a vmware-iso provisioner to Windows 2012r2 Why not Signed-off-by: Tim Smith <tsmith@chef.io> --- packer_templates/windows/windows-2012r2.json | 76 +++++++++++++------- 1 file changed, 51 insertions(+), 25 deletions(-) diff --git a/packer_templates/windows/windows-2012r2.json b/packer_templates/windows/windows-2012r2.json index 4f69a5d1f..7cbc24138 100644 --- a/packer_templates/windows/windows-2012r2.json +++ b/packer_templates/windows/windows-2012r2.json @@ -1,29 +1,54 @@ { "builders": [{ - "type": "virtualbox-iso", - "vboxmanage": [ - ["modifyvm", "{{.Name}}", "--memory", "4096"], - ["modifyvm", "{{.Name}}", "--vram", "48"], - ["modifyvm", "{{.Name}}", "--cpus", "2"] - ], - "guest_additions_mode": "{{ user `guest_additions_mode` }}", - "guest_additions_path": "C:/users/vagrant/VBoxGuestAdditions.iso", - "guest_os_type": "Windows2012_64", - "headless": "{{ user `headless` }}", - "iso_url": "{{ user `iso_url` }}", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "sha1", - "output_directory": "../../builds/packer-{{user `template`}}-virtualbox", - "communicator": "winrm", - "winrm_username": "vagrant", - "winrm_password": "vagrant", - "winrm_timeout": "12h", - "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"", - "shutdown_timeout": "15m", - "floppy_files": [ - "answer_files/2012_r2/Autounattend.xml" - ] - }], + "type": "virtualbox-iso", + "vboxmanage": [ + ["modifyvm", "{{.Name}}", "--memory", "4096"], + ["modifyvm", "{{.Name}}", "--vram", "48"], + ["modifyvm", "{{.Name}}", "--cpus", "2"] + ], + "guest_additions_mode": "{{ user `guest_additions_mode` }}", + "guest_additions_path": "C:/users/vagrant/VBoxGuestAdditions.iso", + "guest_os_type": "Windows2012_64", + "headless": "{{ user `headless` }}", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_checksum_type": "sha1", + "output_directory": "../../builds/packer-{{user `template`}}-virtualbox", + "communicator": "winrm", + "winrm_username": "vagrant", + "winrm_password": "vagrant", + "winrm_timeout": "12h", + "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"", + "shutdown_timeout": "15m", + "floppy_files": [ + "answer_files/2012_r2/Autounattend.xml" + ] + }, + { + "type": "vmware-iso", + "vmx_data": { + "memsize": "4096", + "numvcpus": "2", + "scsi0.virtualDev": "lsisas1068", + "scsi0.present": "TRUE" + }, + "guest_os_type": "windows9srv-64", + "headless": "{{ user `headless` }}", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_checksum_type": "sha1", + "output_directory": "../../builds/packer-{{user `template`}}-vmware", + "communicator": "winrm", + "winrm_username": "vagrant", + "winrm_password": "vagrant", + "winrm_timeout": "12h", + "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"", + "shutdown_timeout": "15m", + "floppy_files": [ + "answer_files/2012_r2/Autounattend.xml" + ] + } + ], "provisioners": [{ "type": "chef-solo", "cookbook_paths": ["cookbooks"], @@ -32,6 +57,7 @@ "packer::disable_uac", "packer::disable_restore", "packer::disable_windows_update", + "packer::remove_defender" ] }, { @@ -84,4 +110,4 @@ "iso_url": "http://download.microsoft.com/download/6/2/A/62A76ABB-9990-4EFC-A4FE-C7D698DAEB96/9600.17050.WINBLUE_REFRESH.140317-1640_X64FRE_SERVER_EVAL_EN-US-IR3_SSS_X64FREE_EN-US_DV9.ISO", "template": "windows-2012r2-standard" } -} +} \ No newline at end of file From 9a61fd39ffe5b4b94a675fcc4fc38eb94cbb4f0c Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Tue, 23 Jul 2019 17:38:11 -0700 Subject: [PATCH 1004/1622] Update Windows 10 to 1903 Let's get current Signed-off-by: Tim Smith <tsmith@chef.io> --- packer_templates/windows/windows-10.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packer_templates/windows/windows-10.json b/packer_templates/windows/windows-10.json index 1e05c43f0..8d2a788c2 100644 --- a/packer_templates/windows/windows-10.json +++ b/packer_templates/windows/windows-10.json @@ -111,8 +111,8 @@ "variables": { "guest_additions_mode": "attach", "headless": "true", - "iso_checksum": "164f022a22d2305e6fbd82f6e35d530b6bbadca8", - "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": "743fc483bb8bf1901c0534a0ae15208a5a72a3c5", + "iso_url": "https://software-download.microsoft.com/download/pr/18362.30.190401-1528.19h1_release_svc_refresh_CLIENTENTERPRISEEVAL_OEMRET_x64FRE_en-us.iso", "template": "windows-10" } } From 06b85517dfc7c3632e268f1cbbc098b66b535ef7 Mon Sep 17 00:00:00 2001 From: Mattias Giese <mattiasgiese@posteo.net> Date: Tue, 23 Jul 2019 19:44:16 -0500 Subject: [PATCH 1005/1622] Introduce SLES 15 SP1 - Initial commit of a config that builds SLES 15 SP1. - Reduce footprint of resulting image. - Add bzip2/tar packages in order to support the installation of VirtualBox Additions - Misc fixes in post scripts Signed-off-by: Mattias Giese <mattiasgiese@posteo.net> --- .../sles/http/sles-15-sp1-x86_64-autoinst.xml | 293 ++++++++++++++++++ .../sles/scripts/remove-dvd-source.sh | 2 +- packer_templates/sles/sles-15-sp1.json | 212 +++++++++++++ 3 files changed, 506 insertions(+), 1 deletion(-) create mode 100644 packer_templates/sles/http/sles-15-sp1-x86_64-autoinst.xml create mode 100644 packer_templates/sles/sles-15-sp1.json diff --git a/packer_templates/sles/http/sles-15-sp1-x86_64-autoinst.xml b/packer_templates/sles/http/sles-15-sp1-x86_64-autoinst.xml new file mode 100644 index 000000000..2c47c22e3 --- /dev/null +++ b/packer_templates/sles/http/sles-15-sp1-x86_64-autoinst.xml @@ -0,0 +1,293 @@ +<?xml version="1.0"?> +<!DOCTYPE profile> +<profile xmlns="http://www.suse.com/1.0/yast2ns" xmlns:config="http://www.suse.com/1.0/configns"> + <add-on> + <add_on_products config:type="list"> + <listentry> + <media_url><![CDATA[dvd:///?devices=/dev/sr0]]></media_url> + <product>sle-module-basesystem-release</product> + <product_dir>/Module-Basesystem</product_dir> + </listentry> + </add_on_products> + </add-on> + <bootloader> + <global> + <activate>true</activate> + <append>splash=silent quiet showopts</append> + <append_failsafe>showopts apm=off noresume edd=off powersaved=off nohz=off highres=off processor.max_cstate=1 nomodeset x11failsafe</append_failsafe> + <boot_boot>false</boot_boot> + <boot_extended>false</boot_extended> + <boot_mbr>false</boot_mbr> + <boot_root>true</boot_root> + <default>0</default> + <distributor>SLES15</distributor> + <generic_mbr>true</generic_mbr> + <gfxmode>auto</gfxmode> + <os_prober>false</os_prober> + <timeout config:type="integer">8</timeout> + </global> + <initrd_modules config:type="list"> + <initrd_module> + <module>ahci</module> + </initrd_module> + <initrd_module> + <module>ata_piix</module> + </initrd_module> + <initrd_module> + <module>ata_generic</module> + </initrd_module> + <initrd_module> + <module>jbd</module> + </initrd_module> + <initrd_module> + <module>mbcache</module> + </initrd_module> + </initrd_modules> + <loader_type>grub2</loader_type> + <sections config:type="list"/> + </bootloader> + <deploy_image> + <image_installation config:type="boolean">false</image_installation> + </deploy_image> + <firewall> + <enable_firewall config:type="boolean">false</enable_firewall> + <start_firewall config:type="boolean">false</start_firewall> + </firewall> + <general> + <ask-list config:type="list"/> + <mode> + <confirm config:type="boolean">false</confirm> + </mode> + <mouse> + <id>none</id> + </mouse> + <proposals config:type="list"/> + <signature-handling> + <accept_file_without_checksum config:type="boolean">true</accept_file_without_checksum> + <accept_non_trusted_gpg_key config:type="boolean">true</accept_non_trusted_gpg_key> + <accept_unknown_gpg_key config:type="boolean">true</accept_unknown_gpg_key> + <accept_unsigned_file config:type="boolean">true</accept_unsigned_file> + <accept_verification_failed config:type="boolean">false</accept_verification_failed> + <import_gpg_key config:type="boolean">true</import_gpg_key> + </signature-handling> + <storage/> + </general> + <login_settings/> + <networking> + <dhcp_options> + <dhclient_client_id/> + <dhclient_hostname_option>AUTO</dhclient_hostname_option> + </dhcp_options> + <dns> + <dhcp_hostname config:type="boolean">false</dhcp_hostname> + <domain>vagrantup.com</domain> + <hostname>vagrant-sles-15-x64</hostname> + <resolv_conf_policy>auto</resolv_conf_policy> + <searchlist config:type="list"> + <search>vagrantup.com</search> + </searchlist> + <write_hostname config:type="boolean">true</write_hostname> + </dns> + <interfaces config:type="list"> + <interface> + <bootproto>dhcp</bootproto> + <device>eth0</device> + <dhclient_set_default_route>yes</dhclient_set_default_route> + <startmode>auto</startmode> + <usercontrol>no</usercontrol> + </interface> + </interfaces> + <keep_install_network config:type="boolean">true</keep_install_network> + <managed config:type="boolean">false</managed> + <routing> + <ipv4_forward config:type="boolean">false</ipv4_forward> + <ipv6_forward config:type="boolean">false</ipv6_forward> + </routing> + </networking> + <partitioning config:type="list"> + <drive> + <!-- + definition of device not needed (starting with SLES 11 SP2 + YaST will pickup the first harddisk. + This is useful if someone wants to deploy using VirtualBox and/or KVM/virtio + --> + <!-- <device>/dev/sda</device> --> + <!-- This section may be removed entirely if we want to simply reuse YaST defaults --> + <enable_snapshots config:type="boolean">false</enable_snapshots> + <initialize config:type="boolean">true</initialize> + <partitions config:type="list"> + <partition> + <create config:type="boolean">true</create> + <crypt_fs config:type="boolean">false</crypt_fs> + <filesystem config:type="symbol">swap</filesystem> + <format config:type="boolean">true</format> + <fstopt>defaults</fstopt> + <loop_fs config:type="boolean">false</loop_fs> + <mount>swap</mount> + <mountby config:type="symbol">device</mountby> + <partition_id config:type="integer">130</partition_id> + <partition_nr config:type="integer">1</partition_nr> + <raid_options/> + <resize config:type="boolean">false</resize> + <size>1561492992</size> + </partition> + <partition> + <create config:type="boolean">true</create> + <crypt_fs config:type="boolean">false</crypt_fs> + <filesystem config:type="symbol">btrfs</filesystem> + <format config:type="boolean">true</format> + <loop_fs config:type="boolean">false</loop_fs> + <mount>/</mount> + <mountby config:type="symbol">device</mountby> + <partition_id config:type="integer">131</partition_id> + <partition_nr config:type="integer">2</partition_nr> + <raid_options/> + <resize config:type="boolean">false</resize> + <size>max</size> + <subvolumes config:type="list"> + <listentry>boot/grub2/i386-pc</listentry> + <listentry>boot/grub2/x86_64-efi</listentry> + <listentry>home</listentry> + <listentry>opt</listentry> + <listentry>srv</listentry> + <listentry>tmp</listentry> + <listentry>usr/local</listentry> + <listentry>var/crash</listentry> + <listentry>var/lib/mailman</listentry> + <listentry>var/lib/named</listentry> + <listentry>var/lib/pgsql</listentry> + <listentry>var/log</listentry> + <listentry>var/opt</listentry> + <listentry>var/spool</listentry> + <listentry>var/tmp</listentry> + </subvolumes> + </partition> + </partitions> + <pesize/> + <type config:type="symbol">CT_DISK</type> + <use>all</use> + </drive> + </partitioning> + <report> + <errors> + <log config:type="boolean">true</log> + <show config:type="boolean">true</show> + <timeout config:type="integer">0</timeout> + </errors> + <messages> + <log config:type="boolean">true</log> + <show config:type="boolean">true</show> + <timeout config:type="integer">0</timeout> + </messages> + <warnings> + <log config:type="boolean">true</log> + <show config:type="boolean">true</show> + <timeout config:type="integer">0</timeout> + </warnings> + <yesno_messages> + <log config:type="boolean">true</log> + <show config:type="boolean">true</show> + <timeout config:type="integer">0</timeout> + </yesno_messages> + </report> + <services-manager> + <default_target>graphical</default_target> + <services> + <disable config:type="list"/> + <enable config:type="list"> + <service>sshd</service> + </enable> + </services> + </services-manager> + <software> + <products config:type="list"> + <product>SLES</product> + </products> + <packages config:type="list"> + <package>glibc</package> + <package>openssh</package> + <package>kexec-tools</package> + <package>kernel-default-devel</package> + <package>sudo</package> + <package>gcc</package> + <package>wget</package> + <package>perl</package> + <package>make</package> + <package>bzip2</package> + <package>tar</package> + </packages> + <patterns config:type="list"> + <pattern>base</pattern> + </patterns> + <remove-packages config:type="list"> + <package>adaptec-firmware</package> + <package>atmel-firmware</package> + <package>bash-completion</package> + <package>bash-doc</package> + <package>cifs-utils</package> + <package>cups-libs</package> + <package>ipw-firmware</package> + <package>mpt-firmware</package> + <package>postfix</package> + <package>samba-libs</package> + <package>ucode-intel</package> + <package>snapper</package> + <package>snapper-zypp-plugin</package> + </remove-packages> + </software> + <timezone> + <hwclock>UTC</hwclock> + <timezone>UTC</timezone> + </timezone> + <user_defaults> + <expire/> + <group>100</group> + <groups>video,dialout</groups> + <home>/home</home> + <inactive>-1</inactive> + <shell>/bin/bash</shell> + <skel>/etc/skel</skel> + <umask>022</umask> + </user_defaults> + <users config:type="list"> + <user> + <encrypted config:type="boolean">true</encrypted> + <fullname>vagrant</fullname> + <gid>100</gid> + <home>/home/vagrant</home> + <password_settings> + <expire/> + <flag/> + <inact/> + <max>99999</max> + <min>0</min> + <warn>7</warn> + </password_settings> + <shell>/bin/bash</shell> + <uid>1000</uid> + <user_password>$2y$05$NA1Li9ZKJOLRW5mMTXm6/e5r8dltWS5RpDZpvHrI82aLE00V51tdi</user_password> + <username>vagrant</username> + </user> + <user> + <encrypted config:type="boolean">true</encrypted> + <fullname>root</fullname> + <gid>0</gid> + <home>/root</home> + <password_settings> + <expire/> + <flag/> + <inact/> + <max/> + <min/> + <warn/> + </password_settings> + <shell>/bin/bash</shell> + <uid>0</uid> + <user_password>$6$UgKtUD0AUMIA$VWLyc2Uvl0Lk6xxfTuoRb0/jrhZ9IJG/Gtx/DkZUEWZm.JYO1Q1fvPo6gDxQAHp38kQ1DG1vNGRgu2T/z/vih.</user_password> + <username>root</username> + </user> + </users> + <suse_register> + <do_registration config:type="boolean">false</do_registration> + </suse_register> +</profile> diff --git a/packer_templates/sles/scripts/remove-dvd-source.sh b/packer_templates/sles/scripts/remove-dvd-source.sh index 198d23812..f15778eb6 100644 --- a/packer_templates/sles/scripts/remove-dvd-source.sh +++ b/packer_templates/sles/scripts/remove-dvd-source.sh @@ -1,4 +1,4 @@ #!/bin/sh -eux zypper removerepo `zypper repos | grep 'SLES' | awk '{ print $3 }' | grep "^SLES"`; -zypper refresh +exit 0 diff --git a/packer_templates/sles/sles-15-sp1.json b/packer_templates/sles/sles-15-sp1.json new file mode 100644 index 000000000..4e7a0d142 --- /dev/null +++ b/packer_templates/sles/sles-15-sp1.json @@ -0,0 +1,212 @@ +{ + "builders": [ + { + "boot_command": [ + "<esc><enter><wait>", + "linux netdevice=eth0 netsetup=dhcp install=cd:/<wait>", + " lang=en_US autoyast=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `autoinst_cfg`}}<wait>", + " textmode=1<wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": "{{user `disk_size`}}", + "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "guest_os_type": "OpenSUSE_64", + "hard_drive_interface": "sata", + "headless": "{{ user `headless` }}", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `iso_name`}}", + "output_directory": "../../builds/packer-{{user `template`}}-virtualbox", + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "virtualbox-iso", + "vboxmanage": [ + [ + "modifyvm", + "{{.Name}}", + "--memory", + "{{ user `memory` }}" + ], + [ + "modifyvm", + "{{.Name}}", + "--cpus", + "{{ user `cpus` }}" + ], + [ + "storageattach", + "{{.Name}}", + "--storagectl", + "SATA Controller", + "--port", + "1", + "--device", + "0", + "--type", + "dvddrive", + "--medium", + "{{user `mirror`}}/{{user `packages_iso`}}" + ] + ], + "virtualbox_version_file": ".vbox_version", + "vm_name": "{{ user `template` }}" + }, + { + "boot_command": [ + "<esc><enter><wait>", + "linux netdevice=eth0 netsetup=dhcp install=cd:/<wait>", + " lang=en_US autoyast=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `autoinst_cfg`}}<wait>", + " textmode=1<wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": "{{user `disk_size`}}", + "guest_os_type": "sles12-64", + "headless": "{{ user `headless` }}", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `iso_name`}}", + "output_directory": "../../builds/packer-{{user `template`}}-vmware", + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "tools_upload_flavor": "linux", + "type": "vmware-iso", + "vm_name": "{{ user `template` }}", + "vmx_data": { + "cpuid.coresPerSocket": "1", + "memsize": "{{ user `memory` }}", + "numvcpus": "{{ user `cpus` }}" + }, + "vmx_remove_ethernet_interfaces": true + }, + { + "boot_command": [ + "<esc><enter><wait>", + "linux netdevice=eth0 netsetup=dhcp install=cd:/<wait>", + " lang=en_US autoyast=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `autoinst_cfg`}}<wait>", + " textmode=1<wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": "{{user `disk_size`}}", + "guest_os_type": "suse", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `iso_name`}}", + "output_directory": "../../builds/packer-{{user `template`}}-parallels", + "parallels_tools_flavor": "lin", + "prlctl": [ + [ + "set", + "{{.Name}}", + "--memsize", + "{{ user `memory` }}" + ], + [ + "set", + "{{.Name}}", + "--cpus", + "{{ user `cpus` }}" + ] + ], + "prlctl_version_file": ".prlctl_version", + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "parallels-iso", + "vm_name": "{{ user `template` }}" + }, + { + "boot_command": [ + "<esc><enter><wait>", + "linux netdevice=eth0 netsetup=dhcp install=cd:/<wait>", + " lang=en_US autoyast=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `autoinst_cfg`}}<wait>", + " textmode=1<wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": "{{user `disk_size`}}", + "headless": "{{ user `headless` }}", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `iso_name`}}", + "output_directory": "../../builds/packer-{{user `template`}}-qemu", + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "qemu", + "vm_name": "{{ user `template` }}" + } + ], + "post-processors": [ + { + "output": "../../builds/{{user `box_basename`}}.{{.Provider}}.box", + "type": "vagrant" + } + ], + "provisioners": [ + { + "environment_vars": [ + "HOME_DIR=/home/vagrant", + "http_proxy={{user `http_proxy`}}", + "https_proxy={{user `https_proxy`}}", + "no_proxy={{user `no_proxy`}}" + ], + "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh '{{.Path}}'", + "expect_disconnect": true, + "scripts": [ + "../_common/motd.sh", + "../_common/sshd.sh", + "../_common/vagrant.sh", + "scripts/unsupported-modules.sh", + "../_common/virtualbox.sh", + "../_common/vmware.sh", + "../_common/parallels.sh", + "scripts/sudoers.sh", + "scripts/zypper-locks.sh", + "scripts/remove-dvd-source.sh", + "scripts/cleanup.sh", + "../_common/minimize.sh" + ], + "type": "shell" + } + ], + "variables": { + "_DOWNLOAD_SITE": "https://www.suse.com/products/server/download", + "_README": "You must download the installer (DVD1) and Packages (DVD1) iso from the following page, and then place them in the packer_cache dir", + "arch": "64", + "autoinst_cfg": "sles-15-sp1-x86_64-autoinst.xml", + "box_basename": "sles-15-sp1", + "build_timestamp": "{{isotime \"20060102150405\"}}", + "cpus": "1", + "disk_size": "65536", + "git_revision": "__unknown_git_revision__", + "headless": "", + "http_proxy": "{{env `http_proxy`}}", + "https_proxy": "{{env `https_proxy`}}", + "iso_checksum": "5787b180a60a8d52bc42ddb8c51884ca4263f5ed47dc10bb72229a49e8b07497", + "iso_checksum_type": "sha256", + "iso_name": "SLE-15-SP1-Installer-DVD-x86_64-GM-DVD1.iso", + "memory": "1024", + "mirror": "./packer_cache", + "name": "sles-15-sp1", + "packages_iso": "SLE-15-SP1-Packages-x86_64-GM-DVD1.iso", + "template": "sles-15-sp1-x86_64", + "version": "TIMESTAMP" + } +} From b6c75f6068730c9e7f9d876d4a8b1b3b3fd5a1e8 Mon Sep 17 00:00:00 2001 From: "Benjamin M. Hughes" <bmhughes@bmhughes.co.uk> Date: Sat, 27 Jul 2019 12:17:41 +0100 Subject: [PATCH 1006/1622] Fix the Fedora 30 box for Chef Fedora >= 30 requires libxcrypt-compat to be installed to provide libcrypt.so.1 for Chef. Signed-off-by: Ben Hughes <bmhughes@bmhughes.co.uk> --- packer_templates/fedora/fedora-30-x86_64.json | 1 + packer_templates/fedora/scripts/install-supporting-packages.sh | 3 +++ 2 files changed, 4 insertions(+) create mode 100644 packer_templates/fedora/scripts/install-supporting-packages.sh diff --git a/packer_templates/fedora/fedora-30-x86_64.json b/packer_templates/fedora/fedora-30-x86_64.json index 8d099ccc6..9fe746e2b 100644 --- a/packer_templates/fedora/fedora-30-x86_64.json +++ b/packer_templates/fedora/fedora-30-x86_64.json @@ -182,6 +182,7 @@ "scripts/swap.sh", "scripts/fix-slow-dns.sh", "scripts/build-tools.sh", + "scripts/install-supporting-packages.sh", "../_common/motd.sh", "../_common/sshd.sh", "../_common/virtualbox.sh", diff --git a/packer_templates/fedora/scripts/install-supporting-packages.sh b/packer_templates/fedora/scripts/install-supporting-packages.sh new file mode 100644 index 000000000..0cc2a51ce --- /dev/null +++ b/packer_templates/fedora/scripts/install-supporting-packages.sh @@ -0,0 +1,3 @@ +#!/bin/bash -eux +# Chef with Fedora >= 30 requires libxcrypt-compat to be installed +dnf -y install libxcrypt-compat From 99ce102296d9fdc9c2b6270d2bf19bc4ca946210 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Tue, 6 Aug 2019 19:31:14 -0700 Subject: [PATCH 1007/1622] Slim the size of the boot partition for Windows 10 --- .../windows/answer_files/10/Autounattend.xml | 236 +++++++++--------- 1 file changed, 118 insertions(+), 118 deletions(-) diff --git a/packer_templates/windows/answer_files/10/Autounattend.xml b/packer_templates/windows/answer_files/10/Autounattend.xml index 0b229409b..454da0dc8 100644 --- a/packer_templates/windows/answer_files/10/Autounattend.xml +++ b/packer_templates/windows/answer_files/10/Autounattend.xml @@ -1,103 +1,103 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="UTF-8"?> <unattend xmlns="urn:schemas-microsoft-com:unattend"> - <settings pass="windowsPE"> - <component name="Microsoft-Windows-International-Core-WinPE" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - <SetupUILanguage> - <UILanguage>en-US</UILanguage> - </SetupUILanguage> - <InputLocale>en-US</InputLocale> - <SystemLocale>en-US</SystemLocale> - <UILanguage>en-US</UILanguage> - <UILanguageFallback>en-US</UILanguageFallback> - <UserLocale>en-US</UserLocale> - </component> - <component name="Microsoft-Windows-Setup" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - <DiskConfiguration> - <Disk wcm:action="add"> - <CreatePartitions> - <CreatePartition wcm:action="add"> - <Type>Primary</Type> - <Order>1</Order> - <Size>350</Size> - </CreatePartition> - <CreatePartition wcm:action="add"> - <Order>2</Order> - <Type>Primary</Type> - <Extend>true</Extend> - </CreatePartition> - </CreatePartitions> - <ModifyPartitions> - <ModifyPartition wcm:action="add"> - <Active>true</Active> - <Format>NTFS</Format> - <Label>boot</Label> - <Order>1</Order> - <PartitionID>1</PartitionID> - </ModifyPartition> - <ModifyPartition wcm:action="add"> - <Format>NTFS</Format> - <Label>Windows 10</Label> - <Letter>C</Letter> - <Order>2</Order> - <PartitionID>2</PartitionID> - </ModifyPartition> - </ModifyPartitions> - <DiskID>0</DiskID> - <WillWipeDisk>true</WillWipeDisk> - </Disk> - </DiskConfiguration> - <ImageInstall> - <OSImage> - <InstallFrom> - <MetaData wcm:action="add"> - <Key>/IMAGE/NAME</Key> - <Value>Windows 10 Enterprise Evaluation</Value> - </MetaData> - </InstallFrom> - <InstallTo> - <DiskID>0</DiskID> - <PartitionID>2</PartitionID> - </InstallTo> - </OSImage> - </ImageInstall> - <UserData> - <ProductKey> - <WillShowUI>OnError</WillShowUI> - </ProductKey> - <AcceptEula>true</AcceptEula> - <FullName>Vagrant</FullName> - <Organization>Bento by Chef Software, Inc.</Organization> - </UserData> - </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-International-Core-WinPE" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> + <SetupUILanguage> + <UILanguage>en-US</UILanguage> + </SetupUILanguage> + <InputLocale>en-US</InputLocale> + <SystemLocale>en-US</SystemLocale> + <UILanguage>en-US</UILanguage> + <UILanguageFallback>en-US</UILanguageFallback> + <UserLocale>en-US</UserLocale> + </component> + <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"> + <CreatePartitions> + <CreatePartition wcm:action="add"> + <Type>Primary</Type> + <Order>1</Order> + <Size>100</Size> + </CreatePartition> + <CreatePartition wcm:action="add"> + <Order>2</Order> + <Type>Primary</Type> + <Extend>true</Extend> + </CreatePartition> + </CreatePartitions> + <ModifyPartitions> + <ModifyPartition wcm:action="add"> + <Active>true</Active> + <Format>NTFS</Format> + <Label>boot</Label> + <Order>1</Order> + <PartitionID>1</PartitionID> + </ModifyPartition> + <ModifyPartition wcm:action="add"> + <Format>NTFS</Format> + <Label>Windows 10</Label> + <Letter>C</Letter> + <Order>2</Order> + <PartitionID>2</PartitionID> + </ModifyPartition> + </ModifyPartitions> + <DiskID>0</DiskID> + <WillWipeDisk>true</WillWipeDisk> + </Disk> + </DiskConfiguration> + <ImageInstall> + <OSImage> + <InstallFrom> + <MetaData wcm:action="add"> + <Key>/IMAGE/NAME</Key> + <Value>Windows 10 Enterprise Evaluation</Value> + </MetaData> + </InstallFrom> + <InstallTo> + <DiskID>0</DiskID> + <PartitionID>2</PartitionID> + </InstallTo> + </OSImage> + </ImageInstall> + <UserData> + <ProductKey> + <WillShowUI>OnError</WillShowUI> + </ProductKey> + <AcceptEula>true</AcceptEula> + <FullName>Vagrant</FullName> + <Organization>Bento by Chef Software, Inc.</Organization> + </UserData> + </component> + </settings> <settings pass="generalize"> - <component name="Microsoft-Windows-Security-SPP" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <component xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" name="Microsoft-Windows-Security-SPP" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> <SkipRearm>1</SkipRearm> </component> - <component name="Microsoft-Windows-PnpSysprep" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <component xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" name="Microsoft-Windows-PnpSysprep" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> <PersistAllDeviceInstalls>false</PersistAllDeviceInstalls> <DoNotCleanUpNonPresentDevices>false</DoNotCleanUpNonPresentDevices> </component> </settings> <settings pass="oobeSystem"> - <component name="Microsoft-Windows-International-Core" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <component xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" name="Microsoft-Windows-International-Core" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> <InputLocale>en-US</InputLocale> <SystemLocale>en-US</SystemLocale> <UILanguage>en-US</UILanguage> <UserLocale>en-US</UserLocale> </component> - <component name="Microsoft-Windows-Shell-Setup" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - <OOBE> - <HideEULAPage>true</HideEULAPage> - <HideLocalAccountScreen>true</HideLocalAccountScreen> - <HideOEMRegistrationScreen>true</HideOEMRegistrationScreen> - <HideOnlineAccountScreens>true</HideOnlineAccountScreens> - <HideWirelessSetupInOOBE>true</HideWirelessSetupInOOBE> - <NetworkLocation>Home</NetworkLocation> - <ProtectYourPC>3</ProtectYourPC> - <SkipMachineOOBE>true</SkipMachineOOBE> - <SkipUserOOBE>true</SkipUserOOBE> - </OOBE> + <component xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" name="Microsoft-Windows-Shell-Setup" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> + <OOBE> + <HideEULAPage>true</HideEULAPage> + <HideLocalAccountScreen>true</HideLocalAccountScreen> + <HideOEMRegistrationScreen>true</HideOEMRegistrationScreen> + <HideOnlineAccountScreens>true</HideOnlineAccountScreens> + <HideWirelessSetupInOOBE>true</HideWirelessSetupInOOBE> + <NetworkLocation>Work</NetworkLocation> + <ProtectYourPC>3</ProtectYourPC> + <SkipMachineOOBE>true</SkipMachineOOBE> + <SkipUserOOBE>true</SkipUserOOBE> + </OOBE> <TimeZone>UTC</TimeZone> <UserAccounts> <AdministratorPassword> @@ -117,26 +117,26 @@ </LocalAccount> </LocalAccounts> </UserAccounts> - <AutoLogon> - <Password> - <Value>vagrant</Value> - <PlainText>true</PlainText> - </Password> - <Enabled>true</Enabled> - <Username>vagrant</Username> - </AutoLogon> + <AutoLogon> + <Password> + <Value>vagrant</Value> + <PlainText>true</PlainText> + </Password> + <Enabled>true</Enabled> + <Username>vagrant</Username> + </AutoLogon> <FirstLogonCommands> <SynchronousCommand wcm:action="add"> - <CommandLine>PowerShell "Set-ExecutionPolicy -ExecutionPolicy RemoteSigned -Force"</CommandLine> - <Description>Set Execution Policy 64 Bit</Description> - <Order>1</Order> - <RequiresUserInput>true</RequiresUserInput> + <CommandLine>PowerShell "Set-ExecutionPolicy -ExecutionPolicy RemoteSigned -Force"</CommandLine> + <Description>Set Execution Policy 64 Bit</Description> + <Order>1</Order> + <RequiresUserInput>true</RequiresUserInput> </SynchronousCommand> <SynchronousCommand wcm:action="add"> - <CommandLine>C:\Windows\SysWOW64\cmd /c PowerShell -Command "Set-ExecutionPolicy -ExecutionPolicy RemoteSigned -Force"</CommandLine> - <Description>Set Execution Policy 32 Bit</Description> - <Order>2</Order> - <RequiresUserInput>true</RequiresUserInput> + <CommandLine>C:\Windows\SysWOW64\cmd /c PowerShell -Command "Set-ExecutionPolicy -ExecutionPolicy RemoteSigned -Force"</CommandLine> + <Description>Set Execution Policy 32 Bit</Description> + <Order>2</Order> + <RequiresUserInput>true</RequiresUserInput> </SynchronousCommand> <SynchronousCommand wcm:action="add"> <CommandLine>powershell -NoLogo -ExecutionPolicy RemoteSigned -File a:\base_setup.ps1</CommandLine> @@ -145,23 +145,23 @@ <RequiresUserInput>false</RequiresUserInput> </SynchronousCommand> <SynchronousCommand wcm:action="add"> - <CommandLine>cmd.exe /c wmic useraccount where "name='vagrant'" set PasswordExpires=FALSE</CommandLine> - <Order>4</Order> - <Description>Disable password expiration for vagrant user</Description> + <CommandLine>cmd.exe /c wmic useraccount where "name='vagrant'" set PasswordExpires=FALSE</CommandLine> + <Order>4</Order> + <Description>Disable password expiration for vagrant user</Description> </SynchronousCommand> </FirstLogonCommands> </component> </settings> - <settings pass="specialize"> - <component xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" name="Microsoft-Windows-ServerManager-SvrMgrNc" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> - <DoNotOpenServerManagerAtLogon>true</DoNotOpenServerManagerAtLogon> - </component> - <component xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" name="Microsoft-Windows-IE-ESC" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> - <IEHardenAdmin>false</IEHardenAdmin> - <IEHardenUser>false</IEHardenUser> - </component> - <component xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" name="Microsoft-Windows-OutOfBoxExperience" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> - <DoNotOpenInitialConfigurationTasksAtLogon>true</DoNotOpenInitialConfigurationTasksAtLogon> - </component> - </settings> -</unattend> + <settings pass="specialize"> + <component xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" name="Microsoft-Windows-ServerManager-SvrMgrNc" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> + <DoNotOpenServerManagerAtLogon>true</DoNotOpenServerManagerAtLogon> + </component> + <component xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" name="Microsoft-Windows-IE-ESC" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> + <IEHardenAdmin>false</IEHardenAdmin> + <IEHardenUser>false</IEHardenUser> + </component> + <component xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" name="Microsoft-Windows-OutOfBoxExperience" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> + <DoNotOpenInitialConfigurationTasksAtLogon>true</DoNotOpenInitialConfigurationTasksAtLogon> + </component> + </settings> +</unattend> \ No newline at end of file From 3ecfac0d07a74ad2392bb2ffb3e171efbda0690e Mon Sep 17 00:00:00 2001 From: Brian Cain <bcain@hashicorp.com> Date: Fri, 9 Aug 2019 08:58:36 -0700 Subject: [PATCH 1008/1622] Update Ubuntu 18.04 template with latest iso This commit updates the Ubuntu template with the latest 18.04.3 iso, since 18.04.2 no longer exists. http://cdimage.ubuntu.com/ubuntu/releases/18.04.3/release/ Signed-off-by: Brian Cain <bcain@hashicorp.com> --- packer_templates/ubuntu/ubuntu-18.04-amd64.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packer_templates/ubuntu/ubuntu-18.04-amd64.json b/packer_templates/ubuntu/ubuntu-18.04-amd64.json index b6e8e4fda..e09596e92 100644 --- a/packer_templates/ubuntu/ubuntu-18.04-amd64.json +++ b/packer_templates/ubuntu/ubuntu-18.04-amd64.json @@ -301,12 +301,12 @@ "https_proxy": "{{env `https_proxy`}}", "hyperv_generation": "2", "hyperv_switch": "{{env `hyperv_switch`}}", - "iso_checksum": "a2cb36dc010d98ad9253ea5ad5a07fd6b409e3412c48f1860536970b073c98f5", + "iso_checksum": "7d8e0055d663bffa27c1718685085626cb59346e7626ba3d3f476322271f573e", "iso_checksum_type": "sha256", - "iso_name": "ubuntu-18.04.2-server-amd64.iso", + "iso_name": "ubuntu-18.04.3-server-amd64.iso", "memory": "1024", "mirror": "http://cdimage.ubuntu.com", - "mirror_directory": "ubuntu/releases/18.04.2/release", + "mirror_directory": "ubuntu/releases/18.04.3/release", "name": "ubuntu-18.04", "no_proxy": "{{env `no_proxy`}}", "preseed_path": "preseed.cfg", From d71b846993a7d3f277d56d24ad4f12aa28be0e6c Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Sun, 25 Aug 2019 17:18:18 -0700 Subject: [PATCH 1009/1622] Remove broken revoke, delete, and release support The vagrant gem is fundamentally flawed and broken. This isn't going to work anytime soon. Signed-off-by: Tim Smith <tsmith@chef.io> --- lib/bento/cli.rb | 31 ++----------------------------- lib/bento/delete.rb | 22 ---------------------- lib/bento/release.rb | 22 ---------------------- lib/bento/revoke.rb | 22 ---------------------- 4 files changed, 2 insertions(+), 95 deletions(-) delete mode 100644 lib/bento/delete.rb delete mode 100644 lib/bento/release.rb delete mode 100644 lib/bento/revoke.rb diff --git a/lib/bento/cli.rb b/lib/bento/cli.rb index 00f293a31..12c9dcd22 100644 --- a/lib/bento/cli.rb +++ b/lib/bento/cli.rb @@ -3,10 +3,7 @@ require "bento/common" require "bento/runner" -require "bento/delete" require "bento/normalize" -require "bento/release" -require "bento/revoke" require "bento/test" require "bento/upload" @@ -26,10 +23,7 @@ def self.parse(args) list : list all templates in project normalize : normalize one or more templates test : test one or more builds with kitchen - upload : upload one or more builds to Vagrant Cloud - release : release a version of a box on Vagrant Cloud - revoke : revoke a version of a box on Vagrant Cloud - delete : delete a version of a box from Vagrant Cloud + upload : upload and release one or more builds to Vagrant Cloud COMMANDS end @@ -156,28 +150,7 @@ def self.parse(args) opts.banner = "Usage: #{NAME} upload" end, argv: md_json_argv_proc, - }, - release: { - class: ReleaseRunner, - parser: OptionParser.new do |opts| - opts.banner = "Usage: #{NAME} release BOX VERSION" - end, - argv: box_version_argv_proc, - }, - revoke: { - class: RevokeRunner, - parser: OptionParser.new do |opts| - opts.banner = "Usage: #{NAME} revoke BOX VERSION" - end, - argv: box_version_argv_proc, - }, - delete: { - class: DeleteRunner, - parser: OptionParser.new do |opts| - opts.banner = "Usage: #{NAME} delete BOX VERSION" - end, - argv: box_version_argv_proc, - }, + } } global.order! diff --git a/lib/bento/delete.rb b/lib/bento/delete.rb deleted file mode 100644 index fdf50ada0..000000000 --- a/lib/bento/delete.rb +++ /dev/null @@ -1,22 +0,0 @@ -require "bento/common" - -class DeleteRunner - include Common - - attr_reader :box, :version - - def initialize(opts) - @box = opts.box - @version = opts.version - end - - def start - banner("Starting Delete...") - time = Benchmark.measure do - box = vc_account.get_box(box) - version = box.get_version(version) - version.delete - end - banner("Delete finished in #{duration(time.real)}.") - end -end diff --git a/lib/bento/release.rb b/lib/bento/release.rb deleted file mode 100644 index d6e8bf9c3..000000000 --- a/lib/bento/release.rb +++ /dev/null @@ -1,22 +0,0 @@ -require "bento/common" - -class ReleaseRunner - include Common - - attr_reader :box, :version - - def initialize(opts) - @box = opts.box - @version = opts.version - end - - def start - banner("Releasing #{box}/#{version}...") - time = Benchmark.measure do - b = vc_account.get_box(box) - v = b.get_version(version) - v.release - end - banner("Release finished in #{duration(time.real)}.") - end -end diff --git a/lib/bento/revoke.rb b/lib/bento/revoke.rb deleted file mode 100644 index 9e9a0cf2a..000000000 --- a/lib/bento/revoke.rb +++ /dev/null @@ -1,22 +0,0 @@ -require "bento/common" - -class RevokeRunner - include Common - - attr_reader :box, :version - - def initialize(opts) - @box = opts.box - @version = opts.version - end - - def start - banner("Revoking #{box}/#{version}...") - time = Benchmark.measure do - box = vc_account.get_box(box) - version = box.get_version(version) - version.revoke - end - banner("Revoke finished in #{duration(time.real)}.") - end -end From 2669337e5a68a32445e1c04f7d418d1bc8e2f379 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Sun, 25 Aug 2019 17:19:02 -0700 Subject: [PATCH 1010/1622] Use our version format by default unless otherwise specified No one ever wants the versions in the templates. They're garbage Signed-off-by: Tim Smith <tsmith@chef.io> --- lib/bento/cli.rb | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lib/bento/cli.rb b/lib/bento/cli.rb index 12c9dcd22..e49c4f765 100644 --- a/lib/bento/cli.rb +++ b/lib/bento/cli.rb @@ -105,7 +105,10 @@ def self.parse(args) options.single = opt end - opts.on("-v VERSION", "--version VERSION", "Override the version set in the template") do |opt| + # the default template override version unless a user passes one + options.override_version = Time.now.gmtime.strftime("%Y%m.%d.0") + + opts.on("-v VERSION", "--version VERSION", "Override the date computed version of #{options.override_version}") do |opt| options.override_version = opt end end, From 48575925f96e50cfd5550a54a3626b8fabc9c3f9 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Sat, 28 Sep 2019 22:57:22 -0700 Subject: [PATCH 1011/1622] Add Debian 10.1 Signed-off-by: Tim Smith <tsmith@chef.io> --- ...debian-10.0-amd64.json => debian-10.1-amd64.json} | 12 ++++++------ .../{debian-10.0-i386.json => debian-10.1-i386.json} | 10 +++++----- 2 files changed, 11 insertions(+), 11 deletions(-) rename packer_templates/debian/{debian-10.0-amd64.json => debian-10.1-amd64.json} (96%) rename packer_templates/debian/{debian-10.0-i386.json => debian-10.1-i386.json} (97%) diff --git a/packer_templates/debian/debian-10.0-amd64.json b/packer_templates/debian/debian-10.1-amd64.json similarity index 96% rename from packer_templates/debian/debian-10.0-amd64.json rename to packer_templates/debian/debian-10.1-amd64.json index b01001d91..01999ef84 100644 --- a/packer_templates/debian/debian-10.0-amd64.json +++ b/packer_templates/debian/debian-10.1-amd64.json @@ -218,7 +218,7 @@ } ], "variables": { - "box_basename": "debian-10.0", + "box_basename": "debian-10.1", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", "disk_size": "65536", @@ -226,16 +226,16 @@ "headless": "", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", - "iso_checksum": "3dbb597b7f11dbda71cda08d4c1339c1eb565e784c75409987fa2b91182d9240", + "iso_checksum": "7915fdb77a0c2623b4481fc5f0a8052330defe1cde1e0834ff233818dc6f301e", "iso_checksum_type": "sha256", - "iso_name": "debian-10.0.0-amd64-netinst.iso", + "iso_name": "debian-10.1.0-amd64-netinst.iso", "memory": "1024", "mirror": "http://cdimage.debian.org/cdimage/release", - "mirror_directory": "10.0.0/amd64/iso-cd", - "name": "debian-10.0", + "mirror_directory": "10.1.0/amd64/iso-cd", + "name": "debian-10.1", "no_proxy": "{{env `no_proxy`}}", "preseed_path": "debian-9/preseed.cfg", - "template": "debian-10.0-amd64", + "template": "debian-10.1-amd64", "version": "TIMESTAMP" } } diff --git a/packer_templates/debian/debian-10.0-i386.json b/packer_templates/debian/debian-10.1-i386.json similarity index 97% rename from packer_templates/debian/debian-10.0-i386.json rename to packer_templates/debian/debian-10.1-i386.json index 25cfe61ff..9e92fb34e 100644 --- a/packer_templates/debian/debian-10.0-i386.json +++ b/packer_templates/debian/debian-10.1-i386.json @@ -218,7 +218,7 @@ } ], "variables": { - "box_basename": "debian-10.0-i386", + "box_basename": "debian-10.1-i386", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", "disk_size": "65536", @@ -228,14 +228,14 @@ "https_proxy": "{{env `https_proxy`}}", "iso_checksum": "1356e3aeb202533570031735c2ac4b8f2de718ce407df2895e1a5f4027d5db7c", "iso_checksum_type": "sha256", - "iso_name": "debian-10.0.0-i386-netinst.iso", + "iso_name": "debian-10.1.0-i386-netinst.iso", "memory": "1024", "mirror": "http://cdimage.debian.org/cdimage/release", - "mirror_directory": "10.0.0/i386/iso-cd", - "name": "debian-10.0-i386", + "mirror_directory": "10.1.0/i386/iso-cd", + "name": "debian-10.1-i386", "no_proxy": "{{env `no_proxy`}}", "preseed_path": "debian-9/preseed.cfg", - "template": "debian-10.0-i386", + "template": "debian-10.1-i386", "version": "TIMESTAMP" } } From 4ddbee96c418d4d7869e520e7ac773e250683c54 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Sat, 28 Sep 2019 23:02:43 -0700 Subject: [PATCH 1012/1622] Fix 10.1 i386 shasum Signed-off-by: Tim Smith <tsmith@chef.io> --- packer_templates/debian/debian-10.1-i386.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packer_templates/debian/debian-10.1-i386.json b/packer_templates/debian/debian-10.1-i386.json index 9e92fb34e..c849567a0 100644 --- a/packer_templates/debian/debian-10.1-i386.json +++ b/packer_templates/debian/debian-10.1-i386.json @@ -226,7 +226,7 @@ "headless": "", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", - "iso_checksum": "1356e3aeb202533570031735c2ac4b8f2de718ce407df2895e1a5f4027d5db7c", + "iso_checksum": "78ea01feb0f0d8a8c274333a3b2e6261c93b33135c26aa5b7c791d0f57524eb5", "iso_checksum_type": "sha256", "iso_name": "debian-10.1.0-i386-netinst.iso", "memory": "1024", From 8baf89c9b4fc5d0b34d7be6585e969a236acd6aa Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Sat, 28 Sep 2019 23:08:52 -0700 Subject: [PATCH 1013/1622] Update CentOS to 7.7 Signed-off-by: Tim Smith <tsmith@chef.io> --- ...centos-7.6-x86_64.json => centos-7.7-x86_64.json} | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) rename packer_templates/centos/{centos-7.6-x86_64.json => centos-7.7-x86_64.json} (96%) diff --git a/packer_templates/centos/centos-7.6-x86_64.json b/packer_templates/centos/centos-7.7-x86_64.json similarity index 96% rename from packer_templates/centos/centos-7.6-x86_64.json rename to packer_templates/centos/centos-7.7-x86_64.json index a13d8fdfd..15d8288f8 100644 --- a/packer_templates/centos/centos-7.6-x86_64.json +++ b/packer_templates/centos/centos-7.7-x86_64.json @@ -182,7 +182,7 @@ } ], "variables": { - "box_basename": "centos-7.6", + "box_basename": "centos-7.7", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", "disk_size": "65536", @@ -192,16 +192,16 @@ "https_proxy": "{{env `https_proxy`}}", "hyperv_generation": "1", "hyperv_switch": "{{env `hyperv_switch`}}", - "iso_checksum": "6d44331cc4f6c506c7bbe9feb8468fad6c51a88ca1393ca6b8b486ea04bec3c1", + "iso_checksum": "9bba3da2876cb9fcf6c28fb636bcbd01832fe6d84cd7445fa58e44e569b3b4fe", "iso_checksum_type": "sha256", - "iso_name": "CentOS-7-x86_64-DVD-1810.iso", + "iso_name": "CentOS-7-x86_64-DVD-1908.iso", "ks_path": "7/ks.cfg", "memory": "1024", "mirror": "http://mirrors.kernel.org/centos", - "mirror_directory": "7.6.1810/isos/x86_64", - "name": "centos-7.6", + "mirror_directory": "7.7.1908/isos/x86_64", + "name": "centos-7.7", "no_proxy": "{{env `no_proxy`}}", - "template": "centos-7.6-x86_64", + "template": "centos-7.7-x86_64", "version": "TIMESTAMP" } } From 8a8b880a248e074751a6a8cf51c20e19571131b2 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Sat, 28 Sep 2019 23:11:59 -0700 Subject: [PATCH 1014/1622] Update Debian to 9.11 Signed-off-by: Tim Smith <tsmith@chef.io> --- ...{debian-9.9-amd64.json => debian-9.11-amd64.json} | 12 ++++++------ .../{debian-9.9-i386.json => debian-9.11-i386.json} | 12 ++++++------ 2 files changed, 12 insertions(+), 12 deletions(-) rename packer_templates/debian/{debian-9.9-amd64.json => debian-9.11-amd64.json} (96%) rename packer_templates/debian/{debian-9.9-i386.json => debian-9.11-i386.json} (96%) diff --git a/packer_templates/debian/debian-9.9-amd64.json b/packer_templates/debian/debian-9.11-amd64.json similarity index 96% rename from packer_templates/debian/debian-9.9-amd64.json rename to packer_templates/debian/debian-9.11-amd64.json index f8101b5af..206f8416f 100644 --- a/packer_templates/debian/debian-9.9-amd64.json +++ b/packer_templates/debian/debian-9.11-amd64.json @@ -218,7 +218,7 @@ } ], "variables": { - "box_basename": "debian-9.9", + "box_basename": "debian-9.11", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", "disk_size": "65536", @@ -226,16 +226,16 @@ "headless": "", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", - "iso_checksum": "d4a22c81c76a66558fb92e690ef70a5d67c685a08216701b15746586520f6e8e", + "iso_checksum": "9ae83aa5a732151ef2dc84538d1d4ffd6374df47cc01681da6348f9ec5a45bd4", "iso_checksum_type": "sha256", - "iso_name": "debian-9.9.0-amd64-netinst.iso", + "iso_name": "debian-9.11.0-amd64-netinst.iso", "memory": "1024", "mirror": "http://cdimage.debian.org/cdimage/archive", - "mirror_directory": "9.9.0/amd64/iso-cd", - "name": "debian-9.9", + "mirror_directory": "9.11.0/amd64/iso-cd", + "name": "debian-9.11", "no_proxy": "{{env `no_proxy`}}", "preseed_path": "debian-9/preseed.cfg", - "template": "debian-9.9-amd64", + "template": "debian-9.11-amd64", "version": "TIMESTAMP" } } diff --git a/packer_templates/debian/debian-9.9-i386.json b/packer_templates/debian/debian-9.11-i386.json similarity index 96% rename from packer_templates/debian/debian-9.9-i386.json rename to packer_templates/debian/debian-9.11-i386.json index 558ac3848..9305d5d31 100644 --- a/packer_templates/debian/debian-9.9-i386.json +++ b/packer_templates/debian/debian-9.11-i386.json @@ -218,7 +218,7 @@ } ], "variables": { - "box_basename": "debian-9.9-i386", + "box_basename": "debian-9.11-i386", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", "disk_size": "65536", @@ -226,16 +226,16 @@ "headless": "", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", - "iso_checksum": "44dc843e39ab0b24dd6aa552bb93acd66c08cb3c95e64c614532d95db531a8c1", + "iso_checksum": "c24ac0bd549549bee755d842799153abf0b232f106c248e2efe48aa6209b6bd6", "iso_checksum_type": "sha256", - "iso_name": "debian-9.9.0-i386-netinst.iso", + "iso_name": "debian-9.11.0-i386-netinst.iso", "memory": "1024", "mirror": "http://cdimage.debian.org/cdimage/archive", - "mirror_directory": "9.9.0/i386/iso-cd", - "name": "debian-9.9-i386", + "mirror_directory": "9.11.0/i386/iso-cd", + "name": "debian-9.11-i386", "no_proxy": "{{env `no_proxy`}}", "preseed_path": "debian-9/preseed.cfg", - "template": "debian-9.9-i386", + "template": "debian-9.11-i386", "version": "TIMESTAMP" } } From 8c8c6a1423f7de56b085185f08b99cc583d6a1af Mon Sep 17 00:00:00 2001 From: Sean Molenaar <sean@seanmolenaar.eu> Date: Mon, 30 Sep 2019 12:18:47 +0200 Subject: [PATCH 1015/1622] centos-8.0-x86_64.json Signed-off-by: Sean Molenaar <sean@seanmolenaar.eu> --- builds.yml | 2 + .../centos/centos-8.0-x86_64.json | 207 ++++++++++++++++++ packer_templates/centos/http/8/ks.cfg | 99 +++++++++ 3 files changed, 308 insertions(+) create mode 100644 packer_templates/centos/centos-8.0-x86_64.json create mode 100644 packer_templates/centos/http/8/ks.cfg diff --git a/builds.yml b/builds.yml index c8fa04a25..301906e55 100644 --- a/builds.yml +++ b/builds.yml @@ -5,6 +5,7 @@ public: - 'centos-6.10-i386' - 'centos-6.10' - 'centos-7.6' +- 'centos-8.0' - 'debian-8.11-i386' - 'debian-8.11' - 'debian-9.9-i386' @@ -34,6 +35,7 @@ public: - 'ubuntu-19.04' slugs: + 'centos-8': 'centos-8.0' 'centos-7': 'centos-7.6' 'centos-6': 'centos-6.10' 'centos-5': 'centos-5.11' diff --git a/packer_templates/centos/centos-8.0-x86_64.json b/packer_templates/centos/centos-8.0-x86_64.json new file mode 100644 index 000000000..3e5e5e0ba --- /dev/null +++ b/packer_templates/centos/centos-8.0-x86_64.json @@ -0,0 +1,207 @@ +{ + "builders": [ + { + "boot_command": [ + "<up><wait><tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": "{{user `disk_size`}}", + "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "guest_os_type": "RedHat_64", + "hard_drive_interface": "sata", + "headless": "{{ user `headless` }}", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "../../builds/packer-{{user `template`}}-virtualbox", + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "virtualbox-iso", + "vboxmanage": [ + [ + "modifyvm", + "{{.Name}}", + "--memory", + "{{ user `memory` }}" + ], + [ + "modifyvm", + "{{.Name}}", + "--cpus", + "{{ user `cpus` }}" + ] + ], + "virtualbox_version_file": ".vbox_version", + "vm_name": "{{ user `template` }}" + }, + { + "boot_command": [ + "<up><wait><tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": "{{user `disk_size`}}", + "guest_os_type": "centos-64", + "headless": "{{ user `headless` }}", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "../../builds/packer-{{user `template`}}-vmware", + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "tools_upload_flavor": "linux", + "type": "vmware-iso", + "vm_name": "{{ user `template` }}", + "vmx_data": { + "cpuid.coresPerSocket": "1", + "memsize": "{{ user `memory` }}", + "numvcpus": "{{ user `cpus` }}" + }, + "vmx_remove_ethernet_interfaces": true + }, + { + "boot_command": [ + "<up><wait><tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": "{{user `disk_size`}}", + "guest_os_type": "centos", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "../../builds/packer-{{user `template`}}-parallels", + "parallels_tools_flavor": "lin", + "prlctl": [ + [ + "set", + "{{.Name}}", + "--memsize", + "{{ user `memory` }}" + ], + [ + "set", + "{{.Name}}", + "--cpus", + "{{ user `cpus` }}" + ] + ], + "prlctl_version_file": ".prlctl_version", + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "parallels-iso", + "vm_name": "{{ user `template` }}" + }, + { + "boot_command": [ + "<wait5><tab> text ks=hd:fd0:/ks.cfg<enter><wait5><esc>" + ], + "boot_wait": "10s", + "cpus": "{{ user `cpus` }}", + "disk_size": "{{user `disk_size`}}", + "floppy_files": [ + "http/8/ks.cfg" + ], + "generation": "{{user `hyperv_generation`}}", + "guest_additions_mode": "disable", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "memory": "{{ user `memory` }}", + "output_directory": "../../builds/packer-{{user `template`}}-hyperv", + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_timeout": "10000s", + "ssh_username": "vagrant", + "switch_name": "{{ user `hyperv_switch`}}", + "type": "hyperv-iso", + "vm_name": "{{ user `template` }}" + }, + { + "boot_command": [ + "<up><wait><tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": "{{user `disk_size`}}", + "headless": "{{ user `headless` }}", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "../../builds/packer-{{user `template`}}-qemu", + "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "qemu", + "vm_name": "{{ user `template` }}" + } + ], + "post-processors": [ + { + "output": "../../builds/{{user `box_basename`}}.{{.Provider}}.box", + "type": "vagrant" + } + ], + "provisioners": [ + { + "environment_vars": [ + "HOME_DIR=/home/vagrant", + "http_proxy={{user `http_proxy`}}", + "https_proxy={{user `https_proxy`}}", + "no_proxy={{user `no_proxy`}}" + ], + "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", + "expect_disconnect": true, + "scripts": [ + "scripts/update.sh", + "../_common/motd.sh", + "../_common/sshd.sh", + "scripts/networking.sh", + "../_common/vagrant.sh", + "../_common/virtualbox.sh", + "../_common/vmware.sh", + "../_common/parallels.sh", + "scripts/cleanup.sh", + "../_common/minimize.sh" + ], + "type": "shell" + } + ], + "variables": { + "box_basename": "centos-8.0", + "build_timestamp": "{{isotime \"2019102650405\"}}", + "cpus": "1", + "disk_size": "65536", + "git_revision": "__unknown_git_revision__", + "headless": "", + "http_proxy": "{{env `http_proxy`}}", + "https_proxy": "{{env `https_proxy`}}", + "hyperv_generation": "1", + "hyperv_switch": "{{env `hyperv_switch`}}", + "iso_checksum": "ea17ef71e0df3f6bf1d4bf1fc25bec1a76d1f211c115d39618fe688be34503e8", + "iso_checksum_type": "sha256", + "iso_name": "CentOS-8-x86_64-1905-dvd1.iso", + "ks_path": "8/ks.cfg", + "memory": "1024", + "mirror": "http://mirrors.kernel.org/centos", + "mirror_directory": "8.0.1905/isos/x86_64", + "name": "centos-8.0", + "no_proxy": "{{env `no_proxy`}}", + "template": "centos-8.0-x86_64", + "version": "TIMESTAMP" + } +} diff --git a/packer_templates/centos/http/8/ks.cfg b/packer_templates/centos/http/8/ks.cfg new file mode 100644 index 000000000..6e7e04c3a --- /dev/null +++ b/packer_templates/centos/http/8/ks.cfg @@ -0,0 +1,99 @@ +install +cdrom +lang en_US.UTF-8 +keyboard us +network --bootproto=dhcp --onboot=on --device=eth0 +rootpw vagrant +firewall --disabled +selinux --permissive +timezone UTC +unsupported_hardware +bootloader --location=mbr --append="net.ifnames=0 biosdevname=0" +text +skipx +zerombr +clearpart --all --initlabel +autopart +auth --enableshadow --passalgo=sha512 --kickstart +firstboot --disabled +reboot --eject +user --name=vagrant --plaintext --password vagrant + +%packages --nobase --ignoremissing --excludedocs --instLangs=en_US.utf8 +# vagrant needs this to copy initial files via scp +openssh-clients +sudo +kernel-headers +kernel-devel +gcc +make +perl +selinux-policy-devel +wget +nfs-utils +net-tools +bzip2 +deltarpm +rsync +-fprintd-pam +-intltool + +# unnecessary firmware +-aic94xx-firmware +-alsa-firmware +-alsa-tools-firmware +-ivtv-firmware +-iwl100-firmware +-iwl105-firmware +-iwl135-firmware +-iwl1000-firmware +-iwl2000-firmware +-iwl2030-firmware +-iwl3160-firmware +-iwl3945-firmware +-iwl4965-firmware +-iwl5000-firmware +-iwl5150-firmware +-iwl6000-firmware +-iwl6000g2a-firmware +-iwl6000g2b-firmware +-iwl6050-firmware +-iwl7260-firmware +-iwl7265-firmware +%end + +%post +# sudo +echo "%vagrant ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers.d/vagrant +chmod 0440 /etc/sudoers.d/vagrant + +#Enable hyper-v daemons only if using hyper-v virtualization +if [ $(virt-what) == "hyperv" ]; then + yum -y install hyperv-daemons cifs-utils + systemctl enable hypervvssd + systemctl enable hypervkvpd +fi + +# Since we disable consistent network naming, we need to make sure the eth0 +# configuration file is in place so it will come up. +# Delete other network configuration first because RHEL/C7 networking will not +# restart successfully if there are configuration files for devices that do not +# exist. +rm -f /etc/sysconfig/network-scripts/ifcfg-e* +cat > /etc/sysconfig/network-scripts/ifcfg-eth0 << _EOF_ +TYPE=Ethernet +PROXY_METHOD=none +BROWSER_ONLY=no +BOOTPROTO=dhcp +DEFROUTE=yes +IPV4_FAILURE_FATAL=no +IPV6INIT=yes +IPV6_AUTOCONF=yes +IPV6_DEFROUTE=yes +IPV6_FAILURE_FATAL=no +IPV6_ADDR_GEN_MODE=stable-privacy +NAME=eth0 +DEVICE=eth0 +ONBOOT=yes +_EOF_ +%end From 28a051fa91aa80964941890a795e015ec20c8a82 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Thu, 3 Oct 2019 13:18:45 -0700 Subject: [PATCH 1016/1622] Remove unsupported kickstart options for the CentOS 8 file Signed-off-by: Tim Smith <tsmith@chef.io> --- packer_templates/centos/http/8/ks.cfg | 3 +- .../debian/debian-9.9-ppc64el.json | 102 ------------------ 2 files changed, 1 insertion(+), 104 deletions(-) delete mode 100644 packer_templates/debian/debian-9.9-ppc64el.json diff --git a/packer_templates/centos/http/8/ks.cfg b/packer_templates/centos/http/8/ks.cfg index 6e7e04c3a..0b62d719a 100644 --- a/packer_templates/centos/http/8/ks.cfg +++ b/packer_templates/centos/http/8/ks.cfg @@ -7,7 +7,6 @@ rootpw vagrant firewall --disabled selinux --permissive timezone UTC -unsupported_hardware bootloader --location=mbr --append="net.ifnames=0 biosdevname=0" text skipx @@ -19,7 +18,7 @@ firstboot --disabled reboot --eject user --name=vagrant --plaintext --password vagrant -%packages --nobase --ignoremissing --excludedocs --instLangs=en_US.utf8 +%packages --ignoremissing --excludedocs --instLangs=en_US.utf8 # vagrant needs this to copy initial files via scp openssh-clients sudo diff --git a/packer_templates/debian/debian-9.9-ppc64el.json b/packer_templates/debian/debian-9.9-ppc64el.json deleted file mode 100644 index 6dedceec7..000000000 --- a/packer_templates/debian/debian-9.9-ppc64el.json +++ /dev/null @@ -1,102 +0,0 @@ -{ - "builders": [ - { - "boot_command": [ - "c<wait>", - "setparams 'Automated install'<enter><wait>", - "<enter><wait>", - "set options=\" preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}} <wait>", - "debian-installer=en_US.UTF-8 <wait>", - "auto <wait>", - "locale=en_US.UTF-8 <wait>", - "kbd-chooser/method=us <wait>", - "keyboard-configuration/xkb-keymap=us <wait>", - "netcfg/get_hostname={{ .Name }} <wait>", - "netcfg/get_domain=vagrantup.com <wait>", - "fb=false <wait>", - "debconf/frontend=noninteractive <wait>", - "console-setup/ask_detect=false <wait>", - "console-keymaps-at/keymap=us <wait>", - "grub-installer/bootdev=/dev/vda1 <wait>", - "\"", - "<enter><wait>", - "boot_one<wait>", - "<enter><wait>", - "boot<enter>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "headless": "{{ user `headless` }}", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../../builds/packer-{{user `template`}}-qemu", - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "qemu", - "qemu_binary": "qemu-system-ppc64le", - "machine_type": "pseries", - "use_default_display": true, - "accelerator": "kvm", - "vm_name": "{{ user `template` }}" - } - ], - "post-processors": [ - { - "output": "../../builds/{{user `box_basename`}}.{{.Provider}}.box", - "type": "vagrant" - } - ], - "provisioners": [ - { - "environment_vars": [ - "HOME_DIR=/home/vagrant", - "http_proxy={{user `http_proxy`}}", - "https_proxy={{user `https_proxy`}}", - "no_proxy={{user `no_proxy`}}" - ], - "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", - "expect_disconnect": true, - "scripts": [ - "scripts/update.sh", - "../_common/motd.sh", - "../_common/sshd.sh", - "scripts/networking.sh", - "scripts/sudoers.sh", - "../_common/vagrant.sh", - "scripts/systemd.sh", - "../_common/virtualbox.sh", - "../_common/vmware.sh", - "../_common/parallels.sh", - "scripts/cleanup.sh", - "../_common/minimize.sh" - ], - "type": "shell" - } - ], - "variables": { - "box_basename": "debian-9.9", - "build_timestamp": "{{isotime \"20060102150405\"}}", - "cpus": "1", - "disk_size": "65536", - "git_revision": "__unknown_git_revision__", - "headless": "", - "http_proxy": "{{env `http_proxy`}}", - "https_proxy": "{{env `https_proxy`}}", - "iso_checksum": "3ecde213fabd4d8ebec02b745970942c177793c939ef6e3fe679a436bf2e104d", - "iso_checksum_type": "sha256", - "iso_name": "debian-9.9.0-ppc64el-netinst.iso", - "memory": "1024", - "mirror": "http://cdimage.debian.org/cdimage/archive", - "mirror_directory": "9.9.0/ppc64el/iso-cd", - "name": "debian-9.9", - "no_proxy": "{{env `no_proxy`}}", - "preseed_path": "debian-9/preseed.cfg", - "template": "debian-9.9-ppc64el", - "version": "TIMESTAMP" - } -} From f680d98ae16f31522b95469c6d1eb80f15d0ea1b Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Thu, 3 Oct 2019 13:20:49 -0700 Subject: [PATCH 1017/1622] Update Debian 9 PPC to 9.11 Signed-off-by: Tim Smith <tsmith@chef.io> --- .../debian/debian-9.11-ppc64el.json | 102 ++++++++++++++++++ 1 file changed, 102 insertions(+) create mode 100644 packer_templates/debian/debian-9.11-ppc64el.json diff --git a/packer_templates/debian/debian-9.11-ppc64el.json b/packer_templates/debian/debian-9.11-ppc64el.json new file mode 100644 index 000000000..39bbf5fcd --- /dev/null +++ b/packer_templates/debian/debian-9.11-ppc64el.json @@ -0,0 +1,102 @@ +{ + "builders": [ + { + "boot_command": [ + "c<wait>", + "setparams 'Automated install'<enter><wait>", + "<enter><wait>", + "set options=\" preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}} <wait>", + "debian-installer=en_US.UTF-8 <wait>", + "auto <wait>", + "locale=en_US.UTF-8 <wait>", + "kbd-chooser/method=us <wait>", + "keyboard-configuration/xkb-keymap=us <wait>", + "netcfg/get_hostname={{ .Name }} <wait>", + "netcfg/get_domain=vagrantup.com <wait>", + "fb=false <wait>", + "debconf/frontend=noninteractive <wait>", + "console-setup/ask_detect=false <wait>", + "console-keymaps-at/keymap=us <wait>", + "grub-installer/bootdev=/dev/vda1 <wait>", + "\"", + "<enter><wait>", + "boot_one<wait>", + "<enter><wait>", + "boot<enter>" + ], + "boot_wait": "10s", + "disk_size": "{{user `disk_size`}}", + "headless": "{{ user `headless` }}", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "../../builds/packer-{{user `template`}}-qemu", + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "qemu", + "qemu_binary": "qemu-system-ppc64le", + "machine_type": "pseries", + "use_default_display": true, + "accelerator": "kvm", + "vm_name": "{{ user `template` }}" + } + ], + "post-processors": [ + { + "output": "../../builds/{{user `box_basename`}}.{{.Provider}}.box", + "type": "vagrant" + } + ], + "provisioners": [ + { + "environment_vars": [ + "HOME_DIR=/home/vagrant", + "http_proxy={{user `http_proxy`}}", + "https_proxy={{user `https_proxy`}}", + "no_proxy={{user `no_proxy`}}" + ], + "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", + "expect_disconnect": true, + "scripts": [ + "scripts/update.sh", + "../_common/motd.sh", + "../_common/sshd.sh", + "scripts/networking.sh", + "scripts/sudoers.sh", + "../_common/vagrant.sh", + "scripts/systemd.sh", + "../_common/virtualbox.sh", + "../_common/vmware.sh", + "../_common/parallels.sh", + "scripts/cleanup.sh", + "../_common/minimize.sh" + ], + "type": "shell" + } + ], + "variables": { + "box_basename": "debian-9.11", + "build_timestamp": "{{isotime \"20060102150405\"}}", + "cpus": "1", + "disk_size": "65536", + "git_revision": "__unknown_git_revision__", + "headless": "", + "http_proxy": "{{env `http_proxy`}}", + "https_proxy": "{{env `https_proxy`}}", + "iso_checksum": "5d785af424e0259474f48bf55c5bf7aee19a945fdd74a3eb765f1c55f83cb554", + "iso_checksum_type": "sha256", + "iso_name": "debian-9.11.0-ppc64el-netinst.iso", + "memory": "1024", + "mirror": "http://cdimage.debian.org/cdimage/archive", + "mirror_directory": "9.11.0/ppc64el/iso-cd", + "name": "debian-9.11", + "no_proxy": "{{env `no_proxy`}}", + "preseed_path": "debian-9/preseed.cfg", + "template": "debian-9.11-ppc64el", + "version": "TIMESTAMP" + } +} From ac442a5e0c680e9e4d57e35ad018bf846298a93c Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Thu, 3 Oct 2019 13:58:35 -0700 Subject: [PATCH 1018/1622] Skip network optimization on RHEL 8 for now Signed-off-by: Tim Smith <tsmith@chef.io> --- packer_templates/centos/scripts/networking.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packer_templates/centos/scripts/networking.sh b/packer_templates/centos/scripts/networking.sh index e61cf3502..2c926183c 100644 --- a/packer_templates/centos/scripts/networking.sh +++ b/packer_templates/centos/scripts/networking.sh @@ -5,7 +5,7 @@ case "$PACKER_BUILDER_TYPE" in virtualbox-iso|virtualbox-ovf) major_version="`sed 's/^.\+ release \([.0-9]\+\).*/\1/' /etc/redhat-release | awk -F. '{print $1}'`"; - if [ "$major_version" -ge 6 ]; then + if [ "$major_version" -ge 6 -lt 8 ]; then # this fails on RHEL 8 so until we have a workaround just skip it # Fix slow DNS: # Add 'single-request-reopen' so it is included when /etc/resolv.conf is # generated From 20ac8bc82ed1bc5ad760fb65b307e15ed3e0ce67 Mon Sep 17 00:00:00 2001 From: "Christopher A. Snapp" <csnapp@chef.io> Date: Thu, 18 Jul 2019 10:27:42 -0400 Subject: [PATCH 1019/1622] add rhel 8 support Signed-off-by: Christopher A. Snapp <csnapp@chef.io> --- packer_templates/centos/http/8/ks.cfg | 5 +- packer_templates/centos/scripts/cleanup.sh | 13 +- packer_templates/centos/scripts/networking.sh | 13 +- packer_templates/rhel/rhel-8.0-x86_64.json | 178 ++++++++++++++++++ 4 files changed, 204 insertions(+), 5 deletions(-) create mode 100644 packer_templates/rhel/rhel-8.0-x86_64.json diff --git a/packer_templates/centos/http/8/ks.cfg b/packer_templates/centos/http/8/ks.cfg index 0b62d719a..bd918af8b 100644 --- a/packer_templates/centos/http/8/ks.cfg +++ b/packer_templates/centos/http/8/ks.cfg @@ -34,6 +34,9 @@ net-tools bzip2 deltarpm rsync +dnf-utils +redhat-lsb-core +elfutils-libelf-devel -fprintd-pam -intltool @@ -68,7 +71,7 @@ chmod 0440 /etc/sudoers.d/vagrant #Enable hyper-v daemons only if using hyper-v virtualization if [ $(virt-what) == "hyperv" ]; then - yum -y install hyperv-daemons cifs-utils + dnf -y install hyperv-daemons cifs-utils systemctl enable hypervvssd systemctl enable hypervkvpd fi diff --git a/packer_templates/centos/scripts/cleanup.sh b/packer_templates/centos/scripts/cleanup.sh index bd677c772..271f6eb06 100644 --- a/packer_templates/centos/scripts/cleanup.sh +++ b/packer_templates/centos/scripts/cleanup.sh @@ -3,6 +3,8 @@ # should output one of 'redhat' 'centos' 'oraclelinux' distro="`rpm -qf --queryformat '%{NAME}' /etc/redhat-release | cut -f 1 -d '-'`" +major_version="`sed 's/^.\+ release \([.0-9]\+\).*/\1/' /etc/redhat-release | awk -F. '{print $1}'`"; + # Remove development and kernel source packages yum -y remove gcc cpp kernel-devel kernel-headers; @@ -61,8 +63,15 @@ find /var/log/ -name *.log -exec rm -f {} \; # remove previous kernels that yum preserved for rollback # yum-utils isn't in RHEL 5 so don't try to run this if ! lsb_release -a | grep -qE '^Release:\s*5'; then - yum install -y yum-utils - package-cleanup --oldkernels --count=1 -y + if ! command -v package-cleanup >/dev/null 2>&1; then + yum install -y yum-utils + fi + + if [ "$major_version" -ge 8 ]; then + dnf remove -y $(dnf repoquery --installonly --latest-limit=-1 -q) + else + package-cleanup --oldkernels --count=1 -y + fi fi # we try to remove these in the ks file, but they're still there diff --git a/packer_templates/centos/scripts/networking.sh b/packer_templates/centos/scripts/networking.sh index 2c926183c..516ee19b4 100644 --- a/packer_templates/centos/scripts/networking.sh +++ b/packer_templates/centos/scripts/networking.sh @@ -5,13 +5,22 @@ case "$PACKER_BUILDER_TYPE" in virtualbox-iso|virtualbox-ovf) major_version="`sed 's/^.\+ release \([.0-9]\+\).*/\1/' /etc/redhat-release | awk -F. '{print $1}'`"; - if [ "$major_version" -ge 6 -lt 8 ]; then # this fails on RHEL 8 so until we have a workaround just skip it + if [ "$major_version" -ge 6 ]; then # Fix slow DNS: # Add 'single-request-reopen' so it is included when /etc/resolv.conf is # generated # https://access.redhat.com/site/solutions/58625 (subscription required) + echo 'RES_OPTIONS="single-request-reopen"' >>/etc/sysconfig/network; - service network restart; + + if [ "$major_version" -ge 8 ]; then + nmcli networking off + sleep 5 + nmcli networking on + else + service network restart; + fi + echo 'Slow DNS fix applied (single-request-reopen)'; fi ;; diff --git a/packer_templates/rhel/rhel-8.0-x86_64.json b/packer_templates/rhel/rhel-8.0-x86_64.json new file mode 100644 index 000000000..c48ac141d --- /dev/null +++ b/packer_templates/rhel/rhel-8.0-x86_64.json @@ -0,0 +1,178 @@ +{ + "builders": [ + { + "boot_command": [ + "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": "{{user `disk_size`}}", + "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "guest_os_type": "RedHat_64", + "hard_drive_interface": "sata", + "headless": "{{ user `headless` }}", + "http_directory": "../centos/http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "../../builds/packer-{{user `template`}}-virtualbox", + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "virtualbox-iso", + "vboxmanage": [ + [ + "modifyvm", + "{{.Name}}", + "--memory", + "{{ user `memory` }}" + ], + [ + "modifyvm", + "{{.Name}}", + "--cpus", + "{{ user `cpus` }}" + ] + ], + "virtualbox_version_file": ".vbox_version", + "vm_name": "{{ user `template` }}" + }, + { + "boot_command": [ + "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": "{{user `disk_size`}}", + "guest_os_type": "rhel8-64", + "headless": "{{ user `headless` }}", + "http_directory": "../centos/http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "../../builds/packer-{{user `template`}}-vmware", + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "tools_upload_flavor": "linux", + "type": "vmware-iso", + "vm_name": "{{ user `template` }}", + "vmx_data": { + "cpuid.coresPerSocket": "1", + "memsize": "{{ user `memory` }}", + "numvcpus": "{{ user `cpus` }}" + }, + "vmx_remove_ethernet_interfaces": true + }, + { + "boot_command": [ + "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": "{{user `disk_size`}}", + "guest_os_type": "rhel", + "http_directory": "../centos/http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "../../builds/packer-{{user `template`}}-parallels", + "parallels_tools_flavor": "lin", + "prlctl": [ + [ + "set", + "{{.Name}}", + "--memsize", + "{{ user `memory` }}" + ], + [ + "set", + "{{.Name}}", + "--cpus", + "{{ user `cpus` }}" + ] + ], + "prlctl_version_file": ".prlctl_version", + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "parallels-iso", + "vm_name": "{{ user `template` }}" + }, + { + "boot_command": [ + "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": "{{user `disk_size`}}", + "headless": "{{ user `headless` }}", + "http_directory": "../centos/http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "../../builds/packer-{{user `template`}}-qemu", + "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "qemu", + "vm_name": "{{ user `template` }}" + } + ], + "post-processors": [ + { + "output": "../../builds/{{user `box_basename`}}.{{.Provider}}.box", + "type": "vagrant" + } + ], + "provisioners": [ + { + "environment_vars": [ + "HOME_DIR=/home/vagrant", + "http_proxy={{user `http_proxy`}}", + "https_proxy={{user `https_proxy`}}", + "no_proxy={{user `no_proxy`}}" + ], + "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", + "expect_disconnect": true, + "scripts": [ + "../centos/scripts/networking.sh", + "../_common/motd.sh", + "../_common/sshd.sh", + "../_common/vagrant.sh", + "../_common/virtualbox.sh", + "../_common/vmware.sh", + "../_common/parallels.sh", + "../centos/scripts/cleanup.sh", + "../_common/minimize.sh" + ], + "type": "shell" + } + ], + "variables": { + "arch": "64", + "box_basename": "rhel-8.0", + "build_timestamp": "{{isotime \"20060102150405\"}}", + "cpus": "1", + "disk_size": "65536", + "git_revision": "__unknown_git_revision__", + "headless": "", + "http_proxy": "{{env `http_proxy`}}", + "https_proxy": "{{env `https_proxy`}}", + "iso_checksum": "005d4f88fff6d63b0fc01a10822380ef52570edd8834321de7be63002cc6cc43", + "iso_checksum_type": "sha256", + "iso_name": "rhel-8.0-x86_64-dvd.iso", + "ks_path": "8/ks.cfg", + "memory": "1024", + "mirror": "http://YOU-MUST-PROVIDE-YOUR-OWN-ISO.sorry", + "mirror_directory": "rhel", + "name": "rhel-8.0", + "no_proxy": "{{env `no_proxy`}}", + "template": "rhel-8.0-x86_64", + "version": "TIMESTAMP" + } +} From f5453827cf1566f70aa6681d4d7cc5c1b5887180 Mon Sep 17 00:00:00 2001 From: Lance Albertson <lance@osuosl.org> Date: Wed, 9 Oct 2019 10:33:43 -0700 Subject: [PATCH 1020/1622] Add network-scripts package for CentOS 8 This installs the legacy network scripts which Vagrant still requires it seems [1] for the ``network`` systemd service. The ``network-scripts`` package provides the ``network.service`` systemd unit which resolve the issue. That probably should be fixed upstream at some point to use ``nmcli`` or something else. [1] https://github.com/hashicorp/vagrant/blob/master/plugins/guests/pld/cap/change_host_name.rb#L22 Signed-off-by: Lance Albertson <lance@osuosl.org> --- packer_templates/centos/http/8/ks.cfg | 1 + 1 file changed, 1 insertion(+) diff --git a/packer_templates/centos/http/8/ks.cfg b/packer_templates/centos/http/8/ks.cfg index bd918af8b..36617d266 100644 --- a/packer_templates/centos/http/8/ks.cfg +++ b/packer_templates/centos/http/8/ks.cfg @@ -37,6 +37,7 @@ rsync dnf-utils redhat-lsb-core elfutils-libelf-devel +network-scripts -fprintd-pam -intltool From d2534418552ed4bc61328a38fac615909eeb61d0 Mon Sep 17 00:00:00 2001 From: Carlos Rodrigues <cer@brpx.com> Date: Sat, 19 Oct 2019 20:58:44 +0100 Subject: [PATCH 1021/1622] Fix ambiguous "eth" parameter on nmcli --- packer_templates/centos/scripts/cleanup.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packer_templates/centos/scripts/cleanup.sh b/packer_templates/centos/scripts/cleanup.sh index 271f6eb06..22fe55c55 100644 --- a/packer_templates/centos/scripts/cleanup.sh +++ b/packer_templates/centos/scripts/cleanup.sh @@ -48,7 +48,7 @@ done # add gateway interface connection. gwdev=\`nmcli dev | grep ethernet | egrep -v 'unmanaged' | head -n 1 | awk '{print \$1}'\` if [ "\$gwdev" != "" ]; then - nmcli c add type eth ifname \$gwdev con-name \$gwdev + nmcli connection add type ethernet ifname \$gwdev con-name \$gwdev fi sed -i "/^#BENTO-BEGIN/,/^#BENTO-END/d" /etc/rc.d/rc.local chmod -x /etc/rc.d/rc.local From aa42a142807f71d866a95f0a528473e5474c6c15 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Sat, 19 Oct 2019 16:41:06 -0700 Subject: [PATCH 1022/1622] Switch to shelling out for all vagrant uploads The vagrant cloud gem is pretty fundamentally broken. It does not allow uploading a box that is not directly owned by the user performing the upload. Since I'm not using the bento account directly, and that seems like a horrible idea, this won't work. Instead we can just shell out to the vagrant CLI to perform the uploads. The vagrant CLI also does a much better job of this. Other fixes: Simplifies how we handle slugs by just using a match on the name. This means we don't have to update the slug list with the exact versions to match on every time we bump the version. Signed-off-by: Tim Smith <tsmith@chef.io> --- Gemfile | 1 - builds.yml | 28 ++++++++------- lib/bento/common.rb | 28 +++++++++++---- lib/bento/providermetadata.rb | 1 + lib/bento/upload.rb | 68 +++++++++++++++++++++++------------ lib/bento/version.rb | 2 +- 6 files changed, 83 insertions(+), 45 deletions(-) diff --git a/Gemfile b/Gemfile index c5cec7e24..a004a6bde 100644 --- a/Gemfile +++ b/Gemfile @@ -4,5 +4,4 @@ group :development do gem "cookstyle" gem "rake", ">= 12" gem "mixlib-shellout", ">= 2.3.2" - gem "vagrant_cloud", "~> 2.0" end diff --git a/builds.yml b/builds.yml index 301906e55..34792c9f2 100644 --- a/builds.yml +++ b/builds.yml @@ -34,20 +34,22 @@ public: - 'ubuntu-18.10' - 'ubuntu-19.04' +# slug box name: text string from standard box name to match (generally the same) slugs: - 'centos-8': 'centos-8.0' - 'centos-7': 'centos-7.6' - 'centos-6': 'centos-6.10' - 'centos-5': 'centos-5.11' - 'debian-8': 'debian-8.11' - 'debian-9': 'debian-9.8' - 'debian-10': 'debian-10.0' - 'oracle-6': 'oracle-6.10' - 'oracle-7': 'oracle-7.6' - 'scientific-7': 'scientific-7.6' - 'freebsd-11': 'freebsd-11.3' - 'freebsd-12': 'freebsd-12.0' - 'opensuse-leap-15': 'opensuse-leap-15.1' + 'centos-8': 'centos-8' + 'centos-7': 'centos-7' + 'centos-6': 'centos-6' + 'centos-5': 'centos-5' + 'debian-8': 'debian-8' + 'debian-9': 'debian-9' + 'debian-10': 'debian-10' + 'oracle-6': 'oracle-6' + 'oracle-7': 'oracle-7' + 'scientific-7': 'scientific-7' + 'freebsd-11': 'freebsd-11' + 'freebsd-12': 'freebsd-12' + 'opensuse-leap-15': 'opensuse-leap-15' + 'fedora-latest': 'fedora-30' providers: - virtualbox-iso diff --git a/lib/bento/common.rb b/lib/bento/common.rb index bb692c9df..7fd93ed8f 100644 --- a/lib/bento/common.rb +++ b/lib/bento/common.rb @@ -3,16 +3,11 @@ require "json" require "tempfile" require "yaml" -require "vagrant_cloud" +require "mixlib/shellout" MEGABYTE = 1024.0 * 1024.0 module Common - def vc_account - raise "You must set the 'VAGRANT_CLOUD_ORG' and 'VAGRANT_CLOUD_TOKEN' tokens to interact with the Vagrant Cloud!" unless ENV["VAGRANT_CLOUD_ORG"] && ENV["VAGRANT_CLOUD_TOKEN"] - VagrantCloud::Account.new(ENV["VAGRANT_CLOUD_ORG"], ENV["VAGRANT_CLOUD_TOKEN"]) - end - def banner(msg) puts "==> #{msg}" end @@ -25,6 +20,25 @@ def warn(msg) puts ">>> #{msg}" end + # + # Shellout to vagrant CLI to see if we're logged into the cloud + # + # @return [Boolean] + # + def logged_in? + shellout = Mixlib::ShellOut.new("vagrant cloud auth whoami").run_command + + if shellout.error? + error_output = !shellout.stderr.empty? ? shellout.stderr : shellout.stdout + warn("Failed to shellout to vagrant to check the login status. Error: #{error_output}") + return false + end + + return true if shellout.stdout.match?(/Currently logged in/) + + false + end + def duration(total) total = 0 if total.nil? minutes = (total / 60).to_i @@ -37,7 +51,7 @@ def box_metadata(metadata_file) file = File.read(metadata_file) json = JSON.parse(file) - # metadata needed for upload: boxname, version, provider, box filename + # metadata needed for upload: boxname, version, provider, box filename metadata["name"] = json["name"] metadata["version"] = json["version"] metadata["box_basename"] = json["box_basename"] diff --git a/lib/bento/providermetadata.rb b/lib/bento/providermetadata.rb index d050d7ed2..6147dfd09 100644 --- a/lib/bento/providermetadata.rb +++ b/lib/bento/providermetadata.rb @@ -71,6 +71,7 @@ def ver_vmware def ver_parallels raise "Platform is not macOS, exiting..." unless macos? + cmd = Mixlib::ShellOut.new("prlctl --version") cmd.run_command cmd.stdout.split(" ")[2] diff --git a/lib/bento/upload.rb b/lib/bento/upload.rb index e19f90871..46482c5e3 100644 --- a/lib/bento/upload.rb +++ b/lib/bento/upload.rb @@ -9,41 +9,63 @@ def initialize(opts) @md_json = opts.md_json end + def error_unless_logged_in + warn("You cannot upload files to vagrant cloud unless the vagrant CLI is logged in. Run 'vagrant cloud auth login' first.") unless logged_in? + end + def start + error_unless_logged_in + banner("Starting uploads...") time = Benchmark.measure do files = md_json ? [md_json] : metadata_files files.each do |md_file| - upload(md_file) + upload_box(md_file) end end banner("Uploads finished in #{duration(time.real)}.") end - def upload(md_file) - puts "Attempting to upload #{md_file}" - md = box_metadata(md_file) - box_desc = "a bento box for #{md['name']}" - box = vc_account.ensure_box(md["name"], {short_description: box_desc, is_private: private_box?(md["name"])}) - box_ver = box.ensure_version(md["version"], File.read(md_file)) - - if builds_yml["slugs"].value?(box.name) - slug_desc = "a bento box for #{builds_yml['slugs'].key(box.name)}" - slug = vc_account.ensure_box(builds_yml["slugs"].key(box.name), {short_description: slug_desc, is_private: false}) - slug_ver = slug.ensure_version(md["version"], File.read(md_file)) + + # + # Upload all the boxes defined in the passed metadata file + # + # @param [String] md_file The path to the metadata file + # + # + def upload_box(md_file) + md_data = box_metadata(md_file) + + md_data['providers'].each_pair do |prov, prov_data| + banner("Uploading bento/#{md_data['name']} version:#{md_data['version']} provider:#{prov}...") + + upload_cmd = "vagrant cloud publish bento/#{md_data['name']} #{md_data['version']} #{prov} builds/#{prov_data['file']} --description '#{box_desc(md_data['name'])}' -f" + info "Would run #{upload_cmd}" + + slug_name = lookup_slug(md_data['name']) + unless slug_name.nil? + banner("Uploading slug bento/#{slug_name} from #{md_data['name']} version:#{md_data['version']} provider:#{prov}...") + upload_cmd = "vagrant cloud publish bento/#{slug_name} #{md_data['version']} #{prov} builds/#{prov_data['file']} --description '#{box_desc(slug_name)}' -f" + info "Would run #{upload_cmd}" + end end - md["providers"].each do |k, v| - provider = box_ver.ensure_provider(k, nil) - banner("Uploading #{box.name}/#{box_ver.version}/#{provider.name}...") - provider.upload_file("builds/#{v['file']}") - banner(provider.download_url.to_s) - next unless builds_yml["slugs"].value?(box.name) - - slug_provider = slug_ver.ensure_provider(k, nil) - banner("Uploading #{slug.name}/#{slug_ver.version}/#{slug_provider.name}...") - slug_provider.upload_file("builds/#{v['file']}") - banner(slug_provider.download_url.to_s) + # cmd = Mixlib::ShellOut.new("packer --version") + # cmd.run_command + end + + # + # Given a box name return a slug name or nil + # + # @return [String, NilClass] The slug name or nil + # + def lookup_slug(name) + builds_yml["slugs"].each_pair do |slug, match_string| + return slug if name.start_with?(match_string) end end + + def box_desc(name) + box_desc = "#{name.tr("-", " ").capitalize} Vagrant box created with Bento by Chef" + end end diff --git a/lib/bento/version.rb b/lib/bento/version.rb index 8e8ba24da..c4205bd56 100644 --- a/lib/bento/version.rb +++ b/lib/bento/version.rb @@ -1,3 +1,3 @@ module Bento - VERSION = "1.4.0".freeze + VERSION = "2.0.0".freeze end From 041713d75bac9f1b1e9fe7775f369458a95e90fe Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Sat, 19 Oct 2019 17:37:36 -0700 Subject: [PATCH 1023/1622] Add the actual shellout Signed-off-by: Tim Smith <tsmith@chef.io> --- lib/bento/common.rb | 7 +++++++ lib/bento/upload.rb | 7 ++----- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/lib/bento/common.rb b/lib/bento/common.rb index 7fd93ed8f..df35131f9 100644 --- a/lib/bento/common.rb +++ b/lib/bento/common.rb @@ -16,6 +16,13 @@ def info(msg) puts " #{msg}" end + def shellout(cmd) + info "Shelling out to run #{cmd}" + sout = Mixlib::ShellOut.new(cmd) + sout.live_stream = STDOUT + sout.run_command + end + def warn(msg) puts ">>> #{msg}" end diff --git a/lib/bento/upload.rb b/lib/bento/upload.rb index 46482c5e3..057cc582c 100644 --- a/lib/bento/upload.rb +++ b/lib/bento/upload.rb @@ -40,18 +40,15 @@ def upload_box(md_file) banner("Uploading bento/#{md_data['name']} version:#{md_data['version']} provider:#{prov}...") upload_cmd = "vagrant cloud publish bento/#{md_data['name']} #{md_data['version']} #{prov} builds/#{prov_data['file']} --description '#{box_desc(md_data['name'])}' -f" - info "Would run #{upload_cmd}" + shellout(upload_cmd) slug_name = lookup_slug(md_data['name']) unless slug_name.nil? banner("Uploading slug bento/#{slug_name} from #{md_data['name']} version:#{md_data['version']} provider:#{prov}...") upload_cmd = "vagrant cloud publish bento/#{slug_name} #{md_data['version']} #{prov} builds/#{prov_data['file']} --description '#{box_desc(slug_name)}' -f" - info "Would run #{upload_cmd}" + shellout(upload_cmd) end end - - # cmd = Mixlib::ShellOut.new("packer --version") - # cmd.run_command end # From e83fb1858b581d0b144bbf1bf2130802d738ca7d Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Sat, 19 Oct 2019 19:25:05 -0700 Subject: [PATCH 1024/1622] Add better descriptions on vagrantcloud.com Signed-off-by: Tim Smith <tsmith@chef.io> --- lib/bento/upload.rb | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/lib/bento/upload.rb b/lib/bento/upload.rb index 057cc582c..50bacc411 100644 --- a/lib/bento/upload.rb +++ b/lib/bento/upload.rb @@ -39,15 +39,14 @@ def upload_box(md_file) md_data['providers'].each_pair do |prov, prov_data| banner("Uploading bento/#{md_data['name']} version:#{md_data['version']} provider:#{prov}...") - upload_cmd = "vagrant cloud publish bento/#{md_data['name']} #{md_data['version']} #{prov} builds/#{prov_data['file']} --description '#{box_desc(md_data['name'])}' -f" + upload_cmd = "vagrant cloud publish bento/#{md_data['name']} #{md_data['version']} #{prov} builds/#{prov_data['file']} --description '#{box_desc(md_data['name'])}' --short-description '#{box_desc(md_data['name'])}' --version-description '#{ver_desc(md_data, prov)}' --force --release" shellout(upload_cmd) slug_name = lookup_slug(md_data['name']) - unless slug_name.nil? - banner("Uploading slug bento/#{slug_name} from #{md_data['name']} version:#{md_data['version']} provider:#{prov}...") - upload_cmd = "vagrant cloud publish bento/#{slug_name} #{md_data['version']} #{prov} builds/#{prov_data['file']} --description '#{box_desc(slug_name)}' -f" - shellout(upload_cmd) - end + next if slug_name.nil? + banner("Uploading slug bento/#{slug_name} from #{md_data['name']} version:#{md_data['version']} provider:#{prov}...") + upload_cmd = "vagrant cloud publish bento/#{slug_name} #{md_data['version']} #{prov} builds/#{prov_data['file']} --description '#{slug_desc(slug_name)}' --short-description '#{slug_desc(slug_name)}' --version-description '#{ver_desc(md_data, prov)}' --force --release" + shellout(upload_cmd) end end @@ -63,6 +62,14 @@ def lookup_slug(name) end def box_desc(name) - box_desc = "#{name.tr("-", " ").capitalize} Vagrant box created with Bento by Chef" + "#{name.tr("-", " ").capitalize} Vagrant box created with Bento by Chef" + end + + def slug_desc(name) + "#{name.tr("-", " ").capitalize}.x Vagrant box created with Bento by Chef. This box will be updated with the latest releases of #{name.tr("-", " ").capitalize} as they become available" + end + + def ver_desc(md_data, provider) + "#{md_data['name'].tr("-", " ").capitalize} Vagrant box version #{md_data['version']} created with Bento by Chef. Tool version: #{provider}: #{md_data['providers'][provider]['version']}" end end From e3ceaba60ab617909291f52683c26572389933d1 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Sun, 20 Oct 2019 09:15:38 -0700 Subject: [PATCH 1025/1622] Improve version description data on vagrantcloud Signed-off-by: Tim Smith <tsmith@chef.io> --- lib/bento/common.rb | 3 ++- lib/bento/upload.rb | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/lib/bento/common.rb b/lib/bento/common.rb index df35131f9..3f6a97e97 100644 --- a/lib/bento/common.rb +++ b/lib/bento/common.rb @@ -62,7 +62,8 @@ def box_metadata(metadata_file) metadata["name"] = json["name"] metadata["version"] = json["version"] metadata["box_basename"] = json["box_basename"] - metadata["tools"] = json["tools"] + metadata["packer"] = json["packer"] + metadata["vagrant"] = json["vagrant"] metadata["providers"] = {} json["providers"].each do |provider| metadata["providers"][provider["name"]] = provider.reject { |k, _| k == "name" } diff --git a/lib/bento/upload.rb b/lib/bento/upload.rb index 50bacc411..222c69a36 100644 --- a/lib/bento/upload.rb +++ b/lib/bento/upload.rb @@ -70,6 +70,6 @@ def slug_desc(name) end def ver_desc(md_data, provider) - "#{md_data['name'].tr("-", " ").capitalize} Vagrant box version #{md_data['version']} created with Bento by Chef. Tool version: #{provider}: #{md_data['providers'][provider]['version']}" + "#{md_data['name'].tr("-", " ").capitalize} Vagrant box version #{md_data['version']} created with Bento by Chef. Tool version: #{provider}: #{md_data['providers'][provider]['version']}, packer: #{md_data['packer']}, vagrant: #{md_data['vagrant']}" end end From 37dd8deeef6d57efc1479be6b07c62c6136b2aba Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Sun, 20 Oct 2019 09:16:10 -0700 Subject: [PATCH 1026/1622] Fix the Oracle Linux 6 ISO url The old URL is no longer around Signed-off-by: Tim Smith <tsmith@chef.io> --- packer_templates/oraclelinux/oracle-6.10-i386.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packer_templates/oraclelinux/oracle-6.10-i386.json b/packer_templates/oraclelinux/oracle-6.10-i386.json index 6b520fe75..1190ec617 100644 --- a/packer_templates/oraclelinux/oracle-6.10-i386.json +++ b/packer_templates/oraclelinux/oracle-6.10-i386.json @@ -169,11 +169,11 @@ "iso_name": "OracleLinux-R6-U9-Server-i386-dvd.iso", "ks_path": "6/ks.cfg", "memory": "1024", - "mirror": "http://mirrors.kernel.org/oracle/", + "mirror": "https://mirrors.dotsrc.org/oracle-linux", "mirror_directory": "OL6/U9/i386", "name": "oracle-6.10-i386", "no_proxy": "{{env `no_proxy`}}", "template": "oracle-6.10-i386", "version": "TIMESTAMP" } -} +} \ No newline at end of file From 0c4aea6302089fd6ee94636e915ae8c22a15eb3a Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Sun, 20 Oct 2019 09:16:27 -0700 Subject: [PATCH 1027/1622] Update Oracle Linux to 7.7 Signed-off-by: Tim Smith <tsmith@chef.io> --- ...acle-7.6-x86_64.json => oracle-7.7-x86_64.json} | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) rename packer_templates/oraclelinux/{oracle-7.6-x86_64.json => oracle-7.7-x86_64.json} (95%) diff --git a/packer_templates/oraclelinux/oracle-7.6-x86_64.json b/packer_templates/oraclelinux/oracle-7.7-x86_64.json similarity index 95% rename from packer_templates/oraclelinux/oracle-7.6-x86_64.json rename to packer_templates/oraclelinux/oracle-7.7-x86_64.json index 9cfa97bdb..42d74e687 100644 --- a/packer_templates/oraclelinux/oracle-7.6-x86_64.json +++ b/packer_templates/oraclelinux/oracle-7.7-x86_64.json @@ -156,7 +156,7 @@ ], "variables": { "arch": "64", - "box_basename": "oracle-7.6", + "box_basename": "oracle-7.7", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", "disk_size": "65536", @@ -164,16 +164,16 @@ "headless": "", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", - "iso_checksum": "a3156e9dc53ace74b81f6e37f284b74498057efd02babebd88aa2a51cc44d7e7", + "iso_checksum": "1d06cef6a518c32c0e7adcad0a99a8efbc7516066de41118ebf49002c15ea84d", "iso_checksum_type": "sha256", - "iso_name": "OracleLinux-R7-U6-Server-x86_64-dvd.iso", + "iso_name": "OracleLinux-R7-U7-Server-x86_64-dvd.iso", "ks_path": "7/ks.cfg", "memory": "1024", "mirror": "http://mirrors.dotsrc.org/oracle-linux", - "mirror_directory": "OL7/u6/x86_64", - "name": "oracle-7.6", + "mirror_directory": "OL7/u7/x86_64", + "name": "oracle-7.7", "no_proxy": "{{env `no_proxy`}}", - "template": "oracle-7.6-x86_64", + "template": "oracle-7.7-x86_64", "version": "TIMESTAMP" } -} +} \ No newline at end of file From 65157b752ee7456c2d88d651574ebc2aae1184f0 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Sun, 20 Oct 2019 09:33:23 -0700 Subject: [PATCH 1028/1622] Don't match the i386 boxes for slugs Signed-off-by: Tim Smith <tsmith@chef.io> --- lib/bento/upload.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/bento/upload.rb b/lib/bento/upload.rb index 222c69a36..d8169c492 100644 --- a/lib/bento/upload.rb +++ b/lib/bento/upload.rb @@ -57,8 +57,9 @@ def upload_box(md_file) # def lookup_slug(name) builds_yml["slugs"].each_pair do |slug, match_string| - return slug if name.start_with?(match_string) + return slug if name.start_with?(match_string) && !name.include?('i386') end + return nil end def box_desc(name) From b11a07f51c9f5ea0a58a1c56738ce4c504709844 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Sun, 20 Oct 2019 10:13:14 -0700 Subject: [PATCH 1029/1622] Build scientific using the full name Signed-off-by: Tim Smith <tsmith@chef.io> --- packer_templates/scientificlinux/scientific-7.6-x86_64.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packer_templates/scientificlinux/scientific-7.6-x86_64.json b/packer_templates/scientificlinux/scientific-7.6-x86_64.json index f6a1f58aa..c2b9ba9b4 100644 --- a/packer_templates/scientificlinux/scientific-7.6-x86_64.json +++ b/packer_templates/scientificlinux/scientific-7.6-x86_64.json @@ -69,7 +69,7 @@ } ], "variables": { - "box_basename": "SL-7.6", + "box_basename": "scientific-7.6", "build_timestamp": "{{isotime \"20080506150405\"}}", "cpus": "1", "disk_size": "65536", @@ -86,7 +86,7 @@ "memory": "1024", "mirror": "http://www.gtlib.gatech.edu/pub/scientific", "mirror_directory": "7.6/x86_64/iso", - "name": "SL-7.6", + "name": "scientific-7.6", "no_proxy": "{{env `no_proxy`}}", "template": "scientific-7-x86_64", "version": "TIMESTAMP" From b0a78f9f6dde45974c4b0eb5333a7879171571e4 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Sun, 20 Oct 2019 10:13:31 -0700 Subject: [PATCH 1030/1622] Minor tweak to the version information Signed-off-by: Tim Smith <tsmith@chef.io> --- lib/bento/upload.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/bento/upload.rb b/lib/bento/upload.rb index d8169c492..6f0f193fa 100644 --- a/lib/bento/upload.rb +++ b/lib/bento/upload.rb @@ -71,6 +71,6 @@ def slug_desc(name) end def ver_desc(md_data, provider) - "#{md_data['name'].tr("-", " ").capitalize} Vagrant box version #{md_data['version']} created with Bento by Chef. Tool version: #{provider}: #{md_data['providers'][provider]['version']}, packer: #{md_data['packer']}, vagrant: #{md_data['vagrant']}" + "#{md_data['name'].tr("-", " ").capitalize} Vagrant box version #{md_data['version']} created with Bento by Chef. Tool versions: #{provider}: #{md_data['providers'][provider]['version']}, packer: #{md_data['packer']}, vagrant: #{md_data['vagrant']}" end end From ee03eefb4df84791a78491135978a8634ad85e0d Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Sun, 20 Oct 2019 16:31:38 -0700 Subject: [PATCH 1031/1622] Update scientific linux to 7.7 Signed-off-by: Tim Smith <tsmith@chef.io> --- ...entific-7.6-x86_64.json => scientific-7.7-x86_64.json} | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) rename packer_templates/scientificlinux/{scientific-7.6-x86_64.json => scientific-7.7-x86_64.json} (93%) diff --git a/packer_templates/scientificlinux/scientific-7.6-x86_64.json b/packer_templates/scientificlinux/scientific-7.7-x86_64.json similarity index 93% rename from packer_templates/scientificlinux/scientific-7.6-x86_64.json rename to packer_templates/scientificlinux/scientific-7.7-x86_64.json index c2b9ba9b4..8db014655 100644 --- a/packer_templates/scientificlinux/scientific-7.6-x86_64.json +++ b/packer_templates/scientificlinux/scientific-7.7-x86_64.json @@ -69,7 +69,7 @@ } ], "variables": { - "box_basename": "scientific-7.6", + "box_basename": "scientific-7.7", "build_timestamp": "{{isotime \"20080506150405\"}}", "cpus": "1", "disk_size": "65536", @@ -79,14 +79,14 @@ "https_proxy": "{{env `https_proxy`}}", "hyperv_generation": "1", "hyperv_switch": "{{env `hyperv_switch`}}", - "iso_checksum": "2fdecb713bdaf3e253a9b8a11c54be6d17be38bb0c59b4346ff23a10c249bed1", + "iso_checksum": "4490f72797834a958396af929c0da6a97a69049eddbfe969a8903b5ce0fddb99", "iso_checksum_type": "sha256", "iso_name": "SL-7-DVD-x86_64.iso", "ks_path": "7/ks.cfg", "memory": "1024", "mirror": "http://www.gtlib.gatech.edu/pub/scientific", - "mirror_directory": "7.6/x86_64/iso", - "name": "scientific-7.6", + "mirror_directory": "7.7/x86_64/iso", + "name": "scientific-7.7", "no_proxy": "{{env `no_proxy`}}", "template": "scientific-7-x86_64", "version": "TIMESTAMP" From c23d9bf92d59f00c2d882367043a8c8c142b4f7c Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Sun, 20 Oct 2019 16:54:00 -0700 Subject: [PATCH 1032/1622] Update the builds to the current list Signed-off-by: Tim Smith <tsmith@chef.io> --- builds.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/builds.yml b/builds.yml index 34792c9f2..d022b130b 100644 --- a/builds.yml +++ b/builds.yml @@ -1,17 +1,18 @@ --- public: +- 'amazon-2' - 'centos-5.11-i386' - 'centos-5.11' - 'centos-6.10-i386' - 'centos-6.10' -- 'centos-7.6' +- 'centos-7.7' - 'centos-8.0' - 'debian-8.11-i386' - 'debian-8.11' -- 'debian-9.9-i386' -- 'debian-9.9' -- 'debian-10.0-i386' -- 'debian-10.0' +- 'debian-9.11-i386' +- 'debian-9.11' +- 'debian-10.1-i386' +- 'debian-10.1' - 'fedora-29' - 'fedora-30' - 'freebsd-11.2-i386' @@ -20,14 +21,13 @@ public: - 'freebsd-11.3' - 'freebsd-12.0-i386' - 'freebsd-12.0' -- 'hardenedbsd-11' - 'opensuse-leap-15.1' - 'oracle-5.11-i386' - 'oracle-5.11' - 'oracle-6.10-i386' - 'oracle-6.10' -- 'oracle-7.6' -- 'scientific-7.6' +- 'oracle-7.7' +- 'scientific-7.7' - 'ubuntu-16.04-i386' - 'ubuntu-16.04' - 'ubuntu-18.04' From abb793dc7dd19142564060313ab8f7ba6747f164 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Sun, 20 Oct 2019 17:50:53 -0700 Subject: [PATCH 1033/1622] Move the files when we're done with the upload Signed-off-by: Tim Smith <tsmith@chef.io> --- lib/bento/upload.rb | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/lib/bento/upload.rb b/lib/bento/upload.rb index 6f0f193fa..b14d69ca0 100644 --- a/lib/bento/upload.rb +++ b/lib/bento/upload.rb @@ -47,7 +47,13 @@ def upload_box(md_file) banner("Uploading slug bento/#{slug_name} from #{md_data['name']} version:#{md_data['version']} provider:#{prov}...") upload_cmd = "vagrant cloud publish bento/#{slug_name} #{md_data['version']} #{prov} builds/#{prov_data['file']} --description '#{slug_desc(slug_name)}' --short-description '#{slug_desc(slug_name)}' --version-description '#{ver_desc(md_data, prov)}' --force --release" shellout(upload_cmd) + + # move the box file to the completed directory + FileUtils.mv(File.join('builds', prov_data['file']), File.join('builds', 'uploaded', prov_data['file'])) end + + # move the metadata file to the completed directory + FileUtils.mv(md_file, File.join('builds', 'uploaded', File.basename(md_file))) end # From 0ae39a235eba98a28a902017b19fd3e2ed563869 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Sun, 20 Oct 2019 18:04:20 -0700 Subject: [PATCH 1034/1622] If metadata defines a box that isn't there then warn, but don't fail Signed-off-by: Tim Smith <tsmith@chef.io> --- lib/bento/upload.rb | 30 +++++++++++++++++------------- 1 file changed, 17 insertions(+), 13 deletions(-) diff --git a/lib/bento/upload.rb b/lib/bento/upload.rb index b14d69ca0..17f20fcce 100644 --- a/lib/bento/upload.rb +++ b/lib/bento/upload.rb @@ -37,19 +37,23 @@ def upload_box(md_file) md_data = box_metadata(md_file) md_data['providers'].each_pair do |prov, prov_data| - banner("Uploading bento/#{md_data['name']} version:#{md_data['version']} provider:#{prov}...") - - upload_cmd = "vagrant cloud publish bento/#{md_data['name']} #{md_data['version']} #{prov} builds/#{prov_data['file']} --description '#{box_desc(md_data['name'])}' --short-description '#{box_desc(md_data['name'])}' --version-description '#{ver_desc(md_data, prov)}' --force --release" - shellout(upload_cmd) - - slug_name = lookup_slug(md_data['name']) - next if slug_name.nil? - banner("Uploading slug bento/#{slug_name} from #{md_data['name']} version:#{md_data['version']} provider:#{prov}...") - upload_cmd = "vagrant cloud publish bento/#{slug_name} #{md_data['version']} #{prov} builds/#{prov_data['file']} --description '#{slug_desc(slug_name)}' --short-description '#{slug_desc(slug_name)}' --version-description '#{ver_desc(md_data, prov)}' --force --release" - shellout(upload_cmd) - - # move the box file to the completed directory - FileUtils.mv(File.join('builds', prov_data['file']), File.join('builds', 'uploaded', prov_data['file'])) + if File.exist?(File.join('builds', prov_data['file'])) + banner("Uploading bento/#{md_data['name']} version:#{md_data['version']} provider:#{prov}...") + + upload_cmd = "vagrant cloud publish bento/#{md_data['name']} #{md_data['version']} #{prov} builds/#{prov_data['file']} --description '#{box_desc(md_data['name'])}' --short-description '#{box_desc(md_data['name'])}' --version-description '#{ver_desc(md_data, prov)}' --force --release" + shellout(upload_cmd) + + slug_name = lookup_slug(md_data['name']) + next if slug_name.nil? + banner("Uploading slug bento/#{slug_name} from #{md_data['name']} version:#{md_data['version']} provider:#{prov}...") + upload_cmd = "vagrant cloud publish bento/#{slug_name} #{md_data['version']} #{prov} builds/#{prov_data['file']} --description '#{slug_desc(slug_name)}' --short-description '#{slug_desc(slug_name)}' --version-description '#{ver_desc(md_data, prov)}' --force --release" + shellout(upload_cmd) + + # move the box file to the completed directory + FileUtils.mv(File.join('builds', prov_data['file']), File.join('builds', 'uploaded', prov_data['file'])) + else # box in metadata isn't on disk + warn "The #{prov} box defined in the metadata file #{md_file} does not exist at builds/#{prov_data['file']}. Skipping!" + end end # move the metadata file to the completed directory From 6168c3e71a7297ada7dad8bf5e928efef30d9b77 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Sun, 20 Oct 2019 19:14:50 -0700 Subject: [PATCH 1035/1622] Remove support for FreeBSD < 11 This was put in to allow the 10.3 templates to work. Those are gone now Signed-off-by: Tim Smith <tsmith@chef.io> --- packer_templates/freebsd/scripts/minimize.sh | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/packer_templates/freebsd/scripts/minimize.sh b/packer_templates/freebsd/scripts/minimize.sh index 4b041948f..6e557815f 100644 --- a/packer_templates/freebsd/scripts/minimize.sh +++ b/packer_templates/freebsd/scripts/minimize.sh @@ -4,14 +4,7 @@ case "$PACKER_BUILDER_TYPE" in qemu) exit 0 ;; esac -major_version="`uname -r | awk -F. '{print $1}'`"; - -if [ "$major_version" -eq 10 ]; then - ZROOT="zroot" -else - ZROOT="zroot/ROOT/default" -fi - +ZROOT="zroot/ROOT/default" COMPRESSION=$(zfs get -H compression $ZROOT | cut -f3); zfs set compression=off $ZROOT; From 3a932257e317aaf6eb4be273671657f3a9b06b3f Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Sun, 20 Oct 2019 23:15:20 -0700 Subject: [PATCH 1036/1622] Make sure sbin is in the path when setting up vmware tools It's not on RHEL boxes and this breaks the world in the perl script for the tools. Signed-off-by: Tim Smith <tsmith@chef.io> --- packer_templates/_common/vmware.sh | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/packer_templates/_common/vmware.sh b/packer_templates/_common/vmware.sh index 33e949698..ae1d874b9 100644 --- a/packer_templates/_common/vmware.sh +++ b/packer_templates/_common/vmware.sh @@ -5,6 +5,11 @@ HOME_DIR="${HOME_DIR:-/home/vagrant}"; case "$PACKER_BUILDER_TYPE" in vmware-iso|vmware-vmx) + + # make sure we have /sbin in our path. RHEL systems lack this + PATH=/sbin:$PATH + export PATH + mkdir -p /tmp/vmware; mkdir -p /tmp/vmware-archive; mount -o loop $HOME_DIR/linux.iso /tmp/vmware; From b4791d24841b43bf1d3599d429ad8f67f8e8935c Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Mon, 21 Oct 2019 09:40:42 -0700 Subject: [PATCH 1037/1622] Remove FreeBSD 11.2 templates It goes EOL at the end of this month Signed-off-by: Tim Smith <tsmith@chef.io> --- .../freebsd/freebsd-11.2-amd64.json | 230 ------------------ .../freebsd/freebsd-11.2-i386.json | 230 ------------------ 2 files changed, 460 deletions(-) delete mode 100644 packer_templates/freebsd/freebsd-11.2-amd64.json delete mode 100644 packer_templates/freebsd/freebsd-11.2-i386.json diff --git a/packer_templates/freebsd/freebsd-11.2-amd64.json b/packer_templates/freebsd/freebsd-11.2-amd64.json deleted file mode 100644 index 6ffd10d07..000000000 --- a/packer_templates/freebsd/freebsd-11.2-amd64.json +++ /dev/null @@ -1,230 +0,0 @@ -{ - "builders": [ - { - "boot_command": [ - "<esc><wait>", - "boot -s<wait>", - "<enter><wait>", - "<wait10><wait10>", - "/bin/sh<enter><wait>", - "mdmfs -s 100m md1 /tmp<enter><wait>", - "mdmfs -s 100m md2 /mnt<enter><wait>", - "dhclient -l /tmp/dhclient.lease.em0 em0<enter><wait>", - "fetch -o /tmp/installerconfig http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} && bsdinstall script /tmp/installerconfig<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "guest_additions_mode": "disable", - "guest_os_type": "FreeBSD_64", - "headless": "{{ user `headless` }}", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../../builds/packer-{{user `template`}}-virtualbox", - "shutdown_command": "echo 'vagrant' | su -m root -c 'shutdown -p now'", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "virtualbox-iso", - "vboxmanage": [ - [ - "modifyvm", - "{{.Name}}", - "--memory", - "{{ user `memory` }}" - ], - [ - "modifyvm", - "{{.Name}}", - "--cpus", - "{{ user `cpus` }}" - ] - ], - "virtualbox_version_file": ".vbox_version", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<esc><wait>", - "boot -s<wait>", - "<enter><wait>", - "<wait10><wait10>", - "/bin/sh<enter><wait>", - "mdmfs -s 100m md1 /tmp<enter><wait>", - "mdmfs -s 100m md2 /mnt<enter><wait>", - "dhclient -l /tmp/dhclient.lease.em0 em0<enter><wait>", - "<wait5>", - "fetch -o /tmp/installerconfig http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} && bsdinstall script /tmp/installerconfig<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "freebsd-64", - "headless": "{{ user `headless` }}", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../../builds/packer-{{user `template`}}-vmware", - "shutdown_command": "echo 'vagrant' | su -m root -c 'shutdown -p now'", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "vmware-iso", - "vm_name": "{{ user `template` }}", - "vmx_data": { - "cpuid.coresPerSocket": "1", - "memsize": "{{ user `memory` }}", - "numvcpus": "{{ user `cpus` }}" - }, - "vmx_remove_ethernet_interfaces": true - }, - { - "boot_command": [ - "<esc><wait>", - "boot -s<wait>", - "<enter><wait>", - "<wait10><wait10>", - "/bin/sh<enter><wait>", - "mdmfs -s 100m md1 /tmp<enter><wait>", - "mdmfs -s 100m md2 /mnt<enter><wait>", - "dhclient -l /tmp/dhclient.lease.em0 em0<enter><wait>", - "fetch -o /tmp/installerconfig http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} && bsdinstall script /tmp/installerconfig<enter><wait>" - ], - "boot_wait": "8s", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "freebsd", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../../builds/packer-{{user `template`}}-parallels", - "parallels_tools_mode": "disable", - "prlctl": [ - [ - "set", - "{{.Name}}", - "--memsize", - "{{ user `memory` }}" - ], - [ - "set", - "{{.Name}}", - "--cpus", - "{{ user `cpus` }}" - ], - [ - "set", - "{{.Name}}", - "--device-set", - "cdrom0", - "--iface", - "ide" - ], - [ - "set", - "{{.Name}}", - "--device-del", - "fdd0" - ], - [ - "set", - "{{.Name}}", - "--device-del", - "parallel0" - ] - ], - "prlctl_version_file": ".prlctl_version", - "shutdown_command": "echo 'vagrant' | su -m root -c 'shutdown -p now'", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "parallels-iso", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<esc><wait>", - "boot -s<wait>", - "<enter><wait>", - "<wait10><wait10>", - "/bin/sh<enter><wait>", - "mdmfs -s 100m md1 /tmp<enter><wait>", - "mdmfs -s 100m md2 /mnt<enter><wait>", - "dhclient -l /tmp/dhclient.lease.vtnet0 vtnet0<enter><wait>", - "fetch -o /tmp/installerconfig http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} && bsdinstall script /tmp/installerconfig<enter><wait>" - ], - "boot_wait": "7s", - "disk_size": "{{user `disk_size`}}", - "headless": "{{ user `headless` }}", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../../builds/packer-{{user `template`}}-qemu", - "shutdown_command": "echo 'vagrant' | su -m root -c 'shutdown -p now'", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "qemu", - "vm_name": "{{ user `template` }}" - } - ], - "post-processors": [ - { - "output": "../../builds/{{user `box_basename`}}.{{.Provider}}.box", - "type": "vagrant", - "vagrantfile_template": "vagrantfile_templates/freebsd.rb" - } - ], - "provisioners": [ - { - "environment_vars": [ - "HOME_DIR=/home/vagrant", - "http_proxy={{user `http_proxy`}}", - "https_proxy={{user `https_proxy`}}", - "no_proxy={{user `no_proxy`}}", - "pkg_branch={{user `pkg_branch`}}" - ], - "execute_command": "echo 'vagrant' | {{.Vars}} su -m root -c 'sh -eux {{.Path}}'", - "expect_disconnect": true, - "scripts": [ - "scripts/update.sh", - "scripts/postinstall.sh", - "scripts/sudoers.sh", - "../_common/vagrant.sh", - "scripts/vmtools.sh", - "scripts/cleanup.sh", - "scripts/minimize.sh" - ], - "type": "shell" - } - ], - "variables": { - "box_basename": "freebsd-11.2", - "build_timestamp": "{{isotime \"20060102150405\"}}", - "cpus": "1", - "disk_size": "65536", - "git_revision": "__unknown_git_revision__", - "headless": "", - "http_proxy": "{{env `http_proxy`}}", - "https_proxy": "{{env `https_proxy`}}", - "install_path": "freebsd-11/installerconfig", - "iso_checksum": "710d237907f1753dbfbecb1186e401d9635156eeef6914f24f632f3219e59d3b", - "iso_checksum_type": "sha256", - "iso_name": "FreeBSD-11.2-RELEASE-amd64-disc1.iso", - "memory": "1024", - "mirror": "https://download.freebsd.org/ftp", - "mirror_directory": "releases/amd64/amd64/ISO-IMAGES/11.2", - "name": "freebsd-11.2", - "no_proxy": "{{env `no_proxy`}}", - "pkg_branch": "quarterly", - "template": "freebsd-11.2-amd64", - "version": "TIMESTAMP" - } -} - diff --git a/packer_templates/freebsd/freebsd-11.2-i386.json b/packer_templates/freebsd/freebsd-11.2-i386.json deleted file mode 100644 index caadaae33..000000000 --- a/packer_templates/freebsd/freebsd-11.2-i386.json +++ /dev/null @@ -1,230 +0,0 @@ -{ - "builders": [ - { - "boot_command": [ - "<esc><wait>", - "boot -s<wait>", - "<enter><wait>", - "<wait10><wait10>", - "/bin/sh<enter><wait>", - "mdmfs -s 100m md1 /tmp<enter><wait>", - "mdmfs -s 100m md2 /mnt<enter><wait>", - "dhclient -l /tmp/dhclient.lease.em0 em0<enter><wait>", - "fetch -o /tmp/installerconfig http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} && bsdinstall script /tmp/installerconfig<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "guest_additions_mode": "disable", - "guest_os_type": "FreeBSD", - "headless": "{{ user `headless` }}", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../../builds/packer-{{user `template`}}-virtualbox", - "shutdown_command": "echo 'vagrant' | su -m root -c 'shutdown -p now'", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "virtualbox-iso", - "vboxmanage": [ - [ - "modifyvm", - "{{.Name}}", - "--memory", - "{{ user `memory` }}" - ], - [ - "modifyvm", - "{{.Name}}", - "--cpus", - "{{ user `cpus` }}" - ] - ], - "virtualbox_version_file": ".vbox_version", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<esc><wait>", - "boot -s<wait>", - "<enter><wait>", - "<wait10><wait10>", - "/bin/sh<enter><wait>", - "mdmfs -s 100m md1 /tmp<enter><wait>", - "mdmfs -s 100m md2 /mnt<enter><wait>", - "dhclient -l /tmp/dhclient.lease.em0 em0<enter><wait>", - "<wait5>", - "fetch -o /tmp/installerconfig http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} && bsdinstall script /tmp/installerconfig<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "freebsd", - "headless": "{{ user `headless` }}", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../../builds/packer-{{user `template`}}-vmware", - "shutdown_command": "echo 'vagrant' | su -m root -c 'shutdown -p now'", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "vmware-iso", - "vm_name": "{{ user `template` }}", - "vmx_data": { - "cpuid.coresPerSocket": "1", - "memsize": "{{ user `memory` }}", - "numvcpus": "{{ user `cpus` }}" - }, - "vmx_remove_ethernet_interfaces": true - }, - { - "boot_command": [ - "<esc><wait>", - "boot -s<wait>", - "<enter><wait>", - "<wait10><wait10>", - "/bin/sh<enter><wait>", - "mdmfs -s 100m md1 /tmp<enter><wait>", - "mdmfs -s 100m md2 /mnt<enter><wait>", - "dhclient -l /tmp/dhclient.lease.em0 em0<enter><wait>", - "fetch -o /tmp/installerconfig http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} && bsdinstall script /tmp/installerconfig<enter><wait>" - ], - "boot_wait": "8s", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "freebsd", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../../builds/packer-{{user `template`}}-parallels", - "parallels_tools_mode": "disable", - "prlctl": [ - [ - "set", - "{{.Name}}", - "--memsize", - "{{ user `memory` }}" - ], - [ - "set", - "{{.Name}}", - "--cpus", - "{{ user `cpus` }}" - ], - [ - "set", - "{{.Name}}", - "--device-set", - "cdrom0", - "--iface", - "ide" - ], - [ - "set", - "{{.Name}}", - "--device-del", - "fdd0" - ], - [ - "set", - "{{.Name}}", - "--device-del", - "parallel0" - ] - ], - "prlctl_version_file": ".prlctl_version", - "shutdown_command": "echo 'vagrant' | su -m root -c 'shutdown -p now'", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "parallels-iso", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<esc><wait>", - "boot -s<wait>", - "<enter><wait>", - "<wait10><wait10>", - "/bin/sh<enter><wait>", - "mdmfs -s 100m md1 /tmp<enter><wait>", - "mdmfs -s 100m md2 /mnt<enter><wait>", - "dhclient -l /tmp/dhclient.lease.vtnet0 vtnet0<enter><wait>", - "fetch -o /tmp/installerconfig http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} && bsdinstall script /tmp/installerconfig<enter><wait>" - ], - "boot_wait": "7s", - "disk_size": "{{user `disk_size`}}", - "headless": "{{ user `headless` }}", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../../builds/packer-{{user `template`}}-qemu", - "shutdown_command": "echo 'vagrant' | su -m root -c 'shutdown -p now'", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "qemu", - "vm_name": "{{ user `template` }}" - } - ], - "post-processors": [ - { - "output": "../../builds/{{user `box_basename`}}.{{.Provider}}.box", - "type": "vagrant", - "vagrantfile_template": "vagrantfile_templates/freebsd.rb" - } - ], - "provisioners": [ - { - "environment_vars": [ - "HOME_DIR=/home/vagrant", - "http_proxy={{user `http_proxy`}}", - "https_proxy={{user `https_proxy`}}", - "no_proxy={{user `no_proxy`}}", - "pkg_branch={{user `pkg_branch`}}" - ], - "execute_command": "echo 'vagrant' | {{.Vars}} su -m root -c 'sh -eux {{.Path}}'", - "expect_disconnect": true, - "scripts": [ - "scripts/update.sh", - "scripts/postinstall.sh", - "scripts/sudoers.sh", - "../_common/vagrant.sh", - "scripts/vmtools.sh", - "scripts/cleanup.sh", - "scripts/minimize.sh" - ], - "type": "shell" - } - ], - "variables": { - "box_basename": "freebsd-11.2-i386", - "build_timestamp": "{{isotime \"20060102150405\"}}", - "cpus": "1", - "disk_size": "40960", - "git_revision": "__unknown_git_revision__", - "headless": "", - "http_proxy": "{{env `http_proxy`}}", - "https_proxy": "{{env `https_proxy`}}", - "install_path": "freebsd-11/installerconfig", - "iso_checksum": "676ca4ca873b210a52a01c3c24fb2d114ea47ae77e7d86b445f459407d7a0a8d", - "iso_checksum_type": "sha256", - "iso_name": "FreeBSD-11.2-RELEASE-i386-disc1.iso", - "memory": "1024", - "mirror": "https://download.freebsd.org/ftp", - "mirror_directory": "releases/i386/i386/ISO-IMAGES/11.2", - "name": "freebsd-11.2-i386", - "no_proxy": "{{env `no_proxy`}}", - "pkg_branch": "quarterly", - "template": "freebsd-11.2-i386", - "version": "TIMESTAMP" - } -} - From 80b0b874b45348f21285e830c206e5ad8a7be81e Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Mon, 21 Oct 2019 13:25:57 -0700 Subject: [PATCH 1038/1622] Remove FreeBSD 11.2 from builds.yml Signed-off-by: Tim Smith <tsmith@chef.io> --- builds.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/builds.yml b/builds.yml index d022b130b..1e819cf49 100644 --- a/builds.yml +++ b/builds.yml @@ -15,8 +15,6 @@ public: - 'debian-10.1' - 'fedora-29' - 'fedora-30' -- 'freebsd-11.2-i386' -- 'freebsd-11.2' - 'freebsd-11.3-i386' - 'freebsd-11.3' - 'freebsd-12.0-i386' From 6db2bffad3eafe2e02a0d1120eb6ceff8992e7dd Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Mon, 21 Oct 2019 16:30:16 -0700 Subject: [PATCH 1039/1622] Update the codeowners to point to the new workstation team Signed-off-by: Tim Smith <tsmith@chef.io> --- .github/CODEOWNERS | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 67a82fe3c..7e02dca69 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -1,7 +1,5 @@ # Order is important. The last matching pattern has the most precedence. -* @chef/chef-workstation -.expeditor/** @chef/jex-team -README.md @chef/docs-team -RELEASE_NOTES.md @chef/docs-team -.github/ISSUE_TEMPLATE/** @chef/docs-team +* @chef/chef-workstation-owners @chef/chef-workstation-approvers @chef/chef-workstation-reviewers +.expeditor/ @chef/jex-team +*.md @chef/docs-team \ No newline at end of file From 0030de67810fb4ef1840f0c80df516c7f0eecbec Mon Sep 17 00:00:00 2001 From: Ali Rizvi-Santiago <arizvisa@gmail.com> Date: Wed, 30 Oct 2019 16:47:57 -0500 Subject: [PATCH 1040/1622] Updated all the packer_templates to use the memory and cpus options for the builders that support them. Signed-off-by: Ali Rizvi-Santiago <arizvisa@gmail.com> --- .../amazonlinux/amazon-2-x86_64.json | 16 +----- packer_templates/centos/centos-5.11-i386.json | 38 +++----------- .../centos/centos-5.11-x86_64.json | 38 +++----------- packer_templates/centos/centos-6.10-i386.json | 38 +++----------- .../centos/centos-6.10-x86_64.json | 38 +++----------- .../centos/centos-7.7-x86_64.json | 38 +++----------- .../centos/centos-8.0-x86_64.json | 38 +++----------- .../debian/debian-10.1-amd64.json | 38 +++----------- packer_templates/debian/debian-10.1-i386.json | 38 +++----------- .../debian/debian-8.11-amd64.json | 38 +++----------- packer_templates/debian/debian-8.11-i386.json | 38 +++----------- .../debian/debian-9.11-amd64.json | 38 +++----------- packer_templates/debian/debian-9.11-i386.json | 38 +++----------- packer_templates/fedora/fedora-29-x86_64.json | 50 ++++-------------- packer_templates/fedora/fedora-30-x86_64.json | 50 ++++-------------- .../freebsd/freebsd-11.3-amd64.json | 38 ++++---------- .../freebsd/freebsd-11.3-i386.json | 38 ++++---------- .../freebsd/freebsd-12.0-amd64.json | 38 ++++---------- .../freebsd/freebsd-12.0-i386.json | 38 ++++---------- .../hardenedbsd/hardenedbsd-11-amd64.json | 38 ++++---------- packer_templates/macos/macos-10.12.json | 34 +++--------- packer_templates/macos/macosx-10.11.json | 32 +++--------- .../opensuse/opensuse-leap-15.1-x86_64.json | 38 +++----------- .../oraclelinux/oracle-5.11-i386.json | 38 +++----------- .../oraclelinux/oracle-5.11-x86_64.json | 36 +++---------- .../oraclelinux/oracle-6.10-i386.json | 38 +++----------- .../oraclelinux/oracle-6.10-x86_64.json | 38 +++----------- .../oraclelinux/oracle-7.7-x86_64.json | 38 +++----------- packer_templates/rhel/rhel-5.11-i386.json | 38 +++----------- packer_templates/rhel/rhel-5.11-x86_64.json | 36 +++---------- packer_templates/rhel/rhel-6.10-i386.json | 38 +++----------- packer_templates/rhel/rhel-6.10-x86_64.json | 38 +++----------- packer_templates/rhel/rhel-7.6-x86_64.json | 38 +++----------- packer_templates/rhel/rhel-8.0-x86_64.json | 38 +++----------- packer_templates/sles/sles-11-sp4-x86_64.json | 38 +++----------- packer_templates/sles/sles-12-sp2-x86_64.json | 38 +++----------- packer_templates/sles/sles-12-sp3-x86_64.json | 38 +++----------- packer_templates/sles/sles-15-sp1.json | 38 +++----------- packer_templates/sles/sles-15.json | 38 +++----------- .../solaris/solaris-10.11-x86.json | 22 ++------ packer_templates/solaris/solaris-11-x86.json | 22 ++------ .../ubuntu/ubuntu-16.04-amd64.json | 50 ++++-------------- .../ubuntu/ubuntu-16.04-i386.json | 52 ++++--------------- .../ubuntu/ubuntu-18.04-amd64.json | 50 ++++-------------- .../ubuntu/ubuntu-18.10-amd64.json | 50 ++++-------------- .../ubuntu/ubuntu-19.04-amd64.json | 50 ++++-------------- packer_templates/windows/windows-10.json | 10 ++-- packer_templates/windows/windows-2008r2.json | 8 +-- packer_templates/windows/windows-2012r2.json | 14 ++--- packer_templates/windows/windows-2016.json | 12 +++-- packer_templates/windows/windows-2019.json | 12 +++-- packer_templates/windows/windows-7.json | 14 ++--- 52 files changed, 380 insertions(+), 1456 deletions(-) diff --git a/packer_templates/amazonlinux/amazon-2-x86_64.json b/packer_templates/amazonlinux/amazon-2-x86_64.json index 049f7e71c..acb89c763 100644 --- a/packer_templates/amazonlinux/amazon-2-x86_64.json +++ b/packer_templates/amazonlinux/amazon-2-x86_64.json @@ -12,20 +12,8 @@ "source_path": "amazon2.ovf", "ssh_username": "vagrant", "ssh_password": "vagrant", - "vboxmanage": [ - [ - "modifyvm", - "{{.Name}}", - "--memory", - "{{ user `memory` }}" - ], - [ - "modifyvm", - "{{.Name}}", - "--cpus", - "{{ user `cpus` }}" - ] - ], + "memory": "{{ user `memory` }}", + "cpus": "{{ user `cpus` }}", "virtualbox_version_file": ".vbox_version", "vm_name": "{{ user `template` }}" } diff --git a/packer_templates/centos/centos-5.11-i386.json b/packer_templates/centos/centos-5.11-i386.json index b314d2d03..46d6c39c4 100644 --- a/packer_templates/centos/centos-5.11-i386.json +++ b/packer_templates/centos/centos-5.11-i386.json @@ -21,20 +21,8 @@ "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", "type": "virtualbox-iso", - "vboxmanage": [ - [ - "modifyvm", - "{{.Name}}", - "--memory", - "{{ user `memory` }}" - ], - [ - "modifyvm", - "{{.Name}}", - "--cpus", - "1" - ] - ], + "memory": "{{ user `memory` }}", + "cpus": "{{ user `cpus` }}", "virtualbox_version_file": ".vbox_version", "vm_name": "{{ user `template` }}" }, @@ -59,10 +47,10 @@ "tools_upload_flavor": "linux", "type": "vmware-iso", "vm_name": "{{ user `template` }}", + "memory": "{{ user `memory` }}", + "cpus": "{{ user `cpus` }}", "vmx_data": { - "cpuid.coresPerSocket": "1", - "memsize": "{{ user `memory` }}", - "numvcpus": "{{ user `cpus` }}" + "cpuid.coresPerSocket": "1" }, "vmx_remove_ethernet_interfaces": true }, @@ -79,20 +67,8 @@ "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", "output_directory": "../../builds/packer-{{user `template`}}-parallels", "parallels_tools_flavor": "lin", - "prlctl": [ - [ - "set", - "{{.Name}}", - "--memsize", - "{{ user `memory` }}" - ], - [ - "set", - "{{.Name}}", - "--cpus", - "{{ user `cpus` }}" - ] - ], + "memory": "{{ user `memory` }}", + "cpus": "{{ user `cpus` }}", "prlctl_version_file": ".prlctl_version", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", diff --git a/packer_templates/centos/centos-5.11-x86_64.json b/packer_templates/centos/centos-5.11-x86_64.json index a0e99e577..cc3876837 100644 --- a/packer_templates/centos/centos-5.11-x86_64.json +++ b/packer_templates/centos/centos-5.11-x86_64.json @@ -21,20 +21,8 @@ "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", "type": "virtualbox-iso", - "vboxmanage": [ - [ - "modifyvm", - "{{.Name}}", - "--memory", - "{{ user `memory` }}" - ], - [ - "modifyvm", - "{{.Name}}", - "--cpus", - "1" - ] - ], + "memory": "{{ user `memory` }}", + "cpus": "{{ user `cpus` }}", "virtualbox_version_file": ".vbox_version", "vm_name": "{{ user `template` }}" }, @@ -59,10 +47,10 @@ "tools_upload_flavor": "linux", "type": "vmware-iso", "vm_name": "{{ user `template` }}", + "memory": "{{ user `memory` }}", + "cpus": "{{ user `cpus` }}", "vmx_data": { - "cpuid.coresPerSocket": "1", - "memsize": "{{ user `memory` }}", - "numvcpus": "{{ user `cpus` }}" + "cpuid.coresPerSocket": "1" }, "vmx_remove_ethernet_interfaces": true }, @@ -79,20 +67,8 @@ "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", "output_directory": "../../builds/packer-{{user `template`}}-parallels", "parallels_tools_flavor": "lin", - "prlctl": [ - [ - "set", - "{{.Name}}", - "--memsize", - "{{ user `memory` }}" - ], - [ - "set", - "{{.Name}}", - "--cpus", - "{{ user `cpus` }}" - ] - ], + "memory": "{{ user `memory` }}", + "cpus": "{{ user `cpus` }}", "prlctl_version_file": ".prlctl_version", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", diff --git a/packer_templates/centos/centos-6.10-i386.json b/packer_templates/centos/centos-6.10-i386.json index 2e0ccfed0..ea38ddac0 100644 --- a/packer_templates/centos/centos-6.10-i386.json +++ b/packer_templates/centos/centos-6.10-i386.json @@ -21,20 +21,8 @@ "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", "type": "virtualbox-iso", - "vboxmanage": [ - [ - "modifyvm", - "{{.Name}}", - "--memory", - "{{ user `memory` }}" - ], - [ - "modifyvm", - "{{.Name}}", - "--cpus", - "{{ user `cpus` }}" - ] - ], + "memory": "{{ user `memory` }}", + "cpus": "{{ user `cpus` }}", "virtualbox_version_file": ".vbox_version", "vm_name": "{{ user `template` }}" }, @@ -59,10 +47,10 @@ "tools_upload_flavor": "linux", "type": "vmware-iso", "vm_name": "{{ user `template` }}", + "memory": "{{ user `memory` }}", + "cpus": "{{ user `cpus` }}", "vmx_data": { - "cpuid.coresPerSocket": "1", - "memsize": "{{ user `memory` }}", - "numvcpus": "{{ user `cpus` }}" + "cpuid.coresPerSocket": "1" }, "vmx_remove_ethernet_interfaces": true }, @@ -79,20 +67,8 @@ "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", "output_directory": "../../builds/packer-{{user `template`}}-parallels", "parallels_tools_flavor": "lin", - "prlctl": [ - [ - "set", - "{{.Name}}", - "--memsize", - "{{ user `memory` }}" - ], - [ - "set", - "{{.Name}}", - "--cpus", - "{{ user `cpus` }}" - ] - ], + "memory": "{{ user `memory` }}", + "cpus": "{{ user `cpus` }}", "prlctl_version_file": ".prlctl_version", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", diff --git a/packer_templates/centos/centos-6.10-x86_64.json b/packer_templates/centos/centos-6.10-x86_64.json index 9d7676dc1..8d1cc5a43 100644 --- a/packer_templates/centos/centos-6.10-x86_64.json +++ b/packer_templates/centos/centos-6.10-x86_64.json @@ -21,20 +21,8 @@ "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", "type": "virtualbox-iso", - "vboxmanage": [ - [ - "modifyvm", - "{{.Name}}", - "--memory", - "{{ user `memory` }}" - ], - [ - "modifyvm", - "{{.Name}}", - "--cpus", - "{{ user `cpus` }}" - ] - ], + "memory": "{{ user `memory` }}", + "cpus": "{{ user `cpus` }}", "virtualbox_version_file": ".vbox_version", "vm_name": "{{ user `template` }}" }, @@ -59,10 +47,10 @@ "tools_upload_flavor": "linux", "type": "vmware-iso", "vm_name": "{{ user `template` }}", + "memory": "{{ user `memory` }}", + "cpus": "{{ user `cpus` }}", "vmx_data": { - "cpuid.coresPerSocket": "1", - "memsize": "{{ user `memory` }}", - "numvcpus": "{{ user `cpus` }}" + "cpuid.coresPerSocket": "1" }, "vmx_remove_ethernet_interfaces": true }, @@ -79,20 +67,8 @@ "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", "output_directory": "../../builds/packer-{{user `template`}}-parallels", "parallels_tools_flavor": "lin", - "prlctl": [ - [ - "set", - "{{.Name}}", - "--memsize", - "{{ user `memory` }}" - ], - [ - "set", - "{{.Name}}", - "--cpus", - "{{ user `cpus` }}" - ] - ], + "memory": "{{ user `memory` }}", + "cpus": "{{ user `cpus` }}", "prlctl_version_file": ".prlctl_version", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", diff --git a/packer_templates/centos/centos-7.7-x86_64.json b/packer_templates/centos/centos-7.7-x86_64.json index 15d8288f8..b4dcab140 100644 --- a/packer_templates/centos/centos-7.7-x86_64.json +++ b/packer_templates/centos/centos-7.7-x86_64.json @@ -21,20 +21,8 @@ "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", "type": "virtualbox-iso", - "vboxmanage": [ - [ - "modifyvm", - "{{.Name}}", - "--memory", - "{{ user `memory` }}" - ], - [ - "modifyvm", - "{{.Name}}", - "--cpus", - "{{ user `cpus` }}" - ] - ], + "memory": "{{ user `memory` }}", + "cpus": "{{ user `cpus` }}", "virtualbox_version_file": ".vbox_version", "vm_name": "{{ user `template` }}" }, @@ -59,10 +47,10 @@ "tools_upload_flavor": "linux", "type": "vmware-iso", "vm_name": "{{ user `template` }}", + "memory": "{{ user `memory` }}", + "cpus": "{{ user `cpus` }}", "vmx_data": { - "cpuid.coresPerSocket": "1", - "memsize": "{{ user `memory` }}", - "numvcpus": "{{ user `cpus` }}" + "cpuid.coresPerSocket": "1" }, "vmx_remove_ethernet_interfaces": true }, @@ -79,20 +67,8 @@ "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", "output_directory": "../../builds/packer-{{user `template`}}-parallels", "parallels_tools_flavor": "lin", - "prlctl": [ - [ - "set", - "{{.Name}}", - "--memsize", - "{{ user `memory` }}" - ], - [ - "set", - "{{.Name}}", - "--cpus", - "{{ user `cpus` }}" - ] - ], + "memory": "{{ user `memory` }}", + "cpus": "{{ user `cpus` }}", "prlctl_version_file": ".prlctl_version", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", diff --git a/packer_templates/centos/centos-8.0-x86_64.json b/packer_templates/centos/centos-8.0-x86_64.json index 3e5e5e0ba..2f03a5b0c 100644 --- a/packer_templates/centos/centos-8.0-x86_64.json +++ b/packer_templates/centos/centos-8.0-x86_64.json @@ -21,20 +21,8 @@ "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", "type": "virtualbox-iso", - "vboxmanage": [ - [ - "modifyvm", - "{{.Name}}", - "--memory", - "{{ user `memory` }}" - ], - [ - "modifyvm", - "{{.Name}}", - "--cpus", - "{{ user `cpus` }}" - ] - ], + "memory": "{{ user `memory` }}", + "cpus": "{{ user `cpus` }}", "virtualbox_version_file": ".vbox_version", "vm_name": "{{ user `template` }}" }, @@ -59,10 +47,10 @@ "tools_upload_flavor": "linux", "type": "vmware-iso", "vm_name": "{{ user `template` }}", + "memory": "{{ user `memory` }}", + "cpus": "{{ user `cpus` }}", "vmx_data": { - "cpuid.coresPerSocket": "1", - "memsize": "{{ user `memory` }}", - "numvcpus": "{{ user `cpus` }}" + "cpuid.coresPerSocket": "1" }, "vmx_remove_ethernet_interfaces": true }, @@ -79,20 +67,8 @@ "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", "output_directory": "../../builds/packer-{{user `template`}}-parallels", "parallels_tools_flavor": "lin", - "prlctl": [ - [ - "set", - "{{.Name}}", - "--memsize", - "{{ user `memory` }}" - ], - [ - "set", - "{{.Name}}", - "--cpus", - "{{ user `cpus` }}" - ] - ], + "memory": "{{ user `memory` }}", + "cpus": "{{ user `cpus` }}", "prlctl_version_file": ".prlctl_version", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", diff --git a/packer_templates/debian/debian-10.1-amd64.json b/packer_templates/debian/debian-10.1-amd64.json index 01999ef84..9e5877b69 100644 --- a/packer_templates/debian/debian-10.1-amd64.json +++ b/packer_templates/debian/debian-10.1-amd64.json @@ -36,20 +36,8 @@ "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", "type": "virtualbox-iso", - "vboxmanage": [ - [ - "modifyvm", - "{{.Name}}", - "--memory", - "{{ user `memory` }}" - ], - [ - "modifyvm", - "{{.Name}}", - "--cpus", - "{{ user `cpus` }}" - ] - ], + "memory": "{{ user `memory` }}", + "cpus": "{{ user `cpus` }}", "virtualbox_version_file": ".vbox_version", "vm_name": "{{ user `template` }}" }, @@ -89,11 +77,11 @@ "tools_upload_flavor": "linux", "type": "vmware-iso", "vm_name": "{{ user `template` }}", + "memory": "{{ user `memory` }}", + "cpus": "{{ user `cpus` }}", "vmx_data": { "cpuid.coresPerSocket": "1", - "ethernet0.pciSlotNumber": "32", - "memsize": "{{ user `memory` }}", - "numvcpus": "{{ user `cpus` }}" + "ethernet0.pciSlotNumber": "32" }, "vmx_remove_ethernet_interfaces": true }, @@ -125,20 +113,8 @@ "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", "output_directory": "../../builds/packer-{{user `template`}}-parallels", "parallels_tools_flavor": "lin", - "prlctl": [ - [ - "set", - "{{.Name}}", - "--memsize", - "{{ user `memory` }}" - ], - [ - "set", - "{{.Name}}", - "--cpus", - "{{ user `cpus` }}" - ] - ], + "memory": "{{ user `memory` }}", + "cpus": "{{ user `cpus` }}", "prlctl_version_file": ".prlctl_version", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", "ssh_password": "vagrant", diff --git a/packer_templates/debian/debian-10.1-i386.json b/packer_templates/debian/debian-10.1-i386.json index c849567a0..c769aca4c 100644 --- a/packer_templates/debian/debian-10.1-i386.json +++ b/packer_templates/debian/debian-10.1-i386.json @@ -36,20 +36,8 @@ "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", "type": "virtualbox-iso", - "vboxmanage": [ - [ - "modifyvm", - "{{.Name}}", - "--memory", - "{{ user `memory` }}" - ], - [ - "modifyvm", - "{{.Name}}", - "--cpus", - "{{ user `cpus` }}" - ] - ], + "memory": "{{ user `memory` }}", + "cpus": "{{ user `cpus` }}", "virtualbox_version_file": ".vbox_version", "vm_name": "{{ user `template` }}" }, @@ -89,11 +77,11 @@ "tools_upload_flavor": "linux", "type": "vmware-iso", "vm_name": "{{ user `template` }}", + "memory": "{{ user `memory` }}", + "cpus": "{{ user `cpus` }}", "vmx_data": { "cpuid.coresPerSocket": "1", - "ethernet0.pciSlotNumber": "32", - "memsize": "{{ user `memory` }}", - "numvcpus": "{{ user `cpus` }}" + "ethernet0.pciSlotNumber": "32" }, "vmx_remove_ethernet_interfaces": true }, @@ -125,20 +113,8 @@ "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", "output_directory": "../../builds/packer-{{user `template`}}-parallels", "parallels_tools_flavor": "lin", - "prlctl": [ - [ - "set", - "{{.Name}}", - "--memsize", - "{{ user `memory` }}" - ], - [ - "set", - "{{.Name}}", - "--cpus", - "{{ user `cpus` }}" - ] - ], + "memory": "{{ user `memory` }}", + "cpus": "{{ user `cpus` }}", "prlctl_version_file": ".prlctl_version", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", "ssh_password": "vagrant", diff --git a/packer_templates/debian/debian-8.11-amd64.json b/packer_templates/debian/debian-8.11-amd64.json index 6b520543e..cae3945d9 100644 --- a/packer_templates/debian/debian-8.11-amd64.json +++ b/packer_templates/debian/debian-8.11-amd64.json @@ -36,20 +36,8 @@ "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", "type": "virtualbox-iso", - "vboxmanage": [ - [ - "modifyvm", - "{{.Name}}", - "--memory", - "{{ user `memory` }}" - ], - [ - "modifyvm", - "{{.Name}}", - "--cpus", - "{{ user `cpus` }}" - ] - ], + "memory": "{{ user `memory` }}", + "cpus": "{{ user `cpus` }}", "virtualbox_version_file": ".vbox_version", "vm_name": "{{ user `template` }}" }, @@ -89,11 +77,11 @@ "tools_upload_flavor": "linux", "type": "vmware-iso", "vm_name": "{{ user `template` }}", + "memory": "{{ user `memory` }}", + "cpus": "{{ user `cpus` }}", "vmx_data": { "cpuid.coresPerSocket": "1", - "ethernet0.pciSlotNumber": "32", - "memsize": "{{ user `memory` }}", - "numvcpus": "{{ user `cpus` }}" + "ethernet0.pciSlotNumber": "32" }, "vmx_remove_ethernet_interfaces": true }, @@ -125,20 +113,8 @@ "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", "output_directory": "../../builds/packer-{{user `template`}}-parallels", "parallels_tools_flavor": "lin", - "prlctl": [ - [ - "set", - "{{.Name}}", - "--memsize", - "{{ user `memory` }}" - ], - [ - "set", - "{{.Name}}", - "--cpus", - "{{ user `cpus` }}" - ] - ], + "memory": "{{ user `memory` }}", + "cpus": "{{ user `cpus` }}", "prlctl_version_file": ".prlctl_version", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", "ssh_password": "vagrant", diff --git a/packer_templates/debian/debian-8.11-i386.json b/packer_templates/debian/debian-8.11-i386.json index df1113438..c033f1331 100644 --- a/packer_templates/debian/debian-8.11-i386.json +++ b/packer_templates/debian/debian-8.11-i386.json @@ -36,20 +36,8 @@ "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", "type": "virtualbox-iso", - "vboxmanage": [ - [ - "modifyvm", - "{{.Name}}", - "--memory", - "{{ user `memory` }}" - ], - [ - "modifyvm", - "{{.Name}}", - "--cpus", - "{{ user `cpus` }}" - ] - ], + "memory": "{{ user `memory` }}", + "cpus": "{{ user `cpus` }}", "virtualbox_version_file": ".vbox_version", "vm_name": "{{ user `template` }}" }, @@ -89,11 +77,11 @@ "tools_upload_flavor": "linux", "type": "vmware-iso", "vm_name": "{{ user `template` }}", + "memory": "{{ user `memory` }}", + "cpus": "{{ user `cpus` }}", "vmx_data": { "cpuid.coresPerSocket": "1", - "ethernet0.pciSlotNumber": "32", - "memsize": "{{ user `memory` }}", - "numvcpus": "{{ user `cpus` }}" + "ethernet0.pciSlotNumber": "32" }, "vmx_remove_ethernet_interfaces": true }, @@ -125,20 +113,8 @@ "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", "output_directory": "../../builds/packer-{{user `template`}}-parallels", "parallels_tools_flavor": "lin", - "prlctl": [ - [ - "set", - "{{.Name}}", - "--memsize", - "{{ user `memory` }}" - ], - [ - "set", - "{{.Name}}", - "--cpus", - "{{ user `cpus` }}" - ] - ], + "memory": "{{ user `memory` }}", + "cpus": "{{ user `cpus` }}", "prlctl_version_file": ".prlctl_version", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", "ssh_password": "vagrant", diff --git a/packer_templates/debian/debian-9.11-amd64.json b/packer_templates/debian/debian-9.11-amd64.json index 206f8416f..90eb7f5a2 100644 --- a/packer_templates/debian/debian-9.11-amd64.json +++ b/packer_templates/debian/debian-9.11-amd64.json @@ -36,20 +36,8 @@ "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", "type": "virtualbox-iso", - "vboxmanage": [ - [ - "modifyvm", - "{{.Name}}", - "--memory", - "{{ user `memory` }}" - ], - [ - "modifyvm", - "{{.Name}}", - "--cpus", - "{{ user `cpus` }}" - ] - ], + "memory": "{{ user `memory` }}", + "cpus": "{{ user `cpus` }}", "virtualbox_version_file": ".vbox_version", "vm_name": "{{ user `template` }}" }, @@ -89,11 +77,11 @@ "tools_upload_flavor": "linux", "type": "vmware-iso", "vm_name": "{{ user `template` }}", + "memory": "{{ user `memory` }}", + "cpus": "{{ user `cpus` }}", "vmx_data": { "cpuid.coresPerSocket": "1", - "ethernet0.pciSlotNumber": "32", - "memsize": "{{ user `memory` }}", - "numvcpus": "{{ user `cpus` }}" + "ethernet0.pciSlotNumber": "32" }, "vmx_remove_ethernet_interfaces": true }, @@ -125,20 +113,8 @@ "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", "output_directory": "../../builds/packer-{{user `template`}}-parallels", "parallels_tools_flavor": "lin", - "prlctl": [ - [ - "set", - "{{.Name}}", - "--memsize", - "{{ user `memory` }}" - ], - [ - "set", - "{{.Name}}", - "--cpus", - "{{ user `cpus` }}" - ] - ], + "memory": "{{ user `memory` }}", + "cpus": "{{ user `cpus` }}", "prlctl_version_file": ".prlctl_version", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", "ssh_password": "vagrant", diff --git a/packer_templates/debian/debian-9.11-i386.json b/packer_templates/debian/debian-9.11-i386.json index 9305d5d31..24bd68556 100644 --- a/packer_templates/debian/debian-9.11-i386.json +++ b/packer_templates/debian/debian-9.11-i386.json @@ -36,20 +36,8 @@ "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", "type": "virtualbox-iso", - "vboxmanage": [ - [ - "modifyvm", - "{{.Name}}", - "--memory", - "{{ user `memory` }}" - ], - [ - "modifyvm", - "{{.Name}}", - "--cpus", - "{{ user `cpus` }}" - ] - ], + "memory": "{{ user `memory` }}", + "cpus": "{{ user `cpus` }}", "virtualbox_version_file": ".vbox_version", "vm_name": "{{ user `template` }}" }, @@ -89,11 +77,11 @@ "tools_upload_flavor": "linux", "type": "vmware-iso", "vm_name": "{{ user `template` }}", + "memory": "{{ user `memory` }}", + "cpus": "{{ user `cpus` }}", "vmx_data": { "cpuid.coresPerSocket": "1", - "ethernet0.pciSlotNumber": "32", - "memsize": "{{ user `memory` }}", - "numvcpus": "{{ user `cpus` }}" + "ethernet0.pciSlotNumber": "32" }, "vmx_remove_ethernet_interfaces": true }, @@ -125,20 +113,8 @@ "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", "output_directory": "../../builds/packer-{{user `template`}}-parallels", "parallels_tools_flavor": "lin", - "prlctl": [ - [ - "set", - "{{.Name}}", - "--memsize", - "{{ user `memory` }}" - ], - [ - "set", - "{{.Name}}", - "--cpus", - "{{ user `cpus` }}" - ] - ], + "memory": "{{ user `memory` }}", + "cpus": "{{ user `cpus` }}", "prlctl_version_file": ".prlctl_version", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", "ssh_password": "vagrant", diff --git a/packer_templates/fedora/fedora-29-x86_64.json b/packer_templates/fedora/fedora-29-x86_64.json index d0ccafb63..2ee7ca0f2 100644 --- a/packer_templates/fedora/fedora-29-x86_64.json +++ b/packer_templates/fedora/fedora-29-x86_64.json @@ -17,16 +17,8 @@ "disk_compression": true, "disk_interface": "virtio-scsi", "net_device": "virtio-net", - "qemuargs": [ - [ - "-m", - "{{ user `memory` }}" - ], - [ - "-smp", - "cpus={{ user `cpus` }}" - ] - ], + "memory": "{{ user `memory` }}", + "cpus": "{{ user `cpus` }}", "http_directory": "http", "headless": "{{ user `headless` }}", "iso_checksum": "{{user `iso_checksum`}}", @@ -59,20 +51,8 @@ "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", "type": "virtualbox-iso", - "vboxmanage": [ - [ - "modifyvm", - "{{.Name}}", - "--memory", - "{{ user `memory` }}" - ], - [ - "modifyvm", - "{{.Name}}", - "--cpus", - "{{ user `cpus` }}" - ] - ], + "memory": "{{ user `memory` }}", + "cpus": "{{ user `cpus` }}", "virtualbox_version_file": ".vbox_version", "vm_name": "{{ user `template` }}" }, @@ -97,11 +77,11 @@ "tools_upload_flavor": "linux", "type": "vmware-iso", "vm_name": "{{ user `template` }}", + "memory": "{{ user `memory` }}", + "cpus": "{{ user `cpus` }}", "vmx_data": { "cpuid.coresPerSocket": "1", - "ethernet0.pciSlotNumber": "32", - "memsize": "{{ user `memory` }}", - "numvcpus": "{{ user `cpus` }}" + "ethernet0.pciSlotNumber": "32" }, "vmx_remove_ethernet_interfaces": true }, @@ -118,20 +98,8 @@ "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", "output_directory": "../../builds/packer-{{user `template`}}-parallels", "parallels_tools_flavor": "lin", - "prlctl": [ - [ - "set", - "{{.Name}}", - "--memsize", - "{{ user `memory` }}" - ], - [ - "set", - "{{.Name}}", - "--cpus", - "{{ user `cpus` }}" - ] - ], + "memory": "{{ user `memory` }}", + "cpus": "{{ user `cpus` }}", "prlctl_version_file": ".prlctl_version", "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", "ssh_password": "vagrant", diff --git a/packer_templates/fedora/fedora-30-x86_64.json b/packer_templates/fedora/fedora-30-x86_64.json index 9fe746e2b..2c3c64245 100644 --- a/packer_templates/fedora/fedora-30-x86_64.json +++ b/packer_templates/fedora/fedora-30-x86_64.json @@ -17,16 +17,8 @@ "disk_compression": true, "disk_interface": "virtio-scsi", "net_device": "virtio-net", - "qemuargs": [ - [ - "-m", - "{{ user `memory` }}" - ], - [ - "-smp", - "cpus={{ user `cpus` }}" - ] - ], + "memory": "{{ user `memory` }}", + "cpus": "{{ user `cpus` }}", "http_directory": "http", "headless": "{{ user `headless` }}", "iso_checksum": "{{user `iso_checksum`}}", @@ -59,20 +51,8 @@ "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", "type": "virtualbox-iso", - "vboxmanage": [ - [ - "modifyvm", - "{{.Name}}", - "--memory", - "{{ user `memory` }}" - ], - [ - "modifyvm", - "{{.Name}}", - "--cpus", - "{{ user `cpus` }}" - ] - ], + "memory": "{{ user `memory` }}", + "cpus": "{{ user `cpus` }}", "virtualbox_version_file": ".vbox_version", "vm_name": "{{ user `template` }}" }, @@ -97,11 +77,11 @@ "tools_upload_flavor": "linux", "type": "vmware-iso", "vm_name": "{{ user `template` }}", + "memory": "{{ user `memory` }}", + "cpus": "{{ user `cpus` }}", "vmx_data": { "cpuid.coresPerSocket": "1", - "ethernet0.pciSlotNumber": "32", - "memsize": "{{ user `memory` }}", - "numvcpus": "{{ user `cpus` }}" + "ethernet0.pciSlotNumber": "32" }, "vmx_remove_ethernet_interfaces": true }, @@ -118,20 +98,8 @@ "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", "output_directory": "../../builds/packer-{{user `template`}}-parallels", "parallels_tools_flavor": "lin", - "prlctl": [ - [ - "set", - "{{.Name}}", - "--memsize", - "{{ user `memory` }}" - ], - [ - "set", - "{{.Name}}", - "--cpus", - "{{ user `cpus` }}" - ] - ], + "memory": "{{ user `memory` }}", + "cpus": "{{ user `cpus` }}", "prlctl_version_file": ".prlctl_version", "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", "ssh_password": "vagrant", diff --git a/packer_templates/freebsd/freebsd-11.3-amd64.json b/packer_templates/freebsd/freebsd-11.3-amd64.json index ecfb6d85b..c68cb956b 100644 --- a/packer_templates/freebsd/freebsd-11.3-amd64.json +++ b/packer_templates/freebsd/freebsd-11.3-amd64.json @@ -13,6 +13,8 @@ "fetch -o /tmp/installerconfig http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} && bsdinstall script /tmp/installerconfig<enter><wait>" ], "boot_wait": "10s", + "memory": "{{ user `memory` }}", + "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "guest_additions_mode": "disable", "guest_os_type": "FreeBSD_64", @@ -28,20 +30,6 @@ "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", "type": "virtualbox-iso", - "vboxmanage": [ - [ - "modifyvm", - "{{.Name}}", - "--memory", - "{{ user `memory` }}" - ], - [ - "modifyvm", - "{{.Name}}", - "--cpus", - "{{ user `cpus` }}" - ] - ], "virtualbox_version_file": ".vbox_version", "vm_name": "{{ user `template` }}" }, @@ -59,6 +47,8 @@ "fetch -o /tmp/installerconfig http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} && bsdinstall script /tmp/installerconfig<enter><wait>" ], "boot_wait": "10s", + "memory": "{{ user `memory` }}", + "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "guest_os_type": "freebsd-64", "headless": "{{ user `headless` }}", @@ -75,9 +65,7 @@ "type": "vmware-iso", "vm_name": "{{ user `template` }}", "vmx_data": { - "cpuid.coresPerSocket": "1", - "memsize": "{{ user `memory` }}", - "numvcpus": "{{ user `cpus` }}" + "cpuid.coresPerSocket": "1" }, "vmx_remove_ethernet_interfaces": true }, @@ -94,6 +82,8 @@ "fetch -o /tmp/installerconfig http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} && bsdinstall script /tmp/installerconfig<enter><wait>" ], "boot_wait": "8s", + "memory": "{{ user `memory` }}", + "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "guest_os_type": "freebsd", "http_directory": "http", @@ -103,18 +93,6 @@ "output_directory": "../../builds/packer-{{user `template`}}-parallels", "parallels_tools_mode": "disable", "prlctl": [ - [ - "set", - "{{.Name}}", - "--memsize", - "{{ user `memory` }}" - ], - [ - "set", - "{{.Name}}", - "--cpus", - "{{ user `cpus` }}" - ], [ "set", "{{.Name}}", @@ -158,6 +136,8 @@ "fetch -o /tmp/installerconfig http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} && bsdinstall script /tmp/installerconfig<enter><wait>" ], "boot_wait": "7s", + "memory": "{{ user `memory` }}", + "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", "http_directory": "http", diff --git a/packer_templates/freebsd/freebsd-11.3-i386.json b/packer_templates/freebsd/freebsd-11.3-i386.json index 17fe60e9b..c4e89b835 100644 --- a/packer_templates/freebsd/freebsd-11.3-i386.json +++ b/packer_templates/freebsd/freebsd-11.3-i386.json @@ -13,6 +13,8 @@ "fetch -o /tmp/installerconfig http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} && bsdinstall script /tmp/installerconfig<enter><wait>" ], "boot_wait": "10s", + "memory": "{{ user `memory` }}", + "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "guest_additions_mode": "disable", "guest_os_type": "FreeBSD", @@ -28,20 +30,6 @@ "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", "type": "virtualbox-iso", - "vboxmanage": [ - [ - "modifyvm", - "{{.Name}}", - "--memory", - "{{ user `memory` }}" - ], - [ - "modifyvm", - "{{.Name}}", - "--cpus", - "{{ user `cpus` }}" - ] - ], "virtualbox_version_file": ".vbox_version", "vm_name": "{{ user `template` }}" }, @@ -59,6 +47,8 @@ "fetch -o /tmp/installerconfig http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} && bsdinstall script /tmp/installerconfig<enter><wait>" ], "boot_wait": "10s", + "memory": "{{ user `memory` }}", + "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "guest_os_type": "freebsd", "headless": "{{ user `headless` }}", @@ -75,9 +65,7 @@ "type": "vmware-iso", "vm_name": "{{ user `template` }}", "vmx_data": { - "cpuid.coresPerSocket": "1", - "memsize": "{{ user `memory` }}", - "numvcpus": "{{ user `cpus` }}" + "cpuid.coresPerSocket": "1" }, "vmx_remove_ethernet_interfaces": true }, @@ -94,6 +82,8 @@ "fetch -o /tmp/installerconfig http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} && bsdinstall script /tmp/installerconfig<enter><wait>" ], "boot_wait": "8s", + "memory": "{{ user `memory` }}", + "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "guest_os_type": "freebsd", "http_directory": "http", @@ -103,18 +93,6 @@ "output_directory": "../../builds/packer-{{user `template`}}-parallels", "parallels_tools_mode": "disable", "prlctl": [ - [ - "set", - "{{.Name}}", - "--memsize", - "{{ user `memory` }}" - ], - [ - "set", - "{{.Name}}", - "--cpus", - "{{ user `cpus` }}" - ], [ "set", "{{.Name}}", @@ -158,6 +136,8 @@ "fetch -o /tmp/installerconfig http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} && bsdinstall script /tmp/installerconfig<enter><wait>" ], "boot_wait": "7s", + "memory": "{{ user `memory` }}", + "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", "http_directory": "http", diff --git a/packer_templates/freebsd/freebsd-12.0-amd64.json b/packer_templates/freebsd/freebsd-12.0-amd64.json index 576ce2d21..d9932eafc 100644 --- a/packer_templates/freebsd/freebsd-12.0-amd64.json +++ b/packer_templates/freebsd/freebsd-12.0-amd64.json @@ -13,6 +13,8 @@ "fetch -o /tmp/installerconfig http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} && bsdinstall script /tmp/installerconfig<enter><wait>" ], "boot_wait": "10s", + "memory": "{{ user `memory` }}", + "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "guest_additions_mode": "disable", "guest_os_type": "FreeBSD_64", @@ -28,20 +30,6 @@ "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", "type": "virtualbox-iso", - "vboxmanage": [ - [ - "modifyvm", - "{{.Name}}", - "--memory", - "{{ user `memory` }}" - ], - [ - "modifyvm", - "{{.Name}}", - "--cpus", - "{{ user `cpus` }}" - ] - ], "virtualbox_version_file": ".vbox_version", "vm_name": "{{ user `template` }}" }, @@ -59,6 +47,8 @@ "fetch -o /tmp/installerconfig http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} && bsdinstall script /tmp/installerconfig<enter><wait>" ], "boot_wait": "10s", + "memory": "{{ user `memory` }}", + "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "guest_os_type": "freebsd-64", "headless": "{{ user `headless` }}", @@ -75,9 +65,7 @@ "type": "vmware-iso", "vm_name": "{{ user `template` }}", "vmx_data": { - "cpuid.coresPerSocket": "1", - "memsize": "{{ user `memory` }}", - "numvcpus": "{{ user `cpus` }}" + "cpuid.coresPerSocket": "1" }, "vmx_remove_ethernet_interfaces": true }, @@ -94,6 +82,8 @@ "fetch -o /tmp/installerconfig http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} && bsdinstall script /tmp/installerconfig<enter><wait>" ], "boot_wait": "8s", + "memory": "{{ user `memory` }}", + "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "guest_os_type": "freebsd", "http_directory": "http", @@ -103,18 +93,6 @@ "output_directory": "../../builds/packer-{{user `template`}}-parallels", "parallels_tools_mode": "disable", "prlctl": [ - [ - "set", - "{{.Name}}", - "--memsize", - "{{ user `memory` }}" - ], - [ - "set", - "{{.Name}}", - "--cpus", - "{{ user `cpus` }}" - ], [ "set", "{{.Name}}", @@ -158,6 +136,8 @@ "fetch -o /tmp/installerconfig http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} && bsdinstall script /tmp/installerconfig<enter><wait>" ], "boot_wait": "7s", + "memory": "{{ user `memory` }}", + "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", "http_directory": "http", diff --git a/packer_templates/freebsd/freebsd-12.0-i386.json b/packer_templates/freebsd/freebsd-12.0-i386.json index 7b82d6c7d..1af107e4a 100644 --- a/packer_templates/freebsd/freebsd-12.0-i386.json +++ b/packer_templates/freebsd/freebsd-12.0-i386.json @@ -13,6 +13,8 @@ "fetch -o /tmp/installerconfig http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} && bsdinstall script /tmp/installerconfig<enter><wait>" ], "boot_wait": "10s", + "memory": "{{ user `memory` }}", + "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "guest_additions_mode": "disable", "guest_os_type": "FreeBSD", @@ -28,20 +30,6 @@ "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", "type": "virtualbox-iso", - "vboxmanage": [ - [ - "modifyvm", - "{{.Name}}", - "--memory", - "{{ user `memory` }}" - ], - [ - "modifyvm", - "{{.Name}}", - "--cpus", - "{{ user `cpus` }}" - ] - ], "virtualbox_version_file": ".vbox_version", "vm_name": "{{ user `template` }}" }, @@ -59,6 +47,8 @@ "fetch -o /tmp/installerconfig http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} && bsdinstall script /tmp/installerconfig<enter><wait>" ], "boot_wait": "10s", + "memory": "{{ user `memory` }}", + "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "guest_os_type": "freebsd", "headless": "{{ user `headless` }}", @@ -75,9 +65,7 @@ "type": "vmware-iso", "vm_name": "{{ user `template` }}", "vmx_data": { - "cpuid.coresPerSocket": "1", - "memsize": "{{ user `memory` }}", - "numvcpus": "{{ user `cpus` }}" + "cpuid.coresPerSocket": "1" }, "vmx_remove_ethernet_interfaces": true }, @@ -94,6 +82,8 @@ "fetch -o /tmp/installerconfig http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} && bsdinstall script /tmp/installerconfig<enter><wait>" ], "boot_wait": "8s", + "memory": "{{ user `memory` }}", + "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "guest_os_type": "freebsd", "http_directory": "http", @@ -103,18 +93,6 @@ "output_directory": "../../builds/packer-{{user `template`}}-parallels", "parallels_tools_mode": "disable", "prlctl": [ - [ - "set", - "{{.Name}}", - "--memsize", - "{{ user `memory` }}" - ], - [ - "set", - "{{.Name}}", - "--cpus", - "{{ user `cpus` }}" - ], [ "set", "{{.Name}}", @@ -158,6 +136,8 @@ "fetch -o /tmp/installerconfig http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} && bsdinstall script /tmp/installerconfig<enter><wait>" ], "boot_wait": "7s", + "memory": "{{ user `memory` }}", + "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", "http_directory": "http", diff --git a/packer_templates/hardenedbsd/hardenedbsd-11-amd64.json b/packer_templates/hardenedbsd/hardenedbsd-11-amd64.json index 53307f340..b8030813d 100644 --- a/packer_templates/hardenedbsd/hardenedbsd-11-amd64.json +++ b/packer_templates/hardenedbsd/hardenedbsd-11-amd64.json @@ -28,20 +28,8 @@ "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", "type": "virtualbox-iso", - "vboxmanage": [ - [ - "modifyvm", - "{{.Name}}", - "--memory", - "{{ user `memory` }}" - ], - [ - "modifyvm", - "{{.Name}}", - "--cpus", - "{{ user `cpus` }}" - ] - ], + "memory": "{{ user `memory` }}", + "cpus": "{{ user `cpus` }}", "virtualbox_version_file": ".vbox_version", "vm_name": "{{ user `template` }}" }, @@ -59,6 +47,8 @@ "fetch -o /tmp/installerconfig http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} && bsdinstall script /tmp/installerconfig<enter><wait>" ], "boot_wait": "10s", + "memory": "{{ user `memory` }}", + "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "guest_os_type": "freebsd-64", "headless": "{{ user `headless` }}", @@ -76,9 +66,7 @@ "type": "vmware-iso", "vm_name": "{{ user `template` }}", "vmx_data": { - "cpuid.coresPerSocket": "1", - "memsize": "{{ user `memory` }}", - "numvcpus": "{{ user `cpus` }}" + "cpuid.coresPerSocket": "1" }, "vmx_remove_ethernet_interfaces": true }, @@ -95,6 +83,8 @@ "fetch -o /tmp/installerconfig http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} && bsdinstall script /tmp/installerconfig<enter><wait>" ], "boot_wait": "8s", + "memory": "{{ user `memory` }}", + "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "guest_os_type": "freebsd", "http_directory": "http", @@ -104,18 +94,6 @@ "output_directory": "../../builds/packer-{{user `template`}}-parallels", "parallels_tools_mode": "disable", "prlctl": [ - [ - "set", - "{{.Name}}", - "--memsize", - "{{ user `memory` }}" - ], - [ - "set", - "{{.Name}}", - "--cpus", - "{{ user `cpus` }}" - ], [ "set", "{{.Name}}", @@ -159,6 +137,8 @@ "fetch -o /tmp/installerconfig http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} && bsdinstall script /tmp/installerconfig<enter><wait>" ], "boot_wait": "7s", + "memory": "{{ user `memory` }}", + "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", "http_directory": "http", diff --git a/packer_templates/macos/macos-10.12.json b/packer_templates/macos/macos-10.12.json index 73042f397..7e27ee4a2 100644 --- a/packer_templates/macos/macos-10.12.json +++ b/packer_templates/macos/macos-10.12.json @@ -2,6 +2,8 @@ "builders": [ { "boot_wait": "2s", + "memory": "{{ user `memory` }}", + "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "guest_os_type": "darwin12-64", "headless": "{{ user `headless` }}", @@ -26,8 +28,6 @@ "hpet0.present": "TRUE", "ich7m.present": "TRUE", "keyboardAndMouseProfile": "macProfile", - "memsize": "{{ user `memsize` }}", - "numvcpus": "{{ user `cpus` }}", "smc.present": "TRUE", "usb.present": "TRUE" }, @@ -35,6 +35,8 @@ }, { "boot_wait": "2s", + "memory": "{{ user `memory` }}", + "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "guest_additions_mode": "disable", "guest_os_type": "MacOS1011_64", @@ -75,12 +77,6 @@ "--chipset", "ich9" ], - [ - "modifyvm", - "{{.Name}}", - "--cpus", - "{{ user `cpus` }}" - ], [ "modifyvm", "{{.Name}}", @@ -99,12 +95,6 @@ "--keyboard", "usb" ], - [ - "modifyvm", - "{{.Name}}", - "--memory", - "{{ user `memsize` }}" - ], [ "modifyvm", "{{.Name}}", @@ -156,6 +146,8 @@ }, { "boot_wait": "2s", + "memory": "{{ user `memory` }}", + "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "guest_os_type": "macosx", "iso_checksum": "{{user `iso_checksum`}}", @@ -164,18 +156,6 @@ "output_directory": "../../builds/packer-{{user `template`}}-parallels", "parallels_tools_flavor": "mac", "prlctl": [ - [ - "set", - "{{.Name}}", - "--memsize", - "{{ user `memsize` }}" - ], - [ - "set", - "{{.Name}}", - "--cpus", - "{{ user `cpus` }}" - ], [ "set", "{{.Name}}", @@ -243,7 +223,7 @@ "iso_checksum": "__unset_iso_checksum__", "iso_checksum_type": "md5", "iso_url": "http://YOU-MUST-PROVIDE-YOUR-OWN-DMG.sorry", - "memsize": "2048", + "memory": "2048", "name": "macos-10.12", "no_proxy": "{{env `no_proxy`}}", "template": "macos-10.12", diff --git a/packer_templates/macos/macosx-10.11.json b/packer_templates/macos/macosx-10.11.json index 4e572034f..074bc3d23 100644 --- a/packer_templates/macos/macosx-10.11.json +++ b/packer_templates/macos/macosx-10.11.json @@ -2,6 +2,8 @@ "builders": [ { "boot_wait": "2s", + "memory": "{{ user `memory` }}", + "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "guest_os_type": "darwin12-64", "headless": "{{ user `headless` }}", @@ -26,8 +28,6 @@ "hpet0.present": "TRUE", "ich7m.present": "TRUE", "keyboardAndMouseProfile": "macProfile", - "memsize": "{{ user `memory` }}", - "numvcpus": "{{ user `cpus` }}", "smc.present": "TRUE", "usb.present": "TRUE" }, @@ -35,6 +35,8 @@ }, { "boot_wait": "2s", + "memory": "{{ user `memory` }}", + "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "guest_additions_mode": "disable", "guest_os_type": "MacOS1011_64", @@ -75,12 +77,6 @@ "--chipset", "ich9" ], - [ - "modifyvm", - "{{.Name}}", - "--cpus", - "{{ user `cpus` }}" - ], [ "modifyvm", "{{.Name}}", @@ -99,12 +95,6 @@ "--keyboard", "usb" ], - [ - "modifyvm", - "{{.Name}}", - "--memory", - "{{ user `memory` }}" - ], [ "modifyvm", "{{.Name}}", @@ -156,6 +146,8 @@ }, { "boot_wait": "2s", + "memory": "{{ user `memory` }}", + "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "guest_os_type": "macosx", "iso_checksum": "{{user `iso_checksum`}}", @@ -164,18 +156,6 @@ "output_directory": "../../builds/packer-{{user `template`}}-parallels", "parallels_tools_flavor": "mac", "prlctl": [ - [ - "set", - "{{.Name}}", - "--memsize", - "{{ user `memory` }}" - ], - [ - "set", - "{{.Name}}", - "--cpus", - "{{ user `cpus` }}" - ], [ "set", "{{.Name}}", diff --git a/packer_templates/opensuse/opensuse-leap-15.1-x86_64.json b/packer_templates/opensuse/opensuse-leap-15.1-x86_64.json index b2848bc31..d5c2d9f42 100644 --- a/packer_templates/opensuse/opensuse-leap-15.1-x86_64.json +++ b/packer_templates/opensuse/opensuse-leap-15.1-x86_64.json @@ -30,20 +30,8 @@ "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", "type": "virtualbox-iso", - "vboxmanage": [ - [ - "modifyvm", - "{{.Name}}", - "--memory", - "{{ user `memory` }}" - ], - [ - "modifyvm", - "{{.Name}}", - "--cpus", - "{{ user `cpus` }}" - ] - ], + "memory": "{{ user `memory` }}", + "cpus": "{{ user `cpus` }}", "virtualbox_version_file": ".vbox_version", "vm_name": "{{ user `template` }}" }, @@ -77,10 +65,10 @@ "tools_upload_flavor": "linux", "type": "vmware-iso", "vm_name": "{{ user `template` }}", + "memory": "{{ user `memory` }}", + "cpus": "{{ user `cpus` }}", "vmx_data": { - "cpuid.coresPerSocket": "1", - "memsize": "{{ user `memory` }}", - "numvcpus": "{{ user `cpus` }}" + "cpuid.coresPerSocket": "1" }, "vmx_remove_ethernet_interfaces": true }, @@ -106,20 +94,8 @@ "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", "output_directory": "../../builds/packer-{{user `template`}}-parallels", "parallels_tools_flavor": "lin", - "prlctl": [ - [ - "set", - "{{.Name}}", - "--memsize", - "{{ user `memory` }}" - ], - [ - "set", - "{{.Name}}", - "--cpus", - "{{ user `cpus` }}" - ] - ], + "memory": "{{ user `memory` }}", + "cpus": "{{ user `cpus` }}", "prlctl_version_file": ".prlctl_version", "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", diff --git a/packer_templates/oraclelinux/oracle-5.11-i386.json b/packer_templates/oraclelinux/oracle-5.11-i386.json index 0c15075f0..a636dfbd0 100644 --- a/packer_templates/oraclelinux/oracle-5.11-i386.json +++ b/packer_templates/oraclelinux/oracle-5.11-i386.json @@ -21,20 +21,8 @@ "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", "type": "virtualbox-iso", - "vboxmanage": [ - [ - "modifyvm", - "{{.Name}}", - "--memory", - "{{ user `memory` }}" - ], - [ - "modifyvm", - "{{.Name}}", - "--cpus", - "{{ user `cpus` }}" - ] - ], + "memory": "{{ user `memory` }}", + "cpus": "{{ user `cpus` }}", "virtualbox_version_file": ".vbox_version", "vm_name": "{{ user `template` }}" }, @@ -59,10 +47,10 @@ "tools_upload_flavor": "linux", "type": "vmware-iso", "vm_name": "{{ user `template` }}", + "memory": "{{ user `memory` }}", + "cpus": "{{ user `cpus` }}", "vmx_data": { - "cpuid.coresPerSocket": "1", - "memsize": "{{ user `memory` }}", - "numvcpus": "{{ user `cpus` }}" + "cpuid.coresPerSocket": "1" }, "vmx_remove_ethernet_interfaces": true }, @@ -79,20 +67,8 @@ "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", "output_directory": "../../builds/packer-{{user `template`}}-parallels", "parallels_tools_flavor": "lin", - "prlctl": [ - [ - "set", - "{{.Name}}", - "--memsize", - "{{ user `memory` }}" - ], - [ - "set", - "{{.Name}}", - "--cpus", - "{{ user `cpus` }}" - ] - ], + "memory": "{{ user `memory` }}", + "cpus": "{{ user `cpus` }}", "prlctl_version_file": ".prlctl_version", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", diff --git a/packer_templates/oraclelinux/oracle-5.11-x86_64.json b/packer_templates/oraclelinux/oracle-5.11-x86_64.json index 2997229f6..d9bd22a1f 100644 --- a/packer_templates/oraclelinux/oracle-5.11-x86_64.json +++ b/packer_templates/oraclelinux/oracle-5.11-x86_64.json @@ -21,19 +21,9 @@ "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", "type": "virtualbox-iso", + "memory": "{{ user `memory` }}", + "cpus": "{{ user `cpus` }}", "vboxmanage": [ - [ - "modifyvm", - "{{.Name}}", - "--memory", - "{{ user `memory` }}" - ], - [ - "modifyvm", - "{{.Name}}", - "--cpus", - "{{ user `cpus` }}" - ], [ "modifyvm", "{{.Name}}", @@ -65,10 +55,10 @@ "tools_upload_flavor": "linux", "type": "vmware-iso", "vm_name": "{{ user `template` }}", + "memory": "{{ user `memory` }}", + "cpus": "{{ user `cpus` }}", "vmx_data": { - "cpuid.coresPerSocket": "1", - "memsize": "{{ user `memory` }}", - "numvcpus": "{{ user `cpus` }}" + "cpuid.coresPerSocket": "1" }, "vmx_remove_ethernet_interfaces": true }, @@ -85,20 +75,8 @@ "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", "output_directory": "../../builds/packer-{{user `template`}}-parallels", "parallels_tools_flavor": "lin", - "prlctl": [ - [ - "set", - "{{.Name}}", - "--memsize", - "{{ user `memory` }}" - ], - [ - "set", - "{{.Name}}", - "--cpus", - "{{ user `cpus` }}" - ] - ], + "memory": "{{ user `memory` }}", + "cpus": "{{ user `cpus` }}", "prlctl_version_file": ".prlctl_version", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", diff --git a/packer_templates/oraclelinux/oracle-6.10-i386.json b/packer_templates/oraclelinux/oracle-6.10-i386.json index 1190ec617..6bd2c59db 100644 --- a/packer_templates/oraclelinux/oracle-6.10-i386.json +++ b/packer_templates/oraclelinux/oracle-6.10-i386.json @@ -21,20 +21,8 @@ "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", "type": "virtualbox-iso", - "vboxmanage": [ - [ - "modifyvm", - "{{.Name}}", - "--memory", - "{{ user `memory` }}" - ], - [ - "modifyvm", - "{{.Name}}", - "--cpus", - "{{ user `cpus` }}" - ] - ], + "memory": "{{ user `memory` }}", + "cpus": "{{ user `cpus` }}", "virtualbox_version_file": ".vbox_version", "vm_name": "{{ user `template` }}" }, @@ -59,10 +47,10 @@ "tools_upload_flavor": "linux", "type": "vmware-iso", "vm_name": "{{ user `template` }}", + "memory": "{{ user `memory` }}", + "cpus": "{{ user `cpus` }}", "vmx_data": { - "cpuid.coresPerSocket": "1", - "memsize": "{{ user `memory` }}", - "numvcpus": "{{ user `cpus` }}" + "cpuid.coresPerSocket": "1" }, "vmx_remove_ethernet_interfaces": true }, @@ -79,20 +67,8 @@ "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", "output_directory": "../../builds/packer-{{user `template`}}-parallels", "parallels_tools_flavor": "lin", - "prlctl": [ - [ - "set", - "{{.Name}}", - "--memsize", - "{{ user `memory` }}" - ], - [ - "set", - "{{.Name}}", - "--cpus", - "{{ user `cpus` }}" - ] - ], + "memory": "{{ user `memory` }}", + "cpus": "{{ user `cpus` }}", "prlctl_version_file": ".prlctl_version", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", diff --git a/packer_templates/oraclelinux/oracle-6.10-x86_64.json b/packer_templates/oraclelinux/oracle-6.10-x86_64.json index ae3350542..9ed3942b2 100644 --- a/packer_templates/oraclelinux/oracle-6.10-x86_64.json +++ b/packer_templates/oraclelinux/oracle-6.10-x86_64.json @@ -21,20 +21,8 @@ "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", "type": "virtualbox-iso", - "vboxmanage": [ - [ - "modifyvm", - "{{.Name}}", - "--memory", - "{{ user `memory` }}" - ], - [ - "modifyvm", - "{{.Name}}", - "--cpus", - "{{ user `cpus` }}" - ] - ], + "memory": "{{ user `memory` }}", + "cpus": "{{ user `cpus` }}", "virtualbox_version_file": ".vbox_version", "vm_name": "{{ user `template` }}" }, @@ -59,10 +47,10 @@ "tools_upload_flavor": "linux", "type": "vmware-iso", "vm_name": "{{ user `template` }}", + "memory": "{{ user `memory` }}", + "cpus": "{{ user `cpus` }}", "vmx_data": { - "cpuid.coresPerSocket": "1", - "memsize": "{{ user `memory` }}", - "numvcpus": "{{ user `cpus` }}" + "cpuid.coresPerSocket": "1" }, "vmx_remove_ethernet_interfaces": true }, @@ -79,20 +67,8 @@ "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", "output_directory": "../../builds/packer-{{user `template`}}-parallels", "parallels_tools_flavor": "lin", - "prlctl": [ - [ - "set", - "{{.Name}}", - "--memsize", - "{{ user `memory` }}" - ], - [ - "set", - "{{.Name}}", - "--cpus", - "{{ user `cpus` }}" - ] - ], + "memory": "{{ user `memory` }}", + "cpus": "{{ user `cpus` }}", "prlctl_version_file": ".prlctl_version", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", diff --git a/packer_templates/oraclelinux/oracle-7.7-x86_64.json b/packer_templates/oraclelinux/oracle-7.7-x86_64.json index 42d74e687..bf3d5fdf8 100644 --- a/packer_templates/oraclelinux/oracle-7.7-x86_64.json +++ b/packer_templates/oraclelinux/oracle-7.7-x86_64.json @@ -21,20 +21,8 @@ "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", "type": "virtualbox-iso", - "vboxmanage": [ - [ - "modifyvm", - "{{.Name}}", - "--memory", - "{{ user `memory` }}" - ], - [ - "modifyvm", - "{{.Name}}", - "--cpus", - "{{ user `cpus` }}" - ] - ], + "memory": "{{ user `memory` }}", + "cpus": "{{ user `cpus` }}", "virtualbox_version_file": ".vbox_version", "vm_name": "{{ user `template` }}" }, @@ -59,10 +47,10 @@ "tools_upload_flavor": "linux", "type": "vmware-iso", "vm_name": "{{ user `template` }}", + "memory": "{{ user `memory` }}", + "cpus": "{{ user `cpus` }}", "vmx_data": { - "cpuid.coresPerSocket": "1", - "memsize": "{{ user `memory` }}", - "numvcpus": "{{ user `cpus` }}" + "cpuid.coresPerSocket": "1" }, "vmx_remove_ethernet_interfaces": true }, @@ -79,20 +67,8 @@ "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", "output_directory": "../../builds/packer-{{user `template`}}-parallels", "parallels_tools_flavor": "lin", - "prlctl": [ - [ - "set", - "{{.Name}}", - "--memsize", - "{{ user `memory` }}" - ], - [ - "set", - "{{.Name}}", - "--cpus", - "{{ user `cpus` }}" - ] - ], + "memory": "{{ user `memory` }}", + "cpus": "{{ user `cpus` }}", "prlctl_version_file": ".prlctl_version", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", diff --git a/packer_templates/rhel/rhel-5.11-i386.json b/packer_templates/rhel/rhel-5.11-i386.json index 6aec63dce..7ff97f6bf 100644 --- a/packer_templates/rhel/rhel-5.11-i386.json +++ b/packer_templates/rhel/rhel-5.11-i386.json @@ -21,20 +21,8 @@ "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", "type": "virtualbox-iso", - "vboxmanage": [ - [ - "modifyvm", - "{{.Name}}", - "--memory", - "{{ user `memory` }}" - ], - [ - "modifyvm", - "{{.Name}}", - "--cpus", - "{{ user `cpus` }}" - ] - ], + "memory": "{{ user `memory` }}", + "cpus": "{{ user `cpus` }}", "virtualbox_version_file": ".vbox_version", "vm_name": "{{ user `template` }}" }, @@ -59,10 +47,10 @@ "tools_upload_flavor": "linux", "type": "vmware-iso", "vm_name": "{{ user `template` }}", + "memory": "{{ user `memory` }}", + "cpus": "{{ user `cpus` }}", "vmx_data": { - "cpuid.coresPerSocket": "1", - "memsize": "{{ user `memory` }}", - "numvcpus": "{{ user `cpus` }}" + "cpuid.coresPerSocket": "1" }, "vmx_remove_ethernet_interfaces": true }, @@ -79,20 +67,8 @@ "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", "output_directory": "../../builds/packer-{{user `template`}}-parallels", "parallels_tools_flavor": "lin", - "prlctl": [ - [ - "set", - "{{.Name}}", - "--memsize", - "{{ user `memory` }}" - ], - [ - "set", - "{{.Name}}", - "--cpus", - "{{ user `cpus` }}" - ] - ], + "memory": "{{ user `memory` }}", + "cpus": "{{ user `cpus` }}", "prlctl_version_file": ".prlctl_version", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", diff --git a/packer_templates/rhel/rhel-5.11-x86_64.json b/packer_templates/rhel/rhel-5.11-x86_64.json index f0abb7707..27d64edad 100644 --- a/packer_templates/rhel/rhel-5.11-x86_64.json +++ b/packer_templates/rhel/rhel-5.11-x86_64.json @@ -21,19 +21,9 @@ "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", "type": "virtualbox-iso", + "memory": "{{ user `memory` }}", + "cpus": "{{ user `cpus` }}", "vboxmanage": [ - [ - "modifyvm", - "{{.Name}}", - "--memory", - "{{ user `memory` }}" - ], - [ - "modifyvm", - "{{.Name}}", - "--cpus", - "{{ user `cpus` }}" - ], [ "modifyvm", "{{.Name}}", @@ -65,10 +55,10 @@ "tools_upload_flavor": "linux", "type": "vmware-iso", "vm_name": "{{ user `template` }}", + "memory": "{{ user `memory` }}", + "cpus": "{{ user `cpus` }}", "vmx_data": { - "cpuid.coresPerSocket": "1", - "memsize": "{{ user `memory` }}", - "numvcpus": "{{ user `cpus` }}" + "cpuid.coresPerSocket": "1" }, "vmx_remove_ethernet_interfaces": true }, @@ -85,20 +75,8 @@ "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", "output_directory": "../../builds/packer-{{user `template`}}-parallels", "parallels_tools_flavor": "lin", - "prlctl": [ - [ - "set", - "{{.Name}}", - "--memsize", - "{{ user `memory` }}" - ], - [ - "set", - "{{.Name}}", - "--cpus", - "{{ user `cpus` }}" - ] - ], + "memory": "{{ user `memory` }}", + "cpus": "{{ user `cpus` }}", "prlctl_version_file": ".prlctl_version", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", diff --git a/packer_templates/rhel/rhel-6.10-i386.json b/packer_templates/rhel/rhel-6.10-i386.json index ff66d122f..c9cd803da 100644 --- a/packer_templates/rhel/rhel-6.10-i386.json +++ b/packer_templates/rhel/rhel-6.10-i386.json @@ -21,20 +21,8 @@ "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", "type": "virtualbox-iso", - "vboxmanage": [ - [ - "modifyvm", - "{{.Name}}", - "--memory", - "{{ user `memory` }}" - ], - [ - "modifyvm", - "{{.Name}}", - "--cpus", - "{{ user `cpus` }}" - ] - ], + "memory": "{{ user `memory` }}", + "cpus": "{{ user `cpus` }}", "virtualbox_version_file": ".vbox_version", "vm_name": "{{ user `template` }}" }, @@ -59,10 +47,10 @@ "tools_upload_flavor": "linux", "type": "vmware-iso", "vm_name": "{{ user `template` }}", + "memory": "{{ user `memory` }}", + "cpus": "{{ user `cpus` }}", "vmx_data": { - "cpuid.coresPerSocket": "1", - "memsize": "{{ user `memory` }}", - "numvcpus": "{{ user `cpus` }}" + "cpuid.coresPerSocket": "1" }, "vmx_remove_ethernet_interfaces": true }, @@ -79,20 +67,8 @@ "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", "output_directory": "../../builds/packer-{{user `template`}}-parallels", "parallels_tools_flavor": "lin", - "prlctl": [ - [ - "set", - "{{.Name}}", - "--memsize", - "{{ user `memory` }}" - ], - [ - "set", - "{{.Name}}", - "--cpus", - "{{ user `cpus` }}" - ] - ], + "memory": "{{ user `memory` }}", + "cpus": "{{ user `cpus` }}", "prlctl_version_file": ".prlctl_version", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", diff --git a/packer_templates/rhel/rhel-6.10-x86_64.json b/packer_templates/rhel/rhel-6.10-x86_64.json index 05ab1ddda..64a3e21f0 100644 --- a/packer_templates/rhel/rhel-6.10-x86_64.json +++ b/packer_templates/rhel/rhel-6.10-x86_64.json @@ -21,20 +21,8 @@ "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", "type": "virtualbox-iso", - "vboxmanage": [ - [ - "modifyvm", - "{{.Name}}", - "--memory", - "{{ user `memory` }}" - ], - [ - "modifyvm", - "{{.Name}}", - "--cpus", - "{{ user `cpus` }}" - ] - ], + "memory": "{{ user `memory` }}", + "cpus": "{{ user `cpus` }}", "virtualbox_version_file": ".vbox_version", "vm_name": "{{ user `template` }}" }, @@ -59,10 +47,10 @@ "tools_upload_flavor": "linux", "type": "vmware-iso", "vm_name": "{{ user `template` }}", + "memory": "{{ user `memory` }}", + "cpus": "{{ user `cpus` }}", "vmx_data": { - "cpuid.coresPerSocket": "1", - "memsize": "{{ user `memory` }}", - "numvcpus": "{{ user `cpus` }}" + "cpuid.coresPerSocket": "1" }, "vmx_remove_ethernet_interfaces": true }, @@ -79,20 +67,8 @@ "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", "output_directory": "../../builds/packer-{{user `template`}}-parallels", "parallels_tools_flavor": "lin", - "prlctl": [ - [ - "set", - "{{.Name}}", - "--memsize", - "{{ user `memory` }}" - ], - [ - "set", - "{{.Name}}", - "--cpus", - "{{ user `cpus` }}" - ] - ], + "memory": "{{ user `memory` }}", + "cpus": "{{ user `cpus` }}", "prlctl_version_file": ".prlctl_version", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", diff --git a/packer_templates/rhel/rhel-7.6-x86_64.json b/packer_templates/rhel/rhel-7.6-x86_64.json index 5bc0d98ca..3cbe80d33 100644 --- a/packer_templates/rhel/rhel-7.6-x86_64.json +++ b/packer_templates/rhel/rhel-7.6-x86_64.json @@ -21,20 +21,8 @@ "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", "type": "virtualbox-iso", - "vboxmanage": [ - [ - "modifyvm", - "{{.Name}}", - "--memory", - "{{ user `memory` }}" - ], - [ - "modifyvm", - "{{.Name}}", - "--cpus", - "{{ user `cpus` }}" - ] - ], + "memory": "{{ user `memory` }}", + "cpus": "{{ user `cpus` }}", "virtualbox_version_file": ".vbox_version", "vm_name": "{{ user `template` }}" }, @@ -59,10 +47,10 @@ "tools_upload_flavor": "linux", "type": "vmware-iso", "vm_name": "{{ user `template` }}", + "memory": "{{ user `memory` }}", + "cpus": "{{ user `cpus` }}", "vmx_data": { - "cpuid.coresPerSocket": "1", - "memsize": "{{ user `memory` }}", - "numvcpus": "{{ user `cpus` }}" + "cpuid.coresPerSocket": "1" }, "vmx_remove_ethernet_interfaces": true }, @@ -79,20 +67,8 @@ "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", "output_directory": "../../builds/packer-{{user `template`}}-parallels", "parallels_tools_flavor": "lin", - "prlctl": [ - [ - "set", - "{{.Name}}", - "--memsize", - "{{ user `memory` }}" - ], - [ - "set", - "{{.Name}}", - "--cpus", - "{{ user `cpus` }}" - ] - ], + "memory": "{{ user `memory` }}", + "cpus": "{{ user `cpus` }}", "prlctl_version_file": ".prlctl_version", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", diff --git a/packer_templates/rhel/rhel-8.0-x86_64.json b/packer_templates/rhel/rhel-8.0-x86_64.json index c48ac141d..14b90fece 100644 --- a/packer_templates/rhel/rhel-8.0-x86_64.json +++ b/packer_templates/rhel/rhel-8.0-x86_64.json @@ -21,20 +21,8 @@ "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", "type": "virtualbox-iso", - "vboxmanage": [ - [ - "modifyvm", - "{{.Name}}", - "--memory", - "{{ user `memory` }}" - ], - [ - "modifyvm", - "{{.Name}}", - "--cpus", - "{{ user `cpus` }}" - ] - ], + "memory": "{{ user `memory` }}", + "cpus": "{{ user `cpus` }}", "virtualbox_version_file": ".vbox_version", "vm_name": "{{ user `template` }}" }, @@ -59,10 +47,10 @@ "tools_upload_flavor": "linux", "type": "vmware-iso", "vm_name": "{{ user `template` }}", + "memory": "{{ user `memory` }}", + "cpus": "{{ user `cpus` }}", "vmx_data": { - "cpuid.coresPerSocket": "1", - "memsize": "{{ user `memory` }}", - "numvcpus": "{{ user `cpus` }}" + "cpuid.coresPerSocket": "1" }, "vmx_remove_ethernet_interfaces": true }, @@ -79,20 +67,8 @@ "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", "output_directory": "../../builds/packer-{{user `template`}}-parallels", "parallels_tools_flavor": "lin", - "prlctl": [ - [ - "set", - "{{.Name}}", - "--memsize", - "{{ user `memory` }}" - ], - [ - "set", - "{{.Name}}", - "--cpus", - "{{ user `cpus` }}" - ] - ], + "memory": "{{ user `memory` }}", + "cpus": "{{ user `cpus` }}", "prlctl_version_file": ".prlctl_version", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", diff --git a/packer_templates/sles/sles-11-sp4-x86_64.json b/packer_templates/sles/sles-11-sp4-x86_64.json index ae093b44b..bc9b9a8ae 100644 --- a/packer_templates/sles/sles-11-sp4-x86_64.json +++ b/packer_templates/sles/sles-11-sp4-x86_64.json @@ -25,20 +25,8 @@ "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", "type": "virtualbox-iso", - "vboxmanage": [ - [ - "modifyvm", - "{{.Name}}", - "--memory", - "{{ user `memory` }}" - ], - [ - "modifyvm", - "{{.Name}}", - "--cpus", - "{{ user `cpus` }}" - ] - ], + "memory": "{{ user `memory` }}", + "cpus": "{{ user `cpus` }}", "virtualbox_version_file": ".vbox_version", "vm_name": "{{ user `template` }}" }, @@ -67,10 +55,10 @@ "tools_upload_flavor": "linux", "type": "vmware-iso", "vm_name": "{{ user `template` }}", + "memory": "{{ user `memory` }}", + "cpus": "{{ user `cpus` }}", "vmx_data": { - "cpuid.coresPerSocket": "1", - "memsize": "{{ user `memory` }}", - "numvcpus": "{{ user `cpus` }}" + "cpuid.coresPerSocket": "1" }, "vmx_remove_ethernet_interfaces": true }, @@ -91,20 +79,8 @@ "iso_url": "{{user `mirror`}}/{{user `iso_name`}}", "output_directory": "../../builds/packer-{{user `template`}}-parallels", "parallels_tools_flavor": "lin", - "prlctl": [ - [ - "set", - "{{.Name}}", - "--memsize", - "{{ user `memory` }}" - ], - [ - "set", - "{{.Name}}", - "--cpus", - "{{ user `cpus` }}" - ] - ], + "memory": "{{ user `memory` }}", + "cpus": "{{ user `cpus` }}", "prlctl_version_file": ".prlctl_version", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", diff --git a/packer_templates/sles/sles-12-sp2-x86_64.json b/packer_templates/sles/sles-12-sp2-x86_64.json index 6cfd43bc7..a4ee135c4 100644 --- a/packer_templates/sles/sles-12-sp2-x86_64.json +++ b/packer_templates/sles/sles-12-sp2-x86_64.json @@ -25,20 +25,8 @@ "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", "type": "virtualbox-iso", - "vboxmanage": [ - [ - "modifyvm", - "{{.Name}}", - "--memory", - "{{ user `memory` }}" - ], - [ - "modifyvm", - "{{.Name}}", - "--cpus", - "{{ user `cpus` }}" - ] - ], + "memory": "{{ user `memory` }}", + "cpus": "{{ user `cpus` }}", "virtualbox_version_file": ".vbox_version", "vm_name": "{{ user `template` }}" }, @@ -67,10 +55,10 @@ "tools_upload_flavor": "linux", "type": "vmware-iso", "vm_name": "{{ user `template` }}", + "memory": "{{ user `memory` }}", + "cpus": "{{ user `cpus` }}", "vmx_data": { - "cpuid.coresPerSocket": "1", - "memsize": "{{ user `memory` }}", - "numvcpus": "{{ user `cpus` }}" + "cpuid.coresPerSocket": "1" }, "vmx_remove_ethernet_interfaces": true }, @@ -91,20 +79,8 @@ "iso_url": "{{user `mirror`}}/{{user `iso_name`}}", "output_directory": "../../builds/packer-{{user `template`}}-parallels", "parallels_tools_flavor": "lin", - "prlctl": [ - [ - "set", - "{{.Name}}", - "--memsize", - "{{ user `memory` }}" - ], - [ - "set", - "{{.Name}}", - "--cpus", - "{{ user `cpus` }}" - ] - ], + "memory": "{{ user `memory` }}", + "cpus": "{{ user `cpus` }}", "prlctl_version_file": ".prlctl_version", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", diff --git a/packer_templates/sles/sles-12-sp3-x86_64.json b/packer_templates/sles/sles-12-sp3-x86_64.json index cd187c60d..9eff53b4b 100644 --- a/packer_templates/sles/sles-12-sp3-x86_64.json +++ b/packer_templates/sles/sles-12-sp3-x86_64.json @@ -25,20 +25,8 @@ "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", "type": "virtualbox-iso", - "vboxmanage": [ - [ - "modifyvm", - "{{.Name}}", - "--memory", - "{{ user `memory` }}" - ], - [ - "modifyvm", - "{{.Name}}", - "--cpus", - "{{ user `cpus` }}" - ] - ], + "memory": "{{ user `memory` }}", + "cpus": "{{ user `cpus` }}", "virtualbox_version_file": ".vbox_version", "vm_name": "{{ user `template` }}" }, @@ -67,10 +55,10 @@ "tools_upload_flavor": "linux", "type": "vmware-iso", "vm_name": "{{ user `template` }}", + "memory": "{{ user `memory` }}", + "cpus": "{{ user `cpus` }}", "vmx_data": { - "cpuid.coresPerSocket": "1", - "memsize": "{{ user `memory` }}", - "numvcpus": "{{ user `cpus` }}" + "cpuid.coresPerSocket": "1" }, "vmx_remove_ethernet_interfaces": true }, @@ -91,20 +79,8 @@ "iso_url": "{{user `mirror`}}/{{user `iso_name`}}", "output_directory": "../../builds/packer-{{user `template`}}-parallels", "parallels_tools_flavor": "lin", - "prlctl": [ - [ - "set", - "{{.Name}}", - "--memsize", - "{{ user `memory` }}" - ], - [ - "set", - "{{.Name}}", - "--cpus", - "{{ user `cpus` }}" - ] - ], + "memory": "{{ user `memory` }}", + "cpus": "{{ user `cpus` }}", "prlctl_version_file": ".prlctl_version", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", diff --git a/packer_templates/sles/sles-15-sp1.json b/packer_templates/sles/sles-15-sp1.json index 4e7a0d142..170a41a30 100644 --- a/packer_templates/sles/sles-15-sp1.json +++ b/packer_templates/sles/sles-15-sp1.json @@ -25,19 +25,9 @@ "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", "type": "virtualbox-iso", - "vboxmanage": [ - [ - "modifyvm", - "{{.Name}}", - "--memory", - "{{ user `memory` }}" - ], - [ - "modifyvm", - "{{.Name}}", - "--cpus", - "{{ user `cpus` }}" - ], + "memory": "{{ user `memory` }}", + "cpus": "{{ user `cpus` }}", + "manager": [ [ "storageattach", "{{.Name}}", @@ -81,10 +71,10 @@ "tools_upload_flavor": "linux", "type": "vmware-iso", "vm_name": "{{ user `template` }}", + "memory": "{{ user `memory` }}", + "cpus": "{{ user `cpus` }}", "vmx_data": { - "cpuid.coresPerSocket": "1", - "memsize": "{{ user `memory` }}", - "numvcpus": "{{ user `cpus` }}" + "cpuid.coresPerSocket": "1" }, "vmx_remove_ethernet_interfaces": true }, @@ -105,20 +95,8 @@ "iso_url": "{{user `mirror`}}/{{user `iso_name`}}", "output_directory": "../../builds/packer-{{user `template`}}-parallels", "parallels_tools_flavor": "lin", - "prlctl": [ - [ - "set", - "{{.Name}}", - "--memsize", - "{{ user `memory` }}" - ], - [ - "set", - "{{.Name}}", - "--cpus", - "{{ user `cpus` }}" - ] - ], + "memory": "{{ user `memory` }}", + "cpus": "{{ user `cpus` }}", "prlctl_version_file": ".prlctl_version", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", diff --git a/packer_templates/sles/sles-15.json b/packer_templates/sles/sles-15.json index 588534876..641acaa3b 100644 --- a/packer_templates/sles/sles-15.json +++ b/packer_templates/sles/sles-15.json @@ -25,19 +25,9 @@ "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", "type": "virtualbox-iso", - "vboxmanage": [ - [ - "modifyvm", - "{{.Name}}", - "--memory", - "{{ user `memory` }}" - ], - [ - "modifyvm", - "{{.Name}}", - "--cpus", - "{{ user `cpus` }}" - ], + "memory": "{{ user `memory` }}", + "cpus": "{{ user `cpus` }}", + "manager": [ [ "storageattach", "{{.Name}}", @@ -81,10 +71,10 @@ "tools_upload_flavor": "linux", "type": "vmware-iso", "vm_name": "{{ user `template` }}", + "memory": "{{ user `memory` }}", + "cpus": "{{ user `cpus` }}", "vmx_data": { - "cpuid.coresPerSocket": "1", - "memsize": "{{ user `memory` }}", - "numvcpus": "{{ user `cpus` }}" + "cpuid.coresPerSocket": "1" }, "vmx_remove_ethernet_interfaces": true }, @@ -105,20 +95,8 @@ "iso_url": "{{user `mirror`}}/{{user `iso_name`}}", "output_directory": "../../builds/packer-{{user `template`}}-parallels", "parallels_tools_flavor": "lin", - "prlctl": [ - [ - "set", - "{{.Name}}", - "--memsize", - "{{ user `memory` }}" - ], - [ - "set", - "{{.Name}}", - "--cpus", - "{{ user `cpus` }}" - ] - ], + "memory": "{{ user `memory` }}", + "cpus": "{{ user `cpus` }}", "prlctl_version_file": ".prlctl_version", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", diff --git a/packer_templates/solaris/solaris-10.11-x86.json b/packer_templates/solaris/solaris-10.11-x86.json index c695133c1..33f02c7f9 100644 --- a/packer_templates/solaris/solaris-10.11-x86.json +++ b/packer_templates/solaris/solaris-10.11-x86.json @@ -34,20 +34,8 @@ "ssh_username": "vagrant", "ssh_wait_timeout": "50000s", "type": "virtualbox-iso", - "vboxmanage": [ - [ - "modifyvm", - "{{.Name}}", - "--memory", - "{{ user `memory` }}" - ], - [ - "modifyvm", - "{{.Name}}", - "--cpus", - "{{ user `cpus` }}" - ] - ], + "memory": "{{ user `memory` }}", + "cpus": "{{ user `cpus` }}", "virtualbox_version_file": ".vbox_version", "vm_name": "{{ user `template` }}" }, @@ -87,10 +75,10 @@ "tools_upload_path": "/home/vagrant/solaris.iso", "type": "vmware-iso", "vm_name": "{{ user `template` }}", + "memory": "{{ user `memory` }}", + "cpus": "{{ user `cpus` }}", "vmx_data": { - "cpuid.coresPerSocket": "1", - "memsize": "{{ user `memory` }}", - "numvcpus": "{{ user `cpus` }}" + "cpuid.coresPerSocket": "1" }, "vmx_remove_ethernet_interfaces": true } diff --git a/packer_templates/solaris/solaris-11-x86.json b/packer_templates/solaris/solaris-11-x86.json index 75ca0d4e7..f5830e423 100644 --- a/packer_templates/solaris/solaris-11-x86.json +++ b/packer_templates/solaris/solaris-11-x86.json @@ -45,20 +45,8 @@ "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", "type": "virtualbox-iso", - "vboxmanage": [ - [ - "modifyvm", - "{{.Name}}", - "--memory", - "{{ user `memory` }}" - ], - [ - "modifyvm", - "{{.Name}}", - "--cpus", - "{{ user `cpus` }}" - ] - ], + "memory": "{{ user `memory` }}", + "cpus": "{{ user `cpus` }}", "virtualbox_version_file": ".vbox_version", "vm_name": "{{ user `template` }}" }, @@ -107,10 +95,10 @@ "ssh_wait_timeout": "10000s", "type": "vmware-iso", "vm_name": "{{ user `template` }}", + "memory": "{{ user `memory` }}", + "cpus": "{{ user `cpus` }}", "vmx_data": { - "cpuid.coresPerSocket": "1", - "memsize": "{{ user `memory` }}", - "numvcpus": "{{ user `cpus` }}" + "cpuid.coresPerSocket": "1" }, "vmx_remove_ethernet_interfaces": true } diff --git a/packer_templates/ubuntu/ubuntu-16.04-amd64.json b/packer_templates/ubuntu/ubuntu-16.04-amd64.json index a63113c26..a9d02ca39 100644 --- a/packer_templates/ubuntu/ubuntu-16.04-amd64.json +++ b/packer_templates/ubuntu/ubuntu-16.04-amd64.json @@ -44,20 +44,8 @@ "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", "type": "virtualbox-iso", - "vboxmanage": [ - [ - "modifyvm", - "{{.Name}}", - "--memory", - "{{ user `memory` }}" - ], - [ - "modifyvm", - "{{.Name}}", - "--cpus", - "{{ user `cpus` }}" - ] - ], + "memory": "{{ user `memory` }}", + "cpus": "{{ user `cpus` }}", "virtualbox_version_file": ".vbox_version", "vm_name": "{{ user `template` }}" }, @@ -105,11 +93,11 @@ "tools_upload_flavor": "linux", "type": "vmware-iso", "vm_name": "{{ user `template` }}", + "memory": "{{ user `memory` }}", + "cpus": "{{ user `cpus` }}", "vmx_data": { "cpuid.coresPerSocket": "1", - "ethernet0.pciSlotNumber": "32", - "memsize": "{{ user `memory` }}", - "numvcpus": "{{ user `cpus` }}" + "ethernet0.pciSlotNumber": "32" }, "vmx_remove_ethernet_interfaces": true }, @@ -149,20 +137,8 @@ "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", "output_directory": "../../builds/packer-{{user `template`}}-parallels", "parallels_tools_flavor": "lin", - "prlctl": [ - [ - "set", - "{{.Name}}", - "--memsize", - "{{ user `memory` }}" - ], - [ - "set", - "{{.Name}}", - "--cpus", - "{{ user `cpus` }}" - ] - ], + "memory": "{{ user `memory` }}", + "cpus": "{{ user `cpus` }}", "prlctl_version_file": ".prlctl_version", "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", "ssh_password": "vagrant", @@ -207,16 +183,8 @@ "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", "output_directory": "../../builds/packer-{{user `template`}}-qemu", - "qemuargs": [ - [ - "-m", - "{{ user `memory` }}M" - ], - [ - "-smp", - "{{ user `cpus` }}" - ] - ], + "memory": "{{ user `memory` }}", + "cpus": "{{ user `cpus` }}", "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", "ssh_password": "vagrant", "ssh_port": 22, diff --git a/packer_templates/ubuntu/ubuntu-16.04-i386.json b/packer_templates/ubuntu/ubuntu-16.04-i386.json index 311c3a3d2..aa56b919c 100644 --- a/packer_templates/ubuntu/ubuntu-16.04-i386.json +++ b/packer_templates/ubuntu/ubuntu-16.04-i386.json @@ -44,20 +44,8 @@ "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", "type": "virtualbox-iso", - "vboxmanage": [ - [ - "modifyvm", - "{{.Name}}", - "--memory", - "{{ user `memory` }}" - ], - [ - "modifyvm", - "{{.Name}}", - "--cpus", - "{{ user `cpus` }}" - ] - ], + "memory": "{{ user `memory` }}", + "cpus": "{{ user `cpus` }}", "virtualbox_version_file": ".vbox_version", "vm_name": "{{ user `template` }}" }, @@ -105,10 +93,10 @@ "tools_upload_flavor": "linux", "type": "vmware-iso", "vm_name": "{{ user `template` }}", + "memory": "{{ user `memory` }}", + "cpus": "{{ user `cpus` }}", "vmx_data": { - "cpuid.coresPerSocket": "1", - "memsize": "{{ user `memory` }}", - "numvcpus": "{{ user `cpus` }}" + "cpuid.coresPerSocket": "1" }, "vmx_remove_ethernet_interfaces": true }, @@ -148,20 +136,8 @@ "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", "output_directory": "../../builds/packer-{{user `template`}}-parallels", "parallels_tools_flavor": "lin", - "prlctl": [ - [ - "set", - "{{.Name}}", - "--memsize", - "{{ user `memory` }}" - ], - [ - "set", - "{{.Name}}", - "--cpus", - "{{ user `cpus` }}" - ] - ], + "memory": "{{ user `memory` }}", + "cpus": "{{ user `cpus` }}", "prlctl_version_file": ".prlctl_version", "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", "ssh_password": "vagrant", @@ -206,23 +182,15 @@ "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", "output_directory": "../../builds/packer-{{user `template`}}-qemu", + "memory": "{{ user `memory` }}", + "cpus": "{{ user `cpus` }}", "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", "type": "qemu", - "vm_name": "{{ user `template` }}", - "qemuargs": [ - [ - "-m", - "{{ user `memory` }}M" - ], - [ - "-smp", - "{{ user `cpus` }}" - ] - ] + "vm_name": "{{ user `template` }}" } ], "post-processors": [ diff --git a/packer_templates/ubuntu/ubuntu-18.04-amd64.json b/packer_templates/ubuntu/ubuntu-18.04-amd64.json index e09596e92..2ca3f42ec 100644 --- a/packer_templates/ubuntu/ubuntu-18.04-amd64.json +++ b/packer_templates/ubuntu/ubuntu-18.04-amd64.json @@ -43,20 +43,8 @@ "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", "type": "virtualbox-iso", - "vboxmanage": [ - [ - "modifyvm", - "{{.Name}}", - "--memory", - "{{ user `memory` }}" - ], - [ - "modifyvm", - "{{.Name}}", - "--cpus", - "{{ user `cpus` }}" - ] - ], + "memory": "{{ user `memory` }}", + "cpus": "{{ user `cpus` }}", "virtualbox_version_file": ".vbox_version", "vm_name": "{{ user `template` }}" }, @@ -103,11 +91,11 @@ "tools_upload_flavor": "linux", "type": "vmware-iso", "vm_name": "{{ user `template` }}", + "memory": "{{ user `memory` }}", + "cpus": "{{ user `cpus` }}", "vmx_data": { "cpuid.coresPerSocket": "1", - "ethernet0.pciSlotNumber": "32", - "memsize": "{{ user `memory` }}", - "numvcpus": "{{ user `cpus` }}" + "ethernet0.pciSlotNumber": "32" }, "vmx_remove_ethernet_interfaces": true }, @@ -146,20 +134,8 @@ "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", "output_directory": "../../builds/packer-{{user `template`}}-parallels", "parallels_tools_flavor": "lin", - "prlctl": [ - [ - "set", - "{{.Name}}", - "--memsize", - "{{ user `memory` }}" - ], - [ - "set", - "{{.Name}}", - "--cpus", - "{{ user `cpus` }}" - ] - ], + "memory": "{{ user `memory` }}", + "cpus": "{{ user `cpus` }}", "prlctl_version_file": ".prlctl_version", "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", "ssh_password": "vagrant", @@ -203,16 +179,8 @@ "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", "output_directory": "../../builds/packer-{{user `template`}}-qemu", - "qemuargs": [ - [ - "-m", - "{{ user `memory` }}M" - ], - [ - "-smp", - "{{ user `cpus` }}" - ] - ], + "memory": "{{ user `memory` }}", + "cpus": "{{ user `cpus` }}", "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", "ssh_password": "vagrant", "ssh_port": 22, diff --git a/packer_templates/ubuntu/ubuntu-18.10-amd64.json b/packer_templates/ubuntu/ubuntu-18.10-amd64.json index ebb41eb48..ee27aa7ef 100644 --- a/packer_templates/ubuntu/ubuntu-18.10-amd64.json +++ b/packer_templates/ubuntu/ubuntu-18.10-amd64.json @@ -43,20 +43,8 @@ "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", "type": "virtualbox-iso", - "vboxmanage": [ - [ - "modifyvm", - "{{.Name}}", - "--memory", - "{{ user `memory` }}" - ], - [ - "modifyvm", - "{{.Name}}", - "--cpus", - "{{ user `cpus` }}" - ] - ], + "memory": "{{ user `memory` }}", + "cpus": "{{ user `cpus` }}", "virtualbox_version_file": ".vbox_version", "vm_name": "{{ user `template` }}" }, @@ -103,11 +91,11 @@ "tools_upload_flavor": "linux", "type": "vmware-iso", "vm_name": "{{ user `template` }}", + "memory": "{{ user `memory` }}", + "cpus": "{{ user `cpus` }}", "vmx_data": { "cpuid.coresPerSocket": "1", - "ethernet0.pciSlotNumber": "32", - "memsize": "{{ user `memory` }}", - "numvcpus": "{{ user `cpus` }}" + "ethernet0.pciSlotNumber": "32" }, "vmx_remove_ethernet_interfaces": true }, @@ -146,20 +134,8 @@ "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", "output_directory": "../../builds/packer-{{user `template`}}-parallels", "parallels_tools_flavor": "lin", - "prlctl": [ - [ - "set", - "{{.Name}}", - "--memsize", - "{{ user `memory` }}" - ], - [ - "set", - "{{.Name}}", - "--cpus", - "{{ user `cpus` }}" - ] - ], + "memory": "{{ user `memory` }}", + "cpus": "{{ user `cpus` }}", "prlctl_version_file": ".prlctl_version", "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", "ssh_password": "vagrant", @@ -203,16 +179,8 @@ "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", "output_directory": "../../builds/packer-{{user `template`}}-qemu", - "qemuargs": [ - [ - "-m", - "{{ user `memory` }}M" - ], - [ - "-smp", - "{{ user `cpus` }}" - ] - ], + "memory": "{{ user `memory` }}", + "cpus": "{{ user `cpus` }}", "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", "ssh_password": "vagrant", "ssh_port": 22, diff --git a/packer_templates/ubuntu/ubuntu-19.04-amd64.json b/packer_templates/ubuntu/ubuntu-19.04-amd64.json index 9ed1787f5..bffa967a8 100644 --- a/packer_templates/ubuntu/ubuntu-19.04-amd64.json +++ b/packer_templates/ubuntu/ubuntu-19.04-amd64.json @@ -43,20 +43,8 @@ "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", "type": "virtualbox-iso", - "vboxmanage": [ - [ - "modifyvm", - "{{.Name}}", - "--memory", - "{{ user `memory` }}" - ], - [ - "modifyvm", - "{{.Name}}", - "--cpus", - "{{ user `cpus` }}" - ] - ], + "memory": "{{ user `memory` }}", + "cpus": "{{ user `cpus` }}", "virtualbox_version_file": ".vbox_version", "vm_name": "{{ user `template` }}" }, @@ -103,11 +91,11 @@ "tools_upload_flavor": "linux", "type": "vmware-iso", "vm_name": "{{ user `template` }}", + "memory": "{{ user `memory` }}", + "cpus": "{{ user `cpus` }}", "vmx_data": { "cpuid.coresPerSocket": "1", - "ethernet0.pciSlotNumber": "32", - "memsize": "{{ user `memory` }}", - "numvcpus": "{{ user `cpus` }}" + "ethernet0.pciSlotNumber": "32" }, "vmx_remove_ethernet_interfaces": true }, @@ -146,20 +134,8 @@ "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", "output_directory": "../../builds/packer-{{user `template`}}-parallels", "parallels_tools_flavor": "lin", - "prlctl": [ - [ - "set", - "{{.Name}}", - "--memsize", - "{{ user `memory` }}" - ], - [ - "set", - "{{.Name}}", - "--cpus", - "{{ user `cpus` }}" - ] - ], + "memory": "{{ user `memory` }}", + "cpus": "{{ user `cpus` }}", "prlctl_version_file": ".prlctl_version", "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", "ssh_password": "vagrant", @@ -203,16 +179,8 @@ "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", "output_directory": "../../builds/packer-{{user `template`}}-qemu", - "qemuargs": [ - [ - "-m", - "{{ user `memory` }}M" - ], - [ - "-smp", - "{{ user `cpus` }}" - ] - ], + "memory": "{{ user `memory` }}", + "cpus": "{{ user `cpus` }}", "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", "ssh_password": "vagrant", "ssh_port": 22, diff --git a/packer_templates/windows/windows-10.json b/packer_templates/windows/windows-10.json index 8d2a788c2..bbfa64059 100644 --- a/packer_templates/windows/windows-10.json +++ b/packer_templates/windows/windows-10.json @@ -2,11 +2,11 @@ "builders": [{ "type": "virtualbox-iso", "vboxmanage": [ - ["modifyvm", "{{.Name}}", "--memory", "4096"], ["modifyvm", "{{.Name}}", "--vram", "48"], - ["modifyvm", "{{.Name}}", "--cpus", "2"], ["modifyvm", "{{.Name}}", "--audio", "none"] ], + "memory": "{{ user `memory` }}", + "cpus": "{{ user `cpus` }}", "guest_additions_mode": "{{ user `guest_additions_mode` }}", "guest_additions_path": "C:/users/vagrant/VBoxGuestAdditions.iso", "guest_os_type": "Windows10_64", @@ -30,11 +30,11 @@ { "type": "vmware-iso", "vmx_data": { - "memsize": "4096", - "numvcpus": "2", "scsi0.virtualDev": "lsisas1068", "scsi0.present": "TRUE" }, + "memory": "{{ user `memory` }}", + "cpus": "{{ user `cpus` }}", "guest_os_type": "windows9srv-64", "headless": "{{ user `headless` }}", "iso_url": "{{ user `iso_url` }}", @@ -109,6 +109,8 @@ }] ], "variables": { + "memory": 4096, + "cpus": 2, "guest_additions_mode": "attach", "headless": "true", "iso_checksum": "743fc483bb8bf1901c0534a0ae15208a5a72a3c5", diff --git a/packer_templates/windows/windows-2008r2.json b/packer_templates/windows/windows-2008r2.json index 015e913dd..97c5450bf 100644 --- a/packer_templates/windows/windows-2008r2.json +++ b/packer_templates/windows/windows-2008r2.json @@ -2,10 +2,10 @@ "builders": [{ "type": "virtualbox-iso", "vboxmanage": [ - ["modifyvm", "{{.Name}}", "--memory", "4096"], - ["modifyvm", "{{.Name}}", "--vram", "48"], - ["modifyvm", "{{.Name}}", "--cpus", "2"] + ["modifyvm", "{{.Name}}", "--vram", "48"] ], + "memory": "{{ user `memory` }}", + "cpus": "{{ user `cpus` }}", "guest_additions_mode": "{{ user `guest_additions_mode` }}", "guest_additions_path": "C:/users/vagrant/VBoxGuestAdditions.iso", "guest_os_type": "Windows2008_64", @@ -72,6 +72,8 @@ }] ], "variables": { + "memory": 4096, + "cpus": 2, "guest_additions_mode": "attach", "headless": "false", "iso_checksum": "beed231a34e90e1dd9a04b3afabec31d62ce3889", diff --git a/packer_templates/windows/windows-2012r2.json b/packer_templates/windows/windows-2012r2.json index 7cbc24138..109179851 100644 --- a/packer_templates/windows/windows-2012r2.json +++ b/packer_templates/windows/windows-2012r2.json @@ -2,10 +2,10 @@ "builders": [{ "type": "virtualbox-iso", "vboxmanage": [ - ["modifyvm", "{{.Name}}", "--memory", "4096"], - ["modifyvm", "{{.Name}}", "--vram", "48"], - ["modifyvm", "{{.Name}}", "--cpus", "2"] + ["modifyvm", "{{.Name}}", "--vram", "48"] ], + "memory": "{{ user `memory` }}", + "cpus": "{{ user `cpus` }}", "guest_additions_mode": "{{ user `guest_additions_mode` }}", "guest_additions_path": "C:/users/vagrant/VBoxGuestAdditions.iso", "guest_os_type": "Windows2012_64", @@ -27,11 +27,11 @@ { "type": "vmware-iso", "vmx_data": { - "memsize": "4096", - "numvcpus": "2", "scsi0.virtualDev": "lsisas1068", "scsi0.present": "TRUE" }, + "memory": "{{ user `memory` }}", + "cpus": "{{ user `cpus` }}", "guest_os_type": "windows9srv-64", "headless": "{{ user `headless` }}", "iso_url": "{{ user `iso_url` }}", @@ -104,10 +104,12 @@ }] ], "variables": { + "cpus": 2, + "memory": 4096, "guest_additions_mode": "attach", "headless": "true", "iso_checksum": "849734f37346385dac2c101e4aacba4626bb141c", "iso_url": "http://download.microsoft.com/download/6/2/A/62A76ABB-9990-4EFC-A4FE-C7D698DAEB96/9600.17050.WINBLUE_REFRESH.140317-1640_X64FRE_SERVER_EVAL_EN-US-IR3_SSS_X64FREE_EN-US_DV9.ISO", "template": "windows-2012r2-standard" } -} \ No newline at end of file +} diff --git a/packer_templates/windows/windows-2016.json b/packer_templates/windows/windows-2016.json index 74cd1db27..1ceb83cec 100644 --- a/packer_templates/windows/windows-2016.json +++ b/packer_templates/windows/windows-2016.json @@ -2,10 +2,10 @@ "builders": [{ "type": "virtualbox-iso", "vboxmanage": [ - ["modifyvm", "{{.Name}}", "--memory", "4096"], - ["modifyvm", "{{.Name}}", "--vram", "48"], - ["modifyvm", "{{.Name}}", "--cpus", "2"] + ["modifyvm", "{{.Name}}", "--vram", "48"] ], + "memory": "{{ user `memory` }}", + "cpus": "{{ user `cpus` }}", "guest_additions_mode": "{{ user `guest_additions_mode` }}", "guest_additions_path": "C:/users/vagrant/VBoxGuestAdditions.iso", "guest_os_type": "Windows2016_64", @@ -27,11 +27,11 @@ { "type": "vmware-iso", "vmx_data": { - "memsize": "4096", - "numvcpus": "2", "scsi0.virtualDev": "lsisas1068", "scsi0.present": "TRUE" }, + "memory": "{{ user `memory` }}", + "cpus": "{{ user `cpus` }}", "guest_os_type": "windows9srv-64", "headless": "{{ user `headless` }}", "iso_url": "{{ user `iso_url` }}", @@ -104,6 +104,8 @@ }] ], "variables": { + "memory": 4096, + "cpus": 2, "guest_additions_mode": "attach", "headless": "true", "iso_checksum": "772700802951b36c8cb26a61c040b9a8dc3816a3", diff --git a/packer_templates/windows/windows-2019.json b/packer_templates/windows/windows-2019.json index 9cd1509a7..6e071c58e 100644 --- a/packer_templates/windows/windows-2019.json +++ b/packer_templates/windows/windows-2019.json @@ -2,10 +2,10 @@ "builders": [{ "type": "virtualbox-iso", "vboxmanage": [ - ["modifyvm", "{{.Name}}", "--memory", "4096"], - ["modifyvm", "{{.Name}}", "--vram", "48"], - ["modifyvm", "{{.Name}}", "--cpus", "2"] + ["modifyvm", "{{.Name}}", "--vram", "48"] ], + "memory": "{{ user `memory` }}", + "cpus": "{{ user `cpus` }}", "guest_additions_mode": "{{ user `guest_additions_mode` }}", "guest_additions_path": "C:/users/vagrant/VBoxGuestAdditions.iso", "guest_os_type": "Windows2016_64", @@ -27,11 +27,11 @@ { "type": "vmware-iso", "vmx_data": { - "memsize": "4096", - "numvcpus": "2", "scsi0.virtualDev": "lsisas1068", "scsi0.present": "TRUE" }, + "memory": "{{ user `memory` }}", + "cpus": "{{ user `cpus` }}", "guest_os_type": "windows9srv-64", "headless": "{{ user `headless` }}", "iso_url": "{{ user `iso_url` }}", @@ -104,6 +104,8 @@ }] ], "variables": { + "memory": 4096, + "cpus": 2, "guest_additions_mode": "attach", "headless": "true", "iso_checksum": "91e3a2f1acc39af21353c7cc105c799494d7539f", diff --git a/packer_templates/windows/windows-7.json b/packer_templates/windows/windows-7.json index 3b3a8f3e9..a193aa6d9 100644 --- a/packer_templates/windows/windows-7.json +++ b/packer_templates/windows/windows-7.json @@ -2,10 +2,10 @@ "builders": [{ "type": "virtualbox-iso", "vboxmanage": [ - ["modifyvm", "{{.Name}}", "--memory", "5120"], - ["modifyvm", "{{.Name}}", "--vram", "36"], - ["modifyvm", "{{.Name}}", "--cpus", "2"] + ["modifyvm", "{{.Name}}", "--vram", "36"] ], + "memory": "{{ user `memory` }}", + "cpus": "{{ user `cpus` }}", "guest_additions_mode": "{{ user `guest_additions_mode` }}", "guest_additions_path": "C:/users/vagrant/VBoxGuestAdditions.iso", "guest_os_type": "Windows7_64", @@ -24,7 +24,7 @@ "answer_files/7/Autounattend.xml" ] }], - "provisioners": [{ + "provisioners": [{ "type": "chef-solo", "cookbook_paths": ["cookbooks"], "guest_os_type": "windows", @@ -79,10 +79,12 @@ }] ], "variables": { + "memory": 4096, + "cpus": 2, "guest_additions_mode": "attach", "headless": "false", - "iso_checksum": "971fc00183a52c152fe924a6b99fdec011a871c2", - "iso_url": "http://care.dlservice.microsoft.com/dl/download/evalx/win7/x86/EN/7600.16385.090713-1255_x86fre_enterprise_en-us_EVAL_Eval_Enterprise-GRMCENEVAL_EN_DVD.iso", + "iso_checksum": "971fc00183a52c152fe924a6b99fdec011a871c2", + "iso_url": "http://care.dlservice.microsoft.com/dl/download/evalx/win7/x86/EN/7600.16385.090713-1255_x86fre_enterprise_en-us_EVAL_Eval_Enterprise-GRMCENEVAL_EN_DVD.iso", "template": "windows-7" } } From b0383ac4e529561ef440f71c8baa8eb4fd662925 Mon Sep 17 00:00:00 2001 From: Ali Rizvi-Santiago <arizvisa@gmail.com> Date: Wed, 30 Oct 2019 17:03:59 -0500 Subject: [PATCH 1041/1622] Updated all the templates to specify the memory and cpus options for the qemu builder where they weren't being assigned. Signed-off-by: Ali Rizvi-Santiago <arizvisa@gmail.com> --- packer_templates/centos/centos-5.11-i386.json | 2 ++ packer_templates/centos/centos-5.11-x86_64.json | 2 ++ packer_templates/centos/centos-6.10-i386.json | 2 ++ packer_templates/centos/centos-6.10-x86_64.json | 2 ++ packer_templates/centos/centos-7.7-x86_64.json | 2 ++ packer_templates/centos/centos-8.0-x86_64.json | 2 ++ packer_templates/debian/debian-10.1-amd64.json | 2 ++ packer_templates/debian/debian-10.1-i386.json | 2 ++ packer_templates/debian/debian-8.11-amd64.json | 2 ++ packer_templates/debian/debian-8.11-i386.json | 2 ++ packer_templates/debian/debian-9.11-amd64.json | 2 ++ packer_templates/debian/debian-9.11-i386.json | 2 ++ packer_templates/debian/debian-9.11-ppc64el.json | 2 ++ packer_templates/fedora/fedora-29-x86_64.json | 2 ++ packer_templates/fedora/fedora-30-x86_64.json | 2 ++ packer_templates/opensuse/opensuse-leap-15.1-x86_64.json | 2 ++ packer_templates/oraclelinux/oracle-5.11-i386.json | 2 ++ packer_templates/oraclelinux/oracle-5.11-x86_64.json | 2 ++ packer_templates/oraclelinux/oracle-6.10-i386.json | 4 +++- packer_templates/oraclelinux/oracle-6.10-x86_64.json | 2 ++ packer_templates/oraclelinux/oracle-7.7-x86_64.json | 4 +++- packer_templates/rhel/rhel-5.11-i386.json | 2 ++ packer_templates/rhel/rhel-5.11-x86_64.json | 2 ++ packer_templates/rhel/rhel-6.10-i386.json | 2 ++ packer_templates/rhel/rhel-6.10-x86_64.json | 2 ++ packer_templates/rhel/rhel-7.6-x86_64.json | 2 ++ packer_templates/rhel/rhel-8.0-x86_64.json | 2 ++ packer_templates/sles/sles-11-sp4-x86_64.json | 2 ++ packer_templates/sles/sles-12-sp2-x86_64.json | 2 ++ packer_templates/sles/sles-12-sp3-x86_64.json | 2 ++ packer_templates/sles/sles-15-sp1.json | 2 ++ packer_templates/sles/sles-15.json | 2 ++ 32 files changed, 66 insertions(+), 2 deletions(-) diff --git a/packer_templates/centos/centos-5.11-i386.json b/packer_templates/centos/centos-5.11-i386.json index 46d6c39c4..129454572 100644 --- a/packer_templates/centos/centos-5.11-i386.json +++ b/packer_templates/centos/centos-5.11-i386.json @@ -110,6 +110,8 @@ "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], "boot_wait": "10s", + "memory": "{{ user `memory` }}", + "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", "http_directory": "http", diff --git a/packer_templates/centos/centos-5.11-x86_64.json b/packer_templates/centos/centos-5.11-x86_64.json index cc3876837..27fdc7e68 100644 --- a/packer_templates/centos/centos-5.11-x86_64.json +++ b/packer_templates/centos/centos-5.11-x86_64.json @@ -110,6 +110,8 @@ "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], "boot_wait": "10s", + "memory": "{{ user `memory` }}", + "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", "http_directory": "http", diff --git a/packer_templates/centos/centos-6.10-i386.json b/packer_templates/centos/centos-6.10-i386.json index ea38ddac0..9fce8f88f 100644 --- a/packer_templates/centos/centos-6.10-i386.json +++ b/packer_templates/centos/centos-6.10-i386.json @@ -110,6 +110,8 @@ "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], "boot_wait": "10s", + "memory": "{{ user `memory` }}", + "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", "http_directory": "http", diff --git a/packer_templates/centos/centos-6.10-x86_64.json b/packer_templates/centos/centos-6.10-x86_64.json index 8d1cc5a43..ef03324f6 100644 --- a/packer_templates/centos/centos-6.10-x86_64.json +++ b/packer_templates/centos/centos-6.10-x86_64.json @@ -110,6 +110,8 @@ "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], "boot_wait": "10s", + "memory": "{{ user `memory` }}", + "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", "http_directory": "http", diff --git a/packer_templates/centos/centos-7.7-x86_64.json b/packer_templates/centos/centos-7.7-x86_64.json index b4dcab140..9b0ffe0d2 100644 --- a/packer_templates/centos/centos-7.7-x86_64.json +++ b/packer_templates/centos/centos-7.7-x86_64.json @@ -110,6 +110,8 @@ "<up><wait><tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], "boot_wait": "10s", + "memory": "{{ user `memory` }}", + "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", "http_directory": "http", diff --git a/packer_templates/centos/centos-8.0-x86_64.json b/packer_templates/centos/centos-8.0-x86_64.json index 2f03a5b0c..7ff62a844 100644 --- a/packer_templates/centos/centos-8.0-x86_64.json +++ b/packer_templates/centos/centos-8.0-x86_64.json @@ -110,6 +110,8 @@ "<up><wait><tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], "boot_wait": "10s", + "memory": "{{ user `memory` }}", + "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", "http_directory": "http", diff --git a/packer_templates/debian/debian-10.1-amd64.json b/packer_templates/debian/debian-10.1-amd64.json index 9e5877b69..08e99cd11 100644 --- a/packer_templates/debian/debian-10.1-amd64.json +++ b/packer_templates/debian/debian-10.1-amd64.json @@ -144,6 +144,8 @@ "<enter><wait>" ], "boot_wait": "10s", + "memory": "{{ user `memory` }}", + "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", "http_directory": "http", diff --git a/packer_templates/debian/debian-10.1-i386.json b/packer_templates/debian/debian-10.1-i386.json index c769aca4c..8a60074be 100644 --- a/packer_templates/debian/debian-10.1-i386.json +++ b/packer_templates/debian/debian-10.1-i386.json @@ -144,6 +144,8 @@ "<enter><wait>" ], "boot_wait": "10s", + "memory": "{{ user `memory` }}", + "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", "http_directory": "http", diff --git a/packer_templates/debian/debian-8.11-amd64.json b/packer_templates/debian/debian-8.11-amd64.json index cae3945d9..d83449096 100644 --- a/packer_templates/debian/debian-8.11-amd64.json +++ b/packer_templates/debian/debian-8.11-amd64.json @@ -144,6 +144,8 @@ "<enter><wait>" ], "boot_wait": "10s", + "memory": "{{ user `memory` }}", + "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", "http_directory": "http", diff --git a/packer_templates/debian/debian-8.11-i386.json b/packer_templates/debian/debian-8.11-i386.json index c033f1331..06d4af74d 100644 --- a/packer_templates/debian/debian-8.11-i386.json +++ b/packer_templates/debian/debian-8.11-i386.json @@ -144,6 +144,8 @@ "<enter><wait>" ], "boot_wait": "10s", + "memory": "{{ user `memory` }}", + "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", "http_directory": "http", diff --git a/packer_templates/debian/debian-9.11-amd64.json b/packer_templates/debian/debian-9.11-amd64.json index 90eb7f5a2..cb3133bf5 100644 --- a/packer_templates/debian/debian-9.11-amd64.json +++ b/packer_templates/debian/debian-9.11-amd64.json @@ -144,6 +144,8 @@ "<enter><wait>" ], "boot_wait": "10s", + "memory": "{{ user `memory` }}", + "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", "http_directory": "http", diff --git a/packer_templates/debian/debian-9.11-i386.json b/packer_templates/debian/debian-9.11-i386.json index 24bd68556..66139670b 100644 --- a/packer_templates/debian/debian-9.11-i386.json +++ b/packer_templates/debian/debian-9.11-i386.json @@ -144,6 +144,8 @@ "<enter><wait>" ], "boot_wait": "10s", + "memory": "{{ user `memory` }}", + "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", "http_directory": "http", diff --git a/packer_templates/debian/debian-9.11-ppc64el.json b/packer_templates/debian/debian-9.11-ppc64el.json index 39bbf5fcd..14e5f8f3d 100644 --- a/packer_templates/debian/debian-9.11-ppc64el.json +++ b/packer_templates/debian/debian-9.11-ppc64el.json @@ -25,6 +25,8 @@ "boot<enter>" ], "boot_wait": "10s", + "memory": "{{ user `memory` }}", + "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", "http_directory": "http", diff --git a/packer_templates/fedora/fedora-29-x86_64.json b/packer_templates/fedora/fedora-29-x86_64.json index 2ee7ca0f2..de9fee415 100644 --- a/packer_templates/fedora/fedora-29-x86_64.json +++ b/packer_templates/fedora/fedora-29-x86_64.json @@ -114,6 +114,8 @@ "<tab> linux ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], "boot_wait": "10s", + "memory": "{{ user `memory` }}", + "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", "http_directory": "http", diff --git a/packer_templates/fedora/fedora-30-x86_64.json b/packer_templates/fedora/fedora-30-x86_64.json index 2c3c64245..5e0587c70 100644 --- a/packer_templates/fedora/fedora-30-x86_64.json +++ b/packer_templates/fedora/fedora-30-x86_64.json @@ -114,6 +114,8 @@ "<tab> linux ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], "boot_wait": "10s", + "memory": "{{ user `memory` }}", + "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", "http_directory": "http", diff --git a/packer_templates/opensuse/opensuse-leap-15.1-x86_64.json b/packer_templates/opensuse/opensuse-leap-15.1-x86_64.json index d5c2d9f42..8900a5fc0 100644 --- a/packer_templates/opensuse/opensuse-leap-15.1-x86_64.json +++ b/packer_templates/opensuse/opensuse-leap-15.1-x86_64.json @@ -114,6 +114,8 @@ "<enter><wait>" ], "boot_wait": "10s", + "memory": "{{ user `memory` }}", + "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", "http_directory": "http", diff --git a/packer_templates/oraclelinux/oracle-5.11-i386.json b/packer_templates/oraclelinux/oracle-5.11-i386.json index a636dfbd0..d4f3bc8b8 100644 --- a/packer_templates/oraclelinux/oracle-5.11-i386.json +++ b/packer_templates/oraclelinux/oracle-5.11-i386.json @@ -83,6 +83,8 @@ "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], "boot_wait": "10s", + "memory": "{{ user `memory` }}", + "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", "http_directory": "../centos/http", diff --git a/packer_templates/oraclelinux/oracle-5.11-x86_64.json b/packer_templates/oraclelinux/oracle-5.11-x86_64.json index d9bd22a1f..bd4d395f7 100644 --- a/packer_templates/oraclelinux/oracle-5.11-x86_64.json +++ b/packer_templates/oraclelinux/oracle-5.11-x86_64.json @@ -91,6 +91,8 @@ "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], "boot_wait": "10s", + "memory": "{{ user `memory` }}", + "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", "http_directory": "../centos/http", diff --git a/packer_templates/oraclelinux/oracle-6.10-i386.json b/packer_templates/oraclelinux/oracle-6.10-i386.json index 6bd2c59db..c19e808dc 100644 --- a/packer_templates/oraclelinux/oracle-6.10-i386.json +++ b/packer_templates/oraclelinux/oracle-6.10-i386.json @@ -83,6 +83,8 @@ "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], "boot_wait": "10s", + "memory": "{{ user `memory` }}", + "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", "http_directory": "../centos/http", @@ -152,4 +154,4 @@ "template": "oracle-6.10-i386", "version": "TIMESTAMP" } -} \ No newline at end of file +} diff --git a/packer_templates/oraclelinux/oracle-6.10-x86_64.json b/packer_templates/oraclelinux/oracle-6.10-x86_64.json index 9ed3942b2..0cecccc20 100644 --- a/packer_templates/oraclelinux/oracle-6.10-x86_64.json +++ b/packer_templates/oraclelinux/oracle-6.10-x86_64.json @@ -83,6 +83,8 @@ "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], "boot_wait": "10s", + "memory": "{{ user `memory` }}", + "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", "http_directory": "../centos/http", diff --git a/packer_templates/oraclelinux/oracle-7.7-x86_64.json b/packer_templates/oraclelinux/oracle-7.7-x86_64.json index bf3d5fdf8..dfe407306 100644 --- a/packer_templates/oraclelinux/oracle-7.7-x86_64.json +++ b/packer_templates/oraclelinux/oracle-7.7-x86_64.json @@ -83,6 +83,8 @@ "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], "boot_wait": "10s", + "memory": "{{ user `memory` }}", + "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", "http_directory": "../centos/http", @@ -152,4 +154,4 @@ "template": "oracle-7.7-x86_64", "version": "TIMESTAMP" } -} \ No newline at end of file +} diff --git a/packer_templates/rhel/rhel-5.11-i386.json b/packer_templates/rhel/rhel-5.11-i386.json index 7ff97f6bf..1721cf848 100644 --- a/packer_templates/rhel/rhel-5.11-i386.json +++ b/packer_templates/rhel/rhel-5.11-i386.json @@ -83,6 +83,8 @@ "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], "boot_wait": "10s", + "memory": "{{ user `memory` }}", + "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", "http_directory": "../centos/http", diff --git a/packer_templates/rhel/rhel-5.11-x86_64.json b/packer_templates/rhel/rhel-5.11-x86_64.json index 27d64edad..7f4fa2357 100644 --- a/packer_templates/rhel/rhel-5.11-x86_64.json +++ b/packer_templates/rhel/rhel-5.11-x86_64.json @@ -91,6 +91,8 @@ "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], "boot_wait": "10s", + "memory": "{{ user `memory` }}", + "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", "http_directory": "../centos/http", diff --git a/packer_templates/rhel/rhel-6.10-i386.json b/packer_templates/rhel/rhel-6.10-i386.json index c9cd803da..d07d9872f 100644 --- a/packer_templates/rhel/rhel-6.10-i386.json +++ b/packer_templates/rhel/rhel-6.10-i386.json @@ -83,6 +83,8 @@ "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], "boot_wait": "10s", + "memory": "{{ user `memory` }}", + "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", "http_directory": "../centos/http", diff --git a/packer_templates/rhel/rhel-6.10-x86_64.json b/packer_templates/rhel/rhel-6.10-x86_64.json index 64a3e21f0..a456e75a6 100644 --- a/packer_templates/rhel/rhel-6.10-x86_64.json +++ b/packer_templates/rhel/rhel-6.10-x86_64.json @@ -83,6 +83,8 @@ "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], "boot_wait": "10s", + "memory": "{{ user `memory` }}", + "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", "http_directory": "../centos/http", diff --git a/packer_templates/rhel/rhel-7.6-x86_64.json b/packer_templates/rhel/rhel-7.6-x86_64.json index 3cbe80d33..d9c6a471d 100644 --- a/packer_templates/rhel/rhel-7.6-x86_64.json +++ b/packer_templates/rhel/rhel-7.6-x86_64.json @@ -83,6 +83,8 @@ "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], "boot_wait": "10s", + "memory": "{{ user `memory` }}", + "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", "http_directory": "../centos/http", diff --git a/packer_templates/rhel/rhel-8.0-x86_64.json b/packer_templates/rhel/rhel-8.0-x86_64.json index 14b90fece..79d86c186 100644 --- a/packer_templates/rhel/rhel-8.0-x86_64.json +++ b/packer_templates/rhel/rhel-8.0-x86_64.json @@ -83,6 +83,8 @@ "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], "boot_wait": "10s", + "memory": "{{ user `memory` }}", + "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", "http_directory": "../centos/http", diff --git a/packer_templates/sles/sles-11-sp4-x86_64.json b/packer_templates/sles/sles-11-sp4-x86_64.json index bc9b9a8ae..ca2a9b86d 100644 --- a/packer_templates/sles/sles-11-sp4-x86_64.json +++ b/packer_templates/sles/sles-11-sp4-x86_64.json @@ -99,6 +99,8 @@ "<enter><wait>" ], "boot_wait": "10s", + "memory": "{{ user `memory` }}", + "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", "http_directory": "http", diff --git a/packer_templates/sles/sles-12-sp2-x86_64.json b/packer_templates/sles/sles-12-sp2-x86_64.json index a4ee135c4..43d90c5da 100644 --- a/packer_templates/sles/sles-12-sp2-x86_64.json +++ b/packer_templates/sles/sles-12-sp2-x86_64.json @@ -99,6 +99,8 @@ "<enter><wait>" ], "boot_wait": "10s", + "memory": "{{ user `memory` }}", + "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", "http_directory": "http", diff --git a/packer_templates/sles/sles-12-sp3-x86_64.json b/packer_templates/sles/sles-12-sp3-x86_64.json index 9eff53b4b..6046e8b5e 100644 --- a/packer_templates/sles/sles-12-sp3-x86_64.json +++ b/packer_templates/sles/sles-12-sp3-x86_64.json @@ -99,6 +99,8 @@ "<enter><wait>" ], "boot_wait": "10s", + "memory": "{{ user `memory` }}", + "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", "http_directory": "http", diff --git a/packer_templates/sles/sles-15-sp1.json b/packer_templates/sles/sles-15-sp1.json index 170a41a30..7b2d12883 100644 --- a/packer_templates/sles/sles-15-sp1.json +++ b/packer_templates/sles/sles-15-sp1.json @@ -115,6 +115,8 @@ "<enter><wait>" ], "boot_wait": "10s", + "memory": "{{ user `memory` }}", + "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", "http_directory": "http", diff --git a/packer_templates/sles/sles-15.json b/packer_templates/sles/sles-15.json index 641acaa3b..7501f172a 100644 --- a/packer_templates/sles/sles-15.json +++ b/packer_templates/sles/sles-15.json @@ -115,6 +115,8 @@ "<enter><wait>" ], "boot_wait": "10s", + "memory": "{{ user `memory` }}", + "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", "http_directory": "http", From a1228f1823ff93425a93b17a97b6995c49f44c2f Mon Sep 17 00:00:00 2001 From: Ali Rizvi-Santiago <arizvisa@gmail.com> Date: Wed, 30 Oct 2019 17:46:07 -0500 Subject: [PATCH 1042/1622] Forgot to rename the temporary markers in the sles templates back to "vboxmanage". Signed-off-by: Ali Rizvi-Santiago <arizvisa@gmail.com> --- packer_templates/sles/sles-15-sp1.json | 2 +- packer_templates/sles/sles-15.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packer_templates/sles/sles-15-sp1.json b/packer_templates/sles/sles-15-sp1.json index 7b2d12883..a725f876c 100644 --- a/packer_templates/sles/sles-15-sp1.json +++ b/packer_templates/sles/sles-15-sp1.json @@ -27,7 +27,7 @@ "type": "virtualbox-iso", "memory": "{{ user `memory` }}", "cpus": "{{ user `cpus` }}", - "manager": [ + "vboxmanage": [ [ "storageattach", "{{.Name}}", diff --git a/packer_templates/sles/sles-15.json b/packer_templates/sles/sles-15.json index 7501f172a..fd5f7945d 100644 --- a/packer_templates/sles/sles-15.json +++ b/packer_templates/sles/sles-15.json @@ -27,7 +27,7 @@ "type": "virtualbox-iso", "memory": "{{ user `memory` }}", "cpus": "{{ user `cpus` }}", - "manager": [ + "vboxmanage": [ [ "storageattach", "{{.Name}}", From 23adfb789f7409e52fd92f5f9a3b672534b0c7e3 Mon Sep 17 00:00:00 2001 From: Ali Rizvi-Santiago <arizvisa@gmail.com> Date: Wed, 30 Oct 2019 17:54:40 -0500 Subject: [PATCH 1043/1622] Reverted the amazonlinux/amazon-2-x86_64.json because apparently it's not using the virtualbox-iso builder. Signed-off-by: Ali Rizvi-Santiago <arizvisa@gmail.com> --- .../amazonlinux/amazon-2-x86_64.json | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/packer_templates/amazonlinux/amazon-2-x86_64.json b/packer_templates/amazonlinux/amazon-2-x86_64.json index acb89c763..049f7e71c 100644 --- a/packer_templates/amazonlinux/amazon-2-x86_64.json +++ b/packer_templates/amazonlinux/amazon-2-x86_64.json @@ -12,8 +12,20 @@ "source_path": "amazon2.ovf", "ssh_username": "vagrant", "ssh_password": "vagrant", - "memory": "{{ user `memory` }}", - "cpus": "{{ user `cpus` }}", + "vboxmanage": [ + [ + "modifyvm", + "{{.Name}}", + "--memory", + "{{ user `memory` }}" + ], + [ + "modifyvm", + "{{.Name}}", + "--cpus", + "{{ user `cpus` }}" + ] + ], "virtualbox_version_file": ".vbox_version", "vm_name": "{{ user `template` }}" } From af2d57ca800b422adc2f49184b8e03256164eeb5 Mon Sep 17 00:00:00 2001 From: Ali Rizvi-Santiago <arizvisa@gmail.com> Date: Wed, 30 Oct 2019 18:04:05 -0500 Subject: [PATCH 1044/1622] Forgot to add quotes to the "memory" and "cpus" user-variables in the windows templates. Signed-off-by: Ali Rizvi-Santiago <arizvisa@gmail.com> --- packer_templates/windows/windows-10.json | 4 ++-- packer_templates/windows/windows-2008r2.json | 4 ++-- packer_templates/windows/windows-2012r2.json | 4 ++-- packer_templates/windows/windows-2016.json | 4 ++-- packer_templates/windows/windows-2019.json | 4 ++-- packer_templates/windows/windows-7.json | 4 ++-- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/packer_templates/windows/windows-10.json b/packer_templates/windows/windows-10.json index bbfa64059..fafd7a552 100644 --- a/packer_templates/windows/windows-10.json +++ b/packer_templates/windows/windows-10.json @@ -109,8 +109,8 @@ }] ], "variables": { - "memory": 4096, - "cpus": 2, + "memory": "4096", + "cpus": "2", "guest_additions_mode": "attach", "headless": "true", "iso_checksum": "743fc483bb8bf1901c0534a0ae15208a5a72a3c5", diff --git a/packer_templates/windows/windows-2008r2.json b/packer_templates/windows/windows-2008r2.json index 97c5450bf..4ae02d1a2 100644 --- a/packer_templates/windows/windows-2008r2.json +++ b/packer_templates/windows/windows-2008r2.json @@ -72,8 +72,8 @@ }] ], "variables": { - "memory": 4096, - "cpus": 2, + "memory": "4096", + "cpus": "2", "guest_additions_mode": "attach", "headless": "false", "iso_checksum": "beed231a34e90e1dd9a04b3afabec31d62ce3889", diff --git a/packer_templates/windows/windows-2012r2.json b/packer_templates/windows/windows-2012r2.json index 109179851..24b1b78e4 100644 --- a/packer_templates/windows/windows-2012r2.json +++ b/packer_templates/windows/windows-2012r2.json @@ -104,8 +104,8 @@ }] ], "variables": { - "cpus": 2, - "memory": 4096, + "cpus": "2", + "memory": "4096", "guest_additions_mode": "attach", "headless": "true", "iso_checksum": "849734f37346385dac2c101e4aacba4626bb141c", diff --git a/packer_templates/windows/windows-2016.json b/packer_templates/windows/windows-2016.json index 1ceb83cec..e5940f62e 100644 --- a/packer_templates/windows/windows-2016.json +++ b/packer_templates/windows/windows-2016.json @@ -104,8 +104,8 @@ }] ], "variables": { - "memory": 4096, - "cpus": 2, + "memory": "4096", + "cpus": "2", "guest_additions_mode": "attach", "headless": "true", "iso_checksum": "772700802951b36c8cb26a61c040b9a8dc3816a3", diff --git a/packer_templates/windows/windows-2019.json b/packer_templates/windows/windows-2019.json index 6e071c58e..27c8ec398 100644 --- a/packer_templates/windows/windows-2019.json +++ b/packer_templates/windows/windows-2019.json @@ -104,8 +104,8 @@ }] ], "variables": { - "memory": 4096, - "cpus": 2, + "memory": "4096", + "cpus": "2", "guest_additions_mode": "attach", "headless": "true", "iso_checksum": "91e3a2f1acc39af21353c7cc105c799494d7539f", diff --git a/packer_templates/windows/windows-7.json b/packer_templates/windows/windows-7.json index a193aa6d9..22c4655ae 100644 --- a/packer_templates/windows/windows-7.json +++ b/packer_templates/windows/windows-7.json @@ -79,8 +79,8 @@ }] ], "variables": { - "memory": 4096, - "cpus": 2, + "memory": "4096", + "cpus": "2", "guest_additions_mode": "attach", "headless": "false", "iso_checksum": "971fc00183a52c152fe924a6b99fdec011a871c2", From 558a6a4d202721a3f2f853cf5c76029e9a39bdc2 Mon Sep 17 00:00:00 2001 From: Ali Rizvi-Santiago <arizvisa@gmail.com> Date: Wed, 30 Oct 2019 18:39:44 -0500 Subject: [PATCH 1045/1622] Updated the macos templates to use the "usb" option to enable usb instead of "vmx_data" for the vmware-iso builders. Signed-off-by: Ali Rizvi-Santiago <arizvisa@gmail.com> --- packer_templates/macos/macos-10.12.json | 4 ++-- packer_templates/macos/macosx-10.11.json | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/packer_templates/macos/macos-10.12.json b/packer_templates/macos/macos-10.12.json index 7e27ee4a2..56c4f818e 100644 --- a/packer_templates/macos/macos-10.12.json +++ b/packer_templates/macos/macos-10.12.json @@ -5,6 +5,7 @@ "memory": "{{ user `memory` }}", "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", + "usb": true, "guest_os_type": "darwin12-64", "headless": "{{ user `headless` }}", "iso_checksum": "{{user `iso_checksum`}}", @@ -28,8 +29,7 @@ "hpet0.present": "TRUE", "ich7m.present": "TRUE", "keyboardAndMouseProfile": "macProfile", - "smc.present": "TRUE", - "usb.present": "TRUE" + "smc.present": "TRUE" }, "vmx_remove_ethernet_interfaces": true }, diff --git a/packer_templates/macos/macosx-10.11.json b/packer_templates/macos/macosx-10.11.json index 074bc3d23..5f09dc209 100644 --- a/packer_templates/macos/macosx-10.11.json +++ b/packer_templates/macos/macosx-10.11.json @@ -5,6 +5,7 @@ "memory": "{{ user `memory` }}", "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", + "usb": true, "guest_os_type": "darwin12-64", "headless": "{{ user `headless` }}", "iso_checksum": "{{user `iso_checksum`}}", @@ -28,8 +29,7 @@ "hpet0.present": "TRUE", "ich7m.present": "TRUE", "keyboardAndMouseProfile": "macProfile", - "smc.present": "TRUE", - "usb.present": "TRUE" + "smc.present": "TRUE" }, "vmx_remove_ethernet_interfaces": true }, From f311d6d592d396be8033145c0e0f777c1b0f8811 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Wed, 30 Oct 2019 16:52:05 -0700 Subject: [PATCH 1046/1622] Add Fedora 31 definition Signed-off-by: Tim Smith <tsmith@chef.io> --- packer_templates/fedora/fedora-31-x86_64.json | 190 ++++++++++++++++++ 1 file changed, 190 insertions(+) create mode 100644 packer_templates/fedora/fedora-31-x86_64.json diff --git a/packer_templates/fedora/fedora-31-x86_64.json b/packer_templates/fedora/fedora-31-x86_64.json new file mode 100644 index 000000000..d727d7e9e --- /dev/null +++ b/packer_templates/fedora/fedora-31-x86_64.json @@ -0,0 +1,190 @@ +{ + "builders": [ + { + "type": "qemu", + "vm_name": "{{ user `template` }}", + "name": "{{ user `template` }}", + "output_directory": "../../builds/packer-{{user `template`}}-libvirt", + "accelerator": "kvm", + "boot_wait": "10s", + "boot_command": [ + "<tab> linux ks=http://{{.HTTPIP}}:{{.HTTPPort}}/{{user `ks_path`}}<enter><wait>" + ], + "format": "qcow2", + "disk_size": "{{user `disk_size`}}", + "disk_discard": "unmap", + "disk_cache": "unsafe", + "disk_compression": true, + "disk_interface": "virtio-scsi", + "net_device": "virtio-net", + "memory": "{{ user `memory` }}", + "cpus": "{{ user `cpus` }}", + "http_directory": "http", + "headless": "{{ user `headless` }}", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "ssh_username": "vagrant", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_wait_timeout": "3600s", + "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now" + }, + { + "boot_command": [ + "<tab> linux ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": "{{user `disk_size`}}", + "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "guest_os_type": "Fedora_64", + "hard_drive_interface": "sata", + "headless": "{{ user `headless` }}", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "../../builds/packer-{{user `template`}}-virtualbox", + "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "virtualbox-iso", + "memory": "{{ user `memory` }}", + "cpus": "{{ user `cpus` }}", + "virtualbox_version_file": ".vbox_version", + "vm_name": "{{ user `template` }}" + }, + { + "boot_command": [ + "<tab> linux ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": "{{user `disk_size`}}", + "guest_os_type": "fedora-64", + "headless": "{{ user `headless` }}", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "../../builds/packer-{{user `template`}}-vmware", + "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "tools_upload_flavor": "linux", + "type": "vmware-iso", + "vm_name": "{{ user `template` }}", + "memory": "{{ user `memory` }}", + "cpus": "{{ user `cpus` }}", + "vmx_data": { + "cpuid.coresPerSocket": "1", + "ethernet0.pciSlotNumber": "32" + }, + "vmx_remove_ethernet_interfaces": true + }, + { + "boot_command": [ + "<tab> linux ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": "{{user `disk_size`}}", + "guest_os_type": "fedora-core", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "../../builds/packer-{{user `template`}}-parallels", + "parallels_tools_flavor": "lin", + "memory": "{{ user `memory` }}", + "cpus": "{{ user `cpus` }}", + "prlctl_version_file": ".prlctl_version", + "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "parallels-iso", + "vm_name": "{{ user `template` }}" + }, + { + "boot_command": [ + "<tab> linux ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" + ], + "boot_wait": "10s", + "memory": "{{ user `memory` }}", + "cpus": "{{ user `cpus` }}", + "disk_size": "{{user `disk_size`}}", + "headless": "{{ user `headless` }}", + "http_directory": "http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "../../builds/packer-{{user `template`}}-qemu", + "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "qemu", + "vm_name": "{{ user `template` }}" + } + ], + "post-processors": [ + { + "output": "../../builds/{{user `box_basename`}}.{{.Provider}}.box", + "type": "vagrant" + } + ], + "provisioners": [ + { + "environment_vars": [ + "HOME_DIR=/home/vagrant", + "http_proxy={{user `http_proxy`}}", + "https_proxy={{user `https_proxy`}}", + "no_proxy={{user `no_proxy`}}" + ], + "execute_command": "echo 'vagrant' | {{.Vars}} sudo -E -S bash '{{.Path}}'", + "expect_disconnect": true, + "scripts": [ + "scripts/swap.sh", + "scripts/fix-slow-dns.sh", + "scripts/build-tools.sh", + "scripts/install-supporting-packages.sh", + "../_common/motd.sh", + "../_common/sshd.sh", + "../_common/virtualbox.sh", + "../_common/vmware.sh", + "../_common/parallels.sh", + "../_common/vagrant.sh", + "scripts/cleanup.sh", + "../_common/minimize.sh" + ], + "type": "shell" + } + ], + "variables": { + "arch": "64", + "box_basename": "fedora-31", + "build_timestamp": "{{isotime \"20060102150405\"}}", + "cpus": "1", + "disk_size": "65536", + "git_revision": "__unknown_git_revision__", + "headless": "", + "http_proxy": "{{env `http_proxy`}}", + "https_proxy": "{{env `https_proxy`}}", + "iso_checksum": "225ebc160e40bb43c5de28bad9680e3a78a9db40c9e3f4f42f3ee3f10f95dbeb", + "iso_checksum_type": "sha256", + "iso_name": "Fedora-Server-dvd-x86_64-31-1.9.iso", + "ks_path": "ks-fedora29.cfg", + "memory": "1024", + "mirror": "http://download.fedoraproject.org/pub/fedora/linux", + "mirror_directory": "releases/31/Server/x86_64/iso", + "name": "fedora-31", + "no_proxy": "{{env `no_proxy`}}", + "template": "fedora-31-x86_64", + "version": "TIMESTAMP" + } +} \ No newline at end of file From 5e4d1d734f5d4fc592781a7f0dd51ae0565b6249 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Wed, 30 Oct 2019 16:55:59 -0700 Subject: [PATCH 1047/1622] Make fedora-31 the new fedora-latest version Signed-off-by: Tim Smith <tsmith@chef.io> --- builds.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/builds.yml b/builds.yml index 1e819cf49..ab6da3f6d 100644 --- a/builds.yml +++ b/builds.yml @@ -47,7 +47,7 @@ slugs: 'freebsd-11': 'freebsd-11' 'freebsd-12': 'freebsd-12' 'opensuse-leap-15': 'opensuse-leap-15' - 'fedora-latest': 'fedora-30' + 'fedora-latest': 'fedora-31' providers: - virtualbox-iso From 1eb7739ebffa61f9dde2050f07b7f0e1a676d663 Mon Sep 17 00:00:00 2001 From: Ali Rizvi-Santiago <arizvisa@gmail.com> Date: Thu, 31 Oct 2019 11:17:11 -0500 Subject: [PATCH 1048/1622] Updated the windows templates to use the "disk_adapter_type" option when setting the scsi device type instead of the vmware-specific "vmx_data" opption in order to clean up warnings during template validation. Signed-off-by: Ali Rizvi-Santiago <arizvisa@gmail.com> --- packer_templates/windows/windows-10.json | 5 +---- packer_templates/windows/windows-2012r2.json | 5 +---- packer_templates/windows/windows-2016.json | 5 +---- packer_templates/windows/windows-2019.json | 5 +---- 4 files changed, 4 insertions(+), 16 deletions(-) diff --git a/packer_templates/windows/windows-10.json b/packer_templates/windows/windows-10.json index fafd7a552..c1d21c3ff 100644 --- a/packer_templates/windows/windows-10.json +++ b/packer_templates/windows/windows-10.json @@ -29,12 +29,9 @@ }, { "type": "vmware-iso", - "vmx_data": { - "scsi0.virtualDev": "lsisas1068", - "scsi0.present": "TRUE" - }, "memory": "{{ user `memory` }}", "cpus": "{{ user `cpus` }}", + "disk_adapter_type": "lsisas1068", "guest_os_type": "windows9srv-64", "headless": "{{ user `headless` }}", "iso_url": "{{ user `iso_url` }}", diff --git a/packer_templates/windows/windows-2012r2.json b/packer_templates/windows/windows-2012r2.json index 24b1b78e4..c502cf982 100644 --- a/packer_templates/windows/windows-2012r2.json +++ b/packer_templates/windows/windows-2012r2.json @@ -26,12 +26,9 @@ }, { "type": "vmware-iso", - "vmx_data": { - "scsi0.virtualDev": "lsisas1068", - "scsi0.present": "TRUE" - }, "memory": "{{ user `memory` }}", "cpus": "{{ user `cpus` }}", + "disk_adapter_type": "lsisas1068", "guest_os_type": "windows9srv-64", "headless": "{{ user `headless` }}", "iso_url": "{{ user `iso_url` }}", diff --git a/packer_templates/windows/windows-2016.json b/packer_templates/windows/windows-2016.json index e5940f62e..058e86e43 100644 --- a/packer_templates/windows/windows-2016.json +++ b/packer_templates/windows/windows-2016.json @@ -26,12 +26,9 @@ }, { "type": "vmware-iso", - "vmx_data": { - "scsi0.virtualDev": "lsisas1068", - "scsi0.present": "TRUE" - }, "memory": "{{ user `memory` }}", "cpus": "{{ user `cpus` }}", + "disk_adapter_type": "lsisas1068", "guest_os_type": "windows9srv-64", "headless": "{{ user `headless` }}", "iso_url": "{{ user `iso_url` }}", diff --git a/packer_templates/windows/windows-2019.json b/packer_templates/windows/windows-2019.json index 27c8ec398..ddf5bb750 100644 --- a/packer_templates/windows/windows-2019.json +++ b/packer_templates/windows/windows-2019.json @@ -26,12 +26,9 @@ }, { "type": "vmware-iso", - "vmx_data": { - "scsi0.virtualDev": "lsisas1068", - "scsi0.present": "TRUE" - }, "memory": "{{ user `memory` }}", "cpus": "{{ user `cpus` }}", + "disk_adapter_type": "lsisas1068", "guest_os_type": "windows9srv-64", "headless": "{{ user `headless` }}", "iso_url": "{{ user `iso_url` }}", From cc1df60e34259f3f129da1a75fe8a1637da7e74a Mon Sep 17 00:00:00 2001 From: Ali Rizvi-Santiago <arizvisa@gmail.com> Date: Thu, 31 Oct 2019 11:21:07 -0500 Subject: [PATCH 1049/1622] Replaced tabs in the windows templates with 2-space indents in order to follow the consistentcy set by the linux templates. Signed-off-by: Ali Rizvi-Santiago <arizvisa@gmail.com> --- packer_templates/windows/windows-10.json | 230 +++++++++---------- packer_templates/windows/windows-2008r2.json | 162 ++++++------- packer_templates/windows/windows-2012r2.json | 220 +++++++++--------- packer_templates/windows/windows-2016.json | 220 +++++++++--------- packer_templates/windows/windows-2019.json | 220 +++++++++--------- packer_templates/windows/windows-7.json | 176 +++++++------- 6 files changed, 614 insertions(+), 614 deletions(-) diff --git a/packer_templates/windows/windows-10.json b/packer_templates/windows/windows-10.json index c1d21c3ff..ac5f973ef 100644 --- a/packer_templates/windows/windows-10.json +++ b/packer_templates/windows/windows-10.json @@ -1,117 +1,117 @@ { - "builders": [{ - "type": "virtualbox-iso", - "vboxmanage": [ - ["modifyvm", "{{.Name}}", "--vram", "48"], - ["modifyvm", "{{.Name}}", "--audio", "none"] - ], - "memory": "{{ user `memory` }}", - "cpus": "{{ user `cpus` }}", - "guest_additions_mode": "{{ user `guest_additions_mode` }}", - "guest_additions_path": "C:/users/vagrant/VBoxGuestAdditions.iso", - "guest_os_type": "Windows10_64", - "hard_drive_interface": "sata", - "headless": "{{ user `headless` }}", - "iso_url": "{{ user `iso_url` }}", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "sha1", - "output_directory": "../../builds/packer-{{user `template`}}-virtualbox", - "communicator": "winrm", - "winrm_username": "vagrant", - "winrm_password": "vagrant", - "winrm_timeout": "12h", - "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"", - "shutdown_timeout": "15m", - "floppy_files": [ - "answer_files/10/Autounattend.xml", - "scripts/base_setup.ps1" - ] - }, - { - "type": "vmware-iso", - "memory": "{{ user `memory` }}", - "cpus": "{{ user `cpus` }}", - "disk_adapter_type": "lsisas1068", - "guest_os_type": "windows9srv-64", - "headless": "{{ user `headless` }}", - "iso_url": "{{ user `iso_url` }}", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "sha1", - "output_directory": "../../builds/packer-{{user `template`}}-vmware", - "communicator": "winrm", - "winrm_username": "vagrant", - "winrm_password": "vagrant", - "winrm_timeout": "12h", - "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"", - "shutdown_timeout": "15m", - "floppy_files": [ - "answer_files/10/Autounattend.xml" - ] - } - ], - "provisioners": [{ - "type": "chef-solo", - "cookbook_paths": ["cookbooks"], - "guest_os_type": "windows", - "run_list": [ - "packer::disable_uac", - "packer::disable_onedrive", - "packer::disable_restore", - "packer::disable_hibernation", - "packer::disable_windows_update", - "packer::remove_defender" - ] - }, - { - "type": "windows-restart" - }, - { - "type": "chef-solo", - "cookbook_paths": ["cookbooks"], - "guest_os_type": "windows", - "run_list": [ - "packer::vm_tools", - "packer::features", - "packer::enable_file_sharing", - "packer::enable_remote_desktop", - "packer::ui_tweaks", - "packer::power" - ] - }, - { - "type": "windows-restart" - }, - { - "type": "chef-solo", - "cookbook_paths": ["cookbooks"], - "guest_os_type": "windows", - "run_list": [ - "packer::cleanup", - "packer::defrag" - ] - }, - { - "type": "powershell", - "script": "scripts/cleanup.ps1", - "elevated_user": "vagrant", - "elevated_password": "vagrant" - } - ], - "post-processors": [ - [{ - "type": "vagrant", - "keep_input_artifact": true, - "output": "{{ user `template` }}-{{.Provider}}.box", - "vagrantfile_template": "vagrantfile-windows.template" - }] - ], - "variables": { - "memory": "4096", - "cpus": "2", - "guest_additions_mode": "attach", - "headless": "true", - "iso_checksum": "743fc483bb8bf1901c0534a0ae15208a5a72a3c5", - "iso_url": "https://software-download.microsoft.com/download/pr/18362.30.190401-1528.19h1_release_svc_refresh_CLIENTENTERPRISEEVAL_OEMRET_x64FRE_en-us.iso", - "template": "windows-10" - } + "builders": [{ + "type": "virtualbox-iso", + "vboxmanage": [ + ["modifyvm", "{{.Name}}", "--vram", "48"], + ["modifyvm", "{{.Name}}", "--audio", "none"] + ], + "memory": "{{ user `memory` }}", + "cpus": "{{ user `cpus` }}", + "guest_additions_mode": "{{ user `guest_additions_mode` }}", + "guest_additions_path": "C:/users/vagrant/VBoxGuestAdditions.iso", + "guest_os_type": "Windows10_64", + "hard_drive_interface": "sata", + "headless": "{{ user `headless` }}", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_checksum_type": "sha1", + "output_directory": "../../builds/packer-{{user `template`}}-virtualbox", + "communicator": "winrm", + "winrm_username": "vagrant", + "winrm_password": "vagrant", + "winrm_timeout": "12h", + "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"", + "shutdown_timeout": "15m", + "floppy_files": [ + "answer_files/10/Autounattend.xml", + "scripts/base_setup.ps1" + ] + }, + { + "type": "vmware-iso", + "memory": "{{ user `memory` }}", + "cpus": "{{ user `cpus` }}", + "disk_adapter_type": "lsisas1068", + "guest_os_type": "windows9srv-64", + "headless": "{{ user `headless` }}", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_checksum_type": "sha1", + "output_directory": "../../builds/packer-{{user `template`}}-vmware", + "communicator": "winrm", + "winrm_username": "vagrant", + "winrm_password": "vagrant", + "winrm_timeout": "12h", + "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"", + "shutdown_timeout": "15m", + "floppy_files": [ + "answer_files/10/Autounattend.xml" + ] + } + ], + "provisioners": [{ + "type": "chef-solo", + "cookbook_paths": ["cookbooks"], + "guest_os_type": "windows", + "run_list": [ + "packer::disable_uac", + "packer::disable_onedrive", + "packer::disable_restore", + "packer::disable_hibernation", + "packer::disable_windows_update", + "packer::remove_defender" + ] + }, + { + "type": "windows-restart" + }, + { + "type": "chef-solo", + "cookbook_paths": ["cookbooks"], + "guest_os_type": "windows", + "run_list": [ + "packer::vm_tools", + "packer::features", + "packer::enable_file_sharing", + "packer::enable_remote_desktop", + "packer::ui_tweaks", + "packer::power" + ] + }, + { + "type": "windows-restart" + }, + { + "type": "chef-solo", + "cookbook_paths": ["cookbooks"], + "guest_os_type": "windows", + "run_list": [ + "packer::cleanup", + "packer::defrag" + ] + }, + { + "type": "powershell", + "script": "scripts/cleanup.ps1", + "elevated_user": "vagrant", + "elevated_password": "vagrant" + } + ], + "post-processors": [ + [{ + "type": "vagrant", + "keep_input_artifact": true, + "output": "{{ user `template` }}-{{.Provider}}.box", + "vagrantfile_template": "vagrantfile-windows.template" + }] + ], + "variables": { + "memory": "4096", + "cpus": "2", + "guest_additions_mode": "attach", + "headless": "true", + "iso_checksum": "743fc483bb8bf1901c0534a0ae15208a5a72a3c5", + "iso_url": "https://software-download.microsoft.com/download/pr/18362.30.190401-1528.19h1_release_svc_refresh_CLIENTENTERPRISEEVAL_OEMRET_x64FRE_en-us.iso", + "template": "windows-10" + } } diff --git a/packer_templates/windows/windows-2008r2.json b/packer_templates/windows/windows-2008r2.json index 4ae02d1a2..d2b67d7ff 100644 --- a/packer_templates/windows/windows-2008r2.json +++ b/packer_templates/windows/windows-2008r2.json @@ -1,83 +1,83 @@ { - "builders": [{ - "type": "virtualbox-iso", - "vboxmanage": [ - ["modifyvm", "{{.Name}}", "--vram", "48"] - ], - "memory": "{{ user `memory` }}", - "cpus": "{{ user `cpus` }}", - "guest_additions_mode": "{{ user `guest_additions_mode` }}", - "guest_additions_path": "C:/users/vagrant/VBoxGuestAdditions.iso", - "guest_os_type": "Windows2008_64", - "headless": "{{ user `headless` }}", - "iso_url": "{{ user `iso_url` }}", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "sha1", - "output_directory": "../../builds/packer-{{user `template`}}-virtualbox", - "communicator": "winrm", - "winrm_username": "vagrant", - "winrm_password": "vagrant", - "winrm_timeout": "12h", - "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"", - "shutdown_timeout": "15m", - "floppy_files": [ - "answer_files/2008_r2/Autounattend.xml" - ] - }], - "provisioners": [{ - "type": "chef-solo", - "cookbook_paths": ["cookbooks"], - "guest_os_type": "windows", - "install_command": "powershell.exe -Command \"(new-object Net.WebClient).DownloadString('https://omnitruck.chef.io/install.ps1') | iex; install\"", - "run_list": [ - "packer::disable_uac", - "packer::disable_restore", - "packer::disable_windows_update", - "packer::vm_tools", - "packer::features", - "packer::enable_file_sharing", - "packer::enable_remote_desktop", - "packer::ui_tweaks", - "packer::power", - "packer::updates" - ] - }, - { - "type": "windows-restart" - }, - { - "type": "chef-solo", - "cookbook_paths": ["cookbooks"], - "guest_os_type": "windows", - "install_command": "powershell.exe -Command \"(new-object Net.WebClient).DownloadString('https://omnitruck.chef.io/install.ps1') | iex; install\"", - "run_list": [ - "packer::disable_uac", - "packer::cleanup", - "packer::defrag" - ] - }, - { - "type": "powershell", - "script": "scripts/cleanup.ps1", - "elevated_user": "vagrant", - "elevated_password": "vagrant" - } - ], - "post-processors": [ - [{ - "type": "vagrant", - "keep_input_artifact": true, - "output": "{{ user `template` }}-{{.Provider}}.box", - "vagrantfile_template": "vagrantfile-windows.template" - }] - ], - "variables": { - "memory": "4096", - "cpus": "2", - "guest_additions_mode": "attach", - "headless": "false", - "iso_checksum": "beed231a34e90e1dd9a04b3afabec31d62ce3889", - "iso_url": "http://download.microsoft.com/download/7/5/E/75EC4E54-5B02-42D6-8879-D8D3A25FBEF7/7601.17514.101119-1850_x64fre_server_eval_en-us-GRMSXEVAL_EN_DVD.iso", - "template": "windows-2008r2-standard" - } + "builders": [{ + "type": "virtualbox-iso", + "vboxmanage": [ + ["modifyvm", "{{.Name}}", "--vram", "48"] + ], + "memory": "{{ user `memory` }}", + "cpus": "{{ user `cpus` }}", + "guest_additions_mode": "{{ user `guest_additions_mode` }}", + "guest_additions_path": "C:/users/vagrant/VBoxGuestAdditions.iso", + "guest_os_type": "Windows2008_64", + "headless": "{{ user `headless` }}", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_checksum_type": "sha1", + "output_directory": "../../builds/packer-{{user `template`}}-virtualbox", + "communicator": "winrm", + "winrm_username": "vagrant", + "winrm_password": "vagrant", + "winrm_timeout": "12h", + "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"", + "shutdown_timeout": "15m", + "floppy_files": [ + "answer_files/2008_r2/Autounattend.xml" + ] + }], + "provisioners": [{ + "type": "chef-solo", + "cookbook_paths": ["cookbooks"], + "guest_os_type": "windows", + "install_command": "powershell.exe -Command \"(new-object Net.WebClient).DownloadString('https://omnitruck.chef.io/install.ps1') | iex; install\"", + "run_list": [ + "packer::disable_uac", + "packer::disable_restore", + "packer::disable_windows_update", + "packer::vm_tools", + "packer::features", + "packer::enable_file_sharing", + "packer::enable_remote_desktop", + "packer::ui_tweaks", + "packer::power", + "packer::updates" + ] + }, + { + "type": "windows-restart" + }, + { + "type": "chef-solo", + "cookbook_paths": ["cookbooks"], + "guest_os_type": "windows", + "install_command": "powershell.exe -Command \"(new-object Net.WebClient).DownloadString('https://omnitruck.chef.io/install.ps1') | iex; install\"", + "run_list": [ + "packer::disable_uac", + "packer::cleanup", + "packer::defrag" + ] + }, + { + "type": "powershell", + "script": "scripts/cleanup.ps1", + "elevated_user": "vagrant", + "elevated_password": "vagrant" + } + ], + "post-processors": [ + [{ + "type": "vagrant", + "keep_input_artifact": true, + "output": "{{ user `template` }}-{{.Provider}}.box", + "vagrantfile_template": "vagrantfile-windows.template" + }] + ], + "variables": { + "memory": "4096", + "cpus": "2", + "guest_additions_mode": "attach", + "headless": "false", + "iso_checksum": "beed231a34e90e1dd9a04b3afabec31d62ce3889", + "iso_url": "http://download.microsoft.com/download/7/5/E/75EC4E54-5B02-42D6-8879-D8D3A25FBEF7/7601.17514.101119-1850_x64fre_server_eval_en-us-GRMSXEVAL_EN_DVD.iso", + "template": "windows-2008r2-standard" + } } diff --git a/packer_templates/windows/windows-2012r2.json b/packer_templates/windows/windows-2012r2.json index c502cf982..81013b486 100644 --- a/packer_templates/windows/windows-2012r2.json +++ b/packer_templates/windows/windows-2012r2.json @@ -1,112 +1,112 @@ { - "builders": [{ - "type": "virtualbox-iso", - "vboxmanage": [ - ["modifyvm", "{{.Name}}", "--vram", "48"] - ], - "memory": "{{ user `memory` }}", - "cpus": "{{ user `cpus` }}", - "guest_additions_mode": "{{ user `guest_additions_mode` }}", - "guest_additions_path": "C:/users/vagrant/VBoxGuestAdditions.iso", - "guest_os_type": "Windows2012_64", - "headless": "{{ user `headless` }}", - "iso_url": "{{ user `iso_url` }}", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "sha1", - "output_directory": "../../builds/packer-{{user `template`}}-virtualbox", - "communicator": "winrm", - "winrm_username": "vagrant", - "winrm_password": "vagrant", - "winrm_timeout": "12h", - "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"", - "shutdown_timeout": "15m", - "floppy_files": [ - "answer_files/2012_r2/Autounattend.xml" - ] - }, - { - "type": "vmware-iso", - "memory": "{{ user `memory` }}", - "cpus": "{{ user `cpus` }}", - "disk_adapter_type": "lsisas1068", - "guest_os_type": "windows9srv-64", - "headless": "{{ user `headless` }}", - "iso_url": "{{ user `iso_url` }}", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "sha1", - "output_directory": "../../builds/packer-{{user `template`}}-vmware", - "communicator": "winrm", - "winrm_username": "vagrant", - "winrm_password": "vagrant", - "winrm_timeout": "12h", - "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"", - "shutdown_timeout": "15m", - "floppy_files": [ - "answer_files/2012_r2/Autounattend.xml" - ] - } - ], - "provisioners": [{ - "type": "chef-solo", - "cookbook_paths": ["cookbooks"], - "guest_os_type": "windows", - "run_list": [ - "packer::disable_uac", - "packer::disable_restore", - "packer::disable_windows_update", - "packer::remove_defender" - ] - }, - { - "type": "windows-restart" - }, - { - "type": "chef-solo", - "cookbook_paths": ["cookbooks"], - "guest_os_type": "windows", - "run_list": [ - "packer::vm_tools", - "packer::features", - "packer::enable_file_sharing", - "packer::enable_remote_desktop", - "packer::ui_tweaks", - "packer::power" - ] - }, - { - "type": "windows-restart" - }, - { - "type": "chef-solo", - "cookbook_paths": ["cookbooks"], - "guest_os_type": "windows", - "run_list": [ - "packer::cleanup", - "packer::defrag" - ] - }, - { - "type": "powershell", - "script": "scripts/cleanup.ps1", - "elevated_user": "vagrant", - "elevated_password": "vagrant" - } - ], - "post-processors": [ - [{ - "type": "vagrant", - "keep_input_artifact": true, - "output": "{{ user `template` }}-{{.Provider}}.box", - "vagrantfile_template": "vagrantfile-windows.template" - }] - ], - "variables": { - "cpus": "2", - "memory": "4096", - "guest_additions_mode": "attach", - "headless": "true", - "iso_checksum": "849734f37346385dac2c101e4aacba4626bb141c", - "iso_url": "http://download.microsoft.com/download/6/2/A/62A76ABB-9990-4EFC-A4FE-C7D698DAEB96/9600.17050.WINBLUE_REFRESH.140317-1640_X64FRE_SERVER_EVAL_EN-US-IR3_SSS_X64FREE_EN-US_DV9.ISO", - "template": "windows-2012r2-standard" - } + "builders": [{ + "type": "virtualbox-iso", + "vboxmanage": [ + ["modifyvm", "{{.Name}}", "--vram", "48"] + ], + "memory": "{{ user `memory` }}", + "cpus": "{{ user `cpus` }}", + "guest_additions_mode": "{{ user `guest_additions_mode` }}", + "guest_additions_path": "C:/users/vagrant/VBoxGuestAdditions.iso", + "guest_os_type": "Windows2012_64", + "headless": "{{ user `headless` }}", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_checksum_type": "sha1", + "output_directory": "../../builds/packer-{{user `template`}}-virtualbox", + "communicator": "winrm", + "winrm_username": "vagrant", + "winrm_password": "vagrant", + "winrm_timeout": "12h", + "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"", + "shutdown_timeout": "15m", + "floppy_files": [ + "answer_files/2012_r2/Autounattend.xml" + ] + }, + { + "type": "vmware-iso", + "memory": "{{ user `memory` }}", + "cpus": "{{ user `cpus` }}", + "disk_adapter_type": "lsisas1068", + "guest_os_type": "windows9srv-64", + "headless": "{{ user `headless` }}", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_checksum_type": "sha1", + "output_directory": "../../builds/packer-{{user `template`}}-vmware", + "communicator": "winrm", + "winrm_username": "vagrant", + "winrm_password": "vagrant", + "winrm_timeout": "12h", + "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"", + "shutdown_timeout": "15m", + "floppy_files": [ + "answer_files/2012_r2/Autounattend.xml" + ] + } + ], + "provisioners": [{ + "type": "chef-solo", + "cookbook_paths": ["cookbooks"], + "guest_os_type": "windows", + "run_list": [ + "packer::disable_uac", + "packer::disable_restore", + "packer::disable_windows_update", + "packer::remove_defender" + ] + }, + { + "type": "windows-restart" + }, + { + "type": "chef-solo", + "cookbook_paths": ["cookbooks"], + "guest_os_type": "windows", + "run_list": [ + "packer::vm_tools", + "packer::features", + "packer::enable_file_sharing", + "packer::enable_remote_desktop", + "packer::ui_tweaks", + "packer::power" + ] + }, + { + "type": "windows-restart" + }, + { + "type": "chef-solo", + "cookbook_paths": ["cookbooks"], + "guest_os_type": "windows", + "run_list": [ + "packer::cleanup", + "packer::defrag" + ] + }, + { + "type": "powershell", + "script": "scripts/cleanup.ps1", + "elevated_user": "vagrant", + "elevated_password": "vagrant" + } + ], + "post-processors": [ + [{ + "type": "vagrant", + "keep_input_artifact": true, + "output": "{{ user `template` }}-{{.Provider}}.box", + "vagrantfile_template": "vagrantfile-windows.template" + }] + ], + "variables": { + "cpus": "2", + "memory": "4096", + "guest_additions_mode": "attach", + "headless": "true", + "iso_checksum": "849734f37346385dac2c101e4aacba4626bb141c", + "iso_url": "http://download.microsoft.com/download/6/2/A/62A76ABB-9990-4EFC-A4FE-C7D698DAEB96/9600.17050.WINBLUE_REFRESH.140317-1640_X64FRE_SERVER_EVAL_EN-US-IR3_SSS_X64FREE_EN-US_DV9.ISO", + "template": "windows-2012r2-standard" + } } diff --git a/packer_templates/windows/windows-2016.json b/packer_templates/windows/windows-2016.json index 058e86e43..743bff58e 100644 --- a/packer_templates/windows/windows-2016.json +++ b/packer_templates/windows/windows-2016.json @@ -1,112 +1,112 @@ { - "builders": [{ - "type": "virtualbox-iso", - "vboxmanage": [ - ["modifyvm", "{{.Name}}", "--vram", "48"] - ], - "memory": "{{ user `memory` }}", - "cpus": "{{ user `cpus` }}", - "guest_additions_mode": "{{ user `guest_additions_mode` }}", - "guest_additions_path": "C:/users/vagrant/VBoxGuestAdditions.iso", - "guest_os_type": "Windows2016_64", - "headless": "{{ user `headless` }}", - "iso_url": "{{ user `iso_url` }}", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "sha1", - "output_directory": "../../builds/packer-{{user `template`}}-virtualbox", - "communicator": "winrm", - "winrm_username": "vagrant", - "winrm_password": "vagrant", - "winrm_timeout": "12h", - "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"", - "shutdown_timeout": "15m", - "floppy_files": [ - "answer_files/2016/Autounattend.xml" - ] - }, - { - "type": "vmware-iso", - "memory": "{{ user `memory` }}", - "cpus": "{{ user `cpus` }}", - "disk_adapter_type": "lsisas1068", - "guest_os_type": "windows9srv-64", - "headless": "{{ user `headless` }}", - "iso_url": "{{ user `iso_url` }}", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "sha1", - "output_directory": "../../builds/packer-{{user `template`}}-vmware", - "communicator": "winrm", - "winrm_username": "vagrant", - "winrm_password": "vagrant", - "winrm_timeout": "12h", - "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"", - "shutdown_timeout": "15m", - "floppy_files": [ - "answer_files/2016/Autounattend.xml" - ] - } - ], - "provisioners": [{ - "type": "chef-solo", - "cookbook_paths": ["cookbooks"], - "guest_os_type": "windows", - "run_list": [ - "packer::disable_uac", - "packer::disable_restore", - "packer::disable_windows_update", - "packer::remove_defender" - ] - }, - { - "type": "windows-restart" - }, - { - "type": "chef-solo", - "cookbook_paths": ["cookbooks"], - "guest_os_type": "windows", - "run_list": [ - "packer::vm_tools", - "packer::features", - "packer::enable_file_sharing", - "packer::enable_remote_desktop", - "packer::ui_tweaks", - "packer::power" - ] - }, - { - "type": "windows-restart" - }, - { - "type": "chef-solo", - "cookbook_paths": ["cookbooks"], - "guest_os_type": "windows", - "run_list": [ - "packer::cleanup", - "packer::defrag" - ] - }, - { - "type": "powershell", - "script": "scripts/cleanup.ps1", - "elevated_user": "vagrant", - "elevated_password": "vagrant" - } - ], - "post-processors": [ - [{ - "type": "vagrant", - "keep_input_artifact": true, - "output": "{{ user `template` }}-{{.Provider}}.box", - "vagrantfile_template": "vagrantfile-windows.template" - }] - ], - "variables": { - "memory": "4096", - "cpus": "2", - "guest_additions_mode": "attach", - "headless": "true", - "iso_checksum": "772700802951b36c8cb26a61c040b9a8dc3816a3", - "iso_url": "https://software-download.microsoft.com/download/pr/Windows_Server_2016_Datacenter_EVAL_en-us_14393_refresh.ISO", - "template": "windows-2016-standard" - } + "builders": [{ + "type": "virtualbox-iso", + "vboxmanage": [ + ["modifyvm", "{{.Name}}", "--vram", "48"] + ], + "memory": "{{ user `memory` }}", + "cpus": "{{ user `cpus` }}", + "guest_additions_mode": "{{ user `guest_additions_mode` }}", + "guest_additions_path": "C:/users/vagrant/VBoxGuestAdditions.iso", + "guest_os_type": "Windows2016_64", + "headless": "{{ user `headless` }}", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_checksum_type": "sha1", + "output_directory": "../../builds/packer-{{user `template`}}-virtualbox", + "communicator": "winrm", + "winrm_username": "vagrant", + "winrm_password": "vagrant", + "winrm_timeout": "12h", + "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"", + "shutdown_timeout": "15m", + "floppy_files": [ + "answer_files/2016/Autounattend.xml" + ] + }, + { + "type": "vmware-iso", + "memory": "{{ user `memory` }}", + "cpus": "{{ user `cpus` }}", + "disk_adapter_type": "lsisas1068", + "guest_os_type": "windows9srv-64", + "headless": "{{ user `headless` }}", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_checksum_type": "sha1", + "output_directory": "../../builds/packer-{{user `template`}}-vmware", + "communicator": "winrm", + "winrm_username": "vagrant", + "winrm_password": "vagrant", + "winrm_timeout": "12h", + "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"", + "shutdown_timeout": "15m", + "floppy_files": [ + "answer_files/2016/Autounattend.xml" + ] + } + ], + "provisioners": [{ + "type": "chef-solo", + "cookbook_paths": ["cookbooks"], + "guest_os_type": "windows", + "run_list": [ + "packer::disable_uac", + "packer::disable_restore", + "packer::disable_windows_update", + "packer::remove_defender" + ] + }, + { + "type": "windows-restart" + }, + { + "type": "chef-solo", + "cookbook_paths": ["cookbooks"], + "guest_os_type": "windows", + "run_list": [ + "packer::vm_tools", + "packer::features", + "packer::enable_file_sharing", + "packer::enable_remote_desktop", + "packer::ui_tweaks", + "packer::power" + ] + }, + { + "type": "windows-restart" + }, + { + "type": "chef-solo", + "cookbook_paths": ["cookbooks"], + "guest_os_type": "windows", + "run_list": [ + "packer::cleanup", + "packer::defrag" + ] + }, + { + "type": "powershell", + "script": "scripts/cleanup.ps1", + "elevated_user": "vagrant", + "elevated_password": "vagrant" + } + ], + "post-processors": [ + [{ + "type": "vagrant", + "keep_input_artifact": true, + "output": "{{ user `template` }}-{{.Provider}}.box", + "vagrantfile_template": "vagrantfile-windows.template" + }] + ], + "variables": { + "memory": "4096", + "cpus": "2", + "guest_additions_mode": "attach", + "headless": "true", + "iso_checksum": "772700802951b36c8cb26a61c040b9a8dc3816a3", + "iso_url": "https://software-download.microsoft.com/download/pr/Windows_Server_2016_Datacenter_EVAL_en-us_14393_refresh.ISO", + "template": "windows-2016-standard" + } } diff --git a/packer_templates/windows/windows-2019.json b/packer_templates/windows/windows-2019.json index ddf5bb750..3ec001f75 100644 --- a/packer_templates/windows/windows-2019.json +++ b/packer_templates/windows/windows-2019.json @@ -1,112 +1,112 @@ { - "builders": [{ - "type": "virtualbox-iso", - "vboxmanage": [ - ["modifyvm", "{{.Name}}", "--vram", "48"] - ], - "memory": "{{ user `memory` }}", - "cpus": "{{ user `cpus` }}", - "guest_additions_mode": "{{ user `guest_additions_mode` }}", - "guest_additions_path": "C:/users/vagrant/VBoxGuestAdditions.iso", - "guest_os_type": "Windows2016_64", - "headless": "{{ user `headless` }}", - "iso_url": "{{ user `iso_url` }}", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "sha1", - "output_directory": "../../builds/packer-{{user `template`}}-virtualbox", - "communicator": "winrm", - "winrm_username": "vagrant", - "winrm_password": "vagrant", - "winrm_timeout": "12h", - "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"", - "shutdown_timeout": "15m", - "floppy_files": [ - "answer_files/2019/Autounattend.xml" - ] - }, - { - "type": "vmware-iso", - "memory": "{{ user `memory` }}", - "cpus": "{{ user `cpus` }}", - "disk_adapter_type": "lsisas1068", - "guest_os_type": "windows9srv-64", - "headless": "{{ user `headless` }}", - "iso_url": "{{ user `iso_url` }}", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "sha1", - "output_directory": "../../builds/packer-{{user `template`}}-vmware", - "communicator": "winrm", - "winrm_username": "vagrant", - "winrm_password": "vagrant", - "winrm_timeout": "12h", - "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"", - "shutdown_timeout": "15m", - "floppy_files": [ - "answer_files/2019/Autounattend.xml" - ] - } - ], - "provisioners": [{ - "type": "chef-solo", - "cookbook_paths": ["cookbooks"], - "guest_os_type": "windows", - "run_list": [ - "packer::disable_uac", - "packer::disable_restore", - "packer::disable_windows_update", - "packer::remove_defender" - ] - }, - { - "type": "windows-restart" - }, - { - "type": "chef-solo", - "cookbook_paths": ["cookbooks"], - "guest_os_type": "windows", - "run_list": [ - "packer::vm_tools", - "packer::features", - "packer::enable_file_sharing", - "packer::enable_remote_desktop", - "packer::ui_tweaks", - "packer::power" - ] - }, - { - "type": "windows-restart" - }, - { - "type": "chef-solo", - "cookbook_paths": ["cookbooks"], - "guest_os_type": "windows", - "run_list": [ - "packer::cleanup", - "packer::defrag" - ] - }, - { - "type": "powershell", - "script": "scripts/cleanup.ps1", - "elevated_user": "vagrant", - "elevated_password": "vagrant" - } - ], - "post-processors": [ - [{ - "type": "vagrant", - "keep_input_artifact": true, - "output": "{{ user `template` }}-{{.Provider}}.box", - "vagrantfile_template": "vagrantfile-windows.template" - }] - ], - "variables": { - "memory": "4096", - "cpus": "2", - "guest_additions_mode": "attach", - "headless": "true", - "iso_checksum": "91e3a2f1acc39af21353c7cc105c799494d7539f", - "iso_url": "https://software-download.microsoft.com/download/sg/17763.253.190108-0006.rs5_release_svc_refresh_SERVER_EVAL_x64FRE_en-us.iso", - "template": "windows-2019-standard" - } + "builders": [{ + "type": "virtualbox-iso", + "vboxmanage": [ + ["modifyvm", "{{.Name}}", "--vram", "48"] + ], + "memory": "{{ user `memory` }}", + "cpus": "{{ user `cpus` }}", + "guest_additions_mode": "{{ user `guest_additions_mode` }}", + "guest_additions_path": "C:/users/vagrant/VBoxGuestAdditions.iso", + "guest_os_type": "Windows2016_64", + "headless": "{{ user `headless` }}", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_checksum_type": "sha1", + "output_directory": "../../builds/packer-{{user `template`}}-virtualbox", + "communicator": "winrm", + "winrm_username": "vagrant", + "winrm_password": "vagrant", + "winrm_timeout": "12h", + "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"", + "shutdown_timeout": "15m", + "floppy_files": [ + "answer_files/2019/Autounattend.xml" + ] + }, + { + "type": "vmware-iso", + "memory": "{{ user `memory` }}", + "cpus": "{{ user `cpus` }}", + "disk_adapter_type": "lsisas1068", + "guest_os_type": "windows9srv-64", + "headless": "{{ user `headless` }}", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_checksum_type": "sha1", + "output_directory": "../../builds/packer-{{user `template`}}-vmware", + "communicator": "winrm", + "winrm_username": "vagrant", + "winrm_password": "vagrant", + "winrm_timeout": "12h", + "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"", + "shutdown_timeout": "15m", + "floppy_files": [ + "answer_files/2019/Autounattend.xml" + ] + } + ], + "provisioners": [{ + "type": "chef-solo", + "cookbook_paths": ["cookbooks"], + "guest_os_type": "windows", + "run_list": [ + "packer::disable_uac", + "packer::disable_restore", + "packer::disable_windows_update", + "packer::remove_defender" + ] + }, + { + "type": "windows-restart" + }, + { + "type": "chef-solo", + "cookbook_paths": ["cookbooks"], + "guest_os_type": "windows", + "run_list": [ + "packer::vm_tools", + "packer::features", + "packer::enable_file_sharing", + "packer::enable_remote_desktop", + "packer::ui_tweaks", + "packer::power" + ] + }, + { + "type": "windows-restart" + }, + { + "type": "chef-solo", + "cookbook_paths": ["cookbooks"], + "guest_os_type": "windows", + "run_list": [ + "packer::cleanup", + "packer::defrag" + ] + }, + { + "type": "powershell", + "script": "scripts/cleanup.ps1", + "elevated_user": "vagrant", + "elevated_password": "vagrant" + } + ], + "post-processors": [ + [{ + "type": "vagrant", + "keep_input_artifact": true, + "output": "{{ user `template` }}-{{.Provider}}.box", + "vagrantfile_template": "vagrantfile-windows.template" + }] + ], + "variables": { + "memory": "4096", + "cpus": "2", + "guest_additions_mode": "attach", + "headless": "true", + "iso_checksum": "91e3a2f1acc39af21353c7cc105c799494d7539f", + "iso_url": "https://software-download.microsoft.com/download/sg/17763.253.190108-0006.rs5_release_svc_refresh_SERVER_EVAL_x64FRE_en-us.iso", + "template": "windows-2019-standard" + } } diff --git a/packer_templates/windows/windows-7.json b/packer_templates/windows/windows-7.json index 22c4655ae..d28309940 100644 --- a/packer_templates/windows/windows-7.json +++ b/packer_templates/windows/windows-7.json @@ -1,90 +1,90 @@ { - "builders": [{ - "type": "virtualbox-iso", - "vboxmanage": [ - ["modifyvm", "{{.Name}}", "--vram", "36"] - ], - "memory": "{{ user `memory` }}", - "cpus": "{{ user `cpus` }}", - "guest_additions_mode": "{{ user `guest_additions_mode` }}", - "guest_additions_path": "C:/users/vagrant/VBoxGuestAdditions.iso", - "guest_os_type": "Windows7_64", - "headless": "{{ user `headless` }}", - "iso_url": "{{ user `iso_url` }}", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "sha1", - "output_directory": "../../builds/packer-{{user `template`}}-virtualbox", - "communicator": "winrm", - "winrm_username": "vagrant", - "winrm_password": "vagrant", - "winrm_timeout": "12h", - "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"", - "shutdown_timeout": "15m", - "floppy_files": [ - "answer_files/7/Autounattend.xml" - ] - }], - "provisioners": [{ - "type": "chef-solo", - "cookbook_paths": ["cookbooks"], - "guest_os_type": "windows", - "run_list": [ - "packer::disable_uac", - "packer::disable_restore", - "packer::disable_windows_update", - "packer::remove_defender" - ] - }, - { - "type": "windows-restart" - }, - { - "type": "chef-solo", - "cookbook_paths": ["cookbooks"], - "guest_os_type": "windows", - "run_list": [ - "packer::vm_tools", - "packer::features", - "packer::enable_file_sharing", - "packer::enable_remote_desktop", - "packer::ui_tweaks", - "packer::power" - ] - }, - { - "type": "windows-restart" - }, - { - "type": "chef-solo", - "cookbook_paths": ["cookbooks"], - "guest_os_type": "windows", - "run_list": [ - "packer::cleanup", - "packer::defrag" - ] - }, - { - "type": "powershell", - "script": "scripts/cleanup.ps1", - "elevated_user": "vagrant", - "elevated_password": "vagrant" - } - ], - "post-processors": [ - [{ - "type": "vagrant", - "keep_input_artifact": true, - "output": "{{ user `template` }}-{{.Provider}}.box", - "vagrantfile_template": "vagrantfile-windows.template" - }] - ], - "variables": { - "memory": "4096", - "cpus": "2", - "guest_additions_mode": "attach", - "headless": "false", - "iso_checksum": "971fc00183a52c152fe924a6b99fdec011a871c2", - "iso_url": "http://care.dlservice.microsoft.com/dl/download/evalx/win7/x86/EN/7600.16385.090713-1255_x86fre_enterprise_en-us_EVAL_Eval_Enterprise-GRMCENEVAL_EN_DVD.iso", - "template": "windows-7" - } + "builders": [{ + "type": "virtualbox-iso", + "vboxmanage": [ + ["modifyvm", "{{.Name}}", "--vram", "36"] + ], + "memory": "{{ user `memory` }}", + "cpus": "{{ user `cpus` }}", + "guest_additions_mode": "{{ user `guest_additions_mode` }}", + "guest_additions_path": "C:/users/vagrant/VBoxGuestAdditions.iso", + "guest_os_type": "Windows7_64", + "headless": "{{ user `headless` }}", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_checksum_type": "sha1", + "output_directory": "../../builds/packer-{{user `template`}}-virtualbox", + "communicator": "winrm", + "winrm_username": "vagrant", + "winrm_password": "vagrant", + "winrm_timeout": "12h", + "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"", + "shutdown_timeout": "15m", + "floppy_files": [ + "answer_files/7/Autounattend.xml" + ] + }], + "provisioners": [{ + "type": "chef-solo", + "cookbook_paths": ["cookbooks"], + "guest_os_type": "windows", + "run_list": [ + "packer::disable_uac", + "packer::disable_restore", + "packer::disable_windows_update", + "packer::remove_defender" + ] + }, + { + "type": "windows-restart" + }, + { + "type": "chef-solo", + "cookbook_paths": ["cookbooks"], + "guest_os_type": "windows", + "run_list": [ + "packer::vm_tools", + "packer::features", + "packer::enable_file_sharing", + "packer::enable_remote_desktop", + "packer::ui_tweaks", + "packer::power" + ] + }, + { + "type": "windows-restart" + }, + { + "type": "chef-solo", + "cookbook_paths": ["cookbooks"], + "guest_os_type": "windows", + "run_list": [ + "packer::cleanup", + "packer::defrag" + ] + }, + { + "type": "powershell", + "script": "scripts/cleanup.ps1", + "elevated_user": "vagrant", + "elevated_password": "vagrant" + } + ], + "post-processors": [ + [{ + "type": "vagrant", + "keep_input_artifact": true, + "output": "{{ user `template` }}-{{.Provider}}.box", + "vagrantfile_template": "vagrantfile-windows.template" + }] + ], + "variables": { + "memory": "4096", + "cpus": "2", + "guest_additions_mode": "attach", + "headless": "false", + "iso_checksum": "971fc00183a52c152fe924a6b99fdec011a871c2", + "iso_url": "http://care.dlservice.microsoft.com/dl/download/evalx/win7/x86/EN/7600.16385.090713-1255_x86fre_enterprise_en-us_EVAL_Eval_Enterprise-GRMCENEVAL_EN_DVD.iso", + "template": "windows-7" + } } From bb5a297e6b651e54397682c70addbce96b9e5eb9 Mon Sep 17 00:00:00 2001 From: Ali Rizvi-Santiago <arizvisa@gmail.com> Date: Thu, 31 Oct 2019 10:25:22 -0500 Subject: [PATCH 1050/1622] Added the "builddir" user-variable to all the templates, and updated the "output_directory" option in the builders and the "output" option in the post-processor to use it. Signed-off-by: Ali Rizvi-Santiago <arizvisa@gmail.com> --- packer_templates/amazonlinux/amazon-2-x86_64.json | 5 +++-- packer_templates/centos/centos-5.11-i386.json | 13 +++++++------ packer_templates/centos/centos-5.11-x86_64.json | 13 +++++++------ packer_templates/centos/centos-6.10-i386.json | 13 +++++++------ packer_templates/centos/centos-6.10-x86_64.json | 13 +++++++------ packer_templates/centos/centos-7.7-x86_64.json | 13 +++++++------ packer_templates/centos/centos-8.0-x86_64.json | 13 +++++++------ packer_templates/debian/debian-10.1-amd64.json | 11 ++++++----- packer_templates/debian/debian-10.1-i386.json | 11 ++++++----- packer_templates/debian/debian-8.11-amd64.json | 11 ++++++----- packer_templates/debian/debian-8.11-i386.json | 11 ++++++----- packer_templates/debian/debian-9.11-amd64.json | 11 ++++++----- packer_templates/debian/debian-9.11-i386.json | 11 ++++++----- packer_templates/debian/debian-9.11-ppc64el.json | 5 +++-- packer_templates/fedora/fedora-29-x86_64.json | 13 +++++++------ packer_templates/fedora/fedora-30-x86_64.json | 13 +++++++------ packer_templates/fedora/fedora-31-x86_64.json | 15 ++++++++------- packer_templates/freebsd/freebsd-11.3-amd64.json | 11 ++++++----- packer_templates/freebsd/freebsd-11.3-i386.json | 11 ++++++----- packer_templates/freebsd/freebsd-12.0-amd64.json | 11 ++++++----- packer_templates/freebsd/freebsd-12.0-i386.json | 11 ++++++----- .../hardenedbsd/hardenedbsd-11-amd64.json | 11 ++++++----- packer_templates/macos/macos-10.12.json | 9 +++++---- packer_templates/macos/macosx-10.11.json | 9 +++++---- .../opensuse/opensuse-leap-15.1-x86_64.json | 11 ++++++----- .../oraclelinux/oracle-5.11-i386.json | 11 ++++++----- .../oraclelinux/oracle-5.11-x86_64.json | 11 ++++++----- .../oraclelinux/oracle-6.10-i386.json | 11 ++++++----- .../oraclelinux/oracle-6.10-x86_64.json | 11 ++++++----- .../oraclelinux/oracle-7.7-x86_64.json | 11 ++++++----- packer_templates/rhel/rhel-5.11-i386.json | 11 ++++++----- packer_templates/rhel/rhel-5.11-x86_64.json | 11 ++++++----- packer_templates/rhel/rhel-6.10-i386.json | 11 ++++++----- packer_templates/rhel/rhel-6.10-x86_64.json | 11 ++++++----- packer_templates/rhel/rhel-7.6-x86_64.json | 11 ++++++----- packer_templates/rhel/rhel-8.0-x86_64.json | 11 ++++++----- .../scientificlinux/scientific-7.7-x86_64.json | 5 +++-- packer_templates/sles/sles-11-sp4-x86_64.json | 11 ++++++----- packer_templates/sles/sles-12-sp2-x86_64.json | 11 ++++++----- packer_templates/sles/sles-12-sp3-x86_64.json | 11 ++++++----- packer_templates/sles/sles-15-sp1.json | 11 ++++++----- packer_templates/sles/sles-15.json | 11 ++++++----- packer_templates/solaris/solaris-10.11-x86.json | 3 ++- packer_templates/solaris/solaris-11-x86.json | 3 ++- packer_templates/ubuntu/ubuntu-16.04-amd64.json | 13 +++++++------ packer_templates/ubuntu/ubuntu-16.04-i386.json | 11 ++++++----- packer_templates/ubuntu/ubuntu-18.04-amd64.json | 13 +++++++------ packer_templates/ubuntu/ubuntu-18.10-amd64.json | 13 +++++++------ packer_templates/ubuntu/ubuntu-19.04-amd64.json | 13 +++++++------ packer_templates/windows/windows-10.json | 5 +++-- packer_templates/windows/windows-2008r2.json | 3 ++- packer_templates/windows/windows-2012r2.json | 5 +++-- packer_templates/windows/windows-2016.json | 5 +++-- packer_templates/windows/windows-2019.json | 5 +++-- packer_templates/windows/windows-7.json | 3 ++- 55 files changed, 305 insertions(+), 250 deletions(-) diff --git a/packer_templates/amazonlinux/amazon-2-x86_64.json b/packer_templates/amazonlinux/amazon-2-x86_64.json index 049f7e71c..dd859254d 100644 --- a/packer_templates/amazonlinux/amazon-2-x86_64.json +++ b/packer_templates/amazonlinux/amazon-2-x86_64.json @@ -4,7 +4,7 @@ "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "headless": "{{ user `headless` }}", "http_directory": "http", - "output_directory": "../../builds/packer-{{user `template`}}-virtualbox", + "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-virtualbox", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_wait_timeout": "10000s", "ssh_port": 22, @@ -32,7 +32,7 @@ ], "post-processors": [ { - "output": "../../builds/{{user `box_basename`}}.{{.Provider}}.box", + "output": "{{ user `builddir` }}/{{user `box_basename`}}.{{.Provider}}.box", "type": "vagrant" } ], @@ -61,6 +61,7 @@ ], "variables": { "box_basename": "amazon-2", + "builddir": "../../builds", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", "disk_size": "65536", diff --git a/packer_templates/centos/centos-5.11-i386.json b/packer_templates/centos/centos-5.11-i386.json index 129454572..7ac851cbe 100644 --- a/packer_templates/centos/centos-5.11-i386.json +++ b/packer_templates/centos/centos-5.11-i386.json @@ -14,7 +14,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../../builds/packer-{{user `template`}}-virtualbox", + "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-virtualbox", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, @@ -38,7 +38,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../../builds/packer-{{user `template`}}-vmware", + "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-vmware", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, @@ -65,7 +65,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../../builds/packer-{{user `template`}}-parallels", + "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-parallels", "parallels_tools_flavor": "lin", "memory": "{{ user `memory` }}", "cpus": "{{ user `cpus` }}", @@ -95,7 +95,7 @@ "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", "memory": "{{ user `memory` }}", - "output_directory": "../../builds/packer-{{user `template`}}-hyperv", + "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-hyperv", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, @@ -118,7 +118,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../../builds/packer-{{user `template`}}-qemu", + "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-qemu", "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, @@ -130,7 +130,7 @@ ], "post-processors": [ { - "output": "../../builds/{{user `box_basename`}}.{{.Provider}}.box", + "output": "{{ user `builddir` }}/{{user `box_basename`}}.{{.Provider}}.box", "type": "vagrant" } ], @@ -162,6 +162,7 @@ ], "variables": { "box_basename": "centos-5.11-i386", + "builddir": "../../builds", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", "disk_size": "65536", diff --git a/packer_templates/centos/centos-5.11-x86_64.json b/packer_templates/centos/centos-5.11-x86_64.json index 27fdc7e68..323192c42 100644 --- a/packer_templates/centos/centos-5.11-x86_64.json +++ b/packer_templates/centos/centos-5.11-x86_64.json @@ -14,7 +14,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../../builds/packer-{{user `template`}}-virtualbox", + "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-virtualbox", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, @@ -38,7 +38,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../../builds/packer-{{user `template`}}-vmware", + "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-vmware", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, @@ -65,7 +65,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../../builds/packer-{{user `template`}}-parallels", + "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-parallels", "parallels_tools_flavor": "lin", "memory": "{{ user `memory` }}", "cpus": "{{ user `cpus` }}", @@ -95,7 +95,7 @@ "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", "memory": "{{ user `memory` }}", - "output_directory": "../../builds/packer-{{user `template`}}-hyperv", + "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-hyperv", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, @@ -118,7 +118,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../../builds/packer-{{user `template`}}-qemu", + "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-qemu", "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, @@ -130,7 +130,7 @@ ], "post-processors": [ { - "output": "../../builds/{{user `box_basename`}}.{{.Provider}}.box", + "output": "{{ user `builddir` }}/{{user `box_basename`}}.{{.Provider}}.box", "type": "vagrant" } ], @@ -162,6 +162,7 @@ ], "variables": { "box_basename": "centos-5.11", + "builddir": "../../builds", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", "disk_size": "65536", diff --git a/packer_templates/centos/centos-6.10-i386.json b/packer_templates/centos/centos-6.10-i386.json index 9fce8f88f..6abda098d 100644 --- a/packer_templates/centos/centos-6.10-i386.json +++ b/packer_templates/centos/centos-6.10-i386.json @@ -14,7 +14,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../../builds/packer-{{user `template`}}-virtualbox", + "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-virtualbox", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, @@ -38,7 +38,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../../builds/packer-{{user `template`}}-vmware", + "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-vmware", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, @@ -65,7 +65,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../../builds/packer-{{user `template`}}-parallels", + "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-parallels", "parallels_tools_flavor": "lin", "memory": "{{ user `memory` }}", "cpus": "{{ user `cpus` }}", @@ -95,7 +95,7 @@ "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", "memory": "{{ user `memory` }}", - "output_directory": "../../builds/packer-{{user `template`}}-hyperv", + "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-hyperv", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, @@ -118,7 +118,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../../builds/packer-{{user `template`}}-qemu", + "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-qemu", "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, @@ -130,7 +130,7 @@ ], "post-processors": [ { - "output": "../../builds/{{user `box_basename`}}.{{.Provider}}.box", + "output": "{{ user `builddir` }}/{{user `box_basename`}}.{{.Provider}}.box", "type": "vagrant" } ], @@ -161,6 +161,7 @@ ], "variables": { "box_basename": "centos-6.10-i386", + "builddir": "../../builds", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", "disk_size": "65536", diff --git a/packer_templates/centos/centos-6.10-x86_64.json b/packer_templates/centos/centos-6.10-x86_64.json index ef03324f6..0fdeb61cd 100644 --- a/packer_templates/centos/centos-6.10-x86_64.json +++ b/packer_templates/centos/centos-6.10-x86_64.json @@ -14,7 +14,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../../builds/packer-{{user `template`}}-virtualbox", + "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-virtualbox", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, @@ -38,7 +38,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../../builds/packer-{{user `template`}}-vmware", + "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-vmware", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, @@ -65,7 +65,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../../builds/packer-{{user `template`}}-parallels", + "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-parallels", "parallels_tools_flavor": "lin", "memory": "{{ user `memory` }}", "cpus": "{{ user `cpus` }}", @@ -95,7 +95,7 @@ "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", "memory": "{{ user `memory` }}", - "output_directory": "../../builds/packer-{{user `template`}}-hyperv", + "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-hyperv", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, @@ -118,7 +118,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../../builds/packer-{{user `template`}}-qemu", + "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-qemu", "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, @@ -130,7 +130,7 @@ ], "post-processors": [ { - "output": "../../builds/{{user `box_basename`}}.{{.Provider}}.box", + "output": "{{ user `builddir` }}/{{user `box_basename`}}.{{.Provider}}.box", "type": "vagrant" } ], @@ -161,6 +161,7 @@ ], "variables": { "box_basename": "centos-6.10", + "builddir": "../../builds", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", "disk_size": "65536", diff --git a/packer_templates/centos/centos-7.7-x86_64.json b/packer_templates/centos/centos-7.7-x86_64.json index 9b0ffe0d2..f94c5bcab 100644 --- a/packer_templates/centos/centos-7.7-x86_64.json +++ b/packer_templates/centos/centos-7.7-x86_64.json @@ -14,7 +14,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../../builds/packer-{{user `template`}}-virtualbox", + "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-virtualbox", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, @@ -38,7 +38,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../../builds/packer-{{user `template`}}-vmware", + "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-vmware", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, @@ -65,7 +65,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../../builds/packer-{{user `template`}}-parallels", + "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-parallels", "parallels_tools_flavor": "lin", "memory": "{{ user `memory` }}", "cpus": "{{ user `cpus` }}", @@ -95,7 +95,7 @@ "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", "memory": "{{ user `memory` }}", - "output_directory": "../../builds/packer-{{user `template`}}-hyperv", + "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-hyperv", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, @@ -118,7 +118,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../../builds/packer-{{user `template`}}-qemu", + "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-qemu", "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, @@ -130,7 +130,7 @@ ], "post-processors": [ { - "output": "../../builds/{{user `box_basename`}}.{{.Provider}}.box", + "output": "{{ user `builddir` }}/{{user `box_basename`}}.{{.Provider}}.box", "type": "vagrant" } ], @@ -161,6 +161,7 @@ ], "variables": { "box_basename": "centos-7.7", + "builddir": "../../builds", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", "disk_size": "65536", diff --git a/packer_templates/centos/centos-8.0-x86_64.json b/packer_templates/centos/centos-8.0-x86_64.json index 7ff62a844..b6d168f00 100644 --- a/packer_templates/centos/centos-8.0-x86_64.json +++ b/packer_templates/centos/centos-8.0-x86_64.json @@ -14,7 +14,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../../builds/packer-{{user `template`}}-virtualbox", + "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-virtualbox", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, @@ -38,7 +38,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../../builds/packer-{{user `template`}}-vmware", + "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-vmware", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, @@ -65,7 +65,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../../builds/packer-{{user `template`}}-parallels", + "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-parallels", "parallels_tools_flavor": "lin", "memory": "{{ user `memory` }}", "cpus": "{{ user `cpus` }}", @@ -95,7 +95,7 @@ "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", "memory": "{{ user `memory` }}", - "output_directory": "../../builds/packer-{{user `template`}}-hyperv", + "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-hyperv", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, @@ -118,7 +118,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../../builds/packer-{{user `template`}}-qemu", + "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-qemu", "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, @@ -130,7 +130,7 @@ ], "post-processors": [ { - "output": "../../builds/{{user `box_basename`}}.{{.Provider}}.box", + "output": "{{ user `builddir` }}/{{user `box_basename`}}.{{.Provider}}.box", "type": "vagrant" } ], @@ -161,6 +161,7 @@ ], "variables": { "box_basename": "centos-8.0", + "builddir": "../../builds", "build_timestamp": "{{isotime \"2019102650405\"}}", "cpus": "1", "disk_size": "65536", diff --git a/packer_templates/debian/debian-10.1-amd64.json b/packer_templates/debian/debian-10.1-amd64.json index 08e99cd11..650352037 100644 --- a/packer_templates/debian/debian-10.1-amd64.json +++ b/packer_templates/debian/debian-10.1-amd64.json @@ -29,7 +29,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../../builds/packer-{{user `template`}}-virtualbox", + "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-virtualbox", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", "ssh_password": "vagrant", "ssh_port": 22, @@ -68,7 +68,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../../builds/packer-{{user `template`}}-vmware", + "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-vmware", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", "ssh_password": "vagrant", "ssh_port": 22, @@ -111,7 +111,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../../builds/packer-{{user `template`}}-parallels", + "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-parallels", "parallels_tools_flavor": "lin", "memory": "{{ user `memory` }}", "cpus": "{{ user `cpus` }}", @@ -152,7 +152,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../../builds/packer-{{user `template`}}-qemu", + "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-qemu", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", "ssh_password": "vagrant", "ssh_port": 22, @@ -164,7 +164,7 @@ ], "post-processors": [ { - "output": "../../builds/{{user `box_basename`}}.{{.Provider}}.box", + "output": "{{ user `builddir` }}/{{user `box_basename`}}.{{.Provider}}.box", "type": "vagrant" } ], @@ -197,6 +197,7 @@ ], "variables": { "box_basename": "debian-10.1", + "builddir": "../../builds", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", "disk_size": "65536", diff --git a/packer_templates/debian/debian-10.1-i386.json b/packer_templates/debian/debian-10.1-i386.json index 8a60074be..8f95e190d 100644 --- a/packer_templates/debian/debian-10.1-i386.json +++ b/packer_templates/debian/debian-10.1-i386.json @@ -29,7 +29,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../../builds/packer-{{user `template`}}-virtualbox", + "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-virtualbox", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", "ssh_password": "vagrant", "ssh_port": 22, @@ -68,7 +68,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../../builds/packer-{{user `template`}}-vmware", + "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-vmware", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", "ssh_password": "vagrant", "ssh_port": 22, @@ -111,7 +111,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../../builds/packer-{{user `template`}}-parallels", + "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-parallels", "parallels_tools_flavor": "lin", "memory": "{{ user `memory` }}", "cpus": "{{ user `cpus` }}", @@ -152,7 +152,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../../builds/packer-{{user `template`}}-qemu", + "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-qemu", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", "ssh_password": "vagrant", "ssh_port": 22, @@ -164,7 +164,7 @@ ], "post-processors": [ { - "output": "../../builds/{{user `box_basename`}}.{{.Provider}}.box", + "output": "{{ user `builddir` }}/{{user `box_basename`}}.{{.Provider}}.box", "type": "vagrant" } ], @@ -197,6 +197,7 @@ ], "variables": { "box_basename": "debian-10.1-i386", + "builddir": "../../builds", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", "disk_size": "65536", diff --git a/packer_templates/debian/debian-8.11-amd64.json b/packer_templates/debian/debian-8.11-amd64.json index d83449096..55bfafee3 100644 --- a/packer_templates/debian/debian-8.11-amd64.json +++ b/packer_templates/debian/debian-8.11-amd64.json @@ -29,7 +29,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../../builds/packer-{{user `template`}}-virtualbox", + "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-virtualbox", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", "ssh_password": "vagrant", "ssh_port": 22, @@ -68,7 +68,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../../builds/packer-{{user `template`}}-vmware", + "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-vmware", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", "ssh_password": "vagrant", "ssh_port": 22, @@ -111,7 +111,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../../builds/packer-{{user `template`}}-parallels", + "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-parallels", "parallels_tools_flavor": "lin", "memory": "{{ user `memory` }}", "cpus": "{{ user `cpus` }}", @@ -152,7 +152,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../../builds/packer-{{user `template`}}-qemu", + "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-qemu", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", "ssh_password": "vagrant", "ssh_port": 22, @@ -164,7 +164,7 @@ ], "post-processors": [ { - "output": "../../builds/{{user `box_basename`}}.{{.Provider}}.box", + "output": "{{ user `builddir` }}/{{user `box_basename`}}.{{.Provider}}.box", "type": "vagrant" } ], @@ -197,6 +197,7 @@ ], "variables": { "box_basename": "debian-8.11", + "builddir": "../../builds", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", "disk_size": "65536", diff --git a/packer_templates/debian/debian-8.11-i386.json b/packer_templates/debian/debian-8.11-i386.json index 06d4af74d..9ae38f610 100644 --- a/packer_templates/debian/debian-8.11-i386.json +++ b/packer_templates/debian/debian-8.11-i386.json @@ -29,7 +29,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../../builds/packer-{{user `template`}}-virtualbox", + "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-virtualbox", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", "ssh_password": "vagrant", "ssh_port": 22, @@ -68,7 +68,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../../builds/packer-{{user `template`}}-vmware", + "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-vmware", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", "ssh_password": "vagrant", "ssh_port": 22, @@ -111,7 +111,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../../builds/packer-{{user `template`}}-parallels", + "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-parallels", "parallels_tools_flavor": "lin", "memory": "{{ user `memory` }}", "cpus": "{{ user `cpus` }}", @@ -152,7 +152,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../../builds/packer-{{user `template`}}-qemu", + "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-qemu", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", "ssh_password": "vagrant", "ssh_port": 22, @@ -164,7 +164,7 @@ ], "post-processors": [ { - "output": "../../builds/{{user `box_basename`}}.{{.Provider}}.box", + "output": "{{ user `builddir` }}/{{user `box_basename`}}.{{.Provider}}.box", "type": "vagrant" } ], @@ -197,6 +197,7 @@ ], "variables": { "box_basename": "debian-8.11-i386", + "builddir": "../../builds", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", "disk_size": "65536", diff --git a/packer_templates/debian/debian-9.11-amd64.json b/packer_templates/debian/debian-9.11-amd64.json index cb3133bf5..a2fe04a35 100644 --- a/packer_templates/debian/debian-9.11-amd64.json +++ b/packer_templates/debian/debian-9.11-amd64.json @@ -29,7 +29,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../../builds/packer-{{user `template`}}-virtualbox", + "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-virtualbox", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", "ssh_password": "vagrant", "ssh_port": 22, @@ -68,7 +68,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../../builds/packer-{{user `template`}}-vmware", + "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-vmware", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", "ssh_password": "vagrant", "ssh_port": 22, @@ -111,7 +111,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../../builds/packer-{{user `template`}}-parallels", + "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-parallels", "parallels_tools_flavor": "lin", "memory": "{{ user `memory` }}", "cpus": "{{ user `cpus` }}", @@ -152,7 +152,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../../builds/packer-{{user `template`}}-qemu", + "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-qemu", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", "ssh_password": "vagrant", "ssh_port": 22, @@ -164,7 +164,7 @@ ], "post-processors": [ { - "output": "../../builds/{{user `box_basename`}}.{{.Provider}}.box", + "output": "{{ user `builddir` }}/{{user `box_basename`}}.{{.Provider}}.box", "type": "vagrant" } ], @@ -197,6 +197,7 @@ ], "variables": { "box_basename": "debian-9.11", + "builddir": "../../builds", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", "disk_size": "65536", diff --git a/packer_templates/debian/debian-9.11-i386.json b/packer_templates/debian/debian-9.11-i386.json index 66139670b..90072a700 100644 --- a/packer_templates/debian/debian-9.11-i386.json +++ b/packer_templates/debian/debian-9.11-i386.json @@ -29,7 +29,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../../builds/packer-{{user `template`}}-virtualbox", + "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-virtualbox", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", "ssh_password": "vagrant", "ssh_port": 22, @@ -68,7 +68,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../../builds/packer-{{user `template`}}-vmware", + "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-vmware", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", "ssh_password": "vagrant", "ssh_port": 22, @@ -111,7 +111,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../../builds/packer-{{user `template`}}-parallels", + "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-parallels", "parallels_tools_flavor": "lin", "memory": "{{ user `memory` }}", "cpus": "{{ user `cpus` }}", @@ -152,7 +152,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../../builds/packer-{{user `template`}}-qemu", + "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-qemu", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", "ssh_password": "vagrant", "ssh_port": 22, @@ -164,7 +164,7 @@ ], "post-processors": [ { - "output": "../../builds/{{user `box_basename`}}.{{.Provider}}.box", + "output": "{{ user `builddir` }}/{{user `box_basename`}}.{{.Provider}}.box", "type": "vagrant" } ], @@ -197,6 +197,7 @@ ], "variables": { "box_basename": "debian-9.11-i386", + "builddir": "../../builds", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", "disk_size": "65536", diff --git a/packer_templates/debian/debian-9.11-ppc64el.json b/packer_templates/debian/debian-9.11-ppc64el.json index 14e5f8f3d..54c6d8bd0 100644 --- a/packer_templates/debian/debian-9.11-ppc64el.json +++ b/packer_templates/debian/debian-9.11-ppc64el.json @@ -33,7 +33,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../../builds/packer-{{user `template`}}-qemu", + "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-qemu", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", "ssh_password": "vagrant", "ssh_port": 22, @@ -49,7 +49,7 @@ ], "post-processors": [ { - "output": "../../builds/{{user `box_basename`}}.{{.Provider}}.box", + "output": "{{ user `builddir` }}/{{user `box_basename`}}.{{.Provider}}.box", "type": "vagrant" } ], @@ -82,6 +82,7 @@ ], "variables": { "box_basename": "debian-9.11", + "builddir": "../../builds", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", "disk_size": "65536", diff --git a/packer_templates/fedora/fedora-29-x86_64.json b/packer_templates/fedora/fedora-29-x86_64.json index de9fee415..e5e183ce9 100644 --- a/packer_templates/fedora/fedora-29-x86_64.json +++ b/packer_templates/fedora/fedora-29-x86_64.json @@ -4,7 +4,7 @@ "type": "qemu", "vm_name": "{{ user `template` }}", "name": "{{ user `template` }}", - "output_directory": "../../builds/packer-{{user `template`}}-libvirt", + "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-libvirt", "accelerator": "kvm", "boot_wait": "10s", "boot_command": [ @@ -44,7 +44,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../../builds/packer-{{user `template`}}-virtualbox", + "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-virtualbox", "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", "ssh_password": "vagrant", "ssh_port": 22, @@ -68,7 +68,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../../builds/packer-{{user `template`}}-vmware", + "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-vmware", "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", "ssh_password": "vagrant", "ssh_port": 22, @@ -96,7 +96,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../../builds/packer-{{user `template`}}-parallels", + "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-parallels", "parallels_tools_flavor": "lin", "memory": "{{ user `memory` }}", "cpus": "{{ user `cpus` }}", @@ -122,7 +122,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../../builds/packer-{{user `template`}}-qemu", + "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-qemu", "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", "ssh_password": "vagrant", "ssh_port": 22, @@ -134,7 +134,7 @@ ], "post-processors": [ { - "output": "../../builds/{{user `box_basename`}}.{{.Provider}}.box", + "output": "{{ user `builddir` }}/{{user `box_basename`}}.{{.Provider}}.box", "type": "vagrant" } ], @@ -167,6 +167,7 @@ "variables": { "arch": "64", "box_basename": "fedora-29", + "builddir": "../../builds", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", "disk_size": "65536", diff --git a/packer_templates/fedora/fedora-30-x86_64.json b/packer_templates/fedora/fedora-30-x86_64.json index 5e0587c70..e6aece3e9 100644 --- a/packer_templates/fedora/fedora-30-x86_64.json +++ b/packer_templates/fedora/fedora-30-x86_64.json @@ -4,7 +4,7 @@ "type": "qemu", "vm_name": "{{ user `template` }}", "name": "{{ user `template` }}", - "output_directory": "../../builds/packer-{{user `template`}}-libvirt", + "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-libvirt", "accelerator": "kvm", "boot_wait": "10s", "boot_command": [ @@ -44,7 +44,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../../builds/packer-{{user `template`}}-virtualbox", + "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-virtualbox", "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", "ssh_password": "vagrant", "ssh_port": 22, @@ -68,7 +68,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../../builds/packer-{{user `template`}}-vmware", + "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-vmware", "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", "ssh_password": "vagrant", "ssh_port": 22, @@ -96,7 +96,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../../builds/packer-{{user `template`}}-parallels", + "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-parallels", "parallels_tools_flavor": "lin", "memory": "{{ user `memory` }}", "cpus": "{{ user `cpus` }}", @@ -122,7 +122,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../../builds/packer-{{user `template`}}-qemu", + "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-qemu", "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", "ssh_password": "vagrant", "ssh_port": 22, @@ -134,7 +134,7 @@ ], "post-processors": [ { - "output": "../../builds/{{user `box_basename`}}.{{.Provider}}.box", + "output": "{{ user `builddir` }}/{{user `box_basename`}}.{{.Provider}}.box", "type": "vagrant" } ], @@ -168,6 +168,7 @@ "variables": { "arch": "64", "box_basename": "fedora-30", + "builddir": "../../builds", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", "disk_size": "65536", diff --git a/packer_templates/fedora/fedora-31-x86_64.json b/packer_templates/fedora/fedora-31-x86_64.json index d727d7e9e..97eb34bc2 100644 --- a/packer_templates/fedora/fedora-31-x86_64.json +++ b/packer_templates/fedora/fedora-31-x86_64.json @@ -4,7 +4,7 @@ "type": "qemu", "vm_name": "{{ user `template` }}", "name": "{{ user `template` }}", - "output_directory": "../../builds/packer-{{user `template`}}-libvirt", + "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-libvirt", "accelerator": "kvm", "boot_wait": "10s", "boot_command": [ @@ -44,7 +44,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../../builds/packer-{{user `template`}}-virtualbox", + "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-virtualbox", "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", "ssh_password": "vagrant", "ssh_port": 22, @@ -68,7 +68,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../../builds/packer-{{user `template`}}-vmware", + "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-vmware", "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", "ssh_password": "vagrant", "ssh_port": 22, @@ -96,7 +96,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../../builds/packer-{{user `template`}}-parallels", + "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-parallels", "parallels_tools_flavor": "lin", "memory": "{{ user `memory` }}", "cpus": "{{ user `cpus` }}", @@ -122,7 +122,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../../builds/packer-{{user `template`}}-qemu", + "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-qemu", "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", "ssh_password": "vagrant", "ssh_port": 22, @@ -134,7 +134,7 @@ ], "post-processors": [ { - "output": "../../builds/{{user `box_basename`}}.{{.Provider}}.box", + "output": "{{ user `builddir` }}/{{user `box_basename`}}.{{.Provider}}.box", "type": "vagrant" } ], @@ -168,6 +168,7 @@ "variables": { "arch": "64", "box_basename": "fedora-31", + "builddir": "../../builds", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", "disk_size": "65536", @@ -187,4 +188,4 @@ "template": "fedora-31-x86_64", "version": "TIMESTAMP" } -} \ No newline at end of file +} diff --git a/packer_templates/freebsd/freebsd-11.3-amd64.json b/packer_templates/freebsd/freebsd-11.3-amd64.json index c68cb956b..7e6c26124 100644 --- a/packer_templates/freebsd/freebsd-11.3-amd64.json +++ b/packer_templates/freebsd/freebsd-11.3-amd64.json @@ -23,7 +23,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../../builds/packer-{{user `template`}}-virtualbox", + "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-virtualbox", "shutdown_command": "echo 'vagrant' | su -m root -c 'shutdown -p now'", "ssh_password": "vagrant", "ssh_port": 22, @@ -56,7 +56,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../../builds/packer-{{user `template`}}-vmware", + "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-vmware", "shutdown_command": "echo 'vagrant' | su -m root -c 'shutdown -p now'", "ssh_password": "vagrant", "ssh_port": 22, @@ -90,7 +90,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../../builds/packer-{{user `template`}}-parallels", + "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-parallels", "parallels_tools_mode": "disable", "prlctl": [ [ @@ -144,7 +144,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../../builds/packer-{{user `template`}}-qemu", + "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-qemu", "shutdown_command": "echo 'vagrant' | su -m root -c 'shutdown -p now'", "ssh_password": "vagrant", "ssh_port": 22, @@ -156,7 +156,7 @@ ], "post-processors": [ { - "output": "../../builds/{{user `box_basename`}}.{{.Provider}}.box", + "output": "{{ user `builddir` }}/{{user `box_basename`}}.{{.Provider}}.box", "type": "vagrant", "vagrantfile_template": "vagrantfile_templates/freebsd.rb" } @@ -186,6 +186,7 @@ ], "variables": { "box_basename": "freebsd-11.3", + "builddir": "../../builds", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", "disk_size": "65536", diff --git a/packer_templates/freebsd/freebsd-11.3-i386.json b/packer_templates/freebsd/freebsd-11.3-i386.json index c4e89b835..a0183bb71 100644 --- a/packer_templates/freebsd/freebsd-11.3-i386.json +++ b/packer_templates/freebsd/freebsd-11.3-i386.json @@ -23,7 +23,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../../builds/packer-{{user `template`}}-virtualbox", + "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-virtualbox", "shutdown_command": "echo 'vagrant' | su -m root -c 'shutdown -p now'", "ssh_password": "vagrant", "ssh_port": 22, @@ -56,7 +56,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../../builds/packer-{{user `template`}}-vmware", + "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-vmware", "shutdown_command": "echo 'vagrant' | su -m root -c 'shutdown -p now'", "ssh_password": "vagrant", "ssh_port": 22, @@ -90,7 +90,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../../builds/packer-{{user `template`}}-parallels", + "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-parallels", "parallels_tools_mode": "disable", "prlctl": [ [ @@ -144,7 +144,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../../builds/packer-{{user `template`}}-qemu", + "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-qemu", "shutdown_command": "echo 'vagrant' | su -m root -c 'shutdown -p now'", "ssh_password": "vagrant", "ssh_port": 22, @@ -156,7 +156,7 @@ ], "post-processors": [ { - "output": "../../builds/{{user `box_basename`}}.{{.Provider}}.box", + "output": "{{ user `builddir` }}/{{user `box_basename`}}.{{.Provider}}.box", "type": "vagrant", "vagrantfile_template": "vagrantfile_templates/freebsd.rb" } @@ -186,6 +186,7 @@ ], "variables": { "box_basename": "freebsd-11.3-i386", + "builddir": "../../builds", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", "disk_size": "40960", diff --git a/packer_templates/freebsd/freebsd-12.0-amd64.json b/packer_templates/freebsd/freebsd-12.0-amd64.json index d9932eafc..83430c374 100644 --- a/packer_templates/freebsd/freebsd-12.0-amd64.json +++ b/packer_templates/freebsd/freebsd-12.0-amd64.json @@ -23,7 +23,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../../builds/packer-{{user `template`}}-virtualbox", + "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-virtualbox", "shutdown_command": "echo 'vagrant' | su -m root -c 'shutdown -p now'", "ssh_password": "vagrant", "ssh_port": 22, @@ -56,7 +56,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../../builds/packer-{{user `template`}}-vmware", + "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-vmware", "shutdown_command": "echo 'vagrant' | su -m root -c 'shutdown -p now'", "ssh_password": "vagrant", "ssh_port": 22, @@ -90,7 +90,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../../builds/packer-{{user `template`}}-parallels", + "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-parallels", "parallels_tools_mode": "disable", "prlctl": [ [ @@ -144,7 +144,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../../builds/packer-{{user `template`}}-qemu", + "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-qemu", "shutdown_command": "echo 'vagrant' | su -m root -c 'shutdown -p now'", "ssh_password": "vagrant", "ssh_port": 22, @@ -156,7 +156,7 @@ ], "post-processors": [ { - "output": "../../builds/{{user `box_basename`}}.{{.Provider}}.box", + "output": "{{ user `builddir` }}/{{user `box_basename`}}.{{.Provider}}.box", "type": "vagrant", "vagrantfile_template": "vagrantfile_templates/freebsd.rb" } @@ -186,6 +186,7 @@ ], "variables": { "box_basename": "freebsd-12.0", + "builddir": "../../builds", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", "disk_size": "65536", diff --git a/packer_templates/freebsd/freebsd-12.0-i386.json b/packer_templates/freebsd/freebsd-12.0-i386.json index 1af107e4a..d251da66b 100644 --- a/packer_templates/freebsd/freebsd-12.0-i386.json +++ b/packer_templates/freebsd/freebsd-12.0-i386.json @@ -23,7 +23,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../../builds/packer-{{user `template`}}-virtualbox", + "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-virtualbox", "shutdown_command": "echo 'vagrant' | su -m root -c 'shutdown -p now'", "ssh_password": "vagrant", "ssh_port": 22, @@ -56,7 +56,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../../builds/packer-{{user `template`}}-vmware", + "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-vmware", "shutdown_command": "echo 'vagrant' | su -m root -c 'shutdown -p now'", "ssh_password": "vagrant", "ssh_port": 22, @@ -90,7 +90,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../../builds/packer-{{user `template`}}-parallels", + "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-parallels", "parallels_tools_mode": "disable", "prlctl": [ [ @@ -144,7 +144,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../../builds/packer-{{user `template`}}-qemu", + "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-qemu", "shutdown_command": "echo 'vagrant' | su -m root -c 'shutdown -p now'", "ssh_password": "vagrant", "ssh_port": 22, @@ -156,7 +156,7 @@ ], "post-processors": [ { - "output": "../../builds/{{user `box_basename`}}.{{.Provider}}.box", + "output": "{{ user `builddir` }}/{{user `box_basename`}}.{{.Provider}}.box", "type": "vagrant", "vagrantfile_template": "vagrantfile_templates/freebsd.rb" } @@ -186,6 +186,7 @@ ], "variables": { "box_basename": "freebsd-12.0-i386", + "builddir": "../../builds", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", "disk_size": "40960", diff --git a/packer_templates/hardenedbsd/hardenedbsd-11-amd64.json b/packer_templates/hardenedbsd/hardenedbsd-11-amd64.json index b8030813d..5c0f09e75 100644 --- a/packer_templates/hardenedbsd/hardenedbsd-11-amd64.json +++ b/packer_templates/hardenedbsd/hardenedbsd-11-amd64.json @@ -21,7 +21,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../../builds/packer-{{user `template`}}-virtualbox", + "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-virtualbox", "shutdown_command": "echo 'vagrant' | su -m root -c 'shutdown -p now'", "ssh_password": "vagrant", "ssh_port": 22, @@ -56,7 +56,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../../builds/packer-{{user `template`}}-vmware", + "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-vmware", "shutdown_command": "echo 'vagrant' | su -m root -c 'shutdown -p now'", "ssh_password": "vagrant", "ssh_port": 22, @@ -91,7 +91,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../../builds/packer-{{user `template`}}-parallels", + "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-parallels", "parallels_tools_mode": "disable", "prlctl": [ [ @@ -145,7 +145,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../../builds/packer-{{user `template`}}-qemu", + "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-qemu", "shutdown_command": "echo 'vagrant' | su -m root -c 'shutdown -p now'", "ssh_password": "vagrant", "ssh_port": 22, @@ -157,7 +157,7 @@ ], "post-processors": [ { - "output": "../../builds/{{user `box_basename`}}.{{.Provider}}.box", + "output": "{{ user `builddir` }}/{{user `box_basename`}}.{{.Provider}}.box", "type": "vagrant", "vagrantfile_template": "vagrantfile_templates/hardenedbsd.rb" } @@ -185,6 +185,7 @@ ], "variables": { "box_basename": "hardenedbsd-11", + "builddir": "../../builds", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", "disk_size": "65536", diff --git a/packer_templates/macos/macos-10.12.json b/packer_templates/macos/macos-10.12.json index 56c4f818e..ffe909339 100644 --- a/packer_templates/macos/macos-10.12.json +++ b/packer_templates/macos/macos-10.12.json @@ -11,7 +11,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `iso_url`}}", - "output_directory": "../../builds/packer-{{user `template`}}-vmware", + "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-vmware", "shutdown_command": "echo 'vagrant'| sudo -S shutdown -h now", "skip_compaction": true, "ssh_password": "vagrant", @@ -45,7 +45,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `iso_url`}}", - "output_directory": "../../builds/packer-{{user `template`}}-virtualbox", + "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-virtualbox", "shutdown_command": "echo 'vagrant'| sudo -S shutdown -h now", "ssh_password": "vagrant", "ssh_port": 22, @@ -153,7 +153,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `iso_url`}}", - "output_directory": "../../builds/packer-{{user `template`}}-parallels", + "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-parallels", "parallels_tools_flavor": "mac", "prlctl": [ [ @@ -174,7 +174,7 @@ ], "post-processors": [ { - "output": "../../builds/{{user `box_basename`}}.{{.Provider}}.box", + "output": "{{ user `builddir` }}/{{user `box_basename`}}.{{.Provider}}.box", "type": "vagrant", "vagrantfile_template": "vagrantfile_templates/macosx.rb" } @@ -213,6 +213,7 @@ "_README": "You must provide a prepared Mac disk image (from https://github.com/timsutton/osx-vm-templates) and checksum value for this template to work. For more details, consult this project's README.md", "autologin": "true", "box_basename": "macos-10.12", + "builddir": "../../builds", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", "disk_size": "65536", diff --git a/packer_templates/macos/macosx-10.11.json b/packer_templates/macos/macosx-10.11.json index 5f09dc209..64a04aecb 100644 --- a/packer_templates/macos/macosx-10.11.json +++ b/packer_templates/macos/macosx-10.11.json @@ -11,7 +11,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `iso_url`}}", - "output_directory": "../../builds/packer-{{user `template`}}-vmware", + "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-vmware", "shutdown_command": "echo 'vagrant'| sudo -S shutdown -h now", "skip_compaction": true, "ssh_password": "vagrant", @@ -45,7 +45,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `iso_url`}}", - "output_directory": "../../builds/packer-{{user `template`}}-virtualbox", + "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-virtualbox", "shutdown_command": "echo 'vagrant'| sudo -S shutdown -h now", "ssh_password": "vagrant", "ssh_port": 22, @@ -153,7 +153,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `iso_url`}}", - "output_directory": "../../builds/packer-{{user `template`}}-parallels", + "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-parallels", "parallels_tools_flavor": "mac", "prlctl": [ [ @@ -174,7 +174,7 @@ ], "post-processors": [ { - "output": "../../builds/{{user `box_basename`}}.{{.Provider}}.box", + "output": "{{ user `builddir` }}/{{user `box_basename`}}.{{.Provider}}.box", "type": "vagrant", "vagrantfile_template": "vagrantfile_templates/macosx.rb" } @@ -213,6 +213,7 @@ "_README": "You must provide a prepared Mac disk image (from https://github.com/timsutton/osx-vm-templates) and checksum value for this template to work. For more details, consult this project's README.md", "autologin": "true", "box_basename": "macosx-10.11", + "builddir": "../../builds", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", "disk_size": "65536", diff --git a/packer_templates/opensuse/opensuse-leap-15.1-x86_64.json b/packer_templates/opensuse/opensuse-leap-15.1-x86_64.json index 8900a5fc0..fecfa8d80 100644 --- a/packer_templates/opensuse/opensuse-leap-15.1-x86_64.json +++ b/packer_templates/opensuse/opensuse-leap-15.1-x86_64.json @@ -23,7 +23,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../../builds/packer-{{user `template`}}-virtualbox", + "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-virtualbox", "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, @@ -56,7 +56,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../../builds/packer-{{user `template`}}-vmware", + "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-vmware", "shutdown_command": "echo 'vagrant'|sudo -S /sbin/shutdown -h 1", "ssh_password": "vagrant", "ssh_port": 22, @@ -92,7 +92,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../../builds/packer-{{user `template`}}-parallels", + "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-parallels", "parallels_tools_flavor": "lin", "memory": "{{ user `memory` }}", "cpus": "{{ user `cpus` }}", @@ -122,7 +122,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../../builds/packer-{{user `template`}}-qemu", + "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-qemu", "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, @@ -134,7 +134,7 @@ ], "post-processors": [ { - "output": "../../builds/{{user `box_basename`}}.{{.Provider}}.box", + "output": "{{ user `builddir` }}/{{user `box_basename`}}.{{.Provider}}.box", "type": "vagrant" } ], @@ -171,6 +171,7 @@ "arch": "64", "autoinst_cfg": "15/autoinst.xml", "box_basename": "opensuse-leap-15.1", + "builddir": "../../builds", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", "disk_size": "65536", diff --git a/packer_templates/oraclelinux/oracle-5.11-i386.json b/packer_templates/oraclelinux/oracle-5.11-i386.json index d4f3bc8b8..5c6683458 100644 --- a/packer_templates/oraclelinux/oracle-5.11-i386.json +++ b/packer_templates/oraclelinux/oracle-5.11-i386.json @@ -14,7 +14,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../../builds/packer-{{user `template`}}-virtualbox", + "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-virtualbox", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, @@ -38,7 +38,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../../builds/packer-{{user `template`}}-vmware", + "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-vmware", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, @@ -65,7 +65,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../../builds/packer-{{user `template`}}-parallels", + "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-parallels", "parallels_tools_flavor": "lin", "memory": "{{ user `memory` }}", "cpus": "{{ user `cpus` }}", @@ -91,7 +91,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../../builds/packer-{{user `template`}}-qemu", + "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-qemu", "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, @@ -103,7 +103,7 @@ ], "post-processors": [ { - "output": "../../builds/{{user `box_basename`}}.{{.Provider}}.box", + "output": "{{ user `builddir` }}/{{user `box_basename`}}.{{.Provider}}.box", "type": "vagrant" } ], @@ -134,6 +134,7 @@ "variables": { "arch": "32", "box_basename": "oracle-5.11-i386", + "builddir": "../../builds", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", "disk_size": "65536", diff --git a/packer_templates/oraclelinux/oracle-5.11-x86_64.json b/packer_templates/oraclelinux/oracle-5.11-x86_64.json index bd4d395f7..effd3f6ff 100644 --- a/packer_templates/oraclelinux/oracle-5.11-x86_64.json +++ b/packer_templates/oraclelinux/oracle-5.11-x86_64.json @@ -14,7 +14,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../../builds/packer-{{user `template`}}-virtualbox", + "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-virtualbox", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, @@ -46,7 +46,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../../builds/packer-{{user `template`}}-vmware", + "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-vmware", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, @@ -73,7 +73,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../../builds/packer-{{user `template`}}-parallels", + "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-parallels", "parallels_tools_flavor": "lin", "memory": "{{ user `memory` }}", "cpus": "{{ user `cpus` }}", @@ -99,7 +99,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../../builds/packer-{{user `template`}}-qemu", + "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-qemu", "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, @@ -111,7 +111,7 @@ ], "post-processors": [ { - "output": "../../builds/{{user `box_basename`}}.{{.Provider}}.box", + "output": "{{ user `builddir` }}/{{user `box_basename`}}.{{.Provider}}.box", "type": "vagrant" } ], @@ -142,6 +142,7 @@ "variables": { "arch": "64", "box_basename": "oracle-5.11", + "builddir": "../../builds", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", "disk_size": "65536", diff --git a/packer_templates/oraclelinux/oracle-6.10-i386.json b/packer_templates/oraclelinux/oracle-6.10-i386.json index c19e808dc..a5a05c85c 100644 --- a/packer_templates/oraclelinux/oracle-6.10-i386.json +++ b/packer_templates/oraclelinux/oracle-6.10-i386.json @@ -14,7 +14,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../../builds/packer-{{user `template`}}-virtualbox", + "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-virtualbox", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, @@ -38,7 +38,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../../builds/packer-{{user `template`}}-vmware", + "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-vmware", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, @@ -65,7 +65,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../../builds/packer-{{user `template`}}-parallels", + "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-parallels", "parallels_tools_flavor": "lin", "memory": "{{ user `memory` }}", "cpus": "{{ user `cpus` }}", @@ -91,7 +91,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../../builds/packer-{{user `template`}}-qemu", + "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-qemu", "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, @@ -103,7 +103,7 @@ ], "post-processors": [ { - "output": "../../builds/{{user `box_basename`}}.{{.Provider}}.box", + "output": "{{ user `builddir` }}/{{user `box_basename`}}.{{.Provider}}.box", "type": "vagrant" } ], @@ -135,6 +135,7 @@ "variables": { "arch": "32", "box_basename": "oracle-6.10-i386", + "builddir": "../../builds", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", "disk_size": "65536", diff --git a/packer_templates/oraclelinux/oracle-6.10-x86_64.json b/packer_templates/oraclelinux/oracle-6.10-x86_64.json index 0cecccc20..848018f64 100644 --- a/packer_templates/oraclelinux/oracle-6.10-x86_64.json +++ b/packer_templates/oraclelinux/oracle-6.10-x86_64.json @@ -14,7 +14,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../../builds/packer-{{user `template`}}-virtualbox", + "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-virtualbox", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, @@ -38,7 +38,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../../builds/packer-{{user `template`}}-vmware", + "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-vmware", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, @@ -65,7 +65,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../../builds/packer-{{user `template`}}-parallels", + "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-parallels", "parallels_tools_flavor": "lin", "memory": "{{ user `memory` }}", "cpus": "{{ user `cpus` }}", @@ -91,7 +91,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../../builds/packer-{{user `template`}}-qemu", + "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-qemu", "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, @@ -103,7 +103,7 @@ ], "post-processors": [ { - "output": "../../builds/{{user `box_basename`}}.{{.Provider}}.box", + "output": "{{ user `builddir` }}/{{user `box_basename`}}.{{.Provider}}.box", "type": "vagrant" } ], @@ -135,6 +135,7 @@ "variables": { "arch": "64", "box_basename": "oracle-6.10", + "builddir": "../../builds", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", "disk_size": "65536", diff --git a/packer_templates/oraclelinux/oracle-7.7-x86_64.json b/packer_templates/oraclelinux/oracle-7.7-x86_64.json index dfe407306..1fabebdcc 100644 --- a/packer_templates/oraclelinux/oracle-7.7-x86_64.json +++ b/packer_templates/oraclelinux/oracle-7.7-x86_64.json @@ -14,7 +14,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../../builds/packer-{{user `template`}}-virtualbox", + "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-virtualbox", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, @@ -38,7 +38,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../../builds/packer-{{user `template`}}-vmware", + "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-vmware", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, @@ -65,7 +65,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../../builds/packer-{{user `template`}}-parallels", + "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-parallels", "parallels_tools_flavor": "lin", "memory": "{{ user `memory` }}", "cpus": "{{ user `cpus` }}", @@ -91,7 +91,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../../builds/packer-{{user `template`}}-qemu", + "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-qemu", "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, @@ -103,7 +103,7 @@ ], "post-processors": [ { - "output": "../../builds/{{user `box_basename`}}.{{.Provider}}.box", + "output": "{{ user `builddir` }}/{{user `box_basename`}}.{{.Provider}}.box", "type": "vagrant" } ], @@ -135,6 +135,7 @@ "variables": { "arch": "64", "box_basename": "oracle-7.7", + "builddir": "../../builds", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", "disk_size": "65536", diff --git a/packer_templates/rhel/rhel-5.11-i386.json b/packer_templates/rhel/rhel-5.11-i386.json index 1721cf848..42e24e786 100644 --- a/packer_templates/rhel/rhel-5.11-i386.json +++ b/packer_templates/rhel/rhel-5.11-i386.json @@ -14,7 +14,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../../builds/packer-{{user `template`}}-virtualbox", + "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-virtualbox", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, @@ -38,7 +38,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../../builds/packer-{{user `template`}}-vmware", + "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-vmware", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, @@ -65,7 +65,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../../builds/packer-{{user `template`}}-parallels", + "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-parallels", "parallels_tools_flavor": "lin", "memory": "{{ user `memory` }}", "cpus": "{{ user `cpus` }}", @@ -91,7 +91,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../../builds/packer-{{user `template`}}-qemu", + "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-qemu", "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, @@ -103,7 +103,7 @@ ], "post-processors": [ { - "output": "../../builds/{{user `box_basename`}}.{{.Provider}}.box", + "output": "{{ user `builddir` }}/{{user `box_basename`}}.{{.Provider}}.box", "type": "vagrant" } ], @@ -133,6 +133,7 @@ "variables": { "arch": "32", "box_basename": "rhel-5.11-i386", + "builddir": "../../builds", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", "disk_size": "65536", diff --git a/packer_templates/rhel/rhel-5.11-x86_64.json b/packer_templates/rhel/rhel-5.11-x86_64.json index 7f4fa2357..d0d522243 100644 --- a/packer_templates/rhel/rhel-5.11-x86_64.json +++ b/packer_templates/rhel/rhel-5.11-x86_64.json @@ -14,7 +14,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../../builds/packer-{{user `template`}}-virtualbox", + "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-virtualbox", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, @@ -46,7 +46,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../../builds/packer-{{user `template`}}-vmware", + "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-vmware", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, @@ -73,7 +73,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../../builds/packer-{{user `template`}}-parallels", + "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-parallels", "parallels_tools_flavor": "lin", "memory": "{{ user `memory` }}", "cpus": "{{ user `cpus` }}", @@ -99,7 +99,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../../builds/packer-{{user `template`}}-qemu", + "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-qemu", "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, @@ -111,7 +111,7 @@ ], "post-processors": [ { - "output": "../../builds/{{user `box_basename`}}.{{.Provider}}.box", + "output": "{{ user `builddir` }}/{{user `box_basename`}}.{{.Provider}}.box", "type": "vagrant" } ], @@ -141,6 +141,7 @@ "variables": { "arch": "64", "box_basename": "rhel-5.11", + "builddir": "../../builds", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", "disk_size": "65536", diff --git a/packer_templates/rhel/rhel-6.10-i386.json b/packer_templates/rhel/rhel-6.10-i386.json index d07d9872f..77b514989 100644 --- a/packer_templates/rhel/rhel-6.10-i386.json +++ b/packer_templates/rhel/rhel-6.10-i386.json @@ -14,7 +14,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../../builds/packer-{{user `template`}}-virtualbox", + "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-virtualbox", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, @@ -38,7 +38,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../../builds/packer-{{user `template`}}-vmware", + "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-vmware", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, @@ -65,7 +65,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../../builds/packer-{{user `template`}}-parallels", + "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-parallels", "parallels_tools_flavor": "lin", "memory": "{{ user `memory` }}", "cpus": "{{ user `cpus` }}", @@ -91,7 +91,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../../builds/packer-{{user `template`}}-qemu", + "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-qemu", "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, @@ -103,7 +103,7 @@ ], "post-processors": [ { - "output": "../../builds/{{user `box_basename`}}.{{.Provider}}.box", + "output": "{{ user `builddir` }}/{{user `box_basename`}}.{{.Provider}}.box", "type": "vagrant" } ], @@ -134,6 +134,7 @@ "variables": { "arch": "32", "box_basename": "rhel-6.10-i386", + "builddir": "../../builds", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", "disk_size": "65536", diff --git a/packer_templates/rhel/rhel-6.10-x86_64.json b/packer_templates/rhel/rhel-6.10-x86_64.json index a456e75a6..d99580d49 100644 --- a/packer_templates/rhel/rhel-6.10-x86_64.json +++ b/packer_templates/rhel/rhel-6.10-x86_64.json @@ -14,7 +14,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../../builds/packer-{{user `template`}}-virtualbox", + "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-virtualbox", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, @@ -38,7 +38,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../../builds/packer-{{user `template`}}-vmware", + "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-vmware", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, @@ -65,7 +65,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../../builds/packer-{{user `template`}}-parallels", + "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-parallels", "parallels_tools_flavor": "lin", "memory": "{{ user `memory` }}", "cpus": "{{ user `cpus` }}", @@ -91,7 +91,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../../builds/packer-{{user `template`}}-qemu", + "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-qemu", "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, @@ -103,7 +103,7 @@ ], "post-processors": [ { - "output": "../../builds/{{user `box_basename`}}.{{.Provider}}.box", + "output": "{{ user `builddir` }}/{{user `box_basename`}}.{{.Provider}}.box", "type": "vagrant" } ], @@ -134,6 +134,7 @@ "variables": { "arch": "64", "box_basename": "rhel-6.10", + "builddir": "../../builds", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", "disk_size": "65536", diff --git a/packer_templates/rhel/rhel-7.6-x86_64.json b/packer_templates/rhel/rhel-7.6-x86_64.json index d9c6a471d..e325eb1f4 100644 --- a/packer_templates/rhel/rhel-7.6-x86_64.json +++ b/packer_templates/rhel/rhel-7.6-x86_64.json @@ -14,7 +14,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../../builds/packer-{{user `template`}}-virtualbox", + "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-virtualbox", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, @@ -38,7 +38,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../../builds/packer-{{user `template`}}-vmware", + "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-vmware", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, @@ -65,7 +65,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../../builds/packer-{{user `template`}}-parallels", + "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-parallels", "parallels_tools_flavor": "lin", "memory": "{{ user `memory` }}", "cpus": "{{ user `cpus` }}", @@ -91,7 +91,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../../builds/packer-{{user `template`}}-qemu", + "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-qemu", "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, @@ -103,7 +103,7 @@ ], "post-processors": [ { - "output": "../../builds/{{user `box_basename`}}.{{.Provider}}.box", + "output": "{{ user `builddir` }}/{{user `box_basename`}}.{{.Provider}}.box", "type": "vagrant" } ], @@ -134,6 +134,7 @@ "variables": { "arch": "64", "box_basename": "rhel-7.6", + "builddir": "../../builds", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", "disk_size": "65536", diff --git a/packer_templates/rhel/rhel-8.0-x86_64.json b/packer_templates/rhel/rhel-8.0-x86_64.json index 79d86c186..a000d337c 100644 --- a/packer_templates/rhel/rhel-8.0-x86_64.json +++ b/packer_templates/rhel/rhel-8.0-x86_64.json @@ -14,7 +14,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../../builds/packer-{{user `template`}}-virtualbox", + "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-virtualbox", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, @@ -38,7 +38,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../../builds/packer-{{user `template`}}-vmware", + "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-vmware", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, @@ -65,7 +65,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../../builds/packer-{{user `template`}}-parallels", + "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-parallels", "parallels_tools_flavor": "lin", "memory": "{{ user `memory` }}", "cpus": "{{ user `cpus` }}", @@ -91,7 +91,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../../builds/packer-{{user `template`}}-qemu", + "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-qemu", "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, @@ -103,7 +103,7 @@ ], "post-processors": [ { - "output": "../../builds/{{user `box_basename`}}.{{.Provider}}.box", + "output": "{{ user `builddir` }}/{{user `box_basename`}}.{{.Provider}}.box", "type": "vagrant" } ], @@ -134,6 +134,7 @@ "variables": { "arch": "64", "box_basename": "rhel-8.0", + "builddir": "../../builds", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", "disk_size": "65536", diff --git a/packer_templates/scientificlinux/scientific-7.7-x86_64.json b/packer_templates/scientificlinux/scientific-7.7-x86_64.json index 8db014655..86b134b96 100644 --- a/packer_templates/scientificlinux/scientific-7.7-x86_64.json +++ b/packer_templates/scientificlinux/scientific-7.7-x86_64.json @@ -14,7 +14,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../../builds/packer-{{user `template`}}-virtualbox", + "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-virtualbox", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, @@ -41,7 +41,7 @@ ], "post-processors": [ { - "output": "../../builds/{{user `box_basename`}}.{{.Provider}}.box", + "output": "{{ user `builddir` }}/{{user `box_basename`}}.{{.Provider}}.box", "type": "vagrant" } ], @@ -70,6 +70,7 @@ ], "variables": { "box_basename": "scientific-7.7", + "builddir": "../../builds", "build_timestamp": "{{isotime \"20080506150405\"}}", "cpus": "1", "disk_size": "65536", diff --git a/packer_templates/sles/sles-11-sp4-x86_64.json b/packer_templates/sles/sles-11-sp4-x86_64.json index ca2a9b86d..87cdbe2e1 100644 --- a/packer_templates/sles/sles-11-sp4-x86_64.json +++ b/packer_templates/sles/sles-11-sp4-x86_64.json @@ -18,7 +18,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `iso_name`}}", - "output_directory": "../../builds/packer-{{user `template`}}-virtualbox", + "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-virtualbox", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, @@ -46,7 +46,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `iso_name`}}", - "output_directory": "../../builds/packer-{{user `template`}}-vmware", + "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-vmware", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, @@ -77,7 +77,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `iso_name`}}", - "output_directory": "../../builds/packer-{{user `template`}}-parallels", + "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-parallels", "parallels_tools_flavor": "lin", "memory": "{{ user `memory` }}", "cpus": "{{ user `cpus` }}", @@ -107,7 +107,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `iso_name`}}", - "output_directory": "../../builds/packer-{{user `template`}}-qemu", + "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-qemu", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, @@ -119,7 +119,7 @@ ], "post-processors": [ { - "output": "../../builds/{{user `box_basename`}}.{{.Provider}}.box", + "output": "{{ user `builddir` }}/{{user `box_basename`}}.{{.Provider}}.box", "type": "vagrant" } ], @@ -155,6 +155,7 @@ "arch": "64", "autoinst_cfg": "sles-11-sp4-x86_64-autoinst.xml", "box_basename": "sles-11-sp4", + "builddir": "../../builds", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", "disk_size": "65536", diff --git a/packer_templates/sles/sles-12-sp2-x86_64.json b/packer_templates/sles/sles-12-sp2-x86_64.json index 43d90c5da..def9c2c24 100644 --- a/packer_templates/sles/sles-12-sp2-x86_64.json +++ b/packer_templates/sles/sles-12-sp2-x86_64.json @@ -18,7 +18,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `iso_name`}}", - "output_directory": "../../builds/packer-{{user `template`}}-virtualbox", + "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-virtualbox", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, @@ -46,7 +46,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `iso_name`}}", - "output_directory": "../../builds/packer-{{user `template`}}-vmware", + "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-vmware", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, @@ -77,7 +77,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `iso_name`}}", - "output_directory": "../../builds/packer-{{user `template`}}-parallels", + "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-parallels", "parallels_tools_flavor": "lin", "memory": "{{ user `memory` }}", "cpus": "{{ user `cpus` }}", @@ -107,7 +107,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `iso_name`}}", - "output_directory": "../../builds/packer-{{user `template`}}-qemu", + "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-qemu", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, @@ -119,7 +119,7 @@ ], "post-processors": [ { - "output": "../../builds/{{user `box_basename`}}.{{.Provider}}.box", + "output": "{{ user `builddir` }}/{{user `box_basename`}}.{{.Provider}}.box", "type": "vagrant" } ], @@ -156,6 +156,7 @@ "arch": "64", "autoinst_cfg": "sles-12-sp2-x86_64-autoinst.xml", "box_basename": "sles-12-sp2", + "builddir": "../../builds", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", "disk_size": "65536", diff --git a/packer_templates/sles/sles-12-sp3-x86_64.json b/packer_templates/sles/sles-12-sp3-x86_64.json index 6046e8b5e..83401c319 100644 --- a/packer_templates/sles/sles-12-sp3-x86_64.json +++ b/packer_templates/sles/sles-12-sp3-x86_64.json @@ -18,7 +18,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `iso_name`}}", - "output_directory": "../../builds/packer-{{user `template`}}-virtualbox", + "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-virtualbox", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, @@ -46,7 +46,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `iso_name`}}", - "output_directory": "../../builds/packer-{{user `template`}}-vmware", + "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-vmware", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, @@ -77,7 +77,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `iso_name`}}", - "output_directory": "../../builds/packer-{{user `template`}}-parallels", + "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-parallels", "parallels_tools_flavor": "lin", "memory": "{{ user `memory` }}", "cpus": "{{ user `cpus` }}", @@ -107,7 +107,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `iso_name`}}", - "output_directory": "../../builds/packer-{{user `template`}}-qemu", + "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-qemu", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, @@ -119,7 +119,7 @@ ], "post-processors": [ { - "output": "../../builds/{{user `box_basename`}}.{{.Provider}}.box", + "output": "{{ user `builddir` }}/{{user `box_basename`}}.{{.Provider}}.box", "type": "vagrant" } ], @@ -156,6 +156,7 @@ "arch": "64", "autoinst_cfg": "sles-12-sp3-x86_64-autoinst.xml", "box_basename": "sles-12-sp3", + "builddir": "../../builds", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", "disk_size": "65536", diff --git a/packer_templates/sles/sles-15-sp1.json b/packer_templates/sles/sles-15-sp1.json index a725f876c..3112088b0 100644 --- a/packer_templates/sles/sles-15-sp1.json +++ b/packer_templates/sles/sles-15-sp1.json @@ -18,7 +18,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `iso_name`}}", - "output_directory": "../../builds/packer-{{user `template`}}-virtualbox", + "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-virtualbox", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, @@ -62,7 +62,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `iso_name`}}", - "output_directory": "../../builds/packer-{{user `template`}}-vmware", + "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-vmware", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, @@ -93,7 +93,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `iso_name`}}", - "output_directory": "../../builds/packer-{{user `template`}}-parallels", + "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-parallels", "parallels_tools_flavor": "lin", "memory": "{{ user `memory` }}", "cpus": "{{ user `cpus` }}", @@ -123,7 +123,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `iso_name`}}", - "output_directory": "../../builds/packer-{{user `template`}}-qemu", + "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-qemu", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, @@ -135,7 +135,7 @@ ], "post-processors": [ { - "output": "../../builds/{{user `box_basename`}}.{{.Provider}}.box", + "output": "{{ user `builddir` }}/{{user `box_basename`}}.{{.Provider}}.box", "type": "vagrant" } ], @@ -172,6 +172,7 @@ "arch": "64", "autoinst_cfg": "sles-15-sp1-x86_64-autoinst.xml", "box_basename": "sles-15-sp1", + "builddir": "../../builds", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", "disk_size": "65536", diff --git a/packer_templates/sles/sles-15.json b/packer_templates/sles/sles-15.json index fd5f7945d..aeb367505 100644 --- a/packer_templates/sles/sles-15.json +++ b/packer_templates/sles/sles-15.json @@ -18,7 +18,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `iso_name`}}", - "output_directory": "../../builds/packer-{{user `template`}}-virtualbox", + "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-virtualbox", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, @@ -62,7 +62,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `iso_name`}}", - "output_directory": "../../builds/packer-{{user `template`}}-vmware", + "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-vmware", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, @@ -93,7 +93,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `iso_name`}}", - "output_directory": "../../builds/packer-{{user `template`}}-parallels", + "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-parallels", "parallels_tools_flavor": "lin", "memory": "{{ user `memory` }}", "cpus": "{{ user `cpus` }}", @@ -123,7 +123,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `iso_name`}}", - "output_directory": "../../builds/packer-{{user `template`}}-qemu", + "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-qemu", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, @@ -135,7 +135,7 @@ ], "post-processors": [ { - "output": "../../builds/{{user `box_basename`}}.{{.Provider}}.box", + "output": "{{ user `builddir` }}/{{user `box_basename`}}.{{.Provider}}.box", "type": "vagrant" } ], @@ -172,6 +172,7 @@ "arch": "64", "autoinst_cfg": "sles-15-x86_64-autoinst.xml", "box_basename": "sles-15", + "builddir": "../../builds", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", "disk_size": "65536", diff --git a/packer_templates/solaris/solaris-10.11-x86.json b/packer_templates/solaris/solaris-10.11-x86.json index 33f02c7f9..7e186d0da 100644 --- a/packer_templates/solaris/solaris-10.11-x86.json +++ b/packer_templates/solaris/solaris-10.11-x86.json @@ -85,7 +85,7 @@ ], "post-processors": [ { - "output": "../../builds/{{user `box_basename`}}.{{.Provider}}.box", + "output": "{{ user `builddir` }}/{{user `box_basename`}}.{{.Provider}}.box", "type": "vagrant" } ], @@ -106,6 +106,7 @@ "_README": "You must download the automated installer iso from the following page, and then place it somewhere that packer can fetch it", "arch": "64", "box_basename": "solaris-10.11", + "builddir": "../../builds", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", "disk_size": "65536", diff --git a/packer_templates/solaris/solaris-11-x86.json b/packer_templates/solaris/solaris-11-x86.json index f5830e423..da2c0e0b0 100644 --- a/packer_templates/solaris/solaris-11-x86.json +++ b/packer_templates/solaris/solaris-11-x86.json @@ -105,7 +105,7 @@ ], "post-processors": [ { - "output": "../../builds/{{user `box_basename`}}.{{.Provider}}.box", + "output": "{{ user `builddir` }}/{{user `box_basename`}}.{{.Provider}}.box", "type": "vagrant" } ], @@ -128,6 +128,7 @@ "_README": "You must download the automated installer iso from the following page, and then place it in the packer_cache dir", "arch": "64", "box_basename": "solaris-11.3", + "builddir": "../../builds", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", "disk_size": "65536", diff --git a/packer_templates/ubuntu/ubuntu-16.04-amd64.json b/packer_templates/ubuntu/ubuntu-16.04-amd64.json index a9d02ca39..65aa00c61 100644 --- a/packer_templates/ubuntu/ubuntu-16.04-amd64.json +++ b/packer_templates/ubuntu/ubuntu-16.04-amd64.json @@ -37,7 +37,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../../builds/packer-{{user `template`}}-virtualbox", + "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-virtualbox", "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", "ssh_password": "vagrant", "ssh_port": 22, @@ -84,7 +84,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../../builds/packer-{{user `template`}}-vmware", + "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-vmware", "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", "ssh_password": "vagrant", "ssh_port": 22, @@ -135,7 +135,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../../builds/packer-{{user `template`}}-parallels", + "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-parallels", "parallels_tools_flavor": "lin", "memory": "{{ user `memory` }}", "cpus": "{{ user `cpus` }}", @@ -182,7 +182,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../../builds/packer-{{user `template`}}-qemu", + "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-qemu", "memory": "{{ user `memory` }}", "cpus": "{{ user `cpus` }}", "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", @@ -218,7 +218,7 @@ "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", "memory": "{{user `memory`}}", - "output_directory": "../../builds/packer-{{user `template`}}-hyperv", + "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-hyperv", "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", "ssh_password": "vagrant", "ssh_port": 22, @@ -231,7 +231,7 @@ ], "post-processors": [ { - "output": "../../builds/{{user `box_basename`}}.{{.Provider}}.box", + "output": "{{ user `builddir` }}/{{user `box_basename`}}.{{.Provider}}.box", "type": "vagrant" } ], @@ -264,6 +264,7 @@ ], "variables": { "box_basename": "ubuntu-16.04", + "builddir": "../../builds", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", "disk_size": "65536", diff --git a/packer_templates/ubuntu/ubuntu-16.04-i386.json b/packer_templates/ubuntu/ubuntu-16.04-i386.json index aa56b919c..66747f8ca 100644 --- a/packer_templates/ubuntu/ubuntu-16.04-i386.json +++ b/packer_templates/ubuntu/ubuntu-16.04-i386.json @@ -37,7 +37,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../../builds/packer-{{user `template`}}-virtualbox", + "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-virtualbox", "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", "ssh_password": "vagrant", "ssh_port": 22, @@ -84,7 +84,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../../builds/packer-{{user `template`}}-vmware", + "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-vmware", "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", "ssh_password": "vagrant", "ssh_port": 22, @@ -134,7 +134,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../../builds/packer-{{user `template`}}-parallels", + "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-parallels", "parallels_tools_flavor": "lin", "memory": "{{ user `memory` }}", "cpus": "{{ user `cpus` }}", @@ -181,7 +181,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../../builds/packer-{{user `template`}}-qemu", + "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-qemu", "memory": "{{ user `memory` }}", "cpus": "{{ user `cpus` }}", "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", @@ -195,7 +195,7 @@ ], "post-processors": [ { - "output": "../../builds/{{user `box_basename`}}.{{.Provider}}.box", + "output": "{{ user `builddir` }}/{{user `box_basename`}}.{{.Provider}}.box", "type": "vagrant" } ], @@ -227,6 +227,7 @@ ], "variables": { "box_basename": "ubuntu-16.04-i386", + "builddir": "../../builds", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", "disk_size": "65536", diff --git a/packer_templates/ubuntu/ubuntu-18.04-amd64.json b/packer_templates/ubuntu/ubuntu-18.04-amd64.json index 2ca3f42ec..ae968770f 100644 --- a/packer_templates/ubuntu/ubuntu-18.04-amd64.json +++ b/packer_templates/ubuntu/ubuntu-18.04-amd64.json @@ -36,7 +36,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../../builds/packer-{{user `template`}}-virtualbox", + "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-virtualbox", "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", "ssh_password": "vagrant", "ssh_port": 22, @@ -82,7 +82,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../../builds/packer-{{user `template`}}-vmware", + "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-vmware", "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", "ssh_password": "vagrant", "ssh_port": 22, @@ -132,7 +132,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../../builds/packer-{{user `template`}}-parallels", + "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-parallels", "parallels_tools_flavor": "lin", "memory": "{{ user `memory` }}", "cpus": "{{ user `cpus` }}", @@ -178,7 +178,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../../builds/packer-{{user `template`}}-qemu", + "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-qemu", "memory": "{{ user `memory` }}", "cpus": "{{ user `cpus` }}", "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", @@ -214,7 +214,7 @@ "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", "memory": "{{user `memory`}}", - "output_directory": "../../builds/packer-{{user `template`}}-hyperv", + "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-hyperv", "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", "ssh_password": "vagrant", "ssh_port": 22, @@ -227,7 +227,7 @@ ], "post-processors": [ { - "output": "../../builds/{{user `box_basename`}}.{{.Provider}}.box", + "output": "{{ user `builddir` }}/{{user `box_basename`}}.{{.Provider}}.box", "type": "vagrant" } ], @@ -260,6 +260,7 @@ ], "variables": { "box_basename": "ubuntu-18.04", + "builddir": "../../builds", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", "disk_size": "65536", diff --git a/packer_templates/ubuntu/ubuntu-18.10-amd64.json b/packer_templates/ubuntu/ubuntu-18.10-amd64.json index ee27aa7ef..7f884bcd4 100644 --- a/packer_templates/ubuntu/ubuntu-18.10-amd64.json +++ b/packer_templates/ubuntu/ubuntu-18.10-amd64.json @@ -36,7 +36,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../../builds/packer-{{user `template`}}-virtualbox", + "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-virtualbox", "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", "ssh_password": "vagrant", "ssh_port": 22, @@ -82,7 +82,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../../builds/packer-{{user `template`}}-vmware", + "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-vmware", "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", "ssh_password": "vagrant", "ssh_port": 22, @@ -132,7 +132,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../../builds/packer-{{user `template`}}-parallels", + "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-parallels", "parallels_tools_flavor": "lin", "memory": "{{ user `memory` }}", "cpus": "{{ user `cpus` }}", @@ -178,7 +178,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../../builds/packer-{{user `template`}}-qemu", + "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-qemu", "memory": "{{ user `memory` }}", "cpus": "{{ user `cpus` }}", "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", @@ -214,7 +214,7 @@ "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", "memory": "{{user `memory`}}", - "output_directory": "../../builds/packer-{{user `template`}}-hyperv", + "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-hyperv", "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", "ssh_password": "vagrant", "ssh_port": 22, @@ -227,7 +227,7 @@ ], "post-processors": [ { - "output": "../../builds/{{user `box_basename`}}.{{.Provider}}.box", + "output": "{{ user `builddir` }}/{{user `box_basename`}}.{{.Provider}}.box", "type": "vagrant" } ], @@ -260,6 +260,7 @@ ], "variables": { "box_basename": "ubuntu-18.10", + "builddir": "../../builds", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", "disk_size": "65536", diff --git a/packer_templates/ubuntu/ubuntu-19.04-amd64.json b/packer_templates/ubuntu/ubuntu-19.04-amd64.json index bffa967a8..c97982e82 100644 --- a/packer_templates/ubuntu/ubuntu-19.04-amd64.json +++ b/packer_templates/ubuntu/ubuntu-19.04-amd64.json @@ -36,7 +36,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../../builds/packer-{{user `template`}}-virtualbox", + "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-virtualbox", "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", "ssh_password": "vagrant", "ssh_port": 22, @@ -82,7 +82,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../../builds/packer-{{user `template`}}-vmware", + "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-vmware", "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", "ssh_password": "vagrant", "ssh_port": 22, @@ -132,7 +132,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../../builds/packer-{{user `template`}}-parallels", + "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-parallels", "parallels_tools_flavor": "lin", "memory": "{{ user `memory` }}", "cpus": "{{ user `cpus` }}", @@ -178,7 +178,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../../builds/packer-{{user `template`}}-qemu", + "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-qemu", "memory": "{{ user `memory` }}", "cpus": "{{ user `cpus` }}", "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", @@ -214,7 +214,7 @@ "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", "memory": "{{user `memory`}}", - "output_directory": "../../builds/packer-{{user `template`}}-hyperv", + "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-hyperv", "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", "ssh_password": "vagrant", "ssh_port": 22, @@ -227,7 +227,7 @@ ], "post-processors": [ { - "output": "../../builds/{{user `box_basename`}}.{{.Provider}}.box", + "output": "{{ user `builddir` }}/{{user `box_basename`}}.{{.Provider}}.box", "type": "vagrant" } ], @@ -260,6 +260,7 @@ ], "variables": { "box_basename": "ubuntu-19.04", + "builddir": "../../builds", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", "disk_size": "65536", diff --git a/packer_templates/windows/windows-10.json b/packer_templates/windows/windows-10.json index ac5f973ef..99f522919 100644 --- a/packer_templates/windows/windows-10.json +++ b/packer_templates/windows/windows-10.json @@ -15,7 +15,7 @@ "iso_url": "{{ user `iso_url` }}", "iso_checksum": "{{ user `iso_checksum` }}", "iso_checksum_type": "sha1", - "output_directory": "../../builds/packer-{{user `template`}}-virtualbox", + "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-virtualbox", "communicator": "winrm", "winrm_username": "vagrant", "winrm_password": "vagrant", @@ -37,7 +37,7 @@ "iso_url": "{{ user `iso_url` }}", "iso_checksum": "{{ user `iso_checksum` }}", "iso_checksum_type": "sha1", - "output_directory": "../../builds/packer-{{user `template`}}-vmware", + "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-vmware", "communicator": "winrm", "winrm_username": "vagrant", "winrm_password": "vagrant", @@ -112,6 +112,7 @@ "headless": "true", "iso_checksum": "743fc483bb8bf1901c0534a0ae15208a5a72a3c5", "iso_url": "https://software-download.microsoft.com/download/pr/18362.30.190401-1528.19h1_release_svc_refresh_CLIENTENTERPRISEEVAL_OEMRET_x64FRE_en-us.iso", + "builddir": "../../builds", "template": "windows-10" } } diff --git a/packer_templates/windows/windows-2008r2.json b/packer_templates/windows/windows-2008r2.json index d2b67d7ff..2449e331d 100644 --- a/packer_templates/windows/windows-2008r2.json +++ b/packer_templates/windows/windows-2008r2.json @@ -13,7 +13,7 @@ "iso_url": "{{ user `iso_url` }}", "iso_checksum": "{{ user `iso_checksum` }}", "iso_checksum_type": "sha1", - "output_directory": "../../builds/packer-{{user `template`}}-virtualbox", + "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-virtualbox", "communicator": "winrm", "winrm_username": "vagrant", "winrm_password": "vagrant", @@ -78,6 +78,7 @@ "headless": "false", "iso_checksum": "beed231a34e90e1dd9a04b3afabec31d62ce3889", "iso_url": "http://download.microsoft.com/download/7/5/E/75EC4E54-5B02-42D6-8879-D8D3A25FBEF7/7601.17514.101119-1850_x64fre_server_eval_en-us-GRMSXEVAL_EN_DVD.iso", + "builddir": "../../builds", "template": "windows-2008r2-standard" } } diff --git a/packer_templates/windows/windows-2012r2.json b/packer_templates/windows/windows-2012r2.json index 81013b486..233efd2a4 100644 --- a/packer_templates/windows/windows-2012r2.json +++ b/packer_templates/windows/windows-2012r2.json @@ -13,7 +13,7 @@ "iso_url": "{{ user `iso_url` }}", "iso_checksum": "{{ user `iso_checksum` }}", "iso_checksum_type": "sha1", - "output_directory": "../../builds/packer-{{user `template`}}-virtualbox", + "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-virtualbox", "communicator": "winrm", "winrm_username": "vagrant", "winrm_password": "vagrant", @@ -34,7 +34,7 @@ "iso_url": "{{ user `iso_url` }}", "iso_checksum": "{{ user `iso_checksum` }}", "iso_checksum_type": "sha1", - "output_directory": "../../builds/packer-{{user `template`}}-vmware", + "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-vmware", "communicator": "winrm", "winrm_username": "vagrant", "winrm_password": "vagrant", @@ -107,6 +107,7 @@ "headless": "true", "iso_checksum": "849734f37346385dac2c101e4aacba4626bb141c", "iso_url": "http://download.microsoft.com/download/6/2/A/62A76ABB-9990-4EFC-A4FE-C7D698DAEB96/9600.17050.WINBLUE_REFRESH.140317-1640_X64FRE_SERVER_EVAL_EN-US-IR3_SSS_X64FREE_EN-US_DV9.ISO", + "builddir": "../../builds", "template": "windows-2012r2-standard" } } diff --git a/packer_templates/windows/windows-2016.json b/packer_templates/windows/windows-2016.json index 743bff58e..4fe1b81cc 100644 --- a/packer_templates/windows/windows-2016.json +++ b/packer_templates/windows/windows-2016.json @@ -13,7 +13,7 @@ "iso_url": "{{ user `iso_url` }}", "iso_checksum": "{{ user `iso_checksum` }}", "iso_checksum_type": "sha1", - "output_directory": "../../builds/packer-{{user `template`}}-virtualbox", + "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-virtualbox", "communicator": "winrm", "winrm_username": "vagrant", "winrm_password": "vagrant", @@ -34,7 +34,7 @@ "iso_url": "{{ user `iso_url` }}", "iso_checksum": "{{ user `iso_checksum` }}", "iso_checksum_type": "sha1", - "output_directory": "../../builds/packer-{{user `template`}}-vmware", + "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-vmware", "communicator": "winrm", "winrm_username": "vagrant", "winrm_password": "vagrant", @@ -107,6 +107,7 @@ "headless": "true", "iso_checksum": "772700802951b36c8cb26a61c040b9a8dc3816a3", "iso_url": "https://software-download.microsoft.com/download/pr/Windows_Server_2016_Datacenter_EVAL_en-us_14393_refresh.ISO", + "builddir": "../../builds", "template": "windows-2016-standard" } } diff --git a/packer_templates/windows/windows-2019.json b/packer_templates/windows/windows-2019.json index 3ec001f75..537fcb372 100644 --- a/packer_templates/windows/windows-2019.json +++ b/packer_templates/windows/windows-2019.json @@ -13,7 +13,7 @@ "iso_url": "{{ user `iso_url` }}", "iso_checksum": "{{ user `iso_checksum` }}", "iso_checksum_type": "sha1", - "output_directory": "../../builds/packer-{{user `template`}}-virtualbox", + "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-virtualbox", "communicator": "winrm", "winrm_username": "vagrant", "winrm_password": "vagrant", @@ -34,7 +34,7 @@ "iso_url": "{{ user `iso_url` }}", "iso_checksum": "{{ user `iso_checksum` }}", "iso_checksum_type": "sha1", - "output_directory": "../../builds/packer-{{user `template`}}-vmware", + "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-vmware", "communicator": "winrm", "winrm_username": "vagrant", "winrm_password": "vagrant", @@ -107,6 +107,7 @@ "headless": "true", "iso_checksum": "91e3a2f1acc39af21353c7cc105c799494d7539f", "iso_url": "https://software-download.microsoft.com/download/sg/17763.253.190108-0006.rs5_release_svc_refresh_SERVER_EVAL_x64FRE_en-us.iso", + "builddir": "../../builds", "template": "windows-2019-standard" } } diff --git a/packer_templates/windows/windows-7.json b/packer_templates/windows/windows-7.json index d28309940..498c8cbcd 100644 --- a/packer_templates/windows/windows-7.json +++ b/packer_templates/windows/windows-7.json @@ -13,7 +13,7 @@ "iso_url": "{{ user `iso_url` }}", "iso_checksum": "{{ user `iso_checksum` }}", "iso_checksum_type": "sha1", - "output_directory": "../../builds/packer-{{user `template`}}-virtualbox", + "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-virtualbox", "communicator": "winrm", "winrm_username": "vagrant", "winrm_password": "vagrant", @@ -85,6 +85,7 @@ "headless": "false", "iso_checksum": "971fc00183a52c152fe924a6b99fdec011a871c2", "iso_url": "http://care.dlservice.microsoft.com/dl/download/evalx/win7/x86/EN/7600.16385.090713-1255_x86fre_enterprise_en-us_EVAL_Eval_Enterprise-GRMCENEVAL_EN_DVD.iso", + "builddir": "../../builds", "template": "windows-7" } } From f980789e35382d0dad312ee28fc68de430f4bb12 Mon Sep 17 00:00:00 2001 From: Ali Rizvi-Santiago <arizvisa@gmail.com> Date: Thu, 31 Oct 2019 10:46:31 -0500 Subject: [PATCH 1051/1622] Renamed the "builddir" user-variaable to "build_directory" so that it is more consistent with the naming of the other related user-variables. Signed-off-by: Ali Rizvi-Santiago <arizvisa@gmail.com> --- packer_templates/amazonlinux/amazon-2-x86_64.json | 6 +++--- packer_templates/centos/centos-5.11-i386.json | 14 +++++++------- packer_templates/centos/centos-5.11-x86_64.json | 14 +++++++------- packer_templates/centos/centos-6.10-i386.json | 14 +++++++------- packer_templates/centos/centos-6.10-x86_64.json | 14 +++++++------- packer_templates/centos/centos-7.7-x86_64.json | 14 +++++++------- packer_templates/centos/centos-8.0-x86_64.json | 14 +++++++------- packer_templates/debian/debian-10.1-amd64.json | 12 ++++++------ packer_templates/debian/debian-10.1-i386.json | 12 ++++++------ packer_templates/debian/debian-8.11-amd64.json | 12 ++++++------ packer_templates/debian/debian-8.11-i386.json | 12 ++++++------ packer_templates/debian/debian-9.11-amd64.json | 12 ++++++------ packer_templates/debian/debian-9.11-i386.json | 12 ++++++------ packer_templates/debian/debian-9.11-ppc64el.json | 6 +++--- packer_templates/fedora/fedora-29-x86_64.json | 14 +++++++------- packer_templates/fedora/fedora-30-x86_64.json | 14 +++++++------- packer_templates/fedora/fedora-31-x86_64.json | 14 +++++++------- packer_templates/freebsd/freebsd-11.3-amd64.json | 12 ++++++------ packer_templates/freebsd/freebsd-11.3-i386.json | 12 ++++++------ packer_templates/freebsd/freebsd-12.0-amd64.json | 12 ++++++------ packer_templates/freebsd/freebsd-12.0-i386.json | 12 ++++++------ .../hardenedbsd/hardenedbsd-11-amd64.json | 12 ++++++------ packer_templates/macos/macos-10.12.json | 10 +++++----- packer_templates/macos/macosx-10.11.json | 10 +++++----- .../opensuse/opensuse-leap-15.1-x86_64.json | 12 ++++++------ packer_templates/oraclelinux/oracle-5.11-i386.json | 12 ++++++------ .../oraclelinux/oracle-5.11-x86_64.json | 12 ++++++------ packer_templates/oraclelinux/oracle-6.10-i386.json | 12 ++++++------ .../oraclelinux/oracle-6.10-x86_64.json | 12 ++++++------ .../oraclelinux/oracle-7.7-x86_64.json | 12 ++++++------ packer_templates/rhel/rhel-5.11-i386.json | 12 ++++++------ packer_templates/rhel/rhel-5.11-x86_64.json | 12 ++++++------ packer_templates/rhel/rhel-6.10-i386.json | 12 ++++++------ packer_templates/rhel/rhel-6.10-x86_64.json | 12 ++++++------ packer_templates/rhel/rhel-7.6-x86_64.json | 12 ++++++------ packer_templates/rhel/rhel-8.0-x86_64.json | 12 ++++++------ .../scientificlinux/scientific-7.7-x86_64.json | 6 +++--- packer_templates/sles/sles-11-sp4-x86_64.json | 12 ++++++------ packer_templates/sles/sles-12-sp2-x86_64.json | 12 ++++++------ packer_templates/sles/sles-12-sp3-x86_64.json | 12 ++++++------ packer_templates/sles/sles-15-sp1.json | 12 ++++++------ packer_templates/sles/sles-15.json | 12 ++++++------ packer_templates/solaris/solaris-10.11-x86.json | 4 ++-- packer_templates/solaris/solaris-11-x86.json | 4 ++-- packer_templates/ubuntu/ubuntu-16.04-amd64.json | 14 +++++++------- packer_templates/ubuntu/ubuntu-16.04-i386.json | 12 ++++++------ packer_templates/ubuntu/ubuntu-18.04-amd64.json | 14 +++++++------- packer_templates/ubuntu/ubuntu-18.10-amd64.json | 14 +++++++------- packer_templates/ubuntu/ubuntu-19.04-amd64.json | 14 +++++++------- packer_templates/windows/windows-10.json | 6 +++--- packer_templates/windows/windows-2008r2.json | 4 ++-- packer_templates/windows/windows-2012r2.json | 6 +++--- packer_templates/windows/windows-2016.json | 6 +++--- packer_templates/windows/windows-2019.json | 6 +++--- packer_templates/windows/windows-7.json | 4 ++-- 55 files changed, 304 insertions(+), 304 deletions(-) diff --git a/packer_templates/amazonlinux/amazon-2-x86_64.json b/packer_templates/amazonlinux/amazon-2-x86_64.json index dd859254d..e77603769 100644 --- a/packer_templates/amazonlinux/amazon-2-x86_64.json +++ b/packer_templates/amazonlinux/amazon-2-x86_64.json @@ -4,7 +4,7 @@ "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "headless": "{{ user `headless` }}", "http_directory": "http", - "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-virtualbox", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-virtualbox", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_wait_timeout": "10000s", "ssh_port": 22, @@ -32,7 +32,7 @@ ], "post-processors": [ { - "output": "{{ user `builddir` }}/{{user `box_basename`}}.{{.Provider}}.box", + "output": "{{ user `build_directory` }}/{{user `box_basename`}}.{{.Provider}}.box", "type": "vagrant" } ], @@ -61,7 +61,7 @@ ], "variables": { "box_basename": "amazon-2", - "builddir": "../../builds", + "build_directory": "../../builds", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", "disk_size": "65536", diff --git a/packer_templates/centos/centos-5.11-i386.json b/packer_templates/centos/centos-5.11-i386.json index 7ac851cbe..f35c3b951 100644 --- a/packer_templates/centos/centos-5.11-i386.json +++ b/packer_templates/centos/centos-5.11-i386.json @@ -14,7 +14,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-virtualbox", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-virtualbox", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, @@ -38,7 +38,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-vmware", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-vmware", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, @@ -65,7 +65,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-parallels", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-parallels", "parallels_tools_flavor": "lin", "memory": "{{ user `memory` }}", "cpus": "{{ user `cpus` }}", @@ -95,7 +95,7 @@ "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", "memory": "{{ user `memory` }}", - "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-hyperv", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-hyperv", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, @@ -118,7 +118,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-qemu", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-qemu", "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, @@ -130,7 +130,7 @@ ], "post-processors": [ { - "output": "{{ user `builddir` }}/{{user `box_basename`}}.{{.Provider}}.box", + "output": "{{ user `build_directory` }}/{{user `box_basename`}}.{{.Provider}}.box", "type": "vagrant" } ], @@ -162,7 +162,7 @@ ], "variables": { "box_basename": "centos-5.11-i386", - "builddir": "../../builds", + "build_directory": "../../builds", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", "disk_size": "65536", diff --git a/packer_templates/centos/centos-5.11-x86_64.json b/packer_templates/centos/centos-5.11-x86_64.json index 323192c42..563048752 100644 --- a/packer_templates/centos/centos-5.11-x86_64.json +++ b/packer_templates/centos/centos-5.11-x86_64.json @@ -14,7 +14,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-virtualbox", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-virtualbox", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, @@ -38,7 +38,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-vmware", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-vmware", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, @@ -65,7 +65,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-parallels", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-parallels", "parallels_tools_flavor": "lin", "memory": "{{ user `memory` }}", "cpus": "{{ user `cpus` }}", @@ -95,7 +95,7 @@ "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", "memory": "{{ user `memory` }}", - "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-hyperv", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-hyperv", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, @@ -118,7 +118,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-qemu", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-qemu", "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, @@ -130,7 +130,7 @@ ], "post-processors": [ { - "output": "{{ user `builddir` }}/{{user `box_basename`}}.{{.Provider}}.box", + "output": "{{ user `build_directory` }}/{{user `box_basename`}}.{{.Provider}}.box", "type": "vagrant" } ], @@ -162,7 +162,7 @@ ], "variables": { "box_basename": "centos-5.11", - "builddir": "../../builds", + "build_directory": "../../builds", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", "disk_size": "65536", diff --git a/packer_templates/centos/centos-6.10-i386.json b/packer_templates/centos/centos-6.10-i386.json index 6abda098d..9903f07da 100644 --- a/packer_templates/centos/centos-6.10-i386.json +++ b/packer_templates/centos/centos-6.10-i386.json @@ -14,7 +14,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-virtualbox", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-virtualbox", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, @@ -38,7 +38,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-vmware", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-vmware", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, @@ -65,7 +65,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-parallels", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-parallels", "parallels_tools_flavor": "lin", "memory": "{{ user `memory` }}", "cpus": "{{ user `cpus` }}", @@ -95,7 +95,7 @@ "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", "memory": "{{ user `memory` }}", - "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-hyperv", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-hyperv", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, @@ -118,7 +118,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-qemu", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-qemu", "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, @@ -130,7 +130,7 @@ ], "post-processors": [ { - "output": "{{ user `builddir` }}/{{user `box_basename`}}.{{.Provider}}.box", + "output": "{{ user `build_directory` }}/{{user `box_basename`}}.{{.Provider}}.box", "type": "vagrant" } ], @@ -161,7 +161,7 @@ ], "variables": { "box_basename": "centos-6.10-i386", - "builddir": "../../builds", + "build_directory": "../../builds", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", "disk_size": "65536", diff --git a/packer_templates/centos/centos-6.10-x86_64.json b/packer_templates/centos/centos-6.10-x86_64.json index 0fdeb61cd..2db9e7cb6 100644 --- a/packer_templates/centos/centos-6.10-x86_64.json +++ b/packer_templates/centos/centos-6.10-x86_64.json @@ -14,7 +14,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-virtualbox", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-virtualbox", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, @@ -38,7 +38,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-vmware", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-vmware", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, @@ -65,7 +65,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-parallels", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-parallels", "parallels_tools_flavor": "lin", "memory": "{{ user `memory` }}", "cpus": "{{ user `cpus` }}", @@ -95,7 +95,7 @@ "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", "memory": "{{ user `memory` }}", - "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-hyperv", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-hyperv", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, @@ -118,7 +118,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-qemu", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-qemu", "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, @@ -130,7 +130,7 @@ ], "post-processors": [ { - "output": "{{ user `builddir` }}/{{user `box_basename`}}.{{.Provider}}.box", + "output": "{{ user `build_directory` }}/{{user `box_basename`}}.{{.Provider}}.box", "type": "vagrant" } ], @@ -161,7 +161,7 @@ ], "variables": { "box_basename": "centos-6.10", - "builddir": "../../builds", + "build_directory": "../../builds", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", "disk_size": "65536", diff --git a/packer_templates/centos/centos-7.7-x86_64.json b/packer_templates/centos/centos-7.7-x86_64.json index f94c5bcab..d54ebab2a 100644 --- a/packer_templates/centos/centos-7.7-x86_64.json +++ b/packer_templates/centos/centos-7.7-x86_64.json @@ -14,7 +14,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-virtualbox", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-virtualbox", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, @@ -38,7 +38,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-vmware", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-vmware", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, @@ -65,7 +65,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-parallels", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-parallels", "parallels_tools_flavor": "lin", "memory": "{{ user `memory` }}", "cpus": "{{ user `cpus` }}", @@ -95,7 +95,7 @@ "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", "memory": "{{ user `memory` }}", - "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-hyperv", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-hyperv", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, @@ -118,7 +118,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-qemu", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-qemu", "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, @@ -130,7 +130,7 @@ ], "post-processors": [ { - "output": "{{ user `builddir` }}/{{user `box_basename`}}.{{.Provider}}.box", + "output": "{{ user `build_directory` }}/{{user `box_basename`}}.{{.Provider}}.box", "type": "vagrant" } ], @@ -161,7 +161,7 @@ ], "variables": { "box_basename": "centos-7.7", - "builddir": "../../builds", + "build_directory": "../../builds", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", "disk_size": "65536", diff --git a/packer_templates/centos/centos-8.0-x86_64.json b/packer_templates/centos/centos-8.0-x86_64.json index b6d168f00..541c4fb04 100644 --- a/packer_templates/centos/centos-8.0-x86_64.json +++ b/packer_templates/centos/centos-8.0-x86_64.json @@ -14,7 +14,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-virtualbox", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-virtualbox", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, @@ -38,7 +38,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-vmware", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-vmware", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, @@ -65,7 +65,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-parallels", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-parallels", "parallels_tools_flavor": "lin", "memory": "{{ user `memory` }}", "cpus": "{{ user `cpus` }}", @@ -95,7 +95,7 @@ "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", "memory": "{{ user `memory` }}", - "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-hyperv", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-hyperv", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, @@ -118,7 +118,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-qemu", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-qemu", "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, @@ -130,7 +130,7 @@ ], "post-processors": [ { - "output": "{{ user `builddir` }}/{{user `box_basename`}}.{{.Provider}}.box", + "output": "{{ user `build_directory` }}/{{user `box_basename`}}.{{.Provider}}.box", "type": "vagrant" } ], @@ -161,7 +161,7 @@ ], "variables": { "box_basename": "centos-8.0", - "builddir": "../../builds", + "build_directory": "../../builds", "build_timestamp": "{{isotime \"2019102650405\"}}", "cpus": "1", "disk_size": "65536", diff --git a/packer_templates/debian/debian-10.1-amd64.json b/packer_templates/debian/debian-10.1-amd64.json index 650352037..4cb62a494 100644 --- a/packer_templates/debian/debian-10.1-amd64.json +++ b/packer_templates/debian/debian-10.1-amd64.json @@ -29,7 +29,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-virtualbox", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-virtualbox", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", "ssh_password": "vagrant", "ssh_port": 22, @@ -68,7 +68,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-vmware", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-vmware", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", "ssh_password": "vagrant", "ssh_port": 22, @@ -111,7 +111,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-parallels", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-parallels", "parallels_tools_flavor": "lin", "memory": "{{ user `memory` }}", "cpus": "{{ user `cpus` }}", @@ -152,7 +152,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-qemu", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-qemu", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", "ssh_password": "vagrant", "ssh_port": 22, @@ -164,7 +164,7 @@ ], "post-processors": [ { - "output": "{{ user `builddir` }}/{{user `box_basename`}}.{{.Provider}}.box", + "output": "{{ user `build_directory` }}/{{user `box_basename`}}.{{.Provider}}.box", "type": "vagrant" } ], @@ -197,7 +197,7 @@ ], "variables": { "box_basename": "debian-10.1", - "builddir": "../../builds", + "build_directory": "../../builds", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", "disk_size": "65536", diff --git a/packer_templates/debian/debian-10.1-i386.json b/packer_templates/debian/debian-10.1-i386.json index 8f95e190d..526d119f8 100644 --- a/packer_templates/debian/debian-10.1-i386.json +++ b/packer_templates/debian/debian-10.1-i386.json @@ -29,7 +29,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-virtualbox", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-virtualbox", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", "ssh_password": "vagrant", "ssh_port": 22, @@ -68,7 +68,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-vmware", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-vmware", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", "ssh_password": "vagrant", "ssh_port": 22, @@ -111,7 +111,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-parallels", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-parallels", "parallels_tools_flavor": "lin", "memory": "{{ user `memory` }}", "cpus": "{{ user `cpus` }}", @@ -152,7 +152,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-qemu", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-qemu", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", "ssh_password": "vagrant", "ssh_port": 22, @@ -164,7 +164,7 @@ ], "post-processors": [ { - "output": "{{ user `builddir` }}/{{user `box_basename`}}.{{.Provider}}.box", + "output": "{{ user `build_directory` }}/{{user `box_basename`}}.{{.Provider}}.box", "type": "vagrant" } ], @@ -197,7 +197,7 @@ ], "variables": { "box_basename": "debian-10.1-i386", - "builddir": "../../builds", + "build_directory": "../../builds", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", "disk_size": "65536", diff --git a/packer_templates/debian/debian-8.11-amd64.json b/packer_templates/debian/debian-8.11-amd64.json index 55bfafee3..68d4bc493 100644 --- a/packer_templates/debian/debian-8.11-amd64.json +++ b/packer_templates/debian/debian-8.11-amd64.json @@ -29,7 +29,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-virtualbox", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-virtualbox", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", "ssh_password": "vagrant", "ssh_port": 22, @@ -68,7 +68,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-vmware", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-vmware", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", "ssh_password": "vagrant", "ssh_port": 22, @@ -111,7 +111,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-parallels", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-parallels", "parallels_tools_flavor": "lin", "memory": "{{ user `memory` }}", "cpus": "{{ user `cpus` }}", @@ -152,7 +152,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-qemu", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-qemu", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", "ssh_password": "vagrant", "ssh_port": 22, @@ -164,7 +164,7 @@ ], "post-processors": [ { - "output": "{{ user `builddir` }}/{{user `box_basename`}}.{{.Provider}}.box", + "output": "{{ user `build_directory` }}/{{user `box_basename`}}.{{.Provider}}.box", "type": "vagrant" } ], @@ -197,7 +197,7 @@ ], "variables": { "box_basename": "debian-8.11", - "builddir": "../../builds", + "build_directory": "../../builds", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", "disk_size": "65536", diff --git a/packer_templates/debian/debian-8.11-i386.json b/packer_templates/debian/debian-8.11-i386.json index 9ae38f610..c16d918bb 100644 --- a/packer_templates/debian/debian-8.11-i386.json +++ b/packer_templates/debian/debian-8.11-i386.json @@ -29,7 +29,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-virtualbox", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-virtualbox", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", "ssh_password": "vagrant", "ssh_port": 22, @@ -68,7 +68,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-vmware", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-vmware", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", "ssh_password": "vagrant", "ssh_port": 22, @@ -111,7 +111,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-parallels", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-parallels", "parallels_tools_flavor": "lin", "memory": "{{ user `memory` }}", "cpus": "{{ user `cpus` }}", @@ -152,7 +152,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-qemu", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-qemu", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", "ssh_password": "vagrant", "ssh_port": 22, @@ -164,7 +164,7 @@ ], "post-processors": [ { - "output": "{{ user `builddir` }}/{{user `box_basename`}}.{{.Provider}}.box", + "output": "{{ user `build_directory` }}/{{user `box_basename`}}.{{.Provider}}.box", "type": "vagrant" } ], @@ -197,7 +197,7 @@ ], "variables": { "box_basename": "debian-8.11-i386", - "builddir": "../../builds", + "build_directory": "../../builds", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", "disk_size": "65536", diff --git a/packer_templates/debian/debian-9.11-amd64.json b/packer_templates/debian/debian-9.11-amd64.json index a2fe04a35..e5992176a 100644 --- a/packer_templates/debian/debian-9.11-amd64.json +++ b/packer_templates/debian/debian-9.11-amd64.json @@ -29,7 +29,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-virtualbox", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-virtualbox", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", "ssh_password": "vagrant", "ssh_port": 22, @@ -68,7 +68,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-vmware", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-vmware", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", "ssh_password": "vagrant", "ssh_port": 22, @@ -111,7 +111,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-parallels", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-parallels", "parallels_tools_flavor": "lin", "memory": "{{ user `memory` }}", "cpus": "{{ user `cpus` }}", @@ -152,7 +152,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-qemu", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-qemu", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", "ssh_password": "vagrant", "ssh_port": 22, @@ -164,7 +164,7 @@ ], "post-processors": [ { - "output": "{{ user `builddir` }}/{{user `box_basename`}}.{{.Provider}}.box", + "output": "{{ user `build_directory` }}/{{user `box_basename`}}.{{.Provider}}.box", "type": "vagrant" } ], @@ -197,7 +197,7 @@ ], "variables": { "box_basename": "debian-9.11", - "builddir": "../../builds", + "build_directory": "../../builds", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", "disk_size": "65536", diff --git a/packer_templates/debian/debian-9.11-i386.json b/packer_templates/debian/debian-9.11-i386.json index 90072a700..06102c871 100644 --- a/packer_templates/debian/debian-9.11-i386.json +++ b/packer_templates/debian/debian-9.11-i386.json @@ -29,7 +29,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-virtualbox", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-virtualbox", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", "ssh_password": "vagrant", "ssh_port": 22, @@ -68,7 +68,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-vmware", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-vmware", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", "ssh_password": "vagrant", "ssh_port": 22, @@ -111,7 +111,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-parallels", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-parallels", "parallels_tools_flavor": "lin", "memory": "{{ user `memory` }}", "cpus": "{{ user `cpus` }}", @@ -152,7 +152,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-qemu", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-qemu", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", "ssh_password": "vagrant", "ssh_port": 22, @@ -164,7 +164,7 @@ ], "post-processors": [ { - "output": "{{ user `builddir` }}/{{user `box_basename`}}.{{.Provider}}.box", + "output": "{{ user `build_directory` }}/{{user `box_basename`}}.{{.Provider}}.box", "type": "vagrant" } ], @@ -197,7 +197,7 @@ ], "variables": { "box_basename": "debian-9.11-i386", - "builddir": "../../builds", + "build_directory": "../../builds", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", "disk_size": "65536", diff --git a/packer_templates/debian/debian-9.11-ppc64el.json b/packer_templates/debian/debian-9.11-ppc64el.json index 54c6d8bd0..a2730adae 100644 --- a/packer_templates/debian/debian-9.11-ppc64el.json +++ b/packer_templates/debian/debian-9.11-ppc64el.json @@ -33,7 +33,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-qemu", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-qemu", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", "ssh_password": "vagrant", "ssh_port": 22, @@ -49,7 +49,7 @@ ], "post-processors": [ { - "output": "{{ user `builddir` }}/{{user `box_basename`}}.{{.Provider}}.box", + "output": "{{ user `build_directory` }}/{{user `box_basename`}}.{{.Provider}}.box", "type": "vagrant" } ], @@ -82,7 +82,7 @@ ], "variables": { "box_basename": "debian-9.11", - "builddir": "../../builds", + "build_directory": "../../builds", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", "disk_size": "65536", diff --git a/packer_templates/fedora/fedora-29-x86_64.json b/packer_templates/fedora/fedora-29-x86_64.json index e5e183ce9..3eb3c4d68 100644 --- a/packer_templates/fedora/fedora-29-x86_64.json +++ b/packer_templates/fedora/fedora-29-x86_64.json @@ -4,7 +4,7 @@ "type": "qemu", "vm_name": "{{ user `template` }}", "name": "{{ user `template` }}", - "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-libvirt", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-libvirt", "accelerator": "kvm", "boot_wait": "10s", "boot_command": [ @@ -44,7 +44,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-virtualbox", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-virtualbox", "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", "ssh_password": "vagrant", "ssh_port": 22, @@ -68,7 +68,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-vmware", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-vmware", "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", "ssh_password": "vagrant", "ssh_port": 22, @@ -96,7 +96,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-parallels", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-parallels", "parallels_tools_flavor": "lin", "memory": "{{ user `memory` }}", "cpus": "{{ user `cpus` }}", @@ -122,7 +122,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-qemu", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-qemu", "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", "ssh_password": "vagrant", "ssh_port": 22, @@ -134,7 +134,7 @@ ], "post-processors": [ { - "output": "{{ user `builddir` }}/{{user `box_basename`}}.{{.Provider}}.box", + "output": "{{ user `build_directory` }}/{{user `box_basename`}}.{{.Provider}}.box", "type": "vagrant" } ], @@ -167,7 +167,7 @@ "variables": { "arch": "64", "box_basename": "fedora-29", - "builddir": "../../builds", + "build_directory": "../../builds", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", "disk_size": "65536", diff --git a/packer_templates/fedora/fedora-30-x86_64.json b/packer_templates/fedora/fedora-30-x86_64.json index e6aece3e9..f76688b71 100644 --- a/packer_templates/fedora/fedora-30-x86_64.json +++ b/packer_templates/fedora/fedora-30-x86_64.json @@ -4,7 +4,7 @@ "type": "qemu", "vm_name": "{{ user `template` }}", "name": "{{ user `template` }}", - "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-libvirt", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-libvirt", "accelerator": "kvm", "boot_wait": "10s", "boot_command": [ @@ -44,7 +44,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-virtualbox", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-virtualbox", "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", "ssh_password": "vagrant", "ssh_port": 22, @@ -68,7 +68,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-vmware", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-vmware", "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", "ssh_password": "vagrant", "ssh_port": 22, @@ -96,7 +96,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-parallels", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-parallels", "parallels_tools_flavor": "lin", "memory": "{{ user `memory` }}", "cpus": "{{ user `cpus` }}", @@ -122,7 +122,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-qemu", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-qemu", "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", "ssh_password": "vagrant", "ssh_port": 22, @@ -134,7 +134,7 @@ ], "post-processors": [ { - "output": "{{ user `builddir` }}/{{user `box_basename`}}.{{.Provider}}.box", + "output": "{{ user `build_directory` }}/{{user `box_basename`}}.{{.Provider}}.box", "type": "vagrant" } ], @@ -168,7 +168,7 @@ "variables": { "arch": "64", "box_basename": "fedora-30", - "builddir": "../../builds", + "build_directory": "../../builds", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", "disk_size": "65536", diff --git a/packer_templates/fedora/fedora-31-x86_64.json b/packer_templates/fedora/fedora-31-x86_64.json index 97eb34bc2..7dec8c56a 100644 --- a/packer_templates/fedora/fedora-31-x86_64.json +++ b/packer_templates/fedora/fedora-31-x86_64.json @@ -4,7 +4,7 @@ "type": "qemu", "vm_name": "{{ user `template` }}", "name": "{{ user `template` }}", - "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-libvirt", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-libvirt", "accelerator": "kvm", "boot_wait": "10s", "boot_command": [ @@ -44,7 +44,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-virtualbox", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-virtualbox", "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", "ssh_password": "vagrant", "ssh_port": 22, @@ -68,7 +68,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-vmware", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-vmware", "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", "ssh_password": "vagrant", "ssh_port": 22, @@ -96,7 +96,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-parallels", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-parallels", "parallels_tools_flavor": "lin", "memory": "{{ user `memory` }}", "cpus": "{{ user `cpus` }}", @@ -122,7 +122,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-qemu", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-qemu", "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", "ssh_password": "vagrant", "ssh_port": 22, @@ -134,7 +134,7 @@ ], "post-processors": [ { - "output": "{{ user `builddir` }}/{{user `box_basename`}}.{{.Provider}}.box", + "output": "{{ user `build_directory` }}/{{user `box_basename`}}.{{.Provider}}.box", "type": "vagrant" } ], @@ -168,7 +168,7 @@ "variables": { "arch": "64", "box_basename": "fedora-31", - "builddir": "../../builds", + "build_directory": "../../builds", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", "disk_size": "65536", diff --git a/packer_templates/freebsd/freebsd-11.3-amd64.json b/packer_templates/freebsd/freebsd-11.3-amd64.json index 7e6c26124..8f5676ac1 100644 --- a/packer_templates/freebsd/freebsd-11.3-amd64.json +++ b/packer_templates/freebsd/freebsd-11.3-amd64.json @@ -23,7 +23,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-virtualbox", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-virtualbox", "shutdown_command": "echo 'vagrant' | su -m root -c 'shutdown -p now'", "ssh_password": "vagrant", "ssh_port": 22, @@ -56,7 +56,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-vmware", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-vmware", "shutdown_command": "echo 'vagrant' | su -m root -c 'shutdown -p now'", "ssh_password": "vagrant", "ssh_port": 22, @@ -90,7 +90,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-parallels", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-parallels", "parallels_tools_mode": "disable", "prlctl": [ [ @@ -144,7 +144,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-qemu", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-qemu", "shutdown_command": "echo 'vagrant' | su -m root -c 'shutdown -p now'", "ssh_password": "vagrant", "ssh_port": 22, @@ -156,7 +156,7 @@ ], "post-processors": [ { - "output": "{{ user `builddir` }}/{{user `box_basename`}}.{{.Provider}}.box", + "output": "{{ user `build_directory` }}/{{user `box_basename`}}.{{.Provider}}.box", "type": "vagrant", "vagrantfile_template": "vagrantfile_templates/freebsd.rb" } @@ -186,7 +186,7 @@ ], "variables": { "box_basename": "freebsd-11.3", - "builddir": "../../builds", + "build_directory": "../../builds", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", "disk_size": "65536", diff --git a/packer_templates/freebsd/freebsd-11.3-i386.json b/packer_templates/freebsd/freebsd-11.3-i386.json index a0183bb71..9094587be 100644 --- a/packer_templates/freebsd/freebsd-11.3-i386.json +++ b/packer_templates/freebsd/freebsd-11.3-i386.json @@ -23,7 +23,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-virtualbox", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-virtualbox", "shutdown_command": "echo 'vagrant' | su -m root -c 'shutdown -p now'", "ssh_password": "vagrant", "ssh_port": 22, @@ -56,7 +56,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-vmware", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-vmware", "shutdown_command": "echo 'vagrant' | su -m root -c 'shutdown -p now'", "ssh_password": "vagrant", "ssh_port": 22, @@ -90,7 +90,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-parallels", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-parallels", "parallels_tools_mode": "disable", "prlctl": [ [ @@ -144,7 +144,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-qemu", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-qemu", "shutdown_command": "echo 'vagrant' | su -m root -c 'shutdown -p now'", "ssh_password": "vagrant", "ssh_port": 22, @@ -156,7 +156,7 @@ ], "post-processors": [ { - "output": "{{ user `builddir` }}/{{user `box_basename`}}.{{.Provider}}.box", + "output": "{{ user `build_directory` }}/{{user `box_basename`}}.{{.Provider}}.box", "type": "vagrant", "vagrantfile_template": "vagrantfile_templates/freebsd.rb" } @@ -186,7 +186,7 @@ ], "variables": { "box_basename": "freebsd-11.3-i386", - "builddir": "../../builds", + "build_directory": "../../builds", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", "disk_size": "40960", diff --git a/packer_templates/freebsd/freebsd-12.0-amd64.json b/packer_templates/freebsd/freebsd-12.0-amd64.json index 83430c374..1a26ebe13 100644 --- a/packer_templates/freebsd/freebsd-12.0-amd64.json +++ b/packer_templates/freebsd/freebsd-12.0-amd64.json @@ -23,7 +23,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-virtualbox", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-virtualbox", "shutdown_command": "echo 'vagrant' | su -m root -c 'shutdown -p now'", "ssh_password": "vagrant", "ssh_port": 22, @@ -56,7 +56,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-vmware", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-vmware", "shutdown_command": "echo 'vagrant' | su -m root -c 'shutdown -p now'", "ssh_password": "vagrant", "ssh_port": 22, @@ -90,7 +90,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-parallels", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-parallels", "parallels_tools_mode": "disable", "prlctl": [ [ @@ -144,7 +144,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-qemu", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-qemu", "shutdown_command": "echo 'vagrant' | su -m root -c 'shutdown -p now'", "ssh_password": "vagrant", "ssh_port": 22, @@ -156,7 +156,7 @@ ], "post-processors": [ { - "output": "{{ user `builddir` }}/{{user `box_basename`}}.{{.Provider}}.box", + "output": "{{ user `build_directory` }}/{{user `box_basename`}}.{{.Provider}}.box", "type": "vagrant", "vagrantfile_template": "vagrantfile_templates/freebsd.rb" } @@ -186,7 +186,7 @@ ], "variables": { "box_basename": "freebsd-12.0", - "builddir": "../../builds", + "build_directory": "../../builds", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", "disk_size": "65536", diff --git a/packer_templates/freebsd/freebsd-12.0-i386.json b/packer_templates/freebsd/freebsd-12.0-i386.json index d251da66b..a48300bac 100644 --- a/packer_templates/freebsd/freebsd-12.0-i386.json +++ b/packer_templates/freebsd/freebsd-12.0-i386.json @@ -23,7 +23,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-virtualbox", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-virtualbox", "shutdown_command": "echo 'vagrant' | su -m root -c 'shutdown -p now'", "ssh_password": "vagrant", "ssh_port": 22, @@ -56,7 +56,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-vmware", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-vmware", "shutdown_command": "echo 'vagrant' | su -m root -c 'shutdown -p now'", "ssh_password": "vagrant", "ssh_port": 22, @@ -90,7 +90,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-parallels", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-parallels", "parallels_tools_mode": "disable", "prlctl": [ [ @@ -144,7 +144,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-qemu", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-qemu", "shutdown_command": "echo 'vagrant' | su -m root -c 'shutdown -p now'", "ssh_password": "vagrant", "ssh_port": 22, @@ -156,7 +156,7 @@ ], "post-processors": [ { - "output": "{{ user `builddir` }}/{{user `box_basename`}}.{{.Provider}}.box", + "output": "{{ user `build_directory` }}/{{user `box_basename`}}.{{.Provider}}.box", "type": "vagrant", "vagrantfile_template": "vagrantfile_templates/freebsd.rb" } @@ -186,7 +186,7 @@ ], "variables": { "box_basename": "freebsd-12.0-i386", - "builddir": "../../builds", + "build_directory": "../../builds", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", "disk_size": "40960", diff --git a/packer_templates/hardenedbsd/hardenedbsd-11-amd64.json b/packer_templates/hardenedbsd/hardenedbsd-11-amd64.json index 5c0f09e75..5eaffbdc2 100644 --- a/packer_templates/hardenedbsd/hardenedbsd-11-amd64.json +++ b/packer_templates/hardenedbsd/hardenedbsd-11-amd64.json @@ -21,7 +21,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-virtualbox", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-virtualbox", "shutdown_command": "echo 'vagrant' | su -m root -c 'shutdown -p now'", "ssh_password": "vagrant", "ssh_port": 22, @@ -56,7 +56,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-vmware", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-vmware", "shutdown_command": "echo 'vagrant' | su -m root -c 'shutdown -p now'", "ssh_password": "vagrant", "ssh_port": 22, @@ -91,7 +91,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-parallels", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-parallels", "parallels_tools_mode": "disable", "prlctl": [ [ @@ -145,7 +145,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-qemu", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-qemu", "shutdown_command": "echo 'vagrant' | su -m root -c 'shutdown -p now'", "ssh_password": "vagrant", "ssh_port": 22, @@ -157,7 +157,7 @@ ], "post-processors": [ { - "output": "{{ user `builddir` }}/{{user `box_basename`}}.{{.Provider}}.box", + "output": "{{ user `build_directory` }}/{{user `box_basename`}}.{{.Provider}}.box", "type": "vagrant", "vagrantfile_template": "vagrantfile_templates/hardenedbsd.rb" } @@ -185,7 +185,7 @@ ], "variables": { "box_basename": "hardenedbsd-11", - "builddir": "../../builds", + "build_directory": "../../builds", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", "disk_size": "65536", diff --git a/packer_templates/macos/macos-10.12.json b/packer_templates/macos/macos-10.12.json index ffe909339..33f15ebfe 100644 --- a/packer_templates/macos/macos-10.12.json +++ b/packer_templates/macos/macos-10.12.json @@ -11,7 +11,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `iso_url`}}", - "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-vmware", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-vmware", "shutdown_command": "echo 'vagrant'| sudo -S shutdown -h now", "skip_compaction": true, "ssh_password": "vagrant", @@ -45,7 +45,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `iso_url`}}", - "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-virtualbox", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-virtualbox", "shutdown_command": "echo 'vagrant'| sudo -S shutdown -h now", "ssh_password": "vagrant", "ssh_port": 22, @@ -153,7 +153,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `iso_url`}}", - "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-parallels", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-parallels", "parallels_tools_flavor": "mac", "prlctl": [ [ @@ -174,7 +174,7 @@ ], "post-processors": [ { - "output": "{{ user `builddir` }}/{{user `box_basename`}}.{{.Provider}}.box", + "output": "{{ user `build_directory` }}/{{user `box_basename`}}.{{.Provider}}.box", "type": "vagrant", "vagrantfile_template": "vagrantfile_templates/macosx.rb" } @@ -213,7 +213,7 @@ "_README": "You must provide a prepared Mac disk image (from https://github.com/timsutton/osx-vm-templates) and checksum value for this template to work. For more details, consult this project's README.md", "autologin": "true", "box_basename": "macos-10.12", - "builddir": "../../builds", + "build_directory": "../../builds", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", "disk_size": "65536", diff --git a/packer_templates/macos/macosx-10.11.json b/packer_templates/macos/macosx-10.11.json index 64a04aecb..e36389111 100644 --- a/packer_templates/macos/macosx-10.11.json +++ b/packer_templates/macos/macosx-10.11.json @@ -11,7 +11,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `iso_url`}}", - "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-vmware", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-vmware", "shutdown_command": "echo 'vagrant'| sudo -S shutdown -h now", "skip_compaction": true, "ssh_password": "vagrant", @@ -45,7 +45,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `iso_url`}}", - "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-virtualbox", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-virtualbox", "shutdown_command": "echo 'vagrant'| sudo -S shutdown -h now", "ssh_password": "vagrant", "ssh_port": 22, @@ -153,7 +153,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `iso_url`}}", - "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-parallels", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-parallels", "parallels_tools_flavor": "mac", "prlctl": [ [ @@ -174,7 +174,7 @@ ], "post-processors": [ { - "output": "{{ user `builddir` }}/{{user `box_basename`}}.{{.Provider}}.box", + "output": "{{ user `build_directory` }}/{{user `box_basename`}}.{{.Provider}}.box", "type": "vagrant", "vagrantfile_template": "vagrantfile_templates/macosx.rb" } @@ -213,7 +213,7 @@ "_README": "You must provide a prepared Mac disk image (from https://github.com/timsutton/osx-vm-templates) and checksum value for this template to work. For more details, consult this project's README.md", "autologin": "true", "box_basename": "macosx-10.11", - "builddir": "../../builds", + "build_directory": "../../builds", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", "disk_size": "65536", diff --git a/packer_templates/opensuse/opensuse-leap-15.1-x86_64.json b/packer_templates/opensuse/opensuse-leap-15.1-x86_64.json index fecfa8d80..f693f3299 100644 --- a/packer_templates/opensuse/opensuse-leap-15.1-x86_64.json +++ b/packer_templates/opensuse/opensuse-leap-15.1-x86_64.json @@ -23,7 +23,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-virtualbox", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-virtualbox", "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, @@ -56,7 +56,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-vmware", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-vmware", "shutdown_command": "echo 'vagrant'|sudo -S /sbin/shutdown -h 1", "ssh_password": "vagrant", "ssh_port": 22, @@ -92,7 +92,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-parallels", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-parallels", "parallels_tools_flavor": "lin", "memory": "{{ user `memory` }}", "cpus": "{{ user `cpus` }}", @@ -122,7 +122,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-qemu", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-qemu", "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, @@ -134,7 +134,7 @@ ], "post-processors": [ { - "output": "{{ user `builddir` }}/{{user `box_basename`}}.{{.Provider}}.box", + "output": "{{ user `build_directory` }}/{{user `box_basename`}}.{{.Provider}}.box", "type": "vagrant" } ], @@ -171,7 +171,7 @@ "arch": "64", "autoinst_cfg": "15/autoinst.xml", "box_basename": "opensuse-leap-15.1", - "builddir": "../../builds", + "build_directory": "../../builds", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", "disk_size": "65536", diff --git a/packer_templates/oraclelinux/oracle-5.11-i386.json b/packer_templates/oraclelinux/oracle-5.11-i386.json index 5c6683458..c54b0456d 100644 --- a/packer_templates/oraclelinux/oracle-5.11-i386.json +++ b/packer_templates/oraclelinux/oracle-5.11-i386.json @@ -14,7 +14,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-virtualbox", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-virtualbox", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, @@ -38,7 +38,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-vmware", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-vmware", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, @@ -65,7 +65,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-parallels", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-parallels", "parallels_tools_flavor": "lin", "memory": "{{ user `memory` }}", "cpus": "{{ user `cpus` }}", @@ -91,7 +91,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-qemu", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-qemu", "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, @@ -103,7 +103,7 @@ ], "post-processors": [ { - "output": "{{ user `builddir` }}/{{user `box_basename`}}.{{.Provider}}.box", + "output": "{{ user `build_directory` }}/{{user `box_basename`}}.{{.Provider}}.box", "type": "vagrant" } ], @@ -134,7 +134,7 @@ "variables": { "arch": "32", "box_basename": "oracle-5.11-i386", - "builddir": "../../builds", + "build_directory": "../../builds", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", "disk_size": "65536", diff --git a/packer_templates/oraclelinux/oracle-5.11-x86_64.json b/packer_templates/oraclelinux/oracle-5.11-x86_64.json index effd3f6ff..f741d59ae 100644 --- a/packer_templates/oraclelinux/oracle-5.11-x86_64.json +++ b/packer_templates/oraclelinux/oracle-5.11-x86_64.json @@ -14,7 +14,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-virtualbox", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-virtualbox", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, @@ -46,7 +46,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-vmware", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-vmware", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, @@ -73,7 +73,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-parallels", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-parallels", "parallels_tools_flavor": "lin", "memory": "{{ user `memory` }}", "cpus": "{{ user `cpus` }}", @@ -99,7 +99,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-qemu", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-qemu", "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, @@ -111,7 +111,7 @@ ], "post-processors": [ { - "output": "{{ user `builddir` }}/{{user `box_basename`}}.{{.Provider}}.box", + "output": "{{ user `build_directory` }}/{{user `box_basename`}}.{{.Provider}}.box", "type": "vagrant" } ], @@ -142,7 +142,7 @@ "variables": { "arch": "64", "box_basename": "oracle-5.11", - "builddir": "../../builds", + "build_directory": "../../builds", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", "disk_size": "65536", diff --git a/packer_templates/oraclelinux/oracle-6.10-i386.json b/packer_templates/oraclelinux/oracle-6.10-i386.json index a5a05c85c..d938b7efe 100644 --- a/packer_templates/oraclelinux/oracle-6.10-i386.json +++ b/packer_templates/oraclelinux/oracle-6.10-i386.json @@ -14,7 +14,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-virtualbox", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-virtualbox", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, @@ -38,7 +38,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-vmware", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-vmware", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, @@ -65,7 +65,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-parallels", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-parallels", "parallels_tools_flavor": "lin", "memory": "{{ user `memory` }}", "cpus": "{{ user `cpus` }}", @@ -91,7 +91,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-qemu", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-qemu", "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, @@ -103,7 +103,7 @@ ], "post-processors": [ { - "output": "{{ user `builddir` }}/{{user `box_basename`}}.{{.Provider}}.box", + "output": "{{ user `build_directory` }}/{{user `box_basename`}}.{{.Provider}}.box", "type": "vagrant" } ], @@ -135,7 +135,7 @@ "variables": { "arch": "32", "box_basename": "oracle-6.10-i386", - "builddir": "../../builds", + "build_directory": "../../builds", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", "disk_size": "65536", diff --git a/packer_templates/oraclelinux/oracle-6.10-x86_64.json b/packer_templates/oraclelinux/oracle-6.10-x86_64.json index 848018f64..9057c4536 100644 --- a/packer_templates/oraclelinux/oracle-6.10-x86_64.json +++ b/packer_templates/oraclelinux/oracle-6.10-x86_64.json @@ -14,7 +14,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-virtualbox", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-virtualbox", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, @@ -38,7 +38,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-vmware", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-vmware", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, @@ -65,7 +65,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-parallels", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-parallels", "parallels_tools_flavor": "lin", "memory": "{{ user `memory` }}", "cpus": "{{ user `cpus` }}", @@ -91,7 +91,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-qemu", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-qemu", "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, @@ -103,7 +103,7 @@ ], "post-processors": [ { - "output": "{{ user `builddir` }}/{{user `box_basename`}}.{{.Provider}}.box", + "output": "{{ user `build_directory` }}/{{user `box_basename`}}.{{.Provider}}.box", "type": "vagrant" } ], @@ -135,7 +135,7 @@ "variables": { "arch": "64", "box_basename": "oracle-6.10", - "builddir": "../../builds", + "build_directory": "../../builds", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", "disk_size": "65536", diff --git a/packer_templates/oraclelinux/oracle-7.7-x86_64.json b/packer_templates/oraclelinux/oracle-7.7-x86_64.json index 1fabebdcc..9109ed9d5 100644 --- a/packer_templates/oraclelinux/oracle-7.7-x86_64.json +++ b/packer_templates/oraclelinux/oracle-7.7-x86_64.json @@ -14,7 +14,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-virtualbox", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-virtualbox", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, @@ -38,7 +38,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-vmware", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-vmware", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, @@ -65,7 +65,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-parallels", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-parallels", "parallels_tools_flavor": "lin", "memory": "{{ user `memory` }}", "cpus": "{{ user `cpus` }}", @@ -91,7 +91,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-qemu", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-qemu", "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, @@ -103,7 +103,7 @@ ], "post-processors": [ { - "output": "{{ user `builddir` }}/{{user `box_basename`}}.{{.Provider}}.box", + "output": "{{ user `build_directory` }}/{{user `box_basename`}}.{{.Provider}}.box", "type": "vagrant" } ], @@ -135,7 +135,7 @@ "variables": { "arch": "64", "box_basename": "oracle-7.7", - "builddir": "../../builds", + "build_directory": "../../builds", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", "disk_size": "65536", diff --git a/packer_templates/rhel/rhel-5.11-i386.json b/packer_templates/rhel/rhel-5.11-i386.json index 42e24e786..9b77c3670 100644 --- a/packer_templates/rhel/rhel-5.11-i386.json +++ b/packer_templates/rhel/rhel-5.11-i386.json @@ -14,7 +14,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-virtualbox", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-virtualbox", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, @@ -38,7 +38,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-vmware", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-vmware", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, @@ -65,7 +65,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-parallels", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-parallels", "parallels_tools_flavor": "lin", "memory": "{{ user `memory` }}", "cpus": "{{ user `cpus` }}", @@ -91,7 +91,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-qemu", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-qemu", "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, @@ -103,7 +103,7 @@ ], "post-processors": [ { - "output": "{{ user `builddir` }}/{{user `box_basename`}}.{{.Provider}}.box", + "output": "{{ user `build_directory` }}/{{user `box_basename`}}.{{.Provider}}.box", "type": "vagrant" } ], @@ -133,7 +133,7 @@ "variables": { "arch": "32", "box_basename": "rhel-5.11-i386", - "builddir": "../../builds", + "build_directory": "../../builds", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", "disk_size": "65536", diff --git a/packer_templates/rhel/rhel-5.11-x86_64.json b/packer_templates/rhel/rhel-5.11-x86_64.json index d0d522243..784d02f30 100644 --- a/packer_templates/rhel/rhel-5.11-x86_64.json +++ b/packer_templates/rhel/rhel-5.11-x86_64.json @@ -14,7 +14,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-virtualbox", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-virtualbox", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, @@ -46,7 +46,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-vmware", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-vmware", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, @@ -73,7 +73,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-parallels", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-parallels", "parallels_tools_flavor": "lin", "memory": "{{ user `memory` }}", "cpus": "{{ user `cpus` }}", @@ -99,7 +99,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-qemu", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-qemu", "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, @@ -111,7 +111,7 @@ ], "post-processors": [ { - "output": "{{ user `builddir` }}/{{user `box_basename`}}.{{.Provider}}.box", + "output": "{{ user `build_directory` }}/{{user `box_basename`}}.{{.Provider}}.box", "type": "vagrant" } ], @@ -141,7 +141,7 @@ "variables": { "arch": "64", "box_basename": "rhel-5.11", - "builddir": "../../builds", + "build_directory": "../../builds", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", "disk_size": "65536", diff --git a/packer_templates/rhel/rhel-6.10-i386.json b/packer_templates/rhel/rhel-6.10-i386.json index 77b514989..8f3d28289 100644 --- a/packer_templates/rhel/rhel-6.10-i386.json +++ b/packer_templates/rhel/rhel-6.10-i386.json @@ -14,7 +14,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-virtualbox", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-virtualbox", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, @@ -38,7 +38,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-vmware", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-vmware", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, @@ -65,7 +65,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-parallels", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-parallels", "parallels_tools_flavor": "lin", "memory": "{{ user `memory` }}", "cpus": "{{ user `cpus` }}", @@ -91,7 +91,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-qemu", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-qemu", "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, @@ -103,7 +103,7 @@ ], "post-processors": [ { - "output": "{{ user `builddir` }}/{{user `box_basename`}}.{{.Provider}}.box", + "output": "{{ user `build_directory` }}/{{user `box_basename`}}.{{.Provider}}.box", "type": "vagrant" } ], @@ -134,7 +134,7 @@ "variables": { "arch": "32", "box_basename": "rhel-6.10-i386", - "builddir": "../../builds", + "build_directory": "../../builds", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", "disk_size": "65536", diff --git a/packer_templates/rhel/rhel-6.10-x86_64.json b/packer_templates/rhel/rhel-6.10-x86_64.json index d99580d49..d49c9ffc2 100644 --- a/packer_templates/rhel/rhel-6.10-x86_64.json +++ b/packer_templates/rhel/rhel-6.10-x86_64.json @@ -14,7 +14,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-virtualbox", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-virtualbox", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, @@ -38,7 +38,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-vmware", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-vmware", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, @@ -65,7 +65,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-parallels", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-parallels", "parallels_tools_flavor": "lin", "memory": "{{ user `memory` }}", "cpus": "{{ user `cpus` }}", @@ -91,7 +91,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-qemu", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-qemu", "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, @@ -103,7 +103,7 @@ ], "post-processors": [ { - "output": "{{ user `builddir` }}/{{user `box_basename`}}.{{.Provider}}.box", + "output": "{{ user `build_directory` }}/{{user `box_basename`}}.{{.Provider}}.box", "type": "vagrant" } ], @@ -134,7 +134,7 @@ "variables": { "arch": "64", "box_basename": "rhel-6.10", - "builddir": "../../builds", + "build_directory": "../../builds", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", "disk_size": "65536", diff --git a/packer_templates/rhel/rhel-7.6-x86_64.json b/packer_templates/rhel/rhel-7.6-x86_64.json index e325eb1f4..d439f7b30 100644 --- a/packer_templates/rhel/rhel-7.6-x86_64.json +++ b/packer_templates/rhel/rhel-7.6-x86_64.json @@ -14,7 +14,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-virtualbox", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-virtualbox", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, @@ -38,7 +38,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-vmware", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-vmware", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, @@ -65,7 +65,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-parallels", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-parallels", "parallels_tools_flavor": "lin", "memory": "{{ user `memory` }}", "cpus": "{{ user `cpus` }}", @@ -91,7 +91,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-qemu", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-qemu", "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, @@ -103,7 +103,7 @@ ], "post-processors": [ { - "output": "{{ user `builddir` }}/{{user `box_basename`}}.{{.Provider}}.box", + "output": "{{ user `build_directory` }}/{{user `box_basename`}}.{{.Provider}}.box", "type": "vagrant" } ], @@ -134,7 +134,7 @@ "variables": { "arch": "64", "box_basename": "rhel-7.6", - "builddir": "../../builds", + "build_directory": "../../builds", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", "disk_size": "65536", diff --git a/packer_templates/rhel/rhel-8.0-x86_64.json b/packer_templates/rhel/rhel-8.0-x86_64.json index a000d337c..bb13ab598 100644 --- a/packer_templates/rhel/rhel-8.0-x86_64.json +++ b/packer_templates/rhel/rhel-8.0-x86_64.json @@ -14,7 +14,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-virtualbox", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-virtualbox", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, @@ -38,7 +38,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-vmware", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-vmware", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, @@ -65,7 +65,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-parallels", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-parallels", "parallels_tools_flavor": "lin", "memory": "{{ user `memory` }}", "cpus": "{{ user `cpus` }}", @@ -91,7 +91,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-qemu", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-qemu", "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, @@ -103,7 +103,7 @@ ], "post-processors": [ { - "output": "{{ user `builddir` }}/{{user `box_basename`}}.{{.Provider}}.box", + "output": "{{ user `build_directory` }}/{{user `box_basename`}}.{{.Provider}}.box", "type": "vagrant" } ], @@ -134,7 +134,7 @@ "variables": { "arch": "64", "box_basename": "rhel-8.0", - "builddir": "../../builds", + "build_directory": "../../builds", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", "disk_size": "65536", diff --git a/packer_templates/scientificlinux/scientific-7.7-x86_64.json b/packer_templates/scientificlinux/scientific-7.7-x86_64.json index 86b134b96..a558719e7 100644 --- a/packer_templates/scientificlinux/scientific-7.7-x86_64.json +++ b/packer_templates/scientificlinux/scientific-7.7-x86_64.json @@ -14,7 +14,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-virtualbox", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-virtualbox", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, @@ -41,7 +41,7 @@ ], "post-processors": [ { - "output": "{{ user `builddir` }}/{{user `box_basename`}}.{{.Provider}}.box", + "output": "{{ user `build_directory` }}/{{user `box_basename`}}.{{.Provider}}.box", "type": "vagrant" } ], @@ -70,7 +70,7 @@ ], "variables": { "box_basename": "scientific-7.7", - "builddir": "../../builds", + "build_directory": "../../builds", "build_timestamp": "{{isotime \"20080506150405\"}}", "cpus": "1", "disk_size": "65536", diff --git a/packer_templates/sles/sles-11-sp4-x86_64.json b/packer_templates/sles/sles-11-sp4-x86_64.json index 87cdbe2e1..429f192b3 100644 --- a/packer_templates/sles/sles-11-sp4-x86_64.json +++ b/packer_templates/sles/sles-11-sp4-x86_64.json @@ -18,7 +18,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `iso_name`}}", - "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-virtualbox", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-virtualbox", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, @@ -46,7 +46,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `iso_name`}}", - "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-vmware", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-vmware", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, @@ -77,7 +77,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `iso_name`}}", - "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-parallels", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-parallels", "parallels_tools_flavor": "lin", "memory": "{{ user `memory` }}", "cpus": "{{ user `cpus` }}", @@ -107,7 +107,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `iso_name`}}", - "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-qemu", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-qemu", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, @@ -119,7 +119,7 @@ ], "post-processors": [ { - "output": "{{ user `builddir` }}/{{user `box_basename`}}.{{.Provider}}.box", + "output": "{{ user `build_directory` }}/{{user `box_basename`}}.{{.Provider}}.box", "type": "vagrant" } ], @@ -155,7 +155,7 @@ "arch": "64", "autoinst_cfg": "sles-11-sp4-x86_64-autoinst.xml", "box_basename": "sles-11-sp4", - "builddir": "../../builds", + "build_directory": "../../builds", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", "disk_size": "65536", diff --git a/packer_templates/sles/sles-12-sp2-x86_64.json b/packer_templates/sles/sles-12-sp2-x86_64.json index def9c2c24..eee675483 100644 --- a/packer_templates/sles/sles-12-sp2-x86_64.json +++ b/packer_templates/sles/sles-12-sp2-x86_64.json @@ -18,7 +18,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `iso_name`}}", - "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-virtualbox", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-virtualbox", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, @@ -46,7 +46,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `iso_name`}}", - "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-vmware", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-vmware", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, @@ -77,7 +77,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `iso_name`}}", - "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-parallels", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-parallels", "parallels_tools_flavor": "lin", "memory": "{{ user `memory` }}", "cpus": "{{ user `cpus` }}", @@ -107,7 +107,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `iso_name`}}", - "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-qemu", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-qemu", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, @@ -119,7 +119,7 @@ ], "post-processors": [ { - "output": "{{ user `builddir` }}/{{user `box_basename`}}.{{.Provider}}.box", + "output": "{{ user `build_directory` }}/{{user `box_basename`}}.{{.Provider}}.box", "type": "vagrant" } ], @@ -156,7 +156,7 @@ "arch": "64", "autoinst_cfg": "sles-12-sp2-x86_64-autoinst.xml", "box_basename": "sles-12-sp2", - "builddir": "../../builds", + "build_directory": "../../builds", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", "disk_size": "65536", diff --git a/packer_templates/sles/sles-12-sp3-x86_64.json b/packer_templates/sles/sles-12-sp3-x86_64.json index 83401c319..3d21fb06f 100644 --- a/packer_templates/sles/sles-12-sp3-x86_64.json +++ b/packer_templates/sles/sles-12-sp3-x86_64.json @@ -18,7 +18,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `iso_name`}}", - "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-virtualbox", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-virtualbox", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, @@ -46,7 +46,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `iso_name`}}", - "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-vmware", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-vmware", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, @@ -77,7 +77,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `iso_name`}}", - "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-parallels", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-parallels", "parallels_tools_flavor": "lin", "memory": "{{ user `memory` }}", "cpus": "{{ user `cpus` }}", @@ -107,7 +107,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `iso_name`}}", - "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-qemu", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-qemu", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, @@ -119,7 +119,7 @@ ], "post-processors": [ { - "output": "{{ user `builddir` }}/{{user `box_basename`}}.{{.Provider}}.box", + "output": "{{ user `build_directory` }}/{{user `box_basename`}}.{{.Provider}}.box", "type": "vagrant" } ], @@ -156,7 +156,7 @@ "arch": "64", "autoinst_cfg": "sles-12-sp3-x86_64-autoinst.xml", "box_basename": "sles-12-sp3", - "builddir": "../../builds", + "build_directory": "../../builds", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", "disk_size": "65536", diff --git a/packer_templates/sles/sles-15-sp1.json b/packer_templates/sles/sles-15-sp1.json index 3112088b0..816c9da88 100644 --- a/packer_templates/sles/sles-15-sp1.json +++ b/packer_templates/sles/sles-15-sp1.json @@ -18,7 +18,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `iso_name`}}", - "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-virtualbox", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-virtualbox", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, @@ -62,7 +62,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `iso_name`}}", - "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-vmware", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-vmware", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, @@ -93,7 +93,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `iso_name`}}", - "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-parallels", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-parallels", "parallels_tools_flavor": "lin", "memory": "{{ user `memory` }}", "cpus": "{{ user `cpus` }}", @@ -123,7 +123,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `iso_name`}}", - "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-qemu", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-qemu", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, @@ -135,7 +135,7 @@ ], "post-processors": [ { - "output": "{{ user `builddir` }}/{{user `box_basename`}}.{{.Provider}}.box", + "output": "{{ user `build_directory` }}/{{user `box_basename`}}.{{.Provider}}.box", "type": "vagrant" } ], @@ -172,7 +172,7 @@ "arch": "64", "autoinst_cfg": "sles-15-sp1-x86_64-autoinst.xml", "box_basename": "sles-15-sp1", - "builddir": "../../builds", + "build_directory": "../../builds", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", "disk_size": "65536", diff --git a/packer_templates/sles/sles-15.json b/packer_templates/sles/sles-15.json index aeb367505..08cea7eba 100644 --- a/packer_templates/sles/sles-15.json +++ b/packer_templates/sles/sles-15.json @@ -18,7 +18,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `iso_name`}}", - "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-virtualbox", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-virtualbox", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, @@ -62,7 +62,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `iso_name`}}", - "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-vmware", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-vmware", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, @@ -93,7 +93,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `iso_name`}}", - "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-parallels", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-parallels", "parallels_tools_flavor": "lin", "memory": "{{ user `memory` }}", "cpus": "{{ user `cpus` }}", @@ -123,7 +123,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `iso_name`}}", - "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-qemu", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-qemu", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, @@ -135,7 +135,7 @@ ], "post-processors": [ { - "output": "{{ user `builddir` }}/{{user `box_basename`}}.{{.Provider}}.box", + "output": "{{ user `build_directory` }}/{{user `box_basename`}}.{{.Provider}}.box", "type": "vagrant" } ], @@ -172,7 +172,7 @@ "arch": "64", "autoinst_cfg": "sles-15-x86_64-autoinst.xml", "box_basename": "sles-15", - "builddir": "../../builds", + "build_directory": "../../builds", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", "disk_size": "65536", diff --git a/packer_templates/solaris/solaris-10.11-x86.json b/packer_templates/solaris/solaris-10.11-x86.json index 7e186d0da..1b5a0eef9 100644 --- a/packer_templates/solaris/solaris-10.11-x86.json +++ b/packer_templates/solaris/solaris-10.11-x86.json @@ -85,7 +85,7 @@ ], "post-processors": [ { - "output": "{{ user `builddir` }}/{{user `box_basename`}}.{{.Provider}}.box", + "output": "{{ user `build_directory` }}/{{user `box_basename`}}.{{.Provider}}.box", "type": "vagrant" } ], @@ -106,7 +106,7 @@ "_README": "You must download the automated installer iso from the following page, and then place it somewhere that packer can fetch it", "arch": "64", "box_basename": "solaris-10.11", - "builddir": "../../builds", + "build_directory": "../../builds", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", "disk_size": "65536", diff --git a/packer_templates/solaris/solaris-11-x86.json b/packer_templates/solaris/solaris-11-x86.json index da2c0e0b0..ece579837 100644 --- a/packer_templates/solaris/solaris-11-x86.json +++ b/packer_templates/solaris/solaris-11-x86.json @@ -105,7 +105,7 @@ ], "post-processors": [ { - "output": "{{ user `builddir` }}/{{user `box_basename`}}.{{.Provider}}.box", + "output": "{{ user `build_directory` }}/{{user `box_basename`}}.{{.Provider}}.box", "type": "vagrant" } ], @@ -128,7 +128,7 @@ "_README": "You must download the automated installer iso from the following page, and then place it in the packer_cache dir", "arch": "64", "box_basename": "solaris-11.3", - "builddir": "../../builds", + "build_directory": "../../builds", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", "disk_size": "65536", diff --git a/packer_templates/ubuntu/ubuntu-16.04-amd64.json b/packer_templates/ubuntu/ubuntu-16.04-amd64.json index 65aa00c61..384675cce 100644 --- a/packer_templates/ubuntu/ubuntu-16.04-amd64.json +++ b/packer_templates/ubuntu/ubuntu-16.04-amd64.json @@ -37,7 +37,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-virtualbox", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-virtualbox", "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", "ssh_password": "vagrant", "ssh_port": 22, @@ -84,7 +84,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-vmware", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-vmware", "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", "ssh_password": "vagrant", "ssh_port": 22, @@ -135,7 +135,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-parallels", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-parallels", "parallels_tools_flavor": "lin", "memory": "{{ user `memory` }}", "cpus": "{{ user `cpus` }}", @@ -182,7 +182,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-qemu", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-qemu", "memory": "{{ user `memory` }}", "cpus": "{{ user `cpus` }}", "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", @@ -218,7 +218,7 @@ "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", "memory": "{{user `memory`}}", - "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-hyperv", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-hyperv", "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", "ssh_password": "vagrant", "ssh_port": 22, @@ -231,7 +231,7 @@ ], "post-processors": [ { - "output": "{{ user `builddir` }}/{{user `box_basename`}}.{{.Provider}}.box", + "output": "{{ user `build_directory` }}/{{user `box_basename`}}.{{.Provider}}.box", "type": "vagrant" } ], @@ -264,7 +264,7 @@ ], "variables": { "box_basename": "ubuntu-16.04", - "builddir": "../../builds", + "build_directory": "../../builds", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", "disk_size": "65536", diff --git a/packer_templates/ubuntu/ubuntu-16.04-i386.json b/packer_templates/ubuntu/ubuntu-16.04-i386.json index 66747f8ca..95e1e1e89 100644 --- a/packer_templates/ubuntu/ubuntu-16.04-i386.json +++ b/packer_templates/ubuntu/ubuntu-16.04-i386.json @@ -37,7 +37,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-virtualbox", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-virtualbox", "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", "ssh_password": "vagrant", "ssh_port": 22, @@ -84,7 +84,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-vmware", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-vmware", "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", "ssh_password": "vagrant", "ssh_port": 22, @@ -134,7 +134,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-parallels", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-parallels", "parallels_tools_flavor": "lin", "memory": "{{ user `memory` }}", "cpus": "{{ user `cpus` }}", @@ -181,7 +181,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-qemu", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-qemu", "memory": "{{ user `memory` }}", "cpus": "{{ user `cpus` }}", "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", @@ -195,7 +195,7 @@ ], "post-processors": [ { - "output": "{{ user `builddir` }}/{{user `box_basename`}}.{{.Provider}}.box", + "output": "{{ user `build_directory` }}/{{user `box_basename`}}.{{.Provider}}.box", "type": "vagrant" } ], @@ -227,7 +227,7 @@ ], "variables": { "box_basename": "ubuntu-16.04-i386", - "builddir": "../../builds", + "build_directory": "../../builds", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", "disk_size": "65536", diff --git a/packer_templates/ubuntu/ubuntu-18.04-amd64.json b/packer_templates/ubuntu/ubuntu-18.04-amd64.json index ae968770f..18d731c92 100644 --- a/packer_templates/ubuntu/ubuntu-18.04-amd64.json +++ b/packer_templates/ubuntu/ubuntu-18.04-amd64.json @@ -36,7 +36,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-virtualbox", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-virtualbox", "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", "ssh_password": "vagrant", "ssh_port": 22, @@ -82,7 +82,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-vmware", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-vmware", "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", "ssh_password": "vagrant", "ssh_port": 22, @@ -132,7 +132,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-parallels", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-parallels", "parallels_tools_flavor": "lin", "memory": "{{ user `memory` }}", "cpus": "{{ user `cpus` }}", @@ -178,7 +178,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-qemu", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-qemu", "memory": "{{ user `memory` }}", "cpus": "{{ user `cpus` }}", "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", @@ -214,7 +214,7 @@ "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", "memory": "{{user `memory`}}", - "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-hyperv", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-hyperv", "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", "ssh_password": "vagrant", "ssh_port": 22, @@ -227,7 +227,7 @@ ], "post-processors": [ { - "output": "{{ user `builddir` }}/{{user `box_basename`}}.{{.Provider}}.box", + "output": "{{ user `build_directory` }}/{{user `box_basename`}}.{{.Provider}}.box", "type": "vagrant" } ], @@ -260,7 +260,7 @@ ], "variables": { "box_basename": "ubuntu-18.04", - "builddir": "../../builds", + "build_directory": "../../builds", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", "disk_size": "65536", diff --git a/packer_templates/ubuntu/ubuntu-18.10-amd64.json b/packer_templates/ubuntu/ubuntu-18.10-amd64.json index 7f884bcd4..24bcf180b 100644 --- a/packer_templates/ubuntu/ubuntu-18.10-amd64.json +++ b/packer_templates/ubuntu/ubuntu-18.10-amd64.json @@ -36,7 +36,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-virtualbox", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-virtualbox", "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", "ssh_password": "vagrant", "ssh_port": 22, @@ -82,7 +82,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-vmware", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-vmware", "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", "ssh_password": "vagrant", "ssh_port": 22, @@ -132,7 +132,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-parallels", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-parallels", "parallels_tools_flavor": "lin", "memory": "{{ user `memory` }}", "cpus": "{{ user `cpus` }}", @@ -178,7 +178,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-qemu", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-qemu", "memory": "{{ user `memory` }}", "cpus": "{{ user `cpus` }}", "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", @@ -214,7 +214,7 @@ "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", "memory": "{{user `memory`}}", - "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-hyperv", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-hyperv", "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", "ssh_password": "vagrant", "ssh_port": 22, @@ -227,7 +227,7 @@ ], "post-processors": [ { - "output": "{{ user `builddir` }}/{{user `box_basename`}}.{{.Provider}}.box", + "output": "{{ user `build_directory` }}/{{user `box_basename`}}.{{.Provider}}.box", "type": "vagrant" } ], @@ -260,7 +260,7 @@ ], "variables": { "box_basename": "ubuntu-18.10", - "builddir": "../../builds", + "build_directory": "../../builds", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", "disk_size": "65536", diff --git a/packer_templates/ubuntu/ubuntu-19.04-amd64.json b/packer_templates/ubuntu/ubuntu-19.04-amd64.json index c97982e82..92cd55034 100644 --- a/packer_templates/ubuntu/ubuntu-19.04-amd64.json +++ b/packer_templates/ubuntu/ubuntu-19.04-amd64.json @@ -36,7 +36,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-virtualbox", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-virtualbox", "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", "ssh_password": "vagrant", "ssh_port": 22, @@ -82,7 +82,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-vmware", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-vmware", "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", "ssh_password": "vagrant", "ssh_port": 22, @@ -132,7 +132,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-parallels", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-parallels", "parallels_tools_flavor": "lin", "memory": "{{ user `memory` }}", "cpus": "{{ user `cpus` }}", @@ -178,7 +178,7 @@ "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-qemu", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-qemu", "memory": "{{ user `memory` }}", "cpus": "{{ user `cpus` }}", "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", @@ -214,7 +214,7 @@ "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", "memory": "{{user `memory`}}", - "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-hyperv", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-hyperv", "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", "ssh_password": "vagrant", "ssh_port": 22, @@ -227,7 +227,7 @@ ], "post-processors": [ { - "output": "{{ user `builddir` }}/{{user `box_basename`}}.{{.Provider}}.box", + "output": "{{ user `build_directory` }}/{{user `box_basename`}}.{{.Provider}}.box", "type": "vagrant" } ], @@ -260,7 +260,7 @@ ], "variables": { "box_basename": "ubuntu-19.04", - "builddir": "../../builds", + "build_directory": "../../builds", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", "disk_size": "65536", diff --git a/packer_templates/windows/windows-10.json b/packer_templates/windows/windows-10.json index 99f522919..48195c999 100644 --- a/packer_templates/windows/windows-10.json +++ b/packer_templates/windows/windows-10.json @@ -15,7 +15,7 @@ "iso_url": "{{ user `iso_url` }}", "iso_checksum": "{{ user `iso_checksum` }}", "iso_checksum_type": "sha1", - "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-virtualbox", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-virtualbox", "communicator": "winrm", "winrm_username": "vagrant", "winrm_password": "vagrant", @@ -37,7 +37,7 @@ "iso_url": "{{ user `iso_url` }}", "iso_checksum": "{{ user `iso_checksum` }}", "iso_checksum_type": "sha1", - "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-vmware", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-vmware", "communicator": "winrm", "winrm_username": "vagrant", "winrm_password": "vagrant", @@ -112,7 +112,7 @@ "headless": "true", "iso_checksum": "743fc483bb8bf1901c0534a0ae15208a5a72a3c5", "iso_url": "https://software-download.microsoft.com/download/pr/18362.30.190401-1528.19h1_release_svc_refresh_CLIENTENTERPRISEEVAL_OEMRET_x64FRE_en-us.iso", - "builddir": "../../builds", + "build_directory": "../../builds", "template": "windows-10" } } diff --git a/packer_templates/windows/windows-2008r2.json b/packer_templates/windows/windows-2008r2.json index 2449e331d..9d1dcfc21 100644 --- a/packer_templates/windows/windows-2008r2.json +++ b/packer_templates/windows/windows-2008r2.json @@ -13,7 +13,7 @@ "iso_url": "{{ user `iso_url` }}", "iso_checksum": "{{ user `iso_checksum` }}", "iso_checksum_type": "sha1", - "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-virtualbox", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-virtualbox", "communicator": "winrm", "winrm_username": "vagrant", "winrm_password": "vagrant", @@ -78,7 +78,7 @@ "headless": "false", "iso_checksum": "beed231a34e90e1dd9a04b3afabec31d62ce3889", "iso_url": "http://download.microsoft.com/download/7/5/E/75EC4E54-5B02-42D6-8879-D8D3A25FBEF7/7601.17514.101119-1850_x64fre_server_eval_en-us-GRMSXEVAL_EN_DVD.iso", - "builddir": "../../builds", + "build_directory": "../../builds", "template": "windows-2008r2-standard" } } diff --git a/packer_templates/windows/windows-2012r2.json b/packer_templates/windows/windows-2012r2.json index 233efd2a4..79557554d 100644 --- a/packer_templates/windows/windows-2012r2.json +++ b/packer_templates/windows/windows-2012r2.json @@ -13,7 +13,7 @@ "iso_url": "{{ user `iso_url` }}", "iso_checksum": "{{ user `iso_checksum` }}", "iso_checksum_type": "sha1", - "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-virtualbox", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-virtualbox", "communicator": "winrm", "winrm_username": "vagrant", "winrm_password": "vagrant", @@ -34,7 +34,7 @@ "iso_url": "{{ user `iso_url` }}", "iso_checksum": "{{ user `iso_checksum` }}", "iso_checksum_type": "sha1", - "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-vmware", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-vmware", "communicator": "winrm", "winrm_username": "vagrant", "winrm_password": "vagrant", @@ -107,7 +107,7 @@ "headless": "true", "iso_checksum": "849734f37346385dac2c101e4aacba4626bb141c", "iso_url": "http://download.microsoft.com/download/6/2/A/62A76ABB-9990-4EFC-A4FE-C7D698DAEB96/9600.17050.WINBLUE_REFRESH.140317-1640_X64FRE_SERVER_EVAL_EN-US-IR3_SSS_X64FREE_EN-US_DV9.ISO", - "builddir": "../../builds", + "build_directory": "../../builds", "template": "windows-2012r2-standard" } } diff --git a/packer_templates/windows/windows-2016.json b/packer_templates/windows/windows-2016.json index 4fe1b81cc..503534317 100644 --- a/packer_templates/windows/windows-2016.json +++ b/packer_templates/windows/windows-2016.json @@ -13,7 +13,7 @@ "iso_url": "{{ user `iso_url` }}", "iso_checksum": "{{ user `iso_checksum` }}", "iso_checksum_type": "sha1", - "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-virtualbox", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-virtualbox", "communicator": "winrm", "winrm_username": "vagrant", "winrm_password": "vagrant", @@ -34,7 +34,7 @@ "iso_url": "{{ user `iso_url` }}", "iso_checksum": "{{ user `iso_checksum` }}", "iso_checksum_type": "sha1", - "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-vmware", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-vmware", "communicator": "winrm", "winrm_username": "vagrant", "winrm_password": "vagrant", @@ -107,7 +107,7 @@ "headless": "true", "iso_checksum": "772700802951b36c8cb26a61c040b9a8dc3816a3", "iso_url": "https://software-download.microsoft.com/download/pr/Windows_Server_2016_Datacenter_EVAL_en-us_14393_refresh.ISO", - "builddir": "../../builds", + "build_directory": "../../builds", "template": "windows-2016-standard" } } diff --git a/packer_templates/windows/windows-2019.json b/packer_templates/windows/windows-2019.json index 537fcb372..ab874ec76 100644 --- a/packer_templates/windows/windows-2019.json +++ b/packer_templates/windows/windows-2019.json @@ -13,7 +13,7 @@ "iso_url": "{{ user `iso_url` }}", "iso_checksum": "{{ user `iso_checksum` }}", "iso_checksum_type": "sha1", - "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-virtualbox", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-virtualbox", "communicator": "winrm", "winrm_username": "vagrant", "winrm_password": "vagrant", @@ -34,7 +34,7 @@ "iso_url": "{{ user `iso_url` }}", "iso_checksum": "{{ user `iso_checksum` }}", "iso_checksum_type": "sha1", - "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-vmware", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-vmware", "communicator": "winrm", "winrm_username": "vagrant", "winrm_password": "vagrant", @@ -107,7 +107,7 @@ "headless": "true", "iso_checksum": "91e3a2f1acc39af21353c7cc105c799494d7539f", "iso_url": "https://software-download.microsoft.com/download/sg/17763.253.190108-0006.rs5_release_svc_refresh_SERVER_EVAL_x64FRE_en-us.iso", - "builddir": "../../builds", + "build_directory": "../../builds", "template": "windows-2019-standard" } } diff --git a/packer_templates/windows/windows-7.json b/packer_templates/windows/windows-7.json index 498c8cbcd..081348590 100644 --- a/packer_templates/windows/windows-7.json +++ b/packer_templates/windows/windows-7.json @@ -13,7 +13,7 @@ "iso_url": "{{ user `iso_url` }}", "iso_checksum": "{{ user `iso_checksum` }}", "iso_checksum_type": "sha1", - "output_directory": "{{ user `builddir` }}/packer-{{user `template`}}-virtualbox", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-virtualbox", "communicator": "winrm", "winrm_username": "vagrant", "winrm_password": "vagrant", @@ -85,7 +85,7 @@ "headless": "false", "iso_checksum": "971fc00183a52c152fe924a6b99fdec011a871c2", "iso_url": "http://care.dlservice.microsoft.com/dl/download/evalx/win7/x86/EN/7600.16385.090713-1255_x86fre_enterprise_en-us_EVAL_Eval_Enterprise-GRMCENEVAL_EN_DVD.iso", - "builddir": "../../builds", + "build_directory": "../../builds", "template": "windows-7" } } From d4b6059851961087252b5da0b2f75672dd3ab552 Mon Sep 17 00:00:00 2001 From: Ali Rizvi-Santiago <arizvisa@gmail.com> Date: Thu, 31 Oct 2019 13:16:34 -0500 Subject: [PATCH 1052/1622] Added support for specifying the guest_additions_url as a variable to all the json templates to allow the user to specify a custom VirtualBox Guest Additions ISO if necessary. Signed-off-by: Ali Rizvi-Santiago <arizvisa@gmail.com> --- packer_templates/centos/centos-5.11-i386.json | 2 ++ packer_templates/centos/centos-5.11-x86_64.json | 2 ++ packer_templates/centos/centos-6.10-i386.json | 2 ++ packer_templates/centos/centos-6.10-x86_64.json | 2 ++ packer_templates/centos/centos-7.7-x86_64.json | 2 ++ packer_templates/centos/centos-8.0-x86_64.json | 2 ++ packer_templates/debian/debian-10.1-amd64.json | 2 ++ packer_templates/debian/debian-10.1-i386.json | 2 ++ packer_templates/debian/debian-8.11-amd64.json | 2 ++ packer_templates/debian/debian-8.11-i386.json | 2 ++ packer_templates/debian/debian-9.11-amd64.json | 2 ++ packer_templates/debian/debian-9.11-i386.json | 2 ++ packer_templates/fedora/fedora-29-x86_64.json | 2 ++ packer_templates/fedora/fedora-30-x86_64.json | 2 ++ packer_templates/fedora/fedora-31-x86_64.json | 2 ++ packer_templates/opensuse/opensuse-leap-15.1-x86_64.json | 2 ++ packer_templates/oraclelinux/oracle-5.11-i386.json | 2 ++ packer_templates/oraclelinux/oracle-5.11-x86_64.json | 2 ++ packer_templates/oraclelinux/oracle-6.10-i386.json | 2 ++ packer_templates/oraclelinux/oracle-6.10-x86_64.json | 2 ++ packer_templates/oraclelinux/oracle-7.7-x86_64.json | 2 ++ packer_templates/rhel/rhel-5.11-i386.json | 2 ++ packer_templates/rhel/rhel-5.11-x86_64.json | 2 ++ packer_templates/rhel/rhel-6.10-i386.json | 2 ++ packer_templates/rhel/rhel-6.10-x86_64.json | 2 ++ packer_templates/rhel/rhel-7.6-x86_64.json | 2 ++ packer_templates/rhel/rhel-8.0-x86_64.json | 2 ++ packer_templates/scientificlinux/scientific-7.7-x86_64.json | 2 ++ packer_templates/sles/sles-11-sp4-x86_64.json | 2 ++ packer_templates/sles/sles-12-sp2-x86_64.json | 2 ++ packer_templates/sles/sles-12-sp3-x86_64.json | 2 ++ packer_templates/sles/sles-15-sp1.json | 2 ++ packer_templates/sles/sles-15.json | 2 ++ packer_templates/solaris/solaris-10.11-x86.json | 2 ++ packer_templates/solaris/solaris-11-x86.json | 2 ++ packer_templates/ubuntu/ubuntu-16.04-amd64.json | 2 ++ packer_templates/ubuntu/ubuntu-16.04-i386.json | 2 ++ packer_templates/ubuntu/ubuntu-18.04-amd64.json | 2 ++ packer_templates/ubuntu/ubuntu-18.10-amd64.json | 2 ++ packer_templates/ubuntu/ubuntu-19.04-amd64.json | 2 ++ packer_templates/windows/windows-10.json | 2 ++ packer_templates/windows/windows-2008r2.json | 2 ++ packer_templates/windows/windows-2012r2.json | 2 ++ packer_templates/windows/windows-2016.json | 2 ++ packer_templates/windows/windows-2019.json | 2 ++ packer_templates/windows/windows-7.json | 2 ++ 46 files changed, 92 insertions(+) diff --git a/packer_templates/centos/centos-5.11-i386.json b/packer_templates/centos/centos-5.11-i386.json index f35c3b951..01d4fbd23 100644 --- a/packer_templates/centos/centos-5.11-i386.json +++ b/packer_templates/centos/centos-5.11-i386.json @@ -6,6 +6,7 @@ ], "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", + "guest_additions_url": "{{ user `guest_additions_url` }}", "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "guest_os_type": "RedHat", "hard_drive_interface": "sata", @@ -171,6 +172,7 @@ "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", "hyperv_generation": "1", + "guest_additions_url": "", "iso_checksum": "66d7aa1be7f7aa327b823a706b04b37e219cea67c4eadd9185e8de5e3c4fb08d", "iso_checksum_type": "sha256", "iso_name": "CentOS-5.11-i386-bin-DVD-1of2.iso", diff --git a/packer_templates/centos/centos-5.11-x86_64.json b/packer_templates/centos/centos-5.11-x86_64.json index 563048752..fe12448ea 100644 --- a/packer_templates/centos/centos-5.11-x86_64.json +++ b/packer_templates/centos/centos-5.11-x86_64.json @@ -6,6 +6,7 @@ ], "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", + "guest_additions_url": "{{ user `guest_additions_url` }}", "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "guest_os_type": "RedHat_64", "hard_drive_interface": "sata", @@ -171,6 +172,7 @@ "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", "hyperv_generation": "1", + "guest_additions_url": "", "iso_checksum": "b6eb0565b636513b90663ff01c6ec4da5058baff0d7d4007d187be997dd985f8", "iso_checksum_type": "sha256", "iso_name": "CentOS-5.11-x86_64-bin-DVD-1of2.iso", diff --git a/packer_templates/centos/centos-6.10-i386.json b/packer_templates/centos/centos-6.10-i386.json index 9903f07da..3a3cb31df 100644 --- a/packer_templates/centos/centos-6.10-i386.json +++ b/packer_templates/centos/centos-6.10-i386.json @@ -6,6 +6,7 @@ ], "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", + "guest_additions_url": "{{ user `guest_additions_url` }}", "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "guest_os_type": "RedHat", "hard_drive_interface": "sata", @@ -170,6 +171,7 @@ "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", "hyperv_generation": "1", + "guest_additions_url": "", "iso_checksum": "25d95b3f178e59bd672fa97e043a9191cbf73bb6cd12f5df9b540fa88076cae8", "iso_checksum_type": "sha256", "iso_name": "CentOS-6.10-i386-bin-DVD1.iso", diff --git a/packer_templates/centos/centos-6.10-x86_64.json b/packer_templates/centos/centos-6.10-x86_64.json index 2db9e7cb6..0586cdc65 100644 --- a/packer_templates/centos/centos-6.10-x86_64.json +++ b/packer_templates/centos/centos-6.10-x86_64.json @@ -6,6 +6,7 @@ ], "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", + "guest_additions_url": "{{ user `guest_additions_url` }}", "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "guest_os_type": "RedHat_64", "hard_drive_interface": "sata", @@ -170,6 +171,7 @@ "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", "hyperv_generation": "1", + "guest_additions_url": "", "iso_checksum": "a68e46970678d4d297d46086ae2efdd3e994322d6d862ff51dcce25a0759e41c", "iso_checksum_type": "sha256", "iso_name": "CentOS-6.10-x86_64-bin-DVD1.iso", diff --git a/packer_templates/centos/centos-7.7-x86_64.json b/packer_templates/centos/centos-7.7-x86_64.json index d54ebab2a..5cebc1d27 100644 --- a/packer_templates/centos/centos-7.7-x86_64.json +++ b/packer_templates/centos/centos-7.7-x86_64.json @@ -6,6 +6,7 @@ ], "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", + "guest_additions_url": "{{ user `guest_additions_url` }}", "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "guest_os_type": "RedHat_64", "hard_drive_interface": "sata", @@ -171,6 +172,7 @@ "https_proxy": "{{env `https_proxy`}}", "hyperv_generation": "1", "hyperv_switch": "{{env `hyperv_switch`}}", + "guest_additions_url": "", "iso_checksum": "9bba3da2876cb9fcf6c28fb636bcbd01832fe6d84cd7445fa58e44e569b3b4fe", "iso_checksum_type": "sha256", "iso_name": "CentOS-7-x86_64-DVD-1908.iso", diff --git a/packer_templates/centos/centos-8.0-x86_64.json b/packer_templates/centos/centos-8.0-x86_64.json index 541c4fb04..cb52ced7d 100644 --- a/packer_templates/centos/centos-8.0-x86_64.json +++ b/packer_templates/centos/centos-8.0-x86_64.json @@ -6,6 +6,7 @@ ], "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", + "guest_additions_url": "{{ user `guest_additions_url` }}", "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "guest_os_type": "RedHat_64", "hard_drive_interface": "sata", @@ -171,6 +172,7 @@ "https_proxy": "{{env `https_proxy`}}", "hyperv_generation": "1", "hyperv_switch": "{{env `hyperv_switch`}}", + "guest_additions_url": "", "iso_checksum": "ea17ef71e0df3f6bf1d4bf1fc25bec1a76d1f211c115d39618fe688be34503e8", "iso_checksum_type": "sha256", "iso_name": "CentOS-8-x86_64-1905-dvd1.iso", diff --git a/packer_templates/debian/debian-10.1-amd64.json b/packer_templates/debian/debian-10.1-amd64.json index 4cb62a494..257a58db4 100644 --- a/packer_templates/debian/debian-10.1-amd64.json +++ b/packer_templates/debian/debian-10.1-amd64.json @@ -21,6 +21,7 @@ ], "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", + "guest_additions_url": "{{ user `guest_additions_url` }}", "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "guest_os_type": "Debian_64", "hard_drive_interface": "sata", @@ -205,6 +206,7 @@ "headless": "", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", + "guest_additions_url": "", "iso_checksum": "7915fdb77a0c2623b4481fc5f0a8052330defe1cde1e0834ff233818dc6f301e", "iso_checksum_type": "sha256", "iso_name": "debian-10.1.0-amd64-netinst.iso", diff --git a/packer_templates/debian/debian-10.1-i386.json b/packer_templates/debian/debian-10.1-i386.json index 526d119f8..ec198e364 100644 --- a/packer_templates/debian/debian-10.1-i386.json +++ b/packer_templates/debian/debian-10.1-i386.json @@ -21,6 +21,7 @@ ], "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", + "guest_additions_url": "{{ user `guest_additions_url` }}", "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "guest_os_type": "Debian", "hard_drive_interface": "sata", @@ -205,6 +206,7 @@ "headless": "", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", + "guest_additions_url": "", "iso_checksum": "78ea01feb0f0d8a8c274333a3b2e6261c93b33135c26aa5b7c791d0f57524eb5", "iso_checksum_type": "sha256", "iso_name": "debian-10.1.0-i386-netinst.iso", diff --git a/packer_templates/debian/debian-8.11-amd64.json b/packer_templates/debian/debian-8.11-amd64.json index 68d4bc493..f3a1a38c9 100644 --- a/packer_templates/debian/debian-8.11-amd64.json +++ b/packer_templates/debian/debian-8.11-amd64.json @@ -21,6 +21,7 @@ ], "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", + "guest_additions_url": "{{ user `guest_additions_url` }}", "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "guest_os_type": "Debian_64", "hard_drive_interface": "sata", @@ -205,6 +206,7 @@ "headless": "", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", + "guest_additions_url": "", "iso_checksum": "166868369a8094a69b2766b46a9a28869ac921bac5697e525d0ec5be14a9d373", "iso_checksum_type": "sha256", "iso_name": "debian-8.11.0-amd64-CD-1.iso", diff --git a/packer_templates/debian/debian-8.11-i386.json b/packer_templates/debian/debian-8.11-i386.json index c16d918bb..71c68c0ca 100644 --- a/packer_templates/debian/debian-8.11-i386.json +++ b/packer_templates/debian/debian-8.11-i386.json @@ -21,6 +21,7 @@ ], "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", + "guest_additions_url": "{{ user `guest_additions_url` }}", "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "guest_os_type": "Debian", "hard_drive_interface": "sata", @@ -205,6 +206,7 @@ "headless": "", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", + "guest_additions_url": "", "iso_checksum": "4c56c06d2ba489409f50cbf073bf3656460336dd805b0245f9b419585680b7cd", "iso_checksum_type": "sha256", "iso_name": "debian-8.11.0-i386-CD-1.iso", diff --git a/packer_templates/debian/debian-9.11-amd64.json b/packer_templates/debian/debian-9.11-amd64.json index e5992176a..b940c085a 100644 --- a/packer_templates/debian/debian-9.11-amd64.json +++ b/packer_templates/debian/debian-9.11-amd64.json @@ -21,6 +21,7 @@ ], "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", + "guest_additions_url": "{{ user `guest_additions_url` }}", "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "guest_os_type": "Debian_64", "hard_drive_interface": "sata", @@ -205,6 +206,7 @@ "headless": "", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", + "guest_additions_url": "", "iso_checksum": "9ae83aa5a732151ef2dc84538d1d4ffd6374df47cc01681da6348f9ec5a45bd4", "iso_checksum_type": "sha256", "iso_name": "debian-9.11.0-amd64-netinst.iso", diff --git a/packer_templates/debian/debian-9.11-i386.json b/packer_templates/debian/debian-9.11-i386.json index 06102c871..acf96954b 100644 --- a/packer_templates/debian/debian-9.11-i386.json +++ b/packer_templates/debian/debian-9.11-i386.json @@ -21,6 +21,7 @@ ], "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", + "guest_additions_url": "{{ user `guest_additions_url` }}", "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "guest_os_type": "Debian", "hard_drive_interface": "sata", @@ -205,6 +206,7 @@ "headless": "", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", + "guest_additions_url": "", "iso_checksum": "c24ac0bd549549bee755d842799153abf0b232f106c248e2efe48aa6209b6bd6", "iso_checksum_type": "sha256", "iso_name": "debian-9.11.0-i386-netinst.iso", diff --git a/packer_templates/fedora/fedora-29-x86_64.json b/packer_templates/fedora/fedora-29-x86_64.json index 3eb3c4d68..0f8b7a5f3 100644 --- a/packer_templates/fedora/fedora-29-x86_64.json +++ b/packer_templates/fedora/fedora-29-x86_64.json @@ -36,6 +36,7 @@ ], "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", + "guest_additions_url": "{{ user `guest_additions_url` }}", "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "guest_os_type": "Fedora_64", "hard_drive_interface": "sata", @@ -175,6 +176,7 @@ "headless": "", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", + "guest_additions_url": "", "iso_checksum": "129d131a55e5bd518f593f0eacdce095f7c795fe7ccbef1f3f6aeb2ff9f99f35", "iso_checksum_type": "sha256", "iso_name": "Fedora-Server-dvd-x86_64-29-1.2.iso", diff --git a/packer_templates/fedora/fedora-30-x86_64.json b/packer_templates/fedora/fedora-30-x86_64.json index f76688b71..11792aa25 100644 --- a/packer_templates/fedora/fedora-30-x86_64.json +++ b/packer_templates/fedora/fedora-30-x86_64.json @@ -36,6 +36,7 @@ ], "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", + "guest_additions_url": "{{ user `guest_additions_url` }}", "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "guest_os_type": "Fedora_64", "hard_drive_interface": "sata", @@ -176,6 +177,7 @@ "headless": "", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", + "guest_additions_url": "", "iso_checksum": "bb0622b78449298e24a96b90b561b429edec71aae72b8f7a8c3da4d81e4df5b7", "iso_checksum_type": "sha256", "iso_name": "Fedora-Server-dvd-x86_64-30-1.2.iso", diff --git a/packer_templates/fedora/fedora-31-x86_64.json b/packer_templates/fedora/fedora-31-x86_64.json index 7dec8c56a..c0ae67797 100644 --- a/packer_templates/fedora/fedora-31-x86_64.json +++ b/packer_templates/fedora/fedora-31-x86_64.json @@ -36,6 +36,7 @@ ], "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", + "guest_additions_url": "{{ user `guest_additions_url` }}", "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "guest_os_type": "Fedora_64", "hard_drive_interface": "sata", @@ -176,6 +177,7 @@ "headless": "", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", + "guest_additions_url": "", "iso_checksum": "225ebc160e40bb43c5de28bad9680e3a78a9db40c9e3f4f42f3ee3f10f95dbeb", "iso_checksum_type": "sha256", "iso_name": "Fedora-Server-dvd-x86_64-31-1.9.iso", diff --git a/packer_templates/opensuse/opensuse-leap-15.1-x86_64.json b/packer_templates/opensuse/opensuse-leap-15.1-x86_64.json index f693f3299..75c3db0f2 100644 --- a/packer_templates/opensuse/opensuse-leap-15.1-x86_64.json +++ b/packer_templates/opensuse/opensuse-leap-15.1-x86_64.json @@ -15,6 +15,7 @@ ], "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", + "guest_additions_url": "{{ user `guest_additions_url` }}", "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "guest_os_type": "OpenSUSE_64", "hard_drive_interface": "sata", @@ -179,6 +180,7 @@ "headless": "", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", + "guest_additions_url": "", "iso_checksum": "c6d3ed19fe5cc25c4667bf0b46cc86aebcfbca3b0073aed0a288834600cb8b97", "iso_checksum_type": "sha256", "iso_name": "openSUSE-Leap-15.1-DVD-x86_64.iso", diff --git a/packer_templates/oraclelinux/oracle-5.11-i386.json b/packer_templates/oraclelinux/oracle-5.11-i386.json index c54b0456d..3b39345dc 100644 --- a/packer_templates/oraclelinux/oracle-5.11-i386.json +++ b/packer_templates/oraclelinux/oracle-5.11-i386.json @@ -6,6 +6,7 @@ ], "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", + "guest_additions_url": "{{ user `guest_additions_url` }}", "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "guest_os_type": "Oracle", "hard_drive_interface": "sata", @@ -142,6 +143,7 @@ "headless": "", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", + "guest_additions_url": "", "iso_checksum": "E60962C4EBF8920BBD828EFE32A78A7CC8F28E3B", "iso_checksum_type": "sha1", "iso_name": "Enterprise-R5-U11-Server-i386-dvd.iso", diff --git a/packer_templates/oraclelinux/oracle-5.11-x86_64.json b/packer_templates/oraclelinux/oracle-5.11-x86_64.json index f741d59ae..d6b236d36 100644 --- a/packer_templates/oraclelinux/oracle-5.11-x86_64.json +++ b/packer_templates/oraclelinux/oracle-5.11-x86_64.json @@ -6,6 +6,7 @@ ], "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", + "guest_additions_url": "{{ user `guest_additions_url` }}", "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "guest_os_type": "Oracle_64", "hard_drive_interface": "sata", @@ -150,6 +151,7 @@ "headless": "", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", + "guest_additions_url": "", "iso_checksum": "2D38F76652CBC1367FDF30024F13CDE5F6BF34DF", "iso_checksum_type": "sha1", "iso_name": "Enterprise-R5-U11-Server-x86_64-dvd.iso", diff --git a/packer_templates/oraclelinux/oracle-6.10-i386.json b/packer_templates/oraclelinux/oracle-6.10-i386.json index d938b7efe..8835bc352 100644 --- a/packer_templates/oraclelinux/oracle-6.10-i386.json +++ b/packer_templates/oraclelinux/oracle-6.10-i386.json @@ -6,6 +6,7 @@ ], "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", + "guest_additions_url": "{{ user `guest_additions_url` }}", "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "guest_os_type": "Oracle", "hard_drive_interface": "sata", @@ -143,6 +144,7 @@ "headless": "", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", + "guest_additions_url": "", "iso_checksum": "fd07f775e7fa52e9ab021eb7dccb78453fc61f3d3b712ec426f6b1bf5020318b", "iso_checksum_type": "sha256", "iso_name": "OracleLinux-R6-U9-Server-i386-dvd.iso", diff --git a/packer_templates/oraclelinux/oracle-6.10-x86_64.json b/packer_templates/oraclelinux/oracle-6.10-x86_64.json index 9057c4536..a68df4030 100644 --- a/packer_templates/oraclelinux/oracle-6.10-x86_64.json +++ b/packer_templates/oraclelinux/oracle-6.10-x86_64.json @@ -6,6 +6,7 @@ ], "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", + "guest_additions_url": "{{ user `guest_additions_url` }}", "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "guest_os_type": "Oracle_64", "hard_drive_interface": "sata", @@ -143,6 +144,7 @@ "headless": "", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", + "guest_additions_url": "", "iso_checksum": "c32e2a7c8eb471db731741f1a30be37e49deda8ce961710273a71b26c9a04a36", "iso_checksum_type": "sha256", "iso_name": "OracleLinux-R6-U9-Server-x86_64-dvd.iso", diff --git a/packer_templates/oraclelinux/oracle-7.7-x86_64.json b/packer_templates/oraclelinux/oracle-7.7-x86_64.json index 9109ed9d5..621695bdc 100644 --- a/packer_templates/oraclelinux/oracle-7.7-x86_64.json +++ b/packer_templates/oraclelinux/oracle-7.7-x86_64.json @@ -6,6 +6,7 @@ ], "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", + "guest_additions_url": "{{ user `guest_additions_url` }}", "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "guest_os_type": "Oracle_64", "hard_drive_interface": "sata", @@ -143,6 +144,7 @@ "headless": "", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", + "guest_additions_url": "", "iso_checksum": "1d06cef6a518c32c0e7adcad0a99a8efbc7516066de41118ebf49002c15ea84d", "iso_checksum_type": "sha256", "iso_name": "OracleLinux-R7-U7-Server-x86_64-dvd.iso", diff --git a/packer_templates/rhel/rhel-5.11-i386.json b/packer_templates/rhel/rhel-5.11-i386.json index 9b77c3670..7962951ed 100644 --- a/packer_templates/rhel/rhel-5.11-i386.json +++ b/packer_templates/rhel/rhel-5.11-i386.json @@ -6,6 +6,7 @@ ], "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", + "guest_additions_url": "{{ user `guest_additions_url` }}", "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "guest_os_type": "RedHat", "hard_drive_interface": "sata", @@ -141,6 +142,7 @@ "headless": "", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", + "guest_additions_url": "", "iso_checksum": "4e38e4ed06d83efb10446e7db19d96761715cdbdbf0bbfacb978b44ce368bbe2", "iso_checksum_type": "sha256", "iso_name": "rhel-server-5.11-i386-dvd.iso", diff --git a/packer_templates/rhel/rhel-5.11-x86_64.json b/packer_templates/rhel/rhel-5.11-x86_64.json index 784d02f30..8826a0f72 100644 --- a/packer_templates/rhel/rhel-5.11-x86_64.json +++ b/packer_templates/rhel/rhel-5.11-x86_64.json @@ -6,6 +6,7 @@ ], "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", + "guest_additions_url": "{{ user `guest_additions_url` }}", "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "guest_os_type": "RedHat_64", "hard_drive_interface": "sata", @@ -149,6 +150,7 @@ "headless": "", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", + "guest_additions_url": "", "iso_checksum": "36565fe0c8a97207d63234d10123daeedb29d509576dbd7b34e71958ac2f9050", "iso_checksum_type": "sha256", "iso_name": "rhel-server-5.11-x86_64-dvd.iso", diff --git a/packer_templates/rhel/rhel-6.10-i386.json b/packer_templates/rhel/rhel-6.10-i386.json index 8f3d28289..26470b99a 100644 --- a/packer_templates/rhel/rhel-6.10-i386.json +++ b/packer_templates/rhel/rhel-6.10-i386.json @@ -6,6 +6,7 @@ ], "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", + "guest_additions_url": "{{ user `guest_additions_url` }}", "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "guest_os_type": "RedHat", "hard_drive_interface": "sata", @@ -142,6 +143,7 @@ "headless": "", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", + "guest_additions_url": "", "iso_checksum": "715c382b2c0484087654281446dce058d9eeb930d7dcc92a2130d52328df87b8", "iso_checksum_type": "sha256", "iso_name": "rhel-server-6.10-i386-dvd.iso", diff --git a/packer_templates/rhel/rhel-6.10-x86_64.json b/packer_templates/rhel/rhel-6.10-x86_64.json index d49c9ffc2..db929955a 100644 --- a/packer_templates/rhel/rhel-6.10-x86_64.json +++ b/packer_templates/rhel/rhel-6.10-x86_64.json @@ -6,6 +6,7 @@ ], "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", + "guest_additions_url": "{{ user `guest_additions_url` }}", "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "guest_os_type": "RedHat_64", "hard_drive_interface": "sata", @@ -142,6 +143,7 @@ "headless": "", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", + "guest_additions_url": "", "iso_checksum": "1e15f9202d2cdd4b2bdf9d6503a8543347f0cb8cc06ba9a0dfd2df4fdef5c727", "iso_checksum_type": "sha256", "iso_name": "rhel-server-6.10-x86_64-dvd.iso", diff --git a/packer_templates/rhel/rhel-7.6-x86_64.json b/packer_templates/rhel/rhel-7.6-x86_64.json index d439f7b30..809332ded 100644 --- a/packer_templates/rhel/rhel-7.6-x86_64.json +++ b/packer_templates/rhel/rhel-7.6-x86_64.json @@ -6,6 +6,7 @@ ], "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", + "guest_additions_url": "{{ user `guest_additions_url` }}", "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "guest_os_type": "RedHat_64", "hard_drive_interface": "sata", @@ -142,6 +143,7 @@ "headless": "", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", + "guest_additions_url": "", "iso_checksum": "60a0be5aeed1f08f2bb7599a578c89ec134b4016cd62a8604b29f15d543a469c", "iso_checksum_type": "sha256", "iso_name": "rhel-server-7.6-x86_64-dvd.iso", diff --git a/packer_templates/rhel/rhel-8.0-x86_64.json b/packer_templates/rhel/rhel-8.0-x86_64.json index bb13ab598..3cbe01ddb 100644 --- a/packer_templates/rhel/rhel-8.0-x86_64.json +++ b/packer_templates/rhel/rhel-8.0-x86_64.json @@ -6,6 +6,7 @@ ], "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", + "guest_additions_url": "{{ user `guest_additions_url` }}", "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "guest_os_type": "RedHat_64", "hard_drive_interface": "sata", @@ -142,6 +143,7 @@ "headless": "", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", + "guest_additions_url": "", "iso_checksum": "005d4f88fff6d63b0fc01a10822380ef52570edd8834321de7be63002cc6cc43", "iso_checksum_type": "sha256", "iso_name": "rhel-8.0-x86_64-dvd.iso", diff --git a/packer_templates/scientificlinux/scientific-7.7-x86_64.json b/packer_templates/scientificlinux/scientific-7.7-x86_64.json index a558719e7..3d8200c7c 100644 --- a/packer_templates/scientificlinux/scientific-7.7-x86_64.json +++ b/packer_templates/scientificlinux/scientific-7.7-x86_64.json @@ -6,6 +6,7 @@ ], "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", + "guest_additions_url": "{{ user `guest_additions_url` }}", "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "guest_os_type": "RedHat_64", "hard_drive_interface": "sata", @@ -80,6 +81,7 @@ "https_proxy": "{{env `https_proxy`}}", "hyperv_generation": "1", "hyperv_switch": "{{env `hyperv_switch`}}", + "guest_additions_url": "", "iso_checksum": "4490f72797834a958396af929c0da6a97a69049eddbfe969a8903b5ce0fddb99", "iso_checksum_type": "sha256", "iso_name": "SL-7-DVD-x86_64.iso", diff --git a/packer_templates/sles/sles-11-sp4-x86_64.json b/packer_templates/sles/sles-11-sp4-x86_64.json index 429f192b3..737f8471c 100644 --- a/packer_templates/sles/sles-11-sp4-x86_64.json +++ b/packer_templates/sles/sles-11-sp4-x86_64.json @@ -10,6 +10,7 @@ ], "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", + "guest_additions_url": "{{ user `guest_additions_url` }}", "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "guest_os_type": "OpenSUSE_64", "hard_drive_interface": "sata", @@ -163,6 +164,7 @@ "headless": "", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", + "guest_additions_url": "", "iso_checksum": "4fbf22201876d571c719328f385d87d6d690fb3ceb5e093108cdf0373c43e855", "iso_checksum_type": "sha256", "iso_name": "SLES-11-SP4-DVD-x86_64-GM-DVD1.iso", diff --git a/packer_templates/sles/sles-12-sp2-x86_64.json b/packer_templates/sles/sles-12-sp2-x86_64.json index eee675483..af9a6b826 100644 --- a/packer_templates/sles/sles-12-sp2-x86_64.json +++ b/packer_templates/sles/sles-12-sp2-x86_64.json @@ -10,6 +10,7 @@ ], "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", + "guest_additions_url": "{{ user `guest_additions_url` }}", "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "guest_os_type": "OpenSUSE_64", "hard_drive_interface": "sata", @@ -164,6 +165,7 @@ "headless": "", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", + "guest_additions_url": "", "iso_checksum": "dd724e9248f2c3507e8e9d0050a4c8b6e9aeda7fdf0870858757cc6c01b7d47d", "iso_checksum_type": "sha256", "iso_name": "SLE-12-SP2-Server-DVD-x86_64-GM-DVD1.iso", diff --git a/packer_templates/sles/sles-12-sp3-x86_64.json b/packer_templates/sles/sles-12-sp3-x86_64.json index 3d21fb06f..fa902f523 100644 --- a/packer_templates/sles/sles-12-sp3-x86_64.json +++ b/packer_templates/sles/sles-12-sp3-x86_64.json @@ -10,6 +10,7 @@ ], "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", + "guest_additions_url": "{{ user `guest_additions_url` }}", "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "guest_os_type": "OpenSUSE_64", "hard_drive_interface": "sata", @@ -164,6 +165,7 @@ "headless": "", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", + "guest_additions_url": "", "iso_checksum": "48408157ef667100671b22f92c3e20771ccf2100108b96e3ae83d8df30abddd5", "iso_checksum_type": "sha256", "iso_name": "SLE-12-SP3-Server-DVD-x86_64-GM-DVD1.iso", diff --git a/packer_templates/sles/sles-15-sp1.json b/packer_templates/sles/sles-15-sp1.json index 816c9da88..198b6c262 100644 --- a/packer_templates/sles/sles-15-sp1.json +++ b/packer_templates/sles/sles-15-sp1.json @@ -10,6 +10,7 @@ ], "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", + "guest_additions_url": "{{ user `guest_additions_url` }}", "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "guest_os_type": "OpenSUSE_64", "hard_drive_interface": "sata", @@ -180,6 +181,7 @@ "headless": "", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", + "guest_additions_url": "", "iso_checksum": "5787b180a60a8d52bc42ddb8c51884ca4263f5ed47dc10bb72229a49e8b07497", "iso_checksum_type": "sha256", "iso_name": "SLE-15-SP1-Installer-DVD-x86_64-GM-DVD1.iso", diff --git a/packer_templates/sles/sles-15.json b/packer_templates/sles/sles-15.json index 08cea7eba..a7794844c 100644 --- a/packer_templates/sles/sles-15.json +++ b/packer_templates/sles/sles-15.json @@ -10,6 +10,7 @@ ], "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", + "guest_additions_url": "{{ user `guest_additions_url` }}", "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "guest_os_type": "OpenSUSE_64", "hard_drive_interface": "sata", @@ -180,6 +181,7 @@ "headless": "", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", + "guest_additions_url": "", "iso_checksum": "06bd8b78ef0ca6d5ff5000688727953e894805dc3de59060d74441f0fd0539ab", "iso_checksum_type": "sha256", "iso_name": "SLE-15-Installer-DVD-x86_64-GM-DVD1.iso", diff --git a/packer_templates/solaris/solaris-10.11-x86.json b/packer_templates/solaris/solaris-10.11-x86.json index 1b5a0eef9..adb254590 100644 --- a/packer_templates/solaris/solaris-10.11-x86.json +++ b/packer_templates/solaris/solaris-10.11-x86.json @@ -20,6 +20,7 @@ "floppy/finish.sh" ], "guest_additions_mode": "upload", + "guest_additions_url": "{{ user `guest_additions_url` }}", "guest_os_type": "Solaris_64", "headless": "{{ user `headless` }}", "http_directory": "http", @@ -108,6 +109,7 @@ "box_basename": "solaris-10.11", "build_directory": "../../builds", "build_timestamp": "{{isotime \"20060102150405\"}}", + "guest_additions_url": "", "cpus": "1", "disk_size": "65536", "git_revision": "__unknown_git_revision__", diff --git a/packer_templates/solaris/solaris-11-x86.json b/packer_templates/solaris/solaris-11-x86.json index ece579837..9f3afc5a0 100644 --- a/packer_templates/solaris/solaris-11-x86.json +++ b/packer_templates/solaris/solaris-11-x86.json @@ -31,6 +31,7 @@ "boot_wait": "5s", "disk_size": "{{user `disk_size`}}", "guest_additions_mode": "attach", + "guest_additions_url": "{{ user `guest_additions_url` }}", "guest_os_type": "Solaris11_64", "headless": "{{ user `headless` }}", "http_directory": "http", @@ -130,6 +131,7 @@ "box_basename": "solaris-11.3", "build_directory": "../../builds", "build_timestamp": "{{isotime \"20060102150405\"}}", + "guest_additions_url": "", "cpus": "1", "disk_size": "65536", "git_revision": "__unknown_git_revision__", diff --git a/packer_templates/ubuntu/ubuntu-16.04-amd64.json b/packer_templates/ubuntu/ubuntu-16.04-amd64.json index 384675cce..e98774e5e 100644 --- a/packer_templates/ubuntu/ubuntu-16.04-amd64.json +++ b/packer_templates/ubuntu/ubuntu-16.04-amd64.json @@ -29,6 +29,7 @@ ], "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", + "guest_additions_url": "{{ user `guest_additions_url` }}", "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "guest_os_type": "Ubuntu_64", "hard_drive_interface": "sata", @@ -274,6 +275,7 @@ "https_proxy": "{{env `https_proxy`}}", "hyperv_generation": "2", "hyperv_switch": "{{env `hyperv_switch`}}", + "guest_additions_url": "", "iso_checksum": "16afb1375372c57471ea5e29803a89a5a6bd1f6aabea2e5e34ac1ab7eb9786ac", "iso_checksum_type": "sha256", "iso_name": "ubuntu-16.04.6-server-amd64.iso", diff --git a/packer_templates/ubuntu/ubuntu-16.04-i386.json b/packer_templates/ubuntu/ubuntu-16.04-i386.json index 95e1e1e89..cbdd5904d 100644 --- a/packer_templates/ubuntu/ubuntu-16.04-i386.json +++ b/packer_templates/ubuntu/ubuntu-16.04-i386.json @@ -29,6 +29,7 @@ ], "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", + "guest_additions_url": "{{ user `guest_additions_url` }}", "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "guest_os_type": "Ubuntu", "hard_drive_interface": "sata", @@ -235,6 +236,7 @@ "headless": "", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", + "guest_additions_url": "", "iso_checksum": "7509cabb2f9f6ba0a95f8454d432be2ef26679d31ce35baa626acc5321460fab", "iso_checksum_type": "sha256", "iso_name": "ubuntu-16.04.6-server-i386.iso", diff --git a/packer_templates/ubuntu/ubuntu-18.04-amd64.json b/packer_templates/ubuntu/ubuntu-18.04-amd64.json index 18d731c92..120495218 100644 --- a/packer_templates/ubuntu/ubuntu-18.04-amd64.json +++ b/packer_templates/ubuntu/ubuntu-18.04-amd64.json @@ -28,6 +28,7 @@ ], "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", + "guest_additions_url": "{{ user `guest_additions_url` }}", "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "guest_os_type": "Ubuntu_64", "hard_drive_interface": "sata", @@ -270,6 +271,7 @@ "https_proxy": "{{env `https_proxy`}}", "hyperv_generation": "2", "hyperv_switch": "{{env `hyperv_switch`}}", + "guest_additions_url": "", "iso_checksum": "7d8e0055d663bffa27c1718685085626cb59346e7626ba3d3f476322271f573e", "iso_checksum_type": "sha256", "iso_name": "ubuntu-18.04.3-server-amd64.iso", diff --git a/packer_templates/ubuntu/ubuntu-18.10-amd64.json b/packer_templates/ubuntu/ubuntu-18.10-amd64.json index 24bcf180b..9f170de5f 100644 --- a/packer_templates/ubuntu/ubuntu-18.10-amd64.json +++ b/packer_templates/ubuntu/ubuntu-18.10-amd64.json @@ -28,6 +28,7 @@ ], "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", + "guest_additions_url": "{{ user `guest_additions_url` }}", "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "guest_os_type": "Ubuntu_64", "hard_drive_interface": "sata", @@ -270,6 +271,7 @@ "https_proxy": "{{env `https_proxy`}}", "hyperv_generation": "2", "hyperv_switch": "{{env `hyperv_switch`}}", + "guest_additions_url": "", "iso_checksum": "cf9250781dadd919f23c9d9612212cad653e35fccc2fbcf6853f67ad09e067ba", "iso_checksum_type": "sha256", "iso_name": "ubuntu-18.10-server-amd64.iso", diff --git a/packer_templates/ubuntu/ubuntu-19.04-amd64.json b/packer_templates/ubuntu/ubuntu-19.04-amd64.json index 92cd55034..e8b62bce9 100644 --- a/packer_templates/ubuntu/ubuntu-19.04-amd64.json +++ b/packer_templates/ubuntu/ubuntu-19.04-amd64.json @@ -28,6 +28,7 @@ ], "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", + "guest_additions_url": "{{ user `guest_additions_url` }}", "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "guest_os_type": "Ubuntu_64", "hard_drive_interface": "sata", @@ -270,6 +271,7 @@ "https_proxy": "{{env `https_proxy`}}", "hyperv_generation": "2", "hyperv_switch": "{{env `hyperv_switch`}}", + "guest_additions_url": "", "iso_checksum": "7e8a0d07522f591dfee9bc9fcd7c05466763161e6cb0117906655bce1750b2fa", "iso_checksum_type": "sha256", "iso_name": "ubuntu-19.04-server-amd64.iso", diff --git a/packer_templates/windows/windows-10.json b/packer_templates/windows/windows-10.json index 48195c999..696000360 100644 --- a/packer_templates/windows/windows-10.json +++ b/packer_templates/windows/windows-10.json @@ -8,6 +8,7 @@ "memory": "{{ user `memory` }}", "cpus": "{{ user `cpus` }}", "guest_additions_mode": "{{ user `guest_additions_mode` }}", + "guest_additions_url": "{{ user `guest_additions_url` }}", "guest_additions_path": "C:/users/vagrant/VBoxGuestAdditions.iso", "guest_os_type": "Windows10_64", "hard_drive_interface": "sata", @@ -109,6 +110,7 @@ "memory": "4096", "cpus": "2", "guest_additions_mode": "attach", + "guest_additions_url": "", "headless": "true", "iso_checksum": "743fc483bb8bf1901c0534a0ae15208a5a72a3c5", "iso_url": "https://software-download.microsoft.com/download/pr/18362.30.190401-1528.19h1_release_svc_refresh_CLIENTENTERPRISEEVAL_OEMRET_x64FRE_en-us.iso", diff --git a/packer_templates/windows/windows-2008r2.json b/packer_templates/windows/windows-2008r2.json index 9d1dcfc21..e69e9b189 100644 --- a/packer_templates/windows/windows-2008r2.json +++ b/packer_templates/windows/windows-2008r2.json @@ -7,6 +7,7 @@ "memory": "{{ user `memory` }}", "cpus": "{{ user `cpus` }}", "guest_additions_mode": "{{ user `guest_additions_mode` }}", + "guest_additions_url": "{{ user `guest_additions_url` }}", "guest_additions_path": "C:/users/vagrant/VBoxGuestAdditions.iso", "guest_os_type": "Windows2008_64", "headless": "{{ user `headless` }}", @@ -75,6 +76,7 @@ "memory": "4096", "cpus": "2", "guest_additions_mode": "attach", + "guest_additions_url": "", "headless": "false", "iso_checksum": "beed231a34e90e1dd9a04b3afabec31d62ce3889", "iso_url": "http://download.microsoft.com/download/7/5/E/75EC4E54-5B02-42D6-8879-D8D3A25FBEF7/7601.17514.101119-1850_x64fre_server_eval_en-us-GRMSXEVAL_EN_DVD.iso", diff --git a/packer_templates/windows/windows-2012r2.json b/packer_templates/windows/windows-2012r2.json index 79557554d..7731f5014 100644 --- a/packer_templates/windows/windows-2012r2.json +++ b/packer_templates/windows/windows-2012r2.json @@ -7,6 +7,7 @@ "memory": "{{ user `memory` }}", "cpus": "{{ user `cpus` }}", "guest_additions_mode": "{{ user `guest_additions_mode` }}", + "guest_additions_url": "{{ user `guest_additions_url` }}", "guest_additions_path": "C:/users/vagrant/VBoxGuestAdditions.iso", "guest_os_type": "Windows2012_64", "headless": "{{ user `headless` }}", @@ -104,6 +105,7 @@ "cpus": "2", "memory": "4096", "guest_additions_mode": "attach", + "guest_additions_url": "", "headless": "true", "iso_checksum": "849734f37346385dac2c101e4aacba4626bb141c", "iso_url": "http://download.microsoft.com/download/6/2/A/62A76ABB-9990-4EFC-A4FE-C7D698DAEB96/9600.17050.WINBLUE_REFRESH.140317-1640_X64FRE_SERVER_EVAL_EN-US-IR3_SSS_X64FREE_EN-US_DV9.ISO", diff --git a/packer_templates/windows/windows-2016.json b/packer_templates/windows/windows-2016.json index 503534317..f84d04305 100644 --- a/packer_templates/windows/windows-2016.json +++ b/packer_templates/windows/windows-2016.json @@ -7,6 +7,7 @@ "memory": "{{ user `memory` }}", "cpus": "{{ user `cpus` }}", "guest_additions_mode": "{{ user `guest_additions_mode` }}", + "guest_additions_url": "{{ user `guest_additions_url` }}", "guest_additions_path": "C:/users/vagrant/VBoxGuestAdditions.iso", "guest_os_type": "Windows2016_64", "headless": "{{ user `headless` }}", @@ -104,6 +105,7 @@ "memory": "4096", "cpus": "2", "guest_additions_mode": "attach", + "guest_additions_url": "", "headless": "true", "iso_checksum": "772700802951b36c8cb26a61c040b9a8dc3816a3", "iso_url": "https://software-download.microsoft.com/download/pr/Windows_Server_2016_Datacenter_EVAL_en-us_14393_refresh.ISO", diff --git a/packer_templates/windows/windows-2019.json b/packer_templates/windows/windows-2019.json index ab874ec76..d2bceb4de 100644 --- a/packer_templates/windows/windows-2019.json +++ b/packer_templates/windows/windows-2019.json @@ -7,6 +7,7 @@ "memory": "{{ user `memory` }}", "cpus": "{{ user `cpus` }}", "guest_additions_mode": "{{ user `guest_additions_mode` }}", + "guest_additions_url": "{{ user `guest_additions_url` }}", "guest_additions_path": "C:/users/vagrant/VBoxGuestAdditions.iso", "guest_os_type": "Windows2016_64", "headless": "{{ user `headless` }}", @@ -104,6 +105,7 @@ "memory": "4096", "cpus": "2", "guest_additions_mode": "attach", + "guest_additions_url": "", "headless": "true", "iso_checksum": "91e3a2f1acc39af21353c7cc105c799494d7539f", "iso_url": "https://software-download.microsoft.com/download/sg/17763.253.190108-0006.rs5_release_svc_refresh_SERVER_EVAL_x64FRE_en-us.iso", diff --git a/packer_templates/windows/windows-7.json b/packer_templates/windows/windows-7.json index 081348590..f27cee767 100644 --- a/packer_templates/windows/windows-7.json +++ b/packer_templates/windows/windows-7.json @@ -7,6 +7,7 @@ "memory": "{{ user `memory` }}", "cpus": "{{ user `cpus` }}", "guest_additions_mode": "{{ user `guest_additions_mode` }}", + "guest_additions_url": "{{ user `guest_additions_url` }}", "guest_additions_path": "C:/users/vagrant/VBoxGuestAdditions.iso", "guest_os_type": "Windows7_64", "headless": "{{ user `headless` }}", @@ -82,6 +83,7 @@ "memory": "4096", "cpus": "2", "guest_additions_mode": "attach", + "guest_additions_url": "", "headless": "false", "iso_checksum": "971fc00183a52c152fe924a6b99fdec011a871c2", "iso_url": "http://care.dlservice.microsoft.com/dl/download/evalx/win7/x86/EN/7600.16385.090713-1255_x86fre_enterprise_en-us_EVAL_Eval_Enterprise-GRMCENEVAL_EN_DVD.iso", From ac5b43d0756c09d5e4825bede246faf6d4ae67dd Mon Sep 17 00:00:00 2001 From: Ali Rizvi-Santiago <arizvisa@gmail.com> Date: Thu, 31 Oct 2019 15:10:46 -0500 Subject: [PATCH 1053/1622] Updated all templates to use the "template_dir" packer variable to describe relative paths to scripts, sources, and http_directories. Signed-off-by: Ali Rizvi-Santiago <arizvisa@gmail.com> --- .../amazonlinux/amazon-2-x86_64.json | 20 +++++------ packer_templates/centos/centos-5.11-i386.json | 34 +++++++++--------- .../centos/centos-5.11-x86_64.json | 34 +++++++++--------- packer_templates/centos/centos-6.10-i386.json | 32 ++++++++--------- .../centos/centos-6.10-x86_64.json | 32 ++++++++--------- .../centos/centos-7.7-x86_64.json | 32 ++++++++--------- .../centos/centos-8.0-x86_64.json | 32 ++++++++--------- .../debian/debian-10.1-amd64.json | 32 ++++++++--------- packer_templates/debian/debian-10.1-i386.json | 32 ++++++++--------- .../debian/debian-8.11-amd64.json | 32 ++++++++--------- packer_templates/debian/debian-8.11-i386.json | 32 ++++++++--------- .../debian/debian-9.11-amd64.json | 32 ++++++++--------- packer_templates/debian/debian-9.11-i386.json | 32 ++++++++--------- .../debian/debian-9.11-ppc64el.json | 26 +++++++------- packer_templates/fedora/fedora-29-x86_64.json | 34 +++++++++--------- packer_templates/fedora/fedora-30-x86_64.json | 36 +++++++++---------- packer_templates/fedora/fedora-31-x86_64.json | 36 +++++++++---------- .../freebsd/freebsd-11.3-amd64.json | 22 ++++++------ .../freebsd/freebsd-11.3-i386.json | 22 ++++++------ .../freebsd/freebsd-12.0-amd64.json | 22 ++++++------ .../freebsd/freebsd-12.0-i386.json | 22 ++++++------ .../hardenedbsd/hardenedbsd-11-amd64.json | 21 ++++++----- packer_templates/macos/macos-10.12.json | 20 +++++------ packer_templates/macos/macosx-10.11.json | 20 +++++------ .../opensuse/opensuse-leap-15.1-x86_64.json | 36 +++++++++---------- .../oraclelinux/oracle-5.11-i386.json | 27 +++++++------- .../oraclelinux/oracle-5.11-x86_64.json | 27 +++++++------- .../oraclelinux/oracle-6.10-i386.json | 28 +++++++-------- .../oraclelinux/oracle-6.10-x86_64.json | 28 +++++++-------- .../oraclelinux/oracle-7.7-x86_64.json | 28 +++++++-------- packer_templates/rhel/rhel-5.11-i386.json | 24 ++++++------- packer_templates/rhel/rhel-5.11-x86_64.json | 24 ++++++------- packer_templates/rhel/rhel-6.10-i386.json | 26 +++++++------- packer_templates/rhel/rhel-6.10-x86_64.json | 26 +++++++------- packer_templates/rhel/rhel-7.6-x86_64.json | 26 +++++++------- packer_templates/rhel/rhel-8.0-x86_64.json | 26 +++++++------- .../scientific-7.7-x86_64.json | 18 +++++----- packer_templates/sles/sles-11-sp4-x86_64.json | 30 ++++++++-------- packer_templates/sles/sles-12-sp2-x86_64.json | 32 ++++++++--------- packer_templates/sles/sles-12-sp3-x86_64.json | 32 ++++++++--------- packer_templates/sles/sles-15-sp1.json | 32 ++++++++--------- packer_templates/sles/sles-15.json | 32 ++++++++--------- .../solaris/solaris-10.11-x86.json | 28 +++++++-------- packer_templates/solaris/solaris-11-x86.json | 12 +++---- .../ubuntu/ubuntu-16.04-amd64.json | 34 +++++++++--------- .../ubuntu/ubuntu-16.04-i386.json | 30 ++++++++-------- .../ubuntu/ubuntu-18.04-amd64.json | 34 +++++++++--------- .../ubuntu/ubuntu-18.10-amd64.json | 34 +++++++++--------- .../ubuntu/ubuntu-19.04-amd64.json | 34 +++++++++--------- packer_templates/windows/windows-10.json | 8 ++--- packer_templates/windows/windows-2008r2.json | 4 +-- packer_templates/windows/windows-2012r2.json | 6 ++-- packer_templates/windows/windows-2016.json | 6 ++-- packer_templates/windows/windows-2019.json | 6 ++-- packer_templates/windows/windows-7.json | 4 +-- 55 files changed, 714 insertions(+), 717 deletions(-) diff --git a/packer_templates/amazonlinux/amazon-2-x86_64.json b/packer_templates/amazonlinux/amazon-2-x86_64.json index e77603769..8341279f9 100644 --- a/packer_templates/amazonlinux/amazon-2-x86_64.json +++ b/packer_templates/amazonlinux/amazon-2-x86_64.json @@ -3,13 +3,13 @@ { "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "headless": "{{ user `headless` }}", - "http_directory": "http", + "http_directory": "{{template_dir}}/http", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-virtualbox", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_wait_timeout": "10000s", "ssh_port": 22, "type": "virtualbox-ovf", - "source_path": "amazon2.ovf", + "source_path": "{{template_dir}}/amazon2.ovf", "ssh_username": "vagrant", "ssh_password": "vagrant", "vboxmanage": [ @@ -47,14 +47,14 @@ "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", "expect_disconnect": true, "scripts": [ - "scripts/update.sh", - "../_common/motd.sh", - "../_common/sshd.sh", - "scripts/networking.sh", - "../_common/vagrant.sh", - "../_common/virtualbox.sh", - "scripts/cleanup.sh", - "../_common/minimize.sh" + "{{template_dir}}/scripts/update.sh", + "{{template_dir}}/../_common/motd.sh", + "{{template_dir}}/../_common/sshd.sh", + "{{template_dir}}/scripts/networking.sh", + "{{template_dir}}/../_common/vagrant.sh", + "{{template_dir}}/../_common/virtualbox.sh", + "{{template_dir}}/scripts/cleanup.sh", + "{{template_dir}}/../_common/minimize.sh" ], "type": "shell" } diff --git a/packer_templates/centos/centos-5.11-i386.json b/packer_templates/centos/centos-5.11-i386.json index 01d4fbd23..869593277 100644 --- a/packer_templates/centos/centos-5.11-i386.json +++ b/packer_templates/centos/centos-5.11-i386.json @@ -11,7 +11,7 @@ "guest_os_type": "RedHat", "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", - "http_directory": "http", + "http_directory": "{{template_dir}}/http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -35,7 +35,7 @@ "disk_size": "{{user `disk_size`}}", "guest_os_type": "centos", "headless": "{{ user `headless` }}", - "http_directory": "http", + "http_directory": "{{template_dir}}/http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -62,7 +62,7 @@ "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", "guest_os_type": "centos", - "http_directory": "http", + "http_directory": "{{template_dir}}/http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -87,11 +87,11 @@ "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "floppy_files": [ - "../centos/http/{{user `ks_path`}}" + "{{template_dir}}/http/{{user `ks_path`}}" ], "generation": "{{user `hyperv_generation`}}", "guest_additions_mode": "disable", - "http_directory": "http", + "http_directory": "{{template_dir}}/http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -115,7 +115,7 @@ "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", - "http_directory": "http", + "http_directory": "{{template_dir}}/http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -146,17 +146,17 @@ "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", "expect_disconnect": true, "scripts": [ - "scripts/enable_vault.sh", - "scripts/update.sh", - "../_common/motd.sh", - "../_common/sshd.sh", - "scripts/networking.sh", - "../_common/vagrant.sh", - "../_common/virtualbox.sh", - "../_common/vmware.sh", - "../_common/parallels.sh", - "scripts/cleanup.sh", - "../_common/minimize.sh" + "{{template_dir}}/scripts/enable_vault.sh", + "{{template_dir}}/scripts/update.sh", + "{{template_dir}}/../_common/motd.sh", + "{{template_dir}}/../_common/sshd.sh", + "{{template_dir}}/scripts/networking.sh", + "{{template_dir}}/../_common/vagrant.sh", + "{{template_dir}}/../_common/virtualbox.sh", + "{{template_dir}}/../_common/vmware.sh", + "{{template_dir}}/../_common/parallels.sh", + "{{template_dir}}/scripts/cleanup.sh", + "{{template_dir}}/../_common/minimize.sh" ], "type": "shell" } diff --git a/packer_templates/centos/centos-5.11-x86_64.json b/packer_templates/centos/centos-5.11-x86_64.json index fe12448ea..710c11518 100644 --- a/packer_templates/centos/centos-5.11-x86_64.json +++ b/packer_templates/centos/centos-5.11-x86_64.json @@ -11,7 +11,7 @@ "guest_os_type": "RedHat_64", "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", - "http_directory": "http", + "http_directory": "{{template_dir}}/http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -35,7 +35,7 @@ "disk_size": "{{user `disk_size`}}", "guest_os_type": "centos-64", "headless": "{{ user `headless` }}", - "http_directory": "http", + "http_directory": "{{template_dir}}/http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -62,7 +62,7 @@ "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", "guest_os_type": "centos", - "http_directory": "http", + "http_directory": "{{template_dir}}/http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -87,11 +87,11 @@ "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "floppy_files": [ - "../centos/http/{{user `ks_path`}}" + "{{template_dir}}/http/{{user `ks_path`}}" ], "generation": "{{user `hyperv_generation`}}", "guest_additions_mode": "disable", - "http_directory": "http", + "http_directory": "{{template_dir}}/http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -115,7 +115,7 @@ "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", - "http_directory": "http", + "http_directory": "{{template_dir}}/http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -146,17 +146,17 @@ "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", "expect_disconnect": true, "scripts": [ - "scripts/enable_vault.sh", - "scripts/update.sh", - "../_common/motd.sh", - "../_common/sshd.sh", - "scripts/networking.sh", - "../_common/vagrant.sh", - "../_common/virtualbox.sh", - "../_common/vmware.sh", - "../_common/parallels.sh", - "scripts/cleanup.sh", - "../_common/minimize.sh" + "{{template_dir}}/scripts/enable_vault.sh", + "{{template_dir}}/scripts/update.sh", + "{{template_dir}}/../_common/motd.sh", + "{{template_dir}}/../_common/sshd.sh", + "{{template_dir}}/scripts/networking.sh", + "{{template_dir}}/../_common/vagrant.sh", + "{{template_dir}}/../_common/virtualbox.sh", + "{{template_dir}}/../_common/vmware.sh", + "{{template_dir}}/../_common/parallels.sh", + "{{template_dir}}/scripts/cleanup.sh", + "{{template_dir}}/../_common/minimize.sh" ], "type": "shell" } diff --git a/packer_templates/centos/centos-6.10-i386.json b/packer_templates/centos/centos-6.10-i386.json index 3a3cb31df..3cba32388 100644 --- a/packer_templates/centos/centos-6.10-i386.json +++ b/packer_templates/centos/centos-6.10-i386.json @@ -11,7 +11,7 @@ "guest_os_type": "RedHat", "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", - "http_directory": "http", + "http_directory": "{{template_dir}}/http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -35,7 +35,7 @@ "disk_size": "{{user `disk_size`}}", "guest_os_type": "centos", "headless": "{{ user `headless` }}", - "http_directory": "http", + "http_directory": "{{template_dir}}/http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -62,7 +62,7 @@ "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", "guest_os_type": "centos", - "http_directory": "http", + "http_directory": "{{template_dir}}/http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -87,11 +87,11 @@ "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "floppy_files": [ - "../centos/http/{{user `ks_path`}}" + "{{template_dir}}/http/{{user `ks_path`}}" ], "generation": "{{user `hyperv_generation`}}", "guest_additions_mode": "disable", - "http_directory": "http", + "http_directory": "{{template_dir}}/http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -115,7 +115,7 @@ "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", - "http_directory": "http", + "http_directory": "{{template_dir}}/http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -146,16 +146,16 @@ "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", "expect_disconnect": true, "scripts": [ - "scripts/update.sh", - "../_common/motd.sh", - "../_common/sshd.sh", - "scripts/networking.sh", - "../_common/vagrant.sh", - "../_common/virtualbox.sh", - "../_common/vmware.sh", - "../_common/parallels.sh", - "scripts/cleanup.sh", - "../_common/minimize.sh" + "{{template_dir}}/scripts/update.sh", + "{{template_dir}}/../_common/motd.sh", + "{{template_dir}}/../_common/sshd.sh", + "{{template_dir}}/scripts/networking.sh", + "{{template_dir}}/../_common/vagrant.sh", + "{{template_dir}}/../_common/virtualbox.sh", + "{{template_dir}}/../_common/vmware.sh", + "{{template_dir}}/../_common/parallels.sh", + "{{template_dir}}/scripts/cleanup.sh", + "{{template_dir}}/../_common/minimize.sh" ], "type": "shell" } diff --git a/packer_templates/centos/centos-6.10-x86_64.json b/packer_templates/centos/centos-6.10-x86_64.json index 0586cdc65..af3be1fe2 100644 --- a/packer_templates/centos/centos-6.10-x86_64.json +++ b/packer_templates/centos/centos-6.10-x86_64.json @@ -11,7 +11,7 @@ "guest_os_type": "RedHat_64", "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", - "http_directory": "http", + "http_directory": "{{template_dir}}/http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -35,7 +35,7 @@ "disk_size": "{{user `disk_size`}}", "guest_os_type": "centos-64", "headless": "{{ user `headless` }}", - "http_directory": "http", + "http_directory": "{{template_dir}}/http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -62,7 +62,7 @@ "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", "guest_os_type": "centos", - "http_directory": "http", + "http_directory": "{{template_dir}}/http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -87,11 +87,11 @@ "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "floppy_files": [ - "../centos/http/{{user `ks_path`}}" + "{{template_dir}}/http/{{user `ks_path`}}" ], "generation": "{{user `hyperv_generation`}}", "guest_additions_mode": "disable", - "http_directory": "http", + "http_directory": "{{template_dir}}/http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -115,7 +115,7 @@ "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", - "http_directory": "http", + "http_directory": "{{template_dir}}/http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -146,16 +146,16 @@ "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", "expect_disconnect": true, "scripts": [ - "scripts/update.sh", - "../_common/motd.sh", - "../_common/sshd.sh", - "scripts/networking.sh", - "../_common/vagrant.sh", - "../_common/virtualbox.sh", - "../_common/vmware.sh", - "../_common/parallels.sh", - "scripts/cleanup.sh", - "../_common/minimize.sh" + "{{template_dir}}/scripts/update.sh", + "{{template_dir}}/../_common/motd.sh", + "{{template_dir}}/../_common/sshd.sh", + "{{template_dir}}/scripts/networking.sh", + "{{template_dir}}/../_common/vagrant.sh", + "{{template_dir}}/../_common/virtualbox.sh", + "{{template_dir}}/../_common/vmware.sh", + "{{template_dir}}/../_common/parallels.sh", + "{{template_dir}}/scripts/cleanup.sh", + "{{template_dir}}/../_common/minimize.sh" ], "type": "shell" } diff --git a/packer_templates/centos/centos-7.7-x86_64.json b/packer_templates/centos/centos-7.7-x86_64.json index 5cebc1d27..70a63af74 100644 --- a/packer_templates/centos/centos-7.7-x86_64.json +++ b/packer_templates/centos/centos-7.7-x86_64.json @@ -11,7 +11,7 @@ "guest_os_type": "RedHat_64", "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", - "http_directory": "http", + "http_directory": "{{template_dir}}/http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -35,7 +35,7 @@ "disk_size": "{{user `disk_size`}}", "guest_os_type": "centos-64", "headless": "{{ user `headless` }}", - "http_directory": "http", + "http_directory": "{{template_dir}}/http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -62,7 +62,7 @@ "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", "guest_os_type": "centos", - "http_directory": "http", + "http_directory": "{{template_dir}}/http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -87,11 +87,11 @@ "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "floppy_files": [ - "http/7/ks.cfg" + "{{template_dir}}/http/7/ks.cfg" ], "generation": "{{user `hyperv_generation`}}", "guest_additions_mode": "disable", - "http_directory": "http", + "http_directory": "{{template_dir}}/http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -115,7 +115,7 @@ "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", - "http_directory": "http", + "http_directory": "{{template_dir}}/http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -146,16 +146,16 @@ "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", "expect_disconnect": true, "scripts": [ - "scripts/update.sh", - "../_common/motd.sh", - "../_common/sshd.sh", - "scripts/networking.sh", - "../_common/vagrant.sh", - "../_common/virtualbox.sh", - "../_common/vmware.sh", - "../_common/parallels.sh", - "scripts/cleanup.sh", - "../_common/minimize.sh" + "{{template_dir}}/scripts/update.sh", + "{{template_dir}}/../_common/motd.sh", + "{{template_dir}}/../_common/sshd.sh", + "{{template_dir}}/scripts/networking.sh", + "{{template_dir}}/../_common/vagrant.sh", + "{{template_dir}}/../_common/virtualbox.sh", + "{{template_dir}}/../_common/vmware.sh", + "{{template_dir}}/../_common/parallels.sh", + "{{template_dir}}/scripts/cleanup.sh", + "{{template_dir}}/../_common/minimize.sh" ], "type": "shell" } diff --git a/packer_templates/centos/centos-8.0-x86_64.json b/packer_templates/centos/centos-8.0-x86_64.json index cb52ced7d..84c88bf63 100644 --- a/packer_templates/centos/centos-8.0-x86_64.json +++ b/packer_templates/centos/centos-8.0-x86_64.json @@ -11,7 +11,7 @@ "guest_os_type": "RedHat_64", "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", - "http_directory": "http", + "http_directory": "{{template_dir}}/http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -35,7 +35,7 @@ "disk_size": "{{user `disk_size`}}", "guest_os_type": "centos-64", "headless": "{{ user `headless` }}", - "http_directory": "http", + "http_directory": "{{template_dir}}/http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -62,7 +62,7 @@ "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", "guest_os_type": "centos", - "http_directory": "http", + "http_directory": "{{template_dir}}/http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -87,11 +87,11 @@ "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "floppy_files": [ - "http/8/ks.cfg" + "{{template_dir}}/http/8/ks.cfg" ], "generation": "{{user `hyperv_generation`}}", "guest_additions_mode": "disable", - "http_directory": "http", + "http_directory": "{{template_dir}}/http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -115,7 +115,7 @@ "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", - "http_directory": "http", + "http_directory": "{{template_dir}}/http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -146,16 +146,16 @@ "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", "expect_disconnect": true, "scripts": [ - "scripts/update.sh", - "../_common/motd.sh", - "../_common/sshd.sh", - "scripts/networking.sh", - "../_common/vagrant.sh", - "../_common/virtualbox.sh", - "../_common/vmware.sh", - "../_common/parallels.sh", - "scripts/cleanup.sh", - "../_common/minimize.sh" + "{{template_dir}}/scripts/update.sh", + "{{template_dir}}/../_common/motd.sh", + "{{template_dir}}/../_common/sshd.sh", + "{{template_dir}}/scripts/networking.sh", + "{{template_dir}}/../_common/vagrant.sh", + "{{template_dir}}/../_common/virtualbox.sh", + "{{template_dir}}/../_common/vmware.sh", + "{{template_dir}}/../_common/parallels.sh", + "{{template_dir}}/scripts/cleanup.sh", + "{{template_dir}}/../_common/minimize.sh" ], "type": "shell" } diff --git a/packer_templates/debian/debian-10.1-amd64.json b/packer_templates/debian/debian-10.1-amd64.json index 257a58db4..20f0860a5 100644 --- a/packer_templates/debian/debian-10.1-amd64.json +++ b/packer_templates/debian/debian-10.1-amd64.json @@ -26,7 +26,7 @@ "guest_os_type": "Debian_64", "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", - "http_directory": "http", + "http_directory": "{{template_dir}}/http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -65,7 +65,7 @@ "disk_size": "{{user `disk_size`}}", "guest_os_type": "debian8-64", "headless": "{{ user `headless` }}", - "http_directory": "http", + "http_directory": "{{template_dir}}/http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -108,7 +108,7 @@ "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", "guest_os_type": "debian", - "http_directory": "http", + "http_directory": "{{template_dir}}/http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -149,7 +149,7 @@ "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", - "http_directory": "http", + "http_directory": "{{template_dir}}/http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -180,18 +180,18 @@ "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", "expect_disconnect": true, "scripts": [ - "scripts/update.sh", - "../_common/motd.sh", - "../_common/sshd.sh", - "scripts/networking.sh", - "scripts/sudoers.sh", - "../_common/vagrant.sh", - "scripts/systemd.sh", - "../_common/virtualbox.sh", - "../_common/vmware.sh", - "../_common/parallels.sh", - "scripts/cleanup.sh", - "../_common/minimize.sh" + "{{template_dir}}/scripts/update.sh", + "{{template_dir}}/../_common/motd.sh", + "{{template_dir}}/../_common/sshd.sh", + "{{template_dir}}/scripts/networking.sh", + "{{template_dir}}/scripts/sudoers.sh", + "{{template_dir}}/../_common/vagrant.sh", + "{{template_dir}}/scripts/systemd.sh", + "{{template_dir}}/../_common/virtualbox.sh", + "{{template_dir}}/../_common/vmware.sh", + "{{template_dir}}/../_common/parallels.sh", + "{{template_dir}}/scripts/cleanup.sh", + "{{template_dir}}/../_common/minimize.sh" ], "type": "shell" } diff --git a/packer_templates/debian/debian-10.1-i386.json b/packer_templates/debian/debian-10.1-i386.json index ec198e364..37d217949 100644 --- a/packer_templates/debian/debian-10.1-i386.json +++ b/packer_templates/debian/debian-10.1-i386.json @@ -26,7 +26,7 @@ "guest_os_type": "Debian", "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", - "http_directory": "http", + "http_directory": "{{template_dir}}/http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -65,7 +65,7 @@ "disk_size": "{{user `disk_size`}}", "guest_os_type": "debian8", "headless": "{{ user `headless` }}", - "http_directory": "http", + "http_directory": "{{template_dir}}/http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -108,7 +108,7 @@ "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", "guest_os_type": "debian", - "http_directory": "http", + "http_directory": "{{template_dir}}/http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -149,7 +149,7 @@ "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", - "http_directory": "http", + "http_directory": "{{template_dir}}/http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -180,18 +180,18 @@ "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", "expect_disconnect": true, "scripts": [ - "scripts/update.sh", - "../_common/motd.sh", - "../_common/sshd.sh", - "scripts/networking.sh", - "scripts/sudoers.sh", - "../_common/vagrant.sh", - "scripts/systemd.sh", - "../_common/virtualbox.sh", - "../_common/vmware.sh", - "../_common/parallels.sh", - "scripts/cleanup.sh", - "../_common/minimize.sh" + "{{template_dir}}/scripts/update.sh", + "{{template_dir}}/../_common/motd.sh", + "{{template_dir}}/../_common/sshd.sh", + "{{template_dir}}/scripts/networking.sh", + "{{template_dir}}/scripts/sudoers.sh", + "{{template_dir}}/../_common/vagrant.sh", + "{{template_dir}}/scripts/systemd.sh", + "{{template_dir}}/../_common/virtualbox.sh", + "{{template_dir}}/../_common/vmware.sh", + "{{template_dir}}/../_common/parallels.sh", + "{{template_dir}}/scripts/cleanup.sh", + "{{template_dir}}/../_common/minimize.sh" ], "type": "shell" } diff --git a/packer_templates/debian/debian-8.11-amd64.json b/packer_templates/debian/debian-8.11-amd64.json index f3a1a38c9..3044c5da1 100644 --- a/packer_templates/debian/debian-8.11-amd64.json +++ b/packer_templates/debian/debian-8.11-amd64.json @@ -26,7 +26,7 @@ "guest_os_type": "Debian_64", "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", - "http_directory": "http", + "http_directory": "{{template_dir}}/http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -65,7 +65,7 @@ "disk_size": "{{user `disk_size`}}", "guest_os_type": "debian8-64", "headless": "{{ user `headless` }}", - "http_directory": "http", + "http_directory": "{{template_dir}}/http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -108,7 +108,7 @@ "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", "guest_os_type": "debian", - "http_directory": "http", + "http_directory": "{{template_dir}}/http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -149,7 +149,7 @@ "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", - "http_directory": "http", + "http_directory": "{{template_dir}}/http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -180,18 +180,18 @@ "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", "expect_disconnect": true, "scripts": [ - "scripts/update.sh", - "../_common/motd.sh", - "../_common/sshd.sh", - "scripts/networking.sh", - "scripts/sudoers.sh", - "../_common/vagrant.sh", - "scripts/systemd.sh", - "../_common/virtualbox.sh", - "../_common/vmware.sh", - "../_common/parallels.sh", - "scripts/cleanup.sh", - "../_common/minimize.sh" + "{{template_dir}}/scripts/update.sh", + "{{template_dir}}/../_common/motd.sh", + "{{template_dir}}/../_common/sshd.sh", + "{{template_dir}}/scripts/networking.sh", + "{{template_dir}}/scripts/sudoers.sh", + "{{template_dir}}/../_common/vagrant.sh", + "{{template_dir}}/scripts/systemd.sh", + "{{template_dir}}/../_common/virtualbox.sh", + "{{template_dir}}/../_common/vmware.sh", + "{{template_dir}}/../_common/parallels.sh", + "{{template_dir}}/scripts/cleanup.sh", + "{{template_dir}}/../_common/minimize.sh" ], "type": "shell" } diff --git a/packer_templates/debian/debian-8.11-i386.json b/packer_templates/debian/debian-8.11-i386.json index 71c68c0ca..3b06366ae 100644 --- a/packer_templates/debian/debian-8.11-i386.json +++ b/packer_templates/debian/debian-8.11-i386.json @@ -26,7 +26,7 @@ "guest_os_type": "Debian", "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", - "http_directory": "http", + "http_directory": "{{template_dir}}/http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -65,7 +65,7 @@ "disk_size": "{{user `disk_size`}}", "guest_os_type": "debian8", "headless": "{{ user `headless` }}", - "http_directory": "http", + "http_directory": "{{template_dir}}/http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -108,7 +108,7 @@ "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", "guest_os_type": "debian", - "http_directory": "http", + "http_directory": "{{template_dir}}/http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -149,7 +149,7 @@ "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", - "http_directory": "http", + "http_directory": "{{template_dir}}/http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -180,18 +180,18 @@ "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", "expect_disconnect": true, "scripts": [ - "scripts/update.sh", - "../_common/motd.sh", - "../_common/sshd.sh", - "scripts/networking.sh", - "scripts/sudoers.sh", - "../_common/vagrant.sh", - "scripts/systemd.sh", - "../_common/virtualbox.sh", - "../_common/vmware.sh", - "../_common/parallels.sh", - "scripts/cleanup.sh", - "../_common/minimize.sh" + "{{template_dir}}/scripts/update.sh", + "{{template_dir}}/../_common/motd.sh", + "{{template_dir}}/../_common/sshd.sh", + "{{template_dir}}/scripts/networking.sh", + "{{template_dir}}/scripts/sudoers.sh", + "{{template_dir}}/../_common/vagrant.sh", + "{{template_dir}}/scripts/systemd.sh", + "{{template_dir}}/../_common/virtualbox.sh", + "{{template_dir}}/../_common/vmware.sh", + "{{template_dir}}/../_common/parallels.sh", + "{{template_dir}}/scripts/cleanup.sh", + "{{template_dir}}/../_common/minimize.sh" ], "type": "shell" } diff --git a/packer_templates/debian/debian-9.11-amd64.json b/packer_templates/debian/debian-9.11-amd64.json index b940c085a..7ec9f1f9e 100644 --- a/packer_templates/debian/debian-9.11-amd64.json +++ b/packer_templates/debian/debian-9.11-amd64.json @@ -26,7 +26,7 @@ "guest_os_type": "Debian_64", "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", - "http_directory": "http", + "http_directory": "{{template_dir}}/http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -65,7 +65,7 @@ "disk_size": "{{user `disk_size`}}", "guest_os_type": "debian8-64", "headless": "{{ user `headless` }}", - "http_directory": "http", + "http_directory": "{{template_dir}}/http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -108,7 +108,7 @@ "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", "guest_os_type": "debian", - "http_directory": "http", + "http_directory": "{{template_dir}}/http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -149,7 +149,7 @@ "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", - "http_directory": "http", + "http_directory": "{{template_dir}}/http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -180,18 +180,18 @@ "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", "expect_disconnect": true, "scripts": [ - "scripts/update.sh", - "../_common/motd.sh", - "../_common/sshd.sh", - "scripts/networking.sh", - "scripts/sudoers.sh", - "../_common/vagrant.sh", - "scripts/systemd.sh", - "../_common/virtualbox.sh", - "../_common/vmware.sh", - "../_common/parallels.sh", - "scripts/cleanup.sh", - "../_common/minimize.sh" + "{{template_dir}}/scripts/update.sh", + "{{template_dir}}/../_common/motd.sh", + "{{template_dir}}/../_common/sshd.sh", + "{{template_dir}}/scripts/networking.sh", + "{{template_dir}}/scripts/sudoers.sh", + "{{template_dir}}/../_common/vagrant.sh", + "{{template_dir}}/scripts/systemd.sh", + "{{template_dir}}/../_common/virtualbox.sh", + "{{template_dir}}/../_common/vmware.sh", + "{{template_dir}}/../_common/parallels.sh", + "{{template_dir}}/scripts/cleanup.sh", + "{{template_dir}}/../_common/minimize.sh" ], "type": "shell" } diff --git a/packer_templates/debian/debian-9.11-i386.json b/packer_templates/debian/debian-9.11-i386.json index acf96954b..f29e8cb9f 100644 --- a/packer_templates/debian/debian-9.11-i386.json +++ b/packer_templates/debian/debian-9.11-i386.json @@ -26,7 +26,7 @@ "guest_os_type": "Debian", "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", - "http_directory": "http", + "http_directory": "{{template_dir}}/http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -65,7 +65,7 @@ "disk_size": "{{user `disk_size`}}", "guest_os_type": "debian8", "headless": "{{ user `headless` }}", - "http_directory": "http", + "http_directory": "{{template_dir}}/http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -108,7 +108,7 @@ "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", "guest_os_type": "debian", - "http_directory": "http", + "http_directory": "{{template_dir}}/http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -149,7 +149,7 @@ "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", - "http_directory": "http", + "http_directory": "{{template_dir}}/http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -180,18 +180,18 @@ "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", "expect_disconnect": true, "scripts": [ - "scripts/update.sh", - "../_common/motd.sh", - "../_common/sshd.sh", - "scripts/networking.sh", - "scripts/sudoers.sh", - "../_common/vagrant.sh", - "scripts/systemd.sh", - "../_common/virtualbox.sh", - "../_common/vmware.sh", - "../_common/parallels.sh", - "scripts/cleanup.sh", - "../_common/minimize.sh" + "{{template_dir}}/scripts/update.sh", + "{{template_dir}}/../_common/motd.sh", + "{{template_dir}}/../_common/sshd.sh", + "{{template_dir}}/scripts/networking.sh", + "{{template_dir}}/scripts/sudoers.sh", + "{{template_dir}}/../_common/vagrant.sh", + "{{template_dir}}/scripts/systemd.sh", + "{{template_dir}}/../_common/virtualbox.sh", + "{{template_dir}}/../_common/vmware.sh", + "{{template_dir}}/../_common/parallels.sh", + "{{template_dir}}/scripts/cleanup.sh", + "{{template_dir}}/../_common/minimize.sh" ], "type": "shell" } diff --git a/packer_templates/debian/debian-9.11-ppc64el.json b/packer_templates/debian/debian-9.11-ppc64el.json index a2730adae..e19ed96df 100644 --- a/packer_templates/debian/debian-9.11-ppc64el.json +++ b/packer_templates/debian/debian-9.11-ppc64el.json @@ -29,7 +29,7 @@ "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", - "http_directory": "http", + "http_directory": "{{template_dir}}/http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -64,18 +64,18 @@ "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", "expect_disconnect": true, "scripts": [ - "scripts/update.sh", - "../_common/motd.sh", - "../_common/sshd.sh", - "scripts/networking.sh", - "scripts/sudoers.sh", - "../_common/vagrant.sh", - "scripts/systemd.sh", - "../_common/virtualbox.sh", - "../_common/vmware.sh", - "../_common/parallels.sh", - "scripts/cleanup.sh", - "../_common/minimize.sh" + "{{template_dir}}/scripts/update.sh", + "{{template_dir}}/../_common/motd.sh", + "{{template_dir}}/../_common/sshd.sh", + "{{template_dir}}/scripts/networking.sh", + "{{template_dir}}/scripts/sudoers.sh", + "{{template_dir}}/../_common/vagrant.sh", + "{{template_dir}}/scripts/systemd.sh", + "{{template_dir}}/../_common/virtualbox.sh", + "{{template_dir}}/../_common/vmware.sh", + "{{template_dir}}/../_common/parallels.sh", + "{{template_dir}}/scripts/cleanup.sh", + "{{template_dir}}/../_common/minimize.sh" ], "type": "shell" } diff --git a/packer_templates/fedora/fedora-29-x86_64.json b/packer_templates/fedora/fedora-29-x86_64.json index 0f8b7a5f3..ee3019501 100644 --- a/packer_templates/fedora/fedora-29-x86_64.json +++ b/packer_templates/fedora/fedora-29-x86_64.json @@ -8,7 +8,7 @@ "accelerator": "kvm", "boot_wait": "10s", "boot_command": [ - "<tab> linux ks=http://{{.HTTPIP}}:{{.HTTPPort}}/{{user `ks_path`}}<enter><wait>" + "<tab> linux ks=http://{{.HTTPIP}}:{{.HTTPPort}}/{{user `ks_path`}}<enter><wait>" ], "format": "qcow2", "disk_size": "{{user `disk_size`}}", @@ -19,7 +19,7 @@ "net_device": "virtio-net", "memory": "{{ user `memory` }}", "cpus": "{{ user `cpus` }}", - "http_directory": "http", + "http_directory": "{{template_dir}}/http", "headless": "{{ user `headless` }}", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", @@ -41,7 +41,7 @@ "guest_os_type": "Fedora_64", "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", - "http_directory": "http", + "http_directory": "{{template_dir}}/http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -65,7 +65,7 @@ "disk_size": "{{user `disk_size`}}", "guest_os_type": "fedora-64", "headless": "{{ user `headless` }}", - "http_directory": "http", + "http_directory": "{{template_dir}}/http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -93,7 +93,7 @@ "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", "guest_os_type": "fedora-core", - "http_directory": "http", + "http_directory": "{{template_dir}}/http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -119,7 +119,7 @@ "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", - "http_directory": "http", + "http_directory": "{{template_dir}}/http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -150,17 +150,17 @@ "execute_command": "echo 'vagrant' | {{.Vars}} sudo -E -S bash '{{.Path}}'", "expect_disconnect": true, "scripts": [ - "scripts/swap.sh", - "scripts/fix-slow-dns.sh", - "scripts/build-tools.sh", - "../_common/motd.sh", - "../_common/sshd.sh", - "../_common/virtualbox.sh", - "../_common/vmware.sh", - "../_common/parallels.sh", - "../_common/vagrant.sh", - "scripts/cleanup.sh", - "../_common/minimize.sh" + "{{template_dir}}/scripts/swap.sh", + "{{template_dir}}/scripts/fix-slow-dns.sh", + "{{template_dir}}/scripts/build-tools.sh", + "{{template_dir}}/../_common/motd.sh", + "{{template_dir}}/../_common/sshd.sh", + "{{template_dir}}/../_common/virtualbox.sh", + "{{template_dir}}/../_common/vmware.sh", + "{{template_dir}}/../_common/parallels.sh", + "{{template_dir}}/../_common/vagrant.sh", + "{{template_dir}}/scripts/cleanup.sh", + "{{template_dir}}/../_common/minimize.sh" ], "type": "shell" } diff --git a/packer_templates/fedora/fedora-30-x86_64.json b/packer_templates/fedora/fedora-30-x86_64.json index 11792aa25..9181bb0b7 100644 --- a/packer_templates/fedora/fedora-30-x86_64.json +++ b/packer_templates/fedora/fedora-30-x86_64.json @@ -8,7 +8,7 @@ "accelerator": "kvm", "boot_wait": "10s", "boot_command": [ - "<tab> linux ks=http://{{.HTTPIP}}:{{.HTTPPort}}/{{user `ks_path`}}<enter><wait>" + "<tab> linux ks=http://{{.HTTPIP}}:{{.HTTPPort}}/{{user `ks_path`}}<enter><wait>" ], "format": "qcow2", "disk_size": "{{user `disk_size`}}", @@ -19,7 +19,7 @@ "net_device": "virtio-net", "memory": "{{ user `memory` }}", "cpus": "{{ user `cpus` }}", - "http_directory": "http", + "http_directory": "{{template_dir}}/http", "headless": "{{ user `headless` }}", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", @@ -41,7 +41,7 @@ "guest_os_type": "Fedora_64", "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", - "http_directory": "http", + "http_directory": "{{template_dir}}/http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -65,7 +65,7 @@ "disk_size": "{{user `disk_size`}}", "guest_os_type": "fedora-64", "headless": "{{ user `headless` }}", - "http_directory": "http", + "http_directory": "{{template_dir}}/http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -93,7 +93,7 @@ "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", "guest_os_type": "fedora-core", - "http_directory": "http", + "http_directory": "{{template_dir}}/http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -119,7 +119,7 @@ "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", - "http_directory": "http", + "http_directory": "{{template_dir}}/http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -150,18 +150,18 @@ "execute_command": "echo 'vagrant' | {{.Vars}} sudo -E -S bash '{{.Path}}'", "expect_disconnect": true, "scripts": [ - "scripts/swap.sh", - "scripts/fix-slow-dns.sh", - "scripts/build-tools.sh", - "scripts/install-supporting-packages.sh", - "../_common/motd.sh", - "../_common/sshd.sh", - "../_common/virtualbox.sh", - "../_common/vmware.sh", - "../_common/parallels.sh", - "../_common/vagrant.sh", - "scripts/cleanup.sh", - "../_common/minimize.sh" + "{{template_dir}}/scripts/swap.sh", + "{{template_dir}}/scripts/fix-slow-dns.sh", + "{{template_dir}}/scripts/build-tools.sh", + "{{template_dir}}/scripts/install-supporting-packages.sh", + "{{template_dir}}/../_common/motd.sh", + "{{template_dir}}/../_common/sshd.sh", + "{{template_dir}}/../_common/virtualbox.sh", + "{{template_dir}}/../_common/vmware.sh", + "{{template_dir}}/../_common/parallels.sh", + "{{template_dir}}/../_common/vagrant.sh", + "{{template_dir}}/scripts/cleanup.sh", + "{{template_dir}}/../_common/minimize.sh" ], "type": "shell" } diff --git a/packer_templates/fedora/fedora-31-x86_64.json b/packer_templates/fedora/fedora-31-x86_64.json index c0ae67797..bf5c9aa69 100644 --- a/packer_templates/fedora/fedora-31-x86_64.json +++ b/packer_templates/fedora/fedora-31-x86_64.json @@ -8,7 +8,7 @@ "accelerator": "kvm", "boot_wait": "10s", "boot_command": [ - "<tab> linux ks=http://{{.HTTPIP}}:{{.HTTPPort}}/{{user `ks_path`}}<enter><wait>" + "<tab> linux ks=http://{{.HTTPIP}}:{{.HTTPPort}}/{{user `ks_path`}}<enter><wait>" ], "format": "qcow2", "disk_size": "{{user `disk_size`}}", @@ -19,7 +19,7 @@ "net_device": "virtio-net", "memory": "{{ user `memory` }}", "cpus": "{{ user `cpus` }}", - "http_directory": "http", + "http_directory": "{{template_dir}}/http", "headless": "{{ user `headless` }}", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", @@ -41,7 +41,7 @@ "guest_os_type": "Fedora_64", "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", - "http_directory": "http", + "http_directory": "{{template_dir}}/http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -65,7 +65,7 @@ "disk_size": "{{user `disk_size`}}", "guest_os_type": "fedora-64", "headless": "{{ user `headless` }}", - "http_directory": "http", + "http_directory": "{{template_dir}}/http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -93,7 +93,7 @@ "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", "guest_os_type": "fedora-core", - "http_directory": "http", + "http_directory": "{{template_dir}}/http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -119,7 +119,7 @@ "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", - "http_directory": "http", + "http_directory": "{{template_dir}}/http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -150,18 +150,18 @@ "execute_command": "echo 'vagrant' | {{.Vars}} sudo -E -S bash '{{.Path}}'", "expect_disconnect": true, "scripts": [ - "scripts/swap.sh", - "scripts/fix-slow-dns.sh", - "scripts/build-tools.sh", - "scripts/install-supporting-packages.sh", - "../_common/motd.sh", - "../_common/sshd.sh", - "../_common/virtualbox.sh", - "../_common/vmware.sh", - "../_common/parallels.sh", - "../_common/vagrant.sh", - "scripts/cleanup.sh", - "../_common/minimize.sh" + "{{template_dir}}/scripts/swap.sh", + "{{template_dir}}/scripts/fix-slow-dns.sh", + "{{template_dir}}/scripts/build-tools.sh", + "{{template_dir}}/scripts/install-supporting-packages.sh", + "{{template_dir}}/../_common/motd.sh", + "{{template_dir}}/../_common/sshd.sh", + "{{template_dir}}/../_common/virtualbox.sh", + "{{template_dir}}/../_common/vmware.sh", + "{{template_dir}}/../_common/parallels.sh", + "{{template_dir}}/../_common/vagrant.sh", + "{{template_dir}}/scripts/cleanup.sh", + "{{template_dir}}/../_common/minimize.sh" ], "type": "shell" } diff --git a/packer_templates/freebsd/freebsd-11.3-amd64.json b/packer_templates/freebsd/freebsd-11.3-amd64.json index 8f5676ac1..75d8a5fdb 100644 --- a/packer_templates/freebsd/freebsd-11.3-amd64.json +++ b/packer_templates/freebsd/freebsd-11.3-amd64.json @@ -19,7 +19,7 @@ "guest_additions_mode": "disable", "guest_os_type": "FreeBSD_64", "headless": "{{ user `headless` }}", - "http_directory": "http", + "http_directory": "{{template_dir}}/http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -52,7 +52,7 @@ "disk_size": "{{user `disk_size`}}", "guest_os_type": "freebsd-64", "headless": "{{ user `headless` }}", - "http_directory": "http", + "http_directory": "{{template_dir}}/http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -86,7 +86,7 @@ "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "guest_os_type": "freebsd", - "http_directory": "http", + "http_directory": "{{template_dir}}/http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -140,7 +140,7 @@ "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", - "http_directory": "http", + "http_directory": "{{template_dir}}/http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -173,13 +173,13 @@ "execute_command": "echo 'vagrant' | {{.Vars}} su -m root -c 'sh -eux {{.Path}}'", "expect_disconnect": true, "scripts": [ - "scripts/update.sh", - "scripts/postinstall.sh", - "scripts/sudoers.sh", - "../_common/vagrant.sh", - "scripts/vmtools.sh", - "scripts/cleanup.sh", - "scripts/minimize.sh" + "{{template_dir}}/scripts/update.sh", + "{{template_dir}}/scripts/postinstall.sh", + "{{template_dir}}/scripts/sudoers.sh", + "{{template_dir}}/../_common/vagrant.sh", + "{{template_dir}}/scripts/vmtools.sh", + "{{template_dir}}/scripts/cleanup.sh", + "{{template_dir}}/scripts/minimize.sh" ], "type": "shell" } diff --git a/packer_templates/freebsd/freebsd-11.3-i386.json b/packer_templates/freebsd/freebsd-11.3-i386.json index 9094587be..c979171bd 100644 --- a/packer_templates/freebsd/freebsd-11.3-i386.json +++ b/packer_templates/freebsd/freebsd-11.3-i386.json @@ -19,7 +19,7 @@ "guest_additions_mode": "disable", "guest_os_type": "FreeBSD", "headless": "{{ user `headless` }}", - "http_directory": "http", + "http_directory": "{{template_dir}}/http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -52,7 +52,7 @@ "disk_size": "{{user `disk_size`}}", "guest_os_type": "freebsd", "headless": "{{ user `headless` }}", - "http_directory": "http", + "http_directory": "{{template_dir}}/http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -86,7 +86,7 @@ "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "guest_os_type": "freebsd", - "http_directory": "http", + "http_directory": "{{template_dir}}/http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -140,7 +140,7 @@ "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", - "http_directory": "http", + "http_directory": "{{template_dir}}/http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -173,13 +173,13 @@ "execute_command": "echo 'vagrant' | {{.Vars}} su -m root -c 'sh -eux {{.Path}}'", "expect_disconnect": true, "scripts": [ - "scripts/update.sh", - "scripts/postinstall.sh", - "scripts/sudoers.sh", - "../_common/vagrant.sh", - "scripts/vmtools.sh", - "scripts/cleanup.sh", - "scripts/minimize.sh" + "{{template_dir}}/scripts/update.sh", + "{{template_dir}}/scripts/postinstall.sh", + "{{template_dir}}/scripts/sudoers.sh", + "{{template_dir}}/../_common/vagrant.sh", + "{{template_dir}}/scripts/vmtools.sh", + "{{template_dir}}/scripts/cleanup.sh", + "{{template_dir}}/scripts/minimize.sh" ], "type": "shell" } diff --git a/packer_templates/freebsd/freebsd-12.0-amd64.json b/packer_templates/freebsd/freebsd-12.0-amd64.json index 1a26ebe13..609c53802 100644 --- a/packer_templates/freebsd/freebsd-12.0-amd64.json +++ b/packer_templates/freebsd/freebsd-12.0-amd64.json @@ -19,7 +19,7 @@ "guest_additions_mode": "disable", "guest_os_type": "FreeBSD_64", "headless": "{{ user `headless` }}", - "http_directory": "http", + "http_directory": "{{template_dir}}/http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -52,7 +52,7 @@ "disk_size": "{{user `disk_size`}}", "guest_os_type": "freebsd-64", "headless": "{{ user `headless` }}", - "http_directory": "http", + "http_directory": "{{template_dir}}/http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -86,7 +86,7 @@ "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "guest_os_type": "freebsd", - "http_directory": "http", + "http_directory": "{{template_dir}}/http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -140,7 +140,7 @@ "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", - "http_directory": "http", + "http_directory": "{{template_dir}}/http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -173,13 +173,13 @@ "execute_command": "echo 'vagrant' | {{.Vars}} su -m root -c 'sh -eux {{.Path}}'", "expect_disconnect": true, "scripts": [ - "scripts/update.sh", - "scripts/postinstall.sh", - "scripts/sudoers.sh", - "../_common/vagrant.sh", - "scripts/vmtools.sh", - "scripts/cleanup.sh", - "scripts/minimize.sh" + "{{template_dir}}/scripts/update.sh", + "{{template_dir}}/scripts/postinstall.sh", + "{{template_dir}}/scripts/sudoers.sh", + "{{template_dir}}/../_common/vagrant.sh", + "{{template_dir}}/scripts/vmtools.sh", + "{{template_dir}}/scripts/cleanup.sh", + "{{template_dir}}/scripts/minimize.sh" ], "type": "shell" } diff --git a/packer_templates/freebsd/freebsd-12.0-i386.json b/packer_templates/freebsd/freebsd-12.0-i386.json index a48300bac..6a0f1565f 100644 --- a/packer_templates/freebsd/freebsd-12.0-i386.json +++ b/packer_templates/freebsd/freebsd-12.0-i386.json @@ -19,7 +19,7 @@ "guest_additions_mode": "disable", "guest_os_type": "FreeBSD", "headless": "{{ user `headless` }}", - "http_directory": "http", + "http_directory": "{{template_dir}}/http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -52,7 +52,7 @@ "disk_size": "{{user `disk_size`}}", "guest_os_type": "freebsd", "headless": "{{ user `headless` }}", - "http_directory": "http", + "http_directory": "{{template_dir}}/http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -86,7 +86,7 @@ "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "guest_os_type": "freebsd", - "http_directory": "http", + "http_directory": "{{template_dir}}/http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -140,7 +140,7 @@ "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", - "http_directory": "http", + "http_directory": "{{template_dir}}/http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -173,13 +173,13 @@ "execute_command": "echo 'vagrant' | {{.Vars}} su -m root -c 'sh -eux {{.Path}}'", "expect_disconnect": true, "scripts": [ - "scripts/update.sh", - "scripts/postinstall.sh", - "scripts/sudoers.sh", - "../_common/vagrant.sh", - "scripts/vmtools.sh", - "scripts/cleanup.sh", - "scripts/minimize.sh" + "{{template_dir}}/scripts/update.sh", + "{{template_dir}}/scripts/postinstall.sh", + "{{template_dir}}/scripts/sudoers.sh", + "{{template_dir}}/../_common/vagrant.sh", + "{{template_dir}}/scripts/vmtools.sh", + "{{template_dir}}/scripts/cleanup.sh", + "{{template_dir}}/scripts/minimize.sh" ], "type": "shell" } diff --git a/packer_templates/hardenedbsd/hardenedbsd-11-amd64.json b/packer_templates/hardenedbsd/hardenedbsd-11-amd64.json index 5eaffbdc2..e044459a1 100644 --- a/packer_templates/hardenedbsd/hardenedbsd-11-amd64.json +++ b/packer_templates/hardenedbsd/hardenedbsd-11-amd64.json @@ -17,7 +17,7 @@ "guest_additions_mode": "disable", "guest_os_type": "FreeBSD_64", "headless": "{{ user `headless` }}", - "http_directory": "http", + "http_directory": "{{template_dir}}/http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -52,7 +52,7 @@ "disk_size": "{{user `disk_size`}}", "guest_os_type": "freebsd-64", "headless": "{{ user `headless` }}", - "http_directory": "http", + "http_directory": "{{template_dir}}/http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -87,7 +87,7 @@ "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "guest_os_type": "freebsd", - "http_directory": "http", + "http_directory": "{{template_dir}}/http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -141,7 +141,7 @@ "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", - "http_directory": "http", + "http_directory": "{{template_dir}}/http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -173,12 +173,12 @@ "execute_command": "echo 'vagrant' | {{.Vars}} su -m root -c 'sh -eux {{.Path}}'", "expect_disconnect": true, "scripts": [ - "scripts/update.sh", - "scripts/postinstall.sh", - "scripts/sudoers.sh", - "../_common/vagrant.sh", - "scripts/cleanup.sh", - "scripts/minimize.sh" + "{{template_dir}}/scripts/update.sh", + "{{template_dir}}/scripts/postinstall.sh", + "{{template_dir}}/scripts/sudoers.sh", + "{{template_dir}}/../_common/vagrant.sh", + "{{template_dir}}/scripts/cleanup.sh", + "{{template_dir}}/scripts/minimize.sh" ], "type": "shell" } @@ -206,4 +206,3 @@ "version": "TIMESTAMP" } } - diff --git a/packer_templates/macos/macos-10.12.json b/packer_templates/macos/macos-10.12.json index 33f15ebfe..6d321a7d9 100644 --- a/packer_templates/macos/macos-10.12.json +++ b/packer_templates/macos/macos-10.12.json @@ -182,7 +182,7 @@ "provisioners": [ { "destination": "/private/tmp/set_kcpassword.py", - "source": "scripts/support/set_kcpassword.py", + "source": "{{template_dir}}/scripts/support/set_kcpassword.py", "type": "file" }, { @@ -196,15 +196,15 @@ "execute_command": "echo 'vagrant'| {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", "expect_disconnect": true, "scripts": [ - "scripts/hostname.sh", - "scripts/update.sh", - "scripts/networking.sh", - "scripts/disablesleep.sh", - "scripts/vagrant.sh", - "scripts/autologin.sh", - "scripts/vmtools.sh", - "scripts/cleanup.sh", - "scripts/minimize.sh" + "{{template_dir}}/scripts/hostname.sh", + "{{template_dir}}/scripts/update.sh", + "{{template_dir}}/scripts/networking.sh", + "{{template_dir}}/scripts/disablesleep.sh", + "{{template_dir}}/scripts/vagrant.sh", + "{{template_dir}}/scripts/autologin.sh", + "{{template_dir}}/scripts/vmtools.sh", + "{{template_dir}}/scripts/cleanup.sh", + "{{template_dir}}/scripts/minimize.sh" ], "type": "shell" } diff --git a/packer_templates/macos/macosx-10.11.json b/packer_templates/macos/macosx-10.11.json index e36389111..cc23f69a0 100644 --- a/packer_templates/macos/macosx-10.11.json +++ b/packer_templates/macos/macosx-10.11.json @@ -182,7 +182,7 @@ "provisioners": [ { "destination": "/private/tmp/set_kcpassword.py", - "source": "scripts/support/set_kcpassword.py", + "source": "{{template_dir}}/scripts/support/set_kcpassword.py", "type": "file" }, { @@ -196,15 +196,15 @@ "execute_command": "echo 'vagrant'| {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", "expect_disconnect": true, "scripts": [ - "scripts/hostname.sh", - "scripts/update.sh", - "scripts/networking.sh", - "scripts/disablesleep.sh", - "scripts/vagrant.sh", - "scripts/autologin.sh", - "scripts/vmtools.sh", - "scripts/cleanup.sh", - "scripts/minimize.sh" + "{{template_dir}}/scripts/hostname.sh", + "{{template_dir}}/scripts/update.sh", + "{{template_dir}}/scripts/networking.sh", + "{{template_dir}}/scripts/disablesleep.sh", + "{{template_dir}}/scripts/vagrant.sh", + "{{template_dir}}/scripts/autologin.sh", + "{{template_dir}}/scripts/vmtools.sh", + "{{template_dir}}/scripts/cleanup.sh", + "{{template_dir}}/scripts/minimize.sh" ], "type": "shell" } diff --git a/packer_templates/opensuse/opensuse-leap-15.1-x86_64.json b/packer_templates/opensuse/opensuse-leap-15.1-x86_64.json index 75c3db0f2..90fb924d3 100644 --- a/packer_templates/opensuse/opensuse-leap-15.1-x86_64.json +++ b/packer_templates/opensuse/opensuse-leap-15.1-x86_64.json @@ -20,7 +20,7 @@ "guest_os_type": "OpenSUSE_64", "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", - "http_directory": "http", + "http_directory": "{{template_dir}}/http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -53,7 +53,7 @@ "disk_size": "{{user `disk_size`}}", "guest_os_type": "opensuse-64", "headless": "{{ user `headless` }}", - "http_directory": "http", + "http_directory": "{{template_dir}}/http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -89,7 +89,7 @@ "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", "guest_os_type": "opensuse", - "http_directory": "http", + "http_directory": "{{template_dir}}/http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -119,7 +119,7 @@ "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", - "http_directory": "http", + "http_directory": "{{template_dir}}/http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -150,20 +150,20 @@ "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh '{{.Path}}'", "expect_disconnect": true, "scripts": [ - "scripts/repositories.sh", - "scripts/update.sh", - "scripts/add_packages.sh", - "../_common/motd.sh", - "../_common/sshd.sh", - "../_common/vagrant.sh", - "../_common/virtualbox.sh", - "../_common/vmware.sh", - "../_common/parallels.sh", - "scripts/vagrant_group.sh", - "scripts/sudoers.sh", - "scripts/zypper-locks.sh", - "scripts/cleanup.sh", - "../_common/minimize.sh" + "{{template_dir}}/scripts/repositories.sh", + "{{template_dir}}/scripts/update.sh", + "{{template_dir}}/scripts/add_packages.sh", + "{{template_dir}}/../_common/motd.sh", + "{{template_dir}}/../_common/sshd.sh", + "{{template_dir}}/../_common/vagrant.sh", + "{{template_dir}}/../_common/virtualbox.sh", + "{{template_dir}}/../_common/vmware.sh", + "{{template_dir}}/../_common/parallels.sh", + "{{template_dir}}/scripts/vagrant_group.sh", + "{{template_dir}}/scripts/sudoers.sh", + "{{template_dir}}/scripts/zypper-locks.sh", + "{{template_dir}}/scripts/cleanup.sh", + "{{template_dir}}/../_common/minimize.sh" ], "type": "shell" } diff --git a/packer_templates/oraclelinux/oracle-5.11-i386.json b/packer_templates/oraclelinux/oracle-5.11-i386.json index 3b39345dc..429eab7ba 100644 --- a/packer_templates/oraclelinux/oracle-5.11-i386.json +++ b/packer_templates/oraclelinux/oracle-5.11-i386.json @@ -11,7 +11,7 @@ "guest_os_type": "Oracle", "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", - "http_directory": "../centos/http", + "http_directory": "{{template_dir}}/../centos/http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -35,7 +35,7 @@ "disk_size": "{{user `disk_size`}}", "guest_os_type": "oraclelinux", "headless": "{{ user `headless` }}", - "http_directory": "../centos/http", + "http_directory": "{{template_dir}}/../centos/http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -62,7 +62,7 @@ "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", "guest_os_type": "centos", - "http_directory": "../centos/http", + "http_directory": "{{template_dir}}/../centos/http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -88,7 +88,7 @@ "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", - "http_directory": "../centos/http", + "http_directory": "{{template_dir}}/../centos/http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -119,15 +119,15 @@ "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", "expect_disconnect": true, "scripts": [ - "../centos/scripts/update.sh", - "../_common/vagrant.sh", - "../_common/motd.sh", - "../_common/sshd.sh", - "../_common/virtualbox.sh", - "../_common/vmware.sh", - "../_common/parallels.sh", - "../centos/scripts/cleanup.sh", - "../_common/minimize.sh" + "{{template_dir}}/../centos/scripts/update.sh", + "{{template_dir}}/../_common/vagrant.sh", + "{{template_dir}}/../_common/motd.sh", + "{{template_dir}}/../_common/sshd.sh", + "{{template_dir}}/../_common/virtualbox.sh", + "{{template_dir}}/../_common/vmware.sh", + "{{template_dir}}/../_common/parallels.sh", + "{{template_dir}}/../centos/scripts/cleanup.sh", + "{{template_dir}}/../_common/minimize.sh" ], "type": "shell" } @@ -157,4 +157,3 @@ "version": "TIMESTAMP" } } - diff --git a/packer_templates/oraclelinux/oracle-5.11-x86_64.json b/packer_templates/oraclelinux/oracle-5.11-x86_64.json index d6b236d36..d6a032e8d 100644 --- a/packer_templates/oraclelinux/oracle-5.11-x86_64.json +++ b/packer_templates/oraclelinux/oracle-5.11-x86_64.json @@ -11,7 +11,7 @@ "guest_os_type": "Oracle_64", "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", - "http_directory": "../centos/http", + "http_directory": "{{template_dir}}/../centos/http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -43,7 +43,7 @@ "disk_size": "{{user `disk_size`}}", "guest_os_type": "oraclelinux-64", "headless": "{{ user `headless` }}", - "http_directory": "../centos/http", + "http_directory": "{{template_dir}}/../centos/http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -70,7 +70,7 @@ "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", "guest_os_type": "centos", - "http_directory": "../centos/http", + "http_directory": "{{template_dir}}/../centos/http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -96,7 +96,7 @@ "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", - "http_directory": "../centos/http", + "http_directory": "{{template_dir}}/../centos/http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -127,15 +127,15 @@ "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", "expect_disconnect": true, "scripts": [ - "../centos/scripts/update.sh", - "../_common/vagrant.sh", - "../_common/motd.sh", - "../_common/sshd.sh", - "../_common/virtualbox.sh", - "../_common/vmware.sh", - "../_common/parallels.sh", - "../centos/scripts/cleanup.sh", - "../_common/minimize.sh" + "{{template_dir}}/../centos/scripts/update.sh", + "{{template_dir}}/../_common/vagrant.sh", + "{{template_dir}}/../_common/motd.sh", + "{{template_dir}}/../_common/sshd.sh", + "{{template_dir}}/../_common/virtualbox.sh", + "{{template_dir}}/../_common/vmware.sh", + "{{template_dir}}/../_common/parallels.sh", + "{{template_dir}}/../centos/scripts/cleanup.sh", + "{{template_dir}}/../_common/minimize.sh" ], "type": "shell" } @@ -165,4 +165,3 @@ "version": "TIMESTAMP" } } - diff --git a/packer_templates/oraclelinux/oracle-6.10-i386.json b/packer_templates/oraclelinux/oracle-6.10-i386.json index 8835bc352..cf3f6c93e 100644 --- a/packer_templates/oraclelinux/oracle-6.10-i386.json +++ b/packer_templates/oraclelinux/oracle-6.10-i386.json @@ -11,7 +11,7 @@ "guest_os_type": "Oracle", "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", - "http_directory": "../centos/http", + "http_directory": "{{template_dir}}/../centos/http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -35,7 +35,7 @@ "disk_size": "{{user `disk_size`}}", "guest_os_type": "oraclelinux", "headless": "{{ user `headless` }}", - "http_directory": "../centos/http", + "http_directory": "{{template_dir}}/../centos/http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -62,7 +62,7 @@ "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", "guest_os_type": "centos", - "http_directory": "../centos/http", + "http_directory": "{{template_dir}}/../centos/http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -88,7 +88,7 @@ "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", - "http_directory": "../centos/http", + "http_directory": "{{template_dir}}/../centos/http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -119,16 +119,16 @@ "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", "expect_disconnect": true, "scripts": [ - "../centos/scripts/update.sh", - "../centos/scripts/networking.sh", - "../_common/motd.sh", - "../_common/sshd.sh", - "../_common/vagrant.sh", - "../_common/virtualbox.sh", - "../_common/vmware.sh", - "../_common/parallels.sh", - "../centos/scripts/cleanup.sh", - "../_common/minimize.sh" + "{{template_dir}}/../centos/scripts/update.sh", + "{{template_dir}}/../centos/scripts/networking.sh", + "{{template_dir}}/../_common/motd.sh", + "{{template_dir}}/../_common/sshd.sh", + "{{template_dir}}/../_common/vagrant.sh", + "{{template_dir}}/../_common/virtualbox.sh", + "{{template_dir}}/../_common/vmware.sh", + "{{template_dir}}/../_common/parallels.sh", + "{{template_dir}}/../centos/scripts/cleanup.sh", + "{{template_dir}}/../_common/minimize.sh" ], "type": "shell" } diff --git a/packer_templates/oraclelinux/oracle-6.10-x86_64.json b/packer_templates/oraclelinux/oracle-6.10-x86_64.json index a68df4030..314d3e621 100644 --- a/packer_templates/oraclelinux/oracle-6.10-x86_64.json +++ b/packer_templates/oraclelinux/oracle-6.10-x86_64.json @@ -11,7 +11,7 @@ "guest_os_type": "Oracle_64", "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", - "http_directory": "../centos/http", + "http_directory": "{{template_dir}}/../centos/http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -35,7 +35,7 @@ "disk_size": "{{user `disk_size`}}", "guest_os_type": "oraclelinux-64", "headless": "{{ user `headless` }}", - "http_directory": "../centos/http", + "http_directory": "{{template_dir}}/../centos/http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -62,7 +62,7 @@ "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", "guest_os_type": "centos", - "http_directory": "../centos/http", + "http_directory": "{{template_dir}}/../centos/http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -88,7 +88,7 @@ "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", - "http_directory": "../centos/http", + "http_directory": "{{template_dir}}/../centos/http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -119,16 +119,16 @@ "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", "expect_disconnect": true, "scripts": [ - "../centos/scripts/update.sh", - "../centos/scripts/networking.sh", - "../_common/motd.sh", - "../_common/sshd.sh", - "../_common/vagrant.sh", - "../_common/virtualbox.sh", - "../_common/vmware.sh", - "../_common/parallels.sh", - "../centos/scripts/cleanup.sh", - "../_common/minimize.sh" + "{{template_dir}}/../centos/scripts/update.sh", + "{{template_dir}}/../centos/scripts/networking.sh", + "{{template_dir}}/../_common/motd.sh", + "{{template_dir}}/../_common/sshd.sh", + "{{template_dir}}/../_common/vagrant.sh", + "{{template_dir}}/../_common/virtualbox.sh", + "{{template_dir}}/../_common/vmware.sh", + "{{template_dir}}/../_common/parallels.sh", + "{{template_dir}}/../centos/scripts/cleanup.sh", + "{{template_dir}}/../_common/minimize.sh" ], "type": "shell" } diff --git a/packer_templates/oraclelinux/oracle-7.7-x86_64.json b/packer_templates/oraclelinux/oracle-7.7-x86_64.json index 621695bdc..3c81dba35 100644 --- a/packer_templates/oraclelinux/oracle-7.7-x86_64.json +++ b/packer_templates/oraclelinux/oracle-7.7-x86_64.json @@ -11,7 +11,7 @@ "guest_os_type": "Oracle_64", "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", - "http_directory": "../centos/http", + "http_directory": "{{template_dir}}/../centos/http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -35,7 +35,7 @@ "disk_size": "{{user `disk_size`}}", "guest_os_type": "oraclelinux-64", "headless": "{{ user `headless` }}", - "http_directory": "../centos/http", + "http_directory": "{{template_dir}}/../centos/http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -62,7 +62,7 @@ "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", "guest_os_type": "centos", - "http_directory": "../centos/http", + "http_directory": "{{template_dir}}/../centos/http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -88,7 +88,7 @@ "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", - "http_directory": "../centos/http", + "http_directory": "{{template_dir}}/../centos/http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -119,16 +119,16 @@ "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", "expect_disconnect": true, "scripts": [ - "../centos/scripts/update.sh", - "../centos/scripts/networking.sh", - "../_common/motd.sh", - "../_common/sshd.sh", - "../_common/vagrant.sh", - "../_common/virtualbox.sh", - "../_common/vmware.sh", - "../_common/parallels.sh", - "../centos/scripts/cleanup.sh", - "../_common/minimize.sh" + "{{template_dir}}/../centos/scripts/update.sh", + "{{template_dir}}/../centos/scripts/networking.sh", + "{{template_dir}}/../_common/motd.sh", + "{{template_dir}}/../_common/sshd.sh", + "{{template_dir}}/../_common/vagrant.sh", + "{{template_dir}}/../_common/virtualbox.sh", + "{{template_dir}}/../_common/vmware.sh", + "{{template_dir}}/../_common/parallels.sh", + "{{template_dir}}/../centos/scripts/cleanup.sh", + "{{template_dir}}/../_common/minimize.sh" ], "type": "shell" } diff --git a/packer_templates/rhel/rhel-5.11-i386.json b/packer_templates/rhel/rhel-5.11-i386.json index 7962951ed..25ace884c 100644 --- a/packer_templates/rhel/rhel-5.11-i386.json +++ b/packer_templates/rhel/rhel-5.11-i386.json @@ -11,7 +11,7 @@ "guest_os_type": "RedHat", "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", - "http_directory": "../centos/http", + "http_directory": "{{template_dir}}/../centos/http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -35,7 +35,7 @@ "disk_size": "{{user `disk_size`}}", "guest_os_type": "redhat", "headless": "{{ user `headless` }}", - "http_directory": "../centos/http", + "http_directory": "{{template_dir}}/../centos/http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -62,7 +62,7 @@ "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", "guest_os_type": "rhel", - "http_directory": "../centos/http", + "http_directory": "{{template_dir}}/../centos/http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -88,7 +88,7 @@ "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", - "http_directory": "../centos/http", + "http_directory": "{{template_dir}}/../centos/http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -119,14 +119,14 @@ "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", "expect_disconnect": true, "scripts": [ - "../_common/vagrant.sh", - "../_common/motd.sh", - "../_common/sshd.sh", - "../_common/virtualbox.sh", - "../_common/vmware.sh", - "../_common/parallels.sh", - "../centos/scripts/cleanup.sh", - "../_common/minimize.sh" + "{{template_dir}}/../_common/vagrant.sh", + "{{template_dir}}/../_common/motd.sh", + "{{template_dir}}/../_common/sshd.sh", + "{{template_dir}}/../_common/virtualbox.sh", + "{{template_dir}}/../_common/vmware.sh", + "{{template_dir}}/../_common/parallels.sh", + "{{template_dir}}/../centos/scripts/cleanup.sh", + "{{template_dir}}/../_common/minimize.sh" ], "type": "shell" } diff --git a/packer_templates/rhel/rhel-5.11-x86_64.json b/packer_templates/rhel/rhel-5.11-x86_64.json index 8826a0f72..e2d18230b 100644 --- a/packer_templates/rhel/rhel-5.11-x86_64.json +++ b/packer_templates/rhel/rhel-5.11-x86_64.json @@ -11,7 +11,7 @@ "guest_os_type": "RedHat_64", "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", - "http_directory": "../centos/http", + "http_directory": "{{template_dir}}/../centos/http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -43,7 +43,7 @@ "disk_size": "{{user `disk_size`}}", "guest_os_type": "rhel5-64", "headless": "{{ user `headless` }}", - "http_directory": "../centos/http", + "http_directory": "{{template_dir}}/../centos/http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -70,7 +70,7 @@ "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", "guest_os_type": "rhel", - "http_directory": "../centos/http", + "http_directory": "{{template_dir}}/../centos/http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -96,7 +96,7 @@ "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", - "http_directory": "../centos/http", + "http_directory": "{{template_dir}}/../centos/http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -127,14 +127,14 @@ "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", "expect_disconnect": true, "scripts": [ - "../_common/vagrant.sh", - "../_common/motd.sh", - "../_common/sshd.sh", - "../_common/virtualbox.sh", - "../_common/vmware.sh", - "../_common/parallels.sh", - "../centos/scripts/cleanup.sh", - "../_common/minimize.sh" + "{{template_dir}}/../_common/vagrant.sh", + "{{template_dir}}/../_common/motd.sh", + "{{template_dir}}/../_common/sshd.sh", + "{{template_dir}}/../_common/virtualbox.sh", + "{{template_dir}}/../_common/vmware.sh", + "{{template_dir}}/../_common/parallels.sh", + "{{template_dir}}/../centos/scripts/cleanup.sh", + "{{template_dir}}/../_common/minimize.sh" ], "type": "shell" } diff --git a/packer_templates/rhel/rhel-6.10-i386.json b/packer_templates/rhel/rhel-6.10-i386.json index 26470b99a..8aecb531a 100644 --- a/packer_templates/rhel/rhel-6.10-i386.json +++ b/packer_templates/rhel/rhel-6.10-i386.json @@ -11,7 +11,7 @@ "guest_os_type": "RedHat", "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", - "http_directory": "../centos/http", + "http_directory": "{{template_dir}}/../centos/http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -35,7 +35,7 @@ "disk_size": "{{user `disk_size`}}", "guest_os_type": "redhat", "headless": "{{ user `headless` }}", - "http_directory": "../centos/http", + "http_directory": "{{template_dir}}/../centos/http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -62,7 +62,7 @@ "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", "guest_os_type": "rhel", - "http_directory": "../centos/http", + "http_directory": "{{template_dir}}/../centos/http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -88,7 +88,7 @@ "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", - "http_directory": "../centos/http", + "http_directory": "{{template_dir}}/../centos/http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -119,15 +119,15 @@ "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", "expect_disconnect": true, "scripts": [ - "../centos/scripts/networking.sh", - "../_common/motd.sh", - "../_common/sshd.sh", - "../_common/vagrant.sh", - "../_common/virtualbox.sh", - "../_common/vmware.sh", - "../_common/parallels.sh", - "../centos/scripts/cleanup.sh", - "../_common/minimize.sh" + "{{template_dir}}/../centos/scripts/networking.sh", + "{{template_dir}}/../_common/motd.sh", + "{{template_dir}}/../_common/sshd.sh", + "{{template_dir}}/../_common/vagrant.sh", + "{{template_dir}}/../_common/virtualbox.sh", + "{{template_dir}}/../_common/vmware.sh", + "{{template_dir}}/../_common/parallels.sh", + "{{template_dir}}/../centos/scripts/cleanup.sh", + "{{template_dir}}/../_common/minimize.sh" ], "type": "shell" } diff --git a/packer_templates/rhel/rhel-6.10-x86_64.json b/packer_templates/rhel/rhel-6.10-x86_64.json index db929955a..1514ac0aa 100644 --- a/packer_templates/rhel/rhel-6.10-x86_64.json +++ b/packer_templates/rhel/rhel-6.10-x86_64.json @@ -11,7 +11,7 @@ "guest_os_type": "RedHat_64", "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", - "http_directory": "../centos/http", + "http_directory": "{{template_dir}}/../centos/http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -35,7 +35,7 @@ "disk_size": "{{user `disk_size`}}", "guest_os_type": "rhel6-64", "headless": "{{ user `headless` }}", - "http_directory": "../centos/http", + "http_directory": "{{template_dir}}/../centos/http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -62,7 +62,7 @@ "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", "guest_os_type": "rhel", - "http_directory": "../centos/http", + "http_directory": "{{template_dir}}/../centos/http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -88,7 +88,7 @@ "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", - "http_directory": "../centos/http", + "http_directory": "{{template_dir}}/../centos/http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -119,15 +119,15 @@ "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", "expect_disconnect": true, "scripts": [ - "../centos/scripts/networking.sh", - "../_common/motd.sh", - "../_common/sshd.sh", - "../_common/vagrant.sh", - "../_common/virtualbox.sh", - "../_common/vmware.sh", - "../_common/parallels.sh", - "../centos/scripts/cleanup.sh", - "../_common/minimize.sh" + "{{template_dir}}/../centos/scripts/networking.sh", + "{{template_dir}}/../_common/motd.sh", + "{{template_dir}}/../_common/sshd.sh", + "{{template_dir}}/../_common/vagrant.sh", + "{{template_dir}}/../_common/virtualbox.sh", + "{{template_dir}}/../_common/vmware.sh", + "{{template_dir}}/../_common/parallels.sh", + "{{template_dir}}/../centos/scripts/cleanup.sh", + "{{template_dir}}/../_common/minimize.sh" ], "type": "shell" } diff --git a/packer_templates/rhel/rhel-7.6-x86_64.json b/packer_templates/rhel/rhel-7.6-x86_64.json index 809332ded..bc13c6d5e 100644 --- a/packer_templates/rhel/rhel-7.6-x86_64.json +++ b/packer_templates/rhel/rhel-7.6-x86_64.json @@ -11,7 +11,7 @@ "guest_os_type": "RedHat_64", "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", - "http_directory": "../centos/http", + "http_directory": "{{template_dir}}/../centos/http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -35,7 +35,7 @@ "disk_size": "{{user `disk_size`}}", "guest_os_type": "rhel7-64", "headless": "{{ user `headless` }}", - "http_directory": "../centos/http", + "http_directory": "{{template_dir}}/../centos/http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -62,7 +62,7 @@ "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", "guest_os_type": "rhel", - "http_directory": "../centos/http", + "http_directory": "{{template_dir}}/../centos/http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -88,7 +88,7 @@ "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", - "http_directory": "../centos/http", + "http_directory": "{{template_dir}}/../centos/http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -119,15 +119,15 @@ "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", "expect_disconnect": true, "scripts": [ - "../centos/scripts/networking.sh", - "../_common/motd.sh", - "../_common/sshd.sh", - "../_common/vagrant.sh", - "../_common/virtualbox.sh", - "../_common/vmware.sh", - "../_common/parallels.sh", - "../centos/scripts/cleanup.sh", - "../_common/minimize.sh" + "{{template_dir}}/../centos/scripts/networking.sh", + "{{template_dir}}/../_common/motd.sh", + "{{template_dir}}/../_common/sshd.sh", + "{{template_dir}}/../_common/vagrant.sh", + "{{template_dir}}/../_common/virtualbox.sh", + "{{template_dir}}/../_common/vmware.sh", + "{{template_dir}}/../_common/parallels.sh", + "{{template_dir}}/../centos/scripts/cleanup.sh", + "{{template_dir}}/../_common/minimize.sh" ], "type": "shell" } diff --git a/packer_templates/rhel/rhel-8.0-x86_64.json b/packer_templates/rhel/rhel-8.0-x86_64.json index 3cbe01ddb..2ec53fe89 100644 --- a/packer_templates/rhel/rhel-8.0-x86_64.json +++ b/packer_templates/rhel/rhel-8.0-x86_64.json @@ -11,7 +11,7 @@ "guest_os_type": "RedHat_64", "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", - "http_directory": "../centos/http", + "http_directory": "{{template_dir}}/../centos/http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -35,7 +35,7 @@ "disk_size": "{{user `disk_size`}}", "guest_os_type": "rhel8-64", "headless": "{{ user `headless` }}", - "http_directory": "../centos/http", + "http_directory": "{{template_dir}}/../centos/http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -62,7 +62,7 @@ "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", "guest_os_type": "rhel", - "http_directory": "../centos/http", + "http_directory": "{{template_dir}}/../centos/http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -88,7 +88,7 @@ "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", - "http_directory": "../centos/http", + "http_directory": "{{template_dir}}/../centos/http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -119,15 +119,15 @@ "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", "expect_disconnect": true, "scripts": [ - "../centos/scripts/networking.sh", - "../_common/motd.sh", - "../_common/sshd.sh", - "../_common/vagrant.sh", - "../_common/virtualbox.sh", - "../_common/vmware.sh", - "../_common/parallels.sh", - "../centos/scripts/cleanup.sh", - "../_common/minimize.sh" + "{{template_dir}}/../centos/scripts/networking.sh", + "{{template_dir}}/../_common/motd.sh", + "{{template_dir}}/../_common/sshd.sh", + "{{template_dir}}/../_common/vagrant.sh", + "{{template_dir}}/../_common/virtualbox.sh", + "{{template_dir}}/../_common/vmware.sh", + "{{template_dir}}/../_common/parallels.sh", + "{{template_dir}}/../centos/scripts/cleanup.sh", + "{{template_dir}}/../_common/minimize.sh" ], "type": "shell" } diff --git a/packer_templates/scientificlinux/scientific-7.7-x86_64.json b/packer_templates/scientificlinux/scientific-7.7-x86_64.json index 3d8200c7c..cf0f15a7a 100644 --- a/packer_templates/scientificlinux/scientific-7.7-x86_64.json +++ b/packer_templates/scientificlinux/scientific-7.7-x86_64.json @@ -11,7 +11,7 @@ "guest_os_type": "RedHat_64", "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", - "http_directory": "http", + "http_directory": "{{template_dir}}/http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -57,14 +57,14 @@ "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", "expect_disconnect": true, "scripts": [ - "../centos/scripts/update.sh", - "../_common/motd.sh", - "../_common/sshd.sh", - "../centos/scripts/networking.sh", - "../_common/vagrant.sh", - "../_common/virtualbox.sh", - "../centos/scripts/cleanup.sh", - "../_common/minimize.sh" + "{{template_dir}}/../centos/scripts/update.sh", + "{{template_dir}}/../_common/motd.sh", + "{{template_dir}}/../_common/sshd.sh", + "{{template_dir}}/../centos/scripts/networking.sh", + "{{template_dir}}/../_common/vagrant.sh", + "{{template_dir}}/../_common/virtualbox.sh", + "{{template_dir}}/../centos/scripts/cleanup.sh", + "{{template_dir}}/../_common/minimize.sh" ], "type": "shell" } diff --git a/packer_templates/sles/sles-11-sp4-x86_64.json b/packer_templates/sles/sles-11-sp4-x86_64.json index 737f8471c..75e4c98a3 100644 --- a/packer_templates/sles/sles-11-sp4-x86_64.json +++ b/packer_templates/sles/sles-11-sp4-x86_64.json @@ -15,7 +15,7 @@ "guest_os_type": "OpenSUSE_64", "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", - "http_directory": "http", + "http_directory": "{{template_dir}}/http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `iso_name`}}", @@ -43,7 +43,7 @@ "disk_size": "{{user `disk_size`}}", "guest_os_type": "sles11-64", "headless": "{{ user `headless` }}", - "http_directory": "http", + "http_directory": "{{template_dir}}/http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `iso_name`}}", @@ -74,7 +74,7 @@ "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", "guest_os_type": "suse", - "http_directory": "http", + "http_directory": "{{template_dir}}/http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `iso_name`}}", @@ -104,7 +104,7 @@ "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", - "http_directory": "http", + "http_directory": "{{template_dir}}/http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `iso_name`}}", @@ -135,17 +135,17 @@ "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh '{{.Path}}'", "expect_disconnect": true, "scripts": [ - "../_common/motd.sh", - "../_common/sshd.sh", - "../_common/vagrant.sh", - "../_common/virtualbox.sh", - "../_common/vmware.sh", - "../_common/parallels.sh", - "scripts/sudoers.sh", - "scripts/zypper-locks.sh", - "scripts/remove-dvd-source.sh", - "scripts/cleanup.sh", - "../_common/minimize.sh" + "{{template_dir}}/../_common/motd.sh", + "{{template_dir}}/../_common/sshd.sh", + "{{template_dir}}/../_common/vagrant.sh", + "{{template_dir}}/../_common/virtualbox.sh", + "{{template_dir}}/../_common/vmware.sh", + "{{template_dir}}/../_common/parallels.sh", + "{{template_dir}}/scripts/sudoers.sh", + "{{template_dir}}/scripts/zypper-locks.sh", + "{{template_dir}}/scripts/remove-dvd-source.sh", + "{{template_dir}}/scripts/cleanup.sh", + "{{template_dir}}/../_common/minimize.sh" ], "type": "shell" } diff --git a/packer_templates/sles/sles-12-sp2-x86_64.json b/packer_templates/sles/sles-12-sp2-x86_64.json index af9a6b826..d4b59b539 100644 --- a/packer_templates/sles/sles-12-sp2-x86_64.json +++ b/packer_templates/sles/sles-12-sp2-x86_64.json @@ -15,7 +15,7 @@ "guest_os_type": "OpenSUSE_64", "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", - "http_directory": "http", + "http_directory": "{{template_dir}}/http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `iso_name`}}", @@ -43,7 +43,7 @@ "disk_size": "{{user `disk_size`}}", "guest_os_type": "sles12-64", "headless": "{{ user `headless` }}", - "http_directory": "http", + "http_directory": "{{template_dir}}/http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `iso_name`}}", @@ -74,7 +74,7 @@ "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", "guest_os_type": "suse", - "http_directory": "http", + "http_directory": "{{template_dir}}/http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `iso_name`}}", @@ -104,7 +104,7 @@ "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", - "http_directory": "http", + "http_directory": "{{template_dir}}/http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `iso_name`}}", @@ -135,18 +135,18 @@ "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh '{{.Path}}'", "expect_disconnect": true, "scripts": [ - "../_common/motd.sh", - "../_common/sshd.sh", - "../_common/vagrant.sh", - "scripts/unsupported-modules.sh", - "../_common/virtualbox.sh", - "../_common/vmware.sh", - "../_common/parallels.sh", - "scripts/sudoers.sh", - "scripts/zypper-locks.sh", - "scripts/remove-dvd-source.sh", - "scripts/cleanup.sh", - "../_common/minimize.sh" + "{{template_dir}}/../_common/motd.sh", + "{{template_dir}}/../_common/sshd.sh", + "{{template_dir}}/../_common/vagrant.sh", + "{{template_dir}}/scripts/unsupported-modules.sh", + "{{template_dir}}/../_common/virtualbox.sh", + "{{template_dir}}/../_common/vmware.sh", + "{{template_dir}}/../_common/parallels.sh", + "{{template_dir}}/scripts/sudoers.sh", + "{{template_dir}}/scripts/zypper-locks.sh", + "{{template_dir}}/scripts/remove-dvd-source.sh", + "{{template_dir}}/scripts/cleanup.sh", + "{{template_dir}}/../_common/minimize.sh" ], "type": "shell" } diff --git a/packer_templates/sles/sles-12-sp3-x86_64.json b/packer_templates/sles/sles-12-sp3-x86_64.json index fa902f523..22c2c24f8 100644 --- a/packer_templates/sles/sles-12-sp3-x86_64.json +++ b/packer_templates/sles/sles-12-sp3-x86_64.json @@ -15,7 +15,7 @@ "guest_os_type": "OpenSUSE_64", "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", - "http_directory": "http", + "http_directory": "{{template_dir}}/http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `iso_name`}}", @@ -43,7 +43,7 @@ "disk_size": "{{user `disk_size`}}", "guest_os_type": "sles12-64", "headless": "{{ user `headless` }}", - "http_directory": "http", + "http_directory": "{{template_dir}}/http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `iso_name`}}", @@ -74,7 +74,7 @@ "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", "guest_os_type": "suse", - "http_directory": "http", + "http_directory": "{{template_dir}}/http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `iso_name`}}", @@ -104,7 +104,7 @@ "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", - "http_directory": "http", + "http_directory": "{{template_dir}}/http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `iso_name`}}", @@ -135,18 +135,18 @@ "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh '{{.Path}}'", "expect_disconnect": true, "scripts": [ - "../_common/motd.sh", - "../_common/sshd.sh", - "../_common/vagrant.sh", - "scripts/unsupported-modules.sh", - "../_common/virtualbox.sh", - "../_common/vmware.sh", - "../_common/parallels.sh", - "scripts/sudoers.sh", - "scripts/zypper-locks.sh", - "scripts/remove-dvd-source.sh", - "scripts/cleanup.sh", - "../_common/minimize.sh" + "{{template_dir}}/../_common/motd.sh", + "{{template_dir}}/../_common/sshd.sh", + "{{template_dir}}/../_common/vagrant.sh", + "{{template_dir}}/scripts/unsupported-modules.sh", + "{{template_dir}}/../_common/virtualbox.sh", + "{{template_dir}}/../_common/vmware.sh", + "{{template_dir}}/../_common/parallels.sh", + "{{template_dir}}/scripts/sudoers.sh", + "{{template_dir}}/scripts/zypper-locks.sh", + "{{template_dir}}/scripts/remove-dvd-source.sh", + "{{template_dir}}/scripts/cleanup.sh", + "{{template_dir}}/../_common/minimize.sh" ], "type": "shell" } diff --git a/packer_templates/sles/sles-15-sp1.json b/packer_templates/sles/sles-15-sp1.json index 198b6c262..22ba01141 100644 --- a/packer_templates/sles/sles-15-sp1.json +++ b/packer_templates/sles/sles-15-sp1.json @@ -15,7 +15,7 @@ "guest_os_type": "OpenSUSE_64", "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", - "http_directory": "http", + "http_directory": "{{template_dir}}/http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `iso_name`}}", @@ -59,7 +59,7 @@ "disk_size": "{{user `disk_size`}}", "guest_os_type": "sles12-64", "headless": "{{ user `headless` }}", - "http_directory": "http", + "http_directory": "{{template_dir}}/http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `iso_name`}}", @@ -90,7 +90,7 @@ "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", "guest_os_type": "suse", - "http_directory": "http", + "http_directory": "{{template_dir}}/http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `iso_name`}}", @@ -120,7 +120,7 @@ "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", - "http_directory": "http", + "http_directory": "{{template_dir}}/http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `iso_name`}}", @@ -151,18 +151,18 @@ "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh '{{.Path}}'", "expect_disconnect": true, "scripts": [ - "../_common/motd.sh", - "../_common/sshd.sh", - "../_common/vagrant.sh", - "scripts/unsupported-modules.sh", - "../_common/virtualbox.sh", - "../_common/vmware.sh", - "../_common/parallels.sh", - "scripts/sudoers.sh", - "scripts/zypper-locks.sh", - "scripts/remove-dvd-source.sh", - "scripts/cleanup.sh", - "../_common/minimize.sh" + "{{template_dir}}/../_common/motd.sh", + "{{template_dir}}/../_common/sshd.sh", + "{{template_dir}}/../_common/vagrant.sh", + "{{template_dir}}/scripts/unsupported-modules.sh", + "{{template_dir}}/../_common/virtualbox.sh", + "{{template_dir}}/../_common/vmware.sh", + "{{template_dir}}/../_common/parallels.sh", + "{{template_dir}}/scripts/sudoers.sh", + "{{template_dir}}/scripts/zypper-locks.sh", + "{{template_dir}}/scripts/remove-dvd-source.sh", + "{{template_dir}}/scripts/cleanup.sh", + "{{template_dir}}/../_common/minimize.sh" ], "type": "shell" } diff --git a/packer_templates/sles/sles-15.json b/packer_templates/sles/sles-15.json index a7794844c..228ebb615 100644 --- a/packer_templates/sles/sles-15.json +++ b/packer_templates/sles/sles-15.json @@ -15,7 +15,7 @@ "guest_os_type": "OpenSUSE_64", "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", - "http_directory": "http", + "http_directory": "{{template_dir}}/http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `iso_name`}}", @@ -59,7 +59,7 @@ "disk_size": "{{user `disk_size`}}", "guest_os_type": "sles12-64", "headless": "{{ user `headless` }}", - "http_directory": "http", + "http_directory": "{{template_dir}}/http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `iso_name`}}", @@ -90,7 +90,7 @@ "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", "guest_os_type": "suse", - "http_directory": "http", + "http_directory": "{{template_dir}}/http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `iso_name`}}", @@ -120,7 +120,7 @@ "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", - "http_directory": "http", + "http_directory": "{{template_dir}}/http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `iso_name`}}", @@ -151,18 +151,18 @@ "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh '{{.Path}}'", "expect_disconnect": true, "scripts": [ - "../_common/motd.sh", - "../_common/sshd.sh", - "../_common/vagrant.sh", - "scripts/unsupported-modules.sh", - "../_common/virtualbox.sh", - "../_common/vmware.sh", - "../_common/parallels.sh", - "scripts/sudoers.sh", - "scripts/zypper-locks.sh", - "scripts/remove-dvd-source.sh", - "scripts/cleanup.sh", - "../_common/minimize.sh" + "{{template_dir}}/../_common/motd.sh", + "{{template_dir}}/../_common/sshd.sh", + "{{template_dir}}/../_common/vagrant.sh", + "{{template_dir}}/scripts/unsupported-modules.sh", + "{{template_dir}}/../_common/virtualbox.sh", + "{{template_dir}}/../_common/vmware.sh", + "{{template_dir}}/../_common/parallels.sh", + "{{template_dir}}/scripts/sudoers.sh", + "{{template_dir}}/scripts/zypper-locks.sh", + "{{template_dir}}/scripts/remove-dvd-source.sh", + "{{template_dir}}/scripts/cleanup.sh", + "{{template_dir}}/../_common/minimize.sh" ], "type": "shell" } diff --git a/packer_templates/solaris/solaris-10.11-x86.json b/packer_templates/solaris/solaris-10.11-x86.json index adb254590..2b66aa96a 100644 --- a/packer_templates/solaris/solaris-10.11-x86.json +++ b/packer_templates/solaris/solaris-10.11-x86.json @@ -13,17 +13,17 @@ "boot_wait": "5s", "disk_size": "{{user `disk_size`}}", "floppy_files": [ - "floppy/sysidcfg", - "floppy/awesome_prof", - "floppy/rules.ok", - "floppy/S99startup.sh", - "floppy/finish.sh" + "{{template_dir}}/floppy/sysidcfg", + "{{template_dir}}/floppy/awesome_prof", + "{{template_dir}}/floppy/rules.ok", + "{{template_dir}}/floppy/S99startup.sh", + "{{template_dir}}/floppy/finish.sh" ], "guest_additions_mode": "upload", "guest_additions_url": "{{ user `guest_additions_url` }}", "guest_os_type": "Solaris_64", "headless": "{{ user `headless` }}", - "http_directory": "http", + "http_directory": "{{template_dir}}/http", "iso_checksum": "aae1452bb3d56baa3dcb8866ce7e4a08", "iso_checksum_type": "md5", "iso_url": "{{user `mirror`}}/sol-10-u11-ga-x86-dvd.iso", @@ -53,15 +53,15 @@ "boot_wait": "5s", "disk_size": "{{user `disk_size`}}", "floppy_files": [ - "floppy/sysidcfg", - "floppy/awesome_prof", - "floppy/rules.ok", - "floppy/S99startup.sh", - "floppy/finish.sh" + "{{template_dir}}/floppy/sysidcfg", + "{{template_dir}}/floppy/awesome_prof", + "{{template_dir}}/floppy/rules.ok", + "{{template_dir}}/floppy/S99startup.sh", + "{{template_dir}}/floppy/finish.sh" ], "guest_os_type": "solaris10-64", "headless": "{{ user `headless` }}", - "http_directory": "http", + "http_directory": "{{template_dir}}/http", "iso_checksum": "aae1452bb3d56baa3dcb8866ce7e4a08", "iso_checksum_type": "md5", "iso_url": "{{user `mirror`}}/sol-10-u11-ga-x86-dvd.iso", @@ -96,8 +96,8 @@ "execute_command": "/usr/local/bin/sudo {{.Path}}", "expect_disconnect": true, "scripts": [ - "scripts/solaris-10/vmtools.sh", - "scripts/solaris-10/minimize.sh" + "{{template_dir}}/scripts/solaris-10/vmtools.sh", + "{{template_dir}}/scripts/solaris-10/minimize.sh" ], "type": "shell" } diff --git a/packer_templates/solaris/solaris-11-x86.json b/packer_templates/solaris/solaris-11-x86.json index 9f3afc5a0..0138765dc 100644 --- a/packer_templates/solaris/solaris-11-x86.json +++ b/packer_templates/solaris/solaris-11-x86.json @@ -34,7 +34,7 @@ "guest_additions_url": "{{ user `guest_additions_url` }}", "guest_os_type": "Solaris11_64", "headless": "{{ user `headless` }}", - "http_directory": "http", + "http_directory": "{{template_dir}}/http", "iso_checksum": "30d9ae857f62938c21307722d031e0dc", "iso_checksum_type": "md5", "iso_url": "{{user `mirror`}}/sol-11_3-ai-x86.iso", @@ -83,7 +83,7 @@ "disk_size": "{{user `disk_size`}}", "guest_os_type": "solaris11-64", "headless": "{{ user `headless` }}", - "http_directory": "http", + "http_directory": "{{template_dir}}/http", "iso_checksum": "30d9ae857f62938c21307722d031e0dc", "iso_checksum_type": "md5", "iso_url": "{{user `mirror`}}/sol-11_3-ai-x86.iso", @@ -116,10 +116,10 @@ "execute_command": "echo 'vagrant'|sudo -S bash {{.Path}}", "expect_disconnect": true, "scripts": [ - "scripts/update.sh", - "scripts/vagrant.sh", - "scripts/vmtools.sh", - "scripts/minimize.sh" + "{{template_dir}}/scripts/update.sh", + "{{template_dir}}/scripts/vagrant.sh", + "{{template_dir}}/scripts/vmtools.sh", + "{{template_dir}}/scripts/minimize.sh" ], "type": "shell" } diff --git a/packer_templates/ubuntu/ubuntu-16.04-amd64.json b/packer_templates/ubuntu/ubuntu-16.04-amd64.json index e98774e5e..509689871 100644 --- a/packer_templates/ubuntu/ubuntu-16.04-amd64.json +++ b/packer_templates/ubuntu/ubuntu-16.04-amd64.json @@ -34,7 +34,7 @@ "guest_os_type": "Ubuntu_64", "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", - "http_directory": "http", + "http_directory": "{{template_dir}}/http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -81,7 +81,7 @@ "disk_size": "{{user `disk_size`}}", "guest_os_type": "ubuntu-64", "headless": "{{ user `headless` }}", - "http_directory": "http", + "http_directory": "{{template_dir}}/http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -132,7 +132,7 @@ "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", "guest_os_type": "ubuntu", - "http_directory": "http", + "http_directory": "{{template_dir}}/http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -179,7 +179,7 @@ "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", - "http_directory": "http", + "http_directory": "{{template_dir}}/http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -214,7 +214,7 @@ "disk_size": "{{user `disk_size`}}", "enable_secure_boot": false, "generation": "{{user `hyperv_generation`}}", - "http_directory": "http", + "http_directory": "{{template_dir}}/http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -247,18 +247,18 @@ "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", "expect_disconnect": true, "scripts": [ - "scripts/update.sh", - "../_common/motd.sh", - "../_common/sshd.sh", - "scripts/networking.sh", - "scripts/sudoers.sh", - "scripts/vagrant.sh", - "../_common/virtualbox.sh", - "scripts/vmware.sh", - "../_common/parallels.sh", - "scripts/hyperv.sh", - "scripts/cleanup.sh", - "../_common/minimize.sh" + "{{template_dir}}/scripts/update.sh", + "{{template_dir}}/../_common/motd.sh", + "{{template_dir}}/../_common/sshd.sh", + "{{template_dir}}/scripts/networking.sh", + "{{template_dir}}/scripts/sudoers.sh", + "{{template_dir}}/scripts/vagrant.sh", + "{{template_dir}}/../_common/virtualbox.sh", + "{{template_dir}}/scripts/vmware.sh", + "{{template_dir}}/../_common/parallels.sh", + "{{template_dir}}/scripts/hyperv.sh", + "{{template_dir}}/scripts/cleanup.sh", + "{{template_dir}}/../_common/minimize.sh" ], "type": "shell" } diff --git a/packer_templates/ubuntu/ubuntu-16.04-i386.json b/packer_templates/ubuntu/ubuntu-16.04-i386.json index cbdd5904d..953dad81f 100644 --- a/packer_templates/ubuntu/ubuntu-16.04-i386.json +++ b/packer_templates/ubuntu/ubuntu-16.04-i386.json @@ -34,7 +34,7 @@ "guest_os_type": "Ubuntu", "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", - "http_directory": "http", + "http_directory": "{{template_dir}}/http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -81,7 +81,7 @@ "disk_size": "{{user `disk_size`}}", "guest_os_type": "ubuntu", "headless": "{{ user `headless` }}", - "http_directory": "http", + "http_directory": "{{template_dir}}/http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -131,7 +131,7 @@ "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", "guest_os_type": "ubuntu", - "http_directory": "http", + "http_directory": "{{template_dir}}/http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -178,7 +178,7 @@ "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", - "http_directory": "http", + "http_directory": "{{template_dir}}/http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -211,17 +211,17 @@ "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", "expect_disconnect": true, "scripts": [ - "scripts/update.sh", - "../_common/motd.sh", - "../_common/sshd.sh", - "scripts/networking.sh", - "scripts/sudoers.sh", - "scripts/vagrant.sh", - "../_common/virtualbox.sh", - "scripts/vmware.sh", - "../_common/parallels.sh", - "scripts/cleanup.sh", - "../_common/minimize.sh" + "{{template_dir}}/scripts/update.sh", + "{{template_dir}}/../_common/motd.sh", + "{{template_dir}}/../_common/sshd.sh", + "{{template_dir}}/scripts/networking.sh", + "{{template_dir}}/scripts/sudoers.sh", + "{{template_dir}}/scripts/vagrant.sh", + "{{template_dir}}/../_common/virtualbox.sh", + "{{template_dir}}/scripts/vmware.sh", + "{{template_dir}}/../_common/parallels.sh", + "{{template_dir}}/scripts/cleanup.sh", + "{{template_dir}}/../_common/minimize.sh" ], "type": "shell" } diff --git a/packer_templates/ubuntu/ubuntu-18.04-amd64.json b/packer_templates/ubuntu/ubuntu-18.04-amd64.json index 120495218..4c6fffa57 100644 --- a/packer_templates/ubuntu/ubuntu-18.04-amd64.json +++ b/packer_templates/ubuntu/ubuntu-18.04-amd64.json @@ -33,7 +33,7 @@ "guest_os_type": "Ubuntu_64", "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", - "http_directory": "http", + "http_directory": "{{template_dir}}/http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -79,7 +79,7 @@ "disk_size": "{{user `disk_size`}}", "guest_os_type": "ubuntu-64", "headless": "{{ user `headless` }}", - "http_directory": "http", + "http_directory": "{{template_dir}}/http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -129,7 +129,7 @@ "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", "guest_os_type": "ubuntu", - "http_directory": "http", + "http_directory": "{{template_dir}}/http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -175,7 +175,7 @@ "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", - "http_directory": "http", + "http_directory": "{{template_dir}}/http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -210,7 +210,7 @@ "disk_size": "{{user `disk_size`}}", "enable_secure_boot": false, "generation": "{{user `hyperv_generation`}}", - "http_directory": "http", + "http_directory": "{{template_dir}}/http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -243,18 +243,18 @@ "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", "expect_disconnect": true, "scripts": [ - "scripts/update.sh", - "../_common/motd.sh", - "../_common/sshd.sh", - "scripts/networking.sh", - "scripts/sudoers.sh", - "scripts/vagrant.sh", - "../_common/virtualbox.sh", - "scripts/vmware.sh", - "../_common/parallels.sh", - "scripts/hyperv.sh", - "scripts/cleanup.sh", - "../_common/minimize.sh" + "{{template_dir}}/scripts/update.sh", + "{{template_dir}}/../_common/motd.sh", + "{{template_dir}}/../_common/sshd.sh", + "{{template_dir}}/scripts/networking.sh", + "{{template_dir}}/scripts/sudoers.sh", + "{{template_dir}}/scripts/vagrant.sh", + "{{template_dir}}/../_common/virtualbox.sh", + "{{template_dir}}/scripts/vmware.sh", + "{{template_dir}}/../_common/parallels.sh", + "{{template_dir}}/scripts/hyperv.sh", + "{{template_dir}}/scripts/cleanup.sh", + "{{template_dir}}/../_common/minimize.sh" ], "type": "shell" } diff --git a/packer_templates/ubuntu/ubuntu-18.10-amd64.json b/packer_templates/ubuntu/ubuntu-18.10-amd64.json index 9f170de5f..b2f18727a 100644 --- a/packer_templates/ubuntu/ubuntu-18.10-amd64.json +++ b/packer_templates/ubuntu/ubuntu-18.10-amd64.json @@ -33,7 +33,7 @@ "guest_os_type": "Ubuntu_64", "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", - "http_directory": "http", + "http_directory": "{{template_dir}}/http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -79,7 +79,7 @@ "disk_size": "{{user `disk_size`}}", "guest_os_type": "ubuntu-64", "headless": "{{ user `headless` }}", - "http_directory": "http", + "http_directory": "{{template_dir}}/http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -129,7 +129,7 @@ "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", "guest_os_type": "ubuntu", - "http_directory": "http", + "http_directory": "{{template_dir}}/http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -175,7 +175,7 @@ "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", - "http_directory": "http", + "http_directory": "{{template_dir}}/http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -210,7 +210,7 @@ "disk_size": "{{user `disk_size`}}", "enable_secure_boot": false, "generation": "{{user `hyperv_generation`}}", - "http_directory": "http", + "http_directory": "{{template_dir}}/http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -243,18 +243,18 @@ "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", "expect_disconnect": true, "scripts": [ - "scripts/update.sh", - "../_common/motd.sh", - "../_common/sshd.sh", - "scripts/networking.sh", - "scripts/sudoers.sh", - "scripts/vagrant.sh", - "../_common/virtualbox.sh", - "scripts/vmware.sh", - "../_common/parallels.sh", - "scripts/hyperv.sh", - "scripts/cleanup.sh", - "../_common/minimize.sh" + "{{template_dir}}/scripts/update.sh", + "{{template_dir}}/../_common/motd.sh", + "{{template_dir}}/../_common/sshd.sh", + "{{template_dir}}/scripts/networking.sh", + "{{template_dir}}/scripts/sudoers.sh", + "{{template_dir}}/scripts/vagrant.sh", + "{{template_dir}}/../_common/virtualbox.sh", + "{{template_dir}}/scripts/vmware.sh", + "{{template_dir}}/../_common/parallels.sh", + "{{template_dir}}/scripts/hyperv.sh", + "{{template_dir}}/scripts/cleanup.sh", + "{{template_dir}}/../_common/minimize.sh" ], "type": "shell" } diff --git a/packer_templates/ubuntu/ubuntu-19.04-amd64.json b/packer_templates/ubuntu/ubuntu-19.04-amd64.json index e8b62bce9..adfa11133 100644 --- a/packer_templates/ubuntu/ubuntu-19.04-amd64.json +++ b/packer_templates/ubuntu/ubuntu-19.04-amd64.json @@ -33,7 +33,7 @@ "guest_os_type": "Ubuntu_64", "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", - "http_directory": "http", + "http_directory": "{{template_dir}}/http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -79,7 +79,7 @@ "disk_size": "{{user `disk_size`}}", "guest_os_type": "ubuntu-64", "headless": "{{ user `headless` }}", - "http_directory": "http", + "http_directory": "{{template_dir}}/http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -129,7 +129,7 @@ "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", "guest_os_type": "ubuntu", - "http_directory": "http", + "http_directory": "{{template_dir}}/http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -175,7 +175,7 @@ "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", - "http_directory": "http", + "http_directory": "{{template_dir}}/http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -210,7 +210,7 @@ "disk_size": "{{user `disk_size`}}", "enable_secure_boot": false, "generation": "{{user `hyperv_generation`}}", - "http_directory": "http", + "http_directory": "{{template_dir}}/http", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -243,18 +243,18 @@ "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", "expect_disconnect": true, "scripts": [ - "scripts/update.sh", - "../_common/motd.sh", - "../_common/sshd.sh", - "scripts/networking.sh", - "scripts/sudoers.sh", - "scripts/vagrant.sh", - "../_common/virtualbox.sh", - "scripts/vmware.sh", - "../_common/parallels.sh", - "scripts/hyperv.sh", - "scripts/cleanup.sh", - "../_common/minimize.sh" + "{{template_dir}}/scripts/update.sh", + "{{template_dir}}/../_common/motd.sh", + "{{template_dir}}/../_common/sshd.sh", + "{{template_dir}}/scripts/networking.sh", + "{{template_dir}}/scripts/sudoers.sh", + "{{template_dir}}/scripts/vagrant.sh", + "{{template_dir}}/../_common/virtualbox.sh", + "{{template_dir}}/scripts/vmware.sh", + "{{template_dir}}/../_common/parallels.sh", + "{{template_dir}}/scripts/hyperv.sh", + "{{template_dir}}/scripts/cleanup.sh", + "{{template_dir}}/../_common/minimize.sh" ], "type": "shell" } diff --git a/packer_templates/windows/windows-10.json b/packer_templates/windows/windows-10.json index 696000360..a2761fb19 100644 --- a/packer_templates/windows/windows-10.json +++ b/packer_templates/windows/windows-10.json @@ -24,8 +24,8 @@ "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"", "shutdown_timeout": "15m", "floppy_files": [ - "answer_files/10/Autounattend.xml", - "scripts/base_setup.ps1" + "{{template_dir}}/answer_files/10/Autounattend.xml", + "{{template_dir}}/scripts/base_setup.ps1" ] }, { @@ -46,7 +46,7 @@ "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"", "shutdown_timeout": "15m", "floppy_files": [ - "answer_files/10/Autounattend.xml" + "{{template_dir}}/answer_files/10/Autounattend.xml" ] } ], @@ -93,7 +93,7 @@ }, { "type": "powershell", - "script": "scripts/cleanup.ps1", + "script": "{{template_dir}}/scripts/cleanup.ps1", "elevated_user": "vagrant", "elevated_password": "vagrant" } diff --git a/packer_templates/windows/windows-2008r2.json b/packer_templates/windows/windows-2008r2.json index e69e9b189..767382946 100644 --- a/packer_templates/windows/windows-2008r2.json +++ b/packer_templates/windows/windows-2008r2.json @@ -22,7 +22,7 @@ "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"", "shutdown_timeout": "15m", "floppy_files": [ - "answer_files/2008_r2/Autounattend.xml" + "{{template_dir}}/answer_files/2008_r2/Autounattend.xml" ] }], "provisioners": [{ @@ -59,7 +59,7 @@ }, { "type": "powershell", - "script": "scripts/cleanup.ps1", + "script": "{{template_dir}}/scripts/cleanup.ps1", "elevated_user": "vagrant", "elevated_password": "vagrant" } diff --git a/packer_templates/windows/windows-2012r2.json b/packer_templates/windows/windows-2012r2.json index 7731f5014..ffa0b270a 100644 --- a/packer_templates/windows/windows-2012r2.json +++ b/packer_templates/windows/windows-2012r2.json @@ -22,7 +22,7 @@ "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"", "shutdown_timeout": "15m", "floppy_files": [ - "answer_files/2012_r2/Autounattend.xml" + "{{template_dir}}/answer_files/2012_r2/Autounattend.xml" ] }, { @@ -43,7 +43,7 @@ "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"", "shutdown_timeout": "15m", "floppy_files": [ - "answer_files/2012_r2/Autounattend.xml" + "{{template_dir}}/answer_files/2012_r2/Autounattend.xml" ] } ], @@ -88,7 +88,7 @@ }, { "type": "powershell", - "script": "scripts/cleanup.ps1", + "script": "{{template_dir}}/scripts/cleanup.ps1", "elevated_user": "vagrant", "elevated_password": "vagrant" } diff --git a/packer_templates/windows/windows-2016.json b/packer_templates/windows/windows-2016.json index f84d04305..a0ca17c3b 100644 --- a/packer_templates/windows/windows-2016.json +++ b/packer_templates/windows/windows-2016.json @@ -22,7 +22,7 @@ "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"", "shutdown_timeout": "15m", "floppy_files": [ - "answer_files/2016/Autounattend.xml" + "{{template_dir}}/answer_files/2016/Autounattend.xml" ] }, { @@ -43,7 +43,7 @@ "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"", "shutdown_timeout": "15m", "floppy_files": [ - "answer_files/2016/Autounattend.xml" + "{{template_dir}}/answer_files/2016/Autounattend.xml" ] } ], @@ -88,7 +88,7 @@ }, { "type": "powershell", - "script": "scripts/cleanup.ps1", + "script": "{{template_dir}}/scripts/cleanup.ps1", "elevated_user": "vagrant", "elevated_password": "vagrant" } diff --git a/packer_templates/windows/windows-2019.json b/packer_templates/windows/windows-2019.json index d2bceb4de..1516e39aa 100644 --- a/packer_templates/windows/windows-2019.json +++ b/packer_templates/windows/windows-2019.json @@ -22,7 +22,7 @@ "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"", "shutdown_timeout": "15m", "floppy_files": [ - "answer_files/2019/Autounattend.xml" + "{{template_dir}}/answer_files/2019/Autounattend.xml" ] }, { @@ -43,7 +43,7 @@ "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"", "shutdown_timeout": "15m", "floppy_files": [ - "answer_files/2019/Autounattend.xml" + "{{template_dir}}/answer_files/2019/Autounattend.xml" ] } ], @@ -88,7 +88,7 @@ }, { "type": "powershell", - "script": "scripts/cleanup.ps1", + "script": "{{template_dir}}/scripts/cleanup.ps1", "elevated_user": "vagrant", "elevated_password": "vagrant" } diff --git a/packer_templates/windows/windows-7.json b/packer_templates/windows/windows-7.json index f27cee767..174ec4edb 100644 --- a/packer_templates/windows/windows-7.json +++ b/packer_templates/windows/windows-7.json @@ -22,7 +22,7 @@ "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"", "shutdown_timeout": "15m", "floppy_files": [ - "answer_files/7/Autounattend.xml" + "{{template_dir}}/answer_files/7/Autounattend.xml" ] }], "provisioners": [{ @@ -66,7 +66,7 @@ }, { "type": "powershell", - "script": "scripts/cleanup.ps1", + "script": "{{template_dir}}/scripts/cleanup.ps1", "elevated_user": "vagrant", "elevated_password": "vagrant" } From 51deabd2b5c636833da4ed7d73b10df428159b42 Mon Sep 17 00:00:00 2001 From: Ali Rizvi-Santiago <arizvisa@gmail.com> Date: Thu, 31 Oct 2019 15:30:20 -0500 Subject: [PATCH 1054/1622] Updated the "vagrantfile_template" option for the vagrant provisioner, and the cookbook_paths option for the chef-solo provisioner to use the "template_dir" packer variable. Signed-off-by: Ali Rizvi-Santiago <arizvisa@gmail.com> --- packer_templates/freebsd/freebsd-11.3-amd64.json | 2 +- packer_templates/freebsd/freebsd-11.3-i386.json | 2 +- packer_templates/freebsd/freebsd-12.0-amd64.json | 2 +- packer_templates/freebsd/freebsd-12.0-i386.json | 2 +- packer_templates/hardenedbsd/hardenedbsd-11-amd64.json | 2 +- packer_templates/macos/macos-10.12.json | 2 +- packer_templates/macos/macosx-10.11.json | 2 +- packer_templates/windows/windows-10.json | 8 ++++---- packer_templates/windows/windows-2008r2.json | 6 +++--- packer_templates/windows/windows-2012r2.json | 8 ++++---- packer_templates/windows/windows-2016.json | 8 ++++---- packer_templates/windows/windows-2019.json | 8 ++++---- packer_templates/windows/windows-7.json | 8 ++++---- 13 files changed, 30 insertions(+), 30 deletions(-) diff --git a/packer_templates/freebsd/freebsd-11.3-amd64.json b/packer_templates/freebsd/freebsd-11.3-amd64.json index 75d8a5fdb..e9c5501b3 100644 --- a/packer_templates/freebsd/freebsd-11.3-amd64.json +++ b/packer_templates/freebsd/freebsd-11.3-amd64.json @@ -158,7 +158,7 @@ { "output": "{{ user `build_directory` }}/{{user `box_basename`}}.{{.Provider}}.box", "type": "vagrant", - "vagrantfile_template": "vagrantfile_templates/freebsd.rb" + "vagrantfile_template": "{{template_dir}}/vagrantfile_templates/freebsd.rb" } ], "provisioners": [ diff --git a/packer_templates/freebsd/freebsd-11.3-i386.json b/packer_templates/freebsd/freebsd-11.3-i386.json index c979171bd..b191ef871 100644 --- a/packer_templates/freebsd/freebsd-11.3-i386.json +++ b/packer_templates/freebsd/freebsd-11.3-i386.json @@ -158,7 +158,7 @@ { "output": "{{ user `build_directory` }}/{{user `box_basename`}}.{{.Provider}}.box", "type": "vagrant", - "vagrantfile_template": "vagrantfile_templates/freebsd.rb" + "vagrantfile_template": "{{template_dir}}/vagrantfile_templates/freebsd.rb" } ], "provisioners": [ diff --git a/packer_templates/freebsd/freebsd-12.0-amd64.json b/packer_templates/freebsd/freebsd-12.0-amd64.json index 609c53802..7f69b1174 100644 --- a/packer_templates/freebsd/freebsd-12.0-amd64.json +++ b/packer_templates/freebsd/freebsd-12.0-amd64.json @@ -158,7 +158,7 @@ { "output": "{{ user `build_directory` }}/{{user `box_basename`}}.{{.Provider}}.box", "type": "vagrant", - "vagrantfile_template": "vagrantfile_templates/freebsd.rb" + "vagrantfile_template": "{{template_dir}}/vagrantfile_templates/freebsd.rb" } ], "provisioners": [ diff --git a/packer_templates/freebsd/freebsd-12.0-i386.json b/packer_templates/freebsd/freebsd-12.0-i386.json index 6a0f1565f..f52a00990 100644 --- a/packer_templates/freebsd/freebsd-12.0-i386.json +++ b/packer_templates/freebsd/freebsd-12.0-i386.json @@ -158,7 +158,7 @@ { "output": "{{ user `build_directory` }}/{{user `box_basename`}}.{{.Provider}}.box", "type": "vagrant", - "vagrantfile_template": "vagrantfile_templates/freebsd.rb" + "vagrantfile_template": "{{template_dir}}/vagrantfile_templates/freebsd.rb" } ], "provisioners": [ diff --git a/packer_templates/hardenedbsd/hardenedbsd-11-amd64.json b/packer_templates/hardenedbsd/hardenedbsd-11-amd64.json index e044459a1..5eb5745fc 100644 --- a/packer_templates/hardenedbsd/hardenedbsd-11-amd64.json +++ b/packer_templates/hardenedbsd/hardenedbsd-11-amd64.json @@ -159,7 +159,7 @@ { "output": "{{ user `build_directory` }}/{{user `box_basename`}}.{{.Provider}}.box", "type": "vagrant", - "vagrantfile_template": "vagrantfile_templates/hardenedbsd.rb" + "vagrantfile_template": "{{template_dir}}/vagrantfile_templates/hardenedbsd.rb" } ], "provisioners": [ diff --git a/packer_templates/macos/macos-10.12.json b/packer_templates/macos/macos-10.12.json index 6d321a7d9..4a651f0d5 100644 --- a/packer_templates/macos/macos-10.12.json +++ b/packer_templates/macos/macos-10.12.json @@ -176,7 +176,7 @@ { "output": "{{ user `build_directory` }}/{{user `box_basename`}}.{{.Provider}}.box", "type": "vagrant", - "vagrantfile_template": "vagrantfile_templates/macosx.rb" + "vagrantfile_template": "{{template_dir}}/vagrantfile_templates/macosx.rb" } ], "provisioners": [ diff --git a/packer_templates/macos/macosx-10.11.json b/packer_templates/macos/macosx-10.11.json index cc23f69a0..b6630a2c0 100644 --- a/packer_templates/macos/macosx-10.11.json +++ b/packer_templates/macos/macosx-10.11.json @@ -176,7 +176,7 @@ { "output": "{{ user `build_directory` }}/{{user `box_basename`}}.{{.Provider}}.box", "type": "vagrant", - "vagrantfile_template": "vagrantfile_templates/macosx.rb" + "vagrantfile_template": "{{template_dir}}/vagrantfile_templates/macosx.rb" } ], "provisioners": [ diff --git a/packer_templates/windows/windows-10.json b/packer_templates/windows/windows-10.json index a2761fb19..c32ecfa4c 100644 --- a/packer_templates/windows/windows-10.json +++ b/packer_templates/windows/windows-10.json @@ -52,7 +52,7 @@ ], "provisioners": [{ "type": "chef-solo", - "cookbook_paths": ["cookbooks"], + "cookbook_paths": ["{{template_dir}}/cookbooks"], "guest_os_type": "windows", "run_list": [ "packer::disable_uac", @@ -68,7 +68,7 @@ }, { "type": "chef-solo", - "cookbook_paths": ["cookbooks"], + "cookbook_paths": ["{{template_dir}}/cookbooks"], "guest_os_type": "windows", "run_list": [ "packer::vm_tools", @@ -84,7 +84,7 @@ }, { "type": "chef-solo", - "cookbook_paths": ["cookbooks"], + "cookbook_paths": ["{{template_dir}}/cookbooks"], "guest_os_type": "windows", "run_list": [ "packer::cleanup", @@ -103,7 +103,7 @@ "type": "vagrant", "keep_input_artifact": true, "output": "{{ user `template` }}-{{.Provider}}.box", - "vagrantfile_template": "vagrantfile-windows.template" + "vagrantfile_template": "{{template_dir}}/vagrantfile-windows.template" }] ], "variables": { diff --git a/packer_templates/windows/windows-2008r2.json b/packer_templates/windows/windows-2008r2.json index 767382946..c60691b5e 100644 --- a/packer_templates/windows/windows-2008r2.json +++ b/packer_templates/windows/windows-2008r2.json @@ -27,7 +27,7 @@ }], "provisioners": [{ "type": "chef-solo", - "cookbook_paths": ["cookbooks"], + "cookbook_paths": ["{{template_dir}}/cookbooks"], "guest_os_type": "windows", "install_command": "powershell.exe -Command \"(new-object Net.WebClient).DownloadString('https://omnitruck.chef.io/install.ps1') | iex; install\"", "run_list": [ @@ -48,7 +48,7 @@ }, { "type": "chef-solo", - "cookbook_paths": ["cookbooks"], + "cookbook_paths": ["{{template_dir}}/cookbooks"], "guest_os_type": "windows", "install_command": "powershell.exe -Command \"(new-object Net.WebClient).DownloadString('https://omnitruck.chef.io/install.ps1') | iex; install\"", "run_list": [ @@ -69,7 +69,7 @@ "type": "vagrant", "keep_input_artifact": true, "output": "{{ user `template` }}-{{.Provider}}.box", - "vagrantfile_template": "vagrantfile-windows.template" + "vagrantfile_template": "{{template_dir}}/vagrantfile-windows.template" }] ], "variables": { diff --git a/packer_templates/windows/windows-2012r2.json b/packer_templates/windows/windows-2012r2.json index ffa0b270a..5dcf3af4e 100644 --- a/packer_templates/windows/windows-2012r2.json +++ b/packer_templates/windows/windows-2012r2.json @@ -49,7 +49,7 @@ ], "provisioners": [{ "type": "chef-solo", - "cookbook_paths": ["cookbooks"], + "cookbook_paths": ["{{template_dir}}/cookbooks"], "guest_os_type": "windows", "run_list": [ "packer::disable_uac", @@ -63,7 +63,7 @@ }, { "type": "chef-solo", - "cookbook_paths": ["cookbooks"], + "cookbook_paths": ["{{template_dir}}/cookbooks"], "guest_os_type": "windows", "run_list": [ "packer::vm_tools", @@ -79,7 +79,7 @@ }, { "type": "chef-solo", - "cookbook_paths": ["cookbooks"], + "cookbook_paths": ["{{template_dir}}/cookbooks"], "guest_os_type": "windows", "run_list": [ "packer::cleanup", @@ -98,7 +98,7 @@ "type": "vagrant", "keep_input_artifact": true, "output": "{{ user `template` }}-{{.Provider}}.box", - "vagrantfile_template": "vagrantfile-windows.template" + "vagrantfile_template": "{{template_dir}}/vagrantfile-windows.template" }] ], "variables": { diff --git a/packer_templates/windows/windows-2016.json b/packer_templates/windows/windows-2016.json index a0ca17c3b..72f7373f0 100644 --- a/packer_templates/windows/windows-2016.json +++ b/packer_templates/windows/windows-2016.json @@ -49,7 +49,7 @@ ], "provisioners": [{ "type": "chef-solo", - "cookbook_paths": ["cookbooks"], + "cookbook_paths": ["{{template_dir}}/cookbooks"], "guest_os_type": "windows", "run_list": [ "packer::disable_uac", @@ -63,7 +63,7 @@ }, { "type": "chef-solo", - "cookbook_paths": ["cookbooks"], + "cookbook_paths": ["{{template_dir}}/cookbooks"], "guest_os_type": "windows", "run_list": [ "packer::vm_tools", @@ -79,7 +79,7 @@ }, { "type": "chef-solo", - "cookbook_paths": ["cookbooks"], + "cookbook_paths": ["{{template_dir}}/cookbooks"], "guest_os_type": "windows", "run_list": [ "packer::cleanup", @@ -98,7 +98,7 @@ "type": "vagrant", "keep_input_artifact": true, "output": "{{ user `template` }}-{{.Provider}}.box", - "vagrantfile_template": "vagrantfile-windows.template" + "vagrantfile_template": "{{template_dir}}/vagrantfile-windows.template" }] ], "variables": { diff --git a/packer_templates/windows/windows-2019.json b/packer_templates/windows/windows-2019.json index 1516e39aa..6859a01b8 100644 --- a/packer_templates/windows/windows-2019.json +++ b/packer_templates/windows/windows-2019.json @@ -49,7 +49,7 @@ ], "provisioners": [{ "type": "chef-solo", - "cookbook_paths": ["cookbooks"], + "cookbook_paths": ["{{template_dir}}/cookbooks"], "guest_os_type": "windows", "run_list": [ "packer::disable_uac", @@ -63,7 +63,7 @@ }, { "type": "chef-solo", - "cookbook_paths": ["cookbooks"], + "cookbook_paths": ["{{template_dir}}/cookbooks"], "guest_os_type": "windows", "run_list": [ "packer::vm_tools", @@ -79,7 +79,7 @@ }, { "type": "chef-solo", - "cookbook_paths": ["cookbooks"], + "cookbook_paths": ["{{template_dir}}/cookbooks"], "guest_os_type": "windows", "run_list": [ "packer::cleanup", @@ -98,7 +98,7 @@ "type": "vagrant", "keep_input_artifact": true, "output": "{{ user `template` }}-{{.Provider}}.box", - "vagrantfile_template": "vagrantfile-windows.template" + "vagrantfile_template": "{{template_dir}}/vagrantfile-windows.template" }] ], "variables": { diff --git a/packer_templates/windows/windows-7.json b/packer_templates/windows/windows-7.json index 174ec4edb..8385f753f 100644 --- a/packer_templates/windows/windows-7.json +++ b/packer_templates/windows/windows-7.json @@ -27,7 +27,7 @@ }], "provisioners": [{ "type": "chef-solo", - "cookbook_paths": ["cookbooks"], + "cookbook_paths": ["{{template_dir}}/cookbooks"], "guest_os_type": "windows", "run_list": [ "packer::disable_uac", @@ -41,7 +41,7 @@ }, { "type": "chef-solo", - "cookbook_paths": ["cookbooks"], + "cookbook_paths": ["{{template_dir}}/cookbooks"], "guest_os_type": "windows", "run_list": [ "packer::vm_tools", @@ -57,7 +57,7 @@ }, { "type": "chef-solo", - "cookbook_paths": ["cookbooks"], + "cookbook_paths": ["{{template_dir}}/cookbooks"], "guest_os_type": "windows", "run_list": [ "packer::cleanup", @@ -76,7 +76,7 @@ "type": "vagrant", "keep_input_artifact": true, "output": "{{ user `template` }}-{{.Provider}}.box", - "vagrantfile_template": "vagrantfile-windows.template" + "vagrantfile_template": "{{template_dir}}/vagrantfile-windows.template" }] ], "variables": { From b536bc154ff7b85068ab4f54632c4e72b2b173a1 Mon Sep 17 00:00:00 2001 From: dragon788 <dragon788@users.noreply.github.com> Date: Mon, 25 Nov 2019 14:11:33 -0600 Subject: [PATCH 1055/1622] Change profile to Private to avoid infinite wait I've run into an infinite wait scenario when trying to build without the additional line added. While debugging I ran this script from an Administrator Powershell window and the error was always the same, the WinRM -quickconfig command isn't getting the profile override so isn't allowing WinRM o be enabled preventing the initial Packer wait for WinRM to succeed. Obvious fix. --- packer_templates/windows/scripts/base_setup.ps1 | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/packer_templates/windows/scripts/base_setup.ps1 b/packer_templates/windows/scripts/base_setup.ps1 index dc8743425..3689725be 100644 --- a/packer_templates/windows/scripts/base_setup.ps1 +++ b/packer_templates/windows/scripts/base_setup.ps1 @@ -6,8 +6,13 @@ Write-Host "Performing the WinRM setup necessary to get the host ready for packe # Supress network location Prompt New-Item -Path "HKLM:\SYSTEM\CurrentControlSet\Control\Network\NewNetworkWindowOff" -Force +# The above suppresses the prompt but defaults to "Public" which prevents WinRM from being enabled even with the SkipNetworkProfileCheck arg +# This command sets any network connections detected to Private to allow WinRM to be configured and started +Get-NetConnectionProfile | Set-NetConnectionProfile -NetworkCategory "Private" + # Does a lot: https://docs.microsoft.com/en-us/powershell/module/microsoft.powershell.core/enable-psremoting?view=powershell-6 Enable-PSRemoting -SkipNetworkProfileCheck -Force +# May not be necessary since we set the profile to Private above Set-NetFirewallRule -Name "WINRM-HTTP-In-TCP" -RemoteAddress Any # allow winrm over public profile interfaces winrm set "winrm/config" '@{MaxTimeoutms="1800000"}' From 1d60b8e7eae400964ed04bf5b2333c0884a6a8aa Mon Sep 17 00:00:00 2001 From: Li-Wen Hsu <lwhsu@lwhsu.org> Date: Fri, 29 Nov 2019 20:13:09 +0800 Subject: [PATCH 1056/1622] Add FreeBSD-12.1 definitions Signed-off-by: Li-Wen Hsu <lwhsu@lwhsu.org> --- builds.yml | 2 + .../freebsd/freebsd-12.1-amd64.json | 210 ++++++++++++++++++ .../freebsd/freebsd-12.1-i386.json | 210 ++++++++++++++++++ 3 files changed, 422 insertions(+) create mode 100644 packer_templates/freebsd/freebsd-12.1-amd64.json create mode 100644 packer_templates/freebsd/freebsd-12.1-i386.json diff --git a/builds.yml b/builds.yml index ab6da3f6d..dcf4ea345 100644 --- a/builds.yml +++ b/builds.yml @@ -19,6 +19,8 @@ public: - 'freebsd-11.3' - 'freebsd-12.0-i386' - 'freebsd-12.0' +- 'freebsd-12.1-i386' +- 'freebsd-12.1' - 'opensuse-leap-15.1' - 'oracle-5.11-i386' - 'oracle-5.11' diff --git a/packer_templates/freebsd/freebsd-12.1-amd64.json b/packer_templates/freebsd/freebsd-12.1-amd64.json new file mode 100644 index 000000000..f80c9df26 --- /dev/null +++ b/packer_templates/freebsd/freebsd-12.1-amd64.json @@ -0,0 +1,210 @@ +{ + "builders": [ + { + "boot_command": [ + "<esc><wait>", + "boot -s<wait>", + "<enter><wait>", + "<wait10><wait10>", + "/bin/sh<enter><wait>", + "mdmfs -s 100m md1 /tmp<enter><wait>", + "mdmfs -s 100m md2 /mnt<enter><wait>", + "dhclient -l /tmp/dhclient.lease.em0 em0<enter><wait>", + "fetch -o /tmp/installerconfig http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} && bsdinstall script /tmp/installerconfig<enter><wait>" + ], + "boot_wait": "10s", + "memory": "{{ user `memory` }}", + "cpus": "{{ user `cpus` }}", + "disk_size": "{{user `disk_size`}}", + "guest_additions_mode": "disable", + "guest_os_type": "FreeBSD_64", + "headless": "{{ user `headless` }}", + "http_directory": "{{template_dir}}/http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-virtualbox", + "shutdown_command": "echo 'vagrant' | su -m root -c 'shutdown -p now'", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "virtualbox-iso", + "virtualbox_version_file": ".vbox_version", + "vm_name": "{{ user `template` }}" + }, + { + "boot_command": [ + "<esc><wait>", + "boot -s<wait>", + "<enter><wait>", + "<wait10><wait10>", + "/bin/sh<enter><wait>", + "mdmfs -s 100m md1 /tmp<enter><wait>", + "mdmfs -s 100m md2 /mnt<enter><wait>", + "dhclient -l /tmp/dhclient.lease.em0 em0<enter><wait>", + "<wait5>", + "fetch -o /tmp/installerconfig http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} && bsdinstall script /tmp/installerconfig<enter><wait>" + ], + "boot_wait": "10s", + "memory": "{{ user `memory` }}", + "cpus": "{{ user `cpus` }}", + "disk_size": "{{user `disk_size`}}", + "guest_os_type": "freebsd-64", + "headless": "{{ user `headless` }}", + "http_directory": "{{template_dir}}/http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-vmware", + "shutdown_command": "echo 'vagrant' | su -m root -c 'shutdown -p now'", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "vmware-iso", + "vm_name": "{{ user `template` }}", + "vmx_data": { + "cpuid.coresPerSocket": "1" + }, + "vmx_remove_ethernet_interfaces": true + }, + { + "boot_command": [ + "<esc><wait>", + "boot -s<wait>", + "<enter><wait>", + "<wait10><wait10>", + "/bin/sh<enter><wait>", + "mdmfs -s 100m md1 /tmp<enter><wait>", + "mdmfs -s 100m md2 /mnt<enter><wait>", + "dhclient -l /tmp/dhclient.lease.em0 em0<enter><wait>", + "fetch -o /tmp/installerconfig http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} && bsdinstall script /tmp/installerconfig<enter><wait>" + ], + "boot_wait": "8s", + "memory": "{{ user `memory` }}", + "cpus": "{{ user `cpus` }}", + "disk_size": "{{user `disk_size`}}", + "guest_os_type": "freebsd", + "http_directory": "{{template_dir}}/http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-parallels", + "parallels_tools_mode": "disable", + "prlctl": [ + [ + "set", + "{{.Name}}", + "--device-set", + "cdrom0", + "--iface", + "ide" + ], + [ + "set", + "{{.Name}}", + "--device-del", + "fdd0" + ], + [ + "set", + "{{.Name}}", + "--device-del", + "parallel0" + ] + ], + "prlctl_version_file": ".prlctl_version", + "shutdown_command": "echo 'vagrant' | su -m root -c 'shutdown -p now'", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "parallels-iso", + "vm_name": "{{ user `template` }}" + }, + { + "boot_command": [ + "<esc><wait>", + "boot -s<wait>", + "<enter><wait>", + "<wait10><wait10>", + "/bin/sh<enter><wait>", + "mdmfs -s 100m md1 /tmp<enter><wait>", + "mdmfs -s 100m md2 /mnt<enter><wait>", + "dhclient -l /tmp/dhclient.lease.vtnet0 vtnet0<enter><wait>", + "fetch -o /tmp/installerconfig http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} && bsdinstall script /tmp/installerconfig<enter><wait>" + ], + "boot_wait": "7s", + "memory": "{{ user `memory` }}", + "cpus": "{{ user `cpus` }}", + "disk_size": "{{user `disk_size`}}", + "headless": "{{ user `headless` }}", + "http_directory": "{{template_dir}}/http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-qemu", + "shutdown_command": "echo 'vagrant' | su -m root -c 'shutdown -p now'", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "qemu", + "vm_name": "{{ user `template` }}" + } + ], + "post-processors": [ + { + "output": "{{ user `build_directory` }}/{{user `box_basename`}}.{{.Provider}}.box", + "type": "vagrant", + "vagrantfile_template": "{{template_dir}}/vagrantfile_templates/freebsd.rb" + } + ], + "provisioners": [ + { + "environment_vars": [ + "HOME_DIR=/home/vagrant", + "http_proxy={{user `http_proxy`}}", + "https_proxy={{user `https_proxy`}}", + "no_proxy={{user `no_proxy`}}", + "pkg_branch={{user `pkg_branch`}}" + ], + "execute_command": "echo 'vagrant' | {{.Vars}} su -m root -c 'sh -eux {{.Path}}'", + "expect_disconnect": true, + "scripts": [ + "{{template_dir}}/scripts/update.sh", + "{{template_dir}}/scripts/postinstall.sh", + "{{template_dir}}/scripts/sudoers.sh", + "{{template_dir}}/../_common/vagrant.sh", + "{{template_dir}}/scripts/vmtools.sh", + "{{template_dir}}/scripts/cleanup.sh", + "{{template_dir}}/scripts/minimize.sh" + ], + "type": "shell" + } + ], + "variables": { + "box_basename": "freebsd-12.1", + "build_directory": "../../builds", + "build_timestamp": "{{isotime \"20060102150405\"}}", + "cpus": "1", + "disk_size": "65536", + "git_revision": "__unknown_git_revision__", + "headless": "", + "http_proxy": "{{env `http_proxy`}}", + "https_proxy": "{{env `https_proxy`}}", + "install_path": "freebsd-11/installerconfig", + "iso_checksum": "aa9d34b458826486999ed3e872436b6712ae38cede5ea41de4ab923e3419d461", + "iso_checksum_type": "sha256", + "iso_name": "FreeBSD-12.1-RELEASE-amd64-disc1.iso", + "memory": "1024", + "mirror": "https://download.freebsd.org/ftp", + "mirror_directory": "releases/amd64/amd64/ISO-IMAGES/12.1", + "name": "freebsd-12.1", + "no_proxy": "{{env `no_proxy`}}", + "pkg_branch": "quarterly", + "template": "freebsd-12.1-amd64", + "version": "TIMESTAMP" + } +} diff --git a/packer_templates/freebsd/freebsd-12.1-i386.json b/packer_templates/freebsd/freebsd-12.1-i386.json new file mode 100644 index 000000000..0c83c11f5 --- /dev/null +++ b/packer_templates/freebsd/freebsd-12.1-i386.json @@ -0,0 +1,210 @@ +{ + "builders": [ + { + "boot_command": [ + "<esc><wait>", + "boot -s<wait>", + "<enter><wait>", + "<wait10><wait10>", + "/bin/sh<enter><wait>", + "mdmfs -s 100m md1 /tmp<enter><wait>", + "mdmfs -s 100m md2 /mnt<enter><wait>", + "dhclient -l /tmp/dhclient.lease.em0 em0<enter><wait>", + "fetch -o /tmp/installerconfig http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} && bsdinstall script /tmp/installerconfig<enter><wait>" + ], + "boot_wait": "10s", + "memory": "{{ user `memory` }}", + "cpus": "{{ user `cpus` }}", + "disk_size": "{{user `disk_size`}}", + "guest_additions_mode": "disable", + "guest_os_type": "FreeBSD", + "headless": "{{ user `headless` }}", + "http_directory": "{{template_dir}}/http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-virtualbox", + "shutdown_command": "echo 'vagrant' | su -m root -c 'shutdown -p now'", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "virtualbox-iso", + "virtualbox_version_file": ".vbox_version", + "vm_name": "{{ user `template` }}" + }, + { + "boot_command": [ + "<esc><wait>", + "boot -s<wait>", + "<enter><wait>", + "<wait10><wait10>", + "/bin/sh<enter><wait>", + "mdmfs -s 100m md1 /tmp<enter><wait>", + "mdmfs -s 100m md2 /mnt<enter><wait>", + "dhclient -l /tmp/dhclient.lease.em0 em0<enter><wait>", + "<wait5>", + "fetch -o /tmp/installerconfig http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} && bsdinstall script /tmp/installerconfig<enter><wait>" + ], + "boot_wait": "10s", + "memory": "{{ user `memory` }}", + "cpus": "{{ user `cpus` }}", + "disk_size": "{{user `disk_size`}}", + "guest_os_type": "freebsd", + "headless": "{{ user `headless` }}", + "http_directory": "{{template_dir}}/http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-vmware", + "shutdown_command": "echo 'vagrant' | su -m root -c 'shutdown -p now'", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "vmware-iso", + "vm_name": "{{ user `template` }}", + "vmx_data": { + "cpuid.coresPerSocket": "1" + }, + "vmx_remove_ethernet_interfaces": true + }, + { + "boot_command": [ + "<esc><wait>", + "boot -s<wait>", + "<enter><wait>", + "<wait10><wait10>", + "/bin/sh<enter><wait>", + "mdmfs -s 100m md1 /tmp<enter><wait>", + "mdmfs -s 100m md2 /mnt<enter><wait>", + "dhclient -l /tmp/dhclient.lease.em0 em0<enter><wait>", + "fetch -o /tmp/installerconfig http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} && bsdinstall script /tmp/installerconfig<enter><wait>" + ], + "boot_wait": "8s", + "memory": "{{ user `memory` }}", + "cpus": "{{ user `cpus` }}", + "disk_size": "{{user `disk_size`}}", + "guest_os_type": "freebsd", + "http_directory": "{{template_dir}}/http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-parallels", + "parallels_tools_mode": "disable", + "prlctl": [ + [ + "set", + "{{.Name}}", + "--device-set", + "cdrom0", + "--iface", + "ide" + ], + [ + "set", + "{{.Name}}", + "--device-del", + "fdd0" + ], + [ + "set", + "{{.Name}}", + "--device-del", + "parallel0" + ] + ], + "prlctl_version_file": ".prlctl_version", + "shutdown_command": "echo 'vagrant' | su -m root -c 'shutdown -p now'", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "parallels-iso", + "vm_name": "{{ user `template` }}" + }, + { + "boot_command": [ + "<esc><wait>", + "boot -s<wait>", + "<enter><wait>", + "<wait10><wait10>", + "/bin/sh<enter><wait>", + "mdmfs -s 100m md1 /tmp<enter><wait>", + "mdmfs -s 100m md2 /mnt<enter><wait>", + "dhclient -l /tmp/dhclient.lease.vtnet0 vtnet0<enter><wait>", + "fetch -o /tmp/installerconfig http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} && bsdinstall script /tmp/installerconfig<enter><wait>" + ], + "boot_wait": "7s", + "memory": "{{ user `memory` }}", + "cpus": "{{ user `cpus` }}", + "disk_size": "{{user `disk_size`}}", + "headless": "{{ user `headless` }}", + "http_directory": "{{template_dir}}/http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-qemu", + "shutdown_command": "echo 'vagrant' | su -m root -c 'shutdown -p now'", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "qemu", + "vm_name": "{{ user `template` }}" + } + ], + "post-processors": [ + { + "output": "{{ user `build_directory` }}/{{user `box_basename`}}.{{.Provider}}.box", + "type": "vagrant", + "vagrantfile_template": "{{template_dir}}/vagrantfile_templates/freebsd.rb" + } + ], + "provisioners": [ + { + "environment_vars": [ + "HOME_DIR=/home/vagrant", + "http_proxy={{user `http_proxy`}}", + "https_proxy={{user `https_proxy`}}", + "no_proxy={{user `no_proxy`}}", + "pkg_branch={{user `pkg_branch`}}" + ], + "execute_command": "echo 'vagrant' | {{.Vars}} su -m root -c 'sh -eux {{.Path}}'", + "expect_disconnect": true, + "scripts": [ + "{{template_dir}}/scripts/update.sh", + "{{template_dir}}/scripts/postinstall.sh", + "{{template_dir}}/scripts/sudoers.sh", + "{{template_dir}}/../_common/vagrant.sh", + "{{template_dir}}/scripts/vmtools.sh", + "{{template_dir}}/scripts/cleanup.sh", + "{{template_dir}}/scripts/minimize.sh" + ], + "type": "shell" + } + ], + "variables": { + "box_basename": "freebsd-12.1-i386", + "build_directory": "../../builds", + "build_timestamp": "{{isotime \"20060102150405\"}}", + "cpus": "1", + "disk_size": "40960", + "git_revision": "__unknown_git_revision__", + "headless": "", + "http_proxy": "{{env `http_proxy`}}", + "https_proxy": "{{env `https_proxy`}}", + "install_path": "freebsd-11/installerconfig", + "iso_checksum": "07b10e098e7c9b5e920679d3a9b3d12628f0b918c6e3962620b7f570a82cf41d", + "iso_checksum_type": "sha256", + "iso_name": "FreeBSD-12.1-RELEASE-i386-disc1.iso", + "memory": "1024", + "mirror": "https://download.freebsd.org/ftp", + "mirror_directory": "releases/i386/i386/ISO-IMAGES/12.1", + "name": "freebsd-12.1-i386", + "no_proxy": "{{env `no_proxy`}}", + "pkg_branch": "quarterly", + "template": "freebsd-12.1-i386", + "version": "TIMESTAMP" + } +} From ef2e2cf0f19fb17687e8460a8ef9ed62c69821d7 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Wed, 30 Oct 2019 23:09:23 -0700 Subject: [PATCH 1057/1622] Add Ubuntu 19.10 and remove Ubuntu 18.10 which is now EOL Signed-off-by: Tim Smith <tsmith@chef.io> --- packer_templates/ubuntu/scripts/cleanup.sh | 5 ++++- ...untu-18.10-amd64.json => ubuntu-19.10-amd64.json} | 12 ++++++------ 2 files changed, 10 insertions(+), 7 deletions(-) rename packer_templates/ubuntu/{ubuntu-18.10-amd64.json => ubuntu-19.10-amd64.json} (97%) diff --git a/packer_templates/ubuntu/scripts/cleanup.sh b/packer_templates/ubuntu/scripts/cleanup.sh index 68988348d..37166c7d8 100644 --- a/packer_templates/ubuntu/scripts/cleanup.sh +++ b/packer_templates/ubuntu/scripts/cleanup.sh @@ -40,7 +40,10 @@ apt-get -y purge libx11-data xauth libxmuu1 libxcb1 libx11-6 libxext6; apt-get -y purge ppp pppconfig pppoeconf; # Delete oddities -apt-get -y purge popularity-contest installation-report command-not-found command-not-found-data friendly-recovery bash-completion fonts-ubuntu-font-family-console laptop-detect; +apt-get -y purge popularity-contest installation-report command-not-found friendly-recovery bash-completion fonts-ubuntu-font-family-console laptop-detect; + +# 19.10+ don't have this package so fail gracefully +apt-get -y purge command-not-found-data || true; # Exlude the files we don't need w/o uninstalling linux-firmware echo "==> Setup dpkg excludes for linux-firmware" diff --git a/packer_templates/ubuntu/ubuntu-18.10-amd64.json b/packer_templates/ubuntu/ubuntu-19.10-amd64.json similarity index 97% rename from packer_templates/ubuntu/ubuntu-18.10-amd64.json rename to packer_templates/ubuntu/ubuntu-19.10-amd64.json index b2f18727a..fddf96c48 100644 --- a/packer_templates/ubuntu/ubuntu-18.10-amd64.json +++ b/packer_templates/ubuntu/ubuntu-19.10-amd64.json @@ -260,7 +260,7 @@ } ], "variables": { - "box_basename": "ubuntu-18.10", + "box_basename": "ubuntu-19.10", "build_directory": "../../builds", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", @@ -272,16 +272,16 @@ "hyperv_generation": "2", "hyperv_switch": "{{env `hyperv_switch`}}", "guest_additions_url": "", - "iso_checksum": "cf9250781dadd919f23c9d9612212cad653e35fccc2fbcf6853f67ad09e067ba", + "iso_checksum": "921fd8b271c04aa86a321cc35b40e677f9b85f7903bf2204efb2389b0f0a64c1", "iso_checksum_type": "sha256", - "iso_name": "ubuntu-18.10-server-amd64.iso", + "iso_name": "ubuntu-19.10-server-amd64.iso", "memory": "1024", "mirror": "http://cdimage.ubuntu.com", - "mirror_directory": "ubuntu/releases/18.10/release", - "name": "ubuntu-18.10", + "mirror_directory": "ubuntu/releases/19.10/release", + "name": "ubuntu-19.10", "no_proxy": "{{env `no_proxy`}}", "preseed_path": "preseed.cfg", - "template": "ubuntu-18.10-amd64", + "template": "ubuntu-19.10-amd64", "version": "TIMESTAMP" } } From ba42f728ac1c577d9bd8dc8be84579dbea68fb4c Mon Sep 17 00:00:00 2001 From: Raphael Hoegger <blog@pfuender.net> Date: Wed, 27 Nov 2019 09:10:55 +0100 Subject: [PATCH 1058/1622] upgrading debian 10.1 -> 10.2 Signed-off-by: Raphael Hoegger <blog@pfuender.net> --- ...debian-10.1-amd64.json => debian-10.2-amd64.json} | 12 ++++++------ .../{debian-10.1-i386.json => debian-10.2-i386.json} | 12 ++++++------ 2 files changed, 12 insertions(+), 12 deletions(-) rename packer_templates/debian/{debian-10.1-amd64.json => debian-10.2-amd64.json} (96%) rename packer_templates/debian/{debian-10.1-i386.json => debian-10.2-i386.json} (96%) diff --git a/packer_templates/debian/debian-10.1-amd64.json b/packer_templates/debian/debian-10.2-amd64.json similarity index 96% rename from packer_templates/debian/debian-10.1-amd64.json rename to packer_templates/debian/debian-10.2-amd64.json index 20f0860a5..4f27cbcf9 100644 --- a/packer_templates/debian/debian-10.1-amd64.json +++ b/packer_templates/debian/debian-10.2-amd64.json @@ -197,7 +197,7 @@ } ], "variables": { - "box_basename": "debian-10.1", + "box_basename": "debian-10.2", "build_directory": "../../builds", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", @@ -207,16 +207,16 @@ "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", "guest_additions_url": "", - "iso_checksum": "7915fdb77a0c2623b4481fc5f0a8052330defe1cde1e0834ff233818dc6f301e", + "iso_checksum": "e43fef979352df15056ac512ad96a07b515cb8789bf0bfd86f99ed0404f885f5", "iso_checksum_type": "sha256", - "iso_name": "debian-10.1.0-amd64-netinst.iso", + "iso_name": "debian-10.2.0-amd64-netinst.iso", "memory": "1024", "mirror": "http://cdimage.debian.org/cdimage/release", - "mirror_directory": "10.1.0/amd64/iso-cd", - "name": "debian-10.1", + "mirror_directory": "10.2.0/amd64/iso-cd", + "name": "debian-10.2", "no_proxy": "{{env `no_proxy`}}", "preseed_path": "debian-9/preseed.cfg", - "template": "debian-10.1-amd64", + "template": "debian-10.2-amd64", "version": "TIMESTAMP" } } diff --git a/packer_templates/debian/debian-10.1-i386.json b/packer_templates/debian/debian-10.2-i386.json similarity index 96% rename from packer_templates/debian/debian-10.1-i386.json rename to packer_templates/debian/debian-10.2-i386.json index 37d217949..5e2e20d6d 100644 --- a/packer_templates/debian/debian-10.1-i386.json +++ b/packer_templates/debian/debian-10.2-i386.json @@ -197,7 +197,7 @@ } ], "variables": { - "box_basename": "debian-10.1-i386", + "box_basename": "debian-10.2-i386", "build_directory": "../../builds", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", @@ -207,16 +207,16 @@ "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", "guest_additions_url": "", - "iso_checksum": "78ea01feb0f0d8a8c274333a3b2e6261c93b33135c26aa5b7c791d0f57524eb5", + "iso_checksum": "883d0ca91d2f21ce0a0e0e481f97bf73d50a0232f467e5200aaea79849fc74fd", "iso_checksum_type": "sha256", - "iso_name": "debian-10.1.0-i386-netinst.iso", + "iso_name": "debian-10.2.0-i386-netinst.iso", "memory": "1024", "mirror": "http://cdimage.debian.org/cdimage/release", - "mirror_directory": "10.1.0/i386/iso-cd", - "name": "debian-10.1-i386", + "mirror_directory": "10.2.0/i386/iso-cd", + "name": "debian-10.2-i386", "no_proxy": "{{env `no_proxy`}}", "preseed_path": "debian-9/preseed.cfg", - "template": "debian-10.1-i386", + "template": "debian-10.2-i386", "version": "TIMESTAMP" } } From bc142d1595b5f866bad92d7e92f3ee84ae615652 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Tue, 3 Dec 2019 14:29:17 -0800 Subject: [PATCH 1059/1622] Fix comment spacing in the ks files Signed-off-by: Tim Smith <tsmith@chef.io> --- packer_templates/centos/http/6/ks.cfg | 2 +- packer_templates/centos/http/7/ks.cfg | 2 +- packer_templates/centos/http/8/ks.cfg | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packer_templates/centos/http/6/ks.cfg b/packer_templates/centos/http/6/ks.cfg index c24d3034d..356d34590 100644 --- a/packer_templates/centos/http/6/ks.cfg +++ b/packer_templates/centos/http/6/ks.cfg @@ -72,7 +72,7 @@ sed -i -e 's/\(^SELINUX=\).*$/\1permissive/' /etc/selinux/config echo "%vagrant ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers.d/vagrant chmod 0440 /etc/sudoers.d/vagrant -#Enable hyper-v daemons only if using hyper-v virtualization +# Enable hyper-v daemons only if using hyper-v virtualization if [ $(virt-what) == "hyperv" ]; then ifup eth0 yum -y install hyperv-daemons diff --git a/packer_templates/centos/http/7/ks.cfg b/packer_templates/centos/http/7/ks.cfg index 6e7e04c3a..e188bb703 100644 --- a/packer_templates/centos/http/7/ks.cfg +++ b/packer_templates/centos/http/7/ks.cfg @@ -67,7 +67,7 @@ rsync echo "%vagrant ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers.d/vagrant chmod 0440 /etc/sudoers.d/vagrant -#Enable hyper-v daemons only if using hyper-v virtualization +# Enable hyper-v daemons only if using hyper-v virtualization if [ $(virt-what) == "hyperv" ]; then yum -y install hyperv-daemons cifs-utils systemctl enable hypervvssd diff --git a/packer_templates/centos/http/8/ks.cfg b/packer_templates/centos/http/8/ks.cfg index 36617d266..c7912b37d 100644 --- a/packer_templates/centos/http/8/ks.cfg +++ b/packer_templates/centos/http/8/ks.cfg @@ -70,7 +70,7 @@ network-scripts echo "%vagrant ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers.d/vagrant chmod 0440 /etc/sudoers.d/vagrant -#Enable hyper-v daemons only if using hyper-v virtualization +# Enable hyper-v daemons only if using hyper-v virtualization if [ $(virt-what) == "hyperv" ]; then dnf -y install hyperv-daemons cifs-utils systemctl enable hypervvssd From 54b0c425104f2ecc1c636a7a76ba4862450076cb Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Tue, 3 Dec 2019 14:29:34 -0800 Subject: [PATCH 1060/1622] Update the Oracle Linux repos when necessary This unlocks another 199 updates for EL 6 Signed-off-by: Tim Smith <tsmith@chef.io> --- packer_templates/centos/scripts/update.sh | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/packer_templates/centos/scripts/update.sh b/packer_templates/centos/scripts/update.sh index 131d8cdb9..f56122591 100644 --- a/packer_templates/centos/scripts/update.sh +++ b/packer_templates/centos/scripts/update.sh @@ -1,5 +1,12 @@ #!/bin/sh -eux yum -y update; + +# make sure we update the repo structure on Oracle Linux and then update again +if [ -f "/usr/bin/ol_yum_configure.sh" ]; then + /usr/bin/ol_yum_configure.sh + yum -y update +fi + reboot; sleep 60; From ce9427b8d2fa9928e8c1fd8c50f42985670227d1 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Tue, 3 Dec 2019 14:47:41 -0800 Subject: [PATCH 1061/1622] Update to the latest hardenedbsd 11 / new mirror This definition was entirely broken Signed-off-by: Tim Smith <tsmith@chef.io> --- packer_templates/hardenedbsd/hardenedbsd-11-amd64.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/packer_templates/hardenedbsd/hardenedbsd-11-amd64.json b/packer_templates/hardenedbsd/hardenedbsd-11-amd64.json index 5eb5745fc..6c62a0ad2 100644 --- a/packer_templates/hardenedbsd/hardenedbsd-11-amd64.json +++ b/packer_templates/hardenedbsd/hardenedbsd-11-amd64.json @@ -194,12 +194,12 @@ "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", "install_path": "hardenedbsd-11/installerconfig", - "iso_checksum": "c720ebf3989397a6703fa11f36679a277c2cc2eb5637dac9e404adf005bd6b9b", + "iso_checksum": "9cb9d0880b423b0f47a001c9606bda3742f485bcfab19dda20c7cccb3d71bee2", "iso_checksum_type": "sha256", - "iso_name": "HardenedBSD-11-STABLE-v1100055.2-amd64-disc1.iso", + "iso_name": "disc1.iso", "memory": "1024", - "mirror": "https://installer.hardenedbsd.org", - "mirror_directory": "pub/HardenedBSD/releases/amd64/amd64/ISO-IMAGES/hardenedbsd-11-stable-20180420-1", + "mirror": "http://ci-01.nyi.hardenedbsd.org", + "mirror_directory": "pub/hardenedbsd/11-stable/amd64/amd64/build-3", "name": "hardenedbsd-11", "no_proxy": "{{env `no_proxy`}}", "template": "hardenedbsd-11-amd64", From ab8d7b5a214691e17f454ab64be72283636beff6 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Tue, 3 Dec 2019 15:02:12 -0800 Subject: [PATCH 1062/1622] Improve old package cleanup on RHEL boxes Use the major_version variable and don't install utils we don't need on RHEL 8+ Signed-off-by: Tim Smith <tsmith@chef.io> --- packer_templates/centos/scripts/cleanup.sh | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/packer_templates/centos/scripts/cleanup.sh b/packer_templates/centos/scripts/cleanup.sh index 22fe55c55..76950dd6c 100644 --- a/packer_templates/centos/scripts/cleanup.sh +++ b/packer_templates/centos/scripts/cleanup.sh @@ -61,17 +61,13 @@ fi find /var/log/ -name *.log -exec rm -f {} \; # remove previous kernels that yum preserved for rollback -# yum-utils isn't in RHEL 5 so don't try to run this -if ! lsb_release -a | grep -qE '^Release:\s*5'; then +if [ "$major_version" -ge 8 ]; then + dnf remove -y $(dnf repoquery --installonly --latest-limit=-1 -q) +elif [ "$major_version" -gt 5 ]; then # yum-utils isn't in RHEL 5 so don't try to run this if ! command -v package-cleanup >/dev/null 2>&1; then - yum install -y yum-utils - fi - - if [ "$major_version" -ge 8 ]; then - dnf remove -y $(dnf repoquery --installonly --latest-limit=-1 -q) - else - package-cleanup --oldkernels --count=1 -y + yum install -y yum-utils fi + package-cleanup --oldkernels --count=1 -y fi # we try to remove these in the ks file, but they're still there @@ -96,4 +92,4 @@ yum remove -y \ ql2xxx-firmware \ rt61pci-firmware \ rt73usb-firmware \ - zd1211-firmware + zd1211-firmware \ No newline at end of file From 6d4515fb6d5f358cb456cefab05e86d6275d6815 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Wed, 4 Dec 2019 10:49:41 -0800 Subject: [PATCH 1063/1622] Add parallels / vmware to Scientific Linux Signed-off-by: Tim Smith <tsmith@chef.io> --- .../scientific-7.7-x86_64.json | 119 +++++++++++++++--- 1 file changed, 105 insertions(+), 14 deletions(-) diff --git a/packer_templates/scientificlinux/scientific-7.7-x86_64.json b/packer_templates/scientificlinux/scientific-7.7-x86_64.json index cf0f15a7a..cffa4c97a 100644 --- a/packer_templates/scientificlinux/scientific-7.7-x86_64.json +++ b/packer_templates/scientificlinux/scientific-7.7-x86_64.json @@ -22,22 +22,111 @@ "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", "type": "virtualbox-iso", - "vboxmanage": [ - [ - "modifyvm", - "{{.Name}}", - "--memory", - "{{ user `memory` }}" - ], - [ - "modifyvm", - "{{.Name}}", - "--cpus", - "{{ user `cpus` }}" - ] - ], + "memory": "{{ user `memory` }}", + "cpus": "{{ user `cpus` }}", "virtualbox_version_file": ".vbox_version", "vm_name": "{{ user `template` }}" + }, + { + "boot_command": [ + "<up><wait><tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": "{{user `disk_size`}}", + "guest_os_type": "centos-64", + "headless": "{{ user `headless` }}", + "http_directory": "{{template_dir}}/http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-vmware", + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "tools_upload_flavor": "linux", + "type": "vmware-iso", + "vm_name": "{{ user `template` }}", + "memory": "{{ user `memory` }}", + "cpus": "{{ user `cpus` }}", + "vmx_data": { + "cpuid.coresPerSocket": "1" + }, + "vmx_remove_ethernet_interfaces": true + }, + { + "boot_command": [ + "<up><wait><tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": "{{user `disk_size`}}", + "guest_os_type": "centos", + "http_directory": "{{template_dir}}/http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-parallels", + "parallels_tools_flavor": "lin", + "memory": "{{ user `memory` }}", + "cpus": "{{ user `cpus` }}", + "prlctl_version_file": ".prlctl_version", + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "parallels-iso", + "vm_name": "{{ user `template` }}" + }, + { + "boot_command": [ + "<wait5><tab> text ks=hd:fd0:/ks.cfg<enter><wait5><esc>" + ], + "boot_wait": "10s", + "cpus": "{{ user `cpus` }}", + "disk_size": "{{user `disk_size`}}", + "floppy_files": [ + "{{template_dir}}/http/7/ks.cfg" + ], + "generation": "{{user `hyperv_generation`}}", + "guest_additions_mode": "disable", + "http_directory": "{{template_dir}}/http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "memory": "{{ user `memory` }}", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-hyperv", + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_timeout": "10000s", + "ssh_username": "vagrant", + "switch_name": "{{ user `hyperv_switch`}}", + "type": "hyperv-iso", + "vm_name": "{{ user `template` }}" + }, + { + "boot_command": [ + "<up><wait><tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" + ], + "boot_wait": "10s", + "memory": "{{ user `memory` }}", + "cpus": "{{ user `cpus` }}", + "disk_size": "{{user `disk_size`}}", + "headless": "{{ user `headless` }}", + "http_directory": "{{template_dir}}/http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-qemu", + "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "qemu", + "vm_name": "{{ user `template` }}" } ], "post-processors": [ @@ -63,6 +152,8 @@ "{{template_dir}}/../centos/scripts/networking.sh", "{{template_dir}}/../_common/vagrant.sh", "{{template_dir}}/../_common/virtualbox.sh", + "{{template_dir}}/../_common/vmware.sh", + "{{template_dir}}/../_common/parallels.sh", "{{template_dir}}/../centos/scripts/cleanup.sh", "{{template_dir}}/../_common/minimize.sh" ], From 925785b073abea8ef4a89b6e20d58f2ca68500de Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Wed, 4 Dec 2019 12:17:32 -0800 Subject: [PATCH 1064/1622] Update the build list Signed-off-by: Tim Smith <tsmith@chef.io> --- builds.yml | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/builds.yml b/builds.yml index dcf4ea345..cafbc7e23 100644 --- a/builds.yml +++ b/builds.yml @@ -11,10 +11,11 @@ public: - 'debian-8.11' - 'debian-9.11-i386' - 'debian-9.11' -- 'debian-10.1-i386' -- 'debian-10.1' +- 'debian-10.2-i386' +- 'debian-10.2' - 'fedora-29' - 'fedora-30' +- 'fedora-31' - 'freebsd-11.3-i386' - 'freebsd-11.3' - 'freebsd-12.0-i386' @@ -27,24 +28,27 @@ public: - 'oracle-6.10-i386' - 'oracle-6.10' - 'oracle-7.7' +- 'oracle-8.1' - 'scientific-7.7' - 'ubuntu-16.04-i386' - 'ubuntu-16.04' - 'ubuntu-18.04' - 'ubuntu-18.10' - 'ubuntu-19.04' +- 'ubuntu-19.10' # slug box name: text string from standard box name to match (generally the same) slugs: - 'centos-8': 'centos-8' - 'centos-7': 'centos-7' - 'centos-6': 'centos-6' 'centos-5': 'centos-5' + 'centos-6': 'centos-6' + 'centos-7': 'centos-7' + 'centos-8': 'centos-8' 'debian-8': 'debian-8' 'debian-9': 'debian-9' 'debian-10': 'debian-10' 'oracle-6': 'oracle-6' 'oracle-7': 'oracle-7' + 'oracle-8': 'oracle-8' 'scientific-7': 'scientific-7' 'freebsd-11': 'freebsd-11' 'freebsd-12': 'freebsd-12' From 34c076f1b01c9cbc7f06669f1e2d84bfd34dc064 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Wed, 4 Dec 2019 12:18:11 -0800 Subject: [PATCH 1065/1622] Remove invalid tools flavor in hardenedbsd for vmware This isn't a valid option Signed-off-by: Tim Smith <tsmith@chef.io> --- packer_templates/hardenedbsd/hardenedbsd-11-amd64.json | 1 - packer_templates/oraclelinux/oracle-7.7-x86_64.json | 8 ++++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/packer_templates/hardenedbsd/hardenedbsd-11-amd64.json b/packer_templates/hardenedbsd/hardenedbsd-11-amd64.json index 6c62a0ad2..6e647bb84 100644 --- a/packer_templates/hardenedbsd/hardenedbsd-11-amd64.json +++ b/packer_templates/hardenedbsd/hardenedbsd-11-amd64.json @@ -62,7 +62,6 @@ "ssh_port": 22, "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", - "tools_upload_flavor": "freebsd", "type": "vmware-iso", "vm_name": "{{ user `template` }}", "vmx_data": { diff --git a/packer_templates/oraclelinux/oracle-7.7-x86_64.json b/packer_templates/oraclelinux/oracle-7.7-x86_64.json index 3c81dba35..fd881bd1e 100644 --- a/packer_templates/oraclelinux/oracle-7.7-x86_64.json +++ b/packer_templates/oraclelinux/oracle-7.7-x86_64.json @@ -2,7 +2,7 @@ "builders": [ { "boot_command": [ - "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" + "<up><wait><tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", @@ -29,7 +29,7 @@ }, { "boot_command": [ - "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" + "<up><wait><tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", @@ -57,7 +57,7 @@ }, { "boot_command": [ - "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" + "<up><wait><tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", @@ -81,7 +81,7 @@ }, { "boot_command": [ - "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" + "<up><wait><tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], "boot_wait": "10s", "memory": "{{ user `memory` }}", From d95fc22c1b116636f5bcd9a5de19ef0aa2801d31 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Wed, 4 Dec 2019 12:18:29 -0800 Subject: [PATCH 1066/1622] Fix non-slug boxes not being moved into the uploaded dir Signed-off-by: Tim Smith <tsmith@chef.io> --- lib/bento/upload.rb | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/lib/bento/upload.rb b/lib/bento/upload.rb index 17f20fcce..cc4b5139e 100644 --- a/lib/bento/upload.rb +++ b/lib/bento/upload.rb @@ -44,10 +44,11 @@ def upload_box(md_file) shellout(upload_cmd) slug_name = lookup_slug(md_data['name']) - next if slug_name.nil? - banner("Uploading slug bento/#{slug_name} from #{md_data['name']} version:#{md_data['version']} provider:#{prov}...") - upload_cmd = "vagrant cloud publish bento/#{slug_name} #{md_data['version']} #{prov} builds/#{prov_data['file']} --description '#{slug_desc(slug_name)}' --short-description '#{slug_desc(slug_name)}' --version-description '#{ver_desc(md_data, prov)}' --force --release" - shellout(upload_cmd) + if slug_name + banner("Uploading slug bento/#{slug_name} from #{md_data['name']} version:#{md_data['version']} provider:#{prov}...") + upload_cmd = "vagrant cloud publish bento/#{slug_name} #{md_data['version']} #{prov} builds/#{prov_data['file']} --description '#{slug_desc(slug_name)}' --short-description '#{slug_desc(slug_name)}' --version-description '#{ver_desc(md_data, prov)}' --force --release" + shellout(upload_cmd) + end # move the box file to the completed directory FileUtils.mv(File.join('builds', prov_data['file']), File.join('builds', 'uploaded', prov_data['file'])) From fa040dfdcc23e75714c608e2e366ebc71cb7a3d7 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Wed, 4 Dec 2019 12:18:49 -0800 Subject: [PATCH 1067/1622] Make hardened bsd easier to diff with standard freebsd Signed-off-by: Tim Smith <tsmith@chef.io> --- packer_templates/hardenedbsd/hardenedbsd-11-amd64.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packer_templates/hardenedbsd/hardenedbsd-11-amd64.json b/packer_templates/hardenedbsd/hardenedbsd-11-amd64.json index 6e647bb84..f248c39e5 100644 --- a/packer_templates/hardenedbsd/hardenedbsd-11-amd64.json +++ b/packer_templates/hardenedbsd/hardenedbsd-11-amd64.json @@ -13,6 +13,8 @@ "fetch -o /tmp/installerconfig http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} && bsdinstall script /tmp/installerconfig<enter><wait>" ], "boot_wait": "10s", + "memory": "{{ user `memory` }}", + "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "guest_additions_mode": "disable", "guest_os_type": "FreeBSD_64", @@ -28,8 +30,6 @@ "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", "type": "virtualbox-iso", - "memory": "{{ user `memory` }}", - "cpus": "{{ user `cpus` }}", "virtualbox_version_file": ".vbox_version", "vm_name": "{{ user `template` }}" }, From 68c5279497d45a0b073dc5fefa431d73c1bcbf33 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Wed, 4 Dec 2019 12:30:32 -0800 Subject: [PATCH 1068/1622] Add Oracle 8.1 template Signed-off-by: Tim Smith <tsmith@chef.io> --- .../oraclelinux/oracle-8.1-x86_64.json | 160 ++++++++++++++++++ 1 file changed, 160 insertions(+) create mode 100644 packer_templates/oraclelinux/oracle-8.1-x86_64.json diff --git a/packer_templates/oraclelinux/oracle-8.1-x86_64.json b/packer_templates/oraclelinux/oracle-8.1-x86_64.json new file mode 100644 index 000000000..b5b31d694 --- /dev/null +++ b/packer_templates/oraclelinux/oracle-8.1-x86_64.json @@ -0,0 +1,160 @@ +{ + "builders": [ + { + "boot_command": [ + "<up><wait><tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": "{{user `disk_size`}}", + "guest_additions_url": "{{ user `guest_additions_url` }}", + "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "guest_os_type": "Oracle_64", + "hard_drive_interface": "sata", + "headless": "{{ user `headless` }}", + "http_directory": "{{template_dir}}/../centos/http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-virtualbox", + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "virtualbox-iso", + "memory": "{{ user `memory` }}", + "cpus": "{{ user `cpus` }}", + "virtualbox_version_file": ".vbox_version", + "vm_name": "{{ user `template` }}" + }, + { + "boot_command": [ + "<up><wait><tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": "{{user `disk_size`}}", + "guest_os_type": "oraclelinux-64", + "headless": "{{ user `headless` }}", + "http_directory": "{{template_dir}}/../centos/http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-vmware", + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "tools_upload_flavor": "linux", + "type": "vmware-iso", + "vm_name": "{{ user `template` }}", + "memory": "{{ user `memory` }}", + "cpus": "{{ user `cpus` }}", + "vmx_data": { + "cpuid.coresPerSocket": "1" + }, + "vmx_remove_ethernet_interfaces": true + }, + { + "boot_command": [ + "<up><wait><tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": "{{user `disk_size`}}", + "guest_os_type": "centos", + "http_directory": "{{template_dir}}/../centos/http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-parallels", + "parallels_tools_flavor": "lin", + "memory": "{{ user `memory` }}", + "cpus": "{{ user `cpus` }}", + "prlctl_version_file": ".prlctl_version", + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "parallels-iso", + "vm_name": "{{ user `template` }}" + }, + { + "boot_command": [ + "<up><wait><tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" + ], + "boot_wait": "10s", + "memory": "{{ user `memory` }}", + "cpus": "{{ user `cpus` }}", + "disk_size": "{{user `disk_size`}}", + "headless": "{{ user `headless` }}", + "http_directory": "{{template_dir}}/../centos/http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-qemu", + "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "qemu", + "vm_name": "{{ user `template` }}" + } + ], + "post-processors": [ + { + "output": "{{ user `build_directory` }}/{{user `box_basename`}}.{{.Provider}}.box", + "type": "vagrant" + } + ], + "provisioners": [ + { + "environment_vars": [ + "HOME_DIR=/home/vagrant", + "http_proxy={{user `http_proxy`}}", + "https_proxy={{user `https_proxy`}}", + "no_proxy={{user `no_proxy`}}" + ], + "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", + "expect_disconnect": true, + "scripts": [ + "{{template_dir}}/../centos/scripts/update.sh", + "{{template_dir}}/../centos/scripts/networking.sh", + "{{template_dir}}/../_common/motd.sh", + "{{template_dir}}/../_common/sshd.sh", + "{{template_dir}}/../_common/vagrant.sh", + "{{template_dir}}/../_common/virtualbox.sh", + "{{template_dir}}/../_common/vmware.sh", + "{{template_dir}}/../_common/parallels.sh", + "{{template_dir}}/../centos/scripts/cleanup.sh", + "{{template_dir}}/../_common/minimize.sh" + ], + "type": "shell" + } + ], + "variables": { + "arch": "64", + "box_basename": "oracle-8.1", + "build_directory": "../../builds", + "build_timestamp": "{{isotime \"2019102650405\"}}", + "cpus": "1", + "disk_size": "65536", + "git_revision": "__unknown_git_revision__", + "headless": "", + "http_proxy": "{{env `http_proxy`}}", + "https_proxy": "{{env `https_proxy`}}", + "guest_additions_url": "", + "iso_checksum": "8a8afc79c3e30209058201ff91a662b030f13951c7fa4d896f89dd356b3c6f22", + "iso_checksum_type": "sha256", + "iso_name": "OracleLinux-R8-U1-x86_64-dvd.iso", + "ks_path": "8/ks.cfg", + "memory": "1024", + "mirror": "http://mirrors.dotsrc.org/oracle-linux", + "mirror_directory": "OL8/u1/x86_64", + "name": "oracle-8.1", + "no_proxy": "{{env `no_proxy`}}", + "template": "oracle-8.1-x86_64", + "version": "TIMESTAMP" + } +} From 1684c9434fd7c323fa88c4143d6a4f23599aa326 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Wed, 4 Dec 2019 13:26:15 -0800 Subject: [PATCH 1069/1622] Use DNF in scripts when on EL 8+ Signed-off-by: Tim Smith <tsmith@chef.io> --- packer_templates/centos/scripts/cleanup.sh | 13 ++++++++++--- packer_templates/centos/scripts/update.sh | 13 +++++++++++-- 2 files changed, 21 insertions(+), 5 deletions(-) diff --git a/packer_templates/centos/scripts/cleanup.sh b/packer_templates/centos/scripts/cleanup.sh index 76950dd6c..281cc2435 100644 --- a/packer_templates/centos/scripts/cleanup.sh +++ b/packer_templates/centos/scripts/cleanup.sh @@ -5,11 +5,18 @@ distro="`rpm -qf --queryformat '%{NAME}' /etc/redhat-release | cut -f 1 -d '-'`" major_version="`sed 's/^.\+ release \([.0-9]\+\).*/\1/' /etc/redhat-release | awk -F. '{print $1}'`"; +# make sure we use dnf on EL 8+ +if [ "$major_version" -ge 8 ]; then + pkg_cmd="dnf" +else + pkg_cmd="yum" +fi + # Remove development and kernel source packages -yum -y remove gcc cpp kernel-devel kernel-headers; +$pkg_cmd -y remove gcc cpp kernel-devel kernel-headers; if [ "$distro" != 'redhat' ]; then - yum -y clean all; + $pkg_cmd -y clean all; fi # Clean up network interface persistence @@ -72,7 +79,7 @@ fi # we try to remove these in the ks file, but they're still there # in the builds so let's remove them here to be sure :shrug: -yum remove -y \ +$pkg_cmd remove -y \ aic94xx-firmware \ atmel-firmware \ bfa-firmware \ diff --git a/packer_templates/centos/scripts/update.sh b/packer_templates/centos/scripts/update.sh index f56122591..fe6b85f89 100644 --- a/packer_templates/centos/scripts/update.sh +++ b/packer_templates/centos/scripts/update.sh @@ -1,8 +1,17 @@ #!/bin/sh -eux -yum -y update; +# determine the major EL version we're runninng +major_version="`sed 's/^.\+ release \([.0-9]\+\).*/\1/' /etc/redhat-release | awk -F. '{print $1}'`"; -# make sure we update the repo structure on Oracle Linux and then update again +# make sure we use dnf on EL 8+ +if [ "$major_version" -ge 8 ]; then + dnf -y update +else + yum -y update +fi + +# Updating the oracle release on at least OL 6 updates the repos and unlocks a whole +# new set of updates that need to be applied. If this script is there it should be run if [ -f "/usr/bin/ol_yum_configure.sh" ]; then /usr/bin/ol_yum_configure.sh yum -y update From 6b32f4e55e4dbf429d7a8819c206f9641bb5db24 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Wed, 4 Dec 2019 13:26:29 -0800 Subject: [PATCH 1070/1622] Truncate the logs instead of deleting them Signed-off-by: Tim Smith <tsmith@chef.io> --- packer_templates/centos/scripts/cleanup.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packer_templates/centos/scripts/cleanup.sh b/packer_templates/centos/scripts/cleanup.sh index 281cc2435..0ae6ae5c1 100644 --- a/packer_templates/centos/scripts/cleanup.sh +++ b/packer_templates/centos/scripts/cleanup.sh @@ -64,8 +64,8 @@ _EOF_ chmod +x /etc/rc.d/rc.local fi -# delete any logs that have built up during the install -find /var/log/ -name *.log -exec rm -f {} \; +# truncate any logs that have built up during the install +find /var/log -type f -exec truncate --size=0 {} \; # remove previous kernels that yum preserved for rollback if [ "$major_version" -ge 8 ]; then From 6a9f954b123a38c5eeea72a4e373187c3c1e62d5 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Wed, 4 Dec 2019 13:30:33 -0800 Subject: [PATCH 1071/1622] Clear the history to avoid showing our install commands No need for any of this in history Signed-off-by: Tim Smith <tsmith@chef.io> --- packer_templates/amazonlinux/scripts/cleanup.sh | 3 +++ packer_templates/centos/scripts/cleanup.sh | 5 ++++- packer_templates/debian/scripts/cleanup.sh | 3 +++ packer_templates/fedora/scripts/cleanup.sh | 3 +++ packer_templates/opensuse/scripts/cleanup.sh | 3 +++ packer_templates/sles/scripts/cleanup.sh | 3 +++ packer_templates/ubuntu/scripts/cleanup.sh | 3 +++ 7 files changed, 22 insertions(+), 1 deletion(-) diff --git a/packer_templates/amazonlinux/scripts/cleanup.sh b/packer_templates/amazonlinux/scripts/cleanup.sh index 5d4b2cc9d..06b9c5d52 100644 --- a/packer_templates/amazonlinux/scripts/cleanup.sh +++ b/packer_templates/amazonlinux/scripts/cleanup.sh @@ -57,3 +57,6 @@ find /var/log/ -name *.log -exec rm -f {} \; # remove previous kernels that yum preserved for rollback yum install -y yum-utils package-cleanup --oldkernels --count=1 -y + +# clear the history so our install isn't there +export HISTSIZE=0 \ No newline at end of file diff --git a/packer_templates/centos/scripts/cleanup.sh b/packer_templates/centos/scripts/cleanup.sh index 0ae6ae5c1..df92c141f 100644 --- a/packer_templates/centos/scripts/cleanup.sh +++ b/packer_templates/centos/scripts/cleanup.sh @@ -99,4 +99,7 @@ $pkg_cmd remove -y \ ql2xxx-firmware \ rt61pci-firmware \ rt73usb-firmware \ - zd1211-firmware \ No newline at end of file + zd1211-firmware + +# clear the history so our install isn't there +export HISTSIZE=0 \ No newline at end of file diff --git a/packer_templates/debian/scripts/cleanup.sh b/packer_templates/debian/scripts/cleanup.sh index 8b8deeaf8..79d008189 100644 --- a/packer_templates/debian/scripts/cleanup.sh +++ b/packer_templates/debian/scripts/cleanup.sh @@ -42,3 +42,6 @@ apt-get -y clean; # delete any logs that have built up during the install find /var/log/ -name *.log -exec rm -f {} \; + +# clear the history so our install isn't there +export HISTSIZE=0 \ No newline at end of file diff --git a/packer_templates/fedora/scripts/cleanup.sh b/packer_templates/fedora/scripts/cleanup.sh index ab741486c..3ddff6507 100644 --- a/packer_templates/fedora/scripts/cleanup.sh +++ b/packer_templates/fedora/scripts/cleanup.sh @@ -15,3 +15,6 @@ find /var/log/ -name *.log -exec rm -f {} \; # Remove any non-loopback network configs find /etc/sysconfig/network-scripts -name "ifcfg-*" -not -name "ifcfg-lo" -exec rm -f {} \; + +# clear the history so our install isn't there +export HISTSIZE=0 \ No newline at end of file diff --git a/packer_templates/opensuse/scripts/cleanup.sh b/packer_templates/opensuse/scripts/cleanup.sh index c7cb08725..4d336e400 100644 --- a/packer_templates/opensuse/scripts/cleanup.sh +++ b/packer_templates/opensuse/scripts/cleanup.sh @@ -12,3 +12,6 @@ touch /etc/udev/rules.d/75-persistent-net-generator.rules; # delete any logs that have built up during the install find /var/log/ -name *.log -exec rm -f {} \; + +# clear the history so our install isn't there +export HISTSIZE=0 \ No newline at end of file diff --git a/packer_templates/sles/scripts/cleanup.sh b/packer_templates/sles/scripts/cleanup.sh index 5acb7eb0d..962e981c5 100644 --- a/packer_templates/sles/scripts/cleanup.sh +++ b/packer_templates/sles/scripts/cleanup.sh @@ -11,3 +11,6 @@ touch /etc/udev/rules.d/75-persistent-net-generator.rules; # delete any logs that have built up during the install find /var/log/ -name *.log -exec rm -f {} \; + +# clear the history so our install isn't there +export HISTSIZE=0 \ No newline at end of file diff --git a/packer_templates/ubuntu/scripts/cleanup.sh b/packer_templates/ubuntu/scripts/cleanup.sh index 37166c7d8..344fc4fd8 100644 --- a/packer_templates/ubuntu/scripts/cleanup.sh +++ b/packer_templates/ubuntu/scripts/cleanup.sh @@ -72,3 +72,6 @@ find /var/log/ -name *.log -exec rm -f {} \; # Blank netplan machine-id (DUID) so machines get unique ID generated on boot. truncate -s 0 /etc/machine-id + +# clear the history so our install isn't there +export HISTSIZE=0 \ No newline at end of file From a710f2a6959dba00890554e9905b28753cd6d1d1 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Wed, 4 Dec 2019 13:30:52 -0800 Subject: [PATCH 1072/1622] Truncate logs everywhere Signed-off-by: Tim Smith <tsmith@chef.io> --- packer_templates/amazonlinux/scripts/cleanup.sh | 4 ++-- packer_templates/debian/scripts/cleanup.sh | 4 ++-- packer_templates/fedora/scripts/cleanup.sh | 6 ++---- packer_templates/opensuse/scripts/cleanup.sh | 4 ++-- packer_templates/sles/scripts/cleanup.sh | 4 ++-- packer_templates/ubuntu/scripts/cleanup.sh | 4 ++-- 6 files changed, 12 insertions(+), 14 deletions(-) diff --git a/packer_templates/amazonlinux/scripts/cleanup.sh b/packer_templates/amazonlinux/scripts/cleanup.sh index 06b9c5d52..db00a4c36 100644 --- a/packer_templates/amazonlinux/scripts/cleanup.sh +++ b/packer_templates/amazonlinux/scripts/cleanup.sh @@ -51,8 +51,8 @@ _EOF_ chmod +x /etc/rc.d/rc.local fi -# delete any logs that have built up during the install -find /var/log/ -name *.log -exec rm -f {} \; +# truncate any logs that have built up during the install +find /var/log -type f -exec truncate --size=0 {} \; # remove previous kernels that yum preserved for rollback yum install -y yum-utils diff --git a/packer_templates/debian/scripts/cleanup.sh b/packer_templates/debian/scripts/cleanup.sh index 79d008189..02c095afe 100644 --- a/packer_templates/debian/scripts/cleanup.sh +++ b/packer_templates/debian/scripts/cleanup.sh @@ -40,8 +40,8 @@ apt-get -y purge installation-report; apt-get -y autoremove; apt-get -y clean; -# delete any logs that have built up during the install -find /var/log/ -name *.log -exec rm -f {} \; +# truncate any logs that have built up during the install +find /var/log -type f -exec truncate --size=0 {} \; # clear the history so our install isn't there export HISTSIZE=0 \ No newline at end of file diff --git a/packer_templates/fedora/scripts/cleanup.sh b/packer_templates/fedora/scripts/cleanup.sh index 3ddff6507..d39f3275f 100644 --- a/packer_templates/fedora/scripts/cleanup.sh +++ b/packer_templates/fedora/scripts/cleanup.sh @@ -8,10 +8,8 @@ dnf -y clean all --enablerepo=\* echo "Removing extra packages" dnf -y remove linux-firmware -rm -f /tmp/chef*rpm - -# delete any logs that have built up during the install -find /var/log/ -name *.log -exec rm -f {} \; +# truncate any logs that have built up during the install +find /var/log -type f -exec truncate --size=0 {} \; # Remove any non-loopback network configs find /etc/sysconfig/network-scripts -name "ifcfg-*" -not -name "ifcfg-lo" -exec rm -f {} \; diff --git a/packer_templates/opensuse/scripts/cleanup.sh b/packer_templates/opensuse/scripts/cleanup.sh index 4d336e400..6c031d5a4 100644 --- a/packer_templates/opensuse/scripts/cleanup.sh +++ b/packer_templates/opensuse/scripts/cleanup.sh @@ -10,8 +10,8 @@ zypper clean --all rm -f /etc/udev/rules.d/70-persistent-net.rules; touch /etc/udev/rules.d/75-persistent-net-generator.rules; -# delete any logs that have built up during the install -find /var/log/ -name *.log -exec rm -f {} \; +# truncate any logs that have built up during the install +find /var/log -type f -exec truncate --size=0 {} \; # clear the history so our install isn't there export HISTSIZE=0 \ No newline at end of file diff --git a/packer_templates/sles/scripts/cleanup.sh b/packer_templates/sles/scripts/cleanup.sh index 962e981c5..c724ad7f7 100644 --- a/packer_templates/sles/scripts/cleanup.sh +++ b/packer_templates/sles/scripts/cleanup.sh @@ -9,8 +9,8 @@ rm -f /tmp/chef*rpm rm -f /etc/udev/rules.d/70-persistent-net.rules; touch /etc/udev/rules.d/75-persistent-net-generator.rules; -# delete any logs that have built up during the install -find /var/log/ -name *.log -exec rm -f {} \; +# truncate any logs that have built up during the install +find /var/log -type f -exec truncate --size=0 {} \; # clear the history so our install isn't there export HISTSIZE=0 \ No newline at end of file diff --git a/packer_templates/ubuntu/scripts/cleanup.sh b/packer_templates/ubuntu/scripts/cleanup.sh index 344fc4fd8..ba85f3dcf 100644 --- a/packer_templates/ubuntu/scripts/cleanup.sh +++ b/packer_templates/ubuntu/scripts/cleanup.sh @@ -67,8 +67,8 @@ rm -rf /usr/share/doc/* # Remove caches find /var/cache -type f -exec rm -rf {} \; -# delete any logs that have built up during the install -find /var/log/ -name *.log -exec rm -f {} \; +# truncate any logs that have built up during the install +find /var/log -type f -exec truncate --size=0 {} \; # Blank netplan machine-id (DUID) so machines get unique ID generated on boot. truncate -s 0 /etc/machine-id From 914a472126b25f6d2777e17a483d93ca1870fd0b Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Wed, 4 Dec 2019 13:56:57 -0800 Subject: [PATCH 1073/1622] Clean the wget history as well Signed-off-by: Tim Smith <tsmith@chef.io> --- packer_templates/amazonlinux/scripts/cleanup.sh | 3 ++- packer_templates/centos/scripts/cleanup.sh | 3 ++- packer_templates/fedora/scripts/cleanup.sh | 3 ++- packer_templates/opensuse/scripts/cleanup.sh | 3 ++- packer_templates/sles/scripts/cleanup.sh | 3 ++- packer_templates/ubuntu/scripts/cleanup.sh | 3 ++- 6 files changed, 12 insertions(+), 6 deletions(-) diff --git a/packer_templates/amazonlinux/scripts/cleanup.sh b/packer_templates/amazonlinux/scripts/cleanup.sh index db00a4c36..a8b6e28d9 100644 --- a/packer_templates/amazonlinux/scripts/cleanup.sh +++ b/packer_templates/amazonlinux/scripts/cleanup.sh @@ -59,4 +59,5 @@ yum install -y yum-utils package-cleanup --oldkernels --count=1 -y # clear the history so our install isn't there -export HISTSIZE=0 \ No newline at end of file +export HISTSIZE=0 +rm -f /root/.wget-hsts \ No newline at end of file diff --git a/packer_templates/centos/scripts/cleanup.sh b/packer_templates/centos/scripts/cleanup.sh index df92c141f..cd648cb2c 100644 --- a/packer_templates/centos/scripts/cleanup.sh +++ b/packer_templates/centos/scripts/cleanup.sh @@ -102,4 +102,5 @@ $pkg_cmd remove -y \ zd1211-firmware # clear the history so our install isn't there -export HISTSIZE=0 \ No newline at end of file +export HISTSIZE=0 +rm -f /root/.wget-hsts \ No newline at end of file diff --git a/packer_templates/fedora/scripts/cleanup.sh b/packer_templates/fedora/scripts/cleanup.sh index d39f3275f..83c095d40 100644 --- a/packer_templates/fedora/scripts/cleanup.sh +++ b/packer_templates/fedora/scripts/cleanup.sh @@ -15,4 +15,5 @@ find /var/log -type f -exec truncate --size=0 {} \; find /etc/sysconfig/network-scripts -name "ifcfg-*" -not -name "ifcfg-lo" -exec rm -f {} \; # clear the history so our install isn't there -export HISTSIZE=0 \ No newline at end of file +export HISTSIZE=0 +rm -f /root/.wget-hsts \ No newline at end of file diff --git a/packer_templates/opensuse/scripts/cleanup.sh b/packer_templates/opensuse/scripts/cleanup.sh index 6c031d5a4..75cae5054 100644 --- a/packer_templates/opensuse/scripts/cleanup.sh +++ b/packer_templates/opensuse/scripts/cleanup.sh @@ -14,4 +14,5 @@ touch /etc/udev/rules.d/75-persistent-net-generator.rules; find /var/log -type f -exec truncate --size=0 {} \; # clear the history so our install isn't there -export HISTSIZE=0 \ No newline at end of file +export HISTSIZE=0 +rm -f /root/.wget-hsts \ No newline at end of file diff --git a/packer_templates/sles/scripts/cleanup.sh b/packer_templates/sles/scripts/cleanup.sh index c724ad7f7..5e427a3b9 100644 --- a/packer_templates/sles/scripts/cleanup.sh +++ b/packer_templates/sles/scripts/cleanup.sh @@ -13,4 +13,5 @@ touch /etc/udev/rules.d/75-persistent-net-generator.rules; find /var/log -type f -exec truncate --size=0 {} \; # clear the history so our install isn't there -export HISTSIZE=0 \ No newline at end of file +export HISTSIZE=0 +rm -f /root/.wget-hsts \ No newline at end of file diff --git a/packer_templates/ubuntu/scripts/cleanup.sh b/packer_templates/ubuntu/scripts/cleanup.sh index ba85f3dcf..b358b8d4f 100644 --- a/packer_templates/ubuntu/scripts/cleanup.sh +++ b/packer_templates/ubuntu/scripts/cleanup.sh @@ -74,4 +74,5 @@ find /var/log -type f -exec truncate --size=0 {} \; truncate -s 0 /etc/machine-id # clear the history so our install isn't there -export HISTSIZE=0 \ No newline at end of file +export HISTSIZE=0 +rm -f /root/.wget-hsts \ No newline at end of file From 73727904e5417cd23f46373f65280eee02d861ab Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Wed, 4 Dec 2019 13:57:33 -0800 Subject: [PATCH 1074/1622] Remove the Anaconda logs on EL Signed-off-by: Tim Smith <tsmith@chef.io> --- packer_templates/centos/scripts/cleanup.sh | 3 +++ packer_templates/fedora/scripts/cleanup.sh | 3 +++ 2 files changed, 6 insertions(+) diff --git a/packer_templates/centos/scripts/cleanup.sh b/packer_templates/centos/scripts/cleanup.sh index cd648cb2c..349ced6a1 100644 --- a/packer_templates/centos/scripts/cleanup.sh +++ b/packer_templates/centos/scripts/cleanup.sh @@ -101,6 +101,9 @@ $pkg_cmd remove -y \ rt73usb-firmware \ zd1211-firmware +# remove the install log +rm -f /root/anaconda-ks.cfg + # clear the history so our install isn't there export HISTSIZE=0 rm -f /root/.wget-hsts \ No newline at end of file diff --git a/packer_templates/fedora/scripts/cleanup.sh b/packer_templates/fedora/scripts/cleanup.sh index 83c095d40..81518ad03 100644 --- a/packer_templates/fedora/scripts/cleanup.sh +++ b/packer_templates/fedora/scripts/cleanup.sh @@ -14,6 +14,9 @@ find /var/log -type f -exec truncate --size=0 {} \; # Remove any non-loopback network configs find /etc/sysconfig/network-scripts -name "ifcfg-*" -not -name "ifcfg-lo" -exec rm -f {} \; +# remove the install log +rm -f /root/anaconda-ks.cfg + # clear the history so our install isn't there export HISTSIZE=0 rm -f /root/.wget-hsts \ No newline at end of file From 9ea60d2b87010119bfd75573e32e5c4cb35c5877 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Wed, 4 Dec 2019 14:07:55 -0800 Subject: [PATCH 1075/1622] Make script output more generic for various EL distros Signed-off-by: Tim Smith <tsmith@chef.io> --- packer_templates/centos/scripts/cleanup.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packer_templates/centos/scripts/cleanup.sh b/packer_templates/centos/scripts/cleanup.sh index 349ced6a1..4160c05eb 100644 --- a/packer_templates/centos/scripts/cleanup.sh +++ b/packer_templates/centos/scripts/cleanup.sh @@ -42,7 +42,7 @@ if grep -q -i "release 7" /etc/redhat-release ; then done rm -rf /var/lib/NetworkManager/* - echo "==> Setup /etc/rc.d/rc.local for CentOS7" + echo "==> Setup /etc/rc.d/rc.local for EL7" cat <<_EOF_ | cat >> /etc/rc.d/rc.local #BENTO-BEGIN LANG=C From ede84f24ed7a0415385de15e1973617cd9a5ba0f Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Wed, 4 Dec 2019 14:08:32 -0800 Subject: [PATCH 1076/1622] Run autoremove on EL 8+ and run pkg cleanup last Signed-off-by: Tim Smith <tsmith@chef.io> --- packer_templates/centos/scripts/cleanup.sh | 29 +++++++++++----------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/packer_templates/centos/scripts/cleanup.sh b/packer_templates/centos/scripts/cleanup.sh index 4160c05eb..c7d5ba365 100644 --- a/packer_templates/centos/scripts/cleanup.sh +++ b/packer_templates/centos/scripts/cleanup.sh @@ -12,13 +12,20 @@ else pkg_cmd="yum" fi +# remove previous kernels that yum/dnf preserved for rollback +if [ "$major_version" -ge 8 ]; then + dnf autoremove -y + dnf remove -y $(dnf repoquery --installonly --latest-limit=-1 -q) +elif [ "$major_version" -gt 5 ]; then # yum-utils isn't in RHEL 5 so don't try to run this + if ! command -v package-cleanup >/dev/null 2>&1; then + yum install -y yum-utils + fi + package-cleanup --oldkernels --count=1 -y +fi + # Remove development and kernel source packages $pkg_cmd -y remove gcc cpp kernel-devel kernel-headers; -if [ "$distro" != 'redhat' ]; then - $pkg_cmd -y clean all; -fi - # Clean up network interface persistence rm -f /etc/udev/rules.d/70-persistent-net.rules; mkdir -p /etc/udev/rules.d/70-persistent-net.rules; @@ -67,16 +74,6 @@ fi # truncate any logs that have built up during the install find /var/log -type f -exec truncate --size=0 {} \; -# remove previous kernels that yum preserved for rollback -if [ "$major_version" -ge 8 ]; then - dnf remove -y $(dnf repoquery --installonly --latest-limit=-1 -q) -elif [ "$major_version" -gt 5 ]; then # yum-utils isn't in RHEL 5 so don't try to run this - if ! command -v package-cleanup >/dev/null 2>&1; then - yum install -y yum-utils - fi - package-cleanup --oldkernels --count=1 -y -fi - # we try to remove these in the ks file, but they're still there # in the builds so let's remove them here to be sure :shrug: $pkg_cmd remove -y \ @@ -101,6 +98,10 @@ $pkg_cmd remove -y \ rt73usb-firmware \ zd1211-firmware +if [ "$distro" != 'redhat' ]; then + $pkg_cmd -y clean all; +fi + # remove the install log rm -f /root/anaconda-ks.cfg From bf573eab5fbe0547b88e3a463428305eecf54c34 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Wed, 4 Dec 2019 14:25:33 -0800 Subject: [PATCH 1077/1622] Remove the contents of /tmp and /var/tmp Signed-off-by: Tim Smith <tsmith@chef.io> --- packer_templates/amazonlinux/scripts/cleanup.sh | 3 +++ packer_templates/centos/scripts/cleanup.sh | 5 +++++ packer_templates/fedora/scripts/cleanup.sh | 3 +++ packer_templates/opensuse/scripts/cleanup.sh | 3 +++ packer_templates/sles/scripts/cleanup.sh | 3 +++ packer_templates/ubuntu/scripts/cleanup.sh | 3 +++ 6 files changed, 20 insertions(+) diff --git a/packer_templates/amazonlinux/scripts/cleanup.sh b/packer_templates/amazonlinux/scripts/cleanup.sh index a8b6e28d9..3b6deadfd 100644 --- a/packer_templates/amazonlinux/scripts/cleanup.sh +++ b/packer_templates/amazonlinux/scripts/cleanup.sh @@ -58,6 +58,9 @@ find /var/log -type f -exec truncate --size=0 {} \; yum install -y yum-utils package-cleanup --oldkernels --count=1 -y +# remove the contents of /tmp and /var/tmp +rm -rf /tmp/* /var/tmp/* + # clear the history so our install isn't there export HISTSIZE=0 rm -f /root/.wget-hsts \ No newline at end of file diff --git a/packer_templates/centos/scripts/cleanup.sh b/packer_templates/centos/scripts/cleanup.sh index c7d5ba365..82778bc01 100644 --- a/packer_templates/centos/scripts/cleanup.sh +++ b/packer_templates/centos/scripts/cleanup.sh @@ -76,6 +76,8 @@ find /var/log -type f -exec truncate --size=0 {} \; # we try to remove these in the ks file, but they're still there # in the builds so let's remove them here to be sure :shrug: +# +# 12.2019 note: We can probably remove this now, but let's confirm it $pkg_cmd remove -y \ aic94xx-firmware \ atmel-firmware \ @@ -105,6 +107,9 @@ fi # remove the install log rm -f /root/anaconda-ks.cfg +# remove the contents of /tmp and /var/tmp +rm -rf /tmp/* /var/tmp/* + # clear the history so our install isn't there export HISTSIZE=0 rm -f /root/.wget-hsts \ No newline at end of file diff --git a/packer_templates/fedora/scripts/cleanup.sh b/packer_templates/fedora/scripts/cleanup.sh index 81518ad03..c1ec2d73d 100644 --- a/packer_templates/fedora/scripts/cleanup.sh +++ b/packer_templates/fedora/scripts/cleanup.sh @@ -17,6 +17,9 @@ find /etc/sysconfig/network-scripts -name "ifcfg-*" -not -name "ifcfg-lo" -exec # remove the install log rm -f /root/anaconda-ks.cfg +# remove the contents of /tmp and /var/tmp +rm -rf /tmp/* /var/tmp/* + # clear the history so our install isn't there export HISTSIZE=0 rm -f /root/.wget-hsts \ No newline at end of file diff --git a/packer_templates/opensuse/scripts/cleanup.sh b/packer_templates/opensuse/scripts/cleanup.sh index 75cae5054..df6b815a2 100644 --- a/packer_templates/opensuse/scripts/cleanup.sh +++ b/packer_templates/opensuse/scripts/cleanup.sh @@ -13,6 +13,9 @@ touch /etc/udev/rules.d/75-persistent-net-generator.rules; # truncate any logs that have built up during the install find /var/log -type f -exec truncate --size=0 {} \; +# remove the contents of /tmp and /var/tmp +rm -rf /tmp/* /var/tmp/* + # clear the history so our install isn't there export HISTSIZE=0 rm -f /root/.wget-hsts \ No newline at end of file diff --git a/packer_templates/sles/scripts/cleanup.sh b/packer_templates/sles/scripts/cleanup.sh index 5e427a3b9..1162baccb 100644 --- a/packer_templates/sles/scripts/cleanup.sh +++ b/packer_templates/sles/scripts/cleanup.sh @@ -12,6 +12,9 @@ touch /etc/udev/rules.d/75-persistent-net-generator.rules; # truncate any logs that have built up during the install find /var/log -type f -exec truncate --size=0 {} \; +# remove the contents of /tmp and /var/tmp +rm -rf /tmp/* /var/tmp/* + # clear the history so our install isn't there export HISTSIZE=0 rm -f /root/.wget-hsts \ No newline at end of file diff --git a/packer_templates/ubuntu/scripts/cleanup.sh b/packer_templates/ubuntu/scripts/cleanup.sh index b358b8d4f..0d0f16455 100644 --- a/packer_templates/ubuntu/scripts/cleanup.sh +++ b/packer_templates/ubuntu/scripts/cleanup.sh @@ -73,6 +73,9 @@ find /var/log -type f -exec truncate --size=0 {} \; # Blank netplan machine-id (DUID) so machines get unique ID generated on boot. truncate -s 0 /etc/machine-id +# remove the contents of /tmp and /var/tmp +rm -rf /tmp/* /var/tmp/* + # clear the history so our install isn't there export HISTSIZE=0 rm -f /root/.wget-hsts \ No newline at end of file From 7255d68845c57de0c02bb39c753f48eeb1a1cec8 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Wed, 4 Dec 2019 16:47:03 -0800 Subject: [PATCH 1078/1622] Remove ubuntu 14.04 support in the hyperv script Signed-off-by: Tim Smith <tsmith@chef.io> --- packer_templates/ubuntu/scripts/hyperv.sh | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/packer_templates/ubuntu/scripts/hyperv.sh b/packer_templates/ubuntu/scripts/hyperv.sh index 43d149d00..e06ac2dde 100755 --- a/packer_templates/ubuntu/scripts/hyperv.sh +++ b/packer_templates/ubuntu/scripts/hyperv.sh @@ -4,9 +4,7 @@ major_version="`echo $ubuntu_version | awk -F. '{print $1}'`"; case "$PACKER_BUILDER_TYPE" in hyperv-iso) - if [ "$major_version" -eq "14" ]; then - apt-get install -y hv-kvp-daemon-init linux-tools-virtual-lts-xenial linux-cloud-tools-virtual-lts-xenial; - elif [ "$major_version" -eq "16" ]; then + if [ "$major_version" -eq "16" ]; then apt-get install -y linux-tools-virtual-lts-xenial linux-cloud-tools-virtual-lts-xenial; elif [ "$major_version" -ge "17" ]; then apt-get -y install linux-image-virtual linux-tools-virtual linux-cloud-tools-virtual; From 15bdcadf7fc42512484aafa62404af533fd5ddb9 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Wed, 4 Dec 2019 16:47:38 -0800 Subject: [PATCH 1079/1622] Simplify the hyper-v script further Signed-off-by: Tim Smith <tsmith@chef.io> --- packer_templates/ubuntu/scripts/hyperv.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packer_templates/ubuntu/scripts/hyperv.sh b/packer_templates/ubuntu/scripts/hyperv.sh index e06ac2dde..af379bcc0 100755 --- a/packer_templates/ubuntu/scripts/hyperv.sh +++ b/packer_templates/ubuntu/scripts/hyperv.sh @@ -6,7 +6,7 @@ case "$PACKER_BUILDER_TYPE" in hyperv-iso) if [ "$major_version" -eq "16" ]; then apt-get install -y linux-tools-virtual-lts-xenial linux-cloud-tools-virtual-lts-xenial; - elif [ "$major_version" -ge "17" ]; then + else apt-get -y install linux-image-virtual linux-tools-virtual linux-cloud-tools-virtual; fi esac From e62be8855f6f80e11fb1fea965c426e7d641f397 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Wed, 4 Dec 2019 16:48:25 -0800 Subject: [PATCH 1080/1622] Remove Ubuntu 17.10 support in networking.sh Signed-off-by: Tim Smith <tsmith@chef.io> --- packer_templates/ubuntu/scripts/networking.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packer_templates/ubuntu/scripts/networking.sh b/packer_templates/ubuntu/scripts/networking.sh index 27186f0ea..2d4b3372d 100644 --- a/packer_templates/ubuntu/scripts/networking.sh +++ b/packer_templates/ubuntu/scripts/networking.sh @@ -3,7 +3,7 @@ ubuntu_version="`lsb_release -r | awk '{print $2}'`"; major_version="`echo $ubuntu_version | awk -F. '{print $1}'`"; -if [ "$ubuntu_version" = '17.10' ] || [ "$major_version" -ge "18" ]; then +if [ "$major_version" -ge "18" ]; then echo "Create netplan config for eth0" cat <<EOF >/etc/netplan/01-netcfg.yaml; network: From 5bab1cc2d39f4f2ae916e8a39dacfe317377cac3 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Wed, 4 Dec 2019 17:07:04 -0800 Subject: [PATCH 1081/1622] Use open-vm-tools on Fedora 30 to workaround failures The stock vmware tools won't install on fedora 30 for some reason. Works fine on 31. Signed-off-by: Tim Smith <tsmith@chef.io> --- packer_templates/fedora/fedora-30-x86_64.json | 2 +- packer_templates/fedora/scripts/open-vm-tools.sh | 10 ++++++++++ packer_templates/ubuntu/scripts/vmware.sh | 2 ++ 3 files changed, 13 insertions(+), 1 deletion(-) create mode 100644 packer_templates/fedora/scripts/open-vm-tools.sh diff --git a/packer_templates/fedora/fedora-30-x86_64.json b/packer_templates/fedora/fedora-30-x86_64.json index 9181bb0b7..94d7a40aa 100644 --- a/packer_templates/fedora/fedora-30-x86_64.json +++ b/packer_templates/fedora/fedora-30-x86_64.json @@ -157,7 +157,7 @@ "{{template_dir}}/../_common/motd.sh", "{{template_dir}}/../_common/sshd.sh", "{{template_dir}}/../_common/virtualbox.sh", - "{{template_dir}}/../_common/vmware.sh", + "{{template_dir}}/scripts/open-vm-tools.sh", "{{template_dir}}/../_common/parallels.sh", "{{template_dir}}/../_common/vagrant.sh", "{{template_dir}}/scripts/cleanup.sh", diff --git a/packer_templates/fedora/scripts/open-vm-tools.sh b/packer_templates/fedora/scripts/open-vm-tools.sh new file mode 100644 index 000000000..ce11d25bf --- /dev/null +++ b/packer_templates/fedora/scripts/open-vm-tools.sh @@ -0,0 +1,10 @@ +#!/bin/bash -eux + +# the proprietary vm tools don't work on Fedora 30 so we'll install the open-vm-tools +case "$PACKER_BUILDER_TYPE" in +vmware-iso|vmware-vmx) + dnf install -y open-vm-tools + mkdir /mnt/hgfs; + systemctl enable vmtoolsd + systemctl start vmtoolsd +esac \ No newline at end of file diff --git a/packer_templates/ubuntu/scripts/vmware.sh b/packer_templates/ubuntu/scripts/vmware.sh index fed591315..617b3df42 100644 --- a/packer_templates/ubuntu/scripts/vmware.sh +++ b/packer_templates/ubuntu/scripts/vmware.sh @@ -4,5 +4,7 @@ case "$PACKER_BUILDER_TYPE" in vmware-iso|vmware-vmx) apt-get install -y open-vm-tools; mkdir /mnt/hgfs; + systemctl enable vmtoolsd + systemctl start vmtoolsd echo "platform specific vmware.sh executed"; esac From 77a86f1a14b858c1bc1baa284791a32d5773aadb Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Wed, 4 Dec 2019 21:29:45 -0800 Subject: [PATCH 1082/1622] Install packer tools on FreeBSD Signed-off-by: Tim Smith <tsmith@chef.io> --- packer_templates/freebsd/scripts/vmtools.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packer_templates/freebsd/scripts/vmtools.sh b/packer_templates/freebsd/scripts/vmtools.sh index a065cae25..f2a23e873 100644 --- a/packer_templates/freebsd/scripts/vmtools.sh +++ b/packer_templates/freebsd/scripts/vmtools.sh @@ -45,7 +45,7 @@ vmware-iso|vmware-vmx) ;; parallels-iso|parallels-pvm) - echo "No current support for Parallels tools, continuing" + pkg install -y parallels-tools ;; *) From ce1a231cac0ccc6d09c0e229a4bf451f4758da5c Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Wed, 4 Dec 2019 21:38:38 -0800 Subject: [PATCH 1083/1622] Speed up FreeBSD boot + disable crash dumps Signed-off-by: Tim Smith <tsmith@chef.io> --- packer_templates/freebsd/scripts/postinstall.sh | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/packer_templates/freebsd/scripts/postinstall.sh b/packer_templates/freebsd/scripts/postinstall.sh index 8107039f6..c9e518369 100644 --- a/packer_templates/freebsd/scripts/postinstall.sh +++ b/packer_templates/freebsd/scripts/postinstall.sh @@ -11,6 +11,16 @@ pkg install -y curl ca_root_nss; # SSL CAcerts anymore ln -sf /usr/local/share/certs/ca-root-nss.crt /etc/ssl/cert.pem; +# Avoid pausing at the boot screen +cat >>/etc/loader.conf << LOADER_CONF +autoboot_delay="-1" +beastie_disable="YES" +kern.hz=50 +LOADER_CONF + +# disable crash dumps +sysrc dumpdev="NO" + # As sharedfolders are not in defaults ports tree, we will use NFS sharing cat >>/etc/rc.conf << RC_CONF rpcbind_enable="YES" @@ -18,7 +28,11 @@ nfs_server_enable="YES" mountd_flags="-r" RC_CONF -# Disable X11 because Vagrants VMs are (usually) headless +echo 'Disable X11 in make.conf because Vagrants VMs are (usually) headless' cat >>/etc/make.conf << MAKE_CONF WITHOUT_X11="YES" +WITHOUT_GUI="YES" MAKE_CONF + +echo 'Update the locate DB' +/etc/periodic/weekly/310.locate \ No newline at end of file From 5b81ed0dca1fb349a91bf7efc294aa98f2f16a51 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Wed, 4 Dec 2019 21:45:45 -0800 Subject: [PATCH 1084/1622] Cleanup wget history on Debian Signed-off-by: Tim Smith <tsmith@chef.io> --- packer_templates/debian/scripts/cleanup.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packer_templates/debian/scripts/cleanup.sh b/packer_templates/debian/scripts/cleanup.sh index 02c095afe..801cfaf03 100644 --- a/packer_templates/debian/scripts/cleanup.sh +++ b/packer_templates/debian/scripts/cleanup.sh @@ -44,4 +44,5 @@ apt-get -y clean; find /var/log -type f -exec truncate --size=0 {} \; # clear the history so our install isn't there -export HISTSIZE=0 \ No newline at end of file +export HISTSIZE=0 +rm -f /root/.wget-hsts \ No newline at end of file From bf1be06c80a6d14481f5980a14bdc375dc203daa Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Wed, 4 Dec 2019 21:46:18 -0800 Subject: [PATCH 1085/1622] Remove chef rpm cleanup that we don't need anymore Signed-off-by: Tim Smith <tsmith@chef.io> --- packer_templates/sles/scripts/cleanup.sh | 2 -- 1 file changed, 2 deletions(-) diff --git a/packer_templates/sles/scripts/cleanup.sh b/packer_templates/sles/scripts/cleanup.sh index 1162baccb..e1d150ab0 100644 --- a/packer_templates/sles/scripts/cleanup.sh +++ b/packer_templates/sles/scripts/cleanup.sh @@ -3,8 +3,6 @@ zypper --non-interactive rm --clean-deps gcc kernel-default-devel zypper clean -rm -f /tmp/chef*rpm - # Clean up network interface persistence rm -f /etc/udev/rules.d/70-persistent-net.rules; touch /etc/udev/rules.d/75-persistent-net-generator.rules; From af3cc7d4f966d26eb539d2e5be6103efcd94e41b Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Wed, 4 Dec 2019 21:46:45 -0800 Subject: [PATCH 1086/1622] Remove old Solaris 10 template Solaris 10 is WAY EOL at this point. Signed-off-by: Tim Smith <tsmith@chef.io> --- packer_templates/solaris/floppy/S99startup.sh | 56 -------- packer_templates/solaris/floppy/awesome_prof | 33 ----- packer_templates/solaris/floppy/finish.sh | 32 ----- packer_templates/solaris/floppy/rules.ok | 2 - packer_templates/solaris/floppy/sysidcfg | 10 -- .../solaris/scripts/solaris-10/minimize.sh | 7 - .../solaris/scripts/solaris-10/vmtools.sh | 40 ------ .../solaris/solaris-10.11-x86.json | 123 ------------------ 8 files changed, 303 deletions(-) delete mode 100644 packer_templates/solaris/floppy/S99startup.sh delete mode 100644 packer_templates/solaris/floppy/awesome_prof delete mode 100644 packer_templates/solaris/floppy/finish.sh delete mode 100644 packer_templates/solaris/floppy/rules.ok delete mode 100644 packer_templates/solaris/floppy/sysidcfg delete mode 100644 packer_templates/solaris/scripts/solaris-10/minimize.sh delete mode 100644 packer_templates/solaris/scripts/solaris-10/vmtools.sh delete mode 100644 packer_templates/solaris/solaris-10.11-x86.json diff --git a/packer_templates/solaris/floppy/S99startup.sh b/packer_templates/solaris/floppy/S99startup.sh deleted file mode 100644 index b5527eab9..000000000 --- a/packer_templates/solaris/floppy/S99startup.sh +++ /dev/null @@ -1,56 +0,0 @@ -#!/bin/sh - -# BE VERY CAREFUL IN HERE -# IF ANY COMMAND FAILS, IT WILL NOT REPORT, NOR WILL IT CONTINUE EXECUTION - -# disable sshd so we wait for the rc script to aaaaaalmost finish before we -# try to connect via ssh -svcadm disable network/ssh - -# setup a home directory -mkdir /home - -# create user -groupadd vagrant -useradd -m -s /usr/bin/bash -d /home/vagrant -G vagrant vagrant - -# set password - there is no way to set a password non-interactively -perl -pi -e 's/vagrant:UP/vagrant:VrvarmJYR3SHs/g' /etc/shadow -# defaults to a locked account, unlock it -passwd -u vagrant - -echo "vagrant user created" >> /tmp/s99log - -# set up ssh -mkdir /home/vagrant/.ssh -/usr/sfw/bin/wget --no-check-certificate 'https://raw.githubusercontent.com/mitchellh/vagrant/master/keys/vagrant.pub' -O /home/vagrant/.ssh/authorized_keys -chown -R vagrant /home/vagrant/.ssh -chmod -R go-rwsx /home/vagrant/.ssh - -# set up some ssh defaults -echo GSSAPIAuthentication no >> /etc/ssh/sshd_config -echo LookupClientHostnames no >> /etc/ssh/sshd_config - -echo "SSH Installed" >> /tmp/s99log - -# install omnibus-build-essential package -cd /tmp -echo "mail=\ninstance=overwrite\npartial=nocheck\nrunlevel=nocheck\nidepend=nocheck\nrdepend=nocheck\nspace=nocheck\nsetuid=nocheck\nconflict=nocheck\naction=nocheck\nbasedir=default" > /tmp/noask - -# install sudo so that packer functions correctly -# NOTE - LOOK HERE FIRST IF THE URL CHANGES! -/usr/sfw/bin/wget http://www.sudo.ws/sudo/dist/packages/Solaris/10/TCMsudo-1.8.15-i386.pkg.gz -gunzip TCMsudo-1.8.15-i386.pkg.gz -pkgadd -a /tmp/noask -d TCMsudo-1.8.15-i386.pkg all -echo "vagrant ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers -echo "Defaults secure_path=/usr/local/bin:/usr/sfw/bin:/usr/ccs/bin:/usr/sbin:/usr/bin:/bin:/sbin" >> /etc/sudoers - -echo "sudo Installed" >> /tmp/s99log - -# reenable ssh because we should be good to go now -svcadm enable network/ssh - -# delete ourself! -rm /etc/rc2.d/S99startup.sh - -echo "Successfully Finished" >> /tmp/s99log diff --git a/packer_templates/solaris/floppy/awesome_prof b/packer_templates/solaris/floppy/awesome_prof deleted file mode 100644 index 9b0ac608b..000000000 --- a/packer_templates/solaris/floppy/awesome_prof +++ /dev/null @@ -1,33 +0,0 @@ -install_type initial_install -system_type standalone -pool rpool 16g 2g 2g any -cluster SUNWCrnet add -package SUNWwgetr add -package SUNWwgetu add -package SUNWgss add -package SUNWgssk add -package SUNWgssc add -package SUNWsshdr add -package SUNWsshdu add -package SUNWsshcu add -package SUNWsshr add -package SUNWsshu add -package SUNWgcmn add -package SUNWuiu8 add -package SUNWbash add -package SUNWarc add -package SUNWhea add -package SUNWlibm add -package SUNWscpu add -package SUNWlibm -package SUNWlibmr -package SUNWlibms -package SUNWlibmsr -package SUNWggrp -package SUNWscpr -package SUNWscpu -package SUNWgcc -package SUNWgccruntime -package SUNWgtar -package SUNWtoo -package SUNWgmake diff --git a/packer_templates/solaris/floppy/finish.sh b/packer_templates/solaris/floppy/finish.sh deleted file mode 100644 index 9c3a60fad..000000000 --- a/packer_templates/solaris/floppy/finish.sh +++ /dev/null @@ -1,32 +0,0 @@ -#!/bin/sh -x - -BASE=/a - -# copy our postinstall rc script -cp /tmp/install_config/s99startup.sh /a/etc/rc2.d/S99startup.sh -chmod +x /a/etc/rc2.d/S99startup.sh - -# set up some paths for root (yeah some of these don't exist yet, but that's ok) -echo "if [ -f /etc/profile ]; then" >> /a/etc/skel/.bashrc -echo " . /etc/profile" >> /a/etc/skel/.bashrc -echo "fi" >> /a/etc/skel/.bashrc - -echo "if [ \"\$PS1\" ]; then" >> /a/etc/profile -echo " if [ \"\$BASH\" ]; then" >> /a/etc/profile -echo " PS1='\\u@\\h:\w\$ '" >> /a/etc/profile -echo " if [ -f /etc/bash.bashrc ]; then" >> /a/etc/profile -echo " . /etc/bash.bashrc" >> /a/etc/profile -echo " fi" >> /a/etc/profile -echo " else" >> /a/etc/profile -echo " if [ \"\`id -u\`\" -eq 0 ]; then" >> /a/etc/profile -echo " PS1='# '" >> /a/etc/profile -echo " else" >> /a/etc/profile -echo " PS1='\$ '" >> /a/etc/profile -echo " fi" >> /a/etc/profile -echo " fi" >> /a/etc/profile -echo "fi" >> /a/etc/profile -echo "PATH=/usr/local/bin:/usr/sfw/bin:/usr/ccs/bin:/usr/sbin:/usr/bin:\$PATH" >> /a/etc/profile -echo "export PATH" >> /a/etc/profile - -echo "PATH=/usr/local/bin:/usr/sfw/bin:/usr/ccs/bin:/usr/sbin:/usr/bin" >> /a/etc/default/login -echo "SUPATH=/usr/local/bin:/usr/sfw/bin:/usr/ccs/bin:/usr/sbin:/usr/bin" >> /a/etc/default/login diff --git a/packer_templates/solaris/floppy/rules.ok b/packer_templates/solaris/floppy/rules.ok deleted file mode 100644 index 0748e7cb9..000000000 --- a/packer_templates/solaris/floppy/rules.ok +++ /dev/null @@ -1,2 +0,0 @@ -any - - awesome_prof finish.sh -# version=2 checksum=453256326 diff --git a/packer_templates/solaris/floppy/sysidcfg b/packer_templates/solaris/floppy/sysidcfg deleted file mode 100644 index 633c6dda1..000000000 --- a/packer_templates/solaris/floppy/sysidcfg +++ /dev/null @@ -1,10 +0,0 @@ -keyboard=US-English -timezone=UTC -auto_reg=disable -network_interface=PRIMARY - {dhcp protocol_ipv6=yes} -nfs4_domain=dynamic -root_password=$1$MrZPBLgm$Gj2Ofw3ca2eKiIVB72zeL/ -system_locale=en_US -security_policy=NONE -name_service=NONE diff --git a/packer_templates/solaris/scripts/solaris-10/minimize.sh b/packer_templates/solaris/scripts/solaris-10/minimize.sh deleted file mode 100644 index a64193ce5..000000000 --- a/packer_templates/solaris/scripts/solaris-10/minimize.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/sh -ux - -dd if=/dev/zero of=/EMPTY bs=262144 -rm -f /EMPTY -# Block until the empty file has been removed, otherwise, Packer -# will try to kill the box while the disk is still full and that's bad -sync diff --git a/packer_templates/solaris/scripts/solaris-10/vmtools.sh b/packer_templates/solaris/scripts/solaris-10/vmtools.sh deleted file mode 100644 index 289e870ff..000000000 --- a/packer_templates/solaris/scripts/solaris-10/vmtools.sh +++ /dev/null @@ -1,40 +0,0 @@ -#!/bin/bash -eux - -# Add pkgadd auto-answer file -echo "mail=" > /tmp/nocheck -echo "instance=overwrite" >> /tmp/nocheck -echo "partial=nocheck" >> /tmp/nocheck -echo "runlevel=nocheck" >> /tmp/nocheck -echo "idepend=nocheck" >> /tmp/nocheck -echo "rdepend=nocheck" >> /tmp/nocheck -echo "space=nocheck" >> /tmp/nocheck -echo "setuid=nocheck" >> /tmp/nocheck -echo "conflict=nocheck" >> /tmp/nocheck -echo "action=nocheck" >> /tmp/nocheck -echo "basedir=default" >> /tmp/nocheck - -echo "all" > /tmp/allfiles - -if [ -f /home/vagrant/.vbox_version ]; then - mkdir /tmp/vbox - VER=$(cat /home/vagrant/.vbox_version) - mkdir /cdrom - VBGADEV=`lofiadm -a /home/vagrant/VBoxGuestAdditions.iso` - mount -o ro -F hsfs $VBGADEV /cdrom - pkgadd -a /tmp/nocheck -d /cdrom/VBoxSolarisAdditions.pkg < /tmp/allfiles - umount /cdrom - lofiadm -d $VBGADEV - rm -f /home/vagrant/VBoxGuestAdditions.iso -else - VMTOOLSDEV=`/usr/sbin/lofiadm -a /home/vagrant/solaris.iso` - mkdir /cdrom - mount -o ro -F hsfs $VMTOOLSDEV /cdrom - mkdir /tmp/vmfusion-archive - gtar zxvf /cdrom/vmware-solaris-tools.tar.gz -C /tmp/vmfusion-archive - /tmp/vmfusion-archive/vmware-tools-distrib/vmware-install.pl --force-install - umount /cdrom - lofiadm -d $VMTOOLSDEV - rm -rf /mnt/vmtools - rm -rf /tmp/vmfusion-archive - rm -f /home/vagrant/solaris.iso -fi diff --git a/packer_templates/solaris/solaris-10.11-x86.json b/packer_templates/solaris/solaris-10.11-x86.json deleted file mode 100644 index 2b66aa96a..000000000 --- a/packer_templates/solaris/solaris-10.11-x86.json +++ /dev/null @@ -1,123 +0,0 @@ -{ - "builders": [ - { - "boot_command": [ - "e", - "e", - "<left><left><left><left><left><left><left><left><left><left>", - "<left><left><left><left><left><left><left><left><left><left>", - "<left><left><left>", - " - install<enter>", - "b" - ], - "boot_wait": "5s", - "disk_size": "{{user `disk_size`}}", - "floppy_files": [ - "{{template_dir}}/floppy/sysidcfg", - "{{template_dir}}/floppy/awesome_prof", - "{{template_dir}}/floppy/rules.ok", - "{{template_dir}}/floppy/S99startup.sh", - "{{template_dir}}/floppy/finish.sh" - ], - "guest_additions_mode": "upload", - "guest_additions_url": "{{ user `guest_additions_url` }}", - "guest_os_type": "Solaris_64", - "headless": "{{ user `headless` }}", - "http_directory": "{{template_dir}}/http", - "iso_checksum": "aae1452bb3d56baa3dcb8866ce7e4a08", - "iso_checksum_type": "md5", - "iso_url": "{{user `mirror`}}/sol-10-u11-ga-x86-dvd.iso", - "output_directory": "packer-solaris-10u11-x86_64-virtualbox", - "shutdown_command": "/usr/local/bin/sudo /usr/sbin/init 5", - "shutdown_timeout": "10m", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "50000s", - "type": "virtualbox-iso", - "memory": "{{ user `memory` }}", - "cpus": "{{ user `cpus` }}", - "virtualbox_version_file": ".vbox_version", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "e", - "e", - "<left><left><left><left><left><left><left><left><left><left>", - "<left><left><left><left><left><left><left><left><left><left>", - "<left><left><left>", - " - install<enter>", - "b" - ], - "boot_wait": "5s", - "disk_size": "{{user `disk_size`}}", - "floppy_files": [ - "{{template_dir}}/floppy/sysidcfg", - "{{template_dir}}/floppy/awesome_prof", - "{{template_dir}}/floppy/rules.ok", - "{{template_dir}}/floppy/S99startup.sh", - "{{template_dir}}/floppy/finish.sh" - ], - "guest_os_type": "solaris10-64", - "headless": "{{ user `headless` }}", - "http_directory": "{{template_dir}}/http", - "iso_checksum": "aae1452bb3d56baa3dcb8866ce7e4a08", - "iso_checksum_type": "md5", - "iso_url": "{{user `mirror`}}/sol-10-u11-ga-x86-dvd.iso", - "output_directory": "packer-solaris-10u11-x86_64-vmware", - "shutdown_command": "/usr/local/bin/sudo /usr/sbin/init 5", - "shutdown_timeout": "10m", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "50000s", - "tools_upload_flavor": "solaris", - "tools_upload_path": "/home/vagrant/solaris.iso", - "type": "vmware-iso", - "vm_name": "{{ user `template` }}", - "memory": "{{ user `memory` }}", - "cpus": "{{ user `cpus` }}", - "vmx_data": { - "cpuid.coresPerSocket": "1" - }, - "vmx_remove_ethernet_interfaces": true - } - ], - "post-processors": [ - { - "output": "{{ user `build_directory` }}/{{user `box_basename`}}.{{.Provider}}.box", - "type": "vagrant" - } - ], - "provisioners": [ - { - "environment_vars": [], - "execute_command": "/usr/local/bin/sudo {{.Path}}", - "expect_disconnect": true, - "scripts": [ - "{{template_dir}}/scripts/solaris-10/vmtools.sh", - "{{template_dir}}/scripts/solaris-10/minimize.sh" - ], - "type": "shell" - } - ], - "variables": { - "_DOWNLOAD_SITE": "http://www.oracle.com/technetwork/server-storage/solaris10/downloads/index.html", - "_README": "You must download the automated installer iso from the following page, and then place it somewhere that packer can fetch it", - "arch": "64", - "box_basename": "solaris-10.11", - "build_directory": "../../builds", - "build_timestamp": "{{isotime \"20060102150405\"}}", - "guest_additions_url": "", - "cpus": "1", - "disk_size": "65536", - "git_revision": "__unknown_git_revision__", - "headless": "", - "memory": "1536", - "mirror": "./packer_cache", - "name": "solaris-10.11", - "template": "solaris-10.11-x86", - "version": "TIMESTAMP" - } -} From cf7bc1e4af7feb156ec3741ea4637b6d1c77255d Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Wed, 4 Dec 2019 21:48:59 -0800 Subject: [PATCH 1087/1622] Truncate /etc/machine-id on all systemd hosts We used to only do it on Ubuntu Signed-off-by: Tim Smith <tsmith@chef.io> --- packer_templates/centos/scripts/cleanup.sh | 5 +++++ packer_templates/debian/scripts/cleanup.sh | 3 +++ packer_templates/fedora/scripts/cleanup.sh | 3 +++ packer_templates/opensuse/scripts/cleanup.sh | 3 +++ 4 files changed, 14 insertions(+) diff --git a/packer_templates/centos/scripts/cleanup.sh b/packer_templates/centos/scripts/cleanup.sh index 82778bc01..50e3394b7 100644 --- a/packer_templates/centos/scripts/cleanup.sh +++ b/packer_templates/centos/scripts/cleanup.sh @@ -110,6 +110,11 @@ rm -f /root/anaconda-ks.cfg # remove the contents of /tmp and /var/tmp rm -rf /tmp/* /var/tmp/* +# Blank netplan machine-id (DUID) so machines get unique ID generated on boot. +if [ "$major_version" -ge 7 ]; then + truncate -s 0 /etc/machine-id +fi + # clear the history so our install isn't there export HISTSIZE=0 rm -f /root/.wget-hsts \ No newline at end of file diff --git a/packer_templates/debian/scripts/cleanup.sh b/packer_templates/debian/scripts/cleanup.sh index 801cfaf03..da4f05bfa 100644 --- a/packer_templates/debian/scripts/cleanup.sh +++ b/packer_templates/debian/scripts/cleanup.sh @@ -43,6 +43,9 @@ apt-get -y clean; # truncate any logs that have built up during the install find /var/log -type f -exec truncate --size=0 {} \; +# Blank netplan machine-id (DUID) so machines get unique ID generated on boot. +truncate -s 0 /etc/machine-id + # clear the history so our install isn't there export HISTSIZE=0 rm -f /root/.wget-hsts \ No newline at end of file diff --git a/packer_templates/fedora/scripts/cleanup.sh b/packer_templates/fedora/scripts/cleanup.sh index c1ec2d73d..41dc8b695 100644 --- a/packer_templates/fedora/scripts/cleanup.sh +++ b/packer_templates/fedora/scripts/cleanup.sh @@ -20,6 +20,9 @@ rm -f /root/anaconda-ks.cfg # remove the contents of /tmp and /var/tmp rm -rf /tmp/* /var/tmp/* +# Blank netplan machine-id (DUID) so machines get unique ID generated on boot. +truncate -s 0 /etc/machine-id + # clear the history so our install isn't there export HISTSIZE=0 rm -f /root/.wget-hsts \ No newline at end of file diff --git a/packer_templates/opensuse/scripts/cleanup.sh b/packer_templates/opensuse/scripts/cleanup.sh index df6b815a2..2fbe811a8 100644 --- a/packer_templates/opensuse/scripts/cleanup.sh +++ b/packer_templates/opensuse/scripts/cleanup.sh @@ -16,6 +16,9 @@ find /var/log -type f -exec truncate --size=0 {} \; # remove the contents of /tmp and /var/tmp rm -rf /tmp/* /var/tmp/* +# Blank netplan machine-id (DUID) so machines get unique ID generated on boot. +truncate -s 0 /etc/machine-id + # clear the history so our install isn't there export HISTSIZE=0 rm -f /root/.wget-hsts \ No newline at end of file From 377da7d67281987a8dc6eae50a1a1f31c39e0b6a Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Wed, 4 Dec 2019 22:14:01 -0800 Subject: [PATCH 1088/1622] Don't install linux-firmware on centos 7 This drops the image by 100 megs Signed-off-by: Tim Smith <tsmith@chef.io> --- packer_templates/centos/http/7/ks.cfg | 1 + 1 file changed, 1 insertion(+) diff --git a/packer_templates/centos/http/7/ks.cfg b/packer_templates/centos/http/7/ks.cfg index e188bb703..e1a3b610c 100644 --- a/packer_templates/centos/http/7/ks.cfg +++ b/packer_templates/centos/http/7/ks.cfg @@ -60,6 +60,7 @@ rsync -iwl6050-firmware -iwl7260-firmware -iwl7265-firmware +-linux-firmware %end %post From 22ce8a017cfa0b410470b26bb9f4f30cb8d1cad9 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Thu, 5 Dec 2019 00:14:37 -0800 Subject: [PATCH 1089/1622] Remove linux-firmware package on EL Signed-off-by: Tim Smith <tsmith@chef.io> --- packer_templates/centos/scripts/cleanup.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/packer_templates/centos/scripts/cleanup.sh b/packer_templates/centos/scripts/cleanup.sh index 50e3394b7..201d4b8c8 100644 --- a/packer_templates/centos/scripts/cleanup.sh +++ b/packer_templates/centos/scripts/cleanup.sh @@ -98,7 +98,9 @@ $pkg_cmd remove -y \ ql2xxx-firmware \ rt61pci-firmware \ rt73usb-firmware \ - zd1211-firmware + zd1211-firmware \ + linux-firmware \ + microcode_ctl if [ "$distro" != 'redhat' ]; then $pkg_cmd -y clean all; From b244907afa4ba3ae2a7188bb31e2a9761b4293d4 Mon Sep 17 00:00:00 2001 From: Li-Wen Hsu <lwhsu@lwhsu.org> Date: Sun, 8 Dec 2019 00:02:12 +0800 Subject: [PATCH 1090/1622] kern.hz will be automatically set to 100 in a VM environment Signed-off-by: Li-Wen Hsu <lwhsu@lwhsu.org> --- packer_templates/freebsd/scripts/postinstall.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/packer_templates/freebsd/scripts/postinstall.sh b/packer_templates/freebsd/scripts/postinstall.sh index c9e518369..303a262e3 100644 --- a/packer_templates/freebsd/scripts/postinstall.sh +++ b/packer_templates/freebsd/scripts/postinstall.sh @@ -15,7 +15,6 @@ ln -sf /usr/local/share/certs/ca-root-nss.crt /etc/ssl/cert.pem; cat >>/etc/loader.conf << LOADER_CONF autoboot_delay="-1" beastie_disable="YES" -kern.hz=50 LOADER_CONF # disable crash dumps @@ -35,4 +34,4 @@ WITHOUT_GUI="YES" MAKE_CONF echo 'Update the locate DB' -/etc/periodic/weekly/310.locate \ No newline at end of file +/etc/periodic/weekly/310.locate From cea3fa899c05718124a641b2fbb5efcebf946269 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Mon, 9 Dec 2019 17:12:18 -0800 Subject: [PATCH 1091/1622] Better describe how to generate the amazon2 box Signed-off-by: Tim Smith <tsmith@chef.io> --- packer_templates/amazonlinux/README_FIRST.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packer_templates/amazonlinux/README_FIRST.md b/packer_templates/amazonlinux/README_FIRST.md index 1a6005a68..cff1a42a3 100644 --- a/packer_templates/amazonlinux/README_FIRST.md +++ b/packer_templates/amazonlinux/README_FIRST.md @@ -4,5 +4,5 @@ This is not your normal Bento box. Instead of building a system from an ISO we'r 1. Download the VirtualBox .vdi file for Amazon Linux 2 and place it in the same directory as this readme file. Amazon hosts these at https://cdn.amazonlinux.com/os-images/latest/virtualbox/. Make sure to name it amazon.vdi instead of the version specific name that Amazon gives it on their site. 2. Run the STEP1_build_ovf.sh script to prepare this VDI file for packer and export it as a OVF file. -3. Run the packer definition as usual +3. Run packer: bento build packer_templates/amazonlinux/amazon-2-x86_64.json 4. OPTIONAL: Cleanup the leftover files in the directory From 1934445e81f678a16f52d42a75f9482b5209e285 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Mon, 9 Dec 2019 17:12:54 -0800 Subject: [PATCH 1092/1622] Trim leftovers from builds.yml Signed-off-by: Tim Smith <tsmith@chef.io> --- builds.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/builds.yml b/builds.yml index cafbc7e23..a36b097b9 100644 --- a/builds.yml +++ b/builds.yml @@ -54,6 +54,3 @@ slugs: 'freebsd-12': 'freebsd-12' 'opensuse-leap-15': 'opensuse-leap-15' 'fedora-latest': 'fedora-31' - -providers: -- virtualbox-iso From d5db0cb304fc7a4af0b4c68da6a84323e38724ab Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Mon, 9 Dec 2019 17:13:11 -0800 Subject: [PATCH 1093/1622] Minor def updates Signed-off-by: Tim Smith <tsmith@chef.io> --- .../centos/centos-6.10-x86_64.json | 1 + .../ubuntu/ubuntu-16.04-i386.json | 40 ++++++++++++++++++- .../ubuntu/ubuntu-19.10-amd64.json | 2 +- 3 files changed, 41 insertions(+), 2 deletions(-) diff --git a/packer_templates/centos/centos-6.10-x86_64.json b/packer_templates/centos/centos-6.10-x86_64.json index af3be1fe2..e883c2719 100644 --- a/packer_templates/centos/centos-6.10-x86_64.json +++ b/packer_templates/centos/centos-6.10-x86_64.json @@ -171,6 +171,7 @@ "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", "hyperv_generation": "1", + "hyperv_switch": "{{env `hyperv_switch`}}", "guest_additions_url": "", "iso_checksum": "a68e46970678d4d297d46086ae2efdd3e994322d6d862ff51dcce25a0759e41c", "iso_checksum_type": "sha256", diff --git a/packer_templates/ubuntu/ubuntu-16.04-i386.json b/packer_templates/ubuntu/ubuntu-16.04-i386.json index 953dad81f..0615005fb 100644 --- a/packer_templates/ubuntu/ubuntu-16.04-i386.json +++ b/packer_templates/ubuntu/ubuntu-16.04-i386.json @@ -21,7 +21,7 @@ " locale=en_US.UTF-8<wait>", " netcfg/get_domain=vm<wait>", " netcfg/get_hostname=vagrant<wait>", - " grub-installer/bootdev=/dev/sda <wait>", + " grub-installer/bootdev=/dev/sda<wait>", " noapic<wait>", " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}}<wait>", " -- <wait>", @@ -192,6 +192,41 @@ "ssh_wait_timeout": "10000s", "type": "qemu", "vm_name": "{{ user `template` }}" + }, + { + "boot_command": [ + "<esc><wait10><esc><esc><enter><wait>", + "set gfxpayload=1024x768<enter>", + "linux /install/vmlinuz ", + "preseed/url=http://{{.HTTPIP}}:{{.HTTPPort}}/preseed-hyperv.cfg ", + "debian-installer=en_US.UTF-8 auto locale=en_US.UTF-8 kbd-chooser/method=us ", + "hostname={{.Name}} ", + "fb=false debconf/frontend=noninteractive ", + "keyboard-configuration/modelcode=SKIP keyboard-configuration/layout=USA ", + "keyboard-configuration/variant=USA console-setup/ask_detect=false <enter>", + "initrd /install/initrd.gz<enter>", + "boot<enter>" + ], + "boot_wait": "10s", + "communicator": "ssh", + "cpus": "{{ user `cpus` }}", + "disk_size": "{{user `disk_size`}}", + "enable_secure_boot": false, + "generation": "{{user `hyperv_generation`}}", + "http_directory": "{{template_dir}}/http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "memory": "{{user `memory`}}", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-hyperv", + "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_timeout": "10000s", + "ssh_username": "vagrant", + "switch_name": "{{user `hyperv_switch`}}", + "type": "hyperv-iso", + "vm_name": "{{ user `template` }}" } ], "post-processors": [ @@ -220,6 +255,7 @@ "{{template_dir}}/../_common/virtualbox.sh", "{{template_dir}}/scripts/vmware.sh", "{{template_dir}}/../_common/parallels.sh", + "{{template_dir}}/scripts/hyperv.sh", "{{template_dir}}/scripts/cleanup.sh", "{{template_dir}}/../_common/minimize.sh" ], @@ -236,6 +272,8 @@ "headless": "", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", + "hyperv_generation": 1", + "hyperv_switch": "{{env `hyperv_switch`}}", "guest_additions_url": "", "iso_checksum": "7509cabb2f9f6ba0a95f8454d432be2ef26679d31ce35baa626acc5321460fab", "iso_checksum_type": "sha256", diff --git a/packer_templates/ubuntu/ubuntu-19.10-amd64.json b/packer_templates/ubuntu/ubuntu-19.10-amd64.json index fddf96c48..bc0bf83e1 100644 --- a/packer_templates/ubuntu/ubuntu-19.10-amd64.json +++ b/packer_templates/ubuntu/ubuntu-19.10-amd64.json @@ -277,7 +277,7 @@ "iso_name": "ubuntu-19.10-server-amd64.iso", "memory": "1024", "mirror": "http://cdimage.ubuntu.com", - "mirror_directory": "ubuntu/releases/19.10/release", + "mirror_directory": "ubuntu/releases/19.10.1/release", "name": "ubuntu-19.10", "no_proxy": "{{env `no_proxy`}}", "preseed_path": "preseed.cfg", From 1f91bec123f8c29b98a8012e38f1e240a15c2c1e Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Mon, 9 Dec 2019 19:35:17 -0800 Subject: [PATCH 1094/1622] Add vmware config for 2008r2 Signed-off-by: Tim Smith <tsmith@chef.io> --- packer_templates/windows/windows-2008r2.json | 28 +++++++++++++++++--- 1 file changed, 25 insertions(+), 3 deletions(-) diff --git a/packer_templates/windows/windows-2008r2.json b/packer_templates/windows/windows-2008r2.json index c60691b5e..3419bde1c 100644 --- a/packer_templates/windows/windows-2008r2.json +++ b/packer_templates/windows/windows-2008r2.json @@ -23,8 +23,30 @@ "shutdown_timeout": "15m", "floppy_files": [ "{{template_dir}}/answer_files/2008_r2/Autounattend.xml" - ] - }], + ] + }, + { + "type": "vmware-iso", + "memory": "{{ user `memory` }}", + "cpus": "{{ user `cpus` }}", + "disk_adapter_type": "lsisas1068", + "guest_os_type": "windows9srv-64", + "headless": "{{ user `headless` }}", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_checksum_type": "sha1", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-vmware", + "communicator": "winrm", + "winrm_username": "vagrant", + "winrm_password": "vagrant", + "winrm_timeout": "12h", + "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"", + "shutdown_timeout": "15m", + "floppy_files": [ + "{{template_dir}}/answer_files/2008_r2/Autounattend.xml" + ] + } + ], "provisioners": [{ "type": "chef-solo", "cookbook_paths": ["{{template_dir}}/cookbooks"], @@ -73,8 +95,8 @@ }] ], "variables": { - "memory": "4096", "cpus": "2", + "memory": "4096", "guest_additions_mode": "attach", "guest_additions_url": "", "headless": "false", From 8f1337438a7fde966dba7385aeb916ad81608536 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Mon, 9 Dec 2019 19:36:02 -0800 Subject: [PATCH 1095/1622] Sync parts of win10 unattended with other versions of win Signed-off-by: Tim Smith <tsmith@chef.io> --- .../windows/answer_files/10/Autounattend.xml | 34 +++++++++---------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/packer_templates/windows/answer_files/10/Autounattend.xml b/packer_templates/windows/answer_files/10/Autounattend.xml index 454da0dc8..1ee0c0796 100644 --- a/packer_templates/windows/answer_files/10/Autounattend.xml +++ b/packer_templates/windows/answer_files/10/Autounattend.xml @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="UTF-8"?> +<?xml version="1.0" encoding="utf-8"?> <unattend xmlns="urn:schemas-microsoft-com:unattend"> <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-International-Core-WinPE" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> @@ -117,26 +117,26 @@ </LocalAccount> </LocalAccounts> </UserAccounts> - <AutoLogon> - <Password> - <Value>vagrant</Value> - <PlainText>true</PlainText> - </Password> - <Enabled>true</Enabled> - <Username>vagrant</Username> - </AutoLogon> + <AutoLogon> + <Password> + <Value>vagrant</Value> + <PlainText>true</PlainText> + </Password> + <Enabled>true</Enabled> + <Username>vagrant</Username> + </AutoLogon> <FirstLogonCommands> <SynchronousCommand wcm:action="add"> - <CommandLine>PowerShell "Set-ExecutionPolicy -ExecutionPolicy RemoteSigned -Force"</CommandLine> - <Description>Set Execution Policy 64 Bit</Description> - <Order>1</Order> - <RequiresUserInput>true</RequiresUserInput> + <CommandLine>cmd.exe /c powershell -Command "Set-ExecutionPolicy -ExecutionPolicy RemoteSigned -Force"</CommandLine> + <Description>Set Execution Policy 64 Bit</Description> + <Order>1</Order> + <RequiresUserInput>true</RequiresUserInput> </SynchronousCommand> <SynchronousCommand wcm:action="add"> - <CommandLine>C:\Windows\SysWOW64\cmd /c PowerShell -Command "Set-ExecutionPolicy -ExecutionPolicy RemoteSigned -Force"</CommandLine> - <Description>Set Execution Policy 32 Bit</Description> - <Order>2</Order> - <RequiresUserInput>true</RequiresUserInput> + <CommandLine>C:\Windows\SysWOW64\cmd.exe /c powershell -Command "Set-ExecutionPolicy -ExecutionPolicy RemoteSigned -Force"</CommandLine> + <Description>Set Execution Policy 32 Bit</Description> + <Order>2</Order> + <RequiresUserInput>true</RequiresUserInput> </SynchronousCommand> <SynchronousCommand wcm:action="add"> <CommandLine>powershell -NoLogo -ExecutionPolicy RemoteSigned -File a:\base_setup.ps1</CommandLine> From a305356c61abf49482a96e84995ac7307ae70fde Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Mon, 9 Dec 2019 20:25:40 -0800 Subject: [PATCH 1096/1622] Remove EOL Fedora 29 Fedora 29 went EOL: https://www.linuxtechnews.com/fedora-29-officially-reached-end-of-life-eol-on-november-26th-2019/ Signed-off-by: Tim Smith <tsmith@chef.io> --- packer_templates/fedora/fedora-29-x86_64.json | 192 ------------------ packer_templates/fedora/fedora-30-x86_64.json | 2 +- packer_templates/fedora/fedora-31-x86_64.json | 2 +- 3 files changed, 2 insertions(+), 194 deletions(-) delete mode 100644 packer_templates/fedora/fedora-29-x86_64.json diff --git a/packer_templates/fedora/fedora-29-x86_64.json b/packer_templates/fedora/fedora-29-x86_64.json deleted file mode 100644 index ee3019501..000000000 --- a/packer_templates/fedora/fedora-29-x86_64.json +++ /dev/null @@ -1,192 +0,0 @@ -{ - "builders": [ - { - "type": "qemu", - "vm_name": "{{ user `template` }}", - "name": "{{ user `template` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-libvirt", - "accelerator": "kvm", - "boot_wait": "10s", - "boot_command": [ - "<tab> linux ks=http://{{.HTTPIP}}:{{.HTTPPort}}/{{user `ks_path`}}<enter><wait>" - ], - "format": "qcow2", - "disk_size": "{{user `disk_size`}}", - "disk_discard": "unmap", - "disk_cache": "unsafe", - "disk_compression": true, - "disk_interface": "virtio-scsi", - "net_device": "virtio-net", - "memory": "{{ user `memory` }}", - "cpus": "{{ user `cpus` }}", - "http_directory": "{{template_dir}}/http", - "headless": "{{ user `headless` }}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "ssh_username": "vagrant", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_wait_timeout": "3600s", - "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now" - }, - { - "boot_command": [ - "<tab> linux ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "guest_additions_url": "{{ user `guest_additions_url` }}", - "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", - "guest_os_type": "Fedora_64", - "hard_drive_interface": "sata", - "headless": "{{ user `headless` }}", - "http_directory": "{{template_dir}}/http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-virtualbox", - "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "virtualbox-iso", - "memory": "{{ user `memory` }}", - "cpus": "{{ user `cpus` }}", - "virtualbox_version_file": ".vbox_version", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<tab> linux ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "fedora-64", - "headless": "{{ user `headless` }}", - "http_directory": "{{template_dir}}/http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-vmware", - "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "tools_upload_flavor": "linux", - "type": "vmware-iso", - "vm_name": "{{ user `template` }}", - "memory": "{{ user `memory` }}", - "cpus": "{{ user `cpus` }}", - "vmx_data": { - "cpuid.coresPerSocket": "1", - "ethernet0.pciSlotNumber": "32" - }, - "vmx_remove_ethernet_interfaces": true - }, - { - "boot_command": [ - "<tab> linux ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "fedora-core", - "http_directory": "{{template_dir}}/http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-parallels", - "parallels_tools_flavor": "lin", - "memory": "{{ user `memory` }}", - "cpus": "{{ user `cpus` }}", - "prlctl_version_file": ".prlctl_version", - "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "parallels-iso", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<tab> linux ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" - ], - "boot_wait": "10s", - "memory": "{{ user `memory` }}", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "headless": "{{ user `headless` }}", - "http_directory": "{{template_dir}}/http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-qemu", - "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "qemu", - "vm_name": "{{ user `template` }}" - } - ], - "post-processors": [ - { - "output": "{{ user `build_directory` }}/{{user `box_basename`}}.{{.Provider}}.box", - "type": "vagrant" - } - ], - "provisioners": [ - { - "environment_vars": [ - "HOME_DIR=/home/vagrant", - "http_proxy={{user `http_proxy`}}", - "https_proxy={{user `https_proxy`}}", - "no_proxy={{user `no_proxy`}}" - ], - "execute_command": "echo 'vagrant' | {{.Vars}} sudo -E -S bash '{{.Path}}'", - "expect_disconnect": true, - "scripts": [ - "{{template_dir}}/scripts/swap.sh", - "{{template_dir}}/scripts/fix-slow-dns.sh", - "{{template_dir}}/scripts/build-tools.sh", - "{{template_dir}}/../_common/motd.sh", - "{{template_dir}}/../_common/sshd.sh", - "{{template_dir}}/../_common/virtualbox.sh", - "{{template_dir}}/../_common/vmware.sh", - "{{template_dir}}/../_common/parallels.sh", - "{{template_dir}}/../_common/vagrant.sh", - "{{template_dir}}/scripts/cleanup.sh", - "{{template_dir}}/../_common/minimize.sh" - ], - "type": "shell" - } - ], - "variables": { - "arch": "64", - "box_basename": "fedora-29", - "build_directory": "../../builds", - "build_timestamp": "{{isotime \"20060102150405\"}}", - "cpus": "1", - "disk_size": "65536", - "git_revision": "__unknown_git_revision__", - "headless": "", - "http_proxy": "{{env `http_proxy`}}", - "https_proxy": "{{env `https_proxy`}}", - "guest_additions_url": "", - "iso_checksum": "129d131a55e5bd518f593f0eacdce095f7c795fe7ccbef1f3f6aeb2ff9f99f35", - "iso_checksum_type": "sha256", - "iso_name": "Fedora-Server-dvd-x86_64-29-1.2.iso", - "ks_path": "ks-fedora29.cfg", - "memory": "1024", - "mirror": "http://download.fedoraproject.org/pub/fedora/linux", - "mirror_directory": "releases/29/Server/x86_64/iso", - "name": "fedora-29", - "no_proxy": "{{env `no_proxy`}}", - "template": "fedora-29-x86_64", - "version": "TIMESTAMP" - } -} diff --git a/packer_templates/fedora/fedora-30-x86_64.json b/packer_templates/fedora/fedora-30-x86_64.json index 94d7a40aa..fe446597b 100644 --- a/packer_templates/fedora/fedora-30-x86_64.json +++ b/packer_templates/fedora/fedora-30-x86_64.json @@ -181,7 +181,7 @@ "iso_checksum": "bb0622b78449298e24a96b90b561b429edec71aae72b8f7a8c3da4d81e4df5b7", "iso_checksum_type": "sha256", "iso_name": "Fedora-Server-dvd-x86_64-30-1.2.iso", - "ks_path": "ks-fedora29.cfg", + "ks_path": "ks-fedora.cfg", "memory": "1024", "mirror": "http://download.fedoraproject.org/pub/fedora/linux", "mirror_directory": "releases/30/Server/x86_64/iso", diff --git a/packer_templates/fedora/fedora-31-x86_64.json b/packer_templates/fedora/fedora-31-x86_64.json index bf5c9aa69..84ad553ff 100644 --- a/packer_templates/fedora/fedora-31-x86_64.json +++ b/packer_templates/fedora/fedora-31-x86_64.json @@ -181,7 +181,7 @@ "iso_checksum": "225ebc160e40bb43c5de28bad9680e3a78a9db40c9e3f4f42f3ee3f10f95dbeb", "iso_checksum_type": "sha256", "iso_name": "Fedora-Server-dvd-x86_64-31-1.9.iso", - "ks_path": "ks-fedora29.cfg", + "ks_path": "ks-fedora.cfg", "memory": "1024", "mirror": "http://download.fedoraproject.org/pub/fedora/linux", "mirror_directory": "releases/31/Server/x86_64/iso", From 901f12d87a7315ee408e07cb7bae48dcbf892268 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Mon, 9 Dec 2019 20:26:10 -0800 Subject: [PATCH 1097/1622] Remove Fedora 29 from the build.yml file Signed-off-by: Tim Smith <tsmith@chef.io> --- builds.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/builds.yml b/builds.yml index a36b097b9..cea0db4c1 100644 --- a/builds.yml +++ b/builds.yml @@ -13,7 +13,6 @@ public: - 'debian-9.11' - 'debian-10.2-i386' - 'debian-10.2' -- 'fedora-29' - 'fedora-30' - 'fedora-31' - 'freebsd-11.3-i386' From a84683b72495b7470bb87f422fc6a0a9b3164b99 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Mon, 9 Dec 2019 20:26:31 -0800 Subject: [PATCH 1098/1622] Rename the Fedora ks file It's a non-version specific file now Signed-off-by: Tim Smith <tsmith@chef.io> --- packer_templates/fedora/http/{ks-fedora29.cfg => ks-fedora.cfg} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename packer_templates/fedora/http/{ks-fedora29.cfg => ks-fedora.cfg} (100%) diff --git a/packer_templates/fedora/http/ks-fedora29.cfg b/packer_templates/fedora/http/ks-fedora.cfg similarity index 100% rename from packer_templates/fedora/http/ks-fedora29.cfg rename to packer_templates/fedora/http/ks-fedora.cfg From 3f3351de920976cdf4363d8a072c6be86e653c2a Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Mon, 9 Dec 2019 20:30:39 -0800 Subject: [PATCH 1099/1622] Update to Windows 10 1909 Signed-off-by: Tim Smith <tsmith@chef.io> --- packer_templates/windows/windows-10.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packer_templates/windows/windows-10.json b/packer_templates/windows/windows-10.json index c32ecfa4c..bdae8276e 100644 --- a/packer_templates/windows/windows-10.json +++ b/packer_templates/windows/windows-10.json @@ -112,8 +112,8 @@ "guest_additions_mode": "attach", "guest_additions_url": "", "headless": "true", - "iso_checksum": "743fc483bb8bf1901c0534a0ae15208a5a72a3c5", - "iso_url": "https://software-download.microsoft.com/download/pr/18362.30.190401-1528.19h1_release_svc_refresh_CLIENTENTERPRISEEVAL_OEMRET_x64FRE_en-us.iso", + "iso_checksum": "489ebee676e26cdb81377b0e6385c001a22589b8", + "iso_url": "https://software-download.microsoft.com/download/pr/18363.418.191007-0143.19h2_release_svc_refresh_CLIENTENTERPRISEEVAL_OEMRET_x64FRE_en-us.iso", "build_directory": "../../builds", "template": "windows-10" } From 1072996c2c0160c7a432470f858ba7fc3f3db0e7 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Mon, 9 Dec 2019 20:51:57 -0800 Subject: [PATCH 1100/1622] Disable UAC via the windows_uac resource I wrote this specifically for this workflow Signed-off-by: Tim Smith <tsmith@chef.io> --- .../windows/cookbooks/packer/recipes/disable_uac.rb | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/packer_templates/windows/cookbooks/packer/recipes/disable_uac.rb b/packer_templates/windows/cookbooks/packer/recipes/disable_uac.rb index 628b92eeb..7bdda073d 100644 --- a/packer_templates/windows/cookbooks/packer/recipes/disable_uac.rb +++ b/packer_templates/windows/cookbooks/packer/recipes/disable_uac.rb @@ -1,7 +1,5 @@ -registry_key 'HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Policies\System' do - values [{ name: 'EnableLUA', type: :dword, data: 0 }, - { name: 'PromptOnSecureDesktop', type: :dword, data: 0 }, - { name: 'ConsentPromptBehaviorAdmin', type: :dword, data: 0 }, - ] - action :create +windows_uac 'Configure UAC' do + consent_behavior_admins :no_prompt + prompt_on_secure_desktop false + enable_uac false end From f82549011c8862c5f5290f2a44669eef09399c21 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Mon, 9 Dec 2019 20:56:25 -0800 Subject: [PATCH 1101/1622] Fix license acceptance on the 2008R2 builder A custom install command requires setting the license Signed-off-by: Tim Smith <tsmith@chef.io> --- packer_templates/windows/windows-2008r2.json | 2 ++ 1 file changed, 2 insertions(+) diff --git a/packer_templates/windows/windows-2008r2.json b/packer_templates/windows/windows-2008r2.json index 3419bde1c..114f1d20f 100644 --- a/packer_templates/windows/windows-2008r2.json +++ b/packer_templates/windows/windows-2008r2.json @@ -51,6 +51,7 @@ "type": "chef-solo", "cookbook_paths": ["{{template_dir}}/cookbooks"], "guest_os_type": "windows", + "chef_license": "accept-no-persist", "install_command": "powershell.exe -Command \"(new-object Net.WebClient).DownloadString('https://omnitruck.chef.io/install.ps1') | iex; install\"", "run_list": [ "packer::disable_uac", @@ -72,6 +73,7 @@ "type": "chef-solo", "cookbook_paths": ["{{template_dir}}/cookbooks"], "guest_os_type": "windows", + "chef_license": "accept-no-persist", "install_command": "powershell.exe -Command \"(new-object Net.WebClient).DownloadString('https://omnitruck.chef.io/install.ps1') | iex; install\"", "run_list": [ "packer::disable_uac", From f2c790df257b067e33724822267d4779e6865a13 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Mon, 9 Dec 2019 20:56:53 -0800 Subject: [PATCH 1102/1622] Sync 2008 config with the other windows configs Signed-off-by: Tim Smith <tsmith@chef.io> --- packer_templates/windows/windows-2008r2.json | 50 ++++++++++---------- 1 file changed, 26 insertions(+), 24 deletions(-) diff --git a/packer_templates/windows/windows-2008r2.json b/packer_templates/windows/windows-2008r2.json index 114f1d20f..f3548c973 100644 --- a/packer_templates/windows/windows-2008r2.json +++ b/packer_templates/windows/windows-2008r2.json @@ -1,28 +1,30 @@ { "builders": [{ - "type": "virtualbox-iso", - "vboxmanage": [ - ["modifyvm", "{{.Name}}", "--vram", "48"] - ], - "memory": "{{ user `memory` }}", - "cpus": "{{ user `cpus` }}", - "guest_additions_mode": "{{ user `guest_additions_mode` }}", - "guest_additions_url": "{{ user `guest_additions_url` }}", - "guest_additions_path": "C:/users/vagrant/VBoxGuestAdditions.iso", - "guest_os_type": "Windows2008_64", - "headless": "{{ user `headless` }}", - "iso_url": "{{ user `iso_url` }}", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "sha1", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-virtualbox", - "communicator": "winrm", - "winrm_username": "vagrant", - "winrm_password": "vagrant", - "winrm_timeout": "12h", - "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"", - "shutdown_timeout": "15m", - "floppy_files": [ - "{{template_dir}}/answer_files/2008_r2/Autounattend.xml" + "type": "virtualbox-iso", + "vboxmanage": [ + ["modifyvm", "{{.Name}}", "--vram", "48"], + ["modifyvm", "{{.Name}}", "--audio", "none"] + ], + "memory": "{{ user `memory` }}", + "cpus": "{{ user `cpus` }}", + "guest_additions_mode": "{{ user `guest_additions_mode` }}", + "guest_additions_url": "{{ user `guest_additions_url` }}", + "guest_additions_path": "C:/users/vagrant/VBoxGuestAdditions.iso", + "guest_os_type": "Windows2008_64", + "hard_drive_interface": "sata", + "headless": "{{ user `headless` }}", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_checksum_type": "sha1", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-virtualbox", + "communicator": "winrm", + "winrm_username": "vagrant", + "winrm_password": "vagrant", + "winrm_timeout": "12h", + "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"", + "shutdown_timeout": "15m", + "floppy_files": [ + "{{template_dir}}/answer_files/2008_r2/Autounattend.xml" ] }, { @@ -97,8 +99,8 @@ }] ], "variables": { - "cpus": "2", "memory": "4096", + "cpus": "2", "guest_additions_mode": "attach", "guest_additions_url": "", "headless": "false", From 39672c50379eb0e599403ac7226593bfb832c313 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Mon, 9 Dec 2019 20:57:15 -0800 Subject: [PATCH 1103/1622] Sync the various Windows Server configs Signed-off-by: Tim Smith <tsmith@chef.io> --- packer_templates/windows/windows-2012r2.json | 6 ++++-- packer_templates/windows/windows-2016.json | 4 +++- packer_templates/windows/windows-2019.json | 4 +++- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/packer_templates/windows/windows-2012r2.json b/packer_templates/windows/windows-2012r2.json index 5dcf3af4e..c71faca8f 100644 --- a/packer_templates/windows/windows-2012r2.json +++ b/packer_templates/windows/windows-2012r2.json @@ -2,7 +2,8 @@ "builders": [{ "type": "virtualbox-iso", "vboxmanage": [ - ["modifyvm", "{{.Name}}", "--vram", "48"] + ["modifyvm", "{{.Name}}", "--vram", "48"], + ["modifyvm", "{{.Name}}", "--audio", "none"] ], "memory": "{{ user `memory` }}", "cpus": "{{ user `cpus` }}", @@ -10,6 +11,7 @@ "guest_additions_url": "{{ user `guest_additions_url` }}", "guest_additions_path": "C:/users/vagrant/VBoxGuestAdditions.iso", "guest_os_type": "Windows2012_64", + "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", "iso_url": "{{ user `iso_url` }}", "iso_checksum": "{{ user `iso_checksum` }}", @@ -102,8 +104,8 @@ }] ], "variables": { - "cpus": "2", "memory": "4096", + "cpus": "2", "guest_additions_mode": "attach", "guest_additions_url": "", "headless": "true", diff --git a/packer_templates/windows/windows-2016.json b/packer_templates/windows/windows-2016.json index 72f7373f0..b219d4c4c 100644 --- a/packer_templates/windows/windows-2016.json +++ b/packer_templates/windows/windows-2016.json @@ -2,7 +2,8 @@ "builders": [{ "type": "virtualbox-iso", "vboxmanage": [ - ["modifyvm", "{{.Name}}", "--vram", "48"] + ["modifyvm", "{{.Name}}", "--vram", "48"], + ["modifyvm", "{{.Name}}", "--audio", "none"] ], "memory": "{{ user `memory` }}", "cpus": "{{ user `cpus` }}", @@ -10,6 +11,7 @@ "guest_additions_url": "{{ user `guest_additions_url` }}", "guest_additions_path": "C:/users/vagrant/VBoxGuestAdditions.iso", "guest_os_type": "Windows2016_64", + "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", "iso_url": "{{ user `iso_url` }}", "iso_checksum": "{{ user `iso_checksum` }}", diff --git a/packer_templates/windows/windows-2019.json b/packer_templates/windows/windows-2019.json index 6859a01b8..2c23c304f 100644 --- a/packer_templates/windows/windows-2019.json +++ b/packer_templates/windows/windows-2019.json @@ -2,7 +2,8 @@ "builders": [{ "type": "virtualbox-iso", "vboxmanage": [ - ["modifyvm", "{{.Name}}", "--vram", "48"] + ["modifyvm", "{{.Name}}", "--vram", "48"], + ["modifyvm", "{{.Name}}", "--audio", "none"] ], "memory": "{{ user `memory` }}", "cpus": "{{ user `cpus` }}", @@ -10,6 +11,7 @@ "guest_additions_url": "{{ user `guest_additions_url` }}", "guest_additions_path": "C:/users/vagrant/VBoxGuestAdditions.iso", "guest_os_type": "Windows2016_64", + "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", "iso_url": "{{ user `iso_url` }}", "iso_checksum": "{{ user `iso_checksum` }}", From 227cfb1288b0eb63cb146b0b6f2904bea6a5abad Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Mon, 9 Dec 2019 21:04:17 -0800 Subject: [PATCH 1104/1622] More windows config syncs Signed-off-by: Tim Smith <tsmith@chef.io> --- .../answer_files/2012_r2/Autounattend.xml | 19 +++++------------ .../answer_files/2016/Autounattend.xml | 17 ++++----------- packer_templates/windows/windows-7.json | 21 ++++++++++--------- 3 files changed, 20 insertions(+), 37 deletions(-) diff --git a/packer_templates/windows/answer_files/2012_r2/Autounattend.xml b/packer_templates/windows/answer_files/2012_r2/Autounattend.xml index 1d3296913..9139bff7f 100644 --- a/packer_templates/windows/answer_files/2012_r2/Autounattend.xml +++ b/packer_templates/windows/answer_files/2012_r2/Autounattend.xml @@ -1,16 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <unattend xmlns="urn:schemas-microsoft-com:unattend"> <settings pass="windowsPE"> - <!-- look for drivers on floppy --> - <component name="Microsoft-Windows-PnpCustomizationsWinPE" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - <DriverPaths> - <PathAndCredentials wcm:keyValue="1" wcm:action="add"> - <Path>A:\</Path> - </PathAndCredentials> - </DriverPaths> - </component> - - <component xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" name="Microsoft-Windows-International-Core-WinPE" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> + <component name="Microsoft-Windows-International-Core-WinPE" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> <SetupUILanguage> <UILanguage>en-US</UILanguage> </SetupUILanguage> @@ -20,7 +11,7 @@ <UILanguageFallback>en-US</UILanguageFallback> <UserLocale>en-US</UserLocale> </component> - <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 name="Microsoft-Windows-Setup" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> <DiskConfiguration> <Disk wcm:action="add"> <CreatePartitions> @@ -59,7 +50,7 @@ <OSImage> <InstallFrom> <MetaData wcm:action="add"> - <Key>/IMAGE/NAME </Key> + <Key>/IMAGE/NAME</Key> <Value>Windows Server 2012 R2 SERVERSTANDARD</Value> </MetaData> </InstallFrom> @@ -75,7 +66,7 @@ </ProductKey> <AcceptEula>true</AcceptEula> <FullName>Vagrant</FullName> - <Organization>Bento by Chef</Organization> + <Organization>Bento by Chef Software, Inc.</Organization> </UserData> </component> </settings> @@ -104,8 +95,8 @@ <HideWirelessSetupInOOBE>true</HideWirelessSetupInOOBE> <NetworkLocation>Home</NetworkLocation> <ProtectYourPC>3</ProtectYourPC> - <SkipUserOOBE>true</SkipUserOOBE> <SkipMachineOOBE>true</SkipMachineOOBE> + <SkipUserOOBE>true</SkipUserOOBE> </OOBE> <TimeZone>UTC</TimeZone> <UserAccounts> diff --git a/packer_templates/windows/answer_files/2016/Autounattend.xml b/packer_templates/windows/answer_files/2016/Autounattend.xml index de1ef7cf1..eae4526a0 100644 --- a/packer_templates/windows/answer_files/2016/Autounattend.xml +++ b/packer_templates/windows/answer_files/2016/Autounattend.xml @@ -1,16 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <unattend xmlns="urn:schemas-microsoft-com:unattend"> <settings pass="windowsPE"> - <!-- look for drivers on floppy --> - <component name="Microsoft-Windows-PnpCustomizationsWinPE" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - <DriverPaths> - <PathAndCredentials wcm:keyValue="1" wcm:action="add"> - <Path>A:\</Path> - </PathAndCredentials> - </DriverPaths> - </component> - - <component xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" name="Microsoft-Windows-International-Core-WinPE" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> + <component name="Microsoft-Windows-International-Core-WinPE" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> <SetupUILanguage> <UILanguage>en-US</UILanguage> </SetupUILanguage> @@ -20,7 +11,7 @@ <UILanguageFallback>en-US</UILanguageFallback> <UserLocale>en-US</UserLocale> </component> - <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 name="Microsoft-Windows-Setup" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> <DiskConfiguration> <Disk wcm:action="add"> <CreatePartitions> @@ -59,7 +50,7 @@ <OSImage> <InstallFrom> <MetaData wcm:action="add"> - <Key>/IMAGE/NAME </Key> + <Key>/IMAGE/NAME</Key> <Value>Windows Server 2016 SERVERDATACENTER</Value> </MetaData> </InstallFrom> @@ -75,7 +66,7 @@ </ProductKey> <AcceptEula>true</AcceptEula> <FullName>Vagrant</FullName> - <Organization>Bento by Chef</Organization> + <Organization>Bento by Chef Software, Inc.</Organization> </UserData> </component> </settings> diff --git a/packer_templates/windows/windows-7.json b/packer_templates/windows/windows-7.json index 8385f753f..b18b8be49 100644 --- a/packer_templates/windows/windows-7.json +++ b/packer_templates/windows/windows-7.json @@ -1,15 +1,16 @@ { "builders": [{ - "type": "virtualbox-iso", - "vboxmanage": [ - ["modifyvm", "{{.Name}}", "--vram", "36"] - ], - "memory": "{{ user `memory` }}", - "cpus": "{{ user `cpus` }}", - "guest_additions_mode": "{{ user `guest_additions_mode` }}", - "guest_additions_url": "{{ user `guest_additions_url` }}", - "guest_additions_path": "C:/users/vagrant/VBoxGuestAdditions.iso", - "guest_os_type": "Windows7_64", + "type": "virtualbox-iso", + "vboxmanage": [ + ["modifyvm", "{{.Name}}", "--vram", "48"], + ["modifyvm", "{{.Name}}", "--audio", "none"] + ], + "memory": "{{ user `memory` }}", + "cpus": "{{ user `cpus` }}", + "guest_additions_mode": "{{ user `guest_additions_mode` }}", + "guest_additions_url": "{{ user `guest_additions_url` }}", + "guest_additions_path": "C:/users/vagrant/VBoxGuestAdditions.iso", + "guest_os_type": "Windows7_64", "headless": "{{ user `headless` }}", "iso_url": "{{ user `iso_url` }}", "iso_checksum": "{{ user `iso_checksum` }}", From 25fde946ee8011ce9aad348a7d6522417c34ec29 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Mon, 9 Dec 2019 23:04:37 -0800 Subject: [PATCH 1105/1622] Update 2019 to 17763.737 Signed-off-by: Tim Smith <tsmith@chef.io> --- packer_templates/windows/windows-2019.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packer_templates/windows/windows-2019.json b/packer_templates/windows/windows-2019.json index 2c23c304f..0a702e6c5 100644 --- a/packer_templates/windows/windows-2019.json +++ b/packer_templates/windows/windows-2019.json @@ -109,8 +109,8 @@ "guest_additions_mode": "attach", "guest_additions_url": "", "headless": "true", - "iso_checksum": "91e3a2f1acc39af21353c7cc105c799494d7539f", - "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": "3022424f777b66a698047ba1c37812026b9714c5", + "iso_url": "https://software-download.microsoft.com/download/pr/17763.737.190906-2324.rs5_release_svc_refresh_SERVER_EVAL_x64FRE_en-us_1.iso", "build_directory": "../../builds", "template": "windows-2019-standard" } From 31a2e9d9113fc21f7144a12fc5a7ad621364fd91 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Tue, 10 Dec 2019 09:26:27 -0800 Subject: [PATCH 1106/1622] Use SATA interfaces for the Windows ISOs Signed-off-by: Tim Smith <tsmith@chef.io> --- packer_templates/windows/windows-10.json | 1 + packer_templates/windows/windows-2008r2.json | 1 + packer_templates/windows/windows-2012r2.json | 1 + packer_templates/windows/windows-2016.json | 1 + packer_templates/windows/windows-2019.json | 1 + 5 files changed, 5 insertions(+) diff --git a/packer_templates/windows/windows-10.json b/packer_templates/windows/windows-10.json index bdae8276e..2a31555a7 100644 --- a/packer_templates/windows/windows-10.json +++ b/packer_templates/windows/windows-10.json @@ -12,6 +12,7 @@ "guest_additions_path": "C:/users/vagrant/VBoxGuestAdditions.iso", "guest_os_type": "Windows10_64", "hard_drive_interface": "sata", + "iso_interface": "sata", "headless": "{{ user `headless` }}", "iso_url": "{{ user `iso_url` }}", "iso_checksum": "{{ user `iso_checksum` }}", diff --git a/packer_templates/windows/windows-2008r2.json b/packer_templates/windows/windows-2008r2.json index f3548c973..05ad4ceb3 100644 --- a/packer_templates/windows/windows-2008r2.json +++ b/packer_templates/windows/windows-2008r2.json @@ -12,6 +12,7 @@ "guest_additions_path": "C:/users/vagrant/VBoxGuestAdditions.iso", "guest_os_type": "Windows2008_64", "hard_drive_interface": "sata", + "iso_interface": "sata", "headless": "{{ user `headless` }}", "iso_url": "{{ user `iso_url` }}", "iso_checksum": "{{ user `iso_checksum` }}", diff --git a/packer_templates/windows/windows-2012r2.json b/packer_templates/windows/windows-2012r2.json index c71faca8f..d75b46ec5 100644 --- a/packer_templates/windows/windows-2012r2.json +++ b/packer_templates/windows/windows-2012r2.json @@ -12,6 +12,7 @@ "guest_additions_path": "C:/users/vagrant/VBoxGuestAdditions.iso", "guest_os_type": "Windows2012_64", "hard_drive_interface": "sata", + "iso_interface": "sata", "headless": "{{ user `headless` }}", "iso_url": "{{ user `iso_url` }}", "iso_checksum": "{{ user `iso_checksum` }}", diff --git a/packer_templates/windows/windows-2016.json b/packer_templates/windows/windows-2016.json index b219d4c4c..057ff80c4 100644 --- a/packer_templates/windows/windows-2016.json +++ b/packer_templates/windows/windows-2016.json @@ -12,6 +12,7 @@ "guest_additions_path": "C:/users/vagrant/VBoxGuestAdditions.iso", "guest_os_type": "Windows2016_64", "hard_drive_interface": "sata", + "iso_interface": "sata", "headless": "{{ user `headless` }}", "iso_url": "{{ user `iso_url` }}", "iso_checksum": "{{ user `iso_checksum` }}", diff --git a/packer_templates/windows/windows-2019.json b/packer_templates/windows/windows-2019.json index 0a702e6c5..8bb77309a 100644 --- a/packer_templates/windows/windows-2019.json +++ b/packer_templates/windows/windows-2019.json @@ -12,6 +12,7 @@ "guest_additions_path": "C:/users/vagrant/VBoxGuestAdditions.iso", "guest_os_type": "Windows2016_64", "hard_drive_interface": "sata", + "iso_interface": "sata", "headless": "{{ user `headless` }}", "iso_url": "{{ user `iso_url` }}", "iso_checksum": "{{ user `iso_checksum` }}", From 16dd618e10183e739c2d51ea8f6c14c3ef6cae13 Mon Sep 17 00:00:00 2001 From: laixintao <laixintao1995@163.com> Date: Thu, 12 Dec 2019 14:48:30 +0800 Subject: [PATCH 1107/1622] bugfix: fix welcome message 404 Signed-off-by: laixintao <laixintao1995@163.com> --- packer_templates/_common/motd.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packer_templates/_common/motd.sh b/packer_templates/_common/motd.sh index 7079e9ccc..2a82b9b70 100644 --- a/packer_templates/_common/motd.sh +++ b/packer_templates/_common/motd.sh @@ -2,7 +2,7 @@ bento=' This system is built by the Bento project by Chef Software -More information can be found at https://github.com/chef/bento/README.md' +More information can be found at https://github.com/chef/bento' if [ -d /etc/update-motd.d ]; then MOTD_CONFIG='/etc/update-motd.d/99-bento' From bc2adc385f6dfdb83d25a40d9016969472faf539 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Wed, 11 Dec 2019 23:04:43 -0800 Subject: [PATCH 1108/1622] Fix bad JSON in template Signed-off-by: Tim Smith <tsmith@chef.io> --- packer_templates/ubuntu/ubuntu-16.04-i386.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packer_templates/ubuntu/ubuntu-16.04-i386.json b/packer_templates/ubuntu/ubuntu-16.04-i386.json index 0615005fb..532394edb 100644 --- a/packer_templates/ubuntu/ubuntu-16.04-i386.json +++ b/packer_templates/ubuntu/ubuntu-16.04-i386.json @@ -272,7 +272,7 @@ "headless": "", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", - "hyperv_generation": 1", + "hyperv_generation": "1", "hyperv_switch": "{{env `hyperv_switch`}}", "guest_additions_url": "", "iso_checksum": "7509cabb2f9f6ba0a95f8454d432be2ef26679d31ce35baa626acc5321460fab", From ce6c28f08424176e409808bf08be6d211cd53b9d Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Fri, 13 Dec 2019 09:20:15 -0800 Subject: [PATCH 1109/1622] Remove vagrant data from box descriptions This has no impact on the system we're building Signed-off-by: Tim Smith <tsmith@chef.io> --- lib/bento/buildmetadata.rb | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/lib/bento/buildmetadata.rb b/lib/bento/buildmetadata.rb index bfbf2b376..bba3d7205 100644 --- a/lib/bento/buildmetadata.rb +++ b/lib/bento/buildmetadata.rb @@ -20,7 +20,6 @@ def read box_basename: box_basename, template: template_vars.fetch("template", UNKNOWN), packer: packer_ver, - vagrant: vagrant_ver, } end @@ -70,14 +69,4 @@ def packer_ver cmd.run_command cmd.stdout.split("\n")[0] end - - def vagrant_ver - if ENV["TRAVIS"] - "travis" - else - cmd = Mixlib::ShellOut.new("vagrant --version") - cmd.run_command - cmd.stdout.split(" ")[1] - end - end end From 2e4859c9fb2d949480a710a4331efb5563717b76 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Fri, 13 Dec 2019 23:19:47 -0800 Subject: [PATCH 1110/1622] Remove unused windows defender recipe Signed-off-by: Tim Smith <tsmith@chef.io> --- .../cookbooks/packer/recipes/disable_windows_defender.rb | 3 --- 1 file changed, 3 deletions(-) delete mode 100644 packer_templates/windows/cookbooks/packer/recipes/disable_windows_defender.rb diff --git a/packer_templates/windows/cookbooks/packer/recipes/disable_windows_defender.rb b/packer_templates/windows/cookbooks/packer/recipes/disable_windows_defender.rb deleted file mode 100644 index 615737a5a..000000000 --- a/packer_templates/windows/cookbooks/packer/recipes/disable_windows_defender.rb +++ /dev/null @@ -1,3 +0,0 @@ -powershell_script 'disable-windows-defender' do - code 'Set-MpPreference -DisableRealtimeMonitoring $false' -end From 69bb40d0495c5964ad43faa21d3a6361be49205b Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Fri, 13 Dec 2019 23:20:23 -0800 Subject: [PATCH 1111/1622] Don't disable hibernation twice Signed-off-by: Tim Smith <tsmith@chef.io> --- .../packer/recipes/{power.rb => configure_power.rb} | 0 .../windows/cookbooks/packer/recipes/disable_hibernation.rb | 6 ------ 2 files changed, 6 deletions(-) rename packer_templates/windows/cookbooks/packer/recipes/{power.rb => configure_power.rb} (100%) delete mode 100644 packer_templates/windows/cookbooks/packer/recipes/disable_hibernation.rb diff --git a/packer_templates/windows/cookbooks/packer/recipes/power.rb b/packer_templates/windows/cookbooks/packer/recipes/configure_power.rb similarity index 100% rename from packer_templates/windows/cookbooks/packer/recipes/power.rb rename to packer_templates/windows/cookbooks/packer/recipes/configure_power.rb diff --git a/packer_templates/windows/cookbooks/packer/recipes/disable_hibernation.rb b/packer_templates/windows/cookbooks/packer/recipes/disable_hibernation.rb deleted file mode 100644 index b34208074..000000000 --- a/packer_templates/windows/cookbooks/packer/recipes/disable_hibernation.rb +++ /dev/null @@ -1,6 +0,0 @@ -registry_key 'HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Power' do - values [{ name: 'HiberFileSizePercent', type: :dword, data: 0 }, - { name: 'HibernateEnabled', type: :dword, data: 0 }, - ] - action :create -end From 388e6ff43d776c2df2164fa7e129a854ffa16839 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Fri, 13 Dec 2019 23:20:35 -0800 Subject: [PATCH 1112/1622] Disable the screen saver Signed-off-by: Tim Smith <tsmith@chef.io> --- .../windows/cookbooks/packer/recipes/disable_screensaver.rb | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 packer_templates/windows/cookbooks/packer/recipes/disable_screensaver.rb diff --git a/packer_templates/windows/cookbooks/packer/recipes/disable_screensaver.rb b/packer_templates/windows/cookbooks/packer/recipes/disable_screensaver.rb new file mode 100644 index 000000000..8318ac72b --- /dev/null +++ b/packer_templates/windows/cookbooks/packer/recipes/disable_screensaver.rb @@ -0,0 +1,5 @@ +# Disable the screensaver +registry_key 'HKEY_CURRENT_USER\Control Panel\Desktop' do + values [{ name: 'ScreenSaveActive', type: :dword, data: 0 }] # disable + action :create +end From 07b96fde4c5c37f696e5480775e9202050d3858e Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Fri, 13 Dec 2019 23:20:55 -0800 Subject: [PATCH 1113/1622] Standardize the recipe order a bit Signed-off-by: Tim Smith <tsmith@chef.io> --- .../windows/cookbooks/packer/kitchen.yml | 10 +++--- packer_templates/windows/windows-10.json | 8 ++--- packer_templates/windows/windows-2008r2.json | 3 +- packer_templates/windows/windows-2012r2.json | 7 +++-- packer_templates/windows/windows-2016.json | 7 +++-- packer_templates/windows/windows-2019.json | 7 +++-- packer_templates/windows/windows-7.json | 31 ++++++++++--------- 7 files changed, 41 insertions(+), 32 deletions(-) diff --git a/packer_templates/windows/cookbooks/packer/kitchen.yml b/packer_templates/windows/cookbooks/packer/kitchen.yml index e1933c582..0cd47f581 100644 --- a/packer_templates/windows/cookbooks/packer/kitchen.yml +++ b/packer_templates/windows/cookbooks/packer/kitchen.yml @@ -13,6 +13,9 @@ provisioner: deprecations_as_errors: true platforms: + - name: windows-2019 + driver_config: + box: tas50/windows_2019 - name: windows-2016 driver_config: box: tas50/windows_2016 @@ -27,16 +30,15 @@ suites: - name: default run_list: - recipe[packer::disable_uac] - - recipe[packer::disable_windows_defender] - - recipe[packer::disable_windows_update] - recipe[packer::disable_restore] - - recipe[packer::disable_hibernation] + - recipe[packer::disable_windows_update] - recipe[packer::remove_defender] + - recipe[packer::configure_power] + - recipe[packer::disable_screensaver] - recipe[packer::vm_tools] - recipe[packer::features] - recipe[packer::enable_file_sharing] - recipe[packer::enable_remote_desktop] - recipe[packer::ui_tweaks] - - recipe[packer::power] - recipe[packer::cleanup] - recipe[packer::defrag] diff --git a/packer_templates/windows/windows-10.json b/packer_templates/windows/windows-10.json index 2a31555a7..93adc702d 100644 --- a/packer_templates/windows/windows-10.json +++ b/packer_templates/windows/windows-10.json @@ -59,9 +59,10 @@ "packer::disable_uac", "packer::disable_onedrive", "packer::disable_restore", - "packer::disable_hibernation", "packer::disable_windows_update", - "packer::remove_defender" + "packer::remove_defender", + "packer::configure_power", + "packer::disable_screensaver" ] }, { @@ -76,8 +77,7 @@ "packer::features", "packer::enable_file_sharing", "packer::enable_remote_desktop", - "packer::ui_tweaks", - "packer::power" + "packer::ui_tweaks" ] }, { diff --git a/packer_templates/windows/windows-2008r2.json b/packer_templates/windows/windows-2008r2.json index 05ad4ceb3..477aac7e8 100644 --- a/packer_templates/windows/windows-2008r2.json +++ b/packer_templates/windows/windows-2008r2.json @@ -65,7 +65,8 @@ "packer::enable_file_sharing", "packer::enable_remote_desktop", "packer::ui_tweaks", - "packer::power", + "packer::configure_power", + "packer::disable_screensaver", "packer::updates" ] }, diff --git a/packer_templates/windows/windows-2012r2.json b/packer_templates/windows/windows-2012r2.json index d75b46ec5..28dfa010e 100644 --- a/packer_templates/windows/windows-2012r2.json +++ b/packer_templates/windows/windows-2012r2.json @@ -58,7 +58,9 @@ "packer::disable_uac", "packer::disable_restore", "packer::disable_windows_update", - "packer::remove_defender" + "packer::remove_defender", + "packer::configure_power", + "packer::disable_screensaver" ] }, { @@ -73,8 +75,7 @@ "packer::features", "packer::enable_file_sharing", "packer::enable_remote_desktop", - "packer::ui_tweaks", - "packer::power" + "packer::ui_tweaks" ] }, { diff --git a/packer_templates/windows/windows-2016.json b/packer_templates/windows/windows-2016.json index 057ff80c4..7968f14d2 100644 --- a/packer_templates/windows/windows-2016.json +++ b/packer_templates/windows/windows-2016.json @@ -58,7 +58,9 @@ "packer::disable_uac", "packer::disable_restore", "packer::disable_windows_update", - "packer::remove_defender" + "packer::remove_defender", + "packer::configure_power", + "packer::disable_screensaver" ] }, { @@ -73,8 +75,7 @@ "packer::features", "packer::enable_file_sharing", "packer::enable_remote_desktop", - "packer::ui_tweaks", - "packer::power" + "packer::ui_tweaks" ] }, { diff --git a/packer_templates/windows/windows-2019.json b/packer_templates/windows/windows-2019.json index 8bb77309a..e9a48a9e0 100644 --- a/packer_templates/windows/windows-2019.json +++ b/packer_templates/windows/windows-2019.json @@ -58,7 +58,9 @@ "packer::disable_uac", "packer::disable_restore", "packer::disable_windows_update", - "packer::remove_defender" + "packer::remove_defender", + "packer::configure_power", + "packer::disable_screensaver" ] }, { @@ -73,8 +75,7 @@ "packer::features", "packer::enable_file_sharing", "packer::enable_remote_desktop", - "packer::ui_tweaks", - "packer::power" + "packer::ui_tweaks" ] }, { diff --git a/packer_templates/windows/windows-7.json b/packer_templates/windows/windows-7.json index b18b8be49..c38f8b06f 100644 --- a/packer_templates/windows/windows-7.json +++ b/packer_templates/windows/windows-7.json @@ -1,16 +1,18 @@ { "builders": [{ - "type": "virtualbox-iso", - "vboxmanage": [ - ["modifyvm", "{{.Name}}", "--vram", "48"], - ["modifyvm", "{{.Name}}", "--audio", "none"] - ], - "memory": "{{ user `memory` }}", - "cpus": "{{ user `cpus` }}", - "guest_additions_mode": "{{ user `guest_additions_mode` }}", - "guest_additions_url": "{{ user `guest_additions_url` }}", - "guest_additions_path": "C:/users/vagrant/VBoxGuestAdditions.iso", - "guest_os_type": "Windows7_64", + "type": "virtualbox-iso", + "vboxmanage": [ + ["modifyvm", "{{.Name}}", "--vram", "48"], + ["modifyvm", "{{.Name}}", "--audio", "none"] + ], + "memory": "{{ user `memory` }}", + "cpus": "{{ user `cpus` }}", + "guest_additions_mode": "{{ user `guest_additions_mode` }}", + "guest_additions_url": "{{ user `guest_additions_url` }}", + "guest_additions_path": "C:/users/vagrant/VBoxGuestAdditions.iso", + "guest_os_type": "Windows7_64", + "hard_drive_interface": "sata", + "iso_interface": "sata", "headless": "{{ user `headless` }}", "iso_url": "{{ user `iso_url` }}", "iso_checksum": "{{ user `iso_checksum` }}", @@ -34,7 +36,9 @@ "packer::disable_uac", "packer::disable_restore", "packer::disable_windows_update", - "packer::remove_defender" + "packer::remove_defender", + "packer::configure_power", + "packer::disable_screensaver" ] }, { @@ -49,8 +53,7 @@ "packer::features", "packer::enable_file_sharing", "packer::enable_remote_desktop", - "packer::ui_tweaks", - "packer::power" + "packer::ui_tweaks" ] }, { From 1c66277709e27546c99628854a71a007f7fac5a5 Mon Sep 17 00:00:00 2001 From: Ali Rizvi-Santiago <arizvisa@gmail.com> Date: Thu, 19 Dec 2019 17:40:17 -0600 Subject: [PATCH 1114/1622] Modified the boot_command for all of the FreeBSD templates to include the pidfile path when executing dhclient. Signed-off-by: Ali Rizvi-Santiago <arizvisa@gmail.com> --- packer_templates/freebsd/freebsd-11.3-amd64.json | 8 ++++---- packer_templates/freebsd/freebsd-11.3-i386.json | 8 ++++---- packer_templates/freebsd/freebsd-12.0-amd64.json | 8 ++++---- packer_templates/freebsd/freebsd-12.0-i386.json | 8 ++++---- packer_templates/freebsd/freebsd-12.1-amd64.json | 8 ++++---- packer_templates/freebsd/freebsd-12.1-i386.json | 8 ++++---- 6 files changed, 24 insertions(+), 24 deletions(-) diff --git a/packer_templates/freebsd/freebsd-11.3-amd64.json b/packer_templates/freebsd/freebsd-11.3-amd64.json index e9c5501b3..22c4f0b91 100644 --- a/packer_templates/freebsd/freebsd-11.3-amd64.json +++ b/packer_templates/freebsd/freebsd-11.3-amd64.json @@ -9,7 +9,7 @@ "/bin/sh<enter><wait>", "mdmfs -s 100m md1 /tmp<enter><wait>", "mdmfs -s 100m md2 /mnt<enter><wait>", - "dhclient -l /tmp/dhclient.lease.em0 em0<enter><wait>", + "dhclient -p /tmp/dhclient.em0.pid -l /tmp/dhclient.lease.em0 em0<enter><wait>", "fetch -o /tmp/installerconfig http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} && bsdinstall script /tmp/installerconfig<enter><wait>" ], "boot_wait": "10s", @@ -42,7 +42,7 @@ "/bin/sh<enter><wait>", "mdmfs -s 100m md1 /tmp<enter><wait>", "mdmfs -s 100m md2 /mnt<enter><wait>", - "dhclient -l /tmp/dhclient.lease.em0 em0<enter><wait>", + "dhclient -p /tmp/dhclient.em0.pid -l /tmp/dhclient.lease.em0 em0<enter><wait>", "<wait5>", "fetch -o /tmp/installerconfig http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} && bsdinstall script /tmp/installerconfig<enter><wait>" ], @@ -78,7 +78,7 @@ "/bin/sh<enter><wait>", "mdmfs -s 100m md1 /tmp<enter><wait>", "mdmfs -s 100m md2 /mnt<enter><wait>", - "dhclient -l /tmp/dhclient.lease.em0 em0<enter><wait>", + "dhclient -p /tmp/dhclient.em0.pid -l /tmp/dhclient.lease.em0 em0<enter><wait>", "fetch -o /tmp/installerconfig http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} && bsdinstall script /tmp/installerconfig<enter><wait>" ], "boot_wait": "8s", @@ -132,7 +132,7 @@ "/bin/sh<enter><wait>", "mdmfs -s 100m md1 /tmp<enter><wait>", "mdmfs -s 100m md2 /mnt<enter><wait>", - "dhclient -l /tmp/dhclient.lease.vtnet0 vtnet0<enter><wait>", + "dhclient -p /tmp/dhclient.vtnet0.pid -l /tmp/dhclient.lease.vtnet0 vtnet0<enter><wait>", "fetch -o /tmp/installerconfig http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} && bsdinstall script /tmp/installerconfig<enter><wait>" ], "boot_wait": "7s", diff --git a/packer_templates/freebsd/freebsd-11.3-i386.json b/packer_templates/freebsd/freebsd-11.3-i386.json index b191ef871..8aaa77684 100644 --- a/packer_templates/freebsd/freebsd-11.3-i386.json +++ b/packer_templates/freebsd/freebsd-11.3-i386.json @@ -9,7 +9,7 @@ "/bin/sh<enter><wait>", "mdmfs -s 100m md1 /tmp<enter><wait>", "mdmfs -s 100m md2 /mnt<enter><wait>", - "dhclient -l /tmp/dhclient.lease.em0 em0<enter><wait>", + "dhclient /tmp/dhclient.em0.pid -l /tmp/dhclient.lease.em0 em0<enter><wait>", "fetch -o /tmp/installerconfig http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} && bsdinstall script /tmp/installerconfig<enter><wait>" ], "boot_wait": "10s", @@ -42,7 +42,7 @@ "/bin/sh<enter><wait>", "mdmfs -s 100m md1 /tmp<enter><wait>", "mdmfs -s 100m md2 /mnt<enter><wait>", - "dhclient -l /tmp/dhclient.lease.em0 em0<enter><wait>", + "dhclient -p /tmp/dhclient.em0.pid -l /tmp/dhclient.lease.em0 em0<enter><wait>", "<wait5>", "fetch -o /tmp/installerconfig http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} && bsdinstall script /tmp/installerconfig<enter><wait>" ], @@ -78,7 +78,7 @@ "/bin/sh<enter><wait>", "mdmfs -s 100m md1 /tmp<enter><wait>", "mdmfs -s 100m md2 /mnt<enter><wait>", - "dhclient -l /tmp/dhclient.lease.em0 em0<enter><wait>", + "dhclient -p /tmp/dhclient.em0.pid -l /tmp/dhclient.lease.em0 em0<enter><wait>", "fetch -o /tmp/installerconfig http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} && bsdinstall script /tmp/installerconfig<enter><wait>" ], "boot_wait": "8s", @@ -132,7 +132,7 @@ "/bin/sh<enter><wait>", "mdmfs -s 100m md1 /tmp<enter><wait>", "mdmfs -s 100m md2 /mnt<enter><wait>", - "dhclient -l /tmp/dhclient.lease.vtnet0 vtnet0<enter><wait>", + "dhclient -p /tmp/dhclient.vtnet0.pid -l /tmp/dhclient.lease.vtnet0 vtnet0<enter><wait>", "fetch -o /tmp/installerconfig http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} && bsdinstall script /tmp/installerconfig<enter><wait>" ], "boot_wait": "7s", diff --git a/packer_templates/freebsd/freebsd-12.0-amd64.json b/packer_templates/freebsd/freebsd-12.0-amd64.json index 7f69b1174..d04ccd523 100644 --- a/packer_templates/freebsd/freebsd-12.0-amd64.json +++ b/packer_templates/freebsd/freebsd-12.0-amd64.json @@ -9,7 +9,7 @@ "/bin/sh<enter><wait>", "mdmfs -s 100m md1 /tmp<enter><wait>", "mdmfs -s 100m md2 /mnt<enter><wait>", - "dhclient -l /tmp/dhclient.lease.em0 em0<enter><wait>", + "dhclient -p /tmp/dhclient.em0.pid -l /tmp/dhclient.lease.em0 em0<enter><wait>", "fetch -o /tmp/installerconfig http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} && bsdinstall script /tmp/installerconfig<enter><wait>" ], "boot_wait": "10s", @@ -42,7 +42,7 @@ "/bin/sh<enter><wait>", "mdmfs -s 100m md1 /tmp<enter><wait>", "mdmfs -s 100m md2 /mnt<enter><wait>", - "dhclient -l /tmp/dhclient.lease.em0 em0<enter><wait>", + "dhclient -p /tmp/dhclient.em0.pid -l /tmp/dhclient.lease.em0 em0<enter><wait>", "<wait5>", "fetch -o /tmp/installerconfig http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} && bsdinstall script /tmp/installerconfig<enter><wait>" ], @@ -78,7 +78,7 @@ "/bin/sh<enter><wait>", "mdmfs -s 100m md1 /tmp<enter><wait>", "mdmfs -s 100m md2 /mnt<enter><wait>", - "dhclient -l /tmp/dhclient.lease.em0 em0<enter><wait>", + "dhclient -p /tmp/dhclient.em0.pid -l /tmp/dhclient.lease.em0 em0<enter><wait>", "fetch -o /tmp/installerconfig http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} && bsdinstall script /tmp/installerconfig<enter><wait>" ], "boot_wait": "8s", @@ -132,7 +132,7 @@ "/bin/sh<enter><wait>", "mdmfs -s 100m md1 /tmp<enter><wait>", "mdmfs -s 100m md2 /mnt<enter><wait>", - "dhclient -l /tmp/dhclient.lease.vtnet0 vtnet0<enter><wait>", + "dhclient -p /tmp/dhclient.vtnet0.pid -l /tmp/dhclient.lease.vtnet0 vtnet0<enter><wait>", "fetch -o /tmp/installerconfig http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} && bsdinstall script /tmp/installerconfig<enter><wait>" ], "boot_wait": "7s", diff --git a/packer_templates/freebsd/freebsd-12.0-i386.json b/packer_templates/freebsd/freebsd-12.0-i386.json index f52a00990..de0becd12 100644 --- a/packer_templates/freebsd/freebsd-12.0-i386.json +++ b/packer_templates/freebsd/freebsd-12.0-i386.json @@ -9,7 +9,7 @@ "/bin/sh<enter><wait>", "mdmfs -s 100m md1 /tmp<enter><wait>", "mdmfs -s 100m md2 /mnt<enter><wait>", - "dhclient -l /tmp/dhclient.lease.em0 em0<enter><wait>", + "dhclient -p /tmp/dhclient.em0.pid -l /tmp/dhclient.lease.em0 em0<enter><wait>", "fetch -o /tmp/installerconfig http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} && bsdinstall script /tmp/installerconfig<enter><wait>" ], "boot_wait": "10s", @@ -42,7 +42,7 @@ "/bin/sh<enter><wait>", "mdmfs -s 100m md1 /tmp<enter><wait>", "mdmfs -s 100m md2 /mnt<enter><wait>", - "dhclient -l /tmp/dhclient.lease.em0 em0<enter><wait>", + "dhclient -p /tmp/dhclient.em0.pid -l /tmp/dhclient.lease.em0 em0<enter><wait>", "<wait5>", "fetch -o /tmp/installerconfig http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} && bsdinstall script /tmp/installerconfig<enter><wait>" ], @@ -78,7 +78,7 @@ "/bin/sh<enter><wait>", "mdmfs -s 100m md1 /tmp<enter><wait>", "mdmfs -s 100m md2 /mnt<enter><wait>", - "dhclient -l /tmp/dhclient.lease.em0 em0<enter><wait>", + "dhclient -p /tmp/dhclient.em0.pid -l /tmp/dhclient.lease.em0 em0<enter><wait>", "fetch -o /tmp/installerconfig http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} && bsdinstall script /tmp/installerconfig<enter><wait>" ], "boot_wait": "8s", @@ -132,7 +132,7 @@ "/bin/sh<enter><wait>", "mdmfs -s 100m md1 /tmp<enter><wait>", "mdmfs -s 100m md2 /mnt<enter><wait>", - "dhclient -l /tmp/dhclient.lease.vtnet0 vtnet0<enter><wait>", + "dhclient -p /tmp/dhclient.vtnet0.pid -l /tmp/dhclient.lease.vtnet0 vtnet0<enter><wait>", "fetch -o /tmp/installerconfig http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} && bsdinstall script /tmp/installerconfig<enter><wait>" ], "boot_wait": "7s", diff --git a/packer_templates/freebsd/freebsd-12.1-amd64.json b/packer_templates/freebsd/freebsd-12.1-amd64.json index f80c9df26..52f291544 100644 --- a/packer_templates/freebsd/freebsd-12.1-amd64.json +++ b/packer_templates/freebsd/freebsd-12.1-amd64.json @@ -9,7 +9,7 @@ "/bin/sh<enter><wait>", "mdmfs -s 100m md1 /tmp<enter><wait>", "mdmfs -s 100m md2 /mnt<enter><wait>", - "dhclient -l /tmp/dhclient.lease.em0 em0<enter><wait>", + "dhclient -p /tmp/dhclient.em0.pid -l /tmp/dhclient.lease.em0 em0<enter><wait>", "fetch -o /tmp/installerconfig http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} && bsdinstall script /tmp/installerconfig<enter><wait>" ], "boot_wait": "10s", @@ -42,7 +42,7 @@ "/bin/sh<enter><wait>", "mdmfs -s 100m md1 /tmp<enter><wait>", "mdmfs -s 100m md2 /mnt<enter><wait>", - "dhclient -l /tmp/dhclient.lease.em0 em0<enter><wait>", + "dhclient -p /tmp/dhclient.em0.pid -l /tmp/dhclient.lease.em0 em0<enter><wait>", "<wait5>", "fetch -o /tmp/installerconfig http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} && bsdinstall script /tmp/installerconfig<enter><wait>" ], @@ -78,7 +78,7 @@ "/bin/sh<enter><wait>", "mdmfs -s 100m md1 /tmp<enter><wait>", "mdmfs -s 100m md2 /mnt<enter><wait>", - "dhclient -l /tmp/dhclient.lease.em0 em0<enter><wait>", + "dhclient -p /tmp/dhclient.em0.pid -l /tmp/dhclient.lease.em0 em0<enter><wait>", "fetch -o /tmp/installerconfig http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} && bsdinstall script /tmp/installerconfig<enter><wait>" ], "boot_wait": "8s", @@ -132,7 +132,7 @@ "/bin/sh<enter><wait>", "mdmfs -s 100m md1 /tmp<enter><wait>", "mdmfs -s 100m md2 /mnt<enter><wait>", - "dhclient -l /tmp/dhclient.lease.vtnet0 vtnet0<enter><wait>", + "dhclient -p /tmp/dhclient.vtnet0.pid -l /tmp/dhclient.lease.vtnet0 vtnet0<enter><wait>", "fetch -o /tmp/installerconfig http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} && bsdinstall script /tmp/installerconfig<enter><wait>" ], "boot_wait": "7s", diff --git a/packer_templates/freebsd/freebsd-12.1-i386.json b/packer_templates/freebsd/freebsd-12.1-i386.json index 0c83c11f5..6ffd530f3 100644 --- a/packer_templates/freebsd/freebsd-12.1-i386.json +++ b/packer_templates/freebsd/freebsd-12.1-i386.json @@ -9,7 +9,7 @@ "/bin/sh<enter><wait>", "mdmfs -s 100m md1 /tmp<enter><wait>", "mdmfs -s 100m md2 /mnt<enter><wait>", - "dhclient -l /tmp/dhclient.lease.em0 em0<enter><wait>", + "dhclient -p /tmp/dhclient.em0.pid -l /tmp/dhclient.lease.em0 em0<enter><wait>", "fetch -o /tmp/installerconfig http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} && bsdinstall script /tmp/installerconfig<enter><wait>" ], "boot_wait": "10s", @@ -42,7 +42,7 @@ "/bin/sh<enter><wait>", "mdmfs -s 100m md1 /tmp<enter><wait>", "mdmfs -s 100m md2 /mnt<enter><wait>", - "dhclient -l /tmp/dhclient.lease.em0 em0<enter><wait>", + "dhclient -p /tmp/dhclient.em0.pid -l /tmp/dhclient.lease.em0 em0<enter><wait>", "<wait5>", "fetch -o /tmp/installerconfig http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} && bsdinstall script /tmp/installerconfig<enter><wait>" ], @@ -78,7 +78,7 @@ "/bin/sh<enter><wait>", "mdmfs -s 100m md1 /tmp<enter><wait>", "mdmfs -s 100m md2 /mnt<enter><wait>", - "dhclient -l /tmp/dhclient.lease.em0 em0<enter><wait>", + "dhclient -p /tmp/dhclient.em0.pid -l /tmp/dhclient.lease.em0 em0<enter><wait>", "fetch -o /tmp/installerconfig http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} && bsdinstall script /tmp/installerconfig<enter><wait>" ], "boot_wait": "8s", @@ -132,7 +132,7 @@ "/bin/sh<enter><wait>", "mdmfs -s 100m md1 /tmp<enter><wait>", "mdmfs -s 100m md2 /mnt<enter><wait>", - "dhclient -l /tmp/dhclient.lease.vtnet0 vtnet0<enter><wait>", + "dhclient -p /tmp/dhclient.vtnet0.pid -l /tmp/dhclient.lease.vtnet0 vtnet0<enter><wait>", "fetch -o /tmp/installerconfig http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} && bsdinstall script /tmp/installerconfig<enter><wait>" ], "boot_wait": "7s", From 75c0893972d295730e5dbf3f1fe144b332683ffb Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Thu, 19 Dec 2019 16:28:24 -0800 Subject: [PATCH 1115/1622] Fix vmware install failures on opensuse Signed-off-by: Tim Smith <tsmith@chef.io> --- packer_templates/opensuse/scripts/add_packages.sh | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/packer_templates/opensuse/scripts/add_packages.sh b/packer_templates/opensuse/scripts/add_packages.sh index 1698de837..150989645 100644 --- a/packer_templates/opensuse/scripts/add_packages.sh +++ b/packer_templates/opensuse/scripts/add_packages.sh @@ -2,3 +2,8 @@ # Install missing packages zypper install -y kernel-default-devel gcc + +# this is needed for the vmware tools install to complete +if [[ "$PACKER_BUILDER_TYPE" == vmware-iso ]]; then + zypper install -y insserv-compat +fi \ No newline at end of file From 4ef6ed5280c758b697d73765ef300287d3c0008e Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith@chef.io> Date: Sun, 22 Dec 2019 13:03:19 -0800 Subject: [PATCH 1116/1622] Minor readme updates Update platform names Update examples for 2019 --- README.md | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/README.md b/README.md index a0b41bd98..b164c52e5 100644 --- a/README.md +++ b/README.md @@ -9,14 +9,14 @@ Bento is a project that encapsulates [Packer](https://www.packer.io/) templates Adding a bento box to Vagrant ``` -$ vagrant box add bento/ubuntu-16.04 +$ vagrant box add bento/ubuntu-18.04 ``` Using a bento box in a Vagrantfile ``` Vagrant.configure("2") do |config| - config.vm.box = "bento/ubuntu-16.04" + config.vm.box = "bento/ubuntu-18.04" end ``` @@ -37,41 +37,41 @@ end #### Using `packer` -To build an Ubuntu 16.04 box for only the VirtualBox provider +To build an Ubuntu 18.04 box for only the VirtualBox provider ``` $ cd ubuntu -$ packer build -only=virtualbox-iso ubuntu-16.04-amd64.json +$ packer build -only=virtualbox-iso ubuntu-18.04-amd64.json ``` -To build Debian 9.1 32bit boxes for all possible providers (simultaneously) +To build Debian 10.2 32bit boxes for all possible providers (simultaneously) ``` $ cd debian -$ packer build debian-9.1-i386.json +$ packer build debian-10.2-i386.json ``` -To build CentOS 7.3 boxes for all providers except VMware and Parallels +To build CentOS 7.7 boxes for all providers except VMware and Parallels ``` $ cd centos -$ packer build -except=parallels-iso,vmware-iso centos-7.3-x86_64.json +$ packer build -except=parallels-iso,vmware-iso centos-7.7-x86_64.json ``` To use an alternate mirror ``` $ cd fedora -$ packer build -var 'mirror=http://mirror.utexas.edu/fedora/linux' fedora-26-x86_64.json +$ packer build -var 'mirror=http://mirror.utexas.edu/fedora/linux' fedora-31-x86_64.json ``` If the build is successful, ready to import box files will be in the `builds` directory at the root of the repository. -\***NOTE:** box_basename can be overridden like other Packer vars with `-var 'box_basename=ubuntu-16.04'` +\***NOTE:** box_basename can be overridden like other Packer vars with `-var 'box_basename=ubuntu-18.04'` ### Proprietary Templates -Templates for operating systems only available via license or subscription are also available in the repository, these include but are not limited to: Mac OS X, Red Hat Enterprise Linux, and SUSE Linux Enterprise. As the ISOs are not publicly available the URL values will need to be overridden as appropriate. We rely on the efforts of those with access to licensed versions of the operating systems to keep these up-to-date. +Templates for operating systems only available via license or subscription are also available in the repository, these include but are not limited to: macOS, Red Hat Enterprise Linux, and SUSE Linux Enterprise. As the ISOs are not publicly available the URL values will need to be overridden as appropriate. We rely on the efforts of those with access to licensed versions of the operating systems to keep these up-to-date. ### Networking/Firewalls From fd2c74117577901dfbbe2818c9b39bbab6999aed Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Sun, 22 Dec 2019 14:10:11 -0800 Subject: [PATCH 1117/1622] Make sure we have the uploaded dir for windows This keeps builds from blowing up Signed-off-by: Tim Smith <tsmith@chef.io> --- builds/uploaded/.gitkeep | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 builds/uploaded/.gitkeep diff --git a/builds/uploaded/.gitkeep b/builds/uploaded/.gitkeep new file mode 100644 index 000000000..e69de29bb From 4070c160449c6130159f2cd926c4e99cf6993d92 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Sun, 22 Dec 2019 19:50:20 -0800 Subject: [PATCH 1118/1622] Add hyper-v to Oracle Linux Signed-off-by: Tim Smith <tsmith@chef.io> --- .../oraclelinux/oracle-5.11-i386.json | 29 +++++++++++++++++- .../oraclelinux/oracle-5.11-x86_64.json | 28 +++++++++++++++++ .../oraclelinux/oracle-6.10-i386.json | 28 +++++++++++++++++ .../oraclelinux/oracle-6.10-x86_64.json | 29 ++++++++++++++++++ .../oraclelinux/oracle-7.7-x86_64.json | 27 +++++++++++++++++ .../oraclelinux/oracle-8.1-x86_64.json | 30 ++++++++++++++++++- 6 files changed, 169 insertions(+), 2 deletions(-) diff --git a/packer_templates/oraclelinux/oracle-5.11-i386.json b/packer_templates/oraclelinux/oracle-5.11-i386.json index 429eab7ba..3d4bfe6bf 100644 --- a/packer_templates/oraclelinux/oracle-5.11-i386.json +++ b/packer_templates/oraclelinux/oracle-5.11-i386.json @@ -79,6 +79,33 @@ "type": "parallels-iso", "vm_name": "{{ user `template` }}" }, + { + "boot_command": [ + "<wait5><tab> text ks=hd:fd0:/ks.cfg<enter><wait5><esc>" + ], + "boot_wait": "10s", + "cpus": "{{ user `cpus` }}", + "disk_size": "{{user `disk_size`}}", + "floppy_files": [ + "{{template_dir}}/http/{{user `ks_path`}}" + ], + "generation": "{{user `hyperv_generation`}}", + "guest_additions_mode": "disable", + "http_directory": "{{template_dir}}/../centos/http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "memory": "{{ user `memory` }}", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-hyperv", + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_timeout": "10000s", + "ssh_username": "vagrant", + "switch_name": "{{ user `hyperv_switch`}}", + "type": "hyperv-iso", + "vm_name": "{{ user `template` }}" + }, { "boot_command": [ "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" @@ -133,7 +160,6 @@ } ], "variables": { - "arch": "32", "box_basename": "oracle-5.11-i386", "build_directory": "../../builds", "build_timestamp": "{{isotime \"20060102150405\"}}", @@ -143,6 +169,7 @@ "headless": "", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", + "hyperv_generation": "1", "guest_additions_url": "", "iso_checksum": "E60962C4EBF8920BBD828EFE32A78A7CC8F28E3B", "iso_checksum_type": "sha1", diff --git a/packer_templates/oraclelinux/oracle-5.11-x86_64.json b/packer_templates/oraclelinux/oracle-5.11-x86_64.json index d6a032e8d..c62c99daf 100644 --- a/packer_templates/oraclelinux/oracle-5.11-x86_64.json +++ b/packer_templates/oraclelinux/oracle-5.11-x86_64.json @@ -87,6 +87,33 @@ "type": "parallels-iso", "vm_name": "{{ user `template` }}" }, + { + "boot_command": [ + "<wait5><tab> text ks=hd:fd0:/ks.cfg<enter><wait5><esc>" + ], + "boot_wait": "10s", + "cpus": "{{ user `cpus` }}", + "disk_size": "{{user `disk_size`}}", + "floppy_files": [ + "{{template_dir}}/http/{{user `ks_path`}}" + ], + "generation": "{{user `hyperv_generation`}}", + "guest_additions_mode": "disable", + "http_directory": "{{template_dir}}/../centos/http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "memory": "{{ user `memory` }}", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-hyperv", + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_timeout": "10000s", + "ssh_username": "vagrant", + "switch_name": "{{ user `hyperv_switch`}}", + "type": "hyperv-iso", + "vm_name": "{{ user `template` }}" + }, { "boot_command": [ "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" @@ -151,6 +178,7 @@ "headless": "", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", + "hyperv_generation": "1", "guest_additions_url": "", "iso_checksum": "2D38F76652CBC1367FDF30024F13CDE5F6BF34DF", "iso_checksum_type": "sha1", diff --git a/packer_templates/oraclelinux/oracle-6.10-i386.json b/packer_templates/oraclelinux/oracle-6.10-i386.json index cf3f6c93e..f9e9526b7 100644 --- a/packer_templates/oraclelinux/oracle-6.10-i386.json +++ b/packer_templates/oraclelinux/oracle-6.10-i386.json @@ -79,6 +79,33 @@ "type": "parallels-iso", "vm_name": "{{ user `template` }}" }, + { + "boot_command": [ + "<wait5><tab> text ks=hd:fd0:/ks.cfg<enter><wait5><esc>" + ], + "boot_wait": "10s", + "cpus": "{{ user `cpus` }}", + "disk_size": "{{user `disk_size`}}", + "floppy_files": [ + "{{template_dir}}/http/{{user `ks_path`}}" + ], + "generation": "{{user `hyperv_generation`}}", + "guest_additions_mode": "disable", + "http_directory": "{{template_dir}}/../centos/http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "memory": "{{ user `memory` }}", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-hyperv", + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_timeout": "10000s", + "ssh_username": "vagrant", + "switch_name": "{{ user `hyperv_switch`}}", + "type": "hyperv-iso", + "vm_name": "{{ user `template` }}" + }, { "boot_command": [ "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" @@ -144,6 +171,7 @@ "headless": "", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", + "hyperv_generation": "1", "guest_additions_url": "", "iso_checksum": "fd07f775e7fa52e9ab021eb7dccb78453fc61f3d3b712ec426f6b1bf5020318b", "iso_checksum_type": "sha256", diff --git a/packer_templates/oraclelinux/oracle-6.10-x86_64.json b/packer_templates/oraclelinux/oracle-6.10-x86_64.json index 314d3e621..5ca75374c 100644 --- a/packer_templates/oraclelinux/oracle-6.10-x86_64.json +++ b/packer_templates/oraclelinux/oracle-6.10-x86_64.json @@ -79,6 +79,33 @@ "type": "parallels-iso", "vm_name": "{{ user `template` }}" }, + { + "boot_command": [ + "<wait5><tab> text ks=hd:fd0:/ks.cfg<enter><wait5><esc>" + ], + "boot_wait": "10s", + "cpus": "{{ user `cpus` }}", + "disk_size": "{{user `disk_size`}}", + "floppy_files": [ + "{{template_dir}}/http/{{user `ks_path`}}" + ], + "generation": "{{user `hyperv_generation`}}", + "guest_additions_mode": "disable", + "http_directory": "{{template_dir}}/../centos/http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "memory": "{{ user `memory` }}", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-hyperv", + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_timeout": "10000s", + "ssh_username": "vagrant", + "switch_name": "{{ user `hyperv_switch`}}", + "type": "hyperv-iso", + "vm_name": "{{ user `template` }}" + }, { "boot_command": [ "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" @@ -144,6 +171,8 @@ "headless": "", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", + "hyperv_generation": "1", + "hyperv_switch": "{{env `hyperv_switch`}}", "guest_additions_url": "", "iso_checksum": "c32e2a7c8eb471db731741f1a30be37e49deda8ce961710273a71b26c9a04a36", "iso_checksum_type": "sha256", diff --git a/packer_templates/oraclelinux/oracle-7.7-x86_64.json b/packer_templates/oraclelinux/oracle-7.7-x86_64.json index fd881bd1e..3f10e2185 100644 --- a/packer_templates/oraclelinux/oracle-7.7-x86_64.json +++ b/packer_templates/oraclelinux/oracle-7.7-x86_64.json @@ -79,6 +79,33 @@ "type": "parallels-iso", "vm_name": "{{ user `template` }}" }, + { + "boot_command": [ + "<wait5><tab> text ks=hd:fd0:/ks.cfg<enter><wait5><esc>" + ], + "boot_wait": "10s", + "cpus": "{{ user `cpus` }}", + "disk_size": "{{user `disk_size`}}", + "floppy_files": [ + "{{template_dir}}/http/7/ks.cfg" + ], + "generation": "{{user `hyperv_generation`}}", + "guest_additions_mode": "disable", + "http_directory": "{{template_dir}}/../centos/http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "memory": "{{ user `memory` }}", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-hyperv", + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_timeout": "10000s", + "ssh_username": "vagrant", + "switch_name": "{{ user `hyperv_switch`}}", + "type": "hyperv-iso", + "vm_name": "{{ user `template` }}" + }, { "boot_command": [ "<up><wait><tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" diff --git a/packer_templates/oraclelinux/oracle-8.1-x86_64.json b/packer_templates/oraclelinux/oracle-8.1-x86_64.json index b5b31d694..a30042840 100644 --- a/packer_templates/oraclelinux/oracle-8.1-x86_64.json +++ b/packer_templates/oraclelinux/oracle-8.1-x86_64.json @@ -79,6 +79,33 @@ "type": "parallels-iso", "vm_name": "{{ user `template` }}" }, + { + "boot_command": [ + "<wait5><tab> text ks=hd:fd0:/ks.cfg<enter><wait5><esc>" + ], + "boot_wait": "10s", + "cpus": "{{ user `cpus` }}", + "disk_size": "{{user `disk_size`}}", + "floppy_files": [ + "{{template_dir}}/http/8/ks.cfg" + ], + "generation": "{{user `hyperv_generation`}}", + "guest_additions_mode": "disable", + "http_directory": "{{template_dir}}/../centos/http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "memory": "{{ user `memory` }}", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-hyperv", + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_timeout": "10000s", + "ssh_username": "vagrant", + "switch_name": "{{ user `hyperv_switch`}}", + "type": "hyperv-iso", + "vm_name": "{{ user `template` }}" + }, { "boot_command": [ "<up><wait><tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" @@ -134,7 +161,6 @@ } ], "variables": { - "arch": "64", "box_basename": "oracle-8.1", "build_directory": "../../builds", "build_timestamp": "{{isotime \"2019102650405\"}}", @@ -144,6 +170,8 @@ "headless": "", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", + "hyperv_generation": "1", + "hyperv_switch": "{{env `hyperv_switch`}}", "guest_additions_url": "", "iso_checksum": "8a8afc79c3e30209058201ff91a662b030f13951c7fa4d896f89dd356b3c6f22", "iso_checksum_type": "sha256", From c6362ebfa2dc247bf549a23c2ce3914578faa458 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Sun, 22 Dec 2019 20:24:00 -0800 Subject: [PATCH 1119/1622] Avoid checksuming the centos boot ISOs Signed-off-by: Tim Smith <tsmith@chef.io> --- packer_templates/centos/centos-5.11-x86_64.json | 6 +++--- packer_templates/centos/centos-6.10-i386.json | 6 +++--- packer_templates/centos/centos-6.10-x86_64.json | 6 +++--- packer_templates/centos/centos-7.7-x86_64.json | 2 +- packer_templates/centos/centos-8.0-x86_64.json | 2 +- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/packer_templates/centos/centos-5.11-x86_64.json b/packer_templates/centos/centos-5.11-x86_64.json index 710c11518..900ab4cd2 100644 --- a/packer_templates/centos/centos-5.11-x86_64.json +++ b/packer_templates/centos/centos-5.11-x86_64.json @@ -29,7 +29,7 @@ }, { "boot_command": [ - "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" + "<up><wait><tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", @@ -57,7 +57,7 @@ }, { "boot_command": [ - "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" + "<up><wait><tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", @@ -108,7 +108,7 @@ }, { "boot_command": [ - "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" + "<up><wait><tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], "boot_wait": "10s", "memory": "{{ user `memory` }}", diff --git a/packer_templates/centos/centos-6.10-i386.json b/packer_templates/centos/centos-6.10-i386.json index 3cba32388..acf8b86ae 100644 --- a/packer_templates/centos/centos-6.10-i386.json +++ b/packer_templates/centos/centos-6.10-i386.json @@ -29,7 +29,7 @@ }, { "boot_command": [ - "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" + "<up><wait><tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", @@ -57,7 +57,7 @@ }, { "boot_command": [ - "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" + "<up><wait><tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", @@ -108,7 +108,7 @@ }, { "boot_command": [ - "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" + "<up><wait><tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], "boot_wait": "10s", "memory": "{{ user `memory` }}", diff --git a/packer_templates/centos/centos-6.10-x86_64.json b/packer_templates/centos/centos-6.10-x86_64.json index e883c2719..87d17b8ae 100644 --- a/packer_templates/centos/centos-6.10-x86_64.json +++ b/packer_templates/centos/centos-6.10-x86_64.json @@ -29,7 +29,7 @@ }, { "boot_command": [ - "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" + "<up><wait><tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", @@ -57,7 +57,7 @@ }, { "boot_command": [ - "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" + "<up><wait><tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", @@ -108,7 +108,7 @@ }, { "boot_command": [ - "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" + "<up><wait><tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], "boot_wait": "10s", "memory": "{{ user `memory` }}", diff --git a/packer_templates/centos/centos-7.7-x86_64.json b/packer_templates/centos/centos-7.7-x86_64.json index 70a63af74..335106783 100644 --- a/packer_templates/centos/centos-7.7-x86_64.json +++ b/packer_templates/centos/centos-7.7-x86_64.json @@ -87,7 +87,7 @@ "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "floppy_files": [ - "{{template_dir}}/http/7/ks.cfg" + "{{template_dir}}/http/{{user `ks_path`}}" ], "generation": "{{user `hyperv_generation`}}", "guest_additions_mode": "disable", diff --git a/packer_templates/centos/centos-8.0-x86_64.json b/packer_templates/centos/centos-8.0-x86_64.json index 84c88bf63..9a77cd999 100644 --- a/packer_templates/centos/centos-8.0-x86_64.json +++ b/packer_templates/centos/centos-8.0-x86_64.json @@ -87,7 +87,7 @@ "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "floppy_files": [ - "{{template_dir}}/http/8/ks.cfg" + "{{template_dir}}/http/{{user `ks_path`}}" ], "generation": "{{user `hyperv_generation`}}", "guest_additions_mode": "disable", From 00a20e484ccba3c7f194d3065618cac6a8211965 Mon Sep 17 00:00:00 2001 From: kartnico <kartnico@kartzone.info> Date: Fri, 3 Jan 2020 17:32:15 +0100 Subject: [PATCH 1120/1622] Added the "http_directory" user-variable to all the templates, and updated the "http_directory" option in the builders to use it. Signed-off-by: kartnico <kartnico@kartzone.info> --- packer_templates/amazonlinux/amazon-2-x86_64.json | 3 ++- packer_templates/centos/centos-5.11-i386.json | 11 ++++++----- packer_templates/centos/centos-5.11-x86_64.json | 11 ++++++----- packer_templates/centos/centos-6.10-i386.json | 11 ++++++----- packer_templates/centos/centos-6.10-x86_64.json | 11 ++++++----- packer_templates/centos/centos-7.7-x86_64.json | 11 ++++++----- packer_templates/centos/centos-8.0-x86_64.json | 11 ++++++----- packer_templates/debian/debian-10.2-amd64.json | 9 +++++---- packer_templates/debian/debian-10.2-i386.json | 9 +++++---- packer_templates/debian/debian-8.11-amd64.json | 9 +++++---- packer_templates/debian/debian-8.11-i386.json | 9 +++++---- packer_templates/debian/debian-9.11-amd64.json | 9 +++++---- packer_templates/debian/debian-9.11-i386.json | 9 +++++---- packer_templates/debian/debian-9.11-ppc64el.json | 3 ++- packer_templates/fedora/fedora-30-x86_64.json | 11 ++++++----- packer_templates/fedora/fedora-31-x86_64.json | 11 ++++++----- packer_templates/freebsd/freebsd-11.3-amd64.json | 9 +++++---- packer_templates/freebsd/freebsd-11.3-i386.json | 9 +++++---- packer_templates/freebsd/freebsd-12.0-amd64.json | 9 +++++---- packer_templates/freebsd/freebsd-12.0-i386.json | 9 +++++---- packer_templates/freebsd/freebsd-12.1-amd64.json | 9 +++++---- packer_templates/freebsd/freebsd-12.1-i386.json | 9 +++++---- .../hardenedbsd/hardenedbsd-11-amd64.json | 9 +++++---- .../opensuse/opensuse-leap-15.1-x86_64.json | 9 +++++---- packer_templates/oraclelinux/oracle-5.11-i386.json | 11 ++++++----- packer_templates/oraclelinux/oracle-5.11-x86_64.json | 11 ++++++----- packer_templates/oraclelinux/oracle-6.10-i386.json | 11 ++++++----- packer_templates/oraclelinux/oracle-6.10-x86_64.json | 11 ++++++----- packer_templates/oraclelinux/oracle-7.7-x86_64.json | 11 ++++++----- packer_templates/oraclelinux/oracle-8.1-x86_64.json | 11 ++++++----- packer_templates/rhel/rhel-5.11-i386.json | 9 +++++---- packer_templates/rhel/rhel-5.11-x86_64.json | 9 +++++---- packer_templates/rhel/rhel-6.10-i386.json | 9 +++++---- packer_templates/rhel/rhel-6.10-x86_64.json | 9 +++++---- packer_templates/rhel/rhel-7.6-x86_64.json | 9 +++++---- packer_templates/rhel/rhel-8.0-x86_64.json | 9 +++++---- .../scientificlinux/scientific-7.7-x86_64.json | 11 ++++++----- packer_templates/sles/sles-11-sp4-x86_64.json | 9 +++++---- packer_templates/sles/sles-12-sp2-x86_64.json | 9 +++++---- packer_templates/sles/sles-12-sp3-x86_64.json | 9 +++++---- packer_templates/sles/sles-15-sp1.json | 9 +++++---- packer_templates/sles/sles-15.json | 9 +++++---- packer_templates/solaris/solaris-11-x86.json | 5 +++-- packer_templates/ubuntu/ubuntu-16.04-amd64.json | 11 ++++++----- packer_templates/ubuntu/ubuntu-16.04-i386.json | 11 ++++++----- packer_templates/ubuntu/ubuntu-18.04-amd64.json | 11 ++++++----- packer_templates/ubuntu/ubuntu-19.04-amd64.json | 11 ++++++----- packer_templates/ubuntu/ubuntu-19.10-amd64.json | 11 ++++++----- 48 files changed, 252 insertions(+), 204 deletions(-) diff --git a/packer_templates/amazonlinux/amazon-2-x86_64.json b/packer_templates/amazonlinux/amazon-2-x86_64.json index 8341279f9..8264a59c2 100644 --- a/packer_templates/amazonlinux/amazon-2-x86_64.json +++ b/packer_templates/amazonlinux/amazon-2-x86_64.json @@ -3,7 +3,7 @@ { "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "headless": "{{ user `headless` }}", - "http_directory": "{{template_dir}}/http", + "http_directory": "{{user `http_directory`}}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-virtualbox", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_wait_timeout": "10000s", @@ -62,6 +62,7 @@ "variables": { "box_basename": "amazon-2", "build_directory": "../../builds", + "http_directory": "{{template_dir}}/http", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", "disk_size": "65536", diff --git a/packer_templates/centos/centos-5.11-i386.json b/packer_templates/centos/centos-5.11-i386.json index 869593277..19fb9aaf1 100644 --- a/packer_templates/centos/centos-5.11-i386.json +++ b/packer_templates/centos/centos-5.11-i386.json @@ -11,7 +11,7 @@ "guest_os_type": "RedHat", "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", - "http_directory": "{{template_dir}}/http", + "http_directory": "{{user `http_directory`}}", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -35,7 +35,7 @@ "disk_size": "{{user `disk_size`}}", "guest_os_type": "centos", "headless": "{{ user `headless` }}", - "http_directory": "{{template_dir}}/http", + "http_directory": "{{user `http_directory`}}", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -62,7 +62,7 @@ "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", "guest_os_type": "centos", - "http_directory": "{{template_dir}}/http", + "http_directory": "{{user `http_directory`}}", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -91,7 +91,7 @@ ], "generation": "{{user `hyperv_generation`}}", "guest_additions_mode": "disable", - "http_directory": "{{template_dir}}/http", + "http_directory": "{{user `http_directory`}}", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -115,7 +115,7 @@ "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", - "http_directory": "{{template_dir}}/http", + "http_directory": "{{user `http_directory`}}", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -164,6 +164,7 @@ "variables": { "box_basename": "centos-5.11-i386", "build_directory": "../../builds", + "http_directory": "{{template_dir}}/http", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", "disk_size": "65536", diff --git a/packer_templates/centos/centos-5.11-x86_64.json b/packer_templates/centos/centos-5.11-x86_64.json index 900ab4cd2..62fe47891 100644 --- a/packer_templates/centos/centos-5.11-x86_64.json +++ b/packer_templates/centos/centos-5.11-x86_64.json @@ -11,7 +11,7 @@ "guest_os_type": "RedHat_64", "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", - "http_directory": "{{template_dir}}/http", + "http_directory": "{{user `http_directory`}}", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -35,7 +35,7 @@ "disk_size": "{{user `disk_size`}}", "guest_os_type": "centos-64", "headless": "{{ user `headless` }}", - "http_directory": "{{template_dir}}/http", + "http_directory": "{{user `http_directory`}}", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -62,7 +62,7 @@ "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", "guest_os_type": "centos", - "http_directory": "{{template_dir}}/http", + "http_directory": "{{user `http_directory`}}", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -91,7 +91,7 @@ ], "generation": "{{user `hyperv_generation`}}", "guest_additions_mode": "disable", - "http_directory": "{{template_dir}}/http", + "http_directory": "{{user `http_directory`}}", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -115,7 +115,7 @@ "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", - "http_directory": "{{template_dir}}/http", + "http_directory": "{{user `http_directory`}}", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -164,6 +164,7 @@ "variables": { "box_basename": "centos-5.11", "build_directory": "../../builds", + "http_directory": "{{template_dir}}/http", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", "disk_size": "65536", diff --git a/packer_templates/centos/centos-6.10-i386.json b/packer_templates/centos/centos-6.10-i386.json index acf8b86ae..f88255820 100644 --- a/packer_templates/centos/centos-6.10-i386.json +++ b/packer_templates/centos/centos-6.10-i386.json @@ -11,7 +11,7 @@ "guest_os_type": "RedHat", "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", - "http_directory": "{{template_dir}}/http", + "http_directory": "{{user `http_directory`}}", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -35,7 +35,7 @@ "disk_size": "{{user `disk_size`}}", "guest_os_type": "centos", "headless": "{{ user `headless` }}", - "http_directory": "{{template_dir}}/http", + "http_directory": "{{user `http_directory`}}", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -62,7 +62,7 @@ "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", "guest_os_type": "centos", - "http_directory": "{{template_dir}}/http", + "http_directory": "{{user `http_directory`}}", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -91,7 +91,7 @@ ], "generation": "{{user `hyperv_generation`}}", "guest_additions_mode": "disable", - "http_directory": "{{template_dir}}/http", + "http_directory": "{{user `http_directory`}}", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -115,7 +115,7 @@ "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", - "http_directory": "{{template_dir}}/http", + "http_directory": "{{user `http_directory`}}", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -163,6 +163,7 @@ "variables": { "box_basename": "centos-6.10-i386", "build_directory": "../../builds", + "http_directory": "{{template_dir}}/http", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", "disk_size": "65536", diff --git a/packer_templates/centos/centos-6.10-x86_64.json b/packer_templates/centos/centos-6.10-x86_64.json index 87d17b8ae..c16ff199f 100644 --- a/packer_templates/centos/centos-6.10-x86_64.json +++ b/packer_templates/centos/centos-6.10-x86_64.json @@ -11,7 +11,7 @@ "guest_os_type": "RedHat_64", "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", - "http_directory": "{{template_dir}}/http", + "http_directory": "{{user `http_directory`}}", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -35,7 +35,7 @@ "disk_size": "{{user `disk_size`}}", "guest_os_type": "centos-64", "headless": "{{ user `headless` }}", - "http_directory": "{{template_dir}}/http", + "http_directory": "{{user `http_directory`}}", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -62,7 +62,7 @@ "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", "guest_os_type": "centos", - "http_directory": "{{template_dir}}/http", + "http_directory": "{{user `http_directory`}}", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -91,7 +91,7 @@ ], "generation": "{{user `hyperv_generation`}}", "guest_additions_mode": "disable", - "http_directory": "{{template_dir}}/http", + "http_directory": "{{user `http_directory`}}", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -115,7 +115,7 @@ "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", - "http_directory": "{{template_dir}}/http", + "http_directory": "{{user `http_directory`}}", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -163,6 +163,7 @@ "variables": { "box_basename": "centos-6.10", "build_directory": "../../builds", + "http_directory": "{{template_dir}}/http", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", "disk_size": "65536", diff --git a/packer_templates/centos/centos-7.7-x86_64.json b/packer_templates/centos/centos-7.7-x86_64.json index 335106783..1682ec45c 100644 --- a/packer_templates/centos/centos-7.7-x86_64.json +++ b/packer_templates/centos/centos-7.7-x86_64.json @@ -11,7 +11,7 @@ "guest_os_type": "RedHat_64", "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", - "http_directory": "{{template_dir}}/http", + "http_directory": "{{user `http_directory`}}", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -35,7 +35,7 @@ "disk_size": "{{user `disk_size`}}", "guest_os_type": "centos-64", "headless": "{{ user `headless` }}", - "http_directory": "{{template_dir}}/http", + "http_directory": "{{user `http_directory`}}", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -62,7 +62,7 @@ "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", "guest_os_type": "centos", - "http_directory": "{{template_dir}}/http", + "http_directory": "{{user `http_directory`}}", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -91,7 +91,7 @@ ], "generation": "{{user `hyperv_generation`}}", "guest_additions_mode": "disable", - "http_directory": "{{template_dir}}/http", + "http_directory": "{{user `http_directory`}}", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -115,7 +115,7 @@ "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", - "http_directory": "{{template_dir}}/http", + "http_directory": "{{user `http_directory`}}", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -163,6 +163,7 @@ "variables": { "box_basename": "centos-7.7", "build_directory": "../../builds", + "http_directory": "{{template_dir}}/http", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", "disk_size": "65536", diff --git a/packer_templates/centos/centos-8.0-x86_64.json b/packer_templates/centos/centos-8.0-x86_64.json index 9a77cd999..4d0da28c6 100644 --- a/packer_templates/centos/centos-8.0-x86_64.json +++ b/packer_templates/centos/centos-8.0-x86_64.json @@ -11,7 +11,7 @@ "guest_os_type": "RedHat_64", "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", - "http_directory": "{{template_dir}}/http", + "http_directory": "{{user `http_directory`}}", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -35,7 +35,7 @@ "disk_size": "{{user `disk_size`}}", "guest_os_type": "centos-64", "headless": "{{ user `headless` }}", - "http_directory": "{{template_dir}}/http", + "http_directory": "{{user `http_directory`}}", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -62,7 +62,7 @@ "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", "guest_os_type": "centos", - "http_directory": "{{template_dir}}/http", + "http_directory": "{{user `http_directory`}}", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -91,7 +91,7 @@ ], "generation": "{{user `hyperv_generation`}}", "guest_additions_mode": "disable", - "http_directory": "{{template_dir}}/http", + "http_directory": "{{user `http_directory`}}", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -115,7 +115,7 @@ "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", - "http_directory": "{{template_dir}}/http", + "http_directory": "{{user `http_directory`}}", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -163,6 +163,7 @@ "variables": { "box_basename": "centos-8.0", "build_directory": "../../builds", + "http_directory": "{{template_dir}}/http", "build_timestamp": "{{isotime \"2019102650405\"}}", "cpus": "1", "disk_size": "65536", diff --git a/packer_templates/debian/debian-10.2-amd64.json b/packer_templates/debian/debian-10.2-amd64.json index 4f27cbcf9..187020cbe 100644 --- a/packer_templates/debian/debian-10.2-amd64.json +++ b/packer_templates/debian/debian-10.2-amd64.json @@ -26,7 +26,7 @@ "guest_os_type": "Debian_64", "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", - "http_directory": "{{template_dir}}/http", + "http_directory": "{{user `http_directory`}}", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -65,7 +65,7 @@ "disk_size": "{{user `disk_size`}}", "guest_os_type": "debian8-64", "headless": "{{ user `headless` }}", - "http_directory": "{{template_dir}}/http", + "http_directory": "{{user `http_directory`}}", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -108,7 +108,7 @@ "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", "guest_os_type": "debian", - "http_directory": "{{template_dir}}/http", + "http_directory": "{{user `http_directory`}}", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -149,7 +149,7 @@ "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", - "http_directory": "{{template_dir}}/http", + "http_directory": "{{user `http_directory`}}", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -199,6 +199,7 @@ "variables": { "box_basename": "debian-10.2", "build_directory": "../../builds", + "http_directory": "{{template_dir}}/http", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", "disk_size": "65536", diff --git a/packer_templates/debian/debian-10.2-i386.json b/packer_templates/debian/debian-10.2-i386.json index 5e2e20d6d..753208b03 100644 --- a/packer_templates/debian/debian-10.2-i386.json +++ b/packer_templates/debian/debian-10.2-i386.json @@ -26,7 +26,7 @@ "guest_os_type": "Debian", "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", - "http_directory": "{{template_dir}}/http", + "http_directory": "{{user `http_directory`}}", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -65,7 +65,7 @@ "disk_size": "{{user `disk_size`}}", "guest_os_type": "debian8", "headless": "{{ user `headless` }}", - "http_directory": "{{template_dir}}/http", + "http_directory": "{{user `http_directory`}}", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -108,7 +108,7 @@ "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", "guest_os_type": "debian", - "http_directory": "{{template_dir}}/http", + "http_directory": "{{user `http_directory`}}", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -149,7 +149,7 @@ "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", - "http_directory": "{{template_dir}}/http", + "http_directory": "{{user `http_directory`}}", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -199,6 +199,7 @@ "variables": { "box_basename": "debian-10.2-i386", "build_directory": "../../builds", + "http_directory": "{{template_dir}}/http", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", "disk_size": "65536", diff --git a/packer_templates/debian/debian-8.11-amd64.json b/packer_templates/debian/debian-8.11-amd64.json index 3044c5da1..9def4c6bc 100644 --- a/packer_templates/debian/debian-8.11-amd64.json +++ b/packer_templates/debian/debian-8.11-amd64.json @@ -26,7 +26,7 @@ "guest_os_type": "Debian_64", "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", - "http_directory": "{{template_dir}}/http", + "http_directory": "{{user `http_directory`}}", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -65,7 +65,7 @@ "disk_size": "{{user `disk_size`}}", "guest_os_type": "debian8-64", "headless": "{{ user `headless` }}", - "http_directory": "{{template_dir}}/http", + "http_directory": "{{user `http_directory`}}", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -108,7 +108,7 @@ "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", "guest_os_type": "debian", - "http_directory": "{{template_dir}}/http", + "http_directory": "{{user `http_directory`}}", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -149,7 +149,7 @@ "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", - "http_directory": "{{template_dir}}/http", + "http_directory": "{{user `http_directory`}}", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -199,6 +199,7 @@ "variables": { "box_basename": "debian-8.11", "build_directory": "../../builds", + "http_directory": "{{template_dir}}/http", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", "disk_size": "65536", diff --git a/packer_templates/debian/debian-8.11-i386.json b/packer_templates/debian/debian-8.11-i386.json index 3b06366ae..d2b1fc7ab 100644 --- a/packer_templates/debian/debian-8.11-i386.json +++ b/packer_templates/debian/debian-8.11-i386.json @@ -26,7 +26,7 @@ "guest_os_type": "Debian", "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", - "http_directory": "{{template_dir}}/http", + "http_directory": "{{user `http_directory`}}", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -65,7 +65,7 @@ "disk_size": "{{user `disk_size`}}", "guest_os_type": "debian8", "headless": "{{ user `headless` }}", - "http_directory": "{{template_dir}}/http", + "http_directory": "{{user `http_directory`}}", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -108,7 +108,7 @@ "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", "guest_os_type": "debian", - "http_directory": "{{template_dir}}/http", + "http_directory": "{{user `http_directory`}}", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -149,7 +149,7 @@ "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", - "http_directory": "{{template_dir}}/http", + "http_directory": "{{user `http_directory`}}", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -199,6 +199,7 @@ "variables": { "box_basename": "debian-8.11-i386", "build_directory": "../../builds", + "http_directory": "{{template_dir}}/http", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", "disk_size": "65536", diff --git a/packer_templates/debian/debian-9.11-amd64.json b/packer_templates/debian/debian-9.11-amd64.json index 7ec9f1f9e..7d5a14f4b 100644 --- a/packer_templates/debian/debian-9.11-amd64.json +++ b/packer_templates/debian/debian-9.11-amd64.json @@ -26,7 +26,7 @@ "guest_os_type": "Debian_64", "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", - "http_directory": "{{template_dir}}/http", + "http_directory": "{{user `http_directory`}}", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -65,7 +65,7 @@ "disk_size": "{{user `disk_size`}}", "guest_os_type": "debian8-64", "headless": "{{ user `headless` }}", - "http_directory": "{{template_dir}}/http", + "http_directory": "{{user `http_directory`}}", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -108,7 +108,7 @@ "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", "guest_os_type": "debian", - "http_directory": "{{template_dir}}/http", + "http_directory": "{{user `http_directory`}}", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -149,7 +149,7 @@ "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", - "http_directory": "{{template_dir}}/http", + "http_directory": "{{user `http_directory`}}", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -199,6 +199,7 @@ "variables": { "box_basename": "debian-9.11", "build_directory": "../../builds", + "http_directory": "{{template_dir}}/http", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", "disk_size": "65536", diff --git a/packer_templates/debian/debian-9.11-i386.json b/packer_templates/debian/debian-9.11-i386.json index f29e8cb9f..fd7dc716d 100644 --- a/packer_templates/debian/debian-9.11-i386.json +++ b/packer_templates/debian/debian-9.11-i386.json @@ -26,7 +26,7 @@ "guest_os_type": "Debian", "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", - "http_directory": "{{template_dir}}/http", + "http_directory": "{{user `http_directory`}}", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -65,7 +65,7 @@ "disk_size": "{{user `disk_size`}}", "guest_os_type": "debian8", "headless": "{{ user `headless` }}", - "http_directory": "{{template_dir}}/http", + "http_directory": "{{user `http_directory`}}", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -108,7 +108,7 @@ "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", "guest_os_type": "debian", - "http_directory": "{{template_dir}}/http", + "http_directory": "{{user `http_directory`}}", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -149,7 +149,7 @@ "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", - "http_directory": "{{template_dir}}/http", + "http_directory": "{{user `http_directory`}}", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -199,6 +199,7 @@ "variables": { "box_basename": "debian-9.11-i386", "build_directory": "../../builds", + "http_directory": "{{template_dir}}/http", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", "disk_size": "65536", diff --git a/packer_templates/debian/debian-9.11-ppc64el.json b/packer_templates/debian/debian-9.11-ppc64el.json index e19ed96df..688d7836f 100644 --- a/packer_templates/debian/debian-9.11-ppc64el.json +++ b/packer_templates/debian/debian-9.11-ppc64el.json @@ -29,7 +29,7 @@ "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", - "http_directory": "{{template_dir}}/http", + "http_directory": "{{user `http_directory`}}", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -83,6 +83,7 @@ "variables": { "box_basename": "debian-9.11", "build_directory": "../../builds", + "http_directory": "{{template_dir}}/http", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", "disk_size": "65536", diff --git a/packer_templates/fedora/fedora-30-x86_64.json b/packer_templates/fedora/fedora-30-x86_64.json index fe446597b..b33094c8b 100644 --- a/packer_templates/fedora/fedora-30-x86_64.json +++ b/packer_templates/fedora/fedora-30-x86_64.json @@ -19,7 +19,7 @@ "net_device": "virtio-net", "memory": "{{ user `memory` }}", "cpus": "{{ user `cpus` }}", - "http_directory": "{{template_dir}}/http", + "http_directory": "{{user `http_directory`}}", "headless": "{{ user `headless` }}", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", @@ -41,7 +41,7 @@ "guest_os_type": "Fedora_64", "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", - "http_directory": "{{template_dir}}/http", + "http_directory": "{{user `http_directory`}}", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -65,7 +65,7 @@ "disk_size": "{{user `disk_size`}}", "guest_os_type": "fedora-64", "headless": "{{ user `headless` }}", - "http_directory": "{{template_dir}}/http", + "http_directory": "{{user `http_directory`}}", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -93,7 +93,7 @@ "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", "guest_os_type": "fedora-core", - "http_directory": "{{template_dir}}/http", + "http_directory": "{{user `http_directory`}}", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -119,7 +119,7 @@ "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", - "http_directory": "{{template_dir}}/http", + "http_directory": "{{user `http_directory`}}", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -170,6 +170,7 @@ "arch": "64", "box_basename": "fedora-30", "build_directory": "../../builds", + "http_directory": "{{template_dir}}/http", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", "disk_size": "65536", diff --git a/packer_templates/fedora/fedora-31-x86_64.json b/packer_templates/fedora/fedora-31-x86_64.json index 84ad553ff..deca55ba7 100644 --- a/packer_templates/fedora/fedora-31-x86_64.json +++ b/packer_templates/fedora/fedora-31-x86_64.json @@ -19,7 +19,7 @@ "net_device": "virtio-net", "memory": "{{ user `memory` }}", "cpus": "{{ user `cpus` }}", - "http_directory": "{{template_dir}}/http", + "http_directory": "{{user `http_directory`}}", "headless": "{{ user `headless` }}", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", @@ -41,7 +41,7 @@ "guest_os_type": "Fedora_64", "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", - "http_directory": "{{template_dir}}/http", + "http_directory": "{{user `http_directory`}}", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -65,7 +65,7 @@ "disk_size": "{{user `disk_size`}}", "guest_os_type": "fedora-64", "headless": "{{ user `headless` }}", - "http_directory": "{{template_dir}}/http", + "http_directory": "{{user `http_directory`}}", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -93,7 +93,7 @@ "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", "guest_os_type": "fedora-core", - "http_directory": "{{template_dir}}/http", + "http_directory": "{{user `http_directory`}}", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -119,7 +119,7 @@ "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", - "http_directory": "{{template_dir}}/http", + "http_directory": "{{user `http_directory`}}", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -170,6 +170,7 @@ "arch": "64", "box_basename": "fedora-31", "build_directory": "../../builds", + "http_directory": "{{template_dir}}/http", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", "disk_size": "65536", diff --git a/packer_templates/freebsd/freebsd-11.3-amd64.json b/packer_templates/freebsd/freebsd-11.3-amd64.json index 22c4f0b91..b9047b437 100644 --- a/packer_templates/freebsd/freebsd-11.3-amd64.json +++ b/packer_templates/freebsd/freebsd-11.3-amd64.json @@ -19,7 +19,7 @@ "guest_additions_mode": "disable", "guest_os_type": "FreeBSD_64", "headless": "{{ user `headless` }}", - "http_directory": "{{template_dir}}/http", + "http_directory": "{{user `http_directory`}}", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -52,7 +52,7 @@ "disk_size": "{{user `disk_size`}}", "guest_os_type": "freebsd-64", "headless": "{{ user `headless` }}", - "http_directory": "{{template_dir}}/http", + "http_directory": "{{user `http_directory`}}", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -86,7 +86,7 @@ "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "guest_os_type": "freebsd", - "http_directory": "{{template_dir}}/http", + "http_directory": "{{user `http_directory`}}", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -140,7 +140,7 @@ "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", - "http_directory": "{{template_dir}}/http", + "http_directory": "{{user `http_directory`}}", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -187,6 +187,7 @@ "variables": { "box_basename": "freebsd-11.3", "build_directory": "../../builds", + "http_directory": "{{template_dir}}/http", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", "disk_size": "65536", diff --git a/packer_templates/freebsd/freebsd-11.3-i386.json b/packer_templates/freebsd/freebsd-11.3-i386.json index 8aaa77684..b7354baf7 100644 --- a/packer_templates/freebsd/freebsd-11.3-i386.json +++ b/packer_templates/freebsd/freebsd-11.3-i386.json @@ -19,7 +19,7 @@ "guest_additions_mode": "disable", "guest_os_type": "FreeBSD", "headless": "{{ user `headless` }}", - "http_directory": "{{template_dir}}/http", + "http_directory": "{{user `http_directory`}}", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -52,7 +52,7 @@ "disk_size": "{{user `disk_size`}}", "guest_os_type": "freebsd", "headless": "{{ user `headless` }}", - "http_directory": "{{template_dir}}/http", + "http_directory": "{{user `http_directory`}}", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -86,7 +86,7 @@ "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "guest_os_type": "freebsd", - "http_directory": "{{template_dir}}/http", + "http_directory": "{{user `http_directory`}}", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -140,7 +140,7 @@ "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", - "http_directory": "{{template_dir}}/http", + "http_directory": "{{user `http_directory`}}", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -187,6 +187,7 @@ "variables": { "box_basename": "freebsd-11.3-i386", "build_directory": "../../builds", + "http_directory": "{{template_dir}}/http", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", "disk_size": "40960", diff --git a/packer_templates/freebsd/freebsd-12.0-amd64.json b/packer_templates/freebsd/freebsd-12.0-amd64.json index d04ccd523..728199edf 100644 --- a/packer_templates/freebsd/freebsd-12.0-amd64.json +++ b/packer_templates/freebsd/freebsd-12.0-amd64.json @@ -19,7 +19,7 @@ "guest_additions_mode": "disable", "guest_os_type": "FreeBSD_64", "headless": "{{ user `headless` }}", - "http_directory": "{{template_dir}}/http", + "http_directory": "{{user `http_directory`}}", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -52,7 +52,7 @@ "disk_size": "{{user `disk_size`}}", "guest_os_type": "freebsd-64", "headless": "{{ user `headless` }}", - "http_directory": "{{template_dir}}/http", + "http_directory": "{{user `http_directory`}}", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -86,7 +86,7 @@ "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "guest_os_type": "freebsd", - "http_directory": "{{template_dir}}/http", + "http_directory": "{{user `http_directory`}}", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -140,7 +140,7 @@ "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", - "http_directory": "{{template_dir}}/http", + "http_directory": "{{user `http_directory`}}", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -187,6 +187,7 @@ "variables": { "box_basename": "freebsd-12.0", "build_directory": "../../builds", + "http_directory": "{{template_dir}}/http", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", "disk_size": "65536", diff --git a/packer_templates/freebsd/freebsd-12.0-i386.json b/packer_templates/freebsd/freebsd-12.0-i386.json index de0becd12..0d01b56c8 100644 --- a/packer_templates/freebsd/freebsd-12.0-i386.json +++ b/packer_templates/freebsd/freebsd-12.0-i386.json @@ -19,7 +19,7 @@ "guest_additions_mode": "disable", "guest_os_type": "FreeBSD", "headless": "{{ user `headless` }}", - "http_directory": "{{template_dir}}/http", + "http_directory": "{{user `http_directory`}}", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -52,7 +52,7 @@ "disk_size": "{{user `disk_size`}}", "guest_os_type": "freebsd", "headless": "{{ user `headless` }}", - "http_directory": "{{template_dir}}/http", + "http_directory": "{{user `http_directory`}}", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -86,7 +86,7 @@ "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "guest_os_type": "freebsd", - "http_directory": "{{template_dir}}/http", + "http_directory": "{{user `http_directory`}}", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -140,7 +140,7 @@ "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", - "http_directory": "{{template_dir}}/http", + "http_directory": "{{user `http_directory`}}", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -187,6 +187,7 @@ "variables": { "box_basename": "freebsd-12.0-i386", "build_directory": "../../builds", + "http_directory": "{{template_dir}}/http", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", "disk_size": "40960", diff --git a/packer_templates/freebsd/freebsd-12.1-amd64.json b/packer_templates/freebsd/freebsd-12.1-amd64.json index 52f291544..e8fb9c3d4 100644 --- a/packer_templates/freebsd/freebsd-12.1-amd64.json +++ b/packer_templates/freebsd/freebsd-12.1-amd64.json @@ -19,7 +19,7 @@ "guest_additions_mode": "disable", "guest_os_type": "FreeBSD_64", "headless": "{{ user `headless` }}", - "http_directory": "{{template_dir}}/http", + "http_directory": "{{user `http_directory`}}", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -52,7 +52,7 @@ "disk_size": "{{user `disk_size`}}", "guest_os_type": "freebsd-64", "headless": "{{ user `headless` }}", - "http_directory": "{{template_dir}}/http", + "http_directory": "{{user `http_directory`}}", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -86,7 +86,7 @@ "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "guest_os_type": "freebsd", - "http_directory": "{{template_dir}}/http", + "http_directory": "{{user `http_directory`}}", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -140,7 +140,7 @@ "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", - "http_directory": "{{template_dir}}/http", + "http_directory": "{{user `http_directory`}}", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -187,6 +187,7 @@ "variables": { "box_basename": "freebsd-12.1", "build_directory": "../../builds", + "http_directory": "{{template_dir}}/http", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", "disk_size": "65536", diff --git a/packer_templates/freebsd/freebsd-12.1-i386.json b/packer_templates/freebsd/freebsd-12.1-i386.json index 6ffd530f3..cce7ac57f 100644 --- a/packer_templates/freebsd/freebsd-12.1-i386.json +++ b/packer_templates/freebsd/freebsd-12.1-i386.json @@ -19,7 +19,7 @@ "guest_additions_mode": "disable", "guest_os_type": "FreeBSD", "headless": "{{ user `headless` }}", - "http_directory": "{{template_dir}}/http", + "http_directory": "{{user `http_directory`}}", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -52,7 +52,7 @@ "disk_size": "{{user `disk_size`}}", "guest_os_type": "freebsd", "headless": "{{ user `headless` }}", - "http_directory": "{{template_dir}}/http", + "http_directory": "{{user `http_directory`}}", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -86,7 +86,7 @@ "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "guest_os_type": "freebsd", - "http_directory": "{{template_dir}}/http", + "http_directory": "{{user `http_directory`}}", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -140,7 +140,7 @@ "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", - "http_directory": "{{template_dir}}/http", + "http_directory": "{{user `http_directory`}}", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -187,6 +187,7 @@ "variables": { "box_basename": "freebsd-12.1-i386", "build_directory": "../../builds", + "http_directory": "{{template_dir}}/http", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", "disk_size": "40960", diff --git a/packer_templates/hardenedbsd/hardenedbsd-11-amd64.json b/packer_templates/hardenedbsd/hardenedbsd-11-amd64.json index f248c39e5..7928e705b 100644 --- a/packer_templates/hardenedbsd/hardenedbsd-11-amd64.json +++ b/packer_templates/hardenedbsd/hardenedbsd-11-amd64.json @@ -19,7 +19,7 @@ "guest_additions_mode": "disable", "guest_os_type": "FreeBSD_64", "headless": "{{ user `headless` }}", - "http_directory": "{{template_dir}}/http", + "http_directory": "{{user `http_directory`}}", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -52,7 +52,7 @@ "disk_size": "{{user `disk_size`}}", "guest_os_type": "freebsd-64", "headless": "{{ user `headless` }}", - "http_directory": "{{template_dir}}/http", + "http_directory": "{{user `http_directory`}}", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -86,7 +86,7 @@ "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "guest_os_type": "freebsd", - "http_directory": "{{template_dir}}/http", + "http_directory": "{{user `http_directory`}}", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -140,7 +140,7 @@ "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", - "http_directory": "{{template_dir}}/http", + "http_directory": "{{user `http_directory`}}", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -185,6 +185,7 @@ "variables": { "box_basename": "hardenedbsd-11", "build_directory": "../../builds", + "http_directory": "{{template_dir}}/http", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", "disk_size": "65536", diff --git a/packer_templates/opensuse/opensuse-leap-15.1-x86_64.json b/packer_templates/opensuse/opensuse-leap-15.1-x86_64.json index 90fb924d3..9ef4ae7d2 100644 --- a/packer_templates/opensuse/opensuse-leap-15.1-x86_64.json +++ b/packer_templates/opensuse/opensuse-leap-15.1-x86_64.json @@ -20,7 +20,7 @@ "guest_os_type": "OpenSUSE_64", "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", - "http_directory": "{{template_dir}}/http", + "http_directory": "{{user `http_directory`}}", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -53,7 +53,7 @@ "disk_size": "{{user `disk_size`}}", "guest_os_type": "opensuse-64", "headless": "{{ user `headless` }}", - "http_directory": "{{template_dir}}/http", + "http_directory": "{{user `http_directory`}}", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -89,7 +89,7 @@ "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", "guest_os_type": "opensuse", - "http_directory": "{{template_dir}}/http", + "http_directory": "{{user `http_directory`}}", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -119,7 +119,7 @@ "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", - "http_directory": "{{template_dir}}/http", + "http_directory": "{{user `http_directory`}}", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -173,6 +173,7 @@ "autoinst_cfg": "15/autoinst.xml", "box_basename": "opensuse-leap-15.1", "build_directory": "../../builds", + "http_directory": "{{template_dir}}/http", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", "disk_size": "65536", diff --git a/packer_templates/oraclelinux/oracle-5.11-i386.json b/packer_templates/oraclelinux/oracle-5.11-i386.json index 3d4bfe6bf..8c72b81f6 100644 --- a/packer_templates/oraclelinux/oracle-5.11-i386.json +++ b/packer_templates/oraclelinux/oracle-5.11-i386.json @@ -11,7 +11,7 @@ "guest_os_type": "Oracle", "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", - "http_directory": "{{template_dir}}/../centos/http", + "http_directory": "{{user `http_directory`}}", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -35,7 +35,7 @@ "disk_size": "{{user `disk_size`}}", "guest_os_type": "oraclelinux", "headless": "{{ user `headless` }}", - "http_directory": "{{template_dir}}/../centos/http", + "http_directory": "{{user `http_directory`}}", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -62,7 +62,7 @@ "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", "guest_os_type": "centos", - "http_directory": "{{template_dir}}/../centos/http", + "http_directory": "{{user `http_directory`}}", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -91,7 +91,7 @@ ], "generation": "{{user `hyperv_generation`}}", "guest_additions_mode": "disable", - "http_directory": "{{template_dir}}/../centos/http", + "http_directory": "{{user `http_directory`}}", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -115,7 +115,7 @@ "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", - "http_directory": "{{template_dir}}/../centos/http", + "http_directory": "{{user `http_directory`}}", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -162,6 +162,7 @@ "variables": { "box_basename": "oracle-5.11-i386", "build_directory": "../../builds", + "http_directory": "{{template_dir}}/../centos/http", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", "disk_size": "65536", diff --git a/packer_templates/oraclelinux/oracle-5.11-x86_64.json b/packer_templates/oraclelinux/oracle-5.11-x86_64.json index c62c99daf..a9b7a62c0 100644 --- a/packer_templates/oraclelinux/oracle-5.11-x86_64.json +++ b/packer_templates/oraclelinux/oracle-5.11-x86_64.json @@ -11,7 +11,7 @@ "guest_os_type": "Oracle_64", "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", - "http_directory": "{{template_dir}}/../centos/http", + "http_directory": "{{user `http_directory`}}", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -43,7 +43,7 @@ "disk_size": "{{user `disk_size`}}", "guest_os_type": "oraclelinux-64", "headless": "{{ user `headless` }}", - "http_directory": "{{template_dir}}/../centos/http", + "http_directory": "{{user `http_directory`}}", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -70,7 +70,7 @@ "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", "guest_os_type": "centos", - "http_directory": "{{template_dir}}/../centos/http", + "http_directory": "{{user `http_directory`}}", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -99,7 +99,7 @@ ], "generation": "{{user `hyperv_generation`}}", "guest_additions_mode": "disable", - "http_directory": "{{template_dir}}/../centos/http", + "http_directory": "{{user `http_directory`}}", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -123,7 +123,7 @@ "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", - "http_directory": "{{template_dir}}/../centos/http", + "http_directory": "{{user `http_directory`}}", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -171,6 +171,7 @@ "arch": "64", "box_basename": "oracle-5.11", "build_directory": "../../builds", + "http_directory": "{{template_dir}}/../centos/http", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", "disk_size": "65536", diff --git a/packer_templates/oraclelinux/oracle-6.10-i386.json b/packer_templates/oraclelinux/oracle-6.10-i386.json index f9e9526b7..c83df2e75 100644 --- a/packer_templates/oraclelinux/oracle-6.10-i386.json +++ b/packer_templates/oraclelinux/oracle-6.10-i386.json @@ -11,7 +11,7 @@ "guest_os_type": "Oracle", "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", - "http_directory": "{{template_dir}}/../centos/http", + "http_directory": "{{user `http_directory`}}", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -35,7 +35,7 @@ "disk_size": "{{user `disk_size`}}", "guest_os_type": "oraclelinux", "headless": "{{ user `headless` }}", - "http_directory": "{{template_dir}}/../centos/http", + "http_directory": "{{user `http_directory`}}", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -62,7 +62,7 @@ "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", "guest_os_type": "centos", - "http_directory": "{{template_dir}}/../centos/http", + "http_directory": "{{user `http_directory`}}", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -91,7 +91,7 @@ ], "generation": "{{user `hyperv_generation`}}", "guest_additions_mode": "disable", - "http_directory": "{{template_dir}}/../centos/http", + "http_directory": "{{user `http_directory`}}", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -115,7 +115,7 @@ "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", - "http_directory": "{{template_dir}}/../centos/http", + "http_directory": "{{user `http_directory`}}", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -164,6 +164,7 @@ "arch": "32", "box_basename": "oracle-6.10-i386", "build_directory": "../../builds", + "http_directory": "{{template_dir}}/../centos/http", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", "disk_size": "65536", diff --git a/packer_templates/oraclelinux/oracle-6.10-x86_64.json b/packer_templates/oraclelinux/oracle-6.10-x86_64.json index 5ca75374c..8deb2a7f5 100644 --- a/packer_templates/oraclelinux/oracle-6.10-x86_64.json +++ b/packer_templates/oraclelinux/oracle-6.10-x86_64.json @@ -11,7 +11,7 @@ "guest_os_type": "Oracle_64", "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", - "http_directory": "{{template_dir}}/../centos/http", + "http_directory": "{{user `http_directory`}}", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -35,7 +35,7 @@ "disk_size": "{{user `disk_size`}}", "guest_os_type": "oraclelinux-64", "headless": "{{ user `headless` }}", - "http_directory": "{{template_dir}}/../centos/http", + "http_directory": "{{user `http_directory`}}", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -62,7 +62,7 @@ "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", "guest_os_type": "centos", - "http_directory": "{{template_dir}}/../centos/http", + "http_directory": "{{user `http_directory`}}", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -91,7 +91,7 @@ ], "generation": "{{user `hyperv_generation`}}", "guest_additions_mode": "disable", - "http_directory": "{{template_dir}}/../centos/http", + "http_directory": "{{user `http_directory`}}", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -115,7 +115,7 @@ "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", - "http_directory": "{{template_dir}}/../centos/http", + "http_directory": "{{user `http_directory`}}", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -164,6 +164,7 @@ "arch": "64", "box_basename": "oracle-6.10", "build_directory": "../../builds", + "http_directory": "{{template_dir}}/../centos/http", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", "disk_size": "65536", diff --git a/packer_templates/oraclelinux/oracle-7.7-x86_64.json b/packer_templates/oraclelinux/oracle-7.7-x86_64.json index 3f10e2185..36219d316 100644 --- a/packer_templates/oraclelinux/oracle-7.7-x86_64.json +++ b/packer_templates/oraclelinux/oracle-7.7-x86_64.json @@ -11,7 +11,7 @@ "guest_os_type": "Oracle_64", "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", - "http_directory": "{{template_dir}}/../centos/http", + "http_directory": "{{user `http_directory`}}", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -35,7 +35,7 @@ "disk_size": "{{user `disk_size`}}", "guest_os_type": "oraclelinux-64", "headless": "{{ user `headless` }}", - "http_directory": "{{template_dir}}/../centos/http", + "http_directory": "{{user `http_directory`}}", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -62,7 +62,7 @@ "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", "guest_os_type": "centos", - "http_directory": "{{template_dir}}/../centos/http", + "http_directory": "{{user `http_directory`}}", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -91,7 +91,7 @@ ], "generation": "{{user `hyperv_generation`}}", "guest_additions_mode": "disable", - "http_directory": "{{template_dir}}/../centos/http", + "http_directory": "{{user `http_directory`}}", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -115,7 +115,7 @@ "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", - "http_directory": "{{template_dir}}/../centos/http", + "http_directory": "{{user `http_directory`}}", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -164,6 +164,7 @@ "arch": "64", "box_basename": "oracle-7.7", "build_directory": "../../builds", + "http_directory": "{{template_dir}}/../centos/http", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", "disk_size": "65536", diff --git a/packer_templates/oraclelinux/oracle-8.1-x86_64.json b/packer_templates/oraclelinux/oracle-8.1-x86_64.json index a30042840..bb7d5e84a 100644 --- a/packer_templates/oraclelinux/oracle-8.1-x86_64.json +++ b/packer_templates/oraclelinux/oracle-8.1-x86_64.json @@ -11,7 +11,7 @@ "guest_os_type": "Oracle_64", "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", - "http_directory": "{{template_dir}}/../centos/http", + "http_directory": "{{user `http_directory`}}", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -35,7 +35,7 @@ "disk_size": "{{user `disk_size`}}", "guest_os_type": "oraclelinux-64", "headless": "{{ user `headless` }}", - "http_directory": "{{template_dir}}/../centos/http", + "http_directory": "{{user `http_directory`}}", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -62,7 +62,7 @@ "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", "guest_os_type": "centos", - "http_directory": "{{template_dir}}/../centos/http", + "http_directory": "{{user `http_directory`}}", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -91,7 +91,7 @@ ], "generation": "{{user `hyperv_generation`}}", "guest_additions_mode": "disable", - "http_directory": "{{template_dir}}/../centos/http", + "http_directory": "{{user `http_directory`}}", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -115,7 +115,7 @@ "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", - "http_directory": "{{template_dir}}/../centos/http", + "http_directory": "{{user `http_directory`}}", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -163,6 +163,7 @@ "variables": { "box_basename": "oracle-8.1", "build_directory": "../../builds", + "http_directory": "{{template_dir}}/../centos/http", "build_timestamp": "{{isotime \"2019102650405\"}}", "cpus": "1", "disk_size": "65536", diff --git a/packer_templates/rhel/rhel-5.11-i386.json b/packer_templates/rhel/rhel-5.11-i386.json index 25ace884c..5d914fc4e 100644 --- a/packer_templates/rhel/rhel-5.11-i386.json +++ b/packer_templates/rhel/rhel-5.11-i386.json @@ -11,7 +11,7 @@ "guest_os_type": "RedHat", "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", - "http_directory": "{{template_dir}}/../centos/http", + "http_directory": "{{user `http_directory`}}", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -35,7 +35,7 @@ "disk_size": "{{user `disk_size`}}", "guest_os_type": "redhat", "headless": "{{ user `headless` }}", - "http_directory": "{{template_dir}}/../centos/http", + "http_directory": "{{user `http_directory`}}", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -62,7 +62,7 @@ "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", "guest_os_type": "rhel", - "http_directory": "{{template_dir}}/../centos/http", + "http_directory": "{{user `http_directory`}}", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -88,7 +88,7 @@ "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", - "http_directory": "{{template_dir}}/../centos/http", + "http_directory": "{{user `http_directory`}}", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -135,6 +135,7 @@ "arch": "32", "box_basename": "rhel-5.11-i386", "build_directory": "../../builds", + "http_directory": "{{template_dir}}/../centos/http", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", "disk_size": "65536", diff --git a/packer_templates/rhel/rhel-5.11-x86_64.json b/packer_templates/rhel/rhel-5.11-x86_64.json index e2d18230b..2b07cec92 100644 --- a/packer_templates/rhel/rhel-5.11-x86_64.json +++ b/packer_templates/rhel/rhel-5.11-x86_64.json @@ -11,7 +11,7 @@ "guest_os_type": "RedHat_64", "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", - "http_directory": "{{template_dir}}/../centos/http", + "http_directory": "{{user `http_directory`}}", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -43,7 +43,7 @@ "disk_size": "{{user `disk_size`}}", "guest_os_type": "rhel5-64", "headless": "{{ user `headless` }}", - "http_directory": "{{template_dir}}/../centos/http", + "http_directory": "{{user `http_directory`}}", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -70,7 +70,7 @@ "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", "guest_os_type": "rhel", - "http_directory": "{{template_dir}}/../centos/http", + "http_directory": "{{user `http_directory`}}", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -96,7 +96,7 @@ "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", - "http_directory": "{{template_dir}}/../centos/http", + "http_directory": "{{user `http_directory`}}", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -143,6 +143,7 @@ "arch": "64", "box_basename": "rhel-5.11", "build_directory": "../../builds", + "http_directory": "{{template_dir}}/../centos/http", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", "disk_size": "65536", diff --git a/packer_templates/rhel/rhel-6.10-i386.json b/packer_templates/rhel/rhel-6.10-i386.json index 8aecb531a..9c15fd985 100644 --- a/packer_templates/rhel/rhel-6.10-i386.json +++ b/packer_templates/rhel/rhel-6.10-i386.json @@ -11,7 +11,7 @@ "guest_os_type": "RedHat", "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", - "http_directory": "{{template_dir}}/../centos/http", + "http_directory": "{{user `http_directory`}}", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -35,7 +35,7 @@ "disk_size": "{{user `disk_size`}}", "guest_os_type": "redhat", "headless": "{{ user `headless` }}", - "http_directory": "{{template_dir}}/../centos/http", + "http_directory": "{{user `http_directory`}}", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -62,7 +62,7 @@ "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", "guest_os_type": "rhel", - "http_directory": "{{template_dir}}/../centos/http", + "http_directory": "{{user `http_directory`}}", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -88,7 +88,7 @@ "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", - "http_directory": "{{template_dir}}/../centos/http", + "http_directory": "{{user `http_directory`}}", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -136,6 +136,7 @@ "arch": "32", "box_basename": "rhel-6.10-i386", "build_directory": "../../builds", + "http_directory": "{{template_dir}}/../centos/http", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", "disk_size": "65536", diff --git a/packer_templates/rhel/rhel-6.10-x86_64.json b/packer_templates/rhel/rhel-6.10-x86_64.json index 1514ac0aa..f2b3aaac4 100644 --- a/packer_templates/rhel/rhel-6.10-x86_64.json +++ b/packer_templates/rhel/rhel-6.10-x86_64.json @@ -11,7 +11,7 @@ "guest_os_type": "RedHat_64", "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", - "http_directory": "{{template_dir}}/../centos/http", + "http_directory": "{{user `http_directory`}}", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -35,7 +35,7 @@ "disk_size": "{{user `disk_size`}}", "guest_os_type": "rhel6-64", "headless": "{{ user `headless` }}", - "http_directory": "{{template_dir}}/../centos/http", + "http_directory": "{{user `http_directory`}}", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -62,7 +62,7 @@ "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", "guest_os_type": "rhel", - "http_directory": "{{template_dir}}/../centos/http", + "http_directory": "{{user `http_directory`}}", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -88,7 +88,7 @@ "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", - "http_directory": "{{template_dir}}/../centos/http", + "http_directory": "{{user `http_directory`}}", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -136,6 +136,7 @@ "arch": "64", "box_basename": "rhel-6.10", "build_directory": "../../builds", + "http_directory": "{{template_dir}}/../centos/http", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", "disk_size": "65536", diff --git a/packer_templates/rhel/rhel-7.6-x86_64.json b/packer_templates/rhel/rhel-7.6-x86_64.json index bc13c6d5e..8df31afb0 100644 --- a/packer_templates/rhel/rhel-7.6-x86_64.json +++ b/packer_templates/rhel/rhel-7.6-x86_64.json @@ -11,7 +11,7 @@ "guest_os_type": "RedHat_64", "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", - "http_directory": "{{template_dir}}/../centos/http", + "http_directory": "{{user `http_directory`}}", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -35,7 +35,7 @@ "disk_size": "{{user `disk_size`}}", "guest_os_type": "rhel7-64", "headless": "{{ user `headless` }}", - "http_directory": "{{template_dir}}/../centos/http", + "http_directory": "{{user `http_directory`}}", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -62,7 +62,7 @@ "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", "guest_os_type": "rhel", - "http_directory": "{{template_dir}}/../centos/http", + "http_directory": "{{user `http_directory`}}", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -88,7 +88,7 @@ "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", - "http_directory": "{{template_dir}}/../centos/http", + "http_directory": "{{user `http_directory`}}", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -136,6 +136,7 @@ "arch": "64", "box_basename": "rhel-7.6", "build_directory": "../../builds", + "http_directory": "{{template_dir}}/../centos/http", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", "disk_size": "65536", diff --git a/packer_templates/rhel/rhel-8.0-x86_64.json b/packer_templates/rhel/rhel-8.0-x86_64.json index 2ec53fe89..c3b5b1617 100644 --- a/packer_templates/rhel/rhel-8.0-x86_64.json +++ b/packer_templates/rhel/rhel-8.0-x86_64.json @@ -11,7 +11,7 @@ "guest_os_type": "RedHat_64", "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", - "http_directory": "{{template_dir}}/../centos/http", + "http_directory": "{{user `http_directory`}}", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -35,7 +35,7 @@ "disk_size": "{{user `disk_size`}}", "guest_os_type": "rhel8-64", "headless": "{{ user `headless` }}", - "http_directory": "{{template_dir}}/../centos/http", + "http_directory": "{{user `http_directory`}}", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -62,7 +62,7 @@ "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", "guest_os_type": "rhel", - "http_directory": "{{template_dir}}/../centos/http", + "http_directory": "{{user `http_directory`}}", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -88,7 +88,7 @@ "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", - "http_directory": "{{template_dir}}/../centos/http", + "http_directory": "{{user `http_directory`}}", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -136,6 +136,7 @@ "arch": "64", "box_basename": "rhel-8.0", "build_directory": "../../builds", + "http_directory": "{{template_dir}}/../centos/http", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", "disk_size": "65536", diff --git a/packer_templates/scientificlinux/scientific-7.7-x86_64.json b/packer_templates/scientificlinux/scientific-7.7-x86_64.json index cffa4c97a..5da27d280 100644 --- a/packer_templates/scientificlinux/scientific-7.7-x86_64.json +++ b/packer_templates/scientificlinux/scientific-7.7-x86_64.json @@ -11,7 +11,7 @@ "guest_os_type": "RedHat_64", "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", - "http_directory": "{{template_dir}}/http", + "http_directory": "{{user `http_directory`}}", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -35,7 +35,7 @@ "disk_size": "{{user `disk_size`}}", "guest_os_type": "centos-64", "headless": "{{ user `headless` }}", - "http_directory": "{{template_dir}}/http", + "http_directory": "{{user `http_directory`}}", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -62,7 +62,7 @@ "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", "guest_os_type": "centos", - "http_directory": "{{template_dir}}/http", + "http_directory": "{{user `http_directory`}}", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -91,7 +91,7 @@ ], "generation": "{{user `hyperv_generation`}}", "guest_additions_mode": "disable", - "http_directory": "{{template_dir}}/http", + "http_directory": "{{user `http_directory`}}", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -115,7 +115,7 @@ "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", - "http_directory": "{{template_dir}}/http", + "http_directory": "{{user `http_directory`}}", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -163,6 +163,7 @@ "variables": { "box_basename": "scientific-7.7", "build_directory": "../../builds", + "http_directory": "{{template_dir}}/http", "build_timestamp": "{{isotime \"20080506150405\"}}", "cpus": "1", "disk_size": "65536", diff --git a/packer_templates/sles/sles-11-sp4-x86_64.json b/packer_templates/sles/sles-11-sp4-x86_64.json index 75e4c98a3..9ef968b25 100644 --- a/packer_templates/sles/sles-11-sp4-x86_64.json +++ b/packer_templates/sles/sles-11-sp4-x86_64.json @@ -15,7 +15,7 @@ "guest_os_type": "OpenSUSE_64", "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", - "http_directory": "{{template_dir}}/http", + "http_directory": "{{user `http_directory`}}", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `iso_name`}}", @@ -43,7 +43,7 @@ "disk_size": "{{user `disk_size`}}", "guest_os_type": "sles11-64", "headless": "{{ user `headless` }}", - "http_directory": "{{template_dir}}/http", + "http_directory": "{{user `http_directory`}}", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `iso_name`}}", @@ -74,7 +74,7 @@ "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", "guest_os_type": "suse", - "http_directory": "{{template_dir}}/http", + "http_directory": "{{user `http_directory`}}", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `iso_name`}}", @@ -104,7 +104,7 @@ "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", - "http_directory": "{{template_dir}}/http", + "http_directory": "{{user `http_directory`}}", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `iso_name`}}", @@ -157,6 +157,7 @@ "autoinst_cfg": "sles-11-sp4-x86_64-autoinst.xml", "box_basename": "sles-11-sp4", "build_directory": "../../builds", + "http_directory": "{{template_dir}}/http", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", "disk_size": "65536", diff --git a/packer_templates/sles/sles-12-sp2-x86_64.json b/packer_templates/sles/sles-12-sp2-x86_64.json index d4b59b539..750d0cb84 100644 --- a/packer_templates/sles/sles-12-sp2-x86_64.json +++ b/packer_templates/sles/sles-12-sp2-x86_64.json @@ -15,7 +15,7 @@ "guest_os_type": "OpenSUSE_64", "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", - "http_directory": "{{template_dir}}/http", + "http_directory": "{{user `http_directory`}}", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `iso_name`}}", @@ -43,7 +43,7 @@ "disk_size": "{{user `disk_size`}}", "guest_os_type": "sles12-64", "headless": "{{ user `headless` }}", - "http_directory": "{{template_dir}}/http", + "http_directory": "{{user `http_directory`}}", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `iso_name`}}", @@ -74,7 +74,7 @@ "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", "guest_os_type": "suse", - "http_directory": "{{template_dir}}/http", + "http_directory": "{{user `http_directory`}}", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `iso_name`}}", @@ -104,7 +104,7 @@ "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", - "http_directory": "{{template_dir}}/http", + "http_directory": "{{user `http_directory`}}", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `iso_name`}}", @@ -158,6 +158,7 @@ "autoinst_cfg": "sles-12-sp2-x86_64-autoinst.xml", "box_basename": "sles-12-sp2", "build_directory": "../../builds", + "http_directory": "{{template_dir}}/http", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", "disk_size": "65536", diff --git a/packer_templates/sles/sles-12-sp3-x86_64.json b/packer_templates/sles/sles-12-sp3-x86_64.json index 22c2c24f8..f5ffb0f53 100644 --- a/packer_templates/sles/sles-12-sp3-x86_64.json +++ b/packer_templates/sles/sles-12-sp3-x86_64.json @@ -15,7 +15,7 @@ "guest_os_type": "OpenSUSE_64", "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", - "http_directory": "{{template_dir}}/http", + "http_directory": "{{user `http_directory`}}", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `iso_name`}}", @@ -43,7 +43,7 @@ "disk_size": "{{user `disk_size`}}", "guest_os_type": "sles12-64", "headless": "{{ user `headless` }}", - "http_directory": "{{template_dir}}/http", + "http_directory": "{{user `http_directory`}}", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `iso_name`}}", @@ -74,7 +74,7 @@ "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", "guest_os_type": "suse", - "http_directory": "{{template_dir}}/http", + "http_directory": "{{user `http_directory`}}", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `iso_name`}}", @@ -104,7 +104,7 @@ "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", - "http_directory": "{{template_dir}}/http", + "http_directory": "{{user `http_directory`}}", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `iso_name`}}", @@ -158,6 +158,7 @@ "autoinst_cfg": "sles-12-sp3-x86_64-autoinst.xml", "box_basename": "sles-12-sp3", "build_directory": "../../builds", + "http_directory": "{{template_dir}}/http", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", "disk_size": "65536", diff --git a/packer_templates/sles/sles-15-sp1.json b/packer_templates/sles/sles-15-sp1.json index 22ba01141..c61094a92 100644 --- a/packer_templates/sles/sles-15-sp1.json +++ b/packer_templates/sles/sles-15-sp1.json @@ -15,7 +15,7 @@ "guest_os_type": "OpenSUSE_64", "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", - "http_directory": "{{template_dir}}/http", + "http_directory": "{{user `http_directory`}}", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `iso_name`}}", @@ -59,7 +59,7 @@ "disk_size": "{{user `disk_size`}}", "guest_os_type": "sles12-64", "headless": "{{ user `headless` }}", - "http_directory": "{{template_dir}}/http", + "http_directory": "{{user `http_directory`}}", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `iso_name`}}", @@ -90,7 +90,7 @@ "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", "guest_os_type": "suse", - "http_directory": "{{template_dir}}/http", + "http_directory": "{{user `http_directory`}}", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `iso_name`}}", @@ -120,7 +120,7 @@ "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", - "http_directory": "{{template_dir}}/http", + "http_directory": "{{user `http_directory`}}", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `iso_name`}}", @@ -174,6 +174,7 @@ "autoinst_cfg": "sles-15-sp1-x86_64-autoinst.xml", "box_basename": "sles-15-sp1", "build_directory": "../../builds", + "http_directory": "{{template_dir}}/http", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", "disk_size": "65536", diff --git a/packer_templates/sles/sles-15.json b/packer_templates/sles/sles-15.json index 228ebb615..4dc77055b 100644 --- a/packer_templates/sles/sles-15.json +++ b/packer_templates/sles/sles-15.json @@ -15,7 +15,7 @@ "guest_os_type": "OpenSUSE_64", "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", - "http_directory": "{{template_dir}}/http", + "http_directory": "{{user `http_directory`}}", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `iso_name`}}", @@ -59,7 +59,7 @@ "disk_size": "{{user `disk_size`}}", "guest_os_type": "sles12-64", "headless": "{{ user `headless` }}", - "http_directory": "{{template_dir}}/http", + "http_directory": "{{user `http_directory`}}", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `iso_name`}}", @@ -90,7 +90,7 @@ "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", "guest_os_type": "suse", - "http_directory": "{{template_dir}}/http", + "http_directory": "{{user `http_directory`}}", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `iso_name`}}", @@ -120,7 +120,7 @@ "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", - "http_directory": "{{template_dir}}/http", + "http_directory": "{{user `http_directory`}}", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `iso_name`}}", @@ -174,6 +174,7 @@ "autoinst_cfg": "sles-15-x86_64-autoinst.xml", "box_basename": "sles-15", "build_directory": "../../builds", + "http_directory": "{{template_dir}}/http", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", "disk_size": "65536", diff --git a/packer_templates/solaris/solaris-11-x86.json b/packer_templates/solaris/solaris-11-x86.json index 0138765dc..d58f053ad 100644 --- a/packer_templates/solaris/solaris-11-x86.json +++ b/packer_templates/solaris/solaris-11-x86.json @@ -34,7 +34,7 @@ "guest_additions_url": "{{ user `guest_additions_url` }}", "guest_os_type": "Solaris11_64", "headless": "{{ user `headless` }}", - "http_directory": "{{template_dir}}/http", + "http_directory": "{{user `http_directory`}}", "iso_checksum": "30d9ae857f62938c21307722d031e0dc", "iso_checksum_type": "md5", "iso_url": "{{user `mirror`}}/sol-11_3-ai-x86.iso", @@ -83,7 +83,7 @@ "disk_size": "{{user `disk_size`}}", "guest_os_type": "solaris11-64", "headless": "{{ user `headless` }}", - "http_directory": "{{template_dir}}/http", + "http_directory": "{{user `http_directory`}}", "iso_checksum": "30d9ae857f62938c21307722d031e0dc", "iso_checksum_type": "md5", "iso_url": "{{user `mirror`}}/sol-11_3-ai-x86.iso", @@ -130,6 +130,7 @@ "arch": "64", "box_basename": "solaris-11.3", "build_directory": "../../builds", + "http_directory": "{{template_dir}}/http", "build_timestamp": "{{isotime \"20060102150405\"}}", "guest_additions_url": "", "cpus": "1", diff --git a/packer_templates/ubuntu/ubuntu-16.04-amd64.json b/packer_templates/ubuntu/ubuntu-16.04-amd64.json index 509689871..b8a1061c4 100644 --- a/packer_templates/ubuntu/ubuntu-16.04-amd64.json +++ b/packer_templates/ubuntu/ubuntu-16.04-amd64.json @@ -34,7 +34,7 @@ "guest_os_type": "Ubuntu_64", "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", - "http_directory": "{{template_dir}}/http", + "http_directory": "{{user `http_directory`}}", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -81,7 +81,7 @@ "disk_size": "{{user `disk_size`}}", "guest_os_type": "ubuntu-64", "headless": "{{ user `headless` }}", - "http_directory": "{{template_dir}}/http", + "http_directory": "{{user `http_directory`}}", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -132,7 +132,7 @@ "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", "guest_os_type": "ubuntu", - "http_directory": "{{template_dir}}/http", + "http_directory": "{{user `http_directory`}}", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -179,7 +179,7 @@ "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", - "http_directory": "{{template_dir}}/http", + "http_directory": "{{user `http_directory`}}", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -214,7 +214,7 @@ "disk_size": "{{user `disk_size`}}", "enable_secure_boot": false, "generation": "{{user `hyperv_generation`}}", - "http_directory": "{{template_dir}}/http", + "http_directory": "{{user `http_directory`}}", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -266,6 +266,7 @@ "variables": { "box_basename": "ubuntu-16.04", "build_directory": "../../builds", + "http_directory": "{{template_dir}}/http", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", "disk_size": "65536", diff --git a/packer_templates/ubuntu/ubuntu-16.04-i386.json b/packer_templates/ubuntu/ubuntu-16.04-i386.json index 532394edb..5a46aa2a0 100644 --- a/packer_templates/ubuntu/ubuntu-16.04-i386.json +++ b/packer_templates/ubuntu/ubuntu-16.04-i386.json @@ -34,7 +34,7 @@ "guest_os_type": "Ubuntu", "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", - "http_directory": "{{template_dir}}/http", + "http_directory": "{{user `http_directory`}}", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -81,7 +81,7 @@ "disk_size": "{{user `disk_size`}}", "guest_os_type": "ubuntu", "headless": "{{ user `headless` }}", - "http_directory": "{{template_dir}}/http", + "http_directory": "{{user `http_directory`}}", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -131,7 +131,7 @@ "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", "guest_os_type": "ubuntu", - "http_directory": "{{template_dir}}/http", + "http_directory": "{{user `http_directory`}}", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -178,7 +178,7 @@ "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", - "http_directory": "{{template_dir}}/http", + "http_directory": "{{user `http_directory`}}", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -213,7 +213,7 @@ "disk_size": "{{user `disk_size`}}", "enable_secure_boot": false, "generation": "{{user `hyperv_generation`}}", - "http_directory": "{{template_dir}}/http", + "http_directory": "{{user `http_directory`}}", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -265,6 +265,7 @@ "variables": { "box_basename": "ubuntu-16.04-i386", "build_directory": "../../builds", + "http_directory": "{{template_dir}}/http", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", "disk_size": "65536", diff --git a/packer_templates/ubuntu/ubuntu-18.04-amd64.json b/packer_templates/ubuntu/ubuntu-18.04-amd64.json index 4c6fffa57..46de7ce01 100644 --- a/packer_templates/ubuntu/ubuntu-18.04-amd64.json +++ b/packer_templates/ubuntu/ubuntu-18.04-amd64.json @@ -33,7 +33,7 @@ "guest_os_type": "Ubuntu_64", "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", - "http_directory": "{{template_dir}}/http", + "http_directory": "{{user `http_directory`}}", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -79,7 +79,7 @@ "disk_size": "{{user `disk_size`}}", "guest_os_type": "ubuntu-64", "headless": "{{ user `headless` }}", - "http_directory": "{{template_dir}}/http", + "http_directory": "{{user `http_directory`}}", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -129,7 +129,7 @@ "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", "guest_os_type": "ubuntu", - "http_directory": "{{template_dir}}/http", + "http_directory": "{{user `http_directory`}}", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -175,7 +175,7 @@ "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", - "http_directory": "{{template_dir}}/http", + "http_directory": "{{user `http_directory`}}", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -210,7 +210,7 @@ "disk_size": "{{user `disk_size`}}", "enable_secure_boot": false, "generation": "{{user `hyperv_generation`}}", - "http_directory": "{{template_dir}}/http", + "http_directory": "{{user `http_directory`}}", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -262,6 +262,7 @@ "variables": { "box_basename": "ubuntu-18.04", "build_directory": "../../builds", + "http_directory": "{{template_dir}}/http", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", "disk_size": "65536", diff --git a/packer_templates/ubuntu/ubuntu-19.04-amd64.json b/packer_templates/ubuntu/ubuntu-19.04-amd64.json index adfa11133..3ac0b86bd 100644 --- a/packer_templates/ubuntu/ubuntu-19.04-amd64.json +++ b/packer_templates/ubuntu/ubuntu-19.04-amd64.json @@ -33,7 +33,7 @@ "guest_os_type": "Ubuntu_64", "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", - "http_directory": "{{template_dir}}/http", + "http_directory": "{{user `http_directory`}}", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -79,7 +79,7 @@ "disk_size": "{{user `disk_size`}}", "guest_os_type": "ubuntu-64", "headless": "{{ user `headless` }}", - "http_directory": "{{template_dir}}/http", + "http_directory": "{{user `http_directory`}}", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -129,7 +129,7 @@ "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", "guest_os_type": "ubuntu", - "http_directory": "{{template_dir}}/http", + "http_directory": "{{user `http_directory`}}", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -175,7 +175,7 @@ "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", - "http_directory": "{{template_dir}}/http", + "http_directory": "{{user `http_directory`}}", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -210,7 +210,7 @@ "disk_size": "{{user `disk_size`}}", "enable_secure_boot": false, "generation": "{{user `hyperv_generation`}}", - "http_directory": "{{template_dir}}/http", + "http_directory": "{{user `http_directory`}}", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -262,6 +262,7 @@ "variables": { "box_basename": "ubuntu-19.04", "build_directory": "../../builds", + "http_directory": "{{template_dir}}/http", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", "disk_size": "65536", diff --git a/packer_templates/ubuntu/ubuntu-19.10-amd64.json b/packer_templates/ubuntu/ubuntu-19.10-amd64.json index bc0bf83e1..f779eac47 100644 --- a/packer_templates/ubuntu/ubuntu-19.10-amd64.json +++ b/packer_templates/ubuntu/ubuntu-19.10-amd64.json @@ -33,7 +33,7 @@ "guest_os_type": "Ubuntu_64", "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", - "http_directory": "{{template_dir}}/http", + "http_directory": "{{user `http_directory`}}", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -79,7 +79,7 @@ "disk_size": "{{user `disk_size`}}", "guest_os_type": "ubuntu-64", "headless": "{{ user `headless` }}", - "http_directory": "{{template_dir}}/http", + "http_directory": "{{user `http_directory`}}", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -129,7 +129,7 @@ "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", "guest_os_type": "ubuntu", - "http_directory": "{{template_dir}}/http", + "http_directory": "{{user `http_directory`}}", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -175,7 +175,7 @@ "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", - "http_directory": "{{template_dir}}/http", + "http_directory": "{{user `http_directory`}}", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -210,7 +210,7 @@ "disk_size": "{{user `disk_size`}}", "enable_secure_boot": false, "generation": "{{user `hyperv_generation`}}", - "http_directory": "{{template_dir}}/http", + "http_directory": "{{user `http_directory`}}", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -262,6 +262,7 @@ "variables": { "box_basename": "ubuntu-19.10", "build_directory": "../../builds", + "http_directory": "{{template_dir}}/http", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", "disk_size": "65536", From ab265961b010ba0ef8d7a7ac27b86e39b606e217 Mon Sep 17 00:00:00 2001 From: kartnico <kartnico@kartzone.info> Date: Fri, 3 Jan 2020 18:24:00 +0100 Subject: [PATCH 1121/1622] Updated centos/scientificlinux/oraclelinux templates to use the "http_directory" and "ks_path" to get kickstarts files for floppy_files sections. Signed-off-by: kartnico <kartnico@kartzone.info> --- packer_templates/centos/centos-5.11-i386.json | 2 +- packer_templates/centos/centos-5.11-x86_64.json | 2 +- packer_templates/centos/centos-6.10-i386.json | 2 +- packer_templates/centos/centos-6.10-x86_64.json | 2 +- packer_templates/centos/centos-7.7-x86_64.json | 2 +- packer_templates/centos/centos-8.0-x86_64.json | 2 +- packer_templates/oraclelinux/oracle-5.11-i386.json | 2 +- packer_templates/oraclelinux/oracle-5.11-x86_64.json | 2 +- packer_templates/oraclelinux/oracle-6.10-i386.json | 2 +- packer_templates/oraclelinux/oracle-6.10-x86_64.json | 2 +- packer_templates/oraclelinux/oracle-7.7-x86_64.json | 2 +- packer_templates/oraclelinux/oracle-8.1-x86_64.json | 2 +- packer_templates/scientificlinux/scientific-7.7-x86_64.json | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) diff --git a/packer_templates/centos/centos-5.11-i386.json b/packer_templates/centos/centos-5.11-i386.json index 19fb9aaf1..08ea40a7a 100644 --- a/packer_templates/centos/centos-5.11-i386.json +++ b/packer_templates/centos/centos-5.11-i386.json @@ -87,7 +87,7 @@ "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "floppy_files": [ - "{{template_dir}}/http/{{user `ks_path`}}" + "{{user `http_directory`}}/{{user `ks_path`}}" ], "generation": "{{user `hyperv_generation`}}", "guest_additions_mode": "disable", diff --git a/packer_templates/centos/centos-5.11-x86_64.json b/packer_templates/centos/centos-5.11-x86_64.json index 62fe47891..e4239cd2a 100644 --- a/packer_templates/centos/centos-5.11-x86_64.json +++ b/packer_templates/centos/centos-5.11-x86_64.json @@ -87,7 +87,7 @@ "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "floppy_files": [ - "{{template_dir}}/http/{{user `ks_path`}}" + "{{user `http_directory`}}/{{user `ks_path`}}" ], "generation": "{{user `hyperv_generation`}}", "guest_additions_mode": "disable", diff --git a/packer_templates/centos/centos-6.10-i386.json b/packer_templates/centos/centos-6.10-i386.json index f88255820..800d6fbd5 100644 --- a/packer_templates/centos/centos-6.10-i386.json +++ b/packer_templates/centos/centos-6.10-i386.json @@ -87,7 +87,7 @@ "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "floppy_files": [ - "{{template_dir}}/http/{{user `ks_path`}}" + "{{user `http_directory`}}/{{user `ks_path`}}" ], "generation": "{{user `hyperv_generation`}}", "guest_additions_mode": "disable", diff --git a/packer_templates/centos/centos-6.10-x86_64.json b/packer_templates/centos/centos-6.10-x86_64.json index c16ff199f..dff9b0c31 100644 --- a/packer_templates/centos/centos-6.10-x86_64.json +++ b/packer_templates/centos/centos-6.10-x86_64.json @@ -87,7 +87,7 @@ "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "floppy_files": [ - "{{template_dir}}/http/{{user `ks_path`}}" + "{{user `http_directory`}}/{{user `ks_path`}}" ], "generation": "{{user `hyperv_generation`}}", "guest_additions_mode": "disable", diff --git a/packer_templates/centos/centos-7.7-x86_64.json b/packer_templates/centos/centos-7.7-x86_64.json index 1682ec45c..095a25d06 100644 --- a/packer_templates/centos/centos-7.7-x86_64.json +++ b/packer_templates/centos/centos-7.7-x86_64.json @@ -87,7 +87,7 @@ "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "floppy_files": [ - "{{template_dir}}/http/{{user `ks_path`}}" + "{{user `http_directory`}}/{{user `ks_path`}}" ], "generation": "{{user `hyperv_generation`}}", "guest_additions_mode": "disable", diff --git a/packer_templates/centos/centos-8.0-x86_64.json b/packer_templates/centos/centos-8.0-x86_64.json index 4d0da28c6..1944fd2d9 100644 --- a/packer_templates/centos/centos-8.0-x86_64.json +++ b/packer_templates/centos/centos-8.0-x86_64.json @@ -87,7 +87,7 @@ "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "floppy_files": [ - "{{template_dir}}/http/{{user `ks_path`}}" + "{{user `http_directory`}}/{{user `ks_path`}}" ], "generation": "{{user `hyperv_generation`}}", "guest_additions_mode": "disable", diff --git a/packer_templates/oraclelinux/oracle-5.11-i386.json b/packer_templates/oraclelinux/oracle-5.11-i386.json index 8c72b81f6..c9722a1bf 100644 --- a/packer_templates/oraclelinux/oracle-5.11-i386.json +++ b/packer_templates/oraclelinux/oracle-5.11-i386.json @@ -87,7 +87,7 @@ "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "floppy_files": [ - "{{template_dir}}/http/{{user `ks_path`}}" + "{{user `http_directory`}}/{{user `ks_path`}}" ], "generation": "{{user `hyperv_generation`}}", "guest_additions_mode": "disable", diff --git a/packer_templates/oraclelinux/oracle-5.11-x86_64.json b/packer_templates/oraclelinux/oracle-5.11-x86_64.json index a9b7a62c0..ca12eb388 100644 --- a/packer_templates/oraclelinux/oracle-5.11-x86_64.json +++ b/packer_templates/oraclelinux/oracle-5.11-x86_64.json @@ -95,7 +95,7 @@ "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "floppy_files": [ - "{{template_dir}}/http/{{user `ks_path`}}" + "{{user `http_directory`}}/{{user `ks_path`}}" ], "generation": "{{user `hyperv_generation`}}", "guest_additions_mode": "disable", diff --git a/packer_templates/oraclelinux/oracle-6.10-i386.json b/packer_templates/oraclelinux/oracle-6.10-i386.json index c83df2e75..1fa7ce864 100644 --- a/packer_templates/oraclelinux/oracle-6.10-i386.json +++ b/packer_templates/oraclelinux/oracle-6.10-i386.json @@ -87,7 +87,7 @@ "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "floppy_files": [ - "{{template_dir}}/http/{{user `ks_path`}}" + "{{user `http_directory`}}/{{user `ks_path`}}" ], "generation": "{{user `hyperv_generation`}}", "guest_additions_mode": "disable", diff --git a/packer_templates/oraclelinux/oracle-6.10-x86_64.json b/packer_templates/oraclelinux/oracle-6.10-x86_64.json index 8deb2a7f5..83ec220cc 100644 --- a/packer_templates/oraclelinux/oracle-6.10-x86_64.json +++ b/packer_templates/oraclelinux/oracle-6.10-x86_64.json @@ -87,7 +87,7 @@ "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "floppy_files": [ - "{{template_dir}}/http/{{user `ks_path`}}" + "{{user `http_directory`}}/{{user `ks_path`}}" ], "generation": "{{user `hyperv_generation`}}", "guest_additions_mode": "disable", diff --git a/packer_templates/oraclelinux/oracle-7.7-x86_64.json b/packer_templates/oraclelinux/oracle-7.7-x86_64.json index 36219d316..79024471d 100644 --- a/packer_templates/oraclelinux/oracle-7.7-x86_64.json +++ b/packer_templates/oraclelinux/oracle-7.7-x86_64.json @@ -87,7 +87,7 @@ "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "floppy_files": [ - "{{template_dir}}/http/7/ks.cfg" + "{{user `http_directory`}}/{{user `ks_path`}}" ], "generation": "{{user `hyperv_generation`}}", "guest_additions_mode": "disable", diff --git a/packer_templates/oraclelinux/oracle-8.1-x86_64.json b/packer_templates/oraclelinux/oracle-8.1-x86_64.json index bb7d5e84a..c35c8878c 100644 --- a/packer_templates/oraclelinux/oracle-8.1-x86_64.json +++ b/packer_templates/oraclelinux/oracle-8.1-x86_64.json @@ -87,7 +87,7 @@ "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "floppy_files": [ - "{{template_dir}}/http/8/ks.cfg" + "{{user `http_directory`}}/{{user `ks_path`}}" ], "generation": "{{user `hyperv_generation`}}", "guest_additions_mode": "disable", diff --git a/packer_templates/scientificlinux/scientific-7.7-x86_64.json b/packer_templates/scientificlinux/scientific-7.7-x86_64.json index 5da27d280..079ff8470 100644 --- a/packer_templates/scientificlinux/scientific-7.7-x86_64.json +++ b/packer_templates/scientificlinux/scientific-7.7-x86_64.json @@ -87,7 +87,7 @@ "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "floppy_files": [ - "{{template_dir}}/http/7/ks.cfg" + "{{user `http_directory`}}/{{user `ks_path`}}" ], "generation": "{{user `hyperv_generation`}}", "guest_additions_mode": "disable", From 63d68642981f7c20d0059ae5641154462c8ac878 Mon Sep 17 00:00:00 2001 From: kartnico <kartnico@kartzone.info> Date: Fri, 3 Jan 2020 18:26:38 +0100 Subject: [PATCH 1122/1622] Updated windows templates to use the "floppy_dir" and "unattended_file_path "to get unattended files for floppy_files sections. Signed-off-by: kartnico <kartnico@kartzone.info> --- packer_templates/windows/windows-10.json | 6 ++++-- packer_templates/windows/windows-2008r2.json | 6 ++++-- packer_templates/windows/windows-2012r2.json | 6 ++++-- packer_templates/windows/windows-2016.json | 6 ++++-- packer_templates/windows/windows-2019.json | 6 ++++-- packer_templates/windows/windows-7.json | 4 +++- 6 files changed, 23 insertions(+), 11 deletions(-) diff --git a/packer_templates/windows/windows-10.json b/packer_templates/windows/windows-10.json index 93adc702d..401f7438e 100644 --- a/packer_templates/windows/windows-10.json +++ b/packer_templates/windows/windows-10.json @@ -25,7 +25,7 @@ "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"", "shutdown_timeout": "15m", "floppy_files": [ - "{{template_dir}}/answer_files/10/Autounattend.xml", + "{{ user `floppy_dir` }}/{{ user `unattended_file` }}", "{{template_dir}}/scripts/base_setup.ps1" ] }, @@ -47,7 +47,7 @@ "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"", "shutdown_timeout": "15m", "floppy_files": [ - "{{template_dir}}/answer_files/10/Autounattend.xml" + "{{ user `floppy_dir` }}/{{ user `unattended_file` }}" ] } ], @@ -116,6 +116,8 @@ "iso_checksum": "489ebee676e26cdb81377b0e6385c001a22589b8", "iso_url": "https://software-download.microsoft.com/download/pr/18363.418.191007-0143.19h2_release_svc_refresh_CLIENTENTERPRISEEVAL_OEMRET_x64FRE_en-us.iso", "build_directory": "../../builds", + "floppy_dir": "{{template_dir}}/answer_files", + "unattended_file": "10/Autounattend.xml", "template": "windows-10" } } diff --git a/packer_templates/windows/windows-2008r2.json b/packer_templates/windows/windows-2008r2.json index 477aac7e8..9c1444259 100644 --- a/packer_templates/windows/windows-2008r2.json +++ b/packer_templates/windows/windows-2008r2.json @@ -25,7 +25,7 @@ "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"", "shutdown_timeout": "15m", "floppy_files": [ - "{{template_dir}}/answer_files/2008_r2/Autounattend.xml" + "{{ user `floppy_dir` }}/{{ user `unattended_file` }} ] }, { @@ -46,7 +46,7 @@ "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"", "shutdown_timeout": "15m", "floppy_files": [ - "{{template_dir}}/answer_files/2008_r2/Autounattend.xml" + "{{ user `floppy_dir` }}/{{ user `unattended_file` }} ] } ], @@ -109,6 +109,8 @@ "iso_checksum": "beed231a34e90e1dd9a04b3afabec31d62ce3889", "iso_url": "http://download.microsoft.com/download/7/5/E/75EC4E54-5B02-42D6-8879-D8D3A25FBEF7/7601.17514.101119-1850_x64fre_server_eval_en-us-GRMSXEVAL_EN_DVD.iso", "build_directory": "../../builds", + "floppy_dir": "{{template_dir}}/answer_files", + "unattended_file": "2008_r2/Autounattend.xml", "template": "windows-2008r2-standard" } } diff --git a/packer_templates/windows/windows-2012r2.json b/packer_templates/windows/windows-2012r2.json index 28dfa010e..c515259c1 100644 --- a/packer_templates/windows/windows-2012r2.json +++ b/packer_templates/windows/windows-2012r2.json @@ -25,7 +25,7 @@ "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"", "shutdown_timeout": "15m", "floppy_files": [ - "{{template_dir}}/answer_files/2012_r2/Autounattend.xml" + "{{ user `floppy_dir` }}/{{ user `unattended_file` }}" ] }, { @@ -46,7 +46,7 @@ "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"", "shutdown_timeout": "15m", "floppy_files": [ - "{{template_dir}}/answer_files/2012_r2/Autounattend.xml" + "{{ user `floppy_dir` }}/{{ user `unattended_file` }}" ] } ], @@ -114,6 +114,8 @@ "iso_checksum": "849734f37346385dac2c101e4aacba4626bb141c", "iso_url": "http://download.microsoft.com/download/6/2/A/62A76ABB-9990-4EFC-A4FE-C7D698DAEB96/9600.17050.WINBLUE_REFRESH.140317-1640_X64FRE_SERVER_EVAL_EN-US-IR3_SSS_X64FREE_EN-US_DV9.ISO", "build_directory": "../../builds", + "floppy_dir": "{{template_dir}}/answer_files", + "unattended_file": "2012_r2/Autounattend.xml", "template": "windows-2012r2-standard" } } diff --git a/packer_templates/windows/windows-2016.json b/packer_templates/windows/windows-2016.json index 7968f14d2..64f764e59 100644 --- a/packer_templates/windows/windows-2016.json +++ b/packer_templates/windows/windows-2016.json @@ -25,7 +25,7 @@ "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"", "shutdown_timeout": "15m", "floppy_files": [ - "{{template_dir}}/answer_files/2016/Autounattend.xml" + "{{ user `floppy_dir` }}/{{ user `unattended_file` }}" ] }, { @@ -46,7 +46,7 @@ "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"", "shutdown_timeout": "15m", "floppy_files": [ - "{{template_dir}}/answer_files/2016/Autounattend.xml" + "{{ user `floppy_dir` }}/{{ user `unattended_file` }}" ] } ], @@ -114,6 +114,8 @@ "iso_checksum": "772700802951b36c8cb26a61c040b9a8dc3816a3", "iso_url": "https://software-download.microsoft.com/download/pr/Windows_Server_2016_Datacenter_EVAL_en-us_14393_refresh.ISO", "build_directory": "../../builds", + "floppy_dir": "{{template_dir}}/answer_files", + "unattended_file": "2016/Autounattend.xml", "template": "windows-2016-standard" } } diff --git a/packer_templates/windows/windows-2019.json b/packer_templates/windows/windows-2019.json index e9a48a9e0..13aaca8ca 100644 --- a/packer_templates/windows/windows-2019.json +++ b/packer_templates/windows/windows-2019.json @@ -25,7 +25,7 @@ "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"", "shutdown_timeout": "15m", "floppy_files": [ - "{{template_dir}}/answer_files/2019/Autounattend.xml" + "{{ user `floppy_dir` }}/{{ user `unattended_file` }}" ] }, { @@ -46,7 +46,7 @@ "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"", "shutdown_timeout": "15m", "floppy_files": [ - "{{template_dir}}/answer_files/2019/Autounattend.xml" + "{{ user `floppy_dir` }}/{{ user `unattended_file` }}" ] } ], @@ -114,6 +114,8 @@ "iso_checksum": "3022424f777b66a698047ba1c37812026b9714c5", "iso_url": "https://software-download.microsoft.com/download/pr/17763.737.190906-2324.rs5_release_svc_refresh_SERVER_EVAL_x64FRE_en-us_1.iso", "build_directory": "../../builds", + "floppy_dir": "{{template_dir}}/answer_files", + "unattended_file": "2019/Autounattend.xml", "template": "windows-2019-standard" } } diff --git a/packer_templates/windows/windows-7.json b/packer_templates/windows/windows-7.json index c38f8b06f..f94f8ac0f 100644 --- a/packer_templates/windows/windows-7.json +++ b/packer_templates/windows/windows-7.json @@ -25,7 +25,7 @@ "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"", "shutdown_timeout": "15m", "floppy_files": [ - "{{template_dir}}/answer_files/7/Autounattend.xml" + "{{ user `floppy_dir` }}/{{ user `unattended_file` }} ] }], "provisioners": [{ @@ -92,6 +92,8 @@ "iso_checksum": "971fc00183a52c152fe924a6b99fdec011a871c2", "iso_url": "http://care.dlservice.microsoft.com/dl/download/evalx/win7/x86/EN/7600.16385.090713-1255_x86fre_enterprise_en-us_EVAL_Eval_Enterprise-GRMCENEVAL_EN_DVD.iso", "build_directory": "../../builds", + "floppy_dir": "{{template_dir}}/answer_files", + "unattended_file": "7/Autounattend.xml", "template": "windows-7" } } From 817fbe52f8d9141668eea901afb5080c868db8c8 Mon Sep 17 00:00:00 2001 From: kartnico <kartnico@kartzone.info> Date: Fri, 3 Jan 2020 18:28:31 +0100 Subject: [PATCH 1123/1622] Rename variable "unattended_file" to "unattended_file_path". Signed-off-by: kartnico <kartnico@kartzone.info> --- packer_templates/windows/windows-10.json | 6 +++--- packer_templates/windows/windows-2008r2.json | 6 +++--- packer_templates/windows/windows-2012r2.json | 6 +++--- packer_templates/windows/windows-2016.json | 6 +++--- packer_templates/windows/windows-2019.json | 6 +++--- packer_templates/windows/windows-7.json | 4 ++-- 6 files changed, 17 insertions(+), 17 deletions(-) diff --git a/packer_templates/windows/windows-10.json b/packer_templates/windows/windows-10.json index 401f7438e..324207aed 100644 --- a/packer_templates/windows/windows-10.json +++ b/packer_templates/windows/windows-10.json @@ -25,7 +25,7 @@ "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"", "shutdown_timeout": "15m", "floppy_files": [ - "{{ user `floppy_dir` }}/{{ user `unattended_file` }}", + "{{ user `floppy_dir` }}/{{ user `unattended_file_path` }}", "{{template_dir}}/scripts/base_setup.ps1" ] }, @@ -47,7 +47,7 @@ "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"", "shutdown_timeout": "15m", "floppy_files": [ - "{{ user `floppy_dir` }}/{{ user `unattended_file` }}" + "{{ user `floppy_dir` }}/{{ user `unattended_file_path` }}" ] } ], @@ -117,7 +117,7 @@ "iso_url": "https://software-download.microsoft.com/download/pr/18363.418.191007-0143.19h2_release_svc_refresh_CLIENTENTERPRISEEVAL_OEMRET_x64FRE_en-us.iso", "build_directory": "../../builds", "floppy_dir": "{{template_dir}}/answer_files", - "unattended_file": "10/Autounattend.xml", + "unattended_file_path": "10/Autounattend.xml", "template": "windows-10" } } diff --git a/packer_templates/windows/windows-2008r2.json b/packer_templates/windows/windows-2008r2.json index 9c1444259..4c54fdd12 100644 --- a/packer_templates/windows/windows-2008r2.json +++ b/packer_templates/windows/windows-2008r2.json @@ -25,7 +25,7 @@ "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"", "shutdown_timeout": "15m", "floppy_files": [ - "{{ user `floppy_dir` }}/{{ user `unattended_file` }} + "{{ user `floppy_dir` }}/{{ user `unattended_file_path` }} ] }, { @@ -46,7 +46,7 @@ "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"", "shutdown_timeout": "15m", "floppy_files": [ - "{{ user `floppy_dir` }}/{{ user `unattended_file` }} + "{{ user `floppy_dir` }}/{{ user `unattended_file_path` }} ] } ], @@ -110,7 +110,7 @@ "iso_url": "http://download.microsoft.com/download/7/5/E/75EC4E54-5B02-42D6-8879-D8D3A25FBEF7/7601.17514.101119-1850_x64fre_server_eval_en-us-GRMSXEVAL_EN_DVD.iso", "build_directory": "../../builds", "floppy_dir": "{{template_dir}}/answer_files", - "unattended_file": "2008_r2/Autounattend.xml", + "unattended_file_path": "2008_r2/Autounattend.xml", "template": "windows-2008r2-standard" } } diff --git a/packer_templates/windows/windows-2012r2.json b/packer_templates/windows/windows-2012r2.json index c515259c1..3782f527e 100644 --- a/packer_templates/windows/windows-2012r2.json +++ b/packer_templates/windows/windows-2012r2.json @@ -25,7 +25,7 @@ "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"", "shutdown_timeout": "15m", "floppy_files": [ - "{{ user `floppy_dir` }}/{{ user `unattended_file` }}" + "{{ user `floppy_dir` }}/{{ user `unattended_file_path` }}" ] }, { @@ -46,7 +46,7 @@ "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"", "shutdown_timeout": "15m", "floppy_files": [ - "{{ user `floppy_dir` }}/{{ user `unattended_file` }}" + "{{ user `floppy_dir` }}/{{ user `unattended_file_path` }}" ] } ], @@ -115,7 +115,7 @@ "iso_url": "http://download.microsoft.com/download/6/2/A/62A76ABB-9990-4EFC-A4FE-C7D698DAEB96/9600.17050.WINBLUE_REFRESH.140317-1640_X64FRE_SERVER_EVAL_EN-US-IR3_SSS_X64FREE_EN-US_DV9.ISO", "build_directory": "../../builds", "floppy_dir": "{{template_dir}}/answer_files", - "unattended_file": "2012_r2/Autounattend.xml", + "unattended_file_path": "2012_r2/Autounattend.xml", "template": "windows-2012r2-standard" } } diff --git a/packer_templates/windows/windows-2016.json b/packer_templates/windows/windows-2016.json index 64f764e59..6999e15fc 100644 --- a/packer_templates/windows/windows-2016.json +++ b/packer_templates/windows/windows-2016.json @@ -25,7 +25,7 @@ "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"", "shutdown_timeout": "15m", "floppy_files": [ - "{{ user `floppy_dir` }}/{{ user `unattended_file` }}" + "{{ user `floppy_dir` }}/{{ user `unattended_file_path` }}" ] }, { @@ -46,7 +46,7 @@ "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"", "shutdown_timeout": "15m", "floppy_files": [ - "{{ user `floppy_dir` }}/{{ user `unattended_file` }}" + "{{ user `floppy_dir` }}/{{ user `unattended_file_path` }}" ] } ], @@ -115,7 +115,7 @@ "iso_url": "https://software-download.microsoft.com/download/pr/Windows_Server_2016_Datacenter_EVAL_en-us_14393_refresh.ISO", "build_directory": "../../builds", "floppy_dir": "{{template_dir}}/answer_files", - "unattended_file": "2016/Autounattend.xml", + "unattended_file_path": "2016/Autounattend.xml", "template": "windows-2016-standard" } } diff --git a/packer_templates/windows/windows-2019.json b/packer_templates/windows/windows-2019.json index 13aaca8ca..9ddab6ecb 100644 --- a/packer_templates/windows/windows-2019.json +++ b/packer_templates/windows/windows-2019.json @@ -25,7 +25,7 @@ "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"", "shutdown_timeout": "15m", "floppy_files": [ - "{{ user `floppy_dir` }}/{{ user `unattended_file` }}" + "{{ user `floppy_dir` }}/{{ user `unattended_file_path` }}" ] }, { @@ -46,7 +46,7 @@ "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"", "shutdown_timeout": "15m", "floppy_files": [ - "{{ user `floppy_dir` }}/{{ user `unattended_file` }}" + "{{ user `floppy_dir` }}/{{ user `unattended_file_path` }}" ] } ], @@ -115,7 +115,7 @@ "iso_url": "https://software-download.microsoft.com/download/pr/17763.737.190906-2324.rs5_release_svc_refresh_SERVER_EVAL_x64FRE_en-us_1.iso", "build_directory": "../../builds", "floppy_dir": "{{template_dir}}/answer_files", - "unattended_file": "2019/Autounattend.xml", + "unattended_file_path": "2019/Autounattend.xml", "template": "windows-2019-standard" } } diff --git a/packer_templates/windows/windows-7.json b/packer_templates/windows/windows-7.json index f94f8ac0f..44223f702 100644 --- a/packer_templates/windows/windows-7.json +++ b/packer_templates/windows/windows-7.json @@ -25,7 +25,7 @@ "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"", "shutdown_timeout": "15m", "floppy_files": [ - "{{ user `floppy_dir` }}/{{ user `unattended_file` }} + "{{ user `floppy_dir` }}/{{ user `unattended_file_path` }} ] }], "provisioners": [{ @@ -93,7 +93,7 @@ "iso_url": "http://care.dlservice.microsoft.com/dl/download/evalx/win7/x86/EN/7600.16385.090713-1255_x86fre_enterprise_en-us_EVAL_Eval_Enterprise-GRMCENEVAL_EN_DVD.iso", "build_directory": "../../builds", "floppy_dir": "{{template_dir}}/answer_files", - "unattended_file": "7/Autounattend.xml", + "unattended_file_path": "7/Autounattend.xml", "template": "windows-7" } } From 0bc579dcc357375e0869ac01e616d844647f14d6 Mon Sep 17 00:00:00 2001 From: kartnico <kartnico@kartzone.info> Date: Fri, 3 Jan 2020 18:42:56 +0100 Subject: [PATCH 1124/1622] Correct syntax error. Signed-off-by: kartnico <kartnico@kartzone.info> --- packer_templates/windows/windows-2008r2.json | 4 ++-- packer_templates/windows/windows-7.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packer_templates/windows/windows-2008r2.json b/packer_templates/windows/windows-2008r2.json index 4c54fdd12..5aef15543 100644 --- a/packer_templates/windows/windows-2008r2.json +++ b/packer_templates/windows/windows-2008r2.json @@ -25,7 +25,7 @@ "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"", "shutdown_timeout": "15m", "floppy_files": [ - "{{ user `floppy_dir` }}/{{ user `unattended_file_path` }} + "{{ user `floppy_dir` }}/{{ user `unattended_file_path` }}" ] }, { @@ -46,7 +46,7 @@ "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"", "shutdown_timeout": "15m", "floppy_files": [ - "{{ user `floppy_dir` }}/{{ user `unattended_file_path` }} + "{{ user `floppy_dir` }}/{{ user `unattended_file_path` }}" ] } ], diff --git a/packer_templates/windows/windows-7.json b/packer_templates/windows/windows-7.json index 44223f702..c31017f2e 100644 --- a/packer_templates/windows/windows-7.json +++ b/packer_templates/windows/windows-7.json @@ -25,7 +25,7 @@ "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"", "shutdown_timeout": "15m", "floppy_files": [ - "{{ user `floppy_dir` }}/{{ user `unattended_file_path` }} + "{{ user `floppy_dir` }}/{{ user `unattended_file_path` }}" ] }], "provisioners": [{ From f9333c3b34d8701bb9731999b5b6b32cd7da8aa8 Mon Sep 17 00:00:00 2001 From: kartnico <kartnico@kartzone.info> Date: Fri, 3 Jan 2020 18:43:42 +0100 Subject: [PATCH 1125/1622] Add "hyperv_generation" and "hyperv_switch" user variables to oraclelinux 7.7 template. Signed-off-by: kartnico <kartnico@kartzone.info> --- packer_templates/oraclelinux/oracle-7.7-x86_64.json | 2 ++ 1 file changed, 2 insertions(+) diff --git a/packer_templates/oraclelinux/oracle-7.7-x86_64.json b/packer_templates/oraclelinux/oracle-7.7-x86_64.json index 79024471d..4b5972e9b 100644 --- a/packer_templates/oraclelinux/oracle-7.7-x86_64.json +++ b/packer_templates/oraclelinux/oracle-7.7-x86_64.json @@ -172,6 +172,8 @@ "headless": "", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", + "hyperv_generation": "1", + "hyperv_switch": "{{env `hyperv_switch`}}", "guest_additions_url": "", "iso_checksum": "1d06cef6a518c32c0e7adcad0a99a8efbc7516066de41118ebf49002c15ea84d", "iso_checksum_type": "sha256", From 4fe1cf32dbbfd8469f189d9c58a3d0413a5dc866 Mon Sep 17 00:00:00 2001 From: kartnico <kartnico@kartzone.info> Date: Sat, 4 Jan 2020 11:40:01 +0100 Subject: [PATCH 1126/1622] Add "qemu" builder for windows 2019 template. Signed-off-by: kartnico <kartnico@kartzone.info> --- README.md | 11 +++++ .../answer_files/2019/Autounattend.xml | 49 +++++++++++++++++++ packer_templates/windows/windows-2019.json | 26 ++++++++++ 3 files changed, 86 insertions(+) diff --git a/README.md b/README.md index b164c52e5..8bc89910b 100644 --- a/README.md +++ b/README.md @@ -69,6 +69,17 @@ If the build is successful, ready to import box files will be in the `builds` di \***NOTE:** box_basename can be overridden like other Packer vars with `-var 'box_basename=ubuntu-18.04'` +#### KVM/qemu support for Windows + +* You must download [the iso image with the Windows drivers for paravirtualized KVM/qemu hardware](https://fedorapeople.org/groups/virt/virtio-win/direct-downloads/stable-virtio/virtio-win.iso). + You can do this from the command line: `wget -nv -nc https://fedorapeople.org/groups/virt/virtio-win/direct-downloads/stable-virtio/virtio-win.iso -O virtio-win.iso`. + +You can use the following sample command to build a KVM/qemu Windows box: + +``` +packer build --only=qemu --var virtio_win_iso=~/virtio-win.iso windows-2019.json +``` + ### Proprietary Templates Templates for operating systems only available via license or subscription are also available in the repository, these include but are not limited to: macOS, Red Hat Enterprise Linux, and SUSE Linux Enterprise. As the ISOs are not publicly available the URL values will need to be overridden as appropriate. We rely on the efforts of those with access to licensed versions of the operating systems to keep these up-to-date. diff --git a/packer_templates/windows/answer_files/2019/Autounattend.xml b/packer_templates/windows/answer_files/2019/Autounattend.xml index f5fb5a3d0..4737d13ae 100644 --- a/packer_templates/windows/answer_files/2019/Autounattend.xml +++ b/packer_templates/windows/answer_files/2019/Autounattend.xml @@ -1,6 +1,55 @@ <?xml version="1.0" encoding="utf-8"?> <unattend xmlns="urn:schemas-microsoft-com:unattend"> <settings pass="windowsPE"> + <component name="Microsoft-Windows-PnpCustomizationsWinPE" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" processorArchitecture="amd64" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State"> + <!-- + This makes the VirtIO drivers available to Windows, assuming that + the VirtIO driver disk at https://fedorapeople.org/groups/virt/virtio-win/direct-downloads/stable-virtio/virtio-win.iso + (see https://docs.fedoraproject.org/en-US/quick-docs/creating-windows-virtual-machines-using-virtio-drivers/index.html#virtio-win-direct-downloads) + is available as drive E: + --> + <DriverPaths> + <PathAndCredentials wcm:action="add" wcm:keyValue="2"> + <Path>E:\viostor\2k19\amd64</Path> + </PathAndCredentials> + + <PathAndCredentials wcm:action="add" wcm:keyValue="3"> + <Path>E:\NetKVM\2k19\amd64</Path> + </PathAndCredentials> + + <PathAndCredentials wcm:action="add" wcm:keyValue="4"> + <Path>E:\Balloon\2k19\amd64</Path> + </PathAndCredentials> + + <PathAndCredentials wcm:action="add" wcm:keyValue="5"> + <Path>E:\pvpanic\2k19\amd64</Path> + </PathAndCredentials> + + <PathAndCredentials wcm:action="add" wcm:keyValue="6"> + <Path>E:\qemupciserial\2k19\amd64</Path> + </PathAndCredentials> + + <PathAndCredentials wcm:action="add" wcm:keyValue="7"> + <Path>E:\qxldod\2k19\amd64</Path> + </PathAndCredentials> + + <PathAndCredentials wcm:action="add" wcm:keyValue="8"> + <Path>E:\vioinput\2k19\amd64</Path> + </PathAndCredentials> + + <PathAndCredentials wcm:action="add" wcm:keyValue="9"> + <Path>E:\viorng\2k19\amd64</Path> + </PathAndCredentials> + + <PathAndCredentials wcm:action="add" wcm:keyValue="10"> + <Path>E:\vioscsi\2k19\amd64</Path> + </PathAndCredentials> + + <PathAndCredentials wcm:action="add" wcm:keyValue="11"> + <Path>E:\vioserial\2k19\amd64</Path> + </PathAndCredentials> + </DriverPaths> + </component> <component name="Microsoft-Windows-International-Core-WinPE" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> <SetupUILanguage> <UILanguage>en-US</UILanguage> diff --git a/packer_templates/windows/windows-2019.json b/packer_templates/windows/windows-2019.json index 9ddab6ecb..38dd807a3 100644 --- a/packer_templates/windows/windows-2019.json +++ b/packer_templates/windows/windows-2019.json @@ -48,6 +48,31 @@ "floppy_files": [ "{{ user `floppy_dir` }}/{{ user `unattended_file_path` }}" ] + }, + { + "type": "qemu", + "memory": "{{ user `memory` }}", + "cpus": "{{ user `cpus` }}", + "headless": "{{ user `headless` }}", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_checksum_type": "sha1", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-qemu", + "communicator": "winrm", + "winrm_username": "vagrant", + "winrm_password": "vagrant", + "winrm_timeout": "12h", + "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"", + "shutdown_timeout": "15m", + "qemuargs": [ + [ "-m", "{{ user `memory` }}" ], + [ "-smp", "{{ user `cpus` }}" ], + [ "-drive", "file={{ user `virtio_win_iso` }},media=cdrom,index=3" ], + [ "-drive", "file={{ user `build_directory` }}/packer-{{ user `template` }}-qemu/{{ .Name }},if=virtio,cache=writeback,discard=ignore,format=qcow2,index=1" ] + ], + "floppy_files": [ + "{{ user `floppy_dir` }}/{{ user `unattended_file_path` }}" + ] } ], "provisioners": [{ @@ -116,6 +141,7 @@ "build_directory": "../../builds", "floppy_dir": "{{template_dir}}/answer_files", "unattended_file_path": "2019/Autounattend.xml", + "virtio_win_iso": "~/virtio-win.iso", "template": "windows-2019-standard" } } From 922335e8bf53153e017c9a2ae00906409f4f31fc Mon Sep 17 00:00:00 2001 From: kartnico <kartnico@kartzone.info> Date: Sat, 4 Jan 2020 11:40:14 +0100 Subject: [PATCH 1127/1622] Add "qemu" builder for windows 10 template. Signed-off-by: kartnico <kartnico@kartzone.info> --- .../windows/answer_files/10/Autounattend.xml | 55 ++++++++++++++++++- packer_templates/windows/windows-10.json | 26 +++++++++ 2 files changed, 80 insertions(+), 1 deletion(-) diff --git a/packer_templates/windows/answer_files/10/Autounattend.xml b/packer_templates/windows/answer_files/10/Autounattend.xml index 1ee0c0796..2679e7321 100644 --- a/packer_templates/windows/answer_files/10/Autounattend.xml +++ b/packer_templates/windows/answer_files/10/Autounattend.xml @@ -1,6 +1,59 @@ <?xml version="1.0" encoding="utf-8"?> <unattend xmlns="urn:schemas-microsoft-com:unattend"> <settings pass="windowsPE"> + <component name="Microsoft-Windows-PnpCustomizationsWinPE" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" processorArchitecture="amd64" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State"> + <!-- + This makes the VirtIO drivers available to Windows, assuming that + the VirtIO driver disk at https://fedorapeople.org/groups/virt/virtio-win/direct-downloads/stable-virtio/virtio-win.iso + (see https://docs.fedoraproject.org/en-US/quick-docs/creating-windows-virtual-machines-using-virtio-drivers/index.html#virtio-win-direct-downloads) + is available as drive E: + --> + <DriverPaths> + <PathAndCredentials wcm:action="add" wcm:keyValue="2"> + <Path>E:\viostor\w10\amd64</Path> + </PathAndCredentials> + + <PathAndCredentials wcm:action="add" wcm:keyValue="3"> + <Path>E:\NetKVM\w10\amd64</Path> + </PathAndCredentials> + + <PathAndCredentials wcm:action="add" wcm:keyValue="4"> + <Path>E:\Balloon\w10\amd64</Path> + </PathAndCredentials> + + <PathAndCredentials wcm:action="add" wcm:keyValue="5"> + <Path>E:\pvpanic\w10\amd64</Path> + </PathAndCredentials> + + <PathAndCredentials wcm:action="add" wcm:keyValue="6"> + <Path>E:\qemupciserial\w10\amd64</Path> + </PathAndCredentials> + + <PathAndCredentials wcm:action="add" wcm:keyValue="7"> + <Path>E:\qxldod\w10\amd64</Path> + </PathAndCredentials> + + <PathAndCredentials wcm:action="add" wcm:keyValue="8"> + <Path>E:\vioinput\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:\vioscsi\w10\amd64</Path> + </PathAndCredentials> + + <PathAndCredentials wcm:action="add" wcm:keyValue="11"> + <Path>E:\vioserial\w10\amd64</Path> + </PathAndCredentials> + + <PathAndCredentials wcm:action="add" wcm:keyValue="12"> + <Path>E:\vioserial\w10\amd64</Path> + </PathAndCredentials> + </DriverPaths> + </component> <component xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" name="Microsoft-Windows-International-Core-WinPE" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> <SetupUILanguage> <UILanguage>en-US</UILanguage> @@ -164,4 +217,4 @@ <DoNotOpenInitialConfigurationTasksAtLogon>true</DoNotOpenInitialConfigurationTasksAtLogon> </component> </settings> -</unattend> \ No newline at end of file +</unattend> diff --git a/packer_templates/windows/windows-10.json b/packer_templates/windows/windows-10.json index 324207aed..731e58ee8 100644 --- a/packer_templates/windows/windows-10.json +++ b/packer_templates/windows/windows-10.json @@ -49,6 +49,31 @@ "floppy_files": [ "{{ user `floppy_dir` }}/{{ user `unattended_file_path` }}" ] + }, + { + "type": "qemu", + "memory": "{{ user `memory` }}", + "cpus": "{{ user `cpus` }}", + "headless": "{{ user `headless` }}", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_checksum_type": "sha1", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-qemu", + "communicator": "winrm", + "winrm_username": "vagrant", + "winrm_password": "vagrant", + "winrm_timeout": "12h", + "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"", + "shutdown_timeout": "15m", + "qemuargs": [ + [ "-m", "{{ user `memory` }}" ], + [ "-smp", "{{ user `cpus` }}" ], + [ "-drive", "file={{ user `virtio_win_iso` }},media=cdrom,index=3" ], + [ "-drive", "file={{ user `build_directory` }}/packer-{{ user `template` }}-qemu/{{ .Name }},if=virtio,cache=writeback,discard=ignore,format=qcow2,index=1" ] + ], + "floppy_files": [ + "{{ user `floppy_dir` }}/{{ user `unattended_file_path` }}" + ] } ], "provisioners": [{ @@ -118,6 +143,7 @@ "build_directory": "../../builds", "floppy_dir": "{{template_dir}}/answer_files", "unattended_file_path": "10/Autounattend.xml", + "virtio_win_iso": "~/virtio-win.iso", "template": "windows-10" } } From 944309c7f5fbce6411534241cc0c4b67121df53f Mon Sep 17 00:00:00 2001 From: kartnico <kartnico@kartzone.info> Date: Sat, 4 Jan 2020 11:40:30 +0100 Subject: [PATCH 1128/1622] Add "qemu" builder for windows 2012R2 template. Signed-off-by: kartnico <kartnico@kartzone.info> --- .../answer_files/2012_r2/Autounattend.xml | 49 +++++++++++++++++++ packer_templates/windows/windows-2012r2.json | 26 ++++++++++ 2 files changed, 75 insertions(+) diff --git a/packer_templates/windows/answer_files/2012_r2/Autounattend.xml b/packer_templates/windows/answer_files/2012_r2/Autounattend.xml index 9139bff7f..b68fdf4a1 100644 --- a/packer_templates/windows/answer_files/2012_r2/Autounattend.xml +++ b/packer_templates/windows/answer_files/2012_r2/Autounattend.xml @@ -1,6 +1,55 @@ <?xml version="1.0" encoding="utf-8"?> <unattend xmlns="urn:schemas-microsoft-com:unattend"> <settings pass="windowsPE"> + <component name="Microsoft-Windows-PnpCustomizationsWinPE" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" processorArchitecture="amd64" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State"> + <!-- + This makes the VirtIO drivers available to Windows, assuming that + the VirtIO driver disk at https://fedorapeople.org/groups/virt/virtio-win/direct-downloads/stable-virtio/virtio-win.iso + (see https://docs.fedoraproject.org/en-US/quick-docs/creating-windows-virtual-machines-using-virtio-drivers/index.html#virtio-win-direct-downloads) + is available as drive E: + --> + <DriverPaths> + <PathAndCredentials wcm:action="add" wcm:keyValue="2"> + <Path>E:\viostor\2k12R2\amd64</Path> + </PathAndCredentials> + + <PathAndCredentials wcm:action="add" wcm:keyValue="3"> + <Path>E:\NetKVM\2k12R2\amd64</Path> + </PathAndCredentials> + + <PathAndCredentials wcm:action="add" wcm:keyValue="4"> + <Path>E:\Balloon\2k12R2\amd64</Path> + </PathAndCredentials> + + <PathAndCredentials wcm:action="add" wcm:keyValue="5"> + <Path>E:\pvpanic\2k12R2\amd64</Path> + </PathAndCredentials> + + <PathAndCredentials wcm:action="add" wcm:keyValue="6"> + <Path>E:\qemupciserial\2k12R2\amd64</Path> + </PathAndCredentials> + + <PathAndCredentials wcm:action="add" wcm:keyValue="7"> + <Path>E:\qxldod\2k12R2\amd64</Path> + </PathAndCredentials> + + <PathAndCredentials wcm:action="add" wcm:keyValue="8"> + <Path>E:\vioinput\2k12R2\amd64</Path> + </PathAndCredentials> + + <PathAndCredentials wcm:action="add" wcm:keyValue="9"> + <Path>E:\viorng\2k12R2\amd64</Path> + </PathAndCredentials> + + <PathAndCredentials wcm:action="add" wcm:keyValue="10"> + <Path>E:\vioscsi\2k12R2\amd64</Path> + </PathAndCredentials> + + <PathAndCredentials wcm:action="add" wcm:keyValue="11"> + <Path>E:\vioserial\2k12R2\amd64</Path> + </PathAndCredentials> + </DriverPaths> + </component> <component name="Microsoft-Windows-International-Core-WinPE" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> <SetupUILanguage> <UILanguage>en-US</UILanguage> diff --git a/packer_templates/windows/windows-2012r2.json b/packer_templates/windows/windows-2012r2.json index 3782f527e..318ce34d5 100644 --- a/packer_templates/windows/windows-2012r2.json +++ b/packer_templates/windows/windows-2012r2.json @@ -48,6 +48,31 @@ "floppy_files": [ "{{ user `floppy_dir` }}/{{ user `unattended_file_path` }}" ] + }, + { + "type": "qemu", + "memory": "{{ user `memory` }}", + "cpus": "{{ user `cpus` }}", + "headless": "{{ user `headless` }}", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_checksum_type": "sha1", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-qemu", + "communicator": "winrm", + "winrm_username": "vagrant", + "winrm_password": "vagrant", + "winrm_timeout": "12h", + "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"", + "shutdown_timeout": "15m", + "qemuargs": [ + [ "-m", "{{ user `memory` }}" ], + [ "-smp", "{{ user `cpus` }}" ], + [ "-drive", "file={{ user `virtio_win_iso` }},media=cdrom,index=3" ], + [ "-drive", "file={{ user `build_directory` }}/packer-{{ user `template` }}-qemu/{{ .Name }},if=virtio,cache=writeback,discard=ignore,format=qcow2,index=1" ] + ], + "floppy_files": [ + "{{ user `floppy_dir` }}/{{ user `unattended_file_path` }}" + ] } ], "provisioners": [{ @@ -116,6 +141,7 @@ "build_directory": "../../builds", "floppy_dir": "{{template_dir}}/answer_files", "unattended_file_path": "2012_r2/Autounattend.xml", + "virtio_win_iso": "~/virtio-win.iso", "template": "windows-2012r2-standard" } } From 3758280bd5682c21dc897f8dbc698d842c7f673e Mon Sep 17 00:00:00 2001 From: kartnico <kartnico@kartzone.info> Date: Sat, 4 Jan 2020 11:40:43 +0100 Subject: [PATCH 1129/1622] Add "qemu" builder for windows 2016 template. Signed-off-by: kartnico <kartnico@kartzone.info> --- .../answer_files/2016/Autounattend.xml | 49 +++++++++++++++++++ packer_templates/windows/windows-2016.json | 26 ++++++++++ 2 files changed, 75 insertions(+) diff --git a/packer_templates/windows/answer_files/2016/Autounattend.xml b/packer_templates/windows/answer_files/2016/Autounattend.xml index eae4526a0..50e74334c 100644 --- a/packer_templates/windows/answer_files/2016/Autounattend.xml +++ b/packer_templates/windows/answer_files/2016/Autounattend.xml @@ -1,6 +1,55 @@ <?xml version="1.0" encoding="utf-8"?> <unattend xmlns="urn:schemas-microsoft-com:unattend"> <settings pass="windowsPE"> + <component name="Microsoft-Windows-PnpCustomizationsWinPE" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" processorArchitecture="amd64" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State"> + <!-- + This makes the VirtIO drivers available to Windows, assuming that + the VirtIO driver disk at https://fedorapeople.org/groups/virt/virtio-win/direct-downloads/stable-virtio/virtio-win.iso + (see https://docs.fedoraproject.org/en-US/quick-docs/creating-windows-virtual-machines-using-virtio-drivers/index.html#virtio-win-direct-downloads) + is available as drive E: + --> + <DriverPaths> + <PathAndCredentials wcm:action="add" wcm:keyValue="2"> + <Path>E:\viostor\2k16\amd64</Path> + </PathAndCredentials> + + <PathAndCredentials wcm:action="add" wcm:keyValue="3"> + <Path>E:\NetKVM\2k16\amd64</Path> + </PathAndCredentials> + + <PathAndCredentials wcm:action="add" wcm:keyValue="4"> + <Path>E:\Balloon\2k16\amd64</Path> + </PathAndCredentials> + + <PathAndCredentials wcm:action="add" wcm:keyValue="5"> + <Path>E:\pvpanic\2k16\amd64</Path> + </PathAndCredentials> + + <PathAndCredentials wcm:action="add" wcm:keyValue="6"> + <Path>E:\qemupciserial\2k16\amd64</Path> + </PathAndCredentials> + + <PathAndCredentials wcm:action="add" wcm:keyValue="7"> + <Path>E:\qxldod\2k16\amd64</Path> + </PathAndCredentials> + + <PathAndCredentials wcm:action="add" wcm:keyValue="8"> + <Path>E:\vioinput\2k16\amd64</Path> + </PathAndCredentials> + + <PathAndCredentials wcm:action="add" wcm:keyValue="9"> + <Path>E:\viorng\2k16\amd64</Path> + </PathAndCredentials> + + <PathAndCredentials wcm:action="add" wcm:keyValue="10"> + <Path>E:\vioscsi\2k16\amd64</Path> + </PathAndCredentials> + + <PathAndCredentials wcm:action="add" wcm:keyValue="11"> + <Path>E:\vioserial\2k16\amd64</Path> + </PathAndCredentials> + </DriverPaths> + </component> <component name="Microsoft-Windows-International-Core-WinPE" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> <SetupUILanguage> <UILanguage>en-US</UILanguage> diff --git a/packer_templates/windows/windows-2016.json b/packer_templates/windows/windows-2016.json index 6999e15fc..f6bb7cd85 100644 --- a/packer_templates/windows/windows-2016.json +++ b/packer_templates/windows/windows-2016.json @@ -48,6 +48,31 @@ "floppy_files": [ "{{ user `floppy_dir` }}/{{ user `unattended_file_path` }}" ] + }, + { + "type": "qemu", + "memory": "{{ user `memory` }}", + "cpus": "{{ user `cpus` }}", + "headless": "{{ user `headless` }}", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_checksum_type": "sha1", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-qemu", + "communicator": "winrm", + "winrm_username": "vagrant", + "winrm_password": "vagrant", + "winrm_timeout": "12h", + "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"", + "shutdown_timeout": "15m", + "qemuargs": [ + [ "-m", "{{ user `memory` }}" ], + [ "-smp", "{{ user `cpus` }}" ], + [ "-drive", "file={{ user `virtio_win_iso` }},media=cdrom,index=3" ], + [ "-drive", "file={{ user `build_directory` }}/packer-{{ user `template` }}-qemu/{{ .Name }},if=virtio,cache=writeback,discard=ignore,format=qcow2,index=1" ] + ], + "floppy_files": [ + "{{ user `floppy_dir` }}/{{ user `unattended_file_path` }}" + ] } ], "provisioners": [{ @@ -116,6 +141,7 @@ "build_directory": "../../builds", "floppy_dir": "{{template_dir}}/answer_files", "unattended_file_path": "2016/Autounattend.xml", + "virtio_win_iso": "~/virtio-win.iso", "template": "windows-2016-standard" } } From 144a489d6f2ff6172664f751b9d42c987e48285d Mon Sep 17 00:00:00 2001 From: kartnico <kartnico@kartzone.info> Date: Sat, 4 Jan 2020 11:58:59 +0100 Subject: [PATCH 1130/1622] Update README. Signed-off-by: kartnico <kartnico@kartzone.info> --- README.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/README.md b/README.md index 8bc89910b..cc062af35 100644 --- a/README.md +++ b/README.md @@ -71,8 +71,7 @@ If the build is successful, ready to import box files will be in the `builds` di #### KVM/qemu support for Windows -* You must download [the iso image with the Windows drivers for paravirtualized KVM/qemu hardware](https://fedorapeople.org/groups/virt/virtio-win/direct-downloads/stable-virtio/virtio-win.iso). - You can do this from the command line: `wget -nv -nc https://fedorapeople.org/groups/virt/virtio-win/direct-downloads/stable-virtio/virtio-win.iso -O virtio-win.iso`. +You must download [the iso image with the Windows drivers for paravirtualized KVM/qemu hardware](https://fedorapeople.org/groups/virt/virtio-win/direct-downloads/stable-virtio/virtio-win.iso). You can do this from the command line: `wget -nv -nc https://fedorapeople.org/groups/virt/virtio-win/direct-downloads/stable-virtio/virtio-win.iso -O virtio-win.iso`. You can use the following sample command to build a KVM/qemu Windows box: From 685f03ba6f516bc74b732767fabd0d2df3bab1d0 Mon Sep 17 00:00:00 2001 From: kartnico <kartnico@kartzone.info> Date: Sat, 4 Jan 2020 12:34:58 +0100 Subject: [PATCH 1131/1622] Add base_setup.ps1 script to floppy_files for vmware and qemu builders to windows 10 templates. Signed-off-by: kartnico <kartnico@kartzone.info> --- packer_templates/windows/windows-10.json | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/packer_templates/windows/windows-10.json b/packer_templates/windows/windows-10.json index 731e58ee8..4cd6e9e59 100644 --- a/packer_templates/windows/windows-10.json +++ b/packer_templates/windows/windows-10.json @@ -47,7 +47,8 @@ "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"", "shutdown_timeout": "15m", "floppy_files": [ - "{{ user `floppy_dir` }}/{{ user `unattended_file_path` }}" + "{{ user `floppy_dir` }}/{{ user `unattended_file_path` }}", + "{{template_dir}}/scripts/base_setup.ps1" ] }, { @@ -72,7 +73,8 @@ [ "-drive", "file={{ user `build_directory` }}/packer-{{ user `template` }}-qemu/{{ .Name }},if=virtio,cache=writeback,discard=ignore,format=qcow2,index=1" ] ], "floppy_files": [ - "{{ user `floppy_dir` }}/{{ user `unattended_file_path` }}" + "{{ user `floppy_dir` }}/{{ user `unattended_file_path` }}", + "{{template_dir}}/scripts/base_setup.ps1" ] } ], From 968f259ec0f986ca43b848d458c8abca3e5def60 Mon Sep 17 00:00:00 2001 From: Ian Brown <ian.brown@everlaw.com> Date: Mon, 6 Jan 2020 15:24:28 -0800 Subject: [PATCH 1132/1622] Replace lgeacy service name with open-vm-tools --- packer_templates/ubuntu/scripts/vmware.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packer_templates/ubuntu/scripts/vmware.sh b/packer_templates/ubuntu/scripts/vmware.sh index 617b3df42..0f23f5547 100644 --- a/packer_templates/ubuntu/scripts/vmware.sh +++ b/packer_templates/ubuntu/scripts/vmware.sh @@ -4,7 +4,7 @@ case "$PACKER_BUILDER_TYPE" in vmware-iso|vmware-vmx) apt-get install -y open-vm-tools; mkdir /mnt/hgfs; - systemctl enable vmtoolsd - systemctl start vmtoolsd + systemctl enable open-vm-tools + systemctl start open-vm-tools echo "platform specific vmware.sh executed"; esac From ef02d18a2dfcee4bbb8aeeea2917a3ed1a922a9d Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Thu, 16 Jan 2020 14:26:39 -0800 Subject: [PATCH 1133/1622] Remove the github lock config Signed-off-by: Tim Smith <tsmith@chef.io> --- .github/lock.yml | 1 - 1 file changed, 1 deletion(-) delete mode 100644 .github/lock.yml diff --git a/.github/lock.yml b/.github/lock.yml deleted file mode 100644 index 66d5d4962..000000000 --- a/.github/lock.yml +++ /dev/null @@ -1 +0,0 @@ -daysUntilLock: 60 From 4f7c969ad23eb49f7dc8f82933aafa388fa6f935 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Thu, 16 Jan 2020 14:27:15 -0800 Subject: [PATCH 1134/1622] Don't include the Vagrant version on Vagrant Cloud Vagrant doesn't matter in this context Signed-off-by: Tim Smith <tsmith@chef.io> --- lib/bento/upload.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/bento/upload.rb b/lib/bento/upload.rb index cc4b5139e..b0aa71818 100644 --- a/lib/bento/upload.rb +++ b/lib/bento/upload.rb @@ -82,6 +82,6 @@ def slug_desc(name) end def ver_desc(md_data, provider) - "#{md_data['name'].tr("-", " ").capitalize} Vagrant box version #{md_data['version']} created with Bento by Chef. Tool versions: #{provider}: #{md_data['providers'][provider]['version']}, packer: #{md_data['packer']}, vagrant: #{md_data['vagrant']}" + "#{md_data['name'].tr("-", " ").capitalize} Vagrant box version #{md_data['version']} created with Bento by Chef. Tool versions: #{provider}: #{md_data['providers'][provider]['version']}, packer: #{md_data['packer']}" end end From 25e83aedeb02e27b6e94368bdb3a7668e5daccdd Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Thu, 16 Jan 2020 14:27:26 -0800 Subject: [PATCH 1135/1622] CentOS 8 -> 8.1 Signed-off-by: Tim Smith <tsmith@chef.io> --- builds.yml | 2 +- .../centos/centos-8.1-x86_64.json | 188 ++++++++++++++++++ 2 files changed, 189 insertions(+), 1 deletion(-) create mode 100644 packer_templates/centos/centos-8.1-x86_64.json diff --git a/builds.yml b/builds.yml index cea0db4c1..9ef4afc1a 100644 --- a/builds.yml +++ b/builds.yml @@ -6,7 +6,7 @@ public: - 'centos-6.10-i386' - 'centos-6.10' - 'centos-7.7' -- 'centos-8.0' +- 'centos-8.1' - 'debian-8.11-i386' - 'debian-8.11' - 'debian-9.11-i386' diff --git a/packer_templates/centos/centos-8.1-x86_64.json b/packer_templates/centos/centos-8.1-x86_64.json new file mode 100644 index 000000000..6a3e4a077 --- /dev/null +++ b/packer_templates/centos/centos-8.1-x86_64.json @@ -0,0 +1,188 @@ +{ + "builders": [ + { + "boot_command": [ + "<up><wait><tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": "{{user `disk_size`}}", + "guest_additions_url": "{{ user `guest_additions_url` }}", + "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "guest_os_type": "RedHat_64", + "hard_drive_interface": "sata", + "headless": "{{ user `headless` }}", + "http_directory": "{{template_dir}}/http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-virtualbox", + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "virtualbox-iso", + "memory": "{{ user `memory` }}", + "cpus": "{{ user `cpus` }}", + "virtualbox_version_file": ".vbox_version", + "vm_name": "{{ user `template` }}" + }, + { + "boot_command": [ + "<up><wait><tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": "{{user `disk_size`}}", + "guest_os_type": "centos-64", + "headless": "{{ user `headless` }}", + "http_directory": "{{template_dir}}/http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-vmware", + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "tools_upload_flavor": "linux", + "type": "vmware-iso", + "vm_name": "{{ user `template` }}", + "memory": "{{ user `memory` }}", + "cpus": "{{ user `cpus` }}", + "vmx_data": { + "cpuid.coresPerSocket": "1" + }, + "vmx_remove_ethernet_interfaces": true + }, + { + "boot_command": [ + "<up><wait><tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": "{{user `disk_size`}}", + "guest_os_type": "centos", + "http_directory": "{{template_dir}}/http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-parallels", + "parallels_tools_flavor": "lin", + "memory": "{{ user `memory` }}", + "cpus": "{{ user `cpus` }}", + "prlctl_version_file": ".prlctl_version", + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "parallels-iso", + "vm_name": "{{ user `template` }}" + }, + { + "boot_command": [ + "<wait5><tab> text ks=hd:fd0:/ks.cfg<enter><wait5><esc>" + ], + "boot_wait": "10s", + "cpus": "{{ user `cpus` }}", + "disk_size": "{{user `disk_size`}}", + "floppy_files": [ + "{{template_dir}}/http/{{user `ks_path`}}" + ], + "generation": "{{user `hyperv_generation`}}", + "guest_additions_mode": "disable", + "http_directory": "{{template_dir}}/http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "memory": "{{ user `memory` }}", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-hyperv", + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_timeout": "10000s", + "ssh_username": "vagrant", + "switch_name": "{{ user `hyperv_switch`}}", + "type": "hyperv-iso", + "vm_name": "{{ user `template` }}" + }, + { + "boot_command": [ + "<up><wait><tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" + ], + "boot_wait": "10s", + "memory": "{{ user `memory` }}", + "cpus": "{{ user `cpus` }}", + "disk_size": "{{user `disk_size`}}", + "headless": "{{ user `headless` }}", + "http_directory": "{{template_dir}}/http", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-qemu", + "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "qemu", + "vm_name": "{{ user `template` }}" + } + ], + "post-processors": [ + { + "output": "{{ user `build_directory` }}/{{user `box_basename`}}.{{.Provider}}.box", + "type": "vagrant" + } + ], + "provisioners": [ + { + "environment_vars": [ + "HOME_DIR=/home/vagrant", + "http_proxy={{user `http_proxy`}}", + "https_proxy={{user `https_proxy`}}", + "no_proxy={{user `no_proxy`}}" + ], + "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", + "expect_disconnect": true, + "scripts": [ + "{{template_dir}}/scripts/update.sh", + "{{template_dir}}/../_common/motd.sh", + "{{template_dir}}/../_common/sshd.sh", + "{{template_dir}}/scripts/networking.sh", + "{{template_dir}}/../_common/vagrant.sh", + "{{template_dir}}/../_common/virtualbox.sh", + "{{template_dir}}/../_common/vmware.sh", + "{{template_dir}}/../_common/parallels.sh", + "{{template_dir}}/scripts/cleanup.sh", + "{{template_dir}}/../_common/minimize.sh" + ], + "type": "shell" + } + ], + "variables": { + "box_basename": "centos-8.1", + "build_directory": "../../builds", + "build_timestamp": "{{isotime \"2019102650405\"}}", + "cpus": "1", + "disk_size": "65536", + "git_revision": "__unknown_git_revision__", + "headless": "", + "http_proxy": "{{env `http_proxy`}}", + "https_proxy": "{{env `https_proxy`}}", + "hyperv_generation": "1", + "hyperv_switch": "{{env `hyperv_switch`}}", + "guest_additions_url": "", + "iso_checksum": "3ee3f4ea1538e026fff763e2b284a6f20b259d91d1ad5688f5783a67d279423b", + "iso_checksum_type": "sha256", + "iso_name": "CentOS-8.1.1911-x86_64-dvd1.iso", + "ks_path": "8/ks.cfg", + "memory": "1024", + "mirror": "http://mirrors.kernel.org/centos", + "mirror_directory": "8.1.1911/isos/x86_64", + "name": "centos-8.1", + "no_proxy": "{{env `no_proxy`}}", + "template": "centos-8.1-x86_64", + "version": "TIMESTAMP" + } +} From 2a226d76e06aaa3842b6b1965e08a0291870c954 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Thu, 16 Jan 2020 14:46:09 -0800 Subject: [PATCH 1136/1622] Remove the CentOS 8 template Signed-off-by: Tim Smith <tsmith@chef.io> --- .../centos/centos-8.0-x86_64.json | 189 ------------------ .../centos/centos-8.1-x86_64.json | 13 +- 2 files changed, 7 insertions(+), 195 deletions(-) delete mode 100644 packer_templates/centos/centos-8.0-x86_64.json diff --git a/packer_templates/centos/centos-8.0-x86_64.json b/packer_templates/centos/centos-8.0-x86_64.json deleted file mode 100644 index 1944fd2d9..000000000 --- a/packer_templates/centos/centos-8.0-x86_64.json +++ /dev/null @@ -1,189 +0,0 @@ -{ - "builders": [ - { - "boot_command": [ - "<up><wait><tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "guest_additions_url": "{{ user `guest_additions_url` }}", - "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", - "guest_os_type": "RedHat_64", - "hard_drive_interface": "sata", - "headless": "{{ user `headless` }}", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-virtualbox", - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "virtualbox-iso", - "memory": "{{ user `memory` }}", - "cpus": "{{ user `cpus` }}", - "virtualbox_version_file": ".vbox_version", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<up><wait><tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "centos-64", - "headless": "{{ user `headless` }}", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-vmware", - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "tools_upload_flavor": "linux", - "type": "vmware-iso", - "vm_name": "{{ user `template` }}", - "memory": "{{ user `memory` }}", - "cpus": "{{ user `cpus` }}", - "vmx_data": { - "cpuid.coresPerSocket": "1" - }, - "vmx_remove_ethernet_interfaces": true - }, - { - "boot_command": [ - "<up><wait><tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "centos", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-parallels", - "parallels_tools_flavor": "lin", - "memory": "{{ user `memory` }}", - "cpus": "{{ user `cpus` }}", - "prlctl_version_file": ".prlctl_version", - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "parallels-iso", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<wait5><tab> text ks=hd:fd0:/ks.cfg<enter><wait5><esc>" - ], - "boot_wait": "10s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "floppy_files": [ - "{{user `http_directory`}}/{{user `ks_path`}}" - ], - "generation": "{{user `hyperv_generation`}}", - "guest_additions_mode": "disable", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-hyperv", - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "switch_name": "{{ user `hyperv_switch`}}", - "type": "hyperv-iso", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<up><wait><tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" - ], - "boot_wait": "10s", - "memory": "{{ user `memory` }}", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "headless": "{{ user `headless` }}", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-qemu", - "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "qemu", - "vm_name": "{{ user `template` }}" - } - ], - "post-processors": [ - { - "output": "{{ user `build_directory` }}/{{user `box_basename`}}.{{.Provider}}.box", - "type": "vagrant" - } - ], - "provisioners": [ - { - "environment_vars": [ - "HOME_DIR=/home/vagrant", - "http_proxy={{user `http_proxy`}}", - "https_proxy={{user `https_proxy`}}", - "no_proxy={{user `no_proxy`}}" - ], - "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", - "expect_disconnect": true, - "scripts": [ - "{{template_dir}}/scripts/update.sh", - "{{template_dir}}/../_common/motd.sh", - "{{template_dir}}/../_common/sshd.sh", - "{{template_dir}}/scripts/networking.sh", - "{{template_dir}}/../_common/vagrant.sh", - "{{template_dir}}/../_common/virtualbox.sh", - "{{template_dir}}/../_common/vmware.sh", - "{{template_dir}}/../_common/parallels.sh", - "{{template_dir}}/scripts/cleanup.sh", - "{{template_dir}}/../_common/minimize.sh" - ], - "type": "shell" - } - ], - "variables": { - "box_basename": "centos-8.0", - "build_directory": "../../builds", - "http_directory": "{{template_dir}}/http", - "build_timestamp": "{{isotime \"2019102650405\"}}", - "cpus": "1", - "disk_size": "65536", - "git_revision": "__unknown_git_revision__", - "headless": "", - "http_proxy": "{{env `http_proxy`}}", - "https_proxy": "{{env `https_proxy`}}", - "hyperv_generation": "1", - "hyperv_switch": "{{env `hyperv_switch`}}", - "guest_additions_url": "", - "iso_checksum": "ea17ef71e0df3f6bf1d4bf1fc25bec1a76d1f211c115d39618fe688be34503e8", - "iso_checksum_type": "sha256", - "iso_name": "CentOS-8-x86_64-1905-dvd1.iso", - "ks_path": "8/ks.cfg", - "memory": "1024", - "mirror": "http://mirrors.kernel.org/centos", - "mirror_directory": "8.0.1905/isos/x86_64", - "name": "centos-8.0", - "no_proxy": "{{env `no_proxy`}}", - "template": "centos-8.0-x86_64", - "version": "TIMESTAMP" - } -} diff --git a/packer_templates/centos/centos-8.1-x86_64.json b/packer_templates/centos/centos-8.1-x86_64.json index 6a3e4a077..638f59a76 100644 --- a/packer_templates/centos/centos-8.1-x86_64.json +++ b/packer_templates/centos/centos-8.1-x86_64.json @@ -11,7 +11,7 @@ "guest_os_type": "RedHat_64", "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", - "http_directory": "{{template_dir}}/http", + "http_directory": "{{user `http_directory`}}", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -35,7 +35,7 @@ "disk_size": "{{user `disk_size`}}", "guest_os_type": "centos-64", "headless": "{{ user `headless` }}", - "http_directory": "{{template_dir}}/http", + "http_directory": "{{user `http_directory`}}", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -62,7 +62,7 @@ "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", "guest_os_type": "centos", - "http_directory": "{{template_dir}}/http", + "http_directory": "{{user `http_directory`}}", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -87,11 +87,11 @@ "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "floppy_files": [ - "{{template_dir}}/http/{{user `ks_path`}}" + "{{user `http_directory`}}/{{user `ks_path`}}" ], "generation": "{{user `hyperv_generation`}}", "guest_additions_mode": "disable", - "http_directory": "{{template_dir}}/http", + "http_directory": "{{user `http_directory`}}", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -115,7 +115,7 @@ "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", - "http_directory": "{{template_dir}}/http", + "http_directory": "{{user `http_directory`}}", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", @@ -163,6 +163,7 @@ "variables": { "box_basename": "centos-8.1", "build_directory": "../../builds", + "http_directory": "{{template_dir}}/http", "build_timestamp": "{{isotime \"2019102650405\"}}", "cpus": "1", "disk_size": "65536", From f6ea77a336c6fbbdc48958c4b3d51c091a625e43 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Tue, 4 Feb 2020 12:56:58 -0800 Subject: [PATCH 1137/1622] Remove Ubuntu 19.04 which went EOL 1/23/2020 Wave bye Signed-off-by: Tim Smith <tsmith@chef.io> --- builds.yml | 1 - .../ubuntu/ubuntu-19.04-amd64.json | 288 ------------------ 2 files changed, 289 deletions(-) delete mode 100644 packer_templates/ubuntu/ubuntu-19.04-amd64.json diff --git a/builds.yml b/builds.yml index 9ef4afc1a..7ab5d5cc5 100644 --- a/builds.yml +++ b/builds.yml @@ -33,7 +33,6 @@ public: - 'ubuntu-16.04' - 'ubuntu-18.04' - 'ubuntu-18.10' -- 'ubuntu-19.04' - 'ubuntu-19.10' # slug box name: text string from standard box name to match (generally the same) diff --git a/packer_templates/ubuntu/ubuntu-19.04-amd64.json b/packer_templates/ubuntu/ubuntu-19.04-amd64.json deleted file mode 100644 index 3ac0b86bd..000000000 --- a/packer_templates/ubuntu/ubuntu-19.04-amd64.json +++ /dev/null @@ -1,288 +0,0 @@ -{ - "builders": [ - { - "boot_command": [ - "<esc><wait>", - "<esc><wait>", - "<enter><wait>", - "/install/vmlinuz<wait>", - " auto<wait>", - " console-setup/ask_detect=false<wait>", - " console-setup/layoutcode=us<wait>", - " console-setup/modelcode=pc105<wait>", - " debconf/frontend=noninteractive<wait>", - " debian-installer=en_US.UTF-8<wait>", - " fb=false<wait>", - " initrd=/install/initrd.gz<wait>", - " kbd-chooser/method=us<wait>", - " keyboard-configuration/layout=USA<wait>", - " keyboard-configuration/variant=USA<wait>", - " locale=en_US.UTF-8<wait>", - " netcfg/get_domain=vm<wait>", - " netcfg/get_hostname=vagrant<wait>", - " grub-installer/bootdev=/dev/sda<wait>", - " noapic<wait>", - " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}}<wait>", - " -- <wait>", - "<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "guest_additions_url": "{{ user `guest_additions_url` }}", - "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", - "guest_os_type": "Ubuntu_64", - "hard_drive_interface": "sata", - "headless": "{{ user `headless` }}", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-virtualbox", - "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "virtualbox-iso", - "memory": "{{ user `memory` }}", - "cpus": "{{ user `cpus` }}", - "virtualbox_version_file": ".vbox_version", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<esc><wait>", - "<esc><wait>", - "<enter><wait>", - "/install/vmlinuz<wait>", - " auto<wait>", - " console-setup/ask_detect=false<wait>", - " console-setup/layoutcode=us<wait>", - " console-setup/modelcode=pc105<wait>", - " debconf/frontend=noninteractive<wait>", - " debian-installer=en_US.UTF-8<wait>", - " fb=false<wait>", - " initrd=/install/initrd.gz<wait>", - " kbd-chooser/method=us<wait>", - " keyboard-configuration/layout=USA<wait>", - " keyboard-configuration/variant=USA<wait>", - " locale=en_US.UTF-8<wait>", - " netcfg/get_domain=vm<wait>", - " netcfg/get_hostname=vagrant<wait>", - " grub-installer/bootdev=/dev/sda<wait>", - " noapic<wait>", - " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}}<wait>", - " -- <wait>", - "<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "ubuntu-64", - "headless": "{{ user `headless` }}", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-vmware", - "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "tools_upload_flavor": "linux", - "type": "vmware-iso", - "vm_name": "{{ user `template` }}", - "memory": "{{ user `memory` }}", - "cpus": "{{ user `cpus` }}", - "vmx_data": { - "cpuid.coresPerSocket": "1", - "ethernet0.pciSlotNumber": "32" - }, - "vmx_remove_ethernet_interfaces": true - }, - { - "boot_command": [ - "<esc><wait>", - "<esc><wait>", - "<enter><wait>", - "/install/vmlinuz<wait>", - " auto<wait>", - " console-setup/ask_detect=false<wait>", - " console-setup/layoutcode=us<wait>", - " console-setup/modelcode=pc105<wait>", - " debconf/frontend=noninteractive<wait>", - " debian-installer=en_US.UTF-8<wait>", - " fb=false<wait>", - " initrd=/install/initrd.gz<wait>", - " kbd-chooser/method=us<wait>", - " keyboard-configuration/layout=USA<wait>", - " keyboard-configuration/variant=USA<wait>", - " locale=en_US.UTF-8<wait>", - " netcfg/get_domain=vm<wait>", - " netcfg/get_hostname=vagrant<wait>", - " grub-installer/bootdev=/dev/sda<wait>", - " noapic<wait>", - " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}}<wait>", - " -- <wait>", - "<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "ubuntu", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-parallels", - "parallels_tools_flavor": "lin", - "memory": "{{ user `memory` }}", - "cpus": "{{ user `cpus` }}", - "prlctl_version_file": ".prlctl_version", - "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "parallels-iso", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<esc><wait>", - "<esc><wait>", - "<enter><wait>", - "/install/vmlinuz<wait>", - " auto<wait>", - " console-setup/ask_detect=false<wait>", - " console-setup/layoutcode=us<wait>", - " console-setup/modelcode=pc105<wait>", - " debconf/frontend=noninteractive<wait>", - " debian-installer=en_US.UTF-8<wait>", - " fb=false<wait>", - " initrd=/install/initrd.gz<wait>", - " kbd-chooser/method=us<wait>", - " keyboard-configuration/layout=USA<wait>", - " keyboard-configuration/variant=USA<wait>", - " locale=en_US.UTF-8<wait>", - " netcfg/get_domain=vm<wait>", - " netcfg/get_hostname=vagrant<wait>", - " grub-installer/bootdev=/dev/vda<wait>", - " noapic<wait>", - " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}}<wait>", - " -- <wait>", - "<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "headless": "{{ user `headless` }}", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-qemu", - "memory": "{{ user `memory` }}", - "cpus": "{{ user `cpus` }}", - "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "qemu", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<esc><wait10><esc><esc><enter><wait>", - "set gfxpayload=1024x768<enter>", - "linux /install/vmlinuz ", - "preseed/url=http://{{.HTTPIP}}:{{.HTTPPort}}/preseed-hyperv.cfg ", - "debian-installer=en_US.UTF-8 auto locale=en_US.UTF-8 kbd-chooser/method=us ", - "hostname={{.Name}} ", - "fb=false debconf/frontend=noninteractive ", - "keyboard-configuration/modelcode=SKIP keyboard-configuration/layout=USA ", - "keyboard-configuration/variant=USA console-setup/ask_detect=false <enter>", - "initrd /install/initrd.gz<enter>", - "boot<enter>" - ], - "boot_wait": "10s", - "communicator": "ssh", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "enable_secure_boot": false, - "generation": "{{user `hyperv_generation`}}", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{user `memory`}}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-hyperv", - "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "switch_name": "{{user `hyperv_switch`}}", - "type": "hyperv-iso", - "vm_name": "{{ user `template` }}" - } - ], - "post-processors": [ - { - "output": "{{ user `build_directory` }}/{{user `box_basename`}}.{{.Provider}}.box", - "type": "vagrant" - } - ], - "provisioners": [ - { - "environment_vars": [ - "HOME_DIR=/home/vagrant", - "http_proxy={{user `http_proxy`}}", - "https_proxy={{user `https_proxy`}}", - "no_proxy={{user `no_proxy`}}" - ], - "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", - "expect_disconnect": true, - "scripts": [ - "{{template_dir}}/scripts/update.sh", - "{{template_dir}}/../_common/motd.sh", - "{{template_dir}}/../_common/sshd.sh", - "{{template_dir}}/scripts/networking.sh", - "{{template_dir}}/scripts/sudoers.sh", - "{{template_dir}}/scripts/vagrant.sh", - "{{template_dir}}/../_common/virtualbox.sh", - "{{template_dir}}/scripts/vmware.sh", - "{{template_dir}}/../_common/parallels.sh", - "{{template_dir}}/scripts/hyperv.sh", - "{{template_dir}}/scripts/cleanup.sh", - "{{template_dir}}/../_common/minimize.sh" - ], - "type": "shell" - } - ], - "variables": { - "box_basename": "ubuntu-19.04", - "build_directory": "../../builds", - "http_directory": "{{template_dir}}/http", - "build_timestamp": "{{isotime \"20060102150405\"}}", - "cpus": "1", - "disk_size": "65536", - "git_revision": "__unknown_git_revision__", - "headless": "", - "http_proxy": "{{env `http_proxy`}}", - "https_proxy": "{{env `https_proxy`}}", - "hyperv_generation": "2", - "hyperv_switch": "{{env `hyperv_switch`}}", - "guest_additions_url": "", - "iso_checksum": "7e8a0d07522f591dfee9bc9fcd7c05466763161e6cb0117906655bce1750b2fa", - "iso_checksum_type": "sha256", - "iso_name": "ubuntu-19.04-server-amd64.iso", - "memory": "1024", - "mirror": "http://cdimage.ubuntu.com", - "mirror_directory": "ubuntu/releases/19.04/release", - "name": "ubuntu-19.04", - "no_proxy": "{{env `no_proxy`}}", - "preseed_path": "preseed.cfg", - "template": "ubuntu-19.04-amd64", - "version": "TIMESTAMP" - } -} From 23d78cb4d0989b6fa145eb881c182480e32839f3 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Tue, 4 Feb 2020 13:14:59 -0800 Subject: [PATCH 1138/1622] Remove EOL CentOS 5 CentOS 5 went EOL about 3 years ago. It's time for folks to move on. Signed-off-by: Tim Smith <tsmith@chef.io> --- builds.yml | 3 - packer_templates/centos/centos-5.11-i386.json | 189 ------------------ .../centos/centos-5.11-x86_64.json | 189 ------------------ packer_templates/centos/http/5/ks.cfg | 78 -------- .../centos/scripts/enable_vault.sh | 38 ---- 5 files changed, 497 deletions(-) delete mode 100644 packer_templates/centos/centos-5.11-i386.json delete mode 100644 packer_templates/centos/centos-5.11-x86_64.json delete mode 100644 packer_templates/centos/http/5/ks.cfg delete mode 100644 packer_templates/centos/scripts/enable_vault.sh diff --git a/builds.yml b/builds.yml index 7ab5d5cc5..435823b68 100644 --- a/builds.yml +++ b/builds.yml @@ -1,8 +1,6 @@ --- public: - 'amazon-2' -- 'centos-5.11-i386' -- 'centos-5.11' - 'centos-6.10-i386' - 'centos-6.10' - 'centos-7.7' @@ -37,7 +35,6 @@ public: # slug box name: text string from standard box name to match (generally the same) slugs: - 'centos-5': 'centos-5' 'centos-6': 'centos-6' 'centos-7': 'centos-7' 'centos-8': 'centos-8' diff --git a/packer_templates/centos/centos-5.11-i386.json b/packer_templates/centos/centos-5.11-i386.json deleted file mode 100644 index 08ea40a7a..000000000 --- a/packer_templates/centos/centos-5.11-i386.json +++ /dev/null @@ -1,189 +0,0 @@ -{ - "builders": [ - { - "boot_command": [ - "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "guest_additions_url": "{{ user `guest_additions_url` }}", - "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", - "guest_os_type": "RedHat", - "hard_drive_interface": "sata", - "headless": "{{ user `headless` }}", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-virtualbox", - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "virtualbox-iso", - "memory": "{{ user `memory` }}", - "cpus": "{{ user `cpus` }}", - "virtualbox_version_file": ".vbox_version", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "centos", - "headless": "{{ user `headless` }}", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-vmware", - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "tools_upload_flavor": "linux", - "type": "vmware-iso", - "vm_name": "{{ user `template` }}", - "memory": "{{ user `memory` }}", - "cpus": "{{ user `cpus` }}", - "vmx_data": { - "cpuid.coresPerSocket": "1" - }, - "vmx_remove_ethernet_interfaces": true - }, - { - "boot_command": [ - "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "centos", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-parallels", - "parallels_tools_flavor": "lin", - "memory": "{{ user `memory` }}", - "cpus": "{{ user `cpus` }}", - "prlctl_version_file": ".prlctl_version", - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "parallels-iso", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<wait5><tab> text ks=hd:fd0:/ks.cfg<enter><wait5><esc>" - ], - "boot_wait": "10s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "floppy_files": [ - "{{user `http_directory`}}/{{user `ks_path`}}" - ], - "generation": "{{user `hyperv_generation`}}", - "guest_additions_mode": "disable", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-hyperv", - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "switch_name": "{{ user `hyperv_switch`}}", - "type": "hyperv-iso", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" - ], - "boot_wait": "10s", - "memory": "{{ user `memory` }}", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "headless": "{{ user `headless` }}", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-qemu", - "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "qemu", - "vm_name": "{{ user `template` }}" - } - ], - "post-processors": [ - { - "output": "{{ user `build_directory` }}/{{user `box_basename`}}.{{.Provider}}.box", - "type": "vagrant" - } - ], - "provisioners": [ - { - "environment_vars": [ - "HOME_DIR=/home/vagrant", - "http_proxy={{user `http_proxy`}}", - "https_proxy={{user `https_proxy`}}", - "no_proxy={{user `no_proxy`}}" - ], - "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", - "expect_disconnect": true, - "scripts": [ - "{{template_dir}}/scripts/enable_vault.sh", - "{{template_dir}}/scripts/update.sh", - "{{template_dir}}/../_common/motd.sh", - "{{template_dir}}/../_common/sshd.sh", - "{{template_dir}}/scripts/networking.sh", - "{{template_dir}}/../_common/vagrant.sh", - "{{template_dir}}/../_common/virtualbox.sh", - "{{template_dir}}/../_common/vmware.sh", - "{{template_dir}}/../_common/parallels.sh", - "{{template_dir}}/scripts/cleanup.sh", - "{{template_dir}}/../_common/minimize.sh" - ], - "type": "shell" - } - ], - "variables": { - "box_basename": "centos-5.11-i386", - "build_directory": "../../builds", - "http_directory": "{{template_dir}}/http", - "build_timestamp": "{{isotime \"20060102150405\"}}", - "cpus": "1", - "disk_size": "65536", - "git_revision": "__unknown_git_revision__", - "headless": "", - "http_proxy": "{{env `http_proxy`}}", - "https_proxy": "{{env `https_proxy`}}", - "hyperv_generation": "1", - "guest_additions_url": "", - "iso_checksum": "66d7aa1be7f7aa327b823a706b04b37e219cea67c4eadd9185e8de5e3c4fb08d", - "iso_checksum_type": "sha256", - "iso_name": "CentOS-5.11-i386-bin-DVD-1of2.iso", - "ks_path": "5/ks.cfg", - "memory": "1024", - "mirror": "https://archive.kernel.org", - "mirror_directory": "centos-vault/5.11/isos/i386", - "name": "centos-5.11-i386", - "no_proxy": "{{env `no_proxy`}}", - "template": "centos-5.11-i386", - "version": "TIMESTAMP" - } -} diff --git a/packer_templates/centos/centos-5.11-x86_64.json b/packer_templates/centos/centos-5.11-x86_64.json deleted file mode 100644 index e4239cd2a..000000000 --- a/packer_templates/centos/centos-5.11-x86_64.json +++ /dev/null @@ -1,189 +0,0 @@ -{ - "builders": [ - { - "boot_command": [ - "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "guest_additions_url": "{{ user `guest_additions_url` }}", - "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", - "guest_os_type": "RedHat_64", - "hard_drive_interface": "sata", - "headless": "{{ user `headless` }}", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-virtualbox", - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "virtualbox-iso", - "memory": "{{ user `memory` }}", - "cpus": "{{ user `cpus` }}", - "virtualbox_version_file": ".vbox_version", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<up><wait><tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "centos-64", - "headless": "{{ user `headless` }}", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-vmware", - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "tools_upload_flavor": "linux", - "type": "vmware-iso", - "vm_name": "{{ user `template` }}", - "memory": "{{ user `memory` }}", - "cpus": "{{ user `cpus` }}", - "vmx_data": { - "cpuid.coresPerSocket": "1" - }, - "vmx_remove_ethernet_interfaces": true - }, - { - "boot_command": [ - "<up><wait><tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" - ], - "boot_wait": "10s", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "centos", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-parallels", - "parallels_tools_flavor": "lin", - "memory": "{{ user `memory` }}", - "cpus": "{{ user `cpus` }}", - "prlctl_version_file": ".prlctl_version", - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "parallels-iso", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<wait5><tab> text ks=hd:fd0:/ks.cfg<enter><wait5><esc>" - ], - "boot_wait": "10s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "floppy_files": [ - "{{user `http_directory`}}/{{user `ks_path`}}" - ], - "generation": "{{user `hyperv_generation`}}", - "guest_additions_mode": "disable", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-hyperv", - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "switch_name": "{{ user `hyperv_switch`}}", - "type": "hyperv-iso", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<up><wait><tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" - ], - "boot_wait": "10s", - "memory": "{{ user `memory` }}", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "headless": "{{ user `headless` }}", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-qemu", - "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "qemu", - "vm_name": "{{ user `template` }}" - } - ], - "post-processors": [ - { - "output": "{{ user `build_directory` }}/{{user `box_basename`}}.{{.Provider}}.box", - "type": "vagrant" - } - ], - "provisioners": [ - { - "environment_vars": [ - "HOME_DIR=/home/vagrant", - "http_proxy={{user `http_proxy`}}", - "https_proxy={{user `https_proxy`}}", - "no_proxy={{user `no_proxy`}}" - ], - "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", - "expect_disconnect": true, - "scripts": [ - "{{template_dir}}/scripts/enable_vault.sh", - "{{template_dir}}/scripts/update.sh", - "{{template_dir}}/../_common/motd.sh", - "{{template_dir}}/../_common/sshd.sh", - "{{template_dir}}/scripts/networking.sh", - "{{template_dir}}/../_common/vagrant.sh", - "{{template_dir}}/../_common/virtualbox.sh", - "{{template_dir}}/../_common/vmware.sh", - "{{template_dir}}/../_common/parallels.sh", - "{{template_dir}}/scripts/cleanup.sh", - "{{template_dir}}/../_common/minimize.sh" - ], - "type": "shell" - } - ], - "variables": { - "box_basename": "centos-5.11", - "build_directory": "../../builds", - "http_directory": "{{template_dir}}/http", - "build_timestamp": "{{isotime \"20060102150405\"}}", - "cpus": "1", - "disk_size": "65536", - "git_revision": "__unknown_git_revision__", - "headless": "", - "http_proxy": "{{env `http_proxy`}}", - "https_proxy": "{{env `https_proxy`}}", - "hyperv_generation": "1", - "guest_additions_url": "", - "iso_checksum": "b6eb0565b636513b90663ff01c6ec4da5058baff0d7d4007d187be997dd985f8", - "iso_checksum_type": "sha256", - "iso_name": "CentOS-5.11-x86_64-bin-DVD-1of2.iso", - "ks_path": "5/ks.cfg", - "memory": "1024", - "mirror": "https://archive.kernel.org", - "mirror_directory": "centos-vault/5.11/isos/x86_64", - "name": "centos-5.11", - "no_proxy": "{{env `no_proxy`}}", - "template": "centos-5.11-x86_64", - "version": "TIMESTAMP" - } -} diff --git a/packer_templates/centos/http/5/ks.cfg b/packer_templates/centos/http/5/ks.cfg deleted file mode 100644 index 2884f561f..000000000 --- a/packer_templates/centos/http/5/ks.cfg +++ /dev/null @@ -1,78 +0,0 @@ -install -cdrom -lang en_US.UTF-8 -keyboard us -network --bootproto=dhcp -rootpw vagrant -firewall --disabled -authconfig --enableshadow --passalgo=sha512 -selinux --permissive -timezone UTC -bootloader --location=mbr -text -skipx -zerombr -clearpart --all --initlabel -autopart -firstboot --disabled -reboot -user --name=vagrant --password vagrant -key --skip - -%packages --nobase --ignoremissing --excludedocs -# vagrant needs this to copy initial files via scp -openssh-clients -openssh-server -bzip2 -curl -dhclient -gcc -kernel-devel -kernel-headers -make -nfs-utils -perl -sudo -wget -yum --fprintd-pam --intltool --avahi --bluez-utils --dogtail --kudzu -# unnecessary firmware --aic94xx-firmware --atmel-firmware --b43-openfwwf --bfa-firmware --ipw2100-firmware --ipw2200-firmware --ivtv-firmware --iwl100-firmware --iwl1000-firmware --iwl3945-firmware --iwl4965-firmware --iwl5000-firmware --iwl5150-firmware --iwl6000-firmware --iwl6000g2a-firmware --iwl6050-firmware --libertas-usb8388-firmware --ql2100-firmware --ql2200-firmware --ql23xx-firmware --ql2400-firmware --ql2500-firmware --rt61pci-firmware --rt73usb-firmware --xorg-x11-drv-ati-firmware --zd1211-firmware -# Not Needed --selinux-policy --selinux-policy-targeted - -%post -# sudo -echo "vagrant ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers -sed -i "s/^[^#].*requiretty/#Defaults requiretty/" /etc/sudoers diff --git a/packer_templates/centos/scripts/enable_vault.sh b/packer_templates/centos/scripts/enable_vault.sh deleted file mode 100644 index 8f352353f..000000000 --- a/packer_templates/centos/scripts/enable_vault.sh +++ /dev/null @@ -1,38 +0,0 @@ -#!/bin/sh -eux - -for F in /etc/yum.repos.d/*.repo; do - #sed --in-place=.orig 's/enabled=1/enabled=0/' $F - echo "# EOL DISTRO - SETTINGS IN Bento-Vault.repo" > $F -done - -cat <<_EOF_ | cat > /etc/yum.repos.d/Bento-Vault.repo -#BENTO-BEGIN -[C5.11-base] -name=CentOS-5.11 - Base -baseurl=http://vault.centos.org/5.11/os/\$basearch/ -gpgcheck=1 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-5 -enabled=1 - -[C5.11-updates] -name=CentOS-5.11 - Updates -baseurl=http://vault.centos.org/5.11/updates/\$basearch/ -gpgcheck=1 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-5 -enabled=1 - -[C5.11-extras] -name=CentOS-5.11 - Extras -baseurl=http://vault.centos.org/5.11/extras/\$basearch/ -gpgcheck=1 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-5 -enabled=1 - -[C5.11-centosplus] -name=CentOS-5.11 - Plus -baseurl=http://vault.centos.org/5.11/centosplus/\$basearch/ -gpgcheck=1 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-5 -enabled=1 -#BENTO-END -_EOF_ From e644f7694bac76e44de423317723fa0458313dcd Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Wed, 5 Feb 2020 09:30:23 -0800 Subject: [PATCH 1139/1622] Build the windows boxes on Parallels as well Why not Signed-off-by: Tim Smith <tsmith@chef.io> --- packer_templates/windows/windows-10.json | 26 ++++++++++++++++++++ packer_templates/windows/windows-2012r2.json | 24 ++++++++++++++++++ packer_templates/windows/windows-2016.json | 24 ++++++++++++++++++ packer_templates/windows/windows-2019.json | 24 ++++++++++++++++++ 4 files changed, 98 insertions(+) diff --git a/packer_templates/windows/windows-10.json b/packer_templates/windows/windows-10.json index 4cd6e9e59..e1c4fd2c4 100644 --- a/packer_templates/windows/windows-10.json +++ b/packer_templates/windows/windows-10.json @@ -29,6 +29,32 @@ "{{template_dir}}/scripts/base_setup.ps1" ] }, + { + "type": "parallels-iso", + "memory": "{{ user `memory` }}", + "cpus": "{{ user `cpus` }}", + "guest_os_type": "win-10", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_checksum_type": "sha1", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-parallels", + "parallels_tools_flavor": "win", + "parallels_tools_mode" : "attach", + "prlctl_version_file": ".prlctl_version", + "communicator": "winrm", + "winrm_username": "vagrant", + "winrm_password": "vagrant", + "winrm_timeout": "12h", + "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"", + "shutdown_timeout": "15m", + "prlctl": [ + ["set", "{{.Name}}", "--efi-boot", "off"] + ], + "floppy_files": [ + "{{ user `floppy_dir` }}/{{ user `unattended_file_path` }}", + "{{template_dir}}/scripts/base_setup.ps1" + ] + }, { "type": "vmware-iso", "memory": "{{ user `memory` }}", diff --git a/packer_templates/windows/windows-2012r2.json b/packer_templates/windows/windows-2012r2.json index 318ce34d5..7d671edc4 100644 --- a/packer_templates/windows/windows-2012r2.json +++ b/packer_templates/windows/windows-2012r2.json @@ -28,6 +28,30 @@ "{{ user `floppy_dir` }}/{{ user `unattended_file_path` }}" ] }, + { + "type": "parallels-iso", + "memory": "{{ user `memory` }}", + "cpus": "{{ user `cpus` }}", + "guest_os_type": "win-2012", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_checksum_type": "sha1", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-parallels", + "parallels_tools_flavor": "win", + "prlctl_version_file": ".prlctl_version", + "communicator": "winrm", + "winrm_username": "vagrant", + "winrm_password": "vagrant", + "winrm_timeout": "12h", + "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"", + "shutdown_timeout": "15m", + "prlctl": [ + ["set", "{{.Name}}", "--efi-boot", "off"] + ], + "floppy_files": [ + "{{ user `floppy_dir` }}/{{ user `unattended_file_path` }}" + ] + }, { "type": "vmware-iso", "memory": "{{ user `memory` }}", diff --git a/packer_templates/windows/windows-2016.json b/packer_templates/windows/windows-2016.json index f6bb7cd85..7b17ca69f 100644 --- a/packer_templates/windows/windows-2016.json +++ b/packer_templates/windows/windows-2016.json @@ -28,6 +28,30 @@ "{{ user `floppy_dir` }}/{{ user `unattended_file_path` }}" ] }, + { + "type": "parallels-iso", + "memory": "{{ user `memory` }}", + "cpus": "{{ user `cpus` }}", + "guest_os_type": "win-2016", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_checksum_type": "sha1", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-parallels", + "parallels_tools_flavor": "win", + "prlctl_version_file": ".prlctl_version", + "communicator": "winrm", + "winrm_username": "vagrant", + "winrm_password": "vagrant", + "winrm_timeout": "12h", + "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"", + "shutdown_timeout": "15m", + "prlctl": [ + ["set", "{{.Name}}", "--efi-boot", "off"] + ], + "floppy_files": [ + "{{ user `floppy_dir` }}/{{ user `unattended_file_path` }}" + ] + }, { "type": "vmware-iso", "memory": "{{ user `memory` }}", diff --git a/packer_templates/windows/windows-2019.json b/packer_templates/windows/windows-2019.json index 38dd807a3..9310c4ddf 100644 --- a/packer_templates/windows/windows-2019.json +++ b/packer_templates/windows/windows-2019.json @@ -28,6 +28,30 @@ "{{ user `floppy_dir` }}/{{ user `unattended_file_path` }}" ] }, + { + "type": "parallels-iso", + "memory": "{{ user `memory` }}", + "cpus": "{{ user `cpus` }}", + "guest_os_type": "win-2019", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_checksum_type": "sha1", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-parallels", + "parallels_tools_flavor": "win", + "prlctl_version_file": ".prlctl_version", + "communicator": "winrm", + "winrm_username": "vagrant", + "winrm_password": "vagrant", + "winrm_timeout": "12h", + "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"", + "shutdown_timeout": "15m", + "prlctl": [ + ["set", "{{.Name}}", "--efi-boot", "off"] + ], + "floppy_files": [ + "{{ user `floppy_dir` }}/{{ user `unattended_file_path` }}" + ] + }, { "type": "vmware-iso", "memory": "{{ user `memory` }}", From 91ea78dad50381e3276d012fa760ade66b599eb2 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Wed, 5 Feb 2020 09:31:06 -0800 Subject: [PATCH 1140/1622] Bump the vmware hardware version requires to 11 on windows 11 is asking folks to have a 6 year old hypervisor. Seems pretty fair and this resolves issues on some windows systems. Signed-off-by: Tim Smith <tsmith@chef.io> --- packer_templates/windows/windows-10.json | 1 + packer_templates/windows/windows-2008r2.json | 1 + packer_templates/windows/windows-2012r2.json | 1 + packer_templates/windows/windows-2016.json | 1 + packer_templates/windows/windows-2019.json | 1 + 5 files changed, 5 insertions(+) diff --git a/packer_templates/windows/windows-10.json b/packer_templates/windows/windows-10.json index e1c4fd2c4..8c615acd3 100644 --- a/packer_templates/windows/windows-10.json +++ b/packer_templates/windows/windows-10.json @@ -57,6 +57,7 @@ }, { "type": "vmware-iso", + "version": 11, "memory": "{{ user `memory` }}", "cpus": "{{ user `cpus` }}", "disk_adapter_type": "lsisas1068", diff --git a/packer_templates/windows/windows-2008r2.json b/packer_templates/windows/windows-2008r2.json index 5aef15543..6a6b622c1 100644 --- a/packer_templates/windows/windows-2008r2.json +++ b/packer_templates/windows/windows-2008r2.json @@ -30,6 +30,7 @@ }, { "type": "vmware-iso", + "version": 11, "memory": "{{ user `memory` }}", "cpus": "{{ user `cpus` }}", "disk_adapter_type": "lsisas1068", diff --git a/packer_templates/windows/windows-2012r2.json b/packer_templates/windows/windows-2012r2.json index 7d671edc4..c0fdc40b3 100644 --- a/packer_templates/windows/windows-2012r2.json +++ b/packer_templates/windows/windows-2012r2.json @@ -54,6 +54,7 @@ }, { "type": "vmware-iso", + "version": 11, "memory": "{{ user `memory` }}", "cpus": "{{ user `cpus` }}", "disk_adapter_type": "lsisas1068", diff --git a/packer_templates/windows/windows-2016.json b/packer_templates/windows/windows-2016.json index 7b17ca69f..670b59a9f 100644 --- a/packer_templates/windows/windows-2016.json +++ b/packer_templates/windows/windows-2016.json @@ -54,6 +54,7 @@ }, { "type": "vmware-iso", + "version": 11, "memory": "{{ user `memory` }}", "cpus": "{{ user `cpus` }}", "disk_adapter_type": "lsisas1068", diff --git a/packer_templates/windows/windows-2019.json b/packer_templates/windows/windows-2019.json index 9310c4ddf..8832b8bbb 100644 --- a/packer_templates/windows/windows-2019.json +++ b/packer_templates/windows/windows-2019.json @@ -54,6 +54,7 @@ }, { "type": "vmware-iso", + "version": 11, "memory": "{{ user `memory` }}", "cpus": "{{ user `cpus` }}", "disk_adapter_type": "lsisas1068", From 0ac780669b7392c1464ed33ad845f4bf7addc929 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Wed, 5 Feb 2020 09:31:22 -0800 Subject: [PATCH 1141/1622] Remove the Windows 7 definition It's time Signed-off-by: Tim Smith <tsmith@chef.io> --- packer_templates/windows/windows-7.json | 99 ------------------------- 1 file changed, 99 deletions(-) delete mode 100644 packer_templates/windows/windows-7.json diff --git a/packer_templates/windows/windows-7.json b/packer_templates/windows/windows-7.json deleted file mode 100644 index c31017f2e..000000000 --- a/packer_templates/windows/windows-7.json +++ /dev/null @@ -1,99 +0,0 @@ -{ - "builders": [{ - "type": "virtualbox-iso", - "vboxmanage": [ - ["modifyvm", "{{.Name}}", "--vram", "48"], - ["modifyvm", "{{.Name}}", "--audio", "none"] - ], - "memory": "{{ user `memory` }}", - "cpus": "{{ user `cpus` }}", - "guest_additions_mode": "{{ user `guest_additions_mode` }}", - "guest_additions_url": "{{ user `guest_additions_url` }}", - "guest_additions_path": "C:/users/vagrant/VBoxGuestAdditions.iso", - "guest_os_type": "Windows7_64", - "hard_drive_interface": "sata", - "iso_interface": "sata", - "headless": "{{ user `headless` }}", - "iso_url": "{{ user `iso_url` }}", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "sha1", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-virtualbox", - "communicator": "winrm", - "winrm_username": "vagrant", - "winrm_password": "vagrant", - "winrm_timeout": "12h", - "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"", - "shutdown_timeout": "15m", - "floppy_files": [ - "{{ user `floppy_dir` }}/{{ user `unattended_file_path` }}" - ] - }], - "provisioners": [{ - "type": "chef-solo", - "cookbook_paths": ["{{template_dir}}/cookbooks"], - "guest_os_type": "windows", - "run_list": [ - "packer::disable_uac", - "packer::disable_restore", - "packer::disable_windows_update", - "packer::remove_defender", - "packer::configure_power", - "packer::disable_screensaver" - ] - }, - { - "type": "windows-restart" - }, - { - "type": "chef-solo", - "cookbook_paths": ["{{template_dir}}/cookbooks"], - "guest_os_type": "windows", - "run_list": [ - "packer::vm_tools", - "packer::features", - "packer::enable_file_sharing", - "packer::enable_remote_desktop", - "packer::ui_tweaks" - ] - }, - { - "type": "windows-restart" - }, - { - "type": "chef-solo", - "cookbook_paths": ["{{template_dir}}/cookbooks"], - "guest_os_type": "windows", - "run_list": [ - "packer::cleanup", - "packer::defrag" - ] - }, - { - "type": "powershell", - "script": "{{template_dir}}/scripts/cleanup.ps1", - "elevated_user": "vagrant", - "elevated_password": "vagrant" - } - ], - "post-processors": [ - [{ - "type": "vagrant", - "keep_input_artifact": true, - "output": "{{ user `template` }}-{{.Provider}}.box", - "vagrantfile_template": "{{template_dir}}/vagrantfile-windows.template" - }] - ], - "variables": { - "memory": "4096", - "cpus": "2", - "guest_additions_mode": "attach", - "guest_additions_url": "", - "headless": "false", - "iso_checksum": "971fc00183a52c152fe924a6b99fdec011a871c2", - "iso_url": "http://care.dlservice.microsoft.com/dl/download/evalx/win7/x86/EN/7600.16385.090713-1255_x86fre_enterprise_en-us_EVAL_Eval_Enterprise-GRMCENEVAL_EN_DVD.iso", - "build_directory": "../../builds", - "floppy_dir": "{{template_dir}}/answer_files", - "unattended_file_path": "7/Autounattend.xml", - "template": "windows-7" - } -} From 1911491ee6d6353960f41d2a56d1b25d646b7d08 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Wed, 5 Feb 2020 12:32:09 -0800 Subject: [PATCH 1142/1622] Add parallels to Windows 2008 R2 Signed-off-by: Tim Smith <tsmith@chef.io> --- packer_templates/windows/windows-2008r2.json | 24 ++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/packer_templates/windows/windows-2008r2.json b/packer_templates/windows/windows-2008r2.json index 6a6b622c1..022a4f0ad 100644 --- a/packer_templates/windows/windows-2008r2.json +++ b/packer_templates/windows/windows-2008r2.json @@ -28,6 +28,30 @@ "{{ user `floppy_dir` }}/{{ user `unattended_file_path` }}" ] }, + { + "type": "parallels-iso", + "memory": "{{ user `memory` }}", + "cpus": "{{ user `cpus` }}", + "guest_os_type": "win-2008", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_checksum_type": "sha1", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-parallels", + "parallels_tools_flavor": "win", + "prlctl_version_file": ".prlctl_version", + "communicator": "winrm", + "winrm_username": "vagrant", + "winrm_password": "vagrant", + "winrm_timeout": "12h", + "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"", + "shutdown_timeout": "15m", + "prlctl": [ + ["set", "{{.Name}}", "--efi-boot", "off"] + ], + "floppy_files": [ + "{{ user `floppy_dir` }}/{{ user `unattended_file_path` }}" + ] + }, { "type": "vmware-iso", "version": 11, From 08bf811c5f7257d46aa0dfe07189d6822d00f3a1 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Wed, 5 Feb 2020 12:33:58 -0800 Subject: [PATCH 1143/1622] Make it easier to diff the answer files Signed-off-by: Tim Smith <tsmith@chef.io> --- .../windows/answer_files/10/Autounattend.xml | 21 ++++++++++--------- .../answer_files/2008_r2/Autounattend.xml | 10 ++++----- .../answer_files/2012_r2/Autounattend.xml | 11 +++++----- .../answer_files/2016/Autounattend.xml | 9 ++++---- .../answer_files/2019/Autounattend.xml | 9 ++++---- 5 files changed, 32 insertions(+), 28 deletions(-) diff --git a/packer_templates/windows/answer_files/10/Autounattend.xml b/packer_templates/windows/answer_files/10/Autounattend.xml index 2679e7321..173416a9a 100644 --- a/packer_templates/windows/answer_files/10/Autounattend.xml +++ b/packer_templates/windows/answer_files/10/Autounattend.xml @@ -54,7 +54,7 @@ </PathAndCredentials> </DriverPaths> </component> - <component xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" name="Microsoft-Windows-International-Core-WinPE" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> + <component name="Microsoft-Windows-International-Core-WinPE" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> <SetupUILanguage> <UILanguage>en-US</UILanguage> </SetupUILanguage> @@ -64,7 +64,7 @@ <UILanguageFallback>en-US</UILanguageFallback> <UserLocale>en-US</UserLocale> </component> - <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 name="Microsoft-Windows-Setup" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> <DiskConfiguration> <Disk wcm:action="add"> <CreatePartitions> @@ -124,22 +124,22 @@ </component> </settings> <settings pass="generalize"> - <component xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" name="Microsoft-Windows-Security-SPP" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> + <component name="Microsoft-Windows-Security-SPP" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> <SkipRearm>1</SkipRearm> </component> - <component xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" name="Microsoft-Windows-PnpSysprep" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> + <component name="Microsoft-Windows-PnpSysprep" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> <PersistAllDeviceInstalls>false</PersistAllDeviceInstalls> <DoNotCleanUpNonPresentDevices>false</DoNotCleanUpNonPresentDevices> </component> </settings> <settings pass="oobeSystem"> - <component xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" name="Microsoft-Windows-International-Core" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> + <component name="Microsoft-Windows-International-Core" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> <InputLocale>en-US</InputLocale> <SystemLocale>en-US</SystemLocale> <UILanguage>en-US</UILanguage> <UserLocale>en-US</UserLocale> </component> - <component xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" name="Microsoft-Windows-Shell-Setup" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> + <component name="Microsoft-Windows-Shell-Setup" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> <OOBE> <HideEULAPage>true</HideEULAPage> <HideLocalAccountScreen>true</HideLocalAccountScreen> @@ -163,10 +163,10 @@ <Value>vagrant</Value> <PlainText>true</PlainText> </Password> - <Group>Administrators</Group> - <DisplayName>Vagrant</DisplayName> - <Name>vagrant</Name> <Description>Vagrant User</Description> + <DisplayName>vagrant</DisplayName> + <Group>administrators</Group> + <Name>vagrant</Name> </LocalAccount> </LocalAccounts> </UserAccounts> @@ -175,8 +175,8 @@ <Value>vagrant</Value> <PlainText>true</PlainText> </Password> - <Enabled>true</Enabled> <Username>vagrant</Username> + <Enabled>true</Enabled> </AutoLogon> <FirstLogonCommands> <SynchronousCommand wcm:action="add"> @@ -210,6 +210,7 @@ <DoNotOpenServerManagerAtLogon>true</DoNotOpenServerManagerAtLogon> </component> <component xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" name="Microsoft-Windows-IE-ESC" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> + <!-- Disable IE ESC. --> <IEHardenAdmin>false</IEHardenAdmin> <IEHardenUser>false</IEHardenUser> </component> diff --git a/packer_templates/windows/answer_files/2008_r2/Autounattend.xml b/packer_templates/windows/answer_files/2008_r2/Autounattend.xml index 04ef491b3..6c6cbabc1 100644 --- a/packer_templates/windows/answer_files/2008_r2/Autounattend.xml +++ b/packer_templates/windows/answer_files/2008_r2/Autounattend.xml @@ -80,6 +80,11 @@ </settings> <settings pass="oobeSystem"> <component xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" name="Microsoft-Windows-Shell-Setup" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> + <OOBE> + <HideEULAPage>true</HideEULAPage> + <HideWirelessSetupInOOBE>true</HideWirelessSetupInOOBE> + <NetworkLocation>Home</NetworkLocation> + </OOBE> <UserAccounts> <AdministratorPassword> <Value>vagrant</Value> @@ -98,11 +103,6 @@ </LocalAccount> </LocalAccounts> </UserAccounts> - <OOBE> - <HideEULAPage>true</HideEULAPage> - <HideWirelessSetupInOOBE>true</HideWirelessSetupInOOBE> - <NetworkLocation>Home</NetworkLocation> - </OOBE> <AutoLogon> <Password> <Value>vagrant</Value> diff --git a/packer_templates/windows/answer_files/2012_r2/Autounattend.xml b/packer_templates/windows/answer_files/2012_r2/Autounattend.xml index b68fdf4a1..4c020b308 100644 --- a/packer_templates/windows/answer_files/2012_r2/Autounattend.xml +++ b/packer_templates/windows/answer_files/2012_r2/Autounattend.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <unattend xmlns="urn:schemas-microsoft-com:unattend"> <settings pass="windowsPE"> - <component name="Microsoft-Windows-PnpCustomizationsWinPE" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" processorArchitecture="amd64" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State"> + <component name="Microsoft-Windows-PnpCustomizationsWinPE" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> <!-- This makes the VirtIO drivers available to Windows, assuming that the VirtIO driver disk at https://fedorapeople.org/groups/virt/virtio-win/direct-downloads/stable-virtio/virtio-win.iso @@ -159,10 +159,10 @@ <Value>vagrant</Value> <PlainText>true</PlainText> </Password> - <Group>Administrators</Group> - <DisplayName>Vagrant</DisplayName> - <Name>vagrant</Name> <Description>Vagrant User</Description> + <DisplayName>vagrant</DisplayName> + <Group>administrators</Group> + <Name>vagrant</Name> </LocalAccount> </LocalAccounts> </UserAccounts> @@ -171,8 +171,8 @@ <Value>vagrant</Value> <PlainText>true</PlainText> </Password> - <Enabled>true</Enabled> <Username>vagrant</Username> + <Enabled>true</Enabled> </AutoLogon> <FirstLogonCommands> <SynchronousCommand wcm:action="add"> @@ -278,6 +278,7 @@ <DoNotOpenServerManagerAtLogon>true</DoNotOpenServerManagerAtLogon> </component> <component xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" name="Microsoft-Windows-IE-ESC" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> + <!-- Disable IE ESC. --> <IEHardenAdmin>false</IEHardenAdmin> <IEHardenUser>false</IEHardenUser> </component> diff --git a/packer_templates/windows/answer_files/2016/Autounattend.xml b/packer_templates/windows/answer_files/2016/Autounattend.xml index 50e74334c..7b2f80ba8 100644 --- a/packer_templates/windows/answer_files/2016/Autounattend.xml +++ b/packer_templates/windows/answer_files/2016/Autounattend.xml @@ -159,10 +159,10 @@ <Value>vagrant</Value> <PlainText>true</PlainText> </Password> - <Group>Administrators</Group> - <DisplayName>Vagrant</DisplayName> - <Name>vagrant</Name> <Description>Vagrant User</Description> + <DisplayName>vagrant</DisplayName> + <Group>administrators</Group> + <Name>vagrant</Name> </LocalAccount> </LocalAccounts> </UserAccounts> @@ -171,8 +171,8 @@ <Value>vagrant</Value> <PlainText>true</PlainText> </Password> - <Enabled>true</Enabled> <Username>vagrant</Username> + <Enabled>true</Enabled> </AutoLogon> <FirstLogonCommands> <SynchronousCommand wcm:action="add"> @@ -278,6 +278,7 @@ <DoNotOpenServerManagerAtLogon>true</DoNotOpenServerManagerAtLogon> </component> <component xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" name="Microsoft-Windows-IE-ESC" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> + <!-- Disable IE ESC. --> <IEHardenAdmin>false</IEHardenAdmin> <IEHardenUser>false</IEHardenUser> </component> diff --git a/packer_templates/windows/answer_files/2019/Autounattend.xml b/packer_templates/windows/answer_files/2019/Autounattend.xml index 4737d13ae..4dd84f9de 100644 --- a/packer_templates/windows/answer_files/2019/Autounattend.xml +++ b/packer_templates/windows/answer_files/2019/Autounattend.xml @@ -159,10 +159,10 @@ <Value>vagrant</Value> <PlainText>true</PlainText> </Password> - <Group>Administrators</Group> - <DisplayName>Vagrant</DisplayName> - <Name>vagrant</Name> <Description>Vagrant User</Description> + <DisplayName>vagrant</DisplayName> + <Group>administrators</Group> + <Name>vagrant</Name> </LocalAccount> </LocalAccounts> </UserAccounts> @@ -171,8 +171,8 @@ <Value>vagrant</Value> <PlainText>true</PlainText> </Password> - <Enabled>true</Enabled> <Username>vagrant</Username> + <Enabled>true</Enabled> </AutoLogon> <FirstLogonCommands> <SynchronousCommand wcm:action="add"> @@ -278,6 +278,7 @@ <DoNotOpenServerManagerAtLogon>true</DoNotOpenServerManagerAtLogon> </component> <component xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" name="Microsoft-Windows-IE-ESC" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> + <!-- Disable IE ESC. --> <IEHardenAdmin>false</IEHardenAdmin> <IEHardenUser>false</IEHardenUser> </component> From 874a466725b9a33f3bbeb8635ee0851123c5c5e4 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Wed, 5 Feb 2020 12:34:17 -0800 Subject: [PATCH 1144/1622] Remove the Windows 7 answer file Signed-off-by: Tim Smith <tsmith@chef.io> --- .../windows/answer_files/7/Autounattend.xml | 129 ------------------ 1 file changed, 129 deletions(-) delete mode 100644 packer_templates/windows/answer_files/7/Autounattend.xml diff --git a/packer_templates/windows/answer_files/7/Autounattend.xml b/packer_templates/windows/answer_files/7/Autounattend.xml deleted file mode 100644 index d62421cd0..000000000 --- a/packer_templates/windows/answer_files/7/Autounattend.xml +++ /dev/null @@ -1,129 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<unattend xmlns="urn:schemas-microsoft-com:unattend"> - <servicing/> - <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"> - <CreatePartitions> - <CreatePartition wcm:action="add"> - <Order>1</Order> - <Type>Primary</Type> - <Extend>true</Extend> - </CreatePartition> - </CreatePartitions> - <ModifyPartitions> - <ModifyPartition wcm:action="add"> - <Extend>false</Extend> - <Format>NTFS</Format> - <Letter>C</Letter> - <Order>1</Order> - <PartitionID>1</PartitionID> - <Label>Windows 7</Label> - </ModifyPartition> - </ModifyPartitions> - <DiskID>0</DiskID> - <WillWipeDisk>true</WillWipeDisk> - </Disk> - <WillShowUI>OnError</WillShowUI> - </DiskConfiguration> - <UserData> - <AcceptEula>true</AcceptEula> - <FullName>Vagrant Administrator</FullName> - <Organization>Vagrant Inc.</Organization> - <ProductKey> - <!--<Key>your key here</Key>--> - <WillShowUI>Never</WillShowUI> - </ProductKey> - </UserData> - <ImageInstall> - <OSImage> - <InstallTo> - <DiskID>0</DiskID> - <PartitionID>1</PartitionID> - </InstallTo> - <WillShowUI>OnError</WillShowUI> - <InstallToAvailablePartition>false</InstallToAvailablePartition> - <InstallFrom> - <MetaData wcm:action="add"> - <Key>/IMAGE/NAME</Key> - <Value>Windows 7 ULTIMATE</Value> - </MetaData> - </InstallFrom> - </OSImage> - </ImageInstall> - </component> - <component xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" name="Microsoft-Windows-International-Core-WinPE" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> - <SetupUILanguage> - <UILanguage>en-US</UILanguage> - </SetupUILanguage> - <InputLocale>en-US</InputLocale> - <SystemLocale>en-US</SystemLocale> - <UILanguage>en-US</UILanguage> - <UILanguageFallback>en-US</UILanguageFallback> - <UserLocale>en-US</UserLocale> - </component> - </settings> - <settings pass="offlineServicing"> - <component name="Microsoft-Windows-LUA-Settings" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> - <EnableLUA>false</EnableLUA> - </component> - </settings> - <settings pass="oobeSystem"> - <component xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" name="Microsoft-Windows-Shell-Setup" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> - <UserAccounts> - <AdministratorPassword> - <Value>vagrant</Value> - <PlainText>true</PlainText> - </AdministratorPassword> - <LocalAccounts> - <LocalAccount wcm:action="add"> - <Password> - <Value>vagrant</Value> - <PlainText>true</PlainText> - </Password> - <Description>Vagrant User</Description> - <DisplayName>vagrant</DisplayName> - <Group>administrators</Group> - <Name>vagrant</Name> - </LocalAccount> - </LocalAccounts> - </UserAccounts> - <OOBE> - <HideEULAPage>true</HideEULAPage> - <HideWirelessSetupInOOBE>true</HideWirelessSetupInOOBE> - <NetworkLocation>Home</NetworkLocation> - <ProtectYourPC>1</ProtectYourPC> - </OOBE> - <AutoLogon> - <Password> - <Value>vagrant</Value> - <PlainText>true</PlainText> - </Password> - <Username>vagrant</Username> - <Enabled>true</Enabled> - </AutoLogon> - <FirstLogonCommands> - <SynchronousCommand wcm:action="add"> - <CommandLine>cmd.exe /c C:\Windows\System32\WindowsPowerShell\v1.0\powershell.exe -ExecutionPolicy Bypass -File a:\boxstarter.ps1</CommandLine> - <Order>1</Order> - </SynchronousCommand> - </FirstLogonCommands> - <ShowWindowsLive>false</ShowWindowsLive> - </component> - </settings> - <settings pass="specialize"> - <component name="Microsoft-Windows-Shell-Setup" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> - <OEMInformation> - <HelpCustomized>false</HelpCustomized> - </OEMInformation> - <!-- Rename computer here. --> - <ComputerName>vagrant-7</ComputerName> - <TimeZone>Pacific Standard Time</TimeZone> - <RegisteredOwner/> - </component> - <component xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" name="Microsoft-Windows-Security-SPP-UX" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> - <SkipAutoActivation>true</SkipAutoActivation> - </component> - </settings> -</unattend> \ No newline at end of file From f47bd22812eddfa866b167ea0266cf0ea6b595cc Mon Sep 17 00:00:00 2001 From: bugbuilder <nelson@bennu.cl> Date: Thu, 6 Feb 2020 12:25:41 -0300 Subject: [PATCH 1145/1622] fix: adding qemuargs to mount secondary drive Signed-off-by: bugbuilder <nelson@bennu.cl> --- packer_templates/sles/sles-15-sp1.json | 10 +++++++++- packer_templates/sles/sles-15.json | 9 ++++++++- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/packer_templates/sles/sles-15-sp1.json b/packer_templates/sles/sles-15-sp1.json index c61094a92..e9ae1e6b3 100644 --- a/packer_templates/sles/sles-15-sp1.json +++ b/packer_templates/sles/sles-15-sp1.json @@ -131,7 +131,15 @@ "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", "type": "qemu", - "vm_name": "{{ user `template` }}" + "vm_name": "{{ user `template` }}", + "qemuargs": [ + ["-drive", "file=../../builds/packer-{{user `template`}}-qemu/{{user `template`}},if=virtio,cache=writeback,discard=ignore,format=qcow2"], + ["-drive", "file={{user `mirror`}}/{{user `packages_iso`}},format=raw,if=none,id=cdrom1,readonly=on"], + ["-object", "iothread,id=iothread1"], + ["-device", "virtio-scsi-pci,iothread=iothread1,id=scsi1"], + ["-device", "scsi-cd,bus=scsi1.0,drive=cdrom1"] + ] + } ], "post-processors": [ diff --git a/packer_templates/sles/sles-15.json b/packer_templates/sles/sles-15.json index 4dc77055b..a5f2e9cb9 100644 --- a/packer_templates/sles/sles-15.json +++ b/packer_templates/sles/sles-15.json @@ -131,7 +131,14 @@ "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", "type": "qemu", - "vm_name": "{{ user `template` }}" + "vm_name": "{{ user `template` }}", + "qemuargs": [ + ["-drive", "file=../../builds/packer-{{user `template`}}-qemu/{{user `template`}},if=virtio,cache=writeback,discard=ignore,format=qcow2"], + ["-drive", "file={{user `mirror`}}/{{user `packages_iso`}},format=raw,if=none,id=cdrom1,readonly=on"], + ["-object", "iothread,id=iothread1"], + ["-device", "virtio-scsi-pci,iothread=iothread1,id=scsi1"], + ["-device", "scsi-cd,bus=scsi1.0,drive=cdrom1"] + ] } ], "post-processors": [ From 7717fa70932d9a501e31f533a3f35fc3e9f323d6 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Sun, 9 Feb 2020 20:00:08 -0800 Subject: [PATCH 1146/1622] Sort windows variables Signed-off-by: Tim Smith <tsmith@chef.io> --- packer_templates/windows/windows-10.json | 10 +++++----- packer_templates/windows/windows-2012r2.json | 10 +++++----- packer_templates/windows/windows-2016.json | 10 +++++----- packer_templates/windows/windows-2019.json | 10 +++++----- 4 files changed, 20 insertions(+), 20 deletions(-) diff --git a/packer_templates/windows/windows-10.json b/packer_templates/windows/windows-10.json index 8c615acd3..0464be88b 100644 --- a/packer_templates/windows/windows-10.json +++ b/packer_templates/windows/windows-10.json @@ -162,17 +162,17 @@ }] ], "variables": { - "memory": "4096", + "build_directory": "../../builds", "cpus": "2", + "floppy_dir": "{{template_dir}}/answer_files", "guest_additions_mode": "attach", "guest_additions_url": "", "headless": "true", "iso_checksum": "489ebee676e26cdb81377b0e6385c001a22589b8", "iso_url": "https://software-download.microsoft.com/download/pr/18363.418.191007-0143.19h2_release_svc_refresh_CLIENTENTERPRISEEVAL_OEMRET_x64FRE_en-us.iso", - "build_directory": "../../builds", - "floppy_dir": "{{template_dir}}/answer_files", + "memory": "4096", + "template": "windows-10", "unattended_file_path": "10/Autounattend.xml", - "virtio_win_iso": "~/virtio-win.iso", - "template": "windows-10" + "virtio_win_iso": "~/virtio-win.iso" } } diff --git a/packer_templates/windows/windows-2012r2.json b/packer_templates/windows/windows-2012r2.json index c0fdc40b3..2f82d4fcb 100644 --- a/packer_templates/windows/windows-2012r2.json +++ b/packer_templates/windows/windows-2012r2.json @@ -156,17 +156,17 @@ }] ], "variables": { - "memory": "4096", + "build_directory": "../../builds", "cpus": "2", + "floppy_dir": "{{template_dir}}/answer_files", "guest_additions_mode": "attach", "guest_additions_url": "", "headless": "true", "iso_checksum": "849734f37346385dac2c101e4aacba4626bb141c", "iso_url": "http://download.microsoft.com/download/6/2/A/62A76ABB-9990-4EFC-A4FE-C7D698DAEB96/9600.17050.WINBLUE_REFRESH.140317-1640_X64FRE_SERVER_EVAL_EN-US-IR3_SSS_X64FREE_EN-US_DV9.ISO", - "build_directory": "../../builds", - "floppy_dir": "{{template_dir}}/answer_files", + "memory": "4096", + "template": "windows-2012r2-standard", "unattended_file_path": "2012_r2/Autounattend.xml", - "virtio_win_iso": "~/virtio-win.iso", - "template": "windows-2012r2-standard" + "virtio_win_iso": "~/virtio-win.iso" } } diff --git a/packer_templates/windows/windows-2016.json b/packer_templates/windows/windows-2016.json index 670b59a9f..2388da05f 100644 --- a/packer_templates/windows/windows-2016.json +++ b/packer_templates/windows/windows-2016.json @@ -156,17 +156,17 @@ }] ], "variables": { - "memory": "4096", + "build_directory": "../../builds", "cpus": "2", + "floppy_dir": "{{template_dir}}/answer_files", "guest_additions_mode": "attach", "guest_additions_url": "", "headless": "true", "iso_checksum": "772700802951b36c8cb26a61c040b9a8dc3816a3", "iso_url": "https://software-download.microsoft.com/download/pr/Windows_Server_2016_Datacenter_EVAL_en-us_14393_refresh.ISO", - "build_directory": "../../builds", - "floppy_dir": "{{template_dir}}/answer_files", + "memory": "4096", + "template": "windows-2016-standard", "unattended_file_path": "2016/Autounattend.xml", - "virtio_win_iso": "~/virtio-win.iso", - "template": "windows-2016-standard" + "virtio_win_iso": "~/virtio-win.iso" } } diff --git a/packer_templates/windows/windows-2019.json b/packer_templates/windows/windows-2019.json index 8832b8bbb..ed9e26cc6 100644 --- a/packer_templates/windows/windows-2019.json +++ b/packer_templates/windows/windows-2019.json @@ -156,17 +156,17 @@ }] ], "variables": { - "memory": "4096", + "build_directory": "../../builds", "cpus": "2", + "floppy_dir": "{{template_dir}}/answer_files", "guest_additions_mode": "attach", "guest_additions_url": "", "headless": "true", "iso_checksum": "3022424f777b66a698047ba1c37812026b9714c5", "iso_url": "https://software-download.microsoft.com/download/pr/17763.737.190906-2324.rs5_release_svc_refresh_SERVER_EVAL_x64FRE_en-us_1.iso", - "build_directory": "../../builds", - "floppy_dir": "{{template_dir}}/answer_files", + "memory": "4096", + "template": "windows-2019-standard", "unattended_file_path": "2019/Autounattend.xml", - "virtio_win_iso": "~/virtio-win.iso", - "template": "windows-2019-standard" + "virtio_win_iso": "~/virtio-win.iso" } } From a4e98d9fcd0a649bb57e8bf7bf58de516c1f5979 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Sun, 9 Feb 2020 20:00:26 -0800 Subject: [PATCH 1147/1622] Initial add of hyperv-iso to windows 2019 Signed-off-by: Tim Smith <tsmith@chef.io> --- packer_templates/windows/windows-2019.json | 23 ++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/packer_templates/windows/windows-2019.json b/packer_templates/windows/windows-2019.json index ed9e26cc6..ea7b2b083 100644 --- a/packer_templates/windows/windows-2019.json +++ b/packer_templates/windows/windows-2019.json @@ -1,5 +1,26 @@ { "builders": [{ + "type": "hyperv-iso", + "generation": "{{user `hyperv_generation`}}", + "switch_name": "{{user `hyperv_switch`}}", + "memory": "{{ user `memory` }}", + "cpus": "{{ user `cpus` }}", + "headless": "{{ user `headless` }}", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_checksum_type": "sha1", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-virtualbox", + "communicator": "winrm", + "winrm_username": "vagrant", + "winrm_password": "vagrant", + "winrm_timeout": "12h", + "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"", + "shutdown_timeout": "15m", + "floppy_files": [ + "{{ user `floppy_dir` }}/{{ user `unattended_file_path` }}" + ] + }, + { "type": "virtualbox-iso", "vboxmanage": [ ["modifyvm", "{{.Name}}", "--vram", "48"], @@ -162,6 +183,8 @@ "guest_additions_mode": "attach", "guest_additions_url": "", "headless": "true", + "hyperv_generation": "2", + "hyperv_switch": "{{env `hyperv_switch`}}", "iso_checksum": "3022424f777b66a698047ba1c37812026b9714c5", "iso_url": "https://software-download.microsoft.com/download/pr/17763.737.190906-2324.rs5_release_svc_refresh_SERVER_EVAL_x64FRE_en-us_1.iso", "memory": "4096", From 72a48d9418fb72df59223dc63cbb6629386b1d3f Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Sun, 9 Feb 2020 20:48:17 -0800 Subject: [PATCH 1148/1622] Add hyperv-iso to all the windows versions Signed-off-by: Tim Smith <tsmith@chef.io> --- packer_templates/windows/windows-10.json | 22 ++++++++++++++ packer_templates/windows/windows-2008r2.json | 31 ++++++++++++++++---- packer_templates/windows/windows-2012r2.json | 21 +++++++++++++ packer_templates/windows/windows-2016.json | 21 +++++++++++++ packer_templates/windows/windows-2019.json | 6 ++-- 5 files changed, 92 insertions(+), 9 deletions(-) diff --git a/packer_templates/windows/windows-10.json b/packer_templates/windows/windows-10.json index 0464be88b..5a8ca9b4c 100644 --- a/packer_templates/windows/windows-10.json +++ b/packer_templates/windows/windows-10.json @@ -1,5 +1,25 @@ { "builders": [{ + "type": "hyperv-iso", + "switch_name": "{{user `hyperv_switch`}}", + "memory": "{{ user `memory` }}", + "cpus": "{{ user `cpus` }}", + "headless": "{{ user `headless` }}", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_checksum_type": "sha1", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-virtualbox", + "communicator": "winrm", + "winrm_username": "vagrant", + "winrm_password": "vagrant", + "winrm_timeout": "12h", + "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"", + "shutdown_timeout": "15m", + "floppy_files": [ + "{{ user `floppy_dir` }}/{{ user `unattended_file_path` }}" + ] + }, + { "type": "virtualbox-iso", "vboxmanage": [ ["modifyvm", "{{.Name}}", "--vram", "48"], @@ -168,6 +188,8 @@ "guest_additions_mode": "attach", "guest_additions_url": "", "headless": "true", + "hyperv_generation": "2", + "hyperv_switch": "{{env `hyperv_switch`}}", "iso_checksum": "489ebee676e26cdb81377b0e6385c001a22589b8", "iso_url": "https://software-download.microsoft.com/download/pr/18363.418.191007-0143.19h2_release_svc_refresh_CLIENTENTERPRISEEVAL_OEMRET_x64FRE_en-us.iso", "memory": "4096", diff --git a/packer_templates/windows/windows-2008r2.json b/packer_templates/windows/windows-2008r2.json index 022a4f0ad..6a17de735 100644 --- a/packer_templates/windows/windows-2008r2.json +++ b/packer_templates/windows/windows-2008r2.json @@ -1,5 +1,25 @@ { "builders": [{ + "type": "hyperv-iso", + "switch_name": "{{user `hyperv_switch`}}", + "memory": "{{ user `memory` }}", + "cpus": "{{ user `cpus` }}", + "headless": "{{ user `headless` }}", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_checksum_type": "sha1", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-virtualbox", + "communicator": "winrm", + "winrm_username": "vagrant", + "winrm_password": "vagrant", + "winrm_timeout": "12h", + "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"", + "shutdown_timeout": "15m", + "floppy_files": [ + "{{ user `floppy_dir` }}/{{ user `unattended_file_path` }}" + ] + }, + { "type": "virtualbox-iso", "vboxmanage": [ ["modifyvm", "{{.Name}}", "--vram", "48"], @@ -126,16 +146,17 @@ }] ], "variables": { - "memory": "4096", + "build_directory": "../../builds", "cpus": "2", + "floppy_dir": "{{template_dir}}/answer_files", "guest_additions_mode": "attach", "guest_additions_url": "", - "headless": "false", + "headless": "true", + "hyperv_switch": "{{env `hyperv_switch`}}", "iso_checksum": "beed231a34e90e1dd9a04b3afabec31d62ce3889", "iso_url": "http://download.microsoft.com/download/7/5/E/75EC4E54-5B02-42D6-8879-D8D3A25FBEF7/7601.17514.101119-1850_x64fre_server_eval_en-us-GRMSXEVAL_EN_DVD.iso", - "build_directory": "../../builds", - "floppy_dir": "{{template_dir}}/answer_files", - "unattended_file_path": "2008_r2/Autounattend.xml", + "memory": "4096", "template": "windows-2008r2-standard" + "unattended_file_path": "2008_r2/Autounattend.xml", } } diff --git a/packer_templates/windows/windows-2012r2.json b/packer_templates/windows/windows-2012r2.json index 2f82d4fcb..38add7097 100644 --- a/packer_templates/windows/windows-2012r2.json +++ b/packer_templates/windows/windows-2012r2.json @@ -1,5 +1,25 @@ { "builders": [{ + "type": "hyperv-iso", + "switch_name": "{{user `hyperv_switch`}}", + "memory": "{{ user `memory` }}", + "cpus": "{{ user `cpus` }}", + "headless": "{{ user `headless` }}", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_checksum_type": "sha1", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-virtualbox", + "communicator": "winrm", + "winrm_username": "vagrant", + "winrm_password": "vagrant", + "winrm_timeout": "12h", + "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"", + "shutdown_timeout": "15m", + "floppy_files": [ + "{{ user `floppy_dir` }}/{{ user `unattended_file_path` }}" + ] + }, + { "type": "virtualbox-iso", "vboxmanage": [ ["modifyvm", "{{.Name}}", "--vram", "48"], @@ -162,6 +182,7 @@ "guest_additions_mode": "attach", "guest_additions_url": "", "headless": "true", + "hyperv_switch": "{{env `hyperv_switch`}}", "iso_checksum": "849734f37346385dac2c101e4aacba4626bb141c", "iso_url": "http://download.microsoft.com/download/6/2/A/62A76ABB-9990-4EFC-A4FE-C7D698DAEB96/9600.17050.WINBLUE_REFRESH.140317-1640_X64FRE_SERVER_EVAL_EN-US-IR3_SSS_X64FREE_EN-US_DV9.ISO", "memory": "4096", diff --git a/packer_templates/windows/windows-2016.json b/packer_templates/windows/windows-2016.json index 2388da05f..f2acbe9a4 100644 --- a/packer_templates/windows/windows-2016.json +++ b/packer_templates/windows/windows-2016.json @@ -1,5 +1,25 @@ { "builders": [{ + "type": "hyperv-iso", + "switch_name": "{{user `hyperv_switch`}}", + "memory": "{{ user `memory` }}", + "cpus": "{{ user `cpus` }}", + "headless": "{{ user `headless` }}", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_checksum_type": "sha1", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-virtualbox", + "communicator": "winrm", + "winrm_username": "vagrant", + "winrm_password": "vagrant", + "winrm_timeout": "12h", + "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"", + "shutdown_timeout": "15m", + "floppy_files": [ + "{{ user `floppy_dir` }}/{{ user `unattended_file_path` }}" + ] + }, + { "type": "virtualbox-iso", "vboxmanage": [ ["modifyvm", "{{.Name}}", "--vram", "48"], @@ -162,6 +182,7 @@ "guest_additions_mode": "attach", "guest_additions_url": "", "headless": "true", + "hyperv_switch": "{{env `hyperv_switch`}}", "iso_checksum": "772700802951b36c8cb26a61c040b9a8dc3816a3", "iso_url": "https://software-download.microsoft.com/download/pr/Windows_Server_2016_Datacenter_EVAL_en-us_14393_refresh.ISO", "memory": "4096", diff --git a/packer_templates/windows/windows-2019.json b/packer_templates/windows/windows-2019.json index ea7b2b083..f1ccb0cc8 100644 --- a/packer_templates/windows/windows-2019.json +++ b/packer_templates/windows/windows-2019.json @@ -1,7 +1,6 @@ { "builders": [{ "type": "hyperv-iso", - "generation": "{{user `hyperv_generation`}}", "switch_name": "{{user `hyperv_switch`}}", "memory": "{{ user `memory` }}", "cpus": "{{ user `cpus` }}", @@ -19,8 +18,8 @@ "floppy_files": [ "{{ user `floppy_dir` }}/{{ user `unattended_file_path` }}" ] - }, - { + }, + { "type": "virtualbox-iso", "vboxmanage": [ ["modifyvm", "{{.Name}}", "--vram", "48"], @@ -183,7 +182,6 @@ "guest_additions_mode": "attach", "guest_additions_url": "", "headless": "true", - "hyperv_generation": "2", "hyperv_switch": "{{env `hyperv_switch`}}", "iso_checksum": "3022424f777b66a698047ba1c37812026b9714c5", "iso_url": "https://software-download.microsoft.com/download/pr/17763.737.190906-2324.rs5_release_svc_refresh_SERVER_EVAL_x64FRE_en-us_1.iso", From 072945deef0172cd12f55d5a76e7aa055ac110a5 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Mon, 10 Feb 2020 11:26:15 -0800 Subject: [PATCH 1149/1622] Fix the w2k8r2 template Signed-off-by: Tim Smith <tsmith@chef.io> --- packer_templates/windows/windows-2008r2.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packer_templates/windows/windows-2008r2.json b/packer_templates/windows/windows-2008r2.json index 6a17de735..3411da500 100644 --- a/packer_templates/windows/windows-2008r2.json +++ b/packer_templates/windows/windows-2008r2.json @@ -156,7 +156,7 @@ "iso_checksum": "beed231a34e90e1dd9a04b3afabec31d62ce3889", "iso_url": "http://download.microsoft.com/download/7/5/E/75EC4E54-5B02-42D6-8879-D8D3A25FBEF7/7601.17514.101119-1850_x64fre_server_eval_en-us-GRMSXEVAL_EN_DVD.iso", "memory": "4096", - "template": "windows-2008r2-standard" + "template": "windows-2008r2-standard", "unattended_file_path": "2008_r2/Autounattend.xml", } } From 7d1a9ea2fe28c9657329caf42f15bbb2f335ad93 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Mon, 10 Feb 2020 11:28:14 -0800 Subject: [PATCH 1150/1622] Update the win 10 hyperv setup Signed-off-by: Tim Smith <tsmith@chef.io> --- packer_templates/windows/windows-10.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packer_templates/windows/windows-10.json b/packer_templates/windows/windows-10.json index 5a8ca9b4c..567dfe71e 100644 --- a/packer_templates/windows/windows-10.json +++ b/packer_templates/windows/windows-10.json @@ -16,7 +16,8 @@ "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"", "shutdown_timeout": "15m", "floppy_files": [ - "{{ user `floppy_dir` }}/{{ user `unattended_file_path` }}" + "{{ user `floppy_dir` }}/{{ user `unattended_file_path` }}", + "{{template_dir}}/scripts/base_setup.ps1" ] }, { @@ -188,7 +189,6 @@ "guest_additions_mode": "attach", "guest_additions_url": "", "headless": "true", - "hyperv_generation": "2", "hyperv_switch": "{{env `hyperv_switch`}}", "iso_checksum": "489ebee676e26cdb81377b0e6385c001a22589b8", "iso_url": "https://software-download.microsoft.com/download/pr/18363.418.191007-0143.19h2_release_svc_refresh_CLIENTENTERPRISEEVAL_OEMRET_x64FRE_en-us.iso", From 958e047b1fe830de3659e5f688abd33e8ee8e887 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Thu, 13 Feb 2020 22:24:58 -0800 Subject: [PATCH 1151/1622] Update Ubuntu 18.04.3 -> 18.04.4 Signed-off-by: Tim Smith <tsmith@chef.io> --- packer_templates/ubuntu/ubuntu-18.04-amd64.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packer_templates/ubuntu/ubuntu-18.04-amd64.json b/packer_templates/ubuntu/ubuntu-18.04-amd64.json index 46de7ce01..c95514b8f 100644 --- a/packer_templates/ubuntu/ubuntu-18.04-amd64.json +++ b/packer_templates/ubuntu/ubuntu-18.04-amd64.json @@ -273,12 +273,12 @@ "hyperv_generation": "2", "hyperv_switch": "{{env `hyperv_switch`}}", "guest_additions_url": "", - "iso_checksum": "7d8e0055d663bffa27c1718685085626cb59346e7626ba3d3f476322271f573e", + "iso_checksum": "e2ecdace33c939527cbc9e8d23576381c493b071107207d2040af72595f8990b", "iso_checksum_type": "sha256", - "iso_name": "ubuntu-18.04.3-server-amd64.iso", + "iso_name": "ubuntu-18.04.4-server-amd64.iso", "memory": "1024", "mirror": "http://cdimage.ubuntu.com", - "mirror_directory": "ubuntu/releases/18.04.3/release", + "mirror_directory": "ubuntu/releases/18.04.4/release", "name": "ubuntu-18.04", "no_proxy": "{{env `no_proxy`}}", "preseed_path": "preseed.cfg", From 4ce395e81f32e482cc19cc73e39c06ee8c247046 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Fri, 14 Feb 2020 00:39:25 -0800 Subject: [PATCH 1152/1622] Use new helpers from Chef Infra Client 15.8 Simplify some checks a bit Signed-off-by: Tim Smith <tsmith@chef.io> --- packer_templates/windows/cookbooks/packer/recipes/cleanup.rb | 4 ++-- .../windows/cookbooks/packer/recipes/features.rb | 2 +- packer_templates/windows/cookbooks/packer/recipes/updates.rb | 2 +- .../windows/cookbooks/packer/recipes/vm_tools.rb | 5 ++--- 4 files changed, 6 insertions(+), 7 deletions(-) diff --git a/packer_templates/windows/cookbooks/packer/recipes/cleanup.rb b/packer_templates/windows/cookbooks/packer/recipes/cleanup.rb index e1cc92f70..b9b65de59 100644 --- a/packer_templates/windows/cookbooks/packer/recipes/cleanup.rb +++ b/packer_templates/windows/cookbooks/packer/recipes/cleanup.rb @@ -1,13 +1,13 @@ execute 'run cleanmgr' do command 'C:\Windows\System32\cleanmgr.exe /sagerun:10' ignore_failure true - only_if { node['kernel']['product_type'] == 'Workstaton' } # cleanmgr isn't on servers + only_if { windows_workstation? } # cleanmgr isn't on servers end execute 'clean SxS' do command 'Dism.exe /online /Cleanup-Image /StartComponentCleanup /ResetBase' ignore_failure true - only_if { node['platform_version'].to_f > 6.1 } # command not present on Windows 7 + only_if { windows_nt_version > 6.1 } # command not present on Windows 7 end powershell_script 'remove unnecesary directories' do diff --git a/packer_templates/windows/cookbooks/packer/recipes/features.rb b/packer_templates/windows/cookbooks/packer/recipes/features.rb index b701d31fc..0ba436e2e 100644 --- a/packer_templates/windows/cookbooks/packer/recipes/features.rb +++ b/packer_templates/windows/cookbooks/packer/recipes/features.rb @@ -1,6 +1,6 @@ windows_feature 'NetFx3' do action :install - only_if { node['platform_version'].to_f == 6.1 } + only_if { windows_nt_version == 6.1 } end windows_feature 'MicrosoftWindowsPowerShellISE' do diff --git a/packer_templates/windows/cookbooks/packer/recipes/updates.rb b/packer_templates/windows/cookbooks/packer/recipes/updates.rb index a826fa4b2..d29fc860d 100644 --- a/packer_templates/windows/cookbooks/packer/recipes/updates.rb +++ b/packer_templates/windows/cookbooks/packer/recipes/updates.rb @@ -7,7 +7,7 @@ }] end -if node['platform_version'].to_f == 6.1 # 2008R2 +if windows_nt_version == 6.1 # 2008R2 # This is basically a service pack and we should install it to fix a giant pile of bugs msu_package '2018-10 monthly rollup' do diff --git a/packer_templates/windows/cookbooks/packer/recipes/vm_tools.rb b/packer_templates/windows/cookbooks/packer/recipes/vm_tools.rb index 72c73adf5..7b87c28aa 100644 --- a/packer_templates/windows/cookbooks/packer/recipes/vm_tools.rb +++ b/packer_templates/windows/cookbooks/packer/recipes/vm_tools.rb @@ -1,6 +1,5 @@ -# install the correct tools per virtualization system -case node['virtualization']['system'] -when 'vbox' +# install virtualbox guest additions on vbox guests +if vbox? directory 'C:/Windows/Temp/virtualbox' do recursive true end From 935a43042634e82c4098f243560263f4bf6a59a2 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Fri, 14 Feb 2020 00:41:55 -0800 Subject: [PATCH 1153/1622] Upload the vmware ISO on windows Signed-off-by: Tim Smith <tsmith@chef.io> --- packer_templates/windows/windows-10.json | 2 ++ packer_templates/windows/windows-2008r2.json | 2 ++ packer_templates/windows/windows-2012r2.json | 2 ++ packer_templates/windows/windows-2016.json | 2 ++ packer_templates/windows/windows-2019.json | 2 ++ 5 files changed, 10 insertions(+) diff --git a/packer_templates/windows/windows-10.json b/packer_templates/windows/windows-10.json index 567dfe71e..a92ef4ece 100644 --- a/packer_templates/windows/windows-10.json +++ b/packer_templates/windows/windows-10.json @@ -89,6 +89,8 @@ "iso_checksum_type": "sha1", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-vmware", "communicator": "winrm", + "tools_upload_flavor": "windows", + "tools_upload_path": "c:/Windows/Temp/vmware.iso", "winrm_username": "vagrant", "winrm_password": "vagrant", "winrm_timeout": "12h", diff --git a/packer_templates/windows/windows-2008r2.json b/packer_templates/windows/windows-2008r2.json index 3411da500..a29f0a2cb 100644 --- a/packer_templates/windows/windows-2008r2.json +++ b/packer_templates/windows/windows-2008r2.json @@ -85,6 +85,8 @@ "iso_checksum_type": "sha1", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-vmware", "communicator": "winrm", + "tools_upload_flavor": "windows", + "tools_upload_path": "c:/Windows/Temp/vmware.iso", "winrm_username": "vagrant", "winrm_password": "vagrant", "winrm_timeout": "12h", diff --git a/packer_templates/windows/windows-2012r2.json b/packer_templates/windows/windows-2012r2.json index 38add7097..95284b0df 100644 --- a/packer_templates/windows/windows-2012r2.json +++ b/packer_templates/windows/windows-2012r2.json @@ -85,6 +85,8 @@ "iso_checksum_type": "sha1", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-vmware", "communicator": "winrm", + "tools_upload_flavor": "windows", + "tools_upload_path": "c:/Windows/Temp/vmware.iso", "winrm_username": "vagrant", "winrm_password": "vagrant", "winrm_timeout": "12h", diff --git a/packer_templates/windows/windows-2016.json b/packer_templates/windows/windows-2016.json index f2acbe9a4..4da2245ed 100644 --- a/packer_templates/windows/windows-2016.json +++ b/packer_templates/windows/windows-2016.json @@ -85,6 +85,8 @@ "iso_checksum_type": "sha1", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-vmware", "communicator": "winrm", + "tools_upload_flavor": "windows", + "tools_upload_path": "c:/Windows/Temp/vmware.iso", "winrm_username": "vagrant", "winrm_password": "vagrant", "winrm_timeout": "12h", diff --git a/packer_templates/windows/windows-2019.json b/packer_templates/windows/windows-2019.json index f1ccb0cc8..5320e7e1d 100644 --- a/packer_templates/windows/windows-2019.json +++ b/packer_templates/windows/windows-2019.json @@ -85,6 +85,8 @@ "iso_checksum_type": "sha1", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-vmware", "communicator": "winrm", + "tools_upload_flavor": "windows", + "tools_upload_path": "c:/Windows/Temp/vmware.iso", "winrm_username": "vagrant", "winrm_password": "vagrant", "winrm_timeout": "12h", From 03efa19812ec144ba2941d6d471c0369fe5533ab Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Fri, 14 Feb 2020 16:24:15 -0800 Subject: [PATCH 1154/1622] Install vmware tools on windows vmware-iso boxes Signed-off-by: Tim Smith <tsmith@chef.io> --- .../windows/cookbooks/packer/recipes/vm_tools.rb | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/packer_templates/windows/cookbooks/packer/recipes/vm_tools.rb b/packer_templates/windows/cookbooks/packer/recipes/vm_tools.rb index 7b87c28aa..83436bf78 100644 --- a/packer_templates/windows/cookbooks/packer/recipes/vm_tools.rb +++ b/packer_templates/windows/cookbooks/packer/recipes/vm_tools.rb @@ -19,3 +19,18 @@ action :delete end end + +# install vmware tools on vmware guests +# This is from https://github.com/luciusbono/Packer-Windows10/blob/master/install-guest-tools.ps1 +if vmware? + powershell_script 'install vbox guest additions' do + code <<-EOH + $isopath = "C:\\Windows\\Temp\\vmware.iso" + Mount-DiskImage -ImagePath $isopath + $exe = ((Get-DiskImage -ImagePath $isopath | Get-Volume).Driveletter + ':\setup.exe') + $parameters = '/S /v "/qr REBOOT=R"' + Dismount-DiskImage -ImagePath $isopath + Remove-Item $isopath + EOH + end +end From 6c5859cafdb04e89b61d8e0ba17603f484fa6244 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Fri, 14 Feb 2020 17:12:47 -0800 Subject: [PATCH 1155/1622] Fix bad json data in 2008 R2 Signed-off-by: Tim Smith <tsmith@chef.io> --- packer_templates/windows/windows-2008r2.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packer_templates/windows/windows-2008r2.json b/packer_templates/windows/windows-2008r2.json index a29f0a2cb..472246a2a 100644 --- a/packer_templates/windows/windows-2008r2.json +++ b/packer_templates/windows/windows-2008r2.json @@ -159,6 +159,6 @@ "iso_url": "http://download.microsoft.com/download/7/5/E/75EC4E54-5B02-42D6-8879-D8D3A25FBEF7/7601.17514.101119-1850_x64fre_server_eval_en-us-GRMSXEVAL_EN_DVD.iso", "memory": "4096", "template": "windows-2008r2-standard", - "unattended_file_path": "2008_r2/Autounattend.xml", + "unattended_file_path": "2008_r2/Autounattend.xml" } } From 050d7cbb678d1a69848bec9b17d07aa80e4fc4c1 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Fri, 14 Feb 2020 17:21:19 -0800 Subject: [PATCH 1156/1622] Only validate the actual packer configs Signed-off-by: Tim Smith <tsmith@chef.io> --- Rakefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Rakefile b/Rakefile index 4b9111b01..050ef4557 100644 --- a/Rakefile +++ b/Rakefile @@ -3,7 +3,7 @@ require "fileutils" desc "Validate all templates using Packer" task :validate do - Dir.glob("**/*.json").sort.each do |template_path| + Dir.glob("packer_templates/**/*.json").sort.each do |template_path| template_dir = File.dirname(template_path) filename = File.basename(template_path) From 4d5a0969913a2051a03a10241e13e6a25cd2971e Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Fri, 14 Feb 2020 17:21:32 -0800 Subject: [PATCH 1157/1622] Add back the EL 5 ks file for Oracle 5 Signed-off-by: Tim Smith <tsmith@chef.io> --- packer_templates/centos/http/5/ks.cfg | 78 +++++++++++++++++++++++++++ 1 file changed, 78 insertions(+) create mode 100644 packer_templates/centos/http/5/ks.cfg diff --git a/packer_templates/centos/http/5/ks.cfg b/packer_templates/centos/http/5/ks.cfg new file mode 100644 index 000000000..286830f7d --- /dev/null +++ b/packer_templates/centos/http/5/ks.cfg @@ -0,0 +1,78 @@ +install +cdrom +lang en_US.UTF-8 +keyboard us +network --bootproto=dhcp +rootpw vagrant +firewall --disabled +authconfig --enableshadow --passalgo=sha512 +selinux --permissive +timezone UTC +bootloader --location=mbr +text +skipx +zerombr +clearpart --all --initlabel +autopart +firstboot --disabled +reboot +user --name=vagrant --password vagrant +key --skip + +%packages --nobase --ignoremissing --excludedocs +# vagrant needs this to copy initial files via scp +openssh-clients +openssh-server +bzip2 +curl +dhclient +gcc +kernel-devel +kernel-headers +make +nfs-utils +perl +sudo +wget +yum +-fprintd-pam +-intltool +-avahi +-bluez-utils +-dogtail +-kudzu +# unnecessary firmware +-aic94xx-firmware +-atmel-firmware +-b43-openfwwf +-bfa-firmware +-ipw2100-firmware +-ipw2200-firmware +-ivtv-firmware +-iwl100-firmware +-iwl1000-firmware +-iwl3945-firmware +-iwl4965-firmware +-iwl5000-firmware +-iwl5150-firmware +-iwl6000-firmware +-iwl6000g2a-firmware +-iwl6050-firmware +-libertas-usb8388-firmware +-ql2100-firmware +-ql2200-firmware +-ql23xx-firmware +-ql2400-firmware +-ql2500-firmware +-rt61pci-firmware +-rt73usb-firmware +-xorg-x11-drv-ati-firmware +-zd1211-firmware +# Not Needed +-selinux-policy +-selinux-policy-targeted + +%post +# sudo +echo "vagrant ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers +sed -i "s/^[^#].*requiretty/#Defaults requiretty/" /etc/sudoers \ No newline at end of file From 5a40f140317f77be371705dc1931263fcb6f61c4 Mon Sep 17 00:00:00 2001 From: githubfoam <lequestionis@gmail.com> Date: Tue, 25 Feb 2020 09:56:08 +0300 Subject: [PATCH 1158/1622] 11-4 version. --- solaris/solaris-11-4-x86.json | 147 ++++++++++++++++++++++++++++++++++ 1 file changed, 147 insertions(+) create mode 100644 solaris/solaris-11-4-x86.json diff --git a/solaris/solaris-11-4-x86.json b/solaris/solaris-11-4-x86.json new file mode 100644 index 000000000..1e32244cd --- /dev/null +++ b/solaris/solaris-11-4-x86.json @@ -0,0 +1,147 @@ +{ + "builders": [ + { + "boot_command": [ + "e<wait>", + "<down><down><down><down><down><wait>", + "<end><wait>", + "<bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><wait>", + "false<wait>", + "<f10><wait>", + "<wait10><wait10><wait10><wait10><wait10><wait10>", + "<wait10><wait10><wait10><wait10><wait10><wait10>", + "<wait10><wait10><wait10><wait10><wait10><wait10>", + "root<enter><wait><wait>", + "solaris<enter><wait><wait>", + "<wait10>", + "while (true); do sleep 5; test -f /a/etc/sudoers && grep -v \"vagrant\" \"/a/etc/sudoers\" 2> /dev/null<wait>", + " && echo \"vagrant ALL=(ALL) NOPASSWD: ALL\" >> /a/etc/sudoers && break ; done &<enter><wait>", + "<enter>while (true); do grep \"You may wish to reboot\" \"/var/svc/log/application-auto-installer:default.log\" 2> /dev/null<wait>", + " && reboot; sleep 10; done &<enter><wait>", + "sleep 5; curl http://{{ .HTTPIP }}:{{ .HTTPPort }}/default.xml -o default.xml;<wait>", + "curl http://{{ .HTTPIP }}:{{ .HTTPPort }}/profile.xml -o profile.xml;<wait>", + "cp default.xml /system/volatile/ai.xml;<wait>", + "mkdir /system/volatile/profile;<wait>", + "cp profile.xml /system/volatile/profile/profile.xml;<wait>", + "svcadm enable svc:/application/auto-installer:default;<wait>", + "<enter><wait10><wait><wait>", + "<enter><wait>", + "tail -f /var/svc/log/application-auto-installer\\:default.log<enter><wait>", + "<leftCtrlOn>r<leftCtrlOff>" + ], + "boot_wait": "5s", + "disk_size": "{{user `disk_size`}}", + "guest_additions_mode": "attach", + "guest_additions_url": "{{ user `guest_additions_url` }}", + "guest_os_type": "Solaris11_64", + "headless": "{{ user `headless` }}", + "http_directory": "{{user `http_directory`}}", + "iso_checksum": "e3a29507e583acbc0b912f371c8f328fea7cb6257d587cbc0a651477a52b0a29", + "iso_checksum_type": "sha256", + "iso_url": "{{user `mirror`}}/sol-11_4-ai-x86.iso", + "output_directory": "packer-solaris-11.4-x86_64-virtualbox", + "shutdown_command": "echo 'vagrant'|sudo -i init 5", + "shutdown_timeout": "10m", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "virtualbox-iso", + "memory": "{{ user `memory` }}", + "cpus": "{{ user `cpus` }}", + "virtualbox_version_file": ".vbox_version", + "vm_name": "{{ user `template` }}" + }, + { + "boot_command": [ + "e<wait>", + "<down><down><down><down><down><wait>", + "<end><wait>", + "<bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><wait>", + "false<wait>", + "<f10><wait>", + "<wait10><wait10><wait10><wait10><wait10><wait10>", + "<wait10><wait10><wait10><wait10><wait10><wait10>", + "<wait10><wait10><wait10><wait10><wait10><wait10>", + "root<enter><wait><wait>", + "solaris<enter><wait><wait>", + "<wait10>", + "while (true); do sleep 5; test -f /a/etc/sudoers && grep -v \"vagrant\" \"/a/etc/sudoers\" 2> /dev/null<wait>", + " && echo \"vagrant ALL=(ALL) NOPASSWD: ALL\" >> /a/etc/sudoers && break ; done &<enter><wait>", + "<enter>while (true); do grep \"You may wish to reboot\" \"/var/svc/log/application-auto-installer:default.log\" 2> /dev/null<wait>", + " && reboot; sleep 10; done &<enter><wait>", + "sleep 5; curl http://{{ .HTTPIP }}:{{ .HTTPPort }}/default.xml -o default.xml;<wait>", + "curl http://{{ .HTTPIP }}:{{ .HTTPPort }}/profile.xml -o profile.xml;<wait>", + "cp default.xml /system/volatile/ai.xml;<wait>", + "mkdir /system/volatile/profile;<wait>", + "cp profile.xml /system/volatile/profile/profile.xml;<wait>", + "svcadm enable svc:/application/auto-installer:default;<wait>", + "<enter><wait10><wait><wait>", + "<enter><wait>", + "tail -f /var/svc/log/application-auto-installer\\:default.log<enter><wait>" + ], + "boot_wait": "5s", + "disk_size": "{{user `disk_size`}}", + "guest_os_type": "solaris11-64", + "headless": "{{ user `headless` }}", + "http_directory": "{{user `http_directory`}}", + "iso_checksum": "e3a29507e583acbc0b912f371c8f328fea7cb6257d587cbc0a651477a52b0a29", + "iso_checksum_type": "sha256", + "iso_url": "{{user `mirror`}}/sol-11_4-ai-x86.iso", + "output_directory": "packer-solaris-11.4-x86_64-vmware", + "shutdown_command": "echo 'vagrant'|sudo -i init 5", + "shutdown_timeout": "10m", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "vmware-iso", + "vm_name": "{{ user `template` }}", + "memory": "{{ user `memory` }}", + "cpus": "{{ user `cpus` }}", + "vmx_data": { + "cpuid.coresPerSocket": "1" + }, + "vmx_remove_ethernet_interfaces": true + } + ], + "post-processors": [ + { + "output": "{{ user `build_directory` }}/{{user `box_basename`}}.{{.Provider}}.box", + "type": "vagrant" + } + ], + "provisioners": [ + { + "environment_vars": [], + "execute_command": "echo 'vagrant'|sudo -S bash {{.Path}}", + "expect_disconnect": true, + "scripts": [ + "{{template_dir}}/scripts/update.sh", + "{{template_dir}}/scripts/vagrant.sh", + "{{template_dir}}/scripts/vmtools.sh", + "{{template_dir}}/scripts/minimize.sh" + ], + "type": "shell" + } + ], + "variables": { + "_DOWNLOAD_SITE": "http://www.oracle.com/technetwork/server-storage/solaris11/downloads/index.html", + "_README": "You must download the automated installer iso from the following page, and then place it in the packer_cache dir", + "arch": "64", + "box_basename": "solaris-11.4", + "build_directory": "../../builds", + "http_directory": "{{template_dir}}/http", + "build_timestamp": "{{isotime \"20200222210405\"}}", + "guest_additions_url": "", + "cpus": "1", + "disk_size": "65536", + "git_revision": "__unknown_git_revision__", + "headless": "", + "memory": "4096", + "mirror": "./packer_cache", + "name": "solaris-11.4", + "template": "solaris-11.4-x86", + "version": "TIMESTAMP" + } +} From 91776466c21f98dea2cadae37c1e08306ff2b4ad Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Wed, 11 Mar 2020 21:42:55 -0700 Subject: [PATCH 1159/1622] Update removed ssh_wait_timeout option to be ssh_timeout Signed-off-by: Tim Smith <tsmith@chef.io> --- packer_templates/amazonlinux/amazon-2-x86_64.json | 2 +- packer_templates/centos/centos-6.10-i386.json | 8 ++++---- packer_templates/centos/centos-6.10-x86_64.json | 8 ++++---- packer_templates/centos/centos-7.7-x86_64.json | 8 ++++---- packer_templates/centos/centos-8.1-x86_64.json | 8 ++++---- packer_templates/debian/debian-10.2-amd64.json | 8 ++++---- packer_templates/debian/debian-10.2-i386.json | 8 ++++---- packer_templates/debian/debian-8.11-amd64.json | 8 ++++---- packer_templates/debian/debian-8.11-i386.json | 8 ++++---- packer_templates/debian/debian-9.11-amd64.json | 8 ++++---- packer_templates/debian/debian-9.11-i386.json | 8 ++++---- packer_templates/debian/debian-9.11-ppc64el.json | 2 +- packer_templates/fedora/fedora-30-x86_64.json | 10 +++++----- packer_templates/fedora/fedora-31-x86_64.json | 10 +++++----- packer_templates/freebsd/freebsd-11.3-amd64.json | 8 ++++---- packer_templates/freebsd/freebsd-11.3-i386.json | 8 ++++---- packer_templates/freebsd/freebsd-12.0-amd64.json | 8 ++++---- packer_templates/freebsd/freebsd-12.0-i386.json | 8 ++++---- packer_templates/freebsd/freebsd-12.1-amd64.json | 8 ++++---- packer_templates/freebsd/freebsd-12.1-i386.json | 8 ++++---- packer_templates/hardenedbsd/hardenedbsd-11-amd64.json | 8 ++++---- packer_templates/macos/macos-10.12.json | 7 +++---- packer_templates/macos/macosx-10.11.json | 7 +++---- .../opensuse/opensuse-leap-15.1-x86_64.json | 8 ++++---- packer_templates/oraclelinux/oracle-5.11-i386.json | 8 ++++---- packer_templates/oraclelinux/oracle-5.11-x86_64.json | 8 ++++---- packer_templates/oraclelinux/oracle-6.10-i386.json | 8 ++++---- packer_templates/oraclelinux/oracle-6.10-x86_64.json | 8 ++++---- packer_templates/oraclelinux/oracle-7.7-x86_64.json | 8 ++++---- packer_templates/oraclelinux/oracle-8.1-x86_64.json | 8 ++++---- packer_templates/rhel/rhel-5.11-i386.json | 8 ++++---- packer_templates/rhel/rhel-5.11-x86_64.json | 8 ++++---- packer_templates/rhel/rhel-6.10-i386.json | 8 ++++---- packer_templates/rhel/rhel-6.10-x86_64.json | 8 ++++---- packer_templates/rhel/rhel-7.6-x86_64.json | 8 ++++---- packer_templates/rhel/rhel-8.0-x86_64.json | 8 ++++---- .../scientificlinux/scientific-7.7-x86_64.json | 8 ++++---- packer_templates/sles/sles-11-sp4-x86_64.json | 8 ++++---- packer_templates/sles/sles-12-sp2-x86_64.json | 8 ++++---- packer_templates/sles/sles-12-sp3-x86_64.json | 8 ++++---- packer_templates/sles/sles-15-sp1.json | 8 ++++---- packer_templates/sles/sles-15.json | 8 ++++---- packer_templates/solaris/solaris-11-x86.json | 4 ++-- packer_templates/ubuntu/ubuntu-16.04-amd64.json | 8 ++++---- packer_templates/ubuntu/ubuntu-16.04-i386.json | 8 ++++---- packer_templates/ubuntu/ubuntu-18.04-amd64.json | 8 ++++---- packer_templates/ubuntu/ubuntu-19.10-amd64.json | 8 ++++---- 47 files changed, 180 insertions(+), 182 deletions(-) diff --git a/packer_templates/amazonlinux/amazon-2-x86_64.json b/packer_templates/amazonlinux/amazon-2-x86_64.json index 8264a59c2..f65b61f7e 100644 --- a/packer_templates/amazonlinux/amazon-2-x86_64.json +++ b/packer_templates/amazonlinux/amazon-2-x86_64.json @@ -6,7 +6,7 @@ "http_directory": "{{user `http_directory`}}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-virtualbox", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", - "ssh_wait_timeout": "10000s", + "ssh_timeout": "10000s", "ssh_port": 22, "type": "virtualbox-ovf", "source_path": "{{template_dir}}/amazon2.ovf", diff --git a/packer_templates/centos/centos-6.10-i386.json b/packer_templates/centos/centos-6.10-i386.json index 800d6fbd5..1e0358376 100644 --- a/packer_templates/centos/centos-6.10-i386.json +++ b/packer_templates/centos/centos-6.10-i386.json @@ -20,7 +20,7 @@ "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", + "ssh_timeout": "10000s", "type": "virtualbox-iso", "memory": "{{ user `memory` }}", "cpus": "{{ user `cpus` }}", @@ -44,7 +44,7 @@ "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", + "ssh_timeout": "10000s", "tools_upload_flavor": "linux", "type": "vmware-iso", "vm_name": "{{ user `template` }}", @@ -75,7 +75,7 @@ "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", + "ssh_timeout": "10000s", "type": "parallels-iso", "vm_name": "{{ user `template` }}" }, @@ -124,7 +124,7 @@ "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", + "ssh_timeout": "10000s", "type": "qemu", "vm_name": "{{ user `template` }}" } diff --git a/packer_templates/centos/centos-6.10-x86_64.json b/packer_templates/centos/centos-6.10-x86_64.json index dff9b0c31..c72799e77 100644 --- a/packer_templates/centos/centos-6.10-x86_64.json +++ b/packer_templates/centos/centos-6.10-x86_64.json @@ -20,7 +20,7 @@ "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", + "ssh_timeout": "10000s", "type": "virtualbox-iso", "memory": "{{ user `memory` }}", "cpus": "{{ user `cpus` }}", @@ -44,7 +44,7 @@ "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", + "ssh_timeout": "10000s", "tools_upload_flavor": "linux", "type": "vmware-iso", "vm_name": "{{ user `template` }}", @@ -75,7 +75,7 @@ "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", + "ssh_timeout": "10000s", "type": "parallels-iso", "vm_name": "{{ user `template` }}" }, @@ -124,7 +124,7 @@ "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", + "ssh_timeout": "10000s", "type": "qemu", "vm_name": "{{ user `template` }}" } diff --git a/packer_templates/centos/centos-7.7-x86_64.json b/packer_templates/centos/centos-7.7-x86_64.json index 095a25d06..93635e05a 100644 --- a/packer_templates/centos/centos-7.7-x86_64.json +++ b/packer_templates/centos/centos-7.7-x86_64.json @@ -20,7 +20,7 @@ "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", + "ssh_timeout": "10000s", "type": "virtualbox-iso", "memory": "{{ user `memory` }}", "cpus": "{{ user `cpus` }}", @@ -44,7 +44,7 @@ "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", + "ssh_timeout": "10000s", "tools_upload_flavor": "linux", "type": "vmware-iso", "vm_name": "{{ user `template` }}", @@ -75,7 +75,7 @@ "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", + "ssh_timeout": "10000s", "type": "parallels-iso", "vm_name": "{{ user `template` }}" }, @@ -124,7 +124,7 @@ "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", + "ssh_timeout": "10000s", "type": "qemu", "vm_name": "{{ user `template` }}" } diff --git a/packer_templates/centos/centos-8.1-x86_64.json b/packer_templates/centos/centos-8.1-x86_64.json index 638f59a76..bc743af70 100644 --- a/packer_templates/centos/centos-8.1-x86_64.json +++ b/packer_templates/centos/centos-8.1-x86_64.json @@ -20,7 +20,7 @@ "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", + "ssh_timeout": "10000s", "type": "virtualbox-iso", "memory": "{{ user `memory` }}", "cpus": "{{ user `cpus` }}", @@ -44,7 +44,7 @@ "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", + "ssh_timeout": "10000s", "tools_upload_flavor": "linux", "type": "vmware-iso", "vm_name": "{{ user `template` }}", @@ -75,7 +75,7 @@ "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", + "ssh_timeout": "10000s", "type": "parallels-iso", "vm_name": "{{ user `template` }}" }, @@ -124,7 +124,7 @@ "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", + "ssh_timeout": "10000s", "type": "qemu", "vm_name": "{{ user `template` }}" } diff --git a/packer_templates/debian/debian-10.2-amd64.json b/packer_templates/debian/debian-10.2-amd64.json index 187020cbe..1f090531a 100644 --- a/packer_templates/debian/debian-10.2-amd64.json +++ b/packer_templates/debian/debian-10.2-amd64.json @@ -35,7 +35,7 @@ "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", + "ssh_timeout": "10000s", "type": "virtualbox-iso", "memory": "{{ user `memory` }}", "cpus": "{{ user `cpus` }}", @@ -74,7 +74,7 @@ "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", + "ssh_timeout": "10000s", "tools_upload_flavor": "linux", "type": "vmware-iso", "vm_name": "{{ user `template` }}", @@ -121,7 +121,7 @@ "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", + "ssh_timeout": "10000s", "type": "parallels-iso", "vm_name": "{{ user `template` }}" }, @@ -158,7 +158,7 @@ "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", + "ssh_timeout": "10000s", "type": "qemu", "vm_name": "{{ user `template` }}" } diff --git a/packer_templates/debian/debian-10.2-i386.json b/packer_templates/debian/debian-10.2-i386.json index 753208b03..7c49091d4 100644 --- a/packer_templates/debian/debian-10.2-i386.json +++ b/packer_templates/debian/debian-10.2-i386.json @@ -35,7 +35,7 @@ "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", + "ssh_timeout": "10000s", "type": "virtualbox-iso", "memory": "{{ user `memory` }}", "cpus": "{{ user `cpus` }}", @@ -74,7 +74,7 @@ "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", + "ssh_timeout": "10000s", "tools_upload_flavor": "linux", "type": "vmware-iso", "vm_name": "{{ user `template` }}", @@ -121,7 +121,7 @@ "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", + "ssh_timeout": "10000s", "type": "parallels-iso", "vm_name": "{{ user `template` }}" }, @@ -158,7 +158,7 @@ "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", + "ssh_timeout": "10000s", "type": "qemu", "vm_name": "{{ user `template` }}" } diff --git a/packer_templates/debian/debian-8.11-amd64.json b/packer_templates/debian/debian-8.11-amd64.json index 9def4c6bc..e679e6338 100644 --- a/packer_templates/debian/debian-8.11-amd64.json +++ b/packer_templates/debian/debian-8.11-amd64.json @@ -35,7 +35,7 @@ "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", + "ssh_timeout": "10000s", "type": "virtualbox-iso", "memory": "{{ user `memory` }}", "cpus": "{{ user `cpus` }}", @@ -74,7 +74,7 @@ "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", + "ssh_timeout": "10000s", "tools_upload_flavor": "linux", "type": "vmware-iso", "vm_name": "{{ user `template` }}", @@ -121,7 +121,7 @@ "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", + "ssh_timeout": "10000s", "type": "parallels-iso", "vm_name": "{{ user `template` }}" }, @@ -158,7 +158,7 @@ "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", + "ssh_timeout": "10000s", "type": "qemu", "vm_name": "{{ user `template` }}" } diff --git a/packer_templates/debian/debian-8.11-i386.json b/packer_templates/debian/debian-8.11-i386.json index d2b1fc7ab..75d9ef7b6 100644 --- a/packer_templates/debian/debian-8.11-i386.json +++ b/packer_templates/debian/debian-8.11-i386.json @@ -35,7 +35,7 @@ "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", + "ssh_timeout": "10000s", "type": "virtualbox-iso", "memory": "{{ user `memory` }}", "cpus": "{{ user `cpus` }}", @@ -74,7 +74,7 @@ "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", + "ssh_timeout": "10000s", "tools_upload_flavor": "linux", "type": "vmware-iso", "vm_name": "{{ user `template` }}", @@ -121,7 +121,7 @@ "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", + "ssh_timeout": "10000s", "type": "parallels-iso", "vm_name": "{{ user `template` }}" }, @@ -158,7 +158,7 @@ "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", + "ssh_timeout": "10000s", "type": "qemu", "vm_name": "{{ user `template` }}" } diff --git a/packer_templates/debian/debian-9.11-amd64.json b/packer_templates/debian/debian-9.11-amd64.json index 7d5a14f4b..1dffa78f2 100644 --- a/packer_templates/debian/debian-9.11-amd64.json +++ b/packer_templates/debian/debian-9.11-amd64.json @@ -35,7 +35,7 @@ "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", + "ssh_timeout": "10000s", "type": "virtualbox-iso", "memory": "{{ user `memory` }}", "cpus": "{{ user `cpus` }}", @@ -74,7 +74,7 @@ "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", + "ssh_timeout": "10000s", "tools_upload_flavor": "linux", "type": "vmware-iso", "vm_name": "{{ user `template` }}", @@ -121,7 +121,7 @@ "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", + "ssh_timeout": "10000s", "type": "parallels-iso", "vm_name": "{{ user `template` }}" }, @@ -158,7 +158,7 @@ "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", + "ssh_timeout": "10000s", "type": "qemu", "vm_name": "{{ user `template` }}" } diff --git a/packer_templates/debian/debian-9.11-i386.json b/packer_templates/debian/debian-9.11-i386.json index fd7dc716d..065a31ed1 100644 --- a/packer_templates/debian/debian-9.11-i386.json +++ b/packer_templates/debian/debian-9.11-i386.json @@ -35,7 +35,7 @@ "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", + "ssh_timeout": "10000s", "type": "virtualbox-iso", "memory": "{{ user `memory` }}", "cpus": "{{ user `cpus` }}", @@ -74,7 +74,7 @@ "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", + "ssh_timeout": "10000s", "tools_upload_flavor": "linux", "type": "vmware-iso", "vm_name": "{{ user `template` }}", @@ -121,7 +121,7 @@ "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", + "ssh_timeout": "10000s", "type": "parallels-iso", "vm_name": "{{ user `template` }}" }, @@ -158,7 +158,7 @@ "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", + "ssh_timeout": "10000s", "type": "qemu", "vm_name": "{{ user `template` }}" } diff --git a/packer_templates/debian/debian-9.11-ppc64el.json b/packer_templates/debian/debian-9.11-ppc64el.json index 688d7836f..46116d9e9 100644 --- a/packer_templates/debian/debian-9.11-ppc64el.json +++ b/packer_templates/debian/debian-9.11-ppc64el.json @@ -38,7 +38,7 @@ "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", + "ssh_timeout": "10000s", "type": "qemu", "qemu_binary": "qemu-system-ppc64le", "machine_type": "pseries", diff --git a/packer_templates/fedora/fedora-30-x86_64.json b/packer_templates/fedora/fedora-30-x86_64.json index b33094c8b..c571efc7b 100644 --- a/packer_templates/fedora/fedora-30-x86_64.json +++ b/packer_templates/fedora/fedora-30-x86_64.json @@ -27,7 +27,7 @@ "ssh_username": "vagrant", "ssh_password": "vagrant", "ssh_port": 22, - "ssh_wait_timeout": "3600s", + "ssh_timeout": "3600s", "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now" }, { @@ -50,7 +50,7 @@ "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", + "ssh_timeout": "10000s", "type": "virtualbox-iso", "memory": "{{ user `memory` }}", "cpus": "{{ user `cpus` }}", @@ -74,7 +74,7 @@ "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", + "ssh_timeout": "10000s", "tools_upload_flavor": "linux", "type": "vmware-iso", "vm_name": "{{ user `template` }}", @@ -106,7 +106,7 @@ "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", + "ssh_timeout": "10000s", "type": "parallels-iso", "vm_name": "{{ user `template` }}" }, @@ -128,7 +128,7 @@ "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", + "ssh_timeout": "10000s", "type": "qemu", "vm_name": "{{ user `template` }}" } diff --git a/packer_templates/fedora/fedora-31-x86_64.json b/packer_templates/fedora/fedora-31-x86_64.json index deca55ba7..c91c7bd2e 100644 --- a/packer_templates/fedora/fedora-31-x86_64.json +++ b/packer_templates/fedora/fedora-31-x86_64.json @@ -27,7 +27,7 @@ "ssh_username": "vagrant", "ssh_password": "vagrant", "ssh_port": 22, - "ssh_wait_timeout": "3600s", + "ssh_timeout": "3600s", "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now" }, { @@ -50,7 +50,7 @@ "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", + "ssh_timeout": "10000s", "type": "virtualbox-iso", "memory": "{{ user `memory` }}", "cpus": "{{ user `cpus` }}", @@ -74,7 +74,7 @@ "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", + "ssh_timeout": "10000s", "tools_upload_flavor": "linux", "type": "vmware-iso", "vm_name": "{{ user `template` }}", @@ -106,7 +106,7 @@ "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", + "ssh_timeout": "10000s", "type": "parallels-iso", "vm_name": "{{ user `template` }}" }, @@ -128,7 +128,7 @@ "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", + "ssh_timeout": "10000s", "type": "qemu", "vm_name": "{{ user `template` }}" } diff --git a/packer_templates/freebsd/freebsd-11.3-amd64.json b/packer_templates/freebsd/freebsd-11.3-amd64.json index b9047b437..e1ffa2d99 100644 --- a/packer_templates/freebsd/freebsd-11.3-amd64.json +++ b/packer_templates/freebsd/freebsd-11.3-amd64.json @@ -28,7 +28,7 @@ "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", + "ssh_timeout": "10000s", "type": "virtualbox-iso", "virtualbox_version_file": ".vbox_version", "vm_name": "{{ user `template` }}" @@ -61,7 +61,7 @@ "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", + "ssh_timeout": "10000s", "type": "vmware-iso", "vm_name": "{{ user `template` }}", "vmx_data": { @@ -119,7 +119,7 @@ "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", + "ssh_timeout": "10000s", "type": "parallels-iso", "vm_name": "{{ user `template` }}" }, @@ -149,7 +149,7 @@ "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", + "ssh_timeout": "10000s", "type": "qemu", "vm_name": "{{ user `template` }}" } diff --git a/packer_templates/freebsd/freebsd-11.3-i386.json b/packer_templates/freebsd/freebsd-11.3-i386.json index b7354baf7..10dd22df1 100644 --- a/packer_templates/freebsd/freebsd-11.3-i386.json +++ b/packer_templates/freebsd/freebsd-11.3-i386.json @@ -28,7 +28,7 @@ "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", + "ssh_timeout": "10000s", "type": "virtualbox-iso", "virtualbox_version_file": ".vbox_version", "vm_name": "{{ user `template` }}" @@ -61,7 +61,7 @@ "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", + "ssh_timeout": "10000s", "type": "vmware-iso", "vm_name": "{{ user `template` }}", "vmx_data": { @@ -119,7 +119,7 @@ "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", + "ssh_timeout": "10000s", "type": "parallels-iso", "vm_name": "{{ user `template` }}" }, @@ -149,7 +149,7 @@ "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", + "ssh_timeout": "10000s", "type": "qemu", "vm_name": "{{ user `template` }}" } diff --git a/packer_templates/freebsd/freebsd-12.0-amd64.json b/packer_templates/freebsd/freebsd-12.0-amd64.json index 728199edf..ff55978fe 100644 --- a/packer_templates/freebsd/freebsd-12.0-amd64.json +++ b/packer_templates/freebsd/freebsd-12.0-amd64.json @@ -28,7 +28,7 @@ "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", + "ssh_timeout": "10000s", "type": "virtualbox-iso", "virtualbox_version_file": ".vbox_version", "vm_name": "{{ user `template` }}" @@ -61,7 +61,7 @@ "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", + "ssh_timeout": "10000s", "type": "vmware-iso", "vm_name": "{{ user `template` }}", "vmx_data": { @@ -119,7 +119,7 @@ "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", + "ssh_timeout": "10000s", "type": "parallels-iso", "vm_name": "{{ user `template` }}" }, @@ -149,7 +149,7 @@ "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", + "ssh_timeout": "10000s", "type": "qemu", "vm_name": "{{ user `template` }}" } diff --git a/packer_templates/freebsd/freebsd-12.0-i386.json b/packer_templates/freebsd/freebsd-12.0-i386.json index 0d01b56c8..f069f1e92 100644 --- a/packer_templates/freebsd/freebsd-12.0-i386.json +++ b/packer_templates/freebsd/freebsd-12.0-i386.json @@ -28,7 +28,7 @@ "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", + "ssh_timeout": "10000s", "type": "virtualbox-iso", "virtualbox_version_file": ".vbox_version", "vm_name": "{{ user `template` }}" @@ -61,7 +61,7 @@ "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", + "ssh_timeout": "10000s", "type": "vmware-iso", "vm_name": "{{ user `template` }}", "vmx_data": { @@ -119,7 +119,7 @@ "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", + "ssh_timeout": "10000s", "type": "parallels-iso", "vm_name": "{{ user `template` }}" }, @@ -149,7 +149,7 @@ "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", + "ssh_timeout": "10000s", "type": "qemu", "vm_name": "{{ user `template` }}" } diff --git a/packer_templates/freebsd/freebsd-12.1-amd64.json b/packer_templates/freebsd/freebsd-12.1-amd64.json index e8fb9c3d4..9c5c38754 100644 --- a/packer_templates/freebsd/freebsd-12.1-amd64.json +++ b/packer_templates/freebsd/freebsd-12.1-amd64.json @@ -28,7 +28,7 @@ "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", + "ssh_timeout": "10000s", "type": "virtualbox-iso", "virtualbox_version_file": ".vbox_version", "vm_name": "{{ user `template` }}" @@ -61,7 +61,7 @@ "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", + "ssh_timeout": "10000s", "type": "vmware-iso", "vm_name": "{{ user `template` }}", "vmx_data": { @@ -119,7 +119,7 @@ "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", + "ssh_timeout": "10000s", "type": "parallels-iso", "vm_name": "{{ user `template` }}" }, @@ -149,7 +149,7 @@ "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", + "ssh_timeout": "10000s", "type": "qemu", "vm_name": "{{ user `template` }}" } diff --git a/packer_templates/freebsd/freebsd-12.1-i386.json b/packer_templates/freebsd/freebsd-12.1-i386.json index cce7ac57f..591bf8299 100644 --- a/packer_templates/freebsd/freebsd-12.1-i386.json +++ b/packer_templates/freebsd/freebsd-12.1-i386.json @@ -28,7 +28,7 @@ "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", + "ssh_timeout": "10000s", "type": "virtualbox-iso", "virtualbox_version_file": ".vbox_version", "vm_name": "{{ user `template` }}" @@ -61,7 +61,7 @@ "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", + "ssh_timeout": "10000s", "type": "vmware-iso", "vm_name": "{{ user `template` }}", "vmx_data": { @@ -119,7 +119,7 @@ "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", + "ssh_timeout": "10000s", "type": "parallels-iso", "vm_name": "{{ user `template` }}" }, @@ -149,7 +149,7 @@ "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", + "ssh_timeout": "10000s", "type": "qemu", "vm_name": "{{ user `template` }}" } diff --git a/packer_templates/hardenedbsd/hardenedbsd-11-amd64.json b/packer_templates/hardenedbsd/hardenedbsd-11-amd64.json index 7928e705b..6e87c0a73 100644 --- a/packer_templates/hardenedbsd/hardenedbsd-11-amd64.json +++ b/packer_templates/hardenedbsd/hardenedbsd-11-amd64.json @@ -28,7 +28,7 @@ "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", + "ssh_timeout": "10000s", "type": "virtualbox-iso", "virtualbox_version_file": ".vbox_version", "vm_name": "{{ user `template` }}" @@ -61,7 +61,7 @@ "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", + "ssh_timeout": "10000s", "type": "vmware-iso", "vm_name": "{{ user `template` }}", "vmx_data": { @@ -119,7 +119,7 @@ "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", + "ssh_timeout": "10000s", "type": "parallels-iso", "vm_name": "{{ user `template` }}" }, @@ -149,7 +149,7 @@ "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", + "ssh_timeout": "10000s", "type": "qemu", "vm_name": "{{ user `template` }}" } diff --git a/packer_templates/macos/macos-10.12.json b/packer_templates/macos/macos-10.12.json index 4a651f0d5..e7f11e3e1 100644 --- a/packer_templates/macos/macos-10.12.json +++ b/packer_templates/macos/macos-10.12.json @@ -17,7 +17,7 @@ "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", + "ssh_timeout": "10000s", "tools_upload_flavor": "darwin", "tools_upload_path": "/tmp/vmtools.iso", "type": "vmware-iso", @@ -50,7 +50,7 @@ "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", + "ssh_timeout": "10000s", "type": "virtualbox-iso", "vboxmanage": [ [ @@ -167,7 +167,7 @@ "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", + "ssh_timeout": "10000s", "type": "parallels-iso", "vm_name": "{{ user `template` }}" } @@ -231,4 +231,3 @@ "version": "TIMESTAMP" } } - diff --git a/packer_templates/macos/macosx-10.11.json b/packer_templates/macos/macosx-10.11.json index b6630a2c0..70b8b8cae 100644 --- a/packer_templates/macos/macosx-10.11.json +++ b/packer_templates/macos/macosx-10.11.json @@ -17,7 +17,7 @@ "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", + "ssh_timeout": "10000s", "tools_upload_flavor": "darwin", "tools_upload_path": "/tmp/vmtools.iso", "type": "vmware-iso", @@ -50,7 +50,7 @@ "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", + "ssh_timeout": "10000s", "type": "virtualbox-iso", "vboxmanage": [ [ @@ -167,7 +167,7 @@ "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", + "ssh_timeout": "10000s", "type": "parallels-iso", "vm_name": "{{ user `template` }}" } @@ -231,4 +231,3 @@ "version": "TIMESTAMP" } } - diff --git a/packer_templates/opensuse/opensuse-leap-15.1-x86_64.json b/packer_templates/opensuse/opensuse-leap-15.1-x86_64.json index 9ef4ae7d2..e0447bd2f 100644 --- a/packer_templates/opensuse/opensuse-leap-15.1-x86_64.json +++ b/packer_templates/opensuse/opensuse-leap-15.1-x86_64.json @@ -29,7 +29,7 @@ "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", + "ssh_timeout": "10000s", "type": "virtualbox-iso", "memory": "{{ user `memory` }}", "cpus": "{{ user `cpus` }}", @@ -62,7 +62,7 @@ "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", + "ssh_timeout": "10000s", "tools_upload_flavor": "linux", "type": "vmware-iso", "vm_name": "{{ user `template` }}", @@ -102,7 +102,7 @@ "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", + "ssh_timeout": "10000s", "type": "parallels-iso", "vm_name": "{{ user `template` }}" }, @@ -128,7 +128,7 @@ "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", + "ssh_timeout": "10000s", "type": "qemu", "vm_name": "{{ user `template` }}" } diff --git a/packer_templates/oraclelinux/oracle-5.11-i386.json b/packer_templates/oraclelinux/oracle-5.11-i386.json index c9722a1bf..439f280f4 100644 --- a/packer_templates/oraclelinux/oracle-5.11-i386.json +++ b/packer_templates/oraclelinux/oracle-5.11-i386.json @@ -20,7 +20,7 @@ "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", + "ssh_timeout": "10000s", "type": "virtualbox-iso", "memory": "{{ user `memory` }}", "cpus": "{{ user `cpus` }}", @@ -44,7 +44,7 @@ "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", + "ssh_timeout": "10000s", "tools_upload_flavor": "linux", "type": "vmware-iso", "vm_name": "{{ user `template` }}", @@ -75,7 +75,7 @@ "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", + "ssh_timeout": "10000s", "type": "parallels-iso", "vm_name": "{{ user `template` }}" }, @@ -124,7 +124,7 @@ "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", + "ssh_timeout": "10000s", "type": "qemu", "vm_name": "{{ user `template` }}" } diff --git a/packer_templates/oraclelinux/oracle-5.11-x86_64.json b/packer_templates/oraclelinux/oracle-5.11-x86_64.json index ca12eb388..3391d2e73 100644 --- a/packer_templates/oraclelinux/oracle-5.11-x86_64.json +++ b/packer_templates/oraclelinux/oracle-5.11-x86_64.json @@ -20,7 +20,7 @@ "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", + "ssh_timeout": "10000s", "type": "virtualbox-iso", "memory": "{{ user `memory` }}", "cpus": "{{ user `cpus` }}", @@ -52,7 +52,7 @@ "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", + "ssh_timeout": "10000s", "tools_upload_flavor": "linux", "type": "vmware-iso", "vm_name": "{{ user `template` }}", @@ -83,7 +83,7 @@ "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", + "ssh_timeout": "10000s", "type": "parallels-iso", "vm_name": "{{ user `template` }}" }, @@ -132,7 +132,7 @@ "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", + "ssh_timeout": "10000s", "type": "qemu", "vm_name": "{{ user `template` }}" } diff --git a/packer_templates/oraclelinux/oracle-6.10-i386.json b/packer_templates/oraclelinux/oracle-6.10-i386.json index 1fa7ce864..9123d181d 100644 --- a/packer_templates/oraclelinux/oracle-6.10-i386.json +++ b/packer_templates/oraclelinux/oracle-6.10-i386.json @@ -20,7 +20,7 @@ "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", + "ssh_timeout": "10000s", "type": "virtualbox-iso", "memory": "{{ user `memory` }}", "cpus": "{{ user `cpus` }}", @@ -44,7 +44,7 @@ "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", + "ssh_timeout": "10000s", "tools_upload_flavor": "linux", "type": "vmware-iso", "vm_name": "{{ user `template` }}", @@ -75,7 +75,7 @@ "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", + "ssh_timeout": "10000s", "type": "parallels-iso", "vm_name": "{{ user `template` }}" }, @@ -124,7 +124,7 @@ "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", + "ssh_timeout": "10000s", "type": "qemu", "vm_name": "{{ user `template` }}" } diff --git a/packer_templates/oraclelinux/oracle-6.10-x86_64.json b/packer_templates/oraclelinux/oracle-6.10-x86_64.json index 83ec220cc..7ba835c84 100644 --- a/packer_templates/oraclelinux/oracle-6.10-x86_64.json +++ b/packer_templates/oraclelinux/oracle-6.10-x86_64.json @@ -20,7 +20,7 @@ "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", + "ssh_timeout": "10000s", "type": "virtualbox-iso", "memory": "{{ user `memory` }}", "cpus": "{{ user `cpus` }}", @@ -44,7 +44,7 @@ "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", + "ssh_timeout": "10000s", "tools_upload_flavor": "linux", "type": "vmware-iso", "vm_name": "{{ user `template` }}", @@ -75,7 +75,7 @@ "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", + "ssh_timeout": "10000s", "type": "parallels-iso", "vm_name": "{{ user `template` }}" }, @@ -124,7 +124,7 @@ "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", + "ssh_timeout": "10000s", "type": "qemu", "vm_name": "{{ user `template` }}" } diff --git a/packer_templates/oraclelinux/oracle-7.7-x86_64.json b/packer_templates/oraclelinux/oracle-7.7-x86_64.json index 4b5972e9b..b21e3725d 100644 --- a/packer_templates/oraclelinux/oracle-7.7-x86_64.json +++ b/packer_templates/oraclelinux/oracle-7.7-x86_64.json @@ -20,7 +20,7 @@ "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", + "ssh_timeout": "10000s", "type": "virtualbox-iso", "memory": "{{ user `memory` }}", "cpus": "{{ user `cpus` }}", @@ -44,7 +44,7 @@ "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", + "ssh_timeout": "10000s", "tools_upload_flavor": "linux", "type": "vmware-iso", "vm_name": "{{ user `template` }}", @@ -75,7 +75,7 @@ "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", + "ssh_timeout": "10000s", "type": "parallels-iso", "vm_name": "{{ user `template` }}" }, @@ -124,7 +124,7 @@ "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", + "ssh_timeout": "10000s", "type": "qemu", "vm_name": "{{ user `template` }}" } diff --git a/packer_templates/oraclelinux/oracle-8.1-x86_64.json b/packer_templates/oraclelinux/oracle-8.1-x86_64.json index c35c8878c..28edbf4ec 100644 --- a/packer_templates/oraclelinux/oracle-8.1-x86_64.json +++ b/packer_templates/oraclelinux/oracle-8.1-x86_64.json @@ -20,7 +20,7 @@ "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", + "ssh_timeout": "10000s", "type": "virtualbox-iso", "memory": "{{ user `memory` }}", "cpus": "{{ user `cpus` }}", @@ -44,7 +44,7 @@ "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", + "ssh_timeout": "10000s", "tools_upload_flavor": "linux", "type": "vmware-iso", "vm_name": "{{ user `template` }}", @@ -75,7 +75,7 @@ "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", + "ssh_timeout": "10000s", "type": "parallels-iso", "vm_name": "{{ user `template` }}" }, @@ -124,7 +124,7 @@ "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", + "ssh_timeout": "10000s", "type": "qemu", "vm_name": "{{ user `template` }}" } diff --git a/packer_templates/rhel/rhel-5.11-i386.json b/packer_templates/rhel/rhel-5.11-i386.json index 5d914fc4e..87dbb4462 100644 --- a/packer_templates/rhel/rhel-5.11-i386.json +++ b/packer_templates/rhel/rhel-5.11-i386.json @@ -20,7 +20,7 @@ "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", + "ssh_timeout": "10000s", "type": "virtualbox-iso", "memory": "{{ user `memory` }}", "cpus": "{{ user `cpus` }}", @@ -44,7 +44,7 @@ "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", + "ssh_timeout": "10000s", "tools_upload_flavor": "linux", "type": "vmware-iso", "vm_name": "{{ user `template` }}", @@ -75,7 +75,7 @@ "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", + "ssh_timeout": "10000s", "type": "parallels-iso", "vm_name": "{{ user `template` }}" }, @@ -97,7 +97,7 @@ "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", + "ssh_timeout": "10000s", "type": "qemu", "vm_name": "{{ user `template` }}" } diff --git a/packer_templates/rhel/rhel-5.11-x86_64.json b/packer_templates/rhel/rhel-5.11-x86_64.json index 2b07cec92..fba2895f9 100644 --- a/packer_templates/rhel/rhel-5.11-x86_64.json +++ b/packer_templates/rhel/rhel-5.11-x86_64.json @@ -20,7 +20,7 @@ "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", + "ssh_timeout": "10000s", "type": "virtualbox-iso", "memory": "{{ user `memory` }}", "cpus": "{{ user `cpus` }}", @@ -52,7 +52,7 @@ "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", + "ssh_timeout": "10000s", "tools_upload_flavor": "linux", "type": "vmware-iso", "vm_name": "{{ user `template` }}", @@ -83,7 +83,7 @@ "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", + "ssh_timeout": "10000s", "type": "parallels-iso", "vm_name": "{{ user `template` }}" }, @@ -105,7 +105,7 @@ "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", + "ssh_timeout": "10000s", "type": "qemu", "vm_name": "{{ user `template` }}" } diff --git a/packer_templates/rhel/rhel-6.10-i386.json b/packer_templates/rhel/rhel-6.10-i386.json index 9c15fd985..a8f1bfebc 100644 --- a/packer_templates/rhel/rhel-6.10-i386.json +++ b/packer_templates/rhel/rhel-6.10-i386.json @@ -20,7 +20,7 @@ "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", + "ssh_timeout": "10000s", "type": "virtualbox-iso", "memory": "{{ user `memory` }}", "cpus": "{{ user `cpus` }}", @@ -44,7 +44,7 @@ "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", + "ssh_timeout": "10000s", "tools_upload_flavor": "linux", "type": "vmware-iso", "vm_name": "{{ user `template` }}", @@ -75,7 +75,7 @@ "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", + "ssh_timeout": "10000s", "type": "parallels-iso", "vm_name": "{{ user `template` }}" }, @@ -97,7 +97,7 @@ "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", + "ssh_timeout": "10000s", "type": "qemu", "vm_name": "{{ user `template` }}" } diff --git a/packer_templates/rhel/rhel-6.10-x86_64.json b/packer_templates/rhel/rhel-6.10-x86_64.json index f2b3aaac4..6b9369c34 100644 --- a/packer_templates/rhel/rhel-6.10-x86_64.json +++ b/packer_templates/rhel/rhel-6.10-x86_64.json @@ -20,7 +20,7 @@ "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", + "ssh_timeout": "10000s", "type": "virtualbox-iso", "memory": "{{ user `memory` }}", "cpus": "{{ user `cpus` }}", @@ -44,7 +44,7 @@ "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", + "ssh_timeout": "10000s", "tools_upload_flavor": "linux", "type": "vmware-iso", "vm_name": "{{ user `template` }}", @@ -75,7 +75,7 @@ "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", + "ssh_timeout": "10000s", "type": "parallels-iso", "vm_name": "{{ user `template` }}" }, @@ -97,7 +97,7 @@ "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", + "ssh_timeout": "10000s", "type": "qemu", "vm_name": "{{ user `template` }}" } diff --git a/packer_templates/rhel/rhel-7.6-x86_64.json b/packer_templates/rhel/rhel-7.6-x86_64.json index 8df31afb0..b2826f942 100644 --- a/packer_templates/rhel/rhel-7.6-x86_64.json +++ b/packer_templates/rhel/rhel-7.6-x86_64.json @@ -20,7 +20,7 @@ "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", + "ssh_timeout": "10000s", "type": "virtualbox-iso", "memory": "{{ user `memory` }}", "cpus": "{{ user `cpus` }}", @@ -44,7 +44,7 @@ "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", + "ssh_timeout": "10000s", "tools_upload_flavor": "linux", "type": "vmware-iso", "vm_name": "{{ user `template` }}", @@ -75,7 +75,7 @@ "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", + "ssh_timeout": "10000s", "type": "parallels-iso", "vm_name": "{{ user `template` }}" }, @@ -97,7 +97,7 @@ "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", + "ssh_timeout": "10000s", "type": "qemu", "vm_name": "{{ user `template` }}" } diff --git a/packer_templates/rhel/rhel-8.0-x86_64.json b/packer_templates/rhel/rhel-8.0-x86_64.json index c3b5b1617..c4313d767 100644 --- a/packer_templates/rhel/rhel-8.0-x86_64.json +++ b/packer_templates/rhel/rhel-8.0-x86_64.json @@ -20,7 +20,7 @@ "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", + "ssh_timeout": "10000s", "type": "virtualbox-iso", "memory": "{{ user `memory` }}", "cpus": "{{ user `cpus` }}", @@ -44,7 +44,7 @@ "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", + "ssh_timeout": "10000s", "tools_upload_flavor": "linux", "type": "vmware-iso", "vm_name": "{{ user `template` }}", @@ -75,7 +75,7 @@ "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", + "ssh_timeout": "10000s", "type": "parallels-iso", "vm_name": "{{ user `template` }}" }, @@ -97,7 +97,7 @@ "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", + "ssh_timeout": "10000s", "type": "qemu", "vm_name": "{{ user `template` }}" } diff --git a/packer_templates/scientificlinux/scientific-7.7-x86_64.json b/packer_templates/scientificlinux/scientific-7.7-x86_64.json index 079ff8470..c2e011779 100644 --- a/packer_templates/scientificlinux/scientific-7.7-x86_64.json +++ b/packer_templates/scientificlinux/scientific-7.7-x86_64.json @@ -20,7 +20,7 @@ "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", + "ssh_timeout": "10000s", "type": "virtualbox-iso", "memory": "{{ user `memory` }}", "cpus": "{{ user `cpus` }}", @@ -44,7 +44,7 @@ "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", + "ssh_timeout": "10000s", "tools_upload_flavor": "linux", "type": "vmware-iso", "vm_name": "{{ user `template` }}", @@ -75,7 +75,7 @@ "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", + "ssh_timeout": "10000s", "type": "parallels-iso", "vm_name": "{{ user `template` }}" }, @@ -124,7 +124,7 @@ "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", + "ssh_timeout": "10000s", "type": "qemu", "vm_name": "{{ user `template` }}" } diff --git a/packer_templates/sles/sles-11-sp4-x86_64.json b/packer_templates/sles/sles-11-sp4-x86_64.json index 9ef968b25..c11a86573 100644 --- a/packer_templates/sles/sles-11-sp4-x86_64.json +++ b/packer_templates/sles/sles-11-sp4-x86_64.json @@ -24,7 +24,7 @@ "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", + "ssh_timeout": "10000s", "type": "virtualbox-iso", "memory": "{{ user `memory` }}", "cpus": "{{ user `cpus` }}", @@ -52,7 +52,7 @@ "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", + "ssh_timeout": "10000s", "tools_upload_flavor": "linux", "type": "vmware-iso", "vm_name": "{{ user `template` }}", @@ -87,7 +87,7 @@ "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", + "ssh_timeout": "10000s", "type": "parallels-iso", "vm_name": "{{ user `template` }}" }, @@ -113,7 +113,7 @@ "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", + "ssh_timeout": "10000s", "type": "qemu", "vm_name": "{{ user `template` }}" } diff --git a/packer_templates/sles/sles-12-sp2-x86_64.json b/packer_templates/sles/sles-12-sp2-x86_64.json index 750d0cb84..be4c1c86e 100644 --- a/packer_templates/sles/sles-12-sp2-x86_64.json +++ b/packer_templates/sles/sles-12-sp2-x86_64.json @@ -24,7 +24,7 @@ "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", + "ssh_timeout": "10000s", "type": "virtualbox-iso", "memory": "{{ user `memory` }}", "cpus": "{{ user `cpus` }}", @@ -52,7 +52,7 @@ "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", + "ssh_timeout": "10000s", "tools_upload_flavor": "linux", "type": "vmware-iso", "vm_name": "{{ user `template` }}", @@ -87,7 +87,7 @@ "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", + "ssh_timeout": "10000s", "type": "parallels-iso", "vm_name": "{{ user `template` }}" }, @@ -113,7 +113,7 @@ "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", + "ssh_timeout": "10000s", "type": "qemu", "vm_name": "{{ user `template` }}" } diff --git a/packer_templates/sles/sles-12-sp3-x86_64.json b/packer_templates/sles/sles-12-sp3-x86_64.json index f5ffb0f53..e2e95f802 100644 --- a/packer_templates/sles/sles-12-sp3-x86_64.json +++ b/packer_templates/sles/sles-12-sp3-x86_64.json @@ -24,7 +24,7 @@ "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", + "ssh_timeout": "10000s", "type": "virtualbox-iso", "memory": "{{ user `memory` }}", "cpus": "{{ user `cpus` }}", @@ -52,7 +52,7 @@ "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", + "ssh_timeout": "10000s", "tools_upload_flavor": "linux", "type": "vmware-iso", "vm_name": "{{ user `template` }}", @@ -87,7 +87,7 @@ "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", + "ssh_timeout": "10000s", "type": "parallels-iso", "vm_name": "{{ user `template` }}" }, @@ -113,7 +113,7 @@ "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", + "ssh_timeout": "10000s", "type": "qemu", "vm_name": "{{ user `template` }}" } diff --git a/packer_templates/sles/sles-15-sp1.json b/packer_templates/sles/sles-15-sp1.json index e9ae1e6b3..e11d1d37a 100644 --- a/packer_templates/sles/sles-15-sp1.json +++ b/packer_templates/sles/sles-15-sp1.json @@ -24,7 +24,7 @@ "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", + "ssh_timeout": "10000s", "type": "virtualbox-iso", "memory": "{{ user `memory` }}", "cpus": "{{ user `cpus` }}", @@ -68,7 +68,7 @@ "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", + "ssh_timeout": "10000s", "tools_upload_flavor": "linux", "type": "vmware-iso", "vm_name": "{{ user `template` }}", @@ -103,7 +103,7 @@ "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", + "ssh_timeout": "10000s", "type": "parallels-iso", "vm_name": "{{ user `template` }}" }, @@ -129,7 +129,7 @@ "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", + "ssh_timeout": "10000s", "type": "qemu", "vm_name": "{{ user `template` }}", "qemuargs": [ diff --git a/packer_templates/sles/sles-15.json b/packer_templates/sles/sles-15.json index a5f2e9cb9..8e240c697 100644 --- a/packer_templates/sles/sles-15.json +++ b/packer_templates/sles/sles-15.json @@ -24,7 +24,7 @@ "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", + "ssh_timeout": "10000s", "type": "virtualbox-iso", "memory": "{{ user `memory` }}", "cpus": "{{ user `cpus` }}", @@ -68,7 +68,7 @@ "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", + "ssh_timeout": "10000s", "tools_upload_flavor": "linux", "type": "vmware-iso", "vm_name": "{{ user `template` }}", @@ -103,7 +103,7 @@ "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", + "ssh_timeout": "10000s", "type": "parallels-iso", "vm_name": "{{ user `template` }}" }, @@ -129,7 +129,7 @@ "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", + "ssh_timeout": "10000s", "type": "qemu", "vm_name": "{{ user `template` }}", "qemuargs": [ diff --git a/packer_templates/solaris/solaris-11-x86.json b/packer_templates/solaris/solaris-11-x86.json index d58f053ad..45954cf02 100644 --- a/packer_templates/solaris/solaris-11-x86.json +++ b/packer_templates/solaris/solaris-11-x86.json @@ -44,7 +44,7 @@ "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", + "ssh_timeout": "10000s", "type": "virtualbox-iso", "memory": "{{ user `memory` }}", "cpus": "{{ user `cpus` }}", @@ -93,7 +93,7 @@ "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", + "ssh_timeout": "10000s", "type": "vmware-iso", "vm_name": "{{ user `template` }}", "memory": "{{ user `memory` }}", diff --git a/packer_templates/ubuntu/ubuntu-16.04-amd64.json b/packer_templates/ubuntu/ubuntu-16.04-amd64.json index b8a1061c4..de09b0d4d 100644 --- a/packer_templates/ubuntu/ubuntu-16.04-amd64.json +++ b/packer_templates/ubuntu/ubuntu-16.04-amd64.json @@ -43,7 +43,7 @@ "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", + "ssh_timeout": "10000s", "type": "virtualbox-iso", "memory": "{{ user `memory` }}", "cpus": "{{ user `cpus` }}", @@ -90,7 +90,7 @@ "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", + "ssh_timeout": "10000s", "tools_upload_flavor": "linux", "type": "vmware-iso", "vm_name": "{{ user `template` }}", @@ -145,7 +145,7 @@ "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", + "ssh_timeout": "10000s", "type": "parallels-iso", "vm_name": "{{ user `template` }}" }, @@ -190,7 +190,7 @@ "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", + "ssh_timeout": "10000s", "type": "qemu", "vm_name": "{{ user `template` }}" }, diff --git a/packer_templates/ubuntu/ubuntu-16.04-i386.json b/packer_templates/ubuntu/ubuntu-16.04-i386.json index 5a46aa2a0..bb7ee4dbc 100644 --- a/packer_templates/ubuntu/ubuntu-16.04-i386.json +++ b/packer_templates/ubuntu/ubuntu-16.04-i386.json @@ -43,7 +43,7 @@ "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", + "ssh_timeout": "10000s", "type": "virtualbox-iso", "memory": "{{ user `memory` }}", "cpus": "{{ user `cpus` }}", @@ -90,7 +90,7 @@ "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", + "ssh_timeout": "10000s", "tools_upload_flavor": "linux", "type": "vmware-iso", "vm_name": "{{ user `template` }}", @@ -144,7 +144,7 @@ "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", + "ssh_timeout": "10000s", "type": "parallels-iso", "vm_name": "{{ user `template` }}" }, @@ -189,7 +189,7 @@ "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", + "ssh_timeout": "10000s", "type": "qemu", "vm_name": "{{ user `template` }}" }, diff --git a/packer_templates/ubuntu/ubuntu-18.04-amd64.json b/packer_templates/ubuntu/ubuntu-18.04-amd64.json index c95514b8f..e93ea107e 100644 --- a/packer_templates/ubuntu/ubuntu-18.04-amd64.json +++ b/packer_templates/ubuntu/ubuntu-18.04-amd64.json @@ -42,7 +42,7 @@ "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", + "ssh_timeout": "10000s", "type": "virtualbox-iso", "memory": "{{ user `memory` }}", "cpus": "{{ user `cpus` }}", @@ -88,7 +88,7 @@ "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", + "ssh_timeout": "10000s", "tools_upload_flavor": "linux", "type": "vmware-iso", "vm_name": "{{ user `template` }}", @@ -142,7 +142,7 @@ "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", + "ssh_timeout": "10000s", "type": "parallels-iso", "vm_name": "{{ user `template` }}" }, @@ -186,7 +186,7 @@ "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", + "ssh_timeout": "10000s", "type": "qemu", "vm_name": "{{ user `template` }}" }, diff --git a/packer_templates/ubuntu/ubuntu-19.10-amd64.json b/packer_templates/ubuntu/ubuntu-19.10-amd64.json index f779eac47..81c7dba71 100644 --- a/packer_templates/ubuntu/ubuntu-19.10-amd64.json +++ b/packer_templates/ubuntu/ubuntu-19.10-amd64.json @@ -42,7 +42,7 @@ "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", + "ssh_timeout": "10000s", "type": "virtualbox-iso", "memory": "{{ user `memory` }}", "cpus": "{{ user `cpus` }}", @@ -88,7 +88,7 @@ "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", + "ssh_timeout": "10000s", "tools_upload_flavor": "linux", "type": "vmware-iso", "vm_name": "{{ user `template` }}", @@ -142,7 +142,7 @@ "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", + "ssh_timeout": "10000s", "type": "parallels-iso", "vm_name": "{{ user `template` }}" }, @@ -186,7 +186,7 @@ "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", + "ssh_timeout": "10000s", "type": "qemu", "vm_name": "{{ user `template` }}" }, From bb4402c1f7a17b88531cf445f6f344fbd0fe1a51 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Wed, 11 Mar 2020 21:44:12 -0700 Subject: [PATCH 1160/1622] Switch debian to open-vm-tools I'll move this to common eventually, but for now it's a one off using ubuntu logic Signed-off-by: Tim Smith <tsmith@chef.io> --- packer_templates/debian/debian-10.2-amd64.json | 2 +- packer_templates/debian/debian-10.2-i386.json | 2 +- packer_templates/debian/debian-8.11-amd64.json | 2 +- packer_templates/debian/debian-8.11-i386.json | 2 +- packer_templates/debian/debian-9.11-amd64.json | 2 +- packer_templates/debian/debian-9.11-i386.json | 2 +- packer_templates/debian/debian-9.11-ppc64el.json | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/packer_templates/debian/debian-10.2-amd64.json b/packer_templates/debian/debian-10.2-amd64.json index 1f090531a..6b387c84d 100644 --- a/packer_templates/debian/debian-10.2-amd64.json +++ b/packer_templates/debian/debian-10.2-amd64.json @@ -188,7 +188,7 @@ "{{template_dir}}/../_common/vagrant.sh", "{{template_dir}}/scripts/systemd.sh", "{{template_dir}}/../_common/virtualbox.sh", - "{{template_dir}}/../_common/vmware.sh", + "{{template_dir}}/../ubuntu/scripts/vmware.sh", "{{template_dir}}/../_common/parallels.sh", "{{template_dir}}/scripts/cleanup.sh", "{{template_dir}}/../_common/minimize.sh" diff --git a/packer_templates/debian/debian-10.2-i386.json b/packer_templates/debian/debian-10.2-i386.json index 7c49091d4..aadb838c7 100644 --- a/packer_templates/debian/debian-10.2-i386.json +++ b/packer_templates/debian/debian-10.2-i386.json @@ -188,7 +188,7 @@ "{{template_dir}}/../_common/vagrant.sh", "{{template_dir}}/scripts/systemd.sh", "{{template_dir}}/../_common/virtualbox.sh", - "{{template_dir}}/../_common/vmware.sh", + "{{template_dir}}/../ubuntu/scripts/vmware.sh", "{{template_dir}}/../_common/parallels.sh", "{{template_dir}}/scripts/cleanup.sh", "{{template_dir}}/../_common/minimize.sh" diff --git a/packer_templates/debian/debian-8.11-amd64.json b/packer_templates/debian/debian-8.11-amd64.json index e679e6338..c26846530 100644 --- a/packer_templates/debian/debian-8.11-amd64.json +++ b/packer_templates/debian/debian-8.11-amd64.json @@ -188,7 +188,7 @@ "{{template_dir}}/../_common/vagrant.sh", "{{template_dir}}/scripts/systemd.sh", "{{template_dir}}/../_common/virtualbox.sh", - "{{template_dir}}/../_common/vmware.sh", + "{{template_dir}}/../ubuntu/scripts/vmware.sh", "{{template_dir}}/../_common/parallels.sh", "{{template_dir}}/scripts/cleanup.sh", "{{template_dir}}/../_common/minimize.sh" diff --git a/packer_templates/debian/debian-8.11-i386.json b/packer_templates/debian/debian-8.11-i386.json index 75d9ef7b6..07c7dc14d 100644 --- a/packer_templates/debian/debian-8.11-i386.json +++ b/packer_templates/debian/debian-8.11-i386.json @@ -188,7 +188,7 @@ "{{template_dir}}/../_common/vagrant.sh", "{{template_dir}}/scripts/systemd.sh", "{{template_dir}}/../_common/virtualbox.sh", - "{{template_dir}}/../_common/vmware.sh", + "{{template_dir}}/../ubuntu/scripts/vmware.sh", "{{template_dir}}/../_common/parallels.sh", "{{template_dir}}/scripts/cleanup.sh", "{{template_dir}}/../_common/minimize.sh" diff --git a/packer_templates/debian/debian-9.11-amd64.json b/packer_templates/debian/debian-9.11-amd64.json index 1dffa78f2..e50480007 100644 --- a/packer_templates/debian/debian-9.11-amd64.json +++ b/packer_templates/debian/debian-9.11-amd64.json @@ -188,7 +188,7 @@ "{{template_dir}}/../_common/vagrant.sh", "{{template_dir}}/scripts/systemd.sh", "{{template_dir}}/../_common/virtualbox.sh", - "{{template_dir}}/../_common/vmware.sh", + "{{template_dir}}/../ubuntu/scripts/vmware.sh", "{{template_dir}}/../_common/parallels.sh", "{{template_dir}}/scripts/cleanup.sh", "{{template_dir}}/../_common/minimize.sh" diff --git a/packer_templates/debian/debian-9.11-i386.json b/packer_templates/debian/debian-9.11-i386.json index 065a31ed1..302e85a37 100644 --- a/packer_templates/debian/debian-9.11-i386.json +++ b/packer_templates/debian/debian-9.11-i386.json @@ -188,7 +188,7 @@ "{{template_dir}}/../_common/vagrant.sh", "{{template_dir}}/scripts/systemd.sh", "{{template_dir}}/../_common/virtualbox.sh", - "{{template_dir}}/../_common/vmware.sh", + "{{template_dir}}/../ubuntu/scripts/vmware.sh", "{{template_dir}}/../_common/parallels.sh", "{{template_dir}}/scripts/cleanup.sh", "{{template_dir}}/../_common/minimize.sh" diff --git a/packer_templates/debian/debian-9.11-ppc64el.json b/packer_templates/debian/debian-9.11-ppc64el.json index 46116d9e9..e1064f244 100644 --- a/packer_templates/debian/debian-9.11-ppc64el.json +++ b/packer_templates/debian/debian-9.11-ppc64el.json @@ -72,7 +72,7 @@ "{{template_dir}}/../_common/vagrant.sh", "{{template_dir}}/scripts/systemd.sh", "{{template_dir}}/../_common/virtualbox.sh", - "{{template_dir}}/../_common/vmware.sh", + "{{template_dir}}/../ubuntu/scripts/vmware.sh", "{{template_dir}}/../_common/parallels.sh", "{{template_dir}}/scripts/cleanup.sh", "{{template_dir}}/../_common/minimize.sh" From 056f3d14fbac6cf1a45423427587731df12afd02 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Wed, 11 Mar 2020 21:44:32 -0700 Subject: [PATCH 1161/1622] Move opensuse-leap to open-vm-tools as well Signed-off-by: Tim Smith <tsmith@chef.io> --- .../opensuse/opensuse-leap-15.1-x86_64.json | 2 +- packer_templates/opensuse/scripts/vmware.sh | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) create mode 100644 packer_templates/opensuse/scripts/vmware.sh diff --git a/packer_templates/opensuse/opensuse-leap-15.1-x86_64.json b/packer_templates/opensuse/opensuse-leap-15.1-x86_64.json index e0447bd2f..56d2bde5d 100644 --- a/packer_templates/opensuse/opensuse-leap-15.1-x86_64.json +++ b/packer_templates/opensuse/opensuse-leap-15.1-x86_64.json @@ -157,7 +157,7 @@ "{{template_dir}}/../_common/sshd.sh", "{{template_dir}}/../_common/vagrant.sh", "{{template_dir}}/../_common/virtualbox.sh", - "{{template_dir}}/../_common/vmware.sh", + "{{template_dir}}/scripts/vmware.sh", "{{template_dir}}/../_common/parallels.sh", "{{template_dir}}/scripts/vagrant_group.sh", "{{template_dir}}/scripts/sudoers.sh", diff --git a/packer_templates/opensuse/scripts/vmware.sh b/packer_templates/opensuse/scripts/vmware.sh new file mode 100644 index 000000000..d118b3780 --- /dev/null +++ b/packer_templates/opensuse/scripts/vmware.sh @@ -0,0 +1,10 @@ +#!/bin/sh -eux + +case "$PACKER_BUILDER_TYPE" in +vmware-iso|vmware-vmx) + zypper install -y open-vm-tools + mkdir /mnt/hgfs + systemctl enable vmtoolsd + systemctl start vmtoolsd + echo "platform specific vmware.sh executed" +esac From 2d0fa2c26d1cb81889b0552dad73f87f9140522d Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Fri, 27 Mar 2020 18:22:29 -0700 Subject: [PATCH 1162/1622] Fix deprecated package configs in the new Solaris config Signed-off-by: Tim Smith <tsmith@chef.io> --- packer_templates/solaris/solaris-11-4-x86.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packer_templates/solaris/solaris-11-4-x86.json b/packer_templates/solaris/solaris-11-4-x86.json index 1e32244cd..681689c1d 100644 --- a/packer_templates/solaris/solaris-11-4-x86.json +++ b/packer_templates/solaris/solaris-11-4-x86.json @@ -45,7 +45,7 @@ "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", + "ssh_timeout": "10000s", "type": "virtualbox-iso", "memory": "{{ user `memory` }}", "cpus": "{{ user `cpus` }}", @@ -94,7 +94,7 @@ "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", + "ssh_timeout": "10000s", "type": "vmware-iso", "vm_name": "{{ user `template` }}", "memory": "{{ user `memory` }}", From 93670da5863f821888cdfa8a8b957cf0166944c4 Mon Sep 17 00:00:00 2001 From: Damien Gustave <delovan@gmail.com> Date: Tue, 31 Mar 2020 12:32:19 +0200 Subject: [PATCH 1163/1622] Incorrect calculation of block count Block count were returned based of KB, but blocks of 1MB were written ! Signed-off-by: Damien Gustave <delovan@gmail.com> --- packer_templates/_common/minimize.sh | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/packer_templates/_common/minimize.sh b/packer_templates/_common/minimize.sh index 0173b4233..00cd94c14 100644 --- a/packer_templates/_common/minimize.sh +++ b/packer_templates/_common/minimize.sh @@ -5,14 +5,12 @@ case "$PACKER_BUILDER_TYPE" in esac # Whiteout root -count=$(df --sync -kP / | tail -n1 | awk -F ' ' '{print $4}') -count=$(($count-1)) +count=$(df --sync -kP / | tail -n1 | awk -F ' ' '{printf("%d",($4-1)/1024-1)}') dd if=/dev/zero of=/tmp/whitespace bs=1M count=$count || echo "dd exit code $? is suppressed"; rm /tmp/whitespace # Whiteout /boot -count=$(df --sync -kP /boot | tail -n1 | awk -F ' ' '{print $4}') -count=$(($count-1)) + count=$(df --sync -kP /boot | tail -n1 | awk -F ' ' '{printf("%d",($4-1)/1024-1)}') dd if=/dev/zero of=/boot/whitespace bs=1M count=$count || echo "dd exit code $? is suppressed"; rm /boot/whitespace From 7e0e0fe21daa5c153e424b01edb265710a2d0fc5 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith@chef.io> Date: Tue, 31 Mar 2020 11:36:53 -0700 Subject: [PATCH 1164/1622] Revert "Incorrect calculation of block count" --- packer_templates/_common/minimize.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/packer_templates/_common/minimize.sh b/packer_templates/_common/minimize.sh index 00cd94c14..0173b4233 100644 --- a/packer_templates/_common/minimize.sh +++ b/packer_templates/_common/minimize.sh @@ -5,12 +5,14 @@ case "$PACKER_BUILDER_TYPE" in esac # Whiteout root -count=$(df --sync -kP / | tail -n1 | awk -F ' ' '{printf("%d",($4-1)/1024-1)}') +count=$(df --sync -kP / | tail -n1 | awk -F ' ' '{print $4}') +count=$(($count-1)) dd if=/dev/zero of=/tmp/whitespace bs=1M count=$count || echo "dd exit code $? is suppressed"; rm /tmp/whitespace # Whiteout /boot - count=$(df --sync -kP /boot | tail -n1 | awk -F ' ' '{printf("%d",($4-1)/1024-1)}') +count=$(df --sync -kP /boot | tail -n1 | awk -F ' ' '{print $4}') +count=$(($count-1)) dd if=/dev/zero of=/boot/whitespace bs=1M count=$count || echo "dd exit code $? is suppressed"; rm /boot/whitespace From 9b3825e8a89e50f879b530a89493549bacb40d74 Mon Sep 17 00:00:00 2001 From: Joe Ferguson <joe@joeferguson.me> Date: Sun, 26 Apr 2020 16:00:34 -0500 Subject: [PATCH 1165/1622] Add support for Ubuntu 20.04 Changes based on updates from https://github.com/chef/bento/issues/1281#issuecomment-619618393 Signed-off-by: Joe Ferguson <joe@joeferguson.me> --- .../ubuntu/ubuntu-20.04-amd64.json | 288 ++++++++++++++++++ 1 file changed, 288 insertions(+) create mode 100644 packer_templates/ubuntu/ubuntu-20.04-amd64.json diff --git a/packer_templates/ubuntu/ubuntu-20.04-amd64.json b/packer_templates/ubuntu/ubuntu-20.04-amd64.json new file mode 100644 index 000000000..254447e6b --- /dev/null +++ b/packer_templates/ubuntu/ubuntu-20.04-amd64.json @@ -0,0 +1,288 @@ +{ + "builders": [ + { + "boot_command": [ + "<esc><wait>", + "<esc><wait>", + "<enter><wait>", + "/install/vmlinuz<wait>", + " auto<wait>", + " console-setup/ask_detect=false<wait>", + " console-setup/layoutcode=us<wait>", + " console-setup/modelcode=pc105<wait>", + " debconf/frontend=noninteractive<wait>", + " debian-installer=en_US.UTF-8<wait>", + " fb=false<wait>", + " initrd=/install/initrd.gz<wait>", + " kbd-chooser/method=us<wait>", + " keyboard-configuration/layout=USA<wait>", + " keyboard-configuration/variant=USA<wait>", + " locale=en_US.UTF-8<wait>", + " netcfg/get_domain=vm<wait>", + " netcfg/get_hostname=vagrant<wait>", + " grub-installer/bootdev=/dev/sda<wait>", + " noapic<wait>", + " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}}<wait>", + " -- <wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": "{{user `disk_size`}}", + "guest_additions_url": "{{ user `guest_additions_url` }}", + "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "guest_os_type": "Ubuntu_64", + "hard_drive_interface": "sata", + "headless": "{{ user `headless` }}", + "http_directory": "{{user `http_directory`}}", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-virtualbox", + "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_timeout": "10000s", + "type": "virtualbox-iso", + "memory": "{{ user `memory` }}", + "cpus": "{{ user `cpus` }}", + "virtualbox_version_file": ".vbox_version", + "vm_name": "{{ user `template` }}" + }, + { + "boot_command": [ + "<esc><wait>", + "<esc><wait>", + "<enter><wait>", + "/install/vmlinuz<wait>", + " auto<wait>", + " console-setup/ask_detect=false<wait>", + " console-setup/layoutcode=us<wait>", + " console-setup/modelcode=pc105<wait>", + " debconf/frontend=noninteractive<wait>", + " debian-installer=en_US.UTF-8<wait>", + " fb=false<wait>", + " initrd=/install/initrd.gz<wait>", + " kbd-chooser/method=us<wait>", + " keyboard-configuration/layout=USA<wait>", + " keyboard-configuration/variant=USA<wait>", + " locale=en_US.UTF-8<wait>", + " netcfg/get_domain=vm<wait>", + " netcfg/get_hostname=vagrant<wait>", + " grub-installer/bootdev=/dev/sda<wait>", + " noapic<wait>", + " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}}<wait>", + " -- <wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": "{{user `disk_size`}}", + "guest_os_type": "ubuntu-64", + "headless": "{{ user `headless` }}", + "http_directory": "{{user `http_directory`}}", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-vmware", + "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_timeout": "10000s", + "tools_upload_flavor": "linux", + "type": "vmware-iso", + "vm_name": "{{ user `template` }}", + "memory": "{{ user `memory` }}", + "cpus": "{{ user `cpus` }}", + "vmx_data": { + "cpuid.coresPerSocket": "1", + "ethernet0.pciSlotNumber": "32" + }, + "vmx_remove_ethernet_interfaces": true + }, + { + "boot_command": [ + "<esc><wait>", + "<esc><wait>", + "<enter><wait>", + "/install/vmlinuz<wait>", + " auto<wait>", + " console-setup/ask_detect=false<wait>", + " console-setup/layoutcode=us<wait>", + " console-setup/modelcode=pc105<wait>", + " debconf/frontend=noninteractive<wait>", + " debian-installer=en_US.UTF-8<wait>", + " fb=false<wait>", + " initrd=/install/initrd.gz<wait>", + " kbd-chooser/method=us<wait>", + " keyboard-configuration/layout=USA<wait>", + " keyboard-configuration/variant=USA<wait>", + " locale=en_US.UTF-8<wait>", + " netcfg/get_domain=vm<wait>", + " netcfg/get_hostname=vagrant<wait>", + " grub-installer/bootdev=/dev/sda<wait>", + " noapic<wait>", + " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}}<wait>", + " -- <wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": "{{user `disk_size`}}", + "guest_os_type": "ubuntu", + "http_directory": "{{user `http_directory`}}", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-parallels", + "parallels_tools_flavor": "lin", + "memory": "{{ user `memory` }}", + "cpus": "{{ user `cpus` }}", + "prlctl_version_file": ".prlctl_version", + "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_timeout": "10000s", + "type": "parallels-iso", + "vm_name": "{{ user `template` }}" + }, + { + "boot_command": [ + "<esc><wait>", + "<esc><wait>", + "<enter><wait>", + "/install/vmlinuz<wait>", + " auto<wait>", + " console-setup/ask_detect=false<wait>", + " console-setup/layoutcode=us<wait>", + " console-setup/modelcode=pc105<wait>", + " debconf/frontend=noninteractive<wait>", + " debian-installer=en_US.UTF-8<wait>", + " fb=false<wait>", + " initrd=/install/initrd.gz<wait>", + " kbd-chooser/method=us<wait>", + " keyboard-configuration/layout=USA<wait>", + " keyboard-configuration/variant=USA<wait>", + " locale=en_US.UTF-8<wait>", + " netcfg/get_domain=vm<wait>", + " netcfg/get_hostname=vagrant<wait>", + " grub-installer/bootdev=/dev/vda<wait>", + " noapic<wait>", + " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}}<wait>", + " -- <wait>", + "<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": "{{user `disk_size`}}", + "headless": "{{ user `headless` }}", + "http_directory": "{{user `http_directory`}}", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-qemu", + "memory": "{{ user `memory` }}", + "cpus": "{{ user `cpus` }}", + "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_timeout": "10000s", + "type": "qemu", + "vm_name": "{{ user `template` }}" + }, + { + "boot_command": [ + "<esc><wait10><esc><esc><enter><wait>", + "set gfxpayload=1024x768<enter>", + "linux /install/vmlinuz ", + "preseed/url=http://{{.HTTPIP}}:{{.HTTPPort}}/preseed-hyperv.cfg ", + "debian-installer=en_US.UTF-8 auto locale=en_US.UTF-8 kbd-chooser/method=us ", + "hostname={{.Name}} ", + "fb=false debconf/frontend=noninteractive ", + "keyboard-configuration/modelcode=SKIP keyboard-configuration/layout=USA ", + "keyboard-configuration/variant=USA console-setup/ask_detect=false <enter>", + "initrd /install/initrd.gz<enter>", + "boot<enter>" + ], + "boot_wait": "10s", + "communicator": "ssh", + "cpus": "{{ user `cpus` }}", + "disk_size": "{{user `disk_size`}}", + "enable_secure_boot": false, + "generation": "{{user `hyperv_generation`}}", + "http_directory": "{{user `http_directory`}}", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "memory": "{{user `memory`}}", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-hyperv", + "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_timeout": "10000s", + "ssh_username": "vagrant", + "switch_name": "{{user `hyperv_switch`}}", + "type": "hyperv-iso", + "vm_name": "{{ user `template` }}" + } + ], + "post-processors": [ + { + "output": "{{ user `build_directory` }}/{{user `box_basename`}}.{{.Provider}}.box", + "type": "vagrant" + } + ], + "provisioners": [ + { + "environment_vars": [ + "HOME_DIR=/home/vagrant", + "http_proxy={{user `http_proxy`}}", + "https_proxy={{user `https_proxy`}}", + "no_proxy={{user `no_proxy`}}" + ], + "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", + "expect_disconnect": true, + "scripts": [ + "{{template_dir}}/scripts/update.sh", + "{{template_dir}}/../_common/motd.sh", + "{{template_dir}}/../_common/sshd.sh", + "{{template_dir}}/scripts/networking.sh", + "{{template_dir}}/scripts/sudoers.sh", + "{{template_dir}}/scripts/vagrant.sh", + "{{template_dir}}/../_common/virtualbox.sh", + "{{template_dir}}/scripts/vmware.sh", + "{{template_dir}}/../_common/parallels.sh", + "{{template_dir}}/scripts/hyperv.sh", + "{{template_dir}}/scripts/cleanup.sh", + "{{template_dir}}/../_common/minimize.sh" + ], + "type": "shell" + } + ], + "variables": { + "box_basename": "ubuntu-20.04", + "build_directory": "../../builds", + "http_directory": "{{template_dir}}/http", + "build_timestamp": "{{isotime \"20060102150405\"}}", + "cpus": "1", + "disk_size": "65536", + "git_revision": "__unknown_git_revision__", + "headless": "", + "http_proxy": "{{env `http_proxy`}}", + "https_proxy": "{{env `https_proxy`}}", + "hyperv_generation": "2", + "hyperv_switch": "{{env `hyperv_switch`}}", + "guest_additions_url": "", + "iso_checksum": "36f15879bd9dfd061cd588620a164a82972663fdd148cce1f70d57d314c21b73", + "iso_checksum_type": "sha256", + "iso_name": "ubuntu-20.04-legacy-server-amd64.iso", + "memory": "1024", + "mirror": "http://cdimage.ubuntu.com", + "mirror_directory": "ubuntu-legacy-server/releases/20.04/release", + "name": "ubuntu-20.04", + "no_proxy": "{{env `no_proxy`}}", + "preseed_path": "preseed.cfg", + "template": "ubuntu-20.04-amd64", + "version": "TIMESTAMP" + } +} From 562a8e22484425a6666d9990d56a5b463d0033c3 Mon Sep 17 00:00:00 2001 From: xtqqczze <45661989+xtqqczze@users.noreply.github.com> Date: Fri, 1 May 2020 02:29:05 +0100 Subject: [PATCH 1166/1622] Add support for Windows 2012 Signed-off-by: xtqqczze <45661989+xtqqczze@users.noreply.github.com> --- .../answer_files/2012/Autounattend.xml | 289 ++++++++++++++++++ packer_templates/windows/windows-2012.json | 196 ++++++++++++ 2 files changed, 485 insertions(+) create mode 100644 packer_templates/windows/answer_files/2012/Autounattend.xml create mode 100644 packer_templates/windows/windows-2012.json diff --git a/packer_templates/windows/answer_files/2012/Autounattend.xml b/packer_templates/windows/answer_files/2012/Autounattend.xml new file mode 100644 index 000000000..52937873b --- /dev/null +++ b/packer_templates/windows/answer_files/2012/Autounattend.xml @@ -0,0 +1,289 @@ +<?xml version="1.0" encoding="utf-8"?> +<unattend xmlns="urn:schemas-microsoft-com:unattend"> + <settings pass="windowsPE"> + <component name="Microsoft-Windows-PnpCustomizationsWinPE" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <!-- + This makes the VirtIO drivers available to Windows, assuming that + the VirtIO driver disk at https://fedorapeople.org/groups/virt/virtio-win/direct-downloads/stable-virtio/virtio-win.iso + (see https://docs.fedoraproject.org/en-US/quick-docs/creating-windows-virtual-machines-using-virtio-drivers/index.html#virtio-win-direct-downloads) + is available as drive E: + --> + <DriverPaths> + <PathAndCredentials wcm:action="add" wcm:keyValue="2"> + <Path>E:\viostor\2k12\amd64</Path> + </PathAndCredentials> + + <PathAndCredentials wcm:action="add" wcm:keyValue="3"> + <Path>E:\NetKVM\2k12\amd64</Path> + </PathAndCredentials> + + <PathAndCredentials wcm:action="add" wcm:keyValue="4"> + <Path>E:\Balloon\2k12\amd64</Path> + </PathAndCredentials> + + <PathAndCredentials wcm:action="add" wcm:keyValue="5"> + <Path>E:\pvpanic\2k12\amd64</Path> + </PathAndCredentials> + + <PathAndCredentials wcm:action="add" wcm:keyValue="6"> + <Path>E:\qemupciserial\2k12\amd64</Path> + </PathAndCredentials> + + <PathAndCredentials wcm:action="add" wcm:keyValue="7"> + <Path>E:\qxldod\2k12\amd64</Path> + </PathAndCredentials> + + <PathAndCredentials wcm:action="add" wcm:keyValue="8"> + <Path>E:\vioinput\2k12\amd64</Path> + </PathAndCredentials> + + <PathAndCredentials wcm:action="add" wcm:keyValue="9"> + <Path>E:\viorng\2k12\amd64</Path> + </PathAndCredentials> + + <PathAndCredentials wcm:action="add" wcm:keyValue="10"> + <Path>E:\vioscsi\2k12\amd64</Path> + </PathAndCredentials> + + <PathAndCredentials wcm:action="add" wcm:keyValue="11"> + <Path>E:\vioserial\2k12\amd64</Path> + </PathAndCredentials> + </DriverPaths> + </component> + <component name="Microsoft-Windows-International-Core-WinPE" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <SetupUILanguage> + <UILanguage>en-US</UILanguage> + </SetupUILanguage> + <InputLocale>en-US</InputLocale> + <SystemLocale>en-US</SystemLocale> + <UILanguage>en-US</UILanguage> + <UILanguageFallback>en-US</UILanguageFallback> + <UserLocale>en-US</UserLocale> + </component> + <component name="Microsoft-Windows-Setup" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <DiskConfiguration> + <Disk wcm:action="add"> + <CreatePartitions> + <CreatePartition wcm:action="add"> + <Type>Primary</Type> + <Order>1</Order> + <Size>350</Size> + </CreatePartition> + <CreatePartition wcm:action="add"> + <Order>2</Order> + <Type>Primary</Type> + <Extend>true</Extend> + </CreatePartition> + </CreatePartitions> + <ModifyPartitions> + <ModifyPartition wcm:action="add"> + <Active>true</Active> + <Format>NTFS</Format> + <Label>boot</Label> + <Order>1</Order> + <PartitionID>1</PartitionID> + </ModifyPartition> + <ModifyPartition wcm:action="add"> + <Format>NTFS</Format> + <Label>Windows 2012</Label> + <Letter>C</Letter> + <Order>2</Order> + <PartitionID>2</PartitionID> + </ModifyPartition> + </ModifyPartitions> + <DiskID>0</DiskID> + <WillWipeDisk>true</WillWipeDisk> + </Disk> + </DiskConfiguration> + <ImageInstall> + <OSImage> + <InstallFrom> + <MetaData wcm:action="add"> + <Key>/IMAGE/NAME</Key> + <Value>Windows Server 2012 SERVERSTANDARD</Value> + </MetaData> + </InstallFrom> + <InstallTo> + <DiskID>0</DiskID> + <PartitionID>2</PartitionID> + </InstallTo> + </OSImage> + </ImageInstall> + <UserData> + <ProductKey> + <WillShowUI>OnError</WillShowUI> + </ProductKey> + <AcceptEula>true</AcceptEula> + <FullName>Vagrant</FullName> + <Organization>Bento by Chef Software, Inc.</Organization> + </UserData> + </component> + </settings> + <settings pass="generalize"> + <component name="Microsoft-Windows-Security-SPP" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <SkipRearm>1</SkipRearm> + </component> + <component name="Microsoft-Windows-PnpSysprep" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <PersistAllDeviceInstalls>false</PersistAllDeviceInstalls> + <DoNotCleanUpNonPresentDevices>false</DoNotCleanUpNonPresentDevices> + </component> + </settings> + <settings pass="oobeSystem"> + <component name="Microsoft-Windows-International-Core" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <InputLocale>en-US</InputLocale> + <SystemLocale>en-US</SystemLocale> + <UILanguage>en-US</UILanguage> + <UserLocale>en-US</UserLocale> + </component> + <component name="Microsoft-Windows-Shell-Setup" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <OOBE> + <HideEULAPage>true</HideEULAPage> + <HideLocalAccountScreen>true</HideLocalAccountScreen> + <HideOEMRegistrationScreen>true</HideOEMRegistrationScreen> + <HideOnlineAccountScreens>true</HideOnlineAccountScreens> + <HideWirelessSetupInOOBE>true</HideWirelessSetupInOOBE> + <NetworkLocation>Home</NetworkLocation> + <ProtectYourPC>3</ProtectYourPC> + <SkipMachineOOBE>true</SkipMachineOOBE> + <SkipUserOOBE>true</SkipUserOOBE> + </OOBE> + <TimeZone>UTC</TimeZone> + <UserAccounts> + <AdministratorPassword> + <Value>vagrant</Value> + <PlainText>true</PlainText> + </AdministratorPassword> + <LocalAccounts> + <LocalAccount wcm:action="add"> + <Password> + <Value>vagrant</Value> + <PlainText>true</PlainText> + </Password> + <Description>Vagrant User</Description> + <DisplayName>vagrant</DisplayName> + <Group>administrators</Group> + <Name>vagrant</Name> + </LocalAccount> + </LocalAccounts> + </UserAccounts> + <AutoLogon> + <Password> + <Value>vagrant</Value> + <PlainText>true</PlainText> + </Password> + <Username>vagrant</Username> + <Enabled>true</Enabled> + </AutoLogon> + <FirstLogonCommands> + <SynchronousCommand wcm:action="add"> + <CommandLine>cmd.exe /c powershell -Command "Set-ExecutionPolicy -ExecutionPolicy RemoteSigned -Force"</CommandLine> + <Description>Set Execution Policy 64 Bit</Description> + <Order>1</Order> + <RequiresUserInput>true</RequiresUserInput> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <CommandLine>C:\Windows\SysWOW64\cmd.exe /c powershell -Command "Set-ExecutionPolicy -ExecutionPolicy RemoteSigned -Force"</CommandLine> + <Description>Set Execution Policy 32 Bit</Description> + <Order>2</Order> + <RequiresUserInput>true</RequiresUserInput> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <CommandLine>cmd.exe /c winrm quickconfig -q</CommandLine> + <Description>winrm quickconfig -q</Description> + <Order>3</Order> + <RequiresUserInput>true</RequiresUserInput> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <CommandLine>cmd.exe /c winrm quickconfig -transport:http</CommandLine> + <Description>winrm quickconfig -transport:http</Description> + <Order>4</Order> + <RequiresUserInput>true</RequiresUserInput> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <CommandLine>cmd.exe /c winrm set winrm/config @{MaxTimeoutms="1800000"}</CommandLine> + <Description>Win RM MaxTimoutms</Description> + <Order>5</Order> + <RequiresUserInput>true</RequiresUserInput> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <CommandLine>cmd.exe /c winrm set winrm/config/winrs @{MaxMemoryPerShellMB="800"}</CommandLine> + <Description>Win RM MaxMemoryPerShellMB</Description> + <Order>6</Order> + <RequiresUserInput>true</RequiresUserInput> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <CommandLine>cmd.exe /c winrm set winrm/config/service @{AllowUnencrypted="true"}</CommandLine> + <Description>Win RM AllowUnencrypted</Description> + <Order>7</Order> + <RequiresUserInput>true</RequiresUserInput> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <CommandLine>cmd.exe /c winrm set winrm/config/service/auth @{Basic="true"}</CommandLine> + <Description>Win RM auth Basic</Description> + <Order>8</Order> + <RequiresUserInput>true</RequiresUserInput> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <CommandLine>cmd.exe /c winrm set winrm/config/client/auth @{Basic="true"}</CommandLine> + <Description>Win RM client auth Basic</Description> + <Order>9</Order> + <RequiresUserInput>true</RequiresUserInput> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <CommandLine>cmd.exe /c winrm set winrm/config/listener?Address=*+Transport=HTTP @{Port="5985"} </CommandLine> + <Description>Win RM listener Address/Port</Description> + <Order>10</Order> + <RequiresUserInput>true</RequiresUserInput> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <CommandLine>cmd.exe /c netsh advfirewall firewall set rule group="remote administration" new enable=yes </CommandLine> + <Description>Win RM adv firewall enable</Description> + <Order>11</Order> + <RequiresUserInput>true</RequiresUserInput> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <CommandLine>cmd.exe /c netsh firewall add portopening TCP 5985 "Port 5985" </CommandLine> + <Description>Win RM port open</Description> + <Order>12</Order> + <RequiresUserInput>true</RequiresUserInput> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <CommandLine>cmd.exe /c net stop winrm </CommandLine> + <Description>Stop Win RM Service </Description> + <Order>13</Order> + <RequiresUserInput>true</RequiresUserInput> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <CommandLine>cmd.exe /c sc config winrm start= auto</CommandLine> + <Description>Win RM Autostart</Description> + <Order>14</Order> + <RequiresUserInput>true</RequiresUserInput> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <CommandLine>cmd.exe /c net start winrm</CommandLine> + <Description>Start Win RM Service</Description> + <Order>15</Order> + <RequiresUserInput>true</RequiresUserInput> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <CommandLine>cmd.exe /c wmic useraccount where "name='vagrant'" set PasswordExpires=FALSE</CommandLine> + <Order>16</Order> + <Description>Disable password expiration for vagrant user</Description> + </SynchronousCommand> + </FirstLogonCommands> + </component> + </settings> + <settings pass="specialize"> + <component xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" name="Microsoft-Windows-ServerManager-SvrMgrNc" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> + <DoNotOpenServerManagerAtLogon>true</DoNotOpenServerManagerAtLogon> + </component> + <component xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" name="Microsoft-Windows-IE-ESC" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> + <!-- Disable IE ESC. --> + <IEHardenAdmin>false</IEHardenAdmin> + <IEHardenUser>false</IEHardenUser> + </component> + <component xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" name="Microsoft-Windows-OutOfBoxExperience" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> + <DoNotOpenInitialConfigurationTasksAtLogon>true</DoNotOpenInitialConfigurationTasksAtLogon> + </component> + </settings> +</unattend> diff --git a/packer_templates/windows/windows-2012.json b/packer_templates/windows/windows-2012.json new file mode 100644 index 000000000..5403ca82c --- /dev/null +++ b/packer_templates/windows/windows-2012.json @@ -0,0 +1,196 @@ +{ + "builders": [{ + "type": "hyperv-iso", + "switch_name": "{{user `hyperv_switch`}}", + "memory": "{{ user `memory` }}", + "cpus": "{{ user `cpus` }}", + "headless": "{{ user `headless` }}", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_checksum_type": "sha1", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-virtualbox", + "communicator": "winrm", + "winrm_username": "vagrant", + "winrm_password": "vagrant", + "winrm_timeout": "12h", + "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"", + "shutdown_timeout": "15m", + "floppy_files": [ + "{{ user `floppy_dir` }}/{{ user `unattended_file_path` }}" + ] + }, + { + "type": "virtualbox-iso", + "vboxmanage": [ + ["modifyvm", "{{.Name}}", "--vram", "48"], + ["modifyvm", "{{.Name}}", "--audio", "none"] + ], + "memory": "{{ user `memory` }}", + "cpus": "{{ user `cpus` }}", + "guest_additions_mode": "{{ user `guest_additions_mode` }}", + "guest_additions_url": "{{ user `guest_additions_url` }}", + "guest_additions_path": "C:/users/vagrant/VBoxGuestAdditions.iso", + "guest_os_type": "Windows2012_64", + "hard_drive_interface": "sata", + "iso_interface": "sata", + "headless": "{{ user `headless` }}", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_checksum_type": "sha1", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-virtualbox", + "communicator": "winrm", + "winrm_username": "vagrant", + "winrm_password": "vagrant", + "winrm_timeout": "12h", + "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"", + "shutdown_timeout": "15m", + "floppy_files": [ + "{{ user `floppy_dir` }}/{{ user `unattended_file_path` }}" + ] + }, + { + "type": "parallels-iso", + "memory": "{{ user `memory` }}", + "cpus": "{{ user `cpus` }}", + "guest_os_type": "win-2012", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_checksum_type": "sha1", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-parallels", + "parallels_tools_flavor": "win", + "prlctl_version_file": ".prlctl_version", + "communicator": "winrm", + "winrm_username": "vagrant", + "winrm_password": "vagrant", + "winrm_timeout": "12h", + "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"", + "shutdown_timeout": "15m", + "prlctl": [ + ["set", "{{.Name}}", "--efi-boot", "off"] + ], + "floppy_files": [ + "{{ user `floppy_dir` }}/{{ user `unattended_file_path` }}" + ] + }, + { + "type": "vmware-iso", + "version": 11, + "memory": "{{ user `memory` }}", + "cpus": "{{ user `cpus` }}", + "disk_adapter_type": "lsisas1068", + "guest_os_type": "windows9srv-64", + "headless": "{{ user `headless` }}", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_checksum_type": "sha1", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-vmware", + "communicator": "winrm", + "tools_upload_flavor": "windows", + "tools_upload_path": "c:/Windows/Temp/vmware.iso", + "winrm_username": "vagrant", + "winrm_password": "vagrant", + "winrm_timeout": "12h", + "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"", + "shutdown_timeout": "15m", + "floppy_files": [ + "{{ user `floppy_dir` }}/{{ user `unattended_file_path` }}" + ] + }, + { + "type": "qemu", + "memory": "{{ user `memory` }}", + "cpus": "{{ user `cpus` }}", + "headless": "{{ user `headless` }}", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_checksum_type": "sha1", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-qemu", + "communicator": "winrm", + "winrm_username": "vagrant", + "winrm_password": "vagrant", + "winrm_timeout": "12h", + "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"", + "shutdown_timeout": "15m", + "qemuargs": [ + ["-m", "{{ user `memory` }}"], + ["-smp", "{{ user `cpus` }}"], + ["-drive", "file={{ user `virtio_win_iso` }},media=cdrom,index=3"], + ["-drive", "file={{ user `build_directory` }}/packer-{{ user `template` }}-qemu/{{ .Name }},if=virtio,cache=writeback,discard=ignore,format=qcow2,index=1"] + ], + "floppy_files": [ + "{{ user `floppy_dir` }}/{{ user `unattended_file_path` }}" + ] + } + ], + "provisioners": [{ + "type": "chef-solo", + "cookbook_paths": ["{{template_dir}}/cookbooks"], + "guest_os_type": "windows", + "run_list": [ + "packer::disable_uac", + "packer::disable_restore", + "packer::disable_windows_update", + "packer::remove_defender", + "packer::configure_power", + "packer::disable_screensaver" + ] + }, + { + "type": "windows-restart" + }, + { + "type": "chef-solo", + "cookbook_paths": ["{{template_dir}}/cookbooks"], + "guest_os_type": "windows", + "run_list": [ + "packer::vm_tools", + "packer::features", + "packer::enable_file_sharing", + "packer::enable_remote_desktop", + "packer::ui_tweaks" + ] + }, + { + "type": "windows-restart" + }, + { + "type": "chef-solo", + "cookbook_paths": ["{{template_dir}}/cookbooks"], + "guest_os_type": "windows", + "run_list": [ + "packer::cleanup", + "packer::defrag" + ] + }, + { + "type": "powershell", + "script": "{{template_dir}}/scripts/cleanup.ps1", + "elevated_user": "vagrant", + "elevated_password": "vagrant" + } + ], + "post-processors": [ + [{ + "type": "vagrant", + "keep_input_artifact": true, + "output": "{{ user `template` }}-{{.Provider}}.box", + "vagrantfile_template": "{{template_dir}}/vagrantfile-windows.template" + }] + ], + "variables": { + "build_directory": "../../builds", + "cpus": "2", + "floppy_dir": "{{template_dir}}/answer_files", + "guest_additions_mode": "attach", + "guest_additions_url": "", + "headless": "true", + "hyperv_switch": "{{env `hyperv_switch`}}", + "iso_checksum": "922b365c3360ce630f6a4b4f2f3c79e66165c0fb", + "iso_checksum_type": "sha1", + "iso_url": "http://download.microsoft.com/download/6/D/A/6DAB58BA-F939-451D-9101-7DE07DC09C03/9200.16384.WIN8_RTM.120725-1247_X64FRE_SERVER_EVAL_EN-US-HRM_SSS_X64FREE_EN-US_DV5.ISO", + "memory": "4096", + "template": "windows-2012-standard", + "unattended_file_path": "2012/Autounattend.xml", + "virtio_win_iso": "~/virtio-win.iso" + } +} \ No newline at end of file From 80bd520e2cdff05a9e62e6dc65c6f556f1165679 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Thu, 7 May 2020 12:43:18 -0700 Subject: [PATCH 1167/1622] Update Debian to 9.12 Signed-off-by: Tim Smith <tsmith@chef.io> --- builds.yml | 4 ++-- ...debian-9.11-amd64.json => debian-9.12-amd64.json} | 12 ++++++------ .../{debian-9.11-i386.json => debian-9.12-i386.json} | 12 ++++++------ ...an-9.11-ppc64el.json => debian-9.12-ppc64el.json} | 12 ++++++------ 4 files changed, 20 insertions(+), 20 deletions(-) rename packer_templates/debian/{debian-9.11-amd64.json => debian-9.12-amd64.json} (96%) rename packer_templates/debian/{debian-9.11-i386.json => debian-9.12-i386.json} (96%) rename packer_templates/debian/{debian-9.11-ppc64el.json => debian-9.12-ppc64el.json} (92%) diff --git a/builds.yml b/builds.yml index 435823b68..86f50fa38 100644 --- a/builds.yml +++ b/builds.yml @@ -7,8 +7,8 @@ public: - 'centos-8.1' - 'debian-8.11-i386' - 'debian-8.11' -- 'debian-9.11-i386' -- 'debian-9.11' +- 'debian-9.12-i386' +- 'debian-9.12' - 'debian-10.2-i386' - 'debian-10.2' - 'fedora-30' diff --git a/packer_templates/debian/debian-9.11-amd64.json b/packer_templates/debian/debian-9.12-amd64.json similarity index 96% rename from packer_templates/debian/debian-9.11-amd64.json rename to packer_templates/debian/debian-9.12-amd64.json index e50480007..0a74d354b 100644 --- a/packer_templates/debian/debian-9.11-amd64.json +++ b/packer_templates/debian/debian-9.12-amd64.json @@ -197,7 +197,7 @@ } ], "variables": { - "box_basename": "debian-9.11", + "box_basename": "debian-9.12", "build_directory": "../../builds", "http_directory": "{{template_dir}}/http", "build_timestamp": "{{isotime \"20060102150405\"}}", @@ -208,16 +208,16 @@ "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", "guest_additions_url": "", - "iso_checksum": "9ae83aa5a732151ef2dc84538d1d4ffd6374df47cc01681da6348f9ec5a45bd4", + "iso_checksum": "3c47f64693435b0b42b6ef59624edbffa7c4004317d9f9a3f04ecb6a4e30f191", "iso_checksum_type": "sha256", - "iso_name": "debian-9.11.0-amd64-netinst.iso", + "iso_name": "debian-9.12.0-amd64-netinst.iso", "memory": "1024", "mirror": "http://cdimage.debian.org/cdimage/archive", - "mirror_directory": "9.11.0/amd64/iso-cd", - "name": "debian-9.11", + "mirror_directory": "9.12.0/amd64/iso-cd", + "name": "debian-9.12", "no_proxy": "{{env `no_proxy`}}", "preseed_path": "debian-9/preseed.cfg", - "template": "debian-9.11-amd64", + "template": "debian-9.12-amd64", "version": "TIMESTAMP" } } diff --git a/packer_templates/debian/debian-9.11-i386.json b/packer_templates/debian/debian-9.12-i386.json similarity index 96% rename from packer_templates/debian/debian-9.11-i386.json rename to packer_templates/debian/debian-9.12-i386.json index 302e85a37..844e67bca 100644 --- a/packer_templates/debian/debian-9.11-i386.json +++ b/packer_templates/debian/debian-9.12-i386.json @@ -197,7 +197,7 @@ } ], "variables": { - "box_basename": "debian-9.11-i386", + "box_basename": "debian-9.12-i386", "build_directory": "../../builds", "http_directory": "{{template_dir}}/http", "build_timestamp": "{{isotime \"20060102150405\"}}", @@ -208,16 +208,16 @@ "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", "guest_additions_url": "", - "iso_checksum": "c24ac0bd549549bee755d842799153abf0b232f106c248e2efe48aa6209b6bd6", + "iso_checksum": "7b5f1480c45bb7e70ddac7daf0b23f7ae5b97b4b12c6e835b285460f41a50572", "iso_checksum_type": "sha256", - "iso_name": "debian-9.11.0-i386-netinst.iso", + "iso_name": "debian-9.12.0-i386-netinst.iso", "memory": "1024", "mirror": "http://cdimage.debian.org/cdimage/archive", - "mirror_directory": "9.11.0/i386/iso-cd", - "name": "debian-9.11-i386", + "mirror_directory": "9.12.0/i386/iso-cd", + "name": "debian-9.12-i386", "no_proxy": "{{env `no_proxy`}}", "preseed_path": "debian-9/preseed.cfg", - "template": "debian-9.11-i386", + "template": "debian-9.12-i386", "version": "TIMESTAMP" } } diff --git a/packer_templates/debian/debian-9.11-ppc64el.json b/packer_templates/debian/debian-9.12-ppc64el.json similarity index 92% rename from packer_templates/debian/debian-9.11-ppc64el.json rename to packer_templates/debian/debian-9.12-ppc64el.json index e1064f244..d14ea75e6 100644 --- a/packer_templates/debian/debian-9.11-ppc64el.json +++ b/packer_templates/debian/debian-9.12-ppc64el.json @@ -81,7 +81,7 @@ } ], "variables": { - "box_basename": "debian-9.11", + "box_basename": "debian-9.12", "build_directory": "../../builds", "http_directory": "{{template_dir}}/http", "build_timestamp": "{{isotime \"20060102150405\"}}", @@ -91,16 +91,16 @@ "headless": "", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", - "iso_checksum": "5d785af424e0259474f48bf55c5bf7aee19a945fdd74a3eb765f1c55f83cb554", + "iso_checksum": "b35d8b33c9fc316c03178d8f493ecb858269082337150f82af75c8d4663cc324", "iso_checksum_type": "sha256", - "iso_name": "debian-9.11.0-ppc64el-netinst.iso", + "iso_name": "debian-9.12.0-ppc64el-netinst.iso", "memory": "1024", "mirror": "http://cdimage.debian.org/cdimage/archive", - "mirror_directory": "9.11.0/ppc64el/iso-cd", - "name": "debian-9.11", + "mirror_directory": "9.12.0/ppc64el/iso-cd", + "name": "debian-9.12", "no_proxy": "{{env `no_proxy`}}", "preseed_path": "debian-9/preseed.cfg", - "template": "debian-9.11-ppc64el", + "template": "debian-9.12-ppc64el", "version": "TIMESTAMP" } } From 33cc7d8f1ba8d483051b4b31d447a17b576b7ae5 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Thu, 7 May 2020 12:45:53 -0700 Subject: [PATCH 1168/1622] Remove Ubuntu 18.10 Signed-off-by: Tim Smith <tsmith@chef.io> --- builds.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/builds.yml b/builds.yml index 86f50fa38..a6aa6a842 100644 --- a/builds.yml +++ b/builds.yml @@ -30,7 +30,6 @@ public: - 'ubuntu-16.04-i386' - 'ubuntu-16.04' - 'ubuntu-18.04' -- 'ubuntu-18.10' - 'ubuntu-19.10' # slug box name: text string from standard box name to match (generally the same) From 18226a9d95658a5aea3f4d595faac5917115ccdd Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Thu, 7 May 2020 12:52:10 -0700 Subject: [PATCH 1169/1622] Update Debian 10 to 10.3 Signed-off-by: Tim Smith <tsmith@chef.io> --- README.md | 4 ++-- builds.yml | 4 ++-- ...debian-10.2-amd64.json => debian-10.3-amd64.json} | 12 ++++++------ .../{debian-10.2-i386.json => debian-10.3-i386.json} | 12 ++++++------ 4 files changed, 16 insertions(+), 16 deletions(-) rename packer_templates/debian/{debian-10.2-amd64.json => debian-10.3-amd64.json} (96%) rename packer_templates/debian/{debian-10.2-i386.json => debian-10.3-i386.json} (96%) diff --git a/README.md b/README.md index cc062af35..54a2762fe 100644 --- a/README.md +++ b/README.md @@ -44,11 +44,11 @@ $ cd ubuntu $ packer build -only=virtualbox-iso ubuntu-18.04-amd64.json ``` -To build Debian 10.2 32bit boxes for all possible providers (simultaneously) +To build Debian 10.3 32bit boxes for all possible providers (simultaneously) ``` $ cd debian -$ packer build debian-10.2-i386.json +$ packer build debian-10.3-i386.json ``` To build CentOS 7.7 boxes for all providers except VMware and Parallels diff --git a/builds.yml b/builds.yml index a6aa6a842..a1c94f867 100644 --- a/builds.yml +++ b/builds.yml @@ -9,8 +9,8 @@ public: - 'debian-8.11' - 'debian-9.12-i386' - 'debian-9.12' -- 'debian-10.2-i386' -- 'debian-10.2' +- 'debian-10.3-i386' +- 'debian-10.3' - 'fedora-30' - 'fedora-31' - 'freebsd-11.3-i386' diff --git a/packer_templates/debian/debian-10.2-amd64.json b/packer_templates/debian/debian-10.3-amd64.json similarity index 96% rename from packer_templates/debian/debian-10.2-amd64.json rename to packer_templates/debian/debian-10.3-amd64.json index 6b387c84d..3feb7b0ae 100644 --- a/packer_templates/debian/debian-10.2-amd64.json +++ b/packer_templates/debian/debian-10.3-amd64.json @@ -197,7 +197,7 @@ } ], "variables": { - "box_basename": "debian-10.2", + "box_basename": "debian-10.3", "build_directory": "../../builds", "http_directory": "{{template_dir}}/http", "build_timestamp": "{{isotime \"20060102150405\"}}", @@ -208,16 +208,16 @@ "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", "guest_additions_url": "", - "iso_checksum": "e43fef979352df15056ac512ad96a07b515cb8789bf0bfd86f99ed0404f885f5", + "iso_checksum": "6a901b5abe43d88b39d627e1339d15507cc38f980036b928f835e0f0e957d3d8", "iso_checksum_type": "sha256", - "iso_name": "debian-10.2.0-amd64-netinst.iso", + "iso_name": "debian-10.3.0-amd64-netinst.iso", "memory": "1024", "mirror": "http://cdimage.debian.org/cdimage/release", - "mirror_directory": "10.2.0/amd64/iso-cd", - "name": "debian-10.2", + "mirror_directory": "10.3.0/amd64/iso-cd", + "name": "debian-10.3", "no_proxy": "{{env `no_proxy`}}", "preseed_path": "debian-9/preseed.cfg", - "template": "debian-10.2-amd64", + "template": "debian-10.3-amd64", "version": "TIMESTAMP" } } diff --git a/packer_templates/debian/debian-10.2-i386.json b/packer_templates/debian/debian-10.3-i386.json similarity index 96% rename from packer_templates/debian/debian-10.2-i386.json rename to packer_templates/debian/debian-10.3-i386.json index aadb838c7..ebd6ee661 100644 --- a/packer_templates/debian/debian-10.2-i386.json +++ b/packer_templates/debian/debian-10.3-i386.json @@ -197,7 +197,7 @@ } ], "variables": { - "box_basename": "debian-10.2-i386", + "box_basename": "debian-10.3-i386", "build_directory": "../../builds", "http_directory": "{{template_dir}}/http", "build_timestamp": "{{isotime \"20060102150405\"}}", @@ -208,16 +208,16 @@ "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", "guest_additions_url": "", - "iso_checksum": "883d0ca91d2f21ce0a0e0e481f97bf73d50a0232f467e5200aaea79849fc74fd", + "iso_checksum": "057bc3f52a45bf7c9f82bee898ecb6a054e9841a76fc22b26dedd2b53c0c5884", "iso_checksum_type": "sha256", - "iso_name": "debian-10.2.0-i386-netinst.iso", + "iso_name": "debian-10.3.0-i386-netinst.iso", "memory": "1024", "mirror": "http://cdimage.debian.org/cdimage/release", - "mirror_directory": "10.2.0/i386/iso-cd", - "name": "debian-10.2-i386", + "mirror_directory": "10.3.0/i386/iso-cd", + "name": "debian-10.3-i386", "no_proxy": "{{env `no_proxy`}}", "preseed_path": "debian-9/preseed.cfg", - "template": "debian-10.2-i386", + "template": "debian-10.3-i386", "version": "TIMESTAMP" } } From ba97ab27db882bcc623daeae1fd32102fe1e4733 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Thu, 7 May 2020 15:19:15 -0700 Subject: [PATCH 1170/1622] Remove Windows 2008 R2 template and fix cookbook formatting Signed-off-by: Tim Smith <tsmith@chef.io> --- lib/bento/upload.rb | 1 - .../cookbooks/packer/recipes/cleanup.rb | 1 - .../cookbooks/packer/recipes/features.rb | 5 - .../cookbooks/packer/recipes/ui_tweaks.rb | Bin 3865 -> 3851 bytes packer_templates/windows/windows-2008r2.json | 164 ------------------ 5 files changed, 171 deletions(-) delete mode 100644 packer_templates/windows/windows-2008r2.json diff --git a/lib/bento/upload.rb b/lib/bento/upload.rb index b0aa71818..a24bce722 100644 --- a/lib/bento/upload.rb +++ b/lib/bento/upload.rb @@ -26,7 +26,6 @@ def start banner("Uploads finished in #{duration(time.real)}.") end - # # Upload all the boxes defined in the passed metadata file # diff --git a/packer_templates/windows/cookbooks/packer/recipes/cleanup.rb b/packer_templates/windows/cookbooks/packer/recipes/cleanup.rb index b9b65de59..4dcf102e6 100644 --- a/packer_templates/windows/cookbooks/packer/recipes/cleanup.rb +++ b/packer_templates/windows/cookbooks/packer/recipes/cleanup.rb @@ -7,7 +7,6 @@ execute 'clean SxS' do command 'Dism.exe /online /Cleanup-Image /StartComponentCleanup /ResetBase' ignore_failure true - only_if { windows_nt_version > 6.1 } # command not present on Windows 7 end powershell_script 'remove unnecesary directories' do diff --git a/packer_templates/windows/cookbooks/packer/recipes/features.rb b/packer_templates/windows/cookbooks/packer/recipes/features.rb index 0ba436e2e..8fb9548e5 100644 --- a/packer_templates/windows/cookbooks/packer/recipes/features.rb +++ b/packer_templates/windows/cookbooks/packer/recipes/features.rb @@ -1,8 +1,3 @@ -windows_feature 'NetFx3' do - action :install - only_if { windows_nt_version == 6.1 } -end - windows_feature 'MicrosoftWindowsPowerShellISE' do action :remove end diff --git a/packer_templates/windows/cookbooks/packer/recipes/ui_tweaks.rb b/packer_templates/windows/cookbooks/packer/recipes/ui_tweaks.rb index ac26e6fd393666ffd898c2f3675863db294c1b0a..bf17b3330a5bd025d554f1363b3211143843e78b 100644 GIT binary patch delta 119 zcmbO!*DW_8b#fz<%*3XdAZoG&<4Q37kFg0z9|o~ECo)&CfCay?uY=OolmBqkf!PII n9FymBZh^8Pn$5UZO@7F|94xk!rxQraZua3#WdsYH<MRdpuc<7> delta 147 zcmeB{n<+OTm62hx1GCJ;#+eYtWHZK<P}Xn8CMatr({e_J%?`{{SfBzQ*w?{X)|0<- s)IoXuoO|Fbj>-943xPZV?qg7~Pu$&5)=ZvG2y3$)ZyF<1@Bp7T05d%)fdBvi diff --git a/packer_templates/windows/windows-2008r2.json b/packer_templates/windows/windows-2008r2.json deleted file mode 100644 index 472246a2a..000000000 --- a/packer_templates/windows/windows-2008r2.json +++ /dev/null @@ -1,164 +0,0 @@ -{ - "builders": [{ - "type": "hyperv-iso", - "switch_name": "{{user `hyperv_switch`}}", - "memory": "{{ user `memory` }}", - "cpus": "{{ user `cpus` }}", - "headless": "{{ user `headless` }}", - "iso_url": "{{ user `iso_url` }}", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "sha1", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-virtualbox", - "communicator": "winrm", - "winrm_username": "vagrant", - "winrm_password": "vagrant", - "winrm_timeout": "12h", - "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"", - "shutdown_timeout": "15m", - "floppy_files": [ - "{{ user `floppy_dir` }}/{{ user `unattended_file_path` }}" - ] - }, - { - "type": "virtualbox-iso", - "vboxmanage": [ - ["modifyvm", "{{.Name}}", "--vram", "48"], - ["modifyvm", "{{.Name}}", "--audio", "none"] - ], - "memory": "{{ user `memory` }}", - "cpus": "{{ user `cpus` }}", - "guest_additions_mode": "{{ user `guest_additions_mode` }}", - "guest_additions_url": "{{ user `guest_additions_url` }}", - "guest_additions_path": "C:/users/vagrant/VBoxGuestAdditions.iso", - "guest_os_type": "Windows2008_64", - "hard_drive_interface": "sata", - "iso_interface": "sata", - "headless": "{{ user `headless` }}", - "iso_url": "{{ user `iso_url` }}", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "sha1", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-virtualbox", - "communicator": "winrm", - "winrm_username": "vagrant", - "winrm_password": "vagrant", - "winrm_timeout": "12h", - "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"", - "shutdown_timeout": "15m", - "floppy_files": [ - "{{ user `floppy_dir` }}/{{ user `unattended_file_path` }}" - ] - }, - { - "type": "parallels-iso", - "memory": "{{ user `memory` }}", - "cpus": "{{ user `cpus` }}", - "guest_os_type": "win-2008", - "iso_url": "{{ user `iso_url` }}", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "sha1", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-parallels", - "parallels_tools_flavor": "win", - "prlctl_version_file": ".prlctl_version", - "communicator": "winrm", - "winrm_username": "vagrant", - "winrm_password": "vagrant", - "winrm_timeout": "12h", - "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"", - "shutdown_timeout": "15m", - "prlctl": [ - ["set", "{{.Name}}", "--efi-boot", "off"] - ], - "floppy_files": [ - "{{ user `floppy_dir` }}/{{ user `unattended_file_path` }}" - ] - }, - { - "type": "vmware-iso", - "version": 11, - "memory": "{{ user `memory` }}", - "cpus": "{{ user `cpus` }}", - "disk_adapter_type": "lsisas1068", - "guest_os_type": "windows9srv-64", - "headless": "{{ user `headless` }}", - "iso_url": "{{ user `iso_url` }}", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "sha1", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-vmware", - "communicator": "winrm", - "tools_upload_flavor": "windows", - "tools_upload_path": "c:/Windows/Temp/vmware.iso", - "winrm_username": "vagrant", - "winrm_password": "vagrant", - "winrm_timeout": "12h", - "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"", - "shutdown_timeout": "15m", - "floppy_files": [ - "{{ user `floppy_dir` }}/{{ user `unattended_file_path` }}" - ] - } - ], - "provisioners": [{ - "type": "chef-solo", - "cookbook_paths": ["{{template_dir}}/cookbooks"], - "guest_os_type": "windows", - "chef_license": "accept-no-persist", - "install_command": "powershell.exe -Command \"(new-object Net.WebClient).DownloadString('https://omnitruck.chef.io/install.ps1') | iex; install\"", - "run_list": [ - "packer::disable_uac", - "packer::disable_restore", - "packer::disable_windows_update", - "packer::vm_tools", - "packer::features", - "packer::enable_file_sharing", - "packer::enable_remote_desktop", - "packer::ui_tweaks", - "packer::configure_power", - "packer::disable_screensaver", - "packer::updates" - ] - }, - { - "type": "windows-restart" - }, - { - "type": "chef-solo", - "cookbook_paths": ["{{template_dir}}/cookbooks"], - "guest_os_type": "windows", - "chef_license": "accept-no-persist", - "install_command": "powershell.exe -Command \"(new-object Net.WebClient).DownloadString('https://omnitruck.chef.io/install.ps1') | iex; install\"", - "run_list": [ - "packer::disable_uac", - "packer::cleanup", - "packer::defrag" - ] - }, - { - "type": "powershell", - "script": "{{template_dir}}/scripts/cleanup.ps1", - "elevated_user": "vagrant", - "elevated_password": "vagrant" - } - ], - "post-processors": [ - [{ - "type": "vagrant", - "keep_input_artifact": true, - "output": "{{ user `template` }}-{{.Provider}}.box", - "vagrantfile_template": "{{template_dir}}/vagrantfile-windows.template" - }] - ], - "variables": { - "build_directory": "../../builds", - "cpus": "2", - "floppy_dir": "{{template_dir}}/answer_files", - "guest_additions_mode": "attach", - "guest_additions_url": "", - "headless": "true", - "hyperv_switch": "{{env `hyperv_switch`}}", - "iso_checksum": "beed231a34e90e1dd9a04b3afabec31d62ce3889", - "iso_url": "http://download.microsoft.com/download/7/5/E/75EC4E54-5B02-42D6-8879-D8D3A25FBEF7/7601.17514.101119-1850_x64fre_server_eval_en-us-GRMSXEVAL_EN_DVD.iso", - "memory": "4096", - "template": "windows-2008r2-standard", - "unattended_file_path": "2008_r2/Autounattend.xml" - } -} From 3d2eb22abbc2da5d6db3a2ce87b5582bda773af3 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Thu, 7 May 2020 21:37:08 -0700 Subject: [PATCH 1171/1622] Remove more 2008 R2 files Signed-off-by: Tim Smith <tsmith@chef.io> --- .../answer_files/2008_r2/Autounattend.xml | 240 ------------------ 1 file changed, 240 deletions(-) delete mode 100644 packer_templates/windows/answer_files/2008_r2/Autounattend.xml diff --git a/packer_templates/windows/answer_files/2008_r2/Autounattend.xml b/packer_templates/windows/answer_files/2008_r2/Autounattend.xml deleted file mode 100644 index 6c6cbabc1..000000000 --- a/packer_templates/windows/answer_files/2008_r2/Autounattend.xml +++ /dev/null @@ -1,240 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<unattend xmlns="urn:schemas-microsoft-com:unattend"> - <settings pass="windowsPE"> - <component name="Microsoft-Windows-PnpCustomizationsWinPE" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - <DriverPaths> - <PathAndCredentials wcm:keyValue="1" wcm:action="add"> - <Path>A:\</Path> - </PathAndCredentials> - </DriverPaths> - </component> - <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"> - <CreatePartitions> - <CreatePartition wcm:action="add"> - <Order>1</Order> - <Type>Primary</Type> - <Extend>true</Extend> - </CreatePartition> - </CreatePartitions> - <ModifyPartitions> - <ModifyPartition wcm:action="add"> - <Extend>false</Extend> - <Format>NTFS</Format> - <Letter>C</Letter> - <Order>1</Order> - <PartitionID>1</PartitionID> - <Label>Windows 2008R2</Label> - </ModifyPartition> - </ModifyPartitions> - <DiskID>0</DiskID> - <WillWipeDisk>true</WillWipeDisk> - </Disk> - <WillShowUI>OnError</WillShowUI> - </DiskConfiguration> - <UserData> - <AcceptEula>true</AcceptEula> - <FullName>Vagrant Administrator</FullName> - <Organization>Bento by Chef</Organization> - <!-- Product Key from http://technet.microsoft.com/en-us/library/jj612867.aspx --> - <ProductKey> - <!-- Do not uncomment the Key element if you are using trial ISOs --> - <!-- You must uncomment the Key element (and optionally insert your own key) if you are using retail or volume license ISOs --> - <!--<Key>YC6KT-GKW9T-YTKYR-T4X34-R7VHC</Key>--> - <WillShowUI>Never</WillShowUI> - </ProductKey> - </UserData> - <ImageInstall> - <OSImage> - <InstallTo> - <DiskID>0</DiskID> - <PartitionID>1</PartitionID> - </InstallTo> - <WillShowUI>OnError</WillShowUI> - <InstallToAvailablePartition>false</InstallToAvailablePartition> - <InstallFrom> - <MetaData wcm:action="add"> - <Key>/IMAGE/NAME</Key> - <Value>Windows Server 2008 R2 SERVERSTANDARD</Value> - </MetaData> - </InstallFrom> - </OSImage> - </ImageInstall> - </component> - <component xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" name="Microsoft-Windows-International-Core-WinPE" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> - <SetupUILanguage> - <UILanguage>en-US</UILanguage> - </SetupUILanguage> - <InputLocale>en-US</InputLocale> - <SystemLocale>en-US</SystemLocale> - <UILanguage>en-US</UILanguage> - <UILanguageFallback>en-US</UILanguageFallback> - <UserLocale>en-US</UserLocale> - </component> - </settings> - <settings pass="offlineServicing"> - <component name="Microsoft-Windows-LUA-Settings" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> - <EnableLUA>false</EnableLUA> - </component> - </settings> - <settings pass="oobeSystem"> - <component xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" name="Microsoft-Windows-Shell-Setup" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> - <OOBE> - <HideEULAPage>true</HideEULAPage> - <HideWirelessSetupInOOBE>true</HideWirelessSetupInOOBE> - <NetworkLocation>Home</NetworkLocation> - </OOBE> - <UserAccounts> - <AdministratorPassword> - <Value>vagrant</Value> - <PlainText>true</PlainText> - </AdministratorPassword> - <LocalAccounts> - <LocalAccount wcm:action="add"> - <Password> - <Value>vagrant</Value> - <PlainText>true</PlainText> - </Password> - <Description>Vagrant User</Description> - <DisplayName>vagrant</DisplayName> - <Group>administrators</Group> - <Name>vagrant</Name> - </LocalAccount> - </LocalAccounts> - </UserAccounts> - <AutoLogon> - <Password> - <Value>vagrant</Value> - <PlainText>true</PlainText> - </Password> - <Username>vagrant</Username> - <Enabled>true</Enabled> - </AutoLogon> - <FirstLogonCommands> - <SynchronousCommand wcm:action="add"> - <CommandLine>cmd.exe /c powershell -Command "Set-ExecutionPolicy -ExecutionPolicy RemoteSigned -Force"</CommandLine> - <Description>Set Execution Policy 64 Bit</Description> - <Order>1</Order> - <RequiresUserInput>true</RequiresUserInput> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <CommandLine>C:\Windows\SysWOW64\cmd.exe /c powershell -Command "Set-ExecutionPolicy -ExecutionPolicy RemoteSigned -Force"</CommandLine> - <Description>Set Execution Policy 32 Bit</Description> - <Order>2</Order> - <RequiresUserInput>true</RequiresUserInput> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <CommandLine>cmd.exe /c winrm quickconfig -q</CommandLine> - <Description>winrm quickconfig -q</Description> - <Order>3</Order> - <RequiresUserInput>true</RequiresUserInput> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <CommandLine>cmd.exe /c winrm quickconfig -transport:http</CommandLine> - <Description>winrm quickconfig -transport:http</Description> - <Order>4</Order> - <RequiresUserInput>true</RequiresUserInput> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <CommandLine>cmd.exe /c winrm set winrm/config @{MaxTimeoutms="1800000"}</CommandLine> - <Description>Win RM MaxTimoutms</Description> - <Order>5</Order> - <RequiresUserInput>true</RequiresUserInput> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <CommandLine>cmd.exe /c winrm set winrm/config/winrs @{MaxMemoryPerShellMB="800"}</CommandLine> - <Description>Win RM MaxMemoryPerShellMB</Description> - <Order>6</Order> - <RequiresUserInput>true</RequiresUserInput> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <CommandLine>cmd.exe /c winrm set winrm/config/service @{AllowUnencrypted="true"}</CommandLine> - <Description>Win RM AllowUnencrypted</Description> - <Order>7</Order> - <RequiresUserInput>true</RequiresUserInput> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <CommandLine>cmd.exe /c winrm set winrm/config/service/auth @{Basic="true"}</CommandLine> - <Description>Win RM auth Basic</Description> - <Order>8</Order> - <RequiresUserInput>true</RequiresUserInput> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <CommandLine>cmd.exe /c winrm set winrm/config/client/auth @{Basic="true"}</CommandLine> - <Description>Win RM client auth Basic</Description> - <Order>9</Order> - <RequiresUserInput>true</RequiresUserInput> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <CommandLine>cmd.exe /c winrm set winrm/config/listener?Address=*+Transport=HTTP @{Port="5985"} </CommandLine> - <Description>Win RM listener Address/Port</Description> - <Order>10</Order> - <RequiresUserInput>true</RequiresUserInput> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <CommandLine>cmd.exe /c netsh advfirewall firewall set rule group="remote administration" new enable=yes </CommandLine> - <Description>Win RM adv firewall enable</Description> - <Order>11</Order> - <RequiresUserInput>true</RequiresUserInput> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <CommandLine>cmd.exe /c netsh firewall add portopening TCP 5985 "Port 5985" </CommandLine> - <Description>Win RM port open</Description> - <Order>12</Order> - <RequiresUserInput>true</RequiresUserInput> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <CommandLine>cmd.exe /c net stop winrm </CommandLine> - <Description>Stop Win RM Service </Description> - <Order>13</Order> - <RequiresUserInput>true</RequiresUserInput> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <CommandLine>cmd.exe /c sc config winrm start= auto</CommandLine> - <Description>Win RM Autostart</Description> - <Order>14</Order> - <RequiresUserInput>true</RequiresUserInput> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <CommandLine>cmd.exe /c net start winrm</CommandLine> - <Description>Start Win RM Service</Description> - <Order>15</Order> - <RequiresUserInput>true</RequiresUserInput> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <CommandLine>cmd.exe /c wmic useraccount where "name='vagrant'" set PasswordExpires=FALSE</CommandLine> - <Order>16</Order> - <Description>Disable password expiration for vagrant user</Description> - </SynchronousCommand> - </FirstLogonCommands> - <ShowWindowsLive>false</ShowWindowsLive> - </component> - </settings> - <settings pass="specialize"> - <component name="Microsoft-Windows-Shell-Setup" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> - <OEMInformation> - <HelpCustomized>false</HelpCustomized> - </OEMInformation> - <!-- Rename computer here. --> - <ComputerName>vagrant-2008R2</ComputerName> - <TimeZone>Pacific Standard Time</TimeZone> - <RegisteredOwner/> - </component> - <component xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" name="Microsoft-Windows-ServerManager-SvrMgrNc" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> - <DoNotOpenServerManagerAtLogon>true</DoNotOpenServerManagerAtLogon> - </component> - <component xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" name="Microsoft-Windows-IE-ESC" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> - <!-- Disable IE ESC. --> - <IEHardenAdmin>false</IEHardenAdmin> - <IEHardenUser>false</IEHardenUser> - </component> - <component xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" name="Microsoft-Windows-OutOfBoxExperience" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> - <DoNotOpenInitialConfigurationTasksAtLogon>true</DoNotOpenInitialConfigurationTasksAtLogon> - </component> - <component xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" name="Microsoft-Windows-Security-SPP-UX" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> - <SkipAutoActivation>true</SkipAutoActivation> - </component> - </settings> - <cpi:offlineImage xmlns:cpi="urn:schemas-microsoft-com:cpi" cpi:source="catalog:d:/sources/install_windows server 2008 r2 serverdatacenter.clg"/> -</unattend> From ea07b95b91334a7b78b427487332ebe5752d0125 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Tue, 12 May 2020 14:31:59 -0700 Subject: [PATCH 1172/1622] Update CentOS to 7.8 and add Fedora 32 Signed-off-by: Tim Smith <tsmith@chef.io> --- builds.yml | 5 +- ...7.7-x86_64.json => centos-7.8-x86_64.json} | 12 +- packer_templates/fedora/fedora-32-x86_64.json | 194 ++++++++++++++++++ 3 files changed, 203 insertions(+), 8 deletions(-) rename packer_templates/centos/{centos-7.7-x86_64.json => centos-7.8-x86_64.json} (96%) create mode 100644 packer_templates/fedora/fedora-32-x86_64.json diff --git a/builds.yml b/builds.yml index a1c94f867..79a234ba7 100644 --- a/builds.yml +++ b/builds.yml @@ -3,7 +3,7 @@ public: - 'amazon-2' - 'centos-6.10-i386' - 'centos-6.10' -- 'centos-7.7' +- 'centos-7.8' - 'centos-8.1' - 'debian-8.11-i386' - 'debian-8.11' @@ -13,6 +13,7 @@ public: - 'debian-10.3' - 'fedora-30' - 'fedora-31' +- 'fedora-32' - 'freebsd-11.3-i386' - 'freebsd-11.3' - 'freebsd-12.0-i386' @@ -47,4 +48,4 @@ slugs: 'freebsd-11': 'freebsd-11' 'freebsd-12': 'freebsd-12' 'opensuse-leap-15': 'opensuse-leap-15' - 'fedora-latest': 'fedora-31' + 'fedora-latest': 'fedora-32' diff --git a/packer_templates/centos/centos-7.7-x86_64.json b/packer_templates/centos/centos-7.8-x86_64.json similarity index 96% rename from packer_templates/centos/centos-7.7-x86_64.json rename to packer_templates/centos/centos-7.8-x86_64.json index 93635e05a..b90dd71fd 100644 --- a/packer_templates/centos/centos-7.7-x86_64.json +++ b/packer_templates/centos/centos-7.8-x86_64.json @@ -161,7 +161,7 @@ } ], "variables": { - "box_basename": "centos-7.7", + "box_basename": "centos-7.8", "build_directory": "../../builds", "http_directory": "{{template_dir}}/http", "build_timestamp": "{{isotime \"20060102150405\"}}", @@ -174,16 +174,16 @@ "hyperv_generation": "1", "hyperv_switch": "{{env `hyperv_switch`}}", "guest_additions_url": "", - "iso_checksum": "9bba3da2876cb9fcf6c28fb636bcbd01832fe6d84cd7445fa58e44e569b3b4fe", + "iso_checksum": "087a5743dc6fd6706d9b961b8147423ddc029451b938364c760d75440eb7be14", "iso_checksum_type": "sha256", - "iso_name": "CentOS-7-x86_64-DVD-1908.iso", + "iso_name": "CentOS-7-x86_64-DVD-2003.iso", "ks_path": "7/ks.cfg", "memory": "1024", "mirror": "http://mirrors.kernel.org/centos", - "mirror_directory": "7.7.1908/isos/x86_64", - "name": "centos-7.7", + "mirror_directory": "7.8.2003/isos/x86_64", + "name": "centos-7.8", "no_proxy": "{{env `no_proxy`}}", - "template": "centos-7.7-x86_64", + "template": "centos-7.8-x86_64", "version": "TIMESTAMP" } } diff --git a/packer_templates/fedora/fedora-32-x86_64.json b/packer_templates/fedora/fedora-32-x86_64.json new file mode 100644 index 000000000..c4507d99b --- /dev/null +++ b/packer_templates/fedora/fedora-32-x86_64.json @@ -0,0 +1,194 @@ +{ + "builders": [ + { + "type": "qemu", + "vm_name": "{{ user `template` }}", + "name": "{{ user `template` }}", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-libvirt", + "accelerator": "kvm", + "boot_wait": "10s", + "boot_command": [ + "<tab> linux ks=http://{{.HTTPIP}}:{{.HTTPPort}}/{{user `ks_path`}}<enter><wait>" + ], + "format": "qcow2", + "disk_size": "{{user `disk_size`}}", + "disk_discard": "unmap", + "disk_cache": "unsafe", + "disk_compression": true, + "disk_interface": "virtio-scsi", + "net_device": "virtio-net", + "memory": "{{ user `memory` }}", + "cpus": "{{ user `cpus` }}", + "http_directory": "{{user `http_directory`}}", + "headless": "{{ user `headless` }}", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "ssh_username": "vagrant", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_timeout": "3600s", + "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now" + }, + { + "boot_command": [ + "<tab> linux ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": "{{user `disk_size`}}", + "guest_additions_url": "{{ user `guest_additions_url` }}", + "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "guest_os_type": "Fedora_64", + "hard_drive_interface": "sata", + "headless": "{{ user `headless` }}", + "http_directory": "{{user `http_directory`}}", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-virtualbox", + "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_timeout": "10000s", + "type": "virtualbox-iso", + "memory": "{{ user `memory` }}", + "cpus": "{{ user `cpus` }}", + "virtualbox_version_file": ".vbox_version", + "vm_name": "{{ user `template` }}" + }, + { + "boot_command": [ + "<tab> linux ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": "{{user `disk_size`}}", + "guest_os_type": "fedora-64", + "headless": "{{ user `headless` }}", + "http_directory": "{{user `http_directory`}}", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-vmware", + "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_timeout": "10000s", + "tools_upload_flavor": "linux", + "type": "vmware-iso", + "vm_name": "{{ user `template` }}", + "memory": "{{ user `memory` }}", + "cpus": "{{ user `cpus` }}", + "vmx_data": { + "cpuid.coresPerSocket": "1", + "ethernet0.pciSlotNumber": "32" + }, + "vmx_remove_ethernet_interfaces": true + }, + { + "boot_command": [ + "<tab> linux ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" + ], + "boot_wait": "10s", + "disk_size": "{{user `disk_size`}}", + "guest_os_type": "fedora-core", + "http_directory": "{{user `http_directory`}}", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-parallels", + "parallels_tools_flavor": "lin", + "memory": "{{ user `memory` }}", + "cpus": "{{ user `cpus` }}", + "prlctl_version_file": ".prlctl_version", + "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_timeout": "10000s", + "type": "parallels-iso", + "vm_name": "{{ user `template` }}" + }, + { + "boot_command": [ + "<tab> linux ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" + ], + "boot_wait": "10s", + "memory": "{{ user `memory` }}", + "cpus": "{{ user `cpus` }}", + "disk_size": "{{user `disk_size`}}", + "headless": "{{ user `headless` }}", + "http_directory": "{{user `http_directory`}}", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-qemu", + "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_timeout": "10000s", + "type": "qemu", + "vm_name": "{{ user `template` }}" + } + ], + "post-processors": [ + { + "output": "{{ user `build_directory` }}/{{user `box_basename`}}.{{.Provider}}.box", + "type": "vagrant" + } + ], + "provisioners": [ + { + "environment_vars": [ + "HOME_DIR=/home/vagrant", + "http_proxy={{user `http_proxy`}}", + "https_proxy={{user `https_proxy`}}", + "no_proxy={{user `no_proxy`}}" + ], + "execute_command": "echo 'vagrant' | {{.Vars}} sudo -E -S bash '{{.Path}}'", + "expect_disconnect": true, + "scripts": [ + "{{template_dir}}/scripts/swap.sh", + "{{template_dir}}/scripts/fix-slow-dns.sh", + "{{template_dir}}/scripts/build-tools.sh", + "{{template_dir}}/scripts/install-supporting-packages.sh", + "{{template_dir}}/../_common/motd.sh", + "{{template_dir}}/../_common/sshd.sh", + "{{template_dir}}/../_common/virtualbox.sh", + "{{template_dir}}/../_common/vmware.sh", + "{{template_dir}}/../_common/parallels.sh", + "{{template_dir}}/../_common/vagrant.sh", + "{{template_dir}}/scripts/cleanup.sh", + "{{template_dir}}/../_common/minimize.sh" + ], + "type": "shell" + } + ], + "variables": { + "arch": "64", + "box_basename": "fedora-32", + "build_directory": "../../builds", + "http_directory": "{{template_dir}}/http", + "build_timestamp": "{{isotime \"20060102150405\"}}", + "cpus": "1", + "disk_size": "65536", + "git_revision": "__unknown_git_revision__", + "headless": "", + "http_proxy": "{{env `http_proxy`}}", + "https_proxy": "{{env `https_proxy`}}", + "guest_additions_url": "", + "iso_checksum": "cd2aefdbe1b5042865a39c49d32f5d21a9537c719aa87dde34d08ca06bc6681c", + "iso_checksum_type": "sha256", + "iso_name": "Fedora-Server-dvd-x86_64-32-1.6.iso", + "ks_path": "ks-fedora.cfg", + "memory": "1024", + "mirror": "http://download.fedoraproject.org/pub/fedora/linux", + "mirror_directory": "releases/32/Server/x86_64/iso", + "name": "fedora-32", + "no_proxy": "{{env `no_proxy`}}", + "template": "fedora-32-x86_64", + "version": "TIMESTAMP" + } +} From 32c7b2479018c09777e949d33f124980af28cb04 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Tue, 12 May 2020 14:32:35 -0700 Subject: [PATCH 1173/1622] make myself the owner on the cookbook There really isn't much if anything left of the original at this point. Signed-off-by: Tim Smith <tsmith@chef.io> --- packer_templates/windows/cookbooks/packer/metadata.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packer_templates/windows/cookbooks/packer/metadata.rb b/packer_templates/windows/cookbooks/packer/metadata.rb index 4bcc8d0e9..c15884e1a 100644 --- a/packer_templates/windows/cookbooks/packer/metadata.rb +++ b/packer_templates/windows/cookbooks/packer/metadata.rb @@ -1,7 +1,7 @@ name 'packer' -maintainer 'Matt Wrock' -maintainer_email 'matt@mattwrock.com' +maintainer 'Tim Smith' +maintainer_email 'tsmith@chef.io' license 'Apache-2.0' description 'Resources run during packer builds' -version '0.1.0' +version '1.0.0' chef_version '>= 15.0' From be3257b30d68970e9a4454a633c8561c5d0d57fa Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Tue, 12 May 2020 14:33:07 -0700 Subject: [PATCH 1174/1622] Chefstyle fixes to the CLI Signed-off-by: Tim Smith <tsmith@chef.io> --- lib/bento/buildmetadata.rb | 2 +- lib/bento/cli.rb | 2 +- lib/bento/normalize.rb | 2 +- lib/bento/runner.rb | 2 +- lib/bento/test.rb | 4 ++-- lib/bento/upload.rb | 27 ++++++++++++++------------- 6 files changed, 20 insertions(+), 19 deletions(-) diff --git a/lib/bento/buildmetadata.rb b/lib/bento/buildmetadata.rb index bba3d7205..abbf91eb0 100644 --- a/lib/bento/buildmetadata.rb +++ b/lib/bento/buildmetadata.rb @@ -61,7 +61,7 @@ def template_vars def version override_version || merged_vars.fetch("version", "#{UNKNOWN}.TIMESTAMP") - .rpartition(".").first.concat(build_timestamp.to_s) + .rpartition(".").first.concat(build_timestamp.to_s) end def packer_ver diff --git a/lib/bento/cli.rb b/lib/bento/cli.rb index e49c4f765..f737c2119 100644 --- a/lib/bento/cli.rb +++ b/lib/bento/cli.rb @@ -153,7 +153,7 @@ def self.parse(args) opts.banner = "Usage: #{NAME} upload" end, argv: md_json_argv_proc, - } + }, } global.order! diff --git a/lib/bento/normalize.rb b/lib/bento/normalize.rb index ffb7b5487..e112fe313 100644 --- a/lib/bento/normalize.rb +++ b/lib/bento/normalize.rb @@ -72,7 +72,7 @@ def packer_validate_cmd(template, var_file) def validate(template) for_packer_run_with(template) do |md_file, var_file| cmd = packer_validate_cmd(template, var_file.path) - banner("[#{template}] Validating: '#{cmd.join(' ')}'") + banner("[#{template}] Validating: '#{cmd.join(" ")}'") if debug banner("[#{template}] DEBUG: var_file(#{var_file.path}) is:") puts IO.read(var_file.path) diff --git a/lib/bento/runner.rb b/lib/bento/runner.rb index b1e0f010a..74936852f 100644 --- a/lib/bento/runner.rb +++ b/lib/bento/runner.rb @@ -45,7 +45,7 @@ def build(file) Dir.chdir dir for_packer_run_with(template) do |md_file, _var_file| cmd = packer_build_cmd(template, md_file.path) - banner("[#{template}] Building: '#{cmd.join(' ')}'") + banner("[#{template}] Building: '#{cmd.join(" ")}'") time = Benchmark.measure do system(*cmd) || raise("[#{template}] Error building, exited #{$CHILD_STATUS}") end diff --git a/lib/bento/test.rb b/lib/bento/test.rb index ba88e0b00..666705be0 100644 --- a/lib/bento/test.rb +++ b/lib/bento/test.rb @@ -34,8 +34,8 @@ def destroy_all_bento boxes.each do |box| b = box.split(" ") - rm_cmd = Mixlib::ShellOut.new("vagrant box remove --force #{b[0]} --provider #{b[1].to_s.gsub(/(,|\()/, '')}") - banner("Removing #{b[0]} for provider #{b[1].to_s.gsub(/(,|\()/, '')}") + rm_cmd = Mixlib::ShellOut.new("vagrant box remove --force #{b[0]} --provider #{b[1].to_s.gsub(/(,|\()/, "")}") + banner("Removing #{b[0]} for provider #{b[1].to_s.gsub(/(,|\()/, "")}") rm_cmd.run_command end end diff --git a/lib/bento/upload.rb b/lib/bento/upload.rb index a24bce722..46800acc8 100644 --- a/lib/bento/upload.rb +++ b/lib/bento/upload.rb @@ -35,29 +35,29 @@ def start def upload_box(md_file) md_data = box_metadata(md_file) - md_data['providers'].each_pair do |prov, prov_data| - if File.exist?(File.join('builds', prov_data['file'])) - banner("Uploading bento/#{md_data['name']} version:#{md_data['version']} provider:#{prov}...") + md_data["providers"].each_pair do |prov, prov_data| + if File.exist?(File.join("builds", prov_data["file"])) + banner("Uploading bento/#{md_data["name"]} version:#{md_data["version"]} provider:#{prov}...") - upload_cmd = "vagrant cloud publish bento/#{md_data['name']} #{md_data['version']} #{prov} builds/#{prov_data['file']} --description '#{box_desc(md_data['name'])}' --short-description '#{box_desc(md_data['name'])}' --version-description '#{ver_desc(md_data, prov)}' --force --release" + upload_cmd = "vagrant cloud publish bento/#{md_data["name"]} #{md_data["version"]} #{prov} builds/#{prov_data["file"]} --description '#{box_desc(md_data["name"])}' --short-description '#{box_desc(md_data["name"])}' --version-description '#{ver_desc(md_data, prov)}' --force --release" shellout(upload_cmd) - slug_name = lookup_slug(md_data['name']) + slug_name = lookup_slug(md_data["name"]) if slug_name - banner("Uploading slug bento/#{slug_name} from #{md_data['name']} version:#{md_data['version']} provider:#{prov}...") - upload_cmd = "vagrant cloud publish bento/#{slug_name} #{md_data['version']} #{prov} builds/#{prov_data['file']} --description '#{slug_desc(slug_name)}' --short-description '#{slug_desc(slug_name)}' --version-description '#{ver_desc(md_data, prov)}' --force --release" + banner("Uploading slug bento/#{slug_name} from #{md_data["name"]} version:#{md_data["version"]} provider:#{prov}...") + upload_cmd = "vagrant cloud publish bento/#{slug_name} #{md_data["version"]} #{prov} builds/#{prov_data["file"]} --description '#{slug_desc(slug_name)}' --short-description '#{slug_desc(slug_name)}' --version-description '#{ver_desc(md_data, prov)}' --force --release" shellout(upload_cmd) end # move the box file to the completed directory - FileUtils.mv(File.join('builds', prov_data['file']), File.join('builds', 'uploaded', prov_data['file'])) + FileUtils.mv(File.join("builds", prov_data["file"]), File.join("builds", "uploaded", prov_data["file"])) else # box in metadata isn't on disk - warn "The #{prov} box defined in the metadata file #{md_file} does not exist at builds/#{prov_data['file']}. Skipping!" + warn "The #{prov} box defined in the metadata file #{md_file} does not exist at builds/#{prov_data["file"]}. Skipping!" end end # move the metadata file to the completed directory - FileUtils.mv(md_file, File.join('builds', 'uploaded', File.basename(md_file))) + FileUtils.mv(md_file, File.join("builds", "uploaded", File.basename(md_file))) end # @@ -67,9 +67,10 @@ def upload_box(md_file) # def lookup_slug(name) builds_yml["slugs"].each_pair do |slug, match_string| - return slug if name.start_with?(match_string) && !name.include?('i386') + return slug if name.start_with?(match_string) && !name.include?("i386") end - return nil + + nil end def box_desc(name) @@ -81,6 +82,6 @@ def slug_desc(name) end def ver_desc(md_data, provider) - "#{md_data['name'].tr("-", " ").capitalize} Vagrant box version #{md_data['version']} created with Bento by Chef. Tool versions: #{provider}: #{md_data['providers'][provider]['version']}, packer: #{md_data['packer']}" + "#{md_data["name"].tr("-", " ").capitalize} Vagrant box version #{md_data["version"]} created with Bento by Chef. Tool versions: #{provider}: #{md_data["providers"][provider]["version"]}, packer: #{md_data["packer"]}" end end From b36ea54950c7844e920672e6c134573866559531 Mon Sep 17 00:00:00 2001 From: Thorsten Bruhns <thorsten.bruhns@googlemail.com> Date: Fri, 15 May 2020 20:21:25 +0200 Subject: [PATCH 1175/1622] oraclelinux-7: added kernelparameter for kickstart Oracle changed the behavior for the NAT network device after rebooting the 1st time. enp3 is used during the kickstart and eth0 after the reboot. Packer cannot connect via SSH, due to missing network configuration for eth0. Signed-off-by: Thorsten Bruhns <thorsten.bruhns@googlemail.com> --- packer_templates/oraclelinux/oracle-7.7-x86_64.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/packer_templates/oraclelinux/oracle-7.7-x86_64.json b/packer_templates/oraclelinux/oracle-7.7-x86_64.json index b21e3725d..68363ae6d 100644 --- a/packer_templates/oraclelinux/oracle-7.7-x86_64.json +++ b/packer_templates/oraclelinux/oracle-7.7-x86_64.json @@ -2,7 +2,7 @@ "builders": [ { "boot_command": [ - "<up><wait><tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" + "<up><wait><tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}} net.ifnames=0 biosdevname=0<enter><wait>" ], "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", @@ -29,7 +29,7 @@ }, { "boot_command": [ - "<up><wait><tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" + "<up><wait><tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}} net.ifnames=0 biosdevname=0 <enter><wait>" ], "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", @@ -57,7 +57,7 @@ }, { "boot_command": [ - "<up><wait><tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" + "<up><wait><tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}} net.ifnames=0 biosdevname=0<enter><wait>" ], "boot_wait": "10s", "disk_size": "{{user `disk_size`}}", @@ -81,7 +81,7 @@ }, { "boot_command": [ - "<wait5><tab> text ks=hd:fd0:/ks.cfg<enter><wait5><esc>" + "<wait5><tab> text ks=hd:fd0:/ks.cfg net.ifnames=0 biosdevname=0<enter><wait5><esc>" ], "boot_wait": "10s", "cpus": "{{ user `cpus` }}", @@ -108,7 +108,7 @@ }, { "boot_command": [ - "<up><wait><tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" + "<up><wait><tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}} net.ifnames=0 biosdevname=0<enter><wait>" ], "boot_wait": "10s", "memory": "{{ user `memory` }}", From 2136327a2e8f47848fbec16c0ea9dd0627ed9beb Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Thu, 21 May 2020 08:28:27 -0700 Subject: [PATCH 1176/1622] Update URLs to point to Hashicorp's github org Signed-off-by: Tim Smith <tsmith@chef.io> --- lib/bento/normalize.rb | 2 +- packer_templates/_common/vagrant.sh | 2 +- packer_templates/macos/scripts/vagrant.sh | 2 +- packer_templates/solaris/scripts/vagrant.sh | 2 +- packer_templates/ubuntu/scripts/vagrant.sh | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/bento/normalize.rb b/lib/bento/normalize.rb index e112fe313..fa7eeb489 100644 --- a/lib/bento/normalize.rb +++ b/lib/bento/normalize.rb @@ -49,7 +49,7 @@ def fix(template) raise "[#{template}] Error fixing, exited #{$CHILD_STATUS}" if $CHILD_STATUS.exitstatus != 0 # preserve ampersands in shell commands, - # see: https://github.com/mitchellh/packer/issues/784 + # see: https://github.com/hashicorp/packer/issues/784 output.gsub!("\\u0026", "&") File.open(file, "wb") { |dest| dest.write(output) } fixed_checksum = checksum(file) diff --git a/packer_templates/_common/vagrant.sh b/packer_templates/_common/vagrant.sh index b69c3a585..c2a14bb1e 100644 --- a/packer_templates/_common/vagrant.sh +++ b/packer_templates/_common/vagrant.sh @@ -3,7 +3,7 @@ # set a default HOME_DIR environment variable if not set HOME_DIR="${HOME_DIR:-/home/vagrant}"; -pubkey_url="https://raw.githubusercontent.com/mitchellh/vagrant/master/keys/vagrant.pub"; +pubkey_url="https://raw.githubusercontent.com/hashicorp/vagrant/master/keys/vagrant.pub"; mkdir -p $HOME_DIR/.ssh; if command -v wget >/dev/null 2>&1; then wget --no-check-certificate "$pubkey_url" -O $HOME_DIR/.ssh/authorized_keys; diff --git a/packer_templates/macos/scripts/vagrant.sh b/packer_templates/macos/scripts/vagrant.sh index bd4b3ec21..993588e58 100644 --- a/packer_templates/macos/scripts/vagrant.sh +++ b/packer_templates/macos/scripts/vagrant.sh @@ -1,6 +1,6 @@ #!/bin/bash -eux -pubkey_url="https://raw.githubusercontent.com/mitchellh/vagrant/master/keys/vagrant.pub"; +pubkey_url="https://raw.githubusercontent.com/hashicorp/vagrant/master/keys/vagrant.pub"; mkdir -p $HOME_DIR/.ssh; if command -v wget >/dev/null 2>&1; then wget --no-check-certificate "$pubkey_url" -O $HOME_DIR/.ssh/authorized_keys; diff --git a/packer_templates/solaris/scripts/vagrant.sh b/packer_templates/solaris/scripts/vagrant.sh index 72803e267..f59273a70 100644 --- a/packer_templates/solaris/scripts/vagrant.sh +++ b/packer_templates/solaris/scripts/vagrant.sh @@ -3,7 +3,7 @@ # set a default HOME_DIR environment variable if not set HOME_DIR="${HOME_DIR:-/export/home/vagrant}"; -pubkey_url="https://raw.githubusercontent.com/mitchellh/vagrant/master/keys/vagrant.pub"; +pubkey_url="https://raw.githubusercontent.com/hashicorp/vagrant/master/keys/vagrant.pub"; mkdir -p $HOME_DIR/.ssh; if command -v wget >/dev/null 2>&1; then wget --no-check-certificate "$pubkey_url" -O $HOME_DIR/.ssh/authorized_keys; diff --git a/packer_templates/ubuntu/scripts/vagrant.sh b/packer_templates/ubuntu/scripts/vagrant.sh index bd4b3ec21..993588e58 100644 --- a/packer_templates/ubuntu/scripts/vagrant.sh +++ b/packer_templates/ubuntu/scripts/vagrant.sh @@ -1,6 +1,6 @@ #!/bin/bash -eux -pubkey_url="https://raw.githubusercontent.com/mitchellh/vagrant/master/keys/vagrant.pub"; +pubkey_url="https://raw.githubusercontent.com/hashicorp/vagrant/master/keys/vagrant.pub"; mkdir -p $HOME_DIR/.ssh; if command -v wget >/dev/null 2>&1; then wget --no-check-certificate "$pubkey_url" -O $HOME_DIR/.ssh/authorized_keys; From 525bfcecb2dc1d50322aeb613fbd5d9a8ee16e6a Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Thu, 21 May 2020 08:28:47 -0700 Subject: [PATCH 1177/1622] Install 2019 and 2016 updates Signed-off-by: Tim Smith <tsmith@chef.io> --- .../cookbooks/packer/recipes/updates.rb | 24 ++++++++----------- 1 file changed, 10 insertions(+), 14 deletions(-) diff --git a/packer_templates/windows/cookbooks/packer/recipes/updates.rb b/packer_templates/windows/cookbooks/packer/recipes/updates.rb index d29fc860d..7bf0ed514 100644 --- a/packer_templates/windows/cookbooks/packer/recipes/updates.rb +++ b/packer_templates/windows/cookbooks/packer/recipes/updates.rb @@ -1,17 +1,13 @@ -# Don't check for updates automatically. This needs to be configured before you can install updates -registry_key 'HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\WindowsUpdate\Auto Update' do - values [{ - name: 'AUOptions', - type: :dword, - data: 1, - }] -end - -if windows_nt_version == 6.1 # 2008R2 - +if windows_nt_version == '10.0.17763' # 2019 # This is basically a service pack and we should install it to fix a giant pile of bugs - msu_package '2018-10 monthly rollup' do - source 'http://download.windowsupdate.com/d/msdownload/update/software/secu/2018/09/windows6.1-kb4462923-x64_5c4506692214692bf846da33052edb1dc5752156.msu' + msu_package '2020-04 monthly rollup' do + source 'http://download.windowsupdate.com/d/msdownload/update/software/updt/2020/04/windows10.0-kb4550969-x64_7d0a6efbe9e4d44253babdc161873513f88fc1e4.msu' action :install end -end +elsif windows_nt_version == '10.0.14393' # 2016 + # This is basically a service pack and we should install it to fix a giant pile of bugs + msu_package '2020-04 monthly rollup' do + source 'http://download.windowsupdate.com/d/msdownload/update/software/updt/2020/04/windows10.0-kb4550947-x64_f2ec932f8fb2be82d2f430b5dcd1ec4b92a7611c.msu' + action :install + end +end \ No newline at end of file From 8e1f2e03e3450bb9d948449b0b9c6639220ba306 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Thu, 21 May 2020 08:29:12 -0700 Subject: [PATCH 1178/1622] Update Debian 10.3 -> 10.4 Signed-off-by: Tim Smith <tsmith@chef.io> --- README.md | 4 ++-- builds.yml | 4 ++-- ...debian-10.3-amd64.json => debian-10.4-amd64.json} | 12 ++++++------ .../{debian-10.3-i386.json => debian-10.4-i386.json} | 12 ++++++------ 4 files changed, 16 insertions(+), 16 deletions(-) rename packer_templates/debian/{debian-10.3-amd64.json => debian-10.4-amd64.json} (96%) rename packer_templates/debian/{debian-10.3-i386.json => debian-10.4-i386.json} (96%) diff --git a/README.md b/README.md index 54a2762fe..45bfc2274 100644 --- a/README.md +++ b/README.md @@ -44,11 +44,11 @@ $ cd ubuntu $ packer build -only=virtualbox-iso ubuntu-18.04-amd64.json ``` -To build Debian 10.3 32bit boxes for all possible providers (simultaneously) +To build Debian 10.4 32bit boxes for all possible providers (simultaneously) ``` $ cd debian -$ packer build debian-10.3-i386.json +$ packer build debian-10.4-i386.json ``` To build CentOS 7.7 boxes for all providers except VMware and Parallels diff --git a/builds.yml b/builds.yml index 79a234ba7..737d6a430 100644 --- a/builds.yml +++ b/builds.yml @@ -9,8 +9,8 @@ public: - 'debian-8.11' - 'debian-9.12-i386' - 'debian-9.12' -- 'debian-10.3-i386' -- 'debian-10.3' +- 'debian-10.4-i386' +- 'debian-10.4' - 'fedora-30' - 'fedora-31' - 'fedora-32' diff --git a/packer_templates/debian/debian-10.3-amd64.json b/packer_templates/debian/debian-10.4-amd64.json similarity index 96% rename from packer_templates/debian/debian-10.3-amd64.json rename to packer_templates/debian/debian-10.4-amd64.json index 3feb7b0ae..5c88c56d1 100644 --- a/packer_templates/debian/debian-10.3-amd64.json +++ b/packer_templates/debian/debian-10.4-amd64.json @@ -197,7 +197,7 @@ } ], "variables": { - "box_basename": "debian-10.3", + "box_basename": "debian-10.4", "build_directory": "../../builds", "http_directory": "{{template_dir}}/http", "build_timestamp": "{{isotime \"20060102150405\"}}", @@ -208,16 +208,16 @@ "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", "guest_additions_url": "", - "iso_checksum": "6a901b5abe43d88b39d627e1339d15507cc38f980036b928f835e0f0e957d3d8", + "iso_checksum": "ab3763d553330e90869487a6843c88f1d4aa199333ff16b653e60e59ac1fc60b", "iso_checksum_type": "sha256", - "iso_name": "debian-10.3.0-amd64-netinst.iso", + "iso_name": "debian-10.4.0-amd64-netinst.iso", "memory": "1024", "mirror": "http://cdimage.debian.org/cdimage/release", - "mirror_directory": "10.3.0/amd64/iso-cd", - "name": "debian-10.3", + "mirror_directory": "10.4.0/amd64/iso-cd", + "name": "debian-10.4", "no_proxy": "{{env `no_proxy`}}", "preseed_path": "debian-9/preseed.cfg", - "template": "debian-10.3-amd64", + "template": "debian-10.4-amd64", "version": "TIMESTAMP" } } diff --git a/packer_templates/debian/debian-10.3-i386.json b/packer_templates/debian/debian-10.4-i386.json similarity index 96% rename from packer_templates/debian/debian-10.3-i386.json rename to packer_templates/debian/debian-10.4-i386.json index ebd6ee661..f1518339b 100644 --- a/packer_templates/debian/debian-10.3-i386.json +++ b/packer_templates/debian/debian-10.4-i386.json @@ -197,7 +197,7 @@ } ], "variables": { - "box_basename": "debian-10.3-i386", + "box_basename": "debian-10.4-i386", "build_directory": "../../builds", "http_directory": "{{template_dir}}/http", "build_timestamp": "{{isotime \"20060102150405\"}}", @@ -208,16 +208,16 @@ "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", "guest_additions_url": "", - "iso_checksum": "057bc3f52a45bf7c9f82bee898ecb6a054e9841a76fc22b26dedd2b53c0c5884", + "iso_checksum": "549966a43224f237c46ee4397901ec9fd6feae74abb1e6f6baa0078acf77a936", "iso_checksum_type": "sha256", - "iso_name": "debian-10.3.0-i386-netinst.iso", + "iso_name": "debian-10.4.0-i386-netinst.iso", "memory": "1024", "mirror": "http://cdimage.debian.org/cdimage/release", - "mirror_directory": "10.3.0/i386/iso-cd", - "name": "debian-10.3-i386", + "mirror_directory": "10.4.0/i386/iso-cd", + "name": "debian-10.4-i386", "no_proxy": "{{env `no_proxy`}}", "preseed_path": "debian-9/preseed.cfg", - "template": "debian-10.3-i386", + "template": "debian-10.4-i386", "version": "TIMESTAMP" } } From c07517b89803ce6ecf99454c2b08c27aaa0dfaef Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Thu, 21 May 2020 08:29:23 -0700 Subject: [PATCH 1179/1622] Remove Windows 2008 from the Kitchen Config Signed-off-by: Tim Smith <tsmith@chef.io> --- packer_templates/windows/cookbooks/packer/kitchen.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/packer_templates/windows/cookbooks/packer/kitchen.yml b/packer_templates/windows/cookbooks/packer/kitchen.yml index 0cd47f581..4e4a4a243 100644 --- a/packer_templates/windows/cookbooks/packer/kitchen.yml +++ b/packer_templates/windows/cookbooks/packer/kitchen.yml @@ -22,9 +22,6 @@ platforms: - name: windows-2012r2 driver_config: box: tas50/windows_2012r2 - - name: windows-2008r2 - driver_config: - box: tas50/windows_2008r2 suites: - name: default From 1f28249e0694e7f76df22e15e41f92b9c58952ac Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Thu, 21 May 2020 12:05:25 -0700 Subject: [PATCH 1180/1622] Remove EOL FreeBSD 12.0 Signed-off-by: Tim Smith <tsmith@chef.io> --- builds.yml | 2 - .../freebsd/freebsd-12.0-amd64.json | 211 ------------------ .../freebsd/freebsd-12.0-i386.json | 211 ------------------ 3 files changed, 424 deletions(-) delete mode 100644 packer_templates/freebsd/freebsd-12.0-amd64.json delete mode 100644 packer_templates/freebsd/freebsd-12.0-i386.json diff --git a/builds.yml b/builds.yml index 737d6a430..03080871a 100644 --- a/builds.yml +++ b/builds.yml @@ -16,8 +16,6 @@ public: - 'fedora-32' - 'freebsd-11.3-i386' - 'freebsd-11.3' -- 'freebsd-12.0-i386' -- 'freebsd-12.0' - 'freebsd-12.1-i386' - 'freebsd-12.1' - 'opensuse-leap-15.1' diff --git a/packer_templates/freebsd/freebsd-12.0-amd64.json b/packer_templates/freebsd/freebsd-12.0-amd64.json deleted file mode 100644 index ff55978fe..000000000 --- a/packer_templates/freebsd/freebsd-12.0-amd64.json +++ /dev/null @@ -1,211 +0,0 @@ -{ - "builders": [ - { - "boot_command": [ - "<esc><wait>", - "boot -s<wait>", - "<enter><wait>", - "<wait10><wait10>", - "/bin/sh<enter><wait>", - "mdmfs -s 100m md1 /tmp<enter><wait>", - "mdmfs -s 100m md2 /mnt<enter><wait>", - "dhclient -p /tmp/dhclient.em0.pid -l /tmp/dhclient.lease.em0 em0<enter><wait>", - "fetch -o /tmp/installerconfig http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} && bsdinstall script /tmp/installerconfig<enter><wait>" - ], - "boot_wait": "10s", - "memory": "{{ user `memory` }}", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "guest_additions_mode": "disable", - "guest_os_type": "FreeBSD_64", - "headless": "{{ user `headless` }}", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-virtualbox", - "shutdown_command": "echo 'vagrant' | su -m root -c 'shutdown -p now'", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_timeout": "10000s", - "type": "virtualbox-iso", - "virtualbox_version_file": ".vbox_version", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<esc><wait>", - "boot -s<wait>", - "<enter><wait>", - "<wait10><wait10>", - "/bin/sh<enter><wait>", - "mdmfs -s 100m md1 /tmp<enter><wait>", - "mdmfs -s 100m md2 /mnt<enter><wait>", - "dhclient -p /tmp/dhclient.em0.pid -l /tmp/dhclient.lease.em0 em0<enter><wait>", - "<wait5>", - "fetch -o /tmp/installerconfig http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} && bsdinstall script /tmp/installerconfig<enter><wait>" - ], - "boot_wait": "10s", - "memory": "{{ user `memory` }}", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "freebsd-64", - "headless": "{{ user `headless` }}", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-vmware", - "shutdown_command": "echo 'vagrant' | su -m root -c 'shutdown -p now'", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_timeout": "10000s", - "type": "vmware-iso", - "vm_name": "{{ user `template` }}", - "vmx_data": { - "cpuid.coresPerSocket": "1" - }, - "vmx_remove_ethernet_interfaces": true - }, - { - "boot_command": [ - "<esc><wait>", - "boot -s<wait>", - "<enter><wait>", - "<wait10><wait10>", - "/bin/sh<enter><wait>", - "mdmfs -s 100m md1 /tmp<enter><wait>", - "mdmfs -s 100m md2 /mnt<enter><wait>", - "dhclient -p /tmp/dhclient.em0.pid -l /tmp/dhclient.lease.em0 em0<enter><wait>", - "fetch -o /tmp/installerconfig http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} && bsdinstall script /tmp/installerconfig<enter><wait>" - ], - "boot_wait": "8s", - "memory": "{{ user `memory` }}", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "freebsd", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-parallels", - "parallels_tools_mode": "disable", - "prlctl": [ - [ - "set", - "{{.Name}}", - "--device-set", - "cdrom0", - "--iface", - "ide" - ], - [ - "set", - "{{.Name}}", - "--device-del", - "fdd0" - ], - [ - "set", - "{{.Name}}", - "--device-del", - "parallel0" - ] - ], - "prlctl_version_file": ".prlctl_version", - "shutdown_command": "echo 'vagrant' | su -m root -c 'shutdown -p now'", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_timeout": "10000s", - "type": "parallels-iso", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<esc><wait>", - "boot -s<wait>", - "<enter><wait>", - "<wait10><wait10>", - "/bin/sh<enter><wait>", - "mdmfs -s 100m md1 /tmp<enter><wait>", - "mdmfs -s 100m md2 /mnt<enter><wait>", - "dhclient -p /tmp/dhclient.vtnet0.pid -l /tmp/dhclient.lease.vtnet0 vtnet0<enter><wait>", - "fetch -o /tmp/installerconfig http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} && bsdinstall script /tmp/installerconfig<enter><wait>" - ], - "boot_wait": "7s", - "memory": "{{ user `memory` }}", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "headless": "{{ user `headless` }}", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-qemu", - "shutdown_command": "echo 'vagrant' | su -m root -c 'shutdown -p now'", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_timeout": "10000s", - "type": "qemu", - "vm_name": "{{ user `template` }}" - } - ], - "post-processors": [ - { - "output": "{{ user `build_directory` }}/{{user `box_basename`}}.{{.Provider}}.box", - "type": "vagrant", - "vagrantfile_template": "{{template_dir}}/vagrantfile_templates/freebsd.rb" - } - ], - "provisioners": [ - { - "environment_vars": [ - "HOME_DIR=/home/vagrant", - "http_proxy={{user `http_proxy`}}", - "https_proxy={{user `https_proxy`}}", - "no_proxy={{user `no_proxy`}}", - "pkg_branch={{user `pkg_branch`}}" - ], - "execute_command": "echo 'vagrant' | {{.Vars}} su -m root -c 'sh -eux {{.Path}}'", - "expect_disconnect": true, - "scripts": [ - "{{template_dir}}/scripts/update.sh", - "{{template_dir}}/scripts/postinstall.sh", - "{{template_dir}}/scripts/sudoers.sh", - "{{template_dir}}/../_common/vagrant.sh", - "{{template_dir}}/scripts/vmtools.sh", - "{{template_dir}}/scripts/cleanup.sh", - "{{template_dir}}/scripts/minimize.sh" - ], - "type": "shell" - } - ], - "variables": { - "box_basename": "freebsd-12.0", - "build_directory": "../../builds", - "http_directory": "{{template_dir}}/http", - "build_timestamp": "{{isotime \"20060102150405\"}}", - "cpus": "1", - "disk_size": "65536", - "git_revision": "__unknown_git_revision__", - "headless": "", - "http_proxy": "{{env `http_proxy`}}", - "https_proxy": "{{env `https_proxy`}}", - "install_path": "freebsd-11/installerconfig", - "iso_checksum": "63abec8aeb915f1a021dd2df6c7767251f9b6e87f403b7ddf9a423446d0a5453", - "iso_checksum_type": "sha256", - "iso_name": "FreeBSD-12.0-RELEASE-amd64-disc1.iso", - "memory": "1024", - "mirror": "https://download.freebsd.org/ftp", - "mirror_directory": "releases/amd64/amd64/ISO-IMAGES/12.0", - "name": "freebsd-12.0", - "no_proxy": "{{env `no_proxy`}}", - "pkg_branch": "quarterly", - "template": "freebsd-12.0-amd64", - "version": "TIMESTAMP" - } -} diff --git a/packer_templates/freebsd/freebsd-12.0-i386.json b/packer_templates/freebsd/freebsd-12.0-i386.json deleted file mode 100644 index f069f1e92..000000000 --- a/packer_templates/freebsd/freebsd-12.0-i386.json +++ /dev/null @@ -1,211 +0,0 @@ -{ - "builders": [ - { - "boot_command": [ - "<esc><wait>", - "boot -s<wait>", - "<enter><wait>", - "<wait10><wait10>", - "/bin/sh<enter><wait>", - "mdmfs -s 100m md1 /tmp<enter><wait>", - "mdmfs -s 100m md2 /mnt<enter><wait>", - "dhclient -p /tmp/dhclient.em0.pid -l /tmp/dhclient.lease.em0 em0<enter><wait>", - "fetch -o /tmp/installerconfig http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} && bsdinstall script /tmp/installerconfig<enter><wait>" - ], - "boot_wait": "10s", - "memory": "{{ user `memory` }}", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "guest_additions_mode": "disable", - "guest_os_type": "FreeBSD", - "headless": "{{ user `headless` }}", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-virtualbox", - "shutdown_command": "echo 'vagrant' | su -m root -c 'shutdown -p now'", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_timeout": "10000s", - "type": "virtualbox-iso", - "virtualbox_version_file": ".vbox_version", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<esc><wait>", - "boot -s<wait>", - "<enter><wait>", - "<wait10><wait10>", - "/bin/sh<enter><wait>", - "mdmfs -s 100m md1 /tmp<enter><wait>", - "mdmfs -s 100m md2 /mnt<enter><wait>", - "dhclient -p /tmp/dhclient.em0.pid -l /tmp/dhclient.lease.em0 em0<enter><wait>", - "<wait5>", - "fetch -o /tmp/installerconfig http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} && bsdinstall script /tmp/installerconfig<enter><wait>" - ], - "boot_wait": "10s", - "memory": "{{ user `memory` }}", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "freebsd", - "headless": "{{ user `headless` }}", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-vmware", - "shutdown_command": "echo 'vagrant' | su -m root -c 'shutdown -p now'", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_timeout": "10000s", - "type": "vmware-iso", - "vm_name": "{{ user `template` }}", - "vmx_data": { - "cpuid.coresPerSocket": "1" - }, - "vmx_remove_ethernet_interfaces": true - }, - { - "boot_command": [ - "<esc><wait>", - "boot -s<wait>", - "<enter><wait>", - "<wait10><wait10>", - "/bin/sh<enter><wait>", - "mdmfs -s 100m md1 /tmp<enter><wait>", - "mdmfs -s 100m md2 /mnt<enter><wait>", - "dhclient -p /tmp/dhclient.em0.pid -l /tmp/dhclient.lease.em0 em0<enter><wait>", - "fetch -o /tmp/installerconfig http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} && bsdinstall script /tmp/installerconfig<enter><wait>" - ], - "boot_wait": "8s", - "memory": "{{ user `memory` }}", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "freebsd", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-parallels", - "parallels_tools_mode": "disable", - "prlctl": [ - [ - "set", - "{{.Name}}", - "--device-set", - "cdrom0", - "--iface", - "ide" - ], - [ - "set", - "{{.Name}}", - "--device-del", - "fdd0" - ], - [ - "set", - "{{.Name}}", - "--device-del", - "parallel0" - ] - ], - "prlctl_version_file": ".prlctl_version", - "shutdown_command": "echo 'vagrant' | su -m root -c 'shutdown -p now'", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_timeout": "10000s", - "type": "parallels-iso", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<esc><wait>", - "boot -s<wait>", - "<enter><wait>", - "<wait10><wait10>", - "/bin/sh<enter><wait>", - "mdmfs -s 100m md1 /tmp<enter><wait>", - "mdmfs -s 100m md2 /mnt<enter><wait>", - "dhclient -p /tmp/dhclient.vtnet0.pid -l /tmp/dhclient.lease.vtnet0 vtnet0<enter><wait>", - "fetch -o /tmp/installerconfig http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} && bsdinstall script /tmp/installerconfig<enter><wait>" - ], - "boot_wait": "7s", - "memory": "{{ user `memory` }}", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "headless": "{{ user `headless` }}", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-qemu", - "shutdown_command": "echo 'vagrant' | su -m root -c 'shutdown -p now'", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_timeout": "10000s", - "type": "qemu", - "vm_name": "{{ user `template` }}" - } - ], - "post-processors": [ - { - "output": "{{ user `build_directory` }}/{{user `box_basename`}}.{{.Provider}}.box", - "type": "vagrant", - "vagrantfile_template": "{{template_dir}}/vagrantfile_templates/freebsd.rb" - } - ], - "provisioners": [ - { - "environment_vars": [ - "HOME_DIR=/home/vagrant", - "http_proxy={{user `http_proxy`}}", - "https_proxy={{user `https_proxy`}}", - "no_proxy={{user `no_proxy`}}", - "pkg_branch={{user `pkg_branch`}}" - ], - "execute_command": "echo 'vagrant' | {{.Vars}} su -m root -c 'sh -eux {{.Path}}'", - "expect_disconnect": true, - "scripts": [ - "{{template_dir}}/scripts/update.sh", - "{{template_dir}}/scripts/postinstall.sh", - "{{template_dir}}/scripts/sudoers.sh", - "{{template_dir}}/../_common/vagrant.sh", - "{{template_dir}}/scripts/vmtools.sh", - "{{template_dir}}/scripts/cleanup.sh", - "{{template_dir}}/scripts/minimize.sh" - ], - "type": "shell" - } - ], - "variables": { - "box_basename": "freebsd-12.0-i386", - "build_directory": "../../builds", - "http_directory": "{{template_dir}}/http", - "build_timestamp": "{{isotime \"20060102150405\"}}", - "cpus": "1", - "disk_size": "40960", - "git_revision": "__unknown_git_revision__", - "headless": "", - "http_proxy": "{{env `http_proxy`}}", - "https_proxy": "{{env `https_proxy`}}", - "install_path": "freebsd-11/installerconfig", - "iso_checksum": "c2a2a18e9e803e1849533c5c7640f1eec058ef1426fb8fa62769d2fcbd58d485", - "iso_checksum_type": "sha256", - "iso_name": "FreeBSD-12.0-RELEASE-i386-disc1.iso", - "memory": "1024", - "mirror": "https://download.freebsd.org/ftp", - "mirror_directory": "releases/i386/i386/ISO-IMAGES/12.0", - "name": "freebsd-12.0-i386", - "no_proxy": "{{env `no_proxy`}}", - "pkg_branch": "quarterly", - "template": "freebsd-12.0-i386", - "version": "TIMESTAMP" - } -} From 7d15b180b8232423cb70d16d648fd037a7e99034 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Wed, 3 Jun 2020 19:34:25 -0700 Subject: [PATCH 1181/1622] Make sure we have bzip2 for virtualbox tools on opensuse This should get us working virtualbox tools which we need for Test Kitchen Signed-off-by: Tim Smith <tsmith@chef.io> --- packer_templates/opensuse/scripts/add_packages.sh | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/packer_templates/opensuse/scripts/add_packages.sh b/packer_templates/opensuse/scripts/add_packages.sh index 150989645..8eedd25dc 100644 --- a/packer_templates/opensuse/scripts/add_packages.sh +++ b/packer_templates/opensuse/scripts/add_packages.sh @@ -3,7 +3,12 @@ # Install missing packages zypper install -y kernel-default-devel gcc -# this is needed for the vmware tools install to complete -if [[ "$PACKER_BUILDER_TYPE" == vmware-iso ]]; then - zypper install -y insserv-compat -fi \ No newline at end of file +# make sure we have tools we need for the vm extensions +case "$PACKER_BUILDER_TYPE" in +virtualbox-iso|virtualbox-ovf) + zypper install -y bzip2; + ;; +vmware-iso) + zypper install -y insserv-compat; + ;; +esac \ No newline at end of file From be952738c2dbcc10bf81ff7a372fb6d7e08c90e9 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Tue, 16 Jun 2020 10:05:43 -0700 Subject: [PATCH 1182/1622] Update CentOS to 8.2 Signed-off-by: Tim Smith <tsmith@chef.io> --- ...8.1-x86_64.json => centos-8.2-x86_64.json} | 50 +++++++++---------- 1 file changed, 23 insertions(+), 27 deletions(-) rename packer_templates/centos/{centos-8.1-x86_64.json => centos-8.2-x86_64.json} (90%) diff --git a/packer_templates/centos/centos-8.1-x86_64.json b/packer_templates/centos/centos-8.2-x86_64.json similarity index 90% rename from packer_templates/centos/centos-8.1-x86_64.json rename to packer_templates/centos/centos-8.2-x86_64.json index bc743af70..27ee130db 100644 --- a/packer_templates/centos/centos-8.1-x86_64.json +++ b/packer_templates/centos/centos-8.2-x86_64.json @@ -5,25 +5,24 @@ "<up><wait><tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], "boot_wait": "10s", + "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", - "guest_additions_url": "{{ user `guest_additions_url` }}", "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "guest_additions_url": "{{ user `guest_additions_url` }}", "guest_os_type": "RedHat_64", "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-virtualbox", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, - "ssh_username": "vagrant", "ssh_timeout": "10000s", + "ssh_username": "vagrant", "type": "virtualbox-iso", - "memory": "{{ user `memory` }}", - "cpus": "{{ user `cpus` }}", "virtualbox_version_file": ".vbox_version", "vm_name": "{{ user `template` }}" }, @@ -32,24 +31,23 @@ "<up><wait><tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], "boot_wait": "10s", + "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "guest_os_type": "centos-64", "headless": "{{ user `headless` }}", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-vmware", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, - "ssh_username": "vagrant", "ssh_timeout": "10000s", + "ssh_username": "vagrant", "tools_upload_flavor": "linux", "type": "vmware-iso", "vm_name": "{{ user `template` }}", - "memory": "{{ user `memory` }}", - "cpus": "{{ user `cpus` }}", "vmx_data": { "cpuid.coresPerSocket": "1" }, @@ -60,22 +58,21 @@ "<up><wait><tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], "boot_wait": "10s", + "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "guest_os_type": "centos", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-parallels", "parallels_tools_flavor": "lin", - "memory": "{{ user `memory` }}", - "cpus": "{{ user `cpus` }}", "prlctl_version_file": ".prlctl_version", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, - "ssh_username": "vagrant", "ssh_timeout": "10000s", + "ssh_username": "vagrant", "type": "parallels-iso", "vm_name": "{{ user `template` }}" }, @@ -92,8 +89,7 @@ "generation": "{{user `hyperv_generation`}}", "guest_additions_mode": "disable", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-hyperv", @@ -111,20 +107,19 @@ "<up><wait><tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], "boot_wait": "10s", - "memory": "{{ user `memory` }}", "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-qemu", "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, - "ssh_username": "vagrant", "ssh_timeout": "10000s", + "ssh_username": "vagrant", "type": "qemu", "vm_name": "{{ user `template` }}" } @@ -163,27 +158,28 @@ "variables": { "box_basename": "centos-8.1", "build_directory": "../../builds", - "http_directory": "{{template_dir}}/http", "build_timestamp": "{{isotime \"2019102650405\"}}", "cpus": "1", "disk_size": "65536", "git_revision": "__unknown_git_revision__", + "guest_additions_url": "", "headless": "", + "http_directory": "{{template_dir}}/http", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", "hyperv_generation": "1", "hyperv_switch": "{{env `hyperv_switch`}}", - "guest_additions_url": "", - "iso_checksum": "3ee3f4ea1538e026fff763e2b284a6f20b259d91d1ad5688f5783a67d279423b", + "iso_checksum": "c87a2d81d67bbaeaf646aea5bedd70990078ec252fc52f5a7d65ff609871e255", "iso_checksum_type": "sha256", - "iso_name": "CentOS-8.1.1911-x86_64-dvd1.iso", + "iso_name": "CentOS-8.2.2004-x86_64-dvd1.iso", "ks_path": "8/ks.cfg", "memory": "1024", "mirror": "http://mirrors.kernel.org/centos", - "mirror_directory": "8.1.1911/isos/x86_64", + "mirror_directory": "8.2.2004/isos/x86_64", "name": "centos-8.1", "no_proxy": "{{env `no_proxy`}}", "template": "centos-8.1-x86_64", "version": "TIMESTAMP" } } + From a9492641a29313e8236f61c26e593bbe1ab2674d Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Tue, 16 Jun 2020 10:06:23 -0700 Subject: [PATCH 1183/1622] Run packer fix on the centos templates Signed-off-by: Tim Smith <tsmith@chef.io> --- packer_templates/centos/centos-6.10-i386.json | 44 +++++++++---------- .../centos/centos-6.10-x86_64.json | 44 +++++++++---------- .../centos/centos-7.8-x86_64.json | 44 +++++++++---------- 3 files changed, 60 insertions(+), 72 deletions(-) diff --git a/packer_templates/centos/centos-6.10-i386.json b/packer_templates/centos/centos-6.10-i386.json index 1e0358376..08a6071ab 100644 --- a/packer_templates/centos/centos-6.10-i386.json +++ b/packer_templates/centos/centos-6.10-i386.json @@ -5,25 +5,24 @@ "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], "boot_wait": "10s", + "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", - "guest_additions_url": "{{ user `guest_additions_url` }}", "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "guest_additions_url": "{{ user `guest_additions_url` }}", "guest_os_type": "RedHat", "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-virtualbox", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, - "ssh_username": "vagrant", "ssh_timeout": "10000s", + "ssh_username": "vagrant", "type": "virtualbox-iso", - "memory": "{{ user `memory` }}", - "cpus": "{{ user `cpus` }}", "virtualbox_version_file": ".vbox_version", "vm_name": "{{ user `template` }}" }, @@ -32,24 +31,23 @@ "<up><wait><tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], "boot_wait": "10s", + "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "guest_os_type": "centos", "headless": "{{ user `headless` }}", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-vmware", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, - "ssh_username": "vagrant", "ssh_timeout": "10000s", + "ssh_username": "vagrant", "tools_upload_flavor": "linux", "type": "vmware-iso", "vm_name": "{{ user `template` }}", - "memory": "{{ user `memory` }}", - "cpus": "{{ user `cpus` }}", "vmx_data": { "cpuid.coresPerSocket": "1" }, @@ -60,22 +58,21 @@ "<up><wait><tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], "boot_wait": "10s", + "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "guest_os_type": "centos", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-parallels", "parallels_tools_flavor": "lin", - "memory": "{{ user `memory` }}", - "cpus": "{{ user `cpus` }}", "prlctl_version_file": ".prlctl_version", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, - "ssh_username": "vagrant", "ssh_timeout": "10000s", + "ssh_username": "vagrant", "type": "parallels-iso", "vm_name": "{{ user `template` }}" }, @@ -92,8 +89,7 @@ "generation": "{{user `hyperv_generation`}}", "guest_additions_mode": "disable", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-hyperv", @@ -111,20 +107,19 @@ "<up><wait><tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], "boot_wait": "10s", - "memory": "{{ user `memory` }}", "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-qemu", "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, - "ssh_username": "vagrant", "ssh_timeout": "10000s", + "ssh_username": "vagrant", "type": "qemu", "vm_name": "{{ user `template` }}" } @@ -163,16 +158,16 @@ "variables": { "box_basename": "centos-6.10-i386", "build_directory": "../../builds", - "http_directory": "{{template_dir}}/http", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", "disk_size": "65536", "git_revision": "__unknown_git_revision__", + "guest_additions_url": "", "headless": "", + "http_directory": "{{template_dir}}/http", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", "hyperv_generation": "1", - "guest_additions_url": "", "iso_checksum": "25d95b3f178e59bd672fa97e043a9191cbf73bb6cd12f5df9b540fa88076cae8", "iso_checksum_type": "sha256", "iso_name": "CentOS-6.10-i386-bin-DVD1.iso", @@ -186,3 +181,4 @@ "version": "TIMESTAMP" } } + diff --git a/packer_templates/centos/centos-6.10-x86_64.json b/packer_templates/centos/centos-6.10-x86_64.json index c72799e77..924e79569 100644 --- a/packer_templates/centos/centos-6.10-x86_64.json +++ b/packer_templates/centos/centos-6.10-x86_64.json @@ -5,25 +5,24 @@ "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], "boot_wait": "10s", + "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", - "guest_additions_url": "{{ user `guest_additions_url` }}", "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "guest_additions_url": "{{ user `guest_additions_url` }}", "guest_os_type": "RedHat_64", "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-virtualbox", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, - "ssh_username": "vagrant", "ssh_timeout": "10000s", + "ssh_username": "vagrant", "type": "virtualbox-iso", - "memory": "{{ user `memory` }}", - "cpus": "{{ user `cpus` }}", "virtualbox_version_file": ".vbox_version", "vm_name": "{{ user `template` }}" }, @@ -32,24 +31,23 @@ "<up><wait><tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], "boot_wait": "10s", + "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "guest_os_type": "centos-64", "headless": "{{ user `headless` }}", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-vmware", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, - "ssh_username": "vagrant", "ssh_timeout": "10000s", + "ssh_username": "vagrant", "tools_upload_flavor": "linux", "type": "vmware-iso", "vm_name": "{{ user `template` }}", - "memory": "{{ user `memory` }}", - "cpus": "{{ user `cpus` }}", "vmx_data": { "cpuid.coresPerSocket": "1" }, @@ -60,22 +58,21 @@ "<up><wait><tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], "boot_wait": "10s", + "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "guest_os_type": "centos", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-parallels", "parallels_tools_flavor": "lin", - "memory": "{{ user `memory` }}", - "cpus": "{{ user `cpus` }}", "prlctl_version_file": ".prlctl_version", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, - "ssh_username": "vagrant", "ssh_timeout": "10000s", + "ssh_username": "vagrant", "type": "parallels-iso", "vm_name": "{{ user `template` }}" }, @@ -92,8 +89,7 @@ "generation": "{{user `hyperv_generation`}}", "guest_additions_mode": "disable", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-hyperv", @@ -111,20 +107,19 @@ "<up><wait><tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], "boot_wait": "10s", - "memory": "{{ user `memory` }}", "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-qemu", "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, - "ssh_username": "vagrant", "ssh_timeout": "10000s", + "ssh_username": "vagrant", "type": "qemu", "vm_name": "{{ user `template` }}" } @@ -163,17 +158,17 @@ "variables": { "box_basename": "centos-6.10", "build_directory": "../../builds", - "http_directory": "{{template_dir}}/http", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", "disk_size": "65536", "git_revision": "__unknown_git_revision__", + "guest_additions_url": "", "headless": "", + "http_directory": "{{template_dir}}/http", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", "hyperv_generation": "1", "hyperv_switch": "{{env `hyperv_switch`}}", - "guest_additions_url": "", "iso_checksum": "a68e46970678d4d297d46086ae2efdd3e994322d6d862ff51dcce25a0759e41c", "iso_checksum_type": "sha256", "iso_name": "CentOS-6.10-x86_64-bin-DVD1.iso", @@ -187,3 +182,4 @@ "version": "TIMESTAMP" } } + diff --git a/packer_templates/centos/centos-7.8-x86_64.json b/packer_templates/centos/centos-7.8-x86_64.json index b90dd71fd..60e28b6cb 100644 --- a/packer_templates/centos/centos-7.8-x86_64.json +++ b/packer_templates/centos/centos-7.8-x86_64.json @@ -5,25 +5,24 @@ "<up><wait><tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], "boot_wait": "10s", + "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", - "guest_additions_url": "{{ user `guest_additions_url` }}", "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "guest_additions_url": "{{ user `guest_additions_url` }}", "guest_os_type": "RedHat_64", "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-virtualbox", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, - "ssh_username": "vagrant", "ssh_timeout": "10000s", + "ssh_username": "vagrant", "type": "virtualbox-iso", - "memory": "{{ user `memory` }}", - "cpus": "{{ user `cpus` }}", "virtualbox_version_file": ".vbox_version", "vm_name": "{{ user `template` }}" }, @@ -32,24 +31,23 @@ "<up><wait><tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], "boot_wait": "10s", + "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "guest_os_type": "centos-64", "headless": "{{ user `headless` }}", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-vmware", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, - "ssh_username": "vagrant", "ssh_timeout": "10000s", + "ssh_username": "vagrant", "tools_upload_flavor": "linux", "type": "vmware-iso", "vm_name": "{{ user `template` }}", - "memory": "{{ user `memory` }}", - "cpus": "{{ user `cpus` }}", "vmx_data": { "cpuid.coresPerSocket": "1" }, @@ -60,22 +58,21 @@ "<up><wait><tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], "boot_wait": "10s", + "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "guest_os_type": "centos", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-parallels", "parallels_tools_flavor": "lin", - "memory": "{{ user `memory` }}", - "cpus": "{{ user `cpus` }}", "prlctl_version_file": ".prlctl_version", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, - "ssh_username": "vagrant", "ssh_timeout": "10000s", + "ssh_username": "vagrant", "type": "parallels-iso", "vm_name": "{{ user `template` }}" }, @@ -92,8 +89,7 @@ "generation": "{{user `hyperv_generation`}}", "guest_additions_mode": "disable", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-hyperv", @@ -111,20 +107,19 @@ "<up><wait><tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], "boot_wait": "10s", - "memory": "{{ user `memory` }}", "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-qemu", "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, - "ssh_username": "vagrant", "ssh_timeout": "10000s", + "ssh_username": "vagrant", "type": "qemu", "vm_name": "{{ user `template` }}" } @@ -163,17 +158,17 @@ "variables": { "box_basename": "centos-7.8", "build_directory": "../../builds", - "http_directory": "{{template_dir}}/http", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", "disk_size": "65536", "git_revision": "__unknown_git_revision__", + "guest_additions_url": "", "headless": "", + "http_directory": "{{template_dir}}/http", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", "hyperv_generation": "1", "hyperv_switch": "{{env `hyperv_switch`}}", - "guest_additions_url": "", "iso_checksum": "087a5743dc6fd6706d9b961b8147423ddc029451b938364c760d75440eb7be14", "iso_checksum_type": "sha256", "iso_name": "CentOS-7-x86_64-DVD-2003.iso", @@ -187,3 +182,4 @@ "version": "TIMESTAMP" } } + From 90edb6fca0d81a0d5a984513b8dc80e223a8e4fa Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Tue, 16 Jun 2020 10:37:24 -0700 Subject: [PATCH 1184/1622] More CentOS 8.2 updates Signed-off-by: Tim Smith <tsmith@chef.io> --- builds.yml | 2 +- packer_templates/centos/centos-8.2-x86_64.json | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/builds.yml b/builds.yml index 03080871a..7199f1b52 100644 --- a/builds.yml +++ b/builds.yml @@ -4,7 +4,7 @@ public: - 'centos-6.10-i386' - 'centos-6.10' - 'centos-7.8' -- 'centos-8.1' +- 'centos-8.2' - 'debian-8.11-i386' - 'debian-8.11' - 'debian-9.12-i386' diff --git a/packer_templates/centos/centos-8.2-x86_64.json b/packer_templates/centos/centos-8.2-x86_64.json index 27ee130db..cddb6d0dc 100644 --- a/packer_templates/centos/centos-8.2-x86_64.json +++ b/packer_templates/centos/centos-8.2-x86_64.json @@ -156,7 +156,7 @@ } ], "variables": { - "box_basename": "centos-8.1", + "box_basename": "centos-8.2", "build_directory": "../../builds", "build_timestamp": "{{isotime \"2019102650405\"}}", "cpus": "1", @@ -176,10 +176,9 @@ "memory": "1024", "mirror": "http://mirrors.kernel.org/centos", "mirror_directory": "8.2.2004/isos/x86_64", - "name": "centos-8.1", + "name": "centos-8.2", "no_proxy": "{{env `no_proxy`}}", - "template": "centos-8.1-x86_64", + "template": "centos-8.2-x86_64", "version": "TIMESTAMP" } } - From 6fbf99823f6cb45ef17c330918dccdc9aa3af8aa Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Tue, 16 Jun 2020 11:19:15 -0700 Subject: [PATCH 1185/1622] Run packer fix on the Ubuntu templates Signed-off-by: Tim Smith <tsmith@chef.io> --- .../ubuntu/ubuntu-16.04-amd64.json | 46 +++++++++---------- .../ubuntu/ubuntu-16.04-i386.json | 46 +++++++++---------- .../ubuntu/ubuntu-18.04-amd64.json | 46 +++++++++---------- .../ubuntu/ubuntu-19.10-amd64.json | 46 +++++++++---------- .../ubuntu/ubuntu-20.04-amd64.json | 46 +++++++++---------- 5 files changed, 105 insertions(+), 125 deletions(-) diff --git a/packer_templates/ubuntu/ubuntu-16.04-amd64.json b/packer_templates/ubuntu/ubuntu-16.04-amd64.json index de09b0d4d..77c8ed541 100644 --- a/packer_templates/ubuntu/ubuntu-16.04-amd64.json +++ b/packer_templates/ubuntu/ubuntu-16.04-amd64.json @@ -28,25 +28,24 @@ "<enter><wait>" ], "boot_wait": "10s", + "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", - "guest_additions_url": "{{ user `guest_additions_url` }}", "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "guest_additions_url": "{{ user `guest_additions_url` }}", "guest_os_type": "Ubuntu_64", "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-virtualbox", "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", "ssh_password": "vagrant", "ssh_port": 22, - "ssh_username": "vagrant", "ssh_timeout": "10000s", + "ssh_username": "vagrant", "type": "virtualbox-iso", - "memory": "{{ user `memory` }}", - "cpus": "{{ user `cpus` }}", "virtualbox_version_file": ".vbox_version", "vm_name": "{{ user `template` }}" }, @@ -78,24 +77,23 @@ "<enter><wait>" ], "boot_wait": "10s", + "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "guest_os_type": "ubuntu-64", "headless": "{{ user `headless` }}", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-vmware", "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", "ssh_password": "vagrant", "ssh_port": 22, - "ssh_username": "vagrant", "ssh_timeout": "10000s", + "ssh_username": "vagrant", "tools_upload_flavor": "linux", "type": "vmware-iso", "vm_name": "{{ user `template` }}", - "memory": "{{ user `memory` }}", - "cpus": "{{ user `cpus` }}", "vmx_data": { "cpuid.coresPerSocket": "1", "ethernet0.pciSlotNumber": "32" @@ -130,22 +128,21 @@ "<enter><wait>" ], "boot_wait": "10s", + "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "guest_os_type": "ubuntu", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-parallels", "parallels_tools_flavor": "lin", - "memory": "{{ user `memory` }}", - "cpus": "{{ user `cpus` }}", "prlctl_version_file": ".prlctl_version", "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", "ssh_password": "vagrant", "ssh_port": 22, - "ssh_username": "vagrant", "ssh_timeout": "10000s", + "ssh_username": "vagrant", "type": "parallels-iso", "vm_name": "{{ user `template` }}" }, @@ -177,20 +174,19 @@ "<enter><wait>" ], "boot_wait": "10s", + "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-qemu", "memory": "{{ user `memory` }}", - "cpus": "{{ user `cpus` }}", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-qemu", "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", "ssh_password": "vagrant", "ssh_port": 22, - "ssh_username": "vagrant", "ssh_timeout": "10000s", + "ssh_username": "vagrant", "type": "qemu", "vm_name": "{{ user `template` }}" }, @@ -215,8 +211,7 @@ "enable_secure_boot": false, "generation": "{{user `hyperv_generation`}}", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", "memory": "{{user `memory`}}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-hyperv", @@ -266,17 +261,17 @@ "variables": { "box_basename": "ubuntu-16.04", "build_directory": "../../builds", - "http_directory": "{{template_dir}}/http", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", "disk_size": "65536", "git_revision": "__unknown_git_revision__", + "guest_additions_url": "", "headless": "", + "http_directory": "{{template_dir}}/http", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", "hyperv_generation": "2", "hyperv_switch": "{{env `hyperv_switch`}}", - "guest_additions_url": "", "iso_checksum": "16afb1375372c57471ea5e29803a89a5a6bd1f6aabea2e5e34ac1ab7eb9786ac", "iso_checksum_type": "sha256", "iso_name": "ubuntu-16.04.6-server-amd64.iso", @@ -290,3 +285,4 @@ "version": "TIMESTAMP" } } + diff --git a/packer_templates/ubuntu/ubuntu-16.04-i386.json b/packer_templates/ubuntu/ubuntu-16.04-i386.json index bb7ee4dbc..887c7bb73 100644 --- a/packer_templates/ubuntu/ubuntu-16.04-i386.json +++ b/packer_templates/ubuntu/ubuntu-16.04-i386.json @@ -28,25 +28,24 @@ "<enter><wait>" ], "boot_wait": "10s", + "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", - "guest_additions_url": "{{ user `guest_additions_url` }}", "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "guest_additions_url": "{{ user `guest_additions_url` }}", "guest_os_type": "Ubuntu", "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-virtualbox", "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", "ssh_password": "vagrant", "ssh_port": 22, - "ssh_username": "vagrant", "ssh_timeout": "10000s", + "ssh_username": "vagrant", "type": "virtualbox-iso", - "memory": "{{ user `memory` }}", - "cpus": "{{ user `cpus` }}", "virtualbox_version_file": ".vbox_version", "vm_name": "{{ user `template` }}" }, @@ -78,24 +77,23 @@ "<enter><wait>" ], "boot_wait": "10s", + "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "guest_os_type": "ubuntu", "headless": "{{ user `headless` }}", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-vmware", "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", "ssh_password": "vagrant", "ssh_port": 22, - "ssh_username": "vagrant", "ssh_timeout": "10000s", + "ssh_username": "vagrant", "tools_upload_flavor": "linux", "type": "vmware-iso", "vm_name": "{{ user `template` }}", - "memory": "{{ user `memory` }}", - "cpus": "{{ user `cpus` }}", "vmx_data": { "cpuid.coresPerSocket": "1" }, @@ -129,22 +127,21 @@ "<enter><wait>" ], "boot_wait": "10s", + "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "guest_os_type": "ubuntu", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-parallels", "parallels_tools_flavor": "lin", - "memory": "{{ user `memory` }}", - "cpus": "{{ user `cpus` }}", "prlctl_version_file": ".prlctl_version", "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", "ssh_password": "vagrant", "ssh_port": 22, - "ssh_username": "vagrant", "ssh_timeout": "10000s", + "ssh_username": "vagrant", "type": "parallels-iso", "vm_name": "{{ user `template` }}" }, @@ -176,20 +173,19 @@ "<enter><wait>" ], "boot_wait": "10s", + "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-qemu", "memory": "{{ user `memory` }}", - "cpus": "{{ user `cpus` }}", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-qemu", "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", "ssh_password": "vagrant", "ssh_port": 22, - "ssh_username": "vagrant", "ssh_timeout": "10000s", + "ssh_username": "vagrant", "type": "qemu", "vm_name": "{{ user `template` }}" }, @@ -214,8 +210,7 @@ "enable_secure_boot": false, "generation": "{{user `hyperv_generation`}}", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", "memory": "{{user `memory`}}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-hyperv", @@ -265,17 +260,17 @@ "variables": { "box_basename": "ubuntu-16.04-i386", "build_directory": "../../builds", - "http_directory": "{{template_dir}}/http", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", "disk_size": "65536", "git_revision": "__unknown_git_revision__", + "guest_additions_url": "", "headless": "", + "http_directory": "{{template_dir}}/http", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", "hyperv_generation": "1", "hyperv_switch": "{{env `hyperv_switch`}}", - "guest_additions_url": "", "iso_checksum": "7509cabb2f9f6ba0a95f8454d432be2ef26679d31ce35baa626acc5321460fab", "iso_checksum_type": "sha256", "iso_name": "ubuntu-16.04.6-server-i386.iso", @@ -289,3 +284,4 @@ "version": "TIMESTAMP" } } + diff --git a/packer_templates/ubuntu/ubuntu-18.04-amd64.json b/packer_templates/ubuntu/ubuntu-18.04-amd64.json index e93ea107e..0d5050be1 100644 --- a/packer_templates/ubuntu/ubuntu-18.04-amd64.json +++ b/packer_templates/ubuntu/ubuntu-18.04-amd64.json @@ -27,25 +27,24 @@ "<enter><wait>" ], "boot_wait": "10s", + "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", - "guest_additions_url": "{{ user `guest_additions_url` }}", "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "guest_additions_url": "{{ user `guest_additions_url` }}", "guest_os_type": "Ubuntu_64", "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-virtualbox", "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", "ssh_password": "vagrant", "ssh_port": 22, - "ssh_username": "vagrant", "ssh_timeout": "10000s", + "ssh_username": "vagrant", "type": "virtualbox-iso", - "memory": "{{ user `memory` }}", - "cpus": "{{ user `cpus` }}", "virtualbox_version_file": ".vbox_version", "vm_name": "{{ user `template` }}" }, @@ -76,24 +75,23 @@ "<enter><wait>" ], "boot_wait": "10s", + "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "guest_os_type": "ubuntu-64", "headless": "{{ user `headless` }}", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-vmware", "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", "ssh_password": "vagrant", "ssh_port": 22, - "ssh_username": "vagrant", "ssh_timeout": "10000s", + "ssh_username": "vagrant", "tools_upload_flavor": "linux", "type": "vmware-iso", "vm_name": "{{ user `template` }}", - "memory": "{{ user `memory` }}", - "cpus": "{{ user `cpus` }}", "vmx_data": { "cpuid.coresPerSocket": "1", "ethernet0.pciSlotNumber": "32" @@ -127,22 +125,21 @@ "<enter><wait>" ], "boot_wait": "10s", + "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "guest_os_type": "ubuntu", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-parallels", "parallels_tools_flavor": "lin", - "memory": "{{ user `memory` }}", - "cpus": "{{ user `cpus` }}", "prlctl_version_file": ".prlctl_version", "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", "ssh_password": "vagrant", "ssh_port": 22, - "ssh_username": "vagrant", "ssh_timeout": "10000s", + "ssh_username": "vagrant", "type": "parallels-iso", "vm_name": "{{ user `template` }}" }, @@ -173,20 +170,19 @@ "<enter><wait>" ], "boot_wait": "10s", + "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-qemu", "memory": "{{ user `memory` }}", - "cpus": "{{ user `cpus` }}", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-qemu", "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", "ssh_password": "vagrant", "ssh_port": 22, - "ssh_username": "vagrant", "ssh_timeout": "10000s", + "ssh_username": "vagrant", "type": "qemu", "vm_name": "{{ user `template` }}" }, @@ -211,8 +207,7 @@ "enable_secure_boot": false, "generation": "{{user `hyperv_generation`}}", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", "memory": "{{user `memory`}}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-hyperv", @@ -262,17 +257,17 @@ "variables": { "box_basename": "ubuntu-18.04", "build_directory": "../../builds", - "http_directory": "{{template_dir}}/http", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", "disk_size": "65536", "git_revision": "__unknown_git_revision__", + "guest_additions_url": "", "headless": "", + "http_directory": "{{template_dir}}/http", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", "hyperv_generation": "2", "hyperv_switch": "{{env `hyperv_switch`}}", - "guest_additions_url": "", "iso_checksum": "e2ecdace33c939527cbc9e8d23576381c493b071107207d2040af72595f8990b", "iso_checksum_type": "sha256", "iso_name": "ubuntu-18.04.4-server-amd64.iso", @@ -286,3 +281,4 @@ "version": "TIMESTAMP" } } + diff --git a/packer_templates/ubuntu/ubuntu-19.10-amd64.json b/packer_templates/ubuntu/ubuntu-19.10-amd64.json index 81c7dba71..07003ee50 100644 --- a/packer_templates/ubuntu/ubuntu-19.10-amd64.json +++ b/packer_templates/ubuntu/ubuntu-19.10-amd64.json @@ -27,25 +27,24 @@ "<enter><wait>" ], "boot_wait": "10s", + "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", - "guest_additions_url": "{{ user `guest_additions_url` }}", "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "guest_additions_url": "{{ user `guest_additions_url` }}", "guest_os_type": "Ubuntu_64", "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-virtualbox", "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", "ssh_password": "vagrant", "ssh_port": 22, - "ssh_username": "vagrant", "ssh_timeout": "10000s", + "ssh_username": "vagrant", "type": "virtualbox-iso", - "memory": "{{ user `memory` }}", - "cpus": "{{ user `cpus` }}", "virtualbox_version_file": ".vbox_version", "vm_name": "{{ user `template` }}" }, @@ -76,24 +75,23 @@ "<enter><wait>" ], "boot_wait": "10s", + "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "guest_os_type": "ubuntu-64", "headless": "{{ user `headless` }}", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-vmware", "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", "ssh_password": "vagrant", "ssh_port": 22, - "ssh_username": "vagrant", "ssh_timeout": "10000s", + "ssh_username": "vagrant", "tools_upload_flavor": "linux", "type": "vmware-iso", "vm_name": "{{ user `template` }}", - "memory": "{{ user `memory` }}", - "cpus": "{{ user `cpus` }}", "vmx_data": { "cpuid.coresPerSocket": "1", "ethernet0.pciSlotNumber": "32" @@ -127,22 +125,21 @@ "<enter><wait>" ], "boot_wait": "10s", + "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "guest_os_type": "ubuntu", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-parallels", "parallels_tools_flavor": "lin", - "memory": "{{ user `memory` }}", - "cpus": "{{ user `cpus` }}", "prlctl_version_file": ".prlctl_version", "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", "ssh_password": "vagrant", "ssh_port": 22, - "ssh_username": "vagrant", "ssh_timeout": "10000s", + "ssh_username": "vagrant", "type": "parallels-iso", "vm_name": "{{ user `template` }}" }, @@ -173,20 +170,19 @@ "<enter><wait>" ], "boot_wait": "10s", + "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-qemu", "memory": "{{ user `memory` }}", - "cpus": "{{ user `cpus` }}", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-qemu", "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", "ssh_password": "vagrant", "ssh_port": 22, - "ssh_username": "vagrant", "ssh_timeout": "10000s", + "ssh_username": "vagrant", "type": "qemu", "vm_name": "{{ user `template` }}" }, @@ -211,8 +207,7 @@ "enable_secure_boot": false, "generation": "{{user `hyperv_generation`}}", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", "memory": "{{user `memory`}}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-hyperv", @@ -262,17 +257,17 @@ "variables": { "box_basename": "ubuntu-19.10", "build_directory": "../../builds", - "http_directory": "{{template_dir}}/http", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", "disk_size": "65536", "git_revision": "__unknown_git_revision__", + "guest_additions_url": "", "headless": "", + "http_directory": "{{template_dir}}/http", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", "hyperv_generation": "2", "hyperv_switch": "{{env `hyperv_switch`}}", - "guest_additions_url": "", "iso_checksum": "921fd8b271c04aa86a321cc35b40e677f9b85f7903bf2204efb2389b0f0a64c1", "iso_checksum_type": "sha256", "iso_name": "ubuntu-19.10-server-amd64.iso", @@ -286,3 +281,4 @@ "version": "TIMESTAMP" } } + diff --git a/packer_templates/ubuntu/ubuntu-20.04-amd64.json b/packer_templates/ubuntu/ubuntu-20.04-amd64.json index 254447e6b..27330dbec 100644 --- a/packer_templates/ubuntu/ubuntu-20.04-amd64.json +++ b/packer_templates/ubuntu/ubuntu-20.04-amd64.json @@ -27,25 +27,24 @@ "<enter><wait>" ], "boot_wait": "10s", + "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", - "guest_additions_url": "{{ user `guest_additions_url` }}", "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "guest_additions_url": "{{ user `guest_additions_url` }}", "guest_os_type": "Ubuntu_64", "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-virtualbox", "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", "ssh_password": "vagrant", "ssh_port": 22, - "ssh_username": "vagrant", "ssh_timeout": "10000s", + "ssh_username": "vagrant", "type": "virtualbox-iso", - "memory": "{{ user `memory` }}", - "cpus": "{{ user `cpus` }}", "virtualbox_version_file": ".vbox_version", "vm_name": "{{ user `template` }}" }, @@ -76,24 +75,23 @@ "<enter><wait>" ], "boot_wait": "10s", + "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "guest_os_type": "ubuntu-64", "headless": "{{ user `headless` }}", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-vmware", "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", "ssh_password": "vagrant", "ssh_port": 22, - "ssh_username": "vagrant", "ssh_timeout": "10000s", + "ssh_username": "vagrant", "tools_upload_flavor": "linux", "type": "vmware-iso", "vm_name": "{{ user `template` }}", - "memory": "{{ user `memory` }}", - "cpus": "{{ user `cpus` }}", "vmx_data": { "cpuid.coresPerSocket": "1", "ethernet0.pciSlotNumber": "32" @@ -127,22 +125,21 @@ "<enter><wait>" ], "boot_wait": "10s", + "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "guest_os_type": "ubuntu", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-parallels", "parallels_tools_flavor": "lin", - "memory": "{{ user `memory` }}", - "cpus": "{{ user `cpus` }}", "prlctl_version_file": ".prlctl_version", "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", "ssh_password": "vagrant", "ssh_port": 22, - "ssh_username": "vagrant", "ssh_timeout": "10000s", + "ssh_username": "vagrant", "type": "parallels-iso", "vm_name": "{{ user `template` }}" }, @@ -173,20 +170,19 @@ "<enter><wait>" ], "boot_wait": "10s", + "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-qemu", "memory": "{{ user `memory` }}", - "cpus": "{{ user `cpus` }}", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-qemu", "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", "ssh_password": "vagrant", "ssh_port": 22, - "ssh_username": "vagrant", "ssh_timeout": "10000s", + "ssh_username": "vagrant", "type": "qemu", "vm_name": "{{ user `template` }}" }, @@ -211,8 +207,7 @@ "enable_secure_boot": false, "generation": "{{user `hyperv_generation`}}", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", "memory": "{{user `memory`}}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-hyperv", @@ -262,17 +257,17 @@ "variables": { "box_basename": "ubuntu-20.04", "build_directory": "../../builds", - "http_directory": "{{template_dir}}/http", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", "disk_size": "65536", "git_revision": "__unknown_git_revision__", + "guest_additions_url": "", "headless": "", + "http_directory": "{{template_dir}}/http", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", "hyperv_generation": "2", "hyperv_switch": "{{env `hyperv_switch`}}", - "guest_additions_url": "", "iso_checksum": "36f15879bd9dfd061cd588620a164a82972663fdd148cce1f70d57d314c21b73", "iso_checksum_type": "sha256", "iso_name": "ubuntu-20.04-legacy-server-amd64.iso", @@ -286,3 +281,4 @@ "version": "TIMESTAMP" } } + From 7059069051263419f2fd11aef2a56806295517ba Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Tue, 16 Jun 2020 13:14:02 -0700 Subject: [PATCH 1186/1622] Run packer fix on the remaining templates Signed-off-by: Tim Smith <tsmith@chef.io> --- .../amazonlinux/amazon-2-x86_64.json | 11 +- .../debian/debian-10.4-amd64.json | 41 +- packer_templates/debian/debian-10.4-i386.json | 41 +- .../debian/debian-8.11-amd64.json | 41 +- packer_templates/debian/debian-8.11-i386.json | 41 +- .../debian/debian-9.12-amd64.json | 41 +- packer_templates/debian/debian-9.12-i386.json | 41 +- .../debian/debian-9.12-ppc64el.json | 16 +- packer_templates/fedora/fedora-30-x86_64.json | 72 ++- packer_templates/fedora/fedora-31-x86_64.json | 72 ++- packer_templates/fedora/fedora-32-x86_64.json | 72 ++- .../freebsd/freebsd-11.3-amd64.json | 39 +- .../freebsd/freebsd-11.3-i386.json | 39 +- .../freebsd/freebsd-12.1-amd64.json | 39 +- .../freebsd/freebsd-12.1-i386.json | 39 +- .../hardenedbsd/hardenedbsd-11-amd64.json | 39 +- packer_templates/macos/macos-10.12.json | 24 +- packer_templates/macos/macosx-10.11.json | 24 +- .../opensuse/opensuse-leap-15.1-x86_64.json | 41 +- .../oraclelinux/oracle-5.11-i386.json | 44 +- .../oraclelinux/oracle-5.11-x86_64.json | 44 +- .../oraclelinux/oracle-6.10-i386.json | 44 +- .../oraclelinux/oracle-6.10-x86_64.json | 44 +- .../oraclelinux/oracle-7.7-x86_64.json | 44 +- .../oraclelinux/oracle-8.1-x86_64.json | 44 +- packer_templates/rhel/rhel-5.11-i386.json | 41 +- packer_templates/rhel/rhel-5.11-x86_64.json | 41 +- packer_templates/rhel/rhel-6.10-i386.json | 41 +- packer_templates/rhel/rhel-6.10-x86_64.json | 41 +- packer_templates/rhel/rhel-7.6-x86_64.json | 41 +- packer_templates/rhel/rhel-8.0-x86_64.json | 41 +- .../scientific-7.7-x86_64.json | 44 +- packer_templates/sles/sles-11-sp4-x86_64.json | 41 +- packer_templates/sles/sles-12-sp2-x86_64.json | 41 +- packer_templates/sles/sles-12-sp3-x86_64.json | 41 +- packer_templates/sles/sles-15-sp1.json | 73 +-- packer_templates/sles/sles-15.json | 72 +-- .../solaris/solaris-11-4-x86.json | 37 +- packer_templates/solaris/solaris-11-x86.json | 35 +- packer_templates/windows/windows-10.json | 231 ++++++---- packer_templates/windows/windows-2012.json | 421 ++++++++++-------- packer_templates/windows/windows-2012r2.json | 221 +++++---- packer_templates/windows/windows-2016.json | 221 +++++---- packer_templates/windows/windows-2019.json | 221 +++++---- 44 files changed, 1531 insertions(+), 1451 deletions(-) diff --git a/packer_templates/amazonlinux/amazon-2-x86_64.json b/packer_templates/amazonlinux/amazon-2-x86_64.json index f65b61f7e..cd93260a5 100644 --- a/packer_templates/amazonlinux/amazon-2-x86_64.json +++ b/packer_templates/amazonlinux/amazon-2-x86_64.json @@ -6,12 +6,12 @@ "http_directory": "{{user `http_directory`}}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-virtualbox", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", - "ssh_timeout": "10000s", - "ssh_port": 22, - "type": "virtualbox-ovf", "source_path": "{{template_dir}}/amazon2.ovf", - "ssh_username": "vagrant", "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_timeout": "10000s", + "ssh_username": "vagrant", + "type": "virtualbox-ovf", "vboxmanage": [ [ "modifyvm", @@ -62,12 +62,12 @@ "variables": { "box_basename": "amazon-2", "build_directory": "../../builds", - "http_directory": "{{template_dir}}/http", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", "disk_size": "65536", "git_revision": "__unknown_git_revision__", "headless": "", + "http_directory": "{{template_dir}}/http", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", "memory": "1024", @@ -77,3 +77,4 @@ "version": "TIMESTAMP" } } + diff --git a/packer_templates/debian/debian-10.4-amd64.json b/packer_templates/debian/debian-10.4-amd64.json index 5c88c56d1..85a5145a3 100644 --- a/packer_templates/debian/debian-10.4-amd64.json +++ b/packer_templates/debian/debian-10.4-amd64.json @@ -20,25 +20,24 @@ "<enter><wait>" ], "boot_wait": "10s", + "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", - "guest_additions_url": "{{ user `guest_additions_url` }}", "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "guest_additions_url": "{{ user `guest_additions_url` }}", "guest_os_type": "Debian_64", "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-virtualbox", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", "ssh_password": "vagrant", "ssh_port": 22, - "ssh_username": "vagrant", "ssh_timeout": "10000s", + "ssh_username": "vagrant", "type": "virtualbox-iso", - "memory": "{{ user `memory` }}", - "cpus": "{{ user `cpus` }}", "virtualbox_version_file": ".vbox_version", "vm_name": "{{ user `template` }}" }, @@ -62,24 +61,23 @@ "<enter><wait>" ], "boot_wait": "10s", + "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "guest_os_type": "debian8-64", "headless": "{{ user `headless` }}", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-vmware", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", "ssh_password": "vagrant", "ssh_port": 22, - "ssh_username": "vagrant", "ssh_timeout": "10000s", + "ssh_username": "vagrant", "tools_upload_flavor": "linux", "type": "vmware-iso", "vm_name": "{{ user `template` }}", - "memory": "{{ user `memory` }}", - "cpus": "{{ user `cpus` }}", "vmx_data": { "cpuid.coresPerSocket": "1", "ethernet0.pciSlotNumber": "32" @@ -106,22 +104,21 @@ "<enter><wait>" ], "boot_wait": "10s", + "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "guest_os_type": "debian", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-parallels", "parallels_tools_flavor": "lin", - "memory": "{{ user `memory` }}", - "cpus": "{{ user `cpus` }}", "prlctl_version_file": ".prlctl_version", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", "ssh_password": "vagrant", "ssh_port": 22, - "ssh_username": "vagrant", "ssh_timeout": "10000s", + "ssh_username": "vagrant", "type": "parallels-iso", "vm_name": "{{ user `template` }}" }, @@ -145,20 +142,19 @@ "<enter><wait>" ], "boot_wait": "10s", - "memory": "{{ user `memory` }}", "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-qemu", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", "ssh_password": "vagrant", "ssh_port": 22, - "ssh_username": "vagrant", "ssh_timeout": "10000s", + "ssh_username": "vagrant", "type": "qemu", "vm_name": "{{ user `template` }}" } @@ -199,15 +195,15 @@ "variables": { "box_basename": "debian-10.4", "build_directory": "../../builds", - "http_directory": "{{template_dir}}/http", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", "disk_size": "65536", "git_revision": "__unknown_git_revision__", + "guest_additions_url": "", "headless": "", + "http_directory": "{{template_dir}}/http", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", - "guest_additions_url": "", "iso_checksum": "ab3763d553330e90869487a6843c88f1d4aa199333ff16b653e60e59ac1fc60b", "iso_checksum_type": "sha256", "iso_name": "debian-10.4.0-amd64-netinst.iso", @@ -221,3 +217,4 @@ "version": "TIMESTAMP" } } + diff --git a/packer_templates/debian/debian-10.4-i386.json b/packer_templates/debian/debian-10.4-i386.json index f1518339b..3830a620e 100644 --- a/packer_templates/debian/debian-10.4-i386.json +++ b/packer_templates/debian/debian-10.4-i386.json @@ -20,25 +20,24 @@ "<enter><wait>" ], "boot_wait": "10s", + "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", - "guest_additions_url": "{{ user `guest_additions_url` }}", "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "guest_additions_url": "{{ user `guest_additions_url` }}", "guest_os_type": "Debian", "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-virtualbox", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", "ssh_password": "vagrant", "ssh_port": 22, - "ssh_username": "vagrant", "ssh_timeout": "10000s", + "ssh_username": "vagrant", "type": "virtualbox-iso", - "memory": "{{ user `memory` }}", - "cpus": "{{ user `cpus` }}", "virtualbox_version_file": ".vbox_version", "vm_name": "{{ user `template` }}" }, @@ -62,24 +61,23 @@ "<enter><wait>" ], "boot_wait": "10s", + "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "guest_os_type": "debian8", "headless": "{{ user `headless` }}", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-vmware", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", "ssh_password": "vagrant", "ssh_port": 22, - "ssh_username": "vagrant", "ssh_timeout": "10000s", + "ssh_username": "vagrant", "tools_upload_flavor": "linux", "type": "vmware-iso", "vm_name": "{{ user `template` }}", - "memory": "{{ user `memory` }}", - "cpus": "{{ user `cpus` }}", "vmx_data": { "cpuid.coresPerSocket": "1", "ethernet0.pciSlotNumber": "32" @@ -106,22 +104,21 @@ "<enter><wait>" ], "boot_wait": "10s", + "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "guest_os_type": "debian", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-parallels", "parallels_tools_flavor": "lin", - "memory": "{{ user `memory` }}", - "cpus": "{{ user `cpus` }}", "prlctl_version_file": ".prlctl_version", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", "ssh_password": "vagrant", "ssh_port": 22, - "ssh_username": "vagrant", "ssh_timeout": "10000s", + "ssh_username": "vagrant", "type": "parallels-iso", "vm_name": "{{ user `template` }}" }, @@ -145,20 +142,19 @@ "<enter><wait>" ], "boot_wait": "10s", - "memory": "{{ user `memory` }}", "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-qemu", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", "ssh_password": "vagrant", "ssh_port": 22, - "ssh_username": "vagrant", "ssh_timeout": "10000s", + "ssh_username": "vagrant", "type": "qemu", "vm_name": "{{ user `template` }}" } @@ -199,15 +195,15 @@ "variables": { "box_basename": "debian-10.4-i386", "build_directory": "../../builds", - "http_directory": "{{template_dir}}/http", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", "disk_size": "65536", "git_revision": "__unknown_git_revision__", + "guest_additions_url": "", "headless": "", + "http_directory": "{{template_dir}}/http", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", - "guest_additions_url": "", "iso_checksum": "549966a43224f237c46ee4397901ec9fd6feae74abb1e6f6baa0078acf77a936", "iso_checksum_type": "sha256", "iso_name": "debian-10.4.0-i386-netinst.iso", @@ -221,3 +217,4 @@ "version": "TIMESTAMP" } } + diff --git a/packer_templates/debian/debian-8.11-amd64.json b/packer_templates/debian/debian-8.11-amd64.json index c26846530..3880fea07 100644 --- a/packer_templates/debian/debian-8.11-amd64.json +++ b/packer_templates/debian/debian-8.11-amd64.json @@ -20,25 +20,24 @@ "<enter><wait>" ], "boot_wait": "10s", + "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", - "guest_additions_url": "{{ user `guest_additions_url` }}", "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "guest_additions_url": "{{ user `guest_additions_url` }}", "guest_os_type": "Debian_64", "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-virtualbox", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", "ssh_password": "vagrant", "ssh_port": 22, - "ssh_username": "vagrant", "ssh_timeout": "10000s", + "ssh_username": "vagrant", "type": "virtualbox-iso", - "memory": "{{ user `memory` }}", - "cpus": "{{ user `cpus` }}", "virtualbox_version_file": ".vbox_version", "vm_name": "{{ user `template` }}" }, @@ -62,24 +61,23 @@ "<enter><wait>" ], "boot_wait": "10s", + "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "guest_os_type": "debian8-64", "headless": "{{ user `headless` }}", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-vmware", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", "ssh_password": "vagrant", "ssh_port": 22, - "ssh_username": "vagrant", "ssh_timeout": "10000s", + "ssh_username": "vagrant", "tools_upload_flavor": "linux", "type": "vmware-iso", "vm_name": "{{ user `template` }}", - "memory": "{{ user `memory` }}", - "cpus": "{{ user `cpus` }}", "vmx_data": { "cpuid.coresPerSocket": "1", "ethernet0.pciSlotNumber": "32" @@ -106,22 +104,21 @@ "<enter><wait>" ], "boot_wait": "10s", + "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "guest_os_type": "debian", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-parallels", "parallels_tools_flavor": "lin", - "memory": "{{ user `memory` }}", - "cpus": "{{ user `cpus` }}", "prlctl_version_file": ".prlctl_version", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", "ssh_password": "vagrant", "ssh_port": 22, - "ssh_username": "vagrant", "ssh_timeout": "10000s", + "ssh_username": "vagrant", "type": "parallels-iso", "vm_name": "{{ user `template` }}" }, @@ -145,20 +142,19 @@ "<enter><wait>" ], "boot_wait": "10s", - "memory": "{{ user `memory` }}", "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-qemu", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", "ssh_password": "vagrant", "ssh_port": 22, - "ssh_username": "vagrant", "ssh_timeout": "10000s", + "ssh_username": "vagrant", "type": "qemu", "vm_name": "{{ user `template` }}" } @@ -199,15 +195,15 @@ "variables": { "box_basename": "debian-8.11", "build_directory": "../../builds", - "http_directory": "{{template_dir}}/http", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", "disk_size": "65536", "git_revision": "__unknown_git_revision__", + "guest_additions_url": "", "headless": "", + "http_directory": "{{template_dir}}/http", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", - "guest_additions_url": "", "iso_checksum": "166868369a8094a69b2766b46a9a28869ac921bac5697e525d0ec5be14a9d373", "iso_checksum_type": "sha256", "iso_name": "debian-8.11.0-amd64-CD-1.iso", @@ -221,3 +217,4 @@ "version": "TIMESTAMP" } } + diff --git a/packer_templates/debian/debian-8.11-i386.json b/packer_templates/debian/debian-8.11-i386.json index 07c7dc14d..10f19608f 100644 --- a/packer_templates/debian/debian-8.11-i386.json +++ b/packer_templates/debian/debian-8.11-i386.json @@ -20,25 +20,24 @@ "<enter><wait>" ], "boot_wait": "10s", + "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", - "guest_additions_url": "{{ user `guest_additions_url` }}", "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "guest_additions_url": "{{ user `guest_additions_url` }}", "guest_os_type": "Debian", "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-virtualbox", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", "ssh_password": "vagrant", "ssh_port": 22, - "ssh_username": "vagrant", "ssh_timeout": "10000s", + "ssh_username": "vagrant", "type": "virtualbox-iso", - "memory": "{{ user `memory` }}", - "cpus": "{{ user `cpus` }}", "virtualbox_version_file": ".vbox_version", "vm_name": "{{ user `template` }}" }, @@ -62,24 +61,23 @@ "<enter><wait>" ], "boot_wait": "10s", + "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "guest_os_type": "debian8", "headless": "{{ user `headless` }}", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-vmware", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", "ssh_password": "vagrant", "ssh_port": 22, - "ssh_username": "vagrant", "ssh_timeout": "10000s", + "ssh_username": "vagrant", "tools_upload_flavor": "linux", "type": "vmware-iso", "vm_name": "{{ user `template` }}", - "memory": "{{ user `memory` }}", - "cpus": "{{ user `cpus` }}", "vmx_data": { "cpuid.coresPerSocket": "1", "ethernet0.pciSlotNumber": "32" @@ -106,22 +104,21 @@ "<enter><wait>" ], "boot_wait": "10s", + "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "guest_os_type": "debian", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-parallels", "parallels_tools_flavor": "lin", - "memory": "{{ user `memory` }}", - "cpus": "{{ user `cpus` }}", "prlctl_version_file": ".prlctl_version", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", "ssh_password": "vagrant", "ssh_port": 22, - "ssh_username": "vagrant", "ssh_timeout": "10000s", + "ssh_username": "vagrant", "type": "parallels-iso", "vm_name": "{{ user `template` }}" }, @@ -145,20 +142,19 @@ "<enter><wait>" ], "boot_wait": "10s", - "memory": "{{ user `memory` }}", "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-qemu", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", "ssh_password": "vagrant", "ssh_port": 22, - "ssh_username": "vagrant", "ssh_timeout": "10000s", + "ssh_username": "vagrant", "type": "qemu", "vm_name": "{{ user `template` }}" } @@ -199,15 +195,15 @@ "variables": { "box_basename": "debian-8.11-i386", "build_directory": "../../builds", - "http_directory": "{{template_dir}}/http", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", "disk_size": "65536", "git_revision": "__unknown_git_revision__", + "guest_additions_url": "", "headless": "", + "http_directory": "{{template_dir}}/http", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", - "guest_additions_url": "", "iso_checksum": "4c56c06d2ba489409f50cbf073bf3656460336dd805b0245f9b419585680b7cd", "iso_checksum_type": "sha256", "iso_name": "debian-8.11.0-i386-CD-1.iso", @@ -221,3 +217,4 @@ "version": "TIMESTAMP" } } + diff --git a/packer_templates/debian/debian-9.12-amd64.json b/packer_templates/debian/debian-9.12-amd64.json index 0a74d354b..fbe4a4dd9 100644 --- a/packer_templates/debian/debian-9.12-amd64.json +++ b/packer_templates/debian/debian-9.12-amd64.json @@ -20,25 +20,24 @@ "<enter><wait>" ], "boot_wait": "10s", + "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", - "guest_additions_url": "{{ user `guest_additions_url` }}", "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "guest_additions_url": "{{ user `guest_additions_url` }}", "guest_os_type": "Debian_64", "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-virtualbox", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", "ssh_password": "vagrant", "ssh_port": 22, - "ssh_username": "vagrant", "ssh_timeout": "10000s", + "ssh_username": "vagrant", "type": "virtualbox-iso", - "memory": "{{ user `memory` }}", - "cpus": "{{ user `cpus` }}", "virtualbox_version_file": ".vbox_version", "vm_name": "{{ user `template` }}" }, @@ -62,24 +61,23 @@ "<enter><wait>" ], "boot_wait": "10s", + "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "guest_os_type": "debian8-64", "headless": "{{ user `headless` }}", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-vmware", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", "ssh_password": "vagrant", "ssh_port": 22, - "ssh_username": "vagrant", "ssh_timeout": "10000s", + "ssh_username": "vagrant", "tools_upload_flavor": "linux", "type": "vmware-iso", "vm_name": "{{ user `template` }}", - "memory": "{{ user `memory` }}", - "cpus": "{{ user `cpus` }}", "vmx_data": { "cpuid.coresPerSocket": "1", "ethernet0.pciSlotNumber": "32" @@ -106,22 +104,21 @@ "<enter><wait>" ], "boot_wait": "10s", + "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "guest_os_type": "debian", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-parallels", "parallels_tools_flavor": "lin", - "memory": "{{ user `memory` }}", - "cpus": "{{ user `cpus` }}", "prlctl_version_file": ".prlctl_version", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", "ssh_password": "vagrant", "ssh_port": 22, - "ssh_username": "vagrant", "ssh_timeout": "10000s", + "ssh_username": "vagrant", "type": "parallels-iso", "vm_name": "{{ user `template` }}" }, @@ -145,20 +142,19 @@ "<enter><wait>" ], "boot_wait": "10s", - "memory": "{{ user `memory` }}", "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-qemu", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", "ssh_password": "vagrant", "ssh_port": 22, - "ssh_username": "vagrant", "ssh_timeout": "10000s", + "ssh_username": "vagrant", "type": "qemu", "vm_name": "{{ user `template` }}" } @@ -199,15 +195,15 @@ "variables": { "box_basename": "debian-9.12", "build_directory": "../../builds", - "http_directory": "{{template_dir}}/http", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", "disk_size": "65536", "git_revision": "__unknown_git_revision__", + "guest_additions_url": "", "headless": "", + "http_directory": "{{template_dir}}/http", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", - "guest_additions_url": "", "iso_checksum": "3c47f64693435b0b42b6ef59624edbffa7c4004317d9f9a3f04ecb6a4e30f191", "iso_checksum_type": "sha256", "iso_name": "debian-9.12.0-amd64-netinst.iso", @@ -221,3 +217,4 @@ "version": "TIMESTAMP" } } + diff --git a/packer_templates/debian/debian-9.12-i386.json b/packer_templates/debian/debian-9.12-i386.json index 844e67bca..2a9086946 100644 --- a/packer_templates/debian/debian-9.12-i386.json +++ b/packer_templates/debian/debian-9.12-i386.json @@ -20,25 +20,24 @@ "<enter><wait>" ], "boot_wait": "10s", + "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", - "guest_additions_url": "{{ user `guest_additions_url` }}", "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "guest_additions_url": "{{ user `guest_additions_url` }}", "guest_os_type": "Debian", "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-virtualbox", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", "ssh_password": "vagrant", "ssh_port": 22, - "ssh_username": "vagrant", "ssh_timeout": "10000s", + "ssh_username": "vagrant", "type": "virtualbox-iso", - "memory": "{{ user `memory` }}", - "cpus": "{{ user `cpus` }}", "virtualbox_version_file": ".vbox_version", "vm_name": "{{ user `template` }}" }, @@ -62,24 +61,23 @@ "<enter><wait>" ], "boot_wait": "10s", + "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "guest_os_type": "debian8", "headless": "{{ user `headless` }}", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-vmware", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", "ssh_password": "vagrant", "ssh_port": 22, - "ssh_username": "vagrant", "ssh_timeout": "10000s", + "ssh_username": "vagrant", "tools_upload_flavor": "linux", "type": "vmware-iso", "vm_name": "{{ user `template` }}", - "memory": "{{ user `memory` }}", - "cpus": "{{ user `cpus` }}", "vmx_data": { "cpuid.coresPerSocket": "1", "ethernet0.pciSlotNumber": "32" @@ -106,22 +104,21 @@ "<enter><wait>" ], "boot_wait": "10s", + "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "guest_os_type": "debian", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-parallels", "parallels_tools_flavor": "lin", - "memory": "{{ user `memory` }}", - "cpus": "{{ user `cpus` }}", "prlctl_version_file": ".prlctl_version", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", "ssh_password": "vagrant", "ssh_port": 22, - "ssh_username": "vagrant", "ssh_timeout": "10000s", + "ssh_username": "vagrant", "type": "parallels-iso", "vm_name": "{{ user `template` }}" }, @@ -145,20 +142,19 @@ "<enter><wait>" ], "boot_wait": "10s", - "memory": "{{ user `memory` }}", "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-qemu", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", "ssh_password": "vagrant", "ssh_port": 22, - "ssh_username": "vagrant", "ssh_timeout": "10000s", + "ssh_username": "vagrant", "type": "qemu", "vm_name": "{{ user `template` }}" } @@ -199,15 +195,15 @@ "variables": { "box_basename": "debian-9.12-i386", "build_directory": "../../builds", - "http_directory": "{{template_dir}}/http", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", "disk_size": "65536", "git_revision": "__unknown_git_revision__", + "guest_additions_url": "", "headless": "", + "http_directory": "{{template_dir}}/http", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", - "guest_additions_url": "", "iso_checksum": "7b5f1480c45bb7e70ddac7daf0b23f7ae5b97b4b12c6e835b285460f41a50572", "iso_checksum_type": "sha256", "iso_name": "debian-9.12.0-i386-netinst.iso", @@ -221,3 +217,4 @@ "version": "TIMESTAMP" } } + diff --git a/packer_templates/debian/debian-9.12-ppc64el.json b/packer_templates/debian/debian-9.12-ppc64el.json index d14ea75e6..12607b443 100644 --- a/packer_templates/debian/debian-9.12-ppc64el.json +++ b/packer_templates/debian/debian-9.12-ppc64el.json @@ -1,6 +1,7 @@ { "builders": [ { + "accelerator": "kvm", "boot_command": [ "c<wait>", "setparams 'Automated install'<enter><wait>", @@ -25,25 +26,23 @@ "boot<enter>" ], "boot_wait": "10s", - "memory": "{{ user `memory` }}", "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "machine_type": "pseries", + "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-qemu", + "qemu_binary": "qemu-system-ppc64le", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", "ssh_password": "vagrant", "ssh_port": 22, - "ssh_username": "vagrant", "ssh_timeout": "10000s", + "ssh_username": "vagrant", "type": "qemu", - "qemu_binary": "qemu-system-ppc64le", - "machine_type": "pseries", "use_default_display": true, - "accelerator": "kvm", "vm_name": "{{ user `template` }}" } ], @@ -83,12 +82,12 @@ "variables": { "box_basename": "debian-9.12", "build_directory": "../../builds", - "http_directory": "{{template_dir}}/http", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", "disk_size": "65536", "git_revision": "__unknown_git_revision__", "headless": "", + "http_directory": "{{template_dir}}/http", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", "iso_checksum": "b35d8b33c9fc316c03178d8f493ecb858269082337150f82af75c8d4663cc324", @@ -104,3 +103,4 @@ "version": "TIMESTAMP" } } + diff --git a/packer_templates/fedora/fedora-30-x86_64.json b/packer_templates/fedora/fedora-30-x86_64.json index c571efc7b..8de57f09d 100644 --- a/packer_templates/fedora/fedora-30-x86_64.json +++ b/packer_templates/fedora/fedora-30-x86_64.json @@ -1,59 +1,57 @@ { "builders": [ { - "type": "qemu", - "vm_name": "{{ user `template` }}", - "name": "{{ user `template` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-libvirt", "accelerator": "kvm", - "boot_wait": "10s", "boot_command": [ "<tab> linux ks=http://{{.HTTPIP}}:{{.HTTPPort}}/{{user `ks_path`}}<enter><wait>" ], - "format": "qcow2", - "disk_size": "{{user `disk_size`}}", - "disk_discard": "unmap", + "boot_wait": "10s", + "cpus": "{{ user `cpus` }}", "disk_cache": "unsafe", "disk_compression": true, + "disk_discard": "unmap", "disk_interface": "virtio-scsi", - "net_device": "virtio-net", - "memory": "{{ user `memory` }}", - "cpus": "{{ user `cpus` }}", - "http_directory": "{{user `http_directory`}}", + "disk_size": "{{user `disk_size`}}", + "format": "qcow2", "headless": "{{ user `headless` }}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", + "http_directory": "{{user `http_directory`}}", + "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "ssh_username": "vagrant", + "memory": "{{ user `memory` }}", + "name": "{{ user `template` }}", + "net_device": "virtio-net", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-libvirt", + "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", "ssh_password": "vagrant", "ssh_port": 22, "ssh_timeout": "3600s", - "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now" + "ssh_username": "vagrant", + "type": "qemu", + "vm_name": "{{ user `template` }}" }, { "boot_command": [ "<tab> linux ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], "boot_wait": "10s", + "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", - "guest_additions_url": "{{ user `guest_additions_url` }}", "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "guest_additions_url": "{{ user `guest_additions_url` }}", "guest_os_type": "Fedora_64", "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-virtualbox", "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", "ssh_password": "vagrant", "ssh_port": 22, - "ssh_username": "vagrant", "ssh_timeout": "10000s", + "ssh_username": "vagrant", "type": "virtualbox-iso", - "memory": "{{ user `memory` }}", - "cpus": "{{ user `cpus` }}", "virtualbox_version_file": ".vbox_version", "vm_name": "{{ user `template` }}" }, @@ -62,24 +60,23 @@ "<tab> linux ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], "boot_wait": "10s", + "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "guest_os_type": "fedora-64", "headless": "{{ user `headless` }}", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-vmware", "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", "ssh_password": "vagrant", "ssh_port": 22, - "ssh_username": "vagrant", "ssh_timeout": "10000s", + "ssh_username": "vagrant", "tools_upload_flavor": "linux", "type": "vmware-iso", "vm_name": "{{ user `template` }}", - "memory": "{{ user `memory` }}", - "cpus": "{{ user `cpus` }}", "vmx_data": { "cpuid.coresPerSocket": "1", "ethernet0.pciSlotNumber": "32" @@ -91,22 +88,21 @@ "<tab> linux ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], "boot_wait": "10s", + "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "guest_os_type": "fedora-core", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-parallels", "parallels_tools_flavor": "lin", - "memory": "{{ user `memory` }}", - "cpus": "{{ user `cpus` }}", "prlctl_version_file": ".prlctl_version", "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", "ssh_password": "vagrant", "ssh_port": 22, - "ssh_username": "vagrant", "ssh_timeout": "10000s", + "ssh_username": "vagrant", "type": "parallels-iso", "vm_name": "{{ user `template` }}" }, @@ -115,20 +111,19 @@ "<tab> linux ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], "boot_wait": "10s", - "memory": "{{ user `memory` }}", "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-qemu", "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", "ssh_password": "vagrant", "ssh_port": 22, - "ssh_username": "vagrant", "ssh_timeout": "10000s", + "ssh_username": "vagrant", "type": "qemu", "vm_name": "{{ user `template` }}" } @@ -170,15 +165,15 @@ "arch": "64", "box_basename": "fedora-30", "build_directory": "../../builds", - "http_directory": "{{template_dir}}/http", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", "disk_size": "65536", "git_revision": "__unknown_git_revision__", + "guest_additions_url": "", "headless": "", + "http_directory": "{{template_dir}}/http", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", - "guest_additions_url": "", "iso_checksum": "bb0622b78449298e24a96b90b561b429edec71aae72b8f7a8c3da4d81e4df5b7", "iso_checksum_type": "sha256", "iso_name": "Fedora-Server-dvd-x86_64-30-1.2.iso", @@ -192,3 +187,4 @@ "version": "TIMESTAMP" } } + diff --git a/packer_templates/fedora/fedora-31-x86_64.json b/packer_templates/fedora/fedora-31-x86_64.json index c91c7bd2e..351616be6 100644 --- a/packer_templates/fedora/fedora-31-x86_64.json +++ b/packer_templates/fedora/fedora-31-x86_64.json @@ -1,59 +1,57 @@ { "builders": [ { - "type": "qemu", - "vm_name": "{{ user `template` }}", - "name": "{{ user `template` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-libvirt", "accelerator": "kvm", - "boot_wait": "10s", "boot_command": [ "<tab> linux ks=http://{{.HTTPIP}}:{{.HTTPPort}}/{{user `ks_path`}}<enter><wait>" ], - "format": "qcow2", - "disk_size": "{{user `disk_size`}}", - "disk_discard": "unmap", + "boot_wait": "10s", + "cpus": "{{ user `cpus` }}", "disk_cache": "unsafe", "disk_compression": true, + "disk_discard": "unmap", "disk_interface": "virtio-scsi", - "net_device": "virtio-net", - "memory": "{{ user `memory` }}", - "cpus": "{{ user `cpus` }}", - "http_directory": "{{user `http_directory`}}", + "disk_size": "{{user `disk_size`}}", + "format": "qcow2", "headless": "{{ user `headless` }}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", + "http_directory": "{{user `http_directory`}}", + "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "ssh_username": "vagrant", + "memory": "{{ user `memory` }}", + "name": "{{ user `template` }}", + "net_device": "virtio-net", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-libvirt", + "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", "ssh_password": "vagrant", "ssh_port": 22, "ssh_timeout": "3600s", - "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now" + "ssh_username": "vagrant", + "type": "qemu", + "vm_name": "{{ user `template` }}" }, { "boot_command": [ "<tab> linux ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], "boot_wait": "10s", + "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", - "guest_additions_url": "{{ user `guest_additions_url` }}", "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "guest_additions_url": "{{ user `guest_additions_url` }}", "guest_os_type": "Fedora_64", "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-virtualbox", "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", "ssh_password": "vagrant", "ssh_port": 22, - "ssh_username": "vagrant", "ssh_timeout": "10000s", + "ssh_username": "vagrant", "type": "virtualbox-iso", - "memory": "{{ user `memory` }}", - "cpus": "{{ user `cpus` }}", "virtualbox_version_file": ".vbox_version", "vm_name": "{{ user `template` }}" }, @@ -62,24 +60,23 @@ "<tab> linux ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], "boot_wait": "10s", + "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "guest_os_type": "fedora-64", "headless": "{{ user `headless` }}", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-vmware", "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", "ssh_password": "vagrant", "ssh_port": 22, - "ssh_username": "vagrant", "ssh_timeout": "10000s", + "ssh_username": "vagrant", "tools_upload_flavor": "linux", "type": "vmware-iso", "vm_name": "{{ user `template` }}", - "memory": "{{ user `memory` }}", - "cpus": "{{ user `cpus` }}", "vmx_data": { "cpuid.coresPerSocket": "1", "ethernet0.pciSlotNumber": "32" @@ -91,22 +88,21 @@ "<tab> linux ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], "boot_wait": "10s", + "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "guest_os_type": "fedora-core", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-parallels", "parallels_tools_flavor": "lin", - "memory": "{{ user `memory` }}", - "cpus": "{{ user `cpus` }}", "prlctl_version_file": ".prlctl_version", "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", "ssh_password": "vagrant", "ssh_port": 22, - "ssh_username": "vagrant", "ssh_timeout": "10000s", + "ssh_username": "vagrant", "type": "parallels-iso", "vm_name": "{{ user `template` }}" }, @@ -115,20 +111,19 @@ "<tab> linux ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], "boot_wait": "10s", - "memory": "{{ user `memory` }}", "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-qemu", "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", "ssh_password": "vagrant", "ssh_port": 22, - "ssh_username": "vagrant", "ssh_timeout": "10000s", + "ssh_username": "vagrant", "type": "qemu", "vm_name": "{{ user `template` }}" } @@ -170,15 +165,15 @@ "arch": "64", "box_basename": "fedora-31", "build_directory": "../../builds", - "http_directory": "{{template_dir}}/http", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", "disk_size": "65536", "git_revision": "__unknown_git_revision__", + "guest_additions_url": "", "headless": "", + "http_directory": "{{template_dir}}/http", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", - "guest_additions_url": "", "iso_checksum": "225ebc160e40bb43c5de28bad9680e3a78a9db40c9e3f4f42f3ee3f10f95dbeb", "iso_checksum_type": "sha256", "iso_name": "Fedora-Server-dvd-x86_64-31-1.9.iso", @@ -192,3 +187,4 @@ "version": "TIMESTAMP" } } + diff --git a/packer_templates/fedora/fedora-32-x86_64.json b/packer_templates/fedora/fedora-32-x86_64.json index c4507d99b..b4e177269 100644 --- a/packer_templates/fedora/fedora-32-x86_64.json +++ b/packer_templates/fedora/fedora-32-x86_64.json @@ -1,59 +1,57 @@ { "builders": [ { - "type": "qemu", - "vm_name": "{{ user `template` }}", - "name": "{{ user `template` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-libvirt", "accelerator": "kvm", - "boot_wait": "10s", "boot_command": [ "<tab> linux ks=http://{{.HTTPIP}}:{{.HTTPPort}}/{{user `ks_path`}}<enter><wait>" ], - "format": "qcow2", - "disk_size": "{{user `disk_size`}}", - "disk_discard": "unmap", + "boot_wait": "10s", + "cpus": "{{ user `cpus` }}", "disk_cache": "unsafe", "disk_compression": true, + "disk_discard": "unmap", "disk_interface": "virtio-scsi", - "net_device": "virtio-net", - "memory": "{{ user `memory` }}", - "cpus": "{{ user `cpus` }}", - "http_directory": "{{user `http_directory`}}", + "disk_size": "{{user `disk_size`}}", + "format": "qcow2", "headless": "{{ user `headless` }}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", + "http_directory": "{{user `http_directory`}}", + "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "ssh_username": "vagrant", + "memory": "{{ user `memory` }}", + "name": "{{ user `template` }}", + "net_device": "virtio-net", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-libvirt", + "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", "ssh_password": "vagrant", "ssh_port": 22, "ssh_timeout": "3600s", - "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now" + "ssh_username": "vagrant", + "type": "qemu", + "vm_name": "{{ user `template` }}" }, { "boot_command": [ "<tab> linux ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], "boot_wait": "10s", + "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", - "guest_additions_url": "{{ user `guest_additions_url` }}", "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "guest_additions_url": "{{ user `guest_additions_url` }}", "guest_os_type": "Fedora_64", "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-virtualbox", "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", "ssh_password": "vagrant", "ssh_port": 22, - "ssh_username": "vagrant", "ssh_timeout": "10000s", + "ssh_username": "vagrant", "type": "virtualbox-iso", - "memory": "{{ user `memory` }}", - "cpus": "{{ user `cpus` }}", "virtualbox_version_file": ".vbox_version", "vm_name": "{{ user `template` }}" }, @@ -62,24 +60,23 @@ "<tab> linux ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], "boot_wait": "10s", + "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "guest_os_type": "fedora-64", "headless": "{{ user `headless` }}", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-vmware", "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", "ssh_password": "vagrant", "ssh_port": 22, - "ssh_username": "vagrant", "ssh_timeout": "10000s", + "ssh_username": "vagrant", "tools_upload_flavor": "linux", "type": "vmware-iso", "vm_name": "{{ user `template` }}", - "memory": "{{ user `memory` }}", - "cpus": "{{ user `cpus` }}", "vmx_data": { "cpuid.coresPerSocket": "1", "ethernet0.pciSlotNumber": "32" @@ -91,22 +88,21 @@ "<tab> linux ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], "boot_wait": "10s", + "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "guest_os_type": "fedora-core", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-parallels", "parallels_tools_flavor": "lin", - "memory": "{{ user `memory` }}", - "cpus": "{{ user `cpus` }}", "prlctl_version_file": ".prlctl_version", "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", "ssh_password": "vagrant", "ssh_port": 22, - "ssh_username": "vagrant", "ssh_timeout": "10000s", + "ssh_username": "vagrant", "type": "parallels-iso", "vm_name": "{{ user `template` }}" }, @@ -115,20 +111,19 @@ "<tab> linux ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], "boot_wait": "10s", - "memory": "{{ user `memory` }}", "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-qemu", "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", "ssh_password": "vagrant", "ssh_port": 22, - "ssh_username": "vagrant", "ssh_timeout": "10000s", + "ssh_username": "vagrant", "type": "qemu", "vm_name": "{{ user `template` }}" } @@ -170,15 +165,15 @@ "arch": "64", "box_basename": "fedora-32", "build_directory": "../../builds", - "http_directory": "{{template_dir}}/http", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", "disk_size": "65536", "git_revision": "__unknown_git_revision__", + "guest_additions_url": "", "headless": "", + "http_directory": "{{template_dir}}/http", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", - "guest_additions_url": "", "iso_checksum": "cd2aefdbe1b5042865a39c49d32f5d21a9537c719aa87dde34d08ca06bc6681c", "iso_checksum_type": "sha256", "iso_name": "Fedora-Server-dvd-x86_64-32-1.6.iso", @@ -192,3 +187,4 @@ "version": "TIMESTAMP" } } + diff --git a/packer_templates/freebsd/freebsd-11.3-amd64.json b/packer_templates/freebsd/freebsd-11.3-amd64.json index e1ffa2d99..71b5d9922 100644 --- a/packer_templates/freebsd/freebsd-11.3-amd64.json +++ b/packer_templates/freebsd/freebsd-11.3-amd64.json @@ -10,25 +10,24 @@ "mdmfs -s 100m md1 /tmp<enter><wait>", "mdmfs -s 100m md2 /mnt<enter><wait>", "dhclient -p /tmp/dhclient.em0.pid -l /tmp/dhclient.lease.em0 em0<enter><wait>", - "fetch -o /tmp/installerconfig http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} && bsdinstall script /tmp/installerconfig<enter><wait>" + "fetch -o /tmp/installerconfig http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} \u0026\u0026 bsdinstall script /tmp/installerconfig<enter><wait>" ], "boot_wait": "10s", - "memory": "{{ user `memory` }}", "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "guest_additions_mode": "disable", "guest_os_type": "FreeBSD_64", "headless": "{{ user `headless` }}", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-virtualbox", "shutdown_command": "echo 'vagrant' | su -m root -c 'shutdown -p now'", "ssh_password": "vagrant", "ssh_port": 22, - "ssh_username": "vagrant", "ssh_timeout": "10000s", + "ssh_username": "vagrant", "type": "virtualbox-iso", "virtualbox_version_file": ".vbox_version", "vm_name": "{{ user `template` }}" @@ -44,24 +43,23 @@ "mdmfs -s 100m md2 /mnt<enter><wait>", "dhclient -p /tmp/dhclient.em0.pid -l /tmp/dhclient.lease.em0 em0<enter><wait>", "<wait5>", - "fetch -o /tmp/installerconfig http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} && bsdinstall script /tmp/installerconfig<enter><wait>" + "fetch -o /tmp/installerconfig http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} \u0026\u0026 bsdinstall script /tmp/installerconfig<enter><wait>" ], "boot_wait": "10s", - "memory": "{{ user `memory` }}", "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "guest_os_type": "freebsd-64", "headless": "{{ user `headless` }}", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-vmware", "shutdown_command": "echo 'vagrant' | su -m root -c 'shutdown -p now'", "ssh_password": "vagrant", "ssh_port": 22, - "ssh_username": "vagrant", "ssh_timeout": "10000s", + "ssh_username": "vagrant", "type": "vmware-iso", "vm_name": "{{ user `template` }}", "vmx_data": { @@ -79,17 +77,16 @@ "mdmfs -s 100m md1 /tmp<enter><wait>", "mdmfs -s 100m md2 /mnt<enter><wait>", "dhclient -p /tmp/dhclient.em0.pid -l /tmp/dhclient.lease.em0 em0<enter><wait>", - "fetch -o /tmp/installerconfig http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} && bsdinstall script /tmp/installerconfig<enter><wait>" + "fetch -o /tmp/installerconfig http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} \u0026\u0026 bsdinstall script /tmp/installerconfig<enter><wait>" ], "boot_wait": "8s", - "memory": "{{ user `memory` }}", "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "guest_os_type": "freebsd", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-parallels", "parallels_tools_mode": "disable", "prlctl": [ @@ -118,8 +115,8 @@ "shutdown_command": "echo 'vagrant' | su -m root -c 'shutdown -p now'", "ssh_password": "vagrant", "ssh_port": 22, - "ssh_username": "vagrant", "ssh_timeout": "10000s", + "ssh_username": "vagrant", "type": "parallels-iso", "vm_name": "{{ user `template` }}" }, @@ -133,23 +130,22 @@ "mdmfs -s 100m md1 /tmp<enter><wait>", "mdmfs -s 100m md2 /mnt<enter><wait>", "dhclient -p /tmp/dhclient.vtnet0.pid -l /tmp/dhclient.lease.vtnet0 vtnet0<enter><wait>", - "fetch -o /tmp/installerconfig http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} && bsdinstall script /tmp/installerconfig<enter><wait>" + "fetch -o /tmp/installerconfig http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} \u0026\u0026 bsdinstall script /tmp/installerconfig<enter><wait>" ], "boot_wait": "7s", - "memory": "{{ user `memory` }}", "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-qemu", "shutdown_command": "echo 'vagrant' | su -m root -c 'shutdown -p now'", "ssh_password": "vagrant", "ssh_port": 22, - "ssh_username": "vagrant", "ssh_timeout": "10000s", + "ssh_username": "vagrant", "type": "qemu", "vm_name": "{{ user `template` }}" } @@ -187,12 +183,12 @@ "variables": { "box_basename": "freebsd-11.3", "build_directory": "../../builds", - "http_directory": "{{template_dir}}/http", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", "disk_size": "65536", "git_revision": "__unknown_git_revision__", "headless": "", + "http_directory": "{{template_dir}}/http", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", "install_path": "freebsd-11/installerconfig", @@ -209,3 +205,4 @@ "version": "TIMESTAMP" } } + diff --git a/packer_templates/freebsd/freebsd-11.3-i386.json b/packer_templates/freebsd/freebsd-11.3-i386.json index 10dd22df1..02fb18777 100644 --- a/packer_templates/freebsd/freebsd-11.3-i386.json +++ b/packer_templates/freebsd/freebsd-11.3-i386.json @@ -10,25 +10,24 @@ "mdmfs -s 100m md1 /tmp<enter><wait>", "mdmfs -s 100m md2 /mnt<enter><wait>", "dhclient /tmp/dhclient.em0.pid -l /tmp/dhclient.lease.em0 em0<enter><wait>", - "fetch -o /tmp/installerconfig http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} && bsdinstall script /tmp/installerconfig<enter><wait>" + "fetch -o /tmp/installerconfig http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} \u0026\u0026 bsdinstall script /tmp/installerconfig<enter><wait>" ], "boot_wait": "10s", - "memory": "{{ user `memory` }}", "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "guest_additions_mode": "disable", "guest_os_type": "FreeBSD", "headless": "{{ user `headless` }}", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-virtualbox", "shutdown_command": "echo 'vagrant' | su -m root -c 'shutdown -p now'", "ssh_password": "vagrant", "ssh_port": 22, - "ssh_username": "vagrant", "ssh_timeout": "10000s", + "ssh_username": "vagrant", "type": "virtualbox-iso", "virtualbox_version_file": ".vbox_version", "vm_name": "{{ user `template` }}" @@ -44,24 +43,23 @@ "mdmfs -s 100m md2 /mnt<enter><wait>", "dhclient -p /tmp/dhclient.em0.pid -l /tmp/dhclient.lease.em0 em0<enter><wait>", "<wait5>", - "fetch -o /tmp/installerconfig http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} && bsdinstall script /tmp/installerconfig<enter><wait>" + "fetch -o /tmp/installerconfig http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} \u0026\u0026 bsdinstall script /tmp/installerconfig<enter><wait>" ], "boot_wait": "10s", - "memory": "{{ user `memory` }}", "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "guest_os_type": "freebsd", "headless": "{{ user `headless` }}", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-vmware", "shutdown_command": "echo 'vagrant' | su -m root -c 'shutdown -p now'", "ssh_password": "vagrant", "ssh_port": 22, - "ssh_username": "vagrant", "ssh_timeout": "10000s", + "ssh_username": "vagrant", "type": "vmware-iso", "vm_name": "{{ user `template` }}", "vmx_data": { @@ -79,17 +77,16 @@ "mdmfs -s 100m md1 /tmp<enter><wait>", "mdmfs -s 100m md2 /mnt<enter><wait>", "dhclient -p /tmp/dhclient.em0.pid -l /tmp/dhclient.lease.em0 em0<enter><wait>", - "fetch -o /tmp/installerconfig http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} && bsdinstall script /tmp/installerconfig<enter><wait>" + "fetch -o /tmp/installerconfig http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} \u0026\u0026 bsdinstall script /tmp/installerconfig<enter><wait>" ], "boot_wait": "8s", - "memory": "{{ user `memory` }}", "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "guest_os_type": "freebsd", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-parallels", "parallels_tools_mode": "disable", "prlctl": [ @@ -118,8 +115,8 @@ "shutdown_command": "echo 'vagrant' | su -m root -c 'shutdown -p now'", "ssh_password": "vagrant", "ssh_port": 22, - "ssh_username": "vagrant", "ssh_timeout": "10000s", + "ssh_username": "vagrant", "type": "parallels-iso", "vm_name": "{{ user `template` }}" }, @@ -133,23 +130,22 @@ "mdmfs -s 100m md1 /tmp<enter><wait>", "mdmfs -s 100m md2 /mnt<enter><wait>", "dhclient -p /tmp/dhclient.vtnet0.pid -l /tmp/dhclient.lease.vtnet0 vtnet0<enter><wait>", - "fetch -o /tmp/installerconfig http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} && bsdinstall script /tmp/installerconfig<enter><wait>" + "fetch -o /tmp/installerconfig http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} \u0026\u0026 bsdinstall script /tmp/installerconfig<enter><wait>" ], "boot_wait": "7s", - "memory": "{{ user `memory` }}", "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-qemu", "shutdown_command": "echo 'vagrant' | su -m root -c 'shutdown -p now'", "ssh_password": "vagrant", "ssh_port": 22, - "ssh_username": "vagrant", "ssh_timeout": "10000s", + "ssh_username": "vagrant", "type": "qemu", "vm_name": "{{ user `template` }}" } @@ -187,12 +183,12 @@ "variables": { "box_basename": "freebsd-11.3-i386", "build_directory": "../../builds", - "http_directory": "{{template_dir}}/http", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", "disk_size": "40960", "git_revision": "__unknown_git_revision__", "headless": "", + "http_directory": "{{template_dir}}/http", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", "install_path": "freebsd-11/installerconfig", @@ -209,3 +205,4 @@ "version": "TIMESTAMP" } } + diff --git a/packer_templates/freebsd/freebsd-12.1-amd64.json b/packer_templates/freebsd/freebsd-12.1-amd64.json index 9c5c38754..e034f3237 100644 --- a/packer_templates/freebsd/freebsd-12.1-amd64.json +++ b/packer_templates/freebsd/freebsd-12.1-amd64.json @@ -10,25 +10,24 @@ "mdmfs -s 100m md1 /tmp<enter><wait>", "mdmfs -s 100m md2 /mnt<enter><wait>", "dhclient -p /tmp/dhclient.em0.pid -l /tmp/dhclient.lease.em0 em0<enter><wait>", - "fetch -o /tmp/installerconfig http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} && bsdinstall script /tmp/installerconfig<enter><wait>" + "fetch -o /tmp/installerconfig http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} \u0026\u0026 bsdinstall script /tmp/installerconfig<enter><wait>" ], "boot_wait": "10s", - "memory": "{{ user `memory` }}", "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "guest_additions_mode": "disable", "guest_os_type": "FreeBSD_64", "headless": "{{ user `headless` }}", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-virtualbox", "shutdown_command": "echo 'vagrant' | su -m root -c 'shutdown -p now'", "ssh_password": "vagrant", "ssh_port": 22, - "ssh_username": "vagrant", "ssh_timeout": "10000s", + "ssh_username": "vagrant", "type": "virtualbox-iso", "virtualbox_version_file": ".vbox_version", "vm_name": "{{ user `template` }}" @@ -44,24 +43,23 @@ "mdmfs -s 100m md2 /mnt<enter><wait>", "dhclient -p /tmp/dhclient.em0.pid -l /tmp/dhclient.lease.em0 em0<enter><wait>", "<wait5>", - "fetch -o /tmp/installerconfig http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} && bsdinstall script /tmp/installerconfig<enter><wait>" + "fetch -o /tmp/installerconfig http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} \u0026\u0026 bsdinstall script /tmp/installerconfig<enter><wait>" ], "boot_wait": "10s", - "memory": "{{ user `memory` }}", "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "guest_os_type": "freebsd-64", "headless": "{{ user `headless` }}", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-vmware", "shutdown_command": "echo 'vagrant' | su -m root -c 'shutdown -p now'", "ssh_password": "vagrant", "ssh_port": 22, - "ssh_username": "vagrant", "ssh_timeout": "10000s", + "ssh_username": "vagrant", "type": "vmware-iso", "vm_name": "{{ user `template` }}", "vmx_data": { @@ -79,17 +77,16 @@ "mdmfs -s 100m md1 /tmp<enter><wait>", "mdmfs -s 100m md2 /mnt<enter><wait>", "dhclient -p /tmp/dhclient.em0.pid -l /tmp/dhclient.lease.em0 em0<enter><wait>", - "fetch -o /tmp/installerconfig http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} && bsdinstall script /tmp/installerconfig<enter><wait>" + "fetch -o /tmp/installerconfig http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} \u0026\u0026 bsdinstall script /tmp/installerconfig<enter><wait>" ], "boot_wait": "8s", - "memory": "{{ user `memory` }}", "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "guest_os_type": "freebsd", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-parallels", "parallels_tools_mode": "disable", "prlctl": [ @@ -118,8 +115,8 @@ "shutdown_command": "echo 'vagrant' | su -m root -c 'shutdown -p now'", "ssh_password": "vagrant", "ssh_port": 22, - "ssh_username": "vagrant", "ssh_timeout": "10000s", + "ssh_username": "vagrant", "type": "parallels-iso", "vm_name": "{{ user `template` }}" }, @@ -133,23 +130,22 @@ "mdmfs -s 100m md1 /tmp<enter><wait>", "mdmfs -s 100m md2 /mnt<enter><wait>", "dhclient -p /tmp/dhclient.vtnet0.pid -l /tmp/dhclient.lease.vtnet0 vtnet0<enter><wait>", - "fetch -o /tmp/installerconfig http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} && bsdinstall script /tmp/installerconfig<enter><wait>" + "fetch -o /tmp/installerconfig http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} \u0026\u0026 bsdinstall script /tmp/installerconfig<enter><wait>" ], "boot_wait": "7s", - "memory": "{{ user `memory` }}", "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-qemu", "shutdown_command": "echo 'vagrant' | su -m root -c 'shutdown -p now'", "ssh_password": "vagrant", "ssh_port": 22, - "ssh_username": "vagrant", "ssh_timeout": "10000s", + "ssh_username": "vagrant", "type": "qemu", "vm_name": "{{ user `template` }}" } @@ -187,12 +183,12 @@ "variables": { "box_basename": "freebsd-12.1", "build_directory": "../../builds", - "http_directory": "{{template_dir}}/http", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", "disk_size": "65536", "git_revision": "__unknown_git_revision__", "headless": "", + "http_directory": "{{template_dir}}/http", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", "install_path": "freebsd-11/installerconfig", @@ -209,3 +205,4 @@ "version": "TIMESTAMP" } } + diff --git a/packer_templates/freebsd/freebsd-12.1-i386.json b/packer_templates/freebsd/freebsd-12.1-i386.json index 591bf8299..4d1d6207b 100644 --- a/packer_templates/freebsd/freebsd-12.1-i386.json +++ b/packer_templates/freebsd/freebsd-12.1-i386.json @@ -10,25 +10,24 @@ "mdmfs -s 100m md1 /tmp<enter><wait>", "mdmfs -s 100m md2 /mnt<enter><wait>", "dhclient -p /tmp/dhclient.em0.pid -l /tmp/dhclient.lease.em0 em0<enter><wait>", - "fetch -o /tmp/installerconfig http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} && bsdinstall script /tmp/installerconfig<enter><wait>" + "fetch -o /tmp/installerconfig http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} \u0026\u0026 bsdinstall script /tmp/installerconfig<enter><wait>" ], "boot_wait": "10s", - "memory": "{{ user `memory` }}", "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "guest_additions_mode": "disable", "guest_os_type": "FreeBSD", "headless": "{{ user `headless` }}", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-virtualbox", "shutdown_command": "echo 'vagrant' | su -m root -c 'shutdown -p now'", "ssh_password": "vagrant", "ssh_port": 22, - "ssh_username": "vagrant", "ssh_timeout": "10000s", + "ssh_username": "vagrant", "type": "virtualbox-iso", "virtualbox_version_file": ".vbox_version", "vm_name": "{{ user `template` }}" @@ -44,24 +43,23 @@ "mdmfs -s 100m md2 /mnt<enter><wait>", "dhclient -p /tmp/dhclient.em0.pid -l /tmp/dhclient.lease.em0 em0<enter><wait>", "<wait5>", - "fetch -o /tmp/installerconfig http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} && bsdinstall script /tmp/installerconfig<enter><wait>" + "fetch -o /tmp/installerconfig http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} \u0026\u0026 bsdinstall script /tmp/installerconfig<enter><wait>" ], "boot_wait": "10s", - "memory": "{{ user `memory` }}", "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "guest_os_type": "freebsd", "headless": "{{ user `headless` }}", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-vmware", "shutdown_command": "echo 'vagrant' | su -m root -c 'shutdown -p now'", "ssh_password": "vagrant", "ssh_port": 22, - "ssh_username": "vagrant", "ssh_timeout": "10000s", + "ssh_username": "vagrant", "type": "vmware-iso", "vm_name": "{{ user `template` }}", "vmx_data": { @@ -79,17 +77,16 @@ "mdmfs -s 100m md1 /tmp<enter><wait>", "mdmfs -s 100m md2 /mnt<enter><wait>", "dhclient -p /tmp/dhclient.em0.pid -l /tmp/dhclient.lease.em0 em0<enter><wait>", - "fetch -o /tmp/installerconfig http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} && bsdinstall script /tmp/installerconfig<enter><wait>" + "fetch -o /tmp/installerconfig http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} \u0026\u0026 bsdinstall script /tmp/installerconfig<enter><wait>" ], "boot_wait": "8s", - "memory": "{{ user `memory` }}", "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "guest_os_type": "freebsd", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-parallels", "parallels_tools_mode": "disable", "prlctl": [ @@ -118,8 +115,8 @@ "shutdown_command": "echo 'vagrant' | su -m root -c 'shutdown -p now'", "ssh_password": "vagrant", "ssh_port": 22, - "ssh_username": "vagrant", "ssh_timeout": "10000s", + "ssh_username": "vagrant", "type": "parallels-iso", "vm_name": "{{ user `template` }}" }, @@ -133,23 +130,22 @@ "mdmfs -s 100m md1 /tmp<enter><wait>", "mdmfs -s 100m md2 /mnt<enter><wait>", "dhclient -p /tmp/dhclient.vtnet0.pid -l /tmp/dhclient.lease.vtnet0 vtnet0<enter><wait>", - "fetch -o /tmp/installerconfig http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} && bsdinstall script /tmp/installerconfig<enter><wait>" + "fetch -o /tmp/installerconfig http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} \u0026\u0026 bsdinstall script /tmp/installerconfig<enter><wait>" ], "boot_wait": "7s", - "memory": "{{ user `memory` }}", "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-qemu", "shutdown_command": "echo 'vagrant' | su -m root -c 'shutdown -p now'", "ssh_password": "vagrant", "ssh_port": 22, - "ssh_username": "vagrant", "ssh_timeout": "10000s", + "ssh_username": "vagrant", "type": "qemu", "vm_name": "{{ user `template` }}" } @@ -187,12 +183,12 @@ "variables": { "box_basename": "freebsd-12.1-i386", "build_directory": "../../builds", - "http_directory": "{{template_dir}}/http", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", "disk_size": "40960", "git_revision": "__unknown_git_revision__", "headless": "", + "http_directory": "{{template_dir}}/http", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", "install_path": "freebsd-11/installerconfig", @@ -209,3 +205,4 @@ "version": "TIMESTAMP" } } + diff --git a/packer_templates/hardenedbsd/hardenedbsd-11-amd64.json b/packer_templates/hardenedbsd/hardenedbsd-11-amd64.json index 6e87c0a73..d59a247bb 100644 --- a/packer_templates/hardenedbsd/hardenedbsd-11-amd64.json +++ b/packer_templates/hardenedbsd/hardenedbsd-11-amd64.json @@ -10,25 +10,24 @@ "mdmfs -s 100m md1 /tmp<enter><wait>", "mdmfs -s 100m md2 /mnt<enter><wait>", "dhclient -l /tmp/dhclient.lease.em0 em0<enter><wait10>", - "fetch -o /tmp/installerconfig http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} && bsdinstall script /tmp/installerconfig<enter><wait>" + "fetch -o /tmp/installerconfig http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} \u0026\u0026 bsdinstall script /tmp/installerconfig<enter><wait>" ], "boot_wait": "10s", - "memory": "{{ user `memory` }}", "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "guest_additions_mode": "disable", "guest_os_type": "FreeBSD_64", "headless": "{{ user `headless` }}", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-virtualbox", "shutdown_command": "echo 'vagrant' | su -m root -c 'shutdown -p now'", "ssh_password": "vagrant", "ssh_port": 22, - "ssh_username": "vagrant", "ssh_timeout": "10000s", + "ssh_username": "vagrant", "type": "virtualbox-iso", "virtualbox_version_file": ".vbox_version", "vm_name": "{{ user `template` }}" @@ -44,24 +43,23 @@ "mdmfs -s 100m md2 /mnt<enter><wait>", "dhclient -l /tmp/dhclient.lease.em0 em0<enter><wait>", "<wait5>", - "fetch -o /tmp/installerconfig http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} && bsdinstall script /tmp/installerconfig<enter><wait>" + "fetch -o /tmp/installerconfig http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} \u0026\u0026 bsdinstall script /tmp/installerconfig<enter><wait>" ], "boot_wait": "10s", - "memory": "{{ user `memory` }}", "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "guest_os_type": "freebsd-64", "headless": "{{ user `headless` }}", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-vmware", "shutdown_command": "echo 'vagrant' | su -m root -c 'shutdown -p now'", "ssh_password": "vagrant", "ssh_port": 22, - "ssh_username": "vagrant", "ssh_timeout": "10000s", + "ssh_username": "vagrant", "type": "vmware-iso", "vm_name": "{{ user `template` }}", "vmx_data": { @@ -79,17 +77,16 @@ "mdmfs -s 100m md1 /tmp<enter><wait>", "mdmfs -s 100m md2 /mnt<enter><wait>", "dhclient -l /tmp/dhclient.lease.em0 em0<enter><wait>", - "fetch -o /tmp/installerconfig http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} && bsdinstall script /tmp/installerconfig<enter><wait>" + "fetch -o /tmp/installerconfig http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} \u0026\u0026 bsdinstall script /tmp/installerconfig<enter><wait>" ], "boot_wait": "8s", - "memory": "{{ user `memory` }}", "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "guest_os_type": "freebsd", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-parallels", "parallels_tools_mode": "disable", "prlctl": [ @@ -118,8 +115,8 @@ "shutdown_command": "echo 'vagrant' | su -m root -c 'shutdown -p now'", "ssh_password": "vagrant", "ssh_port": 22, - "ssh_username": "vagrant", "ssh_timeout": "10000s", + "ssh_username": "vagrant", "type": "parallels-iso", "vm_name": "{{ user `template` }}" }, @@ -133,23 +130,22 @@ "mdmfs -s 100m md1 /tmp<enter><wait>", "mdmfs -s 100m md2 /mnt<enter><wait>", "dhclient -l /tmp/dhclient.lease.vtnet0 vtnet0<enter><wait>", - "fetch -o /tmp/installerconfig http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} && bsdinstall script /tmp/installerconfig<enter><wait>" + "fetch -o /tmp/installerconfig http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} \u0026\u0026 bsdinstall script /tmp/installerconfig<enter><wait>" ], "boot_wait": "7s", - "memory": "{{ user `memory` }}", "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-qemu", "shutdown_command": "echo 'vagrant' | su -m root -c 'shutdown -p now'", "ssh_password": "vagrant", "ssh_port": 22, - "ssh_username": "vagrant", "ssh_timeout": "10000s", + "ssh_username": "vagrant", "type": "qemu", "vm_name": "{{ user `template` }}" } @@ -185,12 +181,12 @@ "variables": { "box_basename": "hardenedbsd-11", "build_directory": "../../builds", - "http_directory": "{{template_dir}}/http", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", "disk_size": "65536", "git_revision": "__unknown_git_revision__", "headless": "", + "http_directory": "{{template_dir}}/http", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", "install_path": "hardenedbsd-11/installerconfig", @@ -206,3 +202,4 @@ "version": "TIMESTAMP" } } + diff --git a/packer_templates/macos/macos-10.12.json b/packer_templates/macos/macos-10.12.json index e7f11e3e1..a2c4e5bfb 100644 --- a/packer_templates/macos/macos-10.12.json +++ b/packer_templates/macos/macos-10.12.json @@ -2,25 +2,24 @@ "builders": [ { "boot_wait": "2s", - "memory": "{{ user `memory` }}", "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", - "usb": true, "guest_os_type": "darwin12-64", "headless": "{{ user `headless` }}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", "iso_url": "{{user `iso_url`}}", + "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-vmware", "shutdown_command": "echo 'vagrant'| sudo -S shutdown -h now", "skip_compaction": true, "ssh_password": "vagrant", "ssh_port": 22, - "ssh_username": "vagrant", "ssh_timeout": "10000s", + "ssh_username": "vagrant", "tools_upload_flavor": "darwin", "tools_upload_path": "/tmp/vmtools.iso", "type": "vmware-iso", + "usb": true, "vm_name": "{{ user `template` }}", "vmx_data": { "cpuid.coresPerSocket": "1", @@ -35,22 +34,21 @@ }, { "boot_wait": "2s", - "memory": "{{ user `memory` }}", "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "guest_additions_mode": "disable", "guest_os_type": "MacOS1011_64", "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", "iso_url": "{{user `iso_url`}}", + "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-virtualbox", "shutdown_command": "echo 'vagrant'| sudo -S shutdown -h now", "ssh_password": "vagrant", "ssh_port": 22, - "ssh_username": "vagrant", "ssh_timeout": "10000s", + "ssh_username": "vagrant", "type": "virtualbox-iso", "vboxmanage": [ [ @@ -146,13 +144,12 @@ }, { "boot_wait": "2s", - "memory": "{{ user `memory` }}", "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "guest_os_type": "macosx", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", "iso_url": "{{user `iso_url`}}", + "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-parallels", "parallels_tools_flavor": "mac", "prlctl": [ @@ -166,8 +163,8 @@ "shutdown_command": "echo 'vagrant'| sudo -S shutdown -h now", "ssh_password": "vagrant", "ssh_port": 22, - "ssh_username": "vagrant", "ssh_timeout": "10000s", + "ssh_username": "vagrant", "type": "parallels-iso", "vm_name": "{{ user `template` }}" } @@ -231,3 +228,4 @@ "version": "TIMESTAMP" } } + diff --git a/packer_templates/macos/macosx-10.11.json b/packer_templates/macos/macosx-10.11.json index 70b8b8cae..836d594ec 100644 --- a/packer_templates/macos/macosx-10.11.json +++ b/packer_templates/macos/macosx-10.11.json @@ -2,25 +2,24 @@ "builders": [ { "boot_wait": "2s", - "memory": "{{ user `memory` }}", "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", - "usb": true, "guest_os_type": "darwin12-64", "headless": "{{ user `headless` }}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", "iso_url": "{{user `iso_url`}}", + "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-vmware", "shutdown_command": "echo 'vagrant'| sudo -S shutdown -h now", "skip_compaction": true, "ssh_password": "vagrant", "ssh_port": 22, - "ssh_username": "vagrant", "ssh_timeout": "10000s", + "ssh_username": "vagrant", "tools_upload_flavor": "darwin", "tools_upload_path": "/tmp/vmtools.iso", "type": "vmware-iso", + "usb": true, "vm_name": "{{ user `template` }}", "vmx_data": { "cpuid.coresPerSocket": "1", @@ -35,22 +34,21 @@ }, { "boot_wait": "2s", - "memory": "{{ user `memory` }}", "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "guest_additions_mode": "disable", "guest_os_type": "MacOS1011_64", "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", "iso_url": "{{user `iso_url`}}", + "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-virtualbox", "shutdown_command": "echo 'vagrant'| sudo -S shutdown -h now", "ssh_password": "vagrant", "ssh_port": 22, - "ssh_username": "vagrant", "ssh_timeout": "10000s", + "ssh_username": "vagrant", "type": "virtualbox-iso", "vboxmanage": [ [ @@ -146,13 +144,12 @@ }, { "boot_wait": "2s", - "memory": "{{ user `memory` }}", "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "guest_os_type": "macosx", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", "iso_url": "{{user `iso_url`}}", + "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-parallels", "parallels_tools_flavor": "mac", "prlctl": [ @@ -166,8 +163,8 @@ "shutdown_command": "echo 'vagrant'| sudo -S shutdown -h now", "ssh_password": "vagrant", "ssh_port": 22, - "ssh_username": "vagrant", "ssh_timeout": "10000s", + "ssh_username": "vagrant", "type": "parallels-iso", "vm_name": "{{ user `template` }}" } @@ -231,3 +228,4 @@ "version": "TIMESTAMP" } } + diff --git a/packer_templates/opensuse/opensuse-leap-15.1-x86_64.json b/packer_templates/opensuse/opensuse-leap-15.1-x86_64.json index 56d2bde5d..0b23f92e0 100644 --- a/packer_templates/opensuse/opensuse-leap-15.1-x86_64.json +++ b/packer_templates/opensuse/opensuse-leap-15.1-x86_64.json @@ -14,25 +14,24 @@ "<enter><wait>" ], "boot_wait": "10s", + "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", - "guest_additions_url": "{{ user `guest_additions_url` }}", "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "guest_additions_url": "{{ user `guest_additions_url` }}", "guest_os_type": "OpenSUSE_64", "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-virtualbox", "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, - "ssh_username": "vagrant", "ssh_timeout": "10000s", + "ssh_username": "vagrant", "type": "virtualbox-iso", - "memory": "{{ user `memory` }}", - "cpus": "{{ user `cpus` }}", "virtualbox_version_file": ".vbox_version", "vm_name": "{{ user `template` }}" }, @@ -50,24 +49,23 @@ "<enter><wait>" ], "boot_wait": "10s", + "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "guest_os_type": "opensuse-64", "headless": "{{ user `headless` }}", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-vmware", "shutdown_command": "echo 'vagrant'|sudo -S /sbin/shutdown -h 1", "ssh_password": "vagrant", "ssh_port": 22, - "ssh_username": "vagrant", "ssh_timeout": "10000s", + "ssh_username": "vagrant", "tools_upload_flavor": "linux", "type": "vmware-iso", "vm_name": "{{ user `template` }}", - "memory": "{{ user `memory` }}", - "cpus": "{{ user `cpus` }}", "vmx_data": { "cpuid.coresPerSocket": "1" }, @@ -87,22 +85,21 @@ "<enter><wait>" ], "boot_wait": "10s", + "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "guest_os_type": "opensuse", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-parallels", "parallels_tools_flavor": "lin", - "memory": "{{ user `memory` }}", - "cpus": "{{ user `cpus` }}", "prlctl_version_file": ".prlctl_version", "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, - "ssh_username": "vagrant", "ssh_timeout": "10000s", + "ssh_username": "vagrant", "type": "parallels-iso", "vm_name": "{{ user `template` }}" }, @@ -115,20 +112,19 @@ "<enter><wait>" ], "boot_wait": "10s", - "memory": "{{ user `memory` }}", "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-qemu", "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, - "ssh_username": "vagrant", "ssh_timeout": "10000s", + "ssh_username": "vagrant", "type": "qemu", "vm_name": "{{ user `template` }}" } @@ -173,15 +169,15 @@ "autoinst_cfg": "15/autoinst.xml", "box_basename": "opensuse-leap-15.1", "build_directory": "../../builds", - "http_directory": "{{template_dir}}/http", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", "disk_size": "65536", "git_revision": "__unknown_git_revision__", + "guest_additions_url": "", "headless": "", + "http_directory": "{{template_dir}}/http", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", - "guest_additions_url": "", "iso_checksum": "c6d3ed19fe5cc25c4667bf0b46cc86aebcfbca3b0073aed0a288834600cb8b97", "iso_checksum_type": "sha256", "iso_name": "openSUSE-Leap-15.1-DVD-x86_64.iso", @@ -194,3 +190,4 @@ "version": "TIMESTAMP" } } + diff --git a/packer_templates/oraclelinux/oracle-5.11-i386.json b/packer_templates/oraclelinux/oracle-5.11-i386.json index 439f280f4..da08e7b3d 100644 --- a/packer_templates/oraclelinux/oracle-5.11-i386.json +++ b/packer_templates/oraclelinux/oracle-5.11-i386.json @@ -5,25 +5,24 @@ "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], "boot_wait": "10s", + "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", - "guest_additions_url": "{{ user `guest_additions_url` }}", "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "guest_additions_url": "{{ user `guest_additions_url` }}", "guest_os_type": "Oracle", "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-virtualbox", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, - "ssh_username": "vagrant", "ssh_timeout": "10000s", + "ssh_username": "vagrant", "type": "virtualbox-iso", - "memory": "{{ user `memory` }}", - "cpus": "{{ user `cpus` }}", "virtualbox_version_file": ".vbox_version", "vm_name": "{{ user `template` }}" }, @@ -32,24 +31,23 @@ "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], "boot_wait": "10s", + "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "guest_os_type": "oraclelinux", "headless": "{{ user `headless` }}", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-vmware", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, - "ssh_username": "vagrant", "ssh_timeout": "10000s", + "ssh_username": "vagrant", "tools_upload_flavor": "linux", "type": "vmware-iso", "vm_name": "{{ user `template` }}", - "memory": "{{ user `memory` }}", - "cpus": "{{ user `cpus` }}", "vmx_data": { "cpuid.coresPerSocket": "1" }, @@ -60,22 +58,21 @@ "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], "boot_wait": "10s", + "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "guest_os_type": "centos", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-parallels", "parallels_tools_flavor": "lin", - "memory": "{{ user `memory` }}", - "cpus": "{{ user `cpus` }}", "prlctl_version_file": ".prlctl_version", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, - "ssh_username": "vagrant", "ssh_timeout": "10000s", + "ssh_username": "vagrant", "type": "parallels-iso", "vm_name": "{{ user `template` }}" }, @@ -92,8 +89,7 @@ "generation": "{{user `hyperv_generation`}}", "guest_additions_mode": "disable", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-hyperv", @@ -111,20 +107,19 @@ "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], "boot_wait": "10s", - "memory": "{{ user `memory` }}", "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-qemu", "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, - "ssh_username": "vagrant", "ssh_timeout": "10000s", + "ssh_username": "vagrant", "type": "qemu", "vm_name": "{{ user `template` }}" } @@ -162,16 +157,16 @@ "variables": { "box_basename": "oracle-5.11-i386", "build_directory": "../../builds", - "http_directory": "{{template_dir}}/../centos/http", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", "disk_size": "65536", "git_revision": "__unknown_git_revision__", + "guest_additions_url": "", "headless": "", + "http_directory": "{{template_dir}}/../centos/http", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", "hyperv_generation": "1", - "guest_additions_url": "", "iso_checksum": "E60962C4EBF8920BBD828EFE32A78A7CC8F28E3B", "iso_checksum_type": "sha1", "iso_name": "Enterprise-R5-U11-Server-i386-dvd.iso", @@ -185,3 +180,4 @@ "version": "TIMESTAMP" } } + diff --git a/packer_templates/oraclelinux/oracle-5.11-x86_64.json b/packer_templates/oraclelinux/oracle-5.11-x86_64.json index 3391d2e73..17f790c9d 100644 --- a/packer_templates/oraclelinux/oracle-5.11-x86_64.json +++ b/packer_templates/oraclelinux/oracle-5.11-x86_64.json @@ -5,25 +5,24 @@ "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], "boot_wait": "10s", + "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", - "guest_additions_url": "{{ user `guest_additions_url` }}", "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "guest_additions_url": "{{ user `guest_additions_url` }}", "guest_os_type": "Oracle_64", "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-virtualbox", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, - "ssh_username": "vagrant", "ssh_timeout": "10000s", + "ssh_username": "vagrant", "type": "virtualbox-iso", - "memory": "{{ user `memory` }}", - "cpus": "{{ user `cpus` }}", "vboxmanage": [ [ "modifyvm", @@ -40,24 +39,23 @@ "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], "boot_wait": "10s", + "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "guest_os_type": "oraclelinux-64", "headless": "{{ user `headless` }}", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-vmware", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, - "ssh_username": "vagrant", "ssh_timeout": "10000s", + "ssh_username": "vagrant", "tools_upload_flavor": "linux", "type": "vmware-iso", "vm_name": "{{ user `template` }}", - "memory": "{{ user `memory` }}", - "cpus": "{{ user `cpus` }}", "vmx_data": { "cpuid.coresPerSocket": "1" }, @@ -68,22 +66,21 @@ "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], "boot_wait": "10s", + "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "guest_os_type": "centos", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-parallels", "parallels_tools_flavor": "lin", - "memory": "{{ user `memory` }}", - "cpus": "{{ user `cpus` }}", "prlctl_version_file": ".prlctl_version", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, - "ssh_username": "vagrant", "ssh_timeout": "10000s", + "ssh_username": "vagrant", "type": "parallels-iso", "vm_name": "{{ user `template` }}" }, @@ -100,8 +97,7 @@ "generation": "{{user `hyperv_generation`}}", "guest_additions_mode": "disable", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-hyperv", @@ -119,20 +115,19 @@ "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], "boot_wait": "10s", - "memory": "{{ user `memory` }}", "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-qemu", "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, - "ssh_username": "vagrant", "ssh_timeout": "10000s", + "ssh_username": "vagrant", "type": "qemu", "vm_name": "{{ user `template` }}" } @@ -171,16 +166,16 @@ "arch": "64", "box_basename": "oracle-5.11", "build_directory": "../../builds", - "http_directory": "{{template_dir}}/../centos/http", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", "disk_size": "65536", "git_revision": "__unknown_git_revision__", + "guest_additions_url": "", "headless": "", + "http_directory": "{{template_dir}}/../centos/http", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", "hyperv_generation": "1", - "guest_additions_url": "", "iso_checksum": "2D38F76652CBC1367FDF30024F13CDE5F6BF34DF", "iso_checksum_type": "sha1", "iso_name": "Enterprise-R5-U11-Server-x86_64-dvd.iso", @@ -194,3 +189,4 @@ "version": "TIMESTAMP" } } + diff --git a/packer_templates/oraclelinux/oracle-6.10-i386.json b/packer_templates/oraclelinux/oracle-6.10-i386.json index 9123d181d..c702a9c35 100644 --- a/packer_templates/oraclelinux/oracle-6.10-i386.json +++ b/packer_templates/oraclelinux/oracle-6.10-i386.json @@ -5,25 +5,24 @@ "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], "boot_wait": "10s", + "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", - "guest_additions_url": "{{ user `guest_additions_url` }}", "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "guest_additions_url": "{{ user `guest_additions_url` }}", "guest_os_type": "Oracle", "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-virtualbox", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, - "ssh_username": "vagrant", "ssh_timeout": "10000s", + "ssh_username": "vagrant", "type": "virtualbox-iso", - "memory": "{{ user `memory` }}", - "cpus": "{{ user `cpus` }}", "virtualbox_version_file": ".vbox_version", "vm_name": "{{ user `template` }}" }, @@ -32,24 +31,23 @@ "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], "boot_wait": "10s", + "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "guest_os_type": "oraclelinux", "headless": "{{ user `headless` }}", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-vmware", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, - "ssh_username": "vagrant", "ssh_timeout": "10000s", + "ssh_username": "vagrant", "tools_upload_flavor": "linux", "type": "vmware-iso", "vm_name": "{{ user `template` }}", - "memory": "{{ user `memory` }}", - "cpus": "{{ user `cpus` }}", "vmx_data": { "cpuid.coresPerSocket": "1" }, @@ -60,22 +58,21 @@ "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], "boot_wait": "10s", + "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "guest_os_type": "centos", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-parallels", "parallels_tools_flavor": "lin", - "memory": "{{ user `memory` }}", - "cpus": "{{ user `cpus` }}", "prlctl_version_file": ".prlctl_version", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, - "ssh_username": "vagrant", "ssh_timeout": "10000s", + "ssh_username": "vagrant", "type": "parallels-iso", "vm_name": "{{ user `template` }}" }, @@ -92,8 +89,7 @@ "generation": "{{user `hyperv_generation`}}", "guest_additions_mode": "disable", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-hyperv", @@ -111,20 +107,19 @@ "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], "boot_wait": "10s", - "memory": "{{ user `memory` }}", "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-qemu", "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, - "ssh_username": "vagrant", "ssh_timeout": "10000s", + "ssh_username": "vagrant", "type": "qemu", "vm_name": "{{ user `template` }}" } @@ -164,16 +159,16 @@ "arch": "32", "box_basename": "oracle-6.10-i386", "build_directory": "../../builds", - "http_directory": "{{template_dir}}/../centos/http", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", "disk_size": "65536", "git_revision": "__unknown_git_revision__", + "guest_additions_url": "", "headless": "", + "http_directory": "{{template_dir}}/../centos/http", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", "hyperv_generation": "1", - "guest_additions_url": "", "iso_checksum": "fd07f775e7fa52e9ab021eb7dccb78453fc61f3d3b712ec426f6b1bf5020318b", "iso_checksum_type": "sha256", "iso_name": "OracleLinux-R6-U9-Server-i386-dvd.iso", @@ -187,3 +182,4 @@ "version": "TIMESTAMP" } } + diff --git a/packer_templates/oraclelinux/oracle-6.10-x86_64.json b/packer_templates/oraclelinux/oracle-6.10-x86_64.json index 7ba835c84..fc2cff6c6 100644 --- a/packer_templates/oraclelinux/oracle-6.10-x86_64.json +++ b/packer_templates/oraclelinux/oracle-6.10-x86_64.json @@ -5,25 +5,24 @@ "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], "boot_wait": "10s", + "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", - "guest_additions_url": "{{ user `guest_additions_url` }}", "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "guest_additions_url": "{{ user `guest_additions_url` }}", "guest_os_type": "Oracle_64", "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-virtualbox", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, - "ssh_username": "vagrant", "ssh_timeout": "10000s", + "ssh_username": "vagrant", "type": "virtualbox-iso", - "memory": "{{ user `memory` }}", - "cpus": "{{ user `cpus` }}", "virtualbox_version_file": ".vbox_version", "vm_name": "{{ user `template` }}" }, @@ -32,24 +31,23 @@ "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], "boot_wait": "10s", + "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "guest_os_type": "oraclelinux-64", "headless": "{{ user `headless` }}", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-vmware", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, - "ssh_username": "vagrant", "ssh_timeout": "10000s", + "ssh_username": "vagrant", "tools_upload_flavor": "linux", "type": "vmware-iso", "vm_name": "{{ user `template` }}", - "memory": "{{ user `memory` }}", - "cpus": "{{ user `cpus` }}", "vmx_data": { "cpuid.coresPerSocket": "1" }, @@ -60,22 +58,21 @@ "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], "boot_wait": "10s", + "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "guest_os_type": "centos", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-parallels", "parallels_tools_flavor": "lin", - "memory": "{{ user `memory` }}", - "cpus": "{{ user `cpus` }}", "prlctl_version_file": ".prlctl_version", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, - "ssh_username": "vagrant", "ssh_timeout": "10000s", + "ssh_username": "vagrant", "type": "parallels-iso", "vm_name": "{{ user `template` }}" }, @@ -92,8 +89,7 @@ "generation": "{{user `hyperv_generation`}}", "guest_additions_mode": "disable", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-hyperv", @@ -111,20 +107,19 @@ "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], "boot_wait": "10s", - "memory": "{{ user `memory` }}", "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-qemu", "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, - "ssh_username": "vagrant", "ssh_timeout": "10000s", + "ssh_username": "vagrant", "type": "qemu", "vm_name": "{{ user `template` }}" } @@ -164,17 +159,17 @@ "arch": "64", "box_basename": "oracle-6.10", "build_directory": "../../builds", - "http_directory": "{{template_dir}}/../centos/http", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", "disk_size": "65536", "git_revision": "__unknown_git_revision__", + "guest_additions_url": "", "headless": "", + "http_directory": "{{template_dir}}/../centos/http", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", "hyperv_generation": "1", "hyperv_switch": "{{env `hyperv_switch`}}", - "guest_additions_url": "", "iso_checksum": "c32e2a7c8eb471db731741f1a30be37e49deda8ce961710273a71b26c9a04a36", "iso_checksum_type": "sha256", "iso_name": "OracleLinux-R6-U9-Server-x86_64-dvd.iso", @@ -188,3 +183,4 @@ "version": "TIMESTAMP" } } + diff --git a/packer_templates/oraclelinux/oracle-7.7-x86_64.json b/packer_templates/oraclelinux/oracle-7.7-x86_64.json index 68363ae6d..7144c23b1 100644 --- a/packer_templates/oraclelinux/oracle-7.7-x86_64.json +++ b/packer_templates/oraclelinux/oracle-7.7-x86_64.json @@ -5,25 +5,24 @@ "<up><wait><tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}} net.ifnames=0 biosdevname=0<enter><wait>" ], "boot_wait": "10s", + "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", - "guest_additions_url": "{{ user `guest_additions_url` }}", "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "guest_additions_url": "{{ user `guest_additions_url` }}", "guest_os_type": "Oracle_64", "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-virtualbox", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, - "ssh_username": "vagrant", "ssh_timeout": "10000s", + "ssh_username": "vagrant", "type": "virtualbox-iso", - "memory": "{{ user `memory` }}", - "cpus": "{{ user `cpus` }}", "virtualbox_version_file": ".vbox_version", "vm_name": "{{ user `template` }}" }, @@ -32,24 +31,23 @@ "<up><wait><tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}} net.ifnames=0 biosdevname=0 <enter><wait>" ], "boot_wait": "10s", + "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "guest_os_type": "oraclelinux-64", "headless": "{{ user `headless` }}", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-vmware", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, - "ssh_username": "vagrant", "ssh_timeout": "10000s", + "ssh_username": "vagrant", "tools_upload_flavor": "linux", "type": "vmware-iso", "vm_name": "{{ user `template` }}", - "memory": "{{ user `memory` }}", - "cpus": "{{ user `cpus` }}", "vmx_data": { "cpuid.coresPerSocket": "1" }, @@ -60,22 +58,21 @@ "<up><wait><tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}} net.ifnames=0 biosdevname=0<enter><wait>" ], "boot_wait": "10s", + "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "guest_os_type": "centos", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-parallels", "parallels_tools_flavor": "lin", - "memory": "{{ user `memory` }}", - "cpus": "{{ user `cpus` }}", "prlctl_version_file": ".prlctl_version", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, - "ssh_username": "vagrant", "ssh_timeout": "10000s", + "ssh_username": "vagrant", "type": "parallels-iso", "vm_name": "{{ user `template` }}" }, @@ -92,8 +89,7 @@ "generation": "{{user `hyperv_generation`}}", "guest_additions_mode": "disable", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-hyperv", @@ -111,20 +107,19 @@ "<up><wait><tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}} net.ifnames=0 biosdevname=0<enter><wait>" ], "boot_wait": "10s", - "memory": "{{ user `memory` }}", "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-qemu", "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, - "ssh_username": "vagrant", "ssh_timeout": "10000s", + "ssh_username": "vagrant", "type": "qemu", "vm_name": "{{ user `template` }}" } @@ -164,17 +159,17 @@ "arch": "64", "box_basename": "oracle-7.7", "build_directory": "../../builds", - "http_directory": "{{template_dir}}/../centos/http", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", "disk_size": "65536", "git_revision": "__unknown_git_revision__", + "guest_additions_url": "", "headless": "", + "http_directory": "{{template_dir}}/../centos/http", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", "hyperv_generation": "1", "hyperv_switch": "{{env `hyperv_switch`}}", - "guest_additions_url": "", "iso_checksum": "1d06cef6a518c32c0e7adcad0a99a8efbc7516066de41118ebf49002c15ea84d", "iso_checksum_type": "sha256", "iso_name": "OracleLinux-R7-U7-Server-x86_64-dvd.iso", @@ -188,3 +183,4 @@ "version": "TIMESTAMP" } } + diff --git a/packer_templates/oraclelinux/oracle-8.1-x86_64.json b/packer_templates/oraclelinux/oracle-8.1-x86_64.json index 28edbf4ec..a4a0bbdf0 100644 --- a/packer_templates/oraclelinux/oracle-8.1-x86_64.json +++ b/packer_templates/oraclelinux/oracle-8.1-x86_64.json @@ -5,25 +5,24 @@ "<up><wait><tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], "boot_wait": "10s", + "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", - "guest_additions_url": "{{ user `guest_additions_url` }}", "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "guest_additions_url": "{{ user `guest_additions_url` }}", "guest_os_type": "Oracle_64", "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-virtualbox", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, - "ssh_username": "vagrant", "ssh_timeout": "10000s", + "ssh_username": "vagrant", "type": "virtualbox-iso", - "memory": "{{ user `memory` }}", - "cpus": "{{ user `cpus` }}", "virtualbox_version_file": ".vbox_version", "vm_name": "{{ user `template` }}" }, @@ -32,24 +31,23 @@ "<up><wait><tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], "boot_wait": "10s", + "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "guest_os_type": "oraclelinux-64", "headless": "{{ user `headless` }}", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-vmware", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, - "ssh_username": "vagrant", "ssh_timeout": "10000s", + "ssh_username": "vagrant", "tools_upload_flavor": "linux", "type": "vmware-iso", "vm_name": "{{ user `template` }}", - "memory": "{{ user `memory` }}", - "cpus": "{{ user `cpus` }}", "vmx_data": { "cpuid.coresPerSocket": "1" }, @@ -60,22 +58,21 @@ "<up><wait><tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], "boot_wait": "10s", + "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "guest_os_type": "centos", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-parallels", "parallels_tools_flavor": "lin", - "memory": "{{ user `memory` }}", - "cpus": "{{ user `cpus` }}", "prlctl_version_file": ".prlctl_version", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, - "ssh_username": "vagrant", "ssh_timeout": "10000s", + "ssh_username": "vagrant", "type": "parallels-iso", "vm_name": "{{ user `template` }}" }, @@ -92,8 +89,7 @@ "generation": "{{user `hyperv_generation`}}", "guest_additions_mode": "disable", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-hyperv", @@ -111,20 +107,19 @@ "<up><wait><tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], "boot_wait": "10s", - "memory": "{{ user `memory` }}", "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-qemu", "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, - "ssh_username": "vagrant", "ssh_timeout": "10000s", + "ssh_username": "vagrant", "type": "qemu", "vm_name": "{{ user `template` }}" } @@ -163,17 +158,17 @@ "variables": { "box_basename": "oracle-8.1", "build_directory": "../../builds", - "http_directory": "{{template_dir}}/../centos/http", "build_timestamp": "{{isotime \"2019102650405\"}}", "cpus": "1", "disk_size": "65536", "git_revision": "__unknown_git_revision__", + "guest_additions_url": "", "headless": "", + "http_directory": "{{template_dir}}/../centos/http", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", "hyperv_generation": "1", "hyperv_switch": "{{env `hyperv_switch`}}", - "guest_additions_url": "", "iso_checksum": "8a8afc79c3e30209058201ff91a662b030f13951c7fa4d896f89dd356b3c6f22", "iso_checksum_type": "sha256", "iso_name": "OracleLinux-R8-U1-x86_64-dvd.iso", @@ -187,3 +182,4 @@ "version": "TIMESTAMP" } } + diff --git a/packer_templates/rhel/rhel-5.11-i386.json b/packer_templates/rhel/rhel-5.11-i386.json index 87dbb4462..f0b4060de 100644 --- a/packer_templates/rhel/rhel-5.11-i386.json +++ b/packer_templates/rhel/rhel-5.11-i386.json @@ -5,25 +5,24 @@ "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], "boot_wait": "10s", + "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", - "guest_additions_url": "{{ user `guest_additions_url` }}", "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "guest_additions_url": "{{ user `guest_additions_url` }}", "guest_os_type": "RedHat", "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-virtualbox", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, - "ssh_username": "vagrant", "ssh_timeout": "10000s", + "ssh_username": "vagrant", "type": "virtualbox-iso", - "memory": "{{ user `memory` }}", - "cpus": "{{ user `cpus` }}", "virtualbox_version_file": ".vbox_version", "vm_name": "{{ user `template` }}" }, @@ -32,24 +31,23 @@ "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], "boot_wait": "10s", + "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "guest_os_type": "redhat", "headless": "{{ user `headless` }}", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-vmware", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, - "ssh_username": "vagrant", "ssh_timeout": "10000s", + "ssh_username": "vagrant", "tools_upload_flavor": "linux", "type": "vmware-iso", "vm_name": "{{ user `template` }}", - "memory": "{{ user `memory` }}", - "cpus": "{{ user `cpus` }}", "vmx_data": { "cpuid.coresPerSocket": "1" }, @@ -60,22 +58,21 @@ "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], "boot_wait": "10s", + "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "guest_os_type": "rhel", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-parallels", "parallels_tools_flavor": "lin", - "memory": "{{ user `memory` }}", - "cpus": "{{ user `cpus` }}", "prlctl_version_file": ".prlctl_version", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, - "ssh_username": "vagrant", "ssh_timeout": "10000s", + "ssh_username": "vagrant", "type": "parallels-iso", "vm_name": "{{ user `template` }}" }, @@ -84,20 +81,19 @@ "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], "boot_wait": "10s", - "memory": "{{ user `memory` }}", "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-qemu", "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, - "ssh_username": "vagrant", "ssh_timeout": "10000s", + "ssh_username": "vagrant", "type": "qemu", "vm_name": "{{ user `template` }}" } @@ -135,15 +131,15 @@ "arch": "32", "box_basename": "rhel-5.11-i386", "build_directory": "../../builds", - "http_directory": "{{template_dir}}/../centos/http", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", "disk_size": "65536", "git_revision": "__unknown_git_revision__", + "guest_additions_url": "", "headless": "", + "http_directory": "{{template_dir}}/../centos/http", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", - "guest_additions_url": "", "iso_checksum": "4e38e4ed06d83efb10446e7db19d96761715cdbdbf0bbfacb978b44ce368bbe2", "iso_checksum_type": "sha256", "iso_name": "rhel-server-5.11-i386-dvd.iso", @@ -157,3 +153,4 @@ "version": "TIMESTAMP" } } + diff --git a/packer_templates/rhel/rhel-5.11-x86_64.json b/packer_templates/rhel/rhel-5.11-x86_64.json index fba2895f9..cd4648e93 100644 --- a/packer_templates/rhel/rhel-5.11-x86_64.json +++ b/packer_templates/rhel/rhel-5.11-x86_64.json @@ -5,25 +5,24 @@ "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], "boot_wait": "10s", + "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", - "guest_additions_url": "{{ user `guest_additions_url` }}", "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "guest_additions_url": "{{ user `guest_additions_url` }}", "guest_os_type": "RedHat_64", "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-virtualbox", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, - "ssh_username": "vagrant", "ssh_timeout": "10000s", + "ssh_username": "vagrant", "type": "virtualbox-iso", - "memory": "{{ user `memory` }}", - "cpus": "{{ user `cpus` }}", "vboxmanage": [ [ "modifyvm", @@ -40,24 +39,23 @@ "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], "boot_wait": "10s", + "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "guest_os_type": "rhel5-64", "headless": "{{ user `headless` }}", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-vmware", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, - "ssh_username": "vagrant", "ssh_timeout": "10000s", + "ssh_username": "vagrant", "tools_upload_flavor": "linux", "type": "vmware-iso", "vm_name": "{{ user `template` }}", - "memory": "{{ user `memory` }}", - "cpus": "{{ user `cpus` }}", "vmx_data": { "cpuid.coresPerSocket": "1" }, @@ -68,22 +66,21 @@ "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], "boot_wait": "10s", + "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "guest_os_type": "rhel", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-parallels", "parallels_tools_flavor": "lin", - "memory": "{{ user `memory` }}", - "cpus": "{{ user `cpus` }}", "prlctl_version_file": ".prlctl_version", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, - "ssh_username": "vagrant", "ssh_timeout": "10000s", + "ssh_username": "vagrant", "type": "parallels-iso", "vm_name": "{{ user `template` }}" }, @@ -92,20 +89,19 @@ "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], "boot_wait": "10s", - "memory": "{{ user `memory` }}", "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-qemu", "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, - "ssh_username": "vagrant", "ssh_timeout": "10000s", + "ssh_username": "vagrant", "type": "qemu", "vm_name": "{{ user `template` }}" } @@ -143,15 +139,15 @@ "arch": "64", "box_basename": "rhel-5.11", "build_directory": "../../builds", - "http_directory": "{{template_dir}}/../centos/http", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", "disk_size": "65536", "git_revision": "__unknown_git_revision__", + "guest_additions_url": "", "headless": "", + "http_directory": "{{template_dir}}/../centos/http", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", - "guest_additions_url": "", "iso_checksum": "36565fe0c8a97207d63234d10123daeedb29d509576dbd7b34e71958ac2f9050", "iso_checksum_type": "sha256", "iso_name": "rhel-server-5.11-x86_64-dvd.iso", @@ -165,3 +161,4 @@ "version": "TIMESTAMP" } } + diff --git a/packer_templates/rhel/rhel-6.10-i386.json b/packer_templates/rhel/rhel-6.10-i386.json index a8f1bfebc..7279d9e83 100644 --- a/packer_templates/rhel/rhel-6.10-i386.json +++ b/packer_templates/rhel/rhel-6.10-i386.json @@ -5,25 +5,24 @@ "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], "boot_wait": "10s", + "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", - "guest_additions_url": "{{ user `guest_additions_url` }}", "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "guest_additions_url": "{{ user `guest_additions_url` }}", "guest_os_type": "RedHat", "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-virtualbox", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, - "ssh_username": "vagrant", "ssh_timeout": "10000s", + "ssh_username": "vagrant", "type": "virtualbox-iso", - "memory": "{{ user `memory` }}", - "cpus": "{{ user `cpus` }}", "virtualbox_version_file": ".vbox_version", "vm_name": "{{ user `template` }}" }, @@ -32,24 +31,23 @@ "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], "boot_wait": "10s", + "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "guest_os_type": "redhat", "headless": "{{ user `headless` }}", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-vmware", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, - "ssh_username": "vagrant", "ssh_timeout": "10000s", + "ssh_username": "vagrant", "tools_upload_flavor": "linux", "type": "vmware-iso", "vm_name": "{{ user `template` }}", - "memory": "{{ user `memory` }}", - "cpus": "{{ user `cpus` }}", "vmx_data": { "cpuid.coresPerSocket": "1" }, @@ -60,22 +58,21 @@ "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], "boot_wait": "10s", + "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "guest_os_type": "rhel", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-parallels", "parallels_tools_flavor": "lin", - "memory": "{{ user `memory` }}", - "cpus": "{{ user `cpus` }}", "prlctl_version_file": ".prlctl_version", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, - "ssh_username": "vagrant", "ssh_timeout": "10000s", + "ssh_username": "vagrant", "type": "parallels-iso", "vm_name": "{{ user `template` }}" }, @@ -84,20 +81,19 @@ "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], "boot_wait": "10s", - "memory": "{{ user `memory` }}", "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-qemu", "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, - "ssh_username": "vagrant", "ssh_timeout": "10000s", + "ssh_username": "vagrant", "type": "qemu", "vm_name": "{{ user `template` }}" } @@ -136,15 +132,15 @@ "arch": "32", "box_basename": "rhel-6.10-i386", "build_directory": "../../builds", - "http_directory": "{{template_dir}}/../centos/http", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", "disk_size": "65536", "git_revision": "__unknown_git_revision__", + "guest_additions_url": "", "headless": "", + "http_directory": "{{template_dir}}/../centos/http", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", - "guest_additions_url": "", "iso_checksum": "715c382b2c0484087654281446dce058d9eeb930d7dcc92a2130d52328df87b8", "iso_checksum_type": "sha256", "iso_name": "rhel-server-6.10-i386-dvd.iso", @@ -158,3 +154,4 @@ "version": "TIMESTAMP" } } + diff --git a/packer_templates/rhel/rhel-6.10-x86_64.json b/packer_templates/rhel/rhel-6.10-x86_64.json index 6b9369c34..e1957f01e 100644 --- a/packer_templates/rhel/rhel-6.10-x86_64.json +++ b/packer_templates/rhel/rhel-6.10-x86_64.json @@ -5,25 +5,24 @@ "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], "boot_wait": "10s", + "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", - "guest_additions_url": "{{ user `guest_additions_url` }}", "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "guest_additions_url": "{{ user `guest_additions_url` }}", "guest_os_type": "RedHat_64", "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-virtualbox", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, - "ssh_username": "vagrant", "ssh_timeout": "10000s", + "ssh_username": "vagrant", "type": "virtualbox-iso", - "memory": "{{ user `memory` }}", - "cpus": "{{ user `cpus` }}", "virtualbox_version_file": ".vbox_version", "vm_name": "{{ user `template` }}" }, @@ -32,24 +31,23 @@ "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], "boot_wait": "10s", + "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "guest_os_type": "rhel6-64", "headless": "{{ user `headless` }}", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-vmware", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, - "ssh_username": "vagrant", "ssh_timeout": "10000s", + "ssh_username": "vagrant", "tools_upload_flavor": "linux", "type": "vmware-iso", "vm_name": "{{ user `template` }}", - "memory": "{{ user `memory` }}", - "cpus": "{{ user `cpus` }}", "vmx_data": { "cpuid.coresPerSocket": "1" }, @@ -60,22 +58,21 @@ "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], "boot_wait": "10s", + "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "guest_os_type": "rhel", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-parallels", "parallels_tools_flavor": "lin", - "memory": "{{ user `memory` }}", - "cpus": "{{ user `cpus` }}", "prlctl_version_file": ".prlctl_version", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, - "ssh_username": "vagrant", "ssh_timeout": "10000s", + "ssh_username": "vagrant", "type": "parallels-iso", "vm_name": "{{ user `template` }}" }, @@ -84,20 +81,19 @@ "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], "boot_wait": "10s", - "memory": "{{ user `memory` }}", "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-qemu", "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, - "ssh_username": "vagrant", "ssh_timeout": "10000s", + "ssh_username": "vagrant", "type": "qemu", "vm_name": "{{ user `template` }}" } @@ -136,15 +132,15 @@ "arch": "64", "box_basename": "rhel-6.10", "build_directory": "../../builds", - "http_directory": "{{template_dir}}/../centos/http", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", "disk_size": "65536", "git_revision": "__unknown_git_revision__", + "guest_additions_url": "", "headless": "", + "http_directory": "{{template_dir}}/../centos/http", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", - "guest_additions_url": "", "iso_checksum": "1e15f9202d2cdd4b2bdf9d6503a8543347f0cb8cc06ba9a0dfd2df4fdef5c727", "iso_checksum_type": "sha256", "iso_name": "rhel-server-6.10-x86_64-dvd.iso", @@ -158,3 +154,4 @@ "version": "TIMESTAMP" } } + diff --git a/packer_templates/rhel/rhel-7.6-x86_64.json b/packer_templates/rhel/rhel-7.6-x86_64.json index b2826f942..ffcb87a27 100644 --- a/packer_templates/rhel/rhel-7.6-x86_64.json +++ b/packer_templates/rhel/rhel-7.6-x86_64.json @@ -5,25 +5,24 @@ "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], "boot_wait": "10s", + "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", - "guest_additions_url": "{{ user `guest_additions_url` }}", "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "guest_additions_url": "{{ user `guest_additions_url` }}", "guest_os_type": "RedHat_64", "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-virtualbox", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, - "ssh_username": "vagrant", "ssh_timeout": "10000s", + "ssh_username": "vagrant", "type": "virtualbox-iso", - "memory": "{{ user `memory` }}", - "cpus": "{{ user `cpus` }}", "virtualbox_version_file": ".vbox_version", "vm_name": "{{ user `template` }}" }, @@ -32,24 +31,23 @@ "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], "boot_wait": "10s", + "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "guest_os_type": "rhel7-64", "headless": "{{ user `headless` }}", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-vmware", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, - "ssh_username": "vagrant", "ssh_timeout": "10000s", + "ssh_username": "vagrant", "tools_upload_flavor": "linux", "type": "vmware-iso", "vm_name": "{{ user `template` }}", - "memory": "{{ user `memory` }}", - "cpus": "{{ user `cpus` }}", "vmx_data": { "cpuid.coresPerSocket": "1" }, @@ -60,22 +58,21 @@ "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], "boot_wait": "10s", + "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "guest_os_type": "rhel", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-parallels", "parallels_tools_flavor": "lin", - "memory": "{{ user `memory` }}", - "cpus": "{{ user `cpus` }}", "prlctl_version_file": ".prlctl_version", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, - "ssh_username": "vagrant", "ssh_timeout": "10000s", + "ssh_username": "vagrant", "type": "parallels-iso", "vm_name": "{{ user `template` }}" }, @@ -84,20 +81,19 @@ "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], "boot_wait": "10s", - "memory": "{{ user `memory` }}", "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-qemu", "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, - "ssh_username": "vagrant", "ssh_timeout": "10000s", + "ssh_username": "vagrant", "type": "qemu", "vm_name": "{{ user `template` }}" } @@ -136,15 +132,15 @@ "arch": "64", "box_basename": "rhel-7.6", "build_directory": "../../builds", - "http_directory": "{{template_dir}}/../centos/http", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", "disk_size": "65536", "git_revision": "__unknown_git_revision__", + "guest_additions_url": "", "headless": "", + "http_directory": "{{template_dir}}/../centos/http", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", - "guest_additions_url": "", "iso_checksum": "60a0be5aeed1f08f2bb7599a578c89ec134b4016cd62a8604b29f15d543a469c", "iso_checksum_type": "sha256", "iso_name": "rhel-server-7.6-x86_64-dvd.iso", @@ -158,3 +154,4 @@ "version": "TIMESTAMP" } } + diff --git a/packer_templates/rhel/rhel-8.0-x86_64.json b/packer_templates/rhel/rhel-8.0-x86_64.json index c4313d767..188817c78 100644 --- a/packer_templates/rhel/rhel-8.0-x86_64.json +++ b/packer_templates/rhel/rhel-8.0-x86_64.json @@ -5,25 +5,24 @@ "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], "boot_wait": "10s", + "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", - "guest_additions_url": "{{ user `guest_additions_url` }}", "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "guest_additions_url": "{{ user `guest_additions_url` }}", "guest_os_type": "RedHat_64", "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-virtualbox", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, - "ssh_username": "vagrant", "ssh_timeout": "10000s", + "ssh_username": "vagrant", "type": "virtualbox-iso", - "memory": "{{ user `memory` }}", - "cpus": "{{ user `cpus` }}", "virtualbox_version_file": ".vbox_version", "vm_name": "{{ user `template` }}" }, @@ -32,24 +31,23 @@ "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], "boot_wait": "10s", + "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "guest_os_type": "rhel8-64", "headless": "{{ user `headless` }}", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-vmware", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, - "ssh_username": "vagrant", "ssh_timeout": "10000s", + "ssh_username": "vagrant", "tools_upload_flavor": "linux", "type": "vmware-iso", "vm_name": "{{ user `template` }}", - "memory": "{{ user `memory` }}", - "cpus": "{{ user `cpus` }}", "vmx_data": { "cpuid.coresPerSocket": "1" }, @@ -60,22 +58,21 @@ "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], "boot_wait": "10s", + "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "guest_os_type": "rhel", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-parallels", "parallels_tools_flavor": "lin", - "memory": "{{ user `memory` }}", - "cpus": "{{ user `cpus` }}", "prlctl_version_file": ".prlctl_version", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, - "ssh_username": "vagrant", "ssh_timeout": "10000s", + "ssh_username": "vagrant", "type": "parallels-iso", "vm_name": "{{ user `template` }}" }, @@ -84,20 +81,19 @@ "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], "boot_wait": "10s", - "memory": "{{ user `memory` }}", "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-qemu", "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, - "ssh_username": "vagrant", "ssh_timeout": "10000s", + "ssh_username": "vagrant", "type": "qemu", "vm_name": "{{ user `template` }}" } @@ -136,15 +132,15 @@ "arch": "64", "box_basename": "rhel-8.0", "build_directory": "../../builds", - "http_directory": "{{template_dir}}/../centos/http", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", "disk_size": "65536", "git_revision": "__unknown_git_revision__", + "guest_additions_url": "", "headless": "", + "http_directory": "{{template_dir}}/../centos/http", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", - "guest_additions_url": "", "iso_checksum": "005d4f88fff6d63b0fc01a10822380ef52570edd8834321de7be63002cc6cc43", "iso_checksum_type": "sha256", "iso_name": "rhel-8.0-x86_64-dvd.iso", @@ -158,3 +154,4 @@ "version": "TIMESTAMP" } } + diff --git a/packer_templates/scientificlinux/scientific-7.7-x86_64.json b/packer_templates/scientificlinux/scientific-7.7-x86_64.json index c2e011779..06858bd02 100644 --- a/packer_templates/scientificlinux/scientific-7.7-x86_64.json +++ b/packer_templates/scientificlinux/scientific-7.7-x86_64.json @@ -5,25 +5,24 @@ "<up><wait><tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], "boot_wait": "10s", + "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", - "guest_additions_url": "{{ user `guest_additions_url` }}", "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "guest_additions_url": "{{ user `guest_additions_url` }}", "guest_os_type": "RedHat_64", "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-virtualbox", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, - "ssh_username": "vagrant", "ssh_timeout": "10000s", + "ssh_username": "vagrant", "type": "virtualbox-iso", - "memory": "{{ user `memory` }}", - "cpus": "{{ user `cpus` }}", "virtualbox_version_file": ".vbox_version", "vm_name": "{{ user `template` }}" }, @@ -32,24 +31,23 @@ "<up><wait><tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], "boot_wait": "10s", + "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "guest_os_type": "centos-64", "headless": "{{ user `headless` }}", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-vmware", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, - "ssh_username": "vagrant", "ssh_timeout": "10000s", + "ssh_username": "vagrant", "tools_upload_flavor": "linux", "type": "vmware-iso", "vm_name": "{{ user `template` }}", - "memory": "{{ user `memory` }}", - "cpus": "{{ user `cpus` }}", "vmx_data": { "cpuid.coresPerSocket": "1" }, @@ -60,22 +58,21 @@ "<up><wait><tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], "boot_wait": "10s", + "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "guest_os_type": "centos", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-parallels", "parallels_tools_flavor": "lin", - "memory": "{{ user `memory` }}", - "cpus": "{{ user `cpus` }}", "prlctl_version_file": ".prlctl_version", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, - "ssh_username": "vagrant", "ssh_timeout": "10000s", + "ssh_username": "vagrant", "type": "parallels-iso", "vm_name": "{{ user `template` }}" }, @@ -92,8 +89,7 @@ "generation": "{{user `hyperv_generation`}}", "guest_additions_mode": "disable", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-hyperv", @@ -111,20 +107,19 @@ "<up><wait><tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], "boot_wait": "10s", - "memory": "{{ user `memory` }}", "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-qemu", "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, - "ssh_username": "vagrant", "ssh_timeout": "10000s", + "ssh_username": "vagrant", "type": "qemu", "vm_name": "{{ user `template` }}" } @@ -163,17 +158,17 @@ "variables": { "box_basename": "scientific-7.7", "build_directory": "../../builds", - "http_directory": "{{template_dir}}/http", "build_timestamp": "{{isotime \"20080506150405\"}}", "cpus": "1", "disk_size": "65536", "git_revision": "__unknown_git_revision__", + "guest_additions_url": "", "headless": "", + "http_directory": "{{template_dir}}/http", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", "hyperv_generation": "1", "hyperv_switch": "{{env `hyperv_switch`}}", - "guest_additions_url": "", "iso_checksum": "4490f72797834a958396af929c0da6a97a69049eddbfe969a8903b5ce0fddb99", "iso_checksum_type": "sha256", "iso_name": "SL-7-DVD-x86_64.iso", @@ -187,3 +182,4 @@ "version": "TIMESTAMP" } } + diff --git a/packer_templates/sles/sles-11-sp4-x86_64.json b/packer_templates/sles/sles-11-sp4-x86_64.json index c11a86573..d50484078 100644 --- a/packer_templates/sles/sles-11-sp4-x86_64.json +++ b/packer_templates/sles/sles-11-sp4-x86_64.json @@ -9,25 +9,24 @@ "<enter><wait>" ], "boot_wait": "10s", + "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", - "guest_additions_url": "{{ user `guest_additions_url` }}", "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "guest_additions_url": "{{ user `guest_additions_url` }}", "guest_os_type": "OpenSUSE_64", "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `iso_name`}}", + "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-virtualbox", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, - "ssh_username": "vagrant", "ssh_timeout": "10000s", + "ssh_username": "vagrant", "type": "virtualbox-iso", - "memory": "{{ user `memory` }}", - "cpus": "{{ user `cpus` }}", "virtualbox_version_file": ".vbox_version", "vm_name": "{{ user `template` }}" }, @@ -40,24 +39,23 @@ "<enter><wait>" ], "boot_wait": "10s", + "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "guest_os_type": "sles11-64", "headless": "{{ user `headless` }}", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `iso_name`}}", + "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-vmware", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, - "ssh_username": "vagrant", "ssh_timeout": "10000s", + "ssh_username": "vagrant", "tools_upload_flavor": "linux", "type": "vmware-iso", "vm_name": "{{ user `template` }}", - "memory": "{{ user `memory` }}", - "cpus": "{{ user `cpus` }}", "vmx_data": { "cpuid.coresPerSocket": "1" }, @@ -72,22 +70,21 @@ "<enter><wait>" ], "boot_wait": "10s", + "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "guest_os_type": "suse", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `iso_name`}}", + "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-parallels", "parallels_tools_flavor": "lin", - "memory": "{{ user `memory` }}", - "cpus": "{{ user `cpus` }}", "prlctl_version_file": ".prlctl_version", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, - "ssh_username": "vagrant", "ssh_timeout": "10000s", + "ssh_username": "vagrant", "type": "parallels-iso", "vm_name": "{{ user `template` }}" }, @@ -100,20 +97,19 @@ "<enter><wait>" ], "boot_wait": "10s", - "memory": "{{ user `memory` }}", "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `iso_name`}}", + "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-qemu", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, - "ssh_username": "vagrant", "ssh_timeout": "10000s", + "ssh_username": "vagrant", "type": "qemu", "vm_name": "{{ user `template` }}" } @@ -157,15 +153,15 @@ "autoinst_cfg": "sles-11-sp4-x86_64-autoinst.xml", "box_basename": "sles-11-sp4", "build_directory": "../../builds", - "http_directory": "{{template_dir}}/http", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", "disk_size": "65536", "git_revision": "__unknown_git_revision__", + "guest_additions_url": "", "headless": "", + "http_directory": "{{template_dir}}/http", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", - "guest_additions_url": "", "iso_checksum": "4fbf22201876d571c719328f385d87d6d690fb3ceb5e093108cdf0373c43e855", "iso_checksum_type": "sha256", "iso_name": "SLES-11-SP4-DVD-x86_64-GM-DVD1.iso", @@ -176,3 +172,4 @@ "version": "TIMESTAMP" } } + diff --git a/packer_templates/sles/sles-12-sp2-x86_64.json b/packer_templates/sles/sles-12-sp2-x86_64.json index be4c1c86e..6b64c094d 100644 --- a/packer_templates/sles/sles-12-sp2-x86_64.json +++ b/packer_templates/sles/sles-12-sp2-x86_64.json @@ -9,25 +9,24 @@ "<enter><wait>" ], "boot_wait": "10s", + "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", - "guest_additions_url": "{{ user `guest_additions_url` }}", "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "guest_additions_url": "{{ user `guest_additions_url` }}", "guest_os_type": "OpenSUSE_64", "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `iso_name`}}", + "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-virtualbox", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, - "ssh_username": "vagrant", "ssh_timeout": "10000s", + "ssh_username": "vagrant", "type": "virtualbox-iso", - "memory": "{{ user `memory` }}", - "cpus": "{{ user `cpus` }}", "virtualbox_version_file": ".vbox_version", "vm_name": "{{ user `template` }}" }, @@ -40,24 +39,23 @@ "<enter><wait>" ], "boot_wait": "10s", + "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "guest_os_type": "sles12-64", "headless": "{{ user `headless` }}", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `iso_name`}}", + "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-vmware", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, - "ssh_username": "vagrant", "ssh_timeout": "10000s", + "ssh_username": "vagrant", "tools_upload_flavor": "linux", "type": "vmware-iso", "vm_name": "{{ user `template` }}", - "memory": "{{ user `memory` }}", - "cpus": "{{ user `cpus` }}", "vmx_data": { "cpuid.coresPerSocket": "1" }, @@ -72,22 +70,21 @@ "<enter><wait>" ], "boot_wait": "10s", + "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "guest_os_type": "suse", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `iso_name`}}", + "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-parallels", "parallels_tools_flavor": "lin", - "memory": "{{ user `memory` }}", - "cpus": "{{ user `cpus` }}", "prlctl_version_file": ".prlctl_version", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, - "ssh_username": "vagrant", "ssh_timeout": "10000s", + "ssh_username": "vagrant", "type": "parallels-iso", "vm_name": "{{ user `template` }}" }, @@ -100,20 +97,19 @@ "<enter><wait>" ], "boot_wait": "10s", - "memory": "{{ user `memory` }}", "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `iso_name`}}", + "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-qemu", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, - "ssh_username": "vagrant", "ssh_timeout": "10000s", + "ssh_username": "vagrant", "type": "qemu", "vm_name": "{{ user `template` }}" } @@ -158,15 +154,15 @@ "autoinst_cfg": "sles-12-sp2-x86_64-autoinst.xml", "box_basename": "sles-12-sp2", "build_directory": "../../builds", - "http_directory": "{{template_dir}}/http", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", "disk_size": "65536", "git_revision": "__unknown_git_revision__", + "guest_additions_url": "", "headless": "", + "http_directory": "{{template_dir}}/http", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", - "guest_additions_url": "", "iso_checksum": "dd724e9248f2c3507e8e9d0050a4c8b6e9aeda7fdf0870858757cc6c01b7d47d", "iso_checksum_type": "sha256", "iso_name": "SLE-12-SP2-Server-DVD-x86_64-GM-DVD1.iso", @@ -177,3 +173,4 @@ "version": "TIMESTAMP" } } + diff --git a/packer_templates/sles/sles-12-sp3-x86_64.json b/packer_templates/sles/sles-12-sp3-x86_64.json index e2e95f802..34647ed19 100644 --- a/packer_templates/sles/sles-12-sp3-x86_64.json +++ b/packer_templates/sles/sles-12-sp3-x86_64.json @@ -9,25 +9,24 @@ "<enter><wait>" ], "boot_wait": "10s", + "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", - "guest_additions_url": "{{ user `guest_additions_url` }}", "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "guest_additions_url": "{{ user `guest_additions_url` }}", "guest_os_type": "OpenSUSE_64", "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `iso_name`}}", + "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-virtualbox", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, - "ssh_username": "vagrant", "ssh_timeout": "10000s", + "ssh_username": "vagrant", "type": "virtualbox-iso", - "memory": "{{ user `memory` }}", - "cpus": "{{ user `cpus` }}", "virtualbox_version_file": ".vbox_version", "vm_name": "{{ user `template` }}" }, @@ -40,24 +39,23 @@ "<enter><wait>" ], "boot_wait": "10s", + "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "guest_os_type": "sles12-64", "headless": "{{ user `headless` }}", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `iso_name`}}", + "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-vmware", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, - "ssh_username": "vagrant", "ssh_timeout": "10000s", + "ssh_username": "vagrant", "tools_upload_flavor": "linux", "type": "vmware-iso", "vm_name": "{{ user `template` }}", - "memory": "{{ user `memory` }}", - "cpus": "{{ user `cpus` }}", "vmx_data": { "cpuid.coresPerSocket": "1" }, @@ -72,22 +70,21 @@ "<enter><wait>" ], "boot_wait": "10s", + "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "guest_os_type": "suse", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `iso_name`}}", + "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-parallels", "parallels_tools_flavor": "lin", - "memory": "{{ user `memory` }}", - "cpus": "{{ user `cpus` }}", "prlctl_version_file": ".prlctl_version", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, - "ssh_username": "vagrant", "ssh_timeout": "10000s", + "ssh_username": "vagrant", "type": "parallels-iso", "vm_name": "{{ user `template` }}" }, @@ -100,20 +97,19 @@ "<enter><wait>" ], "boot_wait": "10s", - "memory": "{{ user `memory` }}", "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `iso_name`}}", + "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-qemu", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, - "ssh_username": "vagrant", "ssh_timeout": "10000s", + "ssh_username": "vagrant", "type": "qemu", "vm_name": "{{ user `template` }}" } @@ -158,15 +154,15 @@ "autoinst_cfg": "sles-12-sp3-x86_64-autoinst.xml", "box_basename": "sles-12-sp3", "build_directory": "../../builds", - "http_directory": "{{template_dir}}/http", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", "disk_size": "65536", "git_revision": "__unknown_git_revision__", + "guest_additions_url": "", "headless": "", + "http_directory": "{{template_dir}}/http", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", - "guest_additions_url": "", "iso_checksum": "48408157ef667100671b22f92c3e20771ccf2100108b96e3ae83d8df30abddd5", "iso_checksum_type": "sha256", "iso_name": "SLE-12-SP3-Server-DVD-x86_64-GM-DVD1.iso", @@ -177,3 +173,4 @@ "version": "TIMESTAMP" } } + diff --git a/packer_templates/sles/sles-15-sp1.json b/packer_templates/sles/sles-15-sp1.json index e11d1d37a..4a16a9738 100644 --- a/packer_templates/sles/sles-15-sp1.json +++ b/packer_templates/sles/sles-15-sp1.json @@ -9,25 +9,24 @@ "<enter><wait>" ], "boot_wait": "10s", + "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", - "guest_additions_url": "{{ user `guest_additions_url` }}", "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "guest_additions_url": "{{ user `guest_additions_url` }}", "guest_os_type": "OpenSUSE_64", "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `iso_name`}}", + "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-virtualbox", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, - "ssh_username": "vagrant", "ssh_timeout": "10000s", + "ssh_username": "vagrant", "type": "virtualbox-iso", - "memory": "{{ user `memory` }}", - "cpus": "{{ user `cpus` }}", "vboxmanage": [ [ "storageattach", @@ -56,24 +55,23 @@ "<enter><wait>" ], "boot_wait": "10s", + "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "guest_os_type": "sles12-64", "headless": "{{ user `headless` }}", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `iso_name`}}", + "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-vmware", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, - "ssh_username": "vagrant", "ssh_timeout": "10000s", + "ssh_username": "vagrant", "tools_upload_flavor": "linux", "type": "vmware-iso", "vm_name": "{{ user `template` }}", - "memory": "{{ user `memory` }}", - "cpus": "{{ user `cpus` }}", "vmx_data": { "cpuid.coresPerSocket": "1" }, @@ -88,22 +86,21 @@ "<enter><wait>" ], "boot_wait": "10s", + "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "guest_os_type": "suse", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `iso_name`}}", + "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-parallels", "parallels_tools_flavor": "lin", - "memory": "{{ user `memory` }}", - "cpus": "{{ user `cpus` }}", "prlctl_version_file": ".prlctl_version", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, - "ssh_username": "vagrant", "ssh_timeout": "10000s", + "ssh_username": "vagrant", "type": "parallels-iso", "vm_name": "{{ user `template` }}" }, @@ -116,30 +113,43 @@ "<enter><wait>" ], "boot_wait": "10s", - "memory": "{{ user `memory` }}", "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `iso_name`}}", + "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-qemu", + "qemuargs": [ + [ + "-drive", + "file=../../builds/packer-{{user `template`}}-qemu/{{user `template`}},if=virtio,cache=writeback,discard=ignore,format=qcow2" + ], + [ + "-drive", + "file={{user `mirror`}}/{{user `packages_iso`}},format=raw,if=none,id=cdrom1,readonly=on" + ], + [ + "-object", + "iothread,id=iothread1" + ], + [ + "-device", + "virtio-scsi-pci,iothread=iothread1,id=scsi1" + ], + [ + "-device", + "scsi-cd,bus=scsi1.0,drive=cdrom1" + ] + ], "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, - "ssh_username": "vagrant", "ssh_timeout": "10000s", + "ssh_username": "vagrant", "type": "qemu", - "vm_name": "{{ user `template` }}", - "qemuargs": [ - ["-drive", "file=../../builds/packer-{{user `template`}}-qemu/{{user `template`}},if=virtio,cache=writeback,discard=ignore,format=qcow2"], - ["-drive", "file={{user `mirror`}}/{{user `packages_iso`}},format=raw,if=none,id=cdrom1,readonly=on"], - ["-object", "iothread,id=iothread1"], - ["-device", "virtio-scsi-pci,iothread=iothread1,id=scsi1"], - ["-device", "scsi-cd,bus=scsi1.0,drive=cdrom1"] - ] - + "vm_name": "{{ user `template` }}" } ], "post-processors": [ @@ -182,15 +192,15 @@ "autoinst_cfg": "sles-15-sp1-x86_64-autoinst.xml", "box_basename": "sles-15-sp1", "build_directory": "../../builds", - "http_directory": "{{template_dir}}/http", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", "disk_size": "65536", "git_revision": "__unknown_git_revision__", + "guest_additions_url": "", "headless": "", + "http_directory": "{{template_dir}}/http", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", - "guest_additions_url": "", "iso_checksum": "5787b180a60a8d52bc42ddb8c51884ca4263f5ed47dc10bb72229a49e8b07497", "iso_checksum_type": "sha256", "iso_name": "SLE-15-SP1-Installer-DVD-x86_64-GM-DVD1.iso", @@ -202,3 +212,4 @@ "version": "TIMESTAMP" } } + diff --git a/packer_templates/sles/sles-15.json b/packer_templates/sles/sles-15.json index 8e240c697..59963db54 100644 --- a/packer_templates/sles/sles-15.json +++ b/packer_templates/sles/sles-15.json @@ -9,25 +9,24 @@ "<enter><wait>" ], "boot_wait": "10s", + "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", - "guest_additions_url": "{{ user `guest_additions_url` }}", "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "guest_additions_url": "{{ user `guest_additions_url` }}", "guest_os_type": "OpenSUSE_64", "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `iso_name`}}", + "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-virtualbox", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, - "ssh_username": "vagrant", "ssh_timeout": "10000s", + "ssh_username": "vagrant", "type": "virtualbox-iso", - "memory": "{{ user `memory` }}", - "cpus": "{{ user `cpus` }}", "vboxmanage": [ [ "storageattach", @@ -56,24 +55,23 @@ "<enter><wait>" ], "boot_wait": "10s", + "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "guest_os_type": "sles12-64", "headless": "{{ user `headless` }}", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `iso_name`}}", + "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-vmware", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, - "ssh_username": "vagrant", "ssh_timeout": "10000s", + "ssh_username": "vagrant", "tools_upload_flavor": "linux", "type": "vmware-iso", "vm_name": "{{ user `template` }}", - "memory": "{{ user `memory` }}", - "cpus": "{{ user `cpus` }}", "vmx_data": { "cpuid.coresPerSocket": "1" }, @@ -88,22 +86,21 @@ "<enter><wait>" ], "boot_wait": "10s", + "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "guest_os_type": "suse", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `iso_name`}}", + "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-parallels", "parallels_tools_flavor": "lin", - "memory": "{{ user `memory` }}", - "cpus": "{{ user `cpus` }}", "prlctl_version_file": ".prlctl_version", "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, - "ssh_username": "vagrant", "ssh_timeout": "10000s", + "ssh_username": "vagrant", "type": "parallels-iso", "vm_name": "{{ user `template` }}" }, @@ -116,29 +113,43 @@ "<enter><wait>" ], "boot_wait": "10s", - "memory": "{{ user `memory` }}", "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `iso_name`}}", + "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-qemu", + "qemuargs": [ + [ + "-drive", + "file=../../builds/packer-{{user `template`}}-qemu/{{user `template`}},if=virtio,cache=writeback,discard=ignore,format=qcow2" + ], + [ + "-drive", + "file={{user `mirror`}}/{{user `packages_iso`}},format=raw,if=none,id=cdrom1,readonly=on" + ], + [ + "-object", + "iothread,id=iothread1" + ], + [ + "-device", + "virtio-scsi-pci,iothread=iothread1,id=scsi1" + ], + [ + "-device", + "scsi-cd,bus=scsi1.0,drive=cdrom1" + ] + ], "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, - "ssh_username": "vagrant", "ssh_timeout": "10000s", + "ssh_username": "vagrant", "type": "qemu", - "vm_name": "{{ user `template` }}", - "qemuargs": [ - ["-drive", "file=../../builds/packer-{{user `template`}}-qemu/{{user `template`}},if=virtio,cache=writeback,discard=ignore,format=qcow2"], - ["-drive", "file={{user `mirror`}}/{{user `packages_iso`}},format=raw,if=none,id=cdrom1,readonly=on"], - ["-object", "iothread,id=iothread1"], - ["-device", "virtio-scsi-pci,iothread=iothread1,id=scsi1"], - ["-device", "scsi-cd,bus=scsi1.0,drive=cdrom1"] - ] + "vm_name": "{{ user `template` }}" } ], "post-processors": [ @@ -181,15 +192,15 @@ "autoinst_cfg": "sles-15-x86_64-autoinst.xml", "box_basename": "sles-15", "build_directory": "../../builds", - "http_directory": "{{template_dir}}/http", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", "disk_size": "65536", "git_revision": "__unknown_git_revision__", + "guest_additions_url": "", "headless": "", + "http_directory": "{{template_dir}}/http", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", - "guest_additions_url": "", "iso_checksum": "06bd8b78ef0ca6d5ff5000688727953e894805dc3de59060d74441f0fd0539ab", "iso_checksum_type": "sha256", "iso_name": "SLE-15-Installer-DVD-x86_64-GM-DVD1.iso", @@ -201,3 +212,4 @@ "version": "TIMESTAMP" } } + diff --git a/packer_templates/solaris/solaris-11-4-x86.json b/packer_templates/solaris/solaris-11-4-x86.json index 681689c1d..0b415c55f 100644 --- a/packer_templates/solaris/solaris-11-4-x86.json +++ b/packer_templates/solaris/solaris-11-4-x86.json @@ -14,10 +14,10 @@ "root<enter><wait><wait>", "solaris<enter><wait><wait>", "<wait10>", - "while (true); do sleep 5; test -f /a/etc/sudoers && grep -v \"vagrant\" \"/a/etc/sudoers\" 2> /dev/null<wait>", - " && echo \"vagrant ALL=(ALL) NOPASSWD: ALL\" >> /a/etc/sudoers && break ; done &<enter><wait>", + "while (true); do sleep 5; test -f /a/etc/sudoers \u0026\u0026 grep -v \"vagrant\" \"/a/etc/sudoers\" 2> /dev/null<wait>", + " \u0026\u0026 echo \"vagrant ALL=(ALL) NOPASSWD: ALL\" >> /a/etc/sudoers \u0026\u0026 break ; done \u0026<enter><wait>", "<enter>while (true); do grep \"You may wish to reboot\" \"/var/svc/log/application-auto-installer:default.log\" 2> /dev/null<wait>", - " && reboot; sleep 10; done &<enter><wait>", + " \u0026\u0026 reboot; sleep 10; done \u0026<enter><wait>", "sleep 5; curl http://{{ .HTTPIP }}:{{ .HTTPPort }}/default.xml -o default.xml;<wait>", "curl http://{{ .HTTPIP }}:{{ .HTTPPort }}/profile.xml -o profile.xml;<wait>", "cp default.xml /system/volatile/ai.xml;<wait>", @@ -27,28 +27,27 @@ "<enter><wait10><wait><wait>", "<enter><wait>", "tail -f /var/svc/log/application-auto-installer\\:default.log<enter><wait>", - "<leftCtrlOn>r<leftCtrlOff>" + "<leftCtrlOn>r<leftCtrlOff>" ], "boot_wait": "5s", + "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "guest_additions_mode": "attach", "guest_additions_url": "{{ user `guest_additions_url` }}", "guest_os_type": "Solaris11_64", "headless": "{{ user `headless` }}", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "e3a29507e583acbc0b912f371c8f328fea7cb6257d587cbc0a651477a52b0a29", - "iso_checksum_type": "sha256", + "iso_checksum": "sha256:e3a29507e583acbc0b912f371c8f328fea7cb6257d587cbc0a651477a52b0a29", "iso_url": "{{user `mirror`}}/sol-11_4-ai-x86.iso", + "memory": "{{ user `memory` }}", "output_directory": "packer-solaris-11.4-x86_64-virtualbox", "shutdown_command": "echo 'vagrant'|sudo -i init 5", "shutdown_timeout": "10m", "ssh_password": "vagrant", "ssh_port": 22, - "ssh_username": "vagrant", "ssh_timeout": "10000s", + "ssh_username": "vagrant", "type": "virtualbox-iso", - "memory": "{{ user `memory` }}", - "cpus": "{{ user `cpus` }}", "virtualbox_version_file": ".vbox_version", "vm_name": "{{ user `template` }}" }, @@ -66,10 +65,10 @@ "root<enter><wait><wait>", "solaris<enter><wait><wait>", "<wait10>", - "while (true); do sleep 5; test -f /a/etc/sudoers && grep -v \"vagrant\" \"/a/etc/sudoers\" 2> /dev/null<wait>", - " && echo \"vagrant ALL=(ALL) NOPASSWD: ALL\" >> /a/etc/sudoers && break ; done &<enter><wait>", + "while (true); do sleep 5; test -f /a/etc/sudoers \u0026\u0026 grep -v \"vagrant\" \"/a/etc/sudoers\" 2> /dev/null<wait>", + " \u0026\u0026 echo \"vagrant ALL=(ALL) NOPASSWD: ALL\" >> /a/etc/sudoers \u0026\u0026 break ; done \u0026<enter><wait>", "<enter>while (true); do grep \"You may wish to reboot\" \"/var/svc/log/application-auto-installer:default.log\" 2> /dev/null<wait>", - " && reboot; sleep 10; done &<enter><wait>", + " \u0026\u0026 reboot; sleep 10; done \u0026<enter><wait>", "sleep 5; curl http://{{ .HTTPIP }}:{{ .HTTPPort }}/default.xml -o default.xml;<wait>", "curl http://{{ .HTTPIP }}:{{ .HTTPPort }}/profile.xml -o profile.xml;<wait>", "cp default.xml /system/volatile/ai.xml;<wait>", @@ -81,24 +80,23 @@ "tail -f /var/svc/log/application-auto-installer\\:default.log<enter><wait>" ], "boot_wait": "5s", + "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "guest_os_type": "solaris11-64", "headless": "{{ user `headless` }}", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "e3a29507e583acbc0b912f371c8f328fea7cb6257d587cbc0a651477a52b0a29", - "iso_checksum_type": "sha256", + "iso_checksum": "sha256:e3a29507e583acbc0b912f371c8f328fea7cb6257d587cbc0a651477a52b0a29", "iso_url": "{{user `mirror`}}/sol-11_4-ai-x86.iso", + "memory": "{{ user `memory` }}", "output_directory": "packer-solaris-11.4-x86_64-vmware", "shutdown_command": "echo 'vagrant'|sudo -i init 5", "shutdown_timeout": "10m", "ssh_password": "vagrant", "ssh_port": 22, - "ssh_username": "vagrant", "ssh_timeout": "10000s", + "ssh_username": "vagrant", "type": "vmware-iso", "vm_name": "{{ user `template` }}", - "memory": "{{ user `memory` }}", - "cpus": "{{ user `cpus` }}", "vmx_data": { "cpuid.coresPerSocket": "1" }, @@ -131,13 +129,13 @@ "arch": "64", "box_basename": "solaris-11.4", "build_directory": "../../builds", - "http_directory": "{{template_dir}}/http", "build_timestamp": "{{isotime \"20200222210405\"}}", - "guest_additions_url": "", "cpus": "1", "disk_size": "65536", "git_revision": "__unknown_git_revision__", + "guest_additions_url": "", "headless": "", + "http_directory": "{{template_dir}}/http", "memory": "4096", "mirror": "./packer_cache", "name": "solaris-11.4", @@ -145,3 +143,4 @@ "version": "TIMESTAMP" } } + diff --git a/packer_templates/solaris/solaris-11-x86.json b/packer_templates/solaris/solaris-11-x86.json index 45954cf02..14bd84ace 100644 --- a/packer_templates/solaris/solaris-11-x86.json +++ b/packer_templates/solaris/solaris-11-x86.json @@ -14,10 +14,10 @@ "root<enter><wait><wait>", "solaris<enter><wait><wait>", "<wait10>", - "while (true); do sleep 5; test -f /a/etc/sudoers && grep -v \"vagrant\" \"/a/etc/sudoers\" 2> /dev/null<wait>", - " && echo \"vagrant ALL=(ALL) NOPASSWD: ALL\" >> /a/etc/sudoers && break ; done &<enter><wait>", + "while (true); do sleep 5; test -f /a/etc/sudoers \u0026\u0026 grep -v \"vagrant\" \"/a/etc/sudoers\" 2> /dev/null<wait>", + " \u0026\u0026 echo \"vagrant ALL=(ALL) NOPASSWD: ALL\" >> /a/etc/sudoers \u0026\u0026 break ; done \u0026<enter><wait>", "<enter>while (true); do grep \"You may wish to reboot\" \"/var/svc/log/application-auto-installer:default.log\" 2> /dev/null<wait>", - " && reboot; sleep 10; done &<enter><wait>", + " \u0026\u0026 reboot; sleep 10; done \u0026<enter><wait>", "sleep 5; curl http://{{ .HTTPIP }}:{{ .HTTPPort }}/default.xml -o default.xml;<wait>", "curl http://{{ .HTTPIP }}:{{ .HTTPPort }}/profile.xml -o profile.xml;<wait>", "cp default.xml /system/volatile/ai.xml;<wait>", @@ -29,25 +29,24 @@ "tail -f /var/svc/log/application-auto-installer\\:default.log<enter><wait>" ], "boot_wait": "5s", + "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "guest_additions_mode": "attach", "guest_additions_url": "{{ user `guest_additions_url` }}", "guest_os_type": "Solaris11_64", "headless": "{{ user `headless` }}", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "30d9ae857f62938c21307722d031e0dc", - "iso_checksum_type": "md5", + "iso_checksum": "md5:30d9ae857f62938c21307722d031e0dc", "iso_url": "{{user `mirror`}}/sol-11_3-ai-x86.iso", + "memory": "{{ user `memory` }}", "output_directory": "packer-solaris-11.3-x86_64-virtualbox", "shutdown_command": "echo 'vagrant'|sudo -i init 5", "shutdown_timeout": "10m", "ssh_password": "vagrant", "ssh_port": 22, - "ssh_username": "vagrant", "ssh_timeout": "10000s", + "ssh_username": "vagrant", "type": "virtualbox-iso", - "memory": "{{ user `memory` }}", - "cpus": "{{ user `cpus` }}", "virtualbox_version_file": ".vbox_version", "vm_name": "{{ user `template` }}" }, @@ -65,10 +64,10 @@ "root<enter><wait><wait>", "solaris<enter><wait><wait>", "<wait10>", - "while (true); do sleep 5; test -f /a/etc/sudoers && grep -v \"vagrant\" \"/a/etc/sudoers\" 2> /dev/null<wait>", - " && echo \"vagrant ALL=(ALL) NOPASSWD: ALL\" >> /a/etc/sudoers && break ; done &<enter><wait>", + "while (true); do sleep 5; test -f /a/etc/sudoers \u0026\u0026 grep -v \"vagrant\" \"/a/etc/sudoers\" 2> /dev/null<wait>", + " \u0026\u0026 echo \"vagrant ALL=(ALL) NOPASSWD: ALL\" >> /a/etc/sudoers \u0026\u0026 break ; done \u0026<enter><wait>", "<enter>while (true); do grep \"You may wish to reboot\" \"/var/svc/log/application-auto-installer:default.log\" 2> /dev/null<wait>", - " && reboot; sleep 10; done &<enter><wait>", + " \u0026\u0026 reboot; sleep 10; done \u0026<enter><wait>", "sleep 5; curl http://{{ .HTTPIP }}:{{ .HTTPPort }}/default.xml -o default.xml;<wait>", "curl http://{{ .HTTPIP }}:{{ .HTTPPort }}/profile.xml -o profile.xml;<wait>", "cp default.xml /system/volatile/ai.xml;<wait>", @@ -80,24 +79,23 @@ "tail -f /var/svc/log/application-auto-installer\\:default.log<enter><wait>" ], "boot_wait": "5s", + "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "guest_os_type": "solaris11-64", "headless": "{{ user `headless` }}", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "30d9ae857f62938c21307722d031e0dc", - "iso_checksum_type": "md5", + "iso_checksum": "md5:30d9ae857f62938c21307722d031e0dc", "iso_url": "{{user `mirror`}}/sol-11_3-ai-x86.iso", + "memory": "{{ user `memory` }}", "output_directory": "packer-solaris-11.3-x86_64-vmware", "shutdown_command": "echo 'vagrant'|sudo -i init 5", "shutdown_timeout": "10m", "ssh_password": "vagrant", "ssh_port": 22, - "ssh_username": "vagrant", "ssh_timeout": "10000s", + "ssh_username": "vagrant", "type": "vmware-iso", "vm_name": "{{ user `template` }}", - "memory": "{{ user `memory` }}", - "cpus": "{{ user `cpus` }}", "vmx_data": { "cpuid.coresPerSocket": "1" }, @@ -130,13 +128,13 @@ "arch": "64", "box_basename": "solaris-11.3", "build_directory": "../../builds", - "http_directory": "{{template_dir}}/http", "build_timestamp": "{{isotime \"20060102150405\"}}", - "guest_additions_url": "", "cpus": "1", "disk_size": "65536", "git_revision": "__unknown_git_revision__", + "guest_additions_url": "", "headless": "", + "http_directory": "{{template_dir}}/http", "memory": "2048", "mirror": "./packer_cache", "name": "solaris-11.3", @@ -144,3 +142,4 @@ "version": "TIMESTAMP" } } + diff --git a/packer_templates/windows/windows-10.json b/packer_templates/windows/windows-10.json index a92ef4ece..564b810d9 100644 --- a/packer_templates/windows/windows-10.json +++ b/packer_templates/windows/windows-10.json @@ -1,136 +1,171 @@ { - "builders": [{ - "type": "hyperv-iso", - "switch_name": "{{user `hyperv_switch`}}", - "memory": "{{ user `memory` }}", + "builders": [ + { + "communicator": "winrm", "cpus": "{{ user `cpus` }}", + "floppy_files": [ + "{{ user `floppy_dir` }}/{{ user `unattended_file_path` }}", + "{{template_dir}}/scripts/base_setup.ps1" + ], "headless": "{{ user `headless` }}", + "iso_checksum": "sha1:{{ user `iso_checksum` }}", "iso_url": "{{ user `iso_url` }}", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "sha1", + "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-virtualbox", - "communicator": "winrm", - "winrm_username": "vagrant", - "winrm_password": "vagrant", - "winrm_timeout": "12h", "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"", "shutdown_timeout": "15m", + "switch_name": "{{user `hyperv_switch`}}", + "type": "hyperv-iso", + "winrm_password": "vagrant", + "winrm_timeout": "12h", + "winrm_username": "vagrant" + }, + { + "communicator": "winrm", + "cpus": "{{ user `cpus` }}", "floppy_files": [ "{{ user `floppy_dir` }}/{{ user `unattended_file_path` }}", "{{template_dir}}/scripts/base_setup.ps1" - ] - }, - { - "type": "virtualbox-iso", - "vboxmanage": [ - ["modifyvm", "{{.Name}}", "--vram", "48"], - ["modifyvm", "{{.Name}}", "--audio", "none"] ], - "memory": "{{ user `memory` }}", - "cpus": "{{ user `cpus` }}", "guest_additions_mode": "{{ user `guest_additions_mode` }}", - "guest_additions_url": "{{ user `guest_additions_url` }}", "guest_additions_path": "C:/users/vagrant/VBoxGuestAdditions.iso", + "guest_additions_url": "{{ user `guest_additions_url` }}", "guest_os_type": "Windows10_64", "hard_drive_interface": "sata", - "iso_interface": "sata", "headless": "{{ user `headless` }}", + "iso_checksum": "sha1:{{ user `iso_checksum` }}", + "iso_interface": "sata", "iso_url": "{{ user `iso_url` }}", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "sha1", + "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-virtualbox", - "communicator": "winrm", - "winrm_username": "vagrant", - "winrm_password": "vagrant", - "winrm_timeout": "12h", "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"", "shutdown_timeout": "15m", - "floppy_files": [ - "{{ user `floppy_dir` }}/{{ user `unattended_file_path` }}", - "{{template_dir}}/scripts/base_setup.ps1" - ] + "type": "virtualbox-iso", + "vboxmanage": [ + [ + "modifyvm", + "{{.Name}}", + "--vram", + "48" + ], + [ + "modifyvm", + "{{.Name}}", + "--audio", + "none" + ] + ], + "winrm_password": "vagrant", + "winrm_timeout": "12h", + "winrm_username": "vagrant" }, { - "type": "parallels-iso", - "memory": "{{ user `memory` }}", + "communicator": "winrm", "cpus": "{{ user `cpus` }}", + "floppy_files": [ + "{{ user `floppy_dir` }}/{{ user `unattended_file_path` }}", + "{{template_dir}}/scripts/base_setup.ps1" + ], "guest_os_type": "win-10", + "iso_checksum": "sha1:{{ user `iso_checksum` }}", "iso_url": "{{ user `iso_url` }}", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "sha1", + "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-parallels", "parallels_tools_flavor": "win", - "parallels_tools_mode" : "attach", + "parallels_tools_mode": "attach", + "prlctl": [ + [ + "set", + "{{.Name}}", + "--efi-boot", + "off" + ] + ], "prlctl_version_file": ".prlctl_version", - "communicator": "winrm", - "winrm_username": "vagrant", - "winrm_password": "vagrant", - "winrm_timeout": "12h", "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"", "shutdown_timeout": "15m", - "prlctl": [ - ["set", "{{.Name}}", "--efi-boot", "off"] - ], - "floppy_files": [ - "{{ user `floppy_dir` }}/{{ user `unattended_file_path` }}", - "{{template_dir}}/scripts/base_setup.ps1" - ] + "type": "parallels-iso", + "winrm_password": "vagrant", + "winrm_timeout": "12h", + "winrm_username": "vagrant" }, { - "type": "vmware-iso", - "version": 11, - "memory": "{{ user `memory` }}", + "communicator": "winrm", "cpus": "{{ user `cpus` }}", "disk_adapter_type": "lsisas1068", + "floppy_files": [ + "{{ user `floppy_dir` }}/{{ user `unattended_file_path` }}", + "{{template_dir}}/scripts/base_setup.ps1" + ], "guest_os_type": "windows9srv-64", "headless": "{{ user `headless` }}", + "iso_checksum": "sha1:{{ user `iso_checksum` }}", "iso_url": "{{ user `iso_url` }}", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "sha1", + "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-vmware", - "communicator": "winrm", + "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"", + "shutdown_timeout": "15m", "tools_upload_flavor": "windows", "tools_upload_path": "c:/Windows/Temp/vmware.iso", - "winrm_username": "vagrant", + "type": "vmware-iso", + "version": 11, "winrm_password": "vagrant", "winrm_timeout": "12h", - "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"", - "shutdown_timeout": "15m", - "floppy_files": [ - "{{ user `floppy_dir` }}/{{ user `unattended_file_path` }}", - "{{template_dir}}/scripts/base_setup.ps1" - ] + "winrm_username": "vagrant" }, { - "type": "qemu", - "memory": "{{ user `memory` }}", + "communicator": "winrm", "cpus": "{{ user `cpus` }}", + "floppy_files": [ + "{{ user `floppy_dir` }}/{{ user `unattended_file_path` }}", + "{{template_dir}}/scripts/base_setup.ps1" + ], "headless": "{{ user `headless` }}", + "iso_checksum": "sha1:{{ user `iso_checksum` }}", "iso_url": "{{ user `iso_url` }}", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "sha1", + "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-qemu", - "communicator": "winrm", - "winrm_username": "vagrant", - "winrm_password": "vagrant", - "winrm_timeout": "12h", - "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"", - "shutdown_timeout": "15m", "qemuargs": [ - [ "-m", "{{ user `memory` }}" ], - [ "-smp", "{{ user `cpus` }}" ], - [ "-drive", "file={{ user `virtio_win_iso` }},media=cdrom,index=3" ], - [ "-drive", "file={{ user `build_directory` }}/packer-{{ user `template` }}-qemu/{{ .Name }},if=virtio,cache=writeback,discard=ignore,format=qcow2,index=1" ] + [ + "-m", + "{{ user `memory` }}" + ], + [ + "-smp", + "{{ user `cpus` }}" + ], + [ + "-drive", + "file={{ user `virtio_win_iso` }},media=cdrom,index=3" + ], + [ + "-drive", + "file={{ user `build_directory` }}/packer-{{ user `template` }}-qemu/{{ .Name }},if=virtio,cache=writeback,discard=ignore,format=qcow2,index=1" + ] ], - "floppy_files": [ - "{{ user `floppy_dir` }}/{{ user `unattended_file_path` }}", - "{{template_dir}}/scripts/base_setup.ps1" - ] + "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"", + "shutdown_timeout": "15m", + "type": "qemu", + "winrm_password": "vagrant", + "winrm_timeout": "12h", + "winrm_username": "vagrant" } ], - "provisioners": [{ - "type": "chef-solo", - "cookbook_paths": ["{{template_dir}}/cookbooks"], + "post-processors": [ + [ + { + "keep_input_artifact": true, + "output": "{{ user `template` }}-{{.Provider}}.box", + "type": "vagrant", + "vagrantfile_template": "{{template_dir}}/vagrantfile-windows.template" + } + ] + ], + "provisioners": [ + { + "cookbook_paths": [ + "{{template_dir}}/cookbooks" + ], "guest_os_type": "windows", "run_list": [ "packer::disable_uac", @@ -140,14 +175,16 @@ "packer::remove_defender", "packer::configure_power", "packer::disable_screensaver" - ] + ], + "type": "chef-solo" }, { "type": "windows-restart" }, { - "type": "chef-solo", - "cookbook_paths": ["{{template_dir}}/cookbooks"], + "cookbook_paths": [ + "{{template_dir}}/cookbooks" + ], "guest_os_type": "windows", "run_list": [ "packer::vm_tools", @@ -155,35 +192,30 @@ "packer::enable_file_sharing", "packer::enable_remote_desktop", "packer::ui_tweaks" - ] + ], + "type": "chef-solo" }, { "type": "windows-restart" }, { - "type": "chef-solo", - "cookbook_paths": ["{{template_dir}}/cookbooks"], + "cookbook_paths": [ + "{{template_dir}}/cookbooks" + ], "guest_os_type": "windows", "run_list": [ "packer::cleanup", "packer::defrag" - ] + ], + "type": "chef-solo" }, { - "type": "powershell", - "script": "{{template_dir}}/scripts/cleanup.ps1", + "elevated_password": "vagrant", "elevated_user": "vagrant", - "elevated_password": "vagrant" + "script": "{{template_dir}}/scripts/cleanup.ps1", + "type": "powershell" } ], - "post-processors": [ - [{ - "type": "vagrant", - "keep_input_artifact": true, - "output": "{{ user `template` }}-{{.Provider}}.box", - "vagrantfile_template": "{{template_dir}}/vagrantfile-windows.template" - }] - ], "variables": { "build_directory": "../../builds", "cpus": "2", @@ -200,3 +232,4 @@ "virtio_win_iso": "~/virtio-win.iso" } } + diff --git a/packer_templates/windows/windows-2012.json b/packer_templates/windows/windows-2012.json index 5403ca82c..2b1c20186 100644 --- a/packer_templates/windows/windows-2012.json +++ b/packer_templates/windows/windows-2012.json @@ -1,196 +1,229 @@ { - "builders": [{ - "type": "hyperv-iso", - "switch_name": "{{user `hyperv_switch`}}", - "memory": "{{ user `memory` }}", - "cpus": "{{ user `cpus` }}", - "headless": "{{ user `headless` }}", - "iso_url": "{{ user `iso_url` }}", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "sha1", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-virtualbox", - "communicator": "winrm", - "winrm_username": "vagrant", - "winrm_password": "vagrant", - "winrm_timeout": "12h", - "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"", - "shutdown_timeout": "15m", - "floppy_files": [ - "{{ user `floppy_dir` }}/{{ user `unattended_file_path` }}" - ] - }, - { - "type": "virtualbox-iso", - "vboxmanage": [ - ["modifyvm", "{{.Name}}", "--vram", "48"], - ["modifyvm", "{{.Name}}", "--audio", "none"] - ], - "memory": "{{ user `memory` }}", - "cpus": "{{ user `cpus` }}", - "guest_additions_mode": "{{ user `guest_additions_mode` }}", - "guest_additions_url": "{{ user `guest_additions_url` }}", - "guest_additions_path": "C:/users/vagrant/VBoxGuestAdditions.iso", - "guest_os_type": "Windows2012_64", - "hard_drive_interface": "sata", - "iso_interface": "sata", - "headless": "{{ user `headless` }}", - "iso_url": "{{ user `iso_url` }}", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "sha1", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-virtualbox", - "communicator": "winrm", - "winrm_username": "vagrant", - "winrm_password": "vagrant", - "winrm_timeout": "12h", - "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"", - "shutdown_timeout": "15m", - "floppy_files": [ - "{{ user `floppy_dir` }}/{{ user `unattended_file_path` }}" - ] - }, - { - "type": "parallels-iso", - "memory": "{{ user `memory` }}", - "cpus": "{{ user `cpus` }}", - "guest_os_type": "win-2012", - "iso_url": "{{ user `iso_url` }}", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "sha1", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-parallels", - "parallels_tools_flavor": "win", - "prlctl_version_file": ".prlctl_version", - "communicator": "winrm", - "winrm_username": "vagrant", - "winrm_password": "vagrant", - "winrm_timeout": "12h", - "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"", - "shutdown_timeout": "15m", - "prlctl": [ - ["set", "{{.Name}}", "--efi-boot", "off"] - ], - "floppy_files": [ - "{{ user `floppy_dir` }}/{{ user `unattended_file_path` }}" - ] - }, - { - "type": "vmware-iso", - "version": 11, - "memory": "{{ user `memory` }}", - "cpus": "{{ user `cpus` }}", - "disk_adapter_type": "lsisas1068", - "guest_os_type": "windows9srv-64", - "headless": "{{ user `headless` }}", - "iso_url": "{{ user `iso_url` }}", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "sha1", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-vmware", - "communicator": "winrm", - "tools_upload_flavor": "windows", - "tools_upload_path": "c:/Windows/Temp/vmware.iso", - "winrm_username": "vagrant", - "winrm_password": "vagrant", - "winrm_timeout": "12h", - "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"", - "shutdown_timeout": "15m", - "floppy_files": [ - "{{ user `floppy_dir` }}/{{ user `unattended_file_path` }}" - ] - }, - { - "type": "qemu", - "memory": "{{ user `memory` }}", - "cpus": "{{ user `cpus` }}", - "headless": "{{ user `headless` }}", - "iso_url": "{{ user `iso_url` }}", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "sha1", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-qemu", - "communicator": "winrm", - "winrm_username": "vagrant", - "winrm_password": "vagrant", - "winrm_timeout": "12h", - "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"", - "shutdown_timeout": "15m", - "qemuargs": [ - ["-m", "{{ user `memory` }}"], - ["-smp", "{{ user `cpus` }}"], - ["-drive", "file={{ user `virtio_win_iso` }},media=cdrom,index=3"], - ["-drive", "file={{ user `build_directory` }}/packer-{{ user `template` }}-qemu/{{ .Name }},if=virtio,cache=writeback,discard=ignore,format=qcow2,index=1"] - ], - "floppy_files": [ - "{{ user `floppy_dir` }}/{{ user `unattended_file_path` }}" - ] - } - ], - "provisioners": [{ - "type": "chef-solo", - "cookbook_paths": ["{{template_dir}}/cookbooks"], - "guest_os_type": "windows", - "run_list": [ - "packer::disable_uac", - "packer::disable_restore", - "packer::disable_windows_update", - "packer::remove_defender", - "packer::configure_power", - "packer::disable_screensaver" - ] - }, - { - "type": "windows-restart" - }, - { - "type": "chef-solo", - "cookbook_paths": ["{{template_dir}}/cookbooks"], - "guest_os_type": "windows", - "run_list": [ - "packer::vm_tools", - "packer::features", - "packer::enable_file_sharing", - "packer::enable_remote_desktop", - "packer::ui_tweaks" - ] - }, - { - "type": "windows-restart" - }, - { - "type": "chef-solo", - "cookbook_paths": ["{{template_dir}}/cookbooks"], - "guest_os_type": "windows", - "run_list": [ - "packer::cleanup", - "packer::defrag" - ] - }, - { - "type": "powershell", - "script": "{{template_dir}}/scripts/cleanup.ps1", - "elevated_user": "vagrant", - "elevated_password": "vagrant" - } - ], - "post-processors": [ - [{ - "type": "vagrant", - "keep_input_artifact": true, - "output": "{{ user `template` }}-{{.Provider}}.box", - "vagrantfile_template": "{{template_dir}}/vagrantfile-windows.template" - }] - ], - "variables": { - "build_directory": "../../builds", - "cpus": "2", - "floppy_dir": "{{template_dir}}/answer_files", - "guest_additions_mode": "attach", - "guest_additions_url": "", - "headless": "true", - "hyperv_switch": "{{env `hyperv_switch`}}", - "iso_checksum": "922b365c3360ce630f6a4b4f2f3c79e66165c0fb", - "iso_checksum_type": "sha1", - "iso_url": "http://download.microsoft.com/download/6/D/A/6DAB58BA-F939-451D-9101-7DE07DC09C03/9200.16384.WIN8_RTM.120725-1247_X64FRE_SERVER_EVAL_EN-US-HRM_SSS_X64FREE_EN-US_DV5.ISO", - "memory": "4096", - "template": "windows-2012-standard", - "unattended_file_path": "2012/Autounattend.xml", - "virtio_win_iso": "~/virtio-win.iso" + "builders": [ + { + "communicator": "winrm", + "cpus": "{{ user `cpus` }}", + "floppy_files": [ + "{{ user `floppy_dir` }}/{{ user `unattended_file_path` }}" + ], + "headless": "{{ user `headless` }}", + "iso_checksum": "sha1:{{ user `iso_checksum` }}", + "iso_url": "{{ user `iso_url` }}", + "memory": "{{ user `memory` }}", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-virtualbox", + "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"", + "shutdown_timeout": "15m", + "switch_name": "{{user `hyperv_switch`}}", + "type": "hyperv-iso", + "winrm_password": "vagrant", + "winrm_timeout": "12h", + "winrm_username": "vagrant" + }, + { + "communicator": "winrm", + "cpus": "{{ user `cpus` }}", + "floppy_files": [ + "{{ user `floppy_dir` }}/{{ user `unattended_file_path` }}" + ], + "guest_additions_mode": "{{ user `guest_additions_mode` }}", + "guest_additions_path": "C:/users/vagrant/VBoxGuestAdditions.iso", + "guest_additions_url": "{{ user `guest_additions_url` }}", + "guest_os_type": "Windows2012_64", + "hard_drive_interface": "sata", + "headless": "{{ user `headless` }}", + "iso_checksum": "sha1:{{ user `iso_checksum` }}", + "iso_interface": "sata", + "iso_url": "{{ user `iso_url` }}", + "memory": "{{ user `memory` }}", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-virtualbox", + "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"", + "shutdown_timeout": "15m", + "type": "virtualbox-iso", + "vboxmanage": [ + [ + "modifyvm", + "{{.Name}}", + "--vram", + "48" + ], + [ + "modifyvm", + "{{.Name}}", + "--audio", + "none" + ] + ], + "winrm_password": "vagrant", + "winrm_timeout": "12h", + "winrm_username": "vagrant" + }, + { + "communicator": "winrm", + "cpus": "{{ user `cpus` }}", + "floppy_files": [ + "{{ user `floppy_dir` }}/{{ user `unattended_file_path` }}" + ], + "guest_os_type": "win-2012", + "iso_checksum": "sha1:{{ user `iso_checksum` }}", + "iso_url": "{{ user `iso_url` }}", + "memory": "{{ user `memory` }}", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-parallels", + "parallels_tools_flavor": "win", + "prlctl": [ + [ + "set", + "{{.Name}}", + "--efi-boot", + "off" + ] + ], + "prlctl_version_file": ".prlctl_version", + "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"", + "shutdown_timeout": "15m", + "type": "parallels-iso", + "winrm_password": "vagrant", + "winrm_timeout": "12h", + "winrm_username": "vagrant" + }, + { + "communicator": "winrm", + "cpus": "{{ user `cpus` }}", + "disk_adapter_type": "lsisas1068", + "floppy_files": [ + "{{ user `floppy_dir` }}/{{ user `unattended_file_path` }}" + ], + "guest_os_type": "windows9srv-64", + "headless": "{{ user `headless` }}", + "iso_checksum": "sha1:{{ user `iso_checksum` }}", + "iso_url": "{{ user `iso_url` }}", + "memory": "{{ user `memory` }}", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-vmware", + "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"", + "shutdown_timeout": "15m", + "tools_upload_flavor": "windows", + "tools_upload_path": "c:/Windows/Temp/vmware.iso", + "type": "vmware-iso", + "version": 11, + "winrm_password": "vagrant", + "winrm_timeout": "12h", + "winrm_username": "vagrant" + }, + { + "communicator": "winrm", + "cpus": "{{ user `cpus` }}", + "floppy_files": [ + "{{ user `floppy_dir` }}/{{ user `unattended_file_path` }}" + ], + "headless": "{{ user `headless` }}", + "iso_checksum": "sha1:{{ user `iso_checksum` }}", + "iso_url": "{{ user `iso_url` }}", + "memory": "{{ user `memory` }}", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-qemu", + "qemuargs": [ + [ + "-m", + "{{ user `memory` }}" + ], + [ + "-smp", + "{{ user `cpus` }}" + ], + [ + "-drive", + "file={{ user `virtio_win_iso` }},media=cdrom,index=3" + ], + [ + "-drive", + "file={{ user `build_directory` }}/packer-{{ user `template` }}-qemu/{{ .Name }},if=virtio,cache=writeback,discard=ignore,format=qcow2,index=1" + ] + ], + "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"", + "shutdown_timeout": "15m", + "type": "qemu", + "winrm_password": "vagrant", + "winrm_timeout": "12h", + "winrm_username": "vagrant" } -} \ No newline at end of file + ], + "post-processors": [ + [ + { + "keep_input_artifact": true, + "output": "{{ user `template` }}-{{.Provider}}.box", + "type": "vagrant", + "vagrantfile_template": "{{template_dir}}/vagrantfile-windows.template" + } + ] + ], + "provisioners": [ + { + "cookbook_paths": [ + "{{template_dir}}/cookbooks" + ], + "guest_os_type": "windows", + "run_list": [ + "packer::disable_uac", + "packer::disable_restore", + "packer::disable_windows_update", + "packer::remove_defender", + "packer::configure_power", + "packer::disable_screensaver" + ], + "type": "chef-solo" + }, + { + "type": "windows-restart" + }, + { + "cookbook_paths": [ + "{{template_dir}}/cookbooks" + ], + "guest_os_type": "windows", + "run_list": [ + "packer::vm_tools", + "packer::features", + "packer::enable_file_sharing", + "packer::enable_remote_desktop", + "packer::ui_tweaks" + ], + "type": "chef-solo" + }, + { + "type": "windows-restart" + }, + { + "cookbook_paths": [ + "{{template_dir}}/cookbooks" + ], + "guest_os_type": "windows", + "run_list": [ + "packer::cleanup", + "packer::defrag" + ], + "type": "chef-solo" + }, + { + "elevated_password": "vagrant", + "elevated_user": "vagrant", + "script": "{{template_dir}}/scripts/cleanup.ps1", + "type": "powershell" + } + ], + "variables": { + "build_directory": "../../builds", + "cpus": "2", + "floppy_dir": "{{template_dir}}/answer_files", + "guest_additions_mode": "attach", + "guest_additions_url": "", + "headless": "true", + "hyperv_switch": "{{env `hyperv_switch`}}", + "iso_checksum": "922b365c3360ce630f6a4b4f2f3c79e66165c0fb", + "iso_checksum_type": "sha1", + "iso_url": "http://download.microsoft.com/download/6/D/A/6DAB58BA-F939-451D-9101-7DE07DC09C03/9200.16384.WIN8_RTM.120725-1247_X64FRE_SERVER_EVAL_EN-US-HRM_SSS_X64FREE_EN-US_DV5.ISO", + "memory": "4096", + "template": "windows-2012-standard", + "unattended_file_path": "2012/Autounattend.xml", + "virtio_win_iso": "~/virtio-win.iso" + } +} + diff --git a/packer_templates/windows/windows-2012r2.json b/packer_templates/windows/windows-2012r2.json index 95284b0df..ea8ea5de7 100644 --- a/packer_templates/windows/windows-2012r2.json +++ b/packer_templates/windows/windows-2012r2.json @@ -1,130 +1,165 @@ { - "builders": [{ - "type": "hyperv-iso", - "switch_name": "{{user `hyperv_switch`}}", - "memory": "{{ user `memory` }}", + "builders": [ + { + "communicator": "winrm", "cpus": "{{ user `cpus` }}", + "floppy_files": [ + "{{ user `floppy_dir` }}/{{ user `unattended_file_path` }}" + ], "headless": "{{ user `headless` }}", + "iso_checksum": "sha1:{{ user `iso_checksum` }}", "iso_url": "{{ user `iso_url` }}", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "sha1", + "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-virtualbox", - "communicator": "winrm", - "winrm_username": "vagrant", - "winrm_password": "vagrant", - "winrm_timeout": "12h", "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"", "shutdown_timeout": "15m", - "floppy_files": [ - "{{ user `floppy_dir` }}/{{ user `unattended_file_path` }}" - ] + "switch_name": "{{user `hyperv_switch`}}", + "type": "hyperv-iso", + "winrm_password": "vagrant", + "winrm_timeout": "12h", + "winrm_username": "vagrant" }, { - "type": "virtualbox-iso", - "vboxmanage": [ - ["modifyvm", "{{.Name}}", "--vram", "48"], - ["modifyvm", "{{.Name}}", "--audio", "none"] - ], - "memory": "{{ user `memory` }}", + "communicator": "winrm", "cpus": "{{ user `cpus` }}", + "floppy_files": [ + "{{ user `floppy_dir` }}/{{ user `unattended_file_path` }}" + ], "guest_additions_mode": "{{ user `guest_additions_mode` }}", - "guest_additions_url": "{{ user `guest_additions_url` }}", "guest_additions_path": "C:/users/vagrant/VBoxGuestAdditions.iso", + "guest_additions_url": "{{ user `guest_additions_url` }}", "guest_os_type": "Windows2012_64", "hard_drive_interface": "sata", - "iso_interface": "sata", "headless": "{{ user `headless` }}", + "iso_checksum": "sha1:{{ user `iso_checksum` }}", + "iso_interface": "sata", "iso_url": "{{ user `iso_url` }}", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "sha1", + "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-virtualbox", - "communicator": "winrm", - "winrm_username": "vagrant", - "winrm_password": "vagrant", - "winrm_timeout": "12h", "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"", "shutdown_timeout": "15m", - "floppy_files": [ - "{{ user `floppy_dir` }}/{{ user `unattended_file_path` }}" - ] + "type": "virtualbox-iso", + "vboxmanage": [ + [ + "modifyvm", + "{{.Name}}", + "--vram", + "48" + ], + [ + "modifyvm", + "{{.Name}}", + "--audio", + "none" + ] + ], + "winrm_password": "vagrant", + "winrm_timeout": "12h", + "winrm_username": "vagrant" }, { - "type": "parallels-iso", - "memory": "{{ user `memory` }}", + "communicator": "winrm", "cpus": "{{ user `cpus` }}", + "floppy_files": [ + "{{ user `floppy_dir` }}/{{ user `unattended_file_path` }}" + ], "guest_os_type": "win-2012", + "iso_checksum": "sha1:{{ user `iso_checksum` }}", "iso_url": "{{ user `iso_url` }}", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "sha1", + "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-parallels", "parallels_tools_flavor": "win", + "prlctl": [ + [ + "set", + "{{.Name}}", + "--efi-boot", + "off" + ] + ], "prlctl_version_file": ".prlctl_version", - "communicator": "winrm", - "winrm_username": "vagrant", - "winrm_password": "vagrant", - "winrm_timeout": "12h", "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"", "shutdown_timeout": "15m", - "prlctl": [ - ["set", "{{.Name}}", "--efi-boot", "off"] - ], - "floppy_files": [ - "{{ user `floppy_dir` }}/{{ user `unattended_file_path` }}" - ] + "type": "parallels-iso", + "winrm_password": "vagrant", + "winrm_timeout": "12h", + "winrm_username": "vagrant" }, { - "type": "vmware-iso", - "version": 11, - "memory": "{{ user `memory` }}", + "communicator": "winrm", "cpus": "{{ user `cpus` }}", "disk_adapter_type": "lsisas1068", + "floppy_files": [ + "{{ user `floppy_dir` }}/{{ user `unattended_file_path` }}" + ], "guest_os_type": "windows9srv-64", "headless": "{{ user `headless` }}", + "iso_checksum": "sha1:{{ user `iso_checksum` }}", "iso_url": "{{ user `iso_url` }}", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "sha1", + "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-vmware", - "communicator": "winrm", + "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"", + "shutdown_timeout": "15m", "tools_upload_flavor": "windows", "tools_upload_path": "c:/Windows/Temp/vmware.iso", - "winrm_username": "vagrant", + "type": "vmware-iso", + "version": 11, "winrm_password": "vagrant", "winrm_timeout": "12h", - "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"", - "shutdown_timeout": "15m", - "floppy_files": [ - "{{ user `floppy_dir` }}/{{ user `unattended_file_path` }}" - ] + "winrm_username": "vagrant" }, { - "type": "qemu", - "memory": "{{ user `memory` }}", + "communicator": "winrm", "cpus": "{{ user `cpus` }}", + "floppy_files": [ + "{{ user `floppy_dir` }}/{{ user `unattended_file_path` }}" + ], "headless": "{{ user `headless` }}", + "iso_checksum": "sha1:{{ user `iso_checksum` }}", "iso_url": "{{ user `iso_url` }}", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "sha1", + "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-qemu", - "communicator": "winrm", - "winrm_username": "vagrant", - "winrm_password": "vagrant", - "winrm_timeout": "12h", - "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"", - "shutdown_timeout": "15m", "qemuargs": [ - [ "-m", "{{ user `memory` }}" ], - [ "-smp", "{{ user `cpus` }}" ], - [ "-drive", "file={{ user `virtio_win_iso` }},media=cdrom,index=3" ], - [ "-drive", "file={{ user `build_directory` }}/packer-{{ user `template` }}-qemu/{{ .Name }},if=virtio,cache=writeback,discard=ignore,format=qcow2,index=1" ] + [ + "-m", + "{{ user `memory` }}" + ], + [ + "-smp", + "{{ user `cpus` }}" + ], + [ + "-drive", + "file={{ user `virtio_win_iso` }},media=cdrom,index=3" + ], + [ + "-drive", + "file={{ user `build_directory` }}/packer-{{ user `template` }}-qemu/{{ .Name }},if=virtio,cache=writeback,discard=ignore,format=qcow2,index=1" + ] ], - "floppy_files": [ - "{{ user `floppy_dir` }}/{{ user `unattended_file_path` }}" - ] + "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"", + "shutdown_timeout": "15m", + "type": "qemu", + "winrm_password": "vagrant", + "winrm_timeout": "12h", + "winrm_username": "vagrant" } ], - "provisioners": [{ - "type": "chef-solo", - "cookbook_paths": ["{{template_dir}}/cookbooks"], + "post-processors": [ + [ + { + "keep_input_artifact": true, + "output": "{{ user `template` }}-{{.Provider}}.box", + "type": "vagrant", + "vagrantfile_template": "{{template_dir}}/vagrantfile-windows.template" + } + ] + ], + "provisioners": [ + { + "cookbook_paths": [ + "{{template_dir}}/cookbooks" + ], "guest_os_type": "windows", "run_list": [ "packer::disable_uac", @@ -133,14 +168,16 @@ "packer::remove_defender", "packer::configure_power", "packer::disable_screensaver" - ] + ], + "type": "chef-solo" }, { "type": "windows-restart" }, { - "type": "chef-solo", - "cookbook_paths": ["{{template_dir}}/cookbooks"], + "cookbook_paths": [ + "{{template_dir}}/cookbooks" + ], "guest_os_type": "windows", "run_list": [ "packer::vm_tools", @@ -148,35 +185,30 @@ "packer::enable_file_sharing", "packer::enable_remote_desktop", "packer::ui_tweaks" - ] + ], + "type": "chef-solo" }, { "type": "windows-restart" }, { - "type": "chef-solo", - "cookbook_paths": ["{{template_dir}}/cookbooks"], + "cookbook_paths": [ + "{{template_dir}}/cookbooks" + ], "guest_os_type": "windows", "run_list": [ "packer::cleanup", "packer::defrag" - ] + ], + "type": "chef-solo" }, { - "type": "powershell", - "script": "{{template_dir}}/scripts/cleanup.ps1", + "elevated_password": "vagrant", "elevated_user": "vagrant", - "elevated_password": "vagrant" + "script": "{{template_dir}}/scripts/cleanup.ps1", + "type": "powershell" } ], - "post-processors": [ - [{ - "type": "vagrant", - "keep_input_artifact": true, - "output": "{{ user `template` }}-{{.Provider}}.box", - "vagrantfile_template": "{{template_dir}}/vagrantfile-windows.template" - }] - ], "variables": { "build_directory": "../../builds", "cpus": "2", @@ -193,3 +225,4 @@ "virtio_win_iso": "~/virtio-win.iso" } } + diff --git a/packer_templates/windows/windows-2016.json b/packer_templates/windows/windows-2016.json index 4da2245ed..35a9f259e 100644 --- a/packer_templates/windows/windows-2016.json +++ b/packer_templates/windows/windows-2016.json @@ -1,130 +1,165 @@ { - "builders": [{ - "type": "hyperv-iso", - "switch_name": "{{user `hyperv_switch`}}", - "memory": "{{ user `memory` }}", + "builders": [ + { + "communicator": "winrm", "cpus": "{{ user `cpus` }}", + "floppy_files": [ + "{{ user `floppy_dir` }}/{{ user `unattended_file_path` }}" + ], "headless": "{{ user `headless` }}", + "iso_checksum": "sha1:{{ user `iso_checksum` }}", "iso_url": "{{ user `iso_url` }}", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "sha1", + "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-virtualbox", - "communicator": "winrm", - "winrm_username": "vagrant", - "winrm_password": "vagrant", - "winrm_timeout": "12h", "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"", "shutdown_timeout": "15m", - "floppy_files": [ - "{{ user `floppy_dir` }}/{{ user `unattended_file_path` }}" - ] + "switch_name": "{{user `hyperv_switch`}}", + "type": "hyperv-iso", + "winrm_password": "vagrant", + "winrm_timeout": "12h", + "winrm_username": "vagrant" }, { - "type": "virtualbox-iso", - "vboxmanage": [ - ["modifyvm", "{{.Name}}", "--vram", "48"], - ["modifyvm", "{{.Name}}", "--audio", "none"] - ], - "memory": "{{ user `memory` }}", + "communicator": "winrm", "cpus": "{{ user `cpus` }}", + "floppy_files": [ + "{{ user `floppy_dir` }}/{{ user `unattended_file_path` }}" + ], "guest_additions_mode": "{{ user `guest_additions_mode` }}", - "guest_additions_url": "{{ user `guest_additions_url` }}", "guest_additions_path": "C:/users/vagrant/VBoxGuestAdditions.iso", + "guest_additions_url": "{{ user `guest_additions_url` }}", "guest_os_type": "Windows2016_64", "hard_drive_interface": "sata", - "iso_interface": "sata", "headless": "{{ user `headless` }}", + "iso_checksum": "sha1:{{ user `iso_checksum` }}", + "iso_interface": "sata", "iso_url": "{{ user `iso_url` }}", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "sha1", + "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-virtualbox", - "communicator": "winrm", - "winrm_username": "vagrant", - "winrm_password": "vagrant", - "winrm_timeout": "12h", "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"", "shutdown_timeout": "15m", - "floppy_files": [ - "{{ user `floppy_dir` }}/{{ user `unattended_file_path` }}" - ] + "type": "virtualbox-iso", + "vboxmanage": [ + [ + "modifyvm", + "{{.Name}}", + "--vram", + "48" + ], + [ + "modifyvm", + "{{.Name}}", + "--audio", + "none" + ] + ], + "winrm_password": "vagrant", + "winrm_timeout": "12h", + "winrm_username": "vagrant" }, { - "type": "parallels-iso", - "memory": "{{ user `memory` }}", + "communicator": "winrm", "cpus": "{{ user `cpus` }}", + "floppy_files": [ + "{{ user `floppy_dir` }}/{{ user `unattended_file_path` }}" + ], "guest_os_type": "win-2016", + "iso_checksum": "sha1:{{ user `iso_checksum` }}", "iso_url": "{{ user `iso_url` }}", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "sha1", + "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-parallels", "parallels_tools_flavor": "win", + "prlctl": [ + [ + "set", + "{{.Name}}", + "--efi-boot", + "off" + ] + ], "prlctl_version_file": ".prlctl_version", - "communicator": "winrm", - "winrm_username": "vagrant", - "winrm_password": "vagrant", - "winrm_timeout": "12h", "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"", "shutdown_timeout": "15m", - "prlctl": [ - ["set", "{{.Name}}", "--efi-boot", "off"] - ], - "floppy_files": [ - "{{ user `floppy_dir` }}/{{ user `unattended_file_path` }}" - ] + "type": "parallels-iso", + "winrm_password": "vagrant", + "winrm_timeout": "12h", + "winrm_username": "vagrant" }, { - "type": "vmware-iso", - "version": 11, - "memory": "{{ user `memory` }}", + "communicator": "winrm", "cpus": "{{ user `cpus` }}", "disk_adapter_type": "lsisas1068", + "floppy_files": [ + "{{ user `floppy_dir` }}/{{ user `unattended_file_path` }}" + ], "guest_os_type": "windows9srv-64", "headless": "{{ user `headless` }}", + "iso_checksum": "sha1:{{ user `iso_checksum` }}", "iso_url": "{{ user `iso_url` }}", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "sha1", + "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-vmware", - "communicator": "winrm", + "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"", + "shutdown_timeout": "15m", "tools_upload_flavor": "windows", "tools_upload_path": "c:/Windows/Temp/vmware.iso", - "winrm_username": "vagrant", + "type": "vmware-iso", + "version": 11, "winrm_password": "vagrant", "winrm_timeout": "12h", - "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"", - "shutdown_timeout": "15m", - "floppy_files": [ - "{{ user `floppy_dir` }}/{{ user `unattended_file_path` }}" - ] + "winrm_username": "vagrant" }, { - "type": "qemu", - "memory": "{{ user `memory` }}", + "communicator": "winrm", "cpus": "{{ user `cpus` }}", + "floppy_files": [ + "{{ user `floppy_dir` }}/{{ user `unattended_file_path` }}" + ], "headless": "{{ user `headless` }}", + "iso_checksum": "sha1:{{ user `iso_checksum` }}", "iso_url": "{{ user `iso_url` }}", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "sha1", + "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-qemu", - "communicator": "winrm", - "winrm_username": "vagrant", - "winrm_password": "vagrant", - "winrm_timeout": "12h", - "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"", - "shutdown_timeout": "15m", "qemuargs": [ - [ "-m", "{{ user `memory` }}" ], - [ "-smp", "{{ user `cpus` }}" ], - [ "-drive", "file={{ user `virtio_win_iso` }},media=cdrom,index=3" ], - [ "-drive", "file={{ user `build_directory` }}/packer-{{ user `template` }}-qemu/{{ .Name }},if=virtio,cache=writeback,discard=ignore,format=qcow2,index=1" ] + [ + "-m", + "{{ user `memory` }}" + ], + [ + "-smp", + "{{ user `cpus` }}" + ], + [ + "-drive", + "file={{ user `virtio_win_iso` }},media=cdrom,index=3" + ], + [ + "-drive", + "file={{ user `build_directory` }}/packer-{{ user `template` }}-qemu/{{ .Name }},if=virtio,cache=writeback,discard=ignore,format=qcow2,index=1" + ] ], - "floppy_files": [ - "{{ user `floppy_dir` }}/{{ user `unattended_file_path` }}" - ] + "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"", + "shutdown_timeout": "15m", + "type": "qemu", + "winrm_password": "vagrant", + "winrm_timeout": "12h", + "winrm_username": "vagrant" } ], - "provisioners": [{ - "type": "chef-solo", - "cookbook_paths": ["{{template_dir}}/cookbooks"], + "post-processors": [ + [ + { + "keep_input_artifact": true, + "output": "{{ user `template` }}-{{.Provider}}.box", + "type": "vagrant", + "vagrantfile_template": "{{template_dir}}/vagrantfile-windows.template" + } + ] + ], + "provisioners": [ + { + "cookbook_paths": [ + "{{template_dir}}/cookbooks" + ], "guest_os_type": "windows", "run_list": [ "packer::disable_uac", @@ -133,14 +168,16 @@ "packer::remove_defender", "packer::configure_power", "packer::disable_screensaver" - ] + ], + "type": "chef-solo" }, { "type": "windows-restart" }, { - "type": "chef-solo", - "cookbook_paths": ["{{template_dir}}/cookbooks"], + "cookbook_paths": [ + "{{template_dir}}/cookbooks" + ], "guest_os_type": "windows", "run_list": [ "packer::vm_tools", @@ -148,35 +185,30 @@ "packer::enable_file_sharing", "packer::enable_remote_desktop", "packer::ui_tweaks" - ] + ], + "type": "chef-solo" }, { "type": "windows-restart" }, { - "type": "chef-solo", - "cookbook_paths": ["{{template_dir}}/cookbooks"], + "cookbook_paths": [ + "{{template_dir}}/cookbooks" + ], "guest_os_type": "windows", "run_list": [ "packer::cleanup", "packer::defrag" - ] + ], + "type": "chef-solo" }, { - "type": "powershell", - "script": "{{template_dir}}/scripts/cleanup.ps1", + "elevated_password": "vagrant", "elevated_user": "vagrant", - "elevated_password": "vagrant" + "script": "{{template_dir}}/scripts/cleanup.ps1", + "type": "powershell" } ], - "post-processors": [ - [{ - "type": "vagrant", - "keep_input_artifact": true, - "output": "{{ user `template` }}-{{.Provider}}.box", - "vagrantfile_template": "{{template_dir}}/vagrantfile-windows.template" - }] - ], "variables": { "build_directory": "../../builds", "cpus": "2", @@ -193,3 +225,4 @@ "virtio_win_iso": "~/virtio-win.iso" } } + diff --git a/packer_templates/windows/windows-2019.json b/packer_templates/windows/windows-2019.json index 5320e7e1d..ed80dcac0 100644 --- a/packer_templates/windows/windows-2019.json +++ b/packer_templates/windows/windows-2019.json @@ -1,130 +1,165 @@ { - "builders": [{ - "type": "hyperv-iso", - "switch_name": "{{user `hyperv_switch`}}", - "memory": "{{ user `memory` }}", + "builders": [ + { + "communicator": "winrm", "cpus": "{{ user `cpus` }}", + "floppy_files": [ + "{{ user `floppy_dir` }}/{{ user `unattended_file_path` }}" + ], "headless": "{{ user `headless` }}", + "iso_checksum": "sha1:{{ user `iso_checksum` }}", "iso_url": "{{ user `iso_url` }}", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "sha1", + "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-virtualbox", - "communicator": "winrm", - "winrm_username": "vagrant", - "winrm_password": "vagrant", - "winrm_timeout": "12h", "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"", "shutdown_timeout": "15m", - "floppy_files": [ - "{{ user `floppy_dir` }}/{{ user `unattended_file_path` }}" - ] + "switch_name": "{{user `hyperv_switch`}}", + "type": "hyperv-iso", + "winrm_password": "vagrant", + "winrm_timeout": "12h", + "winrm_username": "vagrant" }, { - "type": "virtualbox-iso", - "vboxmanage": [ - ["modifyvm", "{{.Name}}", "--vram", "48"], - ["modifyvm", "{{.Name}}", "--audio", "none"] - ], - "memory": "{{ user `memory` }}", + "communicator": "winrm", "cpus": "{{ user `cpus` }}", + "floppy_files": [ + "{{ user `floppy_dir` }}/{{ user `unattended_file_path` }}" + ], "guest_additions_mode": "{{ user `guest_additions_mode` }}", - "guest_additions_url": "{{ user `guest_additions_url` }}", "guest_additions_path": "C:/users/vagrant/VBoxGuestAdditions.iso", + "guest_additions_url": "{{ user `guest_additions_url` }}", "guest_os_type": "Windows2016_64", "hard_drive_interface": "sata", - "iso_interface": "sata", "headless": "{{ user `headless` }}", + "iso_checksum": "sha1:{{ user `iso_checksum` }}", + "iso_interface": "sata", "iso_url": "{{ user `iso_url` }}", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "sha1", + "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-virtualbox", - "communicator": "winrm", - "winrm_username": "vagrant", - "winrm_password": "vagrant", - "winrm_timeout": "12h", "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"", "shutdown_timeout": "15m", - "floppy_files": [ - "{{ user `floppy_dir` }}/{{ user `unattended_file_path` }}" - ] + "type": "virtualbox-iso", + "vboxmanage": [ + [ + "modifyvm", + "{{.Name}}", + "--vram", + "48" + ], + [ + "modifyvm", + "{{.Name}}", + "--audio", + "none" + ] + ], + "winrm_password": "vagrant", + "winrm_timeout": "12h", + "winrm_username": "vagrant" }, { - "type": "parallels-iso", - "memory": "{{ user `memory` }}", + "communicator": "winrm", "cpus": "{{ user `cpus` }}", + "floppy_files": [ + "{{ user `floppy_dir` }}/{{ user `unattended_file_path` }}" + ], "guest_os_type": "win-2019", + "iso_checksum": "sha1:{{ user `iso_checksum` }}", "iso_url": "{{ user `iso_url` }}", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "sha1", + "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-parallels", "parallels_tools_flavor": "win", + "prlctl": [ + [ + "set", + "{{.Name}}", + "--efi-boot", + "off" + ] + ], "prlctl_version_file": ".prlctl_version", - "communicator": "winrm", - "winrm_username": "vagrant", - "winrm_password": "vagrant", - "winrm_timeout": "12h", "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"", "shutdown_timeout": "15m", - "prlctl": [ - ["set", "{{.Name}}", "--efi-boot", "off"] - ], - "floppy_files": [ - "{{ user `floppy_dir` }}/{{ user `unattended_file_path` }}" - ] + "type": "parallels-iso", + "winrm_password": "vagrant", + "winrm_timeout": "12h", + "winrm_username": "vagrant" }, { - "type": "vmware-iso", - "version": 11, - "memory": "{{ user `memory` }}", + "communicator": "winrm", "cpus": "{{ user `cpus` }}", "disk_adapter_type": "lsisas1068", + "floppy_files": [ + "{{ user `floppy_dir` }}/{{ user `unattended_file_path` }}" + ], "guest_os_type": "windows9srv-64", "headless": "{{ user `headless` }}", + "iso_checksum": "sha1:{{ user `iso_checksum` }}", "iso_url": "{{ user `iso_url` }}", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "sha1", + "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-vmware", - "communicator": "winrm", + "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"", + "shutdown_timeout": "15m", "tools_upload_flavor": "windows", "tools_upload_path": "c:/Windows/Temp/vmware.iso", - "winrm_username": "vagrant", + "type": "vmware-iso", + "version": 11, "winrm_password": "vagrant", "winrm_timeout": "12h", - "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"", - "shutdown_timeout": "15m", - "floppy_files": [ - "{{ user `floppy_dir` }}/{{ user `unattended_file_path` }}" - ] + "winrm_username": "vagrant" }, { - "type": "qemu", - "memory": "{{ user `memory` }}", + "communicator": "winrm", "cpus": "{{ user `cpus` }}", + "floppy_files": [ + "{{ user `floppy_dir` }}/{{ user `unattended_file_path` }}" + ], "headless": "{{ user `headless` }}", + "iso_checksum": "sha1:{{ user `iso_checksum` }}", "iso_url": "{{ user `iso_url` }}", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "sha1", + "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-qemu", - "communicator": "winrm", - "winrm_username": "vagrant", - "winrm_password": "vagrant", - "winrm_timeout": "12h", - "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"", - "shutdown_timeout": "15m", "qemuargs": [ - [ "-m", "{{ user `memory` }}" ], - [ "-smp", "{{ user `cpus` }}" ], - [ "-drive", "file={{ user `virtio_win_iso` }},media=cdrom,index=3" ], - [ "-drive", "file={{ user `build_directory` }}/packer-{{ user `template` }}-qemu/{{ .Name }},if=virtio,cache=writeback,discard=ignore,format=qcow2,index=1" ] + [ + "-m", + "{{ user `memory` }}" + ], + [ + "-smp", + "{{ user `cpus` }}" + ], + [ + "-drive", + "file={{ user `virtio_win_iso` }},media=cdrom,index=3" + ], + [ + "-drive", + "file={{ user `build_directory` }}/packer-{{ user `template` }}-qemu/{{ .Name }},if=virtio,cache=writeback,discard=ignore,format=qcow2,index=1" + ] ], - "floppy_files": [ - "{{ user `floppy_dir` }}/{{ user `unattended_file_path` }}" - ] + "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"", + "shutdown_timeout": "15m", + "type": "qemu", + "winrm_password": "vagrant", + "winrm_timeout": "12h", + "winrm_username": "vagrant" } ], - "provisioners": [{ - "type": "chef-solo", - "cookbook_paths": ["{{template_dir}}/cookbooks"], + "post-processors": [ + [ + { + "keep_input_artifact": true, + "output": "{{ user `template` }}-{{.Provider}}.box", + "type": "vagrant", + "vagrantfile_template": "{{template_dir}}/vagrantfile-windows.template" + } + ] + ], + "provisioners": [ + { + "cookbook_paths": [ + "{{template_dir}}/cookbooks" + ], "guest_os_type": "windows", "run_list": [ "packer::disable_uac", @@ -133,14 +168,16 @@ "packer::remove_defender", "packer::configure_power", "packer::disable_screensaver" - ] + ], + "type": "chef-solo" }, { "type": "windows-restart" }, { - "type": "chef-solo", - "cookbook_paths": ["{{template_dir}}/cookbooks"], + "cookbook_paths": [ + "{{template_dir}}/cookbooks" + ], "guest_os_type": "windows", "run_list": [ "packer::vm_tools", @@ -148,35 +185,30 @@ "packer::enable_file_sharing", "packer::enable_remote_desktop", "packer::ui_tweaks" - ] + ], + "type": "chef-solo" }, { "type": "windows-restart" }, { - "type": "chef-solo", - "cookbook_paths": ["{{template_dir}}/cookbooks"], + "cookbook_paths": [ + "{{template_dir}}/cookbooks" + ], "guest_os_type": "windows", "run_list": [ "packer::cleanup", "packer::defrag" - ] + ], + "type": "chef-solo" }, { - "type": "powershell", - "script": "{{template_dir}}/scripts/cleanup.ps1", + "elevated_password": "vagrant", "elevated_user": "vagrant", - "elevated_password": "vagrant" + "script": "{{template_dir}}/scripts/cleanup.ps1", + "type": "powershell" } ], - "post-processors": [ - [{ - "type": "vagrant", - "keep_input_artifact": true, - "output": "{{ user `template` }}-{{.Provider}}.box", - "vagrantfile_template": "{{template_dir}}/vagrantfile-windows.template" - }] - ], "variables": { "build_directory": "../../builds", "cpus": "2", @@ -193,3 +225,4 @@ "virtio_win_iso": "~/virtio-win.iso" } } + From 898c40a7ef15ac213ca226c79c3bf1ab01f9faa4 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Wed, 17 Jun 2020 10:25:28 -0700 Subject: [PATCH 1187/1622] Additional cleanup on opensuse boxes Signed-off-by: Tim Smith <tsmith@chef.io> --- packer_templates/opensuse/scripts/cleanup.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/packer_templates/opensuse/scripts/cleanup.sh b/packer_templates/opensuse/scripts/cleanup.sh index 2fbe811a8..3a9a0466d 100644 --- a/packer_templates/opensuse/scripts/cleanup.sh +++ b/packer_templates/opensuse/scripts/cleanup.sh @@ -3,6 +3,9 @@ # These were only needed for building VMware/Virtualbox extensions: zypper -n rm -u gcc make kernel-default-devel kernel-devel +# Remove some bogus packages we don't need and don't fail if zypper fails (because it does sometimes) +zypper -n rm -u wallpaper-branding release-notes sound-theme-freedesktop || true + # cleanup all the downloaded RPMs zypper clean --all @@ -11,6 +14,7 @@ rm -f /etc/udev/rules.d/70-persistent-net.rules; touch /etc/udev/rules.d/75-persistent-net-generator.rules; # truncate any logs that have built up during the install +find /var/log/ -type f -name "*.log.*" -exec rm -rf {} \; find /var/log -type f -exec truncate --size=0 {} \; # remove the contents of /tmp and /var/tmp From 13435f6bac1caebb94323d7327e272fdcf75c8e6 Mon Sep 17 00:00:00 2001 From: Li-Wen Hsu <lwhsu@lwhsu.org> Date: Wed, 17 Jun 2020 09:56:32 +0800 Subject: [PATCH 1188/1622] Add FreeBSD 11.4-RELEASE Signed-off-by: Li-Wen Hsu <lwhsu@lwhsu.org> --- builds.yml | 2 + .../freebsd/freebsd-11.4-amd64.json | 208 ++++++++++++++++++ .../freebsd/freebsd-11.4-i386.json | 208 ++++++++++++++++++ 3 files changed, 418 insertions(+) create mode 100644 packer_templates/freebsd/freebsd-11.4-amd64.json create mode 100644 packer_templates/freebsd/freebsd-11.4-i386.json diff --git a/builds.yml b/builds.yml index 7199f1b52..1f9fd7847 100644 --- a/builds.yml +++ b/builds.yml @@ -16,6 +16,8 @@ public: - 'fedora-32' - 'freebsd-11.3-i386' - 'freebsd-11.3' +- 'freebsd-11.4-i386' +- 'freebsd-11.4' - 'freebsd-12.1-i386' - 'freebsd-12.1' - 'opensuse-leap-15.1' diff --git a/packer_templates/freebsd/freebsd-11.4-amd64.json b/packer_templates/freebsd/freebsd-11.4-amd64.json new file mode 100644 index 000000000..daa5e7463 --- /dev/null +++ b/packer_templates/freebsd/freebsd-11.4-amd64.json @@ -0,0 +1,208 @@ +{ + "builders": [ + { + "boot_command": [ + "<esc><wait>", + "boot -s<wait>", + "<enter><wait>", + "<wait10><wait10>", + "/bin/sh<enter><wait>", + "mdmfs -s 100m md1 /tmp<enter><wait>", + "mdmfs -s 100m md2 /mnt<enter><wait>", + "dhclient -p /tmp/dhclient.em0.pid -l /tmp/dhclient.lease.em0 em0<enter><wait>", + "fetch -o /tmp/installerconfig http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} \u0026\u0026 bsdinstall script /tmp/installerconfig<enter><wait>" + ], + "boot_wait": "10s", + "cpus": "{{ user `cpus` }}", + "disk_size": "{{user `disk_size`}}", + "guest_additions_mode": "disable", + "guest_os_type": "FreeBSD_64", + "headless": "{{ user `headless` }}", + "http_directory": "{{user `http_directory`}}", + "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "memory": "{{ user `memory` }}", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-virtualbox", + "shutdown_command": "echo 'vagrant' | su -m root -c 'shutdown -p now'", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_timeout": "10000s", + "ssh_username": "vagrant", + "type": "virtualbox-iso", + "virtualbox_version_file": ".vbox_version", + "vm_name": "{{ user `template` }}" + }, + { + "boot_command": [ + "<esc><wait>", + "boot -s<wait>", + "<enter><wait>", + "<wait10><wait10>", + "/bin/sh<enter><wait>", + "mdmfs -s 100m md1 /tmp<enter><wait>", + "mdmfs -s 100m md2 /mnt<enter><wait>", + "dhclient -p /tmp/dhclient.em0.pid -l /tmp/dhclient.lease.em0 em0<enter><wait>", + "<wait5>", + "fetch -o /tmp/installerconfig http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} \u0026\u0026 bsdinstall script /tmp/installerconfig<enter><wait>" + ], + "boot_wait": "10s", + "cpus": "{{ user `cpus` }}", + "disk_size": "{{user `disk_size`}}", + "guest_os_type": "freebsd-64", + "headless": "{{ user `headless` }}", + "http_directory": "{{user `http_directory`}}", + "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "memory": "{{ user `memory` }}", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-vmware", + "shutdown_command": "echo 'vagrant' | su -m root -c 'shutdown -p now'", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_timeout": "10000s", + "ssh_username": "vagrant", + "type": "vmware-iso", + "vm_name": "{{ user `template` }}", + "vmx_data": { + "cpuid.coresPerSocket": "1" + }, + "vmx_remove_ethernet_interfaces": true + }, + { + "boot_command": [ + "<esc><wait>", + "boot -s<wait>", + "<enter><wait>", + "<wait10><wait10>", + "/bin/sh<enter><wait>", + "mdmfs -s 100m md1 /tmp<enter><wait>", + "mdmfs -s 100m md2 /mnt<enter><wait>", + "dhclient -p /tmp/dhclient.em0.pid -l /tmp/dhclient.lease.em0 em0<enter><wait>", + "fetch -o /tmp/installerconfig http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} \u0026\u0026 bsdinstall script /tmp/installerconfig<enter><wait>" + ], + "boot_wait": "8s", + "cpus": "{{ user `cpus` }}", + "disk_size": "{{user `disk_size`}}", + "guest_os_type": "freebsd", + "http_directory": "{{user `http_directory`}}", + "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "memory": "{{ user `memory` }}", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-parallels", + "parallels_tools_mode": "disable", + "prlctl": [ + [ + "set", + "{{.Name}}", + "--device-set", + "cdrom0", + "--iface", + "ide" + ], + [ + "set", + "{{.Name}}", + "--device-del", + "fdd0" + ], + [ + "set", + "{{.Name}}", + "--device-del", + "parallel0" + ] + ], + "prlctl_version_file": ".prlctl_version", + "shutdown_command": "echo 'vagrant' | su -m root -c 'shutdown -p now'", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_timeout": "10000s", + "ssh_username": "vagrant", + "type": "parallels-iso", + "vm_name": "{{ user `template` }}" + }, + { + "boot_command": [ + "<esc><wait>", + "boot -s<wait>", + "<enter><wait>", + "<wait10><wait10>", + "/bin/sh<enter><wait>", + "mdmfs -s 100m md1 /tmp<enter><wait>", + "mdmfs -s 100m md2 /mnt<enter><wait>", + "dhclient -p /tmp/dhclient.vtnet0.pid -l /tmp/dhclient.lease.vtnet0 vtnet0<enter><wait>", + "fetch -o /tmp/installerconfig http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} \u0026\u0026 bsdinstall script /tmp/installerconfig<enter><wait>" + ], + "boot_wait": "7s", + "cpus": "{{ user `cpus` }}", + "disk_size": "{{user `disk_size`}}", + "headless": "{{ user `headless` }}", + "http_directory": "{{user `http_directory`}}", + "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "memory": "{{ user `memory` }}", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-qemu", + "shutdown_command": "echo 'vagrant' | su -m root -c 'shutdown -p now'", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_timeout": "10000s", + "ssh_username": "vagrant", + "type": "qemu", + "vm_name": "{{ user `template` }}" + } + ], + "post-processors": [ + { + "output": "{{ user `build_directory` }}/{{user `box_basename`}}.{{.Provider}}.box", + "type": "vagrant", + "vagrantfile_template": "{{template_dir}}/vagrantfile_templates/freebsd.rb" + } + ], + "provisioners": [ + { + "environment_vars": [ + "HOME_DIR=/home/vagrant", + "http_proxy={{user `http_proxy`}}", + "https_proxy={{user `https_proxy`}}", + "no_proxy={{user `no_proxy`}}", + "pkg_branch={{user `pkg_branch`}}" + ], + "execute_command": "echo 'vagrant' | {{.Vars}} su -m root -c 'sh -eux {{.Path}}'", + "expect_disconnect": true, + "scripts": [ + "{{template_dir}}/scripts/update.sh", + "{{template_dir}}/scripts/postinstall.sh", + "{{template_dir}}/scripts/sudoers.sh", + "{{template_dir}}/../_common/vagrant.sh", + "{{template_dir}}/scripts/vmtools.sh", + "{{template_dir}}/scripts/cleanup.sh", + "{{template_dir}}/scripts/minimize.sh" + ], + "type": "shell" + } + ], + "variables": { + "box_basename": "freebsd-11.4", + "build_directory": "../../builds", + "build_timestamp": "{{isotime \"20060102150405\"}}", + "cpus": "1", + "disk_size": "65536", + "git_revision": "__unknown_git_revision__", + "headless": "", + "http_directory": "{{template_dir}}/http", + "http_proxy": "{{env `http_proxy`}}", + "https_proxy": "{{env `https_proxy`}}", + "install_path": "freebsd-11/installerconfig", + "iso_checksum": "d76c1ded99b2c1005b1ff94cc0c811fbcd8a2d04196432009ab5f203c2146914", + "iso_checksum_type": "sha256", + "iso_name": "FreeBSD-11.4-RELEASE-amd64-disc1.iso", + "memory": "1024", + "mirror": "https://download.freebsd.org/ftp", + "mirror_directory": "releases/amd64/amd64/ISO-IMAGES/11.4", + "name": "freebsd-11.4", + "no_proxy": "{{env `no_proxy`}}", + "pkg_branch": "quarterly", + "template": "freebsd-11.4-amd64", + "version": "TIMESTAMP" + } +} + diff --git a/packer_templates/freebsd/freebsd-11.4-i386.json b/packer_templates/freebsd/freebsd-11.4-i386.json new file mode 100644 index 000000000..49c45027e --- /dev/null +++ b/packer_templates/freebsd/freebsd-11.4-i386.json @@ -0,0 +1,208 @@ +{ + "builders": [ + { + "boot_command": [ + "<esc><wait>", + "boot -s<wait>", + "<enter><wait>", + "<wait10><wait10>", + "/bin/sh<enter><wait>", + "mdmfs -s 100m md1 /tmp<enter><wait>", + "mdmfs -s 100m md2 /mnt<enter><wait>", + "dhclient -p /tmp/dhclient.em0.pid -l /tmp/dhclient.lease.em0 em0<enter><wait>", + "fetch -o /tmp/installerconfig http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} \u0026\u0026 bsdinstall script /tmp/installerconfig<enter><wait>" + ], + "boot_wait": "10s", + "cpus": "{{ user `cpus` }}", + "disk_size": "{{user `disk_size`}}", + "guest_additions_mode": "disable", + "guest_os_type": "FreeBSD", + "headless": "{{ user `headless` }}", + "http_directory": "{{user `http_directory`}}", + "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "memory": "{{ user `memory` }}", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-virtualbox", + "shutdown_command": "echo 'vagrant' | su -m root -c 'shutdown -p now'", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_timeout": "10000s", + "ssh_username": "vagrant", + "type": "virtualbox-iso", + "virtualbox_version_file": ".vbox_version", + "vm_name": "{{ user `template` }}" + }, + { + "boot_command": [ + "<esc><wait>", + "boot -s<wait>", + "<enter><wait>", + "<wait10><wait10>", + "/bin/sh<enter><wait>", + "mdmfs -s 100m md1 /tmp<enter><wait>", + "mdmfs -s 100m md2 /mnt<enter><wait>", + "dhclient -p /tmp/dhclient.em0.pid -l /tmp/dhclient.lease.em0 em0<enter><wait>", + "<wait5>", + "fetch -o /tmp/installerconfig http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} \u0026\u0026 bsdinstall script /tmp/installerconfig<enter><wait>" + ], + "boot_wait": "10s", + "cpus": "{{ user `cpus` }}", + "disk_size": "{{user `disk_size`}}", + "guest_os_type": "freebsd", + "headless": "{{ user `headless` }}", + "http_directory": "{{user `http_directory`}}", + "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "memory": "{{ user `memory` }}", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-vmware", + "shutdown_command": "echo 'vagrant' | su -m root -c 'shutdown -p now'", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_timeout": "10000s", + "ssh_username": "vagrant", + "type": "vmware-iso", + "vm_name": "{{ user `template` }}", + "vmx_data": { + "cpuid.coresPerSocket": "1" + }, + "vmx_remove_ethernet_interfaces": true + }, + { + "boot_command": [ + "<esc><wait>", + "boot -s<wait>", + "<enter><wait>", + "<wait10><wait10>", + "/bin/sh<enter><wait>", + "mdmfs -s 100m md1 /tmp<enter><wait>", + "mdmfs -s 100m md2 /mnt<enter><wait>", + "dhclient -p /tmp/dhclient.em0.pid -l /tmp/dhclient.lease.em0 em0<enter><wait>", + "fetch -o /tmp/installerconfig http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} \u0026\u0026 bsdinstall script /tmp/installerconfig<enter><wait>" + ], + "boot_wait": "8s", + "cpus": "{{ user `cpus` }}", + "disk_size": "{{user `disk_size`}}", + "guest_os_type": "freebsd", + "http_directory": "{{user `http_directory`}}", + "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "memory": "{{ user `memory` }}", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-parallels", + "parallels_tools_mode": "disable", + "prlctl": [ + [ + "set", + "{{.Name}}", + "--device-set", + "cdrom0", + "--iface", + "ide" + ], + [ + "set", + "{{.Name}}", + "--device-del", + "fdd0" + ], + [ + "set", + "{{.Name}}", + "--device-del", + "parallel0" + ] + ], + "prlctl_version_file": ".prlctl_version", + "shutdown_command": "echo 'vagrant' | su -m root -c 'shutdown -p now'", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_timeout": "10000s", + "ssh_username": "vagrant", + "type": "parallels-iso", + "vm_name": "{{ user `template` }}" + }, + { + "boot_command": [ + "<esc><wait>", + "boot -s<wait>", + "<enter><wait>", + "<wait10><wait10>", + "/bin/sh<enter><wait>", + "mdmfs -s 100m md1 /tmp<enter><wait>", + "mdmfs -s 100m md2 /mnt<enter><wait>", + "dhclient -p /tmp/dhclient.vtnet0.pid -l /tmp/dhclient.lease.vtnet0 vtnet0<enter><wait>", + "fetch -o /tmp/installerconfig http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} \u0026\u0026 bsdinstall script /tmp/installerconfig<enter><wait>" + ], + "boot_wait": "7s", + "cpus": "{{ user `cpus` }}", + "disk_size": "{{user `disk_size`}}", + "headless": "{{ user `headless` }}", + "http_directory": "{{user `http_directory`}}", + "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "memory": "{{ user `memory` }}", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-qemu", + "shutdown_command": "echo 'vagrant' | su -m root -c 'shutdown -p now'", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_timeout": "10000s", + "ssh_username": "vagrant", + "type": "qemu", + "vm_name": "{{ user `template` }}" + } + ], + "post-processors": [ + { + "output": "{{ user `build_directory` }}/{{user `box_basename`}}.{{.Provider}}.box", + "type": "vagrant", + "vagrantfile_template": "{{template_dir}}/vagrantfile_templates/freebsd.rb" + } + ], + "provisioners": [ + { + "environment_vars": [ + "HOME_DIR=/home/vagrant", + "http_proxy={{user `http_proxy`}}", + "https_proxy={{user `https_proxy`}}", + "no_proxy={{user `no_proxy`}}", + "pkg_branch={{user `pkg_branch`}}" + ], + "execute_command": "echo 'vagrant' | {{.Vars}} su -m root -c 'sh -eux {{.Path}}'", + "expect_disconnect": true, + "scripts": [ + "{{template_dir}}/scripts/update.sh", + "{{template_dir}}/scripts/postinstall.sh", + "{{template_dir}}/scripts/sudoers.sh", + "{{template_dir}}/../_common/vagrant.sh", + "{{template_dir}}/scripts/vmtools.sh", + "{{template_dir}}/scripts/cleanup.sh", + "{{template_dir}}/scripts/minimize.sh" + ], + "type": "shell" + } + ], + "variables": { + "box_basename": "freebsd-11.4-i386", + "build_directory": "../../builds", + "build_timestamp": "{{isotime \"20060102150405\"}}", + "cpus": "1", + "disk_size": "40960", + "git_revision": "__unknown_git_revision__", + "headless": "", + "http_directory": "{{template_dir}}/http", + "http_proxy": "{{env `http_proxy`}}", + "https_proxy": "{{env `https_proxy`}}", + "install_path": "freebsd-11/installerconfig", + "iso_checksum": "cab3c03fc45b84bffcf818d11147af491eb0226be4bf8e4092b1ecafdc096d33", + "iso_checksum_type": "sha256", + "iso_name": "FreeBSD-11.4-RELEASE-i386-disc1.iso", + "memory": "1024", + "mirror": "https://download.freebsd.org/ftp", + "mirror_directory": "releases/i386/i386/ISO-IMAGES/11.4", + "name": "freebsd-11.4-i386", + "no_proxy": "{{env `no_proxy`}}", + "pkg_branch": "quarterly", + "template": "freebsd-11.4-i386", + "version": "TIMESTAMP" + } +} + From 80b024be2a08236ec1340219f2cb759711c9c0e1 Mon Sep 17 00:00:00 2001 From: Li-Wen Hsu <lwhsu@lwhsu.org> Date: Thu, 18 Jun 2020 02:28:24 +0800 Subject: [PATCH 1189/1622] Fix dhclient paramater Signed-off-by: Li-Wen Hsu <lwhsu@lwhsu.org> --- packer_templates/freebsd/freebsd-11.3-i386.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packer_templates/freebsd/freebsd-11.3-i386.json b/packer_templates/freebsd/freebsd-11.3-i386.json index 02fb18777..4519150d1 100644 --- a/packer_templates/freebsd/freebsd-11.3-i386.json +++ b/packer_templates/freebsd/freebsd-11.3-i386.json @@ -9,7 +9,7 @@ "/bin/sh<enter><wait>", "mdmfs -s 100m md1 /tmp<enter><wait>", "mdmfs -s 100m md2 /mnt<enter><wait>", - "dhclient /tmp/dhclient.em0.pid -l /tmp/dhclient.lease.em0 em0<enter><wait>", + "dhclient -p /tmp/dhclient.em0.pid -l /tmp/dhclient.lease.em0 em0<enter><wait>", "fetch -o /tmp/installerconfig http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} \u0026\u0026 bsdinstall script /tmp/installerconfig<enter><wait>" ], "boot_wait": "10s", From 362d78ff13dd95f6d1c87dfa20310640bbf2edff Mon Sep 17 00:00:00 2001 From: Li-Wen Hsu <lwhsu@lwhsu.org> Date: Thu, 18 Jun 2020 02:33:33 +0800 Subject: [PATCH 1190/1622] More loader config to speed up boot Signed-off-by: Li-Wen Hsu <lwhsu@lwhsu.org> --- packer_templates/freebsd/scripts/postinstall.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/packer_templates/freebsd/scripts/postinstall.sh b/packer_templates/freebsd/scripts/postinstall.sh index 303a262e3..92944270f 100644 --- a/packer_templates/freebsd/scripts/postinstall.sh +++ b/packer_templates/freebsd/scripts/postinstall.sh @@ -15,6 +15,8 @@ ln -sf /usr/local/share/certs/ca-root-nss.crt /etc/ssl/cert.pem; cat >>/etc/loader.conf << LOADER_CONF autoboot_delay="-1" beastie_disable="YES" +loader_logo="none" +hw.memtest.tests="0" LOADER_CONF # disable crash dumps From 9d90480cdfac558fa02d0e52c2df5bf57ff88590 Mon Sep 17 00:00:00 2001 From: Li-Wen Hsu <lwhsu@lwhsu.org> Date: Thu, 18 Jun 2020 02:35:03 +0800 Subject: [PATCH 1191/1622] This setting is already done in postinstall.sh Signed-off-by: Li-Wen Hsu <lwhsu@lwhsu.org> --- packer_templates/freebsd/scripts/vmtools.sh | 6 ------ 1 file changed, 6 deletions(-) diff --git a/packer_templates/freebsd/scripts/vmtools.sh b/packer_templates/freebsd/scripts/vmtools.sh index f2a23e873..997f9c28b 100644 --- a/packer_templates/freebsd/scripts/vmtools.sh +++ b/packer_templates/freebsd/scripts/vmtools.sh @@ -20,9 +20,6 @@ virtualbox-iso|virtualbox-ovf) echo 'virtio_balloon_load="YES"' >>/boot/loader.conf; echo 'if_vtnet_load="YES"' >>/boot/loader.conf; - # Don't waste 10 seconds waiting for boot - echo 'autoboot_delay="-1"' >>/boot/loader.conf; - echo 'ifconfig_vtnet0_name="em0"' >>/etc/rc.conf; echo 'ifconfig_vtnet1_name="em1"' >>/etc/rc.conf; echo 'ifconfig_vtnet2_name="em2"' >>/etc/rc.conf; @@ -38,9 +35,6 @@ vmware-iso|vmware-vmx) # for shared folder echo 'fuse_load="YES"' >>/boot/loader.conf; - # Don't waste 10 seconds waiting for boot - echo 'autoboot_delay="-1"' >>/boot/loader.conf; - echo 'ifconfig_vmx0="dhcp"' >>/etc/rc.conf; ;; From 48dbadcb07aaaf7dd5495026f84be65307874b25 Mon Sep 17 00:00:00 2001 From: Li-Wen Hsu <lwhsu@lwhsu.org> Date: Mon, 29 Jun 2020 19:01:30 +0800 Subject: [PATCH 1192/1622] FreeBSD minimize: let dd(1) automatically exit on disk full Don't need to periodically check the space left, dd(1) will automatically exit after it cannot write to the disk anymore. This mitigate the issue that fs may reserve some space so the available space size will never get to 0. Signed-off-by: Li-Wen Hsu <lwhsu@lwhsu.org> --- packer_templates/freebsd/scripts/minimize.sh | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/packer_templates/freebsd/scripts/minimize.sh b/packer_templates/freebsd/scripts/minimize.sh index 6e557815f..ba4742586 100644 --- a/packer_templates/freebsd/scripts/minimize.sh +++ b/packer_templates/freebsd/scripts/minimize.sh @@ -8,17 +8,8 @@ ZROOT="zroot/ROOT/default" COMPRESSION=$(zfs get -H compression $ZROOT | cut -f3); zfs set compression=off $ZROOT; -dd if=/dev/zero of=/EMPTY bs=1m & -PID=$!; - -avail=$(zfs get -pH avail $ZROOT | cut -f3); -while [ "$avail" -ne 0 ]; do - sleep 15; - avail=$(zfs get -pH avail $ZROOT | cut -f3); -done - -kill $PID || echo "dd already exited"; - +dd if=/dev/zero of=/EMPTY bs=1m || echo "dd(1) exits after taking over all the space" +sync rm -f /EMPTY; # Block until the empty file has been removed, otherwise, Packer # will try to kill the box while the disk is still full and that's bad From 0a67d3f0086c72ad404b956abe3c7538d487f92a Mon Sep 17 00:00:00 2001 From: John McCrae <jmccrae@chef.io> Date: Mon, 29 Jun 2020 10:32:24 -0700 Subject: [PATCH 1193/1622] Added packer template, vagrant template and answer file for hyper-v generation 2 VM. Readme also updated to reflect the new work Signed-off-by: John McCrae <jmccrae@chef.io> --- README.md | 13 +- .../answer_files/10/gen2_Autounattend.xml | 257 ++++++++++++++++++ .../windows/vagrantfile-windows-gen2.template | 22 ++ packer_templates/windows/windows-10gen2.json | 124 +++++++++ 4 files changed, 415 insertions(+), 1 deletion(-) create mode 100644 packer_templates/windows/answer_files/10/gen2_Autounattend.xml create mode 100644 packer_templates/windows/vagrantfile-windows-gen2.template create mode 100644 packer_templates/windows/windows-10gen2.json diff --git a/README.md b/README.md index 45bfc2274..95672d1c7 100644 --- a/README.md +++ b/README.md @@ -65,6 +65,13 @@ $ cd fedora $ packer build -var 'mirror=http://mirror.utexas.edu/fedora/linux' fedora-31-x86_64.json ``` +To build a Windows 10 Enterprise Gen 2 box for only the Hyper-V provider + +``` +$ cd windows +$ packer build windows-10gen2.json +``` + If the build is successful, ready to import box files will be in the `builds` directory at the root of the repository. \***NOTE:** box_basename can be overridden like other Packer vars with `-var 'box_basename=ubuntu-18.04'` @@ -89,12 +96,16 @@ Most of the providers expect unrestricted access to networking in order to build #### Windows -``` +```powershell $VS = "Standardswitch" $IF_ALIAS = (Get-NetAdapter -Name "vEthernet ($VS)").ifAlias New-NetFirewallRule -Displayname "Allow incomming from $VS" -Direction Inbound -InterfaceAlias $IF_ALIAS -Action Allow ``` +#### Hyper-V Generation 2 VM's + +There are fundamental differences between the 2 VM types (Gen 1 and Gen 2) in Hyper-V. Most notably, there is no floppy drive support for Gen 2. In order to provide the same resources you previously did with a floppy drive, you will now need to create an iso image that contains those files (in particular, the autounattend.xml and the base_setup.ps1 files) and then attach those images via the "secondary_iso_images" parameter. You will also need to manage the driver disk that holds on the hyper-v guest services drivers and adjust the autounattend.xml file as appropriate. Also note that there is an updated Autounattend.xml file for Gen 2 which supports EFI partitions. + #### macOS / OSX See this [wiki page](https://github.com/chef/bento/wiki/macOS) diff --git a/packer_templates/windows/answer_files/10/gen2_Autounattend.xml b/packer_templates/windows/answer_files/10/gen2_Autounattend.xml new file mode 100644 index 000000000..52ab86028 --- /dev/null +++ b/packer_templates/windows/answer_files/10/gen2_Autounattend.xml @@ -0,0 +1,257 @@ +<?xml version="1.0" encoding="utf-8"?> +<unattend xmlns="urn:schemas-microsoft-com:unattend"> + <settings pass="windowsPE"> + <component name="Microsoft-Windows-PnpCustomizationsWinPE" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" processorArchitecture="amd64" + xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State"> + <!-- + This makes the VirtIO drivers available to Windows, assuming that + the VirtIO driver disk at https://fedorapeople.org/groups/virt/virtio-win/direct-downloads/stable-virtio/virtio-win.iso + (see https://docs.fedoraproject.org/en-US/quick-docs/creating-windows-virtual-machines-using-virtio-drivers/index.html#virtio-win-direct-downloads) + is available as drive E: + --> + <DriverPaths> + <PathAndCredentials wcm:action="add" wcm:keyValue="2"> + <Path>F:\viostor\w10\amd64</Path> + </PathAndCredentials> + + <PathAndCredentials wcm:action="add" wcm:keyValue="3"> + <Path>F:\NetKVM\w10\amd64</Path> + </PathAndCredentials> + + <PathAndCredentials wcm:action="add" wcm:keyValue="4"> + <Path>F:\Balloon\w10\amd64</Path> + </PathAndCredentials> + + <PathAndCredentials wcm:action="add" wcm:keyValue="5"> + <Path>F:\pvpanic\w10\amd64</Path> + </PathAndCredentials> + + <PathAndCredentials wcm:action="add" wcm:keyValue="6"> + <Path>F:\qemupciserial\w10\amd64</Path> + </PathAndCredentials> + + <PathAndCredentials wcm:action="add" wcm:keyValue="7"> + <Path>F:\qxldod\w10\amd64</Path> + </PathAndCredentials> + + <PathAndCredentials wcm:action="add" wcm:keyValue="8"> + <Path>F:\vioinput\w10\amd64</Path> + </PathAndCredentials> + + <PathAndCredentials wcm:action="add" wcm:keyValue="9"> + <Path>F:\viorng\w10\amd64</Path> + </PathAndCredentials> + + <PathAndCredentials wcm:action="add" wcm:keyValue="10"> + <Path>F:\vioscsi\w10\amd64</Path> + </PathAndCredentials> + + <PathAndCredentials wcm:action="add" wcm:keyValue="11"> + <Path>F:\vioserial\w10\amd64</Path> + </PathAndCredentials> + + <PathAndCredentials wcm:action="add" wcm:keyValue="12"> + <Path>F:\vioserial\w10\amd64</Path> + </PathAndCredentials> + </DriverPaths> + </component> + <component name="Microsoft-Windows-International-Core-WinPE" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" + xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <SetupUILanguage> + <UILanguage>en-US</UILanguage> + </SetupUILanguage> + <InputLocale>en-US</InputLocale> + <SystemLocale>en-US</SystemLocale> + <UILanguage>en-US</UILanguage> + <UILanguageFallback>en-US</UILanguageFallback> + <UserLocale>en-US</UserLocale> + </component> + <component name="Microsoft-Windows-Setup" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" + xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <DiskConfiguration> + <Disk wcm:action="add"> + <CreatePartitions> + <CreatePartition wcm:action="add"> + <Order>1</Order> + <Size>350</Size> + <Type>Primary</Type> + </CreatePartition> + <CreatePartition wcm:action="add"> + <Order>2</Order> + <Size>100</Size> + <Type>EFI</Type> + </CreatePartition> + <CreatePartition wcm:action="add"> + <Order>3</Order> + <Size>128</Size> + <Type>MSR</Type> + </CreatePartition> + <CreatePartition wcm:action="add"> + <Order>4</Order> + <Extend>true</Extend> + <Type>Primary</Type> + </CreatePartition> + </CreatePartitions> + <ModifyPartitions> + <ModifyPartition wcm:action="add"> + <Order>1</Order> + <PartitionID>1</PartitionID> + <Label>WINRE</Label> + <Format>NTFS</Format> + <TypeID>de94bba4-06d1-4d40-a16a-bfd50179d6ac</TypeID> + </ModifyPartition> + <ModifyPartition wcm:action="add"> + <Order>2</Order> + <PartitionID>2</PartitionID> + <Label>System</Label> + <Format>FAT32</Format> + </ModifyPartition> + <ModifyPartition wcm:action="add"> + <Order>3</Order> + <PartitionID>3</PartitionID> + </ModifyPartition> + <ModifyPartition wcm:action="add"> + <Order>4</Order> + <PartitionID>4</PartitionID> + <Label>Windows</Label> + <Format>NTFS</Format> + </ModifyPartition> + </ModifyPartitions> + <DiskID>0</DiskID> + <WillWipeDisk>true</WillWipeDisk> + </Disk> + <WillShowUI>OnError</WillShowUI> + </DiskConfiguration> + <ImageInstall> + <OSImage> + <InstallFrom> + <MetaData wcm:action="add"> + <Key>/IMAGE/NAME</Key> + <Value>Windows 10 Enterprise Evaluation</Value> + </MetaData> + </InstallFrom> + <InstallTo> + <DiskID>0</DiskID> + <PartitionID>4</PartitionID> + </InstallTo> + </OSImage> + </ImageInstall> + <UserData> + <ProductKey> + <WillShowUI>OnError</WillShowUI> + </ProductKey> + <AcceptEula>true</AcceptEula> + <FullName>Vagrant</FullName> + <Organization>Bento by Chef Software, Inc.</Organization> + </UserData> + </component> + </settings> + <settings pass="generalize"> + <component name="Microsoft-Windows-Security-SPP" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" + xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <SkipRearm>1</SkipRearm> + </component> + <component name="Microsoft-Windows-PnpSysprep" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" + xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <PersistAllDeviceInstalls>false</PersistAllDeviceInstalls> + <DoNotCleanUpNonPresentDevices>false</DoNotCleanUpNonPresentDevices> + </component> + </settings> + <settings pass="oobeSystem"> + <component name="Microsoft-Windows-International-Core" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" + xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <InputLocale>en-US</InputLocale> + <SystemLocale>en-US</SystemLocale> + <UILanguage>en-US</UILanguage> + <UserLocale>en-US</UserLocale> + </component> + <component name="Microsoft-Windows-Shell-Setup" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" + xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <OOBE> + <HideEULAPage>true</HideEULAPage> + <HideLocalAccountScreen>true</HideLocalAccountScreen> + <HideOEMRegistrationScreen>true</HideOEMRegistrationScreen> + <HideOnlineAccountScreens>true</HideOnlineAccountScreens> + <HideWirelessSetupInOOBE>true</HideWirelessSetupInOOBE> + <NetworkLocation>Work</NetworkLocation> + <ProtectYourPC>3</ProtectYourPC> + <SkipMachineOOBE>true</SkipMachineOOBE> + <SkipUserOOBE>true</SkipUserOOBE> + </OOBE> + <TimeZone>UTC</TimeZone> + <UserAccounts> + <AdministratorPassword> + <Value>vagrant</Value> + <PlainText>true</PlainText> + </AdministratorPassword> + <LocalAccounts> + <LocalAccount wcm:action="add"> + <Password> + <Value>vagrant</Value> + <PlainText>true</PlainText> + </Password> + <Description>Vagrant User</Description> + <DisplayName>vagrant</DisplayName> + <Group>administrators</Group> + <Name>vagrant</Name> + </LocalAccount> + </LocalAccounts> + </UserAccounts> + <AutoLogon> + <Password> + <Value>vagrant</Value> + <PlainText>true</PlainText> + </Password> + <Username>vagrant</Username> + <Enabled>true</Enabled> + </AutoLogon> + <FirstLogonCommands> + <SynchronousCommand wcm:action="add"> + <CommandLine>cmd.exe /c powershell -Command "Set-ExecutionPolicy -ExecutionPolicy RemoteSigned -Force"</CommandLine> + <Description>Set Execution Policy 64 Bit</Description> + <Order>1</Order> + <RequiresUserInput>true</RequiresUserInput> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <CommandLine>C:\Windows\SysWOW64\cmd.exe /c powershell -Command "Set-ExecutionPolicy -ExecutionPolicy RemoteSigned -Force"</CommandLine> + <Description>Set Execution Policy 32 Bit</Description> + <Order>2</Order> + <RequiresUserInput>true</RequiresUserInput> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <CommandLine>powershell -NoLogo -ExecutionPolicy RemoteSigned -File e:\base_setup.ps1</CommandLine> + <Description>Configure WinRM so packer can connect to run Chef</Description> + <Order>3</Order> + <RequiresUserInput>false</RequiresUserInput> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <CommandLine>cmd.exe /c wmic useraccount where "name='vagrant'" set PasswordExpires=FALSE</CommandLine> + <Order>4</Order> + <Description>Disable password expiration for vagrant user</Description> + </SynchronousCommand> + </FirstLogonCommands> + </component> + </settings> + <settings pass="specialize"> + <component xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" name="Microsoft-Windows-ServerManager-SvrMgrNc" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> + <DoNotOpenServerManagerAtLogon>true</DoNotOpenServerManagerAtLogon> + </component> + <component xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" name="Microsoft-Windows-IE-ESC" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> + <!-- Disable IE ESC. --> + <IEHardenAdmin>false</IEHardenAdmin> + <IEHardenUser>false</IEHardenUser> + </component> + <component xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" name="Microsoft-Windows-OutOfBoxExperience" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> + <DoNotOpenInitialConfigurationTasksAtLogon>true</DoNotOpenInitialConfigurationTasksAtLogon> + </component> + </settings> +</unattend> \ No newline at end of file diff --git a/packer_templates/windows/vagrantfile-windows-gen2.template b/packer_templates/windows/vagrantfile-windows-gen2.template new file mode 100644 index 000000000..64618d988 --- /dev/null +++ b/packer_templates/windows/vagrantfile-windows-gen2.template @@ -0,0 +1,22 @@ +# -*- mode: ruby -*- +# vi: set ft=ruby : + +Vagrant.require_version ">= 1.6.2" + +Vagrant.configure("2") do |config| + config.vm.box = "hyperv_win_10" + config.vm.communicator = "winrm" + config.vm.synced_folder ".", "/vagrant", SharedFoldersEnableSymlinksCreate: false + + config.vm.guest = :windows + + config.vm.network :forwarded_port, guest: 3389, host: 3399, id: "rdp", auto_correct: true + config.vm.network :forwarded_port, guest: 5985, host: 5985, id: "winrm", auto_correct: true + + config.vm.provider "hyperv" do |hv| + hv.ip_address_timeout = 240 + hv.memory = 2048 + hv.cpus = 2 + hv.enable_virtualization_extensions = true + end +end \ No newline at end of file diff --git a/packer_templates/windows/windows-10gen2.json b/packer_templates/windows/windows-10gen2.json new file mode 100644 index 000000000..525934432 --- /dev/null +++ b/packer_templates/windows/windows-10gen2.json @@ -0,0 +1,124 @@ +{ + "variables": { + "build_version": "1", + "package_location": "", + "working_directory": "", + "autounattend": "Autounattend.xml", + "unattend": "answer_files\\unattend.xml", + "disk_size": "61440", + "disk_type_id": "1", + "headless": "false", + "iso_checksum": "F57E034095E0423FEB575CA82855F73E39FFA713", + "iso_checksum_type": "sha1", + "iso_url": "https://software-download.microsoft.com/download/pr/19041.264.200511-0456.vb_release_svc_refresh_CLIENTENTERPRISEEVAL_OEMRET_x64FRE_en-us.iso", + "restart_timeout": "5m", + "vhv_enable": "false", + "winrm_timeout": "6h", + "vm_name": "windows_10", + "virtio_win_iso": "virtio-win.iso", + "hyperv_switch": "Default Switch", + "memory": "4096", + "cpus": "2", + "template_dir": "", + "build_directory": "", + "template": "vagrantfile-windows-gen2.template", + "sysprep_unattended": "", + "vagrant_sysprep_unattended": "", + "guest_additions_mode": "upload", + "secondary_iso_images": "e:\\images\\unattend.iso,e:\\images\\virtio-win-0.1.171.iso" + + }, + "builders": [ + { + "type": "hyperv-iso", + "generation": "2", + "switch_name": "{{user `hyperv_switch`}}", + "memory": "{{user `memory`}}", + "enable_dynamic_memory": "true", + "cpus": "{{user `cpus`}}", + "headless": "false", + "iso_url": "{{user `iso_url`}}", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "output_directory": "c:\\packer-build\\", + "communicator": "winrm", + "winrm_username": "vagrant", + "winrm_password": "vagrant", + "winrm_timeout": "12h", + "shutdown_command": "shutdown /s /t 10 /c \"Packer Shutdown\" /f /d p:4:1", + "shutdown_timeout": "15m", + "enable_secure_boot": false, + "skip_export": false, + "boot_wait": "1s", + "boot_command": [ + "aaaaaaa" + ], + "secondary_iso_images": [ + "e:\\images\\unattend.iso", + "e:\\images\\virtio-win-0.1.171.iso" + ] + } + ], + "provisioners": [ + { + "cookbook_paths": [ + "{{template_dir}}/cookbooks" + ], + "guest_os_type": "windows", + "run_list": [ + "packer::disable_uac", + "packer::disable_onedrive", + "packer::disable_restore", + "packer::disable_windows_update", + "packer::remove_defender", + "packer::configure_power", + "packer::disable_screensaver" + ], + "type": "chef-solo" + }, + { + "type": "windows-restart" + }, + { + "cookbook_paths": [ + "{{template_dir}}/cookbooks" + ], + "guest_os_type": "windows", + "run_list": [ + "packer::vm_tools", + "packer::features", + "packer::enable_file_sharing", + "packer::enable_remote_desktop", + "packer::ui_tweaks" + ], + "type": "chef-solo" + }, + { + "type": "windows-restart" + }, + { + "cookbook_paths": [ + "{{template_dir}}/cookbooks" + ], + "guest_os_type": "windows", + "run_list": [ + "packer::cleanup" + ], + "type": "chef-solo" + }, + { + "elevated_password": "vagrant", + "elevated_user": "vagrant", + "script": "{{template_dir}}/scripts/cleanup.ps1", + "type": "powershell" + } + ], + "post-processors": [ + { + "type": "vagrant", + "keep_input_artifact": true, + "output": "{{.Provider}}_windows-10.box", + "vagrantfile_template": "{{template_dir}}/{{user `template`}}" + } + ] +} \ No newline at end of file From c6e0ff43d881637aed1fa58e416f1614f5460742 Mon Sep 17 00:00:00 2001 From: John McCrae <jmccrae@chef.io> Date: Mon, 29 Jun 2020 12:14:19 -0700 Subject: [PATCH 1194/1622] updated the readme and corrected the json file to remove hard-coded paths which are blowing up buildkite --- README.md | 2 +- packer_templates/windows/windows-10gen2.json | 7 ++----- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 95672d1c7..137bf2de2 100644 --- a/README.md +++ b/README.md @@ -104,7 +104,7 @@ New-NetFirewallRule -Displayname "Allow incomming from $VS" -Direction Inbound - #### Hyper-V Generation 2 VM's -There are fundamental differences between the 2 VM types (Gen 1 and Gen 2) in Hyper-V. Most notably, there is no floppy drive support for Gen 2. In order to provide the same resources you previously did with a floppy drive, you will now need to create an iso image that contains those files (in particular, the autounattend.xml and the base_setup.ps1 files) and then attach those images via the "secondary_iso_images" parameter. You will also need to manage the driver disk that holds on the hyper-v guest services drivers and adjust the autounattend.xml file as appropriate. Also note that there is an updated Autounattend.xml file for Gen 2 which supports EFI partitions. +There are fundamental differences between the 2 VM types (Gen 1 and Gen 2) in Hyper-V. Most notably, there is no floppy drive support for Gen 2. In order to provide the same resources you previously did with a floppy drive, you will now need to create iso images that contain those files (in particular, the autounattend.xml and the base_setup.ps1 files) and then attach those images via the "secondary_iso_images" parameter. You will also need to manage the driver disk that holds on the hyper-v guest services drivers and adjust the autounattend.xml file as appropriate. Also note that there is an updated Autounattend.xml file for Gen 2 which supports EFI partitions. #### macOS / OSX diff --git a/packer_templates/windows/windows-10gen2.json b/packer_templates/windows/windows-10gen2.json index 525934432..2c51899cf 100644 --- a/packer_templates/windows/windows-10gen2.json +++ b/packer_templates/windows/windows-10gen2.json @@ -24,9 +24,7 @@ "template": "vagrantfile-windows-gen2.template", "sysprep_unattended": "", "vagrant_sysprep_unattended": "", - "guest_additions_mode": "upload", - "secondary_iso_images": "e:\\images\\unattend.iso,e:\\images\\virtio-win-0.1.171.iso" - + "guest_additions_mode": "upload" }, "builders": [ { @@ -54,8 +52,7 @@ "aaaaaaa" ], "secondary_iso_images": [ - "e:\\images\\unattend.iso", - "e:\\images\\virtio-win-0.1.171.iso" + ] } ], From 102eabd37fce99dcfd139d7cb2fa5604eea27e11 Mon Sep 17 00:00:00 2001 From: John McCrae <jmccrae@chef.io> Date: Mon, 29 Jun 2020 12:45:00 -0700 Subject: [PATCH 1195/1622] corrected spelling and grammar in the readme and added a bit more detail Signed-off-by: John McCrae <jmccrae@chef.io> --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 137bf2de2..ff65df418 100644 --- a/README.md +++ b/README.md @@ -104,7 +104,7 @@ New-NetFirewallRule -Displayname "Allow incomming from $VS" -Direction Inbound - #### Hyper-V Generation 2 VM's -There are fundamental differences between the 2 VM types (Gen 1 and Gen 2) in Hyper-V. Most notably, there is no floppy drive support for Gen 2. In order to provide the same resources you previously did with a floppy drive, you will now need to create iso images that contain those files (in particular, the autounattend.xml and the base_setup.ps1 files) and then attach those images via the "secondary_iso_images" parameter. You will also need to manage the driver disk that holds on the hyper-v guest services drivers and adjust the autounattend.xml file as appropriate. Also note that there is an updated Autounattend.xml file for Gen 2 which supports EFI partitions. +There are fundamental differences between VM types (Gen 1 and Gen 2) in Hyper-V. Most notably, there is no floppy drive support for Gen 2. In order to provide the same resources you previously did with a floppy drive, you will now need to create iso images that contain those files (in particular, the autounattend.xml and the base_setup.ps1 files) and then attach those images via the "secondary_iso_images" parameter. You will also need to manage the driver disk that holds the hyper-v guest services drivers and adjust the autounattend.xml file as appropriate. Also note that there is an updated Autounattend.xml file for Gen 2 which supports EFI partitions. You will want to update that file for the particular Windows version you are using and ensure that the partitions are correct for you situation. #### macOS / OSX From ec7bb96e6a98f8dedf33bcff9fd006052f96c5a0 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Mon, 29 Jun 2020 13:33:11 -0700 Subject: [PATCH 1196/1622] Remove EOL Fedora 30 Signed-off-by: Tim Smith <tsmith@chef.io> --- builds.yml | 1 - packer_templates/fedora/fedora-30-x86_64.json | 190 ------------------ 2 files changed, 191 deletions(-) delete mode 100644 packer_templates/fedora/fedora-30-x86_64.json diff --git a/builds.yml b/builds.yml index 1f9fd7847..9c5f35e31 100644 --- a/builds.yml +++ b/builds.yml @@ -11,7 +11,6 @@ public: - 'debian-9.12' - 'debian-10.4-i386' - 'debian-10.4' -- 'fedora-30' - 'fedora-31' - 'fedora-32' - 'freebsd-11.3-i386' diff --git a/packer_templates/fedora/fedora-30-x86_64.json b/packer_templates/fedora/fedora-30-x86_64.json deleted file mode 100644 index 8de57f09d..000000000 --- a/packer_templates/fedora/fedora-30-x86_64.json +++ /dev/null @@ -1,190 +0,0 @@ -{ - "builders": [ - { - "accelerator": "kvm", - "boot_command": [ - "<tab> linux ks=http://{{.HTTPIP}}:{{.HTTPPort}}/{{user `ks_path`}}<enter><wait>" - ], - "boot_wait": "10s", - "cpus": "{{ user `cpus` }}", - "disk_cache": "unsafe", - "disk_compression": true, - "disk_discard": "unmap", - "disk_interface": "virtio-scsi", - "disk_size": "{{user `disk_size`}}", - "format": "qcow2", - "headless": "{{ user `headless` }}", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "name": "{{ user `template` }}", - "net_device": "virtio-net", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-libvirt", - "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "3600s", - "ssh_username": "vagrant", - "type": "qemu", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<tab> linux ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" - ], - "boot_wait": "10s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", - "guest_additions_url": "{{ user `guest_additions_url` }}", - "guest_os_type": "Fedora_64", - "hard_drive_interface": "sata", - "headless": "{{ user `headless` }}", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-virtualbox", - "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "type": "virtualbox-iso", - "virtualbox_version_file": ".vbox_version", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<tab> linux ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" - ], - "boot_wait": "10s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "fedora-64", - "headless": "{{ user `headless` }}", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-vmware", - "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "tools_upload_flavor": "linux", - "type": "vmware-iso", - "vm_name": "{{ user `template` }}", - "vmx_data": { - "cpuid.coresPerSocket": "1", - "ethernet0.pciSlotNumber": "32" - }, - "vmx_remove_ethernet_interfaces": true - }, - { - "boot_command": [ - "<tab> linux ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" - ], - "boot_wait": "10s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "fedora-core", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-parallels", - "parallels_tools_flavor": "lin", - "prlctl_version_file": ".prlctl_version", - "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "type": "parallels-iso", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<tab> linux ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" - ], - "boot_wait": "10s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "headless": "{{ user `headless` }}", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-qemu", - "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "type": "qemu", - "vm_name": "{{ user `template` }}" - } - ], - "post-processors": [ - { - "output": "{{ user `build_directory` }}/{{user `box_basename`}}.{{.Provider}}.box", - "type": "vagrant" - } - ], - "provisioners": [ - { - "environment_vars": [ - "HOME_DIR=/home/vagrant", - "http_proxy={{user `http_proxy`}}", - "https_proxy={{user `https_proxy`}}", - "no_proxy={{user `no_proxy`}}" - ], - "execute_command": "echo 'vagrant' | {{.Vars}} sudo -E -S bash '{{.Path}}'", - "expect_disconnect": true, - "scripts": [ - "{{template_dir}}/scripts/swap.sh", - "{{template_dir}}/scripts/fix-slow-dns.sh", - "{{template_dir}}/scripts/build-tools.sh", - "{{template_dir}}/scripts/install-supporting-packages.sh", - "{{template_dir}}/../_common/motd.sh", - "{{template_dir}}/../_common/sshd.sh", - "{{template_dir}}/../_common/virtualbox.sh", - "{{template_dir}}/scripts/open-vm-tools.sh", - "{{template_dir}}/../_common/parallels.sh", - "{{template_dir}}/../_common/vagrant.sh", - "{{template_dir}}/scripts/cleanup.sh", - "{{template_dir}}/../_common/minimize.sh" - ], - "type": "shell" - } - ], - "variables": { - "arch": "64", - "box_basename": "fedora-30", - "build_directory": "../../builds", - "build_timestamp": "{{isotime \"20060102150405\"}}", - "cpus": "1", - "disk_size": "65536", - "git_revision": "__unknown_git_revision__", - "guest_additions_url": "", - "headless": "", - "http_directory": "{{template_dir}}/http", - "http_proxy": "{{env `http_proxy`}}", - "https_proxy": "{{env `https_proxy`}}", - "iso_checksum": "bb0622b78449298e24a96b90b561b429edec71aae72b8f7a8c3da4d81e4df5b7", - "iso_checksum_type": "sha256", - "iso_name": "Fedora-Server-dvd-x86_64-30-1.2.iso", - "ks_path": "ks-fedora.cfg", - "memory": "1024", - "mirror": "http://download.fedoraproject.org/pub/fedora/linux", - "mirror_directory": "releases/30/Server/x86_64/iso", - "name": "fedora-30", - "no_proxy": "{{env `no_proxy`}}", - "template": "fedora-30-x86_64", - "version": "TIMESTAMP" - } -} - From c6d0a3e16c88e5d0c8645ed37dade15be6692151 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Thu, 16 Jul 2020 23:51:01 -0700 Subject: [PATCH 1197/1622] Remove EOL Debian 8 Signed-off-by: Tim Smith <tsmith@chef.io> --- .../debian/debian-8.11-amd64.json | 220 ------------------ packer_templates/debian/debian-8.11-i386.json | 220 ------------------ .../debian/http/debian-8/preseed.cfg | 50 ---- packer_templates/debian/scripts/networking.sh | 24 +- packer_templates/debian/scripts/update.sh | 16 +- 5 files changed, 11 insertions(+), 519 deletions(-) delete mode 100644 packer_templates/debian/debian-8.11-amd64.json delete mode 100644 packer_templates/debian/debian-8.11-i386.json delete mode 100644 packer_templates/debian/http/debian-8/preseed.cfg diff --git a/packer_templates/debian/debian-8.11-amd64.json b/packer_templates/debian/debian-8.11-amd64.json deleted file mode 100644 index 3880fea07..000000000 --- a/packer_templates/debian/debian-8.11-amd64.json +++ /dev/null @@ -1,220 +0,0 @@ -{ - "builders": [ - { - "boot_command": [ - "<esc><wait>", - "install <wait>", - " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}} <wait>", - "debian-installer=en_US.UTF-8 <wait>", - "auto <wait>", - "locale=en_US.UTF-8 <wait>", - "kbd-chooser/method=us <wait>", - "keyboard-configuration/xkb-keymap=us <wait>", - "netcfg/get_hostname={{ .Name }} <wait>", - "netcfg/get_domain=vagrantup.com <wait>", - "fb=false <wait>", - "debconf/frontend=noninteractive <wait>", - "console-setup/ask_detect=false <wait>", - "console-keymaps-at/keymap=us <wait>", - "grub-installer/bootdev=/dev/sda <wait>", - "<enter><wait>" - ], - "boot_wait": "10s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", - "guest_additions_url": "{{ user `guest_additions_url` }}", - "guest_os_type": "Debian_64", - "hard_drive_interface": "sata", - "headless": "{{ user `headless` }}", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-virtualbox", - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "type": "virtualbox-iso", - "virtualbox_version_file": ".vbox_version", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<esc><wait>", - "install <wait>", - " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}} <wait>", - "debian-installer=en_US.UTF-8 <wait>", - "auto <wait>", - "locale=en_US.UTF-8 <wait>", - "kbd-chooser/method=us <wait>", - "keyboard-configuration/xkb-keymap=us <wait>", - "netcfg/get_hostname={{ .Name }} <wait>", - "netcfg/get_domain=vagrantup.com <wait>", - "fb=false <wait>", - "debconf/frontend=noninteractive <wait>", - "console-setup/ask_detect=false <wait>", - "console-keymaps-at/keymap=us <wait>", - "grub-installer/bootdev=/dev/sda <wait>", - "<enter><wait>" - ], - "boot_wait": "10s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "debian8-64", - "headless": "{{ user `headless` }}", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-vmware", - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "tools_upload_flavor": "linux", - "type": "vmware-iso", - "vm_name": "{{ user `template` }}", - "vmx_data": { - "cpuid.coresPerSocket": "1", - "ethernet0.pciSlotNumber": "32" - }, - "vmx_remove_ethernet_interfaces": true - }, - { - "boot_command": [ - "<esc><wait>", - "install <wait>", - " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}} <wait>", - "debian-installer=en_US.UTF-8 <wait>", - "auto <wait>", - "locale=en_US.UTF-8 <wait>", - "kbd-chooser/method=us <wait>", - "keyboard-configuration/xkb-keymap=us <wait>", - "netcfg/get_hostname={{ .Name }} <wait>", - "netcfg/get_domain=vagrantup.com <wait>", - "fb=false <wait>", - "debconf/frontend=noninteractive <wait>", - "console-setup/ask_detect=false <wait>", - "console-keymaps-at/keymap=us <wait>", - "grub-installer/bootdev=/dev/sda <wait>", - "<enter><wait>" - ], - "boot_wait": "10s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "debian", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-parallels", - "parallels_tools_flavor": "lin", - "prlctl_version_file": ".prlctl_version", - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "type": "parallels-iso", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<esc><wait>", - "install <wait>", - " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}} <wait>", - "debian-installer=en_US.UTF-8 <wait>", - "auto <wait>", - "locale=en_US.UTF-8 <wait>", - "kbd-chooser/method=us <wait>", - "keyboard-configuration/xkb-keymap=us <wait>", - "netcfg/get_hostname={{ .Name }} <wait>", - "netcfg/get_domain=vagrantup.com <wait>", - "fb=false <wait>", - "debconf/frontend=noninteractive <wait>", - "console-setup/ask_detect=false <wait>", - "console-keymaps-at/keymap=us <wait>", - "grub-installer/bootdev=/dev/vda <wait>", - "<enter><wait>" - ], - "boot_wait": "10s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "headless": "{{ user `headless` }}", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-qemu", - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "type": "qemu", - "vm_name": "{{ user `template` }}" - } - ], - "post-processors": [ - { - "output": "{{ user `build_directory` }}/{{user `box_basename`}}.{{.Provider}}.box", - "type": "vagrant" - } - ], - "provisioners": [ - { - "environment_vars": [ - "HOME_DIR=/home/vagrant", - "http_proxy={{user `http_proxy`}}", - "https_proxy={{user `https_proxy`}}", - "no_proxy={{user `no_proxy`}}" - ], - "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", - "expect_disconnect": true, - "scripts": [ - "{{template_dir}}/scripts/update.sh", - "{{template_dir}}/../_common/motd.sh", - "{{template_dir}}/../_common/sshd.sh", - "{{template_dir}}/scripts/networking.sh", - "{{template_dir}}/scripts/sudoers.sh", - "{{template_dir}}/../_common/vagrant.sh", - "{{template_dir}}/scripts/systemd.sh", - "{{template_dir}}/../_common/virtualbox.sh", - "{{template_dir}}/../ubuntu/scripts/vmware.sh", - "{{template_dir}}/../_common/parallels.sh", - "{{template_dir}}/scripts/cleanup.sh", - "{{template_dir}}/../_common/minimize.sh" - ], - "type": "shell" - } - ], - "variables": { - "box_basename": "debian-8.11", - "build_directory": "../../builds", - "build_timestamp": "{{isotime \"20060102150405\"}}", - "cpus": "1", - "disk_size": "65536", - "git_revision": "__unknown_git_revision__", - "guest_additions_url": "", - "headless": "", - "http_directory": "{{template_dir}}/http", - "http_proxy": "{{env `http_proxy`}}", - "https_proxy": "{{env `https_proxy`}}", - "iso_checksum": "166868369a8094a69b2766b46a9a28869ac921bac5697e525d0ec5be14a9d373", - "iso_checksum_type": "sha256", - "iso_name": "debian-8.11.0-amd64-CD-1.iso", - "memory": "1024", - "mirror": "http://cdimage.debian.org/cdimage/archive", - "mirror_directory": "8.11.0/amd64/iso-cd", - "name": "debian-8.11", - "no_proxy": "{{env `no_proxy`}}", - "preseed_path": "debian-8/preseed.cfg", - "template": "debian-8.11-amd64", - "version": "TIMESTAMP" - } -} - diff --git a/packer_templates/debian/debian-8.11-i386.json b/packer_templates/debian/debian-8.11-i386.json deleted file mode 100644 index 10f19608f..000000000 --- a/packer_templates/debian/debian-8.11-i386.json +++ /dev/null @@ -1,220 +0,0 @@ -{ - "builders": [ - { - "boot_command": [ - "<esc><wait>", - "install <wait>", - " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}} <wait>", - "debian-installer=en_US.UTF-8 <wait>", - "auto <wait>", - "locale=en_US.UTF-8 <wait>", - "kbd-chooser/method=us <wait>", - "keyboard-configuration/xkb-keymap=us <wait>", - "netcfg/get_hostname={{ .Name }} <wait>", - "netcfg/get_domain=vagrantup.com <wait>", - "fb=false <wait>", - "debconf/frontend=noninteractive <wait>", - "console-setup/ask_detect=false <wait>", - "console-keymaps-at/keymap=us <wait>", - "grub-installer/bootdev=/dev/sda <wait>", - "<enter><wait>" - ], - "boot_wait": "10s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", - "guest_additions_url": "{{ user `guest_additions_url` }}", - "guest_os_type": "Debian", - "hard_drive_interface": "sata", - "headless": "{{ user `headless` }}", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-virtualbox", - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "type": "virtualbox-iso", - "virtualbox_version_file": ".vbox_version", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<esc><wait>", - "install <wait>", - " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}} <wait>", - "debian-installer=en_US.UTF-8 <wait>", - "auto <wait>", - "locale=en_US.UTF-8 <wait>", - "kbd-chooser/method=us <wait>", - "keyboard-configuration/xkb-keymap=us <wait>", - "netcfg/get_hostname={{ .Name }} <wait>", - "netcfg/get_domain=vagrantup.com <wait>", - "fb=false <wait>", - "debconf/frontend=noninteractive <wait>", - "console-setup/ask_detect=false <wait>", - "console-keymaps-at/keymap=us <wait>", - "grub-installer/bootdev=/dev/sda <wait>", - "<enter><wait>" - ], - "boot_wait": "10s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "debian8", - "headless": "{{ user `headless` }}", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-vmware", - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "tools_upload_flavor": "linux", - "type": "vmware-iso", - "vm_name": "{{ user `template` }}", - "vmx_data": { - "cpuid.coresPerSocket": "1", - "ethernet0.pciSlotNumber": "32" - }, - "vmx_remove_ethernet_interfaces": true - }, - { - "boot_command": [ - "<esc><wait>", - "install <wait>", - " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}} <wait>", - "debian-installer=en_US.UTF-8 <wait>", - "auto <wait>", - "locale=en_US.UTF-8 <wait>", - "kbd-chooser/method=us <wait>", - "keyboard-configuration/xkb-keymap=us <wait>", - "netcfg/get_hostname={{ .Name }} <wait>", - "netcfg/get_domain=vagrantup.com <wait>", - "fb=false <wait>", - "debconf/frontend=noninteractive <wait>", - "console-setup/ask_detect=false <wait>", - "console-keymaps-at/keymap=us <wait>", - "grub-installer/bootdev=/dev/sda <wait>", - "<enter><wait>" - ], - "boot_wait": "10s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "debian", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-parallels", - "parallels_tools_flavor": "lin", - "prlctl_version_file": ".prlctl_version", - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "type": "parallels-iso", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<esc><wait>", - "install <wait>", - " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}} <wait>", - "debian-installer=en_US.UTF-8 <wait>", - "auto <wait>", - "locale=en_US.UTF-8 <wait>", - "kbd-chooser/method=us <wait>", - "keyboard-configuration/xkb-keymap=us <wait>", - "netcfg/get_hostname={{ .Name }} <wait>", - "netcfg/get_domain=vagrantup.com <wait>", - "fb=false <wait>", - "debconf/frontend=noninteractive <wait>", - "console-setup/ask_detect=false <wait>", - "console-keymaps-at/keymap=us <wait>", - "grub-installer/bootdev=/dev/vda <wait>", - "<enter><wait>" - ], - "boot_wait": "10s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "headless": "{{ user `headless` }}", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-qemu", - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "type": "qemu", - "vm_name": "{{ user `template` }}" - } - ], - "post-processors": [ - { - "output": "{{ user `build_directory` }}/{{user `box_basename`}}.{{.Provider}}.box", - "type": "vagrant" - } - ], - "provisioners": [ - { - "environment_vars": [ - "HOME_DIR=/home/vagrant", - "http_proxy={{user `http_proxy`}}", - "https_proxy={{user `https_proxy`}}", - "no_proxy={{user `no_proxy`}}" - ], - "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", - "expect_disconnect": true, - "scripts": [ - "{{template_dir}}/scripts/update.sh", - "{{template_dir}}/../_common/motd.sh", - "{{template_dir}}/../_common/sshd.sh", - "{{template_dir}}/scripts/networking.sh", - "{{template_dir}}/scripts/sudoers.sh", - "{{template_dir}}/../_common/vagrant.sh", - "{{template_dir}}/scripts/systemd.sh", - "{{template_dir}}/../_common/virtualbox.sh", - "{{template_dir}}/../ubuntu/scripts/vmware.sh", - "{{template_dir}}/../_common/parallels.sh", - "{{template_dir}}/scripts/cleanup.sh", - "{{template_dir}}/../_common/minimize.sh" - ], - "type": "shell" - } - ], - "variables": { - "box_basename": "debian-8.11-i386", - "build_directory": "../../builds", - "build_timestamp": "{{isotime \"20060102150405\"}}", - "cpus": "1", - "disk_size": "65536", - "git_revision": "__unknown_git_revision__", - "guest_additions_url": "", - "headless": "", - "http_directory": "{{template_dir}}/http", - "http_proxy": "{{env `http_proxy`}}", - "https_proxy": "{{env `https_proxy`}}", - "iso_checksum": "4c56c06d2ba489409f50cbf073bf3656460336dd805b0245f9b419585680b7cd", - "iso_checksum_type": "sha256", - "iso_name": "debian-8.11.0-i386-CD-1.iso", - "memory": "1024", - "mirror": "http://cdimage.debian.org/cdimage/archive", - "mirror_directory": "8.11.0/i386/iso-cd", - "name": "debian-8.11-i386", - "no_proxy": "{{env `no_proxy`}}", - "preseed_path": "debian-8/preseed.cfg", - "template": "debian-8.11-i386", - "version": "TIMESTAMP" - } -} - diff --git a/packer_templates/debian/http/debian-8/preseed.cfg b/packer_templates/debian/http/debian-8/preseed.cfg deleted file mode 100644 index 11f0e1525..000000000 --- a/packer_templates/debian/http/debian-8/preseed.cfg +++ /dev/null @@ -1,50 +0,0 @@ -choose-mirror-bin mirror/http/proxy string -d-i apt-setup/use_mirror boolean true -d-i base-installer/kernel/override-image string linux-server -d-i clock-setup/utc boolean true -d-i clock-setup/utc-auto boolean true -d-i finish-install/reboot_in_progress note -d-i grub-installer/only_debian boolean true -d-i grub-installer/with_other_os boolean true -d-i keymap select us -d-i mirror/country string manual -d-i mirror/http/directory string /debian -d-i mirror/http/hostname string httpredir.debian.org -d-i mirror/http/proxy string -d-i partman-auto-lvm/guided_size string max -d-i partman-auto/choose_recipe select atomic -d-i partman-auto/method string lvm -d-i partman-lvm/confirm boolean true -d-i partman-lvm/confirm boolean true -d-i partman-lvm/confirm_nooverwrite boolean true -d-i partman-lvm/device_remove_lvm boolean true -d-i partman/choose_partition select finish -d-i partman/confirm boolean true -d-i partman/confirm_nooverwrite boolean true -d-i partman/confirm_write_new_label boolean true -d-i passwd/root-login boolean false -d-i passwd/root-password-again password vagrant -d-i passwd/root-password password vagrant -d-i passwd/user-fullname string vagrant -d-i passwd/user-uid string 1000 -d-i passwd/user-password password vagrant -d-i passwd/user-password-again password vagrant -d-i passwd/username string vagrant -d-i pkgsel/include string sudo bzip2 acpid cryptsetup zlib1g-dev wget curl dkms fuse make nfs-common net-tools cifs-utils rsync -d-i pkgsel/install-language-support boolean false -d-i pkgsel/update-policy select none -d-i pkgsel/upgrade select full-upgrade -# Prevent packaged version of VirtualBox Guest Additions being installed: -d-i preseed/early_command string sed -i \ - '/in-target/idiscover(){/sbin/discover|grep -v VirtualBox;}' \ - /usr/lib/pre-pkgsel.d/20install-hwpackages -d-i time/zone string UTC -d-i user-setup/allow-password-weak boolean true -d-i user-setup/encrypt-home boolean false -d-i preseed/late_command string sed -i '/^deb cdrom:/s/^/#/' /target/etc/apt/sources.list -apt-cdrom-setup apt-setup/cdrom/set-first boolean false -apt-mirror-setup apt-setup/use_mirror boolean true -popularity-contest popularity-contest/participate boolean false -tasksel tasksel/first multiselect standard, ssh-server -# Fix "Debian 8 build is stuck, asking for user input" - https://github.com/chef/bento/issues/1190 -d-i apt-setup/services-select multiselect security diff --git a/packer_templates/debian/scripts/networking.sh b/packer_templates/debian/scripts/networking.sh index 28b5726b3..a574c6900 100644 --- a/packer_templates/debian/scripts/networking.sh +++ b/packer_templates/debian/scripts/networking.sh @@ -1,25 +1,9 @@ #!/bin/sh -eux -debian_version="`lsb_release -r | awk '{print $2}'`"; -major_version="`echo $debian_version | awk -F. '{print $1}'`"; - - -if [ "$major_version" -le "8" ]; then - echo "Disabling automatic udev rules for network interfaces in Debian" - # Disable automatic udev rules for network interfaces in Ubuntu, - # source: http://6.ptmc.org/164/ - rm -f /etc/udev/rules.d/70-persistent-net.rules; - mkdir -p /etc/udev/rules.d/70-persistent-net.rules; - rm -f /lib/udev/rules.d/75-persistent-net-generator.rules; - rm -rf /dev/.udev/ /var/lib/dhcp/*; -fi - -if [ "$major_version" -ge "9" ]; then - # Disable Predictable Network Interface names and use eth0 - sed -i 's/en[[:alnum:]]*/eth0/g' /etc/network/interfaces; - sed -i 's/GRUB_CMDLINE_LINUX="\(.*\)"/GRUB_CMDLINE_LINUX="net.ifnames=0 biosdevname=0 \1"/g' /etc/default/grub; - update-grub; -fi +# Disable Predictable Network Interface names and use eth0 +sed -i 's/en[[:alnum:]]*/eth0/g' /etc/network/interfaces; +sed -i 's/GRUB_CMDLINE_LINUX="\(.*\)"/GRUB_CMDLINE_LINUX="net.ifnames=0 biosdevname=0 \1"/g' /etc/default/grub; +update-grub; # Adding a 2 sec delay to the interface up, to make the dhclient happy echo "pre-up sleep 2" >> /etc/network/interfaces diff --git a/packer_templates/debian/scripts/update.sh b/packer_templates/debian/scripts/update.sh index 4b0de4373..2053de6a5 100644 --- a/packer_templates/debian/scripts/update.sh +++ b/packer_templates/debian/scripts/update.sh @@ -5,15 +5,13 @@ debian_version="`lsb_release -r | awk '{print $2}'`"; major_version="`echo $debian_version | awk -F. '{print $1}'`"; # Disable systemd apt timers/services -if [ "$major_version" -ge "9" ]; then - systemctl stop apt-daily.timer; - systemctl stop apt-daily-upgrade.timer; - systemctl disable apt-daily.timer; - systemctl disable apt-daily-upgrade.timer; - systemctl mask apt-daily.service; - systemctl mask apt-daily-upgrade.service; - systemctl daemon-reload; -fi +systemctl stop apt-daily.timer; +systemctl stop apt-daily-upgrade.timer; +systemctl disable apt-daily.timer; +systemctl disable apt-daily-upgrade.timer; +systemctl mask apt-daily.service; +systemctl mask apt-daily-upgrade.service; +systemctl daemon-reload; # Disable periodic activities of apt cat <<EOF >/etc/apt/apt.conf.d/10periodic; From ed762a32cf985efd3f351998222d6e4eeccf58fb Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Thu, 16 Jul 2020 23:51:17 -0700 Subject: [PATCH 1198/1622] Update openSUSE Leap to 15.2 Signed-off-by: Tim Smith <tsmith@chef.io> --- ...1-x86_64.json => opensuse-leap-15.2-x86_64.json} | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) rename packer_templates/opensuse/{opensuse-leap-15.1-x86_64.json => opensuse-leap-15.2-x86_64.json} (95%) diff --git a/packer_templates/opensuse/opensuse-leap-15.1-x86_64.json b/packer_templates/opensuse/opensuse-leap-15.2-x86_64.json similarity index 95% rename from packer_templates/opensuse/opensuse-leap-15.1-x86_64.json rename to packer_templates/opensuse/opensuse-leap-15.2-x86_64.json index 0b23f92e0..8d9376a0a 100644 --- a/packer_templates/opensuse/opensuse-leap-15.1-x86_64.json +++ b/packer_templates/opensuse/opensuse-leap-15.2-x86_64.json @@ -167,7 +167,7 @@ "variables": { "arch": "64", "autoinst_cfg": "15/autoinst.xml", - "box_basename": "opensuse-leap-15.1", + "box_basename": "opensuse-leap-15.2", "build_directory": "../../builds", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", @@ -178,16 +178,15 @@ "http_directory": "{{template_dir}}/http", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", - "iso_checksum": "c6d3ed19fe5cc25c4667bf0b46cc86aebcfbca3b0073aed0a288834600cb8b97", + "iso_checksum": "0fd2d4e630b6579b933b5cb4930a8100acca6b4e29cd2738c4b7a9b2f76d80e4", "iso_checksum_type": "sha256", - "iso_name": "openSUSE-Leap-15.1-DVD-x86_64.iso", + "iso_name": "openSUSE-Leap-15.2-DVD-x86_64.iso", "memory": "1024", "mirror": "http://suse.mobile-central.org/distribution", - "mirror_directory": "leap/15.1/iso", - "name": "opensuse-leap-15.1", + "mirror_directory": "leap/15.2/iso", + "name": "opensuse-leap-15.2", "no_proxy": "{{env `no_proxy`}}", - "template": "opensuse-leap-15.1-x86_64", + "template": "opensuse-leap-15.2-x86_64", "version": "TIMESTAMP" } } - From f007284e237ab6c28562b9ccd544b942227d3002 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Thu, 16 Jul 2020 23:51:33 -0700 Subject: [PATCH 1199/1622] Update Scientific Linux to 7.8 Signed-off-by: Tim Smith <tsmith@chef.io> --- ...ntific-7.7-x86_64.json => scientific-7.8-x86_64.json} | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) rename packer_templates/scientificlinux/{scientific-7.7-x86_64.json => scientific-7.8-x86_64.json} (97%) diff --git a/packer_templates/scientificlinux/scientific-7.7-x86_64.json b/packer_templates/scientificlinux/scientific-7.8-x86_64.json similarity index 97% rename from packer_templates/scientificlinux/scientific-7.7-x86_64.json rename to packer_templates/scientificlinux/scientific-7.8-x86_64.json index 06858bd02..bf5d6775d 100644 --- a/packer_templates/scientificlinux/scientific-7.7-x86_64.json +++ b/packer_templates/scientificlinux/scientific-7.8-x86_64.json @@ -156,7 +156,7 @@ } ], "variables": { - "box_basename": "scientific-7.7", + "box_basename": "scientific-7.8", "build_directory": "../../builds", "build_timestamp": "{{isotime \"20080506150405\"}}", "cpus": "1", @@ -169,17 +169,16 @@ "https_proxy": "{{env `https_proxy`}}", "hyperv_generation": "1", "hyperv_switch": "{{env `hyperv_switch`}}", - "iso_checksum": "4490f72797834a958396af929c0da6a97a69049eddbfe969a8903b5ce0fddb99", + "iso_checksum": "64eb2df3616cc1f4c278eb553dccc721bfb9a5aad3f5b5dcc677e709ad8a8b4e", "iso_checksum_type": "sha256", "iso_name": "SL-7-DVD-x86_64.iso", "ks_path": "7/ks.cfg", "memory": "1024", "mirror": "http://www.gtlib.gatech.edu/pub/scientific", - "mirror_directory": "7.7/x86_64/iso", - "name": "scientific-7.7", + "mirror_directory": "7.8/x86_64/iso", + "name": "scientific-7.8", "no_proxy": "{{env `no_proxy`}}", "template": "scientific-7-x86_64", "version": "TIMESTAMP" } } - From 211258bff1b2caa88fff95ef6c2b0f774c6c7cb4 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Thu, 16 Jul 2020 23:55:27 -0700 Subject: [PATCH 1200/1622] Remove FreeBSD 11.3 as we have 11.4 Signed-off-by: Tim Smith <tsmith@chef.io> --- .../freebsd/freebsd-11.3-amd64.json | 208 ------------------ .../freebsd/freebsd-11.3-i386.json | 208 ------------------ 2 files changed, 416 deletions(-) delete mode 100644 packer_templates/freebsd/freebsd-11.3-amd64.json delete mode 100644 packer_templates/freebsd/freebsd-11.3-i386.json diff --git a/packer_templates/freebsd/freebsd-11.3-amd64.json b/packer_templates/freebsd/freebsd-11.3-amd64.json deleted file mode 100644 index 71b5d9922..000000000 --- a/packer_templates/freebsd/freebsd-11.3-amd64.json +++ /dev/null @@ -1,208 +0,0 @@ -{ - "builders": [ - { - "boot_command": [ - "<esc><wait>", - "boot -s<wait>", - "<enter><wait>", - "<wait10><wait10>", - "/bin/sh<enter><wait>", - "mdmfs -s 100m md1 /tmp<enter><wait>", - "mdmfs -s 100m md2 /mnt<enter><wait>", - "dhclient -p /tmp/dhclient.em0.pid -l /tmp/dhclient.lease.em0 em0<enter><wait>", - "fetch -o /tmp/installerconfig http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} \u0026\u0026 bsdinstall script /tmp/installerconfig<enter><wait>" - ], - "boot_wait": "10s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "guest_additions_mode": "disable", - "guest_os_type": "FreeBSD_64", - "headless": "{{ user `headless` }}", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-virtualbox", - "shutdown_command": "echo 'vagrant' | su -m root -c 'shutdown -p now'", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "type": "virtualbox-iso", - "virtualbox_version_file": ".vbox_version", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<esc><wait>", - "boot -s<wait>", - "<enter><wait>", - "<wait10><wait10>", - "/bin/sh<enter><wait>", - "mdmfs -s 100m md1 /tmp<enter><wait>", - "mdmfs -s 100m md2 /mnt<enter><wait>", - "dhclient -p /tmp/dhclient.em0.pid -l /tmp/dhclient.lease.em0 em0<enter><wait>", - "<wait5>", - "fetch -o /tmp/installerconfig http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} \u0026\u0026 bsdinstall script /tmp/installerconfig<enter><wait>" - ], - "boot_wait": "10s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "freebsd-64", - "headless": "{{ user `headless` }}", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-vmware", - "shutdown_command": "echo 'vagrant' | su -m root -c 'shutdown -p now'", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "type": "vmware-iso", - "vm_name": "{{ user `template` }}", - "vmx_data": { - "cpuid.coresPerSocket": "1" - }, - "vmx_remove_ethernet_interfaces": true - }, - { - "boot_command": [ - "<esc><wait>", - "boot -s<wait>", - "<enter><wait>", - "<wait10><wait10>", - "/bin/sh<enter><wait>", - "mdmfs -s 100m md1 /tmp<enter><wait>", - "mdmfs -s 100m md2 /mnt<enter><wait>", - "dhclient -p /tmp/dhclient.em0.pid -l /tmp/dhclient.lease.em0 em0<enter><wait>", - "fetch -o /tmp/installerconfig http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} \u0026\u0026 bsdinstall script /tmp/installerconfig<enter><wait>" - ], - "boot_wait": "8s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "freebsd", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-parallels", - "parallels_tools_mode": "disable", - "prlctl": [ - [ - "set", - "{{.Name}}", - "--device-set", - "cdrom0", - "--iface", - "ide" - ], - [ - "set", - "{{.Name}}", - "--device-del", - "fdd0" - ], - [ - "set", - "{{.Name}}", - "--device-del", - "parallel0" - ] - ], - "prlctl_version_file": ".prlctl_version", - "shutdown_command": "echo 'vagrant' | su -m root -c 'shutdown -p now'", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "type": "parallels-iso", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<esc><wait>", - "boot -s<wait>", - "<enter><wait>", - "<wait10><wait10>", - "/bin/sh<enter><wait>", - "mdmfs -s 100m md1 /tmp<enter><wait>", - "mdmfs -s 100m md2 /mnt<enter><wait>", - "dhclient -p /tmp/dhclient.vtnet0.pid -l /tmp/dhclient.lease.vtnet0 vtnet0<enter><wait>", - "fetch -o /tmp/installerconfig http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} \u0026\u0026 bsdinstall script /tmp/installerconfig<enter><wait>" - ], - "boot_wait": "7s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "headless": "{{ user `headless` }}", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-qemu", - "shutdown_command": "echo 'vagrant' | su -m root -c 'shutdown -p now'", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "type": "qemu", - "vm_name": "{{ user `template` }}" - } - ], - "post-processors": [ - { - "output": "{{ user `build_directory` }}/{{user `box_basename`}}.{{.Provider}}.box", - "type": "vagrant", - "vagrantfile_template": "{{template_dir}}/vagrantfile_templates/freebsd.rb" - } - ], - "provisioners": [ - { - "environment_vars": [ - "HOME_DIR=/home/vagrant", - "http_proxy={{user `http_proxy`}}", - "https_proxy={{user `https_proxy`}}", - "no_proxy={{user `no_proxy`}}", - "pkg_branch={{user `pkg_branch`}}" - ], - "execute_command": "echo 'vagrant' | {{.Vars}} su -m root -c 'sh -eux {{.Path}}'", - "expect_disconnect": true, - "scripts": [ - "{{template_dir}}/scripts/update.sh", - "{{template_dir}}/scripts/postinstall.sh", - "{{template_dir}}/scripts/sudoers.sh", - "{{template_dir}}/../_common/vagrant.sh", - "{{template_dir}}/scripts/vmtools.sh", - "{{template_dir}}/scripts/cleanup.sh", - "{{template_dir}}/scripts/minimize.sh" - ], - "type": "shell" - } - ], - "variables": { - "box_basename": "freebsd-11.3", - "build_directory": "../../builds", - "build_timestamp": "{{isotime \"20060102150405\"}}", - "cpus": "1", - "disk_size": "65536", - "git_revision": "__unknown_git_revision__", - "headless": "", - "http_directory": "{{template_dir}}/http", - "http_proxy": "{{env `http_proxy`}}", - "https_proxy": "{{env `https_proxy`}}", - "install_path": "freebsd-11/installerconfig", - "iso_checksum": "d268db365e26305ec3d51b29211caad903749c33a4a8f2cf661d671f8e0ba0b0", - "iso_checksum_type": "sha256", - "iso_name": "FreeBSD-11.3-RELEASE-amd64-disc1.iso", - "memory": "1024", - "mirror": "https://download.freebsd.org/ftp", - "mirror_directory": "releases/amd64/amd64/ISO-IMAGES/11.3", - "name": "freebsd-11.3", - "no_proxy": "{{env `no_proxy`}}", - "pkg_branch": "quarterly", - "template": "freebsd-11.3-amd64", - "version": "TIMESTAMP" - } -} - diff --git a/packer_templates/freebsd/freebsd-11.3-i386.json b/packer_templates/freebsd/freebsd-11.3-i386.json deleted file mode 100644 index 4519150d1..000000000 --- a/packer_templates/freebsd/freebsd-11.3-i386.json +++ /dev/null @@ -1,208 +0,0 @@ -{ - "builders": [ - { - "boot_command": [ - "<esc><wait>", - "boot -s<wait>", - "<enter><wait>", - "<wait10><wait10>", - "/bin/sh<enter><wait>", - "mdmfs -s 100m md1 /tmp<enter><wait>", - "mdmfs -s 100m md2 /mnt<enter><wait>", - "dhclient -p /tmp/dhclient.em0.pid -l /tmp/dhclient.lease.em0 em0<enter><wait>", - "fetch -o /tmp/installerconfig http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} \u0026\u0026 bsdinstall script /tmp/installerconfig<enter><wait>" - ], - "boot_wait": "10s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "guest_additions_mode": "disable", - "guest_os_type": "FreeBSD", - "headless": "{{ user `headless` }}", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-virtualbox", - "shutdown_command": "echo 'vagrant' | su -m root -c 'shutdown -p now'", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "type": "virtualbox-iso", - "virtualbox_version_file": ".vbox_version", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<esc><wait>", - "boot -s<wait>", - "<enter><wait>", - "<wait10><wait10>", - "/bin/sh<enter><wait>", - "mdmfs -s 100m md1 /tmp<enter><wait>", - "mdmfs -s 100m md2 /mnt<enter><wait>", - "dhclient -p /tmp/dhclient.em0.pid -l /tmp/dhclient.lease.em0 em0<enter><wait>", - "<wait5>", - "fetch -o /tmp/installerconfig http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} \u0026\u0026 bsdinstall script /tmp/installerconfig<enter><wait>" - ], - "boot_wait": "10s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "freebsd", - "headless": "{{ user `headless` }}", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-vmware", - "shutdown_command": "echo 'vagrant' | su -m root -c 'shutdown -p now'", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "type": "vmware-iso", - "vm_name": "{{ user `template` }}", - "vmx_data": { - "cpuid.coresPerSocket": "1" - }, - "vmx_remove_ethernet_interfaces": true - }, - { - "boot_command": [ - "<esc><wait>", - "boot -s<wait>", - "<enter><wait>", - "<wait10><wait10>", - "/bin/sh<enter><wait>", - "mdmfs -s 100m md1 /tmp<enter><wait>", - "mdmfs -s 100m md2 /mnt<enter><wait>", - "dhclient -p /tmp/dhclient.em0.pid -l /tmp/dhclient.lease.em0 em0<enter><wait>", - "fetch -o /tmp/installerconfig http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} \u0026\u0026 bsdinstall script /tmp/installerconfig<enter><wait>" - ], - "boot_wait": "8s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "freebsd", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-parallels", - "parallels_tools_mode": "disable", - "prlctl": [ - [ - "set", - "{{.Name}}", - "--device-set", - "cdrom0", - "--iface", - "ide" - ], - [ - "set", - "{{.Name}}", - "--device-del", - "fdd0" - ], - [ - "set", - "{{.Name}}", - "--device-del", - "parallel0" - ] - ], - "prlctl_version_file": ".prlctl_version", - "shutdown_command": "echo 'vagrant' | su -m root -c 'shutdown -p now'", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "type": "parallels-iso", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<esc><wait>", - "boot -s<wait>", - "<enter><wait>", - "<wait10><wait10>", - "/bin/sh<enter><wait>", - "mdmfs -s 100m md1 /tmp<enter><wait>", - "mdmfs -s 100m md2 /mnt<enter><wait>", - "dhclient -p /tmp/dhclient.vtnet0.pid -l /tmp/dhclient.lease.vtnet0 vtnet0<enter><wait>", - "fetch -o /tmp/installerconfig http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} \u0026\u0026 bsdinstall script /tmp/installerconfig<enter><wait>" - ], - "boot_wait": "7s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "headless": "{{ user `headless` }}", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-qemu", - "shutdown_command": "echo 'vagrant' | su -m root -c 'shutdown -p now'", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "type": "qemu", - "vm_name": "{{ user `template` }}" - } - ], - "post-processors": [ - { - "output": "{{ user `build_directory` }}/{{user `box_basename`}}.{{.Provider}}.box", - "type": "vagrant", - "vagrantfile_template": "{{template_dir}}/vagrantfile_templates/freebsd.rb" - } - ], - "provisioners": [ - { - "environment_vars": [ - "HOME_DIR=/home/vagrant", - "http_proxy={{user `http_proxy`}}", - "https_proxy={{user `https_proxy`}}", - "no_proxy={{user `no_proxy`}}", - "pkg_branch={{user `pkg_branch`}}" - ], - "execute_command": "echo 'vagrant' | {{.Vars}} su -m root -c 'sh -eux {{.Path}}'", - "expect_disconnect": true, - "scripts": [ - "{{template_dir}}/scripts/update.sh", - "{{template_dir}}/scripts/postinstall.sh", - "{{template_dir}}/scripts/sudoers.sh", - "{{template_dir}}/../_common/vagrant.sh", - "{{template_dir}}/scripts/vmtools.sh", - "{{template_dir}}/scripts/cleanup.sh", - "{{template_dir}}/scripts/minimize.sh" - ], - "type": "shell" - } - ], - "variables": { - "box_basename": "freebsd-11.3-i386", - "build_directory": "../../builds", - "build_timestamp": "{{isotime \"20060102150405\"}}", - "cpus": "1", - "disk_size": "40960", - "git_revision": "__unknown_git_revision__", - "headless": "", - "http_directory": "{{template_dir}}/http", - "http_proxy": "{{env `http_proxy`}}", - "https_proxy": "{{env `https_proxy`}}", - "install_path": "freebsd-11/installerconfig", - "iso_checksum": "88860cc6ffd730dad3ee6d3eb1af88234430a26aca6f3e3e26a66521f1e66b74", - "iso_checksum_type": "sha256", - "iso_name": "FreeBSD-11.3-RELEASE-i386-disc1.iso", - "memory": "1024", - "mirror": "https://download.freebsd.org/ftp", - "mirror_directory": "releases/i386/i386/ISO-IMAGES/11.3", - "name": "freebsd-11.3-i386", - "no_proxy": "{{env `no_proxy`}}", - "pkg_branch": "quarterly", - "template": "freebsd-11.3-i386", - "version": "TIMESTAMP" - } -} - From 8fd2dade8caf3a8e17426d7eaa97c9d2ebfe9e99 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Thu, 16 Jul 2020 23:55:42 -0700 Subject: [PATCH 1201/1622] Update build.yml with the latest systems Signed-off-by: Tim Smith <tsmith@chef.io> --- builds.yml | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/builds.yml b/builds.yml index 9c5f35e31..887221045 100644 --- a/builds.yml +++ b/builds.yml @@ -5,39 +5,34 @@ public: - 'centos-6.10' - 'centos-7.8' - 'centos-8.2' -- 'debian-8.11-i386' -- 'debian-8.11' - 'debian-9.12-i386' - 'debian-9.12' - 'debian-10.4-i386' - 'debian-10.4' - 'fedora-31' - 'fedora-32' -- 'freebsd-11.3-i386' -- 'freebsd-11.3' - 'freebsd-11.4-i386' - 'freebsd-11.4' - 'freebsd-12.1-i386' - 'freebsd-12.1' -- 'opensuse-leap-15.1' +- 'opensuse-leap-15.2' - 'oracle-5.11-i386' - 'oracle-5.11' - 'oracle-6.10-i386' - 'oracle-6.10' - 'oracle-7.7' -- 'oracle-8.1' -- 'scientific-7.7' +- 'oracle-8.2' +- 'scientific-7.8' - 'ubuntu-16.04-i386' - 'ubuntu-16.04' - 'ubuntu-18.04' -- 'ubuntu-19.10' +- 'ubuntu-20.04' # slug box name: text string from standard box name to match (generally the same) slugs: 'centos-6': 'centos-6' 'centos-7': 'centos-7' 'centos-8': 'centos-8' - 'debian-8': 'debian-8' 'debian-9': 'debian-9' 'debian-10': 'debian-10' 'oracle-6': 'oracle-6' From 0558de96ff02450bdb99fa0f75e912b6040b9781 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Fri, 17 Jul 2020 00:19:05 -0700 Subject: [PATCH 1202/1622] Update Oracle Linux to 7.8 / 8.2 Signed-off-by: Tim Smith <tsmith@chef.io> --- .../{oracle-7.7-x86_64.json => oracle-7.8-x86_64.json} | 7 +++---- .../{oracle-8.1-x86_64.json => oracle-8.2-x86_64.json} | 7 +++---- 2 files changed, 6 insertions(+), 8 deletions(-) rename packer_templates/oraclelinux/{oracle-7.7-x86_64.json => oracle-7.8-x86_64.json} (97%) rename packer_templates/oraclelinux/{oracle-8.1-x86_64.json => oracle-8.2-x86_64.json} (97%) diff --git a/packer_templates/oraclelinux/oracle-7.7-x86_64.json b/packer_templates/oraclelinux/oracle-7.8-x86_64.json similarity index 97% rename from packer_templates/oraclelinux/oracle-7.7-x86_64.json rename to packer_templates/oraclelinux/oracle-7.8-x86_64.json index 7144c23b1..c3a6c917b 100644 --- a/packer_templates/oraclelinux/oracle-7.7-x86_64.json +++ b/packer_templates/oraclelinux/oracle-7.8-x86_64.json @@ -170,17 +170,16 @@ "https_proxy": "{{env `https_proxy`}}", "hyperv_generation": "1", "hyperv_switch": "{{env `hyperv_switch`}}", - "iso_checksum": "1d06cef6a518c32c0e7adcad0a99a8efbc7516066de41118ebf49002c15ea84d", + "iso_checksum": "6e1069ff42f7e59b19af4e2fcacae2fca3f195c7f2904275b0df386efdcd616d", "iso_checksum_type": "sha256", - "iso_name": "OracleLinux-R7-U7-Server-x86_64-dvd.iso", + "iso_name": "OracleLinux-R7-U8-Server-x86_64-dvd.iso", "ks_path": "7/ks.cfg", "memory": "1024", "mirror": "http://mirrors.dotsrc.org/oracle-linux", - "mirror_directory": "OL7/u7/x86_64", + "mirror_directory": "OL7/u8/x86_64", "name": "oracle-7.7", "no_proxy": "{{env `no_proxy`}}", "template": "oracle-7.7-x86_64", "version": "TIMESTAMP" } } - diff --git a/packer_templates/oraclelinux/oracle-8.1-x86_64.json b/packer_templates/oraclelinux/oracle-8.2-x86_64.json similarity index 97% rename from packer_templates/oraclelinux/oracle-8.1-x86_64.json rename to packer_templates/oraclelinux/oracle-8.2-x86_64.json index a4a0bbdf0..7cc073458 100644 --- a/packer_templates/oraclelinux/oracle-8.1-x86_64.json +++ b/packer_templates/oraclelinux/oracle-8.2-x86_64.json @@ -169,17 +169,16 @@ "https_proxy": "{{env `https_proxy`}}", "hyperv_generation": "1", "hyperv_switch": "{{env `hyperv_switch`}}", - "iso_checksum": "8a8afc79c3e30209058201ff91a662b030f13951c7fa4d896f89dd356b3c6f22", + "iso_checksum": "67568941e976efb26a3d61cdbf98c5a46cd0b3463ec750992f305eee20957a6e", "iso_checksum_type": "sha256", - "iso_name": "OracleLinux-R8-U1-x86_64-dvd.iso", + "iso_name": "OracleLinux-R8-U2-x86_64-dvd.iso", "ks_path": "8/ks.cfg", "memory": "1024", "mirror": "http://mirrors.dotsrc.org/oracle-linux", - "mirror_directory": "OL8/u1/x86_64", + "mirror_directory": "OL8/u2/x86_64", "name": "oracle-8.1", "no_proxy": "{{env `no_proxy`}}", "template": "oracle-8.1-x86_64", "version": "TIMESTAMP" } } - From 4a111f6462601e27997d2083e408b78e6f4b3b50 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Fri, 17 Jul 2020 10:20:42 -0700 Subject: [PATCH 1203/1622] Fix some bad versions in the Oracle configs Signed-off-by: Tim Smith <tsmith@chef.io> --- packer_templates/oraclelinux/oracle-7.8-x86_64.json | 6 +++--- packer_templates/oraclelinux/oracle-8.2-x86_64.json | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/packer_templates/oraclelinux/oracle-7.8-x86_64.json b/packer_templates/oraclelinux/oracle-7.8-x86_64.json index c3a6c917b..15926d712 100644 --- a/packer_templates/oraclelinux/oracle-7.8-x86_64.json +++ b/packer_templates/oraclelinux/oracle-7.8-x86_64.json @@ -157,7 +157,7 @@ ], "variables": { "arch": "64", - "box_basename": "oracle-7.7", + "box_basename": "oracle-7.8", "build_directory": "../../builds", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", @@ -177,9 +177,9 @@ "memory": "1024", "mirror": "http://mirrors.dotsrc.org/oracle-linux", "mirror_directory": "OL7/u8/x86_64", - "name": "oracle-7.7", + "name": "oracle-7.8", "no_proxy": "{{env `no_proxy`}}", - "template": "oracle-7.7-x86_64", + "template": "oracle-7.8-x86_64", "version": "TIMESTAMP" } } diff --git a/packer_templates/oraclelinux/oracle-8.2-x86_64.json b/packer_templates/oraclelinux/oracle-8.2-x86_64.json index 7cc073458..3c16a0e4a 100644 --- a/packer_templates/oraclelinux/oracle-8.2-x86_64.json +++ b/packer_templates/oraclelinux/oracle-8.2-x86_64.json @@ -156,7 +156,7 @@ } ], "variables": { - "box_basename": "oracle-8.1", + "box_basename": "oracle-8.2", "build_directory": "../../builds", "build_timestamp": "{{isotime \"2019102650405\"}}", "cpus": "1", @@ -176,9 +176,9 @@ "memory": "1024", "mirror": "http://mirrors.dotsrc.org/oracle-linux", "mirror_directory": "OL8/u2/x86_64", - "name": "oracle-8.1", + "name": "oracle-8.2", "no_proxy": "{{env `no_proxy`}}", - "template": "oracle-8.1-x86_64", + "template": "oracle-8.2-x86_64", "version": "TIMESTAMP" } } From 9345473099a1a41a16a130e8f1e52e44d24077e4 Mon Sep 17 00:00:00 2001 From: dragon788 <dragon788@users.noreply.github.com> Date: Sat, 18 Jul 2020 17:27:05 -0500 Subject: [PATCH 1204/1622] Enabling disk size overrides for Windows Explicitly sets value matching Packer default of approximately 40GB (40000 megabytes) Removes deprecated iso_checksum_type Removes hardcoded `sha1:` prefixed to iso_checksum as Packer can infer the type and supports getting checksums from a file: URI which this would have broken. https://www.packer.io/docs/builders/virtualbox/iso#iso_checksum Signed-off-by: dragon788 <dragon788@users.noreply.github.com> --- packer_templates/windows/windows-10.json | 16 +++++++++++----- packer_templates/windows/windows-2012.json | 17 +++++++++++------ packer_templates/windows/windows-2012r2.json | 16 +++++++++++----- packer_templates/windows/windows-2016.json | 16 +++++++++++----- packer_templates/windows/windows-2019.json | 16 +++++++++++----- 5 files changed, 55 insertions(+), 26 deletions(-) diff --git a/packer_templates/windows/windows-10.json b/packer_templates/windows/windows-10.json index 564b810d9..185f86fbb 100644 --- a/packer_templates/windows/windows-10.json +++ b/packer_templates/windows/windows-10.json @@ -3,12 +3,13 @@ { "communicator": "winrm", "cpus": "{{ user `cpus` }}", + "disk_size": "{{user `disk_size`}}", "floppy_files": [ "{{ user `floppy_dir` }}/{{ user `unattended_file_path` }}", "{{template_dir}}/scripts/base_setup.ps1" ], "headless": "{{ user `headless` }}", - "iso_checksum": "sha1:{{ user `iso_checksum` }}", + "iso_checksum": "{{ user `iso_checksum` }}", "iso_url": "{{ user `iso_url` }}", "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-virtualbox", @@ -23,6 +24,7 @@ { "communicator": "winrm", "cpus": "{{ user `cpus` }}", + "disk_size": "{{user `disk_size`}}", "floppy_files": [ "{{ user `floppy_dir` }}/{{ user `unattended_file_path` }}", "{{template_dir}}/scripts/base_setup.ps1" @@ -33,7 +35,7 @@ "guest_os_type": "Windows10_64", "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", - "iso_checksum": "sha1:{{ user `iso_checksum` }}", + "iso_checksum": "{{ user `iso_checksum` }}", "iso_interface": "sata", "iso_url": "{{ user `iso_url` }}", "memory": "{{ user `memory` }}", @@ -62,12 +64,13 @@ { "communicator": "winrm", "cpus": "{{ user `cpus` }}", + "disk_size": "{{user `disk_size`}}", "floppy_files": [ "{{ user `floppy_dir` }}/{{ user `unattended_file_path` }}", "{{template_dir}}/scripts/base_setup.ps1" ], "guest_os_type": "win-10", - "iso_checksum": "sha1:{{ user `iso_checksum` }}", + "iso_checksum": "{{ user `iso_checksum` }}", "iso_url": "{{ user `iso_url` }}", "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-parallels", @@ -93,13 +96,14 @@ "communicator": "winrm", "cpus": "{{ user `cpus` }}", "disk_adapter_type": "lsisas1068", + "disk_size": "{{user `disk_size`}}", "floppy_files": [ "{{ user `floppy_dir` }}/{{ user `unattended_file_path` }}", "{{template_dir}}/scripts/base_setup.ps1" ], "guest_os_type": "windows9srv-64", "headless": "{{ user `headless` }}", - "iso_checksum": "sha1:{{ user `iso_checksum` }}", + "iso_checksum": "{{ user `iso_checksum` }}", "iso_url": "{{ user `iso_url` }}", "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-vmware", @@ -116,12 +120,13 @@ { "communicator": "winrm", "cpus": "{{ user `cpus` }}", + "disk_size": "{{user `disk_size`}}", "floppy_files": [ "{{ user `floppy_dir` }}/{{ user `unattended_file_path` }}", "{{template_dir}}/scripts/base_setup.ps1" ], "headless": "{{ user `headless` }}", - "iso_checksum": "sha1:{{ user `iso_checksum` }}", + "iso_checksum": "{{ user `iso_checksum` }}", "iso_url": "{{ user `iso_url` }}", "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-qemu", @@ -219,6 +224,7 @@ "variables": { "build_directory": "../../builds", "cpus": "2", + "disk_size": "40000", "floppy_dir": "{{template_dir}}/answer_files", "guest_additions_mode": "attach", "guest_additions_url": "", diff --git a/packer_templates/windows/windows-2012.json b/packer_templates/windows/windows-2012.json index 2b1c20186..0f4ecc256 100644 --- a/packer_templates/windows/windows-2012.json +++ b/packer_templates/windows/windows-2012.json @@ -3,11 +3,12 @@ { "communicator": "winrm", "cpus": "{{ user `cpus` }}", + "disk_size": "{{user `disk_size`}}", "floppy_files": [ "{{ user `floppy_dir` }}/{{ user `unattended_file_path` }}" ], "headless": "{{ user `headless` }}", - "iso_checksum": "sha1:{{ user `iso_checksum` }}", + "iso_checksum": "{{ user `iso_checksum` }}", "iso_url": "{{ user `iso_url` }}", "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-virtualbox", @@ -22,6 +23,7 @@ { "communicator": "winrm", "cpus": "{{ user `cpus` }}", + "disk_size": "{{user `disk_size`}}", "floppy_files": [ "{{ user `floppy_dir` }}/{{ user `unattended_file_path` }}" ], @@ -31,7 +33,7 @@ "guest_os_type": "Windows2012_64", "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", - "iso_checksum": "sha1:{{ user `iso_checksum` }}", + "iso_checksum": "{{ user `iso_checksum` }}", "iso_interface": "sata", "iso_url": "{{ user `iso_url` }}", "memory": "{{ user `memory` }}", @@ -60,11 +62,12 @@ { "communicator": "winrm", "cpus": "{{ user `cpus` }}", + "disk_size": "{{user `disk_size`}}", "floppy_files": [ "{{ user `floppy_dir` }}/{{ user `unattended_file_path` }}" ], "guest_os_type": "win-2012", - "iso_checksum": "sha1:{{ user `iso_checksum` }}", + "iso_checksum": "{{ user `iso_checksum` }}", "iso_url": "{{ user `iso_url` }}", "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-parallels", @@ -89,12 +92,13 @@ "communicator": "winrm", "cpus": "{{ user `cpus` }}", "disk_adapter_type": "lsisas1068", + "disk_size": "{{user `disk_size`}}", "floppy_files": [ "{{ user `floppy_dir` }}/{{ user `unattended_file_path` }}" ], "guest_os_type": "windows9srv-64", "headless": "{{ user `headless` }}", - "iso_checksum": "sha1:{{ user `iso_checksum` }}", + "iso_checksum": "{{ user `iso_checksum` }}", "iso_url": "{{ user `iso_url` }}", "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-vmware", @@ -111,11 +115,12 @@ { "communicator": "winrm", "cpus": "{{ user `cpus` }}", + "disk_size": "{{user `disk_size`}}", "floppy_files": [ "{{ user `floppy_dir` }}/{{ user `unattended_file_path` }}" ], "headless": "{{ user `headless` }}", - "iso_checksum": "sha1:{{ user `iso_checksum` }}", + "iso_checksum": "{{ user `iso_checksum` }}", "iso_url": "{{ user `iso_url` }}", "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-qemu", @@ -212,13 +217,13 @@ "variables": { "build_directory": "../../builds", "cpus": "2", + "disk_size": "40000", "floppy_dir": "{{template_dir}}/answer_files", "guest_additions_mode": "attach", "guest_additions_url": "", "headless": "true", "hyperv_switch": "{{env `hyperv_switch`}}", "iso_checksum": "922b365c3360ce630f6a4b4f2f3c79e66165c0fb", - "iso_checksum_type": "sha1", "iso_url": "http://download.microsoft.com/download/6/D/A/6DAB58BA-F939-451D-9101-7DE07DC09C03/9200.16384.WIN8_RTM.120725-1247_X64FRE_SERVER_EVAL_EN-US-HRM_SSS_X64FREE_EN-US_DV5.ISO", "memory": "4096", "template": "windows-2012-standard", diff --git a/packer_templates/windows/windows-2012r2.json b/packer_templates/windows/windows-2012r2.json index ea8ea5de7..18a4ab5e3 100644 --- a/packer_templates/windows/windows-2012r2.json +++ b/packer_templates/windows/windows-2012r2.json @@ -3,11 +3,12 @@ { "communicator": "winrm", "cpus": "{{ user `cpus` }}", + "disk_size": "{{user `disk_size`}}", "floppy_files": [ "{{ user `floppy_dir` }}/{{ user `unattended_file_path` }}" ], "headless": "{{ user `headless` }}", - "iso_checksum": "sha1:{{ user `iso_checksum` }}", + "iso_checksum": "{{ user `iso_checksum` }}", "iso_url": "{{ user `iso_url` }}", "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-virtualbox", @@ -22,6 +23,7 @@ { "communicator": "winrm", "cpus": "{{ user `cpus` }}", + "disk_size": "{{user `disk_size`}}", "floppy_files": [ "{{ user `floppy_dir` }}/{{ user `unattended_file_path` }}" ], @@ -31,7 +33,7 @@ "guest_os_type": "Windows2012_64", "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", - "iso_checksum": "sha1:{{ user `iso_checksum` }}", + "iso_checksum": "{{ user `iso_checksum` }}", "iso_interface": "sata", "iso_url": "{{ user `iso_url` }}", "memory": "{{ user `memory` }}", @@ -60,11 +62,12 @@ { "communicator": "winrm", "cpus": "{{ user `cpus` }}", + "disk_size": "{{user `disk_size`}}", "floppy_files": [ "{{ user `floppy_dir` }}/{{ user `unattended_file_path` }}" ], "guest_os_type": "win-2012", - "iso_checksum": "sha1:{{ user `iso_checksum` }}", + "iso_checksum": "{{ user `iso_checksum` }}", "iso_url": "{{ user `iso_url` }}", "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-parallels", @@ -89,12 +92,13 @@ "communicator": "winrm", "cpus": "{{ user `cpus` }}", "disk_adapter_type": "lsisas1068", + "disk_size": "{{user `disk_size`}}", "floppy_files": [ "{{ user `floppy_dir` }}/{{ user `unattended_file_path` }}" ], "guest_os_type": "windows9srv-64", "headless": "{{ user `headless` }}", - "iso_checksum": "sha1:{{ user `iso_checksum` }}", + "iso_checksum": "{{ user `iso_checksum` }}", "iso_url": "{{ user `iso_url` }}", "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-vmware", @@ -111,11 +115,12 @@ { "communicator": "winrm", "cpus": "{{ user `cpus` }}", + "disk_size": "{{user `disk_size`}}", "floppy_files": [ "{{ user `floppy_dir` }}/{{ user `unattended_file_path` }}" ], "headless": "{{ user `headless` }}", - "iso_checksum": "sha1:{{ user `iso_checksum` }}", + "iso_checksum": "{{ user `iso_checksum` }}", "iso_url": "{{ user `iso_url` }}", "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-qemu", @@ -212,6 +217,7 @@ "variables": { "build_directory": "../../builds", "cpus": "2", + "disk_size": "40000", "floppy_dir": "{{template_dir}}/answer_files", "guest_additions_mode": "attach", "guest_additions_url": "", diff --git a/packer_templates/windows/windows-2016.json b/packer_templates/windows/windows-2016.json index 35a9f259e..a6d59c4a2 100644 --- a/packer_templates/windows/windows-2016.json +++ b/packer_templates/windows/windows-2016.json @@ -3,11 +3,12 @@ { "communicator": "winrm", "cpus": "{{ user `cpus` }}", + "disk_size": "{{user `disk_size`}}", "floppy_files": [ "{{ user `floppy_dir` }}/{{ user `unattended_file_path` }}" ], "headless": "{{ user `headless` }}", - "iso_checksum": "sha1:{{ user `iso_checksum` }}", + "iso_checksum": "{{ user `iso_checksum` }}", "iso_url": "{{ user `iso_url` }}", "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-virtualbox", @@ -22,6 +23,7 @@ { "communicator": "winrm", "cpus": "{{ user `cpus` }}", + "disk_size": "{{user `disk_size`}}", "floppy_files": [ "{{ user `floppy_dir` }}/{{ user `unattended_file_path` }}" ], @@ -31,7 +33,7 @@ "guest_os_type": "Windows2016_64", "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", - "iso_checksum": "sha1:{{ user `iso_checksum` }}", + "iso_checksum": "{{ user `iso_checksum` }}", "iso_interface": "sata", "iso_url": "{{ user `iso_url` }}", "memory": "{{ user `memory` }}", @@ -60,11 +62,12 @@ { "communicator": "winrm", "cpus": "{{ user `cpus` }}", + "disk_size": "{{user `disk_size`}}", "floppy_files": [ "{{ user `floppy_dir` }}/{{ user `unattended_file_path` }}" ], "guest_os_type": "win-2016", - "iso_checksum": "sha1:{{ user `iso_checksum` }}", + "iso_checksum": "{{ user `iso_checksum` }}", "iso_url": "{{ user `iso_url` }}", "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-parallels", @@ -89,12 +92,13 @@ "communicator": "winrm", "cpus": "{{ user `cpus` }}", "disk_adapter_type": "lsisas1068", + "disk_size": "{{user `disk_size`}}", "floppy_files": [ "{{ user `floppy_dir` }}/{{ user `unattended_file_path` }}" ], "guest_os_type": "windows9srv-64", "headless": "{{ user `headless` }}", - "iso_checksum": "sha1:{{ user `iso_checksum` }}", + "iso_checksum": "{{ user `iso_checksum` }}", "iso_url": "{{ user `iso_url` }}", "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-vmware", @@ -111,11 +115,12 @@ { "communicator": "winrm", "cpus": "{{ user `cpus` }}", + "disk_size": "{{user `disk_size`}}", "floppy_files": [ "{{ user `floppy_dir` }}/{{ user `unattended_file_path` }}" ], "headless": "{{ user `headless` }}", - "iso_checksum": "sha1:{{ user `iso_checksum` }}", + "iso_checksum": "{{ user `iso_checksum` }}", "iso_url": "{{ user `iso_url` }}", "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-qemu", @@ -212,6 +217,7 @@ "variables": { "build_directory": "../../builds", "cpus": "2", + "disk_size": "40000", "floppy_dir": "{{template_dir}}/answer_files", "guest_additions_mode": "attach", "guest_additions_url": "", diff --git a/packer_templates/windows/windows-2019.json b/packer_templates/windows/windows-2019.json index ed80dcac0..bb53f2cf3 100644 --- a/packer_templates/windows/windows-2019.json +++ b/packer_templates/windows/windows-2019.json @@ -3,11 +3,12 @@ { "communicator": "winrm", "cpus": "{{ user `cpus` }}", + "disk_size": "{{user `disk_size`}}", "floppy_files": [ "{{ user `floppy_dir` }}/{{ user `unattended_file_path` }}" ], "headless": "{{ user `headless` }}", - "iso_checksum": "sha1:{{ user `iso_checksum` }}", + "iso_checksum": "{{ user `iso_checksum` }}", "iso_url": "{{ user `iso_url` }}", "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-virtualbox", @@ -22,6 +23,7 @@ { "communicator": "winrm", "cpus": "{{ user `cpus` }}", + "disk_size": "{{user `disk_size`}}", "floppy_files": [ "{{ user `floppy_dir` }}/{{ user `unattended_file_path` }}" ], @@ -31,7 +33,7 @@ "guest_os_type": "Windows2016_64", "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", - "iso_checksum": "sha1:{{ user `iso_checksum` }}", + "iso_checksum": "{{ user `iso_checksum` }}", "iso_interface": "sata", "iso_url": "{{ user `iso_url` }}", "memory": "{{ user `memory` }}", @@ -60,11 +62,12 @@ { "communicator": "winrm", "cpus": "{{ user `cpus` }}", + "disk_size": "{{user `disk_size`}}", "floppy_files": [ "{{ user `floppy_dir` }}/{{ user `unattended_file_path` }}" ], "guest_os_type": "win-2019", - "iso_checksum": "sha1:{{ user `iso_checksum` }}", + "iso_checksum": "{{ user `iso_checksum` }}", "iso_url": "{{ user `iso_url` }}", "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-parallels", @@ -89,12 +92,13 @@ "communicator": "winrm", "cpus": "{{ user `cpus` }}", "disk_adapter_type": "lsisas1068", + "disk_size": "{{user `disk_size`}}", "floppy_files": [ "{{ user `floppy_dir` }}/{{ user `unattended_file_path` }}" ], "guest_os_type": "windows9srv-64", "headless": "{{ user `headless` }}", - "iso_checksum": "sha1:{{ user `iso_checksum` }}", + "iso_checksum": "{{ user `iso_checksum` }}", "iso_url": "{{ user `iso_url` }}", "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-vmware", @@ -111,11 +115,12 @@ { "communicator": "winrm", "cpus": "{{ user `cpus` }}", + "disk_size": "{{user `disk_size`}}", "floppy_files": [ "{{ user `floppy_dir` }}/{{ user `unattended_file_path` }}" ], "headless": "{{ user `headless` }}", - "iso_checksum": "sha1:{{ user `iso_checksum` }}", + "iso_checksum": "{{ user `iso_checksum` }}", "iso_url": "{{ user `iso_url` }}", "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-qemu", @@ -212,6 +217,7 @@ "variables": { "build_directory": "../../builds", "cpus": "2", + "disk_size": "40000", "floppy_dir": "{{template_dir}}/answer_files", "guest_additions_mode": "attach", "guest_additions_url": "", From a50a4bdb219aacc0f0b1084b77ae73a2a8295dae Mon Sep 17 00:00:00 2001 From: dragon788 <dragon788@users.noreply.github.com> Date: Sat, 18 Jul 2020 18:42:31 -0500 Subject: [PATCH 1205/1622] Made macOS templates valid so rake validate can succeed Signed-off-by: dragon788 <dragon788@users.noreply.github.com> --- packer_templates/macos/macos-10.12.json | 9 ++++----- packer_templates/macos/macosx-10.11.json | 9 ++++----- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/packer_templates/macos/macos-10.12.json b/packer_templates/macos/macos-10.12.json index a2c4e5bfb..1d8b4336b 100644 --- a/packer_templates/macos/macos-10.12.json +++ b/packer_templates/macos/macos-10.12.json @@ -6,7 +6,7 @@ "disk_size": "{{user `disk_size`}}", "guest_os_type": "darwin12-64", "headless": "{{ user `headless` }}", - "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", + "iso_checksum": "{{user `iso_checksum`}}", "iso_url": "{{user `iso_url`}}", "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-vmware", @@ -40,7 +40,7 @@ "guest_os_type": "MacOS1011_64", "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", - "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", + "iso_checksum": "{{user `iso_checksum`}}", "iso_url": "{{user `iso_url`}}", "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-virtualbox", @@ -147,7 +147,7 @@ "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "guest_os_type": "macosx", - "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", + "iso_checksum": "{{user `iso_checksum`}}", "iso_url": "{{user `iso_url`}}", "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-parallels", @@ -218,8 +218,7 @@ "headless": "", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", - "iso_checksum": "__unset_iso_checksum__", - "iso_checksum_type": "md5", + "iso_checksum": "none", "iso_url": "http://YOU-MUST-PROVIDE-YOUR-OWN-DMG.sorry", "memory": "2048", "name": "macos-10.12", diff --git a/packer_templates/macos/macosx-10.11.json b/packer_templates/macos/macosx-10.11.json index 836d594ec..d9c2661b9 100644 --- a/packer_templates/macos/macosx-10.11.json +++ b/packer_templates/macos/macosx-10.11.json @@ -6,7 +6,7 @@ "disk_size": "{{user `disk_size`}}", "guest_os_type": "darwin12-64", "headless": "{{ user `headless` }}", - "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", + "iso_checksum": "{{user `iso_checksum`}}", "iso_url": "{{user `iso_url`}}", "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-vmware", @@ -40,7 +40,7 @@ "guest_os_type": "MacOS1011_64", "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", - "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", + "iso_checksum": "{{user `iso_checksum`}}", "iso_url": "{{user `iso_url`}}", "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-virtualbox", @@ -147,7 +147,7 @@ "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "guest_os_type": "macosx", - "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", + "iso_checksum": "{{user `iso_checksum`}}", "iso_url": "{{user `iso_url`}}", "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-parallels", @@ -218,8 +218,7 @@ "headless": "", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", - "iso_checksum": "__unset_iso_checksum__", - "iso_checksum_type": "md5", + "iso_checksum": "none", "iso_url": "http://YOU-MUST-PROVIDE-YOUR-OWN-DMG.sorry", "memory": "2048", "name": "macosx-10.11", From 010099b9b3f843a546b83f4531552a4518517222 Mon Sep 17 00:00:00 2001 From: dragon788 <dragon788@users.noreply.github.com> Date: Sat, 18 Jul 2020 18:40:51 -0500 Subject: [PATCH 1206/1622] Remove iso_checksum_type and references as Packer can infer them and it would prevent using a file: URI for the checksum which very useful if building a custom ISO with drivers/updates Signed-off-by: dragon788 <dragon788@users.noreply.github.com> --- packer_templates/centos/centos-6.10-i386.json | 11 +++++------ packer_templates/centos/centos-6.10-x86_64.json | 11 +++++------ packer_templates/centos/centos-7.8-x86_64.json | 11 +++++------ packer_templates/centos/centos-8.2-x86_64.json | 11 +++++------ packer_templates/debian/debian-10.4-amd64.json | 9 ++++----- packer_templates/debian/debian-10.4-i386.json | 9 ++++----- packer_templates/debian/debian-9.12-amd64.json | 9 ++++----- packer_templates/debian/debian-9.12-i386.json | 9 ++++----- packer_templates/debian/debian-9.12-ppc64el.json | 3 +-- packer_templates/fedora/fedora-31-x86_64.json | 11 +++++------ packer_templates/fedora/fedora-32-x86_64.json | 11 +++++------ packer_templates/freebsd/freebsd-11.4-amd64.json | 9 ++++----- packer_templates/freebsd/freebsd-11.4-i386.json | 9 ++++----- packer_templates/freebsd/freebsd-12.1-amd64.json | 9 ++++----- packer_templates/freebsd/freebsd-12.1-i386.json | 9 ++++----- .../hardenedbsd/hardenedbsd-11-amd64.json | 9 ++++----- .../opensuse/opensuse-leap-15.2-x86_64.json | 9 ++++----- packer_templates/oraclelinux/oracle-5.11-i386.json | 11 +++++------ packer_templates/oraclelinux/oracle-5.11-x86_64.json | 11 +++++------ packer_templates/oraclelinux/oracle-6.10-i386.json | 11 +++++------ packer_templates/oraclelinux/oracle-6.10-x86_64.json | 11 +++++------ packer_templates/oraclelinux/oracle-7.8-x86_64.json | 11 +++++------ packer_templates/oraclelinux/oracle-8.2-x86_64.json | 11 +++++------ packer_templates/rhel/rhel-5.11-i386.json | 9 ++++----- packer_templates/rhel/rhel-5.11-x86_64.json | 9 ++++----- packer_templates/rhel/rhel-6.10-i386.json | 9 ++++----- packer_templates/rhel/rhel-6.10-x86_64.json | 9 ++++----- packer_templates/rhel/rhel-7.6-x86_64.json | 9 ++++----- packer_templates/rhel/rhel-8.0-x86_64.json | 9 ++++----- .../scientificlinux/scientific-7.8-x86_64.json | 11 +++++------ packer_templates/sles/sles-11-sp4-x86_64.json | 9 ++++----- packer_templates/sles/sles-12-sp2-x86_64.json | 9 ++++----- packer_templates/sles/sles-12-sp3-x86_64.json | 9 ++++----- packer_templates/sles/sles-15-sp1.json | 9 ++++----- packer_templates/sles/sles-15.json | 9 ++++----- packer_templates/ubuntu/ubuntu-16.04-amd64.json | 11 +++++------ packer_templates/ubuntu/ubuntu-16.04-i386.json | 11 +++++------ packer_templates/ubuntu/ubuntu-18.04-amd64.json | 11 +++++------ packer_templates/ubuntu/ubuntu-19.10-amd64.json | 11 +++++------ packer_templates/ubuntu/ubuntu-20.04-amd64.json | 11 +++++------ 40 files changed, 175 insertions(+), 215 deletions(-) diff --git a/packer_templates/centos/centos-6.10-i386.json b/packer_templates/centos/centos-6.10-i386.json index 08a6071ab..ce872882b 100644 --- a/packer_templates/centos/centos-6.10-i386.json +++ b/packer_templates/centos/centos-6.10-i386.json @@ -13,7 +13,7 @@ "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", + "iso_checksum": "{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-virtualbox", @@ -36,7 +36,7 @@ "guest_os_type": "centos", "headless": "{{ user `headless` }}", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", + "iso_checksum": "{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-vmware", @@ -62,7 +62,7 @@ "disk_size": "{{user `disk_size`}}", "guest_os_type": "centos", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", + "iso_checksum": "{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-parallels", @@ -89,7 +89,7 @@ "generation": "{{user `hyperv_generation`}}", "guest_additions_mode": "disable", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", + "iso_checksum": "{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-hyperv", @@ -111,7 +111,7 @@ "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", + "iso_checksum": "{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-qemu", @@ -169,7 +169,6 @@ "https_proxy": "{{env `https_proxy`}}", "hyperv_generation": "1", "iso_checksum": "25d95b3f178e59bd672fa97e043a9191cbf73bb6cd12f5df9b540fa88076cae8", - "iso_checksum_type": "sha256", "iso_name": "CentOS-6.10-i386-bin-DVD1.iso", "ks_path": "6/ks.cfg", "memory": "1024", diff --git a/packer_templates/centos/centos-6.10-x86_64.json b/packer_templates/centos/centos-6.10-x86_64.json index 924e79569..63c020d66 100644 --- a/packer_templates/centos/centos-6.10-x86_64.json +++ b/packer_templates/centos/centos-6.10-x86_64.json @@ -13,7 +13,7 @@ "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", + "iso_checksum": "{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-virtualbox", @@ -36,7 +36,7 @@ "guest_os_type": "centos-64", "headless": "{{ user `headless` }}", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", + "iso_checksum": "{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-vmware", @@ -62,7 +62,7 @@ "disk_size": "{{user `disk_size`}}", "guest_os_type": "centos", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", + "iso_checksum": "{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-parallels", @@ -89,7 +89,7 @@ "generation": "{{user `hyperv_generation`}}", "guest_additions_mode": "disable", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", + "iso_checksum": "{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-hyperv", @@ -111,7 +111,7 @@ "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", + "iso_checksum": "{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-qemu", @@ -170,7 +170,6 @@ "hyperv_generation": "1", "hyperv_switch": "{{env `hyperv_switch`}}", "iso_checksum": "a68e46970678d4d297d46086ae2efdd3e994322d6d862ff51dcce25a0759e41c", - "iso_checksum_type": "sha256", "iso_name": "CentOS-6.10-x86_64-bin-DVD1.iso", "ks_path": "6/ks.cfg", "memory": "1024", diff --git a/packer_templates/centos/centos-7.8-x86_64.json b/packer_templates/centos/centos-7.8-x86_64.json index 60e28b6cb..dbebb1d1d 100644 --- a/packer_templates/centos/centos-7.8-x86_64.json +++ b/packer_templates/centos/centos-7.8-x86_64.json @@ -13,7 +13,7 @@ "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", + "iso_checksum": "{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-virtualbox", @@ -36,7 +36,7 @@ "guest_os_type": "centos-64", "headless": "{{ user `headless` }}", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", + "iso_checksum": "{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-vmware", @@ -62,7 +62,7 @@ "disk_size": "{{user `disk_size`}}", "guest_os_type": "centos", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", + "iso_checksum": "{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-parallels", @@ -89,7 +89,7 @@ "generation": "{{user `hyperv_generation`}}", "guest_additions_mode": "disable", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", + "iso_checksum": "{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-hyperv", @@ -111,7 +111,7 @@ "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", + "iso_checksum": "{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-qemu", @@ -170,7 +170,6 @@ "hyperv_generation": "1", "hyperv_switch": "{{env `hyperv_switch`}}", "iso_checksum": "087a5743dc6fd6706d9b961b8147423ddc029451b938364c760d75440eb7be14", - "iso_checksum_type": "sha256", "iso_name": "CentOS-7-x86_64-DVD-2003.iso", "ks_path": "7/ks.cfg", "memory": "1024", diff --git a/packer_templates/centos/centos-8.2-x86_64.json b/packer_templates/centos/centos-8.2-x86_64.json index cddb6d0dc..5364863a0 100644 --- a/packer_templates/centos/centos-8.2-x86_64.json +++ b/packer_templates/centos/centos-8.2-x86_64.json @@ -13,7 +13,7 @@ "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", + "iso_checksum": "{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-virtualbox", @@ -36,7 +36,7 @@ "guest_os_type": "centos-64", "headless": "{{ user `headless` }}", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", + "iso_checksum": "{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-vmware", @@ -62,7 +62,7 @@ "disk_size": "{{user `disk_size`}}", "guest_os_type": "centos", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", + "iso_checksum": "{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-parallels", @@ -89,7 +89,7 @@ "generation": "{{user `hyperv_generation`}}", "guest_additions_mode": "disable", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", + "iso_checksum": "{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-hyperv", @@ -111,7 +111,7 @@ "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", + "iso_checksum": "{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-qemu", @@ -170,7 +170,6 @@ "hyperv_generation": "1", "hyperv_switch": "{{env `hyperv_switch`}}", "iso_checksum": "c87a2d81d67bbaeaf646aea5bedd70990078ec252fc52f5a7d65ff609871e255", - "iso_checksum_type": "sha256", "iso_name": "CentOS-8.2.2004-x86_64-dvd1.iso", "ks_path": "8/ks.cfg", "memory": "1024", diff --git a/packer_templates/debian/debian-10.4-amd64.json b/packer_templates/debian/debian-10.4-amd64.json index 85a5145a3..ac5e6acb6 100644 --- a/packer_templates/debian/debian-10.4-amd64.json +++ b/packer_templates/debian/debian-10.4-amd64.json @@ -28,7 +28,7 @@ "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", + "iso_checksum": "{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-virtualbox", @@ -66,7 +66,7 @@ "guest_os_type": "debian8-64", "headless": "{{ user `headless` }}", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", + "iso_checksum": "{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-vmware", @@ -108,7 +108,7 @@ "disk_size": "{{user `disk_size`}}", "guest_os_type": "debian", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", + "iso_checksum": "{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-parallels", @@ -146,7 +146,7 @@ "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", + "iso_checksum": "{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-qemu", @@ -205,7 +205,6 @@ "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", "iso_checksum": "ab3763d553330e90869487a6843c88f1d4aa199333ff16b653e60e59ac1fc60b", - "iso_checksum_type": "sha256", "iso_name": "debian-10.4.0-amd64-netinst.iso", "memory": "1024", "mirror": "http://cdimage.debian.org/cdimage/release", diff --git a/packer_templates/debian/debian-10.4-i386.json b/packer_templates/debian/debian-10.4-i386.json index 3830a620e..782d9a40b 100644 --- a/packer_templates/debian/debian-10.4-i386.json +++ b/packer_templates/debian/debian-10.4-i386.json @@ -28,7 +28,7 @@ "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", + "iso_checksum": "{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-virtualbox", @@ -66,7 +66,7 @@ "guest_os_type": "debian8", "headless": "{{ user `headless` }}", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", + "iso_checksum": "{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-vmware", @@ -108,7 +108,7 @@ "disk_size": "{{user `disk_size`}}", "guest_os_type": "debian", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", + "iso_checksum": "{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-parallels", @@ -146,7 +146,7 @@ "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", + "iso_checksum": "{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-qemu", @@ -205,7 +205,6 @@ "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", "iso_checksum": "549966a43224f237c46ee4397901ec9fd6feae74abb1e6f6baa0078acf77a936", - "iso_checksum_type": "sha256", "iso_name": "debian-10.4.0-i386-netinst.iso", "memory": "1024", "mirror": "http://cdimage.debian.org/cdimage/release", diff --git a/packer_templates/debian/debian-9.12-amd64.json b/packer_templates/debian/debian-9.12-amd64.json index fbe4a4dd9..5a077a136 100644 --- a/packer_templates/debian/debian-9.12-amd64.json +++ b/packer_templates/debian/debian-9.12-amd64.json @@ -28,7 +28,7 @@ "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", + "iso_checksum": "{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-virtualbox", @@ -66,7 +66,7 @@ "guest_os_type": "debian8-64", "headless": "{{ user `headless` }}", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", + "iso_checksum": "{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-vmware", @@ -108,7 +108,7 @@ "disk_size": "{{user `disk_size`}}", "guest_os_type": "debian", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", + "iso_checksum": "{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-parallels", @@ -146,7 +146,7 @@ "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", + "iso_checksum": "{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-qemu", @@ -205,7 +205,6 @@ "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", "iso_checksum": "3c47f64693435b0b42b6ef59624edbffa7c4004317d9f9a3f04ecb6a4e30f191", - "iso_checksum_type": "sha256", "iso_name": "debian-9.12.0-amd64-netinst.iso", "memory": "1024", "mirror": "http://cdimage.debian.org/cdimage/archive", diff --git a/packer_templates/debian/debian-9.12-i386.json b/packer_templates/debian/debian-9.12-i386.json index 2a9086946..5bfb13c70 100644 --- a/packer_templates/debian/debian-9.12-i386.json +++ b/packer_templates/debian/debian-9.12-i386.json @@ -28,7 +28,7 @@ "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", + "iso_checksum": "{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-virtualbox", @@ -66,7 +66,7 @@ "guest_os_type": "debian8", "headless": "{{ user `headless` }}", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", + "iso_checksum": "{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-vmware", @@ -108,7 +108,7 @@ "disk_size": "{{user `disk_size`}}", "guest_os_type": "debian", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", + "iso_checksum": "{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-parallels", @@ -146,7 +146,7 @@ "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", + "iso_checksum": "{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-qemu", @@ -205,7 +205,6 @@ "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", "iso_checksum": "7b5f1480c45bb7e70ddac7daf0b23f7ae5b97b4b12c6e835b285460f41a50572", - "iso_checksum_type": "sha256", "iso_name": "debian-9.12.0-i386-netinst.iso", "memory": "1024", "mirror": "http://cdimage.debian.org/cdimage/archive", diff --git a/packer_templates/debian/debian-9.12-ppc64el.json b/packer_templates/debian/debian-9.12-ppc64el.json index 12607b443..f109b3c12 100644 --- a/packer_templates/debian/debian-9.12-ppc64el.json +++ b/packer_templates/debian/debian-9.12-ppc64el.json @@ -30,7 +30,7 @@ "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", + "iso_checksum": "{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", "machine_type": "pseries", "memory": "{{ user `memory` }}", @@ -91,7 +91,6 @@ "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", "iso_checksum": "b35d8b33c9fc316c03178d8f493ecb858269082337150f82af75c8d4663cc324", - "iso_checksum_type": "sha256", "iso_name": "debian-9.12.0-ppc64el-netinst.iso", "memory": "1024", "mirror": "http://cdimage.debian.org/cdimage/archive", diff --git a/packer_templates/fedora/fedora-31-x86_64.json b/packer_templates/fedora/fedora-31-x86_64.json index 351616be6..fb7b79e99 100644 --- a/packer_templates/fedora/fedora-31-x86_64.json +++ b/packer_templates/fedora/fedora-31-x86_64.json @@ -15,7 +15,7 @@ "format": "qcow2", "headless": "{{ user `headless` }}", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", + "iso_checksum": "{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", "memory": "{{ user `memory` }}", "name": "{{ user `template` }}", @@ -42,7 +42,7 @@ "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", + "iso_checksum": "{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-virtualbox", @@ -65,7 +65,7 @@ "guest_os_type": "fedora-64", "headless": "{{ user `headless` }}", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", + "iso_checksum": "{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-vmware", @@ -92,7 +92,7 @@ "disk_size": "{{user `disk_size`}}", "guest_os_type": "fedora-core", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", + "iso_checksum": "{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-parallels", @@ -115,7 +115,7 @@ "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", + "iso_checksum": "{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-qemu", @@ -175,7 +175,6 @@ "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", "iso_checksum": "225ebc160e40bb43c5de28bad9680e3a78a9db40c9e3f4f42f3ee3f10f95dbeb", - "iso_checksum_type": "sha256", "iso_name": "Fedora-Server-dvd-x86_64-31-1.9.iso", "ks_path": "ks-fedora.cfg", "memory": "1024", diff --git a/packer_templates/fedora/fedora-32-x86_64.json b/packer_templates/fedora/fedora-32-x86_64.json index b4e177269..7bd023db2 100644 --- a/packer_templates/fedora/fedora-32-x86_64.json +++ b/packer_templates/fedora/fedora-32-x86_64.json @@ -15,7 +15,7 @@ "format": "qcow2", "headless": "{{ user `headless` }}", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", + "iso_checksum": "{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", "memory": "{{ user `memory` }}", "name": "{{ user `template` }}", @@ -42,7 +42,7 @@ "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", + "iso_checksum": "{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-virtualbox", @@ -65,7 +65,7 @@ "guest_os_type": "fedora-64", "headless": "{{ user `headless` }}", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", + "iso_checksum": "{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-vmware", @@ -92,7 +92,7 @@ "disk_size": "{{user `disk_size`}}", "guest_os_type": "fedora-core", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", + "iso_checksum": "{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-parallels", @@ -115,7 +115,7 @@ "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", + "iso_checksum": "{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-qemu", @@ -175,7 +175,6 @@ "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", "iso_checksum": "cd2aefdbe1b5042865a39c49d32f5d21a9537c719aa87dde34d08ca06bc6681c", - "iso_checksum_type": "sha256", "iso_name": "Fedora-Server-dvd-x86_64-32-1.6.iso", "ks_path": "ks-fedora.cfg", "memory": "1024", diff --git a/packer_templates/freebsd/freebsd-11.4-amd64.json b/packer_templates/freebsd/freebsd-11.4-amd64.json index daa5e7463..052f045c1 100644 --- a/packer_templates/freebsd/freebsd-11.4-amd64.json +++ b/packer_templates/freebsd/freebsd-11.4-amd64.json @@ -19,7 +19,7 @@ "guest_os_type": "FreeBSD_64", "headless": "{{ user `headless` }}", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", + "iso_checksum": "{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-virtualbox", @@ -51,7 +51,7 @@ "guest_os_type": "freebsd-64", "headless": "{{ user `headless` }}", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", + "iso_checksum": "{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-vmware", @@ -84,7 +84,7 @@ "disk_size": "{{user `disk_size`}}", "guest_os_type": "freebsd", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", + "iso_checksum": "{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-parallels", @@ -137,7 +137,7 @@ "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", + "iso_checksum": "{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-qemu", @@ -193,7 +193,6 @@ "https_proxy": "{{env `https_proxy`}}", "install_path": "freebsd-11/installerconfig", "iso_checksum": "d76c1ded99b2c1005b1ff94cc0c811fbcd8a2d04196432009ab5f203c2146914", - "iso_checksum_type": "sha256", "iso_name": "FreeBSD-11.4-RELEASE-amd64-disc1.iso", "memory": "1024", "mirror": "https://download.freebsd.org/ftp", diff --git a/packer_templates/freebsd/freebsd-11.4-i386.json b/packer_templates/freebsd/freebsd-11.4-i386.json index 49c45027e..b071d7eab 100644 --- a/packer_templates/freebsd/freebsd-11.4-i386.json +++ b/packer_templates/freebsd/freebsd-11.4-i386.json @@ -19,7 +19,7 @@ "guest_os_type": "FreeBSD", "headless": "{{ user `headless` }}", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", + "iso_checksum": "{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-virtualbox", @@ -51,7 +51,7 @@ "guest_os_type": "freebsd", "headless": "{{ user `headless` }}", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", + "iso_checksum": "{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-vmware", @@ -84,7 +84,7 @@ "disk_size": "{{user `disk_size`}}", "guest_os_type": "freebsd", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", + "iso_checksum": "{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-parallels", @@ -137,7 +137,7 @@ "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", + "iso_checksum": "{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-qemu", @@ -193,7 +193,6 @@ "https_proxy": "{{env `https_proxy`}}", "install_path": "freebsd-11/installerconfig", "iso_checksum": "cab3c03fc45b84bffcf818d11147af491eb0226be4bf8e4092b1ecafdc096d33", - "iso_checksum_type": "sha256", "iso_name": "FreeBSD-11.4-RELEASE-i386-disc1.iso", "memory": "1024", "mirror": "https://download.freebsd.org/ftp", diff --git a/packer_templates/freebsd/freebsd-12.1-amd64.json b/packer_templates/freebsd/freebsd-12.1-amd64.json index e034f3237..93a51e270 100644 --- a/packer_templates/freebsd/freebsd-12.1-amd64.json +++ b/packer_templates/freebsd/freebsd-12.1-amd64.json @@ -19,7 +19,7 @@ "guest_os_type": "FreeBSD_64", "headless": "{{ user `headless` }}", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", + "iso_checksum": "{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-virtualbox", @@ -51,7 +51,7 @@ "guest_os_type": "freebsd-64", "headless": "{{ user `headless` }}", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", + "iso_checksum": "{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-vmware", @@ -84,7 +84,7 @@ "disk_size": "{{user `disk_size`}}", "guest_os_type": "freebsd", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", + "iso_checksum": "{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-parallels", @@ -137,7 +137,7 @@ "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", + "iso_checksum": "{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-qemu", @@ -193,7 +193,6 @@ "https_proxy": "{{env `https_proxy`}}", "install_path": "freebsd-11/installerconfig", "iso_checksum": "aa9d34b458826486999ed3e872436b6712ae38cede5ea41de4ab923e3419d461", - "iso_checksum_type": "sha256", "iso_name": "FreeBSD-12.1-RELEASE-amd64-disc1.iso", "memory": "1024", "mirror": "https://download.freebsd.org/ftp", diff --git a/packer_templates/freebsd/freebsd-12.1-i386.json b/packer_templates/freebsd/freebsd-12.1-i386.json index 4d1d6207b..2e45ff53e 100644 --- a/packer_templates/freebsd/freebsd-12.1-i386.json +++ b/packer_templates/freebsd/freebsd-12.1-i386.json @@ -19,7 +19,7 @@ "guest_os_type": "FreeBSD", "headless": "{{ user `headless` }}", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", + "iso_checksum": "{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-virtualbox", @@ -51,7 +51,7 @@ "guest_os_type": "freebsd", "headless": "{{ user `headless` }}", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", + "iso_checksum": "{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-vmware", @@ -84,7 +84,7 @@ "disk_size": "{{user `disk_size`}}", "guest_os_type": "freebsd", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", + "iso_checksum": "{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-parallels", @@ -137,7 +137,7 @@ "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", + "iso_checksum": "{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-qemu", @@ -193,7 +193,6 @@ "https_proxy": "{{env `https_proxy`}}", "install_path": "freebsd-11/installerconfig", "iso_checksum": "07b10e098e7c9b5e920679d3a9b3d12628f0b918c6e3962620b7f570a82cf41d", - "iso_checksum_type": "sha256", "iso_name": "FreeBSD-12.1-RELEASE-i386-disc1.iso", "memory": "1024", "mirror": "https://download.freebsd.org/ftp", diff --git a/packer_templates/hardenedbsd/hardenedbsd-11-amd64.json b/packer_templates/hardenedbsd/hardenedbsd-11-amd64.json index d59a247bb..448b3e922 100644 --- a/packer_templates/hardenedbsd/hardenedbsd-11-amd64.json +++ b/packer_templates/hardenedbsd/hardenedbsd-11-amd64.json @@ -19,7 +19,7 @@ "guest_os_type": "FreeBSD_64", "headless": "{{ user `headless` }}", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", + "iso_checksum": "{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-virtualbox", @@ -51,7 +51,7 @@ "guest_os_type": "freebsd-64", "headless": "{{ user `headless` }}", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", + "iso_checksum": "{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-vmware", @@ -84,7 +84,7 @@ "disk_size": "{{user `disk_size`}}", "guest_os_type": "freebsd", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", + "iso_checksum": "{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-parallels", @@ -137,7 +137,7 @@ "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", + "iso_checksum": "{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-qemu", @@ -191,7 +191,6 @@ "https_proxy": "{{env `https_proxy`}}", "install_path": "hardenedbsd-11/installerconfig", "iso_checksum": "9cb9d0880b423b0f47a001c9606bda3742f485bcfab19dda20c7cccb3d71bee2", - "iso_checksum_type": "sha256", "iso_name": "disc1.iso", "memory": "1024", "mirror": "http://ci-01.nyi.hardenedbsd.org", diff --git a/packer_templates/opensuse/opensuse-leap-15.2-x86_64.json b/packer_templates/opensuse/opensuse-leap-15.2-x86_64.json index 8d9376a0a..bc903e1a3 100644 --- a/packer_templates/opensuse/opensuse-leap-15.2-x86_64.json +++ b/packer_templates/opensuse/opensuse-leap-15.2-x86_64.json @@ -22,7 +22,7 @@ "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", + "iso_checksum": "{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-virtualbox", @@ -54,7 +54,7 @@ "guest_os_type": "opensuse-64", "headless": "{{ user `headless` }}", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", + "iso_checksum": "{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-vmware", @@ -89,7 +89,7 @@ "disk_size": "{{user `disk_size`}}", "guest_os_type": "opensuse", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", + "iso_checksum": "{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-parallels", @@ -116,7 +116,7 @@ "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", + "iso_checksum": "{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-qemu", @@ -179,7 +179,6 @@ "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", "iso_checksum": "0fd2d4e630b6579b933b5cb4930a8100acca6b4e29cd2738c4b7a9b2f76d80e4", - "iso_checksum_type": "sha256", "iso_name": "openSUSE-Leap-15.2-DVD-x86_64.iso", "memory": "1024", "mirror": "http://suse.mobile-central.org/distribution", diff --git a/packer_templates/oraclelinux/oracle-5.11-i386.json b/packer_templates/oraclelinux/oracle-5.11-i386.json index da08e7b3d..c5eced383 100644 --- a/packer_templates/oraclelinux/oracle-5.11-i386.json +++ b/packer_templates/oraclelinux/oracle-5.11-i386.json @@ -13,7 +13,7 @@ "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", + "iso_checksum": "{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-virtualbox", @@ -36,7 +36,7 @@ "guest_os_type": "oraclelinux", "headless": "{{ user `headless` }}", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", + "iso_checksum": "{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-vmware", @@ -62,7 +62,7 @@ "disk_size": "{{user `disk_size`}}", "guest_os_type": "centos", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", + "iso_checksum": "{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-parallels", @@ -89,7 +89,7 @@ "generation": "{{user `hyperv_generation`}}", "guest_additions_mode": "disable", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", + "iso_checksum": "{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-hyperv", @@ -111,7 +111,7 @@ "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", + "iso_checksum": "{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-qemu", @@ -168,7 +168,6 @@ "https_proxy": "{{env `https_proxy`}}", "hyperv_generation": "1", "iso_checksum": "E60962C4EBF8920BBD828EFE32A78A7CC8F28E3B", - "iso_checksum_type": "sha1", "iso_name": "Enterprise-R5-U11-Server-i386-dvd.iso", "ks_path": "5/ks.cfg", "memory": "1024", diff --git a/packer_templates/oraclelinux/oracle-5.11-x86_64.json b/packer_templates/oraclelinux/oracle-5.11-x86_64.json index 17f790c9d..0e82dabf3 100644 --- a/packer_templates/oraclelinux/oracle-5.11-x86_64.json +++ b/packer_templates/oraclelinux/oracle-5.11-x86_64.json @@ -13,7 +13,7 @@ "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", + "iso_checksum": "{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-virtualbox", @@ -44,7 +44,7 @@ "guest_os_type": "oraclelinux-64", "headless": "{{ user `headless` }}", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", + "iso_checksum": "{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-vmware", @@ -70,7 +70,7 @@ "disk_size": "{{user `disk_size`}}", "guest_os_type": "centos", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", + "iso_checksum": "{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-parallels", @@ -97,7 +97,7 @@ "generation": "{{user `hyperv_generation`}}", "guest_additions_mode": "disable", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", + "iso_checksum": "{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-hyperv", @@ -119,7 +119,7 @@ "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", + "iso_checksum": "{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-qemu", @@ -177,7 +177,6 @@ "https_proxy": "{{env `https_proxy`}}", "hyperv_generation": "1", "iso_checksum": "2D38F76652CBC1367FDF30024F13CDE5F6BF34DF", - "iso_checksum_type": "sha1", "iso_name": "Enterprise-R5-U11-Server-x86_64-dvd.iso", "ks_path": "5/ks.cfg", "memory": "1024", diff --git a/packer_templates/oraclelinux/oracle-6.10-i386.json b/packer_templates/oraclelinux/oracle-6.10-i386.json index c702a9c35..e0554c0e1 100644 --- a/packer_templates/oraclelinux/oracle-6.10-i386.json +++ b/packer_templates/oraclelinux/oracle-6.10-i386.json @@ -13,7 +13,7 @@ "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", + "iso_checksum": "{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-virtualbox", @@ -36,7 +36,7 @@ "guest_os_type": "oraclelinux", "headless": "{{ user `headless` }}", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", + "iso_checksum": "{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-vmware", @@ -62,7 +62,7 @@ "disk_size": "{{user `disk_size`}}", "guest_os_type": "centos", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", + "iso_checksum": "{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-parallels", @@ -89,7 +89,7 @@ "generation": "{{user `hyperv_generation`}}", "guest_additions_mode": "disable", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", + "iso_checksum": "{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-hyperv", @@ -111,7 +111,7 @@ "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", + "iso_checksum": "{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-qemu", @@ -170,7 +170,6 @@ "https_proxy": "{{env `https_proxy`}}", "hyperv_generation": "1", "iso_checksum": "fd07f775e7fa52e9ab021eb7dccb78453fc61f3d3b712ec426f6b1bf5020318b", - "iso_checksum_type": "sha256", "iso_name": "OracleLinux-R6-U9-Server-i386-dvd.iso", "ks_path": "6/ks.cfg", "memory": "1024", diff --git a/packer_templates/oraclelinux/oracle-6.10-x86_64.json b/packer_templates/oraclelinux/oracle-6.10-x86_64.json index fc2cff6c6..28850c10e 100644 --- a/packer_templates/oraclelinux/oracle-6.10-x86_64.json +++ b/packer_templates/oraclelinux/oracle-6.10-x86_64.json @@ -13,7 +13,7 @@ "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", + "iso_checksum": "{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-virtualbox", @@ -36,7 +36,7 @@ "guest_os_type": "oraclelinux-64", "headless": "{{ user `headless` }}", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", + "iso_checksum": "{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-vmware", @@ -62,7 +62,7 @@ "disk_size": "{{user `disk_size`}}", "guest_os_type": "centos", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", + "iso_checksum": "{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-parallels", @@ -89,7 +89,7 @@ "generation": "{{user `hyperv_generation`}}", "guest_additions_mode": "disable", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", + "iso_checksum": "{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-hyperv", @@ -111,7 +111,7 @@ "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", + "iso_checksum": "{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-qemu", @@ -171,7 +171,6 @@ "hyperv_generation": "1", "hyperv_switch": "{{env `hyperv_switch`}}", "iso_checksum": "c32e2a7c8eb471db731741f1a30be37e49deda8ce961710273a71b26c9a04a36", - "iso_checksum_type": "sha256", "iso_name": "OracleLinux-R6-U9-Server-x86_64-dvd.iso", "ks_path": "6/ks.cfg", "memory": "1024", diff --git a/packer_templates/oraclelinux/oracle-7.8-x86_64.json b/packer_templates/oraclelinux/oracle-7.8-x86_64.json index 15926d712..4f4d7a533 100644 --- a/packer_templates/oraclelinux/oracle-7.8-x86_64.json +++ b/packer_templates/oraclelinux/oracle-7.8-x86_64.json @@ -13,7 +13,7 @@ "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", + "iso_checksum": "{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-virtualbox", @@ -36,7 +36,7 @@ "guest_os_type": "oraclelinux-64", "headless": "{{ user `headless` }}", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", + "iso_checksum": "{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-vmware", @@ -62,7 +62,7 @@ "disk_size": "{{user `disk_size`}}", "guest_os_type": "centos", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", + "iso_checksum": "{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-parallels", @@ -89,7 +89,7 @@ "generation": "{{user `hyperv_generation`}}", "guest_additions_mode": "disable", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", + "iso_checksum": "{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-hyperv", @@ -111,7 +111,7 @@ "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", + "iso_checksum": "{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-qemu", @@ -171,7 +171,6 @@ "hyperv_generation": "1", "hyperv_switch": "{{env `hyperv_switch`}}", "iso_checksum": "6e1069ff42f7e59b19af4e2fcacae2fca3f195c7f2904275b0df386efdcd616d", - "iso_checksum_type": "sha256", "iso_name": "OracleLinux-R7-U8-Server-x86_64-dvd.iso", "ks_path": "7/ks.cfg", "memory": "1024", diff --git a/packer_templates/oraclelinux/oracle-8.2-x86_64.json b/packer_templates/oraclelinux/oracle-8.2-x86_64.json index 3c16a0e4a..101397fbf 100644 --- a/packer_templates/oraclelinux/oracle-8.2-x86_64.json +++ b/packer_templates/oraclelinux/oracle-8.2-x86_64.json @@ -13,7 +13,7 @@ "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", + "iso_checksum": "{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-virtualbox", @@ -36,7 +36,7 @@ "guest_os_type": "oraclelinux-64", "headless": "{{ user `headless` }}", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", + "iso_checksum": "{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-vmware", @@ -62,7 +62,7 @@ "disk_size": "{{user `disk_size`}}", "guest_os_type": "centos", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", + "iso_checksum": "{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-parallels", @@ -89,7 +89,7 @@ "generation": "{{user `hyperv_generation`}}", "guest_additions_mode": "disable", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", + "iso_checksum": "{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-hyperv", @@ -111,7 +111,7 @@ "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", + "iso_checksum": "{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-qemu", @@ -170,7 +170,6 @@ "hyperv_generation": "1", "hyperv_switch": "{{env `hyperv_switch`}}", "iso_checksum": "67568941e976efb26a3d61cdbf98c5a46cd0b3463ec750992f305eee20957a6e", - "iso_checksum_type": "sha256", "iso_name": "OracleLinux-R8-U2-x86_64-dvd.iso", "ks_path": "8/ks.cfg", "memory": "1024", diff --git a/packer_templates/rhel/rhel-5.11-i386.json b/packer_templates/rhel/rhel-5.11-i386.json index f0b4060de..2d6c15f02 100644 --- a/packer_templates/rhel/rhel-5.11-i386.json +++ b/packer_templates/rhel/rhel-5.11-i386.json @@ -13,7 +13,7 @@ "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", + "iso_checksum": "{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-virtualbox", @@ -36,7 +36,7 @@ "guest_os_type": "redhat", "headless": "{{ user `headless` }}", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", + "iso_checksum": "{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-vmware", @@ -62,7 +62,7 @@ "disk_size": "{{user `disk_size`}}", "guest_os_type": "rhel", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", + "iso_checksum": "{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-parallels", @@ -85,7 +85,7 @@ "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", + "iso_checksum": "{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-qemu", @@ -141,7 +141,6 @@ "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", "iso_checksum": "4e38e4ed06d83efb10446e7db19d96761715cdbdbf0bbfacb978b44ce368bbe2", - "iso_checksum_type": "sha256", "iso_name": "rhel-server-5.11-i386-dvd.iso", "ks_path": "5/ks.cfg", "memory": "1024", diff --git a/packer_templates/rhel/rhel-5.11-x86_64.json b/packer_templates/rhel/rhel-5.11-x86_64.json index cd4648e93..2abbf2bda 100644 --- a/packer_templates/rhel/rhel-5.11-x86_64.json +++ b/packer_templates/rhel/rhel-5.11-x86_64.json @@ -13,7 +13,7 @@ "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", + "iso_checksum": "{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-virtualbox", @@ -44,7 +44,7 @@ "guest_os_type": "rhel5-64", "headless": "{{ user `headless` }}", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", + "iso_checksum": "{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-vmware", @@ -70,7 +70,7 @@ "disk_size": "{{user `disk_size`}}", "guest_os_type": "rhel", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", + "iso_checksum": "{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-parallels", @@ -93,7 +93,7 @@ "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", + "iso_checksum": "{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-qemu", @@ -149,7 +149,6 @@ "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", "iso_checksum": "36565fe0c8a97207d63234d10123daeedb29d509576dbd7b34e71958ac2f9050", - "iso_checksum_type": "sha256", "iso_name": "rhel-server-5.11-x86_64-dvd.iso", "ks_path": "5/ks.cfg", "memory": "1024", diff --git a/packer_templates/rhel/rhel-6.10-i386.json b/packer_templates/rhel/rhel-6.10-i386.json index 7279d9e83..a6d2d15c3 100644 --- a/packer_templates/rhel/rhel-6.10-i386.json +++ b/packer_templates/rhel/rhel-6.10-i386.json @@ -13,7 +13,7 @@ "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", + "iso_checksum": "{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-virtualbox", @@ -36,7 +36,7 @@ "guest_os_type": "redhat", "headless": "{{ user `headless` }}", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", + "iso_checksum": "{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-vmware", @@ -62,7 +62,7 @@ "disk_size": "{{user `disk_size`}}", "guest_os_type": "rhel", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", + "iso_checksum": "{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-parallels", @@ -85,7 +85,7 @@ "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", + "iso_checksum": "{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-qemu", @@ -142,7 +142,6 @@ "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", "iso_checksum": "715c382b2c0484087654281446dce058d9eeb930d7dcc92a2130d52328df87b8", - "iso_checksum_type": "sha256", "iso_name": "rhel-server-6.10-i386-dvd.iso", "ks_path": "6/ks.cfg", "memory": "1024", diff --git a/packer_templates/rhel/rhel-6.10-x86_64.json b/packer_templates/rhel/rhel-6.10-x86_64.json index e1957f01e..493fc323d 100644 --- a/packer_templates/rhel/rhel-6.10-x86_64.json +++ b/packer_templates/rhel/rhel-6.10-x86_64.json @@ -13,7 +13,7 @@ "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", + "iso_checksum": "{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-virtualbox", @@ -36,7 +36,7 @@ "guest_os_type": "rhel6-64", "headless": "{{ user `headless` }}", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", + "iso_checksum": "{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-vmware", @@ -62,7 +62,7 @@ "disk_size": "{{user `disk_size`}}", "guest_os_type": "rhel", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", + "iso_checksum": "{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-parallels", @@ -85,7 +85,7 @@ "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", + "iso_checksum": "{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-qemu", @@ -142,7 +142,6 @@ "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", "iso_checksum": "1e15f9202d2cdd4b2bdf9d6503a8543347f0cb8cc06ba9a0dfd2df4fdef5c727", - "iso_checksum_type": "sha256", "iso_name": "rhel-server-6.10-x86_64-dvd.iso", "ks_path": "6/ks.cfg", "memory": "1024", diff --git a/packer_templates/rhel/rhel-7.6-x86_64.json b/packer_templates/rhel/rhel-7.6-x86_64.json index ffcb87a27..418ea053f 100644 --- a/packer_templates/rhel/rhel-7.6-x86_64.json +++ b/packer_templates/rhel/rhel-7.6-x86_64.json @@ -13,7 +13,7 @@ "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", + "iso_checksum": "{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-virtualbox", @@ -36,7 +36,7 @@ "guest_os_type": "rhel7-64", "headless": "{{ user `headless` }}", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", + "iso_checksum": "{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-vmware", @@ -62,7 +62,7 @@ "disk_size": "{{user `disk_size`}}", "guest_os_type": "rhel", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", + "iso_checksum": "{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-parallels", @@ -85,7 +85,7 @@ "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", + "iso_checksum": "{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-qemu", @@ -142,7 +142,6 @@ "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", "iso_checksum": "60a0be5aeed1f08f2bb7599a578c89ec134b4016cd62a8604b29f15d543a469c", - "iso_checksum_type": "sha256", "iso_name": "rhel-server-7.6-x86_64-dvd.iso", "ks_path": "7/ks.cfg", "memory": "1024", diff --git a/packer_templates/rhel/rhel-8.0-x86_64.json b/packer_templates/rhel/rhel-8.0-x86_64.json index 188817c78..66737ea08 100644 --- a/packer_templates/rhel/rhel-8.0-x86_64.json +++ b/packer_templates/rhel/rhel-8.0-x86_64.json @@ -13,7 +13,7 @@ "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", + "iso_checksum": "{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-virtualbox", @@ -36,7 +36,7 @@ "guest_os_type": "rhel8-64", "headless": "{{ user `headless` }}", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", + "iso_checksum": "{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-vmware", @@ -62,7 +62,7 @@ "disk_size": "{{user `disk_size`}}", "guest_os_type": "rhel", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", + "iso_checksum": "{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-parallels", @@ -85,7 +85,7 @@ "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", + "iso_checksum": "{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-qemu", @@ -142,7 +142,6 @@ "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", "iso_checksum": "005d4f88fff6d63b0fc01a10822380ef52570edd8834321de7be63002cc6cc43", - "iso_checksum_type": "sha256", "iso_name": "rhel-8.0-x86_64-dvd.iso", "ks_path": "8/ks.cfg", "memory": "1024", diff --git a/packer_templates/scientificlinux/scientific-7.8-x86_64.json b/packer_templates/scientificlinux/scientific-7.8-x86_64.json index bf5d6775d..0e1210bf3 100644 --- a/packer_templates/scientificlinux/scientific-7.8-x86_64.json +++ b/packer_templates/scientificlinux/scientific-7.8-x86_64.json @@ -13,7 +13,7 @@ "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", + "iso_checksum": "{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-virtualbox", @@ -36,7 +36,7 @@ "guest_os_type": "centos-64", "headless": "{{ user `headless` }}", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", + "iso_checksum": "{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-vmware", @@ -62,7 +62,7 @@ "disk_size": "{{user `disk_size`}}", "guest_os_type": "centos", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", + "iso_checksum": "{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-parallels", @@ -89,7 +89,7 @@ "generation": "{{user `hyperv_generation`}}", "guest_additions_mode": "disable", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", + "iso_checksum": "{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-hyperv", @@ -111,7 +111,7 @@ "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", + "iso_checksum": "{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-qemu", @@ -170,7 +170,6 @@ "hyperv_generation": "1", "hyperv_switch": "{{env `hyperv_switch`}}", "iso_checksum": "64eb2df3616cc1f4c278eb553dccc721bfb9a5aad3f5b5dcc677e709ad8a8b4e", - "iso_checksum_type": "sha256", "iso_name": "SL-7-DVD-x86_64.iso", "ks_path": "7/ks.cfg", "memory": "1024", diff --git a/packer_templates/sles/sles-11-sp4-x86_64.json b/packer_templates/sles/sles-11-sp4-x86_64.json index d50484078..52c16e446 100644 --- a/packer_templates/sles/sles-11-sp4-x86_64.json +++ b/packer_templates/sles/sles-11-sp4-x86_64.json @@ -17,7 +17,7 @@ "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", + "iso_checksum": "{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `iso_name`}}", "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-virtualbox", @@ -44,7 +44,7 @@ "guest_os_type": "sles11-64", "headless": "{{ user `headless` }}", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", + "iso_checksum": "{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `iso_name`}}", "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-vmware", @@ -74,7 +74,7 @@ "disk_size": "{{user `disk_size`}}", "guest_os_type": "suse", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", + "iso_checksum": "{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `iso_name`}}", "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-parallels", @@ -101,7 +101,7 @@ "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", + "iso_checksum": "{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `iso_name`}}", "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-qemu", @@ -163,7 +163,6 @@ "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", "iso_checksum": "4fbf22201876d571c719328f385d87d6d690fb3ceb5e093108cdf0373c43e855", - "iso_checksum_type": "sha256", "iso_name": "SLES-11-SP4-DVD-x86_64-GM-DVD1.iso", "memory": "1024", "mirror": "./packer_cache", diff --git a/packer_templates/sles/sles-12-sp2-x86_64.json b/packer_templates/sles/sles-12-sp2-x86_64.json index 6b64c094d..f93412d8b 100644 --- a/packer_templates/sles/sles-12-sp2-x86_64.json +++ b/packer_templates/sles/sles-12-sp2-x86_64.json @@ -17,7 +17,7 @@ "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", + "iso_checksum": "{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `iso_name`}}", "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-virtualbox", @@ -44,7 +44,7 @@ "guest_os_type": "sles12-64", "headless": "{{ user `headless` }}", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", + "iso_checksum": "{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `iso_name`}}", "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-vmware", @@ -74,7 +74,7 @@ "disk_size": "{{user `disk_size`}}", "guest_os_type": "suse", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", + "iso_checksum": "{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `iso_name`}}", "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-parallels", @@ -101,7 +101,7 @@ "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", + "iso_checksum": "{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `iso_name`}}", "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-qemu", @@ -164,7 +164,6 @@ "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", "iso_checksum": "dd724e9248f2c3507e8e9d0050a4c8b6e9aeda7fdf0870858757cc6c01b7d47d", - "iso_checksum_type": "sha256", "iso_name": "SLE-12-SP2-Server-DVD-x86_64-GM-DVD1.iso", "memory": "1024", "mirror": "./packer_cache", diff --git a/packer_templates/sles/sles-12-sp3-x86_64.json b/packer_templates/sles/sles-12-sp3-x86_64.json index 34647ed19..9e28724cc 100644 --- a/packer_templates/sles/sles-12-sp3-x86_64.json +++ b/packer_templates/sles/sles-12-sp3-x86_64.json @@ -17,7 +17,7 @@ "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", + "iso_checksum": "{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `iso_name`}}", "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-virtualbox", @@ -44,7 +44,7 @@ "guest_os_type": "sles12-64", "headless": "{{ user `headless` }}", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", + "iso_checksum": "{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `iso_name`}}", "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-vmware", @@ -74,7 +74,7 @@ "disk_size": "{{user `disk_size`}}", "guest_os_type": "suse", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", + "iso_checksum": "{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `iso_name`}}", "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-parallels", @@ -101,7 +101,7 @@ "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", + "iso_checksum": "{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `iso_name`}}", "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-qemu", @@ -164,7 +164,6 @@ "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", "iso_checksum": "48408157ef667100671b22f92c3e20771ccf2100108b96e3ae83d8df30abddd5", - "iso_checksum_type": "sha256", "iso_name": "SLE-12-SP3-Server-DVD-x86_64-GM-DVD1.iso", "memory": "1024", "mirror": "./packer_cache", diff --git a/packer_templates/sles/sles-15-sp1.json b/packer_templates/sles/sles-15-sp1.json index 4a16a9738..1f09b6924 100644 --- a/packer_templates/sles/sles-15-sp1.json +++ b/packer_templates/sles/sles-15-sp1.json @@ -17,7 +17,7 @@ "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", + "iso_checksum": "{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `iso_name`}}", "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-virtualbox", @@ -60,7 +60,7 @@ "guest_os_type": "sles12-64", "headless": "{{ user `headless` }}", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", + "iso_checksum": "{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `iso_name`}}", "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-vmware", @@ -90,7 +90,7 @@ "disk_size": "{{user `disk_size`}}", "guest_os_type": "suse", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", + "iso_checksum": "{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `iso_name`}}", "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-parallels", @@ -117,7 +117,7 @@ "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", + "iso_checksum": "{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `iso_name`}}", "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-qemu", @@ -202,7 +202,6 @@ "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", "iso_checksum": "5787b180a60a8d52bc42ddb8c51884ca4263f5ed47dc10bb72229a49e8b07497", - "iso_checksum_type": "sha256", "iso_name": "SLE-15-SP1-Installer-DVD-x86_64-GM-DVD1.iso", "memory": "1024", "mirror": "./packer_cache", diff --git a/packer_templates/sles/sles-15.json b/packer_templates/sles/sles-15.json index 59963db54..826c6a549 100644 --- a/packer_templates/sles/sles-15.json +++ b/packer_templates/sles/sles-15.json @@ -17,7 +17,7 @@ "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", + "iso_checksum": "{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `iso_name`}}", "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-virtualbox", @@ -60,7 +60,7 @@ "guest_os_type": "sles12-64", "headless": "{{ user `headless` }}", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", + "iso_checksum": "{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `iso_name`}}", "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-vmware", @@ -90,7 +90,7 @@ "disk_size": "{{user `disk_size`}}", "guest_os_type": "suse", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", + "iso_checksum": "{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `iso_name`}}", "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-parallels", @@ -117,7 +117,7 @@ "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", + "iso_checksum": "{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `iso_name`}}", "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-qemu", @@ -202,7 +202,6 @@ "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", "iso_checksum": "06bd8b78ef0ca6d5ff5000688727953e894805dc3de59060d74441f0fd0539ab", - "iso_checksum_type": "sha256", "iso_name": "SLE-15-Installer-DVD-x86_64-GM-DVD1.iso", "memory": "1024", "mirror": "./packer_cache", diff --git a/packer_templates/ubuntu/ubuntu-16.04-amd64.json b/packer_templates/ubuntu/ubuntu-16.04-amd64.json index 77c8ed541..7a7795971 100644 --- a/packer_templates/ubuntu/ubuntu-16.04-amd64.json +++ b/packer_templates/ubuntu/ubuntu-16.04-amd64.json @@ -36,7 +36,7 @@ "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", + "iso_checksum": "{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-virtualbox", @@ -82,7 +82,7 @@ "guest_os_type": "ubuntu-64", "headless": "{{ user `headless` }}", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", + "iso_checksum": "{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-vmware", @@ -132,7 +132,7 @@ "disk_size": "{{user `disk_size`}}", "guest_os_type": "ubuntu", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", + "iso_checksum": "{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-parallels", @@ -178,7 +178,7 @@ "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", + "iso_checksum": "{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-qemu", @@ -211,7 +211,7 @@ "enable_secure_boot": false, "generation": "{{user `hyperv_generation`}}", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", + "iso_checksum": "{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", "memory": "{{user `memory`}}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-hyperv", @@ -273,7 +273,6 @@ "hyperv_generation": "2", "hyperv_switch": "{{env `hyperv_switch`}}", "iso_checksum": "16afb1375372c57471ea5e29803a89a5a6bd1f6aabea2e5e34ac1ab7eb9786ac", - "iso_checksum_type": "sha256", "iso_name": "ubuntu-16.04.6-server-amd64.iso", "memory": "1024", "mirror": "http://releases.ubuntu.com", diff --git a/packer_templates/ubuntu/ubuntu-16.04-i386.json b/packer_templates/ubuntu/ubuntu-16.04-i386.json index 887c7bb73..25785653e 100644 --- a/packer_templates/ubuntu/ubuntu-16.04-i386.json +++ b/packer_templates/ubuntu/ubuntu-16.04-i386.json @@ -36,7 +36,7 @@ "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", + "iso_checksum": "{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-virtualbox", @@ -82,7 +82,7 @@ "guest_os_type": "ubuntu", "headless": "{{ user `headless` }}", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", + "iso_checksum": "{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-vmware", @@ -131,7 +131,7 @@ "disk_size": "{{user `disk_size`}}", "guest_os_type": "ubuntu", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", + "iso_checksum": "{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-parallels", @@ -177,7 +177,7 @@ "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", + "iso_checksum": "{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-qemu", @@ -210,7 +210,7 @@ "enable_secure_boot": false, "generation": "{{user `hyperv_generation`}}", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", + "iso_checksum": "{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", "memory": "{{user `memory`}}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-hyperv", @@ -272,7 +272,6 @@ "hyperv_generation": "1", "hyperv_switch": "{{env `hyperv_switch`}}", "iso_checksum": "7509cabb2f9f6ba0a95f8454d432be2ef26679d31ce35baa626acc5321460fab", - "iso_checksum_type": "sha256", "iso_name": "ubuntu-16.04.6-server-i386.iso", "memory": "1024", "mirror": "http://releases.ubuntu.com/releases", diff --git a/packer_templates/ubuntu/ubuntu-18.04-amd64.json b/packer_templates/ubuntu/ubuntu-18.04-amd64.json index 0d5050be1..a9ba78809 100644 --- a/packer_templates/ubuntu/ubuntu-18.04-amd64.json +++ b/packer_templates/ubuntu/ubuntu-18.04-amd64.json @@ -35,7 +35,7 @@ "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", + "iso_checksum": "{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-virtualbox", @@ -80,7 +80,7 @@ "guest_os_type": "ubuntu-64", "headless": "{{ user `headless` }}", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", + "iso_checksum": "{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-vmware", @@ -129,7 +129,7 @@ "disk_size": "{{user `disk_size`}}", "guest_os_type": "ubuntu", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", + "iso_checksum": "{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-parallels", @@ -174,7 +174,7 @@ "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", + "iso_checksum": "{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-qemu", @@ -207,7 +207,7 @@ "enable_secure_boot": false, "generation": "{{user `hyperv_generation`}}", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", + "iso_checksum": "{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", "memory": "{{user `memory`}}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-hyperv", @@ -269,7 +269,6 @@ "hyperv_generation": "2", "hyperv_switch": "{{env `hyperv_switch`}}", "iso_checksum": "e2ecdace33c939527cbc9e8d23576381c493b071107207d2040af72595f8990b", - "iso_checksum_type": "sha256", "iso_name": "ubuntu-18.04.4-server-amd64.iso", "memory": "1024", "mirror": "http://cdimage.ubuntu.com", diff --git a/packer_templates/ubuntu/ubuntu-19.10-amd64.json b/packer_templates/ubuntu/ubuntu-19.10-amd64.json index 07003ee50..882a68d76 100644 --- a/packer_templates/ubuntu/ubuntu-19.10-amd64.json +++ b/packer_templates/ubuntu/ubuntu-19.10-amd64.json @@ -35,7 +35,7 @@ "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", + "iso_checksum": "{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-virtualbox", @@ -80,7 +80,7 @@ "guest_os_type": "ubuntu-64", "headless": "{{ user `headless` }}", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", + "iso_checksum": "{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-vmware", @@ -129,7 +129,7 @@ "disk_size": "{{user `disk_size`}}", "guest_os_type": "ubuntu", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", + "iso_checksum": "{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-parallels", @@ -174,7 +174,7 @@ "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", + "iso_checksum": "{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-qemu", @@ -207,7 +207,7 @@ "enable_secure_boot": false, "generation": "{{user `hyperv_generation`}}", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", + "iso_checksum": "{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", "memory": "{{user `memory`}}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-hyperv", @@ -269,7 +269,6 @@ "hyperv_generation": "2", "hyperv_switch": "{{env `hyperv_switch`}}", "iso_checksum": "921fd8b271c04aa86a321cc35b40e677f9b85f7903bf2204efb2389b0f0a64c1", - "iso_checksum_type": "sha256", "iso_name": "ubuntu-19.10-server-amd64.iso", "memory": "1024", "mirror": "http://cdimage.ubuntu.com", diff --git a/packer_templates/ubuntu/ubuntu-20.04-amd64.json b/packer_templates/ubuntu/ubuntu-20.04-amd64.json index 27330dbec..da8f4dfaa 100644 --- a/packer_templates/ubuntu/ubuntu-20.04-amd64.json +++ b/packer_templates/ubuntu/ubuntu-20.04-amd64.json @@ -35,7 +35,7 @@ "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", + "iso_checksum": "{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-virtualbox", @@ -80,7 +80,7 @@ "guest_os_type": "ubuntu-64", "headless": "{{ user `headless` }}", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", + "iso_checksum": "{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-vmware", @@ -129,7 +129,7 @@ "disk_size": "{{user `disk_size`}}", "guest_os_type": "ubuntu", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", + "iso_checksum": "{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-parallels", @@ -174,7 +174,7 @@ "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", + "iso_checksum": "{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-qemu", @@ -207,7 +207,7 @@ "enable_secure_boot": false, "generation": "{{user `hyperv_generation`}}", "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", + "iso_checksum": "{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", "memory": "{{user `memory`}}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-hyperv", @@ -269,7 +269,6 @@ "hyperv_generation": "2", "hyperv_switch": "{{env `hyperv_switch`}}", "iso_checksum": "36f15879bd9dfd061cd588620a164a82972663fdd148cce1f70d57d314c21b73", - "iso_checksum_type": "sha256", "iso_name": "ubuntu-20.04-legacy-server-amd64.iso", "memory": "1024", "mirror": "http://cdimage.ubuntu.com", From 742d95310aa564d63fa740219d41ad6773231ec1 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Sun, 19 Jul 2020 15:11:27 -0700 Subject: [PATCH 1207/1622] Test on Packer 1.6.0 not 1.4.2 Signed-off-by: Tim Smith <tsmith@chef.io> --- .expeditor/verify.pipeline.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.expeditor/verify.pipeline.yml b/.expeditor/verify.pipeline.yml index dea83150a..dfa3fb9d8 100644 --- a/.expeditor/verify.pipeline.yml +++ b/.expeditor/verify.pipeline.yml @@ -3,8 +3,8 @@ steps: - label: run-packer-validate command: - bundle install - - wget https://releases.hashicorp.com/packer/1.4.2/packer_1.4.2_linux_amd64.zip - - unzip -d /usr/local/bin packer_1.4.2_linux_amd64.zip + - wget https://releases.hashicorp.com/packer/1.6.0/packer_1.6.0_linux_amd64.zip + - unzip -d /usr/local/bin packer_1.6.0_linux_amd64.zip - rake validate expeditor: executor: From b37ff6ea8a55c08e44dfdc68f0d9cbcd7285faca Mon Sep 17 00:00:00 2001 From: John McCrae <jmccrae@chef.io> Date: Mon, 20 Jul 2020 12:32:09 -0700 Subject: [PATCH 1208/1622] Update README.md Signed-off-by: John McCrae <jmccrae@chef.io> Co-authored-by: Kimberly Garmoe <kgarmoe@chef.io> --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index ff65df418..eeb658958 100644 --- a/README.md +++ b/README.md @@ -65,7 +65,7 @@ $ cd fedora $ packer build -var 'mirror=http://mirror.utexas.edu/fedora/linux' fedora-31-x86_64.json ``` -To build a Windows 10 Enterprise Gen 2 box for only the Hyper-V provider +To build a Windows 10 Enterprise Gen 2 box for the Hyper-V provider ``` $ cd windows From bf2659f29fd7bdab5933dd614b39805b109625f6 Mon Sep 17 00:00:00 2001 From: John McCrae <jmccrae@chef.io> Date: Mon, 20 Jul 2020 12:32:17 -0700 Subject: [PATCH 1209/1622] Update README.md Signed-off-by: John McCrae <jmccrae@chef.io> Co-authored-by: Kimberly Garmoe <kgarmoe@chef.io> --- README.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index eeb658958..a721ceda4 100644 --- a/README.md +++ b/README.md @@ -104,7 +104,11 @@ New-NetFirewallRule -Displayname "Allow incomming from $VS" -Direction Inbound - #### Hyper-V Generation 2 VM's -There are fundamental differences between VM types (Gen 1 and Gen 2) in Hyper-V. Most notably, there is no floppy drive support for Gen 2. In order to provide the same resources you previously did with a floppy drive, you will now need to create iso images that contain those files (in particular, the autounattend.xml and the base_setup.ps1 files) and then attach those images via the "secondary_iso_images" parameter. You will also need to manage the driver disk that holds the hyper-v guest services drivers and adjust the autounattend.xml file as appropriate. Also note that there is an updated Autounattend.xml file for Gen 2 which supports EFI partitions. You will want to update that file for the particular Windows version you are using and ensure that the partitions are correct for you situation. +Hyper-V Gen 2 VMs do not support floppy drives. If you previously provided resources using a floppy drive, you must add those files to your Gen 2 iso images, in particular: + +- `autounattend.xml`: The Gen 2 `autounattend.xml` file supports EFI partitions. Update the `autounattend.xml` with the correct Windows version for your systems and ensure that the partitions are correct for your situation. You also need to manage the driver disk that holds the hyper-v guest services drivers and adjust the `autounattend.xml` file as appropriate. +- `base_setup.ps1` + #### macOS / OSX From ffd88eac9897190f243a90c96e505043c39befa2 Mon Sep 17 00:00:00 2001 From: John McCrae <jmccrae@chef.io> Date: Mon, 20 Jul 2020 12:37:36 -0700 Subject: [PATCH 1210/1622] corrected the grammar of the line 75 of the readme Signed-off-by: John McCrae <jmccrae@chef.io> --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index a721ceda4..5c1dc1db4 100644 --- a/README.md +++ b/README.md @@ -72,7 +72,7 @@ $ cd windows $ packer build windows-10gen2.json ``` -If the build is successful, ready to import box files will be in the `builds` directory at the root of the repository. +If the build is successful, your box files will be in the `builds` directory at the root of the repository. \***NOTE:** box_basename can be overridden like other Packer vars with `-var 'box_basename=ubuntu-18.04'` @@ -106,7 +106,7 @@ New-NetFirewallRule -Displayname "Allow incomming from $VS" -Direction Inbound - Hyper-V Gen 2 VMs do not support floppy drives. If you previously provided resources using a floppy drive, you must add those files to your Gen 2 iso images, in particular: -- `autounattend.xml`: The Gen 2 `autounattend.xml` file supports EFI partitions. Update the `autounattend.xml` with the correct Windows version for your systems and ensure that the partitions are correct for your situation. You also need to manage the driver disk that holds the hyper-v guest services drivers and adjust the `autounattend.xml` file as appropriate. +- `autounattend.xml`: The Gen 2 `autounattend.xml` file supports EFI partitions. Update the `autounattend.xml` with the correct Windows version for your systems and ensure that the partitions are correct for your situation. You also need to manage the driver disk that holds the hyper-v guest services drivers and adjust the `autounattend.xml` file as appropriate. - `base_setup.ps1` From 32d649555e454469a0611b4919b2e026deaf4ff8 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Sat, 15 Aug 2020 17:33:58 -0700 Subject: [PATCH 1211/1622] Update to Debian 9.13 / 10.5 Signed-off-by: Tim Smith <tsmith@chef.io> --- README.md | 4 ++-- builds.yml | 8 ++++---- ...ebian-10.4-amd64.json => debian-10.5-amd64.json} | 13 ++++++------- ...{debian-10.4-i386.json => debian-10.5-i386.json} | 13 ++++++------- ...ebian-9.12-amd64.json => debian-9.13-amd64.json} | 13 ++++++------- ...{debian-9.12-i386.json => debian-9.13-i386.json} | 13 ++++++------- ...n-9.12-ppc64el.json => debian-9.13-ppc64el.json} | 11 +++++------ 7 files changed, 35 insertions(+), 40 deletions(-) rename packer_templates/debian/{debian-10.4-amd64.json => debian-10.5-amd64.json} (96%) rename packer_templates/debian/{debian-10.4-i386.json => debian-10.5-i386.json} (96%) rename packer_templates/debian/{debian-9.12-amd64.json => debian-9.13-amd64.json} (96%) rename packer_templates/debian/{debian-9.12-i386.json => debian-9.13-i386.json} (96%) rename packer_templates/debian/{debian-9.12-ppc64el.json => debian-9.13-ppc64el.json} (94%) diff --git a/README.md b/README.md index 5c1dc1db4..a3cec7c7c 100644 --- a/README.md +++ b/README.md @@ -44,11 +44,11 @@ $ cd ubuntu $ packer build -only=virtualbox-iso ubuntu-18.04-amd64.json ``` -To build Debian 10.4 32bit boxes for all possible providers (simultaneously) +To build Debian 10.5 32bit boxes for all possible providers (simultaneously) ``` $ cd debian -$ packer build debian-10.4-i386.json +$ packer build debian-10.5-i386.json ``` To build CentOS 7.7 boxes for all providers except VMware and Parallels diff --git a/builds.yml b/builds.yml index 887221045..c681cb54f 100644 --- a/builds.yml +++ b/builds.yml @@ -5,10 +5,10 @@ public: - 'centos-6.10' - 'centos-7.8' - 'centos-8.2' -- 'debian-9.12-i386' -- 'debian-9.12' -- 'debian-10.4-i386' -- 'debian-10.4' +- 'debian-9.13-i386' +- 'debian-9.13' +- 'debian-10.5-i386' +- 'debian-10.5' - 'fedora-31' - 'fedora-32' - 'freebsd-11.4-i386' diff --git a/packer_templates/debian/debian-10.4-amd64.json b/packer_templates/debian/debian-10.5-amd64.json similarity index 96% rename from packer_templates/debian/debian-10.4-amd64.json rename to packer_templates/debian/debian-10.5-amd64.json index ac5e6acb6..0984bcaef 100644 --- a/packer_templates/debian/debian-10.4-amd64.json +++ b/packer_templates/debian/debian-10.5-amd64.json @@ -193,7 +193,7 @@ } ], "variables": { - "box_basename": "debian-10.4", + "box_basename": "debian-10.5", "build_directory": "../../builds", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", @@ -204,16 +204,15 @@ "http_directory": "{{template_dir}}/http", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", - "iso_checksum": "ab3763d553330e90869487a6843c88f1d4aa199333ff16b653e60e59ac1fc60b", - "iso_name": "debian-10.4.0-amd64-netinst.iso", + "iso_checksum": "93863e17ac24eeaa347dfb91dddac654f214c189e0379d7c28664a306e0301e7", + "iso_name": "debian-10.5.0-amd64-netinst.iso", "memory": "1024", "mirror": "http://cdimage.debian.org/cdimage/release", - "mirror_directory": "10.4.0/amd64/iso-cd", - "name": "debian-10.4", + "mirror_directory": "10.5.0/amd64/iso-cd", + "name": "debian-10.5", "no_proxy": "{{env `no_proxy`}}", "preseed_path": "debian-9/preseed.cfg", - "template": "debian-10.4-amd64", + "template": "debian-10.5-amd64", "version": "TIMESTAMP" } } - diff --git a/packer_templates/debian/debian-10.4-i386.json b/packer_templates/debian/debian-10.5-i386.json similarity index 96% rename from packer_templates/debian/debian-10.4-i386.json rename to packer_templates/debian/debian-10.5-i386.json index 782d9a40b..14af45f99 100644 --- a/packer_templates/debian/debian-10.4-i386.json +++ b/packer_templates/debian/debian-10.5-i386.json @@ -193,7 +193,7 @@ } ], "variables": { - "box_basename": "debian-10.4-i386", + "box_basename": "debian-10.5-i386", "build_directory": "../../builds", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", @@ -204,16 +204,15 @@ "http_directory": "{{template_dir}}/http", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", - "iso_checksum": "549966a43224f237c46ee4397901ec9fd6feae74abb1e6f6baa0078acf77a936", - "iso_name": "debian-10.4.0-i386-netinst.iso", + "iso_checksum": "6632bc1817bd891ded98f45344cabc182c8458cb61306784cf34e0b2afbfcee7", + "iso_name": "debian-10.5.0-i386-netinst.iso", "memory": "1024", "mirror": "http://cdimage.debian.org/cdimage/release", - "mirror_directory": "10.4.0/i386/iso-cd", - "name": "debian-10.4-i386", + "mirror_directory": "10.5.0/i386/iso-cd", + "name": "debian-10.5-i386", "no_proxy": "{{env `no_proxy`}}", "preseed_path": "debian-9/preseed.cfg", - "template": "debian-10.4-i386", + "template": "debian-10.5-i386", "version": "TIMESTAMP" } } - diff --git a/packer_templates/debian/debian-9.12-amd64.json b/packer_templates/debian/debian-9.13-amd64.json similarity index 96% rename from packer_templates/debian/debian-9.12-amd64.json rename to packer_templates/debian/debian-9.13-amd64.json index 5a077a136..e252b8cff 100644 --- a/packer_templates/debian/debian-9.12-amd64.json +++ b/packer_templates/debian/debian-9.13-amd64.json @@ -193,7 +193,7 @@ } ], "variables": { - "box_basename": "debian-9.12", + "box_basename": "debian-9.13", "build_directory": "../../builds", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", @@ -204,16 +204,15 @@ "http_directory": "{{template_dir}}/http", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", - "iso_checksum": "3c47f64693435b0b42b6ef59624edbffa7c4004317d9f9a3f04ecb6a4e30f191", - "iso_name": "debian-9.12.0-amd64-netinst.iso", + "iso_checksum": "51109882680c5db06eaf348e1ac7da04dc52798b164724a9db1b95e0275ee013", + "iso_name": "debian-9.13.0-amd64-netinst.iso", "memory": "1024", "mirror": "http://cdimage.debian.org/cdimage/archive", - "mirror_directory": "9.12.0/amd64/iso-cd", - "name": "debian-9.12", + "mirror_directory": "9.13.0/amd64/iso-cd", + "name": "debian-9.13", "no_proxy": "{{env `no_proxy`}}", "preseed_path": "debian-9/preseed.cfg", - "template": "debian-9.12-amd64", + "template": "debian-9.13-amd64", "version": "TIMESTAMP" } } - diff --git a/packer_templates/debian/debian-9.12-i386.json b/packer_templates/debian/debian-9.13-i386.json similarity index 96% rename from packer_templates/debian/debian-9.12-i386.json rename to packer_templates/debian/debian-9.13-i386.json index 5bfb13c70..bb34cbc29 100644 --- a/packer_templates/debian/debian-9.12-i386.json +++ b/packer_templates/debian/debian-9.13-i386.json @@ -193,7 +193,7 @@ } ], "variables": { - "box_basename": "debian-9.12-i386", + "box_basename": "debian-9.13-i386", "build_directory": "../../builds", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", @@ -204,16 +204,15 @@ "http_directory": "{{template_dir}}/http", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", - "iso_checksum": "7b5f1480c45bb7e70ddac7daf0b23f7ae5b97b4b12c6e835b285460f41a50572", - "iso_name": "debian-9.12.0-i386-netinst.iso", + "iso_checksum": "27de998af87007bf5daa3030d3863d3ef801b948c29f5bbce232be4f928eedba", + "iso_name": "debian-9.13.0-i386-netinst.iso", "memory": "1024", "mirror": "http://cdimage.debian.org/cdimage/archive", - "mirror_directory": "9.12.0/i386/iso-cd", - "name": "debian-9.12-i386", + "mirror_directory": "9.13.0/i386/iso-cd", + "name": "debian-9.13-i386", "no_proxy": "{{env `no_proxy`}}", "preseed_path": "debian-9/preseed.cfg", - "template": "debian-9.12-i386", + "template": "debian-9.13-i386", "version": "TIMESTAMP" } } - diff --git a/packer_templates/debian/debian-9.12-ppc64el.json b/packer_templates/debian/debian-9.13-ppc64el.json similarity index 94% rename from packer_templates/debian/debian-9.12-ppc64el.json rename to packer_templates/debian/debian-9.13-ppc64el.json index f109b3c12..b6e9d190d 100644 --- a/packer_templates/debian/debian-9.12-ppc64el.json +++ b/packer_templates/debian/debian-9.13-ppc64el.json @@ -80,7 +80,7 @@ } ], "variables": { - "box_basename": "debian-9.12", + "box_basename": "debian-9.13", "build_directory": "../../builds", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", @@ -91,15 +91,14 @@ "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", "iso_checksum": "b35d8b33c9fc316c03178d8f493ecb858269082337150f82af75c8d4663cc324", - "iso_name": "debian-9.12.0-ppc64el-netinst.iso", + "iso_name": "debian-9.13.0-ppc64el-netinst.iso", "memory": "1024", "mirror": "http://cdimage.debian.org/cdimage/archive", - "mirror_directory": "9.12.0/ppc64el/iso-cd", - "name": "debian-9.12", + "mirror_directory": "9.13.0/ppc64el/iso-cd", + "name": "debian-9.13", "no_proxy": "{{env `no_proxy`}}", "preseed_path": "debian-9/preseed.cfg", - "template": "debian-9.12-ppc64el", + "template": "debian-9.13-ppc64el", "version": "TIMESTAMP" } } - From d37cf979fb2573eac825b8b92720800226942c96 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Sat, 15 Aug 2020 19:51:43 -0700 Subject: [PATCH 1212/1622] Fix sha in debian 9.3 Signed-off-by: Tim Smith <tsmith@chef.io> --- packer_templates/debian/debian-9.13-amd64.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packer_templates/debian/debian-9.13-amd64.json b/packer_templates/debian/debian-9.13-amd64.json index e252b8cff..952b43182 100644 --- a/packer_templates/debian/debian-9.13-amd64.json +++ b/packer_templates/debian/debian-9.13-amd64.json @@ -204,7 +204,7 @@ "http_directory": "{{template_dir}}/http", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", - "iso_checksum": "51109882680c5db06eaf348e1ac7da04dc52798b164724a9db1b95e0275ee013", + "iso_checksum": "71c7e9eb292acc880f84605b1ca2b997f25737fe0a43fc9586f61d35cd2eb43b", "iso_name": "debian-9.13.0-amd64-netinst.iso", "memory": "1024", "mirror": "http://cdimage.debian.org/cdimage/archive", From 0e80bd5faa4b9976180bc0d3e11e4c4d734506bf Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Sat, 15 Aug 2020 20:12:57 -0700 Subject: [PATCH 1213/1622] Update Ubuntu 16.04.6 to 16.04.7 Signed-off-by: Tim Smith <tsmith@chef.io> --- packer_templates/ubuntu/ubuntu-16.04-amd64.json | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/packer_templates/ubuntu/ubuntu-16.04-amd64.json b/packer_templates/ubuntu/ubuntu-16.04-amd64.json index 7a7795971..1bd4dc0b4 100644 --- a/packer_templates/ubuntu/ubuntu-16.04-amd64.json +++ b/packer_templates/ubuntu/ubuntu-16.04-amd64.json @@ -272,11 +272,11 @@ "https_proxy": "{{env `https_proxy`}}", "hyperv_generation": "2", "hyperv_switch": "{{env `hyperv_switch`}}", - "iso_checksum": "16afb1375372c57471ea5e29803a89a5a6bd1f6aabea2e5e34ac1ab7eb9786ac", - "iso_name": "ubuntu-16.04.6-server-amd64.iso", + "iso_checksum": "b23488689e16cad7a269eb2d3a3bf725d3457ee6b0868e00c8762d3816e25848", + "iso_name": "ubuntu-16.04.7-server-amd64.iso", "memory": "1024", "mirror": "http://releases.ubuntu.com", - "mirror_directory": "16.04.6", + "mirror_directory": "16.04.7", "name": "ubuntu-16.04", "no_proxy": "{{env `no_proxy`}}", "preseed_path": "preseed.cfg", @@ -284,4 +284,3 @@ "version": "TIMESTAMP" } } - From 6d7c5d6c2af86b13e3753acaf7d81336efc8ea5c Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Sun, 16 Aug 2020 12:01:55 -0700 Subject: [PATCH 1214/1622] Ignore log files in git Signed-off-by: Tim Smith <tsmith@chef.io> --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index b2e11ac29..132b90580 100644 --- a/.gitignore +++ b/.gitignore @@ -17,3 +17,4 @@ Gemfile.lock bootstrap.sh Berksfile.lock ubuntu/scripts/homestead.sh +*.log \ No newline at end of file From 638ffb76a7dba05d01e0419781508bd664babce1 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Sun, 16 Aug 2020 12:02:05 -0700 Subject: [PATCH 1215/1622] Fix deprecations in the windows 10 gen2 hyperv template Signed-off-by: Tim Smith <tsmith@chef.io> --- packer_templates/windows/windows-10gen2.json | 234 +++++++++---------- 1 file changed, 116 insertions(+), 118 deletions(-) diff --git a/packer_templates/windows/windows-10gen2.json b/packer_templates/windows/windows-10gen2.json index 2c51899cf..206348b09 100644 --- a/packer_templates/windows/windows-10gen2.json +++ b/packer_templates/windows/windows-10gen2.json @@ -1,121 +1,119 @@ { - "variables": { - "build_version": "1", - "package_location": "", - "working_directory": "", - "autounattend": "Autounattend.xml", - "unattend": "answer_files\\unattend.xml", - "disk_size": "61440", - "disk_type_id": "1", - "headless": "false", - "iso_checksum": "F57E034095E0423FEB575CA82855F73E39FFA713", - "iso_checksum_type": "sha1", - "iso_url": "https://software-download.microsoft.com/download/pr/19041.264.200511-0456.vb_release_svc_refresh_CLIENTENTERPRISEEVAL_OEMRET_x64FRE_en-us.iso", - "restart_timeout": "5m", - "vhv_enable": "false", - "winrm_timeout": "6h", - "vm_name": "windows_10", - "virtio_win_iso": "virtio-win.iso", - "hyperv_switch": "Default Switch", - "memory": "4096", - "cpus": "2", - "template_dir": "", - "build_directory": "", - "template": "vagrantfile-windows-gen2.template", - "sysprep_unattended": "", - "vagrant_sysprep_unattended": "", - "guest_additions_mode": "upload" + "builders": [ + { + "boot_command": [ + "aaaaaaa" + ], + "boot_wait": "1s", + "communicator": "winrm", + "cpus": "{{user `cpus`}}", + "enable_dynamic_memory": "true", + "enable_secure_boot": false, + "generation": "2", + "headless": "false", + "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", + "iso_url": "{{user `iso_url`}}", + "memory": "{{user `memory`}}", + "output_directory": "c:\\packer-build\\", + "secondary_iso_images": [], + "shutdown_command": "shutdown /s /t 10 /c \"Packer Shutdown\" /f /d p:4:1", + "shutdown_timeout": "15m", + "skip_export": false, + "switch_name": "{{user `hyperv_switch`}}", + "type": "hyperv-iso", + "winrm_password": "vagrant", + "winrm_timeout": "12h", + "winrm_username": "vagrant" + } + ], + "post-processors": [ + { + "keep_input_artifact": true, + "output": "{{.Provider}}_windows-10.box", + "type": "vagrant", + "vagrantfile_template": "{{template_dir}}/{{user `template`}}" + } + ], + "provisioners": [ + { + "cookbook_paths": [ + "{{template_dir}}/cookbooks" + ], + "guest_os_type": "windows", + "run_list": [ + "packer::disable_uac", + "packer::disable_onedrive", + "packer::disable_restore", + "packer::disable_windows_update", + "packer::remove_defender", + "packer::configure_power", + "packer::disable_screensaver" + ], + "type": "chef-solo" }, - "builders": [ - { - "type": "hyperv-iso", - "generation": "2", - "switch_name": "{{user `hyperv_switch`}}", - "memory": "{{user `memory`}}", - "enable_dynamic_memory": "true", - "cpus": "{{user `cpus`}}", - "headless": "false", - "iso_url": "{{user `iso_url`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "output_directory": "c:\\packer-build\\", - "communicator": "winrm", - "winrm_username": "vagrant", - "winrm_password": "vagrant", - "winrm_timeout": "12h", - "shutdown_command": "shutdown /s /t 10 /c \"Packer Shutdown\" /f /d p:4:1", - "shutdown_timeout": "15m", - "enable_secure_boot": false, - "skip_export": false, - "boot_wait": "1s", - "boot_command": [ - "aaaaaaa" - ], - "secondary_iso_images": [ + { + "type": "windows-restart" + }, + { + "cookbook_paths": [ + "{{template_dir}}/cookbooks" + ], + "guest_os_type": "windows", + "run_list": [ + "packer::vm_tools", + "packer::features", + "packer::enable_file_sharing", + "packer::enable_remote_desktop", + "packer::ui_tweaks" + ], + "type": "chef-solo" + }, + { + "type": "windows-restart" + }, + { + "cookbook_paths": [ + "{{template_dir}}/cookbooks" + ], + "guest_os_type": "windows", + "run_list": [ + "packer::cleanup" + ], + "type": "chef-solo" + }, + { + "elevated_password": "vagrant", + "elevated_user": "vagrant", + "script": "{{template_dir}}/scripts/cleanup.ps1", + "type": "powershell" + } + ], + "variables": { + "autounattend": "Autounattend.xml", + "build_directory": "", + "build_version": "1", + "cpus": "2", + "disk_size": "61440", + "disk_type_id": "1", + "guest_additions_mode": "upload", + "headless": "false", + "hyperv_switch": "Default Switch", + "iso_checksum": "F57E034095E0423FEB575CA82855F73E39FFA713", + "iso_checksum_type": "sha1", + "iso_url": "https://software-download.microsoft.com/download/pr/19041.264.200511-0456.vb_release_svc_refresh_CLIENTENTERPRISEEVAL_OEMRET_x64FRE_en-us.iso", + "memory": "4096", + "package_location": "", + "restart_timeout": "5m", + "sysprep_unattended": "", + "template": "vagrantfile-windows-gen2.template", + "template_dir": "", + "unattend": "answer_files\\unattend.xml", + "vagrant_sysprep_unattended": "", + "vhv_enable": "false", + "virtio_win_iso": "virtio-win.iso", + "vm_name": "windows_10", + "winrm_timeout": "6h", + "working_directory": "" + } +} - ] - } - ], - "provisioners": [ - { - "cookbook_paths": [ - "{{template_dir}}/cookbooks" - ], - "guest_os_type": "windows", - "run_list": [ - "packer::disable_uac", - "packer::disable_onedrive", - "packer::disable_restore", - "packer::disable_windows_update", - "packer::remove_defender", - "packer::configure_power", - "packer::disable_screensaver" - ], - "type": "chef-solo" - }, - { - "type": "windows-restart" - }, - { - "cookbook_paths": [ - "{{template_dir}}/cookbooks" - ], - "guest_os_type": "windows", - "run_list": [ - "packer::vm_tools", - "packer::features", - "packer::enable_file_sharing", - "packer::enable_remote_desktop", - "packer::ui_tweaks" - ], - "type": "chef-solo" - }, - { - "type": "windows-restart" - }, - { - "cookbook_paths": [ - "{{template_dir}}/cookbooks" - ], - "guest_os_type": "windows", - "run_list": [ - "packer::cleanup" - ], - "type": "chef-solo" - }, - { - "elevated_password": "vagrant", - "elevated_user": "vagrant", - "script": "{{template_dir}}/scripts/cleanup.ps1", - "type": "powershell" - } - ], - "post-processors": [ - { - "type": "vagrant", - "keep_input_artifact": true, - "output": "{{.Provider}}_windows-10.box", - "vagrantfile_template": "{{template_dir}}/{{user `template`}}" - } - ] -} \ No newline at end of file From 7a9a96b0987581f90c839c26ce70a56357aa9741 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Sun, 16 Aug 2020 12:02:29 -0700 Subject: [PATCH 1216/1622] Update Ubuntu 18.04 to 18.04.5 Signed-off-by: Tim Smith <tsmith@chef.io> --- packer_templates/ubuntu/ubuntu-18.04-amd64.json | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/packer_templates/ubuntu/ubuntu-18.04-amd64.json b/packer_templates/ubuntu/ubuntu-18.04-amd64.json index a9ba78809..4c757fea5 100644 --- a/packer_templates/ubuntu/ubuntu-18.04-amd64.json +++ b/packer_templates/ubuntu/ubuntu-18.04-amd64.json @@ -268,11 +268,11 @@ "https_proxy": "{{env `https_proxy`}}", "hyperv_generation": "2", "hyperv_switch": "{{env `hyperv_switch`}}", - "iso_checksum": "e2ecdace33c939527cbc9e8d23576381c493b071107207d2040af72595f8990b", - "iso_name": "ubuntu-18.04.4-server-amd64.iso", + "iso_checksum": "8c5fc24894394035402f66f3824beb7234b757dd2b5531379cb310cedfdf0996", + "iso_name": "ubuntu-18.04.5-server-amd64.iso", "memory": "1024", "mirror": "http://cdimage.ubuntu.com", - "mirror_directory": "ubuntu/releases/18.04.4/release", + "mirror_directory": "ubuntu/releases/18.04.5/release", "name": "ubuntu-18.04", "no_proxy": "{{env `no_proxy`}}", "preseed_path": "preseed.cfg", @@ -280,4 +280,3 @@ "version": "TIMESTAMP" } } - From bde20cf265822534e7686bf2887b7221d1509530 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Sun, 16 Aug 2020 12:02:52 -0700 Subject: [PATCH 1217/1622] Update Ubuntu 20.04 to 20.04.1 Signed-off-by: Tim Smith <tsmith@chef.io> --- packer_templates/ubuntu/ubuntu-16.04-i386.json | 1 - packer_templates/ubuntu/ubuntu-19.10-amd64.json | 1 - packer_templates/ubuntu/ubuntu-20.04-amd64.json | 7 +++---- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/packer_templates/ubuntu/ubuntu-16.04-i386.json b/packer_templates/ubuntu/ubuntu-16.04-i386.json index 25785653e..e244e516b 100644 --- a/packer_templates/ubuntu/ubuntu-16.04-i386.json +++ b/packer_templates/ubuntu/ubuntu-16.04-i386.json @@ -283,4 +283,3 @@ "version": "TIMESTAMP" } } - diff --git a/packer_templates/ubuntu/ubuntu-19.10-amd64.json b/packer_templates/ubuntu/ubuntu-19.10-amd64.json index 882a68d76..e853c07c1 100644 --- a/packer_templates/ubuntu/ubuntu-19.10-amd64.json +++ b/packer_templates/ubuntu/ubuntu-19.10-amd64.json @@ -280,4 +280,3 @@ "version": "TIMESTAMP" } } - diff --git a/packer_templates/ubuntu/ubuntu-20.04-amd64.json b/packer_templates/ubuntu/ubuntu-20.04-amd64.json index da8f4dfaa..b4f629503 100644 --- a/packer_templates/ubuntu/ubuntu-20.04-amd64.json +++ b/packer_templates/ubuntu/ubuntu-20.04-amd64.json @@ -268,11 +268,11 @@ "https_proxy": "{{env `https_proxy`}}", "hyperv_generation": "2", "hyperv_switch": "{{env `hyperv_switch`}}", - "iso_checksum": "36f15879bd9dfd061cd588620a164a82972663fdd148cce1f70d57d314c21b73", - "iso_name": "ubuntu-20.04-legacy-server-amd64.iso", + "iso_checksum": "f11bda2f2caed8f420802b59f382c25160b114ccc665dbac9c5046e7fceaced2", + "iso_name": "ubuntu-20.04.1-legacy-server-amd64.iso", "memory": "1024", "mirror": "http://cdimage.ubuntu.com", - "mirror_directory": "ubuntu-legacy-server/releases/20.04/release", + "mirror_directory": "ubuntu-legacy-server/releases/20.04.1/release", "name": "ubuntu-20.04", "no_proxy": "{{env `no_proxy`}}", "preseed_path": "preseed.cfg", @@ -280,4 +280,3 @@ "version": "TIMESTAMP" } } - From b7b8a9bd30e143514b61a694c7d37155733adea1 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Sun, 16 Aug 2020 12:03:58 -0700 Subject: [PATCH 1218/1622] Update tests to use the latest packer Signed-off-by: Tim Smith <tsmith@chef.io> --- .expeditor/verify.pipeline.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.expeditor/verify.pipeline.yml b/.expeditor/verify.pipeline.yml index dfa3fb9d8..4cb5bb39a 100644 --- a/.expeditor/verify.pipeline.yml +++ b/.expeditor/verify.pipeline.yml @@ -3,13 +3,13 @@ steps: - label: run-packer-validate command: - bundle install - - wget https://releases.hashicorp.com/packer/1.6.0/packer_1.6.0_linux_amd64.zip - - unzip -d /usr/local/bin packer_1.6.0_linux_amd64.zip + - wget https://releases.hashicorp.com/packer/1.6.1/packer_1.6.1_linux_amd64.zip + - unzip -d /usr/local/bin packer_1.6.1_linux_amd64.zip - rake validate expeditor: executor: docker: - image: ruby:2.6-stretch + image: ruby:2.7-buster - label: windows-build-cookbook-cookstyle command: @@ -18,4 +18,4 @@ steps: expeditor: executor: docker: - image: ruby:2.6-stretch + image: ruby:2.7-buster From 2e4f14eeb36264c14962941b6a607402efdd08a7 Mon Sep 17 00:00:00 2001 From: Michael Kesper <mkesper@sysfive.com> Date: Mon, 21 Sep 2020 16:55:16 +0200 Subject: [PATCH 1219/1622] Use minimal DVDs for CentOS Save bandwidth and download only minimal images for CentOS >= 7. Signed-off-by: Michael Kesper <mkesper@sysfive.com> --- packer_templates/centos/centos-7.8-x86_64.json | 4 ++-- packer_templates/centos/centos-8.2-x86_64.json | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/packer_templates/centos/centos-7.8-x86_64.json b/packer_templates/centos/centos-7.8-x86_64.json index dbebb1d1d..d07b5cb6a 100644 --- a/packer_templates/centos/centos-7.8-x86_64.json +++ b/packer_templates/centos/centos-7.8-x86_64.json @@ -169,8 +169,8 @@ "https_proxy": "{{env `https_proxy`}}", "hyperv_generation": "1", "hyperv_switch": "{{env `hyperv_switch`}}", - "iso_checksum": "087a5743dc6fd6706d9b961b8147423ddc029451b938364c760d75440eb7be14", - "iso_name": "CentOS-7-x86_64-DVD-2003.iso", + "iso_checksum": "659691c28a0e672558b003d223f83938f254b39875ee7559d1a4a14c79173193", + "iso_name": "CentOS-7-x86_64-Minimal-2003.iso", "ks_path": "7/ks.cfg", "memory": "1024", "mirror": "http://mirrors.kernel.org/centos", diff --git a/packer_templates/centos/centos-8.2-x86_64.json b/packer_templates/centos/centos-8.2-x86_64.json index 5364863a0..82cacede4 100644 --- a/packer_templates/centos/centos-8.2-x86_64.json +++ b/packer_templates/centos/centos-8.2-x86_64.json @@ -169,8 +169,8 @@ "https_proxy": "{{env `https_proxy`}}", "hyperv_generation": "1", "hyperv_switch": "{{env `hyperv_switch`}}", - "iso_checksum": "c87a2d81d67bbaeaf646aea5bedd70990078ec252fc52f5a7d65ff609871e255", - "iso_name": "CentOS-8.2.2004-x86_64-dvd1.iso", + "iso_checksum": "47ab14778c823acae2ee6d365d76a9aed3f95bb8d0add23a06536b58bb5293c0", + "iso_name": "CentOS-8.2.2004-x86_64-minimal.iso", "ks_path": "8/ks.cfg", "memory": "1024", "mirror": "http://mirrors.kernel.org/centos", From e64ed7bc509878d1b997818121bda0899671c99c Mon Sep 17 00:00:00 2001 From: Ian Brown <ian.brown@chime.com> Date: Sat, 10 Oct 2020 16:03:57 -0700 Subject: [PATCH 1220/1622] Fix vm_tools recipe --- .../windows/cookbooks/packer/recipes/vm_tools.rb | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/packer_templates/windows/cookbooks/packer/recipes/vm_tools.rb b/packer_templates/windows/cookbooks/packer/recipes/vm_tools.rb index 83436bf78..d5b87c232 100644 --- a/packer_templates/windows/cookbooks/packer/recipes/vm_tools.rb +++ b/packer_templates/windows/cookbooks/packer/recipes/vm_tools.rb @@ -23,12 +23,13 @@ # install vmware tools on vmware guests # This is from https://github.com/luciusbono/Packer-Windows10/blob/master/install-guest-tools.ps1 if vmware? - powershell_script 'install vbox guest additions' do - code <<-EOH - $isopath = "C:\\Windows\\Temp\\vmware.iso" + powershell_script 'install vmware tools' do + code <<-'EOH' + $isopath = 'C:\Windows\Temp\vmware.iso' Mount-DiskImage -ImagePath $isopath $exe = ((Get-DiskImage -ImagePath $isopath | Get-Volume).Driveletter + ':\setup.exe') - $parameters = '/S /v "/qr REBOOT=R"' + $parameters = '/S /v "/qn REBOOT=R"' + Start-Process -FilePath $exe -ArgumentList $parameters -Wait Dismount-DiskImage -ImagePath $isopath Remove-Item $isopath EOH From 35f12ed8d47715cade3027c1a85897236a219fea Mon Sep 17 00:00:00 2001 From: David Beitey <david@davidjb.com> Date: Thu, 15 Oct 2020 01:26:42 +0000 Subject: [PATCH 1221/1622] Add packer_templates/ directory to README examples The examples indicate the OS directories but it wasn't specifically clear where these directories were. Easily found by looking around but easiest if it's documented. This also normalises whitespace in two minor cases. Signed-off-by: David Beitey <david@davidjb.com> --- README.md | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index a3cec7c7c..fb243aef1 100644 --- a/README.md +++ b/README.md @@ -40,35 +40,35 @@ end To build an Ubuntu 18.04 box for only the VirtualBox provider ``` -$ cd ubuntu +$ cd packer_templates/ubuntu $ packer build -only=virtualbox-iso ubuntu-18.04-amd64.json ``` To build Debian 10.5 32bit boxes for all possible providers (simultaneously) ``` -$ cd debian +$ cd packer_templates/debian $ packer build debian-10.5-i386.json ``` To build CentOS 7.7 boxes for all providers except VMware and Parallels ``` -$ cd centos +$ cd packer_templates/centos $ packer build -except=parallels-iso,vmware-iso centos-7.7-x86_64.json ``` To use an alternate mirror ``` -$ cd fedora +$ cd packer_templates/fedora $ packer build -var 'mirror=http://mirror.utexas.edu/fedora/linux' fedora-31-x86_64.json ``` To build a Windows 10 Enterprise Gen 2 box for the Hyper-V provider ``` -$ cd windows +$ cd packer_templates/windows $ packer build windows-10gen2.json ``` @@ -109,7 +109,6 @@ Hyper-V Gen 2 VMs do not support floppy drives. If you previously provided resou - `autounattend.xml`: The Gen 2 `autounattend.xml` file supports EFI partitions. Update the `autounattend.xml` with the correct Windows version for your systems and ensure that the partitions are correct for your situation. You also need to manage the driver disk that holds the hyper-v guest services drivers and adjust the `autounattend.xml` file as appropriate. - `base_setup.ps1` - #### macOS / OSX See this [wiki page](https://github.com/chef/bento/wiki/macOS) From a59884cdd29edc566841c6ab440634352e8d251b Mon Sep 17 00:00:00 2001 From: SG <13872653+mmguero@users.noreply.github.com> Date: Tue, 20 Oct 2020 08:36:46 -0600 Subject: [PATCH 1222/1622] Update to Debian 10.6 --- ...debian-10.5-amd64.json => debian-10.6-amd64.json} | 12 ++++++------ .../{debian-10.5-i386.json => debian-10.6-i386.json} | 12 ++++++------ 2 files changed, 12 insertions(+), 12 deletions(-) rename packer_templates/debian/{debian-10.5-amd64.json => debian-10.6-amd64.json} (96%) rename packer_templates/debian/{debian-10.5-i386.json => debian-10.6-i386.json} (96%) diff --git a/packer_templates/debian/debian-10.5-amd64.json b/packer_templates/debian/debian-10.6-amd64.json similarity index 96% rename from packer_templates/debian/debian-10.5-amd64.json rename to packer_templates/debian/debian-10.6-amd64.json index 0984bcaef..3083dc341 100644 --- a/packer_templates/debian/debian-10.5-amd64.json +++ b/packer_templates/debian/debian-10.6-amd64.json @@ -193,7 +193,7 @@ } ], "variables": { - "box_basename": "debian-10.5", + "box_basename": "debian-10.6", "build_directory": "../../builds", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", @@ -204,15 +204,15 @@ "http_directory": "{{template_dir}}/http", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", - "iso_checksum": "93863e17ac24eeaa347dfb91dddac654f214c189e0379d7c28664a306e0301e7", - "iso_name": "debian-10.5.0-amd64-netinst.iso", + "iso_checksum": "2af8f43d4a7ab852151a7f630ba596572213e17d3579400b5648eba4cc974ed0", + "iso_name": "debian-10.6.0-amd64-netinst.iso", "memory": "1024", "mirror": "http://cdimage.debian.org/cdimage/release", - "mirror_directory": "10.5.0/amd64/iso-cd", - "name": "debian-10.5", + "mirror_directory": "10.6.0/amd64/iso-cd", + "name": "debian-10.6", "no_proxy": "{{env `no_proxy`}}", "preseed_path": "debian-9/preseed.cfg", - "template": "debian-10.5-amd64", + "template": "debian-10.6-amd64", "version": "TIMESTAMP" } } diff --git a/packer_templates/debian/debian-10.5-i386.json b/packer_templates/debian/debian-10.6-i386.json similarity index 96% rename from packer_templates/debian/debian-10.5-i386.json rename to packer_templates/debian/debian-10.6-i386.json index 14af45f99..75340d56a 100644 --- a/packer_templates/debian/debian-10.5-i386.json +++ b/packer_templates/debian/debian-10.6-i386.json @@ -193,7 +193,7 @@ } ], "variables": { - "box_basename": "debian-10.5-i386", + "box_basename": "debian-10.6-i386", "build_directory": "../../builds", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", @@ -204,15 +204,15 @@ "http_directory": "{{template_dir}}/http", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", - "iso_checksum": "6632bc1817bd891ded98f45344cabc182c8458cb61306784cf34e0b2afbfcee7", - "iso_name": "debian-10.5.0-i386-netinst.iso", + "iso_checksum": "c6e7bdada5a04a639e745b41ea43ae36b796b4cf4128e3dcb3c2502ab034caa3", + "iso_name": "debian-10.6.0-i386-netinst.iso", "memory": "1024", "mirror": "http://cdimage.debian.org/cdimage/release", - "mirror_directory": "10.5.0/i386/iso-cd", - "name": "debian-10.5-i386", + "mirror_directory": "10.6.0/i386/iso-cd", + "name": "debian-10.6-i386", "no_proxy": "{{env `no_proxy`}}", "preseed_path": "debian-9/preseed.cfg", - "template": "debian-10.5-i386", + "template": "debian-10.6-i386", "version": "TIMESTAMP" } } From cfb1386ca6e3ede539b0abf1590c5fb4141fb444 Mon Sep 17 00:00:00 2001 From: SG <13872653+mmguero@users.noreply.github.com> Date: Tue, 20 Oct 2020 08:43:28 -0600 Subject: [PATCH 1223/1622] Update to Debian 10.6 --- README.md | 4 ++-- builds.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index fb243aef1..0be451f59 100644 --- a/README.md +++ b/README.md @@ -44,11 +44,11 @@ $ cd packer_templates/ubuntu $ packer build -only=virtualbox-iso ubuntu-18.04-amd64.json ``` -To build Debian 10.5 32bit boxes for all possible providers (simultaneously) +To build Debian 10.6 32bit boxes for all possible providers (simultaneously) ``` $ cd packer_templates/debian -$ packer build debian-10.5-i386.json +$ packer build debian-10.6-i386.json ``` To build CentOS 7.7 boxes for all providers except VMware and Parallels diff --git a/builds.yml b/builds.yml index c681cb54f..070e30e6c 100644 --- a/builds.yml +++ b/builds.yml @@ -7,8 +7,8 @@ public: - 'centos-8.2' - 'debian-9.13-i386' - 'debian-9.13' -- 'debian-10.5-i386' -- 'debian-10.5' +- 'debian-10.6-i386' +- 'debian-10.6' - 'fedora-31' - 'fedora-32' - 'freebsd-11.4-i386' From f8227b1e3ebebc3557930035a055b1f823eb6ad2 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Wed, 21 Oct 2020 14:56:00 -0700 Subject: [PATCH 1224/1622] Install dmidecode on the freebsd boxes Signed-off-by: Tim Smith <tsmith@chef.io> --- packer_templates/freebsd/scripts/postinstall.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packer_templates/freebsd/scripts/postinstall.sh b/packer_templates/freebsd/scripts/postinstall.sh index 92944270f..bdcd62deb 100644 --- a/packer_templates/freebsd/scripts/postinstall.sh +++ b/packer_templates/freebsd/scripts/postinstall.sh @@ -4,7 +4,7 @@ ntpdate -v -b 0.freebsd.pool.ntp.org # Install curl and ca_root_nss -pkg install -y curl ca_root_nss; +pkg install -y curl ca_root_nss dmidecode; # Emulate the ETCSYMLINK behavior of ca_root_nss; this is for FreeBSD 10, # where fetch(1) was massively refactored and doesn't come with From f461c2fc8c0a47397878d28a5123957853bc09ef Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Wed, 21 Oct 2020 15:01:55 -0700 Subject: [PATCH 1225/1622] Perform a bit more cleanup on FreeBSD Signed-off-by: Tim Smith <tsmith@chef.io> --- packer_templates/freebsd/scripts/cleanup.sh | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/packer_templates/freebsd/scripts/cleanup.sh b/packer_templates/freebsd/scripts/cleanup.sh index 701bd8bab..fe6e0a59f 100644 --- a/packer_templates/freebsd/scripts/cleanup.sh +++ b/packer_templates/freebsd/scripts/cleanup.sh @@ -1,5 +1,10 @@ #!/bin/sh -eux +# cleanup orphaned packages and cache +pkg autoremove --yes +pkg clean --yes --all +rm -f /var/db/pkg/repo-FreeBSD.sqlite + # Purge files we don't need any longer rm -rf /var/db/freebsd-update/files; mkdir -p /var/db/freebsd-update/files; From 59ba2550c9bd45067b2e6392706b37bdd1c82ca3 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Wed, 21 Oct 2020 15:56:32 -0700 Subject: [PATCH 1226/1622] Fix a small typo Signed-off-by: Tim Smith <tsmith@chef.io> --- packer_templates/ubuntu/scripts/cleanup.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packer_templates/ubuntu/scripts/cleanup.sh b/packer_templates/ubuntu/scripts/cleanup.sh index 0d0f16455..74fccd02f 100644 --- a/packer_templates/ubuntu/scripts/cleanup.sh +++ b/packer_templates/ubuntu/scripts/cleanup.sh @@ -45,7 +45,7 @@ apt-get -y purge popularity-contest installation-report command-not-found friend # 19.10+ don't have this package so fail gracefully apt-get -y purge command-not-found-data || true; -# Exlude the files we don't need w/o uninstalling linux-firmware +# Exclude the files we don't need w/o uninstalling linux-firmware echo "==> Setup dpkg excludes for linux-firmware" cat <<_EOF_ | cat >> /etc/dpkg/dpkg.cfg.d/excludes #BENTO-BEGIN From 914a80d78fbc36c0d76b2d70c6ff639030885373 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Wed, 21 Oct 2020 15:57:04 -0700 Subject: [PATCH 1227/1622] Remove old Ubuntu version checks Now that we don't build 14.04 there's no point in these checks. Signed-off-by: Tim Smith <tsmith@chef.io> --- packer_templates/ubuntu/scripts/networking.sh | 10 ++++------ packer_templates/ubuntu/scripts/update.sh | 19 +++++++------------ 2 files changed, 11 insertions(+), 18 deletions(-) diff --git a/packer_templates/ubuntu/scripts/networking.sh b/packer_templates/ubuntu/scripts/networking.sh index 2d4b3372d..9547f987a 100644 --- a/packer_templates/ubuntu/scripts/networking.sh +++ b/packer_templates/ubuntu/scripts/networking.sh @@ -17,9 +17,7 @@ else echo "pre-up sleep 2" >> /etc/network/interfaces; fi -if [ "$major_version" -ge "16" ]; then - # Disable Predictable Network Interface names and use eth0 - sed -i 's/en[[:alnum:]]*/eth0/g' /etc/network/interfaces; - sed -i 's/GRUB_CMDLINE_LINUX="\(.*\)"/GRUB_CMDLINE_LINUX="net.ifnames=0 biosdevname=0 \1"/g' /etc/default/grub; - update-grub; -fi +# Disable Predictable Network Interface names and use eth0 +sed -i 's/en[[:alnum:]]*/eth0/g' /etc/network/interfaces; +sed -i 's/GRUB_CMDLINE_LINUX="\(.*\)"/GRUB_CMDLINE_LINUX="net.ifnames=0 biosdevname=0 \1"/g' /etc/default/grub; +update-grub; diff --git a/packer_templates/ubuntu/scripts/update.sh b/packer_templates/ubuntu/scripts/update.sh index 40b1ebfde..de3f941bc 100644 --- a/packer_templates/ubuntu/scripts/update.sh +++ b/packer_templates/ubuntu/scripts/update.sh @@ -1,22 +1,17 @@ #!/bin/sh -eux export DEBIAN_FRONTEND=noninteractive -ubuntu_version="`lsb_release -r | awk '{print $2}'`"; -major_version="`echo $ubuntu_version | awk -F. '{print $1}'`"; - # Disable release-upgrades sed -i.bak 's/^Prompt=.*$/Prompt=never/' /etc/update-manager/release-upgrades; # Disable systemd apt timers/services -if [ "$major_version" -ge "16" ]; then - systemctl stop apt-daily.timer; - systemctl stop apt-daily-upgrade.timer; - systemctl disable apt-daily.timer; - systemctl disable apt-daily-upgrade.timer; - systemctl mask apt-daily.service; - systemctl mask apt-daily-upgrade.service; - systemctl daemon-reload; -fi +systemctl stop apt-daily.timer; +systemctl stop apt-daily-upgrade.timer; +systemctl disable apt-daily.timer; +systemctl disable apt-daily-upgrade.timer; +systemctl mask apt-daily.service; +systemctl mask apt-daily-upgrade.service; +systemctl daemon-reload; # Disable periodic activities of apt to be safe cat <<EOF >/etc/apt/apt.conf.d/10periodic; From 27b445060d42312c0faa4617f8a3efccb50ff85d Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Wed, 21 Oct 2020 19:19:40 -0700 Subject: [PATCH 1228/1622] Remove Oracle Linux 5 It's time to wave goodbye to RHEl 5 Signed-off-by: Tim Smith <tsmith@chef.io> --- builds.yml | 2 - .../oraclelinux/oracle-5.11-i386.json | 182 ----------------- .../oraclelinux/oracle-5.11-x86_64.json | 191 ------------------ 3 files changed, 375 deletions(-) delete mode 100644 packer_templates/oraclelinux/oracle-5.11-i386.json delete mode 100644 packer_templates/oraclelinux/oracle-5.11-x86_64.json diff --git a/builds.yml b/builds.yml index 070e30e6c..53f49fce7 100644 --- a/builds.yml +++ b/builds.yml @@ -16,8 +16,6 @@ public: - 'freebsd-12.1-i386' - 'freebsd-12.1' - 'opensuse-leap-15.2' -- 'oracle-5.11-i386' -- 'oracle-5.11' - 'oracle-6.10-i386' - 'oracle-6.10' - 'oracle-7.7' diff --git a/packer_templates/oraclelinux/oracle-5.11-i386.json b/packer_templates/oraclelinux/oracle-5.11-i386.json deleted file mode 100644 index c5eced383..000000000 --- a/packer_templates/oraclelinux/oracle-5.11-i386.json +++ /dev/null @@ -1,182 +0,0 @@ -{ - "builders": [ - { - "boot_command": [ - "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" - ], - "boot_wait": "10s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", - "guest_additions_url": "{{ user `guest_additions_url` }}", - "guest_os_type": "Oracle", - "hard_drive_interface": "sata", - "headless": "{{ user `headless` }}", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-virtualbox", - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "type": "virtualbox-iso", - "virtualbox_version_file": ".vbox_version", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" - ], - "boot_wait": "10s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "oraclelinux", - "headless": "{{ user `headless` }}", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-vmware", - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "tools_upload_flavor": "linux", - "type": "vmware-iso", - "vm_name": "{{ user `template` }}", - "vmx_data": { - "cpuid.coresPerSocket": "1" - }, - "vmx_remove_ethernet_interfaces": true - }, - { - "boot_command": [ - "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" - ], - "boot_wait": "10s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "centos", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-parallels", - "parallels_tools_flavor": "lin", - "prlctl_version_file": ".prlctl_version", - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "type": "parallels-iso", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<wait5><tab> text ks=hd:fd0:/ks.cfg<enter><wait5><esc>" - ], - "boot_wait": "10s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "floppy_files": [ - "{{user `http_directory`}}/{{user `ks_path`}}" - ], - "generation": "{{user `hyperv_generation`}}", - "guest_additions_mode": "disable", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-hyperv", - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "switch_name": "{{ user `hyperv_switch`}}", - "type": "hyperv-iso", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" - ], - "boot_wait": "10s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "headless": "{{ user `headless` }}", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-qemu", - "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "type": "qemu", - "vm_name": "{{ user `template` }}" - } - ], - "post-processors": [ - { - "output": "{{ user `build_directory` }}/{{user `box_basename`}}.{{.Provider}}.box", - "type": "vagrant" - } - ], - "provisioners": [ - { - "environment_vars": [ - "HOME_DIR=/home/vagrant", - "http_proxy={{user `http_proxy`}}", - "https_proxy={{user `https_proxy`}}", - "no_proxy={{user `no_proxy`}}" - ], - "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", - "expect_disconnect": true, - "scripts": [ - "{{template_dir}}/../centos/scripts/update.sh", - "{{template_dir}}/../_common/vagrant.sh", - "{{template_dir}}/../_common/motd.sh", - "{{template_dir}}/../_common/sshd.sh", - "{{template_dir}}/../_common/virtualbox.sh", - "{{template_dir}}/../_common/vmware.sh", - "{{template_dir}}/../_common/parallels.sh", - "{{template_dir}}/../centos/scripts/cleanup.sh", - "{{template_dir}}/../_common/minimize.sh" - ], - "type": "shell" - } - ], - "variables": { - "box_basename": "oracle-5.11-i386", - "build_directory": "../../builds", - "build_timestamp": "{{isotime \"20060102150405\"}}", - "cpus": "1", - "disk_size": "65536", - "git_revision": "__unknown_git_revision__", - "guest_additions_url": "", - "headless": "", - "http_directory": "{{template_dir}}/../centos/http", - "http_proxy": "{{env `http_proxy`}}", - "https_proxy": "{{env `https_proxy`}}", - "hyperv_generation": "1", - "iso_checksum": "E60962C4EBF8920BBD828EFE32A78A7CC8F28E3B", - "iso_name": "Enterprise-R5-U11-Server-i386-dvd.iso", - "ks_path": "5/ks.cfg", - "memory": "1024", - "mirror": "http://mirrors.dotsrc.org/oracle-linux", - "mirror_directory": "EL5/U11/i386", - "name": "oracle-5.11-i386", - "no_proxy": "{{env `no_proxy`}}", - "template": "oracle-5.11-i386", - "version": "TIMESTAMP" - } -} - diff --git a/packer_templates/oraclelinux/oracle-5.11-x86_64.json b/packer_templates/oraclelinux/oracle-5.11-x86_64.json deleted file mode 100644 index 0e82dabf3..000000000 --- a/packer_templates/oraclelinux/oracle-5.11-x86_64.json +++ /dev/null @@ -1,191 +0,0 @@ -{ - "builders": [ - { - "boot_command": [ - "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" - ], - "boot_wait": "10s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", - "guest_additions_url": "{{ user `guest_additions_url` }}", - "guest_os_type": "Oracle_64", - "hard_drive_interface": "sata", - "headless": "{{ user `headless` }}", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-virtualbox", - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "type": "virtualbox-iso", - "vboxmanage": [ - [ - "modifyvm", - "{{.Name}}", - "--paravirtprovider", - "none" - ] - ], - "virtualbox_version_file": ".vbox_version", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" - ], - "boot_wait": "10s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "oraclelinux-64", - "headless": "{{ user `headless` }}", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-vmware", - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "tools_upload_flavor": "linux", - "type": "vmware-iso", - "vm_name": "{{ user `template` }}", - "vmx_data": { - "cpuid.coresPerSocket": "1" - }, - "vmx_remove_ethernet_interfaces": true - }, - { - "boot_command": [ - "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" - ], - "boot_wait": "10s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "centos", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-parallels", - "parallels_tools_flavor": "lin", - "prlctl_version_file": ".prlctl_version", - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "type": "parallels-iso", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<wait5><tab> text ks=hd:fd0:/ks.cfg<enter><wait5><esc>" - ], - "boot_wait": "10s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "floppy_files": [ - "{{user `http_directory`}}/{{user `ks_path`}}" - ], - "generation": "{{user `hyperv_generation`}}", - "guest_additions_mode": "disable", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-hyperv", - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "switch_name": "{{ user `hyperv_switch`}}", - "type": "hyperv-iso", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" - ], - "boot_wait": "10s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "headless": "{{ user `headless` }}", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-qemu", - "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "type": "qemu", - "vm_name": "{{ user `template` }}" - } - ], - "post-processors": [ - { - "output": "{{ user `build_directory` }}/{{user `box_basename`}}.{{.Provider}}.box", - "type": "vagrant" - } - ], - "provisioners": [ - { - "environment_vars": [ - "HOME_DIR=/home/vagrant", - "http_proxy={{user `http_proxy`}}", - "https_proxy={{user `https_proxy`}}", - "no_proxy={{user `no_proxy`}}" - ], - "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", - "expect_disconnect": true, - "scripts": [ - "{{template_dir}}/../centos/scripts/update.sh", - "{{template_dir}}/../_common/vagrant.sh", - "{{template_dir}}/../_common/motd.sh", - "{{template_dir}}/../_common/sshd.sh", - "{{template_dir}}/../_common/virtualbox.sh", - "{{template_dir}}/../_common/vmware.sh", - "{{template_dir}}/../_common/parallels.sh", - "{{template_dir}}/../centos/scripts/cleanup.sh", - "{{template_dir}}/../_common/minimize.sh" - ], - "type": "shell" - } - ], - "variables": { - "arch": "64", - "box_basename": "oracle-5.11", - "build_directory": "../../builds", - "build_timestamp": "{{isotime \"20060102150405\"}}", - "cpus": "1", - "disk_size": "65536", - "git_revision": "__unknown_git_revision__", - "guest_additions_url": "", - "headless": "", - "http_directory": "{{template_dir}}/../centos/http", - "http_proxy": "{{env `http_proxy`}}", - "https_proxy": "{{env `https_proxy`}}", - "hyperv_generation": "1", - "iso_checksum": "2D38F76652CBC1367FDF30024F13CDE5F6BF34DF", - "iso_name": "Enterprise-R5-U11-Server-x86_64-dvd.iso", - "ks_path": "5/ks.cfg", - "memory": "1024", - "mirror": "http://mirrors.dotsrc.org/oracle-linux", - "mirror_directory": "EL5/U11/x86_64", - "name": "oracle-5.11", - "no_proxy": "{{env `no_proxy`}}", - "template": "oracle-5.11-x86_64", - "version": "TIMESTAMP" - } -} - From 9b0a74dd7debebbcddcf1c2ce9b546d2f498962e Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Wed, 21 Oct 2020 19:46:12 -0700 Subject: [PATCH 1229/1622] Remove the RHEL 5 KS file Signed-off-by: Tim Smith <tsmith@chef.io> --- packer_templates/centos/http/5/ks.cfg | 78 --------------------------- 1 file changed, 78 deletions(-) delete mode 100644 packer_templates/centos/http/5/ks.cfg diff --git a/packer_templates/centos/http/5/ks.cfg b/packer_templates/centos/http/5/ks.cfg deleted file mode 100644 index 286830f7d..000000000 --- a/packer_templates/centos/http/5/ks.cfg +++ /dev/null @@ -1,78 +0,0 @@ -install -cdrom -lang en_US.UTF-8 -keyboard us -network --bootproto=dhcp -rootpw vagrant -firewall --disabled -authconfig --enableshadow --passalgo=sha512 -selinux --permissive -timezone UTC -bootloader --location=mbr -text -skipx -zerombr -clearpart --all --initlabel -autopart -firstboot --disabled -reboot -user --name=vagrant --password vagrant -key --skip - -%packages --nobase --ignoremissing --excludedocs -# vagrant needs this to copy initial files via scp -openssh-clients -openssh-server -bzip2 -curl -dhclient -gcc -kernel-devel -kernel-headers -make -nfs-utils -perl -sudo -wget -yum --fprintd-pam --intltool --avahi --bluez-utils --dogtail --kudzu -# unnecessary firmware --aic94xx-firmware --atmel-firmware --b43-openfwwf --bfa-firmware --ipw2100-firmware --ipw2200-firmware --ivtv-firmware --iwl100-firmware --iwl1000-firmware --iwl3945-firmware --iwl4965-firmware --iwl5000-firmware --iwl5150-firmware --iwl6000-firmware --iwl6000g2a-firmware --iwl6050-firmware --libertas-usb8388-firmware --ql2100-firmware --ql2200-firmware --ql23xx-firmware --ql2400-firmware --ql2500-firmware --rt61pci-firmware --rt73usb-firmware --xorg-x11-drv-ati-firmware --zd1211-firmware -# Not Needed --selinux-policy --selinux-policy-targeted - -%post -# sudo -echo "vagrant ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers -sed -i "s/^[^#].*requiretty/#Defaults requiretty/" /etc/sudoers \ No newline at end of file From 7c12b3f4cefc1e5b3eea2e4c4f5208151f8f5632 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Wed, 21 Oct 2020 19:46:24 -0700 Subject: [PATCH 1230/1622] Remove a RHEL 5 check in the networking script Signed-off-by: Tim Smith <tsmith@chef.io> --- packer_templates/centos/scripts/networking.sh | 30 ++++++++----------- 1 file changed, 13 insertions(+), 17 deletions(-) diff --git a/packer_templates/centos/scripts/networking.sh b/packer_templates/centos/scripts/networking.sh index 516ee19b4..615094a8c 100644 --- a/packer_templates/centos/scripts/networking.sh +++ b/packer_templates/centos/scripts/networking.sh @@ -3,26 +3,22 @@ case "$PACKER_BUILDER_TYPE" in virtualbox-iso|virtualbox-ovf) - major_version="`sed 's/^.\+ release \([.0-9]\+\).*/\1/' /etc/redhat-release | awk -F. '{print $1}'`"; + # Fix slow DNS: + # Add 'single-request-reopen' so it is included when /etc/resolv.conf is + # generated + # https://access.redhat.com/site/solutions/58625 (subscription required) - if [ "$major_version" -ge 6 ]; then - # Fix slow DNS: - # Add 'single-request-reopen' so it is included when /etc/resolv.conf is - # generated - # https://access.redhat.com/site/solutions/58625 (subscription required) + echo 'RES_OPTIONS="single-request-reopen"' >>/etc/sysconfig/network; - echo 'RES_OPTIONS="single-request-reopen"' >>/etc/sysconfig/network; - - if [ "$major_version" -ge 8 ]; then - nmcli networking off - sleep 5 - nmcli networking on - else - service network restart; - fi - - echo 'Slow DNS fix applied (single-request-reopen)'; + if [ "$major_version" -ge 8 ]; then + nmcli networking off + sleep 5 + nmcli networking on + else + service network restart; fi + + echo 'Slow DNS fix applied (single-request-reopen)'; ;; esac From 8d753af9b86ae8b9353cdc3c7d4aeb886dd2b0fc Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Wed, 21 Oct 2020 19:46:52 -0700 Subject: [PATCH 1231/1622] Remove the random seed file on RHEL / Fedora Signed-off-by: Tim Smith <tsmith@chef.io> --- packer_templates/centos/scripts/cleanup.sh | 5 ++++- packer_templates/fedora/scripts/cleanup.sh | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/packer_templates/centos/scripts/cleanup.sh b/packer_templates/centos/scripts/cleanup.sh index 201d4b8c8..bbbabd38d 100644 --- a/packer_templates/centos/scripts/cleanup.sh +++ b/packer_templates/centos/scripts/cleanup.sh @@ -119,4 +119,7 @@ fi # clear the history so our install isn't there export HISTSIZE=0 -rm -f /root/.wget-hsts \ No newline at end of file +rm -f /root/.wget-hsts + +# force a new random seed to be generated +rm -f /var/lib/systemd/random-seed \ No newline at end of file diff --git a/packer_templates/fedora/scripts/cleanup.sh b/packer_templates/fedora/scripts/cleanup.sh index 41dc8b695..b87f56e6c 100644 --- a/packer_templates/fedora/scripts/cleanup.sh +++ b/packer_templates/fedora/scripts/cleanup.sh @@ -25,4 +25,7 @@ truncate -s 0 /etc/machine-id # clear the history so our install isn't there export HISTSIZE=0 -rm -f /root/.wget-hsts \ No newline at end of file +rm -f /root/.wget-hsts + +# force a new random seed to be generated +rm -f /var/lib/systemd/random-seed \ No newline at end of file From dd0efaf4f67ecd2a23c66542002cb3a033f7e18e Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Wed, 21 Oct 2020 19:49:25 -0700 Subject: [PATCH 1232/1622] Remove another RHEL 5 check Signed-off-by: Tim Smith <tsmith@chef.io> --- packer_templates/centos/scripts/cleanup.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packer_templates/centos/scripts/cleanup.sh b/packer_templates/centos/scripts/cleanup.sh index bbbabd38d..15315c38c 100644 --- a/packer_templates/centos/scripts/cleanup.sh +++ b/packer_templates/centos/scripts/cleanup.sh @@ -16,7 +16,7 @@ fi if [ "$major_version" -ge 8 ]; then dnf autoremove -y dnf remove -y $(dnf repoquery --installonly --latest-limit=-1 -q) -elif [ "$major_version" -gt 5 ]; then # yum-utils isn't in RHEL 5 so don't try to run this +else if ! command -v package-cleanup >/dev/null 2>&1; then yum install -y yum-utils fi From 9ae6819e4669d71041f59e7728590e10c54a8c5b Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Wed, 21 Oct 2020 20:10:15 -0700 Subject: [PATCH 1233/1622] Install Virtualbox Guest Additions without x11 Signed-off-by: Tim Smith <tsmith@chef.io> --- packer_templates/_common/virtualbox.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packer_templates/_common/virtualbox.sh b/packer_templates/_common/virtualbox.sh index c1e34095c..2ff5abd09 100644 --- a/packer_templates/_common/virtualbox.sh +++ b/packer_templates/_common/virtualbox.sh @@ -9,7 +9,7 @@ virtualbox-iso|virtualbox-ovf) ISO="VBoxGuestAdditions_$VER.iso"; mkdir -p /tmp/vbox; mount -o loop $HOME_DIR/$ISO /tmp/vbox; - sh /tmp/vbox/VBoxLinuxAdditions.run \ + sh /tmp/vbox/VBoxLinuxAdditions.run --nox11 \ || echo "VBoxLinuxAdditions.run exited $? and is suppressed." \ "For more read https://www.virtualbox.org/ticket/12479"; umount /tmp/vbox; From 8ec693fa5e75a65a3def589b35a74f6d6603eadc Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Wed, 21 Oct 2020 20:14:10 -0700 Subject: [PATCH 1234/1622] Make sure we have tar on RHEL systems Signed-off-by: Tim Smith <tsmith@chef.io> --- packer_templates/centos/http/7/ks.cfg | 1 + packer_templates/centos/http/8/ks.cfg | 1 + 2 files changed, 2 insertions(+) diff --git a/packer_templates/centos/http/7/ks.cfg b/packer_templates/centos/http/7/ks.cfg index e1a3b610c..4596b3e80 100644 --- a/packer_templates/centos/http/7/ks.cfg +++ b/packer_templates/centos/http/7/ks.cfg @@ -32,6 +32,7 @@ selinux-policy-devel wget nfs-utils net-tools +tar bzip2 deltarpm rsync diff --git a/packer_templates/centos/http/8/ks.cfg b/packer_templates/centos/http/8/ks.cfg index c7912b37d..f3eadc969 100644 --- a/packer_templates/centos/http/8/ks.cfg +++ b/packer_templates/centos/http/8/ks.cfg @@ -31,6 +31,7 @@ selinux-policy-devel wget nfs-utils net-tools +tar bzip2 deltarpm rsync From d47ec5322821e801011b5b7469fd361866fac5aa Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Wed, 21 Oct 2020 20:15:16 -0700 Subject: [PATCH 1235/1622] Fix missing variable declaration in networking.sh Signed-off-by: Tim Smith <tsmith@chef.io> --- packer_templates/centos/scripts/networking.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/packer_templates/centos/scripts/networking.sh b/packer_templates/centos/scripts/networking.sh index 615094a8c..de35e787d 100644 --- a/packer_templates/centos/scripts/networking.sh +++ b/packer_templates/centos/scripts/networking.sh @@ -10,6 +10,9 @@ virtualbox-iso|virtualbox-ovf) echo 'RES_OPTIONS="single-request-reopen"' >>/etc/sysconfig/network; + # determine the major EL version we're runninng + major_version="`sed 's/^.\+ release \([.0-9]\+\).*/\1/' /etc/redhat-release | awk -F. '{print $1}'`"; + if [ "$major_version" -ge 8 ]; then nmcli networking off sleep 5 From e8c579b11e3bc09fcd81e7311e0326b3eb5a3819 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Wed, 21 Oct 2020 20:15:45 -0700 Subject: [PATCH 1236/1622] Make the cleanup the last package operation on RHEL Signed-off-by: Tim Smith <tsmith@chef.io> --- packer_templates/fedora/scripts/cleanup.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packer_templates/fedora/scripts/cleanup.sh b/packer_templates/fedora/scripts/cleanup.sh index b87f56e6c..2c858d11e 100644 --- a/packer_templates/fedora/scripts/cleanup.sh +++ b/packer_templates/fedora/scripts/cleanup.sh @@ -2,12 +2,13 @@ echo "Removing development packages and cleaning up DNF data" dnf -y remove gcc cpp gc kernel-devel kernel-headers glibc-devel elfutils-libelf-devel glibc-headers kernel-devel kernel-headers dnf -y autoremove -dnf -y clean all --enablerepo=\* # Avoid 150 meg firmware package we don't need echo "Removing extra packages" dnf -y remove linux-firmware +dnf -y clean all --enablerepo=\* + # truncate any logs that have built up during the install find /var/log -type f -exec truncate --size=0 {} \; From 3c0054c8161935d46cd41c3fa5240f5e3abf8ac3 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Wed, 21 Oct 2020 20:17:51 -0700 Subject: [PATCH 1237/1622] Cleanup additional logs on RHEL Signed-off-by: Tim Smith <tsmith@chef.io> --- packer_templates/centos/scripts/cleanup.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packer_templates/centos/scripts/cleanup.sh b/packer_templates/centos/scripts/cleanup.sh index 15315c38c..398d7f479 100644 --- a/packer_templates/centos/scripts/cleanup.sh +++ b/packer_templates/centos/scripts/cleanup.sh @@ -107,7 +107,7 @@ if [ "$distro" != 'redhat' ]; then fi # remove the install log -rm -f /root/anaconda-ks.cfg +rm -f /root/anaconda-ks.cfg /root/original-ks.cfg # remove the contents of /tmp and /var/tmp rm -rf /tmp/* /var/tmp/* From 814256e3b3295e7af282baa8cc78d70d0b1a4e8a Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Wed, 21 Oct 2020 20:41:35 -0700 Subject: [PATCH 1238/1622] Remove duplicate firmware cleanup on RHEL Signed-off-by: Tim Smith <tsmith@chef.io> --- packer_templates/centos/scripts/cleanup.sh | 28 ---------------------- 1 file changed, 28 deletions(-) diff --git a/packer_templates/centos/scripts/cleanup.sh b/packer_templates/centos/scripts/cleanup.sh index 398d7f479..e5720e3d5 100644 --- a/packer_templates/centos/scripts/cleanup.sh +++ b/packer_templates/centos/scripts/cleanup.sh @@ -74,34 +74,6 @@ fi # truncate any logs that have built up during the install find /var/log -type f -exec truncate --size=0 {} \; -# we try to remove these in the ks file, but they're still there -# in the builds so let's remove them here to be sure :shrug: -# -# 12.2019 note: We can probably remove this now, but let's confirm it -$pkg_cmd remove -y \ - aic94xx-firmware \ - atmel-firmware \ - bfa-firmware \ - ipw2100-firmware \ - ipw2200-firmware \ - ivtv-firmware \ - iwl1000-firmware \ - iwl3945-firmware \ - iwl4965-firmware \ - iwl5000-firmware \ - iwl5150-firmware \ - iwl6000-firmware \ - iwl6050-firmware \ - kernel-uek-firmware \ - libertas-usb8388-firmware \ - netxen-firmware \ - ql2xxx-firmware \ - rt61pci-firmware \ - rt73usb-firmware \ - zd1211-firmware \ - linux-firmware \ - microcode_ctl - if [ "$distro" != 'redhat' ]; then $pkg_cmd -y clean all; fi From f2fce36a41a9bc1c9e35cc2c8247c7e696569521 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Wed, 21 Oct 2020 20:41:53 -0700 Subject: [PATCH 1239/1622] Only perform systemd cleanup on RHEL 7+ Signed-off-by: Tim Smith <tsmith@chef.io> --- packer_templates/centos/scripts/cleanup.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/packer_templates/centos/scripts/cleanup.sh b/packer_templates/centos/scripts/cleanup.sh index e5720e3d5..986a182f5 100644 --- a/packer_templates/centos/scripts/cleanup.sh +++ b/packer_templates/centos/scripts/cleanup.sh @@ -84,14 +84,14 @@ rm -f /root/anaconda-ks.cfg /root/original-ks.cfg # remove the contents of /tmp and /var/tmp rm -rf /tmp/* /var/tmp/* -# Blank netplan machine-id (DUID) so machines get unique ID generated on boot. if [ "$major_version" -ge 7 ]; then + # force a new random seed to be generated + rm -f /var/lib/systemd/random-seed + + # Blank netplan machine-id (DUID) so machines get unique ID generated on boot. truncate -s 0 /etc/machine-id fi # clear the history so our install isn't there export HISTSIZE=0 -rm -f /root/.wget-hsts - -# force a new random seed to be generated -rm -f /var/lib/systemd/random-seed \ No newline at end of file +rm -f /root/.wget-hsts \ No newline at end of file From 84df92ecc200788133b0ab705acb1afd3570faf1 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Wed, 21 Oct 2020 20:42:15 -0700 Subject: [PATCH 1240/1622] Cleanup all anaconda logs on Fedora Signed-off-by: Tim Smith <tsmith@chef.io> --- packer_templates/fedora/scripts/cleanup.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packer_templates/fedora/scripts/cleanup.sh b/packer_templates/fedora/scripts/cleanup.sh index 2c858d11e..77135bbe7 100644 --- a/packer_templates/fedora/scripts/cleanup.sh +++ b/packer_templates/fedora/scripts/cleanup.sh @@ -16,7 +16,7 @@ find /var/log -type f -exec truncate --size=0 {} \; find /etc/sysconfig/network-scripts -name "ifcfg-*" -not -name "ifcfg-lo" -exec rm -f {} \; # remove the install log -rm -f /root/anaconda-ks.cfg +rm -f /root/anaconda-ks.cfg /root/original-ks.cfg # remove the contents of /tmp and /var/tmp rm -rf /tmp/* /var/tmp/* From 4b6113e6031b0bbad3862e81aa86ddcbfe199676 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Wed, 21 Oct 2020 20:42:44 -0700 Subject: [PATCH 1241/1622] Move systemd cleanup in fedora to match the RHEL script Signed-off-by: Tim Smith <tsmith@chef.io> --- packer_templates/fedora/scripts/cleanup.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/packer_templates/fedora/scripts/cleanup.sh b/packer_templates/fedora/scripts/cleanup.sh index 77135bbe7..b2bdfa23e 100644 --- a/packer_templates/fedora/scripts/cleanup.sh +++ b/packer_templates/fedora/scripts/cleanup.sh @@ -21,12 +21,12 @@ rm -f /root/anaconda-ks.cfg /root/original-ks.cfg # remove the contents of /tmp and /var/tmp rm -rf /tmp/* /var/tmp/* +# force a new random seed to be generated +rm -f /var/lib/systemd/random-seed + # Blank netplan machine-id (DUID) so machines get unique ID generated on boot. truncate -s 0 /etc/machine-id # clear the history so our install isn't there export HISTSIZE=0 -rm -f /root/.wget-hsts - -# force a new random seed to be generated -rm -f /var/lib/systemd/random-seed \ No newline at end of file +rm -f /root/.wget-hsts \ No newline at end of file From f16bc2df581d05377b17c40fae6b2afe49d125ff Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Wed, 21 Oct 2020 20:57:37 -0700 Subject: [PATCH 1242/1622] Fail hard if vbox guest additions fail to install Signed-off-by: Tim Smith <tsmith@chef.io> --- packer_templates/_common/virtualbox.sh | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/packer_templates/_common/virtualbox.sh b/packer_templates/_common/virtualbox.sh index 2ff5abd09..692850a99 100644 --- a/packer_templates/_common/virtualbox.sh +++ b/packer_templates/_common/virtualbox.sh @@ -9,9 +9,7 @@ virtualbox-iso|virtualbox-ovf) ISO="VBoxGuestAdditions_$VER.iso"; mkdir -p /tmp/vbox; mount -o loop $HOME_DIR/$ISO /tmp/vbox; - sh /tmp/vbox/VBoxLinuxAdditions.run --nox11 \ - || echo "VBoxLinuxAdditions.run exited $? and is suppressed." \ - "For more read https://www.virtualbox.org/ticket/12479"; + sh /tmp/vbox/VBoxLinuxAdditions.run --nox11 umount /tmp/vbox; rm -rf /tmp/vbox; rm -f $HOME_DIR/*.iso; From 5826b07431e96d0b806abaf5229a9501e6b03671 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Wed, 21 Oct 2020 22:20:00 -0700 Subject: [PATCH 1243/1622] Simplify how we remove firmware packages on RHEL Signed-off-by: Tim Smith <tsmith@chef.io> --- packer_templates/centos/http/6/ks.cfg | 31 +------------ packer_templates/centos/http/7/ks.cfg | 27 +----------- packer_templates/centos/http/8/ks.cfg | 26 +---------- packer_templates/fedora/http/ks-fedora.cfg | 7 ++- .../scientificlinux/http/7/ks.cfg | 44 +------------------ 5 files changed, 11 insertions(+), 124 deletions(-) diff --git a/packer_templates/centos/http/6/ks.cfg b/packer_templates/centos/http/6/ks.cfg index 356d34590..16b1a4503 100644 --- a/packer_templates/centos/http/6/ks.cfg +++ b/packer_templates/centos/http/6/ks.cfg @@ -24,8 +24,6 @@ key --skip # vagrant needs this to copy initial files via scp openssh-clients sudo -kernel-headers -kernel-devel gcc make perl @@ -37,33 +35,8 @@ rsync -intltool # unnecessary firmware --aic94xx-firmware --atmel-firmware --b43-openfwwf --bfa-firmware --ipw2100-firmware --ipw2200-firmware --ivtv-firmware --iwl100-firmware --iwl1000-firmware --iwl3945-firmware --iwl4965-firmware --iwl5000-firmware --iwl5150-firmware --iwl6000-firmware --iwl6000g2a-firmware --iwl6050-firmware --libertas-usb8388-firmware --ql2100-firmware --ql2200-firmware --ql23xx-firmware --ql2400-firmware --ql2500-firmware --rt61pci-firmware --rt73usb-firmware --xorg-x11-drv-ati-firmware --zd1211-firmware --kernel-firmware +-*firmware +-microcode_ctl %post # Force to set SELinux to a permissive mode diff --git a/packer_templates/centos/http/7/ks.cfg b/packer_templates/centos/http/7/ks.cfg index 4596b3e80..815d98358 100644 --- a/packer_templates/centos/http/7/ks.cfg +++ b/packer_templates/centos/http/7/ks.cfg @@ -23,9 +23,6 @@ user --name=vagrant --plaintext --password vagrant # vagrant needs this to copy initial files via scp openssh-clients sudo -kernel-headers -kernel-devel -gcc make perl selinux-policy-devel @@ -40,28 +37,8 @@ rsync -intltool # unnecessary firmware --aic94xx-firmware --alsa-firmware --alsa-tools-firmware --ivtv-firmware --iwl100-firmware --iwl105-firmware --iwl135-firmware --iwl1000-firmware --iwl2000-firmware --iwl2030-firmware --iwl3160-firmware --iwl3945-firmware --iwl4965-firmware --iwl5000-firmware --iwl5150-firmware --iwl6000-firmware --iwl6000g2a-firmware --iwl6000g2b-firmware --iwl6050-firmware --iwl7260-firmware --iwl7265-firmware --linux-firmware +-*firmware +-microcode_ctl %end %post diff --git a/packer_templates/centos/http/8/ks.cfg b/packer_templates/centos/http/8/ks.cfg index f3eadc969..73a171c52 100644 --- a/packer_templates/centos/http/8/ks.cfg +++ b/packer_templates/centos/http/8/ks.cfg @@ -22,9 +22,6 @@ user --name=vagrant --plaintext --password vagrant # vagrant needs this to copy initial files via scp openssh-clients sudo -kernel-headers -kernel-devel -gcc make perl selinux-policy-devel @@ -43,27 +40,8 @@ network-scripts -intltool # unnecessary firmware --aic94xx-firmware --alsa-firmware --alsa-tools-firmware --ivtv-firmware --iwl100-firmware --iwl105-firmware --iwl135-firmware --iwl1000-firmware --iwl2000-firmware --iwl2030-firmware --iwl3160-firmware --iwl3945-firmware --iwl4965-firmware --iwl5000-firmware --iwl5150-firmware --iwl6000-firmware --iwl6000g2a-firmware --iwl6000g2b-firmware --iwl6050-firmware --iwl7260-firmware --iwl7265-firmware +-*firmware +-microcode_ctl %end %post diff --git a/packer_templates/fedora/http/ks-fedora.cfg b/packer_templates/fedora/http/ks-fedora.cfg index 5e1784fe5..f102c4ca6 100644 --- a/packer_templates/fedora/http/ks-fedora.cfg +++ b/packer_templates/fedora/http/ks-fedora.cfg @@ -20,10 +20,6 @@ user --name=vagrant --plaintext --password vagrant %packages --ignoremissing --excludedocs bzip2 -# GCC won't install during kickstart -# gcc -kernel-devel -kernel-headers tar wget nfs-utils @@ -36,6 +32,9 @@ rsync -smartmontools -usbutils -man-pages +# unnecessary firmware +-*firmware +-microcode_ctl %end %post diff --git a/packer_templates/scientificlinux/http/7/ks.cfg b/packer_templates/scientificlinux/http/7/ks.cfg index 1caa16a9c..989750d47 100644 --- a/packer_templates/scientificlinux/http/7/ks.cfg +++ b/packer_templates/scientificlinux/http/7/ks.cfg @@ -23,9 +23,6 @@ user --name=vagrant --plaintext --password vagrant # vagrant needs this to copy initial files via scp openssh-clients sudo -kernel-headers -kernel-devel -gcc make perl selinux-policy-devel @@ -37,45 +34,8 @@ bzip2 -intltool # unnecessary firmware --aic94xx-firmware --atmel-firmware --b43-openfwwf --bfa-firmware --ipw2100-firmware --ipw2200-firmware --ivtv-firmware --iwl100-firmware --iwl105-firmware --iwl135-firmware --iwl1000-firmware --iwl2000-firmware --iwl2030-firmware --iwl3160-firmware --iwl3945-firmware --iwl4965-firmware --iwl5000-firmware --iwl5150-firmware --iwl6000-firmware --iwl6000g2a-firmware --iwl6000g2b-firmware --iwl6050-firmware --iwl7260-firmware --iwl7265-firmware --libertas-usb8388-firmware --libertas-sd8686-firmware --libertas-sd8787-firmware --ql2100-firmware --ql2200-firmware --ql23xx-firmware --ql2400-firmware --ql2500-firmware --rt61pci-firmware --rt73usb-firmware --xorg-x11-drv-ati-firmware --zd1211-firmware --alsa-tools-firmware --alsa-firmware --kernel-firmware +-*firmware +-microcode_ctl %end %post From 443ad12397919a12ef964effdbd65a77cad973fd Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Wed, 21 Oct 2020 22:20:38 -0700 Subject: [PATCH 1244/1622] Simplify how we detect RHEL 7 Signed-off-by: Tim Smith <tsmith@chef.io> --- packer_templates/centos/scripts/cleanup.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packer_templates/centos/scripts/cleanup.sh b/packer_templates/centos/scripts/cleanup.sh index 986a182f5..5753f5d9a 100644 --- a/packer_templates/centos/scripts/cleanup.sh +++ b/packer_templates/centos/scripts/cleanup.sh @@ -40,7 +40,7 @@ for ndev in `ls -1 /etc/sysconfig/network-scripts/ifcfg-*`; do done # new-style network device naming for centos7 -if grep -q -i "release 7" /etc/redhat-release ; then +if [ "$major_version" -eq 7 ]; then # radio off & remove all interface configration nmcli radio all off /bin/systemctl stop NetworkManager.service From 94b5d59d1f2fea11d1a921c096b2bde4d7376abd Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Wed, 21 Oct 2020 22:37:37 -0700 Subject: [PATCH 1245/1622] We handle this in the KS file now Signed-off-by: Tim Smith <tsmith@chef.io> --- packer_templates/fedora/scripts/cleanup.sh | 4 ---- 1 file changed, 4 deletions(-) diff --git a/packer_templates/fedora/scripts/cleanup.sh b/packer_templates/fedora/scripts/cleanup.sh index b2bdfa23e..10874723e 100644 --- a/packer_templates/fedora/scripts/cleanup.sh +++ b/packer_templates/fedora/scripts/cleanup.sh @@ -3,10 +3,6 @@ echo "Removing development packages and cleaning up DNF data" dnf -y remove gcc cpp gc kernel-devel kernel-headers glibc-devel elfutils-libelf-devel glibc-headers kernel-devel kernel-headers dnf -y autoremove -# Avoid 150 meg firmware package we don't need -echo "Removing extra packages" -dnf -y remove linux-firmware - dnf -y clean all --enablerepo=\* # truncate any logs that have built up during the install From 7dfb2a7ad598b841bbc340e8820e2319c61ab9f8 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Wed, 21 Oct 2020 22:37:54 -0700 Subject: [PATCH 1246/1622] Shave 4 seconds off the RHEL boot time Signed-off-by: Tim Smith <tsmith@chef.io> --- packer_templates/centos/scripts/cleanup.sh | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/packer_templates/centos/scripts/cleanup.sh b/packer_templates/centos/scripts/cleanup.sh index 5753f5d9a..8560e30d2 100644 --- a/packer_templates/centos/scripts/cleanup.sh +++ b/packer_templates/centos/scripts/cleanup.sh @@ -5,6 +5,13 @@ distro="`rpm -qf --queryformat '%{NAME}' /etc/redhat-release | cut -f 1 -d '-'`" major_version="`sed 's/^.\+ release \([.0-9]\+\).*/\1/' /etc/redhat-release | awk -F. '{print $1}'`"; + +# reduce the grub menu time to 1 second +if [ "$major_version" -ge 7 ]; then + sed -i -e 's/^GRUB_TIMEOUT=[0-9]\+$/GRUB_TIMEOUT=1/' /etc/default/grub + grub2-mkconfig -o /boot/grub2/grub.cfg +fi + # make sure we use dnf on EL 8+ if [ "$major_version" -ge 8 ]; then pkg_cmd="dnf" From 5b992d72eb4763a39412eed94eb436ad55f3ec66 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Wed, 21 Oct 2020 22:56:54 -0700 Subject: [PATCH 1247/1622] Make sure virtualbox actually installs on RHEL Signed-off-by: Tim Smith <tsmith@chef.io> --- packer_templates/_common/virtualbox.sh | 24 ++++++++++++++++++++++++ packer_templates/ubuntu/http/preseed.cfg | 2 +- 2 files changed, 25 insertions(+), 1 deletion(-) diff --git a/packer_templates/_common/virtualbox.sh b/packer_templates/_common/virtualbox.sh index 692850a99..d4e615807 100644 --- a/packer_templates/_common/virtualbox.sh +++ b/packer_templates/_common/virtualbox.sh @@ -7,11 +7,35 @@ case "$PACKER_BUILDER_TYPE" in virtualbox-iso|virtualbox-ovf) VER="`cat $HOME_DIR/.vbox_version`"; ISO="VBoxGuestAdditions_$VER.iso"; + + # mount the ISO to /tmp/vbox mkdir -p /tmp/vbox; mount -o loop $HOME_DIR/$ISO /tmp/vbox; + + # OS specific packages we need + if [ -f "/bin/dnf" ]; then + dnf install gcc make bzip2 tar kernel-headers kernel-devel -y + elif [ -f "/bin/yum" ]; then + yum install gcc make bzip2 tar kernel-headers kernel-devel -y + elif [ -f "/usr/bin/apt-get" ]; then + apt-get install build-essential bzip2 tar -y + fi + + # install the vbox additions sh /tmp/vbox/VBoxLinuxAdditions.run --nox11 + + # unmount and nuke the ISO umount /tmp/vbox; rm -rf /tmp/vbox; rm -f $HOME_DIR/*.iso; + + # OS specific packages we don't need + if [ -f "/bin/dnf" ]; then + dnf remove gcc cpp kernel-headers kernel-devel -y + elif [ -f "/bin/yum" ]; then + yum remove gcc cpp kernel-headers kernel-devel -y + elif [ -f "/usr/bin/apt-get" ]; then + apt-get remove gcc g++ make libc6-dev -y + fi ;; esac diff --git a/packer_templates/ubuntu/http/preseed.cfg b/packer_templates/ubuntu/http/preseed.cfg index 5287ae089..306bb07dd 100644 --- a/packer_templates/ubuntu/http/preseed.cfg +++ b/packer_templates/ubuntu/http/preseed.cfg @@ -25,7 +25,7 @@ d-i passwd/user-uid string 1000 d-i passwd/user-password password vagrant d-i passwd/user-password-again password vagrant d-i passwd/username string vagrant -d-i pkgsel/include string openssh-server cryptsetup build-essential libssl-dev libreadline-dev zlib1g-dev linux-source dkms nfs-common linux-headers-$(uname -r) perl cifs-utils software-properties-common rsync ifupdown +d-i pkgsel/include string openssh-server cryptsetup libssl-dev libreadline-dev zlib1g-dev linux-source dkms nfs-common linux-headers-$(uname -r) perl cifs-utils software-properties-common rsync ifupdown d-i pkgsel/install-language-support boolean false d-i pkgsel/update-policy select none d-i pkgsel/upgrade select full-upgrade From f8fc7d7cc0d86df41f24d402783bbe9e596bffe8 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Wed, 21 Oct 2020 23:44:46 -0700 Subject: [PATCH 1248/1622] Remove gcc and make from the el6 ks file Signed-off-by: Tim Smith <tsmith@chef.io> --- packer_templates/centos/http/6/ks.cfg | 2 -- 1 file changed, 2 deletions(-) diff --git a/packer_templates/centos/http/6/ks.cfg b/packer_templates/centos/http/6/ks.cfg index 16b1a4503..9669de829 100644 --- a/packer_templates/centos/http/6/ks.cfg +++ b/packer_templates/centos/http/6/ks.cfg @@ -24,8 +24,6 @@ key --skip # vagrant needs this to copy initial files via scp openssh-clients sudo -gcc -make perl wget nfs-utils From de817cda0f75ecac943205babcf2d88f141000fb Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Wed, 21 Oct 2020 23:50:22 -0700 Subject: [PATCH 1249/1622] Avoid cryptsetup-initramfs warnings / failures on Ubuntu Signed-off-by: Tim Smith <tsmith@chef.io> --- packer_templates/_common/virtualbox.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/packer_templates/_common/virtualbox.sh b/packer_templates/_common/virtualbox.sh index d4e615807..13bf54ff2 100644 --- a/packer_templates/_common/virtualbox.sh +++ b/packer_templates/_common/virtualbox.sh @@ -19,6 +19,8 @@ virtualbox-iso|virtualbox-ovf) yum install gcc make bzip2 tar kernel-headers kernel-devel -y elif [ -f "/usr/bin/apt-get" ]; then apt-get install build-essential bzip2 tar -y + # avoid warnings and failures + apt-get remove cryptsetup-initramfs -y fi # install the vbox additions From e39148ad8df1aa46f9d93421bcaa45a0e7ca4d3b Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Thu, 22 Oct 2020 00:22:09 -0700 Subject: [PATCH 1250/1622] Cleanup the machine-id everywhere Signed-off-by: Tim Smith <tsmith@chef.io> --- packer_templates/amazonlinux/scripts/cleanup.sh | 7 +++++-- packer_templates/centos/scripts/cleanup.sh | 4 ++-- packer_templates/debian/scripts/cleanup.sh | 7 +++++-- packer_templates/fedora/scripts/cleanup.sh | 4 ++-- packer_templates/opensuse/scripts/cleanup.sh | 4 ++-- packer_templates/sles/scripts/cleanup.sh | 7 +++++-- packer_templates/ubuntu/scripts/cleanup.sh | 4 ++-- 7 files changed, 23 insertions(+), 14 deletions(-) diff --git a/packer_templates/amazonlinux/scripts/cleanup.sh b/packer_templates/amazonlinux/scripts/cleanup.sh index 3b6deadfd..86069ccb8 100644 --- a/packer_templates/amazonlinux/scripts/cleanup.sh +++ b/packer_templates/amazonlinux/scripts/cleanup.sh @@ -61,6 +61,9 @@ package-cleanup --oldkernels --count=1 -y # remove the contents of /tmp and /var/tmp rm -rf /tmp/* /var/tmp/* +# force a new random seed to be generated +rm -f /var/lib/systemd/random-seed + # clear the history so our install isn't there -export HISTSIZE=0 -rm -f /root/.wget-hsts \ No newline at end of file +rm -f /root/.wget-hsts +export HISTSIZE=0 \ No newline at end of file diff --git a/packer_templates/centos/scripts/cleanup.sh b/packer_templates/centos/scripts/cleanup.sh index 8560e30d2..8532d9684 100644 --- a/packer_templates/centos/scripts/cleanup.sh +++ b/packer_templates/centos/scripts/cleanup.sh @@ -100,5 +100,5 @@ if [ "$major_version" -ge 7 ]; then fi # clear the history so our install isn't there -export HISTSIZE=0 -rm -f /root/.wget-hsts \ No newline at end of file +rm -f /root/.wget-hsts +export HISTSIZE=0 \ No newline at end of file diff --git a/packer_templates/debian/scripts/cleanup.sh b/packer_templates/debian/scripts/cleanup.sh index da4f05bfa..b37ef0c08 100644 --- a/packer_templates/debian/scripts/cleanup.sh +++ b/packer_templates/debian/scripts/cleanup.sh @@ -46,6 +46,9 @@ find /var/log -type f -exec truncate --size=0 {} \; # Blank netplan machine-id (DUID) so machines get unique ID generated on boot. truncate -s 0 /etc/machine-id +# force a new random seed to be generated +rm -f /var/lib/systemd/random-seed + # clear the history so our install isn't there -export HISTSIZE=0 -rm -f /root/.wget-hsts \ No newline at end of file +rm -f /root/.wget-hsts +export HISTSIZE=0 \ No newline at end of file diff --git a/packer_templates/fedora/scripts/cleanup.sh b/packer_templates/fedora/scripts/cleanup.sh index 10874723e..8dd4d822f 100644 --- a/packer_templates/fedora/scripts/cleanup.sh +++ b/packer_templates/fedora/scripts/cleanup.sh @@ -24,5 +24,5 @@ rm -f /var/lib/systemd/random-seed truncate -s 0 /etc/machine-id # clear the history so our install isn't there -export HISTSIZE=0 -rm -f /root/.wget-hsts \ No newline at end of file +rm -f /root/.wget-hsts +export HISTSIZE=0 \ No newline at end of file diff --git a/packer_templates/opensuse/scripts/cleanup.sh b/packer_templates/opensuse/scripts/cleanup.sh index 3a9a0466d..7175f9db8 100644 --- a/packer_templates/opensuse/scripts/cleanup.sh +++ b/packer_templates/opensuse/scripts/cleanup.sh @@ -24,5 +24,5 @@ rm -rf /tmp/* /var/tmp/* truncate -s 0 /etc/machine-id # clear the history so our install isn't there -export HISTSIZE=0 -rm -f /root/.wget-hsts \ No newline at end of file +rm -f /root/.wget-hsts +export HISTSIZE=0 \ No newline at end of file diff --git a/packer_templates/sles/scripts/cleanup.sh b/packer_templates/sles/scripts/cleanup.sh index e1d150ab0..e80d41656 100644 --- a/packer_templates/sles/scripts/cleanup.sh +++ b/packer_templates/sles/scripts/cleanup.sh @@ -13,6 +13,9 @@ find /var/log -type f -exec truncate --size=0 {} \; # remove the contents of /tmp and /var/tmp rm -rf /tmp/* /var/tmp/* +# force a new random seed to be generated +rm -f /var/lib/systemd/random-seed + # clear the history so our install isn't there -export HISTSIZE=0 -rm -f /root/.wget-hsts \ No newline at end of file +rm -f /root/.wget-hsts +export HISTSIZE=0 \ No newline at end of file diff --git a/packer_templates/ubuntu/scripts/cleanup.sh b/packer_templates/ubuntu/scripts/cleanup.sh index 74fccd02f..41a3915d4 100644 --- a/packer_templates/ubuntu/scripts/cleanup.sh +++ b/packer_templates/ubuntu/scripts/cleanup.sh @@ -77,5 +77,5 @@ truncate -s 0 /etc/machine-id rm -rf /tmp/* /var/tmp/* # clear the history so our install isn't there -export HISTSIZE=0 -rm -f /root/.wget-hsts \ No newline at end of file +rm -f /root/.wget-hsts +export HISTSIZE=0 \ No newline at end of file From fc86815d91273561430d2412bcca10e9b296a56d Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Thu, 22 Oct 2020 11:18:37 -0700 Subject: [PATCH 1251/1622] Use open-vm-tools on Fedora This is much easier / more reliable to install and setup Signed-off-by: Tim Smith <tsmith@chef.io> --- packer_templates/fedora/fedora-31-x86_64.json | 3 +-- packer_templates/fedora/fedora-32-x86_64.json | 3 +-- .../fedora/scripts/{open-vm-tools.sh => vmware.sh} | 0 3 files changed, 2 insertions(+), 4 deletions(-) rename packer_templates/fedora/scripts/{open-vm-tools.sh => vmware.sh} (100%) diff --git a/packer_templates/fedora/fedora-31-x86_64.json b/packer_templates/fedora/fedora-31-x86_64.json index fb7b79e99..f8da5e1bc 100644 --- a/packer_templates/fedora/fedora-31-x86_64.json +++ b/packer_templates/fedora/fedora-31-x86_64.json @@ -152,7 +152,7 @@ "{{template_dir}}/../_common/motd.sh", "{{template_dir}}/../_common/sshd.sh", "{{template_dir}}/../_common/virtualbox.sh", - "{{template_dir}}/../_common/vmware.sh", + "{{template_dir}}/scripts/vmware.sh", "{{template_dir}}/../_common/parallels.sh", "{{template_dir}}/../_common/vagrant.sh", "{{template_dir}}/scripts/cleanup.sh", @@ -186,4 +186,3 @@ "version": "TIMESTAMP" } } - diff --git a/packer_templates/fedora/fedora-32-x86_64.json b/packer_templates/fedora/fedora-32-x86_64.json index 7bd023db2..2b69a1eb8 100644 --- a/packer_templates/fedora/fedora-32-x86_64.json +++ b/packer_templates/fedora/fedora-32-x86_64.json @@ -152,7 +152,7 @@ "{{template_dir}}/../_common/motd.sh", "{{template_dir}}/../_common/sshd.sh", "{{template_dir}}/../_common/virtualbox.sh", - "{{template_dir}}/../_common/vmware.sh", + "{{template_dir}}/scripts/vmware.sh", "{{template_dir}}/../_common/parallels.sh", "{{template_dir}}/../_common/vagrant.sh", "{{template_dir}}/scripts/cleanup.sh", @@ -186,4 +186,3 @@ "version": "TIMESTAMP" } } - diff --git a/packer_templates/fedora/scripts/open-vm-tools.sh b/packer_templates/fedora/scripts/vmware.sh similarity index 100% rename from packer_templates/fedora/scripts/open-vm-tools.sh rename to packer_templates/fedora/scripts/vmware.sh From 0d1acf8b69be30dec52142f13e8247008d519b0b Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Thu, 22 Oct 2020 11:18:57 -0700 Subject: [PATCH 1252/1622] Cleanup vbox install files Signed-off-by: Tim Smith <tsmith@chef.io> --- packer_templates/_common/virtualbox.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/packer_templates/_common/virtualbox.sh b/packer_templates/_common/virtualbox.sh index 13bf54ff2..6377d2ce6 100644 --- a/packer_templates/_common/virtualbox.sh +++ b/packer_templates/_common/virtualbox.sh @@ -39,5 +39,8 @@ virtualbox-iso|virtualbox-ovf) elif [ -f "/usr/bin/apt-get" ]; then apt-get remove gcc g++ make libc6-dev -y fi + + # cleanup leftover logs + rm -rf /var/log/vboxadd* ;; esac From 0f1d08d200b99380a07ef30cc63882c49b64216f Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Thu, 22 Oct 2020 11:26:56 -0700 Subject: [PATCH 1253/1622] Speed up Fedora installs by skipping the CDROM check Signed-off-by: Tim Smith <tsmith@chef.io> --- packer_templates/fedora/fedora-31-x86_64.json | 10 +++++----- packer_templates/fedora/fedora-32-x86_64.json | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/packer_templates/fedora/fedora-31-x86_64.json b/packer_templates/fedora/fedora-31-x86_64.json index f8da5e1bc..b1ec8e2ca 100644 --- a/packer_templates/fedora/fedora-31-x86_64.json +++ b/packer_templates/fedora/fedora-31-x86_64.json @@ -3,7 +3,7 @@ { "accelerator": "kvm", "boot_command": [ - "<tab> linux ks=http://{{.HTTPIP}}:{{.HTTPPort}}/{{user `ks_path`}}<enter><wait>" + "<up><wait><tab> linux ks=http://{{.HTTPIP}}:{{.HTTPPort}}/{{user `ks_path`}}<enter><wait>" ], "boot_wait": "10s", "cpus": "{{ user `cpus` }}", @@ -31,7 +31,7 @@ }, { "boot_command": [ - "<tab> linux ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" + "<up><wait><tab> linux ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], "boot_wait": "10s", "cpus": "{{ user `cpus` }}", @@ -57,7 +57,7 @@ }, { "boot_command": [ - "<tab> linux ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" + "<up><wait><tab> linux ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], "boot_wait": "10s", "cpus": "{{ user `cpus` }}", @@ -85,7 +85,7 @@ }, { "boot_command": [ - "<tab> linux ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" + "<up><wait><tab> linux ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], "boot_wait": "10s", "cpus": "{{ user `cpus` }}", @@ -108,7 +108,7 @@ }, { "boot_command": [ - "<tab> linux ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" + "<up><wait><tab> linux ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], "boot_wait": "10s", "cpus": "{{ user `cpus` }}", diff --git a/packer_templates/fedora/fedora-32-x86_64.json b/packer_templates/fedora/fedora-32-x86_64.json index 2b69a1eb8..c13f75a9d 100644 --- a/packer_templates/fedora/fedora-32-x86_64.json +++ b/packer_templates/fedora/fedora-32-x86_64.json @@ -3,7 +3,7 @@ { "accelerator": "kvm", "boot_command": [ - "<tab> linux ks=http://{{.HTTPIP}}:{{.HTTPPort}}/{{user `ks_path`}}<enter><wait>" + "<up><wait><tab> linux ks=http://{{.HTTPIP}}:{{.HTTPPort}}/{{user `ks_path`}}<enter><wait>" ], "boot_wait": "10s", "cpus": "{{ user `cpus` }}", @@ -31,7 +31,7 @@ }, { "boot_command": [ - "<tab> linux ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" + "<up><wait><tab> linux ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], "boot_wait": "10s", "cpus": "{{ user `cpus` }}", @@ -57,7 +57,7 @@ }, { "boot_command": [ - "<tab> linux ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" + "<up><wait><tab> linux ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], "boot_wait": "10s", "cpus": "{{ user `cpus` }}", @@ -85,7 +85,7 @@ }, { "boot_command": [ - "<tab> linux ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" + "<up><wait><tab> linux ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], "boot_wait": "10s", "cpus": "{{ user `cpus` }}", @@ -108,7 +108,7 @@ }, { "boot_command": [ - "<tab> linux ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" + "<up><wait><tab> linux ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], "boot_wait": "10s", "cpus": "{{ user `cpus` }}", From 40b2362e8e778a2d98dd2899640b91247c44ad7e Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Thu, 22 Oct 2020 11:27:19 -0700 Subject: [PATCH 1254/1622] Add a 1 second bootloader wait on Fedora vs. 5 seconds Signed-off-by: Tim Smith <tsmith@chef.io> --- packer_templates/fedora/http/ks-fedora.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packer_templates/fedora/http/ks-fedora.cfg b/packer_templates/fedora/http/ks-fedora.cfg index f102c4ca6..977ae7c70 100644 --- a/packer_templates/fedora/http/ks-fedora.cfg +++ b/packer_templates/fedora/http/ks-fedora.cfg @@ -8,7 +8,7 @@ firewall --disabled authconfig --enableshadow --passalgo=sha512 selinux --permissive timezone UTC -bootloader --location=mbr +bootloader --timeout=1 --location=mbr text skipx zerombr From 4377725b33264f2ef3936a349c8580ac962450d9 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Thu, 22 Oct 2020 11:27:46 -0700 Subject: [PATCH 1255/1622] Don't create the swap partition on Fedora We already create a swap file here Signed-off-by: Tim Smith <tsmith@chef.io> --- packer_templates/fedora/http/ks-fedora.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packer_templates/fedora/http/ks-fedora.cfg b/packer_templates/fedora/http/ks-fedora.cfg index 977ae7c70..965d4bed5 100644 --- a/packer_templates/fedora/http/ks-fedora.cfg +++ b/packer_templates/fedora/http/ks-fedora.cfg @@ -13,7 +13,7 @@ text skipx zerombr clearpart --all --initlabel -autopart --nohome --nolvm --noboot --fstype=ext4 +autopart --nohome --nolvm --noboot --noswap --fstype=ext4 firstboot --disabled reboot --eject user --name=vagrant --plaintext --password vagrant From 7d6fc21855d45a9876502bb55acf25c6fac79b4b Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Thu, 22 Oct 2020 11:31:53 -0700 Subject: [PATCH 1256/1622] Go back to cleanup.sh firmware cleanup on Fedora This is the only firmware package left and it can't be excluded in the ks file Signed-off-by: Tim Smith <tsmith@chef.io> --- packer_templates/fedora/http/ks-fedora.cfg | 1 - packer_templates/fedora/scripts/cleanup.sh | 5 +++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/packer_templates/fedora/http/ks-fedora.cfg b/packer_templates/fedora/http/ks-fedora.cfg index 965d4bed5..74c94cc7b 100644 --- a/packer_templates/fedora/http/ks-fedora.cfg +++ b/packer_templates/fedora/http/ks-fedora.cfg @@ -33,7 +33,6 @@ rsync -usbutils -man-pages # unnecessary firmware --*firmware -microcode_ctl %end diff --git a/packer_templates/fedora/scripts/cleanup.sh b/packer_templates/fedora/scripts/cleanup.sh index 8dd4d822f..a6b9bd8f9 100644 --- a/packer_templates/fedora/scripts/cleanup.sh +++ b/packer_templates/fedora/scripts/cleanup.sh @@ -3,6 +3,11 @@ echo "Removing development packages and cleaning up DNF data" dnf -y remove gcc cpp gc kernel-devel kernel-headers glibc-devel elfutils-libelf-devel glibc-headers kernel-devel kernel-headers dnf -y autoremove +# Avoid ~200 meg firmware package we don't need +# this cannot be done in the KS file so we do it here +echo "Removing extra packages" +dnf -y remove linux-firmware + dnf -y clean all --enablerepo=\* # truncate any logs that have built up during the install From 5656438eb7dfad1e74cb70fdb45e361b13e40cb9 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Thu, 22 Oct 2020 13:15:30 -0700 Subject: [PATCH 1257/1622] Update the description generation logic to report all hypervisors in the metadata Signed-off-by: Tim Smith <tsmith@chef.io> --- lib/bento/buildmetadata.rb | 2 +- lib/bento/cli.rb | 4 ++-- lib/bento/common.rb | 10 +++++----- lib/bento/providermetadata.rb | 2 +- lib/bento/test.rb | 4 ++-- lib/bento/upload.rb | 13 +++++++++---- 6 files changed, 20 insertions(+), 15 deletions(-) diff --git a/lib/bento/buildmetadata.rb b/lib/bento/buildmetadata.rb index abbf91eb0..27b15a4da 100644 --- a/lib/bento/buildmetadata.rb +++ b/lib/bento/buildmetadata.rb @@ -1,5 +1,5 @@ require "bento/common" -require "mixlib/shellout" +require "mixlib/shellout" unless defined?(Mixlib::ShellOut) class BuildMetadata include Common diff --git a/lib/bento/cli.rb b/lib/bento/cli.rb index f737c2119..38ff57b32 100644 --- a/lib/bento/cli.rb +++ b/lib/bento/cli.rb @@ -1,5 +1,5 @@ -require "optparse" -require "ostruct" +require "optparse" unless defined?(OptionParser) +require "ostruct" unless defined?(OpenStruct) require "bento/common" require "bento/runner" diff --git a/lib/bento/common.rb b/lib/bento/common.rb index 3f6a97e97..21b96a52f 100644 --- a/lib/bento/common.rb +++ b/lib/bento/common.rb @@ -1,9 +1,9 @@ -require "benchmark" -require "fileutils" -require "json" -require "tempfile" +require "benchmark" unless defined?(Benchmark) +require "fileutils" unless defined?(FileUtils) +require "json" unless defined?(JSON) +require "tempfile" unless defined?(Tempfile) require "yaml" -require "mixlib/shellout" +require "mixlib/shellout" unless defined?(Mixlib::ShellOut) MEGABYTE = 1024.0 * 1024.0 diff --git a/lib/bento/providermetadata.rb b/lib/bento/providermetadata.rb index 6147dfd09..1cabd59b0 100644 --- a/lib/bento/providermetadata.rb +++ b/lib/bento/providermetadata.rb @@ -1,4 +1,4 @@ -require "digest" +require "digest" unless defined?(Digest) require "bento/common" class ProviderMetadata diff --git a/lib/bento/test.rb b/lib/bento/test.rb index 666705be0..9d2d5fecd 100644 --- a/lib/bento/test.rb +++ b/lib/bento/test.rb @@ -1,6 +1,6 @@ require "bento/common" -require "mixlib/shellout" -require "erb" +require "mixlib/shellout" unless defined?(Mixlib::ShellOut) +require "erb" unless defined?(Erb) class TestRunner include Common diff --git a/lib/bento/upload.rb b/lib/bento/upload.rb index 46800acc8..a7a41eade 100644 --- a/lib/bento/upload.rb +++ b/lib/bento/upload.rb @@ -39,13 +39,13 @@ def upload_box(md_file) if File.exist?(File.join("builds", prov_data["file"])) banner("Uploading bento/#{md_data["name"]} version:#{md_data["version"]} provider:#{prov}...") - upload_cmd = "vagrant cloud publish bento/#{md_data["name"]} #{md_data["version"]} #{prov} builds/#{prov_data["file"]} --description '#{box_desc(md_data["name"])}' --short-description '#{box_desc(md_data["name"])}' --version-description '#{ver_desc(md_data, prov)}' --force --release" + upload_cmd = "vagrant cloud publish bento/#{md_data["name"]} #{md_data["version"]} #{prov} builds/#{prov_data["file"]} --description '#{box_desc(md_data["name"])}' --short-description '#{box_desc(md_data["name"])}' --version-description '#{ver_desc(md_data)}' --force --release" shellout(upload_cmd) slug_name = lookup_slug(md_data["name"]) if slug_name banner("Uploading slug bento/#{slug_name} from #{md_data["name"]} version:#{md_data["version"]} provider:#{prov}...") - upload_cmd = "vagrant cloud publish bento/#{slug_name} #{md_data["version"]} #{prov} builds/#{prov_data["file"]} --description '#{slug_desc(slug_name)}' --short-description '#{slug_desc(slug_name)}' --version-description '#{ver_desc(md_data, prov)}' --force --release" + upload_cmd = "vagrant cloud publish bento/#{slug_name} #{md_data["version"]} #{prov} builds/#{prov_data["file"]} --description '#{slug_desc(slug_name)}' --short-description '#{slug_desc(slug_name)}' --version-description '#{ver_desc(md_data)}' --force --release" shellout(upload_cmd) end @@ -81,7 +81,12 @@ def slug_desc(name) "#{name.tr("-", " ").capitalize}.x Vagrant box created with Bento by Chef. This box will be updated with the latest releases of #{name.tr("-", " ").capitalize} as they become available" end - def ver_desc(md_data, provider) - "#{md_data["name"].tr("-", " ").capitalize} Vagrant box version #{md_data["version"]} created with Bento by Chef. Tool versions: #{provider}: #{md_data["providers"][provider]["version"]}, packer: #{md_data["packer"]}" + def ver_desc(md_data) + tool_versions = [] + md_data["providers"].each_key { |hv| tool_versions << "#{hv}: #{md_data["providers"][hv]["version"]}" } + tool_versions.sort! + tool_versions << "packer: #{md_data["packer"]}" + + "#{md_data["name"].tr("-", " ").capitalize} Vagrant box version #{md_data["version"]} created with Bento by Chef. Tool versions: #{tool_versions.join(", ")}" end end From 5b73908189f1906456edf5c6c89218c50bf5b0b8 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Thu, 22 Oct 2020 13:16:38 -0700 Subject: [PATCH 1258/1622] Don't use tmpfs based /tmp on Fedora This is limited to 1/2 the size of the RAM and that is not enough for Test Kitchen to do proper testing if remote file is used and files need to be cached. Signed-off-by: Tim Smith <tsmith@chef.io> --- packer_templates/fedora/fedora-31-x86_64.json | 1 + packer_templates/fedora/fedora-32-x86_64.json | 1 + packer_templates/fedora/scripts/real-tmp.sh | 4 ++++ 3 files changed, 6 insertions(+) create mode 100644 packer_templates/fedora/scripts/real-tmp.sh diff --git a/packer_templates/fedora/fedora-31-x86_64.json b/packer_templates/fedora/fedora-31-x86_64.json index b1ec8e2ca..1ac88edad 100644 --- a/packer_templates/fedora/fedora-31-x86_64.json +++ b/packer_templates/fedora/fedora-31-x86_64.json @@ -155,6 +155,7 @@ "{{template_dir}}/scripts/vmware.sh", "{{template_dir}}/../_common/parallels.sh", "{{template_dir}}/../_common/vagrant.sh", + "{{template_dir}}/scripts/real-tmp.sh", "{{template_dir}}/scripts/cleanup.sh", "{{template_dir}}/../_common/minimize.sh" ], diff --git a/packer_templates/fedora/fedora-32-x86_64.json b/packer_templates/fedora/fedora-32-x86_64.json index c13f75a9d..6743eef06 100644 --- a/packer_templates/fedora/fedora-32-x86_64.json +++ b/packer_templates/fedora/fedora-32-x86_64.json @@ -155,6 +155,7 @@ "{{template_dir}}/scripts/vmware.sh", "{{template_dir}}/../_common/parallels.sh", "{{template_dir}}/../_common/vagrant.sh", + "{{template_dir}}/scripts/real-tmp.sh", "{{template_dir}}/scripts/cleanup.sh", "{{template_dir}}/../_common/minimize.sh" ], diff --git a/packer_templates/fedora/scripts/real-tmp.sh b/packer_templates/fedora/scripts/real-tmp.sh new file mode 100644 index 000000000..6f781bfd6 --- /dev/null +++ b/packer_templates/fedora/scripts/real-tmp.sh @@ -0,0 +1,4 @@ +#!/bin/bash -eux +echo "Don't use the tmpfs based /tmp dir that is limited to 50% of RAM" +systemctl mask tmp.mount +umount /tmp | true \ No newline at end of file From 8bf47180819755422fd35165c48ea7134b9527e0 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Thu, 22 Oct 2020 13:18:33 -0700 Subject: [PATCH 1259/1622] Update the description field for vagrant cloud Signed-off-by: Tim Smith <tsmith@chef.io> --- lib/bento/upload.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/bento/upload.rb b/lib/bento/upload.rb index a7a41eade..54bfe43d2 100644 --- a/lib/bento/upload.rb +++ b/lib/bento/upload.rb @@ -87,6 +87,6 @@ def ver_desc(md_data) tool_versions.sort! tool_versions << "packer: #{md_data["packer"]}" - "#{md_data["name"].tr("-", " ").capitalize} Vagrant box version #{md_data["version"]} created with Bento by Chef. Tool versions: #{tool_versions.join(", ")}" + "#{md_data["name"].tr("-", " ").capitalize} Vagrant box version #{md_data["version"]} created with Bento by Chef. Built with: #{tool_versions.join(", ")}" end end From f6fea2ad7eebdf0306f40458945aa5f7da29777a Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Thu, 22 Oct 2020 15:14:51 -0700 Subject: [PATCH 1260/1622] Remove deprecated auth from RHEL 8 kickstart file This was removed from rhel 8 and shadowing is enabled by default so we can skip it entirely Signed-off-by: Tim Smith <tsmith@chef.io> --- packer_templates/centos/http/8/ks.cfg | 1 - 1 file changed, 1 deletion(-) diff --git a/packer_templates/centos/http/8/ks.cfg b/packer_templates/centos/http/8/ks.cfg index 73a171c52..cee33739d 100644 --- a/packer_templates/centos/http/8/ks.cfg +++ b/packer_templates/centos/http/8/ks.cfg @@ -13,7 +13,6 @@ skipx zerombr clearpart --all --initlabel autopart -auth --enableshadow --passalgo=sha512 --kickstart firstboot --disabled reboot --eject user --name=vagrant --plaintext --password vagrant From 8d366866744b1429479999cc85ec33bd95a79aef Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Thu, 22 Oct 2020 15:21:53 -0700 Subject: [PATCH 1261/1622] Disable ipv6 on RHEL 8 to match our Fedora setup Signed-off-by: Tim Smith <tsmith@chef.io> --- packer_templates/centos/http/8/ks.cfg | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packer_templates/centos/http/8/ks.cfg b/packer_templates/centos/http/8/ks.cfg index cee33739d..3c26d3c8a 100644 --- a/packer_templates/centos/http/8/ks.cfg +++ b/packer_templates/centos/http/8/ks.cfg @@ -2,8 +2,8 @@ install cdrom lang en_US.UTF-8 keyboard us -network --bootproto=dhcp --onboot=on --device=eth0 -rootpw vagrant +network --bootproto=dhcp --noipv6 --onboot=on --device=eth0 +rootpw --plaintext vagrant firewall --disabled selinux --permissive timezone UTC From 2e99c8cc5a795c608e69a4b28a77cfe1e7f412ed Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Thu, 22 Oct 2020 15:22:12 -0700 Subject: [PATCH 1262/1622] Add 1 second bootloader delay on RHEL 8 Signed-off-by: Tim Smith <tsmith@chef.io> --- packer_templates/centos/http/8/ks.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packer_templates/centos/http/8/ks.cfg b/packer_templates/centos/http/8/ks.cfg index 3c26d3c8a..c1283af6a 100644 --- a/packer_templates/centos/http/8/ks.cfg +++ b/packer_templates/centos/http/8/ks.cfg @@ -7,7 +7,7 @@ rootpw --plaintext vagrant firewall --disabled selinux --permissive timezone UTC -bootloader --location=mbr --append="net.ifnames=0 biosdevname=0" +bootloader --timeout=1 --location=mbr --append="net.ifnames=0 biosdevname=0" text skipx zerombr From cf1b4a81790f8a17b00520436a6fcfaefd00178a Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Thu, 22 Oct 2020 15:26:39 -0700 Subject: [PATCH 1263/1622] Use a flat partition table w/o LVM /boot or /home This gives the user more space to actually use in the vagrant image Signed-off-by: Tim Smith <tsmith@chef.io> --- packer_templates/centos/http/8/ks.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packer_templates/centos/http/8/ks.cfg b/packer_templates/centos/http/8/ks.cfg index c1283af6a..504b632c7 100644 --- a/packer_templates/centos/http/8/ks.cfg +++ b/packer_templates/centos/http/8/ks.cfg @@ -12,7 +12,7 @@ text skipx zerombr clearpart --all --initlabel -autopart +autopart --nohome --nolvm --noboot firstboot --disabled reboot --eject user --name=vagrant --plaintext --password vagrant From 1601574b99c1444583d779cd8347d727e6042e9a Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Thu, 22 Oct 2020 15:27:32 -0700 Subject: [PATCH 1264/1622] Move firmware cleanup back to cleanup.sh for RHEL Also improve the logging Signed-off-by: Tim Smith <tsmith@chef.io> --- packer_templates/centos/http/8/ks.cfg | 9 +++-- packer_templates/centos/scripts/cleanup.sh | 40 +++++++++++++--------- 2 files changed, 28 insertions(+), 21 deletions(-) diff --git a/packer_templates/centos/http/8/ks.cfg b/packer_templates/centos/http/8/ks.cfg index 504b632c7..b1f59a7af 100644 --- a/packer_templates/centos/http/8/ks.cfg +++ b/packer_templates/centos/http/8/ks.cfg @@ -37,16 +37,15 @@ elfutils-libelf-devel network-scripts -fprintd-pam -intltool - -# unnecessary firmware --*firmware +-iwl*-firmware -microcode_ctl %end %post # sudo -echo "%vagrant ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers.d/vagrant -chmod 0440 /etc/sudoers.d/vagrant +echo 'Defaults:vagrant !requiretty' > /etc/sudoers.d/vagrant +echo '%vagrant ALL=(ALL) NOPASSWD: ALL' >> /etc/sudoers.d/vagrant +chmod 440 /etc/sudoers.d/vagrant # Enable hyper-v daemons only if using hyper-v virtualization if [ $(virt-what) == "hyperv" ]; then diff --git a/packer_templates/centos/scripts/cleanup.sh b/packer_templates/centos/scripts/cleanup.sh index 8532d9684..eebcd2b2c 100644 --- a/packer_templates/centos/scripts/cleanup.sh +++ b/packer_templates/centos/scripts/cleanup.sh @@ -19,19 +19,31 @@ else pkg_cmd="yum" fi -# remove previous kernels that yum/dnf preserved for rollback + +echo "Remove development and kernel source packages" +$pkg_cmd -y remove gcc cpp gc kernel-devel kernel-headers glibc-devel elfutils-libelf-devel glibc-headers kernel-devel kernel-headers + if [ "$major_version" -ge 8 ]; then - dnf autoremove -y - dnf remove -y $(dnf repoquery --installonly --latest-limit=-1 -q) + echo "remove orphaned packages" + dnf -y autoremove + echo "Remove previous kernels that preserved for rollbacks" + dnf -y remove -y $(dnf repoquery --installonly --latest-limit=-1 -q) else if ! command -v package-cleanup >/dev/null 2>&1; then - yum install -y yum-utils + yum -y install yum-utils fi package-cleanup --oldkernels --count=1 -y fi -# Remove development and kernel source packages -$pkg_cmd -y remove gcc cpp kernel-devel kernel-headers; +# Avoid ~200 meg firmware package we don't need +# this cannot be done in the KS file so we do it here +echo "Removing extra firmware packages" +$pkg_cmd -y remove linux-firmware + +if [ "$distro" != 'redhat' ]; then + echo "clean all package cache information" + $pkg_cmd -y clean all --enablerepo=\*; +fi # Clean up network interface persistence rm -f /etc/udev/rules.d/70-persistent-net.rules; @@ -78,27 +90,23 @@ _EOF_ chmod +x /etc/rc.d/rc.local fi -# truncate any logs that have built up during the install +echo "truncate any logs that have built up during the install" find /var/log -type f -exec truncate --size=0 {} \; -if [ "$distro" != 'redhat' ]; then - $pkg_cmd -y clean all; -fi - -# remove the install log +echo "remove the install log" rm -f /root/anaconda-ks.cfg /root/original-ks.cfg -# remove the contents of /tmp and /var/tmp +echo "remove the contents of /tmp and /var/tmp" rm -rf /tmp/* /var/tmp/* if [ "$major_version" -ge 7 ]; then - # force a new random seed to be generated + echo "Force a new random seed to be generated" rm -f /var/lib/systemd/random-seed - # Blank netplan machine-id (DUID) so machines get unique ID generated on boot. + echo "Wipe netplan machine-id (DUID) so machines get unique ID generated on boot" truncate -s 0 /etc/machine-id fi -# clear the history so our install isn't there +echo "Clear the history so our install commands aren't there" rm -f /root/.wget-hsts export HISTSIZE=0 \ No newline at end of file From 74507944221c07172163d1b6320b9bd8ae5490dd Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Thu, 22 Oct 2020 15:27:55 -0700 Subject: [PATCH 1265/1622] Remove authconfig for Fedora as well This is deprecated Signed-off-by: Tim Smith <tsmith@chef.io> --- packer_templates/fedora/http/ks-fedora.cfg | 1 - 1 file changed, 1 deletion(-) diff --git a/packer_templates/fedora/http/ks-fedora.cfg b/packer_templates/fedora/http/ks-fedora.cfg index 74c94cc7b..956a1eaa7 100644 --- a/packer_templates/fedora/http/ks-fedora.cfg +++ b/packer_templates/fedora/http/ks-fedora.cfg @@ -5,7 +5,6 @@ keyboard us network --bootproto=dhcp --noipv6 rootpw --plaintext vagrant firewall --disabled -authconfig --enableshadow --passalgo=sha512 selinux --permissive timezone UTC bootloader --timeout=1 --location=mbr From 98a240ffb82af6579ff3bfd6af16ce2a368022f7 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Thu, 22 Oct 2020 15:47:13 -0700 Subject: [PATCH 1266/1622] Switch back to a swap partition in Fedora Signed-off-by: Tim Smith <tsmith@chef.io> --- packer_templates/fedora/fedora-31-x86_64.json | 1 - packer_templates/fedora/fedora-32-x86_64.json | 1 - packer_templates/fedora/http/ks-fedora.cfg | 3 +-- 3 files changed, 1 insertion(+), 4 deletions(-) diff --git a/packer_templates/fedora/fedora-31-x86_64.json b/packer_templates/fedora/fedora-31-x86_64.json index 1ac88edad..efd1bf1bf 100644 --- a/packer_templates/fedora/fedora-31-x86_64.json +++ b/packer_templates/fedora/fedora-31-x86_64.json @@ -145,7 +145,6 @@ "execute_command": "echo 'vagrant' | {{.Vars}} sudo -E -S bash '{{.Path}}'", "expect_disconnect": true, "scripts": [ - "{{template_dir}}/scripts/swap.sh", "{{template_dir}}/scripts/fix-slow-dns.sh", "{{template_dir}}/scripts/build-tools.sh", "{{template_dir}}/scripts/install-supporting-packages.sh", diff --git a/packer_templates/fedora/fedora-32-x86_64.json b/packer_templates/fedora/fedora-32-x86_64.json index 6743eef06..892d0191c 100644 --- a/packer_templates/fedora/fedora-32-x86_64.json +++ b/packer_templates/fedora/fedora-32-x86_64.json @@ -145,7 +145,6 @@ "execute_command": "echo 'vagrant' | {{.Vars}} sudo -E -S bash '{{.Path}}'", "expect_disconnect": true, "scripts": [ - "{{template_dir}}/scripts/swap.sh", "{{template_dir}}/scripts/fix-slow-dns.sh", "{{template_dir}}/scripts/build-tools.sh", "{{template_dir}}/scripts/install-supporting-packages.sh", diff --git a/packer_templates/fedora/http/ks-fedora.cfg b/packer_templates/fedora/http/ks-fedora.cfg index 956a1eaa7..32e044ba3 100644 --- a/packer_templates/fedora/http/ks-fedora.cfg +++ b/packer_templates/fedora/http/ks-fedora.cfg @@ -12,7 +12,7 @@ text skipx zerombr clearpart --all --initlabel -autopart --nohome --nolvm --noboot --noswap --fstype=ext4 +autopart --nohome --nolvm --noboot firstboot --disabled reboot --eject user --name=vagrant --plaintext --password vagrant @@ -31,7 +31,6 @@ rsync -smartmontools -usbutils -man-pages -# unnecessary firmware -microcode_ctl %end From 4ac398ad623aa2653cfb5fdac275447876852bc0 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Thu, 22 Oct 2020 15:49:59 -0700 Subject: [PATCH 1267/1622] Better logging in the Fedora cleanup script Signed-off-by: Tim Smith <tsmith@chef.io> --- packer_templates/fedora/scripts/cleanup.sh | 24 ++++++++++++++-------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/packer_templates/fedora/scripts/cleanup.sh b/packer_templates/fedora/scripts/cleanup.sh index a6b9bd8f9..29476479c 100644 --- a/packer_templates/fedora/scripts/cleanup.sh +++ b/packer_templates/fedora/scripts/cleanup.sh @@ -1,33 +1,39 @@ #!/bin/bash -eux -echo "Removing development packages and cleaning up DNF data" +echo "Remove development and kernel source packages" dnf -y remove gcc cpp gc kernel-devel kernel-headers glibc-devel elfutils-libelf-devel glibc-headers kernel-devel kernel-headers + +echo "remove orphaned packages" dnf -y autoremove +echo "Remove previous kernels that preserved for rollbacks" +dnf -y remove -y $(dnf repoquery --installonly --latest-limit=-1 -q) + # Avoid ~200 meg firmware package we don't need # this cannot be done in the KS file so we do it here -echo "Removing extra packages" +echo "Removing extra firmware packages" dnf -y remove linux-firmware +echo "clean all package cache information" dnf -y clean all --enablerepo=\* -# truncate any logs that have built up during the install +echo "truncate any logs that have built up during the install" find /var/log -type f -exec truncate --size=0 {} \; -# Remove any non-loopback network configs +echo "Remove any non-loopback network configs" find /etc/sysconfig/network-scripts -name "ifcfg-*" -not -name "ifcfg-lo" -exec rm -f {} \; -# remove the install log +echo "remove the install log" rm -f /root/anaconda-ks.cfg /root/original-ks.cfg -# remove the contents of /tmp and /var/tmp +echo "remove the contents of /tmp and /var/tmp" rm -rf /tmp/* /var/tmp/* -# force a new random seed to be generated +echo "Force a new random seed to be generated" rm -f /var/lib/systemd/random-seed -# Blank netplan machine-id (DUID) so machines get unique ID generated on boot. +echo "Wipe netplan machine-id (DUID) so machines get unique ID generated on boot" truncate -s 0 /etc/machine-id -# clear the history so our install isn't there +echo "Clear the history so our install commands aren't there" rm -f /root/.wget-hsts export HISTSIZE=0 \ No newline at end of file From fd9f05b3c72d082e36be7c5e53de1bb6cdc60ad3 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Thu, 22 Oct 2020 15:50:29 -0700 Subject: [PATCH 1268/1622] Turn off the predictive nic names in Fedora Signed-off-by: Tim Smith <tsmith@chef.io> --- packer_templates/fedora/http/ks-fedora.cfg | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packer_templates/fedora/http/ks-fedora.cfg b/packer_templates/fedora/http/ks-fedora.cfg index 32e044ba3..c63e57b8e 100644 --- a/packer_templates/fedora/http/ks-fedora.cfg +++ b/packer_templates/fedora/http/ks-fedora.cfg @@ -2,12 +2,12 @@ install cdrom lang en_US.UTF-8 keyboard us -network --bootproto=dhcp --noipv6 +network --bootproto=dhcp --noipv6 --onboot=on --device=eth0 rootpw --plaintext vagrant firewall --disabled selinux --permissive timezone UTC -bootloader --timeout=1 --location=mbr +bootloader --timeout=1 --location=mbr --append="net.ifnames=0 biosdevname=0" text skipx zerombr From 2fe94adaf7dc8102e2226bb0f13cf8547db62d39 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Thu, 22 Oct 2020 15:50:54 -0700 Subject: [PATCH 1269/1622] Turn off ipv6 in CentOS 7 Signed-off-by: Tim Smith <tsmith@chef.io> --- packer_templates/centos/http/7/ks.cfg | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packer_templates/centos/http/7/ks.cfg b/packer_templates/centos/http/7/ks.cfg index 815d98358..90a9e8467 100644 --- a/packer_templates/centos/http/7/ks.cfg +++ b/packer_templates/centos/http/7/ks.cfg @@ -2,8 +2,8 @@ install cdrom lang en_US.UTF-8 keyboard us -network --bootproto=dhcp --onboot=on --device=eth0 -rootpw vagrant +network --bootproto=dhcp --noipv6 --onboot=on --device=eth0 +rootpw --plaintext vagrant firewall --disabled selinux --permissive timezone UTC From 9c4f4db136d5212188bf2bea5e9fbe274f73be18 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Thu, 22 Oct 2020 15:51:20 -0700 Subject: [PATCH 1270/1622] Use a 1 second timeout for Grub in RHEL 7 Signed-off-by: Tim Smith <tsmith@chef.io> --- packer_templates/centos/http/7/ks.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packer_templates/centos/http/7/ks.cfg b/packer_templates/centos/http/7/ks.cfg index 90a9e8467..354bf48ff 100644 --- a/packer_templates/centos/http/7/ks.cfg +++ b/packer_templates/centos/http/7/ks.cfg @@ -8,7 +8,7 @@ firewall --disabled selinux --permissive timezone UTC unsupported_hardware -bootloader --location=mbr --append="net.ifnames=0 biosdevname=0" +bootloader --timeout=1 --location=mbr --append="net.ifnames=0 biosdevname=0" text skipx zerombr From c007d492924a5dd81eee572667c4f3866966c229 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Thu, 22 Oct 2020 15:52:52 -0700 Subject: [PATCH 1271/1622] Disable LVM in RHEL 7 Signed-off-by: Tim Smith <tsmith@chef.io> --- packer_templates/centos/http/7/ks.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packer_templates/centos/http/7/ks.cfg b/packer_templates/centos/http/7/ks.cfg index 354bf48ff..f22eccfb3 100644 --- a/packer_templates/centos/http/7/ks.cfg +++ b/packer_templates/centos/http/7/ks.cfg @@ -13,7 +13,7 @@ text skipx zerombr clearpart --all --initlabel -autopart +autopart --nohome --nolvm auth --enableshadow --passalgo=sha512 --kickstart firstboot --disabled reboot --eject From ebeb19769ea8cacdfbc48ecc1c0d52bcfc79dcfd Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Thu, 22 Oct 2020 15:53:12 -0700 Subject: [PATCH 1272/1622] Use the same sudo config in RHEL 7 and others Signed-off-by: Tim Smith <tsmith@chef.io> --- packer_templates/centos/http/7/ks.cfg | 5 +++-- packer_templates/fedora/scripts/swap.sh | 7 ------- 2 files changed, 3 insertions(+), 9 deletions(-) delete mode 100644 packer_templates/fedora/scripts/swap.sh diff --git a/packer_templates/centos/http/7/ks.cfg b/packer_templates/centos/http/7/ks.cfg index f22eccfb3..265a04bcb 100644 --- a/packer_templates/centos/http/7/ks.cfg +++ b/packer_templates/centos/http/7/ks.cfg @@ -43,8 +43,9 @@ rsync %post # sudo -echo "%vagrant ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers.d/vagrant -chmod 0440 /etc/sudoers.d/vagrant +echo 'Defaults:vagrant !requiretty' > /etc/sudoers.d/vagrant +echo '%vagrant ALL=(ALL) NOPASSWD: ALL' >> /etc/sudoers.d/vagrant +chmod 440 /etc/sudoers.d/vagrant # Enable hyper-v daemons only if using hyper-v virtualization if [ $(virt-what) == "hyperv" ]; then diff --git a/packer_templates/fedora/scripts/swap.sh b/packer_templates/fedora/scripts/swap.sh deleted file mode 100644 index 965edf145..000000000 --- a/packer_templates/fedora/scripts/swap.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/bash -eux - -# add 2GB swap file since we didn't setup a swap partition -dd if=/dev/zero of=/swapfile bs=1M count=2048 -mkswap /swapfile -swapon /swapfile -echo -e "/swapfile\tswap\tswap\tdefaults\t0\t0" >> /etc/fstab From 688266700515485800a3ab8ef1a787b723b60bd7 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Thu, 22 Oct 2020 16:28:45 -0700 Subject: [PATCH 1273/1622] Make sure we have the deps we need for vmware tools Signed-off-by: Tim Smith <tsmith@chef.io> --- packer_templates/_common/vmware.sh | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/packer_templates/_common/vmware.sh b/packer_templates/_common/vmware.sh index ae1d874b9..b929f88af 100644 --- a/packer_templates/_common/vmware.sh +++ b/packer_templates/_common/vmware.sh @@ -18,6 +18,13 @@ vmware-iso|vmware-vmx) VER="`echo "${TOOLS_PATH}" | cut -f2 -d'-'`"; MAJ_VER="`echo ${VER} | cut -d '.' -f 1`"; + # Make sure we have perl for the installer + if [ -f "/bin/dnf" ]; then + dnf install -y perl gcc make kernel-headers kernel-devel + elif [ -f "/bin/yum" ]; then + yum install -y perl gcc make kernel-headers kernel-devel + fi + echo "VMware Tools Version: $VER"; tar xzf ${TOOLS_PATH} -C /tmp/vmware-archive; From b498fe234e09dbf1f3d589cc20a39d33bdd47f8c Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Thu, 22 Oct 2020 16:33:44 -0700 Subject: [PATCH 1274/1622] Add more debug messaging for vmware installation Signed-off-by: Tim Smith <tsmith@chef.io> --- packer_templates/_common/vmware.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/packer_templates/_common/vmware.sh b/packer_templates/_common/vmware.sh index b929f88af..50720338b 100644 --- a/packer_templates/_common/vmware.sh +++ b/packer_templates/_common/vmware.sh @@ -18,16 +18,19 @@ vmware-iso|vmware-vmx) VER="`echo "${TOOLS_PATH}" | cut -f2 -d'-'`"; MAJ_VER="`echo ${VER} | cut -d '.' -f 1`"; - # Make sure we have perl for the installer if [ -f "/bin/dnf" ]; then + echo "Installing deps for the vmware tools" dnf install -y perl gcc make kernel-headers kernel-devel elif [ -f "/bin/yum" ]; then + echo "Installing deps for the vmware tools" yum install -y perl gcc make kernel-headers kernel-devel fi echo "VMware Tools Version: $VER"; + echo "Expanding the tools archive" tar xzf ${TOOLS_PATH} -C /tmp/vmware-archive; + echo "Installing tools" if [ "${MAJ_VER}" -lt "10" ]; then /tmp/vmware-archive/vmware-tools-distrib/vmware-install.pl --default; else From e985fd009cc9bdeb42c66bafe8cc50525f09b0bb Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Fri, 23 Oct 2020 10:20:37 -0700 Subject: [PATCH 1275/1622] vbox: Make sure we have the kernels we need for Oracle linux Signed-off-by: Tim Smith <tsmith@chef.io> --- packer_templates/_common/virtualbox.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/packer_templates/_common/virtualbox.sh b/packer_templates/_common/virtualbox.sh index 6377d2ce6..470ac9c3d 100644 --- a/packer_templates/_common/virtualbox.sh +++ b/packer_templates/_common/virtualbox.sh @@ -12,11 +12,11 @@ virtualbox-iso|virtualbox-ovf) mkdir -p /tmp/vbox; mount -o loop $HOME_DIR/$ISO /tmp/vbox; - # OS specific packages we need + # OS specific packages we need. We install things like kernel-headers here vs. kickstart files so we make sure we install them for the updated kernel not the stock kernel if [ -f "/bin/dnf" ]; then - dnf install gcc make bzip2 tar kernel-headers kernel-devel -y + dnf install gcc make bzip2 tar kernel-headers kernel-devel kernel-uek-devel -y || true # not all these packages are on every system elif [ -f "/bin/yum" ]; then - yum install gcc make bzip2 tar kernel-headers kernel-devel -y + yum install gcc make bzip2 tar kernel-headers kernel-devel kernel-uek-devel -y || true # not all these packages are on every system elif [ -f "/usr/bin/apt-get" ]; then apt-get install build-essential bzip2 tar -y # avoid warnings and failures @@ -33,9 +33,9 @@ virtualbox-iso|virtualbox-ovf) # OS specific packages we don't need if [ -f "/bin/dnf" ]; then - dnf remove gcc cpp kernel-headers kernel-devel -y + dnf remove gcc cpp kernel-headers kernel-devel kernel-uek-devel -y elif [ -f "/bin/yum" ]; then - yum remove gcc cpp kernel-headers kernel-devel -y + yum remove gcc cpp kernel-headers kernel-devel kernel-uek-devel -y elif [ -f "/usr/bin/apt-get" ]; then apt-get remove gcc g++ make libc6-dev -y fi From f75cc2f367dc919cc7b9ed84f829e7eef220186b Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Fri, 23 Oct 2020 11:52:44 -0700 Subject: [PATCH 1276/1622] Add debug logging to the vbox script and fix RHEL 6 installs Signed-off-by: Tim Smith <tsmith@chef.io> --- packer_templates/_common/virtualbox.sh | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/packer_templates/_common/virtualbox.sh b/packer_templates/_common/virtualbox.sh index 470ac9c3d..e918ced90 100644 --- a/packer_templates/_common/virtualbox.sh +++ b/packer_templates/_common/virtualbox.sh @@ -12,26 +12,27 @@ virtualbox-iso|virtualbox-ovf) mkdir -p /tmp/vbox; mount -o loop $HOME_DIR/$ISO /tmp/vbox; - # OS specific packages we need. We install things like kernel-headers here vs. kickstart files so we make sure we install them for the updated kernel not the stock kernel + echo "installing deps necessary to compile kernel modules" + # We install things like kernel-headers here vs. kickstart files so we make sure we install them for the updated kernel not the stock kernel if [ -f "/bin/dnf" ]; then - dnf install gcc make bzip2 tar kernel-headers kernel-devel kernel-uek-devel -y || true # not all these packages are on every system - elif [ -f "/bin/yum" ]; then - yum install gcc make bzip2 tar kernel-headers kernel-devel kernel-uek-devel -y || true # not all these packages are on every system + dnf install cpp gcc make bzip2 tar kernel-headers kernel-devel kernel-uek-devel -y || true # not all these packages are on every system + elif [ -f "/bin/yum" ] || [ -f "/usr/bin/yum" ]; then + yum install cpp gcc make bzip2 tar kernel-headers kernel-devel kernel-uek-devel -y || true # not all these packages are on every system elif [ -f "/usr/bin/apt-get" ]; then apt-get install build-essential bzip2 tar -y # avoid warnings and failures apt-get remove cryptsetup-initramfs -y fi - # install the vbox additions + echo "installing the vbox additions" sh /tmp/vbox/VBoxLinuxAdditions.run --nox11 - # unmount and nuke the ISO + echo "unmounting and removing the vbox ISO" umount /tmp/vbox; rm -rf /tmp/vbox; rm -f $HOME_DIR/*.iso; - # OS specific packages we don't need + echo "removing kernel dev packages and compilers we no longer need" if [ -f "/bin/dnf" ]; then dnf remove gcc cpp kernel-headers kernel-devel kernel-uek-devel -y elif [ -f "/bin/yum" ]; then @@ -40,7 +41,7 @@ virtualbox-iso|virtualbox-ovf) apt-get remove gcc g++ make libc6-dev -y fi - # cleanup leftover logs + echo "removing leftover logs" rm -rf /var/log/vboxadd* ;; esac From 3b3c1aa49e581211faf8f87b5c055051e51c45ff Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Fri, 23 Oct 2020 12:18:39 -0700 Subject: [PATCH 1277/1622] Fix yum detection for RHEL 6 in a few more places Signed-off-by: Tim Smith <tsmith@chef.io> --- packer_templates/_common/virtualbox.sh | 2 +- packer_templates/_common/vmware.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packer_templates/_common/virtualbox.sh b/packer_templates/_common/virtualbox.sh index e918ced90..acb806d23 100644 --- a/packer_templates/_common/virtualbox.sh +++ b/packer_templates/_common/virtualbox.sh @@ -35,7 +35,7 @@ virtualbox-iso|virtualbox-ovf) echo "removing kernel dev packages and compilers we no longer need" if [ -f "/bin/dnf" ]; then dnf remove gcc cpp kernel-headers kernel-devel kernel-uek-devel -y - elif [ -f "/bin/yum" ]; then + elif [ -f "/bin/yum" ] || [ -f "/usr/bin/yum" ]; then yum remove gcc cpp kernel-headers kernel-devel kernel-uek-devel -y elif [ -f "/usr/bin/apt-get" ]; then apt-get remove gcc g++ make libc6-dev -y diff --git a/packer_templates/_common/vmware.sh b/packer_templates/_common/vmware.sh index 50720338b..5bddaa1ca 100644 --- a/packer_templates/_common/vmware.sh +++ b/packer_templates/_common/vmware.sh @@ -21,7 +21,7 @@ vmware-iso|vmware-vmx) if [ -f "/bin/dnf" ]; then echo "Installing deps for the vmware tools" dnf install -y perl gcc make kernel-headers kernel-devel - elif [ -f "/bin/yum" ]; then + elif [ -f "/bin/yum" ] || [ -f "/usr/bin/yum" ]; then echo "Installing deps for the vmware tools" yum install -y perl gcc make kernel-headers kernel-devel fi From 7b7fc4611a66095d8d4d5721fff020a16453f416 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Fri, 23 Oct 2020 12:36:46 -0700 Subject: [PATCH 1278/1622] Skip make / perl on RHEL unless we need them These are installed by the individual virt tools scripts if necessary Signed-off-by: Tim Smith <tsmith@chef.io> --- packer_templates/centos/http/6/ks.cfg | 1 - packer_templates/centos/http/7/ks.cfg | 2 -- packer_templates/centos/http/8/ks.cfg | 2 -- 3 files changed, 5 deletions(-) diff --git a/packer_templates/centos/http/6/ks.cfg b/packer_templates/centos/http/6/ks.cfg index 9669de829..65d21962e 100644 --- a/packer_templates/centos/http/6/ks.cfg +++ b/packer_templates/centos/http/6/ks.cfg @@ -24,7 +24,6 @@ key --skip # vagrant needs this to copy initial files via scp openssh-clients sudo -perl wget nfs-utils virt-what diff --git a/packer_templates/centos/http/7/ks.cfg b/packer_templates/centos/http/7/ks.cfg index 265a04bcb..ce5b2d96b 100644 --- a/packer_templates/centos/http/7/ks.cfg +++ b/packer_templates/centos/http/7/ks.cfg @@ -23,8 +23,6 @@ user --name=vagrant --plaintext --password vagrant # vagrant needs this to copy initial files via scp openssh-clients sudo -make -perl selinux-policy-devel wget nfs-utils diff --git a/packer_templates/centos/http/8/ks.cfg b/packer_templates/centos/http/8/ks.cfg index b1f59a7af..595f4950f 100644 --- a/packer_templates/centos/http/8/ks.cfg +++ b/packer_templates/centos/http/8/ks.cfg @@ -21,8 +21,6 @@ user --name=vagrant --plaintext --password vagrant # vagrant needs this to copy initial files via scp openssh-clients sudo -make -perl selinux-policy-devel wget nfs-utils From 0427890910afb3ed5fef271cd3a146ac52ceba7a Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Fri, 23 Oct 2020 12:38:46 -0700 Subject: [PATCH 1279/1622] Add 1 second bootloader delay to RHEL 6 + other minor syncs Signed-off-by: Tim Smith <tsmith@chef.io> --- packer_templates/centos/http/6/ks.cfg | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/packer_templates/centos/http/6/ks.cfg b/packer_templates/centos/http/6/ks.cfg index 65d21962e..ee006edfe 100644 --- a/packer_templates/centos/http/6/ks.cfg +++ b/packer_templates/centos/http/6/ks.cfg @@ -3,12 +3,12 @@ cdrom lang en_US.UTF-8 keyboard us network --bootproto=dhcp --onboot=on --device=eth0 -rootpw vagrant +rootpw --plaintext vagrant firewall --disabled selinux --permissive timezone UTC unsupported_hardware -bootloader --location=mbr +bootloader --timeout=1 --location=mbr text skipx zerombr @@ -39,8 +39,9 @@ rsync # Force to set SELinux to a permissive mode sed -i -e 's/\(^SELINUX=\).*$/\1permissive/' /etc/selinux/config # sudo -echo "%vagrant ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers.d/vagrant -chmod 0440 /etc/sudoers.d/vagrant +echo 'Defaults:vagrant !requiretty' > /etc/sudoers.d/vagrant +echo '%vagrant ALL=(ALL) NOPASSWD: ALL' >> /etc/sudoers.d/vagrant +chmod 440 /etc/sudoers.d/vagrant # Enable hyper-v daemons only if using hyper-v virtualization if [ $(virt-what) == "hyperv" ]; then From 948ceb44b735705e6e5a11c24b84c175269f1506 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Fri, 23 Oct 2020 12:53:53 -0700 Subject: [PATCH 1280/1622] Make sure to install perl in the vbox script Signed-off-by: Tim Smith <tsmith@chef.io> --- packer_templates/_common/virtualbox.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packer_templates/_common/virtualbox.sh b/packer_templates/_common/virtualbox.sh index acb806d23..bc8224d6b 100644 --- a/packer_templates/_common/virtualbox.sh +++ b/packer_templates/_common/virtualbox.sh @@ -15,9 +15,9 @@ virtualbox-iso|virtualbox-ovf) echo "installing deps necessary to compile kernel modules" # We install things like kernel-headers here vs. kickstart files so we make sure we install them for the updated kernel not the stock kernel if [ -f "/bin/dnf" ]; then - dnf install cpp gcc make bzip2 tar kernel-headers kernel-devel kernel-uek-devel -y || true # not all these packages are on every system + dnf install perl cpp gcc make bzip2 tar kernel-headers kernel-devel kernel-uek-devel -y || true # not all these packages are on every system elif [ -f "/bin/yum" ] || [ -f "/usr/bin/yum" ]; then - yum install cpp gcc make bzip2 tar kernel-headers kernel-devel kernel-uek-devel -y || true # not all these packages are on every system + yum install perl cpp gcc make bzip2 tar kernel-headers kernel-devel kernel-uek-devel -y || true # not all these packages are on every system elif [ -f "/usr/bin/apt-get" ]; then apt-get install build-essential bzip2 tar -y # avoid warnings and failures From ff4c79764ef32287305df711a45c6a4a2790e533 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Fri, 23 Oct 2020 13:20:08 -0700 Subject: [PATCH 1281/1622] Don't install make by default on SLES Signed-off-by: Tim Smith <tsmith@chef.io> --- packer_templates/opensuse/http/15/autoinst.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/packer_templates/opensuse/http/15/autoinst.xml b/packer_templates/opensuse/http/15/autoinst.xml index 49e1998e1..6a021dc74 100644 --- a/packer_templates/opensuse/http/15/autoinst.xml +++ b/packer_templates/opensuse/http/15/autoinst.xml @@ -127,7 +127,6 @@ <package>glibc-locale</package> <package>iputils</package> <package>kernel-default</package> - <package>make</package> <package>sudo</package> <package>yast2</package> <package>yast2-firstboot</package> From fda329cc8cce10ad25a2214dc1646f9c51dc7623 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Fri, 23 Oct 2020 13:20:36 -0700 Subject: [PATCH 1282/1622] Add a 1 second boot menu delay for SLES Signed-off-by: Tim Smith <tsmith@chef.io> --- packer_templates/opensuse/http/15/autoinst.xml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/packer_templates/opensuse/http/15/autoinst.xml b/packer_templates/opensuse/http/15/autoinst.xml index 6a021dc74..77eb3a1db 100644 --- a/packer_templates/opensuse/http/15/autoinst.xml +++ b/packer_templates/opensuse/http/15/autoinst.xml @@ -96,6 +96,11 @@ </partitioning> <bootloader> <loader_type>grub2</loader_type> + <global> + <activate config:type="boolean">true</activate> + <timeout config:type="integer">1</timeout> + <boot_mbr>true</boot_mbr> + </global> </bootloader> <networking> <ipv6 config:type="boolean">false</ipv6> From 800fb76dce36ce5250d647f7d1e22b9cf83da51c Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Fri, 23 Oct 2020 13:21:37 -0700 Subject: [PATCH 1283/1622] Remove RHEL 5 templates Signed-off-by: Tim Smith <tsmith@chef.io> --- packer_templates/rhel/rhel-5.11-i386.json | 155 ------------------- packer_templates/rhel/rhel-5.11-x86_64.json | 163 -------------------- 2 files changed, 318 deletions(-) delete mode 100644 packer_templates/rhel/rhel-5.11-i386.json delete mode 100644 packer_templates/rhel/rhel-5.11-x86_64.json diff --git a/packer_templates/rhel/rhel-5.11-i386.json b/packer_templates/rhel/rhel-5.11-i386.json deleted file mode 100644 index 2d6c15f02..000000000 --- a/packer_templates/rhel/rhel-5.11-i386.json +++ /dev/null @@ -1,155 +0,0 @@ -{ - "builders": [ - { - "boot_command": [ - "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" - ], - "boot_wait": "10s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", - "guest_additions_url": "{{ user `guest_additions_url` }}", - "guest_os_type": "RedHat", - "hard_drive_interface": "sata", - "headless": "{{ user `headless` }}", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-virtualbox", - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "type": "virtualbox-iso", - "virtualbox_version_file": ".vbox_version", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" - ], - "boot_wait": "10s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "redhat", - "headless": "{{ user `headless` }}", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-vmware", - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "tools_upload_flavor": "linux", - "type": "vmware-iso", - "vm_name": "{{ user `template` }}", - "vmx_data": { - "cpuid.coresPerSocket": "1" - }, - "vmx_remove_ethernet_interfaces": true - }, - { - "boot_command": [ - "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" - ], - "boot_wait": "10s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "rhel", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-parallels", - "parallels_tools_flavor": "lin", - "prlctl_version_file": ".prlctl_version", - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "type": "parallels-iso", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" - ], - "boot_wait": "10s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "headless": "{{ user `headless` }}", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-qemu", - "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "type": "qemu", - "vm_name": "{{ user `template` }}" - } - ], - "post-processors": [ - { - "output": "{{ user `build_directory` }}/{{user `box_basename`}}.{{.Provider}}.box", - "type": "vagrant" - } - ], - "provisioners": [ - { - "environment_vars": [ - "HOME_DIR=/home/vagrant", - "http_proxy={{user `http_proxy`}}", - "https_proxy={{user `https_proxy`}}", - "no_proxy={{user `no_proxy`}}" - ], - "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", - "expect_disconnect": true, - "scripts": [ - "{{template_dir}}/../_common/vagrant.sh", - "{{template_dir}}/../_common/motd.sh", - "{{template_dir}}/../_common/sshd.sh", - "{{template_dir}}/../_common/virtualbox.sh", - "{{template_dir}}/../_common/vmware.sh", - "{{template_dir}}/../_common/parallels.sh", - "{{template_dir}}/../centos/scripts/cleanup.sh", - "{{template_dir}}/../_common/minimize.sh" - ], - "type": "shell" - } - ], - "variables": { - "arch": "32", - "box_basename": "rhel-5.11-i386", - "build_directory": "../../builds", - "build_timestamp": "{{isotime \"20060102150405\"}}", - "cpus": "1", - "disk_size": "65536", - "git_revision": "__unknown_git_revision__", - "guest_additions_url": "", - "headless": "", - "http_directory": "{{template_dir}}/../centos/http", - "http_proxy": "{{env `http_proxy`}}", - "https_proxy": "{{env `https_proxy`}}", - "iso_checksum": "4e38e4ed06d83efb10446e7db19d96761715cdbdbf0bbfacb978b44ce368bbe2", - "iso_name": "rhel-server-5.11-i386-dvd.iso", - "ks_path": "5/ks.cfg", - "memory": "1024", - "mirror": "http://YOU-MUST-PROVIDE-YOUR-OWN-ISO.sorry", - "mirror_directory": "rhel", - "name": "rhel-5.11-i386", - "no_proxy": "{{env `no_proxy`}}", - "template": "rhel-5.11-i386", - "version": "TIMESTAMP" - } -} - diff --git a/packer_templates/rhel/rhel-5.11-x86_64.json b/packer_templates/rhel/rhel-5.11-x86_64.json deleted file mode 100644 index 2abbf2bda..000000000 --- a/packer_templates/rhel/rhel-5.11-x86_64.json +++ /dev/null @@ -1,163 +0,0 @@ -{ - "builders": [ - { - "boot_command": [ - "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" - ], - "boot_wait": "10s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", - "guest_additions_url": "{{ user `guest_additions_url` }}", - "guest_os_type": "RedHat_64", - "hard_drive_interface": "sata", - "headless": "{{ user `headless` }}", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-virtualbox", - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "type": "virtualbox-iso", - "vboxmanage": [ - [ - "modifyvm", - "{{.Name}}", - "--paravirtprovider", - "none" - ] - ], - "virtualbox_version_file": ".vbox_version", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" - ], - "boot_wait": "10s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "rhel5-64", - "headless": "{{ user `headless` }}", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-vmware", - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "tools_upload_flavor": "linux", - "type": "vmware-iso", - "vm_name": "{{ user `template` }}", - "vmx_data": { - "cpuid.coresPerSocket": "1" - }, - "vmx_remove_ethernet_interfaces": true - }, - { - "boot_command": [ - "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" - ], - "boot_wait": "10s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "rhel", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-parallels", - "parallels_tools_flavor": "lin", - "prlctl_version_file": ".prlctl_version", - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "type": "parallels-iso", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" - ], - "boot_wait": "10s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "headless": "{{ user `headless` }}", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-qemu", - "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "type": "qemu", - "vm_name": "{{ user `template` }}" - } - ], - "post-processors": [ - { - "output": "{{ user `build_directory` }}/{{user `box_basename`}}.{{.Provider}}.box", - "type": "vagrant" - } - ], - "provisioners": [ - { - "environment_vars": [ - "HOME_DIR=/home/vagrant", - "http_proxy={{user `http_proxy`}}", - "https_proxy={{user `https_proxy`}}", - "no_proxy={{user `no_proxy`}}" - ], - "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", - "expect_disconnect": true, - "scripts": [ - "{{template_dir}}/../_common/vagrant.sh", - "{{template_dir}}/../_common/motd.sh", - "{{template_dir}}/../_common/sshd.sh", - "{{template_dir}}/../_common/virtualbox.sh", - "{{template_dir}}/../_common/vmware.sh", - "{{template_dir}}/../_common/parallels.sh", - "{{template_dir}}/../centos/scripts/cleanup.sh", - "{{template_dir}}/../_common/minimize.sh" - ], - "type": "shell" - } - ], - "variables": { - "arch": "64", - "box_basename": "rhel-5.11", - "build_directory": "../../builds", - "build_timestamp": "{{isotime \"20060102150405\"}}", - "cpus": "1", - "disk_size": "65536", - "git_revision": "__unknown_git_revision__", - "guest_additions_url": "", - "headless": "", - "http_directory": "{{template_dir}}/../centos/http", - "http_proxy": "{{env `http_proxy`}}", - "https_proxy": "{{env `https_proxy`}}", - "iso_checksum": "36565fe0c8a97207d63234d10123daeedb29d509576dbd7b34e71958ac2f9050", - "iso_name": "rhel-server-5.11-x86_64-dvd.iso", - "ks_path": "5/ks.cfg", - "memory": "1024", - "mirror": "http://YOU-MUST-PROVIDE-YOUR-OWN-ISO.sorry", - "mirror_directory": "rhel", - "name": "rhel-5.11", - "no_proxy": "{{env `no_proxy`}}", - "template": "rhel-5.11-x86_64", - "version": "TIMESTAMP" - } -} - From d0be0204ec6d5dde1d44c85284a9b9463500d1f9 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Fri, 23 Oct 2020 13:22:18 -0700 Subject: [PATCH 1284/1622] Link to Robox in the readme Signed-off-by: Tim Smith <tsmith@chef.io> --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 0be451f59..870d3546b 100644 --- a/README.md +++ b/README.md @@ -120,6 +120,7 @@ Please use GitHub issues to report bugs, features, or other problems. ## Related projects * https://github.com/boxcutter +* https://github.com/lavabit/robox * https://github.com/mcandre/packer-templates * https://github.com/timsutton/osx-vm-templates * https://github.com/ferventcoder/vagrant-windows-puppet/tree/master/baseboxes From db67cc42d5efc0df6bc51b9f0a1bf2ec8db54f95 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Fri, 23 Oct 2020 13:22:59 -0700 Subject: [PATCH 1285/1622] Delete the old macOS templates These are so old they're useless. Use macinbox now Signed-off-by: Tim Smith <tsmith@chef.io> --- packer_templates/macos/macos-10.12.json | 230 ------------------ packer_templates/macos/macosx-10.11.json | 230 ------------------ packer_templates/macos/scripts/autologin.sh | 12 - packer_templates/macos/scripts/cleanup.sh | 4 - .../macos/scripts/disablesleep.sh | 4 - packer_templates/macos/scripts/hostname.sh | 10 - packer_templates/macos/scripts/minimize.sh | 27 -- packer_templates/macos/scripts/networking.sh | 32 --- .../macos/scripts/support/set_kcpassword.py | 36 --- packer_templates/macos/scripts/update.sh | 16 -- packer_templates/macos/scripts/vagrant.sh | 14 -- packer_templates/macos/scripts/vmtools.sh | 45 ---- .../macos/vagrantfile_templates/macosx.rb | 7 - 13 files changed, 667 deletions(-) delete mode 100644 packer_templates/macos/macos-10.12.json delete mode 100644 packer_templates/macos/macosx-10.11.json delete mode 100644 packer_templates/macos/scripts/autologin.sh delete mode 100644 packer_templates/macos/scripts/cleanup.sh delete mode 100644 packer_templates/macos/scripts/disablesleep.sh delete mode 100644 packer_templates/macos/scripts/hostname.sh delete mode 100644 packer_templates/macos/scripts/minimize.sh delete mode 100644 packer_templates/macos/scripts/networking.sh delete mode 100644 packer_templates/macos/scripts/support/set_kcpassword.py delete mode 100644 packer_templates/macos/scripts/update.sh delete mode 100644 packer_templates/macos/scripts/vagrant.sh delete mode 100644 packer_templates/macos/scripts/vmtools.sh delete mode 100644 packer_templates/macos/vagrantfile_templates/macosx.rb diff --git a/packer_templates/macos/macos-10.12.json b/packer_templates/macos/macos-10.12.json deleted file mode 100644 index 1d8b4336b..000000000 --- a/packer_templates/macos/macos-10.12.json +++ /dev/null @@ -1,230 +0,0 @@ -{ - "builders": [ - { - "boot_wait": "2s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "darwin12-64", - "headless": "{{ user `headless` }}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `iso_url`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-vmware", - "shutdown_command": "echo 'vagrant'| sudo -S shutdown -h now", - "skip_compaction": true, - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "tools_upload_flavor": "darwin", - "tools_upload_path": "/tmp/vmtools.iso", - "type": "vmware-iso", - "usb": true, - "vm_name": "{{ user `template` }}", - "vmx_data": { - "cpuid.coresPerSocket": "1", - "ehci.present": "TRUE", - "firmware": "efi", - "hpet0.present": "TRUE", - "ich7m.present": "TRUE", - "keyboardAndMouseProfile": "macProfile", - "smc.present": "TRUE" - }, - "vmx_remove_ethernet_interfaces": true - }, - { - "boot_wait": "2s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "guest_additions_mode": "disable", - "guest_os_type": "MacOS1011_64", - "hard_drive_interface": "sata", - "headless": "{{ user `headless` }}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `iso_url`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-virtualbox", - "shutdown_command": "echo 'vagrant'| sudo -S shutdown -h now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "type": "virtualbox-iso", - "vboxmanage": [ - [ - "modifyvm", - "{{.Name}}", - "--audiocontroller", - "hda" - ], - [ - "modifyvm", - "{{.Name}}", - "--boot1", - "dvd" - ], - [ - "modifyvm", - "{{.Name}}", - "--boot2", - "disk" - ], - [ - "modifyvm", - "{{.Name}}", - "--chipset", - "ich9" - ], - [ - "modifyvm", - "{{.Name}}", - "--firmware", - "efi" - ], - [ - "modifyvm", - "{{.Name}}", - "--hpet", - "on" - ], - [ - "modifyvm", - "{{.Name}}", - "--keyboard", - "usb" - ], - [ - "modifyvm", - "{{.Name}}", - "--mouse", - "usbtablet" - ], - [ - "modifyvm", - "{{.Name}}", - "--vram", - "9" - ], - [ - "storageattach", - "{{.Name}}", - "--storagectl", - "SATA Controller", - "--port", - "{{ user `cpus` }}", - "--type", - "dvddrive", - "--medium", - "{{user `iso_url`}}" - ] - ], - "vboxmanage_post": [ - [ - "storageattach", - "{{.Name}}", - "--storagectl", - "SATA Controller", - "--port", - "{{ user `cpus` }}", - "--type", - "dvddrive", - "--medium", - "none" - ], - [ - "storagectl", - "{{.Name}}", - "--name", - "IDE Controller", - "--remove" - ] - ], - "virtualbox_version_file": ".vbox_version", - "vm_name": "{{ user `template` }}" - }, - { - "boot_wait": "2s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "macosx", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `iso_url`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-parallels", - "parallels_tools_flavor": "mac", - "prlctl": [ - [ - "set", - "{{.Name}}", - "--on-window-close", - "keep-running" - ] - ], - "shutdown_command": "echo 'vagrant'| sudo -S shutdown -h now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "type": "parallels-iso", - "vm_name": "{{ user `template` }}" - } - ], - "post-processors": [ - { - "output": "{{ user `build_directory` }}/{{user `box_basename`}}.{{.Provider}}.box", - "type": "vagrant", - "vagrantfile_template": "{{template_dir}}/vagrantfile_templates/macosx.rb" - } - ], - "provisioners": [ - { - "destination": "/private/tmp/set_kcpassword.py", - "source": "{{template_dir}}/scripts/support/set_kcpassword.py", - "type": "file" - }, - { - "environment_vars": [ - "HOME_DIR=/Users/vagrant", - "AUTOLOGIN={{user `autologin`}}", - "http_proxy={{user `http_proxy`}}", - "https_proxy={{user `https_proxy`}}", - "no_proxy={{user `no_proxy`}}" - ], - "execute_command": "echo 'vagrant'| {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", - "expect_disconnect": true, - "scripts": [ - "{{template_dir}}/scripts/hostname.sh", - "{{template_dir}}/scripts/update.sh", - "{{template_dir}}/scripts/networking.sh", - "{{template_dir}}/scripts/disablesleep.sh", - "{{template_dir}}/scripts/vagrant.sh", - "{{template_dir}}/scripts/autologin.sh", - "{{template_dir}}/scripts/vmtools.sh", - "{{template_dir}}/scripts/cleanup.sh", - "{{template_dir}}/scripts/minimize.sh" - ], - "type": "shell" - } - ], - "variables": { - "_README": "You must provide a prepared Mac disk image (from https://github.com/timsutton/osx-vm-templates) and checksum value for this template to work. For more details, consult this project's README.md", - "autologin": "true", - "box_basename": "macos-10.12", - "build_directory": "../../builds", - "build_timestamp": "{{isotime \"20060102150405\"}}", - "cpus": "1", - "disk_size": "65536", - "git_revision": "__unknown_git_revision__", - "headless": "", - "http_proxy": "{{env `http_proxy`}}", - "https_proxy": "{{env `https_proxy`}}", - "iso_checksum": "none", - "iso_url": "http://YOU-MUST-PROVIDE-YOUR-OWN-DMG.sorry", - "memory": "2048", - "name": "macos-10.12", - "no_proxy": "{{env `no_proxy`}}", - "template": "macos-10.12", - "version": "TIMESTAMP" - } -} - diff --git a/packer_templates/macos/macosx-10.11.json b/packer_templates/macos/macosx-10.11.json deleted file mode 100644 index d9c2661b9..000000000 --- a/packer_templates/macos/macosx-10.11.json +++ /dev/null @@ -1,230 +0,0 @@ -{ - "builders": [ - { - "boot_wait": "2s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "darwin12-64", - "headless": "{{ user `headless` }}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `iso_url`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-vmware", - "shutdown_command": "echo 'vagrant'| sudo -S shutdown -h now", - "skip_compaction": true, - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "tools_upload_flavor": "darwin", - "tools_upload_path": "/tmp/vmtools.iso", - "type": "vmware-iso", - "usb": true, - "vm_name": "{{ user `template` }}", - "vmx_data": { - "cpuid.coresPerSocket": "1", - "ehci.present": "TRUE", - "firmware": "efi", - "hpet0.present": "TRUE", - "ich7m.present": "TRUE", - "keyboardAndMouseProfile": "macProfile", - "smc.present": "TRUE" - }, - "vmx_remove_ethernet_interfaces": true - }, - { - "boot_wait": "2s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "guest_additions_mode": "disable", - "guest_os_type": "MacOS1011_64", - "hard_drive_interface": "sata", - "headless": "{{ user `headless` }}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `iso_url`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-virtualbox", - "shutdown_command": "echo 'vagrant'| sudo -S shutdown -h now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "type": "virtualbox-iso", - "vboxmanage": [ - [ - "modifyvm", - "{{.Name}}", - "--audiocontroller", - "hda" - ], - [ - "modifyvm", - "{{.Name}}", - "--boot1", - "dvd" - ], - [ - "modifyvm", - "{{.Name}}", - "--boot2", - "disk" - ], - [ - "modifyvm", - "{{.Name}}", - "--chipset", - "ich9" - ], - [ - "modifyvm", - "{{.Name}}", - "--firmware", - "efi" - ], - [ - "modifyvm", - "{{.Name}}", - "--hpet", - "on" - ], - [ - "modifyvm", - "{{.Name}}", - "--keyboard", - "usb" - ], - [ - "modifyvm", - "{{.Name}}", - "--mouse", - "usbtablet" - ], - [ - "modifyvm", - "{{.Name}}", - "--vram", - "9" - ], - [ - "storageattach", - "{{.Name}}", - "--storagectl", - "SATA Controller", - "--port", - "{{ user `cpus` }}", - "--type", - "dvddrive", - "--medium", - "{{user `iso_url`}}" - ] - ], - "vboxmanage_post": [ - [ - "storageattach", - "{{.Name}}", - "--storagectl", - "SATA Controller", - "--port", - "{{ user `cpus` }}", - "--type", - "dvddrive", - "--medium", - "none" - ], - [ - "storagectl", - "{{.Name}}", - "--name", - "IDE Controller", - "--remove" - ] - ], - "virtualbox_version_file": ".vbox_version", - "vm_name": "{{ user `template` }}" - }, - { - "boot_wait": "2s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "macosx", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `iso_url`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-parallels", - "parallels_tools_flavor": "mac", - "prlctl": [ - [ - "set", - "{{.Name}}", - "--on-window-close", - "keep-running" - ] - ], - "shutdown_command": "echo 'vagrant'| sudo -S shutdown -h now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "type": "parallels-iso", - "vm_name": "{{ user `template` }}" - } - ], - "post-processors": [ - { - "output": "{{ user `build_directory` }}/{{user `box_basename`}}.{{.Provider}}.box", - "type": "vagrant", - "vagrantfile_template": "{{template_dir}}/vagrantfile_templates/macosx.rb" - } - ], - "provisioners": [ - { - "destination": "/private/tmp/set_kcpassword.py", - "source": "{{template_dir}}/scripts/support/set_kcpassword.py", - "type": "file" - }, - { - "environment_vars": [ - "HOME_DIR=/Users/vagrant", - "AUTOLOGIN={{user `autologin`}}", - "http_proxy={{user `http_proxy`}}", - "https_proxy={{user `https_proxy`}}", - "no_proxy={{user `no_proxy`}}" - ], - "execute_command": "echo 'vagrant'| {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", - "expect_disconnect": true, - "scripts": [ - "{{template_dir}}/scripts/hostname.sh", - "{{template_dir}}/scripts/update.sh", - "{{template_dir}}/scripts/networking.sh", - "{{template_dir}}/scripts/disablesleep.sh", - "{{template_dir}}/scripts/vagrant.sh", - "{{template_dir}}/scripts/autologin.sh", - "{{template_dir}}/scripts/vmtools.sh", - "{{template_dir}}/scripts/cleanup.sh", - "{{template_dir}}/scripts/minimize.sh" - ], - "type": "shell" - } - ], - "variables": { - "_README": "You must provide a prepared Mac disk image (from https://github.com/timsutton/osx-vm-templates) and checksum value for this template to work. For more details, consult this project's README.md", - "autologin": "true", - "box_basename": "macosx-10.11", - "build_directory": "../../builds", - "build_timestamp": "{{isotime \"20060102150405\"}}", - "cpus": "1", - "disk_size": "65536", - "git_revision": "__unknown_git_revision__", - "headless": "", - "http_proxy": "{{env `http_proxy`}}", - "https_proxy": "{{env `https_proxy`}}", - "iso_checksum": "none", - "iso_url": "http://YOU-MUST-PROVIDE-YOUR-OWN-DMG.sorry", - "memory": "2048", - "name": "macosx-10.11", - "no_proxy": "{{env `no_proxy`}}", - "template": "macosx-10.11", - "version": "TIMESTAMP" - } -} - diff --git a/packer_templates/macos/scripts/autologin.sh b/packer_templates/macos/scripts/autologin.sh deleted file mode 100644 index f1ff1a102..000000000 --- a/packer_templates/macos/scripts/autologin.sh +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/sh -eux - -if [ "$AUTOLOGIN" != "true" ] && [ "$AUTOLOGIN" != "1" ] ; then - exit -fi - -# Generate /etc/kcpassword. It contains an encrypted password and allows to run -# the next command without a password prompt. -python /private/tmp/set_kcpassword.py "vagrant" - -# Enable the autologin for the 'vagrant' user -/usr/bin/defaults write /Library/Preferences/com.apple.loginwindow autoLoginUser "vagrant" diff --git a/packer_templates/macos/scripts/cleanup.sh b/packer_templates/macos/scripts/cleanup.sh deleted file mode 100644 index f99321138..000000000 --- a/packer_templates/macos/scripts/cleanup.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh -eux - -# eject installer disc -drutil eject; diff --git a/packer_templates/macos/scripts/disablesleep.sh b/packer_templates/macos/scripts/disablesleep.sh deleted file mode 100644 index 215b42bb8..000000000 --- a/packer_templates/macos/scripts/disablesleep.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh -eux - -# disable system sleep -pmset -a sleep 0 diff --git a/packer_templates/macos/scripts/hostname.sh b/packer_templates/macos/scripts/hostname.sh deleted file mode 100644 index 5cfe189eb..000000000 --- a/packer_templates/macos/scripts/hostname.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/sh -eux -# Major thanks to @timsutton's osx-vm-templates: -# https://github.com/timsutton/osx-vm-templates - -osx_minor_version="`sw_vers -productVersion | awk -F '.' '{print $2}'`"; - -# Set computer/hostname -computer_name="macosx-10-${osx_minor_version}"; -scutil --set ComputerName "$computer_name"; -scutil --set HostName "${computer_name}.vagrantup.com"; diff --git a/packer_templates/macos/scripts/minimize.sh b/packer_templates/macos/scripts/minimize.sh deleted file mode 100644 index 08b2f275c..000000000 --- a/packer_templates/macos/scripts/minimize.sh +++ /dev/null @@ -1,27 +0,0 @@ -#!/bin/sh -eux - -# Remove any sleepimage--a file the same size as the RAM footprint -rm -f /private/var/vm/sleepimage; - -# Stop the pager process and drop swap files. These will be re-created on boot -launchctl unload /System/Library/LaunchDaemons/com.apple.dynamic_pager.plist; -sleep 5; -rm -rf /private/var/vm/swap*; - -dd if=/dev/zero of=/EMPTY bs=1000000 || echo "dd exit code $? is suppressed"; -rm -f /EMPTY; -# Block until the empty file has been removed, otherwise, Packer -# will try to kill the box while the disk is still full and that's bad -sync; - - -case "$PACKER_BUILDER_TYPE" in - -vmware-iso|vmware-vmx) - sudo /Library/Application\ Support/VMware\ Tools/vmware-tools-cli disk shrink /; - ;; - -esac - -# re-enable swap -launchctl load -wF /System/Library/LaunchDaemons/com.apple.dynamic_pager.plist; diff --git a/packer_templates/macos/scripts/networking.sh b/packer_templates/macos/scripts/networking.sh deleted file mode 100644 index 8e32df866..000000000 --- a/packer_templates/macos/scripts/networking.sh +++ /dev/null @@ -1,32 +0,0 @@ -#!/bin/sh -eux - -# Thank you to https://github.com/timsutton/osx-vm-templates -# for the implementation - -# This script adds a Mac OS Launch Daemon, which runs every time the -# machine is booted. The daemon will re-detect the attached network -# interfaces. If this is not done, network devices may not work. -plist=/Library/LaunchDaemons/com.github.timsutton.osx-vm-templates.detectnewhardware.plist; - -cat <<PLIST >"$plist"; -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> -<plist version="1.0"> -<dict> - <key>Label</key> - <string>com.github.timsutton.osx-vm-templates.detectnewhardware</string> - <key>ProgramArguments</key> - <array> - <string>/usr/sbin/networksetup</string> - <string>-detectnewhardware</string> - </array> - <key>RunAtLoad</key> - <true/> -</dict> -</plist> -PLIST - -# These should be already set as follows, but since they're required -# in order to load properly, we set them explicitly. -chmod 644 "$plist"; -chown root:wheel "$plist"; diff --git a/packer_templates/macos/scripts/support/set_kcpassword.py b/packer_templates/macos/scripts/support/set_kcpassword.py deleted file mode 100644 index efa077e97..000000000 --- a/packer_templates/macos/scripts/support/set_kcpassword.py +++ /dev/null @@ -1,36 +0,0 @@ -#!/usr/bin/env python - -# Port of Gavin Brock's Perl kcpassword generator to Python, by Tom Taylor -# <tom@tomtaylor.co.uk>. -# Perl version: http://www.brock-family.org/gavin/perl/kcpassword.html - -import sys -import os - -def kcpassword(passwd): - # The magic 11 bytes - these are just repeated - # 0x7D 0x89 0x52 0x23 0xD2 0xBC 0xDD 0xEA 0xA3 0xB9 0x1F - key = [125,137,82,35,210,188,221,234,163,185,31] - key_len = len(key) - - passwd = [ord(x) for x in list(passwd)] - # pad passwd length out to an even multiple of key length - r = len(passwd) % key_len - if (r > 0): - passwd = passwd + [0] * (key_len - r) - - for n in range(0, len(passwd), len(key)): - ki = 0 - for j in range(n, min(n+len(key), len(passwd))): - passwd[j] = passwd[j] ^ key[ki] - ki += 1 - - passwd = [chr(x) for x in passwd] - return "".join(passwd) - -if __name__ == "__main__": - passwd = kcpassword(sys.argv[1]) - fd = os.open('/etc/kcpassword', os.O_WRONLY | os.O_CREAT, 0o600) - file = os.fdopen(fd, 'w') - file.write(passwd) - file.close() diff --git a/packer_templates/macos/scripts/update.sh b/packer_templates/macos/scripts/update.sh deleted file mode 100644 index e1415eb01..000000000 --- a/packer_templates/macos/scripts/update.sh +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/sh -eux - -MACOS_VERS=$(sw_vers -productVersion | awk -F "." '{print $2}') - -if [ "$MACOS_VERS" -le 11 ] ; then - softwareupdate --install --all; -fi - -# --force became an option in 10.12 (Sierra) and will fail on other versions -if [ "$MACOS_VERS" -ge 12 ] ; then - softwareupdate --background --force --verbose; - softwareupdate --install --all --force --verbose; - # vboxmanage_post commands fail without this sleep because the system - # is not done with the softwareupdate background checks - sleep 3; -fi diff --git a/packer_templates/macos/scripts/vagrant.sh b/packer_templates/macos/scripts/vagrant.sh deleted file mode 100644 index 993588e58..000000000 --- a/packer_templates/macos/scripts/vagrant.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/bash -eux - -pubkey_url="https://raw.githubusercontent.com/hashicorp/vagrant/master/keys/vagrant.pub"; -mkdir -p $HOME_DIR/.ssh; -if command -v wget >/dev/null 2>&1; then - wget --no-check-certificate "$pubkey_url" -O $HOME_DIR/.ssh/authorized_keys; -elif command -v curl >/dev/null 2>&1; then - curl --insecure --location "$pubkey_url" > $HOME_DIR/.ssh/authorized_keys; -else - echo "Cannot download vagrant public key"; - exit 1; -fi -chown -R vagrant $HOME_DIR/.ssh; -chmod -R go-rwsx $HOME_DIR/.ssh; diff --git a/packer_templates/macos/scripts/vmtools.sh b/packer_templates/macos/scripts/vmtools.sh deleted file mode 100644 index 78699941c..000000000 --- a/packer_templates/macos/scripts/vmtools.sh +++ /dev/null @@ -1,45 +0,0 @@ -#!/bin/sh -eux - -case "$PACKER_BUILDER_TYPE" in - -virtualbox-iso|virtualbox-ovf) - echo "VirtualBox not currently supported, sadface"; - ;; - -vmware-iso|vmware-vmx) - iso_name="/tmp/vmtools.iso"; - mount_point="`mktemp -d /tmp/vmware-tools.XXXX`"; - #Run install, unmount ISO and remove it - hdiutil attach "$iso_name" -mountpoint "$mount_point"; - installer -pkg "$mount_point/Install VMware Tools.app/Contents/Resources/VMware Tools.pkg" -target /; - # This usually fails - hdiutil detach "$mount_point" || true; - rm -f "$iso_name"; - rmdir "$mount_point"; - - # Point Linux shared folder root to that used by OS X guests, - # useful for the Hashicorp vmware_fusion Vagrant provider plugin - mkdir /mnt; - ln -sf /Volumes/VMware\ Shared\ Folders /mnt/hgfs; - ;; - -parallels-iso|parallels-pvm) - TOOLS_PATH="$HOME_DIR/prl-tools-mac.iso"; - TMPMOUNT="`/usr/bin/mktemp -d /tmp/parallels-tools.XXXX`"; - - #Run install, unmount ISO and remove it - hdiutil attach "$TOOLS_PATH" -mountpoint "$TMPMOUNT"; - echo "Installing Parallels Tools..." - installer -pkg "$TMPMOUNT/Install.app/Contents/Resources/Install.mpkg" -target /; - - # This usually fails - hdiutil detach "$TMPMOUNT" || true; - rmdir "$TMPMOUNT"; - rm -f "$TOOLS_PATH"; - ;; -*) - echo "Unknown Packer Builder Type >>${PACKER_BUILDER_TYPE}<< selected."; - echo "Known are virtualbox-iso|virtualbox-ovf|vmware-iso|vmware-vmx|parallels-iso|parallels-pvm."; - ;; - -esac diff --git a/packer_templates/macos/vagrantfile_templates/macosx.rb b/packer_templates/macos/vagrantfile_templates/macosx.rb deleted file mode 100644 index 33d06e14a..000000000 --- a/packer_templates/macos/vagrantfile_templates/macosx.rb +++ /dev/null @@ -1,7 +0,0 @@ -Vagrant.require_version ">= 1.7.3" - -Vagrant.configure(2) do |config| - config.vm.provider "virtualbox" do |_, override| - override.vm.synced_folder ".", "/vagrant", type: "rsync" - end -end From 51abf4f95e4abc336bc5c5f2d8bc36ee2c932a9e Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Fri, 23 Oct 2020 13:23:27 -0700 Subject: [PATCH 1286/1622] Update the readme copyright Signed-off-by: Tim Smith <tsmith@chef.io> --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 870d3546b..ce8734bba 100644 --- a/README.md +++ b/README.md @@ -143,7 +143,7 @@ macOS templates were adopted wholesale from [Fletcher Nichol's packer templates] - Author: Tom Duffield ([tom@chef.io](mailto:tom@chef.io)) ```text -Copyright 2012-2019, Chef Software, Inc. (<legal@chef.io>) +Copyright 2012-2020, Chef Software, Inc. (<legal@chef.io>) Copyright 2011-2012, Tim Dysinger (<tim@dysinger.net>) Licensed under the Apache License, Version 2.0 (the "License"); From 6afb962551a3ff6a8fb32b826c1e018d21fd3f9e Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Fri, 23 Oct 2020 13:40:50 -0700 Subject: [PATCH 1287/1622] Add log messages to the opensuse scripts Signed-off-by: Tim Smith <tsmith@chef.io> --- packer_templates/opensuse/scripts/cleanup.sh | 19 ++++++++----------- packer_templates/opensuse/scripts/update.sh | 3 ++- 2 files changed, 10 insertions(+), 12 deletions(-) diff --git a/packer_templates/opensuse/scripts/cleanup.sh b/packer_templates/opensuse/scripts/cleanup.sh index 7175f9db8..5226681a7 100644 --- a/packer_templates/opensuse/scripts/cleanup.sh +++ b/packer_templates/opensuse/scripts/cleanup.sh @@ -1,28 +1,25 @@ #!/bin/bash -eux -# These were only needed for building VMware/Virtualbox extensions: -zypper -n rm -u gcc make kernel-default-devel kernel-devel +echo "remove some bogus packages we don't need" +zypper -n rm -u wallpaper-branding release-notes sound-theme-freedesktop || true # don't fail if zypper fails (because it does sometimes) -# Remove some bogus packages we don't need and don't fail if zypper fails (because it does sometimes) -zypper -n rm -u wallpaper-branding release-notes sound-theme-freedesktop || true - -# cleanup all the downloaded RPMs +echo "cleanup all the downloaded RPMs" zypper clean --all -# Clean up network interface persistence +echo "clean up network interface persistence" rm -f /etc/udev/rules.d/70-persistent-net.rules; touch /etc/udev/rules.d/75-persistent-net-generator.rules; -# truncate any logs that have built up during the install +echo "truncate any logs that have built up during the install" find /var/log/ -type f -name "*.log.*" -exec rm -rf {} \; find /var/log -type f -exec truncate --size=0 {} \; -# remove the contents of /tmp and /var/tmp +echo "remove the contents of /tmp and /var/tmp" rm -rf /tmp/* /var/tmp/* -# Blank netplan machine-id (DUID) so machines get unique ID generated on boot. +echo "blank netplan machine-id (DUID) so machines get unique ID generated on boot" truncate -s 0 /etc/machine-id -# clear the history so our install isn't there +echo "clear the history so our install isn't there" rm -f /root/.wget-hsts export HISTSIZE=0 \ No newline at end of file diff --git a/packer_templates/opensuse/scripts/update.sh b/packer_templates/opensuse/scripts/update.sh index 11a0dce28..4da63d378 100644 --- a/packer_templates/opensuse/scripts/update.sh +++ b/packer_templates/opensuse/scripts/update.sh @@ -1,5 +1,6 @@ #!/bin/sh -eux -# Update all packages +echo "updating all packages" zypper update -y + reboot From c2cc2b1ebe5a1ec75a1555bd8b91e045064b6f42 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Fri, 23 Oct 2020 13:41:15 -0700 Subject: [PATCH 1288/1622] Move package installs for opensuse directly into the hypervisor scripts Signed-off-by: Tim Smith <tsmith@chef.io> --- packer_templates/_common/virtualbox.sh | 18 +++++++++++------- .../opensuse/opensuse-leap-15.2-x86_64.json | 1 - .../opensuse/scripts/add_packages.sh | 14 -------------- packer_templates/opensuse/scripts/vmware.sh | 2 +- 4 files changed, 12 insertions(+), 23 deletions(-) delete mode 100644 packer_templates/opensuse/scripts/add_packages.sh diff --git a/packer_templates/_common/virtualbox.sh b/packer_templates/_common/virtualbox.sh index bc8224d6b..0fc038384 100644 --- a/packer_templates/_common/virtualbox.sh +++ b/packer_templates/_common/virtualbox.sh @@ -15,13 +15,15 @@ virtualbox-iso|virtualbox-ovf) echo "installing deps necessary to compile kernel modules" # We install things like kernel-headers here vs. kickstart files so we make sure we install them for the updated kernel not the stock kernel if [ -f "/bin/dnf" ]; then - dnf install perl cpp gcc make bzip2 tar kernel-headers kernel-devel kernel-uek-devel -y || true # not all these packages are on every system + dnf install -y perl cpp gcc make bzip2 tar kernel-headers kernel-devel kernel-uek-devel || true # not all these packages are on every system elif [ -f "/bin/yum" ] || [ -f "/usr/bin/yum" ]; then - yum install perl cpp gcc make bzip2 tar kernel-headers kernel-devel kernel-uek-devel -y || true # not all these packages are on every system + yum install -y perl cpp gcc make bzip2 tar kernel-headers kernel-devel kernel-uek-devel || true # not all these packages are on every system elif [ -f "/usr/bin/apt-get" ]; then - apt-get install build-essential bzip2 tar -y + apt-get install -y build-essential bzip2 tar # avoid warnings and failures - apt-get remove cryptsetup-initramfs -y + apt-get remove -y cryptsetup-initramfs + elif [ -f "/usr/bin/zypper" ]; then + zypper install -y perl cpp gcc make bzip2 tar kernel-default-devel fi echo "installing the vbox additions" @@ -34,11 +36,13 @@ virtualbox-iso|virtualbox-ovf) echo "removing kernel dev packages and compilers we no longer need" if [ -f "/bin/dnf" ]; then - dnf remove gcc cpp kernel-headers kernel-devel kernel-uek-devel -y + dnf remove -y gcc cpp kernel-headers kernel-devel kernel-uek-devel elif [ -f "/bin/yum" ] || [ -f "/usr/bin/yum" ]; then - yum remove gcc cpp kernel-headers kernel-devel kernel-uek-devel -y + yum remove -y gcc cpp kernel-headers kernel-devel kernel-uek-devel elif [ -f "/usr/bin/apt-get" ]; then - apt-get remove gcc g++ make libc6-dev -y + apt-get remove -y gcc g++ make libc6-dev + elif [ -f "/usr/bin/zypper" ]; then + zypper -n rm -u kernel-default-devel gcc make fi echo "removing leftover logs" diff --git a/packer_templates/opensuse/opensuse-leap-15.2-x86_64.json b/packer_templates/opensuse/opensuse-leap-15.2-x86_64.json index bc903e1a3..f20346e97 100644 --- a/packer_templates/opensuse/opensuse-leap-15.2-x86_64.json +++ b/packer_templates/opensuse/opensuse-leap-15.2-x86_64.json @@ -148,7 +148,6 @@ "scripts": [ "{{template_dir}}/scripts/repositories.sh", "{{template_dir}}/scripts/update.sh", - "{{template_dir}}/scripts/add_packages.sh", "{{template_dir}}/../_common/motd.sh", "{{template_dir}}/../_common/sshd.sh", "{{template_dir}}/../_common/vagrant.sh", diff --git a/packer_templates/opensuse/scripts/add_packages.sh b/packer_templates/opensuse/scripts/add_packages.sh deleted file mode 100644 index 8eedd25dc..000000000 --- a/packer_templates/opensuse/scripts/add_packages.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/sh -eux - -# Install missing packages -zypper install -y kernel-default-devel gcc - -# make sure we have tools we need for the vm extensions -case "$PACKER_BUILDER_TYPE" in -virtualbox-iso|virtualbox-ovf) - zypper install -y bzip2; - ;; -vmware-iso) - zypper install -y insserv-compat; - ;; -esac \ No newline at end of file diff --git a/packer_templates/opensuse/scripts/vmware.sh b/packer_templates/opensuse/scripts/vmware.sh index d118b3780..1905bbdb5 100644 --- a/packer_templates/opensuse/scripts/vmware.sh +++ b/packer_templates/opensuse/scripts/vmware.sh @@ -2,7 +2,7 @@ case "$PACKER_BUILDER_TYPE" in vmware-iso|vmware-vmx) - zypper install -y open-vm-tools + zypper install -y open-vm-tools insserv-compat mkdir /mnt/hgfs systemctl enable vmtoolsd systemctl start vmtoolsd From 723de7758f737e9fb609d010033d3f398a79ae9c Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Fri, 23 Oct 2020 14:35:43 -0700 Subject: [PATCH 1289/1622] Take out the removal of cryptsetup-initramfs on Debian/Ubuntu Signed-off-by: Tim Smith <tsmith@chef.io> --- packer_templates/_common/virtualbox.sh | 2 -- 1 file changed, 2 deletions(-) diff --git a/packer_templates/_common/virtualbox.sh b/packer_templates/_common/virtualbox.sh index 0fc038384..c984bd442 100644 --- a/packer_templates/_common/virtualbox.sh +++ b/packer_templates/_common/virtualbox.sh @@ -20,8 +20,6 @@ virtualbox-iso|virtualbox-ovf) yum install -y perl cpp gcc make bzip2 tar kernel-headers kernel-devel kernel-uek-devel || true # not all these packages are on every system elif [ -f "/usr/bin/apt-get" ]; then apt-get install -y build-essential bzip2 tar - # avoid warnings and failures - apt-get remove -y cryptsetup-initramfs elif [ -f "/usr/bin/zypper" ]; then zypper install -y perl cpp gcc make bzip2 tar kernel-default-devel fi From 92dac54d64b197008ac839db9eaed8797821b5cb Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Fri, 23 Oct 2020 15:07:19 -0700 Subject: [PATCH 1290/1622] Make sure dkms is installed for vbox on ubuntu/debian Signed-off-by: Tim Smith <tsmith@chef.io> --- packer_templates/_common/virtualbox.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packer_templates/_common/virtualbox.sh b/packer_templates/_common/virtualbox.sh index c984bd442..bf09edb76 100644 --- a/packer_templates/_common/virtualbox.sh +++ b/packer_templates/_common/virtualbox.sh @@ -19,7 +19,7 @@ virtualbox-iso|virtualbox-ovf) elif [ -f "/bin/yum" ] || [ -f "/usr/bin/yum" ]; then yum install -y perl cpp gcc make bzip2 tar kernel-headers kernel-devel kernel-uek-devel || true # not all these packages are on every system elif [ -f "/usr/bin/apt-get" ]; then - apt-get install -y build-essential bzip2 tar + apt-get install -y build-essential dkms bzip2 tar elif [ -f "/usr/bin/zypper" ]; then zypper install -y perl cpp gcc make bzip2 tar kernel-default-devel fi @@ -38,7 +38,7 @@ virtualbox-iso|virtualbox-ovf) elif [ -f "/bin/yum" ] || [ -f "/usr/bin/yum" ]; then yum remove -y gcc cpp kernel-headers kernel-devel kernel-uek-devel elif [ -f "/usr/bin/apt-get" ]; then - apt-get remove -y gcc g++ make libc6-dev + apt-get remove -y gcc g++ make dkms libc6-dev elif [ -f "/usr/bin/zypper" ]; then zypper -n rm -u kernel-default-devel gcc make fi From 7c5e771d27c0da5b98e160b51d1a49baf1b27a1e Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Fri, 23 Oct 2020 15:07:42 -0700 Subject: [PATCH 1291/1622] Add log output for Ubuntu installs Signed-off-by: Tim Smith <tsmith@chef.io> --- packer_templates/ubuntu/scripts/cleanup.sh | 36 +++++++++++----------- packer_templates/ubuntu/scripts/hyperv.sh | 1 + packer_templates/ubuntu/scripts/update.sh | 10 +++--- packer_templates/ubuntu/scripts/vmware.sh | 1 + 4 files changed, 25 insertions(+), 23 deletions(-) diff --git a/packer_templates/ubuntu/scripts/cleanup.sh b/packer_templates/ubuntu/scripts/cleanup.sh index 41a3915d4..afebe0300 100644 --- a/packer_templates/ubuntu/scripts/cleanup.sh +++ b/packer_templates/ubuntu/scripts/cleanup.sh @@ -1,52 +1,51 @@ #!/bin/sh -eux -# Delete all Linux headers +echo "remove linux-headers" dpkg --list \ | awk '{ print $2 }' \ | grep 'linux-headers' \ | xargs apt-get -y purge; -# Remove specific Linux kernels, such as linux-image-3.11.0-15-generic but -# keeps the current kernel and does not touch the virtual packages, -# e.g. 'linux-image-generic', etc. +echo "remove specific Linux kernels, such as linux-image-3.11.0-15-generic but keeps the current kernel and does not touch the virtual packages" dpkg --list \ | awk '{ print $2 }' \ | grep 'linux-image-.*-generic' \ | grep -v `uname -r` \ | xargs apt-get -y purge; -# Delete Linux source +echo "remove linux-source package" dpkg --list \ | awk '{ print $2 }' \ | grep linux-source \ | xargs apt-get -y purge; -# Delete development packages +echo "remove all development packages" dpkg --list \ | awk '{ print $2 }' \ | grep -- '-dev$' \ | xargs apt-get -y purge; -# delete docs packages +echo "remove docs packages" dpkg --list \ | awk '{ print $2 }' \ | grep -- '-doc$' \ | xargs apt-get -y purge; -# Delete X11 libraries +echo "remove X11 libraries" apt-get -y purge libx11-data xauth libxmuu1 libxcb1 libx11-6 libxext6; -# Delete obsolete networking +echo "remove obsolete networking packages" apt-get -y purge ppp pppconfig pppoeconf; -# Delete oddities +echo "remove packages we don't need" apt-get -y purge popularity-contest installation-report command-not-found friendly-recovery bash-completion fonts-ubuntu-font-family-console laptop-detect; +echo "removing command-not-found-data" # 19.10+ don't have this package so fail gracefully apt-get -y purge command-not-found-data || true; # Exclude the files we don't need w/o uninstalling linux-firmware -echo "==> Setup dpkg excludes for linux-firmware" +echo "Setup dpkg excludes for linux-firmware" cat <<_EOF_ | cat >> /etc/dpkg/dpkg.cfg.d/excludes #BENTO-BEGIN path-exclude=/lib/firmware/* @@ -54,28 +53,29 @@ path-exclude=/usr/share/doc/linux-firmware/* #BENTO-END _EOF_ -# Delete the massive firmware packages +echo "delete the massive firmware files" rm -rf /lib/firmware/* rm -rf /usr/share/doc/linux-firmware/* +echo "autoremoving packages and cleaning apt data" apt-get -y autoremove; apt-get -y clean; -# Remove docs +echo "remove /usr/share/doc/" rm -rf /usr/share/doc/* -# Remove caches +echo "remove /var/cache" find /var/cache -type f -exec rm -rf {} \; -# truncate any logs that have built up during the install +echo "truncate any logs that have built up during the install" find /var/log -type f -exec truncate --size=0 {} \; -# Blank netplan machine-id (DUID) so machines get unique ID generated on boot. +echo "blank netplan machine-id (DUID) so machines get unique ID generated on boot" truncate -s 0 /etc/machine-id -# remove the contents of /tmp and /var/tmp +echo "remove the contents of /tmp and /var/tmp" rm -rf /tmp/* /var/tmp/* -# clear the history so our install isn't there +echo "clear the history so our install isn't there" rm -f /root/.wget-hsts export HISTSIZE=0 \ No newline at end of file diff --git a/packer_templates/ubuntu/scripts/hyperv.sh b/packer_templates/ubuntu/scripts/hyperv.sh index af379bcc0..454324408 100755 --- a/packer_templates/ubuntu/scripts/hyperv.sh +++ b/packer_templates/ubuntu/scripts/hyperv.sh @@ -4,6 +4,7 @@ major_version="`echo $ubuntu_version | awk -F. '{print $1}'`"; case "$PACKER_BUILDER_TYPE" in hyperv-iso) + echo "installing packaging for hyper-v" if [ "$major_version" -eq "16" ]; then apt-get install -y linux-tools-virtual-lts-xenial linux-cloud-tools-virtual-lts-xenial; else diff --git a/packer_templates/ubuntu/scripts/update.sh b/packer_templates/ubuntu/scripts/update.sh index de3f941bc..8d6f4df73 100644 --- a/packer_templates/ubuntu/scripts/update.sh +++ b/packer_templates/ubuntu/scripts/update.sh @@ -1,10 +1,10 @@ #!/bin/sh -eux export DEBIAN_FRONTEND=noninteractive -# Disable release-upgrades +echo "disable release-upgrades" sed -i.bak 's/^Prompt=.*$/Prompt=never/' /etc/update-manager/release-upgrades; -# Disable systemd apt timers/services +echo "disable systemd apt timers/services" systemctl stop apt-daily.timer; systemctl stop apt-daily-upgrade.timer; systemctl disable apt-daily.timer; @@ -22,14 +22,14 @@ APT::Periodic::AutocleanInterval "0"; APT::Periodic::Unattended-Upgrade "0"; EOF -# Clean and nuke the package from orbit +echo "remove the unattended-upgrades package" rm -rf /var/log/unattended-upgrades; apt-get -y purge unattended-upgrades; -# Update the package list +echo "update the package list" apt-get -y update; -# Upgrade all installed packages incl. kernel and kernel headers +echo "upgrade all installed packages incl. kernel and kernel headers" apt-get -y dist-upgrade -o Dpkg::Options::="--force-confnew"; reboot diff --git a/packer_templates/ubuntu/scripts/vmware.sh b/packer_templates/ubuntu/scripts/vmware.sh index 0f23f5547..1409a8bd6 100644 --- a/packer_templates/ubuntu/scripts/vmware.sh +++ b/packer_templates/ubuntu/scripts/vmware.sh @@ -2,6 +2,7 @@ case "$PACKER_BUILDER_TYPE" in vmware-iso|vmware-vmx) + echo "install open-vm-tools" apt-get install -y open-vm-tools; mkdir /mnt/hgfs; systemctl enable open-vm-tools From 12795febaecfa3fcfb17258b2958e739d36a3945 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Fri, 23 Oct 2020 15:49:57 -0700 Subject: [PATCH 1292/1622] Make sure we have kernel headers on debian/ubuntu with vbox Signed-off-by: Tim Smith <tsmith@chef.io> --- packer_templates/_common/virtualbox.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packer_templates/_common/virtualbox.sh b/packer_templates/_common/virtualbox.sh index bf09edb76..5822f04ee 100644 --- a/packer_templates/_common/virtualbox.sh +++ b/packer_templates/_common/virtualbox.sh @@ -19,7 +19,7 @@ virtualbox-iso|virtualbox-ovf) elif [ -f "/bin/yum" ] || [ -f "/usr/bin/yum" ]; then yum install -y perl cpp gcc make bzip2 tar kernel-headers kernel-devel kernel-uek-devel || true # not all these packages are on every system elif [ -f "/usr/bin/apt-get" ]; then - apt-get install -y build-essential dkms bzip2 tar + apt-get install -y build-essential dkms bzip2 tar linux-headers-`uname -r` elif [ -f "/usr/bin/zypper" ]; then zypper install -y perl cpp gcc make bzip2 tar kernel-default-devel fi From 8ef41672d41a23aa86699e7d23a85380d279b138 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Fri, 23 Oct 2020 16:41:09 -0700 Subject: [PATCH 1293/1622] Remove old modules packages on Ubuntu Signed-off-by: Tim Smith <tsmith@chef.io> --- packer_templates/ubuntu/scripts/cleanup.sh | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/packer_templates/ubuntu/scripts/cleanup.sh b/packer_templates/ubuntu/scripts/cleanup.sh index afebe0300..73ed17dba 100644 --- a/packer_templates/ubuntu/scripts/cleanup.sh +++ b/packer_templates/ubuntu/scripts/cleanup.sh @@ -13,6 +13,13 @@ dpkg --list \ | grep -v `uname -r` \ | xargs apt-get -y purge; +echo "remove old kernel modules packages" +dpkg --list \ + | awk '{ print $2 }' \ + | grep 'linux-modules-.*-generic' \ + | grep -v `uname -r` \ + | xargs apt-get -y purge; + echo "remove linux-source package" dpkg --list \ | awk '{ print $2 }' \ From ca42ab28a473b84e863f3d0065ecfe49818c80a2 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Fri, 23 Oct 2020 16:41:39 -0700 Subject: [PATCH 1294/1622] Remove motd-news-config, usb-utils, grub-legacy-ec2, and fronts-ubuntu-console packages Signed-off-by: Tim Smith <tsmith@chef.io> --- packer_templates/ubuntu/scripts/cleanup.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packer_templates/ubuntu/scripts/cleanup.sh b/packer_templates/ubuntu/scripts/cleanup.sh index 73ed17dba..4751b9e7c 100644 --- a/packer_templates/ubuntu/scripts/cleanup.sh +++ b/packer_templates/ubuntu/scripts/cleanup.sh @@ -45,7 +45,7 @@ echo "remove obsolete networking packages" apt-get -y purge ppp pppconfig pppoeconf; echo "remove packages we don't need" -apt-get -y purge popularity-contest installation-report command-not-found friendly-recovery bash-completion fonts-ubuntu-font-family-console laptop-detect; +apt-get -y purge popularity-contest installation-report command-not-found friendly-recovery bash-completion fonts-ubuntu-font-family-console laptop-detect motd-news-config usbutils grub-legacy-ec2 fonts-ubuntu-console; echo "removing command-not-found-data" # 19.10+ don't have this package so fail gracefully From 6921eb35736a52508a37c15fe9c62ff1944b775d Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Fri, 23 Oct 2020 16:41:59 -0700 Subject: [PATCH 1295/1622] Remove ubuntu-release-upgrader-core package Signed-off-by: Tim Smith <tsmith@chef.io> --- packer_templates/ubuntu/scripts/update.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packer_templates/ubuntu/scripts/update.sh b/packer_templates/ubuntu/scripts/update.sh index 8d6f4df73..79ca01b65 100644 --- a/packer_templates/ubuntu/scripts/update.sh +++ b/packer_templates/ubuntu/scripts/update.sh @@ -22,9 +22,9 @@ APT::Periodic::AutocleanInterval "0"; APT::Periodic::Unattended-Upgrade "0"; EOF -echo "remove the unattended-upgrades package" +echo "remove the unattended-upgrades and ubuntu-release-upgrader-core packages" rm -rf /var/log/unattended-upgrades; -apt-get -y purge unattended-upgrades; +apt-get -y purge unattended-upgrades ubuntu-release-upgrader-core; echo "update the package list" apt-get -y update; From 5f4f8402c82517dc332fb82c87e4cf7c04556160 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Fri, 23 Oct 2020 16:42:44 -0700 Subject: [PATCH 1296/1622] Properly cleanup dev/kernel packages post vbox install on debian/ubuntu Signed-off-by: Tim Smith <tsmith@chef.io> --- packer_templates/_common/virtualbox.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packer_templates/_common/virtualbox.sh b/packer_templates/_common/virtualbox.sh index 5822f04ee..bb560da92 100644 --- a/packer_templates/_common/virtualbox.sh +++ b/packer_templates/_common/virtualbox.sh @@ -38,7 +38,7 @@ virtualbox-iso|virtualbox-ovf) elif [ -f "/bin/yum" ] || [ -f "/usr/bin/yum" ]; then yum remove -y gcc cpp kernel-headers kernel-devel kernel-uek-devel elif [ -f "/usr/bin/apt-get" ]; then - apt-get remove -y gcc g++ make dkms libc6-dev + apt-get remove -y build-essential gcc g++ make libc6-dev dkms linux-headers-`uname -r` elif [ -f "/usr/bin/zypper" ]; then zypper -n rm -u kernel-default-devel gcc make fi From 49b3df83c0742bde03a87ac24aec69fff003b321 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Fri, 23 Oct 2020 16:43:23 -0700 Subject: [PATCH 1297/1622] Try a different method of determining if vbox correctly installed This installer is terrible Signed-off-by: Tim Smith <tsmith@chef.io> --- packer_templates/_common/virtualbox.sh | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/packer_templates/_common/virtualbox.sh b/packer_templates/_common/virtualbox.sh index bb560da92..fc961ad73 100644 --- a/packer_templates/_common/virtualbox.sh +++ b/packer_templates/_common/virtualbox.sh @@ -25,8 +25,14 @@ virtualbox-iso|virtualbox-ovf) fi echo "installing the vbox additions" - sh /tmp/vbox/VBoxLinuxAdditions.run --nox11 + # this install script fails with non-zero exit codes for no apparent reason so we need better ways to know if it worked + /tmp/vbox/VBoxLinuxAdditions.run --nox11 || true + if ! modinfo vboxsf >/dev/null 2>&1; then + echo "Cannot find vbox kernel module. Installation of guest additions unsuccessful!" + exit 1 + fi + echo "unmounting and removing the vbox ISO" umount /tmp/vbox; rm -rf /tmp/vbox; From 74eddf49e19d5fed74963151d14656efb5b66353 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Fri, 23 Oct 2020 19:23:28 -0700 Subject: [PATCH 1298/1622] Don't fail on old Ubuntu Signed-off-by: Tim Smith <tsmith@chef.io> --- packer_templates/ubuntu/scripts/cleanup.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/packer_templates/ubuntu/scripts/cleanup.sh b/packer_templates/ubuntu/scripts/cleanup.sh index 4751b9e7c..28556d6e1 100644 --- a/packer_templates/ubuntu/scripts/cleanup.sh +++ b/packer_templates/ubuntu/scripts/cleanup.sh @@ -45,7 +45,10 @@ echo "remove obsolete networking packages" apt-get -y purge ppp pppconfig pppoeconf; echo "remove packages we don't need" -apt-get -y purge popularity-contest installation-report command-not-found friendly-recovery bash-completion fonts-ubuntu-font-family-console laptop-detect motd-news-config usbutils grub-legacy-ec2 fonts-ubuntu-console; +apt-get -y purge popularity-contest installation-report command-not-found friendly-recovery bash-completion fonts-ubuntu-font-family-console laptop-detect motd-news-config usbutils grub-legacy-ec2; + +echo "remove the console font" +apt-get -y purge fonts-ubuntu-console || true; echo "removing command-not-found-data" # 19.10+ don't have this package so fail gracefully From 54f45a395daff5ccf8feb956bb7b6ce7c524c029 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Sat, 24 Oct 2020 12:42:44 -0700 Subject: [PATCH 1299/1622] Cleanup the tmp dir on Debian Signed-off-by: Tim Smith <tsmith@chef.io> --- packer_templates/debian/scripts/cleanup.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/packer_templates/debian/scripts/cleanup.sh b/packer_templates/debian/scripts/cleanup.sh index b37ef0c08..414a53bb8 100644 --- a/packer_templates/debian/scripts/cleanup.sh +++ b/packer_templates/debian/scripts/cleanup.sh @@ -46,7 +46,10 @@ find /var/log -type f -exec truncate --size=0 {} \; # Blank netplan machine-id (DUID) so machines get unique ID generated on boot. truncate -s 0 /etc/machine-id -# force a new random seed to be generated +echo "remove the contents of /tmp and /var/tmp" +rm -rf /tmp/* /var/tmp/* + +echo "force a new random seed to be generated" rm -f /var/lib/systemd/random-seed # clear the history so our install isn't there From 7daba410e9c10891d73395da60e5168f980df841 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Sat, 24 Oct 2020 12:43:12 -0700 Subject: [PATCH 1300/1622] Cleanup /var/cache on Debian Signed-off-by: Tim Smith <tsmith@chef.io> --- packer_templates/debian/scripts/cleanup.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/packer_templates/debian/scripts/cleanup.sh b/packer_templates/debian/scripts/cleanup.sh index 414a53bb8..5378d069b 100644 --- a/packer_templates/debian/scripts/cleanup.sh +++ b/packer_templates/debian/scripts/cleanup.sh @@ -40,7 +40,10 @@ apt-get -y purge installation-report; apt-get -y autoremove; apt-get -y clean; -# truncate any logs that have built up during the install +echo "remove /var/cache" +find /var/cache -type f -exec rm -rf {} \; + +echo "truncate any logs that have built up during the install" find /var/log -type f -exec truncate --size=0 {} \; # Blank netplan machine-id (DUID) so machines get unique ID generated on boot. From f05b2ddd678223319308db069bc064ff7d56a703 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Sat, 24 Oct 2020 12:43:46 -0700 Subject: [PATCH 1301/1622] Properly cleanup amd64 dev packages on Ubuntu / Debian Signed-off-by: Tim Smith <tsmith@chef.io> --- packer_templates/debian/scripts/cleanup.sh | 4 ++-- packer_templates/ubuntu/scripts/cleanup.sh | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packer_templates/debian/scripts/cleanup.sh b/packer_templates/debian/scripts/cleanup.sh index 5378d069b..52d7e4da4 100644 --- a/packer_templates/debian/scripts/cleanup.sh +++ b/packer_templates/debian/scripts/cleanup.sh @@ -21,10 +21,10 @@ dpkg --list \ | grep linux-source \ | xargs apt-get -y purge; -# Delete development packages +echo "remove all development packages" dpkg --list \ | awk '{ print $2 }' \ - | grep -- '-dev$' \ + | grep -- '-dev\(:[a-z0-9]\+\)\?$' \ | xargs apt-get -y purge; # Delete X11 libraries diff --git a/packer_templates/ubuntu/scripts/cleanup.sh b/packer_templates/ubuntu/scripts/cleanup.sh index 28556d6e1..4e503842e 100644 --- a/packer_templates/ubuntu/scripts/cleanup.sh +++ b/packer_templates/ubuntu/scripts/cleanup.sh @@ -29,7 +29,7 @@ dpkg --list \ echo "remove all development packages" dpkg --list \ | awk '{ print $2 }' \ - | grep -- '-dev$' \ + | grep -- '-dev\(:[a-z0-9]\+\)\?$' \ | xargs apt-get -y purge; echo "remove docs packages" From a24382501669170293622f12f327d384caed665d Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Sat, 24 Oct 2020 12:44:26 -0700 Subject: [PATCH 1302/1622] Add log output for the Debian cleanup tasks Signed-off-by: Tim Smith <tsmith@chef.io> --- packer_templates/debian/scripts/cleanup.sh | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/packer_templates/debian/scripts/cleanup.sh b/packer_templates/debian/scripts/cleanup.sh index 52d7e4da4..5b589a6d3 100644 --- a/packer_templates/debian/scripts/cleanup.sh +++ b/packer_templates/debian/scripts/cleanup.sh @@ -1,21 +1,19 @@ #!/bin/sh -eux -# Delete all Linux headers +echo "remove linux-headers" dpkg --list \ | awk '{ print $2 }' \ | grep 'linux-headers' \ | xargs apt-get -y purge; -# Remove specific Linux kernels, such as linux-image-3.11.0-15 but -# keeps the current kernel and does not touch the virtual packages, -# e.g. 'linux-image-amd64', etc. +echo "remove specific Linux kernels, such as linux-image-4.9.0-13-amd64 but keeps the current kernel and does not touch the virtual packages" dpkg --list \ | awk '{ print $2 }' \ | grep 'linux-image-[234].*' \ | grep -v `uname -r` \ | xargs apt-get -y purge; -# Delete Linux source +echo "remove linux-source package" dpkg --list \ | awk '{ print $2 }' \ | grep linux-source \ @@ -27,16 +25,19 @@ dpkg --list \ | grep -- '-dev\(:[a-z0-9]\+\)\?$' \ | xargs apt-get -y purge; -# Delete X11 libraries +echo "remove X11 libraries" apt-get -y purge libx11-data xauth libxmuu1 libxcb1 libx11-6 libxext6; -# Delete obsolete networking +echo "remove obsolete networking packages" apt-get -y purge ppp pppconfig pppoeconf; -# Delete oddities +echo "remove popularity-contest package" apt-get -y purge popularity-contest; + +echo "remove installation-report package" apt-get -y purge installation-report; +echo "autoremoving packages and cleaning apt data" apt-get -y autoremove; apt-get -y clean; @@ -46,7 +47,7 @@ find /var/cache -type f -exec rm -rf {} \; echo "truncate any logs that have built up during the install" find /var/log -type f -exec truncate --size=0 {} \; -# Blank netplan machine-id (DUID) so machines get unique ID generated on boot. +echo "blank netplan machine-id (DUID) so machines get unique ID generated on boot" truncate -s 0 /etc/machine-id echo "remove the contents of /tmp and /var/tmp" @@ -55,6 +56,6 @@ rm -rf /tmp/* /var/tmp/* echo "force a new random seed to be generated" rm -f /var/lib/systemd/random-seed -# clear the history so our install isn't there +echo "clear the history so our install isn't there" rm -f /root/.wget-hsts export HISTSIZE=0 \ No newline at end of file From b1098c93b350e7023f99e9a76d5b12e3cad6ad6f Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Sat, 24 Oct 2020 14:16:09 -0700 Subject: [PATCH 1303/1622] Remove the random-seed file on Ubuntu Signed-off-by: Tim Smith <tsmith@chef.io> --- packer_templates/ubuntu/scripts/cleanup.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/packer_templates/ubuntu/scripts/cleanup.sh b/packer_templates/ubuntu/scripts/cleanup.sh index 4e503842e..aa30ccbe1 100644 --- a/packer_templates/ubuntu/scripts/cleanup.sh +++ b/packer_templates/ubuntu/scripts/cleanup.sh @@ -86,6 +86,9 @@ truncate -s 0 /etc/machine-id echo "remove the contents of /tmp and /var/tmp" rm -rf /tmp/* /var/tmp/* +echo "force a new random seed to be generated" +rm -f /var/lib/systemd/random-seed + echo "clear the history so our install isn't there" rm -f /root/.wget-hsts export HISTSIZE=0 \ No newline at end of file From 1ad41767ca8c60dcab24a3e7de6d7a4cdaa800f8 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Sat, 24 Oct 2020 14:56:13 -0700 Subject: [PATCH 1304/1622] Drop the grub menu timeout to 1 sec on Amazon Linux as well Signed-off-by: Tim Smith <tsmith@chef.io> --- packer_templates/centos/scripts/cleanup.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packer_templates/centos/scripts/cleanup.sh b/packer_templates/centos/scripts/cleanup.sh index eebcd2b2c..5391e370d 100644 --- a/packer_templates/centos/scripts/cleanup.sh +++ b/packer_templates/centos/scripts/cleanup.sh @@ -7,7 +7,7 @@ major_version="`sed 's/^.\+ release \([.0-9]\+\).*/\1/' /etc/redhat-release | aw # reduce the grub menu time to 1 second -if [ "$major_version" -ge 7 ]; then +if ! [ "$major_version" -eq 6 ]; then sed -i -e 's/^GRUB_TIMEOUT=[0-9]\+$/GRUB_TIMEOUT=1/' /etc/default/grub grub2-mkconfig -o /boot/grub2/grub.cfg fi From b92f06e0a0b9fe14b0277e78c8f3c1ea3780dcdd Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Sat, 24 Oct 2020 15:07:04 -0700 Subject: [PATCH 1305/1622] Add more log output for centos cleanup Signed-off-by: Tim Smith <tsmith@chef.io> --- packer_templates/centos/scripts/cleanup.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/packer_templates/centos/scripts/cleanup.sh b/packer_templates/centos/scripts/cleanup.sh index 5391e370d..0651a7c04 100644 --- a/packer_templates/centos/scripts/cleanup.sh +++ b/packer_templates/centos/scripts/cleanup.sh @@ -6,7 +6,7 @@ distro="`rpm -qf --queryformat '%{NAME}' /etc/redhat-release | cut -f 1 -d '-'`" major_version="`sed 's/^.\+ release \([.0-9]\+\).*/\1/' /etc/redhat-release | awk -F. '{print $1}'`"; -# reduce the grub menu time to 1 second +echo "reduce the grub menu time to 1 second" if ! [ "$major_version" -eq 6 ]; then sed -i -e 's/^GRUB_TIMEOUT=[0-9]\+$/GRUB_TIMEOUT=1/' /etc/default/grub grub2-mkconfig -o /boot/grub2/grub.cfg @@ -29,8 +29,9 @@ if [ "$major_version" -ge 8 ]; then echo "Remove previous kernels that preserved for rollbacks" dnf -y remove -y $(dnf repoquery --installonly --latest-limit=-1 -q) else + echo "Remove previous kernels that preserved for rollbacks" if ! command -v package-cleanup >/dev/null 2>&1; then - yum -y install yum-utils + yum -y install yum-utils fi package-cleanup --oldkernels --count=1 -y fi From eb97fa29e241b9faeeb59bfeac8c2b454525e3c7 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Sat, 24 Oct 2020 15:07:26 -0700 Subject: [PATCH 1306/1622] Remove network cleanup from Amazon that never ran Signed-off-by: Tim Smith <tsmith@chef.io> --- .../amazonlinux/scripts/cleanup.sh | 31 ------------------- 1 file changed, 31 deletions(-) diff --git a/packer_templates/amazonlinux/scripts/cleanup.sh b/packer_templates/amazonlinux/scripts/cleanup.sh index 86069ccb8..2acfcbd2e 100644 --- a/packer_templates/amazonlinux/scripts/cleanup.sh +++ b/packer_templates/amazonlinux/scripts/cleanup.sh @@ -19,37 +19,6 @@ for ndev in `ls -1 /etc/sysconfig/network-scripts/ifcfg-*`; do fi done -# new-style network device naming for centos7 -if grep -q -i "release 7" /etc/redhat-release ; then - # radio off & remove all interface configration - nmcli radio all off - /bin/systemctl stop NetworkManager.service - for ifcfg in `ls /etc/sysconfig/network-scripts/ifcfg-* |grep -v ifcfg-lo` ; do - rm -f $ifcfg - done - rm -rf /var/lib/NetworkManager/* - - echo "==> Setup /etc/rc.d/rc.local for CentOS7" - cat <<_EOF_ | cat >> /etc/rc.d/rc.local -#BENTO-BEGIN -LANG=C -# delete all connection -for con in \`nmcli -t -f uuid con\`; do - if [ "\$con" != "" ]; then - nmcli con del \$con - fi -done -# add gateway interface connection. -gwdev=\`nmcli dev | grep ethernet | egrep -v 'unmanaged' | head -n 1 | awk '{print \$1}'\` -if [ "\$gwdev" != "" ]; then - nmcli c add type eth ifname \$gwdev con-name \$gwdev -fi -sed -i "/^#BENTO-BEGIN/,/^#BENTO-END/d" /etc/rc.d/rc.local -chmod -x /etc/rc.d/rc.local -#BENTO-END -_EOF_ - chmod +x /etc/rc.d/rc.local -fi # truncate any logs that have built up during the install find /var/log -type f -exec truncate --size=0 {} \; From 2c7b9283c0aaf8f8461e51120df01ba32b19d7b1 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Sat, 24 Oct 2020 15:08:03 -0700 Subject: [PATCH 1307/1622] Remove the machine-id on Amazon Linux Signed-off-by: Tim Smith <tsmith@chef.io> --- packer_templates/amazonlinux/scripts/cleanup.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/packer_templates/amazonlinux/scripts/cleanup.sh b/packer_templates/amazonlinux/scripts/cleanup.sh index 2acfcbd2e..20b45df2f 100644 --- a/packer_templates/amazonlinux/scripts/cleanup.sh +++ b/packer_templates/amazonlinux/scripts/cleanup.sh @@ -33,6 +33,9 @@ rm -rf /tmp/* /var/tmp/* # force a new random seed to be generated rm -f /var/lib/systemd/random-seed -# clear the history so our install isn't there +echo "Wipe netplan machine-id (DUID) so machines get unique ID generated on boot" +truncate -s 0 /etc/machine-id + +echo "Clear the history so our install commands aren't there" rm -f /root/.wget-hsts export HISTSIZE=0 \ No newline at end of file From c1a5395ee0aa21bcde70a6b5c6dcdc19a3ad3bf0 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Sat, 24 Oct 2020 18:06:45 -0700 Subject: [PATCH 1308/1622] Expand what we cleanup on Amazon Linux to match CentOS Signed-off-by: Tim Smith <tsmith@chef.io> --- .../amazonlinux/scripts/cleanup.sh | 28 +++++++++++-------- 1 file changed, 17 insertions(+), 11 deletions(-) diff --git a/packer_templates/amazonlinux/scripts/cleanup.sh b/packer_templates/amazonlinux/scripts/cleanup.sh index 20b45df2f..338c1617a 100644 --- a/packer_templates/amazonlinux/scripts/cleanup.sh +++ b/packer_templates/amazonlinux/scripts/cleanup.sh @@ -1,10 +1,20 @@ #!/bin/sh -eux -# should output one of 'redhat' 'centos' 'oraclelinux' -distro="`rpm -qf --queryformat '%{NAME}' /etc/redhat-release | cut -f 1 -d '-'`" +echo "reduce the grub menu time to 1 second" + sed -i -e 's/^GRUB_TIMEOUT=[0-9]\+$/GRUB_TIMEOUT=1/' /etc/default/grub + grub2-mkconfig -o /boot/grub2/grub.cfg -# Remove development and kernel source packages -yum -y remove gcc cpp kernel-devel kernel-headers; +echo "Remove development and kernel source packages" +yum -y remove gcc cpp gc kernel-devel kernel-headers glibc-devel elfutils-libelf-devel glibc-headers kernel-devel kernel-headers + +echo "Remove previous kernels that preserved for rollbacks" +if ! command -v package-cleanup >/dev/null 2>&1; then + yum -y install yum-utils +fi +package-cleanup --oldkernels --count=1 -y + +echo "clean all package cache information" +yum -y clean all --enablerepo=\*; # Clean up network interface persistence rm -f /etc/udev/rules.d/70-persistent-net.rules; @@ -20,17 +30,13 @@ for ndev in `ls -1 /etc/sysconfig/network-scripts/ifcfg-*`; do done -# truncate any logs that have built up during the install +echo "truncate any logs that have built up during the install" find /var/log -type f -exec truncate --size=0 {} \; -# remove previous kernels that yum preserved for rollback -yum install -y yum-utils -package-cleanup --oldkernels --count=1 -y - -# remove the contents of /tmp and /var/tmp +echo "remove the contents of /tmp and /var/tmp" rm -rf /tmp/* /var/tmp/* -# force a new random seed to be generated +echo "Force a new random seed to be generated" rm -f /var/lib/systemd/random-seed echo "Wipe netplan machine-id (DUID) so machines get unique ID generated on boot" From 28e4b2073875b9407fa0e85641bc6a80cd13acf1 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Sat, 24 Oct 2020 18:07:00 -0700 Subject: [PATCH 1309/1622] Remove OneDrive on Windows Signed-off-by: Tim Smith <tsmith@chef.io> --- packer_templates/windows/cookbooks/packer/recipes/cleanup.rb | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/packer_templates/windows/cookbooks/packer/recipes/cleanup.rb b/packer_templates/windows/cookbooks/packer/recipes/cleanup.rb index 4dcf102e6..6d2695ff8 100644 --- a/packer_templates/windows/cookbooks/packer/recipes/cleanup.rb +++ b/packer_templates/windows/cookbooks/packer/recipes/cleanup.rb @@ -1,3 +1,8 @@ +# OneDrive takes up 150 megs and isn't needed for testing +windows_package 'Microsoft OneDrive' do + action :remove +end + execute 'run cleanmgr' do command 'C:\Windows\System32\cleanmgr.exe /sagerun:10' ignore_failure true From 3207706bcc3bf93973f4f6eb1e5c0b3091fb8b25 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Sat, 24 Oct 2020 18:07:17 -0700 Subject: [PATCH 1310/1622] Update to the latest UltraDefrag on Windows Signed-off-by: Tim Smith <tsmith@chef.io> --- packer_templates/windows/cookbooks/packer/recipes/defrag.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packer_templates/windows/cookbooks/packer/recipes/defrag.rb b/packer_templates/windows/cookbooks/packer/recipes/defrag.rb index aff9ab268..fcd4c170d 100644 --- a/packer_templates/windows/cookbooks/packer/recipes/defrag.rb +++ b/packer_templates/windows/cookbooks/packer/recipes/defrag.rb @@ -1,5 +1,5 @@ remote_file ::File.join(Chef::Config[:file_cache_path], 'ultradefrag.zip') do - source 'http://downloads.sourceforge.net/ultradefrag/ultradefrag-portable-7.0.2.bin.amd64.zip' + source 'http://downloads.sourceforge.net/ultradefrag/ultradefrag-portable-7.1.4.bin.amd64.zip' action :create end From cab5904e73c2cb5db46eb2eb80e9ec01ce98f049 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Sat, 24 Oct 2020 19:44:35 -0700 Subject: [PATCH 1311/1622] Remove Skype on Windows Signed-off-by: Tim Smith <tsmith@chef.io> --- packer_templates/windows/cookbooks/packer/recipes/cleanup.rb | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/packer_templates/windows/cookbooks/packer/recipes/cleanup.rb b/packer_templates/windows/cookbooks/packer/recipes/cleanup.rb index 6d2695ff8..7ea775ae1 100644 --- a/packer_templates/windows/cookbooks/packer/recipes/cleanup.rb +++ b/packer_templates/windows/cookbooks/packer/recipes/cleanup.rb @@ -3,6 +3,11 @@ action :remove end +# Skype takes up 26 megs +windows_package 'Skype' do + action :remove +end + execute 'run cleanmgr' do command 'C:\Windows\System32\cleanmgr.exe /sagerun:10' ignore_failure true From dbbe2f0541690d619f4cb4cfaffc0a3dc43b223b Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Sat, 24 Oct 2020 20:04:03 -0700 Subject: [PATCH 1312/1622] Stop disabling onedrive when we've just removed it Signed-off-by: Tim Smith <tsmith@chef.io> --- .../windows/cookbooks/packer/recipes/disable_onedrive.rb | 5 ----- packer_templates/windows/windows-10.json | 2 -- packer_templates/windows/windows-10gen2.json | 2 -- 3 files changed, 9 deletions(-) delete mode 100644 packer_templates/windows/cookbooks/packer/recipes/disable_onedrive.rb diff --git a/packer_templates/windows/cookbooks/packer/recipes/disable_onedrive.rb b/packer_templates/windows/cookbooks/packer/recipes/disable_onedrive.rb deleted file mode 100644 index a6d719c02..000000000 --- a/packer_templates/windows/cookbooks/packer/recipes/disable_onedrive.rb +++ /dev/null @@ -1,5 +0,0 @@ -# this causes onedrive to load then instantly exit -registry_key 'HKEY_LOCAL_MACHINE\Software\Policies\Microsoft\Windows\OneDrive' do - values [{ name: 'DisableFileSyncNGSC', type: :dword, data: 1 }] - action :create -end diff --git a/packer_templates/windows/windows-10.json b/packer_templates/windows/windows-10.json index 185f86fbb..204030402 100644 --- a/packer_templates/windows/windows-10.json +++ b/packer_templates/windows/windows-10.json @@ -174,7 +174,6 @@ "guest_os_type": "windows", "run_list": [ "packer::disable_uac", - "packer::disable_onedrive", "packer::disable_restore", "packer::disable_windows_update", "packer::remove_defender", @@ -238,4 +237,3 @@ "virtio_win_iso": "~/virtio-win.iso" } } - diff --git a/packer_templates/windows/windows-10gen2.json b/packer_templates/windows/windows-10gen2.json index 206348b09..9891cf184 100644 --- a/packer_templates/windows/windows-10gen2.json +++ b/packer_templates/windows/windows-10gen2.json @@ -42,7 +42,6 @@ "guest_os_type": "windows", "run_list": [ "packer::disable_uac", - "packer::disable_onedrive", "packer::disable_restore", "packer::disable_windows_update", "packer::remove_defender", @@ -116,4 +115,3 @@ "working_directory": "" } } - From 712ebe893f8951e2585e6eff774a3b7d446ad30a Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Sat, 24 Oct 2020 20:04:20 -0700 Subject: [PATCH 1313/1622] Stream output on our long running cleanup executes Signed-off-by: Tim Smith <tsmith@chef.io> --- packer_templates/windows/cookbooks/packer/recipes/cleanup.rb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/packer_templates/windows/cookbooks/packer/recipes/cleanup.rb b/packer_templates/windows/cookbooks/packer/recipes/cleanup.rb index 7ea775ae1..e1a51dae9 100644 --- a/packer_templates/windows/cookbooks/packer/recipes/cleanup.rb +++ b/packer_templates/windows/cookbooks/packer/recipes/cleanup.rb @@ -12,11 +12,13 @@ command 'C:\Windows\System32\cleanmgr.exe /sagerun:10' ignore_failure true only_if { windows_workstation? } # cleanmgr isn't on servers + live_stream true end execute 'clean SxS' do command 'Dism.exe /online /Cleanup-Image /StartComponentCleanup /ResetBase' ignore_failure true + live_stream true end powershell_script 'remove unnecesary directories' do From 7a27cf61ef228d8d6564a00e05e48f308281f620 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Sat, 24 Oct 2020 20:35:14 -0700 Subject: [PATCH 1314/1622] Add a chefignore file to the cookbook A lot of things are being copied to this box and it's very slow. Signed-off-by: Tim Smith <tsmith@chef.io> --- .../windows/cookbooks/packer/chefignore | 115 ++++++++++++++++++ 1 file changed, 115 insertions(+) create mode 100644 packer_templates/windows/cookbooks/packer/chefignore diff --git a/packer_templates/windows/cookbooks/packer/chefignore b/packer_templates/windows/cookbooks/packer/chefignore new file mode 100644 index 000000000..cc170ea79 --- /dev/null +++ b/packer_templates/windows/cookbooks/packer/chefignore @@ -0,0 +1,115 @@ +# Put files/directories that should be ignored in this file when uploading +# to a Chef Infra Server or Supermarket. +# Lines that start with '# ' are comments. + +# OS generated files # +###################### +.DS_Store +ehthumbs.db +Icon? +nohup.out +Thumbs.db +.envrc + +# EDITORS # +########### +.#* +.project +.settings +*_flymake +*_flymake.* +*.bak +*.sw[a-z] +*.tmproj +*~ +\#* +REVISION +TAGS* +tmtags +.vscode +.editorconfig + +## COMPILED ## +############## +*.class +*.com +*.dll +*.exe +*.o +*.pyc +*.so +*/rdoc/ +a.out +mkmf.log + +# Testing # +########### +.circleci/* +.codeclimate.yml +.delivery/* +.foodcritic +.kitchen* +.mdlrc +.overcommit.yml +.rspec +.rubocop.yml +.travis.yml +.watchr +.yamllint +azure-pipelines.yml +Dangerfile +examples/* +features/* +Guardfile +kitchen.yml* +mlc_config.json +Procfile +Rakefile +spec/* +test/* + +# SCM # +####### +.git +.gitattributes +.gitconfig +.github/* +.gitignore +.gitkeep +.gitmodules +.svn +*/.bzr/* +*/.git +*/.hg/* +*/.svn/* + +# Berkshelf # +############# +Berksfile +Berksfile.lock +cookbooks/* +tmp + +# Bundler # +########### +vendor/* +Gemfile +Gemfile.lock + +# Policyfile # +############## +Policyfile.rb +Policyfile.lock.json + +# Documentation # +############# +CODE_OF_CONDUCT* +CONTRIBUTING* +documentation/* +TESTING* +UPGRADING* + +# Vagrant # +########### +.vagrant +Vagrantfile From a4ba7dc4e8fa6c39a043bab7b4f9cdeadb43af25 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Sat, 24 Oct 2020 21:32:14 -0700 Subject: [PATCH 1315/1622] Fix a non-unicode character in the cleanmgr code and expand the cleanup This snuck in somehow and was busting things Signed-off-by: Tim Smith <tsmith@chef.io> --- .../cookbooks/packer/recipes/cleanup.rb | 29 +++++++++++++++---- 1 file changed, 24 insertions(+), 5 deletions(-) diff --git a/packer_templates/windows/cookbooks/packer/recipes/cleanup.rb b/packer_templates/windows/cookbooks/packer/recipes/cleanup.rb index e1a51dae9..cd81f2719 100644 --- a/packer_templates/windows/cookbooks/packer/recipes/cleanup.rb +++ b/packer_templates/windows/cookbooks/packer/recipes/cleanup.rb @@ -8,11 +8,30 @@ action :remove end -execute 'run cleanmgr' do - command 'C:\Windows\System32\cleanmgr.exe /sagerun:10' - ignore_failure true - only_if { windows_workstation? } # cleanmgr isn't on servers - live_stream true +if windows_workstation? # cleanmgr isn't on servers + # registry key locations pulled from https://github.com/spjeff/spadmin/blob/master/Cleanmgr.ps1 + # thanks @spjeff! + registry_key 'HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\Update Cleanup' do + values [{ + name: 'StateFlags0001', + type: :dword, + data: 2, + }] + end + + registry_key 'HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\Temporary Files' do + values [{ + name: 'StateFlags0001', + type: :dword, + data: 2, + }] + end + + execute 'run cleanmgr' do + command 'C:\Windows\System32\cleanmgr.exe /sagerun:1' + ignore_failure true + live_stream true + end end execute 'clean SxS' do From 8ef8e58b3994e56c3358af823bac227ae15c4dc7 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Sat, 24 Oct 2020 21:32:44 -0700 Subject: [PATCH 1316/1622] Add a note about the pagefile cleanup Signed-off-by: Tim Smith <tsmith@chef.io> --- packer_templates/windows/cookbooks/packer/recipes/cleanup.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packer_templates/windows/cookbooks/packer/recipes/cleanup.rb b/packer_templates/windows/cookbooks/packer/recipes/cleanup.rb index cd81f2719..dfe292e9a 100644 --- a/packer_templates/windows/cookbooks/packer/recipes/cleanup.rb +++ b/packer_templates/windows/cookbooks/packer/recipes/cleanup.rb @@ -68,11 +68,11 @@ end end -# remove pagefile +# remove pagefile. it will get created on boot next time registry_key 'HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Session Manager\Memory Management' do values [{ name: 'PagingFiles', type: :string, data: '', }] -end +end \ No newline at end of file From 747f492b3aaa4ee627b31380cfc41b1f553dd0bb Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Sat, 24 Oct 2020 21:32:58 -0700 Subject: [PATCH 1317/1622] Cleanup the windows temp dir as well Signed-off-by: Tim Smith <tsmith@chef.io> --- packer_templates/windows/cookbooks/packer/recipes/cleanup.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/packer_templates/windows/cookbooks/packer/recipes/cleanup.rb b/packer_templates/windows/cookbooks/packer/recipes/cleanup.rb index dfe292e9a..9e7bb2883 100644 --- a/packer_templates/windows/cookbooks/packer/recipes/cleanup.rb +++ b/packer_templates/windows/cookbooks/packer/recipes/cleanup.rb @@ -46,6 +46,7 @@ "C:\\Recovery", "$env:localappdata\\temp\\*", "$env:windir\\logs", + "$env:windir\\temp", "$env:windir\\winsxs\\manifestcache", "C:\\Users\\vagrant\Favorites\\*" ) | % { From c6224515955a7621e086a4e1078b804e1ca76b5f Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Sat, 24 Oct 2020 23:22:42 -0700 Subject: [PATCH 1318/1622] Skip cleanmgr on windows 10 for now Signed-off-by: Tim Smith <tsmith@chef.io> --- packer_templates/windows/cookbooks/packer/recipes/cleanup.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packer_templates/windows/cookbooks/packer/recipes/cleanup.rb b/packer_templates/windows/cookbooks/packer/recipes/cleanup.rb index 9e7bb2883..bca0e1eeb 100644 --- a/packer_templates/windows/cookbooks/packer/recipes/cleanup.rb +++ b/packer_templates/windows/cookbooks/packer/recipes/cleanup.rb @@ -8,7 +8,7 @@ action :remove end -if windows_workstation? # cleanmgr isn't on servers +if windows_workstation? && !node['platform_version'].to_i == 10 # cleanmgr isn't on servers # registry key locations pulled from https://github.com/spjeff/spadmin/blob/master/Cleanmgr.ps1 # thanks @spjeff! registry_key 'HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\Update Cleanup' do From c5b95441f6460a3dc2dacc4f6495e947ac1941b8 Mon Sep 17 00:00:00 2001 From: Carlos Rodrigues <cefrodrigues@gmail.com> Date: Sun, 25 Oct 2020 13:12:44 +0000 Subject: [PATCH 1319/1622] Fix virtualbox additions build failure on CentOS 8.2 No build dependencies for virtualbox guest additions were being installed if one of them happened to be missing from the repos. In this case, kernel-uek-devel doesn't exist in CentOS 8.2. Signed-off-by: Carlos Rodrigues <cefrodrigues@gmail.com> --- packer_templates/_common/virtualbox.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packer_templates/_common/virtualbox.sh b/packer_templates/_common/virtualbox.sh index fc961ad73..c0e1a3d0a 100644 --- a/packer_templates/_common/virtualbox.sh +++ b/packer_templates/_common/virtualbox.sh @@ -15,9 +15,9 @@ virtualbox-iso|virtualbox-ovf) echo "installing deps necessary to compile kernel modules" # We install things like kernel-headers here vs. kickstart files so we make sure we install them for the updated kernel not the stock kernel if [ -f "/bin/dnf" ]; then - dnf install -y perl cpp gcc make bzip2 tar kernel-headers kernel-devel kernel-uek-devel || true # not all these packages are on every system + dnf install -y --skip-broken perl cpp gcc make bzip2 tar kernel-headers kernel-devel kernel-uek-devel || true # not all these packages are on every system elif [ -f "/bin/yum" ] || [ -f "/usr/bin/yum" ]; then - yum install -y perl cpp gcc make bzip2 tar kernel-headers kernel-devel kernel-uek-devel || true # not all these packages are on every system + yum install -y --skip-broken perl cpp gcc make bzip2 tar kernel-headers kernel-devel kernel-uek-devel || true # not all these packages are on every system elif [ -f "/usr/bin/apt-get" ]; then apt-get install -y build-essential dkms bzip2 tar linux-headers-`uname -r` elif [ -f "/usr/bin/zypper" ]; then @@ -32,7 +32,7 @@ virtualbox-iso|virtualbox-ovf) echo "Cannot find vbox kernel module. Installation of guest additions unsuccessful!" exit 1 fi - + echo "unmounting and removing the vbox ISO" umount /tmp/vbox; rm -rf /tmp/vbox; From 038e2e925780003635efbf64182e0c96620b0612 Mon Sep 17 00:00:00 2001 From: Li-Wen Hsu <lwhsu@lwhsu.org> Date: Wed, 28 Oct 2020 11:33:27 -0600 Subject: [PATCH 1320/1622] Add FreeBSD 12.2-RELEASE Signed-off-by: Li-Wen Hsu <lwhsu@lwhsu.org> --- builds.yml | 2 + .../freebsd/freebsd-12.2-amd64.json | 207 ++++++++++++++++++ .../freebsd/freebsd-12.2-i386.json | 207 ++++++++++++++++++ 3 files changed, 416 insertions(+) create mode 100644 packer_templates/freebsd/freebsd-12.2-amd64.json create mode 100644 packer_templates/freebsd/freebsd-12.2-i386.json diff --git a/builds.yml b/builds.yml index c681cb54f..22d304a0d 100644 --- a/builds.yml +++ b/builds.yml @@ -15,6 +15,8 @@ public: - 'freebsd-11.4' - 'freebsd-12.1-i386' - 'freebsd-12.1' +- 'freebsd-12.2-i386' +- 'freebsd-12.2' - 'opensuse-leap-15.2' - 'oracle-5.11-i386' - 'oracle-5.11' diff --git a/packer_templates/freebsd/freebsd-12.2-amd64.json b/packer_templates/freebsd/freebsd-12.2-amd64.json new file mode 100644 index 000000000..8e7bd6de7 --- /dev/null +++ b/packer_templates/freebsd/freebsd-12.2-amd64.json @@ -0,0 +1,207 @@ +{ + "builders": [ + { + "boot_command": [ + "<esc><wait>", + "boot -s<wait>", + "<enter><wait>", + "<wait10><wait10>", + "/bin/sh<enter><wait>", + "mdmfs -s 100m md1 /tmp<enter><wait>", + "mdmfs -s 100m md2 /mnt<enter><wait>", + "dhclient -p /tmp/dhclient.em0.pid -l /tmp/dhclient.lease.em0 em0<enter><wait>", + "fetch -o /tmp/installerconfig http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} \u0026\u0026 bsdinstall script /tmp/installerconfig<enter><wait>" + ], + "boot_wait": "10s", + "cpus": "{{ user `cpus` }}", + "disk_size": "{{user `disk_size`}}", + "guest_additions_mode": "disable", + "guest_os_type": "FreeBSD_64", + "headless": "{{ user `headless` }}", + "http_directory": "{{user `http_directory`}}", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "memory": "{{ user `memory` }}", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-virtualbox", + "shutdown_command": "echo 'vagrant' | su -m root -c 'shutdown -p now'", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_timeout": "10000s", + "ssh_username": "vagrant", + "type": "virtualbox-iso", + "virtualbox_version_file": ".vbox_version", + "vm_name": "{{ user `template` }}" + }, + { + "boot_command": [ + "<esc><wait>", + "boot -s<wait>", + "<enter><wait>", + "<wait10><wait10>", + "/bin/sh<enter><wait>", + "mdmfs -s 100m md1 /tmp<enter><wait>", + "mdmfs -s 100m md2 /mnt<enter><wait>", + "dhclient -p /tmp/dhclient.em0.pid -l /tmp/dhclient.lease.em0 em0<enter><wait>", + "<wait5>", + "fetch -o /tmp/installerconfig http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} \u0026\u0026 bsdinstall script /tmp/installerconfig<enter><wait>" + ], + "boot_wait": "10s", + "cpus": "{{ user `cpus` }}", + "disk_size": "{{user `disk_size`}}", + "guest_os_type": "freebsd-64", + "headless": "{{ user `headless` }}", + "http_directory": "{{user `http_directory`}}", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "memory": "{{ user `memory` }}", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-vmware", + "shutdown_command": "echo 'vagrant' | su -m root -c 'shutdown -p now'", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_timeout": "10000s", + "ssh_username": "vagrant", + "type": "vmware-iso", + "vm_name": "{{ user `template` }}", + "vmx_data": { + "cpuid.coresPerSocket": "1" + }, + "vmx_remove_ethernet_interfaces": true + }, + { + "boot_command": [ + "<esc><wait>", + "boot -s<wait>", + "<enter><wait>", + "<wait10><wait10>", + "/bin/sh<enter><wait>", + "mdmfs -s 100m md1 /tmp<enter><wait>", + "mdmfs -s 100m md2 /mnt<enter><wait>", + "dhclient -p /tmp/dhclient.em0.pid -l /tmp/dhclient.lease.em0 em0<enter><wait>", + "fetch -o /tmp/installerconfig http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} \u0026\u0026 bsdinstall script /tmp/installerconfig<enter><wait>" + ], + "boot_wait": "8s", + "cpus": "{{ user `cpus` }}", + "disk_size": "{{user `disk_size`}}", + "guest_os_type": "freebsd", + "http_directory": "{{user `http_directory`}}", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "memory": "{{ user `memory` }}", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-parallels", + "parallels_tools_mode": "disable", + "prlctl": [ + [ + "set", + "{{.Name}}", + "--device-set", + "cdrom0", + "--iface", + "ide" + ], + [ + "set", + "{{.Name}}", + "--device-del", + "fdd0" + ], + [ + "set", + "{{.Name}}", + "--device-del", + "parallel0" + ] + ], + "prlctl_version_file": ".prlctl_version", + "shutdown_command": "echo 'vagrant' | su -m root -c 'shutdown -p now'", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_timeout": "10000s", + "ssh_username": "vagrant", + "type": "parallels-iso", + "vm_name": "{{ user `template` }}" + }, + { + "boot_command": [ + "<esc><wait>", + "boot -s<wait>", + "<enter><wait>", + "<wait10><wait10>", + "/bin/sh<enter><wait>", + "mdmfs -s 100m md1 /tmp<enter><wait>", + "mdmfs -s 100m md2 /mnt<enter><wait>", + "dhclient -p /tmp/dhclient.vtnet0.pid -l /tmp/dhclient.lease.vtnet0 vtnet0<enter><wait>", + "fetch -o /tmp/installerconfig http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} \u0026\u0026 bsdinstall script /tmp/installerconfig<enter><wait>" + ], + "boot_wait": "7s", + "cpus": "{{ user `cpus` }}", + "disk_size": "{{user `disk_size`}}", + "headless": "{{ user `headless` }}", + "http_directory": "{{user `http_directory`}}", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "memory": "{{ user `memory` }}", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-qemu", + "shutdown_command": "echo 'vagrant' | su -m root -c 'shutdown -p now'", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_timeout": "10000s", + "ssh_username": "vagrant", + "type": "qemu", + "vm_name": "{{ user `template` }}" + } + ], + "post-processors": [ + { + "output": "{{ user `build_directory` }}/{{user `box_basename`}}.{{.Provider}}.box", + "type": "vagrant", + "vagrantfile_template": "{{template_dir}}/vagrantfile_templates/freebsd.rb" + } + ], + "provisioners": [ + { + "environment_vars": [ + "HOME_DIR=/home/vagrant", + "http_proxy={{user `http_proxy`}}", + "https_proxy={{user `https_proxy`}}", + "no_proxy={{user `no_proxy`}}", + "pkg_branch={{user `pkg_branch`}}" + ], + "execute_command": "echo 'vagrant' | {{.Vars}} su -m root -c 'sh -eux {{.Path}}'", + "expect_disconnect": true, + "scripts": [ + "{{template_dir}}/scripts/update.sh", + "{{template_dir}}/scripts/postinstall.sh", + "{{template_dir}}/scripts/sudoers.sh", + "{{template_dir}}/../_common/vagrant.sh", + "{{template_dir}}/scripts/vmtools.sh", + "{{template_dir}}/scripts/cleanup.sh", + "{{template_dir}}/scripts/minimize.sh" + ], + "type": "shell" + } + ], + "variables": { + "box_basename": "freebsd-12.2", + "build_directory": "../../builds", + "build_timestamp": "{{isotime \"20060102150405\"}}", + "cpus": "1", + "disk_size": "65536", + "git_revision": "__unknown_git_revision__", + "headless": "", + "http_directory": "{{template_dir}}/http", + "http_proxy": "{{env `http_proxy`}}", + "https_proxy": "{{env `https_proxy`}}", + "install_path": "freebsd-11/installerconfig", + "iso_checksum": "289522e2f4e1260859505adab6d7b54ab83d19aeb147388ff7e28019984da5dc", + "iso_name": "FreeBSD-12.2-RELEASE-amd64-disc1.iso", + "memory": "1024", + "mirror": "https://download.freebsd.org/ftp", + "mirror_directory": "releases/amd64/amd64/ISO-IMAGES/12.2", + "name": "freebsd-12.2", + "no_proxy": "{{env `no_proxy`}}", + "pkg_branch": "quarterly", + "template": "freebsd-12.2-amd64", + "version": "TIMESTAMP" + } +} + diff --git a/packer_templates/freebsd/freebsd-12.2-i386.json b/packer_templates/freebsd/freebsd-12.2-i386.json new file mode 100644 index 000000000..c495f452f --- /dev/null +++ b/packer_templates/freebsd/freebsd-12.2-i386.json @@ -0,0 +1,207 @@ +{ + "builders": [ + { + "boot_command": [ + "<esc><wait>", + "boot -s<wait>", + "<enter><wait>", + "<wait10><wait10>", + "/bin/sh<enter><wait>", + "mdmfs -s 100m md1 /tmp<enter><wait>", + "mdmfs -s 100m md2 /mnt<enter><wait>", + "dhclient -p /tmp/dhclient.em0.pid -l /tmp/dhclient.lease.em0 em0<enter><wait>", + "fetch -o /tmp/installerconfig http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} \u0026\u0026 bsdinstall script /tmp/installerconfig<enter><wait>" + ], + "boot_wait": "10s", + "cpus": "{{ user `cpus` }}", + "disk_size": "{{user `disk_size`}}", + "guest_additions_mode": "disable", + "guest_os_type": "FreeBSD", + "headless": "{{ user `headless` }}", + "http_directory": "{{user `http_directory`}}", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "memory": "{{ user `memory` }}", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-virtualbox", + "shutdown_command": "echo 'vagrant' | su -m root -c 'shutdown -p now'", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_timeout": "10000s", + "ssh_username": "vagrant", + "type": "virtualbox-iso", + "virtualbox_version_file": ".vbox_version", + "vm_name": "{{ user `template` }}" + }, + { + "boot_command": [ + "<esc><wait>", + "boot -s<wait>", + "<enter><wait>", + "<wait10><wait10>", + "/bin/sh<enter><wait>", + "mdmfs -s 100m md1 /tmp<enter><wait>", + "mdmfs -s 100m md2 /mnt<enter><wait>", + "dhclient -p /tmp/dhclient.em0.pid -l /tmp/dhclient.lease.em0 em0<enter><wait>", + "<wait5>", + "fetch -o /tmp/installerconfig http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} \u0026\u0026 bsdinstall script /tmp/installerconfig<enter><wait>" + ], + "boot_wait": "10s", + "cpus": "{{ user `cpus` }}", + "disk_size": "{{user `disk_size`}}", + "guest_os_type": "freebsd", + "headless": "{{ user `headless` }}", + "http_directory": "{{user `http_directory`}}", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "memory": "{{ user `memory` }}", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-vmware", + "shutdown_command": "echo 'vagrant' | su -m root -c 'shutdown -p now'", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_timeout": "10000s", + "ssh_username": "vagrant", + "type": "vmware-iso", + "vm_name": "{{ user `template` }}", + "vmx_data": { + "cpuid.coresPerSocket": "1" + }, + "vmx_remove_ethernet_interfaces": true + }, + { + "boot_command": [ + "<esc><wait>", + "boot -s<wait>", + "<enter><wait>", + "<wait10><wait10>", + "/bin/sh<enter><wait>", + "mdmfs -s 100m md1 /tmp<enter><wait>", + "mdmfs -s 100m md2 /mnt<enter><wait>", + "dhclient -p /tmp/dhclient.em0.pid -l /tmp/dhclient.lease.em0 em0<enter><wait>", + "fetch -o /tmp/installerconfig http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} \u0026\u0026 bsdinstall script /tmp/installerconfig<enter><wait>" + ], + "boot_wait": "8s", + "cpus": "{{ user `cpus` }}", + "disk_size": "{{user `disk_size`}}", + "guest_os_type": "freebsd", + "http_directory": "{{user `http_directory`}}", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "memory": "{{ user `memory` }}", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-parallels", + "parallels_tools_mode": "disable", + "prlctl": [ + [ + "set", + "{{.Name}}", + "--device-set", + "cdrom0", + "--iface", + "ide" + ], + [ + "set", + "{{.Name}}", + "--device-del", + "fdd0" + ], + [ + "set", + "{{.Name}}", + "--device-del", + "parallel0" + ] + ], + "prlctl_version_file": ".prlctl_version", + "shutdown_command": "echo 'vagrant' | su -m root -c 'shutdown -p now'", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_timeout": "10000s", + "ssh_username": "vagrant", + "type": "parallels-iso", + "vm_name": "{{ user `template` }}" + }, + { + "boot_command": [ + "<esc><wait>", + "boot -s<wait>", + "<enter><wait>", + "<wait10><wait10>", + "/bin/sh<enter><wait>", + "mdmfs -s 100m md1 /tmp<enter><wait>", + "mdmfs -s 100m md2 /mnt<enter><wait>", + "dhclient -p /tmp/dhclient.vtnet0.pid -l /tmp/dhclient.lease.vtnet0 vtnet0<enter><wait>", + "fetch -o /tmp/installerconfig http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} \u0026\u0026 bsdinstall script /tmp/installerconfig<enter><wait>" + ], + "boot_wait": "7s", + "cpus": "{{ user `cpus` }}", + "disk_size": "{{user `disk_size`}}", + "headless": "{{ user `headless` }}", + "http_directory": "{{user `http_directory`}}", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "memory": "{{ user `memory` }}", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-qemu", + "shutdown_command": "echo 'vagrant' | su -m root -c 'shutdown -p now'", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_timeout": "10000s", + "ssh_username": "vagrant", + "type": "qemu", + "vm_name": "{{ user `template` }}" + } + ], + "post-processors": [ + { + "output": "{{ user `build_directory` }}/{{user `box_basename`}}.{{.Provider}}.box", + "type": "vagrant", + "vagrantfile_template": "{{template_dir}}/vagrantfile_templates/freebsd.rb" + } + ], + "provisioners": [ + { + "environment_vars": [ + "HOME_DIR=/home/vagrant", + "http_proxy={{user `http_proxy`}}", + "https_proxy={{user `https_proxy`}}", + "no_proxy={{user `no_proxy`}}", + "pkg_branch={{user `pkg_branch`}}" + ], + "execute_command": "echo 'vagrant' | {{.Vars}} su -m root -c 'sh -eux {{.Path}}'", + "expect_disconnect": true, + "scripts": [ + "{{template_dir}}/scripts/update.sh", + "{{template_dir}}/scripts/postinstall.sh", + "{{template_dir}}/scripts/sudoers.sh", + "{{template_dir}}/../_common/vagrant.sh", + "{{template_dir}}/scripts/vmtools.sh", + "{{template_dir}}/scripts/cleanup.sh", + "{{template_dir}}/scripts/minimize.sh" + ], + "type": "shell" + } + ], + "variables": { + "box_basename": "freebsd-12.2-i386", + "build_directory": "../../builds", + "build_timestamp": "{{isotime \"20060102150405\"}}", + "cpus": "1", + "disk_size": "40960", + "git_revision": "__unknown_git_revision__", + "headless": "", + "http_directory": "{{template_dir}}/http", + "http_proxy": "{{env `http_proxy`}}", + "https_proxy": "{{env `https_proxy`}}", + "install_path": "freebsd-11/installerconfig", + "iso_checksum": "b422b5f390f9bd05f5c71783099b2b9a925e7256d7907b9be613ece4a1fb4124", + "iso_name": "FreeBSD-12.2-RELEASE-i386-disc1.iso", + "memory": "1024", + "mirror": "https://download.freebsd.org/ftp", + "mirror_directory": "releases/i386/i386/ISO-IMAGES/12.2", + "name": "freebsd-12.2-i386", + "no_proxy": "{{env `no_proxy`}}", + "pkg_branch": "quarterly", + "template": "freebsd-12.2-i386", + "version": "TIMESTAMP" + } +} + From c38d04ef3b65df53b2b2610ab956eac33e0e6a0c Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Tue, 27 Oct 2020 21:37:52 -0700 Subject: [PATCH 1321/1622] Additional SLES/opensuse cleanup + logging Signed-off-by: Tim Smith <tsmith@chef.io> --- packer_templates/opensuse/scripts/cleanup.sh | 3 +++ packer_templates/sles/scripts/cleanup.sh | 17 +++++++++++------ 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/packer_templates/opensuse/scripts/cleanup.sh b/packer_templates/opensuse/scripts/cleanup.sh index 5226681a7..c16f9b55d 100644 --- a/packer_templates/opensuse/scripts/cleanup.sh +++ b/packer_templates/opensuse/scripts/cleanup.sh @@ -20,6 +20,9 @@ rm -rf /tmp/* /var/tmp/* echo "blank netplan machine-id (DUID) so machines get unique ID generated on boot" truncate -s 0 /etc/machine-id +echo "force a new random seed to be generated" +rm -f /var/lib/systemd/random-seed + echo "clear the history so our install isn't there" rm -f /root/.wget-hsts export HISTSIZE=0 \ No newline at end of file diff --git a/packer_templates/sles/scripts/cleanup.sh b/packer_templates/sles/scripts/cleanup.sh index e80d41656..bc1e49932 100644 --- a/packer_templates/sles/scripts/cleanup.sh +++ b/packer_templates/sles/scripts/cleanup.sh @@ -1,21 +1,26 @@ #!/bin/sh # These were only needed for building VMware/Virtualbox extensions: +echo "remove some bogus packages we don't need" zypper --non-interactive rm --clean-deps gcc kernel-default-devel -zypper clean +echo "cleanup all the downloaded RPMs" +zypper clean --all -# Clean up network interface persistence +echo "clean up network interface persistence" rm -f /etc/udev/rules.d/70-persistent-net.rules; touch /etc/udev/rules.d/75-persistent-net-generator.rules; -# truncate any logs that have built up during the install +echo "truncate any logs that have built up during the install" find /var/log -type f -exec truncate --size=0 {} \; -# remove the contents of /tmp and /var/tmp +echo "remove the contents of /tmp and /var/tmp" rm -rf /tmp/* /var/tmp/* -# force a new random seed to be generated +echo "blank netplan machine-id (DUID) so machines get unique ID generated on boot" +truncate -s 0 /etc/machine-id + +echo "force a new random seed to be generated" rm -f /var/lib/systemd/random-seed -# clear the history so our install isn't there +echo "clear the history so our install isn't there" rm -f /root/.wget-hsts export HISTSIZE=0 \ No newline at end of file From a5da7611b1ca55c1db16fb156f4b885239e2573d Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Wed, 28 Oct 2020 00:28:19 -0700 Subject: [PATCH 1322/1622] Update readme Signed-off-by: Tim Smith <tsmith@chef.io> --- README.md | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index ce8734bba..d775d83fb 100644 --- a/README.md +++ b/README.md @@ -88,7 +88,7 @@ packer build --only=qemu --var virtio_win_iso=~/virtio-win.iso windows-2019.json ### Proprietary Templates -Templates for operating systems only available via license or subscription are also available in the repository, these include but are not limited to: macOS, Red Hat Enterprise Linux, and SUSE Linux Enterprise. As the ISOs are not publicly available the URL values will need to be overridden as appropriate. We rely on the efforts of those with access to licensed versions of the operating systems to keep these up-to-date. +Templates for operating systems only available via license or subscription are also available in the repository, these include but are not limited to: Red Hat Enterprise Linux, and SUSE Linux Enterprise. As the ISOs are not publicly available the URL values will need to be overridden as appropriate. We rely on the efforts of those with access to licensed versions of the operating systems to keep these up-to-date. ### Networking/Firewalls @@ -109,16 +109,14 @@ Hyper-V Gen 2 VMs do not support floppy drives. If you previously provided resou - `autounattend.xml`: The Gen 2 `autounattend.xml` file supports EFI partitions. Update the `autounattend.xml` with the correct Windows version for your systems and ensure that the partitions are correct for your situation. You also need to manage the driver disk that holds the hyper-v guest services drivers and adjust the `autounattend.xml` file as appropriate. - `base_setup.ps1` -#### macOS / OSX - -See this [wiki page](https://github.com/chef/bento/wiki/macOS) - ## Bugs and Issues Please use GitHub issues to report bugs, features, or other problems. ## Related projects +A huge thank you to these related projects from which we've taken inspiration and often used as a source for workarounds in complex world of base box building. + * https://github.com/boxcutter * https://github.com/lavabit/robox * https://github.com/mcandre/packer-templates @@ -129,8 +127,6 @@ Please use GitHub issues to report bugs, features, or other problems. These basebox templates were converted from [veewee](https://github.com/jedi4ever/veewee) definitions originally based on [work done by Tim Dysinger](https://github.com/dysinger/basebox) to make "Don't Repeat Yourself" (DRY) modular baseboxes. Thanks Tim! -macOS templates were adopted wholesale from [Fletcher Nichol's packer templates](https://github.com/fnichol/packer-templates). - - Author: Chris McClimans ([chris@hippiehacker.org](mailto:chris@hippiehacker.org)) - Author: Fletcher Nichol ([fnichol@nichol.ca](mailto:fnichol@nichol.ca)) - Author: Joshua Timberman ([joshua@chef.io](mailto:joshua@chef.io)) From 4abc72657c85882a36fd8b3686c5866599f6c6fd Mon Sep 17 00:00:00 2001 From: kartnico <kartnico@kartzone.info> Date: Sat, 31 Oct 2020 12:44:40 +0100 Subject: [PATCH 1323/1622] Add qemuargs parameter for Fedora --- packer_templates/fedora/fedora-31-x86_64.json | 3 +++ packer_templates/fedora/fedora-32-x86_64.json | 3 +++ 2 files changed, 6 insertions(+) diff --git a/packer_templates/fedora/fedora-31-x86_64.json b/packer_templates/fedora/fedora-31-x86_64.json index efd1bf1bf..71afd0ce9 100644 --- a/packer_templates/fedora/fedora-31-x86_64.json +++ b/packer_templates/fedora/fedora-31-x86_64.json @@ -125,6 +125,7 @@ "ssh_timeout": "10000s", "ssh_username": "vagrant", "type": "qemu", + "qemuargs": [["{{ user `qemuargs_opt` }}","{{ user `qemuargs_value` }}"]], "vm_name": "{{ user `template` }}" } ], @@ -183,6 +184,8 @@ "name": "fedora-31", "no_proxy": "{{env `no_proxy`}}", "template": "fedora-31-x86_64", + "qemuargs_opt": "-m", + "qemuargs_value": "1024M", "version": "TIMESTAMP" } } diff --git a/packer_templates/fedora/fedora-32-x86_64.json b/packer_templates/fedora/fedora-32-x86_64.json index 892d0191c..115112618 100644 --- a/packer_templates/fedora/fedora-32-x86_64.json +++ b/packer_templates/fedora/fedora-32-x86_64.json @@ -125,6 +125,7 @@ "ssh_timeout": "10000s", "ssh_username": "vagrant", "type": "qemu", + "qemuargs": [["{{ user `qemuargs_opt` }}","{{ user `qemuargs_value` }}"]], "vm_name": "{{ user `template` }}" } ], @@ -183,6 +184,8 @@ "name": "fedora-32", "no_proxy": "{{env `no_proxy`}}", "template": "fedora-32-x86_64", + "qemuargs_opt": "-m", + "qemuargs_value": "1024M", "version": "TIMESTAMP" } } From 33e88f41da487fd2404001d968a77ec636759a77 Mon Sep 17 00:00:00 2001 From: kartnico <kartnico@kartzone.info> Date: Sat, 31 Oct 2020 14:34:26 +0100 Subject: [PATCH 1324/1622] Add Fedora33 --- packer_templates/fedora/fedora-33-x86_64.json | 191 ++++++++++++++++++ 1 file changed, 191 insertions(+) create mode 100644 packer_templates/fedora/fedora-33-x86_64.json diff --git a/packer_templates/fedora/fedora-33-x86_64.json b/packer_templates/fedora/fedora-33-x86_64.json new file mode 100644 index 000000000..baf7b9b0e --- /dev/null +++ b/packer_templates/fedora/fedora-33-x86_64.json @@ -0,0 +1,191 @@ +{ + "builders": [ + { + "accelerator": "kvm", + "boot_command": [ + "<tab> linux ks=http://{{.HTTPIP}}:{{.HTTPPort}}/{{user `ks_path`}}<enter><wait>" + ], + "boot_wait": "10s", + "cpus": "{{ user `cpus` }}", + "disk_cache": "unsafe", + "disk_compression": true, + "disk_discard": "unmap", + "disk_interface": "virtio-scsi", + "disk_size": "{{user `disk_size`}}", + "format": "qcow2", + "headless": "{{ user `headless` }}", + "http_directory": "{{user `http_directory`}}", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "memory": "{{ user `memory` }}", + "name": "{{ user `template` }}", + "net_device": "virtio-net", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-libvirt", + "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_timeout": "3600s", + "ssh_username": "vagrant", + "type": "qemu", + "vm_name": "{{ user `template` }}" + }, + { + "boot_command": [ + "<tab> linux ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" + ], + "boot_wait": "10s", + "cpus": "{{ user `cpus` }}", + "disk_size": "{{user `disk_size`}}", + "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "guest_additions_url": "{{ user `guest_additions_url` }}", + "guest_os_type": "Fedora_64", + "hard_drive_interface": "sata", + "headless": "{{ user `headless` }}", + "http_directory": "{{user `http_directory`}}", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "memory": "{{ user `memory` }}", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-virtualbox", + "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_timeout": "10000s", + "ssh_username": "vagrant", + "type": "virtualbox-iso", + "virtualbox_version_file": ".vbox_version", + "vm_name": "{{ user `template` }}" + }, + { + "boot_command": [ + "<tab> linux ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" + ], + "boot_wait": "10s", + "cpus": "{{ user `cpus` }}", + "disk_size": "{{user `disk_size`}}", + "guest_os_type": "fedora-64", + "headless": "{{ user `headless` }}", + "http_directory": "{{user `http_directory`}}", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "memory": "{{ user `memory` }}", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-vmware", + "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_timeout": "10000s", + "ssh_username": "vagrant", + "tools_upload_flavor": "linux", + "type": "vmware-iso", + "vm_name": "{{ user `template` }}", + "vmx_data": { + "cpuid.coresPerSocket": "1", + "ethernet0.pciSlotNumber": "32" + }, + "vmx_remove_ethernet_interfaces": true + }, + { + "boot_command": [ + "<tab> linux ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" + ], + "boot_wait": "10s", + "cpus": "{{ user `cpus` }}", + "disk_size": "{{user `disk_size`}}", + "guest_os_type": "fedora-core", + "http_directory": "{{user `http_directory`}}", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "memory": "{{ user `memory` }}", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-parallels", + "parallels_tools_flavor": "lin", + "prlctl_version_file": ".prlctl_version", + "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_timeout": "10000s", + "ssh_username": "vagrant", + "type": "parallels-iso", + "vm_name": "{{ user `template` }}" + }, + { + "boot_wait": "10s", + "cpus": "{{ user `cpus` }}", + "disk_size": "{{user `disk_size`}}", + "headless": "{{ user `headless` }}", + "http_directory": "{{user `http_directory`}}", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "memory": "{{ user `memory` }}", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-qemu", + "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_timeout": "10000s", + "ssh_username": "vagrant", + "type": "qemu", + "vm_name": "{{ user `template` }}", + "qemuargs": [["{{ user `qemuargs_opt` }}","{{ user `qemuargs_value` }}"]], + "boot_command": "{{user `boot_command`}}" + } + ], + "post-processors": [ + { + "output": "{{ user `build_directory` }}/{{user `box_basename`}}.{{.Provider}}.box", + "type": "vagrant" + } + ], + "provisioners": [ + { + "environment_vars": [ + "HOME_DIR=/home/vagrant", + "http_proxy={{user `http_proxy`}}", + "https_proxy={{user `https_proxy`}}", + "no_proxy={{user `no_proxy`}}" + ], + "execute_command": "echo 'vagrant' | {{.Vars}} sudo -E -S bash '{{.Path}}'", + "expect_disconnect": true, + "scripts": [ + "{{template_dir}}/scripts/fix-slow-dns.sh", + "{{template_dir}}/scripts/build-tools.sh", + "{{template_dir}}/scripts/install-supporting-packages.sh", + "{{template_dir}}/../_common/motd.sh", + "{{template_dir}}/../_common/sshd.sh", + "{{template_dir}}/../_common/virtualbox.sh", + "{{template_dir}}/scripts/vmware.sh", + "{{template_dir}}/../_common/parallels.sh", + "{{template_dir}}/../_common/vagrant.sh", + "{{template_dir}}/scripts/real-tmp.sh", + "{{template_dir}}/scripts/cleanup.sh", + "{{template_dir}}/../_common/minimize.sh" + ], + "type": "shell" + } + ], + "variables": { + "arch": "64", + "box_basename": "fedora-33", + "build_directory": "../../builds", + "build_timestamp": "{{isotime \"20060102150405\"}}", + "cpus": "1", + "disk_size": "65536", + "git_revision": "__unknown_git_revision__", + "guest_additions_url": "", + "headless": "", + "http_directory": "{{template_dir}}/http", + "http_proxy": "{{env `http_proxy`}}", + "https_proxy": "{{env `https_proxy`}}", + "iso_checksum": "4fe38b45a4c788927ddfdfb224c414f138226a75f27a287995d802cba3cb89d4", + "iso_name": "Fedora-Server-dvd-x86_64-33-1.2.iso", + "ks_path": "ks-fedora.cfg", + "memory": "1024", + "mirror": "http://download.fedoraproject.org/pub/fedora/linux", + "mirror_directory": "releases/33/Server/x86_64/iso", + "name": "fedora-33", + "no_proxy": "{{env `no_proxy`}}", + "template": "fedora-33-x86_64", + "qemuargs_opt": "-m", + "qemuargs_value": "1024M", + "boot_command": "<tab> linux ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>", + "version": "TIMESTAMP" + } +} + From ec324adf7ea08bcbece8367acdd8acc25e428b9a Mon Sep 17 00:00:00 2001 From: Ross Smith II <ross@smithii.com> Date: Sat, 19 Dec 2020 22:58:26 -0800 Subject: [PATCH 1325/1622] Add support for Ubuntu 20.10 and 21.04 All tested and ran fine, though 21.04's hash will change every day and is included just for proof of concept. Signed-off-by: Ross Smith II <ross@smithii.com> --- builds.yml | 1 + packer_templates/ubuntu/http/meta-data | 0 packer_templates/ubuntu/http/user-data | 13 + .../ubuntu/ubuntu-20.04-live-amd64.json | 249 ++++++++++++++++ .../ubuntu/ubuntu-20.10-amd64.json | 279 ++++++++++++++++++ .../ubuntu/ubuntu-21.04-amd64.json | 279 ++++++++++++++++++ 6 files changed, 821 insertions(+) create mode 100644 packer_templates/ubuntu/http/meta-data create mode 100644 packer_templates/ubuntu/http/user-data create mode 100644 packer_templates/ubuntu/ubuntu-20.04-live-amd64.json create mode 100644 packer_templates/ubuntu/ubuntu-20.10-amd64.json create mode 100644 packer_templates/ubuntu/ubuntu-21.04-amd64.json diff --git a/builds.yml b/builds.yml index 4f9c06916..08552e12a 100644 --- a/builds.yml +++ b/builds.yml @@ -27,6 +27,7 @@ public: - 'ubuntu-16.04' - 'ubuntu-18.04' - 'ubuntu-20.04' +- 'ubuntu-20.10' # slug box name: text string from standard box name to match (generally the same) slugs: diff --git a/packer_templates/ubuntu/http/meta-data b/packer_templates/ubuntu/http/meta-data new file mode 100644 index 000000000..e69de29bb diff --git a/packer_templates/ubuntu/http/user-data b/packer_templates/ubuntu/http/user-data new file mode 100644 index 000000000..f636fbc61 --- /dev/null +++ b/packer_templates/ubuntu/http/user-data @@ -0,0 +1,13 @@ +#cloud-config +autoinstall: + version: 1 + identity: + hostname: vagrant + username: vagrant + # Generated via: printf vagrant | mkpasswd -m sha-512 -S vagrant. -s + password: "$6$vagrant.$sd6r0/OKL.FIGZbhanVkrLassSxoPRv1h5lkISsmBONqaLUGVXkEcD22Ddak5W8JSxeU0VFkU/We1Y7o4hVO/1" + early-commands: + # otherwise packer tries to connect and exceed max attempts: + - systemctl stop ssh + ssh: + install-server: true diff --git a/packer_templates/ubuntu/ubuntu-20.04-live-amd64.json b/packer_templates/ubuntu/ubuntu-20.04-live-amd64.json new file mode 100644 index 000000000..575c7dd98 --- /dev/null +++ b/packer_templates/ubuntu/ubuntu-20.04-live-amd64.json @@ -0,0 +1,249 @@ +{ + "builders": [ + { + "boot_command": [ + " <wait>", + " <wait>", + " <wait>", + " <wait>", + " <wait>", + "<esc><wait>", + "<f6><wait>", + "<esc><wait>", + "<bs><bs><bs><bs><wait>", + " autoinstall<wait5>", + " ds=nocloud-net<wait5>", + ";s=http://<wait5>{{.HTTPIP}}<wait5>:{{.HTTPPort}}/<wait5>", + " ---<wait5>", + "<enter><wait5>" + ], + "boot_wait": "5s", + "cpus": "{{ user `cpus` }}", + "disk_size": "{{user `disk_size`}}", + "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "guest_additions_url": "{{ user `guest_additions_url` }}", + "guest_os_type": "Ubuntu_64", + "hard_drive_interface": "sata", + "headless": "{{ user `headless` }}", + "http_directory": "{{user `http_directory`}}", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "memory": "{{ user `memory` }}", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-virtualbox", + "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_timeout": "10000s", + "ssh_username": "vagrant", + "type": "virtualbox-iso", + "virtualbox_version_file": ".vbox_version", + "vm_name": "{{ user `template` }}" + }, + { + "boot_command": [ + " <wait>", + " <wait>", + " <wait>", + " <wait>", + " <wait>", + "<esc><wait>", + "<f6><wait>", + "<esc><wait>", + "<bs><bs><bs><bs><wait>", + " autoinstall<wait5>", + " ds=nocloud-net<wait5>", + ";s=http://<wait5>{{.HTTPIP}}<wait5>:{{.HTTPPort}}/<wait5>", + " ---<wait5>", + "<enter><wait5>" + ], + "boot_wait": "5s", + "cpus": "{{ user `cpus` }}", + "disk_size": "{{user `disk_size`}}", + "guest_os_type": "ubuntu-64", + "headless": "{{ user `headless` }}", + "http_directory": "{{user `http_directory`}}", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "memory": "{{ user `memory` }}", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-vmware", + "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_timeout": "10000s", + "ssh_username": "vagrant", + "tools_upload_flavor": "linux", + "type": "vmware-iso", + "vm_name": "{{ user `template` }}", + "vmx_data": { + "cpuid.coresPerSocket": "1", + "ethernet0.pciSlotNumber": "32" + }, + "vmx_remove_ethernet_interfaces": true + }, + { + "boot_command": [ + " <wait>", + " <wait>", + " <wait>", + " <wait>", + " <wait>", + "<esc><wait>", + "<f6><wait>", + "<esc><wait>", + "<bs><bs><bs><bs><wait>", + " autoinstall<wait5>", + " ds=nocloud-net<wait5>", + ";s=http://<wait5>{{.HTTPIP}}<wait5>:{{.HTTPPort}}/<wait5>", + " ---<wait5>", + "<enter><wait5>" + ], + "boot_wait": "5s", + "cpus": "{{ user `cpus` }}", + "disk_size": "{{user `disk_size`}}", + "guest_os_type": "ubuntu", + "http_directory": "{{user `http_directory`}}", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "memory": "{{ user `memory` }}", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-parallels", + "parallels_tools_flavor": "lin", + "prlctl_version_file": ".prlctl_version", + "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_timeout": "10000s", + "ssh_username": "vagrant", + "type": "parallels-iso", + "vm_name": "{{ user `template` }}" + }, + { + "boot_command": [ + " <wait>", + " <wait>", + " <wait>", + " <wait>", + " <wait>", + "<esc><wait>", + "<f6><wait>", + "<esc><wait>", + "<bs><bs><bs><bs><wait>", + " autoinstall<wait5>", + " ds=nocloud-net<wait5>", + ";s=http://<wait5>{{.HTTPIP}}<wait5>:{{.HTTPPort}}/<wait5>", + " ---<wait5>", + "<enter><wait5>" + ], + "boot_wait": "5s", + "cpus": "{{ user `cpus` }}", + "disk_size": "{{user `disk_size`}}", + "headless": "{{ user `headless` }}", + "http_directory": "{{user `http_directory`}}", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "memory": "{{ user `memory` }}", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-qemu", + "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_timeout": "10000s", + "ssh_username": "vagrant", + "type": "qemu", + "vm_name": "{{ user `template` }}" + }, + { + "boot_command": [ + " <wait>", + " <wait>", + " <wait>", + " <wait>", + " <wait>", + "<esc><wait>", + "<f6><wait>", + "<esc><wait>", + "<bs><bs><bs><bs><wait>", + " autoinstall<wait5>", + " ds=nocloud-net<wait5>", + ";s=http://<wait5>{{.HTTPIP}}<wait5>:{{.HTTPPort}}/<wait5>", + " ---<wait5>", + "<enter><wait5>" + ], + "boot_wait": "5s", + "communicator": "ssh", + "cpus": "{{ user `cpus` }}", + "disk_size": "{{user `disk_size`}}", + "enable_secure_boot": false, + "generation": "{{user `hyperv_generation`}}", + "http_directory": "{{user `http_directory`}}", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "memory": "{{user `memory`}}", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-hyperv", + "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_timeout": "10000s", + "ssh_username": "vagrant", + "switch_name": "{{user `hyperv_switch`}}", + "type": "hyperv-iso", + "vm_name": "{{ user `template` }}" + } + ], + "post-processors": [ + { + "output": "{{ user `build_directory` }}/{{user `box_basename`}}.{{.Provider}}.box", + "type": "vagrant" + } + ], + "provisioners": [ + { + "environment_vars": [ + "HOME_DIR=/home/vagrant", + "http_proxy={{user `http_proxy`}}", + "https_proxy={{user `https_proxy`}}", + "no_proxy={{user `no_proxy`}}" + ], + "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", + "expect_disconnect": true, + "scripts": [ + "{{template_dir}}/scripts/update.sh", + "{{template_dir}}/../_common/motd.sh", + "{{template_dir}}/../_common/sshd.sh", + "{{template_dir}}/scripts/networking.sh", + "{{template_dir}}/scripts/sudoers.sh", + "{{template_dir}}/scripts/vagrant.sh", + "{{template_dir}}/../_common/virtualbox.sh", + "{{template_dir}}/scripts/vmware.sh", + "{{template_dir}}/../_common/parallels.sh", + "{{template_dir}}/scripts/hyperv.sh", + "{{template_dir}}/scripts/cleanup.sh", + "{{template_dir}}/../_common/minimize.sh" + ], + "type": "shell" + } + ], + "variables": { + "box_basename": "ubuntu-20.04-live", + "build_directory": "../../builds", + "build_timestamp": "{{isotime \"20060102150405\"}}", + "cpus": "1", + "disk_size": "65536", + "git_revision": "__unknown_git_revision__", + "guest_additions_url": "", + "headless": "", + "http_directory": "{{template_dir}}/http", + "http_proxy": "{{env `http_proxy`}}", + "https_proxy": "{{env `https_proxy`}}", + "hyperv_generation": "2", + "hyperv_switch": "{{env `hyperv_switch`}}", + "iso_checksum": "443511f6bf12402c12503733059269a2e10dec602916c0a75263e5d990f6bb93", + "iso_name": "ubuntu-20.04.1-live-server-amd64.iso", + "memory": "1024", + "mirror": "http://releases.ubuntu.com", + "mirror_directory": "20.04", + "name": "ubuntu-20.04-live", + "no_proxy": "{{env `no_proxy`}}", + "preseed_path": "preseed.cfg", + "template": "ubuntu-20.04-live-amd64", + "version": "TIMESTAMP" + } +} diff --git a/packer_templates/ubuntu/ubuntu-20.10-amd64.json b/packer_templates/ubuntu/ubuntu-20.10-amd64.json new file mode 100644 index 000000000..763dca759 --- /dev/null +++ b/packer_templates/ubuntu/ubuntu-20.10-amd64.json @@ -0,0 +1,279 @@ +{ + "builders": [ + { + "boot_command": [ + " <wait>", + " <wait>", + " <wait>", + " <wait>", + " <wait>", + "c", + "<wait>", + "set gfxpayload=keep", + "<enter><wait>", + "linux /casper/vmlinuz quiet<wait>", + " autoinstall<wait>", + " ds=nocloud-net<wait>", + "\\;s=http://<wait>", + "{{.HTTPIP}}<wait>", + ":{{.HTTPPort}}/<wait>", + " ---", + "<enter><wait>", + "initrd /casper/initrd<wait>", + "<enter><wait>", + "boot<enter><wait>" + ], + "boot_wait": "5s", + "cpus": "{{ user `cpus` }}", + "disk_size": "{{user `disk_size`}}", + "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "guest_additions_url": "{{ user `guest_additions_url` }}", + "guest_os_type": "Ubuntu_64", + "hard_drive_interface": "sata", + "headless": "{{ user `headless` }}", + "http_directory": "{{user `http_directory`}}", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "memory": "{{ user `memory` }}", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-virtualbox", + "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_timeout": "10000s", + "ssh_username": "vagrant", + "type": "virtualbox-iso", + "virtualbox_version_file": ".vbox_version", + "vm_name": "{{ user `template` }}" + }, + { + "boot_command": [ + " <wait>", + " <wait>", + " <wait>", + " <wait>", + " <wait>", + "c", + "<wait>", + "set gfxpayload=keep", + "<enter><wait>", + "linux /casper/vmlinuz quiet<wait>", + " autoinstall<wait>", + " ds=nocloud-net<wait>", + "\\;s=http://<wait>", + "{{.HTTPIP}}<wait>", + ":{{.HTTPPort}}/<wait>", + " ---", + "<enter><wait>", + "initrd /casper/initrd<wait>", + "<enter><wait>", + "boot<enter><wait>" + ], + "boot_wait": "5s", + "cpus": "{{ user `cpus` }}", + "disk_size": "{{user `disk_size`}}", + "guest_os_type": "ubuntu-64", + "headless": "{{ user `headless` }}", + "http_directory": "{{user `http_directory`}}", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "memory": "{{ user `memory` }}", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-vmware", + "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_timeout": "10000s", + "ssh_username": "vagrant", + "tools_upload_flavor": "linux", + "type": "vmware-iso", + "vm_name": "{{ user `template` }}", + "vmx_data": { + "cpuid.coresPerSocket": "1", + "ethernet0.pciSlotNumber": "32" + }, + "vmx_remove_ethernet_interfaces": true + }, + { + "boot_command": [ + " <wait>", + " <wait>", + " <wait>", + " <wait>", + " <wait>", + "c", + "<wait>", + "set gfxpayload=keep", + "<enter><wait>", + "linux /casper/vmlinuz quiet<wait>", + " autoinstall<wait>", + " ds=nocloud-net<wait>", + "\\;s=http://<wait>", + "{{.HTTPIP}}<wait>", + ":{{.HTTPPort}}/<wait>", + " ---", + "<enter><wait>", + "initrd /casper/initrd<wait>", + "<enter><wait>", + "boot<enter><wait>" + ], + "boot_wait": "5s", + "cpus": "{{ user `cpus` }}", + "disk_size": "{{user `disk_size`}}", + "guest_os_type": "ubuntu", + "http_directory": "{{user `http_directory`}}", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "memory": "{{ user `memory` }}", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-parallels", + "parallels_tools_flavor": "lin", + "prlctl_version_file": ".prlctl_version", + "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_timeout": "10000s", + "ssh_username": "vagrant", + "type": "parallels-iso", + "vm_name": "{{ user `template` }}" + }, + { + "boot_command": [ + " <wait>", + " <wait>", + " <wait>", + " <wait>", + " <wait>", + "c", + "<wait>", + "set gfxpayload=keep", + "<enter><wait>", + "linux /casper/vmlinuz quiet<wait>", + " autoinstall<wait>", + " ds=nocloud-net<wait>", + "\\;s=http://<wait>", + "{{.HTTPIP}}<wait>", + ":{{.HTTPPort}}/<wait>", + " ---", + "<enter><wait>", + "initrd /casper/initrd<wait>", + "<enter><wait>", + "boot<enter><wait>" + ], + "boot_wait": "5s", + "cpus": "{{ user `cpus` }}", + "disk_size": "{{user `disk_size`}}", + "headless": "{{ user `headless` }}", + "http_directory": "{{user `http_directory`}}", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "memory": "{{ user `memory` }}", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-qemu", + "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_timeout": "10000s", + "ssh_username": "vagrant", + "type": "qemu", + "vm_name": "{{ user `template` }}" + }, + { + "boot_command": [ + " <wait>", + " <wait>", + " <wait>", + " <wait>", + " <wait>", + "c", + "<wait>", + "set gfxpayload=keep", + "<enter><wait>", + "linux /casper/vmlinuz quiet<wait>", + " autoinstall<wait>", + " ds=nocloud-net<wait>", + "\\;s=http://<wait>", + "{{.HTTPIP}}<wait>", + ":{{.HTTPPort}}/<wait>", + " ---", + "<enter><wait>", + "initrd /casper/initrd<wait>", + "<enter><wait>", + "boot<enter><wait>" + ], + "boot_wait": "5s", + "communicator": "ssh", + "cpus": "{{ user `cpus` }}", + "disk_size": "{{user `disk_size`}}", + "enable_secure_boot": false, + "generation": "{{user `hyperv_generation`}}", + "http_directory": "{{user `http_directory`}}", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "memory": "{{user `memory`}}", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-hyperv", + "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_timeout": "10000s", + "ssh_username": "vagrant", + "switch_name": "{{user `hyperv_switch`}}", + "type": "hyperv-iso", + "vm_name": "{{ user `template` }}" + } + ], + "post-processors": [ + { + "output": "{{ user `build_directory` }}/{{user `box_basename`}}.{{.Provider}}.box", + "type": "vagrant" + } + ], + "provisioners": [ + { + "environment_vars": [ + "HOME_DIR=/home/vagrant", + "http_proxy={{user `http_proxy`}}", + "https_proxy={{user `https_proxy`}}", + "no_proxy={{user `no_proxy`}}" + ], + "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", + "expect_disconnect": true, + "scripts": [ + "{{template_dir}}/scripts/update.sh", + "{{template_dir}}/../_common/motd.sh", + "{{template_dir}}/../_common/sshd.sh", + "{{template_dir}}/scripts/networking.sh", + "{{template_dir}}/scripts/sudoers.sh", + "{{template_dir}}/scripts/vagrant.sh", + "{{template_dir}}/../_common/virtualbox.sh", + "{{template_dir}}/scripts/vmware.sh", + "{{template_dir}}/../_common/parallels.sh", + "{{template_dir}}/scripts/hyperv.sh", + "{{template_dir}}/scripts/cleanup.sh", + "{{template_dir}}/../_common/minimize.sh" + ], + "type": "shell" + } + ], + "variables": { + "box_basename": "ubuntu-20.10", + "build_directory": "../../builds", + "build_timestamp": "{{isotime \"20060102150405\"}}", + "cpus": "1", + "disk_size": "65536", + "git_revision": "__unknown_git_revision__", + "guest_additions_url": "", + "headless": "", + "http_directory": "{{template_dir}}/http", + "http_proxy": "{{env `http_proxy`}}", + "https_proxy": "{{env `https_proxy`}}", + "hyperv_generation": "2", + "hyperv_switch": "{{env `hyperv_switch`}}", + "iso_checksum": "defdc1ad3af7b661fe2b4ee861fb6fdb5f52039389ef56da6efc05e6adfe3d45", + "iso_name": "ubuntu-20.10-live-server-amd64.iso", + "memory": "1024", + "mirror": "http://releases.ubuntu.com", + "mirror_directory": "groovy", + "name": "ubuntu-20.10", + "no_proxy": "{{env `no_proxy`}}", + "preseed_path": "preseed.cfg", + "template": "ubuntu-20.10-amd64", + "version": "TIMESTAMP" + } +} diff --git a/packer_templates/ubuntu/ubuntu-21.04-amd64.json b/packer_templates/ubuntu/ubuntu-21.04-amd64.json new file mode 100644 index 000000000..157266655 --- /dev/null +++ b/packer_templates/ubuntu/ubuntu-21.04-amd64.json @@ -0,0 +1,279 @@ +{ + "builders": [ + { + "boot_command": [ + " <wait>", + " <wait>", + " <wait>", + " <wait>", + " <wait>", + "c", + "<wait>", + "set gfxpayload=keep", + "<enter><wait>", + "linux /casper/vmlinuz quiet<wait>", + " autoinstall<wait>", + " ds=nocloud-net<wait>", + "\\;s=http://<wait>", + "{{.HTTPIP}}<wait>", + ":{{.HTTPPort}}/<wait>", + " ---", + "<enter><wait>", + "initrd /casper/initrd<wait>", + "<enter><wait>", + "boot<enter><wait>" + ], + "boot_wait": "5s", + "cpus": "{{ user `cpus` }}", + "disk_size": "{{user `disk_size`}}", + "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "guest_additions_url": "{{ user `guest_additions_url` }}", + "guest_os_type": "Ubuntu_64", + "hard_drive_interface": "sata", + "headless": "{{ user `headless` }}", + "http_directory": "{{user `http_directory`}}", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "memory": "{{ user `memory` }}", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-virtualbox", + "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_timeout": "10000s", + "ssh_username": "vagrant", + "type": "virtualbox-iso", + "virtualbox_version_file": ".vbox_version", + "vm_name": "{{ user `template` }}" + }, + { + "boot_command": [ + " <wait>", + " <wait>", + " <wait>", + " <wait>", + " <wait>", + "c", + "<wait>", + "set gfxpayload=keep", + "<enter><wait>", + "linux /casper/vmlinuz quiet<wait>", + " autoinstall<wait>", + " ds=nocloud-net<wait>", + "\\;s=http://<wait>", + "{{.HTTPIP}}<wait>", + ":{{.HTTPPort}}/<wait>", + " ---", + "<enter><wait>", + "initrd /casper/initrd<wait>", + "<enter><wait>", + "boot<enter><wait>" + ], + "boot_wait": "5s", + "cpus": "{{ user `cpus` }}", + "disk_size": "{{user `disk_size`}}", + "guest_os_type": "ubuntu-64", + "headless": "{{ user `headless` }}", + "http_directory": "{{user `http_directory`}}", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "memory": "{{ user `memory` }}", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-vmware", + "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_timeout": "10000s", + "ssh_username": "vagrant", + "tools_upload_flavor": "linux", + "type": "vmware-iso", + "vm_name": "{{ user `template` }}", + "vmx_data": { + "cpuid.coresPerSocket": "1", + "ethernet0.pciSlotNumber": "32" + }, + "vmx_remove_ethernet_interfaces": true + }, + { + "boot_command": [ + " <wait>", + " <wait>", + " <wait>", + " <wait>", + " <wait>", + "c", + "<wait>", + "set gfxpayload=keep", + "<enter><wait>", + "linux /casper/vmlinuz quiet<wait>", + " autoinstall<wait>", + " ds=nocloud-net<wait>", + "\\;s=http://<wait>", + "{{.HTTPIP}}<wait>", + ":{{.HTTPPort}}/<wait>", + " ---", + "<enter><wait>", + "initrd /casper/initrd<wait>", + "<enter><wait>", + "boot<enter><wait>" + ], + "boot_wait": "5s", + "cpus": "{{ user `cpus` }}", + "disk_size": "{{user `disk_size`}}", + "guest_os_type": "ubuntu", + "http_directory": "{{user `http_directory`}}", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "memory": "{{ user `memory` }}", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-parallels", + "parallels_tools_flavor": "lin", + "prlctl_version_file": ".prlctl_version", + "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_timeout": "10000s", + "ssh_username": "vagrant", + "type": "parallels-iso", + "vm_name": "{{ user `template` }}" + }, + { + "boot_command": [ + " <wait>", + " <wait>", + " <wait>", + " <wait>", + " <wait>", + "c", + "<wait>", + "set gfxpayload=keep", + "<enter><wait>", + "linux /casper/vmlinuz quiet<wait>", + " autoinstall<wait>", + " ds=nocloud-net<wait>", + "\\;s=http://<wait>", + "{{.HTTPIP}}<wait>", + ":{{.HTTPPort}}/<wait>", + " ---", + "<enter><wait>", + "initrd /casper/initrd<wait>", + "<enter><wait>", + "boot<enter><wait>" + ], + "boot_wait": "5s", + "cpus": "{{ user `cpus` }}", + "disk_size": "{{user `disk_size`}}", + "headless": "{{ user `headless` }}", + "http_directory": "{{user `http_directory`}}", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "memory": "{{ user `memory` }}", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-qemu", + "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_timeout": "10000s", + "ssh_username": "vagrant", + "type": "qemu", + "vm_name": "{{ user `template` }}" + }, + { + "boot_command": [ + " <wait>", + " <wait>", + " <wait>", + " <wait>", + " <wait>", + "c", + "<wait>", + "set gfxpayload=keep", + "<enter><wait>", + "linux /casper/vmlinuz quiet<wait>", + " autoinstall<wait>", + " ds=nocloud-net<wait>", + "\\;s=http://<wait>", + "{{.HTTPIP}}<wait>", + ":{{.HTTPPort}}/<wait>", + " ---", + "<enter><wait>", + "initrd /casper/initrd<wait>", + "<enter><wait>", + "boot<enter><wait>" + ], + "boot_wait": "5s", + "communicator": "ssh", + "cpus": "{{ user `cpus` }}", + "disk_size": "{{user `disk_size`}}", + "enable_secure_boot": false, + "generation": "{{user `hyperv_generation`}}", + "http_directory": "{{user `http_directory`}}", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "memory": "{{user `memory`}}", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-hyperv", + "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_timeout": "10000s", + "ssh_username": "vagrant", + "switch_name": "{{user `hyperv_switch`}}", + "type": "hyperv-iso", + "vm_name": "{{ user `template` }}" + } + ], + "post-processors": [ + { + "output": "{{ user `build_directory` }}/{{user `box_basename`}}.{{.Provider}}.box", + "type": "vagrant" + } + ], + "provisioners": [ + { + "environment_vars": [ + "HOME_DIR=/home/vagrant", + "http_proxy={{user `http_proxy`}}", + "https_proxy={{user `https_proxy`}}", + "no_proxy={{user `no_proxy`}}" + ], + "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", + "expect_disconnect": true, + "scripts": [ + "{{template_dir}}/scripts/update.sh", + "{{template_dir}}/../_common/motd.sh", + "{{template_dir}}/../_common/sshd.sh", + "{{template_dir}}/scripts/networking.sh", + "{{template_dir}}/scripts/sudoers.sh", + "{{template_dir}}/scripts/vagrant.sh", + "{{template_dir}}/../_common/virtualbox.sh", + "{{template_dir}}/scripts/vmware.sh", + "{{template_dir}}/../_common/parallels.sh", + "{{template_dir}}/scripts/hyperv.sh", + "{{template_dir}}/scripts/cleanup.sh", + "{{template_dir}}/../_common/minimize.sh" + ], + "type": "shell" + } + ], + "variables": { + "box_basename": "ubuntu-21.04", + "build_directory": "../../builds", + "build_timestamp": "{{isotime \"20060102150405\"}}", + "cpus": "1", + "disk_size": "65536", + "git_revision": "__unknown_git_revision__", + "guest_additions_url": "", + "headless": "", + "http_directory": "{{template_dir}}/http", + "http_proxy": "{{env `http_proxy`}}", + "https_proxy": "{{env `https_proxy`}}", + "hyperv_generation": "2", + "hyperv_switch": "{{env `hyperv_switch`}}", + "iso_checksum": "dade2fb5cd82f70b14c1677c0e3968cadf1f95740473247a27ef4cf98fbd140e", + "iso_name": "hirsute-live-server-amd64.iso", + "memory": "1024", + "mirror": "http://cdimage.ubuntu.com", + "mirror_directory": "daily-live/pending", + "name": "ubuntu-21.04", + "no_proxy": "{{env `no_proxy`}}", + "preseed_path": "preseed.cfg", + "template": "ubuntu-21.04-amd64", + "version": "TIMESTAMP" + } +} From ceeb7a9f7d26563203923af18c3e28ebc5314917 Mon Sep 17 00:00:00 2001 From: SG <13872653+mmguero@users.noreply.github.com> Date: Thu, 10 Dec 2020 09:02:26 -0700 Subject: [PATCH 1326/1622] Updated Debian from 10.6 to 10.7 for amd64 and i386 Signed-off-by: SG <13872653+mmguero@users.noreply.github.com> --- README.md | 4 ++-- builds.yml | 4 ++-- ...debian-10.6-amd64.json => debian-10.7-amd64.json} | 12 ++++++------ .../{debian-10.6-i386.json => debian-10.7-i386.json} | 12 ++++++------ 4 files changed, 16 insertions(+), 16 deletions(-) rename packer_templates/debian/{debian-10.6-amd64.json => debian-10.7-amd64.json} (96%) rename packer_templates/debian/{debian-10.6-i386.json => debian-10.7-i386.json} (96%) diff --git a/README.md b/README.md index d775d83fb..9e36686bd 100644 --- a/README.md +++ b/README.md @@ -44,11 +44,11 @@ $ cd packer_templates/ubuntu $ packer build -only=virtualbox-iso ubuntu-18.04-amd64.json ``` -To build Debian 10.6 32bit boxes for all possible providers (simultaneously) +To build Debian 10.7 32bit boxes for all possible providers (simultaneously) ``` $ cd packer_templates/debian -$ packer build debian-10.6-i386.json +$ packer build debian-10.7-i386.json ``` To build CentOS 7.7 boxes for all providers except VMware and Parallels diff --git a/builds.yml b/builds.yml index 4f9c06916..0fb193cb2 100644 --- a/builds.yml +++ b/builds.yml @@ -7,8 +7,8 @@ public: - 'centos-8.2' - 'debian-9.13-i386' - 'debian-9.13' -- 'debian-10.6-i386' -- 'debian-10.6' +- 'debian-10.7-i386' +- 'debian-10.7' - 'fedora-31' - 'fedora-32' - 'freebsd-11.4-i386' diff --git a/packer_templates/debian/debian-10.6-amd64.json b/packer_templates/debian/debian-10.7-amd64.json similarity index 96% rename from packer_templates/debian/debian-10.6-amd64.json rename to packer_templates/debian/debian-10.7-amd64.json index 3083dc341..7d1b5f1de 100644 --- a/packer_templates/debian/debian-10.6-amd64.json +++ b/packer_templates/debian/debian-10.7-amd64.json @@ -193,7 +193,7 @@ } ], "variables": { - "box_basename": "debian-10.6", + "box_basename": "debian-10.7", "build_directory": "../../builds", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", @@ -204,15 +204,15 @@ "http_directory": "{{template_dir}}/http", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", - "iso_checksum": "2af8f43d4a7ab852151a7f630ba596572213e17d3579400b5648eba4cc974ed0", - "iso_name": "debian-10.6.0-amd64-netinst.iso", + "iso_checksum": "b317d87b0a3d5b568f48a92dcabfc4bc51fe58d9f67ca13b013f1b8329d1306d", + "iso_name": "debian-10.7.0-amd64-netinst.iso", "memory": "1024", "mirror": "http://cdimage.debian.org/cdimage/release", - "mirror_directory": "10.6.0/amd64/iso-cd", - "name": "debian-10.6", + "mirror_directory": "10.7.0/amd64/iso-cd", + "name": "debian-10.7", "no_proxy": "{{env `no_proxy`}}", "preseed_path": "debian-9/preseed.cfg", - "template": "debian-10.6-amd64", + "template": "debian-10.7-amd64", "version": "TIMESTAMP" } } diff --git a/packer_templates/debian/debian-10.6-i386.json b/packer_templates/debian/debian-10.7-i386.json similarity index 96% rename from packer_templates/debian/debian-10.6-i386.json rename to packer_templates/debian/debian-10.7-i386.json index 75340d56a..a52a846df 100644 --- a/packer_templates/debian/debian-10.6-i386.json +++ b/packer_templates/debian/debian-10.7-i386.json @@ -193,7 +193,7 @@ } ], "variables": { - "box_basename": "debian-10.6-i386", + "box_basename": "debian-10.7-i386", "build_directory": "../../builds", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", @@ -204,15 +204,15 @@ "http_directory": "{{template_dir}}/http", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", - "iso_checksum": "c6e7bdada5a04a639e745b41ea43ae36b796b4cf4128e3dcb3c2502ab034caa3", - "iso_name": "debian-10.6.0-i386-netinst.iso", + "iso_checksum": "5c32e6dfa5d75c70f2ea8e8ef8ae68565c37d93014f2c774d5b942b08b5d0b7b", + "iso_name": "debian-10.7.0-i386-netinst.iso", "memory": "1024", "mirror": "http://cdimage.debian.org/cdimage/release", - "mirror_directory": "10.6.0/i386/iso-cd", - "name": "debian-10.6-i386", + "mirror_directory": "10.7.0/i386/iso-cd", + "name": "debian-10.7-i386", "no_proxy": "{{env `no_proxy`}}", "preseed_path": "debian-9/preseed.cfg", - "template": "debian-10.6-i386", + "template": "debian-10.7-i386", "version": "TIMESTAMP" } } From ed6120d6305a2cfbf5b264d81fd375da5ec96423 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Mon, 21 Dec 2020 10:22:05 -0800 Subject: [PATCH 1327/1622] Update to CentOS 7.9 / 8.3 Signed-off-by: Tim Smith <tsmith@chef.io> --- ...entos-7.8-x86_64.json => centos-7.9-x86_64.json} | 13 ++++++------- ...entos-8.2-x86_64.json => centos-8.3-x86_64.json} | 12 ++++++------ 2 files changed, 12 insertions(+), 13 deletions(-) rename packer_templates/centos/{centos-7.8-x86_64.json => centos-7.9-x86_64.json} (95%) rename packer_templates/centos/{centos-8.2-x86_64.json => centos-8.3-x86_64.json} (95%) diff --git a/packer_templates/centos/centos-7.8-x86_64.json b/packer_templates/centos/centos-7.9-x86_64.json similarity index 95% rename from packer_templates/centos/centos-7.8-x86_64.json rename to packer_templates/centos/centos-7.9-x86_64.json index d07b5cb6a..4227c0670 100644 --- a/packer_templates/centos/centos-7.8-x86_64.json +++ b/packer_templates/centos/centos-7.9-x86_64.json @@ -156,7 +156,7 @@ } ], "variables": { - "box_basename": "centos-7.8", + "box_basename": "centos-7.9", "build_directory": "../../builds", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", @@ -169,16 +169,15 @@ "https_proxy": "{{env `https_proxy`}}", "hyperv_generation": "1", "hyperv_switch": "{{env `hyperv_switch`}}", - "iso_checksum": "659691c28a0e672558b003d223f83938f254b39875ee7559d1a4a14c79173193", - "iso_name": "CentOS-7-x86_64-Minimal-2003.iso", + "iso_checksum": "07b94e6b1a0b0260b94c83d6bb76b26bf7a310dc78d7a9c7432809fb9bc6194a", + "iso_name": "CentOS-7-x86_64-Minimal-2009.iso", "ks_path": "7/ks.cfg", "memory": "1024", "mirror": "http://mirrors.kernel.org/centos", - "mirror_directory": "7.8.2003/isos/x86_64", - "name": "centos-7.8", + "mirror_directory": "7.9.2009/isos/x86_64", + "name": "centos-7.9", "no_proxy": "{{env `no_proxy`}}", - "template": "centos-7.8-x86_64", + "template": "centos-7.9-x86_64", "version": "TIMESTAMP" } } - diff --git a/packer_templates/centos/centos-8.2-x86_64.json b/packer_templates/centos/centos-8.3-x86_64.json similarity index 95% rename from packer_templates/centos/centos-8.2-x86_64.json rename to packer_templates/centos/centos-8.3-x86_64.json index 82cacede4..379f50260 100644 --- a/packer_templates/centos/centos-8.2-x86_64.json +++ b/packer_templates/centos/centos-8.3-x86_64.json @@ -156,7 +156,7 @@ } ], "variables": { - "box_basename": "centos-8.2", + "box_basename": "centos-8.3", "build_directory": "../../builds", "build_timestamp": "{{isotime \"2019102650405\"}}", "cpus": "1", @@ -169,15 +169,15 @@ "https_proxy": "{{env `https_proxy`}}", "hyperv_generation": "1", "hyperv_switch": "{{env `hyperv_switch`}}", - "iso_checksum": "47ab14778c823acae2ee6d365d76a9aed3f95bb8d0add23a06536b58bb5293c0", - "iso_name": "CentOS-8.2.2004-x86_64-minimal.iso", + "iso_checksum": "aaf9d4b3071c16dbbda01dfe06085e5d0fdac76df323e3bbe87cce4318052247", + "iso_name": "CentOS-8.3.2011-x86_64-dvd1.iso", "ks_path": "8/ks.cfg", "memory": "1024", "mirror": "http://mirrors.kernel.org/centos", - "mirror_directory": "8.2.2004/isos/x86_64", - "name": "centos-8.2", + "mirror_directory": "8.3.2011/isos/x86_64", + "name": "centos-8.3", "no_proxy": "{{env `no_proxy`}}", - "template": "centos-8.2-x86_64", + "template": "centos-8.3-x86_64", "version": "TIMESTAMP" } } From 468eee7fc4e3a0de938d541745a96ab6f78e6a78 Mon Sep 17 00:00:00 2001 From: kartnico <kartnico@kartzone.info> Date: Sat, 19 Dec 2020 19:28:12 +0100 Subject: [PATCH 1328/1622] Add qemu in Windows 10 Gen2 installation Signed-off-by: kartnico <kartnico@kartzone.info> --- packer_templates/windows/windows-10gen2.json | 42 +++++++++++++++++++- 1 file changed, 41 insertions(+), 1 deletion(-) diff --git a/packer_templates/windows/windows-10gen2.json b/packer_templates/windows/windows-10gen2.json index 9891cf184..4269dbbfe 100644 --- a/packer_templates/windows/windows-10gen2.json +++ b/packer_templates/windows/windows-10gen2.json @@ -24,6 +24,42 @@ "winrm_password": "vagrant", "winrm_timeout": "12h", "winrm_username": "vagrant" + }, + { + "boot_command": [ + "aaaaaaa<wait><enter><wait><enter><wait><enter>" + ], + "communicator": "winrm", + "cpus": "{{ user `cpus` }}", + "disk_size": "{{user `disk_size`}}", + "headless": "{{ user `headless` }}", + "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", + "iso_url": "{{ user `iso_url` }}", + "memory": "{{ user `memory` }}", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-qemu", + "cd_files": "{{ user `cd_files` }}", + "disk_interface": "{{ user `disk_interface` }}", + "qemuargs": [ + [ + "-m", + "{{ user `memory` }}" + ], + [ + "-smp", + "{{ user `cpus` }}" + ], + [ + "-bios", + "{{ user `qemu_bios` }}" + ] + ], + "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"", + "shutdown_timeout": "15m", + "type": "qemu", + "boot_wait": "{{ user `boot_wait` }}", + "winrm_password": "vagrant", + "winrm_timeout": "12h", + "winrm_username": "vagrant" } ], "post-processors": [ @@ -112,6 +148,10 @@ "virtio_win_iso": "virtio-win.iso", "vm_name": "windows_10", "winrm_timeout": "6h", - "working_directory": "" + "working_directory": "", + "qemu_bios": "/usr/share/OVMF/OVMF_CODE.fd", + "disk_interface": "ide", + "boot_wait": "10s", + "cd_files": "{{template_dir}}/answer_files/10/Autounattend.xml" } } From 7cfa47a88d52ffba235bef2cabb2bba346b35540 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Tue, 22 Dec 2020 21:55:39 -0800 Subject: [PATCH 1329/1622] Fail hard if a command fails Signed-off-by: Tim Smith <tsmith@chef.io> --- lib/bento/common.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/bento/common.rb b/lib/bento/common.rb index 21b96a52f..120c2c346 100644 --- a/lib/bento/common.rb +++ b/lib/bento/common.rb @@ -21,6 +21,7 @@ def shellout(cmd) sout = Mixlib::ShellOut.new(cmd) sout.live_stream = STDOUT sout.run_command + sout.error! # fail hard if the cmd fails end def warn(msg) From 541d7a4af4bd9cbe6d62725ddcb67fffbe3afe24 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Tue, 22 Dec 2020 22:11:20 -0800 Subject: [PATCH 1330/1622] Remove EOL Fedora 31 Signed-off-by: Tim Smith <tsmith@chef.io> --- builds.yml | 8 +- packer_templates/fedora/fedora-31-x86_64.json | 191 ------------------ 2 files changed, 4 insertions(+), 195 deletions(-) delete mode 100644 packer_templates/fedora/fedora-31-x86_64.json diff --git a/builds.yml b/builds.yml index 2720c9d37..a1fb4d115 100644 --- a/builds.yml +++ b/builds.yml @@ -3,14 +3,14 @@ public: - 'amazon-2' - 'centos-6.10-i386' - 'centos-6.10' -- 'centos-7.8' -- 'centos-8.2' +- 'centos-7.9' +- 'centos-8.3' - 'debian-9.13-i386' - 'debian-9.13' - 'debian-10.7-i386' - 'debian-10.7' -- 'fedora-31' - 'fedora-32' +- 'fedora-33' - 'freebsd-11.4-i386' - 'freebsd-11.4' - 'freebsd-12.1-i386' @@ -43,4 +43,4 @@ slugs: 'freebsd-11': 'freebsd-11' 'freebsd-12': 'freebsd-12' 'opensuse-leap-15': 'opensuse-leap-15' - 'fedora-latest': 'fedora-32' + 'fedora-latest': 'fedora-33' diff --git a/packer_templates/fedora/fedora-31-x86_64.json b/packer_templates/fedora/fedora-31-x86_64.json deleted file mode 100644 index 71afd0ce9..000000000 --- a/packer_templates/fedora/fedora-31-x86_64.json +++ /dev/null @@ -1,191 +0,0 @@ -{ - "builders": [ - { - "accelerator": "kvm", - "boot_command": [ - "<up><wait><tab> linux ks=http://{{.HTTPIP}}:{{.HTTPPort}}/{{user `ks_path`}}<enter><wait>" - ], - "boot_wait": "10s", - "cpus": "{{ user `cpus` }}", - "disk_cache": "unsafe", - "disk_compression": true, - "disk_discard": "unmap", - "disk_interface": "virtio-scsi", - "disk_size": "{{user `disk_size`}}", - "format": "qcow2", - "headless": "{{ user `headless` }}", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "name": "{{ user `template` }}", - "net_device": "virtio-net", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-libvirt", - "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "3600s", - "ssh_username": "vagrant", - "type": "qemu", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<up><wait><tab> linux ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" - ], - "boot_wait": "10s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", - "guest_additions_url": "{{ user `guest_additions_url` }}", - "guest_os_type": "Fedora_64", - "hard_drive_interface": "sata", - "headless": "{{ user `headless` }}", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-virtualbox", - "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "type": "virtualbox-iso", - "virtualbox_version_file": ".vbox_version", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<up><wait><tab> linux ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" - ], - "boot_wait": "10s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "fedora-64", - "headless": "{{ user `headless` }}", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-vmware", - "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "tools_upload_flavor": "linux", - "type": "vmware-iso", - "vm_name": "{{ user `template` }}", - "vmx_data": { - "cpuid.coresPerSocket": "1", - "ethernet0.pciSlotNumber": "32" - }, - "vmx_remove_ethernet_interfaces": true - }, - { - "boot_command": [ - "<up><wait><tab> linux ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" - ], - "boot_wait": "10s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "fedora-core", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-parallels", - "parallels_tools_flavor": "lin", - "prlctl_version_file": ".prlctl_version", - "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "type": "parallels-iso", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<up><wait><tab> linux ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" - ], - "boot_wait": "10s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "headless": "{{ user `headless` }}", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-qemu", - "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "type": "qemu", - "qemuargs": [["{{ user `qemuargs_opt` }}","{{ user `qemuargs_value` }}"]], - "vm_name": "{{ user `template` }}" - } - ], - "post-processors": [ - { - "output": "{{ user `build_directory` }}/{{user `box_basename`}}.{{.Provider}}.box", - "type": "vagrant" - } - ], - "provisioners": [ - { - "environment_vars": [ - "HOME_DIR=/home/vagrant", - "http_proxy={{user `http_proxy`}}", - "https_proxy={{user `https_proxy`}}", - "no_proxy={{user `no_proxy`}}" - ], - "execute_command": "echo 'vagrant' | {{.Vars}} sudo -E -S bash '{{.Path}}'", - "expect_disconnect": true, - "scripts": [ - "{{template_dir}}/scripts/fix-slow-dns.sh", - "{{template_dir}}/scripts/build-tools.sh", - "{{template_dir}}/scripts/install-supporting-packages.sh", - "{{template_dir}}/../_common/motd.sh", - "{{template_dir}}/../_common/sshd.sh", - "{{template_dir}}/../_common/virtualbox.sh", - "{{template_dir}}/scripts/vmware.sh", - "{{template_dir}}/../_common/parallels.sh", - "{{template_dir}}/../_common/vagrant.sh", - "{{template_dir}}/scripts/real-tmp.sh", - "{{template_dir}}/scripts/cleanup.sh", - "{{template_dir}}/../_common/minimize.sh" - ], - "type": "shell" - } - ], - "variables": { - "arch": "64", - "box_basename": "fedora-31", - "build_directory": "../../builds", - "build_timestamp": "{{isotime \"20060102150405\"}}", - "cpus": "1", - "disk_size": "65536", - "git_revision": "__unknown_git_revision__", - "guest_additions_url": "", - "headless": "", - "http_directory": "{{template_dir}}/http", - "http_proxy": "{{env `http_proxy`}}", - "https_proxy": "{{env `https_proxy`}}", - "iso_checksum": "225ebc160e40bb43c5de28bad9680e3a78a9db40c9e3f4f42f3ee3f10f95dbeb", - "iso_name": "Fedora-Server-dvd-x86_64-31-1.9.iso", - "ks_path": "ks-fedora.cfg", - "memory": "1024", - "mirror": "http://download.fedoraproject.org/pub/fedora/linux", - "mirror_directory": "releases/31/Server/x86_64/iso", - "name": "fedora-31", - "no_proxy": "{{env `no_proxy`}}", - "template": "fedora-31-x86_64", - "qemuargs_opt": "-m", - "qemuargs_value": "1024M", - "version": "TIMESTAMP" - } -} From fec2b81c539efb8941f0e510abc0364d9a959a28 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Tue, 22 Dec 2020 22:13:31 -0800 Subject: [PATCH 1331/1622] Remove EOL Ubuntu 19.10 Signed-off-by: Tim Smith <tsmith@chef.io> --- .../ubuntu/ubuntu-19.10-amd64.json | 282 ------------------ 1 file changed, 282 deletions(-) delete mode 100644 packer_templates/ubuntu/ubuntu-19.10-amd64.json diff --git a/packer_templates/ubuntu/ubuntu-19.10-amd64.json b/packer_templates/ubuntu/ubuntu-19.10-amd64.json deleted file mode 100644 index e853c07c1..000000000 --- a/packer_templates/ubuntu/ubuntu-19.10-amd64.json +++ /dev/null @@ -1,282 +0,0 @@ -{ - "builders": [ - { - "boot_command": [ - "<esc><wait>", - "<esc><wait>", - "<enter><wait>", - "/install/vmlinuz<wait>", - " auto<wait>", - " console-setup/ask_detect=false<wait>", - " console-setup/layoutcode=us<wait>", - " console-setup/modelcode=pc105<wait>", - " debconf/frontend=noninteractive<wait>", - " debian-installer=en_US.UTF-8<wait>", - " fb=false<wait>", - " initrd=/install/initrd.gz<wait>", - " kbd-chooser/method=us<wait>", - " keyboard-configuration/layout=USA<wait>", - " keyboard-configuration/variant=USA<wait>", - " locale=en_US.UTF-8<wait>", - " netcfg/get_domain=vm<wait>", - " netcfg/get_hostname=vagrant<wait>", - " grub-installer/bootdev=/dev/sda<wait>", - " noapic<wait>", - " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}}<wait>", - " -- <wait>", - "<enter><wait>" - ], - "boot_wait": "10s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", - "guest_additions_url": "{{ user `guest_additions_url` }}", - "guest_os_type": "Ubuntu_64", - "hard_drive_interface": "sata", - "headless": "{{ user `headless` }}", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-virtualbox", - "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "type": "virtualbox-iso", - "virtualbox_version_file": ".vbox_version", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<esc><wait>", - "<esc><wait>", - "<enter><wait>", - "/install/vmlinuz<wait>", - " auto<wait>", - " console-setup/ask_detect=false<wait>", - " console-setup/layoutcode=us<wait>", - " console-setup/modelcode=pc105<wait>", - " debconf/frontend=noninteractive<wait>", - " debian-installer=en_US.UTF-8<wait>", - " fb=false<wait>", - " initrd=/install/initrd.gz<wait>", - " kbd-chooser/method=us<wait>", - " keyboard-configuration/layout=USA<wait>", - " keyboard-configuration/variant=USA<wait>", - " locale=en_US.UTF-8<wait>", - " netcfg/get_domain=vm<wait>", - " netcfg/get_hostname=vagrant<wait>", - " grub-installer/bootdev=/dev/sda<wait>", - " noapic<wait>", - " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}}<wait>", - " -- <wait>", - "<enter><wait>" - ], - "boot_wait": "10s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "ubuntu-64", - "headless": "{{ user `headless` }}", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-vmware", - "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "tools_upload_flavor": "linux", - "type": "vmware-iso", - "vm_name": "{{ user `template` }}", - "vmx_data": { - "cpuid.coresPerSocket": "1", - "ethernet0.pciSlotNumber": "32" - }, - "vmx_remove_ethernet_interfaces": true - }, - { - "boot_command": [ - "<esc><wait>", - "<esc><wait>", - "<enter><wait>", - "/install/vmlinuz<wait>", - " auto<wait>", - " console-setup/ask_detect=false<wait>", - " console-setup/layoutcode=us<wait>", - " console-setup/modelcode=pc105<wait>", - " debconf/frontend=noninteractive<wait>", - " debian-installer=en_US.UTF-8<wait>", - " fb=false<wait>", - " initrd=/install/initrd.gz<wait>", - " kbd-chooser/method=us<wait>", - " keyboard-configuration/layout=USA<wait>", - " keyboard-configuration/variant=USA<wait>", - " locale=en_US.UTF-8<wait>", - " netcfg/get_domain=vm<wait>", - " netcfg/get_hostname=vagrant<wait>", - " grub-installer/bootdev=/dev/sda<wait>", - " noapic<wait>", - " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}}<wait>", - " -- <wait>", - "<enter><wait>" - ], - "boot_wait": "10s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "ubuntu", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-parallels", - "parallels_tools_flavor": "lin", - "prlctl_version_file": ".prlctl_version", - "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "type": "parallels-iso", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<esc><wait>", - "<esc><wait>", - "<enter><wait>", - "/install/vmlinuz<wait>", - " auto<wait>", - " console-setup/ask_detect=false<wait>", - " console-setup/layoutcode=us<wait>", - " console-setup/modelcode=pc105<wait>", - " debconf/frontend=noninteractive<wait>", - " debian-installer=en_US.UTF-8<wait>", - " fb=false<wait>", - " initrd=/install/initrd.gz<wait>", - " kbd-chooser/method=us<wait>", - " keyboard-configuration/layout=USA<wait>", - " keyboard-configuration/variant=USA<wait>", - " locale=en_US.UTF-8<wait>", - " netcfg/get_domain=vm<wait>", - " netcfg/get_hostname=vagrant<wait>", - " grub-installer/bootdev=/dev/vda<wait>", - " noapic<wait>", - " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}}<wait>", - " -- <wait>", - "<enter><wait>" - ], - "boot_wait": "10s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "headless": "{{ user `headless` }}", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-qemu", - "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "type": "qemu", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<esc><wait10><esc><esc><enter><wait>", - "set gfxpayload=1024x768<enter>", - "linux /install/vmlinuz ", - "preseed/url=http://{{.HTTPIP}}:{{.HTTPPort}}/preseed-hyperv.cfg ", - "debian-installer=en_US.UTF-8 auto locale=en_US.UTF-8 kbd-chooser/method=us ", - "hostname={{.Name}} ", - "fb=false debconf/frontend=noninteractive ", - "keyboard-configuration/modelcode=SKIP keyboard-configuration/layout=USA ", - "keyboard-configuration/variant=USA console-setup/ask_detect=false <enter>", - "initrd /install/initrd.gz<enter>", - "boot<enter>" - ], - "boot_wait": "10s", - "communicator": "ssh", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "enable_secure_boot": false, - "generation": "{{user `hyperv_generation`}}", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{user `memory`}}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-hyperv", - "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "switch_name": "{{user `hyperv_switch`}}", - "type": "hyperv-iso", - "vm_name": "{{ user `template` }}" - } - ], - "post-processors": [ - { - "output": "{{ user `build_directory` }}/{{user `box_basename`}}.{{.Provider}}.box", - "type": "vagrant" - } - ], - "provisioners": [ - { - "environment_vars": [ - "HOME_DIR=/home/vagrant", - "http_proxy={{user `http_proxy`}}", - "https_proxy={{user `https_proxy`}}", - "no_proxy={{user `no_proxy`}}" - ], - "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", - "expect_disconnect": true, - "scripts": [ - "{{template_dir}}/scripts/update.sh", - "{{template_dir}}/../_common/motd.sh", - "{{template_dir}}/../_common/sshd.sh", - "{{template_dir}}/scripts/networking.sh", - "{{template_dir}}/scripts/sudoers.sh", - "{{template_dir}}/scripts/vagrant.sh", - "{{template_dir}}/../_common/virtualbox.sh", - "{{template_dir}}/scripts/vmware.sh", - "{{template_dir}}/../_common/parallels.sh", - "{{template_dir}}/scripts/hyperv.sh", - "{{template_dir}}/scripts/cleanup.sh", - "{{template_dir}}/../_common/minimize.sh" - ], - "type": "shell" - } - ], - "variables": { - "box_basename": "ubuntu-19.10", - "build_directory": "../../builds", - "build_timestamp": "{{isotime \"20060102150405\"}}", - "cpus": "1", - "disk_size": "65536", - "git_revision": "__unknown_git_revision__", - "guest_additions_url": "", - "headless": "", - "http_directory": "{{template_dir}}/http", - "http_proxy": "{{env `http_proxy`}}", - "https_proxy": "{{env `https_proxy`}}", - "hyperv_generation": "2", - "hyperv_switch": "{{env `hyperv_switch`}}", - "iso_checksum": "921fd8b271c04aa86a321cc35b40e677f9b85f7903bf2204efb2389b0f0a64c1", - "iso_name": "ubuntu-19.10-server-amd64.iso", - "memory": "1024", - "mirror": "http://cdimage.ubuntu.com", - "mirror_directory": "ubuntu/releases/19.10.1/release", - "name": "ubuntu-19.10", - "no_proxy": "{{env `no_proxy`}}", - "preseed_path": "preseed.cfg", - "template": "ubuntu-19.10-amd64", - "version": "TIMESTAMP" - } -} From cf73a5c1e2893896b10f82f849b259256b1db7c1 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Wed, 23 Dec 2020 10:00:44 -0800 Subject: [PATCH 1332/1622] Don't fail to minimize if the swapoff command fails This prevents failures on new Fedora boxes Signed-off-by: Tim Smith <tsmith@chef.io> --- packer_templates/_common/minimize.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packer_templates/_common/minimize.sh b/packer_templates/_common/minimize.sh index 0173b4233..4fbe43c6a 100644 --- a/packer_templates/_common/minimize.sh +++ b/packer_templates/_common/minimize.sh @@ -28,7 +28,7 @@ if [ "x${swapuuid}" != "x" ]; then # Whiteout the swap partition to reduce box size # Swap is disabled till reboot swappart="`readlink -f /dev/disk/by-uuid/$swapuuid`"; - /sbin/swapoff "$swappart"; + /sbin/swapoff "$swappart" || true; dd if=/dev/zero of="$swappart" bs=1M || echo "dd exit code $? is suppressed"; /sbin/mkswap -U "$swapuuid" "$swappart"; fi From 341c3a669c5bef377676a656d42a0bf50a40eb81 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Sat, 26 Dec 2020 21:40:02 -0800 Subject: [PATCH 1333/1622] Use 2 CPUs on all boxes Signed-off-by: Tim Smith <tsmith@chef.io> --- packer_templates/amazonlinux/amazon-2-x86_64.json | 3 +-- packer_templates/centos/centos-6.10-i386.json | 3 +-- packer_templates/centos/centos-6.10-x86_64.json | 3 +-- packer_templates/centos/centos-7.9-x86_64.json | 2 +- packer_templates/centos/centos-8.3-x86_64.json | 2 +- packer_templates/debian/debian-10.7-amd64.json | 2 +- packer_templates/debian/debian-10.7-i386.json | 2 +- packer_templates/debian/debian-9.13-amd64.json | 2 +- packer_templates/debian/debian-9.13-i386.json | 2 +- packer_templates/debian/debian-9.13-ppc64el.json | 2 +- packer_templates/fedora/fedora-32-x86_64.json | 2 +- packer_templates/fedora/fedora-33-x86_64.json | 3 +-- packer_templates/freebsd/freebsd-11.4-amd64.json | 3 +-- packer_templates/freebsd/freebsd-11.4-i386.json | 3 +-- packer_templates/freebsd/freebsd-12.1-amd64.json | 3 +-- packer_templates/freebsd/freebsd-12.1-i386.json | 3 +-- packer_templates/freebsd/freebsd-12.2-amd64.json | 3 +-- packer_templates/freebsd/freebsd-12.2-i386.json | 3 +-- packer_templates/hardenedbsd/hardenedbsd-11-amd64.json | 3 +-- packer_templates/opensuse/opensuse-leap-15.2-x86_64.json | 2 +- packer_templates/oraclelinux/oracle-6.10-i386.json | 3 +-- packer_templates/oraclelinux/oracle-6.10-x86_64.json | 3 +-- packer_templates/oraclelinux/oracle-7.8-x86_64.json | 2 +- packer_templates/oraclelinux/oracle-8.2-x86_64.json | 2 +- packer_templates/rhel/rhel-6.10-i386.json | 3 +-- packer_templates/rhel/rhel-6.10-x86_64.json | 3 +-- packer_templates/rhel/rhel-7.6-x86_64.json | 3 +-- packer_templates/rhel/rhel-8.0-x86_64.json | 3 +-- packer_templates/scientificlinux/scientific-7.8-x86_64.json | 2 +- packer_templates/sles/sles-11-sp4-x86_64.json | 3 +-- packer_templates/sles/sles-12-sp2-x86_64.json | 3 +-- packer_templates/sles/sles-12-sp3-x86_64.json | 3 +-- packer_templates/sles/sles-15-sp1.json | 3 +-- packer_templates/sles/sles-15.json | 3 +-- packer_templates/solaris/solaris-11-4-x86.json | 3 +-- packer_templates/solaris/solaris-11-x86.json | 3 +-- packer_templates/ubuntu/ubuntu-16.04-amd64.json | 2 +- packer_templates/ubuntu/ubuntu-16.04-i386.json | 2 +- packer_templates/ubuntu/ubuntu-18.04-amd64.json | 2 +- packer_templates/ubuntu/ubuntu-20.04-amd64.json | 2 +- packer_templates/ubuntu/ubuntu-20.04-live-amd64.json | 2 +- packer_templates/ubuntu/ubuntu-20.10-amd64.json | 2 +- packer_templates/ubuntu/ubuntu-21.04-amd64.json | 2 +- 43 files changed, 43 insertions(+), 67 deletions(-) diff --git a/packer_templates/amazonlinux/amazon-2-x86_64.json b/packer_templates/amazonlinux/amazon-2-x86_64.json index cd93260a5..47b429cf4 100644 --- a/packer_templates/amazonlinux/amazon-2-x86_64.json +++ b/packer_templates/amazonlinux/amazon-2-x86_64.json @@ -63,7 +63,7 @@ "box_basename": "amazon-2", "build_directory": "../../builds", "build_timestamp": "{{isotime \"20060102150405\"}}", - "cpus": "1", + "cpus": "2", "disk_size": "65536", "git_revision": "__unknown_git_revision__", "headless": "", @@ -77,4 +77,3 @@ "version": "TIMESTAMP" } } - diff --git a/packer_templates/centos/centos-6.10-i386.json b/packer_templates/centos/centos-6.10-i386.json index ce872882b..db81dd9bc 100644 --- a/packer_templates/centos/centos-6.10-i386.json +++ b/packer_templates/centos/centos-6.10-i386.json @@ -159,7 +159,7 @@ "box_basename": "centos-6.10-i386", "build_directory": "../../builds", "build_timestamp": "{{isotime \"20060102150405\"}}", - "cpus": "1", + "cpus": "2", "disk_size": "65536", "git_revision": "__unknown_git_revision__", "guest_additions_url": "", @@ -180,4 +180,3 @@ "version": "TIMESTAMP" } } - diff --git a/packer_templates/centos/centos-6.10-x86_64.json b/packer_templates/centos/centos-6.10-x86_64.json index 63c020d66..326b24ef8 100644 --- a/packer_templates/centos/centos-6.10-x86_64.json +++ b/packer_templates/centos/centos-6.10-x86_64.json @@ -159,7 +159,7 @@ "box_basename": "centos-6.10", "build_directory": "../../builds", "build_timestamp": "{{isotime \"20060102150405\"}}", - "cpus": "1", + "cpus": "2", "disk_size": "65536", "git_revision": "__unknown_git_revision__", "guest_additions_url": "", @@ -181,4 +181,3 @@ "version": "TIMESTAMP" } } - diff --git a/packer_templates/centos/centos-7.9-x86_64.json b/packer_templates/centos/centos-7.9-x86_64.json index 4227c0670..d37a60721 100644 --- a/packer_templates/centos/centos-7.9-x86_64.json +++ b/packer_templates/centos/centos-7.9-x86_64.json @@ -159,7 +159,7 @@ "box_basename": "centos-7.9", "build_directory": "../../builds", "build_timestamp": "{{isotime \"20060102150405\"}}", - "cpus": "1", + "cpus": "2", "disk_size": "65536", "git_revision": "__unknown_git_revision__", "guest_additions_url": "", diff --git a/packer_templates/centos/centos-8.3-x86_64.json b/packer_templates/centos/centos-8.3-x86_64.json index 379f50260..cd9d07cf7 100644 --- a/packer_templates/centos/centos-8.3-x86_64.json +++ b/packer_templates/centos/centos-8.3-x86_64.json @@ -159,7 +159,7 @@ "box_basename": "centos-8.3", "build_directory": "../../builds", "build_timestamp": "{{isotime \"2019102650405\"}}", - "cpus": "1", + "cpus": "2", "disk_size": "65536", "git_revision": "__unknown_git_revision__", "guest_additions_url": "", diff --git a/packer_templates/debian/debian-10.7-amd64.json b/packer_templates/debian/debian-10.7-amd64.json index 7d1b5f1de..b54b4775e 100644 --- a/packer_templates/debian/debian-10.7-amd64.json +++ b/packer_templates/debian/debian-10.7-amd64.json @@ -196,7 +196,7 @@ "box_basename": "debian-10.7", "build_directory": "../../builds", "build_timestamp": "{{isotime \"20060102150405\"}}", - "cpus": "1", + "cpus": "2", "disk_size": "65536", "git_revision": "__unknown_git_revision__", "guest_additions_url": "", diff --git a/packer_templates/debian/debian-10.7-i386.json b/packer_templates/debian/debian-10.7-i386.json index a52a846df..048774729 100644 --- a/packer_templates/debian/debian-10.7-i386.json +++ b/packer_templates/debian/debian-10.7-i386.json @@ -196,7 +196,7 @@ "box_basename": "debian-10.7-i386", "build_directory": "../../builds", "build_timestamp": "{{isotime \"20060102150405\"}}", - "cpus": "1", + "cpus": "2", "disk_size": "65536", "git_revision": "__unknown_git_revision__", "guest_additions_url": "", diff --git a/packer_templates/debian/debian-9.13-amd64.json b/packer_templates/debian/debian-9.13-amd64.json index 952b43182..09a317b98 100644 --- a/packer_templates/debian/debian-9.13-amd64.json +++ b/packer_templates/debian/debian-9.13-amd64.json @@ -196,7 +196,7 @@ "box_basename": "debian-9.13", "build_directory": "../../builds", "build_timestamp": "{{isotime \"20060102150405\"}}", - "cpus": "1", + "cpus": "2", "disk_size": "65536", "git_revision": "__unknown_git_revision__", "guest_additions_url": "", diff --git a/packer_templates/debian/debian-9.13-i386.json b/packer_templates/debian/debian-9.13-i386.json index bb34cbc29..a1065ef89 100644 --- a/packer_templates/debian/debian-9.13-i386.json +++ b/packer_templates/debian/debian-9.13-i386.json @@ -196,7 +196,7 @@ "box_basename": "debian-9.13-i386", "build_directory": "../../builds", "build_timestamp": "{{isotime \"20060102150405\"}}", - "cpus": "1", + "cpus": "2", "disk_size": "65536", "git_revision": "__unknown_git_revision__", "guest_additions_url": "", diff --git a/packer_templates/debian/debian-9.13-ppc64el.json b/packer_templates/debian/debian-9.13-ppc64el.json index b6e9d190d..3c3aa4a7d 100644 --- a/packer_templates/debian/debian-9.13-ppc64el.json +++ b/packer_templates/debian/debian-9.13-ppc64el.json @@ -83,7 +83,7 @@ "box_basename": "debian-9.13", "build_directory": "../../builds", "build_timestamp": "{{isotime \"20060102150405\"}}", - "cpus": "1", + "cpus": "2", "disk_size": "65536", "git_revision": "__unknown_git_revision__", "headless": "", diff --git a/packer_templates/fedora/fedora-32-x86_64.json b/packer_templates/fedora/fedora-32-x86_64.json index 115112618..4684251be 100644 --- a/packer_templates/fedora/fedora-32-x86_64.json +++ b/packer_templates/fedora/fedora-32-x86_64.json @@ -167,7 +167,7 @@ "box_basename": "fedora-32", "build_directory": "../../builds", "build_timestamp": "{{isotime \"20060102150405\"}}", - "cpus": "1", + "cpus": "2", "disk_size": "65536", "git_revision": "__unknown_git_revision__", "guest_additions_url": "", diff --git a/packer_templates/fedora/fedora-33-x86_64.json b/packer_templates/fedora/fedora-33-x86_64.json index baf7b9b0e..f148501dd 100644 --- a/packer_templates/fedora/fedora-33-x86_64.json +++ b/packer_templates/fedora/fedora-33-x86_64.json @@ -165,7 +165,7 @@ "box_basename": "fedora-33", "build_directory": "../../builds", "build_timestamp": "{{isotime \"20060102150405\"}}", - "cpus": "1", + "cpus": "2", "disk_size": "65536", "git_revision": "__unknown_git_revision__", "guest_additions_url": "", @@ -188,4 +188,3 @@ "version": "TIMESTAMP" } } - diff --git a/packer_templates/freebsd/freebsd-11.4-amd64.json b/packer_templates/freebsd/freebsd-11.4-amd64.json index 052f045c1..0f986a089 100644 --- a/packer_templates/freebsd/freebsd-11.4-amd64.json +++ b/packer_templates/freebsd/freebsd-11.4-amd64.json @@ -184,7 +184,7 @@ "box_basename": "freebsd-11.4", "build_directory": "../../builds", "build_timestamp": "{{isotime \"20060102150405\"}}", - "cpus": "1", + "cpus": "2", "disk_size": "65536", "git_revision": "__unknown_git_revision__", "headless": "", @@ -204,4 +204,3 @@ "version": "TIMESTAMP" } } - diff --git a/packer_templates/freebsd/freebsd-11.4-i386.json b/packer_templates/freebsd/freebsd-11.4-i386.json index b071d7eab..2cdfd9f89 100644 --- a/packer_templates/freebsd/freebsd-11.4-i386.json +++ b/packer_templates/freebsd/freebsd-11.4-i386.json @@ -184,7 +184,7 @@ "box_basename": "freebsd-11.4-i386", "build_directory": "../../builds", "build_timestamp": "{{isotime \"20060102150405\"}}", - "cpus": "1", + "cpus": "2", "disk_size": "40960", "git_revision": "__unknown_git_revision__", "headless": "", @@ -204,4 +204,3 @@ "version": "TIMESTAMP" } } - diff --git a/packer_templates/freebsd/freebsd-12.1-amd64.json b/packer_templates/freebsd/freebsd-12.1-amd64.json index 93a51e270..c54e460d2 100644 --- a/packer_templates/freebsd/freebsd-12.1-amd64.json +++ b/packer_templates/freebsd/freebsd-12.1-amd64.json @@ -184,7 +184,7 @@ "box_basename": "freebsd-12.1", "build_directory": "../../builds", "build_timestamp": "{{isotime \"20060102150405\"}}", - "cpus": "1", + "cpus": "2", "disk_size": "65536", "git_revision": "__unknown_git_revision__", "headless": "", @@ -204,4 +204,3 @@ "version": "TIMESTAMP" } } - diff --git a/packer_templates/freebsd/freebsd-12.1-i386.json b/packer_templates/freebsd/freebsd-12.1-i386.json index 2e45ff53e..f4e4c9d29 100644 --- a/packer_templates/freebsd/freebsd-12.1-i386.json +++ b/packer_templates/freebsd/freebsd-12.1-i386.json @@ -184,7 +184,7 @@ "box_basename": "freebsd-12.1-i386", "build_directory": "../../builds", "build_timestamp": "{{isotime \"20060102150405\"}}", - "cpus": "1", + "cpus": "2", "disk_size": "40960", "git_revision": "__unknown_git_revision__", "headless": "", @@ -204,4 +204,3 @@ "version": "TIMESTAMP" } } - diff --git a/packer_templates/freebsd/freebsd-12.2-amd64.json b/packer_templates/freebsd/freebsd-12.2-amd64.json index 8e7bd6de7..614f788a5 100644 --- a/packer_templates/freebsd/freebsd-12.2-amd64.json +++ b/packer_templates/freebsd/freebsd-12.2-amd64.json @@ -184,7 +184,7 @@ "box_basename": "freebsd-12.2", "build_directory": "../../builds", "build_timestamp": "{{isotime \"20060102150405\"}}", - "cpus": "1", + "cpus": "2", "disk_size": "65536", "git_revision": "__unknown_git_revision__", "headless": "", @@ -204,4 +204,3 @@ "version": "TIMESTAMP" } } - diff --git a/packer_templates/freebsd/freebsd-12.2-i386.json b/packer_templates/freebsd/freebsd-12.2-i386.json index c495f452f..2231d1f12 100644 --- a/packer_templates/freebsd/freebsd-12.2-i386.json +++ b/packer_templates/freebsd/freebsd-12.2-i386.json @@ -184,7 +184,7 @@ "box_basename": "freebsd-12.2-i386", "build_directory": "../../builds", "build_timestamp": "{{isotime \"20060102150405\"}}", - "cpus": "1", + "cpus": "2", "disk_size": "40960", "git_revision": "__unknown_git_revision__", "headless": "", @@ -204,4 +204,3 @@ "version": "TIMESTAMP" } } - diff --git a/packer_templates/hardenedbsd/hardenedbsd-11-amd64.json b/packer_templates/hardenedbsd/hardenedbsd-11-amd64.json index 448b3e922..a78249470 100644 --- a/packer_templates/hardenedbsd/hardenedbsd-11-amd64.json +++ b/packer_templates/hardenedbsd/hardenedbsd-11-amd64.json @@ -182,7 +182,7 @@ "box_basename": "hardenedbsd-11", "build_directory": "../../builds", "build_timestamp": "{{isotime \"20060102150405\"}}", - "cpus": "1", + "cpus": "2", "disk_size": "65536", "git_revision": "__unknown_git_revision__", "headless": "", @@ -201,4 +201,3 @@ "version": "TIMESTAMP" } } - diff --git a/packer_templates/opensuse/opensuse-leap-15.2-x86_64.json b/packer_templates/opensuse/opensuse-leap-15.2-x86_64.json index f20346e97..29126290c 100644 --- a/packer_templates/opensuse/opensuse-leap-15.2-x86_64.json +++ b/packer_templates/opensuse/opensuse-leap-15.2-x86_64.json @@ -169,7 +169,7 @@ "box_basename": "opensuse-leap-15.2", "build_directory": "../../builds", "build_timestamp": "{{isotime \"20060102150405\"}}", - "cpus": "1", + "cpus": "2", "disk_size": "65536", "git_revision": "__unknown_git_revision__", "guest_additions_url": "", diff --git a/packer_templates/oraclelinux/oracle-6.10-i386.json b/packer_templates/oraclelinux/oracle-6.10-i386.json index e0554c0e1..a74b7604c 100644 --- a/packer_templates/oraclelinux/oracle-6.10-i386.json +++ b/packer_templates/oraclelinux/oracle-6.10-i386.json @@ -160,7 +160,7 @@ "box_basename": "oracle-6.10-i386", "build_directory": "../../builds", "build_timestamp": "{{isotime \"20060102150405\"}}", - "cpus": "1", + "cpus": "2", "disk_size": "65536", "git_revision": "__unknown_git_revision__", "guest_additions_url": "", @@ -181,4 +181,3 @@ "version": "TIMESTAMP" } } - diff --git a/packer_templates/oraclelinux/oracle-6.10-x86_64.json b/packer_templates/oraclelinux/oracle-6.10-x86_64.json index 28850c10e..c9d96a105 100644 --- a/packer_templates/oraclelinux/oracle-6.10-x86_64.json +++ b/packer_templates/oraclelinux/oracle-6.10-x86_64.json @@ -160,7 +160,7 @@ "box_basename": "oracle-6.10", "build_directory": "../../builds", "build_timestamp": "{{isotime \"20060102150405\"}}", - "cpus": "1", + "cpus": "2", "disk_size": "65536", "git_revision": "__unknown_git_revision__", "guest_additions_url": "", @@ -182,4 +182,3 @@ "version": "TIMESTAMP" } } - diff --git a/packer_templates/oraclelinux/oracle-7.8-x86_64.json b/packer_templates/oraclelinux/oracle-7.8-x86_64.json index 4f4d7a533..f174482e0 100644 --- a/packer_templates/oraclelinux/oracle-7.8-x86_64.json +++ b/packer_templates/oraclelinux/oracle-7.8-x86_64.json @@ -160,7 +160,7 @@ "box_basename": "oracle-7.8", "build_directory": "../../builds", "build_timestamp": "{{isotime \"20060102150405\"}}", - "cpus": "1", + "cpus": "2", "disk_size": "65536", "git_revision": "__unknown_git_revision__", "guest_additions_url": "", diff --git a/packer_templates/oraclelinux/oracle-8.2-x86_64.json b/packer_templates/oraclelinux/oracle-8.2-x86_64.json index 101397fbf..b674f6fa6 100644 --- a/packer_templates/oraclelinux/oracle-8.2-x86_64.json +++ b/packer_templates/oraclelinux/oracle-8.2-x86_64.json @@ -159,7 +159,7 @@ "box_basename": "oracle-8.2", "build_directory": "../../builds", "build_timestamp": "{{isotime \"2019102650405\"}}", - "cpus": "1", + "cpus": "2", "disk_size": "65536", "git_revision": "__unknown_git_revision__", "guest_additions_url": "", diff --git a/packer_templates/rhel/rhel-6.10-i386.json b/packer_templates/rhel/rhel-6.10-i386.json index a6d2d15c3..24027999e 100644 --- a/packer_templates/rhel/rhel-6.10-i386.json +++ b/packer_templates/rhel/rhel-6.10-i386.json @@ -133,7 +133,7 @@ "box_basename": "rhel-6.10-i386", "build_directory": "../../builds", "build_timestamp": "{{isotime \"20060102150405\"}}", - "cpus": "1", + "cpus": "2", "disk_size": "65536", "git_revision": "__unknown_git_revision__", "guest_additions_url": "", @@ -153,4 +153,3 @@ "version": "TIMESTAMP" } } - diff --git a/packer_templates/rhel/rhel-6.10-x86_64.json b/packer_templates/rhel/rhel-6.10-x86_64.json index 493fc323d..73715ce01 100644 --- a/packer_templates/rhel/rhel-6.10-x86_64.json +++ b/packer_templates/rhel/rhel-6.10-x86_64.json @@ -133,7 +133,7 @@ "box_basename": "rhel-6.10", "build_directory": "../../builds", "build_timestamp": "{{isotime \"20060102150405\"}}", - "cpus": "1", + "cpus": "2", "disk_size": "65536", "git_revision": "__unknown_git_revision__", "guest_additions_url": "", @@ -153,4 +153,3 @@ "version": "TIMESTAMP" } } - diff --git a/packer_templates/rhel/rhel-7.6-x86_64.json b/packer_templates/rhel/rhel-7.6-x86_64.json index 418ea053f..4c5b3abe8 100644 --- a/packer_templates/rhel/rhel-7.6-x86_64.json +++ b/packer_templates/rhel/rhel-7.6-x86_64.json @@ -133,7 +133,7 @@ "box_basename": "rhel-7.6", "build_directory": "../../builds", "build_timestamp": "{{isotime \"20060102150405\"}}", - "cpus": "1", + "cpus": "2", "disk_size": "65536", "git_revision": "__unknown_git_revision__", "guest_additions_url": "", @@ -153,4 +153,3 @@ "version": "TIMESTAMP" } } - diff --git a/packer_templates/rhel/rhel-8.0-x86_64.json b/packer_templates/rhel/rhel-8.0-x86_64.json index 66737ea08..ddfb507aa 100644 --- a/packer_templates/rhel/rhel-8.0-x86_64.json +++ b/packer_templates/rhel/rhel-8.0-x86_64.json @@ -133,7 +133,7 @@ "box_basename": "rhel-8.0", "build_directory": "../../builds", "build_timestamp": "{{isotime \"20060102150405\"}}", - "cpus": "1", + "cpus": "2", "disk_size": "65536", "git_revision": "__unknown_git_revision__", "guest_additions_url": "", @@ -153,4 +153,3 @@ "version": "TIMESTAMP" } } - diff --git a/packer_templates/scientificlinux/scientific-7.8-x86_64.json b/packer_templates/scientificlinux/scientific-7.8-x86_64.json index 0e1210bf3..cd56f4946 100644 --- a/packer_templates/scientificlinux/scientific-7.8-x86_64.json +++ b/packer_templates/scientificlinux/scientific-7.8-x86_64.json @@ -159,7 +159,7 @@ "box_basename": "scientific-7.8", "build_directory": "../../builds", "build_timestamp": "{{isotime \"20080506150405\"}}", - "cpus": "1", + "cpus": "2", "disk_size": "65536", "git_revision": "__unknown_git_revision__", "guest_additions_url": "", diff --git a/packer_templates/sles/sles-11-sp4-x86_64.json b/packer_templates/sles/sles-11-sp4-x86_64.json index 52c16e446..c96bfe4ec 100644 --- a/packer_templates/sles/sles-11-sp4-x86_64.json +++ b/packer_templates/sles/sles-11-sp4-x86_64.json @@ -154,7 +154,7 @@ "box_basename": "sles-11-sp4", "build_directory": "../../builds", "build_timestamp": "{{isotime \"20060102150405\"}}", - "cpus": "1", + "cpus": "2", "disk_size": "65536", "git_revision": "__unknown_git_revision__", "guest_additions_url": "", @@ -171,4 +171,3 @@ "version": "TIMESTAMP" } } - diff --git a/packer_templates/sles/sles-12-sp2-x86_64.json b/packer_templates/sles/sles-12-sp2-x86_64.json index f93412d8b..3ff974421 100644 --- a/packer_templates/sles/sles-12-sp2-x86_64.json +++ b/packer_templates/sles/sles-12-sp2-x86_64.json @@ -155,7 +155,7 @@ "box_basename": "sles-12-sp2", "build_directory": "../../builds", "build_timestamp": "{{isotime \"20060102150405\"}}", - "cpus": "1", + "cpus": "2", "disk_size": "65536", "git_revision": "__unknown_git_revision__", "guest_additions_url": "", @@ -172,4 +172,3 @@ "version": "TIMESTAMP" } } - diff --git a/packer_templates/sles/sles-12-sp3-x86_64.json b/packer_templates/sles/sles-12-sp3-x86_64.json index 9e28724cc..1fee0583a 100644 --- a/packer_templates/sles/sles-12-sp3-x86_64.json +++ b/packer_templates/sles/sles-12-sp3-x86_64.json @@ -155,7 +155,7 @@ "box_basename": "sles-12-sp3", "build_directory": "../../builds", "build_timestamp": "{{isotime \"20060102150405\"}}", - "cpus": "1", + "cpus": "2", "disk_size": "65536", "git_revision": "__unknown_git_revision__", "guest_additions_url": "", @@ -172,4 +172,3 @@ "version": "TIMESTAMP" } } - diff --git a/packer_templates/sles/sles-15-sp1.json b/packer_templates/sles/sles-15-sp1.json index 1f09b6924..93731f730 100644 --- a/packer_templates/sles/sles-15-sp1.json +++ b/packer_templates/sles/sles-15-sp1.json @@ -193,7 +193,7 @@ "box_basename": "sles-15-sp1", "build_directory": "../../builds", "build_timestamp": "{{isotime \"20060102150405\"}}", - "cpus": "1", + "cpus": "2", "disk_size": "65536", "git_revision": "__unknown_git_revision__", "guest_additions_url": "", @@ -211,4 +211,3 @@ "version": "TIMESTAMP" } } - diff --git a/packer_templates/sles/sles-15.json b/packer_templates/sles/sles-15.json index 826c6a549..dc3a74b56 100644 --- a/packer_templates/sles/sles-15.json +++ b/packer_templates/sles/sles-15.json @@ -193,7 +193,7 @@ "box_basename": "sles-15", "build_directory": "../../builds", "build_timestamp": "{{isotime \"20060102150405\"}}", - "cpus": "1", + "cpus": "2", "disk_size": "65536", "git_revision": "__unknown_git_revision__", "guest_additions_url": "", @@ -211,4 +211,3 @@ "version": "TIMESTAMP" } } - diff --git a/packer_templates/solaris/solaris-11-4-x86.json b/packer_templates/solaris/solaris-11-4-x86.json index 0b415c55f..14cb54d57 100644 --- a/packer_templates/solaris/solaris-11-4-x86.json +++ b/packer_templates/solaris/solaris-11-4-x86.json @@ -130,7 +130,7 @@ "box_basename": "solaris-11.4", "build_directory": "../../builds", "build_timestamp": "{{isotime \"20200222210405\"}}", - "cpus": "1", + "cpus": "2", "disk_size": "65536", "git_revision": "__unknown_git_revision__", "guest_additions_url": "", @@ -143,4 +143,3 @@ "version": "TIMESTAMP" } } - diff --git a/packer_templates/solaris/solaris-11-x86.json b/packer_templates/solaris/solaris-11-x86.json index 14bd84ace..8386a9092 100644 --- a/packer_templates/solaris/solaris-11-x86.json +++ b/packer_templates/solaris/solaris-11-x86.json @@ -129,7 +129,7 @@ "box_basename": "solaris-11.3", "build_directory": "../../builds", "build_timestamp": "{{isotime \"20060102150405\"}}", - "cpus": "1", + "cpus": "2", "disk_size": "65536", "git_revision": "__unknown_git_revision__", "guest_additions_url": "", @@ -142,4 +142,3 @@ "version": "TIMESTAMP" } } - diff --git a/packer_templates/ubuntu/ubuntu-16.04-amd64.json b/packer_templates/ubuntu/ubuntu-16.04-amd64.json index 1bd4dc0b4..0e4002c14 100644 --- a/packer_templates/ubuntu/ubuntu-16.04-amd64.json +++ b/packer_templates/ubuntu/ubuntu-16.04-amd64.json @@ -262,7 +262,7 @@ "box_basename": "ubuntu-16.04", "build_directory": "../../builds", "build_timestamp": "{{isotime \"20060102150405\"}}", - "cpus": "1", + "cpus": "2", "disk_size": "65536", "git_revision": "__unknown_git_revision__", "guest_additions_url": "", diff --git a/packer_templates/ubuntu/ubuntu-16.04-i386.json b/packer_templates/ubuntu/ubuntu-16.04-i386.json index e244e516b..6766f0732 100644 --- a/packer_templates/ubuntu/ubuntu-16.04-i386.json +++ b/packer_templates/ubuntu/ubuntu-16.04-i386.json @@ -261,7 +261,7 @@ "box_basename": "ubuntu-16.04-i386", "build_directory": "../../builds", "build_timestamp": "{{isotime \"20060102150405\"}}", - "cpus": "1", + "cpus": "2", "disk_size": "65536", "git_revision": "__unknown_git_revision__", "guest_additions_url": "", diff --git a/packer_templates/ubuntu/ubuntu-18.04-amd64.json b/packer_templates/ubuntu/ubuntu-18.04-amd64.json index 4c757fea5..7a3759879 100644 --- a/packer_templates/ubuntu/ubuntu-18.04-amd64.json +++ b/packer_templates/ubuntu/ubuntu-18.04-amd64.json @@ -258,7 +258,7 @@ "box_basename": "ubuntu-18.04", "build_directory": "../../builds", "build_timestamp": "{{isotime \"20060102150405\"}}", - "cpus": "1", + "cpus": "2", "disk_size": "65536", "git_revision": "__unknown_git_revision__", "guest_additions_url": "", diff --git a/packer_templates/ubuntu/ubuntu-20.04-amd64.json b/packer_templates/ubuntu/ubuntu-20.04-amd64.json index b4f629503..7dfd06132 100644 --- a/packer_templates/ubuntu/ubuntu-20.04-amd64.json +++ b/packer_templates/ubuntu/ubuntu-20.04-amd64.json @@ -258,7 +258,7 @@ "box_basename": "ubuntu-20.04", "build_directory": "../../builds", "build_timestamp": "{{isotime \"20060102150405\"}}", - "cpus": "1", + "cpus": "2", "disk_size": "65536", "git_revision": "__unknown_git_revision__", "guest_additions_url": "", diff --git a/packer_templates/ubuntu/ubuntu-20.04-live-amd64.json b/packer_templates/ubuntu/ubuntu-20.04-live-amd64.json index 575c7dd98..a169d0367 100644 --- a/packer_templates/ubuntu/ubuntu-20.04-live-amd64.json +++ b/packer_templates/ubuntu/ubuntu-20.04-live-amd64.json @@ -225,7 +225,7 @@ "box_basename": "ubuntu-20.04-live", "build_directory": "../../builds", "build_timestamp": "{{isotime \"20060102150405\"}}", - "cpus": "1", + "cpus": "2", "disk_size": "65536", "git_revision": "__unknown_git_revision__", "guest_additions_url": "", diff --git a/packer_templates/ubuntu/ubuntu-20.10-amd64.json b/packer_templates/ubuntu/ubuntu-20.10-amd64.json index 763dca759..20e7ce267 100644 --- a/packer_templates/ubuntu/ubuntu-20.10-amd64.json +++ b/packer_templates/ubuntu/ubuntu-20.10-amd64.json @@ -255,7 +255,7 @@ "box_basename": "ubuntu-20.10", "build_directory": "../../builds", "build_timestamp": "{{isotime \"20060102150405\"}}", - "cpus": "1", + "cpus": "2", "disk_size": "65536", "git_revision": "__unknown_git_revision__", "guest_additions_url": "", diff --git a/packer_templates/ubuntu/ubuntu-21.04-amd64.json b/packer_templates/ubuntu/ubuntu-21.04-amd64.json index 157266655..d21f15666 100644 --- a/packer_templates/ubuntu/ubuntu-21.04-amd64.json +++ b/packer_templates/ubuntu/ubuntu-21.04-amd64.json @@ -255,7 +255,7 @@ "box_basename": "ubuntu-21.04", "build_directory": "../../builds", "build_timestamp": "{{isotime \"20060102150405\"}}", - "cpus": "1", + "cpus": "2", "disk_size": "65536", "git_revision": "__unknown_git_revision__", "guest_additions_url": "", From 67e10d5465976dff6649ebb06f07f60e776c5165 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Sat, 26 Dec 2020 22:41:21 -0800 Subject: [PATCH 1334/1622] Build ubuntu boxes in vmware with sata disks Signed-off-by: Tim Smith <tsmith@chef.io> --- packer_templates/ubuntu/ubuntu-16.04-amd64.json | 1 + packer_templates/ubuntu/ubuntu-16.04-i386.json | 1 + packer_templates/ubuntu/ubuntu-18.04-amd64.json | 1 + packer_templates/ubuntu/ubuntu-20.04-amd64.json | 1 + packer_templates/ubuntu/ubuntu-20.10-amd64.json | 1 + packer_templates/ubuntu/ubuntu-21.04-amd64.json | 1 + 6 files changed, 6 insertions(+) diff --git a/packer_templates/ubuntu/ubuntu-16.04-amd64.json b/packer_templates/ubuntu/ubuntu-16.04-amd64.json index 0e4002c14..a96973547 100644 --- a/packer_templates/ubuntu/ubuntu-16.04-amd64.json +++ b/packer_templates/ubuntu/ubuntu-16.04-amd64.json @@ -78,6 +78,7 @@ ], "boot_wait": "10s", "cpus": "{{ user `cpus` }}", + "disk_adapter_type": "sata", "disk_size": "{{user `disk_size`}}", "guest_os_type": "ubuntu-64", "headless": "{{ user `headless` }}", diff --git a/packer_templates/ubuntu/ubuntu-16.04-i386.json b/packer_templates/ubuntu/ubuntu-16.04-i386.json index 6766f0732..2f4c1570e 100644 --- a/packer_templates/ubuntu/ubuntu-16.04-i386.json +++ b/packer_templates/ubuntu/ubuntu-16.04-i386.json @@ -78,6 +78,7 @@ ], "boot_wait": "10s", "cpus": "{{ user `cpus` }}", + "disk_adapter_type": "sata", "disk_size": "{{user `disk_size`}}", "guest_os_type": "ubuntu", "headless": "{{ user `headless` }}", diff --git a/packer_templates/ubuntu/ubuntu-18.04-amd64.json b/packer_templates/ubuntu/ubuntu-18.04-amd64.json index 7a3759879..87fb8e0f0 100644 --- a/packer_templates/ubuntu/ubuntu-18.04-amd64.json +++ b/packer_templates/ubuntu/ubuntu-18.04-amd64.json @@ -76,6 +76,7 @@ ], "boot_wait": "10s", "cpus": "{{ user `cpus` }}", + "disk_adapter_type": "sata", "disk_size": "{{user `disk_size`}}", "guest_os_type": "ubuntu-64", "headless": "{{ user `headless` }}", diff --git a/packer_templates/ubuntu/ubuntu-20.04-amd64.json b/packer_templates/ubuntu/ubuntu-20.04-amd64.json index 7dfd06132..4ff225867 100644 --- a/packer_templates/ubuntu/ubuntu-20.04-amd64.json +++ b/packer_templates/ubuntu/ubuntu-20.04-amd64.json @@ -76,6 +76,7 @@ ], "boot_wait": "10s", "cpus": "{{ user `cpus` }}", + "disk_adapter_type": "sata", "disk_size": "{{user `disk_size`}}", "guest_os_type": "ubuntu-64", "headless": "{{ user `headless` }}", diff --git a/packer_templates/ubuntu/ubuntu-20.10-amd64.json b/packer_templates/ubuntu/ubuntu-20.10-amd64.json index 20e7ce267..7aa9c8b53 100644 --- a/packer_templates/ubuntu/ubuntu-20.10-amd64.json +++ b/packer_templates/ubuntu/ubuntu-20.10-amd64.json @@ -70,6 +70,7 @@ ], "boot_wait": "5s", "cpus": "{{ user `cpus` }}", + "disk_adapter_type": "sata", "disk_size": "{{user `disk_size`}}", "guest_os_type": "ubuntu-64", "headless": "{{ user `headless` }}", diff --git a/packer_templates/ubuntu/ubuntu-21.04-amd64.json b/packer_templates/ubuntu/ubuntu-21.04-amd64.json index d21f15666..0b5a0183e 100644 --- a/packer_templates/ubuntu/ubuntu-21.04-amd64.json +++ b/packer_templates/ubuntu/ubuntu-21.04-amd64.json @@ -70,6 +70,7 @@ ], "boot_wait": "5s", "cpus": "{{ user `cpus` }}", + "disk_adapter_type": "sata", "disk_size": "{{user `disk_size`}}", "guest_os_type": "ubuntu-64", "headless": "{{ user `headless` }}", From f5bc657c4a78a1fa017bfc5ef7e56ec2e2c6991f Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Sun, 27 Dec 2020 14:25:59 -0800 Subject: [PATCH 1335/1622] Actually use boot command from the user args in Fedora 33 Signed-off-by: Tim Smith <tsmith@chef.io> --- packer_templates/fedora/fedora-33-x86_64.json | 29 +++++++------------ 1 file changed, 10 insertions(+), 19 deletions(-) diff --git a/packer_templates/fedora/fedora-33-x86_64.json b/packer_templates/fedora/fedora-33-x86_64.json index f148501dd..d045e11fd 100644 --- a/packer_templates/fedora/fedora-33-x86_64.json +++ b/packer_templates/fedora/fedora-33-x86_64.json @@ -2,10 +2,8 @@ "builders": [ { "accelerator": "kvm", - "boot_command": [ - "<tab> linux ks=http://{{.HTTPIP}}:{{.HTTPPort}}/{{user `ks_path`}}<enter><wait>" - ], - "boot_wait": "10s", + "boot_command": "{{user `boot_command`}}", + "boot_wait": "5s", "cpus": "{{ user `cpus` }}", "disk_cache": "unsafe", "disk_compression": true, @@ -30,10 +28,8 @@ "vm_name": "{{ user `template` }}" }, { - "boot_command": [ - "<tab> linux ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" - ], - "boot_wait": "10s", + "boot_command": "{{user `boot_command`}}", + "boot_wait": "5s", "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", @@ -56,10 +52,8 @@ "vm_name": "{{ user `template` }}" }, { - "boot_command": [ - "<tab> linux ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" - ], - "boot_wait": "10s", + "boot_command": "{{ user `boot_command` }}", + "boot_wait": "5s", "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "guest_os_type": "fedora-64", @@ -84,10 +78,8 @@ "vmx_remove_ethernet_interfaces": true }, { - "boot_command": [ - "<tab> linux ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" - ], - "boot_wait": "10s", + "boot_command": "{{user `boot_command`}}", + "boot_wait": "5s", "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "guest_os_type": "fedora-core", @@ -123,8 +115,7 @@ "ssh_username": "vagrant", "type": "qemu", "vm_name": "{{ user `template` }}", - "qemuargs": [["{{ user `qemuargs_opt` }}","{{ user `qemuargs_value` }}"]], - "boot_command": "{{user `boot_command`}}" + "qemuargs": [["{{ user `qemuargs_opt` }}","{{ user `qemuargs_value` }}"]] } ], "post-processors": [ @@ -184,7 +175,7 @@ "template": "fedora-33-x86_64", "qemuargs_opt": "-m", "qemuargs_value": "1024M", - "boot_command": "<tab> linux ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>", + "boot_command": "<tab> text inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>", "version": "TIMESTAMP" } } From 079aae1cf3dd1addd25264b0742574c58edda4a6 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Sun, 27 Dec 2020 14:28:17 -0800 Subject: [PATCH 1336/1622] Lower the boot wait to 5 secs Signed-off-by: Tim Smith <tsmith@chef.io> --- packer_templates/centos/centos-6.10-i386.json | 10 +++++----- packer_templates/centos/centos-6.10-x86_64.json | 10 +++++----- packer_templates/centos/centos-7.9-x86_64.json | 10 +++++----- packer_templates/centos/centos-8.3-x86_64.json | 10 +++++----- packer_templates/debian/debian-10.7-amd64.json | 8 ++++---- packer_templates/debian/debian-10.7-i386.json | 8 ++++---- packer_templates/debian/debian-9.13-amd64.json | 8 ++++---- packer_templates/debian/debian-9.13-i386.json | 8 ++++---- packer_templates/debian/debian-9.13-ppc64el.json | 2 +- packer_templates/fedora/fedora-32-x86_64.json | 10 +++++----- packer_templates/fedora/fedora-33-x86_64.json | 3 ++- packer_templates/freebsd/freebsd-11.4-amd64.json | 4 ++-- packer_templates/freebsd/freebsd-11.4-i386.json | 4 ++-- packer_templates/freebsd/freebsd-12.1-amd64.json | 4 ++-- packer_templates/freebsd/freebsd-12.1-i386.json | 4 ++-- packer_templates/freebsd/freebsd-12.2-amd64.json | 4 ++-- packer_templates/freebsd/freebsd-12.2-i386.json | 4 ++-- packer_templates/hardenedbsd/hardenedbsd-11-amd64.json | 4 ++-- .../opensuse/opensuse-leap-15.2-x86_64.json | 8 ++++---- packer_templates/oraclelinux/oracle-6.10-i386.json | 10 +++++----- packer_templates/oraclelinux/oracle-6.10-x86_64.json | 10 +++++----- packer_templates/oraclelinux/oracle-7.8-x86_64.json | 10 +++++----- packer_templates/oraclelinux/oracle-8.2-x86_64.json | 10 +++++----- packer_templates/rhel/rhel-6.10-i386.json | 8 ++++---- packer_templates/rhel/rhel-6.10-x86_64.json | 8 ++++---- packer_templates/rhel/rhel-7.6-x86_64.json | 8 ++++---- packer_templates/rhel/rhel-8.0-x86_64.json | 8 ++++---- .../scientificlinux/scientific-7.8-x86_64.json | 10 +++++----- packer_templates/sles/sles-11-sp4-x86_64.json | 8 ++++---- packer_templates/sles/sles-12-sp2-x86_64.json | 8 ++++---- packer_templates/sles/sles-12-sp3-x86_64.json | 8 ++++---- packer_templates/sles/sles-15-sp1.json | 8 ++++---- packer_templates/sles/sles-15.json | 8 ++++---- packer_templates/ubuntu/ubuntu-16.04-amd64.json | 10 +++++----- packer_templates/ubuntu/ubuntu-16.04-i386.json | 10 +++++----- packer_templates/ubuntu/ubuntu-18.04-amd64.json | 10 +++++----- packer_templates/ubuntu/ubuntu-20.04-amd64.json | 10 +++++----- 37 files changed, 143 insertions(+), 142 deletions(-) diff --git a/packer_templates/centos/centos-6.10-i386.json b/packer_templates/centos/centos-6.10-i386.json index db81dd9bc..f09c05a3b 100644 --- a/packer_templates/centos/centos-6.10-i386.json +++ b/packer_templates/centos/centos-6.10-i386.json @@ -4,7 +4,7 @@ "boot_command": [ "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], - "boot_wait": "10s", + "boot_wait": "5s", "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", @@ -30,7 +30,7 @@ "boot_command": [ "<up><wait><tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], - "boot_wait": "10s", + "boot_wait": "5s", "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "guest_os_type": "centos", @@ -57,7 +57,7 @@ "boot_command": [ "<up><wait><tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], - "boot_wait": "10s", + "boot_wait": "5s", "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "guest_os_type": "centos", @@ -80,7 +80,7 @@ "boot_command": [ "<wait5><tab> text ks=hd:fd0:/ks.cfg<enter><wait5><esc>" ], - "boot_wait": "10s", + "boot_wait": "5s", "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "floppy_files": [ @@ -106,7 +106,7 @@ "boot_command": [ "<up><wait><tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], - "boot_wait": "10s", + "boot_wait": "5s", "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", diff --git a/packer_templates/centos/centos-6.10-x86_64.json b/packer_templates/centos/centos-6.10-x86_64.json index 326b24ef8..8740d13f4 100644 --- a/packer_templates/centos/centos-6.10-x86_64.json +++ b/packer_templates/centos/centos-6.10-x86_64.json @@ -4,7 +4,7 @@ "boot_command": [ "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], - "boot_wait": "10s", + "boot_wait": "5s", "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", @@ -30,7 +30,7 @@ "boot_command": [ "<up><wait><tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], - "boot_wait": "10s", + "boot_wait": "5s", "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "guest_os_type": "centos-64", @@ -57,7 +57,7 @@ "boot_command": [ "<up><wait><tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], - "boot_wait": "10s", + "boot_wait": "5s", "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "guest_os_type": "centos", @@ -80,7 +80,7 @@ "boot_command": [ "<wait5><tab> text ks=hd:fd0:/ks.cfg<enter><wait5><esc>" ], - "boot_wait": "10s", + "boot_wait": "5s", "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "floppy_files": [ @@ -106,7 +106,7 @@ "boot_command": [ "<up><wait><tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], - "boot_wait": "10s", + "boot_wait": "5s", "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", diff --git a/packer_templates/centos/centos-7.9-x86_64.json b/packer_templates/centos/centos-7.9-x86_64.json index d37a60721..6d4a0455b 100644 --- a/packer_templates/centos/centos-7.9-x86_64.json +++ b/packer_templates/centos/centos-7.9-x86_64.json @@ -4,7 +4,7 @@ "boot_command": [ "<up><wait><tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], - "boot_wait": "10s", + "boot_wait": "5s", "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", @@ -30,7 +30,7 @@ "boot_command": [ "<up><wait><tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], - "boot_wait": "10s", + "boot_wait": "5s", "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "guest_os_type": "centos-64", @@ -57,7 +57,7 @@ "boot_command": [ "<up><wait><tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], - "boot_wait": "10s", + "boot_wait": "5s", "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "guest_os_type": "centos", @@ -80,7 +80,7 @@ "boot_command": [ "<wait5><tab> text ks=hd:fd0:/ks.cfg<enter><wait5><esc>" ], - "boot_wait": "10s", + "boot_wait": "5s", "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "floppy_files": [ @@ -106,7 +106,7 @@ "boot_command": [ "<up><wait><tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], - "boot_wait": "10s", + "boot_wait": "5s", "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", diff --git a/packer_templates/centos/centos-8.3-x86_64.json b/packer_templates/centos/centos-8.3-x86_64.json index cd9d07cf7..ac1b2e2c1 100644 --- a/packer_templates/centos/centos-8.3-x86_64.json +++ b/packer_templates/centos/centos-8.3-x86_64.json @@ -4,7 +4,7 @@ "boot_command": [ "<up><wait><tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], - "boot_wait": "10s", + "boot_wait": "5s", "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", @@ -30,7 +30,7 @@ "boot_command": [ "<up><wait><tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], - "boot_wait": "10s", + "boot_wait": "5s", "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "guest_os_type": "centos-64", @@ -57,7 +57,7 @@ "boot_command": [ "<up><wait><tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], - "boot_wait": "10s", + "boot_wait": "5s", "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "guest_os_type": "centos", @@ -80,7 +80,7 @@ "boot_command": [ "<wait5><tab> text ks=hd:fd0:/ks.cfg<enter><wait5><esc>" ], - "boot_wait": "10s", + "boot_wait": "5s", "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "floppy_files": [ @@ -106,7 +106,7 @@ "boot_command": [ "<up><wait><tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], - "boot_wait": "10s", + "boot_wait": "5s", "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", diff --git a/packer_templates/debian/debian-10.7-amd64.json b/packer_templates/debian/debian-10.7-amd64.json index b54b4775e..9e482f526 100644 --- a/packer_templates/debian/debian-10.7-amd64.json +++ b/packer_templates/debian/debian-10.7-amd64.json @@ -19,7 +19,7 @@ "grub-installer/bootdev=/dev/sda <wait>", "<enter><wait>" ], - "boot_wait": "10s", + "boot_wait": "5s", "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", @@ -60,7 +60,7 @@ "grub-installer/bootdev=/dev/sda <wait>", "<enter><wait>" ], - "boot_wait": "10s", + "boot_wait": "5s", "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "guest_os_type": "debian8-64", @@ -103,7 +103,7 @@ "grub-installer/bootdev=/dev/sda <wait>", "<enter><wait>" ], - "boot_wait": "10s", + "boot_wait": "5s", "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "guest_os_type": "debian", @@ -141,7 +141,7 @@ "grub-installer/bootdev=/dev/vda <wait>", "<enter><wait>" ], - "boot_wait": "10s", + "boot_wait": "5s", "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", diff --git a/packer_templates/debian/debian-10.7-i386.json b/packer_templates/debian/debian-10.7-i386.json index 048774729..08eebd6e6 100644 --- a/packer_templates/debian/debian-10.7-i386.json +++ b/packer_templates/debian/debian-10.7-i386.json @@ -19,7 +19,7 @@ "grub-installer/bootdev=/dev/sda <wait>", "<enter><wait>" ], - "boot_wait": "10s", + "boot_wait": "5s", "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", @@ -60,7 +60,7 @@ "grub-installer/bootdev=/dev/sda <wait>", "<enter><wait>" ], - "boot_wait": "10s", + "boot_wait": "5s", "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "guest_os_type": "debian8", @@ -103,7 +103,7 @@ "grub-installer/bootdev=/dev/sda <wait>", "<enter><wait>" ], - "boot_wait": "10s", + "boot_wait": "5s", "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "guest_os_type": "debian", @@ -141,7 +141,7 @@ "grub-installer/bootdev=/dev/vda <wait>", "<enter><wait>" ], - "boot_wait": "10s", + "boot_wait": "5s", "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", diff --git a/packer_templates/debian/debian-9.13-amd64.json b/packer_templates/debian/debian-9.13-amd64.json index 09a317b98..2cdf913e8 100644 --- a/packer_templates/debian/debian-9.13-amd64.json +++ b/packer_templates/debian/debian-9.13-amd64.json @@ -19,7 +19,7 @@ "grub-installer/bootdev=/dev/sda <wait>", "<enter><wait>" ], - "boot_wait": "10s", + "boot_wait": "5s", "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", @@ -60,7 +60,7 @@ "grub-installer/bootdev=/dev/sda <wait>", "<enter><wait>" ], - "boot_wait": "10s", + "boot_wait": "5s", "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "guest_os_type": "debian8-64", @@ -103,7 +103,7 @@ "grub-installer/bootdev=/dev/sda <wait>", "<enter><wait>" ], - "boot_wait": "10s", + "boot_wait": "5s", "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "guest_os_type": "debian", @@ -141,7 +141,7 @@ "grub-installer/bootdev=/dev/vda <wait>", "<enter><wait>" ], - "boot_wait": "10s", + "boot_wait": "5s", "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", diff --git a/packer_templates/debian/debian-9.13-i386.json b/packer_templates/debian/debian-9.13-i386.json index a1065ef89..098e9c809 100644 --- a/packer_templates/debian/debian-9.13-i386.json +++ b/packer_templates/debian/debian-9.13-i386.json @@ -19,7 +19,7 @@ "grub-installer/bootdev=/dev/sda <wait>", "<enter><wait>" ], - "boot_wait": "10s", + "boot_wait": "5s", "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", @@ -60,7 +60,7 @@ "grub-installer/bootdev=/dev/sda <wait>", "<enter><wait>" ], - "boot_wait": "10s", + "boot_wait": "5s", "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "guest_os_type": "debian8", @@ -103,7 +103,7 @@ "grub-installer/bootdev=/dev/sda <wait>", "<enter><wait>" ], - "boot_wait": "10s", + "boot_wait": "5s", "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "guest_os_type": "debian", @@ -141,7 +141,7 @@ "grub-installer/bootdev=/dev/vda <wait>", "<enter><wait>" ], - "boot_wait": "10s", + "boot_wait": "5s", "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", diff --git a/packer_templates/debian/debian-9.13-ppc64el.json b/packer_templates/debian/debian-9.13-ppc64el.json index 3c3aa4a7d..fa8e87e6e 100644 --- a/packer_templates/debian/debian-9.13-ppc64el.json +++ b/packer_templates/debian/debian-9.13-ppc64el.json @@ -25,7 +25,7 @@ "<enter><wait>", "boot<enter>" ], - "boot_wait": "10s", + "boot_wait": "5s", "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", diff --git a/packer_templates/fedora/fedora-32-x86_64.json b/packer_templates/fedora/fedora-32-x86_64.json index 4684251be..a309e8763 100644 --- a/packer_templates/fedora/fedora-32-x86_64.json +++ b/packer_templates/fedora/fedora-32-x86_64.json @@ -5,7 +5,7 @@ "boot_command": [ "<up><wait><tab> linux ks=http://{{.HTTPIP}}:{{.HTTPPort}}/{{user `ks_path`}}<enter><wait>" ], - "boot_wait": "10s", + "boot_wait": "5s", "cpus": "{{ user `cpus` }}", "disk_cache": "unsafe", "disk_compression": true, @@ -33,7 +33,7 @@ "boot_command": [ "<up><wait><tab> linux ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], - "boot_wait": "10s", + "boot_wait": "5s", "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", @@ -59,7 +59,7 @@ "boot_command": [ "<up><wait><tab> linux ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], - "boot_wait": "10s", + "boot_wait": "5s", "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "guest_os_type": "fedora-64", @@ -87,7 +87,7 @@ "boot_command": [ "<up><wait><tab> linux ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], - "boot_wait": "10s", + "boot_wait": "5s", "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "guest_os_type": "fedora-core", @@ -110,7 +110,7 @@ "boot_command": [ "<up><wait><tab> linux ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], - "boot_wait": "10s", + "boot_wait": "5s", "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", diff --git a/packer_templates/fedora/fedora-33-x86_64.json b/packer_templates/fedora/fedora-33-x86_64.json index d045e11fd..366932853 100644 --- a/packer_templates/fedora/fedora-33-x86_64.json +++ b/packer_templates/fedora/fedora-33-x86_64.json @@ -99,7 +99,8 @@ "vm_name": "{{ user `template` }}" }, { - "boot_wait": "10s", + "boot_command": "{{user `boot_command`}}", + "boot_wait": "5s", "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", diff --git a/packer_templates/freebsd/freebsd-11.4-amd64.json b/packer_templates/freebsd/freebsd-11.4-amd64.json index 0f986a089..4cb4f67f3 100644 --- a/packer_templates/freebsd/freebsd-11.4-amd64.json +++ b/packer_templates/freebsd/freebsd-11.4-amd64.json @@ -12,7 +12,7 @@ "dhclient -p /tmp/dhclient.em0.pid -l /tmp/dhclient.lease.em0 em0<enter><wait>", "fetch -o /tmp/installerconfig http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} \u0026\u0026 bsdinstall script /tmp/installerconfig<enter><wait>" ], - "boot_wait": "10s", + "boot_wait": "5s", "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "guest_additions_mode": "disable", @@ -45,7 +45,7 @@ "<wait5>", "fetch -o /tmp/installerconfig http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} \u0026\u0026 bsdinstall script /tmp/installerconfig<enter><wait>" ], - "boot_wait": "10s", + "boot_wait": "5s", "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "guest_os_type": "freebsd-64", diff --git a/packer_templates/freebsd/freebsd-11.4-i386.json b/packer_templates/freebsd/freebsd-11.4-i386.json index 2cdfd9f89..e2b0ed4ac 100644 --- a/packer_templates/freebsd/freebsd-11.4-i386.json +++ b/packer_templates/freebsd/freebsd-11.4-i386.json @@ -12,7 +12,7 @@ "dhclient -p /tmp/dhclient.em0.pid -l /tmp/dhclient.lease.em0 em0<enter><wait>", "fetch -o /tmp/installerconfig http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} \u0026\u0026 bsdinstall script /tmp/installerconfig<enter><wait>" ], - "boot_wait": "10s", + "boot_wait": "5s", "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "guest_additions_mode": "disable", @@ -45,7 +45,7 @@ "<wait5>", "fetch -o /tmp/installerconfig http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} \u0026\u0026 bsdinstall script /tmp/installerconfig<enter><wait>" ], - "boot_wait": "10s", + "boot_wait": "5s", "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "guest_os_type": "freebsd", diff --git a/packer_templates/freebsd/freebsd-12.1-amd64.json b/packer_templates/freebsd/freebsd-12.1-amd64.json index c54e460d2..cebbd59a5 100644 --- a/packer_templates/freebsd/freebsd-12.1-amd64.json +++ b/packer_templates/freebsd/freebsd-12.1-amd64.json @@ -12,7 +12,7 @@ "dhclient -p /tmp/dhclient.em0.pid -l /tmp/dhclient.lease.em0 em0<enter><wait>", "fetch -o /tmp/installerconfig http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} \u0026\u0026 bsdinstall script /tmp/installerconfig<enter><wait>" ], - "boot_wait": "10s", + "boot_wait": "5s", "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "guest_additions_mode": "disable", @@ -45,7 +45,7 @@ "<wait5>", "fetch -o /tmp/installerconfig http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} \u0026\u0026 bsdinstall script /tmp/installerconfig<enter><wait>" ], - "boot_wait": "10s", + "boot_wait": "5s", "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "guest_os_type": "freebsd-64", diff --git a/packer_templates/freebsd/freebsd-12.1-i386.json b/packer_templates/freebsd/freebsd-12.1-i386.json index f4e4c9d29..131c43346 100644 --- a/packer_templates/freebsd/freebsd-12.1-i386.json +++ b/packer_templates/freebsd/freebsd-12.1-i386.json @@ -12,7 +12,7 @@ "dhclient -p /tmp/dhclient.em0.pid -l /tmp/dhclient.lease.em0 em0<enter><wait>", "fetch -o /tmp/installerconfig http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} \u0026\u0026 bsdinstall script /tmp/installerconfig<enter><wait>" ], - "boot_wait": "10s", + "boot_wait": "5s", "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "guest_additions_mode": "disable", @@ -45,7 +45,7 @@ "<wait5>", "fetch -o /tmp/installerconfig http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} \u0026\u0026 bsdinstall script /tmp/installerconfig<enter><wait>" ], - "boot_wait": "10s", + "boot_wait": "5s", "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "guest_os_type": "freebsd", diff --git a/packer_templates/freebsd/freebsd-12.2-amd64.json b/packer_templates/freebsd/freebsd-12.2-amd64.json index 614f788a5..ce2b4cfd5 100644 --- a/packer_templates/freebsd/freebsd-12.2-amd64.json +++ b/packer_templates/freebsd/freebsd-12.2-amd64.json @@ -12,7 +12,7 @@ "dhclient -p /tmp/dhclient.em0.pid -l /tmp/dhclient.lease.em0 em0<enter><wait>", "fetch -o /tmp/installerconfig http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} \u0026\u0026 bsdinstall script /tmp/installerconfig<enter><wait>" ], - "boot_wait": "10s", + "boot_wait": "5s", "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "guest_additions_mode": "disable", @@ -45,7 +45,7 @@ "<wait5>", "fetch -o /tmp/installerconfig http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} \u0026\u0026 bsdinstall script /tmp/installerconfig<enter><wait>" ], - "boot_wait": "10s", + "boot_wait": "5s", "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "guest_os_type": "freebsd-64", diff --git a/packer_templates/freebsd/freebsd-12.2-i386.json b/packer_templates/freebsd/freebsd-12.2-i386.json index 2231d1f12..6ea9bd3d1 100644 --- a/packer_templates/freebsd/freebsd-12.2-i386.json +++ b/packer_templates/freebsd/freebsd-12.2-i386.json @@ -12,7 +12,7 @@ "dhclient -p /tmp/dhclient.em0.pid -l /tmp/dhclient.lease.em0 em0<enter><wait>", "fetch -o /tmp/installerconfig http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} \u0026\u0026 bsdinstall script /tmp/installerconfig<enter><wait>" ], - "boot_wait": "10s", + "boot_wait": "5s", "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "guest_additions_mode": "disable", @@ -45,7 +45,7 @@ "<wait5>", "fetch -o /tmp/installerconfig http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} \u0026\u0026 bsdinstall script /tmp/installerconfig<enter><wait>" ], - "boot_wait": "10s", + "boot_wait": "5s", "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "guest_os_type": "freebsd", diff --git a/packer_templates/hardenedbsd/hardenedbsd-11-amd64.json b/packer_templates/hardenedbsd/hardenedbsd-11-amd64.json index a78249470..999614e17 100644 --- a/packer_templates/hardenedbsd/hardenedbsd-11-amd64.json +++ b/packer_templates/hardenedbsd/hardenedbsd-11-amd64.json @@ -12,7 +12,7 @@ "dhclient -l /tmp/dhclient.lease.em0 em0<enter><wait10>", "fetch -o /tmp/installerconfig http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} \u0026\u0026 bsdinstall script /tmp/installerconfig<enter><wait>" ], - "boot_wait": "10s", + "boot_wait": "5s", "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "guest_additions_mode": "disable", @@ -45,7 +45,7 @@ "<wait5>", "fetch -o /tmp/installerconfig http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} \u0026\u0026 bsdinstall script /tmp/installerconfig<enter><wait>" ], - "boot_wait": "10s", + "boot_wait": "5s", "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "guest_os_type": "freebsd-64", diff --git a/packer_templates/opensuse/opensuse-leap-15.2-x86_64.json b/packer_templates/opensuse/opensuse-leap-15.2-x86_64.json index 29126290c..273a6d879 100644 --- a/packer_templates/opensuse/opensuse-leap-15.2-x86_64.json +++ b/packer_templates/opensuse/opensuse-leap-15.2-x86_64.json @@ -13,7 +13,7 @@ "autoyast=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `autoinst_cfg`}}", "<enter><wait>" ], - "boot_wait": "10s", + "boot_wait": "5s", "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", @@ -48,7 +48,7 @@ "autoyast=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `autoinst_cfg`}}", "<enter><wait>" ], - "boot_wait": "10s", + "boot_wait": "5s", "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "guest_os_type": "opensuse-64", @@ -84,7 +84,7 @@ "autoyast=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `autoinst_cfg`}}", "<enter><wait>" ], - "boot_wait": "10s", + "boot_wait": "5s", "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "guest_os_type": "opensuse", @@ -111,7 +111,7 @@ " textmode=1<wait>", "<enter><wait>" ], - "boot_wait": "10s", + "boot_wait": "5s", "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", diff --git a/packer_templates/oraclelinux/oracle-6.10-i386.json b/packer_templates/oraclelinux/oracle-6.10-i386.json index a74b7604c..b44746f3c 100644 --- a/packer_templates/oraclelinux/oracle-6.10-i386.json +++ b/packer_templates/oraclelinux/oracle-6.10-i386.json @@ -4,7 +4,7 @@ "boot_command": [ "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], - "boot_wait": "10s", + "boot_wait": "5s", "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", @@ -30,7 +30,7 @@ "boot_command": [ "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], - "boot_wait": "10s", + "boot_wait": "5s", "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "guest_os_type": "oraclelinux", @@ -57,7 +57,7 @@ "boot_command": [ "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], - "boot_wait": "10s", + "boot_wait": "5s", "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "guest_os_type": "centos", @@ -80,7 +80,7 @@ "boot_command": [ "<wait5><tab> text ks=hd:fd0:/ks.cfg<enter><wait5><esc>" ], - "boot_wait": "10s", + "boot_wait": "5s", "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "floppy_files": [ @@ -106,7 +106,7 @@ "boot_command": [ "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], - "boot_wait": "10s", + "boot_wait": "5s", "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", diff --git a/packer_templates/oraclelinux/oracle-6.10-x86_64.json b/packer_templates/oraclelinux/oracle-6.10-x86_64.json index c9d96a105..c74d3bbe8 100644 --- a/packer_templates/oraclelinux/oracle-6.10-x86_64.json +++ b/packer_templates/oraclelinux/oracle-6.10-x86_64.json @@ -4,7 +4,7 @@ "boot_command": [ "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], - "boot_wait": "10s", + "boot_wait": "5s", "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", @@ -30,7 +30,7 @@ "boot_command": [ "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], - "boot_wait": "10s", + "boot_wait": "5s", "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "guest_os_type": "oraclelinux-64", @@ -57,7 +57,7 @@ "boot_command": [ "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], - "boot_wait": "10s", + "boot_wait": "5s", "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "guest_os_type": "centos", @@ -80,7 +80,7 @@ "boot_command": [ "<wait5><tab> text ks=hd:fd0:/ks.cfg<enter><wait5><esc>" ], - "boot_wait": "10s", + "boot_wait": "5s", "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "floppy_files": [ @@ -106,7 +106,7 @@ "boot_command": [ "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], - "boot_wait": "10s", + "boot_wait": "5s", "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", diff --git a/packer_templates/oraclelinux/oracle-7.8-x86_64.json b/packer_templates/oraclelinux/oracle-7.8-x86_64.json index f174482e0..eb3898b72 100644 --- a/packer_templates/oraclelinux/oracle-7.8-x86_64.json +++ b/packer_templates/oraclelinux/oracle-7.8-x86_64.json @@ -4,7 +4,7 @@ "boot_command": [ "<up><wait><tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}} net.ifnames=0 biosdevname=0<enter><wait>" ], - "boot_wait": "10s", + "boot_wait": "5s", "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", @@ -30,7 +30,7 @@ "boot_command": [ "<up><wait><tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}} net.ifnames=0 biosdevname=0 <enter><wait>" ], - "boot_wait": "10s", + "boot_wait": "5s", "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "guest_os_type": "oraclelinux-64", @@ -57,7 +57,7 @@ "boot_command": [ "<up><wait><tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}} net.ifnames=0 biosdevname=0<enter><wait>" ], - "boot_wait": "10s", + "boot_wait": "5s", "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "guest_os_type": "centos", @@ -80,7 +80,7 @@ "boot_command": [ "<wait5><tab> text ks=hd:fd0:/ks.cfg net.ifnames=0 biosdevname=0<enter><wait5><esc>" ], - "boot_wait": "10s", + "boot_wait": "5s", "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "floppy_files": [ @@ -106,7 +106,7 @@ "boot_command": [ "<up><wait><tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}} net.ifnames=0 biosdevname=0<enter><wait>" ], - "boot_wait": "10s", + "boot_wait": "5s", "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", diff --git a/packer_templates/oraclelinux/oracle-8.2-x86_64.json b/packer_templates/oraclelinux/oracle-8.2-x86_64.json index b674f6fa6..33d10e2a1 100644 --- a/packer_templates/oraclelinux/oracle-8.2-x86_64.json +++ b/packer_templates/oraclelinux/oracle-8.2-x86_64.json @@ -4,7 +4,7 @@ "boot_command": [ "<up><wait><tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], - "boot_wait": "10s", + "boot_wait": "5s", "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", @@ -30,7 +30,7 @@ "boot_command": [ "<up><wait><tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], - "boot_wait": "10s", + "boot_wait": "5s", "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "guest_os_type": "oraclelinux-64", @@ -57,7 +57,7 @@ "boot_command": [ "<up><wait><tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], - "boot_wait": "10s", + "boot_wait": "5s", "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "guest_os_type": "centos", @@ -80,7 +80,7 @@ "boot_command": [ "<wait5><tab> text ks=hd:fd0:/ks.cfg<enter><wait5><esc>" ], - "boot_wait": "10s", + "boot_wait": "5s", "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "floppy_files": [ @@ -106,7 +106,7 @@ "boot_command": [ "<up><wait><tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], - "boot_wait": "10s", + "boot_wait": "5s", "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", diff --git a/packer_templates/rhel/rhel-6.10-i386.json b/packer_templates/rhel/rhel-6.10-i386.json index 24027999e..71ec78544 100644 --- a/packer_templates/rhel/rhel-6.10-i386.json +++ b/packer_templates/rhel/rhel-6.10-i386.json @@ -4,7 +4,7 @@ "boot_command": [ "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], - "boot_wait": "10s", + "boot_wait": "5s", "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", @@ -30,7 +30,7 @@ "boot_command": [ "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], - "boot_wait": "10s", + "boot_wait": "5s", "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "guest_os_type": "redhat", @@ -57,7 +57,7 @@ "boot_command": [ "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], - "boot_wait": "10s", + "boot_wait": "5s", "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "guest_os_type": "rhel", @@ -80,7 +80,7 @@ "boot_command": [ "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], - "boot_wait": "10s", + "boot_wait": "5s", "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", diff --git a/packer_templates/rhel/rhel-6.10-x86_64.json b/packer_templates/rhel/rhel-6.10-x86_64.json index 73715ce01..c4a2c55bf 100644 --- a/packer_templates/rhel/rhel-6.10-x86_64.json +++ b/packer_templates/rhel/rhel-6.10-x86_64.json @@ -4,7 +4,7 @@ "boot_command": [ "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], - "boot_wait": "10s", + "boot_wait": "5s", "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", @@ -30,7 +30,7 @@ "boot_command": [ "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], - "boot_wait": "10s", + "boot_wait": "5s", "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "guest_os_type": "rhel6-64", @@ -57,7 +57,7 @@ "boot_command": [ "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], - "boot_wait": "10s", + "boot_wait": "5s", "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "guest_os_type": "rhel", @@ -80,7 +80,7 @@ "boot_command": [ "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], - "boot_wait": "10s", + "boot_wait": "5s", "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", diff --git a/packer_templates/rhel/rhel-7.6-x86_64.json b/packer_templates/rhel/rhel-7.6-x86_64.json index 4c5b3abe8..538e3a61b 100644 --- a/packer_templates/rhel/rhel-7.6-x86_64.json +++ b/packer_templates/rhel/rhel-7.6-x86_64.json @@ -4,7 +4,7 @@ "boot_command": [ "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], - "boot_wait": "10s", + "boot_wait": "5s", "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", @@ -30,7 +30,7 @@ "boot_command": [ "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], - "boot_wait": "10s", + "boot_wait": "5s", "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "guest_os_type": "rhel7-64", @@ -57,7 +57,7 @@ "boot_command": [ "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], - "boot_wait": "10s", + "boot_wait": "5s", "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "guest_os_type": "rhel", @@ -80,7 +80,7 @@ "boot_command": [ "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], - "boot_wait": "10s", + "boot_wait": "5s", "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", diff --git a/packer_templates/rhel/rhel-8.0-x86_64.json b/packer_templates/rhel/rhel-8.0-x86_64.json index ddfb507aa..093e9ca44 100644 --- a/packer_templates/rhel/rhel-8.0-x86_64.json +++ b/packer_templates/rhel/rhel-8.0-x86_64.json @@ -4,7 +4,7 @@ "boot_command": [ "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], - "boot_wait": "10s", + "boot_wait": "5s", "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", @@ -30,7 +30,7 @@ "boot_command": [ "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], - "boot_wait": "10s", + "boot_wait": "5s", "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "guest_os_type": "rhel8-64", @@ -57,7 +57,7 @@ "boot_command": [ "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], - "boot_wait": "10s", + "boot_wait": "5s", "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "guest_os_type": "rhel", @@ -80,7 +80,7 @@ "boot_command": [ "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], - "boot_wait": "10s", + "boot_wait": "5s", "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", diff --git a/packer_templates/scientificlinux/scientific-7.8-x86_64.json b/packer_templates/scientificlinux/scientific-7.8-x86_64.json index cd56f4946..8535de79f 100644 --- a/packer_templates/scientificlinux/scientific-7.8-x86_64.json +++ b/packer_templates/scientificlinux/scientific-7.8-x86_64.json @@ -4,7 +4,7 @@ "boot_command": [ "<up><wait><tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], - "boot_wait": "10s", + "boot_wait": "5s", "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", @@ -30,7 +30,7 @@ "boot_command": [ "<up><wait><tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], - "boot_wait": "10s", + "boot_wait": "5s", "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "guest_os_type": "centos-64", @@ -57,7 +57,7 @@ "boot_command": [ "<up><wait><tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], - "boot_wait": "10s", + "boot_wait": "5s", "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "guest_os_type": "centos", @@ -80,7 +80,7 @@ "boot_command": [ "<wait5><tab> text ks=hd:fd0:/ks.cfg<enter><wait5><esc>" ], - "boot_wait": "10s", + "boot_wait": "5s", "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "floppy_files": [ @@ -106,7 +106,7 @@ "boot_command": [ "<up><wait><tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" ], - "boot_wait": "10s", + "boot_wait": "5s", "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", diff --git a/packer_templates/sles/sles-11-sp4-x86_64.json b/packer_templates/sles/sles-11-sp4-x86_64.json index c96bfe4ec..6e1315c4d 100644 --- a/packer_templates/sles/sles-11-sp4-x86_64.json +++ b/packer_templates/sles/sles-11-sp4-x86_64.json @@ -8,7 +8,7 @@ " textmode=1<wait>", "<enter><wait>" ], - "boot_wait": "10s", + "boot_wait": "5s", "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", @@ -38,7 +38,7 @@ " textmode=1<wait>", "<enter><wait>" ], - "boot_wait": "10s", + "boot_wait": "5s", "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "guest_os_type": "sles11-64", @@ -69,7 +69,7 @@ " textmode=1<wait>", "<enter><wait>" ], - "boot_wait": "10s", + "boot_wait": "5s", "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "guest_os_type": "suse", @@ -96,7 +96,7 @@ " textmode=1<wait>", "<enter><wait>" ], - "boot_wait": "10s", + "boot_wait": "5s", "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", diff --git a/packer_templates/sles/sles-12-sp2-x86_64.json b/packer_templates/sles/sles-12-sp2-x86_64.json index 3ff974421..b799322fc 100644 --- a/packer_templates/sles/sles-12-sp2-x86_64.json +++ b/packer_templates/sles/sles-12-sp2-x86_64.json @@ -8,7 +8,7 @@ " textmode=1<wait>", "<enter><wait>" ], - "boot_wait": "10s", + "boot_wait": "5s", "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", @@ -38,7 +38,7 @@ " textmode=1<wait>", "<enter><wait>" ], - "boot_wait": "10s", + "boot_wait": "5s", "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "guest_os_type": "sles12-64", @@ -69,7 +69,7 @@ " textmode=1<wait>", "<enter><wait>" ], - "boot_wait": "10s", + "boot_wait": "5s", "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "guest_os_type": "suse", @@ -96,7 +96,7 @@ " textmode=1<wait>", "<enter><wait>" ], - "boot_wait": "10s", + "boot_wait": "5s", "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", diff --git a/packer_templates/sles/sles-12-sp3-x86_64.json b/packer_templates/sles/sles-12-sp3-x86_64.json index 1fee0583a..f636a1423 100644 --- a/packer_templates/sles/sles-12-sp3-x86_64.json +++ b/packer_templates/sles/sles-12-sp3-x86_64.json @@ -8,7 +8,7 @@ " textmode=1<wait>", "<enter><wait>" ], - "boot_wait": "10s", + "boot_wait": "5s", "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", @@ -38,7 +38,7 @@ " textmode=1<wait>", "<enter><wait>" ], - "boot_wait": "10s", + "boot_wait": "5s", "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "guest_os_type": "sles12-64", @@ -69,7 +69,7 @@ " textmode=1<wait>", "<enter><wait>" ], - "boot_wait": "10s", + "boot_wait": "5s", "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "guest_os_type": "suse", @@ -96,7 +96,7 @@ " textmode=1<wait>", "<enter><wait>" ], - "boot_wait": "10s", + "boot_wait": "5s", "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", diff --git a/packer_templates/sles/sles-15-sp1.json b/packer_templates/sles/sles-15-sp1.json index 93731f730..7316b2f89 100644 --- a/packer_templates/sles/sles-15-sp1.json +++ b/packer_templates/sles/sles-15-sp1.json @@ -8,7 +8,7 @@ " textmode=1<wait>", "<enter><wait>" ], - "boot_wait": "10s", + "boot_wait": "5s", "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", @@ -54,7 +54,7 @@ " textmode=1<wait>", "<enter><wait>" ], - "boot_wait": "10s", + "boot_wait": "5s", "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "guest_os_type": "sles12-64", @@ -85,7 +85,7 @@ " textmode=1<wait>", "<enter><wait>" ], - "boot_wait": "10s", + "boot_wait": "5s", "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "guest_os_type": "suse", @@ -112,7 +112,7 @@ " textmode=1<wait>", "<enter><wait>" ], - "boot_wait": "10s", + "boot_wait": "5s", "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", diff --git a/packer_templates/sles/sles-15.json b/packer_templates/sles/sles-15.json index dc3a74b56..8bef948cf 100644 --- a/packer_templates/sles/sles-15.json +++ b/packer_templates/sles/sles-15.json @@ -8,7 +8,7 @@ " textmode=1<wait>", "<enter><wait>" ], - "boot_wait": "10s", + "boot_wait": "5s", "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", @@ -54,7 +54,7 @@ " textmode=1<wait>", "<enter><wait>" ], - "boot_wait": "10s", + "boot_wait": "5s", "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "guest_os_type": "sles12-64", @@ -85,7 +85,7 @@ " textmode=1<wait>", "<enter><wait>" ], - "boot_wait": "10s", + "boot_wait": "5s", "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "guest_os_type": "suse", @@ -112,7 +112,7 @@ " textmode=1<wait>", "<enter><wait>" ], - "boot_wait": "10s", + "boot_wait": "5s", "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", diff --git a/packer_templates/ubuntu/ubuntu-16.04-amd64.json b/packer_templates/ubuntu/ubuntu-16.04-amd64.json index a96973547..4201ddc84 100644 --- a/packer_templates/ubuntu/ubuntu-16.04-amd64.json +++ b/packer_templates/ubuntu/ubuntu-16.04-amd64.json @@ -27,7 +27,7 @@ " -- <wait>", "<enter><wait>" ], - "boot_wait": "10s", + "boot_wait": "5s", "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", @@ -76,7 +76,7 @@ " -- <wait>", "<enter><wait>" ], - "boot_wait": "10s", + "boot_wait": "5s", "cpus": "{{ user `cpus` }}", "disk_adapter_type": "sata", "disk_size": "{{user `disk_size`}}", @@ -128,7 +128,7 @@ " -- <wait>", "<enter><wait>" ], - "boot_wait": "10s", + "boot_wait": "5s", "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "guest_os_type": "ubuntu", @@ -174,7 +174,7 @@ " -- <wait>", "<enter><wait>" ], - "boot_wait": "10s", + "boot_wait": "5s", "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", @@ -205,7 +205,7 @@ "initrd /install/initrd.gz<enter>", "boot<enter>" ], - "boot_wait": "10s", + "boot_wait": "5s", "communicator": "ssh", "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", diff --git a/packer_templates/ubuntu/ubuntu-16.04-i386.json b/packer_templates/ubuntu/ubuntu-16.04-i386.json index 2f4c1570e..8f6beed17 100644 --- a/packer_templates/ubuntu/ubuntu-16.04-i386.json +++ b/packer_templates/ubuntu/ubuntu-16.04-i386.json @@ -27,7 +27,7 @@ " -- <wait>", "<enter><wait>" ], - "boot_wait": "10s", + "boot_wait": "5s", "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", @@ -76,7 +76,7 @@ " -- <wait>", "<enter><wait>" ], - "boot_wait": "10s", + "boot_wait": "5s", "cpus": "{{ user `cpus` }}", "disk_adapter_type": "sata", "disk_size": "{{user `disk_size`}}", @@ -127,7 +127,7 @@ " -- <wait>", "<enter><wait>" ], - "boot_wait": "10s", + "boot_wait": "5s", "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "guest_os_type": "ubuntu", @@ -173,7 +173,7 @@ " -- <wait>", "<enter><wait>" ], - "boot_wait": "10s", + "boot_wait": "5s", "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", @@ -204,7 +204,7 @@ "initrd /install/initrd.gz<enter>", "boot<enter>" ], - "boot_wait": "10s", + "boot_wait": "5s", "communicator": "ssh", "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", diff --git a/packer_templates/ubuntu/ubuntu-18.04-amd64.json b/packer_templates/ubuntu/ubuntu-18.04-amd64.json index 87fb8e0f0..9e7932ec1 100644 --- a/packer_templates/ubuntu/ubuntu-18.04-amd64.json +++ b/packer_templates/ubuntu/ubuntu-18.04-amd64.json @@ -26,7 +26,7 @@ " -- <wait>", "<enter><wait>" ], - "boot_wait": "10s", + "boot_wait": "5s", "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", @@ -74,7 +74,7 @@ " -- <wait>", "<enter><wait>" ], - "boot_wait": "10s", + "boot_wait": "5s", "cpus": "{{ user `cpus` }}", "disk_adapter_type": "sata", "disk_size": "{{user `disk_size`}}", @@ -125,7 +125,7 @@ " -- <wait>", "<enter><wait>" ], - "boot_wait": "10s", + "boot_wait": "5s", "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "guest_os_type": "ubuntu", @@ -170,7 +170,7 @@ " -- <wait>", "<enter><wait>" ], - "boot_wait": "10s", + "boot_wait": "5s", "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", @@ -201,7 +201,7 @@ "initrd /install/initrd.gz<enter>", "boot<enter>" ], - "boot_wait": "10s", + "boot_wait": "5s", "communicator": "ssh", "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", diff --git a/packer_templates/ubuntu/ubuntu-20.04-amd64.json b/packer_templates/ubuntu/ubuntu-20.04-amd64.json index 4ff225867..9fbb86f18 100644 --- a/packer_templates/ubuntu/ubuntu-20.04-amd64.json +++ b/packer_templates/ubuntu/ubuntu-20.04-amd64.json @@ -26,7 +26,7 @@ " -- <wait>", "<enter><wait>" ], - "boot_wait": "10s", + "boot_wait": "5s", "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", @@ -74,7 +74,7 @@ " -- <wait>", "<enter><wait>" ], - "boot_wait": "10s", + "boot_wait": "5s", "cpus": "{{ user `cpus` }}", "disk_adapter_type": "sata", "disk_size": "{{user `disk_size`}}", @@ -125,7 +125,7 @@ " -- <wait>", "<enter><wait>" ], - "boot_wait": "10s", + "boot_wait": "5s", "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "guest_os_type": "ubuntu", @@ -170,7 +170,7 @@ " -- <wait>", "<enter><wait>" ], - "boot_wait": "10s", + "boot_wait": "5s", "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "headless": "{{ user `headless` }}", @@ -201,7 +201,7 @@ "initrd /install/initrd.gz<enter>", "boot<enter>" ], - "boot_wait": "10s", + "boot_wait": "5s", "communicator": "ssh", "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", From 51c29fb15d5b4ff2aebe5fdbdd3ba522f6ccc9ed Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Sun, 27 Dec 2020 14:31:35 -0800 Subject: [PATCH 1337/1622] Fix vmware-iso in Fedora 33 by bumping to HW 11\ Signed-off-by: Tim Smith <tsmith@chef.io> --- packer_templates/fedora/fedora-33-x86_64.json | 1 + 1 file changed, 1 insertion(+) diff --git a/packer_templates/fedora/fedora-33-x86_64.json b/packer_templates/fedora/fedora-33-x86_64.json index 366932853..ab160c4a1 100644 --- a/packer_templates/fedora/fedora-33-x86_64.json +++ b/packer_templates/fedora/fedora-33-x86_64.json @@ -70,6 +70,7 @@ "ssh_username": "vagrant", "tools_upload_flavor": "linux", "type": "vmware-iso", + "version": "11", "vm_name": "{{ user `template` }}", "vmx_data": { "cpuid.coresPerSocket": "1", From 2a9b6c9b5431100b083727564d12d158a47d8cce Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Sun, 27 Dec 2020 15:00:11 -0800 Subject: [PATCH 1338/1622] Bump vmware HW on Fedora 32 to 11 Signed-off-by: Tim Smith <tsmith@chef.io> --- packer_templates/fedora/fedora-32-x86_64.json | 1 + 1 file changed, 1 insertion(+) diff --git a/packer_templates/fedora/fedora-32-x86_64.json b/packer_templates/fedora/fedora-32-x86_64.json index a309e8763..512bc5fc1 100644 --- a/packer_templates/fedora/fedora-32-x86_64.json +++ b/packer_templates/fedora/fedora-32-x86_64.json @@ -76,6 +76,7 @@ "ssh_username": "vagrant", "tools_upload_flavor": "linux", "type": "vmware-iso", + "version": "11", "vm_name": "{{ user `template` }}", "vmx_data": { "cpuid.coresPerSocket": "1", From 09c744ff307ffc8f776b7920cd998c9f711a0369 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Sun, 27 Dec 2020 15:00:34 -0800 Subject: [PATCH 1339/1622] Complete the boot command move on Fedora to user vars Signed-off-by: Tim Smith <tsmith@chef.io> --- packer_templates/fedora/fedora-32-x86_64.json | 25 ++++++------------- packer_templates/fedora/fedora-33-x86_64.json | 2 +- 2 files changed, 9 insertions(+), 18 deletions(-) diff --git a/packer_templates/fedora/fedora-32-x86_64.json b/packer_templates/fedora/fedora-32-x86_64.json index 512bc5fc1..48d385f06 100644 --- a/packer_templates/fedora/fedora-32-x86_64.json +++ b/packer_templates/fedora/fedora-32-x86_64.json @@ -2,9 +2,7 @@ "builders": [ { "accelerator": "kvm", - "boot_command": [ - "<up><wait><tab> linux ks=http://{{.HTTPIP}}:{{.HTTPPort}}/{{user `ks_path`}}<enter><wait>" - ], + "boot_command": "{{user `boot_command`}}", "boot_wait": "5s", "cpus": "{{ user `cpus` }}", "disk_cache": "unsafe", @@ -30,9 +28,7 @@ "vm_name": "{{ user `template` }}" }, { - "boot_command": [ - "<up><wait><tab> linux ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" - ], + "boot_command": "{{user `boot_command`}}", "boot_wait": "5s", "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", @@ -56,9 +52,7 @@ "vm_name": "{{ user `template` }}" }, { - "boot_command": [ - "<up><wait><tab> linux ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" - ], + "boot_command": "{{ user `boot_command` }}", "boot_wait": "5s", "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", @@ -85,9 +79,7 @@ "vmx_remove_ethernet_interfaces": true }, { - "boot_command": [ - "<up><wait><tab> linux ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" - ], + "boot_command": "{{user `boot_command`}}", "boot_wait": "5s", "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", @@ -108,9 +100,7 @@ "vm_name": "{{ user `template` }}" }, { - "boot_command": [ - "<up><wait><tab> linux ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" - ], + "boot_command": "{{user `boot_command`}}", "boot_wait": "5s", "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", @@ -126,8 +116,8 @@ "ssh_timeout": "10000s", "ssh_username": "vagrant", "type": "qemu", - "qemuargs": [["{{ user `qemuargs_opt` }}","{{ user `qemuargs_value` }}"]], - "vm_name": "{{ user `template` }}" + "vm_name": "{{ user `template` }}", + "qemuargs": [["{{ user `qemuargs_opt` }}","{{ user `qemuargs_value` }}"]] } ], "post-processors": [ @@ -187,6 +177,7 @@ "template": "fedora-32-x86_64", "qemuargs_opt": "-m", "qemuargs_value": "1024M", + "boot_command": "<up><wait><tab> text inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>", "version": "TIMESTAMP" } } diff --git a/packer_templates/fedora/fedora-33-x86_64.json b/packer_templates/fedora/fedora-33-x86_64.json index ab160c4a1..8f49522f5 100644 --- a/packer_templates/fedora/fedora-33-x86_64.json +++ b/packer_templates/fedora/fedora-33-x86_64.json @@ -177,7 +177,7 @@ "template": "fedora-33-x86_64", "qemuargs_opt": "-m", "qemuargs_value": "1024M", - "boot_command": "<tab> text inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>", + "boot_command": "<up><wait><tab> text inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>", "version": "TIMESTAMP" } } From 0feb8928d9db1d8fb0b79f2efe335cc44e1e6109 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Sun, 27 Dec 2020 15:00:57 -0800 Subject: [PATCH 1340/1622] Validate configs on the latest Packer Signed-off-by: Tim Smith <tsmith@chef.io> --- .expeditor/verify.pipeline.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.expeditor/verify.pipeline.yml b/.expeditor/verify.pipeline.yml index 4cb5bb39a..6a1790fb2 100644 --- a/.expeditor/verify.pipeline.yml +++ b/.expeditor/verify.pipeline.yml @@ -3,8 +3,8 @@ steps: - label: run-packer-validate command: - bundle install - - wget https://releases.hashicorp.com/packer/1.6.1/packer_1.6.1_linux_amd64.zip - - unzip -d /usr/local/bin packer_1.6.1_linux_amd64.zip + - wget https://releases.hashicorp.com/packer/1.6.6/packer_1.6.6_linux_amd64.zip + - unzip -d /usr/local/bin packer_1.6.6_linux_amd64.zip - rake validate expeditor: executor: From 630c2771d17e06b0c43bdb579f102251bb0a5c44 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Sun, 27 Dec 2020 17:20:40 -0800 Subject: [PATCH 1341/1622] Avoid checking the ISO at build time on Fedora Signed-off-by: Tim Smith <tsmith@chef.io> --- packer_templates/fedora/fedora-32-x86_64.json | 2 +- packer_templates/fedora/fedora-33-x86_64.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packer_templates/fedora/fedora-32-x86_64.json b/packer_templates/fedora/fedora-32-x86_64.json index 48d385f06..689791933 100644 --- a/packer_templates/fedora/fedora-32-x86_64.json +++ b/packer_templates/fedora/fedora-32-x86_64.json @@ -177,7 +177,7 @@ "template": "fedora-32-x86_64", "qemuargs_opt": "-m", "qemuargs_value": "1024M", - "boot_command": "<up><wait><tab> text inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>", + "boot_command": "<up><wait><tab> inst.text inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>", "version": "TIMESTAMP" } } diff --git a/packer_templates/fedora/fedora-33-x86_64.json b/packer_templates/fedora/fedora-33-x86_64.json index 8f49522f5..afd729968 100644 --- a/packer_templates/fedora/fedora-33-x86_64.json +++ b/packer_templates/fedora/fedora-33-x86_64.json @@ -177,7 +177,7 @@ "template": "fedora-33-x86_64", "qemuargs_opt": "-m", "qemuargs_value": "1024M", - "boot_command": "<up><wait><tab> text inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>", + "boot_command": "<up><wait><tab> inst.text inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>", "version": "TIMESTAMP" } } From c474207aa0554942b069a9ee543f219138cb6812 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Sun, 27 Dec 2020 17:20:56 -0800 Subject: [PATCH 1342/1622] Update Oracle to 7.9 and 8.3 Signed-off-by: Tim Smith <tsmith@chef.io> --- ...oracle-7.8-x86_64.json => oracle-7.9-x86_64.json} | 12 ++++++------ ...oracle-8.2-x86_64.json => oracle-8.3-x86_64.json} | 12 ++++++------ 2 files changed, 12 insertions(+), 12 deletions(-) rename packer_templates/oraclelinux/{oracle-7.8-x86_64.json => oracle-7.9-x86_64.json} (96%) rename packer_templates/oraclelinux/{oracle-8.2-x86_64.json => oracle-8.3-x86_64.json} (96%) diff --git a/packer_templates/oraclelinux/oracle-7.8-x86_64.json b/packer_templates/oraclelinux/oracle-7.9-x86_64.json similarity index 96% rename from packer_templates/oraclelinux/oracle-7.8-x86_64.json rename to packer_templates/oraclelinux/oracle-7.9-x86_64.json index eb3898b72..87077b8c5 100644 --- a/packer_templates/oraclelinux/oracle-7.8-x86_64.json +++ b/packer_templates/oraclelinux/oracle-7.9-x86_64.json @@ -157,7 +157,7 @@ ], "variables": { "arch": "64", - "box_basename": "oracle-7.8", + "box_basename": "oracle-7.9", "build_directory": "../../builds", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "2", @@ -170,15 +170,15 @@ "https_proxy": "{{env `https_proxy`}}", "hyperv_generation": "1", "hyperv_switch": "{{env `hyperv_switch`}}", - "iso_checksum": "6e1069ff42f7e59b19af4e2fcacae2fca3f195c7f2904275b0df386efdcd616d", - "iso_name": "OracleLinux-R7-U8-Server-x86_64-dvd.iso", + "iso_checksum": "dc2782bfd92b4c060cf8006fbc6e18036c27f599eebf3584a1a2ac54f008bf2f", + "iso_name": "OracleLinux-R7-U9-Server-x86_64-dvd.iso", "ks_path": "7/ks.cfg", "memory": "1024", "mirror": "http://mirrors.dotsrc.org/oracle-linux", - "mirror_directory": "OL7/u8/x86_64", - "name": "oracle-7.8", + "mirror_directory": "OL7/u9/x86_64", + "name": "oracle-7.9", "no_proxy": "{{env `no_proxy`}}", - "template": "oracle-7.8-x86_64", + "template": "oracle-7.9-x86_64", "version": "TIMESTAMP" } } diff --git a/packer_templates/oraclelinux/oracle-8.2-x86_64.json b/packer_templates/oraclelinux/oracle-8.3-x86_64.json similarity index 96% rename from packer_templates/oraclelinux/oracle-8.2-x86_64.json rename to packer_templates/oraclelinux/oracle-8.3-x86_64.json index 33d10e2a1..07dbd6051 100644 --- a/packer_templates/oraclelinux/oracle-8.2-x86_64.json +++ b/packer_templates/oraclelinux/oracle-8.3-x86_64.json @@ -156,7 +156,7 @@ } ], "variables": { - "box_basename": "oracle-8.2", + "box_basename": "oracle-8.3", "build_directory": "../../builds", "build_timestamp": "{{isotime \"2019102650405\"}}", "cpus": "2", @@ -169,15 +169,15 @@ "https_proxy": "{{env `https_proxy`}}", "hyperv_generation": "1", "hyperv_switch": "{{env `hyperv_switch`}}", - "iso_checksum": "67568941e976efb26a3d61cdbf98c5a46cd0b3463ec750992f305eee20957a6e", - "iso_name": "OracleLinux-R8-U2-x86_64-dvd.iso", + "iso_checksum": "771e383adfd5406d1a360ff24822011a88cbb45b6019e2f1095758c46a406aaa", + "iso_name": "OracleLinux-R8-U3-x86_64-dvd.iso", "ks_path": "8/ks.cfg", "memory": "1024", "mirror": "http://mirrors.dotsrc.org/oracle-linux", - "mirror_directory": "OL8/u2/x86_64", - "name": "oracle-8.2", + "mirror_directory": "OL8/u3/x86_64", + "name": "oracle-8.3", "no_proxy": "{{env `no_proxy`}}", - "template": "oracle-8.2-x86_64", + "template": "oracle-8.3-x86_64", "version": "TIMESTAMP" } } From 37d21ad4807d3808ae94370de72b0cbfd69d1dbc Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Sun, 27 Dec 2020 18:33:22 -0800 Subject: [PATCH 1343/1622] Add gemspec for bundler on windows Signed-off-by: Tim Smith <tsmith@chef.io> --- Gemfile | 1 - bento.gemspec | 22 ++++++++++++++++++++++ 2 files changed, 22 insertions(+), 1 deletion(-) create mode 100644 bento.gemspec diff --git a/Gemfile b/Gemfile index a004a6bde..2121bff82 100644 --- a/Gemfile +++ b/Gemfile @@ -3,5 +3,4 @@ source "https://rubygems.org" group :development do gem "cookstyle" gem "rake", ">= 12" - gem "mixlib-shellout", ">= 2.3.2" end diff --git a/bento.gemspec b/bento.gemspec new file mode 100644 index 000000000..8e96a181c --- /dev/null +++ b/bento.gemspec @@ -0,0 +1,22 @@ +# frozen_string_literal: true + +Gem::Specification.new do |s| + s.name = "bento" + s.version = Ohai::VERSION + s.summary = "Bento builds generic Vagrant boxes " + s.description = s.summary + s.license = "Apache-2.0" + s.author = "Many many Chef employees over the years" + s.email = "oss@chef.io" + s.homepage = "https://github.com/chef/bento/" + + s.required_ruby_version = ">= 2.6" + + s.add_dependency "mixlib-shellout", ">= 2.3.2" + + s.bindir = "bin" + s.executables = %w{bento} + + s.require_path = "lib" + s.files = %w{LICENSE Gemfile} + Dir.glob("*.gemspec") + Dir.glob("lib/**/*") +end From 32d7b3768bbc57fa15abbd31a8d9c90556a048d6 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Sun, 27 Dec 2020 19:01:23 -0800 Subject: [PATCH 1344/1622] Fix the gemfile to use the gemspec Signed-off-by: Tim Smith <tsmith@chef.io> --- Gemfile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Gemfile b/Gemfile index 2121bff82..2d3ae5f00 100644 --- a/Gemfile +++ b/Gemfile @@ -1,5 +1,7 @@ source "https://rubygems.org" +gemspec + group :development do gem "cookstyle" gem "rake", ">= 12" From 60e59db0fdbdc135ce40e558c1e04c3984d681e5 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Sun, 27 Dec 2020 19:02:35 -0800 Subject: [PATCH 1345/1622] Add version to gemspec Signed-off-by: Tim Smith <tsmith@chef.io> --- bento.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bento.gemspec b/bento.gemspec index 8e96a181c..04eb36651 100644 --- a/bento.gemspec +++ b/bento.gemspec @@ -2,7 +2,7 @@ Gem::Specification.new do |s| s.name = "bento" - s.version = Ohai::VERSION + s.version = "1.0" s.summary = "Bento builds generic Vagrant boxes " s.description = s.summary s.license = "Apache-2.0" From 525faa6fa39f417f8e01142c6e895119b8d7891b Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Sun, 27 Dec 2020 19:10:50 -0800 Subject: [PATCH 1346/1622] Use require_relative instead of messing with load path Signed-off-by: Tim Smith <tsmith@chef.io> --- bin/bento | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/bin/bento b/bin/bento index aaef099cc..9e8ca40f4 100755 --- a/bin/bento +++ b/bin/bento @@ -4,8 +4,7 @@ Signal.trap("INT") { exit 1 } $stdout.sync = true $stderr.sync = true -$LOAD_PATH.unshift File.join(__dir__, %w{.. lib}) -require "bento/cli" +require_relative "../lib/bento/cli" begin Runner.new(Options.parse(ARGV)).start From 3768bb6fb5b60cab9abd679118e144ac1a0e5790 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Sun, 27 Dec 2020 19:11:23 -0800 Subject: [PATCH 1347/1622] Keep the manpages on Fedora Signed-off-by: Tim Smith <tsmith@chef.io> --- packer_templates/fedora/http/ks-fedora.cfg | 1 - 1 file changed, 1 deletion(-) diff --git a/packer_templates/fedora/http/ks-fedora.cfg b/packer_templates/fedora/http/ks-fedora.cfg index c63e57b8e..b55345f7b 100644 --- a/packer_templates/fedora/http/ks-fedora.cfg +++ b/packer_templates/fedora/http/ks-fedora.cfg @@ -30,7 +30,6 @@ rsync -mcelog -smartmontools -usbutils --man-pages -microcode_ctl %end From 6b05ec7966dd40f5c809107beb407606039e0d2c Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Sun, 27 Dec 2020 19:11:41 -0800 Subject: [PATCH 1348/1622] Make boot_command a variable on Oracle 8.3 Signed-off-by: Tim Smith <tsmith@chef.io> --- packer_templates/oraclelinux/oracle-8.3-x86_64.json | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/packer_templates/oraclelinux/oracle-8.3-x86_64.json b/packer_templates/oraclelinux/oracle-8.3-x86_64.json index 07dbd6051..92c84be0e 100644 --- a/packer_templates/oraclelinux/oracle-8.3-x86_64.json +++ b/packer_templates/oraclelinux/oracle-8.3-x86_64.json @@ -27,9 +27,7 @@ "vm_name": "{{ user `template` }}" }, { - "boot_command": [ - "<up><wait><tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" - ], + "boot_command": "{{ user `boot_command` }}", "boot_wait": "5s", "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", @@ -54,9 +52,7 @@ "vmx_remove_ethernet_interfaces": true }, { - "boot_command": [ - "<up><wait><tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" - ], + "boot_command": "{{user `boot_command`}}", "boot_wait": "5s", "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", @@ -178,6 +174,7 @@ "name": "oracle-8.3", "no_proxy": "{{env `no_proxy`}}", "template": "oracle-8.3-x86_64", + "boot_command": "<up><wait><tab> inst.text inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>", "version": "TIMESTAMP" } } From a57eb16723ec9a0848a67926a82edaa56898fa06 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Sun, 27 Dec 2020 19:15:44 -0800 Subject: [PATCH 1349/1622] Update builds.yml Signed-off-by: Tim Smith <tsmith@chef.io> --- builds.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/builds.yml b/builds.yml index a1fb4d115..84ac3e873 100644 --- a/builds.yml +++ b/builds.yml @@ -20,8 +20,8 @@ public: - 'opensuse-leap-15.2' - 'oracle-6.10-i386' - 'oracle-6.10' -- 'oracle-7.7' -- 'oracle-8.2' +- 'oracle-7.9' +- 'oracle-8.3' - 'scientific-7.8' - 'ubuntu-16.04-i386' - 'ubuntu-16.04' From 3d020f5f8eaa6c70edff8d4da64b00eeff8213f6 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith@chef.io> Date: Sun, 27 Dec 2020 20:25:37 -0800 Subject: [PATCH 1350/1622] Update README.md Signed-off-by: Tim Smith <tsmith@chef.io> --- README.md | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 9e36686bd..ee2776126 100644 --- a/README.md +++ b/README.md @@ -25,13 +25,14 @@ end #### Requirements - [Packer](https://www.packer.io/) +- [Vagrant](https://www.vagrantup.com/) - At least one of the following virtualization providers: - - [VirtualBox](https://www.virtualbox.org) + - [VirtualBox](https://www.virtualbox.org/) - [VMware Fusion](https://www.vmware.com/products/fusion.html) - - [VMware Workstation](https://www.vmware.com/products/workstation.html) - - [Parallels Desktop](http://www.parallels.com/products/desktop) also requires [Parallels Virtualization SDK](https://www.parallels.com/products/desktop/download/) + - [VMware Workstation](https://www.vmware.com/products/workstation-pro.html) + - [Parallels Desktop](https://www.parallels.com/products/desktop/) also requires [Parallels Virtualization SDK](https://www.parallels.com/products/desktop/download/) - [KVM](https://www.linux-kvm.org/page/Main_Page) * - - [Hyper-V](https://technet.microsoft.com/en-us/library/hh831531(v=ws.11).aspx) * + - [Hyper-V](https://docs.microsoft.com/en-us/virtualization/hyper-v-on-windows/about/) * \***NOTE:** support for these providers is considered experimental and corresponding Vagrant Cloud images may or may not exist. From 653f8471647579ffe9b11202ff19a91a38799b67 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Sun, 27 Dec 2020 21:06:41 -0800 Subject: [PATCH 1351/1622] Provide a default hyper-v switch name Signed-off-by: Tim Smith <tsmith@chef.io> --- packer_templates/centos/centos-6.10-x86_64.json | 2 +- packer_templates/centos/centos-7.9-x86_64.json | 2 +- packer_templates/centos/centos-8.3-x86_64.json | 2 +- packer_templates/oraclelinux/oracle-6.10-x86_64.json | 2 +- packer_templates/oraclelinux/oracle-7.9-x86_64.json | 2 +- packer_templates/oraclelinux/oracle-8.3-x86_64.json | 2 +- packer_templates/scientificlinux/scientific-7.8-x86_64.json | 2 +- packer_templates/ubuntu/ubuntu-16.04-amd64.json | 2 +- packer_templates/ubuntu/ubuntu-16.04-i386.json | 2 +- packer_templates/ubuntu/ubuntu-18.04-amd64.json | 2 +- packer_templates/ubuntu/ubuntu-20.04-amd64.json | 2 +- packer_templates/ubuntu/ubuntu-20.04-live-amd64.json | 2 +- packer_templates/ubuntu/ubuntu-20.10-amd64.json | 2 +- packer_templates/ubuntu/ubuntu-21.04-amd64.json | 2 +- packer_templates/windows/windows-10.json | 2 +- packer_templates/windows/windows-10gen2.json | 2 +- packer_templates/windows/windows-2012.json | 3 +-- packer_templates/windows/windows-2012r2.json | 3 +-- packer_templates/windows/windows-2016.json | 3 +-- packer_templates/windows/windows-2019.json | 3 +-- 20 files changed, 20 insertions(+), 24 deletions(-) diff --git a/packer_templates/centos/centos-6.10-x86_64.json b/packer_templates/centos/centos-6.10-x86_64.json index 8740d13f4..96cc4622f 100644 --- a/packer_templates/centos/centos-6.10-x86_64.json +++ b/packer_templates/centos/centos-6.10-x86_64.json @@ -168,7 +168,7 @@ "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", "hyperv_generation": "1", - "hyperv_switch": "{{env `hyperv_switch`}}", + "hyperv_switch": "bento", "iso_checksum": "a68e46970678d4d297d46086ae2efdd3e994322d6d862ff51dcce25a0759e41c", "iso_name": "CentOS-6.10-x86_64-bin-DVD1.iso", "ks_path": "6/ks.cfg", diff --git a/packer_templates/centos/centos-7.9-x86_64.json b/packer_templates/centos/centos-7.9-x86_64.json index 6d4a0455b..16808cd71 100644 --- a/packer_templates/centos/centos-7.9-x86_64.json +++ b/packer_templates/centos/centos-7.9-x86_64.json @@ -168,7 +168,7 @@ "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", "hyperv_generation": "1", - "hyperv_switch": "{{env `hyperv_switch`}}", + "hyperv_switch": "bento", "iso_checksum": "07b94e6b1a0b0260b94c83d6bb76b26bf7a310dc78d7a9c7432809fb9bc6194a", "iso_name": "CentOS-7-x86_64-Minimal-2009.iso", "ks_path": "7/ks.cfg", diff --git a/packer_templates/centos/centos-8.3-x86_64.json b/packer_templates/centos/centos-8.3-x86_64.json index ac1b2e2c1..f10b4f51d 100644 --- a/packer_templates/centos/centos-8.3-x86_64.json +++ b/packer_templates/centos/centos-8.3-x86_64.json @@ -168,7 +168,7 @@ "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", "hyperv_generation": "1", - "hyperv_switch": "{{env `hyperv_switch`}}", + "hyperv_switch": "bento", "iso_checksum": "aaf9d4b3071c16dbbda01dfe06085e5d0fdac76df323e3bbe87cce4318052247", "iso_name": "CentOS-8.3.2011-x86_64-dvd1.iso", "ks_path": "8/ks.cfg", diff --git a/packer_templates/oraclelinux/oracle-6.10-x86_64.json b/packer_templates/oraclelinux/oracle-6.10-x86_64.json index c74d3bbe8..b06b98748 100644 --- a/packer_templates/oraclelinux/oracle-6.10-x86_64.json +++ b/packer_templates/oraclelinux/oracle-6.10-x86_64.json @@ -169,7 +169,7 @@ "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", "hyperv_generation": "1", - "hyperv_switch": "{{env `hyperv_switch`}}", + "hyperv_switch": "bento", "iso_checksum": "c32e2a7c8eb471db731741f1a30be37e49deda8ce961710273a71b26c9a04a36", "iso_name": "OracleLinux-R6-U9-Server-x86_64-dvd.iso", "ks_path": "6/ks.cfg", diff --git a/packer_templates/oraclelinux/oracle-7.9-x86_64.json b/packer_templates/oraclelinux/oracle-7.9-x86_64.json index 87077b8c5..d8393c43d 100644 --- a/packer_templates/oraclelinux/oracle-7.9-x86_64.json +++ b/packer_templates/oraclelinux/oracle-7.9-x86_64.json @@ -169,7 +169,7 @@ "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", "hyperv_generation": "1", - "hyperv_switch": "{{env `hyperv_switch`}}", + "hyperv_switch": "bento", "iso_checksum": "dc2782bfd92b4c060cf8006fbc6e18036c27f599eebf3584a1a2ac54f008bf2f", "iso_name": "OracleLinux-R7-U9-Server-x86_64-dvd.iso", "ks_path": "7/ks.cfg", diff --git a/packer_templates/oraclelinux/oracle-8.3-x86_64.json b/packer_templates/oraclelinux/oracle-8.3-x86_64.json index 92c84be0e..edbeb1f9e 100644 --- a/packer_templates/oraclelinux/oracle-8.3-x86_64.json +++ b/packer_templates/oraclelinux/oracle-8.3-x86_64.json @@ -164,7 +164,7 @@ "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", "hyperv_generation": "1", - "hyperv_switch": "{{env `hyperv_switch`}}", + "hyperv_switch": "bento", "iso_checksum": "771e383adfd5406d1a360ff24822011a88cbb45b6019e2f1095758c46a406aaa", "iso_name": "OracleLinux-R8-U3-x86_64-dvd.iso", "ks_path": "8/ks.cfg", diff --git a/packer_templates/scientificlinux/scientific-7.8-x86_64.json b/packer_templates/scientificlinux/scientific-7.8-x86_64.json index 8535de79f..d88aa296c 100644 --- a/packer_templates/scientificlinux/scientific-7.8-x86_64.json +++ b/packer_templates/scientificlinux/scientific-7.8-x86_64.json @@ -168,7 +168,7 @@ "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", "hyperv_generation": "1", - "hyperv_switch": "{{env `hyperv_switch`}}", + "hyperv_switch": "bento", "iso_checksum": "64eb2df3616cc1f4c278eb553dccc721bfb9a5aad3f5b5dcc677e709ad8a8b4e", "iso_name": "SL-7-DVD-x86_64.iso", "ks_path": "7/ks.cfg", diff --git a/packer_templates/ubuntu/ubuntu-16.04-amd64.json b/packer_templates/ubuntu/ubuntu-16.04-amd64.json index 4201ddc84..539dcac4c 100644 --- a/packer_templates/ubuntu/ubuntu-16.04-amd64.json +++ b/packer_templates/ubuntu/ubuntu-16.04-amd64.json @@ -272,7 +272,7 @@ "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", "hyperv_generation": "2", - "hyperv_switch": "{{env `hyperv_switch`}}", + "hyperv_switch": "bento", "iso_checksum": "b23488689e16cad7a269eb2d3a3bf725d3457ee6b0868e00c8762d3816e25848", "iso_name": "ubuntu-16.04.7-server-amd64.iso", "memory": "1024", diff --git a/packer_templates/ubuntu/ubuntu-16.04-i386.json b/packer_templates/ubuntu/ubuntu-16.04-i386.json index 8f6beed17..ca6eb1703 100644 --- a/packer_templates/ubuntu/ubuntu-16.04-i386.json +++ b/packer_templates/ubuntu/ubuntu-16.04-i386.json @@ -271,7 +271,7 @@ "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", "hyperv_generation": "1", - "hyperv_switch": "{{env `hyperv_switch`}}", + "hyperv_switch": "bento", "iso_checksum": "7509cabb2f9f6ba0a95f8454d432be2ef26679d31ce35baa626acc5321460fab", "iso_name": "ubuntu-16.04.6-server-i386.iso", "memory": "1024", diff --git a/packer_templates/ubuntu/ubuntu-18.04-amd64.json b/packer_templates/ubuntu/ubuntu-18.04-amd64.json index 9e7932ec1..3a3ee326d 100644 --- a/packer_templates/ubuntu/ubuntu-18.04-amd64.json +++ b/packer_templates/ubuntu/ubuntu-18.04-amd64.json @@ -268,7 +268,7 @@ "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", "hyperv_generation": "2", - "hyperv_switch": "{{env `hyperv_switch`}}", + "hyperv_switch": "bento", "iso_checksum": "8c5fc24894394035402f66f3824beb7234b757dd2b5531379cb310cedfdf0996", "iso_name": "ubuntu-18.04.5-server-amd64.iso", "memory": "1024", diff --git a/packer_templates/ubuntu/ubuntu-20.04-amd64.json b/packer_templates/ubuntu/ubuntu-20.04-amd64.json index 9fbb86f18..bb7caec59 100644 --- a/packer_templates/ubuntu/ubuntu-20.04-amd64.json +++ b/packer_templates/ubuntu/ubuntu-20.04-amd64.json @@ -268,7 +268,7 @@ "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", "hyperv_generation": "2", - "hyperv_switch": "{{env `hyperv_switch`}}", + "hyperv_switch": "bento", "iso_checksum": "f11bda2f2caed8f420802b59f382c25160b114ccc665dbac9c5046e7fceaced2", "iso_name": "ubuntu-20.04.1-legacy-server-amd64.iso", "memory": "1024", diff --git a/packer_templates/ubuntu/ubuntu-20.04-live-amd64.json b/packer_templates/ubuntu/ubuntu-20.04-live-amd64.json index a169d0367..5918e4ebd 100644 --- a/packer_templates/ubuntu/ubuntu-20.04-live-amd64.json +++ b/packer_templates/ubuntu/ubuntu-20.04-live-amd64.json @@ -234,7 +234,7 @@ "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", "hyperv_generation": "2", - "hyperv_switch": "{{env `hyperv_switch`}}", + "hyperv_switch": "bento", "iso_checksum": "443511f6bf12402c12503733059269a2e10dec602916c0a75263e5d990f6bb93", "iso_name": "ubuntu-20.04.1-live-server-amd64.iso", "memory": "1024", diff --git a/packer_templates/ubuntu/ubuntu-20.10-amd64.json b/packer_templates/ubuntu/ubuntu-20.10-amd64.json index 7aa9c8b53..dfc00b77d 100644 --- a/packer_templates/ubuntu/ubuntu-20.10-amd64.json +++ b/packer_templates/ubuntu/ubuntu-20.10-amd64.json @@ -265,7 +265,7 @@ "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", "hyperv_generation": "2", - "hyperv_switch": "{{env `hyperv_switch`}}", + "hyperv_switch": "bento", "iso_checksum": "defdc1ad3af7b661fe2b4ee861fb6fdb5f52039389ef56da6efc05e6adfe3d45", "iso_name": "ubuntu-20.10-live-server-amd64.iso", "memory": "1024", diff --git a/packer_templates/ubuntu/ubuntu-21.04-amd64.json b/packer_templates/ubuntu/ubuntu-21.04-amd64.json index 0b5a0183e..b1e54e016 100644 --- a/packer_templates/ubuntu/ubuntu-21.04-amd64.json +++ b/packer_templates/ubuntu/ubuntu-21.04-amd64.json @@ -265,7 +265,7 @@ "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", "hyperv_generation": "2", - "hyperv_switch": "{{env `hyperv_switch`}}", + "hyperv_switch": "bento", "iso_checksum": "dade2fb5cd82f70b14c1677c0e3968cadf1f95740473247a27ef4cf98fbd140e", "iso_name": "hirsute-live-server-amd64.iso", "memory": "1024", diff --git a/packer_templates/windows/windows-10.json b/packer_templates/windows/windows-10.json index 204030402..f6e9e1655 100644 --- a/packer_templates/windows/windows-10.json +++ b/packer_templates/windows/windows-10.json @@ -228,7 +228,7 @@ "guest_additions_mode": "attach", "guest_additions_url": "", "headless": "true", - "hyperv_switch": "{{env `hyperv_switch`}}", + "hyperv_switch": "bento", "iso_checksum": "489ebee676e26cdb81377b0e6385c001a22589b8", "iso_url": "https://software-download.microsoft.com/download/pr/18363.418.191007-0143.19h2_release_svc_refresh_CLIENTENTERPRISEEVAL_OEMRET_x64FRE_en-us.iso", "memory": "4096", diff --git a/packer_templates/windows/windows-10gen2.json b/packer_templates/windows/windows-10gen2.json index 4269dbbfe..18acd6d7e 100644 --- a/packer_templates/windows/windows-10gen2.json +++ b/packer_templates/windows/windows-10gen2.json @@ -132,7 +132,7 @@ "disk_type_id": "1", "guest_additions_mode": "upload", "headless": "false", - "hyperv_switch": "Default Switch", + "hyperv_switch": "bento", "iso_checksum": "F57E034095E0423FEB575CA82855F73E39FFA713", "iso_checksum_type": "sha1", "iso_url": "https://software-download.microsoft.com/download/pr/19041.264.200511-0456.vb_release_svc_refresh_CLIENTENTERPRISEEVAL_OEMRET_x64FRE_en-us.iso", diff --git a/packer_templates/windows/windows-2012.json b/packer_templates/windows/windows-2012.json index 0f4ecc256..9361d3137 100644 --- a/packer_templates/windows/windows-2012.json +++ b/packer_templates/windows/windows-2012.json @@ -222,7 +222,7 @@ "guest_additions_mode": "attach", "guest_additions_url": "", "headless": "true", - "hyperv_switch": "{{env `hyperv_switch`}}", + "hyperv_switch": "bento", "iso_checksum": "922b365c3360ce630f6a4b4f2f3c79e66165c0fb", "iso_url": "http://download.microsoft.com/download/6/D/A/6DAB58BA-F939-451D-9101-7DE07DC09C03/9200.16384.WIN8_RTM.120725-1247_X64FRE_SERVER_EVAL_EN-US-HRM_SSS_X64FREE_EN-US_DV5.ISO", "memory": "4096", @@ -231,4 +231,3 @@ "virtio_win_iso": "~/virtio-win.iso" } } - diff --git a/packer_templates/windows/windows-2012r2.json b/packer_templates/windows/windows-2012r2.json index 18a4ab5e3..acf67aa30 100644 --- a/packer_templates/windows/windows-2012r2.json +++ b/packer_templates/windows/windows-2012r2.json @@ -222,7 +222,7 @@ "guest_additions_mode": "attach", "guest_additions_url": "", "headless": "true", - "hyperv_switch": "{{env `hyperv_switch`}}", + "hyperv_switch": "bento", "iso_checksum": "849734f37346385dac2c101e4aacba4626bb141c", "iso_url": "http://download.microsoft.com/download/6/2/A/62A76ABB-9990-4EFC-A4FE-C7D698DAEB96/9600.17050.WINBLUE_REFRESH.140317-1640_X64FRE_SERVER_EVAL_EN-US-IR3_SSS_X64FREE_EN-US_DV9.ISO", "memory": "4096", @@ -231,4 +231,3 @@ "virtio_win_iso": "~/virtio-win.iso" } } - diff --git a/packer_templates/windows/windows-2016.json b/packer_templates/windows/windows-2016.json index a6d59c4a2..e60262034 100644 --- a/packer_templates/windows/windows-2016.json +++ b/packer_templates/windows/windows-2016.json @@ -222,7 +222,7 @@ "guest_additions_mode": "attach", "guest_additions_url": "", "headless": "true", - "hyperv_switch": "{{env `hyperv_switch`}}", + "hyperv_switch": "bento", "iso_checksum": "772700802951b36c8cb26a61c040b9a8dc3816a3", "iso_url": "https://software-download.microsoft.com/download/pr/Windows_Server_2016_Datacenter_EVAL_en-us_14393_refresh.ISO", "memory": "4096", @@ -231,4 +231,3 @@ "virtio_win_iso": "~/virtio-win.iso" } } - diff --git a/packer_templates/windows/windows-2019.json b/packer_templates/windows/windows-2019.json index bb53f2cf3..89aa01c07 100644 --- a/packer_templates/windows/windows-2019.json +++ b/packer_templates/windows/windows-2019.json @@ -222,7 +222,7 @@ "guest_additions_mode": "attach", "guest_additions_url": "", "headless": "true", - "hyperv_switch": "{{env `hyperv_switch`}}", + "hyperv_switch": "bento", "iso_checksum": "3022424f777b66a698047ba1c37812026b9714c5", "iso_url": "https://software-download.microsoft.com/download/pr/17763.737.190906-2324.rs5_release_svc_refresh_SERVER_EVAL_x64FRE_en-us_1.iso", "memory": "4096", @@ -231,4 +231,3 @@ "virtio_win_iso": "~/virtio-win.iso" } } - From 66cbdf97a814d5db07f5ef185a85ec836c355f7e Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Sun, 27 Dec 2020 21:34:43 -0800 Subject: [PATCH 1352/1622] Add missing hyperv switch config to centos6-i386 Signed-off-by: Tim Smith <tsmith@chef.io> --- packer_templates/centos/centos-6.10-i386.json | 1 + 1 file changed, 1 insertion(+) diff --git a/packer_templates/centos/centos-6.10-i386.json b/packer_templates/centos/centos-6.10-i386.json index f09c05a3b..cad51af4e 100644 --- a/packer_templates/centos/centos-6.10-i386.json +++ b/packer_templates/centos/centos-6.10-i386.json @@ -168,6 +168,7 @@ "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", "hyperv_generation": "1", + "hyperv_switch": "bento", "iso_checksum": "25d95b3f178e59bd672fa97e043a9191cbf73bb6cd12f5df9b540fa88076cae8", "iso_name": "CentOS-6.10-i386-bin-DVD1.iso", "ks_path": "6/ks.cfg", From edcb2480b6350e83c29d7635941929d18b59dd01 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Sun, 27 Dec 2020 22:10:45 -0800 Subject: [PATCH 1353/1622] Get CentOS 6 building on hyperv Signed-off-by: Tim Smith <tsmith@chef.io> --- packer_templates/centos/http/6/ks.cfg | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/packer_templates/centos/http/6/ks.cfg b/packer_templates/centos/http/6/ks.cfg index ee006edfe..102a93ca1 100644 --- a/packer_templates/centos/http/6/ks.cfg +++ b/packer_templates/centos/http/6/ks.cfg @@ -50,3 +50,23 @@ if [ $(virt-what) == "hyperv" ]; then chkconfig hypervvssd on chkconfig hypervkvpd on fi + +# from robox. thanks! +VIRT=`dmesg | grep "Hypervisor detected" | awk -F': ' '{print $2}'` +if [[ $VIRT == "Microsoft HyperV" || $VIRT == "Microsoft Hyper-V" ]]; then + cd /root/ + curl -4 --silent --retry 10 --retry-delay 10 --remote-name https://vault.centos.org/6.10/os/x86_64/Packages/hyperv-daemons-0-0.17.20150108git.el6.x86_64.rpm + curl -4 --silent --retry 10 --retry-delay 10 --remote-name https://vault.centos.org/6.10/os/x86_64/Packages/hyperv-daemons-license-0-0.17.20150108git.el6.noarch.rpm + curl -4 --silent --retry 10 --retry-delay 10 --remote-name https://vault.centos.org/6.10/os/x86_64/Packages/hypervfcopyd-0-0.17.20150108git.el6.x86_64.rpm + curl -4 --silent --retry 10 --retry-delay 10 --remote-name https://vault.centos.org/6.10/os/x86_64/Packages/hypervkvpd-0-0.17.20150108git.el6.x86_64.rpm + curl -4 --silent --retry 10 --retry-delay 10 --remote-name https://vault.centos.org/6.10/os/x86_64/Packages/hypervvssd-0-0.17.20150108git.el6.x86_64.rpm + (printf "d52f20e4b3b2c477a437bc572bf402ea0297f979e87a02b48f10da48f367e3bb hyperv-daemons-0-0.17.20150108git.el6.x86_64.rpm\n" | sha256sum -c) || exit 1 + (printf "cf2a69cd781270941b63802004b516bbf3515ed111b243ad489aa9c16424794c hyperv-daemons-license-0-0.17.20150108git.el6.noarch.rpm\n" | sha256sum -c) || exit 1 + (printf "96373df61de41dce587462282d14158f04ac4973ec2f8014de99d7f5e779f08a hypervfcopyd-0-0.17.20150108git.el6.x86_64.rpm\n" | sha256sum -c) || exit 1 + (printf "cd1889b3a5b33e1a3a3c4055f09388a958989d4971677a889a19a5ea12b65ffb hypervkvpd-0-0.17.20150108git.el6.x86_64.rpm\n" | sha256sum -c) || exit 1 + (printf "91951ccb4ed9bbcda1ac0776e36183eb90c1ca24efcaf02ba0569d0287ebfe74 hypervvssd-0-0.17.20150108git.el6.x86_64.rpm\n" | sha256sum -c) || exit 1 + yum --assumeyes --disablerepo=* install hyperv-daemons-0-0.17.20150108git.el6.x86_64.rpm hyperv-daemons-license-0-0.17.20150108git.el6.noarch.rpm hypervfcopyd-0-0.17.20150108git.el6.x86_64.rpm hypervkvpd-0-0.17.20150108git.el6.x86_64.rpm hypervvssd-0-0.17.20150108git.el6.x86_64.rpm + rm --force hyperv-daemons-0-0.17.20150108git.el6.x86_64.rpm hyperv-daemons-license-0-0.17.20150108git.el6.noarch.rpm hypervfcopyd-0-0.17.20150108git.el6.x86_64.rpm hypervkvpd-0-0.17.20150108git.el6.x86_64.rpm hypervvssd-0-0.17.20150108git.el6.x86_64.rpm + chkconfig hypervvssd on + chkconfig hypervkvpd on +fi \ No newline at end of file From b8aa007659b3e517ef41603cbc57d890912f1080 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Sun, 27 Dec 2020 22:21:51 -0800 Subject: [PATCH 1354/1622] Try just setting the archive repos on RHEL 6 Signed-off-by: Tim Smith <tsmith@chef.io> --- packer_templates/centos/http/6/ks.cfg | 27 ++++++--------------------- 1 file changed, 6 insertions(+), 21 deletions(-) diff --git a/packer_templates/centos/http/6/ks.cfg b/packer_templates/centos/http/6/ks.cfg index 102a93ca1..60810ebaa 100644 --- a/packer_templates/centos/http/6/ks.cfg +++ b/packer_templates/centos/http/6/ks.cfg @@ -8,7 +8,7 @@ firewall --disabled selinux --permissive timezone UTC unsupported_hardware -bootloader --timeout=1 --location=mbr +bootloader --timeout=1 --location=mbr --append="net.ifnames=0 biosdevname=0" text skipx zerombr @@ -43,30 +43,15 @@ echo 'Defaults:vagrant !requiretty' > /etc/sudoers.d/vagrant echo '%vagrant ALL=(ALL) NOPASSWD: ALL' >> /etc/sudoers.d/vagrant chmod 440 /etc/sudoers.d/vagrant +# update the repos to point to the archive +sed -i '/mirrorlist/d' /etc/yum.repos.d/*.repo +sed -i -e 's/#baseurl/baseurl/g' /etc/yum.repos.d/*.repo +sed -i -e 's/mirror.centos.org\/centos\/\$releasever/vault.centos.org\/6.10/g' /etc/yum.repos.d/*.repo + # Enable hyper-v daemons only if using hyper-v virtualization if [ $(virt-what) == "hyperv" ]; then ifup eth0 yum -y install hyperv-daemons chkconfig hypervvssd on chkconfig hypervkvpd on -fi - -# from robox. thanks! -VIRT=`dmesg | grep "Hypervisor detected" | awk -F': ' '{print $2}'` -if [[ $VIRT == "Microsoft HyperV" || $VIRT == "Microsoft Hyper-V" ]]; then - cd /root/ - curl -4 --silent --retry 10 --retry-delay 10 --remote-name https://vault.centos.org/6.10/os/x86_64/Packages/hyperv-daemons-0-0.17.20150108git.el6.x86_64.rpm - curl -4 --silent --retry 10 --retry-delay 10 --remote-name https://vault.centos.org/6.10/os/x86_64/Packages/hyperv-daemons-license-0-0.17.20150108git.el6.noarch.rpm - curl -4 --silent --retry 10 --retry-delay 10 --remote-name https://vault.centos.org/6.10/os/x86_64/Packages/hypervfcopyd-0-0.17.20150108git.el6.x86_64.rpm - curl -4 --silent --retry 10 --retry-delay 10 --remote-name https://vault.centos.org/6.10/os/x86_64/Packages/hypervkvpd-0-0.17.20150108git.el6.x86_64.rpm - curl -4 --silent --retry 10 --retry-delay 10 --remote-name https://vault.centos.org/6.10/os/x86_64/Packages/hypervvssd-0-0.17.20150108git.el6.x86_64.rpm - (printf "d52f20e4b3b2c477a437bc572bf402ea0297f979e87a02b48f10da48f367e3bb hyperv-daemons-0-0.17.20150108git.el6.x86_64.rpm\n" | sha256sum -c) || exit 1 - (printf "cf2a69cd781270941b63802004b516bbf3515ed111b243ad489aa9c16424794c hyperv-daemons-license-0-0.17.20150108git.el6.noarch.rpm\n" | sha256sum -c) || exit 1 - (printf "96373df61de41dce587462282d14158f04ac4973ec2f8014de99d7f5e779f08a hypervfcopyd-0-0.17.20150108git.el6.x86_64.rpm\n" | sha256sum -c) || exit 1 - (printf "cd1889b3a5b33e1a3a3c4055f09388a958989d4971677a889a19a5ea12b65ffb hypervkvpd-0-0.17.20150108git.el6.x86_64.rpm\n" | sha256sum -c) || exit 1 - (printf "91951ccb4ed9bbcda1ac0776e36183eb90c1ca24efcaf02ba0569d0287ebfe74 hypervvssd-0-0.17.20150108git.el6.x86_64.rpm\n" | sha256sum -c) || exit 1 - yum --assumeyes --disablerepo=* install hyperv-daemons-0-0.17.20150108git.el6.x86_64.rpm hyperv-daemons-license-0-0.17.20150108git.el6.noarch.rpm hypervfcopyd-0-0.17.20150108git.el6.x86_64.rpm hypervkvpd-0-0.17.20150108git.el6.x86_64.rpm hypervvssd-0-0.17.20150108git.el6.x86_64.rpm - rm --force hyperv-daemons-0-0.17.20150108git.el6.x86_64.rpm hyperv-daemons-license-0-0.17.20150108git.el6.noarch.rpm hypervfcopyd-0-0.17.20150108git.el6.x86_64.rpm hypervkvpd-0-0.17.20150108git.el6.x86_64.rpm hypervvssd-0-0.17.20150108git.el6.x86_64.rpm - chkconfig hypervvssd on - chkconfig hypervkvpd on fi \ No newline at end of file From 5f25d32bde9f5d73e9a45355e1370b7bbc120d19 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Sun, 27 Dec 2020 23:16:04 -0800 Subject: [PATCH 1355/1622] Avoid more ISO checksumming Signed-off-by: Tim Smith <tsmith@chef.io> --- .../centos/centos-8.3-x86_64.json | 19 ++++++------------- .../oraclelinux/oracle-8.3-x86_64.json | 10 +++------- 2 files changed, 9 insertions(+), 20 deletions(-) diff --git a/packer_templates/centos/centos-8.3-x86_64.json b/packer_templates/centos/centos-8.3-x86_64.json index f10b4f51d..7c0d645bf 100644 --- a/packer_templates/centos/centos-8.3-x86_64.json +++ b/packer_templates/centos/centos-8.3-x86_64.json @@ -1,9 +1,7 @@ { "builders": [ { - "boot_command": [ - "<up><wait><tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" - ], + "boot_command": "{{ user `boot_command` }}", "boot_wait": "5s", "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", @@ -27,9 +25,7 @@ "vm_name": "{{ user `template` }}" }, { - "boot_command": [ - "<up><wait><tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" - ], + "boot_command": "{{ user `boot_command` }}", "boot_wait": "5s", "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", @@ -54,9 +50,7 @@ "vmx_remove_ethernet_interfaces": true }, { - "boot_command": [ - "<up><wait><tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" - ], + "boot_command": "{{user `boot_command`}}", "boot_wait": "5s", "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", @@ -78,7 +72,7 @@ }, { "boot_command": [ - "<wait5><tab> text ks=hd:fd0:/ks.cfg<enter><wait5><esc>" + "<wait5><up><wait5><tab> text ks=hd:fd0:/ks.cfg<enter><wait5><esc>" ], "boot_wait": "5s", "cpus": "{{ user `cpus` }}", @@ -103,9 +97,7 @@ "vm_name": "{{ user `template` }}" }, { - "boot_command": [ - "<up><wait><tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" - ], + "boot_command": "{{ user `boot_command` }}", "boot_wait": "5s", "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", @@ -178,6 +170,7 @@ "name": "centos-8.3", "no_proxy": "{{env `no_proxy`}}", "template": "centos-8.3-x86_64", + "boot_command": "<up><wait><tab> inst.text inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>", "version": "TIMESTAMP" } } diff --git a/packer_templates/oraclelinux/oracle-8.3-x86_64.json b/packer_templates/oraclelinux/oracle-8.3-x86_64.json index edbeb1f9e..6389e73a7 100644 --- a/packer_templates/oraclelinux/oracle-8.3-x86_64.json +++ b/packer_templates/oraclelinux/oracle-8.3-x86_64.json @@ -1,9 +1,7 @@ { "builders": [ { - "boot_command": [ - "<up><wait><tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" - ], + "boot_command": "{{ user `boot_command` }}", "boot_wait": "5s", "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", @@ -74,7 +72,7 @@ }, { "boot_command": [ - "<wait5><tab> text ks=hd:fd0:/ks.cfg<enter><wait5><esc>" + "<wait5><up><wait5><tab> text ks=hd:fd0:/ks.cfg<enter><wait5><esc>" ], "boot_wait": "5s", "cpus": "{{ user `cpus` }}", @@ -99,9 +97,7 @@ "vm_name": "{{ user `template` }}" }, { - "boot_command": [ - "<up><wait><tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" - ], + "boot_command": "{{ user `boot_command` }}", "boot_wait": "5s", "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", From b7f378927dbefa00ce58aa0239f7c89285874132 Mon Sep 17 00:00:00 2001 From: Charlie Mordant <cmordant1@gmail.com> Date: Sat, 2 Jan 2021 19:07:21 +0100 Subject: [PATCH 1356/1622] set fedora crypto policy to legacy Obvious fix. --- packer_templates/fedora/fedora-33-x86_64.json | 1 + packer_templates/fedora/scripts/crypto-policy.sh | 2 ++ 2 files changed, 3 insertions(+) create mode 100755 packer_templates/fedora/scripts/crypto-policy.sh diff --git a/packer_templates/fedora/fedora-33-x86_64.json b/packer_templates/fedora/fedora-33-x86_64.json index afd729968..7af5d4a20 100644 --- a/packer_templates/fedora/fedora-33-x86_64.json +++ b/packer_templates/fedora/fedora-33-x86_64.json @@ -148,6 +148,7 @@ "{{template_dir}}/../_common/vagrant.sh", "{{template_dir}}/scripts/real-tmp.sh", "{{template_dir}}/scripts/cleanup.sh", + "{{template_dir}}/scripts/crypto-policy.sh", "{{template_dir}}/../_common/minimize.sh" ], "type": "shell" diff --git a/packer_templates/fedora/scripts/crypto-policy.sh b/packer_templates/fedora/scripts/crypto-policy.sh new file mode 100755 index 000000000..ba42084a8 --- /dev/null +++ b/packer_templates/fedora/scripts/crypto-policy.sh @@ -0,0 +1,2 @@ +#!/bin/bash -eux +update-crypto-policies --set LEGACY \ No newline at end of file From 6f00fda91a1f929d659b999bca621e9a4551aca4 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Mon, 1 Feb 2021 12:45:08 -0800 Subject: [PATCH 1357/1622] Add Alma Linux 8 config This is a new RHEL clone similar to how CentOS worked before. Signed-off-by: Tim Smith <tsmith@chef.io> --- builds.yml | 2 + .../almalinux/almalinux-8.3-x86_64.json | 176 ++++++++++++++++++ 2 files changed, 178 insertions(+) create mode 100644 packer_templates/almalinux/almalinux-8.3-x86_64.json diff --git a/builds.yml b/builds.yml index 84ac3e873..32ba8528e 100644 --- a/builds.yml +++ b/builds.yml @@ -1,5 +1,6 @@ --- public: +- 'almalinux-8.3' - 'amazon-2' - 'centos-6.10-i386' - 'centos-6.10' @@ -31,6 +32,7 @@ public: # slug box name: text string from standard box name to match (generally the same) slugs: + 'almalinux-8': 'almalinux-8' 'centos-6': 'centos-6' 'centos-7': 'centos-7' 'centos-8': 'centos-8' diff --git a/packer_templates/almalinux/almalinux-8.3-x86_64.json b/packer_templates/almalinux/almalinux-8.3-x86_64.json new file mode 100644 index 000000000..c6ad9f372 --- /dev/null +++ b/packer_templates/almalinux/almalinux-8.3-x86_64.json @@ -0,0 +1,176 @@ +{ + "builders": [ + { + "boot_command": "{{ user `boot_command` }}", + "boot_wait": "5s", + "cpus": "{{ user `cpus` }}", + "disk_size": "{{user `disk_size`}}", + "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "guest_additions_url": "{{ user `guest_additions_url` }}", + "guest_os_type": "RedHat_64", + "hard_drive_interface": "sata", + "headless": "{{ user `headless` }}", + "http_directory": "{{user `http_directory`}}", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "memory": "{{ user `memory` }}", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-virtualbox", + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_timeout": "10000s", + "ssh_username": "vagrant", + "type": "virtualbox-iso", + "virtualbox_version_file": ".vbox_version", + "vm_name": "{{ user `template` }}" + }, + { + "boot_command": "{{ user `boot_command` }}", + "boot_wait": "5s", + "cpus": "{{ user `cpus` }}", + "disk_size": "{{user `disk_size`}}", + "guest_os_type": "centos-64", + "headless": "{{ user `headless` }}", + "http_directory": "{{user `http_directory`}}", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "memory": "{{ user `memory` }}", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-vmware", + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_timeout": "10000s", + "ssh_username": "vagrant", + "tools_upload_flavor": "linux", + "type": "vmware-iso", + "vm_name": "{{ user `template` }}", + "vmx_data": { + "cpuid.coresPerSocket": "1" + }, + "vmx_remove_ethernet_interfaces": true + }, + { + "boot_command": "{{user `boot_command`}}", + "boot_wait": "5s", + "cpus": "{{ user `cpus` }}", + "disk_size": "{{user `disk_size`}}", + "guest_os_type": "centos", + "http_directory": "{{user `http_directory`}}", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "memory": "{{ user `memory` }}", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-parallels", + "parallels_tools_flavor": "lin", + "prlctl_version_file": ".prlctl_version", + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_timeout": "10000s", + "ssh_username": "vagrant", + "type": "parallels-iso", + "vm_name": "{{ user `template` }}" + }, + { + "boot_command": [ + "<wait5><up><wait5><tab> text ks=hd:fd0:/ks.cfg<enter><wait5><esc>" + ], + "boot_wait": "5s", + "cpus": "{{ user `cpus` }}", + "disk_size": "{{user `disk_size`}}", + "floppy_files": [ + "{{user `http_directory`}}/{{user `ks_path`}}" + ], + "generation": "{{user `hyperv_generation`}}", + "guest_additions_mode": "disable", + "http_directory": "{{user `http_directory`}}", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "memory": "{{ user `memory` }}", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-hyperv", + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_timeout": "10000s", + "ssh_username": "vagrant", + "switch_name": "{{ user `hyperv_switch`}}", + "type": "hyperv-iso", + "vm_name": "{{ user `template` }}" + }, + { + "boot_command": "{{ user `boot_command` }}", + "boot_wait": "5s", + "cpus": "{{ user `cpus` }}", + "disk_size": "{{user `disk_size`}}", + "headless": "{{ user `headless` }}", + "http_directory": "{{user `http_directory`}}", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "memory": "{{ user `memory` }}", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-qemu", + "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_timeout": "10000s", + "ssh_username": "vagrant", + "type": "qemu", + "vm_name": "{{ user `template` }}" + } + ], + "post-processors": [ + { + "output": "{{ user `build_directory` }}/{{user `box_basename`}}.{{.Provider}}.box", + "type": "vagrant" + } + ], + "provisioners": [ + { + "environment_vars": [ + "HOME_DIR=/home/vagrant", + "http_proxy={{user `http_proxy`}}", + "https_proxy={{user `https_proxy`}}", + "no_proxy={{user `no_proxy`}}" + ], + "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", + "expect_disconnect": true, + "scripts": [ + "{{template_dir}}/../centos/scripts/update.sh", + "{{template_dir}}/../centos/scripts/networking.sh", + "{{template_dir}}/../_common/motd.sh", + "{{template_dir}}/../_common/sshd.sh", + "{{template_dir}}/../_common/vagrant.sh", + "{{template_dir}}/../_common/virtualbox.sh", + "{{template_dir}}/../_common/vmware.sh", + "{{template_dir}}/../_common/parallels.sh", + "{{template_dir}}/../centos/scripts/cleanup.sh", + "{{template_dir}}/../_common/minimize.sh" + ], + "type": "shell" + } + ], + "variables": { + "box_basename": "almalinux-8.3", + "build_directory": "../../builds", + "build_timestamp": "{{isotime \"2019102650405\"}}", + "cpus": "2", + "disk_size": "65536", + "git_revision": "__unknown_git_revision__", + "guest_additions_url": "", + "headless": "", + "http_directory": "{{template_dir}}/../centos/http", + "http_proxy": "{{env `http_proxy`}}", + "https_proxy": "{{env `https_proxy`}}", + "hyperv_generation": "1", + "hyperv_switch": "bento", + "iso_checksum": "8b6a3321982b0138d54922edd078f5f4e76d0b5a72e587e2a32760a36c375637", + "iso_name": "AlmaLinux-8.3-beta-1-x86_64-dvd1.iso", + "ks_path": "8/ks.cfg", + "memory": "1024", + "mirror": "https://repo.almalinux.org/almalinux", + "mirror_directory": "8.3-beta/isos/x86_64", + "name": "almalinux-8.3", + "no_proxy": "{{env `no_proxy`}}", + "template": "almalinux-8.3-x86_64", + "boot_command": "<up><wait><tab> inst.text inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>", + "version": "TIMESTAMP" + } +} From 9c499dae30ebbce8600c8cd065cd0a8669991043 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Mon, 1 Feb 2021 18:17:32 -0800 Subject: [PATCH 1358/1622] Update Ubuntu 21.04 to the latest ISO Signed-off-by: Tim Smith <tsmith@chef.io> --- packer_templates/ubuntu/ubuntu-21.04-amd64.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packer_templates/ubuntu/ubuntu-21.04-amd64.json b/packer_templates/ubuntu/ubuntu-21.04-amd64.json index b1e54e016..471a2be66 100644 --- a/packer_templates/ubuntu/ubuntu-21.04-amd64.json +++ b/packer_templates/ubuntu/ubuntu-21.04-amd64.json @@ -266,11 +266,11 @@ "https_proxy": "{{env `https_proxy`}}", "hyperv_generation": "2", "hyperv_switch": "bento", - "iso_checksum": "dade2fb5cd82f70b14c1677c0e3968cadf1f95740473247a27ef4cf98fbd140e", + "iso_checksum": "1cb16319825c41fd40a2d1d9453da6f61de987af1872c86798b6c004487eab48", "iso_name": "hirsute-live-server-amd64.iso", "memory": "1024", "mirror": "http://cdimage.ubuntu.com", - "mirror_directory": "daily-live/pending", + "mirror_directory": "ubuntu-server/daily-live/current", "name": "ubuntu-21.04", "no_proxy": "{{env `no_proxy`}}", "preseed_path": "preseed.cfg", From 3dd165cf422572ab4240c8f1ce9a7e40b7960457 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Mon, 1 Feb 2021 19:48:09 -0800 Subject: [PATCH 1359/1622] Be clear these are generic boxes Signed-off-by: Tim Smith <tsmith@chef.io> --- lib/bento/upload.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/bento/upload.rb b/lib/bento/upload.rb index 54bfe43d2..d5493ea12 100644 --- a/lib/bento/upload.rb +++ b/lib/bento/upload.rb @@ -74,11 +74,11 @@ def lookup_slug(name) end def box_desc(name) - "#{name.tr("-", " ").capitalize} Vagrant box created with Bento by Chef" + "Vanilla #{name.tr("-", " ").capitalize} Vagrant box created with Bento by Chef" end def slug_desc(name) - "#{name.tr("-", " ").capitalize}.x Vagrant box created with Bento by Chef. This box will be updated with the latest releases of #{name.tr("-", " ").capitalize} as they become available" + "Vanilla #{name.tr("-", " ").capitalize}.x Vagrant box created with Bento by Chef. This box will be updated with the latest releases of #{name.tr("-", " ").capitalize} as they become available" end def ver_desc(md_data) From 429a0083cb46a56dde61cf74c12cf9671c9f7205 Mon Sep 17 00:00:00 2001 From: SG <13872653+mmguero@users.noreply.github.com> Date: Wed, 10 Feb 2021 08:15:50 -0700 Subject: [PATCH 1360/1622] Upated bento/debian-10 template from debian 10.7 to debian 10.8 (released Feb 6, 2021) for amd64 and i386 Signed-off-by: SG <13872653+mmguero@users.noreply.github.com> --- README.md | 4 ++-- builds.yml | 4 ++-- ...debian-10.7-amd64.json => debian-10.8-amd64.json} | 12 ++++++------ .../{debian-10.7-i386.json => debian-10.8-i386.json} | 12 ++++++------ 4 files changed, 16 insertions(+), 16 deletions(-) rename packer_templates/debian/{debian-10.7-amd64.json => debian-10.8-amd64.json} (96%) rename packer_templates/debian/{debian-10.7-i386.json => debian-10.8-i386.json} (96%) diff --git a/README.md b/README.md index ee2776126..578b2ee7c 100644 --- a/README.md +++ b/README.md @@ -45,11 +45,11 @@ $ cd packer_templates/ubuntu $ packer build -only=virtualbox-iso ubuntu-18.04-amd64.json ``` -To build Debian 10.7 32bit boxes for all possible providers (simultaneously) +To build Debian 10.8 32bit boxes for all possible providers (simultaneously) ``` $ cd packer_templates/debian -$ packer build debian-10.7-i386.json +$ packer build debian-10.8-i386.json ``` To build CentOS 7.7 boxes for all providers except VMware and Parallels diff --git a/builds.yml b/builds.yml index 32ba8528e..21095c65c 100644 --- a/builds.yml +++ b/builds.yml @@ -8,8 +8,8 @@ public: - 'centos-8.3' - 'debian-9.13-i386' - 'debian-9.13' -- 'debian-10.7-i386' -- 'debian-10.7' +- 'debian-10.8-i386' +- 'debian-10.8' - 'fedora-32' - 'fedora-33' - 'freebsd-11.4-i386' diff --git a/packer_templates/debian/debian-10.7-amd64.json b/packer_templates/debian/debian-10.8-amd64.json similarity index 96% rename from packer_templates/debian/debian-10.7-amd64.json rename to packer_templates/debian/debian-10.8-amd64.json index 9e482f526..eccb1247b 100644 --- a/packer_templates/debian/debian-10.7-amd64.json +++ b/packer_templates/debian/debian-10.8-amd64.json @@ -193,7 +193,7 @@ } ], "variables": { - "box_basename": "debian-10.7", + "box_basename": "debian-10.8", "build_directory": "../../builds", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "2", @@ -204,15 +204,15 @@ "http_directory": "{{template_dir}}/http", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", - "iso_checksum": "b317d87b0a3d5b568f48a92dcabfc4bc51fe58d9f67ca13b013f1b8329d1306d", - "iso_name": "debian-10.7.0-amd64-netinst.iso", + "iso_checksum": "396553f005ad9f86a51e246b1540c60cef676f9c71b95e22b753faef59f89bee", + "iso_name": "debian-10.8.0-amd64-netinst.iso", "memory": "1024", "mirror": "http://cdimage.debian.org/cdimage/release", - "mirror_directory": "10.7.0/amd64/iso-cd", - "name": "debian-10.7", + "mirror_directory": "10.8.0/amd64/iso-cd", + "name": "debian-10.8", "no_proxy": "{{env `no_proxy`}}", "preseed_path": "debian-9/preseed.cfg", - "template": "debian-10.7-amd64", + "template": "debian-10.8-amd64", "version": "TIMESTAMP" } } diff --git a/packer_templates/debian/debian-10.7-i386.json b/packer_templates/debian/debian-10.8-i386.json similarity index 96% rename from packer_templates/debian/debian-10.7-i386.json rename to packer_templates/debian/debian-10.8-i386.json index 08eebd6e6..9b5cc2725 100644 --- a/packer_templates/debian/debian-10.7-i386.json +++ b/packer_templates/debian/debian-10.8-i386.json @@ -193,7 +193,7 @@ } ], "variables": { - "box_basename": "debian-10.7-i386", + "box_basename": "debian-10.8-i386", "build_directory": "../../builds", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "2", @@ -204,15 +204,15 @@ "http_directory": "{{template_dir}}/http", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", - "iso_checksum": "5c32e6dfa5d75c70f2ea8e8ef8ae68565c37d93014f2c774d5b942b08b5d0b7b", - "iso_name": "debian-10.7.0-i386-netinst.iso", + "iso_checksum": "3c2260ba88e1af468b0c330190c8a03c6d81b56e9ec03dfbe351913c45f3df1d", + "iso_name": "debian-10.8.0-i386-netinst.iso", "memory": "1024", "mirror": "http://cdimage.debian.org/cdimage/release", - "mirror_directory": "10.7.0/i386/iso-cd", - "name": "debian-10.7-i386", + "mirror_directory": "10.8.0/i386/iso-cd", + "name": "debian-10.8-i386", "no_proxy": "{{env `no_proxy`}}", "preseed_path": "debian-9/preseed.cfg", - "template": "debian-10.7-i386", + "template": "debian-10.8-i386", "version": "TIMESTAMP" } } From 3deb3e91b0f6b7b2d0d0cd3bf737c66f929a0bb5 Mon Sep 17 00:00:00 2001 From: Lance Albertson <lance@osuosl.org> Date: Thu, 18 Feb 2021 15:37:22 -0800 Subject: [PATCH 1361/1622] Add CentOS Stream 8 config Signed-off-by: Lance Albertson <lance@osuosl.org> --- builds.yml | 1 + .../centos/centos-stream-8-x86_64.json | 176 ++++++++++++++++++ packer_templates/centos/http/8-stream/ks.cfg | 76 ++++++++ 3 files changed, 253 insertions(+) create mode 100644 packer_templates/centos/centos-stream-8-x86_64.json create mode 100644 packer_templates/centos/http/8-stream/ks.cfg diff --git a/builds.yml b/builds.yml index 21095c65c..b872b14b4 100644 --- a/builds.yml +++ b/builds.yml @@ -6,6 +6,7 @@ public: - 'centos-6.10' - 'centos-7.9' - 'centos-8.3' +- 'centos-stream-8' - 'debian-9.13-i386' - 'debian-9.13' - 'debian-10.8-i386' diff --git a/packer_templates/centos/centos-stream-8-x86_64.json b/packer_templates/centos/centos-stream-8-x86_64.json new file mode 100644 index 000000000..ef4d042b7 --- /dev/null +++ b/packer_templates/centos/centos-stream-8-x86_64.json @@ -0,0 +1,176 @@ +{ + "builders": [ + { + "boot_command": "{{ user `boot_command` }}", + "boot_wait": "5s", + "cpus": "{{ user `cpus` }}", + "disk_size": "{{user `disk_size`}}", + "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "guest_additions_url": "{{ user `guest_additions_url` }}", + "guest_os_type": "RedHat_64", + "hard_drive_interface": "sata", + "headless": "{{ user `headless` }}", + "http_directory": "{{user `http_directory`}}", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "memory": "{{ user `memory` }}", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-virtualbox", + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_timeout": "10000s", + "ssh_username": "vagrant", + "type": "virtualbox-iso", + "virtualbox_version_file": ".vbox_version", + "vm_name": "{{ user `template` }}" + }, + { + "boot_command": "{{ user `boot_command` }}", + "boot_wait": "5s", + "cpus": "{{ user `cpus` }}", + "disk_size": "{{user `disk_size`}}", + "guest_os_type": "centos-64", + "headless": "{{ user `headless` }}", + "http_directory": "{{user `http_directory`}}", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "memory": "{{ user `memory` }}", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-vmware", + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_timeout": "10000s", + "ssh_username": "vagrant", + "tools_upload_flavor": "linux", + "type": "vmware-iso", + "vm_name": "{{ user `template` }}", + "vmx_data": { + "cpuid.coresPerSocket": "1" + }, + "vmx_remove_ethernet_interfaces": true + }, + { + "boot_command": "{{user `boot_command`}}", + "boot_wait": "5s", + "cpus": "{{ user `cpus` }}", + "disk_size": "{{user `disk_size`}}", + "guest_os_type": "centos", + "http_directory": "{{user `http_directory`}}", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "memory": "{{ user `memory` }}", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-parallels", + "parallels_tools_flavor": "lin", + "prlctl_version_file": ".prlctl_version", + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_timeout": "10000s", + "ssh_username": "vagrant", + "type": "parallels-iso", + "vm_name": "{{ user `template` }}" + }, + { + "boot_command": [ + "<wait5><up><wait5><tab> text ks=hd:fd0:/ks.cfg<enter><wait5><esc>" + ], + "boot_wait": "5s", + "cpus": "{{ user `cpus` }}", + "disk_size": "{{user `disk_size`}}", + "floppy_files": [ + "{{user `http_directory`}}/{{user `ks_path`}}" + ], + "generation": "{{user `hyperv_generation`}}", + "guest_additions_mode": "disable", + "http_directory": "{{user `http_directory`}}", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "memory": "{{ user `memory` }}", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-hyperv", + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_timeout": "10000s", + "ssh_username": "vagrant", + "switch_name": "{{ user `hyperv_switch`}}", + "type": "hyperv-iso", + "vm_name": "{{ user `template` }}" + }, + { + "boot_command": "{{ user `boot_command` }}", + "boot_wait": "5s", + "cpus": "{{ user `cpus` }}", + "disk_size": "{{user `disk_size`}}", + "headless": "{{ user `headless` }}", + "http_directory": "{{user `http_directory`}}", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "memory": "{{ user `memory` }}", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-qemu", + "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_timeout": "10000s", + "ssh_username": "vagrant", + "type": "qemu", + "vm_name": "{{ user `template` }}" + } + ], + "post-processors": [ + { + "output": "{{ user `build_directory` }}/{{user `box_basename`}}.{{.Provider}}.box", + "type": "vagrant" + } + ], + "provisioners": [ + { + "environment_vars": [ + "HOME_DIR=/home/vagrant", + "http_proxy={{user `http_proxy`}}", + "https_proxy={{user `https_proxy`}}", + "no_proxy={{user `no_proxy`}}" + ], + "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", + "expect_disconnect": true, + "scripts": [ + "{{template_dir}}/scripts/update.sh", + "{{template_dir}}/../_common/motd.sh", + "{{template_dir}}/../_common/sshd.sh", + "{{template_dir}}/scripts/networking.sh", + "{{template_dir}}/../_common/vagrant.sh", + "{{template_dir}}/../_common/virtualbox.sh", + "{{template_dir}}/../_common/vmware.sh", + "{{template_dir}}/../_common/parallels.sh", + "{{template_dir}}/scripts/cleanup.sh", + "{{template_dir}}/../_common/minimize.sh" + ], + "type": "shell" + } + ], + "variables": { + "box_basename": "centos-stream-8", + "build_directory": "../../builds", + "build_timestamp": "{{isotime \"2019102650405\"}}", + "cpus": "2", + "disk_size": "65536", + "git_revision": "__unknown_git_revision__", + "guest_additions_url": "", + "headless": "", + "http_directory": "{{template_dir}}/http", + "http_proxy": "{{env `http_proxy`}}", + "https_proxy": "{{env `https_proxy`}}", + "hyperv_generation": "1", + "hyperv_switch": "bento", + "iso_checksum": "b693d501987d7d450e926696d48a98987b648f167a93b5c4dad2d843385f90d2", + "iso_name": "CentOS-Stream-8-x86_64-20210215-dvd1.iso", + "ks_path": "8-stream/ks.cfg", + "memory": "1024", + "mirror": "http://mirrors.kernel.org/centos", + "mirror_directory": "8-stream/isos/x86_64", + "name": "centos-stream-8", + "no_proxy": "{{env `no_proxy`}}", + "template": "centos-stream-8-x86_64", + "boot_command": "<up><wait><tab> inst.text inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>", + "version": "TIMESTAMP" + } +} diff --git a/packer_templates/centos/http/8-stream/ks.cfg b/packer_templates/centos/http/8-stream/ks.cfg new file mode 100644 index 000000000..1f6233b99 --- /dev/null +++ b/packer_templates/centos/http/8-stream/ks.cfg @@ -0,0 +1,76 @@ +cdrom +lang en_US.UTF-8 +keyboard us +network --bootproto=dhcp --noipv6 --onboot=on --device=eth0 +rootpw --plaintext vagrant +firewall --disabled +selinux --permissive +timezone UTC +bootloader --timeout=1 --location=mbr --append="net.ifnames=0 biosdevname=0" +text +skipx +zerombr +clearpart --all --initlabel +autopart --nohome --nolvm --noboot +firstboot --disabled +reboot --eject +user --name=vagrant --plaintext --password vagrant + +%packages --ignoremissing --excludedocs --instLangs=en_US.utf8 +# vagrant needs this to copy initial files via scp +openssh-clients +sudo +selinux-policy-devel +wget +nfs-utils +net-tools +tar +bzip2 +deltarpm +rsync +dnf-utils +redhat-lsb-core +elfutils-libelf-devel +network-scripts +-fprintd-pam +-intltool +-iwl*-firmware +-microcode_ctl +%end + +%post +# sudo +echo 'Defaults:vagrant !requiretty' > /etc/sudoers.d/vagrant +echo '%vagrant ALL=(ALL) NOPASSWD: ALL' >> /etc/sudoers.d/vagrant +chmod 440 /etc/sudoers.d/vagrant + +# Enable hyper-v daemons only if using hyper-v virtualization +if [ $(virt-what) == "hyperv" ]; then + dnf -y install hyperv-daemons cifs-utils + systemctl enable hypervvssd + systemctl enable hypervkvpd +fi + +# Since we disable consistent network naming, we need to make sure the eth0 +# configuration file is in place so it will come up. +# Delete other network configuration first because RHEL/C7 networking will not +# restart successfully if there are configuration files for devices that do not +# exist. +rm -f /etc/sysconfig/network-scripts/ifcfg-e* +cat > /etc/sysconfig/network-scripts/ifcfg-eth0 << _EOF_ +TYPE=Ethernet +PROXY_METHOD=none +BROWSER_ONLY=no +BOOTPROTO=dhcp +DEFROUTE=yes +IPV4_FAILURE_FATAL=no +IPV6INIT=yes +IPV6_AUTOCONF=yes +IPV6_DEFROUTE=yes +IPV6_FAILURE_FATAL=no +IPV6_ADDR_GEN_MODE=stable-privacy +NAME=eth0 +DEVICE=eth0 +ONBOOT=yes +_EOF_ +%end From c47367b2c69ed78b6aee6a3d6fc005217db03d21 Mon Sep 17 00:00:00 2001 From: Jordi Molina <warp3r@2shifted.com> Date: Thu, 4 Mar 2021 12:06:41 +0100 Subject: [PATCH 1362/1622] fix centos 8 stream iso url --- packer_templates/centos/centos-stream-8-x86_64.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packer_templates/centos/centos-stream-8-x86_64.json b/packer_templates/centos/centos-stream-8-x86_64.json index ef4d042b7..4109c38c9 100644 --- a/packer_templates/centos/centos-stream-8-x86_64.json +++ b/packer_templates/centos/centos-stream-8-x86_64.json @@ -161,8 +161,8 @@ "https_proxy": "{{env `https_proxy`}}", "hyperv_generation": "1", "hyperv_switch": "bento", - "iso_checksum": "b693d501987d7d450e926696d48a98987b648f167a93b5c4dad2d843385f90d2", - "iso_name": "CentOS-Stream-8-x86_64-20210215-dvd1.iso", + "iso_checksum": "c6f70c69178e7f631756009d0cd7366196def71ea471f4be1db02547f4c17833", + "iso_name": "CentOS-Stream-8-x86_64-20210302-dvd1.iso", "ks_path": "8-stream/ks.cfg", "memory": "1024", "mirror": "http://mirrors.kernel.org/centos", From 32bcc4ff209255beefd8600b59d4865e8b061b4f Mon Sep 17 00:00:00 2001 From: Li-Wen Hsu <lwhsu@lwhsu.org> Date: Fri, 19 Mar 2021 00:05:53 +0800 Subject: [PATCH 1363/1622] FreeBSD 12.1 is EoL'd on January 31, 2021 Signed-off-by: Li-Wen Hsu <lwhsu@lwhsu.org> --- builds.yml | 2 - .../freebsd/freebsd-12.1-amd64.json | 206 ------------------ .../freebsd/freebsd-12.1-i386.json | 206 ------------------ 3 files changed, 414 deletions(-) delete mode 100644 packer_templates/freebsd/freebsd-12.1-amd64.json delete mode 100644 packer_templates/freebsd/freebsd-12.1-i386.json diff --git a/builds.yml b/builds.yml index b872b14b4..715e8f389 100644 --- a/builds.yml +++ b/builds.yml @@ -15,8 +15,6 @@ public: - 'fedora-33' - 'freebsd-11.4-i386' - 'freebsd-11.4' -- 'freebsd-12.1-i386' -- 'freebsd-12.1' - 'freebsd-12.2-i386' - 'freebsd-12.2' - 'opensuse-leap-15.2' diff --git a/packer_templates/freebsd/freebsd-12.1-amd64.json b/packer_templates/freebsd/freebsd-12.1-amd64.json deleted file mode 100644 index cebbd59a5..000000000 --- a/packer_templates/freebsd/freebsd-12.1-amd64.json +++ /dev/null @@ -1,206 +0,0 @@ -{ - "builders": [ - { - "boot_command": [ - "<esc><wait>", - "boot -s<wait>", - "<enter><wait>", - "<wait10><wait10>", - "/bin/sh<enter><wait>", - "mdmfs -s 100m md1 /tmp<enter><wait>", - "mdmfs -s 100m md2 /mnt<enter><wait>", - "dhclient -p /tmp/dhclient.em0.pid -l /tmp/dhclient.lease.em0 em0<enter><wait>", - "fetch -o /tmp/installerconfig http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} \u0026\u0026 bsdinstall script /tmp/installerconfig<enter><wait>" - ], - "boot_wait": "5s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "guest_additions_mode": "disable", - "guest_os_type": "FreeBSD_64", - "headless": "{{ user `headless` }}", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-virtualbox", - "shutdown_command": "echo 'vagrant' | su -m root -c 'shutdown -p now'", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "type": "virtualbox-iso", - "virtualbox_version_file": ".vbox_version", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<esc><wait>", - "boot -s<wait>", - "<enter><wait>", - "<wait10><wait10>", - "/bin/sh<enter><wait>", - "mdmfs -s 100m md1 /tmp<enter><wait>", - "mdmfs -s 100m md2 /mnt<enter><wait>", - "dhclient -p /tmp/dhclient.em0.pid -l /tmp/dhclient.lease.em0 em0<enter><wait>", - "<wait5>", - "fetch -o /tmp/installerconfig http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} \u0026\u0026 bsdinstall script /tmp/installerconfig<enter><wait>" - ], - "boot_wait": "5s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "freebsd-64", - "headless": "{{ user `headless` }}", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-vmware", - "shutdown_command": "echo 'vagrant' | su -m root -c 'shutdown -p now'", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "type": "vmware-iso", - "vm_name": "{{ user `template` }}", - "vmx_data": { - "cpuid.coresPerSocket": "1" - }, - "vmx_remove_ethernet_interfaces": true - }, - { - "boot_command": [ - "<esc><wait>", - "boot -s<wait>", - "<enter><wait>", - "<wait10><wait10>", - "/bin/sh<enter><wait>", - "mdmfs -s 100m md1 /tmp<enter><wait>", - "mdmfs -s 100m md2 /mnt<enter><wait>", - "dhclient -p /tmp/dhclient.em0.pid -l /tmp/dhclient.lease.em0 em0<enter><wait>", - "fetch -o /tmp/installerconfig http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} \u0026\u0026 bsdinstall script /tmp/installerconfig<enter><wait>" - ], - "boot_wait": "8s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "freebsd", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-parallels", - "parallels_tools_mode": "disable", - "prlctl": [ - [ - "set", - "{{.Name}}", - "--device-set", - "cdrom0", - "--iface", - "ide" - ], - [ - "set", - "{{.Name}}", - "--device-del", - "fdd0" - ], - [ - "set", - "{{.Name}}", - "--device-del", - "parallel0" - ] - ], - "prlctl_version_file": ".prlctl_version", - "shutdown_command": "echo 'vagrant' | su -m root -c 'shutdown -p now'", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "type": "parallels-iso", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<esc><wait>", - "boot -s<wait>", - "<enter><wait>", - "<wait10><wait10>", - "/bin/sh<enter><wait>", - "mdmfs -s 100m md1 /tmp<enter><wait>", - "mdmfs -s 100m md2 /mnt<enter><wait>", - "dhclient -p /tmp/dhclient.vtnet0.pid -l /tmp/dhclient.lease.vtnet0 vtnet0<enter><wait>", - "fetch -o /tmp/installerconfig http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} \u0026\u0026 bsdinstall script /tmp/installerconfig<enter><wait>" - ], - "boot_wait": "7s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "headless": "{{ user `headless` }}", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-qemu", - "shutdown_command": "echo 'vagrant' | su -m root -c 'shutdown -p now'", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "type": "qemu", - "vm_name": "{{ user `template` }}" - } - ], - "post-processors": [ - { - "output": "{{ user `build_directory` }}/{{user `box_basename`}}.{{.Provider}}.box", - "type": "vagrant", - "vagrantfile_template": "{{template_dir}}/vagrantfile_templates/freebsd.rb" - } - ], - "provisioners": [ - { - "environment_vars": [ - "HOME_DIR=/home/vagrant", - "http_proxy={{user `http_proxy`}}", - "https_proxy={{user `https_proxy`}}", - "no_proxy={{user `no_proxy`}}", - "pkg_branch={{user `pkg_branch`}}" - ], - "execute_command": "echo 'vagrant' | {{.Vars}} su -m root -c 'sh -eux {{.Path}}'", - "expect_disconnect": true, - "scripts": [ - "{{template_dir}}/scripts/update.sh", - "{{template_dir}}/scripts/postinstall.sh", - "{{template_dir}}/scripts/sudoers.sh", - "{{template_dir}}/../_common/vagrant.sh", - "{{template_dir}}/scripts/vmtools.sh", - "{{template_dir}}/scripts/cleanup.sh", - "{{template_dir}}/scripts/minimize.sh" - ], - "type": "shell" - } - ], - "variables": { - "box_basename": "freebsd-12.1", - "build_directory": "../../builds", - "build_timestamp": "{{isotime \"20060102150405\"}}", - "cpus": "2", - "disk_size": "65536", - "git_revision": "__unknown_git_revision__", - "headless": "", - "http_directory": "{{template_dir}}/http", - "http_proxy": "{{env `http_proxy`}}", - "https_proxy": "{{env `https_proxy`}}", - "install_path": "freebsd-11/installerconfig", - "iso_checksum": "aa9d34b458826486999ed3e872436b6712ae38cede5ea41de4ab923e3419d461", - "iso_name": "FreeBSD-12.1-RELEASE-amd64-disc1.iso", - "memory": "1024", - "mirror": "https://download.freebsd.org/ftp", - "mirror_directory": "releases/amd64/amd64/ISO-IMAGES/12.1", - "name": "freebsd-12.1", - "no_proxy": "{{env `no_proxy`}}", - "pkg_branch": "quarterly", - "template": "freebsd-12.1-amd64", - "version": "TIMESTAMP" - } -} diff --git a/packer_templates/freebsd/freebsd-12.1-i386.json b/packer_templates/freebsd/freebsd-12.1-i386.json deleted file mode 100644 index 131c43346..000000000 --- a/packer_templates/freebsd/freebsd-12.1-i386.json +++ /dev/null @@ -1,206 +0,0 @@ -{ - "builders": [ - { - "boot_command": [ - "<esc><wait>", - "boot -s<wait>", - "<enter><wait>", - "<wait10><wait10>", - "/bin/sh<enter><wait>", - "mdmfs -s 100m md1 /tmp<enter><wait>", - "mdmfs -s 100m md2 /mnt<enter><wait>", - "dhclient -p /tmp/dhclient.em0.pid -l /tmp/dhclient.lease.em0 em0<enter><wait>", - "fetch -o /tmp/installerconfig http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} \u0026\u0026 bsdinstall script /tmp/installerconfig<enter><wait>" - ], - "boot_wait": "5s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "guest_additions_mode": "disable", - "guest_os_type": "FreeBSD", - "headless": "{{ user `headless` }}", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-virtualbox", - "shutdown_command": "echo 'vagrant' | su -m root -c 'shutdown -p now'", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "type": "virtualbox-iso", - "virtualbox_version_file": ".vbox_version", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<esc><wait>", - "boot -s<wait>", - "<enter><wait>", - "<wait10><wait10>", - "/bin/sh<enter><wait>", - "mdmfs -s 100m md1 /tmp<enter><wait>", - "mdmfs -s 100m md2 /mnt<enter><wait>", - "dhclient -p /tmp/dhclient.em0.pid -l /tmp/dhclient.lease.em0 em0<enter><wait>", - "<wait5>", - "fetch -o /tmp/installerconfig http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} \u0026\u0026 bsdinstall script /tmp/installerconfig<enter><wait>" - ], - "boot_wait": "5s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "freebsd", - "headless": "{{ user `headless` }}", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-vmware", - "shutdown_command": "echo 'vagrant' | su -m root -c 'shutdown -p now'", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "type": "vmware-iso", - "vm_name": "{{ user `template` }}", - "vmx_data": { - "cpuid.coresPerSocket": "1" - }, - "vmx_remove_ethernet_interfaces": true - }, - { - "boot_command": [ - "<esc><wait>", - "boot -s<wait>", - "<enter><wait>", - "<wait10><wait10>", - "/bin/sh<enter><wait>", - "mdmfs -s 100m md1 /tmp<enter><wait>", - "mdmfs -s 100m md2 /mnt<enter><wait>", - "dhclient -p /tmp/dhclient.em0.pid -l /tmp/dhclient.lease.em0 em0<enter><wait>", - "fetch -o /tmp/installerconfig http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} \u0026\u0026 bsdinstall script /tmp/installerconfig<enter><wait>" - ], - "boot_wait": "8s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "freebsd", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-parallels", - "parallels_tools_mode": "disable", - "prlctl": [ - [ - "set", - "{{.Name}}", - "--device-set", - "cdrom0", - "--iface", - "ide" - ], - [ - "set", - "{{.Name}}", - "--device-del", - "fdd0" - ], - [ - "set", - "{{.Name}}", - "--device-del", - "parallel0" - ] - ], - "prlctl_version_file": ".prlctl_version", - "shutdown_command": "echo 'vagrant' | su -m root -c 'shutdown -p now'", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "type": "parallels-iso", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<esc><wait>", - "boot -s<wait>", - "<enter><wait>", - "<wait10><wait10>", - "/bin/sh<enter><wait>", - "mdmfs -s 100m md1 /tmp<enter><wait>", - "mdmfs -s 100m md2 /mnt<enter><wait>", - "dhclient -p /tmp/dhclient.vtnet0.pid -l /tmp/dhclient.lease.vtnet0 vtnet0<enter><wait>", - "fetch -o /tmp/installerconfig http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} \u0026\u0026 bsdinstall script /tmp/installerconfig<enter><wait>" - ], - "boot_wait": "7s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "headless": "{{ user `headless` }}", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-qemu", - "shutdown_command": "echo 'vagrant' | su -m root -c 'shutdown -p now'", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "type": "qemu", - "vm_name": "{{ user `template` }}" - } - ], - "post-processors": [ - { - "output": "{{ user `build_directory` }}/{{user `box_basename`}}.{{.Provider}}.box", - "type": "vagrant", - "vagrantfile_template": "{{template_dir}}/vagrantfile_templates/freebsd.rb" - } - ], - "provisioners": [ - { - "environment_vars": [ - "HOME_DIR=/home/vagrant", - "http_proxy={{user `http_proxy`}}", - "https_proxy={{user `https_proxy`}}", - "no_proxy={{user `no_proxy`}}", - "pkg_branch={{user `pkg_branch`}}" - ], - "execute_command": "echo 'vagrant' | {{.Vars}} su -m root -c 'sh -eux {{.Path}}'", - "expect_disconnect": true, - "scripts": [ - "{{template_dir}}/scripts/update.sh", - "{{template_dir}}/scripts/postinstall.sh", - "{{template_dir}}/scripts/sudoers.sh", - "{{template_dir}}/../_common/vagrant.sh", - "{{template_dir}}/scripts/vmtools.sh", - "{{template_dir}}/scripts/cleanup.sh", - "{{template_dir}}/scripts/minimize.sh" - ], - "type": "shell" - } - ], - "variables": { - "box_basename": "freebsd-12.1-i386", - "build_directory": "../../builds", - "build_timestamp": "{{isotime \"20060102150405\"}}", - "cpus": "2", - "disk_size": "40960", - "git_revision": "__unknown_git_revision__", - "headless": "", - "http_directory": "{{template_dir}}/http", - "http_proxy": "{{env `http_proxy`}}", - "https_proxy": "{{env `https_proxy`}}", - "install_path": "freebsd-11/installerconfig", - "iso_checksum": "07b10e098e7c9b5e920679d3a9b3d12628f0b918c6e3962620b7f570a82cf41d", - "iso_name": "FreeBSD-12.1-RELEASE-i386-disc1.iso", - "memory": "1024", - "mirror": "https://download.freebsd.org/ftp", - "mirror_directory": "releases/i386/i386/ISO-IMAGES/12.1", - "name": "freebsd-12.1-i386", - "no_proxy": "{{env `no_proxy`}}", - "pkg_branch": "quarterly", - "template": "freebsd-12.1-i386", - "version": "TIMESTAMP" - } -} From 69116b8265e5747098b0db2e16663fc59de4cd86 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Thu, 18 Mar 2021 18:47:02 -0700 Subject: [PATCH 1364/1622] Update Alma Linux 8 to the RC1 release Signed-off-by: Tim Smith <tsmith@chef.io> --- packer_templates/almalinux/almalinux-8.3-x86_64.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packer_templates/almalinux/almalinux-8.3-x86_64.json b/packer_templates/almalinux/almalinux-8.3-x86_64.json index c6ad9f372..2bcc4b840 100644 --- a/packer_templates/almalinux/almalinux-8.3-x86_64.json +++ b/packer_templates/almalinux/almalinux-8.3-x86_64.json @@ -161,12 +161,12 @@ "https_proxy": "{{env `https_proxy`}}", "hyperv_generation": "1", "hyperv_switch": "bento", - "iso_checksum": "8b6a3321982b0138d54922edd078f5f4e76d0b5a72e587e2a32760a36c375637", - "iso_name": "AlmaLinux-8.3-beta-1-x86_64-dvd1.iso", + "iso_checksum": "147c5f8cd6dc9ca3372dbef25491f12d2482f8eef87866c4dbe17cd6fb12c3c9", + "iso_name": "AlmaLinux-8.3-rc-1-x86_64-dvd1.iso", "ks_path": "8/ks.cfg", "memory": "1024", "mirror": "https://repo.almalinux.org/almalinux", - "mirror_directory": "8.3-beta/isos/x86_64", + "mirror_directory": "8.3/isos/x86_64", "name": "almalinux-8.3", "no_proxy": "{{env `no_proxy`}}", "template": "almalinux-8.3-x86_64", From a6e9d53874fb09f6e5ad51d11b30f6663605274e Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Thu, 18 Mar 2021 18:48:04 -0700 Subject: [PATCH 1365/1622] Use the latest Ubuntu 21.04 release Signed-off-by: Tim Smith <tsmith@chef.io> --- packer_templates/ubuntu/ubuntu-21.04-amd64.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packer_templates/ubuntu/ubuntu-21.04-amd64.json b/packer_templates/ubuntu/ubuntu-21.04-amd64.json index 471a2be66..ebbd6450e 100644 --- a/packer_templates/ubuntu/ubuntu-21.04-amd64.json +++ b/packer_templates/ubuntu/ubuntu-21.04-amd64.json @@ -266,11 +266,11 @@ "https_proxy": "{{env `https_proxy`}}", "hyperv_generation": "2", "hyperv_switch": "bento", - "iso_checksum": "1cb16319825c41fd40a2d1d9453da6f61de987af1872c86798b6c004487eab48", + "iso_checksum": "6e207960c3b9fdabd95c98e1b3b61b72328223ea787f56fe5bfe8f2898f48d96", "iso_name": "hirsute-live-server-amd64.iso", "memory": "1024", "mirror": "http://cdimage.ubuntu.com", - "mirror_directory": "ubuntu-server/daily-live/current", + "mirror_directory": "ubuntu-server/daily-live/20210318", "name": "ubuntu-21.04", "no_proxy": "{{env `no_proxy`}}", "preseed_path": "preseed.cfg", From abf822a16e5b5a9e7f6cc12ebd8325131f818447 Mon Sep 17 00:00:00 2001 From: Li-Wen Hsu <lwhsu@lwhsu.org> Date: Fri, 16 Apr 2021 16:34:27 +0800 Subject: [PATCH 1366/1622] Add FreeBSD 13.0-RELEASE Signed-off-by: Li-Wen Hsu <lwhsu@lwhsu.org> --- .../freebsd/freebsd-13.0-amd64.json | 206 ++++++++++++++++++ 1 file changed, 206 insertions(+) create mode 100644 packer_templates/freebsd/freebsd-13.0-amd64.json diff --git a/packer_templates/freebsd/freebsd-13.0-amd64.json b/packer_templates/freebsd/freebsd-13.0-amd64.json new file mode 100644 index 000000000..7fb547bd2 --- /dev/null +++ b/packer_templates/freebsd/freebsd-13.0-amd64.json @@ -0,0 +1,206 @@ +{ + "builders": [ + { + "boot_command": [ + "<esc><wait>", + "boot -s<wait>", + "<enter><wait>", + "<wait10><wait10>", + "/bin/sh<enter><wait>", + "mdmfs -s 100m md1 /tmp<enter><wait>", + "mdmfs -s 100m md2 /mnt<enter><wait>", + "dhclient -p /tmp/dhclient.em0.pid -l /tmp/dhclient.lease.em0 em0<enter><wait>", + "fetch -o /tmp/installerconfig http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} \u0026\u0026 bsdinstall script /tmp/installerconfig<enter><wait>" + ], + "boot_wait": "5s", + "cpus": "{{ user `cpus` }}", + "disk_size": "{{user `disk_size`}}", + "guest_additions_mode": "disable", + "guest_os_type": "FreeBSD_64", + "headless": "{{ user `headless` }}", + "http_directory": "{{user `http_directory`}}", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "memory": "{{ user `memory` }}", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-virtualbox", + "shutdown_command": "echo 'vagrant' | su -m root -c 'shutdown -p now'", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_timeout": "10000s", + "ssh_username": "vagrant", + "type": "virtualbox-iso", + "virtualbox_version_file": ".vbox_version", + "vm_name": "{{ user `template` }}" + }, + { + "boot_command": [ + "<esc><wait>", + "boot -s<wait>", + "<enter><wait>", + "<wait10><wait10>", + "/bin/sh<enter><wait>", + "mdmfs -s 100m md1 /tmp<enter><wait>", + "mdmfs -s 100m md2 /mnt<enter><wait>", + "dhclient -p /tmp/dhclient.em0.pid -l /tmp/dhclient.lease.em0 em0<enter><wait>", + "<wait5>", + "fetch -o /tmp/installerconfig http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} \u0026\u0026 bsdinstall script /tmp/installerconfig<enter><wait>" + ], + "boot_wait": "5s", + "cpus": "{{ user `cpus` }}", + "disk_size": "{{user `disk_size`}}", + "guest_os_type": "freebsd-64", + "headless": "{{ user `headless` }}", + "http_directory": "{{user `http_directory`}}", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "memory": "{{ user `memory` }}", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-vmware", + "shutdown_command": "echo 'vagrant' | su -m root -c 'shutdown -p now'", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_timeout": "10000s", + "ssh_username": "vagrant", + "type": "vmware-iso", + "vm_name": "{{ user `template` }}", + "vmx_data": { + "cpuid.coresPerSocket": "1" + }, + "vmx_remove_ethernet_interfaces": true + }, + { + "boot_command": [ + "<esc><wait>", + "boot -s<wait>", + "<enter><wait>", + "<wait10><wait10>", + "/bin/sh<enter><wait>", + "mdmfs -s 100m md1 /tmp<enter><wait>", + "mdmfs -s 100m md2 /mnt<enter><wait>", + "dhclient -p /tmp/dhclient.em0.pid -l /tmp/dhclient.lease.em0 em0<enter><wait>", + "fetch -o /tmp/installerconfig http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} \u0026\u0026 bsdinstall script /tmp/installerconfig<enter><wait>" + ], + "boot_wait": "8s", + "cpus": "{{ user `cpus` }}", + "disk_size": "{{user `disk_size`}}", + "guest_os_type": "freebsd", + "http_directory": "{{user `http_directory`}}", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "memory": "{{ user `memory` }}", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-parallels", + "parallels_tools_mode": "disable", + "prlctl": [ + [ + "set", + "{{.Name}}", + "--device-set", + "cdrom0", + "--iface", + "ide" + ], + [ + "set", + "{{.Name}}", + "--device-del", + "fdd0" + ], + [ + "set", + "{{.Name}}", + "--device-del", + "parallel0" + ] + ], + "prlctl_version_file": ".prlctl_version", + "shutdown_command": "echo 'vagrant' | su -m root -c 'shutdown -p now'", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_timeout": "10000s", + "ssh_username": "vagrant", + "type": "parallels-iso", + "vm_name": "{{ user `template` }}" + }, + { + "boot_command": [ + "<esc><wait>", + "boot -s<wait>", + "<enter><wait>", + "<wait10><wait10>", + "/bin/sh<enter><wait>", + "mdmfs -s 100m md1 /tmp<enter><wait>", + "mdmfs -s 100m md2 /mnt<enter><wait>", + "dhclient -p /tmp/dhclient.vtnet0.pid -l /tmp/dhclient.lease.vtnet0 vtnet0<enter><wait>", + "fetch -o /tmp/installerconfig http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} \u0026\u0026 bsdinstall script /tmp/installerconfig<enter><wait>" + ], + "boot_wait": "7s", + "cpus": "{{ user `cpus` }}", + "disk_size": "{{user `disk_size`}}", + "headless": "{{ user `headless` }}", + "http_directory": "{{user `http_directory`}}", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "memory": "{{ user `memory` }}", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-qemu", + "shutdown_command": "echo 'vagrant' | su -m root -c 'shutdown -p now'", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_timeout": "10000s", + "ssh_username": "vagrant", + "type": "qemu", + "vm_name": "{{ user `template` }}" + } + ], + "post-processors": [ + { + "output": "{{ user `build_directory` }}/{{user `box_basename`}}.{{.Provider}}.box", + "type": "vagrant", + "vagrantfile_template": "{{template_dir}}/vagrantfile_templates/freebsd.rb" + } + ], + "provisioners": [ + { + "environment_vars": [ + "HOME_DIR=/home/vagrant", + "http_proxy={{user `http_proxy`}}", + "https_proxy={{user `https_proxy`}}", + "no_proxy={{user `no_proxy`}}", + "pkg_branch={{user `pkg_branch`}}" + ], + "execute_command": "echo 'vagrant' | {{.Vars}} su -m root -c 'sh -eux {{.Path}}'", + "expect_disconnect": true, + "scripts": [ + "{{template_dir}}/scripts/update.sh", + "{{template_dir}}/scripts/postinstall.sh", + "{{template_dir}}/scripts/sudoers.sh", + "{{template_dir}}/../_common/vagrant.sh", + "{{template_dir}}/scripts/vmtools.sh", + "{{template_dir}}/scripts/cleanup.sh", + "{{template_dir}}/scripts/minimize.sh" + ], + "type": "shell" + } + ], + "variables": { + "box_basename": "freebsd-13.0", + "build_directory": "../../builds", + "build_timestamp": "{{isotime \"20060102150405\"}}", + "cpus": "2", + "disk_size": "65536", + "git_revision": "__unknown_git_revision__", + "headless": "", + "http_directory": "{{template_dir}}/http", + "http_proxy": "{{env `http_proxy`}}", + "https_proxy": "{{env `https_proxy`}}", + "install_path": "freebsd-11/installerconfig", + "iso_checksum": "f78d4e5f53605592863852b39fa31a12f15893dc48cacecd875f2da72fa67ae5", + "iso_name": "FreeBSD-13.0-RELEASE-amd64-disc1.iso", + "memory": "1024", + "mirror": "https://download.freebsd.org/ftp", + "mirror_directory": "releases/amd64/amd64/ISO-IMAGES/13.0", + "name": "freebsd-13.0", + "no_proxy": "{{env `no_proxy`}}", + "pkg_branch": "quarterly", + "template": "freebsd-13.0-amd64", + "version": "TIMESTAMP" + } +} From 486efe7bf13a3e11b43b4fcca372c33699167247 Mon Sep 17 00:00:00 2001 From: Li-Wen Hsu <lwhsu@lwhsu.org> Date: Sat, 17 Apr 2021 01:55:15 +0800 Subject: [PATCH 1367/1622] Add freebsd-13 to build config Signed-off-by: Li-Wen Hsu <lwhsu@lwhsu.org> --- builds.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/builds.yml b/builds.yml index 715e8f389..bc61ee793 100644 --- a/builds.yml +++ b/builds.yml @@ -17,6 +17,7 @@ public: - 'freebsd-11.4' - 'freebsd-12.2-i386' - 'freebsd-12.2' +- 'freebsd-13.0' - 'opensuse-leap-15.2' - 'oracle-6.10-i386' - 'oracle-6.10' @@ -43,5 +44,6 @@ slugs: 'scientific-7': 'scientific-7' 'freebsd-11': 'freebsd-11' 'freebsd-12': 'freebsd-12' + 'freebsd-13': 'freebsd-13' 'opensuse-leap-15': 'opensuse-leap-15' 'fedora-latest': 'fedora-33' From ab1b84b995953c8f13e69139df48b9a535a60780 Mon Sep 17 00:00:00 2001 From: Carlos Rodrigues <cefrodrigues@gmail.com> Date: Fri, 2 Apr 2021 20:19:39 +0100 Subject: [PATCH 1368/1622] Update debian to 10.9 Signed-off-by: Carlos Rodrigues <cefrodrigues@gmail.com> --- README.md | 4 ++-- builds.yml | 4 ++-- ...debian-10.8-amd64.json => debian-10.9-amd64.json} | 12 ++++++------ .../{debian-10.8-i386.json => debian-10.9-i386.json} | 12 ++++++------ 4 files changed, 16 insertions(+), 16 deletions(-) rename packer_templates/debian/{debian-10.8-amd64.json => debian-10.9-amd64.json} (96%) rename packer_templates/debian/{debian-10.8-i386.json => debian-10.9-i386.json} (96%) diff --git a/README.md b/README.md index 578b2ee7c..8e0277632 100644 --- a/README.md +++ b/README.md @@ -45,11 +45,11 @@ $ cd packer_templates/ubuntu $ packer build -only=virtualbox-iso ubuntu-18.04-amd64.json ``` -To build Debian 10.8 32bit boxes for all possible providers (simultaneously) +To build Debian 10.9 32bit boxes for all possible providers (simultaneously) ``` $ cd packer_templates/debian -$ packer build debian-10.8-i386.json +$ packer build debian-10.9-i386.json ``` To build CentOS 7.7 boxes for all providers except VMware and Parallels diff --git a/builds.yml b/builds.yml index 715e8f389..90039662d 100644 --- a/builds.yml +++ b/builds.yml @@ -9,8 +9,8 @@ public: - 'centos-stream-8' - 'debian-9.13-i386' - 'debian-9.13' -- 'debian-10.8-i386' -- 'debian-10.8' +- 'debian-10.9-i386' +- 'debian-10.9' - 'fedora-32' - 'fedora-33' - 'freebsd-11.4-i386' diff --git a/packer_templates/debian/debian-10.8-amd64.json b/packer_templates/debian/debian-10.9-amd64.json similarity index 96% rename from packer_templates/debian/debian-10.8-amd64.json rename to packer_templates/debian/debian-10.9-amd64.json index eccb1247b..eace0f92b 100644 --- a/packer_templates/debian/debian-10.8-amd64.json +++ b/packer_templates/debian/debian-10.9-amd64.json @@ -193,7 +193,7 @@ } ], "variables": { - "box_basename": "debian-10.8", + "box_basename": "debian-10.9", "build_directory": "../../builds", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "2", @@ -204,15 +204,15 @@ "http_directory": "{{template_dir}}/http", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", - "iso_checksum": "396553f005ad9f86a51e246b1540c60cef676f9c71b95e22b753faef59f89bee", - "iso_name": "debian-10.8.0-amd64-netinst.iso", + "iso_checksum": "8660593d10de0ce7577c9de4dab886ff540bc9843659c8879d8eea0ab224c109", + "iso_name": "debian-10.9.0-amd64-netinst.iso", "memory": "1024", "mirror": "http://cdimage.debian.org/cdimage/release", - "mirror_directory": "10.8.0/amd64/iso-cd", - "name": "debian-10.8", + "mirror_directory": "10.9.0/amd64/iso-cd", + "name": "debian-10.9", "no_proxy": "{{env `no_proxy`}}", "preseed_path": "debian-9/preseed.cfg", - "template": "debian-10.8-amd64", + "template": "debian-10.9-amd64", "version": "TIMESTAMP" } } diff --git a/packer_templates/debian/debian-10.8-i386.json b/packer_templates/debian/debian-10.9-i386.json similarity index 96% rename from packer_templates/debian/debian-10.8-i386.json rename to packer_templates/debian/debian-10.9-i386.json index 9b5cc2725..6e695bfde 100644 --- a/packer_templates/debian/debian-10.8-i386.json +++ b/packer_templates/debian/debian-10.9-i386.json @@ -193,7 +193,7 @@ } ], "variables": { - "box_basename": "debian-10.8-i386", + "box_basename": "debian-10.9-i386", "build_directory": "../../builds", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "2", @@ -204,15 +204,15 @@ "http_directory": "{{template_dir}}/http", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", - "iso_checksum": "3c2260ba88e1af468b0c330190c8a03c6d81b56e9ec03dfbe351913c45f3df1d", - "iso_name": "debian-10.8.0-i386-netinst.iso", + "iso_checksum": "db92546facb722bfd3cf796f9f10db70a257d6d21126d35348d1fba13601e82a", + "iso_name": "debian-10.9.0-i386-netinst.iso", "memory": "1024", "mirror": "http://cdimage.debian.org/cdimage/release", - "mirror_directory": "10.8.0/i386/iso-cd", - "name": "debian-10.8-i386", + "mirror_directory": "10.9.0/i386/iso-cd", + "name": "debian-10.9-i386", "no_proxy": "{{env `no_proxy`}}", "preseed_path": "debian-9/preseed.cfg", - "template": "debian-10.8-i386", + "template": "debian-10.9-i386", "version": "TIMESTAMP" } } From bae65568b9e395a2e19d0d594687eca999391eb9 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Sun, 18 Apr 2021 20:28:06 -0700 Subject: [PATCH 1369/1622] Add springdalelinux Signed-off-by: Tim Smith <tsmith@chef.io> --- builds.yml | 2 + .../springdalelinux-7.9-x86_64.json | 176 ++++++++++++++++++ 2 files changed, 178 insertions(+) create mode 100644 packer_templates/springdalelinux/springdalelinux-7.9-x86_64.json diff --git a/builds.yml b/builds.yml index bc61ee793..74e770505 100644 --- a/builds.yml +++ b/builds.yml @@ -24,6 +24,7 @@ public: - 'oracle-7.9' - 'oracle-8.3' - 'scientific-7.8' +- 'springdalelinux-7.9' - 'ubuntu-16.04-i386' - 'ubuntu-16.04' - 'ubuntu-18.04' @@ -42,6 +43,7 @@ slugs: 'oracle-7': 'oracle-7' 'oracle-8': 'oracle-8' 'scientific-7': 'scientific-7' + 'springdalelinux-7': 'springdalelinux-7' 'freebsd-11': 'freebsd-11' 'freebsd-12': 'freebsd-12' 'freebsd-13': 'freebsd-13' diff --git a/packer_templates/springdalelinux/springdalelinux-7.9-x86_64.json b/packer_templates/springdalelinux/springdalelinux-7.9-x86_64.json new file mode 100644 index 000000000..3aee6d6aa --- /dev/null +++ b/packer_templates/springdalelinux/springdalelinux-7.9-x86_64.json @@ -0,0 +1,176 @@ +{ + "builders": [ + { + "boot_command": "{{ user `boot_command` }}", + "boot_wait": "5s", + "cpus": "{{ user `cpus` }}", + "disk_size": "{{user `disk_size`}}", + "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "guest_additions_url": "{{ user `guest_additions_url` }}", + "guest_os_type": "RedHat_64", + "hard_drive_interface": "sata", + "headless": "{{ user `headless` }}", + "http_directory": "{{user `http_directory`}}", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "memory": "{{ user `memory` }}", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-virtualbox", + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_timeout": "10000s", + "ssh_username": "vagrant", + "type": "virtualbox-iso", + "virtualbox_version_file": ".vbox_version", + "vm_name": "{{ user `template` }}" + }, + { + "boot_command": "{{ user `boot_command` }}", + "boot_wait": "5s", + "cpus": "{{ user `cpus` }}", + "disk_size": "{{user `disk_size`}}", + "guest_os_type": "centos-64", + "headless": "{{ user `headless` }}", + "http_directory": "{{user `http_directory`}}", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "memory": "{{ user `memory` }}", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-vmware", + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_timeout": "10000s", + "ssh_username": "vagrant", + "tools_upload_flavor": "linux", + "type": "vmware-iso", + "vm_name": "{{ user `template` }}", + "vmx_data": { + "cpuid.coresPerSocket": "1" + }, + "vmx_remove_ethernet_interfaces": true + }, + { + "boot_command": "{{user `boot_command`}}", + "boot_wait": "5s", + "cpus": "{{ user `cpus` }}", + "disk_size": "{{user `disk_size`}}", + "guest_os_type": "centos", + "http_directory": "{{user `http_directory`}}", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "memory": "{{ user `memory` }}", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-parallels", + "parallels_tools_flavor": "lin", + "prlctl_version_file": ".prlctl_version", + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_timeout": "10000s", + "ssh_username": "vagrant", + "type": "parallels-iso", + "vm_name": "{{ user `template` }}" + }, + { + "boot_command": [ + "<wait5><up><wait5><tab> text ks=hd:fd0:/ks.cfg<enter><wait5><esc>" + ], + "boot_wait": "5s", + "cpus": "{{ user `cpus` }}", + "disk_size": "{{user `disk_size`}}", + "floppy_files": [ + "{{user `http_directory`}}/{{user `ks_path`}}" + ], + "generation": "{{user `hyperv_generation`}}", + "guest_additions_mode": "disable", + "http_directory": "{{user `http_directory`}}", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "memory": "{{ user `memory` }}", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-hyperv", + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_timeout": "10000s", + "ssh_username": "vagrant", + "switch_name": "{{ user `hyperv_switch`}}", + "type": "hyperv-iso", + "vm_name": "{{ user `template` }}" + }, + { + "boot_command": "{{ user `boot_command` }}", + "boot_wait": "5s", + "cpus": "{{ user `cpus` }}", + "disk_size": "{{user `disk_size`}}", + "headless": "{{ user `headless` }}", + "http_directory": "{{user `http_directory`}}", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "memory": "{{ user `memory` }}", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-qemu", + "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_timeout": "10000s", + "ssh_username": "vagrant", + "type": "qemu", + "vm_name": "{{ user `template` }}" + } + ], + "post-processors": [ + { + "output": "{{ user `build_directory` }}/{{user `box_basename`}}.{{.Provider}}.box", + "type": "vagrant" + } + ], + "provisioners": [ + { + "environment_vars": [ + "HOME_DIR=/home/vagrant", + "http_proxy={{user `http_proxy`}}", + "https_proxy={{user `https_proxy`}}", + "no_proxy={{user `no_proxy`}}" + ], + "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", + "expect_disconnect": true, + "scripts": [ + "{{template_dir}}/../centos/scripts/update.sh", + "{{template_dir}}/../centos/scripts/networking.sh", + "{{template_dir}}/../_common/motd.sh", + "{{template_dir}}/../_common/sshd.sh", + "{{template_dir}}/../_common/vagrant.sh", + "{{template_dir}}/../_common/virtualbox.sh", + "{{template_dir}}/../_common/vmware.sh", + "{{template_dir}}/../_common/parallels.sh", + "{{template_dir}}/../centos/scripts/cleanup.sh", + "{{template_dir}}/../_common/minimize.sh" + ], + "type": "shell" + } + ], + "variables": { + "box_basename": "springdalelinux-7.9", + "build_directory": "../../builds", + "build_timestamp": "{{isotime \"2019102650405\"}}", + "cpus": "2", + "disk_size": "65536", + "git_revision": "__unknown_git_revision__", + "guest_additions_url": "", + "headless": "", + "http_directory": "{{template_dir}}/../centos/http", + "http_proxy": "{{env `http_proxy`}}", + "https_proxy": "{{env `https_proxy`}}", + "hyperv_generation": "1", + "hyperv_switch": "bento", + "iso_checksum": "f4324776f92ee6f4d8a8fc96ddcb7b346e96a51cbc6eac39b51ac8b485a602ad", + "iso_name": "Springdale%20Linux-7.5-x86_64-DVD.iso", + "ks_path": "7/ks.cfg", + "memory": "1024", + "mirror": "http://springdale.princeton.edu/data/springdale", + "mirror_directory": "7.5/x86_64/iso", + "name": "springdalelinux-7.9", + "no_proxy": "{{env `no_proxy`}}", + "template": "springdalelinux-7.9-x86_64", + "boot_command": "<up><wait><tab> inst.text inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>", + "version": "TIMESTAMP" + } +} From 0555e932652e7261aef94a62da51fadff7fbb6f6 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Thu, 29 Apr 2021 20:23:03 +0000 Subject: [PATCH 1370/1622] Upgrade to GitHub-native Dependabot --- .github/dependabot.yml | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 .github/dependabot.yml diff --git a/.github/dependabot.yml b/.github/dependabot.yml new file mode 100644 index 000000000..0967c13fd --- /dev/null +++ b/.github/dependabot.yml @@ -0,0 +1,9 @@ +version: 2 +updates: +- package-ecosystem: bundler + directory: "/" + schedule: + interval: daily + time: "06:00" + timezone: America/Los_Angeles + open-pull-requests-limit: 10 From e5692c639d3dcb7ac2b3d69bad5ec0bae9f18b6b Mon Sep 17 00:00:00 2001 From: Alex Mayer <amayer5125@gmail.com> Date: Wed, 19 May 2021 16:56:02 -0400 Subject: [PATCH 1371/1622] Remove Duplicate Lines From Preseeds Signed-off-by: Alex Mayer <amayer5125@gmail.com> --- packer_templates/debian/http/debian-9/preseed.cfg | 1 - packer_templates/ubuntu/http/preseed-hyperv.cfg | 1 - packer_templates/ubuntu/http/preseed.cfg | 1 - 3 files changed, 3 deletions(-) diff --git a/packer_templates/debian/http/debian-9/preseed.cfg b/packer_templates/debian/http/debian-9/preseed.cfg index 250463ecf..7d0ce7c2b 100644 --- a/packer_templates/debian/http/debian-9/preseed.cfg +++ b/packer_templates/debian/http/debian-9/preseed.cfg @@ -15,7 +15,6 @@ d-i partman-auto-lvm/guided_size string max d-i partman-auto/choose_recipe select atomic d-i partman-auto/method string lvm d-i partman-lvm/confirm boolean true -d-i partman-lvm/confirm boolean true d-i partman-lvm/confirm_nooverwrite boolean true d-i partman-lvm/device_remove_lvm boolean true d-i partman/choose_partition select finish diff --git a/packer_templates/ubuntu/http/preseed-hyperv.cfg b/packer_templates/ubuntu/http/preseed-hyperv.cfg index fafaccf2a..9d9f6dec7 100755 --- a/packer_templates/ubuntu/http/preseed-hyperv.cfg +++ b/packer_templates/ubuntu/http/preseed-hyperv.cfg @@ -13,7 +13,6 @@ d-i partman-auto-lvm/guided_size string max d-i partman-auto/choose_recipe select atomic d-i partman-auto/method string lvm d-i partman-lvm/confirm boolean true -d-i partman-lvm/confirm boolean true d-i partman-lvm/confirm_nooverwrite boolean true d-i partman-lvm/device_remove_lvm boolean true d-i partman/choose_partition select finish diff --git a/packer_templates/ubuntu/http/preseed.cfg b/packer_templates/ubuntu/http/preseed.cfg index 306bb07dd..3754cb4ec 100644 --- a/packer_templates/ubuntu/http/preseed.cfg +++ b/packer_templates/ubuntu/http/preseed.cfg @@ -13,7 +13,6 @@ d-i partman-auto-lvm/guided_size string max d-i partman-auto/choose_recipe select atomic d-i partman-auto/method string lvm d-i partman-lvm/confirm boolean true -d-i partman-lvm/confirm boolean true d-i partman-lvm/confirm_nooverwrite boolean true d-i partman-lvm/device_remove_lvm boolean true d-i partman/choose_partition select finish From 0ec1435126c9ccb1acdc0ab898644c3ddda50f78 Mon Sep 17 00:00:00 2001 From: Ross Smith II <ross@smithii.com> Date: Mon, 24 May 2021 06:24:58 -0700 Subject: [PATCH 1372/1622] chore: Bump Ubuntu 20.04 to 20.04.02 See http://releases.ubuntu.com/20.04/ and http://releases.ubuntu.com/20.04/SHA256SUMS Signed-off-by: Ross Smith II <ross@smithii.com> --- packer_templates/ubuntu/ubuntu-20.04-live-amd64.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packer_templates/ubuntu/ubuntu-20.04-live-amd64.json b/packer_templates/ubuntu/ubuntu-20.04-live-amd64.json index 5918e4ebd..1099b3687 100644 --- a/packer_templates/ubuntu/ubuntu-20.04-live-amd64.json +++ b/packer_templates/ubuntu/ubuntu-20.04-live-amd64.json @@ -235,8 +235,8 @@ "https_proxy": "{{env `https_proxy`}}", "hyperv_generation": "2", "hyperv_switch": "bento", - "iso_checksum": "443511f6bf12402c12503733059269a2e10dec602916c0a75263e5d990f6bb93", - "iso_name": "ubuntu-20.04.1-live-server-amd64.iso", + "iso_checksum": "d1f2bf834bbe9bb43faf16f9be992a6f3935e65be0edece1dee2aa6eb1767423", + "iso_name": "ubuntu-20.04.2-live-server-amd64.iso", "memory": "1024", "mirror": "http://releases.ubuntu.com", "mirror_directory": "20.04", From 21fa921d3a263bed6c2735bce7a3e8e50a7a25e4 Mon Sep 17 00:00:00 2001 From: Ross Smith II <ross@smithii.com> Date: Mon, 24 May 2021 06:36:09 -0700 Subject: [PATCH 1373/1622] chore: Bump Ubuntu 21.04 to released version See http://releases.ubuntu.com/21.04/ and http://releases.ubuntu.com/21.04/SHA256SUMS Signed-off-by: Ross Smith II <ross@smithii.com> --- packer_templates/ubuntu/ubuntu-21.04-amd64.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/packer_templates/ubuntu/ubuntu-21.04-amd64.json b/packer_templates/ubuntu/ubuntu-21.04-amd64.json index ebbd6450e..0bd96201f 100644 --- a/packer_templates/ubuntu/ubuntu-21.04-amd64.json +++ b/packer_templates/ubuntu/ubuntu-21.04-amd64.json @@ -266,11 +266,11 @@ "https_proxy": "{{env `https_proxy`}}", "hyperv_generation": "2", "hyperv_switch": "bento", - "iso_checksum": "6e207960c3b9fdabd95c98e1b3b61b72328223ea787f56fe5bfe8f2898f48d96", - "iso_name": "hirsute-live-server-amd64.iso", + "iso_checksum": "e4089c47104375b59951bad6c7b3ee5d9f6d80bfac4597e43a716bb8f5c1f3b0", + "iso_name": "ubuntu-21.04-live-server-amd64.iso", "memory": "1024", - "mirror": "http://cdimage.ubuntu.com", - "mirror_directory": "ubuntu-server/daily-live/20210318", + "mirror": "http://releases.ubuntu.com", + "mirror_directory": "21.04", "name": "ubuntu-21.04", "no_proxy": "{{env `no_proxy`}}", "preseed_path": "preseed.cfg", From d3347633f0e04f2ed51bef63f62ff6e1b880f76b Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith@chef.io> Date: Mon, 24 May 2021 21:07:31 -0700 Subject: [PATCH 1374/1622] Update Alma Linux to the final Signed-off-by: Tim Smith <tsmith@chef.io> --- packer_templates/almalinux/almalinux-8.3-x86_64.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packer_templates/almalinux/almalinux-8.3-x86_64.json b/packer_templates/almalinux/almalinux-8.3-x86_64.json index 2bcc4b840..1f55f3158 100644 --- a/packer_templates/almalinux/almalinux-8.3-x86_64.json +++ b/packer_templates/almalinux/almalinux-8.3-x86_64.json @@ -161,8 +161,8 @@ "https_proxy": "{{env `https_proxy`}}", "hyperv_generation": "1", "hyperv_switch": "bento", - "iso_checksum": "147c5f8cd6dc9ca3372dbef25491f12d2482f8eef87866c4dbe17cd6fb12c3c9", - "iso_name": "AlmaLinux-8.3-rc-1-x86_64-dvd1.iso", + "iso_checksum": "a2ca2ff3de3e7c0707b042994e1947a8ce81d16ba5c869d6ecf8f4d4dd88eee2", + "iso_name": "AlmaLinux-8.3-x86_64-dvd.iso", "ks_path": "8/ks.cfg", "memory": "1024", "mirror": "https://repo.almalinux.org/almalinux", From efb9ad663069f47ff625a85f3fa378c969309256 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith@chef.io> Date: Mon, 24 May 2021 21:07:50 -0700 Subject: [PATCH 1375/1622] Remove EOL Ubuntu 16.04 Signed-off-by: Tim Smith <tsmith@chef.io> --- builds.yml | 2 - packer_templates/ubuntu/scripts/hyperv.sh | 6 +- packer_templates/ubuntu/scripts/networking.sh | 5 - .../ubuntu/ubuntu-16.04-amd64.json | 287 ------------------ .../ubuntu/ubuntu-16.04-i386.json | 286 ----------------- 5 files changed, 1 insertion(+), 585 deletions(-) delete mode 100644 packer_templates/ubuntu/ubuntu-16.04-amd64.json delete mode 100644 packer_templates/ubuntu/ubuntu-16.04-i386.json diff --git a/builds.yml b/builds.yml index a5b5f2912..24018d2a2 100644 --- a/builds.yml +++ b/builds.yml @@ -25,8 +25,6 @@ public: - 'oracle-8.3' - 'scientific-7.8' - 'springdalelinux-7.9' -- 'ubuntu-16.04-i386' -- 'ubuntu-16.04' - 'ubuntu-18.04' - 'ubuntu-20.04' - 'ubuntu-20.10' diff --git a/packer_templates/ubuntu/scripts/hyperv.sh b/packer_templates/ubuntu/scripts/hyperv.sh index 454324408..d4afdd2c9 100755 --- a/packer_templates/ubuntu/scripts/hyperv.sh +++ b/packer_templates/ubuntu/scripts/hyperv.sh @@ -5,9 +5,5 @@ major_version="`echo $ubuntu_version | awk -F. '{print $1}'`"; case "$PACKER_BUILDER_TYPE" in hyperv-iso) echo "installing packaging for hyper-v" - if [ "$major_version" -eq "16" ]; then - apt-get install -y linux-tools-virtual-lts-xenial linux-cloud-tools-virtual-lts-xenial; - else - apt-get -y install linux-image-virtual linux-tools-virtual linux-cloud-tools-virtual; - fi + apt-get -y install linux-image-virtual linux-tools-virtual linux-cloud-tools-virtual; esac diff --git a/packer_templates/ubuntu/scripts/networking.sh b/packer_templates/ubuntu/scripts/networking.sh index 9547f987a..77bc9abee 100644 --- a/packer_templates/ubuntu/scripts/networking.sh +++ b/packer_templates/ubuntu/scripts/networking.sh @@ -3,7 +3,6 @@ ubuntu_version="`lsb_release -r | awk '{print $2}'`"; major_version="`echo $ubuntu_version | awk -F. '{print $1}'`"; -if [ "$major_version" -ge "18" ]; then echo "Create netplan config for eth0" cat <<EOF >/etc/netplan/01-netcfg.yaml; network: @@ -12,10 +11,6 @@ network: eth0: dhcp4: true EOF -else - # Adding a 2 sec delay to the interface up, to make the dhclient happy - echo "pre-up sleep 2" >> /etc/network/interfaces; -fi # Disable Predictable Network Interface names and use eth0 sed -i 's/en[[:alnum:]]*/eth0/g' /etc/network/interfaces; diff --git a/packer_templates/ubuntu/ubuntu-16.04-amd64.json b/packer_templates/ubuntu/ubuntu-16.04-amd64.json deleted file mode 100644 index 539dcac4c..000000000 --- a/packer_templates/ubuntu/ubuntu-16.04-amd64.json +++ /dev/null @@ -1,287 +0,0 @@ -{ - "builders": [ - { - "boot_command": [ - "<enter><wait><f6><esc><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs>", - "<bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs>", - "<bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs>", - "<bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs>", - "/install/vmlinuz<wait>", - " auto<wait>", - " console-setup/ask_detect=false<wait>", - " console-setup/layoutcode=us<wait>", - " console-setup/modelcode=pc105<wait>", - " debconf/frontend=noninteractive<wait>", - " debian-installer=en_US.UTF-8<wait>", - " fb=false<wait>", - " initrd=/install/initrd.gz<wait>", - " kbd-chooser/method=us<wait>", - " keyboard-configuration/layout=USA<wait>", - " keyboard-configuration/variant=USA<wait>", - " locale=en_US.UTF-8<wait>", - " netcfg/get_domain=vm<wait>", - " netcfg/get_hostname=vagrant<wait>", - " grub-installer/bootdev=/dev/sda<wait>", - " noapic<wait>", - " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}}<wait>", - " -- <wait>", - "<enter><wait>" - ], - "boot_wait": "5s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", - "guest_additions_url": "{{ user `guest_additions_url` }}", - "guest_os_type": "Ubuntu_64", - "hard_drive_interface": "sata", - "headless": "{{ user `headless` }}", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-virtualbox", - "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "type": "virtualbox-iso", - "virtualbox_version_file": ".vbox_version", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<enter><wait><f6><esc><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs>", - "<bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs>", - "<bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs>", - "<bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs>", - "/install/vmlinuz<wait>", - " auto<wait>", - " console-setup/ask_detect=false<wait>", - " console-setup/layoutcode=us<wait>", - " console-setup/modelcode=pc105<wait>", - " debconf/frontend=noninteractive<wait>", - " debian-installer=en_US.UTF-8<wait>", - " fb=false<wait>", - " initrd=/install/initrd.gz<wait>", - " kbd-chooser/method=us<wait>", - " keyboard-configuration/layout=USA<wait>", - " keyboard-configuration/variant=USA<wait>", - " locale=en_US.UTF-8<wait>", - " netcfg/get_domain=vm<wait>", - " netcfg/get_hostname=vagrant<wait>", - " grub-installer/bootdev=/dev/sda<wait>", - " noapic<wait>", - " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}}<wait>", - " -- <wait>", - "<enter><wait>" - ], - "boot_wait": "5s", - "cpus": "{{ user `cpus` }}", - "disk_adapter_type": "sata", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "ubuntu-64", - "headless": "{{ user `headless` }}", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-vmware", - "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "tools_upload_flavor": "linux", - "type": "vmware-iso", - "vm_name": "{{ user `template` }}", - "vmx_data": { - "cpuid.coresPerSocket": "1", - "ethernet0.pciSlotNumber": "32" - }, - "vmx_remove_ethernet_interfaces": true - }, - { - "boot_command": [ - "<enter><wait><f6><esc><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs>", - "<bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs>", - "<bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs>", - "<bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs>", - "/install/vmlinuz<wait>", - " auto<wait>", - " console-setup/ask_detect=false<wait>", - " console-setup/layoutcode=us<wait>", - " console-setup/modelcode=pc105<wait>", - " debconf/frontend=noninteractive<wait>", - " debian-installer=en_US.UTF-8<wait>", - " fb=false<wait>", - " initrd=/install/initrd.gz<wait>", - " kbd-chooser/method=us<wait>", - " keyboard-configuration/layout=USA<wait>", - " keyboard-configuration/variant=USA<wait>", - " locale=en_US.UTF-8<wait>", - " netcfg/get_domain=vm<wait>", - " netcfg/get_hostname=vagrant<wait>", - " grub-installer/bootdev=/dev/sda<wait>", - " noapic<wait>", - " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}}<wait>", - " -- <wait>", - "<enter><wait>" - ], - "boot_wait": "5s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "ubuntu", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-parallels", - "parallels_tools_flavor": "lin", - "prlctl_version_file": ".prlctl_version", - "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "type": "parallels-iso", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<enter><wait><f6><esc><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs>", - "<bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs>", - "<bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs>", - "<bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs>", - "/install/vmlinuz<wait>", - " auto<wait>", - " console-setup/ask_detect=false<wait>", - " console-setup/layoutcode=us<wait>", - " console-setup/modelcode=pc105<wait>", - " debconf/frontend=noninteractive<wait>", - " debian-installer=en_US.UTF-8<wait>", - " fb=false<wait>", - " initrd=/install/initrd.gz<wait>", - " kbd-chooser/method=us<wait>", - " keyboard-configuration/layout=USA<wait>", - " keyboard-configuration/variant=USA<wait>", - " locale=en_US.UTF-8<wait>", - " netcfg/get_domain=vm<wait>", - " netcfg/get_hostname=vagrant<wait>", - " grub-installer/bootdev=/dev/vda<wait>", - " noapic<wait>", - " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}}<wait>", - " -- <wait>", - "<enter><wait>" - ], - "boot_wait": "5s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "headless": "{{ user `headless` }}", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-qemu", - "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "type": "qemu", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<esc><wait10><esc><esc><enter><wait>", - "set gfxpayload=1024x768<enter>", - "linux /install/vmlinuz ", - "preseed/url=http://{{.HTTPIP}}:{{.HTTPPort}}/preseed-hyperv.cfg ", - "debian-installer=en_US auto locale=en_US kbd-chooser/method=us ", - "hostname={{.Name}} ", - "fb=false debconf/frontend=noninteractive ", - "keyboard-configuration/modelcode=SKIP keyboard-configuration/layout=USA ", - "keyboard-configuration/variant=USA console-setup/ask_detect=false <enter>", - "initrd /install/initrd.gz<enter>", - "boot<enter>" - ], - "boot_wait": "5s", - "communicator": "ssh", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "enable_secure_boot": false, - "generation": "{{user `hyperv_generation`}}", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{user `memory`}}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-hyperv", - "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "switch_name": "{{user `hyperv_switch`}}", - "type": "hyperv-iso", - "vm_name": "{{ user `template` }}" - } - ], - "post-processors": [ - { - "output": "{{ user `build_directory` }}/{{user `box_basename`}}.{{.Provider}}.box", - "type": "vagrant" - } - ], - "provisioners": [ - { - "environment_vars": [ - "HOME_DIR=/home/vagrant", - "http_proxy={{user `http_proxy`}}", - "https_proxy={{user `https_proxy`}}", - "no_proxy={{user `no_proxy`}}" - ], - "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", - "expect_disconnect": true, - "scripts": [ - "{{template_dir}}/scripts/update.sh", - "{{template_dir}}/../_common/motd.sh", - "{{template_dir}}/../_common/sshd.sh", - "{{template_dir}}/scripts/networking.sh", - "{{template_dir}}/scripts/sudoers.sh", - "{{template_dir}}/scripts/vagrant.sh", - "{{template_dir}}/../_common/virtualbox.sh", - "{{template_dir}}/scripts/vmware.sh", - "{{template_dir}}/../_common/parallels.sh", - "{{template_dir}}/scripts/hyperv.sh", - "{{template_dir}}/scripts/cleanup.sh", - "{{template_dir}}/../_common/minimize.sh" - ], - "type": "shell" - } - ], - "variables": { - "box_basename": "ubuntu-16.04", - "build_directory": "../../builds", - "build_timestamp": "{{isotime \"20060102150405\"}}", - "cpus": "2", - "disk_size": "65536", - "git_revision": "__unknown_git_revision__", - "guest_additions_url": "", - "headless": "", - "http_directory": "{{template_dir}}/http", - "http_proxy": "{{env `http_proxy`}}", - "https_proxy": "{{env `https_proxy`}}", - "hyperv_generation": "2", - "hyperv_switch": "bento", - "iso_checksum": "b23488689e16cad7a269eb2d3a3bf725d3457ee6b0868e00c8762d3816e25848", - "iso_name": "ubuntu-16.04.7-server-amd64.iso", - "memory": "1024", - "mirror": "http://releases.ubuntu.com", - "mirror_directory": "16.04.7", - "name": "ubuntu-16.04", - "no_proxy": "{{env `no_proxy`}}", - "preseed_path": "preseed.cfg", - "template": "ubuntu-16.04-amd64", - "version": "TIMESTAMP" - } -} diff --git a/packer_templates/ubuntu/ubuntu-16.04-i386.json b/packer_templates/ubuntu/ubuntu-16.04-i386.json deleted file mode 100644 index ca6eb1703..000000000 --- a/packer_templates/ubuntu/ubuntu-16.04-i386.json +++ /dev/null @@ -1,286 +0,0 @@ -{ - "builders": [ - { - "boot_command": [ - "<enter><wait><f6><esc><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs>", - "<bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs>", - "<bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs>", - "<bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs>", - "/install/vmlinuz<wait>", - " auto<wait>", - " console-setup/ask_detect=false<wait>", - " console-setup/layoutcode=us<wait>", - " console-setup/modelcode=pc105<wait>", - " debconf/frontend=noninteractive<wait>", - " debian-installer=en_US.UTF-8<wait>", - " fb=false<wait>", - " initrd=/install/initrd.gz<wait>", - " kbd-chooser/method=us<wait>", - " keyboard-configuration/layout=USA<wait>", - " keyboard-configuration/variant=USA<wait>", - " locale=en_US.UTF-8<wait>", - " netcfg/get_domain=vm<wait>", - " netcfg/get_hostname=vagrant<wait>", - " grub-installer/bootdev=/dev/sda<wait>", - " noapic<wait>", - " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}}<wait>", - " -- <wait>", - "<enter><wait>" - ], - "boot_wait": "5s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", - "guest_additions_url": "{{ user `guest_additions_url` }}", - "guest_os_type": "Ubuntu", - "hard_drive_interface": "sata", - "headless": "{{ user `headless` }}", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-virtualbox", - "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "type": "virtualbox-iso", - "virtualbox_version_file": ".vbox_version", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<enter><wait><f6><esc><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs>", - "<bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs>", - "<bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs>", - "<bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs>", - "/install/vmlinuz<wait>", - " auto<wait>", - " console-setup/ask_detect=false<wait>", - " console-setup/layoutcode=us<wait>", - " console-setup/modelcode=pc105<wait>", - " debconf/frontend=noninteractive<wait>", - " debian-installer=en_US.UTF-8<wait>", - " fb=false<wait>", - " initrd=/install/initrd.gz<wait>", - " kbd-chooser/method=us<wait>", - " keyboard-configuration/layout=USA<wait>", - " keyboard-configuration/variant=USA<wait>", - " locale=en_US.UTF-8<wait>", - " netcfg/get_domain=vm<wait>", - " netcfg/get_hostname=vagrant<wait>", - " grub-installer/bootdev=/dev/sda <wait>", - " noapic<wait>", - " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}}<wait>", - " -- <wait>", - "<enter><wait>" - ], - "boot_wait": "5s", - "cpus": "{{ user `cpus` }}", - "disk_adapter_type": "sata", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "ubuntu", - "headless": "{{ user `headless` }}", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-vmware", - "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "tools_upload_flavor": "linux", - "type": "vmware-iso", - "vm_name": "{{ user `template` }}", - "vmx_data": { - "cpuid.coresPerSocket": "1" - }, - "vmx_remove_ethernet_interfaces": true - }, - { - "boot_command": [ - "<enter><wait><f6><esc><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs>", - "<bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs>", - "<bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs>", - "<bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs>", - "/install/vmlinuz<wait>", - " auto<wait>", - " console-setup/ask_detect=false<wait>", - " console-setup/layoutcode=us<wait>", - " console-setup/modelcode=pc105<wait>", - " debconf/frontend=noninteractive<wait>", - " debian-installer=en_US.UTF-8<wait>", - " fb=false<wait>", - " initrd=/install/initrd.gz<wait>", - " kbd-chooser/method=us<wait>", - " keyboard-configuration/layout=USA<wait>", - " keyboard-configuration/variant=USA<wait>", - " locale=en_US.UTF-8<wait>", - " netcfg/get_domain=vm<wait>", - " netcfg/get_hostname=vagrant<wait>", - " grub-installer/bootdev=/dev/sda <wait>", - " noapic<wait>", - " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}}<wait>", - " -- <wait>", - "<enter><wait>" - ], - "boot_wait": "5s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "ubuntu", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-parallels", - "parallels_tools_flavor": "lin", - "prlctl_version_file": ".prlctl_version", - "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "type": "parallels-iso", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<enter><wait><f6><esc><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs>", - "<bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs>", - "<bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs>", - "<bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs>", - "/install/vmlinuz<wait>", - " auto<wait>", - " console-setup/ask_detect=false<wait>", - " console-setup/layoutcode=us<wait>", - " console-setup/modelcode=pc105<wait>", - " debconf/frontend=noninteractive<wait>", - " debian-installer=en_US.UTF-8<wait>", - " fb=false<wait>", - " initrd=/install/initrd.gz<wait>", - " kbd-chooser/method=us<wait>", - " keyboard-configuration/layout=USA<wait>", - " keyboard-configuration/variant=USA<wait>", - " locale=en_US.UTF-8<wait>", - " netcfg/get_domain=vm<wait>", - " netcfg/get_hostname=vagrant<wait>", - " grub-installer/bootdev=/dev/vda <wait>", - " noapic<wait>", - " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}}<wait>", - " -- <wait>", - "<enter><wait>" - ], - "boot_wait": "5s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "headless": "{{ user `headless` }}", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-qemu", - "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "type": "qemu", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<esc><wait10><esc><esc><enter><wait>", - "set gfxpayload=1024x768<enter>", - "linux /install/vmlinuz ", - "preseed/url=http://{{.HTTPIP}}:{{.HTTPPort}}/preseed-hyperv.cfg ", - "debian-installer=en_US.UTF-8 auto locale=en_US.UTF-8 kbd-chooser/method=us ", - "hostname={{.Name}} ", - "fb=false debconf/frontend=noninteractive ", - "keyboard-configuration/modelcode=SKIP keyboard-configuration/layout=USA ", - "keyboard-configuration/variant=USA console-setup/ask_detect=false <enter>", - "initrd /install/initrd.gz<enter>", - "boot<enter>" - ], - "boot_wait": "5s", - "communicator": "ssh", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "enable_secure_boot": false, - "generation": "{{user `hyperv_generation`}}", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{user `memory`}}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-hyperv", - "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "switch_name": "{{user `hyperv_switch`}}", - "type": "hyperv-iso", - "vm_name": "{{ user `template` }}" - } - ], - "post-processors": [ - { - "output": "{{ user `build_directory` }}/{{user `box_basename`}}.{{.Provider}}.box", - "type": "vagrant" - } - ], - "provisioners": [ - { - "environment_vars": [ - "HOME_DIR=/home/vagrant", - "http_proxy={{user `http_proxy`}}", - "https_proxy={{user `https_proxy`}}", - "no_proxy={{user `no_proxy`}}" - ], - "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", - "expect_disconnect": true, - "scripts": [ - "{{template_dir}}/scripts/update.sh", - "{{template_dir}}/../_common/motd.sh", - "{{template_dir}}/../_common/sshd.sh", - "{{template_dir}}/scripts/networking.sh", - "{{template_dir}}/scripts/sudoers.sh", - "{{template_dir}}/scripts/vagrant.sh", - "{{template_dir}}/../_common/virtualbox.sh", - "{{template_dir}}/scripts/vmware.sh", - "{{template_dir}}/../_common/parallels.sh", - "{{template_dir}}/scripts/hyperv.sh", - "{{template_dir}}/scripts/cleanup.sh", - "{{template_dir}}/../_common/minimize.sh" - ], - "type": "shell" - } - ], - "variables": { - "box_basename": "ubuntu-16.04-i386", - "build_directory": "../../builds", - "build_timestamp": "{{isotime \"20060102150405\"}}", - "cpus": "2", - "disk_size": "65536", - "git_revision": "__unknown_git_revision__", - "guest_additions_url": "", - "headless": "", - "http_directory": "{{template_dir}}/http", - "http_proxy": "{{env `http_proxy`}}", - "https_proxy": "{{env `https_proxy`}}", - "hyperv_generation": "1", - "hyperv_switch": "bento", - "iso_checksum": "7509cabb2f9f6ba0a95f8454d432be2ef26679d31ce35baa626acc5321460fab", - "iso_name": "ubuntu-16.04.6-server-i386.iso", - "memory": "1024", - "mirror": "http://releases.ubuntu.com/releases", - "mirror_directory": "16.04.6", - "name": "ubuntu-16.04-i386", - "no_proxy": "{{env `no_proxy`}}", - "preseed_path": "preseed.cfg", - "template": "ubuntu-16.04-i386", - "version": "TIMESTAMP" - } -} From 503b53f70ae9b7e833b8cb57ff5bb0fe2f2b89cb Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith@chef.io> Date: Mon, 24 May 2021 21:08:48 -0700 Subject: [PATCH 1376/1622] Resolve cookstyle warnings Signed-off-by: Tim Smith <tsmith@chef.io> --- packer_templates/windows/cookbooks/packer/recipes/cleanup.rb | 2 +- packer_templates/windows/cookbooks/packer/recipes/updates.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packer_templates/windows/cookbooks/packer/recipes/cleanup.rb b/packer_templates/windows/cookbooks/packer/recipes/cleanup.rb index bca0e1eeb..b2e47e142 100644 --- a/packer_templates/windows/cookbooks/packer/recipes/cleanup.rb +++ b/packer_templates/windows/cookbooks/packer/recipes/cleanup.rb @@ -76,4 +76,4 @@ type: :string, data: '', }] -end \ No newline at end of file +end diff --git a/packer_templates/windows/cookbooks/packer/recipes/updates.rb b/packer_templates/windows/cookbooks/packer/recipes/updates.rb index 7bf0ed514..f602be4db 100644 --- a/packer_templates/windows/cookbooks/packer/recipes/updates.rb +++ b/packer_templates/windows/cookbooks/packer/recipes/updates.rb @@ -10,4 +10,4 @@ source 'http://download.windowsupdate.com/d/msdownload/update/software/updt/2020/04/windows10.0-kb4550947-x64_f2ec932f8fb2be82d2f430b5dcd1ec4b92a7611c.msu' action :install end -end \ No newline at end of file +end From 2b29b1d918d6dfcae22afa3e52946d38b834afd0 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith@chef.io> Date: Tue, 25 May 2021 12:18:36 -0700 Subject: [PATCH 1377/1622] Fix cleanup script to work on Ubuntu 21.04 Signed-off-by: Tim Smith <tsmith@chef.io> --- packer_templates/ubuntu/scripts/cleanup.sh | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/packer_templates/ubuntu/scripts/cleanup.sh b/packer_templates/ubuntu/scripts/cleanup.sh index aa30ccbe1..035619ce1 100644 --- a/packer_templates/ubuntu/scripts/cleanup.sh +++ b/packer_templates/ubuntu/scripts/cleanup.sh @@ -45,7 +45,11 @@ echo "remove obsolete networking packages" apt-get -y purge ppp pppconfig pppoeconf; echo "remove packages we don't need" -apt-get -y purge popularity-contest installation-report command-not-found friendly-recovery bash-completion fonts-ubuntu-font-family-console laptop-detect motd-news-config usbutils grub-legacy-ec2; +apt-get -y purge popularity-contest command-not-found friendly-recovery bash-completion fonts-ubuntu-font-family-console laptop-detect motd-news-config usbutils grub-legacy-ec2 + +# 21.04+ don't have this +echo "remove the installation-report" +apt-get -y purge popularity-contest installation-report || true; echo "remove the console font" apt-get -y purge fonts-ubuntu-console || true; @@ -91,4 +95,4 @@ rm -f /var/lib/systemd/random-seed echo "clear the history so our install isn't there" rm -f /root/.wget-hsts -export HISTSIZE=0 \ No newline at end of file +export HISTSIZE=0 From 2ac5028a770e30ba2984cbcacd8d7d9e61ef5e5d Mon Sep 17 00:00:00 2001 From: Sergey Klimchuk <sergey.klimchuk@gmail.com> Date: Tue, 25 May 2021 23:15:37 +0300 Subject: [PATCH 1378/1622] Add Rocky Linux 8.3 x86_6 Signed-off-by: Sergey Klimchuk <sergey.klimchuk@gmail.com> --- packer_templates/rocky/http/8/ks.cfg | 77 ++++++++ packer_templates/rocky/rocky-8.3-x86_64.json | 176 +++++++++++++++++++ packer_templates/rocky/scripts/cleanup.sh | 113 ++++++++++++ packer_templates/rocky/scripts/networking.sh | 27 +++ packer_templates/rocky/scripts/update.sh | 21 +++ 5 files changed, 414 insertions(+) create mode 100644 packer_templates/rocky/http/8/ks.cfg create mode 100644 packer_templates/rocky/rocky-8.3-x86_64.json create mode 100644 packer_templates/rocky/scripts/cleanup.sh create mode 100644 packer_templates/rocky/scripts/networking.sh create mode 100644 packer_templates/rocky/scripts/update.sh diff --git a/packer_templates/rocky/http/8/ks.cfg b/packer_templates/rocky/http/8/ks.cfg new file mode 100644 index 000000000..595f4950f --- /dev/null +++ b/packer_templates/rocky/http/8/ks.cfg @@ -0,0 +1,77 @@ +install +cdrom +lang en_US.UTF-8 +keyboard us +network --bootproto=dhcp --noipv6 --onboot=on --device=eth0 +rootpw --plaintext vagrant +firewall --disabled +selinux --permissive +timezone UTC +bootloader --timeout=1 --location=mbr --append="net.ifnames=0 biosdevname=0" +text +skipx +zerombr +clearpart --all --initlabel +autopart --nohome --nolvm --noboot +firstboot --disabled +reboot --eject +user --name=vagrant --plaintext --password vagrant + +%packages --ignoremissing --excludedocs --instLangs=en_US.utf8 +# vagrant needs this to copy initial files via scp +openssh-clients +sudo +selinux-policy-devel +wget +nfs-utils +net-tools +tar +bzip2 +deltarpm +rsync +dnf-utils +redhat-lsb-core +elfutils-libelf-devel +network-scripts +-fprintd-pam +-intltool +-iwl*-firmware +-microcode_ctl +%end + +%post +# sudo +echo 'Defaults:vagrant !requiretty' > /etc/sudoers.d/vagrant +echo '%vagrant ALL=(ALL) NOPASSWD: ALL' >> /etc/sudoers.d/vagrant +chmod 440 /etc/sudoers.d/vagrant + +# Enable hyper-v daemons only if using hyper-v virtualization +if [ $(virt-what) == "hyperv" ]; then + dnf -y install hyperv-daemons cifs-utils + systemctl enable hypervvssd + systemctl enable hypervkvpd +fi + +# Since we disable consistent network naming, we need to make sure the eth0 +# configuration file is in place so it will come up. +# Delete other network configuration first because RHEL/C7 networking will not +# restart successfully if there are configuration files for devices that do not +# exist. +rm -f /etc/sysconfig/network-scripts/ifcfg-e* +cat > /etc/sysconfig/network-scripts/ifcfg-eth0 << _EOF_ +TYPE=Ethernet +PROXY_METHOD=none +BROWSER_ONLY=no +BOOTPROTO=dhcp +DEFROUTE=yes +IPV4_FAILURE_FATAL=no +IPV6INIT=yes +IPV6_AUTOCONF=yes +IPV6_DEFROUTE=yes +IPV6_FAILURE_FATAL=no +IPV6_ADDR_GEN_MODE=stable-privacy +NAME=eth0 +DEVICE=eth0 +ONBOOT=yes +_EOF_ +%end diff --git a/packer_templates/rocky/rocky-8.3-x86_64.json b/packer_templates/rocky/rocky-8.3-x86_64.json new file mode 100644 index 000000000..449abc692 --- /dev/null +++ b/packer_templates/rocky/rocky-8.3-x86_64.json @@ -0,0 +1,176 @@ +{ + "builders": [ + { + "boot_command": "{{ user `boot_command` }}", + "boot_wait": "5s", + "cpus": "{{ user `cpus` }}", + "disk_size": "{{user `disk_size`}}", + "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "guest_additions_url": "{{ user `guest_additions_url` }}", + "guest_os_type": "RedHat_64", + "hard_drive_interface": "sata", + "headless": "{{ user `headless` }}", + "http_directory": "{{user `http_directory`}}", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "memory": "{{ user `memory` }}", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-virtualbox", + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_timeout": "10000s", + "ssh_username": "vagrant", + "type": "virtualbox-iso", + "virtualbox_version_file": ".vbox_version", + "vm_name": "{{ user `template` }}" + }, + { + "boot_command": "{{ user `boot_command` }}", + "boot_wait": "5s", + "cpus": "{{ user `cpus` }}", + "disk_size": "{{user `disk_size`}}", + "guest_os_type": "centos-64", + "headless": "{{ user `headless` }}", + "http_directory": "{{user `http_directory`}}", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "memory": "{{ user `memory` }}", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-vmware", + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_timeout": "10000s", + "ssh_username": "vagrant", + "tools_upload_flavor": "linux", + "type": "vmware-iso", + "vm_name": "{{ user `template` }}", + "vmx_data": { + "cpuid.coresPerSocket": "1" + }, + "vmx_remove_ethernet_interfaces": true + }, + { + "boot_command": "{{user `boot_command`}}", + "boot_wait": "5s", + "cpus": "{{ user `cpus` }}", + "disk_size": "{{user `disk_size`}}", + "guest_os_type": "centos", + "http_directory": "{{user `http_directory`}}", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "memory": "{{ user `memory` }}", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-parallels", + "parallels_tools_flavor": "lin", + "prlctl_version_file": ".prlctl_version", + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_timeout": "10000s", + "ssh_username": "vagrant", + "type": "parallels-iso", + "vm_name": "{{ user `template` }}" + }, + { + "boot_command": [ + "<wait5><up><wait5><tab> text ks=hd:fd0:/ks.cfg<enter><wait5><esc>" + ], + "boot_wait": "5s", + "cpus": "{{ user `cpus` }}", + "disk_size": "{{user `disk_size`}}", + "floppy_files": [ + "{{user `http_directory`}}/{{user `ks_path`}}" + ], + "generation": "{{user `hyperv_generation`}}", + "guest_additions_mode": "disable", + "http_directory": "{{user `http_directory`}}", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "memory": "{{ user `memory` }}", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-hyperv", + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_timeout": "10000s", + "ssh_username": "vagrant", + "switch_name": "{{ user `hyperv_switch`}}", + "type": "hyperv-iso", + "vm_name": "{{ user `template` }}" + }, + { + "boot_command": "{{ user `boot_command` }}", + "boot_wait": "5s", + "cpus": "{{ user `cpus` }}", + "disk_size": "{{user `disk_size`}}", + "headless": "{{ user `headless` }}", + "http_directory": "{{user `http_directory`}}", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "memory": "{{ user `memory` }}", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-qemu", + "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_timeout": "10000s", + "ssh_username": "vagrant", + "type": "qemu", + "vm_name": "{{ user `template` }}" + } + ], + "post-processors": [ + { + "output": "{{ user `build_directory` }}/{{user `box_basename`}}.{{.Provider}}.box", + "type": "vagrant" + } + ], + "provisioners": [ + { + "environment_vars": [ + "HOME_DIR=/home/vagrant", + "http_proxy={{user `http_proxy`}}", + "https_proxy={{user `https_proxy`}}", + "no_proxy={{user `no_proxy`}}" + ], + "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", + "expect_disconnect": true, + "scripts": [ + "{{template_dir}}/scripts/update.sh", + "{{template_dir}}/../_common/motd.sh", + "{{template_dir}}/../_common/sshd.sh", + "{{template_dir}}/scripts/networking.sh", + "{{template_dir}}/../_common/vagrant.sh", + "{{template_dir}}/../_common/virtualbox.sh", + "{{template_dir}}/../_common/vmware.sh", + "{{template_dir}}/../_common/parallels.sh", + "{{template_dir}}/scripts/cleanup.sh", + "{{template_dir}}/../_common/minimize.sh" + ], + "type": "shell" + } + ], + "variables": { + "box_basename": "rocky-8.3", + "build_directory": "../../builds", + "build_timestamp": "{{isotime \"2019102650405\"}}", + "cpus": "2", + "disk_size": "65536", + "git_revision": "__unknown_git_revision__", + "guest_additions_url": "", + "headless": "", + "http_directory": "{{template_dir}}/http", + "http_proxy": "{{env `http_proxy`}}", + "https_proxy": "{{env `https_proxy`}}", + "hyperv_generation": "1", + "hyperv_switch": "bento", + "iso_checksum": "4be83f5edf28209ce5caa06995c1c3fc5112d0d260b9e8c1cc2fecd384abcee0", + "iso_name": "Rocky-8.3-x86_64-dvd1.iso", + "ks_path": "8/ks.cfg", + "memory": "1024", + "mirror": "http://download.rockylinux.org/pub/rocky", + "mirror_directory": "8.3/isos/x86_64", + "name": "rocky-8.3", + "no_proxy": "{{env `no_proxy`}}", + "template": "rocky-8.3-x86_64", + "boot_command": "<up><wait><tab> inst.text inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>", + "version": "TIMESTAMP" + } +} diff --git a/packer_templates/rocky/scripts/cleanup.sh b/packer_templates/rocky/scripts/cleanup.sh new file mode 100644 index 000000000..0651a7c04 --- /dev/null +++ b/packer_templates/rocky/scripts/cleanup.sh @@ -0,0 +1,113 @@ +#!/bin/sh -eux + +# should output one of 'redhat' 'centos' 'oraclelinux' +distro="`rpm -qf --queryformat '%{NAME}' /etc/redhat-release | cut -f 1 -d '-'`" + +major_version="`sed 's/^.\+ release \([.0-9]\+\).*/\1/' /etc/redhat-release | awk -F. '{print $1}'`"; + + +echo "reduce the grub menu time to 1 second" +if ! [ "$major_version" -eq 6 ]; then + sed -i -e 's/^GRUB_TIMEOUT=[0-9]\+$/GRUB_TIMEOUT=1/' /etc/default/grub + grub2-mkconfig -o /boot/grub2/grub.cfg +fi + +# make sure we use dnf on EL 8+ +if [ "$major_version" -ge 8 ]; then + pkg_cmd="dnf" +else + pkg_cmd="yum" +fi + + +echo "Remove development and kernel source packages" +$pkg_cmd -y remove gcc cpp gc kernel-devel kernel-headers glibc-devel elfutils-libelf-devel glibc-headers kernel-devel kernel-headers + +if [ "$major_version" -ge 8 ]; then + echo "remove orphaned packages" + dnf -y autoremove + echo "Remove previous kernels that preserved for rollbacks" + dnf -y remove -y $(dnf repoquery --installonly --latest-limit=-1 -q) +else + echo "Remove previous kernels that preserved for rollbacks" + if ! command -v package-cleanup >/dev/null 2>&1; then + yum -y install yum-utils + fi + package-cleanup --oldkernels --count=1 -y +fi + +# Avoid ~200 meg firmware package we don't need +# this cannot be done in the KS file so we do it here +echo "Removing extra firmware packages" +$pkg_cmd -y remove linux-firmware + +if [ "$distro" != 'redhat' ]; then + echo "clean all package cache information" + $pkg_cmd -y clean all --enablerepo=\*; +fi + +# Clean up network interface persistence +rm -f /etc/udev/rules.d/70-persistent-net.rules; +mkdir -p /etc/udev/rules.d/70-persistent-net.rules; +rm -f /lib/udev/rules.d/75-persistent-net-generator.rules; +rm -rf /dev/.udev/; + +for ndev in `ls -1 /etc/sysconfig/network-scripts/ifcfg-*`; do + if [ "`basename $ndev`" != "ifcfg-lo" ]; then + sed -i '/^HWADDR/d' "$ndev"; + sed -i '/^UUID/d' "$ndev"; + fi +done + +# new-style network device naming for centos7 +if [ "$major_version" -eq 7 ]; then + # radio off & remove all interface configration + nmcli radio all off + /bin/systemctl stop NetworkManager.service + for ifcfg in `ls /etc/sysconfig/network-scripts/ifcfg-* |grep -v ifcfg-lo` ; do + rm -f $ifcfg + done + rm -rf /var/lib/NetworkManager/* + + echo "==> Setup /etc/rc.d/rc.local for EL7" + cat <<_EOF_ | cat >> /etc/rc.d/rc.local +#BENTO-BEGIN +LANG=C +# delete all connection +for con in \`nmcli -t -f uuid con\`; do + if [ "\$con" != "" ]; then + nmcli con del \$con + fi +done +# add gateway interface connection. +gwdev=\`nmcli dev | grep ethernet | egrep -v 'unmanaged' | head -n 1 | awk '{print \$1}'\` +if [ "\$gwdev" != "" ]; then + nmcli connection add type ethernet ifname \$gwdev con-name \$gwdev +fi +sed -i "/^#BENTO-BEGIN/,/^#BENTO-END/d" /etc/rc.d/rc.local +chmod -x /etc/rc.d/rc.local +#BENTO-END +_EOF_ + chmod +x /etc/rc.d/rc.local +fi + +echo "truncate any logs that have built up during the install" +find /var/log -type f -exec truncate --size=0 {} \; + +echo "remove the install log" +rm -f /root/anaconda-ks.cfg /root/original-ks.cfg + +echo "remove the contents of /tmp and /var/tmp" +rm -rf /tmp/* /var/tmp/* + +if [ "$major_version" -ge 7 ]; then + echo "Force a new random seed to be generated" + rm -f /var/lib/systemd/random-seed + + echo "Wipe netplan machine-id (DUID) so machines get unique ID generated on boot" + truncate -s 0 /etc/machine-id +fi + +echo "Clear the history so our install commands aren't there" +rm -f /root/.wget-hsts +export HISTSIZE=0 \ No newline at end of file diff --git a/packer_templates/rocky/scripts/networking.sh b/packer_templates/rocky/scripts/networking.sh new file mode 100644 index 000000000..de35e787d --- /dev/null +++ b/packer_templates/rocky/scripts/networking.sh @@ -0,0 +1,27 @@ +#!/bin/sh -eux + +case "$PACKER_BUILDER_TYPE" in + +virtualbox-iso|virtualbox-ovf) + # Fix slow DNS: + # Add 'single-request-reopen' so it is included when /etc/resolv.conf is + # generated + # https://access.redhat.com/site/solutions/58625 (subscription required) + + echo 'RES_OPTIONS="single-request-reopen"' >>/etc/sysconfig/network; + + # determine the major EL version we're runninng + major_version="`sed 's/^.\+ release \([.0-9]\+\).*/\1/' /etc/redhat-release | awk -F. '{print $1}'`"; + + if [ "$major_version" -ge 8 ]; then + nmcli networking off + sleep 5 + nmcli networking on + else + service network restart; + fi + + echo 'Slow DNS fix applied (single-request-reopen)'; + ;; + +esac diff --git a/packer_templates/rocky/scripts/update.sh b/packer_templates/rocky/scripts/update.sh new file mode 100644 index 000000000..fe6b85f89 --- /dev/null +++ b/packer_templates/rocky/scripts/update.sh @@ -0,0 +1,21 @@ +#!/bin/sh -eux + +# determine the major EL version we're runninng +major_version="`sed 's/^.\+ release \([.0-9]\+\).*/\1/' /etc/redhat-release | awk -F. '{print $1}'`"; + +# make sure we use dnf on EL 8+ +if [ "$major_version" -ge 8 ]; then + dnf -y update +else + yum -y update +fi + +# Updating the oracle release on at least OL 6 updates the repos and unlocks a whole +# new set of updates that need to be applied. If this script is there it should be run +if [ -f "/usr/bin/ol_yum_configure.sh" ]; then + /usr/bin/ol_yum_configure.sh + yum -y update +fi + +reboot; +sleep 60; From 660b287d373a8229e07eb6aaf26bb5115c4803f4 Mon Sep 17 00:00:00 2001 From: Sergey Klimchuk <sergey.klimchuk@gmail.com> Date: Wed, 26 May 2021 12:35:08 +0300 Subject: [PATCH 1379/1622] Removed duplicates from centos 8 provision --- packer_templates/rocky/http/8/ks.cfg | 77 ------------- packer_templates/rocky/scripts/cleanup.sh | 113 ------------------- packer_templates/rocky/scripts/networking.sh | 27 ----- packer_templates/rocky/scripts/update.sh | 21 ---- 4 files changed, 238 deletions(-) delete mode 100644 packer_templates/rocky/http/8/ks.cfg delete mode 100644 packer_templates/rocky/scripts/cleanup.sh delete mode 100644 packer_templates/rocky/scripts/networking.sh delete mode 100644 packer_templates/rocky/scripts/update.sh diff --git a/packer_templates/rocky/http/8/ks.cfg b/packer_templates/rocky/http/8/ks.cfg deleted file mode 100644 index 595f4950f..000000000 --- a/packer_templates/rocky/http/8/ks.cfg +++ /dev/null @@ -1,77 +0,0 @@ -install -cdrom -lang en_US.UTF-8 -keyboard us -network --bootproto=dhcp --noipv6 --onboot=on --device=eth0 -rootpw --plaintext vagrant -firewall --disabled -selinux --permissive -timezone UTC -bootloader --timeout=1 --location=mbr --append="net.ifnames=0 biosdevname=0" -text -skipx -zerombr -clearpart --all --initlabel -autopart --nohome --nolvm --noboot -firstboot --disabled -reboot --eject -user --name=vagrant --plaintext --password vagrant - -%packages --ignoremissing --excludedocs --instLangs=en_US.utf8 -# vagrant needs this to copy initial files via scp -openssh-clients -sudo -selinux-policy-devel -wget -nfs-utils -net-tools -tar -bzip2 -deltarpm -rsync -dnf-utils -redhat-lsb-core -elfutils-libelf-devel -network-scripts --fprintd-pam --intltool --iwl*-firmware --microcode_ctl -%end - -%post -# sudo -echo 'Defaults:vagrant !requiretty' > /etc/sudoers.d/vagrant -echo '%vagrant ALL=(ALL) NOPASSWD: ALL' >> /etc/sudoers.d/vagrant -chmod 440 /etc/sudoers.d/vagrant - -# Enable hyper-v daemons only if using hyper-v virtualization -if [ $(virt-what) == "hyperv" ]; then - dnf -y install hyperv-daemons cifs-utils - systemctl enable hypervvssd - systemctl enable hypervkvpd -fi - -# Since we disable consistent network naming, we need to make sure the eth0 -# configuration file is in place so it will come up. -# Delete other network configuration first because RHEL/C7 networking will not -# restart successfully if there are configuration files for devices that do not -# exist. -rm -f /etc/sysconfig/network-scripts/ifcfg-e* -cat > /etc/sysconfig/network-scripts/ifcfg-eth0 << _EOF_ -TYPE=Ethernet -PROXY_METHOD=none -BROWSER_ONLY=no -BOOTPROTO=dhcp -DEFROUTE=yes -IPV4_FAILURE_FATAL=no -IPV6INIT=yes -IPV6_AUTOCONF=yes -IPV6_DEFROUTE=yes -IPV6_FAILURE_FATAL=no -IPV6_ADDR_GEN_MODE=stable-privacy -NAME=eth0 -DEVICE=eth0 -ONBOOT=yes -_EOF_ -%end diff --git a/packer_templates/rocky/scripts/cleanup.sh b/packer_templates/rocky/scripts/cleanup.sh deleted file mode 100644 index 0651a7c04..000000000 --- a/packer_templates/rocky/scripts/cleanup.sh +++ /dev/null @@ -1,113 +0,0 @@ -#!/bin/sh -eux - -# should output one of 'redhat' 'centos' 'oraclelinux' -distro="`rpm -qf --queryformat '%{NAME}' /etc/redhat-release | cut -f 1 -d '-'`" - -major_version="`sed 's/^.\+ release \([.0-9]\+\).*/\1/' /etc/redhat-release | awk -F. '{print $1}'`"; - - -echo "reduce the grub menu time to 1 second" -if ! [ "$major_version" -eq 6 ]; then - sed -i -e 's/^GRUB_TIMEOUT=[0-9]\+$/GRUB_TIMEOUT=1/' /etc/default/grub - grub2-mkconfig -o /boot/grub2/grub.cfg -fi - -# make sure we use dnf on EL 8+ -if [ "$major_version" -ge 8 ]; then - pkg_cmd="dnf" -else - pkg_cmd="yum" -fi - - -echo "Remove development and kernel source packages" -$pkg_cmd -y remove gcc cpp gc kernel-devel kernel-headers glibc-devel elfutils-libelf-devel glibc-headers kernel-devel kernel-headers - -if [ "$major_version" -ge 8 ]; then - echo "remove orphaned packages" - dnf -y autoremove - echo "Remove previous kernels that preserved for rollbacks" - dnf -y remove -y $(dnf repoquery --installonly --latest-limit=-1 -q) -else - echo "Remove previous kernels that preserved for rollbacks" - if ! command -v package-cleanup >/dev/null 2>&1; then - yum -y install yum-utils - fi - package-cleanup --oldkernels --count=1 -y -fi - -# Avoid ~200 meg firmware package we don't need -# this cannot be done in the KS file so we do it here -echo "Removing extra firmware packages" -$pkg_cmd -y remove linux-firmware - -if [ "$distro" != 'redhat' ]; then - echo "clean all package cache information" - $pkg_cmd -y clean all --enablerepo=\*; -fi - -# Clean up network interface persistence -rm -f /etc/udev/rules.d/70-persistent-net.rules; -mkdir -p /etc/udev/rules.d/70-persistent-net.rules; -rm -f /lib/udev/rules.d/75-persistent-net-generator.rules; -rm -rf /dev/.udev/; - -for ndev in `ls -1 /etc/sysconfig/network-scripts/ifcfg-*`; do - if [ "`basename $ndev`" != "ifcfg-lo" ]; then - sed -i '/^HWADDR/d' "$ndev"; - sed -i '/^UUID/d' "$ndev"; - fi -done - -# new-style network device naming for centos7 -if [ "$major_version" -eq 7 ]; then - # radio off & remove all interface configration - nmcli radio all off - /bin/systemctl stop NetworkManager.service - for ifcfg in `ls /etc/sysconfig/network-scripts/ifcfg-* |grep -v ifcfg-lo` ; do - rm -f $ifcfg - done - rm -rf /var/lib/NetworkManager/* - - echo "==> Setup /etc/rc.d/rc.local for EL7" - cat <<_EOF_ | cat >> /etc/rc.d/rc.local -#BENTO-BEGIN -LANG=C -# delete all connection -for con in \`nmcli -t -f uuid con\`; do - if [ "\$con" != "" ]; then - nmcli con del \$con - fi -done -# add gateway interface connection. -gwdev=\`nmcli dev | grep ethernet | egrep -v 'unmanaged' | head -n 1 | awk '{print \$1}'\` -if [ "\$gwdev" != "" ]; then - nmcli connection add type ethernet ifname \$gwdev con-name \$gwdev -fi -sed -i "/^#BENTO-BEGIN/,/^#BENTO-END/d" /etc/rc.d/rc.local -chmod -x /etc/rc.d/rc.local -#BENTO-END -_EOF_ - chmod +x /etc/rc.d/rc.local -fi - -echo "truncate any logs that have built up during the install" -find /var/log -type f -exec truncate --size=0 {} \; - -echo "remove the install log" -rm -f /root/anaconda-ks.cfg /root/original-ks.cfg - -echo "remove the contents of /tmp and /var/tmp" -rm -rf /tmp/* /var/tmp/* - -if [ "$major_version" -ge 7 ]; then - echo "Force a new random seed to be generated" - rm -f /var/lib/systemd/random-seed - - echo "Wipe netplan machine-id (DUID) so machines get unique ID generated on boot" - truncate -s 0 /etc/machine-id -fi - -echo "Clear the history so our install commands aren't there" -rm -f /root/.wget-hsts -export HISTSIZE=0 \ No newline at end of file diff --git a/packer_templates/rocky/scripts/networking.sh b/packer_templates/rocky/scripts/networking.sh deleted file mode 100644 index de35e787d..000000000 --- a/packer_templates/rocky/scripts/networking.sh +++ /dev/null @@ -1,27 +0,0 @@ -#!/bin/sh -eux - -case "$PACKER_BUILDER_TYPE" in - -virtualbox-iso|virtualbox-ovf) - # Fix slow DNS: - # Add 'single-request-reopen' so it is included when /etc/resolv.conf is - # generated - # https://access.redhat.com/site/solutions/58625 (subscription required) - - echo 'RES_OPTIONS="single-request-reopen"' >>/etc/sysconfig/network; - - # determine the major EL version we're runninng - major_version="`sed 's/^.\+ release \([.0-9]\+\).*/\1/' /etc/redhat-release | awk -F. '{print $1}'`"; - - if [ "$major_version" -ge 8 ]; then - nmcli networking off - sleep 5 - nmcli networking on - else - service network restart; - fi - - echo 'Slow DNS fix applied (single-request-reopen)'; - ;; - -esac diff --git a/packer_templates/rocky/scripts/update.sh b/packer_templates/rocky/scripts/update.sh deleted file mode 100644 index fe6b85f89..000000000 --- a/packer_templates/rocky/scripts/update.sh +++ /dev/null @@ -1,21 +0,0 @@ -#!/bin/sh -eux - -# determine the major EL version we're runninng -major_version="`sed 's/^.\+ release \([.0-9]\+\).*/\1/' /etc/redhat-release | awk -F. '{print $1}'`"; - -# make sure we use dnf on EL 8+ -if [ "$major_version" -ge 8 ]; then - dnf -y update -else - yum -y update -fi - -# Updating the oracle release on at least OL 6 updates the repos and unlocks a whole -# new set of updates that need to be applied. If this script is there it should be run -if [ -f "/usr/bin/ol_yum_configure.sh" ]; then - /usr/bin/ol_yum_configure.sh - yum -y update -fi - -reboot; -sleep 60; From 07a4f9b6fd5da470ca880bb99dec0c5eee8abda0 Mon Sep 17 00:00:00 2001 From: Sergey Klimchuk <sergey.klimchuk@gmail.com> Date: Wed, 26 May 2021 12:36:49 +0300 Subject: [PATCH 1380/1622] Removed old Rocky config --- packer_templates/rocky/rocky-8.3-x86_64.json | 176 ------------------- 1 file changed, 176 deletions(-) delete mode 100644 packer_templates/rocky/rocky-8.3-x86_64.json diff --git a/packer_templates/rocky/rocky-8.3-x86_64.json b/packer_templates/rocky/rocky-8.3-x86_64.json deleted file mode 100644 index 449abc692..000000000 --- a/packer_templates/rocky/rocky-8.3-x86_64.json +++ /dev/null @@ -1,176 +0,0 @@ -{ - "builders": [ - { - "boot_command": "{{ user `boot_command` }}", - "boot_wait": "5s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", - "guest_additions_url": "{{ user `guest_additions_url` }}", - "guest_os_type": "RedHat_64", - "hard_drive_interface": "sata", - "headless": "{{ user `headless` }}", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-virtualbox", - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "type": "virtualbox-iso", - "virtualbox_version_file": ".vbox_version", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": "{{ user `boot_command` }}", - "boot_wait": "5s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "centos-64", - "headless": "{{ user `headless` }}", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-vmware", - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "tools_upload_flavor": "linux", - "type": "vmware-iso", - "vm_name": "{{ user `template` }}", - "vmx_data": { - "cpuid.coresPerSocket": "1" - }, - "vmx_remove_ethernet_interfaces": true - }, - { - "boot_command": "{{user `boot_command`}}", - "boot_wait": "5s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "centos", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-parallels", - "parallels_tools_flavor": "lin", - "prlctl_version_file": ".prlctl_version", - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "type": "parallels-iso", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<wait5><up><wait5><tab> text ks=hd:fd0:/ks.cfg<enter><wait5><esc>" - ], - "boot_wait": "5s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "floppy_files": [ - "{{user `http_directory`}}/{{user `ks_path`}}" - ], - "generation": "{{user `hyperv_generation`}}", - "guest_additions_mode": "disable", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-hyperv", - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "switch_name": "{{ user `hyperv_switch`}}", - "type": "hyperv-iso", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": "{{ user `boot_command` }}", - "boot_wait": "5s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "headless": "{{ user `headless` }}", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-qemu", - "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "type": "qemu", - "vm_name": "{{ user `template` }}" - } - ], - "post-processors": [ - { - "output": "{{ user `build_directory` }}/{{user `box_basename`}}.{{.Provider}}.box", - "type": "vagrant" - } - ], - "provisioners": [ - { - "environment_vars": [ - "HOME_DIR=/home/vagrant", - "http_proxy={{user `http_proxy`}}", - "https_proxy={{user `https_proxy`}}", - "no_proxy={{user `no_proxy`}}" - ], - "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", - "expect_disconnect": true, - "scripts": [ - "{{template_dir}}/scripts/update.sh", - "{{template_dir}}/../_common/motd.sh", - "{{template_dir}}/../_common/sshd.sh", - "{{template_dir}}/scripts/networking.sh", - "{{template_dir}}/../_common/vagrant.sh", - "{{template_dir}}/../_common/virtualbox.sh", - "{{template_dir}}/../_common/vmware.sh", - "{{template_dir}}/../_common/parallels.sh", - "{{template_dir}}/scripts/cleanup.sh", - "{{template_dir}}/../_common/minimize.sh" - ], - "type": "shell" - } - ], - "variables": { - "box_basename": "rocky-8.3", - "build_directory": "../../builds", - "build_timestamp": "{{isotime \"2019102650405\"}}", - "cpus": "2", - "disk_size": "65536", - "git_revision": "__unknown_git_revision__", - "guest_additions_url": "", - "headless": "", - "http_directory": "{{template_dir}}/http", - "http_proxy": "{{env `http_proxy`}}", - "https_proxy": "{{env `https_proxy`}}", - "hyperv_generation": "1", - "hyperv_switch": "bento", - "iso_checksum": "4be83f5edf28209ce5caa06995c1c3fc5112d0d260b9e8c1cc2fecd384abcee0", - "iso_name": "Rocky-8.3-x86_64-dvd1.iso", - "ks_path": "8/ks.cfg", - "memory": "1024", - "mirror": "http://download.rockylinux.org/pub/rocky", - "mirror_directory": "8.3/isos/x86_64", - "name": "rocky-8.3", - "no_proxy": "{{env `no_proxy`}}", - "template": "rocky-8.3-x86_64", - "boot_command": "<up><wait><tab> inst.text inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>", - "version": "TIMESTAMP" - } -} From dedc0a10610557410ad548e5de2b240e2c58d5b7 Mon Sep 17 00:00:00 2001 From: Sergey Klimchuk <sergey.klimchuk@gmail.com> Date: Wed, 26 May 2021 12:39:15 +0300 Subject: [PATCH 1381/1622] Add Rocky Linux 8.3 x86_64 Signed-off-by: Sergey Klimchuk <sergey.klimchuk@gmail.com> --- packer_templates/rocky/rocky-8.3-x86_64.json | 176 +++++++++++++++++++ 1 file changed, 176 insertions(+) create mode 100644 packer_templates/rocky/rocky-8.3-x86_64.json diff --git a/packer_templates/rocky/rocky-8.3-x86_64.json b/packer_templates/rocky/rocky-8.3-x86_64.json new file mode 100644 index 000000000..2eb706b4d --- /dev/null +++ b/packer_templates/rocky/rocky-8.3-x86_64.json @@ -0,0 +1,176 @@ +{ + "builders": [ + { + "boot_command": "{{ user `boot_command` }}", + "boot_wait": "5s", + "cpus": "{{ user `cpus` }}", + "disk_size": "{{user `disk_size`}}", + "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "guest_additions_url": "{{ user `guest_additions_url` }}", + "guest_os_type": "RedHat_64", + "hard_drive_interface": "sata", + "headless": "{{ user `headless` }}", + "http_directory": "{{user `http_directory`}}", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "memory": "{{ user `memory` }}", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-virtualbox", + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_timeout": "10000s", + "ssh_username": "vagrant", + "type": "virtualbox-iso", + "virtualbox_version_file": ".vbox_version", + "vm_name": "{{ user `template` }}" + }, + { + "boot_command": "{{ user `boot_command` }}", + "boot_wait": "5s", + "cpus": "{{ user `cpus` }}", + "disk_size": "{{user `disk_size`}}", + "guest_os_type": "centos-64", + "headless": "{{ user `headless` }}", + "http_directory": "{{user `http_directory`}}", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "memory": "{{ user `memory` }}", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-vmware", + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_timeout": "10000s", + "ssh_username": "vagrant", + "tools_upload_flavor": "linux", + "type": "vmware-iso", + "vm_name": "{{ user `template` }}", + "vmx_data": { + "cpuid.coresPerSocket": "1" + }, + "vmx_remove_ethernet_interfaces": true + }, + { + "boot_command": "{{user `boot_command`}}", + "boot_wait": "5s", + "cpus": "{{ user `cpus` }}", + "disk_size": "{{user `disk_size`}}", + "guest_os_type": "centos", + "http_directory": "{{user `http_directory`}}", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "memory": "{{ user `memory` }}", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-parallels", + "parallels_tools_flavor": "lin", + "prlctl_version_file": ".prlctl_version", + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_timeout": "10000s", + "ssh_username": "vagrant", + "type": "parallels-iso", + "vm_name": "{{ user `template` }}" + }, + { + "boot_command": [ + "<wait5><up><wait5><tab> text ks=hd:fd0:/ks.cfg<enter><wait5><esc>" + ], + "boot_wait": "5s", + "cpus": "{{ user `cpus` }}", + "disk_size": "{{user `disk_size`}}", + "floppy_files": [ + "{{user `http_directory`}}/{{user `ks_path`}}" + ], + "generation": "{{user `hyperv_generation`}}", + "guest_additions_mode": "disable", + "http_directory": "{{user `http_directory`}}", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "memory": "{{ user `memory` }}", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-hyperv", + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_timeout": "10000s", + "ssh_username": "vagrant", + "switch_name": "{{ user `hyperv_switch`}}", + "type": "hyperv-iso", + "vm_name": "{{ user `template` }}" + }, + { + "boot_command": "{{ user `boot_command` }}", + "boot_wait": "5s", + "cpus": "{{ user `cpus` }}", + "disk_size": "{{user `disk_size`}}", + "headless": "{{ user `headless` }}", + "http_directory": "{{user `http_directory`}}", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "memory": "{{ user `memory` }}", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-qemu", + "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_timeout": "10000s", + "ssh_username": "vagrant", + "type": "qemu", + "vm_name": "{{ user `template` }}" + } + ], + "post-processors": [ + { + "output": "{{ user `build_directory` }}/{{user `box_basename`}}.{{.Provider}}.box", + "type": "vagrant" + } + ], + "provisioners": [ + { + "environment_vars": [ + "HOME_DIR=/home/vagrant", + "http_proxy={{user `http_proxy`}}", + "https_proxy={{user `https_proxy`}}", + "no_proxy={{user `no_proxy`}}" + ], + "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", + "expect_disconnect": true, + "scripts": [ + "{{template_dir}}/../centos/scripts/update.sh", + "{{template_dir}}/../_common/motd.sh", + "{{template_dir}}/../_common/sshd.sh", + "{{template_dir}}/../centos/scripts/networking.sh", + "{{template_dir}}/../_common/vagrant.sh", + "{{template_dir}}/../_common/virtualbox.sh", + "{{template_dir}}/../_common/vmware.sh", + "{{template_dir}}/../_common/parallels.sh", + "{{template_dir}}/../centos/scripts/cleanup.sh", + "{{template_dir}}/../_common/minimize.sh" + ], + "type": "shell" + } + ], + "variables": { + "box_basename": "rocky-8.3", + "build_directory": "../../builds", + "build_timestamp": "{{isotime \"2019102650405\"}}", + "cpus": "2", + "disk_size": "65536", + "git_revision": "__unknown_git_revision__", + "guest_additions_url": "", + "headless": "", + "http_directory": "{{template_dir}}/../centos/http", + "http_proxy": "{{env `http_proxy`}}", + "https_proxy": "{{env `https_proxy`}}", + "hyperv_generation": "1", + "hyperv_switch": "bento", + "iso_checksum": "4be83f5edf28209ce5caa06995c1c3fc5112d0d260b9e8c1cc2fecd384abcee0", + "iso_name": "Rocky-8.3-x86_64-dvd1.iso", + "ks_path": "8/ks.cfg", + "memory": "1024", + "mirror": "http://download.rockylinux.org/pub/rocky", + "mirror_directory": "8.3/isos/x86_64", + "name": "rocky-8.3", + "no_proxy": "{{env `no_proxy`}}", + "template": "rocky-8.3-x86_64", + "boot_command": "<up><wait><tab> inst.text inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>", + "version": "TIMESTAMP" + } +} From 71685355a6d8ca21ad53b72a0678ee203dbcebae Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith@chef.io> Date: Wed, 26 May 2021 06:46:46 -0700 Subject: [PATCH 1382/1622] Rename rocky to rockylinux and add it to the builds config Signed-off-by: Tim Smith <tsmith@chef.io> --- builds.yml | 3 +++ .../rockylinux-8.3-x86_64.json} | 6 +++--- 2 files changed, 6 insertions(+), 3 deletions(-) rename packer_templates/{rocky/rocky-8.3-x86_64.json => rockylinux/rockylinux-8.3-x86_64.json} (98%) diff --git a/builds.yml b/builds.yml index 24018d2a2..dc47c0ff1 100644 --- a/builds.yml +++ b/builds.yml @@ -23,11 +23,13 @@ public: - 'oracle-6.10' - 'oracle-7.9' - 'oracle-8.3' +- 'rockylinux-8.3' - 'scientific-7.8' - 'springdalelinux-7.9' - 'ubuntu-18.04' - 'ubuntu-20.04' - 'ubuntu-20.10' +- 'ubuntu-21.04' # slug box name: text string from standard box name to match (generally the same) slugs: @@ -40,6 +42,7 @@ slugs: 'oracle-6': 'oracle-6' 'oracle-7': 'oracle-7' 'oracle-8': 'oracle-8' + 'rockylinux-8': 'rockylinux-8' 'scientific-7': 'scientific-7' 'springdalelinux-7': 'springdalelinux-7' 'freebsd-11': 'freebsd-11' diff --git a/packer_templates/rocky/rocky-8.3-x86_64.json b/packer_templates/rockylinux/rockylinux-8.3-x86_64.json similarity index 98% rename from packer_templates/rocky/rocky-8.3-x86_64.json rename to packer_templates/rockylinux/rockylinux-8.3-x86_64.json index 2eb706b4d..2b4787957 100644 --- a/packer_templates/rocky/rocky-8.3-x86_64.json +++ b/packer_templates/rockylinux/rockylinux-8.3-x86_64.json @@ -148,7 +148,7 @@ } ], "variables": { - "box_basename": "rocky-8.3", + "box_basename": "rockylinux-8.3", "build_directory": "../../builds", "build_timestamp": "{{isotime \"2019102650405\"}}", "cpus": "2", @@ -167,9 +167,9 @@ "memory": "1024", "mirror": "http://download.rockylinux.org/pub/rocky", "mirror_directory": "8.3/isos/x86_64", - "name": "rocky-8.3", + "name": "rockylinux-8.3", "no_proxy": "{{env `no_proxy`}}", - "template": "rocky-8.3-x86_64", + "template": "rockylinux-8.3-x86_64", "boot_command": "<up><wait><tab> inst.text inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>", "version": "TIMESTAMP" } From cdab8edfa336a2304a90178b8b3b87cb1a3f7931 Mon Sep 17 00:00:00 2001 From: Lance Albertson <lance@osuosl.org> Date: Fri, 28 May 2021 09:58:38 -0700 Subject: [PATCH 1383/1622] Update CentOS Stream 8 to 20210524 ISO Signed-off-by: Lance Albertson <lance@osuosl.org> --- packer_templates/centos/centos-stream-8-x86_64.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packer_templates/centos/centos-stream-8-x86_64.json b/packer_templates/centos/centos-stream-8-x86_64.json index 4109c38c9..9518870b8 100644 --- a/packer_templates/centos/centos-stream-8-x86_64.json +++ b/packer_templates/centos/centos-stream-8-x86_64.json @@ -161,8 +161,8 @@ "https_proxy": "{{env `https_proxy`}}", "hyperv_generation": "1", "hyperv_switch": "bento", - "iso_checksum": "c6f70c69178e7f631756009d0cd7366196def71ea471f4be1db02547f4c17833", - "iso_name": "CentOS-Stream-8-x86_64-20210302-dvd1.iso", + "iso_checksum": "46efc80cd973bc2c55f0bed7e29a3351e0f623675e55059bf2ee19209bb2a604", + "iso_name": "CentOS-Stream-8-x86_64-20210524-dvd1.iso", "ks_path": "8-stream/ks.cfg", "memory": "1024", "mirror": "http://mirrors.kernel.org/centos", From 35b44cd45c3ae7c627f05c56e25b6cd35df8c7f9 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith@chef.io> Date: Wed, 7 Jul 2021 19:32:18 -0700 Subject: [PATCH 1384/1622] Update to Debian 10.10 Signed-off-by: Tim Smith <tsmith@chef.io> --- README.md | 4 ++-- builds.yml | 4 ++-- ...ebian-10.9-amd64.json => debian-10.10-amd64.json} | 12 ++++++------ ...{debian-10.9-i386.json => debian-10.10-i386.json} | 12 ++++++------ 4 files changed, 16 insertions(+), 16 deletions(-) rename packer_templates/debian/{debian-10.9-amd64.json => debian-10.10-amd64.json} (96%) rename packer_templates/debian/{debian-10.9-i386.json => debian-10.10-i386.json} (96%) diff --git a/README.md b/README.md index 8e0277632..0ebf2c161 100644 --- a/README.md +++ b/README.md @@ -45,11 +45,11 @@ $ cd packer_templates/ubuntu $ packer build -only=virtualbox-iso ubuntu-18.04-amd64.json ``` -To build Debian 10.9 32bit boxes for all possible providers (simultaneously) +To build Debian 10.10 32bit boxes for all possible providers (simultaneously) ``` $ cd packer_templates/debian -$ packer build debian-10.9-i386.json +$ packer build debian-10.10-i386.json ``` To build CentOS 7.7 boxes for all providers except VMware and Parallels diff --git a/builds.yml b/builds.yml index dc47c0ff1..b0c3042a4 100644 --- a/builds.yml +++ b/builds.yml @@ -9,8 +9,8 @@ public: - 'centos-stream-8' - 'debian-9.13-i386' - 'debian-9.13' -- 'debian-10.9-i386' -- 'debian-10.9' +- 'debian-10.10-i386' +- 'debian-10.10' - 'fedora-32' - 'fedora-33' - 'freebsd-11.4-i386' diff --git a/packer_templates/debian/debian-10.9-amd64.json b/packer_templates/debian/debian-10.10-amd64.json similarity index 96% rename from packer_templates/debian/debian-10.9-amd64.json rename to packer_templates/debian/debian-10.10-amd64.json index eace0f92b..80b372adf 100644 --- a/packer_templates/debian/debian-10.9-amd64.json +++ b/packer_templates/debian/debian-10.10-amd64.json @@ -193,7 +193,7 @@ } ], "variables": { - "box_basename": "debian-10.9", + "box_basename": "debian-10.10", "build_directory": "../../builds", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "2", @@ -204,15 +204,15 @@ "http_directory": "{{template_dir}}/http", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", - "iso_checksum": "8660593d10de0ce7577c9de4dab886ff540bc9843659c8879d8eea0ab224c109", - "iso_name": "debian-10.9.0-amd64-netinst.iso", + "iso_checksum": "c433254a7c5b5b9e6a05f9e1379a0bd6ab3323f89b56537b684b6d1bd1f8b6ad", + "iso_name": "debian-10.10.0-amd64-netinst.iso", "memory": "1024", "mirror": "http://cdimage.debian.org/cdimage/release", - "mirror_directory": "10.9.0/amd64/iso-cd", - "name": "debian-10.9", + "mirror_directory": "10.10.0/amd64/iso-cd", + "name": "debian-10.10", "no_proxy": "{{env `no_proxy`}}", "preseed_path": "debian-9/preseed.cfg", - "template": "debian-10.9-amd64", + "template": "debian-10.10-amd64", "version": "TIMESTAMP" } } diff --git a/packer_templates/debian/debian-10.9-i386.json b/packer_templates/debian/debian-10.10-i386.json similarity index 96% rename from packer_templates/debian/debian-10.9-i386.json rename to packer_templates/debian/debian-10.10-i386.json index 6e695bfde..2fd10cb3b 100644 --- a/packer_templates/debian/debian-10.9-i386.json +++ b/packer_templates/debian/debian-10.10-i386.json @@ -193,7 +193,7 @@ } ], "variables": { - "box_basename": "debian-10.9-i386", + "box_basename": "debian-10.10-i386", "build_directory": "../../builds", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "2", @@ -204,15 +204,15 @@ "http_directory": "{{template_dir}}/http", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", - "iso_checksum": "db92546facb722bfd3cf796f9f10db70a257d6d21126d35348d1fba13601e82a", - "iso_name": "debian-10.9.0-i386-netinst.iso", + "iso_checksum": "cf824084643fb82f74d1fbec804baaf74539dadd279af2098da94254f758e5b7", + "iso_name": "debian-10.10.0-i386-netinst.iso", "memory": "1024", "mirror": "http://cdimage.debian.org/cdimage/release", - "mirror_directory": "10.9.0/i386/iso-cd", - "name": "debian-10.9-i386", + "mirror_directory": "10.10.0/i386/iso-cd", + "name": "debian-10.10-i386", "no_proxy": "{{env `no_proxy`}}", "preseed_path": "debian-9/preseed.cfg", - "template": "debian-10.9-i386", + "template": "debian-10.10-i386", "version": "TIMESTAMP" } } From a4b90eee98a1c45617753ebbd5d3769d88e826f8 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith@chef.io> Date: Wed, 7 Jul 2021 19:33:01 -0700 Subject: [PATCH 1385/1622] Remove noapic to fix vmware ubuntu failures This fixes the kernel panics at boot on vmware Signed-off-by: Tim Smith <tsmith@chef.io> --- packer_templates/ubuntu/ubuntu-18.04-amd64.json | 1 - packer_templates/ubuntu/ubuntu-20.04-amd64.json | 1 - 2 files changed, 2 deletions(-) diff --git a/packer_templates/ubuntu/ubuntu-18.04-amd64.json b/packer_templates/ubuntu/ubuntu-18.04-amd64.json index 3a3ee326d..4196213e6 100644 --- a/packer_templates/ubuntu/ubuntu-18.04-amd64.json +++ b/packer_templates/ubuntu/ubuntu-18.04-amd64.json @@ -69,7 +69,6 @@ " netcfg/get_domain=vm<wait>", " netcfg/get_hostname=vagrant<wait>", " grub-installer/bootdev=/dev/sda<wait>", - " noapic<wait>", " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}}<wait>", " -- <wait>", "<enter><wait>" diff --git a/packer_templates/ubuntu/ubuntu-20.04-amd64.json b/packer_templates/ubuntu/ubuntu-20.04-amd64.json index bb7caec59..7749fea4f 100644 --- a/packer_templates/ubuntu/ubuntu-20.04-amd64.json +++ b/packer_templates/ubuntu/ubuntu-20.04-amd64.json @@ -69,7 +69,6 @@ " netcfg/get_domain=vm<wait>", " netcfg/get_hostname=vagrant<wait>", " grub-installer/bootdev=/dev/sda<wait>", - " noapic<wait>", " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}}<wait>", " -- <wait>", "<enter><wait>" From 662bb81c798e6430322a3739d48c38738aad8678 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith@chef.io> Date: Wed, 7 Jul 2021 19:40:12 -0700 Subject: [PATCH 1386/1622] Update Rocky Linux from 8.3 to 8.4 Signed-off-by: Tim Smith <tsmith@chef.io> --- ...ux-8.3-x86_64.json => rockylinux-8.4-x86_64.json} | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) rename packer_templates/rockylinux/{rockylinux-8.3-x86_64.json => rockylinux-8.4-x86_64.json} (95%) diff --git a/packer_templates/rockylinux/rockylinux-8.3-x86_64.json b/packer_templates/rockylinux/rockylinux-8.4-x86_64.json similarity index 95% rename from packer_templates/rockylinux/rockylinux-8.3-x86_64.json rename to packer_templates/rockylinux/rockylinux-8.4-x86_64.json index 2b4787957..88169c17c 100644 --- a/packer_templates/rockylinux/rockylinux-8.3-x86_64.json +++ b/packer_templates/rockylinux/rockylinux-8.4-x86_64.json @@ -148,7 +148,7 @@ } ], "variables": { - "box_basename": "rockylinux-8.3", + "box_basename": "rockylinux-8.4", "build_directory": "../../builds", "build_timestamp": "{{isotime \"2019102650405\"}}", "cpus": "2", @@ -161,15 +161,15 @@ "https_proxy": "{{env `https_proxy`}}", "hyperv_generation": "1", "hyperv_switch": "bento", - "iso_checksum": "4be83f5edf28209ce5caa06995c1c3fc5112d0d260b9e8c1cc2fecd384abcee0", - "iso_name": "Rocky-8.3-x86_64-dvd1.iso", + "iso_checksum": "ffe2fae67da6702d859cfb0b321561a5d616ce87a963d8a25b018c9c3d52d9a4", + "iso_name": "Rocky-8.4-x86_64-dvd1.iso", "ks_path": "8/ks.cfg", "memory": "1024", "mirror": "http://download.rockylinux.org/pub/rocky", - "mirror_directory": "8.3/isos/x86_64", - "name": "rockylinux-8.3", + "mirror_directory": "8.4/isos/x86_64", + "name": "rockylinux-8.4", "no_proxy": "{{env `no_proxy`}}", - "template": "rockylinux-8.3-x86_64", + "template": "rockylinux-8.4-x86_64", "boot_command": "<up><wait><tab> inst.text inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>", "version": "TIMESTAMP" } From 8d754829770ef46afe78b4f988de46f76f1f0553 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith@chef.io> Date: Wed, 7 Jul 2021 19:45:38 -0700 Subject: [PATCH 1387/1622] Update almalinux from 8.3 to 8.4 Signed-off-by: Tim Smith <tsmith@chef.io> --- ...nux-8.3-x86_64.json => almalinux-8.4-x86_64.json} | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) rename packer_templates/almalinux/{almalinux-8.3-x86_64.json => almalinux-8.4-x86_64.json} (95%) diff --git a/packer_templates/almalinux/almalinux-8.3-x86_64.json b/packer_templates/almalinux/almalinux-8.4-x86_64.json similarity index 95% rename from packer_templates/almalinux/almalinux-8.3-x86_64.json rename to packer_templates/almalinux/almalinux-8.4-x86_64.json index 1f55f3158..86c34053e 100644 --- a/packer_templates/almalinux/almalinux-8.3-x86_64.json +++ b/packer_templates/almalinux/almalinux-8.4-x86_64.json @@ -148,7 +148,7 @@ } ], "variables": { - "box_basename": "almalinux-8.3", + "box_basename": "almalinux-8.4", "build_directory": "../../builds", "build_timestamp": "{{isotime \"2019102650405\"}}", "cpus": "2", @@ -161,15 +161,15 @@ "https_proxy": "{{env `https_proxy`}}", "hyperv_generation": "1", "hyperv_switch": "bento", - "iso_checksum": "a2ca2ff3de3e7c0707b042994e1947a8ce81d16ba5c869d6ecf8f4d4dd88eee2", - "iso_name": "AlmaLinux-8.3-x86_64-dvd.iso", + "iso_checksum": "4dd2f7c558bfa34d9a5e71d5add2c77c59fdec58076678a381d9dfd0f9583a51", + "iso_name": "AlmaLinux-8.4-x86_64-dvd.iso", "ks_path": "8/ks.cfg", "memory": "1024", "mirror": "https://repo.almalinux.org/almalinux", - "mirror_directory": "8.3/isos/x86_64", - "name": "almalinux-8.3", + "mirror_directory": "8.4/isos/x86_64", + "name": "almalinux-8.4", "no_proxy": "{{env `no_proxy`}}", - "template": "almalinux-8.3-x86_64", + "template": "almalinux-8.4-x86_64", "boot_command": "<up><wait><tab> inst.text inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>", "version": "TIMESTAMP" } From a914f505556c634e2135bf5af4626fbbb14146a9 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith@chef.io> Date: Wed, 7 Jul 2021 20:12:51 -0700 Subject: [PATCH 1388/1622] Update scientificlinux 7.8 -> 7.9 Signed-off-by: Tim Smith <tsmith@chef.io> --- builds.yml | 6 +++--- ...entific-7.8-x86_64.json => scientific-7.9-x86_64.json} | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) rename packer_templates/scientificlinux/{scientific-7.8-x86_64.json => scientific-7.9-x86_64.json} (97%) diff --git a/builds.yml b/builds.yml index b0c3042a4..422a1d5e4 100644 --- a/builds.yml +++ b/builds.yml @@ -1,6 +1,6 @@ --- public: -- 'almalinux-8.3' +- 'almalinux-8.4' - 'amazon-2' - 'centos-6.10-i386' - 'centos-6.10' @@ -23,8 +23,8 @@ public: - 'oracle-6.10' - 'oracle-7.9' - 'oracle-8.3' -- 'rockylinux-8.3' -- 'scientific-7.8' +- 'rockylinux-8.4' +- 'scientific-7.9' - 'springdalelinux-7.9' - 'ubuntu-18.04' - 'ubuntu-20.04' diff --git a/packer_templates/scientificlinux/scientific-7.8-x86_64.json b/packer_templates/scientificlinux/scientific-7.9-x86_64.json similarity index 97% rename from packer_templates/scientificlinux/scientific-7.8-x86_64.json rename to packer_templates/scientificlinux/scientific-7.9-x86_64.json index d88aa296c..754cf1ba7 100644 --- a/packer_templates/scientificlinux/scientific-7.8-x86_64.json +++ b/packer_templates/scientificlinux/scientific-7.9-x86_64.json @@ -156,7 +156,7 @@ } ], "variables": { - "box_basename": "scientific-7.8", + "box_basename": "scientific-7.9", "build_directory": "../../builds", "build_timestamp": "{{isotime \"20080506150405\"}}", "cpus": "2", @@ -169,13 +169,13 @@ "https_proxy": "{{env `https_proxy`}}", "hyperv_generation": "1", "hyperv_switch": "bento", - "iso_checksum": "64eb2df3616cc1f4c278eb553dccc721bfb9a5aad3f5b5dcc677e709ad8a8b4e", + "iso_checksum": "7ac643e164c4a0da0b9f33411c68368cf908e0c34254904044957a3ca7793934", "iso_name": "SL-7-DVD-x86_64.iso", "ks_path": "7/ks.cfg", "memory": "1024", "mirror": "http://www.gtlib.gatech.edu/pub/scientific", - "mirror_directory": "7.8/x86_64/iso", - "name": "scientific-7.8", + "mirror_directory": "7.9/x86_64/iso", + "name": "scientific-7.9", "no_proxy": "{{env `no_proxy`}}", "template": "scientific-7-x86_64", "version": "TIMESTAMP" From 655bc6bf59587171747d6defcb0ec3e07432ad10 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith@chef.io> Date: Wed, 7 Jul 2021 20:47:51 -0700 Subject: [PATCH 1389/1622] Update opensuse leap 15.2 to 15.3 Signed-off-by: Tim Smith <tsmith@chef.io> --- builds.yml | 2 +- ....2-x86_64.json => opensuse-leap-15.3-x86_64.json} | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) rename packer_templates/opensuse/{opensuse-leap-15.2-x86_64.json => opensuse-leap-15.3-x86_64.json} (95%) diff --git a/builds.yml b/builds.yml index 422a1d5e4..79d9e1a8c 100644 --- a/builds.yml +++ b/builds.yml @@ -18,7 +18,7 @@ public: - 'freebsd-12.2-i386' - 'freebsd-12.2' - 'freebsd-13.0' -- 'opensuse-leap-15.2' +- 'opensuse-leap-15.3' - 'oracle-6.10-i386' - 'oracle-6.10' - 'oracle-7.9' diff --git a/packer_templates/opensuse/opensuse-leap-15.2-x86_64.json b/packer_templates/opensuse/opensuse-leap-15.3-x86_64.json similarity index 95% rename from packer_templates/opensuse/opensuse-leap-15.2-x86_64.json rename to packer_templates/opensuse/opensuse-leap-15.3-x86_64.json index 273a6d879..93dd4f2df 100644 --- a/packer_templates/opensuse/opensuse-leap-15.2-x86_64.json +++ b/packer_templates/opensuse/opensuse-leap-15.3-x86_64.json @@ -166,7 +166,7 @@ "variables": { "arch": "64", "autoinst_cfg": "15/autoinst.xml", - "box_basename": "opensuse-leap-15.2", + "box_basename": "opensuse-leap-15.3", "build_directory": "../../builds", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "2", @@ -177,14 +177,14 @@ "http_directory": "{{template_dir}}/http", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", - "iso_checksum": "0fd2d4e630b6579b933b5cb4930a8100acca6b4e29cd2738c4b7a9b2f76d80e4", - "iso_name": "openSUSE-Leap-15.2-DVD-x86_64.iso", + "iso_checksum": "0deae0b74953acd951150ae9567e098d450f2ae91b2d0c0a610b9d934f91c7b1", + "iso_name": "openSUSE-Leap-15.3-DVD-x86_64.iso", "memory": "1024", "mirror": "http://suse.mobile-central.org/distribution", - "mirror_directory": "leap/15.2/iso", - "name": "opensuse-leap-15.2", + "mirror_directory": "leap/15.3/iso", + "name": "opensuse-leap-15.3", "no_proxy": "{{env `no_proxy`}}", - "template": "opensuse-leap-15.2-x86_64", + "template": "opensuse-leap-15.3-x86_64", "version": "TIMESTAMP" } } From 9b1f07dc86b374e111e7ff21a277de152f987955 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith@chef.io> Date: Wed, 7 Jul 2021 21:06:41 -0700 Subject: [PATCH 1390/1622] Replace EOL Fedora 33 with 34 Signed-off-by: Tim Smith <tsmith@chef.io> --- .../{fedora-32-x86_64.json => fedora-34-x86_64.json} | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) rename packer_templates/fedora/{fedora-32-x86_64.json => fedora-34-x86_64.json} (95%) diff --git a/packer_templates/fedora/fedora-32-x86_64.json b/packer_templates/fedora/fedora-34-x86_64.json similarity index 95% rename from packer_templates/fedora/fedora-32-x86_64.json rename to packer_templates/fedora/fedora-34-x86_64.json index 689791933..2fba922d8 100644 --- a/packer_templates/fedora/fedora-32-x86_64.json +++ b/packer_templates/fedora/fedora-34-x86_64.json @@ -155,7 +155,7 @@ ], "variables": { "arch": "64", - "box_basename": "fedora-32", + "box_basename": "fedora-34", "build_directory": "../../builds", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "2", @@ -166,15 +166,15 @@ "http_directory": "{{template_dir}}/http", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", - "iso_checksum": "cd2aefdbe1b5042865a39c49d32f5d21a9537c719aa87dde34d08ca06bc6681c", - "iso_name": "Fedora-Server-dvd-x86_64-32-1.6.iso", + "iso_checksum": "0b9dc87d060c7c4ef89f63db6d4d1597dd3feaf4d635ca051d87f5e8c89e8675", + "iso_name": "Fedora-Server-dvd-x86_64-34-1.2.iso", "ks_path": "ks-fedora.cfg", "memory": "1024", "mirror": "http://download.fedoraproject.org/pub/fedora/linux", - "mirror_directory": "releases/32/Server/x86_64/iso", - "name": "fedora-32", + "mirror_directory": "releases/34/Server/x86_64/iso", + "name": "fedora-34", "no_proxy": "{{env `no_proxy`}}", - "template": "fedora-32-x86_64", + "template": "fedora-34-x86_64", "qemuargs_opt": "-m", "qemuargs_value": "1024M", "boot_command": "<up><wait><tab> inst.text inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>", From f01fcb8221b3221be9ea3fe2acdd2fd2c3199f49 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith@chef.io> Date: Wed, 7 Jul 2021 21:07:13 -0700 Subject: [PATCH 1391/1622] Update the build doc for the new fedora Signed-off-by: Tim Smith <tsmith@chef.io> --- builds.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/builds.yml b/builds.yml index 79d9e1a8c..eb0a1db7a 100644 --- a/builds.yml +++ b/builds.yml @@ -11,8 +11,8 @@ public: - 'debian-9.13' - 'debian-10.10-i386' - 'debian-10.10' -- 'fedora-32' - 'fedora-33' +- 'fedora-34' - 'freebsd-11.4-i386' - 'freebsd-11.4' - 'freebsd-12.2-i386' @@ -37,16 +37,16 @@ slugs: 'centos-6': 'centos-6' 'centos-7': 'centos-7' 'centos-8': 'centos-8' - 'debian-9': 'debian-9' 'debian-10': 'debian-10' + 'debian-9': 'debian-9' + 'fedora-latest': 'fedora-34' + 'freebsd-11': 'freebsd-11' + 'freebsd-12': 'freebsd-12' + 'freebsd-13': 'freebsd-13' + 'opensuse-leap-15': 'opensuse-leap-15' 'oracle-6': 'oracle-6' 'oracle-7': 'oracle-7' 'oracle-8': 'oracle-8' 'rockylinux-8': 'rockylinux-8' 'scientific-7': 'scientific-7' 'springdalelinux-7': 'springdalelinux-7' - 'freebsd-11': 'freebsd-11' - 'freebsd-12': 'freebsd-12' - 'freebsd-13': 'freebsd-13' - 'opensuse-leap-15': 'opensuse-leap-15' - 'fedora-latest': 'fedora-33' From 1c7d68007f4def1a40c0147ab8c2a68a6e6c69dc Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith@chef.io> Date: Wed, 7 Jul 2021 22:45:30 -0700 Subject: [PATCH 1392/1622] Update Fedora kickstart file to work on Fedora 34 Signed-off-by: Tim Smith <tsmith@chef.io> --- packer_templates/fedora/http/ks-fedora.cfg | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/packer_templates/fedora/http/ks-fedora.cfg b/packer_templates/fedora/http/ks-fedora.cfg index b55345f7b..6d4aa6441 100644 --- a/packer_templates/fedora/http/ks-fedora.cfg +++ b/packer_templates/fedora/http/ks-fedora.cfg @@ -1,7 +1,5 @@ -install -cdrom lang en_US.UTF-8 -keyboard us +keyboard --xlayouts='us' network --bootproto=dhcp --noipv6 --onboot=on --device=eth0 rootpw --plaintext vagrant firewall --disabled From 2a223ed213ff8a4350bc08b11b398bfb894eeee0 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith@chef.io> Date: Wed, 28 Jul 2021 09:35:22 -0700 Subject: [PATCH 1393/1622] Use new windows resources for configuring the system 17.3 gave us some nice new resources for this cookbook Signed-off-by: Tim Smith <tsmith@chef.io> --- .../cookbooks/packer/recipes/disable_windows_update.rb | 8 ++------ .../windows/cookbooks/packer/recipes/remove_defender.rb | 4 ++-- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/packer_templates/windows/cookbooks/packer/recipes/disable_windows_update.rb b/packer_templates/windows/cookbooks/packer/recipes/disable_windows_update.rb index ac7848898..dbd70fdef 100644 --- a/packer_templates/windows/cookbooks/packer/recipes/disable_windows_update.rb +++ b/packer_templates/windows/cookbooks/packer/recipes/disable_windows_update.rb @@ -1,8 +1,4 @@ # don't waste CPU / network bandwidth checking for updates -registry_key 'HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows\WindowsUpdate\AU' do - values [{ name: 'AUOptions', type: :dword, data: 1 }, # disable keep my computer up to date - { name: 'NoAutoUpdate', type: :dword, data: 1 }, # disable auto updates - ] - action :create - recursive true +windows_update_settings 'disable windows update' do + disable_automatic_updates true end diff --git a/packer_templates/windows/cookbooks/packer/recipes/remove_defender.rb b/packer_templates/windows/cookbooks/packer/recipes/remove_defender.rb index 1784f568f..ec72c2eb8 100644 --- a/packer_templates/windows/cookbooks/packer/recipes/remove_defender.rb +++ b/packer_templates/windows/cookbooks/packer/recipes/remove_defender.rb @@ -1,3 +1,3 @@ -windows_feature 'Windows-Defender' do - action :remove +windows_defender 'disable windows defender' do + action :disable end From 653905317bbcf4bef7b9d1e3e3ebc7571fa9491d Mon Sep 17 00:00:00 2001 From: SG <13872653+mmguero@users.noreply.github.com> Date: Mon, 16 Aug 2021 10:05:02 -0600 Subject: [PATCH 1394/1622] With Debian 11 (bullseye) released, README.md and builds.yml and add packer_templates to build debian-11 Signed-off-by: SG <13872653+mmguero@users.noreply.github.com> --- README.md | 4 +- builds.yml | 3 + .../debian/debian-11.0-amd64.json | 218 ++++++++++++++++++ packer_templates/debian/debian-11.0-i386.json | 218 ++++++++++++++++++ 4 files changed, 441 insertions(+), 2 deletions(-) create mode 100644 packer_templates/debian/debian-11.0-amd64.json create mode 100644 packer_templates/debian/debian-11.0-i386.json diff --git a/README.md b/README.md index 0ebf2c161..f152307f2 100644 --- a/README.md +++ b/README.md @@ -45,11 +45,11 @@ $ cd packer_templates/ubuntu $ packer build -only=virtualbox-iso ubuntu-18.04-amd64.json ``` -To build Debian 10.10 32bit boxes for all possible providers (simultaneously) +To build Debian 11.0 32bit boxes for all possible providers (simultaneously) ``` $ cd packer_templates/debian -$ packer build debian-10.10-i386.json +$ packer build debian-11.0-i386.json ``` To build CentOS 7.7 boxes for all providers except VMware and Parallels diff --git a/builds.yml b/builds.yml index eb0a1db7a..984a22cd0 100644 --- a/builds.yml +++ b/builds.yml @@ -11,6 +11,8 @@ public: - 'debian-9.13' - 'debian-10.10-i386' - 'debian-10.10' +- 'debian-11.0-i386' +- 'debian-11.0' - 'fedora-33' - 'fedora-34' - 'freebsd-11.4-i386' @@ -37,6 +39,7 @@ slugs: 'centos-6': 'centos-6' 'centos-7': 'centos-7' 'centos-8': 'centos-8' + 'debian-11': 'debian-11' 'debian-10': 'debian-10' 'debian-9': 'debian-9' 'fedora-latest': 'fedora-34' diff --git a/packer_templates/debian/debian-11.0-amd64.json b/packer_templates/debian/debian-11.0-amd64.json new file mode 100644 index 000000000..e346bfdd4 --- /dev/null +++ b/packer_templates/debian/debian-11.0-amd64.json @@ -0,0 +1,218 @@ +{ + "builders": [ + { + "boot_command": [ + "<esc><wait>", + "install <wait>", + " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}} <wait>", + "debian-installer=en_US.UTF-8 <wait>", + "auto <wait>", + "locale=en_US.UTF-8 <wait>", + "kbd-chooser/method=us <wait>", + "keyboard-configuration/xkb-keymap=us <wait>", + "netcfg/get_hostname={{ .Name }} <wait>", + "netcfg/get_domain=vagrantup.com <wait>", + "fb=false <wait>", + "debconf/frontend=noninteractive <wait>", + "console-setup/ask_detect=false <wait>", + "console-keymaps-at/keymap=us <wait>", + "grub-installer/bootdev=/dev/sda <wait>", + "<enter><wait>" + ], + "boot_wait": "5s", + "cpus": "{{ user `cpus` }}", + "disk_size": "{{user `disk_size`}}", + "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "guest_additions_url": "{{ user `guest_additions_url` }}", + "guest_os_type": "Debian_64", + "hard_drive_interface": "sata", + "headless": "{{ user `headless` }}", + "http_directory": "{{user `http_directory`}}", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "memory": "{{ user `memory` }}", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-virtualbox", + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_timeout": "10000s", + "ssh_username": "vagrant", + "type": "virtualbox-iso", + "virtualbox_version_file": ".vbox_version", + "vm_name": "{{ user `template` }}" + }, + { + "boot_command": [ + "<esc><wait>", + "install <wait>", + " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}} <wait>", + "debian-installer=en_US.UTF-8 <wait>", + "auto <wait>", + "locale=en_US.UTF-8 <wait>", + "kbd-chooser/method=us <wait>", + "keyboard-configuration/xkb-keymap=us <wait>", + "netcfg/get_hostname={{ .Name }} <wait>", + "netcfg/get_domain=vagrantup.com <wait>", + "fb=false <wait>", + "debconf/frontend=noninteractive <wait>", + "console-setup/ask_detect=false <wait>", + "console-keymaps-at/keymap=us <wait>", + "grub-installer/bootdev=/dev/sda <wait>", + "<enter><wait>" + ], + "boot_wait": "5s", + "cpus": "{{ user `cpus` }}", + "disk_size": "{{user `disk_size`}}", + "guest_os_type": "debian8-64", + "headless": "{{ user `headless` }}", + "http_directory": "{{user `http_directory`}}", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "memory": "{{ user `memory` }}", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-vmware", + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_timeout": "10000s", + "ssh_username": "vagrant", + "tools_upload_flavor": "linux", + "type": "vmware-iso", + "vm_name": "{{ user `template` }}", + "vmx_data": { + "cpuid.coresPerSocket": "1", + "ethernet0.pciSlotNumber": "32" + }, + "vmx_remove_ethernet_interfaces": true + }, + { + "boot_command": [ + "<esc><wait>", + "install <wait>", + " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}} <wait>", + "debian-installer=en_US.UTF-8 <wait>", + "auto <wait>", + "locale=en_US.UTF-8 <wait>", + "kbd-chooser/method=us <wait>", + "keyboard-configuration/xkb-keymap=us <wait>", + "netcfg/get_hostname={{ .Name }} <wait>", + "netcfg/get_domain=vagrantup.com <wait>", + "fb=false <wait>", + "debconf/frontend=noninteractive <wait>", + "console-setup/ask_detect=false <wait>", + "console-keymaps-at/keymap=us <wait>", + "grub-installer/bootdev=/dev/sda <wait>", + "<enter><wait>" + ], + "boot_wait": "5s", + "cpus": "{{ user `cpus` }}", + "disk_size": "{{user `disk_size`}}", + "guest_os_type": "debian", + "http_directory": "{{user `http_directory`}}", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "memory": "{{ user `memory` }}", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-parallels", + "parallels_tools_flavor": "lin", + "prlctl_version_file": ".prlctl_version", + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_timeout": "10000s", + "ssh_username": "vagrant", + "type": "parallels-iso", + "vm_name": "{{ user `template` }}" + }, + { + "boot_command": [ + "<esc><wait>", + "install <wait>", + " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}} <wait>", + "debian-installer=en_US.UTF-8 <wait>", + "auto <wait>", + "locale=en_US.UTF-8 <wait>", + "kbd-chooser/method=us <wait>", + "keyboard-configuration/xkb-keymap=us <wait>", + "netcfg/get_hostname={{ .Name }} <wait>", + "netcfg/get_domain=vagrantup.com <wait>", + "fb=false <wait>", + "debconf/frontend=noninteractive <wait>", + "console-setup/ask_detect=false <wait>", + "console-keymaps-at/keymap=us <wait>", + "grub-installer/bootdev=/dev/vda <wait>", + "<enter><wait>" + ], + "boot_wait": "5s", + "cpus": "{{ user `cpus` }}", + "disk_size": "{{user `disk_size`}}", + "headless": "{{ user `headless` }}", + "http_directory": "{{user `http_directory`}}", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "memory": "{{ user `memory` }}", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-qemu", + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_timeout": "10000s", + "ssh_username": "vagrant", + "type": "qemu", + "vm_name": "{{ user `template` }}" + } + ], + "post-processors": [ + { + "output": "{{ user `build_directory` }}/{{user `box_basename`}}.{{.Provider}}.box", + "type": "vagrant" + } + ], + "provisioners": [ + { + "environment_vars": [ + "HOME_DIR=/home/vagrant", + "http_proxy={{user `http_proxy`}}", + "https_proxy={{user `https_proxy`}}", + "no_proxy={{user `no_proxy`}}" + ], + "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", + "expect_disconnect": true, + "scripts": [ + "{{template_dir}}/scripts/update.sh", + "{{template_dir}}/../_common/motd.sh", + "{{template_dir}}/../_common/sshd.sh", + "{{template_dir}}/scripts/networking.sh", + "{{template_dir}}/scripts/sudoers.sh", + "{{template_dir}}/../_common/vagrant.sh", + "{{template_dir}}/scripts/systemd.sh", + "{{template_dir}}/../_common/virtualbox.sh", + "{{template_dir}}/../ubuntu/scripts/vmware.sh", + "{{template_dir}}/../_common/parallels.sh", + "{{template_dir}}/scripts/cleanup.sh", + "{{template_dir}}/../_common/minimize.sh" + ], + "type": "shell" + } + ], + "variables": { + "box_basename": "debian-11.0", + "build_directory": "../../builds", + "build_timestamp": "{{isotime \"20060102150405\"}}", + "cpus": "2", + "disk_size": "65536", + "git_revision": "__unknown_git_revision__", + "guest_additions_url": "", + "headless": "", + "http_directory": "{{template_dir}}/http", + "http_proxy": "{{env `http_proxy`}}", + "https_proxy": "{{env `https_proxy`}}", + "iso_checksum": "ae6d563d2444665316901fe7091059ac34b8f67ba30f9159f7cef7d2fdc5bf8a", + "iso_name": "debian-11.0.0-amd64-netinst.iso", + "memory": "1024", + "mirror": "http://cdimage.debian.org/cdimage/release", + "mirror_directory": "11.0.0/amd64/iso-cd", + "name": "debian-11.0", + "no_proxy": "{{env `no_proxy`}}", + "preseed_path": "debian-9/preseed.cfg", + "template": "debian-11.0-amd64", + "version": "TIMESTAMP" + } +} diff --git a/packer_templates/debian/debian-11.0-i386.json b/packer_templates/debian/debian-11.0-i386.json new file mode 100644 index 000000000..5d4799b70 --- /dev/null +++ b/packer_templates/debian/debian-11.0-i386.json @@ -0,0 +1,218 @@ +{ + "builders": [ + { + "boot_command": [ + "<esc><wait>", + "install <wait>", + " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}} <wait>", + "debian-installer=en_US.UTF-8 <wait>", + "auto <wait>", + "locale=en_US.UTF-8 <wait>", + "kbd-chooser/method=us <wait>", + "keyboard-configuration/xkb-keymap=us <wait>", + "netcfg/get_hostname={{ .Name }} <wait>", + "netcfg/get_domain=vagrantup.com <wait>", + "fb=false <wait>", + "debconf/frontend=noninteractive <wait>", + "console-setup/ask_detect=false <wait>", + "console-keymaps-at/keymap=us <wait>", + "grub-installer/bootdev=/dev/sda <wait>", + "<enter><wait>" + ], + "boot_wait": "5s", + "cpus": "{{ user `cpus` }}", + "disk_size": "{{user `disk_size`}}", + "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "guest_additions_url": "{{ user `guest_additions_url` }}", + "guest_os_type": "Debian", + "hard_drive_interface": "sata", + "headless": "{{ user `headless` }}", + "http_directory": "{{user `http_directory`}}", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "memory": "{{ user `memory` }}", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-virtualbox", + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_timeout": "10000s", + "ssh_username": "vagrant", + "type": "virtualbox-iso", + "virtualbox_version_file": ".vbox_version", + "vm_name": "{{ user `template` }}" + }, + { + "boot_command": [ + "<esc><wait>", + "install <wait>", + " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}} <wait>", + "debian-installer=en_US.UTF-8 <wait>", + "auto <wait>", + "locale=en_US.UTF-8 <wait>", + "kbd-chooser/method=us <wait>", + "keyboard-configuration/xkb-keymap=us <wait>", + "netcfg/get_hostname={{ .Name }} <wait>", + "netcfg/get_domain=vagrantup.com <wait>", + "fb=false <wait>", + "debconf/frontend=noninteractive <wait>", + "console-setup/ask_detect=false <wait>", + "console-keymaps-at/keymap=us <wait>", + "grub-installer/bootdev=/dev/sda <wait>", + "<enter><wait>" + ], + "boot_wait": "5s", + "cpus": "{{ user `cpus` }}", + "disk_size": "{{user `disk_size`}}", + "guest_os_type": "debian8", + "headless": "{{ user `headless` }}", + "http_directory": "{{user `http_directory`}}", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "memory": "{{ user `memory` }}", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-vmware", + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_timeout": "10000s", + "ssh_username": "vagrant", + "tools_upload_flavor": "linux", + "type": "vmware-iso", + "vm_name": "{{ user `template` }}", + "vmx_data": { + "cpuid.coresPerSocket": "1", + "ethernet0.pciSlotNumber": "32" + }, + "vmx_remove_ethernet_interfaces": true + }, + { + "boot_command": [ + "<esc><wait>", + "install <wait>", + " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}} <wait>", + "debian-installer=en_US.UTF-8 <wait>", + "auto <wait>", + "locale=en_US.UTF-8 <wait>", + "kbd-chooser/method=us <wait>", + "keyboard-configuration/xkb-keymap=us <wait>", + "netcfg/get_hostname={{ .Name }} <wait>", + "netcfg/get_domain=vagrantup.com <wait>", + "fb=false <wait>", + "debconf/frontend=noninteractive <wait>", + "console-setup/ask_detect=false <wait>", + "console-keymaps-at/keymap=us <wait>", + "grub-installer/bootdev=/dev/sda <wait>", + "<enter><wait>" + ], + "boot_wait": "5s", + "cpus": "{{ user `cpus` }}", + "disk_size": "{{user `disk_size`}}", + "guest_os_type": "debian", + "http_directory": "{{user `http_directory`}}", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "memory": "{{ user `memory` }}", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-parallels", + "parallels_tools_flavor": "lin", + "prlctl_version_file": ".prlctl_version", + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_timeout": "10000s", + "ssh_username": "vagrant", + "type": "parallels-iso", + "vm_name": "{{ user `template` }}" + }, + { + "boot_command": [ + "<esc><wait>", + "install <wait>", + " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}} <wait>", + "debian-installer=en_US.UTF-8 <wait>", + "auto <wait>", + "locale=en_US.UTF-8 <wait>", + "kbd-chooser/method=us <wait>", + "keyboard-configuration/xkb-keymap=us <wait>", + "netcfg/get_hostname={{ .Name }} <wait>", + "netcfg/get_domain=vagrantup.com <wait>", + "fb=false <wait>", + "debconf/frontend=noninteractive <wait>", + "console-setup/ask_detect=false <wait>", + "console-keymaps-at/keymap=us <wait>", + "grub-installer/bootdev=/dev/vda <wait>", + "<enter><wait>" + ], + "boot_wait": "5s", + "cpus": "{{ user `cpus` }}", + "disk_size": "{{user `disk_size`}}", + "headless": "{{ user `headless` }}", + "http_directory": "{{user `http_directory`}}", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "memory": "{{ user `memory` }}", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-qemu", + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_timeout": "10000s", + "ssh_username": "vagrant", + "type": "qemu", + "vm_name": "{{ user `template` }}" + } + ], + "post-processors": [ + { + "output": "{{ user `build_directory` }}/{{user `box_basename`}}.{{.Provider}}.box", + "type": "vagrant" + } + ], + "provisioners": [ + { + "environment_vars": [ + "HOME_DIR=/home/vagrant", + "http_proxy={{user `http_proxy`}}", + "https_proxy={{user `https_proxy`}}", + "no_proxy={{user `no_proxy`}}" + ], + "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", + "expect_disconnect": true, + "scripts": [ + "{{template_dir}}/scripts/update.sh", + "{{template_dir}}/../_common/motd.sh", + "{{template_dir}}/../_common/sshd.sh", + "{{template_dir}}/scripts/networking.sh", + "{{template_dir}}/scripts/sudoers.sh", + "{{template_dir}}/../_common/vagrant.sh", + "{{template_dir}}/scripts/systemd.sh", + "{{template_dir}}/../_common/virtualbox.sh", + "{{template_dir}}/../ubuntu/scripts/vmware.sh", + "{{template_dir}}/../_common/parallels.sh", + "{{template_dir}}/scripts/cleanup.sh", + "{{template_dir}}/../_common/minimize.sh" + ], + "type": "shell" + } + ], + "variables": { + "box_basename": "debian-11.0-i386", + "build_directory": "../../builds", + "build_timestamp": "{{isotime \"20060102150405\"}}", + "cpus": "2", + "disk_size": "65536", + "git_revision": "__unknown_git_revision__", + "guest_additions_url": "", + "headless": "", + "http_directory": "{{template_dir}}/http", + "http_proxy": "{{env `http_proxy`}}", + "https_proxy": "{{env `https_proxy`}}", + "iso_checksum": "ee628b029c116b8512cf60f7f8ec897b657dd8c99a89d92bdce514c8885e1c2a", + "iso_name": "debian-11.0.0-i386-netinst.iso", + "memory": "1024", + "mirror": "http://cdimage.debian.org/cdimage/release", + "mirror_directory": "11.0.0/i386/iso-cd", + "name": "debian-11.0-i386", + "no_proxy": "{{env `no_proxy`}}", + "preseed_path": "debian-9/preseed.cfg", + "template": "debian-11.0-i386", + "version": "TIMESTAMP" + } +} From 96848627388dba7f3f0dcc3f3708923af3a92a9a Mon Sep 17 00:00:00 2001 From: elreydetoda <10230166+elreydetoda@users.noreply.github.com> Date: Sat, 21 Aug 2021 16:16:30 -0400 Subject: [PATCH 1395/1622] adding more dynamic links for downloads with centos-stream-8 Signed-off-by: Alex R <10230166+elreydetoda@users.noreply.github.com> --- packer_templates/centos/centos-stream-8-x86_64.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packer_templates/centos/centos-stream-8-x86_64.json b/packer_templates/centos/centos-stream-8-x86_64.json index 9518870b8..ca44a67e9 100644 --- a/packer_templates/centos/centos-stream-8-x86_64.json +++ b/packer_templates/centos/centos-stream-8-x86_64.json @@ -161,8 +161,8 @@ "https_proxy": "{{env `https_proxy`}}", "hyperv_generation": "1", "hyperv_switch": "bento", - "iso_checksum": "46efc80cd973bc2c55f0bed7e29a3351e0f623675e55059bf2ee19209bb2a604", - "iso_name": "CentOS-Stream-8-x86_64-20210524-dvd1.iso", + "iso_checksum": "file:https://mirrors.edge.kernel.org/centos/8-stream/isos/x86_64/CHECKSUM", + "iso_name": "CentOS-Stream-8-x86_64-latest-dvd1.iso", "ks_path": "8-stream/ks.cfg", "memory": "1024", "mirror": "http://mirrors.kernel.org/centos", From 680952d7d0627532a6c25508933c1a2e3fb49595 Mon Sep 17 00:00:00 2001 From: "chef-expeditor[bot]" <49165653+chef-expeditor[bot]@users.noreply.github.com> Date: Tue, 24 Aug 2021 17:28:35 +0000 Subject: [PATCH 1396/1622] Updating references of master to main as part of Expeditor agent rename. From 3a36eb4ba396eaecf4565899eaf067fbc2fb6529 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Tue, 7 Sep 2021 18:10:46 -0700 Subject: [PATCH 1397/1622] Update centos 8.3 to 8.4 Signed-off-by: Tim Smith <tsmith@chef.io> --- builds.yml | 2 +- ...centos-8.3-x86_64.json => centos-8.4-x86_64.json} | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) rename packer_templates/centos/{centos-8.3-x86_64.json => centos-8.4-x86_64.json} (95%) diff --git a/builds.yml b/builds.yml index 984a22cd0..7b152a408 100644 --- a/builds.yml +++ b/builds.yml @@ -5,7 +5,7 @@ public: - 'centos-6.10-i386' - 'centos-6.10' - 'centos-7.9' -- 'centos-8.3' +- 'centos-8.4' - 'centos-stream-8' - 'debian-9.13-i386' - 'debian-9.13' diff --git a/packer_templates/centos/centos-8.3-x86_64.json b/packer_templates/centos/centos-8.4-x86_64.json similarity index 95% rename from packer_templates/centos/centos-8.3-x86_64.json rename to packer_templates/centos/centos-8.4-x86_64.json index 7c0d645bf..c16cdb5f5 100644 --- a/packer_templates/centos/centos-8.3-x86_64.json +++ b/packer_templates/centos/centos-8.4-x86_64.json @@ -148,7 +148,7 @@ } ], "variables": { - "box_basename": "centos-8.3", + "box_basename": "centos-8.4", "build_directory": "../../builds", "build_timestamp": "{{isotime \"2019102650405\"}}", "cpus": "2", @@ -161,15 +161,15 @@ "https_proxy": "{{env `https_proxy`}}", "hyperv_generation": "1", "hyperv_switch": "bento", - "iso_checksum": "aaf9d4b3071c16dbbda01dfe06085e5d0fdac76df323e3bbe87cce4318052247", - "iso_name": "CentOS-8.3.2011-x86_64-dvd1.iso", + "iso_checksum": "0394ecfa994db75efc1413207d2e5ac67af4f6685b3b896e2837c682221fd6b2", + "iso_name": "CentOS-8.4.2105-x86_64-dvd1.iso", "ks_path": "8/ks.cfg", "memory": "1024", "mirror": "http://mirrors.kernel.org/centos", - "mirror_directory": "8.3.2011/isos/x86_64", - "name": "centos-8.3", + "mirror_directory": "8.4.2105/isos/x86_64", + "name": "centos-8.4", "no_proxy": "{{env `no_proxy`}}", - "template": "centos-8.3-x86_64", + "template": "centos-8.4-x86_64", "boot_command": "<up><wait><tab> inst.text inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>", "version": "TIMESTAMP" } From 315abb4efa468cc6ae3b4707e2248ff945357f9a Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Fri, 10 Sep 2021 13:48:39 -0700 Subject: [PATCH 1398/1622] Move debian 10 to the archive source Signed-off-by: Tim Smith <tsmith@chef.io> --- packer_templates/debian/debian-10.10-amd64.json | 2 +- packer_templates/debian/debian-10.10-i386.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packer_templates/debian/debian-10.10-amd64.json b/packer_templates/debian/debian-10.10-amd64.json index 80b372adf..6c97ee8c6 100644 --- a/packer_templates/debian/debian-10.10-amd64.json +++ b/packer_templates/debian/debian-10.10-amd64.json @@ -207,7 +207,7 @@ "iso_checksum": "c433254a7c5b5b9e6a05f9e1379a0bd6ab3323f89b56537b684b6d1bd1f8b6ad", "iso_name": "debian-10.10.0-amd64-netinst.iso", "memory": "1024", - "mirror": "http://cdimage.debian.org/cdimage/release", + "mirror": "http://cdimage.debian.org/cdimage/archive", "mirror_directory": "10.10.0/amd64/iso-cd", "name": "debian-10.10", "no_proxy": "{{env `no_proxy`}}", diff --git a/packer_templates/debian/debian-10.10-i386.json b/packer_templates/debian/debian-10.10-i386.json index 2fd10cb3b..4d6434d3f 100644 --- a/packer_templates/debian/debian-10.10-i386.json +++ b/packer_templates/debian/debian-10.10-i386.json @@ -207,7 +207,7 @@ "iso_checksum": "cf824084643fb82f74d1fbec804baaf74539dadd279af2098da94254f758e5b7", "iso_name": "debian-10.10.0-i386-netinst.iso", "memory": "1024", - "mirror": "http://cdimage.debian.org/cdimage/release", + "mirror": "http://cdimage.debian.org/cdimage/archive", "mirror_directory": "10.10.0/i386/iso-cd", "name": "debian-10.10-i386", "no_proxy": "{{env `no_proxy`}}", From 362526cc49004109b51bc07742361c7621e096ef Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Fri, 10 Sep 2021 14:17:46 -0700 Subject: [PATCH 1399/1622] Remove dead dead dead CentOS 6 The ISOs are no longer hosted on the mirrors. It's time. Signed-off-by: Tim Smith <tsmith@chef.io> --- builds.yml | 3 - packer_templates/centos/centos-6.10-i386.json | 183 ------------------ .../centos/centos-6.10-x86_64.json | 183 ------------------ 3 files changed, 369 deletions(-) delete mode 100644 packer_templates/centos/centos-6.10-i386.json delete mode 100644 packer_templates/centos/centos-6.10-x86_64.json diff --git a/builds.yml b/builds.yml index 7b152a408..633286b15 100644 --- a/builds.yml +++ b/builds.yml @@ -2,8 +2,6 @@ public: - 'almalinux-8.4' - 'amazon-2' -- 'centos-6.10-i386' -- 'centos-6.10' - 'centos-7.9' - 'centos-8.4' - 'centos-stream-8' @@ -36,7 +34,6 @@ public: # slug box name: text string from standard box name to match (generally the same) slugs: 'almalinux-8': 'almalinux-8' - 'centos-6': 'centos-6' 'centos-7': 'centos-7' 'centos-8': 'centos-8' 'debian-11': 'debian-11' diff --git a/packer_templates/centos/centos-6.10-i386.json b/packer_templates/centos/centos-6.10-i386.json deleted file mode 100644 index cad51af4e..000000000 --- a/packer_templates/centos/centos-6.10-i386.json +++ /dev/null @@ -1,183 +0,0 @@ -{ - "builders": [ - { - "boot_command": [ - "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" - ], - "boot_wait": "5s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", - "guest_additions_url": "{{ user `guest_additions_url` }}", - "guest_os_type": "RedHat", - "hard_drive_interface": "sata", - "headless": "{{ user `headless` }}", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-virtualbox", - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "type": "virtualbox-iso", - "virtualbox_version_file": ".vbox_version", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<up><wait><tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" - ], - "boot_wait": "5s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "centos", - "headless": "{{ user `headless` }}", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-vmware", - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "tools_upload_flavor": "linux", - "type": "vmware-iso", - "vm_name": "{{ user `template` }}", - "vmx_data": { - "cpuid.coresPerSocket": "1" - }, - "vmx_remove_ethernet_interfaces": true - }, - { - "boot_command": [ - "<up><wait><tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" - ], - "boot_wait": "5s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "centos", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-parallels", - "parallels_tools_flavor": "lin", - "prlctl_version_file": ".prlctl_version", - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "type": "parallels-iso", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<wait5><tab> text ks=hd:fd0:/ks.cfg<enter><wait5><esc>" - ], - "boot_wait": "5s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "floppy_files": [ - "{{user `http_directory`}}/{{user `ks_path`}}" - ], - "generation": "{{user `hyperv_generation`}}", - "guest_additions_mode": "disable", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-hyperv", - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "switch_name": "{{ user `hyperv_switch`}}", - "type": "hyperv-iso", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<up><wait><tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" - ], - "boot_wait": "5s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "headless": "{{ user `headless` }}", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-qemu", - "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "type": "qemu", - "vm_name": "{{ user `template` }}" - } - ], - "post-processors": [ - { - "output": "{{ user `build_directory` }}/{{user `box_basename`}}.{{.Provider}}.box", - "type": "vagrant" - } - ], - "provisioners": [ - { - "environment_vars": [ - "HOME_DIR=/home/vagrant", - "http_proxy={{user `http_proxy`}}", - "https_proxy={{user `https_proxy`}}", - "no_proxy={{user `no_proxy`}}" - ], - "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", - "expect_disconnect": true, - "scripts": [ - "{{template_dir}}/scripts/update.sh", - "{{template_dir}}/../_common/motd.sh", - "{{template_dir}}/../_common/sshd.sh", - "{{template_dir}}/scripts/networking.sh", - "{{template_dir}}/../_common/vagrant.sh", - "{{template_dir}}/../_common/virtualbox.sh", - "{{template_dir}}/../_common/vmware.sh", - "{{template_dir}}/../_common/parallels.sh", - "{{template_dir}}/scripts/cleanup.sh", - "{{template_dir}}/../_common/minimize.sh" - ], - "type": "shell" - } - ], - "variables": { - "box_basename": "centos-6.10-i386", - "build_directory": "../../builds", - "build_timestamp": "{{isotime \"20060102150405\"}}", - "cpus": "2", - "disk_size": "65536", - "git_revision": "__unknown_git_revision__", - "guest_additions_url": "", - "headless": "", - "http_directory": "{{template_dir}}/http", - "http_proxy": "{{env `http_proxy`}}", - "https_proxy": "{{env `https_proxy`}}", - "hyperv_generation": "1", - "hyperv_switch": "bento", - "iso_checksum": "25d95b3f178e59bd672fa97e043a9191cbf73bb6cd12f5df9b540fa88076cae8", - "iso_name": "CentOS-6.10-i386-bin-DVD1.iso", - "ks_path": "6/ks.cfg", - "memory": "1024", - "mirror": "http://mirrors.kernel.org/centos", - "mirror_directory": "6.10/isos/i386", - "name": "centos-6.10-i386", - "no_proxy": "{{env `no_proxy`}}", - "template": "centos-6.10-i386", - "version": "TIMESTAMP" - } -} diff --git a/packer_templates/centos/centos-6.10-x86_64.json b/packer_templates/centos/centos-6.10-x86_64.json deleted file mode 100644 index 96cc4622f..000000000 --- a/packer_templates/centos/centos-6.10-x86_64.json +++ /dev/null @@ -1,183 +0,0 @@ -{ - "builders": [ - { - "boot_command": [ - "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" - ], - "boot_wait": "5s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", - "guest_additions_url": "{{ user `guest_additions_url` }}", - "guest_os_type": "RedHat_64", - "hard_drive_interface": "sata", - "headless": "{{ user `headless` }}", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-virtualbox", - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "type": "virtualbox-iso", - "virtualbox_version_file": ".vbox_version", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<up><wait><tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" - ], - "boot_wait": "5s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "centos-64", - "headless": "{{ user `headless` }}", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-vmware", - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "tools_upload_flavor": "linux", - "type": "vmware-iso", - "vm_name": "{{ user `template` }}", - "vmx_data": { - "cpuid.coresPerSocket": "1" - }, - "vmx_remove_ethernet_interfaces": true - }, - { - "boot_command": [ - "<up><wait><tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" - ], - "boot_wait": "5s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "centos", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-parallels", - "parallels_tools_flavor": "lin", - "prlctl_version_file": ".prlctl_version", - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "type": "parallels-iso", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<wait5><tab> text ks=hd:fd0:/ks.cfg<enter><wait5><esc>" - ], - "boot_wait": "5s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "floppy_files": [ - "{{user `http_directory`}}/{{user `ks_path`}}" - ], - "generation": "{{user `hyperv_generation`}}", - "guest_additions_mode": "disable", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-hyperv", - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "switch_name": "{{ user `hyperv_switch`}}", - "type": "hyperv-iso", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<up><wait><tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" - ], - "boot_wait": "5s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "headless": "{{ user `headless` }}", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-qemu", - "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "type": "qemu", - "vm_name": "{{ user `template` }}" - } - ], - "post-processors": [ - { - "output": "{{ user `build_directory` }}/{{user `box_basename`}}.{{.Provider}}.box", - "type": "vagrant" - } - ], - "provisioners": [ - { - "environment_vars": [ - "HOME_DIR=/home/vagrant", - "http_proxy={{user `http_proxy`}}", - "https_proxy={{user `https_proxy`}}", - "no_proxy={{user `no_proxy`}}" - ], - "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", - "expect_disconnect": true, - "scripts": [ - "{{template_dir}}/scripts/update.sh", - "{{template_dir}}/../_common/motd.sh", - "{{template_dir}}/../_common/sshd.sh", - "{{template_dir}}/scripts/networking.sh", - "{{template_dir}}/../_common/vagrant.sh", - "{{template_dir}}/../_common/virtualbox.sh", - "{{template_dir}}/../_common/vmware.sh", - "{{template_dir}}/../_common/parallels.sh", - "{{template_dir}}/scripts/cleanup.sh", - "{{template_dir}}/../_common/minimize.sh" - ], - "type": "shell" - } - ], - "variables": { - "box_basename": "centos-6.10", - "build_directory": "../../builds", - "build_timestamp": "{{isotime \"20060102150405\"}}", - "cpus": "2", - "disk_size": "65536", - "git_revision": "__unknown_git_revision__", - "guest_additions_url": "", - "headless": "", - "http_directory": "{{template_dir}}/http", - "http_proxy": "{{env `http_proxy`}}", - "https_proxy": "{{env `https_proxy`}}", - "hyperv_generation": "1", - "hyperv_switch": "bento", - "iso_checksum": "a68e46970678d4d297d46086ae2efdd3e994322d6d862ff51dcce25a0759e41c", - "iso_name": "CentOS-6.10-x86_64-bin-DVD1.iso", - "ks_path": "6/ks.cfg", - "memory": "1024", - "mirror": "http://mirrors.kernel.org/centos", - "mirror_directory": "6.10/isos/x86_64", - "name": "centos-6.10", - "no_proxy": "{{env `no_proxy`}}", - "template": "centos-6.10-x86_64", - "version": "TIMESTAMP" - } -} From d658512e3f0c29ff910372e9a2c4f87ba652c5b0 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Sat, 18 Sep 2021 10:08:45 -0700 Subject: [PATCH 1400/1622] Try workaround for windows images See https://github.com/chef/bento/issues/1370 Signed-off-by: Tim Smith <tsmith@chef.io> --- packer_templates/windows/windows-2019.json | 2 ++ 1 file changed, 2 insertions(+) diff --git a/packer_templates/windows/windows-2019.json b/packer_templates/windows/windows-2019.json index 89aa01c07..d667c4773 100644 --- a/packer_templates/windows/windows-2019.json +++ b/packer_templates/windows/windows-2019.json @@ -32,6 +32,8 @@ "guest_additions_url": "{{ user `guest_additions_url` }}", "guest_os_type": "Windows2016_64", "hard_drive_interface": "sata", + "iso_interface": "ide", + "guest_additions_interface": "sata", "headless": "{{ user `headless` }}", "iso_checksum": "{{ user `iso_checksum` }}", "iso_interface": "sata", From ff73f9a31e2811ba220f4aab11d3cfe0ecefb300 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Sat, 18 Sep 2021 10:10:01 -0700 Subject: [PATCH 1401/1622] Remove duplicate config Signed-off-by: Tim Smith <tsmith@chef.io> --- packer_templates/windows/windows-2019.json | 1 - 1 file changed, 1 deletion(-) diff --git a/packer_templates/windows/windows-2019.json b/packer_templates/windows/windows-2019.json index d667c4773..b689f22c6 100644 --- a/packer_templates/windows/windows-2019.json +++ b/packer_templates/windows/windows-2019.json @@ -36,7 +36,6 @@ "guest_additions_interface": "sata", "headless": "{{ user `headless` }}", "iso_checksum": "{{ user `iso_checksum` }}", - "iso_interface": "sata", "iso_url": "{{ user `iso_url` }}", "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-virtualbox", From a3f1ca7795e01016c93d94e1664185f44ecef736 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Sat, 18 Sep 2021 10:12:34 -0700 Subject: [PATCH 1402/1622] use workaround in all windows boxes Signed-off-by: Tim Smith <tsmith@chef.io> --- packer_templates/windows/windows-10.json | 3 ++- packer_templates/windows/windows-2012.json | 3 ++- packer_templates/windows/windows-2012r2.json | 3 ++- packer_templates/windows/windows-2016.json | 3 ++- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/packer_templates/windows/windows-10.json b/packer_templates/windows/windows-10.json index f6e9e1655..4abc9ea9e 100644 --- a/packer_templates/windows/windows-10.json +++ b/packer_templates/windows/windows-10.json @@ -36,7 +36,8 @@ "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", "iso_checksum": "{{ user `iso_checksum` }}", - "iso_interface": "sata", + "iso_interface": "ide", + "guest_additions_interface": "sata", "iso_url": "{{ user `iso_url` }}", "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-virtualbox", diff --git a/packer_templates/windows/windows-2012.json b/packer_templates/windows/windows-2012.json index 9361d3137..eea8c700d 100644 --- a/packer_templates/windows/windows-2012.json +++ b/packer_templates/windows/windows-2012.json @@ -34,7 +34,8 @@ "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", "iso_checksum": "{{ user `iso_checksum` }}", - "iso_interface": "sata", + "iso_interface": "ide", + "guest_additions_interface": "sata", "iso_url": "{{ user `iso_url` }}", "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-virtualbox", diff --git a/packer_templates/windows/windows-2012r2.json b/packer_templates/windows/windows-2012r2.json index acf67aa30..74494398a 100644 --- a/packer_templates/windows/windows-2012r2.json +++ b/packer_templates/windows/windows-2012r2.json @@ -34,7 +34,8 @@ "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", "iso_checksum": "{{ user `iso_checksum` }}", - "iso_interface": "sata", + "iso_interface": "ide", + "guest_additions_interface": "sata", "iso_url": "{{ user `iso_url` }}", "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-virtualbox", diff --git a/packer_templates/windows/windows-2016.json b/packer_templates/windows/windows-2016.json index e60262034..bf324dde5 100644 --- a/packer_templates/windows/windows-2016.json +++ b/packer_templates/windows/windows-2016.json @@ -34,7 +34,8 @@ "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", "iso_checksum": "{{ user `iso_checksum` }}", - "iso_interface": "sata", + "iso_interface": "ide", + "guest_additions_interface": "sata", "iso_url": "{{ user `iso_url` }}", "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-virtualbox", From 29ba764a907bbc229bada779868b284828f4d6a0 Mon Sep 17 00:00:00 2001 From: Jeff Noxon <jeff@noxon.cc> Date: Sun, 19 Sep 2021 15:08:24 -0500 Subject: [PATCH 1403/1622] Apple M1 support (Ubuntu 20.04, Parallels) Signed-off-by: Jeff Noxon <jeff@noxon.cc> --- packer_templates/_common/parallels.sh | 6 +- packer_templates/ubuntu/scripts/networking.sh | 2 +- .../ubuntu/ubuntu-20.04-live-arm64.json | 92 +++++++++++++++++++ 3 files changed, 98 insertions(+), 2 deletions(-) create mode 100644 packer_templates/ubuntu/ubuntu-20.04-live-arm64.json diff --git a/packer_templates/_common/parallels.sh b/packer_templates/_common/parallels.sh index 1b2a6896a..95ad82b0b 100644 --- a/packer_templates/_common/parallels.sh +++ b/packer_templates/_common/parallels.sh @@ -6,7 +6,11 @@ HOME_DIR="${HOME_DIR:-/home/vagrant}"; case "$PACKER_BUILDER_TYPE" in parallels-iso|parallels-pvm) mkdir -p /tmp/parallels; - mount -o loop $HOME_DIR/prl-tools-lin.iso /tmp/parallels; + if [ `uname -m` = "aarch64" ] ; then + mount -o loop $HOME_DIR/prl-tools-lin-arm.iso /tmp/parallels; + else + mount -o loop $HOME_DIR/prl-tools-lin.iso /tmp/parallels; + fi VER="`cat /tmp/parallels/version`"; echo "Parallels Tools Version: $VER"; diff --git a/packer_templates/ubuntu/scripts/networking.sh b/packer_templates/ubuntu/scripts/networking.sh index 77bc9abee..270a78670 100644 --- a/packer_templates/ubuntu/scripts/networking.sh +++ b/packer_templates/ubuntu/scripts/networking.sh @@ -13,6 +13,6 @@ network: EOF # Disable Predictable Network Interface names and use eth0 -sed -i 's/en[[:alnum:]]*/eth0/g' /etc/network/interfaces; +[ -e /etc/network/interfaces ] && sed -i 's/en[[:alnum:]]*/eth0/g' /etc/network/interfaces; sed -i 's/GRUB_CMDLINE_LINUX="\(.*\)"/GRUB_CMDLINE_LINUX="net.ifnames=0 biosdevname=0 \1"/g' /etc/default/grub; update-grub; diff --git a/packer_templates/ubuntu/ubuntu-20.04-live-arm64.json b/packer_templates/ubuntu/ubuntu-20.04-live-arm64.json new file mode 100644 index 000000000..881323bd9 --- /dev/null +++ b/packer_templates/ubuntu/ubuntu-20.04-live-arm64.json @@ -0,0 +1,92 @@ +{ + "builders": [ + { + "boot_command": [ + "<esc>", + "linux /casper/vmlinuz", + " quiet", + " autoinstall", + " ds='nocloud-net;s=http://{{.HTTPIP}}:{{.HTTPPort}}/'", + "<enter>", + "initrd /casper/initrd<enter>", + "boot<enter>" + ], + "boot_wait": "5s", + "cpus": "{{ user `cpus` }}", + "disk_size": "{{user `disk_size`}}", + "guest_os_type": "ubuntu", + "http_directory": "{{user `http_directory`}}", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "memory": "{{ user `memory` }}", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-parallels", + "parallels_tools_flavor": "lin-arm", + "prlctl_version_file": ".prlctl_version", + "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_timeout": "10000s", + "ssh_username": "vagrant", + "type": "parallels-iso", + "vm_name": "{{ user `template` }}" + } + ], + "post-processors": [ + { + "output": "{{ user `build_directory` }}/{{user `box_basename`}}.{{.Provider}}.box", + "type": "vagrant" + } + ], + "provisioners": [ + { + "environment_vars": [ + "HOME_DIR=/home/vagrant", + "http_proxy={{user `http_proxy`}}", + "https_proxy={{user `https_proxy`}}", + "no_proxy={{user `no_proxy`}}" + ], + "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", + "expect_disconnect": true, + "scripts": [ + "{{template_dir}}/scripts/update.sh", + "{{template_dir}}/../_common/motd.sh", + "{{template_dir}}/../_common/sshd.sh", + "{{template_dir}}/scripts/networking.sh", + "{{template_dir}}/scripts/sudoers.sh", + "{{template_dir}}/scripts/vagrant.sh", + "{{template_dir}}/../_common/virtualbox.sh", + "{{template_dir}}/scripts/vmware.sh", + "{{template_dir}}/../_common/parallels.sh", + "{{template_dir}}/scripts/hyperv.sh", + "{{template_dir}}/scripts/cleanup.sh", + "{{template_dir}}/../_common/minimize.sh" + ], + "type": "shell" + } + ], + "variables": { + "box_basename": "ubuntu-20.04-live", + "build_directory": "../../builds", + "build_timestamp": "{{isotime \"20060102150405\"}}", + "cpus": "2", + "disk_size": "65536", + "git_revision": "__unknown_git_revision__", + "guest_additions_url": "", + "headless": "", + "http_directory": "{{template_dir}}/http", + "http_proxy": "{{env `http_proxy`}}", + "https_proxy": "{{env `https_proxy`}}", + "hyperv_generation": "2", + "hyperv_switch": "bento", + "iso_checksum": "d6fea1f11b4d23b481a48198f51d9b08258a36f6024cb5cec447fe78379959ce", + "iso_name": "ubuntu-20.04.3-live-server-arm64.iso", + "memory": "1024", + "mirror": "http://cdimage.ubuntu.com", + "mirror_directory": "releases/20.04/release", + "name": "ubuntu-20.04-live", + "no_proxy": "{{env `no_proxy`}}", + "preseed_path": "preseed.cfg", + "template": "ubuntu-20.04-live-arm64", + "version": "TIMESTAMP" + } +} From 36283df0a012dc592bdb024b97df8f335e8fa162 Mon Sep 17 00:00:00 2001 From: SG <13872653+mmguero@users.noreply.github.com> Date: Thu, 30 Sep 2021 11:00:38 -0600 Subject: [PATCH 1404/1622] Standardize qemuargs across packer templates Now, minimally `qemuargs` has -m (using `memory` in the user variables) and -display (using `qemu_display`, which defaults to "none" in the user variables to support headless builds). Signed-off-by: SG <13872653+mmguero@users.noreply.github.com> --- .../almalinux/almalinux-8.4-x86_64.json | 7 ++++++- packer_templates/centos/centos-7.9-x86_64.json | 7 ++++++- packer_templates/centos/centos-8.4-x86_64.json | 7 ++++++- .../centos/centos-stream-8-x86_64.json | 7 ++++++- packer_templates/debian/debian-10.10-amd64.json | 7 ++++++- packer_templates/debian/debian-10.10-i386.json | 7 ++++++- packer_templates/debian/debian-11.0-amd64.json | 7 ++++++- packer_templates/debian/debian-11.0-i386.json | 7 ++++++- packer_templates/debian/debian-9.13-amd64.json | 7 ++++++- packer_templates/debian/debian-9.13-i386.json | 7 ++++++- packer_templates/debian/debian-9.13-ppc64el.json | 7 ++++++- packer_templates/fedora/fedora-33-x86_64.json | 14 ++++++++++---- packer_templates/fedora/fedora-34-x86_64.json | 14 ++++++++++---- packer_templates/freebsd/freebsd-11.4-amd64.json | 7 ++++++- packer_templates/freebsd/freebsd-11.4-i386.json | 7 ++++++- packer_templates/freebsd/freebsd-12.2-amd64.json | 7 ++++++- packer_templates/freebsd/freebsd-12.2-i386.json | 7 ++++++- packer_templates/freebsd/freebsd-13.0-amd64.json | 7 ++++++- .../hardenedbsd/hardenedbsd-11-amd64.json | 7 ++++++- .../opensuse/opensuse-leap-15.3-x86_64.json | 7 ++++++- packer_templates/oraclelinux/oracle-6.10-i386.json | 7 ++++++- .../oraclelinux/oracle-6.10-x86_64.json | 7 ++++++- .../oraclelinux/oracle-7.9-x86_64.json | 7 ++++++- .../oraclelinux/oracle-8.3-x86_64.json | 7 ++++++- packer_templates/rhel/rhel-6.10-i386.json | 7 ++++++- packer_templates/rhel/rhel-6.10-x86_64.json | 7 ++++++- packer_templates/rhel/rhel-7.6-x86_64.json | 7 ++++++- packer_templates/rhel/rhel-8.0-x86_64.json | 7 ++++++- .../rockylinux/rockylinux-8.4-x86_64.json | 7 ++++++- .../scientificlinux/scientific-7.9-x86_64.json | 7 ++++++- packer_templates/sles/sles-11-sp4-x86_64.json | 7 ++++++- packer_templates/sles/sles-12-sp2-x86_64.json | 7 ++++++- packer_templates/sles/sles-12-sp3-x86_64.json | 7 ++++++- packer_templates/sles/sles-15-sp1.json | 7 ++++++- packer_templates/sles/sles-15.json | 7 ++++++- packer_templates/solaris/solaris-11-4-x86.json | 1 + packer_templates/solaris/solaris-11-x86.json | 1 + .../springdalelinux-7.9-x86_64.json | 7 ++++++- packer_templates/ubuntu/ubuntu-18.04-amd64.json | 7 ++++++- packer_templates/ubuntu/ubuntu-20.04-amd64.json | 7 ++++++- .../ubuntu/ubuntu-20.04-live-amd64.json | 7 ++++++- packer_templates/ubuntu/ubuntu-20.10-amd64.json | 7 ++++++- packer_templates/ubuntu/ubuntu-21.04-amd64.json | 7 ++++++- packer_templates/windows/windows-10.json | 5 +++++ packer_templates/windows/windows-10gen2.json | 5 +++++ packer_templates/windows/windows-2012.json | 5 +++++ packer_templates/windows/windows-2012r2.json | 5 +++++ packer_templates/windows/windows-2016.json | 5 +++++ packer_templates/windows/windows-2019.json | 5 +++++ 49 files changed, 286 insertions(+), 47 deletions(-) diff --git a/packer_templates/almalinux/almalinux-8.4-x86_64.json b/packer_templates/almalinux/almalinux-8.4-x86_64.json index 86c34053e..12d70bdf9 100644 --- a/packer_templates/almalinux/almalinux-8.4-x86_64.json +++ b/packer_templates/almalinux/almalinux-8.4-x86_64.json @@ -113,7 +113,11 @@ "ssh_timeout": "10000s", "ssh_username": "vagrant", "type": "qemu", - "vm_name": "{{ user `template` }}" + "vm_name": "{{ user `template` }}", + "qemuargs": [ + [ "-m", "{{ user `memory` }}" ], + [ "-display", "{{ user `qemu_display` }}" ] + ] } ], "post-processors": [ @@ -169,6 +173,7 @@ "mirror_directory": "8.4/isos/x86_64", "name": "almalinux-8.4", "no_proxy": "{{env `no_proxy`}}", + "qemu_display": "none", "template": "almalinux-8.4-x86_64", "boot_command": "<up><wait><tab> inst.text inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>", "version": "TIMESTAMP" diff --git a/packer_templates/centos/centos-7.9-x86_64.json b/packer_templates/centos/centos-7.9-x86_64.json index 16808cd71..09fbe875e 100644 --- a/packer_templates/centos/centos-7.9-x86_64.json +++ b/packer_templates/centos/centos-7.9-x86_64.json @@ -121,7 +121,11 @@ "ssh_timeout": "10000s", "ssh_username": "vagrant", "type": "qemu", - "vm_name": "{{ user `template` }}" + "vm_name": "{{ user `template` }}", + "qemuargs": [ + [ "-m", "{{ user `memory` }}" ], + [ "-display", "{{ user `qemu_display` }}" ] + ] } ], "post-processors": [ @@ -177,6 +181,7 @@ "mirror_directory": "7.9.2009/isos/x86_64", "name": "centos-7.9", "no_proxy": "{{env `no_proxy`}}", + "qemu_display": "none", "template": "centos-7.9-x86_64", "version": "TIMESTAMP" } diff --git a/packer_templates/centos/centos-8.4-x86_64.json b/packer_templates/centos/centos-8.4-x86_64.json index c16cdb5f5..6eed911e8 100644 --- a/packer_templates/centos/centos-8.4-x86_64.json +++ b/packer_templates/centos/centos-8.4-x86_64.json @@ -113,7 +113,11 @@ "ssh_timeout": "10000s", "ssh_username": "vagrant", "type": "qemu", - "vm_name": "{{ user `template` }}" + "vm_name": "{{ user `template` }}", + "qemuargs": [ + [ "-m", "{{ user `memory` }}" ], + [ "-display", "{{ user `qemu_display` }}" ] + ] } ], "post-processors": [ @@ -169,6 +173,7 @@ "mirror_directory": "8.4.2105/isos/x86_64", "name": "centos-8.4", "no_proxy": "{{env `no_proxy`}}", + "qemu_display": "none", "template": "centos-8.4-x86_64", "boot_command": "<up><wait><tab> inst.text inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>", "version": "TIMESTAMP" diff --git a/packer_templates/centos/centos-stream-8-x86_64.json b/packer_templates/centos/centos-stream-8-x86_64.json index ca44a67e9..7ce0ae7f7 100644 --- a/packer_templates/centos/centos-stream-8-x86_64.json +++ b/packer_templates/centos/centos-stream-8-x86_64.json @@ -113,7 +113,11 @@ "ssh_timeout": "10000s", "ssh_username": "vagrant", "type": "qemu", - "vm_name": "{{ user `template` }}" + "vm_name": "{{ user `template` }}", + "qemuargs": [ + [ "-m", "{{ user `memory` }}" ], + [ "-display", "{{ user `qemu_display` }}" ] + ] } ], "post-processors": [ @@ -169,6 +173,7 @@ "mirror_directory": "8-stream/isos/x86_64", "name": "centos-stream-8", "no_proxy": "{{env `no_proxy`}}", + "qemu_display": "none", "template": "centos-stream-8-x86_64", "boot_command": "<up><wait><tab> inst.text inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>", "version": "TIMESTAMP" diff --git a/packer_templates/debian/debian-10.10-amd64.json b/packer_templates/debian/debian-10.10-amd64.json index 6c97ee8c6..06f4c53d9 100644 --- a/packer_templates/debian/debian-10.10-amd64.json +++ b/packer_templates/debian/debian-10.10-amd64.json @@ -156,7 +156,11 @@ "ssh_timeout": "10000s", "ssh_username": "vagrant", "type": "qemu", - "vm_name": "{{ user `template` }}" + "vm_name": "{{ user `template` }}", + "qemuargs": [ + [ "-m", "{{ user `memory` }}" ], + [ "-display", "{{ user `qemu_display` }}" ] + ] } ], "post-processors": [ @@ -212,6 +216,7 @@ "name": "debian-10.10", "no_proxy": "{{env `no_proxy`}}", "preseed_path": "debian-9/preseed.cfg", + "qemu_display": "none", "template": "debian-10.10-amd64", "version": "TIMESTAMP" } diff --git a/packer_templates/debian/debian-10.10-i386.json b/packer_templates/debian/debian-10.10-i386.json index 4d6434d3f..8d09dbeda 100644 --- a/packer_templates/debian/debian-10.10-i386.json +++ b/packer_templates/debian/debian-10.10-i386.json @@ -156,7 +156,11 @@ "ssh_timeout": "10000s", "ssh_username": "vagrant", "type": "qemu", - "vm_name": "{{ user `template` }}" + "vm_name": "{{ user `template` }}", + "qemuargs": [ + [ "-m", "{{ user `memory` }}" ], + [ "-display", "{{ user `qemu_display` }}" ] + ] } ], "post-processors": [ @@ -212,6 +216,7 @@ "name": "debian-10.10-i386", "no_proxy": "{{env `no_proxy`}}", "preseed_path": "debian-9/preseed.cfg", + "qemu_display": "none", "template": "debian-10.10-i386", "version": "TIMESTAMP" } diff --git a/packer_templates/debian/debian-11.0-amd64.json b/packer_templates/debian/debian-11.0-amd64.json index e346bfdd4..f5900a87d 100644 --- a/packer_templates/debian/debian-11.0-amd64.json +++ b/packer_templates/debian/debian-11.0-amd64.json @@ -156,7 +156,11 @@ "ssh_timeout": "10000s", "ssh_username": "vagrant", "type": "qemu", - "vm_name": "{{ user `template` }}" + "vm_name": "{{ user `template` }}", + "qemuargs": [ + [ "-m", "{{ user `memory` }}" ], + [ "-display", "{{ user `qemu_display` }}" ] + ] } ], "post-processors": [ @@ -212,6 +216,7 @@ "name": "debian-11.0", "no_proxy": "{{env `no_proxy`}}", "preseed_path": "debian-9/preseed.cfg", + "qemu_display": "none", "template": "debian-11.0-amd64", "version": "TIMESTAMP" } diff --git a/packer_templates/debian/debian-11.0-i386.json b/packer_templates/debian/debian-11.0-i386.json index 5d4799b70..e4331f749 100644 --- a/packer_templates/debian/debian-11.0-i386.json +++ b/packer_templates/debian/debian-11.0-i386.json @@ -156,7 +156,11 @@ "ssh_timeout": "10000s", "ssh_username": "vagrant", "type": "qemu", - "vm_name": "{{ user `template` }}" + "vm_name": "{{ user `template` }}", + "qemuargs": [ + [ "-m", "{{ user `memory` }}" ], + [ "-display", "{{ user `qemu_display` }}" ] + ] } ], "post-processors": [ @@ -212,6 +216,7 @@ "name": "debian-11.0-i386", "no_proxy": "{{env `no_proxy`}}", "preseed_path": "debian-9/preseed.cfg", + "qemu_display": "none", "template": "debian-11.0-i386", "version": "TIMESTAMP" } diff --git a/packer_templates/debian/debian-9.13-amd64.json b/packer_templates/debian/debian-9.13-amd64.json index 2cdf913e8..7ced97c09 100644 --- a/packer_templates/debian/debian-9.13-amd64.json +++ b/packer_templates/debian/debian-9.13-amd64.json @@ -156,7 +156,11 @@ "ssh_timeout": "10000s", "ssh_username": "vagrant", "type": "qemu", - "vm_name": "{{ user `template` }}" + "vm_name": "{{ user `template` }}", + "qemuargs": [ + [ "-m", "{{ user `memory` }}" ], + [ "-display", "{{ user `qemu_display` }}" ] + ] } ], "post-processors": [ @@ -212,6 +216,7 @@ "name": "debian-9.13", "no_proxy": "{{env `no_proxy`}}", "preseed_path": "debian-9/preseed.cfg", + "qemu_display": "none", "template": "debian-9.13-amd64", "version": "TIMESTAMP" } diff --git a/packer_templates/debian/debian-9.13-i386.json b/packer_templates/debian/debian-9.13-i386.json index 098e9c809..f79d451a2 100644 --- a/packer_templates/debian/debian-9.13-i386.json +++ b/packer_templates/debian/debian-9.13-i386.json @@ -156,7 +156,11 @@ "ssh_timeout": "10000s", "ssh_username": "vagrant", "type": "qemu", - "vm_name": "{{ user `template` }}" + "vm_name": "{{ user `template` }}", + "qemuargs": [ + [ "-m", "{{ user `memory` }}" ], + [ "-display", "{{ user `qemu_display` }}" ] + ] } ], "post-processors": [ @@ -212,6 +216,7 @@ "name": "debian-9.13-i386", "no_proxy": "{{env `no_proxy`}}", "preseed_path": "debian-9/preseed.cfg", + "qemu_display": "none", "template": "debian-9.13-i386", "version": "TIMESTAMP" } diff --git a/packer_templates/debian/debian-9.13-ppc64el.json b/packer_templates/debian/debian-9.13-ppc64el.json index fa8e87e6e..731a1b68b 100644 --- a/packer_templates/debian/debian-9.13-ppc64el.json +++ b/packer_templates/debian/debian-9.13-ppc64el.json @@ -43,7 +43,11 @@ "ssh_username": "vagrant", "type": "qemu", "use_default_display": true, - "vm_name": "{{ user `template` }}" + "vm_name": "{{ user `template` }}", + "qemuargs": [ + [ "-m", "{{ user `memory` }}" ], + [ "-display", "{{ user `qemu_display` }}" ] + ] } ], "post-processors": [ @@ -98,6 +102,7 @@ "name": "debian-9.13", "no_proxy": "{{env `no_proxy`}}", "preseed_path": "debian-9/preseed.cfg", + "qemu_display": "none", "template": "debian-9.13-ppc64el", "version": "TIMESTAMP" } diff --git a/packer_templates/fedora/fedora-33-x86_64.json b/packer_templates/fedora/fedora-33-x86_64.json index 7af5d4a20..1ed58d8f7 100644 --- a/packer_templates/fedora/fedora-33-x86_64.json +++ b/packer_templates/fedora/fedora-33-x86_64.json @@ -25,7 +25,11 @@ "ssh_timeout": "3600s", "ssh_username": "vagrant", "type": "qemu", - "vm_name": "{{ user `template` }}" + "vm_name": "{{ user `template` }}", + "qemuargs": [ + [ "-m", "{{ user `memory` }}" ], + [ "-display", "{{ user `qemu_display` }}" ] + ] }, { "boot_command": "{{user `boot_command`}}", @@ -117,7 +121,10 @@ "ssh_username": "vagrant", "type": "qemu", "vm_name": "{{ user `template` }}", - "qemuargs": [["{{ user `qemuargs_opt` }}","{{ user `qemuargs_value` }}"]] + "qemuargs": [ + [ "-m", "{{ user `memory` }}" ], + [ "-display", "{{ user `qemu_display` }}" ] + ] } ], "post-processors": [ @@ -175,9 +182,8 @@ "mirror_directory": "releases/33/Server/x86_64/iso", "name": "fedora-33", "no_proxy": "{{env `no_proxy`}}", + "qemu_display": "none", "template": "fedora-33-x86_64", - "qemuargs_opt": "-m", - "qemuargs_value": "1024M", "boot_command": "<up><wait><tab> inst.text inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>", "version": "TIMESTAMP" } diff --git a/packer_templates/fedora/fedora-34-x86_64.json b/packer_templates/fedora/fedora-34-x86_64.json index 2fba922d8..4a473b7e3 100644 --- a/packer_templates/fedora/fedora-34-x86_64.json +++ b/packer_templates/fedora/fedora-34-x86_64.json @@ -25,7 +25,11 @@ "ssh_timeout": "3600s", "ssh_username": "vagrant", "type": "qemu", - "vm_name": "{{ user `template` }}" + "vm_name": "{{ user `template` }}", + "qemuargs": [ + [ "-m", "{{ user `memory` }}" ], + [ "-display", "{{ user `qemu_display` }}" ] + ] }, { "boot_command": "{{user `boot_command`}}", @@ -117,7 +121,10 @@ "ssh_username": "vagrant", "type": "qemu", "vm_name": "{{ user `template` }}", - "qemuargs": [["{{ user `qemuargs_opt` }}","{{ user `qemuargs_value` }}"]] + "qemuargs": [ + [ "-m", "{{ user `memory` }}" ], + [ "-display", "{{ user `qemu_display` }}" ] + ] } ], "post-processors": [ @@ -174,9 +181,8 @@ "mirror_directory": "releases/34/Server/x86_64/iso", "name": "fedora-34", "no_proxy": "{{env `no_proxy`}}", + "qemu_display": "none", "template": "fedora-34-x86_64", - "qemuargs_opt": "-m", - "qemuargs_value": "1024M", "boot_command": "<up><wait><tab> inst.text inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>", "version": "TIMESTAMP" } diff --git a/packer_templates/freebsd/freebsd-11.4-amd64.json b/packer_templates/freebsd/freebsd-11.4-amd64.json index 4cb4f67f3..0cafb9418 100644 --- a/packer_templates/freebsd/freebsd-11.4-amd64.json +++ b/packer_templates/freebsd/freebsd-11.4-amd64.json @@ -147,7 +147,11 @@ "ssh_timeout": "10000s", "ssh_username": "vagrant", "type": "qemu", - "vm_name": "{{ user `template` }}" + "vm_name": "{{ user `template` }}", + "qemuargs": [ + [ "-m", "{{ user `memory` }}" ], + [ "-display", "{{ user `qemu_display` }}" ] + ] } ], "post-processors": [ @@ -200,6 +204,7 @@ "name": "freebsd-11.4", "no_proxy": "{{env `no_proxy`}}", "pkg_branch": "quarterly", + "qemu_display": "none", "template": "freebsd-11.4-amd64", "version": "TIMESTAMP" } diff --git a/packer_templates/freebsd/freebsd-11.4-i386.json b/packer_templates/freebsd/freebsd-11.4-i386.json index e2b0ed4ac..de26c1fb5 100644 --- a/packer_templates/freebsd/freebsd-11.4-i386.json +++ b/packer_templates/freebsd/freebsd-11.4-i386.json @@ -147,7 +147,11 @@ "ssh_timeout": "10000s", "ssh_username": "vagrant", "type": "qemu", - "vm_name": "{{ user `template` }}" + "vm_name": "{{ user `template` }}", + "qemuargs": [ + [ "-m", "{{ user `memory` }}" ], + [ "-display", "{{ user `qemu_display` }}" ] + ] } ], "post-processors": [ @@ -200,6 +204,7 @@ "name": "freebsd-11.4-i386", "no_proxy": "{{env `no_proxy`}}", "pkg_branch": "quarterly", + "qemu_display": "none", "template": "freebsd-11.4-i386", "version": "TIMESTAMP" } diff --git a/packer_templates/freebsd/freebsd-12.2-amd64.json b/packer_templates/freebsd/freebsd-12.2-amd64.json index ce2b4cfd5..f39a5fa5c 100644 --- a/packer_templates/freebsd/freebsd-12.2-amd64.json +++ b/packer_templates/freebsd/freebsd-12.2-amd64.json @@ -147,7 +147,11 @@ "ssh_timeout": "10000s", "ssh_username": "vagrant", "type": "qemu", - "vm_name": "{{ user `template` }}" + "vm_name": "{{ user `template` }}", + "qemuargs": [ + [ "-m", "{{ user `memory` }}" ], + [ "-display", "{{ user `qemu_display` }}" ] + ] } ], "post-processors": [ @@ -200,6 +204,7 @@ "name": "freebsd-12.2", "no_proxy": "{{env `no_proxy`}}", "pkg_branch": "quarterly", + "qemu_display": "none", "template": "freebsd-12.2-amd64", "version": "TIMESTAMP" } diff --git a/packer_templates/freebsd/freebsd-12.2-i386.json b/packer_templates/freebsd/freebsd-12.2-i386.json index 6ea9bd3d1..5cf7aef56 100644 --- a/packer_templates/freebsd/freebsd-12.2-i386.json +++ b/packer_templates/freebsd/freebsd-12.2-i386.json @@ -147,7 +147,11 @@ "ssh_timeout": "10000s", "ssh_username": "vagrant", "type": "qemu", - "vm_name": "{{ user `template` }}" + "vm_name": "{{ user `template` }}", + "qemuargs": [ + [ "-m", "{{ user `memory` }}" ], + [ "-display", "{{ user `qemu_display` }}" ] + ] } ], "post-processors": [ @@ -200,6 +204,7 @@ "name": "freebsd-12.2-i386", "no_proxy": "{{env `no_proxy`}}", "pkg_branch": "quarterly", + "qemu_display": "none", "template": "freebsd-12.2-i386", "version": "TIMESTAMP" } diff --git a/packer_templates/freebsd/freebsd-13.0-amd64.json b/packer_templates/freebsd/freebsd-13.0-amd64.json index 7fb547bd2..8478d1367 100644 --- a/packer_templates/freebsd/freebsd-13.0-amd64.json +++ b/packer_templates/freebsd/freebsd-13.0-amd64.json @@ -147,7 +147,11 @@ "ssh_timeout": "10000s", "ssh_username": "vagrant", "type": "qemu", - "vm_name": "{{ user `template` }}" + "vm_name": "{{ user `template` }}", + "qemuargs": [ + [ "-m", "{{ user `memory` }}" ], + [ "-display", "{{ user `qemu_display` }}" ] + ] } ], "post-processors": [ @@ -200,6 +204,7 @@ "name": "freebsd-13.0", "no_proxy": "{{env `no_proxy`}}", "pkg_branch": "quarterly", + "qemu_display": "none", "template": "freebsd-13.0-amd64", "version": "TIMESTAMP" } diff --git a/packer_templates/hardenedbsd/hardenedbsd-11-amd64.json b/packer_templates/hardenedbsd/hardenedbsd-11-amd64.json index 999614e17..9574bd091 100644 --- a/packer_templates/hardenedbsd/hardenedbsd-11-amd64.json +++ b/packer_templates/hardenedbsd/hardenedbsd-11-amd64.json @@ -147,7 +147,11 @@ "ssh_timeout": "10000s", "ssh_username": "vagrant", "type": "qemu", - "vm_name": "{{ user `template` }}" + "vm_name": "{{ user `template` }}", + "qemuargs": [ + [ "-m", "{{ user `memory` }}" ], + [ "-display", "{{ user `qemu_display` }}" ] + ] } ], "post-processors": [ @@ -197,6 +201,7 @@ "mirror_directory": "pub/hardenedbsd/11-stable/amd64/amd64/build-3", "name": "hardenedbsd-11", "no_proxy": "{{env `no_proxy`}}", + "qemu_display": "none", "template": "hardenedbsd-11-amd64", "version": "TIMESTAMP" } diff --git a/packer_templates/opensuse/opensuse-leap-15.3-x86_64.json b/packer_templates/opensuse/opensuse-leap-15.3-x86_64.json index 93dd4f2df..cd682be13 100644 --- a/packer_templates/opensuse/opensuse-leap-15.3-x86_64.json +++ b/packer_templates/opensuse/opensuse-leap-15.3-x86_64.json @@ -126,7 +126,11 @@ "ssh_timeout": "10000s", "ssh_username": "vagrant", "type": "qemu", - "vm_name": "{{ user `template` }}" + "vm_name": "{{ user `template` }}", + "qemuargs": [ + [ "-m", "{{ user `memory` }}" ], + [ "-display", "{{ user `qemu_display` }}" ] + ] } ], "post-processors": [ @@ -184,6 +188,7 @@ "mirror_directory": "leap/15.3/iso", "name": "opensuse-leap-15.3", "no_proxy": "{{env `no_proxy`}}", + "qemu_display": "none", "template": "opensuse-leap-15.3-x86_64", "version": "TIMESTAMP" } diff --git a/packer_templates/oraclelinux/oracle-6.10-i386.json b/packer_templates/oraclelinux/oracle-6.10-i386.json index b44746f3c..afeb352b7 100644 --- a/packer_templates/oraclelinux/oracle-6.10-i386.json +++ b/packer_templates/oraclelinux/oracle-6.10-i386.json @@ -121,7 +121,11 @@ "ssh_timeout": "10000s", "ssh_username": "vagrant", "type": "qemu", - "vm_name": "{{ user `template` }}" + "vm_name": "{{ user `template` }}", + "qemuargs": [ + [ "-m", "{{ user `memory` }}" ], + [ "-display", "{{ user `qemu_display` }}" ] + ] } ], "post-processors": [ @@ -177,6 +181,7 @@ "mirror_directory": "OL6/U9/i386", "name": "oracle-6.10-i386", "no_proxy": "{{env `no_proxy`}}", + "qemu_display": "none", "template": "oracle-6.10-i386", "version": "TIMESTAMP" } diff --git a/packer_templates/oraclelinux/oracle-6.10-x86_64.json b/packer_templates/oraclelinux/oracle-6.10-x86_64.json index b06b98748..52e950d20 100644 --- a/packer_templates/oraclelinux/oracle-6.10-x86_64.json +++ b/packer_templates/oraclelinux/oracle-6.10-x86_64.json @@ -121,7 +121,11 @@ "ssh_timeout": "10000s", "ssh_username": "vagrant", "type": "qemu", - "vm_name": "{{ user `template` }}" + "vm_name": "{{ user `template` }}", + "qemuargs": [ + [ "-m", "{{ user `memory` }}" ], + [ "-display", "{{ user `qemu_display` }}" ] + ] } ], "post-processors": [ @@ -178,6 +182,7 @@ "mirror_directory": "OL6/U9/x86_64", "name": "oracle-6.10", "no_proxy": "{{env `no_proxy`}}", + "qemu_display": "none", "template": "oracle-6.10-x86_64", "version": "TIMESTAMP" } diff --git a/packer_templates/oraclelinux/oracle-7.9-x86_64.json b/packer_templates/oraclelinux/oracle-7.9-x86_64.json index d8393c43d..d59e561ae 100644 --- a/packer_templates/oraclelinux/oracle-7.9-x86_64.json +++ b/packer_templates/oraclelinux/oracle-7.9-x86_64.json @@ -121,7 +121,11 @@ "ssh_timeout": "10000s", "ssh_username": "vagrant", "type": "qemu", - "vm_name": "{{ user `template` }}" + "vm_name": "{{ user `template` }}", + "qemuargs": [ + [ "-m", "{{ user `memory` }}" ], + [ "-display", "{{ user `qemu_display` }}" ] + ] } ], "post-processors": [ @@ -178,6 +182,7 @@ "mirror_directory": "OL7/u9/x86_64", "name": "oracle-7.9", "no_proxy": "{{env `no_proxy`}}", + "qemu_display": "none", "template": "oracle-7.9-x86_64", "version": "TIMESTAMP" } diff --git a/packer_templates/oraclelinux/oracle-8.3-x86_64.json b/packer_templates/oraclelinux/oracle-8.3-x86_64.json index 6389e73a7..6f600b8d1 100644 --- a/packer_templates/oraclelinux/oracle-8.3-x86_64.json +++ b/packer_templates/oraclelinux/oracle-8.3-x86_64.json @@ -113,7 +113,11 @@ "ssh_timeout": "10000s", "ssh_username": "vagrant", "type": "qemu", - "vm_name": "{{ user `template` }}" + "vm_name": "{{ user `template` }}", + "qemuargs": [ + [ "-m", "{{ user `memory` }}" ], + [ "-display", "{{ user `qemu_display` }}" ] + ] } ], "post-processors": [ @@ -169,6 +173,7 @@ "mirror_directory": "OL8/u3/x86_64", "name": "oracle-8.3", "no_proxy": "{{env `no_proxy`}}", + "qemu_display": "none", "template": "oracle-8.3-x86_64", "boot_command": "<up><wait><tab> inst.text inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>", "version": "TIMESTAMP" diff --git a/packer_templates/rhel/rhel-6.10-i386.json b/packer_templates/rhel/rhel-6.10-i386.json index 71ec78544..de15f2a3b 100644 --- a/packer_templates/rhel/rhel-6.10-i386.json +++ b/packer_templates/rhel/rhel-6.10-i386.json @@ -95,7 +95,11 @@ "ssh_timeout": "10000s", "ssh_username": "vagrant", "type": "qemu", - "vm_name": "{{ user `template` }}" + "vm_name": "{{ user `template` }}", + "qemuargs": [ + [ "-m", "{{ user `memory` }}" ], + [ "-display", "{{ user `qemu_display` }}" ] + ] } ], "post-processors": [ @@ -149,6 +153,7 @@ "mirror_directory": "rhel", "name": "rhel-6.10-i386", "no_proxy": "{{env `no_proxy`}}", + "qemu_display": "none", "template": "rhel-6.10-i386", "version": "TIMESTAMP" } diff --git a/packer_templates/rhel/rhel-6.10-x86_64.json b/packer_templates/rhel/rhel-6.10-x86_64.json index c4a2c55bf..45a6d3f31 100644 --- a/packer_templates/rhel/rhel-6.10-x86_64.json +++ b/packer_templates/rhel/rhel-6.10-x86_64.json @@ -95,7 +95,11 @@ "ssh_timeout": "10000s", "ssh_username": "vagrant", "type": "qemu", - "vm_name": "{{ user `template` }}" + "vm_name": "{{ user `template` }}", + "qemuargs": [ + [ "-m", "{{ user `memory` }}" ], + [ "-display", "{{ user `qemu_display` }}" ] + ] } ], "post-processors": [ @@ -149,6 +153,7 @@ "mirror_directory": "rhel", "name": "rhel-6.10", "no_proxy": "{{env `no_proxy`}}", + "qemu_display": "none", "template": "rhel-6.10-x86_64", "version": "TIMESTAMP" } diff --git a/packer_templates/rhel/rhel-7.6-x86_64.json b/packer_templates/rhel/rhel-7.6-x86_64.json index 538e3a61b..6c4db4ffe 100644 --- a/packer_templates/rhel/rhel-7.6-x86_64.json +++ b/packer_templates/rhel/rhel-7.6-x86_64.json @@ -95,7 +95,11 @@ "ssh_timeout": "10000s", "ssh_username": "vagrant", "type": "qemu", - "vm_name": "{{ user `template` }}" + "vm_name": "{{ user `template` }}", + "qemuargs": [ + [ "-m", "{{ user `memory` }}" ], + [ "-display", "{{ user `qemu_display` }}" ] + ] } ], "post-processors": [ @@ -149,6 +153,7 @@ "mirror_directory": "rhel", "name": "rhel-7.6", "no_proxy": "{{env `no_proxy`}}", + "qemu_display": "none", "template": "rhel-7.6-x86_64", "version": "TIMESTAMP" } diff --git a/packer_templates/rhel/rhel-8.0-x86_64.json b/packer_templates/rhel/rhel-8.0-x86_64.json index 093e9ca44..401011f2d 100644 --- a/packer_templates/rhel/rhel-8.0-x86_64.json +++ b/packer_templates/rhel/rhel-8.0-x86_64.json @@ -95,7 +95,11 @@ "ssh_timeout": "10000s", "ssh_username": "vagrant", "type": "qemu", - "vm_name": "{{ user `template` }}" + "vm_name": "{{ user `template` }}", + "qemuargs": [ + [ "-m", "{{ user `memory` }}" ], + [ "-display", "{{ user `qemu_display` }}" ] + ] } ], "post-processors": [ @@ -149,6 +153,7 @@ "mirror_directory": "rhel", "name": "rhel-8.0", "no_proxy": "{{env `no_proxy`}}", + "qemu_display": "none", "template": "rhel-8.0-x86_64", "version": "TIMESTAMP" } diff --git a/packer_templates/rockylinux/rockylinux-8.4-x86_64.json b/packer_templates/rockylinux/rockylinux-8.4-x86_64.json index 88169c17c..7af7f9e5f 100644 --- a/packer_templates/rockylinux/rockylinux-8.4-x86_64.json +++ b/packer_templates/rockylinux/rockylinux-8.4-x86_64.json @@ -113,7 +113,11 @@ "ssh_timeout": "10000s", "ssh_username": "vagrant", "type": "qemu", - "vm_name": "{{ user `template` }}" + "vm_name": "{{ user `template` }}", + "qemuargs": [ + [ "-m", "{{ user `memory` }}" ], + [ "-display", "{{ user `qemu_display` }}" ] + ] } ], "post-processors": [ @@ -169,6 +173,7 @@ "mirror_directory": "8.4/isos/x86_64", "name": "rockylinux-8.4", "no_proxy": "{{env `no_proxy`}}", + "qemu_display": "none", "template": "rockylinux-8.4-x86_64", "boot_command": "<up><wait><tab> inst.text inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>", "version": "TIMESTAMP" diff --git a/packer_templates/scientificlinux/scientific-7.9-x86_64.json b/packer_templates/scientificlinux/scientific-7.9-x86_64.json index 754cf1ba7..e14698d08 100644 --- a/packer_templates/scientificlinux/scientific-7.9-x86_64.json +++ b/packer_templates/scientificlinux/scientific-7.9-x86_64.json @@ -121,7 +121,11 @@ "ssh_timeout": "10000s", "ssh_username": "vagrant", "type": "qemu", - "vm_name": "{{ user `template` }}" + "vm_name": "{{ user `template` }}", + "qemuargs": [ + [ "-m", "{{ user `memory` }}" ], + [ "-display", "{{ user `qemu_display` }}" ] + ] } ], "post-processors": [ @@ -177,6 +181,7 @@ "mirror_directory": "7.9/x86_64/iso", "name": "scientific-7.9", "no_proxy": "{{env `no_proxy`}}", + "qemu_display": "none", "template": "scientific-7-x86_64", "version": "TIMESTAMP" } diff --git a/packer_templates/sles/sles-11-sp4-x86_64.json b/packer_templates/sles/sles-11-sp4-x86_64.json index 6e1315c4d..75a0593d2 100644 --- a/packer_templates/sles/sles-11-sp4-x86_64.json +++ b/packer_templates/sles/sles-11-sp4-x86_64.json @@ -111,7 +111,11 @@ "ssh_timeout": "10000s", "ssh_username": "vagrant", "type": "qemu", - "vm_name": "{{ user `template` }}" + "vm_name": "{{ user `template` }}", + "qemuargs": [ + [ "-m", "{{ user `memory` }}" ], + [ "-display", "{{ user `qemu_display` }}" ] + ] } ], "post-processors": [ @@ -167,6 +171,7 @@ "memory": "1024", "mirror": "./packer_cache", "name": "sles-11-sp4", + "qemu_display": "none", "template": "sles-11-sp4-x86_64", "version": "TIMESTAMP" } diff --git a/packer_templates/sles/sles-12-sp2-x86_64.json b/packer_templates/sles/sles-12-sp2-x86_64.json index b799322fc..07230bb8e 100644 --- a/packer_templates/sles/sles-12-sp2-x86_64.json +++ b/packer_templates/sles/sles-12-sp2-x86_64.json @@ -111,7 +111,11 @@ "ssh_timeout": "10000s", "ssh_username": "vagrant", "type": "qemu", - "vm_name": "{{ user `template` }}" + "vm_name": "{{ user `template` }}", + "qemuargs": [ + [ "-m", "{{ user `memory` }}" ], + [ "-display", "{{ user `qemu_display` }}" ] + ] } ], "post-processors": [ @@ -168,6 +172,7 @@ "memory": "1024", "mirror": "./packer_cache", "name": "sles-12-sp2", + "qemu_display": "none", "template": "sles-12-sp2-x86_64", "version": "TIMESTAMP" } diff --git a/packer_templates/sles/sles-12-sp3-x86_64.json b/packer_templates/sles/sles-12-sp3-x86_64.json index f636a1423..3f0bea5ec 100644 --- a/packer_templates/sles/sles-12-sp3-x86_64.json +++ b/packer_templates/sles/sles-12-sp3-x86_64.json @@ -111,7 +111,11 @@ "ssh_timeout": "10000s", "ssh_username": "vagrant", "type": "qemu", - "vm_name": "{{ user `template` }}" + "vm_name": "{{ user `template` }}", + "qemuargs": [ + [ "-m", "{{ user `memory` }}" ], + [ "-display", "{{ user `qemu_display` }}" ] + ] } ], "post-processors": [ @@ -168,6 +172,7 @@ "memory": "1024", "mirror": "./packer_cache", "name": "sles-12-sp3", + "qemu_display": "none", "template": "sles-12-sp3-x86_64", "version": "TIMESTAMP" } diff --git a/packer_templates/sles/sles-15-sp1.json b/packer_templates/sles/sles-15-sp1.json index 7316b2f89..321e5c4e2 100644 --- a/packer_templates/sles/sles-15-sp1.json +++ b/packer_templates/sles/sles-15-sp1.json @@ -149,7 +149,11 @@ "ssh_timeout": "10000s", "ssh_username": "vagrant", "type": "qemu", - "vm_name": "{{ user `template` }}" + "vm_name": "{{ user `template` }}", + "qemuargs": [ + [ "-m", "{{ user `memory` }}" ], + [ "-display", "{{ user `qemu_display` }}" ] + ] } ], "post-processors": [ @@ -207,6 +211,7 @@ "mirror": "./packer_cache", "name": "sles-15-sp1", "packages_iso": "SLE-15-SP1-Packages-x86_64-GM-DVD1.iso", + "qemu_display": "none", "template": "sles-15-sp1-x86_64", "version": "TIMESTAMP" } diff --git a/packer_templates/sles/sles-15.json b/packer_templates/sles/sles-15.json index 8bef948cf..18a18bba9 100644 --- a/packer_templates/sles/sles-15.json +++ b/packer_templates/sles/sles-15.json @@ -149,7 +149,11 @@ "ssh_timeout": "10000s", "ssh_username": "vagrant", "type": "qemu", - "vm_name": "{{ user `template` }}" + "vm_name": "{{ user `template` }}", + "qemuargs": [ + [ "-m", "{{ user `memory` }}" ], + [ "-display", "{{ user `qemu_display` }}" ] + ] } ], "post-processors": [ @@ -207,6 +211,7 @@ "mirror": "./packer_cache", "name": "sles-15", "packages_iso": "SLE-15-Packages-x86_64-GM-DVD1.iso", + "qemu_display": "none", "template": "sles-15-x86_64", "version": "TIMESTAMP" } diff --git a/packer_templates/solaris/solaris-11-4-x86.json b/packer_templates/solaris/solaris-11-4-x86.json index 14cb54d57..bb1cb3d05 100644 --- a/packer_templates/solaris/solaris-11-4-x86.json +++ b/packer_templates/solaris/solaris-11-4-x86.json @@ -139,6 +139,7 @@ "memory": "4096", "mirror": "./packer_cache", "name": "solaris-11.4", + "qemu_display": "none", "template": "solaris-11.4-x86", "version": "TIMESTAMP" } diff --git a/packer_templates/solaris/solaris-11-x86.json b/packer_templates/solaris/solaris-11-x86.json index 8386a9092..a6fcff121 100644 --- a/packer_templates/solaris/solaris-11-x86.json +++ b/packer_templates/solaris/solaris-11-x86.json @@ -138,6 +138,7 @@ "memory": "2048", "mirror": "./packer_cache", "name": "solaris-11.3", + "qemu_display": "none", "template": "solaris-11.3-x86", "version": "TIMESTAMP" } diff --git a/packer_templates/springdalelinux/springdalelinux-7.9-x86_64.json b/packer_templates/springdalelinux/springdalelinux-7.9-x86_64.json index 3aee6d6aa..a72d7d3bd 100644 --- a/packer_templates/springdalelinux/springdalelinux-7.9-x86_64.json +++ b/packer_templates/springdalelinux/springdalelinux-7.9-x86_64.json @@ -113,7 +113,11 @@ "ssh_timeout": "10000s", "ssh_username": "vagrant", "type": "qemu", - "vm_name": "{{ user `template` }}" + "vm_name": "{{ user `template` }}", + "qemuargs": [ + [ "-m", "{{ user `memory` }}" ], + [ "-display", "{{ user `qemu_display` }}" ] + ] } ], "post-processors": [ @@ -169,6 +173,7 @@ "mirror_directory": "7.5/x86_64/iso", "name": "springdalelinux-7.9", "no_proxy": "{{env `no_proxy`}}", + "qemu_display": "none", "template": "springdalelinux-7.9-x86_64", "boot_command": "<up><wait><tab> inst.text inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>", "version": "TIMESTAMP" diff --git a/packer_templates/ubuntu/ubuntu-18.04-amd64.json b/packer_templates/ubuntu/ubuntu-18.04-amd64.json index 4196213e6..6e0416962 100644 --- a/packer_templates/ubuntu/ubuntu-18.04-amd64.json +++ b/packer_templates/ubuntu/ubuntu-18.04-amd64.json @@ -184,7 +184,11 @@ "ssh_timeout": "10000s", "ssh_username": "vagrant", "type": "qemu", - "vm_name": "{{ user `template` }}" + "vm_name": "{{ user `template` }}", + "qemuargs": [ + [ "-m", "{{ user `memory` }}" ], + [ "-display", "{{ user `qemu_display` }}" ] + ] }, { "boot_command": [ @@ -276,6 +280,7 @@ "name": "ubuntu-18.04", "no_proxy": "{{env `no_proxy`}}", "preseed_path": "preseed.cfg", + "qemu_display": "none", "template": "ubuntu-18.04-amd64", "version": "TIMESTAMP" } diff --git a/packer_templates/ubuntu/ubuntu-20.04-amd64.json b/packer_templates/ubuntu/ubuntu-20.04-amd64.json index 7749fea4f..873fef22d 100644 --- a/packer_templates/ubuntu/ubuntu-20.04-amd64.json +++ b/packer_templates/ubuntu/ubuntu-20.04-amd64.json @@ -184,7 +184,11 @@ "ssh_timeout": "10000s", "ssh_username": "vagrant", "type": "qemu", - "vm_name": "{{ user `template` }}" + "vm_name": "{{ user `template` }}", + "qemuargs": [ + [ "-m", "{{ user `memory` }}" ], + [ "-display", "{{ user `qemu_display` }}" ] + ] }, { "boot_command": [ @@ -276,6 +280,7 @@ "name": "ubuntu-20.04", "no_proxy": "{{env `no_proxy`}}", "preseed_path": "preseed.cfg", + "qemu_display": "none", "template": "ubuntu-20.04-amd64", "version": "TIMESTAMP" } diff --git a/packer_templates/ubuntu/ubuntu-20.04-live-amd64.json b/packer_templates/ubuntu/ubuntu-20.04-live-amd64.json index 1099b3687..bcb4847c9 100644 --- a/packer_templates/ubuntu/ubuntu-20.04-live-amd64.json +++ b/packer_templates/ubuntu/ubuntu-20.04-live-amd64.json @@ -148,7 +148,11 @@ "ssh_timeout": "10000s", "ssh_username": "vagrant", "type": "qemu", - "vm_name": "{{ user `template` }}" + "vm_name": "{{ user `template` }}", + "qemuargs": [ + [ "-m", "{{ user `memory` }}" ], + [ "-display", "{{ user `qemu_display` }}" ] + ] }, { "boot_command": [ @@ -243,6 +247,7 @@ "name": "ubuntu-20.04-live", "no_proxy": "{{env `no_proxy`}}", "preseed_path": "preseed.cfg", + "qemu_display": "none", "template": "ubuntu-20.04-live-amd64", "version": "TIMESTAMP" } diff --git a/packer_templates/ubuntu/ubuntu-20.10-amd64.json b/packer_templates/ubuntu/ubuntu-20.10-amd64.json index dfc00b77d..4f9dd2fef 100644 --- a/packer_templates/ubuntu/ubuntu-20.10-amd64.json +++ b/packer_templates/ubuntu/ubuntu-20.10-amd64.json @@ -173,7 +173,11 @@ "ssh_timeout": "10000s", "ssh_username": "vagrant", "type": "qemu", - "vm_name": "{{ user `template` }}" + "vm_name": "{{ user `template` }}", + "qemuargs": [ + [ "-m", "{{ user `memory` }}" ], + [ "-display", "{{ user `qemu_display` }}" ] + ] }, { "boot_command": [ @@ -274,6 +278,7 @@ "name": "ubuntu-20.10", "no_proxy": "{{env `no_proxy`}}", "preseed_path": "preseed.cfg", + "qemu_display": "none", "template": "ubuntu-20.10-amd64", "version": "TIMESTAMP" } diff --git a/packer_templates/ubuntu/ubuntu-21.04-amd64.json b/packer_templates/ubuntu/ubuntu-21.04-amd64.json index 0bd96201f..d989d9b71 100644 --- a/packer_templates/ubuntu/ubuntu-21.04-amd64.json +++ b/packer_templates/ubuntu/ubuntu-21.04-amd64.json @@ -173,7 +173,11 @@ "ssh_timeout": "10000s", "ssh_username": "vagrant", "type": "qemu", - "vm_name": "{{ user `template` }}" + "vm_name": "{{ user `template` }}", + "qemuargs": [ + [ "-m", "{{ user `memory` }}" ], + [ "-display", "{{ user `qemu_display` }}" ] + ] }, { "boot_command": [ @@ -274,6 +278,7 @@ "name": "ubuntu-21.04", "no_proxy": "{{env `no_proxy`}}", "preseed_path": "preseed.cfg", + "qemu_display": "none", "template": "ubuntu-21.04-amd64", "version": "TIMESTAMP" } diff --git a/packer_templates/windows/windows-10.json b/packer_templates/windows/windows-10.json index 4abc9ea9e..0b4142153 100644 --- a/packer_templates/windows/windows-10.json +++ b/packer_templates/windows/windows-10.json @@ -147,6 +147,10 @@ [ "-drive", "file={{ user `build_directory` }}/packer-{{ user `template` }}-qemu/{{ .Name }},if=virtio,cache=writeback,discard=ignore,format=qcow2,index=1" + ], + [ + "-display", + "{{ user `qemu_display` }}" ] ], "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"", @@ -233,6 +237,7 @@ "iso_checksum": "489ebee676e26cdb81377b0e6385c001a22589b8", "iso_url": "https://software-download.microsoft.com/download/pr/18363.418.191007-0143.19h2_release_svc_refresh_CLIENTENTERPRISEEVAL_OEMRET_x64FRE_en-us.iso", "memory": "4096", + "qemu_display": "none", "template": "windows-10", "unattended_file_path": "10/Autounattend.xml", "virtio_win_iso": "~/virtio-win.iso" diff --git a/packer_templates/windows/windows-10gen2.json b/packer_templates/windows/windows-10gen2.json index 18acd6d7e..9f436c5f6 100644 --- a/packer_templates/windows/windows-10gen2.json +++ b/packer_templates/windows/windows-10gen2.json @@ -51,6 +51,10 @@ [ "-bios", "{{ user `qemu_bios` }}" + ], + [ + "-display", + "{{ user `qemu_display` }}" ] ], "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"", @@ -150,6 +154,7 @@ "winrm_timeout": "6h", "working_directory": "", "qemu_bios": "/usr/share/OVMF/OVMF_CODE.fd", + "qemu_display": "none", "disk_interface": "ide", "boot_wait": "10s", "cd_files": "{{template_dir}}/answer_files/10/Autounattend.xml" diff --git a/packer_templates/windows/windows-2012.json b/packer_templates/windows/windows-2012.json index eea8c700d..2a883abbf 100644 --- a/packer_templates/windows/windows-2012.json +++ b/packer_templates/windows/windows-2012.json @@ -141,6 +141,10 @@ [ "-drive", "file={{ user `build_directory` }}/packer-{{ user `template` }}-qemu/{{ .Name }},if=virtio,cache=writeback,discard=ignore,format=qcow2,index=1" + ], + [ + "-display", + "{{ user `qemu_display` }}" ] ], "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"", @@ -227,6 +231,7 @@ "iso_checksum": "922b365c3360ce630f6a4b4f2f3c79e66165c0fb", "iso_url": "http://download.microsoft.com/download/6/D/A/6DAB58BA-F939-451D-9101-7DE07DC09C03/9200.16384.WIN8_RTM.120725-1247_X64FRE_SERVER_EVAL_EN-US-HRM_SSS_X64FREE_EN-US_DV5.ISO", "memory": "4096", + "qemu_display": "none", "template": "windows-2012-standard", "unattended_file_path": "2012/Autounattend.xml", "virtio_win_iso": "~/virtio-win.iso" diff --git a/packer_templates/windows/windows-2012r2.json b/packer_templates/windows/windows-2012r2.json index 74494398a..52459c760 100644 --- a/packer_templates/windows/windows-2012r2.json +++ b/packer_templates/windows/windows-2012r2.json @@ -141,6 +141,10 @@ [ "-drive", "file={{ user `build_directory` }}/packer-{{ user `template` }}-qemu/{{ .Name }},if=virtio,cache=writeback,discard=ignore,format=qcow2,index=1" + ], + [ + "-display", + "{{ user `qemu_display` }}" ] ], "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"", @@ -227,6 +231,7 @@ "iso_checksum": "849734f37346385dac2c101e4aacba4626bb141c", "iso_url": "http://download.microsoft.com/download/6/2/A/62A76ABB-9990-4EFC-A4FE-C7D698DAEB96/9600.17050.WINBLUE_REFRESH.140317-1640_X64FRE_SERVER_EVAL_EN-US-IR3_SSS_X64FREE_EN-US_DV9.ISO", "memory": "4096", + "qemu_display": "none", "template": "windows-2012r2-standard", "unattended_file_path": "2012_r2/Autounattend.xml", "virtio_win_iso": "~/virtio-win.iso" diff --git a/packer_templates/windows/windows-2016.json b/packer_templates/windows/windows-2016.json index bf324dde5..c865a0bf2 100644 --- a/packer_templates/windows/windows-2016.json +++ b/packer_templates/windows/windows-2016.json @@ -141,6 +141,10 @@ [ "-drive", "file={{ user `build_directory` }}/packer-{{ user `template` }}-qemu/{{ .Name }},if=virtio,cache=writeback,discard=ignore,format=qcow2,index=1" + ], + [ + "-display", + "{{ user `qemu_display` }}" ] ], "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"", @@ -227,6 +231,7 @@ "iso_checksum": "772700802951b36c8cb26a61c040b9a8dc3816a3", "iso_url": "https://software-download.microsoft.com/download/pr/Windows_Server_2016_Datacenter_EVAL_en-us_14393_refresh.ISO", "memory": "4096", + "qemu_display": "none", "template": "windows-2016-standard", "unattended_file_path": "2016/Autounattend.xml", "virtio_win_iso": "~/virtio-win.iso" diff --git a/packer_templates/windows/windows-2019.json b/packer_templates/windows/windows-2019.json index b689f22c6..51c4d0218 100644 --- a/packer_templates/windows/windows-2019.json +++ b/packer_templates/windows/windows-2019.json @@ -141,6 +141,10 @@ [ "-drive", "file={{ user `build_directory` }}/packer-{{ user `template` }}-qemu/{{ .Name }},if=virtio,cache=writeback,discard=ignore,format=qcow2,index=1" + ], + [ + "-display", + "{{ user `qemu_display` }}" ] ], "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"", @@ -227,6 +231,7 @@ "iso_checksum": "3022424f777b66a698047ba1c37812026b9714c5", "iso_url": "https://software-download.microsoft.com/download/pr/17763.737.190906-2324.rs5_release_svc_refresh_SERVER_EVAL_x64FRE_en-us_1.iso", "memory": "4096", + "qemu_display": "none", "template": "windows-2019-standard", "unattended_file_path": "2019/Autounattend.xml", "virtio_win_iso": "~/virtio-win.iso" From 8b9d3367567c4516fa1105b750527bcacb1b7038 Mon Sep 17 00:00:00 2001 From: SG <13872653+mmguero@users.noreply.github.com> Date: Mon, 4 Oct 2021 12:06:03 -0600 Subject: [PATCH 1405/1622] fix "{{ user `qemu_display` }} for chef/bento#1375 Signed-off-by: SG <13872653+mmguero@users.noreply.github.com> --- packer_templates/sles/sles-15-sp1.json | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/packer_templates/sles/sles-15-sp1.json b/packer_templates/sles/sles-15-sp1.json index 321e5c4e2..7afdd0151 100644 --- a/packer_templates/sles/sles-15-sp1.json +++ b/packer_templates/sles/sles-15-sp1.json @@ -141,6 +141,14 @@ [ "-device", "scsi-cd,bus=scsi1.0,drive=cdrom1" + ], + [ + "-m", + "{{ user `memory` }}" + ], + [ + "-display", + "{{ user `qemu_display` }}" ] ], "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", @@ -149,11 +157,7 @@ "ssh_timeout": "10000s", "ssh_username": "vagrant", "type": "qemu", - "vm_name": "{{ user `template` }}", - "qemuargs": [ - [ "-m", "{{ user `memory` }}" ], - [ "-display", "{{ user `qemu_display` }}" ] - ] + "vm_name": "{{ user `template` }}" } ], "post-processors": [ From 8ecf9ddf91f84d8fcfd39abd3351a62fa41f50aa Mon Sep 17 00:00:00 2001 From: SG <13872653+mmguero@users.noreply.github.com> Date: Mon, 4 Oct 2021 12:10:22 -0600 Subject: [PATCH 1406/1622] fix "{{ user `qemu_display` }} for chef/bento#1375 Signed-off-by: SG <13872653+mmguero@users.noreply.github.com> --- packer_templates/sles/sles-15.json | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/packer_templates/sles/sles-15.json b/packer_templates/sles/sles-15.json index 18a18bba9..337bed92b 100644 --- a/packer_templates/sles/sles-15.json +++ b/packer_templates/sles/sles-15.json @@ -141,6 +141,14 @@ [ "-device", "scsi-cd,bus=scsi1.0,drive=cdrom1" + ], + [ + "-m", + "{{ user `memory` }}" + ], + [ + "-display", + "{{ user `qemu_display` }}" ] ], "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", @@ -149,11 +157,7 @@ "ssh_timeout": "10000s", "ssh_username": "vagrant", "type": "qemu", - "vm_name": "{{ user `template` }}", - "qemuargs": [ - [ "-m", "{{ user `memory` }}" ], - [ "-display", "{{ user `qemu_display` }}" ] - ] + "vm_name": "{{ user `template` }}" } ], "post-processors": [ From 844dd9298a812e55c444fbcc751963546fe1ae89 Mon Sep 17 00:00:00 2001 From: SG <13872653+mmguero@users.noreply.github.com> Date: Tue, 19 Oct 2021 12:51:12 -0600 Subject: [PATCH 1407/1622] Update Debian packer templates from 11.0 to 11.1 Signed-off-by: SG <13872653+mmguero@users.noreply.github.com> --- README.md | 4 ++-- builds.yml | 4 ++-- ...debian-11.0-amd64.json => debian-11.1-amd64.json} | 12 ++++++------ .../{debian-11.0-i386.json => debian-11.1-i386.json} | 12 ++++++------ 4 files changed, 16 insertions(+), 16 deletions(-) rename packer_templates/debian/{debian-11.0-amd64.json => debian-11.1-amd64.json} (96%) rename packer_templates/debian/{debian-11.0-i386.json => debian-11.1-i386.json} (96%) diff --git a/README.md b/README.md index f152307f2..0df22cc45 100644 --- a/README.md +++ b/README.md @@ -45,11 +45,11 @@ $ cd packer_templates/ubuntu $ packer build -only=virtualbox-iso ubuntu-18.04-amd64.json ``` -To build Debian 11.0 32bit boxes for all possible providers (simultaneously) +To build Debian 11.1 32bit boxes for all possible providers (simultaneously) ``` $ cd packer_templates/debian -$ packer build debian-11.0-i386.json +$ packer build debian-11.1-i386.json ``` To build CentOS 7.7 boxes for all providers except VMware and Parallels diff --git a/builds.yml b/builds.yml index 633286b15..46dbee7c4 100644 --- a/builds.yml +++ b/builds.yml @@ -9,8 +9,8 @@ public: - 'debian-9.13' - 'debian-10.10-i386' - 'debian-10.10' -- 'debian-11.0-i386' -- 'debian-11.0' +- 'debian-11.1-i386' +- 'debian-11.1' - 'fedora-33' - 'fedora-34' - 'freebsd-11.4-i386' diff --git a/packer_templates/debian/debian-11.0-amd64.json b/packer_templates/debian/debian-11.1-amd64.json similarity index 96% rename from packer_templates/debian/debian-11.0-amd64.json rename to packer_templates/debian/debian-11.1-amd64.json index f5900a87d..6469da300 100644 --- a/packer_templates/debian/debian-11.0-amd64.json +++ b/packer_templates/debian/debian-11.1-amd64.json @@ -197,7 +197,7 @@ } ], "variables": { - "box_basename": "debian-11.0", + "box_basename": "debian-11.1", "build_directory": "../../builds", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "2", @@ -208,16 +208,16 @@ "http_directory": "{{template_dir}}/http", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", - "iso_checksum": "ae6d563d2444665316901fe7091059ac34b8f67ba30f9159f7cef7d2fdc5bf8a", - "iso_name": "debian-11.0.0-amd64-netinst.iso", + "iso_checksum": "8488abc1361590ee7a3c9b00ec059b29dfb1da40f8ba4adf293c7a30fa943eb2", + "iso_name": "debian-11.1.0-amd64-netinst.iso", "memory": "1024", "mirror": "http://cdimage.debian.org/cdimage/release", - "mirror_directory": "11.0.0/amd64/iso-cd", - "name": "debian-11.0", + "mirror_directory": "11.1.0/amd64/iso-cd", + "name": "debian-11.1", "no_proxy": "{{env `no_proxy`}}", "preseed_path": "debian-9/preseed.cfg", "qemu_display": "none", - "template": "debian-11.0-amd64", + "template": "debian-11.1-amd64", "version": "TIMESTAMP" } } diff --git a/packer_templates/debian/debian-11.0-i386.json b/packer_templates/debian/debian-11.1-i386.json similarity index 96% rename from packer_templates/debian/debian-11.0-i386.json rename to packer_templates/debian/debian-11.1-i386.json index e4331f749..c7166ca74 100644 --- a/packer_templates/debian/debian-11.0-i386.json +++ b/packer_templates/debian/debian-11.1-i386.json @@ -197,7 +197,7 @@ } ], "variables": { - "box_basename": "debian-11.0-i386", + "box_basename": "debian-11.1-i386", "build_directory": "../../builds", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "2", @@ -208,16 +208,16 @@ "http_directory": "{{template_dir}}/http", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", - "iso_checksum": "ee628b029c116b8512cf60f7f8ec897b657dd8c99a89d92bdce514c8885e1c2a", - "iso_name": "debian-11.0.0-i386-netinst.iso", + "iso_checksum": "c08215e95f510905f132de558291487f4a8cdddde2a73632e93e889b78063f06", + "iso_name": "debian-11.1.0-i386-netinst.iso", "memory": "1024", "mirror": "http://cdimage.debian.org/cdimage/release", - "mirror_directory": "11.0.0/i386/iso-cd", - "name": "debian-11.0-i386", + "mirror_directory": "11.1.0/i386/iso-cd", + "name": "debian-11.1-i386", "no_proxy": "{{env `no_proxy`}}", "preseed_path": "debian-9/preseed.cfg", "qemu_display": "none", - "template": "debian-11.0-i386", + "template": "debian-11.1-i386", "version": "TIMESTAMP" } } From 0bf5faa691c95fd2b19a615287ee5d2da766001b Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Sun, 24 Oct 2021 18:49:51 -0700 Subject: [PATCH 1408/1622] Fix mirror dir for Ubuntu 20.04 Signed-off-by: Tim Smith <tsmith@chef.io> --- packer_templates/ubuntu/ubuntu-20.04-amd64.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packer_templates/ubuntu/ubuntu-20.04-amd64.json b/packer_templates/ubuntu/ubuntu-20.04-amd64.json index 873fef22d..2e6dc5ed3 100644 --- a/packer_templates/ubuntu/ubuntu-20.04-amd64.json +++ b/packer_templates/ubuntu/ubuntu-20.04-amd64.json @@ -276,7 +276,7 @@ "iso_name": "ubuntu-20.04.1-legacy-server-amd64.iso", "memory": "1024", "mirror": "http://cdimage.ubuntu.com", - "mirror_directory": "ubuntu-legacy-server/releases/20.04.1/release", + "mirror_directory": "ubuntu-legacy-server/releases/20.04/release", "name": "ubuntu-20.04", "no_proxy": "{{env `no_proxy`}}", "preseed_path": "preseed.cfg", From 336bbcf9f26c53ab5269afb102b522d72469c301 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Sun, 24 Oct 2021 18:56:40 -0700 Subject: [PATCH 1409/1622] Revert "Remove EOL Ubuntu 16.04" This reverts commit efb9ad663069f47ff625a85f3fa378c969309256. --- builds.yml | 2 + packer_templates/ubuntu/scripts/hyperv.sh | 6 +- packer_templates/ubuntu/scripts/networking.sh | 5 + .../ubuntu/ubuntu-16.04-amd64.json | 287 ++++++++++++++++++ .../ubuntu/ubuntu-16.04-i386.json | 286 +++++++++++++++++ 5 files changed, 585 insertions(+), 1 deletion(-) create mode 100644 packer_templates/ubuntu/ubuntu-16.04-amd64.json create mode 100644 packer_templates/ubuntu/ubuntu-16.04-i386.json diff --git a/builds.yml b/builds.yml index 46dbee7c4..0bdaf69fa 100644 --- a/builds.yml +++ b/builds.yml @@ -26,6 +26,8 @@ public: - 'rockylinux-8.4' - 'scientific-7.9' - 'springdalelinux-7.9' +- 'ubuntu-16.04-i386' +- 'ubuntu-16.04' - 'ubuntu-18.04' - 'ubuntu-20.04' - 'ubuntu-20.10' diff --git a/packer_templates/ubuntu/scripts/hyperv.sh b/packer_templates/ubuntu/scripts/hyperv.sh index d4afdd2c9..454324408 100755 --- a/packer_templates/ubuntu/scripts/hyperv.sh +++ b/packer_templates/ubuntu/scripts/hyperv.sh @@ -5,5 +5,9 @@ major_version="`echo $ubuntu_version | awk -F. '{print $1}'`"; case "$PACKER_BUILDER_TYPE" in hyperv-iso) echo "installing packaging for hyper-v" - apt-get -y install linux-image-virtual linux-tools-virtual linux-cloud-tools-virtual; + if [ "$major_version" -eq "16" ]; then + apt-get install -y linux-tools-virtual-lts-xenial linux-cloud-tools-virtual-lts-xenial; + else + apt-get -y install linux-image-virtual linux-tools-virtual linux-cloud-tools-virtual; + fi esac diff --git a/packer_templates/ubuntu/scripts/networking.sh b/packer_templates/ubuntu/scripts/networking.sh index 270a78670..f852d67d3 100644 --- a/packer_templates/ubuntu/scripts/networking.sh +++ b/packer_templates/ubuntu/scripts/networking.sh @@ -3,6 +3,7 @@ ubuntu_version="`lsb_release -r | awk '{print $2}'`"; major_version="`echo $ubuntu_version | awk -F. '{print $1}'`"; +if [ "$major_version" -ge "18" ]; then echo "Create netplan config for eth0" cat <<EOF >/etc/netplan/01-netcfg.yaml; network: @@ -11,6 +12,10 @@ network: eth0: dhcp4: true EOF +else + # Adding a 2 sec delay to the interface up, to make the dhclient happy + echo "pre-up sleep 2" >> /etc/network/interfaces; +fi # Disable Predictable Network Interface names and use eth0 [ -e /etc/network/interfaces ] && sed -i 's/en[[:alnum:]]*/eth0/g' /etc/network/interfaces; diff --git a/packer_templates/ubuntu/ubuntu-16.04-amd64.json b/packer_templates/ubuntu/ubuntu-16.04-amd64.json new file mode 100644 index 000000000..539dcac4c --- /dev/null +++ b/packer_templates/ubuntu/ubuntu-16.04-amd64.json @@ -0,0 +1,287 @@ +{ + "builders": [ + { + "boot_command": [ + "<enter><wait><f6><esc><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs>", + "<bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs>", + "<bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs>", + "<bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs>", + "/install/vmlinuz<wait>", + " auto<wait>", + " console-setup/ask_detect=false<wait>", + " console-setup/layoutcode=us<wait>", + " console-setup/modelcode=pc105<wait>", + " debconf/frontend=noninteractive<wait>", + " debian-installer=en_US.UTF-8<wait>", + " fb=false<wait>", + " initrd=/install/initrd.gz<wait>", + " kbd-chooser/method=us<wait>", + " keyboard-configuration/layout=USA<wait>", + " keyboard-configuration/variant=USA<wait>", + " locale=en_US.UTF-8<wait>", + " netcfg/get_domain=vm<wait>", + " netcfg/get_hostname=vagrant<wait>", + " grub-installer/bootdev=/dev/sda<wait>", + " noapic<wait>", + " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}}<wait>", + " -- <wait>", + "<enter><wait>" + ], + "boot_wait": "5s", + "cpus": "{{ user `cpus` }}", + "disk_size": "{{user `disk_size`}}", + "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "guest_additions_url": "{{ user `guest_additions_url` }}", + "guest_os_type": "Ubuntu_64", + "hard_drive_interface": "sata", + "headless": "{{ user `headless` }}", + "http_directory": "{{user `http_directory`}}", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "memory": "{{ user `memory` }}", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-virtualbox", + "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_timeout": "10000s", + "ssh_username": "vagrant", + "type": "virtualbox-iso", + "virtualbox_version_file": ".vbox_version", + "vm_name": "{{ user `template` }}" + }, + { + "boot_command": [ + "<enter><wait><f6><esc><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs>", + "<bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs>", + "<bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs>", + "<bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs>", + "/install/vmlinuz<wait>", + " auto<wait>", + " console-setup/ask_detect=false<wait>", + " console-setup/layoutcode=us<wait>", + " console-setup/modelcode=pc105<wait>", + " debconf/frontend=noninteractive<wait>", + " debian-installer=en_US.UTF-8<wait>", + " fb=false<wait>", + " initrd=/install/initrd.gz<wait>", + " kbd-chooser/method=us<wait>", + " keyboard-configuration/layout=USA<wait>", + " keyboard-configuration/variant=USA<wait>", + " locale=en_US.UTF-8<wait>", + " netcfg/get_domain=vm<wait>", + " netcfg/get_hostname=vagrant<wait>", + " grub-installer/bootdev=/dev/sda<wait>", + " noapic<wait>", + " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}}<wait>", + " -- <wait>", + "<enter><wait>" + ], + "boot_wait": "5s", + "cpus": "{{ user `cpus` }}", + "disk_adapter_type": "sata", + "disk_size": "{{user `disk_size`}}", + "guest_os_type": "ubuntu-64", + "headless": "{{ user `headless` }}", + "http_directory": "{{user `http_directory`}}", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "memory": "{{ user `memory` }}", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-vmware", + "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_timeout": "10000s", + "ssh_username": "vagrant", + "tools_upload_flavor": "linux", + "type": "vmware-iso", + "vm_name": "{{ user `template` }}", + "vmx_data": { + "cpuid.coresPerSocket": "1", + "ethernet0.pciSlotNumber": "32" + }, + "vmx_remove_ethernet_interfaces": true + }, + { + "boot_command": [ + "<enter><wait><f6><esc><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs>", + "<bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs>", + "<bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs>", + "<bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs>", + "/install/vmlinuz<wait>", + " auto<wait>", + " console-setup/ask_detect=false<wait>", + " console-setup/layoutcode=us<wait>", + " console-setup/modelcode=pc105<wait>", + " debconf/frontend=noninteractive<wait>", + " debian-installer=en_US.UTF-8<wait>", + " fb=false<wait>", + " initrd=/install/initrd.gz<wait>", + " kbd-chooser/method=us<wait>", + " keyboard-configuration/layout=USA<wait>", + " keyboard-configuration/variant=USA<wait>", + " locale=en_US.UTF-8<wait>", + " netcfg/get_domain=vm<wait>", + " netcfg/get_hostname=vagrant<wait>", + " grub-installer/bootdev=/dev/sda<wait>", + " noapic<wait>", + " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}}<wait>", + " -- <wait>", + "<enter><wait>" + ], + "boot_wait": "5s", + "cpus": "{{ user `cpus` }}", + "disk_size": "{{user `disk_size`}}", + "guest_os_type": "ubuntu", + "http_directory": "{{user `http_directory`}}", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "memory": "{{ user `memory` }}", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-parallels", + "parallels_tools_flavor": "lin", + "prlctl_version_file": ".prlctl_version", + "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_timeout": "10000s", + "ssh_username": "vagrant", + "type": "parallels-iso", + "vm_name": "{{ user `template` }}" + }, + { + "boot_command": [ + "<enter><wait><f6><esc><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs>", + "<bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs>", + "<bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs>", + "<bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs>", + "/install/vmlinuz<wait>", + " auto<wait>", + " console-setup/ask_detect=false<wait>", + " console-setup/layoutcode=us<wait>", + " console-setup/modelcode=pc105<wait>", + " debconf/frontend=noninteractive<wait>", + " debian-installer=en_US.UTF-8<wait>", + " fb=false<wait>", + " initrd=/install/initrd.gz<wait>", + " kbd-chooser/method=us<wait>", + " keyboard-configuration/layout=USA<wait>", + " keyboard-configuration/variant=USA<wait>", + " locale=en_US.UTF-8<wait>", + " netcfg/get_domain=vm<wait>", + " netcfg/get_hostname=vagrant<wait>", + " grub-installer/bootdev=/dev/vda<wait>", + " noapic<wait>", + " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}}<wait>", + " -- <wait>", + "<enter><wait>" + ], + "boot_wait": "5s", + "cpus": "{{ user `cpus` }}", + "disk_size": "{{user `disk_size`}}", + "headless": "{{ user `headless` }}", + "http_directory": "{{user `http_directory`}}", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "memory": "{{ user `memory` }}", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-qemu", + "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_timeout": "10000s", + "ssh_username": "vagrant", + "type": "qemu", + "vm_name": "{{ user `template` }}" + }, + { + "boot_command": [ + "<esc><wait10><esc><esc><enter><wait>", + "set gfxpayload=1024x768<enter>", + "linux /install/vmlinuz ", + "preseed/url=http://{{.HTTPIP}}:{{.HTTPPort}}/preseed-hyperv.cfg ", + "debian-installer=en_US auto locale=en_US kbd-chooser/method=us ", + "hostname={{.Name}} ", + "fb=false debconf/frontend=noninteractive ", + "keyboard-configuration/modelcode=SKIP keyboard-configuration/layout=USA ", + "keyboard-configuration/variant=USA console-setup/ask_detect=false <enter>", + "initrd /install/initrd.gz<enter>", + "boot<enter>" + ], + "boot_wait": "5s", + "communicator": "ssh", + "cpus": "{{ user `cpus` }}", + "disk_size": "{{user `disk_size`}}", + "enable_secure_boot": false, + "generation": "{{user `hyperv_generation`}}", + "http_directory": "{{user `http_directory`}}", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "memory": "{{user `memory`}}", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-hyperv", + "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_timeout": "10000s", + "ssh_username": "vagrant", + "switch_name": "{{user `hyperv_switch`}}", + "type": "hyperv-iso", + "vm_name": "{{ user `template` }}" + } + ], + "post-processors": [ + { + "output": "{{ user `build_directory` }}/{{user `box_basename`}}.{{.Provider}}.box", + "type": "vagrant" + } + ], + "provisioners": [ + { + "environment_vars": [ + "HOME_DIR=/home/vagrant", + "http_proxy={{user `http_proxy`}}", + "https_proxy={{user `https_proxy`}}", + "no_proxy={{user `no_proxy`}}" + ], + "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", + "expect_disconnect": true, + "scripts": [ + "{{template_dir}}/scripts/update.sh", + "{{template_dir}}/../_common/motd.sh", + "{{template_dir}}/../_common/sshd.sh", + "{{template_dir}}/scripts/networking.sh", + "{{template_dir}}/scripts/sudoers.sh", + "{{template_dir}}/scripts/vagrant.sh", + "{{template_dir}}/../_common/virtualbox.sh", + "{{template_dir}}/scripts/vmware.sh", + "{{template_dir}}/../_common/parallels.sh", + "{{template_dir}}/scripts/hyperv.sh", + "{{template_dir}}/scripts/cleanup.sh", + "{{template_dir}}/../_common/minimize.sh" + ], + "type": "shell" + } + ], + "variables": { + "box_basename": "ubuntu-16.04", + "build_directory": "../../builds", + "build_timestamp": "{{isotime \"20060102150405\"}}", + "cpus": "2", + "disk_size": "65536", + "git_revision": "__unknown_git_revision__", + "guest_additions_url": "", + "headless": "", + "http_directory": "{{template_dir}}/http", + "http_proxy": "{{env `http_proxy`}}", + "https_proxy": "{{env `https_proxy`}}", + "hyperv_generation": "2", + "hyperv_switch": "bento", + "iso_checksum": "b23488689e16cad7a269eb2d3a3bf725d3457ee6b0868e00c8762d3816e25848", + "iso_name": "ubuntu-16.04.7-server-amd64.iso", + "memory": "1024", + "mirror": "http://releases.ubuntu.com", + "mirror_directory": "16.04.7", + "name": "ubuntu-16.04", + "no_proxy": "{{env `no_proxy`}}", + "preseed_path": "preseed.cfg", + "template": "ubuntu-16.04-amd64", + "version": "TIMESTAMP" + } +} diff --git a/packer_templates/ubuntu/ubuntu-16.04-i386.json b/packer_templates/ubuntu/ubuntu-16.04-i386.json new file mode 100644 index 000000000..ca6eb1703 --- /dev/null +++ b/packer_templates/ubuntu/ubuntu-16.04-i386.json @@ -0,0 +1,286 @@ +{ + "builders": [ + { + "boot_command": [ + "<enter><wait><f6><esc><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs>", + "<bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs>", + "<bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs>", + "<bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs>", + "/install/vmlinuz<wait>", + " auto<wait>", + " console-setup/ask_detect=false<wait>", + " console-setup/layoutcode=us<wait>", + " console-setup/modelcode=pc105<wait>", + " debconf/frontend=noninteractive<wait>", + " debian-installer=en_US.UTF-8<wait>", + " fb=false<wait>", + " initrd=/install/initrd.gz<wait>", + " kbd-chooser/method=us<wait>", + " keyboard-configuration/layout=USA<wait>", + " keyboard-configuration/variant=USA<wait>", + " locale=en_US.UTF-8<wait>", + " netcfg/get_domain=vm<wait>", + " netcfg/get_hostname=vagrant<wait>", + " grub-installer/bootdev=/dev/sda<wait>", + " noapic<wait>", + " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}}<wait>", + " -- <wait>", + "<enter><wait>" + ], + "boot_wait": "5s", + "cpus": "{{ user `cpus` }}", + "disk_size": "{{user `disk_size`}}", + "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "guest_additions_url": "{{ user `guest_additions_url` }}", + "guest_os_type": "Ubuntu", + "hard_drive_interface": "sata", + "headless": "{{ user `headless` }}", + "http_directory": "{{user `http_directory`}}", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "memory": "{{ user `memory` }}", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-virtualbox", + "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_timeout": "10000s", + "ssh_username": "vagrant", + "type": "virtualbox-iso", + "virtualbox_version_file": ".vbox_version", + "vm_name": "{{ user `template` }}" + }, + { + "boot_command": [ + "<enter><wait><f6><esc><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs>", + "<bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs>", + "<bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs>", + "<bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs>", + "/install/vmlinuz<wait>", + " auto<wait>", + " console-setup/ask_detect=false<wait>", + " console-setup/layoutcode=us<wait>", + " console-setup/modelcode=pc105<wait>", + " debconf/frontend=noninteractive<wait>", + " debian-installer=en_US.UTF-8<wait>", + " fb=false<wait>", + " initrd=/install/initrd.gz<wait>", + " kbd-chooser/method=us<wait>", + " keyboard-configuration/layout=USA<wait>", + " keyboard-configuration/variant=USA<wait>", + " locale=en_US.UTF-8<wait>", + " netcfg/get_domain=vm<wait>", + " netcfg/get_hostname=vagrant<wait>", + " grub-installer/bootdev=/dev/sda <wait>", + " noapic<wait>", + " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}}<wait>", + " -- <wait>", + "<enter><wait>" + ], + "boot_wait": "5s", + "cpus": "{{ user `cpus` }}", + "disk_adapter_type": "sata", + "disk_size": "{{user `disk_size`}}", + "guest_os_type": "ubuntu", + "headless": "{{ user `headless` }}", + "http_directory": "{{user `http_directory`}}", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "memory": "{{ user `memory` }}", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-vmware", + "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_timeout": "10000s", + "ssh_username": "vagrant", + "tools_upload_flavor": "linux", + "type": "vmware-iso", + "vm_name": "{{ user `template` }}", + "vmx_data": { + "cpuid.coresPerSocket": "1" + }, + "vmx_remove_ethernet_interfaces": true + }, + { + "boot_command": [ + "<enter><wait><f6><esc><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs>", + "<bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs>", + "<bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs>", + "<bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs>", + "/install/vmlinuz<wait>", + " auto<wait>", + " console-setup/ask_detect=false<wait>", + " console-setup/layoutcode=us<wait>", + " console-setup/modelcode=pc105<wait>", + " debconf/frontend=noninteractive<wait>", + " debian-installer=en_US.UTF-8<wait>", + " fb=false<wait>", + " initrd=/install/initrd.gz<wait>", + " kbd-chooser/method=us<wait>", + " keyboard-configuration/layout=USA<wait>", + " keyboard-configuration/variant=USA<wait>", + " locale=en_US.UTF-8<wait>", + " netcfg/get_domain=vm<wait>", + " netcfg/get_hostname=vagrant<wait>", + " grub-installer/bootdev=/dev/sda <wait>", + " noapic<wait>", + " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}}<wait>", + " -- <wait>", + "<enter><wait>" + ], + "boot_wait": "5s", + "cpus": "{{ user `cpus` }}", + "disk_size": "{{user `disk_size`}}", + "guest_os_type": "ubuntu", + "http_directory": "{{user `http_directory`}}", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "memory": "{{ user `memory` }}", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-parallels", + "parallels_tools_flavor": "lin", + "prlctl_version_file": ".prlctl_version", + "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_timeout": "10000s", + "ssh_username": "vagrant", + "type": "parallels-iso", + "vm_name": "{{ user `template` }}" + }, + { + "boot_command": [ + "<enter><wait><f6><esc><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs>", + "<bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs>", + "<bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs>", + "<bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs>", + "/install/vmlinuz<wait>", + " auto<wait>", + " console-setup/ask_detect=false<wait>", + " console-setup/layoutcode=us<wait>", + " console-setup/modelcode=pc105<wait>", + " debconf/frontend=noninteractive<wait>", + " debian-installer=en_US.UTF-8<wait>", + " fb=false<wait>", + " initrd=/install/initrd.gz<wait>", + " kbd-chooser/method=us<wait>", + " keyboard-configuration/layout=USA<wait>", + " keyboard-configuration/variant=USA<wait>", + " locale=en_US.UTF-8<wait>", + " netcfg/get_domain=vm<wait>", + " netcfg/get_hostname=vagrant<wait>", + " grub-installer/bootdev=/dev/vda <wait>", + " noapic<wait>", + " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}}<wait>", + " -- <wait>", + "<enter><wait>" + ], + "boot_wait": "5s", + "cpus": "{{ user `cpus` }}", + "disk_size": "{{user `disk_size`}}", + "headless": "{{ user `headless` }}", + "http_directory": "{{user `http_directory`}}", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "memory": "{{ user `memory` }}", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-qemu", + "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_timeout": "10000s", + "ssh_username": "vagrant", + "type": "qemu", + "vm_name": "{{ user `template` }}" + }, + { + "boot_command": [ + "<esc><wait10><esc><esc><enter><wait>", + "set gfxpayload=1024x768<enter>", + "linux /install/vmlinuz ", + "preseed/url=http://{{.HTTPIP}}:{{.HTTPPort}}/preseed-hyperv.cfg ", + "debian-installer=en_US.UTF-8 auto locale=en_US.UTF-8 kbd-chooser/method=us ", + "hostname={{.Name}} ", + "fb=false debconf/frontend=noninteractive ", + "keyboard-configuration/modelcode=SKIP keyboard-configuration/layout=USA ", + "keyboard-configuration/variant=USA console-setup/ask_detect=false <enter>", + "initrd /install/initrd.gz<enter>", + "boot<enter>" + ], + "boot_wait": "5s", + "communicator": "ssh", + "cpus": "{{ user `cpus` }}", + "disk_size": "{{user `disk_size`}}", + "enable_secure_boot": false, + "generation": "{{user `hyperv_generation`}}", + "http_directory": "{{user `http_directory`}}", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "memory": "{{user `memory`}}", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-hyperv", + "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_timeout": "10000s", + "ssh_username": "vagrant", + "switch_name": "{{user `hyperv_switch`}}", + "type": "hyperv-iso", + "vm_name": "{{ user `template` }}" + } + ], + "post-processors": [ + { + "output": "{{ user `build_directory` }}/{{user `box_basename`}}.{{.Provider}}.box", + "type": "vagrant" + } + ], + "provisioners": [ + { + "environment_vars": [ + "HOME_DIR=/home/vagrant", + "http_proxy={{user `http_proxy`}}", + "https_proxy={{user `https_proxy`}}", + "no_proxy={{user `no_proxy`}}" + ], + "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", + "expect_disconnect": true, + "scripts": [ + "{{template_dir}}/scripts/update.sh", + "{{template_dir}}/../_common/motd.sh", + "{{template_dir}}/../_common/sshd.sh", + "{{template_dir}}/scripts/networking.sh", + "{{template_dir}}/scripts/sudoers.sh", + "{{template_dir}}/scripts/vagrant.sh", + "{{template_dir}}/../_common/virtualbox.sh", + "{{template_dir}}/scripts/vmware.sh", + "{{template_dir}}/../_common/parallels.sh", + "{{template_dir}}/scripts/hyperv.sh", + "{{template_dir}}/scripts/cleanup.sh", + "{{template_dir}}/../_common/minimize.sh" + ], + "type": "shell" + } + ], + "variables": { + "box_basename": "ubuntu-16.04-i386", + "build_directory": "../../builds", + "build_timestamp": "{{isotime \"20060102150405\"}}", + "cpus": "2", + "disk_size": "65536", + "git_revision": "__unknown_git_revision__", + "guest_additions_url": "", + "headless": "", + "http_directory": "{{template_dir}}/http", + "http_proxy": "{{env `http_proxy`}}", + "https_proxy": "{{env `https_proxy`}}", + "hyperv_generation": "1", + "hyperv_switch": "bento", + "iso_checksum": "7509cabb2f9f6ba0a95f8454d432be2ef26679d31ce35baa626acc5321460fab", + "iso_name": "ubuntu-16.04.6-server-i386.iso", + "memory": "1024", + "mirror": "http://releases.ubuntu.com/releases", + "mirror_directory": "16.04.6", + "name": "ubuntu-16.04-i386", + "no_proxy": "{{env `no_proxy`}}", + "preseed_path": "preseed.cfg", + "template": "ubuntu-16.04-i386", + "version": "TIMESTAMP" + } +} From 17627e4051fca9567636a925da2fd827a202d378 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Sun, 24 Oct 2021 19:33:36 -0700 Subject: [PATCH 1410/1622] Start the process of killing off the "live" Ubuntu images We can use these live installers everywhere now and we should. Signed-off-by: Tim Smith <tsmith@chef.io> --- .../ubuntu/ubuntu-20.04-amd64.json | 535 ++++++++---------- ...ive-arm64.json => ubuntu-20.04-arm64.json} | 0 2 files changed, 251 insertions(+), 284 deletions(-) rename packer_templates/ubuntu/{ubuntu-20.04-live-arm64.json => ubuntu-20.04-arm64.json} (100%) diff --git a/packer_templates/ubuntu/ubuntu-20.04-amd64.json b/packer_templates/ubuntu/ubuntu-20.04-amd64.json index 2e6dc5ed3..a41988db1 100644 --- a/packer_templates/ubuntu/ubuntu-20.04-amd64.json +++ b/packer_templates/ubuntu/ubuntu-20.04-amd64.json @@ -1,287 +1,254 @@ { - "builders": [ - { - "boot_command": [ - "<esc><wait>", - "<esc><wait>", - "<enter><wait>", - "/install/vmlinuz<wait>", - " auto<wait>", - " console-setup/ask_detect=false<wait>", - " console-setup/layoutcode=us<wait>", - " console-setup/modelcode=pc105<wait>", - " debconf/frontend=noninteractive<wait>", - " debian-installer=en_US.UTF-8<wait>", - " fb=false<wait>", - " initrd=/install/initrd.gz<wait>", - " kbd-chooser/method=us<wait>", - " keyboard-configuration/layout=USA<wait>", - " keyboard-configuration/variant=USA<wait>", - " locale=en_US.UTF-8<wait>", - " netcfg/get_domain=vm<wait>", - " netcfg/get_hostname=vagrant<wait>", - " grub-installer/bootdev=/dev/sda<wait>", - " noapic<wait>", - " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}}<wait>", - " -- <wait>", - "<enter><wait>" - ], - "boot_wait": "5s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", - "guest_additions_url": "{{ user `guest_additions_url` }}", - "guest_os_type": "Ubuntu_64", - "hard_drive_interface": "sata", - "headless": "{{ user `headless` }}", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-virtualbox", - "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "type": "virtualbox-iso", - "virtualbox_version_file": ".vbox_version", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<esc><wait>", - "<esc><wait>", - "<enter><wait>", - "/install/vmlinuz<wait>", - " auto<wait>", - " console-setup/ask_detect=false<wait>", - " console-setup/layoutcode=us<wait>", - " console-setup/modelcode=pc105<wait>", - " debconf/frontend=noninteractive<wait>", - " debian-installer=en_US.UTF-8<wait>", - " fb=false<wait>", - " initrd=/install/initrd.gz<wait>", - " kbd-chooser/method=us<wait>", - " keyboard-configuration/layout=USA<wait>", - " keyboard-configuration/variant=USA<wait>", - " locale=en_US.UTF-8<wait>", - " netcfg/get_domain=vm<wait>", - " netcfg/get_hostname=vagrant<wait>", - " grub-installer/bootdev=/dev/sda<wait>", - " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}}<wait>", - " -- <wait>", - "<enter><wait>" - ], - "boot_wait": "5s", - "cpus": "{{ user `cpus` }}", - "disk_adapter_type": "sata", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "ubuntu-64", - "headless": "{{ user `headless` }}", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-vmware", - "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "tools_upload_flavor": "linux", - "type": "vmware-iso", - "vm_name": "{{ user `template` }}", - "vmx_data": { - "cpuid.coresPerSocket": "1", - "ethernet0.pciSlotNumber": "32" - }, - "vmx_remove_ethernet_interfaces": true - }, - { - "boot_command": [ - "<esc><wait>", - "<esc><wait>", - "<enter><wait>", - "/install/vmlinuz<wait>", - " auto<wait>", - " console-setup/ask_detect=false<wait>", - " console-setup/layoutcode=us<wait>", - " console-setup/modelcode=pc105<wait>", - " debconf/frontend=noninteractive<wait>", - " debian-installer=en_US.UTF-8<wait>", - " fb=false<wait>", - " initrd=/install/initrd.gz<wait>", - " kbd-chooser/method=us<wait>", - " keyboard-configuration/layout=USA<wait>", - " keyboard-configuration/variant=USA<wait>", - " locale=en_US.UTF-8<wait>", - " netcfg/get_domain=vm<wait>", - " netcfg/get_hostname=vagrant<wait>", - " grub-installer/bootdev=/dev/sda<wait>", - " noapic<wait>", - " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}}<wait>", - " -- <wait>", - "<enter><wait>" - ], - "boot_wait": "5s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "ubuntu", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-parallels", - "parallels_tools_flavor": "lin", - "prlctl_version_file": ".prlctl_version", - "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "type": "parallels-iso", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<esc><wait>", - "<esc><wait>", - "<enter><wait>", - "/install/vmlinuz<wait>", - " auto<wait>", - " console-setup/ask_detect=false<wait>", - " console-setup/layoutcode=us<wait>", - " console-setup/modelcode=pc105<wait>", - " debconf/frontend=noninteractive<wait>", - " debian-installer=en_US.UTF-8<wait>", - " fb=false<wait>", - " initrd=/install/initrd.gz<wait>", - " kbd-chooser/method=us<wait>", - " keyboard-configuration/layout=USA<wait>", - " keyboard-configuration/variant=USA<wait>", - " locale=en_US.UTF-8<wait>", - " netcfg/get_domain=vm<wait>", - " netcfg/get_hostname=vagrant<wait>", - " grub-installer/bootdev=/dev/vda<wait>", - " noapic<wait>", - " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}}<wait>", - " -- <wait>", - "<enter><wait>" - ], - "boot_wait": "5s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "headless": "{{ user `headless` }}", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-qemu", - "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "type": "qemu", - "vm_name": "{{ user `template` }}", - "qemuargs": [ - [ "-m", "{{ user `memory` }}" ], - [ "-display", "{{ user `qemu_display` }}" ] - ] - }, - { - "boot_command": [ - "<esc><wait10><esc><esc><enter><wait>", - "set gfxpayload=1024x768<enter>", - "linux /install/vmlinuz ", - "preseed/url=http://{{.HTTPIP}}:{{.HTTPPort}}/preseed-hyperv.cfg ", - "debian-installer=en_US.UTF-8 auto locale=en_US.UTF-8 kbd-chooser/method=us ", - "hostname={{.Name}} ", - "fb=false debconf/frontend=noninteractive ", - "keyboard-configuration/modelcode=SKIP keyboard-configuration/layout=USA ", - "keyboard-configuration/variant=USA console-setup/ask_detect=false <enter>", - "initrd /install/initrd.gz<enter>", - "boot<enter>" - ], - "boot_wait": "5s", - "communicator": "ssh", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "enable_secure_boot": false, - "generation": "{{user `hyperv_generation`}}", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{user `memory`}}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-hyperv", - "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "switch_name": "{{user `hyperv_switch`}}", - "type": "hyperv-iso", - "vm_name": "{{ user `template` }}" + "builders": [ + { + "boot_command": [ + " <wait>", + " <wait>", + " <wait>", + " <wait>", + " <wait>", + "<esc><wait>", + "<f6><wait>", + "<esc><wait>", + "<bs><bs><bs><bs><wait>", + " autoinstall<wait5>", + " ds=nocloud-net<wait5>", + ";s=http://<wait5>{{.HTTPIP}}<wait5>:{{.HTTPPort}}/<wait5>", + " ---<wait5>", + "<enter><wait5>" + ], + "boot_wait": "5s", + "cpus": "{{ user `cpus` }}", + "disk_size": "{{user `disk_size`}}", + "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "guest_additions_url": "{{ user `guest_additions_url` }}", + "guest_os_type": "Ubuntu_64", + "hard_drive_interface": "sata", + "headless": "{{ user `headless` }}", + "http_directory": "{{user `http_directory`}}", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "memory": "{{ user `memory` }}", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-virtualbox", + "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_timeout": "10000s", + "ssh_username": "vagrant", + "type": "virtualbox-iso", + "virtualbox_version_file": ".vbox_version", + "vm_name": "{{ user `template` }}" + }, + { + "boot_command": [ + " <wait>", + " <wait>", + " <wait>", + " <wait>", + " <wait>", + "<esc><wait>", + "<f6><wait>", + "<esc><wait>", + "<bs><bs><bs><bs><wait>", + " autoinstall<wait5>", + " ds=nocloud-net<wait5>", + ";s=http://<wait5>{{.HTTPIP}}<wait5>:{{.HTTPPort}}/<wait5>", + " ---<wait5>", + "<enter><wait5>" + ], + "boot_wait": "5s", + "cpus": "{{ user `cpus` }}", + "disk_size": "{{user `disk_size`}}", + "guest_os_type": "ubuntu-64", + "headless": "{{ user `headless` }}", + "http_directory": "{{user `http_directory`}}", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "memory": "{{ user `memory` }}", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-vmware", + "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_timeout": "10000s", + "ssh_username": "vagrant", + "tools_upload_flavor": "linux", + "type": "vmware-iso", + "vm_name": "{{ user `template` }}", + "vmx_data": { + "cpuid.coresPerSocket": "1", + "ethernet0.pciSlotNumber": "32" + }, + "vmx_remove_ethernet_interfaces": true + }, + { + "boot_command": [ + " <wait>", + " <wait>", + " <wait>", + " <wait>", + " <wait>", + "<esc><wait>", + "<f6><wait>", + "<esc><wait>", + "<bs><bs><bs><bs><wait>", + " autoinstall<wait5>", + " ds=nocloud-net<wait5>", + ";s=http://<wait5>{{.HTTPIP}}<wait5>:{{.HTTPPort}}/<wait5>", + " ---<wait5>", + "<enter><wait5>" + ], + "boot_wait": "5s", + "cpus": "{{ user `cpus` }}", + "disk_size": "{{user `disk_size`}}", + "guest_os_type": "ubuntu", + "http_directory": "{{user `http_directory`}}", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "memory": "{{ user `memory` }}", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-parallels", + "parallels_tools_flavor": "lin", + "prlctl_version_file": ".prlctl_version", + "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_timeout": "10000s", + "ssh_username": "vagrant", + "type": "parallels-iso", + "vm_name": "{{ user `template` }}" + }, + { + "boot_command": [ + " <wait>", + " <wait>", + " <wait>", + " <wait>", + " <wait>", + "<esc><wait>", + "<f6><wait>", + "<esc><wait>", + "<bs><bs><bs><bs><wait>", + " autoinstall<wait5>", + " ds=nocloud-net<wait5>", + ";s=http://<wait5>{{.HTTPIP}}<wait5>:{{.HTTPPort}}/<wait5>", + " ---<wait5>", + "<enter><wait5>" + ], + "boot_wait": "5s", + "cpus": "{{ user `cpus` }}", + "disk_size": "{{user `disk_size`}}", + "headless": "{{ user `headless` }}", + "http_directory": "{{user `http_directory`}}", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "memory": "{{ user `memory` }}", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-qemu", + "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_timeout": "10000s", + "ssh_username": "vagrant", + "type": "qemu", + "vm_name": "{{ user `template` }}", + "qemuargs": [ + [ "-m", "{{ user `memory` }}" ], + [ "-display", "{{ user `qemu_display` }}" ] + ] + }, + { + "boot_command": [ + " <wait>", + " <wait>", + " <wait>", + " <wait>", + " <wait>", + "<esc><wait>", + "<f6><wait>", + "<esc><wait>", + "<bs><bs><bs><bs><wait>", + " autoinstall<wait5>", + " ds=nocloud-net<wait5>", + ";s=http://<wait5>{{.HTTPIP}}<wait5>:{{.HTTPPort}}/<wait5>", + " ---<wait5>", + "<enter><wait5>" + ], + "boot_wait": "5s", + "communicator": "ssh", + "cpus": "{{ user `cpus` }}", + "disk_size": "{{user `disk_size`}}", + "enable_secure_boot": false, + "generation": "{{user `hyperv_generation`}}", + "http_directory": "{{user `http_directory`}}", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "memory": "{{user `memory`}}", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-hyperv", + "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_timeout": "10000s", + "ssh_username": "vagrant", + "switch_name": "{{user `hyperv_switch`}}", + "type": "hyperv-iso", + "vm_name": "{{ user `template` }}" + } + ], + "post-processors": [ + { + "output": "{{ user `build_directory` }}/{{user `box_basename`}}.{{.Provider}}.box", + "type": "vagrant" + } + ], + "provisioners": [ + { + "environment_vars": [ + "HOME_DIR=/home/vagrant", + "http_proxy={{user `http_proxy`}}", + "https_proxy={{user `https_proxy`}}", + "no_proxy={{user `no_proxy`}}" + ], + "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", + "expect_disconnect": true, + "scripts": [ + "{{template_dir}}/scripts/update.sh", + "{{template_dir}}/../_common/motd.sh", + "{{template_dir}}/../_common/sshd.sh", + "{{template_dir}}/scripts/networking.sh", + "{{template_dir}}/scripts/sudoers.sh", + "{{template_dir}}/scripts/vagrant.sh", + "{{template_dir}}/../_common/virtualbox.sh", + "{{template_dir}}/scripts/vmware.sh", + "{{template_dir}}/../_common/parallels.sh", + "{{template_dir}}/scripts/hyperv.sh", + "{{template_dir}}/scripts/cleanup.sh", + "{{template_dir}}/../_common/minimize.sh" + ], + "type": "shell" + } + ], + "variables": { + "box_basename": "ubuntu-20.04", + "build_directory": "../../builds", + "build_timestamp": "{{isotime \"20060102150405\"}}", + "cpus": "2", + "disk_size": "65536", + "git_revision": "__unknown_git_revision__", + "guest_additions_url": "", + "headless": "", + "http_directory": "{{template_dir}}/http", + "http_proxy": "{{env `http_proxy`}}", + "https_proxy": "{{env `https_proxy`}}", + "hyperv_generation": "2", + "hyperv_switch": "bento", + "iso_checksum": "d1f2bf834bbe9bb43faf16f9be992a6f3935e65be0edece1dee2aa6eb1767423", + "iso_name": "ubuntu-20.04.2-live-server-amd64.iso", + "memory": "1024", + "mirror": "http://releases.ubuntu.com", + "mirror_directory": "20.04", + "name": "ubuntu-20.04", + "no_proxy": "{{env `no_proxy`}}", + "preseed_path": "preseed.cfg", + "qemu_display": "none", + "template": "ubuntu-20.04-amd64", + "version": "TIMESTAMP" } - ], - "post-processors": [ - { - "output": "{{ user `build_directory` }}/{{user `box_basename`}}.{{.Provider}}.box", - "type": "vagrant" - } - ], - "provisioners": [ - { - "environment_vars": [ - "HOME_DIR=/home/vagrant", - "http_proxy={{user `http_proxy`}}", - "https_proxy={{user `https_proxy`}}", - "no_proxy={{user `no_proxy`}}" - ], - "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", - "expect_disconnect": true, - "scripts": [ - "{{template_dir}}/scripts/update.sh", - "{{template_dir}}/../_common/motd.sh", - "{{template_dir}}/../_common/sshd.sh", - "{{template_dir}}/scripts/networking.sh", - "{{template_dir}}/scripts/sudoers.sh", - "{{template_dir}}/scripts/vagrant.sh", - "{{template_dir}}/../_common/virtualbox.sh", - "{{template_dir}}/scripts/vmware.sh", - "{{template_dir}}/../_common/parallels.sh", - "{{template_dir}}/scripts/hyperv.sh", - "{{template_dir}}/scripts/cleanup.sh", - "{{template_dir}}/../_common/minimize.sh" - ], - "type": "shell" - } - ], - "variables": { - "box_basename": "ubuntu-20.04", - "build_directory": "../../builds", - "build_timestamp": "{{isotime \"20060102150405\"}}", - "cpus": "2", - "disk_size": "65536", - "git_revision": "__unknown_git_revision__", - "guest_additions_url": "", - "headless": "", - "http_directory": "{{template_dir}}/http", - "http_proxy": "{{env `http_proxy`}}", - "https_proxy": "{{env `https_proxy`}}", - "hyperv_generation": "2", - "hyperv_switch": "bento", - "iso_checksum": "f11bda2f2caed8f420802b59f382c25160b114ccc665dbac9c5046e7fceaced2", - "iso_name": "ubuntu-20.04.1-legacy-server-amd64.iso", - "memory": "1024", - "mirror": "http://cdimage.ubuntu.com", - "mirror_directory": "ubuntu-legacy-server/releases/20.04/release", - "name": "ubuntu-20.04", - "no_proxy": "{{env `no_proxy`}}", - "preseed_path": "preseed.cfg", - "qemu_display": "none", - "template": "ubuntu-20.04-amd64", - "version": "TIMESTAMP" - } } diff --git a/packer_templates/ubuntu/ubuntu-20.04-live-arm64.json b/packer_templates/ubuntu/ubuntu-20.04-arm64.json similarity index 100% rename from packer_templates/ubuntu/ubuntu-20.04-live-arm64.json rename to packer_templates/ubuntu/ubuntu-20.04-arm64.json From 78af02a3cb542d274f86555a29612d9922e19e78 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Sun, 24 Oct 2021 19:35:18 -0700 Subject: [PATCH 1411/1622] Fix the mirror dir for Ubuntu 20.04 Signed-off-by: Tim Smith <tsmith@chef.io> --- packer_templates/ubuntu/ubuntu-20.04-amd64.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packer_templates/ubuntu/ubuntu-20.04-amd64.json b/packer_templates/ubuntu/ubuntu-20.04-amd64.json index a41988db1..4633c1ee0 100644 --- a/packer_templates/ubuntu/ubuntu-20.04-amd64.json +++ b/packer_templates/ubuntu/ubuntu-20.04-amd64.json @@ -243,7 +243,7 @@ "iso_name": "ubuntu-20.04.2-live-server-amd64.iso", "memory": "1024", "mirror": "http://releases.ubuntu.com", - "mirror_directory": "20.04", + "mirror_directory": "releases/20.04/release", "name": "ubuntu-20.04", "no_proxy": "{{env `no_proxy`}}", "preseed_path": "preseed.cfg", From 61463c478e3f224ad48319bd342e74fc05f85971 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Sun, 24 Oct 2021 19:36:48 -0700 Subject: [PATCH 1412/1622] Try again Signed-off-by: Tim Smith <tsmith@chef.io> --- packer_templates/ubuntu/ubuntu-20.04-amd64.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packer_templates/ubuntu/ubuntu-20.04-amd64.json b/packer_templates/ubuntu/ubuntu-20.04-amd64.json index 4633c1ee0..ce364c247 100644 --- a/packer_templates/ubuntu/ubuntu-20.04-amd64.json +++ b/packer_templates/ubuntu/ubuntu-20.04-amd64.json @@ -243,7 +243,7 @@ "iso_name": "ubuntu-20.04.2-live-server-amd64.iso", "memory": "1024", "mirror": "http://releases.ubuntu.com", - "mirror_directory": "releases/20.04/release", + "mirror_directory": "focal", "name": "ubuntu-20.04", "no_proxy": "{{env `no_proxy`}}", "preseed_path": "preseed.cfg", From 46866bc865d316ec2922b836c159e620e47e05ba Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Sun, 24 Oct 2021 19:37:33 -0700 Subject: [PATCH 1413/1622] Update Ubuntu 20.04 to 20.04.3 Signed-off-by: Tim Smith <tsmith@chef.io> --- packer_templates/ubuntu/ubuntu-20.04-amd64.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packer_templates/ubuntu/ubuntu-20.04-amd64.json b/packer_templates/ubuntu/ubuntu-20.04-amd64.json index ce364c247..e24330968 100644 --- a/packer_templates/ubuntu/ubuntu-20.04-amd64.json +++ b/packer_templates/ubuntu/ubuntu-20.04-amd64.json @@ -239,8 +239,8 @@ "https_proxy": "{{env `https_proxy`}}", "hyperv_generation": "2", "hyperv_switch": "bento", - "iso_checksum": "d1f2bf834bbe9bb43faf16f9be992a6f3935e65be0edece1dee2aa6eb1767423", - "iso_name": "ubuntu-20.04.2-live-server-amd64.iso", + "iso_checksum": "f8e3086f3cea0fb3fefb29937ab5ed9d19e767079633960ccb50e76153effc98", + "iso_name": "ubuntu-20.04.3-live-server-amd64.iso", "memory": "1024", "mirror": "http://releases.ubuntu.com", "mirror_directory": "focal", From a7b9dcacad2e3a65d02eac5684a2b73646ebc7f3 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Sun, 24 Oct 2021 20:54:29 -0700 Subject: [PATCH 1414/1622] Fix Ubuntu 16.04 i386 url Signed-off-by: Tim Smith <tsmith@chef.io> --- packer_templates/ubuntu/ubuntu-16.04-i386.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packer_templates/ubuntu/ubuntu-16.04-i386.json b/packer_templates/ubuntu/ubuntu-16.04-i386.json index ca6eb1703..559e46aea 100644 --- a/packer_templates/ubuntu/ubuntu-16.04-i386.json +++ b/packer_templates/ubuntu/ubuntu-16.04-i386.json @@ -275,7 +275,7 @@ "iso_checksum": "7509cabb2f9f6ba0a95f8454d432be2ef26679d31ce35baa626acc5321460fab", "iso_name": "ubuntu-16.04.6-server-i386.iso", "memory": "1024", - "mirror": "http://releases.ubuntu.com/releases", + "mirror": "http://releases.ubuntu.com", "mirror_directory": "16.04.6", "name": "ubuntu-16.04-i386", "no_proxy": "{{env `no_proxy`}}", From 1a9f2d386a561811d5c749a6c4821976b4b8ce10 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Sun, 24 Oct 2021 20:58:13 -0700 Subject: [PATCH 1415/1622] Another fix for Ubuntu 16.04 i386 mirror dir Signed-off-by: Tim Smith <tsmith@chef.io> --- packer_templates/ubuntu/ubuntu-16.04-i386.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packer_templates/ubuntu/ubuntu-16.04-i386.json b/packer_templates/ubuntu/ubuntu-16.04-i386.json index 559e46aea..6ba1e966a 100644 --- a/packer_templates/ubuntu/ubuntu-16.04-i386.json +++ b/packer_templates/ubuntu/ubuntu-16.04-i386.json @@ -276,11 +276,11 @@ "iso_name": "ubuntu-16.04.6-server-i386.iso", "memory": "1024", "mirror": "http://releases.ubuntu.com", - "mirror_directory": "16.04.6", + "mirror_directory": "16.04", "name": "ubuntu-16.04-i386", "no_proxy": "{{env `no_proxy`}}", "preseed_path": "preseed.cfg", "template": "ubuntu-16.04-i386", "version": "TIMESTAMP" } -} +} \ No newline at end of file From 509a142d41734e912da51e4976914ef6cc0ec84b Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith@mcwfhtimsmith.localdomain> Date: Sun, 24 Oct 2021 22:20:29 -0700 Subject: [PATCH 1416/1622] Update Ubuntu 18.04 to 18.04.6 --- builds/uploaded/.gitkeep | 0 packer_templates/ubuntu/ubuntu-18.04-amd64.json | 4 ++-- 2 files changed, 2 insertions(+), 2 deletions(-) delete mode 100644 builds/uploaded/.gitkeep diff --git a/builds/uploaded/.gitkeep b/builds/uploaded/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/packer_templates/ubuntu/ubuntu-18.04-amd64.json b/packer_templates/ubuntu/ubuntu-18.04-amd64.json index 6e0416962..b3d1f26ab 100644 --- a/packer_templates/ubuntu/ubuntu-18.04-amd64.json +++ b/packer_templates/ubuntu/ubuntu-18.04-amd64.json @@ -272,8 +272,8 @@ "https_proxy": "{{env `https_proxy`}}", "hyperv_generation": "2", "hyperv_switch": "bento", - "iso_checksum": "8c5fc24894394035402f66f3824beb7234b757dd2b5531379cb310cedfdf0996", - "iso_name": "ubuntu-18.04.5-server-amd64.iso", + "iso_checksum": "f5cbb8104348f0097a8e513b10173a07dbc6684595e331cb06f93f385d0aecf6", + "iso_name": "ubuntu-18.04.6-server-amd64.iso", "memory": "1024", "mirror": "http://cdimage.ubuntu.com", "mirror_directory": "ubuntu/releases/18.04.5/release", From 8d9865d0d945683ae92a304626fb9fcd12629e6a Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Mon, 25 Oct 2021 17:24:23 -0700 Subject: [PATCH 1417/1622] Fix 18.04 mirror path Signed-off-by: Tim Smith <tsmith@chef.io> --- packer_templates/ubuntu/ubuntu-18.04-amd64.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packer_templates/ubuntu/ubuntu-18.04-amd64.json b/packer_templates/ubuntu/ubuntu-18.04-amd64.json index b3d1f26ab..d9c41ffd5 100644 --- a/packer_templates/ubuntu/ubuntu-18.04-amd64.json +++ b/packer_templates/ubuntu/ubuntu-18.04-amd64.json @@ -276,7 +276,7 @@ "iso_name": "ubuntu-18.04.6-server-amd64.iso", "memory": "1024", "mirror": "http://cdimage.ubuntu.com", - "mirror_directory": "ubuntu/releases/18.04.5/release", + "mirror_directory": "ubuntu/releases/18.04.6/release", "name": "ubuntu-18.04", "no_proxy": "{{env `no_proxy`}}", "preseed_path": "preseed.cfg", From 0f9153ac8caeda3cfdd5920507ae223276e6ddac Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Mon, 25 Oct 2021 17:24:52 -0700 Subject: [PATCH 1418/1622] Attempt to fix failing opensuse 15 builds Signed-off-by: Tim Smith <tsmith@chef.io> --- .../opensuse/http/15/autoinst.xml | 22 +++++++++++++------ 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/packer_templates/opensuse/http/15/autoinst.xml b/packer_templates/opensuse/http/15/autoinst.xml index 77eb3a1db..1f57d2c7d 100644 --- a/packer_templates/opensuse/http/15/autoinst.xml +++ b/packer_templates/opensuse/http/15/autoinst.xml @@ -106,17 +106,25 @@ <ipv6 config:type="boolean">false</ipv6> <keep_install_network config:type="boolean">true</keep_install_network> <dns> - <dhcp_hostname config:type="boolean">true</dhcp_hostname> - <dhcp_resolv config:type="boolean">true</dhcp_resolv> - <domain>vagrantup.com</domain> - <hostname>opensuse-leap-x64</hostname> + <dhcp_hostname config:type="boolean">false</dhcp_hostname> + <domain>localdomain</domain> + <hostname>opensuse15.localdomain</hostname> </dns> <interfaces config:type="list"> + <interface> + <bootproto>dhcp</bootproto> + <device>enp0s3</device> + <startmode>hotplug</startmode> + </interface> + <interface> + <bootproto>dhcp</bootproto> + <device>ens33</device> + <startmode>hotplug</startmode> + </interface> <interface> <bootproto>dhcp</bootproto> <device>eth0</device> - <startmode>auto</startmode> - <usercontrol>no</usercontrol> + <startmode>hotplug</startmode> </interface> </interfaces> </networking> @@ -157,7 +165,7 @@ </remove-packages> </software> <services-manager> - <default_target>graphical</default_target> + <default_target>multi-user</default_target> <services> <disable config:type="list" /> <enable config:type="list"> From 457d59760c3fa21c39e0ad9939ea260ad7b6548a Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Mon, 25 Oct 2021 17:31:21 -0700 Subject: [PATCH 1419/1622] Another fix for opensuse 15 Signed-off-by: Tim Smith <tsmith@chef.io> --- .../opensuse/http/15/autoinst.xml | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/packer_templates/opensuse/http/15/autoinst.xml b/packer_templates/opensuse/http/15/autoinst.xml index 1f57d2c7d..098d65e09 100644 --- a/packer_templates/opensuse/http/15/autoinst.xml +++ b/packer_templates/opensuse/http/15/autoinst.xml @@ -97,7 +97,7 @@ <bootloader> <loader_type>grub2</loader_type> <global> - <activate config:type="boolean">true</activate> + <activate>true</activate> <timeout config:type="integer">1</timeout> <boot_mbr>true</boot_mbr> </global> @@ -149,6 +149,8 @@ <package>curl</package> <package>grub2-branding-openSUSE</package> <package>less</package> + <package>openssh</package> + <package>openssh-server</package> </packages> <patterns config:type="list"> <pattern>sw_management</pattern> @@ -217,4 +219,19 @@ <kdump> <add_crash_kernel config:type="boolean">false</add_crash_kernel> </kdump> + <scripts> + <post-scripts config:type="list"> + <script> + <filename>post.sh</filename> + <interpreter>shell</interpreter> + <source><![CDATA[ +#!/bin/bash +dmesg | grep -E "Hypervisor detected: Microsoft HyperV|Hypervisor detected: Microsoft Hyper-V" +if [ $? -eq 0 ]; then systemctl enable hv_kvp_daemon.service ; fi +]]> + </source> + </script> + </post-scripts> + </scripts> + </profile> From f46ca910ced7931f2201396ef4e98c650e3b23dc Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith@mcwfhtimsmith.localdomain> Date: Mon, 25 Oct 2021 20:05:52 -0700 Subject: [PATCH 1420/1622] Additional opensuse autoinst fixes --- packer_templates/opensuse/http/15/autoinst.xml | 2 -- 1 file changed, 2 deletions(-) diff --git a/packer_templates/opensuse/http/15/autoinst.xml b/packer_templates/opensuse/http/15/autoinst.xml index 098d65e09..4b1a823a2 100644 --- a/packer_templates/opensuse/http/15/autoinst.xml +++ b/packer_templates/opensuse/http/15/autoinst.xml @@ -133,7 +133,6 @@ <start_firewall config:type="boolean">false</start_firewall> </firewall> <software> - <image /> <instsource /> <packages config:type="list"> <package>grub2</package> @@ -147,7 +146,6 @@ <package>yast2-trans-en_US</package> <package>wget</package> <package>curl</package> - <package>grub2-branding-openSUSE</package> <package>less</package> <package>openssh</package> <package>openssh-server</package> From b653316a23512641e5bbaeedc9ce909f1ad5b0a0 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith@mcwfhtimsmith.localdomain> Date: Mon, 25 Oct 2021 21:58:49 -0700 Subject: [PATCH 1421/1622] Fix ubuntu 16.04 on vmware booting --- packer_templates/ubuntu/ubuntu-16.04-amd64.json | 1 - packer_templates/ubuntu/ubuntu-16.04-i386.json | 3 +-- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/packer_templates/ubuntu/ubuntu-16.04-amd64.json b/packer_templates/ubuntu/ubuntu-16.04-amd64.json index 539dcac4c..ad4e2e628 100644 --- a/packer_templates/ubuntu/ubuntu-16.04-amd64.json +++ b/packer_templates/ubuntu/ubuntu-16.04-amd64.json @@ -78,7 +78,6 @@ ], "boot_wait": "5s", "cpus": "{{ user `cpus` }}", - "disk_adapter_type": "sata", "disk_size": "{{user `disk_size`}}", "guest_os_type": "ubuntu-64", "headless": "{{ user `headless` }}", diff --git a/packer_templates/ubuntu/ubuntu-16.04-i386.json b/packer_templates/ubuntu/ubuntu-16.04-i386.json index 6ba1e966a..e84a9b2ec 100644 --- a/packer_templates/ubuntu/ubuntu-16.04-i386.json +++ b/packer_templates/ubuntu/ubuntu-16.04-i386.json @@ -78,7 +78,6 @@ ], "boot_wait": "5s", "cpus": "{{ user `cpus` }}", - "disk_adapter_type": "sata", "disk_size": "{{user `disk_size`}}", "guest_os_type": "ubuntu", "headless": "{{ user `headless` }}", @@ -283,4 +282,4 @@ "template": "ubuntu-16.04-i386", "version": "TIMESTAMP" } -} \ No newline at end of file +} From 6c2a2f5529222ba7ed42caf4c44be691865e0c17 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Tue, 26 Oct 2021 20:26:51 -0700 Subject: [PATCH 1422/1622] Set VMware version to 12 on RHEL boxes --- packer_templates/almalinux/almalinux-8.4-x86_64.json | 1 + packer_templates/centos/centos-7.9-x86_64.json | 1 + packer_templates/centos/centos-8.4-x86_64.json | 1 + packer_templates/centos/centos-stream-8-x86_64.json | 1 + packer_templates/oraclelinux/oracle-8.3-x86_64.json | 1 + packer_templates/rockylinux/rockylinux-8.4-x86_64.json | 1 + packer_templates/scientificlinux/scientific-7.9-x86_64.json | 1 + packer_templates/springdalelinux/springdalelinux-7.9-x86_64.json | 1 + 8 files changed, 8 insertions(+) diff --git a/packer_templates/almalinux/almalinux-8.4-x86_64.json b/packer_templates/almalinux/almalinux-8.4-x86_64.json index 12d70bdf9..c14b55e88 100644 --- a/packer_templates/almalinux/almalinux-8.4-x86_64.json +++ b/packer_templates/almalinux/almalinux-8.4-x86_64.json @@ -39,6 +39,7 @@ "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, + "version": "12", "ssh_timeout": "10000s", "ssh_username": "vagrant", "tools_upload_flavor": "linux", diff --git a/packer_templates/centos/centos-7.9-x86_64.json b/packer_templates/centos/centos-7.9-x86_64.json index 09fbe875e..6cbe2db1b 100644 --- a/packer_templates/centos/centos-7.9-x86_64.json +++ b/packer_templates/centos/centos-7.9-x86_64.json @@ -43,6 +43,7 @@ "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, + "version": "12", "ssh_timeout": "10000s", "ssh_username": "vagrant", "tools_upload_flavor": "linux", diff --git a/packer_templates/centos/centos-8.4-x86_64.json b/packer_templates/centos/centos-8.4-x86_64.json index 6eed911e8..101c4921b 100644 --- a/packer_templates/centos/centos-8.4-x86_64.json +++ b/packer_templates/centos/centos-8.4-x86_64.json @@ -39,6 +39,7 @@ "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, + "version": "12", "ssh_timeout": "10000s", "ssh_username": "vagrant", "tools_upload_flavor": "linux", diff --git a/packer_templates/centos/centos-stream-8-x86_64.json b/packer_templates/centos/centos-stream-8-x86_64.json index 7ce0ae7f7..fec733ae9 100644 --- a/packer_templates/centos/centos-stream-8-x86_64.json +++ b/packer_templates/centos/centos-stream-8-x86_64.json @@ -39,6 +39,7 @@ "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, + "version": "12", "ssh_timeout": "10000s", "ssh_username": "vagrant", "tools_upload_flavor": "linux", diff --git a/packer_templates/oraclelinux/oracle-8.3-x86_64.json b/packer_templates/oraclelinux/oracle-8.3-x86_64.json index 6f600b8d1..b43015f5e 100644 --- a/packer_templates/oraclelinux/oracle-8.3-x86_64.json +++ b/packer_templates/oraclelinux/oracle-8.3-x86_64.json @@ -39,6 +39,7 @@ "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, + "version": "12", "ssh_timeout": "10000s", "ssh_username": "vagrant", "tools_upload_flavor": "linux", diff --git a/packer_templates/rockylinux/rockylinux-8.4-x86_64.json b/packer_templates/rockylinux/rockylinux-8.4-x86_64.json index 7af7f9e5f..e6fde2462 100644 --- a/packer_templates/rockylinux/rockylinux-8.4-x86_64.json +++ b/packer_templates/rockylinux/rockylinux-8.4-x86_64.json @@ -39,6 +39,7 @@ "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, + "version": "12", "ssh_timeout": "10000s", "ssh_username": "vagrant", "tools_upload_flavor": "linux", diff --git a/packer_templates/scientificlinux/scientific-7.9-x86_64.json b/packer_templates/scientificlinux/scientific-7.9-x86_64.json index e14698d08..70e1f65c0 100644 --- a/packer_templates/scientificlinux/scientific-7.9-x86_64.json +++ b/packer_templates/scientificlinux/scientific-7.9-x86_64.json @@ -43,6 +43,7 @@ "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, + "version": "12", "ssh_timeout": "10000s", "ssh_username": "vagrant", "tools_upload_flavor": "linux", diff --git a/packer_templates/springdalelinux/springdalelinux-7.9-x86_64.json b/packer_templates/springdalelinux/springdalelinux-7.9-x86_64.json index a72d7d3bd..5fccee710 100644 --- a/packer_templates/springdalelinux/springdalelinux-7.9-x86_64.json +++ b/packer_templates/springdalelinux/springdalelinux-7.9-x86_64.json @@ -39,6 +39,7 @@ "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, + "version": "12", "ssh_timeout": "10000s", "ssh_username": "vagrant", "tools_upload_flavor": "linux", From e202da3e5b776a108c019cc3acdf089d162c0ba1 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Tue, 26 Oct 2021 20:27:53 -0700 Subject: [PATCH 1423/1622] Parallels: Turn off 3d acceleration and set VRAM to 16 megs --- .../almalinux/almalinux-8.4-x86_64.json | 14 ++++++++++++++ packer_templates/centos/centos-7.9-x86_64.json | 14 ++++++++++++++ packer_templates/centos/centos-8.4-x86_64.json | 14 ++++++++++++++ .../centos/centos-stream-8-x86_64.json | 14 ++++++++++++++ .../oraclelinux/oracle-6.10-i386.json | 14 ++++++++++++++ .../oraclelinux/oracle-6.10-x86_64.json | 15 +++++++++++++++ .../oraclelinux/oracle-7.9-x86_64.json | 14 ++++++++++++++ .../rockylinux/rockylinux-8.4-x86_64.json | 14 ++++++++++++++ .../scientificlinux/scientific-7.9-x86_64.json | 14 ++++++++++++++ .../springdalelinux-7.9-x86_64.json | 14 ++++++++++++++ 10 files changed, 141 insertions(+) diff --git a/packer_templates/almalinux/almalinux-8.4-x86_64.json b/packer_templates/almalinux/almalinux-8.4-x86_64.json index c14b55e88..a3432a986 100644 --- a/packer_templates/almalinux/almalinux-8.4-x86_64.json +++ b/packer_templates/almalinux/almalinux-8.4-x86_64.json @@ -63,6 +63,20 @@ "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-parallels", "parallels_tools_flavor": "lin", "prlctl_version_file": ".prlctl_version", + "prlctl": [ + [ + "set", + "{{.Name}}", + "--3d-accelerate", + "off" + ], + [ + "set", + "{{.Name}}", + "--videosize", + "16" + ] + ], "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, diff --git a/packer_templates/centos/centos-7.9-x86_64.json b/packer_templates/centos/centos-7.9-x86_64.json index 6cbe2db1b..7dfdc3476 100644 --- a/packer_templates/centos/centos-7.9-x86_64.json +++ b/packer_templates/centos/centos-7.9-x86_64.json @@ -69,6 +69,20 @@ "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-parallels", "parallels_tools_flavor": "lin", "prlctl_version_file": ".prlctl_version", + "prlctl": [ + [ + "set", + "{{.Name}}", + "--3d-accelerate", + "off" + ], + [ + "set", + "{{.Name}}", + "--videosize", + "16" + ] + ], "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, diff --git a/packer_templates/centos/centos-8.4-x86_64.json b/packer_templates/centos/centos-8.4-x86_64.json index 101c4921b..c4df9dc7c 100644 --- a/packer_templates/centos/centos-8.4-x86_64.json +++ b/packer_templates/centos/centos-8.4-x86_64.json @@ -63,6 +63,20 @@ "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-parallels", "parallels_tools_flavor": "lin", "prlctl_version_file": ".prlctl_version", + "prlctl": [ + [ + "set", + "{{.Name}}", + "--3d-accelerate", + "off" + ], + [ + "set", + "{{.Name}}", + "--videosize", + "16" + ] + ], "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, diff --git a/packer_templates/centos/centos-stream-8-x86_64.json b/packer_templates/centos/centos-stream-8-x86_64.json index fec733ae9..e4c1837f0 100644 --- a/packer_templates/centos/centos-stream-8-x86_64.json +++ b/packer_templates/centos/centos-stream-8-x86_64.json @@ -63,6 +63,20 @@ "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-parallels", "parallels_tools_flavor": "lin", "prlctl_version_file": ".prlctl_version", + "prlctl": [ + [ + "set", + "{{.Name}}", + "--3d-accelerate", + "off" + ], + [ + "set", + "{{.Name}}", + "--videosize", + "16" + ] + ], "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, diff --git a/packer_templates/oraclelinux/oracle-6.10-i386.json b/packer_templates/oraclelinux/oracle-6.10-i386.json index afeb352b7..0f2d2ac93 100644 --- a/packer_templates/oraclelinux/oracle-6.10-i386.json +++ b/packer_templates/oraclelinux/oracle-6.10-i386.json @@ -68,6 +68,20 @@ "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-parallels", "parallels_tools_flavor": "lin", "prlctl_version_file": ".prlctl_version", + "prlctl": [ + [ + "set", + "{{.Name}}", + "--3d-accelerate", + "off" + ], + [ + "set", + "{{.Name}}", + "--videosize", + "16" + ] + ], "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, diff --git a/packer_templates/oraclelinux/oracle-6.10-x86_64.json b/packer_templates/oraclelinux/oracle-6.10-x86_64.json index 52e950d20..2ceb50b30 100644 --- a/packer_templates/oraclelinux/oracle-6.10-x86_64.json +++ b/packer_templates/oraclelinux/oracle-6.10-x86_64.json @@ -43,6 +43,7 @@ "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, + "version": "12", "ssh_timeout": "10000s", "ssh_username": "vagrant", "tools_upload_flavor": "linux", @@ -68,6 +69,20 @@ "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-parallels", "parallels_tools_flavor": "lin", "prlctl_version_file": ".prlctl_version", + "prlctl": [ + [ + "set", + "{{.Name}}", + "--3d-accelerate", + "off" + ], + [ + "set", + "{{.Name}}", + "--videosize", + "16" + ] + ], "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, diff --git a/packer_templates/oraclelinux/oracle-7.9-x86_64.json b/packer_templates/oraclelinux/oracle-7.9-x86_64.json index d59e561ae..528e44c8d 100644 --- a/packer_templates/oraclelinux/oracle-7.9-x86_64.json +++ b/packer_templates/oraclelinux/oracle-7.9-x86_64.json @@ -68,6 +68,20 @@ "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-parallels", "parallels_tools_flavor": "lin", "prlctl_version_file": ".prlctl_version", + "prlctl": [ + [ + "set", + "{{.Name}}", + "--3d-accelerate", + "off" + ], + [ + "set", + "{{.Name}}", + "--videosize", + "16" + ] + ], "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, diff --git a/packer_templates/rockylinux/rockylinux-8.4-x86_64.json b/packer_templates/rockylinux/rockylinux-8.4-x86_64.json index e6fde2462..8ee59c687 100644 --- a/packer_templates/rockylinux/rockylinux-8.4-x86_64.json +++ b/packer_templates/rockylinux/rockylinux-8.4-x86_64.json @@ -63,6 +63,20 @@ "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-parallels", "parallels_tools_flavor": "lin", "prlctl_version_file": ".prlctl_version", + "prlctl": [ + [ + "set", + "{{.Name}}", + "--3d-accelerate", + "off" + ], + [ + "set", + "{{.Name}}", + "--videosize", + "16" + ] + ], "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, diff --git a/packer_templates/scientificlinux/scientific-7.9-x86_64.json b/packer_templates/scientificlinux/scientific-7.9-x86_64.json index 70e1f65c0..184125a57 100644 --- a/packer_templates/scientificlinux/scientific-7.9-x86_64.json +++ b/packer_templates/scientificlinux/scientific-7.9-x86_64.json @@ -69,6 +69,20 @@ "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-parallels", "parallels_tools_flavor": "lin", "prlctl_version_file": ".prlctl_version", + "prlctl": [ + [ + "set", + "{{.Name}}", + "--3d-accelerate", + "off" + ], + [ + "set", + "{{.Name}}", + "--videosize", + "16" + ] + ], "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, diff --git a/packer_templates/springdalelinux/springdalelinux-7.9-x86_64.json b/packer_templates/springdalelinux/springdalelinux-7.9-x86_64.json index 5fccee710..300a6d06b 100644 --- a/packer_templates/springdalelinux/springdalelinux-7.9-x86_64.json +++ b/packer_templates/springdalelinux/springdalelinux-7.9-x86_64.json @@ -63,6 +63,20 @@ "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-parallels", "parallels_tools_flavor": "lin", "prlctl_version_file": ".prlctl_version", + "prlctl": [ + [ + "set", + "{{.Name}}", + "--3d-accelerate", + "off" + ], + [ + "set", + "{{.Name}}", + "--videosize", + "16" + ] + ], "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, From 3c4f1fa6c351cc98d91377d20b46fe37deb58bff Mon Sep 17 00:00:00 2001 From: Jared Kauppila <Jared@Kauppi.la> Date: Wed, 27 Oct 2021 21:10:49 -0500 Subject: [PATCH 1424/1622] Add cookstyle and packer Github Action workflows Signed-off-by: Jared Kauppila <Jared@Kauppi.la> --- .github/workflows/ci.yml | 59 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 59 insertions(+) create mode 100644 .github/workflows/ci.yml diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml new file mode 100644 index 000000000..e0547a36a --- /dev/null +++ b/.github/workflows/ci.yml @@ -0,0 +1,59 @@ +--- + +name: Packer + +on: + push: + +jobs: + windows-build-cookbook-cookstyle: + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v2 + - name: Install Chef + uses: actionshub/chef-install@main + env: + CHEF_LICENSE: accept-no-persist + - name: Run Cookstyle + run: cookstyle packer_templates/windows/cookbooks + + enumerate_templates: + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v2 + - name: enumerate-templates + shell: pwsh + run: "'::set-output name=matrix::{0}' -f $(Get-ChildItem -Path packer_templates -Include *.json -Recurse | Foreach-Object {Join-Path -Path $_.Directory.Name -ChildPath $_.Name} | ConvertTo-Json -Compress)" + id: enumerate-templates + + outputs: + matrix: ${{ steps.enumerate-templates.outputs.matrix }} + + packer-validate: + needs: enumerate_templates + + runs-on: ubuntu-latest + name: packer + + strategy: + matrix: + template: ${{ fromJson(needs.enumerate_templates.outputs.matrix) }} + + steps: + - name: Checkout Repository + uses: actions/checkout@v2 + + - name: Fix Template + uses: hashicorp/packer-github-actions@master + with: + command: fix + target: "packer_templates/${{ matrix.template }}" + + - name: Validate Template + uses: hashicorp/packer-github-actions@master + with: + command: validate + arguments: -syntax-only + target: "packer_templates/${{ matrix.template }}" From 90e613441a80e5b7f6afd0507077dd2d2a85b202 Mon Sep 17 00:00:00 2001 From: Jared Kauppila <Jared@Kauppi.la> Date: Thu, 28 Oct 2021 11:02:00 -0500 Subject: [PATCH 1425/1622] Remove Buildkite tests Signed-off-by: Jared Kauppila <Jared@Kauppi.la> --- .expeditor/config.yml | 15 --------------- .expeditor/verify.pipeline.yml | 21 --------------------- 2 files changed, 36 deletions(-) delete mode 100644 .expeditor/config.yml delete mode 100644 .expeditor/verify.pipeline.yml diff --git a/.expeditor/config.yml b/.expeditor/config.yml deleted file mode 100644 index 60ee8e3b7..000000000 --- a/.expeditor/config.yml +++ /dev/null @@ -1,15 +0,0 @@ -# Documentation available at https://expeditor.chef.io/docs/getting-started/ ---- - -# Slack channel in Chef Software slack to send notifications about build failures, etc -slack: - notify_channel: chef-found-notify - -github: - # This deletes the GitHub PR branch after successfully merged into the release branch - delete_branch_on_merge: true - -pipelines: - - verify: - description: Pull Request validation tests - public: true diff --git a/.expeditor/verify.pipeline.yml b/.expeditor/verify.pipeline.yml deleted file mode 100644 index 6a1790fb2..000000000 --- a/.expeditor/verify.pipeline.yml +++ /dev/null @@ -1,21 +0,0 @@ -steps: - -- label: run-packer-validate - command: - - bundle install - - wget https://releases.hashicorp.com/packer/1.6.6/packer_1.6.6_linux_amd64.zip - - unzip -d /usr/local/bin packer_1.6.6_linux_amd64.zip - - rake validate - expeditor: - executor: - docker: - image: ruby:2.7-buster - -- label: windows-build-cookbook-cookstyle - command: - - bundle install - - bundle exec cookstyle packer_templates/windows/cookbooks - expeditor: - executor: - docker: - image: ruby:2.7-buster From c301a37bcc274d6c9852e13e3b51d35724c34c5e Mon Sep 17 00:00:00 2001 From: Jared Kauppila <Jared@Kauppi.la> Date: Thu, 28 Oct 2021 20:29:50 -0500 Subject: [PATCH 1426/1622] Revert "Remove Buildkite tests" This reverts commit 90e613441a80e5b7f6afd0507077dd2d2a85b202. --- .expeditor/config.yml | 15 +++++++++++++++ .expeditor/verify.pipeline.yml | 21 +++++++++++++++++++++ 2 files changed, 36 insertions(+) create mode 100644 .expeditor/config.yml create mode 100644 .expeditor/verify.pipeline.yml diff --git a/.expeditor/config.yml b/.expeditor/config.yml new file mode 100644 index 000000000..60ee8e3b7 --- /dev/null +++ b/.expeditor/config.yml @@ -0,0 +1,15 @@ +# Documentation available at https://expeditor.chef.io/docs/getting-started/ +--- + +# Slack channel in Chef Software slack to send notifications about build failures, etc +slack: + notify_channel: chef-found-notify + +github: + # This deletes the GitHub PR branch after successfully merged into the release branch + delete_branch_on_merge: true + +pipelines: + - verify: + description: Pull Request validation tests + public: true diff --git a/.expeditor/verify.pipeline.yml b/.expeditor/verify.pipeline.yml new file mode 100644 index 000000000..6a1790fb2 --- /dev/null +++ b/.expeditor/verify.pipeline.yml @@ -0,0 +1,21 @@ +steps: + +- label: run-packer-validate + command: + - bundle install + - wget https://releases.hashicorp.com/packer/1.6.6/packer_1.6.6_linux_amd64.zip + - unzip -d /usr/local/bin packer_1.6.6_linux_amd64.zip + - rake validate + expeditor: + executor: + docker: + image: ruby:2.7-buster + +- label: windows-build-cookbook-cookstyle + command: + - bundle install + - bundle exec cookstyle packer_templates/windows/cookbooks + expeditor: + executor: + docker: + image: ruby:2.7-buster From 685f2d2d9faa5a5f113170281aa17e8023ed5f43 Mon Sep 17 00:00:00 2001 From: Jared Kauppila <Jared@Kauppi.la> Date: Thu, 28 Oct 2021 20:31:09 -0500 Subject: [PATCH 1427/1622] Remove Buildkite pipeline Signed-off-by: Jared Kauppila <Jared@Kauppi.la> --- .expeditor/config.yml | 5 ----- .expeditor/verify.pipeline.yml | 21 --------------------- 2 files changed, 26 deletions(-) delete mode 100644 .expeditor/verify.pipeline.yml diff --git a/.expeditor/config.yml b/.expeditor/config.yml index 60ee8e3b7..0dd1eee90 100644 --- a/.expeditor/config.yml +++ b/.expeditor/config.yml @@ -8,8 +8,3 @@ slack: github: # This deletes the GitHub PR branch after successfully merged into the release branch delete_branch_on_merge: true - -pipelines: - - verify: - description: Pull Request validation tests - public: true diff --git a/.expeditor/verify.pipeline.yml b/.expeditor/verify.pipeline.yml deleted file mode 100644 index 6a1790fb2..000000000 --- a/.expeditor/verify.pipeline.yml +++ /dev/null @@ -1,21 +0,0 @@ -steps: - -- label: run-packer-validate - command: - - bundle install - - wget https://releases.hashicorp.com/packer/1.6.6/packer_1.6.6_linux_amd64.zip - - unzip -d /usr/local/bin packer_1.6.6_linux_amd64.zip - - rake validate - expeditor: - executor: - docker: - image: ruby:2.7-buster - -- label: windows-build-cookbook-cookstyle - command: - - bundle install - - bundle exec cookstyle packer_templates/windows/cookbooks - expeditor: - executor: - docker: - image: ruby:2.7-buster From 9ce00fa2b53fdc1a6b449c799dfa10ef2b961f6d Mon Sep 17 00:00:00 2001 From: Jared Kauppila <Jared@Kauppi.la> Date: Fri, 29 Oct 2021 01:26:32 -0500 Subject: [PATCH 1428/1622] Add workflow for validating iso existance Signed-off-by: Jared Kauppila <Jared@Kauppi.la> --- .github/workflows/ci.yml | 58 +++++++++++++++++++++++++++++++++++----- 1 file changed, 51 insertions(+), 7 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e0547a36a..3cc760d04 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -18,28 +18,29 @@ jobs: - name: Run Cookstyle run: cookstyle packer_templates/windows/cookbooks - enumerate_templates: + enumerate_packer_templates: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 - - name: enumerate-templates + - name: enumerate_packer_templates shell: pwsh run: "'::set-output name=matrix::{0}' -f $(Get-ChildItem -Path packer_templates -Include *.json -Recurse | Foreach-Object {Join-Path -Path $_.Directory.Name -ChildPath $_.Name} | ConvertTo-Json -Compress)" - id: enumerate-templates + id: enumerate_packer_templates outputs: - matrix: ${{ steps.enumerate-templates.outputs.matrix }} + matrix: ${{ steps.enumerate_packer_templates.outputs.matrix }} packer-validate: - needs: enumerate_templates + needs: enumerate_packer_templates runs-on: ubuntu-latest - name: packer + name: packer-validate strategy: + fail-fast: false matrix: - template: ${{ fromJson(needs.enumerate_templates.outputs.matrix) }} + template: ${{ fromJson(needs.enumerate_packer_templates.outputs.matrix) }} steps: - name: Checkout Repository @@ -57,3 +58,46 @@ jobs: command: validate arguments: -syntax-only target: "packer_templates/${{ matrix.template }}" + + enumerate_iso_validation: + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v2 + - name: enumerate_iso_validation + env: + EXCLUDE: 'amazon-2*,rhel*,sles*,solaris*' + shell: pwsh + run: "'::set-output name=matrix::{0}' -f $(Get-ChildItem -Path packer_templates -Include *.json -Exclude ${{ env.EXCLUDE }} -Recurse | Foreach-Object {Join-Path -Path $_.Directory.Name -ChildPath $_.Name} | ConvertTo-Json -Compress)" + id: enumerate_iso_validation + + outputs: + matrix: ${{ steps.enumerate_iso_validation.outputs.matrix }} + + iso-availability: + needs: enumerate_iso_validation + + runs-on: ubuntu-latest + name: iso-validate + + strategy: + fail-fast: false + matrix: + template: ${{ fromJson(needs.enumerate_iso_validation.outputs.matrix) }} + + steps: + - name: Checkout Repository + uses: actions/checkout@v2 + - name: iso-availability + shell: pwsh + run: | + $(Get-Content "packer_templates/${{ matrix.template }}" | ConvertFrom-Json ) | + Foreach-Object { + if($_.variables.iso_url){ + $_.variables.iso_url + }else{ + '{0}/{1}/{2}' -f $_.variables.mirror,$_.variables.mirror_directory,$_.variables.iso_name + } + } | Foreach-Object { + Invoke-RestMethod -Uri $_ -Method Head -Verbose + } From aa141ffa47c843acbfe9e76bb20bd7aeb2274527 Mon Sep 17 00:00:00 2001 From: Lance Albertson <lance@osuosl.org> Date: Sat, 30 Oct 2021 17:55:22 -0700 Subject: [PATCH 1429/1622] Set crypto-policy to legacy on Fedora 34 Without this, vagrant cannot log into this boxes without some work as the default rsa key is rejected. Signed-off-by: Lance Albertson <lance@osuosl.org> --- packer_templates/fedora/fedora-34-x86_64.json | 1 + 1 file changed, 1 insertion(+) diff --git a/packer_templates/fedora/fedora-34-x86_64.json b/packer_templates/fedora/fedora-34-x86_64.json index 4a473b7e3..b7a9bb1bb 100644 --- a/packer_templates/fedora/fedora-34-x86_64.json +++ b/packer_templates/fedora/fedora-34-x86_64.json @@ -155,6 +155,7 @@ "{{template_dir}}/../_common/vagrant.sh", "{{template_dir}}/scripts/real-tmp.sh", "{{template_dir}}/scripts/cleanup.sh", + "{{template_dir}}/scripts/crypto-policy.sh", "{{template_dir}}/../_common/minimize.sh" ], "type": "shell" From cb148b28e8d5ad203de55b977a87b55366923b2a Mon Sep 17 00:00:00 2001 From: Claude Becker <becker@phys.ethz.ch> Date: Mon, 15 Nov 2021 15:48:22 +0100 Subject: [PATCH 1430/1622] Add Debian arm64 templates for Parallels Signed-off-by: Claude Becker <becker@phys.ethz.ch> --- .../debian/debian-10.11-arm64.json | 102 ++++++++++++++++++ .../debian/debian-11.1-arm64.json | 102 ++++++++++++++++++ .../debian/debian-9.13-arm64.json | 102 ++++++++++++++++++ 3 files changed, 306 insertions(+) create mode 100644 packer_templates/debian/debian-10.11-arm64.json create mode 100644 packer_templates/debian/debian-11.1-arm64.json create mode 100644 packer_templates/debian/debian-9.13-arm64.json diff --git a/packer_templates/debian/debian-10.11-arm64.json b/packer_templates/debian/debian-10.11-arm64.json new file mode 100644 index 000000000..00e6443aa --- /dev/null +++ b/packer_templates/debian/debian-10.11-arm64.json @@ -0,0 +1,102 @@ +{ + "builders": [ + { + "boot_command": [ + "e<wait>", + "<down><down><down><right><right><right><right><right><right><right><right><right><right>", + "<right><right><right><right><right><right><right><right><right><right><right><right><right>", + "<right><right><right><right><right><right><right><right><right><right><right><wait>", + "install <wait>", + " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}} <wait>", + "debian-installer=en_US.UTF-8 <wait>", + "auto <wait>", + "locale=en_US.UTF-8 <wait>", + "kbd-chooser/method=us <wait>", + "keyboard-configuration/xkb-keymap=us <wait>", + "netcfg/get_hostname={{ .Name }} <wait>", + "netcfg/get_domain=vagrantup.com <wait>", + "fb=false <wait>", + "debconf/frontend=noninteractive <wait>", + "console-setup/ask_detect=false <wait>", + "console-keymaps-at/keymap=us <wait>", + "grub-installer/bootdev=/dev/sda <wait>", + "<f10><wait>" + ], + "boot_wait": "5s", + "cpus": "{{ user `cpus` }}", + "disk_size": "{{user `disk_size`}}", + "guest_os_type": "debian", + "http_directory": "{{user `http_directory`}}", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "memory": "{{ user `memory` }}", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-parallels", + "parallels_tools_flavor": "lin-arm", + "prlctl_version_file": ".prlctl_version", + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_timeout": "10000s", + "ssh_username": "vagrant", + "type": "parallels-iso", + "vm_name": "{{ user `template` }}" + } + ], + "post-processors": [ + { + "output": "{{ user `build_directory` }}/{{user `box_basename`}}.{{.Provider}}.box", + "type": "vagrant" + } + ], + "provisioners": [ + { + "environment_vars": [ + "HOME_DIR=/home/vagrant", + "http_proxy={{user `http_proxy`}}", + "https_proxy={{user `https_proxy`}}", + "no_proxy={{user `no_proxy`}}" + ], + "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", + "expect_disconnect": true, + "scripts": [ + "{{template_dir}}/scripts/update.sh", + "{{template_dir}}/../_common/motd.sh", + "{{template_dir}}/../_common/sshd.sh", + "{{template_dir}}/scripts/networking.sh", + "{{template_dir}}/scripts/sudoers.sh", + "{{template_dir}}/../_common/vagrant.sh", + "{{template_dir}}/scripts/systemd.sh", + "{{template_dir}}/../_common/virtualbox.sh", + "{{template_dir}}/../ubuntu/scripts/vmware.sh", + "{{template_dir}}/../_common/parallels.sh", + "{{template_dir}}/scripts/cleanup.sh", + "{{template_dir}}/../_common/minimize.sh" + ], + "type": "shell" + } + ], + "variables": { + "box_basename": "debian-10.11", + "build_directory": "../../builds", + "build_timestamp": "{{isotime \"20060102150405\"}}", + "cpus": "2", + "disk_size": "65536", + "git_revision": "__unknown_git_revision__", + "guest_additions_url": "", + "headless": "", + "http_directory": "{{template_dir}}/http", + "http_proxy": "{{env `http_proxy`}}", + "https_proxy": "{{env `https_proxy`}}", + "iso_checksum": "cdb53762803a5b71590f2fdfe44eb1c8351d28d1e2753cfc1b3f0bd654cc99e1", + "iso_name": "debian-10.11.0-arm64-netinst.iso", + "memory": "1024", + "mirror": "http://cdimage.debian.org/cdimage/archive", + "mirror_directory": "10.11.0/arm64/iso-cd", + "name": "debian-10.11", + "no_proxy": "{{env `no_proxy`}}", + "preseed_path": "debian-9/preseed.cfg", + "qemu_display": "none", + "template": "debian-10.11-arm64", + "version": "TIMESTAMP" + } +} diff --git a/packer_templates/debian/debian-11.1-arm64.json b/packer_templates/debian/debian-11.1-arm64.json new file mode 100644 index 000000000..020e4dfce --- /dev/null +++ b/packer_templates/debian/debian-11.1-arm64.json @@ -0,0 +1,102 @@ +{ + "builders": [ + { + "boot_command": [ + "e<wait>", + "<down><down><down><right><right><right><right><right><right><right><right><right><right>", + "<right><right><right><right><right><right><right><right><right><right><right><right><right>", + "<right><right><right><right><right><right><right><right><right><right><right><wait>", + "install <wait>", + " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}} <wait>", + "debian-installer=en_US.UTF-8 <wait>", + "auto <wait>", + "locale=en_US.UTF-8 <wait>", + "kbd-chooser/method=us <wait>", + "keyboard-configuration/xkb-keymap=us <wait>", + "netcfg/get_hostname={{ .Name }} <wait>", + "netcfg/get_domain=vagrantup.com <wait>", + "fb=false <wait>", + "debconf/frontend=noninteractive <wait>", + "console-setup/ask_detect=false <wait>", + "console-keymaps-at/keymap=us <wait>", + "grub-installer/bootdev=/dev/sda <wait>", + "<f10><wait>" + ], + "boot_wait": "5s", + "cpus": "{{ user `cpus` }}", + "disk_size": "{{user `disk_size`}}", + "guest_os_type": "debian", + "http_directory": "{{user `http_directory`}}", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "memory": "{{ user `memory` }}", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-parallels", + "parallels_tools_flavor": "lin-arm", + "prlctl_version_file": ".prlctl_version", + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_timeout": "10000s", + "ssh_username": "vagrant", + "type": "parallels-iso", + "vm_name": "{{ user `template` }}" + } + ], + "post-processors": [ + { + "output": "{{ user `build_directory` }}/{{user `box_basename`}}.{{.Provider}}.box", + "type": "vagrant" + } + ], + "provisioners": [ + { + "environment_vars": [ + "HOME_DIR=/home/vagrant", + "http_proxy={{user `http_proxy`}}", + "https_proxy={{user `https_proxy`}}", + "no_proxy={{user `no_proxy`}}" + ], + "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", + "expect_disconnect": true, + "scripts": [ + "{{template_dir}}/scripts/update.sh", + "{{template_dir}}/../_common/motd.sh", + "{{template_dir}}/../_common/sshd.sh", + "{{template_dir}}/scripts/networking.sh", + "{{template_dir}}/scripts/sudoers.sh", + "{{template_dir}}/../_common/vagrant.sh", + "{{template_dir}}/scripts/systemd.sh", + "{{template_dir}}/../_common/virtualbox.sh", + "{{template_dir}}/../ubuntu/scripts/vmware.sh", + "{{template_dir}}/../_common/parallels.sh", + "{{template_dir}}/scripts/cleanup.sh", + "{{template_dir}}/../_common/minimize.sh" + ], + "type": "shell" + } + ], + "variables": { + "box_basename": "debian-11.1", + "build_directory": "../../builds", + "build_timestamp": "{{isotime \"20060102150405\"}}", + "cpus": "2", + "disk_size": "65536", + "git_revision": "__unknown_git_revision__", + "guest_additions_url": "", + "headless": "", + "http_directory": "{{template_dir}}/http", + "http_proxy": "{{env `http_proxy`}}", + "https_proxy": "{{env `https_proxy`}}", + "iso_checksum": "5572d9d08fd05c857beaf13129481e088e8233bc39c869cb9f3b4ef0132602a3", + "iso_name": "debian-11.1.0-arm64-netinst.iso", + "memory": "1024", + "mirror": "http://cdimage.debian.org/cdimage/release", + "mirror_directory": "11.1.0/arm64/iso-cd", + "name": "debian-11.1", + "no_proxy": "{{env `no_proxy`}}", + "preseed_path": "debian-9/preseed.cfg", + "qemu_display": "none", + "template": "debian-11.1-arm64", + "version": "TIMESTAMP" + } +} diff --git a/packer_templates/debian/debian-9.13-arm64.json b/packer_templates/debian/debian-9.13-arm64.json new file mode 100644 index 000000000..af98cc82f --- /dev/null +++ b/packer_templates/debian/debian-9.13-arm64.json @@ -0,0 +1,102 @@ +{ + "builders": [ + { + "boot_command": [ + "e<wait>", + "<down><down><down><right><right><right><right><right><right><right><right><right><right>", + "<right><right><right><right><right><right><right><right><right><right><right><right><right>", + "<right><right><right><right><right><right><right><right><right><right><right><wait>", + "install <wait>", + " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}} <wait>", + "debian-installer=en_US.UTF-8 <wait>", + "auto <wait>", + "locale=en_US.UTF-8 <wait>", + "kbd-chooser/method=us <wait>", + "keyboard-configuration/xkb-keymap=us <wait>", + "netcfg/get_hostname={{ .Name }} <wait>", + "netcfg/get_domain=vagrantup.com <wait>", + "fb=false <wait>", + "debconf/frontend=noninteractive <wait>", + "console-setup/ask_detect=false <wait>", + "console-keymaps-at/keymap=us <wait>", + "grub-installer/bootdev=/dev/sda <wait>", + "<f10><wait>" + ], + "boot_wait": "5s", + "cpus": "{{ user `cpus` }}", + "disk_size": "{{user `disk_size`}}", + "guest_os_type": "debian", + "http_directory": "{{user `http_directory`}}", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "memory": "{{ user `memory` }}", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-parallels", + "parallels_tools_flavor": "lin-arm", + "prlctl_version_file": ".prlctl_version", + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_timeout": "10000s", + "ssh_username": "vagrant", + "type": "parallels-iso", + "vm_name": "{{ user `template` }}" + } + ], + "post-processors": [ + { + "output": "{{ user `build_directory` }}/{{user `box_basename`}}.{{.Provider}}.box", + "type": "vagrant" + } + ], + "provisioners": [ + { + "environment_vars": [ + "HOME_DIR=/home/vagrant", + "http_proxy={{user `http_proxy`}}", + "https_proxy={{user `https_proxy`}}", + "no_proxy={{user `no_proxy`}}" + ], + "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", + "expect_disconnect": true, + "scripts": [ + "{{template_dir}}/scripts/update.sh", + "{{template_dir}}/../_common/motd.sh", + "{{template_dir}}/../_common/sshd.sh", + "{{template_dir}}/scripts/networking.sh", + "{{template_dir}}/scripts/sudoers.sh", + "{{template_dir}}/../_common/vagrant.sh", + "{{template_dir}}/scripts/systemd.sh", + "{{template_dir}}/../_common/virtualbox.sh", + "{{template_dir}}/../ubuntu/scripts/vmware.sh", + "{{template_dir}}/../_common/parallels.sh", + "{{template_dir}}/scripts/cleanup.sh", + "{{template_dir}}/../_common/minimize.sh" + ], + "type": "shell" + } + ], + "variables": { + "box_basename": "debian-9.13", + "build_directory": "../../builds", + "build_timestamp": "{{isotime \"20060102150405\"}}", + "cpus": "2", + "disk_size": "65536", + "git_revision": "__unknown_git_revision__", + "guest_additions_url": "", + "headless": "", + "http_directory": "{{template_dir}}/http", + "http_proxy": "{{env `http_proxy`}}", + "https_proxy": "{{env `https_proxy`}}", + "iso_checksum": "ea321c9de60a6fe9dfaf438b8e16f1945d6d2239e9f0d3cfe6872d4280eba10c", + "iso_name": "debian-9.13.0-arm64-netinst.iso", + "memory": "1024", + "mirror": "http://cdimage.debian.org/cdimage/archive", + "mirror_directory": "9.13.0/arm64/iso-cd", + "name": "debian-9.13", + "no_proxy": "{{env `no_proxy`}}", + "preseed_path": "debian-9/preseed.cfg", + "qemu_display": "none", + "template": "debian-9.13-arm64", + "version": "TIMESTAMP" + } +} From 3afc2f9b975aacf2b2ca39fba673273265290d62 Mon Sep 17 00:00:00 2001 From: Imran Iqbal <iqbalmy@hotmail.com> Date: Tue, 14 Dec 2021 10:26:31 +0000 Subject: [PATCH 1431/1622] feat(freebsd): add FreeBSD 12.3 Signed-off-by: Imran Iqbal <iqbalmy@hotmail.com> --- builds.yml | 1 + .../freebsd/freebsd-12.3-amd64.json | 211 ++++++++++++++++++ 2 files changed, 212 insertions(+) create mode 100644 packer_templates/freebsd/freebsd-12.3-amd64.json diff --git a/builds.yml b/builds.yml index 0bdaf69fa..09a723da4 100644 --- a/builds.yml +++ b/builds.yml @@ -17,6 +17,7 @@ public: - 'freebsd-11.4' - 'freebsd-12.2-i386' - 'freebsd-12.2' +- 'freebsd-12.3' - 'freebsd-13.0' - 'opensuse-leap-15.3' - 'oracle-6.10-i386' diff --git a/packer_templates/freebsd/freebsd-12.3-amd64.json b/packer_templates/freebsd/freebsd-12.3-amd64.json new file mode 100644 index 000000000..9248eadf5 --- /dev/null +++ b/packer_templates/freebsd/freebsd-12.3-amd64.json @@ -0,0 +1,211 @@ +{ + "builders": [ + { + "boot_command": [ + "<esc><wait>", + "boot -s<wait>", + "<enter><wait>", + "<wait10><wait10>", + "/bin/sh<enter><wait>", + "mdmfs -s 100m md1 /tmp<enter><wait>", + "mdmfs -s 100m md2 /mnt<enter><wait>", + "dhclient -p /tmp/dhclient.em0.pid -l /tmp/dhclient.lease.em0 em0<enter><wait>", + "fetch -o /tmp/installerconfig http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} \u0026\u0026 bsdinstall script /tmp/installerconfig<enter><wait>" + ], + "boot_wait": "5s", + "cpus": "{{ user `cpus` }}", + "disk_size": "{{user `disk_size`}}", + "guest_additions_mode": "disable", + "guest_os_type": "FreeBSD_64", + "headless": "{{ user `headless` }}", + "http_directory": "{{user `http_directory`}}", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "memory": "{{ user `memory` }}", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-virtualbox", + "shutdown_command": "echo 'vagrant' | su -m root -c 'shutdown -p now'", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_timeout": "10000s", + "ssh_username": "vagrant", + "type": "virtualbox-iso", + "virtualbox_version_file": ".vbox_version", + "vm_name": "{{ user `template` }}" + }, + { + "boot_command": [ + "<esc><wait>", + "boot -s<wait>", + "<enter><wait>", + "<wait10><wait10>", + "/bin/sh<enter><wait>", + "mdmfs -s 100m md1 /tmp<enter><wait>", + "mdmfs -s 100m md2 /mnt<enter><wait>", + "dhclient -p /tmp/dhclient.em0.pid -l /tmp/dhclient.lease.em0 em0<enter><wait>", + "<wait5>", + "fetch -o /tmp/installerconfig http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} \u0026\u0026 bsdinstall script /tmp/installerconfig<enter><wait>" + ], + "boot_wait": "5s", + "cpus": "{{ user `cpus` }}", + "disk_size": "{{user `disk_size`}}", + "guest_os_type": "freebsd-64", + "headless": "{{ user `headless` }}", + "http_directory": "{{user `http_directory`}}", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "memory": "{{ user `memory` }}", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-vmware", + "shutdown_command": "echo 'vagrant' | su -m root -c 'shutdown -p now'", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_timeout": "10000s", + "ssh_username": "vagrant", + "type": "vmware-iso", + "vm_name": "{{ user `template` }}", + "vmx_data": { + "cpuid.coresPerSocket": "1" + }, + "vmx_remove_ethernet_interfaces": true + }, + { + "boot_command": [ + "<esc><wait>", + "boot -s<wait>", + "<enter><wait>", + "<wait10><wait10>", + "/bin/sh<enter><wait>", + "mdmfs -s 100m md1 /tmp<enter><wait>", + "mdmfs -s 100m md2 /mnt<enter><wait>", + "dhclient -p /tmp/dhclient.em0.pid -l /tmp/dhclient.lease.em0 em0<enter><wait>", + "fetch -o /tmp/installerconfig http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} \u0026\u0026 bsdinstall script /tmp/installerconfig<enter><wait>" + ], + "boot_wait": "8s", + "cpus": "{{ user `cpus` }}", + "disk_size": "{{user `disk_size`}}", + "guest_os_type": "freebsd", + "http_directory": "{{user `http_directory`}}", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "memory": "{{ user `memory` }}", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-parallels", + "parallels_tools_mode": "disable", + "prlctl": [ + [ + "set", + "{{.Name}}", + "--device-set", + "cdrom0", + "--iface", + "ide" + ], + [ + "set", + "{{.Name}}", + "--device-del", + "fdd0" + ], + [ + "set", + "{{.Name}}", + "--device-del", + "parallel0" + ] + ], + "prlctl_version_file": ".prlctl_version", + "shutdown_command": "echo 'vagrant' | su -m root -c 'shutdown -p now'", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_timeout": "10000s", + "ssh_username": "vagrant", + "type": "parallels-iso", + "vm_name": "{{ user `template` }}" + }, + { + "boot_command": [ + "<esc><wait>", + "boot -s<wait>", + "<enter><wait>", + "<wait10><wait10>", + "/bin/sh<enter><wait>", + "mdmfs -s 100m md1 /tmp<enter><wait>", + "mdmfs -s 100m md2 /mnt<enter><wait>", + "dhclient -p /tmp/dhclient.vtnet0.pid -l /tmp/dhclient.lease.vtnet0 vtnet0<enter><wait>", + "fetch -o /tmp/installerconfig http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} \u0026\u0026 bsdinstall script /tmp/installerconfig<enter><wait>" + ], + "boot_wait": "7s", + "cpus": "{{ user `cpus` }}", + "disk_size": "{{user `disk_size`}}", + "headless": "{{ user `headless` }}", + "http_directory": "{{user `http_directory`}}", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "memory": "{{ user `memory` }}", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-qemu", + "shutdown_command": "echo 'vagrant' | su -m root -c 'shutdown -p now'", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_timeout": "10000s", + "ssh_username": "vagrant", + "type": "qemu", + "vm_name": "{{ user `template` }}", + "qemuargs": [ + [ "-m", "{{ user `memory` }}" ], + [ "-display", "{{ user `qemu_display` }}" ] + ] + } + ], + "post-processors": [ + { + "output": "{{ user `build_directory` }}/{{user `box_basename`}}.{{.Provider}}.box", + "type": "vagrant", + "vagrantfile_template": "{{template_dir}}/vagrantfile_templates/freebsd.rb" + } + ], + "provisioners": [ + { + "environment_vars": [ + "HOME_DIR=/home/vagrant", + "http_proxy={{user `http_proxy`}}", + "https_proxy={{user `https_proxy`}}", + "no_proxy={{user `no_proxy`}}", + "pkg_branch={{user `pkg_branch`}}" + ], + "execute_command": "echo 'vagrant' | {{.Vars}} su -m root -c 'sh -eux {{.Path}}'", + "expect_disconnect": true, + "scripts": [ + "{{template_dir}}/scripts/update.sh", + "{{template_dir}}/scripts/postinstall.sh", + "{{template_dir}}/scripts/sudoers.sh", + "{{template_dir}}/../_common/vagrant.sh", + "{{template_dir}}/scripts/vmtools.sh", + "{{template_dir}}/scripts/cleanup.sh", + "{{template_dir}}/scripts/minimize.sh" + ], + "type": "shell" + } + ], + "variables": { + "box_basename": "freebsd-12.3", + "build_directory": "../../builds", + "build_timestamp": "{{isotime \"20060102150405\"}}", + "cpus": "2", + "disk_size": "65536", + "git_revision": "__unknown_git_revision__", + "headless": "", + "http_directory": "{{template_dir}}/http", + "http_proxy": "{{env `http_proxy`}}", + "https_proxy": "{{env `https_proxy`}}", + "install_path": "freebsd-11/installerconfig", + "iso_checksum": "5f0c10ff9af582c7fca90f65868702aa02e80f344c186f0bc75639a687d65641", + "iso_name": "FreeBSD-12.3-RELEASE-amd64-disc1.iso", + "memory": "1024", + "mirror": "https://download.freebsd.org/ftp", + "mirror_directory": "releases/amd64/amd64/ISO-IMAGES/12.3", + "name": "freebsd-12.3", + "no_proxy": "{{env `no_proxy`}}", + "pkg_branch": "quarterly", + "qemu_display": "none", + "template": "freebsd-12.3-amd64", + "version": "TIMESTAMP" + } +} From e062ef947d4bd66069dfbefae6cfcfd0800e908c Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Sat, 18 Dec 2021 20:09:11 -0800 Subject: [PATCH 1432/1622] Update CentOS from 8.4 to 8.5 Signed-off-by: Tim Smith <tsmith@chef.io> --- builds.yml | 2 +- ...centos-8.4-x86_64.json => centos-8.5-x86_64.json} | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) rename packer_templates/centos/{centos-8.4-x86_64.json => centos-8.5-x86_64.json} (96%) diff --git a/builds.yml b/builds.yml index 09a723da4..f20973fad 100644 --- a/builds.yml +++ b/builds.yml @@ -3,7 +3,7 @@ public: - 'almalinux-8.4' - 'amazon-2' - 'centos-7.9' -- 'centos-8.4' +- 'centos-8.5' - 'centos-stream-8' - 'debian-9.13-i386' - 'debian-9.13' diff --git a/packer_templates/centos/centos-8.4-x86_64.json b/packer_templates/centos/centos-8.5-x86_64.json similarity index 96% rename from packer_templates/centos/centos-8.4-x86_64.json rename to packer_templates/centos/centos-8.5-x86_64.json index c4df9dc7c..c893782aa 100644 --- a/packer_templates/centos/centos-8.4-x86_64.json +++ b/packer_templates/centos/centos-8.5-x86_64.json @@ -167,7 +167,7 @@ } ], "variables": { - "box_basename": "centos-8.4", + "box_basename": "centos-8.5", "build_directory": "../../builds", "build_timestamp": "{{isotime \"2019102650405\"}}", "cpus": "2", @@ -180,16 +180,16 @@ "https_proxy": "{{env `https_proxy`}}", "hyperv_generation": "1", "hyperv_switch": "bento", - "iso_checksum": "0394ecfa994db75efc1413207d2e5ac67af4f6685b3b896e2837c682221fd6b2", - "iso_name": "CentOS-8.4.2105-x86_64-dvd1.iso", + "iso_checksum": "3b795863001461d4f670b0dedd02d25296b6d64683faceb8f2b60c53ac5ebb3e", + "iso_name": "CentOS-8.5.2111-x86_64-dvd1.iso", "ks_path": "8/ks.cfg", "memory": "1024", "mirror": "http://mirrors.kernel.org/centos", - "mirror_directory": "8.4.2105/isos/x86_64", - "name": "centos-8.4", + "mirror_directory": "8.5.2111/isos/x86_64", + "name": "centos-8.5", "no_proxy": "{{env `no_proxy`}}", "qemu_display": "none", - "template": "centos-8.4-x86_64", + "template": "centos-8.5-x86_64", "boot_command": "<up><wait><tab> inst.text inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>", "version": "TIMESTAMP" } From c80f6ed78bbb29cc183613fe8d4392cf432a5f6a Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Sat, 18 Dec 2021 20:12:13 -0800 Subject: [PATCH 1433/1622] Update Debian 11.1 to 11.2 Signed-off-by: Tim Smith <tsmith@chef.io> --- README.md | 4 ++-- builds.yml | 4 ++-- ...debian-11.1-amd64.json => debian-11.2-amd64.json} | 12 ++++++------ ...debian-11.1-arm64.json => debian-11.2-arm64.json} | 12 ++++++------ .../{debian-11.1-i386.json => debian-11.2-i386.json} | 12 ++++++------ 5 files changed, 22 insertions(+), 22 deletions(-) rename packer_templates/debian/{debian-11.1-amd64.json => debian-11.2-amd64.json} (96%) rename packer_templates/debian/{debian-11.1-arm64.json => debian-11.2-arm64.json} (92%) rename packer_templates/debian/{debian-11.1-i386.json => debian-11.2-i386.json} (96%) diff --git a/README.md b/README.md index 0df22cc45..bf0271f64 100644 --- a/README.md +++ b/README.md @@ -45,11 +45,11 @@ $ cd packer_templates/ubuntu $ packer build -only=virtualbox-iso ubuntu-18.04-amd64.json ``` -To build Debian 11.1 32bit boxes for all possible providers (simultaneously) +To build Debian 11.2 32bit boxes for all possible providers (simultaneously) ``` $ cd packer_templates/debian -$ packer build debian-11.1-i386.json +$ packer build debian-11.2-i386.json ``` To build CentOS 7.7 boxes for all providers except VMware and Parallels diff --git a/builds.yml b/builds.yml index f20973fad..944743583 100644 --- a/builds.yml +++ b/builds.yml @@ -9,8 +9,8 @@ public: - 'debian-9.13' - 'debian-10.10-i386' - 'debian-10.10' -- 'debian-11.1-i386' -- 'debian-11.1' +- 'debian-11.2-i386' +- 'debian-11.2' - 'fedora-33' - 'fedora-34' - 'freebsd-11.4-i386' diff --git a/packer_templates/debian/debian-11.1-amd64.json b/packer_templates/debian/debian-11.2-amd64.json similarity index 96% rename from packer_templates/debian/debian-11.1-amd64.json rename to packer_templates/debian/debian-11.2-amd64.json index 6469da300..1230fa8a4 100644 --- a/packer_templates/debian/debian-11.1-amd64.json +++ b/packer_templates/debian/debian-11.2-amd64.json @@ -197,7 +197,7 @@ } ], "variables": { - "box_basename": "debian-11.1", + "box_basename": "debian-11.2", "build_directory": "../../builds", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "2", @@ -208,16 +208,16 @@ "http_directory": "{{template_dir}}/http", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", - "iso_checksum": "8488abc1361590ee7a3c9b00ec059b29dfb1da40f8ba4adf293c7a30fa943eb2", - "iso_name": "debian-11.1.0-amd64-netinst.iso", + "iso_checksum": "45c9feabba213bdc6d72e7469de71ea5aeff73faea6bfb109ab5bad37c3b43bd", + "iso_name": "debian-11.2.0-amd64-netinst.iso", "memory": "1024", "mirror": "http://cdimage.debian.org/cdimage/release", - "mirror_directory": "11.1.0/amd64/iso-cd", - "name": "debian-11.1", + "mirror_directory": "11.2.0/amd64/iso-cd", + "name": "debian-11.2", "no_proxy": "{{env `no_proxy`}}", "preseed_path": "debian-9/preseed.cfg", "qemu_display": "none", - "template": "debian-11.1-amd64", + "template": "debian-11.2-amd64", "version": "TIMESTAMP" } } diff --git a/packer_templates/debian/debian-11.1-arm64.json b/packer_templates/debian/debian-11.2-arm64.json similarity index 92% rename from packer_templates/debian/debian-11.1-arm64.json rename to packer_templates/debian/debian-11.2-arm64.json index 020e4dfce..a59bb40fc 100644 --- a/packer_templates/debian/debian-11.1-arm64.json +++ b/packer_templates/debian/debian-11.2-arm64.json @@ -76,7 +76,7 @@ } ], "variables": { - "box_basename": "debian-11.1", + "box_basename": "debian-11.2", "build_directory": "../../builds", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "2", @@ -87,16 +87,16 @@ "http_directory": "{{template_dir}}/http", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", - "iso_checksum": "5572d9d08fd05c857beaf13129481e088e8233bc39c869cb9f3b4ef0132602a3", - "iso_name": "debian-11.1.0-arm64-netinst.iso", + "iso_checksum": "6dd3f42f84597ba87d3b71d50d69dca2a3b4138cbd7b007cea3d4ba81cc51493", + "iso_name": "debian-11.2.0-arm64-netinst.iso", "memory": "1024", "mirror": "http://cdimage.debian.org/cdimage/release", - "mirror_directory": "11.1.0/arm64/iso-cd", - "name": "debian-11.1", + "mirror_directory": "11.2.0/arm64/iso-cd", + "name": "debian-11.2", "no_proxy": "{{env `no_proxy`}}", "preseed_path": "debian-9/preseed.cfg", "qemu_display": "none", - "template": "debian-11.1-arm64", + "template": "debian-11.2-arm64", "version": "TIMESTAMP" } } diff --git a/packer_templates/debian/debian-11.1-i386.json b/packer_templates/debian/debian-11.2-i386.json similarity index 96% rename from packer_templates/debian/debian-11.1-i386.json rename to packer_templates/debian/debian-11.2-i386.json index c7166ca74..125d6abd8 100644 --- a/packer_templates/debian/debian-11.1-i386.json +++ b/packer_templates/debian/debian-11.2-i386.json @@ -197,7 +197,7 @@ } ], "variables": { - "box_basename": "debian-11.1-i386", + "box_basename": "debian-11.2-i386", "build_directory": "../../builds", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "2", @@ -208,16 +208,16 @@ "http_directory": "{{template_dir}}/http", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", - "iso_checksum": "c08215e95f510905f132de558291487f4a8cdddde2a73632e93e889b78063f06", - "iso_name": "debian-11.1.0-i386-netinst.iso", + "iso_checksum": "14f7758c2ee5d33b751d0dd7d00c77c6482f9b3be59ea39da9338aa07a062972", + "iso_name": "debian-11.2.0-i386-netinst.iso", "memory": "1024", "mirror": "http://cdimage.debian.org/cdimage/release", - "mirror_directory": "11.1.0/i386/iso-cd", - "name": "debian-11.1-i386", + "mirror_directory": "11.2.0/i386/iso-cd", + "name": "debian-11.2-i386", "no_proxy": "{{env `no_proxy`}}", "preseed_path": "debian-9/preseed.cfg", "qemu_display": "none", - "template": "debian-11.1-i386", + "template": "debian-11.2-i386", "version": "TIMESTAMP" } } From 0aa624d4747da1fe8b1955ca256dca2b3b7d236d Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Sat, 18 Dec 2021 20:13:07 -0800 Subject: [PATCH 1434/1622] Remove hardenedbsd configs we never maintained These have bit rot bigtime Signed-off-by: Tim Smith <tsmith@chef.io> --- .../hardenedbsd/hardenedbsd-11-amd64.json | 208 ------------------ .../http/hardenedbsd-11/installerconfig | 52 ----- .../hardenedbsd/scripts/cleanup.sh | 11 - .../hardenedbsd/scripts/minimize.sh | 33 --- .../hardenedbsd/scripts/postinstall.sh | 24 -- .../hardenedbsd/scripts/sudoers.sh | 4 - .../hardenedbsd/scripts/update.sh | 15 -- .../vagrantfile_templates/hardenedbsd.rb | 15 -- 8 files changed, 362 deletions(-) delete mode 100644 packer_templates/hardenedbsd/hardenedbsd-11-amd64.json delete mode 100644 packer_templates/hardenedbsd/http/hardenedbsd-11/installerconfig delete mode 100644 packer_templates/hardenedbsd/scripts/cleanup.sh delete mode 100644 packer_templates/hardenedbsd/scripts/minimize.sh delete mode 100644 packer_templates/hardenedbsd/scripts/postinstall.sh delete mode 100644 packer_templates/hardenedbsd/scripts/sudoers.sh delete mode 100644 packer_templates/hardenedbsd/scripts/update.sh delete mode 100644 packer_templates/hardenedbsd/vagrantfile_templates/hardenedbsd.rb diff --git a/packer_templates/hardenedbsd/hardenedbsd-11-amd64.json b/packer_templates/hardenedbsd/hardenedbsd-11-amd64.json deleted file mode 100644 index 9574bd091..000000000 --- a/packer_templates/hardenedbsd/hardenedbsd-11-amd64.json +++ /dev/null @@ -1,208 +0,0 @@ -{ - "builders": [ - { - "boot_command": [ - "<esc><wait>", - "boot -s<wait>", - "<enter><wait>", - "<wait10><wait10>", - "/bin/sh<enter><wait>", - "mdmfs -s 100m md1 /tmp<enter><wait>", - "mdmfs -s 100m md2 /mnt<enter><wait>", - "dhclient -l /tmp/dhclient.lease.em0 em0<enter><wait10>", - "fetch -o /tmp/installerconfig http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} \u0026\u0026 bsdinstall script /tmp/installerconfig<enter><wait>" - ], - "boot_wait": "5s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "guest_additions_mode": "disable", - "guest_os_type": "FreeBSD_64", - "headless": "{{ user `headless` }}", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-virtualbox", - "shutdown_command": "echo 'vagrant' | su -m root -c 'shutdown -p now'", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "type": "virtualbox-iso", - "virtualbox_version_file": ".vbox_version", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<esc><wait>", - "boot -s<wait>", - "<enter><wait>", - "<wait10><wait10>", - "/bin/sh<enter><wait>", - "mdmfs -s 100m md1 /tmp<enter><wait>", - "mdmfs -s 100m md2 /mnt<enter><wait>", - "dhclient -l /tmp/dhclient.lease.em0 em0<enter><wait>", - "<wait5>", - "fetch -o /tmp/installerconfig http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} \u0026\u0026 bsdinstall script /tmp/installerconfig<enter><wait>" - ], - "boot_wait": "5s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "freebsd-64", - "headless": "{{ user `headless` }}", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-vmware", - "shutdown_command": "echo 'vagrant' | su -m root -c 'shutdown -p now'", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "type": "vmware-iso", - "vm_name": "{{ user `template` }}", - "vmx_data": { - "cpuid.coresPerSocket": "1" - }, - "vmx_remove_ethernet_interfaces": true - }, - { - "boot_command": [ - "<esc><wait>", - "boot -s<wait>", - "<enter><wait>", - "<wait10><wait10>", - "/bin/sh<enter><wait>", - "mdmfs -s 100m md1 /tmp<enter><wait>", - "mdmfs -s 100m md2 /mnt<enter><wait>", - "dhclient -l /tmp/dhclient.lease.em0 em0<enter><wait>", - "fetch -o /tmp/installerconfig http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} \u0026\u0026 bsdinstall script /tmp/installerconfig<enter><wait>" - ], - "boot_wait": "8s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "freebsd", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-parallels", - "parallels_tools_mode": "disable", - "prlctl": [ - [ - "set", - "{{.Name}}", - "--device-set", - "cdrom0", - "--iface", - "ide" - ], - [ - "set", - "{{.Name}}", - "--device-del", - "fdd0" - ], - [ - "set", - "{{.Name}}", - "--device-del", - "parallel0" - ] - ], - "prlctl_version_file": ".prlctl_version", - "shutdown_command": "echo 'vagrant' | su -m root -c 'shutdown -p now'", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "type": "parallels-iso", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<esc><wait>", - "boot -s<wait>", - "<enter><wait>", - "<wait10><wait10>", - "/bin/sh<enter><wait>", - "mdmfs -s 100m md1 /tmp<enter><wait>", - "mdmfs -s 100m md2 /mnt<enter><wait>", - "dhclient -l /tmp/dhclient.lease.vtnet0 vtnet0<enter><wait>", - "fetch -o /tmp/installerconfig http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} \u0026\u0026 bsdinstall script /tmp/installerconfig<enter><wait>" - ], - "boot_wait": "7s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "headless": "{{ user `headless` }}", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-qemu", - "shutdown_command": "echo 'vagrant' | su -m root -c 'shutdown -p now'", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "type": "qemu", - "vm_name": "{{ user `template` }}", - "qemuargs": [ - [ "-m", "{{ user `memory` }}" ], - [ "-display", "{{ user `qemu_display` }}" ] - ] - } - ], - "post-processors": [ - { - "output": "{{ user `build_directory` }}/{{user `box_basename`}}.{{.Provider}}.box", - "type": "vagrant", - "vagrantfile_template": "{{template_dir}}/vagrantfile_templates/hardenedbsd.rb" - } - ], - "provisioners": [ - { - "environment_vars": [ - "HOME_DIR=/home/vagrant", - "http_proxy={{user `http_proxy`}}", - "https_proxy={{user `https_proxy`}}", - "no_proxy={{user `no_proxy`}}" - ], - "execute_command": "echo 'vagrant' | {{.Vars}} su -m root -c 'sh -eux {{.Path}}'", - "expect_disconnect": true, - "scripts": [ - "{{template_dir}}/scripts/update.sh", - "{{template_dir}}/scripts/postinstall.sh", - "{{template_dir}}/scripts/sudoers.sh", - "{{template_dir}}/../_common/vagrant.sh", - "{{template_dir}}/scripts/cleanup.sh", - "{{template_dir}}/scripts/minimize.sh" - ], - "type": "shell" - } - ], - "variables": { - "box_basename": "hardenedbsd-11", - "build_directory": "../../builds", - "build_timestamp": "{{isotime \"20060102150405\"}}", - "cpus": "2", - "disk_size": "65536", - "git_revision": "__unknown_git_revision__", - "headless": "", - "http_directory": "{{template_dir}}/http", - "http_proxy": "{{env `http_proxy`}}", - "https_proxy": "{{env `https_proxy`}}", - "install_path": "hardenedbsd-11/installerconfig", - "iso_checksum": "9cb9d0880b423b0f47a001c9606bda3742f485bcfab19dda20c7cccb3d71bee2", - "iso_name": "disc1.iso", - "memory": "1024", - "mirror": "http://ci-01.nyi.hardenedbsd.org", - "mirror_directory": "pub/hardenedbsd/11-stable/amd64/amd64/build-3", - "name": "hardenedbsd-11", - "no_proxy": "{{env `no_proxy`}}", - "qemu_display": "none", - "template": "hardenedbsd-11-amd64", - "version": "TIMESTAMP" - } -} diff --git a/packer_templates/hardenedbsd/http/hardenedbsd-11/installerconfig b/packer_templates/hardenedbsd/http/hardenedbsd-11/installerconfig deleted file mode 100644 index 1e6c0bbe6..000000000 --- a/packer_templates/hardenedbsd/http/hardenedbsd-11/installerconfig +++ /dev/null @@ -1,52 +0,0 @@ -DISTRIBUTIONS="base.txz kernel.txz" - -# for variations in the root disk device name between VMware and Virtualbox -if [ -e /dev/ada0 ]; then - DISKSLICE=ada0 -elif [ -e /dev/da0 ]; then - DISKSLICE=da0 -elif [ -e /dev/vtbd0 ]; then - DISKSLICE=vtbd0 -else - echo "Unknown disk for install.sh to work with!" - exit -1 -fi - -# Workaround for https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=203777 -export nonInteractive="YES" - -export ZFSBOOT_DISKS="$DISKSLICE" -export ZFSBOOT_CONFIRM_LAYOUT=0 - -HOSTNAME=hardenedbsd - -#!/bin/sh -x - -ifdev=$(ifconfig | grep '^[a-z]' | cut -d: -f1 | head -n 1) -# Enable required services -cat >> /etc/rc.conf << EOT -ifconfig_${ifdev}="dhcp" -sshd_enable="YES" -EOT - -# Tune and boot from zfs -cat >> /boot/loader.conf << EOT -vm.kmem_size="200M" -vm.kmem_size_max="200M" -vfs.zfs.arc_max="40M" -vfs.zfs.vdev.cache.size="5M" -autoboot_delay=3 -EOT - -# zfs doesn't use an fstab, but some rc scripts expect one -touch /etc/fstab - -# Set up user accounts -echo "vagrant" | pw -V /etc useradd vagrant -h 0 -s /bin/sh -G wheel -d /usr/home/vagrant -c "Vagrant User" -echo "vagrant" | pw -V /etc usermod root - -mkdir -p /usr/home/vagrant -chown 1001:1001 /usr/home/vagrant -ln -s /usr/home /home - -reboot diff --git a/packer_templates/hardenedbsd/scripts/cleanup.sh b/packer_templates/hardenedbsd/scripts/cleanup.sh deleted file mode 100644 index 8d0127bbd..000000000 --- a/packer_templates/hardenedbsd/scripts/cleanup.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/sh -eux - -# Purge files we don't need any longer -rm -rf /var/db/hbsd-update/files; -mkdir -p /var/db/hbsd-update/files; -rm -f /var/db/hbsd-update/*-rollback; -rm -rf /var/db/hbsd-update/install.*; -rm -rf /boot/kernel.old; -rm -f /boot/kernel*/*.symbols; -rm -f /*.core; -rm -rf /var/cache/pkg; diff --git a/packer_templates/hardenedbsd/scripts/minimize.sh b/packer_templates/hardenedbsd/scripts/minimize.sh deleted file mode 100644 index 4b041948f..000000000 --- a/packer_templates/hardenedbsd/scripts/minimize.sh +++ /dev/null @@ -1,33 +0,0 @@ -#!/bin/sh -eux - -case "$PACKER_BUILDER_TYPE" in - qemu) exit 0 ;; -esac - -major_version="`uname -r | awk -F. '{print $1}'`"; - -if [ "$major_version" -eq 10 ]; then - ZROOT="zroot" -else - ZROOT="zroot/ROOT/default" -fi - -COMPRESSION=$(zfs get -H compression $ZROOT | cut -f3); - -zfs set compression=off $ZROOT; -dd if=/dev/zero of=/EMPTY bs=1m & -PID=$!; - -avail=$(zfs get -pH avail $ZROOT | cut -f3); -while [ "$avail" -ne 0 ]; do - sleep 15; - avail=$(zfs get -pH avail $ZROOT | cut -f3); -done - -kill $PID || echo "dd already exited"; - -rm -f /EMPTY; -# Block until the empty file has been removed, otherwise, Packer -# will try to kill the box while the disk is still full and that's bad -sync; -zfs set compression=$COMPRESSION $ZROOT; diff --git a/packer_templates/hardenedbsd/scripts/postinstall.sh b/packer_templates/hardenedbsd/scripts/postinstall.sh deleted file mode 100644 index 8107039f6..000000000 --- a/packer_templates/hardenedbsd/scripts/postinstall.sh +++ /dev/null @@ -1,24 +0,0 @@ -#!/bin/sh -eux - -# Set the time correctly -ntpdate -v -b 0.freebsd.pool.ntp.org - -# Install curl and ca_root_nss -pkg install -y curl ca_root_nss; - -# Emulate the ETCSYMLINK behavior of ca_root_nss; this is for FreeBSD 10, -# where fetch(1) was massively refactored and doesn't come with -# SSL CAcerts anymore -ln -sf /usr/local/share/certs/ca-root-nss.crt /etc/ssl/cert.pem; - -# As sharedfolders are not in defaults ports tree, we will use NFS sharing -cat >>/etc/rc.conf << RC_CONF -rpcbind_enable="YES" -nfs_server_enable="YES" -mountd_flags="-r" -RC_CONF - -# Disable X11 because Vagrants VMs are (usually) headless -cat >>/etc/make.conf << MAKE_CONF -WITHOUT_X11="YES" -MAKE_CONF diff --git a/packer_templates/hardenedbsd/scripts/sudoers.sh b/packer_templates/hardenedbsd/scripts/sudoers.sh deleted file mode 100644 index d8c2032b4..000000000 --- a/packer_templates/hardenedbsd/scripts/sudoers.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh -eux - -pkg install -y sudo; -echo "vagrant ALL=(ALL) NOPASSWD: ALL" >>/usr/local/etc/sudoers; diff --git a/packer_templates/hardenedbsd/scripts/update.sh b/packer_templates/hardenedbsd/scripts/update.sh deleted file mode 100644 index 03b36df56..000000000 --- a/packer_templates/hardenedbsd/scripts/update.sh +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/sh -eux - -# Unset these as if they're empty -[ -z "$no_proxy" ] && unset no_proxy -[ -z "$http_proxy" ] && unset http_proxy -[ -z "$https_proxy" ] && unset https_proxy - -hbsd_update="/usr/sbin/hbsd-update"; - -# Update HardenedBSD -# NOTE: the install action fails if there are no updates so || true it -env PAGER=/bin/cat $hbsd_update fetch || true; -env PAGER=/bin/cat $hbsd_update install || true; - -env ASSUME_ALWAYS_YES=true pkg update; diff --git a/packer_templates/hardenedbsd/vagrantfile_templates/hardenedbsd.rb b/packer_templates/hardenedbsd/vagrantfile_templates/hardenedbsd.rb deleted file mode 100644 index 2c1bed2d5..000000000 --- a/packer_templates/hardenedbsd/vagrantfile_templates/hardenedbsd.rb +++ /dev/null @@ -1,15 +0,0 @@ -Vagrant.require_version ">= 1.1.0" - -Vagrant.configure(2) do |config| - config.ssh.shell = "sh" - - # Disable the base shared folder, Guest Tools supporting this feature are - # unavailable for all providers. - config.vm.synced_folder ".", "/vagrant", disabled: true - - config.vm.provider :parallels do |prl, override| - # Guest Tools are unavailable. - prl.check_guest_tools = false - prl.functional_psf = false - end -end From 1e3b801727727b00c6a35bff4b9b57881c95798f Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Sat, 18 Dec 2021 20:20:02 -0800 Subject: [PATCH 1435/1622] Update the ISO used for openSUSE 15.3 Signed-off-by: Tim Smith <tsmith@chef.io> --- packer_templates/opensuse/opensuse-leap-15.3-x86_64.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packer_templates/opensuse/opensuse-leap-15.3-x86_64.json b/packer_templates/opensuse/opensuse-leap-15.3-x86_64.json index cd682be13..1736d2892 100644 --- a/packer_templates/opensuse/opensuse-leap-15.3-x86_64.json +++ b/packer_templates/opensuse/opensuse-leap-15.3-x86_64.json @@ -181,8 +181,8 @@ "http_directory": "{{template_dir}}/http", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", - "iso_checksum": "0deae0b74953acd951150ae9567e098d450f2ae91b2d0c0a610b9d934f91c7b1", - "iso_name": "openSUSE-Leap-15.3-DVD-x86_64.iso", + "iso_checksum": "e377fff244d36c3a1a03092d6f14230fdae8bd116dff638a2b3a41d89d51390a", + "iso_name": "openSUSE-Leap-15.3-2-DVD-x86_64-Current.iso", "memory": "1024", "mirror": "http://suse.mobile-central.org/distribution", "mirror_directory": "leap/15.3/iso", From d20445eb2b8068d1dbd5be431202d84b07a25093 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Sat, 18 Dec 2021 20:21:39 -0800 Subject: [PATCH 1436/1622] Update the Ubuntu 20.04 live image to 20.04.3 Old iso is gone Signed-off-by: Tim Smith <tsmith@chef.io> --- packer_templates/ubuntu/ubuntu-20.04-live-amd64.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packer_templates/ubuntu/ubuntu-20.04-live-amd64.json b/packer_templates/ubuntu/ubuntu-20.04-live-amd64.json index bcb4847c9..8bba3e3aa 100644 --- a/packer_templates/ubuntu/ubuntu-20.04-live-amd64.json +++ b/packer_templates/ubuntu/ubuntu-20.04-live-amd64.json @@ -239,8 +239,8 @@ "https_proxy": "{{env `https_proxy`}}", "hyperv_generation": "2", "hyperv_switch": "bento", - "iso_checksum": "d1f2bf834bbe9bb43faf16f9be992a6f3935e65be0edece1dee2aa6eb1767423", - "iso_name": "ubuntu-20.04.2-live-server-amd64.iso", + "iso_checksum": "f8e3086f3cea0fb3fefb29937ab5ed9d19e767079633960ccb50e76153effc98", + "iso_name": "ubuntu-20.04.3-live-server-amd64.iso", "memory": "1024", "mirror": "http://releases.ubuntu.com", "mirror_directory": "20.04", From 48c2db75967a9cfecdd410b43baa5a4c9a2750d7 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith@chef.io> Date: Sat, 18 Dec 2021 20:39:52 -0800 Subject: [PATCH 1437/1622] Update README.md --- README.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/README.md b/README.md index bf0271f64..4bab8dbe4 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,5 @@ # Bento -[![Build status](https://badge.buildkite.com/2d56b8ca08562a7d17fd25920a2e02079c5e6f28cbc6d426ee.svg?branch=master)](https://buildkite.com/chef-oss/chef-bento-master-verify) - Bento is a project that encapsulates [Packer](https://www.packer.io/) templates for building [Vagrant](https://www.vagrantup.com/) base boxes. A subset of templates are built and published to the [bento org](https://app.vagrantup.com/bento) on Vagrant Cloud. These published boxes serve as the default boxes for [kitchen-vagrant](https://github.com/test-kitchen/kitchen-vagrant/). ### Using Public Boxes From fd6b785889fb1565e1b65fb8039a00e38544ac76 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith@chef.io> Date: Sat, 18 Dec 2021 20:41:05 -0800 Subject: [PATCH 1438/1622] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 4bab8dbe4..80ebb582c 100644 --- a/README.md +++ b/README.md @@ -138,7 +138,7 @@ These basebox templates were converted from [veewee](https://github.com/jedi4eve - Author: Tom Duffield ([tom@chef.io](mailto:tom@chef.io)) ```text -Copyright 2012-2020, Chef Software, Inc. (<legal@chef.io>) +Copyright 2012-2021, Chef Software, Inc. (<legal@chef.io>) Copyright 2011-2012, Tim Dysinger (<tim@dysinger.net>) Licensed under the Apache License, Version 2.0 (the "License"); From af624e4455290bcd2056b37e53f42e075342c35a Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Sat, 18 Dec 2021 23:15:05 -0800 Subject: [PATCH 1439/1622] Update Debian 10.10 to 10.11 and fix arm64 builds Signed-off-by: Tim Smith <tsmith@chef.io> --- builds.yml | 7 +++++-- ...bian-10.10-amd64.json => debian-10.11-amd64.json} | 12 ++++++------ ...debian-10.10-i386.json => debian-10.11-i386.json} | 12 ++++++------ packer_templates/debian/debian-9.13-arm64.json | 4 ++-- 4 files changed, 19 insertions(+), 16 deletions(-) rename packer_templates/debian/{debian-10.10-amd64.json => debian-10.11-amd64.json} (96%) rename packer_templates/debian/{debian-10.10-i386.json => debian-10.11-i386.json} (96%) diff --git a/builds.yml b/builds.yml index 944743583..d48b477b7 100644 --- a/builds.yml +++ b/builds.yml @@ -5,10 +5,13 @@ public: - 'centos-7.9' - 'centos-8.5' - 'centos-stream-8' +- 'debian-9.13-arm64' - 'debian-9.13-i386' - 'debian-9.13' -- 'debian-10.10-i386' -- 'debian-10.10' +- 'debian-10.11-arm64' +- 'debian-10.11-i386' +- 'debian-10.11' +- 'debian-11.2-arm64' - 'debian-11.2-i386' - 'debian-11.2' - 'fedora-33' diff --git a/packer_templates/debian/debian-10.10-amd64.json b/packer_templates/debian/debian-10.11-amd64.json similarity index 96% rename from packer_templates/debian/debian-10.10-amd64.json rename to packer_templates/debian/debian-10.11-amd64.json index 06f4c53d9..636767305 100644 --- a/packer_templates/debian/debian-10.10-amd64.json +++ b/packer_templates/debian/debian-10.11-amd64.json @@ -197,7 +197,7 @@ } ], "variables": { - "box_basename": "debian-10.10", + "box_basename": "debian-10.11", "build_directory": "../../builds", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "2", @@ -208,16 +208,16 @@ "http_directory": "{{template_dir}}/http", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", - "iso_checksum": "c433254a7c5b5b9e6a05f9e1379a0bd6ab3323f89b56537b684b6d1bd1f8b6ad", - "iso_name": "debian-10.10.0-amd64-netinst.iso", + "iso_checksum": "133430141272d8bf96cfb10b6bfd1c945f5a59ea0efc2bcb56d1033c7f2866ea", + "iso_name": "debian-10.11.0-amd64-netinst.iso", "memory": "1024", "mirror": "http://cdimage.debian.org/cdimage/archive", - "mirror_directory": "10.10.0/amd64/iso-cd", - "name": "debian-10.10", + "mirror_directory": "10.11.0/amd64/iso-cd", + "name": "debian-10.11", "no_proxy": "{{env `no_proxy`}}", "preseed_path": "debian-9/preseed.cfg", "qemu_display": "none", - "template": "debian-10.10-amd64", + "template": "debian-10.11-amd64", "version": "TIMESTAMP" } } diff --git a/packer_templates/debian/debian-10.10-i386.json b/packer_templates/debian/debian-10.11-i386.json similarity index 96% rename from packer_templates/debian/debian-10.10-i386.json rename to packer_templates/debian/debian-10.11-i386.json index 8d09dbeda..9b7587578 100644 --- a/packer_templates/debian/debian-10.10-i386.json +++ b/packer_templates/debian/debian-10.11-i386.json @@ -197,7 +197,7 @@ } ], "variables": { - "box_basename": "debian-10.10-i386", + "box_basename": "debian-10.11-i386", "build_directory": "../../builds", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "2", @@ -208,16 +208,16 @@ "http_directory": "{{template_dir}}/http", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", - "iso_checksum": "cf824084643fb82f74d1fbec804baaf74539dadd279af2098da94254f758e5b7", - "iso_name": "debian-10.10.0-i386-netinst.iso", + "iso_checksum": "6df633a8eb829113af5d11fd32b7dd964cdef3eccff394a83e6f07cd7380392d", + "iso_name": "debian-10.11.0-i386-netinst.iso", "memory": "1024", "mirror": "http://cdimage.debian.org/cdimage/archive", - "mirror_directory": "10.10.0/i386/iso-cd", - "name": "debian-10.10-i386", + "mirror_directory": "10.11.0/i386/iso-cd", + "name": "debian-10.11-i386", "no_proxy": "{{env `no_proxy`}}", "preseed_path": "debian-9/preseed.cfg", "qemu_display": "none", - "template": "debian-10.10-i386", + "template": "debian-10.11-i386", "version": "TIMESTAMP" } } diff --git a/packer_templates/debian/debian-9.13-arm64.json b/packer_templates/debian/debian-9.13-arm64.json index af98cc82f..a939da5bd 100644 --- a/packer_templates/debian/debian-9.13-arm64.json +++ b/packer_templates/debian/debian-9.13-arm64.json @@ -76,7 +76,7 @@ } ], "variables": { - "box_basename": "debian-9.13", + "box_basename": "debian-9.13-arm64", "build_directory": "../../builds", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "2", @@ -92,7 +92,7 @@ "memory": "1024", "mirror": "http://cdimage.debian.org/cdimage/archive", "mirror_directory": "9.13.0/arm64/iso-cd", - "name": "debian-9.13", + "name": "debian-9.13-arm64", "no_proxy": "{{env `no_proxy`}}", "preseed_path": "debian-9/preseed.cfg", "qemu_display": "none", From b926a25bab36a262e34e4de5ebc9371c6cce807e Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Sun, 19 Dec 2021 00:03:27 -0800 Subject: [PATCH 1440/1622] Fix arm box names Signed-off-by: Tim Smith <tsmith@chef.io> --- packer_templates/debian/debian-10.11-arm64.json | 4 ++-- packer_templates/debian/debian-11.2-arm64.json | 4 ++-- packer_templates/ubuntu/ubuntu-20.04-arm64.json | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/packer_templates/debian/debian-10.11-arm64.json b/packer_templates/debian/debian-10.11-arm64.json index 00e6443aa..e5144bfa9 100644 --- a/packer_templates/debian/debian-10.11-arm64.json +++ b/packer_templates/debian/debian-10.11-arm64.json @@ -76,7 +76,7 @@ } ], "variables": { - "box_basename": "debian-10.11", + "box_basename": "debian-10.11-arm64", "build_directory": "../../builds", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "2", @@ -92,7 +92,7 @@ "memory": "1024", "mirror": "http://cdimage.debian.org/cdimage/archive", "mirror_directory": "10.11.0/arm64/iso-cd", - "name": "debian-10.11", + "name": "debian-10.11-arm64", "no_proxy": "{{env `no_proxy`}}", "preseed_path": "debian-9/preseed.cfg", "qemu_display": "none", diff --git a/packer_templates/debian/debian-11.2-arm64.json b/packer_templates/debian/debian-11.2-arm64.json index a59bb40fc..506a861f3 100644 --- a/packer_templates/debian/debian-11.2-arm64.json +++ b/packer_templates/debian/debian-11.2-arm64.json @@ -76,7 +76,7 @@ } ], "variables": { - "box_basename": "debian-11.2", + "box_basename": "debian-11.2-arm64", "build_directory": "../../builds", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "2", @@ -92,7 +92,7 @@ "memory": "1024", "mirror": "http://cdimage.debian.org/cdimage/release", "mirror_directory": "11.2.0/arm64/iso-cd", - "name": "debian-11.2", + "name": "debian-11.2-arm64", "no_proxy": "{{env `no_proxy`}}", "preseed_path": "debian-9/preseed.cfg", "qemu_display": "none", diff --git a/packer_templates/ubuntu/ubuntu-20.04-arm64.json b/packer_templates/ubuntu/ubuntu-20.04-arm64.json index 881323bd9..21be87479 100644 --- a/packer_templates/ubuntu/ubuntu-20.04-arm64.json +++ b/packer_templates/ubuntu/ubuntu-20.04-arm64.json @@ -65,7 +65,7 @@ } ], "variables": { - "box_basename": "ubuntu-20.04-live", + "box_basename": "ubuntu-20.04-arm64", "build_directory": "../../builds", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "2", @@ -83,10 +83,10 @@ "memory": "1024", "mirror": "http://cdimage.ubuntu.com", "mirror_directory": "releases/20.04/release", - "name": "ubuntu-20.04-live", + "name": "ubuntu-20.04-arm64", "no_proxy": "{{env `no_proxy`}}", "preseed_path": "preseed.cfg", - "template": "ubuntu-20.04-live-arm64", + "template": "ubuntu-20.04-arm64", "version": "TIMESTAMP" } } From b21b078916b1ae8eaeb62704e3137e1569d07491 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Sun, 19 Dec 2021 10:38:57 -0800 Subject: [PATCH 1441/1622] Replace EOL Ubuntu 20.10 with 21.10 Signed-off-by: Tim Smith <tsmith@chef.io> --- builds.yml | 2 +- ...untu-20.10-amd64.json => ubuntu-21.10-amd64.json} | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) rename packer_templates/ubuntu/{ubuntu-20.10-amd64.json => ubuntu-21.10-amd64.json} (97%) diff --git a/builds.yml b/builds.yml index d48b477b7..8fd50b8f6 100644 --- a/builds.yml +++ b/builds.yml @@ -34,8 +34,8 @@ public: - 'ubuntu-16.04' - 'ubuntu-18.04' - 'ubuntu-20.04' -- 'ubuntu-20.10' - 'ubuntu-21.04' +- 'ubuntu-21.10' # slug box name: text string from standard box name to match (generally the same) slugs: diff --git a/packer_templates/ubuntu/ubuntu-20.10-amd64.json b/packer_templates/ubuntu/ubuntu-21.10-amd64.json similarity index 97% rename from packer_templates/ubuntu/ubuntu-20.10-amd64.json rename to packer_templates/ubuntu/ubuntu-21.10-amd64.json index 4f9dd2fef..a341537c9 100644 --- a/packer_templates/ubuntu/ubuntu-20.10-amd64.json +++ b/packer_templates/ubuntu/ubuntu-21.10-amd64.json @@ -257,7 +257,7 @@ } ], "variables": { - "box_basename": "ubuntu-20.10", + "box_basename": "ubuntu-21.10", "build_directory": "../../builds", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "2", @@ -270,16 +270,16 @@ "https_proxy": "{{env `https_proxy`}}", "hyperv_generation": "2", "hyperv_switch": "bento", - "iso_checksum": "defdc1ad3af7b661fe2b4ee861fb6fdb5f52039389ef56da6efc05e6adfe3d45", - "iso_name": "ubuntu-20.10-live-server-amd64.iso", + "iso_checksum": "e84f546dfc6743f24e8b1e15db9cc2d2c698ec57d9adfb852971772d1ce692d4", + "iso_name": "ubuntu-21.10-live-server-amd64.iso", "memory": "1024", "mirror": "http://releases.ubuntu.com", - "mirror_directory": "groovy", - "name": "ubuntu-20.10", + "mirror_directory": "impish", + "name": "ubuntu-21.10", "no_proxy": "{{env `no_proxy`}}", "preseed_path": "preseed.cfg", "qemu_display": "none", - "template": "ubuntu-20.10-amd64", + "template": "ubuntu-21.10-amd64", "version": "TIMESTAMP" } } From 33684a64f2ab70c95f1db1aa8558678360091547 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Sun, 19 Dec 2021 11:42:18 -0800 Subject: [PATCH 1442/1622] Update AlmaLinux from 8.4 to 8.5 Signed-off-by: Tim Smith <tsmith@chef.io> --- ...x-8.4-x86_64.json => almalinux-8.5-x86_64.json} | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) rename packer_templates/almalinux/{almalinux-8.4-x86_64.json => almalinux-8.5-x86_64.json} (96%) diff --git a/packer_templates/almalinux/almalinux-8.4-x86_64.json b/packer_templates/almalinux/almalinux-8.5-x86_64.json similarity index 96% rename from packer_templates/almalinux/almalinux-8.4-x86_64.json rename to packer_templates/almalinux/almalinux-8.5-x86_64.json index a3432a986..8fc753972 100644 --- a/packer_templates/almalinux/almalinux-8.4-x86_64.json +++ b/packer_templates/almalinux/almalinux-8.5-x86_64.json @@ -1,4 +1,4 @@ -{ + { "builders": [ { "boot_command": "{{ user `boot_command` }}", @@ -167,7 +167,7 @@ } ], "variables": { - "box_basename": "almalinux-8.4", + "box_basename": "almalinux-8.5", "build_directory": "../../builds", "build_timestamp": "{{isotime \"2019102650405\"}}", "cpus": "2", @@ -180,16 +180,16 @@ "https_proxy": "{{env `https_proxy`}}", "hyperv_generation": "1", "hyperv_switch": "bento", - "iso_checksum": "4dd2f7c558bfa34d9a5e71d5add2c77c59fdec58076678a381d9dfd0f9583a51", - "iso_name": "AlmaLinux-8.4-x86_64-dvd.iso", + "iso_checksum": "54b8881bebd924e4699ed12634187a82156fdb0fa57ec24058d04d70d2f033b3", + "iso_name": "AlmaLinux-8.5-x86_64-dvd.iso", "ks_path": "8/ks.cfg", "memory": "1024", "mirror": "https://repo.almalinux.org/almalinux", - "mirror_directory": "8.4/isos/x86_64", - "name": "almalinux-8.4", + "mirror_directory": "8.5/isos/x86_64", + "name": "almalinux-8.5", "no_proxy": "{{env `no_proxy`}}", "qemu_display": "none", - "template": "almalinux-8.4-x86_64", + "template": "almalinux-8.5-x86_64", "boot_command": "<up><wait><tab> inst.text inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>", "version": "TIMESTAMP" } From 260dca7f38599e09fcf9a4e73f5c1cf6ef96da58 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Sun, 19 Dec 2021 11:43:11 -0800 Subject: [PATCH 1443/1622] Update Rocky Linux from 8.4 to 8.5 Signed-off-by: Tim Smith <tsmith@chef.io> --- .../rockylinux/rockylinux-8.4-x86_64.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/packer_templates/rockylinux/rockylinux-8.4-x86_64.json b/packer_templates/rockylinux/rockylinux-8.4-x86_64.json index 8ee59c687..e8325744d 100644 --- a/packer_templates/rockylinux/rockylinux-8.4-x86_64.json +++ b/packer_templates/rockylinux/rockylinux-8.4-x86_64.json @@ -167,7 +167,7 @@ } ], "variables": { - "box_basename": "rockylinux-8.4", + "box_basename": "rockylinux-8.5", "build_directory": "../../builds", "build_timestamp": "{{isotime \"2019102650405\"}}", "cpus": "2", @@ -180,16 +180,16 @@ "https_proxy": "{{env `https_proxy`}}", "hyperv_generation": "1", "hyperv_switch": "bento", - "iso_checksum": "ffe2fae67da6702d859cfb0b321561a5d616ce87a963d8a25b018c9c3d52d9a4", - "iso_name": "Rocky-8.4-x86_64-dvd1.iso", + "iso_checksum": "0081f8b969d0cef426530f6d618b962c7a01e71eb12a40581a83241f22dfdc25", + "iso_name": "Rocky-8.5-x86_64-dvd1.iso", "ks_path": "8/ks.cfg", "memory": "1024", "mirror": "http://download.rockylinux.org/pub/rocky", - "mirror_directory": "8.4/isos/x86_64", - "name": "rockylinux-8.4", + "mirror_directory": "8.5/isos/x86_64", + "name": "rockylinux-8.5", "no_proxy": "{{env `no_proxy`}}", "qemu_display": "none", - "template": "rockylinux-8.4-x86_64", + "template": "rockylinux-8.5-x86_64", "boot_command": "<up><wait><tab> inst.text inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>", "version": "TIMESTAMP" } From b88c9faccd7ba53083411dd6cc05da41f7957dc3 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Sun, 19 Dec 2021 11:50:08 -0800 Subject: [PATCH 1444/1622] Rename the Rocky Linux file for 8.5 Signed-off-by: Tim Smith <tsmith@chef.io> --- .../{rockylinux-8.4-x86_64.json => rockylinux-8.5-x86_64.json} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename packer_templates/rockylinux/{rockylinux-8.4-x86_64.json => rockylinux-8.5-x86_64.json} (100%) diff --git a/packer_templates/rockylinux/rockylinux-8.4-x86_64.json b/packer_templates/rockylinux/rockylinux-8.5-x86_64.json similarity index 100% rename from packer_templates/rockylinux/rockylinux-8.4-x86_64.json rename to packer_templates/rockylinux/rockylinux-8.5-x86_64.json From 7b90ce92f6822ee66539f9acb573d1efef5098d9 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Sun, 19 Dec 2021 12:27:22 -0800 Subject: [PATCH 1445/1622] Update the versions in the builds file Signed-off-by: Tim Smith <tsmith@chef.io> --- builds.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/builds.yml b/builds.yml index 8fd50b8f6..95eaadf79 100644 --- a/builds.yml +++ b/builds.yml @@ -1,6 +1,6 @@ --- public: -- 'almalinux-8.4' +- 'almalinux-8.5' - 'amazon-2' - 'centos-7.9' - 'centos-8.5' @@ -27,7 +27,7 @@ public: - 'oracle-6.10' - 'oracle-7.9' - 'oracle-8.3' -- 'rockylinux-8.4' +- 'rockylinux-8.5' - 'scientific-7.9' - 'springdalelinux-7.9' - 'ubuntu-16.04-i386' From 632da7e7a3c8bca4269cff0d8f3a44ac5c62abb9 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Sun, 19 Dec 2021 12:27:31 -0800 Subject: [PATCH 1446/1622] Account for arm64 builds Signed-off-by: Tim Smith <tsmith@chef.io> --- lib/bento/upload.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/bento/upload.rb b/lib/bento/upload.rb index d5493ea12..695f6727d 100644 --- a/lib/bento/upload.rb +++ b/lib/bento/upload.rb @@ -67,7 +67,7 @@ def upload_box(md_file) # def lookup_slug(name) builds_yml["slugs"].each_pair do |slug, match_string| - return slug if name.start_with?(match_string) && !name.include?("i386") + return slug if name.start_with?(match_string) && !(name.include?("i386") || name.include?("arm64")) end nil From 719aadb69fc68005fde718c640c8c3570cebea19 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Sun, 19 Dec 2021 12:28:57 -0800 Subject: [PATCH 1447/1622] Make sure we create public boxes Signed-off-by: Tim Smith <tsmith@chef.io> --- lib/bento/upload.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/bento/upload.rb b/lib/bento/upload.rb index 695f6727d..181da7345 100644 --- a/lib/bento/upload.rb +++ b/lib/bento/upload.rb @@ -39,13 +39,13 @@ def upload_box(md_file) if File.exist?(File.join("builds", prov_data["file"])) banner("Uploading bento/#{md_data["name"]} version:#{md_data["version"]} provider:#{prov}...") - upload_cmd = "vagrant cloud publish bento/#{md_data["name"]} #{md_data["version"]} #{prov} builds/#{prov_data["file"]} --description '#{box_desc(md_data["name"])}' --short-description '#{box_desc(md_data["name"])}' --version-description '#{ver_desc(md_data)}' --force --release" + upload_cmd = "vagrant cloud publish bento/#{md_data["name"]} #{md_data["version"]} #{prov} builds/#{prov_data["file"]} --description '#{box_desc(md_data["name"])}' --short-description '#{box_desc(md_data["name"])}' --version-description '#{ver_desc(md_data)}' --force --release --no-private" shellout(upload_cmd) slug_name = lookup_slug(md_data["name"]) if slug_name banner("Uploading slug bento/#{slug_name} from #{md_data["name"]} version:#{md_data["version"]} provider:#{prov}...") - upload_cmd = "vagrant cloud publish bento/#{slug_name} #{md_data["version"]} #{prov} builds/#{prov_data["file"]} --description '#{slug_desc(slug_name)}' --short-description '#{slug_desc(slug_name)}' --version-description '#{ver_desc(md_data)}' --force --release" + upload_cmd = "vagrant cloud publish bento/#{slug_name} #{md_data["version"]} #{prov} builds/#{prov_data["file"]} --description '#{slug_desc(slug_name)}' --short-description '#{slug_desc(slug_name)}' --version-description '#{ver_desc(md_data)}' --force --release --no-private" shellout(upload_cmd) end From ade14458360a7ef7fda0b13dca76a1bbc96ad938 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Sun, 19 Dec 2021 14:22:12 -0800 Subject: [PATCH 1448/1622] Update Oracle Linux from 8.3 to 8.5 Signed-off-by: Tim Smith <tsmith@chef.io> --- ...acle-8.3-x86_64.json => oracle-8.5-x86_64.json} | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) rename packer_templates/oraclelinux/{oracle-8.3-x86_64.json => oracle-8.5-x86_64.json} (95%) diff --git a/packer_templates/oraclelinux/oracle-8.3-x86_64.json b/packer_templates/oraclelinux/oracle-8.5-x86_64.json similarity index 95% rename from packer_templates/oraclelinux/oracle-8.3-x86_64.json rename to packer_templates/oraclelinux/oracle-8.5-x86_64.json index b43015f5e..17e81ec10 100644 --- a/packer_templates/oraclelinux/oracle-8.3-x86_64.json +++ b/packer_templates/oraclelinux/oracle-8.5-x86_64.json @@ -153,7 +153,7 @@ } ], "variables": { - "box_basename": "oracle-8.3", + "box_basename": "oracle-8.5", "build_directory": "../../builds", "build_timestamp": "{{isotime \"2019102650405\"}}", "cpus": "2", @@ -166,16 +166,16 @@ "https_proxy": "{{env `https_proxy`}}", "hyperv_generation": "1", "hyperv_switch": "bento", - "iso_checksum": "771e383adfd5406d1a360ff24822011a88cbb45b6019e2f1095758c46a406aaa", - "iso_name": "OracleLinux-R8-U3-x86_64-dvd.iso", + "iso_checksum": "45939e85542c19dd519aaad7c4dbe84a6fcadfaca348245f92ae4472fc7f50ac", + "iso_name": "OracleLinux-R8-U5-x86_64-dvd.iso", "ks_path": "8/ks.cfg", "memory": "1024", - "mirror": "http://mirrors.dotsrc.org/oracle-linux", - "mirror_directory": "OL8/u3/x86_64", - "name": "oracle-8.3", + "mirror": "https://mirror.netcologne.de/oracle-linux", + "mirror_directory": "OL8/u5/x86_64", + "name": "oracle-8.5", "no_proxy": "{{env `no_proxy`}}", "qemu_display": "none", - "template": "oracle-8.3-x86_64", + "template": "oracle-8.5-x86_64", "boot_command": "<up><wait><tab> inst.text inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>", "version": "TIMESTAMP" } From 417380d5e4bee6008a7a09d643564cf2c584f87d Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Sun, 19 Dec 2021 16:34:13 -0800 Subject: [PATCH 1449/1622] Fix failing builds on Ubuntu 18.04 vmware With sata disk set vmware just crashes --- packer_templates/ubuntu/ubuntu-16.04-amd64.json | 3 ++- packer_templates/ubuntu/ubuntu-18.04-amd64.json | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/packer_templates/ubuntu/ubuntu-16.04-amd64.json b/packer_templates/ubuntu/ubuntu-16.04-amd64.json index ad4e2e628..d8af05689 100644 --- a/packer_templates/ubuntu/ubuntu-16.04-amd64.json +++ b/packer_templates/ubuntu/ubuntu-16.04-amd64.json @@ -182,7 +182,7 @@ "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", "memory": "{{ user `memory` }}", "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-qemu", - "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", + "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", "ssh_password": "vagrant", "ssh_port": 22, "ssh_timeout": "10000s", @@ -280,6 +280,7 @@ "name": "ubuntu-16.04", "no_proxy": "{{env `no_proxy`}}", "preseed_path": "preseed.cfg", + "qemu_display": "none", "template": "ubuntu-16.04-amd64", "version": "TIMESTAMP" } diff --git a/packer_templates/ubuntu/ubuntu-18.04-amd64.json b/packer_templates/ubuntu/ubuntu-18.04-amd64.json index d9c41ffd5..8f2b3e4a4 100644 --- a/packer_templates/ubuntu/ubuntu-18.04-amd64.json +++ b/packer_templates/ubuntu/ubuntu-18.04-amd64.json @@ -69,13 +69,13 @@ " netcfg/get_domain=vm<wait>", " netcfg/get_hostname=vagrant<wait>", " grub-installer/bootdev=/dev/sda<wait>", + " noapic<wait>", " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}}<wait>", " -- <wait>", "<enter><wait>" ], "boot_wait": "5s", "cpus": "{{ user `cpus` }}", - "disk_adapter_type": "sata", "disk_size": "{{user `disk_size`}}", "guest_os_type": "ubuntu-64", "headless": "{{ user `headless` }}", From ae85383a887136000b757b175a83ce002e7e49ff Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Thu, 23 Dec 2021 10:28:59 -0800 Subject: [PATCH 1450/1622] Remove EOL FreeBSD 11.4 Signed-off-by: Tim Smith <tsmith@chef.io> --- .../freebsd/freebsd-11.4-amd64.json | 211 ------------------ .../freebsd/freebsd-11.4-i386.json | 211 ------------------ 2 files changed, 422 deletions(-) delete mode 100644 packer_templates/freebsd/freebsd-11.4-amd64.json delete mode 100644 packer_templates/freebsd/freebsd-11.4-i386.json diff --git a/packer_templates/freebsd/freebsd-11.4-amd64.json b/packer_templates/freebsd/freebsd-11.4-amd64.json deleted file mode 100644 index 0cafb9418..000000000 --- a/packer_templates/freebsd/freebsd-11.4-amd64.json +++ /dev/null @@ -1,211 +0,0 @@ -{ - "builders": [ - { - "boot_command": [ - "<esc><wait>", - "boot -s<wait>", - "<enter><wait>", - "<wait10><wait10>", - "/bin/sh<enter><wait>", - "mdmfs -s 100m md1 /tmp<enter><wait>", - "mdmfs -s 100m md2 /mnt<enter><wait>", - "dhclient -p /tmp/dhclient.em0.pid -l /tmp/dhclient.lease.em0 em0<enter><wait>", - "fetch -o /tmp/installerconfig http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} \u0026\u0026 bsdinstall script /tmp/installerconfig<enter><wait>" - ], - "boot_wait": "5s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "guest_additions_mode": "disable", - "guest_os_type": "FreeBSD_64", - "headless": "{{ user `headless` }}", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-virtualbox", - "shutdown_command": "echo 'vagrant' | su -m root -c 'shutdown -p now'", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "type": "virtualbox-iso", - "virtualbox_version_file": ".vbox_version", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<esc><wait>", - "boot -s<wait>", - "<enter><wait>", - "<wait10><wait10>", - "/bin/sh<enter><wait>", - "mdmfs -s 100m md1 /tmp<enter><wait>", - "mdmfs -s 100m md2 /mnt<enter><wait>", - "dhclient -p /tmp/dhclient.em0.pid -l /tmp/dhclient.lease.em0 em0<enter><wait>", - "<wait5>", - "fetch -o /tmp/installerconfig http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} \u0026\u0026 bsdinstall script /tmp/installerconfig<enter><wait>" - ], - "boot_wait": "5s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "freebsd-64", - "headless": "{{ user `headless` }}", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-vmware", - "shutdown_command": "echo 'vagrant' | su -m root -c 'shutdown -p now'", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "type": "vmware-iso", - "vm_name": "{{ user `template` }}", - "vmx_data": { - "cpuid.coresPerSocket": "1" - }, - "vmx_remove_ethernet_interfaces": true - }, - { - "boot_command": [ - "<esc><wait>", - "boot -s<wait>", - "<enter><wait>", - "<wait10><wait10>", - "/bin/sh<enter><wait>", - "mdmfs -s 100m md1 /tmp<enter><wait>", - "mdmfs -s 100m md2 /mnt<enter><wait>", - "dhclient -p /tmp/dhclient.em0.pid -l /tmp/dhclient.lease.em0 em0<enter><wait>", - "fetch -o /tmp/installerconfig http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} \u0026\u0026 bsdinstall script /tmp/installerconfig<enter><wait>" - ], - "boot_wait": "8s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "freebsd", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-parallels", - "parallels_tools_mode": "disable", - "prlctl": [ - [ - "set", - "{{.Name}}", - "--device-set", - "cdrom0", - "--iface", - "ide" - ], - [ - "set", - "{{.Name}}", - "--device-del", - "fdd0" - ], - [ - "set", - "{{.Name}}", - "--device-del", - "parallel0" - ] - ], - "prlctl_version_file": ".prlctl_version", - "shutdown_command": "echo 'vagrant' | su -m root -c 'shutdown -p now'", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "type": "parallels-iso", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<esc><wait>", - "boot -s<wait>", - "<enter><wait>", - "<wait10><wait10>", - "/bin/sh<enter><wait>", - "mdmfs -s 100m md1 /tmp<enter><wait>", - "mdmfs -s 100m md2 /mnt<enter><wait>", - "dhclient -p /tmp/dhclient.vtnet0.pid -l /tmp/dhclient.lease.vtnet0 vtnet0<enter><wait>", - "fetch -o /tmp/installerconfig http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} \u0026\u0026 bsdinstall script /tmp/installerconfig<enter><wait>" - ], - "boot_wait": "7s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "headless": "{{ user `headless` }}", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-qemu", - "shutdown_command": "echo 'vagrant' | su -m root -c 'shutdown -p now'", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "type": "qemu", - "vm_name": "{{ user `template` }}", - "qemuargs": [ - [ "-m", "{{ user `memory` }}" ], - [ "-display", "{{ user `qemu_display` }}" ] - ] - } - ], - "post-processors": [ - { - "output": "{{ user `build_directory` }}/{{user `box_basename`}}.{{.Provider}}.box", - "type": "vagrant", - "vagrantfile_template": "{{template_dir}}/vagrantfile_templates/freebsd.rb" - } - ], - "provisioners": [ - { - "environment_vars": [ - "HOME_DIR=/home/vagrant", - "http_proxy={{user `http_proxy`}}", - "https_proxy={{user `https_proxy`}}", - "no_proxy={{user `no_proxy`}}", - "pkg_branch={{user `pkg_branch`}}" - ], - "execute_command": "echo 'vagrant' | {{.Vars}} su -m root -c 'sh -eux {{.Path}}'", - "expect_disconnect": true, - "scripts": [ - "{{template_dir}}/scripts/update.sh", - "{{template_dir}}/scripts/postinstall.sh", - "{{template_dir}}/scripts/sudoers.sh", - "{{template_dir}}/../_common/vagrant.sh", - "{{template_dir}}/scripts/vmtools.sh", - "{{template_dir}}/scripts/cleanup.sh", - "{{template_dir}}/scripts/minimize.sh" - ], - "type": "shell" - } - ], - "variables": { - "box_basename": "freebsd-11.4", - "build_directory": "../../builds", - "build_timestamp": "{{isotime \"20060102150405\"}}", - "cpus": "2", - "disk_size": "65536", - "git_revision": "__unknown_git_revision__", - "headless": "", - "http_directory": "{{template_dir}}/http", - "http_proxy": "{{env `http_proxy`}}", - "https_proxy": "{{env `https_proxy`}}", - "install_path": "freebsd-11/installerconfig", - "iso_checksum": "d76c1ded99b2c1005b1ff94cc0c811fbcd8a2d04196432009ab5f203c2146914", - "iso_name": "FreeBSD-11.4-RELEASE-amd64-disc1.iso", - "memory": "1024", - "mirror": "https://download.freebsd.org/ftp", - "mirror_directory": "releases/amd64/amd64/ISO-IMAGES/11.4", - "name": "freebsd-11.4", - "no_proxy": "{{env `no_proxy`}}", - "pkg_branch": "quarterly", - "qemu_display": "none", - "template": "freebsd-11.4-amd64", - "version": "TIMESTAMP" - } -} diff --git a/packer_templates/freebsd/freebsd-11.4-i386.json b/packer_templates/freebsd/freebsd-11.4-i386.json deleted file mode 100644 index de26c1fb5..000000000 --- a/packer_templates/freebsd/freebsd-11.4-i386.json +++ /dev/null @@ -1,211 +0,0 @@ -{ - "builders": [ - { - "boot_command": [ - "<esc><wait>", - "boot -s<wait>", - "<enter><wait>", - "<wait10><wait10>", - "/bin/sh<enter><wait>", - "mdmfs -s 100m md1 /tmp<enter><wait>", - "mdmfs -s 100m md2 /mnt<enter><wait>", - "dhclient -p /tmp/dhclient.em0.pid -l /tmp/dhclient.lease.em0 em0<enter><wait>", - "fetch -o /tmp/installerconfig http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} \u0026\u0026 bsdinstall script /tmp/installerconfig<enter><wait>" - ], - "boot_wait": "5s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "guest_additions_mode": "disable", - "guest_os_type": "FreeBSD", - "headless": "{{ user `headless` }}", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-virtualbox", - "shutdown_command": "echo 'vagrant' | su -m root -c 'shutdown -p now'", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "type": "virtualbox-iso", - "virtualbox_version_file": ".vbox_version", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<esc><wait>", - "boot -s<wait>", - "<enter><wait>", - "<wait10><wait10>", - "/bin/sh<enter><wait>", - "mdmfs -s 100m md1 /tmp<enter><wait>", - "mdmfs -s 100m md2 /mnt<enter><wait>", - "dhclient -p /tmp/dhclient.em0.pid -l /tmp/dhclient.lease.em0 em0<enter><wait>", - "<wait5>", - "fetch -o /tmp/installerconfig http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} \u0026\u0026 bsdinstall script /tmp/installerconfig<enter><wait>" - ], - "boot_wait": "5s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "freebsd", - "headless": "{{ user `headless` }}", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-vmware", - "shutdown_command": "echo 'vagrant' | su -m root -c 'shutdown -p now'", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "type": "vmware-iso", - "vm_name": "{{ user `template` }}", - "vmx_data": { - "cpuid.coresPerSocket": "1" - }, - "vmx_remove_ethernet_interfaces": true - }, - { - "boot_command": [ - "<esc><wait>", - "boot -s<wait>", - "<enter><wait>", - "<wait10><wait10>", - "/bin/sh<enter><wait>", - "mdmfs -s 100m md1 /tmp<enter><wait>", - "mdmfs -s 100m md2 /mnt<enter><wait>", - "dhclient -p /tmp/dhclient.em0.pid -l /tmp/dhclient.lease.em0 em0<enter><wait>", - "fetch -o /tmp/installerconfig http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} \u0026\u0026 bsdinstall script /tmp/installerconfig<enter><wait>" - ], - "boot_wait": "8s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "freebsd", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-parallels", - "parallels_tools_mode": "disable", - "prlctl": [ - [ - "set", - "{{.Name}}", - "--device-set", - "cdrom0", - "--iface", - "ide" - ], - [ - "set", - "{{.Name}}", - "--device-del", - "fdd0" - ], - [ - "set", - "{{.Name}}", - "--device-del", - "parallel0" - ] - ], - "prlctl_version_file": ".prlctl_version", - "shutdown_command": "echo 'vagrant' | su -m root -c 'shutdown -p now'", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "type": "parallels-iso", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<esc><wait>", - "boot -s<wait>", - "<enter><wait>", - "<wait10><wait10>", - "/bin/sh<enter><wait>", - "mdmfs -s 100m md1 /tmp<enter><wait>", - "mdmfs -s 100m md2 /mnt<enter><wait>", - "dhclient -p /tmp/dhclient.vtnet0.pid -l /tmp/dhclient.lease.vtnet0 vtnet0<enter><wait>", - "fetch -o /tmp/installerconfig http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} \u0026\u0026 bsdinstall script /tmp/installerconfig<enter><wait>" - ], - "boot_wait": "7s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "headless": "{{ user `headless` }}", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-qemu", - "shutdown_command": "echo 'vagrant' | su -m root -c 'shutdown -p now'", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "type": "qemu", - "vm_name": "{{ user `template` }}", - "qemuargs": [ - [ "-m", "{{ user `memory` }}" ], - [ "-display", "{{ user `qemu_display` }}" ] - ] - } - ], - "post-processors": [ - { - "output": "{{ user `build_directory` }}/{{user `box_basename`}}.{{.Provider}}.box", - "type": "vagrant", - "vagrantfile_template": "{{template_dir}}/vagrantfile_templates/freebsd.rb" - } - ], - "provisioners": [ - { - "environment_vars": [ - "HOME_DIR=/home/vagrant", - "http_proxy={{user `http_proxy`}}", - "https_proxy={{user `https_proxy`}}", - "no_proxy={{user `no_proxy`}}", - "pkg_branch={{user `pkg_branch`}}" - ], - "execute_command": "echo 'vagrant' | {{.Vars}} su -m root -c 'sh -eux {{.Path}}'", - "expect_disconnect": true, - "scripts": [ - "{{template_dir}}/scripts/update.sh", - "{{template_dir}}/scripts/postinstall.sh", - "{{template_dir}}/scripts/sudoers.sh", - "{{template_dir}}/../_common/vagrant.sh", - "{{template_dir}}/scripts/vmtools.sh", - "{{template_dir}}/scripts/cleanup.sh", - "{{template_dir}}/scripts/minimize.sh" - ], - "type": "shell" - } - ], - "variables": { - "box_basename": "freebsd-11.4-i386", - "build_directory": "../../builds", - "build_timestamp": "{{isotime \"20060102150405\"}}", - "cpus": "2", - "disk_size": "40960", - "git_revision": "__unknown_git_revision__", - "headless": "", - "http_directory": "{{template_dir}}/http", - "http_proxy": "{{env `http_proxy`}}", - "https_proxy": "{{env `https_proxy`}}", - "install_path": "freebsd-11/installerconfig", - "iso_checksum": "cab3c03fc45b84bffcf818d11147af491eb0226be4bf8e4092b1ecafdc096d33", - "iso_name": "FreeBSD-11.4-RELEASE-i386-disc1.iso", - "memory": "1024", - "mirror": "https://download.freebsd.org/ftp", - "mirror_directory": "releases/i386/i386/ISO-IMAGES/11.4", - "name": "freebsd-11.4-i386", - "no_proxy": "{{env `no_proxy`}}", - "pkg_branch": "quarterly", - "qemu_display": "none", - "template": "freebsd-11.4-i386", - "version": "TIMESTAMP" - } -} From f68fe82bfd3716c73f451471c54fc4d08419d8ef Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Thu, 23 Dec 2021 10:29:07 -0800 Subject: [PATCH 1451/1622] Add freebsd-12.3-i386 Signed-off-by: Tim Smith <tsmith@chef.io> --- .../freebsd/freebsd-12.3-i386.json | 211 ++++++++++++++++++ 1 file changed, 211 insertions(+) create mode 100644 packer_templates/freebsd/freebsd-12.3-i386.json diff --git a/packer_templates/freebsd/freebsd-12.3-i386.json b/packer_templates/freebsd/freebsd-12.3-i386.json new file mode 100644 index 000000000..d5bcf26c2 --- /dev/null +++ b/packer_templates/freebsd/freebsd-12.3-i386.json @@ -0,0 +1,211 @@ +{ + "builders": [ + { + "boot_command": [ + "<esc><wait>", + "boot -s<wait>", + "<enter><wait>", + "<wait10><wait10>", + "/bin/sh<enter><wait>", + "mdmfs -s 100m md1 /tmp<enter><wait>", + "mdmfs -s 100m md2 /mnt<enter><wait>", + "dhclient -p /tmp/dhclient.em0.pid -l /tmp/dhclient.lease.em0 em0<enter><wait>", + "fetch -o /tmp/installerconfig http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} \u0026\u0026 bsdinstall script /tmp/installerconfig<enter><wait>" + ], + "boot_wait": "5s", + "cpus": "{{ user `cpus` }}", + "disk_size": "{{user `disk_size`}}", + "guest_additions_mode": "disable", + "guest_os_type": "FreeBSD", + "headless": "{{ user `headless` }}", + "http_directory": "{{user `http_directory`}}", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "memory": "{{ user `memory` }}", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-virtualbox", + "shutdown_command": "echo 'vagrant' | su -m root -c 'shutdown -p now'", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_timeout": "10000s", + "ssh_username": "vagrant", + "type": "virtualbox-iso", + "virtualbox_version_file": ".vbox_version", + "vm_name": "{{ user `template` }}" + }, + { + "boot_command": [ + "<esc><wait>", + "boot -s<wait>", + "<enter><wait>", + "<wait10><wait10>", + "/bin/sh<enter><wait>", + "mdmfs -s 100m md1 /tmp<enter><wait>", + "mdmfs -s 100m md2 /mnt<enter><wait>", + "dhclient -p /tmp/dhclient.em0.pid -l /tmp/dhclient.lease.em0 em0<enter><wait>", + "<wait5>", + "fetch -o /tmp/installerconfig http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} \u0026\u0026 bsdinstall script /tmp/installerconfig<enter><wait>" + ], + "boot_wait": "5s", + "cpus": "{{ user `cpus` }}", + "disk_size": "{{user `disk_size`}}", + "guest_os_type": "freebsd", + "headless": "{{ user `headless` }}", + "http_directory": "{{user `http_directory`}}", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "memory": "{{ user `memory` }}", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-vmware", + "shutdown_command": "echo 'vagrant' | su -m root -c 'shutdown -p now'", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_timeout": "10000s", + "ssh_username": "vagrant", + "type": "vmware-iso", + "vm_name": "{{ user `template` }}", + "vmx_data": { + "cpuid.coresPerSocket": "1" + }, + "vmx_remove_ethernet_interfaces": true + }, + { + "boot_command": [ + "<esc><wait>", + "boot -s<wait>", + "<enter><wait>", + "<wait10><wait10>", + "/bin/sh<enter><wait>", + "mdmfs -s 100m md1 /tmp<enter><wait>", + "mdmfs -s 100m md2 /mnt<enter><wait>", + "dhclient -p /tmp/dhclient.em0.pid -l /tmp/dhclient.lease.em0 em0<enter><wait>", + "fetch -o /tmp/installerconfig http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} \u0026\u0026 bsdinstall script /tmp/installerconfig<enter><wait>" + ], + "boot_wait": "8s", + "cpus": "{{ user `cpus` }}", + "disk_size": "{{user `disk_size`}}", + "guest_os_type": "freebsd", + "http_directory": "{{user `http_directory`}}", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "memory": "{{ user `memory` }}", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-parallels", + "parallels_tools_mode": "disable", + "prlctl": [ + [ + "set", + "{{.Name}}", + "--device-set", + "cdrom0", + "--iface", + "ide" + ], + [ + "set", + "{{.Name}}", + "--device-del", + "fdd0" + ], + [ + "set", + "{{.Name}}", + "--device-del", + "parallel0" + ] + ], + "prlctl_version_file": ".prlctl_version", + "shutdown_command": "echo 'vagrant' | su -m root -c 'shutdown -p now'", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_timeout": "10000s", + "ssh_username": "vagrant", + "type": "parallels-iso", + "vm_name": "{{ user `template` }}" + }, + { + "boot_command": [ + "<esc><wait>", + "boot -s<wait>", + "<enter><wait>", + "<wait10><wait10>", + "/bin/sh<enter><wait>", + "mdmfs -s 100m md1 /tmp<enter><wait>", + "mdmfs -s 100m md2 /mnt<enter><wait>", + "dhclient -p /tmp/dhclient.vtnet0.pid -l /tmp/dhclient.lease.vtnet0 vtnet0<enter><wait>", + "fetch -o /tmp/installerconfig http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} \u0026\u0026 bsdinstall script /tmp/installerconfig<enter><wait>" + ], + "boot_wait": "7s", + "cpus": "{{ user `cpus` }}", + "disk_size": "{{user `disk_size`}}", + "headless": "{{ user `headless` }}", + "http_directory": "{{user `http_directory`}}", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "memory": "{{ user `memory` }}", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-qemu", + "shutdown_command": "echo 'vagrant' | su -m root -c 'shutdown -p now'", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_timeout": "10000s", + "ssh_username": "vagrant", + "type": "qemu", + "vm_name": "{{ user `template` }}", + "qemuargs": [ + [ "-m", "{{ user `memory` }}" ], + [ "-display", "{{ user `qemu_display` }}" ] + ] + } + ], + "post-processors": [ + { + "output": "{{ user `build_directory` }}/{{user `box_basename`}}.{{.Provider}}.box", + "type": "vagrant", + "vagrantfile_template": "{{template_dir}}/vagrantfile_templates/freebsd.rb" + } + ], + "provisioners": [ + { + "environment_vars": [ + "HOME_DIR=/home/vagrant", + "http_proxy={{user `http_proxy`}}", + "https_proxy={{user `https_proxy`}}", + "no_proxy={{user `no_proxy`}}", + "pkg_branch={{user `pkg_branch`}}" + ], + "execute_command": "echo 'vagrant' | {{.Vars}} su -m root -c 'sh -eux {{.Path}}'", + "expect_disconnect": true, + "scripts": [ + "{{template_dir}}/scripts/update.sh", + "{{template_dir}}/scripts/postinstall.sh", + "{{template_dir}}/scripts/sudoers.sh", + "{{template_dir}}/../_common/vagrant.sh", + "{{template_dir}}/scripts/vmtools.sh", + "{{template_dir}}/scripts/cleanup.sh", + "{{template_dir}}/scripts/minimize.sh" + ], + "type": "shell" + } + ], + "variables": { + "box_basename": "freebsd-12.3-i386", + "build_directory": "../../builds", + "build_timestamp": "{{isotime \"20060102150405\"}}", + "cpus": "2", + "disk_size": "40960", + "git_revision": "__unknown_git_revision__", + "headless": "", + "http_directory": "{{template_dir}}/http", + "http_proxy": "{{env `http_proxy`}}", + "https_proxy": "{{env `https_proxy`}}", + "install_path": "freebsd-11/installerconfig", + "iso_checksum": "cc90ab819d3fc4782227fc4269ea7de0747c007cfca9df905f9e50c8617fd820", + "iso_name": "FreeBSD-12.3-RELEASE-i386-disc1.iso", + "memory": "1024", + "mirror": "https://download.freebsd.org/ftp", + "mirror_directory": "releases/i386/i386/ISO-IMAGES/12.3", + "name": "freebsd-12.3-i386", + "no_proxy": "{{env `no_proxy`}}", + "pkg_branch": "quarterly", + "qemu_display": "none", + "template": "freebsd-12.3-i386", + "version": "TIMESTAMP" + } +} From 5f8d3dc18177b6ec372a2580770c5afc75e250db Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@gmail.com> Date: Thu, 23 Dec 2021 16:05:16 -0800 Subject: [PATCH 1452/1622] Fix Ubuntu 21.10 vmware builds and update builds.yml --- builds.yml | 5 ++--- packer_templates/ubuntu/ubuntu-21.10-amd64.json | 1 - 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/builds.yml b/builds.yml index 95eaadf79..2b46c0d77 100644 --- a/builds.yml +++ b/builds.yml @@ -16,17 +16,16 @@ public: - 'debian-11.2' - 'fedora-33' - 'fedora-34' -- 'freebsd-11.4-i386' -- 'freebsd-11.4' - 'freebsd-12.2-i386' - 'freebsd-12.2' +- 'freebsd-12.3-i386' - 'freebsd-12.3' - 'freebsd-13.0' - 'opensuse-leap-15.3' - 'oracle-6.10-i386' - 'oracle-6.10' - 'oracle-7.9' -- 'oracle-8.3' +- 'oracle-8.5' - 'rockylinux-8.5' - 'scientific-7.9' - 'springdalelinux-7.9' diff --git a/packer_templates/ubuntu/ubuntu-21.10-amd64.json b/packer_templates/ubuntu/ubuntu-21.10-amd64.json index a341537c9..c4fb77313 100644 --- a/packer_templates/ubuntu/ubuntu-21.10-amd64.json +++ b/packer_templates/ubuntu/ubuntu-21.10-amd64.json @@ -70,7 +70,6 @@ ], "boot_wait": "5s", "cpus": "{{ user `cpus` }}", - "disk_adapter_type": "sata", "disk_size": "{{user `disk_size`}}", "guest_os_type": "ubuntu-64", "headless": "{{ user `headless` }}", From 9f04c1f5f60a797c0be7f37c7e34a5b8a230a7ce Mon Sep 17 00:00:00 2001 From: "Jason A. Staph" <jstaph@staph.us> Date: Thu, 6 Jan 2022 15:52:29 -0500 Subject: [PATCH 1453/1622] remove Fedora 33 and add Fedora 35 --- builds.yml | 2 +- .../{fedora-33-x86_64.json => fedora-35-x86_64.json} | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) rename packer_templates/fedora/{fedora-33-x86_64.json => fedora-35-x86_64.json} (95%) diff --git a/builds.yml b/builds.yml index 2b46c0d77..05d67c652 100644 --- a/builds.yml +++ b/builds.yml @@ -14,8 +14,8 @@ public: - 'debian-11.2-arm64' - 'debian-11.2-i386' - 'debian-11.2' -- 'fedora-33' - 'fedora-34' +- 'fedora-35' - 'freebsd-12.2-i386' - 'freebsd-12.2' - 'freebsd-12.3-i386' diff --git a/packer_templates/fedora/fedora-33-x86_64.json b/packer_templates/fedora/fedora-35-x86_64.json similarity index 95% rename from packer_templates/fedora/fedora-33-x86_64.json rename to packer_templates/fedora/fedora-35-x86_64.json index 1ed58d8f7..0f58a0208 100644 --- a/packer_templates/fedora/fedora-33-x86_64.json +++ b/packer_templates/fedora/fedora-35-x86_64.json @@ -163,7 +163,7 @@ ], "variables": { "arch": "64", - "box_basename": "fedora-33", + "box_basename": "fedora-35", "build_directory": "../../builds", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "2", @@ -174,16 +174,16 @@ "http_directory": "{{template_dir}}/http", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", - "iso_checksum": "4fe38b45a4c788927ddfdfb224c414f138226a75f27a287995d802cba3cb89d4", - "iso_name": "Fedora-Server-dvd-x86_64-33-1.2.iso", + "iso_checksum": "sha256:3fe521d6c7b12c167f3ac4adab14c1f344dd72136ba577aa2bcc4a67bcce2bc6", + "iso_name": "Fedora-Server-dvd-x86_64-35-1.2.iso", "ks_path": "ks-fedora.cfg", "memory": "1024", "mirror": "http://download.fedoraproject.org/pub/fedora/linux", - "mirror_directory": "releases/33/Server/x86_64/iso", - "name": "fedora-33", + "mirror_directory": "releases/35/Server/x86_64/iso", + "name": "fedora-35", "no_proxy": "{{env `no_proxy`}}", "qemu_display": "none", - "template": "fedora-33-x86_64", + "template": "fedora-35-x86_64", "boot_command": "<up><wait><tab> inst.text inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>", "version": "TIMESTAMP" } From 7644802b7ad1f7e7e930acbd45fb16392015457f Mon Sep 17 00:00:00 2001 From: "Jason A. Staph" <jstaph@staph.us> Date: Thu, 6 Jan 2022 16:01:01 -0500 Subject: [PATCH 1454/1622] remove Fedora 33 add Fedora 35 add update script to Fedora 35 build Developer's Certificate of Origin 1.1 By making a contribution to this project, I certify that: (a) The contribution was created in whole or in part by me and I have the right to submit it under the open source license indicated in the file; or (b) The contribution is based upon previous work that, to the best of my knowledge, is covered under an appropriate open source license and I have the right under that license to submit that work with modifications, whether created in whole or in part by me, under the same open source license (unless I am permitted to submit under a different license), as Indicated in the file; or (c) The contribution was provided directly to me by some other person who certified (a), (b) or (c) and I have not modified it. (d) I understand and agree that this project and the contribution are public and that a record of the contribution (including all personal information I submit with it, including my sign-off) is maintained indefinitely and may be redistributed consistent with this project or the open source license(s) involved. --- packer_templates/fedora/fedora-35-x86_64.json | 1 + packer_templates/fedora/scripts/update.sh | 6 ++++++ 2 files changed, 7 insertions(+) create mode 100644 packer_templates/fedora/scripts/update.sh diff --git a/packer_templates/fedora/fedora-35-x86_64.json b/packer_templates/fedora/fedora-35-x86_64.json index 0f58a0208..f73049f43 100644 --- a/packer_templates/fedora/fedora-35-x86_64.json +++ b/packer_templates/fedora/fedora-35-x86_64.json @@ -145,6 +145,7 @@ "expect_disconnect": true, "scripts": [ "{{template_dir}}/scripts/fix-slow-dns.sh", + "{{template_dir}}/scripts/update.sh", "{{template_dir}}/scripts/build-tools.sh", "{{template_dir}}/scripts/install-supporting-packages.sh", "{{template_dir}}/../_common/motd.sh", diff --git a/packer_templates/fedora/scripts/update.sh b/packer_templates/fedora/scripts/update.sh new file mode 100644 index 000000000..7b5219af0 --- /dev/null +++ b/packer_templates/fedora/scripts/update.sh @@ -0,0 +1,6 @@ +#!/bin/sh -eux + +dnf -y update + +reboot; +sleep 60; From 0051d904192147b6e34d66fba5c451b7e7b7ff0d Mon Sep 17 00:00:00 2001 From: "Jason A. Staph" <jstaph@staph.us> Date: Thu, 6 Jan 2022 16:50:23 -0500 Subject: [PATCH 1455/1622] Developer's Certificate of Origin 1.1 By making a contribution to this project, I certify that: (a) The contribution was created in whole or in part by me and I have the right to submit it under the open source license indicated in the file; or (b) The contribution is based upon previous work that, to the best of my knowledge, is covered under an appropriate open source license and I have the right under that license to submit that work with modifications, whether created in whole or in part by me, under the same open source license (unless I am permitted to submit under a different license), as Indicated in the file; or (c) The contribution was provided directly to me by some other person who certified (a), (b) or (c) and I have not modified it. (d) I understand and agree that this project and the contribution are public and that a record of the contribution (including all personal information I submit with it, including my sign-off) is maintained indefinitely and may be redistributed consistent with this project or the open source license(s) involved. Signed-off-by: Jason Staph <jstaph@staph.us> From e73314ab94c2d47b21e168a31b76b1dd804d6428 Mon Sep 17 00:00:00 2001 From: Joe Ferguson <joe@joeferguson.me> Date: Sun, 27 Feb 2022 10:19:25 -0600 Subject: [PATCH 1456/1622] Update Ubuntu 20.04 to 20.04.4 Signed-off-by: joe Ferguson <joe@joeferguson.me> --- packer_templates/ubuntu/ubuntu-20.04-amd64.json | 4 ++-- packer_templates/ubuntu/ubuntu-20.04-arm64.json | 4 ++-- packer_templates/ubuntu/ubuntu-20.04-live-amd64.json | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/packer_templates/ubuntu/ubuntu-20.04-amd64.json b/packer_templates/ubuntu/ubuntu-20.04-amd64.json index e24330968..1984bf227 100644 --- a/packer_templates/ubuntu/ubuntu-20.04-amd64.json +++ b/packer_templates/ubuntu/ubuntu-20.04-amd64.json @@ -239,8 +239,8 @@ "https_proxy": "{{env `https_proxy`}}", "hyperv_generation": "2", "hyperv_switch": "bento", - "iso_checksum": "f8e3086f3cea0fb3fefb29937ab5ed9d19e767079633960ccb50e76153effc98", - "iso_name": "ubuntu-20.04.3-live-server-amd64.iso", + "iso_checksum": "28ccdb56450e643bad03bb7bcf7507ce3d8d90e8bf09e38f6bd9ac298a98eaad", + "iso_name": "ubuntu-20.04.4-live-server-amd64.iso", "memory": "1024", "mirror": "http://releases.ubuntu.com", "mirror_directory": "focal", diff --git a/packer_templates/ubuntu/ubuntu-20.04-arm64.json b/packer_templates/ubuntu/ubuntu-20.04-arm64.json index 21be87479..904f5fdcd 100644 --- a/packer_templates/ubuntu/ubuntu-20.04-arm64.json +++ b/packer_templates/ubuntu/ubuntu-20.04-arm64.json @@ -78,8 +78,8 @@ "https_proxy": "{{env `https_proxy`}}", "hyperv_generation": "2", "hyperv_switch": "bento", - "iso_checksum": "d6fea1f11b4d23b481a48198f51d9b08258a36f6024cb5cec447fe78379959ce", - "iso_name": "ubuntu-20.04.3-live-server-arm64.iso", + "iso_checksum": "fef8bc204d2b09b579b9d40dfd8c5a084f8084a9bffafe8a0f39a0e53606312d", + "iso_name": "ubuntu-20.04.4-live-server-arm64.iso", "memory": "1024", "mirror": "http://cdimage.ubuntu.com", "mirror_directory": "releases/20.04/release", diff --git a/packer_templates/ubuntu/ubuntu-20.04-live-amd64.json b/packer_templates/ubuntu/ubuntu-20.04-live-amd64.json index 8bba3e3aa..6712d2188 100644 --- a/packer_templates/ubuntu/ubuntu-20.04-live-amd64.json +++ b/packer_templates/ubuntu/ubuntu-20.04-live-amd64.json @@ -239,8 +239,8 @@ "https_proxy": "{{env `https_proxy`}}", "hyperv_generation": "2", "hyperv_switch": "bento", - "iso_checksum": "f8e3086f3cea0fb3fefb29937ab5ed9d19e767079633960ccb50e76153effc98", - "iso_name": "ubuntu-20.04.3-live-server-amd64.iso", + "iso_checksum": "28ccdb56450e643bad03bb7bcf7507ce3d8d90e8bf09e38f6bd9ac298a98eaad", + "iso_name": "ubuntu-20.04.4-live-server-amd64.iso", "memory": "1024", "mirror": "http://releases.ubuntu.com", "mirror_directory": "20.04", From 51e8eff53c51c871dfc897b8e1aeef8a9a0c2b09 Mon Sep 17 00:00:00 2001 From: Ashique P S <Ashique.saidalavi@progress.com> Date: Wed, 23 Mar 2022 15:17:45 +0530 Subject: [PATCH 1457/1622] Updated the documentation (#1399) * Updated the documentation Signed-off-by: Ashique Saidalavi <ashique.saidalavi@progress.com> --- README.md | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/README.md b/README.md index 80ebb582c..501baa0fa 100644 --- a/README.md +++ b/README.md @@ -34,6 +34,22 @@ end \***NOTE:** support for these providers is considered experimental and corresponding Vagrant Cloud images may or may not exist. +#### Using `bento` executable +To build a Debian vagrant box using the bento tool with the template available in the `packer_templates` dir, we can use the following command: + +``` +bento build --cpus 2 packer_templates/debian/debian-11.2-i386.json +``` + +Other available options: +- cpus - Specify the number of CPUs needed in the new build. +- mem - Specify the memory +- mirror - The template will have a default mirror link, if you wish to use an alternative one, you can utilise this configuration. +- dry-run - This will not create any build, but will create a metadata file for reference. +- debug - Print the debug logs +- headed - Packer will be building VirtualBox virtual machines by launching a GUI that shows the console of the machine being built. This option is false by default +- single - This can be used to disable the parallel builds. + #### Using `packer` To build an Ubuntu 18.04 box for only the VirtualBox provider @@ -108,6 +124,13 @@ Hyper-V Gen 2 VMs do not support floppy drives. If you previously provided resou - `autounattend.xml`: The Gen 2 `autounattend.xml` file supports EFI partitions. Update the `autounattend.xml` with the correct Windows version for your systems and ensure that the partitions are correct for your situation. You also need to manage the driver disk that holds the hyper-v guest services drivers and adjust the `autounattend.xml` file as appropriate. - `base_setup.ps1` +### Testing the build with the test-kitchen +If you have successfully built a vagrant box using the bento tool, you should have the vagrant box and a metadata file in the `builds` folder. You can use these files to test the build with a test-kitchen configuration. Place your `kitchen.yml.erb` and `bootstrap.sh.erb` files inside the `templates` directory and run the following command to test the build. + +``` +bento test +``` + ## Bugs and Issues Please use GitHub issues to report bugs, features, or other problems. From 118ad132f6bd7c09cbf40b4933281d32dfe139fe Mon Sep 17 00:00:00 2001 From: SG <13872653+mmguero@users.noreply.github.com> Date: Mon, 4 Apr 2022 10:19:13 -0600 Subject: [PATCH 1458/1622] Update templates for Debian 11.3 release (#1400) Signed-off-by: SG <13872653+mmguero@users.noreply.github.com> --- README.md | 6 +++--- builds.yml | 6 +++--- ...debian-11.2-amd64.json => debian-11.3-amd64.json} | 12 ++++++------ ...debian-11.2-arm64.json => debian-11.3-arm64.json} | 12 ++++++------ .../{debian-11.2-i386.json => debian-11.3-i386.json} | 12 ++++++------ 5 files changed, 24 insertions(+), 24 deletions(-) rename packer_templates/debian/{debian-11.2-amd64.json => debian-11.3-amd64.json} (96%) rename packer_templates/debian/{debian-11.2-arm64.json => debian-11.3-arm64.json} (92%) rename packer_templates/debian/{debian-11.2-i386.json => debian-11.3-i386.json} (96%) diff --git a/README.md b/README.md index 501baa0fa..127aa74ca 100644 --- a/README.md +++ b/README.md @@ -38,7 +38,7 @@ end To build a Debian vagrant box using the bento tool with the template available in the `packer_templates` dir, we can use the following command: ``` -bento build --cpus 2 packer_templates/debian/debian-11.2-i386.json +bento build --cpus 2 packer_templates/debian/debian-11.3-i386.json ``` Other available options: @@ -59,11 +59,11 @@ $ cd packer_templates/ubuntu $ packer build -only=virtualbox-iso ubuntu-18.04-amd64.json ``` -To build Debian 11.2 32bit boxes for all possible providers (simultaneously) +To build Debian 11.3 32bit boxes for all possible providers (simultaneously) ``` $ cd packer_templates/debian -$ packer build debian-11.2-i386.json +$ packer build debian-11.3-i386.json ``` To build CentOS 7.7 boxes for all providers except VMware and Parallels diff --git a/builds.yml b/builds.yml index 05d67c652..acb2dcde6 100644 --- a/builds.yml +++ b/builds.yml @@ -11,9 +11,9 @@ public: - 'debian-10.11-arm64' - 'debian-10.11-i386' - 'debian-10.11' -- 'debian-11.2-arm64' -- 'debian-11.2-i386' -- 'debian-11.2' +- 'debian-11.3-arm64' +- 'debian-11.3-i386' +- 'debian-11.3' - 'fedora-34' - 'fedora-35' - 'freebsd-12.2-i386' diff --git a/packer_templates/debian/debian-11.2-amd64.json b/packer_templates/debian/debian-11.3-amd64.json similarity index 96% rename from packer_templates/debian/debian-11.2-amd64.json rename to packer_templates/debian/debian-11.3-amd64.json index 1230fa8a4..3a121789f 100644 --- a/packer_templates/debian/debian-11.2-amd64.json +++ b/packer_templates/debian/debian-11.3-amd64.json @@ -197,7 +197,7 @@ } ], "variables": { - "box_basename": "debian-11.2", + "box_basename": "debian-11.3", "build_directory": "../../builds", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "2", @@ -208,16 +208,16 @@ "http_directory": "{{template_dir}}/http", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", - "iso_checksum": "45c9feabba213bdc6d72e7469de71ea5aeff73faea6bfb109ab5bad37c3b43bd", - "iso_name": "debian-11.2.0-amd64-netinst.iso", + "iso_checksum": "7892981e1da216e79fb3a1536ce5ebab157afdd20048fe458f2ae34fbc26c19b", + "iso_name": "debian-11.3.0-amd64-netinst.iso", "memory": "1024", "mirror": "http://cdimage.debian.org/cdimage/release", - "mirror_directory": "11.2.0/amd64/iso-cd", - "name": "debian-11.2", + "mirror_directory": "11.3.0/amd64/iso-cd", + "name": "debian-11.3", "no_proxy": "{{env `no_proxy`}}", "preseed_path": "debian-9/preseed.cfg", "qemu_display": "none", - "template": "debian-11.2-amd64", + "template": "debian-11.3-amd64", "version": "TIMESTAMP" } } diff --git a/packer_templates/debian/debian-11.2-arm64.json b/packer_templates/debian/debian-11.3-arm64.json similarity index 92% rename from packer_templates/debian/debian-11.2-arm64.json rename to packer_templates/debian/debian-11.3-arm64.json index 506a861f3..532f1e5dd 100644 --- a/packer_templates/debian/debian-11.2-arm64.json +++ b/packer_templates/debian/debian-11.3-arm64.json @@ -76,7 +76,7 @@ } ], "variables": { - "box_basename": "debian-11.2-arm64", + "box_basename": "debian-11.3-arm64", "build_directory": "../../builds", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "2", @@ -87,16 +87,16 @@ "http_directory": "{{template_dir}}/http", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", - "iso_checksum": "6dd3f42f84597ba87d3b71d50d69dca2a3b4138cbd7b007cea3d4ba81cc51493", - "iso_name": "debian-11.2.0-arm64-netinst.iso", + "iso_checksum": "5420115f57a4961c6fb8b31e3eb4c7058d730251837749a27d5878775679c519", + "iso_name": "debian-11.3.0-arm64-netinst.iso", "memory": "1024", "mirror": "http://cdimage.debian.org/cdimage/release", - "mirror_directory": "11.2.0/arm64/iso-cd", - "name": "debian-11.2-arm64", + "mirror_directory": "11.3.0/arm64/iso-cd", + "name": "debian-11.3-arm64", "no_proxy": "{{env `no_proxy`}}", "preseed_path": "debian-9/preseed.cfg", "qemu_display": "none", - "template": "debian-11.2-arm64", + "template": "debian-11.3-arm64", "version": "TIMESTAMP" } } diff --git a/packer_templates/debian/debian-11.2-i386.json b/packer_templates/debian/debian-11.3-i386.json similarity index 96% rename from packer_templates/debian/debian-11.2-i386.json rename to packer_templates/debian/debian-11.3-i386.json index 125d6abd8..acce23799 100644 --- a/packer_templates/debian/debian-11.2-i386.json +++ b/packer_templates/debian/debian-11.3-i386.json @@ -197,7 +197,7 @@ } ], "variables": { - "box_basename": "debian-11.2-i386", + "box_basename": "debian-11.3-i386", "build_directory": "../../builds", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "2", @@ -208,16 +208,16 @@ "http_directory": "{{template_dir}}/http", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", - "iso_checksum": "14f7758c2ee5d33b751d0dd7d00c77c6482f9b3be59ea39da9338aa07a062972", - "iso_name": "debian-11.2.0-i386-netinst.iso", + "iso_checksum": "196770582e9f4f4d34cf412ccdf8118b247e90274843055d627b97ed65a2c5ca", + "iso_name": "debian-11.3.0-i386-netinst.iso", "memory": "1024", "mirror": "http://cdimage.debian.org/cdimage/release", - "mirror_directory": "11.2.0/i386/iso-cd", - "name": "debian-11.2-i386", + "mirror_directory": "11.3.0/i386/iso-cd", + "name": "debian-11.3-i386", "no_proxy": "{{env `no_proxy`}}", "preseed_path": "debian-9/preseed.cfg", "qemu_display": "none", - "template": "debian-11.2-i386", + "template": "debian-11.3-i386", "version": "TIMESTAMP" } } From 1e6bf82a009b5bd32535851eac2bdabfbaa343e9 Mon Sep 17 00:00:00 2001 From: kartnico <kartnico@kartzone.info> Date: Thu, 21 Apr 2022 09:48:04 +0200 Subject: [PATCH 1459/1622] feat(debian): add qemu_bios and boot_command variable for Debian 11.3 amd64 Signed-off-by: kartnico <kartnico@kartzone.info> --- .../debian/debian-11.3-amd64.json | 79 ++----------------- 1 file changed, 7 insertions(+), 72 deletions(-) diff --git a/packer_templates/debian/debian-11.3-amd64.json b/packer_templates/debian/debian-11.3-amd64.json index 3a121789f..45f1a9ff0 100644 --- a/packer_templates/debian/debian-11.3-amd64.json +++ b/packer_templates/debian/debian-11.3-amd64.json @@ -1,24 +1,7 @@ { "builders": [ { - "boot_command": [ - "<esc><wait>", - "install <wait>", - " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}} <wait>", - "debian-installer=en_US.UTF-8 <wait>", - "auto <wait>", - "locale=en_US.UTF-8 <wait>", - "kbd-chooser/method=us <wait>", - "keyboard-configuration/xkb-keymap=us <wait>", - "netcfg/get_hostname={{ .Name }} <wait>", - "netcfg/get_domain=vagrantup.com <wait>", - "fb=false <wait>", - "debconf/frontend=noninteractive <wait>", - "console-setup/ask_detect=false <wait>", - "console-keymaps-at/keymap=us <wait>", - "grub-installer/bootdev=/dev/sda <wait>", - "<enter><wait>" - ], + "boot_command": "{{user `boot_command`}}", "boot_wait": "5s", "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", @@ -42,24 +25,7 @@ "vm_name": "{{ user `template` }}" }, { - "boot_command": [ - "<esc><wait>", - "install <wait>", - " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}} <wait>", - "debian-installer=en_US.UTF-8 <wait>", - "auto <wait>", - "locale=en_US.UTF-8 <wait>", - "kbd-chooser/method=us <wait>", - "keyboard-configuration/xkb-keymap=us <wait>", - "netcfg/get_hostname={{ .Name }} <wait>", - "netcfg/get_domain=vagrantup.com <wait>", - "fb=false <wait>", - "debconf/frontend=noninteractive <wait>", - "console-setup/ask_detect=false <wait>", - "console-keymaps-at/keymap=us <wait>", - "grub-installer/bootdev=/dev/sda <wait>", - "<enter><wait>" - ], + "boot_command": "{{user `boot_command`}}", "boot_wait": "5s", "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", @@ -85,24 +51,7 @@ "vmx_remove_ethernet_interfaces": true }, { - "boot_command": [ - "<esc><wait>", - "install <wait>", - " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}} <wait>", - "debian-installer=en_US.UTF-8 <wait>", - "auto <wait>", - "locale=en_US.UTF-8 <wait>", - "kbd-chooser/method=us <wait>", - "keyboard-configuration/xkb-keymap=us <wait>", - "netcfg/get_hostname={{ .Name }} <wait>", - "netcfg/get_domain=vagrantup.com <wait>", - "fb=false <wait>", - "debconf/frontend=noninteractive <wait>", - "console-setup/ask_detect=false <wait>", - "console-keymaps-at/keymap=us <wait>", - "grub-installer/bootdev=/dev/sda <wait>", - "<enter><wait>" - ], + "boot_command": "{{user `boot_command`}}", "boot_wait": "5s", "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", @@ -123,24 +72,7 @@ "vm_name": "{{ user `template` }}" }, { - "boot_command": [ - "<esc><wait>", - "install <wait>", - " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}} <wait>", - "debian-installer=en_US.UTF-8 <wait>", - "auto <wait>", - "locale=en_US.UTF-8 <wait>", - "kbd-chooser/method=us <wait>", - "keyboard-configuration/xkb-keymap=us <wait>", - "netcfg/get_hostname={{ .Name }} <wait>", - "netcfg/get_domain=vagrantup.com <wait>", - "fb=false <wait>", - "debconf/frontend=noninteractive <wait>", - "console-setup/ask_detect=false <wait>", - "console-keymaps-at/keymap=us <wait>", - "grub-installer/bootdev=/dev/vda <wait>", - "<enter><wait>" - ], + "boot_command": "{{user `boot_command`}}", "boot_wait": "5s", "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", @@ -159,6 +91,7 @@ "vm_name": "{{ user `template` }}", "qemuargs": [ [ "-m", "{{ user `memory` }}" ], + [ "-bios", "{{ user `qemu_bios` }}" ], [ "-display", "{{ user `qemu_display` }}" ] ] } @@ -217,7 +150,9 @@ "no_proxy": "{{env `no_proxy`}}", "preseed_path": "debian-9/preseed.cfg", "qemu_display": "none", + "qemu_bios": "bios-256k.bin", "template": "debian-11.3-amd64", + "boot_command": "<esc><wait>install <wait> preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}} <wait>debian-installer=en_US.UTF-8 <wait>auto <wait>locale=en_US.UTF-8 <wait>kbd-chooser/method=us <wait>keyboard-configuration/xkb-keymap=us <wait>netcfg/get_hostname={{ .Name }} <wait>netcfg/get_domain=vagrantup.com <wait>fb=false <wait>debconf/frontend=noninteractive <wait>console-setup/ask_detect=false <wait>console-keymaps-at/keymap=us <wait>grub-installer/bootdev=default <wait><enter><wait>", "version": "TIMESTAMP" } } From eccf3fc3dabf3f338eab889ce3b231575acf422f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C3=BA=C5=A1=20Ko=C5=A1=C3=BAt?= <matuskosut@users.noreply.github.com> Date: Fri, 6 May 2022 14:29:31 +0200 Subject: [PATCH 1460/1622] add ubuntu 22.04 jammy template (#1404) Signed-off-by: Matus Kosut <matus.kosut@ntnu.no> Co-authored-by: Matus Kosut <matus.kosut@ntnu.no> --- packer_templates/ubuntu/scripts/cleanup.sh | 6 +- .../ubuntu/ubuntu-22.04-amd64.json | 284 ++++++++++++++++++ 2 files changed, 289 insertions(+), 1 deletion(-) create mode 100644 packer_templates/ubuntu/ubuntu-22.04-amd64.json diff --git a/packer_templates/ubuntu/scripts/cleanup.sh b/packer_templates/ubuntu/scripts/cleanup.sh index 035619ce1..e8bb47bdc 100644 --- a/packer_templates/ubuntu/scripts/cleanup.sh +++ b/packer_templates/ubuntu/scripts/cleanup.sh @@ -45,7 +45,11 @@ echo "remove obsolete networking packages" apt-get -y purge ppp pppconfig pppoeconf; echo "remove packages we don't need" -apt-get -y purge popularity-contest command-not-found friendly-recovery bash-completion fonts-ubuntu-font-family-console laptop-detect motd-news-config usbutils grub-legacy-ec2 +apt-get -y purge popularity-contest command-not-found friendly-recovery bash-completion laptop-detect motd-news-config usbutils grub-legacy-ec2 + +# 22.04+ don't have this +echo "remove the fonts-ubuntu-font-family-console" +apt-get -y purge fonts-ubuntu-font-family-console || true; # 21.04+ don't have this echo "remove the installation-report" diff --git a/packer_templates/ubuntu/ubuntu-22.04-amd64.json b/packer_templates/ubuntu/ubuntu-22.04-amd64.json new file mode 100644 index 000000000..fd24650b5 --- /dev/null +++ b/packer_templates/ubuntu/ubuntu-22.04-amd64.json @@ -0,0 +1,284 @@ +{ + "builders": [ + { + "boot_command": [ + " <wait>", + " <wait>", + " <wait>", + " <wait>", + " <wait>", + "c", + "<wait>", + "set gfxpayload=keep", + "<enter><wait>", + "linux /casper/vmlinuz quiet<wait>", + " autoinstall<wait>", + " ds=nocloud-net<wait>", + "\\;s=http://<wait>", + "{{.HTTPIP}}<wait>", + ":{{.HTTPPort}}/<wait>", + " ---", + "<enter><wait>", + "initrd /casper/initrd<wait>", + "<enter><wait>", + "boot<enter><wait>" + ], + "boot_wait": "5s", + "cpus": "{{ user `cpus` }}", + "disk_size": "{{user `disk_size`}}", + "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "guest_additions_url": "{{ user `guest_additions_url` }}", + "guest_os_type": "Ubuntu_64", + "hard_drive_interface": "sata", + "headless": "{{ user `headless` }}", + "http_directory": "{{user `http_directory`}}", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "memory": "{{ user `memory` }}", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-virtualbox", + "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_timeout": "10000s", + "ssh_username": "vagrant", + "type": "virtualbox-iso", + "virtualbox_version_file": ".vbox_version", + "vm_name": "{{ user `template` }}" + }, + { + "boot_command": [ + " <wait>", + " <wait>", + " <wait>", + " <wait>", + " <wait>", + "c", + "<wait>", + "set gfxpayload=keep", + "<enter><wait>", + "linux /casper/vmlinuz quiet<wait>", + " autoinstall<wait>", + " ds=nocloud-net<wait>", + "\\;s=http://<wait>", + "{{.HTTPIP}}<wait>", + ":{{.HTTPPort}}/<wait>", + " ---", + "<enter><wait>", + "initrd /casper/initrd<wait>", + "<enter><wait>", + "boot<enter><wait>" + ], + "boot_wait": "5s", + "cpus": "{{ user `cpus` }}", + "disk_size": "{{user `disk_size`}}", + "guest_os_type": "ubuntu-64", + "headless": "{{ user `headless` }}", + "http_directory": "{{user `http_directory`}}", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "memory": "{{ user `memory` }}", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-vmware", + "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_timeout": "10000s", + "ssh_username": "vagrant", + "tools_upload_flavor": "linux", + "type": "vmware-iso", + "vm_name": "{{ user `template` }}", + "vmx_data": { + "cpuid.coresPerSocket": "1", + "ethernet0.pciSlotNumber": "32" + }, + "vmx_remove_ethernet_interfaces": true + }, + { + "boot_command": [ + " <wait>", + " <wait>", + " <wait>", + " <wait>", + " <wait>", + "c", + "<wait>", + "set gfxpayload=keep", + "<enter><wait>", + "linux /casper/vmlinuz quiet<wait>", + " autoinstall<wait>", + " ds=nocloud-net<wait>", + "\\;s=http://<wait>", + "{{.HTTPIP}}<wait>", + ":{{.HTTPPort}}/<wait>", + " ---", + "<enter><wait>", + "initrd /casper/initrd<wait>", + "<enter><wait>", + "boot<enter><wait>" + ], + "boot_wait": "5s", + "cpus": "{{ user `cpus` }}", + "disk_size": "{{user `disk_size`}}", + "guest_os_type": "ubuntu", + "http_directory": "{{user `http_directory`}}", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "memory": "{{ user `memory` }}", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-parallels", + "parallels_tools_flavor": "lin", + "prlctl_version_file": ".prlctl_version", + "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_timeout": "10000s", + "ssh_username": "vagrant", + "type": "parallels-iso", + "vm_name": "{{ user `template` }}" + }, + { + "boot_command": [ + " <wait>", + " <wait>", + " <wait>", + " <wait>", + " <wait>", + "c", + "<wait>", + "set gfxpayload=keep", + "<enter><wait>", + "linux /casper/vmlinuz quiet<wait>", + " autoinstall<wait>", + " ds=nocloud-net<wait>", + "\\;s=http://<wait>", + "{{.HTTPIP}}<wait>", + ":{{.HTTPPort}}/<wait>", + " ---", + "<enter><wait>", + "initrd /casper/initrd<wait>", + "<enter><wait>", + "boot<enter><wait>" + ], + "boot_wait": "5s", + "cpus": "{{ user `cpus` }}", + "disk_size": "{{user `disk_size`}}", + "headless": "{{ user `headless` }}", + "http_directory": "{{user `http_directory`}}", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "memory": "{{ user `memory` }}", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-qemu", + "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_timeout": "10000s", + "ssh_username": "vagrant", + "type": "qemu", + "vm_name": "{{ user `template` }}", + "qemuargs": [ + [ "-m", "{{ user `memory` }}" ], + [ "-display", "{{ user `qemu_display` }}" ] + ] + }, + { + "boot_command": [ + " <wait>", + " <wait>", + " <wait>", + " <wait>", + " <wait>", + "c", + "<wait>", + "set gfxpayload=keep", + "<enter><wait>", + "linux /casper/vmlinuz quiet<wait>", + " autoinstall<wait>", + " ds=nocloud-net<wait>", + "\\;s=http://<wait>", + "{{.HTTPIP}}<wait>", + ":{{.HTTPPort}}/<wait>", + " ---", + "<enter><wait>", + "initrd /casper/initrd<wait>", + "<enter><wait>", + "boot<enter><wait>" + ], + "boot_wait": "5s", + "communicator": "ssh", + "cpus": "{{ user `cpus` }}", + "disk_size": "{{user `disk_size`}}", + "enable_secure_boot": false, + "generation": "{{user `hyperv_generation`}}", + "http_directory": "{{user `http_directory`}}", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "memory": "{{user `memory`}}", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-hyperv", + "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_timeout": "10000s", + "ssh_username": "vagrant", + "switch_name": "{{user `hyperv_switch`}}", + "type": "hyperv-iso", + "vm_name": "{{ user `template` }}" + } + ], + "post-processors": [ + { + "output": "{{ user `build_directory` }}/{{user `box_basename`}}.{{.Provider}}.box", + "type": "vagrant" + } + ], + "provisioners": [ + { + "environment_vars": [ + "HOME_DIR=/home/vagrant", + "http_proxy={{user `http_proxy`}}", + "https_proxy={{user `https_proxy`}}", + "no_proxy={{user `no_proxy`}}" + ], + "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", + "expect_disconnect": true, + "scripts": [ + "{{template_dir}}/scripts/update.sh", + "{{template_dir}}/../_common/motd.sh", + "{{template_dir}}/../_common/sshd.sh", + "{{template_dir}}/scripts/networking.sh", + "{{template_dir}}/scripts/sudoers.sh", + "{{template_dir}}/scripts/vagrant.sh", + "{{template_dir}}/../_common/virtualbox.sh", + "{{template_dir}}/scripts/vmware.sh", + "{{template_dir}}/../_common/parallels.sh", + "{{template_dir}}/scripts/hyperv.sh", + "{{template_dir}}/scripts/cleanup.sh", + "{{template_dir}}/../_common/minimize.sh" + ], + "type": "shell" + } + ], + "variables": { + "box_basename": "ubuntu-22.04", + "build_directory": "../../builds", + "build_timestamp": "{{isotime \"20060102150405\"}}", + "cpus": "2", + "disk_size": "65536", + "git_revision": "__unknown_git_revision__", + "guest_additions_url": "", + "headless": "", + "http_directory": "{{template_dir}}/http", + "http_proxy": "{{env `http_proxy`}}", + "https_proxy": "{{env `https_proxy`}}", + "hyperv_generation": "2", + "hyperv_switch": "bento", + "iso_checksum": "84aeaf7823c8c61baa0ae862d0a06b03409394800000b3235854a6b38eb4856f", + "iso_name": "ubuntu-22.04-live-server-amd64.iso", + "memory": "1024", + "mirror": "http://releases.ubuntu.com", + "mirror_directory": "jammy", + "name": "ubuntu-22.04", + "no_proxy": "{{env `no_proxy`}}", + "preseed_path": "preseed.cfg", + "qemu_display": "none", + "template": "ubuntu-22.04-amd64", + "version": "TIMESTAMP" + } +} From 39f22b8654ca7d7c84936baffc0ffcfe7c1ace76 Mon Sep 17 00:00:00 2001 From: jstaph <jstaph@users.noreply.github.com> Date: Wed, 18 May 2022 05:02:15 -0400 Subject: [PATCH 1461/1622] Developer's Certificate of Origin 1.1 (#1406) By making a contribution to this project, I certify that: (a) The contribution was created in whole or in part by me and I have the right to submit it under the open source license indicated in the file; or (b) The contribution is based upon previous work that, to the best of my knowledge, is covered under an appropriate open source license and I have the right under that license to submit that work with modifications, whether created in whole or in part by me, under the same open source license (unless I am permitted to submit under a different license), as Indicated in the file; or (c) The contribution was provided directly to me by some other person who certified (a), (b) or (c) and I have not modified it. (d) I understand and agree that this project and the contribution are public and that a record of the contribution (including all personal information I submit with it, including my sign-off) is maintained indefinitely and may be redistributed consistent with this project or the open source license(s) involved. Signed-off-by: Jason Staph <jstaph@staph.us> --- builds.yml | 4 ++-- ...{fedora-34-x86_64.json => fedora-36-x86_64.json} | 13 +++++++------ 2 files changed, 9 insertions(+), 8 deletions(-) rename packer_templates/fedora/{fedora-34-x86_64.json => fedora-36-x86_64.json} (95%) diff --git a/builds.yml b/builds.yml index acb2dcde6..e3308029e 100644 --- a/builds.yml +++ b/builds.yml @@ -14,8 +14,8 @@ public: - 'debian-11.3-arm64' - 'debian-11.3-i386' - 'debian-11.3' -- 'fedora-34' - 'fedora-35' +- 'fedora-36' - 'freebsd-12.2-i386' - 'freebsd-12.2' - 'freebsd-12.3-i386' @@ -44,7 +44,7 @@ slugs: 'debian-11': 'debian-11' 'debian-10': 'debian-10' 'debian-9': 'debian-9' - 'fedora-latest': 'fedora-34' + 'fedora-latest': 'fedora-36' 'freebsd-11': 'freebsd-11' 'freebsd-12': 'freebsd-12' 'freebsd-13': 'freebsd-13' diff --git a/packer_templates/fedora/fedora-34-x86_64.json b/packer_templates/fedora/fedora-36-x86_64.json similarity index 95% rename from packer_templates/fedora/fedora-34-x86_64.json rename to packer_templates/fedora/fedora-36-x86_64.json index b7a9bb1bb..c660f7859 100644 --- a/packer_templates/fedora/fedora-34-x86_64.json +++ b/packer_templates/fedora/fedora-36-x86_64.json @@ -145,6 +145,7 @@ "expect_disconnect": true, "scripts": [ "{{template_dir}}/scripts/fix-slow-dns.sh", + "{{template_dir}}/scripts/update.sh", "{{template_dir}}/scripts/build-tools.sh", "{{template_dir}}/scripts/install-supporting-packages.sh", "{{template_dir}}/../_common/motd.sh", @@ -163,7 +164,7 @@ ], "variables": { "arch": "64", - "box_basename": "fedora-34", + "box_basename": "fedora-36", "build_directory": "../../builds", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "2", @@ -174,16 +175,16 @@ "http_directory": "{{template_dir}}/http", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", - "iso_checksum": "0b9dc87d060c7c4ef89f63db6d4d1597dd3feaf4d635ca051d87f5e8c89e8675", - "iso_name": "Fedora-Server-dvd-x86_64-34-1.2.iso", + "iso_checksum": "sha256:5edaf708a52687b09f9810c2b6d2a3432edac1b18f4d8c908c0da6bde0379148", + "iso_name": "Fedora-Server-dvd-x86_64-36-1.5.iso", "ks_path": "ks-fedora.cfg", "memory": "1024", "mirror": "http://download.fedoraproject.org/pub/fedora/linux", - "mirror_directory": "releases/34/Server/x86_64/iso", - "name": "fedora-34", + "mirror_directory": "releases/36/Server/x86_64/iso", + "name": "fedora-36", "no_proxy": "{{env `no_proxy`}}", "qemu_display": "none", - "template": "fedora-34-x86_64", + "template": "fedora-36-x86_64", "boot_command": "<up><wait><tab> inst.text inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>", "version": "TIMESTAMP" } From 32424024d02a1d0d97187ce8ed6ec532cf0e0dcd Mon Sep 17 00:00:00 2001 From: Li-Wen Hsu <lwhsu@lwhsu.org> Date: Thu, 26 May 2022 23:53:10 +0800 Subject: [PATCH 1462/1622] Add FreeBSD 13.1-RELEASE (#1407) Signed-off-by: Li-Wen Hsu <lwhsu@lwhsu.org> --- .../freebsd/freebsd-13.1-amd64.json | 211 ++++++++++++++++++ 1 file changed, 211 insertions(+) create mode 100644 packer_templates/freebsd/freebsd-13.1-amd64.json diff --git a/packer_templates/freebsd/freebsd-13.1-amd64.json b/packer_templates/freebsd/freebsd-13.1-amd64.json new file mode 100644 index 000000000..9edf8343c --- /dev/null +++ b/packer_templates/freebsd/freebsd-13.1-amd64.json @@ -0,0 +1,211 @@ +{ + "builders": [ + { + "boot_command": [ + "<esc><wait>", + "boot -s<wait>", + "<enter><wait>", + "<wait10><wait10>", + "/bin/sh<enter><wait>", + "mdmfs -s 100m md1 /tmp<enter><wait>", + "mdmfs -s 100m md2 /mnt<enter><wait>", + "dhclient -p /tmp/dhclient.em0.pid -l /tmp/dhclient.lease.em0 em0<enter><wait>", + "fetch -o /tmp/installerconfig http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} \u0026\u0026 bsdinstall script /tmp/installerconfig<enter><wait>" + ], + "boot_wait": "5s", + "cpus": "{{ user `cpus` }}", + "disk_size": "{{user `disk_size`}}", + "guest_additions_mode": "disable", + "guest_os_type": "FreeBSD_64", + "headless": "{{ user `headless` }}", + "http_directory": "{{user `http_directory`}}", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "memory": "{{ user `memory` }}", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-virtualbox", + "shutdown_command": "echo 'vagrant' | su -m root -c 'shutdown -p now'", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_timeout": "10000s", + "ssh_username": "vagrant", + "type": "virtualbox-iso", + "virtualbox_version_file": ".vbox_version", + "vm_name": "{{ user `template` }}" + }, + { + "boot_command": [ + "<esc><wait>", + "boot -s<wait>", + "<enter><wait>", + "<wait10><wait10>", + "/bin/sh<enter><wait>", + "mdmfs -s 100m md1 /tmp<enter><wait>", + "mdmfs -s 100m md2 /mnt<enter><wait>", + "dhclient -p /tmp/dhclient.em0.pid -l /tmp/dhclient.lease.em0 em0<enter><wait>", + "<wait5>", + "fetch -o /tmp/installerconfig http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} \u0026\u0026 bsdinstall script /tmp/installerconfig<enter><wait>" + ], + "boot_wait": "5s", + "cpus": "{{ user `cpus` }}", + "disk_size": "{{user `disk_size`}}", + "guest_os_type": "freebsd-64", + "headless": "{{ user `headless` }}", + "http_directory": "{{user `http_directory`}}", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "memory": "{{ user `memory` }}", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-vmware", + "shutdown_command": "echo 'vagrant' | su -m root -c 'shutdown -p now'", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_timeout": "10000s", + "ssh_username": "vagrant", + "type": "vmware-iso", + "vm_name": "{{ user `template` }}", + "vmx_data": { + "cpuid.coresPerSocket": "1" + }, + "vmx_remove_ethernet_interfaces": true + }, + { + "boot_command": [ + "<esc><wait>", + "boot -s<wait>", + "<enter><wait>", + "<wait10><wait10>", + "/bin/sh<enter><wait>", + "mdmfs -s 100m md1 /tmp<enter><wait>", + "mdmfs -s 100m md2 /mnt<enter><wait>", + "dhclient -p /tmp/dhclient.em0.pid -l /tmp/dhclient.lease.em0 em0<enter><wait>", + "fetch -o /tmp/installerconfig http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} \u0026\u0026 bsdinstall script /tmp/installerconfig<enter><wait>" + ], + "boot_wait": "8s", + "cpus": "{{ user `cpus` }}", + "disk_size": "{{user `disk_size`}}", + "guest_os_type": "freebsd", + "http_directory": "{{user `http_directory`}}", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "memory": "{{ user `memory` }}", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-parallels", + "parallels_tools_mode": "disable", + "prlctl": [ + [ + "set", + "{{.Name}}", + "--device-set", + "cdrom0", + "--iface", + "ide" + ], + [ + "set", + "{{.Name}}", + "--device-del", + "fdd0" + ], + [ + "set", + "{{.Name}}", + "--device-del", + "parallel0" + ] + ], + "prlctl_version_file": ".prlctl_version", + "shutdown_command": "echo 'vagrant' | su -m root -c 'shutdown -p now'", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_timeout": "10000s", + "ssh_username": "vagrant", + "type": "parallels-iso", + "vm_name": "{{ user `template` }}" + }, + { + "boot_command": [ + "<esc><wait>", + "boot -s<wait>", + "<enter><wait>", + "<wait10><wait10>", + "/bin/sh<enter><wait>", + "mdmfs -s 100m md1 /tmp<enter><wait>", + "mdmfs -s 100m md2 /mnt<enter><wait>", + "dhclient -p /tmp/dhclient.vtnet0.pid -l /tmp/dhclient.lease.vtnet0 vtnet0<enter><wait>", + "fetch -o /tmp/installerconfig http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} \u0026\u0026 bsdinstall script /tmp/installerconfig<enter><wait>" + ], + "boot_wait": "7s", + "cpus": "{{ user `cpus` }}", + "disk_size": "{{user `disk_size`}}", + "headless": "{{ user `headless` }}", + "http_directory": "{{user `http_directory`}}", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "memory": "{{ user `memory` }}", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-qemu", + "shutdown_command": "echo 'vagrant' | su -m root -c 'shutdown -p now'", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_timeout": "10000s", + "ssh_username": "vagrant", + "type": "qemu", + "vm_name": "{{ user `template` }}", + "qemuargs": [ + [ "-m", "{{ user `memory` }}" ], + [ "-display", "{{ user `qemu_display` }}" ] + ] + } + ], + "post-processors": [ + { + "output": "{{ user `build_directory` }}/{{user `box_basename`}}.{{.Provider}}.box", + "type": "vagrant", + "vagrantfile_template": "{{template_dir}}/vagrantfile_templates/freebsd.rb" + } + ], + "provisioners": [ + { + "environment_vars": [ + "HOME_DIR=/home/vagrant", + "http_proxy={{user `http_proxy`}}", + "https_proxy={{user `https_proxy`}}", + "no_proxy={{user `no_proxy`}}", + "pkg_branch={{user `pkg_branch`}}" + ], + "execute_command": "echo 'vagrant' | {{.Vars}} su -m root -c 'sh -eux {{.Path}}'", + "expect_disconnect": true, + "scripts": [ + "{{template_dir}}/scripts/update.sh", + "{{template_dir}}/scripts/postinstall.sh", + "{{template_dir}}/scripts/sudoers.sh", + "{{template_dir}}/../_common/vagrant.sh", + "{{template_dir}}/scripts/vmtools.sh", + "{{template_dir}}/scripts/cleanup.sh", + "{{template_dir}}/scripts/minimize.sh" + ], + "type": "shell" + } + ], + "variables": { + "box_basename": "freebsd-13.1", + "build_directory": "../../builds", + "build_timestamp": "{{isotime \"20060102150405\"}}", + "cpus": "2", + "disk_size": "65536", + "git_revision": "__unknown_git_revision__", + "headless": "", + "http_directory": "{{template_dir}}/http", + "http_proxy": "{{env `http_proxy`}}", + "https_proxy": "{{env `https_proxy`}}", + "install_path": "freebsd-11/installerconfig", + "iso_checksum": "697d81653fa246b921ddfcf1d15562c55249cc727b11fa3e47f470e2cf2b6a40", + "iso_name": "FreeBSD-13.1-RELEASE-amd64-disc1.iso", + "memory": "1024", + "mirror": "https://download.freebsd.org", + "mirror_directory": "releases/amd64/amd64/ISO-IMAGES/13.1", + "name": "freebsd-13.1", + "no_proxy": "{{env `no_proxy`}}", + "pkg_branch": "quarterly", + "qemu_display": "none", + "template": "freebsd-13.1-amd64", + "version": "TIMESTAMP" + } +} From 9760060a295934562c03a010bb1f0234a9423c7b Mon Sep 17 00:00:00 2001 From: Christopher Peterson <3893680+cspeterson@users.noreply.github.com> Date: Thu, 26 May 2022 11:59:39 -0400 Subject: [PATCH 1463/1622] Add Springdale 8 (#1392) Signed-off-by: Christopher Peterson <cspeterson@cspeterson.net> --- builds.yml | 2 + .../springdalelinux/http/8-netinst/ks.cfg | 84 ++++++++ .../springdalelinux-8.5-x86_64.json | 196 ++++++++++++++++++ 3 files changed, 282 insertions(+) create mode 100644 packer_templates/springdalelinux/http/8-netinst/ks.cfg create mode 100644 packer_templates/springdalelinux/springdalelinux-8.5-x86_64.json diff --git a/builds.yml b/builds.yml index e3308029e..7874dfed4 100644 --- a/builds.yml +++ b/builds.yml @@ -29,6 +29,7 @@ public: - 'rockylinux-8.5' - 'scientific-7.9' - 'springdalelinux-7.9' +- 'springdalelinux-8.5' - 'ubuntu-16.04-i386' - 'ubuntu-16.04' - 'ubuntu-18.04' @@ -55,3 +56,4 @@ slugs: 'rockylinux-8': 'rockylinux-8' 'scientific-7': 'scientific-7' 'springdalelinux-7': 'springdalelinux-7' + 'springdalelinux-8': 'springdalelinux-8' diff --git a/packer_templates/springdalelinux/http/8-netinst/ks.cfg b/packer_templates/springdalelinux/http/8-netinst/ks.cfg new file mode 100644 index 000000000..f220bbe82 --- /dev/null +++ b/packer_templates/springdalelinux/http/8-netinst/ks.cfg @@ -0,0 +1,84 @@ +install +url --url="http://springdale.princeton.edu/data/Springdale/8.1/x86_64/os" +lang en_US.UTF-8 +keyboard us +network --bootproto=dhcp --noipv6 --onboot=on --device=eth0 +rootpw --plaintext vagrant +firewall --disabled +selinux --permissive +timezone UTC +bootloader --timeout=1 --location=mbr --append="net.ifnames=0 biosdevname=0" +text +skipx +zerombr +clearpart --all --initlabel +autopart --nohome --nolvm --noboot +firstboot --disabled +reboot --eject +user --name=vagrant --plaintext --password vagrant + +%packages --ignoremissing --excludedocs --instLangs=en_US.utf8 +# maybe prb needed for vbos guest additions? https://github.com/chef/bento/issues/1345 +# kernel-devel +# gcc +# make +# perl +# elfutils-libelf-devel +# end vbox +# vagrant needs this to copy initial files via scp +openssh-clients +sudo +selinux-policy-devel +wget +nfs-utils +net-tools +tar +bzip2 +deltarpm +rsync +dnf-utils +redhat-lsb-core +elfutils-libelf-devel +network-scripts +-fprintd-pam +-intltool +-iwl*-firmware +-microcode_ctl +%end + +%post +# sudo +echo 'Defaults:vagrant !requiretty' > /etc/sudoers.d/vagrant +echo '%vagrant ALL=(ALL) NOPASSWD: ALL' >> /etc/sudoers.d/vagrant +chmod 440 /etc/sudoers.d/vagrant + +# Enable hyper-v daemons only if using hyper-v virtualization +if [ $(virt-what) == "hyperv" ]; then + dnf -y install hyperv-daemons cifs-utils + systemctl enable hypervvssd + systemctl enable hypervkvpd +fi + +# Since we disable consistent network naming, we need to make sure the eth0 +# configuration file is in place so it will come up. +# Delete other network configuration first because RHEL/C7 networking will not +# restart successfully if there are configuration files for devices that do not +# exist. +rm -f /etc/sysconfig/network-scripts/ifcfg-e* +cat > /etc/sysconfig/network-scripts/ifcfg-eth0 << _EOF_ +TYPE=Ethernet +PROXY_METHOD=none +BROWSER_ONLY=no +BOOTPROTO=dhcp +DEFROUTE=yes +IPV4_FAILURE_FATAL=no +IPV6INIT=yes +IPV6_AUTOCONF=yes +IPV6_DEFROUTE=yes +IPV6_FAILURE_FATAL=no +IPV6_ADDR_GEN_MODE=stable-privacy +NAME=eth0 +DEVICE=eth0 +ONBOOT=yes +_EOF_ +%end diff --git a/packer_templates/springdalelinux/springdalelinux-8.5-x86_64.json b/packer_templates/springdalelinux/springdalelinux-8.5-x86_64.json new file mode 100644 index 000000000..e0f828ce2 --- /dev/null +++ b/packer_templates/springdalelinux/springdalelinux-8.5-x86_64.json @@ -0,0 +1,196 @@ +{ + "builders": [ + { + "boot_command": "{{ user `boot_command` }}", + "boot_wait": "5s", + "cpus": "{{ user `cpus` }}", + "disk_size": "{{user `disk_size`}}", + "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "guest_additions_url": "{{ user `guest_additions_url` }}", + "guest_os_type": "RedHat_64", + "hard_drive_interface": "sata", + "headless": "{{ user `headless` }}", + "http_directory": "{{user `http_directory`}}", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "memory": "{{ user `memory` }}", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-virtualbox", + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_timeout": "10000s", + "ssh_username": "vagrant", + "type": "virtualbox-iso", + "virtualbox_version_file": ".vbox_version", + "vm_name": "{{ user `template` }}" + }, + { + "boot_command": "{{ user `boot_command` }}", + "boot_wait": "5s", + "cpus": "{{ user `cpus` }}", + "disk_size": "{{user `disk_size`}}", + "guest_os_type": "centos-64", + "headless": "{{ user `headless` }}", + "http_directory": "{{user `http_directory`}}", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "memory": "{{ user `memory` }}", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-vmware", + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", + "ssh_password": "vagrant", + "ssh_port": 22, + "version": "12", + "ssh_timeout": "10000s", + "ssh_username": "vagrant", + "tools_upload_flavor": "linux", + "type": "vmware-iso", + "vm_name": "{{ user `template` }}", + "vmx_data": { + "cpuid.coresPerSocket": "1" + }, + "vmx_remove_ethernet_interfaces": true + }, + { + "boot_command": "{{user `boot_command`}}", + "boot_wait": "5s", + "cpus": "{{ user `cpus` }}", + "disk_size": "{{user `disk_size`}}", + "guest_os_type": "centos", + "http_directory": "{{user `http_directory`}}", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "memory": "{{ user `memory` }}", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-parallels", + "parallels_tools_flavor": "lin", + "prlctl_version_file": ".prlctl_version", + "prlctl": [ + [ + "set", + "{{.Name}}", + "--3d-accelerate", + "off" + ], + [ + "set", + "{{.Name}}", + "--videosize", + "16" + ] + ], + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_timeout": "10000s", + "ssh_username": "vagrant", + "type": "parallels-iso", + "vm_name": "{{ user `template` }}" + }, + { + "boot_command": [ + "<wait5><up><wait5><tab> text ks=hd:fd0:/ks.cfg<enter><wait5><esc>" + ], + "boot_wait": "5s", + "cpus": "{{ user `cpus` }}", + "disk_size": "{{user `disk_size`}}", + "floppy_files": [ + "{{user `http_directory`}}/{{user `ks_path`}}" + ], + "generation": "{{user `hyperv_generation`}}", + "guest_additions_mode": "disable", + "http_directory": "{{user `http_directory`}}", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "memory": "{{ user `memory` }}", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-hyperv", + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_timeout": "10000s", + "ssh_username": "vagrant", + "switch_name": "{{ user `hyperv_switch`}}", + "type": "hyperv-iso", + "vm_name": "{{ user `template` }}" + }, + { + "boot_command": "{{ user `boot_command` }}", + "boot_wait": "5s", + "cpus": "{{ user `cpus` }}", + "disk_size": "{{user `disk_size`}}", + "headless": "{{ user `headless` }}", + "http_directory": "{{user `http_directory`}}", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "memory": "{{ user `memory` }}", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-qemu", + "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_timeout": "10000s", + "ssh_username": "vagrant", + "type": "qemu", + "vm_name": "{{ user `template` }}", + "qemuargs": [ + [ "-m", "{{ user `memory` }}" ], + [ "-display", "{{ user `qemu_display` }}" ] + ] + } + ], + "post-processors": [ + { + "output": "{{ user `build_directory` }}/{{user `box_basename`}}.{{.Provider}}.box", + "type": "vagrant" + } + ], + "provisioners": [ + { + "environment_vars": [ + "HOME_DIR=/home/vagrant", + "http_proxy={{user `http_proxy`}}", + "https_proxy={{user `https_proxy`}}", + "no_proxy={{user `no_proxy`}}" + ], + "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", + "expect_disconnect": true, + "scripts": [ + "{{template_dir}}/../centos/scripts/update.sh", + "{{template_dir}}/../centos/scripts/networking.sh", + "{{template_dir}}/../_common/motd.sh", + "{{template_dir}}/../_common/sshd.sh", + "{{template_dir}}/../_common/vagrant.sh", + "{{template_dir}}/../_common/virtualbox.sh", + "{{template_dir}}/../_common/vmware.sh", + "{{template_dir}}/../_common/parallels.sh", + "{{template_dir}}/../centos/scripts/cleanup.sh", + "{{template_dir}}/../_common/minimize.sh" + ], + "type": "shell" + } + ], + "variables": { + "box_basename": "springdalelinux-8.5", + "build_directory": "../../builds", + "build_timestamp": "{{isotime \"2019102650405\"}}", + "cpus": "2", + "disk_size": "65536", + "git_revision": "__unknown_git_revision__", + "guest_additions_url": "", + "headless": "", + "http_directory": "{{template_dir}}/../springdalelinux/http", + "http_proxy": "{{env `http_proxy`}}", + "https_proxy": "{{env `https_proxy`}}", + "hyperv_generation": "1", + "hyperv_switch": "bento", + "iso_checksum": "7b2b3c20e202bc8b0791e9a09555961dc7ef533cc6e5c6daac980f335a55614f", + "iso_name": "Springdale%20Linux-8.5-x86_64-netinst.iso", + "ks_path": "8-netinst/ks.cfg", + "memory": "1024", + "mirror": "http://springdale.princeton.edu/data/springdale", + "mirror_directory": "8.5/x86_64/iso", + "name": "springdalelinux-8.5", + "no_proxy": "{{env `no_proxy`}}", + "qemu_display": "none", + "template": "springdalelinux-8.5-x86_64", + "boot_command": "<up><wait><tab> inst.text inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>", + "version": "TIMESTAMP" + } +} From 3c4d39228503086647173cfe0f56144dd8804732 Mon Sep 17 00:00:00 2001 From: Corey Hemminger <hemminger@hotmail.com> Date: Wed, 22 Jun 2022 06:21:23 -0500 Subject: [PATCH 1464/1622] adding new boxes (#1414) * adding windows 11, 2022, rockylinux 8.6, amazonlinux 2022, almalinux 8.6, 9.0 * fixed windows errors and almalinux 9 kickstart error Signed-off-by: Corey Hemminger <hemminger@hotmail.com> --- CHANGELOG.md | 17 ++ builds.yml | 7 +- packer_templates/_common/parallels.sh | 58 ++-- packer_templates/_common/vmware.sh | 37 +-- ...-x86_64.json => almalinux-8.6-x86_64.json} | 24 +- .../almalinux/almalinux-9.0-x86_64.json | 196 ++++++++++++ packer_templates/almalinux/http/8/ks.cfg | 77 +++++ packer_templates/almalinux/http/9/ks.cfg | 76 +++++ packer_templates/almalinux/scripts/cleanup.sh | 113 +++++++ .../almalinux/scripts/networking.sh | 27 ++ packer_templates/almalinux/scripts/update.sh | 21 ++ .../centos/centos-7.9-x86_64.json | 2 +- .../centos/centos-8.5-x86_64.json | 2 +- .../centos/centos-stream-8-x86_64.json | 2 +- packer_templates/fedora/fedora-35-x86_64.json | 2 +- packer_templates/fedora/fedora-36-x86_64.json | 2 +- .../oraclelinux/oracle-6.10-x86_64.json | 2 +- .../oraclelinux/oracle-8.5-x86_64.json | 2 +- ...x86_64.json => rockylinux-8.6-x86_64.json} | 16 +- .../scientific-7.9-x86_64.json | 2 +- .../springdalelinux-7.9-x86_64.json | 2 +- .../springdalelinux-8.5-x86_64.json | 2 +- .../windows/answer_files/11/Autounattend.xml | 221 ++++++++++++++ .../answer_files/11/gen2_Autounattend.xml | 257 ++++++++++++++++ .../answer_files/2022/Autounattend.xml | 289 ++++++++++++++++++ .../windows/scripts/base_setup.ps1 | 35 ++- packer_templates/windows/windows-10.json | 5 +- packer_templates/windows/windows-10gen2.json | 5 +- packer_templates/windows/windows-11.json | 284 +++++++++++++++++ packer_templates/windows/windows-11gen2.json | 161 ++++++++++ packer_templates/windows/windows-2012.json | 5 +- packer_templates/windows/windows-2012r2.json | 5 +- packer_templates/windows/windows-2016.json | 5 +- packer_templates/windows/windows-2019.json | 5 +- packer_templates/windows/windows-2022.json | 238 +++++++++++++++ 35 files changed, 2095 insertions(+), 109 deletions(-) rename packer_templates/almalinux/{almalinux-8.5-x86_64.json => almalinux-8.6-x86_64.json} (91%) create mode 100644 packer_templates/almalinux/almalinux-9.0-x86_64.json create mode 100644 packer_templates/almalinux/http/8/ks.cfg create mode 100644 packer_templates/almalinux/http/9/ks.cfg create mode 100644 packer_templates/almalinux/scripts/cleanup.sh create mode 100644 packer_templates/almalinux/scripts/networking.sh create mode 100644 packer_templates/almalinux/scripts/update.sh rename packer_templates/rockylinux/{rockylinux-8.5-x86_64.json => rockylinux-8.6-x86_64.json} (94%) create mode 100644 packer_templates/windows/answer_files/11/Autounattend.xml create mode 100644 packer_templates/windows/answer_files/11/gen2_Autounattend.xml create mode 100644 packer_templates/windows/answer_files/2022/Autounattend.xml create mode 100644 packer_templates/windows/windows-11.json create mode 100644 packer_templates/windows/windows-11gen2.json create mode 100644 packer_templates/windows/windows-2022.json diff --git a/CHANGELOG.md b/CHANGELOG.md index 5d2ac798c..539ca1ae4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,22 @@ # Change Log +## [v202206.14.0](https://github.com/chef/bento/tree/v202206.14.0) (2022-06-14) +[Full Changelog](https://github.com/chef/bento/compare/v201812.27.0...v202206.14.0) + +**New Platforms:** + +- almalinux 8.6 [\#1414](https://github.com/chef/bento/pull/1414) ([stromweld](https://github.com/stromweld)) +- almalinux 9.0 [\#1414](https://github.com/chef/bento/pull/1414) ([stromweld](https://github.com/stromweld)) +- rocklinux 8.6 [\#1414](https://github.com/chef/bento/pull/1414) ([stromweld](https://github.com/stromweld)) +- windows 11 [\#1414](https://github.com/chef/bento/pull/1414) ([stromweld](https://github.com/stromweld)) +- windows 2022 [\#1414](https://github.com/chef/bento/pull/1414) ([stromweld](https://github.com/stromweld)) + +**Deprecated Platforms:** + +**Fixes and updates:** + +- update windows builds to be created in builds folder [\#1414](https://github.com/chef/bento/pull/1414) ([stromweld](https://github.com/stromweld)) + ## [v201812.27.0](https://github.com/chef/bento/tree/v201812.27.0) (2019-01-16) [Full Changelog](https://github.com/chef/bento/compare/v201808.24.0...v201812.27.0) diff --git a/builds.yml b/builds.yml index 7874dfed4..af1ea11b7 100644 --- a/builds.yml +++ b/builds.yml @@ -1,6 +1,7 @@ --- public: -- 'almalinux-8.5' +- 'almalinux-8.6' +- 'almalinux-9.0' - 'amazon-2' - 'centos-7.9' - 'centos-8.5' @@ -26,7 +27,7 @@ public: - 'oracle-6.10' - 'oracle-7.9' - 'oracle-8.5' -- 'rockylinux-8.5' +- 'rockylinux-8.6' - 'scientific-7.9' - 'springdalelinux-7.9' - 'springdalelinux-8.5' @@ -40,6 +41,8 @@ public: # slug box name: text string from standard box name to match (generally the same) slugs: 'almalinux-8': 'almalinux-8' + 'almalinux-9': 'almalinux-9' + 'amazon-2': 'amazon-2' 'centos-7': 'centos-7' 'centos-8': 'centos-8' 'debian-11': 'debian-11' diff --git a/packer_templates/_common/parallels.sh b/packer_templates/_common/parallels.sh index 95ad82b0b..5a5b378cb 100644 --- a/packer_templates/_common/parallels.sh +++ b/packer_templates/_common/parallels.sh @@ -5,35 +5,43 @@ HOME_DIR="${HOME_DIR:-/home/vagrant}"; case "$PACKER_BUILDER_TYPE" in parallels-iso|parallels-pvm) - mkdir -p /tmp/parallels; - if [ `uname -m` = "aarch64" ] ; then - mount -o loop $HOME_DIR/prl-tools-lin-arm.iso /tmp/parallels; + # determine the major EL version we're runninng + major_version="`sed 's/^.\+ release \([.0-9]\+\).*/\1/' /etc/redhat-release | awk -F. '{print $1}'`"; + + # make sure we use dnf on EL 8+ + if [ "$major_version" -ge 9 ]; then + echo "Parallels Tools doesn't support AlmaLinux 9 Yet" else - mount -o loop $HOME_DIR/prl-tools-lin.iso /tmp/parallels; - fi - VER="`cat /tmp/parallels/version`"; + mkdir -p /tmp/parallels; + if [ `uname -m` = "aarch64" ] ; then + mount -o loop $HOME_DIR/prl-tools-lin-arm.iso /tmp/parallels; + else + mount -o loop $HOME_DIR/prl-tools-lin.iso /tmp/parallels; + fi + VER="`cat /tmp/parallels/version`"; - echo "Parallels Tools Version: $VER"; + echo "Parallels Tools Version: $VER"; - /tmp/parallels/install --install-unattended-with-deps \ - || (code="$?"; \ - echo "Parallels tools installation exited $code, attempting" \ - "to output /var/log/parallels-tools-install.log"; \ - cat /var/log/parallels-tools-install.log; \ - exit $code); - umount /tmp/parallels; - rm -rf /tmp/parallels; - rm -f $HOME_DIR/*.iso; + /tmp/parallels/install --install-unattended-with-deps \ + || (code="$?"; \ + echo "Parallels tools installation exited $code, attempting" \ + "to output /var/log/parallels-tools-install.log"; \ + cat /var/log/parallels-tools-install.log; \ + exit $code); + umount /tmp/parallels; + rm -rf /tmp/parallels; + rm -f $HOME_DIR/*.iso; - # Parallels Tools for Linux includes native auto-mount script, - # which causes losing some of Vagrant-relative shared folders. - # So, we should disable this behavior. - # https://github.com/Parallels/vagrant-parallels/issues/325#issuecomment-418727113 - auto_mount_script='/usr/bin/prlfsmountd' - if [ -f "${auto_mount_script}" ]; then - echo -e '#!/bin/sh\n'\ - '# Shared folders auto-mount is disabled by Vagrant ' \ - > "${auto_mount_script}" + # Parallels Tools for Linux includes native auto-mount script, + # which causes losing some of Vagrant-relative shared folders. + # So, we should disable this behavior. + # https://github.com/Parallels/vagrant-parallels/issues/325#issuecomment-418727113 + auto_mount_script='/usr/bin/prlfsmountd' + if [ -f "${auto_mount_script}" ]; then + echo -e '#!/bin/sh\n'\ + '# Shared folders auto-mount is disabled by Vagrant ' \ + > "${auto_mount_script}" + fi fi ;; esac diff --git a/packer_templates/_common/vmware.sh b/packer_templates/_common/vmware.sh index 5bddaa1ca..72d9f2ec6 100644 --- a/packer_templates/_common/vmware.sh +++ b/packer_templates/_common/vmware.sh @@ -6,39 +6,16 @@ HOME_DIR="${HOME_DIR:-/home/vagrant}"; case "$PACKER_BUILDER_TYPE" in vmware-iso|vmware-vmx) - # make sure we have /sbin in our path. RHEL systems lack this - PATH=/sbin:$PATH - export PATH + #!/bin/sh -eux - mkdir -p /tmp/vmware; - mkdir -p /tmp/vmware-archive; - mount -o loop $HOME_DIR/linux.iso /tmp/vmware; + # determine the major EL version we're runninng + major_version="`sed 's/^.\+ release \([.0-9]\+\).*/\1/' /etc/redhat-release | awk -F. '{print $1}'`"; - TOOLS_PATH="`ls /tmp/vmware/VMwareTools-*.tar.gz`"; - VER="`echo "${TOOLS_PATH}" | cut -f2 -d'-'`"; - MAJ_VER="`echo ${VER} | cut -d '.' -f 1`"; - - if [ -f "/bin/dnf" ]; then - echo "Installing deps for the vmware tools" - dnf install -y perl gcc make kernel-headers kernel-devel - elif [ -f "/bin/yum" ] || [ -f "/usr/bin/yum" ]; then - echo "Installing deps for the vmware tools" - yum install -y perl gcc make kernel-headers kernel-devel - fi - - echo "VMware Tools Version: $VER"; - - echo "Expanding the tools archive" - tar xzf ${TOOLS_PATH} -C /tmp/vmware-archive; - echo "Installing tools" - if [ "${MAJ_VER}" -lt "10" ]; then - /tmp/vmware-archive/vmware-tools-distrib/vmware-install.pl --default; + # make sure we use dnf on EL 8+ + if [ "$major_version" -ge 8 ]; then + dnf -y install open-vm-tools else - /tmp/vmware-archive/vmware-tools-distrib/vmware-install.pl --force-install; + yum -y insttall open-vm-tools fi - umount /tmp/vmware; - rm -rf /tmp/vmware; - rm -rf /tmp/vmware-archive; - rm -f $HOME_DIR/*.iso; ;; esac diff --git a/packer_templates/almalinux/almalinux-8.5-x86_64.json b/packer_templates/almalinux/almalinux-8.6-x86_64.json similarity index 91% rename from packer_templates/almalinux/almalinux-8.5-x86_64.json rename to packer_templates/almalinux/almalinux-8.6-x86_64.json index 8fc753972..fc377e3c6 100644 --- a/packer_templates/almalinux/almalinux-8.5-x86_64.json +++ b/packer_templates/almalinux/almalinux-8.6-x86_64.json @@ -39,7 +39,7 @@ "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, - "version": "12", + "version": 19, "ssh_timeout": "10000s", "ssh_username": "vagrant", "tools_upload_flavor": "linux", @@ -152,44 +152,44 @@ "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", "expect_disconnect": true, "scripts": [ - "{{template_dir}}/../centos/scripts/update.sh", - "{{template_dir}}/../centos/scripts/networking.sh", + "{{template_dir}}/scripts/update.sh", + "{{template_dir}}/scripts/networking.sh", "{{template_dir}}/../_common/motd.sh", "{{template_dir}}/../_common/sshd.sh", "{{template_dir}}/../_common/vagrant.sh", "{{template_dir}}/../_common/virtualbox.sh", "{{template_dir}}/../_common/vmware.sh", "{{template_dir}}/../_common/parallels.sh", - "{{template_dir}}/../centos/scripts/cleanup.sh", + "{{template_dir}}/scripts/cleanup.sh", "{{template_dir}}/../_common/minimize.sh" ], "type": "shell" } ], "variables": { - "box_basename": "almalinux-8.5", + "box_basename": "almalinux-8.6", "build_directory": "../../builds", - "build_timestamp": "{{isotime \"2019102650405\"}}", + "build_timestamp": "{{isotime \"202205111847\"}}", "cpus": "2", "disk_size": "65536", "git_revision": "__unknown_git_revision__", "guest_additions_url": "", "headless": "", - "http_directory": "{{template_dir}}/../centos/http", + "http_directory": "{{template_dir}}/http", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", "hyperv_generation": "1", "hyperv_switch": "bento", - "iso_checksum": "54b8881bebd924e4699ed12634187a82156fdb0fa57ec24058d04d70d2f033b3", - "iso_name": "AlmaLinux-8.5-x86_64-dvd.iso", + "iso_checksum": "8c3bd1ff3d88b5599147626fa2616d85edcc861ec00edd6863b81dbfb135874c", + "iso_name": "AlmaLinux-8.6-x86_64-dvd.iso", "ks_path": "8/ks.cfg", "memory": "1024", "mirror": "https://repo.almalinux.org/almalinux", - "mirror_directory": "8.5/isos/x86_64", - "name": "almalinux-8.5", + "mirror_directory": "8.6/isos/x86_64", + "name": "almalinux-8.6", "no_proxy": "{{env `no_proxy`}}", "qemu_display": "none", - "template": "almalinux-8.5-x86_64", + "template": "almalinux-8.6-x86_64", "boot_command": "<up><wait><tab> inst.text inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>", "version": "TIMESTAMP" } diff --git a/packer_templates/almalinux/almalinux-9.0-x86_64.json b/packer_templates/almalinux/almalinux-9.0-x86_64.json new file mode 100644 index 000000000..306bc76ec --- /dev/null +++ b/packer_templates/almalinux/almalinux-9.0-x86_64.json @@ -0,0 +1,196 @@ + { + "builders": [ + { + "boot_command": "{{ user `boot_command` }}", + "boot_wait": "5s", + "cpus": "{{ user `cpus` }}", + "disk_size": "{{user `disk_size`}}", + "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "guest_additions_url": "{{ user `guest_additions_url` }}", + "guest_os_type": "RedHat_64", + "hard_drive_interface": "sata", + "headless": "{{ user `headless` }}", + "http_directory": "{{user `http_directory`}}", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "memory": "{{ user `memory` }}", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-virtualbox", + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_timeout": "10000s", + "ssh_username": "vagrant", + "type": "virtualbox-iso", + "virtualbox_version_file": ".vbox_version", + "vm_name": "{{ user `template` }}" + }, + { + "boot_command": "{{ user `boot_command` }}", + "boot_wait": "5s", + "cpus": "{{ user `cpus` }}", + "disk_size": "{{user `disk_size`}}", + "guest_os_type": "centos-64", + "headless": "{{ user `headless` }}", + "http_directory": "{{user `http_directory`}}", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "memory": "{{ user `memory` }}", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-vmware", + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", + "ssh_password": "vagrant", + "ssh_port": 22, + "version": 19, + "ssh_timeout": "10000s", + "ssh_username": "vagrant", + "tools_upload_flavor": "linux", + "type": "vmware-iso", + "vm_name": "{{ user `template` }}", + "vmx_data": { + "cpuid.coresPerSocket": "1" + }, + "vmx_remove_ethernet_interfaces": true + }, + { + "boot_command": "{{user `boot_command`}}", + "boot_wait": "5s", + "cpus": "{{ user `cpus` }}", + "disk_size": "{{user `disk_size`}}", + "guest_os_type": "centos", + "http_directory": "{{user `http_directory`}}", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "memory": "{{ user `memory` }}", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-parallels", + "parallels_tools_flavor": "lin", + "prlctl_version_file": ".prlctl_version", + "prlctl": [ + [ + "set", + "{{.Name}}", + "--3d-accelerate", + "off" + ], + [ + "set", + "{{.Name}}", + "--videosize", + "16" + ] + ], + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_timeout": "10000s", + "ssh_username": "vagrant", + "type": "parallels-iso", + "vm_name": "{{ user `template` }}" + }, + { + "boot_command": [ + "<wait5><up><wait5><tab> text ks=hd:fd0:/ks.cfg<enter><wait5><esc>" + ], + "boot_wait": "5s", + "cpus": "{{ user `cpus` }}", + "disk_size": "{{user `disk_size`}}", + "floppy_files": [ + "{{user `http_directory`}}/{{user `ks_path`}}" + ], + "generation": "{{user `hyperv_generation`}}", + "guest_additions_mode": "disable", + "http_directory": "{{user `http_directory`}}", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "memory": "{{ user `memory` }}", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-hyperv", + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_timeout": "10000s", + "ssh_username": "vagrant", + "switch_name": "{{ user `hyperv_switch`}}", + "type": "hyperv-iso", + "vm_name": "{{ user `template` }}" + }, + { + "boot_command": "{{ user `boot_command` }}", + "boot_wait": "5s", + "cpus": "{{ user `cpus` }}", + "disk_size": "{{user `disk_size`}}", + "headless": "{{ user `headless` }}", + "http_directory": "{{user `http_directory`}}", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "memory": "{{ user `memory` }}", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-qemu", + "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_timeout": "10000s", + "ssh_username": "vagrant", + "type": "qemu", + "vm_name": "{{ user `template` }}", + "qemuargs": [ + [ "-m", "{{ user `memory` }}" ], + [ "-display", "{{ user `qemu_display` }}" ] + ] + } + ], + "post-processors": [ + { + "output": "{{ user `build_directory` }}/{{user `box_basename`}}.{{.Provider}}.box", + "type": "vagrant" + } + ], + "provisioners": [ + { + "environment_vars": [ + "HOME_DIR=/home/vagrant", + "http_proxy={{user `http_proxy`}}", + "https_proxy={{user `https_proxy`}}", + "no_proxy={{user `no_proxy`}}" + ], + "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", + "expect_disconnect": true, + "scripts": [ + "{{template_dir}}/scripts/update.sh", + "{{template_dir}}/scripts/networking.sh", + "{{template_dir}}/../_common/motd.sh", + "{{template_dir}}/../_common/sshd.sh", + "{{template_dir}}/../_common/vagrant.sh", + "{{template_dir}}/../_common/virtualbox.sh", + "{{template_dir}}/../_common/vmware.sh", + "{{template_dir}}/../_common/parallels.sh", + "{{template_dir}}/scripts/cleanup.sh", + "{{template_dir}}/../_common/minimize.sh" + ], + "type": "shell" + } + ], + "variables": { + "box_basename": "almalinux-9.0", + "build_directory": "../../builds", + "build_timestamp": "{{isotime \"202205251531\"}}", + "cpus": "2", + "disk_size": "65536", + "git_revision": "__unknown_git_revision__", + "guest_additions_url": "", + "headless": "", + "http_directory": "{{template_dir}}/http", + "http_proxy": "{{env `http_proxy`}}", + "https_proxy": "{{env `https_proxy`}}", + "hyperv_generation": "1", + "hyperv_switch": "bento", + "iso_checksum": "6617436f8f2ee5408ff448a4eedce4ce61e2fdb3153a646b875010256bc9fd6b", + "iso_name": "AlmaLinux-9.0-x86_64-dvd.iso", + "ks_path": "9/ks.cfg", + "memory": "1024", + "mirror": "https://repo.almalinux.org/almalinux", + "mirror_directory": "9.0/isos/x86_64", + "name": "almalinux-9.0", + "no_proxy": "{{env `no_proxy`}}", + "qemu_display": "none", + "template": "almalinux-9.0-x86_64", + "boot_command": "<up><wait><tab> inst.text inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>", + "version": "TIMESTAMP" + } +} diff --git a/packer_templates/almalinux/http/8/ks.cfg b/packer_templates/almalinux/http/8/ks.cfg new file mode 100644 index 000000000..595f4950f --- /dev/null +++ b/packer_templates/almalinux/http/8/ks.cfg @@ -0,0 +1,77 @@ +install +cdrom +lang en_US.UTF-8 +keyboard us +network --bootproto=dhcp --noipv6 --onboot=on --device=eth0 +rootpw --plaintext vagrant +firewall --disabled +selinux --permissive +timezone UTC +bootloader --timeout=1 --location=mbr --append="net.ifnames=0 biosdevname=0" +text +skipx +zerombr +clearpart --all --initlabel +autopart --nohome --nolvm --noboot +firstboot --disabled +reboot --eject +user --name=vagrant --plaintext --password vagrant + +%packages --ignoremissing --excludedocs --instLangs=en_US.utf8 +# vagrant needs this to copy initial files via scp +openssh-clients +sudo +selinux-policy-devel +wget +nfs-utils +net-tools +tar +bzip2 +deltarpm +rsync +dnf-utils +redhat-lsb-core +elfutils-libelf-devel +network-scripts +-fprintd-pam +-intltool +-iwl*-firmware +-microcode_ctl +%end + +%post +# sudo +echo 'Defaults:vagrant !requiretty' > /etc/sudoers.d/vagrant +echo '%vagrant ALL=(ALL) NOPASSWD: ALL' >> /etc/sudoers.d/vagrant +chmod 440 /etc/sudoers.d/vagrant + +# Enable hyper-v daemons only if using hyper-v virtualization +if [ $(virt-what) == "hyperv" ]; then + dnf -y install hyperv-daemons cifs-utils + systemctl enable hypervvssd + systemctl enable hypervkvpd +fi + +# Since we disable consistent network naming, we need to make sure the eth0 +# configuration file is in place so it will come up. +# Delete other network configuration first because RHEL/C7 networking will not +# restart successfully if there are configuration files for devices that do not +# exist. +rm -f /etc/sysconfig/network-scripts/ifcfg-e* +cat > /etc/sysconfig/network-scripts/ifcfg-eth0 << _EOF_ +TYPE=Ethernet +PROXY_METHOD=none +BROWSER_ONLY=no +BOOTPROTO=dhcp +DEFROUTE=yes +IPV4_FAILURE_FATAL=no +IPV6INIT=yes +IPV6_AUTOCONF=yes +IPV6_DEFROUTE=yes +IPV6_FAILURE_FATAL=no +IPV6_ADDR_GEN_MODE=stable-privacy +NAME=eth0 +DEVICE=eth0 +ONBOOT=yes +_EOF_ +%end diff --git a/packer_templates/almalinux/http/9/ks.cfg b/packer_templates/almalinux/http/9/ks.cfg new file mode 100644 index 000000000..0ea7d91af --- /dev/null +++ b/packer_templates/almalinux/http/9/ks.cfg @@ -0,0 +1,76 @@ +cdrom +lang en_US.UTF-8 +keyboard us +network --bootproto=dhcp --noipv6 --onboot=on --device=eth0 +rootpw --plaintext vagrant +firewall --disabled +selinux --permissive +timezone UTC +bootloader --timeout=1 --location=mbr --append="net.ifnames=0 biosdevname=0" +text +skipx +zerombr +clearpart --all --initlabel +autopart --nohome --nolvm --noboot +firstboot --disabled +reboot --eject +user --name=vagrant --plaintext --password vagrant + +%packages --ignoremissing --excludedocs +# vagrant needs this to copy initial files via scp +openssh-clients +sudo +selinux-policy-devel +wget +nfs-utils +net-tools +tar +bzip2 +deltarpm +rsync +dnf-utils +redhat-lsb-core +elfutils-libelf-devel +network-scripts +-fprintd-pam +-intltool +-iwl*-firmware +-microcode_ctl +%end + +%post +# sudo +echo 'Defaults:vagrant !requiretty' > /etc/sudoers.d/vagrant +echo '%vagrant ALL=(ALL) NOPASSWD: ALL' >> /etc/sudoers.d/vagrant +chmod 440 /etc/sudoers.d/vagrant + +# Enable hyper-v daemons only if using hyper-v virtualization +if [ $(virt-what) == "hyperv" ]; then +dnf -y install hyperv-daemons cifs-utils +systemctl enable hypervvssd +systemctl enable hypervkvpd +fi + +# Since we disable consistent network naming, we need to make sure the eth0 +# configuration file is in place so it will come up. +# Delete other network configuration first because RHEL/C7 networking will not +# restart successfully if there are configuration files for devices that do not +# exist. +rm -f /etc/sysconfig/network-scripts/ifcfg-e* +cat > /etc/sysconfig/network-scripts/ifcfg-eth0 << _EOF_ +TYPE=Ethernet +PROXY_METHOD=none + BROWSER_ONLY=no + BOOTPROTO=dhcp + DEFROUTE=yes +IPV4_FAILURE_FATAL=no +IPV6INIT=yes +IPV6_AUTOCONF=yes +IPV6_DEFROUTE=yes + IPV6_FAILURE_FATAL=no + IPV6_ADDR_GEN_MODE=stable-privacy + NAME=eth0 +DEVICE=eth0 +ONBOOT=yes +_EOF_ +%end diff --git a/packer_templates/almalinux/scripts/cleanup.sh b/packer_templates/almalinux/scripts/cleanup.sh new file mode 100644 index 000000000..0651a7c04 --- /dev/null +++ b/packer_templates/almalinux/scripts/cleanup.sh @@ -0,0 +1,113 @@ +#!/bin/sh -eux + +# should output one of 'redhat' 'centos' 'oraclelinux' +distro="`rpm -qf --queryformat '%{NAME}' /etc/redhat-release | cut -f 1 -d '-'`" + +major_version="`sed 's/^.\+ release \([.0-9]\+\).*/\1/' /etc/redhat-release | awk -F. '{print $1}'`"; + + +echo "reduce the grub menu time to 1 second" +if ! [ "$major_version" -eq 6 ]; then + sed -i -e 's/^GRUB_TIMEOUT=[0-9]\+$/GRUB_TIMEOUT=1/' /etc/default/grub + grub2-mkconfig -o /boot/grub2/grub.cfg +fi + +# make sure we use dnf on EL 8+ +if [ "$major_version" -ge 8 ]; then + pkg_cmd="dnf" +else + pkg_cmd="yum" +fi + + +echo "Remove development and kernel source packages" +$pkg_cmd -y remove gcc cpp gc kernel-devel kernel-headers glibc-devel elfutils-libelf-devel glibc-headers kernel-devel kernel-headers + +if [ "$major_version" -ge 8 ]; then + echo "remove orphaned packages" + dnf -y autoremove + echo "Remove previous kernels that preserved for rollbacks" + dnf -y remove -y $(dnf repoquery --installonly --latest-limit=-1 -q) +else + echo "Remove previous kernels that preserved for rollbacks" + if ! command -v package-cleanup >/dev/null 2>&1; then + yum -y install yum-utils + fi + package-cleanup --oldkernels --count=1 -y +fi + +# Avoid ~200 meg firmware package we don't need +# this cannot be done in the KS file so we do it here +echo "Removing extra firmware packages" +$pkg_cmd -y remove linux-firmware + +if [ "$distro" != 'redhat' ]; then + echo "clean all package cache information" + $pkg_cmd -y clean all --enablerepo=\*; +fi + +# Clean up network interface persistence +rm -f /etc/udev/rules.d/70-persistent-net.rules; +mkdir -p /etc/udev/rules.d/70-persistent-net.rules; +rm -f /lib/udev/rules.d/75-persistent-net-generator.rules; +rm -rf /dev/.udev/; + +for ndev in `ls -1 /etc/sysconfig/network-scripts/ifcfg-*`; do + if [ "`basename $ndev`" != "ifcfg-lo" ]; then + sed -i '/^HWADDR/d' "$ndev"; + sed -i '/^UUID/d' "$ndev"; + fi +done + +# new-style network device naming for centos7 +if [ "$major_version" -eq 7 ]; then + # radio off & remove all interface configration + nmcli radio all off + /bin/systemctl stop NetworkManager.service + for ifcfg in `ls /etc/sysconfig/network-scripts/ifcfg-* |grep -v ifcfg-lo` ; do + rm -f $ifcfg + done + rm -rf /var/lib/NetworkManager/* + + echo "==> Setup /etc/rc.d/rc.local for EL7" + cat <<_EOF_ | cat >> /etc/rc.d/rc.local +#BENTO-BEGIN +LANG=C +# delete all connection +for con in \`nmcli -t -f uuid con\`; do + if [ "\$con" != "" ]; then + nmcli con del \$con + fi +done +# add gateway interface connection. +gwdev=\`nmcli dev | grep ethernet | egrep -v 'unmanaged' | head -n 1 | awk '{print \$1}'\` +if [ "\$gwdev" != "" ]; then + nmcli connection add type ethernet ifname \$gwdev con-name \$gwdev +fi +sed -i "/^#BENTO-BEGIN/,/^#BENTO-END/d" /etc/rc.d/rc.local +chmod -x /etc/rc.d/rc.local +#BENTO-END +_EOF_ + chmod +x /etc/rc.d/rc.local +fi + +echo "truncate any logs that have built up during the install" +find /var/log -type f -exec truncate --size=0 {} \; + +echo "remove the install log" +rm -f /root/anaconda-ks.cfg /root/original-ks.cfg + +echo "remove the contents of /tmp and /var/tmp" +rm -rf /tmp/* /var/tmp/* + +if [ "$major_version" -ge 7 ]; then + echo "Force a new random seed to be generated" + rm -f /var/lib/systemd/random-seed + + echo "Wipe netplan machine-id (DUID) so machines get unique ID generated on boot" + truncate -s 0 /etc/machine-id +fi + +echo "Clear the history so our install commands aren't there" +rm -f /root/.wget-hsts +export HISTSIZE=0 \ No newline at end of file diff --git a/packer_templates/almalinux/scripts/networking.sh b/packer_templates/almalinux/scripts/networking.sh new file mode 100644 index 000000000..de35e787d --- /dev/null +++ b/packer_templates/almalinux/scripts/networking.sh @@ -0,0 +1,27 @@ +#!/bin/sh -eux + +case "$PACKER_BUILDER_TYPE" in + +virtualbox-iso|virtualbox-ovf) + # Fix slow DNS: + # Add 'single-request-reopen' so it is included when /etc/resolv.conf is + # generated + # https://access.redhat.com/site/solutions/58625 (subscription required) + + echo 'RES_OPTIONS="single-request-reopen"' >>/etc/sysconfig/network; + + # determine the major EL version we're runninng + major_version="`sed 's/^.\+ release \([.0-9]\+\).*/\1/' /etc/redhat-release | awk -F. '{print $1}'`"; + + if [ "$major_version" -ge 8 ]; then + nmcli networking off + sleep 5 + nmcli networking on + else + service network restart; + fi + + echo 'Slow DNS fix applied (single-request-reopen)'; + ;; + +esac diff --git a/packer_templates/almalinux/scripts/update.sh b/packer_templates/almalinux/scripts/update.sh new file mode 100644 index 000000000..fe6b85f89 --- /dev/null +++ b/packer_templates/almalinux/scripts/update.sh @@ -0,0 +1,21 @@ +#!/bin/sh -eux + +# determine the major EL version we're runninng +major_version="`sed 's/^.\+ release \([.0-9]\+\).*/\1/' /etc/redhat-release | awk -F. '{print $1}'`"; + +# make sure we use dnf on EL 8+ +if [ "$major_version" -ge 8 ]; then + dnf -y update +else + yum -y update +fi + +# Updating the oracle release on at least OL 6 updates the repos and unlocks a whole +# new set of updates that need to be applied. If this script is there it should be run +if [ -f "/usr/bin/ol_yum_configure.sh" ]; then + /usr/bin/ol_yum_configure.sh + yum -y update +fi + +reboot; +sleep 60; diff --git a/packer_templates/centos/centos-7.9-x86_64.json b/packer_templates/centos/centos-7.9-x86_64.json index 7dfdc3476..eed9b6af3 100644 --- a/packer_templates/centos/centos-7.9-x86_64.json +++ b/packer_templates/centos/centos-7.9-x86_64.json @@ -43,7 +43,7 @@ "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, - "version": "12", + "version": 19, "ssh_timeout": "10000s", "ssh_username": "vagrant", "tools_upload_flavor": "linux", diff --git a/packer_templates/centos/centos-8.5-x86_64.json b/packer_templates/centos/centos-8.5-x86_64.json index c893782aa..97d0cd6fe 100644 --- a/packer_templates/centos/centos-8.5-x86_64.json +++ b/packer_templates/centos/centos-8.5-x86_64.json @@ -39,7 +39,7 @@ "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, - "version": "12", + "version": 19, "ssh_timeout": "10000s", "ssh_username": "vagrant", "tools_upload_flavor": "linux", diff --git a/packer_templates/centos/centos-stream-8-x86_64.json b/packer_templates/centos/centos-stream-8-x86_64.json index e4c1837f0..5c5bec360 100644 --- a/packer_templates/centos/centos-stream-8-x86_64.json +++ b/packer_templates/centos/centos-stream-8-x86_64.json @@ -39,7 +39,7 @@ "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, - "version": "12", + "version": 19, "ssh_timeout": "10000s", "ssh_username": "vagrant", "tools_upload_flavor": "linux", diff --git a/packer_templates/fedora/fedora-35-x86_64.json b/packer_templates/fedora/fedora-35-x86_64.json index f73049f43..7d1c6121a 100644 --- a/packer_templates/fedora/fedora-35-x86_64.json +++ b/packer_templates/fedora/fedora-35-x86_64.json @@ -74,7 +74,7 @@ "ssh_username": "vagrant", "tools_upload_flavor": "linux", "type": "vmware-iso", - "version": "11", + "version": 19, "vm_name": "{{ user `template` }}", "vmx_data": { "cpuid.coresPerSocket": "1", diff --git a/packer_templates/fedora/fedora-36-x86_64.json b/packer_templates/fedora/fedora-36-x86_64.json index c660f7859..e26be798c 100644 --- a/packer_templates/fedora/fedora-36-x86_64.json +++ b/packer_templates/fedora/fedora-36-x86_64.json @@ -74,7 +74,7 @@ "ssh_username": "vagrant", "tools_upload_flavor": "linux", "type": "vmware-iso", - "version": "11", + "version": 19, "vm_name": "{{ user `template` }}", "vmx_data": { "cpuid.coresPerSocket": "1", diff --git a/packer_templates/oraclelinux/oracle-6.10-x86_64.json b/packer_templates/oraclelinux/oracle-6.10-x86_64.json index 2ceb50b30..7226d0a3e 100644 --- a/packer_templates/oraclelinux/oracle-6.10-x86_64.json +++ b/packer_templates/oraclelinux/oracle-6.10-x86_64.json @@ -43,7 +43,7 @@ "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, - "version": "12", + "version": 19, "ssh_timeout": "10000s", "ssh_username": "vagrant", "tools_upload_flavor": "linux", diff --git a/packer_templates/oraclelinux/oracle-8.5-x86_64.json b/packer_templates/oraclelinux/oracle-8.5-x86_64.json index 17e81ec10..b203b92df 100644 --- a/packer_templates/oraclelinux/oracle-8.5-x86_64.json +++ b/packer_templates/oraclelinux/oracle-8.5-x86_64.json @@ -39,7 +39,7 @@ "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, - "version": "12", + "version": 19, "ssh_timeout": "10000s", "ssh_username": "vagrant", "tools_upload_flavor": "linux", diff --git a/packer_templates/rockylinux/rockylinux-8.5-x86_64.json b/packer_templates/rockylinux/rockylinux-8.6-x86_64.json similarity index 94% rename from packer_templates/rockylinux/rockylinux-8.5-x86_64.json rename to packer_templates/rockylinux/rockylinux-8.6-x86_64.json index e8325744d..42faf12ee 100644 --- a/packer_templates/rockylinux/rockylinux-8.5-x86_64.json +++ b/packer_templates/rockylinux/rockylinux-8.6-x86_64.json @@ -39,7 +39,7 @@ "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, - "version": "12", + "version": 19, "ssh_timeout": "10000s", "ssh_username": "vagrant", "tools_upload_flavor": "linux", @@ -167,9 +167,9 @@ } ], "variables": { - "box_basename": "rockylinux-8.5", + "box_basename": "rockylinux-8.6", "build_directory": "../../builds", - "build_timestamp": "{{isotime \"2019102650405\"}}", + "build_timestamp": "{{isotime \"202205152221\"}}", "cpus": "2", "disk_size": "65536", "git_revision": "__unknown_git_revision__", @@ -180,16 +180,16 @@ "https_proxy": "{{env `https_proxy`}}", "hyperv_generation": "1", "hyperv_switch": "bento", - "iso_checksum": "0081f8b969d0cef426530f6d618b962c7a01e71eb12a40581a83241f22dfdc25", - "iso_name": "Rocky-8.5-x86_64-dvd1.iso", + "iso_checksum": "1d48e0af63d07ff4e582a1819348e714c694e7fd33207f48879c2bc806960786", + "iso_name": "Rocky-8.6-x86_64-dvd1.iso", "ks_path": "8/ks.cfg", "memory": "1024", "mirror": "http://download.rockylinux.org/pub/rocky", - "mirror_directory": "8.5/isos/x86_64", - "name": "rockylinux-8.5", + "mirror_directory": "8.6/isos/x86_64", + "name": "rockylinux-8.6", "no_proxy": "{{env `no_proxy`}}", "qemu_display": "none", - "template": "rockylinux-8.5-x86_64", + "template": "rockylinux-8.6-x86_64", "boot_command": "<up><wait><tab> inst.text inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>", "version": "TIMESTAMP" } diff --git a/packer_templates/scientificlinux/scientific-7.9-x86_64.json b/packer_templates/scientificlinux/scientific-7.9-x86_64.json index 184125a57..c3671bfc6 100644 --- a/packer_templates/scientificlinux/scientific-7.9-x86_64.json +++ b/packer_templates/scientificlinux/scientific-7.9-x86_64.json @@ -43,7 +43,7 @@ "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, - "version": "12", + "version": 19, "ssh_timeout": "10000s", "ssh_username": "vagrant", "tools_upload_flavor": "linux", diff --git a/packer_templates/springdalelinux/springdalelinux-7.9-x86_64.json b/packer_templates/springdalelinux/springdalelinux-7.9-x86_64.json index 300a6d06b..340663e48 100644 --- a/packer_templates/springdalelinux/springdalelinux-7.9-x86_64.json +++ b/packer_templates/springdalelinux/springdalelinux-7.9-x86_64.json @@ -39,7 +39,7 @@ "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, - "version": "12", + "version": 19, "ssh_timeout": "10000s", "ssh_username": "vagrant", "tools_upload_flavor": "linux", diff --git a/packer_templates/springdalelinux/springdalelinux-8.5-x86_64.json b/packer_templates/springdalelinux/springdalelinux-8.5-x86_64.json index e0f828ce2..e4d3f3f8f 100644 --- a/packer_templates/springdalelinux/springdalelinux-8.5-x86_64.json +++ b/packer_templates/springdalelinux/springdalelinux-8.5-x86_64.json @@ -39,7 +39,7 @@ "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, - "version": "12", + "version": 19, "ssh_timeout": "10000s", "ssh_username": "vagrant", "tools_upload_flavor": "linux", diff --git a/packer_templates/windows/answer_files/11/Autounattend.xml b/packer_templates/windows/answer_files/11/Autounattend.xml new file mode 100644 index 000000000..1c09214e2 --- /dev/null +++ b/packer_templates/windows/answer_files/11/Autounattend.xml @@ -0,0 +1,221 @@ +<?xml version="1.0" encoding="utf-8"?> +<unattend xmlns="urn:schemas-microsoft-com:unattend"> + <settings pass="windowsPE"> + <component name="Microsoft-Windows-PnpCustomizationsWinPE" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" processorArchitecture="amd64" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State"> + <!-- + This makes the VirtIO drivers available to Windows, assuming that + the VirtIO driver disk at https://fedorapeople.org/groups/virt/virtio-win/direct-downloads/stable-virtio/virtio-win.iso + (see https://docs.fedoraproject.org/en-US/quick-docs/creating-windows-virtual-machines-using-virtio-drivers/index.html#virtio-win-direct-downloads) + is available as drive E: + --> + <DriverPaths> + <PathAndCredentials wcm:action="add" wcm:keyValue="2"> + <Path>E:\viostor\w11\amd64</Path> + </PathAndCredentials> + + <PathAndCredentials wcm:action="add" wcm:keyValue="3"> + <Path>E:\NetKVM\w11\amd64</Path> + </PathAndCredentials> + + <PathAndCredentials wcm:action="add" wcm:keyValue="4"> + <Path>E:\Balloon\w11\amd64</Path> + </PathAndCredentials> + + <PathAndCredentials wcm:action="add" wcm:keyValue="5"> + <Path>E:\pvpanic\w11\amd64</Path> + </PathAndCredentials> + + <PathAndCredentials wcm:action="add" wcm:keyValue="6"> + <Path>E:\qemupciserial\w11\amd64</Path> + </PathAndCredentials> + + <PathAndCredentials wcm:action="add" wcm:keyValue="7"> + <Path>E:\qxldod\w11\amd64</Path> + </PathAndCredentials> + + <PathAndCredentials wcm:action="add" wcm:keyValue="8"> + <Path>E:\vioinput\w11\amd64</Path> + </PathAndCredentials> + + <PathAndCredentials wcm:action="add" wcm:keyValue="9"> + <Path>E:\viorng\w11\amd64</Path> + </PathAndCredentials> + + <PathAndCredentials wcm:action="add" wcm:keyValue="10"> + <Path>E:\vioscsi\w11\amd64</Path> + </PathAndCredentials> + + <PathAndCredentials wcm:action="add" wcm:keyValue="11"> + <Path>E:\vioserial\w11\amd64</Path> + </PathAndCredentials> + + <PathAndCredentials wcm:action="add" wcm:keyValue="12"> + <Path>E:\vioserial\w11\amd64</Path> + </PathAndCredentials> + </DriverPaths> + </component> + <component name="Microsoft-Windows-International-Core-WinPE" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <SetupUILanguage> + <UILanguage>en-US</UILanguage> + </SetupUILanguage> + <InputLocale>en-US</InputLocale> + <SystemLocale>en-US</SystemLocale> + <UILanguage>en-US</UILanguage> + <UILanguageFallback>en-US</UILanguageFallback> + <UserLocale>en-US</UserLocale> + </component> + <component name="Microsoft-Windows-Setup" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <DiskConfiguration> + <Disk wcm:action="add"> + <CreatePartitions> + <CreatePartition wcm:action="add"> + <Type>Primary</Type> + <Order>1</Order> + <Size>100</Size> + </CreatePartition> + <CreatePartition wcm:action="add"> + <Order>2</Order> + <Type>Primary</Type> + <Extend>true</Extend> + </CreatePartition> + </CreatePartitions> + <ModifyPartitions> + <ModifyPartition wcm:action="add"> + <Active>true</Active> + <Format>NTFS</Format> + <Label>boot</Label> + <Order>1</Order> + <PartitionID>1</PartitionID> + </ModifyPartition> + <ModifyPartition wcm:action="add"> + <Format>NTFS</Format> + <Label>Windows 11</Label> + <Letter>C</Letter> + <Order>2</Order> + <PartitionID>2</PartitionID> + </ModifyPartition> + </ModifyPartitions> + <DiskID>0</DiskID> + <WillWipeDisk>true</WillWipeDisk> + </Disk> + </DiskConfiguration> + <ImageInstall> + <OSImage> + <InstallFrom> + <MetaData wcm:action="add"> + <Key>/IMAGE/NAME</Key> + <Value>Windows 11 Enterprise Evaluation</Value> + </MetaData> + </InstallFrom> + <InstallTo> + <DiskID>0</DiskID> + <PartitionID>2</PartitionID> + </InstallTo> + </OSImage> + </ImageInstall> + <UserData> + <ProductKey> + <WillShowUI>OnError</WillShowUI> + </ProductKey> + <AcceptEula>true</AcceptEula> + <FullName>Vagrant</FullName> + <Organization>Bento by Chef Software, Inc.</Organization> + </UserData> + </component> + </settings> + <settings pass="generalize"> + <component name="Microsoft-Windows-Security-SPP" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <SkipRearm>1</SkipRearm> + </component> + <component name="Microsoft-Windows-PnpSysprep" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <PersistAllDeviceInstalls>false</PersistAllDeviceInstalls> + <DoNotCleanUpNonPresentDevices>false</DoNotCleanUpNonPresentDevices> + </component> + </settings> + <settings pass="oobeSystem"> + <component name="Microsoft-Windows-International-Core" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <InputLocale>en-US</InputLocale> + <SystemLocale>en-US</SystemLocale> + <UILanguage>en-US</UILanguage> + <UserLocale>en-US</UserLocale> + </component> + <component name="Microsoft-Windows-Shell-Setup" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <OOBE> + <HideEULAPage>true</HideEULAPage> + <HideLocalAccountScreen>true</HideLocalAccountScreen> + <HideOEMRegistrationScreen>true</HideOEMRegistrationScreen> + <HideOnlineAccountScreens>true</HideOnlineAccountScreens> + <HideWirelessSetupInOOBE>true</HideWirelessSetupInOOBE> + <NetworkLocation>Work</NetworkLocation> + <ProtectYourPC>3</ProtectYourPC> + <SkipMachineOOBE>true</SkipMachineOOBE> + <SkipUserOOBE>true</SkipUserOOBE> + </OOBE> + <TimeZone>UTC</TimeZone> + <UserAccounts> + <AdministratorPassword> + <Value>vagrant</Value> + <PlainText>true</PlainText> + </AdministratorPassword> + <LocalAccounts> + <LocalAccount wcm:action="add"> + <Password> + <Value>vagrant</Value> + <PlainText>true</PlainText> + </Password> + <Description>Vagrant User</Description> + <DisplayName>vagrant</DisplayName> + <Group>administrators</Group> + <Name>vagrant</Name> + </LocalAccount> + </LocalAccounts> + </UserAccounts> + <AutoLogon> + <Password> + <Value>vagrant</Value> + <PlainText>true</PlainText> + </Password> + <Username>vagrant</Username> + <Enabled>true</Enabled> + </AutoLogon> + <FirstLogonCommands> + <SynchronousCommand wcm:action="add"> + <CommandLine>cmd.exe /c powershell -Command "Set-ExecutionPolicy -ExecutionPolicy RemoteSigned -Force"</CommandLine> + <Description>Set Execution Policy 64 Bit</Description> + <Order>1</Order> + <RequiresUserInput>true</RequiresUserInput> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <CommandLine>C:\Windows\SysWOW64\cmd.exe /c powershell -Command "Set-ExecutionPolicy -ExecutionPolicy RemoteSigned -Force"</CommandLine> + <Description>Set Execution Policy 32 Bit</Description> + <Order>2</Order> + <RequiresUserInput>true</RequiresUserInput> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <CommandLine>powershell -NoLogo -ExecutionPolicy RemoteSigned -File a:\base_setup.ps1</CommandLine> + <Description>Configure WinRM so packer can connect to run Chef</Description> + <Order>3</Order> + <RequiresUserInput>false</RequiresUserInput> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <CommandLine>cmd.exe /c wmic useraccount where "name='vagrant'" set PasswordExpires=FALSE</CommandLine> + <Order>4</Order> + <Description>Disable password expiration for vagrant user</Description> + </SynchronousCommand> + </FirstLogonCommands> + </component> + </settings> + <settings pass="specialize"> + <component xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" name="Microsoft-Windows-ServerManager-SvrMgrNc" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> + <DoNotOpenServerManagerAtLogon>true</DoNotOpenServerManagerAtLogon> + </component> + <component xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" name="Microsoft-Windows-IE-ESC" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> + <!-- Disable IE ESC. --> + <IEHardenAdmin>false</IEHardenAdmin> + <IEHardenUser>false</IEHardenUser> + </component> + <component xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" name="Microsoft-Windows-OutOfBoxExperience" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> + <DoNotOpenInitialConfigurationTasksAtLogon>true</DoNotOpenInitialConfigurationTasksAtLogon> + </component> + </settings> +</unattend> diff --git a/packer_templates/windows/answer_files/11/gen2_Autounattend.xml b/packer_templates/windows/answer_files/11/gen2_Autounattend.xml new file mode 100644 index 000000000..89e9c2602 --- /dev/null +++ b/packer_templates/windows/answer_files/11/gen2_Autounattend.xml @@ -0,0 +1,257 @@ +<?xml version="1.0" encoding="utf-8"?> +<unattend xmlns="urn:schemas-microsoft-com:unattend"> + <settings pass="windowsPE"> + <component name="Microsoft-Windows-PnpCustomizationsWinPE" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" processorArchitecture="amd64" + xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State"> + <!-- + This makes the VirtIO drivers available to Windows, assuming that + the VirtIO driver disk at https://fedorapeople.org/groups/virt/virtio-win/direct-downloads/stable-virtio/virtio-win.iso + (see https://docs.fedoraproject.org/en-US/quick-docs/creating-windows-virtual-machines-using-virtio-drivers/index.html#virtio-win-direct-downloads) + is available as drive E: + --> + <DriverPaths> + <PathAndCredentials wcm:action="add" wcm:keyValue="2"> + <Path>F:\viostor\w11\amd64</Path> + </PathAndCredentials> + + <PathAndCredentials wcm:action="add" wcm:keyValue="3"> + <Path>F:\NetKVM\w11\amd64</Path> + </PathAndCredentials> + + <PathAndCredentials wcm:action="add" wcm:keyValue="4"> + <Path>F:\Balloon\w11\amd64</Path> + </PathAndCredentials> + + <PathAndCredentials wcm:action="add" wcm:keyValue="5"> + <Path>F:\pvpanic\w11\amd64</Path> + </PathAndCredentials> + + <PathAndCredentials wcm:action="add" wcm:keyValue="6"> + <Path>F:\qemupciserial\w11\amd64</Path> + </PathAndCredentials> + + <PathAndCredentials wcm:action="add" wcm:keyValue="7"> + <Path>F:\qxldod\w11\amd64</Path> + </PathAndCredentials> + + <PathAndCredentials wcm:action="add" wcm:keyValue="8"> + <Path>F:\vioinput\w11\amd64</Path> + </PathAndCredentials> + + <PathAndCredentials wcm:action="add" wcm:keyValue="9"> + <Path>F:\viorng\w11\amd64</Path> + </PathAndCredentials> + + <PathAndCredentials wcm:action="add" wcm:keyValue="10"> + <Path>F:\vioscsi\w11\amd64</Path> + </PathAndCredentials> + + <PathAndCredentials wcm:action="add" wcm:keyValue="11"> + <Path>F:\vioserial\w11\amd64</Path> + </PathAndCredentials> + + <PathAndCredentials wcm:action="add" wcm:keyValue="12"> + <Path>F:\vioserial\w11\amd64</Path> + </PathAndCredentials> + </DriverPaths> + </component> + <component name="Microsoft-Windows-International-Core-WinPE" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" + xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <SetupUILanguage> + <UILanguage>en-US</UILanguage> + </SetupUILanguage> + <InputLocale>en-US</InputLocale> + <SystemLocale>en-US</SystemLocale> + <UILanguage>en-US</UILanguage> + <UILanguageFallback>en-US</UILanguageFallback> + <UserLocale>en-US</UserLocale> + </component> + <component name="Microsoft-Windows-Setup" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" + xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <DiskConfiguration> + <Disk wcm:action="add"> + <CreatePartitions> + <CreatePartition wcm:action="add"> + <Order>1</Order> + <Size>350</Size> + <Type>Primary</Type> + </CreatePartition> + <CreatePartition wcm:action="add"> + <Order>2</Order> + <Size>100</Size> + <Type>EFI</Type> + </CreatePartition> + <CreatePartition wcm:action="add"> + <Order>3</Order> + <Size>128</Size> + <Type>MSR</Type> + </CreatePartition> + <CreatePartition wcm:action="add"> + <Order>4</Order> + <Extend>true</Extend> + <Type>Primary</Type> + </CreatePartition> + </CreatePartitions> + <ModifyPartitions> + <ModifyPartition wcm:action="add"> + <Order>1</Order> + <PartitionID>1</PartitionID> + <Label>WINRE</Label> + <Format>NTFS</Format> + <TypeID>de94bba4-06d1-4d40-a16a-bfd50179d6ac</TypeID> + </ModifyPartition> + <ModifyPartition wcm:action="add"> + <Order>2</Order> + <PartitionID>2</PartitionID> + <Label>System</Label> + <Format>FAT32</Format> + </ModifyPartition> + <ModifyPartition wcm:action="add"> + <Order>3</Order> + <PartitionID>3</PartitionID> + </ModifyPartition> + <ModifyPartition wcm:action="add"> + <Order>4</Order> + <PartitionID>4</PartitionID> + <Label>Windows</Label> + <Format>NTFS</Format> + </ModifyPartition> + </ModifyPartitions> + <DiskID>0</DiskID> + <WillWipeDisk>true</WillWipeDisk> + </Disk> + <WillShowUI>OnError</WillShowUI> + </DiskConfiguration> + <ImageInstall> + <OSImage> + <InstallFrom> + <MetaData wcm:action="add"> + <Key>/IMAGE/NAME</Key> + <Value>Windows 11 Enterprise Evaluation</Value> + </MetaData> + </InstallFrom> + <InstallTo> + <DiskID>0</DiskID> + <PartitionID>4</PartitionID> + </InstallTo> + </OSImage> + </ImageInstall> + <UserData> + <ProductKey> + <WillShowUI>OnError</WillShowUI> + </ProductKey> + <AcceptEula>true</AcceptEula> + <FullName>Vagrant</FullName> + <Organization>Bento by Chef Software, Inc.</Organization> + </UserData> + </component> + </settings> + <settings pass="generalize"> + <component name="Microsoft-Windows-Security-SPP" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" + xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <SkipRearm>1</SkipRearm> + </component> + <component name="Microsoft-Windows-PnpSysprep" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" + xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <PersistAllDeviceInstalls>false</PersistAllDeviceInstalls> + <DoNotCleanUpNonPresentDevices>false</DoNotCleanUpNonPresentDevices> + </component> + </settings> + <settings pass="oobeSystem"> + <component name="Microsoft-Windows-International-Core" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" + xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <InputLocale>en-US</InputLocale> + <SystemLocale>en-US</SystemLocale> + <UILanguage>en-US</UILanguage> + <UserLocale>en-US</UserLocale> + </component> + <component name="Microsoft-Windows-Shell-Setup" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" + xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <OOBE> + <HideEULAPage>true</HideEULAPage> + <HideLocalAccountScreen>true</HideLocalAccountScreen> + <HideOEMRegistrationScreen>true</HideOEMRegistrationScreen> + <HideOnlineAccountScreens>true</HideOnlineAccountScreens> + <HideWirelessSetupInOOBE>true</HideWirelessSetupInOOBE> + <NetworkLocation>Work</NetworkLocation> + <ProtectYourPC>3</ProtectYourPC> + <SkipMachineOOBE>true</SkipMachineOOBE> + <SkipUserOOBE>true</SkipUserOOBE> + </OOBE> + <TimeZone>UTC</TimeZone> + <UserAccounts> + <AdministratorPassword> + <Value>vagrant</Value> + <PlainText>true</PlainText> + </AdministratorPassword> + <LocalAccounts> + <LocalAccount wcm:action="add"> + <Password> + <Value>vagrant</Value> + <PlainText>true</PlainText> + </Password> + <Description>Vagrant User</Description> + <DisplayName>vagrant</DisplayName> + <Group>administrators</Group> + <Name>vagrant</Name> + </LocalAccount> + </LocalAccounts> + </UserAccounts> + <AutoLogon> + <Password> + <Value>vagrant</Value> + <PlainText>true</PlainText> + </Password> + <Username>vagrant</Username> + <Enabled>true</Enabled> + </AutoLogon> + <FirstLogonCommands> + <SynchronousCommand wcm:action="add"> + <CommandLine>cmd.exe /c powershell -Command "Set-ExecutionPolicy -ExecutionPolicy RemoteSigned -Force"</CommandLine> + <Description>Set Execution Policy 64 Bit</Description> + <Order>1</Order> + <RequiresUserInput>true</RequiresUserInput> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <CommandLine>C:\Windows\SysWOW64\cmd.exe /c powershell -Command "Set-ExecutionPolicy -ExecutionPolicy RemoteSigned -Force"</CommandLine> + <Description>Set Execution Policy 32 Bit</Description> + <Order>2</Order> + <RequiresUserInput>true</RequiresUserInput> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <CommandLine>powershell -NoLogo -ExecutionPolicy RemoteSigned -File e:\base_setup.ps1</CommandLine> + <Description>Configure WinRM so packer can connect to run Chef</Description> + <Order>3</Order> + <RequiresUserInput>false</RequiresUserInput> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <CommandLine>cmd.exe /c wmic useraccount where "name='vagrant'" set PasswordExpires=FALSE</CommandLine> + <Order>4</Order> + <Description>Disable password expiration for vagrant user</Description> + </SynchronousCommand> + </FirstLogonCommands> + </component> + </settings> + <settings pass="specialize"> + <component xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" name="Microsoft-Windows-ServerManager-SvrMgrNc" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> + <DoNotOpenServerManagerAtLogon>true</DoNotOpenServerManagerAtLogon> + </component> + <component xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" name="Microsoft-Windows-IE-ESC" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> + <!-- Disable IE ESC. --> + <IEHardenAdmin>false</IEHardenAdmin> + <IEHardenUser>false</IEHardenUser> + </component> + <component xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" name="Microsoft-Windows-OutOfBoxExperience" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> + <DoNotOpenInitialConfigurationTasksAtLogon>true</DoNotOpenInitialConfigurationTasksAtLogon> + </component> + </settings> +</unattend> diff --git a/packer_templates/windows/answer_files/2022/Autounattend.xml b/packer_templates/windows/answer_files/2022/Autounattend.xml new file mode 100644 index 000000000..82ceb0b89 --- /dev/null +++ b/packer_templates/windows/answer_files/2022/Autounattend.xml @@ -0,0 +1,289 @@ +<?xml version="1.0" encoding="utf-8"?> +<unattend xmlns="urn:schemas-microsoft-com:unattend"> + <settings pass="windowsPE"> + <component name="Microsoft-Windows-PnpCustomizationsWinPE" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" processorArchitecture="amd64" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State"> + <!-- + This makes the VirtIO drivers available to Windows, assuming that + the VirtIO driver disk at https://fedorapeople.org/groups/virt/virtio-win/direct-downloads/stable-virtio/virtio-win.iso + (see https://docs.fedoraproject.org/en-US/quick-docs/creating-windows-virtual-machines-using-virtio-drivers/index.html#virtio-win-direct-downloads) + is available as drive E: + --> + <DriverPaths> + <PathAndCredentials wcm:action="add" wcm:keyValue="2"> + <Path>E:\viostor\2k22\amd64</Path> + </PathAndCredentials> + + <PathAndCredentials wcm:action="add" wcm:keyValue="3"> + <Path>E:\NetKVM\2k22\amd64</Path> + </PathAndCredentials> + + <PathAndCredentials wcm:action="add" wcm:keyValue="4"> + <Path>E:\Balloon\2k22\amd64</Path> + </PathAndCredentials> + + <PathAndCredentials wcm:action="add" wcm:keyValue="5"> + <Path>E:\pvpanic\2k22\amd64</Path> + </PathAndCredentials> + + <PathAndCredentials wcm:action="add" wcm:keyValue="6"> + <Path>E:\qemupciserial\2k22\amd64</Path> + </PathAndCredentials> + + <PathAndCredentials wcm:action="add" wcm:keyValue="7"> + <Path>E:\qxldod\2k22\amd64</Path> + </PathAndCredentials> + + <PathAndCredentials wcm:action="add" wcm:keyValue="8"> + <Path>E:\vioinput\2k22\amd64</Path> + </PathAndCredentials> + + <PathAndCredentials wcm:action="add" wcm:keyValue="9"> + <Path>E:\viorng\2k22\amd64</Path> + </PathAndCredentials> + + <PathAndCredentials wcm:action="add" wcm:keyValue="10"> + <Path>E:\vioscsi\2k22\amd64</Path> + </PathAndCredentials> + + <PathAndCredentials wcm:action="add" wcm:keyValue="11"> + <Path>E:\vioserial\2k22\amd64</Path> + </PathAndCredentials> + </DriverPaths> + </component> + <component name="Microsoft-Windows-International-Core-WinPE" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <SetupUILanguage> + <UILanguage>en-US</UILanguage> + </SetupUILanguage> + <InputLocale>en-US</InputLocale> + <SystemLocale>en-US</SystemLocale> + <UILanguage>en-US</UILanguage> + <UILanguageFallback>en-US</UILanguageFallback> + <UserLocale>en-US</UserLocale> + </component> + <component name="Microsoft-Windows-Setup" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <DiskConfiguration> + <Disk wcm:action="add"> + <CreatePartitions> + <CreatePartition wcm:action="add"> + <Type>Primary</Type> + <Order>1</Order> + <Size>350</Size> + </CreatePartition> + <CreatePartition wcm:action="add"> + <Order>2</Order> + <Type>Primary</Type> + <Extend>true</Extend> + </CreatePartition> + </CreatePartitions> + <ModifyPartitions> + <ModifyPartition wcm:action="add"> + <Active>true</Active> + <Format>NTFS</Format> + <Label>boot</Label> + <Order>1</Order> + <PartitionID>1</PartitionID> + </ModifyPartition> + <ModifyPartition wcm:action="add"> + <Format>NTFS</Format> + <Label>Windows 2022</Label> + <Letter>C</Letter> + <Order>2</Order> + <PartitionID>2</PartitionID> + </ModifyPartition> + </ModifyPartitions> + <DiskID>0</DiskID> + <WillWipeDisk>true</WillWipeDisk> + </Disk> + </DiskConfiguration> + <ImageInstall> + <OSImage> + <InstallFrom> + <MetaData wcm:action="add"> + <Key>/IMAGE/NAME</Key> + <Value>Windows Server 2022 SERVERDATACENTER</Value> + </MetaData> + </InstallFrom> + <InstallTo> + <DiskID>0</DiskID> + <PartitionID>2</PartitionID> + </InstallTo> + </OSImage> + </ImageInstall> + <UserData> + <ProductKey> + <WillShowUI>OnError</WillShowUI> + </ProductKey> + <AcceptEula>true</AcceptEula> + <FullName>Vagrant</FullName> + <Organization>Bento by Chef Software, Inc.</Organization> + </UserData> + </component> + </settings> + <settings pass="generalize"> + <component name="Microsoft-Windows-Security-SPP" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <SkipRearm>1</SkipRearm> + </component> + <component name="Microsoft-Windows-PnpSysprep" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <PersistAllDeviceInstalls>false</PersistAllDeviceInstalls> + <DoNotCleanUpNonPresentDevices>false</DoNotCleanUpNonPresentDevices> + </component> + </settings> + <settings pass="oobeSystem"> + <component name="Microsoft-Windows-International-Core" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <InputLocale>en-US</InputLocale> + <SystemLocale>en-US</SystemLocale> + <UILanguage>en-US</UILanguage> + <UserLocale>en-US</UserLocale> + </component> + <component name="Microsoft-Windows-Shell-Setup" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <OOBE> + <HideEULAPage>true</HideEULAPage> + <HideLocalAccountScreen>true</HideLocalAccountScreen> + <HideOEMRegistrationScreen>true</HideOEMRegistrationScreen> + <HideOnlineAccountScreens>true</HideOnlineAccountScreens> + <HideWirelessSetupInOOBE>true</HideWirelessSetupInOOBE> + <NetworkLocation>Home</NetworkLocation> + <ProtectYourPC>3</ProtectYourPC> + <SkipMachineOOBE>true</SkipMachineOOBE> + <SkipUserOOBE>true</SkipUserOOBE> + </OOBE> + <TimeZone>UTC</TimeZone> + <UserAccounts> + <AdministratorPassword> + <Value>vagrant</Value> + <PlainText>true</PlainText> + </AdministratorPassword> + <LocalAccounts> + <LocalAccount wcm:action="add"> + <Password> + <Value>vagrant</Value> + <PlainText>true</PlainText> + </Password> + <Description>Vagrant User</Description> + <DisplayName>vagrant</DisplayName> + <Group>administrators</Group> + <Name>vagrant</Name> + </LocalAccount> + </LocalAccounts> + </UserAccounts> + <AutoLogon> + <Password> + <Value>vagrant</Value> + <PlainText>true</PlainText> + </Password> + <Username>vagrant</Username> + <Enabled>true</Enabled> + </AutoLogon> + <FirstLogonCommands> + <SynchronousCommand wcm:action="add"> + <CommandLine>cmd.exe /c powershell -Command "Set-ExecutionPolicy -ExecutionPolicy RemoteSigned -Force"</CommandLine> + <Description>Set Execution Policy 64 Bit</Description> + <Order>1</Order> + <RequiresUserInput>true</RequiresUserInput> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <CommandLine>C:\Windows\SysWOW64\cmd.exe /c powershell -Command "Set-ExecutionPolicy -ExecutionPolicy RemoteSigned -Force"</CommandLine> + <Description>Set Execution Policy 32 Bit</Description> + <Order>2</Order> + <RequiresUserInput>true</RequiresUserInput> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <CommandLine>cmd.exe /c winrm quickconfig -q</CommandLine> + <Description>winrm quickconfig -q</Description> + <Order>3</Order> + <RequiresUserInput>true</RequiresUserInput> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <CommandLine>cmd.exe /c winrm quickconfig -transport:http</CommandLine> + <Description>winrm quickconfig -transport:http</Description> + <Order>4</Order> + <RequiresUserInput>true</RequiresUserInput> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <CommandLine>cmd.exe /c winrm set winrm/config @{MaxTimeoutms="1800000"}</CommandLine> + <Description>Win RM MaxTimoutms</Description> + <Order>5</Order> + <RequiresUserInput>true</RequiresUserInput> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <CommandLine>cmd.exe /c winrm set winrm/config/winrs @{MaxMemoryPerShellMB="800"}</CommandLine> + <Description>Win RM MaxMemoryPerShellMB</Description> + <Order>6</Order> + <RequiresUserInput>true</RequiresUserInput> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <CommandLine>cmd.exe /c winrm set winrm/config/service @{AllowUnencrypted="true"}</CommandLine> + <Description>Win RM AllowUnencrypted</Description> + <Order>7</Order> + <RequiresUserInput>true</RequiresUserInput> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <CommandLine>cmd.exe /c winrm set winrm/config/service/auth @{Basic="true"}</CommandLine> + <Description>Win RM auth Basic</Description> + <Order>8</Order> + <RequiresUserInput>true</RequiresUserInput> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <CommandLine>cmd.exe /c winrm set winrm/config/client/auth @{Basic="true"}</CommandLine> + <Description>Win RM client auth Basic</Description> + <Order>9</Order> + <RequiresUserInput>true</RequiresUserInput> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <CommandLine>cmd.exe /c winrm set winrm/config/listener?Address=*+Transport=HTTP @{Port="5985"} </CommandLine> + <Description>Win RM listener Address/Port</Description> + <Order>10</Order> + <RequiresUserInput>true</RequiresUserInput> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <CommandLine>cmd.exe /c netsh advfirewall firewall set rule group="remote administration" new enable=yes </CommandLine> + <Description>Win RM adv firewall enable</Description> + <Order>11</Order> + <RequiresUserInput>true</RequiresUserInput> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <CommandLine>cmd.exe /c netsh firewall add portopening TCP 5985 "Port 5985" </CommandLine> + <Description>Win RM port open</Description> + <Order>12</Order> + <RequiresUserInput>true</RequiresUserInput> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <CommandLine>cmd.exe /c net stop winrm </CommandLine> + <Description>Stop Win RM Service </Description> + <Order>13</Order> + <RequiresUserInput>true</RequiresUserInput> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <CommandLine>cmd.exe /c sc config winrm start= auto</CommandLine> + <Description>Win RM Autostart</Description> + <Order>14</Order> + <RequiresUserInput>true</RequiresUserInput> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <CommandLine>cmd.exe /c net start winrm</CommandLine> + <Description>Start Win RM Service</Description> + <Order>15</Order> + <RequiresUserInput>true</RequiresUserInput> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <CommandLine>cmd.exe /c wmic useraccount where "name='vagrant'" set PasswordExpires=FALSE</CommandLine> + <Order>16</Order> + <Description>Disable password expiration for vagrant user</Description> + </SynchronousCommand> + </FirstLogonCommands> + </component> + </settings> + <settings pass="specialize"> + <component xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" name="Microsoft-Windows-ServerManager-SvrMgrNc" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> + <DoNotOpenServerManagerAtLogon>true</DoNotOpenServerManagerAtLogon> + </component> + <component xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" name="Microsoft-Windows-IE-ESC" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> + <!-- Disable IE ESC. --> + <IEHardenAdmin>false</IEHardenAdmin> + <IEHardenUser>false</IEHardenUser> + </component> + <component xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" name="Microsoft-Windows-OutOfBoxExperience" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> + <DoNotOpenInitialConfigurationTasksAtLogon>true</DoNotOpenInitialConfigurationTasksAtLogon> + </component> + </settings> +</unattend> diff --git a/packer_templates/windows/scripts/base_setup.ps1 b/packer_templates/windows/scripts/base_setup.ps1 index 3689725be..d66fb8d90 100644 --- a/packer_templates/windows/scripts/base_setup.ps1 +++ b/packer_templates/windows/scripts/base_setup.ps1 @@ -1,5 +1,12 @@ Write-Host "Performing the WinRM setup necessary to get the host ready for packer to run Chef..." +# Make 100% sure we prevent Packer from connecting to WinRM while we +# attempt to configure everything +Disable-NetFirewallRule -DisplayGroup 'Windows Remote Management' + +# Disable UAC +Set-ItemProperty -Path "registry::HKLM\Software\Microsoft\Windows\CurrentVersion\Policies\System" -Name "EnableLUA" -Value 0 + # parts of this are from https://github.com/luciusbono/Packer-Windows10/blob/master/configure-winrm.ps1 # and https://github.com/rgl/windows-2016-vagrant/blob/master/winrm.ps1 @@ -15,9 +22,29 @@ Enable-PSRemoting -SkipNetworkProfileCheck -Force # May not be necessary since we set the profile to Private above Set-NetFirewallRule -Name "WINRM-HTTP-In-TCP" -RemoteAddress Any # allow winrm over public profile interfaces -winrm set "winrm/config" '@{MaxTimeoutms="1800000"}' -winrm set "winrm/config/winrs" '@{MaxMemoryPerShellMB="2048"}' -winrm set "winrm/config/service" '@{AllowUnencrypted="true"}' -winrm set "winrm/config/service/auth" '@{Basic="true"}' +Write-Host '* Deleting any pre-existing listeners' +winrm delete winrm/config/listener?Address=*+Transport=HTTP 2>$Null +winrm delete winrm/config/listener?Address=*+Transport=HTTPS 2>$Null +Write-Host '* Creating an HTTP listener' +winrm create winrm/config/listener?Address=*+Transport=HTTP | Out-Null +winrm create winrm/config/listener?Address=*+Transport=HTTPS | Out-Null + +winrm set winrm/config '@{MaxTimeoutms="1800000"}' +winrm set winrm/config/winrs '@{MaxMemoryPerShellMB="2048"}' +winrm set winrm/config/service '@{AllowUnencrypted="true"}' +winrm set winrm/config/service/auth '@{Basic="true"}' +winrm set winrm/config/client/auth '@{Basic="true"}' + +# Restart WinRM service +Stop-Service -Name "winrm" +Set-Service -Name "winrm" -StartupType "Automatic" +Start-Service -Name "winrm" + +# Enable WinRM in Firewall for any remote address +Get-NetFirewallRule -DisplayGroup "Windows Remote Management" | Get-NetFirewallAddressFilter | Set-NetFirewallAddressFilter -RemoteAddress Any +Enable-NetFirewallRule -DisplayGroup "Windows Remote Management" + +# Allow time to view output before window is closed +Start-Sleep -Seconds 2 exit 0 diff --git a/packer_templates/windows/windows-10.json b/packer_templates/windows/windows-10.json index 0b4142153..9ed60c143 100644 --- a/packer_templates/windows/windows-10.json +++ b/packer_templates/windows/windows-10.json @@ -113,7 +113,7 @@ "tools_upload_flavor": "windows", "tools_upload_path": "c:/Windows/Temp/vmware.iso", "type": "vmware-iso", - "version": 11, + "version": 19, "winrm_password": "vagrant", "winrm_timeout": "12h", "winrm_username": "vagrant" @@ -165,7 +165,7 @@ [ { "keep_input_artifact": true, - "output": "{{ user `template` }}-{{.Provider}}.box", + "output": "{{ user `build_directory` }}/{{ user `template` }}-{{.Provider}}.box", "type": "vagrant", "vagrantfile_template": "{{template_dir}}/vagrantfile-windows.template" } @@ -181,7 +181,6 @@ "packer::disable_uac", "packer::disable_restore", "packer::disable_windows_update", - "packer::remove_defender", "packer::configure_power", "packer::disable_screensaver" ], diff --git a/packer_templates/windows/windows-10gen2.json b/packer_templates/windows/windows-10gen2.json index 9f436c5f6..65e61602b 100644 --- a/packer_templates/windows/windows-10gen2.json +++ b/packer_templates/windows/windows-10gen2.json @@ -69,7 +69,7 @@ "post-processors": [ { "keep_input_artifact": true, - "output": "{{.Provider}}_windows-10.box", + "output": "{{ user `build_directory` }}/{{.Provider}}_windows-10.box", "type": "vagrant", "vagrantfile_template": "{{template_dir}}/{{user `template`}}" } @@ -84,7 +84,6 @@ "packer::disable_uac", "packer::disable_restore", "packer::disable_windows_update", - "packer::remove_defender", "packer::configure_power", "packer::disable_screensaver" ], @@ -129,7 +128,7 @@ ], "variables": { "autounattend": "Autounattend.xml", - "build_directory": "", + "build_directory": "../../builds", "build_version": "1", "cpus": "2", "disk_size": "61440", diff --git a/packer_templates/windows/windows-11.json b/packer_templates/windows/windows-11.json new file mode 100644 index 000000000..e73f27646 --- /dev/null +++ b/packer_templates/windows/windows-11.json @@ -0,0 +1,284 @@ +{ + "builders": [ + { + "boot_command": [ + "<leftShiftOn><f10><leftShiftOff><wait>", + "reg add HKLM\\SYSTEM\\Setup\\LabConfig /t REG_DWORD /v BypassTPMCheck /d 1<return>", + "reg add HKLM\\SYSTEM\\Setup\\LabConfig /t REG_DWORD /v BypassSecureBootCheck /d 1<return><wait>", + "exit<return>", + "<wait><return>" + ], + "boot_wait": "2m", + "communicator": "winrm", + "cpus": "{{ user `cpus` }}", + "disk_size": "{{user `disk_size`}}", + "floppy_files": [ + "{{ user `floppy_dir` }}/{{ user `unattended_file_path` }}", + "{{template_dir}}/scripts/base_setup.ps1" + ], + "headless": "{{ user `headless` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_url": "{{ user `iso_url` }}", + "memory": "{{ user `memory` }}", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-virtualbox", + "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"", + "shutdown_timeout": "15m", + "switch_name": "{{user `hyperv_switch`}}", + "type": "hyperv-iso", + "winrm_password": "vagrant", + "winrm_timeout": "12h", + "winrm_username": "vagrant" + }, + { + "boot_command": [ + "<leftShiftOn><f10><leftShiftOff><wait>", + "reg add HKLM\\SYSTEM\\Setup\\LabConfig /t REG_DWORD /v BypassTPMCheck /d 1<return>", + "reg add HKLM\\SYSTEM\\Setup\\LabConfig /t REG_DWORD /v BypassSecureBootCheck /d 1<return><wait>", + "exit<return>", + "<wait><return>" + ], + "boot_wait": "2m", + "communicator": "winrm", + "cpus": "{{ user `cpus` }}", + "disk_size": "{{user `disk_size`}}", + "floppy_files": [ + "{{ user `floppy_dir` }}/{{ user `unattended_file_path` }}", + "{{template_dir}}/scripts/base_setup.ps1" + ], + "guest_additions_mode": "{{ user `guest_additions_mode` }}", + "guest_additions_path": "C:/users/vagrant/VBoxGuestAdditions.iso", + "guest_additions_url": "{{ user `guest_additions_url` }}", + "guest_os_type": "Windows11_64", + "hard_drive_interface": "sata", + "headless": "{{ user `headless` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_interface": "ide", + "guest_additions_interface": "sata", + "iso_url": "{{ user `iso_url` }}", + "memory": "{{ user `memory` }}", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-virtualbox", + "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"", + "shutdown_timeout": "15m", + "type": "virtualbox-iso", + "vboxmanage": [ + [ + "modifyvm", + "{{.Name}}", + "--vram", + "48" + ], + [ + "modifyvm", + "{{.Name}}", + "--audio", + "none" + ] + ], + "winrm_password": "vagrant", + "winrm_timeout": "12h", + "winrm_username": "vagrant" + }, + { + "boot_command": [ + "<leftShiftOn><f10><leftShiftOff><wait>", + "reg add HKLM\\SYSTEM\\Setup\\LabConfig /t REG_DWORD /v BypassTPMCheck /d 1<return>", + "reg add HKLM\\SYSTEM\\Setup\\LabConfig /t REG_DWORD /v BypassSecureBootCheck /d 1<return><wait>", + "exit<return>", + "<wait><return>" + ], + "boot_wait": "2m", + "communicator": "winrm", + "cpus": "{{ user `cpus` }}", + "disk_size": "{{user `disk_size`}}", + "floppy_files": [ + "{{ user `floppy_dir` }}/{{ user `unattended_file_path` }}", + "{{template_dir}}/scripts/base_setup.ps1" + ], + "guest_os_type": "win-11", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_url": "{{ user `iso_url` }}", + "memory": "{{ user `memory` }}", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-parallels", + "parallels_tools_flavor": "win", + "parallels_tools_mode": "attach", + "prlctl": [ + [ + "set", + "{{.Name}}", + "--efi-boot", + "off" + ] + ], + "prlctl_version_file": ".prlctl_version", + "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"", + "shutdown_timeout": "15m", + "type": "parallels-iso", + "winrm_password": "vagrant", + "winrm_timeout": "12h", + "winrm_username": "vagrant" + }, + { + "boot_command": [ + "<leftShiftOn><f10><leftShiftOff><wait>", + "reg add HKLM\\SYSTEM\\Setup\\LabConfig /t REG_DWORD /v BypassTPMCheck /d 1<return>", + "reg add HKLM\\SYSTEM\\Setup\\LabConfig /t REG_DWORD /v BypassSecureBootCheck /d 1<return><wait>", + "exit<return>", + "<wait><return>" + ], + "boot_wait": "2m", + "communicator": "winrm", + "cpus": "{{ user `cpus` }}", + "disk_adapter_type": "lsisas1068", + "disk_size": "{{user `disk_size`}}", + "floppy_files": [ + "{{ user `floppy_dir` }}/{{ user `unattended_file_path` }}", + "{{template_dir}}/scripts/base_setup.ps1" + ], + "guest_os_type": "windows9srv-64", + "headless": "{{ user `headless` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_url": "{{ user `iso_url` }}", + "memory": "{{ user `memory` }}", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-vmware", + "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"", + "shutdown_timeout": "15m", + "tools_upload_flavor": "windows", + "tools_upload_path": "c:/Windows/Temp/vmware.iso", + "type": "vmware-iso", + "version": 19, + "winrm_password": "vagrant", + "winrm_timeout": "12h", + "winrm_username": "vagrant" + }, + { + "boot_command": [ + "<leftShiftOn><f10><leftShiftOff><wait>", + "reg add HKLM\\SYSTEM\\Setup\\LabConfig /t REG_DWORD /v BypassTPMCheck /d 1<return>", + "reg add HKLM\\SYSTEM\\Setup\\LabConfig /t REG_DWORD /v BypassSecureBootCheck /d 1<return><wait>", + "exit<return>", + "<wait><return>" + ], + "boot_wait": "2m", + "communicator": "winrm", + "cpus": "{{ user `cpus` }}", + "disk_size": "{{user `disk_size`}}", + "floppy_files": [ + "{{ user `floppy_dir` }}/{{ user `unattended_file_path` }}", + "{{template_dir}}/scripts/base_setup.ps1" + ], + "headless": "{{ user `headless` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_url": "{{ user `iso_url` }}", + "memory": "{{ user `memory` }}", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-qemu", + "qemuargs": [ + [ + "-m", + "{{ user `memory` }}" + ], + [ + "-smp", + "{{ user `cpus` }}" + ], + [ + "-drive", + "file={{ user `virtio_win_iso` }},media=cdrom,index=3" + ], + [ + "-drive", + "file={{ user `build_directory` }}/packer-{{ user `template` }}-qemu/{{ .Name }},if=virtio,cache=writeback,discard=ignore,format=qcow2,index=1" + ], + [ + "-display", + "{{ user `qemu_display` }}" + ] + ], + "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"", + "shutdown_timeout": "15m", + "type": "qemu", + "winrm_password": "vagrant", + "winrm_timeout": "12h", + "winrm_username": "vagrant" + } + ], + "post-processors": [ + [ + { + "keep_input_artifact": true, + "output": "{{ user `build_directory` }}/{{ user `template` }}-{{.Provider}}.box", + "type": "vagrant", + "vagrantfile_template": "{{template_dir}}/vagrantfile-windows.template" + } + ] + ], + "provisioners": [ + { + "cookbook_paths": [ + "{{template_dir}}/cookbooks" + ], + "guest_os_type": "windows", + "run_list": [ + "packer::disable_uac", + "packer::disable_restore", + "packer::disable_windows_update", + "packer::configure_power", + "packer::disable_screensaver" + ], + "type": "chef-solo" + }, + { + "type": "windows-restart" + }, + { + "cookbook_paths": [ + "{{template_dir}}/cookbooks" + ], + "guest_os_type": "windows", + "run_list": [ + "packer::vm_tools", + "packer::features", + "packer::enable_file_sharing", + "packer::enable_remote_desktop", + "packer::ui_tweaks" + ], + "type": "chef-solo" + }, + { + "type": "windows-restart" + }, + { + "cookbook_paths": [ + "{{template_dir}}/cookbooks" + ], + "guest_os_type": "windows", + "run_list": [ + "packer::cleanup", + "packer::defrag" + ], + "type": "chef-solo" + }, + { + "elevated_password": "vagrant", + "elevated_user": "vagrant", + "script": "{{template_dir}}/scripts/cleanup.ps1", + "type": "powershell" + } + ], + "variables": { + "build_directory": "../../builds", + "cpus": "2", + "disk_size": "40000", + "floppy_dir": "{{template_dir}}/answer_files", + "guest_additions_mode": "attach", + "guest_additions_url": "", + "headless": "true", + "hyperv_switch": "bento", + "iso_checksum": "sha256:e8b1d2a1a85a09b4bf6154084a8be8e3c814894a15a7bcf3e8e63fcfa9a528cb", + "iso_url": "https://software-download.microsoft.com/download/sg/22000.194.210913-1444.co_release_svc_refresh_CLIENTENTERPRISEEVAL_OEMRET_x64FRE_en-us.iso", + "memory": "4096", + "qemu_display": "none", + "template": "windows-11", + "unattended_file_path": "11/Autounattend.xml", + "virtio_win_iso": "~/virtio-win.iso" + } +} diff --git a/packer_templates/windows/windows-11gen2.json b/packer_templates/windows/windows-11gen2.json new file mode 100644 index 000000000..629a527af --- /dev/null +++ b/packer_templates/windows/windows-11gen2.json @@ -0,0 +1,161 @@ +{ + "builders": [ + { + "boot_command": [ + "aaaaaaa" + ], + "boot_wait": "1s", + "communicator": "winrm", + "cpus": "{{user `cpus`}}", + "enable_dynamic_memory": "true", + "enable_secure_boot": false, + "generation": "2", + "headless": "false", + "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", + "iso_url": "{{user `iso_url`}}", + "memory": "{{user `memory`}}", + "output_directory": "c:\\packer-build\\", + "secondary_iso_images": [], + "shutdown_command": "shutdown /s /t 10 /c \"Packer Shutdown\" /f /d p:4:1", + "shutdown_timeout": "15m", + "skip_export": false, + "switch_name": "{{user `hyperv_switch`}}", + "type": "hyperv-iso", + "winrm_password": "vagrant", + "winrm_timeout": "12h", + "winrm_username": "vagrant" + }, + { + "boot_command": [ + "aaaaaaa<wait><enter><wait><enter><wait><enter>" + ], + "communicator": "winrm", + "cpus": "{{ user `cpus` }}", + "disk_size": "{{user `disk_size`}}", + "headless": "{{ user `headless` }}", + "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", + "iso_url": "{{ user `iso_url` }}", + "memory": "{{ user `memory` }}", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-qemu", + "cd_files": "{{ user `cd_files` }}", + "disk_interface": "{{ user `disk_interface` }}", + "qemuargs": [ + [ + "-m", + "{{ user `memory` }}" + ], + [ + "-smp", + "{{ user `cpus` }}" + ], + [ + "-bios", + "{{ user `qemu_bios` }}" + ], + [ + "-display", + "{{ user `qemu_display` }}" + ] + ], + "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"", + "shutdown_timeout": "15m", + "type": "qemu", + "boot_wait": "{{ user `boot_wait` }}", + "winrm_password": "vagrant", + "winrm_timeout": "12h", + "winrm_username": "vagrant" + } + ], + "post-processors": [ + { + "keep_input_artifact": true, + "output": "{{ user `build_directory` }}/{{.Provider}}_windows-11.box", + "type": "vagrant", + "vagrantfile_template": "{{template_dir}}/{{user `template`}}" + } + ], + "provisioners": [ + { + "cookbook_paths": [ + "{{template_dir}}/cookbooks" + ], + "guest_os_type": "windows", + "run_list": [ + "packer::disable_uac", + "packer::disable_restore", + "packer::disable_windows_update", + "packer::configure_power", + "packer::disable_screensaver" + ], + "type": "chef-solo" + }, + { + "type": "windows-restart" + }, + { + "cookbook_paths": [ + "{{template_dir}}/cookbooks" + ], + "guest_os_type": "windows", + "run_list": [ + "packer::vm_tools", + "packer::features", + "packer::enable_file_sharing", + "packer::enable_remote_desktop", + "packer::ui_tweaks" + ], + "type": "chef-solo" + }, + { + "type": "windows-restart" + }, + { + "cookbook_paths": [ + "{{template_dir}}/cookbooks" + ], + "guest_os_type": "windows", + "run_list": [ + "packer::cleanup" + ], + "type": "chef-solo" + }, + { + "elevated_password": "vagrant", + "elevated_user": "vagrant", + "script": "{{template_dir}}/scripts/cleanup.ps1", + "type": "powershell" + } + ], + "variables": { + "autounattend": "Autounattend.xml", + "build_directory": "../../builds", + "build_version": "1", + "cpus": "2", + "disk_size": "61440", + "disk_type_id": "1", + "guest_additions_mode": "upload", + "headless": "false", + "hyperv_switch": "bento", + "iso_checksum": "684BC16ADBD792EF2F7810158A3F387F23BF95E1AEE5F16270C5B7F56DB753B6", + "iso_checksum_type": "sha256", + "iso_url": "https://software-static.download.prss.microsoft.com/sg/download/888969d5-f34g-4e03-ac9d-1f9786c66749/22000.318.211104-1236.co_release_svc_refresh_CLIENTENTERPRISEEVAL_OEMRET_x64FRE_en-us.iso", + "memory": "4096", + "package_location": "", + "restart_timeout": "5m", + "sysprep_unattended": "", + "template": "vagrantfile-windows-gen2.template", + "template_dir": "", + "unattend": "answer_files\\unattend.xml", + "vagrant_sysprep_unattended": "", + "vhv_enable": "false", + "virtio_win_iso": "virtio-win.iso", + "vm_name": "windows_11", + "winrm_timeout": "6h", + "working_directory": "", + "qemu_bios": "/usr/share/OVMF/OVMF_CODE.fd", + "qemu_display": "none", + "disk_interface": "ide", + "boot_wait": "10s", + "cd_files": "{{template_dir}}/answer_files/11/gen2_Autounattend.xml" + } +} diff --git a/packer_templates/windows/windows-2012.json b/packer_templates/windows/windows-2012.json index 2a883abbf..7ae82f254 100644 --- a/packer_templates/windows/windows-2012.json +++ b/packer_templates/windows/windows-2012.json @@ -108,7 +108,7 @@ "tools_upload_flavor": "windows", "tools_upload_path": "c:/Windows/Temp/vmware.iso", "type": "vmware-iso", - "version": 11, + "version": 19, "winrm_password": "vagrant", "winrm_timeout": "12h", "winrm_username": "vagrant" @@ -159,7 +159,7 @@ [ { "keep_input_artifact": true, - "output": "{{ user `template` }}-{{.Provider}}.box", + "output": "{{ user `build_directory` }}/{{ user `template` }}-{{.Provider}}.box", "type": "vagrant", "vagrantfile_template": "{{template_dir}}/vagrantfile-windows.template" } @@ -175,7 +175,6 @@ "packer::disable_uac", "packer::disable_restore", "packer::disable_windows_update", - "packer::remove_defender", "packer::configure_power", "packer::disable_screensaver" ], diff --git a/packer_templates/windows/windows-2012r2.json b/packer_templates/windows/windows-2012r2.json index 52459c760..6ff1a65ba 100644 --- a/packer_templates/windows/windows-2012r2.json +++ b/packer_templates/windows/windows-2012r2.json @@ -108,7 +108,7 @@ "tools_upload_flavor": "windows", "tools_upload_path": "c:/Windows/Temp/vmware.iso", "type": "vmware-iso", - "version": 11, + "version": 19, "winrm_password": "vagrant", "winrm_timeout": "12h", "winrm_username": "vagrant" @@ -159,7 +159,7 @@ [ { "keep_input_artifact": true, - "output": "{{ user `template` }}-{{.Provider}}.box", + "output": "{{ user `build_directory` }}/{{ user `template` }}-{{.Provider}}.box", "type": "vagrant", "vagrantfile_template": "{{template_dir}}/vagrantfile-windows.template" } @@ -175,7 +175,6 @@ "packer::disable_uac", "packer::disable_restore", "packer::disable_windows_update", - "packer::remove_defender", "packer::configure_power", "packer::disable_screensaver" ], diff --git a/packer_templates/windows/windows-2016.json b/packer_templates/windows/windows-2016.json index c865a0bf2..b65e66059 100644 --- a/packer_templates/windows/windows-2016.json +++ b/packer_templates/windows/windows-2016.json @@ -108,7 +108,7 @@ "tools_upload_flavor": "windows", "tools_upload_path": "c:/Windows/Temp/vmware.iso", "type": "vmware-iso", - "version": 11, + "version": 19, "winrm_password": "vagrant", "winrm_timeout": "12h", "winrm_username": "vagrant" @@ -159,7 +159,7 @@ [ { "keep_input_artifact": true, - "output": "{{ user `template` }}-{{.Provider}}.box", + "output": "{{ user `build_directory` }}/{{ user `template` }}-{{.Provider}}.box", "type": "vagrant", "vagrantfile_template": "{{template_dir}}/vagrantfile-windows.template" } @@ -175,7 +175,6 @@ "packer::disable_uac", "packer::disable_restore", "packer::disable_windows_update", - "packer::remove_defender", "packer::configure_power", "packer::disable_screensaver" ], diff --git a/packer_templates/windows/windows-2019.json b/packer_templates/windows/windows-2019.json index 51c4d0218..816b43be9 100644 --- a/packer_templates/windows/windows-2019.json +++ b/packer_templates/windows/windows-2019.json @@ -108,7 +108,7 @@ "tools_upload_flavor": "windows", "tools_upload_path": "c:/Windows/Temp/vmware.iso", "type": "vmware-iso", - "version": 11, + "version": 19, "winrm_password": "vagrant", "winrm_timeout": "12h", "winrm_username": "vagrant" @@ -159,7 +159,7 @@ [ { "keep_input_artifact": true, - "output": "{{ user `template` }}-{{.Provider}}.box", + "output": "{{ user `build_directory` }}/{{ user `template` }}-{{.Provider}}.box", "type": "vagrant", "vagrantfile_template": "{{template_dir}}/vagrantfile-windows.template" } @@ -175,7 +175,6 @@ "packer::disable_uac", "packer::disable_restore", "packer::disable_windows_update", - "packer::remove_defender", "packer::configure_power", "packer::disable_screensaver" ], diff --git a/packer_templates/windows/windows-2022.json b/packer_templates/windows/windows-2022.json new file mode 100644 index 000000000..3d6afa669 --- /dev/null +++ b/packer_templates/windows/windows-2022.json @@ -0,0 +1,238 @@ +{ + "builders": [ + { + "communicator": "winrm", + "cpus": "{{ user `cpus` }}", + "disk_size": "{{user `disk_size`}}", + "floppy_files": [ + "{{ user `floppy_dir` }}/{{ user `unattended_file_path` }}" + ], + "headless": "{{ user `headless` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_url": "{{ user `iso_url` }}", + "memory": "{{ user `memory` }}", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-virtualbox", + "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"", + "shutdown_timeout": "15m", + "switch_name": "{{user `hyperv_switch`}}", + "type": "hyperv-iso", + "winrm_password": "vagrant", + "winrm_timeout": "12h", + "winrm_username": "vagrant" + }, + { + "communicator": "winrm", + "cpus": "{{ user `cpus` }}", + "disk_size": "{{user `disk_size`}}", + "floppy_files": [ + "{{ user `floppy_dir` }}/{{ user `unattended_file_path` }}" + ], + "guest_additions_mode": "{{ user `guest_additions_mode` }}", + "guest_additions_path": "C:/users/vagrant/VBoxGuestAdditions.iso", + "guest_additions_url": "{{ user `guest_additions_url` }}", + "guest_os_type": "Windows2019_64", + "hard_drive_interface": "sata", + "iso_interface": "ide", + "guest_additions_interface": "sata", + "headless": "{{ user `headless` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_url": "{{ user `iso_url` }}", + "memory": "{{ user `memory` }}", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-virtualbox", + "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"", + "shutdown_timeout": "15m", + "type": "virtualbox-iso", + "vboxmanage": [ + [ + "modifyvm", + "{{.Name}}", + "--vram", + "48" + ], + [ + "modifyvm", + "{{.Name}}", + "--audio", + "none" + ] + ], + "winrm_password": "vagrant", + "winrm_timeout": "12h", + "winrm_username": "vagrant" + }, + { + "communicator": "winrm", + "cpus": "{{ user `cpus` }}", + "disk_size": "{{user `disk_size`}}", + "floppy_files": [ + "{{ user `floppy_dir` }}/{{ user `unattended_file_path` }}" + ], + "guest_os_type": "win-2019", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_url": "{{ user `iso_url` }}", + "memory": "{{ user `memory` }}", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-parallels", + "parallels_tools_flavor": "win", + "prlctl": [ + [ + "set", + "{{.Name}}", + "--efi-boot", + "off" + ] + ], + "prlctl_version_file": ".prlctl_version", + "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"", + "shutdown_timeout": "15m", + "type": "parallels-iso", + "winrm_password": "vagrant", + "winrm_timeout": "12h", + "winrm_username": "vagrant" + }, + { + "communicator": "winrm", + "cpus": "{{ user `cpus` }}", + "disk_adapter_type": "lsisas1068", + "disk_size": "{{user `disk_size`}}", + "floppy_files": [ + "{{ user `floppy_dir` }}/{{ user `unattended_file_path` }}" + ], + "guest_os_type": "windows9srv-64", + "headless": "{{ user `headless` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_url": "{{ user `iso_url` }}", + "memory": "{{ user `memory` }}", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-vmware", + "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"", + "shutdown_timeout": "15m", + "tools_upload_flavor": "windows", + "tools_upload_path": "c:/Windows/Temp/vmware.iso", + "type": "vmware-iso", + "version": 19, + "winrm_password": "vagrant", + "winrm_timeout": "12h", + "winrm_username": "vagrant" + }, + { + "communicator": "winrm", + "cpus": "{{ user `cpus` }}", + "disk_size": "{{user `disk_size`}}", + "floppy_files": [ + "{{ user `floppy_dir` }}/{{ user `unattended_file_path` }}" + ], + "headless": "{{ user `headless` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_url": "{{ user `iso_url` }}", + "memory": "{{ user `memory` }}", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-qemu", + "qemuargs": [ + [ + "-m", + "{{ user `memory` }}" + ], + [ + "-smp", + "{{ user `cpus` }}" + ], + [ + "-drive", + "file={{ user `virtio_win_iso` }},media=cdrom,index=3" + ], + [ + "-drive", + "file={{ user `build_directory` }}/packer-{{ user `template` }}-qemu/{{ .Name }},if=virtio,cache=writeback,discard=ignore,format=qcow2,index=1" + ], + [ + "-display", + "{{ user `qemu_display` }}" + ] + ], + "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"", + "shutdown_timeout": "15m", + "type": "qemu", + "winrm_password": "vagrant", + "winrm_timeout": "12h", + "winrm_username": "vagrant" + } + ], + "post-processors": [ + [ + { + "keep_input_artifact": true, + "output": "{{ user `build_directory` }}/{{ user `template` }}-{{.Provider}}.box", + "type": "vagrant", + "vagrantfile_template": "{{template_dir}}/vagrantfile-windows.template" + } + ] + ], + "provisioners": [ + { + "cookbook_paths": [ + "{{template_dir}}/cookbooks" + ], + "guest_os_type": "windows", + "run_list": [ + "packer::disable_uac", + "packer::disable_restore", + "packer::disable_windows_update", + "packer::configure_power", + "packer::disable_screensaver" + ], + "type": "chef-solo" + }, + { + "type": "windows-restart" + }, + { + "cookbook_paths": [ + "{{template_dir}}/cookbooks" + ], + "guest_os_type": "windows", + "run_list": [ + "packer::vm_tools", + "packer::features", + "packer::enable_file_sharing", + "packer::enable_remote_desktop", + "packer::ui_tweaks" + ], + "type": "chef-solo" + }, + { + "type": "windows-restart" + }, + { + "cookbook_paths": [ + "{{template_dir}}/cookbooks" + ], + "guest_os_type": "windows", + "run_list": [ + "packer::cleanup", + "packer::defrag" + ], + "type": "chef-solo" + }, + { + "elevated_password": "vagrant", + "elevated_user": "vagrant", + "script": "{{template_dir}}/scripts/cleanup.ps1", + "type": "powershell" + } + ], + "variables": { + "build_directory": "../../builds", + "cpus": "2", + "disk_size": "40000", + "floppy_dir": "{{template_dir}}/answer_files", + "guest_additions_mode": "attach", + "guest_additions_url": "", + "headless": "true", + "hyperv_switch": "bento", + "iso_checksum": "sha256:4f1457c4fe14ce48c9b2324924f33ca4f0470475e6da851b39ccbf98f44e7852", + "iso_url": "https://software-download.microsoft.com/download/sg/20348.169.210806-2348.fe_release_svc_refresh_SERVER_EVAL_x64FRE_en-us.iso", + "memory": "4096", + "qemu_display": "none", + "template": "windows-2022-standard", + "unattended_file_path": "2022/Autounattend.xml", + "virtio_win_iso": "~/virtio-win.iso" + } +} From 16192c49e6316d7ddc02d1583c9ab6d9ffa4582c Mon Sep 17 00:00:00 2001 From: Seth Grover <mero.mero.guero@gmail.com> Date: Mon, 11 Jul 2022 09:24:49 -0600 Subject: [PATCH 1465/1622] Update templates for Debian 11.4 release Signed-off-by: Seth Grover <mero.mero.guero@gmail.com> --- README.md | 6 +++--- builds.yml | 6 +++--- ...debian-11.3-amd64.json => debian-11.4-amd64.json} | 12 ++++++------ ...debian-11.3-arm64.json => debian-11.4-arm64.json} | 12 ++++++------ .../{debian-11.3-i386.json => debian-11.4-i386.json} | 12 ++++++------ 5 files changed, 24 insertions(+), 24 deletions(-) rename packer_templates/debian/{debian-11.3-amd64.json => debian-11.4-amd64.json} (95%) rename packer_templates/debian/{debian-11.3-arm64.json => debian-11.4-arm64.json} (92%) rename packer_templates/debian/{debian-11.3-i386.json => debian-11.4-i386.json} (96%) diff --git a/README.md b/README.md index 127aa74ca..be935cdb8 100644 --- a/README.md +++ b/README.md @@ -38,7 +38,7 @@ end To build a Debian vagrant box using the bento tool with the template available in the `packer_templates` dir, we can use the following command: ``` -bento build --cpus 2 packer_templates/debian/debian-11.3-i386.json +bento build --cpus 2 packer_templates/debian/debian-11.4-i386.json ``` Other available options: @@ -59,11 +59,11 @@ $ cd packer_templates/ubuntu $ packer build -only=virtualbox-iso ubuntu-18.04-amd64.json ``` -To build Debian 11.3 32bit boxes for all possible providers (simultaneously) +To build Debian 11.4 32bit boxes for all possible providers (simultaneously) ``` $ cd packer_templates/debian -$ packer build debian-11.3-i386.json +$ packer build debian-11.4-i386.json ``` To build CentOS 7.7 boxes for all providers except VMware and Parallels diff --git a/builds.yml b/builds.yml index af1ea11b7..f134f5129 100644 --- a/builds.yml +++ b/builds.yml @@ -12,9 +12,9 @@ public: - 'debian-10.11-arm64' - 'debian-10.11-i386' - 'debian-10.11' -- 'debian-11.3-arm64' -- 'debian-11.3-i386' -- 'debian-11.3' +- 'debian-11.4-arm64' +- 'debian-11.4-i386' +- 'debian-11.4' - 'fedora-35' - 'fedora-36' - 'freebsd-12.2-i386' diff --git a/packer_templates/debian/debian-11.3-amd64.json b/packer_templates/debian/debian-11.4-amd64.json similarity index 95% rename from packer_templates/debian/debian-11.3-amd64.json rename to packer_templates/debian/debian-11.4-amd64.json index 45f1a9ff0..8a55e4f97 100644 --- a/packer_templates/debian/debian-11.3-amd64.json +++ b/packer_templates/debian/debian-11.4-amd64.json @@ -130,7 +130,7 @@ } ], "variables": { - "box_basename": "debian-11.3", + "box_basename": "debian-11.4", "build_directory": "../../builds", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "2", @@ -141,17 +141,17 @@ "http_directory": "{{template_dir}}/http", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", - "iso_checksum": "7892981e1da216e79fb3a1536ce5ebab157afdd20048fe458f2ae34fbc26c19b", - "iso_name": "debian-11.3.0-amd64-netinst.iso", + "iso_checksum": "d490a35d36030592839f24e468a5b818c919943967012037d6ab3d65d030ef7f", + "iso_name": "debian-11.4.0-amd64-netinst.iso", "memory": "1024", "mirror": "http://cdimage.debian.org/cdimage/release", - "mirror_directory": "11.3.0/amd64/iso-cd", - "name": "debian-11.3", + "mirror_directory": "11.4.0/amd64/iso-cd", + "name": "debian-11.4", "no_proxy": "{{env `no_proxy`}}", "preseed_path": "debian-9/preseed.cfg", "qemu_display": "none", "qemu_bios": "bios-256k.bin", - "template": "debian-11.3-amd64", + "template": "debian-11.4-amd64", "boot_command": "<esc><wait>install <wait> preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}} <wait>debian-installer=en_US.UTF-8 <wait>auto <wait>locale=en_US.UTF-8 <wait>kbd-chooser/method=us <wait>keyboard-configuration/xkb-keymap=us <wait>netcfg/get_hostname={{ .Name }} <wait>netcfg/get_domain=vagrantup.com <wait>fb=false <wait>debconf/frontend=noninteractive <wait>console-setup/ask_detect=false <wait>console-keymaps-at/keymap=us <wait>grub-installer/bootdev=default <wait><enter><wait>", "version": "TIMESTAMP" } diff --git a/packer_templates/debian/debian-11.3-arm64.json b/packer_templates/debian/debian-11.4-arm64.json similarity index 92% rename from packer_templates/debian/debian-11.3-arm64.json rename to packer_templates/debian/debian-11.4-arm64.json index 532f1e5dd..aaf8d9651 100644 --- a/packer_templates/debian/debian-11.3-arm64.json +++ b/packer_templates/debian/debian-11.4-arm64.json @@ -76,7 +76,7 @@ } ], "variables": { - "box_basename": "debian-11.3-arm64", + "box_basename": "debian-11.4-arm64", "build_directory": "../../builds", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "2", @@ -87,16 +87,16 @@ "http_directory": "{{template_dir}}/http", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", - "iso_checksum": "5420115f57a4961c6fb8b31e3eb4c7058d730251837749a27d5878775679c519", - "iso_name": "debian-11.3.0-arm64-netinst.iso", + "iso_checksum": "0193e7b555011a6f8fa6ad132066873fad4a5396a9ebfca8fd179122bb4c7fdd", + "iso_name": "debian-11.4.0-arm64-netinst.iso", "memory": "1024", "mirror": "http://cdimage.debian.org/cdimage/release", - "mirror_directory": "11.3.0/arm64/iso-cd", - "name": "debian-11.3-arm64", + "mirror_directory": "11.4.0/arm64/iso-cd", + "name": "debian-11.4-arm64", "no_proxy": "{{env `no_proxy`}}", "preseed_path": "debian-9/preseed.cfg", "qemu_display": "none", - "template": "debian-11.3-arm64", + "template": "debian-11.4-arm64", "version": "TIMESTAMP" } } diff --git a/packer_templates/debian/debian-11.3-i386.json b/packer_templates/debian/debian-11.4-i386.json similarity index 96% rename from packer_templates/debian/debian-11.3-i386.json rename to packer_templates/debian/debian-11.4-i386.json index acce23799..ec2e03fd7 100644 --- a/packer_templates/debian/debian-11.3-i386.json +++ b/packer_templates/debian/debian-11.4-i386.json @@ -197,7 +197,7 @@ } ], "variables": { - "box_basename": "debian-11.3-i386", + "box_basename": "debian-11.4-i386", "build_directory": "../../builds", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "2", @@ -208,16 +208,16 @@ "http_directory": "{{template_dir}}/http", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", - "iso_checksum": "196770582e9f4f4d34cf412ccdf8118b247e90274843055d627b97ed65a2c5ca", - "iso_name": "debian-11.3.0-i386-netinst.iso", + "iso_checksum": "b369b7eaeee2e897649bf3a8d00036e596149605456d038cad8da4a809333f3d", + "iso_name": "debian-11.4.0-i386-netinst.iso", "memory": "1024", "mirror": "http://cdimage.debian.org/cdimage/release", - "mirror_directory": "11.3.0/i386/iso-cd", - "name": "debian-11.3-i386", + "mirror_directory": "11.4.0/i386/iso-cd", + "name": "debian-11.4-i386", "no_proxy": "{{env `no_proxy`}}", "preseed_path": "debian-9/preseed.cfg", "qemu_display": "none", - "template": "debian-11.3-i386", + "template": "debian-11.4-i386", "version": "TIMESTAMP" } } From e830f5c82709aabd7738a04228be8612d7a79a56 Mon Sep 17 00:00:00 2001 From: Phillip Ross <phillipross@users.noreply.github.com> Date: Wed, 20 Jul 2022 15:59:52 -0400 Subject: [PATCH 1466/1622] Add RockyLinux 9.0 (#1420) * * Add RockyLinux 9.0 * Separate rockylinux scripts and kickstart files from CentOS Signed-off-by: Phillip Ross <phillip.w.g.ross@gmail.com> --- packer_templates/rockylinux/http/8/ks.cfg | 77 +++++++ packer_templates/rockylinux/http/9/ks.cfg | 76 +++++++ .../rockylinux/rockylinux-8.6-x86_64.json | 8 +- .../rockylinux/rockylinux-9.0-x86_64.json | 196 ++++++++++++++++++ .../rockylinux/scripts/cleanup.sh | 113 ++++++++++ .../rockylinux/scripts/networking.sh | 27 +++ packer_templates/rockylinux/scripts/update.sh | 21 ++ 7 files changed, 514 insertions(+), 4 deletions(-) create mode 100644 packer_templates/rockylinux/http/8/ks.cfg create mode 100644 packer_templates/rockylinux/http/9/ks.cfg create mode 100644 packer_templates/rockylinux/rockylinux-9.0-x86_64.json create mode 100644 packer_templates/rockylinux/scripts/cleanup.sh create mode 100644 packer_templates/rockylinux/scripts/networking.sh create mode 100644 packer_templates/rockylinux/scripts/update.sh diff --git a/packer_templates/rockylinux/http/8/ks.cfg b/packer_templates/rockylinux/http/8/ks.cfg new file mode 100644 index 000000000..595f4950f --- /dev/null +++ b/packer_templates/rockylinux/http/8/ks.cfg @@ -0,0 +1,77 @@ +install +cdrom +lang en_US.UTF-8 +keyboard us +network --bootproto=dhcp --noipv6 --onboot=on --device=eth0 +rootpw --plaintext vagrant +firewall --disabled +selinux --permissive +timezone UTC +bootloader --timeout=1 --location=mbr --append="net.ifnames=0 biosdevname=0" +text +skipx +zerombr +clearpart --all --initlabel +autopart --nohome --nolvm --noboot +firstboot --disabled +reboot --eject +user --name=vagrant --plaintext --password vagrant + +%packages --ignoremissing --excludedocs --instLangs=en_US.utf8 +# vagrant needs this to copy initial files via scp +openssh-clients +sudo +selinux-policy-devel +wget +nfs-utils +net-tools +tar +bzip2 +deltarpm +rsync +dnf-utils +redhat-lsb-core +elfutils-libelf-devel +network-scripts +-fprintd-pam +-intltool +-iwl*-firmware +-microcode_ctl +%end + +%post +# sudo +echo 'Defaults:vagrant !requiretty' > /etc/sudoers.d/vagrant +echo '%vagrant ALL=(ALL) NOPASSWD: ALL' >> /etc/sudoers.d/vagrant +chmod 440 /etc/sudoers.d/vagrant + +# Enable hyper-v daemons only if using hyper-v virtualization +if [ $(virt-what) == "hyperv" ]; then + dnf -y install hyperv-daemons cifs-utils + systemctl enable hypervvssd + systemctl enable hypervkvpd +fi + +# Since we disable consistent network naming, we need to make sure the eth0 +# configuration file is in place so it will come up. +# Delete other network configuration first because RHEL/C7 networking will not +# restart successfully if there are configuration files for devices that do not +# exist. +rm -f /etc/sysconfig/network-scripts/ifcfg-e* +cat > /etc/sysconfig/network-scripts/ifcfg-eth0 << _EOF_ +TYPE=Ethernet +PROXY_METHOD=none +BROWSER_ONLY=no +BOOTPROTO=dhcp +DEFROUTE=yes +IPV4_FAILURE_FATAL=no +IPV6INIT=yes +IPV6_AUTOCONF=yes +IPV6_DEFROUTE=yes +IPV6_FAILURE_FATAL=no +IPV6_ADDR_GEN_MODE=stable-privacy +NAME=eth0 +DEVICE=eth0 +ONBOOT=yes +_EOF_ +%end diff --git a/packer_templates/rockylinux/http/9/ks.cfg b/packer_templates/rockylinux/http/9/ks.cfg new file mode 100644 index 000000000..c4336df02 --- /dev/null +++ b/packer_templates/rockylinux/http/9/ks.cfg @@ -0,0 +1,76 @@ +cdrom +lang en_US.UTF-8 +keyboard us +network --bootproto=dhcp --noipv6 --onboot=on --device=eth0 +rootpw --plaintext vagrant +firewall --disabled +selinux --permissive +timezone UTC +bootloader --timeout=1 --location=mbr --append="net.ifnames=0 biosdevname=0" +text +skipx +zerombr +clearpart --all --initlabel +autopart --nohome --nolvm --noboot +firstboot --disabled +reboot --eject +user --name=vagrant --plaintext --password vagrant + +%packages --ignoremissing --excludedocs +# vagrant needs this to copy initial files via scp +openssh-clients +sudo +selinux-policy-devel +wget +nfs-utils +net-tools +tar +bzip2 +deltarpm +rsync +dnf-utils +redhat-lsb-core +elfutils-libelf-devel +network-scripts +-fprintd-pam +-intltool +-iwl*-firmware +-microcode_ctl +%end + +%post +# sudo +echo 'Defaults:vagrant !requiretty' > /etc/sudoers.d/vagrant +echo '%vagrant ALL=(ALL) NOPASSWD: ALL' >> /etc/sudoers.d/vagrant +chmod 440 /etc/sudoers.d/vagrant + +# Enable hyper-v daemons only if using hyper-v virtualization +if [ $(virt-what) == "hyperv" ]; then + dnf -y install hyperv-daemons cifs-utils + systemctl enable hypervvssd + systemctl enable hypervkvpd +fi + +# Since we disable consistent network naming, we need to make sure the eth0 +# configuration file is in place so it will come up. +# Delete other network configuration first because RHEL/C7 networking will not +# restart successfully if there are configuration files for devices that do not +# exist. +rm -f /etc/sysconfig/network-scripts/ifcfg-e* +cat > /etc/sysconfig/network-scripts/ifcfg-eth0 << _EOF_ +TYPE=Ethernet +PROXY_METHOD=none +BROWSER_ONLY=no +BOOTPROTO=dhcp +DEFROUTE=yes +IPV4_FAILURE_FATAL=no +IPV6INIT=yes +IPV6_AUTOCONF=yes +IPV6_DEFROUTE=yes +IPV6_FAILURE_FATAL=no +IPV6_ADDR_GEN_MODE=stable-privacy +NAME=eth0 +DEVICE=eth0 +ONBOOT=yes +_EOF_ +%end diff --git a/packer_templates/rockylinux/rockylinux-8.6-x86_64.json b/packer_templates/rockylinux/rockylinux-8.6-x86_64.json index 42faf12ee..06b2be3a5 100644 --- a/packer_templates/rockylinux/rockylinux-8.6-x86_64.json +++ b/packer_templates/rockylinux/rockylinux-8.6-x86_64.json @@ -152,15 +152,15 @@ "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", "expect_disconnect": true, "scripts": [ - "{{template_dir}}/../centos/scripts/update.sh", + "{{template_dir}}/scripts/update.sh", "{{template_dir}}/../_common/motd.sh", "{{template_dir}}/../_common/sshd.sh", - "{{template_dir}}/../centos/scripts/networking.sh", + "{{template_dir}}/scripts/networking.sh", "{{template_dir}}/../_common/vagrant.sh", "{{template_dir}}/../_common/virtualbox.sh", "{{template_dir}}/../_common/vmware.sh", "{{template_dir}}/../_common/parallels.sh", - "{{template_dir}}/../centos/scripts/cleanup.sh", + "{{template_dir}}/scripts/cleanup.sh", "{{template_dir}}/../_common/minimize.sh" ], "type": "shell" @@ -175,7 +175,7 @@ "git_revision": "__unknown_git_revision__", "guest_additions_url": "", "headless": "", - "http_directory": "{{template_dir}}/../centos/http", + "http_directory": "{{template_dir}}/http", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", "hyperv_generation": "1", diff --git a/packer_templates/rockylinux/rockylinux-9.0-x86_64.json b/packer_templates/rockylinux/rockylinux-9.0-x86_64.json new file mode 100644 index 000000000..04a74d169 --- /dev/null +++ b/packer_templates/rockylinux/rockylinux-9.0-x86_64.json @@ -0,0 +1,196 @@ +{ + "builders": [ + { + "boot_command": "{{ user `boot_command` }}", + "boot_wait": "5s", + "cpus": "{{ user `cpus` }}", + "disk_size": "{{user `disk_size`}}", + "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "guest_additions_url": "{{ user `guest_additions_url` }}", + "guest_os_type": "RedHat_64", + "hard_drive_interface": "sata", + "headless": "{{ user `headless` }}", + "http_directory": "{{user `http_directory`}}", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "memory": "{{ user `memory` }}", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-virtualbox", + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_timeout": "10000s", + "ssh_username": "vagrant", + "type": "virtualbox-iso", + "virtualbox_version_file": ".vbox_version", + "vm_name": "{{ user `template` }}" + }, + { + "boot_command": "{{ user `boot_command` }}", + "boot_wait": "5s", + "cpus": "{{ user `cpus` }}", + "disk_size": "{{user `disk_size`}}", + "guest_os_type": "centos-64", + "headless": "{{ user `headless` }}", + "http_directory": "{{user `http_directory`}}", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "memory": "{{ user `memory` }}", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-vmware", + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", + "ssh_password": "vagrant", + "ssh_port": 22, + "version": 19, + "ssh_timeout": "10000s", + "ssh_username": "vagrant", + "tools_upload_flavor": "linux", + "type": "vmware-iso", + "vm_name": "{{ user `template` }}", + "vmx_data": { + "cpuid.coresPerSocket": "1" + }, + "vmx_remove_ethernet_interfaces": true + }, + { + "boot_command": "{{user `boot_command`}}", + "boot_wait": "5s", + "cpus": "{{ user `cpus` }}", + "disk_size": "{{user `disk_size`}}", + "guest_os_type": "centos", + "http_directory": "{{user `http_directory`}}", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "memory": "{{ user `memory` }}", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-parallels", + "parallels_tools_flavor": "lin", + "prlctl_version_file": ".prlctl_version", + "prlctl": [ + [ + "set", + "{{.Name}}", + "--3d-accelerate", + "off" + ], + [ + "set", + "{{.Name}}", + "--videosize", + "16" + ] + ], + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_timeout": "10000s", + "ssh_username": "vagrant", + "type": "parallels-iso", + "vm_name": "{{ user `template` }}" + }, + { + "boot_command": [ + "<wait5><up><wait5><tab> text ks=hd:fd0:/ks.cfg<enter><wait5><esc>" + ], + "boot_wait": "5s", + "cpus": "{{ user `cpus` }}", + "disk_size": "{{user `disk_size`}}", + "floppy_files": [ + "{{user `http_directory`}}/{{user `ks_path`}}" + ], + "generation": "{{user `hyperv_generation`}}", + "guest_additions_mode": "disable", + "http_directory": "{{user `http_directory`}}", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "memory": "{{ user `memory` }}", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-hyperv", + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_timeout": "10000s", + "ssh_username": "vagrant", + "switch_name": "{{ user `hyperv_switch`}}", + "type": "hyperv-iso", + "vm_name": "{{ user `template` }}" + }, + { + "boot_command": "{{ user `boot_command` }}", + "boot_wait": "5s", + "cpus": "{{ user `cpus` }}", + "disk_size": "{{user `disk_size`}}", + "headless": "{{ user `headless` }}", + "http_directory": "{{user `http_directory`}}", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "memory": "{{ user `memory` }}", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-qemu", + "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_timeout": "10000s", + "ssh_username": "vagrant", + "type": "qemu", + "vm_name": "{{ user `template` }}", + "qemuargs": [ + [ "-m", "{{ user `memory` }}" ], + [ "-display", "{{ user `qemu_display` }}" ] + ] + } + ], + "post-processors": [ + { + "output": "{{ user `build_directory` }}/{{user `box_basename`}}.{{.Provider}}.box", + "type": "vagrant" + } + ], + "provisioners": [ + { + "environment_vars": [ + "HOME_DIR=/home/vagrant", + "http_proxy={{user `http_proxy`}}", + "https_proxy={{user `https_proxy`}}", + "no_proxy={{user `no_proxy`}}" + ], + "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", + "expect_disconnect": true, + "scripts": [ + "{{template_dir}}/scripts/update.sh", + "{{template_dir}}/../_common/motd.sh", + "{{template_dir}}/../_common/sshd.sh", + "{{template_dir}}/scripts/networking.sh", + "{{template_dir}}/../_common/vagrant.sh", + "{{template_dir}}/../_common/virtualbox.sh", + "{{template_dir}}/../_common/vmware.sh", + "{{template_dir}}/../_common/parallels.sh", + "{{template_dir}}/scripts/cleanup.sh", + "{{template_dir}}/../_common/minimize.sh" + ], + "type": "shell" + } + ], + "variables": { + "box_basename": "rockylinux-9.0", + "build_directory": "../../builds", + "build_timestamp": "{{isotime \"202207180452\"}}", + "cpus": "2", + "disk_size": "65536", + "git_revision": "__unknown_git_revision__", + "guest_additions_url": "", + "headless": "", + "http_directory": "{{template_dir}}/http", + "http_proxy": "{{env `http_proxy`}}", + "https_proxy": "{{env `https_proxy`}}", + "hyperv_generation": "1", + "hyperv_switch": "bento", + "iso_checksum": "55dbf904b35969be9f6d96f042b7470d1a3cb5c953bba47ab8f79740560d8a8d", + "iso_name": "Rocky-9.0-x86_64-dvd.iso", + "ks_path": "9/ks.cfg", + "memory": "1024", + "mirror": "http://download.rockylinux.org/pub/rocky", + "mirror_directory": "9/isos/x86_64", + "name": "rockylinux-9.0", + "no_proxy": "{{env `no_proxy`}}", + "qemu_display": "none", + "template": "rockylinux-9.0-x86_64", + "boot_command": "<up><wait><tab> inst.text inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>", + "version": "TIMESTAMP" + } +} diff --git a/packer_templates/rockylinux/scripts/cleanup.sh b/packer_templates/rockylinux/scripts/cleanup.sh new file mode 100644 index 000000000..0651a7c04 --- /dev/null +++ b/packer_templates/rockylinux/scripts/cleanup.sh @@ -0,0 +1,113 @@ +#!/bin/sh -eux + +# should output one of 'redhat' 'centos' 'oraclelinux' +distro="`rpm -qf --queryformat '%{NAME}' /etc/redhat-release | cut -f 1 -d '-'`" + +major_version="`sed 's/^.\+ release \([.0-9]\+\).*/\1/' /etc/redhat-release | awk -F. '{print $1}'`"; + + +echo "reduce the grub menu time to 1 second" +if ! [ "$major_version" -eq 6 ]; then + sed -i -e 's/^GRUB_TIMEOUT=[0-9]\+$/GRUB_TIMEOUT=1/' /etc/default/grub + grub2-mkconfig -o /boot/grub2/grub.cfg +fi + +# make sure we use dnf on EL 8+ +if [ "$major_version" -ge 8 ]; then + pkg_cmd="dnf" +else + pkg_cmd="yum" +fi + + +echo "Remove development and kernel source packages" +$pkg_cmd -y remove gcc cpp gc kernel-devel kernel-headers glibc-devel elfutils-libelf-devel glibc-headers kernel-devel kernel-headers + +if [ "$major_version" -ge 8 ]; then + echo "remove orphaned packages" + dnf -y autoremove + echo "Remove previous kernels that preserved for rollbacks" + dnf -y remove -y $(dnf repoquery --installonly --latest-limit=-1 -q) +else + echo "Remove previous kernels that preserved for rollbacks" + if ! command -v package-cleanup >/dev/null 2>&1; then + yum -y install yum-utils + fi + package-cleanup --oldkernels --count=1 -y +fi + +# Avoid ~200 meg firmware package we don't need +# this cannot be done in the KS file so we do it here +echo "Removing extra firmware packages" +$pkg_cmd -y remove linux-firmware + +if [ "$distro" != 'redhat' ]; then + echo "clean all package cache information" + $pkg_cmd -y clean all --enablerepo=\*; +fi + +# Clean up network interface persistence +rm -f /etc/udev/rules.d/70-persistent-net.rules; +mkdir -p /etc/udev/rules.d/70-persistent-net.rules; +rm -f /lib/udev/rules.d/75-persistent-net-generator.rules; +rm -rf /dev/.udev/; + +for ndev in `ls -1 /etc/sysconfig/network-scripts/ifcfg-*`; do + if [ "`basename $ndev`" != "ifcfg-lo" ]; then + sed -i '/^HWADDR/d' "$ndev"; + sed -i '/^UUID/d' "$ndev"; + fi +done + +# new-style network device naming for centos7 +if [ "$major_version" -eq 7 ]; then + # radio off & remove all interface configration + nmcli radio all off + /bin/systemctl stop NetworkManager.service + for ifcfg in `ls /etc/sysconfig/network-scripts/ifcfg-* |grep -v ifcfg-lo` ; do + rm -f $ifcfg + done + rm -rf /var/lib/NetworkManager/* + + echo "==> Setup /etc/rc.d/rc.local for EL7" + cat <<_EOF_ | cat >> /etc/rc.d/rc.local +#BENTO-BEGIN +LANG=C +# delete all connection +for con in \`nmcli -t -f uuid con\`; do + if [ "\$con" != "" ]; then + nmcli con del \$con + fi +done +# add gateway interface connection. +gwdev=\`nmcli dev | grep ethernet | egrep -v 'unmanaged' | head -n 1 | awk '{print \$1}'\` +if [ "\$gwdev" != "" ]; then + nmcli connection add type ethernet ifname \$gwdev con-name \$gwdev +fi +sed -i "/^#BENTO-BEGIN/,/^#BENTO-END/d" /etc/rc.d/rc.local +chmod -x /etc/rc.d/rc.local +#BENTO-END +_EOF_ + chmod +x /etc/rc.d/rc.local +fi + +echo "truncate any logs that have built up during the install" +find /var/log -type f -exec truncate --size=0 {} \; + +echo "remove the install log" +rm -f /root/anaconda-ks.cfg /root/original-ks.cfg + +echo "remove the contents of /tmp and /var/tmp" +rm -rf /tmp/* /var/tmp/* + +if [ "$major_version" -ge 7 ]; then + echo "Force a new random seed to be generated" + rm -f /var/lib/systemd/random-seed + + echo "Wipe netplan machine-id (DUID) so machines get unique ID generated on boot" + truncate -s 0 /etc/machine-id +fi + +echo "Clear the history so our install commands aren't there" +rm -f /root/.wget-hsts +export HISTSIZE=0 \ No newline at end of file diff --git a/packer_templates/rockylinux/scripts/networking.sh b/packer_templates/rockylinux/scripts/networking.sh new file mode 100644 index 000000000..de35e787d --- /dev/null +++ b/packer_templates/rockylinux/scripts/networking.sh @@ -0,0 +1,27 @@ +#!/bin/sh -eux + +case "$PACKER_BUILDER_TYPE" in + +virtualbox-iso|virtualbox-ovf) + # Fix slow DNS: + # Add 'single-request-reopen' so it is included when /etc/resolv.conf is + # generated + # https://access.redhat.com/site/solutions/58625 (subscription required) + + echo 'RES_OPTIONS="single-request-reopen"' >>/etc/sysconfig/network; + + # determine the major EL version we're runninng + major_version="`sed 's/^.\+ release \([.0-9]\+\).*/\1/' /etc/redhat-release | awk -F. '{print $1}'`"; + + if [ "$major_version" -ge 8 ]; then + nmcli networking off + sleep 5 + nmcli networking on + else + service network restart; + fi + + echo 'Slow DNS fix applied (single-request-reopen)'; + ;; + +esac diff --git a/packer_templates/rockylinux/scripts/update.sh b/packer_templates/rockylinux/scripts/update.sh new file mode 100644 index 000000000..fe6b85f89 --- /dev/null +++ b/packer_templates/rockylinux/scripts/update.sh @@ -0,0 +1,21 @@ +#!/bin/sh -eux + +# determine the major EL version we're runninng +major_version="`sed 's/^.\+ release \([.0-9]\+\).*/\1/' /etc/redhat-release | awk -F. '{print $1}'`"; + +# make sure we use dnf on EL 8+ +if [ "$major_version" -ge 8 ]; then + dnf -y update +else + yum -y update +fi + +# Updating the oracle release on at least OL 6 updates the repos and unlocks a whole +# new set of updates that need to be applied. If this script is there it should be run +if [ -f "/usr/bin/ol_yum_configure.sh" ]; then + /usr/bin/ol_yum_configure.sh + yum -y update +fi + +reboot; +sleep 60; From f64feff1b5590251a64cdce08c7177aa08df017c Mon Sep 17 00:00:00 2001 From: Pavel Podkorytov <pod.pavel@gmail.com> Date: Thu, 21 Jul 2022 03:02:26 +0500 Subject: [PATCH 1467/1622] Add oracle-9.0 (#1417) * Add oracle-9.0 Signed-off-by: Pavel Podkorytov <pod.pavel@gmail.com> --- packer_templates/oraclelinux/http/9/ks.cfg | 76 ++++++++ .../oraclelinux/oracle-9.0-x86_64.json | 182 ++++++++++++++++++ .../oraclelinux/scripts/cleanup.sh | 111 +++++++++++ .../oraclelinux/scripts/networking.sh | 27 +++ .../oraclelinux/scripts/update.sh | 21 ++ 5 files changed, 417 insertions(+) create mode 100644 packer_templates/oraclelinux/http/9/ks.cfg create mode 100644 packer_templates/oraclelinux/oracle-9.0-x86_64.json create mode 100644 packer_templates/oraclelinux/scripts/cleanup.sh create mode 100644 packer_templates/oraclelinux/scripts/networking.sh create mode 100644 packer_templates/oraclelinux/scripts/update.sh diff --git a/packer_templates/oraclelinux/http/9/ks.cfg b/packer_templates/oraclelinux/http/9/ks.cfg new file mode 100644 index 000000000..1f6233b99 --- /dev/null +++ b/packer_templates/oraclelinux/http/9/ks.cfg @@ -0,0 +1,76 @@ +cdrom +lang en_US.UTF-8 +keyboard us +network --bootproto=dhcp --noipv6 --onboot=on --device=eth0 +rootpw --plaintext vagrant +firewall --disabled +selinux --permissive +timezone UTC +bootloader --timeout=1 --location=mbr --append="net.ifnames=0 biosdevname=0" +text +skipx +zerombr +clearpart --all --initlabel +autopart --nohome --nolvm --noboot +firstboot --disabled +reboot --eject +user --name=vagrant --plaintext --password vagrant + +%packages --ignoremissing --excludedocs --instLangs=en_US.utf8 +# vagrant needs this to copy initial files via scp +openssh-clients +sudo +selinux-policy-devel +wget +nfs-utils +net-tools +tar +bzip2 +deltarpm +rsync +dnf-utils +redhat-lsb-core +elfutils-libelf-devel +network-scripts +-fprintd-pam +-intltool +-iwl*-firmware +-microcode_ctl +%end + +%post +# sudo +echo 'Defaults:vagrant !requiretty' > /etc/sudoers.d/vagrant +echo '%vagrant ALL=(ALL) NOPASSWD: ALL' >> /etc/sudoers.d/vagrant +chmod 440 /etc/sudoers.d/vagrant + +# Enable hyper-v daemons only if using hyper-v virtualization +if [ $(virt-what) == "hyperv" ]; then + dnf -y install hyperv-daemons cifs-utils + systemctl enable hypervvssd + systemctl enable hypervkvpd +fi + +# Since we disable consistent network naming, we need to make sure the eth0 +# configuration file is in place so it will come up. +# Delete other network configuration first because RHEL/C7 networking will not +# restart successfully if there are configuration files for devices that do not +# exist. +rm -f /etc/sysconfig/network-scripts/ifcfg-e* +cat > /etc/sysconfig/network-scripts/ifcfg-eth0 << _EOF_ +TYPE=Ethernet +PROXY_METHOD=none +BROWSER_ONLY=no +BOOTPROTO=dhcp +DEFROUTE=yes +IPV4_FAILURE_FATAL=no +IPV6INIT=yes +IPV6_AUTOCONF=yes +IPV6_DEFROUTE=yes +IPV6_FAILURE_FATAL=no +IPV6_ADDR_GEN_MODE=stable-privacy +NAME=eth0 +DEVICE=eth0 +ONBOOT=yes +_EOF_ +%end diff --git a/packer_templates/oraclelinux/oracle-9.0-x86_64.json b/packer_templates/oraclelinux/oracle-9.0-x86_64.json new file mode 100644 index 000000000..81efc5c05 --- /dev/null +++ b/packer_templates/oraclelinux/oracle-9.0-x86_64.json @@ -0,0 +1,182 @@ +{ + "builders": [ + { + "boot_command": "{{ user `boot_command` }}", + "boot_wait": "5s", + "cpus": "{{ user `cpus` }}", + "disk_size": "{{user `disk_size`}}", + "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "guest_additions_url": "{{ user `guest_additions_url` }}", + "guest_os_type": "Oracle_64", + "hard_drive_interface": "sata", + "headless": "{{ user `headless` }}", + "http_directory": "{{user `http_directory`}}", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "memory": "{{ user `memory` }}", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-virtualbox", + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_timeout": "10000s", + "ssh_username": "vagrant", + "type": "virtualbox-iso", + "virtualbox_version_file": ".vbox_version", + "vm_name": "{{ user `template` }}" + }, + { + "boot_command": "{{ user `boot_command` }}", + "boot_wait": "5s", + "cpus": "{{ user `cpus` }}", + "disk_size": "{{user `disk_size`}}", + "guest_os_type": "oraclelinux-64", + "headless": "{{ user `headless` }}", + "http_directory": "{{user `http_directory`}}", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "memory": "{{ user `memory` }}", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-vmware", + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", + "ssh_password": "vagrant", + "ssh_port": 22, + "version": 19, + "ssh_timeout": "10000s", + "ssh_username": "vagrant", + "tools_upload_flavor": "linux", + "type": "vmware-iso", + "vm_name": "{{ user `template` }}", + "vmx_data": { + "cpuid.coresPerSocket": "1" + }, + "vmx_remove_ethernet_interfaces": true + }, + { + "boot_command": "{{user `boot_command`}}", + "boot_wait": "5s", + "cpus": "{{ user `cpus` }}", + "disk_size": "{{user `disk_size`}}", + "guest_os_type": "centos", + "http_directory": "{{user `http_directory`}}", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "memory": "{{ user `memory` }}", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-parallels", + "parallels_tools_flavor": "lin", + "prlctl_version_file": ".prlctl_version", + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_timeout": "10000s", + "ssh_username": "vagrant", + "type": "parallels-iso", + "vm_name": "{{ user `template` }}" + }, + { + "boot_command": [ + "<wait5><up><wait5><tab> text ks=hd:fd0:/ks.cfg<enter><wait5><esc>" + ], + "boot_wait": "5s", + "cpus": "{{ user `cpus` }}", + "disk_size": "{{user `disk_size`}}", + "floppy_files": [ + "{{user `http_directory`}}/{{user `ks_path`}}" + ], + "generation": "{{user `hyperv_generation`}}", + "guest_additions_mode": "disable", + "http_directory": "{{user `http_directory`}}", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "memory": "{{ user `memory` }}", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-hyperv", + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_timeout": "10000s", + "ssh_username": "vagrant", + "switch_name": "{{ user `hyperv_switch`}}", + "type": "hyperv-iso", + "vm_name": "{{ user `template` }}" + }, + { + "boot_command": "{{ user `boot_command` }}", + "boot_wait": "5s", + "cpus": "{{ user `cpus` }}", + "disk_size": "{{user `disk_size`}}", + "headless": "{{ user `headless` }}", + "http_directory": "{{user `http_directory`}}", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "memory": "{{ user `memory` }}", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-qemu", + "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_timeout": "10000s", + "ssh_username": "vagrant", + "type": "qemu", + "vm_name": "{{ user `template` }}", + "qemuargs": [ + [ "-m", "{{ user `memory` }}" ], + [ "-display", "{{ user `qemu_display` }}" ] + ] + } + ], + "post-processors": [ + { + "output": "{{ user `build_directory` }}/{{user `box_basename`}}.{{.Provider}}.box", + "type": "vagrant" + } + ], + "provisioners": [ + { + "environment_vars": [ + "HOME_DIR=/home/vagrant", + "http_proxy={{user `http_proxy`}}", + "https_proxy={{user `https_proxy`}}", + "no_proxy={{user `no_proxy`}}" + ], + "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", + "expect_disconnect": true, + "scripts": [ + "{{template_dir}}/scripts/update.sh", + "{{template_dir}}/scripts/networking.sh", + "{{template_dir}}/../_common/motd.sh", + "{{template_dir}}/../_common/sshd.sh", + "{{template_dir}}/../_common/vagrant.sh", + "{{template_dir}}/../_common/virtualbox.sh", + "{{template_dir}}/../_common/vmware.sh", + "{{template_dir}}/../_common/parallels.sh", + "{{template_dir}}/scripts/cleanup.sh", + "{{template_dir}}/../_common/minimize.sh" + ], + "type": "shell" + } + ], + "variables": { + "box_basename": "oracle-9.0", + "build_directory": "../../builds", + "build_timestamp": "{{isotime \"2019102650405\"}}", + "cpus": "2", + "disk_size": "65536", + "git_revision": "__unknown_git_revision__", + "guest_additions_url": "", + "headless": "", + "http_directory": "{{template_dir}}/http", + "http_proxy": "{{env `http_proxy`}}", + "https_proxy": "{{env `https_proxy`}}", + "hyperv_generation": "1", + "hyperv_switch": "bento", + "iso_checksum": "d5fe339e2f6c4bc157e294bd218eb49c1a920473cae552fb00cfc8978ead3d67", + "iso_name": "OracleLinux-R9-U0-x86_64-dvd.iso", + "ks_path": "9/ks.cfg", + "memory": "1024", + "mirror": "https://yum.oracle.com/ISOS/OracleLinux", + "mirror_directory": "OL9/u0/x86_64", + "name": "oracle-9.0", + "no_proxy": "{{env `no_proxy`}}", + "qemu_display": "none", + "template": "oracle-9.0-x86_64", + "boot_command": "<up><wait><tab> inst.text inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>", + "version": "TIMESTAMP" + } +} diff --git a/packer_templates/oraclelinux/scripts/cleanup.sh b/packer_templates/oraclelinux/scripts/cleanup.sh new file mode 100644 index 000000000..b918faa7b --- /dev/null +++ b/packer_templates/oraclelinux/scripts/cleanup.sh @@ -0,0 +1,111 @@ +#!/bin/sh -eux + +# should output one of 'redhat' 'centos' 'oraclelinux' +distro="`rpm -qf --queryformat '%{NAME}' /etc/redhat-release | cut -f 1 -d '-'`" + +major_version="`sed 's/^.\+ release \([.0-9]\+\).*/\1/' /etc/redhat-release | awk -F. '{print $1}'`"; + + +echo "reduce the grub menu time to 1 second" +if ! [ "$major_version" -eq 6 ]; then + sed -i -e 's/^GRUB_TIMEOUT=[0-9]\+$/GRUB_TIMEOUT=1/' /etc/default/grub + grub2-mkconfig -o /boot/grub2/grub.cfg +fi + +# make sure we use dnf on EL 8+ +if [ "$major_version" -ge 8 ]; then + pkg_cmd="dnf" +else + pkg_cmd="yum" +fi + + +echo "Remove development and kernel source packages" +$pkg_cmd -y remove gcc cpp gc kernel-devel kernel-headers glibc-devel elfutils-libelf-devel glibc-headers kernel-devel kernel-headers + +if [ "$major_version" -ge 8 ]; then + echo "remove orphaned packages" + dnf -y autoremove + echo "Remove previous kernels that preserved for rollbacks" + dnf -y remove -y $(dnf repoquery --installonly --latest-limit=-1 -q) +else + echo "Remove previous kernels that preserved for rollbacks" + if ! command -v package-cleanup >/dev/null 2>&1; then + yum -y install yum-utils + fi + package-cleanup --oldkernels --count=1 -y +fi + +# Don't remove linux-firmware because it causes the error: +# Problem: The operation would result in removing the following protected packages: kernel-uek-core + +if [ "$distro" != 'redhat' ]; then + echo "clean all package cache information" + $pkg_cmd -y clean all --enablerepo=\*; +fi + +# Clean up network interface persistence +rm -f /etc/udev/rules.d/70-persistent-net.rules; +mkdir -p /etc/udev/rules.d/70-persistent-net.rules; +rm -f /lib/udev/rules.d/75-persistent-net-generator.rules; +rm -rf /dev/.udev/; + +for ndev in `ls -1 /etc/sysconfig/network-scripts/ifcfg-*`; do + if [ "`basename $ndev`" != "ifcfg-lo" ]; then + sed -i '/^HWADDR/d' "$ndev"; + sed -i '/^UUID/d' "$ndev"; + fi +done + +# new-style network device naming for centos7 +if [ "$major_version" -eq 7 ]; then + # radio off & remove all interface configration + nmcli radio all off + /bin/systemctl stop NetworkManager.service + for ifcfg in `ls /etc/sysconfig/network-scripts/ifcfg-* |grep -v ifcfg-lo` ; do + rm -f $ifcfg + done + rm -rf /var/lib/NetworkManager/* + + echo "==> Setup /etc/rc.d/rc.local for EL7" + cat <<_EOF_ | cat >> /etc/rc.d/rc.local +#BENTO-BEGIN +LANG=C +# delete all connection +for con in \`nmcli -t -f uuid con\`; do + if [ "\$con" != "" ]; then + nmcli con del \$con + fi +done +# add gateway interface connection. +gwdev=\`nmcli dev | grep ethernet | egrep -v 'unmanaged' | head -n 1 | awk '{print \$1}'\` +if [ "\$gwdev" != "" ]; then + nmcli connection add type ethernet ifname \$gwdev con-name \$gwdev +fi +sed -i "/^#BENTO-BEGIN/,/^#BENTO-END/d" /etc/rc.d/rc.local +chmod -x /etc/rc.d/rc.local +#BENTO-END +_EOF_ + chmod +x /etc/rc.d/rc.local +fi + +echo "truncate any logs that have built up during the install" +find /var/log -type f -exec truncate --size=0 {} \; + +echo "remove the install log" +rm -f /root/anaconda-ks.cfg /root/original-ks.cfg + +echo "remove the contents of /tmp and /var/tmp" +rm -rf /tmp/* /var/tmp/* + +if [ "$major_version" -ge 7 ]; then + echo "Force a new random seed to be generated" + rm -f /var/lib/systemd/random-seed + + echo "Wipe netplan machine-id (DUID) so machines get unique ID generated on boot" + truncate -s 0 /etc/machine-id +fi + +echo "Clear the history so our install commands aren't there" +rm -f /root/.wget-hsts +export HISTSIZE=0 diff --git a/packer_templates/oraclelinux/scripts/networking.sh b/packer_templates/oraclelinux/scripts/networking.sh new file mode 100644 index 000000000..de35e787d --- /dev/null +++ b/packer_templates/oraclelinux/scripts/networking.sh @@ -0,0 +1,27 @@ +#!/bin/sh -eux + +case "$PACKER_BUILDER_TYPE" in + +virtualbox-iso|virtualbox-ovf) + # Fix slow DNS: + # Add 'single-request-reopen' so it is included when /etc/resolv.conf is + # generated + # https://access.redhat.com/site/solutions/58625 (subscription required) + + echo 'RES_OPTIONS="single-request-reopen"' >>/etc/sysconfig/network; + + # determine the major EL version we're runninng + major_version="`sed 's/^.\+ release \([.0-9]\+\).*/\1/' /etc/redhat-release | awk -F. '{print $1}'`"; + + if [ "$major_version" -ge 8 ]; then + nmcli networking off + sleep 5 + nmcli networking on + else + service network restart; + fi + + echo 'Slow DNS fix applied (single-request-reopen)'; + ;; + +esac diff --git a/packer_templates/oraclelinux/scripts/update.sh b/packer_templates/oraclelinux/scripts/update.sh new file mode 100644 index 000000000..fe6b85f89 --- /dev/null +++ b/packer_templates/oraclelinux/scripts/update.sh @@ -0,0 +1,21 @@ +#!/bin/sh -eux + +# determine the major EL version we're runninng +major_version="`sed 's/^.\+ release \([.0-9]\+\).*/\1/' /etc/redhat-release | awk -F. '{print $1}'`"; + +# make sure we use dnf on EL 8+ +if [ "$major_version" -ge 8 ]; then + dnf -y update +else + yum -y update +fi + +# Updating the oracle release on at least OL 6 updates the repos and unlocks a whole +# new set of updates that need to be applied. If this script is there it should be run +if [ -f "/usr/bin/ol_yum_configure.sh" ]; then + /usr/bin/ol_yum_configure.sh + yum -y update +fi + +reboot; +sleep 60; From e6a87b59ade65cfb35e022602ccb2caff4eb346c Mon Sep 17 00:00:00 2001 From: Pavel Podkorytov <pod.pavel@gmail.com> Date: Thu, 21 Jul 2022 03:39:56 +0500 Subject: [PATCH 1468/1622] Add oracle-8.6 (#1416) * Add oracle-8.6 Signed-off-by: Pavel Podkorytov <pod.pavel@gmail.com> --- ...le-8.5-x86_64.json => oracle-8.6-x86_64.json} | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) rename packer_templates/oraclelinux/{oracle-8.5-x86_64.json => oracle-8.6-x86_64.json} (94%) diff --git a/packer_templates/oraclelinux/oracle-8.5-x86_64.json b/packer_templates/oraclelinux/oracle-8.6-x86_64.json similarity index 94% rename from packer_templates/oraclelinux/oracle-8.5-x86_64.json rename to packer_templates/oraclelinux/oracle-8.6-x86_64.json index b203b92df..7d9b843a3 100644 --- a/packer_templates/oraclelinux/oracle-8.5-x86_64.json +++ b/packer_templates/oraclelinux/oracle-8.6-x86_64.json @@ -153,9 +153,9 @@ } ], "variables": { - "box_basename": "oracle-8.5", + "box_basename": "oracle-8.6", "build_directory": "../../builds", - "build_timestamp": "{{isotime \"2019102650405\"}}", + "build_timestamp": "{{isotime \"202207110855\"}}", "cpus": "2", "disk_size": "65536", "git_revision": "__unknown_git_revision__", @@ -166,16 +166,16 @@ "https_proxy": "{{env `https_proxy`}}", "hyperv_generation": "1", "hyperv_switch": "bento", - "iso_checksum": "45939e85542c19dd519aaad7c4dbe84a6fcadfaca348245f92ae4472fc7f50ac", - "iso_name": "OracleLinux-R8-U5-x86_64-dvd.iso", + "iso_checksum": "988969accaddd7fbf4f7ddced16c1b69d3e5c097435fcb2474426936a9c52aeb", + "iso_name": "OracleLinux-R8-U6-x86_64-dvd.iso", "ks_path": "8/ks.cfg", "memory": "1024", - "mirror": "https://mirror.netcologne.de/oracle-linux", - "mirror_directory": "OL8/u5/x86_64", - "name": "oracle-8.5", + "mirror": "https://yum.oracle.com/ISOS/OracleLinux", + "mirror_directory": "OL8/u6/x86_64", + "name": "oracle-8.6", "no_proxy": "{{env `no_proxy`}}", "qemu_display": "none", - "template": "oracle-8.5-x86_64", + "template": "oracle-8.6-x86_64", "boot_command": "<up><wait><tab> inst.text inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>", "version": "TIMESTAMP" } From 1ea95c37bf3a0e99a5eca1ea681e263f2d327234 Mon Sep 17 00:00:00 2001 From: Pavel Podkorytov <pod.pavel@gmail.com> Date: Mon, 25 Jul 2022 20:40:09 +0500 Subject: [PATCH 1469/1622] Switch to oracle-8.6, add oracle-9 in builds.yml (#1422) * Switch to oracle-8.6, add oracle-9 in builds.yml Signed-off-by: Pavel Podkorytov <pod.pavel@gmail.com> * Add rockylinux-9 to builds.yml Signed-off-by: Pavel Podkorytov <pod.pavel@gmail.com> --- builds.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/builds.yml b/builds.yml index f134f5129..ebf3002c6 100644 --- a/builds.yml +++ b/builds.yml @@ -26,8 +26,10 @@ public: - 'oracle-6.10-i386' - 'oracle-6.10' - 'oracle-7.9' -- 'oracle-8.5' +- 'oracle-8.6' +- 'oracle-9.0' - 'rockylinux-8.6' +- 'rockylinux-9.0' - 'scientific-7.9' - 'springdalelinux-7.9' - 'springdalelinux-8.5' @@ -56,7 +58,9 @@ slugs: 'oracle-6': 'oracle-6' 'oracle-7': 'oracle-7' 'oracle-8': 'oracle-8' + 'oracle-9': 'oracle-9' 'rockylinux-8': 'rockylinux-8' + 'rockylinux-9': 'rockylinux-9' 'scientific-7': 'scientific-7' 'springdalelinux-7': 'springdalelinux-7' 'springdalelinux-8': 'springdalelinux-8' From 73fb76009c5f4ae1fe7ff0859dde7c7b8bb3d8bb Mon Sep 17 00:00:00 2001 From: Corey Hemminger <hemminger@hotmail.com> Date: Fri, 19 Aug 2022 00:59:42 -0500 Subject: [PATCH 1470/1622] remove network script to fix errors - this isn't needed. (#1425) Signed-off-by: Corey Hemminger <hemminger@hotmail.com> --- packer_templates/almalinux/almalinux-9.0-x86_64.json | 1 - 1 file changed, 1 deletion(-) diff --git a/packer_templates/almalinux/almalinux-9.0-x86_64.json b/packer_templates/almalinux/almalinux-9.0-x86_64.json index 306bc76ec..6030107ec 100644 --- a/packer_templates/almalinux/almalinux-9.0-x86_64.json +++ b/packer_templates/almalinux/almalinux-9.0-x86_64.json @@ -153,7 +153,6 @@ "expect_disconnect": true, "scripts": [ "{{template_dir}}/scripts/update.sh", - "{{template_dir}}/scripts/networking.sh", "{{template_dir}}/../_common/motd.sh", "{{template_dir}}/../_common/sshd.sh", "{{template_dir}}/../_common/vagrant.sh", From cf41025fb9241f3b594e3e3aa3026e13c604f6c0 Mon Sep 17 00:00:00 2001 From: iomartin <iomartin@users.noreply.github.com> Date: Mon, 22 Aug 2022 23:17:00 -0600 Subject: [PATCH 1471/1622] Update Ubuntu 22.04 to 22.04.1 (#1426) Signed-off-by: Martin Oliveira <martin.oliveira@eideticom.com> --- packer_templates/ubuntu/ubuntu-22.04-amd64.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packer_templates/ubuntu/ubuntu-22.04-amd64.json b/packer_templates/ubuntu/ubuntu-22.04-amd64.json index fd24650b5..8453dd11f 100644 --- a/packer_templates/ubuntu/ubuntu-22.04-amd64.json +++ b/packer_templates/ubuntu/ubuntu-22.04-amd64.json @@ -269,8 +269,8 @@ "https_proxy": "{{env `https_proxy`}}", "hyperv_generation": "2", "hyperv_switch": "bento", - "iso_checksum": "84aeaf7823c8c61baa0ae862d0a06b03409394800000b3235854a6b38eb4856f", - "iso_name": "ubuntu-22.04-live-server-amd64.iso", + "iso_checksum": "sha256:10f19c5b2b8d6db711582e0e27f5116296c34fe4b313ba45f9b201a5007056cb", + "iso_name": "ubuntu-22.04.1-live-server-amd64.iso", "memory": "1024", "mirror": "http://releases.ubuntu.com", "mirror_directory": "jammy", From 2ec5ba219d4f70e8f0e35c6f8840ed9b33f9dca7 Mon Sep 17 00:00:00 2001 From: Phillip Ross <phillipross@users.noreply.github.com> Date: Mon, 29 Aug 2022 01:04:30 -0400 Subject: [PATCH 1472/1622] Add Ubuntu 22.04-arm64 for parallels on apple silicon (#1423) * ubuntu-22.04-arm64 for parallels on apple silicon * update ubuntu-22.04-arm64 iso image from v22.04 to v22.04.1 Signed-off-by: Phillip Ross <phillip.w.g.ross@gmail.com> --- .../ubuntu/ubuntu-22.04-arm64.json | 93 +++++++++++++++++++ 1 file changed, 93 insertions(+) create mode 100644 packer_templates/ubuntu/ubuntu-22.04-arm64.json diff --git a/packer_templates/ubuntu/ubuntu-22.04-arm64.json b/packer_templates/ubuntu/ubuntu-22.04-arm64.json new file mode 100644 index 000000000..610a9b779 --- /dev/null +++ b/packer_templates/ubuntu/ubuntu-22.04-arm64.json @@ -0,0 +1,93 @@ +{ + "builders": [ + { + "boot_command": [ + "<wait5>", "c", + "<wait>", "set gfxpayload=keep<enter>", + "<wait>", "linux /casper/vmlinuz", + " quiet", + " autoinstall", + " ds='nocloud-net;s=http://{{.HTTPIP}}:{{.HTTPPort}}/'", + "<enter>", + "initrd /casper/initrd<enter>", + "boot<enter>" + ], + "boot_wait": "5s", + "cpus": "{{ user `cpus` }}", + "disk_size": "{{user `disk_size`}}", + "guest_os_type": "ubuntu", + "http_directory": "{{user `http_directory`}}", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "memory": "{{ user `memory` }}", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-parallels", + "parallels_tools_flavor": "lin-arm", + "prlctl_version_file": ".prlctl_version", + "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_timeout": "10000s", + "ssh_username": "vagrant", + "type": "parallels-iso", + "vm_name": "{{ user `template` }}" + } + ], + "post-processors": [ + { + "output": "{{ user `build_directory` }}/{{user `box_basename`}}.{{.Provider}}.box", + "type": "vagrant" + } + ], + "provisioners": [ + { + "environment_vars": [ + "HOME_DIR=/home/vagrant", + "http_proxy={{user `http_proxy`}}", + "https_proxy={{user `https_proxy`}}", + "no_proxy={{user `no_proxy`}}" + ], + "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", + "expect_disconnect": true, + "scripts": [ + "{{template_dir}}/scripts/update.sh", + "{{template_dir}}/../_common/motd.sh", + "{{template_dir}}/../_common/sshd.sh", + "{{template_dir}}/scripts/networking.sh", + "{{template_dir}}/scripts/sudoers.sh", + "{{template_dir}}/scripts/vagrant.sh", + "{{template_dir}}/../_common/virtualbox.sh", + "{{template_dir}}/scripts/vmware.sh", + "{{template_dir}}/../_common/parallels.sh", + "{{template_dir}}/scripts/hyperv.sh", + "{{template_dir}}/scripts/cleanup.sh", + "{{template_dir}}/../_common/minimize.sh" + ], + "type": "shell" + } + ], + "variables": { + "box_basename": "ubuntu-22.04-arm64", + "build_directory": "../../builds", + "build_timestamp": "{{isotime \"20060102150405\"}}", + "cpus": "2", + "disk_size": "65536", + "git_revision": "__unknown_git_revision__", + "guest_additions_url": "", + "headless": "", + "http_directory": "{{template_dir}}/http", + "http_proxy": "{{env `http_proxy`}}", + "https_proxy": "{{env `https_proxy`}}", + "hyperv_generation": "2", + "hyperv_switch": "bento", + "iso_checksum": "bc5a8015651c6f8699ab262d333375d3930b824f03d14ae51e551d89d9bb571c", + "iso_name": "ubuntu-22.04.1-live-server-arm64.iso", + "memory": "1024", + "mirror": "http://cdimage.ubuntu.com", + "mirror_directory": "releases/22.04/release", + "name": "ubuntu-22.04-arm64", + "no_proxy": "{{env `no_proxy`}}", + "preseed_path": "preseed.cfg", + "template": "ubuntu-22.04-arm64", + "version": "TIMESTAMP" + } +} From ab15c0b6709260d9fa47fa41b0bee99bf959bd0e Mon Sep 17 00:00:00 2001 From: Phillip Ross <phillipross@users.noreply.github.com> Date: Mon, 26 Sep 2022 18:39:59 -0400 Subject: [PATCH 1473/1622] Update Ubuntu 20.04 to 20.04.5 (#1429) --- packer_templates/ubuntu/ubuntu-20.04-amd64.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packer_templates/ubuntu/ubuntu-20.04-amd64.json b/packer_templates/ubuntu/ubuntu-20.04-amd64.json index 1984bf227..5c510c255 100644 --- a/packer_templates/ubuntu/ubuntu-20.04-amd64.json +++ b/packer_templates/ubuntu/ubuntu-20.04-amd64.json @@ -239,10 +239,10 @@ "https_proxy": "{{env `https_proxy`}}", "hyperv_generation": "2", "hyperv_switch": "bento", - "iso_checksum": "28ccdb56450e643bad03bb7bcf7507ce3d8d90e8bf09e38f6bd9ac298a98eaad", - "iso_name": "ubuntu-20.04.4-live-server-amd64.iso", + "iso_checksum": "sha256:5035be37a7e9abbdc09f0d257f3e33416c1a0fb322ba860d42d74aa75c3468d4", + "iso_name": "ubuntu-20.04.5-live-server-amd64.iso", "memory": "1024", - "mirror": "http://releases.ubuntu.com", + "mirror": "https://releases.ubuntu.com", "mirror_directory": "focal", "name": "ubuntu-20.04", "no_proxy": "{{env `no_proxy`}}", From e228bfa58f3a4085c0a513d663508d357f282a01 Mon Sep 17 00:00:00 2001 From: Phillip Ross <phillipross@users.noreply.github.com> Date: Wed, 12 Oct 2022 14:43:23 -0400 Subject: [PATCH 1474/1622] update ubuntu-20.04-arm64 iso image from v20.04.4 to v20.04.5 (#1430) Signed-off-by: Phillip Ross <phillip.w.g.ross@gmail.com> --- packer_templates/ubuntu/ubuntu-20.04-arm64.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packer_templates/ubuntu/ubuntu-20.04-arm64.json b/packer_templates/ubuntu/ubuntu-20.04-arm64.json index 904f5fdcd..3194cdc99 100644 --- a/packer_templates/ubuntu/ubuntu-20.04-arm64.json +++ b/packer_templates/ubuntu/ubuntu-20.04-arm64.json @@ -78,8 +78,8 @@ "https_proxy": "{{env `https_proxy`}}", "hyperv_generation": "2", "hyperv_switch": "bento", - "iso_checksum": "fef8bc204d2b09b579b9d40dfd8c5a084f8084a9bffafe8a0f39a0e53606312d", - "iso_name": "ubuntu-20.04.4-live-server-arm64.iso", + "iso_checksum": "sha256:e42d6373dd39173094af5c26cbf2497770426f42049f8b9ea3e60ce35bebdedf", + "iso_name": "ubuntu-20.04.5-live-server-arm64.iso", "memory": "1024", "mirror": "http://cdimage.ubuntu.com", "mirror_directory": "releases/20.04/release", From 9caa9eb233777f9927888d6147b171a8dcadf984 Mon Sep 17 00:00:00 2001 From: SG <13872653+mmguero@users.noreply.github.com> Date: Tue, 18 Oct 2022 14:15:26 -0600 Subject: [PATCH 1475/1622] Update templates for Debian 11.5 release (#1431) * Update templates for Debian 11.5 release --- README.md | 6 +++--- builds.yml | 6 +++--- ...debian-11.4-amd64.json => debian-11.5-amd64.json} | 12 ++++++------ ...debian-11.4-arm64.json => debian-11.5-arm64.json} | 12 ++++++------ .../{debian-11.4-i386.json => debian-11.5-i386.json} | 12 ++++++------ 5 files changed, 24 insertions(+), 24 deletions(-) rename packer_templates/debian/{debian-11.4-amd64.json => debian-11.5-amd64.json} (95%) rename packer_templates/debian/{debian-11.4-arm64.json => debian-11.5-arm64.json} (92%) rename packer_templates/debian/{debian-11.4-i386.json => debian-11.5-i386.json} (96%) diff --git a/README.md b/README.md index be935cdb8..cb0ab73e8 100644 --- a/README.md +++ b/README.md @@ -38,7 +38,7 @@ end To build a Debian vagrant box using the bento tool with the template available in the `packer_templates` dir, we can use the following command: ``` -bento build --cpus 2 packer_templates/debian/debian-11.4-i386.json +bento build --cpus 2 packer_templates/debian/debian-11.5-i386.json ``` Other available options: @@ -59,11 +59,11 @@ $ cd packer_templates/ubuntu $ packer build -only=virtualbox-iso ubuntu-18.04-amd64.json ``` -To build Debian 11.4 32bit boxes for all possible providers (simultaneously) +To build Debian 11.5 32bit boxes for all possible providers (simultaneously) ``` $ cd packer_templates/debian -$ packer build debian-11.4-i386.json +$ packer build debian-11.5-i386.json ``` To build CentOS 7.7 boxes for all providers except VMware and Parallels diff --git a/builds.yml b/builds.yml index ebf3002c6..3c44e8cd0 100644 --- a/builds.yml +++ b/builds.yml @@ -12,9 +12,9 @@ public: - 'debian-10.11-arm64' - 'debian-10.11-i386' - 'debian-10.11' -- 'debian-11.4-arm64' -- 'debian-11.4-i386' -- 'debian-11.4' +- 'debian-11.5-arm64' +- 'debian-11.5-i386' +- 'debian-11.5' - 'fedora-35' - 'fedora-36' - 'freebsd-12.2-i386' diff --git a/packer_templates/debian/debian-11.4-amd64.json b/packer_templates/debian/debian-11.5-amd64.json similarity index 95% rename from packer_templates/debian/debian-11.4-amd64.json rename to packer_templates/debian/debian-11.5-amd64.json index 8a55e4f97..e487f8699 100644 --- a/packer_templates/debian/debian-11.4-amd64.json +++ b/packer_templates/debian/debian-11.5-amd64.json @@ -130,7 +130,7 @@ } ], "variables": { - "box_basename": "debian-11.4", + "box_basename": "debian-11.5", "build_directory": "../../builds", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "2", @@ -141,17 +141,17 @@ "http_directory": "{{template_dir}}/http", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", - "iso_checksum": "d490a35d36030592839f24e468a5b818c919943967012037d6ab3d65d030ef7f", - "iso_name": "debian-11.4.0-amd64-netinst.iso", + "iso_checksum": "e307d0e583b4a8f7e5b436f8413d4707dd4242b70aea61eb08591dc0378522f3", + "iso_name": "debian-11.5.0-amd64-netinst.iso", "memory": "1024", "mirror": "http://cdimage.debian.org/cdimage/release", - "mirror_directory": "11.4.0/amd64/iso-cd", - "name": "debian-11.4", + "mirror_directory": "11.5.0/amd64/iso-cd", + "name": "debian-11.5", "no_proxy": "{{env `no_proxy`}}", "preseed_path": "debian-9/preseed.cfg", "qemu_display": "none", "qemu_bios": "bios-256k.bin", - "template": "debian-11.4-amd64", + "template": "debian-11.5-amd64", "boot_command": "<esc><wait>install <wait> preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}} <wait>debian-installer=en_US.UTF-8 <wait>auto <wait>locale=en_US.UTF-8 <wait>kbd-chooser/method=us <wait>keyboard-configuration/xkb-keymap=us <wait>netcfg/get_hostname={{ .Name }} <wait>netcfg/get_domain=vagrantup.com <wait>fb=false <wait>debconf/frontend=noninteractive <wait>console-setup/ask_detect=false <wait>console-keymaps-at/keymap=us <wait>grub-installer/bootdev=default <wait><enter><wait>", "version": "TIMESTAMP" } diff --git a/packer_templates/debian/debian-11.4-arm64.json b/packer_templates/debian/debian-11.5-arm64.json similarity index 92% rename from packer_templates/debian/debian-11.4-arm64.json rename to packer_templates/debian/debian-11.5-arm64.json index aaf8d9651..bc01a3def 100644 --- a/packer_templates/debian/debian-11.4-arm64.json +++ b/packer_templates/debian/debian-11.5-arm64.json @@ -76,7 +76,7 @@ } ], "variables": { - "box_basename": "debian-11.4-arm64", + "box_basename": "debian-11.5-arm64", "build_directory": "../../builds", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "2", @@ -87,16 +87,16 @@ "http_directory": "{{template_dir}}/http", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", - "iso_checksum": "0193e7b555011a6f8fa6ad132066873fad4a5396a9ebfca8fd179122bb4c7fdd", - "iso_name": "debian-11.4.0-arm64-netinst.iso", + "iso_checksum": "70b19f7f0178d594b409822c724c2b7c0834716df1ad7e13dd10e1580380c7c9", + "iso_name": "debian-11.5.0-arm64-netinst.iso", "memory": "1024", "mirror": "http://cdimage.debian.org/cdimage/release", - "mirror_directory": "11.4.0/arm64/iso-cd", - "name": "debian-11.4-arm64", + "mirror_directory": "11.5.0/arm64/iso-cd", + "name": "debian-11.5-arm64", "no_proxy": "{{env `no_proxy`}}", "preseed_path": "debian-9/preseed.cfg", "qemu_display": "none", - "template": "debian-11.4-arm64", + "template": "debian-11.5-arm64", "version": "TIMESTAMP" } } diff --git a/packer_templates/debian/debian-11.4-i386.json b/packer_templates/debian/debian-11.5-i386.json similarity index 96% rename from packer_templates/debian/debian-11.4-i386.json rename to packer_templates/debian/debian-11.5-i386.json index ec2e03fd7..a3f1f3714 100644 --- a/packer_templates/debian/debian-11.4-i386.json +++ b/packer_templates/debian/debian-11.5-i386.json @@ -197,7 +197,7 @@ } ], "variables": { - "box_basename": "debian-11.4-i386", + "box_basename": "debian-11.5-i386", "build_directory": "../../builds", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "2", @@ -208,16 +208,16 @@ "http_directory": "{{template_dir}}/http", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", - "iso_checksum": "b369b7eaeee2e897649bf3a8d00036e596149605456d038cad8da4a809333f3d", - "iso_name": "debian-11.4.0-i386-netinst.iso", + "iso_checksum": "700a775805262e16858f64eebe1a3317edef568fc44a5d55fa6f8ce48301acb2", + "iso_name": "debian-11.5.0-i386-netinst.iso", "memory": "1024", "mirror": "http://cdimage.debian.org/cdimage/release", - "mirror_directory": "11.4.0/i386/iso-cd", - "name": "debian-11.4-i386", + "mirror_directory": "11.5.0/i386/iso-cd", + "name": "debian-11.5-i386", "no_proxy": "{{env `no_proxy`}}", "preseed_path": "debian-9/preseed.cfg", "qemu_display": "none", - "template": "debian-11.4-i386", + "template": "debian-11.5-i386", "version": "TIMESTAMP" } } From 845748e11084e4bf282ce49ff7ea072a0b984da4 Mon Sep 17 00:00:00 2001 From: Paul Maunders <paul@maunders.net> Date: Mon, 5 Dec 2022 18:55:10 +0000 Subject: [PATCH 1476/1622] Add support for AlmaLinux 9 aarch64 parallels box (#1434) * Add support for AlmaLinux 9 aarch64 --- packer_templates/_common/parallels.sh | 55 +++-- .../almalinux/almalinux-9.0-aarch64.json | 209 ++++++++++++++++++ 2 files changed, 235 insertions(+), 29 deletions(-) create mode 100644 packer_templates/almalinux/almalinux-9.0-aarch64.json diff --git a/packer_templates/_common/parallels.sh b/packer_templates/_common/parallels.sh index 5a5b378cb..739738455 100644 --- a/packer_templates/_common/parallels.sh +++ b/packer_templates/_common/parallels.sh @@ -9,39 +9,36 @@ parallels-iso|parallels-pvm) major_version="`sed 's/^.\+ release \([.0-9]\+\).*/\1/' /etc/redhat-release | awk -F. '{print $1}'`"; # make sure we use dnf on EL 8+ - if [ "$major_version" -ge 9 ]; then - echo "Parallels Tools doesn't support AlmaLinux 9 Yet" + mkdir -p /tmp/parallels; + if [ `uname -m` = "aarch64" ] ; then + mount -o loop $HOME_DIR/prl-tools-lin-arm.iso /tmp/parallels; else - mkdir -p /tmp/parallels; - if [ `uname -m` = "aarch64" ] ; then - mount -o loop $HOME_DIR/prl-tools-lin-arm.iso /tmp/parallels; - else - mount -o loop $HOME_DIR/prl-tools-lin.iso /tmp/parallels; - fi - VER="`cat /tmp/parallels/version`"; + mount -o loop $HOME_DIR/prl-tools-lin.iso /tmp/parallels; + fi + VER="`cat /tmp/parallels/version`"; - echo "Parallels Tools Version: $VER"; + echo "Parallels Tools Version: $VER"; - /tmp/parallels/install --install-unattended-with-deps \ - || (code="$?"; \ - echo "Parallels tools installation exited $code, attempting" \ - "to output /var/log/parallels-tools-install.log"; \ - cat /var/log/parallels-tools-install.log; \ - exit $code); - umount /tmp/parallels; - rm -rf /tmp/parallels; - rm -f $HOME_DIR/*.iso; + /tmp/parallels/install --install-unattended-with-deps \ + || (code="$?"; \ + echo "Parallels tools installation exited $code, attempting" \ + "to output /var/log/parallels-tools-install.log"; \ + cat /var/log/parallels-tools-install.log; \ + exit $code); + umount /tmp/parallels; + rm -rf /tmp/parallels; + rm -f $HOME_DIR/*.iso; - # Parallels Tools for Linux includes native auto-mount script, - # which causes losing some of Vagrant-relative shared folders. - # So, we should disable this behavior. - # https://github.com/Parallels/vagrant-parallels/issues/325#issuecomment-418727113 - auto_mount_script='/usr/bin/prlfsmountd' - if [ -f "${auto_mount_script}" ]; then - echo -e '#!/bin/sh\n'\ - '# Shared folders auto-mount is disabled by Vagrant ' \ - > "${auto_mount_script}" - fi + # Parallels Tools for Linux includes native auto-mount script, + # which causes losing some of Vagrant-relative shared folders. + # So, we should disable this behavior. + # https://github.com/Parallels/vagrant-parallels/issues/325#issuecomment-418727113 + auto_mount_script='/usr/bin/prlfsmountd' + if [ -f "${auto_mount_script}" ]; then + echo -e '#!/bin/sh\n'\ + '# Shared folders auto-mount is disabled by Vagrant ' \ + > "${auto_mount_script}" fi + ;; esac diff --git a/packer_templates/almalinux/almalinux-9.0-aarch64.json b/packer_templates/almalinux/almalinux-9.0-aarch64.json new file mode 100644 index 000000000..e834a6dc4 --- /dev/null +++ b/packer_templates/almalinux/almalinux-9.0-aarch64.json @@ -0,0 +1,209 @@ + { + "builders": [ + { + "boot_command": "{{ user `boot_command` }}", + "boot_wait": "5s", + "cpus": "{{ user `cpus` }}", + "disk_size": "{{user `disk_size`}}", + "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "guest_additions_url": "{{ user `guest_additions_url` }}", + "guest_os_type": "RedHat_64", + "hard_drive_interface": "sata", + "headless": "{{ user `headless` }}", + "http_directory": "{{user `http_directory`}}", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "memory": "{{ user `memory` }}", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-virtualbox", + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_timeout": "10000s", + "ssh_username": "vagrant", + "type": "virtualbox-iso", + "virtualbox_version_file": ".vbox_version", + "vm_name": "{{ user `template` }}" + }, + { + "boot_command": "{{ user `boot_command` }}", + "boot_wait": "5s", + "cpus": "{{ user `cpus` }}", + "disk_size": "{{user `disk_size`}}", + "guest_os_type": "centos-64", + "headless": "{{ user `headless` }}", + "http_directory": "{{user `http_directory`}}", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "memory": "{{ user `memory` }}", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-vmware", + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", + "ssh_password": "vagrant", + "ssh_port": 22, + "version": 19, + "ssh_timeout": "10000s", + "ssh_username": "vagrant", + "tools_upload_flavor": "linux", + "type": "vmware-iso", + "vm_name": "{{ user `template` }}", + "vmx_data": { + "cpuid.coresPerSocket": "1" + }, + "vmx_remove_ethernet_interfaces": true + }, + { + "boot_command": "{{user `boot_command`}}", + "boot_wait": "5s", + "cpus": "{{ user `cpus` }}", + "disk_size": "{{user `disk_size`}}", + "guest_os_type": "centos", + "http_directory": "{{user `http_directory`}}", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "memory": "{{ user `memory` }}", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-parallels", + "parallels_tools_flavor": "lin-arm", + "prlctl_version_file": ".prlctl_version", + "prlctl": [ + [ + "set", + "{{.Name}}", + "--3d-accelerate", + "off" + ], + [ + "set", + "{{.Name}}", + "--videosize", + "16" + ] + ], + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_timeout": "10000s", + "ssh_username": "vagrant", + "type": "parallels-iso", + "vm_name": "{{ user `template` }}" + }, + { + "boot_command": [ + "<wait5><up><wait5><tab> text ks=hd:fd0:/ks.cfg<enter><wait5><esc>" + ], + "boot_wait": "5s", + "cpus": "{{ user `cpus` }}", + "disk_size": "{{user `disk_size`}}", + "floppy_files": [ + "{{user `http_directory`}}/{{user `ks_path`}}" + ], + "generation": "{{user `hyperv_generation`}}", + "guest_additions_mode": "disable", + "http_directory": "{{user `http_directory`}}", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "memory": "{{ user `memory` }}", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-hyperv", + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_timeout": "10000s", + "ssh_username": "vagrant", + "switch_name": "{{ user `hyperv_switch`}}", + "type": "hyperv-iso", + "vm_name": "{{ user `template` }}" + }, + { + "boot_command": "{{ user `boot_command` }}", + "boot_wait": "5s", + "cpus": "{{ user `cpus` }}", + "disk_size": "{{user `disk_size`}}", + "headless": "{{ user `headless` }}", + "http_directory": "{{user `http_directory`}}", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "memory": "{{ user `memory` }}", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-qemu", + "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_timeout": "10000s", + "ssh_username": "vagrant", + "type": "qemu", + "vm_name": "{{ user `template` }}", + "qemuargs": [ + [ "-m", "{{ user `memory` }}" ], + [ "-display", "{{ user `qemu_display` }}" ] + ] + } + ], + "post-processors": [ + { + "output": "{{ user `build_directory` }}/{{user `box_basename`}}.{{.Provider}}.box", + "type": "vagrant" + } + ], + "provisioners": [ + { + "environment_vars": [ + "HOME_DIR=/home/vagrant", + "http_proxy={{user `http_proxy`}}", + "https_proxy={{user `https_proxy`}}", + "no_proxy={{user `no_proxy`}}" + ], + "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", + "expect_disconnect": true, + "pause_after": "30s", + "scripts": [ + "{{template_dir}}/scripts/update.sh" + ], + "type": "shell" + }, + { + "environment_vars": [ + "HOME_DIR=/home/vagrant", + "http_proxy={{user `http_proxy`}}", + "https_proxy={{user `https_proxy`}}", + "no_proxy={{user `no_proxy`}}" + ], + "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", + "expect_disconnect": false, + "scripts": [ + "{{template_dir}}/../_common/motd.sh", + "{{template_dir}}/../_common/sshd.sh", + "{{template_dir}}/../_common/vagrant.sh", + "{{template_dir}}/../_common/virtualbox.sh", + "{{template_dir}}/../_common/vmware.sh", + "{{template_dir}}/../_common/parallels.sh", + "{{template_dir}}/scripts/cleanup.sh", + "{{template_dir}}/../_common/minimize.sh" + ], + "type": "shell" + } + ], + "variables": { + "box_basename": "almalinux-9.0", + "build_directory": "../../builds", + "build_timestamp": "{{isotime \"202205251531\"}}", + "cpus": "2", + "disk_size": "65536", + "git_revision": "__unknown_git_revision__", + "guest_additions_url": "", + "headless": "", + "http_directory": "{{template_dir}}/http", + "http_proxy": "{{env `http_proxy`}}", + "https_proxy": "{{env `https_proxy`}}", + "hyperv_generation": "1", + "hyperv_switch": "bento", + "iso_checksum": "dcbb69c766575d8107b34371fb8b947abf3d6aea3df04515385fff0edb9c16ed", + "iso_name": "AlmaLinux-9.0-aarch64-dvd.iso", + "ks_path": "9/ks.cfg", + "memory": "1024", + "mirror": "https://mirrors.ukfast.co.uk/sites/almalinux.org", + "mirror_directory": "9.0/isos/aarch64", + "name": "almalinux-9.0", + "no_proxy": "{{env `no_proxy`}}", + "qemu_display": "none", + "template": "almalinux-9.0-aarch64", + "boot_command": "e<down><down><end><bs><bs><bs><bs><bs>inst.text inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<leftCtrlOn>x<leftCtrlOff>", + "version": "TIMESTAMP" + } +} From 1c5ab0b65d6fbcce2afa0799f45663c0f4dd8874 Mon Sep 17 00:00:00 2001 From: wiltaylor-socotra <104801603+wiltaylor-socotra@users.noreply.github.com> Date: Tue, 6 Dec 2022 04:59:43 +1000 Subject: [PATCH 1477/1622] add fedora 36 arm64 packer template (#1409) --- packer_templates/fedora/fedora-36-arm64.json | 84 ++++++++++++++++++++ 1 file changed, 84 insertions(+) create mode 100644 packer_templates/fedora/fedora-36-arm64.json diff --git a/packer_templates/fedora/fedora-36-arm64.json b/packer_templates/fedora/fedora-36-arm64.json new file mode 100644 index 000000000..adc8b4747 --- /dev/null +++ b/packer_templates/fedora/fedora-36-arm64.json @@ -0,0 +1,84 @@ +{ + "builders": [ + { + "boot_command": "{{user `boot_command`}}", + "boot_wait": "5s", + "cpus": "{{ user `cpus` }}", + "disk_size": "{{user `disk_size`}}", + "guest_os_type": "fedora-core", + "http_directory": "{{user `http_directory`}}", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "memory": "{{ user `memory` }}", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-parallels", + "parallels_tools_flavor": "lin-arm", + "prlctl_version_file": ".prlctl_version", + "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_timeout": "10000s", + "ssh_username": "vagrant", + "type": "parallels-iso", + "vm_name": "{{ user `template` }}" + } + ], + "post-processors": [ + { + "output": "{{ user `build_directory` }}/{{user `box_basename`}}.{{.Provider}}.box", + "type": "vagrant" + } + ], + "provisioners": [ + { + "environment_vars": [ + "HOME_DIR=/home/vagrant", + "http_proxy={{user `http_proxy`}}", + "https_proxy={{user `https_proxy`}}", + "no_proxy={{user `no_proxy`}}" + ], + "execute_command": "echo 'vagrant' | {{.Vars}} sudo -E -S bash '{{.Path}}'", + "expect_disconnect": true, + "scripts": [ + "{{template_dir}}/scripts/fix-slow-dns.sh", + "{{template_dir}}/scripts/update.sh", + "{{template_dir}}/scripts/build-tools.sh", + "{{template_dir}}/scripts/install-supporting-packages.sh", + "{{template_dir}}/../_common/motd.sh", + "{{template_dir}}/../_common/sshd.sh", + "{{template_dir}}/../_common/virtualbox.sh", + "{{template_dir}}/scripts/vmware.sh", + "{{template_dir}}/../_common/parallels.sh", + "{{template_dir}}/../_common/vagrant.sh", + "{{template_dir}}/scripts/real-tmp.sh", + "{{template_dir}}/scripts/cleanup.sh", + "{{template_dir}}/scripts/crypto-policy.sh", + "{{template_dir}}/../_common/minimize.sh" + ], + "type": "shell" + } + ], + "variables": { + "box_basename": "fedora-36", + "build_directory": "../../builds", + "build_timestamp": "{{isotime \"20060102150405\"}}", + "cpus": "2", + "disk_size": "65536", + "git_revision": "__unknown_git_revision__", + "guest_additions_url": "", + "headless": "", + "http_directory": "{{template_dir}}/http", + "http_proxy": "{{env `http_proxy`}}", + "https_proxy": "{{env `https_proxy`}}", + "iso_checksum": "sha256:0ab4000575ff8b258576750ecf4ca39b266f0c88cab5fe3d8d2f88c9bea4830d", + "iso_name": "Fedora-Server-dvd-aarch64-36-1.5.iso", + "ks_path": "ks-fedora.cfg", + "memory": "1024", + "mirror": "http://download.fedoraproject.org/pub/fedora/linux", + "mirror_directory": "releases/36/Server/aarch64/iso", + "name": "fedora-36", + "no_proxy": "{{env `no_proxy`}}", + "template": "fedora-36-arm64", + "boot_command": "<up><wait>e<down><down><end> inst.text inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait><f10>", + "version": "TIMESTAMP" + } +} From 41881c63656470a3a874f010cadade884f91abc2 Mon Sep 17 00:00:00 2001 From: jstaph <jstaph@users.noreply.github.com> Date: Mon, 5 Dec 2022 14:03:18 -0500 Subject: [PATCH 1478/1622] remove Fedora 35 (end of support), add Fedora 37 (#1435) --- ...fedora-35-x86_64.json => fedora-37-x86_64.json} | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) rename packer_templates/fedora/{fedora-35-x86_64.json => fedora-37-x86_64.json} (93%) diff --git a/packer_templates/fedora/fedora-35-x86_64.json b/packer_templates/fedora/fedora-37-x86_64.json similarity index 93% rename from packer_templates/fedora/fedora-35-x86_64.json rename to packer_templates/fedora/fedora-37-x86_64.json index 7d1c6121a..7e5b1d4c4 100644 --- a/packer_templates/fedora/fedora-35-x86_64.json +++ b/packer_templates/fedora/fedora-37-x86_64.json @@ -164,7 +164,7 @@ ], "variables": { "arch": "64", - "box_basename": "fedora-35", + "box_basename": "fedora-37", "build_directory": "../../builds", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "2", @@ -175,17 +175,17 @@ "http_directory": "{{template_dir}}/http", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", - "iso_checksum": "sha256:3fe521d6c7b12c167f3ac4adab14c1f344dd72136ba577aa2bcc4a67bcce2bc6", - "iso_name": "Fedora-Server-dvd-x86_64-35-1.2.iso", + "iso_checksum": "sha256:0a4de5157af47b41a07a53726cd62ffabd04d5c1a4afece5ee7c7a84c1213e4f", + "iso_name": "Fedora-Server-dvd-x86_64-37-1.7.iso", "ks_path": "ks-fedora.cfg", "memory": "1024", "mirror": "http://download.fedoraproject.org/pub/fedora/linux", - "mirror_directory": "releases/35/Server/x86_64/iso", - "name": "fedora-35", + "mirror_directory": "releases/37/Server/x86_64/iso", + "name": "fedora-37", "no_proxy": "{{env `no_proxy`}}", "qemu_display": "none", - "template": "fedora-35-x86_64", - "boot_command": "<up><wait><tab> inst.text inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>", + "template": "fedora-37-x86_64", + "boot_command": "<up><up>e<wait><down><down><end> inst.text inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<F10><wait>", "version": "TIMESTAMP" } } From 83cd51704963231b63b6b777e0fa111baa36d55b Mon Sep 17 00:00:00 2001 From: Benjamin Bertrand <beenje@gmail.com> Date: Mon, 5 Dec 2022 20:04:30 +0100 Subject: [PATCH 1479/1622] Bump rockylinux to 8.7 (#1436) --- builds.yml | 2 +- ...ux-8.6-x86_64.json => rockylinux-8.7-x86_64.json} | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) rename packer_templates/rockylinux/{rockylinux-8.6-x86_64.json => rockylinux-8.7-x86_64.json} (96%) diff --git a/builds.yml b/builds.yml index 3c44e8cd0..f46500dae 100644 --- a/builds.yml +++ b/builds.yml @@ -28,7 +28,7 @@ public: - 'oracle-7.9' - 'oracle-8.6' - 'oracle-9.0' -- 'rockylinux-8.6' +- 'rockylinux-8.7' - 'rockylinux-9.0' - 'scientific-7.9' - 'springdalelinux-7.9' diff --git a/packer_templates/rockylinux/rockylinux-8.6-x86_64.json b/packer_templates/rockylinux/rockylinux-8.7-x86_64.json similarity index 96% rename from packer_templates/rockylinux/rockylinux-8.6-x86_64.json rename to packer_templates/rockylinux/rockylinux-8.7-x86_64.json index 06b2be3a5..fe07d275c 100644 --- a/packer_templates/rockylinux/rockylinux-8.6-x86_64.json +++ b/packer_templates/rockylinux/rockylinux-8.7-x86_64.json @@ -167,7 +167,7 @@ } ], "variables": { - "box_basename": "rockylinux-8.6", + "box_basename": "rockylinux-8.7", "build_directory": "../../builds", "build_timestamp": "{{isotime \"202205152221\"}}", "cpus": "2", @@ -180,16 +180,16 @@ "https_proxy": "{{env `https_proxy`}}", "hyperv_generation": "1", "hyperv_switch": "bento", - "iso_checksum": "1d48e0af63d07ff4e582a1819348e714c694e7fd33207f48879c2bc806960786", - "iso_name": "Rocky-8.6-x86_64-dvd1.iso", + "iso_checksum": "4827dce1c58560d3ca470a5053e8d86ba059cbb77cfca3b5f6a5863d2aac5b84", + "iso_name": "Rocky-8.7-x86_64-dvd1.iso", "ks_path": "8/ks.cfg", "memory": "1024", "mirror": "http://download.rockylinux.org/pub/rocky", - "mirror_directory": "8.6/isos/x86_64", - "name": "rockylinux-8.6", + "mirror_directory": "8.7/isos/x86_64", + "name": "rockylinux-8.7", "no_proxy": "{{env `no_proxy`}}", "qemu_display": "none", - "template": "rockylinux-8.6-x86_64", + "template": "rockylinux-8.7-x86_64", "boot_command": "<up><wait><tab> inst.text inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>", "version": "TIMESTAMP" } From 512cc949a1a278a00226e7abbcf6b143aef11585 Mon Sep 17 00:00:00 2001 From: Corey Hemminger <hemminger@hotmail.com> Date: Thu, 8 Dec 2022 12:41:56 -0600 Subject: [PATCH 1480/1622] remove network script to fix errors - this isn't needed. (#1438) From 6d881c8007893399161d024a148d7c1d68f8e7f3 Mon Sep 17 00:00:00 2001 From: Tim Smith <tim@mondoo.com> Date: Mon, 12 Dec 2022 11:24:52 -0800 Subject: [PATCH 1481/1622] Update Debian 10 to 10.13 (#1439) --- builds.yml | 6 +++--- ...bian-10.11-amd64.json => debian-10.13-amd64.json} | 12 ++++++------ ...bian-10.11-arm64.json => debian-10.13-arm64.json} | 12 ++++++------ ...debian-10.11-i386.json => debian-10.13-i386.json} | 12 ++++++------ 4 files changed, 21 insertions(+), 21 deletions(-) rename packer_templates/debian/{debian-10.11-amd64.json => debian-10.13-amd64.json} (96%) rename packer_templates/debian/{debian-10.11-arm64.json => debian-10.13-arm64.json} (92%) rename packer_templates/debian/{debian-10.11-i386.json => debian-10.13-i386.json} (96%) diff --git a/builds.yml b/builds.yml index f46500dae..563615d98 100644 --- a/builds.yml +++ b/builds.yml @@ -9,9 +9,9 @@ public: - 'debian-9.13-arm64' - 'debian-9.13-i386' - 'debian-9.13' -- 'debian-10.11-arm64' -- 'debian-10.11-i386' -- 'debian-10.11' +- 'debian-10.13-arm64' +- 'debian-10.13-i386' +- 'debian-10.13' - 'debian-11.5-arm64' - 'debian-11.5-i386' - 'debian-11.5' diff --git a/packer_templates/debian/debian-10.11-amd64.json b/packer_templates/debian/debian-10.13-amd64.json similarity index 96% rename from packer_templates/debian/debian-10.11-amd64.json rename to packer_templates/debian/debian-10.13-amd64.json index 636767305..c1eca2233 100644 --- a/packer_templates/debian/debian-10.11-amd64.json +++ b/packer_templates/debian/debian-10.13-amd64.json @@ -197,7 +197,7 @@ } ], "variables": { - "box_basename": "debian-10.11", + "box_basename": "debian-10.13", "build_directory": "../../builds", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "2", @@ -208,16 +208,16 @@ "http_directory": "{{template_dir}}/http", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", - "iso_checksum": "133430141272d8bf96cfb10b6bfd1c945f5a59ea0efc2bcb56d1033c7f2866ea", - "iso_name": "debian-10.11.0-amd64-netinst.iso", + "iso_checksum": "75aa64071060402a594dcf1e14afd669ca0f8bf757b56d4c9c1a31b8f7c8f931", + "iso_name": "debian-10.13.0-amd64-netinst.iso", "memory": "1024", "mirror": "http://cdimage.debian.org/cdimage/archive", - "mirror_directory": "10.11.0/amd64/iso-cd", - "name": "debian-10.11", + "mirror_directory": "10.13.0/amd64/iso-cd", + "name": "debian-10.13", "no_proxy": "{{env `no_proxy`}}", "preseed_path": "debian-9/preseed.cfg", "qemu_display": "none", - "template": "debian-10.11-amd64", + "template": "debian-10.13-amd64", "version": "TIMESTAMP" } } diff --git a/packer_templates/debian/debian-10.11-arm64.json b/packer_templates/debian/debian-10.13-arm64.json similarity index 92% rename from packer_templates/debian/debian-10.11-arm64.json rename to packer_templates/debian/debian-10.13-arm64.json index e5144bfa9..d8fb435e2 100644 --- a/packer_templates/debian/debian-10.11-arm64.json +++ b/packer_templates/debian/debian-10.13-arm64.json @@ -76,7 +76,7 @@ } ], "variables": { - "box_basename": "debian-10.11-arm64", + "box_basename": "debian-10.13-arm64", "build_directory": "../../builds", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "2", @@ -87,16 +87,16 @@ "http_directory": "{{template_dir}}/http", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", - "iso_checksum": "cdb53762803a5b71590f2fdfe44eb1c8351d28d1e2753cfc1b3f0bd654cc99e1", - "iso_name": "debian-10.11.0-arm64-netinst.iso", + "iso_checksum": "a20a5437e243186ac8d678202cf55a253e8d37df2b187da885796d5071ba829f", + "iso_name": "debian-10.13.0-arm64-netinst.iso", "memory": "1024", "mirror": "http://cdimage.debian.org/cdimage/archive", - "mirror_directory": "10.11.0/arm64/iso-cd", - "name": "debian-10.11-arm64", + "mirror_directory": "10.13.0/arm64/iso-cd", + "name": "debian-10.13-arm64", "no_proxy": "{{env `no_proxy`}}", "preseed_path": "debian-9/preseed.cfg", "qemu_display": "none", - "template": "debian-10.11-arm64", + "template": "debian-10.13-arm64", "version": "TIMESTAMP" } } diff --git a/packer_templates/debian/debian-10.11-i386.json b/packer_templates/debian/debian-10.13-i386.json similarity index 96% rename from packer_templates/debian/debian-10.11-i386.json rename to packer_templates/debian/debian-10.13-i386.json index 9b7587578..50f08f561 100644 --- a/packer_templates/debian/debian-10.11-i386.json +++ b/packer_templates/debian/debian-10.13-i386.json @@ -197,7 +197,7 @@ } ], "variables": { - "box_basename": "debian-10.11-i386", + "box_basename": "debian-10.13-i386", "build_directory": "../../builds", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "2", @@ -208,16 +208,16 @@ "http_directory": "{{template_dir}}/http", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", - "iso_checksum": "6df633a8eb829113af5d11fd32b7dd964cdef3eccff394a83e6f07cd7380392d", - "iso_name": "debian-10.11.0-i386-netinst.iso", + "iso_checksum": "af48af8142c6a162e15d70d1f7c77d205ab86e070270939961d0c3021557179f", + "iso_name": "debian-10.13.0-i386-netinst.iso", "memory": "1024", "mirror": "http://cdimage.debian.org/cdimage/archive", - "mirror_directory": "10.11.0/i386/iso-cd", - "name": "debian-10.11-i386", + "mirror_directory": "10.13.0/i386/iso-cd", + "name": "debian-10.13-i386", "no_proxy": "{{env `no_proxy`}}", "preseed_path": "debian-9/preseed.cfg", "qemu_display": "none", - "template": "debian-10.11-i386", + "template": "debian-10.13-i386", "version": "TIMESTAMP" } } From a9b2249a8a9c32391272bae32e3aa6c11081540f Mon Sep 17 00:00:00 2001 From: Tim Smith <tim@mondoo.com> Date: Mon, 12 Dec 2022 11:25:52 -0800 Subject: [PATCH 1482/1622] Swap Ubuntu 21.10 for 22.10 (#1440) --- builds.yml | 3 ++- ...untu-21.10-amd64.json => ubuntu-22.10-amd64.json} | 12 ++++++------ 2 files changed, 8 insertions(+), 7 deletions(-) rename packer_templates/ubuntu/{ubuntu-21.10-amd64.json => ubuntu-22.10-amd64.json} (97%) diff --git a/builds.yml b/builds.yml index 563615d98..ac365dbf2 100644 --- a/builds.yml +++ b/builds.yml @@ -38,7 +38,8 @@ public: - 'ubuntu-18.04' - 'ubuntu-20.04' - 'ubuntu-21.04' -- 'ubuntu-21.10' +- 'ubuntu-22.04' +- 'ubuntu-22.10' # slug box name: text string from standard box name to match (generally the same) slugs: diff --git a/packer_templates/ubuntu/ubuntu-21.10-amd64.json b/packer_templates/ubuntu/ubuntu-22.10-amd64.json similarity index 97% rename from packer_templates/ubuntu/ubuntu-21.10-amd64.json rename to packer_templates/ubuntu/ubuntu-22.10-amd64.json index c4fb77313..4d97f4b21 100644 --- a/packer_templates/ubuntu/ubuntu-21.10-amd64.json +++ b/packer_templates/ubuntu/ubuntu-22.10-amd64.json @@ -256,7 +256,7 @@ } ], "variables": { - "box_basename": "ubuntu-21.10", + "box_basename": "ubuntu-22.10", "build_directory": "../../builds", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "2", @@ -269,16 +269,16 @@ "https_proxy": "{{env `https_proxy`}}", "hyperv_generation": "2", "hyperv_switch": "bento", - "iso_checksum": "e84f546dfc6743f24e8b1e15db9cc2d2c698ec57d9adfb852971772d1ce692d4", - "iso_name": "ubuntu-21.10-live-server-amd64.iso", + "iso_checksum": "874452797430a94ca240c95d8503035aa145bd03ef7d84f9b23b78f3c5099aed", + "iso_name": "ubuntu-22.10-live-server-amd64.iso", "memory": "1024", "mirror": "http://releases.ubuntu.com", - "mirror_directory": "impish", - "name": "ubuntu-21.10", + "mirror_directory": "kinetic", + "name": "ubuntu-22.10", "no_proxy": "{{env `no_proxy`}}", "preseed_path": "preseed.cfg", "qemu_display": "none", - "template": "ubuntu-21.10-amd64", + "template": "ubuntu-22.10-amd64", "version": "TIMESTAMP" } } From 36b12df998238dca9e04fe9ee0c3b9a6bda8562d Mon Sep 17 00:00:00 2001 From: Tim Smith <tim@mondoo.com> Date: Mon, 12 Dec 2022 11:26:42 -0800 Subject: [PATCH 1483/1622] Make sure the uploaded dir is in git (#1441) The bento bin fails without this directory --- builds/uploaded/.gitkeep | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 builds/uploaded/.gitkeep diff --git a/builds/uploaded/.gitkeep b/builds/uploaded/.gitkeep new file mode 100644 index 000000000..e69de29bb From 49a9dad44c352a38b62d65705dbaf6e31084c9ff Mon Sep 17 00:00:00 2001 From: Tim Smith <tim@mondoo.com> Date: Mon, 12 Dec 2022 11:30:14 -0800 Subject: [PATCH 1484/1622] Update opensuse 15.3 -> 15.4 (#1443) --- builds.yml | 2 +- ...-x86_64.json => opensuse-leap-15.4-x86_64.json} | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) rename packer_templates/opensuse/{opensuse-leap-15.3-x86_64.json => opensuse-leap-15.4-x86_64.json} (94%) diff --git a/builds.yml b/builds.yml index ac365dbf2..2fd1de49f 100644 --- a/builds.yml +++ b/builds.yml @@ -22,7 +22,7 @@ public: - 'freebsd-12.3-i386' - 'freebsd-12.3' - 'freebsd-13.0' -- 'opensuse-leap-15.3' +- 'opensuse-leap-15.4' - 'oracle-6.10-i386' - 'oracle-6.10' - 'oracle-7.9' diff --git a/packer_templates/opensuse/opensuse-leap-15.3-x86_64.json b/packer_templates/opensuse/opensuse-leap-15.4-x86_64.json similarity index 94% rename from packer_templates/opensuse/opensuse-leap-15.3-x86_64.json rename to packer_templates/opensuse/opensuse-leap-15.4-x86_64.json index 1736d2892..f8227f5f8 100644 --- a/packer_templates/opensuse/opensuse-leap-15.3-x86_64.json +++ b/packer_templates/opensuse/opensuse-leap-15.4-x86_64.json @@ -170,7 +170,7 @@ "variables": { "arch": "64", "autoinst_cfg": "15/autoinst.xml", - "box_basename": "opensuse-leap-15.3", + "box_basename": "opensuse-leap-15.4", "build_directory": "../../builds", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "2", @@ -181,15 +181,15 @@ "http_directory": "{{template_dir}}/http", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", - "iso_checksum": "e377fff244d36c3a1a03092d6f14230fdae8bd116dff638a2b3a41d89d51390a", - "iso_name": "openSUSE-Leap-15.3-2-DVD-x86_64-Current.iso", + "iso_checksum": "4683345f242397c7fd7d89a50731a120ffd60a24460e21d2634e783b3c169695", + "iso_name": "openSUSE-Leap-15.4-DVD-x86_64-Media.iso", "memory": "1024", - "mirror": "http://suse.mobile-central.org/distribution", - "mirror_directory": "leap/15.3/iso", - "name": "opensuse-leap-15.3", + "mirror": "http://sfo-korg-mirror.kernel.org/opensuse/distribution", + "mirror_directory": "leap/15.4/iso", + "name": "opensuse-leap-15.4", "no_proxy": "{{env `no_proxy`}}", "qemu_display": "none", - "template": "opensuse-leap-15.3-x86_64", + "template": "opensuse-leap-15.4-x86_64", "version": "TIMESTAMP" } } From 66cdd5f2da0c4ccad6b0fbb7c0f9147dcc70749c Mon Sep 17 00:00:00 2001 From: Carlos Rodrigues <937276+carlosefr@users.noreply.github.com> Date: Mon, 12 Dec 2022 19:38:12 +0000 Subject: [PATCH 1485/1622] Update Rocky Linux from 9.0 to 9.1 (#1445) --- ...ux-9.0-x86_64.json => rockylinux-9.1-x86_64.json} | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) rename packer_templates/rockylinux/{rockylinux-9.0-x86_64.json => rockylinux-9.1-x86_64.json} (95%) diff --git a/packer_templates/rockylinux/rockylinux-9.0-x86_64.json b/packer_templates/rockylinux/rockylinux-9.1-x86_64.json similarity index 95% rename from packer_templates/rockylinux/rockylinux-9.0-x86_64.json rename to packer_templates/rockylinux/rockylinux-9.1-x86_64.json index 04a74d169..5adb08968 100644 --- a/packer_templates/rockylinux/rockylinux-9.0-x86_64.json +++ b/packer_templates/rockylinux/rockylinux-9.1-x86_64.json @@ -167,7 +167,7 @@ } ], "variables": { - "box_basename": "rockylinux-9.0", + "box_basename": "rockylinux-9.1", "build_directory": "../../builds", "build_timestamp": "{{isotime \"202207180452\"}}", "cpus": "2", @@ -180,16 +180,16 @@ "https_proxy": "{{env `https_proxy`}}", "hyperv_generation": "1", "hyperv_switch": "bento", - "iso_checksum": "55dbf904b35969be9f6d96f042b7470d1a3cb5c953bba47ab8f79740560d8a8d", - "iso_name": "Rocky-9.0-x86_64-dvd.iso", + "iso_checksum": "file:https://download.rockylinux.org/pub/rocky/9.1/isos/x86_64/Rocky-9.1-x86_64-dvd.iso.CHECKSUM", + "iso_name": "Rocky-9.1-x86_64-dvd.iso", "ks_path": "9/ks.cfg", "memory": "1024", - "mirror": "http://download.rockylinux.org/pub/rocky", + "mirror": "https://download.rockylinux.org/pub/rocky", "mirror_directory": "9/isos/x86_64", - "name": "rockylinux-9.0", + "name": "rockylinux-9.1", "no_proxy": "{{env `no_proxy`}}", "qemu_display": "none", - "template": "rockylinux-9.0-x86_64", + "template": "rockylinux-9.1-x86_64", "boot_command": "<up><wait><tab> inst.text inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>", "version": "TIMESTAMP" } From 293118ef6167c7b573e43060a671eacf8358e87c Mon Sep 17 00:00:00 2001 From: Tim Smith <tim@mondoo.com> Date: Mon, 12 Dec 2022 11:39:16 -0800 Subject: [PATCH 1486/1622] Mark Fedora 37 as the latest (#1446) --- builds.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/builds.yml b/builds.yml index 2fd1de49f..81de859e4 100644 --- a/builds.yml +++ b/builds.yml @@ -15,8 +15,8 @@ public: - 'debian-11.5-arm64' - 'debian-11.5-i386' - 'debian-11.5' -- 'fedora-35' - 'fedora-36' +- 'fedora-37' - 'freebsd-12.2-i386' - 'freebsd-12.2' - 'freebsd-12.3-i386' @@ -51,7 +51,7 @@ slugs: 'debian-11': 'debian-11' 'debian-10': 'debian-10' 'debian-9': 'debian-9' - 'fedora-latest': 'fedora-36' + 'fedora-latest': 'fedora-37' 'freebsd-11': 'freebsd-11' 'freebsd-12': 'freebsd-12' 'freebsd-13': 'freebsd-13' From e0bb782f8f8241eceb61e919cd6629373d375ddd Mon Sep 17 00:00:00 2001 From: Tim Smith <tim@mondoo.com> Date: Mon, 12 Dec 2022 11:44:50 -0800 Subject: [PATCH 1487/1622] Update the URL for the vagrant key (#1447) --- packer_templates/_common/vagrant.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packer_templates/_common/vagrant.sh b/packer_templates/_common/vagrant.sh index c2a14bb1e..9ca783485 100644 --- a/packer_templates/_common/vagrant.sh +++ b/packer_templates/_common/vagrant.sh @@ -3,7 +3,7 @@ # set a default HOME_DIR environment variable if not set HOME_DIR="${HOME_DIR:-/home/vagrant}"; -pubkey_url="https://raw.githubusercontent.com/hashicorp/vagrant/master/keys/vagrant.pub"; +pubkey_url="https://raw.githubusercontent.com/hashicorp/vagrant/main/keys/vagrant.pub"; mkdir -p $HOME_DIR/.ssh; if command -v wget >/dev/null 2>&1; then wget --no-check-certificate "$pubkey_url" -O $HOME_DIR/.ssh/authorized_keys; From ed851499f2b0c29bdccfbb30e89628812063950c Mon Sep 17 00:00:00 2001 From: Tim Smith <tim@mondoo.com> Date: Mon, 12 Dec 2022 11:45:48 -0800 Subject: [PATCH 1488/1622] Oracle Linux 8.6 -> 8.7 and 9.0 -> 9.1 (#1448) --- builds.yml | 4 ++-- ...oracle-8.6-x86_64.json => oracle-8.7-x86_64.json} | 12 ++++++------ ...oracle-9.0-x86_64.json => oracle-9.1-x86_64.json} | 12 ++++++------ 3 files changed, 14 insertions(+), 14 deletions(-) rename packer_templates/oraclelinux/{oracle-8.6-x86_64.json => oracle-8.7-x86_64.json} (96%) rename packer_templates/oraclelinux/{oracle-9.0-x86_64.json => oracle-9.1-x86_64.json} (96%) diff --git a/builds.yml b/builds.yml index 81de859e4..1ce9030d0 100644 --- a/builds.yml +++ b/builds.yml @@ -26,8 +26,8 @@ public: - 'oracle-6.10-i386' - 'oracle-6.10' - 'oracle-7.9' -- 'oracle-8.6' -- 'oracle-9.0' +- 'oracle-8.7' +- 'oracle-9.1' - 'rockylinux-8.7' - 'rockylinux-9.0' - 'scientific-7.9' diff --git a/packer_templates/oraclelinux/oracle-8.6-x86_64.json b/packer_templates/oraclelinux/oracle-8.7-x86_64.json similarity index 96% rename from packer_templates/oraclelinux/oracle-8.6-x86_64.json rename to packer_templates/oraclelinux/oracle-8.7-x86_64.json index 7d9b843a3..8d48e76bd 100644 --- a/packer_templates/oraclelinux/oracle-8.6-x86_64.json +++ b/packer_templates/oraclelinux/oracle-8.7-x86_64.json @@ -153,7 +153,7 @@ } ], "variables": { - "box_basename": "oracle-8.6", + "box_basename": "oracle-8.7", "build_directory": "../../builds", "build_timestamp": "{{isotime \"202207110855\"}}", "cpus": "2", @@ -166,16 +166,16 @@ "https_proxy": "{{env `https_proxy`}}", "hyperv_generation": "1", "hyperv_switch": "bento", - "iso_checksum": "988969accaddd7fbf4f7ddced16c1b69d3e5c097435fcb2474426936a9c52aeb", - "iso_name": "OracleLinux-R8-U6-x86_64-dvd.iso", + "iso_checksum": "dd6ede6c0597189b7dffb800b32835002bd95f19c254734aeb58f58651aa03fb", + "iso_name": "OracleLinux-R8-U7-x86_64-dvd.iso", "ks_path": "8/ks.cfg", "memory": "1024", "mirror": "https://yum.oracle.com/ISOS/OracleLinux", - "mirror_directory": "OL8/u6/x86_64", - "name": "oracle-8.6", + "mirror_directory": "OL8/u7/x86_64", + "name": "oracle-8.7", "no_proxy": "{{env `no_proxy`}}", "qemu_display": "none", - "template": "oracle-8.6-x86_64", + "template": "oracle-8.7-x86_64", "boot_command": "<up><wait><tab> inst.text inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>", "version": "TIMESTAMP" } diff --git a/packer_templates/oraclelinux/oracle-9.0-x86_64.json b/packer_templates/oraclelinux/oracle-9.1-x86_64.json similarity index 96% rename from packer_templates/oraclelinux/oracle-9.0-x86_64.json rename to packer_templates/oraclelinux/oracle-9.1-x86_64.json index 81efc5c05..9ed93017a 100644 --- a/packer_templates/oraclelinux/oracle-9.0-x86_64.json +++ b/packer_templates/oraclelinux/oracle-9.1-x86_64.json @@ -153,7 +153,7 @@ } ], "variables": { - "box_basename": "oracle-9.0", + "box_basename": "oracle-9.1", "build_directory": "../../builds", "build_timestamp": "{{isotime \"2019102650405\"}}", "cpus": "2", @@ -166,16 +166,16 @@ "https_proxy": "{{env `https_proxy`}}", "hyperv_generation": "1", "hyperv_switch": "bento", - "iso_checksum": "d5fe339e2f6c4bc157e294bd218eb49c1a920473cae552fb00cfc8978ead3d67", - "iso_name": "OracleLinux-R9-U0-x86_64-dvd.iso", + "iso_checksum": "a46ac0b717881a2673c7dc981b3219f6dea747e3d6bd18908fcb8c1f42b82786", + "iso_name": "OracleLinux-R9-U1-x86_64-dvd.iso", "ks_path": "9/ks.cfg", "memory": "1024", "mirror": "https://yum.oracle.com/ISOS/OracleLinux", - "mirror_directory": "OL9/u0/x86_64", - "name": "oracle-9.0", + "mirror_directory": "OL9/u1/x86_64", + "name": "oracle-9.1", "no_proxy": "{{env `no_proxy`}}", "qemu_display": "none", - "template": "oracle-9.0-x86_64", + "template": "oracle-9.1-x86_64", "boot_command": "<up><wait><tab> inst.text inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>", "version": "TIMESTAMP" } From 24b5efe2d874c18029e3d9698abc1ff033806acb Mon Sep 17 00:00:00 2001 From: Tim Smith <tim@mondoo.com> Date: Mon, 12 Dec 2022 11:47:14 -0800 Subject: [PATCH 1489/1622] Fix failing Amazon Linux builds (#1449) --- packer_templates/amazonlinux/README_FIRST.md | 2 +- packer_templates/amazonlinux/amazon-2-x86_64.json | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/packer_templates/amazonlinux/README_FIRST.md b/packer_templates/amazonlinux/README_FIRST.md index cff1a42a3..8268b4dfe 100644 --- a/packer_templates/amazonlinux/README_FIRST.md +++ b/packer_templates/amazonlinux/README_FIRST.md @@ -4,5 +4,5 @@ This is not your normal Bento box. Instead of building a system from an ISO we'r 1. Download the VirtualBox .vdi file for Amazon Linux 2 and place it in the same directory as this readme file. Amazon hosts these at https://cdn.amazonlinux.com/os-images/latest/virtualbox/. Make sure to name it amazon.vdi instead of the version specific name that Amazon gives it on their site. 2. Run the STEP1_build_ovf.sh script to prepare this VDI file for packer and export it as a OVF file. -3. Run packer: bento build packer_templates/amazonlinux/amazon-2-x86_64.json +3. From the amazonlinux directory run packer: bento build amazon-2-x86_64.json 4. OPTIONAL: Cleanup the leftover files in the directory diff --git a/packer_templates/amazonlinux/amazon-2-x86_64.json b/packer_templates/amazonlinux/amazon-2-x86_64.json index 47b429cf4..68f09324c 100644 --- a/packer_templates/amazonlinux/amazon-2-x86_64.json +++ b/packer_templates/amazonlinux/amazon-2-x86_64.json @@ -67,7 +67,6 @@ "disk_size": "65536", "git_revision": "__unknown_git_revision__", "headless": "", - "http_directory": "{{template_dir}}/http", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", "memory": "1024", From e75d9f2f71e8b8d0e98aef0b9c9419d791be4fb3 Mon Sep 17 00:00:00 2001 From: Tim Smith <tim@mondoo.com> Date: Mon, 12 Dec 2022 11:49:57 -0800 Subject: [PATCH 1490/1622] Remove extra checks from alma/rocky scripts (#1450) --- packer_templates/almalinux/scripts/cleanup.sh | 89 ++++--------------- .../almalinux/scripts/networking.sh | 13 +-- packer_templates/almalinux/scripts/update.sh | 15 +--- packer_templates/fedora/scripts/cleanup.sh | 5 ++ .../rockylinux/scripts/cleanup.sh | 89 ++++--------------- .../rockylinux/scripts/networking.sh | 13 +-- packer_templates/rockylinux/scripts/update.sh | 15 +--- 7 files changed, 45 insertions(+), 194 deletions(-) diff --git a/packer_templates/almalinux/scripts/cleanup.sh b/packer_templates/almalinux/scripts/cleanup.sh index 0651a7c04..7d29e4588 100644 --- a/packer_templates/almalinux/scripts/cleanup.sh +++ b/packer_templates/almalinux/scripts/cleanup.sh @@ -1,50 +1,25 @@ #!/bin/sh -eux -# should output one of 'redhat' 'centos' 'oraclelinux' -distro="`rpm -qf --queryformat '%{NAME}' /etc/redhat-release | cut -f 1 -d '-'`" - -major_version="`sed 's/^.\+ release \([.0-9]\+\).*/\1/' /etc/redhat-release | awk -F. '{print $1}'`"; - - echo "reduce the grub menu time to 1 second" -if ! [ "$major_version" -eq 6 ]; then - sed -i -e 's/^GRUB_TIMEOUT=[0-9]\+$/GRUB_TIMEOUT=1/' /etc/default/grub - grub2-mkconfig -o /boot/grub2/grub.cfg -fi - -# make sure we use dnf on EL 8+ -if [ "$major_version" -ge 8 ]; then - pkg_cmd="dnf" -else - pkg_cmd="yum" -fi - +sed -i -e 's/^GRUB_TIMEOUT=[0-9]\+$/GRUB_TIMEOUT=1/' /etc/default/grub +grub2-mkconfig -o /boot/grub2/grub.cfg echo "Remove development and kernel source packages" -$pkg_cmd -y remove gcc cpp gc kernel-devel kernel-headers glibc-devel elfutils-libelf-devel glibc-headers kernel-devel kernel-headers +dnf -y remove gcc cpp gc kernel-devel kernel-headers glibc-devel elfutils-libelf-devel glibc-headers kernel-devel kernel-headers -if [ "$major_version" -ge 8 ]; then - echo "remove orphaned packages" - dnf -y autoremove - echo "Remove previous kernels that preserved for rollbacks" - dnf -y remove -y $(dnf repoquery --installonly --latest-limit=-1 -q) -else - echo "Remove previous kernels that preserved for rollbacks" - if ! command -v package-cleanup >/dev/null 2>&1; then - yum -y install yum-utils - fi - package-cleanup --oldkernels --count=1 -y -fi +echo "remove orphaned packages" +dnf -y autoremove + +echo "Remove previous kernels that preserved for rollbacks" +dnf -y remove -y $(dnf repoquery --installonly --latest-limit=-1 -q) # Avoid ~200 meg firmware package we don't need # this cannot be done in the KS file so we do it here echo "Removing extra firmware packages" -$pkg_cmd -y remove linux-firmware +dnf -y remove linux-firmware -if [ "$distro" != 'redhat' ]; then - echo "clean all package cache information" - $pkg_cmd -y clean all --enablerepo=\*; -fi +echo "clean all package cache information" +dnf -y clean all --enablerepo=\* # Clean up network interface persistence rm -f /etc/udev/rules.d/70-persistent-net.rules; @@ -59,38 +34,6 @@ for ndev in `ls -1 /etc/sysconfig/network-scripts/ifcfg-*`; do fi done -# new-style network device naming for centos7 -if [ "$major_version" -eq 7 ]; then - # radio off & remove all interface configration - nmcli radio all off - /bin/systemctl stop NetworkManager.service - for ifcfg in `ls /etc/sysconfig/network-scripts/ifcfg-* |grep -v ifcfg-lo` ; do - rm -f $ifcfg - done - rm -rf /var/lib/NetworkManager/* - - echo "==> Setup /etc/rc.d/rc.local for EL7" - cat <<_EOF_ | cat >> /etc/rc.d/rc.local -#BENTO-BEGIN -LANG=C -# delete all connection -for con in \`nmcli -t -f uuid con\`; do - if [ "\$con" != "" ]; then - nmcli con del \$con - fi -done -# add gateway interface connection. -gwdev=\`nmcli dev | grep ethernet | egrep -v 'unmanaged' | head -n 1 | awk '{print \$1}'\` -if [ "\$gwdev" != "" ]; then - nmcli connection add type ethernet ifname \$gwdev con-name \$gwdev -fi -sed -i "/^#BENTO-BEGIN/,/^#BENTO-END/d" /etc/rc.d/rc.local -chmod -x /etc/rc.d/rc.local -#BENTO-END -_EOF_ - chmod +x /etc/rc.d/rc.local -fi - echo "truncate any logs that have built up during the install" find /var/log -type f -exec truncate --size=0 {} \; @@ -100,13 +43,11 @@ rm -f /root/anaconda-ks.cfg /root/original-ks.cfg echo "remove the contents of /tmp and /var/tmp" rm -rf /tmp/* /var/tmp/* -if [ "$major_version" -ge 7 ]; then - echo "Force a new random seed to be generated" - rm -f /var/lib/systemd/random-seed +echo "Force a new random seed to be generated" +rm -f /var/lib/systemd/random-seed - echo "Wipe netplan machine-id (DUID) so machines get unique ID generated on boot" - truncate -s 0 /etc/machine-id -fi +echo "Wipe netplan machine-id (DUID) so machines get unique ID generated on boot" +truncate -s 0 /etc/machine-id echo "Clear the history so our install commands aren't there" rm -f /root/.wget-hsts diff --git a/packer_templates/almalinux/scripts/networking.sh b/packer_templates/almalinux/scripts/networking.sh index de35e787d..087eca742 100644 --- a/packer_templates/almalinux/scripts/networking.sh +++ b/packer_templates/almalinux/scripts/networking.sh @@ -10,16 +10,9 @@ virtualbox-iso|virtualbox-ovf) echo 'RES_OPTIONS="single-request-reopen"' >>/etc/sysconfig/network; - # determine the major EL version we're runninng - major_version="`sed 's/^.\+ release \([.0-9]\+\).*/\1/' /etc/redhat-release | awk -F. '{print $1}'`"; - - if [ "$major_version" -ge 8 ]; then - nmcli networking off - sleep 5 - nmcli networking on - else - service network restart; - fi + nmcli networking off + sleep 5 + nmcli networking on echo 'Slow DNS fix applied (single-request-reopen)'; ;; diff --git a/packer_templates/almalinux/scripts/update.sh b/packer_templates/almalinux/scripts/update.sh index fe6b85f89..7025bf2b5 100644 --- a/packer_templates/almalinux/scripts/update.sh +++ b/packer_templates/almalinux/scripts/update.sh @@ -3,19 +3,8 @@ # determine the major EL version we're runninng major_version="`sed 's/^.\+ release \([.0-9]\+\).*/\1/' /etc/redhat-release | awk -F. '{print $1}'`"; -# make sure we use dnf on EL 8+ -if [ "$major_version" -ge 8 ]; then - dnf -y update -else - yum -y update -fi - -# Updating the oracle release on at least OL 6 updates the repos and unlocks a whole -# new set of updates that need to be applied. If this script is there it should be run -if [ -f "/usr/bin/ol_yum_configure.sh" ]; then - /usr/bin/ol_yum_configure.sh - yum -y update -fi +# update all packages +dnf -y update reboot; sleep 60; diff --git a/packer_templates/fedora/scripts/cleanup.sh b/packer_templates/fedora/scripts/cleanup.sh index 29476479c..50c912394 100644 --- a/packer_templates/fedora/scripts/cleanup.sh +++ b/packer_templates/fedora/scripts/cleanup.sh @@ -1,4 +1,9 @@ #!/bin/bash -eux + +echo "reduce the grub menu time to 1 second" +sed -i -e 's/^GRUB_TIMEOUT=[0-9]\+$/GRUB_TIMEOUT=1/' /etc/default/grub +grub2-mkconfig -o /boot/grub2/grub.cfg + echo "Remove development and kernel source packages" dnf -y remove gcc cpp gc kernel-devel kernel-headers glibc-devel elfutils-libelf-devel glibc-headers kernel-devel kernel-headers diff --git a/packer_templates/rockylinux/scripts/cleanup.sh b/packer_templates/rockylinux/scripts/cleanup.sh index 0651a7c04..7d29e4588 100644 --- a/packer_templates/rockylinux/scripts/cleanup.sh +++ b/packer_templates/rockylinux/scripts/cleanup.sh @@ -1,50 +1,25 @@ #!/bin/sh -eux -# should output one of 'redhat' 'centos' 'oraclelinux' -distro="`rpm -qf --queryformat '%{NAME}' /etc/redhat-release | cut -f 1 -d '-'`" - -major_version="`sed 's/^.\+ release \([.0-9]\+\).*/\1/' /etc/redhat-release | awk -F. '{print $1}'`"; - - echo "reduce the grub menu time to 1 second" -if ! [ "$major_version" -eq 6 ]; then - sed -i -e 's/^GRUB_TIMEOUT=[0-9]\+$/GRUB_TIMEOUT=1/' /etc/default/grub - grub2-mkconfig -o /boot/grub2/grub.cfg -fi - -# make sure we use dnf on EL 8+ -if [ "$major_version" -ge 8 ]; then - pkg_cmd="dnf" -else - pkg_cmd="yum" -fi - +sed -i -e 's/^GRUB_TIMEOUT=[0-9]\+$/GRUB_TIMEOUT=1/' /etc/default/grub +grub2-mkconfig -o /boot/grub2/grub.cfg echo "Remove development and kernel source packages" -$pkg_cmd -y remove gcc cpp gc kernel-devel kernel-headers glibc-devel elfutils-libelf-devel glibc-headers kernel-devel kernel-headers +dnf -y remove gcc cpp gc kernel-devel kernel-headers glibc-devel elfutils-libelf-devel glibc-headers kernel-devel kernel-headers -if [ "$major_version" -ge 8 ]; then - echo "remove orphaned packages" - dnf -y autoremove - echo "Remove previous kernels that preserved for rollbacks" - dnf -y remove -y $(dnf repoquery --installonly --latest-limit=-1 -q) -else - echo "Remove previous kernels that preserved for rollbacks" - if ! command -v package-cleanup >/dev/null 2>&1; then - yum -y install yum-utils - fi - package-cleanup --oldkernels --count=1 -y -fi +echo "remove orphaned packages" +dnf -y autoremove + +echo "Remove previous kernels that preserved for rollbacks" +dnf -y remove -y $(dnf repoquery --installonly --latest-limit=-1 -q) # Avoid ~200 meg firmware package we don't need # this cannot be done in the KS file so we do it here echo "Removing extra firmware packages" -$pkg_cmd -y remove linux-firmware +dnf -y remove linux-firmware -if [ "$distro" != 'redhat' ]; then - echo "clean all package cache information" - $pkg_cmd -y clean all --enablerepo=\*; -fi +echo "clean all package cache information" +dnf -y clean all --enablerepo=\* # Clean up network interface persistence rm -f /etc/udev/rules.d/70-persistent-net.rules; @@ -59,38 +34,6 @@ for ndev in `ls -1 /etc/sysconfig/network-scripts/ifcfg-*`; do fi done -# new-style network device naming for centos7 -if [ "$major_version" -eq 7 ]; then - # radio off & remove all interface configration - nmcli radio all off - /bin/systemctl stop NetworkManager.service - for ifcfg in `ls /etc/sysconfig/network-scripts/ifcfg-* |grep -v ifcfg-lo` ; do - rm -f $ifcfg - done - rm -rf /var/lib/NetworkManager/* - - echo "==> Setup /etc/rc.d/rc.local for EL7" - cat <<_EOF_ | cat >> /etc/rc.d/rc.local -#BENTO-BEGIN -LANG=C -# delete all connection -for con in \`nmcli -t -f uuid con\`; do - if [ "\$con" != "" ]; then - nmcli con del \$con - fi -done -# add gateway interface connection. -gwdev=\`nmcli dev | grep ethernet | egrep -v 'unmanaged' | head -n 1 | awk '{print \$1}'\` -if [ "\$gwdev" != "" ]; then - nmcli connection add type ethernet ifname \$gwdev con-name \$gwdev -fi -sed -i "/^#BENTO-BEGIN/,/^#BENTO-END/d" /etc/rc.d/rc.local -chmod -x /etc/rc.d/rc.local -#BENTO-END -_EOF_ - chmod +x /etc/rc.d/rc.local -fi - echo "truncate any logs that have built up during the install" find /var/log -type f -exec truncate --size=0 {} \; @@ -100,13 +43,11 @@ rm -f /root/anaconda-ks.cfg /root/original-ks.cfg echo "remove the contents of /tmp and /var/tmp" rm -rf /tmp/* /var/tmp/* -if [ "$major_version" -ge 7 ]; then - echo "Force a new random seed to be generated" - rm -f /var/lib/systemd/random-seed +echo "Force a new random seed to be generated" +rm -f /var/lib/systemd/random-seed - echo "Wipe netplan machine-id (DUID) so machines get unique ID generated on boot" - truncate -s 0 /etc/machine-id -fi +echo "Wipe netplan machine-id (DUID) so machines get unique ID generated on boot" +truncate -s 0 /etc/machine-id echo "Clear the history so our install commands aren't there" rm -f /root/.wget-hsts diff --git a/packer_templates/rockylinux/scripts/networking.sh b/packer_templates/rockylinux/scripts/networking.sh index de35e787d..087eca742 100644 --- a/packer_templates/rockylinux/scripts/networking.sh +++ b/packer_templates/rockylinux/scripts/networking.sh @@ -10,16 +10,9 @@ virtualbox-iso|virtualbox-ovf) echo 'RES_OPTIONS="single-request-reopen"' >>/etc/sysconfig/network; - # determine the major EL version we're runninng - major_version="`sed 's/^.\+ release \([.0-9]\+\).*/\1/' /etc/redhat-release | awk -F. '{print $1}'`"; - - if [ "$major_version" -ge 8 ]; then - nmcli networking off - sleep 5 - nmcli networking on - else - service network restart; - fi + nmcli networking off + sleep 5 + nmcli networking on echo 'Slow DNS fix applied (single-request-reopen)'; ;; diff --git a/packer_templates/rockylinux/scripts/update.sh b/packer_templates/rockylinux/scripts/update.sh index fe6b85f89..7025bf2b5 100644 --- a/packer_templates/rockylinux/scripts/update.sh +++ b/packer_templates/rockylinux/scripts/update.sh @@ -3,19 +3,8 @@ # determine the major EL version we're runninng major_version="`sed 's/^.\+ release \([.0-9]\+\).*/\1/' /etc/redhat-release | awk -F. '{print $1}'`"; -# make sure we use dnf on EL 8+ -if [ "$major_version" -ge 8 ]; then - dnf -y update -else - yum -y update -fi - -# Updating the oracle release on at least OL 6 updates the repos and unlocks a whole -# new set of updates that need to be applied. If this script is there it should be run -if [ -f "/usr/bin/ol_yum_configure.sh" ]; then - /usr/bin/ol_yum_configure.sh - yum -y update -fi +# update all packages +dnf -y update reboot; sleep 60; From befdf3d4c602465229ff0592b2147617cf84d011 Mon Sep 17 00:00:00 2001 From: Tim Smith <tim@mondoo.com> Date: Mon, 12 Dec 2022 11:50:41 -0800 Subject: [PATCH 1491/1622] Simplify the FreeBSD minimize script (#1451) --- packer_templates/freebsd/scripts/minimize.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/packer_templates/freebsd/scripts/minimize.sh b/packer_templates/freebsd/scripts/minimize.sh index ba4742586..92cfaf4af 100644 --- a/packer_templates/freebsd/scripts/minimize.sh +++ b/packer_templates/freebsd/scripts/minimize.sh @@ -5,7 +5,6 @@ case "$PACKER_BUILDER_TYPE" in esac ZROOT="zroot/ROOT/default" -COMPRESSION=$(zfs get -H compression $ZROOT | cut -f3); zfs set compression=off $ZROOT; dd if=/dev/zero of=/EMPTY bs=1m || echo "dd(1) exits after taking over all the space" @@ -14,4 +13,4 @@ rm -f /EMPTY; # Block until the empty file has been removed, otherwise, Packer # will try to kill the box while the disk is still full and that's bad sync; -zfs set compression=$COMPRESSION $ZROOT; +zfs set compression=lz4 $ZROOT; From 76932b297947e92a87b66914648707b634cea32f Mon Sep 17 00:00:00 2001 From: Tim Smith <tim@mondoo.com> Date: Mon, 12 Dec 2022 12:00:12 -0800 Subject: [PATCH 1492/1622] Remove EOL FreeBSD 12.2/13.0 and add 12.4 (#1442) --- builds.yml | 6 +- ...2.2-amd64.json => freebsd-12.4-amd64.json} | 12 +- ...-12.2-i386.json => freebsd-12.4-i386.json} | 12 +- .../freebsd/freebsd-13.0-amd64.json | 211 ------------------ 4 files changed, 15 insertions(+), 226 deletions(-) rename packer_templates/freebsd/{freebsd-12.2-amd64.json => freebsd-12.4-amd64.json} (96%) rename packer_templates/freebsd/{freebsd-12.2-i386.json => freebsd-12.4-i386.json} (95%) delete mode 100644 packer_templates/freebsd/freebsd-13.0-amd64.json diff --git a/builds.yml b/builds.yml index 1ce9030d0..6cea28046 100644 --- a/builds.yml +++ b/builds.yml @@ -17,11 +17,11 @@ public: - 'debian-11.5' - 'fedora-36' - 'fedora-37' -- 'freebsd-12.2-i386' -- 'freebsd-12.2' - 'freebsd-12.3-i386' - 'freebsd-12.3' -- 'freebsd-13.0' +- 'freebsd-12.4-i386' +- 'freebsd-12.4' +- 'freebsd-13.1' - 'opensuse-leap-15.4' - 'oracle-6.10-i386' - 'oracle-6.10' diff --git a/packer_templates/freebsd/freebsd-12.2-amd64.json b/packer_templates/freebsd/freebsd-12.4-amd64.json similarity index 96% rename from packer_templates/freebsd/freebsd-12.2-amd64.json rename to packer_templates/freebsd/freebsd-12.4-amd64.json index f39a5fa5c..d8cfbc5b0 100644 --- a/packer_templates/freebsd/freebsd-12.2-amd64.json +++ b/packer_templates/freebsd/freebsd-12.4-amd64.json @@ -185,7 +185,7 @@ } ], "variables": { - "box_basename": "freebsd-12.2", + "box_basename": "freebsd-12.4", "build_directory": "../../builds", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "2", @@ -196,16 +196,16 @@ "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", "install_path": "freebsd-11/installerconfig", - "iso_checksum": "289522e2f4e1260859505adab6d7b54ab83d19aeb147388ff7e28019984da5dc", - "iso_name": "FreeBSD-12.2-RELEASE-amd64-disc1.iso", + "iso_checksum": "606435637b76991f96df68f561badf03266f3d5452e9f72ed9b130d96b188800", + "iso_name": "FreeBSD-12.4-RELEASE-amd64-disc1.iso", "memory": "1024", "mirror": "https://download.freebsd.org/ftp", - "mirror_directory": "releases/amd64/amd64/ISO-IMAGES/12.2", - "name": "freebsd-12.2", + "mirror_directory": "releases/amd64/amd64/ISO-IMAGES/12.4", + "name": "freebsd-12.4", "no_proxy": "{{env `no_proxy`}}", "pkg_branch": "quarterly", "qemu_display": "none", - "template": "freebsd-12.2-amd64", + "template": "freebsd-12.4-amd64", "version": "TIMESTAMP" } } diff --git a/packer_templates/freebsd/freebsd-12.2-i386.json b/packer_templates/freebsd/freebsd-12.4-i386.json similarity index 95% rename from packer_templates/freebsd/freebsd-12.2-i386.json rename to packer_templates/freebsd/freebsd-12.4-i386.json index 5cf7aef56..7a957bae9 100644 --- a/packer_templates/freebsd/freebsd-12.2-i386.json +++ b/packer_templates/freebsd/freebsd-12.4-i386.json @@ -185,7 +185,7 @@ } ], "variables": { - "box_basename": "freebsd-12.2-i386", + "box_basename": "freebsd-12.4-i386", "build_directory": "../../builds", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "2", @@ -196,16 +196,16 @@ "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", "install_path": "freebsd-11/installerconfig", - "iso_checksum": "b422b5f390f9bd05f5c71783099b2b9a925e7256d7907b9be613ece4a1fb4124", - "iso_name": "FreeBSD-12.2-RELEASE-i386-disc1.iso", + "iso_checksum": "73f4e4875ae4ab9e8695d1ec2cd42f1e4ab4c66b12d99194809eb623a18a7b0d", + "iso_name": "FreeBSD-12.4-RELEASE-i386-disc1.iso", "memory": "1024", "mirror": "https://download.freebsd.org/ftp", - "mirror_directory": "releases/i386/i386/ISO-IMAGES/12.2", - "name": "freebsd-12.2-i386", + "mirror_directory": "releases/i386/i386/ISO-IMAGES/12.4", + "name": "freebsd-12.4-i386", "no_proxy": "{{env `no_proxy`}}", "pkg_branch": "quarterly", "qemu_display": "none", - "template": "freebsd-12.2-i386", + "template": "freebsd-12.4-i386", "version": "TIMESTAMP" } } diff --git a/packer_templates/freebsd/freebsd-13.0-amd64.json b/packer_templates/freebsd/freebsd-13.0-amd64.json deleted file mode 100644 index 8478d1367..000000000 --- a/packer_templates/freebsd/freebsd-13.0-amd64.json +++ /dev/null @@ -1,211 +0,0 @@ -{ - "builders": [ - { - "boot_command": [ - "<esc><wait>", - "boot -s<wait>", - "<enter><wait>", - "<wait10><wait10>", - "/bin/sh<enter><wait>", - "mdmfs -s 100m md1 /tmp<enter><wait>", - "mdmfs -s 100m md2 /mnt<enter><wait>", - "dhclient -p /tmp/dhclient.em0.pid -l /tmp/dhclient.lease.em0 em0<enter><wait>", - "fetch -o /tmp/installerconfig http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} \u0026\u0026 bsdinstall script /tmp/installerconfig<enter><wait>" - ], - "boot_wait": "5s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "guest_additions_mode": "disable", - "guest_os_type": "FreeBSD_64", - "headless": "{{ user `headless` }}", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-virtualbox", - "shutdown_command": "echo 'vagrant' | su -m root -c 'shutdown -p now'", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "type": "virtualbox-iso", - "virtualbox_version_file": ".vbox_version", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<esc><wait>", - "boot -s<wait>", - "<enter><wait>", - "<wait10><wait10>", - "/bin/sh<enter><wait>", - "mdmfs -s 100m md1 /tmp<enter><wait>", - "mdmfs -s 100m md2 /mnt<enter><wait>", - "dhclient -p /tmp/dhclient.em0.pid -l /tmp/dhclient.lease.em0 em0<enter><wait>", - "<wait5>", - "fetch -o /tmp/installerconfig http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} \u0026\u0026 bsdinstall script /tmp/installerconfig<enter><wait>" - ], - "boot_wait": "5s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "freebsd-64", - "headless": "{{ user `headless` }}", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-vmware", - "shutdown_command": "echo 'vagrant' | su -m root -c 'shutdown -p now'", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "type": "vmware-iso", - "vm_name": "{{ user `template` }}", - "vmx_data": { - "cpuid.coresPerSocket": "1" - }, - "vmx_remove_ethernet_interfaces": true - }, - { - "boot_command": [ - "<esc><wait>", - "boot -s<wait>", - "<enter><wait>", - "<wait10><wait10>", - "/bin/sh<enter><wait>", - "mdmfs -s 100m md1 /tmp<enter><wait>", - "mdmfs -s 100m md2 /mnt<enter><wait>", - "dhclient -p /tmp/dhclient.em0.pid -l /tmp/dhclient.lease.em0 em0<enter><wait>", - "fetch -o /tmp/installerconfig http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} \u0026\u0026 bsdinstall script /tmp/installerconfig<enter><wait>" - ], - "boot_wait": "8s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "freebsd", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-parallels", - "parallels_tools_mode": "disable", - "prlctl": [ - [ - "set", - "{{.Name}}", - "--device-set", - "cdrom0", - "--iface", - "ide" - ], - [ - "set", - "{{.Name}}", - "--device-del", - "fdd0" - ], - [ - "set", - "{{.Name}}", - "--device-del", - "parallel0" - ] - ], - "prlctl_version_file": ".prlctl_version", - "shutdown_command": "echo 'vagrant' | su -m root -c 'shutdown -p now'", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "type": "parallels-iso", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<esc><wait>", - "boot -s<wait>", - "<enter><wait>", - "<wait10><wait10>", - "/bin/sh<enter><wait>", - "mdmfs -s 100m md1 /tmp<enter><wait>", - "mdmfs -s 100m md2 /mnt<enter><wait>", - "dhclient -p /tmp/dhclient.vtnet0.pid -l /tmp/dhclient.lease.vtnet0 vtnet0<enter><wait>", - "fetch -o /tmp/installerconfig http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} \u0026\u0026 bsdinstall script /tmp/installerconfig<enter><wait>" - ], - "boot_wait": "7s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "headless": "{{ user `headless` }}", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-qemu", - "shutdown_command": "echo 'vagrant' | su -m root -c 'shutdown -p now'", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "type": "qemu", - "vm_name": "{{ user `template` }}", - "qemuargs": [ - [ "-m", "{{ user `memory` }}" ], - [ "-display", "{{ user `qemu_display` }}" ] - ] - } - ], - "post-processors": [ - { - "output": "{{ user `build_directory` }}/{{user `box_basename`}}.{{.Provider}}.box", - "type": "vagrant", - "vagrantfile_template": "{{template_dir}}/vagrantfile_templates/freebsd.rb" - } - ], - "provisioners": [ - { - "environment_vars": [ - "HOME_DIR=/home/vagrant", - "http_proxy={{user `http_proxy`}}", - "https_proxy={{user `https_proxy`}}", - "no_proxy={{user `no_proxy`}}", - "pkg_branch={{user `pkg_branch`}}" - ], - "execute_command": "echo 'vagrant' | {{.Vars}} su -m root -c 'sh -eux {{.Path}}'", - "expect_disconnect": true, - "scripts": [ - "{{template_dir}}/scripts/update.sh", - "{{template_dir}}/scripts/postinstall.sh", - "{{template_dir}}/scripts/sudoers.sh", - "{{template_dir}}/../_common/vagrant.sh", - "{{template_dir}}/scripts/vmtools.sh", - "{{template_dir}}/scripts/cleanup.sh", - "{{template_dir}}/scripts/minimize.sh" - ], - "type": "shell" - } - ], - "variables": { - "box_basename": "freebsd-13.0", - "build_directory": "../../builds", - "build_timestamp": "{{isotime \"20060102150405\"}}", - "cpus": "2", - "disk_size": "65536", - "git_revision": "__unknown_git_revision__", - "headless": "", - "http_directory": "{{template_dir}}/http", - "http_proxy": "{{env `http_proxy`}}", - "https_proxy": "{{env `https_proxy`}}", - "install_path": "freebsd-11/installerconfig", - "iso_checksum": "f78d4e5f53605592863852b39fa31a12f15893dc48cacecd875f2da72fa67ae5", - "iso_name": "FreeBSD-13.0-RELEASE-amd64-disc1.iso", - "memory": "1024", - "mirror": "https://download.freebsd.org/ftp", - "mirror_directory": "releases/amd64/amd64/ISO-IMAGES/13.0", - "name": "freebsd-13.0", - "no_proxy": "{{env `no_proxy`}}", - "pkg_branch": "quarterly", - "qemu_display": "none", - "template": "freebsd-13.0-amd64", - "version": "TIMESTAMP" - } -} From b24b43397e4920f74ffbb20c475e5f0accb8fc36 Mon Sep 17 00:00:00 2001 From: Tim Smith <tim@mondoo.com> Date: Mon, 12 Dec 2022 21:25:01 -0800 Subject: [PATCH 1493/1622] Remove EOL Ubuntu 21.04 (#1452) --- builds.yml | 1 - .../ubuntu/ubuntu-21.04-amd64.json | 285 ------------------ 2 files changed, 286 deletions(-) delete mode 100644 packer_templates/ubuntu/ubuntu-21.04-amd64.json diff --git a/builds.yml b/builds.yml index 6cea28046..a6f78ed51 100644 --- a/builds.yml +++ b/builds.yml @@ -37,7 +37,6 @@ public: - 'ubuntu-16.04' - 'ubuntu-18.04' - 'ubuntu-20.04' -- 'ubuntu-21.04' - 'ubuntu-22.04' - 'ubuntu-22.10' diff --git a/packer_templates/ubuntu/ubuntu-21.04-amd64.json b/packer_templates/ubuntu/ubuntu-21.04-amd64.json deleted file mode 100644 index d989d9b71..000000000 --- a/packer_templates/ubuntu/ubuntu-21.04-amd64.json +++ /dev/null @@ -1,285 +0,0 @@ -{ - "builders": [ - { - "boot_command": [ - " <wait>", - " <wait>", - " <wait>", - " <wait>", - " <wait>", - "c", - "<wait>", - "set gfxpayload=keep", - "<enter><wait>", - "linux /casper/vmlinuz quiet<wait>", - " autoinstall<wait>", - " ds=nocloud-net<wait>", - "\\;s=http://<wait>", - "{{.HTTPIP}}<wait>", - ":{{.HTTPPort}}/<wait>", - " ---", - "<enter><wait>", - "initrd /casper/initrd<wait>", - "<enter><wait>", - "boot<enter><wait>" - ], - "boot_wait": "5s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", - "guest_additions_url": "{{ user `guest_additions_url` }}", - "guest_os_type": "Ubuntu_64", - "hard_drive_interface": "sata", - "headless": "{{ user `headless` }}", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-virtualbox", - "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "type": "virtualbox-iso", - "virtualbox_version_file": ".vbox_version", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - " <wait>", - " <wait>", - " <wait>", - " <wait>", - " <wait>", - "c", - "<wait>", - "set gfxpayload=keep", - "<enter><wait>", - "linux /casper/vmlinuz quiet<wait>", - " autoinstall<wait>", - " ds=nocloud-net<wait>", - "\\;s=http://<wait>", - "{{.HTTPIP}}<wait>", - ":{{.HTTPPort}}/<wait>", - " ---", - "<enter><wait>", - "initrd /casper/initrd<wait>", - "<enter><wait>", - "boot<enter><wait>" - ], - "boot_wait": "5s", - "cpus": "{{ user `cpus` }}", - "disk_adapter_type": "sata", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "ubuntu-64", - "headless": "{{ user `headless` }}", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-vmware", - "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "tools_upload_flavor": "linux", - "type": "vmware-iso", - "vm_name": "{{ user `template` }}", - "vmx_data": { - "cpuid.coresPerSocket": "1", - "ethernet0.pciSlotNumber": "32" - }, - "vmx_remove_ethernet_interfaces": true - }, - { - "boot_command": [ - " <wait>", - " <wait>", - " <wait>", - " <wait>", - " <wait>", - "c", - "<wait>", - "set gfxpayload=keep", - "<enter><wait>", - "linux /casper/vmlinuz quiet<wait>", - " autoinstall<wait>", - " ds=nocloud-net<wait>", - "\\;s=http://<wait>", - "{{.HTTPIP}}<wait>", - ":{{.HTTPPort}}/<wait>", - " ---", - "<enter><wait>", - "initrd /casper/initrd<wait>", - "<enter><wait>", - "boot<enter><wait>" - ], - "boot_wait": "5s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "ubuntu", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-parallels", - "parallels_tools_flavor": "lin", - "prlctl_version_file": ".prlctl_version", - "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "type": "parallels-iso", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - " <wait>", - " <wait>", - " <wait>", - " <wait>", - " <wait>", - "c", - "<wait>", - "set gfxpayload=keep", - "<enter><wait>", - "linux /casper/vmlinuz quiet<wait>", - " autoinstall<wait>", - " ds=nocloud-net<wait>", - "\\;s=http://<wait>", - "{{.HTTPIP}}<wait>", - ":{{.HTTPPort}}/<wait>", - " ---", - "<enter><wait>", - "initrd /casper/initrd<wait>", - "<enter><wait>", - "boot<enter><wait>" - ], - "boot_wait": "5s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "headless": "{{ user `headless` }}", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-qemu", - "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "type": "qemu", - "vm_name": "{{ user `template` }}", - "qemuargs": [ - [ "-m", "{{ user `memory` }}" ], - [ "-display", "{{ user `qemu_display` }}" ] - ] - }, - { - "boot_command": [ - " <wait>", - " <wait>", - " <wait>", - " <wait>", - " <wait>", - "c", - "<wait>", - "set gfxpayload=keep", - "<enter><wait>", - "linux /casper/vmlinuz quiet<wait>", - " autoinstall<wait>", - " ds=nocloud-net<wait>", - "\\;s=http://<wait>", - "{{.HTTPIP}}<wait>", - ":{{.HTTPPort}}/<wait>", - " ---", - "<enter><wait>", - "initrd /casper/initrd<wait>", - "<enter><wait>", - "boot<enter><wait>" - ], - "boot_wait": "5s", - "communicator": "ssh", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "enable_secure_boot": false, - "generation": "{{user `hyperv_generation`}}", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{user `memory`}}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-hyperv", - "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "switch_name": "{{user `hyperv_switch`}}", - "type": "hyperv-iso", - "vm_name": "{{ user `template` }}" - } - ], - "post-processors": [ - { - "output": "{{ user `build_directory` }}/{{user `box_basename`}}.{{.Provider}}.box", - "type": "vagrant" - } - ], - "provisioners": [ - { - "environment_vars": [ - "HOME_DIR=/home/vagrant", - "http_proxy={{user `http_proxy`}}", - "https_proxy={{user `https_proxy`}}", - "no_proxy={{user `no_proxy`}}" - ], - "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", - "expect_disconnect": true, - "scripts": [ - "{{template_dir}}/scripts/update.sh", - "{{template_dir}}/../_common/motd.sh", - "{{template_dir}}/../_common/sshd.sh", - "{{template_dir}}/scripts/networking.sh", - "{{template_dir}}/scripts/sudoers.sh", - "{{template_dir}}/scripts/vagrant.sh", - "{{template_dir}}/../_common/virtualbox.sh", - "{{template_dir}}/scripts/vmware.sh", - "{{template_dir}}/../_common/parallels.sh", - "{{template_dir}}/scripts/hyperv.sh", - "{{template_dir}}/scripts/cleanup.sh", - "{{template_dir}}/../_common/minimize.sh" - ], - "type": "shell" - } - ], - "variables": { - "box_basename": "ubuntu-21.04", - "build_directory": "../../builds", - "build_timestamp": "{{isotime \"20060102150405\"}}", - "cpus": "2", - "disk_size": "65536", - "git_revision": "__unknown_git_revision__", - "guest_additions_url": "", - "headless": "", - "http_directory": "{{template_dir}}/http", - "http_proxy": "{{env `http_proxy`}}", - "https_proxy": "{{env `https_proxy`}}", - "hyperv_generation": "2", - "hyperv_switch": "bento", - "iso_checksum": "e4089c47104375b59951bad6c7b3ee5d9f6d80bfac4597e43a716bb8f5c1f3b0", - "iso_name": "ubuntu-21.04-live-server-amd64.iso", - "memory": "1024", - "mirror": "http://releases.ubuntu.com", - "mirror_directory": "21.04", - "name": "ubuntu-21.04", - "no_proxy": "{{env `no_proxy`}}", - "preseed_path": "preseed.cfg", - "qemu_display": "none", - "template": "ubuntu-21.04-amd64", - "version": "TIMESTAMP" - } -} From 3c3b2b6e041d4a295ca47c5043d4b4df3fa9ca8e Mon Sep 17 00:00:00 2001 From: Tim Smith <tim@mondoo.com> Date: Mon, 12 Dec 2022 21:27:10 -0800 Subject: [PATCH 1494/1622] Remove EOL CentOS 8 (#1453) --- builds.yml | 2 - .../centos/centos-8.5-x86_64.json | 196 ------------------ 2 files changed, 198 deletions(-) delete mode 100644 packer_templates/centos/centos-8.5-x86_64.json diff --git a/builds.yml b/builds.yml index a6f78ed51..6dac76d37 100644 --- a/builds.yml +++ b/builds.yml @@ -4,7 +4,6 @@ public: - 'almalinux-9.0' - 'amazon-2' - 'centos-7.9' -- 'centos-8.5' - 'centos-stream-8' - 'debian-9.13-arm64' - 'debian-9.13-i386' @@ -46,7 +45,6 @@ slugs: 'almalinux-9': 'almalinux-9' 'amazon-2': 'amazon-2' 'centos-7': 'centos-7' - 'centos-8': 'centos-8' 'debian-11': 'debian-11' 'debian-10': 'debian-10' 'debian-9': 'debian-9' diff --git a/packer_templates/centos/centos-8.5-x86_64.json b/packer_templates/centos/centos-8.5-x86_64.json deleted file mode 100644 index 97d0cd6fe..000000000 --- a/packer_templates/centos/centos-8.5-x86_64.json +++ /dev/null @@ -1,196 +0,0 @@ -{ - "builders": [ - { - "boot_command": "{{ user `boot_command` }}", - "boot_wait": "5s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", - "guest_additions_url": "{{ user `guest_additions_url` }}", - "guest_os_type": "RedHat_64", - "hard_drive_interface": "sata", - "headless": "{{ user `headless` }}", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-virtualbox", - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "type": "virtualbox-iso", - "virtualbox_version_file": ".vbox_version", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": "{{ user `boot_command` }}", - "boot_wait": "5s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "centos-64", - "headless": "{{ user `headless` }}", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-vmware", - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", - "ssh_password": "vagrant", - "ssh_port": 22, - "version": 19, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "tools_upload_flavor": "linux", - "type": "vmware-iso", - "vm_name": "{{ user `template` }}", - "vmx_data": { - "cpuid.coresPerSocket": "1" - }, - "vmx_remove_ethernet_interfaces": true - }, - { - "boot_command": "{{user `boot_command`}}", - "boot_wait": "5s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "centos", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-parallels", - "parallels_tools_flavor": "lin", - "prlctl_version_file": ".prlctl_version", - "prlctl": [ - [ - "set", - "{{.Name}}", - "--3d-accelerate", - "off" - ], - [ - "set", - "{{.Name}}", - "--videosize", - "16" - ] - ], - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "type": "parallels-iso", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<wait5><up><wait5><tab> text ks=hd:fd0:/ks.cfg<enter><wait5><esc>" - ], - "boot_wait": "5s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "floppy_files": [ - "{{user `http_directory`}}/{{user `ks_path`}}" - ], - "generation": "{{user `hyperv_generation`}}", - "guest_additions_mode": "disable", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-hyperv", - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "switch_name": "{{ user `hyperv_switch`}}", - "type": "hyperv-iso", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": "{{ user `boot_command` }}", - "boot_wait": "5s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "headless": "{{ user `headless` }}", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-qemu", - "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "type": "qemu", - "vm_name": "{{ user `template` }}", - "qemuargs": [ - [ "-m", "{{ user `memory` }}" ], - [ "-display", "{{ user `qemu_display` }}" ] - ] - } - ], - "post-processors": [ - { - "output": "{{ user `build_directory` }}/{{user `box_basename`}}.{{.Provider}}.box", - "type": "vagrant" - } - ], - "provisioners": [ - { - "environment_vars": [ - "HOME_DIR=/home/vagrant", - "http_proxy={{user `http_proxy`}}", - "https_proxy={{user `https_proxy`}}", - "no_proxy={{user `no_proxy`}}" - ], - "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", - "expect_disconnect": true, - "scripts": [ - "{{template_dir}}/scripts/update.sh", - "{{template_dir}}/../_common/motd.sh", - "{{template_dir}}/../_common/sshd.sh", - "{{template_dir}}/scripts/networking.sh", - "{{template_dir}}/../_common/vagrant.sh", - "{{template_dir}}/../_common/virtualbox.sh", - "{{template_dir}}/../_common/vmware.sh", - "{{template_dir}}/../_common/parallels.sh", - "{{template_dir}}/scripts/cleanup.sh", - "{{template_dir}}/../_common/minimize.sh" - ], - "type": "shell" - } - ], - "variables": { - "box_basename": "centos-8.5", - "build_directory": "../../builds", - "build_timestamp": "{{isotime \"2019102650405\"}}", - "cpus": "2", - "disk_size": "65536", - "git_revision": "__unknown_git_revision__", - "guest_additions_url": "", - "headless": "", - "http_directory": "{{template_dir}}/http", - "http_proxy": "{{env `http_proxy`}}", - "https_proxy": "{{env `https_proxy`}}", - "hyperv_generation": "1", - "hyperv_switch": "bento", - "iso_checksum": "3b795863001461d4f670b0dedd02d25296b6d64683faceb8f2b60c53ac5ebb3e", - "iso_name": "CentOS-8.5.2111-x86_64-dvd1.iso", - "ks_path": "8/ks.cfg", - "memory": "1024", - "mirror": "http://mirrors.kernel.org/centos", - "mirror_directory": "8.5.2111/isos/x86_64", - "name": "centos-8.5", - "no_proxy": "{{env `no_proxy`}}", - "qemu_display": "none", - "template": "centos-8.5-x86_64", - "boot_command": "<up><wait><tab> inst.text inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>", - "version": "TIMESTAMP" - } -} From fa244235a5a288a33e3b68cc0e17bf03cc9fecaa Mon Sep 17 00:00:00 2001 From: Tim Smith <tim@mondoo.com> Date: Mon, 12 Dec 2022 21:29:51 -0800 Subject: [PATCH 1495/1622] Bump AlmaLinux 9.0 -> 9.1 and 8.6 -> 8.7 (#1454) --- builds.yml | 4 +- .../almalinux/almalinux-8.7-aarch64.json | 209 ++++++++++++++++++ ...-x86_64.json => almalinux-8.7-x86_64.json} | 12 +- ...arch64.json => almalinux-9.1-aarch64.json} | 12 +- ...-x86_64.json => almalinux-9.1-x86_64.json} | 12 +- 5 files changed, 229 insertions(+), 20 deletions(-) create mode 100644 packer_templates/almalinux/almalinux-8.7-aarch64.json rename packer_templates/almalinux/{almalinux-8.6-x86_64.json => almalinux-8.7-x86_64.json} (96%) rename packer_templates/almalinux/{almalinux-9.0-aarch64.json => almalinux-9.1-aarch64.json} (96%) rename packer_templates/almalinux/{almalinux-9.0-x86_64.json => almalinux-9.1-x86_64.json} (96%) diff --git a/builds.yml b/builds.yml index 6dac76d37..aa2d15428 100644 --- a/builds.yml +++ b/builds.yml @@ -1,7 +1,7 @@ --- public: -- 'almalinux-8.6' -- 'almalinux-9.0' +- 'almalinux-8.7' +- 'almalinux-9.1' - 'amazon-2' - 'centos-7.9' - 'centos-stream-8' diff --git a/packer_templates/almalinux/almalinux-8.7-aarch64.json b/packer_templates/almalinux/almalinux-8.7-aarch64.json new file mode 100644 index 000000000..450299912 --- /dev/null +++ b/packer_templates/almalinux/almalinux-8.7-aarch64.json @@ -0,0 +1,209 @@ + { + "builders": [ + { + "boot_command": "{{ user `boot_command` }}", + "boot_wait": "5s", + "cpus": "{{ user `cpus` }}", + "disk_size": "{{user `disk_size`}}", + "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "guest_additions_url": "{{ user `guest_additions_url` }}", + "guest_os_type": "RedHat_64", + "hard_drive_interface": "sata", + "headless": "{{ user `headless` }}", + "http_directory": "{{user `http_directory`}}", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "memory": "{{ user `memory` }}", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-virtualbox", + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_timeout": "10000s", + "ssh_username": "vagrant", + "type": "virtualbox-iso", + "virtualbox_version_file": ".vbox_version", + "vm_name": "{{ user `template` }}" + }, + { + "boot_command": "{{ user `boot_command` }}", + "boot_wait": "5s", + "cpus": "{{ user `cpus` }}", + "disk_size": "{{user `disk_size`}}", + "guest_os_type": "centos-64", + "headless": "{{ user `headless` }}", + "http_directory": "{{user `http_directory`}}", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "memory": "{{ user `memory` }}", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-vmware", + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", + "ssh_password": "vagrant", + "ssh_port": 22, + "version": 19, + "ssh_timeout": "10000s", + "ssh_username": "vagrant", + "tools_upload_flavor": "linux", + "type": "vmware-iso", + "vm_name": "{{ user `template` }}", + "vmx_data": { + "cpuid.coresPerSocket": "1" + }, + "vmx_remove_ethernet_interfaces": true + }, + { + "boot_command": "{{user `boot_command`}}", + "boot_wait": "5s", + "cpus": "{{ user `cpus` }}", + "disk_size": "{{user `disk_size`}}", + "guest_os_type": "centos", + "http_directory": "{{user `http_directory`}}", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "memory": "{{ user `memory` }}", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-parallels", + "parallels_tools_flavor": "lin-arm", + "prlctl_version_file": ".prlctl_version", + "prlctl": [ + [ + "set", + "{{.Name}}", + "--3d-accelerate", + "off" + ], + [ + "set", + "{{.Name}}", + "--videosize", + "16" + ] + ], + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_timeout": "10000s", + "ssh_username": "vagrant", + "type": "parallels-iso", + "vm_name": "{{ user `template` }}" + }, + { + "boot_command": [ + "<wait5><up><wait5><tab> text ks=hd:fd0:/ks.cfg<enter><wait5><esc>" + ], + "boot_wait": "5s", + "cpus": "{{ user `cpus` }}", + "disk_size": "{{user `disk_size`}}", + "floppy_files": [ + "{{user `http_directory`}}/{{user `ks_path`}}" + ], + "generation": "{{user `hyperv_generation`}}", + "guest_additions_mode": "disable", + "http_directory": "{{user `http_directory`}}", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "memory": "{{ user `memory` }}", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-hyperv", + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_timeout": "10000s", + "ssh_username": "vagrant", + "switch_name": "{{ user `hyperv_switch`}}", + "type": "hyperv-iso", + "vm_name": "{{ user `template` }}" + }, + { + "boot_command": "{{ user `boot_command` }}", + "boot_wait": "5s", + "cpus": "{{ user `cpus` }}", + "disk_size": "{{user `disk_size`}}", + "headless": "{{ user `headless` }}", + "http_directory": "{{user `http_directory`}}", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "memory": "{{ user `memory` }}", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-qemu", + "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_timeout": "10000s", + "ssh_username": "vagrant", + "type": "qemu", + "vm_name": "{{ user `template` }}", + "qemuargs": [ + [ "-m", "{{ user `memory` }}" ], + [ "-display", "{{ user `qemu_display` }}" ] + ] + } + ], + "post-processors": [ + { + "output": "{{ user `build_directory` }}/{{user `box_basename`}}.{{.Provider}}.box", + "type": "vagrant" + } + ], + "provisioners": [ + { + "environment_vars": [ + "HOME_DIR=/home/vagrant", + "http_proxy={{user `http_proxy`}}", + "https_proxy={{user `https_proxy`}}", + "no_proxy={{user `no_proxy`}}" + ], + "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", + "expect_disconnect": true, + "pause_after": "30s", + "scripts": [ + "{{template_dir}}/scripts/update.sh" + ], + "type": "shell" + }, + { + "environment_vars": [ + "HOME_DIR=/home/vagrant", + "http_proxy={{user `http_proxy`}}", + "https_proxy={{user `https_proxy`}}", + "no_proxy={{user `no_proxy`}}" + ], + "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", + "expect_disconnect": false, + "scripts": [ + "{{template_dir}}/../_common/motd.sh", + "{{template_dir}}/../_common/sshd.sh", + "{{template_dir}}/../_common/vagrant.sh", + "{{template_dir}}/../_common/virtualbox.sh", + "{{template_dir}}/../_common/vmware.sh", + "{{template_dir}}/../_common/parallels.sh", + "{{template_dir}}/scripts/cleanup.sh", + "{{template_dir}}/../_common/minimize.sh" + ], + "type": "shell" + } + ], + "variables": { + "box_basename": "almalinux-8.7", + "build_directory": "../../builds", + "build_timestamp": "{{isotime \"202205111847\"}}", + "cpus": "2", + "disk_size": "65536", + "git_revision": "__unknown_git_revision__", + "guest_additions_url": "", + "headless": "", + "http_directory": "{{template_dir}}/http", + "http_proxy": "{{env `http_proxy`}}", + "https_proxy": "{{env `https_proxy`}}", + "hyperv_generation": "1", + "hyperv_switch": "bento", + "iso_checksum": "c14fae79d5e26bc41e75f0a65063ab684199a7ea3a6bd0a8086e1ffd2a7afac8", + "iso_name": "AlmaLinux-8.7-aarch64-dvd.iso", + "ks_path": "8/ks.cfg", + "memory": "1024", + "mirror": "https://repo.almalinux.org/almalinux", + "mirror_directory": "8.7/isos/aarch64", + "name": "almalinux-8.7", + "no_proxy": "{{env `no_proxy`}}", + "qemu_display": "none", + "template": "almalinux-8.7-aarch64", + "boot_command": "<up><wait><tab> inst.text inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>", + "version": "TIMESTAMP" + } +} diff --git a/packer_templates/almalinux/almalinux-8.6-x86_64.json b/packer_templates/almalinux/almalinux-8.7-x86_64.json similarity index 96% rename from packer_templates/almalinux/almalinux-8.6-x86_64.json rename to packer_templates/almalinux/almalinux-8.7-x86_64.json index fc377e3c6..6a9a60999 100644 --- a/packer_templates/almalinux/almalinux-8.6-x86_64.json +++ b/packer_templates/almalinux/almalinux-8.7-x86_64.json @@ -167,7 +167,7 @@ } ], "variables": { - "box_basename": "almalinux-8.6", + "box_basename": "almalinux-8.7", "build_directory": "../../builds", "build_timestamp": "{{isotime \"202205111847\"}}", "cpus": "2", @@ -180,16 +180,16 @@ "https_proxy": "{{env `https_proxy`}}", "hyperv_generation": "1", "hyperv_switch": "bento", - "iso_checksum": "8c3bd1ff3d88b5599147626fa2616d85edcc861ec00edd6863b81dbfb135874c", - "iso_name": "AlmaLinux-8.6-x86_64-dvd.iso", + "iso_checksum": "b95ddf9d56a849cc8eb4b95dd2321c13af637d3379b91f5d96c39e96fb4403b3", + "iso_name": "AlmaLinux-8.7-x86_64-dvd.iso", "ks_path": "8/ks.cfg", "memory": "1024", "mirror": "https://repo.almalinux.org/almalinux", - "mirror_directory": "8.6/isos/x86_64", - "name": "almalinux-8.6", + "mirror_directory": "8.7/isos/x86_64", + "name": "almalinux-8.7", "no_proxy": "{{env `no_proxy`}}", "qemu_display": "none", - "template": "almalinux-8.6-x86_64", + "template": "almalinux-8.7-x86_64", "boot_command": "<up><wait><tab> inst.text inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>", "version": "TIMESTAMP" } diff --git a/packer_templates/almalinux/almalinux-9.0-aarch64.json b/packer_templates/almalinux/almalinux-9.1-aarch64.json similarity index 96% rename from packer_templates/almalinux/almalinux-9.0-aarch64.json rename to packer_templates/almalinux/almalinux-9.1-aarch64.json index e834a6dc4..b02c347a6 100644 --- a/packer_templates/almalinux/almalinux-9.0-aarch64.json +++ b/packer_templates/almalinux/almalinux-9.1-aarch64.json @@ -180,7 +180,7 @@ } ], "variables": { - "box_basename": "almalinux-9.0", + "box_basename": "almalinux-9.1", "build_directory": "../../builds", "build_timestamp": "{{isotime \"202205251531\"}}", "cpus": "2", @@ -193,16 +193,16 @@ "https_proxy": "{{env `https_proxy`}}", "hyperv_generation": "1", "hyperv_switch": "bento", - "iso_checksum": "dcbb69c766575d8107b34371fb8b947abf3d6aea3df04515385fff0edb9c16ed", - "iso_name": "AlmaLinux-9.0-aarch64-dvd.iso", + "iso_checksum": "a6f0fb355b9c82f13a95f3f02e19b0f07906a7e0f27e3bca144338ebac9abf40", + "iso_name": "AlmaLinux-9.1-aarch64-dvd.iso", "ks_path": "9/ks.cfg", "memory": "1024", "mirror": "https://mirrors.ukfast.co.uk/sites/almalinux.org", - "mirror_directory": "9.0/isos/aarch64", - "name": "almalinux-9.0", + "mirror_directory": "9.1/isos/aarch64", + "name": "almalinux-9.1", "no_proxy": "{{env `no_proxy`}}", "qemu_display": "none", - "template": "almalinux-9.0-aarch64", + "template": "almalinux-9.1-aarch64", "boot_command": "e<down><down><end><bs><bs><bs><bs><bs>inst.text inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<leftCtrlOn>x<leftCtrlOff>", "version": "TIMESTAMP" } diff --git a/packer_templates/almalinux/almalinux-9.0-x86_64.json b/packer_templates/almalinux/almalinux-9.1-x86_64.json similarity index 96% rename from packer_templates/almalinux/almalinux-9.0-x86_64.json rename to packer_templates/almalinux/almalinux-9.1-x86_64.json index 6030107ec..97cd70380 100644 --- a/packer_templates/almalinux/almalinux-9.0-x86_64.json +++ b/packer_templates/almalinux/almalinux-9.1-x86_64.json @@ -166,7 +166,7 @@ } ], "variables": { - "box_basename": "almalinux-9.0", + "box_basename": "almalinux-9.1", "build_directory": "../../builds", "build_timestamp": "{{isotime \"202205251531\"}}", "cpus": "2", @@ -179,16 +179,16 @@ "https_proxy": "{{env `https_proxy`}}", "hyperv_generation": "1", "hyperv_switch": "bento", - "iso_checksum": "6617436f8f2ee5408ff448a4eedce4ce61e2fdb3153a646b875010256bc9fd6b", - "iso_name": "AlmaLinux-9.0-x86_64-dvd.iso", + "iso_checksum": "2a44e3f8a012c132da19b9aae2bf949e20b116f0a2a7ac3eca111972f4ac952f", + "iso_name": "AlmaLinux-9.1-x86_64-dvd.iso", "ks_path": "9/ks.cfg", "memory": "1024", "mirror": "https://repo.almalinux.org/almalinux", - "mirror_directory": "9.0/isos/x86_64", - "name": "almalinux-9.0", + "mirror_directory": "9.1/isos/x86_64", + "name": "almalinux-9.1", "no_proxy": "{{env `no_proxy`}}", "qemu_display": "none", - "template": "almalinux-9.0-x86_64", + "template": "almalinux-9.1-x86_64", "boot_command": "<up><wait><tab> inst.text inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>", "version": "TIMESTAMP" } From 55607b6f4bc5152fe2538866f24a2d077a52ba97 Mon Sep 17 00:00:00 2001 From: Carlos Rodrigues <937276+carlosefr@users.noreply.github.com> Date: Sun, 18 Dec 2022 15:43:35 +0000 Subject: [PATCH 1496/1622] Added CentOS Stream 9 (x86_64) template (#1444) --- .../centos/centos-stream-9-x86_64.json | 199 ++++++++++++++++++ packer_templates/centos/http/9-stream/ks.cfg | 76 +++++++ 2 files changed, 275 insertions(+) create mode 100644 packer_templates/centos/centos-stream-9-x86_64.json create mode 100644 packer_templates/centos/http/9-stream/ks.cfg diff --git a/packer_templates/centos/centos-stream-9-x86_64.json b/packer_templates/centos/centos-stream-9-x86_64.json new file mode 100644 index 000000000..8b1c9e9b1 --- /dev/null +++ b/packer_templates/centos/centos-stream-9-x86_64.json @@ -0,0 +1,199 @@ +{ + "builders": [ + { + "boot_command": "{{ user `boot_command` }}", + "boot_wait": "5s", + "cpus": "{{ user `cpus` }}", + "disk_size": "{{user `disk_size`}}", + "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "guest_additions_url": "{{ user `guest_additions_url` }}", + "guest_os_type": "RedHat_64", + "hard_drive_interface": "sata", + "headless": "{{ user `headless` }}", + "http_directory": "{{user `http_directory`}}", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "memory": "{{ user `memory` }}", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-virtualbox", + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_timeout": "10000s", + "ssh_username": "vagrant", + "type": "virtualbox-iso", + "virtualbox_version_file": ".vbox_version", + "vm_name": "{{ user `template` }}", + "vboxmanage": [ + ["modifyvm", "{{.Name}}", "--nat-localhostreachable1", "on"] + ] + }, + { + "boot_command": "{{ user `boot_command` }}", + "boot_wait": "5s", + "cpus": "{{ user `cpus` }}", + "disk_size": "{{user `disk_size`}}", + "guest_os_type": "centos-64", + "headless": "{{ user `headless` }}", + "http_directory": "{{user `http_directory`}}", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "memory": "{{ user `memory` }}", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-vmware", + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", + "ssh_password": "vagrant", + "ssh_port": 22, + "version": 19, + "ssh_timeout": "10000s", + "ssh_username": "vagrant", + "tools_upload_flavor": "linux", + "type": "vmware-iso", + "vm_name": "{{ user `template` }}", + "vmx_data": { + "cpuid.coresPerSocket": "1" + }, + "vmx_remove_ethernet_interfaces": true + }, + { + "boot_command": "{{user `boot_command`}}", + "boot_wait": "5s", + "cpus": "{{ user `cpus` }}", + "disk_size": "{{user `disk_size`}}", + "guest_os_type": "centos", + "http_directory": "{{user `http_directory`}}", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "memory": "{{ user `memory` }}", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-parallels", + "parallels_tools_flavor": "lin", + "prlctl_version_file": ".prlctl_version", + "prlctl": [ + [ + "set", + "{{.Name}}", + "--3d-accelerate", + "off" + ], + [ + "set", + "{{.Name}}", + "--videosize", + "16" + ] + ], + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_timeout": "10000s", + "ssh_username": "vagrant", + "type": "parallels-iso", + "vm_name": "{{ user `template` }}" + }, + { + "boot_command": [ + "<wait5><up><wait5><tab> text ks=hd:fd0:/ks.cfg<enter><wait5><esc>" + ], + "boot_wait": "5s", + "cpus": "{{ user `cpus` }}", + "disk_size": "{{user `disk_size`}}", + "floppy_files": [ + "{{user `http_directory`}}/{{user `ks_path`}}" + ], + "generation": "{{user `hyperv_generation`}}", + "guest_additions_mode": "disable", + "http_directory": "{{user `http_directory`}}", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "memory": "{{ user `memory` }}", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-hyperv", + "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_timeout": "10000s", + "ssh_username": "vagrant", + "switch_name": "{{ user `hyperv_switch`}}", + "type": "hyperv-iso", + "vm_name": "{{ user `template` }}" + }, + { + "boot_command": "{{ user `boot_command` }}", + "boot_wait": "5s", + "cpus": "{{ user `cpus` }}", + "disk_size": "{{user `disk_size`}}", + "headless": "{{ user `headless` }}", + "http_directory": "{{user `http_directory`}}", + "iso_checksum": "{{user `iso_checksum`}}", + "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "memory": "{{ user `memory` }}", + "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-qemu", + "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_timeout": "10000s", + "ssh_username": "vagrant", + "type": "qemu", + "vm_name": "{{ user `template` }}", + "qemuargs": [ + [ "-m", "{{ user `memory` }}" ], + [ "-display", "{{ user `qemu_display` }}" ] + ] + } + ], + "post-processors": [ + { + "output": "{{ user `build_directory` }}/{{user `box_basename`}}.{{.Provider}}.box", + "type": "vagrant" + } + ], + "provisioners": [ + { + "environment_vars": [ + "HOME_DIR=/home/vagrant", + "http_proxy={{user `http_proxy`}}", + "https_proxy={{user `https_proxy`}}", + "no_proxy={{user `no_proxy`}}" + ], + "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", + "expect_disconnect": true, + "scripts": [ + "{{template_dir}}/scripts/update.sh", + "{{template_dir}}/../_common/motd.sh", + "{{template_dir}}/../_common/sshd.sh", + "{{template_dir}}/scripts/networking.sh", + "{{template_dir}}/../_common/vagrant.sh", + "{{template_dir}}/../_common/virtualbox.sh", + "{{template_dir}}/../_common/vmware.sh", + "{{template_dir}}/../_common/parallels.sh", + "{{template_dir}}/scripts/cleanup.sh", + "{{template_dir}}/../_common/minimize.sh" + ], + "type": "shell" + } + ], + "variables": { + "box_basename": "centos-stream-9", + "build_directory": "../../builds", + "build_timestamp": "{{isotime \"2019102650405\"}}", + "cpus": "2", + "disk_size": "65536", + "git_revision": "__unknown_git_revision__", + "guest_additions_url": "", + "headless": "", + "http_directory": "{{template_dir}}/http", + "http_proxy": "{{env `http_proxy`}}", + "https_proxy": "{{env `https_proxy`}}", + "hyperv_generation": "1", + "hyperv_switch": "bento", + "iso_checksum": "file:http://mirror.stream.centos.org/9-stream/BaseOS/x86_64/iso/CentOS-Stream-9-latest-x86_64-dvd1.iso.SHA256SUM", + "iso_name": "CentOS-Stream-9-latest-x86_64-dvd1.iso", + "ks_path": "9-stream/ks.cfg", + "memory": "1024", + "mirror": "https://mirrors.ocf.berkeley.edu/centos-stream", + "mirror_directory": "9-stream/BaseOS/x86_64/iso", + "name": "centos-stream-9", + "no_proxy": "{{env `no_proxy`}}", + "qemu_display": "none", + "template": "centos-stream-9-x86_64", + "boot_command": "<up><wait><tab> inst.text inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>", + "version": "TIMESTAMP" + } +} diff --git a/packer_templates/centos/http/9-stream/ks.cfg b/packer_templates/centos/http/9-stream/ks.cfg new file mode 100644 index 000000000..d0bbe881c --- /dev/null +++ b/packer_templates/centos/http/9-stream/ks.cfg @@ -0,0 +1,76 @@ +cdrom +lang en_US.UTF-8 +keyboard us +network --bootproto=dhcp --noipv6 --onboot=on --device=eth0 +rootpw --plaintext vagrant +firewall --disabled +selinux --permissive +timezone UTC +bootloader --timeout=1 --location=mbr --append="net.ifnames=0 biosdevname=0" +text +skipx +zerombr +clearpart --all --initlabel +autopart --nohome --nolvm --noboot +firstboot --disabled +reboot --eject +user --name=vagrant --plaintext --password vagrant + +%packages --ignoremissing --excludedocs +# vagrant needs this to copy initial files via scp +openssh-clients +sudo +selinux-policy-devel +wget +nfs-utils +net-tools +tar +bzip2 +deltarpm +rsync +dnf-utils +redhat-lsb-core +elfutils-libelf-devel +network-scripts +-fprintd-pam +-intltool +-iwl*-firmware +-microcode_ctl +%end + +%post +# sudo +echo 'Defaults:vagrant !requiretty' > /etc/sudoers.d/vagrant +echo '%vagrant ALL=(ALL) NOPASSWD: ALL' >> /etc/sudoers.d/vagrant +chmod 440 /etc/sudoers.d/vagrant + +# Enable hyper-v daemons only if using hyper-v virtualization +if [ $(virt-what) == "hyperv" ]; then + dnf -y install hyperv-daemons cifs-utils + systemctl enable hypervvssd + systemctl enable hypervkvpd +fi + +# Since we disable consistent network naming, we need to make sure the eth0 +# configuration file is in place so it will come up. +# Delete other network configuration first because RHEL/C7 networking will not +# restart successfully if there are configuration files for devices that do not +# exist. +rm -f /etc/sysconfig/network-scripts/ifcfg-e* +cat > /etc/sysconfig/network-scripts/ifcfg-eth0 << _EOF_ +TYPE=Ethernet +PROXY_METHOD=none +BROWSER_ONLY=no +BOOTPROTO=dhcp +DEFROUTE=yes +IPV4_FAILURE_FATAL=no +IPV6INIT=yes +IPV6_AUTOCONF=yes +IPV6_DEFROUTE=yes +IPV6_FAILURE_FATAL=no +IPV6_ADDR_GEN_MODE=stable-privacy +NAME=eth0 +DEVICE=eth0 +ONBOOT=yes +_EOF_ +%end From 5d1d224c9aa84f214b0cc12214d52a917af6c66e Mon Sep 17 00:00:00 2001 From: SG <13872653+mmguero@users.noreply.github.com> Date: Wed, 21 Dec 2022 14:27:39 -0700 Subject: [PATCH 1497/1622] Updated Debian builds from 11.5 to 11.6 (#1456) --- README.md | 6 +++--- builds.yml | 6 +++--- ...debian-11.5-amd64.json => debian-11.6-amd64.json} | 12 ++++++------ ...debian-11.5-arm64.json => debian-11.6-arm64.json} | 12 ++++++------ .../{debian-11.5-i386.json => debian-11.6-i386.json} | 12 ++++++------ 5 files changed, 24 insertions(+), 24 deletions(-) rename packer_templates/debian/{debian-11.5-amd64.json => debian-11.6-amd64.json} (95%) rename packer_templates/debian/{debian-11.5-arm64.json => debian-11.6-arm64.json} (92%) rename packer_templates/debian/{debian-11.5-i386.json => debian-11.6-i386.json} (96%) diff --git a/README.md b/README.md index cb0ab73e8..4325466d8 100644 --- a/README.md +++ b/README.md @@ -38,7 +38,7 @@ end To build a Debian vagrant box using the bento tool with the template available in the `packer_templates` dir, we can use the following command: ``` -bento build --cpus 2 packer_templates/debian/debian-11.5-i386.json +bento build --cpus 2 packer_templates/debian/debian-11.6-i386.json ``` Other available options: @@ -59,11 +59,11 @@ $ cd packer_templates/ubuntu $ packer build -only=virtualbox-iso ubuntu-18.04-amd64.json ``` -To build Debian 11.5 32bit boxes for all possible providers (simultaneously) +To build Debian 11.6 32bit boxes for all possible providers (simultaneously) ``` $ cd packer_templates/debian -$ packer build debian-11.5-i386.json +$ packer build debian-11.6-i386.json ``` To build CentOS 7.7 boxes for all providers except VMware and Parallels diff --git a/builds.yml b/builds.yml index aa2d15428..f25dd21f8 100644 --- a/builds.yml +++ b/builds.yml @@ -11,9 +11,9 @@ public: - 'debian-10.13-arm64' - 'debian-10.13-i386' - 'debian-10.13' -- 'debian-11.5-arm64' -- 'debian-11.5-i386' -- 'debian-11.5' +- 'debian-11.6-arm64' +- 'debian-11.6-i386' +- 'debian-11.6' - 'fedora-36' - 'fedora-37' - 'freebsd-12.3-i386' diff --git a/packer_templates/debian/debian-11.5-amd64.json b/packer_templates/debian/debian-11.6-amd64.json similarity index 95% rename from packer_templates/debian/debian-11.5-amd64.json rename to packer_templates/debian/debian-11.6-amd64.json index e487f8699..a8aa39086 100644 --- a/packer_templates/debian/debian-11.5-amd64.json +++ b/packer_templates/debian/debian-11.6-amd64.json @@ -130,7 +130,7 @@ } ], "variables": { - "box_basename": "debian-11.5", + "box_basename": "debian-11.6", "build_directory": "../../builds", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "2", @@ -141,17 +141,17 @@ "http_directory": "{{template_dir}}/http", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", - "iso_checksum": "e307d0e583b4a8f7e5b436f8413d4707dd4242b70aea61eb08591dc0378522f3", - "iso_name": "debian-11.5.0-amd64-netinst.iso", + "iso_checksum": "e482910626b30f9a7de9b0cc142c3d4a079fbfa96110083be1d0b473671ce08d", + "iso_name": "debian-11.6.0-amd64-netinst.iso", "memory": "1024", "mirror": "http://cdimage.debian.org/cdimage/release", - "mirror_directory": "11.5.0/amd64/iso-cd", - "name": "debian-11.5", + "mirror_directory": "11.6.0/amd64/iso-cd", + "name": "debian-11.6", "no_proxy": "{{env `no_proxy`}}", "preseed_path": "debian-9/preseed.cfg", "qemu_display": "none", "qemu_bios": "bios-256k.bin", - "template": "debian-11.5-amd64", + "template": "debian-11.6-amd64", "boot_command": "<esc><wait>install <wait> preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}} <wait>debian-installer=en_US.UTF-8 <wait>auto <wait>locale=en_US.UTF-8 <wait>kbd-chooser/method=us <wait>keyboard-configuration/xkb-keymap=us <wait>netcfg/get_hostname={{ .Name }} <wait>netcfg/get_domain=vagrantup.com <wait>fb=false <wait>debconf/frontend=noninteractive <wait>console-setup/ask_detect=false <wait>console-keymaps-at/keymap=us <wait>grub-installer/bootdev=default <wait><enter><wait>", "version": "TIMESTAMP" } diff --git a/packer_templates/debian/debian-11.5-arm64.json b/packer_templates/debian/debian-11.6-arm64.json similarity index 92% rename from packer_templates/debian/debian-11.5-arm64.json rename to packer_templates/debian/debian-11.6-arm64.json index bc01a3def..2741764d2 100644 --- a/packer_templates/debian/debian-11.5-arm64.json +++ b/packer_templates/debian/debian-11.6-arm64.json @@ -76,7 +76,7 @@ } ], "variables": { - "box_basename": "debian-11.5-arm64", + "box_basename": "debian-11.6-arm64", "build_directory": "../../builds", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "2", @@ -87,16 +87,16 @@ "http_directory": "{{template_dir}}/http", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", - "iso_checksum": "70b19f7f0178d594b409822c724c2b7c0834716df1ad7e13dd10e1580380c7c9", - "iso_name": "debian-11.5.0-arm64-netinst.iso", + "iso_checksum": "522706a58317915aceb5eef9b777d04ab573982b36670705e2e6d83dd4669e52", + "iso_name": "debian-11.6.0-arm64-netinst.iso", "memory": "1024", "mirror": "http://cdimage.debian.org/cdimage/release", - "mirror_directory": "11.5.0/arm64/iso-cd", - "name": "debian-11.5-arm64", + "mirror_directory": "11.6.0/arm64/iso-cd", + "name": "debian-11.6-arm64", "no_proxy": "{{env `no_proxy`}}", "preseed_path": "debian-9/preseed.cfg", "qemu_display": "none", - "template": "debian-11.5-arm64", + "template": "debian-11.6-arm64", "version": "TIMESTAMP" } } diff --git a/packer_templates/debian/debian-11.5-i386.json b/packer_templates/debian/debian-11.6-i386.json similarity index 96% rename from packer_templates/debian/debian-11.5-i386.json rename to packer_templates/debian/debian-11.6-i386.json index a3f1f3714..cd80db4a2 100644 --- a/packer_templates/debian/debian-11.5-i386.json +++ b/packer_templates/debian/debian-11.6-i386.json @@ -197,7 +197,7 @@ } ], "variables": { - "box_basename": "debian-11.5-i386", + "box_basename": "debian-11.6-i386", "build_directory": "../../builds", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "2", @@ -208,16 +208,16 @@ "http_directory": "{{template_dir}}/http", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", - "iso_checksum": "700a775805262e16858f64eebe1a3317edef568fc44a5d55fa6f8ce48301acb2", - "iso_name": "debian-11.5.0-i386-netinst.iso", + "iso_checksum": "e6369838b9a59db641246fbb134840b84f2d315b89bd2f912d69a5f7c08c2197", + "iso_name": "debian-11.6.0-i386-netinst.iso", "memory": "1024", "mirror": "http://cdimage.debian.org/cdimage/release", - "mirror_directory": "11.5.0/i386/iso-cd", - "name": "debian-11.5-i386", + "mirror_directory": "11.6.0/i386/iso-cd", + "name": "debian-11.6-i386", "no_proxy": "{{env `no_proxy`}}", "preseed_path": "debian-9/preseed.cfg", "qemu_display": "none", - "template": "debian-11.5-i386", + "template": "debian-11.6-i386", "version": "TIMESTAMP" } } From 141131188f44e9f2b6de3ad91713fd74b50e9faf Mon Sep 17 00:00:00 2001 From: Li-Wen Hsu <lwhsu@lwhsu.org> Date: Thu, 22 Dec 2022 23:56:02 +0800 Subject: [PATCH 1498/1622] FreebSD: cleanup scripts and download URL (#1457) --- packer_templates/freebsd/freebsd-12.3-amd64.json | 4 ++-- packer_templates/freebsd/freebsd-12.3-i386.json | 4 ++-- packer_templates/freebsd/freebsd-12.4-amd64.json | 4 ++-- packer_templates/freebsd/freebsd-12.4-i386.json | 4 ++-- packer_templates/freebsd/freebsd-13.1-amd64.json | 2 +- .../freebsd/http/{freebsd-11 => }/installerconfig | 0 6 files changed, 9 insertions(+), 9 deletions(-) rename packer_templates/freebsd/http/{freebsd-11 => }/installerconfig (100%) diff --git a/packer_templates/freebsd/freebsd-12.3-amd64.json b/packer_templates/freebsd/freebsd-12.3-amd64.json index 9248eadf5..6f8bbc3f2 100644 --- a/packer_templates/freebsd/freebsd-12.3-amd64.json +++ b/packer_templates/freebsd/freebsd-12.3-amd64.json @@ -195,11 +195,11 @@ "http_directory": "{{template_dir}}/http", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", - "install_path": "freebsd-11/installerconfig", + "install_path": "installerconfig", "iso_checksum": "5f0c10ff9af582c7fca90f65868702aa02e80f344c186f0bc75639a687d65641", "iso_name": "FreeBSD-12.3-RELEASE-amd64-disc1.iso", "memory": "1024", - "mirror": "https://download.freebsd.org/ftp", + "mirror": "https://download.freebsd.org", "mirror_directory": "releases/amd64/amd64/ISO-IMAGES/12.3", "name": "freebsd-12.3", "no_proxy": "{{env `no_proxy`}}", diff --git a/packer_templates/freebsd/freebsd-12.3-i386.json b/packer_templates/freebsd/freebsd-12.3-i386.json index d5bcf26c2..4e2af23c6 100644 --- a/packer_templates/freebsd/freebsd-12.3-i386.json +++ b/packer_templates/freebsd/freebsd-12.3-i386.json @@ -195,11 +195,11 @@ "http_directory": "{{template_dir}}/http", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", - "install_path": "freebsd-11/installerconfig", + "install_path": "installerconfig", "iso_checksum": "cc90ab819d3fc4782227fc4269ea7de0747c007cfca9df905f9e50c8617fd820", "iso_name": "FreeBSD-12.3-RELEASE-i386-disc1.iso", "memory": "1024", - "mirror": "https://download.freebsd.org/ftp", + "mirror": "https://download.freebsd.org", "mirror_directory": "releases/i386/i386/ISO-IMAGES/12.3", "name": "freebsd-12.3-i386", "no_proxy": "{{env `no_proxy`}}", diff --git a/packer_templates/freebsd/freebsd-12.4-amd64.json b/packer_templates/freebsd/freebsd-12.4-amd64.json index d8cfbc5b0..54b95da53 100644 --- a/packer_templates/freebsd/freebsd-12.4-amd64.json +++ b/packer_templates/freebsd/freebsd-12.4-amd64.json @@ -195,11 +195,11 @@ "http_directory": "{{template_dir}}/http", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", - "install_path": "freebsd-11/installerconfig", + "install_path": "installerconfig", "iso_checksum": "606435637b76991f96df68f561badf03266f3d5452e9f72ed9b130d96b188800", "iso_name": "FreeBSD-12.4-RELEASE-amd64-disc1.iso", "memory": "1024", - "mirror": "https://download.freebsd.org/ftp", + "mirror": "https://download.freebsd.org", "mirror_directory": "releases/amd64/amd64/ISO-IMAGES/12.4", "name": "freebsd-12.4", "no_proxy": "{{env `no_proxy`}}", diff --git a/packer_templates/freebsd/freebsd-12.4-i386.json b/packer_templates/freebsd/freebsd-12.4-i386.json index 7a957bae9..d2406f7ec 100644 --- a/packer_templates/freebsd/freebsd-12.4-i386.json +++ b/packer_templates/freebsd/freebsd-12.4-i386.json @@ -195,11 +195,11 @@ "http_directory": "{{template_dir}}/http", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", - "install_path": "freebsd-11/installerconfig", + "install_path": "installerconfig", "iso_checksum": "73f4e4875ae4ab9e8695d1ec2cd42f1e4ab4c66b12d99194809eb623a18a7b0d", "iso_name": "FreeBSD-12.4-RELEASE-i386-disc1.iso", "memory": "1024", - "mirror": "https://download.freebsd.org/ftp", + "mirror": "https://download.freebsd.org", "mirror_directory": "releases/i386/i386/ISO-IMAGES/12.4", "name": "freebsd-12.4-i386", "no_proxy": "{{env `no_proxy`}}", diff --git a/packer_templates/freebsd/freebsd-13.1-amd64.json b/packer_templates/freebsd/freebsd-13.1-amd64.json index 9edf8343c..6b1b3a1d5 100644 --- a/packer_templates/freebsd/freebsd-13.1-amd64.json +++ b/packer_templates/freebsd/freebsd-13.1-amd64.json @@ -195,7 +195,7 @@ "http_directory": "{{template_dir}}/http", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", - "install_path": "freebsd-11/installerconfig", + "install_path": "installerconfig", "iso_checksum": "697d81653fa246b921ddfcf1d15562c55249cc727b11fa3e47f470e2cf2b6a40", "iso_name": "FreeBSD-13.1-RELEASE-amd64-disc1.iso", "memory": "1024", diff --git a/packer_templates/freebsd/http/freebsd-11/installerconfig b/packer_templates/freebsd/http/installerconfig similarity index 100% rename from packer_templates/freebsd/http/freebsd-11/installerconfig rename to packer_templates/freebsd/http/installerconfig From 1df5023908847526bbfeb9d4cf16af1e310904eb Mon Sep 17 00:00:00 2001 From: Corey Hemminger <hemminger@hotmail.com> Date: Mon, 9 Jan 2023 09:00:03 -0600 Subject: [PATCH 1499/1622] Hcl2 rewrite (#1455) * Rewrite of json to hcl2 packer templates --- .github/ISSUE_TEMPLATE/BUG_TEMPLATE.md | 12 +- .github/ISSUE_TEMPLATE/DESIGN_PROPOSAL.md | 4 +- .../ENHANCEMENT_REQUEST_TEMPLATE.md | 12 +- .github/ISSUE_TEMPLATE/SUPPORT_QUESTION.md | 4 +- .github/stale.yml | 19 ++ .github/workflows/ci.yml | 170 ++++------ .github/workflows/packer-builds.yml | 239 ++++++++++++++ .gitignore | 8 +- .mdlrc | 1 + .../README_FIRST.md => AMZ_README_FIRST.md | 10 +- AMZ_build_virtualbox-ovf.sh | 65 ++++ CHANGELOG.md | 272 +++++++++------- CODE_OF_CONDUCT.md | 1 - CONTRIBUTING.md | 1 + Gemfile | 8 - MAINTAINERS.md | 23 -- NOTICE.md | 3 +- README.md | 116 ++++--- Rakefile | 96 ------ TESTING.md | 1 + bento.gemspec | 22 -- bin/bento | 14 - builds.yml | 64 ---- builds/uploaded/.gitkeep | 0 lib/bento.rb | 2 - lib/bento/buildmetadata.rb | 72 ----- lib/bento/cli.rb | 204 ------------ lib/bento/common.rb | 125 -------- lib/bento/normalize.rb | 85 ----- lib/bento/packerexec.rb | 30 -- lib/bento/providermetadata.rb | 85 ----- lib/bento/runner.rb | 97 ------ lib/bento/test.rb | 60 ---- lib/bento/upload.rb | 92 ------ lib/bento/version.rb | 3 - .../almalinux/almalinux-8-aarch64.pkrvars.hcl | 10 + .../almalinux/almalinux-8-x86_64.pkrvars.hcl | 10 + .../almalinux/almalinux-9-aarch64.pkrvars.hcl | 10 + .../almalinux/almalinux-9-x86_64.pkrvars.hcl | 10 + .../amazonlinux-2-x86_64.pkrvars.hcl | 18 ++ .../centos/centos-7-aarch64.pkrvars.hcl | 10 + os_pkrvars/centos/centos-7-x86_64.pkrvars.hcl | 10 + .../centos-stream-8-aarch64.pkrvars.hcl | 10 + .../centos/centos-stream-8-x86_64.pkrvars.hcl | 10 + .../centos-stream-9-aarch64.pkrvars.hcl | 10 + .../centos/centos-stream-9-x86_64.pkrvars.hcl | 10 + .../debian/debian-10-aarch64.pkrvars.hcl | 9 + .../debian/debian-10-x86_64.pkrvars.hcl | 9 + .../debian/debian-11-aarch64.pkrvars.hcl | 9 + .../debian/debian-11-x86_64.pkrvars.hcl | 9 + .../fedora/fedora-36-aarch64.pkrvars.hcl | 9 + .../fedora/fedora-36-x86_64.pkrvars.hcl | 9 + .../fedora/fedora-37-aarch64.pkrvars.hcl | 9 + .../fedora/fedora-37-x86_64.pkrvars.hcl | 9 + .../freebsd/freebsd-12-x86_64.pkrvars.hcl | 9 + .../freebsd/freebsd-13-x86_64.pkrvars.hcl | 9 + .../opensuse-leap-15-x86_64.pkrvars.hcl | 9 + .../oraclelinux-7-aarch64.pkrvars.hcl | 10 + .../oraclelinux-7-x86_64.pkrvars.hcl | 10 + .../oraclelinux-8-aarch64.pkrvars.hcl | 10 + .../oraclelinux-8-x86_64.pkrvars.hcl | 10 + .../oraclelinux-9-aarch64.pkrvars.hcl | 10 + .../oraclelinux-9-x86_64.pkrvars.hcl | 10 + os_pkrvars/rhel/rhel-7-aarch64.pkrvars.hcl | 10 + os_pkrvars/rhel/rhel-7-x86_64.pkrvars.hcl | 10 + os_pkrvars/rhel/rhel-8-aarch64.pkrvars.hcl | 10 + os_pkrvars/rhel/rhel-8-x86_64.pkrvars.hcl | 10 + os_pkrvars/rhel/rhel-9-aarch64.pkrvars.hcl | 10 + os_pkrvars/rhel/rhel-9-x86_64.pkrvars.hcl | 10 + .../rockylinux-8-aarch64.pkrvars.hcl | 10 + .../rockylinux-8-x86_64.pkrvars.hcl | 10 + .../rockylinux-9-aarch64.pkrvars.hcl | 10 + .../rockylinux-9-x86_64.pkrvars.hcl | 10 + .../scientificlinux-7-x86_64.pkrvars.hcl | 10 + os_pkrvars/sles/sles-12-x86_64.pkrvars.hcl | 9 + os_pkrvars/sles/sles-15-x86_64.pkrvars.hcl | 9 + .../solaris/solaris-11-x86_64.pkrvars.hcl | 9 + .../springdalelinux-7-x86_64.pkrvars.hcl | 10 + .../springdalelinux-8-x86_64.pkrvars.hcl | 10 + .../springdalelinux-9-x86_64.pkrvars.hcl | 10 + .../ubuntu/ubuntu-18.04-x86_64.pkrvars.hcl | 11 + .../ubuntu/ubuntu-20.04-aarch64.pkrvars.hcl | 11 + .../ubuntu/ubuntu-20.04-x86_64.pkrvars.hcl | 11 + .../ubuntu/ubuntu-22.04-aarch64.pkrvars.hcl | 11 + .../ubuntu/ubuntu-22.04-x86_64.pkrvars.hcl | 19 ++ .../ubuntu/ubuntu-22.10-aarch64.pkrvars.hcl | 11 + .../ubuntu/ubuntu-22.10-x86_64.pkrvars.hcl | 11 + .../windows/windows-10-x86_64.pkrvars.hcl | 9 + .../windows/windows-10gen2-x86_64.pkrvars.hcl | 13 + .../windows/windows-11-x86_64.pkrvars.hcl | 12 + .../windows/windows-11gen2-x86_64.pkrvars.hcl | 14 + .../windows/windows-2012r2-x86_64.pkrvars.hcl | 9 + .../windows/windows-2016-x86_64.pkrvars.hcl | 9 + .../windows/windows-2019-x86_64.pkrvars.hcl | 9 + .../windows/windows-2022-x86_64.pkrvars.hcl | 9 + .../almalinux/almalinux-8.7-aarch64.json | 209 ------------ .../almalinux/almalinux-8.7-x86_64.json | 196 ------------ .../almalinux/almalinux-9.1-aarch64.json | 209 ------------ .../almalinux/almalinux-9.1-x86_64.json | 195 ------------ .../almalinux/scripts/networking.sh | 20 -- packer_templates/almalinux/scripts/update.sh | 10 - .../amazonlinux/STEP1_build_ovf.sh | 48 --- .../amazonlinux/amazon-2-x86_64.json | 78 ----- .../amazonlinux/scripts/cleanup.sh | 47 --- packer_templates/amz_seed_iso/README.md | 1 + .../seed_iso => amz_seed_iso}/meta-data | 0 .../seed_iso => amz_seed_iso}/user-data | 0 packer_templates/amz_working_files/README.md | 1 + .../centos/centos-7.9-x86_64.json | 203 ------------ .../centos/centos-stream-8-x86_64.json | 196 ------------ .../centos/centos-stream-9-x86_64.json | 199 ------------ packer_templates/centos/http/6/ks.cfg | 57 ---- packer_templates/centos/http/8-stream/ks.cfg | 76 ----- packer_templates/centos/http/8/ks.cfg | 77 ----- packer_templates/centos/scripts/cleanup.sh | 113 ------- packer_templates/centos/scripts/networking.sh | 27 -- packer_templates/centos/scripts/update.sh | 21 -- .../{windows => }/cookbooks/packer/Berksfile | 0 .../{windows => }/cookbooks/packer/chefignore | 0 .../cookbooks/packer/kitchen.yml | 0 .../cookbooks/packer/metadata.rb | 0 .../cookbooks/packer/recipes/cleanup.rb | 0 .../packer/recipes/configure_power.rb | 0 .../cookbooks/packer/recipes/defrag.rb | 0 .../packer/recipes/disable_restore.rb | 0 .../packer/recipes/disable_screensaver.rb | 0 .../cookbooks/packer/recipes/disable_uac.rb | 0 .../packer/recipes/disable_windows_update.rb | 0 .../packer/recipes/enable_file_sharing.rb | 0 .../packer/recipes/enable_remote_desktop.rb | 0 .../cookbooks/packer/recipes/features.rb | 0 .../packer/recipes/remove_defender.rb | 0 .../set_local_account_token_filter_policy.rb | 0 .../cookbooks/packer/recipes/ui_tweaks.rb | Bin .../cookbooks/packer/recipes/updates.rb | 0 .../cookbooks/packer/recipes/vm_tools.rb | 0 .../debian/debian-10.13-amd64.json | 223 ------------- .../debian/debian-10.13-arm64.json | 102 ------ .../debian/debian-10.13-i386.json | 223 ------------- .../debian/debian-11.6-amd64.json | 158 ---------- .../debian/debian-11.6-arm64.json | 102 ------ packer_templates/debian/debian-11.6-i386.json | 223 ------------- .../debian/debian-9.13-amd64.json | 223 ------------- .../debian/debian-9.13-arm64.json | 102 ------ packer_templates/debian/debian-9.13-i386.json | 223 ------------- .../debian/debian-9.13-ppc64el.json | 109 ------- .../debian/http/debian-9/preseed.cfg | 47 --- packer_templates/fedora/fedora-36-arm64.json | 84 ----- packer_templates/fedora/fedora-36-x86_64.json | 191 ----------- packer_templates/fedora/fedora-37-x86_64.json | 191 ----------- .../fedora/scripts/crypto-policy.sh | 2 - packer_templates/fedora/scripts/update.sh | 6 - .../freebsd/freebsd-12.3-amd64.json | 211 ------------- .../freebsd/freebsd-12.3-i386.json | 211 ------------- .../freebsd/freebsd-12.4-amd64.json | 211 ------------- .../freebsd/freebsd-12.4-i386.json | 211 ------------- .../freebsd/freebsd-13.1-amd64.json | 211 ------------- packer_templates/http/debian/preseed.cfg | 104 ++++++ .../http/ks-fedora.cfg => http/fedora/ks.cfg} | 0 .../http => http/freebsd}/installerconfig | 0 .../http/15 => http/opensuse}/autoinst.xml | 0 .../http/7/ks.cfg => http/rhel/7ks.cfg} | 0 .../http/8/ks.cfg => http/rhel/8ks.cfg} | 0 .../http/9/ks.cfg => http/rhel/9ks.cfg} | 0 .../sles/12-autoinst.xml} | 0 .../sles/15-autoinst.xml} | 0 .../http => http/solaris}/default.xml | 0 .../http => http/solaris}/profile.xml | 0 .../ks.cfg => http/springdalelinux/7ks.cfg} | 29 +- .../ks.cfg => http/springdalelinux/8ks.cfg} | 20 +- .../9/ks.cfg => http/springdalelinux/9ks.cfg} | 28 +- .../{ubuntu/http => http/ubuntu}/meta-data | 0 .../http => http/ubuntu}/preseed-hyperv.cfg | 0 packer_templates/http/ubuntu/preseed.cfg | 90 ++++++ packer_templates/http/ubuntu/user-data | 17 + .../opensuse/opensuse-leap-15.4-x86_64.json | 195 ------------ .../opensuse/scripts/repositories.sh | 12 - packer_templates/opensuse/scripts/sudoers.sh | 5 - packer_templates/oraclelinux/http/9/ks.cfg | 76 ----- .../oraclelinux/oracle-6.10-i386.json | 202 ------------ .../oraclelinux/oracle-6.10-x86_64.json | 204 ------------ .../oraclelinux/oracle-7.9-x86_64.json | 203 ------------ .../oraclelinux/oracle-8.7-x86_64.json | 182 ----------- .../oraclelinux/oracle-9.1-x86_64.json | 182 ----------- .../oraclelinux/scripts/cleanup.sh | 111 ------- .../oraclelinux/scripts/networking.sh | 27 -- .../oraclelinux/scripts/update.sh | 21 -- packer_templates/pkr-builder.pkr.hcl | 262 +++++++++++++++ packer_templates/pkr-sources.pkr.hcl | 281 +++++++++++++++++ packer_templates/pkr-variables.pkr.hcl | 297 ++++++++++++++++++ packer_templates/rhel/rhel-6.10-i386.json | 160 ---------- packer_templates/rhel/rhel-6.10-x86_64.json | 160 ---------- packer_templates/rhel/rhel-7.6-x86_64.json | 160 ---------- packer_templates/rhel/rhel-8.0-x86_64.json | 160 ---------- packer_templates/rockylinux/http/8/ks.cfg | 77 ----- .../rockylinux/rockylinux-8.7-x86_64.json | 196 ------------ .../rockylinux/rockylinux-9.1-x86_64.json | 196 ------------ .../rockylinux/scripts/networking.sh | 20 -- packer_templates/rockylinux/scripts/update.sh | 10 - .../scientificlinux/http/7/ks.cfg | 52 --- .../scientific-7.9-x86_64.json | 203 ------------ .../{ => scripts}/_common/metadata.sh | 0 .../{ => scripts}/_common/minimize.sh | 8 +- .../{ => scripts}/_common/motd.sh | 0 .../{ => scripts}/_common/parallels.sh | 20 +- .../{ => scripts}/_common/sshd.sh | 1 + .../{ => scripts}/_common/vagrant.sh | 12 +- .../{ => scripts}/_common/virtualbox.sh | 10 +- .../_common/vmware_debian_ubuntu.sh} | 0 .../_common/vmware_fedora.sh} | 0 .../_common/vmware_rhel.sh} | 2 +- .../_common/vmware_suse.sh} | 0 .../debian/cleanup_debian.sh} | 4 +- .../scripts/debian/hyperv_debian.sh | 7 + .../debian/networking_debian.sh} | 0 .../debian/sudoers_debian.sh} | 0 .../debian/systemd_debian.sh} | 0 .../debian/update_debian.sh} | 8 +- .../fedora/build-tools_fedora.sh} | 2 +- .../fedora/cleanup_dnf.sh} | 4 +- .../install-supporting-packages_fedora.sh} | 0 .../fedora/networking_fedora.sh} | 0 .../fedora/real-tmp_fedora.sh} | 1 - packer_templates/scripts/fedora/update_dnf.sh | 7 + .../freebsd/cleanup_freebsd.sh} | 0 .../freebsd/minimize_freebsd.sh} | 0 .../freebsd/postinstall_freebsd.sh} | 2 +- .../freebsd/sudoers_freebsd.sh} | 0 .../freebsd/update_freebsd.sh} | 10 +- .../freebsd/vmtools_freebsd.sh} | 2 - .../rhel/cleanup_dnf.sh} | 16 +- .../rhel/cleanup_yum.sh} | 20 +- .../rhel/networking_rhel7.sh} | 0 packer_templates/scripts/rhel/update_dnf.sh | 7 + .../update.sh => scripts/rhel/update_yum.sh} | 2 +- .../solaris/minimize_solaris.sh} | 0 .../solaris/update_solaris.sh} | 0 .../scripts/solaris/vmtools_solaris.sh | 24 ++ .../suse/cleanup_suse.sh} | 6 +- .../scripts/suse/remove-dvd-source_suse.sh | 4 + .../scripts/suse/repositories_suse.sh | 12 + packer_templates/scripts/suse/sudoers_suse.sh | 5 + .../suse/unsupported-modules_suse.sh} | 0 .../update.sh => scripts/suse/update_suse.sh} | 0 .../suse/vagrant_group_suse.sh} | 0 .../suse/zypper-locks_suse.sh} | 0 .../ubuntu/cleanup_ubuntu.sh} | 4 +- .../scripts/ubuntu/hyperv_ubuntu.sh | 7 + .../ubuntu/networking_ubuntu.sh} | 4 +- .../ubuntu/sudoers_ubuntu.sh} | 0 .../scripts/ubuntu/systemd_ubuntu.sh | 4 + .../ubuntu/update_ubuntu.sh} | 0 .../windows}/base_setup.ps1 | 4 + .../scripts => scripts/windows}/cleanup.ps1 | 0 .../windows/disable-windows-defender.ps1 | 49 +++ .../windows/disable-windows-updates.ps1 | 90 ++++++ .../scripts/windows/eject-media.ps1 | 60 ++++ .../scripts/windows/enable-remote-desktop.ps1 | 43 +++ packer_templates/scripts/windows/optimize.ps1 | 212 +++++++++++++ .../provision-guest-tools-qemu-kvm.ps1 | 54 ++++ .../scripts/windows/provision-vmwaretools.ps1 | 41 +++ .../scripts/windows/provision-winrm.ps1 | 100 ++++++ .../scripts/windows/provision.ps1 | 119 +++++++ .../scripts/windows/remove-apps.ps1 | 110 +++++++ .../scripts/windows/remove-one-drive.ps1 | 69 ++++ ...albox-prevent-vboxsrv-resolution-delay.ps1 | 34 ++ .../sles/http/sles-11-sp4-x86_64-autoinst.xml | 180 ----------- .../sles/http/sles-12-sp3-x86_64-autoinst.xml | 283 ----------------- .../sles/http/sles-15-x86_64-autoinst.xml | 294 ----------------- packer_templates/sles/scripts/cleanup.sh | 26 -- .../sles/scripts/remove-dvd-source.sh | 4 - packer_templates/sles/scripts/sudoers.sh | 3 - packer_templates/sles/scripts/zypper-locks.sh | 10 - packer_templates/sles/sles-11-sp4-x86_64.json | 178 ----------- packer_templates/sles/sles-12-sp2-x86_64.json | 179 ----------- packer_templates/sles/sles-12-sp3-x86_64.json | 179 ----------- packer_templates/sles/sles-15-sp1.json | 222 ------------- packer_templates/sles/sles-15.json | 222 ------------- packer_templates/solaris/scripts/vagrant.sh | 19 -- packer_templates/solaris/scripts/vmtools.sh | 26 -- .../solaris/solaris-11-4-x86.json | 146 --------- packer_templates/solaris/solaris-11-x86.json | 145 --------- .../springdalelinux-7.9-x86_64.json | 196 ------------ .../springdalelinux-8.5-x86_64.json | 196 ------------ packer_templates/ubuntu/http/preseed.cfg | 34 -- packer_templates/ubuntu/http/user-data | 13 - packer_templates/ubuntu/scripts/hyperv.sh | 13 - packer_templates/ubuntu/scripts/vagrant.sh | 14 - .../ubuntu/ubuntu-16.04-amd64.json | 287 ----------------- .../ubuntu/ubuntu-16.04-i386.json | 285 ----------------- .../ubuntu/ubuntu-18.04-amd64.json | 287 ----------------- .../ubuntu/ubuntu-20.04-amd64.json | 254 --------------- .../ubuntu/ubuntu-20.04-arm64.json | 92 ------ .../ubuntu/ubuntu-20.04-live-amd64.json | 254 --------------- .../ubuntu/ubuntu-22.04-amd64.json | 284 ----------------- .../ubuntu/ubuntu-22.04-arm64.json | 93 ------ .../ubuntu/ubuntu-22.10-amd64.json | 284 ----------------- ...reebsd.rb => vagrantfile-freebsd.template} | 3 +- .../vagrantfile-windows-gen2.template | 0 .../vagrantfile-windows.template | 4 +- .../10/Autounattend.xml | 4 - .../10/gen2_Autounattend.xml | 6 +- .../11/Autounattend.xml | 0 .../11/gen2_Autounattend.xml | 0 .../2012/Autounattend.xml | 0 .../2012r2}/Autounattend.xml | 0 .../2016/Autounattend.xml | 0 .../2019/Autounattend.xml | 0 .../2022/Autounattend.xml | 0 packer_templates/windows/scripts/oracle.cer | Bin 1419 -> 0 bytes packer_templates/windows/windows-10.json | 244 -------------- packer_templates/windows/windows-10gen2.json | 161 ---------- packer_templates/windows/windows-11.json | 284 ----------------- packer_templates/windows/windows-11gen2.json | 161 ---------- packer_templates/windows/windows-2012.json | 238 -------------- packer_templates/windows/windows-2012r2.json | 238 -------------- packer_templates/windows/windows-2016.json | 238 -------------- packer_templates/windows/windows-2019.json | 238 -------------- packer_templates/windows/windows-2022.json | 238 -------------- test_templates/bootstrap.sh.erb | 1 - test_templates/kitchen.yml.erb | 29 -- 321 files changed, 3470 insertions(+), 16341 deletions(-) create mode 100644 .github/stale.yml create mode 100644 .github/workflows/packer-builds.yml create mode 100644 .mdlrc rename packer_templates/amazonlinux/README_FIRST.md => AMZ_README_FIRST.md (50%) create mode 100755 AMZ_build_virtualbox-ovf.sh delete mode 100644 CODE_OF_CONDUCT.md create mode 100644 CONTRIBUTING.md delete mode 100644 Gemfile delete mode 100644 MAINTAINERS.md delete mode 100644 Rakefile create mode 100644 TESTING.md delete mode 100644 bento.gemspec delete mode 100755 bin/bento delete mode 100644 builds.yml delete mode 100644 builds/uploaded/.gitkeep delete mode 100644 lib/bento.rb delete mode 100644 lib/bento/buildmetadata.rb delete mode 100644 lib/bento/cli.rb delete mode 100644 lib/bento/common.rb delete mode 100644 lib/bento/normalize.rb delete mode 100644 lib/bento/packerexec.rb delete mode 100644 lib/bento/providermetadata.rb delete mode 100644 lib/bento/runner.rb delete mode 100644 lib/bento/test.rb delete mode 100644 lib/bento/upload.rb delete mode 100644 lib/bento/version.rb create mode 100644 os_pkrvars/almalinux/almalinux-8-aarch64.pkrvars.hcl create mode 100644 os_pkrvars/almalinux/almalinux-8-x86_64.pkrvars.hcl create mode 100644 os_pkrvars/almalinux/almalinux-9-aarch64.pkrvars.hcl create mode 100644 os_pkrvars/almalinux/almalinux-9-x86_64.pkrvars.hcl create mode 100644 os_pkrvars/amazonlinux/amazonlinux-2-x86_64.pkrvars.hcl create mode 100644 os_pkrvars/centos/centos-7-aarch64.pkrvars.hcl create mode 100644 os_pkrvars/centos/centos-7-x86_64.pkrvars.hcl create mode 100644 os_pkrvars/centos/centos-stream-8-aarch64.pkrvars.hcl create mode 100644 os_pkrvars/centos/centos-stream-8-x86_64.pkrvars.hcl create mode 100644 os_pkrvars/centos/centos-stream-9-aarch64.pkrvars.hcl create mode 100644 os_pkrvars/centos/centos-stream-9-x86_64.pkrvars.hcl create mode 100644 os_pkrvars/debian/debian-10-aarch64.pkrvars.hcl create mode 100644 os_pkrvars/debian/debian-10-x86_64.pkrvars.hcl create mode 100644 os_pkrvars/debian/debian-11-aarch64.pkrvars.hcl create mode 100644 os_pkrvars/debian/debian-11-x86_64.pkrvars.hcl create mode 100644 os_pkrvars/fedora/fedora-36-aarch64.pkrvars.hcl create mode 100644 os_pkrvars/fedora/fedora-36-x86_64.pkrvars.hcl create mode 100644 os_pkrvars/fedora/fedora-37-aarch64.pkrvars.hcl create mode 100644 os_pkrvars/fedora/fedora-37-x86_64.pkrvars.hcl create mode 100644 os_pkrvars/freebsd/freebsd-12-x86_64.pkrvars.hcl create mode 100644 os_pkrvars/freebsd/freebsd-13-x86_64.pkrvars.hcl create mode 100644 os_pkrvars/opensuse/opensuse-leap-15-x86_64.pkrvars.hcl create mode 100644 os_pkrvars/oraclelinux/oraclelinux-7-aarch64.pkrvars.hcl create mode 100644 os_pkrvars/oraclelinux/oraclelinux-7-x86_64.pkrvars.hcl create mode 100644 os_pkrvars/oraclelinux/oraclelinux-8-aarch64.pkrvars.hcl create mode 100644 os_pkrvars/oraclelinux/oraclelinux-8-x86_64.pkrvars.hcl create mode 100644 os_pkrvars/oraclelinux/oraclelinux-9-aarch64.pkrvars.hcl create mode 100644 os_pkrvars/oraclelinux/oraclelinux-9-x86_64.pkrvars.hcl create mode 100644 os_pkrvars/rhel/rhel-7-aarch64.pkrvars.hcl create mode 100644 os_pkrvars/rhel/rhel-7-x86_64.pkrvars.hcl create mode 100644 os_pkrvars/rhel/rhel-8-aarch64.pkrvars.hcl create mode 100644 os_pkrvars/rhel/rhel-8-x86_64.pkrvars.hcl create mode 100644 os_pkrvars/rhel/rhel-9-aarch64.pkrvars.hcl create mode 100644 os_pkrvars/rhel/rhel-9-x86_64.pkrvars.hcl create mode 100644 os_pkrvars/rockylinux/rockylinux-8-aarch64.pkrvars.hcl create mode 100644 os_pkrvars/rockylinux/rockylinux-8-x86_64.pkrvars.hcl create mode 100644 os_pkrvars/rockylinux/rockylinux-9-aarch64.pkrvars.hcl create mode 100644 os_pkrvars/rockylinux/rockylinux-9-x86_64.pkrvars.hcl create mode 100644 os_pkrvars/scientificlinux/scientificlinux-7-x86_64.pkrvars.hcl create mode 100644 os_pkrvars/sles/sles-12-x86_64.pkrvars.hcl create mode 100644 os_pkrvars/sles/sles-15-x86_64.pkrvars.hcl create mode 100644 os_pkrvars/solaris/solaris-11-x86_64.pkrvars.hcl create mode 100644 os_pkrvars/springdalelinux/springdalelinux-7-x86_64.pkrvars.hcl create mode 100644 os_pkrvars/springdalelinux/springdalelinux-8-x86_64.pkrvars.hcl create mode 100644 os_pkrvars/springdalelinux/springdalelinux-9-x86_64.pkrvars.hcl create mode 100644 os_pkrvars/ubuntu/ubuntu-18.04-x86_64.pkrvars.hcl create mode 100644 os_pkrvars/ubuntu/ubuntu-20.04-aarch64.pkrvars.hcl create mode 100644 os_pkrvars/ubuntu/ubuntu-20.04-x86_64.pkrvars.hcl create mode 100644 os_pkrvars/ubuntu/ubuntu-22.04-aarch64.pkrvars.hcl create mode 100644 os_pkrvars/ubuntu/ubuntu-22.04-x86_64.pkrvars.hcl create mode 100644 os_pkrvars/ubuntu/ubuntu-22.10-aarch64.pkrvars.hcl create mode 100644 os_pkrvars/ubuntu/ubuntu-22.10-x86_64.pkrvars.hcl create mode 100644 os_pkrvars/windows/windows-10-x86_64.pkrvars.hcl create mode 100644 os_pkrvars/windows/windows-10gen2-x86_64.pkrvars.hcl create mode 100644 os_pkrvars/windows/windows-11-x86_64.pkrvars.hcl create mode 100644 os_pkrvars/windows/windows-11gen2-x86_64.pkrvars.hcl create mode 100644 os_pkrvars/windows/windows-2012r2-x86_64.pkrvars.hcl create mode 100644 os_pkrvars/windows/windows-2016-x86_64.pkrvars.hcl create mode 100644 os_pkrvars/windows/windows-2019-x86_64.pkrvars.hcl create mode 100644 os_pkrvars/windows/windows-2022-x86_64.pkrvars.hcl delete mode 100644 packer_templates/almalinux/almalinux-8.7-aarch64.json delete mode 100644 packer_templates/almalinux/almalinux-8.7-x86_64.json delete mode 100644 packer_templates/almalinux/almalinux-9.1-aarch64.json delete mode 100644 packer_templates/almalinux/almalinux-9.1-x86_64.json delete mode 100644 packer_templates/almalinux/scripts/networking.sh delete mode 100644 packer_templates/almalinux/scripts/update.sh delete mode 100755 packer_templates/amazonlinux/STEP1_build_ovf.sh delete mode 100644 packer_templates/amazonlinux/amazon-2-x86_64.json delete mode 100644 packer_templates/amazonlinux/scripts/cleanup.sh create mode 100644 packer_templates/amz_seed_iso/README.md rename packer_templates/{amazonlinux/seed_iso => amz_seed_iso}/meta-data (100%) rename packer_templates/{amazonlinux/seed_iso => amz_seed_iso}/user-data (100%) create mode 100644 packer_templates/amz_working_files/README.md delete mode 100644 packer_templates/centos/centos-7.9-x86_64.json delete mode 100644 packer_templates/centos/centos-stream-8-x86_64.json delete mode 100644 packer_templates/centos/centos-stream-9-x86_64.json delete mode 100644 packer_templates/centos/http/6/ks.cfg delete mode 100644 packer_templates/centos/http/8-stream/ks.cfg delete mode 100644 packer_templates/centos/http/8/ks.cfg delete mode 100644 packer_templates/centos/scripts/cleanup.sh delete mode 100644 packer_templates/centos/scripts/networking.sh delete mode 100644 packer_templates/centos/scripts/update.sh rename packer_templates/{windows => }/cookbooks/packer/Berksfile (100%) rename packer_templates/{windows => }/cookbooks/packer/chefignore (100%) rename packer_templates/{windows => }/cookbooks/packer/kitchen.yml (100%) rename packer_templates/{windows => }/cookbooks/packer/metadata.rb (100%) rename packer_templates/{windows => }/cookbooks/packer/recipes/cleanup.rb (100%) rename packer_templates/{windows => }/cookbooks/packer/recipes/configure_power.rb (100%) rename packer_templates/{windows => }/cookbooks/packer/recipes/defrag.rb (100%) rename packer_templates/{windows => }/cookbooks/packer/recipes/disable_restore.rb (100%) rename packer_templates/{windows => }/cookbooks/packer/recipes/disable_screensaver.rb (100%) rename packer_templates/{windows => }/cookbooks/packer/recipes/disable_uac.rb (100%) rename packer_templates/{windows => }/cookbooks/packer/recipes/disable_windows_update.rb (100%) rename packer_templates/{windows => }/cookbooks/packer/recipes/enable_file_sharing.rb (100%) rename packer_templates/{windows => }/cookbooks/packer/recipes/enable_remote_desktop.rb (100%) rename packer_templates/{windows => }/cookbooks/packer/recipes/features.rb (100%) rename packer_templates/{windows => }/cookbooks/packer/recipes/remove_defender.rb (100%) rename packer_templates/{windows => }/cookbooks/packer/recipes/set_local_account_token_filter_policy.rb (100%) rename packer_templates/{windows => }/cookbooks/packer/recipes/ui_tweaks.rb (100%) rename packer_templates/{windows => }/cookbooks/packer/recipes/updates.rb (100%) rename packer_templates/{windows => }/cookbooks/packer/recipes/vm_tools.rb (100%) delete mode 100644 packer_templates/debian/debian-10.13-amd64.json delete mode 100644 packer_templates/debian/debian-10.13-arm64.json delete mode 100644 packer_templates/debian/debian-10.13-i386.json delete mode 100644 packer_templates/debian/debian-11.6-amd64.json delete mode 100644 packer_templates/debian/debian-11.6-arm64.json delete mode 100644 packer_templates/debian/debian-11.6-i386.json delete mode 100644 packer_templates/debian/debian-9.13-amd64.json delete mode 100644 packer_templates/debian/debian-9.13-arm64.json delete mode 100644 packer_templates/debian/debian-9.13-i386.json delete mode 100644 packer_templates/debian/debian-9.13-ppc64el.json delete mode 100644 packer_templates/debian/http/debian-9/preseed.cfg delete mode 100644 packer_templates/fedora/fedora-36-arm64.json delete mode 100644 packer_templates/fedora/fedora-36-x86_64.json delete mode 100644 packer_templates/fedora/fedora-37-x86_64.json delete mode 100755 packer_templates/fedora/scripts/crypto-policy.sh delete mode 100644 packer_templates/fedora/scripts/update.sh delete mode 100644 packer_templates/freebsd/freebsd-12.3-amd64.json delete mode 100644 packer_templates/freebsd/freebsd-12.3-i386.json delete mode 100644 packer_templates/freebsd/freebsd-12.4-amd64.json delete mode 100644 packer_templates/freebsd/freebsd-12.4-i386.json delete mode 100644 packer_templates/freebsd/freebsd-13.1-amd64.json create mode 100644 packer_templates/http/debian/preseed.cfg rename packer_templates/{fedora/http/ks-fedora.cfg => http/fedora/ks.cfg} (100%) rename packer_templates/{freebsd/http => http/freebsd}/installerconfig (100%) rename packer_templates/{opensuse/http/15 => http/opensuse}/autoinst.xml (100%) rename packer_templates/{centos/http/7/ks.cfg => http/rhel/7ks.cfg} (100%) rename packer_templates/{almalinux/http/8/ks.cfg => http/rhel/8ks.cfg} (100%) rename packer_templates/{almalinux/http/9/ks.cfg => http/rhel/9ks.cfg} (100%) rename packer_templates/{sles/http/sles-12-sp2-x86_64-autoinst.xml => http/sles/12-autoinst.xml} (100%) rename packer_templates/{sles/http/sles-15-sp1-x86_64-autoinst.xml => http/sles/15-autoinst.xml} (100%) rename packer_templates/{solaris/http => http/solaris}/default.xml (100%) rename packer_templates/{solaris/http => http/solaris}/profile.xml (100%) rename packer_templates/{centos/http/9-stream/ks.cfg => http/springdalelinux/7ks.cfg} (66%) rename packer_templates/{springdalelinux/http/8-netinst/ks.cfg => http/springdalelinux/8ks.cfg} (82%) rename packer_templates/{rockylinux/http/9/ks.cfg => http/springdalelinux/9ks.cfg} (63%) rename packer_templates/{ubuntu/http => http/ubuntu}/meta-data (100%) rename packer_templates/{ubuntu/http => http/ubuntu}/preseed-hyperv.cfg (100%) create mode 100644 packer_templates/http/ubuntu/preseed.cfg create mode 100644 packer_templates/http/ubuntu/user-data delete mode 100644 packer_templates/opensuse/opensuse-leap-15.4-x86_64.json delete mode 100644 packer_templates/opensuse/scripts/repositories.sh delete mode 100644 packer_templates/opensuse/scripts/sudoers.sh delete mode 100644 packer_templates/oraclelinux/http/9/ks.cfg delete mode 100644 packer_templates/oraclelinux/oracle-6.10-i386.json delete mode 100644 packer_templates/oraclelinux/oracle-6.10-x86_64.json delete mode 100644 packer_templates/oraclelinux/oracle-7.9-x86_64.json delete mode 100644 packer_templates/oraclelinux/oracle-8.7-x86_64.json delete mode 100644 packer_templates/oraclelinux/oracle-9.1-x86_64.json delete mode 100644 packer_templates/oraclelinux/scripts/cleanup.sh delete mode 100644 packer_templates/oraclelinux/scripts/networking.sh delete mode 100644 packer_templates/oraclelinux/scripts/update.sh create mode 100644 packer_templates/pkr-builder.pkr.hcl create mode 100644 packer_templates/pkr-sources.pkr.hcl create mode 100644 packer_templates/pkr-variables.pkr.hcl delete mode 100644 packer_templates/rhel/rhel-6.10-i386.json delete mode 100644 packer_templates/rhel/rhel-6.10-x86_64.json delete mode 100644 packer_templates/rhel/rhel-7.6-x86_64.json delete mode 100644 packer_templates/rhel/rhel-8.0-x86_64.json delete mode 100644 packer_templates/rockylinux/http/8/ks.cfg delete mode 100644 packer_templates/rockylinux/rockylinux-8.7-x86_64.json delete mode 100644 packer_templates/rockylinux/rockylinux-9.1-x86_64.json delete mode 100644 packer_templates/rockylinux/scripts/networking.sh delete mode 100644 packer_templates/rockylinux/scripts/update.sh delete mode 100644 packer_templates/scientificlinux/http/7/ks.cfg delete mode 100644 packer_templates/scientificlinux/scientific-7.9-x86_64.json rename packer_templates/{ => scripts}/_common/metadata.sh (100%) rename packer_templates/{ => scripts}/_common/minimize.sh (83%) rename packer_templates/{ => scripts}/_common/motd.sh (100%) rename packer_templates/{ => scripts}/_common/parallels.sh (63%) rename packer_templates/{ => scripts}/_common/sshd.sh (95%) rename packer_templates/{ => scripts}/_common/vagrant.sh (57%) rename packer_templates/{ => scripts}/_common/virtualbox.sh (92%) rename packer_templates/{ubuntu/scripts/vmware.sh => scripts/_common/vmware_debian_ubuntu.sh} (100%) rename packer_templates/{fedora/scripts/vmware.sh => scripts/_common/vmware_fedora.sh} (100%) rename packer_templates/{_common/vmware.sh => scripts/_common/vmware_rhel.sh} (79%) rename packer_templates/{opensuse/scripts/vmware.sh => scripts/_common/vmware_suse.sh} (100%) rename packer_templates/{debian/scripts/cleanup.sh => scripts/debian/cleanup_debian.sh} (97%) create mode 100755 packer_templates/scripts/debian/hyperv_debian.sh rename packer_templates/{debian/scripts/networking.sh => scripts/debian/networking_debian.sh} (100%) rename packer_templates/{debian/scripts/sudoers.sh => scripts/debian/sudoers_debian.sh} (100%) rename packer_templates/{debian/scripts/systemd.sh => scripts/debian/systemd_debian.sh} (100%) rename packer_templates/{debian/scripts/update.sh => scripts/debian/update_debian.sh} (67%) rename packer_templates/{fedora/scripts/build-tools.sh => scripts/fedora/build-tools_fedora.sh} (51%) rename packer_templates/{fedora/scripts/cleanup.sh => scripts/fedora/cleanup_dnf.sh} (94%) rename packer_templates/{fedora/scripts/install-supporting-packages.sh => scripts/fedora/install-supporting-packages_fedora.sh} (100%) rename packer_templates/{fedora/scripts/fix-slow-dns.sh => scripts/fedora/networking_fedora.sh} (100%) rename packer_templates/{fedora/scripts/real-tmp.sh => scripts/fedora/real-tmp_fedora.sh} (86%) create mode 100644 packer_templates/scripts/fedora/update_dnf.sh rename packer_templates/{freebsd/scripts/cleanup.sh => scripts/freebsd/cleanup_freebsd.sh} (100%) rename packer_templates/{freebsd/scripts/minimize.sh => scripts/freebsd/minimize_freebsd.sh} (100%) rename packer_templates/{freebsd/scripts/postinstall.sh => scripts/freebsd/postinstall_freebsd.sh} (96%) rename packer_templates/{freebsd/scripts/sudoers.sh => scripts/freebsd/sudoers_freebsd.sh} (100%) rename packer_templates/{freebsd/scripts/update.sh => scripts/freebsd/update_freebsd.sh} (60%) rename packer_templates/{freebsd/scripts/vmtools.sh => scripts/freebsd/vmtools_freebsd.sh} (96%) rename packer_templates/{almalinux/scripts/cleanup.sh => scripts/rhel/cleanup_dnf.sh} (76%) rename packer_templates/{rockylinux/scripts/cleanup.sh => scripts/rhel/cleanup_yum.sh} (78%) rename packer_templates/{amazonlinux/scripts/networking.sh => scripts/rhel/networking_rhel7.sh} (100%) create mode 100644 packer_templates/scripts/rhel/update_dnf.sh rename packer_templates/{amazonlinux/scripts/update.sh => scripts/rhel/update_yum.sh} (68%) rename packer_templates/{solaris/scripts/minimize.sh => scripts/solaris/minimize_solaris.sh} (100%) rename packer_templates/{solaris/scripts/update.sh => scripts/solaris/update_solaris.sh} (100%) create mode 100644 packer_templates/scripts/solaris/vmtools_solaris.sh rename packer_templates/{opensuse/scripts/cleanup.sh => scripts/suse/cleanup_suse.sh} (76%) create mode 100644 packer_templates/scripts/suse/remove-dvd-source_suse.sh create mode 100644 packer_templates/scripts/suse/repositories_suse.sh create mode 100644 packer_templates/scripts/suse/sudoers_suse.sh rename packer_templates/{sles/scripts/unsupported-modules.sh => scripts/suse/unsupported-modules_suse.sh} (100%) rename packer_templates/{opensuse/scripts/update.sh => scripts/suse/update_suse.sh} (100%) rename packer_templates/{opensuse/scripts/vagrant_group.sh => scripts/suse/vagrant_group_suse.sh} (100%) rename packer_templates/{opensuse/scripts/zypper-locks.sh => scripts/suse/zypper-locks_suse.sh} (100%) rename packer_templates/{ubuntu/scripts/cleanup.sh => scripts/ubuntu/cleanup_ubuntu.sh} (97%) create mode 100755 packer_templates/scripts/ubuntu/hyperv_ubuntu.sh rename packer_templates/{ubuntu/scripts/networking.sh => scripts/ubuntu/networking_ubuntu.sh} (83%) rename packer_templates/{ubuntu/scripts/sudoers.sh => scripts/ubuntu/sudoers_ubuntu.sh} (100%) create mode 100644 packer_templates/scripts/ubuntu/systemd_ubuntu.sh rename packer_templates/{ubuntu/scripts/update.sh => scripts/ubuntu/update_ubuntu.sh} (100%) rename packer_templates/{windows/scripts => scripts/windows}/base_setup.ps1 (89%) rename packer_templates/{windows/scripts => scripts/windows}/cleanup.ps1 (100%) create mode 100644 packer_templates/scripts/windows/disable-windows-defender.ps1 create mode 100644 packer_templates/scripts/windows/disable-windows-updates.ps1 create mode 100644 packer_templates/scripts/windows/eject-media.ps1 create mode 100644 packer_templates/scripts/windows/enable-remote-desktop.ps1 create mode 100644 packer_templates/scripts/windows/optimize.ps1 create mode 100644 packer_templates/scripts/windows/provision-guest-tools-qemu-kvm.ps1 create mode 100644 packer_templates/scripts/windows/provision-vmwaretools.ps1 create mode 100644 packer_templates/scripts/windows/provision-winrm.ps1 create mode 100644 packer_templates/scripts/windows/provision.ps1 create mode 100644 packer_templates/scripts/windows/remove-apps.ps1 create mode 100644 packer_templates/scripts/windows/remove-one-drive.ps1 create mode 100644 packer_templates/scripts/windows/virtualbox-prevent-vboxsrv-resolution-delay.ps1 delete mode 100644 packer_templates/sles/http/sles-11-sp4-x86_64-autoinst.xml delete mode 100644 packer_templates/sles/http/sles-12-sp3-x86_64-autoinst.xml delete mode 100644 packer_templates/sles/http/sles-15-x86_64-autoinst.xml delete mode 100644 packer_templates/sles/scripts/cleanup.sh delete mode 100644 packer_templates/sles/scripts/remove-dvd-source.sh delete mode 100644 packer_templates/sles/scripts/sudoers.sh delete mode 100644 packer_templates/sles/scripts/zypper-locks.sh delete mode 100644 packer_templates/sles/sles-11-sp4-x86_64.json delete mode 100644 packer_templates/sles/sles-12-sp2-x86_64.json delete mode 100644 packer_templates/sles/sles-12-sp3-x86_64.json delete mode 100644 packer_templates/sles/sles-15-sp1.json delete mode 100644 packer_templates/sles/sles-15.json delete mode 100644 packer_templates/solaris/scripts/vagrant.sh delete mode 100644 packer_templates/solaris/scripts/vmtools.sh delete mode 100644 packer_templates/solaris/solaris-11-4-x86.json delete mode 100644 packer_templates/solaris/solaris-11-x86.json delete mode 100644 packer_templates/springdalelinux/springdalelinux-7.9-x86_64.json delete mode 100644 packer_templates/springdalelinux/springdalelinux-8.5-x86_64.json delete mode 100644 packer_templates/ubuntu/http/preseed.cfg delete mode 100644 packer_templates/ubuntu/http/user-data delete mode 100755 packer_templates/ubuntu/scripts/hyperv.sh delete mode 100644 packer_templates/ubuntu/scripts/vagrant.sh delete mode 100644 packer_templates/ubuntu/ubuntu-16.04-amd64.json delete mode 100644 packer_templates/ubuntu/ubuntu-16.04-i386.json delete mode 100644 packer_templates/ubuntu/ubuntu-18.04-amd64.json delete mode 100644 packer_templates/ubuntu/ubuntu-20.04-amd64.json delete mode 100644 packer_templates/ubuntu/ubuntu-20.04-arm64.json delete mode 100644 packer_templates/ubuntu/ubuntu-20.04-live-amd64.json delete mode 100644 packer_templates/ubuntu/ubuntu-22.04-amd64.json delete mode 100644 packer_templates/ubuntu/ubuntu-22.04-arm64.json delete mode 100644 packer_templates/ubuntu/ubuntu-22.10-amd64.json rename packer_templates/{freebsd/vagrantfile_templates/freebsd.rb => vagrantfile-freebsd.template} (90%) rename packer_templates/{windows => }/vagrantfile-windows-gen2.template (100%) rename packer_templates/{windows => }/vagrantfile-windows.template (92%) rename packer_templates/{windows/answer_files => win_answer_files}/10/Autounattend.xml (98%) rename packer_templates/{windows/answer_files => win_answer_files}/10/gen2_Autounattend.xml (98%) rename packer_templates/{windows/answer_files => win_answer_files}/11/Autounattend.xml (100%) rename packer_templates/{windows/answer_files => win_answer_files}/11/gen2_Autounattend.xml (100%) rename packer_templates/{windows/answer_files => win_answer_files}/2012/Autounattend.xml (100%) rename packer_templates/{windows/answer_files/2012_r2 => win_answer_files/2012r2}/Autounattend.xml (100%) rename packer_templates/{windows/answer_files => win_answer_files}/2016/Autounattend.xml (100%) rename packer_templates/{windows/answer_files => win_answer_files}/2019/Autounattend.xml (100%) rename packer_templates/{windows/answer_files => win_answer_files}/2022/Autounattend.xml (100%) delete mode 100644 packer_templates/windows/scripts/oracle.cer delete mode 100644 packer_templates/windows/windows-10.json delete mode 100644 packer_templates/windows/windows-10gen2.json delete mode 100644 packer_templates/windows/windows-11.json delete mode 100644 packer_templates/windows/windows-11gen2.json delete mode 100644 packer_templates/windows/windows-2012.json delete mode 100644 packer_templates/windows/windows-2012r2.json delete mode 100644 packer_templates/windows/windows-2016.json delete mode 100644 packer_templates/windows/windows-2019.json delete mode 100644 packer_templates/windows/windows-2022.json delete mode 100644 test_templates/bootstrap.sh.erb delete mode 100644 test_templates/kitchen.yml.erb diff --git a/.github/ISSUE_TEMPLATE/BUG_TEMPLATE.md b/.github/ISSUE_TEMPLATE/BUG_TEMPLATE.md index f28915b72..99ec9e140 100644 --- a/.github/ISSUE_TEMPLATE/BUG_TEMPLATE.md +++ b/.github/ISSUE_TEMPLATE/BUG_TEMPLATE.md @@ -4,26 +4,26 @@ about: If something isn't working as expected �. labels: "Status: Untriaged" --- -# Version: +# Version [Version of the project installed] -# Environment: +## Environment [Details about the environment such as the Operating System, cookbook details, etc...] -# Scenario: +## Scenario [What you are trying to achieve and you can't?] -# Steps to Reproduce: +## Steps to Reproduce [If you are filing an issue what are the things we need to do in order to repro your problem?] -# Expected Result: +## Expected Result [What are you expecting to happen as the consequence of above reproduction steps?] -# Actual Result: +## Actual Result [What actually happens after the reproduction steps?] diff --git a/.github/ISSUE_TEMPLATE/DESIGN_PROPOSAL.md b/.github/ISSUE_TEMPLATE/DESIGN_PROPOSAL.md index 9f4a958fe..46c5c98e7 100644 --- a/.github/ISSUE_TEMPLATE/DESIGN_PROPOSAL.md +++ b/.github/ISSUE_TEMPLATE/DESIGN_PROPOSAL.md @@ -4,7 +4,7 @@ about: I have a significant change I would like to propose and discuss before st labels: "Status: Untriaged" --- -### When a Change Needs a Design Proposal +# When a Change Needs a Design Proposal A design proposal should be opened any time a change meets one of the following qualifications: @@ -12,7 +12,7 @@ A design proposal should be opened any time a change meets one of the following - Significantly changes the underlying architecture of the project in a way that impacts other developers. - Changes the development or testing process of the project such as a change of CI systems or test frameworks. -### Why We Use This Process +## Why We Use This Process - Allows all interested parties (including any community member) to discuss large impact changes to a project. - Serves as a durable paper trail for discussions regarding project architecture. diff --git a/.github/ISSUE_TEMPLATE/ENHANCEMENT_REQUEST_TEMPLATE.md b/.github/ISSUE_TEMPLATE/ENHANCEMENT_REQUEST_TEMPLATE.md index 65bf5a06b..bea4375f2 100644 --- a/.github/ISSUE_TEMPLATE/ENHANCEMENT_REQUEST_TEMPLATE.md +++ b/.github/ISSUE_TEMPLATE/ENHANCEMENT_REQUEST_TEMPLATE.md @@ -4,14 +4,18 @@ about: I have a suggestion (and may want to implement it 🙂)! labels: "Status: Untriaged" --- -### Describe the Enhancement: +# Describe the Enhancement + <!--- What you are trying to achieve that you can't? --> -### Describe the Need: +## Describe the Need + <!--- What kind of user do you believe would utilize this enhancement, and how many users might want this functionality --> -### Current Alternative +## Current Alternative + <!--- Is there a current alternative that you can utilize to workaround the lack of this enhancement --> -### Can We Help You Implement This?: +## Can We Help You Implement This + <!--- The best way to ensure your enhancement is built is to help implement the enhancement yourself. If you're interested in helping out we'd love to give you a hand to make this possible. Let us know if there's something you need. --> diff --git a/.github/ISSUE_TEMPLATE/SUPPORT_QUESTION.md b/.github/ISSUE_TEMPLATE/SUPPORT_QUESTION.md index 921a5f0bb..1f0b925a3 100644 --- a/.github/ISSUE_TEMPLATE/SUPPORT_QUESTION.md +++ b/.github/ISSUE_TEMPLATE/SUPPORT_QUESTION.md @@ -5,7 +5,7 @@ about: If you have a question 💬, please check out our Slack! We use GitHub issues to track bugs and feature requests. If you need help please post to our Mailing List or join the Chef Community Slack. - * Chef Community Slack at http://community-slack.chef.io/. - * Chef Mailing List https://discourse.chef.io/ +- Chef Community Slack at <http://community-slack.chef.io/>. +- Chef Mailing List <https://discourse.chef.io/> Support issues opened here will be closed and redirected to Slack or Discourse. diff --git a/.github/stale.yml b/.github/stale.yml new file mode 100644 index 000000000..f4a1eba6c --- /dev/null +++ b/.github/stale.yml @@ -0,0 +1,19 @@ +--- +# Number of days of inactivity before an issue becomes stale +daysUntilStale: 180 +# Number of days of inactivity before a stale issue is closed +daysUntilClose: 14 +# Issues with these labels will never be considered stale +exemptLabels: + - WIP + - pinned + - security +# Label to use when marking an issue as stale +staleLabel: stale +# Comment to post when marking an issue as stale. Set to `false` to disable +markComment: > + This issue has been automatically marked as stale because it has not had + recent activity. It will be closed if no further activity occurs. Thank you + for your contributions. +# Comment to post when closing a stale issue. Set to `false` to disable +closeComment: This issue has been closed due to no activity please reopen if you believe this is still an issue. diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3cc760d04..2b4e80619 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -1,103 +1,67 @@ ---- - -name: Packer - -on: - push: - -jobs: - windows-build-cookbook-cookstyle: - runs-on: ubuntu-latest - - steps: - - uses: actions/checkout@v2 - - name: Install Chef - uses: actionshub/chef-install@main - env: - CHEF_LICENSE: accept-no-persist - - name: Run Cookstyle - run: cookstyle packer_templates/windows/cookbooks - - enumerate_packer_templates: - runs-on: ubuntu-latest - - steps: - - uses: actions/checkout@v2 - - name: enumerate_packer_templates - shell: pwsh - run: "'::set-output name=matrix::{0}' -f $(Get-ChildItem -Path packer_templates -Include *.json -Recurse | Foreach-Object {Join-Path -Path $_.Directory.Name -ChildPath $_.Name} | ConvertTo-Json -Compress)" - id: enumerate_packer_templates - - outputs: - matrix: ${{ steps.enumerate_packer_templates.outputs.matrix }} - - packer-validate: - needs: enumerate_packer_templates - - runs-on: ubuntu-latest - name: packer-validate - - strategy: - fail-fast: false - matrix: - template: ${{ fromJson(needs.enumerate_packer_templates.outputs.matrix) }} - - steps: - - name: Checkout Repository - uses: actions/checkout@v2 - - - name: Fix Template - uses: hashicorp/packer-github-actions@master - with: - command: fix - target: "packer_templates/${{ matrix.template }}" - - - name: Validate Template - uses: hashicorp/packer-github-actions@master - with: - command: validate - arguments: -syntax-only - target: "packer_templates/${{ matrix.template }}" - - enumerate_iso_validation: - runs-on: ubuntu-latest - - steps: - - uses: actions/checkout@v2 - - name: enumerate_iso_validation - env: - EXCLUDE: 'amazon-2*,rhel*,sles*,solaris*' - shell: pwsh - run: "'::set-output name=matrix::{0}' -f $(Get-ChildItem -Path packer_templates -Include *.json -Exclude ${{ env.EXCLUDE }} -Recurse | Foreach-Object {Join-Path -Path $_.Directory.Name -ChildPath $_.Name} | ConvertTo-Json -Compress)" - id: enumerate_iso_validation - - outputs: - matrix: ${{ steps.enumerate_iso_validation.outputs.matrix }} - - iso-availability: - needs: enumerate_iso_validation - - runs-on: ubuntu-latest - name: iso-validate - - strategy: - fail-fast: false - matrix: - template: ${{ fromJson(needs.enumerate_iso_validation.outputs.matrix) }} - - steps: - - name: Checkout Repository - uses: actions/checkout@v2 - - name: iso-availability - shell: pwsh - run: | - $(Get-Content "packer_templates/${{ matrix.template }}" | ConvertFrom-Json ) | - Foreach-Object { - if($_.variables.iso_url){ - $_.variables.iso_url - }else{ - '{0}/{1}/{2}' -f $_.variables.mirror,$_.variables.mirror_directory,$_.variables.iso_name - } - } | Foreach-Object { - Invoke-RestMethod -Uri $_ -Method Head -Verbose - } +--- +on: + pull_request: + +jobs: + markdown-lint: + uses: chef/github-workflows/.github/workflows/markdown-lint.yml@main + + markdown-link-checker: + uses: chef/github-workflows/.github/workflows/markdown-link-checker.yml@main + + yaml-lint: + uses: chef/github-workflows/.github/workflows/yaml-lint.yml@main + + json-lint: + uses: chef/github-workflows/.github/workflows/json-lint.yml@main + + xml-lint: + uses: chef/github-workflows/.github/workflows/xml-lint.yml@main + + shellcheck-lint: + uses: chef/github-workflows/.github/workflows/shellcheck-lint.yml@main + + powershell-lint: + uses: chef/github-workflows/.github/workflows/powershell-lint.yml@main + + packer-iso-check: + uses: chef/github-workflows/.github/workflows/packer-iso-url-checker.yml@main + secrets: inherit + + packer-lint: + uses: chef/github-workflows/.github/workflows/packer-lint.yml@main + secrets: inherit + + packer-builds: + needs: + - yaml-lint + - json-lint + - xml-lint + - powershell-lint + - shellcheck-lint + - packer-iso-check + - packer-lint + uses: ./.github/workflows/packer-builds.yml + secrets: inherit + + check_jobs_pass: + if: always() + needs: + - markdown-lint + - markdown-link-checker + - yaml-lint + - json-lint + - xml-lint + - powershell-lint + - shellcheck-lint + - packer-iso-check + - packer-lint + - packer-builds + runs-on: Ubuntu-latest + steps: + - name: Decide whether the needed jobs succeeded or failed + uses: re-actors/alls-green@main + with: + allowed-failures: markdown-link-checker + allowed-skips: + jobs: ${{ toJSON(needs) }} diff --git a/.github/workflows/packer-builds.yml b/.github/workflows/packer-builds.yml new file mode 100644 index 000000000..0af546f90 --- /dev/null +++ b/.github/workflows/packer-builds.yml @@ -0,0 +1,239 @@ +--- +on: + workflow_call: + secrets: + PACKER_GITHUB_API_TOKEN: + required: true + +jobs: + builds-x86_64: + runs-on: macos-latest + strategy: + fail-fast: false + matrix: + os: + - almalinux-8 + - almalinux-9 + - centos-7 + - centos-stream-8 + - centos-stream-9 + - debian-10 + - debian-11 + - fedora-36 + - fedora-37 + - freebsd-12 + - freebsd-13 + - opensuse-leap-15 + - oraclelinux-7 + - oraclelinux-8 + - oraclelinux-9 + - rockylinux-8 + - rockylinux-9 + - scientificlinux-7 + - springdalelinux-7 + - springdalelinux-8 + - springdalelinux-9 + - ubuntu-18.04 + - ubuntu-20.04 + - ubuntu-22.04 + - ubuntu-22.10 + - windows-10 + - windows-11 + - windows-2012r2 + - windows-2016 + - windows-2019 + - windows-2022 + provider: + # - qemu + - virtualbox-iso + exclude: + - os: centos-stream-9 + provider: virtualbox-iso + steps: + # - name: HomeBrew + # run: brew update && brew upgrade qemu && brew upgrade --cask virtualbox + - name: Checkout + uses: actions/checkout@main + - name: Pull Change list + id: changed-files + uses: collin-miller/git-changesets@master + - name: Verify Changed files + id: verify-changed-files + run: | + echo '${{ steps.changed-files.outputs.added_modified }}' > changed.txt + if grep ".*\.pkrvars.hcl" changed.txt; then + echo "files_changed=true" >> $GITHUB_OUTPUT + else + echo "files_changed=false" >> $GITHUB_OUTPUT + fi + - name: Setup Packer + if: steps.verify-changed-files.outputs.files_changed == 'true' + uses: hashicorp/setup-packer@main + with: + version: latest + - name: Packer Init + if: steps.verify-changed-files.outputs.files_changed == 'true' + env: + PACKER_GITHUB_API_TOKEN: "${{ secrets.PACKER_GITHUB_API_TOKEN }}" + run: packer init -upgrade packer_templates + - name: Packer build + if: steps.verify-changed-files.outputs.files_changed == 'true' + run: packer build -only=${{ matrix.provider }}.vm -var-file=os_pkrvars/$(echo ${{ matrix.os }} | cut -d "-" -f 1)/"${{ matrix.os }}-x86_64.pkrvars.hcl" packer_templates + - name: Upload build artifact + uses: actions/upload-artifact@main + with: + name: vagrant-boxes + path: | + builds/*.box + retention-days: 10 + + builds-aarch64: + runs-on: self-hosted + strategy: + fail-fast: false + matrix: + os: + - almalinux-8 + - almalinux-9 + - centos-7 + - centos-stream-8 + - centos-stream-9 + - debian-10 + - debian-11 + - fedora-36 + - fedora-37 + - oraclelinux-7 + - oraclelinux-8 + - oraclelinux-9 + - rockylinux-8 + - rockylinux-9 + - ubuntu-20.04 + - ubuntu-22.04 + - ubuntu-22.10 + provider: + - parallels-iso + # - qemu + # - virtualbox-iso + # - vmware-iso + exclude: + - os: almalinux-8 + provider: parallels-iso + - os: rockylinux-8 + provider: parallels-iso + steps: + # - name: Update HomeBrew + # run: brew update && brew upgrade && brew upgrade --cask + - name: Checkout + uses: actions/checkout@main + - name: Pull Change list + id: changed-files + uses: collin-miller/git-changesets@master + - name: Verify Changed files + id: verify-changed-files + run: | + echo '${{ steps.changed-files.outputs.added_modified }}' > changed.txt + if grep ".*\.pkrvars.hcl" changed.txt; then + echo "files_changed=true" >> $GITHUB_OUTPUT + else + echo "files_changed=false" >> $GITHUB_OUTPUT + fi + - name: Setup Packer + if: steps.verify-changed-files.outputs.files_changed == 'true' + uses: hashicorp/setup-packer@main + with: + version: latest + - name: Packer Init + if: steps.verify-changed-files.outputs.files_changed == 'true' + env: + PACKER_GITHUB_API_TOKEN: "${{ secrets.PACKER_GITHUB_API_TOKEN }}" + run: packer init -upgrade packer_templates + - name: Packer build + if: steps.verify-changed-files.outputs.files_changed == 'true' + run: packer build -only=${{ matrix.provider }}.vm -var-file=os_pkrvars/$(echo ${{ matrix.os }} | cut -d "-" -f 1)/"${{ matrix.os }}-aarch64.pkrvars.hcl" packer_templates + - name: Upload build artifact + uses: actions/upload-artifact@v3 + with: + name: vagrant-boxes + path: | + builds + !builds/packer-*/* + !build/.gitkeep + retention-days: 10 + +# builds-x86_64-hyperv: +# runs-on: windows-latest +# strategy: +# fail-fast: false +# matrix: +# os: +# - almalinux-8 +# - almalinux-9 +# - centos-7 +# - centos-stream-8 +# - centos-stream-9 +# - debian-10 +# - debian-11 +# - fedora-36 +# - fedora-37 +# - freebsd-12 +# - freebsd-13 +# - opensuse-leap-15 +# - oraclelinux-7 +# - oraclelinux-8 +# - oraclelinux-9 +# - rockylinux-8 +# - rockylinux-9 +# - scientificlinux-7 +# - springdalelinux-7 +# - springdalelinux-8 +# - springdalelinux-9 +# - ubuntu-18.04 +# - ubuntu-20.04 +# - ubuntu-22.04 +# - ubuntu-22.10 +# - windows-10 +# - windows-11 +# - windows-2012r2 +# - windows-2016 +# - windows-2019 +# - windows-2022 +# provider: +# - hyperv-iso +# +# steps: +# - name: Checkout +# uses: actions/checkout@main +# - name: Pull Change list +# id: changed-files +# uses: collin-miller/git-changesets@master +# - name: Verify Changed files +# id: verify-changed-files +# run: | +# echo '${{ steps.changed-files.outputs.added_modified }}' > changed.txt +# if grep ".*\.pkrvars.hcl" changed.txt; then +# echo "files_changed=true" >> $GITHUB_OUTPUT +# else +# echo "files_changed=false" >> $GITHUB_OUTPUT +# fi +# - name: Setup Packer +# if: steps.verify-changed-files.outputs.files_changed == 'true' +# uses: hashicorp/setup-packer@main +# with: +# version: latest +# - name: Packer Init +# if: steps.verify-changed-files.outputs.files_changed == 'true' +# env: +# PACKER_GITHUB_API_TOKEN: "${{ secrets.PACKER_GITHUB_API_TOKEN }}" +# run: packer init -upgrade packer_templates +# - name: Packer build +# if: steps.verify-changed-files.outputs.files_changed == 'true' +# run: packer build -only=${{ matrix.provider }}.vm -var-file=os_pkrvars/$(echo ${{ matrix.os }} | cut -d "-" -f 1)/"${{ matrix.os }}-x86_64.pkrvars.hcl" packer_templates +# - name: Upload build artifact +# uses: actions/upload-artifact@main +# with: +# name: vagrant-boxes +# path: | +# builds +# !builds/packer-*/* +# !build/.gitkeep +# retention-days: 10 diff --git a/.gitignore b/.gitignore index 132b90580..8b7a25bec 100644 --- a/.gitignore +++ b/.gitignore @@ -4,17 +4,11 @@ *.ovf *.vmdk *.vdi +*.log virtualfloppy.vfd packer_cache packer.log .DS_Store -/packer-*/ -*.variables.json -/builds/ -.kitchen -.kitchen.yml Gemfile.lock bootstrap.sh Berksfile.lock -ubuntu/scripts/homestead.sh -*.log \ No newline at end of file diff --git a/.mdlrc b/.mdlrc new file mode 100644 index 000000000..ebeef65e4 --- /dev/null +++ b/.mdlrc @@ -0,0 +1 @@ +rules "~MD013", "~MD024" diff --git a/packer_templates/amazonlinux/README_FIRST.md b/AMZ_README_FIRST.md similarity index 50% rename from packer_templates/amazonlinux/README_FIRST.md rename to AMZ_README_FIRST.md index 8268b4dfe..51e111752 100644 --- a/packer_templates/amazonlinux/README_FIRST.md +++ b/AMZ_README_FIRST.md @@ -1,8 +1,8 @@ This is not your normal Bento box. Instead of building a system from an ISO we're building a system from an Amazon provided VirtualBox VDI file. This means the process is a bit different than usual. -## Building this box +# Building this box -1. Download the VirtualBox .vdi file for Amazon Linux 2 and place it in the same directory as this readme file. Amazon hosts these at https://cdn.amazonlinux.com/os-images/latest/virtualbox/. Make sure to name it amazon.vdi instead of the version specific name that Amazon gives it on their site. -2. Run the STEP1_build_ovf.sh script to prepare this VDI file for packer and export it as a OVF file. -3. From the amazonlinux directory run packer: bento build amazon-2-x86_64.json -4. OPTIONAL: Cleanup the leftover files in the directory +1. Download the VirtualBox .vdi file for Amazon Linux 2 and place it in the same directory as this readme file. Amazon hosts these at <https://cdn.amazonlinux.com/os-images/latest/virtualbox/>. Make sure to name it amazon.vdi instead of the version specific name that Amazon gives it on their site. +1. Run the STEP1_build_ovf.sh script to prepare this VDI file for packer and export it as a OVF file. +1. From the amazonlinux directory run packer: bento build amazon-2-x86_64.json +1. OPTIONAL: Cleanup the leftover files in the directory diff --git a/AMZ_build_virtualbox-ovf.sh b/AMZ_build_virtualbox-ovf.sh new file mode 100755 index 000000000..c07bed4b8 --- /dev/null +++ b/AMZ_build_virtualbox-ovf.sh @@ -0,0 +1,65 @@ +#!/bin/bash + +# Getting script directory location +SCRIPT_RELATIVE_DIR=$(dirname "${BASH_SOURCE[0]}") +cd "$SCRIPT_RELATIVE_DIR" || exit + +# set tmp dir for files +AMZDIR="$(pwd)/packer_templates/amz_working_files" + +# Get virtualbox vdi file name with latest version number +IMG="$(wget -q https://cdn.amazonlinux.com/os-images/latest/virtualbox/ -O - | grep ".vdi" | cut -d "\"" -f 2)" + +# Download vbox vdi +wget -q -O "$AMZDIR"/amazon.vdi -c https://cdn.amazonlinux.com/os-images/latest/virtualbox/"$IMG" + +if [ ! -f "$AMZDIR"/amazon.vdi ]; then + echo There must be a file named amazon.vdi in "$AMZDIR"! + echo You can download the vdi file at https://cdn.amazonlinux.com/os-images/latest/virtualbox/ + exit 1 +fi + +echo "Cleaning up old files" +rm "$AMZDIR"/*.iso "$AMZDIR"/*.ovf "$AMZDIR"/*.vmdk + +echo "Creating ISO" +hdiutil makehybrid -o "$AMZDIR"/seed.iso -hfs -joliet -iso -default-volume-name cidata seed_iso + +VM="AmazonLinuxBento" +echo Powering off and deleting any existing VMs named $VM +VBoxManage controlvm $VM poweroff --type headless 2> /dev/null +vboxmanage unregistervm $VM --delete 2> /dev/null +sleep 5 + +echo "Creating the VM" +# from https://www.perkin.org.uk/posts/create-virtualbox-vm-from-the-command-line.html +VBoxManage createvm --name $VM --ostype "RedHat_64" --register +VBoxManage storagectl $VM --name "SATA Controller" --add sata --controller IntelAHCI +VBoxManage storageattach $VM --storagectl "SATA Controller" --port 0 --device 0 --type hdd --medium "$AMZDIR"/amazon.vdi +VBoxManage storagectl $VM --name "IDE Controller" --add ide +VBoxManage storageattach $VM --storagectl "IDE Controller" --port 0 --device 0 --type dvddrive --medium "$AMZDIR"/seed.iso +VBoxManage modifyvm $VM --memory 1024 +VBoxManage modifyvm $VM --cpus 2 +VBoxManage modifyvm $VM --audio none +VBoxManage modifyvm $VM --ioapic on +sleep 5 + +echo Sleeping for 120 seconds to let the system boot and cloud-init to run +VBoxManage startvm $VM --type headless +sleep 120 +VBoxManage controlvm $VM poweroff --type headless +VBoxManage storageattach $VM --storagectl "IDE Controller" --port 0 --device 0 --type dvddrive --medium none +sleep 5 + +echo Exporting the VM to an OVF file +vboxmanage export $VM -o "$AMZDIR"/amazon2.ovf +sleep 5 + +echo Deleting the VM +vboxmanage unregistervm $VM --delete + +echo starting packer build of amazonlinux +if packer build -only=virtualbox-ovf.amazonlinux -var-file="$AMZDIR/../../os_pkrvars/amazonlinux/amazonlinux-2-x86_64.pkrvars.hcl" "$AMZDIR"/..; then + echo "Cleaning up files" + rm "$AMZDIR"/*.ovf "$AMZDIR"/*.vmdk "$AMZDIR"/*.iso +fi diff --git a/CHANGELOG.md b/CHANGELOG.md index 539ca1ae4..d86ebdb22 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,9 +1,8 @@ # Change Log -## [v202206.14.0](https://github.com/chef/bento/tree/v202206.14.0) (2022-06-14) -[Full Changelog](https://github.com/chef/bento/compare/v201812.27.0...v202206.14.0) +## [v202206.14.0] (2022-06-14) -**New Platforms:** +### New Platforms - almalinux 8.6 [\#1414](https://github.com/chef/bento/pull/1414) ([stromweld](https://github.com/stromweld)) - almalinux 9.0 [\#1414](https://github.com/chef/bento/pull/1414) ([stromweld](https://github.com/stromweld)) @@ -11,16 +10,15 @@ - windows 11 [\#1414](https://github.com/chef/bento/pull/1414) ([stromweld](https://github.com/stromweld)) - windows 2022 [\#1414](https://github.com/chef/bento/pull/1414) ([stromweld](https://github.com/stromweld)) -**Deprecated Platforms:** +### Deprecated Platforms -**Fixes and updates:** +### Fixes and updates - update windows builds to be created in builds folder [\#1414](https://github.com/chef/bento/pull/1414) ([stromweld](https://github.com/stromweld)) -## [v201812.27.0](https://github.com/chef/bento/tree/v201812.27.0) (2019-01-16) -[Full Changelog](https://github.com/chef/bento/compare/v201808.24.0...v201812.27.0) +## [v201812.27.0] (2019-01-16) -**New Platforms:** +### New Platforms - Debian 9.6 [\#1138](https://github.com/chef/bento/pull/1138) ([cheeseplus](https://github.com/cheeseplus)) - Fedora 29 [\#1126](https://github.com/chef/bento/pull/1126) ([avanzzzi](https://github.com/avanzzzi)) @@ -29,12 +27,12 @@ - FreeBSD 12.0-RELEASE [\#1153](https://github.com/chef/bento/pull/1153) ([lwhsu](https://github.com/lwhsu)) - Ubuntu 18.10 [\#1124](https://github.com/chef/bento/pull/1124) ([chenhan1218](https://github.com/chenhan1218)) -**Deprecated Platforms:** +### Deprecated Platforms - FreeBSD 11.1 [\#1120](https://github.com/chef/bento/pull/1120) ([juliandunn](https://github.com/juliandunn)) - FreeBSD 10.4 [\#1142](https://github.com/chef/bento/pull/1142) ([tas50](https://github.com/tas50)) -**Fixes and updates:** +### Fixes and updates - Whiteout all spaces [\#1151](https://github.com/chef/bento/pull/1151) ([Sorbog](https://github.com/Sorbog)) - Reduce centos locale size [\#1149](https://github.com/chef/bento/pull/1149) ([Sorbog](https://github.com/Sorbog)) @@ -51,32 +49,29 @@ ## [v201808.24.0](https://github.com/chef/bento/tree/v201808.24.0) (2018-09-02) -[Full Changelog](https://github.com/chef/bento/compare/v201807.12.0...v201808.24.0) - -**New Platforms** +### New Platforms - CentOS 5.11 (resurrected) - OpenSUSE 15 -## [v201807.12.0](https://github.com/chef/bento/tree/v201807.12.0) (2018-07-16) - -[Full Changelog](https://github.com/chef/bento/compare/v201806.08.0...v201807.12.0) +## [v201807.12.0] (2018-07-16) -**New Platforms** +### New Platforms - FreeBSD 11.2-RELEASE [\#1068](https://github.com/chef/bento/pull/1068) ([lwhsu](https://github.com/lwhsu)) - Debian 8.11 [\#1064](https://github.com/chef/bento/pull/1064) ([kenhys](https://github.com/kenhys)) - Debian 9.5 - CentOS 6.10 -**Deprecated Platforms** +### Deprecated Platforms - Debian 7 [\#1059](https://github.com/chef/bento/pull/1059) ([tas50](https://github.com/tas50)) - Fedora 26 [\#1074](https://github.com/chef/bento/pull/1074) ([tas50](https://github.com/tas50)) - Ubuntu 17.10 [\#1077](https://github.com/chef/bento/pull/1077) ([tas50](https://github.com/tas50)) - macOS 10.9 [\#1076](https://github.com/chef/bento/pull/1076) ([tas50](https://github.com/tas50)) -**Fixes and Improvements** +### Fixes and Improvements + - Use a faster scientific mirror [\#1081](https://github.com/chef/bento/pull/1081) ([tas50](https://github.com/tas50)) - Install the latest 2008-06 update for 2k8r2 [\#1080](https://github.com/chef/bento/pull/1080) ([tas50](https://github.com/tas50)) - Update RHELs to 6.10 / 7.5 [\#1079](https://github.com/chef/bento/pull/1079) ([tas50](https://github.com/tas50)) @@ -87,19 +82,20 @@ - Increase build time memory to 4GB on Windows boxes [\#1061](https://github.com/chef/bento/pull/1061) ([tas50](https://github.com/tas50)) ## [v201806.08.0](https://github.com/chef/bento/tree/v201806.08.0) (2018-06-07) -[Full Changelog](https://github.com/chef/bento/compare/201803.24.0...v201806.08.0) -**New Platforms** +### New Platforms - Ubuntu 18.04 (Release version) - CentOS 7.5 [\#1037](https://github.com/chef/bento/pull/1037) ([artem-sidorenko](https://github.com/artem-sidorenko)) - Fedora 28 [\#1035](https://github.com/chef/bento/pull/1035) ([fkrull](https://github.com/fkrull)) - HardenedBSD v1100055.2 [\#1033](https://github.com/chef/bento/pull/1033) ([nusenu](https://github.com/nusenu)) -**Deprecated Platforms** +### Deprecated Platforms + - Remove EOL'd FreeBSD-10.3 [\#1060](https://github.com/chef/bento/pull/1060) ([lwhsu](https://github.com/lwhsu)) -**Fixes and Improvements** +### Fixes and Improvements + - fedora, centos, rhel: added deltarpm to kickstart files [\#1030](https://github.com/chef/bento/pull/1030) ([muellerbe](https://github.com/muellerbe)) - Clean up network configs [\#1025](https://github.com/chef/bento/pull/1025) ([Superdawg](https://github.com/Superdawg)) - OpenSuse: Create a new 'vagrant' group for vagrant user [\#1020](https://github.com/chef/bento/pull/1020) ([hwoarang](https://github.com/hwoarang)) @@ -110,27 +106,31 @@ - Scientific Linux templates [\#1051](https://github.com/chef/bento/pull/1051) ([githubfoam](https://github.com/githubfoam)) - Fix Fedora cleanup script not to cause unintended software removal. [\#1050](https://github.com/chef/bento/pull/1050) ([mgruner](https://github.com/mgruner)) -**Tooling** +### Tooling + - VirtualBox 5.2.12 - Parallels 13.3.1 - VMware Fusion 10.1.2 - Packer 1.2.3 - Vagrant 2.1.1 -## [201803.24.0](https://github.com/chef/bento/tree/201803.24.0) (2018-03-24) +## [201803.24.0] (2018-03-24) + +### New Platforms -**New Platforms** - Ubuntu 18.04 (pre-release) - HardenedBSD 11 - FreeBSD 10/11 32bit -**Improvements** +## Improvements + - Ubuntu 16.04+ and Debian 9: fix issues with disabling predictable interface names - Ubuntu/Debian: further mitigate apt locks at startup - Multiple platforms: cleanup errant \*.iso files - OpenSUSE Leap: disable Snappter/btrfs snapshots, increase disk size -**Tooling** +### Tooling + - VirtualBox 5.2.6 (Note: we are not using 5.2.8) - Parallels 13.3.0 - VMware Fusion 10.1.1 @@ -138,42 +138,49 @@ - Vagrant 2.0.3 - Hyper-V 10.0.16299.15 -## [201802.02.0](https://github.com/chef/bento/tree/201802.02.0) (2018-02-02) +## [201802.02.0] (2018-02-02) + +### Improvements -**Improvements** - Ubuntu: remove linux-firmware bloat w/o removing package and breaking upgrades - macOS: enable autologin for vagrant user -**EOL** +### EOL + - Ubuntu 17.04 - Windows Nano TP3 -**Tooling** +### Tooling + - VirtualBox 5.2.6 - Parallels 13.2.0 - VMware Fusion 10.1.1 - Packer 1.1.3 - Vagrant 2.0.1 -## [201801.05.0](https://github.com/chef/bento/tree/201801.05.0) (2018-01-05) +## [201801.05.0] (2018-01-05) + +### New Platforms -**New Platforms** - Oracle Linux 7.4 -**Tooling** +### Tooling + - VirtualBox 5.2.4 - Parallels 13.2.0 - Packer 1.1.3 - Vagrant 2.0.1 -## [201801.02.0](https://github.com/chef/bento/tree/201801.02.0) (2018-01-02) +## [201801.02.0] (2018-01-02) + +### New Platforms -**New Platforms** - Debian 9.3 - Debian 8.10 - Fedora 27 -**Hyper-V Boxes (experimental)** +### Hyper-V Boxes (experimental) + - centos-7.4 - centos-6.9 - ubuntu-17.10 @@ -181,7 +188,8 @@ - ubuntu-16.04 - ubuntu-14.04 -**Tooling** +### Tooling + - VirtualBox 5.2.4 - VMware Fusion 10.1.0 - Parallels 13.2.0 @@ -189,43 +197,48 @@ - Packer 1.1.3 - Vagrant 2.0.1 -## [201710.31.0](https://github.com/chef/bento/tree/201710.31.0) (2017-10-31) +## [201710.31.0] (2017-10-31) + +### New Platforms -**New Platforms** - Ubuntu 17.10 - Debian 9.2 - Debian 8.10 - FreeBSD 10.4 - CentOS 7.4 -**Tooling** +### Tooling + - VirtualBox 5.1.30 - VMware Fusion 10.0.1 - Parallels 13.1.1 - Packer 1.1.1 - Vagrant 2.0.0 -**Fixes/Updates** +### Fixes/Updates + - SLES fixes - 1GB of RAM as default for boxen - re-organized into platform folders - hyper-V fixes - qemu fixes +## [201708.22.0] (2017-08-22) -## [201708.22.0](https://github.com/chef/bento/tree/201708.22.0) (2017-08-22) +### New -**New** - Debian 9.1 - Debian 8.9 - FreeBSD 11.1 -**Improvements** +### Improvements + - Top level slugs for point release platforms, i.e. centos-7 -> centos-7.3 - Move to date based versioning scheme `YYYYMM.DD.PATCH` - Automatically update RHEL-ish platforms as we do with other platforms -**Tooling** +### Tooling + - VirtualBox 5.1.26 - VMware Fusion 8.5.8 - VMware Workstation 12.5.7 @@ -234,77 +247,91 @@ ## [2.3.8](https://github.com/chef/bento/tree/2.3.8) (2017-07-20) -**New** +### New + - Fedora 26 -**Improvements** +### Improvements + - Suppress VMX whitelisting warning by removing interfaces at end of build - Use archive.ubuntu.com instead of US specific domain - Latest Tooling - - VirtualBox 5.1.24 - - VMware Fusion 8.5.8 - - Parallels 12.2.1 - - Packer 1.0.3 + - VirtualBox 5.1.24 + - VMware Fusion 8.5.8 + - Parallels 12.2.1 + - Packer 1.0.3 -## [2.3.7](https://github.com/chef/bento/tree/2.3.7) (2017-07-03) +## [2.3.7] (2017-07-03) + +### New -**New** - Debian 8.8 - Debian 9.0 [\#818](https://github.com/chef/bento/pull/818) - Oracle 6.9 - Ubuntu 17.04 [\#808](https://github.com/chef/bento/pull/808) -**Removed** +### Removed + - OmniOS - Ubuntu 12.04 - SLES 12 / 12 SP1 -**Fixes** +### Fixes + - Fedora cleanup and size reduction -## [2.3.6](https://github.com/chef/bento/tree/2.3.6) (2017-05-03) +## [2.3.6] (2017-05-03) - Release for fixed VirtualBox 5.1.22 -## [2.3.5](https://github.com/chef/bento/tree/2.3.5) (2017-04-24) +## [2.3.5] (2017-04-24) - Release primarily around broken VirtualBox 5.1.20/21 (fixed) -**New** +### New + - CentOS 6.9 [\#788](https://github.com/chef/bento/pull/788) -**Fixes** +### Fixes + - Oracle 6.8 `box_basename` [\#784](https://github.com/chef/bento/pull/784) - MacOS 10.12 issue w/ memory var [\#768](https://github.com/chef/bento/pull/768) -## [2.3.4](https://github.com/chef/bento/tree/2.3.4) (2017-03-23) +## [2.3.4] (2017-03-23) - Mostly rebuilt for updated hypervisors: VirtualBox 5.1.18 and VMware Fusion 8.5.5 - Better cleanup for Fedora boxes -## [2.3.3](https://github.com/chef/bento/tree/2.3.3) (2017-02-19) +## [2.3.3] (2017-02-19) + +### Added and Updated Platforms -**Added and Updated Platforms** - Debian 8.7 ## [2.3.2](https://github.com/chef/bento/tree/2.3.2) (2016-12-19) + [Full Changelog](https://github.com/chef/bento/compare/2.3.1...2.3.2) -**Added and Updated Platforms** +### Added and Updated Platforms + - CentOS and RHEL 7.3 [\#739](https://github.com/chef/bento/pull/739) ([rickard-von-essen](https://github.com/rickard-von-essen)) -- SLES 12 SP2 [\#735](https://github.com/chef/bento/pull/735) ([mattiasgiese](https://github.com/mattiasgiese)) +- SLES 12 SP2 [\#735](https://github.com/chef/bento/pull/735) ([mattiasgiese]) + +### Improvements -**Improvements** - Update VMware tools to fix CentOS 7.3 build [\#743](https://github.com/chef/bento/pull/743) ([cheeseplus](https://github.com/cheeseplus)) - Remove CentOS requiretty sudoers workaround, this is now the default [\#740](https://github.com/chef/bento/pull/740) ([mvermaes](https://github.com/mvermaes)) -**Pipeline** +### Pipeline + - Use the bento-ya gem, add builds.yml [\#745](https://github.com/chef/bento/pull/745) ([cheeseplus](https://github.com/cheeseplus)) ## [2.3.1](https://github.com/chef/bento/tree/2.3.1) (2016-11-30) + [Full Changelog](https://github.com/chef/bento/compare/2.3.0...2.3.1) -**Added and Updated Platforms** +### Added and Updated Platforms + - Fedora 25 [\#725](https://github.com/chef/bento/pull/725) ([rickard-von-essen](https://github.com/rickard-von-essen)) - FreeBSD 11.0 [\#492](https://github.com/chef/bento/pull/492) ([rickard-von-essen](https://github.com/rickard-von-essen)) - macOS Sierra [\#715](https://github.com/chef/bento/pull/715) ([kameghamegha](https://github.com/kameghamegha)) @@ -314,7 +341,7 @@ - Oracle Linux 5.11 - Ubuntu 16.10 [\#697](https://github.com/chef/bento/pull/697) ([rickard-von-essen](https://github.com/rickard-von-essen)) -**Improvements** +### Improvements - RFC: Switch FreeBSD installation to bsdinstall [\#558](https://github.com/chef/bento/issues/558) - Reduce size of Linux images [\#718](https://github.com/chef/bento/pull/718) ([tas50](https://github.com/tas50)) @@ -325,31 +352,32 @@ - Remove unused http files [\#700](https://github.com/chef/bento/pull/700) ([rickard-von-essen](https://github.com/rickard-von-essen)) - Remove unused scripts [\#698](https://github.com/chef/bento/pull/698) ([rickard-von-essen](https://github.com/rickard-von-essen)) -**Fixed bugs** +### Fixed bugs - CentOS 5.11-x86\_64 building w/ vbox 5.1.x. Fix \#729. [\#730](https://github.com/chef/bento/pull/730) ([cheeseplus](https://github.com/cheeseplus)) - Get Solaris 11 to build again [\#687](https://github.com/chef/bento/pull/687) ([tas50](https://github.com/tas50)) - Get OmniOS boxes building again [\#683](https://github.com/chef/bento/pull/683) ([tas50](https://github.com/tas50)) - Fix SLES builds [\#684](https://github.com/chef/bento/pull/684), [\#707](https://github.com/chef/bento/pull/707) ([tas50](https://github.com/tas50)) -**Known Issues** +### Known Issues - OpenSuSE 13.2 builds for all providers but will not start properly under VMware Fusion/Workstation - OpenSuSE Leap 42.2 builds for all providers but will _only_ start properly under VMware Fusion/Workstation ## [2.3.0](https://github.com/chef/bento/tree/2.3.0) (2016-09-30) + [Full Changelog](https://github.com/chef/bento/compare/2.2.9...2.3.0) -**SPECIAL NOTE:** +### SPECIAL NOTE Due to issues with upstream projects that bento relies upon, the 2.3.0 release may appear to break. Please ensure that Virtualbox is at least 5.1.6 and Vagrant at least 1.8.6 before reporting issues. -**Added Platforms:** +### Added Platforms - add Debian 8.6 [\#669](https://github.com/chef/bento/issues/669) -**Improvements:** +### Improvements - Changed the vagrant users UID from 900 to 1000. Fix \#688 [\#675](https://github.com/chef/bento/pull/675) ([rickard-von-essen](https://github.com/rickard-von-essen)) - Updating build.sh with more env vars [\#672](https://github.com/chef/bento/pull/672) ([cheeseplus](https://github.com/cheeseplus)) @@ -360,11 +388,11 @@ Please ensure that Virtualbox is at least 5.1.6 and Vagrant at least 1.8.6 befor - Add script for sles-12-sp1 [\#643](https://github.com/chef/bento/pull/643) ([oven](https://github.com/oven)) - Refactored vmware tools scripts [\#638](https://github.com/chef/bento/pull/638) ([svpace](https://github.com/svpace)) -**Known Issues:** +### Known Issues - CentOS 5 guests in VirtualBox 5.1.x fatally exit with a guru mediation error so v2.3.0 does not exist on Atlas -**Tool Versions:** +### Tool Versions - Packer 0.11.0 (master) - VirtualBox 5.1.16 @@ -374,34 +402,36 @@ Please ensure that Virtualbox is at least 5.1.6 and Vagrant at least 1.8.6 befor - Vagrant 1.8.6 ## [2.2.9](https://github.com/chef/bento/tree/2.2.9) (2016-08-01) + [Full Changelog](https://github.com/chef/bento/compare/2.2.8...2.2.9) -**Improvements:** +### Improvements - OpenSUSE Leap 42.1: requires 768 Mb memory. [\#632](https://github.com/chef/bento/pull/632) ([rickard-von-essen](https://github.com/rickard-von-essen)) - Update for 16.04.1 iso [\#629](https://github.com/chef/bento/pull/629) - For reals fixed 16.04 pkg lock bug [\#637](https://github.com/chef/bento/pull/637) ([cheeseplus](https://github.com/cheeseplus)) -**Fixed bugs:** +### Fixed bugs - VMware: HGFS not working - Ubuntu 16.04 [\#591](https://github.com/chef/bento/issues/591) -**EOL** +### EOL - - Fedora 22 +- Fedora 22 - **Tool Versions:** +### Tool Versions - - Packer 0.10.1 - - VirtualBox 5.0.26 - - VMware Fusion 8.1.1 - - VMware Workstation 12.1.1 - - Parallels Pro 11.2.1 +- Packer 0.10.1 +- VirtualBox 5.0.26 +- VMware Fusion 8.1.1 +- VMware Workstation 12.1.1 +- Parallels Pro 11.2.1 ## [2.2.8](https://github.com/chef/bento/tree/2.2.8) (2016-07-22) + [Full Changelog](https://github.com/chef/bento/compare/2.2.7...2.2.8) -**Improvements:** +### Improvements - Archiving all non-current builds [\#622](https://github.com/chef/bento/pull/622) ([cheeseplus](https://github.com/cheeseplus)) - Add Fedora 24 and dedupe kickstart scripts [\#623](https://github.com/chef/bento/pull/623) ([tas50](https://github.com/tas50)) @@ -413,14 +443,14 @@ Please ensure that Virtualbox is at least 5.1.6 and Vagrant at least 1.8.6 befor - Fix new-style device naming from Network Manager on RHEL/CentOS 7 [\#617](https://github.com/chef/bento/pull/617) ([legal90](https://github.com/legal90)) - update apt sources to use archive.debian.org for packages [\#614](https://github.com/chef/bento/pull/614) ([apollocatlin](https://github.com/apollocatlin)) -**Fixed bugs:** +### Fixed bugs - apt.systemd.daily creates conflict in xenial64 box [\#616](https://github.com/chef/bento/issues/616) - FreeBSD: Root password not set! [\#610](https://github.com/chef/bento/issues/610) - ubuntu-16.04: unattended updates locking dpkg [\#609](https://github.com/chef/bento/issues/609) - Fix vagrant.sh failing on Solaris nodes [\#606](https://github.com/chef/bento/pull/606) ([tas50](https://github.com/tas50)) -**Tool Versions:** +### Tool Versions - Packer 0.10.1 - VirtualBox 5.0.24 @@ -428,21 +458,22 @@ Please ensure that Virtualbox is at least 5.1.6 and Vagrant at least 1.8.6 befor - Parallels Pro 11.2.0 ## [2.2.7](https://github.com/chef/bento/tree/2.2.7) (2016-05-20) + [Full Changelog](https://github.com/chef/bento/compare/2.2.6...2.2.7) -**Improvements:** +### Improvements - Ubuntu: HWE BEGONE! pt 1 - Fix for VMware HGFS on 14.04 [\#584](https://github.com/chef/bento/pull/584) ([davidmnoriega](https://github.com/davidmnoriega)) - Ubuntu: HWE BEGONE! pt 2 - The Pangolining [\#587](https://github.com/chef/bento/pull/587) ([cheeseplus](https://github.com/cheeseplus)) - OpenSuSE: Switching to more reliable mirror [\#583](https://github.com/chef/bento/pull/583) ([cheeseplus](https://github.com/cheeseplus)) - Added "disk\_size" user variable [\#596](https://github.com/chef/bento/pull/596) ([svpace](https://github.com/svpace)) -**Fixed bugs:** +### Fixed bugs - Ubuntu 16.04: 70-persistent-net.rules "hack" messes with update-initramfs triggers [\#592](https://github.com/chef/bento/issues/592) - VMware: use correct script flags based on version [\#590](https://github.com/chef/bento/issues/590) -**Tool Versions:** +### Tool Versions - Packer 0.10.1 - VirtualBox 5.0.20 @@ -451,16 +482,17 @@ Please ensure that Virtualbox is at least 5.1.6 and Vagrant at least 1.8.6 befor - Parallels Pro 11.2.0 ## [2.2.6](https://github.com/chef/bento/tree/2.2.6) (2016-04-28) + [Full Changelog](https://github.com/chef/bento/compare/2.2.5...2.2.6) -**Tool Versions:** +### Tool Versions - Packer 0.10.0 - VirtualBox 5.0.16 - VMware Fusion 8.1.1 - Parallels Pro 11.1.3 -**Added platforms:** +### Added platforms - Debian 8.4 [\#559](https://github.com/chef/bento/pull/559) ([kenhys](https://github.com/kenhys)) - Debian 7.10 [\#563](https://github.com/chef/bento/pull/563) ([kenhys](https://github.com/kenhys)) @@ -468,28 +500,30 @@ Please ensure that Virtualbox is at least 5.1.6 and Vagrant at least 1.8.6 befor - OmniOS 151018 [\#565](https://github.com/chef/bento/pull/565) ([tas50](https://github.com/tas50)) - Ubuntu 16.04 [\#545](https://github.com/chef/bento/pull/545) ([cheeseplus](https://github.com/cheeseplus)) -**Fixed bugs:** +### Fixed bugs - VMWare: tie network device to pci slot 32 [\#566](https://github.com/chef/bento/pull/566) ([rmoriz](https://github.com/rmoriz)) - VMware: Fedora 23 box builds but can't connect [\#521](https://github.com/chef/bento/issues/521) - Publish Ubuntu 15.10 boxes on Atlas [\#506](https://github.com/chef/bento/issues/506) -**Improvements:** +### Improvements - Standardize on 512MB minimum memory [\#574](https://github.com/chef/bento/issues/574) - Added headless option for QEMU builders [\#570](https://github.com/chef/bento/pull/570) ([jmatt](https://github.com/jmatt)) ## [2.2.5](https://github.com/chef/bento/tree/2.2.5) (2016-03-29) + [Full Changelog](https://github.com/chef/bento/compare/2.2.4...2.2.5) -**Merged pull requests:** +### Merged pull requests - Ubuntu: use dist-upgrade and install build packages in preseed [\#551](https://github.com/chef/bento/pull/551) ([cheeseplus](https://github.com/cheeseplus)) ## [2.2.4](https://github.com/chef/bento/tree/2.2.4) (2016-03-29) + [Full Changelog](https://github.com/chef/bento/compare/2.2.3...2.2.4) -**Closed issues:** +### Closed issues - CALL FOR MAINTAINERS [\#537](https://github.com/chef/bento/issues/537) - Proposal: Move bento under test-kitchen org [\#536](https://github.com/chef/bento/issues/536) @@ -506,7 +540,7 @@ Please ensure that Virtualbox is at least 5.1.6 and Vagrant at least 1.8.6 befor - ARM builds [\#486](https://github.com/chef/bento/issues/486) - Minimize script results in large \(non-sparse\) image file for QEMU builder [\#369](https://github.com/chef/bento/issues/369) -**Merged pull requests:** +### Merged pull requests - Cutting 2.2.4 [\#550](https://github.com/chef/bento/pull/550) ([cheeseplus](https://github.com/cheeseplus)) - Update mirror URL for Debian 8.2 [\#544](https://github.com/chef/bento/pull/544) ([legal90](https://github.com/legal90)) @@ -525,14 +559,15 @@ Please ensure that Virtualbox is at least 5.1.6 and Vagrant at least 1.8.6 befor - Cutting 2.2.3 [\#515](https://github.com/chef/bento/pull/515) ([cheeseplus](https://github.com/cheeseplus)) ## [2.2.3](https://github.com/chef/bento/tree/2.2.3) (2015-12-28) + [Full Changelog](https://github.com/chef/bento/compare/2.2.2...2.2.3) -**Fixed bugs:** +### Fixed bugs - minimize.sh fails with no swap partition [\#420](https://github.com/chef/bento/issues/420) - Workstation 11.1.2 Tools incompatible with current builds [\#377](https://github.com/chef/bento/issues/377) -**Closed issues:** +### Closed issues - Debian cleanup script removes C/C++ compiler and therefore breaks DKMS support [\#509](https://github.com/chef/bento/issues/509) - RHEL 6.7 image has wrong guest [\#501](https://github.com/chef/bento/issues/501) @@ -552,7 +587,7 @@ Please ensure that Virtualbox is at least 5.1.6 and Vagrant at least 1.8.6 befor - opscode-centos-7.1 Virtualbox box not able to NFS mount [\#388](https://github.com/chef/bento/issues/388) - Vagrant public key file could be empty [\#258](https://github.com/chef/bento/issues/258) -**Merged pull requests:** +### Merged pull requests - Revert "fix or suppress all shellcheck warnings" [\#513](https://github.com/chef/bento/pull/513) ([cheeseplus](https://github.com/cheeseplus)) - Stops DKMS package from being removed. [\#510](https://github.com/chef/bento/pull/510) ([RobertDeRose](https://github.com/RobertDeRose)) @@ -572,19 +607,20 @@ Please ensure that Virtualbox is at least 5.1.6 and Vagrant at least 1.8.6 befor - \[DRY\] up rhel [\#475](https://github.com/chef/bento/pull/475) ([cheeseplus](https://github.com/cheeseplus)) - \[DRY\] SLES [\#474](https://github.com/chef/bento/pull/474) ([cheeseplus](https://github.com/cheeseplus)) - \[DRY\] Oracle Linux [\#473](https://github.com/chef/bento/pull/473) ([cheeseplus](https://github.com/cheeseplus)) -- Minimized AutoYaST profiles for SLES 11.3/12 to enhance readability [\#373](https://github.com/chef/bento/pull/373) ([mattiasgiese](https://github.com/mattiasgiese)) +- Minimized AutoYaST profiles for SLES 11.3/12 to enhance readability [\#373](https://github.com/chef/bento/pull/373) ([mattiasgiese]) ## [2.2.2](https://github.com/chef/bento/tree/2.2.2) (2015-10-07) + [Full Changelog](https://github.com/chef/bento/compare/2.2.1...2.2.2) -**Closed issues:** +### Closed issues - bento/centos-6.7 won't vagrant up after halt or reload [\#468](https://github.com/chef/bento/issues/468) - Build process broken under VMware Workstation 11.1.2 [\#467](https://github.com/chef/bento/issues/467) - minimize.sh leads to unexpected error in packer \(vagrant 1.7.2\) [\#320](https://github.com/chef/bento/issues/320) - Ubuntu 14.04 VMware HGFS modules not loaded [\#283](https://github.com/chef/bento/issues/283) -**Merged pull requests:** +### Merged pull requests - Cutting 2.2.2 release [\#471](https://github.com/chef/bento/pull/471) ([cheeseplus](https://github.com/cheeseplus)) - The sha changed :/ [\#470](https://github.com/chef/bento/pull/470) ([cheeseplus](https://github.com/cheeseplus)) @@ -603,9 +639,10 @@ Please ensure that Virtualbox is at least 5.1.6 and Vagrant at least 1.8.6 befor - Adding verification \(tk\) stage to build process [\#451](https://github.com/chef/bento/pull/451) ([cheeseplus](https://github.com/cheeseplus)) ## [2.2.1](https://github.com/chef/bento/tree/2.2.1) (2015-09-16) + [Full Changelog](https://github.com/chef/bento/compare/2.2.0...2.2.1) -**Closed issues:** +### Closed issues - Debian 7.9 [\#444](https://github.com/chef/bento/issues/444) - Building boxes results in files with unhelpful names [\#433](https://github.com/chef/bento/issues/433) @@ -626,7 +663,7 @@ Please ensure that Virtualbox is at least 5.1.6 and Vagrant at least 1.8.6 befor - Puppet support in bento? [\#251](https://github.com/chef/bento/issues/251) - rename box prefixes to bento- instead of opscode- [\#208](https://github.com/chef/bento/issues/208) -**Merged pull requests:** +### Merged pull requests - DRY up opensuse [\#450](https://github.com/chef/bento/pull/450) ([cheeseplus](https://github.com/cheeseplus)) - \[fedora-\*\] DRYness pass [\#449](https://github.com/chef/bento/pull/449) ([cheeseplus](https://github.com/cheeseplus)) @@ -648,9 +685,10 @@ Please ensure that Virtualbox is at least 5.1.6 and Vagrant at least 1.8.6 befor - CentOS kickstarts: Change sed to not rewrite sudo comments [\#326](https://github.com/chef/bento/pull/326) ([mvermaes](https://github.com/mvermaes)) ## [2.2.0](https://github.com/chef/bento/tree/2.2.0) (2015-08-26) + [Full Changelog](https://github.com/chef/bento/compare/2.1.0...2.2.0) -**Merged pull requests:** +### Merged pull requests - Update Readme and small fixes/cleanup to Rake tasks [\#426](https://github.com/chef/bento/pull/426) ([cheeseplus](https://github.com/cheeseplus)) - Freebsd 10.2 [\#424](https://github.com/chef/bento/pull/424) ([geoffgarside](https://github.com/geoffgarside)) @@ -660,18 +698,19 @@ Please ensure that Virtualbox is at least 5.1.6 and Vagrant at least 1.8.6 befor - \[macosx-\*\] Increase disk\_size to ~40G from ~20G. [\#413](https://github.com/chef/bento/pull/413) ([fnichol](https://github.com/fnichol)) ## [2.1.0](https://github.com/chef/bento/tree/2.1.0) (2015-08-07) + [Full Changelog](https://github.com/chef/bento/compare/2.0.0...2.1.0) -**Fixed bugs:** +### Fixed bugs - Shortening vm\_name to avoid Parallels box corruption [\#400](https://github.com/chef/bento/pull/400) ([cheeseplus](https://github.com/cheeseplus)) -**Closed issues:** +### Closed issues - Debian 8.1 [\#379](https://github.com/chef/bento/issues/379) - Chef on Centos boxes seems not be installed [\#352](https://github.com/chef/bento/issues/352) -**Merged pull requests:** +### Merged pull requests - \[debian-\*\] Improve DRYness, correctness, & speed of Debian templates. [\#404](https://github.com/chef/bento/pull/404) ([fnichol](https://github.com/fnichol)) - \[freebsd-\*\] Improve DRYness, correctness, & speed of FreeBSD templates. [\#403](https://github.com/chef/bento/pull/403) ([fnichol](https://github.com/fnichol)) @@ -685,13 +724,14 @@ Please ensure that Virtualbox is at least 5.1.6 and Vagrant at least 1.8.6 befor - Add @cheeseplus to MAINTAINERS.md [\#392](https://github.com/chef/bento/pull/392) ([fnichol](https://github.com/fnichol)) ## [2.0.0](https://github.com/chef/bento/tree/2.0.0) (2015-07-03) -**Fixed bugs:** + +### Fixed bugs - Do not write metadata files when `bento build` is in dry run mode [\#368](https://github.com/chef/bento/issues/368) - fix OmniOS build under VMWare [\#178](https://github.com/chef/bento/issues/178) - Don't write metadata file in `bento build` dry run mode. [\#380](https://github.com/chef/bento/pull/380) ([fnichol](https://github.com/fnichol)) -**Closed issues:** +### Closed issues - Release Debian 8.0 boxes [\#381](https://github.com/chef/bento/issues/381) - Upload Ubuntu 15.04 to S3 Bucket [\#376](https://github.com/chef/bento/issues/376) @@ -759,7 +799,7 @@ Please ensure that Virtualbox is at least 5.1.6 and Vagrant at least 1.8.6 befor - 'Error downloading kickstart file' within Oracle VM VirtualBox [\#172](https://github.com/chef/bento/issues/172) - move single-request-reopen from ks.cfg [\#171](https://github.com/chef/bento/issues/171) -**Merged pull requests:** +### Merged pull requests - \[macosx-\*\] Add support for {http,https,no}\_proxy environment variables. [\#391](https://github.com/chef/bento/pull/391) ([fnichol](https://github.com/fnichol)) - Remove files that are no longer referenced by any templates. [\#390](https://github.com/chef/bento/pull/390) ([fnichol](https://github.com/fnichol)) @@ -956,6 +996,4 @@ Please ensure that Virtualbox is at least 5.1.6 and Vagrant at least 1.8.6 befor - \[BENTO-2\] Update Ubuntu iso filenames, md5sums. [\#6](https://github.com/chef/bento/pull/6) ([torandu](https://github.com/torandu)) - \[BENTO-4\] Updated centos 6.2 iso urls to use the vault.centos.org url [\#4](https://github.com/chef/bento/pull/4) ([cburyta](https://github.com/cburyta)) - - \* *This Change Log was automatically generated by [github_changelog_generator](https://github.com/skywinder/Github-Changelog-Generator)* diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md deleted file mode 100644 index 980c1341a..000000000 --- a/CODE_OF_CONDUCT.md +++ /dev/null @@ -1 +0,0 @@ -Please refer to the Chef Community Code of Conduct at https://www.chef.io/code-of-conduct/ diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md new file mode 100644 index 000000000..cd21578dd --- /dev/null +++ b/CONTRIBUTING.md @@ -0,0 +1 @@ +Please refer to <https://github.com/chef-cookbooks/community_cookbook_documentation/blob/master/CONTRIBUTING.MD> diff --git a/Gemfile b/Gemfile deleted file mode 100644 index 2d3ae5f00..000000000 --- a/Gemfile +++ /dev/null @@ -1,8 +0,0 @@ -source "https://rubygems.org" - -gemspec - -group :development do - gem "cookstyle" - gem "rake", ">= 12" -end diff --git a/MAINTAINERS.md b/MAINTAINERS.md deleted file mode 100644 index 3d3935c11..000000000 --- a/MAINTAINERS.md +++ /dev/null @@ -1,23 +0,0 @@ -# Maintainers - -This file lists how the Bento project is maintained. When making changes to the system, this file tells you who needs to review your patch - you need a simple majority of maintainers for the relevant subsystems to provide a :+1: on your pull request. Additionally, you need to not receive a veto from a Lieutenant or the Project Lead. - -Check out [How Chef is Maintained](https://github.com/chef/chef-rfc/blob/master/rfc030-maintenance-policy.md#how-the-project-is-maintained) for details on the process, how to become a maintainer, lieutenant, or the project lead. - -# Project Lead - -[Seth Thomas](http://github.com/cheeseplus) - -# Components - -## Core Components - -Covers the Bento project repository which is responsible for building Vagrant boxes using Packer templates. - -### Lieutenants - -* [Tim Smith](https://github.com/tas50) - -### Maintainers - -* [Rickard von Essen](https://github.com/rickard-von-essen) diff --git a/NOTICE.md b/NOTICE.md index b26c591ba..a2fcc43b9 100644 --- a/NOTICE.md +++ b/NOTICE.md @@ -1,12 +1,11 @@ # Bento NOTICE Chef Bento +Copyright 2019-2023, Progress Software Corporation Copyright 2012-2019, Chef Software, Inc. The baseboxes in the "definitions" directory is from Tim Dysinger's "basebox" project. -* https://github.com/dysinger/basebox - Author: Tim Dysinger (<tim@dysinger.net>) Copyright 2011-2012, Tim Dysinger (<tim@dysinger.net>) diff --git a/README.md b/README.md index 4325466d8..edc74908c 100644 --- a/README.md +++ b/README.md @@ -2,17 +2,19 @@ Bento is a project that encapsulates [Packer](https://www.packer.io/) templates for building [Vagrant](https://www.vagrantup.com/) base boxes. A subset of templates are built and published to the [bento org](https://app.vagrantup.com/bento) on Vagrant Cloud. These published boxes serve as the default boxes for [kitchen-vagrant](https://github.com/test-kitchen/kitchen-vagrant/). -### Using Public Boxes +***NOTE:** Virutalbox 7.x requires extra config to allow nat network to connect to the host. To use uncomment lines #79 and #80 in bento/packer_templates/pkr-sources.pkr.hcl + +## Using Public Boxes Adding a bento box to Vagrant -``` -$ vagrant box add bento/ubuntu-18.04 +```bash +vagrant box add bento/ubuntu-18.04 ``` Using a bento box in a Vagrantfile -``` +```ruby Vagrant.configure("2") do |config| config.vm.box = "bento/ubuntu-18.04" end @@ -22,83 +24,71 @@ end #### Requirements -- [Packer](https://www.packer.io/) +- [Packer](https://www.packer.io/) >= 1.7.0 - [Vagrant](https://www.vagrantup.com/) - At least one of the following virtualization providers: - - [VirtualBox](https://www.virtualbox.org/) - - [VMware Fusion](https://www.vmware.com/products/fusion.html) - - [VMware Workstation](https://www.vmware.com/products/workstation-pro.html) - - [Parallels Desktop](https://www.parallels.com/products/desktop/) also requires [Parallels Virtualization SDK](https://www.parallels.com/products/desktop/download/) - - [KVM](https://www.linux-kvm.org/page/Main_Page) * - - [Hyper-V](https://docs.microsoft.com/en-us/virtualization/hyper-v-on-windows/about/) * + - [VirtualBox](https://www.virtualbox.org/) + - [VMware Fusion](https://www.vmware.com/products/fusion.html) + - [VMware Workstation](https://www.vmware.com/products/workstation-pro.html) + - [Parallels Desktop](https://www.parallels.com/products/desktop/) also requires [Parallels Virtualization SDK](https://www.parallels.com/products/desktop/download/) + - [qemu](https://www.qemu.org/) * + - [Hyper-V](https://docs.microsoft.com/en-us/virtualization/hyper-v-on-windows/about/) * -\***NOTE:** support for these providers is considered experimental and corresponding Vagrant Cloud images may or may not exist. - -#### Using `bento` executable -To build a Debian vagrant box using the bento tool with the template available in the `packer_templates` dir, we can use the following command: - -``` -bento build --cpus 2 packer_templates/debian/debian-11.6-i386.json -``` - -Other available options: -- cpus - Specify the number of CPUs needed in the new build. -- mem - Specify the memory -- mirror - The template will have a default mirror link, if you wish to use an alternative one, you can utilise this configuration. -- dry-run - This will not create any build, but will create a metadata file for reference. -- debug - Print the debug logs -- headed - Packer will be building VirtualBox virtual machines by launching a GUI that shows the console of the machine being built. This option is false by default -- single - This can be used to disable the parallel builds. +***NOTE:** support for these providers is considered experimental and corresponding Vagrant Cloud images may or may not exist. #### Using `packer` -To build an Ubuntu 18.04 box for only the VirtualBox provider +To build a Ubuntu 22.04 box for only the VirtualBox provider -``` -$ cd packer_templates/ubuntu -$ packer build -only=virtualbox-iso ubuntu-18.04-amd64.json +```bash +cd <path/to>/bento +packer init -upgrade ./packer_templates +packer build -only=virtualbox-iso.vm -var-file=os_pkrvars/ubuntu/ubuntu-22.04-x86_64.pkrvars.hcl ./packer_templates ``` -To build Debian 11.6 32bit boxes for all possible providers (simultaneously) +To build latest Debian 11 boxes for all possible providers (simultaneously) -``` -$ cd packer_templates/debian -$ packer build debian-11.6-i386.json +```bash +cd <path/to>/bento +packer init -upgrade ./packer_templates +packer build -var-file=os_pkrvars/debian/debian-11-x86_64.pkrvars.hcl ./packer_templates ``` -To build CentOS 7.7 boxes for all providers except VMware and Parallels +To build latest CentOS 7 boxes for all providers except VMware and Parallels -``` -$ cd packer_templates/centos -$ packer build -except=parallels-iso,vmware-iso centos-7.7-x86_64.json +```bash +cd <path/to>/bento +packer init -upgrade ./packer_templates +packer build -except=parallels-iso.vm,vmware-iso.vm -var-file=os_pkrvars/centos/centos-7-x86_64.pkrvars.hcl ./packer_templates ``` -To use an alternate mirror +To use an alternate url -``` -$ cd packer_templates/fedora -$ packer build -var 'mirror=http://mirror.utexas.edu/fedora/linux' fedora-31-x86_64.json -``` +````bash +cd <path/to>/bento +packer init -upgrade ./packer_templates +packer build -var 'iso_url=http://mirror.utexas.edu/fedora/linux' -var-file=os_pkrvars/fedora/fedor-37-x86_64.pkrvars.hcl ./packer_templates +```` To build a Windows 10 Enterprise Gen 2 box for the Hyper-V provider -``` -$ cd packer_templates/windows -$ packer build windows-10gen2.json +```bash +cd <path/to>/bento +packer init -upgrade ./packer_templates +packer build -var-file=os_pkrvars/windows/windows-10gen2-x86_64.pkrvars.hcl ./packer_templates ``` If the build is successful, your box files will be in the `builds` directory at the root of the repository. -\***NOTE:** box_basename can be overridden like other Packer vars with `-var 'box_basename=ubuntu-18.04'` - #### KVM/qemu support for Windows You must download [the iso image with the Windows drivers for paravirtualized KVM/qemu hardware](https://fedorapeople.org/groups/virt/virtio-win/direct-downloads/stable-virtio/virtio-win.iso). You can do this from the command line: `wget -nv -nc https://fedorapeople.org/groups/virt/virtio-win/direct-downloads/stable-virtio/virtio-win.iso -O virtio-win.iso`. You can use the following sample command to build a KVM/qemu Windows box: -``` -packer build --only=qemu --var virtio_win_iso=~/virtio-win.iso windows-2019.json +```bash +packer init -upgrade ./packer_templates +packer build --only=qemu.vm -var-file=os_pkrvars/windwos/windows-2022-x86_64.pkrvars.hcl ./packer_templates ``` ### Proprietary Templates @@ -125,10 +115,11 @@ Hyper-V Gen 2 VMs do not support floppy drives. If you previously provided resou - `base_setup.ps1` ### Testing the build with the test-kitchen -If you have successfully built a vagrant box using the bento tool, you should have the vagrant box and a metadata file in the `builds` folder. You can use these files to test the build with a test-kitchen configuration. Place your `kitchen.yml.erb` and `bootstrap.sh.erb` files inside the `templates` directory and run the following command to test the build. -``` -bento test +If you have successfully built a vagrant box using the bento tool, you should have the vagrant box and a metadata file in the `builds` folder. You can use these files to test the build with a test-kitchen configuration. Place your `kitchen.yml` and `bootstrap.sh` files inside the `templates` directory and run the following command to test the build. + +```bash +kitchen test ``` ## Bugs and Issues @@ -139,15 +130,15 @@ Please use GitHub issues to report bugs, features, or other problems. A huge thank you to these related projects from which we've taken inspiration and often used as a source for workarounds in complex world of base box building. -* https://github.com/boxcutter -* https://github.com/lavabit/robox -* https://github.com/mcandre/packer-templates -* https://github.com/timsutton/osx-vm-templates -* https://github.com/ferventcoder/vagrant-windows-puppet/tree/master/baseboxes +- <https://github.com/boxcutter> +- <https://github.com/lavabit/robox> +- <https://github.com/mcandre/packer-templates> +- <https://github.com/timsutton/osx-vm-templates> +- <https://github.com/ferventcoder/vagrant-windows-puppet/tree/master/baseboxes> ## License & Authors -These basebox templates were converted from [veewee](https://github.com/jedi4ever/veewee) definitions originally based on [work done by Tim Dysinger](https://github.com/dysinger/basebox) to make "Don't Repeat Yourself" (DRY) modular baseboxes. Thanks Tim! +These basebox templates were converted from [veewee](https://github.com/jedi4ever/veewee) definitions originally based on [work done by Tim Dysinger](https://github.com/dysinger) to make "Don't Repeat Yourself" (DRY) modular baseboxes. Thanks Tim! - Author: Chris McClimans ([chris@hippiehacker.org](mailto:chris@hippiehacker.org)) - Author: Fletcher Nichol ([fnichol@nichol.ca](mailto:fnichol@nichol.ca)) @@ -159,9 +150,10 @@ These basebox templates were converted from [veewee](https://github.com/jedi4eve - Author: Tim Dysinger ([tim@dysinger.net](mailto:tim@dysinger.net)) - Author: Tim Smith ([tsmith@chef.io](mailto:tsmith@chef.io)) - Author: Tom Duffield ([tom@chef.io](mailto:tom@chef.io)) +- Author: Corey Hemminger ([corey.hemminger@progress.com](mailto:corey.hemminger@progress.com)) ```text -Copyright 2012-2021, Chef Software, Inc. (<legal@chef.io>) +Copyright 2012-2022, Progress Software, Inc. (<legal@chef.io>) Copyright 2011-2012, Tim Dysinger (<tim@dysinger.net>) Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/Rakefile b/Rakefile deleted file mode 100644 index 050ef4557..000000000 --- a/Rakefile +++ /dev/null @@ -1,96 +0,0 @@ -require "yaml" -require "fileutils" - -desc "Validate all templates using Packer" -task :validate do - Dir.glob("packer_templates/**/*.json").sort.each do |template_path| - template_dir = File.dirname(template_path) - filename = File.basename(template_path) - - # we can't validatem the amazon config with the ovf file - next if filename == "amazon-2-x86_64.json" - - puts "\n\e[32mValidating #{template_path}\e[0m\n\n" - result = system("packer validate #{filename}", chdir: template_dir) - raise "Validation for #{template_path} failed" unless result - end -end - -desc "clean repo, build boxes, test, and upload/release" -task :do_all do - check_env - public_templates.each do |template| - if config['public'].include?(box_name(template)) - Rake::Task[:clean].execute - sh build_cmd(template) - sh "bento test" - if ENV["BENTO_AUTO_RELEASE"].nil? || ENV["BENTO_VERSION"].nil? - puts "skipping the upload / release of #{template} as BENTO_AUTO_RELEASE and BENTO_VERSION env vars were not set" - else - sh "bento upload" - sh "bento release #{template} #{ENV["BENTO_VERSION"]}" - end - end - end -end - -desc "release all built boxes on vagrant cloud" -task :release_all do - config['public'].each do |template| - sh "bento release #{template} #{ENV["BENTO_VERSION"]}" - end -end - -desc "clean" -task :clean do - puts "Removing kitchen.yml and builds/*" - FileUtils.rm_rf(['kitchen.yml', Dir.glob('builds/*')]) -end - -def build_cmd(template) - cmd = %W{bento build #{template}} - cmd.insert(2, "--only #{providers}") - cmd.insert(2, "--mirror #{ENV['PACKER_MIRROR']}") if ENV["PACKER_MIRROR"] - cmd.insert(2, "--version #{ENV['BENTO_VERSION']}") - cmd.join(" ") - a_to_s(cmd) -end - -def check_env - if ENV["BENTO_VERSION"].nil? - puts "Please set the BENTO_VERSION env variable" - exit 1 - end -end - -def providers - if config['providers'] - config['providers'].join(',') - else - puts "No Providers Specified." - puts "Set `providers` in builds.yml" - exit 1 - end -end - -def a_to_s(*args) - clean_array(*args).join(" ") -end - -def config - YAML.load(File.read("builds.yml")) -end - -def clean_array(*args) - args.flatten.reject { |i| i.nil? || i == "" }.map(&:to_s) -end - -def box_name(template) - bn = template.split('/')[1].gsub!(/\.json/,'') - bn.match(/-x86_64|-amd64/) ? bn.gsub(/-x86_64|-amd64/,'') : bn -end - -def public_templates - templates = Dir.glob('**/*.json').reject{ |d| d['builds'] } - templates.reject{ |f| f[/macos|rhel|sles|solaris|windows/] } -end diff --git a/TESTING.md b/TESTING.md new file mode 100644 index 000000000..359579c17 --- /dev/null +++ b/TESTING.md @@ -0,0 +1 @@ +Please refer to <https://github.com/chef-cookbooks/community_cookbook_documentation/blob/master/TESTING.MD> diff --git a/bento.gemspec b/bento.gemspec deleted file mode 100644 index 04eb36651..000000000 --- a/bento.gemspec +++ /dev/null @@ -1,22 +0,0 @@ -# frozen_string_literal: true - -Gem::Specification.new do |s| - s.name = "bento" - s.version = "1.0" - s.summary = "Bento builds generic Vagrant boxes " - s.description = s.summary - s.license = "Apache-2.0" - s.author = "Many many Chef employees over the years" - s.email = "oss@chef.io" - s.homepage = "https://github.com/chef/bento/" - - s.required_ruby_version = ">= 2.6" - - s.add_dependency "mixlib-shellout", ">= 2.3.2" - - s.bindir = "bin" - s.executables = %w{bento} - - s.require_path = "lib" - s.files = %w{LICENSE Gemfile} + Dir.glob("*.gemspec") + Dir.glob("lib/**/*") -end diff --git a/bin/bento b/bin/bento deleted file mode 100755 index 9e8ca40f4..000000000 --- a/bin/bento +++ /dev/null @@ -1,14 +0,0 @@ -#!/usr/bin/env ruby -Signal.trap("INT") { exit 1 } - -$stdout.sync = true -$stderr.sync = true - -require_relative "../lib/bento/cli" - -begin - Runner.new(Options.parse(ARGV)).start -rescue => ex - warn ">>> #{ex.message}" - exit(($CHILD_STATUS && $CHILD_STATUS.exitstatus) || 99) -end diff --git a/builds.yml b/builds.yml deleted file mode 100644 index f25dd21f8..000000000 --- a/builds.yml +++ /dev/null @@ -1,64 +0,0 @@ ---- -public: -- 'almalinux-8.7' -- 'almalinux-9.1' -- 'amazon-2' -- 'centos-7.9' -- 'centos-stream-8' -- 'debian-9.13-arm64' -- 'debian-9.13-i386' -- 'debian-9.13' -- 'debian-10.13-arm64' -- 'debian-10.13-i386' -- 'debian-10.13' -- 'debian-11.6-arm64' -- 'debian-11.6-i386' -- 'debian-11.6' -- 'fedora-36' -- 'fedora-37' -- 'freebsd-12.3-i386' -- 'freebsd-12.3' -- 'freebsd-12.4-i386' -- 'freebsd-12.4' -- 'freebsd-13.1' -- 'opensuse-leap-15.4' -- 'oracle-6.10-i386' -- 'oracle-6.10' -- 'oracle-7.9' -- 'oracle-8.7' -- 'oracle-9.1' -- 'rockylinux-8.7' -- 'rockylinux-9.0' -- 'scientific-7.9' -- 'springdalelinux-7.9' -- 'springdalelinux-8.5' -- 'ubuntu-16.04-i386' -- 'ubuntu-16.04' -- 'ubuntu-18.04' -- 'ubuntu-20.04' -- 'ubuntu-22.04' -- 'ubuntu-22.10' - -# slug box name: text string from standard box name to match (generally the same) -slugs: - 'almalinux-8': 'almalinux-8' - 'almalinux-9': 'almalinux-9' - 'amazon-2': 'amazon-2' - 'centos-7': 'centos-7' - 'debian-11': 'debian-11' - 'debian-10': 'debian-10' - 'debian-9': 'debian-9' - 'fedora-latest': 'fedora-37' - 'freebsd-11': 'freebsd-11' - 'freebsd-12': 'freebsd-12' - 'freebsd-13': 'freebsd-13' - 'opensuse-leap-15': 'opensuse-leap-15' - 'oracle-6': 'oracle-6' - 'oracle-7': 'oracle-7' - 'oracle-8': 'oracle-8' - 'oracle-9': 'oracle-9' - 'rockylinux-8': 'rockylinux-8' - 'rockylinux-9': 'rockylinux-9' - 'scientific-7': 'scientific-7' - 'springdalelinux-7': 'springdalelinux-7' - 'springdalelinux-8': 'springdalelinux-8' diff --git a/builds/uploaded/.gitkeep b/builds/uploaded/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/lib/bento.rb b/lib/bento.rb deleted file mode 100644 index 572e1b141..000000000 --- a/lib/bento.rb +++ /dev/null @@ -1,2 +0,0 @@ -require "bento/common" -require "bento/version" diff --git a/lib/bento/buildmetadata.rb b/lib/bento/buildmetadata.rb deleted file mode 100644 index 27b15a4da..000000000 --- a/lib/bento/buildmetadata.rb +++ /dev/null @@ -1,72 +0,0 @@ -require "bento/common" -require "mixlib/shellout" unless defined?(Mixlib::ShellOut) - -class BuildMetadata - include Common - - def initialize(template, build_timestamp, override_version) - @template = template - @build_timestamp = build_timestamp - @override_version = override_version - end - - def read - { - name: name, - version: version, - build_timestamp: build_timestamp, - git_revision: git_revision, - git_status: git_clean? ? "clean" : "dirty", - box_basename: box_basename, - template: template_vars.fetch("template", UNKNOWN), - packer: packer_ver, - } - end - - private - - UNKNOWN = "__unknown__".freeze - - attr_reader :template, :build_timestamp, :override_version - - def box_basename - "#{name.gsub("/", "__")}-#{version}" - end - - def git_revision - `git rev-parse HEAD`.strip - end - - def git_clean? - `git status --porcelain`.strip.empty? - end - - def merged_vars - @merged_vars ||= begin - if File.exist?("#{template}.variables.json") - template_vars.merge(JSON.load(IO.read("#{template}.variables.json"))) - else - template_vars - end - end - end - - def name - merged_vars.fetch("name", template) - end - - def template_vars - @template_vars ||= JSON.load(IO.read("#{template}.json")).fetch("variables") - end - - def version - override_version || merged_vars.fetch("version", "#{UNKNOWN}.TIMESTAMP") - .rpartition(".").first.concat(build_timestamp.to_s) - end - - def packer_ver - cmd = Mixlib::ShellOut.new("packer --version") - cmd.run_command - cmd.stdout.split("\n")[0] - end -end diff --git a/lib/bento/cli.rb b/lib/bento/cli.rb deleted file mode 100644 index 38ff57b32..000000000 --- a/lib/bento/cli.rb +++ /dev/null @@ -1,204 +0,0 @@ -require "optparse" unless defined?(OptionParser) -require "ostruct" unless defined?(OpenStruct) - -require "bento/common" -require "bento/runner" -require "bento/normalize" -require "bento/test" -require "bento/upload" - -class Options - NAME = File.basename($PROGRAM_NAME).freeze - - def self.parse(args) - options = OpenStruct.new - options.template_files = calculate_templates("packer_templates/**/*.json") - - global = OptionParser.new do |opts| - opts.banner = "Usage: #{NAME} [SUBCOMMAND [options]]" - opts.separator "" - opts.separator <<-COMMANDS.gsub(/^ {8}/, "") - build : build one or more templates - help : prints this help message - list : list all templates in project - normalize : normalize one or more templates - test : test one or more builds with kitchen - upload : upload and release one or more builds to Vagrant Cloud - COMMANDS - end - - # @tas50: commenting this out since it's unused 11/30/2018 - # platforms_argv_proc = proc { |opts| - # opts.platforms = builds["public"] unless args.empty? - # } - - templates_argv_proc = proc { |opts| - opts.template_files = calculate_templates(args) unless args.empty? - - opts.template_files.each do |t| - unless File.exist?("#{t}.json") - warn "File #{t}.json does not exist for template '#{t}'" - exit(1) - end - end - } - - box_version_argv_proc = proc { |opts| - opts.box = ARGV[0] - opts.version = ARGV[1] - } - - md_json_argv_proc = proc { |opts| - opts.md_json = ARGV[0] - } - - subcommand = { - help: { - parser: OptionParser.new {}, - argv: proc { |_opts| - puts global - exit(0) - }, - }, - build: { - class: BuildRunner, - parser: OptionParser.new do |opts| - opts.banner = "Usage: #{NAME} build [options] TEMPLATE[ TEMPLATE ...]" - - opts.on("-n", "--dry-run", "Dry run (what would happen)") do |opt| - options.dry_run = opt - end - - opts.on("-c BUILD_YML", "--config BUILD_YML", "Use a configuration file") do |opt| - options.config = opt - end - - opts.on("-d", "--[no-]debug", "Run packer with debug output") do |opt| - options.debug = opt - end - - opts.on("-o BUILDS", "--only BUILDS", "Only build some Packer builds (ex: parallels-iso,virtualbox-iso,vmware-iso)") do |opt| - options.only = opt - end - - opts.on("-e BUILDS", "--except BUILDS", "Build all Packer builds except these (ex: parallels-iso,virtualbox-iso,vmware-iso)") do |opt| - options.except = opt - end - - opts.on("-m MIRROR", "--mirror MIRROR", "Look for isos at MIRROR") do |opt| - options.mirror = opt - end - - opts.on("-C cpus", "--cpus CPUS", "# of CPUs per provider") do |opt| - options.cpus = opt - end - - opts.on("-M MEMORY", "--memory MEMORY", "Memory (MB) per provider") do |opt| - options.mem = opt - end - - opts.on("-H", "--headed", "Display provider UI windows") do |opt| - options.headed = opt - end - - opts.on("-S", "--single", "Disable parallelization of Packer builds") do |opt| - options.single = opt - end - - # the default template override version unless a user passes one - options.override_version = Time.now.gmtime.strftime("%Y%m.%d.0") - - opts.on("-v VERSION", "--version VERSION", "Override the date computed version of #{options.override_version}") do |opt| - options.override_version = opt - end - end, - argv: templates_argv_proc, - }, - list: { - class: ListRunner, - parser: OptionParser.new do |opts| - opts.banner = "Usage: #{NAME} list [TEMPLATE ...]" - end, - argv: templates_argv_proc, - }, - normalize: { - class: NormalizeRunner, - parser: OptionParser.new do |opts| - opts.banner = "Usage: #{NAME} normalize TEMPLATE[ TEMPLATE ...]" - - opts.on("-d", "--[no-]debug", "Run packer with debug output") do |opt| - options.debug = opt - end - end, - argv: templates_argv_proc, - }, - test: { - class: TestRunner, - parser: OptionParser.new do |opts| - opts.banner = "Usage: #{NAME} test [options]" - - opts.on("--no-shared-folder", "Disable shared folder testing") do |opt| - options.no_shared = opt - end - - opts.on("-p", "--provisioner PROVISIONER", "Use a specfic provisioner") do |opt| - options.provisioner = opt - end - end, - argv: proc {}, - }, - upload: { - class: UploadRunner, - parser: OptionParser.new do |opts| - opts.banner = "Usage: #{NAME} upload" - end, - argv: md_json_argv_proc, - }, - } - - global.order! - command = args.empty? ? :help : ARGV.shift.to_sym - subcommand.fetch(command).fetch(:parser).order! - subcommand.fetch(command).fetch(:argv).call(options) - - options.command = command - options.klass = subcommand.fetch(command).fetch(:class) - - options - end - - def self.calculate_templates(globs) - Array(globs) - .map { |glob| result = Dir.glob(glob); result.empty? ? glob : result } - .flatten - .sort - .delete_if { |file| file =~ /\.(variables||metadata)\.json/ } - .map { |template| template.sub(/\.json$/, "") } - end -end - -class ListRunner - include Common - - attr_reader :templates - - def initialize(opts) - @templates = opts.template_files - end - - def start - templates.each { |template| puts template } - end -end - -class Runner - attr_reader :options - - def initialize(options) - @options = options - end - - def start - options.klass.new(options).start - end -end diff --git a/lib/bento/common.rb b/lib/bento/common.rb deleted file mode 100644 index 120c2c346..000000000 --- a/lib/bento/common.rb +++ /dev/null @@ -1,125 +0,0 @@ -require "benchmark" unless defined?(Benchmark) -require "fileutils" unless defined?(FileUtils) -require "json" unless defined?(JSON) -require "tempfile" unless defined?(Tempfile) -require "yaml" -require "mixlib/shellout" unless defined?(Mixlib::ShellOut) - -MEGABYTE = 1024.0 * 1024.0 - -module Common - def banner(msg) - puts "==> #{msg}" - end - - def info(msg) - puts " #{msg}" - end - - def shellout(cmd) - info "Shelling out to run #{cmd}" - sout = Mixlib::ShellOut.new(cmd) - sout.live_stream = STDOUT - sout.run_command - sout.error! # fail hard if the cmd fails - end - - def warn(msg) - puts ">>> #{msg}" - end - - # - # Shellout to vagrant CLI to see if we're logged into the cloud - # - # @return [Boolean] - # - def logged_in? - shellout = Mixlib::ShellOut.new("vagrant cloud auth whoami").run_command - - if shellout.error? - error_output = !shellout.stderr.empty? ? shellout.stderr : shellout.stdout - warn("Failed to shellout to vagrant to check the login status. Error: #{error_output}") - return false - end - - return true if shellout.stdout.match?(/Currently logged in/) - - false - end - - def duration(total) - total = 0 if total.nil? - minutes = (total / 60).to_i - seconds = (total - (minutes * 60)) - format("%dm%.2fs", minutes, seconds) - end - - def box_metadata(metadata_file) - metadata = {} - file = File.read(metadata_file) - json = JSON.parse(file) - - # metadata needed for upload: boxname, version, provider, box filename - metadata["name"] = json["name"] - metadata["version"] = json["version"] - metadata["box_basename"] = json["box_basename"] - metadata["packer"] = json["packer"] - metadata["vagrant"] = json["vagrant"] - metadata["providers"] = {} - json["providers"].each do |provider| - metadata["providers"][provider["name"]] = provider.reject { |k, _| k == "name" } - end - metadata - end - - def metadata_files - @metadata_files ||= Dir.glob("builds/*.json") - end - - def builds_yml - YAML.load(File.read("builds.yml")) - end - - def build_list - bit32 = [] - bit64 = [] - builds_yml["public"].each do |platform, versions| - versions.each do |version, archs| - archs.each do |arch| - folder = case platform - when "opensuse-leap" - "opensuse" - when "oracle" - "oraclelinux" - else - platform - end - case arch - when "i386" - bit32 << "#{folder}/#{platform}-#{version}-#{arch}" - else - bit64 << "#{folder}/#{platform}-#{version}-#{arch}" - end - end - end - end - bit64 + bit32 - end - - def private_box?(boxname) - proprietary_os_list = %w{macos windows sles solaris rhel} - proprietary_os_list.any? { |p| boxname.include?(p) } - end - - def macos? - !!(RUBY_PLATFORM =~ /darwin/) - end - - def unix? - !windows? - end - - def windows? - !!(RUBY_PLATFORM =~ /mswin|mingw|windows/) - end -end diff --git a/lib/bento/normalize.rb b/lib/bento/normalize.rb deleted file mode 100644 index fa7eeb489..000000000 --- a/lib/bento/normalize.rb +++ /dev/null @@ -1,85 +0,0 @@ -require "bento/common" - -class NormalizeRunner - include Common - include PackerExec - - attr_reader :templates, :build_timestamp, :debug, :override_version - - def initialize(opts) - @templates = opts.template_files - @debug = opts.debug - @modified = [] - @build_timestamp = Time.now.gmtime.strftime("%Y%m%d%H%M%S") - end - - def start - banner("Normalizing for templates:") - templates.each { |t| puts "- #{t}" } - time = Benchmark.measure do - templates.each do |file| - bento_dir = Dir.pwd - dir = File.dirname(file) - template = File.basename(file) - Dir.chdir dir - validate(template) - Dir.chdir(bento_dir) - end - end - unless @modified.empty? - info("") - info("The following templates were modified:") - @modified.sort.each { |template| info(" * #{template}") } - end - banner("Normalizing finished in #{duration(time.real)}.") - end - - private - - def checksum(file) - Digest::MD5.file(file).hexdigest - end - - def fix(template) - file = "#{template}.json" - - banner("[#{template}] Fixing") - original_checksum = checksum(file) - output = `packer fix #{file}` - raise "[#{template}] Error fixing, exited #{$CHILD_STATUS}" if $CHILD_STATUS.exitstatus != 0 - - # preserve ampersands in shell commands, - # see: https://github.com/hashicorp/packer/issues/784 - output.gsub!("\\u0026", "&") - File.open(file, "wb") { |dest| dest.write(output) } - fixed_checksum = checksum(file) - - if original_checksum == fixed_checksum - puts("No changes made.") - else - warn("Template #{template} has been modified.") - @modified << template - end - end - - def packer_validate_cmd(template, var_file) - vars = "#{template}.variables.json" - cmd = %W{packer validate -var-file=#{var_file} #{template}.json} - cmd.insert(2, "-var-file=#{vars}") if File.exist?(vars) - cmd - end - - def validate(template) - for_packer_run_with(template) do |md_file, var_file| - cmd = packer_validate_cmd(template, var_file.path) - banner("[#{template}] Validating: '#{cmd.join(" ")}'") - if debug - banner("[#{template}] DEBUG: var_file(#{var_file.path}) is:") - puts IO.read(var_file.path) - banner("[#{template}] DEBUG: md_file(#{md_file.path}) is:") - puts IO.read(md_file.path) - end - system(*cmd) || raise("[#{template}] Error validating, exited #{$CHILD_STATUS}") - end - end -end diff --git a/lib/bento/packerexec.rb b/lib/bento/packerexec.rb deleted file mode 100644 index 8fbd7bba6..000000000 --- a/lib/bento/packerexec.rb +++ /dev/null @@ -1,30 +0,0 @@ -module PackerExec - def for_packer_run_with(template) - Tempfile.open("#{template}-metadata.json") do |md_file| - Tempfile.open("#{template}-metadata-var-file") do |var_file| - write_box_metadata(template, md_file) - write_var_file(template, md_file, var_file) - yield md_file, var_file - end - end - end - - def write_box_metadata(template, io) - md = BuildMetadata.new(template, build_timestamp, override_version).read - io.write(JSON.pretty_generate(md)) - io.close - end - - def write_var_file(template, md_file, io) - md = BuildMetadata.new(template, build_timestamp, override_version).read - - io.write(JSON.pretty_generate({ - box_basename: md[:box_basename], - build_timestamp: md[:build_timestamp], - git_revision: md[:git_revision], - metadata: md_file.path, - version: md[:version], - })) - io.close - end -end diff --git a/lib/bento/providermetadata.rb b/lib/bento/providermetadata.rb deleted file mode 100644 index 1cabd59b0..000000000 --- a/lib/bento/providermetadata.rb +++ /dev/null @@ -1,85 +0,0 @@ -require "digest" unless defined?(Digest) -require "bento/common" - -class ProviderMetadata - include Common - - def initialize(path, box_basename) - @base = File.join(path, box_basename) - end - - def read - Dir.glob("#{base}.*.box").map do |file| - { - name: provider_from_file(file), - version: version(provider_from_file(file)), - file: "#{File.basename(file)}", - checksum_type: "sha256", - checksum: shasum(file), - size: "#{size_in_mb(file)} MB", - } - end - end - - private - - attr_reader :base - - def provider_from_file(file) - provider = file.sub(/^.*\.([^.]+)\.box$/, '\1') - if provider == "vmware" - "vmware_desktop" - else - provider - end - end - - def shasum(file) - Digest::SHA256.file(file).hexdigest - end - - def size_in_mb(file) - size = File.size(file) - size_mb = size / MEGABYTE - size_mb.ceil.to_s - end - - def version(provider) - case provider - when /vmware/ - ver_vmware - when /virtualbox/ - ver_vbox - when /parallels/ - ver_parallels - end - end - - def ver_vmware - if macos? - path = File.join('/Applications/VMware\ Fusion.app/Contents/Library') - fusion_cmd = File.join(path, "vmware-vmx -v") - cmd = Mixlib::ShellOut.new(fusion_cmd) - cmd.run_command - cmd.stderr.split(" ")[5] - else - cmd = Mixlib::ShellOut.new("vmware --version") - cmd.run_command - cmd.stdout.split(" ")[2] - end - end - - def ver_parallels - raise "Platform is not macOS, exiting..." unless macos? - - cmd = Mixlib::ShellOut.new("prlctl --version") - cmd.run_command - cmd.stdout.split(" ")[2] - end - - def ver_vbox - cmd = Mixlib::ShellOut.new("VBoxManage --version") - cmd.run_command - cmd.stdout.split("r")[0] - end -end diff --git a/lib/bento/runner.rb b/lib/bento/runner.rb deleted file mode 100644 index 74936852f..000000000 --- a/lib/bento/runner.rb +++ /dev/null @@ -1,97 +0,0 @@ -require "bento/common" -require "bento/buildmetadata" -require "bento/providermetadata" -require "bento/packerexec" - -class BuildRunner - include Common - include PackerExec - - attr_reader :template_files, :config, :dry_run, :debug, :only, :except, :mirror, :headed, :single, - :override_version, :build_timestamp, :cpus, :mem - - def initialize(opts) - @template_files = opts.template_files - @config = opts.config ||= false - @dry_run = opts.dry_run - @debug = opts.debug - @only = opts.only ||= "parallels-iso,virtualbox-iso,vmware-iso" - @except = opts.except - @mirror = opts.mirror - @headed = opts.headed ||= false - @single = opts.single ||= false - @override_version = opts.override_version - @build_timestamp = Time.now.gmtime.strftime("%Y%m%d%H%M%S") - @cpus = opts.cpus - @mem = opts.mem - end - - def start - templates = config ? build_list : template_files - banner("Starting build for templates:") - templates.each { |t| puts "- #{t}" } - time = Benchmark.measure do - templates.each { |template| build(template) } - end - banner("Build finished in #{duration(time.real)}.") - end - - private - - def build(file) - bento_dir = Dir.pwd - dir = File.dirname(file) - template = File.basename(file) - Dir.chdir dir - for_packer_run_with(template) do |md_file, _var_file| - cmd = packer_build_cmd(template, md_file.path) - banner("[#{template}] Building: '#{cmd.join(" ")}'") - time = Benchmark.measure do - system(*cmd) || raise("[#{template}] Error building, exited #{$CHILD_STATUS}") - end - write_final_metadata(template, time.real.ceil) - banner("[#{template}] Finished building in #{duration(time.real)}.") - end - Dir.chdir(bento_dir) - end - - def packer_build_cmd(template, var_file) - vars = "#{template}.variables.json" - cmd = %W{packer build -force -var-file=#{var_file} #{template}.json} - cmd.insert(2, "-var-file=#{vars}") if File.exist?(vars) - cmd.insert(2, "-only=#{only}") - cmd.insert(2, "-except=#{except}") if except - # Build the command line in the correct order and without spaces as future input for the splat operator. - cmd.insert(2, "cpus=#{cpus}") if cpus - cmd.insert(2, "-var") if cpus - cmd.insert(2, "memory=#{mem}") if mem - cmd.insert(2, "-var") if mem - cmd.insert(2, "mirror=#{mirror}") if mirror - cmd.insert(2, "-var") if mirror - cmd.insert(2, "headless=true") unless headed - cmd.insert(2, "-var") unless headed - cmd.insert(2, "-parallel=false") if single - cmd.insert(2, "-debug") if debug - cmd.insert(0, "echo") if dry_run - cmd - end - - def write_final_metadata(template, buildtime) - md = BuildMetadata.new(template, build_timestamp, override_version).read - path = File.join("../../builds") - filename = File.join(path, "#{md[:box_basename]}.metadata.json") - md[:providers] = ProviderMetadata.new(path, md[:box_basename]).read - md[:providers].each do |p| - p[:build_time] = buildtime - p[:build_cpus] = cpus unless cpus.nil? - p[:build_mem] = mem unless mem.nil? - end - - if dry_run - banner("(Dry run) Metadata file contents would be something similar to:") - puts JSON.pretty_generate(md) - else - File.open(filename, "wb") { |file| file.write(JSON.pretty_generate(md)) } - end - end -end diff --git a/lib/bento/test.rb b/lib/bento/test.rb deleted file mode 100644 index 9d2d5fecd..000000000 --- a/lib/bento/test.rb +++ /dev/null @@ -1,60 +0,0 @@ -require "bento/common" -require "mixlib/shellout" unless defined?(Mixlib::ShellOut) -require "erb" unless defined?(Erb) - -class TestRunner - include Common - - attr_reader :shared_folder, :boxname, :provider, :box_url, :no_shared, :provisioner - - def initialize(opts) - @debug = opts.debug - @no_shared = opts.no_shared - @provisioner = opts.provisioner.nil? ? "shell" : opts.provisioner - end - - def start - banner("Starting testing...") - time = Benchmark.measure do - metadata_files.each do |metadata_file| - destroy_all_bento - test_box(metadata_file) - destroy_all_bento - end - end - banner("Testing finished in #{duration(time.real)}.") - end - - private - - def destroy_all_bento - cmd = Mixlib::ShellOut.new("vagrant box list | grep 'bento-'") - cmd.run_command - boxes = cmd.stdout.split("\n") - - boxes.each do |box| - b = box.split(" ") - rm_cmd = Mixlib::ShellOut.new("vagrant box remove --force #{b[0]} --provider #{b[1].to_s.gsub(/(,|\()/, "")}") - banner("Removing #{b[0]} for provider #{b[1].to_s.gsub(/(,|\()/, "")}") - rm_cmd.run_command - end - end - - def test_box(md_json) - md = box_metadata(md_json) - @boxname = md["name"] - @providers = md["providers"] - @share_disabled = no_shared || /(bsd|opensuse)/.match(boxname) ? true : false - - dir = "#{File.expand_path("../../", File.dirname(__FILE__))}/templates" - %w{.kitchen.yml bootstrap.sh}.each do |file| - t = file =~ /kitchen/ ? "kitchen.yml.erb" : "#{file}.erb" - erb = ERB.new(File.read(dir + "/#{t}"), nil, "-").result(binding) - File.open(file, "w") { |f| f.puts erb } - end - - test = Mixlib::ShellOut.new("kitchen test", timeout: 900, live_stream: STDOUT) - test.run_command - test.error! - end -end diff --git a/lib/bento/upload.rb b/lib/bento/upload.rb deleted file mode 100644 index 181da7345..000000000 --- a/lib/bento/upload.rb +++ /dev/null @@ -1,92 +0,0 @@ -require "bento/common" - -class UploadRunner - include Common - - attr_reader :md_json - - def initialize(opts) - @md_json = opts.md_json - end - - def error_unless_logged_in - warn("You cannot upload files to vagrant cloud unless the vagrant CLI is logged in. Run 'vagrant cloud auth login' first.") unless logged_in? - end - - def start - error_unless_logged_in - - banner("Starting uploads...") - time = Benchmark.measure do - files = md_json ? [md_json] : metadata_files - files.each do |md_file| - upload_box(md_file) - end - end - banner("Uploads finished in #{duration(time.real)}.") - end - - # - # Upload all the boxes defined in the passed metadata file - # - # @param [String] md_file The path to the metadata file - # - # - def upload_box(md_file) - md_data = box_metadata(md_file) - - md_data["providers"].each_pair do |prov, prov_data| - if File.exist?(File.join("builds", prov_data["file"])) - banner("Uploading bento/#{md_data["name"]} version:#{md_data["version"]} provider:#{prov}...") - - upload_cmd = "vagrant cloud publish bento/#{md_data["name"]} #{md_data["version"]} #{prov} builds/#{prov_data["file"]} --description '#{box_desc(md_data["name"])}' --short-description '#{box_desc(md_data["name"])}' --version-description '#{ver_desc(md_data)}' --force --release --no-private" - shellout(upload_cmd) - - slug_name = lookup_slug(md_data["name"]) - if slug_name - banner("Uploading slug bento/#{slug_name} from #{md_data["name"]} version:#{md_data["version"]} provider:#{prov}...") - upload_cmd = "vagrant cloud publish bento/#{slug_name} #{md_data["version"]} #{prov} builds/#{prov_data["file"]} --description '#{slug_desc(slug_name)}' --short-description '#{slug_desc(slug_name)}' --version-description '#{ver_desc(md_data)}' --force --release --no-private" - shellout(upload_cmd) - end - - # move the box file to the completed directory - FileUtils.mv(File.join("builds", prov_data["file"]), File.join("builds", "uploaded", prov_data["file"])) - else # box in metadata isn't on disk - warn "The #{prov} box defined in the metadata file #{md_file} does not exist at builds/#{prov_data["file"]}. Skipping!" - end - end - - # move the metadata file to the completed directory - FileUtils.mv(md_file, File.join("builds", "uploaded", File.basename(md_file))) - end - - # - # Given a box name return a slug name or nil - # - # @return [String, NilClass] The slug name or nil - # - def lookup_slug(name) - builds_yml["slugs"].each_pair do |slug, match_string| - return slug if name.start_with?(match_string) && !(name.include?("i386") || name.include?("arm64")) - end - - nil - end - - def box_desc(name) - "Vanilla #{name.tr("-", " ").capitalize} Vagrant box created with Bento by Chef" - end - - def slug_desc(name) - "Vanilla #{name.tr("-", " ").capitalize}.x Vagrant box created with Bento by Chef. This box will be updated with the latest releases of #{name.tr("-", " ").capitalize} as they become available" - end - - def ver_desc(md_data) - tool_versions = [] - md_data["providers"].each_key { |hv| tool_versions << "#{hv}: #{md_data["providers"][hv]["version"]}" } - tool_versions.sort! - tool_versions << "packer: #{md_data["packer"]}" - - "#{md_data["name"].tr("-", " ").capitalize} Vagrant box version #{md_data["version"]} created with Bento by Chef. Built with: #{tool_versions.join(", ")}" - end -end diff --git a/lib/bento/version.rb b/lib/bento/version.rb deleted file mode 100644 index c4205bd56..000000000 --- a/lib/bento/version.rb +++ /dev/null @@ -1,3 +0,0 @@ -module Bento - VERSION = "2.0.0".freeze -end diff --git a/os_pkrvars/almalinux/almalinux-8-aarch64.pkrvars.hcl b/os_pkrvars/almalinux/almalinux-8-aarch64.pkrvars.hcl new file mode 100644 index 000000000..81fff2dfe --- /dev/null +++ b/os_pkrvars/almalinux/almalinux-8-aarch64.pkrvars.hcl @@ -0,0 +1,10 @@ +os_name = "almalinux" +os_version = "8.7" +os_arch = "aarch64" +iso_url = "https://seattle.crazyfast.us/almalinux/8.7/isos/aarch64/AlmaLinux-8.7-aarch64-dvd.iso" +iso_checksum = "c14fae79d5e26bc41e75f0a65063ab684199a7ea3a6bd0a8086e1ffd2a7afac8" +parallels_guest_os_type = "centos" +vbox_guest_os_type = "RedHat_64" +vmware_guest_os_type = "centos-64" +boot_command = ["<up>e<wait><down><down><end><wait> inst.text inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/rhel/8ks.cfg<leftCtrlOn>x<leftCtrlOff>"] +boot_command_hyperv = ["<wait5><up><wait5><tab> text ks=hd:fd0:/ks.cfg<enter><wait5><esc>"] diff --git a/os_pkrvars/almalinux/almalinux-8-x86_64.pkrvars.hcl b/os_pkrvars/almalinux/almalinux-8-x86_64.pkrvars.hcl new file mode 100644 index 000000000..ddb1fd248 --- /dev/null +++ b/os_pkrvars/almalinux/almalinux-8-x86_64.pkrvars.hcl @@ -0,0 +1,10 @@ +os_name = "almalinux" +os_version = "8.7" +os_arch = "x86_64" +iso_url = "https://repo.almalinux.org/almalinux/8.7/isos/x86_64/AlmaLinux-8.7-x86_64-dvd.iso" +iso_checksum = "b95ddf9d56a849cc8eb4b95dd2321c13af637d3379b91f5d96c39e96fb4403b3" +parallels_guest_os_type = "centos" +vbox_guest_os_type = "RedHat_64" +vmware_guest_os_type = "centos-64" +boot_command = ["<up><wait><tab> inst.text inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/rhel/8ks.cfg<enter><wait>"] +boot_command_hyperv = ["<wait5><up><wait5><tab> text ks=hd:fd0:/ks.cfg<enter><wait5><esc>"] diff --git a/os_pkrvars/almalinux/almalinux-9-aarch64.pkrvars.hcl b/os_pkrvars/almalinux/almalinux-9-aarch64.pkrvars.hcl new file mode 100644 index 000000000..cc5238a17 --- /dev/null +++ b/os_pkrvars/almalinux/almalinux-9-aarch64.pkrvars.hcl @@ -0,0 +1,10 @@ +os_name = "almalinux" +os_version = "9.1" +os_arch = "aarch64" +iso_url = "https://repo.almalinux.org/almalinux/9.1/isos/aarch64/AlmaLinux-9.1-aarch64-dvd.iso" +iso_checksum = "a6f0fb355b9c82f13a95f3f02e19b0f07906a7e0f27e3bca144338ebac9abf40" +parallels_guest_os_type = "centos" +vbox_guest_os_type = "RedHat_64" +vmware_guest_os_type = "centos-64" +boot_command = ["<up>e<wait><down><down><end><wait> inst.text inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/rhel/9ks.cfg<leftCtrlOn>x<leftCtrlOff>"] +boot_command_hyperv = ["<wait5><up><wait5><tab> text ks=hd:fd0:/ks.cfg<enter><wait5><esc>"] diff --git a/os_pkrvars/almalinux/almalinux-9-x86_64.pkrvars.hcl b/os_pkrvars/almalinux/almalinux-9-x86_64.pkrvars.hcl new file mode 100644 index 000000000..d80611d72 --- /dev/null +++ b/os_pkrvars/almalinux/almalinux-9-x86_64.pkrvars.hcl @@ -0,0 +1,10 @@ +os_name = "almalinux" +os_version = "9.1" +os_arch = "x86_64" +iso_url = "https://repo.almalinux.org/almalinux/9.1/isos/x86_64/AlmaLinux-9.1-x86_64-dvd.iso" +iso_checksum = "2a44e3f8a012c132da19b9aae2bf949e20b116f0a2a7ac3eca111972f4ac952f" +parallels_guest_os_type = "centos" +vbox_guest_os_type = "RedHat_64" +vmware_guest_os_type = "centos-64" +boot_command = ["<up><wait><tab> inst.text inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/rhel/9ks.cfg<enter><wait>"] +boot_command_hyperv = ["<wait5><up><wait5><tab> text ks=hd:fd0:/ks.cfg<enter><wait5><esc>"] diff --git a/os_pkrvars/amazonlinux/amazonlinux-2-x86_64.pkrvars.hcl b/os_pkrvars/amazonlinux/amazonlinux-2-x86_64.pkrvars.hcl new file mode 100644 index 000000000..e70713af9 --- /dev/null +++ b/os_pkrvars/amazonlinux/amazonlinux-2-x86_64.pkrvars.hcl @@ -0,0 +1,18 @@ +os_name = "amazonlinux" +os_version = "2" +os_arch = "x86_64" +vbox_guest_os_type = "RedHat_64" +sources_enabled = [ + "source.virtualbox-ovf.amazonlinux" +] +vboxmanage = [ + [ + "modifyvm", + "{{ .Name }}", + "--memory", + "2048", + "--cpus", "2", + "--nat-localhostreachable1", + "on", + ] +] diff --git a/os_pkrvars/centos/centos-7-aarch64.pkrvars.hcl b/os_pkrvars/centos/centos-7-aarch64.pkrvars.hcl new file mode 100644 index 000000000..f443470c3 --- /dev/null +++ b/os_pkrvars/centos/centos-7-aarch64.pkrvars.hcl @@ -0,0 +1,10 @@ +os_name = "centos" +os_version = "7.9" +os_arch = "aarch64" +iso_url = "https://quantum-mirror.hu/mirrors/pub/centos-altarch/7.9.2009/isos/aarch64/CentOS-7-aarch64-Everything-2009.iso" +iso_checksum = "b898822822fd5ffacc8da074adcd6b882ac0f73a269111b15871e16c2ce9d774" +parallels_guest_os_type = "centos" +vbox_guest_os_type = "RedHat_64" +vmware_guest_os_type = "centos-64" +boot_command = ["<up>e<wait><down><down><end><wait> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/rhel/7ks.cfg <leftCtrlOn>x<leftCtrlOff>"] +boot_command_hyperv = ["<wait5><up><wait5><tab> text ks=hd:fd0:/ks.cfg<enter><wait5><esc>"] diff --git a/os_pkrvars/centos/centos-7-x86_64.pkrvars.hcl b/os_pkrvars/centos/centos-7-x86_64.pkrvars.hcl new file mode 100644 index 000000000..3035da8a4 --- /dev/null +++ b/os_pkrvars/centos/centos-7-x86_64.pkrvars.hcl @@ -0,0 +1,10 @@ +os_name = "centos" +os_version = "7.9" +os_arch = "x86_64" +iso_url = "http://mirrors.kernel.org/centos/7.9.2009/isos/x86_64/CentOS-7-x86_64-Minimal-2009.iso" +iso_checksum = "07b94e6b1a0b0260b94c83d6bb76b26bf7a310dc78d7a9c7432809fb9bc6194a" +parallels_guest_os_type = "centos" +vbox_guest_os_type = "RedHat_64" +vmware_guest_os_type = "centos-64" +boot_command = ["<up><wait><tab> inst.text inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/rhel/7ks.cfg<enter><wait>"] +boot_command_hyperv = ["<wait5><up><wait5><tab> text ks=hd:fd0:/ks.cfg<enter><wait5><esc>"] diff --git a/os_pkrvars/centos/centos-stream-8-aarch64.pkrvars.hcl b/os_pkrvars/centos/centos-stream-8-aarch64.pkrvars.hcl new file mode 100644 index 000000000..9127ff5c6 --- /dev/null +++ b/os_pkrvars/centos/centos-stream-8-aarch64.pkrvars.hcl @@ -0,0 +1,10 @@ +os_name = "centos-stream" +os_version = "8" +os_arch = "aarch64" +iso_url = "http://mirrors.kernel.org/centos/8-stream/isos/aarch64/CentOS-Stream-8-aarch64-latest-dvd1.iso" +iso_checksum = "file:https://mirrors.edge.kernel.org/centos/8-stream/isos/aarch64/CHECKSUM" +parallels_guest_os_type = "centos" +vbox_guest_os_type = "RedHat_64" +vmware_guest_os_type = "centos-64" +boot_command = ["<up>e<wait><down><down><end><wait> inst.text inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/rhel/8ks.cfg <leftCtrlOn>x<leftCtrlOff>"] +boot_command_hyperv = ["<wait5><up><wait5><tab> text ks=hd:fd0:/ks.cfg<enter><wait5><esc>"] diff --git a/os_pkrvars/centos/centos-stream-8-x86_64.pkrvars.hcl b/os_pkrvars/centos/centos-stream-8-x86_64.pkrvars.hcl new file mode 100644 index 000000000..d93a3e100 --- /dev/null +++ b/os_pkrvars/centos/centos-stream-8-x86_64.pkrvars.hcl @@ -0,0 +1,10 @@ +os_name = "centos-stream" +os_version = "8" +os_arch = "x86_64" +iso_url = "http://mirrors.kernel.org/centos/8-stream/isos/x86_64/CentOS-Stream-8-x86_64-latest-dvd1.iso" +iso_checksum = "file:https://mirrors.edge.kernel.org/centos/8-stream/isos/x86_64/CHECKSUM" +parallels_guest_os_type = "centos" +vbox_guest_os_type = "RedHat_64" +vmware_guest_os_type = "centos-64" +boot_command = ["<up><wait><tab> inst.text inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/rhel/8ks.cfg<enter><wait>"] +boot_command_hyperv = ["<wait5><up><wait5><tab> text ks=hd:fd0:/ks.cfg<enter><wait5><esc>"] diff --git a/os_pkrvars/centos/centos-stream-9-aarch64.pkrvars.hcl b/os_pkrvars/centos/centos-stream-9-aarch64.pkrvars.hcl new file mode 100644 index 000000000..73718c793 --- /dev/null +++ b/os_pkrvars/centos/centos-stream-9-aarch64.pkrvars.hcl @@ -0,0 +1,10 @@ +os_name = "centos-stream" +os_version = "9" +os_arch = "aarch64" +iso_url = "http://mirror.stream.centos.org/9-stream/BaseOS/aarch64/iso/CentOS-Stream-9-latest-aarch64-dvd1.iso" +iso_checksum = "file:http://mirror.stream.centos.org/9-stream/BaseOS/aarch64/iso/CentOS-Stream-9-latest-aarch64-dvd1.iso.SHA256SUM" +parallels_guest_os_type = "centos" +vbox_guest_os_type = "RedHat_64" +vmware_guest_os_type = "centos-64" +boot_command = ["<up>e<wait><down><down><end><wait> inst.text inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/rhel/9ks.cfg <leftCtrlOn>x<leftCtrlOff>"] +boot_command_hyperv = ["<wait5><up><wait5><tab> text ks=hd:fd0:/ks.cfg<enter><wait5><esc>"] diff --git a/os_pkrvars/centos/centos-stream-9-x86_64.pkrvars.hcl b/os_pkrvars/centos/centos-stream-9-x86_64.pkrvars.hcl new file mode 100644 index 000000000..3a7786d99 --- /dev/null +++ b/os_pkrvars/centos/centos-stream-9-x86_64.pkrvars.hcl @@ -0,0 +1,10 @@ +os_name = "centos-stream" +os_version = "9" +os_arch = "x86_64" +iso_url = "http://mirror.stream.centos.org/9-stream/BaseOS/x86_64/iso/CentOS-Stream-9-latest-x86_64-dvd1.iso" +iso_checksum = "file:http://mirror.stream.centos.org/9-stream/BaseOS/x86_64/iso/CentOS-Stream-9-latest-x86_64-dvd1.iso.SHA256SUM" +parallels_guest_os_type = "centos" +vbox_guest_os_type = "RedHat_64" +vmware_guest_os_type = "centos-64" +boot_command = ["<up><wait><tab> inst.text inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/rhel/9ks.cfg<enter><wait>"] +boot_command_hyperv = ["<wait5><up><wait5><tab> text ks=hd:fd0:/ks.cfg<enter><wait5><esc>"] diff --git a/os_pkrvars/debian/debian-10-aarch64.pkrvars.hcl b/os_pkrvars/debian/debian-10-aarch64.pkrvars.hcl new file mode 100644 index 000000000..db55a8a8d --- /dev/null +++ b/os_pkrvars/debian/debian-10-aarch64.pkrvars.hcl @@ -0,0 +1,9 @@ +os_name = "debian" +os_version = "10.13" +os_arch = "aarch64" +iso_url = "https://cdimage.debian.org/cdimage/archive/10.13.0/arm64/iso-dvd/debian-10.13.0-arm64-DVD-1.iso" +iso_checksum = "5c6f6df5febf691e95c08b630db3b1c13b9c5b3d19ea4b1515207f09385e186d" +parallels_guest_os_type = "debian" +vbox_guest_os_type = "Debian_64" +vmware_guest_os_type = "debian-64" +boot_command = ["<up>e<wait><down><down><down><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><wait>install <wait> preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/debian/preseed.cfg <wait>debian-installer=en_US.UTF-8 <wait>auto <wait>locale=en_US.UTF-8 <wait>kbd-chooser/method=us <wait>keyboard-configuration/xkb-keymap=us <wait>netcfg/get_hostname={{ .Name }} <wait>netcfg/get_domain=vagrantup.com <wait>fb=false <wait>debconf/frontend=noninteractive <wait>console-setup/ask_detect=false <wait>console-keymaps-at/keymap=us <wait>grub-installer/bootdev=/dev/sda <wait><f10><wait>"] diff --git a/os_pkrvars/debian/debian-10-x86_64.pkrvars.hcl b/os_pkrvars/debian/debian-10-x86_64.pkrvars.hcl new file mode 100644 index 000000000..bf00eb1b3 --- /dev/null +++ b/os_pkrvars/debian/debian-10-x86_64.pkrvars.hcl @@ -0,0 +1,9 @@ +os_name = "debian" +os_version = "10.13" +os_arch = "x86_64" +iso_url = "https://cdimage.debian.org/cdimage/archive/10.13.0/amd64/iso-dvd/debian-10.13.0-amd64-DVD-1.iso" +iso_checksum = "07d493c305aa5313e767181af5ef2c2b2758a4a3f57e78fb4a4fcba1dcefb198" +parallels_guest_os_type = "debian" +vbox_guest_os_type = "Debian_64" +vmware_guest_os_type = "debian-64" +boot_command = ["<esc><wait>auto preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/debian/preseed.cfg netcfg/get_hostname={{ .Name }}<enter>"] diff --git a/os_pkrvars/debian/debian-11-aarch64.pkrvars.hcl b/os_pkrvars/debian/debian-11-aarch64.pkrvars.hcl new file mode 100644 index 000000000..242e09f98 --- /dev/null +++ b/os_pkrvars/debian/debian-11-aarch64.pkrvars.hcl @@ -0,0 +1,9 @@ +os_name = "debian" +os_version = "11.6" +os_arch = "aarch64" +iso_url = "https://cdimage.debian.org/debian-cd/current/arm64/iso-dvd/debian-11.6.0-arm64-DVD-1.iso" +iso_checksum = "b27ff768c10808518790d72d670c5588cdc60cf8934ef92773a89274a193a65f" +parallels_guest_os_type = "debian" +vbox_guest_os_type = "Debian_64" +vmware_guest_os_type = "debian-64" +boot_command = ["<up>e<wait><down><down><down><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><wait>install <wait> preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/debian/preseed.cfg <wait>debian-installer=en_US.UTF-8 <wait>auto <wait>locale=en_US.UTF-8 <wait>kbd-chooser/method=us <wait>keyboard-configuration/xkb-keymap=us <wait>netcfg/get_hostname={{ .Name }} <wait>netcfg/get_domain=vagrantup.com <wait>fb=false <wait>debconf/frontend=noninteractive <wait>console-setup/ask_detect=false <wait>console-keymaps-at/keymap=us <wait>grub-installer/bootdev=/dev/sda <wait><f10><wait>"] diff --git a/os_pkrvars/debian/debian-11-x86_64.pkrvars.hcl b/os_pkrvars/debian/debian-11-x86_64.pkrvars.hcl new file mode 100644 index 000000000..f1b9cf2cf --- /dev/null +++ b/os_pkrvars/debian/debian-11-x86_64.pkrvars.hcl @@ -0,0 +1,9 @@ +os_name = "debian" +os_version = "11.6" +os_arch = "x86_64" +iso_url = "https://cdimage.debian.org/debian-cd/current/amd64/iso-dvd/debian-11.6.0-amd64-DVD-1.iso" +iso_checksum = "55f6f49b32d3797621297a9481a6cc3e21b3142f57d8e1279412ff5a267868d8" +parallels_guest_os_type = "debian" +vbox_guest_os_type = "Debian_64" +vmware_guest_os_type = "debian-64" +boot_command = ["<esc><wait>auto preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/debian/preseed.cfg netcfg/get_hostname={{ .Name }}<enter>"] diff --git a/os_pkrvars/fedora/fedora-36-aarch64.pkrvars.hcl b/os_pkrvars/fedora/fedora-36-aarch64.pkrvars.hcl new file mode 100644 index 000000000..4b649a0d1 --- /dev/null +++ b/os_pkrvars/fedora/fedora-36-aarch64.pkrvars.hcl @@ -0,0 +1,9 @@ +os_name = "fedora" +os_version = "36" +os_arch = "x86_64" +iso_url = "https://na.edge.kernel.org/fedora/releases/36/Server/aarch64/iso/Fedora-Server-dvd-aarch64-36-1.5.iso" +iso_checksum = "sha256:0ab4000575ff8b258576750ecf4ca39b266f0c88cab5fe3d8d2f88c9bea4830d" +parallels_guest_os_type = "fedora-core" +vbox_guest_os_type = "Fedora_64" +vmware_guest_os_type = "fedora-64" +boot_command = ["<up><wait>e<down><down><end> inst.text inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/fedora/ks.cfg<enter><wait><f10>"] diff --git a/os_pkrvars/fedora/fedora-36-x86_64.pkrvars.hcl b/os_pkrvars/fedora/fedora-36-x86_64.pkrvars.hcl new file mode 100644 index 000000000..638ef6c83 --- /dev/null +++ b/os_pkrvars/fedora/fedora-36-x86_64.pkrvars.hcl @@ -0,0 +1,9 @@ +os_name = "fedora" +os_version = "36" +os_arch = "x86_64" +iso_url = "https://ftp-nyc.osuosl.org/pub/fedora/linux/releases/36/Server/x86_64/iso/Fedora-Server-dvd-x86_64-36-1.5.iso" +iso_checksum = "sha256:5edaf708a52687b09f9810c2b6d2a3432edac1b18f4d8c908c0da6bde0379148" +parallels_guest_os_type = "fedora-core" +vbox_guest_os_type = "Fedora_64" +vmware_guest_os_type = "fedora-64" +boot_command = ["<up><wait><tab> inst.text inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/fedora/ks.cfg<enter><wait>"] diff --git a/os_pkrvars/fedora/fedora-37-aarch64.pkrvars.hcl b/os_pkrvars/fedora/fedora-37-aarch64.pkrvars.hcl new file mode 100644 index 000000000..bf05a6436 --- /dev/null +++ b/os_pkrvars/fedora/fedora-37-aarch64.pkrvars.hcl @@ -0,0 +1,9 @@ +os_name = "fedora" +os_version = "37" +os_arch = "aarch64" +iso_url = "https://download.fedoraproject.org/pub/fedora/linux/releases/37/Server/aarch64/iso/Fedora-Server-dvd-aarch64-37-1.7.iso" +iso_checksum = "sha256:1c2deba876bd2da3a429b1b0cd5e294508b8379b299913d97dd6dd6ebcd8b56f" +parallels_guest_os_type = "fedora-core" +vbox_guest_os_type = "Fedora_64" +vmware_guest_os_type = "fedora-64" +boot_command = ["<up><up>e<wait><down><down><end> inst.text inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/fedora/ks.cfg}<F10><wait>"] diff --git a/os_pkrvars/fedora/fedora-37-x86_64.pkrvars.hcl b/os_pkrvars/fedora/fedora-37-x86_64.pkrvars.hcl new file mode 100644 index 000000000..161cb2975 --- /dev/null +++ b/os_pkrvars/fedora/fedora-37-x86_64.pkrvars.hcl @@ -0,0 +1,9 @@ +os_name = "fedora" +os_version = "37" +os_arch = "x86_64" +iso_url = "https://download.fedoraproject.org/pub/fedora/linux/releases/37/Server/x86_64/iso/Fedora-Server-dvd-x86_64-37-1.7.iso" +iso_checksum = "sha256:0a4de5157af47b41a07a53726cd62ffabd04d5c1a4afece5ee7c7a84c1213e4f" +parallels_guest_os_type = "fedora-core" +vbox_guest_os_type = "Fedora_64" +vmware_guest_os_type = "fedora-64" +boot_command = ["<up>e<wait><down><down><end> inst.text inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/fedora/ks.cfg<F10><wait>"] diff --git a/os_pkrvars/freebsd/freebsd-12-x86_64.pkrvars.hcl b/os_pkrvars/freebsd/freebsd-12-x86_64.pkrvars.hcl new file mode 100644 index 000000000..3c1057dc2 --- /dev/null +++ b/os_pkrvars/freebsd/freebsd-12-x86_64.pkrvars.hcl @@ -0,0 +1,9 @@ +os_name = "freebsd" +os_version = "12.4" +os_arch = "x86_64" +iso_url = "https://download.freebsd.org/releases/amd64/amd64/ISO-IMAGES/12.4/FreeBSD-12.4-RELEASE-amd64-disc1.iso" +iso_checksum = "606435637b76991f96df68f561badf03266f3d5452e9f72ed9b130d96b188800" +parallels_guest_os_type = "freebsd" +vbox_guest_os_type = "FreeBSD_64" +vmware_guest_os_type = "freedsd-64" +boot_command = ["<esc><wait>boot -s<wait><enter><wait><wait10><wait10>/bin/sh<enter><wait>mdmfs -s 100m md1 /tmp<enter><wait>mdmfs -s 100m md2 /mnt<enter><wait>dhclient -p /tmp/dhclient.em0.pid -l /tmp/dhclient.lease.em0 em0<enter><wait>fetch -o /tmp/installerconfig http://{{ .HTTPIP }}:{{ .HTTPPort }}/freebsd/installerconfig \u0026\u0026 bsdinstall script /tmp/installerconfig<enter><wait>"] diff --git a/os_pkrvars/freebsd/freebsd-13-x86_64.pkrvars.hcl b/os_pkrvars/freebsd/freebsd-13-x86_64.pkrvars.hcl new file mode 100644 index 000000000..45a638ca3 --- /dev/null +++ b/os_pkrvars/freebsd/freebsd-13-x86_64.pkrvars.hcl @@ -0,0 +1,9 @@ +os_name = "freebsd" +os_version = "13.1" +os_arch = "x86_64" +iso_url = "https://download.freebsd.org/releases/amd64/amd64/ISO-IMAGES/13.1/FreeBSD-13.1-RELEASE-amd64-disc1.iso" +iso_checksum = "697d81653fa246b921ddfcf1d15562c55249cc727b11fa3e47f470e2cf2b6a40" +parallels_guest_os_type = "freebsd" +vbox_guest_os_type = "FreeBSD_64" +vmware_guest_os_type = "freedsd-64" +boot_command = ["<esc><wait>boot -s<wait><enter><wait><wait10><wait10>/bin/sh<enter><wait>mdmfs -s 100m md1 /tmp<enter><wait>mdmfs -s 100m md2 /mnt<enter><wait>dhclient -p /tmp/dhclient.em0.pid -l /tmp/dhclient.lease.em0 em0<enter><wait><wait5>fetch -o /tmp/installerconfig http://{{ .HTTPIP }}:{{ .HTTPPort }}/freebsd/installerconfig && bsdinstall script /tmp/installerconfig<enter><wait>"] diff --git a/os_pkrvars/opensuse/opensuse-leap-15-x86_64.pkrvars.hcl b/os_pkrvars/opensuse/opensuse-leap-15-x86_64.pkrvars.hcl new file mode 100644 index 000000000..eb5e3169b --- /dev/null +++ b/os_pkrvars/opensuse/opensuse-leap-15-x86_64.pkrvars.hcl @@ -0,0 +1,9 @@ +os_name = "opensuse" +os_version = "15.4" +os_arch = "x86_64" +iso_url = "http://sfo-korg-mirror.kernel.org/opensuse/distribution/leap/15.4/iso/openSUSE-Leap-15.4-DVD-x86_64-Media.iso" +iso_checksum = "4683345f242397c7fd7d89a50731a120ffd60a24460e21d2634e783b3c169695" +parallels_guest_os_type = "opensuse" +vbox_guest_os_type = "OpenSUSE_64" +vmware_guest_os_type = "opensuse-64" +boot_command = ["<wait5><esc><enter><wait>linux biosdevname=0 net.ifnames=0 netdevice=eth0 netsetup=dhcp lang=en_US textmode=1 autoyast=http://{{ .HTTPIP }}:{{ .HTTPPort }}/opensuse/autoinst.xml<enter><wait>"] diff --git a/os_pkrvars/oraclelinux/oraclelinux-7-aarch64.pkrvars.hcl b/os_pkrvars/oraclelinux/oraclelinux-7-aarch64.pkrvars.hcl new file mode 100644 index 000000000..8dbec2587 --- /dev/null +++ b/os_pkrvars/oraclelinux/oraclelinux-7-aarch64.pkrvars.hcl @@ -0,0 +1,10 @@ +os_name = "oraclelinux" +os_version = "7.9" +os_arch = "aarch64" +iso_url = "https://yum.oracle.com/ISOS/OracleLinux/OL7/u9/aarch64/OracleLinux-R7-U9-Server-aarch64-dvd.iso" +iso_checksum = "fd2c1b1e26858576534f6e6c4cf000a15cd81bec010dad5e827b204a14a1750e" +parallels_guest_os_type = "centos" +vbox_guest_os_type = "RedHat_64" +vmware_guest_os_type = "centos-64" +boot_command = ["<up>e<wait><down><down><end><wait> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/rhel/7ks.cfg <leftCtrlOn>x<leftCtrlOff>"] +boot_command_hyperv = ["<wait5><up><wait5><tab> text ks=hd:fd0:/ks.cfg<enter><wait5><esc>"] diff --git a/os_pkrvars/oraclelinux/oraclelinux-7-x86_64.pkrvars.hcl b/os_pkrvars/oraclelinux/oraclelinux-7-x86_64.pkrvars.hcl new file mode 100644 index 000000000..cee7d9eb8 --- /dev/null +++ b/os_pkrvars/oraclelinux/oraclelinux-7-x86_64.pkrvars.hcl @@ -0,0 +1,10 @@ +os_name = "oraclelinux" +os_version = "7.9" +os_arch = "x86_64" +iso_url = "http://mirrors.dotsrc.org/oracle-linux/OL7/u9/x86_64/OracleLinux-R7-U9-Server-x86_64-dvd.iso" +iso_checksum = "dc2782bfd92b4c060cf8006fbc6e18036c27f599eebf3584a1a2ac54f008bf2f" +parallels_guest_os_type = "centos" +vbox_guest_os_type = "RedHat_64" +vmware_guest_os_type = "centos-64" +boot_command = ["<up><wait><tab> inst.text inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/rhel/7ks.cfg<enter><wait>"] +boot_command_hyperv = ["<wait5><up><wait5><tab> text ks=hd:fd0:/ks.cfg<enter><wait5><esc>"] diff --git a/os_pkrvars/oraclelinux/oraclelinux-8-aarch64.pkrvars.hcl b/os_pkrvars/oraclelinux/oraclelinux-8-aarch64.pkrvars.hcl new file mode 100644 index 000000000..0d278fd4a --- /dev/null +++ b/os_pkrvars/oraclelinux/oraclelinux-8-aarch64.pkrvars.hcl @@ -0,0 +1,10 @@ +os_name = "oraclelinux" +os_version = "8.7" +os_arch = "aarch64" +iso_url = "https://yum.oracle.com/ISOS/OracleLinux/OL8/u7/aarch64/OracleLinux-R8-U7-aarch64-dvd.iso" +iso_checksum = "420000aa561e833d8dc9576815d068fb5b15fd9fb826a0d9c127782004683741" +parallels_guest_os_type = "centos" +vbox_guest_os_type = "RedHat_64" +vmware_guest_os_type = "centos-64" +boot_command = ["<up>e<wait><down><down><end><wait> inst.text inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/rhel/8ks.cfg <leftCtrlOn>x<leftCtrlOff>"] +boot_command_hyperv = ["<wait5><up><wait5><tab> text ks=hd:fd0:/ks.cfg<enter><wait5><esc>"] diff --git a/os_pkrvars/oraclelinux/oraclelinux-8-x86_64.pkrvars.hcl b/os_pkrvars/oraclelinux/oraclelinux-8-x86_64.pkrvars.hcl new file mode 100644 index 000000000..0468a3bf9 --- /dev/null +++ b/os_pkrvars/oraclelinux/oraclelinux-8-x86_64.pkrvars.hcl @@ -0,0 +1,10 @@ +os_name = "oraclelinux" +os_version = "8.7" +os_arch = "x86_64" +iso_url = "https://yum.oracle.com/ISOS/OracleLinux/OL8/u7/x86_64/OracleLinux-R8-U7-x86_64-dvd.iso" +iso_checksum = "dd6ede6c0597189b7dffb800b32835002bd95f19c254734aeb58f58651aa03fb" +parallels_guest_os_type = "centos" +vbox_guest_os_type = "RedHat_64" +vmware_guest_os_type = "centos-64" +boot_command = ["<up><wait><tab> inst.text inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/rhel/8ks.cfg<enter><wait>"] +boot_command_hyperv = ["<wait5><up><wait5><tab> text ks=hd:fd0:/ks.cfg<enter><wait5><esc>"] diff --git a/os_pkrvars/oraclelinux/oraclelinux-9-aarch64.pkrvars.hcl b/os_pkrvars/oraclelinux/oraclelinux-9-aarch64.pkrvars.hcl new file mode 100644 index 000000000..2e6e64fba --- /dev/null +++ b/os_pkrvars/oraclelinux/oraclelinux-9-aarch64.pkrvars.hcl @@ -0,0 +1,10 @@ +os_name = "oraclelinux" +os_version = "9.1" +os_arch = "aarch64" +iso_url = "https://yum.oracle.com/ISOS/OracleLinux/OL9/u1/aarch64/OracleLinux-R9-U1-aarch64-dvd.iso" +iso_checksum = "3dc4578f53ceb1010f8236b3356f2441ec3f9e840fa60522e470d7f3cdb86cb1" +parallels_guest_os_type = "centos" +vbox_guest_os_type = "RedHat_64" +vmware_guest_os_type = "centos-64" +boot_command = ["<up>e<wait><down><down><end><wait> inst.text inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/rhel/9ks.cfg <leftCtrlOn>x<leftCtrlOff>"] +boot_command_hyperv = ["<wait5><up><wait5><tab> text ks=hd:fd0:/ks.cfg<enter><wait5><esc>"] diff --git a/os_pkrvars/oraclelinux/oraclelinux-9-x86_64.pkrvars.hcl b/os_pkrvars/oraclelinux/oraclelinux-9-x86_64.pkrvars.hcl new file mode 100644 index 000000000..6f5ce533e --- /dev/null +++ b/os_pkrvars/oraclelinux/oraclelinux-9-x86_64.pkrvars.hcl @@ -0,0 +1,10 @@ +os_name = "oraclelinux" +os_version = "9.1" +os_arch = "x86_64" +iso_url = "https://yum.oracle.com/ISOS/OracleLinux/OL9/u1/x86_64/OracleLinux-R9-U1-x86_64-dvd.iso" +iso_checksum = "a46ac0b717881a2673c7dc981b3219f6dea747e3d6bd18908fcb8c1f42b82786" +parallels_guest_os_type = "centos" +vbox_guest_os_type = "RedHat_64" +vmware_guest_os_type = "centos-64" +boot_command = ["<up><wait><tab> inst.text inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/rhel/9ks.cfg<enter><wait>"] +boot_command_hyperv = ["<wait5><up><wait5><tab> text ks=hd:fd0:/ks.cfg<enter><wait5><esc>"] diff --git a/os_pkrvars/rhel/rhel-7-aarch64.pkrvars.hcl b/os_pkrvars/rhel/rhel-7-aarch64.pkrvars.hcl new file mode 100644 index 000000000..79133599b --- /dev/null +++ b/os_pkrvars/rhel/rhel-7-aarch64.pkrvars.hcl @@ -0,0 +1,10 @@ +os_name = "rhel" +os_version = "7.9" +os_arch = "aarch64" +iso_url = "https://www.redhat.com/en/technologies/linux-platforms/enterprise-linux" +iso_checksum = "1b8004961150b60f6c5ec3f25139d3217eee55707cf9fa19e826919fc58e328b" +parallels_guest_os_type = "rhel" +vbox_guest_os_type = "RedHat_64" +vmware_guest_os_type = "centos-64" +boot_command = ["<up><wait><tab> inst.text inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/rhel/7ks.cfg<enter><wait>"] +boot_command_hyperv = ["<wait5><up><wait5><tab> text ks=hd:fd0:/ks.cfg<enter><wait5><esc>"] diff --git a/os_pkrvars/rhel/rhel-7-x86_64.pkrvars.hcl b/os_pkrvars/rhel/rhel-7-x86_64.pkrvars.hcl new file mode 100644 index 000000000..5cf17ef6d --- /dev/null +++ b/os_pkrvars/rhel/rhel-7-x86_64.pkrvars.hcl @@ -0,0 +1,10 @@ +os_name = "rhel" +os_version = "7.9" +os_arch = "x86_64" +iso_url = "https://www.redhat.com/en/technologies/linux-platforms/enterprise-linux" +iso_checksum = "1b8004961150b60f6c5ec3f25139d3217eee55707cf9fa19e826919fc58e328b" +parallels_guest_os_type = "rhel" +vbox_guest_os_type = "RedHat_64" +vmware_guest_os_type = "centos-64" +boot_command = ["<up><wait><tab> inst.text inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/rhel/7ks.cfg<enter><wait>"] +boot_command_hyperv = ["<wait5><up><wait5><tab> text ks=hd:fd0:/ks.cfg<enter><wait5><esc>"] diff --git a/os_pkrvars/rhel/rhel-8-aarch64.pkrvars.hcl b/os_pkrvars/rhel/rhel-8-aarch64.pkrvars.hcl new file mode 100644 index 000000000..60eb62773 --- /dev/null +++ b/os_pkrvars/rhel/rhel-8-aarch64.pkrvars.hcl @@ -0,0 +1,10 @@ +os_name = "rhel" +os_version = "8.7" +os_arch = "aarch64" +iso_url = "https://www.redhat.com/en/technologies/linux-platforms/enterprise-linux" +iso_checksum = "1b8004961150b60f6c5ec3f25139d3217eee55707cf9fa19e826919fc58e328b" +parallels_guest_os_type = "rhel" +vbox_guest_os_type = "RedHat_64" +vmware_guest_os_type = "centos-64" +boot_command = ["<up><wait><tab> inst.text inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/rhel/8ks.cfg<enter><wait>"] +boot_command_hyperv = ["<wait5><up><wait5><tab> text ks=hd:fd0:/ks.cfg<enter><wait5><esc>"] diff --git a/os_pkrvars/rhel/rhel-8-x86_64.pkrvars.hcl b/os_pkrvars/rhel/rhel-8-x86_64.pkrvars.hcl new file mode 100644 index 000000000..257d0419a --- /dev/null +++ b/os_pkrvars/rhel/rhel-8-x86_64.pkrvars.hcl @@ -0,0 +1,10 @@ +os_name = "rhel" +os_version = "8.7" +os_arch = "x86_64" +iso_url = "https://www.redhat.com/en/technologies/linux-platforms/enterprise-linux" +iso_checksum = "1b8004961150b60f6c5ec3f25139d3217eee55707cf9fa19e826919fc58e328b" +parallels_guest_os_type = "rhel" +vbox_guest_os_type = "RedHat_64" +vmware_guest_os_type = "centos-64" +boot_command = ["<up><wait><tab> inst.text inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/rhel/8ks.cfg<enter><wait>"] +boot_command_hyperv = ["<wait5><up><wait5><tab> text ks=hd:fd0:/ks.cfg<enter><wait5><esc>"] diff --git a/os_pkrvars/rhel/rhel-9-aarch64.pkrvars.hcl b/os_pkrvars/rhel/rhel-9-aarch64.pkrvars.hcl new file mode 100644 index 000000000..bead13c30 --- /dev/null +++ b/os_pkrvars/rhel/rhel-9-aarch64.pkrvars.hcl @@ -0,0 +1,10 @@ +os_name = "rhel" +os_version = "9.1" +os_arch = "aarch64" +iso_url = "https://www.redhat.com/en/technologies/linux-platforms/enterprise-linux" +iso_checksum = "1b8004961150b60f6c5ec3f25139d3217eee55707cf9fa19e826919fc58e328b" +parallels_guest_os_type = "rhel" +vbox_guest_os_type = "RedHat_64" +vmware_guest_os_type = "centos-64" +boot_command = ["<up><wait><tab> inst.text inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/rhel/9ks.cfg<enter><wait>"] +boot_command_hyperv = ["<wait5><up><wait5><tab> text ks=hd:fd0:/ks.cfg<enter><wait5><esc>"] diff --git a/os_pkrvars/rhel/rhel-9-x86_64.pkrvars.hcl b/os_pkrvars/rhel/rhel-9-x86_64.pkrvars.hcl new file mode 100644 index 000000000..6f96ca240 --- /dev/null +++ b/os_pkrvars/rhel/rhel-9-x86_64.pkrvars.hcl @@ -0,0 +1,10 @@ +os_name = "rhel" +os_version = "9.1" +os_arch = "x86_64" +iso_url = "https://www.redhat.com/en/technologies/linux-platforms/enterprise-linux" +iso_checksum = "1b8004961150b60f6c5ec3f25139d3217eee55707cf9fa19e826919fc58e328b" +parallels_guest_os_type = "rhel" +vbox_guest_os_type = "RedHat_64" +vmware_guest_os_type = "centos-64" +boot_command = ["<up><wait><tab> inst.text inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/rhel/9ks.cfg<enter><wait>"] +boot_command_hyperv = ["<wait5><up><wait5><tab> text ks=hd:fd0:/ks.cfg<enter><wait5><esc>"] diff --git a/os_pkrvars/rockylinux/rockylinux-8-aarch64.pkrvars.hcl b/os_pkrvars/rockylinux/rockylinux-8-aarch64.pkrvars.hcl new file mode 100644 index 000000000..5a131590e --- /dev/null +++ b/os_pkrvars/rockylinux/rockylinux-8-aarch64.pkrvars.hcl @@ -0,0 +1,10 @@ +os_name = "rockylinux" +os_version = "8.7" +os_arch = "aarch64" +iso_url = "https://download.rockylinux.org/pub/rocky/8/isos/aarch64/Rocky-8.7-aarch64-dvd1.iso" +iso_checksum = "file:https://download.rockylinux.org/pub/rocky/8/isos/aarch64/CHECKSUM" +parallels_guest_os_type = "centos" +vbox_guest_os_type = "RedHat_64" +vmware_guest_os_type = "centos-64" +boot_command = ["<up>e<wait><down><down><end><wait> inst.text inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/rhel/8ks.cfg <leftCtrlOn>x<leftCtrlOff>"] +boot_command_hyperv = ["<wait5><up><wait5><tab> text ks=hd:fd0:/ks.cfg<enter><wait5><esc>"] diff --git a/os_pkrvars/rockylinux/rockylinux-8-x86_64.pkrvars.hcl b/os_pkrvars/rockylinux/rockylinux-8-x86_64.pkrvars.hcl new file mode 100644 index 000000000..9281d817e --- /dev/null +++ b/os_pkrvars/rockylinux/rockylinux-8-x86_64.pkrvars.hcl @@ -0,0 +1,10 @@ +os_name = "rockylinux" +os_version = "8.7" +os_arch = "x86_64" +iso_url = "http://download.rockylinux.org/pub/rocky/8.7/isos/x86_64/Rocky-8.7-x86_64-dvd1.iso" +iso_checksum = "file:https://download.rockylinux.org/pub/rocky/8.7/isos/x86_64/CHECKSUM" +parallels_guest_os_type = "centos" +vbox_guest_os_type = "RedHat_64" +vmware_guest_os_type = "centos-64" +boot_command = ["<up><wait><tab> inst.text inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/rhel/8ks.cfg<enter><wait>"] +boot_command_hyperv = ["<wait5><up><wait5><tab> text ks=hd:fd0:/ks.cfg<enter><wait5><esc>"] diff --git a/os_pkrvars/rockylinux/rockylinux-9-aarch64.pkrvars.hcl b/os_pkrvars/rockylinux/rockylinux-9-aarch64.pkrvars.hcl new file mode 100644 index 000000000..224bb8732 --- /dev/null +++ b/os_pkrvars/rockylinux/rockylinux-9-aarch64.pkrvars.hcl @@ -0,0 +1,10 @@ +os_name = "rockylinux" +os_version = "9.1" +os_arch = "aarch64" +iso_url = "https://download.rockylinux.org/pub/rocky/9/isos/aarch64/Rocky-9.1-aarch64-dvd.iso" +iso_checksum = "file:https://download.rockylinux.org/pub/rocky/9/isos/aarch64/CHECKSUM" +parallels_guest_os_type = "centos" +vbox_guest_os_type = "RedHat_64" +vmware_guest_os_type = "centos-64" +boot_command = ["<up>e<wait><down><down><end><wait> inst.text inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/rhel/9ks.cfg <leftCtrlOn>x<leftCtrlOff>"] +boot_command_hyperv = ["<wait5><up><wait5><tab> text ks=hd:fd0:/ks.cfg<enter><wait5><esc>"] diff --git a/os_pkrvars/rockylinux/rockylinux-9-x86_64.pkrvars.hcl b/os_pkrvars/rockylinux/rockylinux-9-x86_64.pkrvars.hcl new file mode 100644 index 000000000..816325fa9 --- /dev/null +++ b/os_pkrvars/rockylinux/rockylinux-9-x86_64.pkrvars.hcl @@ -0,0 +1,10 @@ +os_name = "rockylinux" +os_version = "9.1" +os_arch = "x86_64" +iso_url = "https://download.rockylinux.org/pub/rocky/9.1/isos/x86_64/Rocky-9.1-x86_64-dvd.iso" +iso_checksum = "file:https://download.rockylinux.org/pub/rocky/9.1/isos/x86_64/Rocky-9.1-x86_64-dvd.iso.CHECKSUM" +parallels_guest_os_type = "centos" +vbox_guest_os_type = "RedHat_64" +vmware_guest_os_type = "centos-64" +boot_command = ["<up><wait><tab> inst.text inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/rhel/9ks.cfg<enter><wait>"] +boot_command_hyperv = ["<wait5><up><wait5><tab> text ks=hd:fd0:/ks.cfg<enter><wait5><esc>"] diff --git a/os_pkrvars/scientificlinux/scientificlinux-7-x86_64.pkrvars.hcl b/os_pkrvars/scientificlinux/scientificlinux-7-x86_64.pkrvars.hcl new file mode 100644 index 000000000..6a018f251 --- /dev/null +++ b/os_pkrvars/scientificlinux/scientificlinux-7-x86_64.pkrvars.hcl @@ -0,0 +1,10 @@ +os_name = "scientificlinux" +os_version = "7.9" +os_arch = "x86_64" +iso_url = "http://www.gtlib.gatech.edu/pub/scientific/7.9/x86_64/iso/SL-7-DVD-x86_64.iso" +iso_checksum = "7ac643e164c4a0da0b9f33411c68368cf908e0c34254904044957a3ca7793934" +parallels_guest_os_type = "centos" +vbox_guest_os_type = "RedHat_64" +vmware_guest_os_type = "centos-64" +boot_command = ["<up><wait><tab> inst.text inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/rhel/7ks.cfg<enter><wait>"] +boot_command_hyperv = ["<wait5><up><wait5><tab> text ks=hd:fd0:/ks.cfg<enter><wait5><esc>"] diff --git a/os_pkrvars/sles/sles-12-x86_64.pkrvars.hcl b/os_pkrvars/sles/sles-12-x86_64.pkrvars.hcl new file mode 100644 index 000000000..7ba7a51cd --- /dev/null +++ b/os_pkrvars/sles/sles-12-x86_64.pkrvars.hcl @@ -0,0 +1,9 @@ +os_name = "suse" +os_version = "12.5" +os_arch = "x86_64" +iso_url = "https://updates.suse.com/SUSE/Products/SLE-SERVER/12-SP5/x86_64/iso/SLE-12-SP5-Server-DVD-x86_64-GM-DVD1.iso" +iso_checksum = "5a12561f8c2869bca4f820787971f3b92f44dce77442906115cd21c359327b9f" +parallels_guest_os_type = "suse" +vbox_guest_os_type = "SUSE_LE_64" +vmware_guest_os_type = "sles12-64" +boot_command = ["<esc><enter><wait>linux netdevice=eth0 netsetup=dhcp install=cd:/<wait> lang=en_US autoyast=http://{{ .HTTPIP }}:{{ .HTTPPort }}/sles/12-autoinst.xml<wait> textmode=1<wait><enter><wait>"] diff --git a/os_pkrvars/sles/sles-15-x86_64.pkrvars.hcl b/os_pkrvars/sles/sles-15-x86_64.pkrvars.hcl new file mode 100644 index 000000000..d0cca8245 --- /dev/null +++ b/os_pkrvars/sles/sles-15-x86_64.pkrvars.hcl @@ -0,0 +1,9 @@ +os_name = "suse" +os_version = "15.4" +os_arch = "x86_64" +iso_url = "https://updates.suse.com/SUSE/Products/SLE-Product-SLES/15-SP4/x86_64/iso/SLE-15-SP4-Online-x86_64-GM-Media1.iso" +iso_checksum = "c0ceebe14d23c6c9484a1594fc5159225292f0847f7f15046f45a83319536d0e" +parallels_guest_os_type = "suse" +vbox_guest_os_type = "SUSE_LE_64" +vmware_guest_os_type = "sles15-64" +boot_command = ["<esc><enter><wait>linux netdevice=eth0 netsetup=dhcp install=cd:/<wait> lang=en_US autoyast=http://{{ .HTTPIP }}:{{ .HTTPPort }}/sles/15-autoinst.xml<wait> textmode=1<wait><enter><wait>"] diff --git a/os_pkrvars/solaris/solaris-11-x86_64.pkrvars.hcl b/os_pkrvars/solaris/solaris-11-x86_64.pkrvars.hcl new file mode 100644 index 000000000..928103568 --- /dev/null +++ b/os_pkrvars/solaris/solaris-11-x86_64.pkrvars.hcl @@ -0,0 +1,9 @@ +os_name = "solaris" +os_version = "11.4" +os_arch = "x86_64" +iso_url = "./packer_cache/sol-11_4-ai-x86.iso" +iso_checksum = "sha256:e3a29507e583acbc0b912f371c8f328fea7cb6257d587cbc0a651477a52b0a29" +parallels_guest_os_type = "solaris" +vbox_guest_os_type = "Solaris11_64" +vmware_guest_os_type = "solaris11-64" +boot_command = ["e<wait><down><down><down><down><down><wait><end><wait><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><wait>false<wait><f10><wait><wait10><wait10><wait10><wait10><wait10><wait10><wait10><wait10><wait10><wait10><wait10><wait10><wait10><wait10><wait10><wait10><wait10><wait10>root<enter><wait><wait>solaris<enter><wait><wait><wait10>while (true); do sleep 5; test -f /a/etc/sudoers && grep -v \"vagrant\" \"/a/etc/sudoers\" 2> /dev/null<wait> && echo \"vagrant ALL=(ALL) NOPASSWD: ALL\" >> /a/etc/sudoers && break ; done &<enter><wait><enter>while (true); do grep \"You may wish to reboot\" \"/var/svc/log/application-auto-installer:default.log\" 2> /dev/null<wait> && reboot; sleep 10; done &<enter><wait>sleep 5; curl http://{{ .HTTPIP }}:{{ .HTTPPort }}/solaris/default.xml -o default.xml;<wait>curl http://{{ .HTTPIP }}:{{ .HTTPPort }}/solaris/profile.xml -o profile.xml;<wait>cp default.xml /system/volatile/ai.xml;<wait>mkdir /system/volatile/profile;<wait>cp profile.xml /system/volatile/profile/profile.xml;<wait>svcadm enable svc:/application/auto-installer:default;<wait><enter><wait10><wait><wait><enter><wait>tail -f /var/svc/log/application-auto-installer\\:default.log<enter><wait>"] diff --git a/os_pkrvars/springdalelinux/springdalelinux-7-x86_64.pkrvars.hcl b/os_pkrvars/springdalelinux/springdalelinux-7-x86_64.pkrvars.hcl new file mode 100644 index 000000000..bf2f6871a --- /dev/null +++ b/os_pkrvars/springdalelinux/springdalelinux-7-x86_64.pkrvars.hcl @@ -0,0 +1,10 @@ +os_name = "springdalelinux" +os_version = "7.9" +os_arch = "x86_64" +iso_url = "http://springdale.princeton.edu/data/springdale/7/x86_64/iso/Springdale%20Linux-7.9-x86_64-netinst.iso" +iso_checksum = "ad47807e17f796bdca35bb3ec5b65f1340d43b698ee04dcf60faecc8c6818c67" +parallels_guest_os_type = "centos" +vbox_guest_os_type = "RedHat_64" +vmware_guest_os_type = "centos-64" +boot_command = ["<up><wait><tab> inst.text inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/springdalelinux/7ks.cfg<enter><wait>"] +boot_command_hyperv = ["<wait5><up><wait5><tab> text ks=hd:fd0:/ks.cfg<enter><wait5><esc>"] diff --git a/os_pkrvars/springdalelinux/springdalelinux-8-x86_64.pkrvars.hcl b/os_pkrvars/springdalelinux/springdalelinux-8-x86_64.pkrvars.hcl new file mode 100644 index 000000000..013dcffe6 --- /dev/null +++ b/os_pkrvars/springdalelinux/springdalelinux-8-x86_64.pkrvars.hcl @@ -0,0 +1,10 @@ +os_name = "springdalelinux" +os_version = "8.7" +os_arch = "x86_64" +iso_url = "http://springdale.princeton.edu/data/springdale/8/x86_64/iso/Springdale%20Linux-8.7-x86_64-netinst.iso" +iso_checksum = "7535d3eadf5d60d12a026ccaf5f1235c660cc985bc1e8b7502a99fd0389407f8" +parallels_guest_os_type = "centos" +vbox_guest_os_type = "RedHat_64" +vmware_guest_os_type = "centos-64" +boot_command = ["<up><wait><tab> inst.text inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/springdalelinux/8ks.cfg<enter><wait>"] +boot_command_hyperv = ["<wait5><up><wait5><tab> text ks=hd:fd0:/ks.cfg<enter><wait5><esc>"] diff --git a/os_pkrvars/springdalelinux/springdalelinux-9-x86_64.pkrvars.hcl b/os_pkrvars/springdalelinux/springdalelinux-9-x86_64.pkrvars.hcl new file mode 100644 index 000000000..cbf79dcfb --- /dev/null +++ b/os_pkrvars/springdalelinux/springdalelinux-9-x86_64.pkrvars.hcl @@ -0,0 +1,10 @@ +os_name = "springdalelinux" +os_version = "9.1" +os_arch = "x86_64" +iso_url = "http://springdale.princeton.edu/data/springdale/9/x86_64/iso/Springdale%20Linux-9.1-x86_64-netinst.iso" +iso_checksum = "a282a61dfd9ac587aa635688ec3eae8ac95524094dac0355543c3c0f6df84253" +parallels_guest_os_type = "centos" +vbox_guest_os_type = "RedHat_64" +vmware_guest_os_type = "centos-64" +boot_command = ["<up><wait><tab> inst.text inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/springdalelinux/9ks.cfg<enter><wait>"] +boot_command_hyperv = ["<wait5><up><wait5><tab> text ks=hd:fd0:/ks.cfg<enter><wait5><esc>"] diff --git a/os_pkrvars/ubuntu/ubuntu-18.04-x86_64.pkrvars.hcl b/os_pkrvars/ubuntu/ubuntu-18.04-x86_64.pkrvars.hcl new file mode 100644 index 000000000..19b779e2e --- /dev/null +++ b/os_pkrvars/ubuntu/ubuntu-18.04-x86_64.pkrvars.hcl @@ -0,0 +1,11 @@ +os_name = "ubuntu" +os_version = "18.04" +os_arch = "x86_64" +iso_url = "http://cdimage.ubuntu.com/ubuntu/releases/18.04.6/release/ubuntu-18.04.6-server-amd64.iso" +iso_checksum = "f5cbb8104348f0097a8e513b10173a07dbc6684595e331cb06f93f385d0aecf6" +hyperv_generation = 2 +parallels_guest_os_type = "ubuntu" +vbox_guest_os_type = "Ubuntu_64" +vmware_guest_os_type = "ubuntu-64" +boot_command = ["<wait5><esc>", "<wait5><esc>", "<wait5><enter><wait5>", "/install/vmlinuz auto console-setup/ask_detect=false", " console-setup/layoutcode=us", " console-setup/modelcode=pc105", " debconf/frontend=noninteractive", " debian-installer=en_US.UTF-8", " fb=false", " initrd=/install/initrd.gz", " kbd-chooser/method=us", " keyboard-configuration/layout=USA", " keyboard-configuration/variant=USA", " locale=en_US.UTF-8", " netcfg/get_hostname=vagrant", " grub-installer/bootdev=/dev/sda", " noapic", " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/ubuntu/preseed.cfg", " ---", "<enter><wait>"] +boot_command_hyperv = ["<esc><wait10><esc><esc><enter><wait>set gfxpayload=1024x768<enter>linux /install/vmlinuz preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/ubuntu/preseed-hyperv.cfg debian-installer=en_US.UTF-8 auto locale=en_US.UTF-8 kbd-chooser/method=us hostname={{ .Name }} fb=false debconf/frontend=noninteractive keyboard-configuration/modelcode=SKIP keyboard-configuration/layout=USA keyboard-configuration/variant=USA console-setup/ask_detect=false <enter>initrd /install/initrd.gz<enter>boot<enter>"] diff --git a/os_pkrvars/ubuntu/ubuntu-20.04-aarch64.pkrvars.hcl b/os_pkrvars/ubuntu/ubuntu-20.04-aarch64.pkrvars.hcl new file mode 100644 index 000000000..2b7286d20 --- /dev/null +++ b/os_pkrvars/ubuntu/ubuntu-20.04-aarch64.pkrvars.hcl @@ -0,0 +1,11 @@ +os_name = "ubuntu" +os_version = "20.04" +os_arch = "aarch64" +iso_url = "http://cdimage.ubuntu.com/releases/20.04/release/ubuntu-20.04.5-live-server-arm64.iso" +iso_checksum = "sha256:e42d6373dd39173094af5c26cbf2497770426f42049f8b9ea3e60ce35bebdedf" +hyperv_generation = 2 +parallels_guest_os_type = "ubuntu" +vbox_guest_os_type = "Ubuntu_64" +vmware_guest_os_type = "ubuntu-64" +boot_command = ["<esc>linux /casper/vmlinuz quiet autoinstall ds='nocloud-net;s=http://{{.HTTPIP}}:{{.HTTPPort}}/ubuntu/'<enter>initrd /casper/initrd<enter>boot<enter>"] +boot_command_hyperv = ["<esc>linux /casper/vmlinuz quiet autoinstall ds='nocloud-net;s=http://{{.HTTPIP}}:{{.HTTPPort}}/ubuntu/'<enter>initrd /casper/initrd<enter>boot<enter>"] diff --git a/os_pkrvars/ubuntu/ubuntu-20.04-x86_64.pkrvars.hcl b/os_pkrvars/ubuntu/ubuntu-20.04-x86_64.pkrvars.hcl new file mode 100644 index 000000000..dd041c5b6 --- /dev/null +++ b/os_pkrvars/ubuntu/ubuntu-20.04-x86_64.pkrvars.hcl @@ -0,0 +1,11 @@ +os_name = "ubuntu" +os_version = "20.04" +os_arch = "x86_64" +iso_url = "https://releases.ubuntu.com/focal/ubuntu-20.04.5-live-server-amd64.iso" +iso_checksum = "sha256:5035be37a7e9abbdc09f0d257f3e33416c1a0fb322ba860d42d74aa75c3468d4" +hyperv_generation = 2 +parallels_guest_os_type = "ubuntu" +vbox_guest_os_type = "Ubuntu_64" +vmware_guest_os_type = "ubuntu-64" +boot_command = ["<wait>", "<esc><wait>", "<esc><wait>", "<f6><wait>", "<esc><wait>", "<bs><bs><bs><bs>", " autoinstall", " ds=nocloud-net;s=http://<wait5>{{.HTTPIP}}<wait5>:{{.HTTPPort}}/ubuntu/", " ---", "<enter>"] +boot_command_hyperv = ["<wait>", "<esc><wait>", "<esc><wait>", "<f6><wait>", "<esc><wait>", "<bs><bs><bs><bs>", " autoinstall", " ds=nocloud-net;s=http://<wait5>{{.HTTPIP}}<wait5>:{{.HTTPPort}}/ubuntu/", " ---", "<enter>"] diff --git a/os_pkrvars/ubuntu/ubuntu-22.04-aarch64.pkrvars.hcl b/os_pkrvars/ubuntu/ubuntu-22.04-aarch64.pkrvars.hcl new file mode 100644 index 000000000..07ffcf5d8 --- /dev/null +++ b/os_pkrvars/ubuntu/ubuntu-22.04-aarch64.pkrvars.hcl @@ -0,0 +1,11 @@ +os_name = "ubuntu" +os_version = "22.04" +os_arch = "aarch64" +iso_url = "http://cdimage.ubuntu.com/releases/22.04/release/ubuntu-22.04.1-live-server-arm64.iso" +iso_checksum = "bc5a8015651c6f8699ab262d333375d3930b824f03d14ae51e551d89d9bb571c" +hyperv_generation = 2 +parallels_guest_os_type = "ubuntu" +vbox_guest_os_type = "Ubuntu_64" +vmware_guest_os_type = "ubuntu-64" +boot_command = ["<esc>linux /casper/vmlinuz quiet autoinstall ds='nocloud-net;s=http://{{.HTTPIP}}:{{.HTTPPort}}/ubuntu/'<enter>initrd /casper/initrd<enter>boot<enter>"] +boot_command_hyperv = ["<esc>linux /casper/vmlinuz quiet autoinstall ds='nocloud-net;s=http://{{.HTTPIP}}:{{.HTTPPort}}/ubuntu/'<enter>initrd /casper/initrd<enter>boot<enter>"] diff --git a/os_pkrvars/ubuntu/ubuntu-22.04-x86_64.pkrvars.hcl b/os_pkrvars/ubuntu/ubuntu-22.04-x86_64.pkrvars.hcl new file mode 100644 index 000000000..a8a691ce6 --- /dev/null +++ b/os_pkrvars/ubuntu/ubuntu-22.04-x86_64.pkrvars.hcl @@ -0,0 +1,19 @@ +os_name = "ubuntu" +os_version = "22.04" +os_arch = "x86_64" +iso_url = "http://releases.ubuntu.com/jammy/ubuntu-22.04.1-live-server-amd64.iso" +iso_checksum = "sha256:10f19c5b2b8d6db711582e0e27f5116296c34fe4b313ba45f9b201a5007056cb" +hyperv_generation = 2 +parallels_guest_os_type = "ubuntu" +vbox_guest_os_type = "Ubuntu_64" +vmware_guest_os_type = "ubuntu-64" +boot_command = ["c<wait>set gfxpayload=keep<enter><wait>linux /casper/vmlinuz quiet autoinstall ds=nocloud-net\\;s=http://{{.HTTPIP}}:{{.HTTPPort}}/ubuntu/ ---<enter><wait>initrd /casper/initrd<wait><enter><wait>boot<enter><wait>"] +#boot_command = [ +# "e<wait>", +# "<down><down><down>", +# "<end><bs><bs><bs><bs><wait>", +# "quiet autoinstall ds=nocloud-net\\;s=http://{{ .HTTPIP }}:{{ .HTTPPort }}/ubuntu/ ---<wait>", +# "<f10><wait>" +#] +#boot_command = ["c<wait>set gfxpayload=keep<enter><wait>linux /casper/vmlinuz quiet autoinstall ds=nocloud-net;s=http://{{.HTTPIP}}:{{.HTTPPort}}/ubuntu/ ---<enter><wait>initrd /casper/initrd<wait><enter><wait>boot<enter><wait>"] +#boot_command_hyperv = ["c<wait>set gfxpayload=keep<enter><wait>linux /casper/vmlinuz quiet autoinstall ds=nocloud-net;s=http://{{.HTTPIP}}:{{.HTTPPort}}/ubuntu/ ---<enter><wait>initrd /casper/initrd<wait><enter><wait>boot<enter><wait>"] diff --git a/os_pkrvars/ubuntu/ubuntu-22.10-aarch64.pkrvars.hcl b/os_pkrvars/ubuntu/ubuntu-22.10-aarch64.pkrvars.hcl new file mode 100644 index 000000000..e545f6421 --- /dev/null +++ b/os_pkrvars/ubuntu/ubuntu-22.10-aarch64.pkrvars.hcl @@ -0,0 +1,11 @@ +os_name = "ubuntu" +os_version = "22.10" +os_arch = "aarch64" +iso_url = "https://cdimage.ubuntu.com/releases/22.10/release/ubuntu-22.10-live-server-arm64.iso" +iso_checksum = "a19d956e993a16fc6496c371e36dcc0eb85d2bdf6a8e86028b92ce62e9f585cd" +hyperv_generation = 2 +parallels_guest_os_type = "ubuntu" +vbox_guest_os_type = "Ubuntu_64" +vmware_guest_os_type = "ubuntu-64" +boot_command = ["<wait5><esc><wait><f6><wait><esc><wait> <bs><bs><bs><bs><wait> autoinstall<wait5> ds=nocloud-net<wait5>;s=http://<wait5>{{ .HTTPIP }}<wait5>:{{ .HTTPPort }}/ubuntu/<wait5> ---<wait5><enter><wait5>"] +boot_command_hyperv = ["<wait5><esc><wait><f6><wait><esc><wait> <bs><bs><bs><bs><wait> autoinstall<wait5> ds=nocloud-net<wait5>;s=http://<wait5>{{ .HTTPIP }}<wait5>:{{ .HTTPPort }}/ubuntu/<wait5> ---<wait5><enter><wait5>"] diff --git a/os_pkrvars/ubuntu/ubuntu-22.10-x86_64.pkrvars.hcl b/os_pkrvars/ubuntu/ubuntu-22.10-x86_64.pkrvars.hcl new file mode 100644 index 000000000..02baf4920 --- /dev/null +++ b/os_pkrvars/ubuntu/ubuntu-22.10-x86_64.pkrvars.hcl @@ -0,0 +1,11 @@ +os_name = "ubuntu" +os_version = "22.10" +os_arch = "x86_64" +iso_url = "http://releases.ubuntu.com/kinetic/ubuntu-22.10-live-server-amd64.iso" +iso_checksum = "874452797430a94ca240c95d8503035aa145bd03ef7d84f9b23b78f3c5099aed" +hyperv_generation = 2 +parallels_guest_os_type = "ubuntu" +vbox_guest_os_type = "Ubuntu_64" +vmware_guest_os_type = "ubuntu-64" +boot_command = ["c<wait>set gfxpayload=keep<enter><wait>linux /casper/vmlinuz quiet autoinstall ds=nocloud-net\\;s=http://{{.HTTPIP}}:{{.HTTPPort}}/ubuntu/ ---<enter><wait>initrd /casper/initrd<wait><enter><wait>boot<enter><wait>"] +boot_command_hyperv = ["c<wait>set gfxpayload=keep<enter><wait>linux /casper/vmlinuz quiet autoinstall ds=nocloud-net\\;s=http://{{.HTTPIP}}:{{.HTTPPort}}/ubuntu/ ---<enter><wait>initrd /casper/initrd<wait><enter><wait>boot<enter><wait>"] diff --git a/os_pkrvars/windows/windows-10-x86_64.pkrvars.hcl b/os_pkrvars/windows/windows-10-x86_64.pkrvars.hcl new file mode 100644 index 000000000..0036e7c10 --- /dev/null +++ b/os_pkrvars/windows/windows-10-x86_64.pkrvars.hcl @@ -0,0 +1,9 @@ +os_name = "windows" +os_version = "10" +os_arch = "x86_64" +is_windows = true +iso_url = "https://software-static.download.prss.microsoft.com/dbazure/988969d5-f34g-4e03-ac9d-1f9786c66750/19045.2006.220908-0225.22h2_release_svc_refresh_CLIENTENTERPRISEEVAL_OEMRET_x64FRE_en-us.iso" +iso_checksum = "ef7312733a9f5d7d51cfa04ac497671995674ca5e1058d5164d6028f0938d668" +parallels_guest_os_type = "win-10" +vbox_guest_os_type = "Windows10_64" +vmware_guest_os_type = "windows9srv-64" diff --git a/os_pkrvars/windows/windows-10gen2-x86_64.pkrvars.hcl b/os_pkrvars/windows/windows-10gen2-x86_64.pkrvars.hcl new file mode 100644 index 000000000..0cf64362d --- /dev/null +++ b/os_pkrvars/windows/windows-10gen2-x86_64.pkrvars.hcl @@ -0,0 +1,13 @@ +os_name = "windows" +os_version = "10gen2" +os_arch = "x86_64" +is_windows = true +iso_url = "https://software-static.download.prss.microsoft.com/dbazure/988969d5-f34g-4e03-ac9d-1f9786c66750/19045.2006.220908-0225.22h2_release_svc_refresh_CLIENTENTERPRISEEVAL_OEMRET_x64FRE_en-us.iso" +iso_checksum = "ef7312733a9f5d7d51cfa04ac497671995674ca5e1058d5164d6028f0938d668" +parallels_guest_os_type = "win-10" +vbox_guest_os_type = "Windows10_64" +vmware_guest_os_type = "windows9srv-64" +boot_command = ["aaaaaaa<wait><enter><wait><enter><wait><enter>"] +boot_command_hyperv = ["aaaaaaa"] +hyperv_generation = 2 +sources_enabled = ["source.hyperv-iso.vm", "source.qemu.vm"] diff --git a/os_pkrvars/windows/windows-11-x86_64.pkrvars.hcl b/os_pkrvars/windows/windows-11-x86_64.pkrvars.hcl new file mode 100644 index 000000000..b29a3bff6 --- /dev/null +++ b/os_pkrvars/windows/windows-11-x86_64.pkrvars.hcl @@ -0,0 +1,12 @@ +os_name = "windows" +os_version = "11" +os_arch = "x86_64" +is_windows = true +# Windows 11 source requires a prompt to select OS to install. This allows the system time to add reg keys to ignore TPM Check before the install begins. +iso_url = "https://software-download.microsoft.com/download/sg/22000.194.210913-1444.co_release_svc_refresh_CLIENTENTERPRISEEVAL_OEMRET_x64FRE_en-us.iso" +iso_checksum = "sha256:e8b1d2a1a85a09b4bf6154084a8be8e3c814894a15a7bcf3e8e63fcfa9a528cb" +parallels_guest_os_type = "win-11" +vbox_guest_os_type = "Windows11_64" +vmware_guest_os_type = "windows9srv-64" +boot_command_hyperv = ["<leftShiftOn><f10><leftShiftOff><wait>reg add HKLM\\SYSTEM\\Setup\\LabConfig /t REG_DWORD /v BypassTPMCheck /d 1<return>reg add HKLM\\SYSTEM\\Setup\\LabConfig /t REG_DWORD /v BypassSecureBootCheck /d 1<return><wait>exit<return><wait><return>"] +boot_command = ["<leftShiftOn><f10><leftShiftOff><wait>reg add HKLM\\SYSTEM\\Setup\\LabConfig /t REG_DWORD /v BypassTPMCheck /d 1<return>reg add HKLM\\SYSTEM\\Setup\\LabConfig /t REG_DWORD /v BypassSecureBootCheck /d 1<return><wait>exit<return><wait><return>"] diff --git a/os_pkrvars/windows/windows-11gen2-x86_64.pkrvars.hcl b/os_pkrvars/windows/windows-11gen2-x86_64.pkrvars.hcl new file mode 100644 index 000000000..ca44a0cac --- /dev/null +++ b/os_pkrvars/windows/windows-11gen2-x86_64.pkrvars.hcl @@ -0,0 +1,14 @@ +os_name = "windows" +os_version = "11gen2" +os_arch = "x86_64" +is_windows = true +# Windows 11 source requires a prompt to select OS to install. This allows the system time to add reg keys to ignore TPM Check before the install begins. +iso_url = "https://software-download.microsoft.com/download/sg/22000.194.210913-1444.co_release_svc_refresh_CLIENTENTERPRISEEVAL_OEMRET_x64FRE_en-us.iso" +iso_checksum = "sha256:e8b1d2a1a85a09b4bf6154084a8be8e3c814894a15a7bcf3e8e63fcfa9a528cb" +parallels_guest_os_type = "win-11" +vbox_guest_os_type = "Windows11_64" +vmware_guest_os_type = "windows9srv-64" +hyperv_generation = 2 +boot_command_hyperv = ["aaaaaaa"] +boot_command = ["aaaaaaa<wait><enter><wait><enter><wait><enter>"] +sources_enabled = ["source.hyperv-iso.vm", "source.qemu.vm"] diff --git a/os_pkrvars/windows/windows-2012r2-x86_64.pkrvars.hcl b/os_pkrvars/windows/windows-2012r2-x86_64.pkrvars.hcl new file mode 100644 index 000000000..2fab2563a --- /dev/null +++ b/os_pkrvars/windows/windows-2012r2-x86_64.pkrvars.hcl @@ -0,0 +1,9 @@ +os_name = "windows" +os_version = "2012r2" +os_arch = "x86_64" +is_windows = true +iso_url = "https://download.microsoft.com/download/6/2/A/62A76ABB-9990-4EFC-A4FE-C7D698DAEB96/9600.17050.WINBLUE_REFRESH.140317-1640_X64FRE_SERVER_EVAL_EN-US-IR3_SSS_X64FREE_EN-US_DV9.ISO" +iso_checksum = "6612b5b1f53e845aacdf96e974bb119a3d9b4dcb5b82e65804ab7e534dc7b4d5" +parallels_guest_os_type = "win-2012" +vbox_guest_os_type = "Windows2012_64" +vmware_guest_os_type = "windows9srv-64" diff --git a/os_pkrvars/windows/windows-2016-x86_64.pkrvars.hcl b/os_pkrvars/windows/windows-2016-x86_64.pkrvars.hcl new file mode 100644 index 000000000..0346a55c2 --- /dev/null +++ b/os_pkrvars/windows/windows-2016-x86_64.pkrvars.hcl @@ -0,0 +1,9 @@ +os_name = "windows" +os_version = "2016" +os_arch = "x86_64" +is_windows = true +iso_url = "https://software-static.download.prss.microsoft.com/pr/download/Windows_Server_2016_Datacenter_EVAL_en-us_14393_refresh.ISO" +iso_checksum = "1ce702a578a3cb1ac3d14873980838590f06d5b7101c5daaccbac9d73f1fb50f" +parallels_guest_os_type = "win-2016" +vbox_guest_os_type = "Windows2016_64" +vmware_guest_os_type = "windows9srv-64" diff --git a/os_pkrvars/windows/windows-2019-x86_64.pkrvars.hcl b/os_pkrvars/windows/windows-2019-x86_64.pkrvars.hcl new file mode 100644 index 000000000..04c9e3f54 --- /dev/null +++ b/os_pkrvars/windows/windows-2019-x86_64.pkrvars.hcl @@ -0,0 +1,9 @@ +os_name = "windows" +os_version = "2019" +os_arch = "x86_64" +is_windows = true +iso_url = "https://software-static.download.prss.microsoft.com/pr/download/17763.737.190906-2324.rs5_release_svc_refresh_SERVER_EVAL_x64FRE_en-us_1.iso" +iso_checksum = "549bca46c055157291be6c22a3aaaed8330e78ef4382c99ee82c896426a1cee1" +parallels_guest_os_type = "win-2019" +vbox_guest_os_type = "Windows2019_64" +vmware_guest_os_type = "windows9srv-64" diff --git a/os_pkrvars/windows/windows-2022-x86_64.pkrvars.hcl b/os_pkrvars/windows/windows-2022-x86_64.pkrvars.hcl new file mode 100644 index 000000000..6c45a4baa --- /dev/null +++ b/os_pkrvars/windows/windows-2022-x86_64.pkrvars.hcl @@ -0,0 +1,9 @@ +os_name = "windows" +os_version = "2022" +os_arch = "x86_64" +is_windows = true +iso_url = "https://software-static.download.prss.microsoft.com/sg/download/888969d5-f34g-4e03-ac9d-1f9786c66749/SERVER_EVAL_x64FRE_en-us.iso" +iso_checksum = "sha256:3e4fa6d8507b554856fc9ca6079cc402df11a8b79344871669f0251535255325" +parallels_guest_os_type = "win-2022" +vbox_guest_os_type = "Windows2022_64" +vmware_guest_os_type = "windows9srv-64" diff --git a/packer_templates/almalinux/almalinux-8.7-aarch64.json b/packer_templates/almalinux/almalinux-8.7-aarch64.json deleted file mode 100644 index 450299912..000000000 --- a/packer_templates/almalinux/almalinux-8.7-aarch64.json +++ /dev/null @@ -1,209 +0,0 @@ - { - "builders": [ - { - "boot_command": "{{ user `boot_command` }}", - "boot_wait": "5s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", - "guest_additions_url": "{{ user `guest_additions_url` }}", - "guest_os_type": "RedHat_64", - "hard_drive_interface": "sata", - "headless": "{{ user `headless` }}", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-virtualbox", - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "type": "virtualbox-iso", - "virtualbox_version_file": ".vbox_version", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": "{{ user `boot_command` }}", - "boot_wait": "5s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "centos-64", - "headless": "{{ user `headless` }}", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-vmware", - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", - "ssh_password": "vagrant", - "ssh_port": 22, - "version": 19, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "tools_upload_flavor": "linux", - "type": "vmware-iso", - "vm_name": "{{ user `template` }}", - "vmx_data": { - "cpuid.coresPerSocket": "1" - }, - "vmx_remove_ethernet_interfaces": true - }, - { - "boot_command": "{{user `boot_command`}}", - "boot_wait": "5s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "centos", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-parallels", - "parallels_tools_flavor": "lin-arm", - "prlctl_version_file": ".prlctl_version", - "prlctl": [ - [ - "set", - "{{.Name}}", - "--3d-accelerate", - "off" - ], - [ - "set", - "{{.Name}}", - "--videosize", - "16" - ] - ], - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "type": "parallels-iso", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<wait5><up><wait5><tab> text ks=hd:fd0:/ks.cfg<enter><wait5><esc>" - ], - "boot_wait": "5s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "floppy_files": [ - "{{user `http_directory`}}/{{user `ks_path`}}" - ], - "generation": "{{user `hyperv_generation`}}", - "guest_additions_mode": "disable", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-hyperv", - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "switch_name": "{{ user `hyperv_switch`}}", - "type": "hyperv-iso", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": "{{ user `boot_command` }}", - "boot_wait": "5s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "headless": "{{ user `headless` }}", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-qemu", - "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "type": "qemu", - "vm_name": "{{ user `template` }}", - "qemuargs": [ - [ "-m", "{{ user `memory` }}" ], - [ "-display", "{{ user `qemu_display` }}" ] - ] - } - ], - "post-processors": [ - { - "output": "{{ user `build_directory` }}/{{user `box_basename`}}.{{.Provider}}.box", - "type": "vagrant" - } - ], - "provisioners": [ - { - "environment_vars": [ - "HOME_DIR=/home/vagrant", - "http_proxy={{user `http_proxy`}}", - "https_proxy={{user `https_proxy`}}", - "no_proxy={{user `no_proxy`}}" - ], - "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", - "expect_disconnect": true, - "pause_after": "30s", - "scripts": [ - "{{template_dir}}/scripts/update.sh" - ], - "type": "shell" - }, - { - "environment_vars": [ - "HOME_DIR=/home/vagrant", - "http_proxy={{user `http_proxy`}}", - "https_proxy={{user `https_proxy`}}", - "no_proxy={{user `no_proxy`}}" - ], - "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", - "expect_disconnect": false, - "scripts": [ - "{{template_dir}}/../_common/motd.sh", - "{{template_dir}}/../_common/sshd.sh", - "{{template_dir}}/../_common/vagrant.sh", - "{{template_dir}}/../_common/virtualbox.sh", - "{{template_dir}}/../_common/vmware.sh", - "{{template_dir}}/../_common/parallels.sh", - "{{template_dir}}/scripts/cleanup.sh", - "{{template_dir}}/../_common/minimize.sh" - ], - "type": "shell" - } - ], - "variables": { - "box_basename": "almalinux-8.7", - "build_directory": "../../builds", - "build_timestamp": "{{isotime \"202205111847\"}}", - "cpus": "2", - "disk_size": "65536", - "git_revision": "__unknown_git_revision__", - "guest_additions_url": "", - "headless": "", - "http_directory": "{{template_dir}}/http", - "http_proxy": "{{env `http_proxy`}}", - "https_proxy": "{{env `https_proxy`}}", - "hyperv_generation": "1", - "hyperv_switch": "bento", - "iso_checksum": "c14fae79d5e26bc41e75f0a65063ab684199a7ea3a6bd0a8086e1ffd2a7afac8", - "iso_name": "AlmaLinux-8.7-aarch64-dvd.iso", - "ks_path": "8/ks.cfg", - "memory": "1024", - "mirror": "https://repo.almalinux.org/almalinux", - "mirror_directory": "8.7/isos/aarch64", - "name": "almalinux-8.7", - "no_proxy": "{{env `no_proxy`}}", - "qemu_display": "none", - "template": "almalinux-8.7-aarch64", - "boot_command": "<up><wait><tab> inst.text inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>", - "version": "TIMESTAMP" - } -} diff --git a/packer_templates/almalinux/almalinux-8.7-x86_64.json b/packer_templates/almalinux/almalinux-8.7-x86_64.json deleted file mode 100644 index 6a9a60999..000000000 --- a/packer_templates/almalinux/almalinux-8.7-x86_64.json +++ /dev/null @@ -1,196 +0,0 @@ - { - "builders": [ - { - "boot_command": "{{ user `boot_command` }}", - "boot_wait": "5s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", - "guest_additions_url": "{{ user `guest_additions_url` }}", - "guest_os_type": "RedHat_64", - "hard_drive_interface": "sata", - "headless": "{{ user `headless` }}", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-virtualbox", - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "type": "virtualbox-iso", - "virtualbox_version_file": ".vbox_version", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": "{{ user `boot_command` }}", - "boot_wait": "5s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "centos-64", - "headless": "{{ user `headless` }}", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-vmware", - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", - "ssh_password": "vagrant", - "ssh_port": 22, - "version": 19, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "tools_upload_flavor": "linux", - "type": "vmware-iso", - "vm_name": "{{ user `template` }}", - "vmx_data": { - "cpuid.coresPerSocket": "1" - }, - "vmx_remove_ethernet_interfaces": true - }, - { - "boot_command": "{{user `boot_command`}}", - "boot_wait": "5s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "centos", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-parallels", - "parallels_tools_flavor": "lin", - "prlctl_version_file": ".prlctl_version", - "prlctl": [ - [ - "set", - "{{.Name}}", - "--3d-accelerate", - "off" - ], - [ - "set", - "{{.Name}}", - "--videosize", - "16" - ] - ], - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "type": "parallels-iso", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<wait5><up><wait5><tab> text ks=hd:fd0:/ks.cfg<enter><wait5><esc>" - ], - "boot_wait": "5s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "floppy_files": [ - "{{user `http_directory`}}/{{user `ks_path`}}" - ], - "generation": "{{user `hyperv_generation`}}", - "guest_additions_mode": "disable", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-hyperv", - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "switch_name": "{{ user `hyperv_switch`}}", - "type": "hyperv-iso", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": "{{ user `boot_command` }}", - "boot_wait": "5s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "headless": "{{ user `headless` }}", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-qemu", - "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "type": "qemu", - "vm_name": "{{ user `template` }}", - "qemuargs": [ - [ "-m", "{{ user `memory` }}" ], - [ "-display", "{{ user `qemu_display` }}" ] - ] - } - ], - "post-processors": [ - { - "output": "{{ user `build_directory` }}/{{user `box_basename`}}.{{.Provider}}.box", - "type": "vagrant" - } - ], - "provisioners": [ - { - "environment_vars": [ - "HOME_DIR=/home/vagrant", - "http_proxy={{user `http_proxy`}}", - "https_proxy={{user `https_proxy`}}", - "no_proxy={{user `no_proxy`}}" - ], - "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", - "expect_disconnect": true, - "scripts": [ - "{{template_dir}}/scripts/update.sh", - "{{template_dir}}/scripts/networking.sh", - "{{template_dir}}/../_common/motd.sh", - "{{template_dir}}/../_common/sshd.sh", - "{{template_dir}}/../_common/vagrant.sh", - "{{template_dir}}/../_common/virtualbox.sh", - "{{template_dir}}/../_common/vmware.sh", - "{{template_dir}}/../_common/parallels.sh", - "{{template_dir}}/scripts/cleanup.sh", - "{{template_dir}}/../_common/minimize.sh" - ], - "type": "shell" - } - ], - "variables": { - "box_basename": "almalinux-8.7", - "build_directory": "../../builds", - "build_timestamp": "{{isotime \"202205111847\"}}", - "cpus": "2", - "disk_size": "65536", - "git_revision": "__unknown_git_revision__", - "guest_additions_url": "", - "headless": "", - "http_directory": "{{template_dir}}/http", - "http_proxy": "{{env `http_proxy`}}", - "https_proxy": "{{env `https_proxy`}}", - "hyperv_generation": "1", - "hyperv_switch": "bento", - "iso_checksum": "b95ddf9d56a849cc8eb4b95dd2321c13af637d3379b91f5d96c39e96fb4403b3", - "iso_name": "AlmaLinux-8.7-x86_64-dvd.iso", - "ks_path": "8/ks.cfg", - "memory": "1024", - "mirror": "https://repo.almalinux.org/almalinux", - "mirror_directory": "8.7/isos/x86_64", - "name": "almalinux-8.7", - "no_proxy": "{{env `no_proxy`}}", - "qemu_display": "none", - "template": "almalinux-8.7-x86_64", - "boot_command": "<up><wait><tab> inst.text inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>", - "version": "TIMESTAMP" - } -} diff --git a/packer_templates/almalinux/almalinux-9.1-aarch64.json b/packer_templates/almalinux/almalinux-9.1-aarch64.json deleted file mode 100644 index b02c347a6..000000000 --- a/packer_templates/almalinux/almalinux-9.1-aarch64.json +++ /dev/null @@ -1,209 +0,0 @@ - { - "builders": [ - { - "boot_command": "{{ user `boot_command` }}", - "boot_wait": "5s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", - "guest_additions_url": "{{ user `guest_additions_url` }}", - "guest_os_type": "RedHat_64", - "hard_drive_interface": "sata", - "headless": "{{ user `headless` }}", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-virtualbox", - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "type": "virtualbox-iso", - "virtualbox_version_file": ".vbox_version", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": "{{ user `boot_command` }}", - "boot_wait": "5s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "centos-64", - "headless": "{{ user `headless` }}", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-vmware", - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", - "ssh_password": "vagrant", - "ssh_port": 22, - "version": 19, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "tools_upload_flavor": "linux", - "type": "vmware-iso", - "vm_name": "{{ user `template` }}", - "vmx_data": { - "cpuid.coresPerSocket": "1" - }, - "vmx_remove_ethernet_interfaces": true - }, - { - "boot_command": "{{user `boot_command`}}", - "boot_wait": "5s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "centos", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-parallels", - "parallels_tools_flavor": "lin-arm", - "prlctl_version_file": ".prlctl_version", - "prlctl": [ - [ - "set", - "{{.Name}}", - "--3d-accelerate", - "off" - ], - [ - "set", - "{{.Name}}", - "--videosize", - "16" - ] - ], - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "type": "parallels-iso", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<wait5><up><wait5><tab> text ks=hd:fd0:/ks.cfg<enter><wait5><esc>" - ], - "boot_wait": "5s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "floppy_files": [ - "{{user `http_directory`}}/{{user `ks_path`}}" - ], - "generation": "{{user `hyperv_generation`}}", - "guest_additions_mode": "disable", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-hyperv", - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "switch_name": "{{ user `hyperv_switch`}}", - "type": "hyperv-iso", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": "{{ user `boot_command` }}", - "boot_wait": "5s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "headless": "{{ user `headless` }}", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-qemu", - "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "type": "qemu", - "vm_name": "{{ user `template` }}", - "qemuargs": [ - [ "-m", "{{ user `memory` }}" ], - [ "-display", "{{ user `qemu_display` }}" ] - ] - } - ], - "post-processors": [ - { - "output": "{{ user `build_directory` }}/{{user `box_basename`}}.{{.Provider}}.box", - "type": "vagrant" - } - ], - "provisioners": [ - { - "environment_vars": [ - "HOME_DIR=/home/vagrant", - "http_proxy={{user `http_proxy`}}", - "https_proxy={{user `https_proxy`}}", - "no_proxy={{user `no_proxy`}}" - ], - "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", - "expect_disconnect": true, - "pause_after": "30s", - "scripts": [ - "{{template_dir}}/scripts/update.sh" - ], - "type": "shell" - }, - { - "environment_vars": [ - "HOME_DIR=/home/vagrant", - "http_proxy={{user `http_proxy`}}", - "https_proxy={{user `https_proxy`}}", - "no_proxy={{user `no_proxy`}}" - ], - "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", - "expect_disconnect": false, - "scripts": [ - "{{template_dir}}/../_common/motd.sh", - "{{template_dir}}/../_common/sshd.sh", - "{{template_dir}}/../_common/vagrant.sh", - "{{template_dir}}/../_common/virtualbox.sh", - "{{template_dir}}/../_common/vmware.sh", - "{{template_dir}}/../_common/parallels.sh", - "{{template_dir}}/scripts/cleanup.sh", - "{{template_dir}}/../_common/minimize.sh" - ], - "type": "shell" - } - ], - "variables": { - "box_basename": "almalinux-9.1", - "build_directory": "../../builds", - "build_timestamp": "{{isotime \"202205251531\"}}", - "cpus": "2", - "disk_size": "65536", - "git_revision": "__unknown_git_revision__", - "guest_additions_url": "", - "headless": "", - "http_directory": "{{template_dir}}/http", - "http_proxy": "{{env `http_proxy`}}", - "https_proxy": "{{env `https_proxy`}}", - "hyperv_generation": "1", - "hyperv_switch": "bento", - "iso_checksum": "a6f0fb355b9c82f13a95f3f02e19b0f07906a7e0f27e3bca144338ebac9abf40", - "iso_name": "AlmaLinux-9.1-aarch64-dvd.iso", - "ks_path": "9/ks.cfg", - "memory": "1024", - "mirror": "https://mirrors.ukfast.co.uk/sites/almalinux.org", - "mirror_directory": "9.1/isos/aarch64", - "name": "almalinux-9.1", - "no_proxy": "{{env `no_proxy`}}", - "qemu_display": "none", - "template": "almalinux-9.1-aarch64", - "boot_command": "e<down><down><end><bs><bs><bs><bs><bs>inst.text inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<leftCtrlOn>x<leftCtrlOff>", - "version": "TIMESTAMP" - } -} diff --git a/packer_templates/almalinux/almalinux-9.1-x86_64.json b/packer_templates/almalinux/almalinux-9.1-x86_64.json deleted file mode 100644 index 97cd70380..000000000 --- a/packer_templates/almalinux/almalinux-9.1-x86_64.json +++ /dev/null @@ -1,195 +0,0 @@ - { - "builders": [ - { - "boot_command": "{{ user `boot_command` }}", - "boot_wait": "5s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", - "guest_additions_url": "{{ user `guest_additions_url` }}", - "guest_os_type": "RedHat_64", - "hard_drive_interface": "sata", - "headless": "{{ user `headless` }}", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-virtualbox", - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "type": "virtualbox-iso", - "virtualbox_version_file": ".vbox_version", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": "{{ user `boot_command` }}", - "boot_wait": "5s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "centos-64", - "headless": "{{ user `headless` }}", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-vmware", - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", - "ssh_password": "vagrant", - "ssh_port": 22, - "version": 19, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "tools_upload_flavor": "linux", - "type": "vmware-iso", - "vm_name": "{{ user `template` }}", - "vmx_data": { - "cpuid.coresPerSocket": "1" - }, - "vmx_remove_ethernet_interfaces": true - }, - { - "boot_command": "{{user `boot_command`}}", - "boot_wait": "5s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "centos", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-parallels", - "parallels_tools_flavor": "lin", - "prlctl_version_file": ".prlctl_version", - "prlctl": [ - [ - "set", - "{{.Name}}", - "--3d-accelerate", - "off" - ], - [ - "set", - "{{.Name}}", - "--videosize", - "16" - ] - ], - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "type": "parallels-iso", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<wait5><up><wait5><tab> text ks=hd:fd0:/ks.cfg<enter><wait5><esc>" - ], - "boot_wait": "5s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "floppy_files": [ - "{{user `http_directory`}}/{{user `ks_path`}}" - ], - "generation": "{{user `hyperv_generation`}}", - "guest_additions_mode": "disable", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-hyperv", - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "switch_name": "{{ user `hyperv_switch`}}", - "type": "hyperv-iso", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": "{{ user `boot_command` }}", - "boot_wait": "5s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "headless": "{{ user `headless` }}", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-qemu", - "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "type": "qemu", - "vm_name": "{{ user `template` }}", - "qemuargs": [ - [ "-m", "{{ user `memory` }}" ], - [ "-display", "{{ user `qemu_display` }}" ] - ] - } - ], - "post-processors": [ - { - "output": "{{ user `build_directory` }}/{{user `box_basename`}}.{{.Provider}}.box", - "type": "vagrant" - } - ], - "provisioners": [ - { - "environment_vars": [ - "HOME_DIR=/home/vagrant", - "http_proxy={{user `http_proxy`}}", - "https_proxy={{user `https_proxy`}}", - "no_proxy={{user `no_proxy`}}" - ], - "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", - "expect_disconnect": true, - "scripts": [ - "{{template_dir}}/scripts/update.sh", - "{{template_dir}}/../_common/motd.sh", - "{{template_dir}}/../_common/sshd.sh", - "{{template_dir}}/../_common/vagrant.sh", - "{{template_dir}}/../_common/virtualbox.sh", - "{{template_dir}}/../_common/vmware.sh", - "{{template_dir}}/../_common/parallels.sh", - "{{template_dir}}/scripts/cleanup.sh", - "{{template_dir}}/../_common/minimize.sh" - ], - "type": "shell" - } - ], - "variables": { - "box_basename": "almalinux-9.1", - "build_directory": "../../builds", - "build_timestamp": "{{isotime \"202205251531\"}}", - "cpus": "2", - "disk_size": "65536", - "git_revision": "__unknown_git_revision__", - "guest_additions_url": "", - "headless": "", - "http_directory": "{{template_dir}}/http", - "http_proxy": "{{env `http_proxy`}}", - "https_proxy": "{{env `https_proxy`}}", - "hyperv_generation": "1", - "hyperv_switch": "bento", - "iso_checksum": "2a44e3f8a012c132da19b9aae2bf949e20b116f0a2a7ac3eca111972f4ac952f", - "iso_name": "AlmaLinux-9.1-x86_64-dvd.iso", - "ks_path": "9/ks.cfg", - "memory": "1024", - "mirror": "https://repo.almalinux.org/almalinux", - "mirror_directory": "9.1/isos/x86_64", - "name": "almalinux-9.1", - "no_proxy": "{{env `no_proxy`}}", - "qemu_display": "none", - "template": "almalinux-9.1-x86_64", - "boot_command": "<up><wait><tab> inst.text inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>", - "version": "TIMESTAMP" - } -} diff --git a/packer_templates/almalinux/scripts/networking.sh b/packer_templates/almalinux/scripts/networking.sh deleted file mode 100644 index 087eca742..000000000 --- a/packer_templates/almalinux/scripts/networking.sh +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/sh -eux - -case "$PACKER_BUILDER_TYPE" in - -virtualbox-iso|virtualbox-ovf) - # Fix slow DNS: - # Add 'single-request-reopen' so it is included when /etc/resolv.conf is - # generated - # https://access.redhat.com/site/solutions/58625 (subscription required) - - echo 'RES_OPTIONS="single-request-reopen"' >>/etc/sysconfig/network; - - nmcli networking off - sleep 5 - nmcli networking on - - echo 'Slow DNS fix applied (single-request-reopen)'; - ;; - -esac diff --git a/packer_templates/almalinux/scripts/update.sh b/packer_templates/almalinux/scripts/update.sh deleted file mode 100644 index 7025bf2b5..000000000 --- a/packer_templates/almalinux/scripts/update.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/sh -eux - -# determine the major EL version we're runninng -major_version="`sed 's/^.\+ release \([.0-9]\+\).*/\1/' /etc/redhat-release | awk -F. '{print $1}'`"; - -# update all packages -dnf -y update - -reboot; -sleep 60; diff --git a/packer_templates/amazonlinux/STEP1_build_ovf.sh b/packer_templates/amazonlinux/STEP1_build_ovf.sh deleted file mode 100755 index 35c24edc2..000000000 --- a/packer_templates/amazonlinux/STEP1_build_ovf.sh +++ /dev/null @@ -1,48 +0,0 @@ -#!/bin/bash - -if [ ! -f amazon.vdi ]; then - echo There must be a file named amazon.vdi in this directory! - echo You can download the vdi file at https://cdn.amazonlinux.com/os-images/latest/virtualbox/ - exit 1 -fi - -echo "Cleaning up old files" -rm seed.iso -rm amazon2.ovf -rm *.vmdk - -echo "Creating ISO" -hdiutil makehybrid -o seed.iso -hfs -joliet -iso -default-volume-name cidata seed_iso - -VM="AmazonLinuxBento" -echo Powering off and deleting any existing VMs named $VM -VBoxManage controlvm $VM poweroff --type gui 2> /dev/null -vboxmanage unregistervm $VM 2> /dev/null -sleep 5 - -echo "Creating the VM" -# from https://www.perkin.org.uk/posts/create-virtualbox-vm-from-the-command-line.html -VBoxManage createvm --name $VM --ostype "RedHat_64" --register -VBoxManage storagectl $VM --name "SATA Controller" --add sata --controller IntelAHCI -VBoxManage storageattach $VM --storagectl "SATA Controller" --port 0 --device 0 --type hdd --medium amazon.vdi -VBoxManage storagectl $VM --name "IDE Controller" --add ide -VBoxManage storageattach $VM --storagectl "IDE Controller" --port 0 --device 0 --type dvddrive --medium seed.iso -VBoxManage modifyvm $VM --memory 1024 -VBoxManage modifyvm $VM --cpus 2 -VBoxManage modifyvm $VM --audio none -VBoxManage modifyvm $VM --ioapic on -sleep 5 - -echo Sleeping for 200 seconds to let the system boot and cloud-init to run -VBoxManage startvm $VM --type gui -sleep 200 -VBoxManage controlvm $VM poweroff --type gui -VBoxManage storageattach $VM --storagectl "IDE Controller" --port 0 --device 0 --type dvddrive --medium none -sleep 5 - -echo Exporting the VM to an OVF file -vboxmanage export $VM -o amazon2.ovf -sleep 5 - -echo Deleting the VM -vboxmanage unregistervm $VM diff --git a/packer_templates/amazonlinux/amazon-2-x86_64.json b/packer_templates/amazonlinux/amazon-2-x86_64.json deleted file mode 100644 index 68f09324c..000000000 --- a/packer_templates/amazonlinux/amazon-2-x86_64.json +++ /dev/null @@ -1,78 +0,0 @@ -{ - "builders": [ - { - "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", - "headless": "{{ user `headless` }}", - "http_directory": "{{user `http_directory`}}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-virtualbox", - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", - "source_path": "{{template_dir}}/amazon2.ovf", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "type": "virtualbox-ovf", - "vboxmanage": [ - [ - "modifyvm", - "{{.Name}}", - "--memory", - "{{ user `memory` }}" - ], - [ - "modifyvm", - "{{.Name}}", - "--cpus", - "{{ user `cpus` }}" - ] - ], - "virtualbox_version_file": ".vbox_version", - "vm_name": "{{ user `template` }}" - } - ], - "post-processors": [ - { - "output": "{{ user `build_directory` }}/{{user `box_basename`}}.{{.Provider}}.box", - "type": "vagrant" - } - ], - "provisioners": [ - { - "environment_vars": [ - "HOME_DIR=/home/vagrant", - "http_proxy={{user `http_proxy`}}", - "https_proxy={{user `https_proxy`}}", - "no_proxy={{user `no_proxy`}}" - ], - "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", - "expect_disconnect": true, - "scripts": [ - "{{template_dir}}/scripts/update.sh", - "{{template_dir}}/../_common/motd.sh", - "{{template_dir}}/../_common/sshd.sh", - "{{template_dir}}/scripts/networking.sh", - "{{template_dir}}/../_common/vagrant.sh", - "{{template_dir}}/../_common/virtualbox.sh", - "{{template_dir}}/scripts/cleanup.sh", - "{{template_dir}}/../_common/minimize.sh" - ], - "type": "shell" - } - ], - "variables": { - "box_basename": "amazon-2", - "build_directory": "../../builds", - "build_timestamp": "{{isotime \"20060102150405\"}}", - "cpus": "2", - "disk_size": "65536", - "git_revision": "__unknown_git_revision__", - "headless": "", - "http_proxy": "{{env `http_proxy`}}", - "https_proxy": "{{env `https_proxy`}}", - "memory": "1024", - "name": "amazon-2", - "no_proxy": "{{env `no_proxy`}}", - "template": "amazon-2-x86_64", - "version": "TIMESTAMP" - } -} diff --git a/packer_templates/amazonlinux/scripts/cleanup.sh b/packer_templates/amazonlinux/scripts/cleanup.sh deleted file mode 100644 index 338c1617a..000000000 --- a/packer_templates/amazonlinux/scripts/cleanup.sh +++ /dev/null @@ -1,47 +0,0 @@ -#!/bin/sh -eux - -echo "reduce the grub menu time to 1 second" - sed -i -e 's/^GRUB_TIMEOUT=[0-9]\+$/GRUB_TIMEOUT=1/' /etc/default/grub - grub2-mkconfig -o /boot/grub2/grub.cfg - -echo "Remove development and kernel source packages" -yum -y remove gcc cpp gc kernel-devel kernel-headers glibc-devel elfutils-libelf-devel glibc-headers kernel-devel kernel-headers - -echo "Remove previous kernels that preserved for rollbacks" -if ! command -v package-cleanup >/dev/null 2>&1; then - yum -y install yum-utils -fi -package-cleanup --oldkernels --count=1 -y - -echo "clean all package cache information" -yum -y clean all --enablerepo=\*; - -# Clean up network interface persistence -rm -f /etc/udev/rules.d/70-persistent-net.rules; -mkdir -p /etc/udev/rules.d/70-persistent-net.rules; -rm -f /lib/udev/rules.d/75-persistent-net-generator.rules; -rm -rf /dev/.udev/; - -for ndev in `ls -1 /etc/sysconfig/network-scripts/ifcfg-*`; do - if [ "`basename $ndev`" != "ifcfg-lo" ]; then - sed -i '/^HWADDR/d' "$ndev"; - sed -i '/^UUID/d' "$ndev"; - fi -done - - -echo "truncate any logs that have built up during the install" -find /var/log -type f -exec truncate --size=0 {} \; - -echo "remove the contents of /tmp and /var/tmp" -rm -rf /tmp/* /var/tmp/* - -echo "Force a new random seed to be generated" -rm -f /var/lib/systemd/random-seed - -echo "Wipe netplan machine-id (DUID) so machines get unique ID generated on boot" -truncate -s 0 /etc/machine-id - -echo "Clear the history so our install commands aren't there" -rm -f /root/.wget-hsts -export HISTSIZE=0 \ No newline at end of file diff --git a/packer_templates/amz_seed_iso/README.md b/packer_templates/amz_seed_iso/README.md new file mode 100644 index 000000000..8ffadfe42 --- /dev/null +++ b/packer_templates/amz_seed_iso/README.md @@ -0,0 +1 @@ +# Used by Amazon Linux script to convert vdi to packer/vagrant ready ovf diff --git a/packer_templates/amazonlinux/seed_iso/meta-data b/packer_templates/amz_seed_iso/meta-data similarity index 100% rename from packer_templates/amazonlinux/seed_iso/meta-data rename to packer_templates/amz_seed_iso/meta-data diff --git a/packer_templates/amazonlinux/seed_iso/user-data b/packer_templates/amz_seed_iso/user-data similarity index 100% rename from packer_templates/amazonlinux/seed_iso/user-data rename to packer_templates/amz_seed_iso/user-data diff --git a/packer_templates/amz_working_files/README.md b/packer_templates/amz_working_files/README.md new file mode 100644 index 000000000..5142457a4 --- /dev/null +++ b/packer_templates/amz_working_files/README.md @@ -0,0 +1 @@ +# Used to store temp Amazon Linux files for packer build diff --git a/packer_templates/centos/centos-7.9-x86_64.json b/packer_templates/centos/centos-7.9-x86_64.json deleted file mode 100644 index eed9b6af3..000000000 --- a/packer_templates/centos/centos-7.9-x86_64.json +++ /dev/null @@ -1,203 +0,0 @@ -{ - "builders": [ - { - "boot_command": [ - "<up><wait><tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" - ], - "boot_wait": "5s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", - "guest_additions_url": "{{ user `guest_additions_url` }}", - "guest_os_type": "RedHat_64", - "hard_drive_interface": "sata", - "headless": "{{ user `headless` }}", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-virtualbox", - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "type": "virtualbox-iso", - "virtualbox_version_file": ".vbox_version", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<up><wait><tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" - ], - "boot_wait": "5s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "centos-64", - "headless": "{{ user `headless` }}", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-vmware", - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", - "ssh_password": "vagrant", - "ssh_port": 22, - "version": 19, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "tools_upload_flavor": "linux", - "type": "vmware-iso", - "vm_name": "{{ user `template` }}", - "vmx_data": { - "cpuid.coresPerSocket": "1" - }, - "vmx_remove_ethernet_interfaces": true - }, - { - "boot_command": [ - "<up><wait><tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" - ], - "boot_wait": "5s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "centos", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-parallels", - "parallels_tools_flavor": "lin", - "prlctl_version_file": ".prlctl_version", - "prlctl": [ - [ - "set", - "{{.Name}}", - "--3d-accelerate", - "off" - ], - [ - "set", - "{{.Name}}", - "--videosize", - "16" - ] - ], - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "type": "parallels-iso", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<wait5><tab> text ks=hd:fd0:/ks.cfg<enter><wait5><esc>" - ], - "boot_wait": "5s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "floppy_files": [ - "{{user `http_directory`}}/{{user `ks_path`}}" - ], - "generation": "{{user `hyperv_generation`}}", - "guest_additions_mode": "disable", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-hyperv", - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "switch_name": "{{ user `hyperv_switch`}}", - "type": "hyperv-iso", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<up><wait><tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" - ], - "boot_wait": "5s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "headless": "{{ user `headless` }}", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-qemu", - "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "type": "qemu", - "vm_name": "{{ user `template` }}", - "qemuargs": [ - [ "-m", "{{ user `memory` }}" ], - [ "-display", "{{ user `qemu_display` }}" ] - ] - } - ], - "post-processors": [ - { - "output": "{{ user `build_directory` }}/{{user `box_basename`}}.{{.Provider}}.box", - "type": "vagrant" - } - ], - "provisioners": [ - { - "environment_vars": [ - "HOME_DIR=/home/vagrant", - "http_proxy={{user `http_proxy`}}", - "https_proxy={{user `https_proxy`}}", - "no_proxy={{user `no_proxy`}}" - ], - "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", - "expect_disconnect": true, - "scripts": [ - "{{template_dir}}/scripts/update.sh", - "{{template_dir}}/../_common/motd.sh", - "{{template_dir}}/../_common/sshd.sh", - "{{template_dir}}/scripts/networking.sh", - "{{template_dir}}/../_common/vagrant.sh", - "{{template_dir}}/../_common/virtualbox.sh", - "{{template_dir}}/../_common/vmware.sh", - "{{template_dir}}/../_common/parallels.sh", - "{{template_dir}}/scripts/cleanup.sh", - "{{template_dir}}/../_common/minimize.sh" - ], - "type": "shell" - } - ], - "variables": { - "box_basename": "centos-7.9", - "build_directory": "../../builds", - "build_timestamp": "{{isotime \"20060102150405\"}}", - "cpus": "2", - "disk_size": "65536", - "git_revision": "__unknown_git_revision__", - "guest_additions_url": "", - "headless": "", - "http_directory": "{{template_dir}}/http", - "http_proxy": "{{env `http_proxy`}}", - "https_proxy": "{{env `https_proxy`}}", - "hyperv_generation": "1", - "hyperv_switch": "bento", - "iso_checksum": "07b94e6b1a0b0260b94c83d6bb76b26bf7a310dc78d7a9c7432809fb9bc6194a", - "iso_name": "CentOS-7-x86_64-Minimal-2009.iso", - "ks_path": "7/ks.cfg", - "memory": "1024", - "mirror": "http://mirrors.kernel.org/centos", - "mirror_directory": "7.9.2009/isos/x86_64", - "name": "centos-7.9", - "no_proxy": "{{env `no_proxy`}}", - "qemu_display": "none", - "template": "centos-7.9-x86_64", - "version": "TIMESTAMP" - } -} diff --git a/packer_templates/centos/centos-stream-8-x86_64.json b/packer_templates/centos/centos-stream-8-x86_64.json deleted file mode 100644 index 5c5bec360..000000000 --- a/packer_templates/centos/centos-stream-8-x86_64.json +++ /dev/null @@ -1,196 +0,0 @@ -{ - "builders": [ - { - "boot_command": "{{ user `boot_command` }}", - "boot_wait": "5s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", - "guest_additions_url": "{{ user `guest_additions_url` }}", - "guest_os_type": "RedHat_64", - "hard_drive_interface": "sata", - "headless": "{{ user `headless` }}", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-virtualbox", - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "type": "virtualbox-iso", - "virtualbox_version_file": ".vbox_version", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": "{{ user `boot_command` }}", - "boot_wait": "5s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "centos-64", - "headless": "{{ user `headless` }}", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-vmware", - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", - "ssh_password": "vagrant", - "ssh_port": 22, - "version": 19, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "tools_upload_flavor": "linux", - "type": "vmware-iso", - "vm_name": "{{ user `template` }}", - "vmx_data": { - "cpuid.coresPerSocket": "1" - }, - "vmx_remove_ethernet_interfaces": true - }, - { - "boot_command": "{{user `boot_command`}}", - "boot_wait": "5s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "centos", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-parallels", - "parallels_tools_flavor": "lin", - "prlctl_version_file": ".prlctl_version", - "prlctl": [ - [ - "set", - "{{.Name}}", - "--3d-accelerate", - "off" - ], - [ - "set", - "{{.Name}}", - "--videosize", - "16" - ] - ], - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "type": "parallels-iso", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<wait5><up><wait5><tab> text ks=hd:fd0:/ks.cfg<enter><wait5><esc>" - ], - "boot_wait": "5s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "floppy_files": [ - "{{user `http_directory`}}/{{user `ks_path`}}" - ], - "generation": "{{user `hyperv_generation`}}", - "guest_additions_mode": "disable", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-hyperv", - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "switch_name": "{{ user `hyperv_switch`}}", - "type": "hyperv-iso", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": "{{ user `boot_command` }}", - "boot_wait": "5s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "headless": "{{ user `headless` }}", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-qemu", - "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "type": "qemu", - "vm_name": "{{ user `template` }}", - "qemuargs": [ - [ "-m", "{{ user `memory` }}" ], - [ "-display", "{{ user `qemu_display` }}" ] - ] - } - ], - "post-processors": [ - { - "output": "{{ user `build_directory` }}/{{user `box_basename`}}.{{.Provider}}.box", - "type": "vagrant" - } - ], - "provisioners": [ - { - "environment_vars": [ - "HOME_DIR=/home/vagrant", - "http_proxy={{user `http_proxy`}}", - "https_proxy={{user `https_proxy`}}", - "no_proxy={{user `no_proxy`}}" - ], - "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", - "expect_disconnect": true, - "scripts": [ - "{{template_dir}}/scripts/update.sh", - "{{template_dir}}/../_common/motd.sh", - "{{template_dir}}/../_common/sshd.sh", - "{{template_dir}}/scripts/networking.sh", - "{{template_dir}}/../_common/vagrant.sh", - "{{template_dir}}/../_common/virtualbox.sh", - "{{template_dir}}/../_common/vmware.sh", - "{{template_dir}}/../_common/parallels.sh", - "{{template_dir}}/scripts/cleanup.sh", - "{{template_dir}}/../_common/minimize.sh" - ], - "type": "shell" - } - ], - "variables": { - "box_basename": "centos-stream-8", - "build_directory": "../../builds", - "build_timestamp": "{{isotime \"2019102650405\"}}", - "cpus": "2", - "disk_size": "65536", - "git_revision": "__unknown_git_revision__", - "guest_additions_url": "", - "headless": "", - "http_directory": "{{template_dir}}/http", - "http_proxy": "{{env `http_proxy`}}", - "https_proxy": "{{env `https_proxy`}}", - "hyperv_generation": "1", - "hyperv_switch": "bento", - "iso_checksum": "file:https://mirrors.edge.kernel.org/centos/8-stream/isos/x86_64/CHECKSUM", - "iso_name": "CentOS-Stream-8-x86_64-latest-dvd1.iso", - "ks_path": "8-stream/ks.cfg", - "memory": "1024", - "mirror": "http://mirrors.kernel.org/centos", - "mirror_directory": "8-stream/isos/x86_64", - "name": "centos-stream-8", - "no_proxy": "{{env `no_proxy`}}", - "qemu_display": "none", - "template": "centos-stream-8-x86_64", - "boot_command": "<up><wait><tab> inst.text inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>", - "version": "TIMESTAMP" - } -} diff --git a/packer_templates/centos/centos-stream-9-x86_64.json b/packer_templates/centos/centos-stream-9-x86_64.json deleted file mode 100644 index 8b1c9e9b1..000000000 --- a/packer_templates/centos/centos-stream-9-x86_64.json +++ /dev/null @@ -1,199 +0,0 @@ -{ - "builders": [ - { - "boot_command": "{{ user `boot_command` }}", - "boot_wait": "5s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", - "guest_additions_url": "{{ user `guest_additions_url` }}", - "guest_os_type": "RedHat_64", - "hard_drive_interface": "sata", - "headless": "{{ user `headless` }}", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-virtualbox", - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "type": "virtualbox-iso", - "virtualbox_version_file": ".vbox_version", - "vm_name": "{{ user `template` }}", - "vboxmanage": [ - ["modifyvm", "{{.Name}}", "--nat-localhostreachable1", "on"] - ] - }, - { - "boot_command": "{{ user `boot_command` }}", - "boot_wait": "5s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "centos-64", - "headless": "{{ user `headless` }}", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-vmware", - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", - "ssh_password": "vagrant", - "ssh_port": 22, - "version": 19, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "tools_upload_flavor": "linux", - "type": "vmware-iso", - "vm_name": "{{ user `template` }}", - "vmx_data": { - "cpuid.coresPerSocket": "1" - }, - "vmx_remove_ethernet_interfaces": true - }, - { - "boot_command": "{{user `boot_command`}}", - "boot_wait": "5s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "centos", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-parallels", - "parallels_tools_flavor": "lin", - "prlctl_version_file": ".prlctl_version", - "prlctl": [ - [ - "set", - "{{.Name}}", - "--3d-accelerate", - "off" - ], - [ - "set", - "{{.Name}}", - "--videosize", - "16" - ] - ], - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "type": "parallels-iso", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<wait5><up><wait5><tab> text ks=hd:fd0:/ks.cfg<enter><wait5><esc>" - ], - "boot_wait": "5s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "floppy_files": [ - "{{user `http_directory`}}/{{user `ks_path`}}" - ], - "generation": "{{user `hyperv_generation`}}", - "guest_additions_mode": "disable", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-hyperv", - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "switch_name": "{{ user `hyperv_switch`}}", - "type": "hyperv-iso", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": "{{ user `boot_command` }}", - "boot_wait": "5s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "headless": "{{ user `headless` }}", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-qemu", - "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "type": "qemu", - "vm_name": "{{ user `template` }}", - "qemuargs": [ - [ "-m", "{{ user `memory` }}" ], - [ "-display", "{{ user `qemu_display` }}" ] - ] - } - ], - "post-processors": [ - { - "output": "{{ user `build_directory` }}/{{user `box_basename`}}.{{.Provider}}.box", - "type": "vagrant" - } - ], - "provisioners": [ - { - "environment_vars": [ - "HOME_DIR=/home/vagrant", - "http_proxy={{user `http_proxy`}}", - "https_proxy={{user `https_proxy`}}", - "no_proxy={{user `no_proxy`}}" - ], - "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", - "expect_disconnect": true, - "scripts": [ - "{{template_dir}}/scripts/update.sh", - "{{template_dir}}/../_common/motd.sh", - "{{template_dir}}/../_common/sshd.sh", - "{{template_dir}}/scripts/networking.sh", - "{{template_dir}}/../_common/vagrant.sh", - "{{template_dir}}/../_common/virtualbox.sh", - "{{template_dir}}/../_common/vmware.sh", - "{{template_dir}}/../_common/parallels.sh", - "{{template_dir}}/scripts/cleanup.sh", - "{{template_dir}}/../_common/minimize.sh" - ], - "type": "shell" - } - ], - "variables": { - "box_basename": "centos-stream-9", - "build_directory": "../../builds", - "build_timestamp": "{{isotime \"2019102650405\"}}", - "cpus": "2", - "disk_size": "65536", - "git_revision": "__unknown_git_revision__", - "guest_additions_url": "", - "headless": "", - "http_directory": "{{template_dir}}/http", - "http_proxy": "{{env `http_proxy`}}", - "https_proxy": "{{env `https_proxy`}}", - "hyperv_generation": "1", - "hyperv_switch": "bento", - "iso_checksum": "file:http://mirror.stream.centos.org/9-stream/BaseOS/x86_64/iso/CentOS-Stream-9-latest-x86_64-dvd1.iso.SHA256SUM", - "iso_name": "CentOS-Stream-9-latest-x86_64-dvd1.iso", - "ks_path": "9-stream/ks.cfg", - "memory": "1024", - "mirror": "https://mirrors.ocf.berkeley.edu/centos-stream", - "mirror_directory": "9-stream/BaseOS/x86_64/iso", - "name": "centos-stream-9", - "no_proxy": "{{env `no_proxy`}}", - "qemu_display": "none", - "template": "centos-stream-9-x86_64", - "boot_command": "<up><wait><tab> inst.text inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>", - "version": "TIMESTAMP" - } -} diff --git a/packer_templates/centos/http/6/ks.cfg b/packer_templates/centos/http/6/ks.cfg deleted file mode 100644 index 60810ebaa..000000000 --- a/packer_templates/centos/http/6/ks.cfg +++ /dev/null @@ -1,57 +0,0 @@ -install -cdrom -lang en_US.UTF-8 -keyboard us -network --bootproto=dhcp --onboot=on --device=eth0 -rootpw --plaintext vagrant -firewall --disabled -selinux --permissive -timezone UTC -unsupported_hardware -bootloader --timeout=1 --location=mbr --append="net.ifnames=0 biosdevname=0" -text -skipx -zerombr -clearpart --all --initlabel -autopart -auth --enableshadow --passalgo=sha512 --kickstart -firstboot --disabled -reboot --eject -user --name=vagrant --plaintext --password vagrant -key --skip - -%packages --nobase --ignoremissing --excludedocs --instLangs=en_US.utf8 -# vagrant needs this to copy initial files via scp -openssh-clients -sudo -wget -nfs-utils -virt-what -rsync --fprintd-pam --intltool - -# unnecessary firmware --*firmware --microcode_ctl - -%post -# Force to set SELinux to a permissive mode -sed -i -e 's/\(^SELINUX=\).*$/\1permissive/' /etc/selinux/config -# sudo -echo 'Defaults:vagrant !requiretty' > /etc/sudoers.d/vagrant -echo '%vagrant ALL=(ALL) NOPASSWD: ALL' >> /etc/sudoers.d/vagrant -chmod 440 /etc/sudoers.d/vagrant - -# update the repos to point to the archive -sed -i '/mirrorlist/d' /etc/yum.repos.d/*.repo -sed -i -e 's/#baseurl/baseurl/g' /etc/yum.repos.d/*.repo -sed -i -e 's/mirror.centos.org\/centos\/\$releasever/vault.centos.org\/6.10/g' /etc/yum.repos.d/*.repo - -# Enable hyper-v daemons only if using hyper-v virtualization -if [ $(virt-what) == "hyperv" ]; then - ifup eth0 - yum -y install hyperv-daemons - chkconfig hypervvssd on - chkconfig hypervkvpd on -fi \ No newline at end of file diff --git a/packer_templates/centos/http/8-stream/ks.cfg b/packer_templates/centos/http/8-stream/ks.cfg deleted file mode 100644 index 1f6233b99..000000000 --- a/packer_templates/centos/http/8-stream/ks.cfg +++ /dev/null @@ -1,76 +0,0 @@ -cdrom -lang en_US.UTF-8 -keyboard us -network --bootproto=dhcp --noipv6 --onboot=on --device=eth0 -rootpw --plaintext vagrant -firewall --disabled -selinux --permissive -timezone UTC -bootloader --timeout=1 --location=mbr --append="net.ifnames=0 biosdevname=0" -text -skipx -zerombr -clearpart --all --initlabel -autopart --nohome --nolvm --noboot -firstboot --disabled -reboot --eject -user --name=vagrant --plaintext --password vagrant - -%packages --ignoremissing --excludedocs --instLangs=en_US.utf8 -# vagrant needs this to copy initial files via scp -openssh-clients -sudo -selinux-policy-devel -wget -nfs-utils -net-tools -tar -bzip2 -deltarpm -rsync -dnf-utils -redhat-lsb-core -elfutils-libelf-devel -network-scripts --fprintd-pam --intltool --iwl*-firmware --microcode_ctl -%end - -%post -# sudo -echo 'Defaults:vagrant !requiretty' > /etc/sudoers.d/vagrant -echo '%vagrant ALL=(ALL) NOPASSWD: ALL' >> /etc/sudoers.d/vagrant -chmod 440 /etc/sudoers.d/vagrant - -# Enable hyper-v daemons only if using hyper-v virtualization -if [ $(virt-what) == "hyperv" ]; then - dnf -y install hyperv-daemons cifs-utils - systemctl enable hypervvssd - systemctl enable hypervkvpd -fi - -# Since we disable consistent network naming, we need to make sure the eth0 -# configuration file is in place so it will come up. -# Delete other network configuration first because RHEL/C7 networking will not -# restart successfully if there are configuration files for devices that do not -# exist. -rm -f /etc/sysconfig/network-scripts/ifcfg-e* -cat > /etc/sysconfig/network-scripts/ifcfg-eth0 << _EOF_ -TYPE=Ethernet -PROXY_METHOD=none -BROWSER_ONLY=no -BOOTPROTO=dhcp -DEFROUTE=yes -IPV4_FAILURE_FATAL=no -IPV6INIT=yes -IPV6_AUTOCONF=yes -IPV6_DEFROUTE=yes -IPV6_FAILURE_FATAL=no -IPV6_ADDR_GEN_MODE=stable-privacy -NAME=eth0 -DEVICE=eth0 -ONBOOT=yes -_EOF_ -%end diff --git a/packer_templates/centos/http/8/ks.cfg b/packer_templates/centos/http/8/ks.cfg deleted file mode 100644 index 595f4950f..000000000 --- a/packer_templates/centos/http/8/ks.cfg +++ /dev/null @@ -1,77 +0,0 @@ -install -cdrom -lang en_US.UTF-8 -keyboard us -network --bootproto=dhcp --noipv6 --onboot=on --device=eth0 -rootpw --plaintext vagrant -firewall --disabled -selinux --permissive -timezone UTC -bootloader --timeout=1 --location=mbr --append="net.ifnames=0 biosdevname=0" -text -skipx -zerombr -clearpart --all --initlabel -autopart --nohome --nolvm --noboot -firstboot --disabled -reboot --eject -user --name=vagrant --plaintext --password vagrant - -%packages --ignoremissing --excludedocs --instLangs=en_US.utf8 -# vagrant needs this to copy initial files via scp -openssh-clients -sudo -selinux-policy-devel -wget -nfs-utils -net-tools -tar -bzip2 -deltarpm -rsync -dnf-utils -redhat-lsb-core -elfutils-libelf-devel -network-scripts --fprintd-pam --intltool --iwl*-firmware --microcode_ctl -%end - -%post -# sudo -echo 'Defaults:vagrant !requiretty' > /etc/sudoers.d/vagrant -echo '%vagrant ALL=(ALL) NOPASSWD: ALL' >> /etc/sudoers.d/vagrant -chmod 440 /etc/sudoers.d/vagrant - -# Enable hyper-v daemons only if using hyper-v virtualization -if [ $(virt-what) == "hyperv" ]; then - dnf -y install hyperv-daemons cifs-utils - systemctl enable hypervvssd - systemctl enable hypervkvpd -fi - -# Since we disable consistent network naming, we need to make sure the eth0 -# configuration file is in place so it will come up. -# Delete other network configuration first because RHEL/C7 networking will not -# restart successfully if there are configuration files for devices that do not -# exist. -rm -f /etc/sysconfig/network-scripts/ifcfg-e* -cat > /etc/sysconfig/network-scripts/ifcfg-eth0 << _EOF_ -TYPE=Ethernet -PROXY_METHOD=none -BROWSER_ONLY=no -BOOTPROTO=dhcp -DEFROUTE=yes -IPV4_FAILURE_FATAL=no -IPV6INIT=yes -IPV6_AUTOCONF=yes -IPV6_DEFROUTE=yes -IPV6_FAILURE_FATAL=no -IPV6_ADDR_GEN_MODE=stable-privacy -NAME=eth0 -DEVICE=eth0 -ONBOOT=yes -_EOF_ -%end diff --git a/packer_templates/centos/scripts/cleanup.sh b/packer_templates/centos/scripts/cleanup.sh deleted file mode 100644 index 0651a7c04..000000000 --- a/packer_templates/centos/scripts/cleanup.sh +++ /dev/null @@ -1,113 +0,0 @@ -#!/bin/sh -eux - -# should output one of 'redhat' 'centos' 'oraclelinux' -distro="`rpm -qf --queryformat '%{NAME}' /etc/redhat-release | cut -f 1 -d '-'`" - -major_version="`sed 's/^.\+ release \([.0-9]\+\).*/\1/' /etc/redhat-release | awk -F. '{print $1}'`"; - - -echo "reduce the grub menu time to 1 second" -if ! [ "$major_version" -eq 6 ]; then - sed -i -e 's/^GRUB_TIMEOUT=[0-9]\+$/GRUB_TIMEOUT=1/' /etc/default/grub - grub2-mkconfig -o /boot/grub2/grub.cfg -fi - -# make sure we use dnf on EL 8+ -if [ "$major_version" -ge 8 ]; then - pkg_cmd="dnf" -else - pkg_cmd="yum" -fi - - -echo "Remove development and kernel source packages" -$pkg_cmd -y remove gcc cpp gc kernel-devel kernel-headers glibc-devel elfutils-libelf-devel glibc-headers kernel-devel kernel-headers - -if [ "$major_version" -ge 8 ]; then - echo "remove orphaned packages" - dnf -y autoremove - echo "Remove previous kernels that preserved for rollbacks" - dnf -y remove -y $(dnf repoquery --installonly --latest-limit=-1 -q) -else - echo "Remove previous kernels that preserved for rollbacks" - if ! command -v package-cleanup >/dev/null 2>&1; then - yum -y install yum-utils - fi - package-cleanup --oldkernels --count=1 -y -fi - -# Avoid ~200 meg firmware package we don't need -# this cannot be done in the KS file so we do it here -echo "Removing extra firmware packages" -$pkg_cmd -y remove linux-firmware - -if [ "$distro" != 'redhat' ]; then - echo "clean all package cache information" - $pkg_cmd -y clean all --enablerepo=\*; -fi - -# Clean up network interface persistence -rm -f /etc/udev/rules.d/70-persistent-net.rules; -mkdir -p /etc/udev/rules.d/70-persistent-net.rules; -rm -f /lib/udev/rules.d/75-persistent-net-generator.rules; -rm -rf /dev/.udev/; - -for ndev in `ls -1 /etc/sysconfig/network-scripts/ifcfg-*`; do - if [ "`basename $ndev`" != "ifcfg-lo" ]; then - sed -i '/^HWADDR/d' "$ndev"; - sed -i '/^UUID/d' "$ndev"; - fi -done - -# new-style network device naming for centos7 -if [ "$major_version" -eq 7 ]; then - # radio off & remove all interface configration - nmcli radio all off - /bin/systemctl stop NetworkManager.service - for ifcfg in `ls /etc/sysconfig/network-scripts/ifcfg-* |grep -v ifcfg-lo` ; do - rm -f $ifcfg - done - rm -rf /var/lib/NetworkManager/* - - echo "==> Setup /etc/rc.d/rc.local for EL7" - cat <<_EOF_ | cat >> /etc/rc.d/rc.local -#BENTO-BEGIN -LANG=C -# delete all connection -for con in \`nmcli -t -f uuid con\`; do - if [ "\$con" != "" ]; then - nmcli con del \$con - fi -done -# add gateway interface connection. -gwdev=\`nmcli dev | grep ethernet | egrep -v 'unmanaged' | head -n 1 | awk '{print \$1}'\` -if [ "\$gwdev" != "" ]; then - nmcli connection add type ethernet ifname \$gwdev con-name \$gwdev -fi -sed -i "/^#BENTO-BEGIN/,/^#BENTO-END/d" /etc/rc.d/rc.local -chmod -x /etc/rc.d/rc.local -#BENTO-END -_EOF_ - chmod +x /etc/rc.d/rc.local -fi - -echo "truncate any logs that have built up during the install" -find /var/log -type f -exec truncate --size=0 {} \; - -echo "remove the install log" -rm -f /root/anaconda-ks.cfg /root/original-ks.cfg - -echo "remove the contents of /tmp and /var/tmp" -rm -rf /tmp/* /var/tmp/* - -if [ "$major_version" -ge 7 ]; then - echo "Force a new random seed to be generated" - rm -f /var/lib/systemd/random-seed - - echo "Wipe netplan machine-id (DUID) so machines get unique ID generated on boot" - truncate -s 0 /etc/machine-id -fi - -echo "Clear the history so our install commands aren't there" -rm -f /root/.wget-hsts -export HISTSIZE=0 \ No newline at end of file diff --git a/packer_templates/centos/scripts/networking.sh b/packer_templates/centos/scripts/networking.sh deleted file mode 100644 index de35e787d..000000000 --- a/packer_templates/centos/scripts/networking.sh +++ /dev/null @@ -1,27 +0,0 @@ -#!/bin/sh -eux - -case "$PACKER_BUILDER_TYPE" in - -virtualbox-iso|virtualbox-ovf) - # Fix slow DNS: - # Add 'single-request-reopen' so it is included when /etc/resolv.conf is - # generated - # https://access.redhat.com/site/solutions/58625 (subscription required) - - echo 'RES_OPTIONS="single-request-reopen"' >>/etc/sysconfig/network; - - # determine the major EL version we're runninng - major_version="`sed 's/^.\+ release \([.0-9]\+\).*/\1/' /etc/redhat-release | awk -F. '{print $1}'`"; - - if [ "$major_version" -ge 8 ]; then - nmcli networking off - sleep 5 - nmcli networking on - else - service network restart; - fi - - echo 'Slow DNS fix applied (single-request-reopen)'; - ;; - -esac diff --git a/packer_templates/centos/scripts/update.sh b/packer_templates/centos/scripts/update.sh deleted file mode 100644 index fe6b85f89..000000000 --- a/packer_templates/centos/scripts/update.sh +++ /dev/null @@ -1,21 +0,0 @@ -#!/bin/sh -eux - -# determine the major EL version we're runninng -major_version="`sed 's/^.\+ release \([.0-9]\+\).*/\1/' /etc/redhat-release | awk -F. '{print $1}'`"; - -# make sure we use dnf on EL 8+ -if [ "$major_version" -ge 8 ]; then - dnf -y update -else - yum -y update -fi - -# Updating the oracle release on at least OL 6 updates the repos and unlocks a whole -# new set of updates that need to be applied. If this script is there it should be run -if [ -f "/usr/bin/ol_yum_configure.sh" ]; then - /usr/bin/ol_yum_configure.sh - yum -y update -fi - -reboot; -sleep 60; diff --git a/packer_templates/windows/cookbooks/packer/Berksfile b/packer_templates/cookbooks/packer/Berksfile similarity index 100% rename from packer_templates/windows/cookbooks/packer/Berksfile rename to packer_templates/cookbooks/packer/Berksfile diff --git a/packer_templates/windows/cookbooks/packer/chefignore b/packer_templates/cookbooks/packer/chefignore similarity index 100% rename from packer_templates/windows/cookbooks/packer/chefignore rename to packer_templates/cookbooks/packer/chefignore diff --git a/packer_templates/windows/cookbooks/packer/kitchen.yml b/packer_templates/cookbooks/packer/kitchen.yml similarity index 100% rename from packer_templates/windows/cookbooks/packer/kitchen.yml rename to packer_templates/cookbooks/packer/kitchen.yml diff --git a/packer_templates/windows/cookbooks/packer/metadata.rb b/packer_templates/cookbooks/packer/metadata.rb similarity index 100% rename from packer_templates/windows/cookbooks/packer/metadata.rb rename to packer_templates/cookbooks/packer/metadata.rb diff --git a/packer_templates/windows/cookbooks/packer/recipes/cleanup.rb b/packer_templates/cookbooks/packer/recipes/cleanup.rb similarity index 100% rename from packer_templates/windows/cookbooks/packer/recipes/cleanup.rb rename to packer_templates/cookbooks/packer/recipes/cleanup.rb diff --git a/packer_templates/windows/cookbooks/packer/recipes/configure_power.rb b/packer_templates/cookbooks/packer/recipes/configure_power.rb similarity index 100% rename from packer_templates/windows/cookbooks/packer/recipes/configure_power.rb rename to packer_templates/cookbooks/packer/recipes/configure_power.rb diff --git a/packer_templates/windows/cookbooks/packer/recipes/defrag.rb b/packer_templates/cookbooks/packer/recipes/defrag.rb similarity index 100% rename from packer_templates/windows/cookbooks/packer/recipes/defrag.rb rename to packer_templates/cookbooks/packer/recipes/defrag.rb diff --git a/packer_templates/windows/cookbooks/packer/recipes/disable_restore.rb b/packer_templates/cookbooks/packer/recipes/disable_restore.rb similarity index 100% rename from packer_templates/windows/cookbooks/packer/recipes/disable_restore.rb rename to packer_templates/cookbooks/packer/recipes/disable_restore.rb diff --git a/packer_templates/windows/cookbooks/packer/recipes/disable_screensaver.rb b/packer_templates/cookbooks/packer/recipes/disable_screensaver.rb similarity index 100% rename from packer_templates/windows/cookbooks/packer/recipes/disable_screensaver.rb rename to packer_templates/cookbooks/packer/recipes/disable_screensaver.rb diff --git a/packer_templates/windows/cookbooks/packer/recipes/disable_uac.rb b/packer_templates/cookbooks/packer/recipes/disable_uac.rb similarity index 100% rename from packer_templates/windows/cookbooks/packer/recipes/disable_uac.rb rename to packer_templates/cookbooks/packer/recipes/disable_uac.rb diff --git a/packer_templates/windows/cookbooks/packer/recipes/disable_windows_update.rb b/packer_templates/cookbooks/packer/recipes/disable_windows_update.rb similarity index 100% rename from packer_templates/windows/cookbooks/packer/recipes/disable_windows_update.rb rename to packer_templates/cookbooks/packer/recipes/disable_windows_update.rb diff --git a/packer_templates/windows/cookbooks/packer/recipes/enable_file_sharing.rb b/packer_templates/cookbooks/packer/recipes/enable_file_sharing.rb similarity index 100% rename from packer_templates/windows/cookbooks/packer/recipes/enable_file_sharing.rb rename to packer_templates/cookbooks/packer/recipes/enable_file_sharing.rb diff --git a/packer_templates/windows/cookbooks/packer/recipes/enable_remote_desktop.rb b/packer_templates/cookbooks/packer/recipes/enable_remote_desktop.rb similarity index 100% rename from packer_templates/windows/cookbooks/packer/recipes/enable_remote_desktop.rb rename to packer_templates/cookbooks/packer/recipes/enable_remote_desktop.rb diff --git a/packer_templates/windows/cookbooks/packer/recipes/features.rb b/packer_templates/cookbooks/packer/recipes/features.rb similarity index 100% rename from packer_templates/windows/cookbooks/packer/recipes/features.rb rename to packer_templates/cookbooks/packer/recipes/features.rb diff --git a/packer_templates/windows/cookbooks/packer/recipes/remove_defender.rb b/packer_templates/cookbooks/packer/recipes/remove_defender.rb similarity index 100% rename from packer_templates/windows/cookbooks/packer/recipes/remove_defender.rb rename to packer_templates/cookbooks/packer/recipes/remove_defender.rb diff --git a/packer_templates/windows/cookbooks/packer/recipes/set_local_account_token_filter_policy.rb b/packer_templates/cookbooks/packer/recipes/set_local_account_token_filter_policy.rb similarity index 100% rename from packer_templates/windows/cookbooks/packer/recipes/set_local_account_token_filter_policy.rb rename to packer_templates/cookbooks/packer/recipes/set_local_account_token_filter_policy.rb diff --git a/packer_templates/windows/cookbooks/packer/recipes/ui_tweaks.rb b/packer_templates/cookbooks/packer/recipes/ui_tweaks.rb similarity index 100% rename from packer_templates/windows/cookbooks/packer/recipes/ui_tweaks.rb rename to packer_templates/cookbooks/packer/recipes/ui_tweaks.rb diff --git a/packer_templates/windows/cookbooks/packer/recipes/updates.rb b/packer_templates/cookbooks/packer/recipes/updates.rb similarity index 100% rename from packer_templates/windows/cookbooks/packer/recipes/updates.rb rename to packer_templates/cookbooks/packer/recipes/updates.rb diff --git a/packer_templates/windows/cookbooks/packer/recipes/vm_tools.rb b/packer_templates/cookbooks/packer/recipes/vm_tools.rb similarity index 100% rename from packer_templates/windows/cookbooks/packer/recipes/vm_tools.rb rename to packer_templates/cookbooks/packer/recipes/vm_tools.rb diff --git a/packer_templates/debian/debian-10.13-amd64.json b/packer_templates/debian/debian-10.13-amd64.json deleted file mode 100644 index c1eca2233..000000000 --- a/packer_templates/debian/debian-10.13-amd64.json +++ /dev/null @@ -1,223 +0,0 @@ -{ - "builders": [ - { - "boot_command": [ - "<esc><wait>", - "install <wait>", - " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}} <wait>", - "debian-installer=en_US.UTF-8 <wait>", - "auto <wait>", - "locale=en_US.UTF-8 <wait>", - "kbd-chooser/method=us <wait>", - "keyboard-configuration/xkb-keymap=us <wait>", - "netcfg/get_hostname={{ .Name }} <wait>", - "netcfg/get_domain=vagrantup.com <wait>", - "fb=false <wait>", - "debconf/frontend=noninteractive <wait>", - "console-setup/ask_detect=false <wait>", - "console-keymaps-at/keymap=us <wait>", - "grub-installer/bootdev=/dev/sda <wait>", - "<enter><wait>" - ], - "boot_wait": "5s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", - "guest_additions_url": "{{ user `guest_additions_url` }}", - "guest_os_type": "Debian_64", - "hard_drive_interface": "sata", - "headless": "{{ user `headless` }}", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-virtualbox", - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "type": "virtualbox-iso", - "virtualbox_version_file": ".vbox_version", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<esc><wait>", - "install <wait>", - " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}} <wait>", - "debian-installer=en_US.UTF-8 <wait>", - "auto <wait>", - "locale=en_US.UTF-8 <wait>", - "kbd-chooser/method=us <wait>", - "keyboard-configuration/xkb-keymap=us <wait>", - "netcfg/get_hostname={{ .Name }} <wait>", - "netcfg/get_domain=vagrantup.com <wait>", - "fb=false <wait>", - "debconf/frontend=noninteractive <wait>", - "console-setup/ask_detect=false <wait>", - "console-keymaps-at/keymap=us <wait>", - "grub-installer/bootdev=/dev/sda <wait>", - "<enter><wait>" - ], - "boot_wait": "5s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "debian8-64", - "headless": "{{ user `headless` }}", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-vmware", - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "tools_upload_flavor": "linux", - "type": "vmware-iso", - "vm_name": "{{ user `template` }}", - "vmx_data": { - "cpuid.coresPerSocket": "1", - "ethernet0.pciSlotNumber": "32" - }, - "vmx_remove_ethernet_interfaces": true - }, - { - "boot_command": [ - "<esc><wait>", - "install <wait>", - " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}} <wait>", - "debian-installer=en_US.UTF-8 <wait>", - "auto <wait>", - "locale=en_US.UTF-8 <wait>", - "kbd-chooser/method=us <wait>", - "keyboard-configuration/xkb-keymap=us <wait>", - "netcfg/get_hostname={{ .Name }} <wait>", - "netcfg/get_domain=vagrantup.com <wait>", - "fb=false <wait>", - "debconf/frontend=noninteractive <wait>", - "console-setup/ask_detect=false <wait>", - "console-keymaps-at/keymap=us <wait>", - "grub-installer/bootdev=/dev/sda <wait>", - "<enter><wait>" - ], - "boot_wait": "5s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "debian", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-parallels", - "parallels_tools_flavor": "lin", - "prlctl_version_file": ".prlctl_version", - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "type": "parallels-iso", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<esc><wait>", - "install <wait>", - " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}} <wait>", - "debian-installer=en_US.UTF-8 <wait>", - "auto <wait>", - "locale=en_US.UTF-8 <wait>", - "kbd-chooser/method=us <wait>", - "keyboard-configuration/xkb-keymap=us <wait>", - "netcfg/get_hostname={{ .Name }} <wait>", - "netcfg/get_domain=vagrantup.com <wait>", - "fb=false <wait>", - "debconf/frontend=noninteractive <wait>", - "console-setup/ask_detect=false <wait>", - "console-keymaps-at/keymap=us <wait>", - "grub-installer/bootdev=/dev/vda <wait>", - "<enter><wait>" - ], - "boot_wait": "5s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "headless": "{{ user `headless` }}", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-qemu", - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "type": "qemu", - "vm_name": "{{ user `template` }}", - "qemuargs": [ - [ "-m", "{{ user `memory` }}" ], - [ "-display", "{{ user `qemu_display` }}" ] - ] - } - ], - "post-processors": [ - { - "output": "{{ user `build_directory` }}/{{user `box_basename`}}.{{.Provider}}.box", - "type": "vagrant" - } - ], - "provisioners": [ - { - "environment_vars": [ - "HOME_DIR=/home/vagrant", - "http_proxy={{user `http_proxy`}}", - "https_proxy={{user `https_proxy`}}", - "no_proxy={{user `no_proxy`}}" - ], - "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", - "expect_disconnect": true, - "scripts": [ - "{{template_dir}}/scripts/update.sh", - "{{template_dir}}/../_common/motd.sh", - "{{template_dir}}/../_common/sshd.sh", - "{{template_dir}}/scripts/networking.sh", - "{{template_dir}}/scripts/sudoers.sh", - "{{template_dir}}/../_common/vagrant.sh", - "{{template_dir}}/scripts/systemd.sh", - "{{template_dir}}/../_common/virtualbox.sh", - "{{template_dir}}/../ubuntu/scripts/vmware.sh", - "{{template_dir}}/../_common/parallels.sh", - "{{template_dir}}/scripts/cleanup.sh", - "{{template_dir}}/../_common/minimize.sh" - ], - "type": "shell" - } - ], - "variables": { - "box_basename": "debian-10.13", - "build_directory": "../../builds", - "build_timestamp": "{{isotime \"20060102150405\"}}", - "cpus": "2", - "disk_size": "65536", - "git_revision": "__unknown_git_revision__", - "guest_additions_url": "", - "headless": "", - "http_directory": "{{template_dir}}/http", - "http_proxy": "{{env `http_proxy`}}", - "https_proxy": "{{env `https_proxy`}}", - "iso_checksum": "75aa64071060402a594dcf1e14afd669ca0f8bf757b56d4c9c1a31b8f7c8f931", - "iso_name": "debian-10.13.0-amd64-netinst.iso", - "memory": "1024", - "mirror": "http://cdimage.debian.org/cdimage/archive", - "mirror_directory": "10.13.0/amd64/iso-cd", - "name": "debian-10.13", - "no_proxy": "{{env `no_proxy`}}", - "preseed_path": "debian-9/preseed.cfg", - "qemu_display": "none", - "template": "debian-10.13-amd64", - "version": "TIMESTAMP" - } -} diff --git a/packer_templates/debian/debian-10.13-arm64.json b/packer_templates/debian/debian-10.13-arm64.json deleted file mode 100644 index d8fb435e2..000000000 --- a/packer_templates/debian/debian-10.13-arm64.json +++ /dev/null @@ -1,102 +0,0 @@ -{ - "builders": [ - { - "boot_command": [ - "e<wait>", - "<down><down><down><right><right><right><right><right><right><right><right><right><right>", - "<right><right><right><right><right><right><right><right><right><right><right><right><right>", - "<right><right><right><right><right><right><right><right><right><right><right><wait>", - "install <wait>", - " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}} <wait>", - "debian-installer=en_US.UTF-8 <wait>", - "auto <wait>", - "locale=en_US.UTF-8 <wait>", - "kbd-chooser/method=us <wait>", - "keyboard-configuration/xkb-keymap=us <wait>", - "netcfg/get_hostname={{ .Name }} <wait>", - "netcfg/get_domain=vagrantup.com <wait>", - "fb=false <wait>", - "debconf/frontend=noninteractive <wait>", - "console-setup/ask_detect=false <wait>", - "console-keymaps-at/keymap=us <wait>", - "grub-installer/bootdev=/dev/sda <wait>", - "<f10><wait>" - ], - "boot_wait": "5s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "debian", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-parallels", - "parallels_tools_flavor": "lin-arm", - "prlctl_version_file": ".prlctl_version", - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "type": "parallels-iso", - "vm_name": "{{ user `template` }}" - } - ], - "post-processors": [ - { - "output": "{{ user `build_directory` }}/{{user `box_basename`}}.{{.Provider}}.box", - "type": "vagrant" - } - ], - "provisioners": [ - { - "environment_vars": [ - "HOME_DIR=/home/vagrant", - "http_proxy={{user `http_proxy`}}", - "https_proxy={{user `https_proxy`}}", - "no_proxy={{user `no_proxy`}}" - ], - "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", - "expect_disconnect": true, - "scripts": [ - "{{template_dir}}/scripts/update.sh", - "{{template_dir}}/../_common/motd.sh", - "{{template_dir}}/../_common/sshd.sh", - "{{template_dir}}/scripts/networking.sh", - "{{template_dir}}/scripts/sudoers.sh", - "{{template_dir}}/../_common/vagrant.sh", - "{{template_dir}}/scripts/systemd.sh", - "{{template_dir}}/../_common/virtualbox.sh", - "{{template_dir}}/../ubuntu/scripts/vmware.sh", - "{{template_dir}}/../_common/parallels.sh", - "{{template_dir}}/scripts/cleanup.sh", - "{{template_dir}}/../_common/minimize.sh" - ], - "type": "shell" - } - ], - "variables": { - "box_basename": "debian-10.13-arm64", - "build_directory": "../../builds", - "build_timestamp": "{{isotime \"20060102150405\"}}", - "cpus": "2", - "disk_size": "65536", - "git_revision": "__unknown_git_revision__", - "guest_additions_url": "", - "headless": "", - "http_directory": "{{template_dir}}/http", - "http_proxy": "{{env `http_proxy`}}", - "https_proxy": "{{env `https_proxy`}}", - "iso_checksum": "a20a5437e243186ac8d678202cf55a253e8d37df2b187da885796d5071ba829f", - "iso_name": "debian-10.13.0-arm64-netinst.iso", - "memory": "1024", - "mirror": "http://cdimage.debian.org/cdimage/archive", - "mirror_directory": "10.13.0/arm64/iso-cd", - "name": "debian-10.13-arm64", - "no_proxy": "{{env `no_proxy`}}", - "preseed_path": "debian-9/preseed.cfg", - "qemu_display": "none", - "template": "debian-10.13-arm64", - "version": "TIMESTAMP" - } -} diff --git a/packer_templates/debian/debian-10.13-i386.json b/packer_templates/debian/debian-10.13-i386.json deleted file mode 100644 index 50f08f561..000000000 --- a/packer_templates/debian/debian-10.13-i386.json +++ /dev/null @@ -1,223 +0,0 @@ -{ - "builders": [ - { - "boot_command": [ - "<esc><wait>", - "install <wait>", - " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}} <wait>", - "debian-installer=en_US.UTF-8 <wait>", - "auto <wait>", - "locale=en_US.UTF-8 <wait>", - "kbd-chooser/method=us <wait>", - "keyboard-configuration/xkb-keymap=us <wait>", - "netcfg/get_hostname={{ .Name }} <wait>", - "netcfg/get_domain=vagrantup.com <wait>", - "fb=false <wait>", - "debconf/frontend=noninteractive <wait>", - "console-setup/ask_detect=false <wait>", - "console-keymaps-at/keymap=us <wait>", - "grub-installer/bootdev=/dev/sda <wait>", - "<enter><wait>" - ], - "boot_wait": "5s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", - "guest_additions_url": "{{ user `guest_additions_url` }}", - "guest_os_type": "Debian", - "hard_drive_interface": "sata", - "headless": "{{ user `headless` }}", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-virtualbox", - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "type": "virtualbox-iso", - "virtualbox_version_file": ".vbox_version", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<esc><wait>", - "install <wait>", - " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}} <wait>", - "debian-installer=en_US.UTF-8 <wait>", - "auto <wait>", - "locale=en_US.UTF-8 <wait>", - "kbd-chooser/method=us <wait>", - "keyboard-configuration/xkb-keymap=us <wait>", - "netcfg/get_hostname={{ .Name }} <wait>", - "netcfg/get_domain=vagrantup.com <wait>", - "fb=false <wait>", - "debconf/frontend=noninteractive <wait>", - "console-setup/ask_detect=false <wait>", - "console-keymaps-at/keymap=us <wait>", - "grub-installer/bootdev=/dev/sda <wait>", - "<enter><wait>" - ], - "boot_wait": "5s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "debian8", - "headless": "{{ user `headless` }}", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-vmware", - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "tools_upload_flavor": "linux", - "type": "vmware-iso", - "vm_name": "{{ user `template` }}", - "vmx_data": { - "cpuid.coresPerSocket": "1", - "ethernet0.pciSlotNumber": "32" - }, - "vmx_remove_ethernet_interfaces": true - }, - { - "boot_command": [ - "<esc><wait>", - "install <wait>", - " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}} <wait>", - "debian-installer=en_US.UTF-8 <wait>", - "auto <wait>", - "locale=en_US.UTF-8 <wait>", - "kbd-chooser/method=us <wait>", - "keyboard-configuration/xkb-keymap=us <wait>", - "netcfg/get_hostname={{ .Name }} <wait>", - "netcfg/get_domain=vagrantup.com <wait>", - "fb=false <wait>", - "debconf/frontend=noninteractive <wait>", - "console-setup/ask_detect=false <wait>", - "console-keymaps-at/keymap=us <wait>", - "grub-installer/bootdev=/dev/sda <wait>", - "<enter><wait>" - ], - "boot_wait": "5s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "debian", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-parallels", - "parallels_tools_flavor": "lin", - "prlctl_version_file": ".prlctl_version", - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "type": "parallels-iso", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<esc><wait>", - "install <wait>", - " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}} <wait>", - "debian-installer=en_US.UTF-8 <wait>", - "auto <wait>", - "locale=en_US.UTF-8 <wait>", - "kbd-chooser/method=us <wait>", - "keyboard-configuration/xkb-keymap=us <wait>", - "netcfg/get_hostname={{ .Name }} <wait>", - "netcfg/get_domain=vagrantup.com <wait>", - "fb=false <wait>", - "debconf/frontend=noninteractive <wait>", - "console-setup/ask_detect=false <wait>", - "console-keymaps-at/keymap=us <wait>", - "grub-installer/bootdev=/dev/vda <wait>", - "<enter><wait>" - ], - "boot_wait": "5s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "headless": "{{ user `headless` }}", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-qemu", - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "type": "qemu", - "vm_name": "{{ user `template` }}", - "qemuargs": [ - [ "-m", "{{ user `memory` }}" ], - [ "-display", "{{ user `qemu_display` }}" ] - ] - } - ], - "post-processors": [ - { - "output": "{{ user `build_directory` }}/{{user `box_basename`}}.{{.Provider}}.box", - "type": "vagrant" - } - ], - "provisioners": [ - { - "environment_vars": [ - "HOME_DIR=/home/vagrant", - "http_proxy={{user `http_proxy`}}", - "https_proxy={{user `https_proxy`}}", - "no_proxy={{user `no_proxy`}}" - ], - "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", - "expect_disconnect": true, - "scripts": [ - "{{template_dir}}/scripts/update.sh", - "{{template_dir}}/../_common/motd.sh", - "{{template_dir}}/../_common/sshd.sh", - "{{template_dir}}/scripts/networking.sh", - "{{template_dir}}/scripts/sudoers.sh", - "{{template_dir}}/../_common/vagrant.sh", - "{{template_dir}}/scripts/systemd.sh", - "{{template_dir}}/../_common/virtualbox.sh", - "{{template_dir}}/../ubuntu/scripts/vmware.sh", - "{{template_dir}}/../_common/parallels.sh", - "{{template_dir}}/scripts/cleanup.sh", - "{{template_dir}}/../_common/minimize.sh" - ], - "type": "shell" - } - ], - "variables": { - "box_basename": "debian-10.13-i386", - "build_directory": "../../builds", - "build_timestamp": "{{isotime \"20060102150405\"}}", - "cpus": "2", - "disk_size": "65536", - "git_revision": "__unknown_git_revision__", - "guest_additions_url": "", - "headless": "", - "http_directory": "{{template_dir}}/http", - "http_proxy": "{{env `http_proxy`}}", - "https_proxy": "{{env `https_proxy`}}", - "iso_checksum": "af48af8142c6a162e15d70d1f7c77d205ab86e070270939961d0c3021557179f", - "iso_name": "debian-10.13.0-i386-netinst.iso", - "memory": "1024", - "mirror": "http://cdimage.debian.org/cdimage/archive", - "mirror_directory": "10.13.0/i386/iso-cd", - "name": "debian-10.13-i386", - "no_proxy": "{{env `no_proxy`}}", - "preseed_path": "debian-9/preseed.cfg", - "qemu_display": "none", - "template": "debian-10.13-i386", - "version": "TIMESTAMP" - } -} diff --git a/packer_templates/debian/debian-11.6-amd64.json b/packer_templates/debian/debian-11.6-amd64.json deleted file mode 100644 index a8aa39086..000000000 --- a/packer_templates/debian/debian-11.6-amd64.json +++ /dev/null @@ -1,158 +0,0 @@ -{ - "builders": [ - { - "boot_command": "{{user `boot_command`}}", - "boot_wait": "5s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", - "guest_additions_url": "{{ user `guest_additions_url` }}", - "guest_os_type": "Debian_64", - "hard_drive_interface": "sata", - "headless": "{{ user `headless` }}", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-virtualbox", - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "type": "virtualbox-iso", - "virtualbox_version_file": ".vbox_version", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": "{{user `boot_command`}}", - "boot_wait": "5s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "debian8-64", - "headless": "{{ user `headless` }}", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-vmware", - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "tools_upload_flavor": "linux", - "type": "vmware-iso", - "vm_name": "{{ user `template` }}", - "vmx_data": { - "cpuid.coresPerSocket": "1", - "ethernet0.pciSlotNumber": "32" - }, - "vmx_remove_ethernet_interfaces": true - }, - { - "boot_command": "{{user `boot_command`}}", - "boot_wait": "5s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "debian", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-parallels", - "parallels_tools_flavor": "lin", - "prlctl_version_file": ".prlctl_version", - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "type": "parallels-iso", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": "{{user `boot_command`}}", - "boot_wait": "5s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "headless": "{{ user `headless` }}", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-qemu", - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "type": "qemu", - "vm_name": "{{ user `template` }}", - "qemuargs": [ - [ "-m", "{{ user `memory` }}" ], - [ "-bios", "{{ user `qemu_bios` }}" ], - [ "-display", "{{ user `qemu_display` }}" ] - ] - } - ], - "post-processors": [ - { - "output": "{{ user `build_directory` }}/{{user `box_basename`}}.{{.Provider}}.box", - "type": "vagrant" - } - ], - "provisioners": [ - { - "environment_vars": [ - "HOME_DIR=/home/vagrant", - "http_proxy={{user `http_proxy`}}", - "https_proxy={{user `https_proxy`}}", - "no_proxy={{user `no_proxy`}}" - ], - "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", - "expect_disconnect": true, - "scripts": [ - "{{template_dir}}/scripts/update.sh", - "{{template_dir}}/../_common/motd.sh", - "{{template_dir}}/../_common/sshd.sh", - "{{template_dir}}/scripts/networking.sh", - "{{template_dir}}/scripts/sudoers.sh", - "{{template_dir}}/../_common/vagrant.sh", - "{{template_dir}}/scripts/systemd.sh", - "{{template_dir}}/../_common/virtualbox.sh", - "{{template_dir}}/../ubuntu/scripts/vmware.sh", - "{{template_dir}}/../_common/parallels.sh", - "{{template_dir}}/scripts/cleanup.sh", - "{{template_dir}}/../_common/minimize.sh" - ], - "type": "shell" - } - ], - "variables": { - "box_basename": "debian-11.6", - "build_directory": "../../builds", - "build_timestamp": "{{isotime \"20060102150405\"}}", - "cpus": "2", - "disk_size": "65536", - "git_revision": "__unknown_git_revision__", - "guest_additions_url": "", - "headless": "", - "http_directory": "{{template_dir}}/http", - "http_proxy": "{{env `http_proxy`}}", - "https_proxy": "{{env `https_proxy`}}", - "iso_checksum": "e482910626b30f9a7de9b0cc142c3d4a079fbfa96110083be1d0b473671ce08d", - "iso_name": "debian-11.6.0-amd64-netinst.iso", - "memory": "1024", - "mirror": "http://cdimage.debian.org/cdimage/release", - "mirror_directory": "11.6.0/amd64/iso-cd", - "name": "debian-11.6", - "no_proxy": "{{env `no_proxy`}}", - "preseed_path": "debian-9/preseed.cfg", - "qemu_display": "none", - "qemu_bios": "bios-256k.bin", - "template": "debian-11.6-amd64", - "boot_command": "<esc><wait>install <wait> preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}} <wait>debian-installer=en_US.UTF-8 <wait>auto <wait>locale=en_US.UTF-8 <wait>kbd-chooser/method=us <wait>keyboard-configuration/xkb-keymap=us <wait>netcfg/get_hostname={{ .Name }} <wait>netcfg/get_domain=vagrantup.com <wait>fb=false <wait>debconf/frontend=noninteractive <wait>console-setup/ask_detect=false <wait>console-keymaps-at/keymap=us <wait>grub-installer/bootdev=default <wait><enter><wait>", - "version": "TIMESTAMP" - } -} diff --git a/packer_templates/debian/debian-11.6-arm64.json b/packer_templates/debian/debian-11.6-arm64.json deleted file mode 100644 index 2741764d2..000000000 --- a/packer_templates/debian/debian-11.6-arm64.json +++ /dev/null @@ -1,102 +0,0 @@ -{ - "builders": [ - { - "boot_command": [ - "e<wait>", - "<down><down><down><right><right><right><right><right><right><right><right><right><right>", - "<right><right><right><right><right><right><right><right><right><right><right><right><right>", - "<right><right><right><right><right><right><right><right><right><right><right><wait>", - "install <wait>", - " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}} <wait>", - "debian-installer=en_US.UTF-8 <wait>", - "auto <wait>", - "locale=en_US.UTF-8 <wait>", - "kbd-chooser/method=us <wait>", - "keyboard-configuration/xkb-keymap=us <wait>", - "netcfg/get_hostname={{ .Name }} <wait>", - "netcfg/get_domain=vagrantup.com <wait>", - "fb=false <wait>", - "debconf/frontend=noninteractive <wait>", - "console-setup/ask_detect=false <wait>", - "console-keymaps-at/keymap=us <wait>", - "grub-installer/bootdev=/dev/sda <wait>", - "<f10><wait>" - ], - "boot_wait": "5s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "debian", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-parallels", - "parallels_tools_flavor": "lin-arm", - "prlctl_version_file": ".prlctl_version", - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "type": "parallels-iso", - "vm_name": "{{ user `template` }}" - } - ], - "post-processors": [ - { - "output": "{{ user `build_directory` }}/{{user `box_basename`}}.{{.Provider}}.box", - "type": "vagrant" - } - ], - "provisioners": [ - { - "environment_vars": [ - "HOME_DIR=/home/vagrant", - "http_proxy={{user `http_proxy`}}", - "https_proxy={{user `https_proxy`}}", - "no_proxy={{user `no_proxy`}}" - ], - "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", - "expect_disconnect": true, - "scripts": [ - "{{template_dir}}/scripts/update.sh", - "{{template_dir}}/../_common/motd.sh", - "{{template_dir}}/../_common/sshd.sh", - "{{template_dir}}/scripts/networking.sh", - "{{template_dir}}/scripts/sudoers.sh", - "{{template_dir}}/../_common/vagrant.sh", - "{{template_dir}}/scripts/systemd.sh", - "{{template_dir}}/../_common/virtualbox.sh", - "{{template_dir}}/../ubuntu/scripts/vmware.sh", - "{{template_dir}}/../_common/parallels.sh", - "{{template_dir}}/scripts/cleanup.sh", - "{{template_dir}}/../_common/minimize.sh" - ], - "type": "shell" - } - ], - "variables": { - "box_basename": "debian-11.6-arm64", - "build_directory": "../../builds", - "build_timestamp": "{{isotime \"20060102150405\"}}", - "cpus": "2", - "disk_size": "65536", - "git_revision": "__unknown_git_revision__", - "guest_additions_url": "", - "headless": "", - "http_directory": "{{template_dir}}/http", - "http_proxy": "{{env `http_proxy`}}", - "https_proxy": "{{env `https_proxy`}}", - "iso_checksum": "522706a58317915aceb5eef9b777d04ab573982b36670705e2e6d83dd4669e52", - "iso_name": "debian-11.6.0-arm64-netinst.iso", - "memory": "1024", - "mirror": "http://cdimage.debian.org/cdimage/release", - "mirror_directory": "11.6.0/arm64/iso-cd", - "name": "debian-11.6-arm64", - "no_proxy": "{{env `no_proxy`}}", - "preseed_path": "debian-9/preseed.cfg", - "qemu_display": "none", - "template": "debian-11.6-arm64", - "version": "TIMESTAMP" - } -} diff --git a/packer_templates/debian/debian-11.6-i386.json b/packer_templates/debian/debian-11.6-i386.json deleted file mode 100644 index cd80db4a2..000000000 --- a/packer_templates/debian/debian-11.6-i386.json +++ /dev/null @@ -1,223 +0,0 @@ -{ - "builders": [ - { - "boot_command": [ - "<esc><wait>", - "install <wait>", - " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}} <wait>", - "debian-installer=en_US.UTF-8 <wait>", - "auto <wait>", - "locale=en_US.UTF-8 <wait>", - "kbd-chooser/method=us <wait>", - "keyboard-configuration/xkb-keymap=us <wait>", - "netcfg/get_hostname={{ .Name }} <wait>", - "netcfg/get_domain=vagrantup.com <wait>", - "fb=false <wait>", - "debconf/frontend=noninteractive <wait>", - "console-setup/ask_detect=false <wait>", - "console-keymaps-at/keymap=us <wait>", - "grub-installer/bootdev=/dev/sda <wait>", - "<enter><wait>" - ], - "boot_wait": "5s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", - "guest_additions_url": "{{ user `guest_additions_url` }}", - "guest_os_type": "Debian", - "hard_drive_interface": "sata", - "headless": "{{ user `headless` }}", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-virtualbox", - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "type": "virtualbox-iso", - "virtualbox_version_file": ".vbox_version", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<esc><wait>", - "install <wait>", - " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}} <wait>", - "debian-installer=en_US.UTF-8 <wait>", - "auto <wait>", - "locale=en_US.UTF-8 <wait>", - "kbd-chooser/method=us <wait>", - "keyboard-configuration/xkb-keymap=us <wait>", - "netcfg/get_hostname={{ .Name }} <wait>", - "netcfg/get_domain=vagrantup.com <wait>", - "fb=false <wait>", - "debconf/frontend=noninteractive <wait>", - "console-setup/ask_detect=false <wait>", - "console-keymaps-at/keymap=us <wait>", - "grub-installer/bootdev=/dev/sda <wait>", - "<enter><wait>" - ], - "boot_wait": "5s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "debian8", - "headless": "{{ user `headless` }}", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-vmware", - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "tools_upload_flavor": "linux", - "type": "vmware-iso", - "vm_name": "{{ user `template` }}", - "vmx_data": { - "cpuid.coresPerSocket": "1", - "ethernet0.pciSlotNumber": "32" - }, - "vmx_remove_ethernet_interfaces": true - }, - { - "boot_command": [ - "<esc><wait>", - "install <wait>", - " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}} <wait>", - "debian-installer=en_US.UTF-8 <wait>", - "auto <wait>", - "locale=en_US.UTF-8 <wait>", - "kbd-chooser/method=us <wait>", - "keyboard-configuration/xkb-keymap=us <wait>", - "netcfg/get_hostname={{ .Name }} <wait>", - "netcfg/get_domain=vagrantup.com <wait>", - "fb=false <wait>", - "debconf/frontend=noninteractive <wait>", - "console-setup/ask_detect=false <wait>", - "console-keymaps-at/keymap=us <wait>", - "grub-installer/bootdev=/dev/sda <wait>", - "<enter><wait>" - ], - "boot_wait": "5s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "debian", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-parallels", - "parallels_tools_flavor": "lin", - "prlctl_version_file": ".prlctl_version", - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "type": "parallels-iso", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<esc><wait>", - "install <wait>", - " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}} <wait>", - "debian-installer=en_US.UTF-8 <wait>", - "auto <wait>", - "locale=en_US.UTF-8 <wait>", - "kbd-chooser/method=us <wait>", - "keyboard-configuration/xkb-keymap=us <wait>", - "netcfg/get_hostname={{ .Name }} <wait>", - "netcfg/get_domain=vagrantup.com <wait>", - "fb=false <wait>", - "debconf/frontend=noninteractive <wait>", - "console-setup/ask_detect=false <wait>", - "console-keymaps-at/keymap=us <wait>", - "grub-installer/bootdev=/dev/vda <wait>", - "<enter><wait>" - ], - "boot_wait": "5s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "headless": "{{ user `headless` }}", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-qemu", - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "type": "qemu", - "vm_name": "{{ user `template` }}", - "qemuargs": [ - [ "-m", "{{ user `memory` }}" ], - [ "-display", "{{ user `qemu_display` }}" ] - ] - } - ], - "post-processors": [ - { - "output": "{{ user `build_directory` }}/{{user `box_basename`}}.{{.Provider}}.box", - "type": "vagrant" - } - ], - "provisioners": [ - { - "environment_vars": [ - "HOME_DIR=/home/vagrant", - "http_proxy={{user `http_proxy`}}", - "https_proxy={{user `https_proxy`}}", - "no_proxy={{user `no_proxy`}}" - ], - "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", - "expect_disconnect": true, - "scripts": [ - "{{template_dir}}/scripts/update.sh", - "{{template_dir}}/../_common/motd.sh", - "{{template_dir}}/../_common/sshd.sh", - "{{template_dir}}/scripts/networking.sh", - "{{template_dir}}/scripts/sudoers.sh", - "{{template_dir}}/../_common/vagrant.sh", - "{{template_dir}}/scripts/systemd.sh", - "{{template_dir}}/../_common/virtualbox.sh", - "{{template_dir}}/../ubuntu/scripts/vmware.sh", - "{{template_dir}}/../_common/parallels.sh", - "{{template_dir}}/scripts/cleanup.sh", - "{{template_dir}}/../_common/minimize.sh" - ], - "type": "shell" - } - ], - "variables": { - "box_basename": "debian-11.6-i386", - "build_directory": "../../builds", - "build_timestamp": "{{isotime \"20060102150405\"}}", - "cpus": "2", - "disk_size": "65536", - "git_revision": "__unknown_git_revision__", - "guest_additions_url": "", - "headless": "", - "http_directory": "{{template_dir}}/http", - "http_proxy": "{{env `http_proxy`}}", - "https_proxy": "{{env `https_proxy`}}", - "iso_checksum": "e6369838b9a59db641246fbb134840b84f2d315b89bd2f912d69a5f7c08c2197", - "iso_name": "debian-11.6.0-i386-netinst.iso", - "memory": "1024", - "mirror": "http://cdimage.debian.org/cdimage/release", - "mirror_directory": "11.6.0/i386/iso-cd", - "name": "debian-11.6-i386", - "no_proxy": "{{env `no_proxy`}}", - "preseed_path": "debian-9/preseed.cfg", - "qemu_display": "none", - "template": "debian-11.6-i386", - "version": "TIMESTAMP" - } -} diff --git a/packer_templates/debian/debian-9.13-amd64.json b/packer_templates/debian/debian-9.13-amd64.json deleted file mode 100644 index 7ced97c09..000000000 --- a/packer_templates/debian/debian-9.13-amd64.json +++ /dev/null @@ -1,223 +0,0 @@ -{ - "builders": [ - { - "boot_command": [ - "<esc><wait>", - "install <wait>", - " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}} <wait>", - "debian-installer=en_US.UTF-8 <wait>", - "auto <wait>", - "locale=en_US.UTF-8 <wait>", - "kbd-chooser/method=us <wait>", - "keyboard-configuration/xkb-keymap=us <wait>", - "netcfg/get_hostname={{ .Name }} <wait>", - "netcfg/get_domain=vagrantup.com <wait>", - "fb=false <wait>", - "debconf/frontend=noninteractive <wait>", - "console-setup/ask_detect=false <wait>", - "console-keymaps-at/keymap=us <wait>", - "grub-installer/bootdev=/dev/sda <wait>", - "<enter><wait>" - ], - "boot_wait": "5s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", - "guest_additions_url": "{{ user `guest_additions_url` }}", - "guest_os_type": "Debian_64", - "hard_drive_interface": "sata", - "headless": "{{ user `headless` }}", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-virtualbox", - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "type": "virtualbox-iso", - "virtualbox_version_file": ".vbox_version", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<esc><wait>", - "install <wait>", - " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}} <wait>", - "debian-installer=en_US.UTF-8 <wait>", - "auto <wait>", - "locale=en_US.UTF-8 <wait>", - "kbd-chooser/method=us <wait>", - "keyboard-configuration/xkb-keymap=us <wait>", - "netcfg/get_hostname={{ .Name }} <wait>", - "netcfg/get_domain=vagrantup.com <wait>", - "fb=false <wait>", - "debconf/frontend=noninteractive <wait>", - "console-setup/ask_detect=false <wait>", - "console-keymaps-at/keymap=us <wait>", - "grub-installer/bootdev=/dev/sda <wait>", - "<enter><wait>" - ], - "boot_wait": "5s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "debian8-64", - "headless": "{{ user `headless` }}", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-vmware", - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "tools_upload_flavor": "linux", - "type": "vmware-iso", - "vm_name": "{{ user `template` }}", - "vmx_data": { - "cpuid.coresPerSocket": "1", - "ethernet0.pciSlotNumber": "32" - }, - "vmx_remove_ethernet_interfaces": true - }, - { - "boot_command": [ - "<esc><wait>", - "install <wait>", - " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}} <wait>", - "debian-installer=en_US.UTF-8 <wait>", - "auto <wait>", - "locale=en_US.UTF-8 <wait>", - "kbd-chooser/method=us <wait>", - "keyboard-configuration/xkb-keymap=us <wait>", - "netcfg/get_hostname={{ .Name }} <wait>", - "netcfg/get_domain=vagrantup.com <wait>", - "fb=false <wait>", - "debconf/frontend=noninteractive <wait>", - "console-setup/ask_detect=false <wait>", - "console-keymaps-at/keymap=us <wait>", - "grub-installer/bootdev=/dev/sda <wait>", - "<enter><wait>" - ], - "boot_wait": "5s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "debian", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-parallels", - "parallels_tools_flavor": "lin", - "prlctl_version_file": ".prlctl_version", - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "type": "parallels-iso", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<esc><wait>", - "install <wait>", - " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}} <wait>", - "debian-installer=en_US.UTF-8 <wait>", - "auto <wait>", - "locale=en_US.UTF-8 <wait>", - "kbd-chooser/method=us <wait>", - "keyboard-configuration/xkb-keymap=us <wait>", - "netcfg/get_hostname={{ .Name }} <wait>", - "netcfg/get_domain=vagrantup.com <wait>", - "fb=false <wait>", - "debconf/frontend=noninteractive <wait>", - "console-setup/ask_detect=false <wait>", - "console-keymaps-at/keymap=us <wait>", - "grub-installer/bootdev=/dev/vda <wait>", - "<enter><wait>" - ], - "boot_wait": "5s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "headless": "{{ user `headless` }}", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-qemu", - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "type": "qemu", - "vm_name": "{{ user `template` }}", - "qemuargs": [ - [ "-m", "{{ user `memory` }}" ], - [ "-display", "{{ user `qemu_display` }}" ] - ] - } - ], - "post-processors": [ - { - "output": "{{ user `build_directory` }}/{{user `box_basename`}}.{{.Provider}}.box", - "type": "vagrant" - } - ], - "provisioners": [ - { - "environment_vars": [ - "HOME_DIR=/home/vagrant", - "http_proxy={{user `http_proxy`}}", - "https_proxy={{user `https_proxy`}}", - "no_proxy={{user `no_proxy`}}" - ], - "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", - "expect_disconnect": true, - "scripts": [ - "{{template_dir}}/scripts/update.sh", - "{{template_dir}}/../_common/motd.sh", - "{{template_dir}}/../_common/sshd.sh", - "{{template_dir}}/scripts/networking.sh", - "{{template_dir}}/scripts/sudoers.sh", - "{{template_dir}}/../_common/vagrant.sh", - "{{template_dir}}/scripts/systemd.sh", - "{{template_dir}}/../_common/virtualbox.sh", - "{{template_dir}}/../ubuntu/scripts/vmware.sh", - "{{template_dir}}/../_common/parallels.sh", - "{{template_dir}}/scripts/cleanup.sh", - "{{template_dir}}/../_common/minimize.sh" - ], - "type": "shell" - } - ], - "variables": { - "box_basename": "debian-9.13", - "build_directory": "../../builds", - "build_timestamp": "{{isotime \"20060102150405\"}}", - "cpus": "2", - "disk_size": "65536", - "git_revision": "__unknown_git_revision__", - "guest_additions_url": "", - "headless": "", - "http_directory": "{{template_dir}}/http", - "http_proxy": "{{env `http_proxy`}}", - "https_proxy": "{{env `https_proxy`}}", - "iso_checksum": "71c7e9eb292acc880f84605b1ca2b997f25737fe0a43fc9586f61d35cd2eb43b", - "iso_name": "debian-9.13.0-amd64-netinst.iso", - "memory": "1024", - "mirror": "http://cdimage.debian.org/cdimage/archive", - "mirror_directory": "9.13.0/amd64/iso-cd", - "name": "debian-9.13", - "no_proxy": "{{env `no_proxy`}}", - "preseed_path": "debian-9/preseed.cfg", - "qemu_display": "none", - "template": "debian-9.13-amd64", - "version": "TIMESTAMP" - } -} diff --git a/packer_templates/debian/debian-9.13-arm64.json b/packer_templates/debian/debian-9.13-arm64.json deleted file mode 100644 index a939da5bd..000000000 --- a/packer_templates/debian/debian-9.13-arm64.json +++ /dev/null @@ -1,102 +0,0 @@ -{ - "builders": [ - { - "boot_command": [ - "e<wait>", - "<down><down><down><right><right><right><right><right><right><right><right><right><right>", - "<right><right><right><right><right><right><right><right><right><right><right><right><right>", - "<right><right><right><right><right><right><right><right><right><right><right><wait>", - "install <wait>", - " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}} <wait>", - "debian-installer=en_US.UTF-8 <wait>", - "auto <wait>", - "locale=en_US.UTF-8 <wait>", - "kbd-chooser/method=us <wait>", - "keyboard-configuration/xkb-keymap=us <wait>", - "netcfg/get_hostname={{ .Name }} <wait>", - "netcfg/get_domain=vagrantup.com <wait>", - "fb=false <wait>", - "debconf/frontend=noninteractive <wait>", - "console-setup/ask_detect=false <wait>", - "console-keymaps-at/keymap=us <wait>", - "grub-installer/bootdev=/dev/sda <wait>", - "<f10><wait>" - ], - "boot_wait": "5s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "debian", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-parallels", - "parallels_tools_flavor": "lin-arm", - "prlctl_version_file": ".prlctl_version", - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "type": "parallels-iso", - "vm_name": "{{ user `template` }}" - } - ], - "post-processors": [ - { - "output": "{{ user `build_directory` }}/{{user `box_basename`}}.{{.Provider}}.box", - "type": "vagrant" - } - ], - "provisioners": [ - { - "environment_vars": [ - "HOME_DIR=/home/vagrant", - "http_proxy={{user `http_proxy`}}", - "https_proxy={{user `https_proxy`}}", - "no_proxy={{user `no_proxy`}}" - ], - "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", - "expect_disconnect": true, - "scripts": [ - "{{template_dir}}/scripts/update.sh", - "{{template_dir}}/../_common/motd.sh", - "{{template_dir}}/../_common/sshd.sh", - "{{template_dir}}/scripts/networking.sh", - "{{template_dir}}/scripts/sudoers.sh", - "{{template_dir}}/../_common/vagrant.sh", - "{{template_dir}}/scripts/systemd.sh", - "{{template_dir}}/../_common/virtualbox.sh", - "{{template_dir}}/../ubuntu/scripts/vmware.sh", - "{{template_dir}}/../_common/parallels.sh", - "{{template_dir}}/scripts/cleanup.sh", - "{{template_dir}}/../_common/minimize.sh" - ], - "type": "shell" - } - ], - "variables": { - "box_basename": "debian-9.13-arm64", - "build_directory": "../../builds", - "build_timestamp": "{{isotime \"20060102150405\"}}", - "cpus": "2", - "disk_size": "65536", - "git_revision": "__unknown_git_revision__", - "guest_additions_url": "", - "headless": "", - "http_directory": "{{template_dir}}/http", - "http_proxy": "{{env `http_proxy`}}", - "https_proxy": "{{env `https_proxy`}}", - "iso_checksum": "ea321c9de60a6fe9dfaf438b8e16f1945d6d2239e9f0d3cfe6872d4280eba10c", - "iso_name": "debian-9.13.0-arm64-netinst.iso", - "memory": "1024", - "mirror": "http://cdimage.debian.org/cdimage/archive", - "mirror_directory": "9.13.0/arm64/iso-cd", - "name": "debian-9.13-arm64", - "no_proxy": "{{env `no_proxy`}}", - "preseed_path": "debian-9/preseed.cfg", - "qemu_display": "none", - "template": "debian-9.13-arm64", - "version": "TIMESTAMP" - } -} diff --git a/packer_templates/debian/debian-9.13-i386.json b/packer_templates/debian/debian-9.13-i386.json deleted file mode 100644 index f79d451a2..000000000 --- a/packer_templates/debian/debian-9.13-i386.json +++ /dev/null @@ -1,223 +0,0 @@ -{ - "builders": [ - { - "boot_command": [ - "<esc><wait>", - "install <wait>", - " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}} <wait>", - "debian-installer=en_US.UTF-8 <wait>", - "auto <wait>", - "locale=en_US.UTF-8 <wait>", - "kbd-chooser/method=us <wait>", - "keyboard-configuration/xkb-keymap=us <wait>", - "netcfg/get_hostname={{ .Name }} <wait>", - "netcfg/get_domain=vagrantup.com <wait>", - "fb=false <wait>", - "debconf/frontend=noninteractive <wait>", - "console-setup/ask_detect=false <wait>", - "console-keymaps-at/keymap=us <wait>", - "grub-installer/bootdev=/dev/sda <wait>", - "<enter><wait>" - ], - "boot_wait": "5s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", - "guest_additions_url": "{{ user `guest_additions_url` }}", - "guest_os_type": "Debian", - "hard_drive_interface": "sata", - "headless": "{{ user `headless` }}", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-virtualbox", - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "type": "virtualbox-iso", - "virtualbox_version_file": ".vbox_version", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<esc><wait>", - "install <wait>", - " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}} <wait>", - "debian-installer=en_US.UTF-8 <wait>", - "auto <wait>", - "locale=en_US.UTF-8 <wait>", - "kbd-chooser/method=us <wait>", - "keyboard-configuration/xkb-keymap=us <wait>", - "netcfg/get_hostname={{ .Name }} <wait>", - "netcfg/get_domain=vagrantup.com <wait>", - "fb=false <wait>", - "debconf/frontend=noninteractive <wait>", - "console-setup/ask_detect=false <wait>", - "console-keymaps-at/keymap=us <wait>", - "grub-installer/bootdev=/dev/sda <wait>", - "<enter><wait>" - ], - "boot_wait": "5s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "debian8", - "headless": "{{ user `headless` }}", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-vmware", - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "tools_upload_flavor": "linux", - "type": "vmware-iso", - "vm_name": "{{ user `template` }}", - "vmx_data": { - "cpuid.coresPerSocket": "1", - "ethernet0.pciSlotNumber": "32" - }, - "vmx_remove_ethernet_interfaces": true - }, - { - "boot_command": [ - "<esc><wait>", - "install <wait>", - " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}} <wait>", - "debian-installer=en_US.UTF-8 <wait>", - "auto <wait>", - "locale=en_US.UTF-8 <wait>", - "kbd-chooser/method=us <wait>", - "keyboard-configuration/xkb-keymap=us <wait>", - "netcfg/get_hostname={{ .Name }} <wait>", - "netcfg/get_domain=vagrantup.com <wait>", - "fb=false <wait>", - "debconf/frontend=noninteractive <wait>", - "console-setup/ask_detect=false <wait>", - "console-keymaps-at/keymap=us <wait>", - "grub-installer/bootdev=/dev/sda <wait>", - "<enter><wait>" - ], - "boot_wait": "5s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "debian", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-parallels", - "parallels_tools_flavor": "lin", - "prlctl_version_file": ".prlctl_version", - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "type": "parallels-iso", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<esc><wait>", - "install <wait>", - " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}} <wait>", - "debian-installer=en_US.UTF-8 <wait>", - "auto <wait>", - "locale=en_US.UTF-8 <wait>", - "kbd-chooser/method=us <wait>", - "keyboard-configuration/xkb-keymap=us <wait>", - "netcfg/get_hostname={{ .Name }} <wait>", - "netcfg/get_domain=vagrantup.com <wait>", - "fb=false <wait>", - "debconf/frontend=noninteractive <wait>", - "console-setup/ask_detect=false <wait>", - "console-keymaps-at/keymap=us <wait>", - "grub-installer/bootdev=/dev/vda <wait>", - "<enter><wait>" - ], - "boot_wait": "5s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "headless": "{{ user `headless` }}", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-qemu", - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "type": "qemu", - "vm_name": "{{ user `template` }}", - "qemuargs": [ - [ "-m", "{{ user `memory` }}" ], - [ "-display", "{{ user `qemu_display` }}" ] - ] - } - ], - "post-processors": [ - { - "output": "{{ user `build_directory` }}/{{user `box_basename`}}.{{.Provider}}.box", - "type": "vagrant" - } - ], - "provisioners": [ - { - "environment_vars": [ - "HOME_DIR=/home/vagrant", - "http_proxy={{user `http_proxy`}}", - "https_proxy={{user `https_proxy`}}", - "no_proxy={{user `no_proxy`}}" - ], - "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", - "expect_disconnect": true, - "scripts": [ - "{{template_dir}}/scripts/update.sh", - "{{template_dir}}/../_common/motd.sh", - "{{template_dir}}/../_common/sshd.sh", - "{{template_dir}}/scripts/networking.sh", - "{{template_dir}}/scripts/sudoers.sh", - "{{template_dir}}/../_common/vagrant.sh", - "{{template_dir}}/scripts/systemd.sh", - "{{template_dir}}/../_common/virtualbox.sh", - "{{template_dir}}/../ubuntu/scripts/vmware.sh", - "{{template_dir}}/../_common/parallels.sh", - "{{template_dir}}/scripts/cleanup.sh", - "{{template_dir}}/../_common/minimize.sh" - ], - "type": "shell" - } - ], - "variables": { - "box_basename": "debian-9.13-i386", - "build_directory": "../../builds", - "build_timestamp": "{{isotime \"20060102150405\"}}", - "cpus": "2", - "disk_size": "65536", - "git_revision": "__unknown_git_revision__", - "guest_additions_url": "", - "headless": "", - "http_directory": "{{template_dir}}/http", - "http_proxy": "{{env `http_proxy`}}", - "https_proxy": "{{env `https_proxy`}}", - "iso_checksum": "27de998af87007bf5daa3030d3863d3ef801b948c29f5bbce232be4f928eedba", - "iso_name": "debian-9.13.0-i386-netinst.iso", - "memory": "1024", - "mirror": "http://cdimage.debian.org/cdimage/archive", - "mirror_directory": "9.13.0/i386/iso-cd", - "name": "debian-9.13-i386", - "no_proxy": "{{env `no_proxy`}}", - "preseed_path": "debian-9/preseed.cfg", - "qemu_display": "none", - "template": "debian-9.13-i386", - "version": "TIMESTAMP" - } -} diff --git a/packer_templates/debian/debian-9.13-ppc64el.json b/packer_templates/debian/debian-9.13-ppc64el.json deleted file mode 100644 index 731a1b68b..000000000 --- a/packer_templates/debian/debian-9.13-ppc64el.json +++ /dev/null @@ -1,109 +0,0 @@ -{ - "builders": [ - { - "accelerator": "kvm", - "boot_command": [ - "c<wait>", - "setparams 'Automated install'<enter><wait>", - "<enter><wait>", - "set options=\" preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}} <wait>", - "debian-installer=en_US.UTF-8 <wait>", - "auto <wait>", - "locale=en_US.UTF-8 <wait>", - "kbd-chooser/method=us <wait>", - "keyboard-configuration/xkb-keymap=us <wait>", - "netcfg/get_hostname={{ .Name }} <wait>", - "netcfg/get_domain=vagrantup.com <wait>", - "fb=false <wait>", - "debconf/frontend=noninteractive <wait>", - "console-setup/ask_detect=false <wait>", - "console-keymaps-at/keymap=us <wait>", - "grub-installer/bootdev=/dev/vda1 <wait>", - "\"", - "<enter><wait>", - "boot_one<wait>", - "<enter><wait>", - "boot<enter>" - ], - "boot_wait": "5s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "headless": "{{ user `headless` }}", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "machine_type": "pseries", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-qemu", - "qemu_binary": "qemu-system-ppc64le", - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "type": "qemu", - "use_default_display": true, - "vm_name": "{{ user `template` }}", - "qemuargs": [ - [ "-m", "{{ user `memory` }}" ], - [ "-display", "{{ user `qemu_display` }}" ] - ] - } - ], - "post-processors": [ - { - "output": "{{ user `build_directory` }}/{{user `box_basename`}}.{{.Provider}}.box", - "type": "vagrant" - } - ], - "provisioners": [ - { - "environment_vars": [ - "HOME_DIR=/home/vagrant", - "http_proxy={{user `http_proxy`}}", - "https_proxy={{user `https_proxy`}}", - "no_proxy={{user `no_proxy`}}" - ], - "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", - "expect_disconnect": true, - "scripts": [ - "{{template_dir}}/scripts/update.sh", - "{{template_dir}}/../_common/motd.sh", - "{{template_dir}}/../_common/sshd.sh", - "{{template_dir}}/scripts/networking.sh", - "{{template_dir}}/scripts/sudoers.sh", - "{{template_dir}}/../_common/vagrant.sh", - "{{template_dir}}/scripts/systemd.sh", - "{{template_dir}}/../_common/virtualbox.sh", - "{{template_dir}}/../ubuntu/scripts/vmware.sh", - "{{template_dir}}/../_common/parallels.sh", - "{{template_dir}}/scripts/cleanup.sh", - "{{template_dir}}/../_common/minimize.sh" - ], - "type": "shell" - } - ], - "variables": { - "box_basename": "debian-9.13", - "build_directory": "../../builds", - "build_timestamp": "{{isotime \"20060102150405\"}}", - "cpus": "2", - "disk_size": "65536", - "git_revision": "__unknown_git_revision__", - "headless": "", - "http_directory": "{{template_dir}}/http", - "http_proxy": "{{env `http_proxy`}}", - "https_proxy": "{{env `https_proxy`}}", - "iso_checksum": "b35d8b33c9fc316c03178d8f493ecb858269082337150f82af75c8d4663cc324", - "iso_name": "debian-9.13.0-ppc64el-netinst.iso", - "memory": "1024", - "mirror": "http://cdimage.debian.org/cdimage/archive", - "mirror_directory": "9.13.0/ppc64el/iso-cd", - "name": "debian-9.13", - "no_proxy": "{{env `no_proxy`}}", - "preseed_path": "debian-9/preseed.cfg", - "qemu_display": "none", - "template": "debian-9.13-ppc64el", - "version": "TIMESTAMP" - } -} diff --git a/packer_templates/debian/http/debian-9/preseed.cfg b/packer_templates/debian/http/debian-9/preseed.cfg deleted file mode 100644 index 7d0ce7c2b..000000000 --- a/packer_templates/debian/http/debian-9/preseed.cfg +++ /dev/null @@ -1,47 +0,0 @@ -choose-mirror-bin mirror/http/proxy string -d-i apt-setup/use_mirror boolean true -d-i base-installer/kernel/override-image string linux-server -d-i clock-setup/utc boolean true -d-i clock-setup/utc-auto boolean true -d-i finish-install/reboot_in_progress note -d-i grub-installer/only_debian boolean true -d-i grub-installer/with_other_os boolean true -d-i keymap select us -d-i mirror/country string manual -d-i mirror/http/directory string /debian -d-i mirror/http/hostname string httpredir.debian.org -d-i mirror/http/proxy string -d-i partman-auto-lvm/guided_size string max -d-i partman-auto/choose_recipe select atomic -d-i partman-auto/method string lvm -d-i partman-lvm/confirm boolean true -d-i partman-lvm/confirm_nooverwrite boolean true -d-i partman-lvm/device_remove_lvm boolean true -d-i partman/choose_partition select finish -d-i partman/confirm boolean true -d-i partman/confirm_nooverwrite boolean true -d-i partman/confirm_write_new_label boolean true -d-i passwd/root-login boolean false -d-i passwd/root-password-again password vagrant -d-i passwd/root-password password vagrant -d-i passwd/user-fullname string vagrant -d-i passwd/user-uid string 1000 -d-i passwd/user-password password vagrant -d-i passwd/user-password-again password vagrant -d-i passwd/username string vagrant -d-i pkgsel/include string sudo bzip2 acpid cryptsetup zlib1g-dev wget curl dkms fuse make nfs-common net-tools cifs-utils rsync -d-i pkgsel/install-language-support boolean false -d-i pkgsel/update-policy select none -d-i pkgsel/upgrade select full-upgrade -# Prevent packaged version of VirtualBox Guest Additions being installed: -d-i preseed/early_command string sed -i \ - '/in-target/idiscover(){/sbin/discover|grep -v VirtualBox;}' \ - /usr/lib/pre-pkgsel.d/20install-hwpackages -d-i time/zone string UTC -d-i user-setup/allow-password-weak boolean true -d-i user-setup/encrypt-home boolean false -d-i preseed/late_command string sed -i '/^deb cdrom:/s/^/#/' /target/etc/apt/sources.list -apt-cdrom-setup apt-setup/cdrom/set-first boolean false -apt-mirror-setup apt-setup/use_mirror boolean true -popularity-contest popularity-contest/participate boolean false -tasksel tasksel/first multiselect standard, ssh-server diff --git a/packer_templates/fedora/fedora-36-arm64.json b/packer_templates/fedora/fedora-36-arm64.json deleted file mode 100644 index adc8b4747..000000000 --- a/packer_templates/fedora/fedora-36-arm64.json +++ /dev/null @@ -1,84 +0,0 @@ -{ - "builders": [ - { - "boot_command": "{{user `boot_command`}}", - "boot_wait": "5s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "fedora-core", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-parallels", - "parallels_tools_flavor": "lin-arm", - "prlctl_version_file": ".prlctl_version", - "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "type": "parallels-iso", - "vm_name": "{{ user `template` }}" - } - ], - "post-processors": [ - { - "output": "{{ user `build_directory` }}/{{user `box_basename`}}.{{.Provider}}.box", - "type": "vagrant" - } - ], - "provisioners": [ - { - "environment_vars": [ - "HOME_DIR=/home/vagrant", - "http_proxy={{user `http_proxy`}}", - "https_proxy={{user `https_proxy`}}", - "no_proxy={{user `no_proxy`}}" - ], - "execute_command": "echo 'vagrant' | {{.Vars}} sudo -E -S bash '{{.Path}}'", - "expect_disconnect": true, - "scripts": [ - "{{template_dir}}/scripts/fix-slow-dns.sh", - "{{template_dir}}/scripts/update.sh", - "{{template_dir}}/scripts/build-tools.sh", - "{{template_dir}}/scripts/install-supporting-packages.sh", - "{{template_dir}}/../_common/motd.sh", - "{{template_dir}}/../_common/sshd.sh", - "{{template_dir}}/../_common/virtualbox.sh", - "{{template_dir}}/scripts/vmware.sh", - "{{template_dir}}/../_common/parallels.sh", - "{{template_dir}}/../_common/vagrant.sh", - "{{template_dir}}/scripts/real-tmp.sh", - "{{template_dir}}/scripts/cleanup.sh", - "{{template_dir}}/scripts/crypto-policy.sh", - "{{template_dir}}/../_common/minimize.sh" - ], - "type": "shell" - } - ], - "variables": { - "box_basename": "fedora-36", - "build_directory": "../../builds", - "build_timestamp": "{{isotime \"20060102150405\"}}", - "cpus": "2", - "disk_size": "65536", - "git_revision": "__unknown_git_revision__", - "guest_additions_url": "", - "headless": "", - "http_directory": "{{template_dir}}/http", - "http_proxy": "{{env `http_proxy`}}", - "https_proxy": "{{env `https_proxy`}}", - "iso_checksum": "sha256:0ab4000575ff8b258576750ecf4ca39b266f0c88cab5fe3d8d2f88c9bea4830d", - "iso_name": "Fedora-Server-dvd-aarch64-36-1.5.iso", - "ks_path": "ks-fedora.cfg", - "memory": "1024", - "mirror": "http://download.fedoraproject.org/pub/fedora/linux", - "mirror_directory": "releases/36/Server/aarch64/iso", - "name": "fedora-36", - "no_proxy": "{{env `no_proxy`}}", - "template": "fedora-36-arm64", - "boot_command": "<up><wait>e<down><down><end> inst.text inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait><f10>", - "version": "TIMESTAMP" - } -} diff --git a/packer_templates/fedora/fedora-36-x86_64.json b/packer_templates/fedora/fedora-36-x86_64.json deleted file mode 100644 index e26be798c..000000000 --- a/packer_templates/fedora/fedora-36-x86_64.json +++ /dev/null @@ -1,191 +0,0 @@ -{ - "builders": [ - { - "accelerator": "kvm", - "boot_command": "{{user `boot_command`}}", - "boot_wait": "5s", - "cpus": "{{ user `cpus` }}", - "disk_cache": "unsafe", - "disk_compression": true, - "disk_discard": "unmap", - "disk_interface": "virtio-scsi", - "disk_size": "{{user `disk_size`}}", - "format": "qcow2", - "headless": "{{ user `headless` }}", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "name": "{{ user `template` }}", - "net_device": "virtio-net", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-libvirt", - "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "3600s", - "ssh_username": "vagrant", - "type": "qemu", - "vm_name": "{{ user `template` }}", - "qemuargs": [ - [ "-m", "{{ user `memory` }}" ], - [ "-display", "{{ user `qemu_display` }}" ] - ] - }, - { - "boot_command": "{{user `boot_command`}}", - "boot_wait": "5s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", - "guest_additions_url": "{{ user `guest_additions_url` }}", - "guest_os_type": "Fedora_64", - "hard_drive_interface": "sata", - "headless": "{{ user `headless` }}", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-virtualbox", - "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "type": "virtualbox-iso", - "virtualbox_version_file": ".vbox_version", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": "{{ user `boot_command` }}", - "boot_wait": "5s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "fedora-64", - "headless": "{{ user `headless` }}", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-vmware", - "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "tools_upload_flavor": "linux", - "type": "vmware-iso", - "version": 19, - "vm_name": "{{ user `template` }}", - "vmx_data": { - "cpuid.coresPerSocket": "1", - "ethernet0.pciSlotNumber": "32" - }, - "vmx_remove_ethernet_interfaces": true - }, - { - "boot_command": "{{user `boot_command`}}", - "boot_wait": "5s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "fedora-core", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-parallels", - "parallels_tools_flavor": "lin", - "prlctl_version_file": ".prlctl_version", - "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "type": "parallels-iso", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": "{{user `boot_command`}}", - "boot_wait": "5s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "headless": "{{ user `headless` }}", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-qemu", - "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "type": "qemu", - "vm_name": "{{ user `template` }}", - "qemuargs": [ - [ "-m", "{{ user `memory` }}" ], - [ "-display", "{{ user `qemu_display` }}" ] - ] - } - ], - "post-processors": [ - { - "output": "{{ user `build_directory` }}/{{user `box_basename`}}.{{.Provider}}.box", - "type": "vagrant" - } - ], - "provisioners": [ - { - "environment_vars": [ - "HOME_DIR=/home/vagrant", - "http_proxy={{user `http_proxy`}}", - "https_proxy={{user `https_proxy`}}", - "no_proxy={{user `no_proxy`}}" - ], - "execute_command": "echo 'vagrant' | {{.Vars}} sudo -E -S bash '{{.Path}}'", - "expect_disconnect": true, - "scripts": [ - "{{template_dir}}/scripts/fix-slow-dns.sh", - "{{template_dir}}/scripts/update.sh", - "{{template_dir}}/scripts/build-tools.sh", - "{{template_dir}}/scripts/install-supporting-packages.sh", - "{{template_dir}}/../_common/motd.sh", - "{{template_dir}}/../_common/sshd.sh", - "{{template_dir}}/../_common/virtualbox.sh", - "{{template_dir}}/scripts/vmware.sh", - "{{template_dir}}/../_common/parallels.sh", - "{{template_dir}}/../_common/vagrant.sh", - "{{template_dir}}/scripts/real-tmp.sh", - "{{template_dir}}/scripts/cleanup.sh", - "{{template_dir}}/scripts/crypto-policy.sh", - "{{template_dir}}/../_common/minimize.sh" - ], - "type": "shell" - } - ], - "variables": { - "arch": "64", - "box_basename": "fedora-36", - "build_directory": "../../builds", - "build_timestamp": "{{isotime \"20060102150405\"}}", - "cpus": "2", - "disk_size": "65536", - "git_revision": "__unknown_git_revision__", - "guest_additions_url": "", - "headless": "", - "http_directory": "{{template_dir}}/http", - "http_proxy": "{{env `http_proxy`}}", - "https_proxy": "{{env `https_proxy`}}", - "iso_checksum": "sha256:5edaf708a52687b09f9810c2b6d2a3432edac1b18f4d8c908c0da6bde0379148", - "iso_name": "Fedora-Server-dvd-x86_64-36-1.5.iso", - "ks_path": "ks-fedora.cfg", - "memory": "1024", - "mirror": "http://download.fedoraproject.org/pub/fedora/linux", - "mirror_directory": "releases/36/Server/x86_64/iso", - "name": "fedora-36", - "no_proxy": "{{env `no_proxy`}}", - "qemu_display": "none", - "template": "fedora-36-x86_64", - "boot_command": "<up><wait><tab> inst.text inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>", - "version": "TIMESTAMP" - } -} diff --git a/packer_templates/fedora/fedora-37-x86_64.json b/packer_templates/fedora/fedora-37-x86_64.json deleted file mode 100644 index 7e5b1d4c4..000000000 --- a/packer_templates/fedora/fedora-37-x86_64.json +++ /dev/null @@ -1,191 +0,0 @@ -{ - "builders": [ - { - "accelerator": "kvm", - "boot_command": "{{user `boot_command`}}", - "boot_wait": "5s", - "cpus": "{{ user `cpus` }}", - "disk_cache": "unsafe", - "disk_compression": true, - "disk_discard": "unmap", - "disk_interface": "virtio-scsi", - "disk_size": "{{user `disk_size`}}", - "format": "qcow2", - "headless": "{{ user `headless` }}", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "name": "{{ user `template` }}", - "net_device": "virtio-net", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-libvirt", - "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "3600s", - "ssh_username": "vagrant", - "type": "qemu", - "vm_name": "{{ user `template` }}", - "qemuargs": [ - [ "-m", "{{ user `memory` }}" ], - [ "-display", "{{ user `qemu_display` }}" ] - ] - }, - { - "boot_command": "{{user `boot_command`}}", - "boot_wait": "5s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", - "guest_additions_url": "{{ user `guest_additions_url` }}", - "guest_os_type": "Fedora_64", - "hard_drive_interface": "sata", - "headless": "{{ user `headless` }}", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-virtualbox", - "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "type": "virtualbox-iso", - "virtualbox_version_file": ".vbox_version", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": "{{ user `boot_command` }}", - "boot_wait": "5s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "fedora-64", - "headless": "{{ user `headless` }}", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-vmware", - "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "tools_upload_flavor": "linux", - "type": "vmware-iso", - "version": 19, - "vm_name": "{{ user `template` }}", - "vmx_data": { - "cpuid.coresPerSocket": "1", - "ethernet0.pciSlotNumber": "32" - }, - "vmx_remove_ethernet_interfaces": true - }, - { - "boot_command": "{{user `boot_command`}}", - "boot_wait": "5s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "fedora-core", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-parallels", - "parallels_tools_flavor": "lin", - "prlctl_version_file": ".prlctl_version", - "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "type": "parallels-iso", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": "{{user `boot_command`}}", - "boot_wait": "5s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "headless": "{{ user `headless` }}", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-qemu", - "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "type": "qemu", - "vm_name": "{{ user `template` }}", - "qemuargs": [ - [ "-m", "{{ user `memory` }}" ], - [ "-display", "{{ user `qemu_display` }}" ] - ] - } - ], - "post-processors": [ - { - "output": "{{ user `build_directory` }}/{{user `box_basename`}}.{{.Provider}}.box", - "type": "vagrant" - } - ], - "provisioners": [ - { - "environment_vars": [ - "HOME_DIR=/home/vagrant", - "http_proxy={{user `http_proxy`}}", - "https_proxy={{user `https_proxy`}}", - "no_proxy={{user `no_proxy`}}" - ], - "execute_command": "echo 'vagrant' | {{.Vars}} sudo -E -S bash '{{.Path}}'", - "expect_disconnect": true, - "scripts": [ - "{{template_dir}}/scripts/fix-slow-dns.sh", - "{{template_dir}}/scripts/update.sh", - "{{template_dir}}/scripts/build-tools.sh", - "{{template_dir}}/scripts/install-supporting-packages.sh", - "{{template_dir}}/../_common/motd.sh", - "{{template_dir}}/../_common/sshd.sh", - "{{template_dir}}/../_common/virtualbox.sh", - "{{template_dir}}/scripts/vmware.sh", - "{{template_dir}}/../_common/parallels.sh", - "{{template_dir}}/../_common/vagrant.sh", - "{{template_dir}}/scripts/real-tmp.sh", - "{{template_dir}}/scripts/cleanup.sh", - "{{template_dir}}/scripts/crypto-policy.sh", - "{{template_dir}}/../_common/minimize.sh" - ], - "type": "shell" - } - ], - "variables": { - "arch": "64", - "box_basename": "fedora-37", - "build_directory": "../../builds", - "build_timestamp": "{{isotime \"20060102150405\"}}", - "cpus": "2", - "disk_size": "65536", - "git_revision": "__unknown_git_revision__", - "guest_additions_url": "", - "headless": "", - "http_directory": "{{template_dir}}/http", - "http_proxy": "{{env `http_proxy`}}", - "https_proxy": "{{env `https_proxy`}}", - "iso_checksum": "sha256:0a4de5157af47b41a07a53726cd62ffabd04d5c1a4afece5ee7c7a84c1213e4f", - "iso_name": "Fedora-Server-dvd-x86_64-37-1.7.iso", - "ks_path": "ks-fedora.cfg", - "memory": "1024", - "mirror": "http://download.fedoraproject.org/pub/fedora/linux", - "mirror_directory": "releases/37/Server/x86_64/iso", - "name": "fedora-37", - "no_proxy": "{{env `no_proxy`}}", - "qemu_display": "none", - "template": "fedora-37-x86_64", - "boot_command": "<up><up>e<wait><down><down><end> inst.text inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<F10><wait>", - "version": "TIMESTAMP" - } -} diff --git a/packer_templates/fedora/scripts/crypto-policy.sh b/packer_templates/fedora/scripts/crypto-policy.sh deleted file mode 100755 index ba42084a8..000000000 --- a/packer_templates/fedora/scripts/crypto-policy.sh +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/bash -eux -update-crypto-policies --set LEGACY \ No newline at end of file diff --git a/packer_templates/fedora/scripts/update.sh b/packer_templates/fedora/scripts/update.sh deleted file mode 100644 index 7b5219af0..000000000 --- a/packer_templates/fedora/scripts/update.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/sh -eux - -dnf -y update - -reboot; -sleep 60; diff --git a/packer_templates/freebsd/freebsd-12.3-amd64.json b/packer_templates/freebsd/freebsd-12.3-amd64.json deleted file mode 100644 index 6f8bbc3f2..000000000 --- a/packer_templates/freebsd/freebsd-12.3-amd64.json +++ /dev/null @@ -1,211 +0,0 @@ -{ - "builders": [ - { - "boot_command": [ - "<esc><wait>", - "boot -s<wait>", - "<enter><wait>", - "<wait10><wait10>", - "/bin/sh<enter><wait>", - "mdmfs -s 100m md1 /tmp<enter><wait>", - "mdmfs -s 100m md2 /mnt<enter><wait>", - "dhclient -p /tmp/dhclient.em0.pid -l /tmp/dhclient.lease.em0 em0<enter><wait>", - "fetch -o /tmp/installerconfig http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} \u0026\u0026 bsdinstall script /tmp/installerconfig<enter><wait>" - ], - "boot_wait": "5s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "guest_additions_mode": "disable", - "guest_os_type": "FreeBSD_64", - "headless": "{{ user `headless` }}", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-virtualbox", - "shutdown_command": "echo 'vagrant' | su -m root -c 'shutdown -p now'", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "type": "virtualbox-iso", - "virtualbox_version_file": ".vbox_version", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<esc><wait>", - "boot -s<wait>", - "<enter><wait>", - "<wait10><wait10>", - "/bin/sh<enter><wait>", - "mdmfs -s 100m md1 /tmp<enter><wait>", - "mdmfs -s 100m md2 /mnt<enter><wait>", - "dhclient -p /tmp/dhclient.em0.pid -l /tmp/dhclient.lease.em0 em0<enter><wait>", - "<wait5>", - "fetch -o /tmp/installerconfig http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} \u0026\u0026 bsdinstall script /tmp/installerconfig<enter><wait>" - ], - "boot_wait": "5s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "freebsd-64", - "headless": "{{ user `headless` }}", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-vmware", - "shutdown_command": "echo 'vagrant' | su -m root -c 'shutdown -p now'", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "type": "vmware-iso", - "vm_name": "{{ user `template` }}", - "vmx_data": { - "cpuid.coresPerSocket": "1" - }, - "vmx_remove_ethernet_interfaces": true - }, - { - "boot_command": [ - "<esc><wait>", - "boot -s<wait>", - "<enter><wait>", - "<wait10><wait10>", - "/bin/sh<enter><wait>", - "mdmfs -s 100m md1 /tmp<enter><wait>", - "mdmfs -s 100m md2 /mnt<enter><wait>", - "dhclient -p /tmp/dhclient.em0.pid -l /tmp/dhclient.lease.em0 em0<enter><wait>", - "fetch -o /tmp/installerconfig http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} \u0026\u0026 bsdinstall script /tmp/installerconfig<enter><wait>" - ], - "boot_wait": "8s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "freebsd", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-parallels", - "parallels_tools_mode": "disable", - "prlctl": [ - [ - "set", - "{{.Name}}", - "--device-set", - "cdrom0", - "--iface", - "ide" - ], - [ - "set", - "{{.Name}}", - "--device-del", - "fdd0" - ], - [ - "set", - "{{.Name}}", - "--device-del", - "parallel0" - ] - ], - "prlctl_version_file": ".prlctl_version", - "shutdown_command": "echo 'vagrant' | su -m root -c 'shutdown -p now'", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "type": "parallels-iso", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<esc><wait>", - "boot -s<wait>", - "<enter><wait>", - "<wait10><wait10>", - "/bin/sh<enter><wait>", - "mdmfs -s 100m md1 /tmp<enter><wait>", - "mdmfs -s 100m md2 /mnt<enter><wait>", - "dhclient -p /tmp/dhclient.vtnet0.pid -l /tmp/dhclient.lease.vtnet0 vtnet0<enter><wait>", - "fetch -o /tmp/installerconfig http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} \u0026\u0026 bsdinstall script /tmp/installerconfig<enter><wait>" - ], - "boot_wait": "7s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "headless": "{{ user `headless` }}", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-qemu", - "shutdown_command": "echo 'vagrant' | su -m root -c 'shutdown -p now'", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "type": "qemu", - "vm_name": "{{ user `template` }}", - "qemuargs": [ - [ "-m", "{{ user `memory` }}" ], - [ "-display", "{{ user `qemu_display` }}" ] - ] - } - ], - "post-processors": [ - { - "output": "{{ user `build_directory` }}/{{user `box_basename`}}.{{.Provider}}.box", - "type": "vagrant", - "vagrantfile_template": "{{template_dir}}/vagrantfile_templates/freebsd.rb" - } - ], - "provisioners": [ - { - "environment_vars": [ - "HOME_DIR=/home/vagrant", - "http_proxy={{user `http_proxy`}}", - "https_proxy={{user `https_proxy`}}", - "no_proxy={{user `no_proxy`}}", - "pkg_branch={{user `pkg_branch`}}" - ], - "execute_command": "echo 'vagrant' | {{.Vars}} su -m root -c 'sh -eux {{.Path}}'", - "expect_disconnect": true, - "scripts": [ - "{{template_dir}}/scripts/update.sh", - "{{template_dir}}/scripts/postinstall.sh", - "{{template_dir}}/scripts/sudoers.sh", - "{{template_dir}}/../_common/vagrant.sh", - "{{template_dir}}/scripts/vmtools.sh", - "{{template_dir}}/scripts/cleanup.sh", - "{{template_dir}}/scripts/minimize.sh" - ], - "type": "shell" - } - ], - "variables": { - "box_basename": "freebsd-12.3", - "build_directory": "../../builds", - "build_timestamp": "{{isotime \"20060102150405\"}}", - "cpus": "2", - "disk_size": "65536", - "git_revision": "__unknown_git_revision__", - "headless": "", - "http_directory": "{{template_dir}}/http", - "http_proxy": "{{env `http_proxy`}}", - "https_proxy": "{{env `https_proxy`}}", - "install_path": "installerconfig", - "iso_checksum": "5f0c10ff9af582c7fca90f65868702aa02e80f344c186f0bc75639a687d65641", - "iso_name": "FreeBSD-12.3-RELEASE-amd64-disc1.iso", - "memory": "1024", - "mirror": "https://download.freebsd.org", - "mirror_directory": "releases/amd64/amd64/ISO-IMAGES/12.3", - "name": "freebsd-12.3", - "no_proxy": "{{env `no_proxy`}}", - "pkg_branch": "quarterly", - "qemu_display": "none", - "template": "freebsd-12.3-amd64", - "version": "TIMESTAMP" - } -} diff --git a/packer_templates/freebsd/freebsd-12.3-i386.json b/packer_templates/freebsd/freebsd-12.3-i386.json deleted file mode 100644 index 4e2af23c6..000000000 --- a/packer_templates/freebsd/freebsd-12.3-i386.json +++ /dev/null @@ -1,211 +0,0 @@ -{ - "builders": [ - { - "boot_command": [ - "<esc><wait>", - "boot -s<wait>", - "<enter><wait>", - "<wait10><wait10>", - "/bin/sh<enter><wait>", - "mdmfs -s 100m md1 /tmp<enter><wait>", - "mdmfs -s 100m md2 /mnt<enter><wait>", - "dhclient -p /tmp/dhclient.em0.pid -l /tmp/dhclient.lease.em0 em0<enter><wait>", - "fetch -o /tmp/installerconfig http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} \u0026\u0026 bsdinstall script /tmp/installerconfig<enter><wait>" - ], - "boot_wait": "5s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "guest_additions_mode": "disable", - "guest_os_type": "FreeBSD", - "headless": "{{ user `headless` }}", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-virtualbox", - "shutdown_command": "echo 'vagrant' | su -m root -c 'shutdown -p now'", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "type": "virtualbox-iso", - "virtualbox_version_file": ".vbox_version", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<esc><wait>", - "boot -s<wait>", - "<enter><wait>", - "<wait10><wait10>", - "/bin/sh<enter><wait>", - "mdmfs -s 100m md1 /tmp<enter><wait>", - "mdmfs -s 100m md2 /mnt<enter><wait>", - "dhclient -p /tmp/dhclient.em0.pid -l /tmp/dhclient.lease.em0 em0<enter><wait>", - "<wait5>", - "fetch -o /tmp/installerconfig http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} \u0026\u0026 bsdinstall script /tmp/installerconfig<enter><wait>" - ], - "boot_wait": "5s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "freebsd", - "headless": "{{ user `headless` }}", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-vmware", - "shutdown_command": "echo 'vagrant' | su -m root -c 'shutdown -p now'", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "type": "vmware-iso", - "vm_name": "{{ user `template` }}", - "vmx_data": { - "cpuid.coresPerSocket": "1" - }, - "vmx_remove_ethernet_interfaces": true - }, - { - "boot_command": [ - "<esc><wait>", - "boot -s<wait>", - "<enter><wait>", - "<wait10><wait10>", - "/bin/sh<enter><wait>", - "mdmfs -s 100m md1 /tmp<enter><wait>", - "mdmfs -s 100m md2 /mnt<enter><wait>", - "dhclient -p /tmp/dhclient.em0.pid -l /tmp/dhclient.lease.em0 em0<enter><wait>", - "fetch -o /tmp/installerconfig http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} \u0026\u0026 bsdinstall script /tmp/installerconfig<enter><wait>" - ], - "boot_wait": "8s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "freebsd", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-parallels", - "parallels_tools_mode": "disable", - "prlctl": [ - [ - "set", - "{{.Name}}", - "--device-set", - "cdrom0", - "--iface", - "ide" - ], - [ - "set", - "{{.Name}}", - "--device-del", - "fdd0" - ], - [ - "set", - "{{.Name}}", - "--device-del", - "parallel0" - ] - ], - "prlctl_version_file": ".prlctl_version", - "shutdown_command": "echo 'vagrant' | su -m root -c 'shutdown -p now'", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "type": "parallels-iso", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<esc><wait>", - "boot -s<wait>", - "<enter><wait>", - "<wait10><wait10>", - "/bin/sh<enter><wait>", - "mdmfs -s 100m md1 /tmp<enter><wait>", - "mdmfs -s 100m md2 /mnt<enter><wait>", - "dhclient -p /tmp/dhclient.vtnet0.pid -l /tmp/dhclient.lease.vtnet0 vtnet0<enter><wait>", - "fetch -o /tmp/installerconfig http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} \u0026\u0026 bsdinstall script /tmp/installerconfig<enter><wait>" - ], - "boot_wait": "7s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "headless": "{{ user `headless` }}", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-qemu", - "shutdown_command": "echo 'vagrant' | su -m root -c 'shutdown -p now'", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "type": "qemu", - "vm_name": "{{ user `template` }}", - "qemuargs": [ - [ "-m", "{{ user `memory` }}" ], - [ "-display", "{{ user `qemu_display` }}" ] - ] - } - ], - "post-processors": [ - { - "output": "{{ user `build_directory` }}/{{user `box_basename`}}.{{.Provider}}.box", - "type": "vagrant", - "vagrantfile_template": "{{template_dir}}/vagrantfile_templates/freebsd.rb" - } - ], - "provisioners": [ - { - "environment_vars": [ - "HOME_DIR=/home/vagrant", - "http_proxy={{user `http_proxy`}}", - "https_proxy={{user `https_proxy`}}", - "no_proxy={{user `no_proxy`}}", - "pkg_branch={{user `pkg_branch`}}" - ], - "execute_command": "echo 'vagrant' | {{.Vars}} su -m root -c 'sh -eux {{.Path}}'", - "expect_disconnect": true, - "scripts": [ - "{{template_dir}}/scripts/update.sh", - "{{template_dir}}/scripts/postinstall.sh", - "{{template_dir}}/scripts/sudoers.sh", - "{{template_dir}}/../_common/vagrant.sh", - "{{template_dir}}/scripts/vmtools.sh", - "{{template_dir}}/scripts/cleanup.sh", - "{{template_dir}}/scripts/minimize.sh" - ], - "type": "shell" - } - ], - "variables": { - "box_basename": "freebsd-12.3-i386", - "build_directory": "../../builds", - "build_timestamp": "{{isotime \"20060102150405\"}}", - "cpus": "2", - "disk_size": "40960", - "git_revision": "__unknown_git_revision__", - "headless": "", - "http_directory": "{{template_dir}}/http", - "http_proxy": "{{env `http_proxy`}}", - "https_proxy": "{{env `https_proxy`}}", - "install_path": "installerconfig", - "iso_checksum": "cc90ab819d3fc4782227fc4269ea7de0747c007cfca9df905f9e50c8617fd820", - "iso_name": "FreeBSD-12.3-RELEASE-i386-disc1.iso", - "memory": "1024", - "mirror": "https://download.freebsd.org", - "mirror_directory": "releases/i386/i386/ISO-IMAGES/12.3", - "name": "freebsd-12.3-i386", - "no_proxy": "{{env `no_proxy`}}", - "pkg_branch": "quarterly", - "qemu_display": "none", - "template": "freebsd-12.3-i386", - "version": "TIMESTAMP" - } -} diff --git a/packer_templates/freebsd/freebsd-12.4-amd64.json b/packer_templates/freebsd/freebsd-12.4-amd64.json deleted file mode 100644 index 54b95da53..000000000 --- a/packer_templates/freebsd/freebsd-12.4-amd64.json +++ /dev/null @@ -1,211 +0,0 @@ -{ - "builders": [ - { - "boot_command": [ - "<esc><wait>", - "boot -s<wait>", - "<enter><wait>", - "<wait10><wait10>", - "/bin/sh<enter><wait>", - "mdmfs -s 100m md1 /tmp<enter><wait>", - "mdmfs -s 100m md2 /mnt<enter><wait>", - "dhclient -p /tmp/dhclient.em0.pid -l /tmp/dhclient.lease.em0 em0<enter><wait>", - "fetch -o /tmp/installerconfig http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} \u0026\u0026 bsdinstall script /tmp/installerconfig<enter><wait>" - ], - "boot_wait": "5s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "guest_additions_mode": "disable", - "guest_os_type": "FreeBSD_64", - "headless": "{{ user `headless` }}", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-virtualbox", - "shutdown_command": "echo 'vagrant' | su -m root -c 'shutdown -p now'", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "type": "virtualbox-iso", - "virtualbox_version_file": ".vbox_version", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<esc><wait>", - "boot -s<wait>", - "<enter><wait>", - "<wait10><wait10>", - "/bin/sh<enter><wait>", - "mdmfs -s 100m md1 /tmp<enter><wait>", - "mdmfs -s 100m md2 /mnt<enter><wait>", - "dhclient -p /tmp/dhclient.em0.pid -l /tmp/dhclient.lease.em0 em0<enter><wait>", - "<wait5>", - "fetch -o /tmp/installerconfig http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} \u0026\u0026 bsdinstall script /tmp/installerconfig<enter><wait>" - ], - "boot_wait": "5s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "freebsd-64", - "headless": "{{ user `headless` }}", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-vmware", - "shutdown_command": "echo 'vagrant' | su -m root -c 'shutdown -p now'", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "type": "vmware-iso", - "vm_name": "{{ user `template` }}", - "vmx_data": { - "cpuid.coresPerSocket": "1" - }, - "vmx_remove_ethernet_interfaces": true - }, - { - "boot_command": [ - "<esc><wait>", - "boot -s<wait>", - "<enter><wait>", - "<wait10><wait10>", - "/bin/sh<enter><wait>", - "mdmfs -s 100m md1 /tmp<enter><wait>", - "mdmfs -s 100m md2 /mnt<enter><wait>", - "dhclient -p /tmp/dhclient.em0.pid -l /tmp/dhclient.lease.em0 em0<enter><wait>", - "fetch -o /tmp/installerconfig http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} \u0026\u0026 bsdinstall script /tmp/installerconfig<enter><wait>" - ], - "boot_wait": "8s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "freebsd", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-parallels", - "parallels_tools_mode": "disable", - "prlctl": [ - [ - "set", - "{{.Name}}", - "--device-set", - "cdrom0", - "--iface", - "ide" - ], - [ - "set", - "{{.Name}}", - "--device-del", - "fdd0" - ], - [ - "set", - "{{.Name}}", - "--device-del", - "parallel0" - ] - ], - "prlctl_version_file": ".prlctl_version", - "shutdown_command": "echo 'vagrant' | su -m root -c 'shutdown -p now'", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "type": "parallels-iso", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<esc><wait>", - "boot -s<wait>", - "<enter><wait>", - "<wait10><wait10>", - "/bin/sh<enter><wait>", - "mdmfs -s 100m md1 /tmp<enter><wait>", - "mdmfs -s 100m md2 /mnt<enter><wait>", - "dhclient -p /tmp/dhclient.vtnet0.pid -l /tmp/dhclient.lease.vtnet0 vtnet0<enter><wait>", - "fetch -o /tmp/installerconfig http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} \u0026\u0026 bsdinstall script /tmp/installerconfig<enter><wait>" - ], - "boot_wait": "7s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "headless": "{{ user `headless` }}", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-qemu", - "shutdown_command": "echo 'vagrant' | su -m root -c 'shutdown -p now'", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "type": "qemu", - "vm_name": "{{ user `template` }}", - "qemuargs": [ - [ "-m", "{{ user `memory` }}" ], - [ "-display", "{{ user `qemu_display` }}" ] - ] - } - ], - "post-processors": [ - { - "output": "{{ user `build_directory` }}/{{user `box_basename`}}.{{.Provider}}.box", - "type": "vagrant", - "vagrantfile_template": "{{template_dir}}/vagrantfile_templates/freebsd.rb" - } - ], - "provisioners": [ - { - "environment_vars": [ - "HOME_DIR=/home/vagrant", - "http_proxy={{user `http_proxy`}}", - "https_proxy={{user `https_proxy`}}", - "no_proxy={{user `no_proxy`}}", - "pkg_branch={{user `pkg_branch`}}" - ], - "execute_command": "echo 'vagrant' | {{.Vars}} su -m root -c 'sh -eux {{.Path}}'", - "expect_disconnect": true, - "scripts": [ - "{{template_dir}}/scripts/update.sh", - "{{template_dir}}/scripts/postinstall.sh", - "{{template_dir}}/scripts/sudoers.sh", - "{{template_dir}}/../_common/vagrant.sh", - "{{template_dir}}/scripts/vmtools.sh", - "{{template_dir}}/scripts/cleanup.sh", - "{{template_dir}}/scripts/minimize.sh" - ], - "type": "shell" - } - ], - "variables": { - "box_basename": "freebsd-12.4", - "build_directory": "../../builds", - "build_timestamp": "{{isotime \"20060102150405\"}}", - "cpus": "2", - "disk_size": "65536", - "git_revision": "__unknown_git_revision__", - "headless": "", - "http_directory": "{{template_dir}}/http", - "http_proxy": "{{env `http_proxy`}}", - "https_proxy": "{{env `https_proxy`}}", - "install_path": "installerconfig", - "iso_checksum": "606435637b76991f96df68f561badf03266f3d5452e9f72ed9b130d96b188800", - "iso_name": "FreeBSD-12.4-RELEASE-amd64-disc1.iso", - "memory": "1024", - "mirror": "https://download.freebsd.org", - "mirror_directory": "releases/amd64/amd64/ISO-IMAGES/12.4", - "name": "freebsd-12.4", - "no_proxy": "{{env `no_proxy`}}", - "pkg_branch": "quarterly", - "qemu_display": "none", - "template": "freebsd-12.4-amd64", - "version": "TIMESTAMP" - } -} diff --git a/packer_templates/freebsd/freebsd-12.4-i386.json b/packer_templates/freebsd/freebsd-12.4-i386.json deleted file mode 100644 index d2406f7ec..000000000 --- a/packer_templates/freebsd/freebsd-12.4-i386.json +++ /dev/null @@ -1,211 +0,0 @@ -{ - "builders": [ - { - "boot_command": [ - "<esc><wait>", - "boot -s<wait>", - "<enter><wait>", - "<wait10><wait10>", - "/bin/sh<enter><wait>", - "mdmfs -s 100m md1 /tmp<enter><wait>", - "mdmfs -s 100m md2 /mnt<enter><wait>", - "dhclient -p /tmp/dhclient.em0.pid -l /tmp/dhclient.lease.em0 em0<enter><wait>", - "fetch -o /tmp/installerconfig http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} \u0026\u0026 bsdinstall script /tmp/installerconfig<enter><wait>" - ], - "boot_wait": "5s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "guest_additions_mode": "disable", - "guest_os_type": "FreeBSD", - "headless": "{{ user `headless` }}", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-virtualbox", - "shutdown_command": "echo 'vagrant' | su -m root -c 'shutdown -p now'", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "type": "virtualbox-iso", - "virtualbox_version_file": ".vbox_version", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<esc><wait>", - "boot -s<wait>", - "<enter><wait>", - "<wait10><wait10>", - "/bin/sh<enter><wait>", - "mdmfs -s 100m md1 /tmp<enter><wait>", - "mdmfs -s 100m md2 /mnt<enter><wait>", - "dhclient -p /tmp/dhclient.em0.pid -l /tmp/dhclient.lease.em0 em0<enter><wait>", - "<wait5>", - "fetch -o /tmp/installerconfig http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} \u0026\u0026 bsdinstall script /tmp/installerconfig<enter><wait>" - ], - "boot_wait": "5s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "freebsd", - "headless": "{{ user `headless` }}", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-vmware", - "shutdown_command": "echo 'vagrant' | su -m root -c 'shutdown -p now'", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "type": "vmware-iso", - "vm_name": "{{ user `template` }}", - "vmx_data": { - "cpuid.coresPerSocket": "1" - }, - "vmx_remove_ethernet_interfaces": true - }, - { - "boot_command": [ - "<esc><wait>", - "boot -s<wait>", - "<enter><wait>", - "<wait10><wait10>", - "/bin/sh<enter><wait>", - "mdmfs -s 100m md1 /tmp<enter><wait>", - "mdmfs -s 100m md2 /mnt<enter><wait>", - "dhclient -p /tmp/dhclient.em0.pid -l /tmp/dhclient.lease.em0 em0<enter><wait>", - "fetch -o /tmp/installerconfig http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} \u0026\u0026 bsdinstall script /tmp/installerconfig<enter><wait>" - ], - "boot_wait": "8s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "freebsd", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-parallels", - "parallels_tools_mode": "disable", - "prlctl": [ - [ - "set", - "{{.Name}}", - "--device-set", - "cdrom0", - "--iface", - "ide" - ], - [ - "set", - "{{.Name}}", - "--device-del", - "fdd0" - ], - [ - "set", - "{{.Name}}", - "--device-del", - "parallel0" - ] - ], - "prlctl_version_file": ".prlctl_version", - "shutdown_command": "echo 'vagrant' | su -m root -c 'shutdown -p now'", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "type": "parallels-iso", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<esc><wait>", - "boot -s<wait>", - "<enter><wait>", - "<wait10><wait10>", - "/bin/sh<enter><wait>", - "mdmfs -s 100m md1 /tmp<enter><wait>", - "mdmfs -s 100m md2 /mnt<enter><wait>", - "dhclient -p /tmp/dhclient.vtnet0.pid -l /tmp/dhclient.lease.vtnet0 vtnet0<enter><wait>", - "fetch -o /tmp/installerconfig http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} \u0026\u0026 bsdinstall script /tmp/installerconfig<enter><wait>" - ], - "boot_wait": "7s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "headless": "{{ user `headless` }}", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-qemu", - "shutdown_command": "echo 'vagrant' | su -m root -c 'shutdown -p now'", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "type": "qemu", - "vm_name": "{{ user `template` }}", - "qemuargs": [ - [ "-m", "{{ user `memory` }}" ], - [ "-display", "{{ user `qemu_display` }}" ] - ] - } - ], - "post-processors": [ - { - "output": "{{ user `build_directory` }}/{{user `box_basename`}}.{{.Provider}}.box", - "type": "vagrant", - "vagrantfile_template": "{{template_dir}}/vagrantfile_templates/freebsd.rb" - } - ], - "provisioners": [ - { - "environment_vars": [ - "HOME_DIR=/home/vagrant", - "http_proxy={{user `http_proxy`}}", - "https_proxy={{user `https_proxy`}}", - "no_proxy={{user `no_proxy`}}", - "pkg_branch={{user `pkg_branch`}}" - ], - "execute_command": "echo 'vagrant' | {{.Vars}} su -m root -c 'sh -eux {{.Path}}'", - "expect_disconnect": true, - "scripts": [ - "{{template_dir}}/scripts/update.sh", - "{{template_dir}}/scripts/postinstall.sh", - "{{template_dir}}/scripts/sudoers.sh", - "{{template_dir}}/../_common/vagrant.sh", - "{{template_dir}}/scripts/vmtools.sh", - "{{template_dir}}/scripts/cleanup.sh", - "{{template_dir}}/scripts/minimize.sh" - ], - "type": "shell" - } - ], - "variables": { - "box_basename": "freebsd-12.4-i386", - "build_directory": "../../builds", - "build_timestamp": "{{isotime \"20060102150405\"}}", - "cpus": "2", - "disk_size": "40960", - "git_revision": "__unknown_git_revision__", - "headless": "", - "http_directory": "{{template_dir}}/http", - "http_proxy": "{{env `http_proxy`}}", - "https_proxy": "{{env `https_proxy`}}", - "install_path": "installerconfig", - "iso_checksum": "73f4e4875ae4ab9e8695d1ec2cd42f1e4ab4c66b12d99194809eb623a18a7b0d", - "iso_name": "FreeBSD-12.4-RELEASE-i386-disc1.iso", - "memory": "1024", - "mirror": "https://download.freebsd.org", - "mirror_directory": "releases/i386/i386/ISO-IMAGES/12.4", - "name": "freebsd-12.4-i386", - "no_proxy": "{{env `no_proxy`}}", - "pkg_branch": "quarterly", - "qemu_display": "none", - "template": "freebsd-12.4-i386", - "version": "TIMESTAMP" - } -} diff --git a/packer_templates/freebsd/freebsd-13.1-amd64.json b/packer_templates/freebsd/freebsd-13.1-amd64.json deleted file mode 100644 index 6b1b3a1d5..000000000 --- a/packer_templates/freebsd/freebsd-13.1-amd64.json +++ /dev/null @@ -1,211 +0,0 @@ -{ - "builders": [ - { - "boot_command": [ - "<esc><wait>", - "boot -s<wait>", - "<enter><wait>", - "<wait10><wait10>", - "/bin/sh<enter><wait>", - "mdmfs -s 100m md1 /tmp<enter><wait>", - "mdmfs -s 100m md2 /mnt<enter><wait>", - "dhclient -p /tmp/dhclient.em0.pid -l /tmp/dhclient.lease.em0 em0<enter><wait>", - "fetch -o /tmp/installerconfig http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} \u0026\u0026 bsdinstall script /tmp/installerconfig<enter><wait>" - ], - "boot_wait": "5s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "guest_additions_mode": "disable", - "guest_os_type": "FreeBSD_64", - "headless": "{{ user `headless` }}", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-virtualbox", - "shutdown_command": "echo 'vagrant' | su -m root -c 'shutdown -p now'", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "type": "virtualbox-iso", - "virtualbox_version_file": ".vbox_version", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<esc><wait>", - "boot -s<wait>", - "<enter><wait>", - "<wait10><wait10>", - "/bin/sh<enter><wait>", - "mdmfs -s 100m md1 /tmp<enter><wait>", - "mdmfs -s 100m md2 /mnt<enter><wait>", - "dhclient -p /tmp/dhclient.em0.pid -l /tmp/dhclient.lease.em0 em0<enter><wait>", - "<wait5>", - "fetch -o /tmp/installerconfig http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} \u0026\u0026 bsdinstall script /tmp/installerconfig<enter><wait>" - ], - "boot_wait": "5s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "freebsd-64", - "headless": "{{ user `headless` }}", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-vmware", - "shutdown_command": "echo 'vagrant' | su -m root -c 'shutdown -p now'", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "type": "vmware-iso", - "vm_name": "{{ user `template` }}", - "vmx_data": { - "cpuid.coresPerSocket": "1" - }, - "vmx_remove_ethernet_interfaces": true - }, - { - "boot_command": [ - "<esc><wait>", - "boot -s<wait>", - "<enter><wait>", - "<wait10><wait10>", - "/bin/sh<enter><wait>", - "mdmfs -s 100m md1 /tmp<enter><wait>", - "mdmfs -s 100m md2 /mnt<enter><wait>", - "dhclient -p /tmp/dhclient.em0.pid -l /tmp/dhclient.lease.em0 em0<enter><wait>", - "fetch -o /tmp/installerconfig http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} \u0026\u0026 bsdinstall script /tmp/installerconfig<enter><wait>" - ], - "boot_wait": "8s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "freebsd", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-parallels", - "parallels_tools_mode": "disable", - "prlctl": [ - [ - "set", - "{{.Name}}", - "--device-set", - "cdrom0", - "--iface", - "ide" - ], - [ - "set", - "{{.Name}}", - "--device-del", - "fdd0" - ], - [ - "set", - "{{.Name}}", - "--device-del", - "parallel0" - ] - ], - "prlctl_version_file": ".prlctl_version", - "shutdown_command": "echo 'vagrant' | su -m root -c 'shutdown -p now'", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "type": "parallels-iso", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<esc><wait>", - "boot -s<wait>", - "<enter><wait>", - "<wait10><wait10>", - "/bin/sh<enter><wait>", - "mdmfs -s 100m md1 /tmp<enter><wait>", - "mdmfs -s 100m md2 /mnt<enter><wait>", - "dhclient -p /tmp/dhclient.vtnet0.pid -l /tmp/dhclient.lease.vtnet0 vtnet0<enter><wait>", - "fetch -o /tmp/installerconfig http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} \u0026\u0026 bsdinstall script /tmp/installerconfig<enter><wait>" - ], - "boot_wait": "7s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "headless": "{{ user `headless` }}", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-qemu", - "shutdown_command": "echo 'vagrant' | su -m root -c 'shutdown -p now'", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "type": "qemu", - "vm_name": "{{ user `template` }}", - "qemuargs": [ - [ "-m", "{{ user `memory` }}" ], - [ "-display", "{{ user `qemu_display` }}" ] - ] - } - ], - "post-processors": [ - { - "output": "{{ user `build_directory` }}/{{user `box_basename`}}.{{.Provider}}.box", - "type": "vagrant", - "vagrantfile_template": "{{template_dir}}/vagrantfile_templates/freebsd.rb" - } - ], - "provisioners": [ - { - "environment_vars": [ - "HOME_DIR=/home/vagrant", - "http_proxy={{user `http_proxy`}}", - "https_proxy={{user `https_proxy`}}", - "no_proxy={{user `no_proxy`}}", - "pkg_branch={{user `pkg_branch`}}" - ], - "execute_command": "echo 'vagrant' | {{.Vars}} su -m root -c 'sh -eux {{.Path}}'", - "expect_disconnect": true, - "scripts": [ - "{{template_dir}}/scripts/update.sh", - "{{template_dir}}/scripts/postinstall.sh", - "{{template_dir}}/scripts/sudoers.sh", - "{{template_dir}}/../_common/vagrant.sh", - "{{template_dir}}/scripts/vmtools.sh", - "{{template_dir}}/scripts/cleanup.sh", - "{{template_dir}}/scripts/minimize.sh" - ], - "type": "shell" - } - ], - "variables": { - "box_basename": "freebsd-13.1", - "build_directory": "../../builds", - "build_timestamp": "{{isotime \"20060102150405\"}}", - "cpus": "2", - "disk_size": "65536", - "git_revision": "__unknown_git_revision__", - "headless": "", - "http_directory": "{{template_dir}}/http", - "http_proxy": "{{env `http_proxy`}}", - "https_proxy": "{{env `https_proxy`}}", - "install_path": "installerconfig", - "iso_checksum": "697d81653fa246b921ddfcf1d15562c55249cc727b11fa3e47f470e2cf2b6a40", - "iso_name": "FreeBSD-13.1-RELEASE-amd64-disc1.iso", - "memory": "1024", - "mirror": "https://download.freebsd.org", - "mirror_directory": "releases/amd64/amd64/ISO-IMAGES/13.1", - "name": "freebsd-13.1", - "no_proxy": "{{env `no_proxy`}}", - "pkg_branch": "quarterly", - "qemu_display": "none", - "template": "freebsd-13.1-amd64", - "version": "TIMESTAMP" - } -} diff --git a/packer_templates/http/debian/preseed.cfg b/packer_templates/http/debian/preseed.cfg new file mode 100644 index 000000000..4d065bc1b --- /dev/null +++ b/packer_templates/http/debian/preseed.cfg @@ -0,0 +1,104 @@ +#_preseed_V1 +# Automatic installation +d-i auto-install/enable boolean true + +# Preseeding only locale sets language, country and locale. +d-i debian-installer/language string en +d-i debian-installer/country string US +d-i debian-installer/locale string en_US.UTF-8 + +d-i console-setup/ask_detect boolean false +d-i debconf/frontend select noninteractive + +# Keyboard selection. +d-i keyboard-configuration/xkb-keymap select us +d-i keymap select us + +choose-mirror-bin mirror/http/proxy string +d-i apt-setup/use_mirror boolean true +d-i base-installer/kernel/override-image string linux-server + +### Clock and time zone setup +d-i clock-setup/utc boolean true +d-i clock-setup/utc-auto boolean true +d-i time/zone string UTC + +# Avoid that last message about the install being complete. +d-i finish-install/reboot_in_progress note + +# This is fairly safe to set, it makes grub install automatically to the MBR +# if no other operating system is detected on the machine. +d-i grub-installer/only_debian boolean true + +# This one makes grub-installer install to the MBR if it also finds some other +# OS, which is less safe as it might not be able to boot that other OS. +d-i grub-installer/with_other_os boolean true + +# Set dev for grub boot +d-i grub-installer/bootdev string /dev/sda + +### Mirror settings +# If you select ftp, the mirror/country string does not need to be set. +d-i mirror/country string manual +d-i mirror/http/directory string /debian/ +d-i mirror/http/hostname string httpredir.debian.org +d-i mirror/http/proxy string + +# This makes partman automatically partition without confirmation. +d-i partman-efi/non_efi_system boolean true +d-i partman-auto-lvm/guided_size string max +d-i partman-auto/choose_recipe select atomic +d-i partman-auto/method string lvm +d-i partman-lvm/confirm boolean true +d-i partman-lvm/confirm_nooverwrite boolean true +d-i partman-lvm/device_remove_lvm boolean true +d-i partman/choose_partition select finish +d-i partman/confirm boolean true +d-i partman/confirm_nooverwrite boolean true +d-i partman/confirm_write_new_label boolean true + +### Account setup +d-i passwd/root-login boolean false +d-i passwd/user-fullname string vagrant +d-i passwd/user-uid string 1000 +d-i passwd/user-password password vagrant +d-i passwd/user-password-again password vagrant +d-i passwd/username string vagrant + +# The installer will warn about weak passwords. If you are sure you know +# what you're doing and want to override it, uncomment this. +d-i user-setup/allow-password-weak boolean true +d-i user-setup/encrypt-home boolean false + +### Package selection +tasksel tasksel/first multiselect standard, ssh-server +d-i pkgsel/include string openssh-server sudo bzip2 acpid cryptsetup zlib1g-dev wget curl dkms fuse make nfs-common net-tools cifs-utils rsync +d-i pkgsel/install-language-support boolean false + +# Prevent packaged version of VirtualBox Guest Additions being installed: +d-i preseed/early_command string sed -i \ +'/in-target/idiscover(){/sbin/discover|grep -v VirtualBox;}' \ +/usr/lib/pre-pkgsel.d/20install-hwpackages + +# Do not scan additional CDs +apt-cdrom-setup apt-setup/cdrom/set-first boolean false + +# Use network mirror +apt-mirror-setup apt-setup/use_mirror boolean true + +# disable automatic package updates +d-i pkgsel/update-policy select none +d-i pkgsel/upgrade select full-upgrade + +# Disable polularity contest +popularity-contest popularity-contest/participate boolean false + +# Select base install +tasksel tasksel/first multiselect standard, ssh-server + +# Setup passwordless sudo for packer user +d-i preseed/late_command string \ +echo "vagrant ALL=(ALL:ALL) NOPASSWD:ALL" > /target/etc/sudoers.d/vagrant && chmod 0440 /target/etc/sudoers.d/vagrant + +# remove cdrom from apt sources +d-i preseed/late_command string sed -i '/^deb cdrom:/s/^/#/' /target/etc/apt/sources.list diff --git a/packer_templates/fedora/http/ks-fedora.cfg b/packer_templates/http/fedora/ks.cfg similarity index 100% rename from packer_templates/fedora/http/ks-fedora.cfg rename to packer_templates/http/fedora/ks.cfg diff --git a/packer_templates/freebsd/http/installerconfig b/packer_templates/http/freebsd/installerconfig similarity index 100% rename from packer_templates/freebsd/http/installerconfig rename to packer_templates/http/freebsd/installerconfig diff --git a/packer_templates/opensuse/http/15/autoinst.xml b/packer_templates/http/opensuse/autoinst.xml similarity index 100% rename from packer_templates/opensuse/http/15/autoinst.xml rename to packer_templates/http/opensuse/autoinst.xml diff --git a/packer_templates/centos/http/7/ks.cfg b/packer_templates/http/rhel/7ks.cfg similarity index 100% rename from packer_templates/centos/http/7/ks.cfg rename to packer_templates/http/rhel/7ks.cfg diff --git a/packer_templates/almalinux/http/8/ks.cfg b/packer_templates/http/rhel/8ks.cfg similarity index 100% rename from packer_templates/almalinux/http/8/ks.cfg rename to packer_templates/http/rhel/8ks.cfg diff --git a/packer_templates/almalinux/http/9/ks.cfg b/packer_templates/http/rhel/9ks.cfg similarity index 100% rename from packer_templates/almalinux/http/9/ks.cfg rename to packer_templates/http/rhel/9ks.cfg diff --git a/packer_templates/sles/http/sles-12-sp2-x86_64-autoinst.xml b/packer_templates/http/sles/12-autoinst.xml similarity index 100% rename from packer_templates/sles/http/sles-12-sp2-x86_64-autoinst.xml rename to packer_templates/http/sles/12-autoinst.xml diff --git a/packer_templates/sles/http/sles-15-sp1-x86_64-autoinst.xml b/packer_templates/http/sles/15-autoinst.xml similarity index 100% rename from packer_templates/sles/http/sles-15-sp1-x86_64-autoinst.xml rename to packer_templates/http/sles/15-autoinst.xml diff --git a/packer_templates/solaris/http/default.xml b/packer_templates/http/solaris/default.xml similarity index 100% rename from packer_templates/solaris/http/default.xml rename to packer_templates/http/solaris/default.xml diff --git a/packer_templates/solaris/http/profile.xml b/packer_templates/http/solaris/profile.xml similarity index 100% rename from packer_templates/solaris/http/profile.xml rename to packer_templates/http/solaris/profile.xml diff --git a/packer_templates/centos/http/9-stream/ks.cfg b/packer_templates/http/springdalelinux/7ks.cfg similarity index 66% rename from packer_templates/centos/http/9-stream/ks.cfg rename to packer_templates/http/springdalelinux/7ks.cfg index d0bbe881c..bef5e9bd7 100644 --- a/packer_templates/centos/http/9-stream/ks.cfg +++ b/packer_templates/http/springdalelinux/7ks.cfg @@ -1,4 +1,9 @@ -cdrom +install +eula --agreed +url --url="http://springdale.princeton.edu/data/Springdale/7/x86_64/os" +repo --name="Addons" --baseurl=http://springdale.princeton.edu/data/Springdale/7/x86_64/os/Addons +repo --name="Computational" --baseurl=http://springdale.princeton.edu/data/Springdale/7/x86_64/os/Computational +repo --name="Updates" --baseurl=http://springdale.princeton.edu/data/Springdale/7/x86_64/os/Updates lang en_US.UTF-8 keyboard us network --bootproto=dhcp --noipv6 --onboot=on --device=eth0 @@ -11,13 +16,13 @@ text skipx zerombr clearpart --all --initlabel -autopart --nohome --nolvm --noboot +autopart --type=plain firstboot --disabled reboot --eject user --name=vagrant --plaintext --password vagrant %packages --ignoremissing --excludedocs -# vagrant needs this to copy initial files via scp +@core openssh-clients sudo selinux-policy-devel @@ -46,9 +51,9 @@ chmod 440 /etc/sudoers.d/vagrant # Enable hyper-v daemons only if using hyper-v virtualization if [ $(virt-what) == "hyperv" ]; then - dnf -y install hyperv-daemons cifs-utils - systemctl enable hypervvssd - systemctl enable hypervkvpd +dnf -y install hyperv-daemons cifs-utils +systemctl enable hypervvssd +systemctl enable hypervkvpd fi # Since we disable consistent network naming, we need to make sure the eth0 @@ -60,16 +65,16 @@ rm -f /etc/sysconfig/network-scripts/ifcfg-e* cat > /etc/sysconfig/network-scripts/ifcfg-eth0 << _EOF_ TYPE=Ethernet PROXY_METHOD=none -BROWSER_ONLY=no -BOOTPROTO=dhcp -DEFROUTE=yes + BROWSER_ONLY=no + BOOTPROTO=dhcp + DEFROUTE=yes IPV4_FAILURE_FATAL=no IPV6INIT=yes IPV6_AUTOCONF=yes IPV6_DEFROUTE=yes -IPV6_FAILURE_FATAL=no -IPV6_ADDR_GEN_MODE=stable-privacy -NAME=eth0 + IPV6_FAILURE_FATAL=no + IPV6_ADDR_GEN_MODE=stable-privacy + NAME=eth0 DEVICE=eth0 ONBOOT=yes _EOF_ diff --git a/packer_templates/springdalelinux/http/8-netinst/ks.cfg b/packer_templates/http/springdalelinux/8ks.cfg similarity index 82% rename from packer_templates/springdalelinux/http/8-netinst/ks.cfg rename to packer_templates/http/springdalelinux/8ks.cfg index f220bbe82..9209acbaf 100644 --- a/packer_templates/springdalelinux/http/8-netinst/ks.cfg +++ b/packer_templates/http/springdalelinux/8ks.cfg @@ -1,5 +1,5 @@ install -url --url="http://springdale.princeton.edu/data/Springdale/8.1/x86_64/os" +url --url="http://springdale.princeton.edu/data/Springdale/8/x86_64/os" lang en_US.UTF-8 keyboard us network --bootproto=dhcp --noipv6 --onboot=on --device=eth0 @@ -54,9 +54,9 @@ chmod 440 /etc/sudoers.d/vagrant # Enable hyper-v daemons only if using hyper-v virtualization if [ $(virt-what) == "hyperv" ]; then - dnf -y install hyperv-daemons cifs-utils - systemctl enable hypervvssd - systemctl enable hypervkvpd +dnf -y install hyperv-daemons cifs-utils +systemctl enable hypervvssd +systemctl enable hypervkvpd fi # Since we disable consistent network naming, we need to make sure the eth0 @@ -68,16 +68,16 @@ rm -f /etc/sysconfig/network-scripts/ifcfg-e* cat > /etc/sysconfig/network-scripts/ifcfg-eth0 << _EOF_ TYPE=Ethernet PROXY_METHOD=none -BROWSER_ONLY=no -BOOTPROTO=dhcp -DEFROUTE=yes + BROWSER_ONLY=no + BOOTPROTO=dhcp + DEFROUTE=yes IPV4_FAILURE_FATAL=no IPV6INIT=yes IPV6_AUTOCONF=yes IPV6_DEFROUTE=yes -IPV6_FAILURE_FATAL=no -IPV6_ADDR_GEN_MODE=stable-privacy -NAME=eth0 + IPV6_FAILURE_FATAL=no + IPV6_ADDR_GEN_MODE=stable-privacy + NAME=eth0 DEVICE=eth0 ONBOOT=yes _EOF_ diff --git a/packer_templates/rockylinux/http/9/ks.cfg b/packer_templates/http/springdalelinux/9ks.cfg similarity index 63% rename from packer_templates/rockylinux/http/9/ks.cfg rename to packer_templates/http/springdalelinux/9ks.cfg index c4336df02..8f2523d42 100644 --- a/packer_templates/rockylinux/http/9/ks.cfg +++ b/packer_templates/http/springdalelinux/9ks.cfg @@ -1,4 +1,4 @@ -cdrom +# Kickstart file for springdalelinux 9 lang en_US.UTF-8 keyboard us network --bootproto=dhcp --noipv6 --onboot=on --device=eth0 @@ -16,8 +16,14 @@ firstboot --disabled reboot --eject user --name=vagrant --plaintext --password vagrant +url --url="http://springdale.princeton.edu/data/springdale/9/x86_64/os" +repo --name="BaseOS" --baseurl=http://springdale.princeton.edu/data/springdale/9/x86_64/os/BaseOS +repo --name="Updates_BaseOS" --baseurl=http://springdale.princeton.edu/data/springdale/9/x86_64/os/Updates_BaseOS +repo --name="AppStream" --baseurl=http://springdale.princeton.edu/data/springdale/9/x86_64/os/AppStream +repo --name="Updates_AppStream" --baseurl=http://springdale.princeton.edu/data/springdale/9/x86_64/os/Updates_AppStream + %packages --ignoremissing --excludedocs -# vagrant needs this to copy initial files via scp +@^server-product-environment openssh-clients sudo selinux-policy-devel @@ -46,9 +52,9 @@ chmod 440 /etc/sudoers.d/vagrant # Enable hyper-v daemons only if using hyper-v virtualization if [ $(virt-what) == "hyperv" ]; then - dnf -y install hyperv-daemons cifs-utils - systemctl enable hypervvssd - systemctl enable hypervkvpd +dnf -y install hyperv-daemons cifs-utils +systemctl enable hypervvssd +systemctl enable hypervkvpd fi # Since we disable consistent network naming, we need to make sure the eth0 @@ -60,16 +66,16 @@ rm -f /etc/sysconfig/network-scripts/ifcfg-e* cat > /etc/sysconfig/network-scripts/ifcfg-eth0 << _EOF_ TYPE=Ethernet PROXY_METHOD=none -BROWSER_ONLY=no -BOOTPROTO=dhcp -DEFROUTE=yes + BROWSER_ONLY=no + BOOTPROTO=dhcp + DEFROUTE=yes IPV4_FAILURE_FATAL=no IPV6INIT=yes IPV6_AUTOCONF=yes IPV6_DEFROUTE=yes -IPV6_FAILURE_FATAL=no -IPV6_ADDR_GEN_MODE=stable-privacy -NAME=eth0 + IPV6_FAILURE_FATAL=no + IPV6_ADDR_GEN_MODE=stable-privacy + NAME=eth0 DEVICE=eth0 ONBOOT=yes _EOF_ diff --git a/packer_templates/ubuntu/http/meta-data b/packer_templates/http/ubuntu/meta-data similarity index 100% rename from packer_templates/ubuntu/http/meta-data rename to packer_templates/http/ubuntu/meta-data diff --git a/packer_templates/ubuntu/http/preseed-hyperv.cfg b/packer_templates/http/ubuntu/preseed-hyperv.cfg similarity index 100% rename from packer_templates/ubuntu/http/preseed-hyperv.cfg rename to packer_templates/http/ubuntu/preseed-hyperv.cfg diff --git a/packer_templates/http/ubuntu/preseed.cfg b/packer_templates/http/ubuntu/preseed.cfg new file mode 100644 index 000000000..63dbda0f2 --- /dev/null +++ b/packer_templates/http/ubuntu/preseed.cfg @@ -0,0 +1,90 @@ +#_preseed_V1 +# Automatic installation +d-i auto-install/enable boolean true + +# Preseeding only locale sets language, country and locale. +d-i debian-installer/language string en +d-i debian-installer/country string US +d-i debian-installer/locale string en_US.UTF-8 + +d-i console-setup/ask_detect boolean false +d-i debconf/frontend select noninteractive + +# Keyboard selection. +d-i keyboard-configuration/xkb-keymap select us +d-i keymap select us + +choose-mirror-bin mirror/http/proxy string +d-i apt-setup/use_mirror boolean true +d-i base-installer/kernel/override-image string linux-server + +### Clock and time zone setup +d-i clock-setup/utc boolean true +d-i clock-setup/utc-auto boolean true +d-i time/zone string UTC + +# Avoid that last message about the install being complete. +d-i finish-install/reboot_in_progress note + +# This is fairly safe to set, it makes grub install automatically to the MBR +# if no other operating system is detected on the machine. +d-i grub-installer/only_debian boolean true + +# This one makes grub-installer install to the MBR if it also finds some other +# OS, which is less safe as it might not be able to boot that other OS. +d-i grub-installer/with_other_os boolean true + +# Set dev for grub boot +d-i grub-installer/bootdev string /dev/sda + +### Mirror settings +# If you select ftp, the mirror/country string does not need to be set. +d-i mirror/country string manual +d-i mirror/http/directory string /ubuntu/ +d-i mirror/http/hostname string archive.ubuntu.com +d-i mirror/http/proxy string + +# This makes partman automatically partition without confirmation. +d-i partman-efi/non_efi_system boolean true +d-i partman-auto-lvm/guided_size string max +d-i partman-auto/choose_recipe select atomic +d-i partman-auto/method string lvm +d-i partman-lvm/confirm boolean true +d-i partman-lvm/confirm_nooverwrite boolean true +d-i partman-lvm/device_remove_lvm boolean true +d-i partman/choose_partition select finish +d-i partman/confirm boolean true +d-i partman/confirm_nooverwrite boolean true +d-i partman/confirm_write_new_label boolean true + +### Account setup +d-i passwd/root-login boolean false +d-i passwd/user-fullname string vagrant +d-i passwd/user-uid string 1000 +d-i passwd/user-password password vagrant +d-i passwd/user-password-again password vagrant +d-i passwd/username string vagrant + +# The installer will warn about weak passwords. If you are sure you know +# what you're doing and want to override it, uncomment this. +d-i user-setup/allow-password-weak boolean true +d-i user-setup/encrypt-home boolean false + +### Package selection +tasksel tasksel/first multiselect standard, server +d-i pkgsel/include string openssh-server sudo cryptsetup libssl-dev libreadline-dev zlib1g-dev linux-source dkms nfs-common linux-headers-$(uname -r) perl cifs-utils software-properties-common rsync ifupdown +d-i pkgsel/install-language-support boolean false + +# disable automatic package updates +d-i pkgsel/update-policy select none +d-i pkgsel/upgrade select full-upgrade + +# Disable polularity contest +popularity-contest popularity-contest/participate boolean false + +# Select base install +tasksel tasksel/first multiselect standard, ssh-server + +# Setup passwordless sudo for packer user +d-i preseed/late_command string \ +echo "vagrant ALL=(ALL:ALL) NOPASSWD:ALL" > /target/etc/sudoers.d/vagrant && chmod 0440 /target/etc/sudoers.d/vagrant diff --git a/packer_templates/http/ubuntu/user-data b/packer_templates/http/ubuntu/user-data new file mode 100644 index 000000000..0c816e448 --- /dev/null +++ b/packer_templates/http/ubuntu/user-data @@ -0,0 +1,17 @@ +#cloud-config +autoinstall: + version: 1 + identity: + hostname: vagrant + username: vagrant + password: '$6$rounds=4096$5CU3LEj/MQvbkfPb$LmKEF9pCfU8R.dA.GemgE/8GT6r9blge3grJvdsVTMFKyLEQwzEF3SGWqAzjawY/XHRpWj4fOiLBrRyxJhIRJ1' + early-commands: + # otherwise packer tries to connect and exceed max attempts: + - systemctl stop ssh + ssh: + install-server: yes + allow-pw: yes + late-commands: + - 'sed -i "s/dhcp4: true/&\n dhcp-identifier: mac/" /target/etc/netplan/00-installer-config.yaml' + - echo 'vagrant ALL=(ALL) NOPASSWD:ALL' > /target/etc/sudoers.d/vagrant + diff --git a/packer_templates/opensuse/opensuse-leap-15.4-x86_64.json b/packer_templates/opensuse/opensuse-leap-15.4-x86_64.json deleted file mode 100644 index f8227f5f8..000000000 --- a/packer_templates/opensuse/opensuse-leap-15.4-x86_64.json +++ /dev/null @@ -1,195 +0,0 @@ -{ - "builders": [ - { - "boot_command": [ - "<esc><enter><wait>", - "linux ", - "biosdevname=0 ", - "net.ifnames=0 ", - "netdevice=eth0 ", - "netsetup=dhcp ", - "lang=en_US ", - "textmode=1 ", - "autoyast=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `autoinst_cfg`}}", - "<enter><wait>" - ], - "boot_wait": "5s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", - "guest_additions_url": "{{ user `guest_additions_url` }}", - "guest_os_type": "OpenSUSE_64", - "hard_drive_interface": "sata", - "headless": "{{ user `headless` }}", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-virtualbox", - "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "type": "virtualbox-iso", - "virtualbox_version_file": ".vbox_version", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<esc><enter><wait>", - "linux ", - "biosdevname=0 ", - "net.ifnames=0 ", - "netdevice=eth0 ", - "netsetup=dhcp ", - "lang=en_US ", - "textmode=1 ", - "autoyast=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `autoinst_cfg`}}", - "<enter><wait>" - ], - "boot_wait": "5s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "opensuse-64", - "headless": "{{ user `headless` }}", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-vmware", - "shutdown_command": "echo 'vagrant'|sudo -S /sbin/shutdown -h 1", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "tools_upload_flavor": "linux", - "type": "vmware-iso", - "vm_name": "{{ user `template` }}", - "vmx_data": { - "cpuid.coresPerSocket": "1" - }, - "vmx_remove_ethernet_interfaces": true - }, - { - "boot_command": [ - "<esc><enter><wait>", - "linux ", - "biosdevname=0 ", - "net.ifnames=0 ", - "netdevice=eth0 ", - "netsetup=dhcp ", - "lang=en_US ", - "textmode=1 ", - "autoyast=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `autoinst_cfg`}}", - "<enter><wait>" - ], - "boot_wait": "5s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "opensuse", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-parallels", - "parallels_tools_flavor": "lin", - "prlctl_version_file": ".prlctl_version", - "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "type": "parallels-iso", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<esc><enter><wait>", - "linux netsetup=dhcp netdevice=eth0 install=cd:/<wait>", - " lang=en_US autoyast=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `autoinst_cfg`}}<wait>", - " textmode=1<wait>", - "<enter><wait>" - ], - "boot_wait": "5s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "headless": "{{ user `headless` }}", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-qemu", - "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "type": "qemu", - "vm_name": "{{ user `template` }}", - "qemuargs": [ - [ "-m", "{{ user `memory` }}" ], - [ "-display", "{{ user `qemu_display` }}" ] - ] - } - ], - "post-processors": [ - { - "output": "{{ user `build_directory` }}/{{user `box_basename`}}.{{.Provider}}.box", - "type": "vagrant" - } - ], - "provisioners": [ - { - "environment_vars": [ - "HOME_DIR=/home/vagrant", - "http_proxy={{user `http_proxy`}}", - "https_proxy={{user `https_proxy`}}", - "no_proxy={{user `no_proxy`}}" - ], - "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh '{{.Path}}'", - "expect_disconnect": true, - "scripts": [ - "{{template_dir}}/scripts/repositories.sh", - "{{template_dir}}/scripts/update.sh", - "{{template_dir}}/../_common/motd.sh", - "{{template_dir}}/../_common/sshd.sh", - "{{template_dir}}/../_common/vagrant.sh", - "{{template_dir}}/../_common/virtualbox.sh", - "{{template_dir}}/scripts/vmware.sh", - "{{template_dir}}/../_common/parallels.sh", - "{{template_dir}}/scripts/vagrant_group.sh", - "{{template_dir}}/scripts/sudoers.sh", - "{{template_dir}}/scripts/zypper-locks.sh", - "{{template_dir}}/scripts/cleanup.sh", - "{{template_dir}}/../_common/minimize.sh" - ], - "type": "shell" - } - ], - "variables": { - "arch": "64", - "autoinst_cfg": "15/autoinst.xml", - "box_basename": "opensuse-leap-15.4", - "build_directory": "../../builds", - "build_timestamp": "{{isotime \"20060102150405\"}}", - "cpus": "2", - "disk_size": "65536", - "git_revision": "__unknown_git_revision__", - "guest_additions_url": "", - "headless": "", - "http_directory": "{{template_dir}}/http", - "http_proxy": "{{env `http_proxy`}}", - "https_proxy": "{{env `https_proxy`}}", - "iso_checksum": "4683345f242397c7fd7d89a50731a120ffd60a24460e21d2634e783b3c169695", - "iso_name": "openSUSE-Leap-15.4-DVD-x86_64-Media.iso", - "memory": "1024", - "mirror": "http://sfo-korg-mirror.kernel.org/opensuse/distribution", - "mirror_directory": "leap/15.4/iso", - "name": "opensuse-leap-15.4", - "no_proxy": "{{env `no_proxy`}}", - "qemu_display": "none", - "template": "opensuse-leap-15.4-x86_64", - "version": "TIMESTAMP" - } -} diff --git a/packer_templates/opensuse/scripts/repositories.sh b/packer_templates/opensuse/scripts/repositories.sh deleted file mode 100644 index 2ed2ad09a..000000000 --- a/packer_templates/opensuse/scripts/repositories.sh +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/sh -eux - -version=`grep VERSION= /etc/os-release | cut -f2 -d\" | cut -f1 -d\ ` - -zypper removerepo "openSUSE-${version}-0" - -zypper ar http://download.opensuse.org/distribution/leap/${version}/repo/oss/ openSUSE-Leap-${version}-Oss -zypper ar http://download.opensuse.org/distribution/leap/${version}/repo/non-oss/ openSUSE-Leap-${version}-Non-Oss -zypper ar http://download.opensuse.org/update/leap/${version}/oss/ openSUSE-Leap-${version}-Update -zypper ar http://download.opensuse.org/update/leap/${version}/non-oss/ openSUSE-Leap-${version}-Update-Non-Oss - -zypper refresh diff --git a/packer_templates/opensuse/scripts/sudoers.sh b/packer_templates/opensuse/scripts/sudoers.sh deleted file mode 100644 index a80d47031..000000000 --- a/packer_templates/opensuse/scripts/sudoers.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/sh -eux - -# update sudoers - can't do this in autoinst.xml -echo -e "\nupdate sudoers ..." -echo -e "vagrant ALL=(ALL) NOPASSWD: ALL\n" >> /etc/sudoers diff --git a/packer_templates/oraclelinux/http/9/ks.cfg b/packer_templates/oraclelinux/http/9/ks.cfg deleted file mode 100644 index 1f6233b99..000000000 --- a/packer_templates/oraclelinux/http/9/ks.cfg +++ /dev/null @@ -1,76 +0,0 @@ -cdrom -lang en_US.UTF-8 -keyboard us -network --bootproto=dhcp --noipv6 --onboot=on --device=eth0 -rootpw --plaintext vagrant -firewall --disabled -selinux --permissive -timezone UTC -bootloader --timeout=1 --location=mbr --append="net.ifnames=0 biosdevname=0" -text -skipx -zerombr -clearpart --all --initlabel -autopart --nohome --nolvm --noboot -firstboot --disabled -reboot --eject -user --name=vagrant --plaintext --password vagrant - -%packages --ignoremissing --excludedocs --instLangs=en_US.utf8 -# vagrant needs this to copy initial files via scp -openssh-clients -sudo -selinux-policy-devel -wget -nfs-utils -net-tools -tar -bzip2 -deltarpm -rsync -dnf-utils -redhat-lsb-core -elfutils-libelf-devel -network-scripts --fprintd-pam --intltool --iwl*-firmware --microcode_ctl -%end - -%post -# sudo -echo 'Defaults:vagrant !requiretty' > /etc/sudoers.d/vagrant -echo '%vagrant ALL=(ALL) NOPASSWD: ALL' >> /etc/sudoers.d/vagrant -chmod 440 /etc/sudoers.d/vagrant - -# Enable hyper-v daemons only if using hyper-v virtualization -if [ $(virt-what) == "hyperv" ]; then - dnf -y install hyperv-daemons cifs-utils - systemctl enable hypervvssd - systemctl enable hypervkvpd -fi - -# Since we disable consistent network naming, we need to make sure the eth0 -# configuration file is in place so it will come up. -# Delete other network configuration first because RHEL/C7 networking will not -# restart successfully if there are configuration files for devices that do not -# exist. -rm -f /etc/sysconfig/network-scripts/ifcfg-e* -cat > /etc/sysconfig/network-scripts/ifcfg-eth0 << _EOF_ -TYPE=Ethernet -PROXY_METHOD=none -BROWSER_ONLY=no -BOOTPROTO=dhcp -DEFROUTE=yes -IPV4_FAILURE_FATAL=no -IPV6INIT=yes -IPV6_AUTOCONF=yes -IPV6_DEFROUTE=yes -IPV6_FAILURE_FATAL=no -IPV6_ADDR_GEN_MODE=stable-privacy -NAME=eth0 -DEVICE=eth0 -ONBOOT=yes -_EOF_ -%end diff --git a/packer_templates/oraclelinux/oracle-6.10-i386.json b/packer_templates/oraclelinux/oracle-6.10-i386.json deleted file mode 100644 index 0f2d2ac93..000000000 --- a/packer_templates/oraclelinux/oracle-6.10-i386.json +++ /dev/null @@ -1,202 +0,0 @@ -{ - "builders": [ - { - "boot_command": [ - "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" - ], - "boot_wait": "5s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", - "guest_additions_url": "{{ user `guest_additions_url` }}", - "guest_os_type": "Oracle", - "hard_drive_interface": "sata", - "headless": "{{ user `headless` }}", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-virtualbox", - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "type": "virtualbox-iso", - "virtualbox_version_file": ".vbox_version", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" - ], - "boot_wait": "5s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "oraclelinux", - "headless": "{{ user `headless` }}", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-vmware", - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "tools_upload_flavor": "linux", - "type": "vmware-iso", - "vm_name": "{{ user `template` }}", - "vmx_data": { - "cpuid.coresPerSocket": "1" - }, - "vmx_remove_ethernet_interfaces": true - }, - { - "boot_command": [ - "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" - ], - "boot_wait": "5s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "centos", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-parallels", - "parallels_tools_flavor": "lin", - "prlctl_version_file": ".prlctl_version", - "prlctl": [ - [ - "set", - "{{.Name}}", - "--3d-accelerate", - "off" - ], - [ - "set", - "{{.Name}}", - "--videosize", - "16" - ] - ], - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "type": "parallels-iso", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<wait5><tab> text ks=hd:fd0:/ks.cfg<enter><wait5><esc>" - ], - "boot_wait": "5s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "floppy_files": [ - "{{user `http_directory`}}/{{user `ks_path`}}" - ], - "generation": "{{user `hyperv_generation`}}", - "guest_additions_mode": "disable", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-hyperv", - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "switch_name": "{{ user `hyperv_switch`}}", - "type": "hyperv-iso", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" - ], - "boot_wait": "5s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "headless": "{{ user `headless` }}", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-qemu", - "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "type": "qemu", - "vm_name": "{{ user `template` }}", - "qemuargs": [ - [ "-m", "{{ user `memory` }}" ], - [ "-display", "{{ user `qemu_display` }}" ] - ] - } - ], - "post-processors": [ - { - "output": "{{ user `build_directory` }}/{{user `box_basename`}}.{{.Provider}}.box", - "type": "vagrant" - } - ], - "provisioners": [ - { - "environment_vars": [ - "HOME_DIR=/home/vagrant", - "http_proxy={{user `http_proxy`}}", - "https_proxy={{user `https_proxy`}}", - "no_proxy={{user `no_proxy`}}" - ], - "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", - "expect_disconnect": true, - "scripts": [ - "{{template_dir}}/../centos/scripts/update.sh", - "{{template_dir}}/../centos/scripts/networking.sh", - "{{template_dir}}/../_common/motd.sh", - "{{template_dir}}/../_common/sshd.sh", - "{{template_dir}}/../_common/vagrant.sh", - "{{template_dir}}/../_common/virtualbox.sh", - "{{template_dir}}/../_common/vmware.sh", - "{{template_dir}}/../_common/parallels.sh", - "{{template_dir}}/../centos/scripts/cleanup.sh", - "{{template_dir}}/../_common/minimize.sh" - ], - "type": "shell" - } - ], - "variables": { - "arch": "32", - "box_basename": "oracle-6.10-i386", - "build_directory": "../../builds", - "build_timestamp": "{{isotime \"20060102150405\"}}", - "cpus": "2", - "disk_size": "65536", - "git_revision": "__unknown_git_revision__", - "guest_additions_url": "", - "headless": "", - "http_directory": "{{template_dir}}/../centos/http", - "http_proxy": "{{env `http_proxy`}}", - "https_proxy": "{{env `https_proxy`}}", - "hyperv_generation": "1", - "iso_checksum": "fd07f775e7fa52e9ab021eb7dccb78453fc61f3d3b712ec426f6b1bf5020318b", - "iso_name": "OracleLinux-R6-U9-Server-i386-dvd.iso", - "ks_path": "6/ks.cfg", - "memory": "1024", - "mirror": "https://mirrors.dotsrc.org/oracle-linux", - "mirror_directory": "OL6/U9/i386", - "name": "oracle-6.10-i386", - "no_proxy": "{{env `no_proxy`}}", - "qemu_display": "none", - "template": "oracle-6.10-i386", - "version": "TIMESTAMP" - } -} diff --git a/packer_templates/oraclelinux/oracle-6.10-x86_64.json b/packer_templates/oraclelinux/oracle-6.10-x86_64.json deleted file mode 100644 index 7226d0a3e..000000000 --- a/packer_templates/oraclelinux/oracle-6.10-x86_64.json +++ /dev/null @@ -1,204 +0,0 @@ -{ - "builders": [ - { - "boot_command": [ - "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" - ], - "boot_wait": "5s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", - "guest_additions_url": "{{ user `guest_additions_url` }}", - "guest_os_type": "Oracle_64", - "hard_drive_interface": "sata", - "headless": "{{ user `headless` }}", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-virtualbox", - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "type": "virtualbox-iso", - "virtualbox_version_file": ".vbox_version", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" - ], - "boot_wait": "5s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "oraclelinux-64", - "headless": "{{ user `headless` }}", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-vmware", - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", - "ssh_password": "vagrant", - "ssh_port": 22, - "version": 19, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "tools_upload_flavor": "linux", - "type": "vmware-iso", - "vm_name": "{{ user `template` }}", - "vmx_data": { - "cpuid.coresPerSocket": "1" - }, - "vmx_remove_ethernet_interfaces": true - }, - { - "boot_command": [ - "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" - ], - "boot_wait": "5s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "centos", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-parallels", - "parallels_tools_flavor": "lin", - "prlctl_version_file": ".prlctl_version", - "prlctl": [ - [ - "set", - "{{.Name}}", - "--3d-accelerate", - "off" - ], - [ - "set", - "{{.Name}}", - "--videosize", - "16" - ] - ], - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "type": "parallels-iso", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<wait5><tab> text ks=hd:fd0:/ks.cfg<enter><wait5><esc>" - ], - "boot_wait": "5s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "floppy_files": [ - "{{user `http_directory`}}/{{user `ks_path`}}" - ], - "generation": "{{user `hyperv_generation`}}", - "guest_additions_mode": "disable", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-hyperv", - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "switch_name": "{{ user `hyperv_switch`}}", - "type": "hyperv-iso", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" - ], - "boot_wait": "5s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "headless": "{{ user `headless` }}", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-qemu", - "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "type": "qemu", - "vm_name": "{{ user `template` }}", - "qemuargs": [ - [ "-m", "{{ user `memory` }}" ], - [ "-display", "{{ user `qemu_display` }}" ] - ] - } - ], - "post-processors": [ - { - "output": "{{ user `build_directory` }}/{{user `box_basename`}}.{{.Provider}}.box", - "type": "vagrant" - } - ], - "provisioners": [ - { - "environment_vars": [ - "HOME_DIR=/home/vagrant", - "http_proxy={{user `http_proxy`}}", - "https_proxy={{user `https_proxy`}}", - "no_proxy={{user `no_proxy`}}" - ], - "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", - "expect_disconnect": true, - "scripts": [ - "{{template_dir}}/../centos/scripts/update.sh", - "{{template_dir}}/../centos/scripts/networking.sh", - "{{template_dir}}/../_common/motd.sh", - "{{template_dir}}/../_common/sshd.sh", - "{{template_dir}}/../_common/vagrant.sh", - "{{template_dir}}/../_common/virtualbox.sh", - "{{template_dir}}/../_common/vmware.sh", - "{{template_dir}}/../_common/parallels.sh", - "{{template_dir}}/../centos/scripts/cleanup.sh", - "{{template_dir}}/../_common/minimize.sh" - ], - "type": "shell" - } - ], - "variables": { - "arch": "64", - "box_basename": "oracle-6.10", - "build_directory": "../../builds", - "build_timestamp": "{{isotime \"20060102150405\"}}", - "cpus": "2", - "disk_size": "65536", - "git_revision": "__unknown_git_revision__", - "guest_additions_url": "", - "headless": "", - "http_directory": "{{template_dir}}/../centos/http", - "http_proxy": "{{env `http_proxy`}}", - "https_proxy": "{{env `https_proxy`}}", - "hyperv_generation": "1", - "hyperv_switch": "bento", - "iso_checksum": "c32e2a7c8eb471db731741f1a30be37e49deda8ce961710273a71b26c9a04a36", - "iso_name": "OracleLinux-R6-U9-Server-x86_64-dvd.iso", - "ks_path": "6/ks.cfg", - "memory": "1024", - "mirror": "http://mirrors.kernel.org/oracle", - "mirror_directory": "OL6/U9/x86_64", - "name": "oracle-6.10", - "no_proxy": "{{env `no_proxy`}}", - "qemu_display": "none", - "template": "oracle-6.10-x86_64", - "version": "TIMESTAMP" - } -} diff --git a/packer_templates/oraclelinux/oracle-7.9-x86_64.json b/packer_templates/oraclelinux/oracle-7.9-x86_64.json deleted file mode 100644 index 528e44c8d..000000000 --- a/packer_templates/oraclelinux/oracle-7.9-x86_64.json +++ /dev/null @@ -1,203 +0,0 @@ -{ - "builders": [ - { - "boot_command": [ - "<up><wait><tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}} net.ifnames=0 biosdevname=0<enter><wait>" - ], - "boot_wait": "5s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", - "guest_additions_url": "{{ user `guest_additions_url` }}", - "guest_os_type": "Oracle_64", - "hard_drive_interface": "sata", - "headless": "{{ user `headless` }}", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-virtualbox", - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "type": "virtualbox-iso", - "virtualbox_version_file": ".vbox_version", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<up><wait><tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}} net.ifnames=0 biosdevname=0 <enter><wait>" - ], - "boot_wait": "5s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "oraclelinux-64", - "headless": "{{ user `headless` }}", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-vmware", - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "tools_upload_flavor": "linux", - "type": "vmware-iso", - "vm_name": "{{ user `template` }}", - "vmx_data": { - "cpuid.coresPerSocket": "1" - }, - "vmx_remove_ethernet_interfaces": true - }, - { - "boot_command": [ - "<up><wait><tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}} net.ifnames=0 biosdevname=0<enter><wait>" - ], - "boot_wait": "5s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "centos", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-parallels", - "parallels_tools_flavor": "lin", - "prlctl_version_file": ".prlctl_version", - "prlctl": [ - [ - "set", - "{{.Name}}", - "--3d-accelerate", - "off" - ], - [ - "set", - "{{.Name}}", - "--videosize", - "16" - ] - ], - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "type": "parallels-iso", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<wait5><tab> text ks=hd:fd0:/ks.cfg net.ifnames=0 biosdevname=0<enter><wait5><esc>" - ], - "boot_wait": "5s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "floppy_files": [ - "{{user `http_directory`}}/{{user `ks_path`}}" - ], - "generation": "{{user `hyperv_generation`}}", - "guest_additions_mode": "disable", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-hyperv", - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "switch_name": "{{ user `hyperv_switch`}}", - "type": "hyperv-iso", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<up><wait><tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}} net.ifnames=0 biosdevname=0<enter><wait>" - ], - "boot_wait": "5s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "headless": "{{ user `headless` }}", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-qemu", - "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "type": "qemu", - "vm_name": "{{ user `template` }}", - "qemuargs": [ - [ "-m", "{{ user `memory` }}" ], - [ "-display", "{{ user `qemu_display` }}" ] - ] - } - ], - "post-processors": [ - { - "output": "{{ user `build_directory` }}/{{user `box_basename`}}.{{.Provider}}.box", - "type": "vagrant" - } - ], - "provisioners": [ - { - "environment_vars": [ - "HOME_DIR=/home/vagrant", - "http_proxy={{user `http_proxy`}}", - "https_proxy={{user `https_proxy`}}", - "no_proxy={{user `no_proxy`}}" - ], - "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", - "expect_disconnect": true, - "scripts": [ - "{{template_dir}}/../centos/scripts/update.sh", - "{{template_dir}}/../centos/scripts/networking.sh", - "{{template_dir}}/../_common/motd.sh", - "{{template_dir}}/../_common/sshd.sh", - "{{template_dir}}/../_common/vagrant.sh", - "{{template_dir}}/../_common/virtualbox.sh", - "{{template_dir}}/../_common/vmware.sh", - "{{template_dir}}/../_common/parallels.sh", - "{{template_dir}}/../centos/scripts/cleanup.sh", - "{{template_dir}}/../_common/minimize.sh" - ], - "type": "shell" - } - ], - "variables": { - "arch": "64", - "box_basename": "oracle-7.9", - "build_directory": "../../builds", - "build_timestamp": "{{isotime \"20060102150405\"}}", - "cpus": "2", - "disk_size": "65536", - "git_revision": "__unknown_git_revision__", - "guest_additions_url": "", - "headless": "", - "http_directory": "{{template_dir}}/../centos/http", - "http_proxy": "{{env `http_proxy`}}", - "https_proxy": "{{env `https_proxy`}}", - "hyperv_generation": "1", - "hyperv_switch": "bento", - "iso_checksum": "dc2782bfd92b4c060cf8006fbc6e18036c27f599eebf3584a1a2ac54f008bf2f", - "iso_name": "OracleLinux-R7-U9-Server-x86_64-dvd.iso", - "ks_path": "7/ks.cfg", - "memory": "1024", - "mirror": "http://mirrors.dotsrc.org/oracle-linux", - "mirror_directory": "OL7/u9/x86_64", - "name": "oracle-7.9", - "no_proxy": "{{env `no_proxy`}}", - "qemu_display": "none", - "template": "oracle-7.9-x86_64", - "version": "TIMESTAMP" - } -} diff --git a/packer_templates/oraclelinux/oracle-8.7-x86_64.json b/packer_templates/oraclelinux/oracle-8.7-x86_64.json deleted file mode 100644 index 8d48e76bd..000000000 --- a/packer_templates/oraclelinux/oracle-8.7-x86_64.json +++ /dev/null @@ -1,182 +0,0 @@ -{ - "builders": [ - { - "boot_command": "{{ user `boot_command` }}", - "boot_wait": "5s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", - "guest_additions_url": "{{ user `guest_additions_url` }}", - "guest_os_type": "Oracle_64", - "hard_drive_interface": "sata", - "headless": "{{ user `headless` }}", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-virtualbox", - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "type": "virtualbox-iso", - "virtualbox_version_file": ".vbox_version", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": "{{ user `boot_command` }}", - "boot_wait": "5s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "oraclelinux-64", - "headless": "{{ user `headless` }}", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-vmware", - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", - "ssh_password": "vagrant", - "ssh_port": 22, - "version": 19, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "tools_upload_flavor": "linux", - "type": "vmware-iso", - "vm_name": "{{ user `template` }}", - "vmx_data": { - "cpuid.coresPerSocket": "1" - }, - "vmx_remove_ethernet_interfaces": true - }, - { - "boot_command": "{{user `boot_command`}}", - "boot_wait": "5s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "centos", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-parallels", - "parallels_tools_flavor": "lin", - "prlctl_version_file": ".prlctl_version", - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "type": "parallels-iso", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<wait5><up><wait5><tab> text ks=hd:fd0:/ks.cfg<enter><wait5><esc>" - ], - "boot_wait": "5s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "floppy_files": [ - "{{user `http_directory`}}/{{user `ks_path`}}" - ], - "generation": "{{user `hyperv_generation`}}", - "guest_additions_mode": "disable", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-hyperv", - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "switch_name": "{{ user `hyperv_switch`}}", - "type": "hyperv-iso", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": "{{ user `boot_command` }}", - "boot_wait": "5s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "headless": "{{ user `headless` }}", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-qemu", - "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "type": "qemu", - "vm_name": "{{ user `template` }}", - "qemuargs": [ - [ "-m", "{{ user `memory` }}" ], - [ "-display", "{{ user `qemu_display` }}" ] - ] - } - ], - "post-processors": [ - { - "output": "{{ user `build_directory` }}/{{user `box_basename`}}.{{.Provider}}.box", - "type": "vagrant" - } - ], - "provisioners": [ - { - "environment_vars": [ - "HOME_DIR=/home/vagrant", - "http_proxy={{user `http_proxy`}}", - "https_proxy={{user `https_proxy`}}", - "no_proxy={{user `no_proxy`}}" - ], - "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", - "expect_disconnect": true, - "scripts": [ - "{{template_dir}}/../centos/scripts/update.sh", - "{{template_dir}}/../centos/scripts/networking.sh", - "{{template_dir}}/../_common/motd.sh", - "{{template_dir}}/../_common/sshd.sh", - "{{template_dir}}/../_common/vagrant.sh", - "{{template_dir}}/../_common/virtualbox.sh", - "{{template_dir}}/../_common/vmware.sh", - "{{template_dir}}/../_common/parallels.sh", - "{{template_dir}}/../centos/scripts/cleanup.sh", - "{{template_dir}}/../_common/minimize.sh" - ], - "type": "shell" - } - ], - "variables": { - "box_basename": "oracle-8.7", - "build_directory": "../../builds", - "build_timestamp": "{{isotime \"202207110855\"}}", - "cpus": "2", - "disk_size": "65536", - "git_revision": "__unknown_git_revision__", - "guest_additions_url": "", - "headless": "", - "http_directory": "{{template_dir}}/../centos/http", - "http_proxy": "{{env `http_proxy`}}", - "https_proxy": "{{env `https_proxy`}}", - "hyperv_generation": "1", - "hyperv_switch": "bento", - "iso_checksum": "dd6ede6c0597189b7dffb800b32835002bd95f19c254734aeb58f58651aa03fb", - "iso_name": "OracleLinux-R8-U7-x86_64-dvd.iso", - "ks_path": "8/ks.cfg", - "memory": "1024", - "mirror": "https://yum.oracle.com/ISOS/OracleLinux", - "mirror_directory": "OL8/u7/x86_64", - "name": "oracle-8.7", - "no_proxy": "{{env `no_proxy`}}", - "qemu_display": "none", - "template": "oracle-8.7-x86_64", - "boot_command": "<up><wait><tab> inst.text inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>", - "version": "TIMESTAMP" - } -} diff --git a/packer_templates/oraclelinux/oracle-9.1-x86_64.json b/packer_templates/oraclelinux/oracle-9.1-x86_64.json deleted file mode 100644 index 9ed93017a..000000000 --- a/packer_templates/oraclelinux/oracle-9.1-x86_64.json +++ /dev/null @@ -1,182 +0,0 @@ -{ - "builders": [ - { - "boot_command": "{{ user `boot_command` }}", - "boot_wait": "5s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", - "guest_additions_url": "{{ user `guest_additions_url` }}", - "guest_os_type": "Oracle_64", - "hard_drive_interface": "sata", - "headless": "{{ user `headless` }}", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-virtualbox", - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "type": "virtualbox-iso", - "virtualbox_version_file": ".vbox_version", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": "{{ user `boot_command` }}", - "boot_wait": "5s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "oraclelinux-64", - "headless": "{{ user `headless` }}", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-vmware", - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", - "ssh_password": "vagrant", - "ssh_port": 22, - "version": 19, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "tools_upload_flavor": "linux", - "type": "vmware-iso", - "vm_name": "{{ user `template` }}", - "vmx_data": { - "cpuid.coresPerSocket": "1" - }, - "vmx_remove_ethernet_interfaces": true - }, - { - "boot_command": "{{user `boot_command`}}", - "boot_wait": "5s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "centos", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-parallels", - "parallels_tools_flavor": "lin", - "prlctl_version_file": ".prlctl_version", - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "type": "parallels-iso", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<wait5><up><wait5><tab> text ks=hd:fd0:/ks.cfg<enter><wait5><esc>" - ], - "boot_wait": "5s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "floppy_files": [ - "{{user `http_directory`}}/{{user `ks_path`}}" - ], - "generation": "{{user `hyperv_generation`}}", - "guest_additions_mode": "disable", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-hyperv", - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "switch_name": "{{ user `hyperv_switch`}}", - "type": "hyperv-iso", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": "{{ user `boot_command` }}", - "boot_wait": "5s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "headless": "{{ user `headless` }}", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-qemu", - "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "type": "qemu", - "vm_name": "{{ user `template` }}", - "qemuargs": [ - [ "-m", "{{ user `memory` }}" ], - [ "-display", "{{ user `qemu_display` }}" ] - ] - } - ], - "post-processors": [ - { - "output": "{{ user `build_directory` }}/{{user `box_basename`}}.{{.Provider}}.box", - "type": "vagrant" - } - ], - "provisioners": [ - { - "environment_vars": [ - "HOME_DIR=/home/vagrant", - "http_proxy={{user `http_proxy`}}", - "https_proxy={{user `https_proxy`}}", - "no_proxy={{user `no_proxy`}}" - ], - "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", - "expect_disconnect": true, - "scripts": [ - "{{template_dir}}/scripts/update.sh", - "{{template_dir}}/scripts/networking.sh", - "{{template_dir}}/../_common/motd.sh", - "{{template_dir}}/../_common/sshd.sh", - "{{template_dir}}/../_common/vagrant.sh", - "{{template_dir}}/../_common/virtualbox.sh", - "{{template_dir}}/../_common/vmware.sh", - "{{template_dir}}/../_common/parallels.sh", - "{{template_dir}}/scripts/cleanup.sh", - "{{template_dir}}/../_common/minimize.sh" - ], - "type": "shell" - } - ], - "variables": { - "box_basename": "oracle-9.1", - "build_directory": "../../builds", - "build_timestamp": "{{isotime \"2019102650405\"}}", - "cpus": "2", - "disk_size": "65536", - "git_revision": "__unknown_git_revision__", - "guest_additions_url": "", - "headless": "", - "http_directory": "{{template_dir}}/http", - "http_proxy": "{{env `http_proxy`}}", - "https_proxy": "{{env `https_proxy`}}", - "hyperv_generation": "1", - "hyperv_switch": "bento", - "iso_checksum": "a46ac0b717881a2673c7dc981b3219f6dea747e3d6bd18908fcb8c1f42b82786", - "iso_name": "OracleLinux-R9-U1-x86_64-dvd.iso", - "ks_path": "9/ks.cfg", - "memory": "1024", - "mirror": "https://yum.oracle.com/ISOS/OracleLinux", - "mirror_directory": "OL9/u1/x86_64", - "name": "oracle-9.1", - "no_proxy": "{{env `no_proxy`}}", - "qemu_display": "none", - "template": "oracle-9.1-x86_64", - "boot_command": "<up><wait><tab> inst.text inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>", - "version": "TIMESTAMP" - } -} diff --git a/packer_templates/oraclelinux/scripts/cleanup.sh b/packer_templates/oraclelinux/scripts/cleanup.sh deleted file mode 100644 index b918faa7b..000000000 --- a/packer_templates/oraclelinux/scripts/cleanup.sh +++ /dev/null @@ -1,111 +0,0 @@ -#!/bin/sh -eux - -# should output one of 'redhat' 'centos' 'oraclelinux' -distro="`rpm -qf --queryformat '%{NAME}' /etc/redhat-release | cut -f 1 -d '-'`" - -major_version="`sed 's/^.\+ release \([.0-9]\+\).*/\1/' /etc/redhat-release | awk -F. '{print $1}'`"; - - -echo "reduce the grub menu time to 1 second" -if ! [ "$major_version" -eq 6 ]; then - sed -i -e 's/^GRUB_TIMEOUT=[0-9]\+$/GRUB_TIMEOUT=1/' /etc/default/grub - grub2-mkconfig -o /boot/grub2/grub.cfg -fi - -# make sure we use dnf on EL 8+ -if [ "$major_version" -ge 8 ]; then - pkg_cmd="dnf" -else - pkg_cmd="yum" -fi - - -echo "Remove development and kernel source packages" -$pkg_cmd -y remove gcc cpp gc kernel-devel kernel-headers glibc-devel elfutils-libelf-devel glibc-headers kernel-devel kernel-headers - -if [ "$major_version" -ge 8 ]; then - echo "remove orphaned packages" - dnf -y autoremove - echo "Remove previous kernels that preserved for rollbacks" - dnf -y remove -y $(dnf repoquery --installonly --latest-limit=-1 -q) -else - echo "Remove previous kernels that preserved for rollbacks" - if ! command -v package-cleanup >/dev/null 2>&1; then - yum -y install yum-utils - fi - package-cleanup --oldkernels --count=1 -y -fi - -# Don't remove linux-firmware because it causes the error: -# Problem: The operation would result in removing the following protected packages: kernel-uek-core - -if [ "$distro" != 'redhat' ]; then - echo "clean all package cache information" - $pkg_cmd -y clean all --enablerepo=\*; -fi - -# Clean up network interface persistence -rm -f /etc/udev/rules.d/70-persistent-net.rules; -mkdir -p /etc/udev/rules.d/70-persistent-net.rules; -rm -f /lib/udev/rules.d/75-persistent-net-generator.rules; -rm -rf /dev/.udev/; - -for ndev in `ls -1 /etc/sysconfig/network-scripts/ifcfg-*`; do - if [ "`basename $ndev`" != "ifcfg-lo" ]; then - sed -i '/^HWADDR/d' "$ndev"; - sed -i '/^UUID/d' "$ndev"; - fi -done - -# new-style network device naming for centos7 -if [ "$major_version" -eq 7 ]; then - # radio off & remove all interface configration - nmcli radio all off - /bin/systemctl stop NetworkManager.service - for ifcfg in `ls /etc/sysconfig/network-scripts/ifcfg-* |grep -v ifcfg-lo` ; do - rm -f $ifcfg - done - rm -rf /var/lib/NetworkManager/* - - echo "==> Setup /etc/rc.d/rc.local for EL7" - cat <<_EOF_ | cat >> /etc/rc.d/rc.local -#BENTO-BEGIN -LANG=C -# delete all connection -for con in \`nmcli -t -f uuid con\`; do - if [ "\$con" != "" ]; then - nmcli con del \$con - fi -done -# add gateway interface connection. -gwdev=\`nmcli dev | grep ethernet | egrep -v 'unmanaged' | head -n 1 | awk '{print \$1}'\` -if [ "\$gwdev" != "" ]; then - nmcli connection add type ethernet ifname \$gwdev con-name \$gwdev -fi -sed -i "/^#BENTO-BEGIN/,/^#BENTO-END/d" /etc/rc.d/rc.local -chmod -x /etc/rc.d/rc.local -#BENTO-END -_EOF_ - chmod +x /etc/rc.d/rc.local -fi - -echo "truncate any logs that have built up during the install" -find /var/log -type f -exec truncate --size=0 {} \; - -echo "remove the install log" -rm -f /root/anaconda-ks.cfg /root/original-ks.cfg - -echo "remove the contents of /tmp and /var/tmp" -rm -rf /tmp/* /var/tmp/* - -if [ "$major_version" -ge 7 ]; then - echo "Force a new random seed to be generated" - rm -f /var/lib/systemd/random-seed - - echo "Wipe netplan machine-id (DUID) so machines get unique ID generated on boot" - truncate -s 0 /etc/machine-id -fi - -echo "Clear the history so our install commands aren't there" -rm -f /root/.wget-hsts -export HISTSIZE=0 diff --git a/packer_templates/oraclelinux/scripts/networking.sh b/packer_templates/oraclelinux/scripts/networking.sh deleted file mode 100644 index de35e787d..000000000 --- a/packer_templates/oraclelinux/scripts/networking.sh +++ /dev/null @@ -1,27 +0,0 @@ -#!/bin/sh -eux - -case "$PACKER_BUILDER_TYPE" in - -virtualbox-iso|virtualbox-ovf) - # Fix slow DNS: - # Add 'single-request-reopen' so it is included when /etc/resolv.conf is - # generated - # https://access.redhat.com/site/solutions/58625 (subscription required) - - echo 'RES_OPTIONS="single-request-reopen"' >>/etc/sysconfig/network; - - # determine the major EL version we're runninng - major_version="`sed 's/^.\+ release \([.0-9]\+\).*/\1/' /etc/redhat-release | awk -F. '{print $1}'`"; - - if [ "$major_version" -ge 8 ]; then - nmcli networking off - sleep 5 - nmcli networking on - else - service network restart; - fi - - echo 'Slow DNS fix applied (single-request-reopen)'; - ;; - -esac diff --git a/packer_templates/oraclelinux/scripts/update.sh b/packer_templates/oraclelinux/scripts/update.sh deleted file mode 100644 index fe6b85f89..000000000 --- a/packer_templates/oraclelinux/scripts/update.sh +++ /dev/null @@ -1,21 +0,0 @@ -#!/bin/sh -eux - -# determine the major EL version we're runninng -major_version="`sed 's/^.\+ release \([.0-9]\+\).*/\1/' /etc/redhat-release | awk -F. '{print $1}'`"; - -# make sure we use dnf on EL 8+ -if [ "$major_version" -ge 8 ]; then - dnf -y update -else - yum -y update -fi - -# Updating the oracle release on at least OL 6 updates the repos and unlocks a whole -# new set of updates that need to be applied. If this script is there it should be run -if [ -f "/usr/bin/ol_yum_configure.sh" ]; then - /usr/bin/ol_yum_configure.sh - yum -y update -fi - -reboot; -sleep 60; diff --git a/packer_templates/pkr-builder.pkr.hcl b/packer_templates/pkr-builder.pkr.hcl new file mode 100644 index 000000000..f2c701a56 --- /dev/null +++ b/packer_templates/pkr-builder.pkr.hcl @@ -0,0 +1,262 @@ +packer { + required_version = ">= 1.7.0" + required_plugins { + hyperv = { + version = ">= 1.0.0" + source = "github.com/hashicorp/hyperv" + } + inspec = { + version = ">= 0.0.1" + source = "github.com/hashicorp/inspec" + } + parallels = { + version = ">= 1.0.1" + source = "github.com/hashicorp/parallels" + } + qemu = { + version = ">= 1.0.8" + source = "github.com/hashicorp/qemu" + } + vagrant = { + version = ">= 1.0.2" + source = "github.com/hashicorp/vagrant" + } + virtualbox = { + version = ">= 0.0.1" + source = "github.com/hashicorp/virtualbox" + } + vmware = { + version = ">= 0.0.1" + source = "github.com/hashicorp/vmware" + } + windows-update = { + version = ">= 0.14.1" + source = "github.com/rgl/windows-update" + } + } +} + +locals { + scripts = var.is_windows ? ( + substr(var.os_version, 0, 2) == "10" || + substr(var.os_version, 0, 2) == "11" ? [ + # "${path.root}/scripts/windows/base_setup.ps1", + "${path.root}/scripts/windows/disable-windows-updates.ps1", + "${path.root}/scripts/windows/disable-windows-defender.ps1", + "${path.root}/scripts/windows/remove-one-drive.ps1", + "${path.root}/scripts/windows/remove-apps.ps1", + "${path.root}/scripts/windows/virtualbox-prevent-vboxsrv-resolution-delay.ps1", + "${path.root}/scripts/windows/provision-guest-tools-qemu-kvm.ps1", + "${path.root}/scripts/windows/provision-vmwaretools.ps1", + "${path.root}/scripts/windows/provision-winrm.ps1", + "${path.root}/scripts/windows/provision.ps1", + "${path.root}/scripts/windows/enable-remote-desktop.ps1", + "${path.root}/scripts/windows/eject-media.ps1" + ] : [ + # "${path.root}/scripts/windows/base_setup.ps1", + "${path.root}/scripts/windows/disable-windows-updates.ps1", + "${path.root}/scripts/windows/disable-windows-defender.ps1", + "${path.root}/scripts/windows/remove-one-drive.ps1", + # "${path.root}/scripts/windows/remove-apps.ps1", + "${path.root}/scripts/windows/virtualbox-prevent-vboxsrv-resolution-delay.ps1", + "${path.root}/scripts/windows/provision-guest-tools-qemu-kvm.ps1", + "${path.root}/scripts/windows/provision-vmwaretools.ps1", + "${path.root}/scripts/windows/provision-winrm.ps1", + "${path.root}/scripts/windows/provision.ps1", + "${path.root}/scripts/windows/enable-remote-desktop.ps1", + "${path.root}/scripts/windows/eject-media.ps1" + ] + ) : ( + var.os_name == "solaris" ? [ + "${path.root}/scripts/solaris/update_solaris.sh", + "${path.root}/scripts/_common/vagrant.sh", + "${path.root}/scripts/solaris/vmtools_solaris.sh", + "${path.root}/scripts/solaris/minimize_solaris.sh" + ] : ( + var.os_name == "freebsd" ? [ + "${path.root}/scripts/freebsd/update_freebsd.sh", + "${path.root}/scripts/freebsd/postinstall_freebsd.sh", + "${path.root}/scripts/freebsd/sudoers_freebsd.sh", + "${path.root}/scripts/_common/vagrant.sh", + "${path.root}/scripts/freebsd/vmtools_freebsd.sh", + "${path.root}/scripts/freebsd/cleanup_freebsd.sh", + "${path.root}/scripts/freebsd/minimize_freebsd.sh" + ] : ( + var.os_name == "opensuse" || + var.os_name == "sles" ? [ + "${path.root}/scripts/suse/repositories_suse.sh", + "${path.root}/scripts/suse/update_suse.sh", + "${path.root}/scripts/_common/motd.sh", + "${path.root}/scripts/_common/sshd.sh", + "${path.root}/scripts/_common/vagrant.sh", + "${path.root}/scripts/suse/unsupported-modules_suse.sh", + "${path.root}/scripts/_common/virtualbox.sh", + "${path.root}/scripts/_common/vmware_suse.sh", + "${path.root}/scripts/_common/parallels.sh", + "${path.root}/scripts/suse/vagrant_group_suse.sh", + "${path.root}/scripts/suse/sudoers_suse.sh", + "${path.root}/scripts/suse/zypper-locks_suse.sh", + "${path.root}/scripts/suse/remove-dvd-source_suse.sh", + "${path.root}/scripts/suse/cleanup_suse.sh", + "${path.root}/scripts/_common/minimize.sh" + ] : ( + var.os_name == "ubuntu" || + var.os_name == "debian" ? [ + "${path.root}/scripts/${var.os_name}/update_${var.os_name}.sh", + "${path.root}/scripts/_common/motd.sh", + "${path.root}/scripts/_common/sshd.sh", + "${path.root}/scripts/${var.os_name}/networking_${var.os_name}.sh", + "${path.root}/scripts/${var.os_name}/sudoers_${var.os_name}.sh", + "${path.root}/scripts/_common/vagrant.sh", + "${path.root}/scripts/${var.os_name}/systemd_${var.os_name}.sh", + "${path.root}/scripts/_common/virtualbox.sh", + "${path.root}/scripts/_common/vmware_debian_ubuntu.sh", + "${path.root}/scripts/_common/parallels.sh", + "${path.root}/scripts/${var.os_name}/hyperv_${var.os_name}.sh", + "${path.root}/scripts/${var.os_name}/cleanup_${var.os_name}.sh", + "${path.root}/scripts/_common/minimize.sh" + ] : ( + var.os_name == "fedora" ? [ + "${path.root}/scripts/fedora/networking_fedora.sh", + "${path.root}/scripts/fedora/update_dnf.sh", + "${path.root}/scripts/fedora/build-tools_fedora.sh", + "${path.root}/scripts/fedora/install-supporting-packages_fedora.sh", + "${path.root}/scripts/_common/motd.sh", + "${path.root}/scripts/_common/sshd.sh", + "${path.root}/scripts/_common/virtualbox.sh", + "${path.root}/scripts/_common/vmware_fedora.sh", + "${path.root}/scripts/_common/parallels.sh", + "${path.root}/scripts/_common/vagrant.sh", + "${path.root}/scripts/fedora/real-tmp_fedora.sh", + "${path.root}/scripts/fedora/cleanup_dnf.sh", + "${path.root}/scripts/_common/minimize.sh" + ] : ( + "${var.os_name}-${substr(var.os_version, 0, 1)}" == "amazonliunux-2" || + "${var.os_name}-${substr(var.os_version, 0, 1)}" == "centos-7" || + "${var.os_name}-${substr(var.os_version, 0, 1)}" == "oraclelinux-7" || + "${var.os_name}-${substr(var.os_version, 0, 1)}" == "rhel-7" || + "${var.os_name}-${substr(var.os_version, 0, 1)}" == "scientificlinux-7" || + "${var.os_name}-${substr(var.os_version, 0, 1)}" == "springdalelinux-7" ? [ + "${path.root}/scripts/rhel/update_yum.sh", + "${path.root}/scripts/_common/motd.sh", + "${path.root}/scripts/_common/sshd.sh", + "${path.root}/scripts/rhel/networking_rhel7.sh", + "${path.root}/scripts/_common/vagrant.sh", + "${path.root}/scripts/_common/virtualbox.sh", + "${path.root}/scripts/_common/vmware_rhel.sh", + "${path.root}/scripts/_common/parallels.sh", + "${path.root}/scripts/rhel/cleanup_yum.sh", + "${path.root}/scripts/_common/minimize.sh" + ] : [ + "${path.root}/scripts/rhel/update_dnf.sh", + "${path.root}/scripts/_common/motd.sh", + "${path.root}/scripts/_common/sshd.sh", + "${path.root}/scripts/_common/vagrant.sh", + "${path.root}/scripts/_common/virtualbox.sh", + "${path.root}/scripts/_common/vmware_rhel.sh", + "${path.root}/scripts/_common/parallels.sh", + "${path.root}/scripts/rhel/cleanup_dnf.sh", + "${path.root}/scripts/_common/minimize.sh" + ] + ) + ) + ) + ) + ) + ) + source_names = [for source in var.sources_enabled : trimprefix(source, "source.")] +} + +# https://www.packer.io/docs/templates/hcl_templates/blocks/build +build { + sources = var.sources_enabled + + # Linux Shell scipts + provisioner "shell" { + environment_vars = var.os_name == "freebsd" ? [ + "HOME_DIR=/home/vagrant", + "http_proxy=${var.http_proxy}", + "https_proxy=${var.https_proxy}", + "no_proxy=${var.no_proxy}", + "pkg_branch=quarterly" + ] : ( + var.os_name == "solaris" ? [] : [ + "HOME_DIR=/home/vagrant", + "http_proxy=${var.http_proxy}", + "https_proxy=${var.https_proxy}", + "no_proxy=${var.no_proxy}" + ] + ) + execute_command = var.os_name == "freebsd" ? "echo 'vagrant' | {{.Vars}} su -m root -c 'sh -eux {{.Path}}'" : ( + var.os_name == "solaris" ? "echo 'vagrant'|sudo -S bash {{.Path}}" : "echo 'vagrant' | {{ .Vars }} sudo -S -E sh -eux '{{ .Path }}'" + ) + expect_disconnect = true + scripts = local.scripts + except = var.is_windows ? local.source_names : null + } + + # Windows Updates and scripts + provisioner "powershell" { + elevated_password = "vagrant" + elevated_user = "vagrant" + scripts = local.scripts + except = var.is_windows ? null : local.source_names + } + provisioner "windows-restart" { + except = var.is_windows ? null : local.source_names + } + provisioner "windows-update" { + search_criteria = "IsInstalled=0" + except = var.is_windows ? null : local.source_names + } + provisioner "chef-solo" { + chef_license = "accept-no-persist" + version = "17" + cookbook_paths = [ + "${path.root}/cookbooks" + ] + guest_os_type = "windows" + run_list = [ + "packer::disable_uac", + "packer::configure_power", + "packer::disable_screensaver", + "packer::features", + "packer::enable_file_sharing", + "packer::ui_tweaks" + ] + except = var.is_windows ? null : local.source_names + } + provisioner "windows-restart" { + except = var.is_windows ? null : local.source_names + } + provisioner "chef-solo" { + chef_license = "accept-no-persist" + version = "17" + cookbook_paths = [ + "${path.root}/cookbooks" + ] + guest_os_type = "windows" + run_list = [ + "packer::cleanup", + "packer::defrag" + ] + except = var.is_windows ? null : local.source_names + } + provisioner "powershell" { + elevated_password = "vagrant" + elevated_user = "vagrant" + scripts = [ + "${path.root}/scripts/windows/cleanup.ps1", + "${path.root}/scripts/windows/optimize.ps1" + ] + except = var.is_windows ? null : local.source_names + } + + # Convert machines to vagrant boxes + post-processor "vagrant" { + compression_level = 9 + keep_input_artifact = var.is_windows + output = "${path.root}/../builds/${var.os_name}-${var.os_version}-${var.os_arch}.{{ .Provider }}.box" + vagrantfile_template = var.is_windows ? (var.hyperv_generation == 1 ? "${path.root}/vagrantfile-windows.template" : "${path.root}/vagrantfile-windows-gen2.template") : null + } +} diff --git a/packer_templates/pkr-sources.pkr.hcl b/packer_templates/pkr-sources.pkr.hcl new file mode 100644 index 000000000..d3016aa4e --- /dev/null +++ b/packer_templates/pkr-sources.pkr.hcl @@ -0,0 +1,281 @@ +locals { + # Source block provider specific + # hyperv-iso + hyperv_enable_dynamic_memory = var.hyperv_enable_dynamic_memory == null ? ( + var.hyperv_generation == 2 && var.is_windows ? "true" : null + ) : var.hyperv_enable_dynamic_memory + hyperv_enable_secure_boot = var.hyperv_enable_secure_boot == null ? ( + var.hyperv_generation == 2 && var.is_windows ? false : null + ) : var.hyperv_enable_secure_boot + + # parallels-iso + parallels_tools_flavor = var.parallels_tools_flavor == null ? ( + var.is_windows ? ( + var.os_arch == "x86_64" ? "win" : "win-arm" + ) : ( + var.os_arch == "x86_64" ? "lin" : "lin-arm" + ) + ) : var.parallels_tools_flavor + parallels_tools_mode = var.parallels_tools_mode == null ? ( + var.is_windows ? "attach" : "upload" + ) : var.parallels_tools_mode + parallels_prlctl = var.parallels_prlctl == null ? ( + var.is_windows ? [ + ["set", "{{ .Name }}", "--efi-boot", "off"] + ] : [ + ["set", "{{ .Name }}", "--3d-accelerate", "off"], + ["set", "{{ .Name }}", "--videosize", "16"] + ] + ) : var.parallels_prlctl + + # qemu + qemuargs = var.qemuargs == null ? ( + var.hyperv_generation == 2 && var.is_windows ? [ + ["-m", "${local.memory}"], + ["-smp", "2"], + ["-bios", "/usr/share/OVMF/OVMF_CODE.fd"], + ["-display", "none"] + ] : ( + var.is_windows ? [ + ["-m", "${local.memory}"], + ["-smp", "2"], + ["-drive", "file=~/virtio-win.iso,media=cdrom,index=3"], + ["-drive", "file=${path.root}/../builds/packer-${var.os_name}-${var.os_version}-qemu/{{ .Name }},if=virtio,cache=writeback,discard=ignore,format=qcow2,index=1"], + ["-display", "none"] + ] : [ + ["-m", "${local.memory}"], + ["-display", "none"] + ] + ) + ) : var.qemuargs + + # virtualbox-iso + vbox_gfx_controller = var.vbox_gfx_controller == null ? ( + var.is_windows ? "vboxsvga" : "vmsvga" + ) : var.vbox_gfx_controller + vbox_gfx_vram_size = var.vbox_gfx_controller == null ? ( + var.is_windows ? 128 : 33 + ) : var.vbox_gfx_vram_size + vbox_guest_additions_mode = var.vbox_guest_additions_mode == null ? ( + var.is_windows && var.hyperv_generation == 1 ? "attach" : "upload" + ) : var.vbox_guest_additions_mode + + # virtualbox-ovg + vbox_source = var.vbox_source == null ? ( + var.os_name == "amazonlinux" ? "${path.root}/amz_working_files/amazon2.ovf" : null + ) : var.vbox_source + + # vmware-iso + vmware_disk_adapter_type = var.vmware_disk_adapter_type == null ? ( + var.is_windows ? "lsisas1068" : null + ) : var.vmware_disk_adapter_type + vmware_tools_upload_flavor = var.vmware_tools_upload_flavor == null ? ( + var.is_windows ? "windows" : null + ) : var.vmware_tools_upload_flavor + vmware_tools_upload_path = var.vmware_tools_upload_path == null ? ( + var.is_windows ? "c:/Windows/Temp/vmware.iso" : null + ) : var.vmware_tools_upload_path + + # Source block common + boot_wait = var.boot_wait == null ? ( + var.is_windows ? "60s" : "5s" + ) : var.boot_wait + cd_files = var.cd_files == null ? ( + var.hyperv_generation == 2 && var.is_windows ? [ + "${path.root}/win_answer_files/${substr(var.os_version, 0, 2)}/gen2_Autounattend.xml" + ] : null + ) : var.cd_files + communicator = var.communicator == null ? ( + var.is_windows ? "winrm" : "ssh" + ) : var.communicator + floppy_files = var.floppy_files == null ? ( + var.hyperv_generation == 2 ? null : ( + var.is_windows ? [ + "${path.root}/win_answer_files/${var.os_version}/Autounattend.xml", + "${path.root}/scripts/windows/base_setup.ps1" + ] : ( + var.os_name == "springdalelinux" ? [ + "${path.root}/http/rhel/${substr(var.os_version, 0, 1)}ks.cfg" + ] : null + ) + ) + ) : var.floppy_files + http_directory = var.http_directory == null ? "${path.root}/http" : var.http_directory + memory = var.memory == null ? (var.is_windows ? 4096 : 2048) : var.memory + output_directory = var.output_directory == null ? "${path.root}/../builds/packer-${var.os_name}-${var.os_version}-${var.os_arch}-${source.type}" : var.output_directory + shutdown_command = var.shutdown_command == null ? ( + var.is_windows ? "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"" : ( + var.os_name == "freebsd" ? "echo 'vagrant' | su -m root -c 'shutdown -p now'" : "echo 'vagrant' | sudo -S /sbin/halt -h -p" + ) + ) : var.shutdown_command + vm_name = var.vm_name == null ? ( + var.os_arch == "x86_64" ? "${var.os_name}-${var.os_version}-amd64" : "${var.os_name}-${var.os_version}-${var.os_arch}" + ) : var.vm_name +} + +# https://www.packer.io/docs/templates/hcl_templates/blocks/source +source "hyperv-iso" "vm" { + enable_dynamic_memory = local.hyperv_enable_dynamic_memory + enable_secure_boot = local.hyperv_enable_secure_boot + generation = var.hyperv_generation + guest_additions_mode = var.hyperv_guest_additions_mode + switch_name = var.hyperv_switch_name + boot_command = var.boot_command_hyperv + boot_wait = local.boot_wait + cpus = var.cpus + communicator = local.communicator + disk_size = var.disk_size + floppy_files = local.floppy_files + headless = var.headless + http_directory = local.http_directory + iso_checksum = var.iso_checksum + iso_url = var.iso_url + memory = local.memory + output_directory = local.output_directory + shutdown_command = local.shutdown_command + shutdown_timeout = var.shutdown_timeout + ssh_password = var.ssh_password + ssh_port = var.ssh_port + ssh_timeout = var.ssh_timeout + ssh_username = var.ssh_username + winrm_password = var.winrm_password + winrm_timeout = var.winrm_timeout + winrm_username = var.winrm_username + vm_name = local.vm_name +} +source "parallels-iso" "vm" { + guest_os_type = var.parallels_guest_os_type + parallels_tools_flavor = local.parallels_tools_flavor + parallels_tools_mode = local.parallels_tools_mode + prlctl = local.parallels_prlctl + prlctl_version_file = var.parallels_prlctl_version_file + boot_command = var.boot_command + boot_wait = local.boot_wait + cpus = var.cpus + communicator = local.communicator + disk_size = var.disk_size + floppy_files = local.floppy_files + http_directory = local.http_directory + iso_checksum = var.iso_checksum + iso_url = var.iso_url + memory = local.memory + output_directory = local.output_directory + shutdown_command = local.shutdown_command + shutdown_timeout = var.shutdown_timeout + ssh_password = var.ssh_password + ssh_port = var.ssh_port + ssh_timeout = var.ssh_timeout + ssh_username = var.ssh_username + winrm_password = var.winrm_password + winrm_timeout = var.winrm_timeout + winrm_username = var.winrm_username + vm_name = local.vm_name +} +source "qemu" "vm" { + accelerator = var.qemu_accelerator + qemuargs = local.qemuargs + boot_command = var.boot_command + boot_wait = local.boot_wait + cd_files = local.cd_files + cpus = var.cpus + communicator = local.communicator + disk_size = var.disk_size + floppy_files = local.floppy_files + headless = var.headless + http_directory = local.http_directory + iso_checksum = var.iso_checksum + iso_url = var.iso_url + memory = local.memory + output_directory = local.output_directory + shutdown_command = local.shutdown_command + shutdown_timeout = var.shutdown_timeout + ssh_password = var.ssh_password + ssh_port = var.ssh_port + ssh_timeout = var.ssh_timeout + ssh_username = var.ssh_username + winrm_password = var.winrm_password + winrm_timeout = var.winrm_timeout + winrm_username = var.winrm_username + vm_name = local.vm_name +} +source "virtualbox-iso" "vm" { + gfx_controller = local.vbox_gfx_controller + gfx_vram_size = local.vbox_gfx_vram_size + guest_additions_path = var.vbox_guest_additions_path + guest_additions_mode = local.vbox_guest_additions_mode + guest_additions_interface = var.vbox_guest_additions_interface + guest_os_type = var.vbox_guest_os_type + hard_drive_interface = var.vbox_hard_drive_interface + iso_interface = var.vbox_iso_interface + vboxmanage = var.vboxmanage + virtualbox_version_file = var.virtualbox_version_file + boot_command = var.boot_command + boot_wait = local.boot_wait + cpus = var.cpus + communicator = local.communicator + disk_size = var.disk_size + floppy_files = local.floppy_files + headless = var.headless + http_directory = local.http_directory + iso_checksum = var.iso_checksum + iso_url = var.iso_url + memory = local.memory + output_directory = local.output_directory + shutdown_command = local.shutdown_command + shutdown_timeout = var.shutdown_timeout + ssh_password = var.ssh_password + ssh_port = var.ssh_port + ssh_timeout = var.ssh_timeout + ssh_username = var.ssh_username + winrm_password = var.winrm_password + winrm_timeout = var.winrm_timeout + winrm_username = var.winrm_username + vm_name = local.vm_name +} +source "virtualbox-ovf" "amazonlinux" { + guest_additions_path = var.vbox_guest_additions_path + source_path = local.vbox_source + vboxmanage = var.vboxmanage + virtualbox_version_file = var.virtualbox_version_file + communicator = local.communicator + headless = var.headless + output_directory = local.output_directory + shutdown_command = local.shutdown_command + shutdown_timeout = var.shutdown_timeout + ssh_password = var.ssh_password + ssh_port = var.ssh_port + ssh_timeout = var.ssh_timeout + ssh_username = var.ssh_username + vm_name = local.vm_name +} +source "vmware-iso" "vm" { + guest_os_type = var.vmware_guest_os_type + disk_adapter_type = local.vmware_disk_adapter_type + tools_upload_flavor = local.vmware_tools_upload_flavor + tools_upload_path = local.vmware_tools_upload_path + version = var.vmware_version + vmx_data = var.vmware_vmx_data + vmx_remove_ethernet_interfaces = var.vmware_vmx_remove_ethernet_interfaces + boot_command = var.boot_command + boot_wait = local.boot_wait + cpus = var.cpus + communicator = local.communicator + disk_size = var.disk_size + floppy_files = local.floppy_files + headless = var.headless + http_directory = local.http_directory + iso_checksum = var.iso_checksum + iso_url = var.iso_url + memory = local.memory + output_directory = local.output_directory + shutdown_command = local.shutdown_command + shutdown_timeout = var.shutdown_timeout + ssh_password = var.ssh_password + ssh_port = var.ssh_port + ssh_timeout = var.ssh_timeout + ssh_username = var.ssh_username + winrm_password = var.winrm_password + winrm_timeout = var.winrm_timeout + winrm_username = var.winrm_username + vm_name = local.vm_name +} diff --git a/packer_templates/pkr-variables.pkr.hcl b/packer_templates/pkr-variables.pkr.hcl new file mode 100644 index 000000000..506d4583b --- /dev/null +++ b/packer_templates/pkr-variables.pkr.hcl @@ -0,0 +1,297 @@ +# General variables +variable "os_name" { + type = string + description = "OS Brand Name" +} +variable "os_version" { + type = string + description = "OS version number" +} +variable "os_arch" { + type = string + validation { + condition = var.os_arch == "x86_64" || var.os_arch == "aarch64" + error_message = "The OS architecture type should be either x86_64 or aarch64." + } + description = "OS architecture type, x86_64 or aarch64" +} +variable "is_windows" { + type = bool + default = false + description = "Determines to set setting for Windows or Linux" +} +variable "http_proxy" { + type = string + default = env("http_proxy") + description = "Http proxy url to connect to the internet" +} +variable "https_proxy" { + type = string + default = env("https_proxy") + description = "Https proxy url to connect to the internet" +} +variable "no_proxy" { + type = string + default = env("no_proxy") + description = "No Proxy" +} +variable "sources_enabled" { + type = list(string) + default = [ + "source.hyperv-iso.vm", + "source.parallels-iso.vm", + "source.qemu.vm", + "source.virtualbox-iso.vm", + "source.vmware-iso.vm", + ] + description = "Build Sources to use for building vagrant boxes" +} + +# Source block provider specific variables +# hyperv-iso +variable "boot_command_hyperv" { + type = list(string) + default = null + description = "Commands to pass to gui session to initiate automated install" +} +variable "hyperv_enable_dynamic_memory" { + type = bool + default = null +} +variable "hyperv_enable_secure_boot" { + type = bool + default = null +} +variable "hyperv_generation" { + type = number + default = 1 + description = "Hyper-v generation version" +} +variable "hyperv_guest_additions_mode" { + type = string + default = "disable" +} +variable "hyperv_switch_name" { + type = string + default = "bento" +} + +# parallels-iso +variable "parallels_guest_os_type" { + type = string + default = null + description = "OS type for virtualization optimization" +} +variable "parallels_tools_flavor" { + type = string + default = null +} +variable "parallels_tools_mode" { + type = string + default = null +} +variable "parallels_prlctl" { + type = list(list(string)) + default = null +} +variable "parallels_prlctl_version_file" { + type = string + default = ".prlctl_version" +} + +# qemu +variable "qemu_accelerator" { + type = string + default = "kvm" +} +variable "qemuargs" { + type = list(list(string)) + default = null +} + +# virtualbox-iso +variable "vbox_gfx_controller" { + type = string + default = null +} +variable "vbox_gfx_vram_size" { + type = number + default = null +} +variable "vbox_guest_additions_interface" { + type = string + default = "sata" +} +variable "vbox_guest_additions_mode" { + type = string + default = null +} +variable "vbox_guest_additions_path" { + type = string + default = "VBoxGuestAdditions_{{ .Version }}.iso" +} +variable "vbox_guest_os_type" { + type = string + default = null + description = "OS type for virtualization optimization" +} +variable "vbox_hard_drive_interface" { + type = string + default = "sata" +} +variable "vbox_iso_interface" { + type = string + default = "sata" +} +variable "vboxmanage" { + type = list(list(string)) + default = [ + [ + "modifyvm", + "{{.Name}}", + "--audio", + "none", + # "--nat-localhostreachable1", + # "on", + ] + ] +} +variable "virtualbox_version_file" { + type = string + default = ".vbox_version" +} + +# virtualbox-ovg +variable "vbox_source" { + type = string + default = null +} + +# vmware-iso +variable "vmware_disk_adapter_type" { + type = string + default = null +} +variable "vmware_guest_os_type" { + type = string + default = null + description = "OS type for virtualization optimization" +} +variable "vmware_tools_upload_flavor" { + type = string + default = null +} +variable "vmware_tools_upload_path" { + type = string + default = null +} +variable "vmware_version" { + type = number + default = 19 +} +variable "vmware_vmx_data" { + type = map(string) + default = null +} +variable "vmware_vmx_remove_ethernet_interfaces" { + type = bool + default = true +} + +# Source block common variables +variable "boot_command" { + type = list(string) + default = null + description = "Commands to pass to gui session to initiate automated install" +} +variable "boot_wait" { + type = string + default = null +} +variable "cd_files" { + type = list(string) + default = null +} +variable "cpus" { + type = number + default = 2 +} +variable "communicator" { + type = string + default = null +} +variable "disk_size" { + type = number + default = 65536 +} +variable "floppy_files" { + type = list(string) + default = null +} +variable "headless" { + type = bool + default = true + description = "Start GUI window to interact with VM" +} +variable "http_directory" { + type = string + default = null +} +variable "iso_checksum" { + type = string + default = null + description = "ISO download checksum" +} +variable "iso_url" { + type = string + default = null + description = "ISO download url" +} +variable "memory" { + type = number + default = null +} +variable "output_directory" { + type = string + default = null +} +variable "shutdown_command" { + type = string + default = null +} +variable "shutdown_timeout" { + type = string + default = "15m" +} +variable "ssh_password" { + type = string + default = "vagrant" +} +variable "ssh_port" { + type = number + default = 22 +} +variable "ssh_timeout" { + type = string + default = "60m" +} +variable "ssh_username" { + type = string + default = "vagrant" +} +variable "winrm_password" { + type = string + default = "vagrant" +} +variable "winrm_timeout" { + type = string + default = "60m" +} +variable "winrm_username" { + type = string + default = "vagrant" +} +variable "vm_name" { + type = string + default = null +} diff --git a/packer_templates/rhel/rhel-6.10-i386.json b/packer_templates/rhel/rhel-6.10-i386.json deleted file mode 100644 index de15f2a3b..000000000 --- a/packer_templates/rhel/rhel-6.10-i386.json +++ /dev/null @@ -1,160 +0,0 @@ -{ - "builders": [ - { - "boot_command": [ - "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" - ], - "boot_wait": "5s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", - "guest_additions_url": "{{ user `guest_additions_url` }}", - "guest_os_type": "RedHat", - "hard_drive_interface": "sata", - "headless": "{{ user `headless` }}", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-virtualbox", - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "type": "virtualbox-iso", - "virtualbox_version_file": ".vbox_version", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" - ], - "boot_wait": "5s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "redhat", - "headless": "{{ user `headless` }}", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-vmware", - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "tools_upload_flavor": "linux", - "type": "vmware-iso", - "vm_name": "{{ user `template` }}", - "vmx_data": { - "cpuid.coresPerSocket": "1" - }, - "vmx_remove_ethernet_interfaces": true - }, - { - "boot_command": [ - "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" - ], - "boot_wait": "5s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "rhel", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-parallels", - "parallels_tools_flavor": "lin", - "prlctl_version_file": ".prlctl_version", - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "type": "parallels-iso", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" - ], - "boot_wait": "5s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "headless": "{{ user `headless` }}", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-qemu", - "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "type": "qemu", - "vm_name": "{{ user `template` }}", - "qemuargs": [ - [ "-m", "{{ user `memory` }}" ], - [ "-display", "{{ user `qemu_display` }}" ] - ] - } - ], - "post-processors": [ - { - "output": "{{ user `build_directory` }}/{{user `box_basename`}}.{{.Provider}}.box", - "type": "vagrant" - } - ], - "provisioners": [ - { - "environment_vars": [ - "HOME_DIR=/home/vagrant", - "http_proxy={{user `http_proxy`}}", - "https_proxy={{user `https_proxy`}}", - "no_proxy={{user `no_proxy`}}" - ], - "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", - "expect_disconnect": true, - "scripts": [ - "{{template_dir}}/../centos/scripts/networking.sh", - "{{template_dir}}/../_common/motd.sh", - "{{template_dir}}/../_common/sshd.sh", - "{{template_dir}}/../_common/vagrant.sh", - "{{template_dir}}/../_common/virtualbox.sh", - "{{template_dir}}/../_common/vmware.sh", - "{{template_dir}}/../_common/parallels.sh", - "{{template_dir}}/../centos/scripts/cleanup.sh", - "{{template_dir}}/../_common/minimize.sh" - ], - "type": "shell" - } - ], - "variables": { - "arch": "32", - "box_basename": "rhel-6.10-i386", - "build_directory": "../../builds", - "build_timestamp": "{{isotime \"20060102150405\"}}", - "cpus": "2", - "disk_size": "65536", - "git_revision": "__unknown_git_revision__", - "guest_additions_url": "", - "headless": "", - "http_directory": "{{template_dir}}/../centos/http", - "http_proxy": "{{env `http_proxy`}}", - "https_proxy": "{{env `https_proxy`}}", - "iso_checksum": "715c382b2c0484087654281446dce058d9eeb930d7dcc92a2130d52328df87b8", - "iso_name": "rhel-server-6.10-i386-dvd.iso", - "ks_path": "6/ks.cfg", - "memory": "1024", - "mirror": "http://YOU-MUST-PROVIDE-YOUR-OWN-ISO.sorry", - "mirror_directory": "rhel", - "name": "rhel-6.10-i386", - "no_proxy": "{{env `no_proxy`}}", - "qemu_display": "none", - "template": "rhel-6.10-i386", - "version": "TIMESTAMP" - } -} diff --git a/packer_templates/rhel/rhel-6.10-x86_64.json b/packer_templates/rhel/rhel-6.10-x86_64.json deleted file mode 100644 index 45a6d3f31..000000000 --- a/packer_templates/rhel/rhel-6.10-x86_64.json +++ /dev/null @@ -1,160 +0,0 @@ -{ - "builders": [ - { - "boot_command": [ - "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" - ], - "boot_wait": "5s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", - "guest_additions_url": "{{ user `guest_additions_url` }}", - "guest_os_type": "RedHat_64", - "hard_drive_interface": "sata", - "headless": "{{ user `headless` }}", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-virtualbox", - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "type": "virtualbox-iso", - "virtualbox_version_file": ".vbox_version", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" - ], - "boot_wait": "5s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "rhel6-64", - "headless": "{{ user `headless` }}", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-vmware", - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "tools_upload_flavor": "linux", - "type": "vmware-iso", - "vm_name": "{{ user `template` }}", - "vmx_data": { - "cpuid.coresPerSocket": "1" - }, - "vmx_remove_ethernet_interfaces": true - }, - { - "boot_command": [ - "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" - ], - "boot_wait": "5s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "rhel", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-parallels", - "parallels_tools_flavor": "lin", - "prlctl_version_file": ".prlctl_version", - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "type": "parallels-iso", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" - ], - "boot_wait": "5s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "headless": "{{ user `headless` }}", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-qemu", - "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "type": "qemu", - "vm_name": "{{ user `template` }}", - "qemuargs": [ - [ "-m", "{{ user `memory` }}" ], - [ "-display", "{{ user `qemu_display` }}" ] - ] - } - ], - "post-processors": [ - { - "output": "{{ user `build_directory` }}/{{user `box_basename`}}.{{.Provider}}.box", - "type": "vagrant" - } - ], - "provisioners": [ - { - "environment_vars": [ - "HOME_DIR=/home/vagrant", - "http_proxy={{user `http_proxy`}}", - "https_proxy={{user `https_proxy`}}", - "no_proxy={{user `no_proxy`}}" - ], - "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", - "expect_disconnect": true, - "scripts": [ - "{{template_dir}}/../centos/scripts/networking.sh", - "{{template_dir}}/../_common/motd.sh", - "{{template_dir}}/../_common/sshd.sh", - "{{template_dir}}/../_common/vagrant.sh", - "{{template_dir}}/../_common/virtualbox.sh", - "{{template_dir}}/../_common/vmware.sh", - "{{template_dir}}/../_common/parallels.sh", - "{{template_dir}}/../centos/scripts/cleanup.sh", - "{{template_dir}}/../_common/minimize.sh" - ], - "type": "shell" - } - ], - "variables": { - "arch": "64", - "box_basename": "rhel-6.10", - "build_directory": "../../builds", - "build_timestamp": "{{isotime \"20060102150405\"}}", - "cpus": "2", - "disk_size": "65536", - "git_revision": "__unknown_git_revision__", - "guest_additions_url": "", - "headless": "", - "http_directory": "{{template_dir}}/../centos/http", - "http_proxy": "{{env `http_proxy`}}", - "https_proxy": "{{env `https_proxy`}}", - "iso_checksum": "1e15f9202d2cdd4b2bdf9d6503a8543347f0cb8cc06ba9a0dfd2df4fdef5c727", - "iso_name": "rhel-server-6.10-x86_64-dvd.iso", - "ks_path": "6/ks.cfg", - "memory": "1024", - "mirror": "http://YOU-MUST-PROVIDE-YOUR-OWN-ISO.sorry", - "mirror_directory": "rhel", - "name": "rhel-6.10", - "no_proxy": "{{env `no_proxy`}}", - "qemu_display": "none", - "template": "rhel-6.10-x86_64", - "version": "TIMESTAMP" - } -} diff --git a/packer_templates/rhel/rhel-7.6-x86_64.json b/packer_templates/rhel/rhel-7.6-x86_64.json deleted file mode 100644 index 6c4db4ffe..000000000 --- a/packer_templates/rhel/rhel-7.6-x86_64.json +++ /dev/null @@ -1,160 +0,0 @@ -{ - "builders": [ - { - "boot_command": [ - "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" - ], - "boot_wait": "5s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", - "guest_additions_url": "{{ user `guest_additions_url` }}", - "guest_os_type": "RedHat_64", - "hard_drive_interface": "sata", - "headless": "{{ user `headless` }}", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-virtualbox", - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "type": "virtualbox-iso", - "virtualbox_version_file": ".vbox_version", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" - ], - "boot_wait": "5s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "rhel7-64", - "headless": "{{ user `headless` }}", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-vmware", - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "tools_upload_flavor": "linux", - "type": "vmware-iso", - "vm_name": "{{ user `template` }}", - "vmx_data": { - "cpuid.coresPerSocket": "1" - }, - "vmx_remove_ethernet_interfaces": true - }, - { - "boot_command": [ - "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" - ], - "boot_wait": "5s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "rhel", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-parallels", - "parallels_tools_flavor": "lin", - "prlctl_version_file": ".prlctl_version", - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "type": "parallels-iso", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" - ], - "boot_wait": "5s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "headless": "{{ user `headless` }}", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-qemu", - "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "type": "qemu", - "vm_name": "{{ user `template` }}", - "qemuargs": [ - [ "-m", "{{ user `memory` }}" ], - [ "-display", "{{ user `qemu_display` }}" ] - ] - } - ], - "post-processors": [ - { - "output": "{{ user `build_directory` }}/{{user `box_basename`}}.{{.Provider}}.box", - "type": "vagrant" - } - ], - "provisioners": [ - { - "environment_vars": [ - "HOME_DIR=/home/vagrant", - "http_proxy={{user `http_proxy`}}", - "https_proxy={{user `https_proxy`}}", - "no_proxy={{user `no_proxy`}}" - ], - "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", - "expect_disconnect": true, - "scripts": [ - "{{template_dir}}/../centos/scripts/networking.sh", - "{{template_dir}}/../_common/motd.sh", - "{{template_dir}}/../_common/sshd.sh", - "{{template_dir}}/../_common/vagrant.sh", - "{{template_dir}}/../_common/virtualbox.sh", - "{{template_dir}}/../_common/vmware.sh", - "{{template_dir}}/../_common/parallels.sh", - "{{template_dir}}/../centos/scripts/cleanup.sh", - "{{template_dir}}/../_common/minimize.sh" - ], - "type": "shell" - } - ], - "variables": { - "arch": "64", - "box_basename": "rhel-7.6", - "build_directory": "../../builds", - "build_timestamp": "{{isotime \"20060102150405\"}}", - "cpus": "2", - "disk_size": "65536", - "git_revision": "__unknown_git_revision__", - "guest_additions_url": "", - "headless": "", - "http_directory": "{{template_dir}}/../centos/http", - "http_proxy": "{{env `http_proxy`}}", - "https_proxy": "{{env `https_proxy`}}", - "iso_checksum": "60a0be5aeed1f08f2bb7599a578c89ec134b4016cd62a8604b29f15d543a469c", - "iso_name": "rhel-server-7.6-x86_64-dvd.iso", - "ks_path": "7/ks.cfg", - "memory": "1024", - "mirror": "http://YOU-MUST-PROVIDE-YOUR-OWN-ISO.sorry", - "mirror_directory": "rhel", - "name": "rhel-7.6", - "no_proxy": "{{env `no_proxy`}}", - "qemu_display": "none", - "template": "rhel-7.6-x86_64", - "version": "TIMESTAMP" - } -} diff --git a/packer_templates/rhel/rhel-8.0-x86_64.json b/packer_templates/rhel/rhel-8.0-x86_64.json deleted file mode 100644 index 401011f2d..000000000 --- a/packer_templates/rhel/rhel-8.0-x86_64.json +++ /dev/null @@ -1,160 +0,0 @@ -{ - "builders": [ - { - "boot_command": [ - "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" - ], - "boot_wait": "5s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", - "guest_additions_url": "{{ user `guest_additions_url` }}", - "guest_os_type": "RedHat_64", - "hard_drive_interface": "sata", - "headless": "{{ user `headless` }}", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-virtualbox", - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "type": "virtualbox-iso", - "virtualbox_version_file": ".vbox_version", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" - ], - "boot_wait": "5s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "rhel8-64", - "headless": "{{ user `headless` }}", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-vmware", - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "tools_upload_flavor": "linux", - "type": "vmware-iso", - "vm_name": "{{ user `template` }}", - "vmx_data": { - "cpuid.coresPerSocket": "1" - }, - "vmx_remove_ethernet_interfaces": true - }, - { - "boot_command": [ - "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" - ], - "boot_wait": "5s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "rhel", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-parallels", - "parallels_tools_flavor": "lin", - "prlctl_version_file": ".prlctl_version", - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "type": "parallels-iso", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" - ], - "boot_wait": "5s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "headless": "{{ user `headless` }}", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-qemu", - "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "type": "qemu", - "vm_name": "{{ user `template` }}", - "qemuargs": [ - [ "-m", "{{ user `memory` }}" ], - [ "-display", "{{ user `qemu_display` }}" ] - ] - } - ], - "post-processors": [ - { - "output": "{{ user `build_directory` }}/{{user `box_basename`}}.{{.Provider}}.box", - "type": "vagrant" - } - ], - "provisioners": [ - { - "environment_vars": [ - "HOME_DIR=/home/vagrant", - "http_proxy={{user `http_proxy`}}", - "https_proxy={{user `https_proxy`}}", - "no_proxy={{user `no_proxy`}}" - ], - "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", - "expect_disconnect": true, - "scripts": [ - "{{template_dir}}/../centos/scripts/networking.sh", - "{{template_dir}}/../_common/motd.sh", - "{{template_dir}}/../_common/sshd.sh", - "{{template_dir}}/../_common/vagrant.sh", - "{{template_dir}}/../_common/virtualbox.sh", - "{{template_dir}}/../_common/vmware.sh", - "{{template_dir}}/../_common/parallels.sh", - "{{template_dir}}/../centos/scripts/cleanup.sh", - "{{template_dir}}/../_common/minimize.sh" - ], - "type": "shell" - } - ], - "variables": { - "arch": "64", - "box_basename": "rhel-8.0", - "build_directory": "../../builds", - "build_timestamp": "{{isotime \"20060102150405\"}}", - "cpus": "2", - "disk_size": "65536", - "git_revision": "__unknown_git_revision__", - "guest_additions_url": "", - "headless": "", - "http_directory": "{{template_dir}}/../centos/http", - "http_proxy": "{{env `http_proxy`}}", - "https_proxy": "{{env `https_proxy`}}", - "iso_checksum": "005d4f88fff6d63b0fc01a10822380ef52570edd8834321de7be63002cc6cc43", - "iso_name": "rhel-8.0-x86_64-dvd.iso", - "ks_path": "8/ks.cfg", - "memory": "1024", - "mirror": "http://YOU-MUST-PROVIDE-YOUR-OWN-ISO.sorry", - "mirror_directory": "rhel", - "name": "rhel-8.0", - "no_proxy": "{{env `no_proxy`}}", - "qemu_display": "none", - "template": "rhel-8.0-x86_64", - "version": "TIMESTAMP" - } -} diff --git a/packer_templates/rockylinux/http/8/ks.cfg b/packer_templates/rockylinux/http/8/ks.cfg deleted file mode 100644 index 595f4950f..000000000 --- a/packer_templates/rockylinux/http/8/ks.cfg +++ /dev/null @@ -1,77 +0,0 @@ -install -cdrom -lang en_US.UTF-8 -keyboard us -network --bootproto=dhcp --noipv6 --onboot=on --device=eth0 -rootpw --plaintext vagrant -firewall --disabled -selinux --permissive -timezone UTC -bootloader --timeout=1 --location=mbr --append="net.ifnames=0 biosdevname=0" -text -skipx -zerombr -clearpart --all --initlabel -autopart --nohome --nolvm --noboot -firstboot --disabled -reboot --eject -user --name=vagrant --plaintext --password vagrant - -%packages --ignoremissing --excludedocs --instLangs=en_US.utf8 -# vagrant needs this to copy initial files via scp -openssh-clients -sudo -selinux-policy-devel -wget -nfs-utils -net-tools -tar -bzip2 -deltarpm -rsync -dnf-utils -redhat-lsb-core -elfutils-libelf-devel -network-scripts --fprintd-pam --intltool --iwl*-firmware --microcode_ctl -%end - -%post -# sudo -echo 'Defaults:vagrant !requiretty' > /etc/sudoers.d/vagrant -echo '%vagrant ALL=(ALL) NOPASSWD: ALL' >> /etc/sudoers.d/vagrant -chmod 440 /etc/sudoers.d/vagrant - -# Enable hyper-v daemons only if using hyper-v virtualization -if [ $(virt-what) == "hyperv" ]; then - dnf -y install hyperv-daemons cifs-utils - systemctl enable hypervvssd - systemctl enable hypervkvpd -fi - -# Since we disable consistent network naming, we need to make sure the eth0 -# configuration file is in place so it will come up. -# Delete other network configuration first because RHEL/C7 networking will not -# restart successfully if there are configuration files for devices that do not -# exist. -rm -f /etc/sysconfig/network-scripts/ifcfg-e* -cat > /etc/sysconfig/network-scripts/ifcfg-eth0 << _EOF_ -TYPE=Ethernet -PROXY_METHOD=none -BROWSER_ONLY=no -BOOTPROTO=dhcp -DEFROUTE=yes -IPV4_FAILURE_FATAL=no -IPV6INIT=yes -IPV6_AUTOCONF=yes -IPV6_DEFROUTE=yes -IPV6_FAILURE_FATAL=no -IPV6_ADDR_GEN_MODE=stable-privacy -NAME=eth0 -DEVICE=eth0 -ONBOOT=yes -_EOF_ -%end diff --git a/packer_templates/rockylinux/rockylinux-8.7-x86_64.json b/packer_templates/rockylinux/rockylinux-8.7-x86_64.json deleted file mode 100644 index fe07d275c..000000000 --- a/packer_templates/rockylinux/rockylinux-8.7-x86_64.json +++ /dev/null @@ -1,196 +0,0 @@ -{ - "builders": [ - { - "boot_command": "{{ user `boot_command` }}", - "boot_wait": "5s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", - "guest_additions_url": "{{ user `guest_additions_url` }}", - "guest_os_type": "RedHat_64", - "hard_drive_interface": "sata", - "headless": "{{ user `headless` }}", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-virtualbox", - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "type": "virtualbox-iso", - "virtualbox_version_file": ".vbox_version", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": "{{ user `boot_command` }}", - "boot_wait": "5s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "centos-64", - "headless": "{{ user `headless` }}", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-vmware", - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", - "ssh_password": "vagrant", - "ssh_port": 22, - "version": 19, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "tools_upload_flavor": "linux", - "type": "vmware-iso", - "vm_name": "{{ user `template` }}", - "vmx_data": { - "cpuid.coresPerSocket": "1" - }, - "vmx_remove_ethernet_interfaces": true - }, - { - "boot_command": "{{user `boot_command`}}", - "boot_wait": "5s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "centos", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-parallels", - "parallels_tools_flavor": "lin", - "prlctl_version_file": ".prlctl_version", - "prlctl": [ - [ - "set", - "{{.Name}}", - "--3d-accelerate", - "off" - ], - [ - "set", - "{{.Name}}", - "--videosize", - "16" - ] - ], - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "type": "parallels-iso", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<wait5><up><wait5><tab> text ks=hd:fd0:/ks.cfg<enter><wait5><esc>" - ], - "boot_wait": "5s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "floppy_files": [ - "{{user `http_directory`}}/{{user `ks_path`}}" - ], - "generation": "{{user `hyperv_generation`}}", - "guest_additions_mode": "disable", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-hyperv", - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "switch_name": "{{ user `hyperv_switch`}}", - "type": "hyperv-iso", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": "{{ user `boot_command` }}", - "boot_wait": "5s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "headless": "{{ user `headless` }}", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-qemu", - "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "type": "qemu", - "vm_name": "{{ user `template` }}", - "qemuargs": [ - [ "-m", "{{ user `memory` }}" ], - [ "-display", "{{ user `qemu_display` }}" ] - ] - } - ], - "post-processors": [ - { - "output": "{{ user `build_directory` }}/{{user `box_basename`}}.{{.Provider}}.box", - "type": "vagrant" - } - ], - "provisioners": [ - { - "environment_vars": [ - "HOME_DIR=/home/vagrant", - "http_proxy={{user `http_proxy`}}", - "https_proxy={{user `https_proxy`}}", - "no_proxy={{user `no_proxy`}}" - ], - "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", - "expect_disconnect": true, - "scripts": [ - "{{template_dir}}/scripts/update.sh", - "{{template_dir}}/../_common/motd.sh", - "{{template_dir}}/../_common/sshd.sh", - "{{template_dir}}/scripts/networking.sh", - "{{template_dir}}/../_common/vagrant.sh", - "{{template_dir}}/../_common/virtualbox.sh", - "{{template_dir}}/../_common/vmware.sh", - "{{template_dir}}/../_common/parallels.sh", - "{{template_dir}}/scripts/cleanup.sh", - "{{template_dir}}/../_common/minimize.sh" - ], - "type": "shell" - } - ], - "variables": { - "box_basename": "rockylinux-8.7", - "build_directory": "../../builds", - "build_timestamp": "{{isotime \"202205152221\"}}", - "cpus": "2", - "disk_size": "65536", - "git_revision": "__unknown_git_revision__", - "guest_additions_url": "", - "headless": "", - "http_directory": "{{template_dir}}/http", - "http_proxy": "{{env `http_proxy`}}", - "https_proxy": "{{env `https_proxy`}}", - "hyperv_generation": "1", - "hyperv_switch": "bento", - "iso_checksum": "4827dce1c58560d3ca470a5053e8d86ba059cbb77cfca3b5f6a5863d2aac5b84", - "iso_name": "Rocky-8.7-x86_64-dvd1.iso", - "ks_path": "8/ks.cfg", - "memory": "1024", - "mirror": "http://download.rockylinux.org/pub/rocky", - "mirror_directory": "8.7/isos/x86_64", - "name": "rockylinux-8.7", - "no_proxy": "{{env `no_proxy`}}", - "qemu_display": "none", - "template": "rockylinux-8.7-x86_64", - "boot_command": "<up><wait><tab> inst.text inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>", - "version": "TIMESTAMP" - } -} diff --git a/packer_templates/rockylinux/rockylinux-9.1-x86_64.json b/packer_templates/rockylinux/rockylinux-9.1-x86_64.json deleted file mode 100644 index 5adb08968..000000000 --- a/packer_templates/rockylinux/rockylinux-9.1-x86_64.json +++ /dev/null @@ -1,196 +0,0 @@ -{ - "builders": [ - { - "boot_command": "{{ user `boot_command` }}", - "boot_wait": "5s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", - "guest_additions_url": "{{ user `guest_additions_url` }}", - "guest_os_type": "RedHat_64", - "hard_drive_interface": "sata", - "headless": "{{ user `headless` }}", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-virtualbox", - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "type": "virtualbox-iso", - "virtualbox_version_file": ".vbox_version", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": "{{ user `boot_command` }}", - "boot_wait": "5s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "centos-64", - "headless": "{{ user `headless` }}", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-vmware", - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", - "ssh_password": "vagrant", - "ssh_port": 22, - "version": 19, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "tools_upload_flavor": "linux", - "type": "vmware-iso", - "vm_name": "{{ user `template` }}", - "vmx_data": { - "cpuid.coresPerSocket": "1" - }, - "vmx_remove_ethernet_interfaces": true - }, - { - "boot_command": "{{user `boot_command`}}", - "boot_wait": "5s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "centos", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-parallels", - "parallels_tools_flavor": "lin", - "prlctl_version_file": ".prlctl_version", - "prlctl": [ - [ - "set", - "{{.Name}}", - "--3d-accelerate", - "off" - ], - [ - "set", - "{{.Name}}", - "--videosize", - "16" - ] - ], - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "type": "parallels-iso", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<wait5><up><wait5><tab> text ks=hd:fd0:/ks.cfg<enter><wait5><esc>" - ], - "boot_wait": "5s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "floppy_files": [ - "{{user `http_directory`}}/{{user `ks_path`}}" - ], - "generation": "{{user `hyperv_generation`}}", - "guest_additions_mode": "disable", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-hyperv", - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "switch_name": "{{ user `hyperv_switch`}}", - "type": "hyperv-iso", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": "{{ user `boot_command` }}", - "boot_wait": "5s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "headless": "{{ user `headless` }}", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-qemu", - "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "type": "qemu", - "vm_name": "{{ user `template` }}", - "qemuargs": [ - [ "-m", "{{ user `memory` }}" ], - [ "-display", "{{ user `qemu_display` }}" ] - ] - } - ], - "post-processors": [ - { - "output": "{{ user `build_directory` }}/{{user `box_basename`}}.{{.Provider}}.box", - "type": "vagrant" - } - ], - "provisioners": [ - { - "environment_vars": [ - "HOME_DIR=/home/vagrant", - "http_proxy={{user `http_proxy`}}", - "https_proxy={{user `https_proxy`}}", - "no_proxy={{user `no_proxy`}}" - ], - "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", - "expect_disconnect": true, - "scripts": [ - "{{template_dir}}/scripts/update.sh", - "{{template_dir}}/../_common/motd.sh", - "{{template_dir}}/../_common/sshd.sh", - "{{template_dir}}/scripts/networking.sh", - "{{template_dir}}/../_common/vagrant.sh", - "{{template_dir}}/../_common/virtualbox.sh", - "{{template_dir}}/../_common/vmware.sh", - "{{template_dir}}/../_common/parallels.sh", - "{{template_dir}}/scripts/cleanup.sh", - "{{template_dir}}/../_common/minimize.sh" - ], - "type": "shell" - } - ], - "variables": { - "box_basename": "rockylinux-9.1", - "build_directory": "../../builds", - "build_timestamp": "{{isotime \"202207180452\"}}", - "cpus": "2", - "disk_size": "65536", - "git_revision": "__unknown_git_revision__", - "guest_additions_url": "", - "headless": "", - "http_directory": "{{template_dir}}/http", - "http_proxy": "{{env `http_proxy`}}", - "https_proxy": "{{env `https_proxy`}}", - "hyperv_generation": "1", - "hyperv_switch": "bento", - "iso_checksum": "file:https://download.rockylinux.org/pub/rocky/9.1/isos/x86_64/Rocky-9.1-x86_64-dvd.iso.CHECKSUM", - "iso_name": "Rocky-9.1-x86_64-dvd.iso", - "ks_path": "9/ks.cfg", - "memory": "1024", - "mirror": "https://download.rockylinux.org/pub/rocky", - "mirror_directory": "9/isos/x86_64", - "name": "rockylinux-9.1", - "no_proxy": "{{env `no_proxy`}}", - "qemu_display": "none", - "template": "rockylinux-9.1-x86_64", - "boot_command": "<up><wait><tab> inst.text inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>", - "version": "TIMESTAMP" - } -} diff --git a/packer_templates/rockylinux/scripts/networking.sh b/packer_templates/rockylinux/scripts/networking.sh deleted file mode 100644 index 087eca742..000000000 --- a/packer_templates/rockylinux/scripts/networking.sh +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/sh -eux - -case "$PACKER_BUILDER_TYPE" in - -virtualbox-iso|virtualbox-ovf) - # Fix slow DNS: - # Add 'single-request-reopen' so it is included when /etc/resolv.conf is - # generated - # https://access.redhat.com/site/solutions/58625 (subscription required) - - echo 'RES_OPTIONS="single-request-reopen"' >>/etc/sysconfig/network; - - nmcli networking off - sleep 5 - nmcli networking on - - echo 'Slow DNS fix applied (single-request-reopen)'; - ;; - -esac diff --git a/packer_templates/rockylinux/scripts/update.sh b/packer_templates/rockylinux/scripts/update.sh deleted file mode 100644 index 7025bf2b5..000000000 --- a/packer_templates/rockylinux/scripts/update.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/sh -eux - -# determine the major EL version we're runninng -major_version="`sed 's/^.\+ release \([.0-9]\+\).*/\1/' /etc/redhat-release | awk -F. '{print $1}'`"; - -# update all packages -dnf -y update - -reboot; -sleep 60; diff --git a/packer_templates/scientificlinux/http/7/ks.cfg b/packer_templates/scientificlinux/http/7/ks.cfg deleted file mode 100644 index 989750d47..000000000 --- a/packer_templates/scientificlinux/http/7/ks.cfg +++ /dev/null @@ -1,52 +0,0 @@ -install -cdrom -lang en_US.UTF-8 -keyboard us -network --bootproto=dhcp --onboot=on --device=eth0 -rootpw vagrant -firewall --disabled -selinux --permissive -timezone UTC -unsupported_hardware -bootloader --location=mbr -text -skipx -zerombr -clearpart --all --initlabel -autopart -auth --enableshadow --passalgo=sha512 --kickstart -firstboot --disabled -reboot --eject -user --name=vagrant --plaintext --password vagrant - -%packages --nobase --ignoremissing --excludedocs -# vagrant needs this to copy initial files via scp -openssh-clients -sudo -make -perl -selinux-policy-devel -wget -nfs-utils -net-tools -bzip2 --fprintd-pam --intltool - -# unnecessary firmware --*firmware --microcode_ctl -%end - -%post -# sudo -echo "%vagrant ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers.d/vagrant - -#Enable hyper-v daemons only if using hyper-v virtualization -if [ $(virt-what) == "hyperv" ]; then - yum -y install hyperv-daemons cifs-utils - systemctl enable hypervvssd - systemctl enable hypervkvpd -fi - -%end diff --git a/packer_templates/scientificlinux/scientific-7.9-x86_64.json b/packer_templates/scientificlinux/scientific-7.9-x86_64.json deleted file mode 100644 index c3671bfc6..000000000 --- a/packer_templates/scientificlinux/scientific-7.9-x86_64.json +++ /dev/null @@ -1,203 +0,0 @@ -{ - "builders": [ - { - "boot_command": [ - "<up><wait><tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" - ], - "boot_wait": "5s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", - "guest_additions_url": "{{ user `guest_additions_url` }}", - "guest_os_type": "RedHat_64", - "hard_drive_interface": "sata", - "headless": "{{ user `headless` }}", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-virtualbox", - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "type": "virtualbox-iso", - "virtualbox_version_file": ".vbox_version", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<up><wait><tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" - ], - "boot_wait": "5s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "centos-64", - "headless": "{{ user `headless` }}", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-vmware", - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", - "ssh_password": "vagrant", - "ssh_port": 22, - "version": 19, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "tools_upload_flavor": "linux", - "type": "vmware-iso", - "vm_name": "{{ user `template` }}", - "vmx_data": { - "cpuid.coresPerSocket": "1" - }, - "vmx_remove_ethernet_interfaces": true - }, - { - "boot_command": [ - "<up><wait><tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" - ], - "boot_wait": "5s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "centos", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-parallels", - "parallels_tools_flavor": "lin", - "prlctl_version_file": ".prlctl_version", - "prlctl": [ - [ - "set", - "{{.Name}}", - "--3d-accelerate", - "off" - ], - [ - "set", - "{{.Name}}", - "--videosize", - "16" - ] - ], - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "type": "parallels-iso", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<wait5><tab> text ks=hd:fd0:/ks.cfg<enter><wait5><esc>" - ], - "boot_wait": "5s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "floppy_files": [ - "{{user `http_directory`}}/{{user `ks_path`}}" - ], - "generation": "{{user `hyperv_generation`}}", - "guest_additions_mode": "disable", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-hyperv", - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "switch_name": "{{ user `hyperv_switch`}}", - "type": "hyperv-iso", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<up><wait><tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>" - ], - "boot_wait": "5s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "headless": "{{ user `headless` }}", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-qemu", - "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "type": "qemu", - "vm_name": "{{ user `template` }}", - "qemuargs": [ - [ "-m", "{{ user `memory` }}" ], - [ "-display", "{{ user `qemu_display` }}" ] - ] - } - ], - "post-processors": [ - { - "output": "{{ user `build_directory` }}/{{user `box_basename`}}.{{.Provider}}.box", - "type": "vagrant" - } - ], - "provisioners": [ - { - "environment_vars": [ - "HOME_DIR=/home/vagrant", - "http_proxy={{user `http_proxy`}}", - "https_proxy={{user `https_proxy`}}", - "no_proxy={{user `no_proxy`}}" - ], - "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", - "expect_disconnect": true, - "scripts": [ - "{{template_dir}}/../centos/scripts/update.sh", - "{{template_dir}}/../_common/motd.sh", - "{{template_dir}}/../_common/sshd.sh", - "{{template_dir}}/../centos/scripts/networking.sh", - "{{template_dir}}/../_common/vagrant.sh", - "{{template_dir}}/../_common/virtualbox.sh", - "{{template_dir}}/../_common/vmware.sh", - "{{template_dir}}/../_common/parallels.sh", - "{{template_dir}}/../centos/scripts/cleanup.sh", - "{{template_dir}}/../_common/minimize.sh" - ], - "type": "shell" - } - ], - "variables": { - "box_basename": "scientific-7.9", - "build_directory": "../../builds", - "build_timestamp": "{{isotime \"20080506150405\"}}", - "cpus": "2", - "disk_size": "65536", - "git_revision": "__unknown_git_revision__", - "guest_additions_url": "", - "headless": "", - "http_directory": "{{template_dir}}/http", - "http_proxy": "{{env `http_proxy`}}", - "https_proxy": "{{env `https_proxy`}}", - "hyperv_generation": "1", - "hyperv_switch": "bento", - "iso_checksum": "7ac643e164c4a0da0b9f33411c68368cf908e0c34254904044957a3ca7793934", - "iso_name": "SL-7-DVD-x86_64.iso", - "ks_path": "7/ks.cfg", - "memory": "1024", - "mirror": "http://www.gtlib.gatech.edu/pub/scientific", - "mirror_directory": "7.9/x86_64/iso", - "name": "scientific-7.9", - "no_proxy": "{{env `no_proxy`}}", - "qemu_display": "none", - "template": "scientific-7-x86_64", - "version": "TIMESTAMP" - } -} diff --git a/packer_templates/_common/metadata.sh b/packer_templates/scripts/_common/metadata.sh similarity index 100% rename from packer_templates/_common/metadata.sh rename to packer_templates/scripts/_common/metadata.sh diff --git a/packer_templates/_common/minimize.sh b/packer_templates/scripts/_common/minimize.sh similarity index 83% rename from packer_templates/_common/minimize.sh rename to packer_templates/scripts/_common/minimize.sh index 4fbe43c6a..c51667583 100644 --- a/packer_templates/_common/minimize.sh +++ b/packer_templates/scripts/_common/minimize.sh @@ -6,18 +6,18 @@ esac # Whiteout root count=$(df --sync -kP / | tail -n1 | awk -F ' ' '{print $4}') -count=$(($count-1)) +count=$((count - 1)) dd if=/dev/zero of=/tmp/whitespace bs=1M count=$count || echo "dd exit code $? is suppressed"; rm /tmp/whitespace # Whiteout /boot count=$(df --sync -kP /boot | tail -n1 | awk -F ' ' '{print $4}') -count=$(($count-1)) +count=$((count - 1)) dd if=/dev/zero of=/boot/whitespace bs=1M count=$count || echo "dd exit code $? is suppressed"; rm /boot/whitespace set +e -swapuuid="`/sbin/blkid -o value -l -s UUID -t TYPE=swap`"; +swapuuid="$(/sbin/blkid -o value -l -s UUID -t TYPE=swap)"; case "$?" in 2|0) ;; *) exit 1 ;; @@ -27,7 +27,7 @@ set -e if [ "x${swapuuid}" != "x" ]; then # Whiteout the swap partition to reduce box size # Swap is disabled till reboot - swappart="`readlink -f /dev/disk/by-uuid/$swapuuid`"; + swappart="$(readlink -f /dev/disk/by-uuid/"$swapuuid")"; /sbin/swapoff "$swappart" || true; dd if=/dev/zero of="$swappart" bs=1M || echo "dd exit code $? is suppressed"; /sbin/mkswap -U "$swapuuid" "$swappart"; diff --git a/packer_templates/_common/motd.sh b/packer_templates/scripts/_common/motd.sh similarity index 100% rename from packer_templates/_common/motd.sh rename to packer_templates/scripts/_common/motd.sh diff --git a/packer_templates/_common/parallels.sh b/packer_templates/scripts/_common/parallels.sh similarity index 63% rename from packer_templates/_common/parallels.sh rename to packer_templates/scripts/_common/parallels.sh index 739738455..5ee69146f 100644 --- a/packer_templates/_common/parallels.sh +++ b/packer_templates/scripts/_common/parallels.sh @@ -5,17 +5,13 @@ HOME_DIR="${HOME_DIR:-/home/vagrant}"; case "$PACKER_BUILDER_TYPE" in parallels-iso|parallels-pvm) - # determine the major EL version we're runninng - major_version="`sed 's/^.\+ release \([.0-9]\+\).*/\1/' /etc/redhat-release | awk -F. '{print $1}'`"; - - # make sure we use dnf on EL 8+ mkdir -p /tmp/parallels; - if [ `uname -m` = "aarch64" ] ; then - mount -o loop $HOME_DIR/prl-tools-lin-arm.iso /tmp/parallels; + if [ "$(uname -m)" = "aarch64" ] ; then + mount -o loop "$HOME_DIR"/prl-tools-lin-arm.iso /tmp/parallels; else - mount -o loop $HOME_DIR/prl-tools-lin.iso /tmp/parallels; + mount -o loop "$HOME_DIR"/prl-tools-lin.iso /tmp/parallels; fi - VER="`cat /tmp/parallels/version`"; + VER="$(cat /tmp/parallels/version)"; echo "Parallels Tools Version: $VER"; @@ -27,7 +23,7 @@ parallels-iso|parallels-pvm) exit $code); umount /tmp/parallels; rm -rf /tmp/parallels; - rm -f $HOME_DIR/*.iso; + rm -f "$HOME_DIR"/*.iso; # Parallels Tools for Linux includes native auto-mount script, # which causes losing some of Vagrant-relative shared folders. @@ -35,10 +31,8 @@ parallels-iso|parallels-pvm) # https://github.com/Parallels/vagrant-parallels/issues/325#issuecomment-418727113 auto_mount_script='/usr/bin/prlfsmountd' if [ -f "${auto_mount_script}" ]; then - echo -e '#!/bin/sh\n'\ - '# Shared folders auto-mount is disabled by Vagrant ' \ - > "${auto_mount_script}" + printf '#!/bin/sh\n # Shared folders auto-mount is disabled by Vagrant' > "${auto_mount_script}" fi - + ;; esac diff --git a/packer_templates/_common/sshd.sh b/packer_templates/scripts/_common/sshd.sh similarity index 95% rename from packer_templates/_common/sshd.sh rename to packer_templates/scripts/_common/sshd.sh index 1bb16f56e..835193f29 100644 --- a/packer_templates/_common/sshd.sh +++ b/packer_templates/scripts/_common/sshd.sh @@ -3,6 +3,7 @@ SSHD_CONFIG="/etc/ssh/sshd_config" # ensure that there is a trailing newline before attempting to concatenate +# shellcheck disable=SC1003 sed -i -e '$a\' "$SSHD_CONFIG" USEDNS="UseDNS no" diff --git a/packer_templates/_common/vagrant.sh b/packer_templates/scripts/_common/vagrant.sh similarity index 57% rename from packer_templates/_common/vagrant.sh rename to packer_templates/scripts/_common/vagrant.sh index 9ca783485..9dfbc090e 100644 --- a/packer_templates/_common/vagrant.sh +++ b/packer_templates/scripts/_common/vagrant.sh @@ -4,16 +4,16 @@ HOME_DIR="${HOME_DIR:-/home/vagrant}"; pubkey_url="https://raw.githubusercontent.com/hashicorp/vagrant/main/keys/vagrant.pub"; -mkdir -p $HOME_DIR/.ssh; +mkdir -p "$HOME_DIR"/.ssh; if command -v wget >/dev/null 2>&1; then - wget --no-check-certificate "$pubkey_url" -O $HOME_DIR/.ssh/authorized_keys; + wget --no-check-certificate "$pubkey_url" -O "$HOME_DIR"/.ssh/authorized_keys; elif command -v curl >/dev/null 2>&1; then - curl --insecure --location "$pubkey_url" > $HOME_DIR/.ssh/authorized_keys; + curl --insecure --location "$pubkey_url" > "$HOME_DIR"/.ssh/authorized_keys; elif command -v fetch >/dev/null 2>&1; then - fetch -am -o $HOME_DIR/.ssh/authorized_keys "$pubkey_url"; + fetch -am -o "$HOME_DIR"/.ssh/authorized_keys "$pubkey_url"; else echo "Cannot download vagrant public key"; exit 1; fi -chown -R vagrant $HOME_DIR/.ssh; -chmod -R go-rwsx $HOME_DIR/.ssh; +chown -R vagrant "$HOME_DIR"/.ssh; +chmod -R go-rwsx "$HOME_DIR"/.ssh; diff --git a/packer_templates/_common/virtualbox.sh b/packer_templates/scripts/_common/virtualbox.sh similarity index 92% rename from packer_templates/_common/virtualbox.sh rename to packer_templates/scripts/_common/virtualbox.sh index c0e1a3d0a..f6e66b7f1 100644 --- a/packer_templates/_common/virtualbox.sh +++ b/packer_templates/scripts/_common/virtualbox.sh @@ -5,12 +5,12 @@ HOME_DIR="${HOME_DIR:-/home/vagrant}"; case "$PACKER_BUILDER_TYPE" in virtualbox-iso|virtualbox-ovf) - VER="`cat $HOME_DIR/.vbox_version`"; + VER="$(cat "$HOME_DIR"/.vbox_version)"; ISO="VBoxGuestAdditions_$VER.iso"; # mount the ISO to /tmp/vbox mkdir -p /tmp/vbox; - mount -o loop $HOME_DIR/$ISO /tmp/vbox; + mount -o loop "$HOME_DIR"/"$ISO" /tmp/vbox; echo "installing deps necessary to compile kernel modules" # We install things like kernel-headers here vs. kickstart files so we make sure we install them for the updated kernel not the stock kernel @@ -19,7 +19,7 @@ virtualbox-iso|virtualbox-ovf) elif [ -f "/bin/yum" ] || [ -f "/usr/bin/yum" ]; then yum install -y --skip-broken perl cpp gcc make bzip2 tar kernel-headers kernel-devel kernel-uek-devel || true # not all these packages are on every system elif [ -f "/usr/bin/apt-get" ]; then - apt-get install -y build-essential dkms bzip2 tar linux-headers-`uname -r` + apt-get install -y build-essential dkms bzip2 tar linux-headers-"$(uname -r)" elif [ -f "/usr/bin/zypper" ]; then zypper install -y perl cpp gcc make bzip2 tar kernel-default-devel fi @@ -36,7 +36,7 @@ virtualbox-iso|virtualbox-ovf) echo "unmounting and removing the vbox ISO" umount /tmp/vbox; rm -rf /tmp/vbox; - rm -f $HOME_DIR/*.iso; + rm -f "$HOME_DIR"/*.iso; echo "removing kernel dev packages and compilers we no longer need" if [ -f "/bin/dnf" ]; then @@ -44,7 +44,7 @@ virtualbox-iso|virtualbox-ovf) elif [ -f "/bin/yum" ] || [ -f "/usr/bin/yum" ]; then yum remove -y gcc cpp kernel-headers kernel-devel kernel-uek-devel elif [ -f "/usr/bin/apt-get" ]; then - apt-get remove -y build-essential gcc g++ make libc6-dev dkms linux-headers-`uname -r` + apt-get remove -y build-essential gcc g++ make libc6-dev dkms linux-headers-"$(uname -r)" elif [ -f "/usr/bin/zypper" ]; then zypper -n rm -u kernel-default-devel gcc make fi diff --git a/packer_templates/ubuntu/scripts/vmware.sh b/packer_templates/scripts/_common/vmware_debian_ubuntu.sh similarity index 100% rename from packer_templates/ubuntu/scripts/vmware.sh rename to packer_templates/scripts/_common/vmware_debian_ubuntu.sh diff --git a/packer_templates/fedora/scripts/vmware.sh b/packer_templates/scripts/_common/vmware_fedora.sh similarity index 100% rename from packer_templates/fedora/scripts/vmware.sh rename to packer_templates/scripts/_common/vmware_fedora.sh diff --git a/packer_templates/_common/vmware.sh b/packer_templates/scripts/_common/vmware_rhel.sh similarity index 79% rename from packer_templates/_common/vmware.sh rename to packer_templates/scripts/_common/vmware_rhel.sh index 72d9f2ec6..75b2a4961 100644 --- a/packer_templates/_common/vmware.sh +++ b/packer_templates/scripts/_common/vmware_rhel.sh @@ -9,7 +9,7 @@ vmware-iso|vmware-vmx) #!/bin/sh -eux # determine the major EL version we're runninng - major_version="`sed 's/^.\+ release \([.0-9]\+\).*/\1/' /etc/redhat-release | awk -F. '{print $1}'`"; + major_version="$(sed 's/^.\+ release \([.0-9]\+\).*/\1/' /etc/redhat-release | awk -F. '{print $1}')"; # make sure we use dnf on EL 8+ if [ "$major_version" -ge 8 ]; then diff --git a/packer_templates/opensuse/scripts/vmware.sh b/packer_templates/scripts/_common/vmware_suse.sh similarity index 100% rename from packer_templates/opensuse/scripts/vmware.sh rename to packer_templates/scripts/_common/vmware_suse.sh diff --git a/packer_templates/debian/scripts/cleanup.sh b/packer_templates/scripts/debian/cleanup_debian.sh similarity index 97% rename from packer_templates/debian/scripts/cleanup.sh rename to packer_templates/scripts/debian/cleanup_debian.sh index 5b589a6d3..85ec8ee71 100644 --- a/packer_templates/debian/scripts/cleanup.sh +++ b/packer_templates/scripts/debian/cleanup_debian.sh @@ -10,7 +10,7 @@ echo "remove specific Linux kernels, such as linux-image-4.9.0-13-amd64 but keep dpkg --list \ | awk '{ print $2 }' \ | grep 'linux-image-[234].*' \ - | grep -v `uname -r` \ + | grep -v "$(uname -r)" \ | xargs apt-get -y purge; echo "remove linux-source package" @@ -58,4 +58,4 @@ rm -f /var/lib/systemd/random-seed echo "clear the history so our install isn't there" rm -f /root/.wget-hsts -export HISTSIZE=0 \ No newline at end of file +export HISTSIZE=0 diff --git a/packer_templates/scripts/debian/hyperv_debian.sh b/packer_templates/scripts/debian/hyperv_debian.sh new file mode 100755 index 000000000..1c3dc6169 --- /dev/null +++ b/packer_templates/scripts/debian/hyperv_debian.sh @@ -0,0 +1,7 @@ +#!/bin/sh -eux + +case "$PACKER_BUILDER_TYPE" in +hyperv-iso) + echo "installing packaging for hyper-v" + apt-get -y install linux-image-virtual linux-tools-virtual linux-cloud-tools-virtual; +esac diff --git a/packer_templates/debian/scripts/networking.sh b/packer_templates/scripts/debian/networking_debian.sh similarity index 100% rename from packer_templates/debian/scripts/networking.sh rename to packer_templates/scripts/debian/networking_debian.sh diff --git a/packer_templates/debian/scripts/sudoers.sh b/packer_templates/scripts/debian/sudoers_debian.sh similarity index 100% rename from packer_templates/debian/scripts/sudoers.sh rename to packer_templates/scripts/debian/sudoers_debian.sh diff --git a/packer_templates/debian/scripts/systemd.sh b/packer_templates/scripts/debian/systemd_debian.sh similarity index 100% rename from packer_templates/debian/scripts/systemd.sh rename to packer_templates/scripts/debian/systemd_debian.sh diff --git a/packer_templates/debian/scripts/update.sh b/packer_templates/scripts/debian/update_debian.sh similarity index 67% rename from packer_templates/debian/scripts/update.sh rename to packer_templates/scripts/debian/update_debian.sh index 2053de6a5..ee07e8ea9 100644 --- a/packer_templates/debian/scripts/update.sh +++ b/packer_templates/scripts/debian/update_debian.sh @@ -1,8 +1,6 @@ #!/bin/sh -eux -arch="`uname -r | sed 's/^.*[0-9]\{1,\}\.[0-9]\{1,\}\.[0-9]\{1,\}\(-[0-9]\{1,2\}\)-//'`" -debian_version="`lsb_release -r | awk '{print $2}'`"; -major_version="`echo $debian_version | awk -F. '{print $1}'`"; +arch="$(uname -r | sed 's/^.*[0-9]\{1,\}\.[0-9]\{1,\}\.[0-9]\{1,\}\(-[0-9]\{1,2\}\)-//')" # Disable systemd apt timers/services systemctl stop apt-daily.timer; @@ -24,5 +22,5 @@ EOF apt-get update; -apt-get -y upgrade linux-image-$arch; -apt-get -y install linux-headers-`uname -r`; +apt-get -y upgrade linux-image-"$arch"; +apt-get -y install linux-headers-"$(uname -r)"; diff --git a/packer_templates/fedora/scripts/build-tools.sh b/packer_templates/scripts/fedora/build-tools_fedora.sh similarity index 51% rename from packer_templates/fedora/scripts/build-tools.sh rename to packer_templates/scripts/fedora/build-tools_fedora.sh index 8e2c52eb7..e00cd1e4e 100644 --- a/packer_templates/fedora/scripts/build-tools.sh +++ b/packer_templates/scripts/fedora/build-tools_fedora.sh @@ -1,3 +1,3 @@ #!/bin/bash -eux # Installing build tools here because Fedora 22+ will not do so during kickstart -dnf -y install kernel-headers kernel-devel-$(uname -r) elfutils-libelf-devel gcc make perl +dnf -y install kernel-headers kernel-devel-"$(uname -r)" elfutils-libelf-devel gcc make perl diff --git a/packer_templates/fedora/scripts/cleanup.sh b/packer_templates/scripts/fedora/cleanup_dnf.sh similarity index 94% rename from packer_templates/fedora/scripts/cleanup.sh rename to packer_templates/scripts/fedora/cleanup_dnf.sh index 50c912394..12ba745e7 100644 --- a/packer_templates/fedora/scripts/cleanup.sh +++ b/packer_templates/scripts/fedora/cleanup_dnf.sh @@ -11,7 +11,7 @@ echo "remove orphaned packages" dnf -y autoremove echo "Remove previous kernels that preserved for rollbacks" -dnf -y remove -y $(dnf repoquery --installonly --latest-limit=-1 -q) +dnf -y remove "$(dnf repoquery --installonly --latest-limit=-1 -q)" # Avoid ~200 meg firmware package we don't need # this cannot be done in the KS file so we do it here @@ -41,4 +41,4 @@ truncate -s 0 /etc/machine-id echo "Clear the history so our install commands aren't there" rm -f /root/.wget-hsts -export HISTSIZE=0 \ No newline at end of file +export HISTSIZE=0 diff --git a/packer_templates/fedora/scripts/install-supporting-packages.sh b/packer_templates/scripts/fedora/install-supporting-packages_fedora.sh similarity index 100% rename from packer_templates/fedora/scripts/install-supporting-packages.sh rename to packer_templates/scripts/fedora/install-supporting-packages_fedora.sh diff --git a/packer_templates/fedora/scripts/fix-slow-dns.sh b/packer_templates/scripts/fedora/networking_fedora.sh similarity index 100% rename from packer_templates/fedora/scripts/fix-slow-dns.sh rename to packer_templates/scripts/fedora/networking_fedora.sh diff --git a/packer_templates/fedora/scripts/real-tmp.sh b/packer_templates/scripts/fedora/real-tmp_fedora.sh similarity index 86% rename from packer_templates/fedora/scripts/real-tmp.sh rename to packer_templates/scripts/fedora/real-tmp_fedora.sh index 6f781bfd6..09613d903 100644 --- a/packer_templates/fedora/scripts/real-tmp.sh +++ b/packer_templates/scripts/fedora/real-tmp_fedora.sh @@ -1,4 +1,3 @@ #!/bin/bash -eux echo "Don't use the tmpfs based /tmp dir that is limited to 50% of RAM" systemctl mask tmp.mount -umount /tmp | true \ No newline at end of file diff --git a/packer_templates/scripts/fedora/update_dnf.sh b/packer_templates/scripts/fedora/update_dnf.sh new file mode 100644 index 000000000..856c12b35 --- /dev/null +++ b/packer_templates/scripts/fedora/update_dnf.sh @@ -0,0 +1,7 @@ +#!/bin/sh -eux + +# update all packages +dnf -y upgrade + +reboot; +sleep 60; diff --git a/packer_templates/freebsd/scripts/cleanup.sh b/packer_templates/scripts/freebsd/cleanup_freebsd.sh similarity index 100% rename from packer_templates/freebsd/scripts/cleanup.sh rename to packer_templates/scripts/freebsd/cleanup_freebsd.sh diff --git a/packer_templates/freebsd/scripts/minimize.sh b/packer_templates/scripts/freebsd/minimize_freebsd.sh similarity index 100% rename from packer_templates/freebsd/scripts/minimize.sh rename to packer_templates/scripts/freebsd/minimize_freebsd.sh diff --git a/packer_templates/freebsd/scripts/postinstall.sh b/packer_templates/scripts/freebsd/postinstall_freebsd.sh similarity index 96% rename from packer_templates/freebsd/scripts/postinstall.sh rename to packer_templates/scripts/freebsd/postinstall_freebsd.sh index bdcd62deb..a0e25130b 100644 --- a/packer_templates/freebsd/scripts/postinstall.sh +++ b/packer_templates/scripts/freebsd/postinstall_freebsd.sh @@ -1,7 +1,7 @@ #!/bin/sh -eux # Set the time correctly -ntpdate -v -b 0.freebsd.pool.ntp.org +#ntpdate -v -b 0.pool.ntp.org # Install curl and ca_root_nss pkg install -y curl ca_root_nss dmidecode; diff --git a/packer_templates/freebsd/scripts/sudoers.sh b/packer_templates/scripts/freebsd/sudoers_freebsd.sh similarity index 100% rename from packer_templates/freebsd/scripts/sudoers.sh rename to packer_templates/scripts/freebsd/sudoers_freebsd.sh diff --git a/packer_templates/freebsd/scripts/update.sh b/packer_templates/scripts/freebsd/update_freebsd.sh similarity index 60% rename from packer_templates/freebsd/scripts/update.sh rename to packer_templates/scripts/freebsd/update_freebsd.sh index fad1e85e1..5ab088054 100644 --- a/packer_templates/freebsd/scripts/update.sh +++ b/packer_templates/scripts/freebsd/update_freebsd.sh @@ -1,17 +1,13 @@ #!/bin/sh -eux -# Unset these as if they're empty it'll break freebsd-update -[ -z "$no_proxy" ] && unset no_proxy -[ -z "$http_proxy" ] && unset http_proxy -[ -z "$https_proxy" ] && unset https_proxy - freebsd_update="/usr/sbin/freebsd-update --not-running-from-cron"; # Update FreeBSD # NOTE: the install action fails if there are no updates so || true it -env PAGER=/bin/cat $freebsd_update fetch || true; -env PAGER=/bin/cat $freebsd_update install || true; +env PAGER=/bin/cat "$freebsd_update" fetch || true; +env PAGER=/bin/cat "$freebsd_update" install || true; +# shellcheck disable=SC2154 if [ "$pkg_branch" != "quarterly" ]; then sed -i.bak -e "s,pkg+http://pkg.FreeBSD.org/\${ABI}/quarterly,pkg+http://pkg.FreeBSD.org/\${ABI}/${pkg_branch}," /etc/pkg/FreeBSD.conf rm -f /etc/pkg/FreeBSD.conf.bak diff --git a/packer_templates/freebsd/scripts/vmtools.sh b/packer_templates/scripts/freebsd/vmtools_freebsd.sh similarity index 96% rename from packer_templates/freebsd/scripts/vmtools.sh rename to packer_templates/scripts/freebsd/vmtools_freebsd.sh index 997f9c28b..dfaadf577 100644 --- a/packer_templates/freebsd/scripts/vmtools.sh +++ b/packer_templates/scripts/freebsd/vmtools_freebsd.sh @@ -1,7 +1,5 @@ #!/bin/sh -eux -freebsd_major="`uname -r | awk -F. '{print $1}'`"; - case "$PACKER_BUILDER_TYPE" in virtualbox-iso|virtualbox-ovf) diff --git a/packer_templates/almalinux/scripts/cleanup.sh b/packer_templates/scripts/rhel/cleanup_dnf.sh similarity index 76% rename from packer_templates/almalinux/scripts/cleanup.sh rename to packer_templates/scripts/rhel/cleanup_dnf.sh index 7d29e4588..90173e61a 100644 --- a/packer_templates/almalinux/scripts/cleanup.sh +++ b/packer_templates/scripts/rhel/cleanup_dnf.sh @@ -11,12 +11,16 @@ echo "remove orphaned packages" dnf -y autoremove echo "Remove previous kernels that preserved for rollbacks" -dnf -y remove -y $(dnf repoquery --installonly --latest-limit=-1 -q) +dnf -y remove "$(dnf repoquery --installonly --latest-limit=-1 -q)" # Avoid ~200 meg firmware package we don't need # this cannot be done in the KS file so we do it here -echo "Removing extra firmware packages" -dnf -y remove linux-firmware +# Skip Oracle linux because it causes errors by removing kernel-uek-core +distro="$(rpm -qf --queryformat '%{NAME}' /etc/redhat-release | cut -f 1 -d '-')" +if [ "$distro" != 'oraclelinux' ]; then + echo "Removing extra firmware packages" + dnf -y remove linux-firmware +fi echo "clean all package cache information" dnf -y clean all --enablerepo=\* @@ -27,8 +31,8 @@ mkdir -p /etc/udev/rules.d/70-persistent-net.rules; rm -f /lib/udev/rules.d/75-persistent-net-generator.rules; rm -rf /dev/.udev/; -for ndev in `ls -1 /etc/sysconfig/network-scripts/ifcfg-*`; do - if [ "`basename $ndev`" != "ifcfg-lo" ]; then +for ndev in /etc/sysconfig/network-scripts/ifcfg-*; do + if [ "$(basename "$ndev")" != "ifcfg-lo" ]; then sed -i '/^HWADDR/d' "$ndev"; sed -i '/^UUID/d' "$ndev"; fi @@ -51,4 +55,4 @@ truncate -s 0 /etc/machine-id echo "Clear the history so our install commands aren't there" rm -f /root/.wget-hsts -export HISTSIZE=0 \ No newline at end of file +export HISTSIZE=0 diff --git a/packer_templates/rockylinux/scripts/cleanup.sh b/packer_templates/scripts/rhel/cleanup_yum.sh similarity index 78% rename from packer_templates/rockylinux/scripts/cleanup.sh rename to packer_templates/scripts/rhel/cleanup_yum.sh index 7d29e4588..cd01f33e5 100644 --- a/packer_templates/rockylinux/scripts/cleanup.sh +++ b/packer_templates/scripts/rhel/cleanup_yum.sh @@ -5,21 +5,25 @@ sed -i -e 's/^GRUB_TIMEOUT=[0-9]\+$/GRUB_TIMEOUT=1/' /etc/default/grub grub2-mkconfig -o /boot/grub2/grub.cfg echo "Remove development and kernel source packages" -dnf -y remove gcc cpp gc kernel-devel kernel-headers glibc-devel elfutils-libelf-devel glibc-headers kernel-devel kernel-headers +yum -y remove gcc cpp gc kernel-devel kernel-headers glibc-devel elfutils-libelf-devel glibc-headers kernel-devel kernel-headers echo "remove orphaned packages" -dnf -y autoremove +yum -y autoremove echo "Remove previous kernels that preserved for rollbacks" -dnf -y remove -y $(dnf repoquery --installonly --latest-limit=-1 -q) +if ! command -v package-cleanup >/dev/null 2>&1; then + yum -y install yum-utils +fi + +package-cleanup --oldkernels --count=1 -y # Avoid ~200 meg firmware package we don't need # this cannot be done in the KS file so we do it here echo "Removing extra firmware packages" -dnf -y remove linux-firmware +yum -y remove linux-firmware echo "clean all package cache information" -dnf -y clean all --enablerepo=\* +yum -y clean all --enablerepo=\*; # Clean up network interface persistence rm -f /etc/udev/rules.d/70-persistent-net.rules; @@ -27,8 +31,8 @@ mkdir -p /etc/udev/rules.d/70-persistent-net.rules; rm -f /lib/udev/rules.d/75-persistent-net-generator.rules; rm -rf /dev/.udev/; -for ndev in `ls -1 /etc/sysconfig/network-scripts/ifcfg-*`; do - if [ "`basename $ndev`" != "ifcfg-lo" ]; then +for ndev in /etc/sysconfig/network-scripts/ifcfg-*; do + if [ "$(basename "$ndev")" != "ifcfg-lo" ]; then sed -i '/^HWADDR/d' "$ndev"; sed -i '/^UUID/d' "$ndev"; fi @@ -51,4 +55,4 @@ truncate -s 0 /etc/machine-id echo "Clear the history so our install commands aren't there" rm -f /root/.wget-hsts -export HISTSIZE=0 \ No newline at end of file +export HISTSIZE=0 diff --git a/packer_templates/amazonlinux/scripts/networking.sh b/packer_templates/scripts/rhel/networking_rhel7.sh similarity index 100% rename from packer_templates/amazonlinux/scripts/networking.sh rename to packer_templates/scripts/rhel/networking_rhel7.sh diff --git a/packer_templates/scripts/rhel/update_dnf.sh b/packer_templates/scripts/rhel/update_dnf.sh new file mode 100644 index 000000000..856c12b35 --- /dev/null +++ b/packer_templates/scripts/rhel/update_dnf.sh @@ -0,0 +1,7 @@ +#!/bin/sh -eux + +# update all packages +dnf -y upgrade + +reboot; +sleep 60; diff --git a/packer_templates/amazonlinux/scripts/update.sh b/packer_templates/scripts/rhel/update_yum.sh similarity index 68% rename from packer_templates/amazonlinux/scripts/update.sh rename to packer_templates/scripts/rhel/update_yum.sh index 131d8cdb9..32e26334f 100644 --- a/packer_templates/amazonlinux/scripts/update.sh +++ b/packer_templates/scripts/rhel/update_yum.sh @@ -1,5 +1,5 @@ #!/bin/sh -eux -yum -y update; +yum -y upgrade; reboot; sleep 60; diff --git a/packer_templates/solaris/scripts/minimize.sh b/packer_templates/scripts/solaris/minimize_solaris.sh similarity index 100% rename from packer_templates/solaris/scripts/minimize.sh rename to packer_templates/scripts/solaris/minimize_solaris.sh diff --git a/packer_templates/solaris/scripts/update.sh b/packer_templates/scripts/solaris/update_solaris.sh similarity index 100% rename from packer_templates/solaris/scripts/update.sh rename to packer_templates/scripts/solaris/update_solaris.sh diff --git a/packer_templates/scripts/solaris/vmtools_solaris.sh b/packer_templates/scripts/solaris/vmtools_solaris.sh new file mode 100644 index 000000000..73953413f --- /dev/null +++ b/packer_templates/scripts/solaris/vmtools_solaris.sh @@ -0,0 +1,24 @@ +#!/bin/bash -eux + +# Add pkgadd auto-answer file +sudo mkdir -p /tmp +sudo chmod 777 /tmp +{ + echo "mail=" + echo "instance=overwrite" + echo "partial=nocheck" + echo "runlevel=nocheck" + echo "idepend=nocheck" + echo "rdepend=nocheck" + echo "space=nocheck" + echo "setuid=nocheck" + echo "conflict=nocheck" + echo "action=nocheck" + echo "basedir=default" +} > /tmp/nocheck + +if [ -f /home/vagrant/.vbox_version ]; then + mkdir /tmp/vbox + ls + echo "all" | sudo -i pkgadd -a /tmp/nocheck -d /media/VBOXADDITIONS_*/VBoxSolarisAdditions.pkg +fi diff --git a/packer_templates/opensuse/scripts/cleanup.sh b/packer_templates/scripts/suse/cleanup_suse.sh similarity index 76% rename from packer_templates/opensuse/scripts/cleanup.sh rename to packer_templates/scripts/suse/cleanup_suse.sh index c16f9b55d..35679faca 100644 --- a/packer_templates/opensuse/scripts/cleanup.sh +++ b/packer_templates/scripts/suse/cleanup_suse.sh @@ -1,7 +1,7 @@ #!/bin/bash -eux echo "remove some bogus packages we don't need" -zypper -n rm -u wallpaper-branding release-notes sound-theme-freedesktop || true # don't fail if zypper fails (because it does sometimes) +zypper -n rm -u --clean-deps gcc kernel-default-devel wallpaper-branding release-notes sound-theme-freedesktop || true # don't fail if zypper fails (because it does sometimes) echo "cleanup all the downloaded RPMs" zypper clean --all @@ -21,8 +21,8 @@ echo "blank netplan machine-id (DUID) so machines get unique ID generated on boo truncate -s 0 /etc/machine-id echo "force a new random seed to be generated" -rm -f /var/lib/systemd/random-seed +rm -f /var/lib/systemd/random-seed echo "clear the history so our install isn't there" rm -f /root/.wget-hsts -export HISTSIZE=0 \ No newline at end of file +export HISTSIZE=0 diff --git a/packer_templates/scripts/suse/remove-dvd-source_suse.sh b/packer_templates/scripts/suse/remove-dvd-source_suse.sh new file mode 100644 index 000000000..925a4519f --- /dev/null +++ b/packer_templates/scripts/suse/remove-dvd-source_suse.sh @@ -0,0 +1,4 @@ +#!/bin/sh -eux + +zypper removerepo "$(zypper repos | grep 'SLES' | awk '{ print $3 }' | grep "^SLES")"; +exit 0 diff --git a/packer_templates/scripts/suse/repositories_suse.sh b/packer_templates/scripts/suse/repositories_suse.sh new file mode 100644 index 000000000..1e03ba332 --- /dev/null +++ b/packer_templates/scripts/suse/repositories_suse.sh @@ -0,0 +1,12 @@ +#!/bin/sh -eux + +version=$(grep VERSION= /etc/os-release | cut -f2 -d\" | cut -f1 -d\ ) + +zypper removerepo "openSUSE-${version}-0" + +zypper ar http://download.opensuse.org/distribution/leap/"${version}"/repo/oss/ openSUSE-Leap-"${version}"-Oss +zypper ar http://download.opensuse.org/distribution/leap/"${version}"/repo/non-oss/ openSUSE-Leap-"${version}"-Non-Oss +zypper ar http://download.opensuse.org/update/leap/"${version}"/oss/ openSUSE-Leap-"${version}"-Update +zypper ar http://download.opensuse.org/update/leap/"${version}"/non-oss/ openSUSE-Leap-"${version}"-Update-Non-Oss + +zypper refresh diff --git a/packer_templates/scripts/suse/sudoers_suse.sh b/packer_templates/scripts/suse/sudoers_suse.sh new file mode 100644 index 000000000..22e66fd67 --- /dev/null +++ b/packer_templates/scripts/suse/sudoers_suse.sh @@ -0,0 +1,5 @@ +#!/bin/sh -eux + +# update sudoers - can't do this in autoinst.xml +printf "\nupdate sudoers ..." +printf "vagrant ALL=(ALL) NOPASSWD: ALL\n" >> /etc/sudoers diff --git a/packer_templates/sles/scripts/unsupported-modules.sh b/packer_templates/scripts/suse/unsupported-modules_suse.sh similarity index 100% rename from packer_templates/sles/scripts/unsupported-modules.sh rename to packer_templates/scripts/suse/unsupported-modules_suse.sh diff --git a/packer_templates/opensuse/scripts/update.sh b/packer_templates/scripts/suse/update_suse.sh similarity index 100% rename from packer_templates/opensuse/scripts/update.sh rename to packer_templates/scripts/suse/update_suse.sh diff --git a/packer_templates/opensuse/scripts/vagrant_group.sh b/packer_templates/scripts/suse/vagrant_group_suse.sh similarity index 100% rename from packer_templates/opensuse/scripts/vagrant_group.sh rename to packer_templates/scripts/suse/vagrant_group_suse.sh diff --git a/packer_templates/opensuse/scripts/zypper-locks.sh b/packer_templates/scripts/suse/zypper-locks_suse.sh similarity index 100% rename from packer_templates/opensuse/scripts/zypper-locks.sh rename to packer_templates/scripts/suse/zypper-locks_suse.sh diff --git a/packer_templates/ubuntu/scripts/cleanup.sh b/packer_templates/scripts/ubuntu/cleanup_ubuntu.sh similarity index 97% rename from packer_templates/ubuntu/scripts/cleanup.sh rename to packer_templates/scripts/ubuntu/cleanup_ubuntu.sh index e8bb47bdc..9388a779f 100644 --- a/packer_templates/ubuntu/scripts/cleanup.sh +++ b/packer_templates/scripts/ubuntu/cleanup_ubuntu.sh @@ -10,14 +10,14 @@ echo "remove specific Linux kernels, such as linux-image-3.11.0-15-generic but k dpkg --list \ | awk '{ print $2 }' \ | grep 'linux-image-.*-generic' \ - | grep -v `uname -r` \ + | grep -v "$(uname -r)" \ | xargs apt-get -y purge; echo "remove old kernel modules packages" dpkg --list \ | awk '{ print $2 }' \ | grep 'linux-modules-.*-generic' \ - | grep -v `uname -r` \ + | grep -v "$(uname -r)" \ | xargs apt-get -y purge; echo "remove linux-source package" diff --git a/packer_templates/scripts/ubuntu/hyperv_ubuntu.sh b/packer_templates/scripts/ubuntu/hyperv_ubuntu.sh new file mode 100755 index 000000000..1c3dc6169 --- /dev/null +++ b/packer_templates/scripts/ubuntu/hyperv_ubuntu.sh @@ -0,0 +1,7 @@ +#!/bin/sh -eux + +case "$PACKER_BUILDER_TYPE" in +hyperv-iso) + echo "installing packaging for hyper-v" + apt-get -y install linux-image-virtual linux-tools-virtual linux-cloud-tools-virtual; +esac diff --git a/packer_templates/ubuntu/scripts/networking.sh b/packer_templates/scripts/ubuntu/networking_ubuntu.sh similarity index 83% rename from packer_templates/ubuntu/scripts/networking.sh rename to packer_templates/scripts/ubuntu/networking_ubuntu.sh index f852d67d3..26aed005b 100644 --- a/packer_templates/ubuntu/scripts/networking.sh +++ b/packer_templates/scripts/ubuntu/networking_ubuntu.sh @@ -1,7 +1,7 @@ #!/bin/sh -eux -ubuntu_version="`lsb_release -r | awk '{print $2}'`"; -major_version="`echo $ubuntu_version | awk -F. '{print $1}'`"; +ubuntu_version="$(lsb_release -r | awk '{print $2}')"; +major_version="$(echo "$ubuntu_version" | awk -F. '{print $1}')"; if [ "$major_version" -ge "18" ]; then echo "Create netplan config for eth0" diff --git a/packer_templates/ubuntu/scripts/sudoers.sh b/packer_templates/scripts/ubuntu/sudoers_ubuntu.sh similarity index 100% rename from packer_templates/ubuntu/scripts/sudoers.sh rename to packer_templates/scripts/ubuntu/sudoers_ubuntu.sh diff --git a/packer_templates/scripts/ubuntu/systemd_ubuntu.sh b/packer_templates/scripts/ubuntu/systemd_ubuntu.sh new file mode 100644 index 000000000..2d1b5a71e --- /dev/null +++ b/packer_templates/scripts/ubuntu/systemd_ubuntu.sh @@ -0,0 +1,4 @@ +#!/bin/sh -eux + +# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=751636 +apt-get install libpam-systemd diff --git a/packer_templates/ubuntu/scripts/update.sh b/packer_templates/scripts/ubuntu/update_ubuntu.sh similarity index 100% rename from packer_templates/ubuntu/scripts/update.sh rename to packer_templates/scripts/ubuntu/update_ubuntu.sh diff --git a/packer_templates/windows/scripts/base_setup.ps1 b/packer_templates/scripts/windows/base_setup.ps1 similarity index 89% rename from packer_templates/windows/scripts/base_setup.ps1 rename to packer_templates/scripts/windows/base_setup.ps1 index d66fb8d90..c448e0fec 100644 --- a/packer_templates/windows/scripts/base_setup.ps1 +++ b/packer_templates/scripts/windows/base_setup.ps1 @@ -44,6 +44,10 @@ Start-Service -Name "winrm" Get-NetFirewallRule -DisplayGroup "Windows Remote Management" | Get-NetFirewallAddressFilter | Set-NetFirewallAddressFilter -RemoteAddress Any Enable-NetFirewallRule -DisplayGroup "Windows Remote Management" +# Reset auto logon count +# https://docs.microsoft.com/en-us/windows-hardware/customize/desktop/unattend/microsoft-windows-shell-setup-autologon-logoncount#logoncount-known-issue +Set-ItemProperty -Path 'HKLM:\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon' -Name AutoLogonCount -Value 0 + # Allow time to view output before window is closed Start-Sleep -Seconds 2 diff --git a/packer_templates/windows/scripts/cleanup.ps1 b/packer_templates/scripts/windows/cleanup.ps1 similarity index 100% rename from packer_templates/windows/scripts/cleanup.ps1 rename to packer_templates/scripts/windows/cleanup.ps1 diff --git a/packer_templates/scripts/windows/disable-windows-defender.ps1 b/packer_templates/scripts/windows/disable-windows-defender.ps1 new file mode 100644 index 000000000..7a69552e9 --- /dev/null +++ b/packer_templates/scripts/windows/disable-windows-defender.ps1 @@ -0,0 +1,49 @@ +#MIT License +# +#Copyright (c) 2017 Rui Lopes +# +#Permission is hereby granted, free of charge, to any person obtaining a copy +#of this software and associated documentation files (the "Software"), to deal +#in the Software without restriction, including without limitation the rights +#to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +#copies of the Software, and to permit persons to whom the Software is +#furnished to do so, subject to the following conditions: +# +#The above copyright notice and this permission notice shall be included in all +#copies or substantial portions of the Software. +# +#THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +#IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +#FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +#AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +#LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +#OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +#SOFTWARE. + +Set-StrictMode -Version Latest +$ProgressPreference = 'SilentlyContinue' +$ErrorActionPreference = 'Stop' +trap { + Write-Host + Write-Host "ERROR: $_" + ($_.ScriptStackTrace -split '\r?\n') -replace '^(.*)$','ERROR: $1' | Write-Host + ($_.Exception.ToString() -split '\r?\n') -replace '^(.*)$','ERROR EXCEPTION: $1' | Write-Host + Write-Host + Write-Host 'Sleeping for 60m to give you time to look around the virtual machine before self-destruction...' + Start-Sleep -Seconds (60*60) + Exit 1 +} + +if (Get-Command -ErrorAction SilentlyContinue Uninstall-WindowsFeature) { + # for Windows Server. + Get-WindowsFeature 'Windows-Defender*' | Uninstall-WindowsFeature +} else { + # for Windows Client. + Set-MpPreference ` + -DisableRealtimeMonitoring $true ` + -ExclusionPath @('C:\', 'D:\') + Set-ItemProperty ` + -Path 'HKLM:/SOFTWARE/Policies/Microsoft/Windows Defender' ` + -Name DisableAntiSpyware ` + -Value 1 +} diff --git a/packer_templates/scripts/windows/disable-windows-updates.ps1 b/packer_templates/scripts/windows/disable-windows-updates.ps1 new file mode 100644 index 000000000..ec3aee739 --- /dev/null +++ b/packer_templates/scripts/windows/disable-windows-updates.ps1 @@ -0,0 +1,90 @@ +#MIT License +# +#Copyright (c) 2017 Rui Lopes +# +#Permission is hereby granted, free of charge, to any person obtaining a copy +#of this software and associated documentation files (the "Software"), to deal +#in the Software without restriction, including without limitation the rights +#to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +#copies of the Software, and to permit persons to whom the Software is +#furnished to do so, subject to the following conditions: +# +#The above copyright notice and this permission notice shall be included in all +#copies or substantial portions of the Software. +# +#THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +#IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +#FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +#AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +#LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +#OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +#SOFTWARE. + +Set-StrictMode -Version Latest +$ProgressPreference = 'SilentlyContinue' +$ErrorActionPreference = 'Stop' +trap { + Write-Host + Write-Host "ERROR: $_" + ($_.ScriptStackTrace -split '\r?\n') -replace '^(.*)$','ERROR: $1' | Write-Host + ($_.Exception.ToString() -split '\r?\n') -replace '^(.*)$','ERROR EXCEPTION: $1' | Write-Host + Write-Host + Write-Host 'Sleeping for 60m to give you time to look around the virtual machine before self-destruction...' + Start-Sleep -Seconds (60*60) + Exit 1 +} + +# disable automatic updates. +# XXX this does not seem to work anymore. +# see How to configure automatic updates by using Group Policy or registry settings +# at https://support.microsoft.com/en-us/help/328010 +function New-Directory($path) { + $p, $components = $path -split '[\\/]' + $components | ForEach-Object { + $p = "$p\$_" + if (!(Test-Path $p)) { + New-Item -ItemType Directory $p | Out-Null + } + } + $null +} +$auPath = 'HKLM:\SOFTWARE\Policies\Microsoft\Windows\WindowsUpdate\AU' +New-Directory $auPath +# set NoAutoUpdate. +# 0: Automatic Updates is enabled (default). +# 1: Automatic Updates is disabled. +New-ItemProperty ` + -Path $auPath ` + -Name NoAutoUpdate ` + -Value 1 ` + -PropertyType DWORD ` + -Force ` + | Out-Null +# set AUOptions. +# 1: Keep my computer up to date has been disabled in Automatic Updates. +# 2: Notify of download and installation. +# 3: Automatically download and notify of installation. +# 4: Automatically download and scheduled installation. +New-ItemProperty ` + -Path $auPath ` + -Name AUOptions ` + -Value 2 ` + -PropertyType DWORD ` + -Force ` + | Out-Null + +# disable Windows Update Delivery Optimization. +# NB this applies to Windows 10. +# 0: Disabled +# 1: PCs on my local network +# 3: PCs on my local network, and PCs on the Internet +$deliveryOptimizationPath = 'HKLM:\SOFTWARE\Microsoft\Windows\CurrentVersion\DeliveryOptimization\Config' +if (Test-Path $deliveryOptimizationPath) { + New-ItemProperty ` + -Path $deliveryOptimizationPath ` + -Name DODownloadMode ` + -Value 0 ` + -PropertyType DWORD ` + -Force ` + | Out-Null +} diff --git a/packer_templates/scripts/windows/eject-media.ps1 b/packer_templates/scripts/windows/eject-media.ps1 new file mode 100644 index 000000000..9bea3a073 --- /dev/null +++ b/packer_templates/scripts/windows/eject-media.ps1 @@ -0,0 +1,60 @@ +#MIT License +# +#Copyright (c) 2017 Rui Lopes +# +#Permission is hereby granted, free of charge, to any person obtaining a copy +#of this software and associated documentation files (the "Software"), to deal +#in the Software without restriction, including without limitation the rights +#to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +#copies of the Software, and to permit persons to whom the Software is +#furnished to do so, subject to the following conditions: +# +#The above copyright notice and this permission notice shall be included in all +#copies or substantial portions of the Software. +# +#THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +#IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +#FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +#AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +#LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +#OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +#SOFTWARE. + +Set-StrictMode -Version Latest +$ProgressPreference = 'SilentlyContinue' +$ErrorActionPreference = 'Stop' +trap { + Write-Host + Write-Host "ERROR: $_" + ($_.ScriptStackTrace -split '\r?\n') -replace '^(.*)$','ERROR: $1' | Write-Host + ($_.Exception.ToString() -split '\r?\n') -replace '^(.*)$','ERROR EXCEPTION: $1' | Write-Host + Write-Host + Write-Host 'Sleeping for 60m to give you time to look around the virtual machine before self-destruction...' + Start-Sleep -Seconds (60*60) + Exit 1 +} + + +# +# enable TLS 1.2. + +[Net.ServicePointManager]::SecurityProtocol = [Net.ServicePointManager]::SecurityProtocol ` + -bor [Net.SecurityProtocolType]::Tls12 + + +# +# eject removable volume media. + +Write-Host 'Downloaing EjectVolumeMedia...' +$ejectVolumeMediaExeUrl = 'https://github.com/rgl/EjectVolumeMedia/releases/download/v1.0.0/EjectVolumeMedia.exe' +$ejectVolumeMediaExeHash = 'f7863394085e1b3c5aa999808b012fba577b4a027804ea292abf7962e5467ba0' +$ejectVolumeMediaExe = "$env:TEMP\EjectVolumeMedia.exe" +Invoke-WebRequest $ejectVolumeMediaExeUrl -OutFile $ejectVolumeMediaExe +$ejectVolumeMediaExeActualHash = (Get-FileHash $ejectVolumeMediaExe -Algorithm SHA256).Hash +if ($ejectVolumeMediaExeActualHash -ne $ejectVolumeMediaExeHash) { + throw "the $ejectVolumeMediaExeUrl file hash $ejectVolumeMediaExeActualHash does not match the expected $ejectVolumeMediaExeHash" +} + +Get-Volume | Where-Object {$_.DriveType -ne 'Fixed' -and $_.DriveLetter} | ForEach-Object { + &$ejectVolumeMediaExe $_.DriveLetter +} diff --git a/packer_templates/scripts/windows/enable-remote-desktop.ps1 b/packer_templates/scripts/windows/enable-remote-desktop.ps1 new file mode 100644 index 000000000..1eed756f1 --- /dev/null +++ b/packer_templates/scripts/windows/enable-remote-desktop.ps1 @@ -0,0 +1,43 @@ +#MIT License +# +#Copyright (c) 2017 Rui Lopes +# +#Permission is hereby granted, free of charge, to any person obtaining a copy +#of this software and associated documentation files (the "Software"), to deal +#in the Software without restriction, including without limitation the rights +#to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +#copies of the Software, and to permit persons to whom the Software is +#furnished to do so, subject to the following conditions: +# +#The above copyright notice and this permission notice shall be included in all +#copies or substantial portions of the Software. +# +#THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +#IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +#FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +#AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +#LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +#OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +#SOFTWARE. + +Set-StrictMode -Version Latest +$ProgressPreference = 'SilentlyContinue' +$ErrorActionPreference = 'Stop' +trap { + Write-Host + Write-Host "ERROR: $_" + ($_.ScriptStackTrace -split '\r?\n') -replace '^(.*)$','ERROR: $1' | Write-Host + ($_.Exception.ToString() -split '\r?\n') -replace '^(.*)$','ERROR EXCEPTION: $1' | Write-Host + Write-Host + Write-Host 'Sleeping for 60m to give you time to look around the virtual machine before self-destruction...' + Start-Sleep -Seconds (60*60) + Exit 1 +} + +Write-Host 'Enabling Remote Desktop...' +Set-ItemProperty ` + -Path 'HKLM:\System\CurrentControlSet\Control\Terminal Server' ` + -Name fDenyTSConnections ` + -Value 0 +Enable-NetFirewallRule ` + -DisplayGroup 'Remote Desktop' diff --git a/packer_templates/scripts/windows/optimize.ps1 b/packer_templates/scripts/windows/optimize.ps1 new file mode 100644 index 000000000..6f2cb7e14 --- /dev/null +++ b/packer_templates/scripts/windows/optimize.ps1 @@ -0,0 +1,212 @@ +#MIT License +# +#Copyright (c) 2017 Rui Lopes +# +#Permission is hereby granted, free of charge, to any person obtaining a copy +#of this software and associated documentation files (the "Software"), to deal +#in the Software without restriction, including without limitation the rights +#to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +#copies of the Software, and to permit persons to whom the Software is +#furnished to do so, subject to the following conditions: +# +#The above copyright notice and this permission notice shall be included in all +#copies or substantial portions of the Software. +# +#THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +#IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +#FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +#AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +#LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +#OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +#SOFTWARE. + +Set-StrictMode -Version Latest +$ProgressPreference = 'SilentlyContinue' +$ErrorActionPreference = 'Stop' +trap { + Write-Host + Write-Host "ERROR: $_" + ($_.ScriptStackTrace -split '\r?\n') -replace '^(.*)$','ERROR: $1' | Write-Host + ($_.Exception.ToString() -split '\r?\n') -replace '^(.*)$','ERROR EXCEPTION: $1' | Write-Host + Write-Host + Write-Host 'Sleeping for 60m to give you time to look around the virtual machine before self-destruction...' + Start-Sleep -Seconds (60*60) + Exit 1 +} + + +# +# enable TLS 1.2. + +[Net.ServicePointManager]::SecurityProtocol = [Net.ServicePointManager]::SecurityProtocol ` + -bor [Net.SecurityProtocolType]::Tls12 + + +# +# run automatic maintenance. + +Add-Type @' +using System; +using System.Runtime.InteropServices; + +public static class Windows +{ + [DllImport("kernel32", SetLastError=true)] + public static extern UInt64 GetTickCount64(); + + public static TimeSpan GetUptime() + { + return TimeSpan.FromMilliseconds(GetTickCount64()); + } +} +'@ + +function Wait-Condition { + param( + [scriptblock]$Condition, + [int]$DebounceSeconds=15 + ) + process { + $begin = [Windows]::GetUptime() + do { + Start-Sleep -Seconds 3 + try { + $result = &$Condition + } catch { + $result = $false + } + if (-not $result) { + $begin = [Windows]::GetUptime() + continue + } + } while ((([Windows]::GetUptime()) - $begin).TotalSeconds -lt $DebounceSeconds) + } +} + +function Get-ScheduledTasks() { + $s = New-Object -ComObject 'Schedule.Service' + try { + $s.Connect() + Get-ScheduledTasksInternal $s.GetFolder('\') + } finally { + [System.Runtime.Interopservices.Marshal]::ReleaseComObject($s) | Out-Null + } +} + +function Get-ScheduledTasksInternal($Folder) { + $Folder.GetTasks(0) + $Folder.GetFolders(0) | ForEach-Object { + Get-ScheduledTasksInternal $_ + } +} + +function Test-IsMaintenanceTask([xml]$definition) { + # see MaintenanceSettings (maintenanceSettingsType) Element at https://msdn.microsoft.com/en-us/library/windows/desktop/hh832151(v=vs.85).aspx + $ns = New-Object System.Xml.XmlNamespaceManager($definition.NameTable) + $ns.AddNamespace('t', $definition.DocumentElement.NamespaceURI) + $null -ne $definition.SelectSingleNode("/t:Task/t:Settings/t:MaintenanceSettings", $ns) +} + +Write-Host 'Running Automatic Maintenance...' +MSchedExe.exe Start +Wait-Condition {@(Get-ScheduledTasks | Where-Object {($_.State -ge 4) -and (Test-IsMaintenanceTask $_.XML)}).Count -eq 0} -DebounceSeconds 60 + + +# +# generate the .net frameworks native images. +# NB this is normally done in the Automatic Maintenance step, but for +# some reason, sometimes its not. +# see https://docs.microsoft.com/en-us/dotnet/framework/tools/ngen-exe-native-image-generator + +Get-ChildItem "$env:windir\Microsoft.NET\*\*\ngen.exe" | ForEach-Object { + Write-Host "Generating the .NET Framework native images with $_..." + &$_ executeQueuedItems /nologo /silent +} + + +# +# remove temporary files. +# NB we ignore the packer generated files so it won't complain in the output. + +Write-Host 'Stopping services that might interfere with temporary file removal...' +function Stop-ServiceForReal($name) { + while ($true) { + Stop-Service -ErrorAction SilentlyContinue $name + if ((Get-Service $name).Status -eq 'Stopped') { + break + } + } +} +Stop-ServiceForReal TrustedInstaller # Windows Modules Installer +Stop-ServiceForReal wuauserv # Windows Update +Stop-ServiceForReal BITS # Background Intelligent Transfer Service +@( + "$env:LOCALAPPDATA\Temp\*" + "$env:windir\Temp\*" + "$env:windir\Logs\*" + "$env:windir\Panther\*" + "$env:windir\WinSxS\ManifestCache\*" + "$env:windir\SoftwareDistribution\Download" +) | Where-Object {Test-Path $_} | ForEach-Object { + Write-Host "Removing temporary files $_..." + try { + takeown.exe /D Y /R /F $_ | Out-Null + icacls.exe $_ /grant:r Administrators:F /T /C /Q 2>&1 | Out-Null + } catch { + Write-Host "Ignoring taking ownership of temporary files error: $_" + } + Remove-Item $_ -Exclude 'packer-*' -Recurse -Force -ErrorAction SilentlyContinue | Out-Null +} + + +# +# cleanup the WinSxS folder. + +# NB even thou the automatic maintenance includes a component cleanup task, +# it will not clean everything, as such, dism will clean the rest. +# NB to analyse the used space use: dism.exe /Online /Cleanup-Image /AnalyzeComponentStore +# see https://docs.microsoft.com/en-us/windows-hardware/manufacture/desktop/clean-up-the-winsxs-folder +Write-Host 'Cleaning up the WinSxS folder...' +dism.exe /Online /Quiet /Cleanup-Image /StartComponentCleanup /ResetBase +if ($LASTEXITCODE) { + throw "Failed with Exit Code $LASTEXITCODE" +} + +# NB even after cleaning up the WinSxS folder the "Backups and Disabled Features" +# field of the analysis report will display a non-zero number because the +# disabled features packages are still on disk. you can remove them with: +# Get-WindowsOptionalFeature -Online ` +# | Where-Object {$_.State -eq 'Disabled'} ` +# | ForEach-Object { +# Write-Host "Removing feature $($_.FeatureName)..." +# dism.exe /Online /Quiet /Disable-Feature "/FeatureName:$($_.FeatureName)" /Remove +# } +# NB a removed feature can still be installed from other sources (e.g. windows update). +Write-Host 'Analyzing the WinSxS folder...' +dism.exe /Online /Cleanup-Image /AnalyzeComponentStore + + +# +# reclaim the free disk space. + +Write-Host 'Reclaiming the free disk space...' +$results = defrag.exe C: /H /L +if ($results -eq 'The operation completed successfully.') +{ + $results +} +else +{ + if ((Get-CimInstance Win32_OperatingSystem).version -eq "6.3.9600") + { + return + } + else + { + Write-Host 'Zero filling the free disk space...' + (New-Object System.Net.WebClient).DownloadFile('https://download.sysinternals.com/files/SDelete.zip', "$env:TEMP\SDelete.zip") + Expand-Archive "$env:TEMP\SDelete.zip" $env:TEMP + Remove-Item "$env:TEMP\SDelete.zip" + &"$env:TEMP\sdelete64.exe" -accepteula -z C: + } +} diff --git a/packer_templates/scripts/windows/provision-guest-tools-qemu-kvm.ps1 b/packer_templates/scripts/windows/provision-guest-tools-qemu-kvm.ps1 new file mode 100644 index 000000000..379827cf6 --- /dev/null +++ b/packer_templates/scripts/windows/provision-guest-tools-qemu-kvm.ps1 @@ -0,0 +1,54 @@ +#MIT License +# +#Copyright (c) 2017 Rui Lopes +# +#Permission is hereby granted, free of charge, to any person obtaining a copy +#of this software and associated documentation files (the "Software"), to deal +#in the Software without restriction, including without limitation the rights +#to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +#copies of the Software, and to permit persons to whom the Software is +#furnished to do so, subject to the following conditions: +# +#The above copyright notice and this permission notice shall be included in all +#copies or substantial portions of the Software. +# +#THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +#IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +#FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +#AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +#LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +#OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +#SOFTWARE. + +Set-StrictMode -Version Latest +$ProgressPreference = 'SilentlyContinue' +$ErrorActionPreference = 'Stop' +trap { + Write-Host + Write-Host "ERROR: $_" + ($_.ScriptStackTrace -split '\r?\n') -replace '^(.*)$','ERROR: $1' | Write-Host + ($_.Exception.ToString() -split '\r?\n') -replace '^(.*)$','ERROR EXCEPTION: $1' | Write-Host + Write-Host + Write-Host 'Sleeping for 60m to give you time to look around the virtual machine before self-destruction...' + Start-Sleep -Seconds (60*60) + Exit 1 +} + +$systemVendor = (Get-CimInstance -ClassName Win32_ComputerSystemProduct -Property Vendor).Vendor +if ($systemVendor -eq 'QEMU') { + # qemu-kvm. + $guestToolsUrl = "http://$env:PACKER_HTTP_ADDR/drivers/virtio-win-guest-tools.exe" + $guestTools = "$env:TEMP\$(Split-Path -Leaf $guestToolsUrl)" + $guestToolsLog = "$guestTools.log" + Write-Host "Downloading the guest tools from $guestToolsUrl..." + Invoke-WebRequest $guestToolsUrl -OutFile $guestTools + Write-Host 'Installing the guest tools...' + &$guestTools /install /norestart /quiet /log $guestToolsLog | Out-String -Stream + if ($LASTEXITCODE) { + throw "failed to install guest tools with exit code $LASTEXITCODE" + } + Write-Host "Done installing the guest tools." +} else { + Write-Host "Not QEMU machine exiting" + Exit 0 +} diff --git a/packer_templates/scripts/windows/provision-vmwaretools.ps1 b/packer_templates/scripts/windows/provision-vmwaretools.ps1 new file mode 100644 index 000000000..707a16cf2 --- /dev/null +++ b/packer_templates/scripts/windows/provision-vmwaretools.ps1 @@ -0,0 +1,41 @@ +#MIT License +# +#Copyright (c) 2017 Rui Lopes +# +#Permission is hereby granted, free of charge, to any person obtaining a copy +#of this software and associated documentation files (the "Software"), to deal +#in the Software without restriction, including without limitation the rights +#to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +#copies of the Software, and to permit persons to whom the Software is +#furnished to do so, subject to the following conditions: +# +#The above copyright notice and this permission notice shall be included in all +#copies or substantial portions of the Software. +# +#THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +#IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +#FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +#AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +#LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +#OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +#SOFTWARE. + +Set-StrictMode -Version Latest +$ProgressPreference = 'SilentlyContinue' +$ErrorActionPreference = 'Stop' +trap { + Write-Host + Write-Output "ERROR: $_" + Write-Output (($_.ScriptStackTrace -split '\r?\n') -replace '^(.*)$','ERROR: $1') + Write-Host 'Sleeping for 60m to give you time to look around the virtual machine before self-destruction...' + Start-Sleep -Seconds (60*60) + Exit 1 +} + +$systemVendor = (Get-CimInstance -ClassName Win32_ComputerSystemProduct -Property Vendor).Vendor +if ($systemVendor -eq 'VMware, Inc.') { + Write-Output 'Installing VMware Tools...' + # silent install without rebooting. + E:\setup64.exe /s /v '/qn reboot=r' ` + | Out-String -Stream +} diff --git a/packer_templates/scripts/windows/provision-winrm.ps1 b/packer_templates/scripts/windows/provision-winrm.ps1 new file mode 100644 index 000000000..a6640536b --- /dev/null +++ b/packer_templates/scripts/windows/provision-winrm.ps1 @@ -0,0 +1,100 @@ +#MIT License +# +#Copyright (c) 2017 Rui Lopes +# +#Permission is hereby granted, free of charge, to any person obtaining a copy +#of this software and associated documentation files (the "Software"), to deal +#in the Software without restriction, including without limitation the rights +#to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +#copies of the Software, and to permit persons to whom the Software is +#furnished to do so, subject to the following conditions: +# +#The above copyright notice and this permission notice shall be included in all +#copies or substantial portions of the Software. +# +#THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +#IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +#FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +#AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +#LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +#OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +#SOFTWARE. + +Set-StrictMode -Version Latest +$ProgressPreference = 'SilentlyContinue' +$ErrorActionPreference = 'Stop' +trap { + Write-Host + Write-Host "ERROR: $_" + ($_.ScriptStackTrace -split '\r?\n') -replace '^(.*)$','ERROR: $1' | Write-Host + ($_.Exception.ToString() -split '\r?\n') -replace '^(.*)$','ERROR EXCEPTION: $1' | Write-Host + Write-Host + Write-Host 'Sleeping for 60m to give you time to look around the virtual machine before self-destruction...' + Start-Sleep -Seconds (60*60) + Exit 1 +} + +## for troubleshoot purposes, save this script output to a file. +#Start-Transcript C:\winrm-autounattend.txt + +## for troubleshoot purposes, save the current user details. this will be later displayed by provision.ps1. +#whoami /all >C:\whoami-autounattend.txt + +if (![Environment]::Is64BitProcess) { + throw 'this must run in a 64-bit PowerShell session' +} + +if (!(New-Object System.Security.Principal.WindowsPrincipal( + [Security.Principal.WindowsIdentity]::GetCurrent())).IsInRole( + [Security.Principal.WindowsBuiltInRole]::Administrator)) { + throw 'this must run with Administrator privileges (e.g. in a elevated shell session)' +} + +# move all (non-domain) network interfaces into the private profile to make winrm happy (it needs at +# least one private interface; for vagrant its enough to configure the first network interface). +# NB in windows server it would be enough to call winrm -force argument, but +# in windows client 10, we must set the network interface profile. +Get-NetConnectionProfile ` + | Where-Object {$_.NetworkCategory -ne 'DomainAuthenticated'} ` + | Set-NetConnectionProfile -NetworkCategory Private + +# configure WinRM. +Write-Output 'Configuring WinRM...' +winrm quickconfig -quiet +winrm set winrm/config/service '@{AllowUnencrypted="true"}' +winrm set winrm/config/service/auth '@{Basic="true"}' +winrm set winrm/config/service/auth '@{CredSSP="true"}' +# make sure the WinRM service startup type is delayed-auto +# even when the default config is auto (e.g. Windows 2019 +# changed that default). +# WARN do not be tempted to change the default WinRM service startup type from +# delayed-auto to auto, as the later proved to be unreliable. +$result = sc.exe config WinRM start= delayed-auto +if ($result -ne '[SC] ChangeServiceConfig SUCCESS') { + throw "sc.exe config failed with $result" +} + +# dump the WinRM configuration. +Write-Output 'WinRM Configuration:' +winrm enumerate winrm/config/listener +winrm get winrm/config +winrm id + +# disable UAC remote restrictions. +# see https://support.microsoft.com/en-us/help/951016/description-of-user-account-control-and-remote-restrictions-in-windows +# see https://docs.microsoft.com/en-us/windows/desktop/wmisdk/user-account-control-and-wmi#handling-remote-connections-under-uac +New-ItemProperty ` + -Path 'HKLM:\SOFTWARE\Microsoft\Windows\CurrentVersion\Policies\System' ` + -Name LocalAccountTokenFilterPolicy ` + -Value 1 ` + -Force ` + | Out-Null + +# make sure winrm can be accessed from any network location. +New-NetFirewallRule ` + -DisplayName WINRM-HTTP-In-TCP-VAGRANT ` + -Direction Inbound ` + -Action Allow ` + -Protocol TCP ` + -LocalPort 5985 ` + | Out-Null diff --git a/packer_templates/scripts/windows/provision.ps1 b/packer_templates/scripts/windows/provision.ps1 new file mode 100644 index 000000000..f7b761e2d --- /dev/null +++ b/packer_templates/scripts/windows/provision.ps1 @@ -0,0 +1,119 @@ +#MIT License +# +#Copyright (c) 2017 Rui Lopes +# +#Permission is hereby granted, free of charge, to any person obtaining a copy +#of this software and associated documentation files (the "Software"), to deal +#in the Software without restriction, including without limitation the rights +#to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +#copies of the Software, and to permit persons to whom the Software is +#furnished to do so, subject to the following conditions: +# +#The above copyright notice and this permission notice shall be included in all +#copies or substantial portions of the Software. +# +#THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +#IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +#FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +#AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +#LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +#OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +#SOFTWARE. + +Set-StrictMode -Version Latest +$ProgressPreference = 'SilentlyContinue' +$ErrorActionPreference = 'Stop' +trap { + #Write-Host + #Write-Host 'whoami from autounattend:' + #Get-Content C:\whoami-autounattend.txt | ForEach-Object { Write-Host "whoami from autounattend: $_" } + #Write-Host 'whoami from current WinRM session:' + #whoami /all >C:\whoami-winrm.txt + #Get-Content C:\whoami-winrm.txt | ForEach-Object { Write-Host "whoami from winrm: $_" } + Write-Host + Write-Host "ERROR: $_" + ($_.ScriptStackTrace -split '\r?\n') -replace '^(.*)$','ERROR: $1' | Write-Host + ($_.Exception.ToString() -split '\r?\n') -replace '^(.*)$','ERROR EXCEPTION: $1' | Write-Host + Write-Host + Write-Host 'Sleeping for 60m to give you time to look around the virtual machine before self-destruction...' + Start-Sleep -Seconds (60*60) + Exit 1 +} + +# enable TLS 1.2. +[Net.ServicePointManager]::SecurityProtocol = [Net.ServicePointManager]::SecurityProtocol ` + -bor [Net.SecurityProtocolType]::Tls12 + +if (![Environment]::Is64BitProcess) { + throw 'this must run in a 64-bit PowerShell session' +} + +if (!(New-Object System.Security.Principal.WindowsPrincipal( + [Security.Principal.WindowsIdentity]::GetCurrent())).IsInRole( + [Security.Principal.WindowsBuiltInRole]::Administrator)) { + throw 'this must run with Administrator privileges (e.g. in a elevated shell session)' +} + +Add-Type -A System.IO.Compression.FileSystem + +# install Guest Additions. +$systemVendor = (Get-CimInstance -ClassName Win32_ComputerSystemProduct -Property Vendor).Vendor +if ($systemVendor -eq 'QEMU') { + # do nothing. this was installed in provision-guest-tools-qemu-kvm.ps1. +} elseif ($systemVendor -eq 'innotek GmbH') { + Write-Host 'Importing the Oracle (for VirtualBox) certificate as a Trusted Publisher...' + E:\cert\VBoxCertUtil.exe add-trusted-publisher E:\cert\vbox-sha1.cer + if ($LASTEXITCODE) { + throw "failed to import certificate with exit code $LASTEXITCODE" + } + + Write-Host 'Installing the VirtualBox Guest Additions...' + E:\VBoxWindowsAdditions-amd64.exe /S | Out-String -Stream + if ($LASTEXITCODE) { + throw "failed to install with exit code $LASTEXITCODE. Check the logs at C:\Program Files\Oracle\VirtualBox Guest Additions\install.log." + } +} elseif ($systemVendor -eq 'Microsoft Corporation') { + # do nothing. Hyper-V enlightments are already bundled with Windows. +} elseif ($systemVendor -eq 'VMware, Inc.') { + # do nothing. VMware Tools were already installed by provision-vmtools.ps1 (executed from autounattend.xml). +} else { + throw "Cannot install Guest Additions: Unsupported system ($systemVendor)." +} + +Write-Host 'Setting the vagrant account properties...' +# see the ADS_USER_FLAG_ENUM enumeration at https://msdn.microsoft.com/en-us/library/aa772300(v=vs.85).aspx +$AdsScript = 0x00001 +$AdsAccountDisable = 0x00002 +$AdsNormalAccount = 0x00200 +$AdsDontExpirePassword = 0x10000 +$account = [ADSI]'WinNT://./vagrant' +$account.Userflags = $AdsNormalAccount -bor $AdsDontExpirePassword +$account.SetInfo() + +Write-Host 'Setting the Administrator account properties...' +$account = [ADSI]'WinNT://./Administrator' +$account.Userflags = $AdsNormalAccount -bor $AdsDontExpirePassword -bor $AdsAccountDisable +$account.SetInfo() + +Write-Host 'Disabling Automatic Private IP Addressing (APIPA)...' +Set-ItemProperty ` + -Path 'HKLM:\SYSTEM\CurrentControlSet\Services\Tcpip\Parameters' ` + -Name IPAutoconfigurationEnabled ` + -Value 0 + +Write-Host 'Disabling IPv6...' +Set-ItemProperty ` + -Path 'HKLM:\SYSTEM\CurrentControlSet\Services\Tcpip6\Parameters' ` + -Name DisabledComponents ` + -Value 0xff + +Write-Host 'Disabling hibernation...' +powercfg /hibernate off + +Write-Host 'Setting the power plan to high performance...' +powercfg /setactive 8c5e7fda-e8bf-4a96-9a85-a6e23a8c635c + +Write-Host 'Disabling the Windows Boot Manager menu...' +# NB to have the menu show with a lower timeout, run this instead: bcdedit /timeout 2 +# NB with a timeout of 2 you can still press F8 to show the boot manager menu. +bcdedit /set '{bootmgr}' displaybootmenu no diff --git a/packer_templates/scripts/windows/remove-apps.ps1 b/packer_templates/scripts/windows/remove-apps.ps1 new file mode 100644 index 000000000..3209a66de --- /dev/null +++ b/packer_templates/scripts/windows/remove-apps.ps1 @@ -0,0 +1,110 @@ +#MIT License +# +#Copyright (c) 2017 Rui Lopes +# +#Permission is hereby granted, free of charge, to any person obtaining a copy +#of this software and associated documentation files (the "Software"), to deal +#in the Software without restriction, including without limitation the rights +#to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +#copies of the Software, and to permit persons to whom the Software is +#furnished to do so, subject to the following conditions: +# +#The above copyright notice and this permission notice shall be included in all +#copies or substantial portions of the Software. +# +#THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +#IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +#FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +#AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +#LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +#OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +#SOFTWARE. + +Set-StrictMode -Version Latest +$ProgressPreference = 'SilentlyContinue' +$ErrorActionPreference = 'Stop' +trap { + Write-Host + Write-Host "ERROR: $_" + ($_.ScriptStackTrace -split '\r?\n') -replace '^(.*)$','ERROR: $1' | Write-Host + ($_.Exception.ToString() -split '\r?\n') -replace '^(.*)$','ERROR EXCEPTION: $1' | Write-Host + Write-Host + Write-Host 'Sleeping for 60m to give you time to look around the virtual machine before self-destruction...' + Start-Sleep -Seconds (60*60) + Exit 1 +} + +Write-Host 'Disabling the Microsoft Consumer Experience...' +mkdir -Force 'HKLM:\SOFTWARE\Policies\Microsoft\Windows\CloudContent' | Set-ItemProperty ` + -Name DisableWindowsConsumerFeatures ` + -Value 1 + +# when running on pwsh and windows 10, explicitly import the appx module. +# see https://github.com/PowerShell/PowerShell/issues/13138 +$currentVersionKey = Get-ItemProperty 'HKLM:\SOFTWARE\Microsoft\Windows NT\CurrentVersion' +$build = [int]$currentVersionKey.CurrentBuildNumber +if (($PSVersionTable.PSEdition -ne 'Desktop') -and ($build -lt 22000)) { + Import-Module Appx -UseWindowsPowerShell +} + +# remove all the provisioned appx packages. +# NB some packages fail to be removed and thats OK. +Get-AppXProvisionedPackage -Online | ForEach-Object { + Write-Host "Removing the $($_.PackageName) provisioned appx package..." + try { + $_ | Remove-AppxProvisionedPackage -Online | Out-Null + } catch { + Write-Output "WARN Failed to remove appx: $_" + } +} + +# remove appx packages. +# NB some packages fail to be removed and thats OK. +# see https://docs.microsoft.com/en-us/windows/application-management/apps-in-windows-10 +@( + 'Microsoft.BingWeather' + 'Microsoft.GetHelp' + 'Microsoft.Getstarted' + 'Microsoft.Microsoft3DViewer' + 'Microsoft.MicrosoftOfficeHub' + 'Microsoft.MicrosoftSolitaireCollection' + 'Microsoft.MicrosoftStickyNotes' + 'Microsoft.MixedReality.Portal' + 'Microsoft.MSPaint' + 'Microsoft.Office.OneNote' + 'Microsoft.People' + 'Microsoft.ScreenSketch' + 'Microsoft.Services.Store.Engagement' + 'Microsoft.SkypeApp' + 'Microsoft.StorePurchaseApp' + 'Microsoft.Wallet' + 'Microsoft.Windows.Photos' + 'Microsoft.WindowsAlarms' + 'Microsoft.WindowsCalculator' + 'Microsoft.WindowsCamera' + 'microsoft.windowscommunicationsapps' + 'Microsoft.WindowsFeedbackHub' + 'Microsoft.WindowsMaps' + 'Microsoft.WindowsSoundRecorder' + 'Microsoft.WindowsStore' + 'Microsoft.Xbox.TCUI' + 'Microsoft.XboxApp' + 'Microsoft.XboxGameOverlay' + 'Microsoft.XboxGamingOverlay' + 'Microsoft.XboxIdentityProvider' + 'Microsoft.XboxSpeechToTextOverlay' + 'Microsoft.YourPhone' + 'Microsoft.ZuneMusic' + 'Microsoft.ZuneVideo' + #'Microsoft.BioEnrollment' # NB this fails to remove. +) | ForEach-Object { + $appx = Get-AppxPackage -AllUsers $_ + if ($appx) { + Write-Host "Removing the $($appx.Name) appx package..." + try { + $appx | Remove-AppxPackage -AllUsers + } catch { + Write-Output "WARN Failed to remove appx: $_" + } + } +} diff --git a/packer_templates/scripts/windows/remove-one-drive.ps1 b/packer_templates/scripts/windows/remove-one-drive.ps1 new file mode 100644 index 000000000..30d869cbd --- /dev/null +++ b/packer_templates/scripts/windows/remove-one-drive.ps1 @@ -0,0 +1,69 @@ +#MIT License +# +#Copyright (c) 2017 Rui Lopes +# +#Permission is hereby granted, free of charge, to any person obtaining a copy +#of this software and associated documentation files (the "Software"), to deal +#in the Software without restriction, including without limitation the rights +#to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +#copies of the Software, and to permit persons to whom the Software is +#furnished to do so, subject to the following conditions: +# +#The above copyright notice and this permission notice shall be included in all +#copies or substantial portions of the Software. +# +#THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +#IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +#FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +#AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +#LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +#OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +#SOFTWARE. + +Set-StrictMode -Version Latest +$ProgressPreference = 'SilentlyContinue' +$ErrorActionPreference = 'Stop' +trap { + Write-Host + Write-Host "ERROR: $_" + ($_.ScriptStackTrace -split '\r?\n') -replace '^(.*)$','ERROR: $1' | Write-Host + ($_.Exception.ToString() -split '\r?\n') -replace '^(.*)$','ERROR EXCEPTION: $1' | Write-Host + Write-Host + Write-Host 'Sleeping for 60m to give you time to look around the virtual machine before self-destruction...' + Start-Sleep -Seconds (60*60) + Exit 1 +} + +$oneDriveSetup = 'C:\Windows\SysWOW64\OneDriveSetup.exe' + +# bail when OneDrive is not installed. +if (!(Test-Path $oneDriveSetup)) { + Exit 0 +} + +# disable OneDrive. +New-Item ` + -Path 'HKLM:\SOFTWARE\Policies\Microsoft\Windows' ` + -Name OneDrive ` + -Force ` + | Out-Null +New-ItemProperty ` + -Path 'HKLM:\SOFTWARE\Policies\Microsoft\Windows\OneDrive' ` + -Name DisableFileSyncNGSC ` + -Value 1 ` + -Force ` + | Out-Null + +# uninstall OneDrive. +# NB one drive setup will still be WinSxS and it does not seem possible to +# remove with Remove-WindowsPackage. +Get-Process OneDrive -ErrorAction SilentlyContinue | Stop-Process -Force +&$oneDriveSetup /uninstall | Out-String -Stream + +# ignore uninstall error. +# NB because it fails in windows 20H2, and not having OneDrive is just a +# nice to have. +if ($LASTEXITCODE) { + Write-Output "WARN Failed to uninstall OneDrive with exit code $LASTEXITCODE." + Exit 0 +} diff --git a/packer_templates/scripts/windows/virtualbox-prevent-vboxsrv-resolution-delay.ps1 b/packer_templates/scripts/windows/virtualbox-prevent-vboxsrv-resolution-delay.ps1 new file mode 100644 index 000000000..be5267040 --- /dev/null +++ b/packer_templates/scripts/windows/virtualbox-prevent-vboxsrv-resolution-delay.ps1 @@ -0,0 +1,34 @@ +#MIT License +# +#Copyright (c) 2017 Rui Lopes +# +#Permission is hereby granted, free of charge, to any person obtaining a copy +#of this software and associated documentation files (the "Software"), to deal +#in the Software without restriction, including without limitation the rights +#to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +#copies of the Software, and to permit persons to whom the Software is +#furnished to do so, subject to the following conditions: +# +#The above copyright notice and this permission notice shall be included in all +#copies or substantial portions of the Software. +# +#THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +#IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +#FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +#AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +#LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +#OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +#SOFTWARE. + +if ('VirtualBox' -ne (Get-CimInstance -ClassName WIN32_BIOS -Property SMBIOSBIOSVersion).SMBIOSBIOSVersion) { + Exit 0 +} + +# to prevent long delays while resolving the vboxsrv (used by c:\vagrant) +# NetBIOS name, hard-code its address in the lmhosts file. +# see 12.3.9. Long delays when accessing shared folders +# at https://www.virtualbox.org/manual/ch12.html#idm10219 +Write-Output @' +255.255.255.255 VBOXSVR #PRE +255.255.255.255 VBOXSRV #PRE +'@ | Out-File -Encoding ASCII -Append 'c:\windows\system32\drivers\etc\lmhosts' diff --git a/packer_templates/sles/http/sles-11-sp4-x86_64-autoinst.xml b/packer_templates/sles/http/sles-11-sp4-x86_64-autoinst.xml deleted file mode 100644 index bce1a8a9e..000000000 --- a/packer_templates/sles/http/sles-11-sp4-x86_64-autoinst.xml +++ /dev/null @@ -1,180 +0,0 @@ -<?xml version="1.0"?> -<!DOCTYPE profile> -<profile xmlns="http://www.suse.com/1.0/yast2ns" xmlns:config="http://www.suse.com/1.0/configns"> - <general> - <ask-list config:type="list"/> - <mode> - <confirm config:type="boolean">false</confirm> - </mode> - <mouse> - <id>none</id> - </mouse> - <proposals config:type="list"/> - <signature-handling> - <accept_file_without_checksum config:type="boolean">true</accept_file_without_checksum> - <accept_non_trusted_gpg_key config:type="boolean">true</accept_non_trusted_gpg_key> - <accept_unknown_gpg_key config:type="boolean">true</accept_unknown_gpg_key> - <accept_unsigned_file config:type="boolean">true</accept_unsigned_file> - <accept_verification_failed config:type="boolean">false</accept_verification_failed> - <import_gpg_key config:type="boolean">true</import_gpg_key> - </signature-handling> - <storage/> - </general> - <login_settings/> - <networking> - <dhcp_options> - <dhclient_client_id></dhclient_client_id> - <dhclient_hostname_option>AUTO</dhclient_hostname_option> - </dhcp_options> - <dns> - <dhcp_hostname config:type="boolean">false</dhcp_hostname> - <domain>vagrantup.com</domain> - <hostname>vagrant-sles-11sp4-x64</hostname> - <resolv_conf_policy>auto</resolv_conf_policy> - <searchlist config:type="list"> - <search>vagrantup.com</search> - </searchlist> - <write_hostname config:type="boolean">true</write_hostname> - </dns> - <interfaces config:type="list"> - <interface> - <bootproto>dhcp</bootproto> - <device>eth0</device> - <startmode>auto</startmode> - <usercontrol>no</usercontrol> - </interface> - </interfaces> - <keep_install_network config:type="boolean">true</keep_install_network> - <managed config:type="boolean">false</managed> - <routing> - <ip_forward config:type="boolean">false</ip_forward> - </routing> - </networking> - <partitioning config:type="list"> - <drive> - <initialize config:type="boolean">true</initialize> - <partitions config:type="list"> - <partition> - <create config:type="boolean">true</create> - <crypt_fs config:type="boolean">false</crypt_fs> - <filesystem config:type="symbol">swap</filesystem> - <format config:type="boolean">true</format> - <fstopt>defaults</fstopt> - <loop_fs config:type="boolean">false</loop_fs> - <mount>swap</mount> - <mountby config:type="symbol">device</mountby> - <partition_id config:type="integer">130</partition_id> - <partition_nr config:type="integer">1</partition_nr> - <raid_options/> - <resize config:type="boolean">false</resize> - <size>1561492992</size> - </partition> - <partition> - <create config:type="boolean">true</create> - <crypt_fs config:type="boolean">false</crypt_fs> - <filesystem config:type="symbol">ext3</filesystem> - <format config:type="boolean">true</format> - <fstopt>acl,user_xattr</fstopt> - <loop_fs config:type="boolean">false</loop_fs> - <mount>/</mount> - <mountby config:type="symbol">device</mountby> - <partition_id config:type="integer">131</partition_id> - <partition_nr config:type="integer">2</partition_nr> - <raid_options/> - <resize config:type="boolean">false</resize> - <size>max</size> - </partition> - </partitions> - <pesize></pesize> - <type config:type="symbol">CT_DISK</type> - <use>all</use> - </drive> - </partitioning> - <report> - <errors> - <log config:type="boolean">true</log> - <show config:type="boolean">true</show> - <timeout config:type="integer">0</timeout> - </errors> - <messages> - <log config:type="boolean">true</log> - <show config:type="boolean">true</show> - <timeout config:type="integer">0</timeout> - </messages> - <warnings> - <log config:type="boolean">true</log> - <show config:type="boolean">true</show> - <timeout config:type="integer">0</timeout> - </warnings> - <yesno_messages> - <log config:type="boolean">true</log> - <show config:type="boolean">true</show> - <timeout config:type="integer">0</timeout> - </yesno_messages> - </report> - <software> - - <packages config:type="list"> - <package>openssh</package> - <package>kernel-default-devel</package> - <package>sudo</package> - <package>gcc</package> - <package>wget</package> - <package>make</package> - </packages> - <patterns config:type="list"> - <pattern>Minimal</pattern> - <pattern>apparmor</pattern> - </patterns> - <remove-packages config:type="list"> - </remove-packages> - </software> - <user_defaults> - <expire></expire> - <group>100</group> - <groups>video,dialout</groups> - <home>/home</home> - <inactive>-1</inactive> - <shell>/bin/bash</shell> - <skel>/etc/skel</skel> - <umask>022</umask> - </user_defaults> - <users config:type="list"> - <user> - <encrypted config:type="boolean">true</encrypted> - <fullname>vagrant</fullname> - <gid>100</gid> - <home>/home/vagrant</home> - <password_settings> - <expire></expire> - <flag></flag> - <inact></inact> - <max>99999</max> - <min>0</min> - <warn>7</warn> - </password_settings> - <shell>/bin/bash</shell> - <uid>1000</uid> - <user_password>$2y$05$NA1Li9ZKJOLRW5mMTXm6/e5r8dltWS5RpDZpvHrI82aLE00V51tdi</user_password> - <username>vagrant</username> - </user> - <user> - <encrypted config:type="boolean">true</encrypted> - <fullname>root</fullname> - <gid>0</gid> - <home>/root</home> - <password_settings> - <expire></expire> - <flag></flag> - <inact></inact> - <max></max> - <min></min> - <warn></warn> - </password_settings> - <shell>/bin/bash</shell> - <uid>0</uid> - <user_password>$2y$05$NA1Li9ZKJOLRW5mMTXm6/e5r8dltWS5RpDZpvHrI82aLE00V51tdi</user_password> - <username>root</username> - </user> - </users> -</profile> diff --git a/packer_templates/sles/http/sles-12-sp3-x86_64-autoinst.xml b/packer_templates/sles/http/sles-12-sp3-x86_64-autoinst.xml deleted file mode 100644 index 40126e7b0..000000000 --- a/packer_templates/sles/http/sles-12-sp3-x86_64-autoinst.xml +++ /dev/null @@ -1,283 +0,0 @@ -<?xml version="1.0"?> -<!DOCTYPE profile> -<profile xmlns="http://www.suse.com/1.0/yast2ns" xmlns:config="http://www.suse.com/1.0/configns"> - <add-on> - <add_on_products config:type="list"/> - </add-on> - <bootloader> - <global> - <activate>true</activate> - <append>splash=silent quiet showopts</append> - <append_failsafe>showopts apm=off noresume edd=off powersaved=off nohz=off highres=off processor.max_cstate=1 nomodeset x11failsafe</append_failsafe> - <boot_boot>false</boot_boot> - <boot_extended>false</boot_extended> - <boot_mbr>false</boot_mbr> - <boot_root>true</boot_root> - <default>0</default> - <distributor>SLES12</distributor> - <generic_mbr>true</generic_mbr> - <gfxmode>auto</gfxmode> - <os_prober>false</os_prober> - <timeout config:type="integer">8</timeout> - </global> - <initrd_modules config:type="list"> - <initrd_module> - <module>ahci</module> - </initrd_module> - <initrd_module> - <module>ata_piix</module> - </initrd_module> - <initrd_module> - <module>ata_generic</module> - </initrd_module> - <initrd_module> - <module>jbd</module> - </initrd_module> - <initrd_module> - <module>mbcache</module> - </initrd_module> - </initrd_modules> - <loader_type>grub2</loader_type> - <sections config:type="list"/> - </bootloader> - <deploy_image> - <image_installation config:type="boolean">false</image_installation> - </deploy_image> - <firewall> - <enable_firewall config:type="boolean">false</enable_firewall> - <start_firewall config:type="boolean">false</start_firewall> - </firewall> - <general> - <ask-list config:type="list"/> - <mode> - <confirm config:type="boolean">false</confirm> - </mode> - <mouse> - <id>none</id> - </mouse> - <proposals config:type="list"/> - <signature-handling> - <accept_file_without_checksum config:type="boolean">true</accept_file_without_checksum> - <accept_non_trusted_gpg_key config:type="boolean">true</accept_non_trusted_gpg_key> - <accept_unknown_gpg_key config:type="boolean">true</accept_unknown_gpg_key> - <accept_unsigned_file config:type="boolean">true</accept_unsigned_file> - <accept_verification_failed config:type="boolean">false</accept_verification_failed> - <import_gpg_key config:type="boolean">true</import_gpg_key> - </signature-handling> - <storage/> - </general> - <login_settings/> - <networking> - <dhcp_options> - <dhclient_client_id/> - <dhclient_hostname_option>AUTO</dhclient_hostname_option> - </dhcp_options> - <dns> - <dhcp_hostname config:type="boolean">false</dhcp_hostname> - <domain>vagrantup.com</domain> - <hostname>vagrant-sles-12-x64</hostname> - <resolv_conf_policy>auto</resolv_conf_policy> - <searchlist config:type="list"> - <search>vagrantup.com</search> - </searchlist> - <write_hostname config:type="boolean">true</write_hostname> - </dns> - <interfaces config:type="list"> - <interface> - <bootproto>dhcp</bootproto> - <device>eth0</device> - <dhclient_set_default_route>yes</dhclient_set_default_route> - <startmode>auto</startmode> - <usercontrol>no</usercontrol> - </interface> - </interfaces> - <keep_install_network config:type="boolean">true</keep_install_network> - <managed config:type="boolean">false</managed> - <routing> - <ipv4_forward config:type="boolean">false</ipv4_forward> - <ipv6_forward config:type="boolean">false</ipv6_forward> - </routing> - </networking> - <partitioning config:type="list"> - <drive> - <!-- - definition of device not needed (starting with SLES 11 SP2 - YaST will pickup the first harddisk. - This is useful if someone wants to deploy using VirtualBox and/or KVM/virtio - --> - <!-- <device>/dev/sda</device> --> - <!-- This section may be removed entirely if we want to simply reuse YaST defaults --> - <enable_snapshots config:type="boolean">false</enable_snapshots> - <initialize config:type="boolean">true</initialize> - <partitions config:type="list"> - <partition> - <create config:type="boolean">true</create> - <crypt_fs config:type="boolean">false</crypt_fs> - <filesystem config:type="symbol">swap</filesystem> - <format config:type="boolean">true</format> - <fstopt>defaults</fstopt> - <loop_fs config:type="boolean">false</loop_fs> - <mount>swap</mount> - <mountby config:type="symbol">device</mountby> - <partition_id config:type="integer">130</partition_id> - <partition_nr config:type="integer">1</partition_nr> - <raid_options/> - <resize config:type="boolean">false</resize> - <size>1561492992</size> - </partition> - <partition> - <create config:type="boolean">true</create> - <crypt_fs config:type="boolean">false</crypt_fs> - <filesystem config:type="symbol">btrfs</filesystem> - <format config:type="boolean">true</format> - <loop_fs config:type="boolean">false</loop_fs> - <mount>/</mount> - <mountby config:type="symbol">device</mountby> - <partition_id config:type="integer">131</partition_id> - <partition_nr config:type="integer">2</partition_nr> - <raid_options/> - <resize config:type="boolean">false</resize> - <size>max</size> - <subvolumes config:type="list"> - <listentry>boot/grub2/i386-pc</listentry> - <listentry>boot/grub2/x86_64-efi</listentry> - <listentry>home</listentry> - <listentry>opt</listentry> - <listentry>srv</listentry> - <listentry>tmp</listentry> - <listentry>usr/local</listentry> - <listentry>var/crash</listentry> - <listentry>var/lib/mailman</listentry> - <listentry>var/lib/named</listentry> - <listentry>var/lib/pgsql</listentry> - <listentry>var/log</listentry> - <listentry>var/opt</listentry> - <listentry>var/spool</listentry> - <listentry>var/tmp</listentry> - </subvolumes> - </partition> - </partitions> - <pesize/> - <type config:type="symbol">CT_DISK</type> - <use>all</use> - </drive> - </partitioning> - <report> - <errors> - <log config:type="boolean">true</log> - <show config:type="boolean">true</show> - <timeout config:type="integer">0</timeout> - </errors> - <messages> - <log config:type="boolean">true</log> - <show config:type="boolean">true</show> - <timeout config:type="integer">0</timeout> - </messages> - <warnings> - <log config:type="boolean">true</log> - <show config:type="boolean">true</show> - <timeout config:type="integer">0</timeout> - </warnings> - <yesno_messages> - <log config:type="boolean">true</log> - <show config:type="boolean">true</show> - <timeout config:type="integer">0</timeout> - </yesno_messages> - </report> - <services-manager> - <default_target>graphical</default_target> - <services> - <disable config:type="list"/> - <enable config:type="list"> - <service>sshd</service> - </enable> - </services> - </services-manager> - <software> - <packages config:type="list"> - <package>glibc</package> - <package>openssh</package> - <package>snapper</package> - <package>SuSEfirewall2</package> - <package>kexec-tools</package> - <package>perl-Bootloader-YAML</package> - <package>kernel-default-devel</package> - <package>sudo</package> - <package>gcc</package> - <package>wget</package> - <package>perl</package> - <package>make</package> - </packages> - <patterns config:type="list"> - <pattern>Minimal</pattern> - <pattern>apparmor</pattern> - </patterns> - <remove-packages config:type="list"> - <package>adaptec-firmware</package> - <package>atmel-firmware</package> - <package>bash-completion</package> - <package>bash-doc</package> - <package>cifs-utils</package> - <package>cups-libs</package> - <package>ipw-firmware</package> - <package>mpt-firmware</package> - <package>postfix</package> - <package>samba-libs</package> - <package>ucode-intel</package> - <package>snapper</package> - <package>snapper-zypp-plugin</package> - </remove-packages> - </software> - <timezone> - <hwclock>UTC</hwclock> - <timezone>UTC</timezone> - </timezone> - <user_defaults> - <expire/> - <group>100</group> - <groups>video,dialout</groups> - <home>/home</home> - <inactive>-1</inactive> - <shell>/bin/bash</shell> - <skel>/etc/skel</skel> - <umask>022</umask> - </user_defaults> - <users config:type="list"> - <user> - <encrypted config:type="boolean">true</encrypted> - <fullname>vagrant</fullname> - <gid>100</gid> - <home>/home/vagrant</home> - <password_settings> - <expire/> - <flag/> - <inact/> - <max>99999</max> - <min>0</min> - <warn>7</warn> - </password_settings> - <shell>/bin/bash</shell> - <uid>1000</uid> - <user_password>$2y$05$NA1Li9ZKJOLRW5mMTXm6/e5r8dltWS5RpDZpvHrI82aLE00V51tdi</user_password> - <username>vagrant</username> - </user> - <user> - <encrypted config:type="boolean">true</encrypted> - <fullname>root</fullname> - <gid>0</gid> - <home>/root</home> - <password_settings> - <expire/> - <flag/> - <inact/> - <max/> - <min/> - <warn/> - </password_settings> - <shell>/bin/bash</shell> - <uid>0</uid> - <user_password>$6$UgKtUD0AUMIA$VWLyc2Uvl0Lk6xxfTuoRb0/jrhZ9IJG/Gtx/DkZUEWZm.JYO1Q1fvPo6gDxQAHp38kQ1DG1vNGRgu2T/z/vih.</user_password> - <username>root</username> - </user> - </users> -</profile> diff --git a/packer_templates/sles/http/sles-15-x86_64-autoinst.xml b/packer_templates/sles/http/sles-15-x86_64-autoinst.xml deleted file mode 100644 index 9921b0eab..000000000 --- a/packer_templates/sles/http/sles-15-x86_64-autoinst.xml +++ /dev/null @@ -1,294 +0,0 @@ -<?xml version="1.0"?> -<!DOCTYPE profile> -<profile xmlns="http://www.suse.com/1.0/yast2ns" xmlns:config="http://www.suse.com/1.0/configns"> - <add-on> - <add_on_products config:type="list"> - <listentry> - <media_url><![CDATA[dvd:///?devices=/dev/sr0]]></media_url> - <product>sle-module-basesystem-release</product> - <product_dir>/Module-Basesystem</product_dir> - </listentry> - </add_on_products> - </add-on> - <bootloader> - <global> - <activate>true</activate> - <append>splash=silent quiet showopts</append> - <append_failsafe>showopts apm=off noresume edd=off powersaved=off nohz=off highres=off processor.max_cstate=1 nomodeset x11failsafe</append_failsafe> - <boot_boot>false</boot_boot> - <boot_extended>false</boot_extended> - <boot_mbr>false</boot_mbr> - <boot_root>true</boot_root> - <default>0</default> - <distributor>SLES15</distributor> - <generic_mbr>true</generic_mbr> - <gfxmode>auto</gfxmode> - <os_prober>false</os_prober> - <timeout config:type="integer">8</timeout> - </global> - <initrd_modules config:type="list"> - <initrd_module> - <module>ahci</module> - </initrd_module> - <initrd_module> - <module>ata_piix</module> - </initrd_module> - <initrd_module> - <module>ata_generic</module> - </initrd_module> - <initrd_module> - <module>jbd</module> - </initrd_module> - <initrd_module> - <module>mbcache</module> - </initrd_module> - </initrd_modules> - <loader_type>grub2</loader_type> - <sections config:type="list"/> - </bootloader> - <deploy_image> - <image_installation config:type="boolean">false</image_installation> - </deploy_image> - <firewall> - <enable_firewall config:type="boolean">false</enable_firewall> - <start_firewall config:type="boolean">false</start_firewall> - </firewall> - <general> - <ask-list config:type="list"/> - <mode> - <confirm config:type="boolean">false</confirm> - </mode> - <mouse> - <id>none</id> - </mouse> - <proposals config:type="list"/> - <signature-handling> - <accept_file_without_checksum config:type="boolean">true</accept_file_without_checksum> - <accept_non_trusted_gpg_key config:type="boolean">true</accept_non_trusted_gpg_key> - <accept_unknown_gpg_key config:type="boolean">true</accept_unknown_gpg_key> - <accept_unsigned_file config:type="boolean">true</accept_unsigned_file> - <accept_verification_failed config:type="boolean">false</accept_verification_failed> - <import_gpg_key config:type="boolean">true</import_gpg_key> - </signature-handling> - <storage/> - </general> - <login_settings/> - <networking> - <dhcp_options> - <dhclient_client_id/> - <dhclient_hostname_option>AUTO</dhclient_hostname_option> - </dhcp_options> - <dns> - <dhcp_hostname config:type="boolean">false</dhcp_hostname> - <domain>vagrantup.com</domain> - <hostname>vagrant-sles-15-x64</hostname> - <resolv_conf_policy>auto</resolv_conf_policy> - <searchlist config:type="list"> - <search>vagrantup.com</search> - </searchlist> - <write_hostname config:type="boolean">true</write_hostname> - </dns> - <interfaces config:type="list"> - <interface> - <bootproto>dhcp</bootproto> - <device>eth0</device> - <dhclient_set_default_route>yes</dhclient_set_default_route> - <startmode>auto</startmode> - <usercontrol>no</usercontrol> - </interface> - </interfaces> - <keep_install_network config:type="boolean">true</keep_install_network> - <managed config:type="boolean">false</managed> - <routing> - <ipv4_forward config:type="boolean">false</ipv4_forward> - <ipv6_forward config:type="boolean">false</ipv6_forward> - </routing> - </networking> - <partitioning config:type="list"> - <drive> - <!-- - definition of device not needed (starting with SLES 11 SP2 - YaST will pickup the first harddisk. - This is useful if someone wants to deploy using VirtualBox and/or KVM/virtio - --> - <!-- <device>/dev/sda</device> --> - <!-- This section may be removed entirely if we want to simply reuse YaST defaults --> - <enable_snapshots config:type="boolean">false</enable_snapshots> - <initialize config:type="boolean">true</initialize> - <partitions config:type="list"> - <partition> - <create config:type="boolean">true</create> - <crypt_fs config:type="boolean">false</crypt_fs> - <filesystem config:type="symbol">swap</filesystem> - <format config:type="boolean">true</format> - <fstopt>defaults</fstopt> - <loop_fs config:type="boolean">false</loop_fs> - <mount>swap</mount> - <mountby config:type="symbol">device</mountby> - <partition_id config:type="integer">130</partition_id> - <partition_nr config:type="integer">1</partition_nr> - <raid_options/> - <resize config:type="boolean">false</resize> - <size>1561492992</size> - </partition> - <partition> - <create config:type="boolean">true</create> - <crypt_fs config:type="boolean">false</crypt_fs> - <filesystem config:type="symbol">btrfs</filesystem> - <format config:type="boolean">true</format> - <loop_fs config:type="boolean">false</loop_fs> - <mount>/</mount> - <mountby config:type="symbol">device</mountby> - <partition_id config:type="integer">131</partition_id> - <partition_nr config:type="integer">2</partition_nr> - <raid_options/> - <resize config:type="boolean">false</resize> - <size>max</size> - <subvolumes config:type="list"> - <listentry>boot/grub2/i386-pc</listentry> - <listentry>boot/grub2/x86_64-efi</listentry> - <listentry>home</listentry> - <listentry>opt</listentry> - <listentry>srv</listentry> - <listentry>tmp</listentry> - <listentry>usr/local</listentry> - <listentry>var/crash</listentry> - <listentry>var/lib/mailman</listentry> - <listentry>var/lib/named</listentry> - <listentry>var/lib/pgsql</listentry> - <listentry>var/log</listentry> - <listentry>var/opt</listentry> - <listentry>var/spool</listentry> - <listentry>var/tmp</listentry> - </subvolumes> - </partition> - </partitions> - <pesize/> - <type config:type="symbol">CT_DISK</type> - <use>all</use> - </drive> - </partitioning> - <report> - <errors> - <log config:type="boolean">true</log> - <show config:type="boolean">true</show> - <timeout config:type="integer">0</timeout> - </errors> - <messages> - <log config:type="boolean">true</log> - <show config:type="boolean">true</show> - <timeout config:type="integer">0</timeout> - </messages> - <warnings> - <log config:type="boolean">true</log> - <show config:type="boolean">true</show> - <timeout config:type="integer">0</timeout> - </warnings> - <yesno_messages> - <log config:type="boolean">true</log> - <show config:type="boolean">true</show> - <timeout config:type="integer">0</timeout> - </yesno_messages> - </report> - <services-manager> - <default_target>graphical</default_target> - <services> - <disable config:type="list"/> - <enable config:type="list"> - <service>sshd</service> - </enable> - </services> - </services-manager> - <software> - <products config:type="list"> - <product>SLES</product> - </products> - <packages config:type="list"> - <package>glibc</package> - <package>openssh</package> - <package>snapper</package> -<!-- <package>SuSEfirewall2</package> --> - <package>kexec-tools</package> -<!-- <package>perl-Bootloader-YAML</package> --> - <package>kernel-default-devel</package> - <package>sudo</package> - <package>gcc</package> - <package>wget</package> - <package>perl</package> - <package>make</package> - </packages> - <patterns config:type="list"> - <pattern>apparmor</pattern> - </patterns> - <remove-packages config:type="list"> - <package>adaptec-firmware</package> - <package>atmel-firmware</package> - <package>bash-completion</package> - <package>bash-doc</package> - <package>cifs-utils</package> - <package>cups-libs</package> - <package>ipw-firmware</package> - <package>mpt-firmware</package> - <package>postfix</package> - <package>samba-libs</package> - <package>ucode-intel</package> - <package>snapper</package> - <package>snapper-zypp-plugin</package> - </remove-packages> - </software> - <timezone> - <hwclock>UTC</hwclock> - <timezone>UTC</timezone> - </timezone> - <user_defaults> - <expire/> - <group>100</group> - <groups>video,dialout</groups> - <home>/home</home> - <inactive>-1</inactive> - <shell>/bin/bash</shell> - <skel>/etc/skel</skel> - <umask>022</umask> - </user_defaults> - <users config:type="list"> - <user> - <encrypted config:type="boolean">true</encrypted> - <fullname>vagrant</fullname> - <gid>100</gid> - <home>/home/vagrant</home> - <password_settings> - <expire/> - <flag/> - <inact/> - <max>99999</max> - <min>0</min> - <warn>7</warn> - </password_settings> - <shell>/bin/bash</shell> - <uid>1000</uid> - <user_password>$2y$05$NA1Li9ZKJOLRW5mMTXm6/e5r8dltWS5RpDZpvHrI82aLE00V51tdi</user_password> - <username>vagrant</username> - </user> - <user> - <encrypted config:type="boolean">true</encrypted> - <fullname>root</fullname> - <gid>0</gid> - <home>/root</home> - <password_settings> - <expire/> - <flag/> - <inact/> - <max/> - <min/> - <warn/> - </password_settings> - <shell>/bin/bash</shell> - <uid>0</uid> - <user_password>$6$UgKtUD0AUMIA$VWLyc2Uvl0Lk6xxfTuoRb0/jrhZ9IJG/Gtx/DkZUEWZm.JYO1Q1fvPo6gDxQAHp38kQ1DG1vNGRgu2T/z/vih.</user_password> - <username>root</username> - </user> - </users> - <suse_register> - <do_registration config:type="boolean">false</do_registration> - </suse_register> -</profile> diff --git a/packer_templates/sles/scripts/cleanup.sh b/packer_templates/sles/scripts/cleanup.sh deleted file mode 100644 index bc1e49932..000000000 --- a/packer_templates/sles/scripts/cleanup.sh +++ /dev/null @@ -1,26 +0,0 @@ -#!/bin/sh -# These were only needed for building VMware/Virtualbox extensions: -echo "remove some bogus packages we don't need" -zypper --non-interactive rm --clean-deps gcc kernel-default-devel -echo "cleanup all the downloaded RPMs" -zypper clean --all - -echo "clean up network interface persistence" -rm -f /etc/udev/rules.d/70-persistent-net.rules; -touch /etc/udev/rules.d/75-persistent-net-generator.rules; - -echo "truncate any logs that have built up during the install" -find /var/log -type f -exec truncate --size=0 {} \; - -echo "remove the contents of /tmp and /var/tmp" -rm -rf /tmp/* /var/tmp/* - -echo "blank netplan machine-id (DUID) so machines get unique ID generated on boot" -truncate -s 0 /etc/machine-id - -echo "force a new random seed to be generated" -rm -f /var/lib/systemd/random-seed - -echo "clear the history so our install isn't there" -rm -f /root/.wget-hsts -export HISTSIZE=0 \ No newline at end of file diff --git a/packer_templates/sles/scripts/remove-dvd-source.sh b/packer_templates/sles/scripts/remove-dvd-source.sh deleted file mode 100644 index f15778eb6..000000000 --- a/packer_templates/sles/scripts/remove-dvd-source.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh -eux - -zypper removerepo `zypper repos | grep 'SLES' | awk '{ print $3 }' | grep "^SLES"`; -exit 0 diff --git a/packer_templates/sles/scripts/sudoers.sh b/packer_templates/sles/scripts/sudoers.sh deleted file mode 100644 index eb80f3f88..000000000 --- a/packer_templates/sles/scripts/sudoers.sh +++ /dev/null @@ -1,3 +0,0 @@ -# update sudoers - can't do this in autoinst.xml -echo -e "\nupdate sudoers ..." -echo -e "vagrant ALL=(ALL) NOPASSWD: ALL\n" >> /etc/sudoers diff --git a/packer_templates/sles/scripts/zypper-locks.sh b/packer_templates/sles/scripts/zypper-locks.sh deleted file mode 100644 index fe464451b..000000000 --- a/packer_templates/sles/scripts/zypper-locks.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/sh -eux - -# remove zypper locks on removed packages to avoid later dependency problems -any_package_locks=`zypper --non-interactive ll | grep package`; - -if [ 'There are no package locks defined.' == "$any_package_locks" ]; then - echo 'There are no package locks defined. Doing nothing.'; -else - zypper --non-interactive ll | grep package | awk -F\| '{ print $2 }' | xargs -n 20 zypper --non-interactive rl; -fi diff --git a/packer_templates/sles/sles-11-sp4-x86_64.json b/packer_templates/sles/sles-11-sp4-x86_64.json deleted file mode 100644 index 75a0593d2..000000000 --- a/packer_templates/sles/sles-11-sp4-x86_64.json +++ /dev/null @@ -1,178 +0,0 @@ -{ - "builders": [ - { - "boot_command": [ - "<esc><enter><wait>", - "linux netdevice=eth0 netsetup=dhcp install=cd:/<wait>", - " lang=en_US autoyast=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `autoinst_cfg`}}<wait>", - " textmode=1<wait>", - "<enter><wait>" - ], - "boot_wait": "5s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", - "guest_additions_url": "{{ user `guest_additions_url` }}", - "guest_os_type": "OpenSUSE_64", - "hard_drive_interface": "sata", - "headless": "{{ user `headless` }}", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-virtualbox", - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "type": "virtualbox-iso", - "virtualbox_version_file": ".vbox_version", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<esc><enter><wait>", - "linux netdevice=eth0 netsetup=dhcp install=cd:/<wait>", - " lang=en_US autoyast=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `autoinst_cfg`}}", - " textmode=1<wait>", - "<enter><wait>" - ], - "boot_wait": "5s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "sles11-64", - "headless": "{{ user `headless` }}", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-vmware", - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "tools_upload_flavor": "linux", - "type": "vmware-iso", - "vm_name": "{{ user `template` }}", - "vmx_data": { - "cpuid.coresPerSocket": "1" - }, - "vmx_remove_ethernet_interfaces": true - }, - { - "boot_command": [ - "<esc><enter><wait>", - "linux netdevice=eth0 netsetup=dhcp install=cd:/<wait>", - " lang=en_US autoyast=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `autoinst_cfg`}}<wait>", - " textmode=1<wait>", - "<enter><wait>" - ], - "boot_wait": "5s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "suse", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-parallels", - "parallels_tools_flavor": "lin", - "prlctl_version_file": ".prlctl_version", - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "type": "parallels-iso", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<esc><enter><wait>", - "linux netdevice=eth0 netsetup=dhcp install=cd:/<wait>", - " lang=en_US autoyast=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `autoinst_cfg`}}<wait>", - " textmode=1<wait>", - "<enter><wait>" - ], - "boot_wait": "5s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "headless": "{{ user `headless` }}", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-qemu", - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "type": "qemu", - "vm_name": "{{ user `template` }}", - "qemuargs": [ - [ "-m", "{{ user `memory` }}" ], - [ "-display", "{{ user `qemu_display` }}" ] - ] - } - ], - "post-processors": [ - { - "output": "{{ user `build_directory` }}/{{user `box_basename`}}.{{.Provider}}.box", - "type": "vagrant" - } - ], - "provisioners": [ - { - "environment_vars": [ - "HOME_DIR=/home/vagrant", - "http_proxy={{user `http_proxy`}}", - "https_proxy={{user `https_proxy`}}", - "no_proxy={{user `no_proxy`}}" - ], - "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh '{{.Path}}'", - "expect_disconnect": true, - "scripts": [ - "{{template_dir}}/../_common/motd.sh", - "{{template_dir}}/../_common/sshd.sh", - "{{template_dir}}/../_common/vagrant.sh", - "{{template_dir}}/../_common/virtualbox.sh", - "{{template_dir}}/../_common/vmware.sh", - "{{template_dir}}/../_common/parallels.sh", - "{{template_dir}}/scripts/sudoers.sh", - "{{template_dir}}/scripts/zypper-locks.sh", - "{{template_dir}}/scripts/remove-dvd-source.sh", - "{{template_dir}}/scripts/cleanup.sh", - "{{template_dir}}/../_common/minimize.sh" - ], - "type": "shell" - } - ], - "variables": { - "_DOWNLOAD_SITE": "https://www.suse.com/products/server/download", - "_README": "You must download the automated installer iso from the following page, and then place it in the packer_cache dir", - "arch": "64", - "autoinst_cfg": "sles-11-sp4-x86_64-autoinst.xml", - "box_basename": "sles-11-sp4", - "build_directory": "../../builds", - "build_timestamp": "{{isotime \"20060102150405\"}}", - "cpus": "2", - "disk_size": "65536", - "git_revision": "__unknown_git_revision__", - "guest_additions_url": "", - "headless": "", - "http_directory": "{{template_dir}}/http", - "http_proxy": "{{env `http_proxy`}}", - "https_proxy": "{{env `https_proxy`}}", - "iso_checksum": "4fbf22201876d571c719328f385d87d6d690fb3ceb5e093108cdf0373c43e855", - "iso_name": "SLES-11-SP4-DVD-x86_64-GM-DVD1.iso", - "memory": "1024", - "mirror": "./packer_cache", - "name": "sles-11-sp4", - "qemu_display": "none", - "template": "sles-11-sp4-x86_64", - "version": "TIMESTAMP" - } -} diff --git a/packer_templates/sles/sles-12-sp2-x86_64.json b/packer_templates/sles/sles-12-sp2-x86_64.json deleted file mode 100644 index 07230bb8e..000000000 --- a/packer_templates/sles/sles-12-sp2-x86_64.json +++ /dev/null @@ -1,179 +0,0 @@ -{ - "builders": [ - { - "boot_command": [ - "<esc><enter><wait>", - "linux netdevice=eth0 netsetup=dhcp install=cd:/<wait>", - " lang=en_US autoyast=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `autoinst_cfg`}}<wait>", - " textmode=1<wait>", - "<enter><wait>" - ], - "boot_wait": "5s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", - "guest_additions_url": "{{ user `guest_additions_url` }}", - "guest_os_type": "OpenSUSE_64", - "hard_drive_interface": "sata", - "headless": "{{ user `headless` }}", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-virtualbox", - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "type": "virtualbox-iso", - "virtualbox_version_file": ".vbox_version", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<esc><enter><wait>", - "linux netdevice=eth0 netsetup=dhcp install=cd:/<wait>", - " lang=en_US autoyast=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `autoinst_cfg`}}<wait>", - " textmode=1<wait>", - "<enter><wait>" - ], - "boot_wait": "5s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "sles12-64", - "headless": "{{ user `headless` }}", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-vmware", - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "tools_upload_flavor": "linux", - "type": "vmware-iso", - "vm_name": "{{ user `template` }}", - "vmx_data": { - "cpuid.coresPerSocket": "1" - }, - "vmx_remove_ethernet_interfaces": true - }, - { - "boot_command": [ - "<esc><enter><wait>", - "linux netdevice=eth0 netsetup=dhcp install=cd:/<wait>", - " lang=en_US autoyast=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `autoinst_cfg`}}<wait>", - " textmode=1<wait>", - "<enter><wait>" - ], - "boot_wait": "5s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "suse", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-parallels", - "parallels_tools_flavor": "lin", - "prlctl_version_file": ".prlctl_version", - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "type": "parallels-iso", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<esc><enter><wait>", - "linux netdevice=eth0 netsetup=dhcp install=cd:/<wait>", - " lang=en_US autoyast=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `autoinst_cfg`}}<wait>", - " textmode=1<wait>", - "<enter><wait>" - ], - "boot_wait": "5s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "headless": "{{ user `headless` }}", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-qemu", - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "type": "qemu", - "vm_name": "{{ user `template` }}", - "qemuargs": [ - [ "-m", "{{ user `memory` }}" ], - [ "-display", "{{ user `qemu_display` }}" ] - ] - } - ], - "post-processors": [ - { - "output": "{{ user `build_directory` }}/{{user `box_basename`}}.{{.Provider}}.box", - "type": "vagrant" - } - ], - "provisioners": [ - { - "environment_vars": [ - "HOME_DIR=/home/vagrant", - "http_proxy={{user `http_proxy`}}", - "https_proxy={{user `https_proxy`}}", - "no_proxy={{user `no_proxy`}}" - ], - "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh '{{.Path}}'", - "expect_disconnect": true, - "scripts": [ - "{{template_dir}}/../_common/motd.sh", - "{{template_dir}}/../_common/sshd.sh", - "{{template_dir}}/../_common/vagrant.sh", - "{{template_dir}}/scripts/unsupported-modules.sh", - "{{template_dir}}/../_common/virtualbox.sh", - "{{template_dir}}/../_common/vmware.sh", - "{{template_dir}}/../_common/parallels.sh", - "{{template_dir}}/scripts/sudoers.sh", - "{{template_dir}}/scripts/zypper-locks.sh", - "{{template_dir}}/scripts/remove-dvd-source.sh", - "{{template_dir}}/scripts/cleanup.sh", - "{{template_dir}}/../_common/minimize.sh" - ], - "type": "shell" - } - ], - "variables": { - "_DOWNLOAD_SITE": "https://www.suse.com/products/server/download", - "_README": "You must download the automated installer iso from the following page, and then place it in the packer_cache dir", - "arch": "64", - "autoinst_cfg": "sles-12-sp2-x86_64-autoinst.xml", - "box_basename": "sles-12-sp2", - "build_directory": "../../builds", - "build_timestamp": "{{isotime \"20060102150405\"}}", - "cpus": "2", - "disk_size": "65536", - "git_revision": "__unknown_git_revision__", - "guest_additions_url": "", - "headless": "", - "http_directory": "{{template_dir}}/http", - "http_proxy": "{{env `http_proxy`}}", - "https_proxy": "{{env `https_proxy`}}", - "iso_checksum": "dd724e9248f2c3507e8e9d0050a4c8b6e9aeda7fdf0870858757cc6c01b7d47d", - "iso_name": "SLE-12-SP2-Server-DVD-x86_64-GM-DVD1.iso", - "memory": "1024", - "mirror": "./packer_cache", - "name": "sles-12-sp2", - "qemu_display": "none", - "template": "sles-12-sp2-x86_64", - "version": "TIMESTAMP" - } -} diff --git a/packer_templates/sles/sles-12-sp3-x86_64.json b/packer_templates/sles/sles-12-sp3-x86_64.json deleted file mode 100644 index 3f0bea5ec..000000000 --- a/packer_templates/sles/sles-12-sp3-x86_64.json +++ /dev/null @@ -1,179 +0,0 @@ -{ - "builders": [ - { - "boot_command": [ - "<esc><enter><wait>", - "linux netdevice=eth0 netsetup=dhcp install=cd:/<wait>", - " lang=en_US autoyast=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `autoinst_cfg`}}<wait>", - " textmode=1<wait>", - "<enter><wait>" - ], - "boot_wait": "5s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", - "guest_additions_url": "{{ user `guest_additions_url` }}", - "guest_os_type": "OpenSUSE_64", - "hard_drive_interface": "sata", - "headless": "{{ user `headless` }}", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-virtualbox", - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "type": "virtualbox-iso", - "virtualbox_version_file": ".vbox_version", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<esc><enter><wait>", - "linux netdevice=eth0 netsetup=dhcp install=cd:/<wait>", - " lang=en_US autoyast=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `autoinst_cfg`}}<wait>", - " textmode=1<wait>", - "<enter><wait>" - ], - "boot_wait": "5s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "sles12-64", - "headless": "{{ user `headless` }}", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-vmware", - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "tools_upload_flavor": "linux", - "type": "vmware-iso", - "vm_name": "{{ user `template` }}", - "vmx_data": { - "cpuid.coresPerSocket": "1" - }, - "vmx_remove_ethernet_interfaces": true - }, - { - "boot_command": [ - "<esc><enter><wait>", - "linux netdevice=eth0 netsetup=dhcp install=cd:/<wait>", - " lang=en_US autoyast=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `autoinst_cfg`}}<wait>", - " textmode=1<wait>", - "<enter><wait>" - ], - "boot_wait": "5s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "suse", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-parallels", - "parallels_tools_flavor": "lin", - "prlctl_version_file": ".prlctl_version", - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "type": "parallels-iso", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<esc><enter><wait>", - "linux netdevice=eth0 netsetup=dhcp install=cd:/<wait>", - " lang=en_US autoyast=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `autoinst_cfg`}}<wait>", - " textmode=1<wait>", - "<enter><wait>" - ], - "boot_wait": "5s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "headless": "{{ user `headless` }}", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-qemu", - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "type": "qemu", - "vm_name": "{{ user `template` }}", - "qemuargs": [ - [ "-m", "{{ user `memory` }}" ], - [ "-display", "{{ user `qemu_display` }}" ] - ] - } - ], - "post-processors": [ - { - "output": "{{ user `build_directory` }}/{{user `box_basename`}}.{{.Provider}}.box", - "type": "vagrant" - } - ], - "provisioners": [ - { - "environment_vars": [ - "HOME_DIR=/home/vagrant", - "http_proxy={{user `http_proxy`}}", - "https_proxy={{user `https_proxy`}}", - "no_proxy={{user `no_proxy`}}" - ], - "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh '{{.Path}}'", - "expect_disconnect": true, - "scripts": [ - "{{template_dir}}/../_common/motd.sh", - "{{template_dir}}/../_common/sshd.sh", - "{{template_dir}}/../_common/vagrant.sh", - "{{template_dir}}/scripts/unsupported-modules.sh", - "{{template_dir}}/../_common/virtualbox.sh", - "{{template_dir}}/../_common/vmware.sh", - "{{template_dir}}/../_common/parallels.sh", - "{{template_dir}}/scripts/sudoers.sh", - "{{template_dir}}/scripts/zypper-locks.sh", - "{{template_dir}}/scripts/remove-dvd-source.sh", - "{{template_dir}}/scripts/cleanup.sh", - "{{template_dir}}/../_common/minimize.sh" - ], - "type": "shell" - } - ], - "variables": { - "_DOWNLOAD_SITE": "https://www.suse.com/products/server/download", - "_README": "You must download the automated installer iso from the following page, and then place it in the packer_cache dir", - "arch": "64", - "autoinst_cfg": "sles-12-sp3-x86_64-autoinst.xml", - "box_basename": "sles-12-sp3", - "build_directory": "../../builds", - "build_timestamp": "{{isotime \"20060102150405\"}}", - "cpus": "2", - "disk_size": "65536", - "git_revision": "__unknown_git_revision__", - "guest_additions_url": "", - "headless": "", - "http_directory": "{{template_dir}}/http", - "http_proxy": "{{env `http_proxy`}}", - "https_proxy": "{{env `https_proxy`}}", - "iso_checksum": "48408157ef667100671b22f92c3e20771ccf2100108b96e3ae83d8df30abddd5", - "iso_name": "SLE-12-SP3-Server-DVD-x86_64-GM-DVD1.iso", - "memory": "1024", - "mirror": "./packer_cache", - "name": "sles-12-sp3", - "qemu_display": "none", - "template": "sles-12-sp3-x86_64", - "version": "TIMESTAMP" - } -} diff --git a/packer_templates/sles/sles-15-sp1.json b/packer_templates/sles/sles-15-sp1.json deleted file mode 100644 index 7afdd0151..000000000 --- a/packer_templates/sles/sles-15-sp1.json +++ /dev/null @@ -1,222 +0,0 @@ -{ - "builders": [ - { - "boot_command": [ - "<esc><enter><wait>", - "linux netdevice=eth0 netsetup=dhcp install=cd:/<wait>", - " lang=en_US autoyast=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `autoinst_cfg`}}<wait>", - " textmode=1<wait>", - "<enter><wait>" - ], - "boot_wait": "5s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", - "guest_additions_url": "{{ user `guest_additions_url` }}", - "guest_os_type": "OpenSUSE_64", - "hard_drive_interface": "sata", - "headless": "{{ user `headless` }}", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-virtualbox", - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "type": "virtualbox-iso", - "vboxmanage": [ - [ - "storageattach", - "{{.Name}}", - "--storagectl", - "SATA Controller", - "--port", - "1", - "--device", - "0", - "--type", - "dvddrive", - "--medium", - "{{user `mirror`}}/{{user `packages_iso`}}" - ] - ], - "virtualbox_version_file": ".vbox_version", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<esc><enter><wait>", - "linux netdevice=eth0 netsetup=dhcp install=cd:/<wait>", - " lang=en_US autoyast=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `autoinst_cfg`}}<wait>", - " textmode=1<wait>", - "<enter><wait>" - ], - "boot_wait": "5s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "sles12-64", - "headless": "{{ user `headless` }}", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-vmware", - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "tools_upload_flavor": "linux", - "type": "vmware-iso", - "vm_name": "{{ user `template` }}", - "vmx_data": { - "cpuid.coresPerSocket": "1" - }, - "vmx_remove_ethernet_interfaces": true - }, - { - "boot_command": [ - "<esc><enter><wait>", - "linux netdevice=eth0 netsetup=dhcp install=cd:/<wait>", - " lang=en_US autoyast=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `autoinst_cfg`}}<wait>", - " textmode=1<wait>", - "<enter><wait>" - ], - "boot_wait": "5s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "suse", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-parallels", - "parallels_tools_flavor": "lin", - "prlctl_version_file": ".prlctl_version", - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "type": "parallels-iso", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<esc><enter><wait>", - "linux netdevice=eth0 netsetup=dhcp install=cd:/<wait>", - " lang=en_US autoyast=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `autoinst_cfg`}}<wait>", - " textmode=1<wait>", - "<enter><wait>" - ], - "boot_wait": "5s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "headless": "{{ user `headless` }}", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-qemu", - "qemuargs": [ - [ - "-drive", - "file=../../builds/packer-{{user `template`}}-qemu/{{user `template`}},if=virtio,cache=writeback,discard=ignore,format=qcow2" - ], - [ - "-drive", - "file={{user `mirror`}}/{{user `packages_iso`}},format=raw,if=none,id=cdrom1,readonly=on" - ], - [ - "-object", - "iothread,id=iothread1" - ], - [ - "-device", - "virtio-scsi-pci,iothread=iothread1,id=scsi1" - ], - [ - "-device", - "scsi-cd,bus=scsi1.0,drive=cdrom1" - ], - [ - "-m", - "{{ user `memory` }}" - ], - [ - "-display", - "{{ user `qemu_display` }}" - ] - ], - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "type": "qemu", - "vm_name": "{{ user `template` }}" - } - ], - "post-processors": [ - { - "output": "{{ user `build_directory` }}/{{user `box_basename`}}.{{.Provider}}.box", - "type": "vagrant" - } - ], - "provisioners": [ - { - "environment_vars": [ - "HOME_DIR=/home/vagrant", - "http_proxy={{user `http_proxy`}}", - "https_proxy={{user `https_proxy`}}", - "no_proxy={{user `no_proxy`}}" - ], - "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh '{{.Path}}'", - "expect_disconnect": true, - "scripts": [ - "{{template_dir}}/../_common/motd.sh", - "{{template_dir}}/../_common/sshd.sh", - "{{template_dir}}/../_common/vagrant.sh", - "{{template_dir}}/scripts/unsupported-modules.sh", - "{{template_dir}}/../_common/virtualbox.sh", - "{{template_dir}}/../_common/vmware.sh", - "{{template_dir}}/../_common/parallels.sh", - "{{template_dir}}/scripts/sudoers.sh", - "{{template_dir}}/scripts/zypper-locks.sh", - "{{template_dir}}/scripts/remove-dvd-source.sh", - "{{template_dir}}/scripts/cleanup.sh", - "{{template_dir}}/../_common/minimize.sh" - ], - "type": "shell" - } - ], - "variables": { - "_DOWNLOAD_SITE": "https://www.suse.com/products/server/download", - "_README": "You must download the installer (DVD1) and Packages (DVD1) iso from the following page, and then place them in the packer_cache dir", - "arch": "64", - "autoinst_cfg": "sles-15-sp1-x86_64-autoinst.xml", - "box_basename": "sles-15-sp1", - "build_directory": "../../builds", - "build_timestamp": "{{isotime \"20060102150405\"}}", - "cpus": "2", - "disk_size": "65536", - "git_revision": "__unknown_git_revision__", - "guest_additions_url": "", - "headless": "", - "http_directory": "{{template_dir}}/http", - "http_proxy": "{{env `http_proxy`}}", - "https_proxy": "{{env `https_proxy`}}", - "iso_checksum": "5787b180a60a8d52bc42ddb8c51884ca4263f5ed47dc10bb72229a49e8b07497", - "iso_name": "SLE-15-SP1-Installer-DVD-x86_64-GM-DVD1.iso", - "memory": "1024", - "mirror": "./packer_cache", - "name": "sles-15-sp1", - "packages_iso": "SLE-15-SP1-Packages-x86_64-GM-DVD1.iso", - "qemu_display": "none", - "template": "sles-15-sp1-x86_64", - "version": "TIMESTAMP" - } -} diff --git a/packer_templates/sles/sles-15.json b/packer_templates/sles/sles-15.json deleted file mode 100644 index 337bed92b..000000000 --- a/packer_templates/sles/sles-15.json +++ /dev/null @@ -1,222 +0,0 @@ -{ - "builders": [ - { - "boot_command": [ - "<esc><enter><wait>", - "linux netdevice=eth0 netsetup=dhcp install=cd:/<wait>", - " lang=en_US autoyast=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `autoinst_cfg`}}<wait>", - " textmode=1<wait>", - "<enter><wait>" - ], - "boot_wait": "5s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", - "guest_additions_url": "{{ user `guest_additions_url` }}", - "guest_os_type": "OpenSUSE_64", - "hard_drive_interface": "sata", - "headless": "{{ user `headless` }}", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-virtualbox", - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "type": "virtualbox-iso", - "vboxmanage": [ - [ - "storageattach", - "{{.Name}}", - "--storagectl", - "SATA Controller", - "--port", - "1", - "--device", - "0", - "--type", - "dvddrive", - "--medium", - "{{user `mirror`}}/{{user `packages_iso`}}" - ] - ], - "virtualbox_version_file": ".vbox_version", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<esc><enter><wait>", - "linux netdevice=eth0 netsetup=dhcp install=cd:/<wait>", - " lang=en_US autoyast=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `autoinst_cfg`}}<wait>", - " textmode=1<wait>", - "<enter><wait>" - ], - "boot_wait": "5s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "sles12-64", - "headless": "{{ user `headless` }}", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-vmware", - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "tools_upload_flavor": "linux", - "type": "vmware-iso", - "vm_name": "{{ user `template` }}", - "vmx_data": { - "cpuid.coresPerSocket": "1" - }, - "vmx_remove_ethernet_interfaces": true - }, - { - "boot_command": [ - "<esc><enter><wait>", - "linux netdevice=eth0 netsetup=dhcp install=cd:/<wait>", - " lang=en_US autoyast=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `autoinst_cfg`}}<wait>", - " textmode=1<wait>", - "<enter><wait>" - ], - "boot_wait": "5s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "suse", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-parallels", - "parallels_tools_flavor": "lin", - "prlctl_version_file": ".prlctl_version", - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "type": "parallels-iso", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<esc><enter><wait>", - "linux netdevice=eth0 netsetup=dhcp install=cd:/<wait>", - " lang=en_US autoyast=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `autoinst_cfg`}}<wait>", - " textmode=1<wait>", - "<enter><wait>" - ], - "boot_wait": "5s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "headless": "{{ user `headless` }}", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-qemu", - "qemuargs": [ - [ - "-drive", - "file=../../builds/packer-{{user `template`}}-qemu/{{user `template`}},if=virtio,cache=writeback,discard=ignore,format=qcow2" - ], - [ - "-drive", - "file={{user `mirror`}}/{{user `packages_iso`}},format=raw,if=none,id=cdrom1,readonly=on" - ], - [ - "-object", - "iothread,id=iothread1" - ], - [ - "-device", - "virtio-scsi-pci,iothread=iothread1,id=scsi1" - ], - [ - "-device", - "scsi-cd,bus=scsi1.0,drive=cdrom1" - ], - [ - "-m", - "{{ user `memory` }}" - ], - [ - "-display", - "{{ user `qemu_display` }}" - ] - ], - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "type": "qemu", - "vm_name": "{{ user `template` }}" - } - ], - "post-processors": [ - { - "output": "{{ user `build_directory` }}/{{user `box_basename`}}.{{.Provider}}.box", - "type": "vagrant" - } - ], - "provisioners": [ - { - "environment_vars": [ - "HOME_DIR=/home/vagrant", - "http_proxy={{user `http_proxy`}}", - "https_proxy={{user `https_proxy`}}", - "no_proxy={{user `no_proxy`}}" - ], - "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh '{{.Path}}'", - "expect_disconnect": true, - "scripts": [ - "{{template_dir}}/../_common/motd.sh", - "{{template_dir}}/../_common/sshd.sh", - "{{template_dir}}/../_common/vagrant.sh", - "{{template_dir}}/scripts/unsupported-modules.sh", - "{{template_dir}}/../_common/virtualbox.sh", - "{{template_dir}}/../_common/vmware.sh", - "{{template_dir}}/../_common/parallels.sh", - "{{template_dir}}/scripts/sudoers.sh", - "{{template_dir}}/scripts/zypper-locks.sh", - "{{template_dir}}/scripts/remove-dvd-source.sh", - "{{template_dir}}/scripts/cleanup.sh", - "{{template_dir}}/../_common/minimize.sh" - ], - "type": "shell" - } - ], - "variables": { - "_DOWNLOAD_SITE": "https://www.suse.com/products/server/download", - "_README": "You must download the installer (DVD1) and Packages (DVD1) iso from the following page, and then place them in the packer_cache dir", - "arch": "64", - "autoinst_cfg": "sles-15-x86_64-autoinst.xml", - "box_basename": "sles-15", - "build_directory": "../../builds", - "build_timestamp": "{{isotime \"20060102150405\"}}", - "cpus": "2", - "disk_size": "65536", - "git_revision": "__unknown_git_revision__", - "guest_additions_url": "", - "headless": "", - "http_directory": "{{template_dir}}/http", - "http_proxy": "{{env `http_proxy`}}", - "https_proxy": "{{env `https_proxy`}}", - "iso_checksum": "06bd8b78ef0ca6d5ff5000688727953e894805dc3de59060d74441f0fd0539ab", - "iso_name": "SLE-15-Installer-DVD-x86_64-GM-DVD1.iso", - "memory": "1024", - "mirror": "./packer_cache", - "name": "sles-15", - "packages_iso": "SLE-15-Packages-x86_64-GM-DVD1.iso", - "qemu_display": "none", - "template": "sles-15-x86_64", - "version": "TIMESTAMP" - } -} diff --git a/packer_templates/solaris/scripts/vagrant.sh b/packer_templates/solaris/scripts/vagrant.sh deleted file mode 100644 index f59273a70..000000000 --- a/packer_templates/solaris/scripts/vagrant.sh +++ /dev/null @@ -1,19 +0,0 @@ -#!/bin/sh -eux - -# set a default HOME_DIR environment variable if not set -HOME_DIR="${HOME_DIR:-/export/home/vagrant}"; - -pubkey_url="https://raw.githubusercontent.com/hashicorp/vagrant/master/keys/vagrant.pub"; -mkdir -p $HOME_DIR/.ssh; -if command -v wget >/dev/null 2>&1; then - wget --no-check-certificate "$pubkey_url" -O $HOME_DIR/.ssh/authorized_keys; -elif command -v curl >/dev/null 2>&1; then - curl --insecure --location "$pubkey_url" > $HOME_DIR/.ssh/authorized_keys; -elif command -v fetch >/dev/null 2>&1; then - fetch -am -o $HOME_DIR/.ssh/authorized_keys "$pubkey_url"; -else - echo "Cannot download vagrant public key"; - exit 1; -fi -chown -R vagrant $HOME_DIR/.ssh; -chmod -R go-rwsx $HOME_DIR/.ssh; diff --git a/packer_templates/solaris/scripts/vmtools.sh b/packer_templates/solaris/scripts/vmtools.sh deleted file mode 100644 index cefaffb28..000000000 --- a/packer_templates/solaris/scripts/vmtools.sh +++ /dev/null @@ -1,26 +0,0 @@ -#!/bin/bash -eux - -# Add pkgadd auto-answer file -sudo mkdir -p /tmp -sudo chmod 777 /tmp -echo "mail=" > /tmp/nocheck -echo "instance=overwrite" >> /tmp/nocheck -echo "partial=nocheck" >> /tmp/nocheck -echo "runlevel=nocheck" >> /tmp/nocheck -echo "idepend=nocheck" >> /tmp/nocheck -echo "rdepend=nocheck" >> /tmp/nocheck -echo "space=nocheck" >> /tmp/nocheck -echo "setuid=nocheck" >> /tmp/nocheck -echo "conflict=nocheck" >> /tmp/nocheck -echo "action=nocheck" >> /tmp/nocheck -echo "basedir=default" >> /tmp/nocheck - -echo "all" > /tmp/allfiles - -if [ -f /home/vagrant/.vbox_version ]; then - mkdir /tmp/vbox - VER=$(cat /home/vagrant/.vbox_version) - ls - sudo -i pkgadd -a /tmp/nocheck -d /media/VBOXADDITIONS_*/VBoxSolarisAdditions.pkg < /tmp/allfiles -fi - diff --git a/packer_templates/solaris/solaris-11-4-x86.json b/packer_templates/solaris/solaris-11-4-x86.json deleted file mode 100644 index bb1cb3d05..000000000 --- a/packer_templates/solaris/solaris-11-4-x86.json +++ /dev/null @@ -1,146 +0,0 @@ -{ - "builders": [ - { - "boot_command": [ - "e<wait>", - "<down><down><down><down><down><wait>", - "<end><wait>", - "<bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><wait>", - "false<wait>", - "<f10><wait>", - "<wait10><wait10><wait10><wait10><wait10><wait10>", - "<wait10><wait10><wait10><wait10><wait10><wait10>", - "<wait10><wait10><wait10><wait10><wait10><wait10>", - "root<enter><wait><wait>", - "solaris<enter><wait><wait>", - "<wait10>", - "while (true); do sleep 5; test -f /a/etc/sudoers \u0026\u0026 grep -v \"vagrant\" \"/a/etc/sudoers\" 2> /dev/null<wait>", - " \u0026\u0026 echo \"vagrant ALL=(ALL) NOPASSWD: ALL\" >> /a/etc/sudoers \u0026\u0026 break ; done \u0026<enter><wait>", - "<enter>while (true); do grep \"You may wish to reboot\" \"/var/svc/log/application-auto-installer:default.log\" 2> /dev/null<wait>", - " \u0026\u0026 reboot; sleep 10; done \u0026<enter><wait>", - "sleep 5; curl http://{{ .HTTPIP }}:{{ .HTTPPort }}/default.xml -o default.xml;<wait>", - "curl http://{{ .HTTPIP }}:{{ .HTTPPort }}/profile.xml -o profile.xml;<wait>", - "cp default.xml /system/volatile/ai.xml;<wait>", - "mkdir /system/volatile/profile;<wait>", - "cp profile.xml /system/volatile/profile/profile.xml;<wait>", - "svcadm enable svc:/application/auto-installer:default;<wait>", - "<enter><wait10><wait><wait>", - "<enter><wait>", - "tail -f /var/svc/log/application-auto-installer\\:default.log<enter><wait>", - "<leftCtrlOn>r<leftCtrlOff>" - ], - "boot_wait": "5s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "guest_additions_mode": "attach", - "guest_additions_url": "{{ user `guest_additions_url` }}", - "guest_os_type": "Solaris11_64", - "headless": "{{ user `headless` }}", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "sha256:e3a29507e583acbc0b912f371c8f328fea7cb6257d587cbc0a651477a52b0a29", - "iso_url": "{{user `mirror`}}/sol-11_4-ai-x86.iso", - "memory": "{{ user `memory` }}", - "output_directory": "packer-solaris-11.4-x86_64-virtualbox", - "shutdown_command": "echo 'vagrant'|sudo -i init 5", - "shutdown_timeout": "10m", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "type": "virtualbox-iso", - "virtualbox_version_file": ".vbox_version", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "e<wait>", - "<down><down><down><down><down><wait>", - "<end><wait>", - "<bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><wait>", - "false<wait>", - "<f10><wait>", - "<wait10><wait10><wait10><wait10><wait10><wait10>", - "<wait10><wait10><wait10><wait10><wait10><wait10>", - "<wait10><wait10><wait10><wait10><wait10><wait10>", - "root<enter><wait><wait>", - "solaris<enter><wait><wait>", - "<wait10>", - "while (true); do sleep 5; test -f /a/etc/sudoers \u0026\u0026 grep -v \"vagrant\" \"/a/etc/sudoers\" 2> /dev/null<wait>", - " \u0026\u0026 echo \"vagrant ALL=(ALL) NOPASSWD: ALL\" >> /a/etc/sudoers \u0026\u0026 break ; done \u0026<enter><wait>", - "<enter>while (true); do grep \"You may wish to reboot\" \"/var/svc/log/application-auto-installer:default.log\" 2> /dev/null<wait>", - " \u0026\u0026 reboot; sleep 10; done \u0026<enter><wait>", - "sleep 5; curl http://{{ .HTTPIP }}:{{ .HTTPPort }}/default.xml -o default.xml;<wait>", - "curl http://{{ .HTTPIP }}:{{ .HTTPPort }}/profile.xml -o profile.xml;<wait>", - "cp default.xml /system/volatile/ai.xml;<wait>", - "mkdir /system/volatile/profile;<wait>", - "cp profile.xml /system/volatile/profile/profile.xml;<wait>", - "svcadm enable svc:/application/auto-installer:default;<wait>", - "<enter><wait10><wait><wait>", - "<enter><wait>", - "tail -f /var/svc/log/application-auto-installer\\:default.log<enter><wait>" - ], - "boot_wait": "5s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "solaris11-64", - "headless": "{{ user `headless` }}", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "sha256:e3a29507e583acbc0b912f371c8f328fea7cb6257d587cbc0a651477a52b0a29", - "iso_url": "{{user `mirror`}}/sol-11_4-ai-x86.iso", - "memory": "{{ user `memory` }}", - "output_directory": "packer-solaris-11.4-x86_64-vmware", - "shutdown_command": "echo 'vagrant'|sudo -i init 5", - "shutdown_timeout": "10m", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "type": "vmware-iso", - "vm_name": "{{ user `template` }}", - "vmx_data": { - "cpuid.coresPerSocket": "1" - }, - "vmx_remove_ethernet_interfaces": true - } - ], - "post-processors": [ - { - "output": "{{ user `build_directory` }}/{{user `box_basename`}}.{{.Provider}}.box", - "type": "vagrant" - } - ], - "provisioners": [ - { - "environment_vars": [], - "execute_command": "echo 'vagrant'|sudo -S bash {{.Path}}", - "expect_disconnect": true, - "scripts": [ - "{{template_dir}}/scripts/update.sh", - "{{template_dir}}/scripts/vagrant.sh", - "{{template_dir}}/scripts/vmtools.sh", - "{{template_dir}}/scripts/minimize.sh" - ], - "type": "shell" - } - ], - "variables": { - "_DOWNLOAD_SITE": "http://www.oracle.com/technetwork/server-storage/solaris11/downloads/index.html", - "_README": "You must download the automated installer iso from the following page, and then place it in the packer_cache dir", - "arch": "64", - "box_basename": "solaris-11.4", - "build_directory": "../../builds", - "build_timestamp": "{{isotime \"20200222210405\"}}", - "cpus": "2", - "disk_size": "65536", - "git_revision": "__unknown_git_revision__", - "guest_additions_url": "", - "headless": "", - "http_directory": "{{template_dir}}/http", - "memory": "4096", - "mirror": "./packer_cache", - "name": "solaris-11.4", - "qemu_display": "none", - "template": "solaris-11.4-x86", - "version": "TIMESTAMP" - } -} diff --git a/packer_templates/solaris/solaris-11-x86.json b/packer_templates/solaris/solaris-11-x86.json deleted file mode 100644 index a6fcff121..000000000 --- a/packer_templates/solaris/solaris-11-x86.json +++ /dev/null @@ -1,145 +0,0 @@ -{ - "builders": [ - { - "boot_command": [ - "e<wait>", - "<down><down><down><down><down><wait>", - "<end><wait>", - "<bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><wait>", - "false<wait>", - "<f10><wait>", - "<wait10><wait10><wait10><wait10><wait10><wait10>", - "<wait10><wait10><wait10><wait10><wait10><wait10>", - "<wait10><wait10><wait10><wait10><wait10><wait10>", - "root<enter><wait><wait>", - "solaris<enter><wait><wait>", - "<wait10>", - "while (true); do sleep 5; test -f /a/etc/sudoers \u0026\u0026 grep -v \"vagrant\" \"/a/etc/sudoers\" 2> /dev/null<wait>", - " \u0026\u0026 echo \"vagrant ALL=(ALL) NOPASSWD: ALL\" >> /a/etc/sudoers \u0026\u0026 break ; done \u0026<enter><wait>", - "<enter>while (true); do grep \"You may wish to reboot\" \"/var/svc/log/application-auto-installer:default.log\" 2> /dev/null<wait>", - " \u0026\u0026 reboot; sleep 10; done \u0026<enter><wait>", - "sleep 5; curl http://{{ .HTTPIP }}:{{ .HTTPPort }}/default.xml -o default.xml;<wait>", - "curl http://{{ .HTTPIP }}:{{ .HTTPPort }}/profile.xml -o profile.xml;<wait>", - "cp default.xml /system/volatile/ai.xml;<wait>", - "mkdir /system/volatile/profile;<wait>", - "cp profile.xml /system/volatile/profile/profile.xml;<wait>", - "svcadm enable svc:/application/auto-installer:default;<wait>", - "<enter><wait10><wait><wait>", - "<enter><wait>", - "tail -f /var/svc/log/application-auto-installer\\:default.log<enter><wait>" - ], - "boot_wait": "5s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "guest_additions_mode": "attach", - "guest_additions_url": "{{ user `guest_additions_url` }}", - "guest_os_type": "Solaris11_64", - "headless": "{{ user `headless` }}", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "md5:30d9ae857f62938c21307722d031e0dc", - "iso_url": "{{user `mirror`}}/sol-11_3-ai-x86.iso", - "memory": "{{ user `memory` }}", - "output_directory": "packer-solaris-11.3-x86_64-virtualbox", - "shutdown_command": "echo 'vagrant'|sudo -i init 5", - "shutdown_timeout": "10m", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "type": "virtualbox-iso", - "virtualbox_version_file": ".vbox_version", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "e<wait>", - "<down><down><down><down><down><wait>", - "<end><wait>", - "<bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><wait>", - "false<wait>", - "<f10><wait>", - "<wait10><wait10><wait10><wait10><wait10><wait10>", - "<wait10><wait10><wait10><wait10><wait10><wait10>", - "<wait10><wait10><wait10><wait10><wait10><wait10>", - "root<enter><wait><wait>", - "solaris<enter><wait><wait>", - "<wait10>", - "while (true); do sleep 5; test -f /a/etc/sudoers \u0026\u0026 grep -v \"vagrant\" \"/a/etc/sudoers\" 2> /dev/null<wait>", - " \u0026\u0026 echo \"vagrant ALL=(ALL) NOPASSWD: ALL\" >> /a/etc/sudoers \u0026\u0026 break ; done \u0026<enter><wait>", - "<enter>while (true); do grep \"You may wish to reboot\" \"/var/svc/log/application-auto-installer:default.log\" 2> /dev/null<wait>", - " \u0026\u0026 reboot; sleep 10; done \u0026<enter><wait>", - "sleep 5; curl http://{{ .HTTPIP }}:{{ .HTTPPort }}/default.xml -o default.xml;<wait>", - "curl http://{{ .HTTPIP }}:{{ .HTTPPort }}/profile.xml -o profile.xml;<wait>", - "cp default.xml /system/volatile/ai.xml;<wait>", - "mkdir /system/volatile/profile;<wait>", - "cp profile.xml /system/volatile/profile/profile.xml;<wait>", - "svcadm enable svc:/application/auto-installer:default;<wait>", - "<enter><wait10><wait><wait>", - "<enter><wait>", - "tail -f /var/svc/log/application-auto-installer\\:default.log<enter><wait>" - ], - "boot_wait": "5s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "solaris11-64", - "headless": "{{ user `headless` }}", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "md5:30d9ae857f62938c21307722d031e0dc", - "iso_url": "{{user `mirror`}}/sol-11_3-ai-x86.iso", - "memory": "{{ user `memory` }}", - "output_directory": "packer-solaris-11.3-x86_64-vmware", - "shutdown_command": "echo 'vagrant'|sudo -i init 5", - "shutdown_timeout": "10m", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "type": "vmware-iso", - "vm_name": "{{ user `template` }}", - "vmx_data": { - "cpuid.coresPerSocket": "1" - }, - "vmx_remove_ethernet_interfaces": true - } - ], - "post-processors": [ - { - "output": "{{ user `build_directory` }}/{{user `box_basename`}}.{{.Provider}}.box", - "type": "vagrant" - } - ], - "provisioners": [ - { - "environment_vars": [], - "execute_command": "echo 'vagrant'|sudo -S bash {{.Path}}", - "expect_disconnect": true, - "scripts": [ - "{{template_dir}}/scripts/update.sh", - "{{template_dir}}/scripts/vagrant.sh", - "{{template_dir}}/scripts/vmtools.sh", - "{{template_dir}}/scripts/minimize.sh" - ], - "type": "shell" - } - ], - "variables": { - "_DOWNLOAD_SITE": "http://www.oracle.com/technetwork/server-storage/solaris11/downloads/index.html", - "_README": "You must download the automated installer iso from the following page, and then place it in the packer_cache dir", - "arch": "64", - "box_basename": "solaris-11.3", - "build_directory": "../../builds", - "build_timestamp": "{{isotime \"20060102150405\"}}", - "cpus": "2", - "disk_size": "65536", - "git_revision": "__unknown_git_revision__", - "guest_additions_url": "", - "headless": "", - "http_directory": "{{template_dir}}/http", - "memory": "2048", - "mirror": "./packer_cache", - "name": "solaris-11.3", - "qemu_display": "none", - "template": "solaris-11.3-x86", - "version": "TIMESTAMP" - } -} diff --git a/packer_templates/springdalelinux/springdalelinux-7.9-x86_64.json b/packer_templates/springdalelinux/springdalelinux-7.9-x86_64.json deleted file mode 100644 index 340663e48..000000000 --- a/packer_templates/springdalelinux/springdalelinux-7.9-x86_64.json +++ /dev/null @@ -1,196 +0,0 @@ -{ - "builders": [ - { - "boot_command": "{{ user `boot_command` }}", - "boot_wait": "5s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", - "guest_additions_url": "{{ user `guest_additions_url` }}", - "guest_os_type": "RedHat_64", - "hard_drive_interface": "sata", - "headless": "{{ user `headless` }}", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-virtualbox", - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "type": "virtualbox-iso", - "virtualbox_version_file": ".vbox_version", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": "{{ user `boot_command` }}", - "boot_wait": "5s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "centos-64", - "headless": "{{ user `headless` }}", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-vmware", - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", - "ssh_password": "vagrant", - "ssh_port": 22, - "version": 19, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "tools_upload_flavor": "linux", - "type": "vmware-iso", - "vm_name": "{{ user `template` }}", - "vmx_data": { - "cpuid.coresPerSocket": "1" - }, - "vmx_remove_ethernet_interfaces": true - }, - { - "boot_command": "{{user `boot_command`}}", - "boot_wait": "5s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "centos", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-parallels", - "parallels_tools_flavor": "lin", - "prlctl_version_file": ".prlctl_version", - "prlctl": [ - [ - "set", - "{{.Name}}", - "--3d-accelerate", - "off" - ], - [ - "set", - "{{.Name}}", - "--videosize", - "16" - ] - ], - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "type": "parallels-iso", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<wait5><up><wait5><tab> text ks=hd:fd0:/ks.cfg<enter><wait5><esc>" - ], - "boot_wait": "5s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "floppy_files": [ - "{{user `http_directory`}}/{{user `ks_path`}}" - ], - "generation": "{{user `hyperv_generation`}}", - "guest_additions_mode": "disable", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-hyperv", - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "switch_name": "{{ user `hyperv_switch`}}", - "type": "hyperv-iso", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": "{{ user `boot_command` }}", - "boot_wait": "5s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "headless": "{{ user `headless` }}", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-qemu", - "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "type": "qemu", - "vm_name": "{{ user `template` }}", - "qemuargs": [ - [ "-m", "{{ user `memory` }}" ], - [ "-display", "{{ user `qemu_display` }}" ] - ] - } - ], - "post-processors": [ - { - "output": "{{ user `build_directory` }}/{{user `box_basename`}}.{{.Provider}}.box", - "type": "vagrant" - } - ], - "provisioners": [ - { - "environment_vars": [ - "HOME_DIR=/home/vagrant", - "http_proxy={{user `http_proxy`}}", - "https_proxy={{user `https_proxy`}}", - "no_proxy={{user `no_proxy`}}" - ], - "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", - "expect_disconnect": true, - "scripts": [ - "{{template_dir}}/../centos/scripts/update.sh", - "{{template_dir}}/../centos/scripts/networking.sh", - "{{template_dir}}/../_common/motd.sh", - "{{template_dir}}/../_common/sshd.sh", - "{{template_dir}}/../_common/vagrant.sh", - "{{template_dir}}/../_common/virtualbox.sh", - "{{template_dir}}/../_common/vmware.sh", - "{{template_dir}}/../_common/parallels.sh", - "{{template_dir}}/../centos/scripts/cleanup.sh", - "{{template_dir}}/../_common/minimize.sh" - ], - "type": "shell" - } - ], - "variables": { - "box_basename": "springdalelinux-7.9", - "build_directory": "../../builds", - "build_timestamp": "{{isotime \"2019102650405\"}}", - "cpus": "2", - "disk_size": "65536", - "git_revision": "__unknown_git_revision__", - "guest_additions_url": "", - "headless": "", - "http_directory": "{{template_dir}}/../centos/http", - "http_proxy": "{{env `http_proxy`}}", - "https_proxy": "{{env `https_proxy`}}", - "hyperv_generation": "1", - "hyperv_switch": "bento", - "iso_checksum": "f4324776f92ee6f4d8a8fc96ddcb7b346e96a51cbc6eac39b51ac8b485a602ad", - "iso_name": "Springdale%20Linux-7.5-x86_64-DVD.iso", - "ks_path": "7/ks.cfg", - "memory": "1024", - "mirror": "http://springdale.princeton.edu/data/springdale", - "mirror_directory": "7.5/x86_64/iso", - "name": "springdalelinux-7.9", - "no_proxy": "{{env `no_proxy`}}", - "qemu_display": "none", - "template": "springdalelinux-7.9-x86_64", - "boot_command": "<up><wait><tab> inst.text inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>", - "version": "TIMESTAMP" - } -} diff --git a/packer_templates/springdalelinux/springdalelinux-8.5-x86_64.json b/packer_templates/springdalelinux/springdalelinux-8.5-x86_64.json deleted file mode 100644 index e4d3f3f8f..000000000 --- a/packer_templates/springdalelinux/springdalelinux-8.5-x86_64.json +++ /dev/null @@ -1,196 +0,0 @@ -{ - "builders": [ - { - "boot_command": "{{ user `boot_command` }}", - "boot_wait": "5s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", - "guest_additions_url": "{{ user `guest_additions_url` }}", - "guest_os_type": "RedHat_64", - "hard_drive_interface": "sata", - "headless": "{{ user `headless` }}", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-virtualbox", - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "type": "virtualbox-iso", - "virtualbox_version_file": ".vbox_version", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": "{{ user `boot_command` }}", - "boot_wait": "5s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "centos-64", - "headless": "{{ user `headless` }}", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-vmware", - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", - "ssh_password": "vagrant", - "ssh_port": 22, - "version": 19, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "tools_upload_flavor": "linux", - "type": "vmware-iso", - "vm_name": "{{ user `template` }}", - "vmx_data": { - "cpuid.coresPerSocket": "1" - }, - "vmx_remove_ethernet_interfaces": true - }, - { - "boot_command": "{{user `boot_command`}}", - "boot_wait": "5s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "centos", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-parallels", - "parallels_tools_flavor": "lin", - "prlctl_version_file": ".prlctl_version", - "prlctl": [ - [ - "set", - "{{.Name}}", - "--3d-accelerate", - "off" - ], - [ - "set", - "{{.Name}}", - "--videosize", - "16" - ] - ], - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "type": "parallels-iso", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<wait5><up><wait5><tab> text ks=hd:fd0:/ks.cfg<enter><wait5><esc>" - ], - "boot_wait": "5s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "floppy_files": [ - "{{user `http_directory`}}/{{user `ks_path`}}" - ], - "generation": "{{user `hyperv_generation`}}", - "guest_additions_mode": "disable", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-hyperv", - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/halt -h -p", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "switch_name": "{{ user `hyperv_switch`}}", - "type": "hyperv-iso", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": "{{ user `boot_command` }}", - "boot_wait": "5s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "headless": "{{ user `headless` }}", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-qemu", - "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "type": "qemu", - "vm_name": "{{ user `template` }}", - "qemuargs": [ - [ "-m", "{{ user `memory` }}" ], - [ "-display", "{{ user `qemu_display` }}" ] - ] - } - ], - "post-processors": [ - { - "output": "{{ user `build_directory` }}/{{user `box_basename`}}.{{.Provider}}.box", - "type": "vagrant" - } - ], - "provisioners": [ - { - "environment_vars": [ - "HOME_DIR=/home/vagrant", - "http_proxy={{user `http_proxy`}}", - "https_proxy={{user `https_proxy`}}", - "no_proxy={{user `no_proxy`}}" - ], - "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", - "expect_disconnect": true, - "scripts": [ - "{{template_dir}}/../centos/scripts/update.sh", - "{{template_dir}}/../centos/scripts/networking.sh", - "{{template_dir}}/../_common/motd.sh", - "{{template_dir}}/../_common/sshd.sh", - "{{template_dir}}/../_common/vagrant.sh", - "{{template_dir}}/../_common/virtualbox.sh", - "{{template_dir}}/../_common/vmware.sh", - "{{template_dir}}/../_common/parallels.sh", - "{{template_dir}}/../centos/scripts/cleanup.sh", - "{{template_dir}}/../_common/minimize.sh" - ], - "type": "shell" - } - ], - "variables": { - "box_basename": "springdalelinux-8.5", - "build_directory": "../../builds", - "build_timestamp": "{{isotime \"2019102650405\"}}", - "cpus": "2", - "disk_size": "65536", - "git_revision": "__unknown_git_revision__", - "guest_additions_url": "", - "headless": "", - "http_directory": "{{template_dir}}/../springdalelinux/http", - "http_proxy": "{{env `http_proxy`}}", - "https_proxy": "{{env `https_proxy`}}", - "hyperv_generation": "1", - "hyperv_switch": "bento", - "iso_checksum": "7b2b3c20e202bc8b0791e9a09555961dc7ef533cc6e5c6daac980f335a55614f", - "iso_name": "Springdale%20Linux-8.5-x86_64-netinst.iso", - "ks_path": "8-netinst/ks.cfg", - "memory": "1024", - "mirror": "http://springdale.princeton.edu/data/springdale", - "mirror_directory": "8.5/x86_64/iso", - "name": "springdalelinux-8.5", - "no_proxy": "{{env `no_proxy`}}", - "qemu_display": "none", - "template": "springdalelinux-8.5-x86_64", - "boot_command": "<up><wait><tab> inst.text inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>", - "version": "TIMESTAMP" - } -} diff --git a/packer_templates/ubuntu/http/preseed.cfg b/packer_templates/ubuntu/http/preseed.cfg deleted file mode 100644 index 3754cb4ec..000000000 --- a/packer_templates/ubuntu/http/preseed.cfg +++ /dev/null @@ -1,34 +0,0 @@ -choose-mirror-bin mirror/http/proxy string -d-i base-installer/kernel/override-image string linux-server -d-i clock-setup/utc boolean true -d-i clock-setup/utc-auto boolean true -d-i finish-install/reboot_in_progress note -d-i grub-installer/only_debian boolean true -d-i grub-installer/with_other_os boolean true -d-i mirror/country string manual -d-i mirror/http/directory string /ubuntu/ -d-i mirror/http/hostname string archive.ubuntu.com -d-i mirror/http/proxy string -d-i partman-auto-lvm/guided_size string max -d-i partman-auto/choose_recipe select atomic -d-i partman-auto/method string lvm -d-i partman-lvm/confirm boolean true -d-i partman-lvm/confirm_nooverwrite boolean true -d-i partman-lvm/device_remove_lvm boolean true -d-i partman/choose_partition select finish -d-i partman/confirm boolean true -d-i partman/confirm_nooverwrite boolean true -d-i partman/confirm_write_new_label boolean true -d-i passwd/user-fullname string vagrant -d-i passwd/user-uid string 1000 -d-i passwd/user-password password vagrant -d-i passwd/user-password-again password vagrant -d-i passwd/username string vagrant -d-i pkgsel/include string openssh-server cryptsetup libssl-dev libreadline-dev zlib1g-dev linux-source dkms nfs-common linux-headers-$(uname -r) perl cifs-utils software-properties-common rsync ifupdown -d-i pkgsel/install-language-support boolean false -d-i pkgsel/update-policy select none -d-i pkgsel/upgrade select full-upgrade -d-i time/zone string UTC -d-i user-setup/allow-password-weak boolean true -d-i user-setup/encrypt-home boolean false -tasksel tasksel/first multiselect standard, server diff --git a/packer_templates/ubuntu/http/user-data b/packer_templates/ubuntu/http/user-data deleted file mode 100644 index f636fbc61..000000000 --- a/packer_templates/ubuntu/http/user-data +++ /dev/null @@ -1,13 +0,0 @@ -#cloud-config -autoinstall: - version: 1 - identity: - hostname: vagrant - username: vagrant - # Generated via: printf vagrant | mkpasswd -m sha-512 -S vagrant. -s - password: "$6$vagrant.$sd6r0/OKL.FIGZbhanVkrLassSxoPRv1h5lkISsmBONqaLUGVXkEcD22Ddak5W8JSxeU0VFkU/We1Y7o4hVO/1" - early-commands: - # otherwise packer tries to connect and exceed max attempts: - - systemctl stop ssh - ssh: - install-server: true diff --git a/packer_templates/ubuntu/scripts/hyperv.sh b/packer_templates/ubuntu/scripts/hyperv.sh deleted file mode 100755 index 454324408..000000000 --- a/packer_templates/ubuntu/scripts/hyperv.sh +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/sh -eux -ubuntu_version="`lsb_release -r | awk '{print $2}'`"; -major_version="`echo $ubuntu_version | awk -F. '{print $1}'`"; - -case "$PACKER_BUILDER_TYPE" in -hyperv-iso) - echo "installing packaging for hyper-v" - if [ "$major_version" -eq "16" ]; then - apt-get install -y linux-tools-virtual-lts-xenial linux-cloud-tools-virtual-lts-xenial; - else - apt-get -y install linux-image-virtual linux-tools-virtual linux-cloud-tools-virtual; - fi -esac diff --git a/packer_templates/ubuntu/scripts/vagrant.sh b/packer_templates/ubuntu/scripts/vagrant.sh deleted file mode 100644 index 993588e58..000000000 --- a/packer_templates/ubuntu/scripts/vagrant.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/bash -eux - -pubkey_url="https://raw.githubusercontent.com/hashicorp/vagrant/master/keys/vagrant.pub"; -mkdir -p $HOME_DIR/.ssh; -if command -v wget >/dev/null 2>&1; then - wget --no-check-certificate "$pubkey_url" -O $HOME_DIR/.ssh/authorized_keys; -elif command -v curl >/dev/null 2>&1; then - curl --insecure --location "$pubkey_url" > $HOME_DIR/.ssh/authorized_keys; -else - echo "Cannot download vagrant public key"; - exit 1; -fi -chown -R vagrant $HOME_DIR/.ssh; -chmod -R go-rwsx $HOME_DIR/.ssh; diff --git a/packer_templates/ubuntu/ubuntu-16.04-amd64.json b/packer_templates/ubuntu/ubuntu-16.04-amd64.json deleted file mode 100644 index d8af05689..000000000 --- a/packer_templates/ubuntu/ubuntu-16.04-amd64.json +++ /dev/null @@ -1,287 +0,0 @@ -{ - "builders": [ - { - "boot_command": [ - "<enter><wait><f6><esc><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs>", - "<bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs>", - "<bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs>", - "<bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs>", - "/install/vmlinuz<wait>", - " auto<wait>", - " console-setup/ask_detect=false<wait>", - " console-setup/layoutcode=us<wait>", - " console-setup/modelcode=pc105<wait>", - " debconf/frontend=noninteractive<wait>", - " debian-installer=en_US.UTF-8<wait>", - " fb=false<wait>", - " initrd=/install/initrd.gz<wait>", - " kbd-chooser/method=us<wait>", - " keyboard-configuration/layout=USA<wait>", - " keyboard-configuration/variant=USA<wait>", - " locale=en_US.UTF-8<wait>", - " netcfg/get_domain=vm<wait>", - " netcfg/get_hostname=vagrant<wait>", - " grub-installer/bootdev=/dev/sda<wait>", - " noapic<wait>", - " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}}<wait>", - " -- <wait>", - "<enter><wait>" - ], - "boot_wait": "5s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", - "guest_additions_url": "{{ user `guest_additions_url` }}", - "guest_os_type": "Ubuntu_64", - "hard_drive_interface": "sata", - "headless": "{{ user `headless` }}", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-virtualbox", - "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "type": "virtualbox-iso", - "virtualbox_version_file": ".vbox_version", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<enter><wait><f6><esc><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs>", - "<bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs>", - "<bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs>", - "<bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs>", - "/install/vmlinuz<wait>", - " auto<wait>", - " console-setup/ask_detect=false<wait>", - " console-setup/layoutcode=us<wait>", - " console-setup/modelcode=pc105<wait>", - " debconf/frontend=noninteractive<wait>", - " debian-installer=en_US.UTF-8<wait>", - " fb=false<wait>", - " initrd=/install/initrd.gz<wait>", - " kbd-chooser/method=us<wait>", - " keyboard-configuration/layout=USA<wait>", - " keyboard-configuration/variant=USA<wait>", - " locale=en_US.UTF-8<wait>", - " netcfg/get_domain=vm<wait>", - " netcfg/get_hostname=vagrant<wait>", - " grub-installer/bootdev=/dev/sda<wait>", - " noapic<wait>", - " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}}<wait>", - " -- <wait>", - "<enter><wait>" - ], - "boot_wait": "5s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "ubuntu-64", - "headless": "{{ user `headless` }}", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-vmware", - "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "tools_upload_flavor": "linux", - "type": "vmware-iso", - "vm_name": "{{ user `template` }}", - "vmx_data": { - "cpuid.coresPerSocket": "1", - "ethernet0.pciSlotNumber": "32" - }, - "vmx_remove_ethernet_interfaces": true - }, - { - "boot_command": [ - "<enter><wait><f6><esc><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs>", - "<bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs>", - "<bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs>", - "<bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs>", - "/install/vmlinuz<wait>", - " auto<wait>", - " console-setup/ask_detect=false<wait>", - " console-setup/layoutcode=us<wait>", - " console-setup/modelcode=pc105<wait>", - " debconf/frontend=noninteractive<wait>", - " debian-installer=en_US.UTF-8<wait>", - " fb=false<wait>", - " initrd=/install/initrd.gz<wait>", - " kbd-chooser/method=us<wait>", - " keyboard-configuration/layout=USA<wait>", - " keyboard-configuration/variant=USA<wait>", - " locale=en_US.UTF-8<wait>", - " netcfg/get_domain=vm<wait>", - " netcfg/get_hostname=vagrant<wait>", - " grub-installer/bootdev=/dev/sda<wait>", - " noapic<wait>", - " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}}<wait>", - " -- <wait>", - "<enter><wait>" - ], - "boot_wait": "5s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "ubuntu", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-parallels", - "parallels_tools_flavor": "lin", - "prlctl_version_file": ".prlctl_version", - "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "type": "parallels-iso", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<enter><wait><f6><esc><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs>", - "<bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs>", - "<bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs>", - "<bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs>", - "/install/vmlinuz<wait>", - " auto<wait>", - " console-setup/ask_detect=false<wait>", - " console-setup/layoutcode=us<wait>", - " console-setup/modelcode=pc105<wait>", - " debconf/frontend=noninteractive<wait>", - " debian-installer=en_US.UTF-8<wait>", - " fb=false<wait>", - " initrd=/install/initrd.gz<wait>", - " kbd-chooser/method=us<wait>", - " keyboard-configuration/layout=USA<wait>", - " keyboard-configuration/variant=USA<wait>", - " locale=en_US.UTF-8<wait>", - " netcfg/get_domain=vm<wait>", - " netcfg/get_hostname=vagrant<wait>", - " grub-installer/bootdev=/dev/vda<wait>", - " noapic<wait>", - " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}}<wait>", - " -- <wait>", - "<enter><wait>" - ], - "boot_wait": "5s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "headless": "{{ user `headless` }}", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-qemu", - "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "type": "qemu", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<esc><wait10><esc><esc><enter><wait>", - "set gfxpayload=1024x768<enter>", - "linux /install/vmlinuz ", - "preseed/url=http://{{.HTTPIP}}:{{.HTTPPort}}/preseed-hyperv.cfg ", - "debian-installer=en_US auto locale=en_US kbd-chooser/method=us ", - "hostname={{.Name}} ", - "fb=false debconf/frontend=noninteractive ", - "keyboard-configuration/modelcode=SKIP keyboard-configuration/layout=USA ", - "keyboard-configuration/variant=USA console-setup/ask_detect=false <enter>", - "initrd /install/initrd.gz<enter>", - "boot<enter>" - ], - "boot_wait": "5s", - "communicator": "ssh", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "enable_secure_boot": false, - "generation": "{{user `hyperv_generation`}}", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{user `memory`}}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-hyperv", - "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "switch_name": "{{user `hyperv_switch`}}", - "type": "hyperv-iso", - "vm_name": "{{ user `template` }}" - } - ], - "post-processors": [ - { - "output": "{{ user `build_directory` }}/{{user `box_basename`}}.{{.Provider}}.box", - "type": "vagrant" - } - ], - "provisioners": [ - { - "environment_vars": [ - "HOME_DIR=/home/vagrant", - "http_proxy={{user `http_proxy`}}", - "https_proxy={{user `https_proxy`}}", - "no_proxy={{user `no_proxy`}}" - ], - "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", - "expect_disconnect": true, - "scripts": [ - "{{template_dir}}/scripts/update.sh", - "{{template_dir}}/../_common/motd.sh", - "{{template_dir}}/../_common/sshd.sh", - "{{template_dir}}/scripts/networking.sh", - "{{template_dir}}/scripts/sudoers.sh", - "{{template_dir}}/scripts/vagrant.sh", - "{{template_dir}}/../_common/virtualbox.sh", - "{{template_dir}}/scripts/vmware.sh", - "{{template_dir}}/../_common/parallels.sh", - "{{template_dir}}/scripts/hyperv.sh", - "{{template_dir}}/scripts/cleanup.sh", - "{{template_dir}}/../_common/minimize.sh" - ], - "type": "shell" - } - ], - "variables": { - "box_basename": "ubuntu-16.04", - "build_directory": "../../builds", - "build_timestamp": "{{isotime \"20060102150405\"}}", - "cpus": "2", - "disk_size": "65536", - "git_revision": "__unknown_git_revision__", - "guest_additions_url": "", - "headless": "", - "http_directory": "{{template_dir}}/http", - "http_proxy": "{{env `http_proxy`}}", - "https_proxy": "{{env `https_proxy`}}", - "hyperv_generation": "2", - "hyperv_switch": "bento", - "iso_checksum": "b23488689e16cad7a269eb2d3a3bf725d3457ee6b0868e00c8762d3816e25848", - "iso_name": "ubuntu-16.04.7-server-amd64.iso", - "memory": "1024", - "mirror": "http://releases.ubuntu.com", - "mirror_directory": "16.04.7", - "name": "ubuntu-16.04", - "no_proxy": "{{env `no_proxy`}}", - "preseed_path": "preseed.cfg", - "qemu_display": "none", - "template": "ubuntu-16.04-amd64", - "version": "TIMESTAMP" - } -} diff --git a/packer_templates/ubuntu/ubuntu-16.04-i386.json b/packer_templates/ubuntu/ubuntu-16.04-i386.json deleted file mode 100644 index e84a9b2ec..000000000 --- a/packer_templates/ubuntu/ubuntu-16.04-i386.json +++ /dev/null @@ -1,285 +0,0 @@ -{ - "builders": [ - { - "boot_command": [ - "<enter><wait><f6><esc><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs>", - "<bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs>", - "<bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs>", - "<bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs>", - "/install/vmlinuz<wait>", - " auto<wait>", - " console-setup/ask_detect=false<wait>", - " console-setup/layoutcode=us<wait>", - " console-setup/modelcode=pc105<wait>", - " debconf/frontend=noninteractive<wait>", - " debian-installer=en_US.UTF-8<wait>", - " fb=false<wait>", - " initrd=/install/initrd.gz<wait>", - " kbd-chooser/method=us<wait>", - " keyboard-configuration/layout=USA<wait>", - " keyboard-configuration/variant=USA<wait>", - " locale=en_US.UTF-8<wait>", - " netcfg/get_domain=vm<wait>", - " netcfg/get_hostname=vagrant<wait>", - " grub-installer/bootdev=/dev/sda<wait>", - " noapic<wait>", - " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}}<wait>", - " -- <wait>", - "<enter><wait>" - ], - "boot_wait": "5s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", - "guest_additions_url": "{{ user `guest_additions_url` }}", - "guest_os_type": "Ubuntu", - "hard_drive_interface": "sata", - "headless": "{{ user `headless` }}", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-virtualbox", - "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "type": "virtualbox-iso", - "virtualbox_version_file": ".vbox_version", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<enter><wait><f6><esc><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs>", - "<bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs>", - "<bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs>", - "<bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs>", - "/install/vmlinuz<wait>", - " auto<wait>", - " console-setup/ask_detect=false<wait>", - " console-setup/layoutcode=us<wait>", - " console-setup/modelcode=pc105<wait>", - " debconf/frontend=noninteractive<wait>", - " debian-installer=en_US.UTF-8<wait>", - " fb=false<wait>", - " initrd=/install/initrd.gz<wait>", - " kbd-chooser/method=us<wait>", - " keyboard-configuration/layout=USA<wait>", - " keyboard-configuration/variant=USA<wait>", - " locale=en_US.UTF-8<wait>", - " netcfg/get_domain=vm<wait>", - " netcfg/get_hostname=vagrant<wait>", - " grub-installer/bootdev=/dev/sda <wait>", - " noapic<wait>", - " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}}<wait>", - " -- <wait>", - "<enter><wait>" - ], - "boot_wait": "5s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "ubuntu", - "headless": "{{ user `headless` }}", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-vmware", - "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "tools_upload_flavor": "linux", - "type": "vmware-iso", - "vm_name": "{{ user `template` }}", - "vmx_data": { - "cpuid.coresPerSocket": "1" - }, - "vmx_remove_ethernet_interfaces": true - }, - { - "boot_command": [ - "<enter><wait><f6><esc><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs>", - "<bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs>", - "<bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs>", - "<bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs>", - "/install/vmlinuz<wait>", - " auto<wait>", - " console-setup/ask_detect=false<wait>", - " console-setup/layoutcode=us<wait>", - " console-setup/modelcode=pc105<wait>", - " debconf/frontend=noninteractive<wait>", - " debian-installer=en_US.UTF-8<wait>", - " fb=false<wait>", - " initrd=/install/initrd.gz<wait>", - " kbd-chooser/method=us<wait>", - " keyboard-configuration/layout=USA<wait>", - " keyboard-configuration/variant=USA<wait>", - " locale=en_US.UTF-8<wait>", - " netcfg/get_domain=vm<wait>", - " netcfg/get_hostname=vagrant<wait>", - " grub-installer/bootdev=/dev/sda <wait>", - " noapic<wait>", - " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}}<wait>", - " -- <wait>", - "<enter><wait>" - ], - "boot_wait": "5s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "ubuntu", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-parallels", - "parallels_tools_flavor": "lin", - "prlctl_version_file": ".prlctl_version", - "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "type": "parallels-iso", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<enter><wait><f6><esc><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs>", - "<bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs>", - "<bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs>", - "<bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs>", - "/install/vmlinuz<wait>", - " auto<wait>", - " console-setup/ask_detect=false<wait>", - " console-setup/layoutcode=us<wait>", - " console-setup/modelcode=pc105<wait>", - " debconf/frontend=noninteractive<wait>", - " debian-installer=en_US.UTF-8<wait>", - " fb=false<wait>", - " initrd=/install/initrd.gz<wait>", - " kbd-chooser/method=us<wait>", - " keyboard-configuration/layout=USA<wait>", - " keyboard-configuration/variant=USA<wait>", - " locale=en_US.UTF-8<wait>", - " netcfg/get_domain=vm<wait>", - " netcfg/get_hostname=vagrant<wait>", - " grub-installer/bootdev=/dev/vda <wait>", - " noapic<wait>", - " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}}<wait>", - " -- <wait>", - "<enter><wait>" - ], - "boot_wait": "5s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "headless": "{{ user `headless` }}", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-qemu", - "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "type": "qemu", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<esc><wait10><esc><esc><enter><wait>", - "set gfxpayload=1024x768<enter>", - "linux /install/vmlinuz ", - "preseed/url=http://{{.HTTPIP}}:{{.HTTPPort}}/preseed-hyperv.cfg ", - "debian-installer=en_US.UTF-8 auto locale=en_US.UTF-8 kbd-chooser/method=us ", - "hostname={{.Name}} ", - "fb=false debconf/frontend=noninteractive ", - "keyboard-configuration/modelcode=SKIP keyboard-configuration/layout=USA ", - "keyboard-configuration/variant=USA console-setup/ask_detect=false <enter>", - "initrd /install/initrd.gz<enter>", - "boot<enter>" - ], - "boot_wait": "5s", - "communicator": "ssh", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "enable_secure_boot": false, - "generation": "{{user `hyperv_generation`}}", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{user `memory`}}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-hyperv", - "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "switch_name": "{{user `hyperv_switch`}}", - "type": "hyperv-iso", - "vm_name": "{{ user `template` }}" - } - ], - "post-processors": [ - { - "output": "{{ user `build_directory` }}/{{user `box_basename`}}.{{.Provider}}.box", - "type": "vagrant" - } - ], - "provisioners": [ - { - "environment_vars": [ - "HOME_DIR=/home/vagrant", - "http_proxy={{user `http_proxy`}}", - "https_proxy={{user `https_proxy`}}", - "no_proxy={{user `no_proxy`}}" - ], - "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", - "expect_disconnect": true, - "scripts": [ - "{{template_dir}}/scripts/update.sh", - "{{template_dir}}/../_common/motd.sh", - "{{template_dir}}/../_common/sshd.sh", - "{{template_dir}}/scripts/networking.sh", - "{{template_dir}}/scripts/sudoers.sh", - "{{template_dir}}/scripts/vagrant.sh", - "{{template_dir}}/../_common/virtualbox.sh", - "{{template_dir}}/scripts/vmware.sh", - "{{template_dir}}/../_common/parallels.sh", - "{{template_dir}}/scripts/hyperv.sh", - "{{template_dir}}/scripts/cleanup.sh", - "{{template_dir}}/../_common/minimize.sh" - ], - "type": "shell" - } - ], - "variables": { - "box_basename": "ubuntu-16.04-i386", - "build_directory": "../../builds", - "build_timestamp": "{{isotime \"20060102150405\"}}", - "cpus": "2", - "disk_size": "65536", - "git_revision": "__unknown_git_revision__", - "guest_additions_url": "", - "headless": "", - "http_directory": "{{template_dir}}/http", - "http_proxy": "{{env `http_proxy`}}", - "https_proxy": "{{env `https_proxy`}}", - "hyperv_generation": "1", - "hyperv_switch": "bento", - "iso_checksum": "7509cabb2f9f6ba0a95f8454d432be2ef26679d31ce35baa626acc5321460fab", - "iso_name": "ubuntu-16.04.6-server-i386.iso", - "memory": "1024", - "mirror": "http://releases.ubuntu.com", - "mirror_directory": "16.04", - "name": "ubuntu-16.04-i386", - "no_proxy": "{{env `no_proxy`}}", - "preseed_path": "preseed.cfg", - "template": "ubuntu-16.04-i386", - "version": "TIMESTAMP" - } -} diff --git a/packer_templates/ubuntu/ubuntu-18.04-amd64.json b/packer_templates/ubuntu/ubuntu-18.04-amd64.json deleted file mode 100644 index 8f2b3e4a4..000000000 --- a/packer_templates/ubuntu/ubuntu-18.04-amd64.json +++ /dev/null @@ -1,287 +0,0 @@ -{ - "builders": [ - { - "boot_command": [ - "<esc><wait>", - "<esc><wait>", - "<enter><wait>", - "/install/vmlinuz<wait>", - " auto<wait>", - " console-setup/ask_detect=false<wait>", - " console-setup/layoutcode=us<wait>", - " console-setup/modelcode=pc105<wait>", - " debconf/frontend=noninteractive<wait>", - " debian-installer=en_US.UTF-8<wait>", - " fb=false<wait>", - " initrd=/install/initrd.gz<wait>", - " kbd-chooser/method=us<wait>", - " keyboard-configuration/layout=USA<wait>", - " keyboard-configuration/variant=USA<wait>", - " locale=en_US.UTF-8<wait>", - " netcfg/get_domain=vm<wait>", - " netcfg/get_hostname=vagrant<wait>", - " grub-installer/bootdev=/dev/sda<wait>", - " noapic<wait>", - " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}}<wait>", - " -- <wait>", - "<enter><wait>" - ], - "boot_wait": "5s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", - "guest_additions_url": "{{ user `guest_additions_url` }}", - "guest_os_type": "Ubuntu_64", - "hard_drive_interface": "sata", - "headless": "{{ user `headless` }}", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-virtualbox", - "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "type": "virtualbox-iso", - "virtualbox_version_file": ".vbox_version", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<esc><wait>", - "<esc><wait>", - "<enter><wait>", - "/install/vmlinuz<wait>", - " auto<wait>", - " console-setup/ask_detect=false<wait>", - " console-setup/layoutcode=us<wait>", - " console-setup/modelcode=pc105<wait>", - " debconf/frontend=noninteractive<wait>", - " debian-installer=en_US.UTF-8<wait>", - " fb=false<wait>", - " initrd=/install/initrd.gz<wait>", - " kbd-chooser/method=us<wait>", - " keyboard-configuration/layout=USA<wait>", - " keyboard-configuration/variant=USA<wait>", - " locale=en_US.UTF-8<wait>", - " netcfg/get_domain=vm<wait>", - " netcfg/get_hostname=vagrant<wait>", - " grub-installer/bootdev=/dev/sda<wait>", - " noapic<wait>", - " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}}<wait>", - " -- <wait>", - "<enter><wait>" - ], - "boot_wait": "5s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "ubuntu-64", - "headless": "{{ user `headless` }}", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-vmware", - "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "tools_upload_flavor": "linux", - "type": "vmware-iso", - "vm_name": "{{ user `template` }}", - "vmx_data": { - "cpuid.coresPerSocket": "1", - "ethernet0.pciSlotNumber": "32" - }, - "vmx_remove_ethernet_interfaces": true - }, - { - "boot_command": [ - "<esc><wait>", - "<esc><wait>", - "<enter><wait>", - "/install/vmlinuz<wait>", - " auto<wait>", - " console-setup/ask_detect=false<wait>", - " console-setup/layoutcode=us<wait>", - " console-setup/modelcode=pc105<wait>", - " debconf/frontend=noninteractive<wait>", - " debian-installer=en_US.UTF-8<wait>", - " fb=false<wait>", - " initrd=/install/initrd.gz<wait>", - " kbd-chooser/method=us<wait>", - " keyboard-configuration/layout=USA<wait>", - " keyboard-configuration/variant=USA<wait>", - " locale=en_US.UTF-8<wait>", - " netcfg/get_domain=vm<wait>", - " netcfg/get_hostname=vagrant<wait>", - " grub-installer/bootdev=/dev/sda<wait>", - " noapic<wait>", - " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}}<wait>", - " -- <wait>", - "<enter><wait>" - ], - "boot_wait": "5s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "ubuntu", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-parallels", - "parallels_tools_flavor": "lin", - "prlctl_version_file": ".prlctl_version", - "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "type": "parallels-iso", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "<esc><wait>", - "<esc><wait>", - "<enter><wait>", - "/install/vmlinuz<wait>", - " auto<wait>", - " console-setup/ask_detect=false<wait>", - " console-setup/layoutcode=us<wait>", - " console-setup/modelcode=pc105<wait>", - " debconf/frontend=noninteractive<wait>", - " debian-installer=en_US.UTF-8<wait>", - " fb=false<wait>", - " initrd=/install/initrd.gz<wait>", - " kbd-chooser/method=us<wait>", - " keyboard-configuration/layout=USA<wait>", - " keyboard-configuration/variant=USA<wait>", - " locale=en_US.UTF-8<wait>", - " netcfg/get_domain=vm<wait>", - " netcfg/get_hostname=vagrant<wait>", - " grub-installer/bootdev=/dev/vda<wait>", - " noapic<wait>", - " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}}<wait>", - " -- <wait>", - "<enter><wait>" - ], - "boot_wait": "5s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "headless": "{{ user `headless` }}", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-qemu", - "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "type": "qemu", - "vm_name": "{{ user `template` }}", - "qemuargs": [ - [ "-m", "{{ user `memory` }}" ], - [ "-display", "{{ user `qemu_display` }}" ] - ] - }, - { - "boot_command": [ - "<esc><wait10><esc><esc><enter><wait>", - "set gfxpayload=1024x768<enter>", - "linux /install/vmlinuz ", - "preseed/url=http://{{.HTTPIP}}:{{.HTTPPort}}/preseed-hyperv.cfg ", - "debian-installer=en_US.UTF-8 auto locale=en_US.UTF-8 kbd-chooser/method=us ", - "hostname={{.Name}} ", - "fb=false debconf/frontend=noninteractive ", - "keyboard-configuration/modelcode=SKIP keyboard-configuration/layout=USA ", - "keyboard-configuration/variant=USA console-setup/ask_detect=false <enter>", - "initrd /install/initrd.gz<enter>", - "boot<enter>" - ], - "boot_wait": "5s", - "communicator": "ssh", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "enable_secure_boot": false, - "generation": "{{user `hyperv_generation`}}", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{user `memory`}}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-hyperv", - "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "switch_name": "{{user `hyperv_switch`}}", - "type": "hyperv-iso", - "vm_name": "{{ user `template` }}" - } - ], - "post-processors": [ - { - "output": "{{ user `build_directory` }}/{{user `box_basename`}}.{{.Provider}}.box", - "type": "vagrant" - } - ], - "provisioners": [ - { - "environment_vars": [ - "HOME_DIR=/home/vagrant", - "http_proxy={{user `http_proxy`}}", - "https_proxy={{user `https_proxy`}}", - "no_proxy={{user `no_proxy`}}" - ], - "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", - "expect_disconnect": true, - "scripts": [ - "{{template_dir}}/scripts/update.sh", - "{{template_dir}}/../_common/motd.sh", - "{{template_dir}}/../_common/sshd.sh", - "{{template_dir}}/scripts/networking.sh", - "{{template_dir}}/scripts/sudoers.sh", - "{{template_dir}}/scripts/vagrant.sh", - "{{template_dir}}/../_common/virtualbox.sh", - "{{template_dir}}/scripts/vmware.sh", - "{{template_dir}}/../_common/parallels.sh", - "{{template_dir}}/scripts/hyperv.sh", - "{{template_dir}}/scripts/cleanup.sh", - "{{template_dir}}/../_common/minimize.sh" - ], - "type": "shell" - } - ], - "variables": { - "box_basename": "ubuntu-18.04", - "build_directory": "../../builds", - "build_timestamp": "{{isotime \"20060102150405\"}}", - "cpus": "2", - "disk_size": "65536", - "git_revision": "__unknown_git_revision__", - "guest_additions_url": "", - "headless": "", - "http_directory": "{{template_dir}}/http", - "http_proxy": "{{env `http_proxy`}}", - "https_proxy": "{{env `https_proxy`}}", - "hyperv_generation": "2", - "hyperv_switch": "bento", - "iso_checksum": "f5cbb8104348f0097a8e513b10173a07dbc6684595e331cb06f93f385d0aecf6", - "iso_name": "ubuntu-18.04.6-server-amd64.iso", - "memory": "1024", - "mirror": "http://cdimage.ubuntu.com", - "mirror_directory": "ubuntu/releases/18.04.6/release", - "name": "ubuntu-18.04", - "no_proxy": "{{env `no_proxy`}}", - "preseed_path": "preseed.cfg", - "qemu_display": "none", - "template": "ubuntu-18.04-amd64", - "version": "TIMESTAMP" - } -} diff --git a/packer_templates/ubuntu/ubuntu-20.04-amd64.json b/packer_templates/ubuntu/ubuntu-20.04-amd64.json deleted file mode 100644 index 5c510c255..000000000 --- a/packer_templates/ubuntu/ubuntu-20.04-amd64.json +++ /dev/null @@ -1,254 +0,0 @@ -{ - "builders": [ - { - "boot_command": [ - " <wait>", - " <wait>", - " <wait>", - " <wait>", - " <wait>", - "<esc><wait>", - "<f6><wait>", - "<esc><wait>", - "<bs><bs><bs><bs><wait>", - " autoinstall<wait5>", - " ds=nocloud-net<wait5>", - ";s=http://<wait5>{{.HTTPIP}}<wait5>:{{.HTTPPort}}/<wait5>", - " ---<wait5>", - "<enter><wait5>" - ], - "boot_wait": "5s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", - "guest_additions_url": "{{ user `guest_additions_url` }}", - "guest_os_type": "Ubuntu_64", - "hard_drive_interface": "sata", - "headless": "{{ user `headless` }}", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-virtualbox", - "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "type": "virtualbox-iso", - "virtualbox_version_file": ".vbox_version", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - " <wait>", - " <wait>", - " <wait>", - " <wait>", - " <wait>", - "<esc><wait>", - "<f6><wait>", - "<esc><wait>", - "<bs><bs><bs><bs><wait>", - " autoinstall<wait5>", - " ds=nocloud-net<wait5>", - ";s=http://<wait5>{{.HTTPIP}}<wait5>:{{.HTTPPort}}/<wait5>", - " ---<wait5>", - "<enter><wait5>" - ], - "boot_wait": "5s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "ubuntu-64", - "headless": "{{ user `headless` }}", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-vmware", - "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "tools_upload_flavor": "linux", - "type": "vmware-iso", - "vm_name": "{{ user `template` }}", - "vmx_data": { - "cpuid.coresPerSocket": "1", - "ethernet0.pciSlotNumber": "32" - }, - "vmx_remove_ethernet_interfaces": true - }, - { - "boot_command": [ - " <wait>", - " <wait>", - " <wait>", - " <wait>", - " <wait>", - "<esc><wait>", - "<f6><wait>", - "<esc><wait>", - "<bs><bs><bs><bs><wait>", - " autoinstall<wait5>", - " ds=nocloud-net<wait5>", - ";s=http://<wait5>{{.HTTPIP}}<wait5>:{{.HTTPPort}}/<wait5>", - " ---<wait5>", - "<enter><wait5>" - ], - "boot_wait": "5s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "ubuntu", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-parallels", - "parallels_tools_flavor": "lin", - "prlctl_version_file": ".prlctl_version", - "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "type": "parallels-iso", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - " <wait>", - " <wait>", - " <wait>", - " <wait>", - " <wait>", - "<esc><wait>", - "<f6><wait>", - "<esc><wait>", - "<bs><bs><bs><bs><wait>", - " autoinstall<wait5>", - " ds=nocloud-net<wait5>", - ";s=http://<wait5>{{.HTTPIP}}<wait5>:{{.HTTPPort}}/<wait5>", - " ---<wait5>", - "<enter><wait5>" - ], - "boot_wait": "5s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "headless": "{{ user `headless` }}", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-qemu", - "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "type": "qemu", - "vm_name": "{{ user `template` }}", - "qemuargs": [ - [ "-m", "{{ user `memory` }}" ], - [ "-display", "{{ user `qemu_display` }}" ] - ] - }, - { - "boot_command": [ - " <wait>", - " <wait>", - " <wait>", - " <wait>", - " <wait>", - "<esc><wait>", - "<f6><wait>", - "<esc><wait>", - "<bs><bs><bs><bs><wait>", - " autoinstall<wait5>", - " ds=nocloud-net<wait5>", - ";s=http://<wait5>{{.HTTPIP}}<wait5>:{{.HTTPPort}}/<wait5>", - " ---<wait5>", - "<enter><wait5>" - ], - "boot_wait": "5s", - "communicator": "ssh", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "enable_secure_boot": false, - "generation": "{{user `hyperv_generation`}}", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{user `memory`}}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-hyperv", - "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "switch_name": "{{user `hyperv_switch`}}", - "type": "hyperv-iso", - "vm_name": "{{ user `template` }}" - } - ], - "post-processors": [ - { - "output": "{{ user `build_directory` }}/{{user `box_basename`}}.{{.Provider}}.box", - "type": "vagrant" - } - ], - "provisioners": [ - { - "environment_vars": [ - "HOME_DIR=/home/vagrant", - "http_proxy={{user `http_proxy`}}", - "https_proxy={{user `https_proxy`}}", - "no_proxy={{user `no_proxy`}}" - ], - "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", - "expect_disconnect": true, - "scripts": [ - "{{template_dir}}/scripts/update.sh", - "{{template_dir}}/../_common/motd.sh", - "{{template_dir}}/../_common/sshd.sh", - "{{template_dir}}/scripts/networking.sh", - "{{template_dir}}/scripts/sudoers.sh", - "{{template_dir}}/scripts/vagrant.sh", - "{{template_dir}}/../_common/virtualbox.sh", - "{{template_dir}}/scripts/vmware.sh", - "{{template_dir}}/../_common/parallels.sh", - "{{template_dir}}/scripts/hyperv.sh", - "{{template_dir}}/scripts/cleanup.sh", - "{{template_dir}}/../_common/minimize.sh" - ], - "type": "shell" - } - ], - "variables": { - "box_basename": "ubuntu-20.04", - "build_directory": "../../builds", - "build_timestamp": "{{isotime \"20060102150405\"}}", - "cpus": "2", - "disk_size": "65536", - "git_revision": "__unknown_git_revision__", - "guest_additions_url": "", - "headless": "", - "http_directory": "{{template_dir}}/http", - "http_proxy": "{{env `http_proxy`}}", - "https_proxy": "{{env `https_proxy`}}", - "hyperv_generation": "2", - "hyperv_switch": "bento", - "iso_checksum": "sha256:5035be37a7e9abbdc09f0d257f3e33416c1a0fb322ba860d42d74aa75c3468d4", - "iso_name": "ubuntu-20.04.5-live-server-amd64.iso", - "memory": "1024", - "mirror": "https://releases.ubuntu.com", - "mirror_directory": "focal", - "name": "ubuntu-20.04", - "no_proxy": "{{env `no_proxy`}}", - "preseed_path": "preseed.cfg", - "qemu_display": "none", - "template": "ubuntu-20.04-amd64", - "version": "TIMESTAMP" - } -} diff --git a/packer_templates/ubuntu/ubuntu-20.04-arm64.json b/packer_templates/ubuntu/ubuntu-20.04-arm64.json deleted file mode 100644 index 3194cdc99..000000000 --- a/packer_templates/ubuntu/ubuntu-20.04-arm64.json +++ /dev/null @@ -1,92 +0,0 @@ -{ - "builders": [ - { - "boot_command": [ - "<esc>", - "linux /casper/vmlinuz", - " quiet", - " autoinstall", - " ds='nocloud-net;s=http://{{.HTTPIP}}:{{.HTTPPort}}/'", - "<enter>", - "initrd /casper/initrd<enter>", - "boot<enter>" - ], - "boot_wait": "5s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "ubuntu", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-parallels", - "parallels_tools_flavor": "lin-arm", - "prlctl_version_file": ".prlctl_version", - "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "type": "parallels-iso", - "vm_name": "{{ user `template` }}" - } - ], - "post-processors": [ - { - "output": "{{ user `build_directory` }}/{{user `box_basename`}}.{{.Provider}}.box", - "type": "vagrant" - } - ], - "provisioners": [ - { - "environment_vars": [ - "HOME_DIR=/home/vagrant", - "http_proxy={{user `http_proxy`}}", - "https_proxy={{user `https_proxy`}}", - "no_proxy={{user `no_proxy`}}" - ], - "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", - "expect_disconnect": true, - "scripts": [ - "{{template_dir}}/scripts/update.sh", - "{{template_dir}}/../_common/motd.sh", - "{{template_dir}}/../_common/sshd.sh", - "{{template_dir}}/scripts/networking.sh", - "{{template_dir}}/scripts/sudoers.sh", - "{{template_dir}}/scripts/vagrant.sh", - "{{template_dir}}/../_common/virtualbox.sh", - "{{template_dir}}/scripts/vmware.sh", - "{{template_dir}}/../_common/parallels.sh", - "{{template_dir}}/scripts/hyperv.sh", - "{{template_dir}}/scripts/cleanup.sh", - "{{template_dir}}/../_common/minimize.sh" - ], - "type": "shell" - } - ], - "variables": { - "box_basename": "ubuntu-20.04-arm64", - "build_directory": "../../builds", - "build_timestamp": "{{isotime \"20060102150405\"}}", - "cpus": "2", - "disk_size": "65536", - "git_revision": "__unknown_git_revision__", - "guest_additions_url": "", - "headless": "", - "http_directory": "{{template_dir}}/http", - "http_proxy": "{{env `http_proxy`}}", - "https_proxy": "{{env `https_proxy`}}", - "hyperv_generation": "2", - "hyperv_switch": "bento", - "iso_checksum": "sha256:e42d6373dd39173094af5c26cbf2497770426f42049f8b9ea3e60ce35bebdedf", - "iso_name": "ubuntu-20.04.5-live-server-arm64.iso", - "memory": "1024", - "mirror": "http://cdimage.ubuntu.com", - "mirror_directory": "releases/20.04/release", - "name": "ubuntu-20.04-arm64", - "no_proxy": "{{env `no_proxy`}}", - "preseed_path": "preseed.cfg", - "template": "ubuntu-20.04-arm64", - "version": "TIMESTAMP" - } -} diff --git a/packer_templates/ubuntu/ubuntu-20.04-live-amd64.json b/packer_templates/ubuntu/ubuntu-20.04-live-amd64.json deleted file mode 100644 index 6712d2188..000000000 --- a/packer_templates/ubuntu/ubuntu-20.04-live-amd64.json +++ /dev/null @@ -1,254 +0,0 @@ -{ - "builders": [ - { - "boot_command": [ - " <wait>", - " <wait>", - " <wait>", - " <wait>", - " <wait>", - "<esc><wait>", - "<f6><wait>", - "<esc><wait>", - "<bs><bs><bs><bs><wait>", - " autoinstall<wait5>", - " ds=nocloud-net<wait5>", - ";s=http://<wait5>{{.HTTPIP}}<wait5>:{{.HTTPPort}}/<wait5>", - " ---<wait5>", - "<enter><wait5>" - ], - "boot_wait": "5s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", - "guest_additions_url": "{{ user `guest_additions_url` }}", - "guest_os_type": "Ubuntu_64", - "hard_drive_interface": "sata", - "headless": "{{ user `headless` }}", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-virtualbox", - "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "type": "virtualbox-iso", - "virtualbox_version_file": ".vbox_version", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - " <wait>", - " <wait>", - " <wait>", - " <wait>", - " <wait>", - "<esc><wait>", - "<f6><wait>", - "<esc><wait>", - "<bs><bs><bs><bs><wait>", - " autoinstall<wait5>", - " ds=nocloud-net<wait5>", - ";s=http://<wait5>{{.HTTPIP}}<wait5>:{{.HTTPPort}}/<wait5>", - " ---<wait5>", - "<enter><wait5>" - ], - "boot_wait": "5s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "ubuntu-64", - "headless": "{{ user `headless` }}", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-vmware", - "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "tools_upload_flavor": "linux", - "type": "vmware-iso", - "vm_name": "{{ user `template` }}", - "vmx_data": { - "cpuid.coresPerSocket": "1", - "ethernet0.pciSlotNumber": "32" - }, - "vmx_remove_ethernet_interfaces": true - }, - { - "boot_command": [ - " <wait>", - " <wait>", - " <wait>", - " <wait>", - " <wait>", - "<esc><wait>", - "<f6><wait>", - "<esc><wait>", - "<bs><bs><bs><bs><wait>", - " autoinstall<wait5>", - " ds=nocloud-net<wait5>", - ";s=http://<wait5>{{.HTTPIP}}<wait5>:{{.HTTPPort}}/<wait5>", - " ---<wait5>", - "<enter><wait5>" - ], - "boot_wait": "5s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "ubuntu", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-parallels", - "parallels_tools_flavor": "lin", - "prlctl_version_file": ".prlctl_version", - "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "type": "parallels-iso", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - " <wait>", - " <wait>", - " <wait>", - " <wait>", - " <wait>", - "<esc><wait>", - "<f6><wait>", - "<esc><wait>", - "<bs><bs><bs><bs><wait>", - " autoinstall<wait5>", - " ds=nocloud-net<wait5>", - ";s=http://<wait5>{{.HTTPIP}}<wait5>:{{.HTTPPort}}/<wait5>", - " ---<wait5>", - "<enter><wait5>" - ], - "boot_wait": "5s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "headless": "{{ user `headless` }}", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-qemu", - "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "type": "qemu", - "vm_name": "{{ user `template` }}", - "qemuargs": [ - [ "-m", "{{ user `memory` }}" ], - [ "-display", "{{ user `qemu_display` }}" ] - ] - }, - { - "boot_command": [ - " <wait>", - " <wait>", - " <wait>", - " <wait>", - " <wait>", - "<esc><wait>", - "<f6><wait>", - "<esc><wait>", - "<bs><bs><bs><bs><wait>", - " autoinstall<wait5>", - " ds=nocloud-net<wait5>", - ";s=http://<wait5>{{.HTTPIP}}<wait5>:{{.HTTPPort}}/<wait5>", - " ---<wait5>", - "<enter><wait5>" - ], - "boot_wait": "5s", - "communicator": "ssh", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "enable_secure_boot": false, - "generation": "{{user `hyperv_generation`}}", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{user `memory`}}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-hyperv", - "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "switch_name": "{{user `hyperv_switch`}}", - "type": "hyperv-iso", - "vm_name": "{{ user `template` }}" - } - ], - "post-processors": [ - { - "output": "{{ user `build_directory` }}/{{user `box_basename`}}.{{.Provider}}.box", - "type": "vagrant" - } - ], - "provisioners": [ - { - "environment_vars": [ - "HOME_DIR=/home/vagrant", - "http_proxy={{user `http_proxy`}}", - "https_proxy={{user `https_proxy`}}", - "no_proxy={{user `no_proxy`}}" - ], - "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", - "expect_disconnect": true, - "scripts": [ - "{{template_dir}}/scripts/update.sh", - "{{template_dir}}/../_common/motd.sh", - "{{template_dir}}/../_common/sshd.sh", - "{{template_dir}}/scripts/networking.sh", - "{{template_dir}}/scripts/sudoers.sh", - "{{template_dir}}/scripts/vagrant.sh", - "{{template_dir}}/../_common/virtualbox.sh", - "{{template_dir}}/scripts/vmware.sh", - "{{template_dir}}/../_common/parallels.sh", - "{{template_dir}}/scripts/hyperv.sh", - "{{template_dir}}/scripts/cleanup.sh", - "{{template_dir}}/../_common/minimize.sh" - ], - "type": "shell" - } - ], - "variables": { - "box_basename": "ubuntu-20.04-live", - "build_directory": "../../builds", - "build_timestamp": "{{isotime \"20060102150405\"}}", - "cpus": "2", - "disk_size": "65536", - "git_revision": "__unknown_git_revision__", - "guest_additions_url": "", - "headless": "", - "http_directory": "{{template_dir}}/http", - "http_proxy": "{{env `http_proxy`}}", - "https_proxy": "{{env `https_proxy`}}", - "hyperv_generation": "2", - "hyperv_switch": "bento", - "iso_checksum": "28ccdb56450e643bad03bb7bcf7507ce3d8d90e8bf09e38f6bd9ac298a98eaad", - "iso_name": "ubuntu-20.04.4-live-server-amd64.iso", - "memory": "1024", - "mirror": "http://releases.ubuntu.com", - "mirror_directory": "20.04", - "name": "ubuntu-20.04-live", - "no_proxy": "{{env `no_proxy`}}", - "preseed_path": "preseed.cfg", - "qemu_display": "none", - "template": "ubuntu-20.04-live-amd64", - "version": "TIMESTAMP" - } -} diff --git a/packer_templates/ubuntu/ubuntu-22.04-amd64.json b/packer_templates/ubuntu/ubuntu-22.04-amd64.json deleted file mode 100644 index 8453dd11f..000000000 --- a/packer_templates/ubuntu/ubuntu-22.04-amd64.json +++ /dev/null @@ -1,284 +0,0 @@ -{ - "builders": [ - { - "boot_command": [ - " <wait>", - " <wait>", - " <wait>", - " <wait>", - " <wait>", - "c", - "<wait>", - "set gfxpayload=keep", - "<enter><wait>", - "linux /casper/vmlinuz quiet<wait>", - " autoinstall<wait>", - " ds=nocloud-net<wait>", - "\\;s=http://<wait>", - "{{.HTTPIP}}<wait>", - ":{{.HTTPPort}}/<wait>", - " ---", - "<enter><wait>", - "initrd /casper/initrd<wait>", - "<enter><wait>", - "boot<enter><wait>" - ], - "boot_wait": "5s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", - "guest_additions_url": "{{ user `guest_additions_url` }}", - "guest_os_type": "Ubuntu_64", - "hard_drive_interface": "sata", - "headless": "{{ user `headless` }}", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-virtualbox", - "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "type": "virtualbox-iso", - "virtualbox_version_file": ".vbox_version", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - " <wait>", - " <wait>", - " <wait>", - " <wait>", - " <wait>", - "c", - "<wait>", - "set gfxpayload=keep", - "<enter><wait>", - "linux /casper/vmlinuz quiet<wait>", - " autoinstall<wait>", - " ds=nocloud-net<wait>", - "\\;s=http://<wait>", - "{{.HTTPIP}}<wait>", - ":{{.HTTPPort}}/<wait>", - " ---", - "<enter><wait>", - "initrd /casper/initrd<wait>", - "<enter><wait>", - "boot<enter><wait>" - ], - "boot_wait": "5s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "ubuntu-64", - "headless": "{{ user `headless` }}", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-vmware", - "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "tools_upload_flavor": "linux", - "type": "vmware-iso", - "vm_name": "{{ user `template` }}", - "vmx_data": { - "cpuid.coresPerSocket": "1", - "ethernet0.pciSlotNumber": "32" - }, - "vmx_remove_ethernet_interfaces": true - }, - { - "boot_command": [ - " <wait>", - " <wait>", - " <wait>", - " <wait>", - " <wait>", - "c", - "<wait>", - "set gfxpayload=keep", - "<enter><wait>", - "linux /casper/vmlinuz quiet<wait>", - " autoinstall<wait>", - " ds=nocloud-net<wait>", - "\\;s=http://<wait>", - "{{.HTTPIP}}<wait>", - ":{{.HTTPPort}}/<wait>", - " ---", - "<enter><wait>", - "initrd /casper/initrd<wait>", - "<enter><wait>", - "boot<enter><wait>" - ], - "boot_wait": "5s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "ubuntu", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-parallels", - "parallels_tools_flavor": "lin", - "prlctl_version_file": ".prlctl_version", - "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "type": "parallels-iso", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - " <wait>", - " <wait>", - " <wait>", - " <wait>", - " <wait>", - "c", - "<wait>", - "set gfxpayload=keep", - "<enter><wait>", - "linux /casper/vmlinuz quiet<wait>", - " autoinstall<wait>", - " ds=nocloud-net<wait>", - "\\;s=http://<wait>", - "{{.HTTPIP}}<wait>", - ":{{.HTTPPort}}/<wait>", - " ---", - "<enter><wait>", - "initrd /casper/initrd<wait>", - "<enter><wait>", - "boot<enter><wait>" - ], - "boot_wait": "5s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "headless": "{{ user `headless` }}", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-qemu", - "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "type": "qemu", - "vm_name": "{{ user `template` }}", - "qemuargs": [ - [ "-m", "{{ user `memory` }}" ], - [ "-display", "{{ user `qemu_display` }}" ] - ] - }, - { - "boot_command": [ - " <wait>", - " <wait>", - " <wait>", - " <wait>", - " <wait>", - "c", - "<wait>", - "set gfxpayload=keep", - "<enter><wait>", - "linux /casper/vmlinuz quiet<wait>", - " autoinstall<wait>", - " ds=nocloud-net<wait>", - "\\;s=http://<wait>", - "{{.HTTPIP}}<wait>", - ":{{.HTTPPort}}/<wait>", - " ---", - "<enter><wait>", - "initrd /casper/initrd<wait>", - "<enter><wait>", - "boot<enter><wait>" - ], - "boot_wait": "5s", - "communicator": "ssh", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "enable_secure_boot": false, - "generation": "{{user `hyperv_generation`}}", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{user `memory`}}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-hyperv", - "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "switch_name": "{{user `hyperv_switch`}}", - "type": "hyperv-iso", - "vm_name": "{{ user `template` }}" - } - ], - "post-processors": [ - { - "output": "{{ user `build_directory` }}/{{user `box_basename`}}.{{.Provider}}.box", - "type": "vagrant" - } - ], - "provisioners": [ - { - "environment_vars": [ - "HOME_DIR=/home/vagrant", - "http_proxy={{user `http_proxy`}}", - "https_proxy={{user `https_proxy`}}", - "no_proxy={{user `no_proxy`}}" - ], - "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", - "expect_disconnect": true, - "scripts": [ - "{{template_dir}}/scripts/update.sh", - "{{template_dir}}/../_common/motd.sh", - "{{template_dir}}/../_common/sshd.sh", - "{{template_dir}}/scripts/networking.sh", - "{{template_dir}}/scripts/sudoers.sh", - "{{template_dir}}/scripts/vagrant.sh", - "{{template_dir}}/../_common/virtualbox.sh", - "{{template_dir}}/scripts/vmware.sh", - "{{template_dir}}/../_common/parallels.sh", - "{{template_dir}}/scripts/hyperv.sh", - "{{template_dir}}/scripts/cleanup.sh", - "{{template_dir}}/../_common/minimize.sh" - ], - "type": "shell" - } - ], - "variables": { - "box_basename": "ubuntu-22.04", - "build_directory": "../../builds", - "build_timestamp": "{{isotime \"20060102150405\"}}", - "cpus": "2", - "disk_size": "65536", - "git_revision": "__unknown_git_revision__", - "guest_additions_url": "", - "headless": "", - "http_directory": "{{template_dir}}/http", - "http_proxy": "{{env `http_proxy`}}", - "https_proxy": "{{env `https_proxy`}}", - "hyperv_generation": "2", - "hyperv_switch": "bento", - "iso_checksum": "sha256:10f19c5b2b8d6db711582e0e27f5116296c34fe4b313ba45f9b201a5007056cb", - "iso_name": "ubuntu-22.04.1-live-server-amd64.iso", - "memory": "1024", - "mirror": "http://releases.ubuntu.com", - "mirror_directory": "jammy", - "name": "ubuntu-22.04", - "no_proxy": "{{env `no_proxy`}}", - "preseed_path": "preseed.cfg", - "qemu_display": "none", - "template": "ubuntu-22.04-amd64", - "version": "TIMESTAMP" - } -} diff --git a/packer_templates/ubuntu/ubuntu-22.04-arm64.json b/packer_templates/ubuntu/ubuntu-22.04-arm64.json deleted file mode 100644 index 610a9b779..000000000 --- a/packer_templates/ubuntu/ubuntu-22.04-arm64.json +++ /dev/null @@ -1,93 +0,0 @@ -{ - "builders": [ - { - "boot_command": [ - "<wait5>", "c", - "<wait>", "set gfxpayload=keep<enter>", - "<wait>", "linux /casper/vmlinuz", - " quiet", - " autoinstall", - " ds='nocloud-net;s=http://{{.HTTPIP}}:{{.HTTPPort}}/'", - "<enter>", - "initrd /casper/initrd<enter>", - "boot<enter>" - ], - "boot_wait": "5s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "ubuntu", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-parallels", - "parallels_tools_flavor": "lin-arm", - "prlctl_version_file": ".prlctl_version", - "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "type": "parallels-iso", - "vm_name": "{{ user `template` }}" - } - ], - "post-processors": [ - { - "output": "{{ user `build_directory` }}/{{user `box_basename`}}.{{.Provider}}.box", - "type": "vagrant" - } - ], - "provisioners": [ - { - "environment_vars": [ - "HOME_DIR=/home/vagrant", - "http_proxy={{user `http_proxy`}}", - "https_proxy={{user `https_proxy`}}", - "no_proxy={{user `no_proxy`}}" - ], - "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", - "expect_disconnect": true, - "scripts": [ - "{{template_dir}}/scripts/update.sh", - "{{template_dir}}/../_common/motd.sh", - "{{template_dir}}/../_common/sshd.sh", - "{{template_dir}}/scripts/networking.sh", - "{{template_dir}}/scripts/sudoers.sh", - "{{template_dir}}/scripts/vagrant.sh", - "{{template_dir}}/../_common/virtualbox.sh", - "{{template_dir}}/scripts/vmware.sh", - "{{template_dir}}/../_common/parallels.sh", - "{{template_dir}}/scripts/hyperv.sh", - "{{template_dir}}/scripts/cleanup.sh", - "{{template_dir}}/../_common/minimize.sh" - ], - "type": "shell" - } - ], - "variables": { - "box_basename": "ubuntu-22.04-arm64", - "build_directory": "../../builds", - "build_timestamp": "{{isotime \"20060102150405\"}}", - "cpus": "2", - "disk_size": "65536", - "git_revision": "__unknown_git_revision__", - "guest_additions_url": "", - "headless": "", - "http_directory": "{{template_dir}}/http", - "http_proxy": "{{env `http_proxy`}}", - "https_proxy": "{{env `https_proxy`}}", - "hyperv_generation": "2", - "hyperv_switch": "bento", - "iso_checksum": "bc5a8015651c6f8699ab262d333375d3930b824f03d14ae51e551d89d9bb571c", - "iso_name": "ubuntu-22.04.1-live-server-arm64.iso", - "memory": "1024", - "mirror": "http://cdimage.ubuntu.com", - "mirror_directory": "releases/22.04/release", - "name": "ubuntu-22.04-arm64", - "no_proxy": "{{env `no_proxy`}}", - "preseed_path": "preseed.cfg", - "template": "ubuntu-22.04-arm64", - "version": "TIMESTAMP" - } -} diff --git a/packer_templates/ubuntu/ubuntu-22.10-amd64.json b/packer_templates/ubuntu/ubuntu-22.10-amd64.json deleted file mode 100644 index 4d97f4b21..000000000 --- a/packer_templates/ubuntu/ubuntu-22.10-amd64.json +++ /dev/null @@ -1,284 +0,0 @@ -{ - "builders": [ - { - "boot_command": [ - " <wait>", - " <wait>", - " <wait>", - " <wait>", - " <wait>", - "c", - "<wait>", - "set gfxpayload=keep", - "<enter><wait>", - "linux /casper/vmlinuz quiet<wait>", - " autoinstall<wait>", - " ds=nocloud-net<wait>", - "\\;s=http://<wait>", - "{{.HTTPIP}}<wait>", - ":{{.HTTPPort}}/<wait>", - " ---", - "<enter><wait>", - "initrd /casper/initrd<wait>", - "<enter><wait>", - "boot<enter><wait>" - ], - "boot_wait": "5s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", - "guest_additions_url": "{{ user `guest_additions_url` }}", - "guest_os_type": "Ubuntu_64", - "hard_drive_interface": "sata", - "headless": "{{ user `headless` }}", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-virtualbox", - "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "type": "virtualbox-iso", - "virtualbox_version_file": ".vbox_version", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - " <wait>", - " <wait>", - " <wait>", - " <wait>", - " <wait>", - "c", - "<wait>", - "set gfxpayload=keep", - "<enter><wait>", - "linux /casper/vmlinuz quiet<wait>", - " autoinstall<wait>", - " ds=nocloud-net<wait>", - "\\;s=http://<wait>", - "{{.HTTPIP}}<wait>", - ":{{.HTTPPort}}/<wait>", - " ---", - "<enter><wait>", - "initrd /casper/initrd<wait>", - "<enter><wait>", - "boot<enter><wait>" - ], - "boot_wait": "5s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "ubuntu-64", - "headless": "{{ user `headless` }}", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-vmware", - "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "tools_upload_flavor": "linux", - "type": "vmware-iso", - "vm_name": "{{ user `template` }}", - "vmx_data": { - "cpuid.coresPerSocket": "1", - "ethernet0.pciSlotNumber": "32" - }, - "vmx_remove_ethernet_interfaces": true - }, - { - "boot_command": [ - " <wait>", - " <wait>", - " <wait>", - " <wait>", - " <wait>", - "c", - "<wait>", - "set gfxpayload=keep", - "<enter><wait>", - "linux /casper/vmlinuz quiet<wait>", - " autoinstall<wait>", - " ds=nocloud-net<wait>", - "\\;s=http://<wait>", - "{{.HTTPIP}}<wait>", - ":{{.HTTPPort}}/<wait>", - " ---", - "<enter><wait>", - "initrd /casper/initrd<wait>", - "<enter><wait>", - "boot<enter><wait>" - ], - "boot_wait": "5s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "guest_os_type": "ubuntu", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-parallels", - "parallels_tools_flavor": "lin", - "prlctl_version_file": ".prlctl_version", - "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "type": "parallels-iso", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - " <wait>", - " <wait>", - " <wait>", - " <wait>", - " <wait>", - "c", - "<wait>", - "set gfxpayload=keep", - "<enter><wait>", - "linux /casper/vmlinuz quiet<wait>", - " autoinstall<wait>", - " ds=nocloud-net<wait>", - "\\;s=http://<wait>", - "{{.HTTPIP}}<wait>", - ":{{.HTTPPort}}/<wait>", - " ---", - "<enter><wait>", - "initrd /casper/initrd<wait>", - "<enter><wait>", - "boot<enter><wait>" - ], - "boot_wait": "5s", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "headless": "{{ user `headless` }}", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-qemu", - "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "type": "qemu", - "vm_name": "{{ user `template` }}", - "qemuargs": [ - [ "-m", "{{ user `memory` }}" ], - [ "-display", "{{ user `qemu_display` }}" ] - ] - }, - { - "boot_command": [ - " <wait>", - " <wait>", - " <wait>", - " <wait>", - " <wait>", - "c", - "<wait>", - "set gfxpayload=keep", - "<enter><wait>", - "linux /casper/vmlinuz quiet<wait>", - " autoinstall<wait>", - " ds=nocloud-net<wait>", - "\\;s=http://<wait>", - "{{.HTTPIP}}<wait>", - ":{{.HTTPPort}}/<wait>", - " ---", - "<enter><wait>", - "initrd /casper/initrd<wait>", - "<enter><wait>", - "boot<enter><wait>" - ], - "boot_wait": "5s", - "communicator": "ssh", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "enable_secure_boot": false, - "generation": "{{user `hyperv_generation`}}", - "http_directory": "{{user `http_directory`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "memory": "{{user `memory`}}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-hyperv", - "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_timeout": "10000s", - "ssh_username": "vagrant", - "switch_name": "{{user `hyperv_switch`}}", - "type": "hyperv-iso", - "vm_name": "{{ user `template` }}" - } - ], - "post-processors": [ - { - "output": "{{ user `build_directory` }}/{{user `box_basename`}}.{{.Provider}}.box", - "type": "vagrant" - } - ], - "provisioners": [ - { - "environment_vars": [ - "HOME_DIR=/home/vagrant", - "http_proxy={{user `http_proxy`}}", - "https_proxy={{user `https_proxy`}}", - "no_proxy={{user `no_proxy`}}" - ], - "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", - "expect_disconnect": true, - "scripts": [ - "{{template_dir}}/scripts/update.sh", - "{{template_dir}}/../_common/motd.sh", - "{{template_dir}}/../_common/sshd.sh", - "{{template_dir}}/scripts/networking.sh", - "{{template_dir}}/scripts/sudoers.sh", - "{{template_dir}}/scripts/vagrant.sh", - "{{template_dir}}/../_common/virtualbox.sh", - "{{template_dir}}/scripts/vmware.sh", - "{{template_dir}}/../_common/parallels.sh", - "{{template_dir}}/scripts/hyperv.sh", - "{{template_dir}}/scripts/cleanup.sh", - "{{template_dir}}/../_common/minimize.sh" - ], - "type": "shell" - } - ], - "variables": { - "box_basename": "ubuntu-22.10", - "build_directory": "../../builds", - "build_timestamp": "{{isotime \"20060102150405\"}}", - "cpus": "2", - "disk_size": "65536", - "git_revision": "__unknown_git_revision__", - "guest_additions_url": "", - "headless": "", - "http_directory": "{{template_dir}}/http", - "http_proxy": "{{env `http_proxy`}}", - "https_proxy": "{{env `https_proxy`}}", - "hyperv_generation": "2", - "hyperv_switch": "bento", - "iso_checksum": "874452797430a94ca240c95d8503035aa145bd03ef7d84f9b23b78f3c5099aed", - "iso_name": "ubuntu-22.10-live-server-amd64.iso", - "memory": "1024", - "mirror": "http://releases.ubuntu.com", - "mirror_directory": "kinetic", - "name": "ubuntu-22.10", - "no_proxy": "{{env `no_proxy`}}", - "preseed_path": "preseed.cfg", - "qemu_display": "none", - "template": "ubuntu-22.10-amd64", - "version": "TIMESTAMP" - } -} diff --git a/packer_templates/freebsd/vagrantfile_templates/freebsd.rb b/packer_templates/vagrantfile-freebsd.template similarity index 90% rename from packer_templates/freebsd/vagrantfile_templates/freebsd.rb rename to packer_templates/vagrantfile-freebsd.template index 2c1bed2d5..be0e5eb7d 100644 --- a/packer_templates/freebsd/vagrantfile_templates/freebsd.rb +++ b/packer_templates/vagrantfile-freebsd.template @@ -1,4 +1,5 @@ -Vagrant.require_version ">= 1.1.0" +# -*- mode: ruby -*- +# vi: set ft=ruby : Vagrant.configure(2) do |config| config.ssh.shell = "sh" diff --git a/packer_templates/windows/vagrantfile-windows-gen2.template b/packer_templates/vagrantfile-windows-gen2.template similarity index 100% rename from packer_templates/windows/vagrantfile-windows-gen2.template rename to packer_templates/vagrantfile-windows-gen2.template diff --git a/packer_templates/windows/vagrantfile-windows.template b/packer_templates/vagrantfile-windows.template similarity index 92% rename from packer_templates/windows/vagrantfile-windows.template rename to packer_templates/vagrantfile-windows.template index a1b6594af..de22af3cc 100644 --- a/packer_templates/windows/vagrantfile-windows.template +++ b/packer_templates/vagrantfile-windows.template @@ -9,12 +9,12 @@ Vagrant.configure(2) do |config| config.vm.provider "virtualbox" do |vb| vb.gui = true - vb.memory = 1024 + vb.memory = 2048 end config.vm.provider 'hyperv' do |hv| hv.ip_address_timeout = 240 - hv.memory = 1024 + hv.memory = 2048 end config.vm.provider :libvirt do |domain| diff --git a/packer_templates/windows/answer_files/10/Autounattend.xml b/packer_templates/win_answer_files/10/Autounattend.xml similarity index 98% rename from packer_templates/windows/answer_files/10/Autounattend.xml rename to packer_templates/win_answer_files/10/Autounattend.xml index 173416a9a..03669b711 100644 --- a/packer_templates/windows/answer_files/10/Autounattend.xml +++ b/packer_templates/win_answer_files/10/Autounattend.xml @@ -48,10 +48,6 @@ <PathAndCredentials wcm:action="add" wcm:keyValue="11"> <Path>E:\vioserial\w10\amd64</Path> </PathAndCredentials> - - <PathAndCredentials wcm:action="add" wcm:keyValue="12"> - <Path>E:\vioserial\w10\amd64</Path> - </PathAndCredentials> </DriverPaths> </component> <component name="Microsoft-Windows-International-Core-WinPE" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> diff --git a/packer_templates/windows/answer_files/10/gen2_Autounattend.xml b/packer_templates/win_answer_files/10/gen2_Autounattend.xml similarity index 98% rename from packer_templates/windows/answer_files/10/gen2_Autounattend.xml rename to packer_templates/win_answer_files/10/gen2_Autounattend.xml index 52ab86028..d64883c09 100644 --- a/packer_templates/windows/answer_files/10/gen2_Autounattend.xml +++ b/packer_templates/win_answer_files/10/gen2_Autounattend.xml @@ -49,10 +49,6 @@ <PathAndCredentials wcm:action="add" wcm:keyValue="11"> <Path>F:\vioserial\w10\amd64</Path> </PathAndCredentials> - - <PathAndCredentials wcm:action="add" wcm:keyValue="12"> - <Path>F:\vioserial\w10\amd64</Path> - </PathAndCredentials> </DriverPaths> </component> <component name="Microsoft-Windows-International-Core-WinPE" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" @@ -254,4 +250,4 @@ <DoNotOpenInitialConfigurationTasksAtLogon>true</DoNotOpenInitialConfigurationTasksAtLogon> </component> </settings> -</unattend> \ No newline at end of file +</unattend> diff --git a/packer_templates/windows/answer_files/11/Autounattend.xml b/packer_templates/win_answer_files/11/Autounattend.xml similarity index 100% rename from packer_templates/windows/answer_files/11/Autounattend.xml rename to packer_templates/win_answer_files/11/Autounattend.xml diff --git a/packer_templates/windows/answer_files/11/gen2_Autounattend.xml b/packer_templates/win_answer_files/11/gen2_Autounattend.xml similarity index 100% rename from packer_templates/windows/answer_files/11/gen2_Autounattend.xml rename to packer_templates/win_answer_files/11/gen2_Autounattend.xml diff --git a/packer_templates/windows/answer_files/2012/Autounattend.xml b/packer_templates/win_answer_files/2012/Autounattend.xml similarity index 100% rename from packer_templates/windows/answer_files/2012/Autounattend.xml rename to packer_templates/win_answer_files/2012/Autounattend.xml diff --git a/packer_templates/windows/answer_files/2012_r2/Autounattend.xml b/packer_templates/win_answer_files/2012r2/Autounattend.xml similarity index 100% rename from packer_templates/windows/answer_files/2012_r2/Autounattend.xml rename to packer_templates/win_answer_files/2012r2/Autounattend.xml diff --git a/packer_templates/windows/answer_files/2016/Autounattend.xml b/packer_templates/win_answer_files/2016/Autounattend.xml similarity index 100% rename from packer_templates/windows/answer_files/2016/Autounattend.xml rename to packer_templates/win_answer_files/2016/Autounattend.xml diff --git a/packer_templates/windows/answer_files/2019/Autounattend.xml b/packer_templates/win_answer_files/2019/Autounattend.xml similarity index 100% rename from packer_templates/windows/answer_files/2019/Autounattend.xml rename to packer_templates/win_answer_files/2019/Autounattend.xml diff --git a/packer_templates/windows/answer_files/2022/Autounattend.xml b/packer_templates/win_answer_files/2022/Autounattend.xml similarity index 100% rename from packer_templates/windows/answer_files/2022/Autounattend.xml rename to packer_templates/win_answer_files/2022/Autounattend.xml diff --git a/packer_templates/windows/scripts/oracle.cer b/packer_templates/windows/scripts/oracle.cer deleted file mode 100644 index abb6ee6358d80de0ced2d1143b50476430a3cbf6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1419 zcmXqLVr@5QV#!~?%*4pVBoKItVTRb>y$v4~9*DjxZL%}qW#iOp^Jx3d%gD&e%3#pA z#gN;8lZ`o)g-w_#G}utwKorE`66Om_Ey@heOwZF%@XSlrGn6-w1xauVi@_umLW)X@ zOBDQ4OUm<$vJI^bEFlVvLQ;!zixu+I6iSOz6%tDnGD=DcimmkZ%gf94%7CU815MRS z&d=2^Do9k&NY*qoFw`^90cmCyR)w4HoRe5wtYEC*oS%}a0CGrXUb=#jfuVtdv!j8W zIIp3xp^=fX0T@I9xn@8vP{7pE)H2GT@f51Jgbf5i=5q*hIVa|1rsWsqWhTP>$}Y?o zl$uhWpP!--oRMFYT5Kq7APG{<B_iZsl$e~83UotJL4HwUNoIbYp`C#Z#Gj@vndzA& zi8%_ME($Qm>MHnVCKu%w=ckn@1Otik#G+J%FrbwwV9g3;Mut$QaEow-Wfql`CgwQh zSHNs!#%7~I6QdGxv@x<WFgG#sGXTZ8n3@<F8Sb#CpWS8g-K3OjMcd~WA6{j*E%~Oa zZ@r-8r<TH&#aABfs&V?6$WmxkrQdVh?aYc-+0PlQE?!kWytL6ZU*hk%GNIldlP(y1 zxOe(~vS(DOwYfs({f+l*=h&X@{XR!6rq?)QPlsmt{x4Ra{2Sh;6$i5yma81_oAJF< zJ$&Ys#~o8ymSh?0Y8A)-HM+Scy`?RP<=D^Z83L;gdrW&QTGTD-upxZ)shiCDDd*K? z&MY-#eDg48O|NbLmL<=-*Y-}9pSJM7{hUQFUp<`h+(9LxMIuYt_9@TWovVBHo{N`0 znSW?uoP5BxJy#O{rM@<`SjQ_{cXH0N@BCMGgiM)bzRqIf{xz4ynV1<F7#BA&Rs%z% z9GsYCg;|&k7!3G;5hcsd$oQXyg_()H!N38;muImwFgGw=V7$PvO&^prfhjY&IN4Yi zl(uw}i*iuYsB^G0L`n}RW#9rbL4n2A0F>If6WTl&+kUt*vWqhtXc=g*acHvvGZi}% zqnHf7G;bgbGDVez$AAl_g_+r)5XNR?WJxthHc)}_4H(-bpzh31E-pZEo`E%76%!WU zBxWX}DAz~wO=^*WJjfl&ED{D{4I<}fu6$Lk_Qm^TU;p(FtZMHcUs^sFm}xj6eslsl z3K)hg0tRAiTtHv4FgBSpF-o&=7_b2oATWfH6DY7;0VYsJhJ{CX_qnNbZ3^0b(#!PZ z-f#a8WbfTMDbzTnH)D<x+lvYI)AePhT(o9SIl0kp!<`@U@4D0q=B_-zZSeF*W5kKI zr;2VHvOJc&%^tjE)5%9duJ4{Uyk77r_E?I&j_LVG_TPHenhSTw^M>*?oIJhvLs{m| z{^e!vdd3e8dw)bqJq!8Nmc}$w=A+Fln>LN<x#7$2DsuXSMcA2qUv|f&`=?~?!<Q_+ z-&wD2J;45--B8*x?rP0`ms334=RH$a7_aORZ2h(<d&TS{OGJLJ)1TPyUD>hHxLr5= z{h8+mRuQkCvT(G1f4S$&-*?x3Y`WgLUh(6-E2(T7|DIX@V|sqny?IJ;mXD8q1pvu- B@Du<5 diff --git a/packer_templates/windows/windows-10.json b/packer_templates/windows/windows-10.json deleted file mode 100644 index 9ed60c143..000000000 --- a/packer_templates/windows/windows-10.json +++ /dev/null @@ -1,244 +0,0 @@ -{ - "builders": [ - { - "communicator": "winrm", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "floppy_files": [ - "{{ user `floppy_dir` }}/{{ user `unattended_file_path` }}", - "{{template_dir}}/scripts/base_setup.ps1" - ], - "headless": "{{ user `headless` }}", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_url": "{{ user `iso_url` }}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-virtualbox", - "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"", - "shutdown_timeout": "15m", - "switch_name": "{{user `hyperv_switch`}}", - "type": "hyperv-iso", - "winrm_password": "vagrant", - "winrm_timeout": "12h", - "winrm_username": "vagrant" - }, - { - "communicator": "winrm", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "floppy_files": [ - "{{ user `floppy_dir` }}/{{ user `unattended_file_path` }}", - "{{template_dir}}/scripts/base_setup.ps1" - ], - "guest_additions_mode": "{{ user `guest_additions_mode` }}", - "guest_additions_path": "C:/users/vagrant/VBoxGuestAdditions.iso", - "guest_additions_url": "{{ user `guest_additions_url` }}", - "guest_os_type": "Windows10_64", - "hard_drive_interface": "sata", - "headless": "{{ user `headless` }}", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_interface": "ide", - "guest_additions_interface": "sata", - "iso_url": "{{ user `iso_url` }}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-virtualbox", - "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"", - "shutdown_timeout": "15m", - "type": "virtualbox-iso", - "vboxmanage": [ - [ - "modifyvm", - "{{.Name}}", - "--vram", - "48" - ], - [ - "modifyvm", - "{{.Name}}", - "--audio", - "none" - ] - ], - "winrm_password": "vagrant", - "winrm_timeout": "12h", - "winrm_username": "vagrant" - }, - { - "communicator": "winrm", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "floppy_files": [ - "{{ user `floppy_dir` }}/{{ user `unattended_file_path` }}", - "{{template_dir}}/scripts/base_setup.ps1" - ], - "guest_os_type": "win-10", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_url": "{{ user `iso_url` }}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-parallels", - "parallels_tools_flavor": "win", - "parallels_tools_mode": "attach", - "prlctl": [ - [ - "set", - "{{.Name}}", - "--efi-boot", - "off" - ] - ], - "prlctl_version_file": ".prlctl_version", - "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"", - "shutdown_timeout": "15m", - "type": "parallels-iso", - "winrm_password": "vagrant", - "winrm_timeout": "12h", - "winrm_username": "vagrant" - }, - { - "communicator": "winrm", - "cpus": "{{ user `cpus` }}", - "disk_adapter_type": "lsisas1068", - "disk_size": "{{user `disk_size`}}", - "floppy_files": [ - "{{ user `floppy_dir` }}/{{ user `unattended_file_path` }}", - "{{template_dir}}/scripts/base_setup.ps1" - ], - "guest_os_type": "windows9srv-64", - "headless": "{{ user `headless` }}", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_url": "{{ user `iso_url` }}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-vmware", - "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"", - "shutdown_timeout": "15m", - "tools_upload_flavor": "windows", - "tools_upload_path": "c:/Windows/Temp/vmware.iso", - "type": "vmware-iso", - "version": 19, - "winrm_password": "vagrant", - "winrm_timeout": "12h", - "winrm_username": "vagrant" - }, - { - "communicator": "winrm", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "floppy_files": [ - "{{ user `floppy_dir` }}/{{ user `unattended_file_path` }}", - "{{template_dir}}/scripts/base_setup.ps1" - ], - "headless": "{{ user `headless` }}", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_url": "{{ user `iso_url` }}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-qemu", - "qemuargs": [ - [ - "-m", - "{{ user `memory` }}" - ], - [ - "-smp", - "{{ user `cpus` }}" - ], - [ - "-drive", - "file={{ user `virtio_win_iso` }},media=cdrom,index=3" - ], - [ - "-drive", - "file={{ user `build_directory` }}/packer-{{ user `template` }}-qemu/{{ .Name }},if=virtio,cache=writeback,discard=ignore,format=qcow2,index=1" - ], - [ - "-display", - "{{ user `qemu_display` }}" - ] - ], - "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"", - "shutdown_timeout": "15m", - "type": "qemu", - "winrm_password": "vagrant", - "winrm_timeout": "12h", - "winrm_username": "vagrant" - } - ], - "post-processors": [ - [ - { - "keep_input_artifact": true, - "output": "{{ user `build_directory` }}/{{ user `template` }}-{{.Provider}}.box", - "type": "vagrant", - "vagrantfile_template": "{{template_dir}}/vagrantfile-windows.template" - } - ] - ], - "provisioners": [ - { - "cookbook_paths": [ - "{{template_dir}}/cookbooks" - ], - "guest_os_type": "windows", - "run_list": [ - "packer::disable_uac", - "packer::disable_restore", - "packer::disable_windows_update", - "packer::configure_power", - "packer::disable_screensaver" - ], - "type": "chef-solo" - }, - { - "type": "windows-restart" - }, - { - "cookbook_paths": [ - "{{template_dir}}/cookbooks" - ], - "guest_os_type": "windows", - "run_list": [ - "packer::vm_tools", - "packer::features", - "packer::enable_file_sharing", - "packer::enable_remote_desktop", - "packer::ui_tweaks" - ], - "type": "chef-solo" - }, - { - "type": "windows-restart" - }, - { - "cookbook_paths": [ - "{{template_dir}}/cookbooks" - ], - "guest_os_type": "windows", - "run_list": [ - "packer::cleanup", - "packer::defrag" - ], - "type": "chef-solo" - }, - { - "elevated_password": "vagrant", - "elevated_user": "vagrant", - "script": "{{template_dir}}/scripts/cleanup.ps1", - "type": "powershell" - } - ], - "variables": { - "build_directory": "../../builds", - "cpus": "2", - "disk_size": "40000", - "floppy_dir": "{{template_dir}}/answer_files", - "guest_additions_mode": "attach", - "guest_additions_url": "", - "headless": "true", - "hyperv_switch": "bento", - "iso_checksum": "489ebee676e26cdb81377b0e6385c001a22589b8", - "iso_url": "https://software-download.microsoft.com/download/pr/18363.418.191007-0143.19h2_release_svc_refresh_CLIENTENTERPRISEEVAL_OEMRET_x64FRE_en-us.iso", - "memory": "4096", - "qemu_display": "none", - "template": "windows-10", - "unattended_file_path": "10/Autounattend.xml", - "virtio_win_iso": "~/virtio-win.iso" - } -} diff --git a/packer_templates/windows/windows-10gen2.json b/packer_templates/windows/windows-10gen2.json deleted file mode 100644 index 65e61602b..000000000 --- a/packer_templates/windows/windows-10gen2.json +++ /dev/null @@ -1,161 +0,0 @@ -{ - "builders": [ - { - "boot_command": [ - "aaaaaaa" - ], - "boot_wait": "1s", - "communicator": "winrm", - "cpus": "{{user `cpus`}}", - "enable_dynamic_memory": "true", - "enable_secure_boot": false, - "generation": "2", - "headless": "false", - "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", - "iso_url": "{{user `iso_url`}}", - "memory": "{{user `memory`}}", - "output_directory": "c:\\packer-build\\", - "secondary_iso_images": [], - "shutdown_command": "shutdown /s /t 10 /c \"Packer Shutdown\" /f /d p:4:1", - "shutdown_timeout": "15m", - "skip_export": false, - "switch_name": "{{user `hyperv_switch`}}", - "type": "hyperv-iso", - "winrm_password": "vagrant", - "winrm_timeout": "12h", - "winrm_username": "vagrant" - }, - { - "boot_command": [ - "aaaaaaa<wait><enter><wait><enter><wait><enter>" - ], - "communicator": "winrm", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "headless": "{{ user `headless` }}", - "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", - "iso_url": "{{ user `iso_url` }}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-qemu", - "cd_files": "{{ user `cd_files` }}", - "disk_interface": "{{ user `disk_interface` }}", - "qemuargs": [ - [ - "-m", - "{{ user `memory` }}" - ], - [ - "-smp", - "{{ user `cpus` }}" - ], - [ - "-bios", - "{{ user `qemu_bios` }}" - ], - [ - "-display", - "{{ user `qemu_display` }}" - ] - ], - "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"", - "shutdown_timeout": "15m", - "type": "qemu", - "boot_wait": "{{ user `boot_wait` }}", - "winrm_password": "vagrant", - "winrm_timeout": "12h", - "winrm_username": "vagrant" - } - ], - "post-processors": [ - { - "keep_input_artifact": true, - "output": "{{ user `build_directory` }}/{{.Provider}}_windows-10.box", - "type": "vagrant", - "vagrantfile_template": "{{template_dir}}/{{user `template`}}" - } - ], - "provisioners": [ - { - "cookbook_paths": [ - "{{template_dir}}/cookbooks" - ], - "guest_os_type": "windows", - "run_list": [ - "packer::disable_uac", - "packer::disable_restore", - "packer::disable_windows_update", - "packer::configure_power", - "packer::disable_screensaver" - ], - "type": "chef-solo" - }, - { - "type": "windows-restart" - }, - { - "cookbook_paths": [ - "{{template_dir}}/cookbooks" - ], - "guest_os_type": "windows", - "run_list": [ - "packer::vm_tools", - "packer::features", - "packer::enable_file_sharing", - "packer::enable_remote_desktop", - "packer::ui_tweaks" - ], - "type": "chef-solo" - }, - { - "type": "windows-restart" - }, - { - "cookbook_paths": [ - "{{template_dir}}/cookbooks" - ], - "guest_os_type": "windows", - "run_list": [ - "packer::cleanup" - ], - "type": "chef-solo" - }, - { - "elevated_password": "vagrant", - "elevated_user": "vagrant", - "script": "{{template_dir}}/scripts/cleanup.ps1", - "type": "powershell" - } - ], - "variables": { - "autounattend": "Autounattend.xml", - "build_directory": "../../builds", - "build_version": "1", - "cpus": "2", - "disk_size": "61440", - "disk_type_id": "1", - "guest_additions_mode": "upload", - "headless": "false", - "hyperv_switch": "bento", - "iso_checksum": "F57E034095E0423FEB575CA82855F73E39FFA713", - "iso_checksum_type": "sha1", - "iso_url": "https://software-download.microsoft.com/download/pr/19041.264.200511-0456.vb_release_svc_refresh_CLIENTENTERPRISEEVAL_OEMRET_x64FRE_en-us.iso", - "memory": "4096", - "package_location": "", - "restart_timeout": "5m", - "sysprep_unattended": "", - "template": "vagrantfile-windows-gen2.template", - "template_dir": "", - "unattend": "answer_files\\unattend.xml", - "vagrant_sysprep_unattended": "", - "vhv_enable": "false", - "virtio_win_iso": "virtio-win.iso", - "vm_name": "windows_10", - "winrm_timeout": "6h", - "working_directory": "", - "qemu_bios": "/usr/share/OVMF/OVMF_CODE.fd", - "qemu_display": "none", - "disk_interface": "ide", - "boot_wait": "10s", - "cd_files": "{{template_dir}}/answer_files/10/Autounattend.xml" - } -} diff --git a/packer_templates/windows/windows-11.json b/packer_templates/windows/windows-11.json deleted file mode 100644 index e73f27646..000000000 --- a/packer_templates/windows/windows-11.json +++ /dev/null @@ -1,284 +0,0 @@ -{ - "builders": [ - { - "boot_command": [ - "<leftShiftOn><f10><leftShiftOff><wait>", - "reg add HKLM\\SYSTEM\\Setup\\LabConfig /t REG_DWORD /v BypassTPMCheck /d 1<return>", - "reg add HKLM\\SYSTEM\\Setup\\LabConfig /t REG_DWORD /v BypassSecureBootCheck /d 1<return><wait>", - "exit<return>", - "<wait><return>" - ], - "boot_wait": "2m", - "communicator": "winrm", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "floppy_files": [ - "{{ user `floppy_dir` }}/{{ user `unattended_file_path` }}", - "{{template_dir}}/scripts/base_setup.ps1" - ], - "headless": "{{ user `headless` }}", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_url": "{{ user `iso_url` }}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-virtualbox", - "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"", - "shutdown_timeout": "15m", - "switch_name": "{{user `hyperv_switch`}}", - "type": "hyperv-iso", - "winrm_password": "vagrant", - "winrm_timeout": "12h", - "winrm_username": "vagrant" - }, - { - "boot_command": [ - "<leftShiftOn><f10><leftShiftOff><wait>", - "reg add HKLM\\SYSTEM\\Setup\\LabConfig /t REG_DWORD /v BypassTPMCheck /d 1<return>", - "reg add HKLM\\SYSTEM\\Setup\\LabConfig /t REG_DWORD /v BypassSecureBootCheck /d 1<return><wait>", - "exit<return>", - "<wait><return>" - ], - "boot_wait": "2m", - "communicator": "winrm", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "floppy_files": [ - "{{ user `floppy_dir` }}/{{ user `unattended_file_path` }}", - "{{template_dir}}/scripts/base_setup.ps1" - ], - "guest_additions_mode": "{{ user `guest_additions_mode` }}", - "guest_additions_path": "C:/users/vagrant/VBoxGuestAdditions.iso", - "guest_additions_url": "{{ user `guest_additions_url` }}", - "guest_os_type": "Windows11_64", - "hard_drive_interface": "sata", - "headless": "{{ user `headless` }}", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_interface": "ide", - "guest_additions_interface": "sata", - "iso_url": "{{ user `iso_url` }}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-virtualbox", - "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"", - "shutdown_timeout": "15m", - "type": "virtualbox-iso", - "vboxmanage": [ - [ - "modifyvm", - "{{.Name}}", - "--vram", - "48" - ], - [ - "modifyvm", - "{{.Name}}", - "--audio", - "none" - ] - ], - "winrm_password": "vagrant", - "winrm_timeout": "12h", - "winrm_username": "vagrant" - }, - { - "boot_command": [ - "<leftShiftOn><f10><leftShiftOff><wait>", - "reg add HKLM\\SYSTEM\\Setup\\LabConfig /t REG_DWORD /v BypassTPMCheck /d 1<return>", - "reg add HKLM\\SYSTEM\\Setup\\LabConfig /t REG_DWORD /v BypassSecureBootCheck /d 1<return><wait>", - "exit<return>", - "<wait><return>" - ], - "boot_wait": "2m", - "communicator": "winrm", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "floppy_files": [ - "{{ user `floppy_dir` }}/{{ user `unattended_file_path` }}", - "{{template_dir}}/scripts/base_setup.ps1" - ], - "guest_os_type": "win-11", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_url": "{{ user `iso_url` }}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-parallels", - "parallels_tools_flavor": "win", - "parallels_tools_mode": "attach", - "prlctl": [ - [ - "set", - "{{.Name}}", - "--efi-boot", - "off" - ] - ], - "prlctl_version_file": ".prlctl_version", - "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"", - "shutdown_timeout": "15m", - "type": "parallels-iso", - "winrm_password": "vagrant", - "winrm_timeout": "12h", - "winrm_username": "vagrant" - }, - { - "boot_command": [ - "<leftShiftOn><f10><leftShiftOff><wait>", - "reg add HKLM\\SYSTEM\\Setup\\LabConfig /t REG_DWORD /v BypassTPMCheck /d 1<return>", - "reg add HKLM\\SYSTEM\\Setup\\LabConfig /t REG_DWORD /v BypassSecureBootCheck /d 1<return><wait>", - "exit<return>", - "<wait><return>" - ], - "boot_wait": "2m", - "communicator": "winrm", - "cpus": "{{ user `cpus` }}", - "disk_adapter_type": "lsisas1068", - "disk_size": "{{user `disk_size`}}", - "floppy_files": [ - "{{ user `floppy_dir` }}/{{ user `unattended_file_path` }}", - "{{template_dir}}/scripts/base_setup.ps1" - ], - "guest_os_type": "windows9srv-64", - "headless": "{{ user `headless` }}", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_url": "{{ user `iso_url` }}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-vmware", - "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"", - "shutdown_timeout": "15m", - "tools_upload_flavor": "windows", - "tools_upload_path": "c:/Windows/Temp/vmware.iso", - "type": "vmware-iso", - "version": 19, - "winrm_password": "vagrant", - "winrm_timeout": "12h", - "winrm_username": "vagrant" - }, - { - "boot_command": [ - "<leftShiftOn><f10><leftShiftOff><wait>", - "reg add HKLM\\SYSTEM\\Setup\\LabConfig /t REG_DWORD /v BypassTPMCheck /d 1<return>", - "reg add HKLM\\SYSTEM\\Setup\\LabConfig /t REG_DWORD /v BypassSecureBootCheck /d 1<return><wait>", - "exit<return>", - "<wait><return>" - ], - "boot_wait": "2m", - "communicator": "winrm", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "floppy_files": [ - "{{ user `floppy_dir` }}/{{ user `unattended_file_path` }}", - "{{template_dir}}/scripts/base_setup.ps1" - ], - "headless": "{{ user `headless` }}", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_url": "{{ user `iso_url` }}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-qemu", - "qemuargs": [ - [ - "-m", - "{{ user `memory` }}" - ], - [ - "-smp", - "{{ user `cpus` }}" - ], - [ - "-drive", - "file={{ user `virtio_win_iso` }},media=cdrom,index=3" - ], - [ - "-drive", - "file={{ user `build_directory` }}/packer-{{ user `template` }}-qemu/{{ .Name }},if=virtio,cache=writeback,discard=ignore,format=qcow2,index=1" - ], - [ - "-display", - "{{ user `qemu_display` }}" - ] - ], - "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"", - "shutdown_timeout": "15m", - "type": "qemu", - "winrm_password": "vagrant", - "winrm_timeout": "12h", - "winrm_username": "vagrant" - } - ], - "post-processors": [ - [ - { - "keep_input_artifact": true, - "output": "{{ user `build_directory` }}/{{ user `template` }}-{{.Provider}}.box", - "type": "vagrant", - "vagrantfile_template": "{{template_dir}}/vagrantfile-windows.template" - } - ] - ], - "provisioners": [ - { - "cookbook_paths": [ - "{{template_dir}}/cookbooks" - ], - "guest_os_type": "windows", - "run_list": [ - "packer::disable_uac", - "packer::disable_restore", - "packer::disable_windows_update", - "packer::configure_power", - "packer::disable_screensaver" - ], - "type": "chef-solo" - }, - { - "type": "windows-restart" - }, - { - "cookbook_paths": [ - "{{template_dir}}/cookbooks" - ], - "guest_os_type": "windows", - "run_list": [ - "packer::vm_tools", - "packer::features", - "packer::enable_file_sharing", - "packer::enable_remote_desktop", - "packer::ui_tweaks" - ], - "type": "chef-solo" - }, - { - "type": "windows-restart" - }, - { - "cookbook_paths": [ - "{{template_dir}}/cookbooks" - ], - "guest_os_type": "windows", - "run_list": [ - "packer::cleanup", - "packer::defrag" - ], - "type": "chef-solo" - }, - { - "elevated_password": "vagrant", - "elevated_user": "vagrant", - "script": "{{template_dir}}/scripts/cleanup.ps1", - "type": "powershell" - } - ], - "variables": { - "build_directory": "../../builds", - "cpus": "2", - "disk_size": "40000", - "floppy_dir": "{{template_dir}}/answer_files", - "guest_additions_mode": "attach", - "guest_additions_url": "", - "headless": "true", - "hyperv_switch": "bento", - "iso_checksum": "sha256:e8b1d2a1a85a09b4bf6154084a8be8e3c814894a15a7bcf3e8e63fcfa9a528cb", - "iso_url": "https://software-download.microsoft.com/download/sg/22000.194.210913-1444.co_release_svc_refresh_CLIENTENTERPRISEEVAL_OEMRET_x64FRE_en-us.iso", - "memory": "4096", - "qemu_display": "none", - "template": "windows-11", - "unattended_file_path": "11/Autounattend.xml", - "virtio_win_iso": "~/virtio-win.iso" - } -} diff --git a/packer_templates/windows/windows-11gen2.json b/packer_templates/windows/windows-11gen2.json deleted file mode 100644 index 629a527af..000000000 --- a/packer_templates/windows/windows-11gen2.json +++ /dev/null @@ -1,161 +0,0 @@ -{ - "builders": [ - { - "boot_command": [ - "aaaaaaa" - ], - "boot_wait": "1s", - "communicator": "winrm", - "cpus": "{{user `cpus`}}", - "enable_dynamic_memory": "true", - "enable_secure_boot": false, - "generation": "2", - "headless": "false", - "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", - "iso_url": "{{user `iso_url`}}", - "memory": "{{user `memory`}}", - "output_directory": "c:\\packer-build\\", - "secondary_iso_images": [], - "shutdown_command": "shutdown /s /t 10 /c \"Packer Shutdown\" /f /d p:4:1", - "shutdown_timeout": "15m", - "skip_export": false, - "switch_name": "{{user `hyperv_switch`}}", - "type": "hyperv-iso", - "winrm_password": "vagrant", - "winrm_timeout": "12h", - "winrm_username": "vagrant" - }, - { - "boot_command": [ - "aaaaaaa<wait><enter><wait><enter><wait><enter>" - ], - "communicator": "winrm", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "headless": "{{ user `headless` }}", - "iso_checksum": "{{user `iso_checksum_type`}}:{{user `iso_checksum`}}", - "iso_url": "{{ user `iso_url` }}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-qemu", - "cd_files": "{{ user `cd_files` }}", - "disk_interface": "{{ user `disk_interface` }}", - "qemuargs": [ - [ - "-m", - "{{ user `memory` }}" - ], - [ - "-smp", - "{{ user `cpus` }}" - ], - [ - "-bios", - "{{ user `qemu_bios` }}" - ], - [ - "-display", - "{{ user `qemu_display` }}" - ] - ], - "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"", - "shutdown_timeout": "15m", - "type": "qemu", - "boot_wait": "{{ user `boot_wait` }}", - "winrm_password": "vagrant", - "winrm_timeout": "12h", - "winrm_username": "vagrant" - } - ], - "post-processors": [ - { - "keep_input_artifact": true, - "output": "{{ user `build_directory` }}/{{.Provider}}_windows-11.box", - "type": "vagrant", - "vagrantfile_template": "{{template_dir}}/{{user `template`}}" - } - ], - "provisioners": [ - { - "cookbook_paths": [ - "{{template_dir}}/cookbooks" - ], - "guest_os_type": "windows", - "run_list": [ - "packer::disable_uac", - "packer::disable_restore", - "packer::disable_windows_update", - "packer::configure_power", - "packer::disable_screensaver" - ], - "type": "chef-solo" - }, - { - "type": "windows-restart" - }, - { - "cookbook_paths": [ - "{{template_dir}}/cookbooks" - ], - "guest_os_type": "windows", - "run_list": [ - "packer::vm_tools", - "packer::features", - "packer::enable_file_sharing", - "packer::enable_remote_desktop", - "packer::ui_tweaks" - ], - "type": "chef-solo" - }, - { - "type": "windows-restart" - }, - { - "cookbook_paths": [ - "{{template_dir}}/cookbooks" - ], - "guest_os_type": "windows", - "run_list": [ - "packer::cleanup" - ], - "type": "chef-solo" - }, - { - "elevated_password": "vagrant", - "elevated_user": "vagrant", - "script": "{{template_dir}}/scripts/cleanup.ps1", - "type": "powershell" - } - ], - "variables": { - "autounattend": "Autounattend.xml", - "build_directory": "../../builds", - "build_version": "1", - "cpus": "2", - "disk_size": "61440", - "disk_type_id": "1", - "guest_additions_mode": "upload", - "headless": "false", - "hyperv_switch": "bento", - "iso_checksum": "684BC16ADBD792EF2F7810158A3F387F23BF95E1AEE5F16270C5B7F56DB753B6", - "iso_checksum_type": "sha256", - "iso_url": "https://software-static.download.prss.microsoft.com/sg/download/888969d5-f34g-4e03-ac9d-1f9786c66749/22000.318.211104-1236.co_release_svc_refresh_CLIENTENTERPRISEEVAL_OEMRET_x64FRE_en-us.iso", - "memory": "4096", - "package_location": "", - "restart_timeout": "5m", - "sysprep_unattended": "", - "template": "vagrantfile-windows-gen2.template", - "template_dir": "", - "unattend": "answer_files\\unattend.xml", - "vagrant_sysprep_unattended": "", - "vhv_enable": "false", - "virtio_win_iso": "virtio-win.iso", - "vm_name": "windows_11", - "winrm_timeout": "6h", - "working_directory": "", - "qemu_bios": "/usr/share/OVMF/OVMF_CODE.fd", - "qemu_display": "none", - "disk_interface": "ide", - "boot_wait": "10s", - "cd_files": "{{template_dir}}/answer_files/11/gen2_Autounattend.xml" - } -} diff --git a/packer_templates/windows/windows-2012.json b/packer_templates/windows/windows-2012.json deleted file mode 100644 index 7ae82f254..000000000 --- a/packer_templates/windows/windows-2012.json +++ /dev/null @@ -1,238 +0,0 @@ -{ - "builders": [ - { - "communicator": "winrm", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "floppy_files": [ - "{{ user `floppy_dir` }}/{{ user `unattended_file_path` }}" - ], - "headless": "{{ user `headless` }}", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_url": "{{ user `iso_url` }}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-virtualbox", - "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"", - "shutdown_timeout": "15m", - "switch_name": "{{user `hyperv_switch`}}", - "type": "hyperv-iso", - "winrm_password": "vagrant", - "winrm_timeout": "12h", - "winrm_username": "vagrant" - }, - { - "communicator": "winrm", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "floppy_files": [ - "{{ user `floppy_dir` }}/{{ user `unattended_file_path` }}" - ], - "guest_additions_mode": "{{ user `guest_additions_mode` }}", - "guest_additions_path": "C:/users/vagrant/VBoxGuestAdditions.iso", - "guest_additions_url": "{{ user `guest_additions_url` }}", - "guest_os_type": "Windows2012_64", - "hard_drive_interface": "sata", - "headless": "{{ user `headless` }}", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_interface": "ide", - "guest_additions_interface": "sata", - "iso_url": "{{ user `iso_url` }}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-virtualbox", - "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"", - "shutdown_timeout": "15m", - "type": "virtualbox-iso", - "vboxmanage": [ - [ - "modifyvm", - "{{.Name}}", - "--vram", - "48" - ], - [ - "modifyvm", - "{{.Name}}", - "--audio", - "none" - ] - ], - "winrm_password": "vagrant", - "winrm_timeout": "12h", - "winrm_username": "vagrant" - }, - { - "communicator": "winrm", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "floppy_files": [ - "{{ user `floppy_dir` }}/{{ user `unattended_file_path` }}" - ], - "guest_os_type": "win-2012", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_url": "{{ user `iso_url` }}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-parallels", - "parallels_tools_flavor": "win", - "prlctl": [ - [ - "set", - "{{.Name}}", - "--efi-boot", - "off" - ] - ], - "prlctl_version_file": ".prlctl_version", - "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"", - "shutdown_timeout": "15m", - "type": "parallels-iso", - "winrm_password": "vagrant", - "winrm_timeout": "12h", - "winrm_username": "vagrant" - }, - { - "communicator": "winrm", - "cpus": "{{ user `cpus` }}", - "disk_adapter_type": "lsisas1068", - "disk_size": "{{user `disk_size`}}", - "floppy_files": [ - "{{ user `floppy_dir` }}/{{ user `unattended_file_path` }}" - ], - "guest_os_type": "windows9srv-64", - "headless": "{{ user `headless` }}", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_url": "{{ user `iso_url` }}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-vmware", - "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"", - "shutdown_timeout": "15m", - "tools_upload_flavor": "windows", - "tools_upload_path": "c:/Windows/Temp/vmware.iso", - "type": "vmware-iso", - "version": 19, - "winrm_password": "vagrant", - "winrm_timeout": "12h", - "winrm_username": "vagrant" - }, - { - "communicator": "winrm", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "floppy_files": [ - "{{ user `floppy_dir` }}/{{ user `unattended_file_path` }}" - ], - "headless": "{{ user `headless` }}", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_url": "{{ user `iso_url` }}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-qemu", - "qemuargs": [ - [ - "-m", - "{{ user `memory` }}" - ], - [ - "-smp", - "{{ user `cpus` }}" - ], - [ - "-drive", - "file={{ user `virtio_win_iso` }},media=cdrom,index=3" - ], - [ - "-drive", - "file={{ user `build_directory` }}/packer-{{ user `template` }}-qemu/{{ .Name }},if=virtio,cache=writeback,discard=ignore,format=qcow2,index=1" - ], - [ - "-display", - "{{ user `qemu_display` }}" - ] - ], - "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"", - "shutdown_timeout": "15m", - "type": "qemu", - "winrm_password": "vagrant", - "winrm_timeout": "12h", - "winrm_username": "vagrant" - } - ], - "post-processors": [ - [ - { - "keep_input_artifact": true, - "output": "{{ user `build_directory` }}/{{ user `template` }}-{{.Provider}}.box", - "type": "vagrant", - "vagrantfile_template": "{{template_dir}}/vagrantfile-windows.template" - } - ] - ], - "provisioners": [ - { - "cookbook_paths": [ - "{{template_dir}}/cookbooks" - ], - "guest_os_type": "windows", - "run_list": [ - "packer::disable_uac", - "packer::disable_restore", - "packer::disable_windows_update", - "packer::configure_power", - "packer::disable_screensaver" - ], - "type": "chef-solo" - }, - { - "type": "windows-restart" - }, - { - "cookbook_paths": [ - "{{template_dir}}/cookbooks" - ], - "guest_os_type": "windows", - "run_list": [ - "packer::vm_tools", - "packer::features", - "packer::enable_file_sharing", - "packer::enable_remote_desktop", - "packer::ui_tweaks" - ], - "type": "chef-solo" - }, - { - "type": "windows-restart" - }, - { - "cookbook_paths": [ - "{{template_dir}}/cookbooks" - ], - "guest_os_type": "windows", - "run_list": [ - "packer::cleanup", - "packer::defrag" - ], - "type": "chef-solo" - }, - { - "elevated_password": "vagrant", - "elevated_user": "vagrant", - "script": "{{template_dir}}/scripts/cleanup.ps1", - "type": "powershell" - } - ], - "variables": { - "build_directory": "../../builds", - "cpus": "2", - "disk_size": "40000", - "floppy_dir": "{{template_dir}}/answer_files", - "guest_additions_mode": "attach", - "guest_additions_url": "", - "headless": "true", - "hyperv_switch": "bento", - "iso_checksum": "922b365c3360ce630f6a4b4f2f3c79e66165c0fb", - "iso_url": "http://download.microsoft.com/download/6/D/A/6DAB58BA-F939-451D-9101-7DE07DC09C03/9200.16384.WIN8_RTM.120725-1247_X64FRE_SERVER_EVAL_EN-US-HRM_SSS_X64FREE_EN-US_DV5.ISO", - "memory": "4096", - "qemu_display": "none", - "template": "windows-2012-standard", - "unattended_file_path": "2012/Autounattend.xml", - "virtio_win_iso": "~/virtio-win.iso" - } -} diff --git a/packer_templates/windows/windows-2012r2.json b/packer_templates/windows/windows-2012r2.json deleted file mode 100644 index 6ff1a65ba..000000000 --- a/packer_templates/windows/windows-2012r2.json +++ /dev/null @@ -1,238 +0,0 @@ -{ - "builders": [ - { - "communicator": "winrm", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "floppy_files": [ - "{{ user `floppy_dir` }}/{{ user `unattended_file_path` }}" - ], - "headless": "{{ user `headless` }}", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_url": "{{ user `iso_url` }}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-virtualbox", - "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"", - "shutdown_timeout": "15m", - "switch_name": "{{user `hyperv_switch`}}", - "type": "hyperv-iso", - "winrm_password": "vagrant", - "winrm_timeout": "12h", - "winrm_username": "vagrant" - }, - { - "communicator": "winrm", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "floppy_files": [ - "{{ user `floppy_dir` }}/{{ user `unattended_file_path` }}" - ], - "guest_additions_mode": "{{ user `guest_additions_mode` }}", - "guest_additions_path": "C:/users/vagrant/VBoxGuestAdditions.iso", - "guest_additions_url": "{{ user `guest_additions_url` }}", - "guest_os_type": "Windows2012_64", - "hard_drive_interface": "sata", - "headless": "{{ user `headless` }}", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_interface": "ide", - "guest_additions_interface": "sata", - "iso_url": "{{ user `iso_url` }}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-virtualbox", - "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"", - "shutdown_timeout": "15m", - "type": "virtualbox-iso", - "vboxmanage": [ - [ - "modifyvm", - "{{.Name}}", - "--vram", - "48" - ], - [ - "modifyvm", - "{{.Name}}", - "--audio", - "none" - ] - ], - "winrm_password": "vagrant", - "winrm_timeout": "12h", - "winrm_username": "vagrant" - }, - { - "communicator": "winrm", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "floppy_files": [ - "{{ user `floppy_dir` }}/{{ user `unattended_file_path` }}" - ], - "guest_os_type": "win-2012", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_url": "{{ user `iso_url` }}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-parallels", - "parallels_tools_flavor": "win", - "prlctl": [ - [ - "set", - "{{.Name}}", - "--efi-boot", - "off" - ] - ], - "prlctl_version_file": ".prlctl_version", - "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"", - "shutdown_timeout": "15m", - "type": "parallels-iso", - "winrm_password": "vagrant", - "winrm_timeout": "12h", - "winrm_username": "vagrant" - }, - { - "communicator": "winrm", - "cpus": "{{ user `cpus` }}", - "disk_adapter_type": "lsisas1068", - "disk_size": "{{user `disk_size`}}", - "floppy_files": [ - "{{ user `floppy_dir` }}/{{ user `unattended_file_path` }}" - ], - "guest_os_type": "windows9srv-64", - "headless": "{{ user `headless` }}", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_url": "{{ user `iso_url` }}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-vmware", - "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"", - "shutdown_timeout": "15m", - "tools_upload_flavor": "windows", - "tools_upload_path": "c:/Windows/Temp/vmware.iso", - "type": "vmware-iso", - "version": 19, - "winrm_password": "vagrant", - "winrm_timeout": "12h", - "winrm_username": "vagrant" - }, - { - "communicator": "winrm", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "floppy_files": [ - "{{ user `floppy_dir` }}/{{ user `unattended_file_path` }}" - ], - "headless": "{{ user `headless` }}", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_url": "{{ user `iso_url` }}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-qemu", - "qemuargs": [ - [ - "-m", - "{{ user `memory` }}" - ], - [ - "-smp", - "{{ user `cpus` }}" - ], - [ - "-drive", - "file={{ user `virtio_win_iso` }},media=cdrom,index=3" - ], - [ - "-drive", - "file={{ user `build_directory` }}/packer-{{ user `template` }}-qemu/{{ .Name }},if=virtio,cache=writeback,discard=ignore,format=qcow2,index=1" - ], - [ - "-display", - "{{ user `qemu_display` }}" - ] - ], - "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"", - "shutdown_timeout": "15m", - "type": "qemu", - "winrm_password": "vagrant", - "winrm_timeout": "12h", - "winrm_username": "vagrant" - } - ], - "post-processors": [ - [ - { - "keep_input_artifact": true, - "output": "{{ user `build_directory` }}/{{ user `template` }}-{{.Provider}}.box", - "type": "vagrant", - "vagrantfile_template": "{{template_dir}}/vagrantfile-windows.template" - } - ] - ], - "provisioners": [ - { - "cookbook_paths": [ - "{{template_dir}}/cookbooks" - ], - "guest_os_type": "windows", - "run_list": [ - "packer::disable_uac", - "packer::disable_restore", - "packer::disable_windows_update", - "packer::configure_power", - "packer::disable_screensaver" - ], - "type": "chef-solo" - }, - { - "type": "windows-restart" - }, - { - "cookbook_paths": [ - "{{template_dir}}/cookbooks" - ], - "guest_os_type": "windows", - "run_list": [ - "packer::vm_tools", - "packer::features", - "packer::enable_file_sharing", - "packer::enable_remote_desktop", - "packer::ui_tweaks" - ], - "type": "chef-solo" - }, - { - "type": "windows-restart" - }, - { - "cookbook_paths": [ - "{{template_dir}}/cookbooks" - ], - "guest_os_type": "windows", - "run_list": [ - "packer::cleanup", - "packer::defrag" - ], - "type": "chef-solo" - }, - { - "elevated_password": "vagrant", - "elevated_user": "vagrant", - "script": "{{template_dir}}/scripts/cleanup.ps1", - "type": "powershell" - } - ], - "variables": { - "build_directory": "../../builds", - "cpus": "2", - "disk_size": "40000", - "floppy_dir": "{{template_dir}}/answer_files", - "guest_additions_mode": "attach", - "guest_additions_url": "", - "headless": "true", - "hyperv_switch": "bento", - "iso_checksum": "849734f37346385dac2c101e4aacba4626bb141c", - "iso_url": "http://download.microsoft.com/download/6/2/A/62A76ABB-9990-4EFC-A4FE-C7D698DAEB96/9600.17050.WINBLUE_REFRESH.140317-1640_X64FRE_SERVER_EVAL_EN-US-IR3_SSS_X64FREE_EN-US_DV9.ISO", - "memory": "4096", - "qemu_display": "none", - "template": "windows-2012r2-standard", - "unattended_file_path": "2012_r2/Autounattend.xml", - "virtio_win_iso": "~/virtio-win.iso" - } -} diff --git a/packer_templates/windows/windows-2016.json b/packer_templates/windows/windows-2016.json deleted file mode 100644 index b65e66059..000000000 --- a/packer_templates/windows/windows-2016.json +++ /dev/null @@ -1,238 +0,0 @@ -{ - "builders": [ - { - "communicator": "winrm", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "floppy_files": [ - "{{ user `floppy_dir` }}/{{ user `unattended_file_path` }}" - ], - "headless": "{{ user `headless` }}", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_url": "{{ user `iso_url` }}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-virtualbox", - "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"", - "shutdown_timeout": "15m", - "switch_name": "{{user `hyperv_switch`}}", - "type": "hyperv-iso", - "winrm_password": "vagrant", - "winrm_timeout": "12h", - "winrm_username": "vagrant" - }, - { - "communicator": "winrm", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "floppy_files": [ - "{{ user `floppy_dir` }}/{{ user `unattended_file_path` }}" - ], - "guest_additions_mode": "{{ user `guest_additions_mode` }}", - "guest_additions_path": "C:/users/vagrant/VBoxGuestAdditions.iso", - "guest_additions_url": "{{ user `guest_additions_url` }}", - "guest_os_type": "Windows2016_64", - "hard_drive_interface": "sata", - "headless": "{{ user `headless` }}", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_interface": "ide", - "guest_additions_interface": "sata", - "iso_url": "{{ user `iso_url` }}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-virtualbox", - "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"", - "shutdown_timeout": "15m", - "type": "virtualbox-iso", - "vboxmanage": [ - [ - "modifyvm", - "{{.Name}}", - "--vram", - "48" - ], - [ - "modifyvm", - "{{.Name}}", - "--audio", - "none" - ] - ], - "winrm_password": "vagrant", - "winrm_timeout": "12h", - "winrm_username": "vagrant" - }, - { - "communicator": "winrm", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "floppy_files": [ - "{{ user `floppy_dir` }}/{{ user `unattended_file_path` }}" - ], - "guest_os_type": "win-2016", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_url": "{{ user `iso_url` }}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-parallels", - "parallels_tools_flavor": "win", - "prlctl": [ - [ - "set", - "{{.Name}}", - "--efi-boot", - "off" - ] - ], - "prlctl_version_file": ".prlctl_version", - "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"", - "shutdown_timeout": "15m", - "type": "parallels-iso", - "winrm_password": "vagrant", - "winrm_timeout": "12h", - "winrm_username": "vagrant" - }, - { - "communicator": "winrm", - "cpus": "{{ user `cpus` }}", - "disk_adapter_type": "lsisas1068", - "disk_size": "{{user `disk_size`}}", - "floppy_files": [ - "{{ user `floppy_dir` }}/{{ user `unattended_file_path` }}" - ], - "guest_os_type": "windows9srv-64", - "headless": "{{ user `headless` }}", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_url": "{{ user `iso_url` }}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-vmware", - "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"", - "shutdown_timeout": "15m", - "tools_upload_flavor": "windows", - "tools_upload_path": "c:/Windows/Temp/vmware.iso", - "type": "vmware-iso", - "version": 19, - "winrm_password": "vagrant", - "winrm_timeout": "12h", - "winrm_username": "vagrant" - }, - { - "communicator": "winrm", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "floppy_files": [ - "{{ user `floppy_dir` }}/{{ user `unattended_file_path` }}" - ], - "headless": "{{ user `headless` }}", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_url": "{{ user `iso_url` }}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-qemu", - "qemuargs": [ - [ - "-m", - "{{ user `memory` }}" - ], - [ - "-smp", - "{{ user `cpus` }}" - ], - [ - "-drive", - "file={{ user `virtio_win_iso` }},media=cdrom,index=3" - ], - [ - "-drive", - "file={{ user `build_directory` }}/packer-{{ user `template` }}-qemu/{{ .Name }},if=virtio,cache=writeback,discard=ignore,format=qcow2,index=1" - ], - [ - "-display", - "{{ user `qemu_display` }}" - ] - ], - "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"", - "shutdown_timeout": "15m", - "type": "qemu", - "winrm_password": "vagrant", - "winrm_timeout": "12h", - "winrm_username": "vagrant" - } - ], - "post-processors": [ - [ - { - "keep_input_artifact": true, - "output": "{{ user `build_directory` }}/{{ user `template` }}-{{.Provider}}.box", - "type": "vagrant", - "vagrantfile_template": "{{template_dir}}/vagrantfile-windows.template" - } - ] - ], - "provisioners": [ - { - "cookbook_paths": [ - "{{template_dir}}/cookbooks" - ], - "guest_os_type": "windows", - "run_list": [ - "packer::disable_uac", - "packer::disable_restore", - "packer::disable_windows_update", - "packer::configure_power", - "packer::disable_screensaver" - ], - "type": "chef-solo" - }, - { - "type": "windows-restart" - }, - { - "cookbook_paths": [ - "{{template_dir}}/cookbooks" - ], - "guest_os_type": "windows", - "run_list": [ - "packer::vm_tools", - "packer::features", - "packer::enable_file_sharing", - "packer::enable_remote_desktop", - "packer::ui_tweaks" - ], - "type": "chef-solo" - }, - { - "type": "windows-restart" - }, - { - "cookbook_paths": [ - "{{template_dir}}/cookbooks" - ], - "guest_os_type": "windows", - "run_list": [ - "packer::cleanup", - "packer::defrag" - ], - "type": "chef-solo" - }, - { - "elevated_password": "vagrant", - "elevated_user": "vagrant", - "script": "{{template_dir}}/scripts/cleanup.ps1", - "type": "powershell" - } - ], - "variables": { - "build_directory": "../../builds", - "cpus": "2", - "disk_size": "40000", - "floppy_dir": "{{template_dir}}/answer_files", - "guest_additions_mode": "attach", - "guest_additions_url": "", - "headless": "true", - "hyperv_switch": "bento", - "iso_checksum": "772700802951b36c8cb26a61c040b9a8dc3816a3", - "iso_url": "https://software-download.microsoft.com/download/pr/Windows_Server_2016_Datacenter_EVAL_en-us_14393_refresh.ISO", - "memory": "4096", - "qemu_display": "none", - "template": "windows-2016-standard", - "unattended_file_path": "2016/Autounattend.xml", - "virtio_win_iso": "~/virtio-win.iso" - } -} diff --git a/packer_templates/windows/windows-2019.json b/packer_templates/windows/windows-2019.json deleted file mode 100644 index 816b43be9..000000000 --- a/packer_templates/windows/windows-2019.json +++ /dev/null @@ -1,238 +0,0 @@ -{ - "builders": [ - { - "communicator": "winrm", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "floppy_files": [ - "{{ user `floppy_dir` }}/{{ user `unattended_file_path` }}" - ], - "headless": "{{ user `headless` }}", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_url": "{{ user `iso_url` }}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-virtualbox", - "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"", - "shutdown_timeout": "15m", - "switch_name": "{{user `hyperv_switch`}}", - "type": "hyperv-iso", - "winrm_password": "vagrant", - "winrm_timeout": "12h", - "winrm_username": "vagrant" - }, - { - "communicator": "winrm", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "floppy_files": [ - "{{ user `floppy_dir` }}/{{ user `unattended_file_path` }}" - ], - "guest_additions_mode": "{{ user `guest_additions_mode` }}", - "guest_additions_path": "C:/users/vagrant/VBoxGuestAdditions.iso", - "guest_additions_url": "{{ user `guest_additions_url` }}", - "guest_os_type": "Windows2016_64", - "hard_drive_interface": "sata", - "iso_interface": "ide", - "guest_additions_interface": "sata", - "headless": "{{ user `headless` }}", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_url": "{{ user `iso_url` }}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-virtualbox", - "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"", - "shutdown_timeout": "15m", - "type": "virtualbox-iso", - "vboxmanage": [ - [ - "modifyvm", - "{{.Name}}", - "--vram", - "48" - ], - [ - "modifyvm", - "{{.Name}}", - "--audio", - "none" - ] - ], - "winrm_password": "vagrant", - "winrm_timeout": "12h", - "winrm_username": "vagrant" - }, - { - "communicator": "winrm", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "floppy_files": [ - "{{ user `floppy_dir` }}/{{ user `unattended_file_path` }}" - ], - "guest_os_type": "win-2019", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_url": "{{ user `iso_url` }}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-parallels", - "parallels_tools_flavor": "win", - "prlctl": [ - [ - "set", - "{{.Name}}", - "--efi-boot", - "off" - ] - ], - "prlctl_version_file": ".prlctl_version", - "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"", - "shutdown_timeout": "15m", - "type": "parallels-iso", - "winrm_password": "vagrant", - "winrm_timeout": "12h", - "winrm_username": "vagrant" - }, - { - "communicator": "winrm", - "cpus": "{{ user `cpus` }}", - "disk_adapter_type": "lsisas1068", - "disk_size": "{{user `disk_size`}}", - "floppy_files": [ - "{{ user `floppy_dir` }}/{{ user `unattended_file_path` }}" - ], - "guest_os_type": "windows9srv-64", - "headless": "{{ user `headless` }}", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_url": "{{ user `iso_url` }}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-vmware", - "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"", - "shutdown_timeout": "15m", - "tools_upload_flavor": "windows", - "tools_upload_path": "c:/Windows/Temp/vmware.iso", - "type": "vmware-iso", - "version": 19, - "winrm_password": "vagrant", - "winrm_timeout": "12h", - "winrm_username": "vagrant" - }, - { - "communicator": "winrm", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "floppy_files": [ - "{{ user `floppy_dir` }}/{{ user `unattended_file_path` }}" - ], - "headless": "{{ user `headless` }}", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_url": "{{ user `iso_url` }}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-qemu", - "qemuargs": [ - [ - "-m", - "{{ user `memory` }}" - ], - [ - "-smp", - "{{ user `cpus` }}" - ], - [ - "-drive", - "file={{ user `virtio_win_iso` }},media=cdrom,index=3" - ], - [ - "-drive", - "file={{ user `build_directory` }}/packer-{{ user `template` }}-qemu/{{ .Name }},if=virtio,cache=writeback,discard=ignore,format=qcow2,index=1" - ], - [ - "-display", - "{{ user `qemu_display` }}" - ] - ], - "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"", - "shutdown_timeout": "15m", - "type": "qemu", - "winrm_password": "vagrant", - "winrm_timeout": "12h", - "winrm_username": "vagrant" - } - ], - "post-processors": [ - [ - { - "keep_input_artifact": true, - "output": "{{ user `build_directory` }}/{{ user `template` }}-{{.Provider}}.box", - "type": "vagrant", - "vagrantfile_template": "{{template_dir}}/vagrantfile-windows.template" - } - ] - ], - "provisioners": [ - { - "cookbook_paths": [ - "{{template_dir}}/cookbooks" - ], - "guest_os_type": "windows", - "run_list": [ - "packer::disable_uac", - "packer::disable_restore", - "packer::disable_windows_update", - "packer::configure_power", - "packer::disable_screensaver" - ], - "type": "chef-solo" - }, - { - "type": "windows-restart" - }, - { - "cookbook_paths": [ - "{{template_dir}}/cookbooks" - ], - "guest_os_type": "windows", - "run_list": [ - "packer::vm_tools", - "packer::features", - "packer::enable_file_sharing", - "packer::enable_remote_desktop", - "packer::ui_tweaks" - ], - "type": "chef-solo" - }, - { - "type": "windows-restart" - }, - { - "cookbook_paths": [ - "{{template_dir}}/cookbooks" - ], - "guest_os_type": "windows", - "run_list": [ - "packer::cleanup", - "packer::defrag" - ], - "type": "chef-solo" - }, - { - "elevated_password": "vagrant", - "elevated_user": "vagrant", - "script": "{{template_dir}}/scripts/cleanup.ps1", - "type": "powershell" - } - ], - "variables": { - "build_directory": "../../builds", - "cpus": "2", - "disk_size": "40000", - "floppy_dir": "{{template_dir}}/answer_files", - "guest_additions_mode": "attach", - "guest_additions_url": "", - "headless": "true", - "hyperv_switch": "bento", - "iso_checksum": "3022424f777b66a698047ba1c37812026b9714c5", - "iso_url": "https://software-download.microsoft.com/download/pr/17763.737.190906-2324.rs5_release_svc_refresh_SERVER_EVAL_x64FRE_en-us_1.iso", - "memory": "4096", - "qemu_display": "none", - "template": "windows-2019-standard", - "unattended_file_path": "2019/Autounattend.xml", - "virtio_win_iso": "~/virtio-win.iso" - } -} diff --git a/packer_templates/windows/windows-2022.json b/packer_templates/windows/windows-2022.json deleted file mode 100644 index 3d6afa669..000000000 --- a/packer_templates/windows/windows-2022.json +++ /dev/null @@ -1,238 +0,0 @@ -{ - "builders": [ - { - "communicator": "winrm", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "floppy_files": [ - "{{ user `floppy_dir` }}/{{ user `unattended_file_path` }}" - ], - "headless": "{{ user `headless` }}", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_url": "{{ user `iso_url` }}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-virtualbox", - "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"", - "shutdown_timeout": "15m", - "switch_name": "{{user `hyperv_switch`}}", - "type": "hyperv-iso", - "winrm_password": "vagrant", - "winrm_timeout": "12h", - "winrm_username": "vagrant" - }, - { - "communicator": "winrm", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "floppy_files": [ - "{{ user `floppy_dir` }}/{{ user `unattended_file_path` }}" - ], - "guest_additions_mode": "{{ user `guest_additions_mode` }}", - "guest_additions_path": "C:/users/vagrant/VBoxGuestAdditions.iso", - "guest_additions_url": "{{ user `guest_additions_url` }}", - "guest_os_type": "Windows2019_64", - "hard_drive_interface": "sata", - "iso_interface": "ide", - "guest_additions_interface": "sata", - "headless": "{{ user `headless` }}", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_url": "{{ user `iso_url` }}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-virtualbox", - "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"", - "shutdown_timeout": "15m", - "type": "virtualbox-iso", - "vboxmanage": [ - [ - "modifyvm", - "{{.Name}}", - "--vram", - "48" - ], - [ - "modifyvm", - "{{.Name}}", - "--audio", - "none" - ] - ], - "winrm_password": "vagrant", - "winrm_timeout": "12h", - "winrm_username": "vagrant" - }, - { - "communicator": "winrm", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "floppy_files": [ - "{{ user `floppy_dir` }}/{{ user `unattended_file_path` }}" - ], - "guest_os_type": "win-2019", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_url": "{{ user `iso_url` }}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-parallels", - "parallels_tools_flavor": "win", - "prlctl": [ - [ - "set", - "{{.Name}}", - "--efi-boot", - "off" - ] - ], - "prlctl_version_file": ".prlctl_version", - "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"", - "shutdown_timeout": "15m", - "type": "parallels-iso", - "winrm_password": "vagrant", - "winrm_timeout": "12h", - "winrm_username": "vagrant" - }, - { - "communicator": "winrm", - "cpus": "{{ user `cpus` }}", - "disk_adapter_type": "lsisas1068", - "disk_size": "{{user `disk_size`}}", - "floppy_files": [ - "{{ user `floppy_dir` }}/{{ user `unattended_file_path` }}" - ], - "guest_os_type": "windows9srv-64", - "headless": "{{ user `headless` }}", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_url": "{{ user `iso_url` }}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-vmware", - "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"", - "shutdown_timeout": "15m", - "tools_upload_flavor": "windows", - "tools_upload_path": "c:/Windows/Temp/vmware.iso", - "type": "vmware-iso", - "version": 19, - "winrm_password": "vagrant", - "winrm_timeout": "12h", - "winrm_username": "vagrant" - }, - { - "communicator": "winrm", - "cpus": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "floppy_files": [ - "{{ user `floppy_dir` }}/{{ user `unattended_file_path` }}" - ], - "headless": "{{ user `headless` }}", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_url": "{{ user `iso_url` }}", - "memory": "{{ user `memory` }}", - "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-qemu", - "qemuargs": [ - [ - "-m", - "{{ user `memory` }}" - ], - [ - "-smp", - "{{ user `cpus` }}" - ], - [ - "-drive", - "file={{ user `virtio_win_iso` }},media=cdrom,index=3" - ], - [ - "-drive", - "file={{ user `build_directory` }}/packer-{{ user `template` }}-qemu/{{ .Name }},if=virtio,cache=writeback,discard=ignore,format=qcow2,index=1" - ], - [ - "-display", - "{{ user `qemu_display` }}" - ] - ], - "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"", - "shutdown_timeout": "15m", - "type": "qemu", - "winrm_password": "vagrant", - "winrm_timeout": "12h", - "winrm_username": "vagrant" - } - ], - "post-processors": [ - [ - { - "keep_input_artifact": true, - "output": "{{ user `build_directory` }}/{{ user `template` }}-{{.Provider}}.box", - "type": "vagrant", - "vagrantfile_template": "{{template_dir}}/vagrantfile-windows.template" - } - ] - ], - "provisioners": [ - { - "cookbook_paths": [ - "{{template_dir}}/cookbooks" - ], - "guest_os_type": "windows", - "run_list": [ - "packer::disable_uac", - "packer::disable_restore", - "packer::disable_windows_update", - "packer::configure_power", - "packer::disable_screensaver" - ], - "type": "chef-solo" - }, - { - "type": "windows-restart" - }, - { - "cookbook_paths": [ - "{{template_dir}}/cookbooks" - ], - "guest_os_type": "windows", - "run_list": [ - "packer::vm_tools", - "packer::features", - "packer::enable_file_sharing", - "packer::enable_remote_desktop", - "packer::ui_tweaks" - ], - "type": "chef-solo" - }, - { - "type": "windows-restart" - }, - { - "cookbook_paths": [ - "{{template_dir}}/cookbooks" - ], - "guest_os_type": "windows", - "run_list": [ - "packer::cleanup", - "packer::defrag" - ], - "type": "chef-solo" - }, - { - "elevated_password": "vagrant", - "elevated_user": "vagrant", - "script": "{{template_dir}}/scripts/cleanup.ps1", - "type": "powershell" - } - ], - "variables": { - "build_directory": "../../builds", - "cpus": "2", - "disk_size": "40000", - "floppy_dir": "{{template_dir}}/answer_files", - "guest_additions_mode": "attach", - "guest_additions_url": "", - "headless": "true", - "hyperv_switch": "bento", - "iso_checksum": "sha256:4f1457c4fe14ce48c9b2324924f33ca4f0470475e6da851b39ccbf98f44e7852", - "iso_url": "https://software-download.microsoft.com/download/sg/20348.169.210806-2348.fe_release_svc_refresh_SERVER_EVAL_x64FRE_en-us.iso", - "memory": "4096", - "qemu_display": "none", - "template": "windows-2022-standard", - "unattended_file_path": "2022/Autounattend.xml", - "virtio_win_iso": "~/virtio-win.iso" - } -} diff --git a/test_templates/bootstrap.sh.erb b/test_templates/bootstrap.sh.erb deleted file mode 100644 index 99d3975e1..000000000 --- a/test_templates/bootstrap.sh.erb +++ /dev/null @@ -1 +0,0 @@ -echo "Shell Provisioner Says What" diff --git a/test_templates/kitchen.yml.erb b/test_templates/kitchen.yml.erb deleted file mode 100644 index 204be755c..000000000 --- a/test_templates/kitchen.yml.erb +++ /dev/null @@ -1,29 +0,0 @@ ---- -provisioner: - name: <%= @provisioner %> - -platforms: -<% @providers.each do |k,v| -%> -- name: <%= @boxname + '-' + k %> - driver: - name: vagrant -<% if k =~ /vmware/ -%> -<% if RUBY_PLATFORM.match(/darwin/) -%> - provider: <%= 'vmware_fusion' %> -<% else -%> - provider: <%= 'vmware_workstation' %> -<% end -%> -<% else -%> - provider: <%= k %> -<% end -%> - box: bento-<%= @boxname %> - box_url: file://<%= Dir.pwd %>/builds/<%= v['file'] %> - synced_folders: -<% if k =~ /hyperv/ -%> - - [".", "/vagrant", "disabled: true"] -<% else -%> - - [".", "/vagrant", "disabled: <%= @share_disabled %>"] -<% end -%> -<% end -%> -suites: -- name: default From 0372eaf47744b95f492f4989c18e5c52c82e4f23 Mon Sep 17 00:00:00 2001 From: Corey Hemminger <hemminger@hotmail.com> Date: Mon, 9 Jan 2023 17:27:42 -0600 Subject: [PATCH 1500/1622] Update changelog for release (#1461) * Update changelog for release --- .github/CODEOWNERS | 4 +- .github/workflows/ci.yml | 11 ++--- .github/workflows/packer-builds.yml | 5 -- CHANGELOG.md | 75 +++++++++++++++++++++++++++++ 4 files changed, 82 insertions(+), 13 deletions(-) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 7e02dca69..5ac3b7918 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -1,5 +1,5 @@ # Order is important. The last matching pattern has the most precedence. -* @chef/chef-workstation-owners @chef/chef-workstation-approvers @chef/chef-workstation-reviewers +* @chef/chef-workstation-owners @chef/chef-workstation-approvers @chef/chef-workstation-reviewers @Stromweld .expeditor/ @chef/jex-team -*.md @chef/docs-team \ No newline at end of file +*.md @chef/docs-team diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 2b4e80619..a3c27a2de 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -48,20 +48,19 @@ jobs: if: always() needs: - markdown-lint - - markdown-link-checker - yaml-lint - json-lint - xml-lint - powershell-lint - shellcheck-lint - - packer-iso-check - - packer-lint - - packer-builds + # - packer-iso-check + # - packer-lint + # - packer-builds # Skipping for now until all builds are working runs-on: Ubuntu-latest steps: - name: Decide whether the needed jobs succeeded or failed uses: re-actors/alls-green@main with: - allowed-failures: markdown-link-checker - allowed-skips: + allowed-failures: + allowed-skips: ${{ toJSON(needs) }} jobs: ${{ toJSON(needs) }} diff --git a/.github/workflows/packer-builds.yml b/.github/workflows/packer-builds.yml index 0af546f90..7ff369beb 100644 --- a/.github/workflows/packer-builds.yml +++ b/.github/workflows/packer-builds.yml @@ -115,11 +115,6 @@ jobs: # - qemu # - virtualbox-iso # - vmware-iso - exclude: - - os: almalinux-8 - provider: parallels-iso - - os: rockylinux-8 - provider: parallels-iso steps: # - name: Update HomeBrew # run: brew update && brew upgrade && brew upgrade --cask diff --git a/CHANGELOG.md b/CHANGELOG.md index d86ebdb22..8838e8533 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,80 @@ # Change Log +## [v202301.09.0] (2023-01-09) + +### Notes + +- Manual run command from within the bento directory `packer build -only=virtualbox-iso.vm -var-file=os_pkrvars/almalinux/almalinux-9-x86_64.pkrvars.hcl ./packer_templates` +- Old Bento code and Json templates moved to protected branch `bento_old_json_templates` +- All x86_64 builds are currently tested on macos-12 with virtualbox 6.1.38 in Github Actions +- All aarch64 buiils are currently tested on internal runner with M1 macos-13.1 and parallels 18.1.1 +- Source, builder, variable hcl code found in packer_templates folder +- Pkrvars.hcl files representing each OS, version, architecture found in os_pkrvars folders + +### New Platforms + +- CentOS 7.9 - aarch64 +- CentOS-Stream 8 - aarch64 +- CentOS-Stream 9 - aarch64 +- Fedora 37 - aarch64 +- OracleLinux 7.9 - aarch64 +- OracleLinux 8.7 - aarch64 +- OracleLinux 9.1 - aarch64 +- Rhel 7.9 - aarch64 +- Rhel 8.7 - aarch64 +- Rhel 9.1 - aarch64 +- Rhel 9.1 - x86_64 +- RockyLinux 8.7 - aarch64 +- RockyLinux 9.1 - aarch64 +- Springdalelinux 9.1 - x86_64 +- Ubuntu 22.10 - aarch64 + +### Removed Platforms + +- Debian 9 - all archs +- Debian 10.13 - i386 +- Debian 11.6 - i386 +- Freebsd 12.3 - all archs +- Freebsd 12.4 - i386 +- OracleLinux 6 - all archs +- Rhel 6 - all archs +- Sles 11 - all archs +- Ubuntu 16.04 - all archs +- Windows 2012 - all archs + +### Fixes and updates + +- rewrite of json templates to hcl2 +- Added linting checks of files and scripts +- Added a build pipeline for integration testing +- Removed 32bit OS builds +- Added several more aarch64(arm64) builds + +### Known Issues + +#### Failing Builds + +- OpenSUSE Leap 15 - x86_64 +- SpringdaleLinux 8 - x86_64 +- Ubuntu 22.10 - x86_64 +- CentOS 7 - aarch64 +- CentOS-Stream 8 - aarch64 +- CentOS-Stream - aarch64 +- Fedora 36 - aarch64 +- Fedora 37 - aarch64 +- OracleLinux 7 - aarch64 +- OracleLinux 8 - aarch64 +- Ubuntu 22.04 - aarch64 +- Ubuntu 22.10 - aarch64 + +### Todo + +- Fix failing builds +- Add more Virtualization providers to build pipelines +- Update pipelines to only run on updated pkrvars files +- Create CD pipeline to upload vagrant boxes after PR is merged +- Create CD pipeline to build and upload new versions of vagrant boxes once every 3 months with the latest patches + ## [v202206.14.0] (2022-06-14) ### New Platforms From 3dca3da7f9bbe41a75e505b155422902c6ae96a7 Mon Sep 17 00:00:00 2001 From: Corey Hemminger <hemminger@hotmail.com> Date: Mon, 9 Jan 2023 18:04:35 -0600 Subject: [PATCH 1501/1622] add extra todo items to the changelog (#1462) * add extra todo items to the changelog --- .mdlrc | 2 +- CHANGELOG.md | 12 ++++++++---- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.mdlrc b/.mdlrc index ebeef65e4..f9c9a2dd7 100644 --- a/.mdlrc +++ b/.mdlrc @@ -1 +1 @@ -rules "~MD013", "~MD024" +rules "~MD007", "~MD013", "~MD024" diff --git a/CHANGELOG.md b/CHANGELOG.md index 8838e8533..ba5d7b194 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -71,6 +71,10 @@ - Fix failing builds - Add more Virtualization providers to build pipelines +- Finish removal of deprecated chef-solo provider to powershell provider for windows +- migrate from http directory for hosting files to cd_files in source templates + - This makes all builds compatable with hyper-v gen 2 which removes floppy disk capability + - This also makes things universal for Virtualbox 6.1 to 7.x due to latter requiring extra config for guests on NAT to be able to connect to host - Update pipelines to only run on updated pkrvars files - Create CD pipeline to upload vagrant boxes after PR is merged - Create CD pipeline to build and upload new versions of vagrant boxes once every 3 months with the latest patches @@ -331,10 +335,10 @@ - Suppress VMX whitelisting warning by removing interfaces at end of build - Use archive.ubuntu.com instead of US specific domain - Latest Tooling - - VirtualBox 5.1.24 - - VMware Fusion 8.5.8 - - Parallels 12.2.1 - - Packer 1.0.3 + - VirtualBox 5.1.24 + - VMware Fusion 8.5.8 + - Parallels 12.2.1 + - Packer 1.0.3 ## [2.3.7] (2017-07-03) From d7bc5f8f260d3a76a128b2124bd4854bc0835ef6 Mon Sep 17 00:00:00 2001 From: Corey Hemminger <hemminger@hotmail.com> Date: Thu, 19 Jan 2023 18:06:24 -0600 Subject: [PATCH 1502/1622] fix ubuntu 22.10 builds and output_directory (#1465) * fix ubuntu 22.10 builds, updated amz linux script and readme * fix output_directory for windows workstations, updated readme, updated amz_readme * added qemu provider to x86_64 build pipeline --- .github/workflows/packer-builds.yml | 12 ++---- .gitignore | 1 + AMZ_README_FIRST.md | 12 ++++-- AMZ_build_virtualbox-ovf.sh | 2 +- CHANGELOG.md | 43 +++++++++++++++++++ README.md | 5 ++- .../almalinux/almalinux-8-aarch64.pkrvars.hcl | 6 +-- .../almalinux/almalinux-8-x86_64.pkrvars.hcl | 2 +- .../almalinux/almalinux-9-aarch64.pkrvars.hcl | 2 +- .../almalinux/almalinux-9-x86_64.pkrvars.hcl | 2 +- .../ubuntu/ubuntu-22.04-x86_64.pkrvars.hcl | 10 +---- .../ubuntu/ubuntu-22.10-x86_64.pkrvars.hcl | 4 +- packer_templates/http/ubuntu/user-data | 3 +- packer_templates/pkr-sources.pkr.hcl | 16 +++---- packer_templates/pkr-variables.pkr.hcl | 2 +- .../vagrantfile-windows-gen2.template | 2 +- 16 files changed, 82 insertions(+), 42 deletions(-) diff --git a/.github/workflows/packer-builds.yml b/.github/workflows/packer-builds.yml index 7ff369beb..ece212fe7 100644 --- a/.github/workflows/packer-builds.yml +++ b/.github/workflows/packer-builds.yml @@ -44,14 +44,12 @@ jobs: - windows-2019 - windows-2022 provider: - # - qemu + - qemu - virtualbox-iso exclude: - os: centos-stream-9 provider: virtualbox-iso steps: - # - name: HomeBrew - # run: brew update && brew upgrade qemu && brew upgrade --cask virtualbox - name: Checkout uses: actions/checkout@main - name: Pull Change list @@ -78,7 +76,7 @@ jobs: run: packer init -upgrade packer_templates - name: Packer build if: steps.verify-changed-files.outputs.files_changed == 'true' - run: packer build -only=${{ matrix.provider }}.vm -var-file=os_pkrvars/$(echo ${{ matrix.os }} | cut -d "-" -f 1)/"${{ matrix.os }}-x86_64.pkrvars.hcl" packer_templates + run: packer build -only=${{ matrix.provider }}.vm -var "qemu_accelerator=hvf" -var-file=os_pkrvars/$(echo ${{ matrix.os }} | cut -d "-" -f 1)/"${{ matrix.os }}-x86_64.pkrvars.hcl" packer_templates - name: Upload build artifact uses: actions/upload-artifact@main with: @@ -116,8 +114,6 @@ jobs: # - virtualbox-iso # - vmware-iso steps: - # - name: Update HomeBrew - # run: brew update && brew upgrade && brew upgrade --cask - name: Checkout uses: actions/checkout@main - name: Pull Change list @@ -144,7 +140,7 @@ jobs: run: packer init -upgrade packer_templates - name: Packer build if: steps.verify-changed-files.outputs.files_changed == 'true' - run: packer build -only=${{ matrix.provider }}.vm -var-file=os_pkrvars/$(echo ${{ matrix.os }} | cut -d "-" -f 1)/"${{ matrix.os }}-aarch64.pkrvars.hcl" packer_templates + run: packer build -only=${{ matrix.provider }}.vm -var "qemu_accelerator=hvf" -var-file=os_pkrvars/$(echo ${{ matrix.os }} | cut -d "-" -f 1)/"${{ matrix.os }}-aarch64.pkrvars.hcl" packer_templates - name: Upload build artifact uses: actions/upload-artifact@v3 with: @@ -222,7 +218,7 @@ jobs: # run: packer init -upgrade packer_templates # - name: Packer build # if: steps.verify-changed-files.outputs.files_changed == 'true' -# run: packer build -only=${{ matrix.provider }}.vm -var-file=os_pkrvars/$(echo ${{ matrix.os }} | cut -d "-" -f 1)/"${{ matrix.os }}-x86_64.pkrvars.hcl" packer_templates +# run: packer build -only=${{ matrix.provider }}.vm -var "qemu_accelerator=whpx" -var-file=os_pkrvars/$(echo ${{ matrix.os }} | cut -d "-" -f 1)/"${{ matrix.os }}-x86_64.pkrvars.hcl" packer_templates # - name: Upload build artifact # uses: actions/upload-artifact@main # with: diff --git a/.gitignore b/.gitignore index 8b7a25bec..7f457c5cc 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,5 @@ .bundle/ +**/builds/ *.iso *.box *.ovf diff --git a/AMZ_README_FIRST.md b/AMZ_README_FIRST.md index 51e111752..5393c82d2 100644 --- a/AMZ_README_FIRST.md +++ b/AMZ_README_FIRST.md @@ -2,7 +2,11 @@ This is not your normal Bento box. Instead of building a system from an ISO we'r # Building this box -1. Download the VirtualBox .vdi file for Amazon Linux 2 and place it in the same directory as this readme file. Amazon hosts these at <https://cdn.amazonlinux.com/os-images/latest/virtualbox/>. Make sure to name it amazon.vdi instead of the version specific name that Amazon gives it on their site. -1. Run the STEP1_build_ovf.sh script to prepare this VDI file for packer and export it as a OVF file. -1. From the amazonlinux directory run packer: bento build amazon-2-x86_64.json -1. OPTIONAL: Cleanup the leftover files in the directory +Simply run the AMZ_build_virtualbox-ovf.sh script + +This script will: + +1. Download the VirtualBox .vdi file for Amazon Linux 2 and place it in the amz_working_files directory. Amazon hosts these at <https://cdn.amazonlinux.com/os-images/latest/virtualbox/>. It will name it amazon.vdi instead of the version specific name that Amazon gives it on their site +1. It will prepare this VDI file for packer and export it as a OVF file +1. It will run the packer build +1. Lastly it will clean up the leftover files in the working directory diff --git a/AMZ_build_virtualbox-ovf.sh b/AMZ_build_virtualbox-ovf.sh index c07bed4b8..dd683a7d5 100755 --- a/AMZ_build_virtualbox-ovf.sh +++ b/AMZ_build_virtualbox-ovf.sh @@ -59,7 +59,7 @@ echo Deleting the VM vboxmanage unregistervm $VM --delete echo starting packer build of amazonlinux -if packer build -only=virtualbox-ovf.amazonlinux -var-file="$AMZDIR/../../os_pkrvars/amazonlinux/amazonlinux-2-x86_64.pkrvars.hcl" "$AMZDIR"/..; then +if packer build -only=virtualbox-ovf.amazonlinux -var-file="$SCRIPT_RELATIVE_DIR"/os_pkrvars/amazonlinux/amazonlinux-2-x86_64.pkrvars.hcl "$SCRIPT_RELATIVE_DIR"/packer_templates; then echo "Cleaning up files" rm "$AMZDIR"/*.ovf "$AMZDIR"/*.vmdk "$AMZDIR"/*.iso fi diff --git a/CHANGELOG.md b/CHANGELOG.md index ba5d7b194..af6540a9e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,48 @@ # Change Log +## [v202301.19.0] (2023-01-19) + +### Notes + +- When running packer build command the output directory is relative to the working directory the command is currently running in. Suggest running packer build commands from bento root directory for build working files to be placed in bento/builds/(build_name) directory by default. If the output_directory variable isn't overwritten a directory called builds/(build_name) will be created in the current working directory that you are running the command from + +### Fixes and updates + +- fixed x86_64 Ubuntu 22.10 build +- set qemu_accelerator to null +- fixed bug in output_directory variable - the provisioner option doesn't take template variables only hcl variables +- updated AMZ_README_FIRST.md with how to use the updated script and actions it'll perform +- updated README.md with vbox 7 fix and added note on builds directory being relative to the current working directory + +### Known Issues + +#### Failing Builds + +- OpenSUSE Leap 15 - x86_64 +- SpringdaleLinux 7 - x86_64 +- almalinux 8 - aarch64 +- CentOS 7 - aarch64 +- CentOS-Stream 8 - aarch64 +- CentOS-Stream - aarch64 +- Fedora 36 - aarch64 +- Fedora 37 - aarch64 +- OracleLinux 7 - aarch64 +- OracleLinux 8 - aarch64 +- Ubuntu 22.04 - aarch64 +- Ubuntu 22.10 - aarch64 + +### Todo + +- Fix failing builds +- Add more Virtualization providers to build pipelines +- Finish removal of deprecated chef-solo provider to powershell provider for windows +- migrate from http directory for hosting files to cd_files in source templates + - This makes all builds compatable with hyper-v gen 2 which removes floppy disk capability + - This also makes things universal for Virtualbox 6.1 to 7.x due to latter requiring extra config for guests on NAT to be able to connect to host +- Update pipelines to only run on updated pkrvars files +- Create CD pipeline to upload vagrant boxes after PR is merged +- Create CD pipeline to build and upload new versions of vagrant boxes once every 3 months with the latest patches + ## [v202301.09.0] (2023-01-09) ### Notes diff --git a/README.md b/README.md index edc74908c..9372d80a6 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,10 @@ Bento is a project that encapsulates [Packer](https://www.packer.io/) templates for building [Vagrant](https://www.vagrantup.com/) base boxes. A subset of templates are built and published to the [bento org](https://app.vagrantup.com/bento) on Vagrant Cloud. These published boxes serve as the default boxes for [kitchen-vagrant](https://github.com/test-kitchen/kitchen-vagrant/). -***NOTE:** Virutalbox 7.x requires extra config to allow nat network to connect to the host. To use uncomment lines #79 and #80 in bento/packer_templates/pkr-sources.pkr.hcl +***NOTE:** + +- Virutalbox 7.x requires extra config to allow nat network to connect to the host. To use uncomment lines #154 and #155 in bento/packer_templates/pkr-variables.pkr.hcl +- When running packer build command the output directory is relative to the working directory the command is currently running in. Suggest running packer build commands from bento root directory for build working files to be placed in bento/builds/(build_name) directory by default. If the output_directory variable isn't overwritten a directory called builds/(build_name) will be created in the current working directory that you are running the command from ## Using Public Boxes diff --git a/os_pkrvars/almalinux/almalinux-8-aarch64.pkrvars.hcl b/os_pkrvars/almalinux/almalinux-8-aarch64.pkrvars.hcl index 81fff2dfe..136f4a0fc 100644 --- a/os_pkrvars/almalinux/almalinux-8-aarch64.pkrvars.hcl +++ b/os_pkrvars/almalinux/almalinux-8-aarch64.pkrvars.hcl @@ -1,10 +1,10 @@ os_name = "almalinux" os_version = "8.7" os_arch = "aarch64" -iso_url = "https://seattle.crazyfast.us/almalinux/8.7/isos/aarch64/AlmaLinux-8.7-aarch64-dvd.iso" -iso_checksum = "c14fae79d5e26bc41e75f0a65063ab684199a7ea3a6bd0a8086e1ffd2a7afac8" +iso_url = "https://repo.almalinux.org/almalinux/8/isos/aarch64/AlmaLinux-8.7-aarch64-dvd.iso" +iso_checksum = "file:https://repo.almalinux.org/almalinux/8/isos/aarch64/CHECKSUM" parallels_guest_os_type = "centos" vbox_guest_os_type = "RedHat_64" vmware_guest_os_type = "centos-64" -boot_command = ["<up>e<wait><down><down><end><wait> inst.text inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/rhel/8ks.cfg<leftCtrlOn>x<leftCtrlOff>"] +boot_command = ["<up>e<wait><down><down><end><wait> inst.text inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/rhel/8ks.cfg <leftCtrlOn>x<leftCtrlOff>"] boot_command_hyperv = ["<wait5><up><wait5><tab> text ks=hd:fd0:/ks.cfg<enter><wait5><esc>"] diff --git a/os_pkrvars/almalinux/almalinux-8-x86_64.pkrvars.hcl b/os_pkrvars/almalinux/almalinux-8-x86_64.pkrvars.hcl index ddb1fd248..a08fc7b7d 100644 --- a/os_pkrvars/almalinux/almalinux-8-x86_64.pkrvars.hcl +++ b/os_pkrvars/almalinux/almalinux-8-x86_64.pkrvars.hcl @@ -1,7 +1,7 @@ os_name = "almalinux" os_version = "8.7" os_arch = "x86_64" -iso_url = "https://repo.almalinux.org/almalinux/8.7/isos/x86_64/AlmaLinux-8.7-x86_64-dvd.iso" +iso_url = "https://repo.almalinux.org/almalinux/8/isos/x86_64/AlmaLinux-8.7-x86_64-dvd.iso" iso_checksum = "b95ddf9d56a849cc8eb4b95dd2321c13af637d3379b91f5d96c39e96fb4403b3" parallels_guest_os_type = "centos" vbox_guest_os_type = "RedHat_64" diff --git a/os_pkrvars/almalinux/almalinux-9-aarch64.pkrvars.hcl b/os_pkrvars/almalinux/almalinux-9-aarch64.pkrvars.hcl index cc5238a17..1de42577c 100644 --- a/os_pkrvars/almalinux/almalinux-9-aarch64.pkrvars.hcl +++ b/os_pkrvars/almalinux/almalinux-9-aarch64.pkrvars.hcl @@ -1,7 +1,7 @@ os_name = "almalinux" os_version = "9.1" os_arch = "aarch64" -iso_url = "https://repo.almalinux.org/almalinux/9.1/isos/aarch64/AlmaLinux-9.1-aarch64-dvd.iso" +iso_url = "https://repo.almalinux.org/almalinux/9/isos/aarch64/AlmaLinux-9.1-aarch64-dvd.iso" iso_checksum = "a6f0fb355b9c82f13a95f3f02e19b0f07906a7e0f27e3bca144338ebac9abf40" parallels_guest_os_type = "centos" vbox_guest_os_type = "RedHat_64" diff --git a/os_pkrvars/almalinux/almalinux-9-x86_64.pkrvars.hcl b/os_pkrvars/almalinux/almalinux-9-x86_64.pkrvars.hcl index d80611d72..017d333ca 100644 --- a/os_pkrvars/almalinux/almalinux-9-x86_64.pkrvars.hcl +++ b/os_pkrvars/almalinux/almalinux-9-x86_64.pkrvars.hcl @@ -1,7 +1,7 @@ os_name = "almalinux" os_version = "9.1" os_arch = "x86_64" -iso_url = "https://repo.almalinux.org/almalinux/9.1/isos/x86_64/AlmaLinux-9.1-x86_64-dvd.iso" +iso_url = "https://repo.almalinux.org/almalinux/9/isos/x86_64/AlmaLinux-9.1-x86_64-dvd.iso" iso_checksum = "2a44e3f8a012c132da19b9aae2bf949e20b116f0a2a7ac3eca111972f4ac952f" parallels_guest_os_type = "centos" vbox_guest_os_type = "RedHat_64" diff --git a/os_pkrvars/ubuntu/ubuntu-22.04-x86_64.pkrvars.hcl b/os_pkrvars/ubuntu/ubuntu-22.04-x86_64.pkrvars.hcl index a8a691ce6..987aea74a 100644 --- a/os_pkrvars/ubuntu/ubuntu-22.04-x86_64.pkrvars.hcl +++ b/os_pkrvars/ubuntu/ubuntu-22.04-x86_64.pkrvars.hcl @@ -8,12 +8,4 @@ parallels_guest_os_type = "ubuntu" vbox_guest_os_type = "Ubuntu_64" vmware_guest_os_type = "ubuntu-64" boot_command = ["c<wait>set gfxpayload=keep<enter><wait>linux /casper/vmlinuz quiet autoinstall ds=nocloud-net\\;s=http://{{.HTTPIP}}:{{.HTTPPort}}/ubuntu/ ---<enter><wait>initrd /casper/initrd<wait><enter><wait>boot<enter><wait>"] -#boot_command = [ -# "e<wait>", -# "<down><down><down>", -# "<end><bs><bs><bs><bs><wait>", -# "quiet autoinstall ds=nocloud-net\\;s=http://{{ .HTTPIP }}:{{ .HTTPPort }}/ubuntu/ ---<wait>", -# "<f10><wait>" -#] -#boot_command = ["c<wait>set gfxpayload=keep<enter><wait>linux /casper/vmlinuz quiet autoinstall ds=nocloud-net;s=http://{{.HTTPIP}}:{{.HTTPPort}}/ubuntu/ ---<enter><wait>initrd /casper/initrd<wait><enter><wait>boot<enter><wait>"] -#boot_command_hyperv = ["c<wait>set gfxpayload=keep<enter><wait>linux /casper/vmlinuz quiet autoinstall ds=nocloud-net;s=http://{{.HTTPIP}}:{{.HTTPPort}}/ubuntu/ ---<enter><wait>initrd /casper/initrd<wait><enter><wait>boot<enter><wait>"] +boot_command_hyperv = ["c<wait>set gfxpayload=keep<enter><wait>linux /casper/vmlinuz quiet autoinstall ds=nocloud-net\\;s=http://{{.HTTPIP}}:{{.HTTPPort}}/ubuntu/ ---<enter><wait>initrd /casper/initrd<wait><enter><wait>boot<enter><wait>"] diff --git a/os_pkrvars/ubuntu/ubuntu-22.10-x86_64.pkrvars.hcl b/os_pkrvars/ubuntu/ubuntu-22.10-x86_64.pkrvars.hcl index 02baf4920..4ea529502 100644 --- a/os_pkrvars/ubuntu/ubuntu-22.10-x86_64.pkrvars.hcl +++ b/os_pkrvars/ubuntu/ubuntu-22.10-x86_64.pkrvars.hcl @@ -7,5 +7,5 @@ hyperv_generation = 2 parallels_guest_os_type = "ubuntu" vbox_guest_os_type = "Ubuntu_64" vmware_guest_os_type = "ubuntu-64" -boot_command = ["c<wait>set gfxpayload=keep<enter><wait>linux /casper/vmlinuz quiet autoinstall ds=nocloud-net\\;s=http://{{.HTTPIP}}:{{.HTTPPort}}/ubuntu/ ---<enter><wait>initrd /casper/initrd<wait><enter><wait>boot<enter><wait>"] -boot_command_hyperv = ["c<wait>set gfxpayload=keep<enter><wait>linux /casper/vmlinuz quiet autoinstall ds=nocloud-net\\;s=http://{{.HTTPIP}}:{{.HTTPPort}}/ubuntu/ ---<enter><wait>initrd /casper/initrd<wait><enter><wait>boot<enter><wait>"] +boot_command = ["<wait>e<wait><down><down><down><end> autoinstall ds=nocloud-net\\;s=http://{{.HTTPIP}}:{{.HTTPPort}}/ubuntu/<wait><f10><wait>"] +boot_command_hyperv = ["<wait>e<wait><down><down><down><end> autoinstall ds=nocloud-net\\;s=http://{{.HTTPIP}}:{{.HTTPPort}}/ubuntu/<wait><f10><wait>"] diff --git a/packer_templates/http/ubuntu/user-data b/packer_templates/http/ubuntu/user-data index 0c816e448..a6a096122 100644 --- a/packer_templates/http/ubuntu/user-data +++ b/packer_templates/http/ubuntu/user-data @@ -7,7 +7,8 @@ autoinstall: password: '$6$rounds=4096$5CU3LEj/MQvbkfPb$LmKEF9pCfU8R.dA.GemgE/8GT6r9blge3grJvdsVTMFKyLEQwzEF3SGWqAzjawY/XHRpWj4fOiLBrRyxJhIRJ1' early-commands: # otherwise packer tries to connect and exceed max attempts: - - systemctl stop ssh + - systemctl stop ssh.service + - systemctl stop ssh.socket ssh: install-server: yes allow-pw: yes diff --git a/packer_templates/pkr-sources.pkr.hcl b/packer_templates/pkr-sources.pkr.hcl index d3016aa4e..c57e84ae2 100644 --- a/packer_templates/pkr-sources.pkr.hcl +++ b/packer_templates/pkr-sources.pkr.hcl @@ -40,7 +40,7 @@ locals { ["-m", "${local.memory}"], ["-smp", "2"], ["-drive", "file=~/virtio-win.iso,media=cdrom,index=3"], - ["-drive", "file=${path.root}/../builds/packer-${var.os_name}-${var.os_version}-qemu/{{ .Name }},if=virtio,cache=writeback,discard=ignore,format=qcow2,index=1"], + ["-drive", "file=${path.root}/../builds/packer-${var.os_name}-${var.os_version}-${var.os_arch}-qemu/{{ .Name }},if=virtio,cache=writeback,discard=ignore,format=qcow2,index=1"], ["-display", "none"] ] : [ ["-m", "${local.memory}"], @@ -102,7 +102,7 @@ locals { ) : var.floppy_files http_directory = var.http_directory == null ? "${path.root}/http" : var.http_directory memory = var.memory == null ? (var.is_windows ? 4096 : 2048) : var.memory - output_directory = var.output_directory == null ? "${path.root}/../builds/packer-${var.os_name}-${var.os_version}-${var.os_arch}-${source.type}" : var.output_directory + output_directory = var.output_directory == null ? "builds/packer-${var.os_name}-${var.os_version}-${var.os_arch}" : var.output_directory shutdown_command = var.shutdown_command == null ? ( var.is_windows ? "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"" : ( var.os_name == "freebsd" ? "echo 'vagrant' | su -m root -c 'shutdown -p now'" : "echo 'vagrant' | sudo -S /sbin/halt -h -p" @@ -131,7 +131,7 @@ source "hyperv-iso" "vm" { iso_checksum = var.iso_checksum iso_url = var.iso_url memory = local.memory - output_directory = local.output_directory + output_directory = "${local.output_directory}-hyperv" shutdown_command = local.shutdown_command shutdown_timeout = var.shutdown_timeout ssh_password = var.ssh_password @@ -159,7 +159,7 @@ source "parallels-iso" "vm" { iso_checksum = var.iso_checksum iso_url = var.iso_url memory = local.memory - output_directory = local.output_directory + output_directory = "${local.output_directory}-parallels" shutdown_command = local.shutdown_command shutdown_timeout = var.shutdown_timeout ssh_password = var.ssh_password @@ -186,7 +186,7 @@ source "qemu" "vm" { iso_checksum = var.iso_checksum iso_url = var.iso_url memory = local.memory - output_directory = local.output_directory + output_directory = "${local.output_directory}-qemu" shutdown_command = local.shutdown_command shutdown_timeout = var.shutdown_timeout ssh_password = var.ssh_password @@ -220,7 +220,7 @@ source "virtualbox-iso" "vm" { iso_checksum = var.iso_checksum iso_url = var.iso_url memory = local.memory - output_directory = local.output_directory + output_directory = "${local.output_directory}-virtualbox" shutdown_command = local.shutdown_command shutdown_timeout = var.shutdown_timeout ssh_password = var.ssh_password @@ -239,7 +239,7 @@ source "virtualbox-ovf" "amazonlinux" { virtualbox_version_file = var.virtualbox_version_file communicator = local.communicator headless = var.headless - output_directory = local.output_directory + output_directory = "${local.output_directory}-virtualbox-ovf" shutdown_command = local.shutdown_command shutdown_timeout = var.shutdown_timeout ssh_password = var.ssh_password @@ -267,7 +267,7 @@ source "vmware-iso" "vm" { iso_checksum = var.iso_checksum iso_url = var.iso_url memory = local.memory - output_directory = local.output_directory + output_directory = "${local.output_directory}-vmware" shutdown_command = local.shutdown_command shutdown_timeout = var.shutdown_timeout ssh_password = var.ssh_password diff --git a/packer_templates/pkr-variables.pkr.hcl b/packer_templates/pkr-variables.pkr.hcl index 506d4583b..88d1a7b01 100644 --- a/packer_templates/pkr-variables.pkr.hcl +++ b/packer_templates/pkr-variables.pkr.hcl @@ -102,7 +102,7 @@ variable "parallels_prlctl_version_file" { # qemu variable "qemu_accelerator" { type = string - default = "kvm" + default = null } variable "qemuargs" { type = list(list(string)) diff --git a/packer_templates/vagrantfile-windows-gen2.template b/packer_templates/vagrantfile-windows-gen2.template index 64618d988..8a0a1ebb0 100644 --- a/packer_templates/vagrantfile-windows-gen2.template +++ b/packer_templates/vagrantfile-windows-gen2.template @@ -19,4 +19,4 @@ Vagrant.configure("2") do |config| hv.cpus = 2 hv.enable_virtualization_extensions = true end -end \ No newline at end of file +end From 0c64148b2179bdb88268b06425cdde657f9169f0 Mon Sep 17 00:00:00 2001 From: Cory Francis Myers <cfm@panix.com> Date: Thu, 9 Feb 2023 20:32:59 -0800 Subject: [PATCH 1503/1622] fix: truncate "/var/lib/dbus/machine-id" in case it's separate from "/etc/machine-id" (#1471) "/var/lib/dbus/machine-id" MAY be a symlink to "/etc/machine-id".[1] If it isn't, however, we need to truncate it separately to avoid reuse. Fixes #1421. [1]: https://www.mail-archive.com/debian-bugs-dist@lists.debian.org/msg1818499.html Signed-off-by: Cory Francis Myers <cory@freedom.press> --- packer_templates/scripts/debian/cleanup_debian.sh | 1 + packer_templates/scripts/fedora/cleanup_dnf.sh | 1 + packer_templates/scripts/rhel/cleanup_dnf.sh | 1 + packer_templates/scripts/rhel/cleanup_yum.sh | 1 + packer_templates/scripts/suse/cleanup_suse.sh | 1 + packer_templates/scripts/ubuntu/cleanup_ubuntu.sh | 1 + 6 files changed, 6 insertions(+) diff --git a/packer_templates/scripts/debian/cleanup_debian.sh b/packer_templates/scripts/debian/cleanup_debian.sh index 85ec8ee71..b13df2bf6 100644 --- a/packer_templates/scripts/debian/cleanup_debian.sh +++ b/packer_templates/scripts/debian/cleanup_debian.sh @@ -49,6 +49,7 @@ find /var/log -type f -exec truncate --size=0 {} \; echo "blank netplan machine-id (DUID) so machines get unique ID generated on boot" truncate -s 0 /etc/machine-id +truncate -s 0 /var/lib/dbus/machine-id # if not symlinked to "/etc/machine-id" echo "remove the contents of /tmp and /var/tmp" rm -rf /tmp/* /var/tmp/* diff --git a/packer_templates/scripts/fedora/cleanup_dnf.sh b/packer_templates/scripts/fedora/cleanup_dnf.sh index 12ba745e7..b3b106d7f 100644 --- a/packer_templates/scripts/fedora/cleanup_dnf.sh +++ b/packer_templates/scripts/fedora/cleanup_dnf.sh @@ -38,6 +38,7 @@ rm -f /var/lib/systemd/random-seed echo "Wipe netplan machine-id (DUID) so machines get unique ID generated on boot" truncate -s 0 /etc/machine-id +truncate -s 0 /var/lib/dbus/machine-id # if not symlinked to "/etc/machine-id" echo "Clear the history so our install commands aren't there" rm -f /root/.wget-hsts diff --git a/packer_templates/scripts/rhel/cleanup_dnf.sh b/packer_templates/scripts/rhel/cleanup_dnf.sh index 90173e61a..e84e35f14 100644 --- a/packer_templates/scripts/rhel/cleanup_dnf.sh +++ b/packer_templates/scripts/rhel/cleanup_dnf.sh @@ -52,6 +52,7 @@ rm -f /var/lib/systemd/random-seed echo "Wipe netplan machine-id (DUID) so machines get unique ID generated on boot" truncate -s 0 /etc/machine-id +truncate -s 0 /var/lib/dbus/machine-id # if not symlinked to "/etc/machine-id" echo "Clear the history so our install commands aren't there" rm -f /root/.wget-hsts diff --git a/packer_templates/scripts/rhel/cleanup_yum.sh b/packer_templates/scripts/rhel/cleanup_yum.sh index cd01f33e5..eef2f11b4 100644 --- a/packer_templates/scripts/rhel/cleanup_yum.sh +++ b/packer_templates/scripts/rhel/cleanup_yum.sh @@ -52,6 +52,7 @@ rm -f /var/lib/systemd/random-seed echo "Wipe netplan machine-id (DUID) so machines get unique ID generated on boot" truncate -s 0 /etc/machine-id +truncate -s 0 /var/lib/dbus/machine-id # if not symlinked to "/etc/machine-id" echo "Clear the history so our install commands aren't there" rm -f /root/.wget-hsts diff --git a/packer_templates/scripts/suse/cleanup_suse.sh b/packer_templates/scripts/suse/cleanup_suse.sh index 35679faca..d1b31d053 100644 --- a/packer_templates/scripts/suse/cleanup_suse.sh +++ b/packer_templates/scripts/suse/cleanup_suse.sh @@ -19,6 +19,7 @@ rm -rf /tmp/* /var/tmp/* echo "blank netplan machine-id (DUID) so machines get unique ID generated on boot" truncate -s 0 /etc/machine-id +truncate -s 0 /var/lib/dbus/machine-id # if not symlinked to "/etc/machine-id" echo "force a new random seed to be generated" rm -f /var/lib/systemd/random-seed diff --git a/packer_templates/scripts/ubuntu/cleanup_ubuntu.sh b/packer_templates/scripts/ubuntu/cleanup_ubuntu.sh index 9388a779f..c5c68e2df 100644 --- a/packer_templates/scripts/ubuntu/cleanup_ubuntu.sh +++ b/packer_templates/scripts/ubuntu/cleanup_ubuntu.sh @@ -90,6 +90,7 @@ find /var/log -type f -exec truncate --size=0 {} \; echo "blank netplan machine-id (DUID) so machines get unique ID generated on boot" truncate -s 0 /etc/machine-id +truncate -s 0 /var/lib/dbus/machine-id # if not symlinked to "/etc/machine-id" echo "remove the contents of /tmp and /var/tmp" rm -rf /tmp/* /var/tmp/* From db9731449f6bc80536ba7f10111db865e3861856 Mon Sep 17 00:00:00 2001 From: Michael Campfield <campfield@users.noreply.github.com> Date: Sat, 11 Feb 2023 17:16:40 -0500 Subject: [PATCH 1504/1622] change breaking typo for amazon value in locals (#1472) Co-authored-by: Michael Campfield <campfieldm@mailbox.org> --- packer_templates/pkr-builder.pkr.hcl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packer_templates/pkr-builder.pkr.hcl b/packer_templates/pkr-builder.pkr.hcl index f2c701a56..bc7c4f44c 100644 --- a/packer_templates/pkr-builder.pkr.hcl +++ b/packer_templates/pkr-builder.pkr.hcl @@ -131,7 +131,7 @@ locals { "${path.root}/scripts/fedora/cleanup_dnf.sh", "${path.root}/scripts/_common/minimize.sh" ] : ( - "${var.os_name}-${substr(var.os_version, 0, 1)}" == "amazonliunux-2" || + "${var.os_name}-${substr(var.os_version, 0, 1)}" == "amazonlinux-2" || "${var.os_name}-${substr(var.os_version, 0, 1)}" == "centos-7" || "${var.os_name}-${substr(var.os_version, 0, 1)}" == "oraclelinux-7" || "${var.os_name}-${substr(var.os_version, 0, 1)}" == "rhel-7" || From 82e82d88722e5ca806d5c11bcbd5b172a7aee33e Mon Sep 17 00:00:00 2001 From: Bryce Kahle <github@brycekahle.com> Date: Mon, 13 Feb 2023 11:58:10 -0800 Subject: [PATCH 1505/1622] remove excess curly brace in fedora 37 aarch64 (#1474) Signed-off-by: Bryce Kahle <bryce.kahle@datadoghq.com> --- os_pkrvars/fedora/fedora-37-aarch64.pkrvars.hcl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/os_pkrvars/fedora/fedora-37-aarch64.pkrvars.hcl b/os_pkrvars/fedora/fedora-37-aarch64.pkrvars.hcl index bf05a6436..8ee47f2a1 100644 --- a/os_pkrvars/fedora/fedora-37-aarch64.pkrvars.hcl +++ b/os_pkrvars/fedora/fedora-37-aarch64.pkrvars.hcl @@ -6,4 +6,4 @@ iso_checksum = "sha256:1c2deba876bd2da3a429b1b0cd5e294508b8379b299913 parallels_guest_os_type = "fedora-core" vbox_guest_os_type = "Fedora_64" vmware_guest_os_type = "fedora-64" -boot_command = ["<up><up>e<wait><down><down><end> inst.text inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/fedora/ks.cfg}<F10><wait>"] +boot_command = ["<up><up>e<wait><down><down><end> inst.text inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/fedora/ks.cfg<F10><wait>"] From 3d23fcba963d2ef53dd7aeeacd4aa8b10d1c5d0f Mon Sep 17 00:00:00 2001 From: Bryce Kahle <bryce.kahle@datadoghq.com> Date: Tue, 21 Feb 2023 13:10:46 -0800 Subject: [PATCH 1506/1622] Fix boot command for ubuntu 22.10 aarch64 (#1478) Signed-off-by: Bryce Kahle <bryce.kahle@datadoghq.com> --- os_pkrvars/ubuntu/ubuntu-22.10-aarch64.pkrvars.hcl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/os_pkrvars/ubuntu/ubuntu-22.10-aarch64.pkrvars.hcl b/os_pkrvars/ubuntu/ubuntu-22.10-aarch64.pkrvars.hcl index e545f6421..a67150462 100644 --- a/os_pkrvars/ubuntu/ubuntu-22.10-aarch64.pkrvars.hcl +++ b/os_pkrvars/ubuntu/ubuntu-22.10-aarch64.pkrvars.hcl @@ -7,5 +7,5 @@ hyperv_generation = 2 parallels_guest_os_type = "ubuntu" vbox_guest_os_type = "Ubuntu_64" vmware_guest_os_type = "ubuntu-64" -boot_command = ["<wait5><esc><wait><f6><wait><esc><wait> <bs><bs><bs><bs><wait> autoinstall<wait5> ds=nocloud-net<wait5>;s=http://<wait5>{{ .HTTPIP }}<wait5>:{{ .HTTPPort }}/ubuntu/<wait5> ---<wait5><enter><wait5>"] -boot_command_hyperv = ["<wait5><esc><wait><f6><wait><esc><wait> <bs><bs><bs><bs><wait> autoinstall<wait5> ds=nocloud-net<wait5>;s=http://<wait5>{{ .HTTPIP }}<wait5>:{{ .HTTPPort }}/ubuntu/<wait5> ---<wait5><enter><wait5>"] +boot_command = ["<wait>e<wait><down><down><down><end> autoinstall ds=nocloud-net\\;s=http://{{.HTTPIP}}:{{.HTTPPort}}/ubuntu/<wait><f10><wait>"] +boot_command_hyperv = ["<wait>e<wait><down><down><down><end> autoinstall ds=nocloud-net\\;s=http://{{.HTTPIP}}:{{.HTTPPort}}/ubuntu/<wait><f10><wait>"] From d9362aa65a4f74ed2c2f135fabb6bb4423bdef69 Mon Sep 17 00:00:00 2001 From: Bryce Kahle <bryce.kahle@datadoghq.com> Date: Wed, 22 Feb 2023 11:45:37 -0800 Subject: [PATCH 1507/1622] Fix arch for fedora 36 aarch64 (#1480) --- os_pkrvars/fedora/fedora-36-aarch64.pkrvars.hcl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/os_pkrvars/fedora/fedora-36-aarch64.pkrvars.hcl b/os_pkrvars/fedora/fedora-36-aarch64.pkrvars.hcl index 4b649a0d1..ea90c94b9 100644 --- a/os_pkrvars/fedora/fedora-36-aarch64.pkrvars.hcl +++ b/os_pkrvars/fedora/fedora-36-aarch64.pkrvars.hcl @@ -1,6 +1,6 @@ os_name = "fedora" os_version = "36" -os_arch = "x86_64" +os_arch = "aarch64" iso_url = "https://na.edge.kernel.org/fedora/releases/36/Server/aarch64/iso/Fedora-Server-dvd-aarch64-36-1.5.iso" iso_checksum = "sha256:0ab4000575ff8b258576750ecf4ca39b266f0c88cab5fe3d8d2f88c9bea4830d" parallels_guest_os_type = "fedora-core" From ff8d3bea6814b23aa526e0f7ac5d45a8fa06fdee Mon Sep 17 00:00:00 2001 From: Corey Hemminger <hemminger@hotmail.com> Date: Wed, 22 Feb 2023 23:22:12 -0600 Subject: [PATCH 1508/1622] updates and fixes for box builds (#1466) --- .github/workflows/ci.yml | 139 ++++++++++- .github/workflows/packer-builds.yml | 230 ------------------ .github/workflows/pkr-bld-amazonlinux-x64.yml | 45 ++++ .github/workflows/pkr-bld-hyperv-x64.yml | 84 +++++++ .github/workflows/pkr-bld-parallels-arm64.yml | 69 ++++++ .github/workflows/pkr-bld-parallels-x64.yml | 82 +++++++ .github/workflows/pkr-bld-qemu-arm64.yml | 69 ++++++ .github/workflows/pkr-bld-qemu-x64.yml | 84 +++++++ .../workflows/pkr-bld-virtualbox-arm64.yml | 69 ++++++ .github/workflows/pkr-bld-virtualbox-x64.yml | 82 +++++++ .github/workflows/pkr-bld-vmware-arm64.yml | 69 ++++++ .github/workflows/pkr-bld-vmware-x64.yml | 82 +++++++ .gitignore | 2 +- .mdlrc | 2 +- AMZ_build_virtualbox-ovf.sh | 10 +- CHANGELOG.md | 82 +++++++ README.md | 6 +- .../almalinux/almalinux-8-aarch64.pkrvars.hcl | 5 +- .../almalinux/almalinux-8-x86_64.pkrvars.hcl | 7 +- .../almalinux/almalinux-9-aarch64.pkrvars.hcl | 5 +- .../almalinux/almalinux-9-x86_64.pkrvars.hcl | 5 +- .../amazonlinux-2-x86_64.pkrvars.hcl | 5 +- .../centos/centos-7-aarch64.pkrvars.hcl | 7 +- os_pkrvars/centos/centos-7-x86_64.pkrvars.hcl | 3 +- .../centos-stream-8-aarch64.pkrvars.hcl | 5 +- .../centos/centos-stream-8-x86_64.pkrvars.hcl | 3 +- .../centos-stream-9-aarch64.pkrvars.hcl | 7 +- .../centos/centos-stream-9-x86_64.pkrvars.hcl | 5 +- .../debian/debian-10-aarch64.pkrvars.hcl | 2 +- .../debian/debian-10-x86_64.pkrvars.hcl | 2 +- .../debian/debian-11-aarch64.pkrvars.hcl | 2 +- .../debian/debian-11-x86_64.pkrvars.hcl | 2 +- .../fedora/fedora-36-aarch64.pkrvars.hcl | 2 +- .../fedora/fedora-36-x86_64.pkrvars.hcl | 2 +- .../fedora/fedora-37-aarch64.pkrvars.hcl | 2 +- .../fedora/fedora-37-x86_64.pkrvars.hcl | 2 +- .../freebsd/freebsd-12-x86_64.pkrvars.hcl | 2 +- .../freebsd/freebsd-13-x86_64.pkrvars.hcl | 2 +- .../oraclelinux-7-aarch64.pkrvars.hcl | 3 +- .../oraclelinux-7-x86_64.pkrvars.hcl | 3 +- .../oraclelinux-8-aarch64.pkrvars.hcl | 3 +- .../oraclelinux-8-x86_64.pkrvars.hcl | 3 +- .../oraclelinux-9-aarch64.pkrvars.hcl | 3 +- .../oraclelinux-9-x86_64.pkrvars.hcl | 3 +- os_pkrvars/rhel/rhel-7-aarch64.pkrvars.hcl | 1 - os_pkrvars/rhel/rhel-7-x86_64.pkrvars.hcl | 1 - os_pkrvars/rhel/rhel-8-aarch64.pkrvars.hcl | 1 - os_pkrvars/rhel/rhel-8-x86_64.pkrvars.hcl | 1 - os_pkrvars/rhel/rhel-9-aarch64.pkrvars.hcl | 1 - os_pkrvars/rhel/rhel-9-x86_64.pkrvars.hcl | 1 - .../rockylinux-8-aarch64.pkrvars.hcl | 5 +- .../rockylinux-8-x86_64.pkrvars.hcl | 5 +- .../rockylinux-9-aarch64.pkrvars.hcl | 5 +- .../rockylinux-9-x86_64.pkrvars.hcl | 5 +- .../scientificlinux-7-x86_64.pkrvars.hcl | 1 - .../springdalelinux-7-x86_64.pkrvars.hcl | 1 - .../springdalelinux-8-x86_64.pkrvars.hcl | 1 - .../springdalelinux-9-x86_64.pkrvars.hcl | 1 - .../ubuntu/ubuntu-18.04-aarch64.pkrvars.hcl | 10 + .../ubuntu/ubuntu-18.04-x86_64.pkrvars.hcl | 1 - .../ubuntu/ubuntu-20.04-aarch64.pkrvars.hcl | 3 +- .../ubuntu/ubuntu-20.04-x86_64.pkrvars.hcl | 3 +- .../ubuntu/ubuntu-22.04-aarch64.pkrvars.hcl | 3 +- .../ubuntu/ubuntu-22.04-x86_64.pkrvars.hcl | 1 - .../ubuntu/ubuntu-22.10-aarch64.pkrvars.hcl | 1 - .../ubuntu/ubuntu-22.10-x86_64.pkrvars.hcl | 1 - .../windows/windows-10gen2-x86_64.pkrvars.hcl | 3 +- .../windows/windows-11-x86_64.pkrvars.hcl | 1 - .../windows/windows-11gen2-x86_64.pkrvars.hcl | 3 +- packer_templates/http/fedora/ks.cfg | 8 + .../http/ubuntu/preseed-hyperv.cfg | 2 +- packer_templates/http/ubuntu/user-data | 3 +- packer_templates/pkr-builder.pkr.hcl | 20 +- packer_templates/pkr-sources.pkr.hcl | 40 ++- packer_templates/pkr-variables.pkr.hcl | 32 ++- .../scripts/_common/parallels-rhel.sh | 47 ++++ packer_templates/scripts/_common/parallels.sh | 9 +- .../scripts/_common/vmware_fedora.sh | 3 +- .../scripts/_common/vmware_rhel.sh | 5 +- .../scripts/debian/cleanup_debian.sh | 5 +- .../scripts/fedora/cleanup_dnf.sh | 5 +- packer_templates/scripts/rhel/cleanup_dnf.sh | 5 +- packer_templates/scripts/rhel/cleanup_yum.sh | 5 +- packer_templates/scripts/rhel/update_dnf.sh | 2 +- packer_templates/scripts/rhel/update_yum.sh | 2 +- packer_templates/scripts/suse/cleanup_suse.sh | 5 +- .../scripts/suse/unsupported-modules_suse.sh | 2 +- .../scripts/ubuntu/cleanup_ubuntu.sh | 5 +- packer_templates/scripts/windows/optimize.ps1 | 6 +- .../provision-guest-tools-qemu-kvm.ps1 | 54 ---- .../scripts/windows/provision-vmwaretools.ps1 | 41 ---- .../scripts/windows/provision.ps1 | 22 +- 92 files changed, 1181 insertions(+), 508 deletions(-) delete mode 100644 .github/workflows/packer-builds.yml create mode 100644 .github/workflows/pkr-bld-amazonlinux-x64.yml create mode 100644 .github/workflows/pkr-bld-hyperv-x64.yml create mode 100644 .github/workflows/pkr-bld-parallels-arm64.yml create mode 100644 .github/workflows/pkr-bld-parallels-x64.yml create mode 100644 .github/workflows/pkr-bld-qemu-arm64.yml create mode 100644 .github/workflows/pkr-bld-qemu-x64.yml create mode 100644 .github/workflows/pkr-bld-virtualbox-arm64.yml create mode 100644 .github/workflows/pkr-bld-virtualbox-x64.yml create mode 100644 .github/workflows/pkr-bld-vmware-arm64.yml create mode 100644 .github/workflows/pkr-bld-vmware-x64.yml create mode 100644 os_pkrvars/ubuntu/ubuntu-18.04-aarch64.pkrvars.hcl create mode 100644 packer_templates/scripts/_common/parallels-rhel.sh delete mode 100644 packer_templates/scripts/windows/provision-guest-tools-qemu-kvm.ps1 delete mode 100644 packer_templates/scripts/windows/provision-vmwaretools.ps1 diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a3c27a2de..6aa5b000e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -32,16 +32,124 @@ jobs: uses: chef/github-workflows/.github/workflows/packer-lint.yml@main secrets: inherit - packer-builds: - needs: - - yaml-lint - - json-lint - - xml-lint - - powershell-lint - - shellcheck-lint - - packer-iso-check - - packer-lint - uses: ./.github/workflows/packer-builds.yml + pkr-bld-amazonlinux-x64: +# needs: +# - yaml-lint +# - json-lint +# - xml-lint +# - powershell-lint +# - shellcheck-lint +# - packer-iso-check +# - packer-lint + uses: ./.github/workflows/pkr-bld-amazonlinux-x64.yml + secrets: inherit + + # pkr-bld-virtualbox-arm64: + # # needs: + # # - yaml-lint + # # - json-lint + # # - xml-lint + # # - powershell-lint + # # - shellcheck-lint + # # - packer-iso-check + # # - packer-lint + # uses: ./.github/workflows/pkr-bld-virtualbox-arm64.yml + # secrets: inherit + + pkr-bld-virtualbox-x64: + # needs: + # - yaml-lint + # - json-lint + # - xml-lint + # - powershell-lint + # - shellcheck-lint + # - packer-iso-check + # - packer-lint + uses: ./.github/workflows/pkr-bld-virtualbox-x64.yml + secrets: inherit + + # pkr-bld-parallels-arm64: + # # needs: + # # - yaml-lint + # # - json-lint + # # - xml-lint + # # - powershell-lint + # # - shellcheck-lint + # # - packer-iso-check + # # - packer-lint + # uses: ./.github/workflows/pkr-bld-parallels-arm64.yml + # secrets: inherit + + pkr-bld-parallels-x64: + # needs: + # - yaml-lint + # - json-lint + # - xml-lint + # - powershell-lint + # - shellcheck-lint + # - packer-iso-check + # - packer-lint + uses: ./.github/workflows/pkr-bld-parallels-x64.yml + secrets: inherit + + # pkr-bld-vmware-arm64: + # # needs: + # # - yaml-lint + # # - json-lint + # # - xml-lint + # # - powershell-lint + # # - shellcheck-lint + # # - packer-iso-check + # # - packer-lint + # uses: ./.github/workflows/pkr-bld-vmware-arm64.yml + # secrets: inherit + + pkr-bld-vmware-x64: + # needs: + # - yaml-lint + # - json-lint + # - xml-lint + # - powershell-lint + # - shellcheck-lint + # - packer-iso-check + # - packer-lint + uses: ./.github/workflows/pkr-bld-vmware-x64.yml + secrets: inherit + + pkr-bld-hyperv-x64: + # needs: + # - yaml-lint + # - json-lint + # - xml-lint + # - powershell-lint + # - shellcheck-lint + # - packer-iso-check + # - packer-lint + uses: ./.github/workflows/pkr-bld-hyperv-x64.yml + secrets: inherit + +# pkr-bld-qemu-arm64: +# # needs: +# # - yaml-lint +# # - json-lint +# # - xml-lint +# # - powershell-lint +# # - shellcheck-lint +# # - packer-iso-check +# # - packer-lint +# uses: ./.github/workflows/pkr-bld-qemu-arm64.yml +# secrets: inherit + + pkr-bld-qemu-x64: + # needs: + # - yaml-lint + # - json-lint + # - xml-lint + # - powershell-lint + # - shellcheck-lint + # - packer-iso-check + # - packer-lint + uses: ./.github/workflows/pkr-bld-qemu-x64.yml secrets: inherit check_jobs_pass: @@ -55,7 +163,16 @@ jobs: - shellcheck-lint # - packer-iso-check # - packer-lint - # - packer-builds # Skipping for now until all builds are working + # - pkr-bld-amazonlinux-x64 + # - pkr-bld-hyperv-x64 + # - pkr-bld-parallels-arm64 + # - pkr-bld-parallels-x64 + # - pkr-bld-qemu-arm64 + # - pkr-bld-qemu-x64 + # - pkr-bld-virtualbox-arm64 + # - pkr-bld-virtualbox-x64 + # - pkr-bld-vmware-arm64 + # - pkr-bld-vmware-x64 runs-on: Ubuntu-latest steps: - name: Decide whether the needed jobs succeeded or failed diff --git a/.github/workflows/packer-builds.yml b/.github/workflows/packer-builds.yml deleted file mode 100644 index ece212fe7..000000000 --- a/.github/workflows/packer-builds.yml +++ /dev/null @@ -1,230 +0,0 @@ ---- -on: - workflow_call: - secrets: - PACKER_GITHUB_API_TOKEN: - required: true - -jobs: - builds-x86_64: - runs-on: macos-latest - strategy: - fail-fast: false - matrix: - os: - - almalinux-8 - - almalinux-9 - - centos-7 - - centos-stream-8 - - centos-stream-9 - - debian-10 - - debian-11 - - fedora-36 - - fedora-37 - - freebsd-12 - - freebsd-13 - - opensuse-leap-15 - - oraclelinux-7 - - oraclelinux-8 - - oraclelinux-9 - - rockylinux-8 - - rockylinux-9 - - scientificlinux-7 - - springdalelinux-7 - - springdalelinux-8 - - springdalelinux-9 - - ubuntu-18.04 - - ubuntu-20.04 - - ubuntu-22.04 - - ubuntu-22.10 - - windows-10 - - windows-11 - - windows-2012r2 - - windows-2016 - - windows-2019 - - windows-2022 - provider: - - qemu - - virtualbox-iso - exclude: - - os: centos-stream-9 - provider: virtualbox-iso - steps: - - name: Checkout - uses: actions/checkout@main - - name: Pull Change list - id: changed-files - uses: collin-miller/git-changesets@master - - name: Verify Changed files - id: verify-changed-files - run: | - echo '${{ steps.changed-files.outputs.added_modified }}' > changed.txt - if grep ".*\.pkrvars.hcl" changed.txt; then - echo "files_changed=true" >> $GITHUB_OUTPUT - else - echo "files_changed=false" >> $GITHUB_OUTPUT - fi - - name: Setup Packer - if: steps.verify-changed-files.outputs.files_changed == 'true' - uses: hashicorp/setup-packer@main - with: - version: latest - - name: Packer Init - if: steps.verify-changed-files.outputs.files_changed == 'true' - env: - PACKER_GITHUB_API_TOKEN: "${{ secrets.PACKER_GITHUB_API_TOKEN }}" - run: packer init -upgrade packer_templates - - name: Packer build - if: steps.verify-changed-files.outputs.files_changed == 'true' - run: packer build -only=${{ matrix.provider }}.vm -var "qemu_accelerator=hvf" -var-file=os_pkrvars/$(echo ${{ matrix.os }} | cut -d "-" -f 1)/"${{ matrix.os }}-x86_64.pkrvars.hcl" packer_templates - - name: Upload build artifact - uses: actions/upload-artifact@main - with: - name: vagrant-boxes - path: | - builds/*.box - retention-days: 10 - - builds-aarch64: - runs-on: self-hosted - strategy: - fail-fast: false - matrix: - os: - - almalinux-8 - - almalinux-9 - - centos-7 - - centos-stream-8 - - centos-stream-9 - - debian-10 - - debian-11 - - fedora-36 - - fedora-37 - - oraclelinux-7 - - oraclelinux-8 - - oraclelinux-9 - - rockylinux-8 - - rockylinux-9 - - ubuntu-20.04 - - ubuntu-22.04 - - ubuntu-22.10 - provider: - - parallels-iso - # - qemu - # - virtualbox-iso - # - vmware-iso - steps: - - name: Checkout - uses: actions/checkout@main - - name: Pull Change list - id: changed-files - uses: collin-miller/git-changesets@master - - name: Verify Changed files - id: verify-changed-files - run: | - echo '${{ steps.changed-files.outputs.added_modified }}' > changed.txt - if grep ".*\.pkrvars.hcl" changed.txt; then - echo "files_changed=true" >> $GITHUB_OUTPUT - else - echo "files_changed=false" >> $GITHUB_OUTPUT - fi - - name: Setup Packer - if: steps.verify-changed-files.outputs.files_changed == 'true' - uses: hashicorp/setup-packer@main - with: - version: latest - - name: Packer Init - if: steps.verify-changed-files.outputs.files_changed == 'true' - env: - PACKER_GITHUB_API_TOKEN: "${{ secrets.PACKER_GITHUB_API_TOKEN }}" - run: packer init -upgrade packer_templates - - name: Packer build - if: steps.verify-changed-files.outputs.files_changed == 'true' - run: packer build -only=${{ matrix.provider }}.vm -var "qemu_accelerator=hvf" -var-file=os_pkrvars/$(echo ${{ matrix.os }} | cut -d "-" -f 1)/"${{ matrix.os }}-aarch64.pkrvars.hcl" packer_templates - - name: Upload build artifact - uses: actions/upload-artifact@v3 - with: - name: vagrant-boxes - path: | - builds - !builds/packer-*/* - !build/.gitkeep - retention-days: 10 - -# builds-x86_64-hyperv: -# runs-on: windows-latest -# strategy: -# fail-fast: false -# matrix: -# os: -# - almalinux-8 -# - almalinux-9 -# - centos-7 -# - centos-stream-8 -# - centos-stream-9 -# - debian-10 -# - debian-11 -# - fedora-36 -# - fedora-37 -# - freebsd-12 -# - freebsd-13 -# - opensuse-leap-15 -# - oraclelinux-7 -# - oraclelinux-8 -# - oraclelinux-9 -# - rockylinux-8 -# - rockylinux-9 -# - scientificlinux-7 -# - springdalelinux-7 -# - springdalelinux-8 -# - springdalelinux-9 -# - ubuntu-18.04 -# - ubuntu-20.04 -# - ubuntu-22.04 -# - ubuntu-22.10 -# - windows-10 -# - windows-11 -# - windows-2012r2 -# - windows-2016 -# - windows-2019 -# - windows-2022 -# provider: -# - hyperv-iso -# -# steps: -# - name: Checkout -# uses: actions/checkout@main -# - name: Pull Change list -# id: changed-files -# uses: collin-miller/git-changesets@master -# - name: Verify Changed files -# id: verify-changed-files -# run: | -# echo '${{ steps.changed-files.outputs.added_modified }}' > changed.txt -# if grep ".*\.pkrvars.hcl" changed.txt; then -# echo "files_changed=true" >> $GITHUB_OUTPUT -# else -# echo "files_changed=false" >> $GITHUB_OUTPUT -# fi -# - name: Setup Packer -# if: steps.verify-changed-files.outputs.files_changed == 'true' -# uses: hashicorp/setup-packer@main -# with: -# version: latest -# - name: Packer Init -# if: steps.verify-changed-files.outputs.files_changed == 'true' -# env: -# PACKER_GITHUB_API_TOKEN: "${{ secrets.PACKER_GITHUB_API_TOKEN }}" -# run: packer init -upgrade packer_templates -# - name: Packer build -# if: steps.verify-changed-files.outputs.files_changed == 'true' -# run: packer build -only=${{ matrix.provider }}.vm -var "qemu_accelerator=whpx" -var-file=os_pkrvars/$(echo ${{ matrix.os }} | cut -d "-" -f 1)/"${{ matrix.os }}-x86_64.pkrvars.hcl" packer_templates -# - name: Upload build artifact -# uses: actions/upload-artifact@main -# with: -# name: vagrant-boxes -# path: | -# builds -# !builds/packer-*/* -# !build/.gitkeep -# retention-days: 10 diff --git a/.github/workflows/pkr-bld-amazonlinux-x64.yml b/.github/workflows/pkr-bld-amazonlinux-x64.yml new file mode 100644 index 000000000..49f6342f8 --- /dev/null +++ b/.github/workflows/pkr-bld-amazonlinux-x64.yml @@ -0,0 +1,45 @@ +--- +on: + workflow_call: + secrets: + PACKER_GITHUB_API_TOKEN: + required: true + +jobs: + x86_64: + runs-on: [self-hosted, X64, virtualbox] + steps: + - name: Checkout + uses: actions/checkout@main + - name: Pull Change list + id: changed-files + uses: collin-miller/git-changesets@master + - name: Verify Changed files + id: verify-changed-files + run: | + echo '${{ steps.changed-files.outputs.added_modified }}' > changed.txt + if grep ".*\.pkrvars.hcl" changed.txt; then + echo "files_changed=true" >> $GITHUB_OUTPUT + else + echo "files_changed=false" >> $GITHUB_OUTPUT + fi + - name: Setup Packer + if: steps.verify-changed-files.outputs.files_changed == 'true' + uses: hashicorp/setup-packer@main + with: + version: latest + - name: Packer Init + if: steps.verify-changed-files.outputs.files_changed == 'true' + env: + PACKER_GITHUB_API_TOKEN: "${{ secrets.PACKER_GITHUB_API_TOKEN }}" + run: packer init -upgrade packer_templates + - name: Packer build + if: steps.verify-changed-files.outputs.files_changed == 'true' + run: ./AMZ_build_virtualbox-ovf.sh + - name: Upload build artifact + uses: actions/upload-artifact@main + with: + name: "${{ matrix.os }}-virtualbox-x86_64.box" + path: | + builds/*.box + retention-days: 10 diff --git a/.github/workflows/pkr-bld-hyperv-x64.yml b/.github/workflows/pkr-bld-hyperv-x64.yml new file mode 100644 index 000000000..acc926d76 --- /dev/null +++ b/.github/workflows/pkr-bld-hyperv-x64.yml @@ -0,0 +1,84 @@ +--- +on: + workflow_call: + secrets: + PACKER_GITHUB_API_TOKEN: + required: true + +jobs: + x86_64: + runs-on: [self-hosted, X64, hyperv] + strategy: + fail-fast: false + matrix: + os: + - almalinux-8 + - almalinux-9 + - centos-7 + - centos-stream-8 + - centos-stream-9 + - debian-10 + - debian-11 + - fedora-36 + - fedora-37 + - freebsd-12 + - freebsd-13 + - opensuse-leap-15 + - oraclelinux-7 + - oraclelinux-8 + - oraclelinux-9 + - rockylinux-8 + - rockylinux-9 + - scientificlinux-7 + - springdalelinux-7 + - springdalelinux-8 + - springdalelinux-9 + - ubuntu-18.04 + - ubuntu-20.04 + - ubuntu-22.04 + - ubuntu-22.10 + - windows-10 + - windows-10gen2 + - windows-11 + - windows-11gen2 + - windows-2012r2 + - windows-2016 + - windows-2019 + - windows-2022 + provider: + - hyperv-iso + steps: + - name: Checkout + uses: actions/checkout@main +# - name: Pull Change list +# id: changed-files +# uses: collin-miller/git-changesets@master +# - name: Verify Changed files +# id: verify-changed-files +# run: | +# echo '${{ steps.changed-files.outputs.added_modified }}' > changed.txt +# if grep ".*\.pkrvars.hcl" changed.txt; then +# echo "files_changed=true" >> $GITHUB_OUTPUT +# else +# echo "files_changed=false" >> $GITHUB_OUTPUT +# fi + - name: Setup Packer +# if: steps.verify-changed-files.outputs.files_changed == 'true' + uses: hashicorp/setup-packer@main + with: + version: latest + - name: Packer Init +# if: steps.verify-changed-files.outputs.files_changed == 'true' + env: + PACKER_GITHUB_API_TOKEN: "${{ secrets.PACKER_GITHUB_API_TOKEN }}" + run: packer init -upgrade packer_templates + - name: Packer build +# if: steps.verify-changed-files.outputs.files_changed == 'true' + run: packer build -timestamp-ui -only="${{ matrix.provider }}.vm" -var-file="os_pkrvars/$("${{ matrix.os }}".Split('-')[0])/${{ matrix.os }}-x86_64.pkrvars.hcl" packer_templates + - name: Upload build artifact + uses: actions/upload-artifact@main + with: + name: "${{ matrix.os }}-hyperv-x86_64.box" + path: | + builds/*.box + retention-days: 10 diff --git a/.github/workflows/pkr-bld-parallels-arm64.yml b/.github/workflows/pkr-bld-parallels-arm64.yml new file mode 100644 index 000000000..09a9d7e50 --- /dev/null +++ b/.github/workflows/pkr-bld-parallels-arm64.yml @@ -0,0 +1,69 @@ +--- +on: + workflow_call: + secrets: + PACKER_GITHUB_API_TOKEN: + required: true + +jobs: + aarch64: + runs-on: [self-hosted, ARM64, parallels] + strategy: + fail-fast: false + matrix: + os: + - almalinux-8 + - almalinux-9 + - centos-7 + - centos-stream-8 + - centos-stream-9 + - debian-10 + - debian-11 + - fedora-36 + - fedora-37 + - oraclelinux-7 + - oraclelinux-8 + - oraclelinux-9 + - rockylinux-8 + - rockylinux-9 + - ubuntu-18.04 + - ubuntu-20.04 + - ubuntu-22.04 + - ubuntu-22.10 + provider: + - parallels-iso + steps: + - name: Checkout + uses: actions/checkout@main + - name: Pull Change list + id: changed-files + uses: collin-miller/git-changesets@master + - name: Verify Changed files + id: verify-changed-files + run: | + echo '${{ steps.changed-files.outputs.added_modified }}' > changed.txt + if grep ".*\.pkrvars.hcl" changed.txt; then + echo "files_changed=true" >> $GITHUB_OUTPUT + else + echo "files_changed=false" >> $GITHUB_OUTPUT + fi + - name: Setup Packer + if: steps.verify-changed-files.outputs.files_changed == 'true' + uses: hashicorp/setup-packer@main + with: + version: latest + - name: Packer Init + if: steps.verify-changed-files.outputs.files_changed == 'true' + env: + PACKER_GITHUB_API_TOKEN: "${{ secrets.PACKER_GITHUB_API_TOKEN }}" + run: packer init -upgrade packer_templates + - name: Packer build + if: steps.verify-changed-files.outputs.files_changed == 'true' + run: packer build -timestamp-ui -only=${{ matrix.provider }}.vm -var-file=os_pkrvars/$(echo ${{ matrix.os }} | cut -d "-" -f 1)/"${{ matrix.os }}-aarch64.pkrvars.hcl" packer_templates + - name: Upload build artifact + uses: actions/upload-artifact@v3 + with: + name: "${{ matrix.os }}-parallels-aarch64.box" + path: | + builds/*.box + retention-days: 10 diff --git a/.github/workflows/pkr-bld-parallels-x64.yml b/.github/workflows/pkr-bld-parallels-x64.yml new file mode 100644 index 000000000..2af687438 --- /dev/null +++ b/.github/workflows/pkr-bld-parallels-x64.yml @@ -0,0 +1,82 @@ +--- +on: + workflow_call: + secrets: + PACKER_GITHUB_API_TOKEN: + required: true + +jobs: + x86_64: + runs-on: [self-hosted, X64, parallels] + strategy: + fail-fast: false + matrix: + os: + - almalinux-8 + - almalinux-9 + - centos-7 + - centos-stream-8 + - centos-stream-9 + - debian-10 + - debian-11 + - fedora-36 + - fedora-37 + - freebsd-12 + - freebsd-13 + - opensuse-leap-15 + - oraclelinux-7 + - oraclelinux-8 + - oraclelinux-9 + - rockylinux-8 + - rockylinux-9 + - scientificlinux-7 + - springdalelinux-7 + - springdalelinux-8 + - springdalelinux-9 + - ubuntu-18.04 + - ubuntu-20.04 + - ubuntu-22.04 + - ubuntu-22.10 + - windows-10 + - windows-11 + - windows-2012r2 + - windows-2016 + - windows-2019 + - windows-2022 + provider: + - parallels-iso + steps: + - name: Checkout + uses: actions/checkout@main + - name: Pull Change list + id: changed-files + uses: collin-miller/git-changesets@master + - name: Verify Changed files + id: verify-changed-files + run: | + echo '${{ steps.changed-files.outputs.added_modified }}' > changed.txt + if grep ".*\.pkrvars.hcl" changed.txt; then + echo "files_changed=true" >> $GITHUB_OUTPUT + else + echo "files_changed=false" >> $GITHUB_OUTPUT + fi + - name: Setup Packer + if: steps.verify-changed-files.outputs.files_changed == 'true' + uses: hashicorp/setup-packer@main + with: + version: latest + - name: Packer Init + if: steps.verify-changed-files.outputs.files_changed == 'true' + env: + PACKER_GITHUB_API_TOKEN: "${{ secrets.PACKER_GITHUB_API_TOKEN }}" + run: packer init -upgrade packer_templates + - name: Packer build + if: steps.verify-changed-files.outputs.files_changed == 'true' + run: packer build -timestamp-ui -only=${{ matrix.provider }}.vm -var-file=os_pkrvars/$(echo ${{ matrix.os }} | cut -d "-" -f 1)/"${{ matrix.os }}-x86_64.pkrvars.hcl" packer_templates + - name: Upload build artifact + uses: actions/upload-artifact@v3 + with: + name: "${{ matrix.os }}-parallels-x86_64.box" + path: | + builds/*.box + retention-days: 10 diff --git a/.github/workflows/pkr-bld-qemu-arm64.yml b/.github/workflows/pkr-bld-qemu-arm64.yml new file mode 100644 index 000000000..a8b6d5338 --- /dev/null +++ b/.github/workflows/pkr-bld-qemu-arm64.yml @@ -0,0 +1,69 @@ +--- +on: + workflow_call: + secrets: + PACKER_GITHUB_API_TOKEN: + required: true + +jobs: + aarch64: + runs-on: [self-hosted, ARM64, qemu] + strategy: + fail-fast: false + matrix: + os: + - almalinux-8 + - almalinux-9 + - centos-7 + - centos-stream-8 + - centos-stream-9 + - debian-10 + - debian-11 + - fedora-36 + - fedora-37 + - oraclelinux-7 + - oraclelinux-8 + - oraclelinux-9 + - rockylinux-8 + - rockylinux-9 + - ubuntu-18.04 + - ubuntu-20.04 + - ubuntu-22.04 + - ubuntu-22.10 + provider: + - qemu + steps: + - name: Checkout + uses: actions/checkout@main + - name: Pull Change list + id: changed-files + uses: collin-miller/git-changesets@master + - name: Verify Changed files + id: verify-changed-files + run: | + echo '${{ steps.changed-files.outputs.added_modified }}' > changed.txt + if grep ".*\.pkrvars.hcl" changed.txt; then + echo "files_changed=true" >> $GITHUB_OUTPUT + else + echo "files_changed=false" >> $GITHUB_OUTPUT + fi + - name: Setup Packer + if: steps.verify-changed-files.outputs.files_changed == 'true' + uses: hashicorp/setup-packer@main + with: + version: latest + - name: Packer Init + if: steps.verify-changed-files.outputs.files_changed == 'true' + env: + PACKER_GITHUB_API_TOKEN: "${{ secrets.PACKER_GITHUB_API_TOKEN }}" + run: packer init -upgrade packer_templates + - name: Packer build + if: steps.verify-changed-files.outputs.files_changed == 'true' + run: packer build -timestamp-ui -only=${{ matrix.provider }}.vm -var "qemu_accelerator=hvf" -var-file=os_pkrvars/$(echo ${{ matrix.os }} | cut -d "-" -f 1)/"${{ matrix.os }}-aarch64.pkrvars.hcl" packer_templates + - name: Upload build artifact + uses: actions/upload-artifact@v3 + with: + name: "${{ matrix.os }}-qemu-aarch64.box" + path: | + builds/*.box + retention-days: 10 diff --git a/.github/workflows/pkr-bld-qemu-x64.yml b/.github/workflows/pkr-bld-qemu-x64.yml new file mode 100644 index 000000000..1625605ad --- /dev/null +++ b/.github/workflows/pkr-bld-qemu-x64.yml @@ -0,0 +1,84 @@ +--- +on: + workflow_call: + secrets: + PACKER_GITHUB_API_TOKEN: + required: true + +jobs: + x86_64: + runs-on: [self-hosted, X64, qemu] + strategy: + fail-fast: false + matrix: + os: + - almalinux-8 + - almalinux-9 + - centos-7 + - centos-stream-8 + - centos-stream-9 + - debian-10 + - debian-11 + - fedora-36 + - fedora-37 + - freebsd-12 + - freebsd-13 + - opensuse-leap-15 + - oraclelinux-7 + - oraclelinux-8 + - oraclelinux-9 + - rockylinux-8 + - rockylinux-9 + - scientificlinux-7 + - springdalelinux-7 + - springdalelinux-8 + - springdalelinux-9 + - ubuntu-18.04 + - ubuntu-20.04 + - ubuntu-22.04 + - ubuntu-22.10 + - windows-10 + - windows-11 + - windows-2012r2 + - windows-2016 + - windows-2019 + - windows-2022 + provider: + - qemu + steps: + - name: Checkout + uses: actions/checkout@main + - name: Pull Change list + id: changed-files + uses: collin-miller/git-changesets@master + - name: Verify Changed files + id: verify-changed-files + run: | + echo '${{ steps.changed-files.outputs.added_modified }}' > changed.txt + if grep ".*\.pkrvars.hcl" changed.txt; then + echo "files_changed=true" >> $GITHUB_OUTPUT + else + echo "files_changed=false" >> $GITHUB_OUTPUT + fi + - name: Download virtio-win.iso + run: curl https://fedorapeople.org/groups/virt/virtio-win/direct-downloads/archive-virtio/virtio-win-0.1.229-1/virtio-win.iso -o packer_templates/win_answer_files/virtio-win.iso + - name: Setup Packer + if: steps.verify-changed-files.outputs.files_changed == 'true' + uses: hashicorp/setup-packer@main + with: + version: latest + - name: Packer Init + if: steps.verify-changed-files.outputs.files_changed == 'true' + env: + PACKER_GITHUB_API_TOKEN: "${{ secrets.PACKER_GITHUB_API_TOKEN }}" + run: packer init -upgrade packer_templates + - name: Packer build + if: steps.verify-changed-files.outputs.files_changed == 'true' + run: packer build -timestamp-ui -only=${{ matrix.provider }}.vm -var "qemu_accelerator=hvf" -var-file=os_pkrvars/$(echo ${{ matrix.os }} | cut -d "-" -f 1)/"${{ matrix.os }}-x86_64.pkrvars.hcl" packer_templates + - name: Upload build artifact + uses: actions/upload-artifact@main + with: + name: "${{ matrix.os }}-qemu-x86_64.box" + path: | + builds/*.box + retention-days: 10 diff --git a/.github/workflows/pkr-bld-virtualbox-arm64.yml b/.github/workflows/pkr-bld-virtualbox-arm64.yml new file mode 100644 index 000000000..48f6651f6 --- /dev/null +++ b/.github/workflows/pkr-bld-virtualbox-arm64.yml @@ -0,0 +1,69 @@ +--- +on: + workflow_call: + secrets: + PACKER_GITHUB_API_TOKEN: + required: true + +jobs: + aarch64: + runs-on: [self-hosted, ARM64, virtualbox] + strategy: + fail-fast: false + matrix: + os: + - almalinux-8 + - almalinux-9 + - centos-7 + - centos-stream-8 + - centos-stream-9 + - debian-10 + - debian-11 + - fedora-36 + - fedora-37 + - oraclelinux-7 + - oraclelinux-8 + - oraclelinux-9 + - rockylinux-8 + - rockylinux-9 + - ubuntu-18.04 + - ubuntu-20.04 + - ubuntu-22.04 + - ubuntu-22.10 + provider: + - virtualbox-iso + steps: + - name: Checkout + uses: actions/checkout@main + - name: Pull Change list + id: changed-files + uses: collin-miller/git-changesets@master + - name: Verify Changed files + id: verify-changed-files + run: | + echo '${{ steps.changed-files.outputs.added_modified }}' > changed.txt + if grep ".*\.pkrvars.hcl" changed.txt; then + echo "files_changed=true" >> $GITHUB_OUTPUT + else + echo "files_changed=false" >> $GITHUB_OUTPUT + fi + - name: Setup Packer + if: steps.verify-changed-files.outputs.files_changed == 'true' + uses: hashicorp/setup-packer@main + with: + version: latest + - name: Packer Init + if: steps.verify-changed-files.outputs.files_changed == 'true' + env: + PACKER_GITHUB_API_TOKEN: "${{ secrets.PACKER_GITHUB_API_TOKEN }}" + run: packer init -upgrade packer_templates + - name: Packer build + if: steps.verify-changed-files.outputs.files_changed == 'true' + run: packer build -timestamp-ui -only=${{ matrix.provider }}.vm -var-file=os_pkrvars/$(echo ${{ matrix.os }} | cut -d "-" -f 1)/"${{ matrix.os }}-aarch64.pkrvars.hcl" packer_templates + - name: Upload build artifact + uses: actions/upload-artifact@main + with: + name: "${{ matrix.os }}-virtualbox-aarch64.box" + path: | + builds/*.box + retention-days: 10 diff --git a/.github/workflows/pkr-bld-virtualbox-x64.yml b/.github/workflows/pkr-bld-virtualbox-x64.yml new file mode 100644 index 000000000..8b581833f --- /dev/null +++ b/.github/workflows/pkr-bld-virtualbox-x64.yml @@ -0,0 +1,82 @@ +--- +on: + workflow_call: + secrets: + PACKER_GITHUB_API_TOKEN: + required: true + +jobs: + x86_64: + runs-on: [self-hosted, X64, virtualbox] + strategy: + fail-fast: false + matrix: + os: + - almalinux-8 + - almalinux-9 + - centos-7 + - centos-stream-8 + - centos-stream-9 + - debian-10 + - debian-11 + - fedora-36 + - fedora-37 + - freebsd-12 + - freebsd-13 + - opensuse-leap-15 + - oraclelinux-7 + - oraclelinux-8 + - oraclelinux-9 + - rockylinux-8 + - rockylinux-9 + - scientificlinux-7 + - springdalelinux-7 + - springdalelinux-8 + - springdalelinux-9 + - ubuntu-18.04 + - ubuntu-20.04 + - ubuntu-22.04 + - ubuntu-22.10 + - windows-10 + - windows-11 + - windows-2012r2 + - windows-2016 + - windows-2019 + - windows-2022 + provider: + - virtualbox-iso + steps: + - name: Checkout + uses: actions/checkout@main + - name: Pull Change list + id: changed-files + uses: collin-miller/git-changesets@master + - name: Verify Changed files + id: verify-changed-files + run: | + echo '${{ steps.changed-files.outputs.added_modified }}' > changed.txt + if grep ".*\.pkrvars.hcl" changed.txt; then + echo "files_changed=true" >> $GITHUB_OUTPUT + else + echo "files_changed=false" >> $GITHUB_OUTPUT + fi + - name: Setup Packer + if: steps.verify-changed-files.outputs.files_changed == 'true' + uses: hashicorp/setup-packer@main + with: + version: latest + - name: Packer Init + if: steps.verify-changed-files.outputs.files_changed == 'true' + env: + PACKER_GITHUB_API_TOKEN: "${{ secrets.PACKER_GITHUB_API_TOKEN }}" + run: packer init -upgrade packer_templates + - name: Packer build + if: steps.verify-changed-files.outputs.files_changed == 'true' + run: packer build -timestamp-ui -only=${{ matrix.provider }}.vm -var-file=os_pkrvars/$(echo ${{ matrix.os }} | cut -d "-" -f 1)/"${{ matrix.os }}-x86_64.pkrvars.hcl" packer_templates + - name: Upload build artifact + uses: actions/upload-artifact@main + with: + name: "${{ matrix.os }}-virtualbox-x86_64.box" + path: | + builds/*.box + retention-days: 10 diff --git a/.github/workflows/pkr-bld-vmware-arm64.yml b/.github/workflows/pkr-bld-vmware-arm64.yml new file mode 100644 index 000000000..0c6bfaf6f --- /dev/null +++ b/.github/workflows/pkr-bld-vmware-arm64.yml @@ -0,0 +1,69 @@ +--- +on: + workflow_call: + secrets: + PACKER_GITHUB_API_TOKEN: + required: true + +jobs: + aarch64: + runs-on: [self-hosted, ARM64, vmware-fusion] + strategy: + fail-fast: false + matrix: + os: + - almalinux-8 + - almalinux-9 + - centos-7 + - centos-stream-8 + - centos-stream-9 + - debian-10 + - debian-11 + - fedora-36 + - fedora-37 + - oraclelinux-7 + - oraclelinux-8 + - oraclelinux-9 + - rockylinux-8 + - rockylinux-9 + - ubuntu-18.04 + - ubuntu-20.04 + - ubuntu-22.04 + - ubuntu-22.10 + provider: + - vmware-iso + steps: + - name: Checkout + uses: actions/checkout@main + - name: Pull Change list + id: changed-files + uses: collin-miller/git-changesets@master + - name: Verify Changed files + id: verify-changed-files + run: | + echo '${{ steps.changed-files.outputs.added_modified }}' > changed.txt + if grep ".*\.pkrvars.hcl" changed.txt; then + echo "files_changed=true" >> $GITHUB_OUTPUT + else + echo "files_changed=false" >> $GITHUB_OUTPUT + fi + - name: Setup Packer + if: steps.verify-changed-files.outputs.files_changed == 'true' + uses: hashicorp/setup-packer@main + with: + version: latest + - name: Packer Init + if: steps.verify-changed-files.outputs.files_changed == 'true' + env: + PACKER_GITHUB_API_TOKEN: "${{ secrets.PACKER_GITHUB_API_TOKEN }}" + run: packer init -upgrade packer_templates + - name: Packer build + if: steps.verify-changed-files.outputs.files_changed == 'true' + run: packer build -timestamp-ui -only=${{ matrix.provider }}.vm -var-file=os_pkrvars/$(echo ${{ matrix.os }} | cut -d "-" -f 1)/"${{ matrix.os }}-aarch64.pkrvars.hcl" packer_templates + - name: Upload build artifact + uses: actions/upload-artifact@v3 + with: + name: "${{ matrix.os }}-vmware-aarch64.box" + path: | + builds/*.box + retention-days: 10 diff --git a/.github/workflows/pkr-bld-vmware-x64.yml b/.github/workflows/pkr-bld-vmware-x64.yml new file mode 100644 index 000000000..e97262588 --- /dev/null +++ b/.github/workflows/pkr-bld-vmware-x64.yml @@ -0,0 +1,82 @@ +--- +on: + workflow_call: + secrets: + PACKER_GITHUB_API_TOKEN: + required: true + +jobs: + x86_64: + runs-on: [self-hosted, X64, vmware-fusion] + strategy: + fail-fast: false + matrix: + os: + - almalinux-8 + - almalinux-9 + - centos-7 + - centos-stream-8 + - centos-stream-9 + - debian-10 + - debian-11 + - fedora-36 + - fedora-37 + - freebsd-12 + - freebsd-13 + - opensuse-leap-15 + - oraclelinux-7 + - oraclelinux-8 + - oraclelinux-9 + - rockylinux-8 + - rockylinux-9 + - scientificlinux-7 + - springdalelinux-7 + - springdalelinux-8 + - springdalelinux-9 + - ubuntu-18.04 + - ubuntu-20.04 + - ubuntu-22.04 + - ubuntu-22.10 + - windows-10 + - windows-11 + - windows-2012r2 + - windows-2016 + - windows-2019 + - windows-2022 + provider: + - vmware-iso + steps: + - name: Checkout + uses: actions/checkout@main + - name: Pull Change list + id: changed-files + uses: collin-miller/git-changesets@master + - name: Verify Changed files + id: verify-changed-files + run: | + echo '${{ steps.changed-files.outputs.added_modified }}' > changed.txt + if grep ".*\.pkrvars.hcl" changed.txt; then + echo "files_changed=true" >> $GITHUB_OUTPUT + else + echo "files_changed=false" >> $GITHUB_OUTPUT + fi + - name: Setup Packer + if: steps.verify-changed-files.outputs.files_changed == 'true' + uses: hashicorp/setup-packer@main + with: + version: latest + - name: Packer Init + if: steps.verify-changed-files.outputs.files_changed == 'true' + env: + PACKER_GITHUB_API_TOKEN: "${{ secrets.PACKER_GITHUB_API_TOKEN }}" + run: packer init -upgrade packer_templates + - name: Packer build + if: steps.verify-changed-files.outputs.files_changed == 'true' + run: packer build -timestamp-ui -only=${{ matrix.provider }}.vm -var-file=os_pkrvars/$(echo ${{ matrix.os }} | cut -d "-" -f 1)/"${{ matrix.os }}-x86_64.pkrvars.hcl" packer_templates + - name: Upload build artifact + uses: actions/upload-artifact@v3 + with: + name: "${{ matrix.os }}-vmware-x86_64.box" + path: | + builds/*.box + retention-days: 10 diff --git a/.gitignore b/.gitignore index 7f457c5cc..5f4b6dddd 100644 --- a/.gitignore +++ b/.gitignore @@ -7,7 +7,7 @@ *.vdi *.log virtualfloppy.vfd -packer_cache +packer_cache/ packer.log .DS_Store Gemfile.lock diff --git a/.mdlrc b/.mdlrc index f9c9a2dd7..295c24970 100644 --- a/.mdlrc +++ b/.mdlrc @@ -1 +1 @@ -rules "~MD007", "~MD013", "~MD024" +rules "~MD007", "~MD013", "~MD024", "~MD033" diff --git a/AMZ_build_virtualbox-ovf.sh b/AMZ_build_virtualbox-ovf.sh index dd683a7d5..aff63234e 100755 --- a/AMZ_build_virtualbox-ovf.sh +++ b/AMZ_build_virtualbox-ovf.sh @@ -20,10 +20,10 @@ if [ ! -f "$AMZDIR"/amazon.vdi ]; then fi echo "Cleaning up old files" -rm "$AMZDIR"/*.iso "$AMZDIR"/*.ovf "$AMZDIR"/*.vmdk +rm -f "$AMZDIR"/*.iso "$AMZDIR"/*.ovf "$AMZDIR"/*.vmdk echo "Creating ISO" -hdiutil makehybrid -o "$AMZDIR"/seed.iso -hfs -joliet -iso -default-volume-name cidata seed_iso +hdiutil makehybrid -o "$AMZDIR"/seed.iso -hfs -joliet -iso -default-volume-name cidata "$AMZDIR"/../amz_seed_iso VM="AmazonLinuxBento" echo Powering off and deleting any existing VMs named $VM @@ -59,7 +59,9 @@ echo Deleting the VM vboxmanage unregistervm $VM --delete echo starting packer build of amazonlinux -if packer build -only=virtualbox-ovf.amazonlinux -var-file="$SCRIPT_RELATIVE_DIR"/os_pkrvars/amazonlinux/amazonlinux-2-x86_64.pkrvars.hcl "$SCRIPT_RELATIVE_DIR"/packer_templates; then +if packer build -timestamp-ui -only=virtualbox-ovf.amazonlinux -var-file="$AMZDIR"/../../os_pkrvars/amazonlinux/amazonlinux-2-x86_64.pkrvars.hcl "$AMZDIR"/../../packer_templates; then echo "Cleaning up files" - rm "$AMZDIR"/*.ovf "$AMZDIR"/*.vmdk "$AMZDIR"/*.iso + rm -f "$AMZDIR"/*.ovf "$AMZDIR"/*.vmdk "$AMZDIR"/*.iso +else + exit 1 fi diff --git a/CHANGELOG.md b/CHANGELOG.md index af6540a9e..e654dd7e3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,87 @@ # Change Log +## Working Builds + +***Note:** +Markdown table generated at <https://www.tablesgenerator.com/markdown_tables#> + +| | hyperv<br>x86_64 | parallels<br>x86_64 | parallels<br>aarch64 | qemu<br>x86_64 | qemu<br>aarch64 | virtualbox<br>x86_64 | virtualbox<br>aarch64 | vmware<br>x86_64 | vmware<br>aarch64 | +|:---:|:---:|:---:|:---:|:---:|:---:|:---:|:---:|:---:|:---:| +| almalinux-8 | | x | | x | | x | | x | | +| almalinux-9 | | x | | | | x | | x | | +| amazonlinux-2 | | na | na | na | na | x | | na | na | +| amazonlinux-2022 | na | na | na | na | na | na | na | na | na | +| centos-7 | | x | | x | | x | | x | | +| centos-stream-8 | | x | | x | | x | | x | | +| centos-stream-9 | | | | | | x | | x | | +| debian-10 | | | | | | x | | x | | +| debian-11 | | x | | | | x | | x | | +| fedora-36 | | x | | x | | x | | x | | +| fedora-37 | | x | | x | | x | | x | | +| freebsd-12 | | | na | | na | x | na | | na | +| freebsd-13 | | | na | | na | x | na | | na | +| opensuse-leap-15 | | | na | | na | | na | x | na | +| oraclelinux-7 | | x | | x | | x | | x | | +| oraclelinux-8 | | | | x | | x | | x | | +| oraclelinux-9 | | x | | | | x | | x | | +| rhel-7 | | | | | | | | | | +| rhel-8 | | | | | | | | | | +| rhel-9 | | | | | | | | | | +| rockylinux-8 | | x | | x | | x | | x | | +| rockylinux-9 | | x | | | | x | | x | | +| scientificlinux-7 | | x | na | | na | x | na | x | na | +| sles-12 | | | na | | na | | na | | na | +| sles-13 | | | na | | na | | na | | na | +| solaris-11 | | | na | | na | | na | | na | +| springdalelinux-7 | | x | na | x | na | | na | | na | +| springdalelinux-8 | | x | na | x | na | x | na | x | na | +| springdalelinux-9 | | x | na | | na | x | na | x | na | +| ubuntu-18.04 | | x | | | | x | | x | | +| ubuntu-20.04 | | | | | | | | | | +| ubuntu-22.04 | | x | | x | | x | | | | +| ubuntu-22.10 | | x | | x | | x | | x | | +| ubuntu-23.04 | na | na | na | na | na | na | na | na | na | +| windows-10 | x | x | na | | na | x | na | | na | +| windows-10gen2 | | na | na | na | na | na | na | na | na | +| windows-11 | x | x | na | | na | x | na | | na | +| windows-11gen2 | | na | na | na | na | na | na | na | na | +| windows-2012r2 | | x | na | | na | x | na | | na | +| windows-2016 | x | x | na | | na | x | na | x | na | +| windows-2019 | x | x | na | | na | x | na | | na | +| windows-2022 | x | x | na | | na | x | na | | na | + +## [unreleased] (2023-02-22) + +## [v202302.22.0] (2023-02-22) + +### New Platforms + +- Ubuntu 18.04 aarch64 + +### Fixes and updates + +- fixed Ubuntu aarch64 builds +- various box fixes as found +- added qemu pipeline builds +- added hyperv pipeline builds +- added vmware pipeline builds + +### Todo + +- Fix failing builds +- Add more Virtualization providers to build pipelines + - vmware + - aarch64 - vmware plugin has issues with fusion 13 + - virtualbox + - aarch64 - Vbox Beta support currently +- Finish removal of deprecated chef-solo provider to powershell provider for windows +- migrate from http directory for hosting files to cd_files in source templates + - This makes all builds compatable with hyper-v gen 2 which removes floppy disk capability + - This also makes things universal for Virtualbox 6.1 to 7.x due to latter requiring extra config for guests on NAT to be able to connect to host +- Update pipelines to only run on updated pkrvars files +- Create CD pipeline to upload vagrant boxes after PR is merged +- Create CD pipeline to build and upload new versions of vagrant boxes once every 3 months with the latest patches + ## [v202301.19.0] (2023-01-19) ### Notes diff --git a/README.md b/README.md index 9372d80a6..b98fdb680 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ Bento is a project that encapsulates [Packer](https://www.packer.io/) templates ***NOTE:** -- Virutalbox 7.x requires extra config to allow nat network to connect to the host. To use uncomment lines #154 and #155 in bento/packer_templates/pkr-variables.pkr.hcl +- Virutalbox 6.x requires disabling nat config that allows vbox 7.x guests to connect to the host. To use comment out lines #161 and #162 in bento/packer_templates/pkr-variables.pkr.hcl or add variable `vboxmanage = []` to os_pkrvars files. - When running packer build command the output directory is relative to the working directory the command is currently running in. Suggest running packer build commands from bento root directory for build working files to be placed in bento/builds/(build_name) directory by default. If the output_directory variable isn't overwritten a directory called builds/(build_name) will be created in the current working directory that you are running the command from ## Using Public Boxes @@ -85,7 +85,7 @@ If the build is successful, your box files will be in the `builds` directory at #### KVM/qemu support for Windows -You must download [the iso image with the Windows drivers for paravirtualized KVM/qemu hardware](https://fedorapeople.org/groups/virt/virtio-win/direct-downloads/stable-virtio/virtio-win.iso). You can do this from the command line: `wget -nv -nc https://fedorapeople.org/groups/virt/virtio-win/direct-downloads/stable-virtio/virtio-win.iso -O virtio-win.iso`. +You must download [the iso image with the Windows drivers for paravirtualized KVM/qemu hardware](https://fedorapeople.org/groups/virt/virtio-win/direct-downloads/stable-virtio/virtio-win.iso). You can do this from the command line: `wget -nv -nc https://fedorapeople.org/groups/virt/virtio-win/direct-downloads/stable-virtio/virtio-win.iso -O virtio-win.iso` and place it in the packer_templates/win_answer_files/ directory. You can use the following sample command to build a KVM/qemu Windows box: @@ -156,7 +156,7 @@ These basebox templates were converted from [veewee](https://github.com/jedi4eve - Author: Corey Hemminger ([corey.hemminger@progress.com](mailto:corey.hemminger@progress.com)) ```text -Copyright 2012-2022, Progress Software, Inc. (<legal@chef.io>) +Copyright 2012-2023, Progress Software, Inc. (<legal@chef.io>) Copyright 2011-2012, Tim Dysinger (<tim@dysinger.net>) Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/os_pkrvars/almalinux/almalinux-8-aarch64.pkrvars.hcl b/os_pkrvars/almalinux/almalinux-8-aarch64.pkrvars.hcl index 136f4a0fc..235f83d83 100644 --- a/os_pkrvars/almalinux/almalinux-8-aarch64.pkrvars.hcl +++ b/os_pkrvars/almalinux/almalinux-8-aarch64.pkrvars.hcl @@ -1,10 +1,9 @@ os_name = "almalinux" os_version = "8.7" os_arch = "aarch64" -iso_url = "https://repo.almalinux.org/almalinux/8/isos/aarch64/AlmaLinux-8.7-aarch64-dvd.iso" +iso_url = "https://repo.almalinux.org/almalinux/8/isos/aarch64/AlmaLinux-8.7-update-1-aarch64-minimal.iso" iso_checksum = "file:https://repo.almalinux.org/almalinux/8/isos/aarch64/CHECKSUM" parallels_guest_os_type = "centos" vbox_guest_os_type = "RedHat_64" vmware_guest_os_type = "centos-64" -boot_command = ["<up>e<wait><down><down><end><wait> inst.text inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/rhel/8ks.cfg <leftCtrlOn>x<leftCtrlOff>"] -boot_command_hyperv = ["<wait5><up><wait5><tab> text ks=hd:fd0:/ks.cfg<enter><wait5><esc>"] +boot_command = ["<wait><up>e<wait><down><down><end><wait> inst.text inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/rhel/8ks.cfg <leftCtrlOn>x<leftCtrlOff>"] diff --git a/os_pkrvars/almalinux/almalinux-8-x86_64.pkrvars.hcl b/os_pkrvars/almalinux/almalinux-8-x86_64.pkrvars.hcl index a08fc7b7d..4063af098 100644 --- a/os_pkrvars/almalinux/almalinux-8-x86_64.pkrvars.hcl +++ b/os_pkrvars/almalinux/almalinux-8-x86_64.pkrvars.hcl @@ -1,10 +1,9 @@ os_name = "almalinux" os_version = "8.7" os_arch = "x86_64" -iso_url = "https://repo.almalinux.org/almalinux/8/isos/x86_64/AlmaLinux-8.7-x86_64-dvd.iso" -iso_checksum = "b95ddf9d56a849cc8eb4b95dd2321c13af637d3379b91f5d96c39e96fb4403b3" +iso_url = "https://repo.almalinux.org/almalinux/8/isos/x86_64/AlmaLinux-8.7-update-1-x86_64-minimal.iso" +iso_checksum = "file:https://repo.almalinux.org/almalinux/8/isos/x86_64/CHECKSUM" parallels_guest_os_type = "centos" vbox_guest_os_type = "RedHat_64" vmware_guest_os_type = "centos-64" -boot_command = ["<up><wait><tab> inst.text inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/rhel/8ks.cfg<enter><wait>"] -boot_command_hyperv = ["<wait5><up><wait5><tab> text ks=hd:fd0:/ks.cfg<enter><wait5><esc>"] +boot_command = ["<wait><up><wait><tab> inst.text inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/rhel/8ks.cfg<enter><wait>"] diff --git a/os_pkrvars/almalinux/almalinux-9-aarch64.pkrvars.hcl b/os_pkrvars/almalinux/almalinux-9-aarch64.pkrvars.hcl index 1de42577c..9f15caaad 100644 --- a/os_pkrvars/almalinux/almalinux-9-aarch64.pkrvars.hcl +++ b/os_pkrvars/almalinux/almalinux-9-aarch64.pkrvars.hcl @@ -2,9 +2,8 @@ os_name = "almalinux" os_version = "9.1" os_arch = "aarch64" iso_url = "https://repo.almalinux.org/almalinux/9/isos/aarch64/AlmaLinux-9.1-aarch64-dvd.iso" -iso_checksum = "a6f0fb355b9c82f13a95f3f02e19b0f07906a7e0f27e3bca144338ebac9abf40" +iso_checksum = "file:https://repo.almalinux.org/almalinux/9/isos/aarch64/CHECKSUM" parallels_guest_os_type = "centos" vbox_guest_os_type = "RedHat_64" vmware_guest_os_type = "centos-64" -boot_command = ["<up>e<wait><down><down><end><wait> inst.text inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/rhel/9ks.cfg<leftCtrlOn>x<leftCtrlOff>"] -boot_command_hyperv = ["<wait5><up><wait5><tab> text ks=hd:fd0:/ks.cfg<enter><wait5><esc>"] +boot_command = ["<wait><up>e<wait><down><down><end><wait> inst.text inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/rhel/9ks.cfg <leftCtrlOn>x<leftCtrlOff>"] diff --git a/os_pkrvars/almalinux/almalinux-9-x86_64.pkrvars.hcl b/os_pkrvars/almalinux/almalinux-9-x86_64.pkrvars.hcl index 017d333ca..8430665d0 100644 --- a/os_pkrvars/almalinux/almalinux-9-x86_64.pkrvars.hcl +++ b/os_pkrvars/almalinux/almalinux-9-x86_64.pkrvars.hcl @@ -2,9 +2,8 @@ os_name = "almalinux" os_version = "9.1" os_arch = "x86_64" iso_url = "https://repo.almalinux.org/almalinux/9/isos/x86_64/AlmaLinux-9.1-x86_64-dvd.iso" -iso_checksum = "2a44e3f8a012c132da19b9aae2bf949e20b116f0a2a7ac3eca111972f4ac952f" +iso_checksum = "file:https://repo.almalinux.org/almalinux/9/isos/x86_64/CHECKSUM" parallels_guest_os_type = "centos" vbox_guest_os_type = "RedHat_64" vmware_guest_os_type = "centos-64" -boot_command = ["<up><wait><tab> inst.text inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/rhel/9ks.cfg<enter><wait>"] -boot_command_hyperv = ["<wait5><up><wait5><tab> text ks=hd:fd0:/ks.cfg<enter><wait5><esc>"] +boot_command = ["<wait><wait><up><wait><tab> inst.text inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/rhel/9ks.cfg<enter><wait>"] diff --git a/os_pkrvars/amazonlinux/amazonlinux-2-x86_64.pkrvars.hcl b/os_pkrvars/amazonlinux/amazonlinux-2-x86_64.pkrvars.hcl index e70713af9..4707acc7d 100644 --- a/os_pkrvars/amazonlinux/amazonlinux-2-x86_64.pkrvars.hcl +++ b/os_pkrvars/amazonlinux/amazonlinux-2-x86_64.pkrvars.hcl @@ -11,7 +11,10 @@ vboxmanage = [ "{{ .Name }}", "--memory", "2048", - "--cpus", "2", + "--cpus", + "2", + "--audio", + "none", "--nat-localhostreachable1", "on", ] diff --git a/os_pkrvars/centos/centos-7-aarch64.pkrvars.hcl b/os_pkrvars/centos/centos-7-aarch64.pkrvars.hcl index f443470c3..44bbeecc6 100644 --- a/os_pkrvars/centos/centos-7-aarch64.pkrvars.hcl +++ b/os_pkrvars/centos/centos-7-aarch64.pkrvars.hcl @@ -1,10 +1,9 @@ os_name = "centos" os_version = "7.9" os_arch = "aarch64" -iso_url = "https://quantum-mirror.hu/mirrors/pub/centos-altarch/7.9.2009/isos/aarch64/CentOS-7-aarch64-Everything-2009.iso" -iso_checksum = "b898822822fd5ffacc8da074adcd6b882ac0f73a269111b15871e16c2ce9d774" +iso_url = "https://quantum-mirror.hu/mirrors/pub/centos-altarch/7.9.2009/isos/aarch64/CentOS-7-aarch64-Minimal-2009.iso" +iso_checksum = "1bef71329e51f9bed12349aa026b3fe0c4bb27db729399a3f9addae22848da9b" parallels_guest_os_type = "centos" vbox_guest_os_type = "RedHat_64" vmware_guest_os_type = "centos-64" -boot_command = ["<up>e<wait><down><down><end><wait> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/rhel/7ks.cfg <leftCtrlOn>x<leftCtrlOff>"] -boot_command_hyperv = ["<wait5><up><wait5><tab> text ks=hd:fd0:/ks.cfg<enter><wait5><esc>"] +boot_command = ["<wait><up>e<wait><down><down><end><wait> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/rhel/7ks.cfg <leftCtrlOn>x<leftCtrlOff>"] diff --git a/os_pkrvars/centos/centos-7-x86_64.pkrvars.hcl b/os_pkrvars/centos/centos-7-x86_64.pkrvars.hcl index 3035da8a4..867d24baf 100644 --- a/os_pkrvars/centos/centos-7-x86_64.pkrvars.hcl +++ b/os_pkrvars/centos/centos-7-x86_64.pkrvars.hcl @@ -6,5 +6,4 @@ iso_checksum = "07b94e6b1a0b0260b94c83d6bb76b26bf7a310dc78d7a9c743280 parallels_guest_os_type = "centos" vbox_guest_os_type = "RedHat_64" vmware_guest_os_type = "centos-64" -boot_command = ["<up><wait><tab> inst.text inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/rhel/7ks.cfg<enter><wait>"] -boot_command_hyperv = ["<wait5><up><wait5><tab> text ks=hd:fd0:/ks.cfg<enter><wait5><esc>"] +boot_command = ["<wait><up><wait><tab> inst.text inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/rhel/7ks.cfg<enter><wait>"] diff --git a/os_pkrvars/centos/centos-stream-8-aarch64.pkrvars.hcl b/os_pkrvars/centos/centos-stream-8-aarch64.pkrvars.hcl index 9127ff5c6..6733e37c8 100644 --- a/os_pkrvars/centos/centos-stream-8-aarch64.pkrvars.hcl +++ b/os_pkrvars/centos/centos-stream-8-aarch64.pkrvars.hcl @@ -1,10 +1,9 @@ os_name = "centos-stream" os_version = "8" os_arch = "aarch64" -iso_url = "http://mirrors.kernel.org/centos/8-stream/isos/aarch64/CentOS-Stream-8-aarch64-latest-dvd1.iso" +iso_url = "https://mirrors.edge.kernel.org/centos/8-stream/isos/aarch64/CentOS-Stream-8-aarch64-latest-boot.iso" iso_checksum = "file:https://mirrors.edge.kernel.org/centos/8-stream/isos/aarch64/CHECKSUM" parallels_guest_os_type = "centos" vbox_guest_os_type = "RedHat_64" vmware_guest_os_type = "centos-64" -boot_command = ["<up>e<wait><down><down><end><wait> inst.text inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/rhel/8ks.cfg <leftCtrlOn>x<leftCtrlOff>"] -boot_command_hyperv = ["<wait5><up><wait5><tab> text ks=hd:fd0:/ks.cfg<enter><wait5><esc>"] +boot_command = ["<wait><up>e<wait><down><down><end><wait> inst.text inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/rhel/8ks.cfg <leftCtrlOn>x<leftCtrlOff>"] diff --git a/os_pkrvars/centos/centos-stream-8-x86_64.pkrvars.hcl b/os_pkrvars/centos/centos-stream-8-x86_64.pkrvars.hcl index d93a3e100..c2bfab5e4 100644 --- a/os_pkrvars/centos/centos-stream-8-x86_64.pkrvars.hcl +++ b/os_pkrvars/centos/centos-stream-8-x86_64.pkrvars.hcl @@ -6,5 +6,4 @@ iso_checksum = "file:https://mirrors.edge.kernel.org/centos/8-stream/ parallels_guest_os_type = "centos" vbox_guest_os_type = "RedHat_64" vmware_guest_os_type = "centos-64" -boot_command = ["<up><wait><tab> inst.text inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/rhel/8ks.cfg<enter><wait>"] -boot_command_hyperv = ["<wait5><up><wait5><tab> text ks=hd:fd0:/ks.cfg<enter><wait5><esc>"] +boot_command = ["<wait><up><wait><tab> inst.text inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/rhel/8ks.cfg<enter><wait>"] diff --git a/os_pkrvars/centos/centos-stream-9-aarch64.pkrvars.hcl b/os_pkrvars/centos/centos-stream-9-aarch64.pkrvars.hcl index 73718c793..7e3ed350c 100644 --- a/os_pkrvars/centos/centos-stream-9-aarch64.pkrvars.hcl +++ b/os_pkrvars/centos/centos-stream-9-aarch64.pkrvars.hcl @@ -1,10 +1,9 @@ os_name = "centos-stream" os_version = "9" os_arch = "aarch64" -iso_url = "http://mirror.stream.centos.org/9-stream/BaseOS/aarch64/iso/CentOS-Stream-9-latest-aarch64-dvd1.iso" -iso_checksum = "file:http://mirror.stream.centos.org/9-stream/BaseOS/aarch64/iso/CentOS-Stream-9-latest-aarch64-dvd1.iso.SHA256SUM" +iso_url = "https://mirror.stream.centos.org/9-stream/BaseOS/aarch64/iso/CentOS-Stream-9-latest-aarch64-dvd1.iso" +iso_checksum = "file:https://mirror.stream.centos.org/9-stream/BaseOS/aarch64/iso/CentOS-Stream-9-latest-aarch64-dvd1.iso.SHA256SUM" parallels_guest_os_type = "centos" vbox_guest_os_type = "RedHat_64" vmware_guest_os_type = "centos-64" -boot_command = ["<up>e<wait><down><down><end><wait> inst.text inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/rhel/9ks.cfg <leftCtrlOn>x<leftCtrlOff>"] -boot_command_hyperv = ["<wait5><up><wait5><tab> text ks=hd:fd0:/ks.cfg<enter><wait5><esc>"] +boot_command = ["<wait><up>e<wait><down><down><end><wait> inst.text inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/rhel/9ks.cfg <leftCtrlOn>x<leftCtrlOff>"] diff --git a/os_pkrvars/centos/centos-stream-9-x86_64.pkrvars.hcl b/os_pkrvars/centos/centos-stream-9-x86_64.pkrvars.hcl index 3a7786d99..b8eff55a4 100644 --- a/os_pkrvars/centos/centos-stream-9-x86_64.pkrvars.hcl +++ b/os_pkrvars/centos/centos-stream-9-x86_64.pkrvars.hcl @@ -1,10 +1,9 @@ os_name = "centos-stream" os_version = "9" os_arch = "x86_64" -iso_url = "http://mirror.stream.centos.org/9-stream/BaseOS/x86_64/iso/CentOS-Stream-9-latest-x86_64-dvd1.iso" -iso_checksum = "file:http://mirror.stream.centos.org/9-stream/BaseOS/x86_64/iso/CentOS-Stream-9-latest-x86_64-dvd1.iso.SHA256SUM" +iso_url = "https://mirror.stream.centos.org/9-stream/BaseOS/x86_64/iso/CentOS-Stream-9-latest-x86_64-dvd1.iso" +iso_checksum = "file:https://mirror.stream.centos.org/9-stream/BaseOS/x86_64/iso/CentOS-Stream-9-latest-x86_64-dvd1.iso.SHA256SUM" parallels_guest_os_type = "centos" vbox_guest_os_type = "RedHat_64" vmware_guest_os_type = "centos-64" boot_command = ["<up><wait><tab> inst.text inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/rhel/9ks.cfg<enter><wait>"] -boot_command_hyperv = ["<wait5><up><wait5><tab> text ks=hd:fd0:/ks.cfg<enter><wait5><esc>"] diff --git a/os_pkrvars/debian/debian-10-aarch64.pkrvars.hcl b/os_pkrvars/debian/debian-10-aarch64.pkrvars.hcl index db55a8a8d..860f4348b 100644 --- a/os_pkrvars/debian/debian-10-aarch64.pkrvars.hcl +++ b/os_pkrvars/debian/debian-10-aarch64.pkrvars.hcl @@ -6,4 +6,4 @@ iso_checksum = "5c6f6df5febf691e95c08b630db3b1c13b9c5b3d19ea4b1515207 parallels_guest_os_type = "debian" vbox_guest_os_type = "Debian_64" vmware_guest_os_type = "debian-64" -boot_command = ["<up>e<wait><down><down><down><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><wait>install <wait> preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/debian/preseed.cfg <wait>debian-installer=en_US.UTF-8 <wait>auto <wait>locale=en_US.UTF-8 <wait>kbd-chooser/method=us <wait>keyboard-configuration/xkb-keymap=us <wait>netcfg/get_hostname={{ .Name }} <wait>netcfg/get_domain=vagrantup.com <wait>fb=false <wait>debconf/frontend=noninteractive <wait>console-setup/ask_detect=false <wait>console-keymaps-at/keymap=us <wait>grub-installer/bootdev=/dev/sda <wait><f10><wait>"] +boot_command = ["<wait><up>e<wait><down><down><down><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><wait>install <wait> preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/debian/preseed.cfg <wait>debian-installer=en_US.UTF-8 <wait>auto <wait>locale=en_US.UTF-8 <wait>kbd-chooser/method=us <wait>keyboard-configuration/xkb-keymap=us <wait>netcfg/get_hostname={{ .Name }} <wait>netcfg/get_domain=vagrantup.com <wait>fb=false <wait>debconf/frontend=noninteractive <wait>console-setup/ask_detect=false <wait>console-keymaps-at/keymap=us <wait>grub-installer/bootdev=/dev/sda <wait><f10><wait>"] diff --git a/os_pkrvars/debian/debian-10-x86_64.pkrvars.hcl b/os_pkrvars/debian/debian-10-x86_64.pkrvars.hcl index bf00eb1b3..fe00bae06 100644 --- a/os_pkrvars/debian/debian-10-x86_64.pkrvars.hcl +++ b/os_pkrvars/debian/debian-10-x86_64.pkrvars.hcl @@ -6,4 +6,4 @@ iso_checksum = "07d493c305aa5313e767181af5ef2c2b2758a4a3f57e78fb4a4fc parallels_guest_os_type = "debian" vbox_guest_os_type = "Debian_64" vmware_guest_os_type = "debian-64" -boot_command = ["<esc><wait>auto preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/debian/preseed.cfg netcfg/get_hostname={{ .Name }}<enter>"] +boot_command = ["<wait><esc><wait>auto preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/debian/preseed.cfg netcfg/get_hostname={{ .Name }}<enter>"] diff --git a/os_pkrvars/debian/debian-11-aarch64.pkrvars.hcl b/os_pkrvars/debian/debian-11-aarch64.pkrvars.hcl index 242e09f98..8be501084 100644 --- a/os_pkrvars/debian/debian-11-aarch64.pkrvars.hcl +++ b/os_pkrvars/debian/debian-11-aarch64.pkrvars.hcl @@ -6,4 +6,4 @@ iso_checksum = "b27ff768c10808518790d72d670c5588cdc60cf8934ef92773a89 parallels_guest_os_type = "debian" vbox_guest_os_type = "Debian_64" vmware_guest_os_type = "debian-64" -boot_command = ["<up>e<wait><down><down><down><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><wait>install <wait> preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/debian/preseed.cfg <wait>debian-installer=en_US.UTF-8 <wait>auto <wait>locale=en_US.UTF-8 <wait>kbd-chooser/method=us <wait>keyboard-configuration/xkb-keymap=us <wait>netcfg/get_hostname={{ .Name }} <wait>netcfg/get_domain=vagrantup.com <wait>fb=false <wait>debconf/frontend=noninteractive <wait>console-setup/ask_detect=false <wait>console-keymaps-at/keymap=us <wait>grub-installer/bootdev=/dev/sda <wait><f10><wait>"] +boot_command = ["<wait><up>e<wait><down><down><down><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><wait>install <wait> preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/debian/preseed.cfg <wait>debian-installer=en_US.UTF-8 <wait>auto <wait>locale=en_US.UTF-8 <wait>kbd-chooser/method=us <wait>keyboard-configuration/xkb-keymap=us <wait>netcfg/get_hostname={{ .Name }} <wait>netcfg/get_domain=vagrantup.com <wait>fb=false <wait>debconf/frontend=noninteractive <wait>console-setup/ask_detect=false <wait>console-keymaps-at/keymap=us <wait>grub-installer/bootdev=/dev/sda <wait><f10><wait>"] diff --git a/os_pkrvars/debian/debian-11-x86_64.pkrvars.hcl b/os_pkrvars/debian/debian-11-x86_64.pkrvars.hcl index f1b9cf2cf..495ed8828 100644 --- a/os_pkrvars/debian/debian-11-x86_64.pkrvars.hcl +++ b/os_pkrvars/debian/debian-11-x86_64.pkrvars.hcl @@ -6,4 +6,4 @@ iso_checksum = "55f6f49b32d3797621297a9481a6cc3e21b3142f57d8e1279412f parallels_guest_os_type = "debian" vbox_guest_os_type = "Debian_64" vmware_guest_os_type = "debian-64" -boot_command = ["<esc><wait>auto preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/debian/preseed.cfg netcfg/get_hostname={{ .Name }}<enter>"] +boot_command = ["<wait><esc><wait>auto preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/debian/preseed.cfg netcfg/get_hostname={{ .Name }}<enter>"] diff --git a/os_pkrvars/fedora/fedora-36-aarch64.pkrvars.hcl b/os_pkrvars/fedora/fedora-36-aarch64.pkrvars.hcl index ea90c94b9..86239aea4 100644 --- a/os_pkrvars/fedora/fedora-36-aarch64.pkrvars.hcl +++ b/os_pkrvars/fedora/fedora-36-aarch64.pkrvars.hcl @@ -6,4 +6,4 @@ iso_checksum = "sha256:0ab4000575ff8b258576750ecf4ca39b266f0c88cab5fe parallels_guest_os_type = "fedora-core" vbox_guest_os_type = "Fedora_64" vmware_guest_os_type = "fedora-64" -boot_command = ["<up><wait>e<down><down><end> inst.text inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/fedora/ks.cfg<enter><wait><f10>"] +boot_command = ["<wait><up><wait>e<down><down><end> inst.text inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/fedora/ks.cfg<enter><wait><f10>"] diff --git a/os_pkrvars/fedora/fedora-36-x86_64.pkrvars.hcl b/os_pkrvars/fedora/fedora-36-x86_64.pkrvars.hcl index 638ef6c83..634f6a26c 100644 --- a/os_pkrvars/fedora/fedora-36-x86_64.pkrvars.hcl +++ b/os_pkrvars/fedora/fedora-36-x86_64.pkrvars.hcl @@ -6,4 +6,4 @@ iso_checksum = "sha256:5edaf708a52687b09f9810c2b6d2a3432edac1b18f4d8c parallels_guest_os_type = "fedora-core" vbox_guest_os_type = "Fedora_64" vmware_guest_os_type = "fedora-64" -boot_command = ["<up><wait><tab> inst.text inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/fedora/ks.cfg<enter><wait>"] +boot_command = ["<wait><up><wait><tab> inst.text inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/fedora/ks.cfg<enter><wait>"] diff --git a/os_pkrvars/fedora/fedora-37-aarch64.pkrvars.hcl b/os_pkrvars/fedora/fedora-37-aarch64.pkrvars.hcl index 8ee47f2a1..86daf9c6e 100644 --- a/os_pkrvars/fedora/fedora-37-aarch64.pkrvars.hcl +++ b/os_pkrvars/fedora/fedora-37-aarch64.pkrvars.hcl @@ -6,4 +6,4 @@ iso_checksum = "sha256:1c2deba876bd2da3a429b1b0cd5e294508b8379b299913 parallels_guest_os_type = "fedora-core" vbox_guest_os_type = "Fedora_64" vmware_guest_os_type = "fedora-64" -boot_command = ["<up><up>e<wait><down><down><end> inst.text inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/fedora/ks.cfg<F10><wait>"] +boot_command = ["<wait><up><up>e<wait><down><down><end> inst.text inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/fedora/ks.cfg<F10><wait>"] diff --git a/os_pkrvars/fedora/fedora-37-x86_64.pkrvars.hcl b/os_pkrvars/fedora/fedora-37-x86_64.pkrvars.hcl index 161cb2975..a304f86c4 100644 --- a/os_pkrvars/fedora/fedora-37-x86_64.pkrvars.hcl +++ b/os_pkrvars/fedora/fedora-37-x86_64.pkrvars.hcl @@ -6,4 +6,4 @@ iso_checksum = "sha256:0a4de5157af47b41a07a53726cd62ffabd04d5c1a4afec parallels_guest_os_type = "fedora-core" vbox_guest_os_type = "Fedora_64" vmware_guest_os_type = "fedora-64" -boot_command = ["<up>e<wait><down><down><end> inst.text inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/fedora/ks.cfg<F10><wait>"] +boot_command = ["<wait><up>e<wait><down><down><end> inst.text inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/fedora/ks.cfg<F10><wait>"] diff --git a/os_pkrvars/freebsd/freebsd-12-x86_64.pkrvars.hcl b/os_pkrvars/freebsd/freebsd-12-x86_64.pkrvars.hcl index 3c1057dc2..4053f8bf1 100644 --- a/os_pkrvars/freebsd/freebsd-12-x86_64.pkrvars.hcl +++ b/os_pkrvars/freebsd/freebsd-12-x86_64.pkrvars.hcl @@ -6,4 +6,4 @@ iso_checksum = "606435637b76991f96df68f561badf03266f3d5452e9f72ed9b13 parallels_guest_os_type = "freebsd" vbox_guest_os_type = "FreeBSD_64" vmware_guest_os_type = "freedsd-64" -boot_command = ["<esc><wait>boot -s<wait><enter><wait><wait10><wait10>/bin/sh<enter><wait>mdmfs -s 100m md1 /tmp<enter><wait>mdmfs -s 100m md2 /mnt<enter><wait>dhclient -p /tmp/dhclient.em0.pid -l /tmp/dhclient.lease.em0 em0<enter><wait>fetch -o /tmp/installerconfig http://{{ .HTTPIP }}:{{ .HTTPPort }}/freebsd/installerconfig \u0026\u0026 bsdinstall script /tmp/installerconfig<enter><wait>"] +boot_command = ["<wait><esc><wait>boot -s<wait><enter><wait><wait10><wait10>/bin/sh<enter><wait>mdmfs -s 100m md1 /tmp<enter><wait>mdmfs -s 100m md2 /mnt<enter><wait>dhclient -p /tmp/dhclient.em0.pid -l /tmp/dhclient.lease.em0 em0<enter><wait>fetch -o /tmp/installerconfig http://{{ .HTTPIP }}:{{ .HTTPPort }}/freebsd/installerconfig \u0026\u0026 bsdinstall script /tmp/installerconfig<enter><wait>"] diff --git a/os_pkrvars/freebsd/freebsd-13-x86_64.pkrvars.hcl b/os_pkrvars/freebsd/freebsd-13-x86_64.pkrvars.hcl index 45a638ca3..e7fc62048 100644 --- a/os_pkrvars/freebsd/freebsd-13-x86_64.pkrvars.hcl +++ b/os_pkrvars/freebsd/freebsd-13-x86_64.pkrvars.hcl @@ -6,4 +6,4 @@ iso_checksum = "697d81653fa246b921ddfcf1d15562c55249cc727b11fa3e47f47 parallels_guest_os_type = "freebsd" vbox_guest_os_type = "FreeBSD_64" vmware_guest_os_type = "freedsd-64" -boot_command = ["<esc><wait>boot -s<wait><enter><wait><wait10><wait10>/bin/sh<enter><wait>mdmfs -s 100m md1 /tmp<enter><wait>mdmfs -s 100m md2 /mnt<enter><wait>dhclient -p /tmp/dhclient.em0.pid -l /tmp/dhclient.lease.em0 em0<enter><wait><wait5>fetch -o /tmp/installerconfig http://{{ .HTTPIP }}:{{ .HTTPPort }}/freebsd/installerconfig && bsdinstall script /tmp/installerconfig<enter><wait>"] +boot_command = ["<wait><esc><wait>boot -s<wait><enter><wait><wait10><wait10>/bin/sh<enter><wait>mdmfs -s 100m md1 /tmp<enter><wait>mdmfs -s 100m md2 /mnt<enter><wait>dhclient -p /tmp/dhclient.em0.pid -l /tmp/dhclient.lease.em0 em0<enter><wait><wait5>fetch -o /tmp/installerconfig http://{{ .HTTPIP }}:{{ .HTTPPort }}/freebsd/installerconfig && bsdinstall script /tmp/installerconfig<enter><wait>"] diff --git a/os_pkrvars/oraclelinux/oraclelinux-7-aarch64.pkrvars.hcl b/os_pkrvars/oraclelinux/oraclelinux-7-aarch64.pkrvars.hcl index 8dbec2587..bf32714d0 100644 --- a/os_pkrvars/oraclelinux/oraclelinux-7-aarch64.pkrvars.hcl +++ b/os_pkrvars/oraclelinux/oraclelinux-7-aarch64.pkrvars.hcl @@ -6,5 +6,4 @@ iso_checksum = "fd2c1b1e26858576534f6e6c4cf000a15cd81bec010dad5e827b2 parallels_guest_os_type = "centos" vbox_guest_os_type = "RedHat_64" vmware_guest_os_type = "centos-64" -boot_command = ["<up>e<wait><down><down><end><wait> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/rhel/7ks.cfg <leftCtrlOn>x<leftCtrlOff>"] -boot_command_hyperv = ["<wait5><up><wait5><tab> text ks=hd:fd0:/ks.cfg<enter><wait5><esc>"] +boot_command = ["<wait><up>e<wait><down><down><end><wait> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/rhel/7ks.cfg <leftCtrlOn>x<leftCtrlOff>"] diff --git a/os_pkrvars/oraclelinux/oraclelinux-7-x86_64.pkrvars.hcl b/os_pkrvars/oraclelinux/oraclelinux-7-x86_64.pkrvars.hcl index cee7d9eb8..6bd8977ad 100644 --- a/os_pkrvars/oraclelinux/oraclelinux-7-x86_64.pkrvars.hcl +++ b/os_pkrvars/oraclelinux/oraclelinux-7-x86_64.pkrvars.hcl @@ -6,5 +6,4 @@ iso_checksum = "dc2782bfd92b4c060cf8006fbc6e18036c27f599eebf3584a1a2a parallels_guest_os_type = "centos" vbox_guest_os_type = "RedHat_64" vmware_guest_os_type = "centos-64" -boot_command = ["<up><wait><tab> inst.text inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/rhel/7ks.cfg<enter><wait>"] -boot_command_hyperv = ["<wait5><up><wait5><tab> text ks=hd:fd0:/ks.cfg<enter><wait5><esc>"] +boot_command = ["<wait><up><wait><tab> inst.text inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/rhel/7ks.cfg<enter><wait>"] diff --git a/os_pkrvars/oraclelinux/oraclelinux-8-aarch64.pkrvars.hcl b/os_pkrvars/oraclelinux/oraclelinux-8-aarch64.pkrvars.hcl index 0d278fd4a..d9085068a 100644 --- a/os_pkrvars/oraclelinux/oraclelinux-8-aarch64.pkrvars.hcl +++ b/os_pkrvars/oraclelinux/oraclelinux-8-aarch64.pkrvars.hcl @@ -6,5 +6,4 @@ iso_checksum = "420000aa561e833d8dc9576815d068fb5b15fd9fb826a0d9c1277 parallels_guest_os_type = "centos" vbox_guest_os_type = "RedHat_64" vmware_guest_os_type = "centos-64" -boot_command = ["<up>e<wait><down><down><end><wait> inst.text inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/rhel/8ks.cfg <leftCtrlOn>x<leftCtrlOff>"] -boot_command_hyperv = ["<wait5><up><wait5><tab> text ks=hd:fd0:/ks.cfg<enter><wait5><esc>"] +boot_command = ["<wait><up>e<wait><down><down><end><wait> inst.text inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/rhel/8ks.cfg <leftCtrlOn>x<leftCtrlOff>"] diff --git a/os_pkrvars/oraclelinux/oraclelinux-8-x86_64.pkrvars.hcl b/os_pkrvars/oraclelinux/oraclelinux-8-x86_64.pkrvars.hcl index 0468a3bf9..bbfea5fff 100644 --- a/os_pkrvars/oraclelinux/oraclelinux-8-x86_64.pkrvars.hcl +++ b/os_pkrvars/oraclelinux/oraclelinux-8-x86_64.pkrvars.hcl @@ -6,5 +6,4 @@ iso_checksum = "dd6ede6c0597189b7dffb800b32835002bd95f19c254734aeb58f parallels_guest_os_type = "centos" vbox_guest_os_type = "RedHat_64" vmware_guest_os_type = "centos-64" -boot_command = ["<up><wait><tab> inst.text inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/rhel/8ks.cfg<enter><wait>"] -boot_command_hyperv = ["<wait5><up><wait5><tab> text ks=hd:fd0:/ks.cfg<enter><wait5><esc>"] +boot_command = ["<wait><up><wait><tab> inst.text inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/rhel/8ks.cfg<enter><wait>"] diff --git a/os_pkrvars/oraclelinux/oraclelinux-9-aarch64.pkrvars.hcl b/os_pkrvars/oraclelinux/oraclelinux-9-aarch64.pkrvars.hcl index 2e6e64fba..256517d79 100644 --- a/os_pkrvars/oraclelinux/oraclelinux-9-aarch64.pkrvars.hcl +++ b/os_pkrvars/oraclelinux/oraclelinux-9-aarch64.pkrvars.hcl @@ -6,5 +6,4 @@ iso_checksum = "3dc4578f53ceb1010f8236b3356f2441ec3f9e840fa60522e470d parallels_guest_os_type = "centos" vbox_guest_os_type = "RedHat_64" vmware_guest_os_type = "centos-64" -boot_command = ["<up>e<wait><down><down><end><wait> inst.text inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/rhel/9ks.cfg <leftCtrlOn>x<leftCtrlOff>"] -boot_command_hyperv = ["<wait5><up><wait5><tab> text ks=hd:fd0:/ks.cfg<enter><wait5><esc>"] +boot_command = ["<wait><up>e<wait><down><down><end><wait> inst.text inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/rhel/9ks.cfg <leftCtrlOn>x<leftCtrlOff>"] diff --git a/os_pkrvars/oraclelinux/oraclelinux-9-x86_64.pkrvars.hcl b/os_pkrvars/oraclelinux/oraclelinux-9-x86_64.pkrvars.hcl index 6f5ce533e..dd4cc14ce 100644 --- a/os_pkrvars/oraclelinux/oraclelinux-9-x86_64.pkrvars.hcl +++ b/os_pkrvars/oraclelinux/oraclelinux-9-x86_64.pkrvars.hcl @@ -6,5 +6,4 @@ iso_checksum = "a46ac0b717881a2673c7dc981b3219f6dea747e3d6bd18908fcb8 parallels_guest_os_type = "centos" vbox_guest_os_type = "RedHat_64" vmware_guest_os_type = "centos-64" -boot_command = ["<up><wait><tab> inst.text inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/rhel/9ks.cfg<enter><wait>"] -boot_command_hyperv = ["<wait5><up><wait5><tab> text ks=hd:fd0:/ks.cfg<enter><wait5><esc>"] +boot_command = ["<wait><up><wait><tab> inst.text inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/rhel/9ks.cfg<enter><wait>"] diff --git a/os_pkrvars/rhel/rhel-7-aarch64.pkrvars.hcl b/os_pkrvars/rhel/rhel-7-aarch64.pkrvars.hcl index 79133599b..692d2f395 100644 --- a/os_pkrvars/rhel/rhel-7-aarch64.pkrvars.hcl +++ b/os_pkrvars/rhel/rhel-7-aarch64.pkrvars.hcl @@ -7,4 +7,3 @@ parallels_guest_os_type = "rhel" vbox_guest_os_type = "RedHat_64" vmware_guest_os_type = "centos-64" boot_command = ["<up><wait><tab> inst.text inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/rhel/7ks.cfg<enter><wait>"] -boot_command_hyperv = ["<wait5><up><wait5><tab> text ks=hd:fd0:/ks.cfg<enter><wait5><esc>"] diff --git a/os_pkrvars/rhel/rhel-7-x86_64.pkrvars.hcl b/os_pkrvars/rhel/rhel-7-x86_64.pkrvars.hcl index 5cf17ef6d..4b37d60bc 100644 --- a/os_pkrvars/rhel/rhel-7-x86_64.pkrvars.hcl +++ b/os_pkrvars/rhel/rhel-7-x86_64.pkrvars.hcl @@ -7,4 +7,3 @@ parallels_guest_os_type = "rhel" vbox_guest_os_type = "RedHat_64" vmware_guest_os_type = "centos-64" boot_command = ["<up><wait><tab> inst.text inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/rhel/7ks.cfg<enter><wait>"] -boot_command_hyperv = ["<wait5><up><wait5><tab> text ks=hd:fd0:/ks.cfg<enter><wait5><esc>"] diff --git a/os_pkrvars/rhel/rhel-8-aarch64.pkrvars.hcl b/os_pkrvars/rhel/rhel-8-aarch64.pkrvars.hcl index 60eb62773..0563b97e9 100644 --- a/os_pkrvars/rhel/rhel-8-aarch64.pkrvars.hcl +++ b/os_pkrvars/rhel/rhel-8-aarch64.pkrvars.hcl @@ -7,4 +7,3 @@ parallels_guest_os_type = "rhel" vbox_guest_os_type = "RedHat_64" vmware_guest_os_type = "centos-64" boot_command = ["<up><wait><tab> inst.text inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/rhel/8ks.cfg<enter><wait>"] -boot_command_hyperv = ["<wait5><up><wait5><tab> text ks=hd:fd0:/ks.cfg<enter><wait5><esc>"] diff --git a/os_pkrvars/rhel/rhel-8-x86_64.pkrvars.hcl b/os_pkrvars/rhel/rhel-8-x86_64.pkrvars.hcl index 257d0419a..4f37b78de 100644 --- a/os_pkrvars/rhel/rhel-8-x86_64.pkrvars.hcl +++ b/os_pkrvars/rhel/rhel-8-x86_64.pkrvars.hcl @@ -7,4 +7,3 @@ parallels_guest_os_type = "rhel" vbox_guest_os_type = "RedHat_64" vmware_guest_os_type = "centos-64" boot_command = ["<up><wait><tab> inst.text inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/rhel/8ks.cfg<enter><wait>"] -boot_command_hyperv = ["<wait5><up><wait5><tab> text ks=hd:fd0:/ks.cfg<enter><wait5><esc>"] diff --git a/os_pkrvars/rhel/rhel-9-aarch64.pkrvars.hcl b/os_pkrvars/rhel/rhel-9-aarch64.pkrvars.hcl index bead13c30..e3d632afd 100644 --- a/os_pkrvars/rhel/rhel-9-aarch64.pkrvars.hcl +++ b/os_pkrvars/rhel/rhel-9-aarch64.pkrvars.hcl @@ -7,4 +7,3 @@ parallels_guest_os_type = "rhel" vbox_guest_os_type = "RedHat_64" vmware_guest_os_type = "centos-64" boot_command = ["<up><wait><tab> inst.text inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/rhel/9ks.cfg<enter><wait>"] -boot_command_hyperv = ["<wait5><up><wait5><tab> text ks=hd:fd0:/ks.cfg<enter><wait5><esc>"] diff --git a/os_pkrvars/rhel/rhel-9-x86_64.pkrvars.hcl b/os_pkrvars/rhel/rhel-9-x86_64.pkrvars.hcl index 6f96ca240..61e6f486c 100644 --- a/os_pkrvars/rhel/rhel-9-x86_64.pkrvars.hcl +++ b/os_pkrvars/rhel/rhel-9-x86_64.pkrvars.hcl @@ -7,4 +7,3 @@ parallels_guest_os_type = "rhel" vbox_guest_os_type = "RedHat_64" vmware_guest_os_type = "centos-64" boot_command = ["<up><wait><tab> inst.text inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/rhel/9ks.cfg<enter><wait>"] -boot_command_hyperv = ["<wait5><up><wait5><tab> text ks=hd:fd0:/ks.cfg<enter><wait5><esc>"] diff --git a/os_pkrvars/rockylinux/rockylinux-8-aarch64.pkrvars.hcl b/os_pkrvars/rockylinux/rockylinux-8-aarch64.pkrvars.hcl index 5a131590e..1220b87cc 100644 --- a/os_pkrvars/rockylinux/rockylinux-8-aarch64.pkrvars.hcl +++ b/os_pkrvars/rockylinux/rockylinux-8-aarch64.pkrvars.hcl @@ -1,10 +1,9 @@ os_name = "rockylinux" os_version = "8.7" os_arch = "aarch64" -iso_url = "https://download.rockylinux.org/pub/rocky/8/isos/aarch64/Rocky-8.7-aarch64-dvd1.iso" +iso_url = "https://download.rockylinux.org/pub/rocky/8/isos/aarch64/Rocky-aarch64-minimal.iso" iso_checksum = "file:https://download.rockylinux.org/pub/rocky/8/isos/aarch64/CHECKSUM" parallels_guest_os_type = "centos" vbox_guest_os_type = "RedHat_64" vmware_guest_os_type = "centos-64" -boot_command = ["<up>e<wait><down><down><end><wait> inst.text inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/rhel/8ks.cfg <leftCtrlOn>x<leftCtrlOff>"] -boot_command_hyperv = ["<wait5><up><wait5><tab> text ks=hd:fd0:/ks.cfg<enter><wait5><esc>"] +boot_command = ["<wait><up>e<wait><down><down><end><wait> inst.text inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/rhel/8ks.cfg <leftCtrlOn>x<leftCtrlOff>"] diff --git a/os_pkrvars/rockylinux/rockylinux-8-x86_64.pkrvars.hcl b/os_pkrvars/rockylinux/rockylinux-8-x86_64.pkrvars.hcl index 9281d817e..5aee7c315 100644 --- a/os_pkrvars/rockylinux/rockylinux-8-x86_64.pkrvars.hcl +++ b/os_pkrvars/rockylinux/rockylinux-8-x86_64.pkrvars.hcl @@ -1,10 +1,9 @@ os_name = "rockylinux" os_version = "8.7" os_arch = "x86_64" -iso_url = "http://download.rockylinux.org/pub/rocky/8.7/isos/x86_64/Rocky-8.7-x86_64-dvd1.iso" +iso_url = "https://download.rockylinux.org/pub/rocky/8/isos/x86_64/Rocky-x86_64-minimal.iso" iso_checksum = "file:https://download.rockylinux.org/pub/rocky/8.7/isos/x86_64/CHECKSUM" parallels_guest_os_type = "centos" vbox_guest_os_type = "RedHat_64" vmware_guest_os_type = "centos-64" -boot_command = ["<up><wait><tab> inst.text inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/rhel/8ks.cfg<enter><wait>"] -boot_command_hyperv = ["<wait5><up><wait5><tab> text ks=hd:fd0:/ks.cfg<enter><wait5><esc>"] +boot_command = ["<wait><up><wait><tab> inst.text inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/rhel/8ks.cfg<enter><wait>"] diff --git a/os_pkrvars/rockylinux/rockylinux-9-aarch64.pkrvars.hcl b/os_pkrvars/rockylinux/rockylinux-9-aarch64.pkrvars.hcl index 224bb8732..4e808920b 100644 --- a/os_pkrvars/rockylinux/rockylinux-9-aarch64.pkrvars.hcl +++ b/os_pkrvars/rockylinux/rockylinux-9-aarch64.pkrvars.hcl @@ -1,10 +1,9 @@ os_name = "rockylinux" os_version = "9.1" os_arch = "aarch64" -iso_url = "https://download.rockylinux.org/pub/rocky/9/isos/aarch64/Rocky-9.1-aarch64-dvd.iso" +iso_url = "https://download.rockylinux.org/pub/rocky/9/isos/aarch64/Rocky-aarch64-minimal.iso" iso_checksum = "file:https://download.rockylinux.org/pub/rocky/9/isos/aarch64/CHECKSUM" parallels_guest_os_type = "centos" vbox_guest_os_type = "RedHat_64" vmware_guest_os_type = "centos-64" -boot_command = ["<up>e<wait><down><down><end><wait> inst.text inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/rhel/9ks.cfg <leftCtrlOn>x<leftCtrlOff>"] -boot_command_hyperv = ["<wait5><up><wait5><tab> text ks=hd:fd0:/ks.cfg<enter><wait5><esc>"] +boot_command = ["<wait><up>e<wait><down><down><end><wait> inst.text inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/rhel/9ks.cfg <leftCtrlOn>x<leftCtrlOff>"] diff --git a/os_pkrvars/rockylinux/rockylinux-9-x86_64.pkrvars.hcl b/os_pkrvars/rockylinux/rockylinux-9-x86_64.pkrvars.hcl index 816325fa9..2644ead37 100644 --- a/os_pkrvars/rockylinux/rockylinux-9-x86_64.pkrvars.hcl +++ b/os_pkrvars/rockylinux/rockylinux-9-x86_64.pkrvars.hcl @@ -2,9 +2,8 @@ os_name = "rockylinux" os_version = "9.1" os_arch = "x86_64" iso_url = "https://download.rockylinux.org/pub/rocky/9.1/isos/x86_64/Rocky-9.1-x86_64-dvd.iso" -iso_checksum = "file:https://download.rockylinux.org/pub/rocky/9.1/isos/x86_64/Rocky-9.1-x86_64-dvd.iso.CHECKSUM" +iso_checksum = "file:https://download.rockylinux.org/pub/rocky/9.1/isos/x86_64/CHECKSUM" parallels_guest_os_type = "centos" vbox_guest_os_type = "RedHat_64" vmware_guest_os_type = "centos-64" -boot_command = ["<up><wait><tab> inst.text inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/rhel/9ks.cfg<enter><wait>"] -boot_command_hyperv = ["<wait5><up><wait5><tab> text ks=hd:fd0:/ks.cfg<enter><wait5><esc>"] +boot_command = ["<wait><up><wait><tab> inst.text inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/rhel/9ks.cfg<enter><wait>"] diff --git a/os_pkrvars/scientificlinux/scientificlinux-7-x86_64.pkrvars.hcl b/os_pkrvars/scientificlinux/scientificlinux-7-x86_64.pkrvars.hcl index 6a018f251..37eebacd1 100644 --- a/os_pkrvars/scientificlinux/scientificlinux-7-x86_64.pkrvars.hcl +++ b/os_pkrvars/scientificlinux/scientificlinux-7-x86_64.pkrvars.hcl @@ -7,4 +7,3 @@ parallels_guest_os_type = "centos" vbox_guest_os_type = "RedHat_64" vmware_guest_os_type = "centos-64" boot_command = ["<up><wait><tab> inst.text inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/rhel/7ks.cfg<enter><wait>"] -boot_command_hyperv = ["<wait5><up><wait5><tab> text ks=hd:fd0:/ks.cfg<enter><wait5><esc>"] diff --git a/os_pkrvars/springdalelinux/springdalelinux-7-x86_64.pkrvars.hcl b/os_pkrvars/springdalelinux/springdalelinux-7-x86_64.pkrvars.hcl index bf2f6871a..09e5f1725 100644 --- a/os_pkrvars/springdalelinux/springdalelinux-7-x86_64.pkrvars.hcl +++ b/os_pkrvars/springdalelinux/springdalelinux-7-x86_64.pkrvars.hcl @@ -7,4 +7,3 @@ parallels_guest_os_type = "centos" vbox_guest_os_type = "RedHat_64" vmware_guest_os_type = "centos-64" boot_command = ["<up><wait><tab> inst.text inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/springdalelinux/7ks.cfg<enter><wait>"] -boot_command_hyperv = ["<wait5><up><wait5><tab> text ks=hd:fd0:/ks.cfg<enter><wait5><esc>"] diff --git a/os_pkrvars/springdalelinux/springdalelinux-8-x86_64.pkrvars.hcl b/os_pkrvars/springdalelinux/springdalelinux-8-x86_64.pkrvars.hcl index 013dcffe6..1d2ee7fe5 100644 --- a/os_pkrvars/springdalelinux/springdalelinux-8-x86_64.pkrvars.hcl +++ b/os_pkrvars/springdalelinux/springdalelinux-8-x86_64.pkrvars.hcl @@ -7,4 +7,3 @@ parallels_guest_os_type = "centos" vbox_guest_os_type = "RedHat_64" vmware_guest_os_type = "centos-64" boot_command = ["<up><wait><tab> inst.text inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/springdalelinux/8ks.cfg<enter><wait>"] -boot_command_hyperv = ["<wait5><up><wait5><tab> text ks=hd:fd0:/ks.cfg<enter><wait5><esc>"] diff --git a/os_pkrvars/springdalelinux/springdalelinux-9-x86_64.pkrvars.hcl b/os_pkrvars/springdalelinux/springdalelinux-9-x86_64.pkrvars.hcl index cbf79dcfb..0768a7e18 100644 --- a/os_pkrvars/springdalelinux/springdalelinux-9-x86_64.pkrvars.hcl +++ b/os_pkrvars/springdalelinux/springdalelinux-9-x86_64.pkrvars.hcl @@ -7,4 +7,3 @@ parallels_guest_os_type = "centos" vbox_guest_os_type = "RedHat_64" vmware_guest_os_type = "centos-64" boot_command = ["<up><wait><tab> inst.text inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/springdalelinux/9ks.cfg<enter><wait>"] -boot_command_hyperv = ["<wait5><up><wait5><tab> text ks=hd:fd0:/ks.cfg<enter><wait5><esc>"] diff --git a/os_pkrvars/ubuntu/ubuntu-18.04-aarch64.pkrvars.hcl b/os_pkrvars/ubuntu/ubuntu-18.04-aarch64.pkrvars.hcl new file mode 100644 index 000000000..a56af4daa --- /dev/null +++ b/os_pkrvars/ubuntu/ubuntu-18.04-aarch64.pkrvars.hcl @@ -0,0 +1,10 @@ +os_name = "ubuntu" +os_version = "18.04" +os_arch = "aarch64" +iso_url = "https://cdimage.ubuntu.com/releases/18.04.6/release/ubuntu-18.04.6-server-arm64.iso" +iso_checksum = "0a20ef21181a36588f8fb670cc63e8d326fa6e715b526543d300a68de389055f" +hyperv_generation = 2 +parallels_guest_os_type = "ubuntu" +vbox_guest_os_type = "Ubuntu_64" +vmware_guest_os_type = "ubuntu-64" +boot_command = ["<wait>e<wait><down><down><down><end><wait>", "<bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs>", "<bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs>", "<bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs>", "<bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs>", "<bs><wait>auto console-setup/ask_detect=false", " console-setup/layoutcode=us", " console-setup/modelcode=pc105", " debconf/frontend=noninteractive", " debian-installer=en_US.UTF-8", " fb=false", " initrd=/install/initrd.gz", " kbd-chooser/method=us", " keyboard-configuration/layout=USA", " keyboard-configuration/variant=USA", " locale=en_US.UTF-8", " netcfg/get_hostname=vagrant", " grub-installer/bootdev=/dev/sda", " noapic", " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/ubuntu/preseed.cfg", " ---", "<f10><wait>"] diff --git a/os_pkrvars/ubuntu/ubuntu-18.04-x86_64.pkrvars.hcl b/os_pkrvars/ubuntu/ubuntu-18.04-x86_64.pkrvars.hcl index 19b779e2e..192ee7b38 100644 --- a/os_pkrvars/ubuntu/ubuntu-18.04-x86_64.pkrvars.hcl +++ b/os_pkrvars/ubuntu/ubuntu-18.04-x86_64.pkrvars.hcl @@ -8,4 +8,3 @@ parallels_guest_os_type = "ubuntu" vbox_guest_os_type = "Ubuntu_64" vmware_guest_os_type = "ubuntu-64" boot_command = ["<wait5><esc>", "<wait5><esc>", "<wait5><enter><wait5>", "/install/vmlinuz auto console-setup/ask_detect=false", " console-setup/layoutcode=us", " console-setup/modelcode=pc105", " debconf/frontend=noninteractive", " debian-installer=en_US.UTF-8", " fb=false", " initrd=/install/initrd.gz", " kbd-chooser/method=us", " keyboard-configuration/layout=USA", " keyboard-configuration/variant=USA", " locale=en_US.UTF-8", " netcfg/get_hostname=vagrant", " grub-installer/bootdev=/dev/sda", " noapic", " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/ubuntu/preseed.cfg", " ---", "<enter><wait>"] -boot_command_hyperv = ["<esc><wait10><esc><esc><enter><wait>set gfxpayload=1024x768<enter>linux /install/vmlinuz preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/ubuntu/preseed-hyperv.cfg debian-installer=en_US.UTF-8 auto locale=en_US.UTF-8 kbd-chooser/method=us hostname={{ .Name }} fb=false debconf/frontend=noninteractive keyboard-configuration/modelcode=SKIP keyboard-configuration/layout=USA keyboard-configuration/variant=USA console-setup/ask_detect=false <enter>initrd /install/initrd.gz<enter>boot<enter>"] diff --git a/os_pkrvars/ubuntu/ubuntu-20.04-aarch64.pkrvars.hcl b/os_pkrvars/ubuntu/ubuntu-20.04-aarch64.pkrvars.hcl index 2b7286d20..3a32db59d 100644 --- a/os_pkrvars/ubuntu/ubuntu-20.04-aarch64.pkrvars.hcl +++ b/os_pkrvars/ubuntu/ubuntu-20.04-aarch64.pkrvars.hcl @@ -7,5 +7,4 @@ hyperv_generation = 2 parallels_guest_os_type = "ubuntu" vbox_guest_os_type = "Ubuntu_64" vmware_guest_os_type = "ubuntu-64" -boot_command = ["<esc>linux /casper/vmlinuz quiet autoinstall ds='nocloud-net;s=http://{{.HTTPIP}}:{{.HTTPPort}}/ubuntu/'<enter>initrd /casper/initrd<enter>boot<enter>"] -boot_command_hyperv = ["<esc>linux /casper/vmlinuz quiet autoinstall ds='nocloud-net;s=http://{{.HTTPIP}}:{{.HTTPPort}}/ubuntu/'<enter>initrd /casper/initrd<enter>boot<enter>"] +boot_command = ["<wait><esc>linux /casper/vmlinuz quiet autoinstall ds='nocloud-net;s=http://{{.HTTPIP}}:{{.HTTPPort}}/ubuntu/'<enter>initrd /casper/initrd<enter>boot<enter>"] diff --git a/os_pkrvars/ubuntu/ubuntu-20.04-x86_64.pkrvars.hcl b/os_pkrvars/ubuntu/ubuntu-20.04-x86_64.pkrvars.hcl index dd041c5b6..40cc14d9a 100644 --- a/os_pkrvars/ubuntu/ubuntu-20.04-x86_64.pkrvars.hcl +++ b/os_pkrvars/ubuntu/ubuntu-20.04-x86_64.pkrvars.hcl @@ -7,5 +7,4 @@ hyperv_generation = 2 parallels_guest_os_type = "ubuntu" vbox_guest_os_type = "Ubuntu_64" vmware_guest_os_type = "ubuntu-64" -boot_command = ["<wait>", "<esc><wait>", "<esc><wait>", "<f6><wait>", "<esc><wait>", "<bs><bs><bs><bs>", " autoinstall", " ds=nocloud-net;s=http://<wait5>{{.HTTPIP}}<wait5>:{{.HTTPPort}}/ubuntu/", " ---", "<enter>"] -boot_command_hyperv = ["<wait>", "<esc><wait>", "<esc><wait>", "<f6><wait>", "<esc><wait>", "<bs><bs><bs><bs>", " autoinstall", " ds=nocloud-net;s=http://<wait5>{{.HTTPIP}}<wait5>:{{.HTTPPort}}/ubuntu/", " ---", "<enter>"] +boot_command = ["<wait>", "<esc><wait>", "<esc><wait>", "<f6><wait>", "<esc><wait>", "<bs><bs><bs><bs>", " autoinstall", " ds=nocloud-net\\;s=http://{{.HTTPIP}}:{{.HTTPPort}}/ubuntu/", " ---", "<enter><wait>"] diff --git a/os_pkrvars/ubuntu/ubuntu-22.04-aarch64.pkrvars.hcl b/os_pkrvars/ubuntu/ubuntu-22.04-aarch64.pkrvars.hcl index 07ffcf5d8..40dac8936 100644 --- a/os_pkrvars/ubuntu/ubuntu-22.04-aarch64.pkrvars.hcl +++ b/os_pkrvars/ubuntu/ubuntu-22.04-aarch64.pkrvars.hcl @@ -7,5 +7,4 @@ hyperv_generation = 2 parallels_guest_os_type = "ubuntu" vbox_guest_os_type = "Ubuntu_64" vmware_guest_os_type = "ubuntu-64" -boot_command = ["<esc>linux /casper/vmlinuz quiet autoinstall ds='nocloud-net;s=http://{{.HTTPIP}}:{{.HTTPPort}}/ubuntu/'<enter>initrd /casper/initrd<enter>boot<enter>"] -boot_command_hyperv = ["<esc>linux /casper/vmlinuz quiet autoinstall ds='nocloud-net;s=http://{{.HTTPIP}}:{{.HTTPPort}}/ubuntu/'<enter>initrd /casper/initrd<enter>boot<enter>"] +boot_command = ["<wait>e<wait><down><down><down><end><wait> autoinstall ds=nocloud-net\\;s=http://{{.HTTPIP}}:{{.HTTPPort}}/ubuntu/<f10><wait>"] diff --git a/os_pkrvars/ubuntu/ubuntu-22.04-x86_64.pkrvars.hcl b/os_pkrvars/ubuntu/ubuntu-22.04-x86_64.pkrvars.hcl index 987aea74a..47fb44d0b 100644 --- a/os_pkrvars/ubuntu/ubuntu-22.04-x86_64.pkrvars.hcl +++ b/os_pkrvars/ubuntu/ubuntu-22.04-x86_64.pkrvars.hcl @@ -8,4 +8,3 @@ parallels_guest_os_type = "ubuntu" vbox_guest_os_type = "Ubuntu_64" vmware_guest_os_type = "ubuntu-64" boot_command = ["c<wait>set gfxpayload=keep<enter><wait>linux /casper/vmlinuz quiet autoinstall ds=nocloud-net\\;s=http://{{.HTTPIP}}:{{.HTTPPort}}/ubuntu/ ---<enter><wait>initrd /casper/initrd<wait><enter><wait>boot<enter><wait>"] -boot_command_hyperv = ["c<wait>set gfxpayload=keep<enter><wait>linux /casper/vmlinuz quiet autoinstall ds=nocloud-net\\;s=http://{{.HTTPIP}}:{{.HTTPPort}}/ubuntu/ ---<enter><wait>initrd /casper/initrd<wait><enter><wait>boot<enter><wait>"] diff --git a/os_pkrvars/ubuntu/ubuntu-22.10-aarch64.pkrvars.hcl b/os_pkrvars/ubuntu/ubuntu-22.10-aarch64.pkrvars.hcl index a67150462..c594dd1c6 100644 --- a/os_pkrvars/ubuntu/ubuntu-22.10-aarch64.pkrvars.hcl +++ b/os_pkrvars/ubuntu/ubuntu-22.10-aarch64.pkrvars.hcl @@ -8,4 +8,3 @@ parallels_guest_os_type = "ubuntu" vbox_guest_os_type = "Ubuntu_64" vmware_guest_os_type = "ubuntu-64" boot_command = ["<wait>e<wait><down><down><down><end> autoinstall ds=nocloud-net\\;s=http://{{.HTTPIP}}:{{.HTTPPort}}/ubuntu/<wait><f10><wait>"] -boot_command_hyperv = ["<wait>e<wait><down><down><down><end> autoinstall ds=nocloud-net\\;s=http://{{.HTTPIP}}:{{.HTTPPort}}/ubuntu/<wait><f10><wait>"] diff --git a/os_pkrvars/ubuntu/ubuntu-22.10-x86_64.pkrvars.hcl b/os_pkrvars/ubuntu/ubuntu-22.10-x86_64.pkrvars.hcl index 4ea529502..22f4168dd 100644 --- a/os_pkrvars/ubuntu/ubuntu-22.10-x86_64.pkrvars.hcl +++ b/os_pkrvars/ubuntu/ubuntu-22.10-x86_64.pkrvars.hcl @@ -8,4 +8,3 @@ parallels_guest_os_type = "ubuntu" vbox_guest_os_type = "Ubuntu_64" vmware_guest_os_type = "ubuntu-64" boot_command = ["<wait>e<wait><down><down><down><end> autoinstall ds=nocloud-net\\;s=http://{{.HTTPIP}}:{{.HTTPPort}}/ubuntu/<wait><f10><wait>"] -boot_command_hyperv = ["<wait>e<wait><down><down><down><end> autoinstall ds=nocloud-net\\;s=http://{{.HTTPIP}}:{{.HTTPPort}}/ubuntu/<wait><f10><wait>"] diff --git a/os_pkrvars/windows/windows-10gen2-x86_64.pkrvars.hcl b/os_pkrvars/windows/windows-10gen2-x86_64.pkrvars.hcl index 0cf64362d..a7ea6ea53 100644 --- a/os_pkrvars/windows/windows-10gen2-x86_64.pkrvars.hcl +++ b/os_pkrvars/windows/windows-10gen2-x86_64.pkrvars.hcl @@ -7,7 +7,6 @@ iso_checksum = "ef7312733a9f5d7d51cfa04ac497671995674ca5e1058d5164d60 parallels_guest_os_type = "win-10" vbox_guest_os_type = "Windows10_64" vmware_guest_os_type = "windows9srv-64" -boot_command = ["aaaaaaa<wait><enter><wait><enter><wait><enter>"] -boot_command_hyperv = ["aaaaaaa"] +boot_command = ["<wait>aaaaaaa<wait><enter><wait><enter><wait><enter>"] hyperv_generation = 2 sources_enabled = ["source.hyperv-iso.vm", "source.qemu.vm"] diff --git a/os_pkrvars/windows/windows-11-x86_64.pkrvars.hcl b/os_pkrvars/windows/windows-11-x86_64.pkrvars.hcl index b29a3bff6..fce6018c0 100644 --- a/os_pkrvars/windows/windows-11-x86_64.pkrvars.hcl +++ b/os_pkrvars/windows/windows-11-x86_64.pkrvars.hcl @@ -8,5 +8,4 @@ iso_checksum = "sha256:e8b1d2a1a85a09b4bf6154084a8be8e3c814894a15a7bc parallels_guest_os_type = "win-11" vbox_guest_os_type = "Windows11_64" vmware_guest_os_type = "windows9srv-64" -boot_command_hyperv = ["<leftShiftOn><f10><leftShiftOff><wait>reg add HKLM\\SYSTEM\\Setup\\LabConfig /t REG_DWORD /v BypassTPMCheck /d 1<return>reg add HKLM\\SYSTEM\\Setup\\LabConfig /t REG_DWORD /v BypassSecureBootCheck /d 1<return><wait>exit<return><wait><return>"] boot_command = ["<leftShiftOn><f10><leftShiftOff><wait>reg add HKLM\\SYSTEM\\Setup\\LabConfig /t REG_DWORD /v BypassTPMCheck /d 1<return>reg add HKLM\\SYSTEM\\Setup\\LabConfig /t REG_DWORD /v BypassSecureBootCheck /d 1<return><wait>exit<return><wait><return>"] diff --git a/os_pkrvars/windows/windows-11gen2-x86_64.pkrvars.hcl b/os_pkrvars/windows/windows-11gen2-x86_64.pkrvars.hcl index ca44a0cac..37c72aaab 100644 --- a/os_pkrvars/windows/windows-11gen2-x86_64.pkrvars.hcl +++ b/os_pkrvars/windows/windows-11gen2-x86_64.pkrvars.hcl @@ -9,6 +9,5 @@ parallels_guest_os_type = "win-11" vbox_guest_os_type = "Windows11_64" vmware_guest_os_type = "windows9srv-64" hyperv_generation = 2 -boot_command_hyperv = ["aaaaaaa"] -boot_command = ["aaaaaaa<wait><enter><wait><enter><wait><enter>"] +boot_command = ["<wait>aaaaaaa<wait><enter><wait><enter><wait><enter>"] sources_enabled = ["source.hyperv-iso.vm", "source.qemu.vm"] diff --git a/packer_templates/http/fedora/ks.cfg b/packer_templates/http/fedora/ks.cfg index 6d4aa6441..f31e5330c 100644 --- a/packer_templates/http/fedora/ks.cfg +++ b/packer_templates/http/fedora/ks.cfg @@ -22,6 +22,7 @@ wget nfs-utils net-tools rsync +dkms -plymouth -plymouth-core-libs -fedora-release-notes @@ -36,4 +37,11 @@ rsync echo 'Defaults:vagrant !requiretty' > /etc/sudoers.d/vagrant echo '%vagrant ALL=(ALL) NOPASSWD: ALL' >> /etc/sudoers.d/vagrant chmod 440 /etc/sudoers.d/vagrant + +# Enable hyper-v daemons only if using hyper-v virtualization +if [ $(virt-what) == "hyperv" ]; then +dnf -y install hyperv-daemons cifs-utils +systemctl enable hypervvssd +systemctl enable hypervkvpd +fi %end diff --git a/packer_templates/http/ubuntu/preseed-hyperv.cfg b/packer_templates/http/ubuntu/preseed-hyperv.cfg index 9d9f6dec7..6b40fbd7d 100755 --- a/packer_templates/http/ubuntu/preseed-hyperv.cfg +++ b/packer_templates/http/ubuntu/preseed-hyperv.cfg @@ -27,7 +27,7 @@ d-i passwd/user-uid string 1000 d-i passwd/user-password password vagrant d-i passwd/user-password-again password vagrant d-i passwd/username string vagrant -d-i pkgsel/include string openssh-server ntp linux-tools-$(uname -r) linux-cloud-tools-$(uname -r) linux-cloud-tools-common cifs-utils software-properties-common ifupdown +d-i pkgsel/include string openssh-server ntp dkms linux-tools-$(uname -r) linux-cloud-tools-$(uname -r) linux-cloud-tools-common cifs-utils software-properties-common ifupdown d-i pkgsel/install-language-support boolean false d-i pkgsel/update-policy select none d-i pkgsel/upgrade select full-upgrade diff --git a/packer_templates/http/ubuntu/user-data b/packer_templates/http/ubuntu/user-data index a6a096122..df9c1b033 100644 --- a/packer_templates/http/ubuntu/user-data +++ b/packer_templates/http/ubuntu/user-data @@ -15,4 +15,5 @@ autoinstall: late-commands: - 'sed -i "s/dhcp4: true/&\n dhcp-identifier: mac/" /target/etc/netplan/00-installer-config.yaml' - echo 'vagrant ALL=(ALL) NOPASSWD:ALL' > /target/etc/sudoers.d/vagrant - + # Enable hyper-v daemons only if using hyper-v virtualization + - if [ $(virt-what) == "hyperv" ]; then apt-get update && apt-get install -y hyperv-daemons linux-tools-$(uname -r) linux-cloud-tools-$(uname -r) linux-cloud-tools-common cifs-utils && systemctl enable hypervvssd && systemctl enable hypervkvpd && systemctl start hypervvssd && systemctl start hypervkvpd; fi diff --git a/packer_templates/pkr-builder.pkr.hcl b/packer_templates/pkr-builder.pkr.hcl index bc7c4f44c..c586f3ada 100644 --- a/packer_templates/pkr-builder.pkr.hcl +++ b/packer_templates/pkr-builder.pkr.hcl @@ -5,10 +5,6 @@ packer { version = ">= 1.0.0" source = "github.com/hashicorp/hyperv" } - inspec = { - version = ">= 0.0.1" - source = "github.com/hashicorp/inspec" - } parallels = { version = ">= 1.0.1" source = "github.com/hashicorp/parallels" @@ -27,7 +23,7 @@ packer { } vmware = { version = ">= 0.0.1" - source = "github.com/hashicorp/vmware" + source = "github.com/stromweld/vmware" # TODO: switching to stromweld repo for fix to vmware tools for fusion 13 till official fix is in place https://github.com/hashicorp/packer-plugin-vmware/issues/109 } windows-update = { version = ">= 0.14.1" @@ -41,28 +37,24 @@ locals { substr(var.os_version, 0, 2) == "10" || substr(var.os_version, 0, 2) == "11" ? [ # "${path.root}/scripts/windows/base_setup.ps1", + "${path.root}/scripts/windows/provision.ps1", "${path.root}/scripts/windows/disable-windows-updates.ps1", "${path.root}/scripts/windows/disable-windows-defender.ps1", "${path.root}/scripts/windows/remove-one-drive.ps1", "${path.root}/scripts/windows/remove-apps.ps1", "${path.root}/scripts/windows/virtualbox-prevent-vboxsrv-resolution-delay.ps1", - "${path.root}/scripts/windows/provision-guest-tools-qemu-kvm.ps1", - "${path.root}/scripts/windows/provision-vmwaretools.ps1", "${path.root}/scripts/windows/provision-winrm.ps1", - "${path.root}/scripts/windows/provision.ps1", "${path.root}/scripts/windows/enable-remote-desktop.ps1", "${path.root}/scripts/windows/eject-media.ps1" ] : [ # "${path.root}/scripts/windows/base_setup.ps1", + "${path.root}/scripts/windows/provision.ps1", "${path.root}/scripts/windows/disable-windows-updates.ps1", "${path.root}/scripts/windows/disable-windows-defender.ps1", "${path.root}/scripts/windows/remove-one-drive.ps1", # "${path.root}/scripts/windows/remove-apps.ps1", "${path.root}/scripts/windows/virtualbox-prevent-vboxsrv-resolution-delay.ps1", - "${path.root}/scripts/windows/provision-guest-tools-qemu-kvm.ps1", - "${path.root}/scripts/windows/provision-vmwaretools.ps1", "${path.root}/scripts/windows/provision-winrm.ps1", - "${path.root}/scripts/windows/provision.ps1", "${path.root}/scripts/windows/enable-remote-desktop.ps1", "${path.root}/scripts/windows/eject-media.ps1" ] @@ -125,7 +117,7 @@ locals { "${path.root}/scripts/_common/sshd.sh", "${path.root}/scripts/_common/virtualbox.sh", "${path.root}/scripts/_common/vmware_fedora.sh", - "${path.root}/scripts/_common/parallels.sh", + "${path.root}/scripts/_common/parallels-rhel.sh", "${path.root}/scripts/_common/vagrant.sh", "${path.root}/scripts/fedora/real-tmp_fedora.sh", "${path.root}/scripts/fedora/cleanup_dnf.sh", @@ -144,7 +136,7 @@ locals { "${path.root}/scripts/_common/vagrant.sh", "${path.root}/scripts/_common/virtualbox.sh", "${path.root}/scripts/_common/vmware_rhel.sh", - "${path.root}/scripts/_common/parallels.sh", + "${path.root}/scripts/_common/parallels-rhel.sh", "${path.root}/scripts/rhel/cleanup_yum.sh", "${path.root}/scripts/_common/minimize.sh" ] : [ @@ -154,7 +146,7 @@ locals { "${path.root}/scripts/_common/vagrant.sh", "${path.root}/scripts/_common/virtualbox.sh", "${path.root}/scripts/_common/vmware_rhel.sh", - "${path.root}/scripts/_common/parallels.sh", + "${path.root}/scripts/_common/parallels-rhel.sh", "${path.root}/scripts/rhel/cleanup_dnf.sh", "${path.root}/scripts/_common/minimize.sh" ] diff --git a/packer_templates/pkr-sources.pkr.hcl b/packer_templates/pkr-sources.pkr.hcl index c57e84ae2..d36be65da 100644 --- a/packer_templates/pkr-sources.pkr.hcl +++ b/packer_templates/pkr-sources.pkr.hcl @@ -29,23 +29,22 @@ locals { ) : var.parallels_prlctl # qemu + qemu_binary = var.qemu_binary == null ? "qemu-system-${var.os_arch}" : var.qemu_binary + qemu_machine_type = var.qemu_machine_type == null ? ( + var.os_arch == "aarch64" ? "virt" : "q35" + ) : var.qemu_machine_type qemuargs = var.qemuargs == null ? ( var.hyperv_generation == 2 && var.is_windows ? [ - ["-m", "${local.memory}"], - ["-smp", "2"], ["-bios", "/usr/share/OVMF/OVMF_CODE.fd"], - ["-display", "none"] ] : ( var.is_windows ? [ - ["-m", "${local.memory}"], - ["-smp", "2"], - ["-drive", "file=~/virtio-win.iso,media=cdrom,index=3"], + ["-drive", "file=${path.root}/win_answer_files/virtio-win.iso,media=cdrom,index=3"], ["-drive", "file=${path.root}/../builds/packer-${var.os_name}-${var.os_version}-${var.os_arch}-qemu/{{ .Name }},if=virtio,cache=writeback,discard=ignore,format=qcow2,index=1"], - ["-display", "none"] - ] : [ - ["-m", "${local.memory}"], - ["-display", "none"] - ] + ] : ( + var.os_arch == "aarch64" ? [ + ["-boot", "strict=off"] + ] : null + ) ) ) : var.qemuargs @@ -60,7 +59,7 @@ locals { var.is_windows && var.hyperv_generation == 1 ? "attach" : "upload" ) : var.vbox_guest_additions_mode - # virtualbox-ovg + # virtualbox-ovf vbox_source = var.vbox_source == null ? ( var.os_name == "amazonlinux" ? "${path.root}/amz_working_files/amazon2.ovf" : null ) : var.vbox_source @@ -69,16 +68,10 @@ locals { vmware_disk_adapter_type = var.vmware_disk_adapter_type == null ? ( var.is_windows ? "lsisas1068" : null ) : var.vmware_disk_adapter_type - vmware_tools_upload_flavor = var.vmware_tools_upload_flavor == null ? ( - var.is_windows ? "windows" : null - ) : var.vmware_tools_upload_flavor - vmware_tools_upload_path = var.vmware_tools_upload_path == null ? ( - var.is_windows ? "c:/Windows/Temp/vmware.iso" : null - ) : var.vmware_tools_upload_path # Source block common boot_wait = var.boot_wait == null ? ( - var.is_windows ? "60s" : "5s" + var.is_windows ? "60s" : "10s" ) : var.boot_wait cd_files = var.cd_files == null ? ( var.hyperv_generation == 2 && var.is_windows ? [ @@ -120,7 +113,7 @@ source "hyperv-iso" "vm" { generation = var.hyperv_generation guest_additions_mode = var.hyperv_guest_additions_mode switch_name = var.hyperv_switch_name - boot_command = var.boot_command_hyperv + boot_command = var.boot_command boot_wait = local.boot_wait cpus = var.cpus communicator = local.communicator @@ -173,6 +166,9 @@ source "parallels-iso" "vm" { } source "qemu" "vm" { accelerator = var.qemu_accelerator + display = var.headless ? "none" : var.qemu_display + machine_type = local.qemu_machine_type + qemu_binary = local.qemu_binary qemuargs = local.qemuargs boot_command = var.boot_command boot_wait = local.boot_wait @@ -251,8 +247,8 @@ source "virtualbox-ovf" "amazonlinux" { source "vmware-iso" "vm" { guest_os_type = var.vmware_guest_os_type disk_adapter_type = local.vmware_disk_adapter_type - tools_upload_flavor = local.vmware_tools_upload_flavor - tools_upload_path = local.vmware_tools_upload_path + tools_upload_flavor = var.vmware_tools_upload_flavor + tools_upload_path = var.vmware_tools_upload_path version = var.vmware_version vmx_data = var.vmware_vmx_data vmx_remove_ethernet_interfaces = var.vmware_vmx_remove_ethernet_interfaces diff --git a/packer_templates/pkr-variables.pkr.hcl b/packer_templates/pkr-variables.pkr.hcl index 88d1a7b01..b21992509 100644 --- a/packer_templates/pkr-variables.pkr.hcl +++ b/packer_templates/pkr-variables.pkr.hcl @@ -49,11 +49,6 @@ variable "sources_enabled" { # Source block provider specific variables # hyperv-iso -variable "boot_command_hyperv" { - type = list(string) - default = null - description = "Commands to pass to gui session to initiate automated install" -} variable "hyperv_enable_dynamic_memory" { type = bool default = null @@ -104,6 +99,18 @@ variable "qemu_accelerator" { type = string default = null } +variable "qemu_binary" { + type = string + default = null +} +variable "qemu_display" { + type = string + default = "none" +} +variable "qemu_machine_type" { + type = string + default = null +} variable "qemuargs" { type = list(list(string)) default = null @@ -151,8 +158,8 @@ variable "vboxmanage" { "{{.Name}}", "--audio", "none", - # "--nat-localhostreachable1", - # "on", + "--nat-localhostreachable1", + "on", ] ] } @@ -161,7 +168,7 @@ variable "virtualbox_version_file" { default = ".vbox_version" } -# virtualbox-ovg +# virtualbox-ovf variable "vbox_source" { type = string default = null @@ -187,11 +194,14 @@ variable "vmware_tools_upload_path" { } variable "vmware_version" { type = number - default = 19 + default = 20 } variable "vmware_vmx_data" { - type = map(string) - default = null + type = map(string) + default = { + "cpuid.coresPerSocket" = "1" + "ethernet0.pciSlotNumber" = "32" + } } variable "vmware_vmx_remove_ethernet_interfaces" { type = bool diff --git a/packer_templates/scripts/_common/parallels-rhel.sh b/packer_templates/scripts/_common/parallels-rhel.sh new file mode 100644 index 000000000..fde6f59fb --- /dev/null +++ b/packer_templates/scripts/_common/parallels-rhel.sh @@ -0,0 +1,47 @@ +#!/bin/sh -eux + +# set a default HOME_DIR environment variable if not set +HOME_DIR="${HOME_DIR:-/home/vagrant}"; + +case "$PACKER_BUILDER_TYPE" in +parallels-iso|parallels-pvm) + major_version="$(sed 's/^.\+ release \([.0-9]\+\).*/\1/' /etc/redhat-release | awk -F. '{print $1}')" + # make sure we use dnf on EL 8+ + if [ "$major_version" -ge 8 ]; then + dnf -y install checkpolicy selinux-policy-devel gcc kernel-devel kernel-headers make + else + yum -y install checkpolicy selinux-policy-devel gcc kernel-devel kernel-headers make + fi + + mkdir -p /tmp/parallels; + if [ "$(uname -m)" = "aarch64" ] ; then + mount -o loop "$HOME_DIR"/prl-tools-lin-arm.iso /tmp/parallels; + else + mount -o loop "$HOME_DIR"/prl-tools-lin.iso /tmp/parallels; + fi + VER="$(cat /tmp/parallels/version)"; + + echo "Parallels Tools Version: $VER"; + + /tmp/parallels/install --install-unattended-with-deps \ + || (code="$?"; \ + echo "Parallels tools installation exited $code, attempting" \ + "to output /var/log/parallels-tools-install.log"; \ + cat /var/log/parallels-tools-install.log; \ + exit $code); + umount /tmp/parallels; + rm -rf /tmp/parallels; + rm -f "$HOME_DIR"/*.iso; + + # Parallels Tools for Linux includes native auto-mount script, + # which causes losing some of Vagrant-relative shared folders. + # So, we should disable this behavior. + # https://github.com/Parallels/vagrant-parallels/issues/325#issuecomment-418727113 + # TODO: verify this is fixed in latest version of parallels + # auto_mount_script='/usr/bin/prlfsmountd' + # if [ -f "${auto_mount_script}" ]; then + # printf '#!/bin/sh\n # Shared folders auto-mount is disabled by Vagrant' > "${auto_mount_script}" + # fi + + ;; +esac diff --git a/packer_templates/scripts/_common/parallels.sh b/packer_templates/scripts/_common/parallels.sh index 5ee69146f..def4f01aa 100644 --- a/packer_templates/scripts/_common/parallels.sh +++ b/packer_templates/scripts/_common/parallels.sh @@ -29,10 +29,11 @@ parallels-iso|parallels-pvm) # which causes losing some of Vagrant-relative shared folders. # So, we should disable this behavior. # https://github.com/Parallels/vagrant-parallels/issues/325#issuecomment-418727113 - auto_mount_script='/usr/bin/prlfsmountd' - if [ -f "${auto_mount_script}" ]; then - printf '#!/bin/sh\n # Shared folders auto-mount is disabled by Vagrant' > "${auto_mount_script}" - fi + # TODO: verify this is fixed in latest version of parallels + # auto_mount_script='/usr/bin/prlfsmountd' + # if [ -f "${auto_mount_script}" ]; then + # printf '#!/bin/sh\n # Shared folders auto-mount is disabled by Vagrant' > "${auto_mount_script}" + # fi ;; esac diff --git a/packer_templates/scripts/_common/vmware_fedora.sh b/packer_templates/scripts/_common/vmware_fedora.sh index ce11d25bf..8e02760c6 100644 --- a/packer_templates/scripts/_common/vmware_fedora.sh +++ b/packer_templates/scripts/_common/vmware_fedora.sh @@ -4,7 +4,6 @@ case "$PACKER_BUILDER_TYPE" in vmware-iso|vmware-vmx) dnf install -y open-vm-tools - mkdir /mnt/hgfs; systemctl enable vmtoolsd systemctl start vmtoolsd -esac \ No newline at end of file +esac diff --git a/packer_templates/scripts/_common/vmware_rhel.sh b/packer_templates/scripts/_common/vmware_rhel.sh index 75b2a4961..835230df6 100644 --- a/packer_templates/scripts/_common/vmware_rhel.sh +++ b/packer_templates/scripts/_common/vmware_rhel.sh @@ -5,9 +5,6 @@ HOME_DIR="${HOME_DIR:-/home/vagrant}"; case "$PACKER_BUILDER_TYPE" in vmware-iso|vmware-vmx) - - #!/bin/sh -eux - # determine the major EL version we're runninng major_version="$(sed 's/^.\+ release \([.0-9]\+\).*/\1/' /etc/redhat-release | awk -F. '{print $1}')"; @@ -15,7 +12,7 @@ vmware-iso|vmware-vmx) if [ "$major_version" -ge 8 ]; then dnf -y install open-vm-tools else - yum -y insttall open-vm-tools + yum -y install open-vm-tools fi ;; esac diff --git a/packer_templates/scripts/debian/cleanup_debian.sh b/packer_templates/scripts/debian/cleanup_debian.sh index b13df2bf6..c99bf448a 100644 --- a/packer_templates/scripts/debian/cleanup_debian.sh +++ b/packer_templates/scripts/debian/cleanup_debian.sh @@ -49,7 +49,10 @@ find /var/log -type f -exec truncate --size=0 {} \; echo "blank netplan machine-id (DUID) so machines get unique ID generated on boot" truncate -s 0 /etc/machine-id -truncate -s 0 /var/lib/dbus/machine-id # if not symlinked to "/etc/machine-id" +if test -f /var/lib/dbus/machine-id +then + truncate -s 0 /var/lib/dbus/machine-id # if not symlinked to "/etc/machine-id" +fi echo "remove the contents of /tmp and /var/tmp" rm -rf /tmp/* /var/tmp/* diff --git a/packer_templates/scripts/fedora/cleanup_dnf.sh b/packer_templates/scripts/fedora/cleanup_dnf.sh index b3b106d7f..8757cedaf 100644 --- a/packer_templates/scripts/fedora/cleanup_dnf.sh +++ b/packer_templates/scripts/fedora/cleanup_dnf.sh @@ -38,7 +38,10 @@ rm -f /var/lib/systemd/random-seed echo "Wipe netplan machine-id (DUID) so machines get unique ID generated on boot" truncate -s 0 /etc/machine-id -truncate -s 0 /var/lib/dbus/machine-id # if not symlinked to "/etc/machine-id" +if test -f /var/lib/dbus/machine-id +then + truncate -s 0 /var/lib/dbus/machine-id # if not symlinked to "/etc/machine-id" +fi echo "Clear the history so our install commands aren't there" rm -f /root/.wget-hsts diff --git a/packer_templates/scripts/rhel/cleanup_dnf.sh b/packer_templates/scripts/rhel/cleanup_dnf.sh index e84e35f14..2fa9737d8 100644 --- a/packer_templates/scripts/rhel/cleanup_dnf.sh +++ b/packer_templates/scripts/rhel/cleanup_dnf.sh @@ -52,7 +52,10 @@ rm -f /var/lib/systemd/random-seed echo "Wipe netplan machine-id (DUID) so machines get unique ID generated on boot" truncate -s 0 /etc/machine-id -truncate -s 0 /var/lib/dbus/machine-id # if not symlinked to "/etc/machine-id" +if test -f /var/lib/dbus/machine-id +then + truncate -s 0 /var/lib/dbus/machine-id # if not symlinked to "/etc/machine-id" +fi echo "Clear the history so our install commands aren't there" rm -f /root/.wget-hsts diff --git a/packer_templates/scripts/rhel/cleanup_yum.sh b/packer_templates/scripts/rhel/cleanup_yum.sh index eef2f11b4..6dd7cf34e 100644 --- a/packer_templates/scripts/rhel/cleanup_yum.sh +++ b/packer_templates/scripts/rhel/cleanup_yum.sh @@ -52,7 +52,10 @@ rm -f /var/lib/systemd/random-seed echo "Wipe netplan machine-id (DUID) so machines get unique ID generated on boot" truncate -s 0 /etc/machine-id -truncate -s 0 /var/lib/dbus/machine-id # if not symlinked to "/etc/machine-id" +if test -f /var/lib/dbus/machine-id +then + truncate -s 0 /var/lib/dbus/machine-id # if not symlinked to "/etc/machine-id" +fi echo "Clear the history so our install commands aren't there" rm -f /root/.wget-hsts diff --git a/packer_templates/scripts/rhel/update_dnf.sh b/packer_templates/scripts/rhel/update_dnf.sh index 856c12b35..62c95df90 100644 --- a/packer_templates/scripts/rhel/update_dnf.sh +++ b/packer_templates/scripts/rhel/update_dnf.sh @@ -1,7 +1,7 @@ #!/bin/sh -eux # update all packages -dnf -y upgrade +dnf -y upgrade --skip-broken reboot; sleep 60; diff --git a/packer_templates/scripts/rhel/update_yum.sh b/packer_templates/scripts/rhel/update_yum.sh index 32e26334f..d3ef300c5 100644 --- a/packer_templates/scripts/rhel/update_yum.sh +++ b/packer_templates/scripts/rhel/update_yum.sh @@ -1,5 +1,5 @@ #!/bin/sh -eux -yum -y upgrade; +yum -y upgrade --skip-broken; reboot; sleep 60; diff --git a/packer_templates/scripts/suse/cleanup_suse.sh b/packer_templates/scripts/suse/cleanup_suse.sh index d1b31d053..9100c3e16 100644 --- a/packer_templates/scripts/suse/cleanup_suse.sh +++ b/packer_templates/scripts/suse/cleanup_suse.sh @@ -19,7 +19,10 @@ rm -rf /tmp/* /var/tmp/* echo "blank netplan machine-id (DUID) so machines get unique ID generated on boot" truncate -s 0 /etc/machine-id -truncate -s 0 /var/lib/dbus/machine-id # if not symlinked to "/etc/machine-id" +if test -f /var/lib/dbus/machine-id +then + truncate -s 0 /var/lib/dbus/machine-id # if not symlinked to "/etc/machine-id" +fi echo "force a new random seed to be generated" rm -f /var/lib/systemd/random-seed diff --git a/packer_templates/scripts/suse/unsupported-modules_suse.sh b/packer_templates/scripts/suse/unsupported-modules_suse.sh index 8fa7e032b..e62773ec0 100644 --- a/packer_templates/scripts/suse/unsupported-modules_suse.sh +++ b/packer_templates/scripts/suse/unsupported-modules_suse.sh @@ -1,4 +1,4 @@ #!/bin/sh # Enable unsupported kernel modules, so vboxguest can install -sed -i -e 's#^allow_unsupported_modules 0#allow_unsupported_modules 1#' /etc/modprobe.d/10-unsupported-modules.conf +echo 'allow_unsupported_modules 1' > /etc/modprobe.d/10-unsupported-modules.conf diff --git a/packer_templates/scripts/ubuntu/cleanup_ubuntu.sh b/packer_templates/scripts/ubuntu/cleanup_ubuntu.sh index c5c68e2df..91f05656c 100644 --- a/packer_templates/scripts/ubuntu/cleanup_ubuntu.sh +++ b/packer_templates/scripts/ubuntu/cleanup_ubuntu.sh @@ -90,7 +90,10 @@ find /var/log -type f -exec truncate --size=0 {} \; echo "blank netplan machine-id (DUID) so machines get unique ID generated on boot" truncate -s 0 /etc/machine-id -truncate -s 0 /var/lib/dbus/machine-id # if not symlinked to "/etc/machine-id" +if test -f /var/lib/dbus/machine-id +then + truncate -s 0 /var/lib/dbus/machine-id # if not symlinked to "/etc/machine-id" +fi echo "remove the contents of /tmp and /var/tmp" rm -rf /tmp/* /var/tmp/* diff --git a/packer_templates/scripts/windows/optimize.ps1 b/packer_templates/scripts/windows/optimize.ps1 index 6f2cb7e14..86877e667 100644 --- a/packer_templates/scripts/windows/optimize.ps1 +++ b/packer_templates/scripts/windows/optimize.ps1 @@ -155,7 +155,11 @@ Stop-ServiceForReal BITS # Background Intelligent Transfer Service } catch { Write-Host "Ignoring taking ownership of temporary files error: $_" } - Remove-Item $_ -Exclude 'packer-*' -Recurse -Force -ErrorAction SilentlyContinue | Out-Null + try { + Remove-Item $_ -Exclude 'packer-*' -Recurse -Force -ErrorAction SilentlyContinue | Out-Null + } catch { + Write-Host "Ignoring failure to remove files error: $_" + } } diff --git a/packer_templates/scripts/windows/provision-guest-tools-qemu-kvm.ps1 b/packer_templates/scripts/windows/provision-guest-tools-qemu-kvm.ps1 deleted file mode 100644 index 379827cf6..000000000 --- a/packer_templates/scripts/windows/provision-guest-tools-qemu-kvm.ps1 +++ /dev/null @@ -1,54 +0,0 @@ -#MIT License -# -#Copyright (c) 2017 Rui Lopes -# -#Permission is hereby granted, free of charge, to any person obtaining a copy -#of this software and associated documentation files (the "Software"), to deal -#in the Software without restriction, including without limitation the rights -#to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -#copies of the Software, and to permit persons to whom the Software is -#furnished to do so, subject to the following conditions: -# -#The above copyright notice and this permission notice shall be included in all -#copies or substantial portions of the Software. -# -#THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -#IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -#FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -#AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -#LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -#OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -#SOFTWARE. - -Set-StrictMode -Version Latest -$ProgressPreference = 'SilentlyContinue' -$ErrorActionPreference = 'Stop' -trap { - Write-Host - Write-Host "ERROR: $_" - ($_.ScriptStackTrace -split '\r?\n') -replace '^(.*)$','ERROR: $1' | Write-Host - ($_.Exception.ToString() -split '\r?\n') -replace '^(.*)$','ERROR EXCEPTION: $1' | Write-Host - Write-Host - Write-Host 'Sleeping for 60m to give you time to look around the virtual machine before self-destruction...' - Start-Sleep -Seconds (60*60) - Exit 1 -} - -$systemVendor = (Get-CimInstance -ClassName Win32_ComputerSystemProduct -Property Vendor).Vendor -if ($systemVendor -eq 'QEMU') { - # qemu-kvm. - $guestToolsUrl = "http://$env:PACKER_HTTP_ADDR/drivers/virtio-win-guest-tools.exe" - $guestTools = "$env:TEMP\$(Split-Path -Leaf $guestToolsUrl)" - $guestToolsLog = "$guestTools.log" - Write-Host "Downloading the guest tools from $guestToolsUrl..." - Invoke-WebRequest $guestToolsUrl -OutFile $guestTools - Write-Host 'Installing the guest tools...' - &$guestTools /install /norestart /quiet /log $guestToolsLog | Out-String -Stream - if ($LASTEXITCODE) { - throw "failed to install guest tools with exit code $LASTEXITCODE" - } - Write-Host "Done installing the guest tools." -} else { - Write-Host "Not QEMU machine exiting" - Exit 0 -} diff --git a/packer_templates/scripts/windows/provision-vmwaretools.ps1 b/packer_templates/scripts/windows/provision-vmwaretools.ps1 deleted file mode 100644 index 707a16cf2..000000000 --- a/packer_templates/scripts/windows/provision-vmwaretools.ps1 +++ /dev/null @@ -1,41 +0,0 @@ -#MIT License -# -#Copyright (c) 2017 Rui Lopes -# -#Permission is hereby granted, free of charge, to any person obtaining a copy -#of this software and associated documentation files (the "Software"), to deal -#in the Software without restriction, including without limitation the rights -#to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -#copies of the Software, and to permit persons to whom the Software is -#furnished to do so, subject to the following conditions: -# -#The above copyright notice and this permission notice shall be included in all -#copies or substantial portions of the Software. -# -#THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -#IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -#FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -#AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -#LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -#OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -#SOFTWARE. - -Set-StrictMode -Version Latest -$ProgressPreference = 'SilentlyContinue' -$ErrorActionPreference = 'Stop' -trap { - Write-Host - Write-Output "ERROR: $_" - Write-Output (($_.ScriptStackTrace -split '\r?\n') -replace '^(.*)$','ERROR: $1') - Write-Host 'Sleeping for 60m to give you time to look around the virtual machine before self-destruction...' - Start-Sleep -Seconds (60*60) - Exit 1 -} - -$systemVendor = (Get-CimInstance -ClassName Win32_ComputerSystemProduct -Property Vendor).Vendor -if ($systemVendor -eq 'VMware, Inc.') { - Write-Output 'Installing VMware Tools...' - # silent install without rebooting. - E:\setup64.exe /s /v '/qn reboot=r' ` - | Out-String -Stream -} diff --git a/packer_templates/scripts/windows/provision.ps1 b/packer_templates/scripts/windows/provision.ps1 index f7b761e2d..1fd0979ed 100644 --- a/packer_templates/scripts/windows/provision.ps1 +++ b/packer_templates/scripts/windows/provision.ps1 @@ -59,7 +59,15 @@ Add-Type -A System.IO.Compression.FileSystem # install Guest Additions. $systemVendor = (Get-CimInstance -ClassName Win32_ComputerSystemProduct -Property Vendor).Vendor if ($systemVendor -eq 'QEMU') { - # do nothing. this was installed in provision-guest-tools-qemu-kvm.ps1. + $guestToolsPath = "e:\drivers\virtio-win-guest-tools.exe" + $guestTools = "$env:TEMP\$(Split-Path -Leaf $guestToolsPath)" + $guestToolsLog = "$guestTools.log" + Write-Host 'Installing the guest tools...' + &$guestTools /install /norestart /quiet /log $guestToolsLog | Out-String -Stream + if ($LASTEXITCODE) { + throw "failed to install guest tools with exit code $LASTEXITCODE" + } + Write-Host "Done installing the guest tools." } elseif ($systemVendor -eq 'innotek GmbH') { Write-Host 'Importing the Oracle (for VirtualBox) certificate as a Trusted Publisher...' E:\cert\VBoxCertUtil.exe add-trusted-publisher E:\cert\vbox-sha1.cer @@ -75,9 +83,17 @@ if ($systemVendor -eq 'QEMU') { } elseif ($systemVendor -eq 'Microsoft Corporation') { # do nothing. Hyper-V enlightments are already bundled with Windows. } elseif ($systemVendor -eq 'VMware, Inc.') { - # do nothing. VMware Tools were already installed by provision-vmtools.ps1 (executed from autounattend.xml). + Write-Output 'Installing VMware Tools...' + # silent install without rebooting. + E:\setup64.exe /s /v '/qn reboot=r'| Out-String -Stream +} elseif ($systemVendor -eq 'Parallels Software International Inc.') { + Write-Host 'Installing the Parallels Tools for Guest VM...' + E:\PTAgent.exe /install_silent | Out-String -Stream + if ($LASTEXITCODE) { + throw "failed to install with exit code $LASTEXITCODE. Check the logs at C:\Program Files\Oracle\VirtualBox Guest Additions\install.log." + } } else { - throw "Cannot install Guest Additions: Unsupported system ($systemVendor)." + Write-Host "Cannot install Guest Additions: Unsupported system ($systemVendor)." } Write-Host 'Setting the vagrant account properties...' From 16d4f71fb6043f993ef53aa624db084c2c177975 Mon Sep 17 00:00:00 2001 From: Corey Hemminger <hemminger@hotmail.com> Date: Sun, 5 Mar 2023 14:37:29 -0600 Subject: [PATCH 1509/1622] add arm build pipeline (#1482) * add arm build pipeline Signed-off-by: Corey Hemminger <hemminger@hotmail.com> --- .github/workflows/ci-build.yml | 124 ++++++++++++ .github/workflows/ci-verify.yml | 55 ++++++ .github/workflows/ci.yml | 183 ------------------ .github/workflows/pkr-bld-amazonlinux-x64.yml | 24 +-- .github/workflows/pkr-bld-hyperv-x64.yml | 22 +-- .github/workflows/pkr-bld-parallels-arm64.yml | 31 ++- .github/workflows/pkr-bld-parallels-x64.yml | 22 +-- .github/workflows/pkr-bld-qemu-arm64.yml | 31 ++- .github/workflows/pkr-bld-qemu-x64.yml | 22 +-- .../workflows/pkr-bld-virtualbox-arm64.yml | 31 ++- .github/workflows/pkr-bld-virtualbox-x64.yml | 22 +-- .github/workflows/pkr-bld-vmware-arm64.yml | 31 ++- .github/workflows/pkr-bld-vmware-x64.yml | 22 +-- CHANGELOG.md | 44 +++-- .../centos/centos-stream-9-x86_64.pkrvars.hcl | 2 +- os_pkrvars/rhel/rhel-7-aarch64.pkrvars.hcl | 2 +- os_pkrvars/rhel/rhel-7-x86_64.pkrvars.hcl | 2 +- os_pkrvars/rhel/rhel-8-aarch64.pkrvars.hcl | 2 +- os_pkrvars/rhel/rhel-8-x86_64.pkrvars.hcl | 2 +- os_pkrvars/rhel/rhel-9-aarch64.pkrvars.hcl | 2 +- os_pkrvars/rhel/rhel-9-x86_64.pkrvars.hcl | 2 +- .../scientificlinux-7-x86_64.pkrvars.hcl | 2 +- os_pkrvars/sles/sles-12-x86_64.pkrvars.hcl | 2 +- os_pkrvars/sles/sles-15-x86_64.pkrvars.hcl | 2 +- .../solaris/solaris-11-x86_64.pkrvars.hcl | 2 +- .../springdalelinux-7-x86_64.pkrvars.hcl | 2 +- .../springdalelinux-8-x86_64.pkrvars.hcl | 2 +- .../springdalelinux-9-x86_64.pkrvars.hcl | 2 +- .../ubuntu/ubuntu-22.04-aarch64.pkrvars.hcl | 4 +- .../ubuntu/ubuntu-22.04-x86_64.pkrvars.hcl | 6 +- .../windows/windows-11-x86_64.pkrvars.hcl | 2 +- 31 files changed, 322 insertions(+), 382 deletions(-) create mode 100644 .github/workflows/ci-build.yml create mode 100644 .github/workflows/ci-verify.yml delete mode 100644 .github/workflows/ci.yml diff --git a/.github/workflows/ci-build.yml b/.github/workflows/ci-build.yml new file mode 100644 index 000000000..1aaa6c394 --- /dev/null +++ b/.github/workflows/ci-build.yml @@ -0,0 +1,124 @@ +--- +on: + pull_request: + +jobs: + pkr-bld-amazonlinux-x64: + # needs: + # - yaml-lint + # - json-lint + # - xml-lint + # - powershell-lint + # - shellcheck-lint + # - packer-iso-check + # - packer-lint + uses: ./.github/workflows/pkr-bld-amazonlinux-x64.yml + secrets: inherit + + pkr-bld-hyperv-x64: + # needs: + # - yaml-lint + # - json-lint + # - xml-lint + # - powershell-lint + # - shellcheck-lint + # - packer-iso-check + # - packer-lint + uses: ./.github/workflows/pkr-bld-hyperv-x64.yml + secrets: inherit + + pkr-bld-parallels-arm64: + # needs: + # - yaml-lint + # - json-lint + # - xml-lint + # - powershell-lint + # - shellcheck-lint + # - packer-iso-check + # - packer-lint + uses: ./.github/workflows/pkr-bld-parallels-arm64.yml + secrets: inherit + + pkr-bld-parallels-x64: + # needs: + # - yaml-lint + # - json-lint + # - xml-lint + # - powershell-lint + # - shellcheck-lint + # - packer-iso-check + # - packer-lint + uses: ./.github/workflows/pkr-bld-parallels-x64.yml + secrets: inherit + + pkr-bld-qemu-arm64: + # needs: + # - yaml-lint + # - json-lint + # - xml-lint + # - powershell-lint + # - shellcheck-lint + # - packer-iso-check + # - packer-lint + uses: ./.github/workflows/pkr-bld-qemu-arm64.yml + secrets: inherit + + pkr-bld-qemu-x64: + # needs: + # - yaml-lint + # - json-lint + # - xml-lint + # - powershell-lint + # - shellcheck-lint + # - packer-iso-check + # - packer-lint + uses: ./.github/workflows/pkr-bld-qemu-x64.yml + secrets: inherit + + pkr-bld-virtualbox-arm64: + # needs: + # - yaml-lint + # - json-lint + # - xml-lint + # - powershell-lint + # - shellcheck-lint + # - packer-iso-check + # - packer-lint + uses: ./.github/workflows/pkr-bld-virtualbox-arm64.yml + secrets: inherit + + pkr-bld-virtualbox-x64: + # needs: + # - yaml-lint + # - json-lint + # - xml-lint + # - powershell-lint + # - shellcheck-lint + # - packer-iso-check + # - packer-lint + uses: ./.github/workflows/pkr-bld-virtualbox-x64.yml + secrets: inherit + + pkr-bld-vmware-arm64: + # needs: + # - yaml-lint + # - json-lint + # - xml-lint + # - powershell-lint + # - shellcheck-lint + # - packer-iso-check + # - packer-lint + uses: ./.github/workflows/pkr-bld-vmware-arm64.yml + secrets: inherit + + pkr-bld-vmware-x64: + # needs: + # - yaml-lint + # - json-lint + # - xml-lint + # - powershell-lint + # - shellcheck-lint + # - packer-iso-check + # - packer-lint + uses: ./.github/workflows/pkr-bld-vmware-x64.yml + secrets: inherit diff --git a/.github/workflows/ci-verify.yml b/.github/workflows/ci-verify.yml new file mode 100644 index 000000000..c56b11dfd --- /dev/null +++ b/.github/workflows/ci-verify.yml @@ -0,0 +1,55 @@ +--- +on: + pull_request: + schedule: + - cron: '0 0 * * 0' + +jobs: + markdown-lint: + uses: chef/github-workflows/.github/workflows/markdown-lint.yml@main + + markdown-link-checker: + uses: chef/github-workflows/.github/workflows/markdown-link-checker.yml@main + + yaml-lint: + uses: chef/github-workflows/.github/workflows/yaml-lint.yml@main + + json-lint: + uses: chef/github-workflows/.github/workflows/json-lint.yml@main + + xml-lint: + uses: chef/github-workflows/.github/workflows/xml-lint.yml@main + + shellcheck-lint: + uses: chef/github-workflows/.github/workflows/shellcheck-lint.yml@main + + powershell-lint: + uses: chef/github-workflows/.github/workflows/powershell-lint.yml@main + + packer-iso-check: + uses: chef/github-workflows/.github/workflows/packer-iso-url-checker.yml@main + secrets: inherit + + packer-lint: + uses: chef/github-workflows/.github/workflows/packer-lint.yml@main + secrets: inherit + + check_jobs_pass: + if: always() + needs: + - markdown-lint + - yaml-lint + - json-lint + - xml-lint + - powershell-lint + - shellcheck-lint + - packer-iso-check + - packer-lint + runs-on: Ubuntu-latest + steps: + - name: Decide whether the needed jobs succeeded or failed + uses: re-actors/alls-green@main + with: + allowed-failures: + allowed-skips: ${{ toJSON(needs) }} + jobs: ${{ toJSON(needs) }} diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml deleted file mode 100644 index 6aa5b000e..000000000 --- a/.github/workflows/ci.yml +++ /dev/null @@ -1,183 +0,0 @@ ---- -on: - pull_request: - -jobs: - markdown-lint: - uses: chef/github-workflows/.github/workflows/markdown-lint.yml@main - - markdown-link-checker: - uses: chef/github-workflows/.github/workflows/markdown-link-checker.yml@main - - yaml-lint: - uses: chef/github-workflows/.github/workflows/yaml-lint.yml@main - - json-lint: - uses: chef/github-workflows/.github/workflows/json-lint.yml@main - - xml-lint: - uses: chef/github-workflows/.github/workflows/xml-lint.yml@main - - shellcheck-lint: - uses: chef/github-workflows/.github/workflows/shellcheck-lint.yml@main - - powershell-lint: - uses: chef/github-workflows/.github/workflows/powershell-lint.yml@main - - packer-iso-check: - uses: chef/github-workflows/.github/workflows/packer-iso-url-checker.yml@main - secrets: inherit - - packer-lint: - uses: chef/github-workflows/.github/workflows/packer-lint.yml@main - secrets: inherit - - pkr-bld-amazonlinux-x64: -# needs: -# - yaml-lint -# - json-lint -# - xml-lint -# - powershell-lint -# - shellcheck-lint -# - packer-iso-check -# - packer-lint - uses: ./.github/workflows/pkr-bld-amazonlinux-x64.yml - secrets: inherit - - # pkr-bld-virtualbox-arm64: - # # needs: - # # - yaml-lint - # # - json-lint - # # - xml-lint - # # - powershell-lint - # # - shellcheck-lint - # # - packer-iso-check - # # - packer-lint - # uses: ./.github/workflows/pkr-bld-virtualbox-arm64.yml - # secrets: inherit - - pkr-bld-virtualbox-x64: - # needs: - # - yaml-lint - # - json-lint - # - xml-lint - # - powershell-lint - # - shellcheck-lint - # - packer-iso-check - # - packer-lint - uses: ./.github/workflows/pkr-bld-virtualbox-x64.yml - secrets: inherit - - # pkr-bld-parallels-arm64: - # # needs: - # # - yaml-lint - # # - json-lint - # # - xml-lint - # # - powershell-lint - # # - shellcheck-lint - # # - packer-iso-check - # # - packer-lint - # uses: ./.github/workflows/pkr-bld-parallels-arm64.yml - # secrets: inherit - - pkr-bld-parallels-x64: - # needs: - # - yaml-lint - # - json-lint - # - xml-lint - # - powershell-lint - # - shellcheck-lint - # - packer-iso-check - # - packer-lint - uses: ./.github/workflows/pkr-bld-parallels-x64.yml - secrets: inherit - - # pkr-bld-vmware-arm64: - # # needs: - # # - yaml-lint - # # - json-lint - # # - xml-lint - # # - powershell-lint - # # - shellcheck-lint - # # - packer-iso-check - # # - packer-lint - # uses: ./.github/workflows/pkr-bld-vmware-arm64.yml - # secrets: inherit - - pkr-bld-vmware-x64: - # needs: - # - yaml-lint - # - json-lint - # - xml-lint - # - powershell-lint - # - shellcheck-lint - # - packer-iso-check - # - packer-lint - uses: ./.github/workflows/pkr-bld-vmware-x64.yml - secrets: inherit - - pkr-bld-hyperv-x64: - # needs: - # - yaml-lint - # - json-lint - # - xml-lint - # - powershell-lint - # - shellcheck-lint - # - packer-iso-check - # - packer-lint - uses: ./.github/workflows/pkr-bld-hyperv-x64.yml - secrets: inherit - -# pkr-bld-qemu-arm64: -# # needs: -# # - yaml-lint -# # - json-lint -# # - xml-lint -# # - powershell-lint -# # - shellcheck-lint -# # - packer-iso-check -# # - packer-lint -# uses: ./.github/workflows/pkr-bld-qemu-arm64.yml -# secrets: inherit - - pkr-bld-qemu-x64: - # needs: - # - yaml-lint - # - json-lint - # - xml-lint - # - powershell-lint - # - shellcheck-lint - # - packer-iso-check - # - packer-lint - uses: ./.github/workflows/pkr-bld-qemu-x64.yml - secrets: inherit - - check_jobs_pass: - if: always() - needs: - - markdown-lint - - yaml-lint - - json-lint - - xml-lint - - powershell-lint - - shellcheck-lint - # - packer-iso-check - # - packer-lint - # - pkr-bld-amazonlinux-x64 - # - pkr-bld-hyperv-x64 - # - pkr-bld-parallels-arm64 - # - pkr-bld-parallels-x64 - # - pkr-bld-qemu-arm64 - # - pkr-bld-qemu-x64 - # - pkr-bld-virtualbox-arm64 - # - pkr-bld-virtualbox-x64 - # - pkr-bld-vmware-arm64 - # - pkr-bld-vmware-x64 - runs-on: Ubuntu-latest - steps: - - name: Decide whether the needed jobs succeeded or failed - uses: re-actors/alls-green@main - with: - allowed-failures: - allowed-skips: ${{ toJSON(needs) }} - jobs: ${{ toJSON(needs) }} diff --git a/.github/workflows/pkr-bld-amazonlinux-x64.yml b/.github/workflows/pkr-bld-amazonlinux-x64.yml index 49f6342f8..1dfc95d17 100644 --- a/.github/workflows/pkr-bld-amazonlinux-x64.yml +++ b/.github/workflows/pkr-bld-amazonlinux-x64.yml @@ -8,33 +8,27 @@ on: jobs: x86_64: runs-on: [self-hosted, X64, virtualbox] + strategy: + fail-fast: false + matrix: + os: + - amazonlinux-2 steps: - name: Checkout uses: actions/checkout@main - - name: Pull Change list - id: changed-files - uses: collin-miller/git-changesets@master - - name: Verify Changed files - id: verify-changed-files - run: | - echo '${{ steps.changed-files.outputs.added_modified }}' > changed.txt - if grep ".*\.pkrvars.hcl" changed.txt; then - echo "files_changed=true" >> $GITHUB_OUTPUT - else - echo "files_changed=false" >> $GITHUB_OUTPUT - fi - name: Setup Packer - if: steps.verify-changed-files.outputs.files_changed == 'true' uses: hashicorp/setup-packer@main with: version: latest - name: Packer Init - if: steps.verify-changed-files.outputs.files_changed == 'true' env: PACKER_GITHUB_API_TOKEN: "${{ secrets.PACKER_GITHUB_API_TOKEN }}" run: packer init -upgrade packer_templates + - name: Packer FMT + run: if packer fmt -check -recursive .; then exit 0; else echo "Some packer files need to be formatted, run 'packer fmt -recursive .' to fix"; exit 1; fi + - name: Packer Validate + run: packer validate -var-file=os_pkrvars/$(echo ${{ matrix.os }} | cut -d "-" -f 1)/"${{ matrix.os }}-x86_64.pkrvars.hcl" packer_templates - name: Packer build - if: steps.verify-changed-files.outputs.files_changed == 'true' run: ./AMZ_build_virtualbox-ovf.sh - name: Upload build artifact uses: actions/upload-artifact@main diff --git a/.github/workflows/pkr-bld-hyperv-x64.yml b/.github/workflows/pkr-bld-hyperv-x64.yml index acc926d76..43a637a1e 100644 --- a/.github/workflows/pkr-bld-hyperv-x64.yml +++ b/.github/workflows/pkr-bld-hyperv-x64.yml @@ -50,30 +50,22 @@ jobs: steps: - name: Checkout uses: actions/checkout@main -# - name: Pull Change list -# id: changed-files -# uses: collin-miller/git-changesets@master -# - name: Verify Changed files -# id: verify-changed-files -# run: | -# echo '${{ steps.changed-files.outputs.added_modified }}' > changed.txt -# if grep ".*\.pkrvars.hcl" changed.txt; then -# echo "files_changed=true" >> $GITHUB_OUTPUT -# else -# echo "files_changed=false" >> $GITHUB_OUTPUT -# fi + - name: iso-availability + shell: pwsh + run: Invoke-RestMethod -Method Head -Verbose -Uri $(Get-Content os_pkrvars/$('${{ matrix.os }}'.split('-')[0])/${{ matrix.os }}-x86_64.pkrvars.hcl | ConvertFrom-StringData).iso_url.Trim('"') - name: Setup Packer -# if: steps.verify-changed-files.outputs.files_changed == 'true' uses: hashicorp/setup-packer@main with: version: latest - name: Packer Init -# if: steps.verify-changed-files.outputs.files_changed == 'true' env: PACKER_GITHUB_API_TOKEN: "${{ secrets.PACKER_GITHUB_API_TOKEN }}" run: packer init -upgrade packer_templates + - name: Packer FMT + run: packer fmt -check -recursive . + - name: Packer Validate + run: packer validate -var-file="os_pkrvars/$("${{ matrix.os }}".Split('-')[0])/${{ matrix.os }}-x86_64.pkrvars.hcl" packer_templates - name: Packer build -# if: steps.verify-changed-files.outputs.files_changed == 'true' run: packer build -timestamp-ui -only="${{ matrix.provider }}.vm" -var-file="os_pkrvars/$("${{ matrix.os }}".Split('-')[0])/${{ matrix.os }}-x86_64.pkrvars.hcl" packer_templates - name: Upload build artifact uses: actions/upload-artifact@main diff --git a/.github/workflows/pkr-bld-parallels-arm64.yml b/.github/workflows/pkr-bld-parallels-arm64.yml index 09a9d7e50..cc8a25f6a 100644 --- a/.github/workflows/pkr-bld-parallels-arm64.yml +++ b/.github/workflows/pkr-bld-parallels-arm64.yml @@ -35,30 +35,23 @@ jobs: steps: - name: Checkout uses: actions/checkout@main - - name: Pull Change list - id: changed-files - uses: collin-miller/git-changesets@master - - name: Verify Changed files - id: verify-changed-files - run: | - echo '${{ steps.changed-files.outputs.added_modified }}' > changed.txt - if grep ".*\.pkrvars.hcl" changed.txt; then - echo "files_changed=true" >> $GITHUB_OUTPUT - else - echo "files_changed=false" >> $GITHUB_OUTPUT - fi - - name: Setup Packer - if: steps.verify-changed-files.outputs.files_changed == 'true' - uses: hashicorp/setup-packer@main - with: - version: latest + - name: iso-availability + shell: pwsh + run: Invoke-RestMethod -Method Head -Verbose -Uri $(Get-Content os_pkrvars/$('${{ matrix.os }}'.split('-')[0])/${{ matrix.os }}-x86_64.pkrvars.hcl | ConvertFrom-StringData).iso_url.Trim('"') +# - name: Setup Packer +# if: steps.verify-changed-files.outputs.files_changed == 'true' +# uses: hashicorp/setup-packer@main +# with: +# version: latest - name: Packer Init - if: steps.verify-changed-files.outputs.files_changed == 'true' env: PACKER_GITHUB_API_TOKEN: "${{ secrets.PACKER_GITHUB_API_TOKEN }}" run: packer init -upgrade packer_templates + - name: Packer FMT + run: if packer fmt -check -recursive .; then exit 0; else echo "Some packer files need to be formatted, run 'packer fmt -recursive .' to fix"; exit 1; fi + - name: Packer Validate + run: packer validate -var-file=os_pkrvars/$(echo ${{ matrix.os }} | cut -d "-" -f 1)/"${{ matrix.os }}-aarch64.pkrvars.hcl" packer_templates - name: Packer build - if: steps.verify-changed-files.outputs.files_changed == 'true' run: packer build -timestamp-ui -only=${{ matrix.provider }}.vm -var-file=os_pkrvars/$(echo ${{ matrix.os }} | cut -d "-" -f 1)/"${{ matrix.os }}-aarch64.pkrvars.hcl" packer_templates - name: Upload build artifact uses: actions/upload-artifact@v3 diff --git a/.github/workflows/pkr-bld-parallels-x64.yml b/.github/workflows/pkr-bld-parallels-x64.yml index 2af687438..46c47215d 100644 --- a/.github/workflows/pkr-bld-parallels-x64.yml +++ b/.github/workflows/pkr-bld-parallels-x64.yml @@ -48,30 +48,22 @@ jobs: steps: - name: Checkout uses: actions/checkout@main - - name: Pull Change list - id: changed-files - uses: collin-miller/git-changesets@master - - name: Verify Changed files - id: verify-changed-files - run: | - echo '${{ steps.changed-files.outputs.added_modified }}' > changed.txt - if grep ".*\.pkrvars.hcl" changed.txt; then - echo "files_changed=true" >> $GITHUB_OUTPUT - else - echo "files_changed=false" >> $GITHUB_OUTPUT - fi + - name: iso-availability + shell: pwsh + run: Invoke-RestMethod -Method Head -Verbose -Uri $(Get-Content os_pkrvars/$('${{ matrix.os }}'.split('-')[0])/${{ matrix.os }}-x86_64.pkrvars.hcl | ConvertFrom-StringData).iso_url.Trim('"') - name: Setup Packer - if: steps.verify-changed-files.outputs.files_changed == 'true' uses: hashicorp/setup-packer@main with: version: latest - name: Packer Init - if: steps.verify-changed-files.outputs.files_changed == 'true' env: PACKER_GITHUB_API_TOKEN: "${{ secrets.PACKER_GITHUB_API_TOKEN }}" run: packer init -upgrade packer_templates + - name: Packer FMT + run: if packer fmt -check -recursive .; then exit 0; else echo "Some packer files need to be formatted, run 'packer fmt -recursive .' to fix"; exit 1; fi + - name: Packer Validate + run: packer validate -var-file=os_pkrvars/$(echo ${{ matrix.os }} | cut -d "-" -f 1)/"${{ matrix.os }}-x86_64.pkrvars.hcl" packer_templates - name: Packer build - if: steps.verify-changed-files.outputs.files_changed == 'true' run: packer build -timestamp-ui -only=${{ matrix.provider }}.vm -var-file=os_pkrvars/$(echo ${{ matrix.os }} | cut -d "-" -f 1)/"${{ matrix.os }}-x86_64.pkrvars.hcl" packer_templates - name: Upload build artifact uses: actions/upload-artifact@v3 diff --git a/.github/workflows/pkr-bld-qemu-arm64.yml b/.github/workflows/pkr-bld-qemu-arm64.yml index a8b6d5338..46696d9c1 100644 --- a/.github/workflows/pkr-bld-qemu-arm64.yml +++ b/.github/workflows/pkr-bld-qemu-arm64.yml @@ -35,30 +35,23 @@ jobs: steps: - name: Checkout uses: actions/checkout@main - - name: Pull Change list - id: changed-files - uses: collin-miller/git-changesets@master - - name: Verify Changed files - id: verify-changed-files - run: | - echo '${{ steps.changed-files.outputs.added_modified }}' > changed.txt - if grep ".*\.pkrvars.hcl" changed.txt; then - echo "files_changed=true" >> $GITHUB_OUTPUT - else - echo "files_changed=false" >> $GITHUB_OUTPUT - fi - - name: Setup Packer - if: steps.verify-changed-files.outputs.files_changed == 'true' - uses: hashicorp/setup-packer@main - with: - version: latest + - name: iso-availability + shell: pwsh + run: Invoke-RestMethod -Method Head -Verbose -Uri $(Get-Content os_pkrvars/$('${{ matrix.os }}'.split('-')[0])/${{ matrix.os }}-x86_64.pkrvars.hcl | ConvertFrom-StringData).iso_url.Trim('"') +# - name: Setup Packer +# if: steps.verify-changed-files.outputs.files_changed == 'true' +# uses: hashicorp/setup-packer@main +# with: +# version: latest - name: Packer Init - if: steps.verify-changed-files.outputs.files_changed == 'true' env: PACKER_GITHUB_API_TOKEN: "${{ secrets.PACKER_GITHUB_API_TOKEN }}" run: packer init -upgrade packer_templates + - name: Packer FMT + run: if packer fmt -check -recursive .; then exit 0; else echo "Some packer files need to be formatted, run 'packer fmt -recursive .' to fix"; exit 1; fi + - name: Packer Validate + run: packer validate -var-file=os_pkrvars/$(echo ${{ matrix.os }} | cut -d "-" -f 1)/"${{ matrix.os }}-aarch64.pkrvars.hcl" packer_templates - name: Packer build - if: steps.verify-changed-files.outputs.files_changed == 'true' run: packer build -timestamp-ui -only=${{ matrix.provider }}.vm -var "qemu_accelerator=hvf" -var-file=os_pkrvars/$(echo ${{ matrix.os }} | cut -d "-" -f 1)/"${{ matrix.os }}-aarch64.pkrvars.hcl" packer_templates - name: Upload build artifact uses: actions/upload-artifact@v3 diff --git a/.github/workflows/pkr-bld-qemu-x64.yml b/.github/workflows/pkr-bld-qemu-x64.yml index 1625605ad..eb3a82666 100644 --- a/.github/workflows/pkr-bld-qemu-x64.yml +++ b/.github/workflows/pkr-bld-qemu-x64.yml @@ -48,32 +48,24 @@ jobs: steps: - name: Checkout uses: actions/checkout@main - - name: Pull Change list - id: changed-files - uses: collin-miller/git-changesets@master - - name: Verify Changed files - id: verify-changed-files - run: | - echo '${{ steps.changed-files.outputs.added_modified }}' > changed.txt - if grep ".*\.pkrvars.hcl" changed.txt; then - echo "files_changed=true" >> $GITHUB_OUTPUT - else - echo "files_changed=false" >> $GITHUB_OUTPUT - fi + - name: iso-availability + shell: pwsh + run: Invoke-RestMethod -Method Head -Verbose -Uri $(Get-Content os_pkrvars/$('${{ matrix.os }}'.split('-')[0])/${{ matrix.os }}-x86_64.pkrvars.hcl | ConvertFrom-StringData).iso_url.Trim('"') - name: Download virtio-win.iso run: curl https://fedorapeople.org/groups/virt/virtio-win/direct-downloads/archive-virtio/virtio-win-0.1.229-1/virtio-win.iso -o packer_templates/win_answer_files/virtio-win.iso - name: Setup Packer - if: steps.verify-changed-files.outputs.files_changed == 'true' uses: hashicorp/setup-packer@main with: version: latest - name: Packer Init - if: steps.verify-changed-files.outputs.files_changed == 'true' env: PACKER_GITHUB_API_TOKEN: "${{ secrets.PACKER_GITHUB_API_TOKEN }}" run: packer init -upgrade packer_templates + - name: Packer FMT + run: if packer fmt -check -recursive .; then exit 0; else echo "Some packer files need to be formatted, run 'packer fmt -recursive .' to fix"; exit 1; fi + - name: Packer Validate + run: packer validate -var-file=os_pkrvars/$(echo ${{ matrix.os }} | cut -d "-" -f 1)/"${{ matrix.os }}-x86_64.pkrvars.hcl" packer_templates - name: Packer build - if: steps.verify-changed-files.outputs.files_changed == 'true' run: packer build -timestamp-ui -only=${{ matrix.provider }}.vm -var "qemu_accelerator=hvf" -var-file=os_pkrvars/$(echo ${{ matrix.os }} | cut -d "-" -f 1)/"${{ matrix.os }}-x86_64.pkrvars.hcl" packer_templates - name: Upload build artifact uses: actions/upload-artifact@main diff --git a/.github/workflows/pkr-bld-virtualbox-arm64.yml b/.github/workflows/pkr-bld-virtualbox-arm64.yml index 48f6651f6..c78e18d86 100644 --- a/.github/workflows/pkr-bld-virtualbox-arm64.yml +++ b/.github/workflows/pkr-bld-virtualbox-arm64.yml @@ -35,30 +35,23 @@ jobs: steps: - name: Checkout uses: actions/checkout@main - - name: Pull Change list - id: changed-files - uses: collin-miller/git-changesets@master - - name: Verify Changed files - id: verify-changed-files - run: | - echo '${{ steps.changed-files.outputs.added_modified }}' > changed.txt - if grep ".*\.pkrvars.hcl" changed.txt; then - echo "files_changed=true" >> $GITHUB_OUTPUT - else - echo "files_changed=false" >> $GITHUB_OUTPUT - fi - - name: Setup Packer - if: steps.verify-changed-files.outputs.files_changed == 'true' - uses: hashicorp/setup-packer@main - with: - version: latest + - name: iso-availability + shell: pwsh + run: Invoke-RestMethod -Method Head -Verbose -Uri $(Get-Content os_pkrvars/$('${{ matrix.os }}'.split('-')[0])/${{ matrix.os }}-x86_64.pkrvars.hcl | ConvertFrom-StringData).iso_url.Trim('"') +# - name: Setup Packer +# if: steps.verify-changed-files.outputs.files_changed == 'true' +# uses: hashicorp/setup-packer@main +# with: +# version: latest - name: Packer Init - if: steps.verify-changed-files.outputs.files_changed == 'true' env: PACKER_GITHUB_API_TOKEN: "${{ secrets.PACKER_GITHUB_API_TOKEN }}" run: packer init -upgrade packer_templates + - name: Packer FMT + run: if packer fmt -check -recursive .; then exit 0; else echo "Some packer files need to be formatted, run 'packer fmt -recursive .' to fix"; exit 1; fi + - name: Packer Validate + run: packer validate -var-file=os_pkrvars/$(echo ${{ matrix.os }} | cut -d "-" -f 1)/"${{ matrix.os }}-aarch64.pkrvars.hcl" packer_templates - name: Packer build - if: steps.verify-changed-files.outputs.files_changed == 'true' run: packer build -timestamp-ui -only=${{ matrix.provider }}.vm -var-file=os_pkrvars/$(echo ${{ matrix.os }} | cut -d "-" -f 1)/"${{ matrix.os }}-aarch64.pkrvars.hcl" packer_templates - name: Upload build artifact uses: actions/upload-artifact@main diff --git a/.github/workflows/pkr-bld-virtualbox-x64.yml b/.github/workflows/pkr-bld-virtualbox-x64.yml index 8b581833f..87e0f864e 100644 --- a/.github/workflows/pkr-bld-virtualbox-x64.yml +++ b/.github/workflows/pkr-bld-virtualbox-x64.yml @@ -48,30 +48,22 @@ jobs: steps: - name: Checkout uses: actions/checkout@main - - name: Pull Change list - id: changed-files - uses: collin-miller/git-changesets@master - - name: Verify Changed files - id: verify-changed-files - run: | - echo '${{ steps.changed-files.outputs.added_modified }}' > changed.txt - if grep ".*\.pkrvars.hcl" changed.txt; then - echo "files_changed=true" >> $GITHUB_OUTPUT - else - echo "files_changed=false" >> $GITHUB_OUTPUT - fi + - name: iso-availability + shell: pwsh + run: Invoke-RestMethod -Method Head -Verbose -Uri $(Get-Content os_pkrvars/$('${{ matrix.os }}'.split('-')[0])/${{ matrix.os }}-x86_64.pkrvars.hcl | ConvertFrom-StringData).iso_url.Trim('"') - name: Setup Packer - if: steps.verify-changed-files.outputs.files_changed == 'true' uses: hashicorp/setup-packer@main with: version: latest - name: Packer Init - if: steps.verify-changed-files.outputs.files_changed == 'true' env: PACKER_GITHUB_API_TOKEN: "${{ secrets.PACKER_GITHUB_API_TOKEN }}" run: packer init -upgrade packer_templates + - name: Packer FMT + run: if packer fmt -check -recursive .; then exit 0; else echo "Some packer files need to be formatted, run 'packer fmt -recursive .' to fix"; exit 1; fi + - name: Packer Validate + run: packer validate -var-file=os_pkrvars/$(echo ${{ matrix.os }} | cut -d "-" -f 1)/"${{ matrix.os }}-x86_64.pkrvars.hcl" packer_templates - name: Packer build - if: steps.verify-changed-files.outputs.files_changed == 'true' run: packer build -timestamp-ui -only=${{ matrix.provider }}.vm -var-file=os_pkrvars/$(echo ${{ matrix.os }} | cut -d "-" -f 1)/"${{ matrix.os }}-x86_64.pkrvars.hcl" packer_templates - name: Upload build artifact uses: actions/upload-artifact@main diff --git a/.github/workflows/pkr-bld-vmware-arm64.yml b/.github/workflows/pkr-bld-vmware-arm64.yml index 0c6bfaf6f..539b163ca 100644 --- a/.github/workflows/pkr-bld-vmware-arm64.yml +++ b/.github/workflows/pkr-bld-vmware-arm64.yml @@ -35,30 +35,23 @@ jobs: steps: - name: Checkout uses: actions/checkout@main - - name: Pull Change list - id: changed-files - uses: collin-miller/git-changesets@master - - name: Verify Changed files - id: verify-changed-files - run: | - echo '${{ steps.changed-files.outputs.added_modified }}' > changed.txt - if grep ".*\.pkrvars.hcl" changed.txt; then - echo "files_changed=true" >> $GITHUB_OUTPUT - else - echo "files_changed=false" >> $GITHUB_OUTPUT - fi - - name: Setup Packer - if: steps.verify-changed-files.outputs.files_changed == 'true' - uses: hashicorp/setup-packer@main - with: - version: latest + - name: iso-availability + shell: pwsh + run: Invoke-RestMethod -Method Head -Verbose -Uri $(Get-Content os_pkrvars/$('${{ matrix.os }}'.split('-')[0])/${{ matrix.os }}-x86_64.pkrvars.hcl | ConvertFrom-StringData).iso_url.Trim('"') +# - name: Setup Packer +# if: steps.verify-changed-files.outputs.files_changed == 'true' +# uses: hashicorp/setup-packer@main +# with: +# version: latest - name: Packer Init - if: steps.verify-changed-files.outputs.files_changed == 'true' env: PACKER_GITHUB_API_TOKEN: "${{ secrets.PACKER_GITHUB_API_TOKEN }}" run: packer init -upgrade packer_templates + - name: Packer FMT + run: if packer fmt -check -recursive .; then exit 0; else echo "Some packer files need to be formatted, run 'packer fmt -recursive .' to fix"; exit 1; fi + - name: Packer Validate + run: packer validate -var-file=os_pkrvars/$(echo ${{ matrix.os }} | cut -d "-" -f 1)/"${{ matrix.os }}-aarch64.pkrvars.hcl" packer_templates - name: Packer build - if: steps.verify-changed-files.outputs.files_changed == 'true' run: packer build -timestamp-ui -only=${{ matrix.provider }}.vm -var-file=os_pkrvars/$(echo ${{ matrix.os }} | cut -d "-" -f 1)/"${{ matrix.os }}-aarch64.pkrvars.hcl" packer_templates - name: Upload build artifact uses: actions/upload-artifact@v3 diff --git a/.github/workflows/pkr-bld-vmware-x64.yml b/.github/workflows/pkr-bld-vmware-x64.yml index e97262588..fe89c624f 100644 --- a/.github/workflows/pkr-bld-vmware-x64.yml +++ b/.github/workflows/pkr-bld-vmware-x64.yml @@ -48,30 +48,22 @@ jobs: steps: - name: Checkout uses: actions/checkout@main - - name: Pull Change list - id: changed-files - uses: collin-miller/git-changesets@master - - name: Verify Changed files - id: verify-changed-files - run: | - echo '${{ steps.changed-files.outputs.added_modified }}' > changed.txt - if grep ".*\.pkrvars.hcl" changed.txt; then - echo "files_changed=true" >> $GITHUB_OUTPUT - else - echo "files_changed=false" >> $GITHUB_OUTPUT - fi + - name: iso-availability + shell: pwsh + run: Invoke-RestMethod -Method Head -Verbose -Uri $(Get-Content os_pkrvars/$('${{ matrix.os }}'.split('-')[0])/${{ matrix.os }}-x86_64.pkrvars.hcl | ConvertFrom-StringData).iso_url.Trim('"') - name: Setup Packer - if: steps.verify-changed-files.outputs.files_changed == 'true' uses: hashicorp/setup-packer@main with: version: latest - name: Packer Init - if: steps.verify-changed-files.outputs.files_changed == 'true' env: PACKER_GITHUB_API_TOKEN: "${{ secrets.PACKER_GITHUB_API_TOKEN }}" run: packer init -upgrade packer_templates + - name: Packer FMT + run: if packer fmt -check -recursive .; then exit 0; else echo "Some packer files need to be formatted, run 'packer fmt -recursive .' to fix"; exit 1; fi + - name: Packer Validate + run: packer validate -var-file=os_pkrvars/$(echo ${{ matrix.os }} | cut -d "-" -f 1)/"${{ matrix.os }}-x86_64.pkrvars.hcl" packer_templates - name: Packer build - if: steps.verify-changed-files.outputs.files_changed == 'true' run: packer build -timestamp-ui -only=${{ matrix.provider }}.vm -var-file=os_pkrvars/$(echo ${{ matrix.os }} | cut -d "-" -f 1)/"${{ matrix.os }}-x86_64.pkrvars.hcl" packer_templates - name: Upload build artifact uses: actions/upload-artifact@v3 diff --git a/CHANGELOG.md b/CHANGELOG.md index e654dd7e3..bb82164f0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,28 +8,28 @@ Markdown table generated at <https://www.tablesgenerator.com/markdown_tables#> | | hyperv<br>x86_64 | parallels<br>x86_64 | parallels<br>aarch64 | qemu<br>x86_64 | qemu<br>aarch64 | virtualbox<br>x86_64 | virtualbox<br>aarch64 | vmware<br>x86_64 | vmware<br>aarch64 | |:---:|:---:|:---:|:---:|:---:|:---:|:---:|:---:|:---:|:---:| | almalinux-8 | | x | | x | | x | | x | | -| almalinux-9 | | x | | | | x | | x | | +| almalinux-9 | | x | x | | | x | | x | | | amazonlinux-2 | | na | na | na | na | x | | na | na | | amazonlinux-2022 | na | na | na | na | na | na | na | na | na | | centos-7 | | x | | x | | x | | x | | | centos-stream-8 | | x | | x | | x | | x | | | centos-stream-9 | | | | | | x | | x | | -| debian-10 | | | | | | x | | x | | -| debian-11 | | x | | | | x | | x | | -| fedora-36 | | x | | x | | x | | x | | -| fedora-37 | | x | | x | | x | | x | | +| debian-10 | | | x | | | x | | x | | +| debian-11 | | x | x | | | x | | x | | +| fedora-36 | | x | x | x | | x | | x | | +| fedora-37 | | x | x | x | | x | | x | | | freebsd-12 | | | na | | na | x | na | | na | | freebsd-13 | | | na | | na | x | na | | na | -| opensuse-leap-15 | | | na | | na | | na | x | na | +| opensuse-leap-15 | | | na | x | na | | na | x | na | | oraclelinux-7 | | x | | x | | x | | x | | | oraclelinux-8 | | | | x | | x | | x | | -| oraclelinux-9 | | x | | | | x | | x | | +| oraclelinux-9 | | x | x | | | x | | x | | | rhel-7 | | | | | | | | | | | rhel-8 | | | | | | | | | | | rhel-9 | | | | | | | | | | | rockylinux-8 | | x | | x | | x | | x | | -| rockylinux-9 | | x | | | | x | | x | | -| scientificlinux-7 | | x | na | | na | x | na | x | na | +| rockylinux-9 | | x | x | | | x | | x | | +| scientificlinux-7 | | x | na | x | na | x | na | x | na | | sles-12 | | | na | | na | | na | | na | | sles-13 | | | na | | na | | na | | na | | solaris-11 | | | na | | na | | na | | na | @@ -37,9 +37,9 @@ Markdown table generated at <https://www.tablesgenerator.com/markdown_tables#> | springdalelinux-8 | | x | na | x | na | x | na | x | na | | springdalelinux-9 | | x | na | | na | x | na | x | na | | ubuntu-18.04 | | x | | | | x | | x | | -| ubuntu-20.04 | | | | | | | | | | -| ubuntu-22.04 | | x | | x | | x | | | | -| ubuntu-22.10 | | x | | x | | x | | x | | +| ubuntu-20.04 | | | x | | | | | | | +| ubuntu-22.04 | | x | x | x | | x | | x | | +| ubuntu-22.10 | | x | x | x | | x | | x | | | ubuntu-23.04 | na | na | na | na | na | na | na | na | na | | windows-10 | x | x | na | | na | x | na | | na | | windows-10gen2 | | na | na | na | na | na | na | na | na | @@ -50,7 +50,25 @@ Markdown table generated at <https://www.tablesgenerator.com/markdown_tables#> | windows-2019 | x | x | na | | na | x | na | | na | | windows-2022 | x | x | na | | na | x | na | | na | -## [unreleased] (2023-02-22) +## [unreleased] (2023-03-05) + +## [v202303.05.0] (2023-03-05) + +### Fixes and updates + +- added aarch64 builds and runner + +### Todo + +- Fix failing builds +- Finish removal of deprecated chef-solo provider to powershell provider for windows +- migrate from http directory for hosting files to cd_files in source templates + - This makes all builds compatable with hyper-v gen 2 which removes floppy disk capability + - This also makes things universal for Virtualbox 6.1 to 7.x due to latter requiring extra config for guests on NAT to be able to connect to host +- Update pipelines to only run on updated pkrvars files +- Look into making all build uefi default builds +- Create CD pipeline to upload vagrant boxes after PR is merged +- Create CD pipeline to build and upload new versions of vagrant boxes once every 3 months with the latest patches ## [v202302.22.0] (2023-02-22) diff --git a/os_pkrvars/centos/centos-stream-9-x86_64.pkrvars.hcl b/os_pkrvars/centos/centos-stream-9-x86_64.pkrvars.hcl index b8eff55a4..6275223b8 100644 --- a/os_pkrvars/centos/centos-stream-9-x86_64.pkrvars.hcl +++ b/os_pkrvars/centos/centos-stream-9-x86_64.pkrvars.hcl @@ -6,4 +6,4 @@ iso_checksum = "file:https://mirror.stream.centos.org/9-stream/BaseOS parallels_guest_os_type = "centos" vbox_guest_os_type = "RedHat_64" vmware_guest_os_type = "centos-64" -boot_command = ["<up><wait><tab> inst.text inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/rhel/9ks.cfg<enter><wait>"] +boot_command = ["<wait><up><wait><tab> inst.text inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/rhel/9ks.cfg<enter><wait>"] diff --git a/os_pkrvars/rhel/rhel-7-aarch64.pkrvars.hcl b/os_pkrvars/rhel/rhel-7-aarch64.pkrvars.hcl index 692d2f395..8e6b4003a 100644 --- a/os_pkrvars/rhel/rhel-7-aarch64.pkrvars.hcl +++ b/os_pkrvars/rhel/rhel-7-aarch64.pkrvars.hcl @@ -6,4 +6,4 @@ iso_checksum = "1b8004961150b60f6c5ec3f25139d3217eee55707cf9fa19e8269 parallels_guest_os_type = "rhel" vbox_guest_os_type = "RedHat_64" vmware_guest_os_type = "centos-64" -boot_command = ["<up><wait><tab> inst.text inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/rhel/7ks.cfg<enter><wait>"] +boot_command = ["<wait><up><wait><tab> inst.text inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/rhel/7ks.cfg<enter><wait>"] diff --git a/os_pkrvars/rhel/rhel-7-x86_64.pkrvars.hcl b/os_pkrvars/rhel/rhel-7-x86_64.pkrvars.hcl index 4b37d60bc..d3f3d5372 100644 --- a/os_pkrvars/rhel/rhel-7-x86_64.pkrvars.hcl +++ b/os_pkrvars/rhel/rhel-7-x86_64.pkrvars.hcl @@ -6,4 +6,4 @@ iso_checksum = "1b8004961150b60f6c5ec3f25139d3217eee55707cf9fa19e8269 parallels_guest_os_type = "rhel" vbox_guest_os_type = "RedHat_64" vmware_guest_os_type = "centos-64" -boot_command = ["<up><wait><tab> inst.text inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/rhel/7ks.cfg<enter><wait>"] +boot_command = ["<wait><up><wait><tab> inst.text inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/rhel/7ks.cfg<enter><wait>"] diff --git a/os_pkrvars/rhel/rhel-8-aarch64.pkrvars.hcl b/os_pkrvars/rhel/rhel-8-aarch64.pkrvars.hcl index 0563b97e9..ffb0f9cef 100644 --- a/os_pkrvars/rhel/rhel-8-aarch64.pkrvars.hcl +++ b/os_pkrvars/rhel/rhel-8-aarch64.pkrvars.hcl @@ -6,4 +6,4 @@ iso_checksum = "1b8004961150b60f6c5ec3f25139d3217eee55707cf9fa19e8269 parallels_guest_os_type = "rhel" vbox_guest_os_type = "RedHat_64" vmware_guest_os_type = "centos-64" -boot_command = ["<up><wait><tab> inst.text inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/rhel/8ks.cfg<enter><wait>"] +boot_command = ["<wait><up><wait><tab> inst.text inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/rhel/8ks.cfg<enter><wait>"] diff --git a/os_pkrvars/rhel/rhel-8-x86_64.pkrvars.hcl b/os_pkrvars/rhel/rhel-8-x86_64.pkrvars.hcl index 4f37b78de..54368f658 100644 --- a/os_pkrvars/rhel/rhel-8-x86_64.pkrvars.hcl +++ b/os_pkrvars/rhel/rhel-8-x86_64.pkrvars.hcl @@ -6,4 +6,4 @@ iso_checksum = "1b8004961150b60f6c5ec3f25139d3217eee55707cf9fa19e8269 parallels_guest_os_type = "rhel" vbox_guest_os_type = "RedHat_64" vmware_guest_os_type = "centos-64" -boot_command = ["<up><wait><tab> inst.text inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/rhel/8ks.cfg<enter><wait>"] +boot_command = ["<wait><up><wait><tab> inst.text inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/rhel/8ks.cfg<enter><wait>"] diff --git a/os_pkrvars/rhel/rhel-9-aarch64.pkrvars.hcl b/os_pkrvars/rhel/rhel-9-aarch64.pkrvars.hcl index e3d632afd..83c8224ff 100644 --- a/os_pkrvars/rhel/rhel-9-aarch64.pkrvars.hcl +++ b/os_pkrvars/rhel/rhel-9-aarch64.pkrvars.hcl @@ -6,4 +6,4 @@ iso_checksum = "1b8004961150b60f6c5ec3f25139d3217eee55707cf9fa19e8269 parallels_guest_os_type = "rhel" vbox_guest_os_type = "RedHat_64" vmware_guest_os_type = "centos-64" -boot_command = ["<up><wait><tab> inst.text inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/rhel/9ks.cfg<enter><wait>"] +boot_command = ["<wait><up><wait><tab> inst.text inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/rhel/9ks.cfg<enter><wait>"] diff --git a/os_pkrvars/rhel/rhel-9-x86_64.pkrvars.hcl b/os_pkrvars/rhel/rhel-9-x86_64.pkrvars.hcl index 61e6f486c..efda20597 100644 --- a/os_pkrvars/rhel/rhel-9-x86_64.pkrvars.hcl +++ b/os_pkrvars/rhel/rhel-9-x86_64.pkrvars.hcl @@ -6,4 +6,4 @@ iso_checksum = "1b8004961150b60f6c5ec3f25139d3217eee55707cf9fa19e8269 parallels_guest_os_type = "rhel" vbox_guest_os_type = "RedHat_64" vmware_guest_os_type = "centos-64" -boot_command = ["<up><wait><tab> inst.text inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/rhel/9ks.cfg<enter><wait>"] +boot_command = ["<wait><up><wait><tab> inst.text inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/rhel/9ks.cfg<enter><wait>"] diff --git a/os_pkrvars/scientificlinux/scientificlinux-7-x86_64.pkrvars.hcl b/os_pkrvars/scientificlinux/scientificlinux-7-x86_64.pkrvars.hcl index 37eebacd1..90f2d7d52 100644 --- a/os_pkrvars/scientificlinux/scientificlinux-7-x86_64.pkrvars.hcl +++ b/os_pkrvars/scientificlinux/scientificlinux-7-x86_64.pkrvars.hcl @@ -6,4 +6,4 @@ iso_checksum = "7ac643e164c4a0da0b9f33411c68368cf908e0c34254904044957 parallels_guest_os_type = "centos" vbox_guest_os_type = "RedHat_64" vmware_guest_os_type = "centos-64" -boot_command = ["<up><wait><tab> inst.text inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/rhel/7ks.cfg<enter><wait>"] +boot_command = ["<wait><up><wait><tab> inst.text inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/rhel/7ks.cfg<enter><wait>"] diff --git a/os_pkrvars/sles/sles-12-x86_64.pkrvars.hcl b/os_pkrvars/sles/sles-12-x86_64.pkrvars.hcl index 7ba7a51cd..a1e7e7266 100644 --- a/os_pkrvars/sles/sles-12-x86_64.pkrvars.hcl +++ b/os_pkrvars/sles/sles-12-x86_64.pkrvars.hcl @@ -6,4 +6,4 @@ iso_checksum = "5a12561f8c2869bca4f820787971f3b92f44dce77442906115cd2 parallels_guest_os_type = "suse" vbox_guest_os_type = "SUSE_LE_64" vmware_guest_os_type = "sles12-64" -boot_command = ["<esc><enter><wait>linux netdevice=eth0 netsetup=dhcp install=cd:/<wait> lang=en_US autoyast=http://{{ .HTTPIP }}:{{ .HTTPPort }}/sles/12-autoinst.xml<wait> textmode=1<wait><enter><wait>"] +boot_command = ["<wait><esc><enter><wait>linux netdevice=eth0 netsetup=dhcp install=cd:/<wait> lang=en_US autoyast=http://{{ .HTTPIP }}:{{ .HTTPPort }}/sles/12-autoinst.xml<wait> textmode=1<wait><enter><wait>"] diff --git a/os_pkrvars/sles/sles-15-x86_64.pkrvars.hcl b/os_pkrvars/sles/sles-15-x86_64.pkrvars.hcl index d0cca8245..4cb327e06 100644 --- a/os_pkrvars/sles/sles-15-x86_64.pkrvars.hcl +++ b/os_pkrvars/sles/sles-15-x86_64.pkrvars.hcl @@ -6,4 +6,4 @@ iso_checksum = "c0ceebe14d23c6c9484a1594fc5159225292f0847f7f15046f45a parallels_guest_os_type = "suse" vbox_guest_os_type = "SUSE_LE_64" vmware_guest_os_type = "sles15-64" -boot_command = ["<esc><enter><wait>linux netdevice=eth0 netsetup=dhcp install=cd:/<wait> lang=en_US autoyast=http://{{ .HTTPIP }}:{{ .HTTPPort }}/sles/15-autoinst.xml<wait> textmode=1<wait><enter><wait>"] +boot_command = ["<wait><esc><enter><wait>linux netdevice=eth0 netsetup=dhcp install=cd:/<wait> lang=en_US autoyast=http://{{ .HTTPIP }}:{{ .HTTPPort }}/sles/15-autoinst.xml<wait> textmode=1<wait><enter><wait>"] diff --git a/os_pkrvars/solaris/solaris-11-x86_64.pkrvars.hcl b/os_pkrvars/solaris/solaris-11-x86_64.pkrvars.hcl index 928103568..19dec5cc2 100644 --- a/os_pkrvars/solaris/solaris-11-x86_64.pkrvars.hcl +++ b/os_pkrvars/solaris/solaris-11-x86_64.pkrvars.hcl @@ -6,4 +6,4 @@ iso_checksum = "sha256:e3a29507e583acbc0b912f371c8f328fea7cb6257d587c parallels_guest_os_type = "solaris" vbox_guest_os_type = "Solaris11_64" vmware_guest_os_type = "solaris11-64" -boot_command = ["e<wait><down><down><down><down><down><wait><end><wait><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><wait>false<wait><f10><wait><wait10><wait10><wait10><wait10><wait10><wait10><wait10><wait10><wait10><wait10><wait10><wait10><wait10><wait10><wait10><wait10><wait10><wait10>root<enter><wait><wait>solaris<enter><wait><wait><wait10>while (true); do sleep 5; test -f /a/etc/sudoers && grep -v \"vagrant\" \"/a/etc/sudoers\" 2> /dev/null<wait> && echo \"vagrant ALL=(ALL) NOPASSWD: ALL\" >> /a/etc/sudoers && break ; done &<enter><wait><enter>while (true); do grep \"You may wish to reboot\" \"/var/svc/log/application-auto-installer:default.log\" 2> /dev/null<wait> && reboot; sleep 10; done &<enter><wait>sleep 5; curl http://{{ .HTTPIP }}:{{ .HTTPPort }}/solaris/default.xml -o default.xml;<wait>curl http://{{ .HTTPIP }}:{{ .HTTPPort }}/solaris/profile.xml -o profile.xml;<wait>cp default.xml /system/volatile/ai.xml;<wait>mkdir /system/volatile/profile;<wait>cp profile.xml /system/volatile/profile/profile.xml;<wait>svcadm enable svc:/application/auto-installer:default;<wait><enter><wait10><wait><wait><enter><wait>tail -f /var/svc/log/application-auto-installer\\:default.log<enter><wait>"] +boot_command = ["<wait>e<wait><down><down><down><down><down><wait><end><wait><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><wait>false<wait><f10><wait><wait10><wait10><wait10><wait10><wait10><wait10><wait10><wait10><wait10><wait10><wait10><wait10><wait10><wait10><wait10><wait10><wait10><wait10>root<enter><wait><wait>solaris<enter><wait><wait><wait10>while (true); do sleep 5; test -f /a/etc/sudoers && grep -v \"vagrant\" \"/a/etc/sudoers\" 2> /dev/null<wait> && echo \"vagrant ALL=(ALL) NOPASSWD: ALL\" >> /a/etc/sudoers && break ; done &<enter><wait><enter>while (true); do grep \"You may wish to reboot\" \"/var/svc/log/application-auto-installer:default.log\" 2> /dev/null<wait> && reboot; sleep 10; done &<enter><wait>sleep 5; curl http://{{ .HTTPIP }}:{{ .HTTPPort }}/solaris/default.xml -o default.xml;<wait>curl http://{{ .HTTPIP }}:{{ .HTTPPort }}/solaris/profile.xml -o profile.xml;<wait>cp default.xml /system/volatile/ai.xml;<wait>mkdir /system/volatile/profile;<wait>cp profile.xml /system/volatile/profile/profile.xml;<wait>svcadm enable svc:/application/auto-installer:default;<wait><enter><wait10><wait><wait><enter><wait>tail -f /var/svc/log/application-auto-installer\\:default.log<enter><wait>"] diff --git a/os_pkrvars/springdalelinux/springdalelinux-7-x86_64.pkrvars.hcl b/os_pkrvars/springdalelinux/springdalelinux-7-x86_64.pkrvars.hcl index 09e5f1725..3c35a3201 100644 --- a/os_pkrvars/springdalelinux/springdalelinux-7-x86_64.pkrvars.hcl +++ b/os_pkrvars/springdalelinux/springdalelinux-7-x86_64.pkrvars.hcl @@ -6,4 +6,4 @@ iso_checksum = "ad47807e17f796bdca35bb3ec5b65f1340d43b698ee04dcf60fae parallels_guest_os_type = "centos" vbox_guest_os_type = "RedHat_64" vmware_guest_os_type = "centos-64" -boot_command = ["<up><wait><tab> inst.text inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/springdalelinux/7ks.cfg<enter><wait>"] +boot_command = ["<wait><up><wait><tab> inst.text inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/springdalelinux/7ks.cfg<enter><wait>"] diff --git a/os_pkrvars/springdalelinux/springdalelinux-8-x86_64.pkrvars.hcl b/os_pkrvars/springdalelinux/springdalelinux-8-x86_64.pkrvars.hcl index 1d2ee7fe5..779e07f5f 100644 --- a/os_pkrvars/springdalelinux/springdalelinux-8-x86_64.pkrvars.hcl +++ b/os_pkrvars/springdalelinux/springdalelinux-8-x86_64.pkrvars.hcl @@ -6,4 +6,4 @@ iso_checksum = "7535d3eadf5d60d12a026ccaf5f1235c660cc985bc1e8b7502a99 parallels_guest_os_type = "centos" vbox_guest_os_type = "RedHat_64" vmware_guest_os_type = "centos-64" -boot_command = ["<up><wait><tab> inst.text inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/springdalelinux/8ks.cfg<enter><wait>"] +boot_command = ["<wait><up><wait><tab> inst.text inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/springdalelinux/8ks.cfg<enter><wait>"] diff --git a/os_pkrvars/springdalelinux/springdalelinux-9-x86_64.pkrvars.hcl b/os_pkrvars/springdalelinux/springdalelinux-9-x86_64.pkrvars.hcl index 0768a7e18..16fe6ce5d 100644 --- a/os_pkrvars/springdalelinux/springdalelinux-9-x86_64.pkrvars.hcl +++ b/os_pkrvars/springdalelinux/springdalelinux-9-x86_64.pkrvars.hcl @@ -6,4 +6,4 @@ iso_checksum = "a282a61dfd9ac587aa635688ec3eae8ac95524094dac0355543c3 parallels_guest_os_type = "centos" vbox_guest_os_type = "RedHat_64" vmware_guest_os_type = "centos-64" -boot_command = ["<up><wait><tab> inst.text inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/springdalelinux/9ks.cfg<enter><wait>"] +boot_command = ["<wait><up><wait><tab> inst.text inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/springdalelinux/9ks.cfg<enter><wait>"] diff --git a/os_pkrvars/ubuntu/ubuntu-22.04-aarch64.pkrvars.hcl b/os_pkrvars/ubuntu/ubuntu-22.04-aarch64.pkrvars.hcl index 40dac8936..f540f1724 100644 --- a/os_pkrvars/ubuntu/ubuntu-22.04-aarch64.pkrvars.hcl +++ b/os_pkrvars/ubuntu/ubuntu-22.04-aarch64.pkrvars.hcl @@ -1,8 +1,8 @@ os_name = "ubuntu" os_version = "22.04" os_arch = "aarch64" -iso_url = "http://cdimage.ubuntu.com/releases/22.04/release/ubuntu-22.04.1-live-server-arm64.iso" -iso_checksum = "bc5a8015651c6f8699ab262d333375d3930b824f03d14ae51e551d89d9bb571c" +iso_url = "https://cdimage.ubuntu.com/releases/22.04/release/ubuntu-22.04.2-live-server-arm64.iso" +iso_checksum = "file:https://cdimage.ubuntu.com/releases/22.04/release/SHA256SUMS" hyperv_generation = 2 parallels_guest_os_type = "ubuntu" vbox_guest_os_type = "Ubuntu_64" diff --git a/os_pkrvars/ubuntu/ubuntu-22.04-x86_64.pkrvars.hcl b/os_pkrvars/ubuntu/ubuntu-22.04-x86_64.pkrvars.hcl index 47fb44d0b..da713f287 100644 --- a/os_pkrvars/ubuntu/ubuntu-22.04-x86_64.pkrvars.hcl +++ b/os_pkrvars/ubuntu/ubuntu-22.04-x86_64.pkrvars.hcl @@ -1,10 +1,10 @@ os_name = "ubuntu" os_version = "22.04" os_arch = "x86_64" -iso_url = "http://releases.ubuntu.com/jammy/ubuntu-22.04.1-live-server-amd64.iso" -iso_checksum = "sha256:10f19c5b2b8d6db711582e0e27f5116296c34fe4b313ba45f9b201a5007056cb" +iso_url = "https://releases.ubuntu.com/jammy/ubuntu-22.04.2-live-server-amd64.iso" +iso_checksum = "file:https://releases.ubuntu.com/jammy/SHA256SUMS" hyperv_generation = 2 parallels_guest_os_type = "ubuntu" vbox_guest_os_type = "Ubuntu_64" vmware_guest_os_type = "ubuntu-64" -boot_command = ["c<wait>set gfxpayload=keep<enter><wait>linux /casper/vmlinuz quiet autoinstall ds=nocloud-net\\;s=http://{{.HTTPIP}}:{{.HTTPPort}}/ubuntu/ ---<enter><wait>initrd /casper/initrd<wait><enter><wait>boot<enter><wait>"] +boot_command = ["<wait>c<wait>set gfxpayload=keep<enter><wait>linux /casper/vmlinuz quiet autoinstall ds=nocloud-net\\;s=http://{{.HTTPIP}}:{{.HTTPPort}}/ubuntu/ ---<enter><wait>initrd /casper/initrd<wait><enter><wait>boot<enter><wait>"] diff --git a/os_pkrvars/windows/windows-11-x86_64.pkrvars.hcl b/os_pkrvars/windows/windows-11-x86_64.pkrvars.hcl index fce6018c0..42d7a349f 100644 --- a/os_pkrvars/windows/windows-11-x86_64.pkrvars.hcl +++ b/os_pkrvars/windows/windows-11-x86_64.pkrvars.hcl @@ -8,4 +8,4 @@ iso_checksum = "sha256:e8b1d2a1a85a09b4bf6154084a8be8e3c814894a15a7bc parallels_guest_os_type = "win-11" vbox_guest_os_type = "Windows11_64" vmware_guest_os_type = "windows9srv-64" -boot_command = ["<leftShiftOn><f10><leftShiftOff><wait>reg add HKLM\\SYSTEM\\Setup\\LabConfig /t REG_DWORD /v BypassTPMCheck /d 1<return>reg add HKLM\\SYSTEM\\Setup\\LabConfig /t REG_DWORD /v BypassSecureBootCheck /d 1<return><wait>exit<return><wait><return>"] +boot_command = ["<wait><leftShiftOn><f10><leftShiftOff><wait>reg add HKLM\\SYSTEM\\Setup\\LabConfig /t REG_DWORD /v BypassTPMCheck /d 1<return>reg add HKLM\\SYSTEM\\Setup\\LabConfig /t REG_DWORD /v BypassSecureBootCheck /d 1<return><wait>exit<return><wait><return>"] From 997aa22e94dbf48522189b327bfa82e4a45d8b9d Mon Sep 17 00:00:00 2001 From: Corey Hemminger <hemminger@hotmail.com> Date: Tue, 7 Mar 2023 17:25:46 -0600 Subject: [PATCH 1510/1622] Added a cleanup step in build pipelines (#1484) * Added a cleanup step in build pipelines for cancelled jobs that otherwise leave vm in place --- .github/workflows/pkr-bld-amazonlinux-x64.yml | 9 +++++++++ .github/workflows/pkr-bld-hyperv-x64.yml | 9 +++++++++ .github/workflows/pkr-bld-parallels-arm64.yml | 10 ++++++++++ .github/workflows/pkr-bld-parallels-x64.yml | 10 ++++++++++ .github/workflows/pkr-bld-virtualbox-arm64.yml | 9 +++++++++ .github/workflows/pkr-bld-virtualbox-x64.yml | 9 +++++++++ .github/workflows/pkr-bld-vmware-arm64.yml | 9 +++++++++ .github/workflows/pkr-bld-vmware-x64.yml | 9 +++++++++ AMZ_build_virtualbox-ovf.sh | 2 +- CHANGELOG.md | 6 +++++- 10 files changed, 80 insertions(+), 2 deletions(-) diff --git a/.github/workflows/pkr-bld-amazonlinux-x64.yml b/.github/workflows/pkr-bld-amazonlinux-x64.yml index 1dfc95d17..6db5a6fb2 100644 --- a/.github/workflows/pkr-bld-amazonlinux-x64.yml +++ b/.github/workflows/pkr-bld-amazonlinux-x64.yml @@ -30,6 +30,15 @@ jobs: run: packer validate -var-file=os_pkrvars/$(echo ${{ matrix.os }} | cut -d "-" -f 1)/"${{ matrix.os }}-x86_64.pkrvars.hcl" packer_templates - name: Packer build run: ./AMZ_build_virtualbox-ovf.sh + - name: Remove VM in case of canceled job + if: always() + continue-on-error: true + run: | + echo Powering off and deleting any existing VMs named AmazonLinuxBento + VBoxManage controlvm AmazonLinuxBento poweroff --type headless 2> /dev/null + sleep 1 + VBoxManage unregistervm AmazonLinuxBento --delete 2> /dev/null + sleep 2 - name: Upload build artifact uses: actions/upload-artifact@main with: diff --git a/.github/workflows/pkr-bld-hyperv-x64.yml b/.github/workflows/pkr-bld-hyperv-x64.yml index 43a637a1e..746c506bc 100644 --- a/.github/workflows/pkr-bld-hyperv-x64.yml +++ b/.github/workflows/pkr-bld-hyperv-x64.yml @@ -67,6 +67,15 @@ jobs: run: packer validate -var-file="os_pkrvars/$("${{ matrix.os }}".Split('-')[0])/${{ matrix.os }}-x86_64.pkrvars.hcl" packer_templates - name: Packer build run: packer build -timestamp-ui -only="${{ matrix.provider }}.vm" -var-file="os_pkrvars/$("${{ matrix.os }}".Split('-')[0])/${{ matrix.os }}-x86_64.pkrvars.hcl" packer_templates + - name: Remove VM in case of canceled job + if: always() + continue-on-error: true + run: | + echo Powering off and deleting any existing VMs named ${{ matrix.os }}*-amd64 + Stop-VM -Force ${{ matrix.os }}*-amd64 + sleep 1 + Remove-VM -Force ${{ matrix.os }}*-amd64 + sleep 2 - name: Upload build artifact uses: actions/upload-artifact@main with: diff --git a/.github/workflows/pkr-bld-parallels-arm64.yml b/.github/workflows/pkr-bld-parallels-arm64.yml index cc8a25f6a..e1f4d9284 100644 --- a/.github/workflows/pkr-bld-parallels-arm64.yml +++ b/.github/workflows/pkr-bld-parallels-arm64.yml @@ -53,6 +53,16 @@ jobs: run: packer validate -var-file=os_pkrvars/$(echo ${{ matrix.os }} | cut -d "-" -f 1)/"${{ matrix.os }}-aarch64.pkrvars.hcl" packer_templates - name: Packer build run: packer build -timestamp-ui -only=${{ matrix.provider }}.vm -var-file=os_pkrvars/$(echo ${{ matrix.os }} | cut -d "-" -f 1)/"${{ matrix.os }}-aarch64.pkrvars.hcl" packer_templates + - name: Remove VM in case of canceled job + if: always() + continue-on-error: true + run: | + VM="$(prlctl list -a | grep ${{ matrix.os }} | cut -d " " -f 1)" + echo Powering off and deleting any existing VMs named ${{ matrix.os }}*-aarch64 + prlctl stop "$VM" --kill 2> /dev/null + sleep 1 + prlctl delete "$VM" 2> /dev/null + sleep 2 - name: Upload build artifact uses: actions/upload-artifact@v3 with: diff --git a/.github/workflows/pkr-bld-parallels-x64.yml b/.github/workflows/pkr-bld-parallels-x64.yml index 46c47215d..2d65a2100 100644 --- a/.github/workflows/pkr-bld-parallels-x64.yml +++ b/.github/workflows/pkr-bld-parallels-x64.yml @@ -65,6 +65,16 @@ jobs: run: packer validate -var-file=os_pkrvars/$(echo ${{ matrix.os }} | cut -d "-" -f 1)/"${{ matrix.os }}-x86_64.pkrvars.hcl" packer_templates - name: Packer build run: packer build -timestamp-ui -only=${{ matrix.provider }}.vm -var-file=os_pkrvars/$(echo ${{ matrix.os }} | cut -d "-" -f 1)/"${{ matrix.os }}-x86_64.pkrvars.hcl" packer_templates + - name: Remove VM in case of canceled job + if: always() + continue-on-error: true + run: | + VM="$(prlctl list -a | grep ${{ matrix.os }} | cut -d " " -f 1)" + echo Powering off and deleting any existing VMs named ${{ matrix.os }}*-amd64 + prlctl stop "$VM" --kill 2> /dev/null + sleep 1 + prlctl delete "$VM" 2> /dev/null + sleep 2 - name: Upload build artifact uses: actions/upload-artifact@v3 with: diff --git a/.github/workflows/pkr-bld-virtualbox-arm64.yml b/.github/workflows/pkr-bld-virtualbox-arm64.yml index c78e18d86..cc2351a90 100644 --- a/.github/workflows/pkr-bld-virtualbox-arm64.yml +++ b/.github/workflows/pkr-bld-virtualbox-arm64.yml @@ -53,6 +53,15 @@ jobs: run: packer validate -var-file=os_pkrvars/$(echo ${{ matrix.os }} | cut -d "-" -f 1)/"${{ matrix.os }}-aarch64.pkrvars.hcl" packer_templates - name: Packer build run: packer build -timestamp-ui -only=${{ matrix.provider }}.vm -var-file=os_pkrvars/$(echo ${{ matrix.os }} | cut -d "-" -f 1)/"${{ matrix.os }}-aarch64.pkrvars.hcl" packer_templates + - name: Remove VM in case of canceled job + if: always() + continue-on-error: true + run: | + echo Powering off and deleting any existing VMs named ${{ matrix.os }}*-aarch64 + VBoxManage controlvm ${{ matrix.os }}*-aarch64 poweroff --type headless 2> /dev/null + sleep 1 + VBoxManage unregistervm ${{ matrix.os }}*-aarch64 --delete 2> /dev/null + sleep 2 - name: Upload build artifact uses: actions/upload-artifact@main with: diff --git a/.github/workflows/pkr-bld-virtualbox-x64.yml b/.github/workflows/pkr-bld-virtualbox-x64.yml index 87e0f864e..4d89df4e7 100644 --- a/.github/workflows/pkr-bld-virtualbox-x64.yml +++ b/.github/workflows/pkr-bld-virtualbox-x64.yml @@ -65,6 +65,15 @@ jobs: run: packer validate -var-file=os_pkrvars/$(echo ${{ matrix.os }} | cut -d "-" -f 1)/"${{ matrix.os }}-x86_64.pkrvars.hcl" packer_templates - name: Packer build run: packer build -timestamp-ui -only=${{ matrix.provider }}.vm -var-file=os_pkrvars/$(echo ${{ matrix.os }} | cut -d "-" -f 1)/"${{ matrix.os }}-x86_64.pkrvars.hcl" packer_templates + - name: Remove VM in case of canceled job + if: always() + continue-on-error: true + run: | + echo Powering off and deleting any existing VMs named ${{ matrix.os }}*-amd64 + VBoxManage controlvm ${{ matrix.os }}*-amd64 poweroff --type headless 2> /dev/null + sleep 1 + VBoxManage unregistervm ${{ matrix.os }}*-amd64 --delete 2> /dev/null + sleep 2 - name: Upload build artifact uses: actions/upload-artifact@main with: diff --git a/.github/workflows/pkr-bld-vmware-arm64.yml b/.github/workflows/pkr-bld-vmware-arm64.yml index 539b163ca..8231450f9 100644 --- a/.github/workflows/pkr-bld-vmware-arm64.yml +++ b/.github/workflows/pkr-bld-vmware-arm64.yml @@ -53,6 +53,15 @@ jobs: run: packer validate -var-file=os_pkrvars/$(echo ${{ matrix.os }} | cut -d "-" -f 1)/"${{ matrix.os }}-aarch64.pkrvars.hcl" packer_templates - name: Packer build run: packer build -timestamp-ui -only=${{ matrix.provider }}.vm -var-file=os_pkrvars/$(echo ${{ matrix.os }} | cut -d "-" -f 1)/"${{ matrix.os }}-aarch64.pkrvars.hcl" packer_templates + - name: Remove VM in case of canceled job + if: always() + continue-on-error: true + run: | + echo Powering off and deleting any existing VMs named ${{ matrix.os }}*-aarch64 + vmrun -T fusion stop builds/packer-${{ matrix.os }}*-x86_64-vmware/${{ matrix.os }}*-aarch64.vmx hard 2> /dev/null + sleep 1 + vmrun -T fusion deleteVM builds/packer-${{ matrix.os }}*-x86_64-vmware/${{ matrix.os }}*-aarch64.vmx 2> /dev/null + sleep 2 - name: Upload build artifact uses: actions/upload-artifact@v3 with: diff --git a/.github/workflows/pkr-bld-vmware-x64.yml b/.github/workflows/pkr-bld-vmware-x64.yml index fe89c624f..c61fe2333 100644 --- a/.github/workflows/pkr-bld-vmware-x64.yml +++ b/.github/workflows/pkr-bld-vmware-x64.yml @@ -65,6 +65,15 @@ jobs: run: packer validate -var-file=os_pkrvars/$(echo ${{ matrix.os }} | cut -d "-" -f 1)/"${{ matrix.os }}-x86_64.pkrvars.hcl" packer_templates - name: Packer build run: packer build -timestamp-ui -only=${{ matrix.provider }}.vm -var-file=os_pkrvars/$(echo ${{ matrix.os }} | cut -d "-" -f 1)/"${{ matrix.os }}-x86_64.pkrvars.hcl" packer_templates + - name: Remove VM in case of canceled job + if: always() + continue-on-error: true + run: | + echo Powering off and deleting any existing VMs named ${{ matrix.os }}*-amd64 + vmrun -T fusion stop builds/packer-${{ matrix.os }}*-x86_64-vmware/${{ matrix.os }}*-amd64.vmx hard 2> /dev/null + sleep 1 + vmrun -T fusion deleteVM builds/packer-${{ matrix.os }}*-x86_64-vmware/${{ matrix.os }}*-amd64.vmx 2> /dev/null + sleep 2 - name: Upload build artifact uses: actions/upload-artifact@v3 with: diff --git a/AMZ_build_virtualbox-ovf.sh b/AMZ_build_virtualbox-ovf.sh index aff63234e..87497a173 100755 --- a/AMZ_build_virtualbox-ovf.sh +++ b/AMZ_build_virtualbox-ovf.sh @@ -28,7 +28,7 @@ hdiutil makehybrid -o "$AMZDIR"/seed.iso -hfs -joliet -iso -default-volume-name VM="AmazonLinuxBento" echo Powering off and deleting any existing VMs named $VM VBoxManage controlvm $VM poweroff --type headless 2> /dev/null -vboxmanage unregistervm $VM --delete 2> /dev/null +VBoxManage unregistervm $VM --delete 2> /dev/null sleep 5 echo "Creating the VM" diff --git a/CHANGELOG.md b/CHANGELOG.md index bb82164f0..07677f2de 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -50,7 +50,11 @@ Markdown table generated at <https://www.tablesgenerator.com/markdown_tables#> | windows-2019 | x | x | na | | na | x | na | | na | | windows-2022 | x | x | na | | na | x | na | | na | -## [unreleased] (2023-03-05) +## [unreleased] (2023-03-07) + +## [v202303.06] (2023-03-07) + +- Added a cleanup step in build pipelines for cancelled jobs that otherwise leave vm in place ## [v202303.05.0] (2023-03-05) From d622237ffaa396e165de1cf1a6f3e0f8235b09bd Mon Sep 17 00:00:00 2001 From: Johnny Halfmoon <jhalfmoon@milksnot.com> Date: Fri, 10 Mar 2023 16:41:27 +0100 Subject: [PATCH 1511/1622] fix(ubuntu-20.04): boot from media works again (#1487) * fix(ubuntu-20.04): boot from media works again * trying GITHUB_TOKEN secret * switch cleanup job from always to cancelled --------- Signed-off-by: Johnny Halfmoon <jhalfmoon@milksnot.com> Signed-off-by: Corey Hemminger <hemminger@hotmail.com> Co-authored-by: Corey Hemminger <hemminger@hotmail.com> --- .github/workflows/ci-build.yml | 84 +------------------ .../workflows/{ci-verify.yml => ci-lint.yml} | 5 +- .github/workflows/pkr-bld-amazonlinux-x64.yml | 8 +- .github/workflows/pkr-bld-hyperv-x64.yml | 8 +- .github/workflows/pkr-bld-parallels-arm64.yml | 8 +- .github/workflows/pkr-bld-parallels-x64.yml | 8 +- .github/workflows/pkr-bld-qemu-arm64.yml | 5 +- .github/workflows/pkr-bld-qemu-x64.yml | 5 +- .../workflows/pkr-bld-virtualbox-arm64.yml | 8 +- .github/workflows/pkr-bld-virtualbox-x64.yml | 8 +- .github/workflows/pkr-bld-vmware-arm64.yml | 8 +- .github/workflows/pkr-bld-vmware-x64.yml | 8 +- .../ubuntu/ubuntu-20.04-x86_64.pkrvars.hcl | 3 +- 13 files changed, 28 insertions(+), 138 deletions(-) rename .github/workflows/{ci-verify.yml => ci-lint.yml} (94%) diff --git a/.github/workflows/ci-build.yml b/.github/workflows/ci-build.yml index 1aaa6c394..179ff1ce7 100644 --- a/.github/workflows/ci-build.yml +++ b/.github/workflows/ci-build.yml @@ -2,123 +2,47 @@ on: pull_request: +concurrency: + group: ci-build-${{ github.ref }} + cancel-in-progress: true + jobs: pkr-bld-amazonlinux-x64: - # needs: - # - yaml-lint - # - json-lint - # - xml-lint - # - powershell-lint - # - shellcheck-lint - # - packer-iso-check - # - packer-lint uses: ./.github/workflows/pkr-bld-amazonlinux-x64.yml secrets: inherit pkr-bld-hyperv-x64: - # needs: - # - yaml-lint - # - json-lint - # - xml-lint - # - powershell-lint - # - shellcheck-lint - # - packer-iso-check - # - packer-lint uses: ./.github/workflows/pkr-bld-hyperv-x64.yml secrets: inherit pkr-bld-parallels-arm64: - # needs: - # - yaml-lint - # - json-lint - # - xml-lint - # - powershell-lint - # - shellcheck-lint - # - packer-iso-check - # - packer-lint uses: ./.github/workflows/pkr-bld-parallels-arm64.yml secrets: inherit pkr-bld-parallels-x64: - # needs: - # - yaml-lint - # - json-lint - # - xml-lint - # - powershell-lint - # - shellcheck-lint - # - packer-iso-check - # - packer-lint uses: ./.github/workflows/pkr-bld-parallels-x64.yml secrets: inherit pkr-bld-qemu-arm64: - # needs: - # - yaml-lint - # - json-lint - # - xml-lint - # - powershell-lint - # - shellcheck-lint - # - packer-iso-check - # - packer-lint uses: ./.github/workflows/pkr-bld-qemu-arm64.yml secrets: inherit pkr-bld-qemu-x64: - # needs: - # - yaml-lint - # - json-lint - # - xml-lint - # - powershell-lint - # - shellcheck-lint - # - packer-iso-check - # - packer-lint uses: ./.github/workflows/pkr-bld-qemu-x64.yml secrets: inherit pkr-bld-virtualbox-arm64: - # needs: - # - yaml-lint - # - json-lint - # - xml-lint - # - powershell-lint - # - shellcheck-lint - # - packer-iso-check - # - packer-lint uses: ./.github/workflows/pkr-bld-virtualbox-arm64.yml secrets: inherit pkr-bld-virtualbox-x64: - # needs: - # - yaml-lint - # - json-lint - # - xml-lint - # - powershell-lint - # - shellcheck-lint - # - packer-iso-check - # - packer-lint uses: ./.github/workflows/pkr-bld-virtualbox-x64.yml secrets: inherit pkr-bld-vmware-arm64: - # needs: - # - yaml-lint - # - json-lint - # - xml-lint - # - powershell-lint - # - shellcheck-lint - # - packer-iso-check - # - packer-lint uses: ./.github/workflows/pkr-bld-vmware-arm64.yml secrets: inherit pkr-bld-vmware-x64: - # needs: - # - yaml-lint - # - json-lint - # - xml-lint - # - powershell-lint - # - shellcheck-lint - # - packer-iso-check - # - packer-lint uses: ./.github/workflows/pkr-bld-vmware-x64.yml secrets: inherit diff --git a/.github/workflows/ci-verify.yml b/.github/workflows/ci-lint.yml similarity index 94% rename from .github/workflows/ci-verify.yml rename to .github/workflows/ci-lint.yml index c56b11dfd..5977b6f3e 100644 --- a/.github/workflows/ci-verify.yml +++ b/.github/workflows/ci-lint.yml @@ -4,6 +4,10 @@ on: schedule: - cron: '0 0 * * 0' +concurrency: + group: ci-lint-${{ github.ref }} + cancel-in-progress: true + jobs: markdown-lint: uses: chef/github-workflows/.github/workflows/markdown-lint.yml@main @@ -28,7 +32,6 @@ jobs: packer-iso-check: uses: chef/github-workflows/.github/workflows/packer-iso-url-checker.yml@main - secrets: inherit packer-lint: uses: chef/github-workflows/.github/workflows/packer-lint.yml@main diff --git a/.github/workflows/pkr-bld-amazonlinux-x64.yml b/.github/workflows/pkr-bld-amazonlinux-x64.yml index 6db5a6fb2..598f28b15 100644 --- a/.github/workflows/pkr-bld-amazonlinux-x64.yml +++ b/.github/workflows/pkr-bld-amazonlinux-x64.yml @@ -1,9 +1,6 @@ --- on: workflow_call: - secrets: - PACKER_GITHUB_API_TOKEN: - required: true jobs: x86_64: @@ -22,7 +19,7 @@ jobs: version: latest - name: Packer Init env: - PACKER_GITHUB_API_TOKEN: "${{ secrets.PACKER_GITHUB_API_TOKEN }}" + PACKER_GITHUB_API_TOKEN: "${{ secrets.GITHUB_TOKEN }}" run: packer init -upgrade packer_templates - name: Packer FMT run: if packer fmt -check -recursive .; then exit 0; else echo "Some packer files need to be formatted, run 'packer fmt -recursive .' to fix"; exit 1; fi @@ -31,8 +28,7 @@ jobs: - name: Packer build run: ./AMZ_build_virtualbox-ovf.sh - name: Remove VM in case of canceled job - if: always() - continue-on-error: true + if: cancelled() run: | echo Powering off and deleting any existing VMs named AmazonLinuxBento VBoxManage controlvm AmazonLinuxBento poweroff --type headless 2> /dev/null diff --git a/.github/workflows/pkr-bld-hyperv-x64.yml b/.github/workflows/pkr-bld-hyperv-x64.yml index 746c506bc..874728f7e 100644 --- a/.github/workflows/pkr-bld-hyperv-x64.yml +++ b/.github/workflows/pkr-bld-hyperv-x64.yml @@ -1,9 +1,6 @@ --- on: workflow_call: - secrets: - PACKER_GITHUB_API_TOKEN: - required: true jobs: x86_64: @@ -59,7 +56,7 @@ jobs: version: latest - name: Packer Init env: - PACKER_GITHUB_API_TOKEN: "${{ secrets.PACKER_GITHUB_API_TOKEN }}" + PACKER_GITHUB_API_TOKEN: "${{ secrets.GITHUB_TOKEN }}" run: packer init -upgrade packer_templates - name: Packer FMT run: packer fmt -check -recursive . @@ -68,8 +65,7 @@ jobs: - name: Packer build run: packer build -timestamp-ui -only="${{ matrix.provider }}.vm" -var-file="os_pkrvars/$("${{ matrix.os }}".Split('-')[0])/${{ matrix.os }}-x86_64.pkrvars.hcl" packer_templates - name: Remove VM in case of canceled job - if: always() - continue-on-error: true + if: cancelled() run: | echo Powering off and deleting any existing VMs named ${{ matrix.os }}*-amd64 Stop-VM -Force ${{ matrix.os }}*-amd64 diff --git a/.github/workflows/pkr-bld-parallels-arm64.yml b/.github/workflows/pkr-bld-parallels-arm64.yml index e1f4d9284..d1bab87db 100644 --- a/.github/workflows/pkr-bld-parallels-arm64.yml +++ b/.github/workflows/pkr-bld-parallels-arm64.yml @@ -1,9 +1,6 @@ --- on: workflow_call: - secrets: - PACKER_GITHUB_API_TOKEN: - required: true jobs: aarch64: @@ -45,7 +42,7 @@ jobs: # version: latest - name: Packer Init env: - PACKER_GITHUB_API_TOKEN: "${{ secrets.PACKER_GITHUB_API_TOKEN }}" + PACKER_GITHUB_API_TOKEN: "${{ secrets.GITHUB_TOKEN }}" run: packer init -upgrade packer_templates - name: Packer FMT run: if packer fmt -check -recursive .; then exit 0; else echo "Some packer files need to be formatted, run 'packer fmt -recursive .' to fix"; exit 1; fi @@ -54,8 +51,7 @@ jobs: - name: Packer build run: packer build -timestamp-ui -only=${{ matrix.provider }}.vm -var-file=os_pkrvars/$(echo ${{ matrix.os }} | cut -d "-" -f 1)/"${{ matrix.os }}-aarch64.pkrvars.hcl" packer_templates - name: Remove VM in case of canceled job - if: always() - continue-on-error: true + if: cancelled() run: | VM="$(prlctl list -a | grep ${{ matrix.os }} | cut -d " " -f 1)" echo Powering off and deleting any existing VMs named ${{ matrix.os }}*-aarch64 diff --git a/.github/workflows/pkr-bld-parallels-x64.yml b/.github/workflows/pkr-bld-parallels-x64.yml index 2d65a2100..e2971322d 100644 --- a/.github/workflows/pkr-bld-parallels-x64.yml +++ b/.github/workflows/pkr-bld-parallels-x64.yml @@ -1,9 +1,6 @@ --- on: workflow_call: - secrets: - PACKER_GITHUB_API_TOKEN: - required: true jobs: x86_64: @@ -57,7 +54,7 @@ jobs: version: latest - name: Packer Init env: - PACKER_GITHUB_API_TOKEN: "${{ secrets.PACKER_GITHUB_API_TOKEN }}" + PACKER_GITHUB_API_TOKEN: "${{ secrets.GITHUB_TOKEN }}" run: packer init -upgrade packer_templates - name: Packer FMT run: if packer fmt -check -recursive .; then exit 0; else echo "Some packer files need to be formatted, run 'packer fmt -recursive .' to fix"; exit 1; fi @@ -66,8 +63,7 @@ jobs: - name: Packer build run: packer build -timestamp-ui -only=${{ matrix.provider }}.vm -var-file=os_pkrvars/$(echo ${{ matrix.os }} | cut -d "-" -f 1)/"${{ matrix.os }}-x86_64.pkrvars.hcl" packer_templates - name: Remove VM in case of canceled job - if: always() - continue-on-error: true + if: cancelled() run: | VM="$(prlctl list -a | grep ${{ matrix.os }} | cut -d " " -f 1)" echo Powering off and deleting any existing VMs named ${{ matrix.os }}*-amd64 diff --git a/.github/workflows/pkr-bld-qemu-arm64.yml b/.github/workflows/pkr-bld-qemu-arm64.yml index 46696d9c1..12ef2eb3c 100644 --- a/.github/workflows/pkr-bld-qemu-arm64.yml +++ b/.github/workflows/pkr-bld-qemu-arm64.yml @@ -1,9 +1,6 @@ --- on: workflow_call: - secrets: - PACKER_GITHUB_API_TOKEN: - required: true jobs: aarch64: @@ -45,7 +42,7 @@ jobs: # version: latest - name: Packer Init env: - PACKER_GITHUB_API_TOKEN: "${{ secrets.PACKER_GITHUB_API_TOKEN }}" + PACKER_GITHUB_API_TOKEN: "${{ secrets.GITHUB_TOKEN }}" run: packer init -upgrade packer_templates - name: Packer FMT run: if packer fmt -check -recursive .; then exit 0; else echo "Some packer files need to be formatted, run 'packer fmt -recursive .' to fix"; exit 1; fi diff --git a/.github/workflows/pkr-bld-qemu-x64.yml b/.github/workflows/pkr-bld-qemu-x64.yml index eb3a82666..744501afd 100644 --- a/.github/workflows/pkr-bld-qemu-x64.yml +++ b/.github/workflows/pkr-bld-qemu-x64.yml @@ -1,9 +1,6 @@ --- on: workflow_call: - secrets: - PACKER_GITHUB_API_TOKEN: - required: true jobs: x86_64: @@ -59,7 +56,7 @@ jobs: version: latest - name: Packer Init env: - PACKER_GITHUB_API_TOKEN: "${{ secrets.PACKER_GITHUB_API_TOKEN }}" + PACKER_GITHUB_API_TOKEN: "${{ secrets.GITHUB_TOKEN }}" run: packer init -upgrade packer_templates - name: Packer FMT run: if packer fmt -check -recursive .; then exit 0; else echo "Some packer files need to be formatted, run 'packer fmt -recursive .' to fix"; exit 1; fi diff --git a/.github/workflows/pkr-bld-virtualbox-arm64.yml b/.github/workflows/pkr-bld-virtualbox-arm64.yml index cc2351a90..778ccb1a6 100644 --- a/.github/workflows/pkr-bld-virtualbox-arm64.yml +++ b/.github/workflows/pkr-bld-virtualbox-arm64.yml @@ -1,9 +1,6 @@ --- on: workflow_call: - secrets: - PACKER_GITHUB_API_TOKEN: - required: true jobs: aarch64: @@ -45,7 +42,7 @@ jobs: # version: latest - name: Packer Init env: - PACKER_GITHUB_API_TOKEN: "${{ secrets.PACKER_GITHUB_API_TOKEN }}" + PACKER_GITHUB_API_TOKEN: "${{ secrets.GITHUB_TOKEN }}" run: packer init -upgrade packer_templates - name: Packer FMT run: if packer fmt -check -recursive .; then exit 0; else echo "Some packer files need to be formatted, run 'packer fmt -recursive .' to fix"; exit 1; fi @@ -54,8 +51,7 @@ jobs: - name: Packer build run: packer build -timestamp-ui -only=${{ matrix.provider }}.vm -var-file=os_pkrvars/$(echo ${{ matrix.os }} | cut -d "-" -f 1)/"${{ matrix.os }}-aarch64.pkrvars.hcl" packer_templates - name: Remove VM in case of canceled job - if: always() - continue-on-error: true + if: cancelled() run: | echo Powering off and deleting any existing VMs named ${{ matrix.os }}*-aarch64 VBoxManage controlvm ${{ matrix.os }}*-aarch64 poweroff --type headless 2> /dev/null diff --git a/.github/workflows/pkr-bld-virtualbox-x64.yml b/.github/workflows/pkr-bld-virtualbox-x64.yml index 4d89df4e7..adfa2d177 100644 --- a/.github/workflows/pkr-bld-virtualbox-x64.yml +++ b/.github/workflows/pkr-bld-virtualbox-x64.yml @@ -1,9 +1,6 @@ --- on: workflow_call: - secrets: - PACKER_GITHUB_API_TOKEN: - required: true jobs: x86_64: @@ -57,7 +54,7 @@ jobs: version: latest - name: Packer Init env: - PACKER_GITHUB_API_TOKEN: "${{ secrets.PACKER_GITHUB_API_TOKEN }}" + PACKER_GITHUB_API_TOKEN: "${{ secrets.GITHUB_TOKEN }}" run: packer init -upgrade packer_templates - name: Packer FMT run: if packer fmt -check -recursive .; then exit 0; else echo "Some packer files need to be formatted, run 'packer fmt -recursive .' to fix"; exit 1; fi @@ -66,8 +63,7 @@ jobs: - name: Packer build run: packer build -timestamp-ui -only=${{ matrix.provider }}.vm -var-file=os_pkrvars/$(echo ${{ matrix.os }} | cut -d "-" -f 1)/"${{ matrix.os }}-x86_64.pkrvars.hcl" packer_templates - name: Remove VM in case of canceled job - if: always() - continue-on-error: true + if: cancelled() run: | echo Powering off and deleting any existing VMs named ${{ matrix.os }}*-amd64 VBoxManage controlvm ${{ matrix.os }}*-amd64 poweroff --type headless 2> /dev/null diff --git a/.github/workflows/pkr-bld-vmware-arm64.yml b/.github/workflows/pkr-bld-vmware-arm64.yml index 8231450f9..1261ec155 100644 --- a/.github/workflows/pkr-bld-vmware-arm64.yml +++ b/.github/workflows/pkr-bld-vmware-arm64.yml @@ -1,9 +1,6 @@ --- on: workflow_call: - secrets: - PACKER_GITHUB_API_TOKEN: - required: true jobs: aarch64: @@ -45,7 +42,7 @@ jobs: # version: latest - name: Packer Init env: - PACKER_GITHUB_API_TOKEN: "${{ secrets.PACKER_GITHUB_API_TOKEN }}" + PACKER_GITHUB_API_TOKEN: "${{ secrets.GITHUB_TOKEN }}" run: packer init -upgrade packer_templates - name: Packer FMT run: if packer fmt -check -recursive .; then exit 0; else echo "Some packer files need to be formatted, run 'packer fmt -recursive .' to fix"; exit 1; fi @@ -54,8 +51,7 @@ jobs: - name: Packer build run: packer build -timestamp-ui -only=${{ matrix.provider }}.vm -var-file=os_pkrvars/$(echo ${{ matrix.os }} | cut -d "-" -f 1)/"${{ matrix.os }}-aarch64.pkrvars.hcl" packer_templates - name: Remove VM in case of canceled job - if: always() - continue-on-error: true + if: cancelled() run: | echo Powering off and deleting any existing VMs named ${{ matrix.os }}*-aarch64 vmrun -T fusion stop builds/packer-${{ matrix.os }}*-x86_64-vmware/${{ matrix.os }}*-aarch64.vmx hard 2> /dev/null diff --git a/.github/workflows/pkr-bld-vmware-x64.yml b/.github/workflows/pkr-bld-vmware-x64.yml index c61fe2333..a0752f2e5 100644 --- a/.github/workflows/pkr-bld-vmware-x64.yml +++ b/.github/workflows/pkr-bld-vmware-x64.yml @@ -1,9 +1,6 @@ --- on: workflow_call: - secrets: - PACKER_GITHUB_API_TOKEN: - required: true jobs: x86_64: @@ -57,7 +54,7 @@ jobs: version: latest - name: Packer Init env: - PACKER_GITHUB_API_TOKEN: "${{ secrets.PACKER_GITHUB_API_TOKEN }}" + PACKER_GITHUB_API_TOKEN: "${{ secrets.GITHUB_TOKEN }}" run: packer init -upgrade packer_templates - name: Packer FMT run: if packer fmt -check -recursive .; then exit 0; else echo "Some packer files need to be formatted, run 'packer fmt -recursive .' to fix"; exit 1; fi @@ -66,8 +63,7 @@ jobs: - name: Packer build run: packer build -timestamp-ui -only=${{ matrix.provider }}.vm -var-file=os_pkrvars/$(echo ${{ matrix.os }} | cut -d "-" -f 1)/"${{ matrix.os }}-x86_64.pkrvars.hcl" packer_templates - name: Remove VM in case of canceled job - if: always() - continue-on-error: true + if: cancelled() run: | echo Powering off and deleting any existing VMs named ${{ matrix.os }}*-amd64 vmrun -T fusion stop builds/packer-${{ matrix.os }}*-x86_64-vmware/${{ matrix.os }}*-amd64.vmx hard 2> /dev/null diff --git a/os_pkrvars/ubuntu/ubuntu-20.04-x86_64.pkrvars.hcl b/os_pkrvars/ubuntu/ubuntu-20.04-x86_64.pkrvars.hcl index 40cc14d9a..3d4f0873a 100644 --- a/os_pkrvars/ubuntu/ubuntu-20.04-x86_64.pkrvars.hcl +++ b/os_pkrvars/ubuntu/ubuntu-20.04-x86_64.pkrvars.hcl @@ -7,4 +7,5 @@ hyperv_generation = 2 parallels_guest_os_type = "ubuntu" vbox_guest_os_type = "Ubuntu_64" vmware_guest_os_type = "ubuntu-64" -boot_command = ["<wait>", "<esc><wait>", "<esc><wait>", "<f6><wait>", "<esc><wait>", "<bs><bs><bs><bs>", " autoinstall", " ds=nocloud-net\\;s=http://{{.HTTPIP}}:{{.HTTPPort}}/ubuntu/", " ---", "<enter><wait>"] +boot_wait = "2s" +boot_command = ["<wait><esc><esc><esc><enter>/casper/vmlinuz initrd=/casper/initrd quiet autoinstall ds=nocloud-net;s=http://{{.HTTPIP}}:{{.HTTPPort}}/ubuntu/<enter>"] From 768ccf104e619ec74e98c0d365c4a219edb511d5 Mon Sep 17 00:00:00 2001 From: Corey Hemminger <hemminger@hotmail.com> Date: Thu, 16 Mar 2023 13:04:30 -0500 Subject: [PATCH 1512/1622] add back updated bento ruby files to work with hcl2 (#1489) * add back updated bento ruby files to work with hcl2 Signed-off-by: Corey Hemminger <hemminger@hotmail.com> --- .github/workflows/ci-build.yml | 48 +++++ .github/workflows/ci-lint.yml | 25 --- .github/workflows/pkr-bld-hyperv-x64.yml | 16 +- .github/workflows/pkr-bld-parallels-x64.yml | 12 +- .github/workflows/pkr-bld-qemu-x64.yml | 12 +- .github/workflows/pkr-bld-virtualbox-x64.yml | 12 +- .github/workflows/pkr-bld-vmware-x64.yml | 12 +- .gitignore | 6 + CHANGELOG.md | 8 +- Gemfile | 8 + README.md | 48 ++++- Rakefile | 75 +++++++ bento.gemspec | 22 +++ bin/bento | 14 ++ builds.yml | 66 +++++++ builds/uploaded/.gitkeep | 0 lib/bento.rb | 2 + lib/bento/buildmetadata.rb | 91 +++++++++ lib/bento/cli.rb | 197 +++++++++++++++++++ lib/bento/common.rb | 127 ++++++++++++ lib/bento/normalize.rb | 92 +++++++++ lib/bento/packerexec.rb | 30 +++ lib/bento/providermetadata.rb | 99 ++++++++++ lib/bento/runner.rb | 96 +++++++++ lib/bento/test.rb | 60 ++++++ lib/bento/test_templates/bootstrap.sh.erb | 1 + lib/bento/test_templates/kitchen.yml.erb | 21 ++ lib/bento/upload.rb | 92 +++++++++ lib/bento/version.rb | 3 + packer_templates/pkr-sources.pkr.hcl | 2 +- 30 files changed, 1230 insertions(+), 67 deletions(-) create mode 100644 Gemfile create mode 100644 Rakefile create mode 100644 bento.gemspec create mode 100755 bin/bento create mode 100644 builds.yml create mode 100644 builds/uploaded/.gitkeep create mode 100644 lib/bento.rb create mode 100644 lib/bento/buildmetadata.rb create mode 100644 lib/bento/cli.rb create mode 100644 lib/bento/common.rb create mode 100644 lib/bento/normalize.rb create mode 100644 lib/bento/packerexec.rb create mode 100644 lib/bento/providermetadata.rb create mode 100644 lib/bento/runner.rb create mode 100644 lib/bento/test.rb create mode 100644 lib/bento/test_templates/bootstrap.sh.erb create mode 100644 lib/bento/test_templates/kitchen.yml.erb create mode 100644 lib/bento/upload.rb create mode 100644 lib/bento/version.rb diff --git a/.github/workflows/ci-build.yml b/.github/workflows/ci-build.yml index 179ff1ce7..ef67f8635 100644 --- a/.github/workflows/ci-build.yml +++ b/.github/workflows/ci-build.yml @@ -7,6 +7,34 @@ concurrency: cancel-in-progress: true jobs: + markdown-lint: + uses: chef/github-workflows/.github/workflows/markdown-lint.yml@main + + markdown-link-checker: + uses: chef/github-workflows/.github/workflows/markdown-link-checker.yml@main + + yaml-lint: + uses: chef/github-workflows/.github/workflows/yaml-lint.yml@main + + json-lint: + uses: chef/github-workflows/.github/workflows/json-lint.yml@main + + xml-lint: + uses: chef/github-workflows/.github/workflows/xml-lint.yml@main + + shellcheck-lint: + uses: chef/github-workflows/.github/workflows/shellcheck-lint.yml@main + + powershell-lint: + uses: chef/github-workflows/.github/workflows/powershell-lint.yml@main + + packer-iso-check: + uses: chef/github-workflows/.github/workflows/packer-iso-url-checker.yml@main + + packer-lint: + uses: chef/github-workflows/.github/workflows/packer-lint.yml@main + secrets: inherit + pkr-bld-amazonlinux-x64: uses: ./.github/workflows/pkr-bld-amazonlinux-x64.yml secrets: inherit @@ -46,3 +74,23 @@ jobs: pkr-bld-vmware-x64: uses: ./.github/workflows/pkr-bld-vmware-x64.yml secrets: inherit + + check_jobs_pass: + if: always() + needs: + - markdown-lint + - yaml-lint + - json-lint + - xml-lint + - powershell-lint + - shellcheck-lint + - packer-iso-check + - packer-lint + runs-on: Ubuntu-latest + steps: + - name: Decide whether the needed jobs succeeded or failed + uses: re-actors/alls-green@main + with: + allowed-failures: + allowed-skips: ${{ toJSON(needs) }} + jobs: ${{ toJSON(needs) }} diff --git a/.github/workflows/ci-lint.yml b/.github/workflows/ci-lint.yml index 5977b6f3e..5fb3b2075 100644 --- a/.github/workflows/ci-lint.yml +++ b/.github/workflows/ci-lint.yml @@ -1,13 +1,8 @@ --- on: - pull_request: schedule: - cron: '0 0 * * 0' -concurrency: - group: ci-lint-${{ github.ref }} - cancel-in-progress: true - jobs: markdown-lint: uses: chef/github-workflows/.github/workflows/markdown-lint.yml@main @@ -36,23 +31,3 @@ jobs: packer-lint: uses: chef/github-workflows/.github/workflows/packer-lint.yml@main secrets: inherit - - check_jobs_pass: - if: always() - needs: - - markdown-lint - - yaml-lint - - json-lint - - xml-lint - - powershell-lint - - shellcheck-lint - - packer-iso-check - - packer-lint - runs-on: Ubuntu-latest - steps: - - name: Decide whether the needed jobs succeeded or failed - uses: re-actors/alls-green@main - with: - allowed-failures: - allowed-skips: ${{ toJSON(needs) }} - jobs: ${{ toJSON(needs) }} diff --git a/.github/workflows/pkr-bld-hyperv-x64.yml b/.github/workflows/pkr-bld-hyperv-x64.yml index 874728f7e..930db1e7f 100644 --- a/.github/workflows/pkr-bld-hyperv-x64.yml +++ b/.github/workflows/pkr-bld-hyperv-x64.yml @@ -34,14 +34,14 @@ jobs: - ubuntu-20.04 - ubuntu-22.04 - ubuntu-22.10 - - windows-10 - - windows-10gen2 - - windows-11 - - windows-11gen2 - - windows-2012r2 - - windows-2016 - - windows-2019 - - windows-2022 +# - windows-10 +# - windows-10gen2 +# - windows-11 +# - windows-11gen2 +# - windows-2012r2 +# - windows-2016 +# - windows-2019 +# - windows-2022 provider: - hyperv-iso steps: diff --git a/.github/workflows/pkr-bld-parallels-x64.yml b/.github/workflows/pkr-bld-parallels-x64.yml index e2971322d..e3deb043a 100644 --- a/.github/workflows/pkr-bld-parallels-x64.yml +++ b/.github/workflows/pkr-bld-parallels-x64.yml @@ -34,12 +34,12 @@ jobs: - ubuntu-20.04 - ubuntu-22.04 - ubuntu-22.10 - - windows-10 - - windows-11 - - windows-2012r2 - - windows-2016 - - windows-2019 - - windows-2022 +# - windows-10 +# - windows-11 +# - windows-2012r2 +# - windows-2016 +# - windows-2019 +# - windows-2022 provider: - parallels-iso steps: diff --git a/.github/workflows/pkr-bld-qemu-x64.yml b/.github/workflows/pkr-bld-qemu-x64.yml index 744501afd..3ae21b68a 100644 --- a/.github/workflows/pkr-bld-qemu-x64.yml +++ b/.github/workflows/pkr-bld-qemu-x64.yml @@ -34,12 +34,12 @@ jobs: - ubuntu-20.04 - ubuntu-22.04 - ubuntu-22.10 - - windows-10 - - windows-11 - - windows-2012r2 - - windows-2016 - - windows-2019 - - windows-2022 +# - windows-10 +# - windows-11 +# - windows-2012r2 +# - windows-2016 +# - windows-2019 +# - windows-2022 provider: - qemu steps: diff --git a/.github/workflows/pkr-bld-virtualbox-x64.yml b/.github/workflows/pkr-bld-virtualbox-x64.yml index adfa2d177..0fef18bfe 100644 --- a/.github/workflows/pkr-bld-virtualbox-x64.yml +++ b/.github/workflows/pkr-bld-virtualbox-x64.yml @@ -34,12 +34,12 @@ jobs: - ubuntu-20.04 - ubuntu-22.04 - ubuntu-22.10 - - windows-10 - - windows-11 - - windows-2012r2 - - windows-2016 - - windows-2019 - - windows-2022 +# - windows-10 +# - windows-11 +# - windows-2012r2 +# - windows-2016 +# - windows-2019 +# - windows-2022 provider: - virtualbox-iso steps: diff --git a/.github/workflows/pkr-bld-vmware-x64.yml b/.github/workflows/pkr-bld-vmware-x64.yml index a0752f2e5..91efd62aa 100644 --- a/.github/workflows/pkr-bld-vmware-x64.yml +++ b/.github/workflows/pkr-bld-vmware-x64.yml @@ -34,12 +34,12 @@ jobs: - ubuntu-20.04 - ubuntu-22.04 - ubuntu-22.10 - - windows-10 - - windows-11 - - windows-2012r2 - - windows-2016 - - windows-2019 - - windows-2022 +# - windows-10 +# - windows-11 +# - windows-2012r2 +# - windows-2016 +# - windows-2019 +# - windows-2022 provider: - vmware-iso steps: diff --git a/.gitignore b/.gitignore index 5f4b6dddd..f357397f4 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,9 @@ packer.log Gemfile.lock bootstrap.sh Berksfile.lock +*.variables.json +/builds/ +.kitchen +.kitchen.yml +kitchen.yml +*.metadata.json diff --git a/CHANGELOG.md b/CHANGELOG.md index 07677f2de..691abbce8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -50,7 +50,13 @@ Markdown table generated at <https://www.tablesgenerator.com/markdown_tables#> | windows-2019 | x | x | na | | na | x | na | | na | | windows-2022 | x | x | na | | na | x | na | | na | -## [unreleased] (2023-03-07) +## [unreleased] (2023-03-16) + +## [v3.0.0] (2023-03-16) + +- fixed pipeline secrets issue for github api requests and secrets not working for forked repos +- add back the bento ruby code and updated it to work with hcl2 templates, Json templates are no longer supported +- made bento builds for all templates configurable through the builds.yml file on which OSes to skip ## [v202303.06] (2023-03-07) diff --git a/Gemfile b/Gemfile new file mode 100644 index 000000000..807257881 --- /dev/null +++ b/Gemfile @@ -0,0 +1,8 @@ +source 'https://rubygems.org' + +gemspec + +group :development do + gem 'cookstyle' + gem 'rake', '>= 12' +end diff --git a/README.md b/README.md index b98fdb680..ca55ea341 100644 --- a/README.md +++ b/README.md @@ -39,6 +39,46 @@ end ***NOTE:** support for these providers is considered experimental and corresponding Vagrant Cloud images may or may not exist. +#### Using `bento` executable + +### build + +To build a Debian vagrant box using the bento tool with the template available in the `os_pkrvars` dir, we can use the following command: + +```bash +bento build --cpus 2 packer_templates/debian/debian-11.6-i386.json +``` + +Other available options: + +- cpus - Specify the number of CPUs needed in the new build. +- mem - Specify the memory +- mirror - The template will have a default mirror link, if you wish to use an alternative one, you can utilise this configuration. +- dry-run - This will not create any build, but will create a metadata file for reference. +- only - Only build some Packer builds (Default: parallels-iso.vm,virtualbox-iso.vm,vmware-iso.vm +- except - Build all Packer builds except these (ex: parallels-iso.vm,virtualbox-iso.vm,vmware-iso.vm) +- debug - Print the debug logs +- headed - Packer will be building VirtualBox virtual machines by launching a GUI that shows the console of the machine being built. This option is false by default +- single - This can be used to disable the parallel builds. + +### list + +Used to list all builds available for the workstations cpu architecture. This list is also filtered by the build.yml file do_not_build: section. All entries are matched via regex to filter out build templates from the list. + +This only shows what would be built with `bento build` and no template is specified. If any template is specified even if it's in the build.yml to be filtered it'll override the filter. + +```bash +bento list +``` + +### test + +If you have successfully built a vagrant box using the bento tool, you should have the vagrant box and a metadata file in the `builds` folder. You can use these files to test the build with a test-kitchen configuration. Run the following command to test the build. + +```bash +bento test +``` + #### Using `packer` To build a Ubuntu 22.04 box for only the VirtualBox provider @@ -117,14 +157,6 @@ Hyper-V Gen 2 VMs do not support floppy drives. If you previously provided resou - `autounattend.xml`: The Gen 2 `autounattend.xml` file supports EFI partitions. Update the `autounattend.xml` with the correct Windows version for your systems and ensure that the partitions are correct for your situation. You also need to manage the driver disk that holds the hyper-v guest services drivers and adjust the `autounattend.xml` file as appropriate. - `base_setup.ps1` -### Testing the build with the test-kitchen - -If you have successfully built a vagrant box using the bento tool, you should have the vagrant box and a metadata file in the `builds` folder. You can use these files to test the build with a test-kitchen configuration. Place your `kitchen.yml` and `bootstrap.sh` files inside the `templates` directory and run the following command to test the build. - -```bash -kitchen test -``` - ## Bugs and Issues Please use GitHub issues to report bugs, features, or other problems. diff --git a/Rakefile b/Rakefile new file mode 100644 index 000000000..6116ee1f8 --- /dev/null +++ b/Rakefile @@ -0,0 +1,75 @@ +require 'yaml' +require 'fileutils' + +desc 'Validate all templates using Packer' +task :validate do + Dir.glob('os_pkrvars/**/*.pkrvars.hcl').sort.each do |template_path| + template_dir = File.dirname(template_path) + filename = File.basename(template_path) + + puts "\n\e[32mValidating #{template_path}\e[0m\n\n" + result = system("packer validate -var-file=#{filename} ../../packer_templates", chdir: template_dir) + raise "Validation for #{template_path} failed" unless result + end +end + +desc 'clean repo, build boxes, test, and upload/release' +task :do_all do + check_env + public_templates.each do |template| + next unless config['public'].include?(box_name(template)) + Rake::Task[:clean].execute + sh build_cmd(template) + sh 'bento test' + if ENV['BENTO_AUTO_RELEASE'].nil? || ENV['BENTO_VERSION'].nil? + puts "skipping the upload / release of #{template} as BENTO_AUTO_RELEASE and BENTO_VERSION env vars were not set" + else + sh 'bento upload' + end + end +end + +desc 'clean' +task :clean do + puts 'Removing kitchen.yml and builds/*' + FileUtils.rm_rf(['kitchen.yml', 'bootstrap.sh', Dir.glob('builds/*')]) +end + +def build_cmd(template) + cmd = %W(bento build --var-file=#{template} ../../packer_templates) + cmd.insert(2, "--only #{providers}") + cmd.join(' ') + a_to_s(cmd) +end + +def providers + if config['providers'] + config['providers'].join(',') + else + puts 'No Providers Specified.' + puts 'Set `providers` in builds.yml' + exit 1 + end +end + +def a_to_s(*args) + clean_array(*args).join(' ') +end + +def config + YAML.load(File.read('builds.yml')) +end + +def clean_array(*args) + args.flatten.reject { |i| i.nil? || i == '' }.map(&:to_s) +end + +def box_name(template) + bn = template.split('/')[1].gsub!(/\.pkrvars\.hcl/, '') + bn.match(/-x86_64|-aarch64/) ? bn.gsub(/-x86_64|-aarch64/, '') : bn +end + +def public_templates + templates = Dir.glob('**/*.json').reject { |d| d['builds'] } + templates.reject { |f| f[/macos|rhel|sles|solaris|windows/] } +end diff --git a/bento.gemspec b/bento.gemspec new file mode 100644 index 000000000..75a387502 --- /dev/null +++ b/bento.gemspec @@ -0,0 +1,22 @@ +# frozen_string_literal: true + +Gem::Specification.new do |s| + s.name = 'bento' + s.version = '3.0.0' + s.summary = 'Bento builds generic Vagrant boxes ' + s.description = s.summary + s.license = 'Apache-2.0' + s.author = 'Many many Chef employees over the years' + s.email = 'oss@chef.io' + s.homepage = 'https://github.com/chef/bento/' + + s.required_ruby_version = '>= 2.6' + + s.add_dependency 'mixlib-shellout', '>= 2.3.2' + + s.bindir = 'bin' + s.executables = %w(bento) + + s.require_path = 'lib' + s.files = %w(LICENSE Gemfile) + Dir.glob('*.gemspec') + Dir.glob('lib/**/*') +end diff --git a/bin/bento b/bin/bento new file mode 100755 index 000000000..2c989574f --- /dev/null +++ b/bin/bento @@ -0,0 +1,14 @@ +#!/usr/bin/env ruby +Signal.trap('INT') { exit 1 } + +$stdout.sync = true +$stderr.sync = true + +require_relative '../lib/bento/cli' + +begin + Runner.new(Options.parse(ARGV)).start +rescue => ex + warn ">>> #{ex.message}" + exit(($CHILD_STATUS && $CHILD_STATUS.exitstatus) || 99) +end diff --git a/builds.yml b/builds.yml new file mode 100644 index 000000000..80081dc89 --- /dev/null +++ b/builds.yml @@ -0,0 +1,66 @@ +--- +public: +- 'almalinux-8.7' +- 'almalinux-9.1' +- 'amazon-2' +- 'centos-7.9' +- 'centos-stream-8' +- 'centos-stream-9' +- 'debian-10.13-arm64' +- 'debian-10.13' +- 'debian-11.6-arm64' +- 'debian-11.6' +- 'fedora-36' +- 'fedora-37' +- 'freebsd-12.4' +- 'freebsd-13.1' +- 'opensuse-leap-15.4' +- 'oracle-7.9' +- 'oracle-8.7' +- 'oracle-9.1' +- 'rockylinux-8.7' +- 'rockylinux-9.1' +- 'scientific-7.9' +- 'springdalelinux-7.9' +- 'springdalelinux-8.7' +- 'springdalelinux-9.1' +- 'ubuntu-18.04' +- 'ubuntu-18.04-arm64' +- 'ubuntu-20.04' +- 'ubuntu-20.04-arm64' +- 'ubuntu-22.04' +- 'ubuntu-22.04-arm64' +- 'ubuntu-22.10' +- 'ubuntu-22.10-arm64' + +# slug box name: text string from standard box name to match (generally the same) +slugs: + 'almalinux-8': 'almalinux-8' + 'almalinux-9': 'almalinux-9' + 'amazon-2': 'amazon-2' + 'centos-7': 'centos-7' + 'centos-stream-8': 'centos-stream-8' + 'centos-stream-9': 'centos-stream-9' + 'debian-11': 'debian-11' + 'debian-10': 'debian-10' + 'fedora-latest': 'fedora-37' + 'freebsd-12': 'freebsd-12' + 'freebsd-13': 'freebsd-13' + 'opensuse-leap-15': 'opensuse-leap-15' + 'oracle-7': 'oracle-7' + 'oracle-8': 'oracle-8' + 'oracle-9': 'oracle-9' + 'rockylinux-8': 'rockylinux-8' + 'rockylinux-9': 'rockylinux-9' + 'scientific-7': 'scientific-7' + 'springdalelinux-7': 'springdalelinux-7' + 'springdalelinux-8': 'springdalelinux-8' + 'springdalelinux-9': 'springdalelinux-9' + +do_not_build: + - amazon + - macos + - sles + - solaris + - rhel + - windows diff --git a/builds/uploaded/.gitkeep b/builds/uploaded/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/lib/bento.rb b/lib/bento.rb new file mode 100644 index 000000000..71e86d871 --- /dev/null +++ b/lib/bento.rb @@ -0,0 +1,2 @@ +require 'bento/common' +require 'bento/version' diff --git a/lib/bento/buildmetadata.rb b/lib/bento/buildmetadata.rb new file mode 100644 index 000000000..3b7144b21 --- /dev/null +++ b/lib/bento/buildmetadata.rb @@ -0,0 +1,91 @@ +require 'bento/common' +require 'mixlib/shellout' unless defined?(Mixlib::ShellOut) + +class BuildMetadata + include Common + + def initialize(template, build_timestamp, override_version) + @template = template + @build_timestamp = build_timestamp + @override_version = override_version + end + + def read + { + name: name, + version: version, + arch: arch, + build_timestamp: build_timestamp, + git_revision: git_revision, + git_status: git_clean? ? 'clean' : 'dirty', + box_basename: box_basename, + template: template_vars.fetch('template', UNKNOWN), + packer: packer_ver, + } + end + + private + + UNKNOWN = '__unknown__'.freeze + + attr_reader :template, :build_timestamp, :override_version + + def box_basename + "#{name.gsub('/', '__')}-#{arch}" + end + + def git_revision + `git rev-parse HEAD`.strip + end + + def git_clean? + `git status --porcelain`.strip.empty? + end + + def merged_vars + @merged_vars ||= begin + if File.exist?("#{template}.variables.json") + template_vars.merge(JSON.load(IO.read("#{template}.variables.json"))) + else + template_vars + end + end + end + + def name + merged_vars.fetch('name', template) + end + + def arch + merged_vars.fetch('arch', UNKNOWN) + end + + def template_vars + @template_vars ||= begin + file_data = {} + File.open("#{template}.pkrvars.hcl", 'r') do |file| + file.each_line do |line| + line_data = line.split('=') + if line_data[0].strip.gsub(/"|os_/, '') == 'version' + file_data['name'] = "#{file_data['name']}-#{line_data[1]&.strip&.tr('"', '')}" + else + file_data[line_data[0]&.strip&.gsub(/"|os_/, '')] = line_data[1]&.strip&.tr('"', '') + end + end + file_data['template'] = "#{file_data['name']}-#{file_data['arch']}" + end + file_data + end + end + + def version + override_version || merged_vars.fetch('version', "#{UNKNOWN}.TIMESTAMP") + .rpartition('.').first.concat(build_timestamp.to_s) + end + + def packer_ver + cmd = Mixlib::ShellOut.new('packer --version') + cmd.run_command + cmd.stdout.split("\n")[0] + end +end diff --git a/lib/bento/cli.rb b/lib/bento/cli.rb new file mode 100644 index 000000000..136b4a855 --- /dev/null +++ b/lib/bento/cli.rb @@ -0,0 +1,197 @@ +require 'optparse' unless defined?(OptionParser) +require 'ostruct' unless defined?(OpenStruct) + +require 'bento/common' +require 'bento/runner' +require 'bento/normalize' +require 'bento/test' +require 'bento/upload' + +class Options + NAME = File.basename($PROGRAM_NAME).freeze + + def self.parse(args) + not_buildable = YAML.load(File.read('builds.yml'))['do_not_build'] + options = OpenStruct.new + options.template_files = calculate_templates("os_pkrvars/**/*-#{RbConfig::CONFIG['host_cpu']}.pkrvars.hcl") + not_buildable.each do |os| + options.template_files.delete_if { |template| template.include?(os) } + end + + global = OptionParser.new do |opts| + opts.banner = "Usage: #{NAME} [SUBCOMMAND [options]]" + opts.separator '' + opts.separator <<-COMMANDS.gsub(/^ {8}/, '') + build : build one or more templates + help : prints this help message + list : list all templates in project + normalize : normalize one or more templates + test : test one or more builds with kitchen + upload : upload and release one or more builds to Vagrant Cloud + COMMANDS + end + + templates_argv_proc = proc { |opts| + opts.template_files = calculate_templates(args) unless args.empty? + + opts.template_files.each do |t| + unless File.exist?("#{t}.pkrvars.hcl") + warn "File #{t}.pkrvars.hcl does not exist for template '#{t}'" + exit(1) + end + end + } + + md_json_argv_proc = proc { |opts| + opts.md_json = ARGV[0] + } + + subcommand = { + help: { + parser: OptionParser.new {}, + argv: proc { |_opts| + puts global + exit(0) + }, + }, + build: { + class: BuildRunner, + parser: OptionParser.new do |opts| + opts.banner = "Usage: #{NAME} build [options] TEMPLATE[ TEMPLATE ...]" + + opts.on('-n', '--dry-run', 'Dry run (what would happen)') do |opt| + options.dry_run = opt + end + + opts.on('-c BUILD_YML', '--config BUILD_YML', 'Use a configuration file') do |opt| + options.config = opt + end + + opts.on('-d', '--[no-]debug', 'Run packer with debug output') do |opt| + options.debug = opt + end + + opts.on('-o BUILDS', '--only BUILDS', 'Only build some Packer builds (ex: parallels-iso,virtualbox-iso,vmware-iso)') do |opt| + options.only = opt + end + + opts.on('-e BUILDS', '--except BUILDS', 'Build all Packer builds except these (ex: parallels-iso,virtualbox-iso,vmware-iso)') do |opt| + options.except = opt + end + + opts.on('-m MIRROR', '--mirror MIRROR', 'Look for isos at MIRROR') do |opt| + options.mirror = opt + end + + opts.on('-C cpus', '--cpus CPUS', '# of CPUs per provider') do |opt| + options.cpus = opt + end + + opts.on('-M MEMORY', '--memory MEMORY', 'Memory (MB) per provider') do |opt| + options.mem = opt + end + + opts.on('-H', '--headed', 'Display provider UI windows') do |opt| + options.headed = opt + end + + opts.on('-S', '--single', 'Disable parallelization of Packer builds') do |opt| + options.single = opt + end + + # the default template override version unless a user passes one + options.override_version = Time.now.gmtime.strftime('%Y%m.%d.0') + + opts.on('-v VERSION', '--version VERSION', "Override the date computed version of #{options.override_version}") do |opt| + options.override_version = opt + end + end, + argv: templates_argv_proc, + }, + list: { + class: ListRunner, + parser: OptionParser.new do |opts| + opts.banner = "Usage: #{NAME} list [TEMPLATE ...]" + end, + argv: templates_argv_proc, + }, + normalize: { + class: NormalizeRunner, + parser: OptionParser.new do |opts| + opts.banner = "Usage: #{NAME} normalize TEMPLATE[ TEMPLATE ...]" + + opts.on('-d', '--[no-]debug', 'Run packer with debug output') do |opt| + options.debug = opt + end + end, + argv: templates_argv_proc, + }, + test: { + class: TestRunner, + parser: OptionParser.new do |opts| + opts.banner = "Usage: #{NAME} test [options]" + + opts.on('--no-shared-folder', 'Disable shared folder testing') do |opt| + options.no_shared = opt + end + + opts.on('-p', '--provisioner PROVISIONER', 'Use a specfic provisioner') do |opt| + options.provisioner = opt + end + end, + argv: proc {}, + }, + upload: { + class: UploadRunner, + parser: OptionParser.new do |opts| + opts.banner = "Usage: #{NAME} upload" + end, + argv: md_json_argv_proc, + }, + } + + global.order! + command = args.empty? ? :help : ARGV.shift.to_sym + subcommand.fetch(command).fetch(:parser).order! + subcommand.fetch(command).fetch(:argv).call(options) + + options.command = command + options.klass = subcommand.fetch(command).fetch(:class) + + options + end + + def self.calculate_templates(globs) + templates = Array(globs).map do |glob| + result = Dir.glob(glob) + result.empty? ? glob : result + end + templates.flatten.sort.delete_if { |file| file =~ /\.(variables||metadata)\.json/ }.map { |template| template.sub(/\.pkrvars\.hcl$/, '') } + end +end + +class ListRunner + include Common + + attr_reader :templates + + def initialize(opts) + @templates = opts.template_files + end + + def start + templates.each { |template| puts template } + end +end + +class Runner + attr_reader :options + + def initialize(options) + @options = options + end + + def start + options.klass.new(options).start + end +end diff --git a/lib/bento/common.rb b/lib/bento/common.rb new file mode 100644 index 000000000..a6c6ddf8c --- /dev/null +++ b/lib/bento/common.rb @@ -0,0 +1,127 @@ +require 'benchmark' unless defined?(Benchmark) +require 'fileutils' unless defined?(FileUtils) +require 'json' unless defined?(JSON) +require 'tempfile' unless defined?(Tempfile) +require 'yaml' +require 'mixlib/shellout' unless defined?(Mixlib::ShellOut) + +MEGABYTE = 1024.0 * 1024.0 + +module Common + def banner(msg) + puts "==> #{msg}" + end + + def info(msg) + puts " #{msg}" + end + + def shellout(cmd) + info "Shelling out to run #{cmd}" + sout = Mixlib::ShellOut.new(cmd) + sout.live_stream = STDOUT + sout.run_command + sout.error! # fail hard if the cmd fails + end + + def warn(msg) + puts ">>> #{msg}" + end + + # + # Shellout to vagrant CLI to see if we're logged into the cloud + # + # @return [Boolean] + # + def logged_in? + # rubocop:disable Modernize/ShellOutHelper + shellout = Mixlib::ShellOut.new('vagrant cloud auth whoami').run_command + # rubocop:enable Modernize/ShellOutHelper + + if shellout.error? + error_output = !shellout.stderr.empty? ? shellout.stderr : shellout.stdout + warn("Failed to shellout to vagrant to check the login status. Error: #{error_output}") + return false + end + + return true if shellout.stdout.match?(/Currently logged in/) + + false + end + + def duration(total) + total = 0 if total.nil? + minutes = (total / 60).to_i + seconds = (total - (minutes * 60)) + format('%dm%.2fs', minutes, seconds) + end + + def box_metadata(metadata_file) + metadata = {} + file = File.read(metadata_file) + json = JSON.parse(file) + + # metadata needed for upload: boxname, version, provider, box filename + metadata['name'] = json['name'] + metadata['version'] = json['version'] + metadata['box_basename'] = json['box_basename'] + metadata['packer'] = json['packer'] + metadata['vagrant'] = json['vagrant'] + metadata['providers'] = {} + json['providers'].each do |provider| + metadata['providers'][provider['name']] = provider.reject { |k, _| k == 'name' } + end + metadata + end + + def metadata_files + @metadata_files ||= Dir.glob('builds/*.json') + end + + def builds_yml + YAML.load(File.read('builds.yml')) + end + + def build_list + arm64 = [] + x86_64 = [] + builds_yml['public'].each do |platform, versions| + versions.each do |version, archs| + archs.each do |arch| + folder = case platform + when 'opensuse-leap' + 'opensuse' + when 'oracle' + 'oraclelinux' + else + platform + end + case arch + when 'aarch64' + arm64 << "#{folder}/#{platform}-#{version}-#{arch}" + else + x86_64 << "#{folder}/#{platform}-#{version}-#{arch}" + end + end + end + end + x86_64 + arm64 + end + + def private_box?(boxname) + proprietary_os_list = %w(macos windows sles solaris rhel) + proprietary_os_list.any? { |p| boxname.include?(p) } + end + + def macos? + !!(RUBY_PLATFORM =~ /darwin/) + end + + def unix? + !windows? + end + + def windows? + !!(RUBY_PLATFORM =~ /mswin|mingw|windows/) + end +end diff --git a/lib/bento/normalize.rb b/lib/bento/normalize.rb new file mode 100644 index 000000000..8bcdcf993 --- /dev/null +++ b/lib/bento/normalize.rb @@ -0,0 +1,92 @@ +require 'bento/common' + +class NormalizeRunner + include Common + include PackerExec + + attr_reader :templates, :build_timestamp, :debug, :override_version + + def initialize(opts) + @templates = opts.template_files + @debug = opts.debug + @modified = [] + @build_timestamp = Time.now.gmtime.strftime('%Y%m%d%H%M%S') + end + + def start + banner('Normalizing for templates:') + templates.each { |t| puts "- #{t}" } + time = Benchmark.measure do + templates.each do |file| + bento_dir = Dir.pwd + dir = File.dirname(file) + template = File.basename(file) + Dir.chdir dir + validate(template) + Dir.chdir(bento_dir) + end + end + unless @modified.empty? + info('') + info('The following templates were modified:') + @modified.sort.each { |template| info(" * #{template}") } + end + banner("Normalizing finished in #{duration(time.real)}.") + end + + private + + def checksum(file) + Digest::MD5.file(file).hexdigest + end + + def fix(template) + if File.exist?("#{template}.json") + file = "#{template}.json" + + banner("[#{template}] Fixing") + original_checksum = checksum(file) + output = `packer fix #{file}` + raise "[#{template}] Error fixing, exited #{$CHILD_STATUS}" if $CHILD_STATUS.exitstatus != 0 + + # preserve ampersands in shell commands, + # see: https://github.com/hashicorp/packer/issues/784 + output.gsub!('\\u0026', '&') + File.binwrite(file, output) + fixed_checksum = checksum(file) + + if original_checksum == fixed_checksum + puts('No changes made.') + else + warn("Template #{template} has been modified.") + @modified << template + end + elsif File.exist?("#{template}.pkrvars.hcl") + raise 'packer fix only works with JSON files for now.' + else + raise "Template file doesn't exist" + end + end + + def packer_validate_cmd(template, _var_file) + pkrvars = "#{template}.pkrvars.hcl" + vars = "#{template}.variables.json" + cmd = %W(packer validate -var-file=#{pkrvars} ../../packer_templates) + cmd.insert(2, "-var-file=#{vars}") if File.exist?(vars) + cmd + end + + def validate(template) + for_packer_run_with(template) do |md_file, var_file| + cmd = packer_validate_cmd(template, var_file.path) + banner("[#{template}] Validating: '#{cmd.join(' ')}'") + if debug + banner("[#{template}] DEBUG: var_file(#{var_file.path}) is:") + puts IO.read(var_file.path) + banner("[#{template}] DEBUG: md_file(#{md_file.path}) is:") + puts IO.read(md_file.path) + end + system(*cmd) || raise("[#{template}] Error validating, exited #{$CHILD_STATUS}") + end + end +end diff --git a/lib/bento/packerexec.rb b/lib/bento/packerexec.rb new file mode 100644 index 000000000..8fbd7bba6 --- /dev/null +++ b/lib/bento/packerexec.rb @@ -0,0 +1,30 @@ +module PackerExec + def for_packer_run_with(template) + Tempfile.open("#{template}-metadata.json") do |md_file| + Tempfile.open("#{template}-metadata-var-file") do |var_file| + write_box_metadata(template, md_file) + write_var_file(template, md_file, var_file) + yield md_file, var_file + end + end + end + + def write_box_metadata(template, io) + md = BuildMetadata.new(template, build_timestamp, override_version).read + io.write(JSON.pretty_generate(md)) + io.close + end + + def write_var_file(template, md_file, io) + md = BuildMetadata.new(template, build_timestamp, override_version).read + + io.write(JSON.pretty_generate({ + box_basename: md[:box_basename], + build_timestamp: md[:build_timestamp], + git_revision: md[:git_revision], + metadata: md_file.path, + version: md[:version], + })) + io.close + end +end diff --git a/lib/bento/providermetadata.rb b/lib/bento/providermetadata.rb new file mode 100644 index 000000000..263d64005 --- /dev/null +++ b/lib/bento/providermetadata.rb @@ -0,0 +1,99 @@ +require 'digest' unless defined?(Digest) +require 'bento/common' + +class ProviderMetadata + include Common + + def initialize(path, box_basename) + @base = File.join(path, box_basename) + end + + def read + Dir.glob("#{base}.*.box").map do |file| + { + name: provider_from_file(file), + version: version(provider_from_file(file)), + file: "#{File.basename(file)}", + checksum_type: 'sha256', + checksum: shasum(file), + size: "#{size_in_mb(file)} MB", + } + end + end + + private + + attr_reader :base + + def provider_from_file(file) + provider = file.sub(/^.*\.([^.]+)\.box$/, '\1') + if provider == 'vmware' + 'vmware_desktop' + else + provider + end + end + + def shasum(file) + Digest::SHA256.file(file).hexdigest + end + + def size_in_mb(file) + size = File.size(file) + size_mb = size / MEGABYTE + size_mb.ceil.to_s + end + + def version(provider) + case provider + when /vmware/ + ver_vmware + when /virtualbox/ + ver_vbox + when /parallels/ + ver_parallels + when /qemu/ + ver_qemu + when /hyperv/ + ver_hyperv + end + end + + def ver_vmware + if macos? + path = File.join('/Applications/VMware\ Fusion.app/Contents/Library') + fusion_cmd = File.join(path, 'vmware-vmx -v') + cmd = Mixlib::ShellOut.new(fusion_cmd) + cmd.run_command + cmd.stderr.split(' ')[5] + else + cmd = Mixlib::ShellOut.new('vmware --version') + cmd.run_command + cmd.stdout.split(' ')[2] + end + end + + def ver_parallels + raise 'Platform is not macOS, exiting...' unless macos? + + cmd = Mixlib::ShellOut.new('prlctl --version') + cmd.run_command + cmd.stdout.split(' ')[2] + end + + def ver_vbox + cmd = Mixlib::ShellOut.new('VBoxManage --version') + cmd.run_command + cmd.stdout.split('r')[0] + end + + def ver_qemu + cmd = Mixlib::ShellOut.new("qemu-system-#{base.split('-')[2]} -version") + cmd.run_command + cmd.stdout.split(' ')[3] + end + + def ver_hyperv + # TODO: write code + end +end diff --git a/lib/bento/runner.rb b/lib/bento/runner.rb new file mode 100644 index 000000000..ac91448b1 --- /dev/null +++ b/lib/bento/runner.rb @@ -0,0 +1,96 @@ +require 'bento/common' +require 'bento/buildmetadata' +require 'bento/providermetadata' +require 'bento/packerexec' + +class BuildRunner + include Common + include PackerExec + + attr_reader :template_files, :config, :dry_run, :debug, :only, :except, :mirror, :headed, :single, + :override_version, :build_timestamp, :cpus, :mem + + def initialize(opts) + @template_files = opts.template_files + @config = opts.config ||= false + @dry_run = opts.dry_run + @debug = opts.debug + @only = opts.only ||= 'parallels-iso.vm,virtualbox-iso.vm,vmware-iso.vm' + @except = opts.except + @mirror = opts.mirror + @headed = opts.headed ||= false + @single = opts.single ||= false + @override_version = opts.override_version + @build_timestamp = Time.now.gmtime.strftime('%Y%m%d%H%M%S') + @cpus = opts.cpus + @mem = opts.mem + end + + def start + templates = config ? build_list : template_files + banner('Starting build for templates:') + templates.each { |t| puts "- #{t}" } + time = Benchmark.measure do + templates.each { |template| build(template) } + end + banner("Build finished in #{duration(time.real)}.") + end + + private + + def build(file) + bento_dir = Dir.pwd + dir = File.dirname(file) + template = File.basename(file) + Dir.chdir dir + banner('Installing packer plugins if needed') + system('packer init ../../packer_templates') + for_packer_run_with(template) do |md_file, _var_file| + cmd = packer_build_cmd(template, md_file.path) + banner("[#{template}] Building: '#{cmd.join(' ')}'") + time = Benchmark.measure do + system(*cmd) || puts("[#{template}] Error building, exited #{$CHILD_STATUS}") + end + write_final_metadata(template, time.real.ceil) + banner("[#{template}] Finished building in #{duration(time.real)}.") + end + Dir.chdir(bento_dir) + end + + def packer_build_cmd(template, _var_file) + pkrvars = "#{template}.pkrvars.hcl" + # vars = "#{template}.variables.json" + cmd = %W(packer build -timestamp-ui -force -var-file=#{pkrvars} ../../packer_templates) + # cmd.insert(2, "-var-file=#{vars}") if File.exist?(vars) + # cmd.insert(2, "-var-file=#{var_file}") if File.exist?(var_file) + cmd.insert(2, "-only=#{only}") + cmd.insert(2, "-except=#{except}") if except + # Build the command line in the correct order and without spaces as future input for the splat operator. + cmd.insert(2, "-var cpus=#{cpus}") if cpus + cmd.insert(2, "-var memory=#{mem}") if mem + # cmd.insert(2, '-var headless=true') unless headed + cmd.insert(2, '-parallel=false') if single + cmd.insert(2, '-debug') if debug + cmd.insert(0, 'echo') if dry_run + cmd + end + + def write_final_metadata(template, buildtime) + md = BuildMetadata.new(template, build_timestamp, override_version).read + path = File.join('../../builds') + filename = File.join(path, "#{md[:box_basename]}.metadata.json") + md[:providers] = ProviderMetadata.new(path, md[:box_basename]).read + md[:providers].each do |p| + p[:build_time] = buildtime + p[:build_cpus] = cpus unless cpus.nil? + p[:build_mem] = mem unless mem.nil? + end + + if dry_run + banner('(Dry run) Metadata file contents would be something similar to:') + puts JSON.pretty_generate(md) + else + File.binwrite(filename, JSON.pretty_generate(md)) + end + end +end diff --git a/lib/bento/test.rb b/lib/bento/test.rb new file mode 100644 index 000000000..d4d790b3b --- /dev/null +++ b/lib/bento/test.rb @@ -0,0 +1,60 @@ +require 'bento/common' +require 'mixlib/shellout' unless defined?(Mixlib::ShellOut) +require 'erb' unless defined?(Erb) + +class TestRunner + include Common + + attr_reader :shared_folder, :boxname, :provider, :box_url, :no_shared, :provisioner + + def initialize(opts) + @debug = opts.debug + @no_shared = opts.no_shared + @provisioner = opts.provisioner.nil? ? 'shell' : opts.provisioner + end + + def start + banner('Starting testing...') + time = Benchmark.measure do + metadata_files.each do |metadata_file| + destroy_all_bento + test_box(metadata_file) + destroy_all_bento + end + end + banner("Testing finished in #{duration(time.real)}.") + end + + private + + def destroy_all_bento + cmd = Mixlib::ShellOut.new("vagrant box list | grep 'bento-'") + cmd.run_command + boxes = cmd.stdout.split("\n") + + boxes.each do |box| + b = box.split(' ') + rm_cmd = Mixlib::ShellOut.new("vagrant box remove --force #{b[0]} --provider #{b[1].to_s.gsub(/(,|\()/, '')}") + banner("Removing #{b[0]} for provider #{b[1].to_s.gsub(/(,|\()/, '')}") + rm_cmd.run_command + end + end + + def test_box(md_json) + md = box_metadata(md_json) + @boxname = md['name'] + @providers = md['providers'] + @share_disabled = no_shared || /(bsd|opensuse)/.match(boxname) ? true : false + + dir = "#{File.expand_path('../../', File.dirname(__FILE__))}/lib/bento/test_templates" + %w(kitchen.yml bootstrap.sh).each do |file| + t = file =~ /kitchen/ ? 'kitchen.yml.erb' : "#{file}.erb" + erb = ERB.new(File.read(dir + "/#{t}"), trim_mode: '-').result(binding) + File.open(file, 'w') { |f| f.puts erb } + end + + test = Mixlib::ShellOut.new('kitchen test', timeout: 900, live_stream: STDOUT) + test.run_command + test.error! + end +end diff --git a/lib/bento/test_templates/bootstrap.sh.erb b/lib/bento/test_templates/bootstrap.sh.erb new file mode 100644 index 000000000..99d3975e1 --- /dev/null +++ b/lib/bento/test_templates/bootstrap.sh.erb @@ -0,0 +1 @@ +echo "Shell Provisioner Says What" diff --git a/lib/bento/test_templates/kitchen.yml.erb b/lib/bento/test_templates/kitchen.yml.erb new file mode 100644 index 000000000..fb539b2a8 --- /dev/null +++ b/lib/bento/test_templates/kitchen.yml.erb @@ -0,0 +1,21 @@ +--- +provisioner: + name: <%= @provisioner %> + +platforms: +<% @providers.each do |k,v| -%> +- name: <%= @boxname + '-' + k %> + driver: + name: vagrant + provider: <%= k %> + box: bento-<%= @boxname %> + box_url: file://<%= Dir.pwd %>/builds/<%= v['file'] %> + synced_folders: +<% if k =~ /hyperv/ -%> + - [".", "/vagrant", "disabled: true"] +<% else -%> + - [".", "/vagrant", "disabled: <%= @share_disabled %>"] +<% end -%> +<% end -%> +suites: +- name: default diff --git a/lib/bento/upload.rb b/lib/bento/upload.rb new file mode 100644 index 000000000..e6c303a2a --- /dev/null +++ b/lib/bento/upload.rb @@ -0,0 +1,92 @@ +require 'bento/common' + +class UploadRunner + include Common + + attr_reader :md_json + + def initialize(opts) + @md_json = opts.md_json + end + + def error_unless_logged_in + warn("You cannot upload files to vagrant cloud unless the vagrant CLI is logged in. Run 'vagrant cloud auth login' first.") unless logged_in? + end + + def start + error_unless_logged_in + + banner('Starting uploads...') + time = Benchmark.measure do + files = md_json ? [md_json] : metadata_files + files.each do |md_file| + upload_box(md_file) + end + end + banner("Uploads finished in #{duration(time.real)}.") + end + + # + # Upload all the boxes defined in the passed metadata file + # + # @param [String] md_file The path to the metadata file + # + # + def upload_box(md_file) + md_data = box_metadata(md_file) + + md_data['providers'].each_pair do |prov, prov_data| + if File.exist?(File.join('builds', prov_data['file'])) + banner("Uploading bento/#{md_data['name']} version:#{md_data['version']} provider:#{prov}...") + + upload_cmd = "vagrant cloud publish bento/#{md_data['name']} #{md_data['version']} #{prov} builds/#{prov_data['file']} --description '#{box_desc(md_data['name'])}' --short-description '#{box_desc(md_data['name'])}' --version-description '#{ver_desc(md_data)}' --force --release --no-private" + shellout(upload_cmd) + + slug_name = lookup_slug(md_data['name']) + if slug_name + banner("Uploading slug bento/#{slug_name} from #{md_data['name']} version:#{md_data['version']} provider:#{prov}...") + upload_cmd = "vagrant cloud publish bento/#{slug_name} #{md_data['version']} #{prov} builds/#{prov_data['file']} --description '#{slug_desc(slug_name)}' --short-description '#{slug_desc(slug_name)}' --version-description '#{ver_desc(md_data)}' --force --release --no-private" + shellout(upload_cmd) + end + + # move the box file to the completed directory + FileUtils.mv(File.join('builds', prov_data['file']), File.join('builds', 'uploaded', prov_data['file'])) + else # box in metadata isn't on disk + warn "The #{prov} box defined in the metadata file #{md_file} does not exist at builds/#{prov_data['file']}. Skipping!" + end + end + + # move the metadata file to the completed directory + FileUtils.mv(md_file, File.join('builds', 'uploaded', File.basename(md_file))) + end + + # + # Given a box name return a slug name or nil + # + # @return [String, NilClass] The slug name or nil + # + def lookup_slug(name) + builds_yml['slugs'].each_pair do |slug, match_string| + return slug if name.start_with?(match_string) && !(name.include?('i386') || name.include?('arm64')) + end + + nil + end + + def box_desc(name) + "Vanilla #{name.tr('-', ' ').capitalize} Vagrant box created with Bento by Chef" + end + + def slug_desc(name) + "Vanilla #{name.tr('-', ' ').capitalize}.x Vagrant box created with Bento by Chef. This box will be updated with the latest releases of #{name.tr('-', ' ').capitalize} as they become available" + end + + def ver_desc(md_data) + tool_versions = [] + md_data['providers'].each_key { |hv| tool_versions << "#{hv == 'vmware_desktop' ? (macos? ? 'vmware-fusion' : 'vmware-workstation') : hv}: #{md_data['providers'][hv]['version']}" } + tool_versions.sort! + tool_versions << "packer: #{md_data['packer']}" + + "#{md_data['name'].tr('-', ' ').capitalize} Vagrant box version #{md_data['version']} created with Bento by Chef. Built with: #{tool_versions.join(', ')}" + end +end diff --git a/lib/bento/version.rb b/lib/bento/version.rb new file mode 100644 index 000000000..003a98f00 --- /dev/null +++ b/lib/bento/version.rb @@ -0,0 +1,3 @@ +module Bento + VERSION = '3.0.0'.freeze +end diff --git a/packer_templates/pkr-sources.pkr.hcl b/packer_templates/pkr-sources.pkr.hcl index d36be65da..975a79ffe 100644 --- a/packer_templates/pkr-sources.pkr.hcl +++ b/packer_templates/pkr-sources.pkr.hcl @@ -95,7 +95,7 @@ locals { ) : var.floppy_files http_directory = var.http_directory == null ? "${path.root}/http" : var.http_directory memory = var.memory == null ? (var.is_windows ? 4096 : 2048) : var.memory - output_directory = var.output_directory == null ? "builds/packer-${var.os_name}-${var.os_version}-${var.os_arch}" : var.output_directory + output_directory = var.output_directory == null ? "${path.root}/../builds/packer-${var.os_name}-${var.os_version}-${var.os_arch}" : var.output_directory shutdown_command = var.shutdown_command == null ? ( var.is_windows ? "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"" : ( var.os_name == "freebsd" ? "echo 'vagrant' | su -m root -c 'shutdown -p now'" : "echo 'vagrant' | sudo -S /sbin/halt -h -p" From ec404d9e4e24004b8bf847b069e350334ccfbfa6 Mon Sep 17 00:00:00 2001 From: Combat Poodle <israelshirk@gmail.com> Date: Wed, 22 Mar 2023 08:10:14 -0600 Subject: [PATCH 1513/1622] Improve ARM64 Silicon OS X and Ubuntu ARM64 support for VMWare Fusion (#1494) * Improve ARM64 Silicon OS X support for VMWare Fusion running Ubuntu guests. Boots through the GRUB loader by default now, rather than failing due to disk type or PXE boot issues. Signed-off-by: Israel Shirk <israelshirk@gmail.com> * made sata default adaptor type for vmware builds Signed-off-by: Corey Hemminger <hemminger@hotmail.com> --- CHANGELOG.md | 2 ++ os_pkrvars/ubuntu/ubuntu-20.04-aarch64.pkrvars.hcl | 2 +- os_pkrvars/ubuntu/ubuntu-22.04-aarch64.pkrvars.hcl | 2 +- os_pkrvars/ubuntu/ubuntu-22.10-aarch64.pkrvars.hcl | 2 +- packer_templates/pkr-sources.pkr.hcl | 8 ++------ packer_templates/pkr-variables.pkr.hcl | 10 ++++++++-- 6 files changed, 15 insertions(+), 11 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 691abbce8..d7d005d34 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -52,6 +52,8 @@ Markdown table generated at <https://www.tablesgenerator.com/markdown_tables#> ## [unreleased] (2023-03-16) +- Updated VMware disk and cdrom adaptor type to sata for aarch64 build compatability + ## [v3.0.0] (2023-03-16) - fixed pipeline secrets issue for github api requests and secrets not working for forked repos diff --git a/os_pkrvars/ubuntu/ubuntu-20.04-aarch64.pkrvars.hcl b/os_pkrvars/ubuntu/ubuntu-20.04-aarch64.pkrvars.hcl index 3a32db59d..99acbe6c3 100644 --- a/os_pkrvars/ubuntu/ubuntu-20.04-aarch64.pkrvars.hcl +++ b/os_pkrvars/ubuntu/ubuntu-20.04-aarch64.pkrvars.hcl @@ -6,5 +6,5 @@ iso_checksum = "sha256:e42d6373dd39173094af5c26cbf2497770426f42049f8b hyperv_generation = 2 parallels_guest_os_type = "ubuntu" vbox_guest_os_type = "Ubuntu_64" -vmware_guest_os_type = "ubuntu-64" +vmware_guest_os_type = "arm-ubuntu-64" boot_command = ["<wait><esc>linux /casper/vmlinuz quiet autoinstall ds='nocloud-net;s=http://{{.HTTPIP}}:{{.HTTPPort}}/ubuntu/'<enter>initrd /casper/initrd<enter>boot<enter>"] diff --git a/os_pkrvars/ubuntu/ubuntu-22.04-aarch64.pkrvars.hcl b/os_pkrvars/ubuntu/ubuntu-22.04-aarch64.pkrvars.hcl index f540f1724..694d493b0 100644 --- a/os_pkrvars/ubuntu/ubuntu-22.04-aarch64.pkrvars.hcl +++ b/os_pkrvars/ubuntu/ubuntu-22.04-aarch64.pkrvars.hcl @@ -6,5 +6,5 @@ iso_checksum = "file:https://cdimage.ubuntu.com/releases/22.04/releas hyperv_generation = 2 parallels_guest_os_type = "ubuntu" vbox_guest_os_type = "Ubuntu_64" -vmware_guest_os_type = "ubuntu-64" +vmware_guest_os_type = "arm-ubuntu-64" boot_command = ["<wait>e<wait><down><down><down><end><wait> autoinstall ds=nocloud-net\\;s=http://{{.HTTPIP}}:{{.HTTPPort}}/ubuntu/<f10><wait>"] diff --git a/os_pkrvars/ubuntu/ubuntu-22.10-aarch64.pkrvars.hcl b/os_pkrvars/ubuntu/ubuntu-22.10-aarch64.pkrvars.hcl index c594dd1c6..eae23feff 100644 --- a/os_pkrvars/ubuntu/ubuntu-22.10-aarch64.pkrvars.hcl +++ b/os_pkrvars/ubuntu/ubuntu-22.10-aarch64.pkrvars.hcl @@ -6,5 +6,5 @@ iso_checksum = "a19d956e993a16fc6496c371e36dcc0eb85d2bdf6a8e86028b92c hyperv_generation = 2 parallels_guest_os_type = "ubuntu" vbox_guest_os_type = "Ubuntu_64" -vmware_guest_os_type = "ubuntu-64" +vmware_guest_os_type = "arm-ubuntu-64" boot_command = ["<wait>e<wait><down><down><down><end> autoinstall ds=nocloud-net\\;s=http://{{.HTTPIP}}:{{.HTTPPort}}/ubuntu/<wait><f10><wait>"] diff --git a/packer_templates/pkr-sources.pkr.hcl b/packer_templates/pkr-sources.pkr.hcl index 975a79ffe..6b1cfd264 100644 --- a/packer_templates/pkr-sources.pkr.hcl +++ b/packer_templates/pkr-sources.pkr.hcl @@ -64,11 +64,6 @@ locals { var.os_name == "amazonlinux" ? "${path.root}/amz_working_files/amazon2.ovf" : null ) : var.vbox_source - # vmware-iso - vmware_disk_adapter_type = var.vmware_disk_adapter_type == null ? ( - var.is_windows ? "lsisas1068" : null - ) : var.vmware_disk_adapter_type - # Source block common boot_wait = var.boot_wait == null ? ( var.is_windows ? "60s" : "10s" @@ -245,8 +240,9 @@ source "virtualbox-ovf" "amazonlinux" { vm_name = local.vm_name } source "vmware-iso" "vm" { + cdrom_adapter_type = var.vmware_cdrom_adapter_type + disk_adapter_type = var.vmware_disk_adapter_type guest_os_type = var.vmware_guest_os_type - disk_adapter_type = local.vmware_disk_adapter_type tools_upload_flavor = var.vmware_tools_upload_flavor tools_upload_path = var.vmware_tools_upload_path version = var.vmware_version diff --git a/packer_templates/pkr-variables.pkr.hcl b/packer_templates/pkr-variables.pkr.hcl index b21992509..666c2fc30 100644 --- a/packer_templates/pkr-variables.pkr.hcl +++ b/packer_templates/pkr-variables.pkr.hcl @@ -175,9 +175,15 @@ variable "vbox_source" { } # vmware-iso +variable "vmware_cdrom_adapter_type" { + type = string + default = "sata" + description = "CDROM adapter type. Needs to be SATA (or non-SCSI) for ARM64 builds." +} variable "vmware_disk_adapter_type" { - type = string - default = null + type = string + default = "sata" + description = "Disk adapter type. Needs to be SATA (PVSCSI, or non-SCSI) for ARM64 builds." } variable "vmware_guest_os_type" { type = string From 647d2063ba90e18378b2f263127c9f840bf31315 Mon Sep 17 00:00:00 2001 From: Claude Becker <becker@phys.ethz.ch> Date: Wed, 22 Mar 2023 15:12:52 +0100 Subject: [PATCH 1514/1622] match any kernel version in debian purge command (#1490) Signed-off-by: Claude Becker <becker@phys.ethz.ch> --- packer_templates/scripts/debian/cleanup_debian.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packer_templates/scripts/debian/cleanup_debian.sh b/packer_templates/scripts/debian/cleanup_debian.sh index c99bf448a..8a6aa48a5 100644 --- a/packer_templates/scripts/debian/cleanup_debian.sh +++ b/packer_templates/scripts/debian/cleanup_debian.sh @@ -9,7 +9,7 @@ dpkg --list \ echo "remove specific Linux kernels, such as linux-image-4.9.0-13-amd64 but keeps the current kernel and does not touch the virtual packages" dpkg --list \ | awk '{ print $2 }' \ - | grep 'linux-image-[234].*' \ + | grep 'linux-image-[1-9].*' \ | grep -v "$(uname -r)" \ | xargs apt-get -y purge; From b8eca156fc9c29a42baceb7f3c830bfb9a34a769 Mon Sep 17 00:00:00 2001 From: Corey Hemminger <hemminger@hotmail.com> Date: Tue, 28 Mar 2023 16:33:04 -0500 Subject: [PATCH 1515/1622] update aarch64 builds (#1495) * update vmware aarch64 builds vmware_os_guest_type names --- CHANGELOG.md | 5 ++++- README.md | 2 +- .../almalinux/almalinux-8-aarch64.pkrvars.hcl | 2 +- .../almalinux/almalinux-9-aarch64.pkrvars.hcl | 2 +- .../amazonlinux-2023-x86_64.pkrvars.hcl | 21 +++++++++++++++++++ .../centos/centos-7-aarch64.pkrvars.hcl | 2 +- .../centos-stream-8-aarch64.pkrvars.hcl | 2 +- .../centos-stream-9-aarch64.pkrvars.hcl | 2 +- .../debian/debian-10-aarch64.pkrvars.hcl | 2 +- .../debian/debian-11-aarch64.pkrvars.hcl | 2 +- .../fedora/fedora-36-aarch64.pkrvars.hcl | 2 +- .../fedora/fedora-37-aarch64.pkrvars.hcl | 2 +- .../oraclelinux-7-aarch64.pkrvars.hcl | 2 +- .../oraclelinux-8-aarch64.pkrvars.hcl | 2 +- .../oraclelinux-9-aarch64.pkrvars.hcl | 2 +- os_pkrvars/rhel/rhel-7-aarch64.pkrvars.hcl | 2 +- os_pkrvars/rhel/rhel-8-aarch64.pkrvars.hcl | 2 +- os_pkrvars/rhel/rhel-9-aarch64.pkrvars.hcl | 2 +- .../rockylinux-8-aarch64.pkrvars.hcl | 2 +- .../rockylinux-9-aarch64.pkrvars.hcl | 2 +- .../ubuntu/ubuntu-18.04-aarch64.pkrvars.hcl | 2 +- .../ubuntu/ubuntu-20.04-x86_64.pkrvars.hcl | 4 ++-- 22 files changed, 46 insertions(+), 22 deletions(-) create mode 100644 os_pkrvars/amazonlinux/amazonlinux-2023-x86_64.pkrvars.hcl diff --git a/CHANGELOG.md b/CHANGELOG.md index d7d005d34..b27ca1daf 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,7 +10,7 @@ Markdown table generated at <https://www.tablesgenerator.com/markdown_tables#> | almalinux-8 | | x | | x | | x | | x | | | almalinux-9 | | x | x | | | x | | x | | | amazonlinux-2 | | na | na | na | na | x | | na | na | -| amazonlinux-2022 | na | na | na | na | na | na | na | na | na | +| amazonlinux-2023 | na | na | na | na | na | na | na | na | na | | centos-7 | | x | | x | | x | | x | | | centos-stream-8 | | x | | x | | x | | x | | | centos-stream-9 | | | | | | x | | x | | @@ -53,6 +53,9 @@ Markdown table generated at <https://www.tablesgenerator.com/markdown_tables#> ## [unreleased] (2023-03-16) - Updated VMware disk and cdrom adaptor type to sata for aarch64 build compatability +- Added "arm-" to aarch64 pkrvars files vmware_guest_os_type +- Fixed readme example for bento debian build +- Added pkrvars file for amazon 2023, more work needed to build vagrant box if/when amazon releases images for providers ## [v3.0.0] (2023-03-16) diff --git a/README.md b/README.md index ca55ea341..e774f78a8 100644 --- a/README.md +++ b/README.md @@ -46,7 +46,7 @@ end To build a Debian vagrant box using the bento tool with the template available in the `os_pkrvars` dir, we can use the following command: ```bash -bento build --cpus 2 packer_templates/debian/debian-11.6-i386.json +bento build --cpus 2 os_pkrvars/debian/debian-11-x86_64.pkrvars.hcl ``` Other available options: diff --git a/os_pkrvars/almalinux/almalinux-8-aarch64.pkrvars.hcl b/os_pkrvars/almalinux/almalinux-8-aarch64.pkrvars.hcl index 235f83d83..abfd2ca06 100644 --- a/os_pkrvars/almalinux/almalinux-8-aarch64.pkrvars.hcl +++ b/os_pkrvars/almalinux/almalinux-8-aarch64.pkrvars.hcl @@ -5,5 +5,5 @@ iso_url = "https://repo.almalinux.org/almalinux/8/isos/aarch64/A iso_checksum = "file:https://repo.almalinux.org/almalinux/8/isos/aarch64/CHECKSUM" parallels_guest_os_type = "centos" vbox_guest_os_type = "RedHat_64" -vmware_guest_os_type = "centos-64" +vmware_guest_os_type = "arm-centos-64" boot_command = ["<wait><up>e<wait><down><down><end><wait> inst.text inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/rhel/8ks.cfg <leftCtrlOn>x<leftCtrlOff>"] diff --git a/os_pkrvars/almalinux/almalinux-9-aarch64.pkrvars.hcl b/os_pkrvars/almalinux/almalinux-9-aarch64.pkrvars.hcl index 9f15caaad..027385500 100644 --- a/os_pkrvars/almalinux/almalinux-9-aarch64.pkrvars.hcl +++ b/os_pkrvars/almalinux/almalinux-9-aarch64.pkrvars.hcl @@ -5,5 +5,5 @@ iso_url = "https://repo.almalinux.org/almalinux/9/isos/aarch64/A iso_checksum = "file:https://repo.almalinux.org/almalinux/9/isos/aarch64/CHECKSUM" parallels_guest_os_type = "centos" vbox_guest_os_type = "RedHat_64" -vmware_guest_os_type = "centos-64" +vmware_guest_os_type = "arm-centos-64" boot_command = ["<wait><up>e<wait><down><down><end><wait> inst.text inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/rhel/9ks.cfg <leftCtrlOn>x<leftCtrlOff>"] diff --git a/os_pkrvars/amazonlinux/amazonlinux-2023-x86_64.pkrvars.hcl b/os_pkrvars/amazonlinux/amazonlinux-2023-x86_64.pkrvars.hcl new file mode 100644 index 000000000..421326585 --- /dev/null +++ b/os_pkrvars/amazonlinux/amazonlinux-2023-x86_64.pkrvars.hcl @@ -0,0 +1,21 @@ +os_name = "amazonlinux" +os_version = "2023" +os_arch = "x86_64" +vbox_guest_os_type = "RedHat_64" +sources_enabled = [ + "source.virtualbox-ovf.amazonlinux" +] +vboxmanage = [ + [ + "modifyvm", + "{{ .Name }}", + "--memory", + "2048", + "--cpus", + "2", + "--audio", + "none", + "--nat-localhostreachable1", + "on", + ] +] diff --git a/os_pkrvars/centos/centos-7-aarch64.pkrvars.hcl b/os_pkrvars/centos/centos-7-aarch64.pkrvars.hcl index 44bbeecc6..2c4fbc7eb 100644 --- a/os_pkrvars/centos/centos-7-aarch64.pkrvars.hcl +++ b/os_pkrvars/centos/centos-7-aarch64.pkrvars.hcl @@ -5,5 +5,5 @@ iso_url = "https://quantum-mirror.hu/mirrors/pub/centos-altarch/ iso_checksum = "1bef71329e51f9bed12349aa026b3fe0c4bb27db729399a3f9addae22848da9b" parallels_guest_os_type = "centos" vbox_guest_os_type = "RedHat_64" -vmware_guest_os_type = "centos-64" +vmware_guest_os_type = "arm-centos-64" boot_command = ["<wait><up>e<wait><down><down><end><wait> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/rhel/7ks.cfg <leftCtrlOn>x<leftCtrlOff>"] diff --git a/os_pkrvars/centos/centos-stream-8-aarch64.pkrvars.hcl b/os_pkrvars/centos/centos-stream-8-aarch64.pkrvars.hcl index 6733e37c8..20fb10372 100644 --- a/os_pkrvars/centos/centos-stream-8-aarch64.pkrvars.hcl +++ b/os_pkrvars/centos/centos-stream-8-aarch64.pkrvars.hcl @@ -5,5 +5,5 @@ iso_url = "https://mirrors.edge.kernel.org/centos/8-stream/isos/ iso_checksum = "file:https://mirrors.edge.kernel.org/centos/8-stream/isos/aarch64/CHECKSUM" parallels_guest_os_type = "centos" vbox_guest_os_type = "RedHat_64" -vmware_guest_os_type = "centos-64" +vmware_guest_os_type = "arm-centos-64" boot_command = ["<wait><up>e<wait><down><down><end><wait> inst.text inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/rhel/8ks.cfg <leftCtrlOn>x<leftCtrlOff>"] diff --git a/os_pkrvars/centos/centos-stream-9-aarch64.pkrvars.hcl b/os_pkrvars/centos/centos-stream-9-aarch64.pkrvars.hcl index 7e3ed350c..9acbd0cf6 100644 --- a/os_pkrvars/centos/centos-stream-9-aarch64.pkrvars.hcl +++ b/os_pkrvars/centos/centos-stream-9-aarch64.pkrvars.hcl @@ -5,5 +5,5 @@ iso_url = "https://mirror.stream.centos.org/9-stream/BaseOS/aarc iso_checksum = "file:https://mirror.stream.centos.org/9-stream/BaseOS/aarch64/iso/CentOS-Stream-9-latest-aarch64-dvd1.iso.SHA256SUM" parallels_guest_os_type = "centos" vbox_guest_os_type = "RedHat_64" -vmware_guest_os_type = "centos-64" +vmware_guest_os_type = "arm-centos-64" boot_command = ["<wait><up>e<wait><down><down><end><wait> inst.text inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/rhel/9ks.cfg <leftCtrlOn>x<leftCtrlOff>"] diff --git a/os_pkrvars/debian/debian-10-aarch64.pkrvars.hcl b/os_pkrvars/debian/debian-10-aarch64.pkrvars.hcl index 860f4348b..d35d79132 100644 --- a/os_pkrvars/debian/debian-10-aarch64.pkrvars.hcl +++ b/os_pkrvars/debian/debian-10-aarch64.pkrvars.hcl @@ -5,5 +5,5 @@ iso_url = "https://cdimage.debian.org/cdimage/archive/10.13.0/ar iso_checksum = "5c6f6df5febf691e95c08b630db3b1c13b9c5b3d19ea4b1515207f09385e186d" parallels_guest_os_type = "debian" vbox_guest_os_type = "Debian_64" -vmware_guest_os_type = "debian-64" +vmware_guest_os_type = "arm-debian-64" boot_command = ["<wait><up>e<wait><down><down><down><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><wait>install <wait> preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/debian/preseed.cfg <wait>debian-installer=en_US.UTF-8 <wait>auto <wait>locale=en_US.UTF-8 <wait>kbd-chooser/method=us <wait>keyboard-configuration/xkb-keymap=us <wait>netcfg/get_hostname={{ .Name }} <wait>netcfg/get_domain=vagrantup.com <wait>fb=false <wait>debconf/frontend=noninteractive <wait>console-setup/ask_detect=false <wait>console-keymaps-at/keymap=us <wait>grub-installer/bootdev=/dev/sda <wait><f10><wait>"] diff --git a/os_pkrvars/debian/debian-11-aarch64.pkrvars.hcl b/os_pkrvars/debian/debian-11-aarch64.pkrvars.hcl index 8be501084..169c3d587 100644 --- a/os_pkrvars/debian/debian-11-aarch64.pkrvars.hcl +++ b/os_pkrvars/debian/debian-11-aarch64.pkrvars.hcl @@ -5,5 +5,5 @@ iso_url = "https://cdimage.debian.org/debian-cd/current/arm64/is iso_checksum = "b27ff768c10808518790d72d670c5588cdc60cf8934ef92773a89274a193a65f" parallels_guest_os_type = "debian" vbox_guest_os_type = "Debian_64" -vmware_guest_os_type = "debian-64" +vmware_guest_os_type = "arm-debian-64" boot_command = ["<wait><up>e<wait><down><down><down><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><wait>install <wait> preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/debian/preseed.cfg <wait>debian-installer=en_US.UTF-8 <wait>auto <wait>locale=en_US.UTF-8 <wait>kbd-chooser/method=us <wait>keyboard-configuration/xkb-keymap=us <wait>netcfg/get_hostname={{ .Name }} <wait>netcfg/get_domain=vagrantup.com <wait>fb=false <wait>debconf/frontend=noninteractive <wait>console-setup/ask_detect=false <wait>console-keymaps-at/keymap=us <wait>grub-installer/bootdev=/dev/sda <wait><f10><wait>"] diff --git a/os_pkrvars/fedora/fedora-36-aarch64.pkrvars.hcl b/os_pkrvars/fedora/fedora-36-aarch64.pkrvars.hcl index 86239aea4..aca29fa65 100644 --- a/os_pkrvars/fedora/fedora-36-aarch64.pkrvars.hcl +++ b/os_pkrvars/fedora/fedora-36-aarch64.pkrvars.hcl @@ -5,5 +5,5 @@ iso_url = "https://na.edge.kernel.org/fedora/releases/36/Server/ iso_checksum = "sha256:0ab4000575ff8b258576750ecf4ca39b266f0c88cab5fe3d8d2f88c9bea4830d" parallels_guest_os_type = "fedora-core" vbox_guest_os_type = "Fedora_64" -vmware_guest_os_type = "fedora-64" +vmware_guest_os_type = "arm-fedora-64" boot_command = ["<wait><up><wait>e<down><down><end> inst.text inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/fedora/ks.cfg<enter><wait><f10>"] diff --git a/os_pkrvars/fedora/fedora-37-aarch64.pkrvars.hcl b/os_pkrvars/fedora/fedora-37-aarch64.pkrvars.hcl index 86daf9c6e..1be7ae464 100644 --- a/os_pkrvars/fedora/fedora-37-aarch64.pkrvars.hcl +++ b/os_pkrvars/fedora/fedora-37-aarch64.pkrvars.hcl @@ -5,5 +5,5 @@ iso_url = "https://download.fedoraproject.org/pub/fedora/linux/r iso_checksum = "sha256:1c2deba876bd2da3a429b1b0cd5e294508b8379b299913d97dd6dd6ebcd8b56f" parallels_guest_os_type = "fedora-core" vbox_guest_os_type = "Fedora_64" -vmware_guest_os_type = "fedora-64" +vmware_guest_os_type = "arm-fedora-64" boot_command = ["<wait><up><up>e<wait><down><down><end> inst.text inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/fedora/ks.cfg<F10><wait>"] diff --git a/os_pkrvars/oraclelinux/oraclelinux-7-aarch64.pkrvars.hcl b/os_pkrvars/oraclelinux/oraclelinux-7-aarch64.pkrvars.hcl index bf32714d0..b44d97cc1 100644 --- a/os_pkrvars/oraclelinux/oraclelinux-7-aarch64.pkrvars.hcl +++ b/os_pkrvars/oraclelinux/oraclelinux-7-aarch64.pkrvars.hcl @@ -5,5 +5,5 @@ iso_url = "https://yum.oracle.com/ISOS/OracleLinux/OL7/u9/aarch6 iso_checksum = "fd2c1b1e26858576534f6e6c4cf000a15cd81bec010dad5e827b204a14a1750e" parallels_guest_os_type = "centos" vbox_guest_os_type = "RedHat_64" -vmware_guest_os_type = "centos-64" +vmware_guest_os_type = "arm-centos-64" boot_command = ["<wait><up>e<wait><down><down><end><wait> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/rhel/7ks.cfg <leftCtrlOn>x<leftCtrlOff>"] diff --git a/os_pkrvars/oraclelinux/oraclelinux-8-aarch64.pkrvars.hcl b/os_pkrvars/oraclelinux/oraclelinux-8-aarch64.pkrvars.hcl index d9085068a..a6658dffd 100644 --- a/os_pkrvars/oraclelinux/oraclelinux-8-aarch64.pkrvars.hcl +++ b/os_pkrvars/oraclelinux/oraclelinux-8-aarch64.pkrvars.hcl @@ -5,5 +5,5 @@ iso_url = "https://yum.oracle.com/ISOS/OracleLinux/OL8/u7/aarch6 iso_checksum = "420000aa561e833d8dc9576815d068fb5b15fd9fb826a0d9c127782004683741" parallels_guest_os_type = "centos" vbox_guest_os_type = "RedHat_64" -vmware_guest_os_type = "centos-64" +vmware_guest_os_type = "arm-centos-64" boot_command = ["<wait><up>e<wait><down><down><end><wait> inst.text inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/rhel/8ks.cfg <leftCtrlOn>x<leftCtrlOff>"] diff --git a/os_pkrvars/oraclelinux/oraclelinux-9-aarch64.pkrvars.hcl b/os_pkrvars/oraclelinux/oraclelinux-9-aarch64.pkrvars.hcl index 256517d79..c237b0ad3 100644 --- a/os_pkrvars/oraclelinux/oraclelinux-9-aarch64.pkrvars.hcl +++ b/os_pkrvars/oraclelinux/oraclelinux-9-aarch64.pkrvars.hcl @@ -5,5 +5,5 @@ iso_url = "https://yum.oracle.com/ISOS/OracleLinux/OL9/u1/aarch6 iso_checksum = "3dc4578f53ceb1010f8236b3356f2441ec3f9e840fa60522e470d7f3cdb86cb1" parallels_guest_os_type = "centos" vbox_guest_os_type = "RedHat_64" -vmware_guest_os_type = "centos-64" +vmware_guest_os_type = "arm-centos-64" boot_command = ["<wait><up>e<wait><down><down><end><wait> inst.text inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/rhel/9ks.cfg <leftCtrlOn>x<leftCtrlOff>"] diff --git a/os_pkrvars/rhel/rhel-7-aarch64.pkrvars.hcl b/os_pkrvars/rhel/rhel-7-aarch64.pkrvars.hcl index 8e6b4003a..a6c26ef33 100644 --- a/os_pkrvars/rhel/rhel-7-aarch64.pkrvars.hcl +++ b/os_pkrvars/rhel/rhel-7-aarch64.pkrvars.hcl @@ -5,5 +5,5 @@ iso_url = "https://www.redhat.com/en/technologies/linux-platform iso_checksum = "1b8004961150b60f6c5ec3f25139d3217eee55707cf9fa19e826919fc58e328b" parallels_guest_os_type = "rhel" vbox_guest_os_type = "RedHat_64" -vmware_guest_os_type = "centos-64" +vmware_guest_os_type = "arm-centos-64" boot_command = ["<wait><up><wait><tab> inst.text inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/rhel/7ks.cfg<enter><wait>"] diff --git a/os_pkrvars/rhel/rhel-8-aarch64.pkrvars.hcl b/os_pkrvars/rhel/rhel-8-aarch64.pkrvars.hcl index ffb0f9cef..7b381fa9e 100644 --- a/os_pkrvars/rhel/rhel-8-aarch64.pkrvars.hcl +++ b/os_pkrvars/rhel/rhel-8-aarch64.pkrvars.hcl @@ -5,5 +5,5 @@ iso_url = "https://www.redhat.com/en/technologies/linux-platform iso_checksum = "1b8004961150b60f6c5ec3f25139d3217eee55707cf9fa19e826919fc58e328b" parallels_guest_os_type = "rhel" vbox_guest_os_type = "RedHat_64" -vmware_guest_os_type = "centos-64" +vmware_guest_os_type = "arm-centos-64" boot_command = ["<wait><up><wait><tab> inst.text inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/rhel/8ks.cfg<enter><wait>"] diff --git a/os_pkrvars/rhel/rhel-9-aarch64.pkrvars.hcl b/os_pkrvars/rhel/rhel-9-aarch64.pkrvars.hcl index 83c8224ff..1759dc180 100644 --- a/os_pkrvars/rhel/rhel-9-aarch64.pkrvars.hcl +++ b/os_pkrvars/rhel/rhel-9-aarch64.pkrvars.hcl @@ -5,5 +5,5 @@ iso_url = "https://www.redhat.com/en/technologies/linux-platform iso_checksum = "1b8004961150b60f6c5ec3f25139d3217eee55707cf9fa19e826919fc58e328b" parallels_guest_os_type = "rhel" vbox_guest_os_type = "RedHat_64" -vmware_guest_os_type = "centos-64" +vmware_guest_os_type = "arm-centos-64" boot_command = ["<wait><up><wait><tab> inst.text inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/rhel/9ks.cfg<enter><wait>"] diff --git a/os_pkrvars/rockylinux/rockylinux-8-aarch64.pkrvars.hcl b/os_pkrvars/rockylinux/rockylinux-8-aarch64.pkrvars.hcl index 1220b87cc..6d440a3c9 100644 --- a/os_pkrvars/rockylinux/rockylinux-8-aarch64.pkrvars.hcl +++ b/os_pkrvars/rockylinux/rockylinux-8-aarch64.pkrvars.hcl @@ -5,5 +5,5 @@ iso_url = "https://download.rockylinux.org/pub/rocky/8/isos/aarc iso_checksum = "file:https://download.rockylinux.org/pub/rocky/8/isos/aarch64/CHECKSUM" parallels_guest_os_type = "centos" vbox_guest_os_type = "RedHat_64" -vmware_guest_os_type = "centos-64" +vmware_guest_os_type = "arm-centos-64" boot_command = ["<wait><up>e<wait><down><down><end><wait> inst.text inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/rhel/8ks.cfg <leftCtrlOn>x<leftCtrlOff>"] diff --git a/os_pkrvars/rockylinux/rockylinux-9-aarch64.pkrvars.hcl b/os_pkrvars/rockylinux/rockylinux-9-aarch64.pkrvars.hcl index 4e808920b..9fea105f1 100644 --- a/os_pkrvars/rockylinux/rockylinux-9-aarch64.pkrvars.hcl +++ b/os_pkrvars/rockylinux/rockylinux-9-aarch64.pkrvars.hcl @@ -5,5 +5,5 @@ iso_url = "https://download.rockylinux.org/pub/rocky/9/isos/aarc iso_checksum = "file:https://download.rockylinux.org/pub/rocky/9/isos/aarch64/CHECKSUM" parallels_guest_os_type = "centos" vbox_guest_os_type = "RedHat_64" -vmware_guest_os_type = "centos-64" +vmware_guest_os_type = "arm-centos-64" boot_command = ["<wait><up>e<wait><down><down><end><wait> inst.text inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/rhel/9ks.cfg <leftCtrlOn>x<leftCtrlOff>"] diff --git a/os_pkrvars/ubuntu/ubuntu-18.04-aarch64.pkrvars.hcl b/os_pkrvars/ubuntu/ubuntu-18.04-aarch64.pkrvars.hcl index a56af4daa..2dcf57325 100644 --- a/os_pkrvars/ubuntu/ubuntu-18.04-aarch64.pkrvars.hcl +++ b/os_pkrvars/ubuntu/ubuntu-18.04-aarch64.pkrvars.hcl @@ -6,5 +6,5 @@ iso_checksum = "0a20ef21181a36588f8fb670cc63e8d326fa6e715b526543d300a hyperv_generation = 2 parallels_guest_os_type = "ubuntu" vbox_guest_os_type = "Ubuntu_64" -vmware_guest_os_type = "ubuntu-64" +vmware_guest_os_type = "arm-ubuntu-64" boot_command = ["<wait>e<wait><down><down><down><end><wait>", "<bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs>", "<bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs>", "<bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs>", "<bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs>", "<bs><wait>auto console-setup/ask_detect=false", " console-setup/layoutcode=us", " console-setup/modelcode=pc105", " debconf/frontend=noninteractive", " debian-installer=en_US.UTF-8", " fb=false", " initrd=/install/initrd.gz", " kbd-chooser/method=us", " keyboard-configuration/layout=USA", " keyboard-configuration/variant=USA", " locale=en_US.UTF-8", " netcfg/get_hostname=vagrant", " grub-installer/bootdev=/dev/sda", " noapic", " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/ubuntu/preseed.cfg", " ---", "<f10><wait>"] diff --git a/os_pkrvars/ubuntu/ubuntu-20.04-x86_64.pkrvars.hcl b/os_pkrvars/ubuntu/ubuntu-20.04-x86_64.pkrvars.hcl index 3d4f0873a..10b2b581f 100644 --- a/os_pkrvars/ubuntu/ubuntu-20.04-x86_64.pkrvars.hcl +++ b/os_pkrvars/ubuntu/ubuntu-20.04-x86_64.pkrvars.hcl @@ -1,8 +1,8 @@ os_name = "ubuntu" os_version = "20.04" os_arch = "x86_64" -iso_url = "https://releases.ubuntu.com/focal/ubuntu-20.04.5-live-server-amd64.iso" -iso_checksum = "sha256:5035be37a7e9abbdc09f0d257f3e33416c1a0fb322ba860d42d74aa75c3468d4" +iso_url = "https://releases.ubuntu.com/focal/ubuntu-20.04.6-live-server-amd64.iso" +iso_checksum = "file:https://releases.ubuntu.com/focal/SHA256SUMS" hyperv_generation = 2 parallels_guest_os_type = "ubuntu" vbox_guest_os_type = "Ubuntu_64" From 5b98131aef24eb3923cfaec623ed7f110ead4fed Mon Sep 17 00:00:00 2001 From: jstaph <jstaph@users.noreply.github.com> Date: Mon, 24 Apr 2023 10:32:05 -0400 Subject: [PATCH 1516/1622] remove Fedora 36 and add Fedora 38 (#1497) * remove Fedora 36 and add Fedora 38 Signed-off-by: Jason A. Staph <jstaph@staph.us> --- .github/workflows/pkr-bld-hyperv-x64.yml | 2 +- .github/workflows/pkr-bld-parallels-arm64.yml | 2 +- .github/workflows/pkr-bld-parallels-x64.yml | 2 +- .github/workflows/pkr-bld-qemu-arm64.yml | 2 +- .github/workflows/pkr-bld-qemu-x64.yml | 2 +- .github/workflows/pkr-bld-virtualbox-arm64.yml | 2 +- .github/workflows/pkr-bld-virtualbox-x64.yml | 2 +- .github/workflows/pkr-bld-vmware-arm64.yml | 2 +- .github/workflows/pkr-bld-vmware-x64.yml | 2 +- os_pkrvars/fedora/fedora-36-aarch64.pkrvars.hcl | 9 --------- os_pkrvars/fedora/fedora-36-x86_64.pkrvars.hcl | 9 --------- os_pkrvars/fedora/fedora-38-aarch64.pkrvars.hcl | 9 +++++++++ os_pkrvars/fedora/fedora-38-x86_64.pkrvars.hcl | 9 +++++++++ 13 files changed, 27 insertions(+), 27 deletions(-) delete mode 100644 os_pkrvars/fedora/fedora-36-aarch64.pkrvars.hcl delete mode 100644 os_pkrvars/fedora/fedora-36-x86_64.pkrvars.hcl create mode 100644 os_pkrvars/fedora/fedora-38-aarch64.pkrvars.hcl create mode 100644 os_pkrvars/fedora/fedora-38-x86_64.pkrvars.hcl diff --git a/.github/workflows/pkr-bld-hyperv-x64.yml b/.github/workflows/pkr-bld-hyperv-x64.yml index 930db1e7f..dcec258ad 100644 --- a/.github/workflows/pkr-bld-hyperv-x64.yml +++ b/.github/workflows/pkr-bld-hyperv-x64.yml @@ -16,8 +16,8 @@ jobs: - centos-stream-9 - debian-10 - debian-11 - - fedora-36 - fedora-37 + - fedora-38 - freebsd-12 - freebsd-13 - opensuse-leap-15 diff --git a/.github/workflows/pkr-bld-parallels-arm64.yml b/.github/workflows/pkr-bld-parallels-arm64.yml index d1bab87db..0defd2522 100644 --- a/.github/workflows/pkr-bld-parallels-arm64.yml +++ b/.github/workflows/pkr-bld-parallels-arm64.yml @@ -16,8 +16,8 @@ jobs: - centos-stream-9 - debian-10 - debian-11 - - fedora-36 - fedora-37 + - fedora-38 - oraclelinux-7 - oraclelinux-8 - oraclelinux-9 diff --git a/.github/workflows/pkr-bld-parallels-x64.yml b/.github/workflows/pkr-bld-parallels-x64.yml index e3deb043a..466e2b539 100644 --- a/.github/workflows/pkr-bld-parallels-x64.yml +++ b/.github/workflows/pkr-bld-parallels-x64.yml @@ -16,8 +16,8 @@ jobs: - centos-stream-9 - debian-10 - debian-11 - - fedora-36 - fedora-37 + - fedora-38 - freebsd-12 - freebsd-13 - opensuse-leap-15 diff --git a/.github/workflows/pkr-bld-qemu-arm64.yml b/.github/workflows/pkr-bld-qemu-arm64.yml index 12ef2eb3c..17369edbd 100644 --- a/.github/workflows/pkr-bld-qemu-arm64.yml +++ b/.github/workflows/pkr-bld-qemu-arm64.yml @@ -16,8 +16,8 @@ jobs: - centos-stream-9 - debian-10 - debian-11 - - fedora-36 - fedora-37 + - fedora-38 - oraclelinux-7 - oraclelinux-8 - oraclelinux-9 diff --git a/.github/workflows/pkr-bld-qemu-x64.yml b/.github/workflows/pkr-bld-qemu-x64.yml index 3ae21b68a..e6c8ce6f3 100644 --- a/.github/workflows/pkr-bld-qemu-x64.yml +++ b/.github/workflows/pkr-bld-qemu-x64.yml @@ -16,8 +16,8 @@ jobs: - centos-stream-9 - debian-10 - debian-11 - - fedora-36 - fedora-37 + - fedora-38 - freebsd-12 - freebsd-13 - opensuse-leap-15 diff --git a/.github/workflows/pkr-bld-virtualbox-arm64.yml b/.github/workflows/pkr-bld-virtualbox-arm64.yml index 778ccb1a6..29ff88372 100644 --- a/.github/workflows/pkr-bld-virtualbox-arm64.yml +++ b/.github/workflows/pkr-bld-virtualbox-arm64.yml @@ -16,8 +16,8 @@ jobs: - centos-stream-9 - debian-10 - debian-11 - - fedora-36 - fedora-37 + - fedora-38 - oraclelinux-7 - oraclelinux-8 - oraclelinux-9 diff --git a/.github/workflows/pkr-bld-virtualbox-x64.yml b/.github/workflows/pkr-bld-virtualbox-x64.yml index 0fef18bfe..4256b5d07 100644 --- a/.github/workflows/pkr-bld-virtualbox-x64.yml +++ b/.github/workflows/pkr-bld-virtualbox-x64.yml @@ -16,8 +16,8 @@ jobs: - centos-stream-9 - debian-10 - debian-11 - - fedora-36 - fedora-37 + - fedora-38 - freebsd-12 - freebsd-13 - opensuse-leap-15 diff --git a/.github/workflows/pkr-bld-vmware-arm64.yml b/.github/workflows/pkr-bld-vmware-arm64.yml index 1261ec155..3d0c10ac4 100644 --- a/.github/workflows/pkr-bld-vmware-arm64.yml +++ b/.github/workflows/pkr-bld-vmware-arm64.yml @@ -16,8 +16,8 @@ jobs: - centos-stream-9 - debian-10 - debian-11 - - fedora-36 - fedora-37 + - fedora-38 - oraclelinux-7 - oraclelinux-8 - oraclelinux-9 diff --git a/.github/workflows/pkr-bld-vmware-x64.yml b/.github/workflows/pkr-bld-vmware-x64.yml index 91efd62aa..80f8e7625 100644 --- a/.github/workflows/pkr-bld-vmware-x64.yml +++ b/.github/workflows/pkr-bld-vmware-x64.yml @@ -16,8 +16,8 @@ jobs: - centos-stream-9 - debian-10 - debian-11 - - fedora-36 - fedora-37 + - fedora-38 - freebsd-12 - freebsd-13 - opensuse-leap-15 diff --git a/os_pkrvars/fedora/fedora-36-aarch64.pkrvars.hcl b/os_pkrvars/fedora/fedora-36-aarch64.pkrvars.hcl deleted file mode 100644 index aca29fa65..000000000 --- a/os_pkrvars/fedora/fedora-36-aarch64.pkrvars.hcl +++ /dev/null @@ -1,9 +0,0 @@ -os_name = "fedora" -os_version = "36" -os_arch = "aarch64" -iso_url = "https://na.edge.kernel.org/fedora/releases/36/Server/aarch64/iso/Fedora-Server-dvd-aarch64-36-1.5.iso" -iso_checksum = "sha256:0ab4000575ff8b258576750ecf4ca39b266f0c88cab5fe3d8d2f88c9bea4830d" -parallels_guest_os_type = "fedora-core" -vbox_guest_os_type = "Fedora_64" -vmware_guest_os_type = "arm-fedora-64" -boot_command = ["<wait><up><wait>e<down><down><end> inst.text inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/fedora/ks.cfg<enter><wait><f10>"] diff --git a/os_pkrvars/fedora/fedora-36-x86_64.pkrvars.hcl b/os_pkrvars/fedora/fedora-36-x86_64.pkrvars.hcl deleted file mode 100644 index 634f6a26c..000000000 --- a/os_pkrvars/fedora/fedora-36-x86_64.pkrvars.hcl +++ /dev/null @@ -1,9 +0,0 @@ -os_name = "fedora" -os_version = "36" -os_arch = "x86_64" -iso_url = "https://ftp-nyc.osuosl.org/pub/fedora/linux/releases/36/Server/x86_64/iso/Fedora-Server-dvd-x86_64-36-1.5.iso" -iso_checksum = "sha256:5edaf708a52687b09f9810c2b6d2a3432edac1b18f4d8c908c0da6bde0379148" -parallels_guest_os_type = "fedora-core" -vbox_guest_os_type = "Fedora_64" -vmware_guest_os_type = "fedora-64" -boot_command = ["<wait><up><wait><tab> inst.text inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/fedora/ks.cfg<enter><wait>"] diff --git a/os_pkrvars/fedora/fedora-38-aarch64.pkrvars.hcl b/os_pkrvars/fedora/fedora-38-aarch64.pkrvars.hcl new file mode 100644 index 000000000..fe5750727 --- /dev/null +++ b/os_pkrvars/fedora/fedora-38-aarch64.pkrvars.hcl @@ -0,0 +1,9 @@ +os_name = "fedora" +os_version = "38" +os_arch = "aarch64" +iso_url = "https://download.fedoraproject.org/pub/fedora/linux/releases/38/Server/aarch64/iso/Fedora-Server-dvd-aarch64-38-1.6.iso" +iso_checksum = "sha256:0b40485d74fc60c0a78f071396aba78fafb2f8f3b1ab4cbc3388bda82f764f9b" +parallels_guest_os_type = "fedora-core" +vbox_guest_os_type = "Fedora_64" +vmware_guest_os_type = "arm-fedora-64" +boot_command = ["<wait><up><up>e<wait><down><down><end> inst.text inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/fedora/ks.cfg<F10><wait>"] diff --git a/os_pkrvars/fedora/fedora-38-x86_64.pkrvars.hcl b/os_pkrvars/fedora/fedora-38-x86_64.pkrvars.hcl new file mode 100644 index 000000000..2ae962cb3 --- /dev/null +++ b/os_pkrvars/fedora/fedora-38-x86_64.pkrvars.hcl @@ -0,0 +1,9 @@ +os_name = "fedora" +os_version = "38" +os_arch = "x86_64" +iso_url = "https://download.fedoraproject.org/pub/fedora/linux/releases/38/Server/x86_64/iso/Fedora-Server-dvd-x86_64-38-1.6.iso" +iso_checksum = "sha256:66b52d7cb39386644cd740930b0bef0a5a2f2be569328fef6b1f9b3679fdc54d" +parallels_guest_os_type = "fedora-core" +vbox_guest_os_type = "Fedora_64" +vmware_guest_os_type = "fedora-64" +boot_command = ["<wait><up>e<wait><down><down><end> inst.text inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/fedora/ks.cfg<F10><wait>"] From f390b271084bc5c81bbd80700542ffcc9a7992d6 Mon Sep 17 00:00:00 2001 From: verschlimmbesserer <128702443+verschlimmbesserer@users.noreply.github.com> Date: Fri, 5 May 2023 20:26:50 +0200 Subject: [PATCH 1517/1622] fix issues #1499 and #1500 (#1501) Signed-off-by: verschlimmbesserer <verschlimmbesserer@users.noreply.github.com> --- packer_templates/pkr-sources.pkr.hcl | 3 +++ packer_templates/pkr-variables.pkr.hcl | 13 ++++++++++++- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/packer_templates/pkr-sources.pkr.hcl b/packer_templates/pkr-sources.pkr.hcl index 6b1cfd264..3ab89f5df 100644 --- a/packer_templates/pkr-sources.pkr.hcl +++ b/packer_templates/pkr-sources.pkr.hcl @@ -270,4 +270,7 @@ source "vmware-iso" "vm" { winrm_timeout = var.winrm_timeout winrm_username = var.winrm_username vm_name = local.vm_name + usb = var.vmware_enable_usb + network = var.vmware_network + network_adapter_type = var.vmware_network_adapter_type } diff --git a/packer_templates/pkr-variables.pkr.hcl b/packer_templates/pkr-variables.pkr.hcl index 666c2fc30..534457253 100644 --- a/packer_templates/pkr-variables.pkr.hcl +++ b/packer_templates/pkr-variables.pkr.hcl @@ -213,7 +213,18 @@ variable "vmware_vmx_remove_ethernet_interfaces" { type = bool default = true } - +variable "vmware_enable_usb" { + type = bool + default = true +} +variable "vmware_network_adapter_type" { + type = string + default = "e1000e" +} +variable "vmware_network" { + type = string + default = "nat" +} # Source block common variables variable "boot_command" { type = list(string) From b046d4934142639e606cd5b7e66895587547a959 Mon Sep 17 00:00:00 2001 From: Seth Grover <13872653+mmguero@users.noreply.github.com> Date: Mon, 8 May 2023 10:54:15 -0600 Subject: [PATCH 1518/1622] Update Debian builds from 11.6 to 11.7 (#1502) New Debian SOs and sha256 sums Signed-off-by: Seth Grover <mero.mero.guero@gmail.com> --- builds.yml | 4 ++-- os_pkrvars/debian/debian-11-aarch64.pkrvars.hcl | 6 +++--- os_pkrvars/debian/debian-11-x86_64.pkrvars.hcl | 6 +++--- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/builds.yml b/builds.yml index 80081dc89..f613bcdfd 100644 --- a/builds.yml +++ b/builds.yml @@ -8,8 +8,8 @@ public: - 'centos-stream-9' - 'debian-10.13-arm64' - 'debian-10.13' -- 'debian-11.6-arm64' -- 'debian-11.6' +- 'debian-11.7-arm64' +- 'debian-11.7' - 'fedora-36' - 'fedora-37' - 'freebsd-12.4' diff --git a/os_pkrvars/debian/debian-11-aarch64.pkrvars.hcl b/os_pkrvars/debian/debian-11-aarch64.pkrvars.hcl index 169c3d587..79194f0b3 100644 --- a/os_pkrvars/debian/debian-11-aarch64.pkrvars.hcl +++ b/os_pkrvars/debian/debian-11-aarch64.pkrvars.hcl @@ -1,8 +1,8 @@ os_name = "debian" -os_version = "11.6" +os_version = "11.7" os_arch = "aarch64" -iso_url = "https://cdimage.debian.org/debian-cd/current/arm64/iso-dvd/debian-11.6.0-arm64-DVD-1.iso" -iso_checksum = "b27ff768c10808518790d72d670c5588cdc60cf8934ef92773a89274a193a65f" +iso_url = "https://cdimage.debian.org/debian-cd/current/arm64/iso-dvd/debian-11.7.0-arm64-DVD-1.iso" +iso_checksum = "3b0d304379b671d7b7091631765f87e1cbb96b9f03f8e9a595a2bf540c789f3f" parallels_guest_os_type = "debian" vbox_guest_os_type = "Debian_64" vmware_guest_os_type = "arm-debian-64" diff --git a/os_pkrvars/debian/debian-11-x86_64.pkrvars.hcl b/os_pkrvars/debian/debian-11-x86_64.pkrvars.hcl index 495ed8828..bfd935b8c 100644 --- a/os_pkrvars/debian/debian-11-x86_64.pkrvars.hcl +++ b/os_pkrvars/debian/debian-11-x86_64.pkrvars.hcl @@ -1,8 +1,8 @@ os_name = "debian" -os_version = "11.6" +os_version = "11.7" os_arch = "x86_64" -iso_url = "https://cdimage.debian.org/debian-cd/current/amd64/iso-dvd/debian-11.6.0-amd64-DVD-1.iso" -iso_checksum = "55f6f49b32d3797621297a9481a6cc3e21b3142f57d8e1279412ff5a267868d8" +iso_url = "https://cdimage.debian.org/debian-cd/current/amd64/iso-dvd/debian-11.7.0-amd64-DVD-1.iso" +iso_checksum = "cfbb1387d92c83f49420eca06e2d11a23e5a817a21a5d614339749634709a32f" parallels_guest_os_type = "debian" vbox_guest_os_type = "Debian_64" vmware_guest_os_type = "debian-64" From 7115577e7cff59ca526e7746cce2db0fb53de758 Mon Sep 17 00:00:00 2001 From: Corey Hemminger <hemminger@hotmail.com> Date: Wed, 17 May 2023 13:45:45 -0500 Subject: [PATCH 1519/1622] Updates (#1498) * Added ubuntu 23.04 * updated vmware default vmx_data variable for arm64 support * reverted back to official vmware plugin * add ubuntu-23.04 to workflows --- .github/workflows/ci-build.yml | 9 - .github/workflows/pkr-bld-hyperv-x64.yml | 1 + .github/workflows/pkr-bld-parallels-arm64.yml | 3 + .github/workflows/pkr-bld-parallels-x64.yml | 1 + .github/workflows/pkr-bld-qemu-arm64.yml | 3 + .github/workflows/pkr-bld-qemu-x64.yml | 1 + .../workflows/pkr-bld-virtualbox-arm64.yml | 3 + .github/workflows/pkr-bld-virtualbox-x64.yml | 1 + .github/workflows/pkr-bld-vmware-arm64.yml | 3 + .github/workflows/pkr-bld-vmware-x64.yml | 1 + .gitignore | 1 + CHANGELOG.md | 24 +- bento.gemspec | 2 +- builds.yml | 85 ++++--- lib/bento/buildmetadata.rb | 7 +- lib/bento/runner.rb | 4 +- lib/bento/upload.rb | 8 +- lib/bento/version.rb | 2 +- .../debian/debian-10-aarch64.pkrvars.hcl | 2 +- .../debian/debian-10-x86_64.pkrvars.hcl | 2 +- .../debian/debian-11-aarch64.pkrvars.hcl | 2 +- .../debian/debian-11-x86_64.pkrvars.hcl | 2 +- .../freebsd/freebsd-12-aarch64.pkrvars.hcl | 9 + .../freebsd/freebsd-12-x86_64.pkrvars.hcl | 2 +- .../freebsd/freebsd-13-aarch64.pkrvars.hcl | 9 + .../freebsd/freebsd-13-x86_64.pkrvars.hcl | 8 +- ...rvars.hcl => oracle-7-aarch64.pkrvars.hcl} | 2 +- ...krvars.hcl => oracle-7-x86_64.pkrvars.hcl} | 2 +- ...rvars.hcl => oracle-8-aarch64.pkrvars.hcl} | 2 +- ...krvars.hcl => oracle-8-x86_64.pkrvars.hcl} | 2 +- ...rvars.hcl => oracle-9-aarch64.pkrvars.hcl} | 2 +- ...krvars.hcl => oracle-9-x86_64.pkrvars.hcl} | 2 +- .../ubuntu/ubuntu-23.04-aarch64.pkrvars.hcl | 10 + .../ubuntu/ubuntu-23.04-x86_64.pkrvars.hcl | 10 + packer_templates/pkr-builder.pkr.hcl | 6 +- packer_templates/pkr-sources.pkr.hcl | 224 ++++++++++-------- packer_templates/pkr-variables.pkr.hcl | 1 + 37 files changed, 284 insertions(+), 174 deletions(-) create mode 100644 os_pkrvars/freebsd/freebsd-12-aarch64.pkrvars.hcl create mode 100644 os_pkrvars/freebsd/freebsd-13-aarch64.pkrvars.hcl rename os_pkrvars/oraclelinux/{oraclelinux-7-aarch64.pkrvars.hcl => oracle-7-aarch64.pkrvars.hcl} (93%) rename os_pkrvars/oraclelinux/{oraclelinux-7-x86_64.pkrvars.hcl => oracle-7-x86_64.pkrvars.hcl} (92%) rename os_pkrvars/oraclelinux/{oraclelinux-8-aarch64.pkrvars.hcl => oracle-8-aarch64.pkrvars.hcl} (93%) rename os_pkrvars/oraclelinux/{oraclelinux-8-x86_64.pkrvars.hcl => oracle-8-x86_64.pkrvars.hcl} (92%) rename os_pkrvars/oraclelinux/{oraclelinux-9-aarch64.pkrvars.hcl => oracle-9-aarch64.pkrvars.hcl} (93%) rename os_pkrvars/oraclelinux/{oraclelinux-9-x86_64.pkrvars.hcl => oracle-9-x86_64.pkrvars.hcl} (92%) create mode 100644 os_pkrvars/ubuntu/ubuntu-23.04-aarch64.pkrvars.hcl create mode 100644 os_pkrvars/ubuntu/ubuntu-23.04-x86_64.pkrvars.hcl diff --git a/.github/workflows/ci-build.yml b/.github/workflows/ci-build.yml index ef67f8635..842a872d2 100644 --- a/.github/workflows/ci-build.yml +++ b/.github/workflows/ci-build.yml @@ -28,13 +28,6 @@ jobs: powershell-lint: uses: chef/github-workflows/.github/workflows/powershell-lint.yml@main - packer-iso-check: - uses: chef/github-workflows/.github/workflows/packer-iso-url-checker.yml@main - - packer-lint: - uses: chef/github-workflows/.github/workflows/packer-lint.yml@main - secrets: inherit - pkr-bld-amazonlinux-x64: uses: ./.github/workflows/pkr-bld-amazonlinux-x64.yml secrets: inherit @@ -84,8 +77,6 @@ jobs: - xml-lint - powershell-lint - shellcheck-lint - - packer-iso-check - - packer-lint runs-on: Ubuntu-latest steps: - name: Decide whether the needed jobs succeeded or failed diff --git a/.github/workflows/pkr-bld-hyperv-x64.yml b/.github/workflows/pkr-bld-hyperv-x64.yml index dcec258ad..87b53a489 100644 --- a/.github/workflows/pkr-bld-hyperv-x64.yml +++ b/.github/workflows/pkr-bld-hyperv-x64.yml @@ -34,6 +34,7 @@ jobs: - ubuntu-20.04 - ubuntu-22.04 - ubuntu-22.10 + - ubuntu-23.04 # - windows-10 # - windows-10gen2 # - windows-11 diff --git a/.github/workflows/pkr-bld-parallels-arm64.yml b/.github/workflows/pkr-bld-parallels-arm64.yml index 0defd2522..4cd4e3cf2 100644 --- a/.github/workflows/pkr-bld-parallels-arm64.yml +++ b/.github/workflows/pkr-bld-parallels-arm64.yml @@ -18,6 +18,8 @@ jobs: - debian-11 - fedora-37 - fedora-38 + - freebsd-12 + - freebsd-13 - oraclelinux-7 - oraclelinux-8 - oraclelinux-9 @@ -27,6 +29,7 @@ jobs: - ubuntu-20.04 - ubuntu-22.04 - ubuntu-22.10 + - ubuntu-23.04 provider: - parallels-iso steps: diff --git a/.github/workflows/pkr-bld-parallels-x64.yml b/.github/workflows/pkr-bld-parallels-x64.yml index 466e2b539..25c15e2c4 100644 --- a/.github/workflows/pkr-bld-parallels-x64.yml +++ b/.github/workflows/pkr-bld-parallels-x64.yml @@ -34,6 +34,7 @@ jobs: - ubuntu-20.04 - ubuntu-22.04 - ubuntu-22.10 + - ubuntu-23.04 # - windows-10 # - windows-11 # - windows-2012r2 diff --git a/.github/workflows/pkr-bld-qemu-arm64.yml b/.github/workflows/pkr-bld-qemu-arm64.yml index 17369edbd..c208295ba 100644 --- a/.github/workflows/pkr-bld-qemu-arm64.yml +++ b/.github/workflows/pkr-bld-qemu-arm64.yml @@ -18,6 +18,8 @@ jobs: - debian-11 - fedora-37 - fedora-38 + - freebsd-12 + - freebsd-13 - oraclelinux-7 - oraclelinux-8 - oraclelinux-9 @@ -27,6 +29,7 @@ jobs: - ubuntu-20.04 - ubuntu-22.04 - ubuntu-22.10 + - ubuntu-23.04 provider: - qemu steps: diff --git a/.github/workflows/pkr-bld-qemu-x64.yml b/.github/workflows/pkr-bld-qemu-x64.yml index e6c8ce6f3..8a1d0fcf4 100644 --- a/.github/workflows/pkr-bld-qemu-x64.yml +++ b/.github/workflows/pkr-bld-qemu-x64.yml @@ -34,6 +34,7 @@ jobs: - ubuntu-20.04 - ubuntu-22.04 - ubuntu-22.10 + - ubuntu-23.04 # - windows-10 # - windows-11 # - windows-2012r2 diff --git a/.github/workflows/pkr-bld-virtualbox-arm64.yml b/.github/workflows/pkr-bld-virtualbox-arm64.yml index 29ff88372..e07092212 100644 --- a/.github/workflows/pkr-bld-virtualbox-arm64.yml +++ b/.github/workflows/pkr-bld-virtualbox-arm64.yml @@ -18,6 +18,8 @@ jobs: - debian-11 - fedora-37 - fedora-38 + - freebsd-12 + - freebsd-13 - oraclelinux-7 - oraclelinux-8 - oraclelinux-9 @@ -27,6 +29,7 @@ jobs: - ubuntu-20.04 - ubuntu-22.04 - ubuntu-22.10 + - ubuntu-23.04 provider: - virtualbox-iso steps: diff --git a/.github/workflows/pkr-bld-virtualbox-x64.yml b/.github/workflows/pkr-bld-virtualbox-x64.yml index 4256b5d07..65afc1e86 100644 --- a/.github/workflows/pkr-bld-virtualbox-x64.yml +++ b/.github/workflows/pkr-bld-virtualbox-x64.yml @@ -34,6 +34,7 @@ jobs: - ubuntu-20.04 - ubuntu-22.04 - ubuntu-22.10 + - ubuntu-23.04 # - windows-10 # - windows-11 # - windows-2012r2 diff --git a/.github/workflows/pkr-bld-vmware-arm64.yml b/.github/workflows/pkr-bld-vmware-arm64.yml index 3d0c10ac4..094b69a3a 100644 --- a/.github/workflows/pkr-bld-vmware-arm64.yml +++ b/.github/workflows/pkr-bld-vmware-arm64.yml @@ -18,6 +18,8 @@ jobs: - debian-11 - fedora-37 - fedora-38 + - freebsd-12 + - freebsd-13 - oraclelinux-7 - oraclelinux-8 - oraclelinux-9 @@ -27,6 +29,7 @@ jobs: - ubuntu-20.04 - ubuntu-22.04 - ubuntu-22.10 + - ubuntu-23.04 provider: - vmware-iso steps: diff --git a/.github/workflows/pkr-bld-vmware-x64.yml b/.github/workflows/pkr-bld-vmware-x64.yml index 80f8e7625..47f2f8dd0 100644 --- a/.github/workflows/pkr-bld-vmware-x64.yml +++ b/.github/workflows/pkr-bld-vmware-x64.yml @@ -34,6 +34,7 @@ jobs: - ubuntu-20.04 - ubuntu-22.04 - ubuntu-22.10 + - ubuntu-23.04 # - windows-10 # - windows-11 # - windows-2012r2 diff --git a/.gitignore b/.gitignore index f357397f4..175b1f75c 100644 --- a/.gitignore +++ b/.gitignore @@ -19,3 +19,4 @@ Berksfile.lock .kitchen.yml kitchen.yml *.metadata.json +bento-*.gem diff --git a/CHANGELOG.md b/CHANGELOG.md index b27ca1daf..25bf51e21 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -16,8 +16,8 @@ Markdown table generated at <https://www.tablesgenerator.com/markdown_tables#> | centos-stream-9 | | | | | | x | | x | | | debian-10 | | | x | | | x | | x | | | debian-11 | | x | x | | | x | | x | | -| fedora-36 | | x | x | x | | x | | x | | | fedora-37 | | x | x | x | | x | | x | | +| fedora-38 | | x | | x | | x | | x | | | freebsd-12 | | | na | | na | x | na | | na | | freebsd-13 | | | na | | na | x | na | | na | | opensuse-leap-15 | | | na | x | na | | na | x | na | @@ -50,12 +50,32 @@ Markdown table generated at <https://www.tablesgenerator.com/markdown_tables#> | windows-2019 | x | x | na | | na | x | na | | na | | windows-2022 | x | x | na | | na | x | na | | na | -## [unreleased] (2023-03-16) +### Todo + +- Fix failing builds +- Finish removal of deprecated chef-solo provider to powershell provider for windows +- migrate from http directory for hosting files to cd_files in source templates + - This makes all builds compatable with hyper-v gen 2 which removes floppy disk capability + - This also makes things universal for Virtualbox 6.1 to 7.x due to latter requiring extra config for guests on NAT to be able to connect to host +- Update pipelines to only run on updated pkrvars files +- Look into making all build uefi default builds +- Create CD pipeline to upload vagrant boxes after PR is merged +- Create CD pipeline to build and upload new versions of vagrant boxes once every 3 months with the latest patches + +## [unreleased] (2023-04-24) - Updated VMware disk and cdrom adaptor type to sata for aarch64 build compatability - Added "arm-" to aarch64 pkrvars files vmware_guest_os_type - Fixed readme example for bento debian build - Added pkrvars file for amazon 2023, more work needed to build vagrant box if/when amazon releases images for providers +- Removed EOL Fedora 36 build +- Added Fedora 38 build +- Added Ubuntu 23.04 x86_64 and aarch64 +- Switched vmware plugin back to official one with fusion 13 arm64 guest additions fix +- Updated Bento app to support arm64 builds and upload to vagrant +- Added Freebsd aarch64 templates +- Added new default VMware hardware configuration settings +- Update Debian 11 to 11.7 ## [v3.0.0] (2023-03-16) diff --git a/bento.gemspec b/bento.gemspec index 75a387502..4a33dd3a8 100644 --- a/bento.gemspec +++ b/bento.gemspec @@ -2,7 +2,7 @@ Gem::Specification.new do |s| s.name = 'bento' - s.version = '3.0.0' + s.version = '3.1.0' s.summary = 'Bento builds generic Vagrant boxes ' s.description = s.summary s.license = 'Apache-2.0' diff --git a/builds.yml b/builds.yml index f613bcdfd..bdd94cc7c 100644 --- a/builds.yml +++ b/builds.yml @@ -1,37 +1,32 @@ --- public: -- 'almalinux-8.7' -- 'almalinux-9.1' -- 'amazon-2' -- 'centos-7.9' -- 'centos-stream-8' -- 'centos-stream-9' -- 'debian-10.13-arm64' -- 'debian-10.13' -- 'debian-11.7-arm64' -- 'debian-11.7' -- 'fedora-36' -- 'fedora-37' -- 'freebsd-12.4' -- 'freebsd-13.1' -- 'opensuse-leap-15.4' -- 'oracle-7.9' -- 'oracle-8.7' -- 'oracle-9.1' -- 'rockylinux-8.7' -- 'rockylinux-9.1' -- 'scientific-7.9' -- 'springdalelinux-7.9' -- 'springdalelinux-8.7' -- 'springdalelinux-9.1' -- 'ubuntu-18.04' -- 'ubuntu-18.04-arm64' -- 'ubuntu-20.04' -- 'ubuntu-20.04-arm64' -- 'ubuntu-22.04' -- 'ubuntu-22.04-arm64' -- 'ubuntu-22.10' -- 'ubuntu-22.10-arm64' + - 'almalinux-8' + - 'almalinux-9' + - 'amazon-2' + - 'centos-7' + - 'centos-stream-8' + - 'centos-stream-9' + - 'debian-10' + - 'debian-11' + - 'fedora-37' + - 'fedora-38' + - 'freebsd-12' + - 'freebsd-13' + - 'opensuse-leap-15' + - 'oracle-7' + - 'oracle-8' + - 'oracle-9' + - 'rockylinux-8' + - 'rockylinux-9' + - 'scientific-7' + - 'springdalelinux-7' + - 'springdalelinux-8' + - 'springdalelinux-9' + - 'ubuntu-18.04' + - 'ubuntu-20.04' + - 'ubuntu-22.04' + - 'ubuntu-22.10' + - 'ubuntu-23.04' # slug box name: text string from standard box name to match (generally the same) slugs: @@ -43,7 +38,7 @@ slugs: 'centos-stream-9': 'centos-stream-9' 'debian-11': 'debian-11' 'debian-10': 'debian-10' - 'fedora-latest': 'fedora-37' + 'fedora-latest': 'fedora-38' 'freebsd-12': 'freebsd-12' 'freebsd-13': 'freebsd-13' 'opensuse-leap-15': 'opensuse-leap-15' @@ -56,6 +51,19 @@ slugs: 'springdalelinux-7': 'springdalelinux-7' 'springdalelinux-8': 'springdalelinux-8' 'springdalelinux-9': 'springdalelinux-9' + 'almalinux-8-arm64': 'almalinux-8' + 'almalinux-9-arm64': 'almalinux-9' + 'centos-7-arm64': 'centos-7' + 'centos-stream-8-arm64': 'centos-stream-8' + 'centos-stream-9-arm64': 'centos-stream-9' + 'debian-11-arm64': 'debian-11' + 'debian-10-arm64': 'debian-10' + 'fedora-latest-arm64': 'fedora-38' + 'oracle-7-arm64': 'oracle-7' + 'oracle-8-arm64': 'oracle-8' + 'oracle-9-arm64': 'oracle-9' + 'rockylinux-8-arm64': 'rockylinux-8' + 'rockylinux-9-arm64': 'rockylinux-9' do_not_build: - amazon @@ -64,3 +72,14 @@ do_not_build: - solaris - rhel - windows +# - almalinux +# - centos +# - debian +# - fedora +# - freebsd +# - opensuse-leap +# - oracle +# - rockylinux +# - scientificlinux +# - springdalelinux +# - ubuntu diff --git a/lib/bento/buildmetadata.rb b/lib/bento/buildmetadata.rb index 3b7144b21..1c7f6b8c0 100644 --- a/lib/bento/buildmetadata.rb +++ b/lib/bento/buildmetadata.rb @@ -53,7 +53,12 @@ def merged_vars end def name - merged_vars.fetch('name', template) + arch = merged_vars.fetch('arch', UNKNOWN).downcase + if arch == 'aarch64' || arch == 'arm64' + "#{merged_vars.fetch('name', template)}-arm64" + else + merged_vars.fetch('name', template) + end end def arch diff --git a/lib/bento/runner.rb b/lib/bento/runner.rb index ac91448b1..0d6637ed2 100644 --- a/lib/bento/runner.rb +++ b/lib/bento/runner.rb @@ -29,6 +29,8 @@ def initialize(opts) def start templates = config ? build_list : template_files banner('Starting build for templates:') + banner('Installing packer plugins') + shellout("packer init -upgrade #{File.dirname(templates.first)}/../../packer_templates") templates.each { |t| puts "- #{t}" } time = Benchmark.measure do templates.each { |template| build(template) } @@ -43,8 +45,6 @@ def build(file) dir = File.dirname(file) template = File.basename(file) Dir.chdir dir - banner('Installing packer plugins if needed') - system('packer init ../../packer_templates') for_packer_run_with(template) do |md_file, _var_file| cmd = packer_build_cmd(template, md_file.path) banner("[#{template}] Building: '#{cmd.join(' ')}'") diff --git a/lib/bento/upload.rb b/lib/bento/upload.rb index e6c303a2a..3437f1318 100644 --- a/lib/bento/upload.rb +++ b/lib/bento/upload.rb @@ -67,7 +67,11 @@ def upload_box(md_file) # def lookup_slug(name) builds_yml['slugs'].each_pair do |slug, match_string| - return slug if name.start_with?(match_string) && !(name.include?('i386') || name.include?('arm64')) + if name.include?('arm64') + return slug if name.start_with?(match_string) && slug.include?('arm64') + else + return slug if name.start_with?(match_string) && !slug.include?('arm64') + end end nil @@ -78,7 +82,7 @@ def box_desc(name) end def slug_desc(name) - "Vanilla #{name.tr('-', ' ').capitalize}.x Vagrant box created with Bento by Chef. This box will be updated with the latest releases of #{name.tr('-', ' ').capitalize} as they become available" + "Vanilla #{name.tr('-', ' ').capitalize} Vagrant box created with Bento by Chef. This box will be updated with the latest releases of #{name.tr('-', ' ').capitalize} as they become available" end def ver_desc(md_data) diff --git a/lib/bento/version.rb b/lib/bento/version.rb index 003a98f00..dfdcdfa2b 100644 --- a/lib/bento/version.rb +++ b/lib/bento/version.rb @@ -1,3 +1,3 @@ module Bento - VERSION = '3.0.0'.freeze + VERSION = '3.1.0'.freeze end diff --git a/os_pkrvars/debian/debian-10-aarch64.pkrvars.hcl b/os_pkrvars/debian/debian-10-aarch64.pkrvars.hcl index d35d79132..c1a92a298 100644 --- a/os_pkrvars/debian/debian-10-aarch64.pkrvars.hcl +++ b/os_pkrvars/debian/debian-10-aarch64.pkrvars.hcl @@ -2,7 +2,7 @@ os_name = "debian" os_version = "10.13" os_arch = "aarch64" iso_url = "https://cdimage.debian.org/cdimage/archive/10.13.0/arm64/iso-dvd/debian-10.13.0-arm64-DVD-1.iso" -iso_checksum = "5c6f6df5febf691e95c08b630db3b1c13b9c5b3d19ea4b1515207f09385e186d" +iso_checksum = "file:https://cdimage.debian.org/cdimage/archive/10.13.0/arm64/iso-dvd/SHA256SUMS" parallels_guest_os_type = "debian" vbox_guest_os_type = "Debian_64" vmware_guest_os_type = "arm-debian-64" diff --git a/os_pkrvars/debian/debian-10-x86_64.pkrvars.hcl b/os_pkrvars/debian/debian-10-x86_64.pkrvars.hcl index fe00bae06..d7b46b054 100644 --- a/os_pkrvars/debian/debian-10-x86_64.pkrvars.hcl +++ b/os_pkrvars/debian/debian-10-x86_64.pkrvars.hcl @@ -2,7 +2,7 @@ os_name = "debian" os_version = "10.13" os_arch = "x86_64" iso_url = "https://cdimage.debian.org/cdimage/archive/10.13.0/amd64/iso-dvd/debian-10.13.0-amd64-DVD-1.iso" -iso_checksum = "07d493c305aa5313e767181af5ef2c2b2758a4a3f57e78fb4a4fcba1dcefb198" +iso_checksum = "file:https://cdimage.debian.org/cdimage/archive/10.13.0/amd64/iso-dvd/SHA256SUMS" parallels_guest_os_type = "debian" vbox_guest_os_type = "Debian_64" vmware_guest_os_type = "debian-64" diff --git a/os_pkrvars/debian/debian-11-aarch64.pkrvars.hcl b/os_pkrvars/debian/debian-11-aarch64.pkrvars.hcl index 79194f0b3..9920c5fea 100644 --- a/os_pkrvars/debian/debian-11-aarch64.pkrvars.hcl +++ b/os_pkrvars/debian/debian-11-aarch64.pkrvars.hcl @@ -2,7 +2,7 @@ os_name = "debian" os_version = "11.7" os_arch = "aarch64" iso_url = "https://cdimage.debian.org/debian-cd/current/arm64/iso-dvd/debian-11.7.0-arm64-DVD-1.iso" -iso_checksum = "3b0d304379b671d7b7091631765f87e1cbb96b9f03f8e9a595a2bf540c789f3f" +iso_checksum = "file:https://cdimage.debian.org/debian-cd/current/arm64/iso-dvd/SHA256SUMS" parallels_guest_os_type = "debian" vbox_guest_os_type = "Debian_64" vmware_guest_os_type = "arm-debian-64" diff --git a/os_pkrvars/debian/debian-11-x86_64.pkrvars.hcl b/os_pkrvars/debian/debian-11-x86_64.pkrvars.hcl index bfd935b8c..bf7474dfb 100644 --- a/os_pkrvars/debian/debian-11-x86_64.pkrvars.hcl +++ b/os_pkrvars/debian/debian-11-x86_64.pkrvars.hcl @@ -2,7 +2,7 @@ os_name = "debian" os_version = "11.7" os_arch = "x86_64" iso_url = "https://cdimage.debian.org/debian-cd/current/amd64/iso-dvd/debian-11.7.0-amd64-DVD-1.iso" -iso_checksum = "cfbb1387d92c83f49420eca06e2d11a23e5a817a21a5d614339749634709a32f" +iso_checksum = "file:https://cdimage.debian.org/debian-cd/current/amd64/iso-dvd/SHA256SUMS" parallels_guest_os_type = "debian" vbox_guest_os_type = "Debian_64" vmware_guest_os_type = "debian-64" diff --git a/os_pkrvars/freebsd/freebsd-12-aarch64.pkrvars.hcl b/os_pkrvars/freebsd/freebsd-12-aarch64.pkrvars.hcl new file mode 100644 index 000000000..b79ee2f48 --- /dev/null +++ b/os_pkrvars/freebsd/freebsd-12-aarch64.pkrvars.hcl @@ -0,0 +1,9 @@ +os_name = "freebsd" +os_version = "12.4" +os_arch = "aarch64" +iso_url = "https://download.freebsd.org/releases/arm64/aarch64/ISO-IMAGES/12.4/FreeBSD-12.4-RELEASE-arm64-aarch64-disc1.iso" +iso_checksum = "file:https://download.freebsd.org/releases/arm64/aarch64/ISO-IMAGES/12.4/CHECKSUM.SHA256-FreeBSD-12.4-RELEASE-arm64-aarch64" +parallels_guest_os_type = "freebsd" +vbox_guest_os_type = "FreeBSD_64" +vmware_guest_os_type = "arm-freebsd-64" +boot_command = ["<wait><esc><wait>boot -s<wait><enter><wait><wait10><wait10>/bin/sh<enter><wait>mdmfs -s 100m md1 /tmp<enter><wait>mdmfs -s 100m md2 /mnt<enter><wait>dhclient -p /tmp/dhclient.em0.pid -l /tmp/dhclient.lease.em0 em0<enter><wait>fetch -o /tmp/installerconfig http://{{ .HTTPIP }}:{{ .HTTPPort }}/freebsd/installerconfig \u0026\u0026 bsdinstall script /tmp/installerconfig<enter><wait>"] diff --git a/os_pkrvars/freebsd/freebsd-12-x86_64.pkrvars.hcl b/os_pkrvars/freebsd/freebsd-12-x86_64.pkrvars.hcl index 4053f8bf1..41181b3a9 100644 --- a/os_pkrvars/freebsd/freebsd-12-x86_64.pkrvars.hcl +++ b/os_pkrvars/freebsd/freebsd-12-x86_64.pkrvars.hcl @@ -5,5 +5,5 @@ iso_url = "https://download.freebsd.org/releases/amd64/amd64/ISO iso_checksum = "606435637b76991f96df68f561badf03266f3d5452e9f72ed9b130d96b188800" parallels_guest_os_type = "freebsd" vbox_guest_os_type = "FreeBSD_64" -vmware_guest_os_type = "freedsd-64" +vmware_guest_os_type = "freebsd-64" boot_command = ["<wait><esc><wait>boot -s<wait><enter><wait><wait10><wait10>/bin/sh<enter><wait>mdmfs -s 100m md1 /tmp<enter><wait>mdmfs -s 100m md2 /mnt<enter><wait>dhclient -p /tmp/dhclient.em0.pid -l /tmp/dhclient.lease.em0 em0<enter><wait>fetch -o /tmp/installerconfig http://{{ .HTTPIP }}:{{ .HTTPPort }}/freebsd/installerconfig \u0026\u0026 bsdinstall script /tmp/installerconfig<enter><wait>"] diff --git a/os_pkrvars/freebsd/freebsd-13-aarch64.pkrvars.hcl b/os_pkrvars/freebsd/freebsd-13-aarch64.pkrvars.hcl new file mode 100644 index 000000000..6c8ec883a --- /dev/null +++ b/os_pkrvars/freebsd/freebsd-13-aarch64.pkrvars.hcl @@ -0,0 +1,9 @@ +os_name = "freebsd" +os_version = "13.2" +os_arch = "x86_64" +iso_url = "https://download.freebsd.org/releases/arm64/aarch64/ISO-IMAGES/13.2/FreeBSD-13.2-RELEASE-arm64-aarch64-disc1.iso" +iso_checksum = "file:https://download.freebsd.org/releases/arm64/aarch64/ISO-IMAGES/13.2/CHECKSUM.SHA256-FreeBSD-13.2-RELEASE-arm64-aarch64" +parallels_guest_os_type = "freebsd" +vbox_guest_os_type = "FreeBSD_64" +vmware_guest_os_type = "arm-freebsd-64" +boot_command = ["<wait><esc><wait>boot -s<wait><enter><wait><wait10><wait10>/bin/sh<enter><wait>mdmfs -s 100m md1 /tmp<enter><wait>mdmfs -s 100m md2 /mnt<enter><wait>dhclient -p /tmp/dhclient.em0.pid -l /tmp/dhclient.lease.em0 em0<enter><wait><wait5>fetch -o /tmp/installerconfig http://{{ .HTTPIP }}:{{ .HTTPPort }}/freebsd/installerconfig && bsdinstall script /tmp/installerconfig<enter><wait>"] diff --git a/os_pkrvars/freebsd/freebsd-13-x86_64.pkrvars.hcl b/os_pkrvars/freebsd/freebsd-13-x86_64.pkrvars.hcl index e7fc62048..74d59042e 100644 --- a/os_pkrvars/freebsd/freebsd-13-x86_64.pkrvars.hcl +++ b/os_pkrvars/freebsd/freebsd-13-x86_64.pkrvars.hcl @@ -1,9 +1,9 @@ os_name = "freebsd" -os_version = "13.1" +os_version = "13.2" os_arch = "x86_64" -iso_url = "https://download.freebsd.org/releases/amd64/amd64/ISO-IMAGES/13.1/FreeBSD-13.1-RELEASE-amd64-disc1.iso" -iso_checksum = "697d81653fa246b921ddfcf1d15562c55249cc727b11fa3e47f470e2cf2b6a40" +iso_url = "https://download.freebsd.org/releases/amd64/amd64/ISO-IMAGES/13.2/FreeBSD-13.2-RELEASE-amd64-disc1.iso" +iso_checksum = "file:https://download.freebsd.org/releases/amd64/amd64/ISO-IMAGES/13.2/CHECKSUM.SHA256-FreeBSD-13.2-RELEASE-amd64" parallels_guest_os_type = "freebsd" vbox_guest_os_type = "FreeBSD_64" -vmware_guest_os_type = "freedsd-64" +vmware_guest_os_type = "freebsd-64" boot_command = ["<wait><esc><wait>boot -s<wait><enter><wait><wait10><wait10>/bin/sh<enter><wait>mdmfs -s 100m md1 /tmp<enter><wait>mdmfs -s 100m md2 /mnt<enter><wait>dhclient -p /tmp/dhclient.em0.pid -l /tmp/dhclient.lease.em0 em0<enter><wait><wait5>fetch -o /tmp/installerconfig http://{{ .HTTPIP }}:{{ .HTTPPort }}/freebsd/installerconfig && bsdinstall script /tmp/installerconfig<enter><wait>"] diff --git a/os_pkrvars/oraclelinux/oraclelinux-7-aarch64.pkrvars.hcl b/os_pkrvars/oraclelinux/oracle-7-aarch64.pkrvars.hcl similarity index 93% rename from os_pkrvars/oraclelinux/oraclelinux-7-aarch64.pkrvars.hcl rename to os_pkrvars/oraclelinux/oracle-7-aarch64.pkrvars.hcl index b44d97cc1..ec6471c14 100644 --- a/os_pkrvars/oraclelinux/oraclelinux-7-aarch64.pkrvars.hcl +++ b/os_pkrvars/oraclelinux/oracle-7-aarch64.pkrvars.hcl @@ -1,4 +1,4 @@ -os_name = "oraclelinux" +os_name = "oracle" os_version = "7.9" os_arch = "aarch64" iso_url = "https://yum.oracle.com/ISOS/OracleLinux/OL7/u9/aarch64/OracleLinux-R7-U9-Server-aarch64-dvd.iso" diff --git a/os_pkrvars/oraclelinux/oraclelinux-7-x86_64.pkrvars.hcl b/os_pkrvars/oraclelinux/oracle-7-x86_64.pkrvars.hcl similarity index 92% rename from os_pkrvars/oraclelinux/oraclelinux-7-x86_64.pkrvars.hcl rename to os_pkrvars/oraclelinux/oracle-7-x86_64.pkrvars.hcl index 6bd8977ad..49a1a6f40 100644 --- a/os_pkrvars/oraclelinux/oraclelinux-7-x86_64.pkrvars.hcl +++ b/os_pkrvars/oraclelinux/oracle-7-x86_64.pkrvars.hcl @@ -1,4 +1,4 @@ -os_name = "oraclelinux" +os_name = "oracle" os_version = "7.9" os_arch = "x86_64" iso_url = "http://mirrors.dotsrc.org/oracle-linux/OL7/u9/x86_64/OracleLinux-R7-U9-Server-x86_64-dvd.iso" diff --git a/os_pkrvars/oraclelinux/oraclelinux-8-aarch64.pkrvars.hcl b/os_pkrvars/oraclelinux/oracle-8-aarch64.pkrvars.hcl similarity index 93% rename from os_pkrvars/oraclelinux/oraclelinux-8-aarch64.pkrvars.hcl rename to os_pkrvars/oraclelinux/oracle-8-aarch64.pkrvars.hcl index a6658dffd..260bfe051 100644 --- a/os_pkrvars/oraclelinux/oraclelinux-8-aarch64.pkrvars.hcl +++ b/os_pkrvars/oraclelinux/oracle-8-aarch64.pkrvars.hcl @@ -1,4 +1,4 @@ -os_name = "oraclelinux" +os_name = "oracle" os_version = "8.7" os_arch = "aarch64" iso_url = "https://yum.oracle.com/ISOS/OracleLinux/OL8/u7/aarch64/OracleLinux-R8-U7-aarch64-dvd.iso" diff --git a/os_pkrvars/oraclelinux/oraclelinux-8-x86_64.pkrvars.hcl b/os_pkrvars/oraclelinux/oracle-8-x86_64.pkrvars.hcl similarity index 92% rename from os_pkrvars/oraclelinux/oraclelinux-8-x86_64.pkrvars.hcl rename to os_pkrvars/oraclelinux/oracle-8-x86_64.pkrvars.hcl index bbfea5fff..4bf455445 100644 --- a/os_pkrvars/oraclelinux/oraclelinux-8-x86_64.pkrvars.hcl +++ b/os_pkrvars/oraclelinux/oracle-8-x86_64.pkrvars.hcl @@ -1,4 +1,4 @@ -os_name = "oraclelinux" +os_name = "oracle" os_version = "8.7" os_arch = "x86_64" iso_url = "https://yum.oracle.com/ISOS/OracleLinux/OL8/u7/x86_64/OracleLinux-R8-U7-x86_64-dvd.iso" diff --git a/os_pkrvars/oraclelinux/oraclelinux-9-aarch64.pkrvars.hcl b/os_pkrvars/oraclelinux/oracle-9-aarch64.pkrvars.hcl similarity index 93% rename from os_pkrvars/oraclelinux/oraclelinux-9-aarch64.pkrvars.hcl rename to os_pkrvars/oraclelinux/oracle-9-aarch64.pkrvars.hcl index c237b0ad3..f7e44708b 100644 --- a/os_pkrvars/oraclelinux/oraclelinux-9-aarch64.pkrvars.hcl +++ b/os_pkrvars/oraclelinux/oracle-9-aarch64.pkrvars.hcl @@ -1,4 +1,4 @@ -os_name = "oraclelinux" +os_name = "oracle" os_version = "9.1" os_arch = "aarch64" iso_url = "https://yum.oracle.com/ISOS/OracleLinux/OL9/u1/aarch64/OracleLinux-R9-U1-aarch64-dvd.iso" diff --git a/os_pkrvars/oraclelinux/oraclelinux-9-x86_64.pkrvars.hcl b/os_pkrvars/oraclelinux/oracle-9-x86_64.pkrvars.hcl similarity index 92% rename from os_pkrvars/oraclelinux/oraclelinux-9-x86_64.pkrvars.hcl rename to os_pkrvars/oraclelinux/oracle-9-x86_64.pkrvars.hcl index dd4cc14ce..483c1b5db 100644 --- a/os_pkrvars/oraclelinux/oraclelinux-9-x86_64.pkrvars.hcl +++ b/os_pkrvars/oraclelinux/oracle-9-x86_64.pkrvars.hcl @@ -1,4 +1,4 @@ -os_name = "oraclelinux" +os_name = "oracle" os_version = "9.1" os_arch = "x86_64" iso_url = "https://yum.oracle.com/ISOS/OracleLinux/OL9/u1/x86_64/OracleLinux-R9-U1-x86_64-dvd.iso" diff --git a/os_pkrvars/ubuntu/ubuntu-23.04-aarch64.pkrvars.hcl b/os_pkrvars/ubuntu/ubuntu-23.04-aarch64.pkrvars.hcl new file mode 100644 index 000000000..2fe67e0db --- /dev/null +++ b/os_pkrvars/ubuntu/ubuntu-23.04-aarch64.pkrvars.hcl @@ -0,0 +1,10 @@ +os_name = "ubuntu" +os_version = "23.04" +os_arch = "aarch64" +iso_url = "https://cdimage.ubuntu.com/releases/23.04/release/ubuntu-23.04-live-server-arm64.iso" +iso_checksum = "file:https://cdimage.ubuntu.com/releases/23.04/release/SHA256SUMS" +hyperv_generation = 2 +parallels_guest_os_type = "ubuntu" +vbox_guest_os_type = "Ubuntu_64" +vmware_guest_os_type = "arm-ubuntu-64" +boot_command = ["<wait>e<wait><down><down><down><end> autoinstall ds=nocloud-net\\;s=http://{{.HTTPIP}}:{{.HTTPPort}}/ubuntu/<wait><f10><wait>"] diff --git a/os_pkrvars/ubuntu/ubuntu-23.04-x86_64.pkrvars.hcl b/os_pkrvars/ubuntu/ubuntu-23.04-x86_64.pkrvars.hcl new file mode 100644 index 000000000..8566f175c --- /dev/null +++ b/os_pkrvars/ubuntu/ubuntu-23.04-x86_64.pkrvars.hcl @@ -0,0 +1,10 @@ +os_name = "ubuntu" +os_version = "23.04" +os_arch = "x86_64" +iso_url = "https://releases.ubuntu.com/23.04/ubuntu-23.04-live-server-amd64.iso" +iso_checksum = "file:https://releases.ubuntu.com/23.04/SHA256SUMS" +hyperv_generation = 2 +parallels_guest_os_type = "ubuntu" +vbox_guest_os_type = "Ubuntu_64" +vmware_guest_os_type = "ubuntu-64" +boot_command = ["<wait>e<wait><down><down><down><end> autoinstall ds=nocloud-net\\;s=http://{{.HTTPIP}}:{{.HTTPPort}}/ubuntu/<wait><f10><wait>"] diff --git a/packer_templates/pkr-builder.pkr.hcl b/packer_templates/pkr-builder.pkr.hcl index c586f3ada..fea149913 100644 --- a/packer_templates/pkr-builder.pkr.hcl +++ b/packer_templates/pkr-builder.pkr.hcl @@ -22,8 +22,8 @@ packer { source = "github.com/hashicorp/virtualbox" } vmware = { - version = ">= 0.0.1" - source = "github.com/stromweld/vmware" # TODO: switching to stromweld repo for fix to vmware tools for fusion 13 till official fix is in place https://github.com/hashicorp/packer-plugin-vmware/issues/109 + version = ">= 1.0.8" + source = "github.com/hashicorp/vmware" } windows-update = { version = ">= 0.14.1" @@ -125,7 +125,7 @@ locals { ] : ( "${var.os_name}-${substr(var.os_version, 0, 1)}" == "amazonlinux-2" || "${var.os_name}-${substr(var.os_version, 0, 1)}" == "centos-7" || - "${var.os_name}-${substr(var.os_version, 0, 1)}" == "oraclelinux-7" || + "${var.os_name}-${substr(var.os_version, 0, 1)}" == "oracle-7" || "${var.os_name}-${substr(var.os_version, 0, 1)}" == "rhel-7" || "${var.os_name}-${substr(var.os_version, 0, 1)}" == "scientificlinux-7" || "${var.os_name}-${substr(var.os_version, 0, 1)}" == "springdalelinux-7" ? [ diff --git a/packer_templates/pkr-sources.pkr.hcl b/packer_templates/pkr-sources.pkr.hcl index 3ab89f5df..ca1904f2b 100644 --- a/packer_templates/pkr-sources.pkr.hcl +++ b/packer_templates/pkr-sources.pkr.hcl @@ -64,6 +64,8 @@ locals { var.os_name == "amazonlinux" ? "${path.root}/amz_working_files/amazon2.ovf" : null ) : var.vbox_source + # vmware-iso + # Source block common boot_wait = var.boot_wait == null ? ( var.is_windows ? "60s" : "10s" @@ -103,68 +105,74 @@ locals { # https://www.packer.io/docs/templates/hcl_templates/blocks/source source "hyperv-iso" "vm" { + # Hyper-v specific options enable_dynamic_memory = local.hyperv_enable_dynamic_memory enable_secure_boot = local.hyperv_enable_secure_boot generation = var.hyperv_generation guest_additions_mode = var.hyperv_guest_additions_mode switch_name = var.hyperv_switch_name - boot_command = var.boot_command - boot_wait = local.boot_wait - cpus = var.cpus - communicator = local.communicator - disk_size = var.disk_size - floppy_files = local.floppy_files - headless = var.headless - http_directory = local.http_directory - iso_checksum = var.iso_checksum - iso_url = var.iso_url - memory = local.memory - output_directory = "${local.output_directory}-hyperv" - shutdown_command = local.shutdown_command - shutdown_timeout = var.shutdown_timeout - ssh_password = var.ssh_password - ssh_port = var.ssh_port - ssh_timeout = var.ssh_timeout - ssh_username = var.ssh_username - winrm_password = var.winrm_password - winrm_timeout = var.winrm_timeout - winrm_username = var.winrm_username - vm_name = local.vm_name + # Source block common options + boot_command = var.boot_command + boot_wait = local.boot_wait + cpus = var.cpus + communicator = local.communicator + disk_size = var.disk_size + floppy_files = local.floppy_files + headless = var.headless + http_directory = local.http_directory + iso_checksum = var.iso_checksum + iso_url = var.iso_url + memory = local.memory + output_directory = "${local.output_directory}-hyperv" + shutdown_command = local.shutdown_command + shutdown_timeout = var.shutdown_timeout + ssh_password = var.ssh_password + ssh_port = var.ssh_port + ssh_timeout = var.ssh_timeout + ssh_username = var.ssh_username + winrm_password = var.winrm_password + winrm_timeout = var.winrm_timeout + winrm_username = var.winrm_username + vm_name = local.vm_name } source "parallels-iso" "vm" { + # Parallels specific options guest_os_type = var.parallels_guest_os_type parallels_tools_flavor = local.parallels_tools_flavor parallels_tools_mode = local.parallels_tools_mode prlctl = local.parallels_prlctl prlctl_version_file = var.parallels_prlctl_version_file - boot_command = var.boot_command - boot_wait = local.boot_wait - cpus = var.cpus - communicator = local.communicator - disk_size = var.disk_size - floppy_files = local.floppy_files - http_directory = local.http_directory - iso_checksum = var.iso_checksum - iso_url = var.iso_url - memory = local.memory - output_directory = "${local.output_directory}-parallels" - shutdown_command = local.shutdown_command - shutdown_timeout = var.shutdown_timeout - ssh_password = var.ssh_password - ssh_port = var.ssh_port - ssh_timeout = var.ssh_timeout - ssh_username = var.ssh_username - winrm_password = var.winrm_password - winrm_timeout = var.winrm_timeout - winrm_username = var.winrm_username - vm_name = local.vm_name + # Source block common options + boot_command = var.boot_command + boot_wait = local.boot_wait + cpus = var.cpus + communicator = local.communicator + disk_size = var.disk_size + floppy_files = local.floppy_files + http_directory = local.http_directory + iso_checksum = var.iso_checksum + iso_url = var.iso_url + memory = local.memory + output_directory = "${local.output_directory}-parallels" + shutdown_command = local.shutdown_command + shutdown_timeout = var.shutdown_timeout + ssh_password = var.ssh_password + ssh_port = var.ssh_port + ssh_timeout = var.ssh_timeout + ssh_username = var.ssh_username + winrm_password = var.winrm_password + winrm_timeout = var.winrm_timeout + winrm_username = var.winrm_username + vm_name = local.vm_name } source "qemu" "vm" { - accelerator = var.qemu_accelerator - display = var.headless ? "none" : var.qemu_display - machine_type = local.qemu_machine_type - qemu_binary = local.qemu_binary - qemuargs = local.qemuargs + # QEMU specific options + accelerator = var.qemu_accelerator + display = var.headless ? "none" : var.qemu_display + machine_type = local.qemu_machine_type + qemu_binary = local.qemu_binary + qemuargs = local.qemuargs + # Source block common options boot_command = var.boot_command boot_wait = local.boot_wait cd_files = local.cd_files @@ -190,6 +198,7 @@ source "qemu" "vm" { vm_name = local.vm_name } source "virtualbox-iso" "vm" { + # Virtualbox specific options gfx_controller = local.vbox_gfx_controller gfx_vram_size = local.vbox_gfx_vram_size guest_additions_path = var.vbox_guest_additions_path @@ -200,77 +209,82 @@ source "virtualbox-iso" "vm" { iso_interface = var.vbox_iso_interface vboxmanage = var.vboxmanage virtualbox_version_file = var.virtualbox_version_file - boot_command = var.boot_command - boot_wait = local.boot_wait - cpus = var.cpus - communicator = local.communicator - disk_size = var.disk_size - floppy_files = local.floppy_files - headless = var.headless - http_directory = local.http_directory - iso_checksum = var.iso_checksum - iso_url = var.iso_url - memory = local.memory - output_directory = "${local.output_directory}-virtualbox" - shutdown_command = local.shutdown_command - shutdown_timeout = var.shutdown_timeout - ssh_password = var.ssh_password - ssh_port = var.ssh_port - ssh_timeout = var.ssh_timeout - ssh_username = var.ssh_username - winrm_password = var.winrm_password - winrm_timeout = var.winrm_timeout - winrm_username = var.winrm_username - vm_name = local.vm_name + # Source block common options + boot_command = var.boot_command + boot_wait = local.boot_wait + cpus = var.cpus + communicator = local.communicator + disk_size = var.disk_size + floppy_files = local.floppy_files + headless = var.headless + http_directory = local.http_directory + iso_checksum = var.iso_checksum + iso_url = var.iso_url + memory = local.memory + output_directory = "${local.output_directory}-virtualbox" + shutdown_command = local.shutdown_command + shutdown_timeout = var.shutdown_timeout + ssh_password = var.ssh_password + ssh_port = var.ssh_port + ssh_timeout = var.ssh_timeout + ssh_username = var.ssh_username + winrm_password = var.winrm_password + winrm_timeout = var.winrm_timeout + winrm_username = var.winrm_username + vm_name = local.vm_name } source "virtualbox-ovf" "amazonlinux" { + # Virtualbox specific options guest_additions_path = var.vbox_guest_additions_path source_path = local.vbox_source vboxmanage = var.vboxmanage virtualbox_version_file = var.virtualbox_version_file - communicator = local.communicator - headless = var.headless - output_directory = "${local.output_directory}-virtualbox-ovf" - shutdown_command = local.shutdown_command - shutdown_timeout = var.shutdown_timeout - ssh_password = var.ssh_password - ssh_port = var.ssh_port - ssh_timeout = var.ssh_timeout - ssh_username = var.ssh_username - vm_name = local.vm_name + # Source block common options + communicator = local.communicator + headless = var.headless + output_directory = "${local.output_directory}-virtualbox-ovf" + shutdown_command = local.shutdown_command + shutdown_timeout = var.shutdown_timeout + ssh_password = var.ssh_password + ssh_port = var.ssh_port + ssh_timeout = var.ssh_timeout + ssh_username = var.ssh_username + vm_name = local.vm_name } source "vmware-iso" "vm" { + # VMware specific options cdrom_adapter_type = var.vmware_cdrom_adapter_type disk_adapter_type = var.vmware_disk_adapter_type guest_os_type = var.vmware_guest_os_type + network = var.vmware_network + network_adapter_type = var.vmware_network_adapter_type tools_upload_flavor = var.vmware_tools_upload_flavor tools_upload_path = var.vmware_tools_upload_path + usb = var.vmware_enable_usb version = var.vmware_version vmx_data = var.vmware_vmx_data vmx_remove_ethernet_interfaces = var.vmware_vmx_remove_ethernet_interfaces - boot_command = var.boot_command - boot_wait = local.boot_wait - cpus = var.cpus - communicator = local.communicator - disk_size = var.disk_size - floppy_files = local.floppy_files - headless = var.headless - http_directory = local.http_directory - iso_checksum = var.iso_checksum - iso_url = var.iso_url - memory = local.memory - output_directory = "${local.output_directory}-vmware" - shutdown_command = local.shutdown_command - shutdown_timeout = var.shutdown_timeout - ssh_password = var.ssh_password - ssh_port = var.ssh_port - ssh_timeout = var.ssh_timeout - ssh_username = var.ssh_username - winrm_password = var.winrm_password - winrm_timeout = var.winrm_timeout - winrm_username = var.winrm_username - vm_name = local.vm_name - usb = var.vmware_enable_usb - network = var.vmware_network - network_adapter_type = var.vmware_network_adapter_type + # Source block common options + boot_command = var.boot_command + boot_wait = local.boot_wait + cpus = var.cpus + communicator = local.communicator + disk_size = var.disk_size + floppy_files = local.floppy_files + headless = var.headless + http_directory = local.http_directory + iso_checksum = var.iso_checksum + iso_url = var.iso_url + memory = local.memory + output_directory = "${local.output_directory}-vmware" + shutdown_command = local.shutdown_command + shutdown_timeout = var.shutdown_timeout + ssh_password = var.ssh_password + ssh_port = var.ssh_port + ssh_timeout = var.ssh_timeout + ssh_username = var.ssh_username + winrm_password = var.winrm_password + winrm_timeout = var.winrm_timeout + winrm_username = var.winrm_username + vm_name = local.vm_name } diff --git a/packer_templates/pkr-variables.pkr.hcl b/packer_templates/pkr-variables.pkr.hcl index 534457253..6de55b7f4 100644 --- a/packer_templates/pkr-variables.pkr.hcl +++ b/packer_templates/pkr-variables.pkr.hcl @@ -225,6 +225,7 @@ variable "vmware_network" { type = string default = "nat" } + # Source block common variables variable "boot_command" { type = list(string) From e3db534c3f1439b078b8d76c7379c92d3f56958e Mon Sep 17 00:00:00 2001 From: Corey Hemminger <hemminger@hotmail.com> Date: Thu, 25 May 2023 15:04:01 -0500 Subject: [PATCH 1520/1622] oracle fix (#1503) * oracle name fix to match vagrant boxes * update rhel 9 clones to 9.2 * update rhel 8 clones to 8.8 --------- Signed-off-by: Corey Hemminger <hemminger@hotmail.com> --- .github/workflows/pkr-bld-hyperv-x64.yml | 6 +++--- .github/workflows/pkr-bld-parallels-arm64.yml | 6 +++--- .github/workflows/pkr-bld-parallels-x64.yml | 6 +++--- .github/workflows/pkr-bld-qemu-arm64.yml | 6 +++--- .github/workflows/pkr-bld-qemu-x64.yml | 6 +++--- .github/workflows/pkr-bld-virtualbox-arm64.yml | 6 +++--- .github/workflows/pkr-bld-virtualbox-x64.yml | 6 +++--- .github/workflows/pkr-bld-vmware-arm64.yml | 6 +++--- .github/workflows/pkr-bld-vmware-x64.yml | 6 +++--- CHANGELOG.md | 15 ++++++++++----- .../almalinux/almalinux-8-aarch64.pkrvars.hcl | 4 ++-- .../almalinux/almalinux-8-x86_64.pkrvars.hcl | 4 ++-- .../almalinux/almalinux-9-aarch64.pkrvars.hcl | 4 ++-- .../almalinux/almalinux-9-x86_64.pkrvars.hcl | 4 ++-- .../oracle-7-aarch64.pkrvars.hcl | 0 .../oracle-7-x86_64.pkrvars.hcl | 0 .../oracle-8-aarch64.pkrvars.hcl | 6 +++--- .../oracle-8-x86_64.pkrvars.hcl | 6 +++--- .../oracle-9-aarch64.pkrvars.hcl | 6 +++--- .../oracle-9-x86_64.pkrvars.hcl | 6 +++--- os_pkrvars/rhel/rhel-8-aarch64.pkrvars.hcl | 4 ++-- os_pkrvars/rhel/rhel-8-x86_64.pkrvars.hcl | 4 ++-- os_pkrvars/rhel/rhel-9-aarch64.pkrvars.hcl | 4 ++-- os_pkrvars/rhel/rhel-9-x86_64.pkrvars.hcl | 4 ++-- .../rockylinux/rockylinux-8-aarch64.pkrvars.hcl | 4 ++-- .../rockylinux/rockylinux-8-x86_64.pkrvars.hcl | 6 +++--- .../rockylinux/rockylinux-9-aarch64.pkrvars.hcl | 4 ++-- .../rockylinux/rockylinux-9-x86_64.pkrvars.hcl | 6 +++--- 28 files changed, 75 insertions(+), 70 deletions(-) rename os_pkrvars/{oraclelinux => oracle}/oracle-7-aarch64.pkrvars.hcl (100%) rename os_pkrvars/{oraclelinux => oracle}/oracle-7-x86_64.pkrvars.hcl (100%) rename os_pkrvars/{oraclelinux => oracle}/oracle-8-aarch64.pkrvars.hcl (70%) rename os_pkrvars/{oraclelinux => oracle}/oracle-8-x86_64.pkrvars.hcl (68%) rename os_pkrvars/{oraclelinux => oracle}/oracle-9-aarch64.pkrvars.hcl (70%) rename os_pkrvars/{oraclelinux => oracle}/oracle-9-x86_64.pkrvars.hcl (68%) diff --git a/.github/workflows/pkr-bld-hyperv-x64.yml b/.github/workflows/pkr-bld-hyperv-x64.yml index 87b53a489..4cd44ef3f 100644 --- a/.github/workflows/pkr-bld-hyperv-x64.yml +++ b/.github/workflows/pkr-bld-hyperv-x64.yml @@ -21,9 +21,9 @@ jobs: - freebsd-12 - freebsd-13 - opensuse-leap-15 - - oraclelinux-7 - - oraclelinux-8 - - oraclelinux-9 + - oracle-7 + - oracle-8 + - oracle-9 - rockylinux-8 - rockylinux-9 - scientificlinux-7 diff --git a/.github/workflows/pkr-bld-parallels-arm64.yml b/.github/workflows/pkr-bld-parallels-arm64.yml index 4cd4e3cf2..302752bbb 100644 --- a/.github/workflows/pkr-bld-parallels-arm64.yml +++ b/.github/workflows/pkr-bld-parallels-arm64.yml @@ -20,9 +20,9 @@ jobs: - fedora-38 - freebsd-12 - freebsd-13 - - oraclelinux-7 - - oraclelinux-8 - - oraclelinux-9 + - oracle-7 + - oracle-8 + - oracle-9 - rockylinux-8 - rockylinux-9 - ubuntu-18.04 diff --git a/.github/workflows/pkr-bld-parallels-x64.yml b/.github/workflows/pkr-bld-parallels-x64.yml index 25c15e2c4..9efcda481 100644 --- a/.github/workflows/pkr-bld-parallels-x64.yml +++ b/.github/workflows/pkr-bld-parallels-x64.yml @@ -21,9 +21,9 @@ jobs: - freebsd-12 - freebsd-13 - opensuse-leap-15 - - oraclelinux-7 - - oraclelinux-8 - - oraclelinux-9 + - oracle-7 + - oracle-8 + - oracle-9 - rockylinux-8 - rockylinux-9 - scientificlinux-7 diff --git a/.github/workflows/pkr-bld-qemu-arm64.yml b/.github/workflows/pkr-bld-qemu-arm64.yml index c208295ba..21df30bfe 100644 --- a/.github/workflows/pkr-bld-qemu-arm64.yml +++ b/.github/workflows/pkr-bld-qemu-arm64.yml @@ -20,9 +20,9 @@ jobs: - fedora-38 - freebsd-12 - freebsd-13 - - oraclelinux-7 - - oraclelinux-8 - - oraclelinux-9 + - oracle-7 + - oracle-8 + - oracle-9 - rockylinux-8 - rockylinux-9 - ubuntu-18.04 diff --git a/.github/workflows/pkr-bld-qemu-x64.yml b/.github/workflows/pkr-bld-qemu-x64.yml index 8a1d0fcf4..262a8bca1 100644 --- a/.github/workflows/pkr-bld-qemu-x64.yml +++ b/.github/workflows/pkr-bld-qemu-x64.yml @@ -21,9 +21,9 @@ jobs: - freebsd-12 - freebsd-13 - opensuse-leap-15 - - oraclelinux-7 - - oraclelinux-8 - - oraclelinux-9 + - oracle-7 + - oracle-8 + - oracle-9 - rockylinux-8 - rockylinux-9 - scientificlinux-7 diff --git a/.github/workflows/pkr-bld-virtualbox-arm64.yml b/.github/workflows/pkr-bld-virtualbox-arm64.yml index e07092212..7275e2329 100644 --- a/.github/workflows/pkr-bld-virtualbox-arm64.yml +++ b/.github/workflows/pkr-bld-virtualbox-arm64.yml @@ -20,9 +20,9 @@ jobs: - fedora-38 - freebsd-12 - freebsd-13 - - oraclelinux-7 - - oraclelinux-8 - - oraclelinux-9 + - oracle-7 + - oracle-8 + - oracle-9 - rockylinux-8 - rockylinux-9 - ubuntu-18.04 diff --git a/.github/workflows/pkr-bld-virtualbox-x64.yml b/.github/workflows/pkr-bld-virtualbox-x64.yml index 65afc1e86..97056d46a 100644 --- a/.github/workflows/pkr-bld-virtualbox-x64.yml +++ b/.github/workflows/pkr-bld-virtualbox-x64.yml @@ -21,9 +21,9 @@ jobs: - freebsd-12 - freebsd-13 - opensuse-leap-15 - - oraclelinux-7 - - oraclelinux-8 - - oraclelinux-9 + - oracle-7 + - oracle-8 + - oracle-9 - rockylinux-8 - rockylinux-9 - scientificlinux-7 diff --git a/.github/workflows/pkr-bld-vmware-arm64.yml b/.github/workflows/pkr-bld-vmware-arm64.yml index 094b69a3a..da57c00b3 100644 --- a/.github/workflows/pkr-bld-vmware-arm64.yml +++ b/.github/workflows/pkr-bld-vmware-arm64.yml @@ -20,9 +20,9 @@ jobs: - fedora-38 - freebsd-12 - freebsd-13 - - oraclelinux-7 - - oraclelinux-8 - - oraclelinux-9 + - oracle-7 + - oracle-8 + - oracle-9 - rockylinux-8 - rockylinux-9 - ubuntu-18.04 diff --git a/.github/workflows/pkr-bld-vmware-x64.yml b/.github/workflows/pkr-bld-vmware-x64.yml index 47f2f8dd0..c00bbb0e2 100644 --- a/.github/workflows/pkr-bld-vmware-x64.yml +++ b/.github/workflows/pkr-bld-vmware-x64.yml @@ -21,9 +21,9 @@ jobs: - freebsd-12 - freebsd-13 - opensuse-leap-15 - - oraclelinux-7 - - oraclelinux-8 - - oraclelinux-9 + - oracle-7 + - oracle-8 + - oracle-9 - rockylinux-8 - rockylinux-9 - scientificlinux-7 diff --git a/CHANGELOG.md b/CHANGELOG.md index 25bf51e21..4c7022060 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -21,9 +21,9 @@ Markdown table generated at <https://www.tablesgenerator.com/markdown_tables#> | freebsd-12 | | | na | | na | x | na | | na | | freebsd-13 | | | na | | na | x | na | | na | | opensuse-leap-15 | | | na | x | na | | na | x | na | -| oraclelinux-7 | | x | | x | | x | | x | | -| oraclelinux-8 | | | | x | | x | | x | | -| oraclelinux-9 | | x | x | | | x | | x | | +| oracle-7 | | x | | x | | x | | x | | +| oracle-8 | | | | x | | x | | x | | +| oracle-9 | | x | x | | | x | | x | | | rhel-7 | | | | | | | | | | | rhel-8 | | | | | | | | | | | rhel-9 | | | | | | | | | | @@ -55,14 +55,19 @@ Markdown table generated at <https://www.tablesgenerator.com/markdown_tables#> - Fix failing builds - Finish removal of deprecated chef-solo provider to powershell provider for windows - migrate from http directory for hosting files to cd_files in source templates - - This makes all builds compatable with hyper-v gen 2 which removes floppy disk capability + - This makes all builds compatible with hyper-v gen 2 which removes floppy disk capability - This also makes things universal for Virtualbox 6.1 to 7.x due to latter requiring extra config for guests on NAT to be able to connect to host - Update pipelines to only run on updated pkrvars files - Look into making all build uefi default builds - Create CD pipeline to upload vagrant boxes after PR is merged - Create CD pipeline to build and upload new versions of vagrant boxes once every 3 months with the latest patches -## [unreleased] (2023-04-24) +## [unreleased] (2023-05-17) + +- Update RHEL 9 clones to 9.2 +- Update RHEL 8 clones to 8.8 + +## [v3.1.0] (2023-05-17) - Updated VMware disk and cdrom adaptor type to sata for aarch64 build compatability - Added "arm-" to aarch64 pkrvars files vmware_guest_os_type diff --git a/os_pkrvars/almalinux/almalinux-8-aarch64.pkrvars.hcl b/os_pkrvars/almalinux/almalinux-8-aarch64.pkrvars.hcl index abfd2ca06..1e576d376 100644 --- a/os_pkrvars/almalinux/almalinux-8-aarch64.pkrvars.hcl +++ b/os_pkrvars/almalinux/almalinux-8-aarch64.pkrvars.hcl @@ -1,7 +1,7 @@ os_name = "almalinux" -os_version = "8.7" +os_version = "8.8" os_arch = "aarch64" -iso_url = "https://repo.almalinux.org/almalinux/8/isos/aarch64/AlmaLinux-8.7-update-1-aarch64-minimal.iso" +iso_url = "https://repo.almalinux.org/almalinux/8/isos/aarch64/AlmaLinux-8.8-aarch64-minimal.iso" iso_checksum = "file:https://repo.almalinux.org/almalinux/8/isos/aarch64/CHECKSUM" parallels_guest_os_type = "centos" vbox_guest_os_type = "RedHat_64" diff --git a/os_pkrvars/almalinux/almalinux-8-x86_64.pkrvars.hcl b/os_pkrvars/almalinux/almalinux-8-x86_64.pkrvars.hcl index 4063af098..3ca1bb569 100644 --- a/os_pkrvars/almalinux/almalinux-8-x86_64.pkrvars.hcl +++ b/os_pkrvars/almalinux/almalinux-8-x86_64.pkrvars.hcl @@ -1,7 +1,7 @@ os_name = "almalinux" -os_version = "8.7" +os_version = "8.8" os_arch = "x86_64" -iso_url = "https://repo.almalinux.org/almalinux/8/isos/x86_64/AlmaLinux-8.7-update-1-x86_64-minimal.iso" +iso_url = "https://repo.almalinux.org/almalinux/8/isos/x86_64/AlmaLinux-8.8-x86_64-minimal.iso" iso_checksum = "file:https://repo.almalinux.org/almalinux/8/isos/x86_64/CHECKSUM" parallels_guest_os_type = "centos" vbox_guest_os_type = "RedHat_64" diff --git a/os_pkrvars/almalinux/almalinux-9-aarch64.pkrvars.hcl b/os_pkrvars/almalinux/almalinux-9-aarch64.pkrvars.hcl index 027385500..1de0f08a7 100644 --- a/os_pkrvars/almalinux/almalinux-9-aarch64.pkrvars.hcl +++ b/os_pkrvars/almalinux/almalinux-9-aarch64.pkrvars.hcl @@ -1,7 +1,7 @@ os_name = "almalinux" -os_version = "9.1" +os_version = "9.2" os_arch = "aarch64" -iso_url = "https://repo.almalinux.org/almalinux/9/isos/aarch64/AlmaLinux-9.1-aarch64-dvd.iso" +iso_url = "https://repo.almalinux.org/almalinux/9/isos/aarch64/AlmaLinux-9.2-aarch64-dvd.iso" iso_checksum = "file:https://repo.almalinux.org/almalinux/9/isos/aarch64/CHECKSUM" parallels_guest_os_type = "centos" vbox_guest_os_type = "RedHat_64" diff --git a/os_pkrvars/almalinux/almalinux-9-x86_64.pkrvars.hcl b/os_pkrvars/almalinux/almalinux-9-x86_64.pkrvars.hcl index 8430665d0..722d23ee1 100644 --- a/os_pkrvars/almalinux/almalinux-9-x86_64.pkrvars.hcl +++ b/os_pkrvars/almalinux/almalinux-9-x86_64.pkrvars.hcl @@ -1,7 +1,7 @@ os_name = "almalinux" -os_version = "9.1" +os_version = "9.2" os_arch = "x86_64" -iso_url = "https://repo.almalinux.org/almalinux/9/isos/x86_64/AlmaLinux-9.1-x86_64-dvd.iso" +iso_url = "https://repo.almalinux.org/almalinux/9/isos/x86_64/AlmaLinux-9.2-x86_64-dvd.iso" iso_checksum = "file:https://repo.almalinux.org/almalinux/9/isos/x86_64/CHECKSUM" parallels_guest_os_type = "centos" vbox_guest_os_type = "RedHat_64" diff --git a/os_pkrvars/oraclelinux/oracle-7-aarch64.pkrvars.hcl b/os_pkrvars/oracle/oracle-7-aarch64.pkrvars.hcl similarity index 100% rename from os_pkrvars/oraclelinux/oracle-7-aarch64.pkrvars.hcl rename to os_pkrvars/oracle/oracle-7-aarch64.pkrvars.hcl diff --git a/os_pkrvars/oraclelinux/oracle-7-x86_64.pkrvars.hcl b/os_pkrvars/oracle/oracle-7-x86_64.pkrvars.hcl similarity index 100% rename from os_pkrvars/oraclelinux/oracle-7-x86_64.pkrvars.hcl rename to os_pkrvars/oracle/oracle-7-x86_64.pkrvars.hcl diff --git a/os_pkrvars/oraclelinux/oracle-8-aarch64.pkrvars.hcl b/os_pkrvars/oracle/oracle-8-aarch64.pkrvars.hcl similarity index 70% rename from os_pkrvars/oraclelinux/oracle-8-aarch64.pkrvars.hcl rename to os_pkrvars/oracle/oracle-8-aarch64.pkrvars.hcl index 260bfe051..f95e9f8f7 100644 --- a/os_pkrvars/oraclelinux/oracle-8-aarch64.pkrvars.hcl +++ b/os_pkrvars/oracle/oracle-8-aarch64.pkrvars.hcl @@ -1,8 +1,8 @@ os_name = "oracle" -os_version = "8.7" +os_version = "8.8" os_arch = "aarch64" -iso_url = "https://yum.oracle.com/ISOS/OracleLinux/OL8/u7/aarch64/OracleLinux-R8-U7-aarch64-dvd.iso" -iso_checksum = "420000aa561e833d8dc9576815d068fb5b15fd9fb826a0d9c127782004683741" +iso_url = "https://yum.oracle.com/ISOS/OracleLinux/OL8/u8/aarch64/OracleLinux-R8-U8-aarch64-dvd.iso" +iso_checksum = "6fe0c274b08084787f8d82d8cf2ff7893eea91f018c1f2d0c72383588b2fd480" parallels_guest_os_type = "centos" vbox_guest_os_type = "RedHat_64" vmware_guest_os_type = "arm-centos-64" diff --git a/os_pkrvars/oraclelinux/oracle-8-x86_64.pkrvars.hcl b/os_pkrvars/oracle/oracle-8-x86_64.pkrvars.hcl similarity index 68% rename from os_pkrvars/oraclelinux/oracle-8-x86_64.pkrvars.hcl rename to os_pkrvars/oracle/oracle-8-x86_64.pkrvars.hcl index 4bf455445..3768bb278 100644 --- a/os_pkrvars/oraclelinux/oracle-8-x86_64.pkrvars.hcl +++ b/os_pkrvars/oracle/oracle-8-x86_64.pkrvars.hcl @@ -1,8 +1,8 @@ os_name = "oracle" -os_version = "8.7" +os_version = "8.8" os_arch = "x86_64" -iso_url = "https://yum.oracle.com/ISOS/OracleLinux/OL8/u7/x86_64/OracleLinux-R8-U7-x86_64-dvd.iso" -iso_checksum = "dd6ede6c0597189b7dffb800b32835002bd95f19c254734aeb58f58651aa03fb" +iso_url = "https://yum.oracle.com/ISOS/OracleLinux/OL8/u8/x86_64/OracleLinux-R8-U8-x86_64-dvd.iso" +iso_checksum = "cae39116245ff7c3c86d5305d9c11430ce5c4e512987563435ac59c37a082d7e" parallels_guest_os_type = "centos" vbox_guest_os_type = "RedHat_64" vmware_guest_os_type = "centos-64" diff --git a/os_pkrvars/oraclelinux/oracle-9-aarch64.pkrvars.hcl b/os_pkrvars/oracle/oracle-9-aarch64.pkrvars.hcl similarity index 70% rename from os_pkrvars/oraclelinux/oracle-9-aarch64.pkrvars.hcl rename to os_pkrvars/oracle/oracle-9-aarch64.pkrvars.hcl index f7e44708b..606a8d3cf 100644 --- a/os_pkrvars/oraclelinux/oracle-9-aarch64.pkrvars.hcl +++ b/os_pkrvars/oracle/oracle-9-aarch64.pkrvars.hcl @@ -1,8 +1,8 @@ os_name = "oracle" -os_version = "9.1" +os_version = "9.2" os_arch = "aarch64" -iso_url = "https://yum.oracle.com/ISOS/OracleLinux/OL9/u1/aarch64/OracleLinux-R9-U1-aarch64-dvd.iso" -iso_checksum = "3dc4578f53ceb1010f8236b3356f2441ec3f9e840fa60522e470d7f3cdb86cb1" +iso_url = "https://yum.oracle.com/ISOS/OracleLinux/OL9/u2/aarch64/OracleLinux-R9-U2-aarch64-dvd.iso" +iso_checksum = "412f1a5e90d11313735a2a98a977f82d0d09642e3ab14a03da36d4e2b0b0d275" parallels_guest_os_type = "centos" vbox_guest_os_type = "RedHat_64" vmware_guest_os_type = "arm-centos-64" diff --git a/os_pkrvars/oraclelinux/oracle-9-x86_64.pkrvars.hcl b/os_pkrvars/oracle/oracle-9-x86_64.pkrvars.hcl similarity index 68% rename from os_pkrvars/oraclelinux/oracle-9-x86_64.pkrvars.hcl rename to os_pkrvars/oracle/oracle-9-x86_64.pkrvars.hcl index 483c1b5db..9bb6e5078 100644 --- a/os_pkrvars/oraclelinux/oracle-9-x86_64.pkrvars.hcl +++ b/os_pkrvars/oracle/oracle-9-x86_64.pkrvars.hcl @@ -1,8 +1,8 @@ os_name = "oracle" -os_version = "9.1" +os_version = "9.2" os_arch = "x86_64" -iso_url = "https://yum.oracle.com/ISOS/OracleLinux/OL9/u1/x86_64/OracleLinux-R9-U1-x86_64-dvd.iso" -iso_checksum = "a46ac0b717881a2673c7dc981b3219f6dea747e3d6bd18908fcb8c1f42b82786" +iso_url = "https://yum.oracle.com/ISOS/OracleLinux/OL9/u2/x86_64/OracleLinux-R9-U2-x86_64-dvd.iso" +iso_checksum = "cac3c41cc2d3467ba8902a5d74575bcf460f129634d5a0d1d67d87094dd70b09" parallels_guest_os_type = "centos" vbox_guest_os_type = "RedHat_64" vmware_guest_os_type = "centos-64" diff --git a/os_pkrvars/rhel/rhel-8-aarch64.pkrvars.hcl b/os_pkrvars/rhel/rhel-8-aarch64.pkrvars.hcl index 7b381fa9e..03b29e385 100644 --- a/os_pkrvars/rhel/rhel-8-aarch64.pkrvars.hcl +++ b/os_pkrvars/rhel/rhel-8-aarch64.pkrvars.hcl @@ -1,8 +1,8 @@ os_name = "rhel" -os_version = "8.7" +os_version = "8.8" os_arch = "aarch64" iso_url = "https://www.redhat.com/en/technologies/linux-platforms/enterprise-linux" -iso_checksum = "1b8004961150b60f6c5ec3f25139d3217eee55707cf9fa19e826919fc58e328b" +iso_checksum = "none" parallels_guest_os_type = "rhel" vbox_guest_os_type = "RedHat_64" vmware_guest_os_type = "arm-centos-64" diff --git a/os_pkrvars/rhel/rhel-8-x86_64.pkrvars.hcl b/os_pkrvars/rhel/rhel-8-x86_64.pkrvars.hcl index 54368f658..29168e5db 100644 --- a/os_pkrvars/rhel/rhel-8-x86_64.pkrvars.hcl +++ b/os_pkrvars/rhel/rhel-8-x86_64.pkrvars.hcl @@ -1,8 +1,8 @@ os_name = "rhel" -os_version = "8.7" +os_version = "8.8" os_arch = "x86_64" iso_url = "https://www.redhat.com/en/technologies/linux-platforms/enterprise-linux" -iso_checksum = "1b8004961150b60f6c5ec3f25139d3217eee55707cf9fa19e826919fc58e328b" +iso_checksum = "none" parallels_guest_os_type = "rhel" vbox_guest_os_type = "RedHat_64" vmware_guest_os_type = "centos-64" diff --git a/os_pkrvars/rhel/rhel-9-aarch64.pkrvars.hcl b/os_pkrvars/rhel/rhel-9-aarch64.pkrvars.hcl index 1759dc180..7223a554a 100644 --- a/os_pkrvars/rhel/rhel-9-aarch64.pkrvars.hcl +++ b/os_pkrvars/rhel/rhel-9-aarch64.pkrvars.hcl @@ -1,8 +1,8 @@ os_name = "rhel" -os_version = "9.1" +os_version = "9.2" os_arch = "aarch64" iso_url = "https://www.redhat.com/en/technologies/linux-platforms/enterprise-linux" -iso_checksum = "1b8004961150b60f6c5ec3f25139d3217eee55707cf9fa19e826919fc58e328b" +iso_checksum = "none" parallels_guest_os_type = "rhel" vbox_guest_os_type = "RedHat_64" vmware_guest_os_type = "arm-centos-64" diff --git a/os_pkrvars/rhel/rhel-9-x86_64.pkrvars.hcl b/os_pkrvars/rhel/rhel-9-x86_64.pkrvars.hcl index efda20597..434e0c5f8 100644 --- a/os_pkrvars/rhel/rhel-9-x86_64.pkrvars.hcl +++ b/os_pkrvars/rhel/rhel-9-x86_64.pkrvars.hcl @@ -1,8 +1,8 @@ os_name = "rhel" -os_version = "9.1" +os_version = "9.2" os_arch = "x86_64" iso_url = "https://www.redhat.com/en/technologies/linux-platforms/enterprise-linux" -iso_checksum = "1b8004961150b60f6c5ec3f25139d3217eee55707cf9fa19e826919fc58e328b" +iso_checksum = "none" parallels_guest_os_type = "rhel" vbox_guest_os_type = "RedHat_64" vmware_guest_os_type = "centos-64" diff --git a/os_pkrvars/rockylinux/rockylinux-8-aarch64.pkrvars.hcl b/os_pkrvars/rockylinux/rockylinux-8-aarch64.pkrvars.hcl index 6d440a3c9..5a8e84ba1 100644 --- a/os_pkrvars/rockylinux/rockylinux-8-aarch64.pkrvars.hcl +++ b/os_pkrvars/rockylinux/rockylinux-8-aarch64.pkrvars.hcl @@ -1,7 +1,7 @@ os_name = "rockylinux" -os_version = "8.7" +os_version = "8.8" os_arch = "aarch64" -iso_url = "https://download.rockylinux.org/pub/rocky/8/isos/aarch64/Rocky-aarch64-minimal.iso" +iso_url = "https://download.rockylinux.org/pub/rocky/8/isos/aarch64/Rocky-8.8-aarch64-minimal.iso" iso_checksum = "file:https://download.rockylinux.org/pub/rocky/8/isos/aarch64/CHECKSUM" parallels_guest_os_type = "centos" vbox_guest_os_type = "RedHat_64" diff --git a/os_pkrvars/rockylinux/rockylinux-8-x86_64.pkrvars.hcl b/os_pkrvars/rockylinux/rockylinux-8-x86_64.pkrvars.hcl index 5aee7c315..97dbf6978 100644 --- a/os_pkrvars/rockylinux/rockylinux-8-x86_64.pkrvars.hcl +++ b/os_pkrvars/rockylinux/rockylinux-8-x86_64.pkrvars.hcl @@ -1,8 +1,8 @@ os_name = "rockylinux" -os_version = "8.7" +os_version = "8.8" os_arch = "x86_64" -iso_url = "https://download.rockylinux.org/pub/rocky/8/isos/x86_64/Rocky-x86_64-minimal.iso" -iso_checksum = "file:https://download.rockylinux.org/pub/rocky/8.7/isos/x86_64/CHECKSUM" +iso_url = "https://download.rockylinux.org/pub/rocky/8/isos/x86_64/Rocky-8.8-x86_64-minimal.iso" +iso_checksum = "file:https://download.rockylinux.org/pub/rocky/8/isos/x86_64/CHECKSUM" parallels_guest_os_type = "centos" vbox_guest_os_type = "RedHat_64" vmware_guest_os_type = "centos-64" diff --git a/os_pkrvars/rockylinux/rockylinux-9-aarch64.pkrvars.hcl b/os_pkrvars/rockylinux/rockylinux-9-aarch64.pkrvars.hcl index 9fea105f1..e93934191 100644 --- a/os_pkrvars/rockylinux/rockylinux-9-aarch64.pkrvars.hcl +++ b/os_pkrvars/rockylinux/rockylinux-9-aarch64.pkrvars.hcl @@ -1,7 +1,7 @@ os_name = "rockylinux" -os_version = "9.1" +os_version = "9.2" os_arch = "aarch64" -iso_url = "https://download.rockylinux.org/pub/rocky/9/isos/aarch64/Rocky-aarch64-minimal.iso" +iso_url = "https://download.rockylinux.org/pub/rocky/9/isos/aarch64/Rocky-9.2-aarch64-minimal.iso" iso_checksum = "file:https://download.rockylinux.org/pub/rocky/9/isos/aarch64/CHECKSUM" parallels_guest_os_type = "centos" vbox_guest_os_type = "RedHat_64" diff --git a/os_pkrvars/rockylinux/rockylinux-9-x86_64.pkrvars.hcl b/os_pkrvars/rockylinux/rockylinux-9-x86_64.pkrvars.hcl index 2644ead37..c2080690f 100644 --- a/os_pkrvars/rockylinux/rockylinux-9-x86_64.pkrvars.hcl +++ b/os_pkrvars/rockylinux/rockylinux-9-x86_64.pkrvars.hcl @@ -1,8 +1,8 @@ os_name = "rockylinux" -os_version = "9.1" +os_version = "9.2" os_arch = "x86_64" -iso_url = "https://download.rockylinux.org/pub/rocky/9.1/isos/x86_64/Rocky-9.1-x86_64-dvd.iso" -iso_checksum = "file:https://download.rockylinux.org/pub/rocky/9.1/isos/x86_64/CHECKSUM" +iso_url = "https://download.rockylinux.org/pub/rocky/9/isos/x86_64/Rocky-9.2-x86_64-dvd.iso" +iso_checksum = "file:https://download.rockylinux.org/pub/rocky/9/isos/x86_64/CHECKSUM" parallels_guest_os_type = "centos" vbox_guest_os_type = "RedHat_64" vmware_guest_os_type = "centos-64" From d5b085aea85f4e9feefdc67f09d45c010a9172e2 Mon Sep 17 00:00:00 2001 From: Seth Grover <13872653+mmguero@users.noreply.github.com> Date: Tue, 13 Jun 2023 07:26:22 -0600 Subject: [PATCH 1521/1622] added Debian 12 (#1507) * added Debian 12. * added github.com/hashicorp/chef to the plugins list to avoid provisioner error (see comment by @Stromweld in chef/bento#1507) Signed-off-by: SG <mero.mero.guero@gmail.com> --- .github/workflows/pkr-bld-hyperv-x64.yml | 1 + .github/workflows/pkr-bld-parallels-arm64.yml | 1 + .github/workflows/pkr-bld-parallels-x64.yml | 1 + .github/workflows/pkr-bld-qemu-arm64.yml | 1 + .github/workflows/pkr-bld-qemu-x64.yml | 1 + .github/workflows/pkr-bld-virtualbox-arm64.yml | 1 + .github/workflows/pkr-bld-virtualbox-x64.yml | 1 + .github/workflows/pkr-bld-vmware-arm64.yml | 1 + .github/workflows/pkr-bld-vmware-x64.yml | 1 + CHANGELOG.md | 3 ++- README.md | 6 +++--- builds.yml | 3 +++ os_pkrvars/debian/debian-12-aarch64.pkrvars.hcl | 9 +++++++++ os_pkrvars/debian/debian-12-x86_64.pkrvars.hcl | 9 +++++++++ packer_templates/pkr-builder.pkr.hcl | 4 ++++ 15 files changed, 39 insertions(+), 4 deletions(-) create mode 100644 os_pkrvars/debian/debian-12-aarch64.pkrvars.hcl create mode 100644 os_pkrvars/debian/debian-12-x86_64.pkrvars.hcl diff --git a/.github/workflows/pkr-bld-hyperv-x64.yml b/.github/workflows/pkr-bld-hyperv-x64.yml index 4cd44ef3f..da16d32fa 100644 --- a/.github/workflows/pkr-bld-hyperv-x64.yml +++ b/.github/workflows/pkr-bld-hyperv-x64.yml @@ -16,6 +16,7 @@ jobs: - centos-stream-9 - debian-10 - debian-11 + - debian-12 - fedora-37 - fedora-38 - freebsd-12 diff --git a/.github/workflows/pkr-bld-parallels-arm64.yml b/.github/workflows/pkr-bld-parallels-arm64.yml index 302752bbb..b3028a72e 100644 --- a/.github/workflows/pkr-bld-parallels-arm64.yml +++ b/.github/workflows/pkr-bld-parallels-arm64.yml @@ -16,6 +16,7 @@ jobs: - centos-stream-9 - debian-10 - debian-11 + - debian-12 - fedora-37 - fedora-38 - freebsd-12 diff --git a/.github/workflows/pkr-bld-parallels-x64.yml b/.github/workflows/pkr-bld-parallels-x64.yml index 9efcda481..5da9170df 100644 --- a/.github/workflows/pkr-bld-parallels-x64.yml +++ b/.github/workflows/pkr-bld-parallels-x64.yml @@ -16,6 +16,7 @@ jobs: - centos-stream-9 - debian-10 - debian-11 + - debian-12 - fedora-37 - fedora-38 - freebsd-12 diff --git a/.github/workflows/pkr-bld-qemu-arm64.yml b/.github/workflows/pkr-bld-qemu-arm64.yml index 21df30bfe..049325151 100644 --- a/.github/workflows/pkr-bld-qemu-arm64.yml +++ b/.github/workflows/pkr-bld-qemu-arm64.yml @@ -16,6 +16,7 @@ jobs: - centos-stream-9 - debian-10 - debian-11 + - debian-12 - fedora-37 - fedora-38 - freebsd-12 diff --git a/.github/workflows/pkr-bld-qemu-x64.yml b/.github/workflows/pkr-bld-qemu-x64.yml index 262a8bca1..8e7073b15 100644 --- a/.github/workflows/pkr-bld-qemu-x64.yml +++ b/.github/workflows/pkr-bld-qemu-x64.yml @@ -16,6 +16,7 @@ jobs: - centos-stream-9 - debian-10 - debian-11 + - debian-12 - fedora-37 - fedora-38 - freebsd-12 diff --git a/.github/workflows/pkr-bld-virtualbox-arm64.yml b/.github/workflows/pkr-bld-virtualbox-arm64.yml index 7275e2329..fb05d0312 100644 --- a/.github/workflows/pkr-bld-virtualbox-arm64.yml +++ b/.github/workflows/pkr-bld-virtualbox-arm64.yml @@ -16,6 +16,7 @@ jobs: - centos-stream-9 - debian-10 - debian-11 + - debian-12 - fedora-37 - fedora-38 - freebsd-12 diff --git a/.github/workflows/pkr-bld-virtualbox-x64.yml b/.github/workflows/pkr-bld-virtualbox-x64.yml index 97056d46a..843f340ea 100644 --- a/.github/workflows/pkr-bld-virtualbox-x64.yml +++ b/.github/workflows/pkr-bld-virtualbox-x64.yml @@ -16,6 +16,7 @@ jobs: - centos-stream-9 - debian-10 - debian-11 + - debian-12 - fedora-37 - fedora-38 - freebsd-12 diff --git a/.github/workflows/pkr-bld-vmware-arm64.yml b/.github/workflows/pkr-bld-vmware-arm64.yml index da57c00b3..af23bcb65 100644 --- a/.github/workflows/pkr-bld-vmware-arm64.yml +++ b/.github/workflows/pkr-bld-vmware-arm64.yml @@ -16,6 +16,7 @@ jobs: - centos-stream-9 - debian-10 - debian-11 + - debian-12 - fedora-37 - fedora-38 - freebsd-12 diff --git a/.github/workflows/pkr-bld-vmware-x64.yml b/.github/workflows/pkr-bld-vmware-x64.yml index c00bbb0e2..d64cc137c 100644 --- a/.github/workflows/pkr-bld-vmware-x64.yml +++ b/.github/workflows/pkr-bld-vmware-x64.yml @@ -16,6 +16,7 @@ jobs: - centos-stream-9 - debian-10 - debian-11 + - debian-12 - fedora-37 - fedora-38 - freebsd-12 diff --git a/CHANGELOG.md b/CHANGELOG.md index 4c7022060..49a3c5e6a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,8 +14,9 @@ Markdown table generated at <https://www.tablesgenerator.com/markdown_tables#> | centos-7 | | x | | x | | x | | x | | | centos-stream-8 | | x | | x | | x | | x | | | centos-stream-9 | | | | | | x | | x | | -| debian-10 | | | x | | | x | | x | | +| debian-10 | | | x | | | x | | x | | | debian-11 | | x | x | | | x | | x | | +| debian-12 | | x | x | | | x | | x | | | fedora-37 | | x | x | x | | x | | x | | | fedora-38 | | x | | x | | x | | x | | | freebsd-12 | | | na | | na | x | na | | na | diff --git a/README.md b/README.md index e774f78a8..be0a36625 100644 --- a/README.md +++ b/README.md @@ -46,7 +46,7 @@ end To build a Debian vagrant box using the bento tool with the template available in the `os_pkrvars` dir, we can use the following command: ```bash -bento build --cpus 2 os_pkrvars/debian/debian-11-x86_64.pkrvars.hcl +bento build --cpus 2 os_pkrvars/debian/debian-12-x86_64.pkrvars.hcl ``` Other available options: @@ -89,12 +89,12 @@ packer init -upgrade ./packer_templates packer build -only=virtualbox-iso.vm -var-file=os_pkrvars/ubuntu/ubuntu-22.04-x86_64.pkrvars.hcl ./packer_templates ``` -To build latest Debian 11 boxes for all possible providers (simultaneously) +To build latest Debian 12 boxes for all possible providers (simultaneously) ```bash cd <path/to>/bento packer init -upgrade ./packer_templates -packer build -var-file=os_pkrvars/debian/debian-11-x86_64.pkrvars.hcl ./packer_templates +packer build -var-file=os_pkrvars/debian/debian-12-x86_64.pkrvars.hcl ./packer_templates ``` To build latest CentOS 7 boxes for all providers except VMware and Parallels diff --git a/builds.yml b/builds.yml index bdd94cc7c..cf01fe562 100644 --- a/builds.yml +++ b/builds.yml @@ -8,6 +8,7 @@ public: - 'centos-stream-9' - 'debian-10' - 'debian-11' + - 'debian-12' - 'fedora-37' - 'fedora-38' - 'freebsd-12' @@ -36,6 +37,7 @@ slugs: 'centos-7': 'centos-7' 'centos-stream-8': 'centos-stream-8' 'centos-stream-9': 'centos-stream-9' + 'debian-12': 'debian-12' 'debian-11': 'debian-11' 'debian-10': 'debian-10' 'fedora-latest': 'fedora-38' @@ -56,6 +58,7 @@ slugs: 'centos-7-arm64': 'centos-7' 'centos-stream-8-arm64': 'centos-stream-8' 'centos-stream-9-arm64': 'centos-stream-9' + 'debian-12-arm64': 'debian-12' 'debian-11-arm64': 'debian-11' 'debian-10-arm64': 'debian-10' 'fedora-latest-arm64': 'fedora-38' diff --git a/os_pkrvars/debian/debian-12-aarch64.pkrvars.hcl b/os_pkrvars/debian/debian-12-aarch64.pkrvars.hcl new file mode 100644 index 000000000..a5875ffe3 --- /dev/null +++ b/os_pkrvars/debian/debian-12-aarch64.pkrvars.hcl @@ -0,0 +1,9 @@ +os_name = "debian" +os_version = "12.0" +os_arch = "aarch64" +iso_url = "https://cdimage.debian.org/cdimage/release/12.0.0/arm64/iso-dvd/debian-12.0.0-amd64-DVD-1.iso" +iso_checksum = "file:https://cdimage.debian.org/cdimage/release/12.0.0/arm64/iso-dvd/SHA256SUMS" +parallels_guest_os_type = "debian" +vbox_guest_os_type = "Debian_64" +vmware_guest_os_type = "arm-debian-64" +boot_command = ["<wait><up>e<wait><down><down><down><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><wait>install <wait> preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/debian/preseed.cfg <wait>debian-installer=en_US.UTF-8 <wait>auto <wait>locale=en_US.UTF-8 <wait>kbd-chooser/method=us <wait>keyboard-configuration/xkb-keymap=us <wait>netcfg/get_hostname={{ .Name }} <wait>netcfg/get_domain=vagrantup.com <wait>fb=false <wait>debconf/frontend=noninteractive <wait>console-setup/ask_detect=false <wait>console-keymaps-at/keymap=us <wait>grub-installer/bootdev=/dev/sda <wait><f10><wait>"] diff --git a/os_pkrvars/debian/debian-12-x86_64.pkrvars.hcl b/os_pkrvars/debian/debian-12-x86_64.pkrvars.hcl new file mode 100644 index 000000000..5bf313a01 --- /dev/null +++ b/os_pkrvars/debian/debian-12-x86_64.pkrvars.hcl @@ -0,0 +1,9 @@ +os_name = "debian" +os_version = "12.0" +os_arch = "x86_64" +iso_url = "https://cdimage.debian.org/cdimage/release/12.0.0/amd64/iso-dvd/debian-12.0.0-amd64-DVD-1.iso" +iso_checksum = "file:https://cdimage.debian.org/cdimage/release/12.0.0/amd64/iso-dvd/SHA256SUMS" +parallels_guest_os_type = "debian" +vbox_guest_os_type = "Debian_64" +vmware_guest_os_type = "debian-64" +boot_command = ["<wait><esc><wait>auto preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/debian/preseed.cfg netcfg/get_hostname={{ .Name }}<enter>"] diff --git a/packer_templates/pkr-builder.pkr.hcl b/packer_templates/pkr-builder.pkr.hcl index fea149913..eb6a86924 100644 --- a/packer_templates/pkr-builder.pkr.hcl +++ b/packer_templates/pkr-builder.pkr.hcl @@ -1,6 +1,10 @@ packer { required_version = ">= 1.7.0" required_plugins { + chef = { + version = ">= 1.0.0" + source = "github.com/hashicorp/chef" + } hyperv = { version = ">= 1.0.0" source = "github.com/hashicorp/hyperv" From 531b88ed9bab1aa513731f2588cb12b5de2eda50 Mon Sep 17 00:00:00 2001 From: Corey Hemminger <hemminger@hotmail.com> Date: Thu, 15 Jun 2023 15:52:01 -0500 Subject: [PATCH 1522/1622] fix pipeline (#1508) --- .github/workflows/pkr-bld-amazonlinux-x64.yml | 8 ++++---- .github/workflows/pkr-bld-hyperv-x64.yml | 8 ++++---- .github/workflows/pkr-bld-parallels-x64.yml | 8 ++++---- .github/workflows/pkr-bld-qemu-x64.yml | 8 ++++---- .github/workflows/pkr-bld-virtualbox-x64.yml | 8 ++++---- .github/workflows/pkr-bld-vmware-x64.yml | 8 ++++---- AMZ_build_virtualbox-ovf.sh | 12 ++++++------ CHANGELOG.md | 4 +++- os_pkrvars/debian/debian-12-aarch64.pkrvars.hcl | 2 +- 9 files changed, 34 insertions(+), 32 deletions(-) diff --git a/.github/workflows/pkr-bld-amazonlinux-x64.yml b/.github/workflows/pkr-bld-amazonlinux-x64.yml index 598f28b15..149014cce 100644 --- a/.github/workflows/pkr-bld-amazonlinux-x64.yml +++ b/.github/workflows/pkr-bld-amazonlinux-x64.yml @@ -13,10 +13,10 @@ jobs: steps: - name: Checkout uses: actions/checkout@main - - name: Setup Packer - uses: hashicorp/setup-packer@main - with: - version: latest +# - name: Setup Packer +# uses: hashicorp/setup-packer@main +# with: +# version: latest - name: Packer Init env: PACKER_GITHUB_API_TOKEN: "${{ secrets.GITHUB_TOKEN }}" diff --git a/.github/workflows/pkr-bld-hyperv-x64.yml b/.github/workflows/pkr-bld-hyperv-x64.yml index da16d32fa..31198ce99 100644 --- a/.github/workflows/pkr-bld-hyperv-x64.yml +++ b/.github/workflows/pkr-bld-hyperv-x64.yml @@ -52,10 +52,10 @@ jobs: - name: iso-availability shell: pwsh run: Invoke-RestMethod -Method Head -Verbose -Uri $(Get-Content os_pkrvars/$('${{ matrix.os }}'.split('-')[0])/${{ matrix.os }}-x86_64.pkrvars.hcl | ConvertFrom-StringData).iso_url.Trim('"') - - name: Setup Packer - uses: hashicorp/setup-packer@main - with: - version: latest +# - name: Setup Packer +# uses: hashicorp/setup-packer@main +# with: +# version: latest - name: Packer Init env: PACKER_GITHUB_API_TOKEN: "${{ secrets.GITHUB_TOKEN }}" diff --git a/.github/workflows/pkr-bld-parallels-x64.yml b/.github/workflows/pkr-bld-parallels-x64.yml index 5da9170df..832a1b666 100644 --- a/.github/workflows/pkr-bld-parallels-x64.yml +++ b/.github/workflows/pkr-bld-parallels-x64.yml @@ -50,10 +50,10 @@ jobs: - name: iso-availability shell: pwsh run: Invoke-RestMethod -Method Head -Verbose -Uri $(Get-Content os_pkrvars/$('${{ matrix.os }}'.split('-')[0])/${{ matrix.os }}-x86_64.pkrvars.hcl | ConvertFrom-StringData).iso_url.Trim('"') - - name: Setup Packer - uses: hashicorp/setup-packer@main - with: - version: latest +# - name: Setup Packer +# uses: hashicorp/setup-packer@main +# with: +# version: latest - name: Packer Init env: PACKER_GITHUB_API_TOKEN: "${{ secrets.GITHUB_TOKEN }}" diff --git a/.github/workflows/pkr-bld-qemu-x64.yml b/.github/workflows/pkr-bld-qemu-x64.yml index 8e7073b15..832485432 100644 --- a/.github/workflows/pkr-bld-qemu-x64.yml +++ b/.github/workflows/pkr-bld-qemu-x64.yml @@ -52,10 +52,10 @@ jobs: run: Invoke-RestMethod -Method Head -Verbose -Uri $(Get-Content os_pkrvars/$('${{ matrix.os }}'.split('-')[0])/${{ matrix.os }}-x86_64.pkrvars.hcl | ConvertFrom-StringData).iso_url.Trim('"') - name: Download virtio-win.iso run: curl https://fedorapeople.org/groups/virt/virtio-win/direct-downloads/archive-virtio/virtio-win-0.1.229-1/virtio-win.iso -o packer_templates/win_answer_files/virtio-win.iso - - name: Setup Packer - uses: hashicorp/setup-packer@main - with: - version: latest +# - name: Setup Packer +# uses: hashicorp/setup-packer@main +# with: +# version: latest - name: Packer Init env: PACKER_GITHUB_API_TOKEN: "${{ secrets.GITHUB_TOKEN }}" diff --git a/.github/workflows/pkr-bld-virtualbox-x64.yml b/.github/workflows/pkr-bld-virtualbox-x64.yml index 843f340ea..d65123ecb 100644 --- a/.github/workflows/pkr-bld-virtualbox-x64.yml +++ b/.github/workflows/pkr-bld-virtualbox-x64.yml @@ -50,10 +50,10 @@ jobs: - name: iso-availability shell: pwsh run: Invoke-RestMethod -Method Head -Verbose -Uri $(Get-Content os_pkrvars/$('${{ matrix.os }}'.split('-')[0])/${{ matrix.os }}-x86_64.pkrvars.hcl | ConvertFrom-StringData).iso_url.Trim('"') - - name: Setup Packer - uses: hashicorp/setup-packer@main - with: - version: latest +# - name: Setup Packer +# uses: hashicorp/setup-packer@main +# with: +# version: latest - name: Packer Init env: PACKER_GITHUB_API_TOKEN: "${{ secrets.GITHUB_TOKEN }}" diff --git a/.github/workflows/pkr-bld-vmware-x64.yml b/.github/workflows/pkr-bld-vmware-x64.yml index d64cc137c..42971dd3b 100644 --- a/.github/workflows/pkr-bld-vmware-x64.yml +++ b/.github/workflows/pkr-bld-vmware-x64.yml @@ -50,10 +50,10 @@ jobs: - name: iso-availability shell: pwsh run: Invoke-RestMethod -Method Head -Verbose -Uri $(Get-Content os_pkrvars/$('${{ matrix.os }}'.split('-')[0])/${{ matrix.os }}-x86_64.pkrvars.hcl | ConvertFrom-StringData).iso_url.Trim('"') - - name: Setup Packer - uses: hashicorp/setup-packer@main - with: - version: latest +# - name: Setup Packer +# uses: hashicorp/setup-packer@main +# with: +# version: latest - name: Packer Init env: PACKER_GITHUB_API_TOKEN: "${{ secrets.GITHUB_TOKEN }}" diff --git a/AMZ_build_virtualbox-ovf.sh b/AMZ_build_virtualbox-ovf.sh index 87497a173..d935dc3c9 100755 --- a/AMZ_build_virtualbox-ovf.sh +++ b/AMZ_build_virtualbox-ovf.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # Getting script directory location SCRIPT_RELATIVE_DIR=$(dirname "${BASH_SOURCE[0]}") @@ -11,6 +11,7 @@ AMZDIR="$(pwd)/packer_templates/amz_working_files" IMG="$(wget -q https://cdn.amazonlinux.com/os-images/latest/virtualbox/ -O - | grep ".vdi" | cut -d "\"" -f 2)" # Download vbox vdi +echo "Downloading Vbox VDI $IMG" wget -q -O "$AMZDIR"/amazon.vdi -c https://cdn.amazonlinux.com/os-images/latest/virtualbox/"$IMG" if [ ! -f "$AMZDIR"/amazon.vdi ]; then @@ -36,11 +37,10 @@ echo "Creating the VM" VBoxManage createvm --name $VM --ostype "RedHat_64" --register VBoxManage storagectl $VM --name "SATA Controller" --add sata --controller IntelAHCI VBoxManage storageattach $VM --storagectl "SATA Controller" --port 0 --device 0 --type hdd --medium "$AMZDIR"/amazon.vdi -VBoxManage storagectl $VM --name "IDE Controller" --add ide -VBoxManage storageattach $VM --storagectl "IDE Controller" --port 0 --device 0 --type dvddrive --medium "$AMZDIR"/seed.iso -VBoxManage modifyvm $VM --memory 1024 +VBoxManage storageattach $VM --storagectl "SATA Controller" --port 0 --device 1 --type dvddrive --medium "$AMZDIR"/seed.iso +VBoxManage modifyvm $VM --memory 2048 VBoxManage modifyvm $VM --cpus 2 -VBoxManage modifyvm $VM --audio none +VBoxManage modifyvm $VM --audio-driver none VBoxManage modifyvm $VM --ioapic on sleep 5 @@ -48,7 +48,7 @@ echo Sleeping for 120 seconds to let the system boot and cloud-init to run VBoxManage startvm $VM --type headless sleep 120 VBoxManage controlvm $VM poweroff --type headless -VBoxManage storageattach $VM --storagectl "IDE Controller" --port 0 --device 0 --type dvddrive --medium none +VBoxManage storageattach $VM --storagectl "SATA Controller" --port 0 --device 1 --type dvddrive --medium none sleep 5 echo Exporting the VM to an OVF file diff --git a/CHANGELOG.md b/CHANGELOG.md index 49a3c5e6a..74d8b5247 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -63,10 +63,12 @@ Markdown table generated at <https://www.tablesgenerator.com/markdown_tables#> - Create CD pipeline to upload vagrant boxes after PR is merged - Create CD pipeline to build and upload new versions of vagrant boxes once every 3 months with the latest patches -## [unreleased] (2023-05-17) +## [unreleased] (2023-06-15) - Update RHEL 9 clones to 9.2 - Update RHEL 8 clones to 8.8 +- Added Debian 12 variables +- Fixed pipeline issue with plugins ## [v3.1.0] (2023-05-17) diff --git a/os_pkrvars/debian/debian-12-aarch64.pkrvars.hcl b/os_pkrvars/debian/debian-12-aarch64.pkrvars.hcl index a5875ffe3..c16ba4c3e 100644 --- a/os_pkrvars/debian/debian-12-aarch64.pkrvars.hcl +++ b/os_pkrvars/debian/debian-12-aarch64.pkrvars.hcl @@ -1,7 +1,7 @@ os_name = "debian" os_version = "12.0" os_arch = "aarch64" -iso_url = "https://cdimage.debian.org/cdimage/release/12.0.0/arm64/iso-dvd/debian-12.0.0-amd64-DVD-1.iso" +iso_url = "https://cdimage.debian.org/cdimage/release/12.0.0/arm64/iso-dvd/debian-12.0.0-arm64-DVD-1.iso" iso_checksum = "file:https://cdimage.debian.org/cdimage/release/12.0.0/arm64/iso-dvd/SHA256SUMS" parallels_guest_os_type = "debian" vbox_guest_os_type = "Debian_64" From e8d429162b5af7310c4c655dd630351b2561870b Mon Sep 17 00:00:00 2001 From: Mihai Petracovici <petracvv@users.noreply.github.com> Date: Mon, 26 Jun 2023 07:36:43 -0600 Subject: [PATCH 1523/1622] Add build for opensuse aarch64 (#1513) Signed-off-by: Mihai Petracovici <petracvv@users.noreply.github.com> --- .../opensuse-leap-15-aarch64.pkrvars.hcl | 9 + .../http/opensuse/autoinst-uefi.xml | 273 ++++++++++++++++++ 2 files changed, 282 insertions(+) create mode 100644 os_pkrvars/opensuse/opensuse-leap-15-aarch64.pkrvars.hcl create mode 100644 packer_templates/http/opensuse/autoinst-uefi.xml diff --git a/os_pkrvars/opensuse/opensuse-leap-15-aarch64.pkrvars.hcl b/os_pkrvars/opensuse/opensuse-leap-15-aarch64.pkrvars.hcl new file mode 100644 index 000000000..560a0d503 --- /dev/null +++ b/os_pkrvars/opensuse/opensuse-leap-15-aarch64.pkrvars.hcl @@ -0,0 +1,9 @@ +os_name = "opensuse" +os_version = "15.4" +os_arch = "aarch64" +iso_url = "http://provo-mirror.opensuse.org/distribution/leap/15.4/iso/openSUSE-Leap-15.4-DVD-aarch64-Media.iso" +iso_checksum = "d87f79b2b723f9baaeedd9e2be0365c04081e51a4f7f7f08c7ab3eee0c3e0fae" +parallels_guest_os_type = "opensuse" +vbox_guest_os_type = "OpenSUSE_64" +vmware_guest_os_type = "arm-other5xlinux-64" +boot_command = ["<wait5><esc><wait>e<wait><down><down><down><down><end> biosdevname=0 net.ifnames=0 netdevice=eth0 netsetup=dhcp lang=en_US textmode=1 modprobe.blacklist=vmwgfx autoyast=http://{{ .HTTPIP }}:{{ .HTTPPort }}/opensuse/autoinst-uefi.xml<f10><wait>"] diff --git a/packer_templates/http/opensuse/autoinst-uefi.xml b/packer_templates/http/opensuse/autoinst-uefi.xml new file mode 100644 index 000000000..a13ae7f02 --- /dev/null +++ b/packer_templates/http/opensuse/autoinst-uefi.xml @@ -0,0 +1,273 @@ +<?xml version="1.0"?> +<!DOCTYPE profile> +<profile xmlns="http://www.suse.com/1.0/yast2ns" xmlns:config="http://www.suse.com/1.0/configns"> + <report> + <messages> + <show config:type="boolean">false</show> + <timeout config:type="integer">10</timeout> + <log config:type="boolean">true</log> + </messages> + <warnings> + <show config:type="boolean">false</show> + <timeout config:type="integer">10</timeout> + <log config:type="boolean">true</log> + </warnings> + <errors> + <show config:type="boolean">false</show> + <timeout config:type="integer">10</timeout> + <log config:type="boolean">true</log> + </errors> + </report> + <keyboard> + <keymap>english-us</keymap> + </keyboard> + <language> + <language>en_US</language> + <languages>en_US</languages> + </language> + <bootloader t="map"> + <global t="map"> + <append>splash=silent biosdevname=0 net.ifnames=0 modprobe.blacklist=vmwgfx preempt=full mitigations=auto quiet</append> + <secure_boot>false</secure_boot> + <terminal>console</terminal> + <timeout t="integer">1</timeout> + <update_nvram>true</update_nvram> + </global> + <loader_type>grub2-efi</loader_type> + </bootloader> + <firewall t="map"> + <enable_firewall t="boolean">false</enable_firewall> + <start_firewall t="boolean">false</start_firewall> + </firewall> + <general t="map"> + <mode t="map"> + <confirm t="boolean">false</confirm> + <forceboot config:type="boolean">true</forceboot> + <final_reboot config:type="boolean">false</final_reboot> + </mode> + </general> + <groups t="list"> + <group t="map"> + <gid>100</gid> + <groupname>users</groupname> + <userlist/> + </group> + </groups> + <networking t="map"> + <ipv6 t="boolean">false</ipv6> + <keep_install_network t="boolean">true</keep_install_network> + <dns t="map"> + <dhcp_hostname t="boolean">false</dhcp_hostname> + <hostname>opensuse15.localdomain</hostname> + <domain>localdomain</domain> + </dns> + <interfaces t="list"> + <interface t="map"> + <bootproto>dhcp</bootproto> + <name>eth0</name> + <startmode>auto</startmode> + <zone>public</zone> + </interface> + </interfaces> + </networking> + <ntp-client t="map"> + <ntp_policy>auto</ntp_policy> + <ntp_servers t="list"> + <ntp_server t="map"> + <address>1.opensuse.pool.ntp.org</address> + <iburst t="boolean">true</iburst> + <offline t="boolean">false</offline> + </ntp_server> + </ntp_servers> + <ntp_sync>systemd</ntp_sync> + </ntp-client> + <partitioning t="list"> + <drive t="map"> + <device>/dev/sda</device> + <disklabel>gpt</disklabel> + <initialize config:type="boolean">true</initialize> + <enable_snapshots t="boolean">false</enable_snapshots> + <partitions t="list"> + <partition t="map"> + <create t="boolean">true</create> + <filesystem t="symbol">vfat</filesystem> + <format t="boolean">true</format> + <fstopt>utf8</fstopt> + <mount>/boot/efi</mount> + <mountby t="symbol">uuid</mountby> + <partition_id t="integer">259</partition_id> + <partition_nr t="integer">1</partition_nr> + <resize t="boolean">false</resize> + <size>256M</size> + </partition> + <partition t="map"> + <create t="boolean">true</create> + <create_subvolumes t="boolean">true</create_subvolumes> + <filesystem t="symbol">btrfs</filesystem> + <format t="boolean">true</format> + <mount>/</mount> + <mountby t="symbol">uuid</mountby> + <partition_id t="integer">131</partition_id> + <partition_nr t="integer">2</partition_nr> + <quotas t="boolean">true</quotas> + <resize t="boolean">false</resize> + <size>max</size> + <subvolumes t="list"> + <subvolume t="map"> + <copy_on_write t="boolean">false</copy_on_write> + <path>var</path> + </subvolume> + <subvolume t="map"> + <copy_on_write t="boolean">true</copy_on_write> + <path>usr/local</path> + </subvolume> + <subvolume t="map"> + <copy_on_write t="boolean">true</copy_on_write> + <path>tmp</path> + </subvolume> + <subvolume t="map"> + <copy_on_write t="boolean">true</copy_on_write> + <path>srv</path> + </subvolume> + <subvolume t="map"> + <copy_on_write t="boolean">true</copy_on_write> + <path>root</path> + </subvolume> + <subvolume t="map"> + <copy_on_write t="boolean">true</copy_on_write> + <path>opt</path> + </subvolume> + <subvolume t="map"> + <copy_on_write t="boolean">true</copy_on_write> + <path>home</path> + </subvolume> + <subvolume t="map"> + <copy_on_write t="boolean">true</copy_on_write> + <path>boot/grub2/arm64-efi</path> + </subvolume> + </subvolumes> + <subvolumes_prefix>@</subvolumes_prefix> + </partition> + <partition t="map"> + <create t="boolean">true</create> + <filesystem t="symbol">swap</filesystem> + <format t="boolean">true</format> + <mount>swap</mount> + <mountby t="symbol">uuid</mountby> + <partition_id t="integer">130</partition_id> + <partition_nr t="integer">3</partition_nr> + <resize t="boolean">false</resize> + <size>512M</size> + </partition> + </partitions> + <type t="symbol">CT_DISK</type> + <use>all</use> + </drive> + </partitioning> + <services-manager t="map"> + <default_target>multi-user</default_target> + <services t="map"> + <enable t="list"> + <service>sshd</service> + </enable> + </services> + </services-manager> + <software t="map"> + <instsource/> + <packages t="list"> + <package>wicked</package> + <package>shim</package> + <package>openssh</package> + <package>openssh-server</package> + <package>yast2</package> + <package>yast2-firstboot</package> + <package>yast2-trans-en_US</package> + <package>openSUSE-release</package> + <package>mokutil</package> + <package>kexec-tools</package> + <package>grub2-arm64-efi</package> + <package>glibc</package> + <package>firewalld</package> + <package>e2fsprogs</package> + <package>dosfstools</package> + <package>chrony</package> + <package>btrfsprogs</package> + <package>wget</package> + <package>curl</package> + <package>less</package> + <package>sudo</package> + <package>fuse</package> + </packages> + <remove-packages t="list"> + <package>bash-completion</package> + <package>telnet</package> + <package>virtualbox-guest-kmp-default</package> + <package>virtualbox-guest-tools</package> + <package>snapper</package> + <package>snapper-zypp-plugin</package> + </remove-packages> + <patterns t="list"> + <pattern>documentation</pattern> + <pattern>minimal_base</pattern> + <pattern>sw_management</pattern> + <pattern>yast2_basis</pattern> + </patterns> + <products t="list"> + <product>Leap</product> + </products> + </software> + <timezone t="map"> + <hwclock>UTC</hwclock> + <timezone>Etc/UTC</timezone> + </timezone> + <user_defaults t="map"> + <expire/> + <group>100</group> + <home>/home</home> + <inactive>-1</inactive> + <no_groups config:type="boolean">true</no_groups> + <shell>/bin/bash</shell> + <skel>/etc/skel</skel> + <umask>022</umask> + </user_defaults> + <users t="list"> + <user t="map"> + <user_password>vagrant</user_password> + <username>root</username> + </user> + <user t="map"> + <fullname>vagrant</fullname> + <gid>100</gid> + <home>/home/vagrant</home> + <password_settings t="map"> + <expire/> + <flag/> + <inact/> + <max>99999</max> + <min>0</min> + <warn>7</warn> + </password_settings> + <shell>/bin/bash</shell> + <uid>1000</uid> + <user_password>vagrant</user_password> + <username>vagrant</username> + </user> + </users> + <kdump> + <add_crash_kernel config:type="boolean">false</add_crash_kernel> + </kdump> + <scripts> + <post-scripts config:type="list"> + <script> + <filename>post.sh</filename> + <interpreter>shell</interpreter> + <source><![CDATA[ +#!/bin/bash +dmesg | grep -E "Hypervisor detected: Microsoft HyperV|Hypervisor detected: Microsoft Hyper-V" +if [ $? -eq 0 ]; then systemctl enable hv_kvp_daemon.service ; fi +]]> + </source> + </script> + </post-scripts> + </scripts> +</profile> From 465cb8a13240aba5f545ee5a7e8c406129a49712 Mon Sep 17 00:00:00 2001 From: Corey Hemminger <hemminger@hotmail.com> Date: Thu, 6 Jul 2023 13:00:57 -0500 Subject: [PATCH 1524/1622] update default vmx_data (#1512) * update default vmx_data * switch pipeline to bento build command * added opensuse-leap-15-aarch64 and updated build workflows accordingly * update vmware settings and add proper bento build failure exit status * fixed bento arm64 metadata generation --------- Signed-off-by: Corey Hemminger <hemminger@hotmail.com> --- .github/workflows/pkr-bld-amazonlinux-x64.yml | 16 ++-- .github/workflows/pkr-bld-hyperv-x64.yml | 7 +- .github/workflows/pkr-bld-parallels-arm64.yml | 17 ++-- .github/workflows/pkr-bld-parallels-x64.yml | 16 ++-- .github/workflows/pkr-bld-qemu-arm64.yml | 17 ++-- .github/workflows/pkr-bld-qemu-x64.yml | 16 ++-- .../workflows/pkr-bld-virtualbox-arm64.yml | 17 ++-- .github/workflows/pkr-bld-virtualbox-x64.yml | 16 ++-- .github/workflows/pkr-bld-vmware-arm64.yml | 17 ++-- .github/workflows/pkr-bld-vmware-x64.yml | 16 ++-- CHANGELOG.md | 78 ++++++++++--------- bento.gemspec | 3 +- lib/bento/buildmetadata.rb | 4 +- lib/bento/runner.rb | 25 ++++-- lib/bento/version.rb | 2 +- .../debian/debian-11-aarch64.pkrvars.hcl | 4 +- .../debian/debian-11-x86_64.pkrvars.hcl | 4 +- .../opensuse-leap-15-aarch64.pkrvars.hcl | 8 +- .../opensuse-leap-15-x86_64.pkrvars.hcl | 6 +- .../springdalelinux-8-x86_64.pkrvars.hcl | 6 +- .../springdalelinux-9-x86_64.pkrvars.hcl | 6 +- packer_templates/pkr-builder.pkr.hcl | 11 ++- packer_templates/pkr-sources.pkr.hcl | 10 ++- packer_templates/pkr-variables.pkr.hcl | 4 +- .../scripts/windows/provision.ps1 | 6 +- 25 files changed, 213 insertions(+), 119 deletions(-) diff --git a/.github/workflows/pkr-bld-amazonlinux-x64.yml b/.github/workflows/pkr-bld-amazonlinux-x64.yml index 149014cce..facc751a2 100644 --- a/.github/workflows/pkr-bld-amazonlinux-x64.yml +++ b/.github/workflows/pkr-bld-amazonlinux-x64.yml @@ -2,6 +2,9 @@ on: workflow_call: +env: + PACKER_GITHUB_API_TOKEN: "${{ secrets.GITHUB_TOKEN }}" + jobs: x86_64: runs-on: [self-hosted, X64, virtualbox] @@ -18,15 +21,17 @@ jobs: # with: # version: latest - name: Packer Init - env: - PACKER_GITHUB_API_TOKEN: "${{ secrets.GITHUB_TOKEN }}" run: packer init -upgrade packer_templates - name: Packer FMT run: if packer fmt -check -recursive .; then exit 0; else echo "Some packer files need to be formatted, run 'packer fmt -recursive .' to fix"; exit 1; fi - name: Packer Validate run: packer validate -var-file=os_pkrvars/$(echo ${{ matrix.os }} | cut -d "-" -f 1)/"${{ matrix.os }}-x86_64.pkrvars.hcl" packer_templates - name: Packer build - run: ./AMZ_build_virtualbox-ovf.sh + run: | + eval "$(chef shell-init bash)" + ./AMZ_build_virtualbox-ovf.sh + bento build -n os_pkrvars/$(echo ${{ matrix.os }} | cut -d "-" -f 1)/"${{ matrix.os }}-x86_64.pkrvars.hcl" >> builds/amazonlinux-2-x86_64.metadata.json + ls -alh builds - name: Remove VM in case of canceled job if: cancelled() run: | @@ -38,7 +43,8 @@ jobs: - name: Upload build artifact uses: actions/upload-artifact@main with: - name: "${{ matrix.os }}-virtualbox-x86_64.box" + name: "${{ matrix.os }}-virtualbox-x86_64" path: | - builds/*.box + builds + !builds/uploaded/* retention-days: 10 diff --git a/.github/workflows/pkr-bld-hyperv-x64.yml b/.github/workflows/pkr-bld-hyperv-x64.yml index 31198ce99..ca77f1ee5 100644 --- a/.github/workflows/pkr-bld-hyperv-x64.yml +++ b/.github/workflows/pkr-bld-hyperv-x64.yml @@ -2,6 +2,9 @@ on: workflow_call: +env: + PACKER_GITHUB_API_TOKEN: "${{ secrets.GITHUB_TOKEN }}" + jobs: x86_64: runs-on: [self-hosted, X64, hyperv] @@ -57,8 +60,6 @@ jobs: # with: # version: latest - name: Packer Init - env: - PACKER_GITHUB_API_TOKEN: "${{ secrets.GITHUB_TOKEN }}" run: packer init -upgrade packer_templates - name: Packer FMT run: packer fmt -check -recursive . @@ -77,7 +78,7 @@ jobs: - name: Upload build artifact uses: actions/upload-artifact@main with: - name: "${{ matrix.os }}-hyperv-x86_64.box" + name: "${{ matrix.os }}-hyperv-x86_64" path: | builds/*.box retention-days: 10 diff --git a/.github/workflows/pkr-bld-parallels-arm64.yml b/.github/workflows/pkr-bld-parallels-arm64.yml index b3028a72e..c678d1199 100644 --- a/.github/workflows/pkr-bld-parallels-arm64.yml +++ b/.github/workflows/pkr-bld-parallels-arm64.yml @@ -2,6 +2,9 @@ on: workflow_call: +env: + PACKER_GITHUB_API_TOKEN: "${{ secrets.GITHUB_TOKEN }}" + jobs: aarch64: runs-on: [self-hosted, ARM64, parallels] @@ -21,6 +24,7 @@ jobs: - fedora-38 - freebsd-12 - freebsd-13 + - opensuse-leap-15 - oracle-7 - oracle-8 - oracle-9 @@ -45,15 +49,17 @@ jobs: # with: # version: latest - name: Packer Init - env: - PACKER_GITHUB_API_TOKEN: "${{ secrets.GITHUB_TOKEN }}" run: packer init -upgrade packer_templates - name: Packer FMT run: if packer fmt -check -recursive .; then exit 0; else echo "Some packer files need to be formatted, run 'packer fmt -recursive .' to fix"; exit 1; fi - name: Packer Validate run: packer validate -var-file=os_pkrvars/$(echo ${{ matrix.os }} | cut -d "-" -f 1)/"${{ matrix.os }}-aarch64.pkrvars.hcl" packer_templates - name: Packer build - run: packer build -timestamp-ui -only=${{ matrix.provider }}.vm -var-file=os_pkrvars/$(echo ${{ matrix.os }} | cut -d "-" -f 1)/"${{ matrix.os }}-aarch64.pkrvars.hcl" packer_templates +# run: packer build -timestamp-ui -only=${{ matrix.provider }}.vm -var-file=os_pkrvars/$(echo ${{ matrix.os }} | cut -d "-" -f 1)/"${{ matrix.os }}-aarch64.pkrvars.hcl" packer_templates + run: | + eval "$(chef shell-init bash)" + bento build -o ${{ matrix.provider }}.vm os_pkrvars/$(echo ${{ matrix.os }} | cut -d "-" -f 1)/"${{ matrix.os }}-aarch64.pkrvars.hcl" + ls -alh builds - name: Remove VM in case of canceled job if: cancelled() run: | @@ -66,7 +72,8 @@ jobs: - name: Upload build artifact uses: actions/upload-artifact@v3 with: - name: "${{ matrix.os }}-parallels-aarch64.box" + name: "${{ matrix.os }}-parallels-aarch64" path: | - builds/*.box + builds + !builds/uploaded/* retention-days: 10 diff --git a/.github/workflows/pkr-bld-parallels-x64.yml b/.github/workflows/pkr-bld-parallels-x64.yml index 832a1b666..7f6f3cb45 100644 --- a/.github/workflows/pkr-bld-parallels-x64.yml +++ b/.github/workflows/pkr-bld-parallels-x64.yml @@ -2,6 +2,9 @@ on: workflow_call: +env: + PACKER_GITHUB_API_TOKEN: "${{ secrets.GITHUB_TOKEN }}" + jobs: x86_64: runs-on: [self-hosted, X64, parallels] @@ -55,15 +58,17 @@ jobs: # with: # version: latest - name: Packer Init - env: - PACKER_GITHUB_API_TOKEN: "${{ secrets.GITHUB_TOKEN }}" run: packer init -upgrade packer_templates - name: Packer FMT run: if packer fmt -check -recursive .; then exit 0; else echo "Some packer files need to be formatted, run 'packer fmt -recursive .' to fix"; exit 1; fi - name: Packer Validate run: packer validate -var-file=os_pkrvars/$(echo ${{ matrix.os }} | cut -d "-" -f 1)/"${{ matrix.os }}-x86_64.pkrvars.hcl" packer_templates - name: Packer build - run: packer build -timestamp-ui -only=${{ matrix.provider }}.vm -var-file=os_pkrvars/$(echo ${{ matrix.os }} | cut -d "-" -f 1)/"${{ matrix.os }}-x86_64.pkrvars.hcl" packer_templates +# run: packer build -timestamp-ui -only=${{ matrix.provider }}.vm -var-file=os_pkrvars/$(echo ${{ matrix.os }} | cut -d "-" -f 1)/"${{ matrix.os }}-x86_64.pkrvars.hcl" packer_templates + run: | + eval "$(chef shell-init bash)" + bento build -o ${{ matrix.provider }}.vm os_pkrvars/$(echo ${{ matrix.os }} | cut -d "-" -f 1)/"${{ matrix.os }}-x86_64.pkrvars.hcl" + ls -alh builds - name: Remove VM in case of canceled job if: cancelled() run: | @@ -76,7 +81,8 @@ jobs: - name: Upload build artifact uses: actions/upload-artifact@v3 with: - name: "${{ matrix.os }}-parallels-x86_64.box" + name: "${{ matrix.os }}-parallels-x86_64" path: | - builds/*.box + builds + !builds/uploaded/* retention-days: 10 diff --git a/.github/workflows/pkr-bld-qemu-arm64.yml b/.github/workflows/pkr-bld-qemu-arm64.yml index 049325151..1b0925d46 100644 --- a/.github/workflows/pkr-bld-qemu-arm64.yml +++ b/.github/workflows/pkr-bld-qemu-arm64.yml @@ -2,6 +2,9 @@ on: workflow_call: +env: + PACKER_GITHUB_API_TOKEN: "${{ secrets.GITHUB_TOKEN }}" + jobs: aarch64: runs-on: [self-hosted, ARM64, qemu] @@ -21,6 +24,7 @@ jobs: - fedora-38 - freebsd-12 - freebsd-13 + - opensuse-leap-15 - oracle-7 - oracle-8 - oracle-9 @@ -45,19 +49,22 @@ jobs: # with: # version: latest - name: Packer Init - env: - PACKER_GITHUB_API_TOKEN: "${{ secrets.GITHUB_TOKEN }}" run: packer init -upgrade packer_templates - name: Packer FMT run: if packer fmt -check -recursive .; then exit 0; else echo "Some packer files need to be formatted, run 'packer fmt -recursive .' to fix"; exit 1; fi - name: Packer Validate run: packer validate -var-file=os_pkrvars/$(echo ${{ matrix.os }} | cut -d "-" -f 1)/"${{ matrix.os }}-aarch64.pkrvars.hcl" packer_templates - name: Packer build - run: packer build -timestamp-ui -only=${{ matrix.provider }}.vm -var "qemu_accelerator=hvf" -var-file=os_pkrvars/$(echo ${{ matrix.os }} | cut -d "-" -f 1)/"${{ matrix.os }}-aarch64.pkrvars.hcl" packer_templates +# run: packer build -timestamp-ui -only=${{ matrix.provider }}.vm -var "qemu_accelerator=hvf" -var-file=os_pkrvars/$(echo ${{ matrix.os }} | cut -d "-" -f 1)/"${{ matrix.os }}-aarch64.pkrvars.hcl" packer_templates + run: | + eval "$(chef shell-init bash)" + bento build -o ${{ matrix.provider }}.vm os_pkrvars/$(echo ${{ matrix.os }} | cut -d "-" -f 1)/"${{ matrix.os }}-aarch64.pkrvars.hcl" + ls -alh builds - name: Upload build artifact uses: actions/upload-artifact@v3 with: - name: "${{ matrix.os }}-qemu-aarch64.box" + name: "${{ matrix.os }}-qemu-aarch64" path: | - builds/*.box + builds + !builds/uploaded/* retention-days: 10 diff --git a/.github/workflows/pkr-bld-qemu-x64.yml b/.github/workflows/pkr-bld-qemu-x64.yml index 832485432..4a692bf07 100644 --- a/.github/workflows/pkr-bld-qemu-x64.yml +++ b/.github/workflows/pkr-bld-qemu-x64.yml @@ -2,6 +2,9 @@ on: workflow_call: +env: + PACKER_GITHUB_API_TOKEN: "${{ secrets.GITHUB_TOKEN }}" + jobs: x86_64: runs-on: [self-hosted, X64, qemu] @@ -57,19 +60,22 @@ jobs: # with: # version: latest - name: Packer Init - env: - PACKER_GITHUB_API_TOKEN: "${{ secrets.GITHUB_TOKEN }}" run: packer init -upgrade packer_templates - name: Packer FMT run: if packer fmt -check -recursive .; then exit 0; else echo "Some packer files need to be formatted, run 'packer fmt -recursive .' to fix"; exit 1; fi - name: Packer Validate run: packer validate -var-file=os_pkrvars/$(echo ${{ matrix.os }} | cut -d "-" -f 1)/"${{ matrix.os }}-x86_64.pkrvars.hcl" packer_templates - name: Packer build - run: packer build -timestamp-ui -only=${{ matrix.provider }}.vm -var "qemu_accelerator=hvf" -var-file=os_pkrvars/$(echo ${{ matrix.os }} | cut -d "-" -f 1)/"${{ matrix.os }}-x86_64.pkrvars.hcl" packer_templates +# run: packer build -timestamp-ui -only=${{ matrix.provider }}.vm -var "qemu_accelerator=hvf" -var-file=os_pkrvars/$(echo ${{ matrix.os }} | cut -d "-" -f 1)/"${{ matrix.os }}-x86_64.pkrvars.hcl" packer_templates + run: | + eval "$(chef shell-init bash)" + bento build -o ${{ matrix.provider }}.vm os_pkrvars/$(echo ${{ matrix.os }} | cut -d "-" -f 1)/"${{ matrix.os }}-x86_64.pkrvars.hcl" + ls -alh builds - name: Upload build artifact uses: actions/upload-artifact@main with: - name: "${{ matrix.os }}-qemu-x86_64.box" + name: "${{ matrix.os }}-qemu-x86_64" path: | - builds/*.box + builds + !builds/uploaded/* retention-days: 10 diff --git a/.github/workflows/pkr-bld-virtualbox-arm64.yml b/.github/workflows/pkr-bld-virtualbox-arm64.yml index fb05d0312..43e65601f 100644 --- a/.github/workflows/pkr-bld-virtualbox-arm64.yml +++ b/.github/workflows/pkr-bld-virtualbox-arm64.yml @@ -2,6 +2,9 @@ on: workflow_call: +env: + PACKER_GITHUB_API_TOKEN: "${{ secrets.GITHUB_TOKEN }}" + jobs: aarch64: runs-on: [self-hosted, ARM64, virtualbox] @@ -21,6 +24,7 @@ jobs: - fedora-38 - freebsd-12 - freebsd-13 + - opensuse-leap-15 - oracle-7 - oracle-8 - oracle-9 @@ -45,15 +49,17 @@ jobs: # with: # version: latest - name: Packer Init - env: - PACKER_GITHUB_API_TOKEN: "${{ secrets.GITHUB_TOKEN }}" run: packer init -upgrade packer_templates - name: Packer FMT run: if packer fmt -check -recursive .; then exit 0; else echo "Some packer files need to be formatted, run 'packer fmt -recursive .' to fix"; exit 1; fi - name: Packer Validate run: packer validate -var-file=os_pkrvars/$(echo ${{ matrix.os }} | cut -d "-" -f 1)/"${{ matrix.os }}-aarch64.pkrvars.hcl" packer_templates - name: Packer build - run: packer build -timestamp-ui -only=${{ matrix.provider }}.vm -var-file=os_pkrvars/$(echo ${{ matrix.os }} | cut -d "-" -f 1)/"${{ matrix.os }}-aarch64.pkrvars.hcl" packer_templates +# run: packer build -timestamp-ui -only=${{ matrix.provider }}.vm -var-file=os_pkrvars/$(echo ${{ matrix.os }} | cut -d "-" -f 1)/"${{ matrix.os }}-aarch64.pkrvars.hcl" packer_templates + run: | + eval "$(chef shell-init bash)" + bento build -o ${{ matrix.provider }}.vm os_pkrvars/$(echo ${{ matrix.os }} | cut -d "-" -f 1)/"${{ matrix.os }}-aarch64.pkrvars.hcl" + ls -alh builds - name: Remove VM in case of canceled job if: cancelled() run: | @@ -65,7 +71,8 @@ jobs: - name: Upload build artifact uses: actions/upload-artifact@main with: - name: "${{ matrix.os }}-virtualbox-aarch64.box" + name: "${{ matrix.os }}-virtualbox-aarch64" path: | - builds/*.box + builds + !builds/uploaded/* retention-days: 10 diff --git a/.github/workflows/pkr-bld-virtualbox-x64.yml b/.github/workflows/pkr-bld-virtualbox-x64.yml index d65123ecb..c359461ac 100644 --- a/.github/workflows/pkr-bld-virtualbox-x64.yml +++ b/.github/workflows/pkr-bld-virtualbox-x64.yml @@ -2,6 +2,9 @@ on: workflow_call: +env: + PACKER_GITHUB_API_TOKEN: "${{ secrets.GITHUB_TOKEN }}" + jobs: x86_64: runs-on: [self-hosted, X64, virtualbox] @@ -55,15 +58,17 @@ jobs: # with: # version: latest - name: Packer Init - env: - PACKER_GITHUB_API_TOKEN: "${{ secrets.GITHUB_TOKEN }}" run: packer init -upgrade packer_templates - name: Packer FMT run: if packer fmt -check -recursive .; then exit 0; else echo "Some packer files need to be formatted, run 'packer fmt -recursive .' to fix"; exit 1; fi - name: Packer Validate run: packer validate -var-file=os_pkrvars/$(echo ${{ matrix.os }} | cut -d "-" -f 1)/"${{ matrix.os }}-x86_64.pkrvars.hcl" packer_templates - name: Packer build - run: packer build -timestamp-ui -only=${{ matrix.provider }}.vm -var-file=os_pkrvars/$(echo ${{ matrix.os }} | cut -d "-" -f 1)/"${{ matrix.os }}-x86_64.pkrvars.hcl" packer_templates +# run: packer build -timestamp-ui -only=${{ matrix.provider }}.vm -var-file=os_pkrvars/$(echo ${{ matrix.os }} | cut -d "-" -f 1)/"${{ matrix.os }}-x86_64.pkrvars.hcl" packer_templates + run: | + eval "$(chef shell-init bash)" + bento build -o ${{ matrix.provider }}.vm os_pkrvars/$(echo ${{ matrix.os }} | cut -d "-" -f 1)/"${{ matrix.os }}-x86_64.pkrvars.hcl" + ls -alh builds - name: Remove VM in case of canceled job if: cancelled() run: | @@ -75,7 +80,8 @@ jobs: - name: Upload build artifact uses: actions/upload-artifact@main with: - name: "${{ matrix.os }}-virtualbox-x86_64.box" + name: "${{ matrix.os }}-virtualbox-x86_64" path: | - builds/*.box + builds + !builds/uploaded/* retention-days: 10 diff --git a/.github/workflows/pkr-bld-vmware-arm64.yml b/.github/workflows/pkr-bld-vmware-arm64.yml index af23bcb65..32ddfcc32 100644 --- a/.github/workflows/pkr-bld-vmware-arm64.yml +++ b/.github/workflows/pkr-bld-vmware-arm64.yml @@ -2,6 +2,9 @@ on: workflow_call: +env: + PACKER_GITHUB_API_TOKEN: "${{ secrets.GITHUB_TOKEN }}" + jobs: aarch64: runs-on: [self-hosted, ARM64, vmware-fusion] @@ -21,6 +24,7 @@ jobs: - fedora-38 - freebsd-12 - freebsd-13 + - opensuse-leap-15 - oracle-7 - oracle-8 - oracle-9 @@ -45,15 +49,17 @@ jobs: # with: # version: latest - name: Packer Init - env: - PACKER_GITHUB_API_TOKEN: "${{ secrets.GITHUB_TOKEN }}" run: packer init -upgrade packer_templates - name: Packer FMT run: if packer fmt -check -recursive .; then exit 0; else echo "Some packer files need to be formatted, run 'packer fmt -recursive .' to fix"; exit 1; fi - name: Packer Validate run: packer validate -var-file=os_pkrvars/$(echo ${{ matrix.os }} | cut -d "-" -f 1)/"${{ matrix.os }}-aarch64.pkrvars.hcl" packer_templates - name: Packer build - run: packer build -timestamp-ui -only=${{ matrix.provider }}.vm -var-file=os_pkrvars/$(echo ${{ matrix.os }} | cut -d "-" -f 1)/"${{ matrix.os }}-aarch64.pkrvars.hcl" packer_templates +# run: packer build -timestamp-ui -only=${{ matrix.provider }}.vm -var-file=os_pkrvars/$(echo ${{ matrix.os }} | cut -d "-" -f 1)/"${{ matrix.os }}-aarch64.pkrvars.hcl" packer_templates + run: | + eval "$(chef shell-init bash)" + bento build -o ${{ matrix.provider }}.vm os_pkrvars/$(echo ${{ matrix.os }} | cut -d "-" -f 1)/"${{ matrix.os }}-aarch64.pkrvars.hcl" + ls -alh builds - name: Remove VM in case of canceled job if: cancelled() run: | @@ -65,7 +71,8 @@ jobs: - name: Upload build artifact uses: actions/upload-artifact@v3 with: - name: "${{ matrix.os }}-vmware-aarch64.box" + name: "${{ matrix.os }}-vmware-aarch64" path: | - builds/*.box + builds + !builds/uploaded/* retention-days: 10 diff --git a/.github/workflows/pkr-bld-vmware-x64.yml b/.github/workflows/pkr-bld-vmware-x64.yml index 42971dd3b..68f3d3975 100644 --- a/.github/workflows/pkr-bld-vmware-x64.yml +++ b/.github/workflows/pkr-bld-vmware-x64.yml @@ -2,6 +2,9 @@ on: workflow_call: +env: + PACKER_GITHUB_API_TOKEN: "${{ secrets.GITHUB_TOKEN }}" + jobs: x86_64: runs-on: [self-hosted, X64, vmware-fusion] @@ -55,15 +58,17 @@ jobs: # with: # version: latest - name: Packer Init - env: - PACKER_GITHUB_API_TOKEN: "${{ secrets.GITHUB_TOKEN }}" run: packer init -upgrade packer_templates - name: Packer FMT run: if packer fmt -check -recursive .; then exit 0; else echo "Some packer files need to be formatted, run 'packer fmt -recursive .' to fix"; exit 1; fi - name: Packer Validate run: packer validate -var-file=os_pkrvars/$(echo ${{ matrix.os }} | cut -d "-" -f 1)/"${{ matrix.os }}-x86_64.pkrvars.hcl" packer_templates - name: Packer build - run: packer build -timestamp-ui -only=${{ matrix.provider }}.vm -var-file=os_pkrvars/$(echo ${{ matrix.os }} | cut -d "-" -f 1)/"${{ matrix.os }}-x86_64.pkrvars.hcl" packer_templates +# run: packer build -timestamp-ui -only=${{ matrix.provider }}.vm -var-file=os_pkrvars/$(echo ${{ matrix.os }} | cut -d "-" -f 1)/"${{ matrix.os }}-x86_64.pkrvars.hcl" packer_templates + run: | + eval "$(chef shell-init bash)" + bento build -o ${{ matrix.provider }}.vm os_pkrvars/$(echo ${{ matrix.os }} | cut -d "-" -f 1)/"${{ matrix.os }}-x86_64.pkrvars.hcl" + ls -alh builds - name: Remove VM in case of canceled job if: cancelled() run: | @@ -75,7 +80,8 @@ jobs: - name: Upload build artifact uses: actions/upload-artifact@v3 with: - name: "${{ matrix.os }}-vmware-x86_64.box" + name: "${{ matrix.os }}-vmware-x86_64" path: | - builds/*.box + builds + !builds/uploaded/* retention-days: 10 diff --git a/CHANGELOG.md b/CHANGELOG.md index 74d8b5247..4b64b8e04 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,47 +7,47 @@ Markdown table generated at <https://www.tablesgenerator.com/markdown_tables#> | | hyperv<br>x86_64 | parallels<br>x86_64 | parallels<br>aarch64 | qemu<br>x86_64 | qemu<br>aarch64 | virtualbox<br>x86_64 | virtualbox<br>aarch64 | vmware<br>x86_64 | vmware<br>aarch64 | |:---:|:---:|:---:|:---:|:---:|:---:|:---:|:---:|:---:|:---:| -| almalinux-8 | | x | | x | | x | | x | | -| almalinux-9 | | x | x | | | x | | x | | -| amazonlinux-2 | | na | na | na | na | x | | na | na | +| almalinux-8 | | | | x | | x | | x | | +| almalinux-9 | | x | | | | x | | x | | +| amazonlinux-2 | | na | na | | | | na | | na | | amazonlinux-2023 | na | na | na | na | na | na | na | na | na | -| centos-7 | | x | | x | | x | | x | | -| centos-stream-8 | | x | | x | | x | | x | | -| centos-stream-9 | | | | | | x | | x | | -| debian-10 | | | x | | | x | | x | | -| debian-11 | | x | x | | | x | | x | | -| debian-12 | | x | x | | | x | | x | | -| fedora-37 | | x | x | x | | x | | x | | -| fedora-38 | | x | | x | | x | | x | | -| freebsd-12 | | | na | | na | x | na | | na | -| freebsd-13 | | | na | | na | x | na | | na | -| opensuse-leap-15 | | | na | x | na | | na | x | na | -| oracle-7 | | x | | x | | x | | x | | -| oracle-8 | | | | x | | x | | x | | -| oracle-9 | | x | x | | | x | | x | | -| rhel-7 | | | | | | | | | | -| rhel-8 | | | | | | | | | | -| rhel-9 | | | | | | | | | | -| rockylinux-8 | | x | | x | | x | | x | | -| rockylinux-9 | | x | x | | | x | | x | | -| scientificlinux-7 | | x | na | x | na | x | na | x | na | -| sles-12 | | | na | | na | | na | | na | -| sles-13 | | | na | | na | | na | | na | -| solaris-11 | | | na | | na | | na | | na | -| springdalelinux-7 | | x | na | x | na | | na | | na | -| springdalelinux-8 | | x | na | x | na | x | na | x | na | -| springdalelinux-9 | | x | na | | na | x | na | x | na | +| centos-7 | | x | | | | | | x | | +| centos-stream-8 | x | | | x | | | | x | | +| centos-stream-9 | | x | | | | | | x | | +| debian-10 | | | x | | | | | x | | +| debian-11 | | x | x | | | | | x | | +| debian-12 | | x | x | | | x | | x | x | +| fedora-37 | | x | | x | | | | x | x | +| fedora-38 | | | | | | x | | x | x | +| freebsd-12 | | | | | | x | | | | +| freebsd-13 | | | | | | x | | | | +| opensuse-leap-15 | x | x | | | | | | x | | +| oraclelinux-7 | x | x | | | | x | | x | | +| oraclelinux-8 | x | | | x | | x | | x | | +| oraclelinux-9 | | x | | | | x | | x | | +| rhel-7 | license<br>needed | license<br>needed | license<br>needed | license<br>needed | license<br>needed | license<br>needed | license<br>needed | license<br>needed | license<br>needed | +| rhel-8 | license<br>needed | license<br>needed | license<br>needed | license<br>needed | license<br>needed | license<br>needed | license<br>needed | license<br>needed | license<br>needed | +| rhel-9 | license<br>needed | license<br>needed | license<br>needed | license<br>needed | license<br>needed | license<br>needed | license<br>needed | license<br>needed | license<br>needed | +| rockylinux-8 | | | | x | | x | | x | | +| rockylinux-9 | | x | x | | | | | x | | +| scientificlinux-7 | | x | na | | na | | na | x | na | +| sles-12 | license<br>needed | license<br>needed | na | license<br>needed | na | license<br>needed | na | license<br>needed | na | +| sles-13 | license<br>needed | license<br>needed | na | license<br>needed | na | license<br>needed | na | license<br>needed | na | +| solaris-11 | license<br>needed | license<br>needed | na | license<br>needed | na | license<br>needed | na | license<br>needed | na | +| springdalelinux-7 | | x | na | | na | | na | | na | +| springdalelinux-8 | x | | na | x | na | x | na | x | na | +| springdalelinux-9 | x | x | na | | na | | na | x | na | | ubuntu-18.04 | | x | | | | x | | x | | -| ubuntu-20.04 | | | x | | | | | | | -| ubuntu-22.04 | | x | x | x | | x | | x | | -| ubuntu-22.10 | | x | x | x | | x | | x | | -| ubuntu-23.04 | na | na | na | na | na | na | na | na | na | +| ubuntu-20.04 | | x | | x | | | | x | x | +| ubuntu-22.04 | | x | | x | | x | | x | x | +| ubuntu-22.10 | | x | | | | | | | x | +| ubuntu-23.04 | | x | | x | | | | x | x | | windows-10 | x | x | na | | na | x | na | | na | | windows-10gen2 | | na | na | na | na | na | na | na | na | | windows-11 | x | x | na | | na | x | na | | na | | windows-11gen2 | | na | na | na | na | na | na | na | na | | windows-2012r2 | | x | na | | na | x | na | | na | -| windows-2016 | x | x | na | | na | x | na | x | na | +| windows-2016 | x | x | na | | na | x | na | | na | | windows-2019 | x | x | na | | na | x | na | | na | | windows-2022 | x | x | na | | na | x | na | | na | @@ -63,12 +63,20 @@ Markdown table generated at <https://www.tablesgenerator.com/markdown_tables#> - Create CD pipeline to upload vagrant boxes after PR is merged - Create CD pipeline to build and upload new versions of vagrant boxes once every 3 months with the latest patches -## [unreleased] (2023-06-15) +## [unreleased] (2023-07-07) + +## [v3.1.1] (2023-07-07) - Update RHEL 9 clones to 9.2 - Update RHEL 8 clones to 8.8 - Added Debian 12 variables - Fixed pipeline issue with plugins +- Updated debian 11 iso url +- switched pipeline to use bento build command and upload box and metadata.json files +- add opensuse-leap aarch64 build +- updated opensuse-leap to 15.5 +- Bento command exits with error status and code when a build fails for a provider +- fixed bento metadata generation for aarch64 machines ## [v3.1.0] (2023-05-17) diff --git a/bento.gemspec b/bento.gemspec index 4a33dd3a8..690638410 100644 --- a/bento.gemspec +++ b/bento.gemspec @@ -1,8 +1,9 @@ # frozen_string_literal: true +require_relative 'lib/bento/version' Gem::Specification.new do |s| s.name = 'bento' - s.version = '3.1.0' + s.version = Bento::VERSION s.summary = 'Bento builds generic Vagrant boxes ' s.description = s.summary s.license = 'Apache-2.0' diff --git a/lib/bento/buildmetadata.rb b/lib/bento/buildmetadata.rb index 1c7f6b8c0..e35eb867f 100644 --- a/lib/bento/buildmetadata.rb +++ b/lib/bento/buildmetadata.rb @@ -31,7 +31,7 @@ def read attr_reader :template, :build_timestamp, :override_version def box_basename - "#{name.gsub('/', '__')}-#{arch}" + "#{name.gsub('/', '__')}" end def git_revision @@ -57,7 +57,7 @@ def name if arch == 'aarch64' || arch == 'arm64' "#{merged_vars.fetch('name', template)}-arm64" else - merged_vars.fetch('name', template) + "#{merged_vars.fetch('name', template)}-x86_64" end end diff --git a/lib/bento/runner.rb b/lib/bento/runner.rb index 0d6637ed2..c507b434d 100644 --- a/lib/bento/runner.rb +++ b/lib/bento/runner.rb @@ -2,6 +2,7 @@ require 'bento/buildmetadata' require 'bento/providermetadata' require 'bento/packerexec' +require 'mixlib/shellout' unless defined?(Mixlib::ShellOut) class BuildRunner include Common @@ -30,7 +31,7 @@ def start templates = config ? build_list : template_files banner('Starting build for templates:') banner('Installing packer plugins') - shellout("packer init -upgrade #{File.dirname(templates.first)}/../../packer_templates") + shellout("packer init -upgrade #{File.dirname(templates.first)}/../../packer_templates") unless dry_run templates.each { |t| puts "- #{t}" } time = Benchmark.measure do templates.each { |template| build(template) } @@ -44,17 +45,25 @@ def build(file) bento_dir = Dir.pwd dir = File.dirname(file) template = File.basename(file) + cmd = nil Dir.chdir dir for_packer_run_with(template) do |md_file, _var_file| - cmd = packer_build_cmd(template, md_file.path) - banner("[#{template}] Building: '#{cmd.join(' ')}'") + cmd = Mixlib::ShellOut.new(packer_build_cmd(template, md_file.path).join(' ')) + cmd.live_stream = STDOUT + cmd.timeout = 28800 + banner("[#{template}] Building: '#{cmd.command}'") time = Benchmark.measure do - system(*cmd) || puts("[#{template}] Error building, exited #{$CHILD_STATUS}") + cmd.run_command + end + if Dir.glob("../../builds/*.box").empty? + banner("Not writing metadata file since no boxes exist") + else + write_final_metadata(template, time.real.ceil) end - write_final_metadata(template, time.real.ceil) banner("[#{template}] Finished building in #{duration(time.real)}.") end Dir.chdir(bento_dir) + cmd.error! # fail hard if the cmd fails end def packer_build_cmd(template, _var_file) @@ -78,8 +87,8 @@ def packer_build_cmd(template, _var_file) def write_final_metadata(template, buildtime) md = BuildMetadata.new(template, build_timestamp, override_version).read path = File.join('../../builds') - filename = File.join(path, "#{md[:box_basename]}.metadata.json") - md[:providers] = ProviderMetadata.new(path, md[:box_basename]).read + filename = File.join(path, "#{md[:template]}.metadata.json") + md[:providers] = ProviderMetadata.new(path, md[:template]).read md[:providers].each do |p| p[:build_time] = buildtime p[:build_cpus] = cpus unless cpus.nil? @@ -87,7 +96,7 @@ def write_final_metadata(template, buildtime) end if dry_run - banner('(Dry run) Metadata file contents would be something similar to:') + banner("(Dry run) Metadata file would be written to #{filename} with content similar to:") puts JSON.pretty_generate(md) else File.binwrite(filename, JSON.pretty_generate(md)) diff --git a/lib/bento/version.rb b/lib/bento/version.rb index dfdcdfa2b..03d12b2f2 100644 --- a/lib/bento/version.rb +++ b/lib/bento/version.rb @@ -1,3 +1,3 @@ module Bento - VERSION = '3.1.0'.freeze + VERSION = '3.1.1'.freeze end diff --git a/os_pkrvars/debian/debian-11-aarch64.pkrvars.hcl b/os_pkrvars/debian/debian-11-aarch64.pkrvars.hcl index 9920c5fea..cf5dfbab2 100644 --- a/os_pkrvars/debian/debian-11-aarch64.pkrvars.hcl +++ b/os_pkrvars/debian/debian-11-aarch64.pkrvars.hcl @@ -1,8 +1,8 @@ os_name = "debian" os_version = "11.7" os_arch = "aarch64" -iso_url = "https://cdimage.debian.org/debian-cd/current/arm64/iso-dvd/debian-11.7.0-arm64-DVD-1.iso" -iso_checksum = "file:https://cdimage.debian.org/debian-cd/current/arm64/iso-dvd/SHA256SUMS" +iso_url = "https://cdimage.debian.org/cdimage/archive/latest-oldstable/arm64/iso-dvd/debian-11.7.0-arm64-DVD-1.iso" +iso_checksum = "file:https://cdimage.debian.org/cdimage/archive/latest-oldstable/arm64/iso-dvd/SHA256SUMS" parallels_guest_os_type = "debian" vbox_guest_os_type = "Debian_64" vmware_guest_os_type = "arm-debian-64" diff --git a/os_pkrvars/debian/debian-11-x86_64.pkrvars.hcl b/os_pkrvars/debian/debian-11-x86_64.pkrvars.hcl index bf7474dfb..989e2875e 100644 --- a/os_pkrvars/debian/debian-11-x86_64.pkrvars.hcl +++ b/os_pkrvars/debian/debian-11-x86_64.pkrvars.hcl @@ -1,8 +1,8 @@ os_name = "debian" os_version = "11.7" os_arch = "x86_64" -iso_url = "https://cdimage.debian.org/debian-cd/current/amd64/iso-dvd/debian-11.7.0-amd64-DVD-1.iso" -iso_checksum = "file:https://cdimage.debian.org/debian-cd/current/amd64/iso-dvd/SHA256SUMS" +iso_url = "https://cdimage.debian.org/cdimage/archive/latest-oldstable/amd64/iso-dvd/debian-11.7.0-amd64-DVD-1.iso" +iso_checksum = "file:https://cdimage.debian.org/cdimage/archive/latest-oldstable/amd64/iso-dvd/SHA256SUMS" parallels_guest_os_type = "debian" vbox_guest_os_type = "Debian_64" vmware_guest_os_type = "debian-64" diff --git a/os_pkrvars/opensuse/opensuse-leap-15-aarch64.pkrvars.hcl b/os_pkrvars/opensuse/opensuse-leap-15-aarch64.pkrvars.hcl index 560a0d503..ae1d00738 100644 --- a/os_pkrvars/opensuse/opensuse-leap-15-aarch64.pkrvars.hcl +++ b/os_pkrvars/opensuse/opensuse-leap-15-aarch64.pkrvars.hcl @@ -1,9 +1,9 @@ os_name = "opensuse" -os_version = "15.4" +os_version = "15.5" os_arch = "aarch64" -iso_url = "http://provo-mirror.opensuse.org/distribution/leap/15.4/iso/openSUSE-Leap-15.4-DVD-aarch64-Media.iso" -iso_checksum = "d87f79b2b723f9baaeedd9e2be0365c04081e51a4f7f7f08c7ab3eee0c3e0fae" +iso_url = "http://provo-mirror.opensuse.org/distribution/leap/15.5/iso/openSUSE-Leap-15.5-DVD-aarch64-Media.iso" +iso_checksum = "file:https://provo-mirror.opensuse.org/distribution/leap/15.5/iso/openSUSE-Leap-15.5-DVD-aarch64-Media.iso.sha256" parallels_guest_os_type = "opensuse" vbox_guest_os_type = "OpenSUSE_64" -vmware_guest_os_type = "arm-other5xlinux-64" +vmware_guest_os_type = "arm-opensuse-64" boot_command = ["<wait5><esc><wait>e<wait><down><down><down><down><end> biosdevname=0 net.ifnames=0 netdevice=eth0 netsetup=dhcp lang=en_US textmode=1 modprobe.blacklist=vmwgfx autoyast=http://{{ .HTTPIP }}:{{ .HTTPPort }}/opensuse/autoinst-uefi.xml<f10><wait>"] diff --git a/os_pkrvars/opensuse/opensuse-leap-15-x86_64.pkrvars.hcl b/os_pkrvars/opensuse/opensuse-leap-15-x86_64.pkrvars.hcl index eb5e3169b..487b637bf 100644 --- a/os_pkrvars/opensuse/opensuse-leap-15-x86_64.pkrvars.hcl +++ b/os_pkrvars/opensuse/opensuse-leap-15-x86_64.pkrvars.hcl @@ -1,8 +1,8 @@ os_name = "opensuse" -os_version = "15.4" +os_version = "15.5" os_arch = "x86_64" -iso_url = "http://sfo-korg-mirror.kernel.org/opensuse/distribution/leap/15.4/iso/openSUSE-Leap-15.4-DVD-x86_64-Media.iso" -iso_checksum = "4683345f242397c7fd7d89a50731a120ffd60a24460e21d2634e783b3c169695" +iso_url = "http://sfo-korg-mirror.kernel.org/opensuse/distribution/leap/15.5/iso/openSUSE-Leap-15.5-DVD-x86_64-Media.iso" +iso_checksum = "file:http://sfo-korg-mirror.kernel.org/opensuse/distribution/leap/15.5/iso/openSUSE-Leap-15.5-DVD-x86_64-Media.iso.sha256" parallels_guest_os_type = "opensuse" vbox_guest_os_type = "OpenSUSE_64" vmware_guest_os_type = "opensuse-64" diff --git a/os_pkrvars/springdalelinux/springdalelinux-8-x86_64.pkrvars.hcl b/os_pkrvars/springdalelinux/springdalelinux-8-x86_64.pkrvars.hcl index 779e07f5f..443cd96ce 100644 --- a/os_pkrvars/springdalelinux/springdalelinux-8-x86_64.pkrvars.hcl +++ b/os_pkrvars/springdalelinux/springdalelinux-8-x86_64.pkrvars.hcl @@ -1,8 +1,8 @@ os_name = "springdalelinux" -os_version = "8.7" +os_version = "8.8" os_arch = "x86_64" -iso_url = "http://springdale.princeton.edu/data/springdale/8/x86_64/iso/Springdale%20Linux-8.7-x86_64-netinst.iso" -iso_checksum = "7535d3eadf5d60d12a026ccaf5f1235c660cc985bc1e8b7502a99fd0389407f8" +iso_url = "http://springdale.princeton.edu/data/springdale/8/x86_64/iso/Springdale%20Linux-8.8-x86_64-netinst.iso" +iso_checksum = "8bd617eb9fb050387fdf5abd9445722a1ef247523f2aa66d9cd9f952fbc9f6ff" parallels_guest_os_type = "centos" vbox_guest_os_type = "RedHat_64" vmware_guest_os_type = "centos-64" diff --git a/os_pkrvars/springdalelinux/springdalelinux-9-x86_64.pkrvars.hcl b/os_pkrvars/springdalelinux/springdalelinux-9-x86_64.pkrvars.hcl index 16fe6ce5d..22c7d987c 100644 --- a/os_pkrvars/springdalelinux/springdalelinux-9-x86_64.pkrvars.hcl +++ b/os_pkrvars/springdalelinux/springdalelinux-9-x86_64.pkrvars.hcl @@ -1,8 +1,8 @@ os_name = "springdalelinux" -os_version = "9.1" +os_version = "9.2" os_arch = "x86_64" -iso_url = "http://springdale.princeton.edu/data/springdale/9/x86_64/iso/Springdale%20Linux-9.1-x86_64-netinst.iso" -iso_checksum = "a282a61dfd9ac587aa635688ec3eae8ac95524094dac0355543c3c0f6df84253" +iso_url = "http://springdale.princeton.edu/data/springdale/9/x86_64/iso/Springdale%20Linux-9.2-x86_64-netinst.iso" +iso_checksum = "88138260fec7898decf421fe0ae53953f9512c68009dd24cbd897ce226c6295d" parallels_guest_os_type = "centos" vbox_guest_os_type = "RedHat_64" vmware_guest_os_type = "centos-64" diff --git a/packer_templates/pkr-builder.pkr.hcl b/packer_templates/pkr-builder.pkr.hcl index eb6a86924..0277cfd41 100644 --- a/packer_templates/pkr-builder.pkr.hcl +++ b/packer_templates/pkr-builder.pkr.hcl @@ -11,7 +11,7 @@ packer { } parallels = { version = ">= 1.0.1" - source = "github.com/hashicorp/parallels" + source = "github.com/parallels/parallels" } qemu = { version = ">= 1.0.8" @@ -26,9 +26,14 @@ packer { source = "github.com/hashicorp/virtualbox" } vmware = { - version = ">= 1.0.8" - source = "github.com/hashicorp/vmware" + version = ">= 1.0.9" + source = "github.com/Stromweld/vmware" } + # Temp switch till bug fix for x86 tools location is fixed + # vmware = { + # version = ">= 1.0.8" + # source = "github.com/hashicorp/vmware" + # } windows-update = { version = ">= 0.14.1" source = "github.com/rgl/windows-update" diff --git a/packer_templates/pkr-sources.pkr.hcl b/packer_templates/pkr-sources.pkr.hcl index ca1904f2b..c2035e1b4 100644 --- a/packer_templates/pkr-sources.pkr.hcl +++ b/packer_templates/pkr-sources.pkr.hcl @@ -65,6 +65,12 @@ locals { ) : var.vbox_source # vmware-iso + vmware_tools_upload_flavor = var.vmware_tools_upload_flavor == null ? ( + var.is_windows ? "windows" : "linux" + ) : var.vmware_tools_upload_flavor + vmware_tools_upload_path = var.vmware_tools_upload_path == null ? ( + var.is_windows ? "c:\\vmware-tools.iso" : "/tmp/vmware-tools.iso" + ) : var.vmware_tools_upload_path # Source block common boot_wait = var.boot_wait == null ? ( @@ -258,8 +264,8 @@ source "vmware-iso" "vm" { guest_os_type = var.vmware_guest_os_type network = var.vmware_network network_adapter_type = var.vmware_network_adapter_type - tools_upload_flavor = var.vmware_tools_upload_flavor - tools_upload_path = var.vmware_tools_upload_path + tools_upload_flavor = local.vmware_tools_upload_flavor + tools_upload_path = local.vmware_tools_upload_path usb = var.vmware_enable_usb version = var.vmware_version vmx_data = var.vmware_vmx_data diff --git a/packer_templates/pkr-variables.pkr.hcl b/packer_templates/pkr-variables.pkr.hcl index 6de55b7f4..5f67e0e8f 100644 --- a/packer_templates/pkr-variables.pkr.hcl +++ b/packer_templates/pkr-variables.pkr.hcl @@ -205,8 +205,10 @@ variable "vmware_version" { variable "vmware_vmx_data" { type = map(string) default = { - "cpuid.coresPerSocket" = "1" + "cpuid.coresPerSocket" = "2" "ethernet0.pciSlotNumber" = "32" + "svga.autodetect" = true + "usb_xhci.present" = true } } variable "vmware_vmx_remove_ethernet_interfaces" { diff --git a/packer_templates/scripts/windows/provision.ps1 b/packer_templates/scripts/windows/provision.ps1 index 1fd0979ed..99a4052c4 100644 --- a/packer_templates/scripts/windows/provision.ps1 +++ b/packer_templates/scripts/windows/provision.ps1 @@ -83,9 +83,13 @@ if ($systemVendor -eq 'QEMU') { } elseif ($systemVendor -eq 'Microsoft Corporation') { # do nothing. Hyper-V enlightments are already bundled with Windows. } elseif ($systemVendor -eq 'VMware, Inc.') { + Write-Host 'Mounting VMware Tools ISO...' + Mount-DiskImage -ImagePath C:\\vmware-tools.iso -PassThru | Get-Volume | Set-Volume -DriveLetter B + Write-Host 'Installing VMware Tools...' + Start-Process -Wait -FilePath D:\\setup.exe -ArgumentList '/s' Write-Output 'Installing VMware Tools...' # silent install without rebooting. - E:\setup64.exe /s /v '/qn reboot=r'| Out-String -Stream + B:\setup64.exe /s /v '/qn reboot=r'| Out-String -Stream } elseif ($systemVendor -eq 'Parallels Software International Inc.') { Write-Host 'Installing the Parallels Tools for Guest VM...' E:\PTAgent.exe /install_silent | Out-String -Stream From ebbbdcc5a451177bbe5213040d344c065d659ccf Mon Sep 17 00:00:00 2001 From: zbleness <zalan.blenessy@volvocars.com> Date: Tue, 25 Jul 2023 15:45:27 +0200 Subject: [PATCH 1525/1622] provision.ps1: fixed virtio-win-guest-tools.exe installation (#1516) Newer virtio-win.iso has E:\virtio-win-guest-tools.exe. From the code it seems like older virtio-win.iso has this file in E:\driver. Made sure script works with both old and new virtio-win.iso. Signed-off-by: Zalan Bleneszy <zalan.blenessy@volvocars.com> --- packer_templates/scripts/windows/provision.ps1 | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/packer_templates/scripts/windows/provision.ps1 b/packer_templates/scripts/windows/provision.ps1 index 99a4052c4..122f2a343 100644 --- a/packer_templates/scripts/windows/provision.ps1 +++ b/packer_templates/scripts/windows/provision.ps1 @@ -59,11 +59,14 @@ Add-Type -A System.IO.Compression.FileSystem # install Guest Additions. $systemVendor = (Get-CimInstance -ClassName Win32_ComputerSystemProduct -Property Vendor).Vendor if ($systemVendor -eq 'QEMU') { - $guestToolsPath = "e:\drivers\virtio-win-guest-tools.exe" - $guestTools = "$env:TEMP\$(Split-Path -Leaf $guestToolsPath)" - $guestToolsLog = "$guestTools.log" + # in more recent virtio-win.iso virtio-win-guest-tools.exe has move to E:\ + $guestToolsPath = dir -Path E:\ -Filter virtio-win-guest-tools.exe -Recurse | %{$_.FullName} + if (!$guestToolsPath) { + throw "did not find virtio-win-guest-tools.exe on E:\" + } + $guestToolsLog = "$env:TEMP\$(Split-Path -Leaf $guestToolsPath).log" Write-Host 'Installing the guest tools...' - &$guestTools /install /norestart /quiet /log $guestToolsLog | Out-String -Stream + &$guestToolsPath /install /norestart /quiet /log $guestToolsLog | Out-String -Stream if ($LASTEXITCODE) { throw "failed to install guest tools with exit code $LASTEXITCODE" } From 60265badadf7f46c585b917a010bb05aba30c1bc Mon Sep 17 00:00:00 2001 From: Seth Grover <13872653+mmguero@users.noreply.github.com> Date: Tue, 25 Jul 2023 11:42:43 -0600 Subject: [PATCH 1526/1622] Update Debian from 12.0 to 12.1 (https://www.debian.org/News/2023/20230722) (#1517) Signed-off-by: Seth Grover <mero.mero.guero@gmail.com> --- os_pkrvars/debian/debian-12-aarch64.pkrvars.hcl | 6 +++--- os_pkrvars/debian/debian-12-x86_64.pkrvars.hcl | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/os_pkrvars/debian/debian-12-aarch64.pkrvars.hcl b/os_pkrvars/debian/debian-12-aarch64.pkrvars.hcl index c16ba4c3e..a09a8ca52 100644 --- a/os_pkrvars/debian/debian-12-aarch64.pkrvars.hcl +++ b/os_pkrvars/debian/debian-12-aarch64.pkrvars.hcl @@ -1,8 +1,8 @@ os_name = "debian" -os_version = "12.0" +os_version = "12.1" os_arch = "aarch64" -iso_url = "https://cdimage.debian.org/cdimage/release/12.0.0/arm64/iso-dvd/debian-12.0.0-arm64-DVD-1.iso" -iso_checksum = "file:https://cdimage.debian.org/cdimage/release/12.0.0/arm64/iso-dvd/SHA256SUMS" +iso_url = "https://cdimage.debian.org/cdimage/release/12.1.0/arm64/iso-dvd/debian-12.1.0-arm64-DVD-1.iso" +iso_checksum = "file:https://cdimage.debian.org/cdimage/release/12.1.0/arm64/iso-dvd/SHA256SUMS" parallels_guest_os_type = "debian" vbox_guest_os_type = "Debian_64" vmware_guest_os_type = "arm-debian-64" diff --git a/os_pkrvars/debian/debian-12-x86_64.pkrvars.hcl b/os_pkrvars/debian/debian-12-x86_64.pkrvars.hcl index 5bf313a01..27a47e5d1 100644 --- a/os_pkrvars/debian/debian-12-x86_64.pkrvars.hcl +++ b/os_pkrvars/debian/debian-12-x86_64.pkrvars.hcl @@ -1,8 +1,8 @@ os_name = "debian" -os_version = "12.0" +os_version = "12.1" os_arch = "x86_64" -iso_url = "https://cdimage.debian.org/cdimage/release/12.0.0/amd64/iso-dvd/debian-12.0.0-amd64-DVD-1.iso" -iso_checksum = "file:https://cdimage.debian.org/cdimage/release/12.0.0/amd64/iso-dvd/SHA256SUMS" +iso_url = "https://cdimage.debian.org/cdimage/release/12.1.0/amd64/iso-dvd/debian-12.1.0-amd64-DVD-1.iso" +iso_checksum = "file:https://cdimage.debian.org/cdimage/release/12.1.0/amd64/iso-dvd/SHA256SUMS" parallels_guest_os_type = "debian" vbox_guest_os_type = "Debian_64" vmware_guest_os_type = "debian-64" From d56f2198a32c1a8110c0a1596336e6844c56e014 Mon Sep 17 00:00:00 2001 From: Dave Rawks <dave@rawks.io> Date: Tue, 1 Aug 2023 07:51:01 -0700 Subject: [PATCH 1527/1622] Update vmware vars for el9 derivitives (#1519) * updates `vmware_guest_os_type` for almalinux and rockylinux 9 aarch64 to match the vmware hardware profile which reliably results in a successful build Signed-off-by: Dave Rawks <drawks@craigslist.org> --- os_pkrvars/almalinux/almalinux-9-aarch64.pkrvars.hcl | 2 +- os_pkrvars/rockylinux/rockylinux-9-aarch64.pkrvars.hcl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/os_pkrvars/almalinux/almalinux-9-aarch64.pkrvars.hcl b/os_pkrvars/almalinux/almalinux-9-aarch64.pkrvars.hcl index 1de0f08a7..1052b8951 100644 --- a/os_pkrvars/almalinux/almalinux-9-aarch64.pkrvars.hcl +++ b/os_pkrvars/almalinux/almalinux-9-aarch64.pkrvars.hcl @@ -5,5 +5,5 @@ iso_url = "https://repo.almalinux.org/almalinux/9/isos/aarch64/A iso_checksum = "file:https://repo.almalinux.org/almalinux/9/isos/aarch64/CHECKSUM" parallels_guest_os_type = "centos" vbox_guest_os_type = "RedHat_64" -vmware_guest_os_type = "arm-centos-64" +vmware_guest_os_type = "arm-rhel9-64" boot_command = ["<wait><up>e<wait><down><down><end><wait> inst.text inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/rhel/9ks.cfg <leftCtrlOn>x<leftCtrlOff>"] diff --git a/os_pkrvars/rockylinux/rockylinux-9-aarch64.pkrvars.hcl b/os_pkrvars/rockylinux/rockylinux-9-aarch64.pkrvars.hcl index e93934191..016152923 100644 --- a/os_pkrvars/rockylinux/rockylinux-9-aarch64.pkrvars.hcl +++ b/os_pkrvars/rockylinux/rockylinux-9-aarch64.pkrvars.hcl @@ -5,5 +5,5 @@ iso_url = "https://download.rockylinux.org/pub/rocky/9/isos/aarc iso_checksum = "file:https://download.rockylinux.org/pub/rocky/9/isos/aarch64/CHECKSUM" parallels_guest_os_type = "centos" vbox_guest_os_type = "RedHat_64" -vmware_guest_os_type = "arm-centos-64" +vmware_guest_os_type = "arm-rhel9-64" boot_command = ["<wait><up>e<wait><down><down><end><wait> inst.text inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/rhel/9ks.cfg <leftCtrlOn>x<leftCtrlOff>"] From 4721081e06e1f7c475d5d07bf6468ebb42c0c35c Mon Sep 17 00:00:00 2001 From: Matthew Bradbury <MBradbury@users.noreply.github.com> Date: Wed, 6 Sep 2023 15:34:55 +0100 Subject: [PATCH 1528/1622] Do not defrag and zerofill the disk twice during Windows cleanup and optimize (#1525) Signed-off-by: Matthew Bradbury <m.s.bradbury@lancaster.ac.uk> --- packer_templates/scripts/windows/cleanup.ps1 | 27 ------------ packer_templates/scripts/windows/optimize.ps1 | 41 +++++++++++-------- 2 files changed, 23 insertions(+), 45 deletions(-) diff --git a/packer_templates/scripts/windows/cleanup.ps1 b/packer_templates/scripts/windows/cleanup.ps1 index 23b3e0707..0c64f432f 100644 --- a/packer_templates/scripts/windows/cleanup.ps1 +++ b/packer_templates/scripts/windows/cleanup.ps1 @@ -14,30 +14,3 @@ try { Icacls "C:\Windows\Temp\*" /GRANT:r administrators:F /T /c /q 2>&1 Remove-Item "C:\Windows\Temp\*" -Recurse -Force -ErrorAction SilentlyContinue } catch { } - -Write-Host "Optimizing Drive" -Optimize-Volume -DriveLetter C - -Write-Host "Wiping empty space on disk..." -$FilePath="c:\zero.tmp" -$Volume = Get-WmiObject win32_logicaldisk -filter "DeviceID='C:'" -$ArraySize= 64kb -$SpaceToLeave= $Volume.Size * 0.05 -$FileSize= $Volume.FreeSpace - $SpacetoLeave -$ZeroArray= new-object byte[]($ArraySize) - -$Stream= [io.File]::OpenWrite($FilePath) -try { - $CurFileSize = 0 - while($CurFileSize -lt $FileSize) { - $Stream.Write($ZeroArray,0, $ZeroArray.Length) - $CurFileSize +=$ZeroArray.Length - } -} -finally { - if($Stream) { - $Stream.Close() - } -} - -Remove-Item $FilePath diff --git a/packer_templates/scripts/windows/optimize.ps1 b/packer_templates/scripts/windows/optimize.ps1 index 86877e667..a6908c2aa 100644 --- a/packer_templates/scripts/windows/optimize.ps1 +++ b/packer_templates/scripts/windows/optimize.ps1 @@ -193,24 +193,29 @@ dism.exe /Online /Cleanup-Image /AnalyzeComponentStore # # reclaim the free disk space. -Write-Host 'Reclaiming the free disk space...' -$results = defrag.exe C: /H /L -if ($results -eq 'The operation completed successfully.') -{ - $results -} -else -{ - if ((Get-CimInstance Win32_OperatingSystem).version -eq "6.3.9600") - { - return +Write-Host "Optimizing Drive" +Optimize-Volume -DriveLetter C -Analyze -Defrag + +Write-Host "Wiping empty space on disk..." +$FilePath = "C:\zero.tmp" +$Volume = Get-WmiObject win32_logicaldisk -filter "DeviceID='C:'" +$ArraySize = 64kb +$SpaceToLeave = $Volume.Size * 0.05 +$FileSize = $Volume.FreeSpace - $SpacetoLeave +$ZeroArray = new-object byte[]($ArraySize) + +$Stream = [io.File]::OpenWrite($FilePath) +try { + $CurFileSize = 0 + while($CurFileSize -lt $FileSize) { + $Stream.Write($ZeroArray, 0, $ZeroArray.Length) + $CurFileSize += $ZeroArray.Length } - else - { - Write-Host 'Zero filling the free disk space...' - (New-Object System.Net.WebClient).DownloadFile('https://download.sysinternals.com/files/SDelete.zip', "$env:TEMP\SDelete.zip") - Expand-Archive "$env:TEMP\SDelete.zip" $env:TEMP - Remove-Item "$env:TEMP\SDelete.zip" - &"$env:TEMP\sdelete64.exe" -accepteula -z C: +} +finally { + if($Stream) { + $Stream.Close() } } + +Remove-Item $FilePath From f02b325eee11f7f9025f88c1a865ac97004b4fac Mon Sep 17 00:00:00 2001 From: Matthias Pigulla <mp@webfactory.de> Date: Thu, 7 Sep 2023 16:44:58 +0200 Subject: [PATCH 1529/1622] Update Ubuntu 22.04 `iso_url` (#1527) The https://releases.ubuntu.com/jammy/ubuntu-22.04.2-live-server-amd64.iso address is no longer available (404). Since August 2023, there is a .3 release. Signed-off-by: Matthias Pigulla <mp@webfactory.de> --- os_pkrvars/ubuntu/ubuntu-22.04-aarch64.pkrvars.hcl | 2 +- os_pkrvars/ubuntu/ubuntu-22.04-x86_64.pkrvars.hcl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/os_pkrvars/ubuntu/ubuntu-22.04-aarch64.pkrvars.hcl b/os_pkrvars/ubuntu/ubuntu-22.04-aarch64.pkrvars.hcl index 694d493b0..41a66a16c 100644 --- a/os_pkrvars/ubuntu/ubuntu-22.04-aarch64.pkrvars.hcl +++ b/os_pkrvars/ubuntu/ubuntu-22.04-aarch64.pkrvars.hcl @@ -1,7 +1,7 @@ os_name = "ubuntu" os_version = "22.04" os_arch = "aarch64" -iso_url = "https://cdimage.ubuntu.com/releases/22.04/release/ubuntu-22.04.2-live-server-arm64.iso" +iso_url = "https://cdimage.ubuntu.com/releases/22.04/release/ubuntu-22.04.3-live-server-arm64.iso" iso_checksum = "file:https://cdimage.ubuntu.com/releases/22.04/release/SHA256SUMS" hyperv_generation = 2 parallels_guest_os_type = "ubuntu" diff --git a/os_pkrvars/ubuntu/ubuntu-22.04-x86_64.pkrvars.hcl b/os_pkrvars/ubuntu/ubuntu-22.04-x86_64.pkrvars.hcl index da713f287..2f43549c0 100644 --- a/os_pkrvars/ubuntu/ubuntu-22.04-x86_64.pkrvars.hcl +++ b/os_pkrvars/ubuntu/ubuntu-22.04-x86_64.pkrvars.hcl @@ -1,7 +1,7 @@ os_name = "ubuntu" os_version = "22.04" os_arch = "x86_64" -iso_url = "https://releases.ubuntu.com/jammy/ubuntu-22.04.2-live-server-amd64.iso" +iso_url = "https://releases.ubuntu.com/jammy/ubuntu-22.04.3-live-server-amd64.iso" iso_checksum = "file:https://releases.ubuntu.com/jammy/SHA256SUMS" hyperv_generation = 2 parallels_guest_os_type = "ubuntu" From 53d7679e08be434a5d1ebff5cc5c07db696c5383 Mon Sep 17 00:00:00 2001 From: Matthias Pigulla <mp@webfactory.de> Date: Thu, 7 Sep 2023 16:50:57 +0200 Subject: [PATCH 1530/1622] Keep linux-kernel-header package installed for Parallels builds (#1526) add kernel headers for current installed kernel so parallels tools auto update will work Signed-off-by: Matthias Pigulla <mp@webfactory.de> --- packer_templates/pkr-builder.pkr.hcl | 1 + .../parallels_post_cleanup_debian_ubuntu.sh | 14 ++++++++++++++ 2 files changed, 15 insertions(+) create mode 100644 packer_templates/scripts/_common/parallels_post_cleanup_debian_ubuntu.sh diff --git a/packer_templates/pkr-builder.pkr.hcl b/packer_templates/pkr-builder.pkr.hcl index 0277cfd41..67387065d 100644 --- a/packer_templates/pkr-builder.pkr.hcl +++ b/packer_templates/pkr-builder.pkr.hcl @@ -115,6 +115,7 @@ locals { "${path.root}/scripts/_common/parallels.sh", "${path.root}/scripts/${var.os_name}/hyperv_${var.os_name}.sh", "${path.root}/scripts/${var.os_name}/cleanup_${var.os_name}.sh", + "${path.root}/scripts/_common/parallels_post_cleanup_debian_ubuntu.sh", "${path.root}/scripts/_common/minimize.sh" ] : ( var.os_name == "fedora" ? [ diff --git a/packer_templates/scripts/_common/parallels_post_cleanup_debian_ubuntu.sh b/packer_templates/scripts/_common/parallels_post_cleanup_debian_ubuntu.sh new file mode 100644 index 000000000..2ec32b723 --- /dev/null +++ b/packer_templates/scripts/_common/parallels_post_cleanup_debian_ubuntu.sh @@ -0,0 +1,14 @@ +#!/bin/sh -eux + +case "$PACKER_BUILDER_TYPE" in +parallels-iso|parallels-pvm) + # This runs in a special script after cleanup_{ubuntu|debian}.sh, which cleans up the kernel headers + # in general (we want to keep them for Parallels Desktop only). + + echo "Installing linux-kernel-headers for the current kernel version, to allow re-compilation of Parallels Tools upon boot" + + if [ -f "/usr/bin/apt-get" ]; then + apt-get install -y linux-headers-"$(uname -r)" + fi + ;; +esac From e3da65274b1275a51bb64c202335c4d84db8ae66 Mon Sep 17 00:00:00 2001 From: Corey Hemminger <hemminger@hotmail.com> Date: Fri, 15 Sep 2023 17:08:53 -0400 Subject: [PATCH 1531/1622] added vagrant upload account configuration in builds.yml (#1522) * Added bento upload to use vagrant account configured in builds.yml * Updated windows vagrant template to default to 4GB of memory * Default hyper-v to generation 2 * Removed EOL OS builds Windows2012r2, Ubuntu 18.04, Ubuntu 22.10, Debian 10 * Remove use of deprecated chef-solo provisioner and cookbooks for windows builds * Add boot_wait variables for each provider * Adjusted default_boot_wait for linux to 5s * Added --vars and --var_files flags * Fixed upload description for libvirt to add qemu hv and version * Updated ubuntu 20.04 boot_command * Changed workflows to be based on cpu architecture * Updated Bento to continue builds even if one fails and report all failures at the end and exit with exit code 1 * Added qemu clone of libvirt box when metadata file is created for uploading to vagrant qemu provider * Made build shell scripts customizable through packer variable --- .github/workflows/ci-build.yml | 6 +- .github/workflows/pkr-bld-amazonlinux-x64.yml | 8 +- .github/workflows/pkr-bld-hyperv-x64.yml | 11 - .github/workflows/pkr-bld-parallels-arm64.yml | 7 +- .github/workflows/pkr-bld-parallels-x64.yml | 13 +- .github/workflows/pkr-bld-qemu-arm64.yml | 9 +- .github/workflows/pkr-bld-qemu-x64.yml | 15 +- .../workflows/pkr-bld-virtualbox-arm64.yml | 7 +- .github/workflows/pkr-bld-virtualbox-x64.yml | 13 +- .github/workflows/pkr-bld-vmware-arm64.yml | 7 +- .github/workflows/pkr-bld-vmware-x64.yml | 13 +- CHANGELOG.md | 88 +-- README.md | 53 +- builds.yml | 39 +- lib/bento/buildmetadata.rb | 24 +- lib/bento/cli.rb | 14 +- lib/bento/normalize.rb | 2 +- lib/bento/packerexec.rb | 4 +- lib/bento/providermetadata.rb | 19 +- lib/bento/runner.rb | 47 +- lib/bento/test.rb | 9 +- lib/bento/test_templates/kitchen.yml.erb | 1 + lib/bento/upload.rb | 34 +- lib/bento/version.rb | 2 +- .../debian/debian-10-aarch64.pkrvars.hcl | 9 - .../debian/debian-10-x86_64.pkrvars.hcl | 9 - .../ubuntu/ubuntu-18.04-aarch64.pkrvars.hcl | 10 - .../ubuntu/ubuntu-18.04-x86_64.pkrvars.hcl | 10 - .../ubuntu/ubuntu-20.04-aarch64.pkrvars.hcl | 3 +- .../ubuntu/ubuntu-20.04-x86_64.pkrvars.hcl | 4 +- .../ubuntu/ubuntu-22.04-aarch64.pkrvars.hcl | 5 +- .../ubuntu/ubuntu-22.04-x86_64.pkrvars.hcl | 1 - .../ubuntu/ubuntu-22.10-aarch64.pkrvars.hcl | 10 - .../ubuntu/ubuntu-22.10-x86_64.pkrvars.hcl | 10 - .../ubuntu/ubuntu-23.04-aarch64.pkrvars.hcl | 5 +- .../ubuntu/ubuntu-23.04-x86_64.pkrvars.hcl | 5 +- .../windows/windows-10-x86_64.pkrvars.hcl | 1 + .../windows/windows-10gen2-x86_64.pkrvars.hcl | 12 - .../windows/windows-11-x86_64.pkrvars.hcl | 5 +- .../windows/windows-11gen2-x86_64.pkrvars.hcl | 13 - .../windows/windows-2012r2-x86_64.pkrvars.hcl | 9 - packer_templates/cookbooks/packer/Berksfile | 3 - packer_templates/cookbooks/packer/chefignore | 115 ---- packer_templates/cookbooks/packer/kitchen.yml | 41 -- packer_templates/cookbooks/packer/metadata.rb | 7 - .../cookbooks/packer/recipes/cleanup.rb | 79 --- .../packer/recipes/configure_power.rb | 16 - .../cookbooks/packer/recipes/defrag.rb | 20 - .../packer/recipes/disable_restore.rb | 5 - .../packer/recipes/disable_screensaver.rb | 5 - .../cookbooks/packer/recipes/disable_uac.rb | 5 - .../packer/recipes/disable_windows_update.rb | 4 - .../packer/recipes/enable_file_sharing.rb | 3 - .../packer/recipes/enable_remote_desktop.rb | 10 - .../cookbooks/packer/recipes/features.rb | 3 - .../packer/recipes/remove_defender.rb | 3 - .../set_local_account_token_filter_policy.rb | 7 - .../cookbooks/packer/recipes/ui_tweaks.rb | Bin 3851 -> 0 bytes .../cookbooks/packer/recipes/updates.rb | 13 - .../cookbooks/packer/recipes/vm_tools.rb | 37 -- .../http/ubuntu/preseed-hyperv.cfg | 37 -- packer_templates/http/ubuntu/preseed.cfg | 90 --- packer_templates/pkr-builder.pkr.hcl | 234 ++++---- packer_templates/pkr-sources.pkr.hcl | 62 +-- packer_templates/pkr-variables.pkr.hcl | 32 +- .../scripts/windows/base_setup.ps1 | 54 -- packer_templates/scripts/windows/cleanup.ps1 | 114 +++- .../scripts/windows/configure-power 2.ps1 | 32 ++ .../scripts/windows/configure-power.ps1 | 32 ++ .../scripts/windows/disable-screensaver 2.ps1 | 17 + .../scripts/windows/disable-screensaver.ps1 | 17 + .../windows/disable-system-restore 2.ps1 | 17 + .../windows/disable-system-restore.ps1 | 17 + .../windows/disable-windows-defender.ps1 | 1 + .../scripts/windows/disable-windows-uac 2.ps1 | 20 + .../scripts/windows/disable-windows-uac.ps1 | 20 + .../windows/disable-windows-updates.ps1 | 3 +- .../scripts/windows/enable-file-sharing 2.ps1 | 17 + .../scripts/windows/enable-file-sharing.ps1 | 17 + .../scripts/windows/enable-remote-desktop.ps1 | 8 +- packer_templates/scripts/windows/optimize.ps1 | 71 +-- .../scripts/windows/provision-winrm.ps1 | 100 ---- .../scripts/windows/provision.ps1 | 14 +- .../scripts/windows/remove-apps.ps1 | 15 +- .../windows/remove-one-drive-and-teams 2.ps1 | 259 +++++++++ .../windows/remove-one-drive-and-teams.ps1 | 259 +++++++++ .../scripts/windows/remove-one-drive.ps1 | 69 --- .../scripts/windows/ui-tweaks 2.ps1 | 65 +++ .../scripts/windows/ui-tweaks.ps1 | 65 +++ ...albox-prevent-vboxsrv-resolution-delay.ps1 | 34 -- .../vagrantfile-windows-gen2.template | 22 - packer_templates/vagrantfile-windows.template | 10 +- .../win_answer_files/10/Autounattend.xml | 498 ++++++++++------- .../Autounattend 2.xml} | 177 ++++-- .../hyperv-gen2/Autounattend.xml} | 203 ++++--- .../win_answer_files/11/Autounattend.xml | 522 +++++++++++------- .../11/hyperv-gen2/Autounattend 2.xml | 341 ++++++++++++ .../11/hyperv-gen2/Autounattend.xml | 341 ++++++++++++ .../win_answer_files/2012/Autounattend.xml | 289 ---------- .../win_answer_files/2012r2/Autounattend.xml | 289 ---------- .../win_answer_files/2016/Autounattend.xml | 327 ++++++----- .../2016/hyperv-gen2/Autounattend 2.xml | 332 +++++++++++ .../2016/hyperv-gen2/Autounattend.xml | 332 +++++++++++ .../win_answer_files/2019/Autounattend.xml | 327 ++++++----- .../2019/hyperv-gen2/Autounattend 2.xml | 332 +++++++++++ .../2019/hyperv-gen2/Autounattend.xml | 332 +++++++++++ .../win_answer_files/2022/Autounattend.xml | 327 ++++++----- .../2022/hyperv-gen2/Autounattend 2.xml | 332 +++++++++++ .../2022/hyperv-gen2/Autounattend.xml | 332 +++++++++++ 109 files changed, 5481 insertions(+), 2918 deletions(-) delete mode 100644 os_pkrvars/debian/debian-10-aarch64.pkrvars.hcl delete mode 100644 os_pkrvars/debian/debian-10-x86_64.pkrvars.hcl delete mode 100644 os_pkrvars/ubuntu/ubuntu-18.04-aarch64.pkrvars.hcl delete mode 100644 os_pkrvars/ubuntu/ubuntu-18.04-x86_64.pkrvars.hcl delete mode 100644 os_pkrvars/ubuntu/ubuntu-22.10-aarch64.pkrvars.hcl delete mode 100644 os_pkrvars/ubuntu/ubuntu-22.10-x86_64.pkrvars.hcl delete mode 100644 os_pkrvars/windows/windows-10gen2-x86_64.pkrvars.hcl delete mode 100644 os_pkrvars/windows/windows-11gen2-x86_64.pkrvars.hcl delete mode 100644 os_pkrvars/windows/windows-2012r2-x86_64.pkrvars.hcl delete mode 100644 packer_templates/cookbooks/packer/Berksfile delete mode 100644 packer_templates/cookbooks/packer/chefignore delete mode 100644 packer_templates/cookbooks/packer/kitchen.yml delete mode 100644 packer_templates/cookbooks/packer/metadata.rb delete mode 100644 packer_templates/cookbooks/packer/recipes/cleanup.rb delete mode 100644 packer_templates/cookbooks/packer/recipes/configure_power.rb delete mode 100644 packer_templates/cookbooks/packer/recipes/defrag.rb delete mode 100644 packer_templates/cookbooks/packer/recipes/disable_restore.rb delete mode 100644 packer_templates/cookbooks/packer/recipes/disable_screensaver.rb delete mode 100644 packer_templates/cookbooks/packer/recipes/disable_uac.rb delete mode 100644 packer_templates/cookbooks/packer/recipes/disable_windows_update.rb delete mode 100644 packer_templates/cookbooks/packer/recipes/enable_file_sharing.rb delete mode 100644 packer_templates/cookbooks/packer/recipes/enable_remote_desktop.rb delete mode 100644 packer_templates/cookbooks/packer/recipes/features.rb delete mode 100644 packer_templates/cookbooks/packer/recipes/remove_defender.rb delete mode 100644 packer_templates/cookbooks/packer/recipes/set_local_account_token_filter_policy.rb delete mode 100644 packer_templates/cookbooks/packer/recipes/ui_tweaks.rb delete mode 100644 packer_templates/cookbooks/packer/recipes/updates.rb delete mode 100644 packer_templates/cookbooks/packer/recipes/vm_tools.rb delete mode 100755 packer_templates/http/ubuntu/preseed-hyperv.cfg delete mode 100644 packer_templates/http/ubuntu/preseed.cfg delete mode 100644 packer_templates/scripts/windows/base_setup.ps1 create mode 100644 packer_templates/scripts/windows/configure-power 2.ps1 create mode 100644 packer_templates/scripts/windows/configure-power.ps1 create mode 100644 packer_templates/scripts/windows/disable-screensaver 2.ps1 create mode 100644 packer_templates/scripts/windows/disable-screensaver.ps1 create mode 100644 packer_templates/scripts/windows/disable-system-restore 2.ps1 create mode 100644 packer_templates/scripts/windows/disable-system-restore.ps1 create mode 100644 packer_templates/scripts/windows/disable-windows-uac 2.ps1 create mode 100644 packer_templates/scripts/windows/disable-windows-uac.ps1 create mode 100644 packer_templates/scripts/windows/enable-file-sharing 2.ps1 create mode 100644 packer_templates/scripts/windows/enable-file-sharing.ps1 delete mode 100644 packer_templates/scripts/windows/provision-winrm.ps1 create mode 100644 packer_templates/scripts/windows/remove-one-drive-and-teams 2.ps1 create mode 100644 packer_templates/scripts/windows/remove-one-drive-and-teams.ps1 delete mode 100644 packer_templates/scripts/windows/remove-one-drive.ps1 create mode 100644 packer_templates/scripts/windows/ui-tweaks 2.ps1 create mode 100644 packer_templates/scripts/windows/ui-tweaks.ps1 delete mode 100644 packer_templates/scripts/windows/virtualbox-prevent-vboxsrv-resolution-delay.ps1 delete mode 100644 packer_templates/vagrantfile-windows-gen2.template rename packer_templates/win_answer_files/10/{gen2_Autounattend.xml => hyperv-gen2/Autounattend 2.xml} (53%) rename packer_templates/win_answer_files/{11/gen2_Autounattend.xml => 10/hyperv-gen2/Autounattend.xml} (50%) create mode 100644 packer_templates/win_answer_files/11/hyperv-gen2/Autounattend 2.xml create mode 100644 packer_templates/win_answer_files/11/hyperv-gen2/Autounattend.xml delete mode 100644 packer_templates/win_answer_files/2012/Autounattend.xml delete mode 100644 packer_templates/win_answer_files/2012r2/Autounattend.xml create mode 100644 packer_templates/win_answer_files/2016/hyperv-gen2/Autounattend 2.xml create mode 100644 packer_templates/win_answer_files/2016/hyperv-gen2/Autounattend.xml create mode 100644 packer_templates/win_answer_files/2019/hyperv-gen2/Autounattend 2.xml create mode 100644 packer_templates/win_answer_files/2019/hyperv-gen2/Autounattend.xml create mode 100644 packer_templates/win_answer_files/2022/hyperv-gen2/Autounattend 2.xml create mode 100644 packer_templates/win_answer_files/2022/hyperv-gen2/Autounattend.xml diff --git a/.github/workflows/ci-build.yml b/.github/workflows/ci-build.yml index 842a872d2..6864185e1 100644 --- a/.github/workflows/ci-build.yml +++ b/.github/workflows/ci-build.yml @@ -28,9 +28,9 @@ jobs: powershell-lint: uses: chef/github-workflows/.github/workflows/powershell-lint.yml@main - pkr-bld-amazonlinux-x64: - uses: ./.github/workflows/pkr-bld-amazonlinux-x64.yml - secrets: inherit +# pkr-bld-amazonlinux-x64: +# uses: ./.github/workflows/pkr-bld-amazonlinux-x64.yml +# secrets: inherit pkr-bld-hyperv-x64: uses: ./.github/workflows/pkr-bld-hyperv-x64.yml diff --git a/.github/workflows/pkr-bld-amazonlinux-x64.yml b/.github/workflows/pkr-bld-amazonlinux-x64.yml index facc751a2..033202112 100644 --- a/.github/workflows/pkr-bld-amazonlinux-x64.yml +++ b/.github/workflows/pkr-bld-amazonlinux-x64.yml @@ -26,12 +26,16 @@ jobs: run: if packer fmt -check -recursive .; then exit 0; else echo "Some packer files need to be formatted, run 'packer fmt -recursive .' to fix"; exit 1; fi - name: Packer Validate run: packer validate -var-file=os_pkrvars/$(echo ${{ matrix.os }} | cut -d "-" -f 1)/"${{ matrix.os }}-x86_64.pkrvars.hcl" packer_templates - - name: Packer build + - name: Bento build run: | eval "$(chef shell-init bash)" ./AMZ_build_virtualbox-ovf.sh - bento build -n os_pkrvars/$(echo ${{ matrix.os }} | cut -d "-" -f 1)/"${{ matrix.os }}-x86_64.pkrvars.hcl" >> builds/amazonlinux-2-x86_64.metadata.json + bento build --metadata_only os_pkrvars/$(echo ${{ matrix.os }} | cut -d "-" -f 1)/"${{ matrix.os }}-x86_64.pkrvars.hcl" ls -alh builds +# - name: Bento Test +# run: | +# eval "$(chef shell-init bash)" +# bento test - name: Remove VM in case of canceled job if: cancelled() run: | diff --git a/.github/workflows/pkr-bld-hyperv-x64.yml b/.github/workflows/pkr-bld-hyperv-x64.yml index ca77f1ee5..1365135c4 100644 --- a/.github/workflows/pkr-bld-hyperv-x64.yml +++ b/.github/workflows/pkr-bld-hyperv-x64.yml @@ -17,7 +17,6 @@ jobs: - centos-7 - centos-stream-8 - centos-stream-9 - - debian-10 - debian-11 - debian-12 - fedora-37 @@ -34,19 +33,9 @@ jobs: - springdalelinux-7 - springdalelinux-8 - springdalelinux-9 - - ubuntu-18.04 - ubuntu-20.04 - ubuntu-22.04 - - ubuntu-22.10 - ubuntu-23.04 -# - windows-10 -# - windows-10gen2 -# - windows-11 -# - windows-11gen2 -# - windows-2012r2 -# - windows-2016 -# - windows-2019 -# - windows-2022 provider: - hyperv-iso steps: diff --git a/.github/workflows/pkr-bld-parallels-arm64.yml b/.github/workflows/pkr-bld-parallels-arm64.yml index c678d1199..56abac053 100644 --- a/.github/workflows/pkr-bld-parallels-arm64.yml +++ b/.github/workflows/pkr-bld-parallels-arm64.yml @@ -17,7 +17,6 @@ jobs: - centos-7 - centos-stream-8 - centos-stream-9 - - debian-10 - debian-11 - debian-12 - fedora-37 @@ -30,10 +29,8 @@ jobs: - oracle-9 - rockylinux-8 - rockylinux-9 - - ubuntu-18.04 - ubuntu-20.04 - ubuntu-22.04 - - ubuntu-22.10 - ubuntu-23.04 provider: - parallels-iso @@ -60,6 +57,10 @@ jobs: eval "$(chef shell-init bash)" bento build -o ${{ matrix.provider }}.vm os_pkrvars/$(echo ${{ matrix.os }} | cut -d "-" -f 1)/"${{ matrix.os }}-aarch64.pkrvars.hcl" ls -alh builds +# - name: Bento Test +# run: | +# eval "$(chef shell-init bash)" +# bento test - name: Remove VM in case of canceled job if: cancelled() run: | diff --git a/.github/workflows/pkr-bld-parallels-x64.yml b/.github/workflows/pkr-bld-parallels-x64.yml index 7f6f3cb45..2b2ae6d87 100644 --- a/.github/workflows/pkr-bld-parallels-x64.yml +++ b/.github/workflows/pkr-bld-parallels-x64.yml @@ -17,7 +17,6 @@ jobs: - centos-7 - centos-stream-8 - centos-stream-9 - - debian-10 - debian-11 - debian-12 - fedora-37 @@ -34,17 +33,9 @@ jobs: - springdalelinux-7 - springdalelinux-8 - springdalelinux-9 - - ubuntu-18.04 - ubuntu-20.04 - ubuntu-22.04 - - ubuntu-22.10 - ubuntu-23.04 -# - windows-10 -# - windows-11 -# - windows-2012r2 -# - windows-2016 -# - windows-2019 -# - windows-2022 provider: - parallels-iso steps: @@ -69,6 +60,10 @@ jobs: eval "$(chef shell-init bash)" bento build -o ${{ matrix.provider }}.vm os_pkrvars/$(echo ${{ matrix.os }} | cut -d "-" -f 1)/"${{ matrix.os }}-x86_64.pkrvars.hcl" ls -alh builds +# - name: Bento Test +# run: | +# eval "$(chef shell-init bash)" +# bento test - name: Remove VM in case of canceled job if: cancelled() run: | diff --git a/.github/workflows/pkr-bld-qemu-arm64.yml b/.github/workflows/pkr-bld-qemu-arm64.yml index 1b0925d46..d67067856 100644 --- a/.github/workflows/pkr-bld-qemu-arm64.yml +++ b/.github/workflows/pkr-bld-qemu-arm64.yml @@ -17,7 +17,6 @@ jobs: - centos-7 - centos-stream-8 - centos-stream-9 - - debian-10 - debian-11 - debian-12 - fedora-37 @@ -30,10 +29,8 @@ jobs: - oracle-9 - rockylinux-8 - rockylinux-9 - - ubuntu-18.04 - ubuntu-20.04 - ubuntu-22.04 - - ubuntu-22.10 - ubuntu-23.04 provider: - qemu @@ -58,8 +55,12 @@ jobs: # run: packer build -timestamp-ui -only=${{ matrix.provider }}.vm -var "qemu_accelerator=hvf" -var-file=os_pkrvars/$(echo ${{ matrix.os }} | cut -d "-" -f 1)/"${{ matrix.os }}-aarch64.pkrvars.hcl" packer_templates run: | eval "$(chef shell-init bash)" - bento build -o ${{ matrix.provider }}.vm os_pkrvars/$(echo ${{ matrix.os }} | cut -d "-" -f 1)/"${{ matrix.os }}-aarch64.pkrvars.hcl" + bento build -o ${{ matrix.provider }}.vm --vars "qemu_accelerator=hvf" os_pkrvars/$(echo ${{ matrix.os }} | cut -d "-" -f 1)/"${{ matrix.os }}-aarch64.pkrvars.hcl" ls -alh builds +# - name: Bento Test +# run: | +# eval "$(chef shell-init bash)" +# bento test - name: Upload build artifact uses: actions/upload-artifact@v3 with: diff --git a/.github/workflows/pkr-bld-qemu-x64.yml b/.github/workflows/pkr-bld-qemu-x64.yml index 4a692bf07..b530ccbe3 100644 --- a/.github/workflows/pkr-bld-qemu-x64.yml +++ b/.github/workflows/pkr-bld-qemu-x64.yml @@ -17,7 +17,6 @@ jobs: - centos-7 - centos-stream-8 - centos-stream-9 - - debian-10 - debian-11 - debian-12 - fedora-37 @@ -34,17 +33,9 @@ jobs: - springdalelinux-7 - springdalelinux-8 - springdalelinux-9 - - ubuntu-18.04 - ubuntu-20.04 - ubuntu-22.04 - - ubuntu-22.10 - ubuntu-23.04 -# - windows-10 -# - windows-11 -# - windows-2012r2 -# - windows-2016 -# - windows-2019 -# - windows-2022 provider: - qemu steps: @@ -69,8 +60,12 @@ jobs: # run: packer build -timestamp-ui -only=${{ matrix.provider }}.vm -var "qemu_accelerator=hvf" -var-file=os_pkrvars/$(echo ${{ matrix.os }} | cut -d "-" -f 1)/"${{ matrix.os }}-x86_64.pkrvars.hcl" packer_templates run: | eval "$(chef shell-init bash)" - bento build -o ${{ matrix.provider }}.vm os_pkrvars/$(echo ${{ matrix.os }} | cut -d "-" -f 1)/"${{ matrix.os }}-x86_64.pkrvars.hcl" + bento build -o ${{ matrix.provider }}.vm --vars "qemu_accelerator=hvf" os_pkrvars/$(echo ${{ matrix.os }} | cut -d "-" -f 1)/"${{ matrix.os }}-x86_64.pkrvars.hcl" ls -alh builds +# - name: Bento Test +# run: | +# eval "$(chef shell-init bash)" +# bento test - name: Upload build artifact uses: actions/upload-artifact@main with: diff --git a/.github/workflows/pkr-bld-virtualbox-arm64.yml b/.github/workflows/pkr-bld-virtualbox-arm64.yml index 43e65601f..c3a09e81f 100644 --- a/.github/workflows/pkr-bld-virtualbox-arm64.yml +++ b/.github/workflows/pkr-bld-virtualbox-arm64.yml @@ -17,7 +17,6 @@ jobs: - centos-7 - centos-stream-8 - centos-stream-9 - - debian-10 - debian-11 - debian-12 - fedora-37 @@ -30,10 +29,8 @@ jobs: - oracle-9 - rockylinux-8 - rockylinux-9 - - ubuntu-18.04 - ubuntu-20.04 - ubuntu-22.04 - - ubuntu-22.10 - ubuntu-23.04 provider: - virtualbox-iso @@ -60,6 +57,10 @@ jobs: eval "$(chef shell-init bash)" bento build -o ${{ matrix.provider }}.vm os_pkrvars/$(echo ${{ matrix.os }} | cut -d "-" -f 1)/"${{ matrix.os }}-aarch64.pkrvars.hcl" ls -alh builds +# - name: Bento Test +# run: | +# eval "$(chef shell-init bash)" +# bento test - name: Remove VM in case of canceled job if: cancelled() run: | diff --git a/.github/workflows/pkr-bld-virtualbox-x64.yml b/.github/workflows/pkr-bld-virtualbox-x64.yml index c359461ac..b8bc64e4c 100644 --- a/.github/workflows/pkr-bld-virtualbox-x64.yml +++ b/.github/workflows/pkr-bld-virtualbox-x64.yml @@ -17,7 +17,6 @@ jobs: - centos-7 - centos-stream-8 - centos-stream-9 - - debian-10 - debian-11 - debian-12 - fedora-37 @@ -34,17 +33,9 @@ jobs: - springdalelinux-7 - springdalelinux-8 - springdalelinux-9 - - ubuntu-18.04 - ubuntu-20.04 - ubuntu-22.04 - - ubuntu-22.10 - ubuntu-23.04 -# - windows-10 -# - windows-11 -# - windows-2012r2 -# - windows-2016 -# - windows-2019 -# - windows-2022 provider: - virtualbox-iso steps: @@ -69,6 +60,10 @@ jobs: eval "$(chef shell-init bash)" bento build -o ${{ matrix.provider }}.vm os_pkrvars/$(echo ${{ matrix.os }} | cut -d "-" -f 1)/"${{ matrix.os }}-x86_64.pkrvars.hcl" ls -alh builds +# - name: Bento Test +# run: | +# eval "$(chef shell-init bash)" +# bento test - name: Remove VM in case of canceled job if: cancelled() run: | diff --git a/.github/workflows/pkr-bld-vmware-arm64.yml b/.github/workflows/pkr-bld-vmware-arm64.yml index 32ddfcc32..52512cd77 100644 --- a/.github/workflows/pkr-bld-vmware-arm64.yml +++ b/.github/workflows/pkr-bld-vmware-arm64.yml @@ -17,7 +17,6 @@ jobs: - centos-7 - centos-stream-8 - centos-stream-9 - - debian-10 - debian-11 - debian-12 - fedora-37 @@ -30,10 +29,8 @@ jobs: - oracle-9 - rockylinux-8 - rockylinux-9 - - ubuntu-18.04 - ubuntu-20.04 - ubuntu-22.04 - - ubuntu-22.10 - ubuntu-23.04 provider: - vmware-iso @@ -60,6 +57,10 @@ jobs: eval "$(chef shell-init bash)" bento build -o ${{ matrix.provider }}.vm os_pkrvars/$(echo ${{ matrix.os }} | cut -d "-" -f 1)/"${{ matrix.os }}-aarch64.pkrvars.hcl" ls -alh builds +# - name: Bento Test +# run: | +# eval "$(chef shell-init bash)" +# bento test - name: Remove VM in case of canceled job if: cancelled() run: | diff --git a/.github/workflows/pkr-bld-vmware-x64.yml b/.github/workflows/pkr-bld-vmware-x64.yml index 68f3d3975..a44502ab2 100644 --- a/.github/workflows/pkr-bld-vmware-x64.yml +++ b/.github/workflows/pkr-bld-vmware-x64.yml @@ -17,7 +17,6 @@ jobs: - centos-7 - centos-stream-8 - centos-stream-9 - - debian-10 - debian-11 - debian-12 - fedora-37 @@ -34,17 +33,9 @@ jobs: - springdalelinux-7 - springdalelinux-8 - springdalelinux-9 - - ubuntu-18.04 - ubuntu-20.04 - ubuntu-22.04 - - ubuntu-22.10 - ubuntu-23.04 -# - windows-10 -# - windows-11 -# - windows-2012r2 -# - windows-2016 -# - windows-2019 -# - windows-2022 provider: - vmware-iso steps: @@ -69,6 +60,10 @@ jobs: eval "$(chef shell-init bash)" bento build -o ${{ matrix.provider }}.vm os_pkrvars/$(echo ${{ matrix.os }} | cut -d "-" -f 1)/"${{ matrix.os }}-x86_64.pkrvars.hcl" ls -alh builds +# - name: Bento Test +# run: | +# eval "$(chef shell-init bash)" +# bento test - name: Remove VM in case of canceled job if: cancelled() run: | diff --git a/CHANGELOG.md b/CHANGELOG.md index 4b64b8e04..395fa9c4d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,63 +7,75 @@ Markdown table generated at <https://www.tablesgenerator.com/markdown_tables#> | | hyperv<br>x86_64 | parallels<br>x86_64 | parallels<br>aarch64 | qemu<br>x86_64 | qemu<br>aarch64 | virtualbox<br>x86_64 | virtualbox<br>aarch64 | vmware<br>x86_64 | vmware<br>aarch64 | |:---:|:---:|:---:|:---:|:---:|:---:|:---:|:---:|:---:|:---:| -| almalinux-8 | | | | x | | x | | x | | -| almalinux-9 | | x | | | | x | | x | | +| almalinux-8 | | x | | x | | x | | x | | +| almalinux-9 | | x | x | | | x | | x | x | | amazonlinux-2 | | na | na | | | | na | | na | | amazonlinux-2023 | na | na | na | na | na | na | na | na | na | -| centos-7 | | x | | | | | | x | | -| centos-stream-8 | x | | | x | | | | x | | -| centos-stream-9 | | x | | | | | | x | | -| debian-10 | | | x | | | | | x | | -| debian-11 | | x | x | | | | | x | | +| centos-7 | | x | | x | | x | | x | | +| centos-stream-8 | | x | | x | | x | | x | | +| centos-stream-9 | | | x | | | | | | | +| debian-11 | | x | x | | | x | | x | | | debian-12 | | x | x | | | x | | x | x | -| fedora-37 | | x | | x | | | | x | x | -| fedora-38 | | | | | | x | | x | x | -| freebsd-12 | | | | | | x | | | | -| freebsd-13 | | | | | | x | | | | -| opensuse-leap-15 | x | x | | | | | | x | | -| oraclelinux-7 | x | x | | | | x | | x | | -| oraclelinux-8 | x | | | x | | x | | x | | -| oraclelinux-9 | | x | | | | x | | x | | +| fedora-37 | | x | x | x | | x | | x | x | +| fedora-38 | | x | | x | | x | | x | x | +| freebsd-12 | | | | | | x | | x | | +| freebsd-13 | | | | | | x | | x | | +| opensuse-leap-15 | | x | | x | | x | | x | | +| oraclelinux-7 | | x | | x | | x | | x | | +| oraclelinux-8 | | | | x | | x | | x | | +| oraclelinux-9 | | x | x | | | x | | x | | | rhel-7 | license<br>needed | license<br>needed | license<br>needed | license<br>needed | license<br>needed | license<br>needed | license<br>needed | license<br>needed | license<br>needed | | rhel-8 | license<br>needed | license<br>needed | license<br>needed | license<br>needed | license<br>needed | license<br>needed | license<br>needed | license<br>needed | license<br>needed | | rhel-9 | license<br>needed | license<br>needed | license<br>needed | license<br>needed | license<br>needed | license<br>needed | license<br>needed | license<br>needed | license<br>needed | -| rockylinux-8 | | | | x | | x | | x | | -| rockylinux-9 | | x | x | | | | | x | | -| scientificlinux-7 | | x | na | | na | | na | x | na | +| rockylinux-8 | | x | | x | | x | | x | | +| rockylinux-9 | | x | | | | x | | x | x | +| scientificlinux-7 | | x | na | x | na | x | na | x | na | | sles-12 | license<br>needed | license<br>needed | na | license<br>needed | na | license<br>needed | na | license<br>needed | na | | sles-13 | license<br>needed | license<br>needed | na | license<br>needed | na | license<br>needed | na | license<br>needed | na | | solaris-11 | license<br>needed | license<br>needed | na | license<br>needed | na | license<br>needed | na | license<br>needed | na | -| springdalelinux-7 | | x | na | | na | | na | | na | -| springdalelinux-8 | x | | na | x | na | x | na | x | na | -| springdalelinux-9 | x | x | na | | na | | na | x | na | -| ubuntu-18.04 | | x | | | | x | | x | | -| ubuntu-20.04 | | x | | x | | | | x | x | -| ubuntu-22.04 | | x | | x | | x | | x | x | -| ubuntu-22.10 | | x | | | | | | | x | -| ubuntu-23.04 | | x | | x | | | | x | x | -| windows-10 | x | x | na | | na | x | na | | na | -| windows-10gen2 | | na | na | na | na | na | na | na | na | -| windows-11 | x | x | na | | na | x | na | | na | -| windows-11gen2 | | na | na | na | na | na | na | na | na | -| windows-2012r2 | | x | na | | na | x | na | | na | -| windows-2016 | x | x | na | | na | x | na | | na | -| windows-2019 | x | x | na | | na | x | na | | na | -| windows-2022 | x | x | na | | na | x | na | | na | +| springdalelinux-7 | | x | na | x | na | | na | | na | +| springdalelinux-8 | | x | na | x | na | x | na | x | na | +| springdalelinux-9 | | | na | | na | | na | | na | +| ubuntu-20.04 | | x | x | | | x | | x | x | +| ubuntu-22.04 | | x | | x | | x | | x | | +| ubuntu-23.04 | | x | | x | | x | | x | | +| windows-10 | | x | na | | na | x | na | | na | +| windows-11 | | x | na | | na | x | na | | na | +| windows-2016 | | x | na | | na | x | na | | na | +| windows-2019 | | x | na | | na | x | na | | na | +| windows-2022 | | x | na | | na | x | na | | na | ### Todo - Fix failing builds -- Finish removal of deprecated chef-solo provider to powershell provider for windows -- migrate from http directory for hosting files to cd_files in source templates +- migrate from http directory for hosting files to floppy_files or cd_files in source templates - This makes all builds compatible with hyper-v gen 2 which removes floppy disk capability - This also makes things universal for Virtualbox 6.1 to 7.x due to latter requiring extra config for guests on NAT to be able to connect to host + - Also eliminates any potential networking issues - Update pipelines to only run on updated pkrvars files - Look into making all build uefi default builds - Create CD pipeline to upload vagrant boxes after PR is merged - Create CD pipeline to build and upload new versions of vagrant boxes once every 3 months with the latest patches - -## [unreleased] (2023-07-07) +- Added ability to configure bento upload of private or public boxes in builds.yml, defaults to private + +## [unreleased] (2023-09-15) + +## [v.3.2.0] (2023-09-15) + +- Added bento upload to use vagrant account configured in builds.yml +- Updated windows vagrant template to default to 4GB of memory +- Default hyperv to generation 2 +- Removed EOL OS builds Windows2012r2, Ubuntu 18.04, Ubuntu 22.10, Debian 10 +- Remove use of deprecated chef-solo provisioner and cookbooks for widnows builds +- Add boot_wait variables for each provider +- Adjusted default_boot_wait for linux to 5s +- Added --vars and --var_files flags +- Fixed upload description for libvirt to add qemu hv and version +- Updated ubuntu 20.04 boot_command +- Changed workflows to be based on cpu architecture +- Updated Bento to continue builds even if one fails and report all failures at the end and exit with exit code 1 +- Added qemu clone of libvirt box when metadata file is created for uploading to vagrant qemu provider +- Made build shell scripts customizable through packer variable ## [v3.1.1] (2023-07-07) diff --git a/README.md b/README.md index be0a36625..303a5924f 100644 --- a/README.md +++ b/README.md @@ -33,15 +33,15 @@ end - [VirtualBox](https://www.virtualbox.org/) - [VMware Fusion](https://www.vmware.com/products/fusion.html) - [VMware Workstation](https://www.vmware.com/products/workstation-pro.html) - - [Parallels Desktop](https://www.parallels.com/products/desktop/) also requires [Parallels Virtualization SDK](https://www.parallels.com/products/desktop/download/) + - [Parallels Desktop](https://www.parallels.com/products/desktop/) also requires [Parallels Virtualization SDK](https://www.parallels.com/products/desktop/download/) for versons < 19.x - [qemu](https://www.qemu.org/) * - [Hyper-V](https://docs.microsoft.com/en-us/virtualization/hyper-v-on-windows/about/) * ***NOTE:** support for these providers is considered experimental and corresponding Vagrant Cloud images may or may not exist. -#### Using `bento` executable +### Using `bento` executable -### build +#### build To build a Debian vagrant box using the bento tool with the template available in the `os_pkrvars` dir, we can use the following command: @@ -51,17 +51,21 @@ bento build --cpus 2 os_pkrvars/debian/debian-12-x86_64.pkrvars.hcl Other available options: -- cpus - Specify the number of CPUs needed in the new build. +- cpus - Specify the number of CPUs needed in the new build - mem - Specify the memory -- mirror - The template will have a default mirror link, if you wish to use an alternative one, you can utilise this configuration. -- dry-run - This will not create any build, but will create a metadata file for reference. +- config - Use a configuration file other than default builds.yml +- vars - Comma seperated list of variable names equal values (ex: boot_wait="2s",ssh_timeout="5s") +- var_files - Comma seperated list of pkrvar.hcl files to include in the builds (ex: /path/to/var_file.pkrvars.hcl,/path/to/next/var_file2.pkrvars.hcl) +- metadata_only - Only generate the metadata json file +- mirror - The template will have a default mirror link, if you wish to use an alternative one, you can utilise this configuration +- dry-run - This will not create any build, but will create a metadata file for reference - only - Only build some Packer builds (Default: parallels-iso.vm,virtualbox-iso.vm,vmware-iso.vm - except - Build all Packer builds except these (ex: parallels-iso.vm,virtualbox-iso.vm,vmware-iso.vm) - debug - Print the debug logs -- headed - Packer will be building VirtualBox virtual machines by launching a GUI that shows the console of the machine being built. This option is false by default -- single - This can be used to disable the parallel builds. +- gui - Packer will be building VirtualBox virtual machines by launching a GUI that shows the console of the machine being built. This option is false by default +- single - This can be used to disable the parallel builds -### list +#### list Used to list all builds available for the workstations cpu architecture. This list is also filtered by the build.yml file do_not_build: section. All entries are matched via regex to filter out build templates from the list. @@ -71,7 +75,7 @@ This only shows what would be built with `bento build` and no template is specif bento list ``` -### test +#### test If you have successfully built a vagrant box using the bento tool, you should have the vagrant box and a metadata file in the `builds` folder. You can use these files to test the build with a test-kitchen configuration. Run the following command to test the build. @@ -79,7 +83,19 @@ If you have successfully built a vagrant box using the bento tool, you should ha bento test ``` -#### Using `packer` +#### upload + +To upload boxes in the builds directory to your vagrant cloud account update the build.yml file to specify your account name and which OSs are going to be public. + +Make sure you have configured the vagrant cli and logged into your account for the upload command to work. + +```bash +bento upload +``` + +When running `bento upload` it'll read each <box_name>._metadata.json file and use the data provided to generate the `vagrant cloud publish` command with the descriptions, version, provider, and checksums all coming from the <box_name>._metadata.json file. + +### Using `packer` To build a Ubuntu 22.04 box for only the VirtualBox provider @@ -113,17 +129,9 @@ packer init -upgrade ./packer_templates packer build -var 'iso_url=http://mirror.utexas.edu/fedora/linux' -var-file=os_pkrvars/fedora/fedor-37-x86_64.pkrvars.hcl ./packer_templates ```` -To build a Windows 10 Enterprise Gen 2 box for the Hyper-V provider - -```bash -cd <path/to>/bento -packer init -upgrade ./packer_templates -packer build -var-file=os_pkrvars/windows/windows-10gen2-x86_64.pkrvars.hcl ./packer_templates -``` - If the build is successful, your box files will be in the `builds` directory at the root of the repository. -#### KVM/qemu support for Windows +### KVM/qemu support for Windows You must download [the iso image with the Windows drivers for paravirtualized KVM/qemu hardware](https://fedorapeople.org/groups/virt/virtio-win/direct-downloads/stable-virtio/virtio-win.iso). You can do this from the command line: `wget -nv -nc https://fedorapeople.org/groups/virt/virtio-win/direct-downloads/stable-virtio/virtio-win.iso -O virtio-win.iso` and place it in the packer_templates/win_answer_files/ directory. @@ -142,7 +150,7 @@ Templates for operating systems only available via license or subscription are a Most of the providers expect unrestricted access to networking in order to build as expected. We can't enumerate all possible firewall configurations but include some snippets below that might be useful to users. -#### Windows +### Windows ```powershell $VS = "Standardswitch" @@ -155,9 +163,8 @@ New-NetFirewallRule -Displayname "Allow incomming from $VS" -Direction Inbound - Hyper-V Gen 2 VMs do not support floppy drives. If you previously provided resources using a floppy drive, you must add those files to your Gen 2 iso images, in particular: - `autounattend.xml`: The Gen 2 `autounattend.xml` file supports EFI partitions. Update the `autounattend.xml` with the correct Windows version for your systems and ensure that the partitions are correct for your situation. You also need to manage the driver disk that holds the hyper-v guest services drivers and adjust the `autounattend.xml` file as appropriate. -- `base_setup.ps1` -## Bugs and Issues +### Bugs and Issues Please use GitHub issues to report bugs, features, or other problems. diff --git a/builds.yml b/builds.yml index cf01fe562..0604a03f8 100644 --- a/builds.yml +++ b/builds.yml @@ -1,12 +1,14 @@ --- +vagrant_cloud_account: 'bento' + public: - 'almalinux-8' - 'almalinux-9' - 'amazon-2' + - 'amazon-2023' - 'centos-7' - 'centos-stream-8' - 'centos-stream-9' - - 'debian-10' - 'debian-11' - 'debian-12' - 'fedora-37' @@ -23,23 +25,43 @@ public: - 'springdalelinux-7' - 'springdalelinux-8' - 'springdalelinux-9' - - 'ubuntu-18.04' - 'ubuntu-20.04' - 'ubuntu-22.04' - - 'ubuntu-22.10' - 'ubuntu-23.04' + - 'almalinux-8-arm64' + - 'almalinux-9-arm64' + - 'amazon-2-arm64' + - 'amazon-2023-arm64' + - 'centos-7-arm64' + - 'centos-stream-8-arm64' + - 'centos-stream-9-arm64' + - 'debian-11-arm64' + - 'debian-12-arm64' + - 'fedora-37-arm64' + - 'fedora-38-arm64' + - 'freebsd-12-arm64' + - 'freebsd-13-arm64' + - 'opensuse-leap-15-arm64' + - 'oracle-7-arm64' + - 'oracle-8-arm64' + - 'oracle-9-arm64' + - 'rockylinux-8-arm64' + - 'rockylinux-9-arm64' + - 'scientific-7-arm64' + - 'springdalelinux-7-arm64' + - 'springdalelinux-8-arm64' + - 'springdalelinux-9-arm64' + - 'ubuntu-20.04-arm64' + - 'ubuntu-22.04-arm64' + - 'ubuntu-23.04-arm64' # slug box name: text string from standard box name to match (generally the same) slugs: 'almalinux-8': 'almalinux-8' 'almalinux-9': 'almalinux-9' - 'amazon-2': 'amazon-2' 'centos-7': 'centos-7' - 'centos-stream-8': 'centos-stream-8' - 'centos-stream-9': 'centos-stream-9' 'debian-12': 'debian-12' 'debian-11': 'debian-11' - 'debian-10': 'debian-10' 'fedora-latest': 'fedora-38' 'freebsd-12': 'freebsd-12' 'freebsd-13': 'freebsd-13' @@ -56,11 +78,8 @@ slugs: 'almalinux-8-arm64': 'almalinux-8' 'almalinux-9-arm64': 'almalinux-9' 'centos-7-arm64': 'centos-7' - 'centos-stream-8-arm64': 'centos-stream-8' - 'centos-stream-9-arm64': 'centos-stream-9' 'debian-12-arm64': 'debian-12' 'debian-11-arm64': 'debian-11' - 'debian-10-arm64': 'debian-10' 'fedora-latest-arm64': 'fedora-38' 'oracle-7-arm64': 'oracle-7' 'oracle-8-arm64': 'oracle-8' diff --git a/lib/bento/buildmetadata.rb b/lib/bento/buildmetadata.rb index e35eb867f..ecbba79d5 100644 --- a/lib/bento/buildmetadata.rb +++ b/lib/bento/buildmetadata.rb @@ -4,10 +4,11 @@ class BuildMetadata include Common - def initialize(template, build_timestamp, override_version) + def initialize(template, build_timestamp, override_version, pkr_cmd) @template = template @build_timestamp = build_timestamp @override_version = override_version + @pkr_cmd = pkr_cmd end def read @@ -16,6 +17,7 @@ def read version: version, arch: arch, build_timestamp: build_timestamp, + packer_command: pkr_cmd, git_revision: git_revision, git_status: git_clean? ? 'clean' : 'dirty', box_basename: box_basename, @@ -28,10 +30,15 @@ def read UNKNOWN = '__unknown__'.freeze - attr_reader :template, :build_timestamp, :override_version + attr_reader :template, :build_timestamp, :override_version, :pkr_cmd def box_basename - "#{name.gsub('/', '__')}" + temp_name = name.gsub('/', '__').split('-') + if temp_name.last == 'arm64' + temp_name.join('-') + else + (temp_name.first temp_name.size - 1).join('-') + end end def git_revision @@ -43,13 +50,7 @@ def git_clean? end def merged_vars - @merged_vars ||= begin - if File.exist?("#{template}.variables.json") - template_vars.merge(JSON.load(IO.read("#{template}.variables.json"))) - else - template_vars - end - end + @merged_vars ||= template_vars end def name @@ -84,8 +85,7 @@ def template_vars end def version - override_version || merged_vars.fetch('version', "#{UNKNOWN}.TIMESTAMP") - .rpartition('.').first.concat(build_timestamp.to_s) + override_version || merged_vars.fetch('version', "#{UNKNOWN}.TIMESTAMP").rpartition('.').first.concat(build_timestamp.to_s) end def packer_ver diff --git a/lib/bento/cli.rb b/lib/bento/cli.rb index 136b4a855..bd3301287 100644 --- a/lib/bento/cli.rb +++ b/lib/bento/cli.rb @@ -63,6 +63,18 @@ def self.parse(args) options.dry_run = opt end + opts.on('--metadata_only', 'Only generate the metadata json file') do |opt| + options.metadata_only = opt + end + + opts.on('--vars VARS', 'Comma seperated list of variable names equal values (ex: boot_wait="2s",ssh_timeout="5s")') do |opt| + options.vars = opt + end + + opts.on('--var_files VAR_FILES', 'Comma seperated list of pkrvar.hcl files to include in the builds (ex: /path/to/var_file.pkrvars.hcl,/path/to/next/var_file2.pkrvars.hcl)') do |opt| + options.var_files = opt + end + opts.on('-c BUILD_YML', '--config BUILD_YML', 'Use a configuration file') do |opt| options.config = opt end @@ -91,7 +103,7 @@ def self.parse(args) options.mem = opt end - opts.on('-H', '--headed', 'Display provider UI windows') do |opt| + opts.on('-g', '--gui', 'Display provider GUI windows') do |opt| options.headed = opt end diff --git a/lib/bento/normalize.rb b/lib/bento/normalize.rb index 8bcdcf993..c476e63d5 100644 --- a/lib/bento/normalize.rb +++ b/lib/bento/normalize.rb @@ -4,7 +4,7 @@ class NormalizeRunner include Common include PackerExec - attr_reader :templates, :build_timestamp, :debug, :override_version + attr_reader :templates, :build_timestamp, :debug, :override_version, :pkr_cmd def initialize(opts) @templates = opts.template_files diff --git a/lib/bento/packerexec.rb b/lib/bento/packerexec.rb index 8fbd7bba6..c7394ce47 100644 --- a/lib/bento/packerexec.rb +++ b/lib/bento/packerexec.rb @@ -10,13 +10,13 @@ def for_packer_run_with(template) end def write_box_metadata(template, io) - md = BuildMetadata.new(template, build_timestamp, override_version).read + md = BuildMetadata.new(template, build_timestamp, override_version, pkr_cmd).read io.write(JSON.pretty_generate(md)) io.close end def write_var_file(template, md_file, io) - md = BuildMetadata.new(template, build_timestamp, override_version).read + md = BuildMetadata.new(template, build_timestamp, override_version, pkr_cmd).read io.write(JSON.pretty_generate({ box_basename: md[:box_basename], diff --git a/lib/bento/providermetadata.rb b/lib/bento/providermetadata.rb index 263d64005..051b41a9d 100644 --- a/lib/bento/providermetadata.rb +++ b/lib/bento/providermetadata.rb @@ -9,6 +9,9 @@ def initialize(path, box_basename) end def read + if File.exist?("#{base}.libvirt.box") + FileUtils.cp("#{base}.libvirt.box", "#{base}.qemu.box") + end Dir.glob("#{base}.*.box").map do |file| { name: provider_from_file(file), @@ -52,6 +55,8 @@ def version(provider) ver_vbox when /parallels/ ver_parallels + when /libvirt/ + ver_libvirt when /qemu/ ver_qemu when /hyperv/ @@ -84,16 +89,24 @@ def ver_parallels def ver_vbox cmd = Mixlib::ShellOut.new('VBoxManage --version') cmd.run_command - cmd.stdout.split('r')[0] + cmd.stdout.split('r').first + end + + def ver_libvirt + cmd = Mixlib::ShellOut.new('/usr/local/opt/libvirt/sbin/libvirtd -V') + cmd.run_command + cmd.stdout.split(' ').last end def ver_qemu - cmd = Mixlib::ShellOut.new("qemu-system-#{base.split('-')[2]} -version") + cmd = Mixlib::ShellOut.new("qemu-system-#{base.split('-').last} -version") cmd.run_command cmd.stdout.split(' ')[3] end def ver_hyperv - # TODO: write code + cmd = Mixlib::ShellOut.new('(Get-VMHostSupportedVersion -Default | Select-Object -Property Version | Format-Table -HideTableHeaders | Out-String).trim()') + cmd.run_command + cmd.stdout + 'Gen 2' end end diff --git a/lib/bento/runner.rb b/lib/bento/runner.rb index c507b434d..f1f170046 100644 --- a/lib/bento/runner.rb +++ b/lib/bento/runner.rb @@ -8,13 +8,14 @@ class BuildRunner include Common include PackerExec - attr_reader :template_files, :config, :dry_run, :debug, :only, :except, :mirror, :headed, :single, - :override_version, :build_timestamp, :cpus, :mem + attr_reader :template_files, :config, :dry_run, :debug, :only, :except, :mirror, :headed, :single, :errors, + :override_version, :build_timestamp, :cpus, :mem, :metadata_only, :vars, :var_files, :pkr_cmd def initialize(opts) @template_files = opts.template_files @config = opts.config ||= false @dry_run = opts.dry_run + @metadata_only = opts.metadata_only @debug = opts.debug @only = opts.only ||= 'parallels-iso.vm,virtualbox-iso.vm,vmware-iso.vm' @except = opts.except @@ -25,18 +26,25 @@ def initialize(opts) @build_timestamp = Time.now.gmtime.strftime('%Y%m%d%H%M%S') @cpus = opts.cpus @mem = opts.mem + @vars = opts.vars&.split(',') + @var_files = opts.var_files&.split(',') + @errors = [] + @pkr_cmd = nil end def start templates = config ? build_list : template_files banner('Starting build for templates:') - banner('Installing packer plugins') - shellout("packer init -upgrade #{File.dirname(templates.first)}/../../packer_templates") unless dry_run + banner('Installing packer plugins') unless dry_run || metadata_only + shellout("packer init -upgrade #{File.dirname(templates.first)}/../../packer_templates") unless dry_run || metadata_only templates.each { |t| puts "- #{t}" } time = Benchmark.measure do templates.each { |template| build(template) } end banner("Build finished in #{duration(time.real)}.") + unless errors.empty? + raise("Failed Builds:\n #{errors.join("\n")}\n exited #{$CHILD_STATUS}") + end end private @@ -51,6 +59,7 @@ def build(file) cmd = Mixlib::ShellOut.new(packer_build_cmd(template, md_file.path).join(' ')) cmd.live_stream = STDOUT cmd.timeout = 28800 + @pkr_cmd = cmd.command banner("[#{template}] Building: '#{cmd.command}'") time = Benchmark.measure do cmd.run_command @@ -63,31 +72,37 @@ def build(file) banner("[#{template}] Finished building in #{duration(time.real)}.") end Dir.chdir(bento_dir) - cmd.error! # fail hard if the cmd fails + if cmd.error? + cmd.stderr + errors << template + end end def packer_build_cmd(template, _var_file) pkrvars = "#{template}.pkrvars.hcl" - # vars = "#{template}.variables.json" cmd = %W(packer build -timestamp-ui -force -var-file=#{pkrvars} ../../packer_templates) - # cmd.insert(2, "-var-file=#{vars}") if File.exist?(vars) - # cmd.insert(2, "-var-file=#{var_file}") if File.exist?(var_file) - cmd.insert(2, "-only=#{only}") - cmd.insert(2, "-except=#{except}") if except + vars.each do |var| + cmd.insert(4, "-var #{var}") + end if vars + var_files.each do |var_file| + cmd.insert(5, "-var-file=#{var_file}") if File.exist?(var_file) + end if var_files + cmd.insert(4, "-only=#{only}") + cmd.insert(4, "-except=#{except}") if except # Build the command line in the correct order and without spaces as future input for the splat operator. - cmd.insert(2, "-var cpus=#{cpus}") if cpus - cmd.insert(2, "-var memory=#{mem}") if mem - # cmd.insert(2, '-var headless=true') unless headed + cmd.insert(4, "-var cpus=#{cpus}") if cpus + cmd.insert(4, "-var memory=#{mem}") if mem + cmd.insert(4, '-var headless=false') if headed cmd.insert(2, '-parallel=false') if single cmd.insert(2, '-debug') if debug - cmd.insert(0, 'echo') if dry_run + cmd.insert(0, 'echo') if dry_run || metadata_only cmd end def write_final_metadata(template, buildtime) - md = BuildMetadata.new(template, build_timestamp, override_version).read + md = BuildMetadata.new(template, build_timestamp, override_version, pkr_cmd).read path = File.join('../../builds') - filename = File.join(path, "#{md[:template]}.metadata.json") + filename = File.join(path, "#{md[:template]}._metadata.json") md[:providers] = ProviderMetadata.new(path, md[:template]).read md[:providers].each do |p| p[:build_time] = buildtime diff --git a/lib/bento/test.rb b/lib/bento/test.rb index d4d790b3b..b4a572f56 100644 --- a/lib/bento/test.rb +++ b/lib/bento/test.rb @@ -41,6 +41,9 @@ def destroy_all_bento end def test_box(md_json) + bento_dir = Dir.pwd + temp_dir = "#{bento_dir}/builds/test-kitchen" + Dir.mkdir(temp_dir) unless Dir.exist?(temp_dir) md = box_metadata(md_json) @boxname = md['name'] @providers = md['providers'] @@ -50,11 +53,15 @@ def test_box(md_json) %w(kitchen.yml bootstrap.sh).each do |file| t = file =~ /kitchen/ ? 'kitchen.yml.erb' : "#{file}.erb" erb = ERB.new(File.read(dir + "/#{t}"), trim_mode: '-').result(binding) - File.open(file, 'w') { |f| f.puts erb } + File.open("#{temp_dir}/#{file}", 'w') { |f| f.puts erb } end + Dir.chdir(temp_dir) + banner("Test kitchen file located in #{temp_dir}") test = Mixlib::ShellOut.new('kitchen test', timeout: 900, live_stream: STDOUT) test.run_command test.error! + Dir.chdir(bento_dir) + FileUtils.rm_rf(temp_dir) end end diff --git a/lib/bento/test_templates/kitchen.yml.erb b/lib/bento/test_templates/kitchen.yml.erb index fb539b2a8..f676bab8f 100644 --- a/lib/bento/test_templates/kitchen.yml.erb +++ b/lib/bento/test_templates/kitchen.yml.erb @@ -8,6 +8,7 @@ platforms: driver: name: vagrant provider: <%= k %> + vm_hostname: bento-test box: bento-<%= @boxname %> box_url: file://<%= Dir.pwd %>/builds/<%= v['file'] %> synced_folders: diff --git a/lib/bento/upload.rb b/lib/bento/upload.rb index 3437f1318..b78c228db 100644 --- a/lib/bento/upload.rb +++ b/lib/bento/upload.rb @@ -37,15 +37,17 @@ def upload_box(md_file) md_data['providers'].each_pair do |prov, prov_data| if File.exist?(File.join('builds', prov_data['file'])) - banner("Uploading bento/#{md_data['name']} version:#{md_data['version']} provider:#{prov}...") + puts '' + banner("Uploading #{builds_yml['vagrant_cloud_account']}/#{md_data['box_basename']} version:#{md_data['version']} provider:#{prov}...") - upload_cmd = "vagrant cloud publish bento/#{md_data['name']} #{md_data['version']} #{prov} builds/#{prov_data['file']} --description '#{box_desc(md_data['name'])}' --short-description '#{box_desc(md_data['name'])}' --version-description '#{ver_desc(md_data)}' --force --release --no-private" + upload_cmd = "vagrant cloud publish --no-direct-upload #{builds_yml['vagrant_cloud_account']}/#{md_data['box_basename']} #{md_data['version']} #{prov} builds/#{prov_data['file']} --description '#{box_desc(md_data['name'])}' --short-description '#{box_desc(md_data['name'])}' --version-description '#{ver_desc(md_data)}' --force --release #{public_private_box(md_data['box_basename'])}" shellout(upload_cmd) slug_name = lookup_slug(md_data['name']) if slug_name - banner("Uploading slug bento/#{slug_name} from #{md_data['name']} version:#{md_data['version']} provider:#{prov}...") - upload_cmd = "vagrant cloud publish bento/#{slug_name} #{md_data['version']} #{prov} builds/#{prov_data['file']} --description '#{slug_desc(slug_name)}' --short-description '#{slug_desc(slug_name)}' --version-description '#{ver_desc(md_data)}' --force --release --no-private" + puts '' + banner("Uploading slug #{builds_yml['vagrant_cloud_account']}/#{slug_name} from #{md_data['box_basename']} version:#{md_data['version']} provider:#{prov}...") + upload_cmd = "vagrant cloud publish --no-direct-upload #{builds_yml['vagrant_cloud_account']}/#{slug_name} #{md_data['version']} #{prov} builds/#{prov_data['file']} --description '#{slug_desc(slug_name)}' --short-description '#{slug_desc(slug_name)}' --version-description '#{ver_desc(md_data)}' --force --release #{public_private_box(md_data['box_basename'])}" shellout(upload_cmd) end @@ -77,6 +79,18 @@ def lookup_slug(name) nil end + def public_private_box(name) + builds_yml['public'].each do |public| + if name.include?('arm64') + return '--no-private' if name.start_with?(public) && public.include?('arm64') + else + return '--no-private' if name.start_with?(public) && !public.include?('arm64') + end + + return '--private' + end + end + def box_desc(name) "Vanilla #{name.tr('-', ' ').capitalize} Vagrant box created with Bento by Chef" end @@ -87,7 +101,17 @@ def slug_desc(name) def ver_desc(md_data) tool_versions = [] - md_data['providers'].each_key { |hv| tool_versions << "#{hv == 'vmware_desktop' ? (macos? ? 'vmware-fusion' : 'vmware-workstation') : hv}: #{md_data['providers'][hv]['version']}" } + md_data['providers'].each_key do |hv| + tool_versions << if hv == 'vmware_desktop' + if macos? + "vmware-fusion: #{md_data['providers'][hv]['version']}" + else + "vmware-workstation: #{md_data['providers'][hv]['version']}" + end + else + "#{hv}: #{md_data['providers'][hv]['version']}" + end + end tool_versions.sort! tool_versions << "packer: #{md_data['packer']}" diff --git a/lib/bento/version.rb b/lib/bento/version.rb index 03d12b2f2..643cd2b80 100644 --- a/lib/bento/version.rb +++ b/lib/bento/version.rb @@ -1,3 +1,3 @@ module Bento - VERSION = '3.1.1'.freeze + VERSION = '3.2.0'.freeze end diff --git a/os_pkrvars/debian/debian-10-aarch64.pkrvars.hcl b/os_pkrvars/debian/debian-10-aarch64.pkrvars.hcl deleted file mode 100644 index c1a92a298..000000000 --- a/os_pkrvars/debian/debian-10-aarch64.pkrvars.hcl +++ /dev/null @@ -1,9 +0,0 @@ -os_name = "debian" -os_version = "10.13" -os_arch = "aarch64" -iso_url = "https://cdimage.debian.org/cdimage/archive/10.13.0/arm64/iso-dvd/debian-10.13.0-arm64-DVD-1.iso" -iso_checksum = "file:https://cdimage.debian.org/cdimage/archive/10.13.0/arm64/iso-dvd/SHA256SUMS" -parallels_guest_os_type = "debian" -vbox_guest_os_type = "Debian_64" -vmware_guest_os_type = "arm-debian-64" -boot_command = ["<wait><up>e<wait><down><down><down><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><wait>install <wait> preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/debian/preseed.cfg <wait>debian-installer=en_US.UTF-8 <wait>auto <wait>locale=en_US.UTF-8 <wait>kbd-chooser/method=us <wait>keyboard-configuration/xkb-keymap=us <wait>netcfg/get_hostname={{ .Name }} <wait>netcfg/get_domain=vagrantup.com <wait>fb=false <wait>debconf/frontend=noninteractive <wait>console-setup/ask_detect=false <wait>console-keymaps-at/keymap=us <wait>grub-installer/bootdev=/dev/sda <wait><f10><wait>"] diff --git a/os_pkrvars/debian/debian-10-x86_64.pkrvars.hcl b/os_pkrvars/debian/debian-10-x86_64.pkrvars.hcl deleted file mode 100644 index d7b46b054..000000000 --- a/os_pkrvars/debian/debian-10-x86_64.pkrvars.hcl +++ /dev/null @@ -1,9 +0,0 @@ -os_name = "debian" -os_version = "10.13" -os_arch = "x86_64" -iso_url = "https://cdimage.debian.org/cdimage/archive/10.13.0/amd64/iso-dvd/debian-10.13.0-amd64-DVD-1.iso" -iso_checksum = "file:https://cdimage.debian.org/cdimage/archive/10.13.0/amd64/iso-dvd/SHA256SUMS" -parallels_guest_os_type = "debian" -vbox_guest_os_type = "Debian_64" -vmware_guest_os_type = "debian-64" -boot_command = ["<wait><esc><wait>auto preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/debian/preseed.cfg netcfg/get_hostname={{ .Name }}<enter>"] diff --git a/os_pkrvars/ubuntu/ubuntu-18.04-aarch64.pkrvars.hcl b/os_pkrvars/ubuntu/ubuntu-18.04-aarch64.pkrvars.hcl deleted file mode 100644 index 2dcf57325..000000000 --- a/os_pkrvars/ubuntu/ubuntu-18.04-aarch64.pkrvars.hcl +++ /dev/null @@ -1,10 +0,0 @@ -os_name = "ubuntu" -os_version = "18.04" -os_arch = "aarch64" -iso_url = "https://cdimage.ubuntu.com/releases/18.04.6/release/ubuntu-18.04.6-server-arm64.iso" -iso_checksum = "0a20ef21181a36588f8fb670cc63e8d326fa6e715b526543d300a68de389055f" -hyperv_generation = 2 -parallels_guest_os_type = "ubuntu" -vbox_guest_os_type = "Ubuntu_64" -vmware_guest_os_type = "arm-ubuntu-64" -boot_command = ["<wait>e<wait><down><down><down><end><wait>", "<bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs>", "<bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs>", "<bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs>", "<bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs>", "<bs><wait>auto console-setup/ask_detect=false", " console-setup/layoutcode=us", " console-setup/modelcode=pc105", " debconf/frontend=noninteractive", " debian-installer=en_US.UTF-8", " fb=false", " initrd=/install/initrd.gz", " kbd-chooser/method=us", " keyboard-configuration/layout=USA", " keyboard-configuration/variant=USA", " locale=en_US.UTF-8", " netcfg/get_hostname=vagrant", " grub-installer/bootdev=/dev/sda", " noapic", " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/ubuntu/preseed.cfg", " ---", "<f10><wait>"] diff --git a/os_pkrvars/ubuntu/ubuntu-18.04-x86_64.pkrvars.hcl b/os_pkrvars/ubuntu/ubuntu-18.04-x86_64.pkrvars.hcl deleted file mode 100644 index 192ee7b38..000000000 --- a/os_pkrvars/ubuntu/ubuntu-18.04-x86_64.pkrvars.hcl +++ /dev/null @@ -1,10 +0,0 @@ -os_name = "ubuntu" -os_version = "18.04" -os_arch = "x86_64" -iso_url = "http://cdimage.ubuntu.com/ubuntu/releases/18.04.6/release/ubuntu-18.04.6-server-amd64.iso" -iso_checksum = "f5cbb8104348f0097a8e513b10173a07dbc6684595e331cb06f93f385d0aecf6" -hyperv_generation = 2 -parallels_guest_os_type = "ubuntu" -vbox_guest_os_type = "Ubuntu_64" -vmware_guest_os_type = "ubuntu-64" -boot_command = ["<wait5><esc>", "<wait5><esc>", "<wait5><enter><wait5>", "/install/vmlinuz auto console-setup/ask_detect=false", " console-setup/layoutcode=us", " console-setup/modelcode=pc105", " debconf/frontend=noninteractive", " debian-installer=en_US.UTF-8", " fb=false", " initrd=/install/initrd.gz", " kbd-chooser/method=us", " keyboard-configuration/layout=USA", " keyboard-configuration/variant=USA", " locale=en_US.UTF-8", " netcfg/get_hostname=vagrant", " grub-installer/bootdev=/dev/sda", " noapic", " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/ubuntu/preseed.cfg", " ---", "<enter><wait>"] diff --git a/os_pkrvars/ubuntu/ubuntu-20.04-aarch64.pkrvars.hcl b/os_pkrvars/ubuntu/ubuntu-20.04-aarch64.pkrvars.hcl index 99acbe6c3..2ab4099ce 100644 --- a/os_pkrvars/ubuntu/ubuntu-20.04-aarch64.pkrvars.hcl +++ b/os_pkrvars/ubuntu/ubuntu-20.04-aarch64.pkrvars.hcl @@ -1,9 +1,8 @@ os_name = "ubuntu" os_version = "20.04" os_arch = "aarch64" -iso_url = "http://cdimage.ubuntu.com/releases/20.04/release/ubuntu-20.04.5-live-server-arm64.iso" +iso_url = "http://cdimage.ubuntu.com/releases/focal/release/ubuntu-20.04.5-live-server-arm64.iso" iso_checksum = "sha256:e42d6373dd39173094af5c26cbf2497770426f42049f8b9ea3e60ce35bebdedf" -hyperv_generation = 2 parallels_guest_os_type = "ubuntu" vbox_guest_os_type = "Ubuntu_64" vmware_guest_os_type = "arm-ubuntu-64" diff --git a/os_pkrvars/ubuntu/ubuntu-20.04-x86_64.pkrvars.hcl b/os_pkrvars/ubuntu/ubuntu-20.04-x86_64.pkrvars.hcl index 10b2b581f..1b7b9a2e9 100644 --- a/os_pkrvars/ubuntu/ubuntu-20.04-x86_64.pkrvars.hcl +++ b/os_pkrvars/ubuntu/ubuntu-20.04-x86_64.pkrvars.hcl @@ -3,9 +3,7 @@ os_version = "20.04" os_arch = "x86_64" iso_url = "https://releases.ubuntu.com/focal/ubuntu-20.04.6-live-server-amd64.iso" iso_checksum = "file:https://releases.ubuntu.com/focal/SHA256SUMS" -hyperv_generation = 2 parallels_guest_os_type = "ubuntu" vbox_guest_os_type = "Ubuntu_64" vmware_guest_os_type = "ubuntu-64" -boot_wait = "2s" -boot_command = ["<wait><esc><esc><esc><enter>/casper/vmlinuz initrd=/casper/initrd quiet autoinstall ds=nocloud-net;s=http://{{.HTTPIP}}:{{.HTTPPort}}/ubuntu/<enter>"] +boot_command = ["<wait><enter><wait><enter><wait><f6><wait><esc><wait> autoinstall ds=nocloud-net;seedfrom=http://{{ .HTTPIP }}:{{ .HTTPPort }}/ubuntu/<enter><wait>"] diff --git a/os_pkrvars/ubuntu/ubuntu-22.04-aarch64.pkrvars.hcl b/os_pkrvars/ubuntu/ubuntu-22.04-aarch64.pkrvars.hcl index 41a66a16c..35e379886 100644 --- a/os_pkrvars/ubuntu/ubuntu-22.04-aarch64.pkrvars.hcl +++ b/os_pkrvars/ubuntu/ubuntu-22.04-aarch64.pkrvars.hcl @@ -1,9 +1,8 @@ os_name = "ubuntu" os_version = "22.04" os_arch = "aarch64" -iso_url = "https://cdimage.ubuntu.com/releases/22.04/release/ubuntu-22.04.3-live-server-arm64.iso" -iso_checksum = "file:https://cdimage.ubuntu.com/releases/22.04/release/SHA256SUMS" -hyperv_generation = 2 +iso_url = "https://cdimage.ubuntu.com/releases/jammy/release/ubuntu-22.04.3-live-server-arm64.iso" +iso_checksum = "file:https://cdimage.ubuntu.com/releases/jammy/release/SHA256SUMS" parallels_guest_os_type = "ubuntu" vbox_guest_os_type = "Ubuntu_64" vmware_guest_os_type = "arm-ubuntu-64" diff --git a/os_pkrvars/ubuntu/ubuntu-22.04-x86_64.pkrvars.hcl b/os_pkrvars/ubuntu/ubuntu-22.04-x86_64.pkrvars.hcl index 2f43549c0..7475a60a4 100644 --- a/os_pkrvars/ubuntu/ubuntu-22.04-x86_64.pkrvars.hcl +++ b/os_pkrvars/ubuntu/ubuntu-22.04-x86_64.pkrvars.hcl @@ -3,7 +3,6 @@ os_version = "22.04" os_arch = "x86_64" iso_url = "https://releases.ubuntu.com/jammy/ubuntu-22.04.3-live-server-amd64.iso" iso_checksum = "file:https://releases.ubuntu.com/jammy/SHA256SUMS" -hyperv_generation = 2 parallels_guest_os_type = "ubuntu" vbox_guest_os_type = "Ubuntu_64" vmware_guest_os_type = "ubuntu-64" diff --git a/os_pkrvars/ubuntu/ubuntu-22.10-aarch64.pkrvars.hcl b/os_pkrvars/ubuntu/ubuntu-22.10-aarch64.pkrvars.hcl deleted file mode 100644 index eae23feff..000000000 --- a/os_pkrvars/ubuntu/ubuntu-22.10-aarch64.pkrvars.hcl +++ /dev/null @@ -1,10 +0,0 @@ -os_name = "ubuntu" -os_version = "22.10" -os_arch = "aarch64" -iso_url = "https://cdimage.ubuntu.com/releases/22.10/release/ubuntu-22.10-live-server-arm64.iso" -iso_checksum = "a19d956e993a16fc6496c371e36dcc0eb85d2bdf6a8e86028b92ce62e9f585cd" -hyperv_generation = 2 -parallels_guest_os_type = "ubuntu" -vbox_guest_os_type = "Ubuntu_64" -vmware_guest_os_type = "arm-ubuntu-64" -boot_command = ["<wait>e<wait><down><down><down><end> autoinstall ds=nocloud-net\\;s=http://{{.HTTPIP}}:{{.HTTPPort}}/ubuntu/<wait><f10><wait>"] diff --git a/os_pkrvars/ubuntu/ubuntu-22.10-x86_64.pkrvars.hcl b/os_pkrvars/ubuntu/ubuntu-22.10-x86_64.pkrvars.hcl deleted file mode 100644 index 22f4168dd..000000000 --- a/os_pkrvars/ubuntu/ubuntu-22.10-x86_64.pkrvars.hcl +++ /dev/null @@ -1,10 +0,0 @@ -os_name = "ubuntu" -os_version = "22.10" -os_arch = "x86_64" -iso_url = "http://releases.ubuntu.com/kinetic/ubuntu-22.10-live-server-amd64.iso" -iso_checksum = "874452797430a94ca240c95d8503035aa145bd03ef7d84f9b23b78f3c5099aed" -hyperv_generation = 2 -parallels_guest_os_type = "ubuntu" -vbox_guest_os_type = "Ubuntu_64" -vmware_guest_os_type = "ubuntu-64" -boot_command = ["<wait>e<wait><down><down><down><end> autoinstall ds=nocloud-net\\;s=http://{{.HTTPIP}}:{{.HTTPPort}}/ubuntu/<wait><f10><wait>"] diff --git a/os_pkrvars/ubuntu/ubuntu-23.04-aarch64.pkrvars.hcl b/os_pkrvars/ubuntu/ubuntu-23.04-aarch64.pkrvars.hcl index 2fe67e0db..a4d080aeb 100644 --- a/os_pkrvars/ubuntu/ubuntu-23.04-aarch64.pkrvars.hcl +++ b/os_pkrvars/ubuntu/ubuntu-23.04-aarch64.pkrvars.hcl @@ -1,9 +1,8 @@ os_name = "ubuntu" os_version = "23.04" os_arch = "aarch64" -iso_url = "https://cdimage.ubuntu.com/releases/23.04/release/ubuntu-23.04-live-server-arm64.iso" -iso_checksum = "file:https://cdimage.ubuntu.com/releases/23.04/release/SHA256SUMS" -hyperv_generation = 2 +iso_url = "https://cdimage.ubuntu.com/releases/lunar/release/ubuntu-23.04-live-server-arm64.iso" +iso_checksum = "file:https://cdimage.ubuntu.com/releases/lunar/release/SHA256SUMS" parallels_guest_os_type = "ubuntu" vbox_guest_os_type = "Ubuntu_64" vmware_guest_os_type = "arm-ubuntu-64" diff --git a/os_pkrvars/ubuntu/ubuntu-23.04-x86_64.pkrvars.hcl b/os_pkrvars/ubuntu/ubuntu-23.04-x86_64.pkrvars.hcl index 8566f175c..b63e4dd21 100644 --- a/os_pkrvars/ubuntu/ubuntu-23.04-x86_64.pkrvars.hcl +++ b/os_pkrvars/ubuntu/ubuntu-23.04-x86_64.pkrvars.hcl @@ -1,9 +1,8 @@ os_name = "ubuntu" os_version = "23.04" os_arch = "x86_64" -iso_url = "https://releases.ubuntu.com/23.04/ubuntu-23.04-live-server-amd64.iso" -iso_checksum = "file:https://releases.ubuntu.com/23.04/SHA256SUMS" -hyperv_generation = 2 +iso_url = "https://releases.ubuntu.com/lunar/ubuntu-23.04-live-server-amd64.iso" +iso_checksum = "file:https://releases.ubuntu.com/lunar/SHA256SUMS" parallels_guest_os_type = "ubuntu" vbox_guest_os_type = "Ubuntu_64" vmware_guest_os_type = "ubuntu-64" diff --git a/os_pkrvars/windows/windows-10-x86_64.pkrvars.hcl b/os_pkrvars/windows/windows-10-x86_64.pkrvars.hcl index 0036e7c10..ad283fb4e 100644 --- a/os_pkrvars/windows/windows-10-x86_64.pkrvars.hcl +++ b/os_pkrvars/windows/windows-10-x86_64.pkrvars.hcl @@ -7,3 +7,4 @@ iso_checksum = "ef7312733a9f5d7d51cfa04ac497671995674ca5e1058d5164d60 parallels_guest_os_type = "win-10" vbox_guest_os_type = "Windows10_64" vmware_guest_os_type = "windows9srv-64" + diff --git a/os_pkrvars/windows/windows-10gen2-x86_64.pkrvars.hcl b/os_pkrvars/windows/windows-10gen2-x86_64.pkrvars.hcl deleted file mode 100644 index a7ea6ea53..000000000 --- a/os_pkrvars/windows/windows-10gen2-x86_64.pkrvars.hcl +++ /dev/null @@ -1,12 +0,0 @@ -os_name = "windows" -os_version = "10gen2" -os_arch = "x86_64" -is_windows = true -iso_url = "https://software-static.download.prss.microsoft.com/dbazure/988969d5-f34g-4e03-ac9d-1f9786c66750/19045.2006.220908-0225.22h2_release_svc_refresh_CLIENTENTERPRISEEVAL_OEMRET_x64FRE_en-us.iso" -iso_checksum = "ef7312733a9f5d7d51cfa04ac497671995674ca5e1058d5164d6028f0938d668" -parallels_guest_os_type = "win-10" -vbox_guest_os_type = "Windows10_64" -vmware_guest_os_type = "windows9srv-64" -boot_command = ["<wait>aaaaaaa<wait><enter><wait><enter><wait><enter>"] -hyperv_generation = 2 -sources_enabled = ["source.hyperv-iso.vm", "source.qemu.vm"] diff --git a/os_pkrvars/windows/windows-11-x86_64.pkrvars.hcl b/os_pkrvars/windows/windows-11-x86_64.pkrvars.hcl index 42d7a349f..579e5840c 100644 --- a/os_pkrvars/windows/windows-11-x86_64.pkrvars.hcl +++ b/os_pkrvars/windows/windows-11-x86_64.pkrvars.hcl @@ -3,9 +3,8 @@ os_version = "11" os_arch = "x86_64" is_windows = true # Windows 11 source requires a prompt to select OS to install. This allows the system time to add reg keys to ignore TPM Check before the install begins. -iso_url = "https://software-download.microsoft.com/download/sg/22000.194.210913-1444.co_release_svc_refresh_CLIENTENTERPRISEEVAL_OEMRET_x64FRE_en-us.iso" -iso_checksum = "sha256:e8b1d2a1a85a09b4bf6154084a8be8e3c814894a15a7bcf3e8e63fcfa9a528cb" +iso_url = "https://software-static.download.prss.microsoft.com/dbazure/988969d5-f34g-4e03-ac9d-1f9786c66751/22621.525.220925-0207.ni_release_svc_refresh_CLIENTENTERPRISEEVAL_OEMRET_x64FRE_en-us.iso" +iso_checksum = "ebbc79106715f44f5020f77bd90721b17c5a877cbc15a3535b99155493a1bb3f" parallels_guest_os_type = "win-11" vbox_guest_os_type = "Windows11_64" vmware_guest_os_type = "windows9srv-64" -boot_command = ["<wait><leftShiftOn><f10><leftShiftOff><wait>reg add HKLM\\SYSTEM\\Setup\\LabConfig /t REG_DWORD /v BypassTPMCheck /d 1<return>reg add HKLM\\SYSTEM\\Setup\\LabConfig /t REG_DWORD /v BypassSecureBootCheck /d 1<return><wait>exit<return><wait><return>"] diff --git a/os_pkrvars/windows/windows-11gen2-x86_64.pkrvars.hcl b/os_pkrvars/windows/windows-11gen2-x86_64.pkrvars.hcl deleted file mode 100644 index 37c72aaab..000000000 --- a/os_pkrvars/windows/windows-11gen2-x86_64.pkrvars.hcl +++ /dev/null @@ -1,13 +0,0 @@ -os_name = "windows" -os_version = "11gen2" -os_arch = "x86_64" -is_windows = true -# Windows 11 source requires a prompt to select OS to install. This allows the system time to add reg keys to ignore TPM Check before the install begins. -iso_url = "https://software-download.microsoft.com/download/sg/22000.194.210913-1444.co_release_svc_refresh_CLIENTENTERPRISEEVAL_OEMRET_x64FRE_en-us.iso" -iso_checksum = "sha256:e8b1d2a1a85a09b4bf6154084a8be8e3c814894a15a7bcf3e8e63fcfa9a528cb" -parallels_guest_os_type = "win-11" -vbox_guest_os_type = "Windows11_64" -vmware_guest_os_type = "windows9srv-64" -hyperv_generation = 2 -boot_command = ["<wait>aaaaaaa<wait><enter><wait><enter><wait><enter>"] -sources_enabled = ["source.hyperv-iso.vm", "source.qemu.vm"] diff --git a/os_pkrvars/windows/windows-2012r2-x86_64.pkrvars.hcl b/os_pkrvars/windows/windows-2012r2-x86_64.pkrvars.hcl deleted file mode 100644 index 2fab2563a..000000000 --- a/os_pkrvars/windows/windows-2012r2-x86_64.pkrvars.hcl +++ /dev/null @@ -1,9 +0,0 @@ -os_name = "windows" -os_version = "2012r2" -os_arch = "x86_64" -is_windows = true -iso_url = "https://download.microsoft.com/download/6/2/A/62A76ABB-9990-4EFC-A4FE-C7D698DAEB96/9600.17050.WINBLUE_REFRESH.140317-1640_X64FRE_SERVER_EVAL_EN-US-IR3_SSS_X64FREE_EN-US_DV9.ISO" -iso_checksum = "6612b5b1f53e845aacdf96e974bb119a3d9b4dcb5b82e65804ab7e534dc7b4d5" -parallels_guest_os_type = "win-2012" -vbox_guest_os_type = "Windows2012_64" -vmware_guest_os_type = "windows9srv-64" diff --git a/packer_templates/cookbooks/packer/Berksfile b/packer_templates/cookbooks/packer/Berksfile deleted file mode 100644 index 34fea2166..000000000 --- a/packer_templates/cookbooks/packer/Berksfile +++ /dev/null @@ -1,3 +0,0 @@ -source 'https://supermarket.chef.io' - -metadata diff --git a/packer_templates/cookbooks/packer/chefignore b/packer_templates/cookbooks/packer/chefignore deleted file mode 100644 index cc170ea79..000000000 --- a/packer_templates/cookbooks/packer/chefignore +++ /dev/null @@ -1,115 +0,0 @@ -# Put files/directories that should be ignored in this file when uploading -# to a Chef Infra Server or Supermarket. -# Lines that start with '# ' are comments. - -# OS generated files # -###################### -.DS_Store -ehthumbs.db -Icon? -nohup.out -Thumbs.db -.envrc - -# EDITORS # -########### -.#* -.project -.settings -*_flymake -*_flymake.* -*.bak -*.sw[a-z] -*.tmproj -*~ -\#* -REVISION -TAGS* -tmtags -.vscode -.editorconfig - -## COMPILED ## -############## -*.class -*.com -*.dll -*.exe -*.o -*.pyc -*.so -*/rdoc/ -a.out -mkmf.log - -# Testing # -########### -.circleci/* -.codeclimate.yml -.delivery/* -.foodcritic -.kitchen* -.mdlrc -.overcommit.yml -.rspec -.rubocop.yml -.travis.yml -.watchr -.yamllint -azure-pipelines.yml -Dangerfile -examples/* -features/* -Guardfile -kitchen.yml* -mlc_config.json -Procfile -Rakefile -spec/* -test/* - -# SCM # -####### -.git -.gitattributes -.gitconfig -.github/* -.gitignore -.gitkeep -.gitmodules -.svn -*/.bzr/* -*/.git -*/.hg/* -*/.svn/* - -# Berkshelf # -############# -Berksfile -Berksfile.lock -cookbooks/* -tmp - -# Bundler # -########### -vendor/* -Gemfile -Gemfile.lock - -# Policyfile # -############## -Policyfile.rb -Policyfile.lock.json - -# Documentation # -############# -CODE_OF_CONDUCT* -CONTRIBUTING* -documentation/* -TESTING* -UPGRADING* - -# Vagrant # -########### -.vagrant -Vagrantfile diff --git a/packer_templates/cookbooks/packer/kitchen.yml b/packer_templates/cookbooks/packer/kitchen.yml deleted file mode 100644 index 4e4a4a243..000000000 --- a/packer_templates/cookbooks/packer/kitchen.yml +++ /dev/null @@ -1,41 +0,0 @@ -driver: - name: vagrant - customize: - cpus: 2 - memory: 4096 - -transport: - name: winrm - elevated: true - -provisioner: - name: chef_zero - deprecations_as_errors: true - -platforms: - - name: windows-2019 - driver_config: - box: tas50/windows_2019 - - name: windows-2016 - driver_config: - box: tas50/windows_2016 - - name: windows-2012r2 - driver_config: - box: tas50/windows_2012r2 - -suites: - - name: default - run_list: - - recipe[packer::disable_uac] - - recipe[packer::disable_restore] - - recipe[packer::disable_windows_update] - - recipe[packer::remove_defender] - - recipe[packer::configure_power] - - recipe[packer::disable_screensaver] - - recipe[packer::vm_tools] - - recipe[packer::features] - - recipe[packer::enable_file_sharing] - - recipe[packer::enable_remote_desktop] - - recipe[packer::ui_tweaks] - - recipe[packer::cleanup] - - recipe[packer::defrag] diff --git a/packer_templates/cookbooks/packer/metadata.rb b/packer_templates/cookbooks/packer/metadata.rb deleted file mode 100644 index c15884e1a..000000000 --- a/packer_templates/cookbooks/packer/metadata.rb +++ /dev/null @@ -1,7 +0,0 @@ -name 'packer' -maintainer 'Tim Smith' -maintainer_email 'tsmith@chef.io' -license 'Apache-2.0' -description 'Resources run during packer builds' -version '1.0.0' -chef_version '>= 15.0' diff --git a/packer_templates/cookbooks/packer/recipes/cleanup.rb b/packer_templates/cookbooks/packer/recipes/cleanup.rb deleted file mode 100644 index b2e47e142..000000000 --- a/packer_templates/cookbooks/packer/recipes/cleanup.rb +++ /dev/null @@ -1,79 +0,0 @@ -# OneDrive takes up 150 megs and isn't needed for testing -windows_package 'Microsoft OneDrive' do - action :remove -end - -# Skype takes up 26 megs -windows_package 'Skype' do - action :remove -end - -if windows_workstation? && !node['platform_version'].to_i == 10 # cleanmgr isn't on servers - # registry key locations pulled from https://github.com/spjeff/spadmin/blob/master/Cleanmgr.ps1 - # thanks @spjeff! - registry_key 'HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\Update Cleanup' do - values [{ - name: 'StateFlags0001', - type: :dword, - data: 2, - }] - end - - registry_key 'HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\Temporary Files' do - values [{ - name: 'StateFlags0001', - type: :dword, - data: 2, - }] - end - - execute 'run cleanmgr' do - command 'C:\Windows\System32\cleanmgr.exe /sagerun:1' - ignore_failure true - live_stream true - end -end - -execute 'clean SxS' do - command 'Dism.exe /online /Cleanup-Image /StartComponentCleanup /ResetBase' - ignore_failure true - live_stream true -end - -powershell_script 'remove unnecesary directories' do - code <<-EOH - @( - "C:\\Recovery", - "$env:localappdata\\temp\\*", - "$env:windir\\logs", - "$env:windir\\temp", - "$env:windir\\winsxs\\manifestcache", - "C:\\Users\\vagrant\Favorites\\*" - ) | % { - if(Test-Path $_) { - Write-Host "Removing $_" - try { - Takeown /d Y /R /f $_ - Icacls $_ /GRANT:r administrators:F /T /c /q 2>&1 | Out-Null - Remove-Item $_ -Recurse -Force | Out-Null - } catch { $global:error.RemoveAt(0) } - } - } - EOH -end - -# clean all of the event logs -%w(Application Security Setup System).each do |log| - execute "Cleaning the #{log} event log" do - command "wevtutil clear-log #{log}" - end -end - -# remove pagefile. it will get created on boot next time -registry_key 'HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Session Manager\Memory Management' do - values [{ - name: 'PagingFiles', - type: :string, - data: '', - }] -end diff --git a/packer_templates/cookbooks/packer/recipes/configure_power.rb b/packer_templates/cookbooks/packer/recipes/configure_power.rb deleted file mode 100644 index 15279ba0c..000000000 --- a/packer_templates/cookbooks/packer/recipes/configure_power.rb +++ /dev/null @@ -1,16 +0,0 @@ -execute 'Set high performance power profile' do - command 'powercfg -setactive 8c5e7fda-e8bf-4a96-9a85-a6e23a8c635c' -end - -execute 'Turn off Hibernation' do - command 'powercfg.exe /hibernate off' - ignore_failure :quiet # if unsupported on the hardware it errors -end - -execute 'Turn off monitor timeout on AC power' do - command 'powercfg -Change -monitor-timeout-ac 0' -end - -execute 'Turn off monitor timeout on DC power' do - command 'powercfg -Change -monitor-timeout-dc 0' -end diff --git a/packer_templates/cookbooks/packer/recipes/defrag.rb b/packer_templates/cookbooks/packer/recipes/defrag.rb deleted file mode 100644 index fcd4c170d..000000000 --- a/packer_templates/cookbooks/packer/recipes/defrag.rb +++ /dev/null @@ -1,20 +0,0 @@ -remote_file ::File.join(Chef::Config[:file_cache_path], 'ultradefrag.zip') do - source 'http://downloads.sourceforge.net/ultradefrag/ultradefrag-portable-7.1.4.bin.amd64.zip' - action :create -end - -archive_file 'Decompress ultradefrag' do - path ::File.join(Chef::Config[:file_cache_path], 'ultradefrag.zip') - destination ::File.join(Chef::Config[:file_cache_path], 'temp_defrag') - action :extract -end - -execute 'Rename ultradefrag' do - command "move #{::File.join(Chef::Config[:file_cache_path])}\\temp_defrag\\ultradefrag-* #{::File.join(Chef::Config[:file_cache_path], 'ultradefrag')}" - not_if { ::File.exist?(::File.join(Chef::Config[:file_cache_path], 'ultradefrag')) } -end - -execute 'Run ultradefrag' do - command "#{::File.join(Chef::Config[:file_cache_path], 'ultradefrag', 'udefrag.exe')} --optimize --repeat %SystemDrive%" - action :run -end diff --git a/packer_templates/cookbooks/packer/recipes/disable_restore.rb b/packer_templates/cookbooks/packer/recipes/disable_restore.rb deleted file mode 100644 index 1e0ece679..000000000 --- a/packer_templates/cookbooks/packer/recipes/disable_restore.rb +++ /dev/null @@ -1,5 +0,0 @@ -# don't bother saving data for a system restore -registry_key 'HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows NT\SystemRestore' do - values [{ name: 'DisableSR', type: :dword, data: 0 }] # disable - action :create -end diff --git a/packer_templates/cookbooks/packer/recipes/disable_screensaver.rb b/packer_templates/cookbooks/packer/recipes/disable_screensaver.rb deleted file mode 100644 index 8318ac72b..000000000 --- a/packer_templates/cookbooks/packer/recipes/disable_screensaver.rb +++ /dev/null @@ -1,5 +0,0 @@ -# Disable the screensaver -registry_key 'HKEY_CURRENT_USER\Control Panel\Desktop' do - values [{ name: 'ScreenSaveActive', type: :dword, data: 0 }] # disable - action :create -end diff --git a/packer_templates/cookbooks/packer/recipes/disable_uac.rb b/packer_templates/cookbooks/packer/recipes/disable_uac.rb deleted file mode 100644 index 7bdda073d..000000000 --- a/packer_templates/cookbooks/packer/recipes/disable_uac.rb +++ /dev/null @@ -1,5 +0,0 @@ -windows_uac 'Configure UAC' do - consent_behavior_admins :no_prompt - prompt_on_secure_desktop false - enable_uac false -end diff --git a/packer_templates/cookbooks/packer/recipes/disable_windows_update.rb b/packer_templates/cookbooks/packer/recipes/disable_windows_update.rb deleted file mode 100644 index dbd70fdef..000000000 --- a/packer_templates/cookbooks/packer/recipes/disable_windows_update.rb +++ /dev/null @@ -1,4 +0,0 @@ -# don't waste CPU / network bandwidth checking for updates -windows_update_settings 'disable windows update' do - disable_automatic_updates true -end diff --git a/packer_templates/cookbooks/packer/recipes/enable_file_sharing.rb b/packer_templates/cookbooks/packer/recipes/enable_file_sharing.rb deleted file mode 100644 index 072797aad..000000000 --- a/packer_templates/cookbooks/packer/recipes/enable_file_sharing.rb +++ /dev/null @@ -1,3 +0,0 @@ -execute 'enable filesharing' do - command 'netsh advfirewall firewall set rule group="File and Printer Sharing" new enable=Yes' -end diff --git a/packer_templates/cookbooks/packer/recipes/enable_remote_desktop.rb b/packer_templates/cookbooks/packer/recipes/enable_remote_desktop.rb deleted file mode 100644 index 293c729f3..000000000 --- a/packer_templates/cookbooks/packer/recipes/enable_remote_desktop.rb +++ /dev/null @@ -1,10 +0,0 @@ -registry_key 'HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Terminal Server' do - values [{ - name: 'fDenyTSConnections', - type: :dword, - data: 0 }] -end - -execute 'Enable RDP firewall rule' do - command 'netsh advfirewall firewall set rule group="Remote Desktop" new enable=Yes' -end diff --git a/packer_templates/cookbooks/packer/recipes/features.rb b/packer_templates/cookbooks/packer/recipes/features.rb deleted file mode 100644 index 8fb9548e5..000000000 --- a/packer_templates/cookbooks/packer/recipes/features.rb +++ /dev/null @@ -1,3 +0,0 @@ -windows_feature 'MicrosoftWindowsPowerShellISE' do - action :remove -end diff --git a/packer_templates/cookbooks/packer/recipes/remove_defender.rb b/packer_templates/cookbooks/packer/recipes/remove_defender.rb deleted file mode 100644 index ec72c2eb8..000000000 --- a/packer_templates/cookbooks/packer/recipes/remove_defender.rb +++ /dev/null @@ -1,3 +0,0 @@ -windows_defender 'disable windows defender' do - action :disable -end diff --git a/packer_templates/cookbooks/packer/recipes/set_local_account_token_filter_policy.rb b/packer_templates/cookbooks/packer/recipes/set_local_account_token_filter_policy.rb deleted file mode 100644 index 63dbfa241..000000000 --- a/packer_templates/cookbooks/packer/recipes/set_local_account_token_filter_policy.rb +++ /dev/null @@ -1,7 +0,0 @@ -registry_key 'HKEY_LOCAL_MACHINE\software\Microsoft\Windows\CurrentVersion\Policies\system' do - values [{ - name: 'LocalAccountTokenFilterPolicy', - type: :dword, - data: 1, - }] -end diff --git a/packer_templates/cookbooks/packer/recipes/ui_tweaks.rb b/packer_templates/cookbooks/packer/recipes/ui_tweaks.rb deleted file mode 100644 index bf17b3330a5bd025d554f1363b3211143843e78b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3851 zcmc&%O>-JK5ZyDsqN{x1;)9*ju5SbnwOeZviVr(mJ1JMss0UPNq$x?mN4E0c)6zf^ zumiT^uqPNssNZY#d)+z%H#18pq#~e|C+(!su4QQ|oww`zIjy1n=il8)Ix>Y{qNTJi zb88$wrFT*bvvg^<wwAQNB^&;oCaX#rOE&F@1?rqc8-!^AEKt?t;NSoFJAlTLu6S=L zsK?Qhm2aQN7k*vwiz~4-Ry4l|^mqjq;o<Yg7HQFHoi(^;QV7x!{)s_z*dur^ckwE$ zbw1-HH^~8Sz|RN<UC_qIueBq4!pz@9Kx6Y98mFs^Uaiys{j4K|CFh<4@(hG@m~lmO zW@RCB^jwxunX0Z%StW@MAl{-<#^|xEj*-|a@GS|l)>yDq8SAB<{)k8N&wY0?947C^ z_mfdFJfzo+ZXt;~54Su2c1Wk!M*9(4#pJIeNAUv|l{IA*@fXYnS-!Pr^UzETozV~K z{-&Rf-uK3Lonev=jFPz|_t1La-8dbRl9)*){rV7r(I((9#(RHEy?Zo9<Y6IQjS8qJ zDEBT1I3wqwBFmJ@;B*gIyv#RmW1ysobBI&3u=jz{h14E7nK!$J#3$PJz^1b$=KNZ* zKeJSpjj;o20a@++Pq&2ej7sXG#wpoDgyOnR?&X4xklAt9pR%Q2jO`4*B|0}{$?5gz z<_;wHEu#cC%~vX$r?lHU%5Ehsk0f`m_!|OoQ1BMDQ+3Ym9vmqaLa<iLpQxwmwFK~s znS`1b)>Ldl7zP+V2MaQ1A__B7Q39bi3vzRBsuLd14NqMQKA%wp_L5Ty+z>L%=TmEH z)~_sCbdez;&mT?6K^U_B2VQsRiLKJkUqa0(o)x2bGPJMbOV1ir$1Gcp+|iuUQ1;L4 z=Z%Um{+qs9>~hBQYbp6x`6+bwV7Vo(Hjj@TQI|WhH3|l(Nu}3Kjc#V~K6xv1cgSM< zQa23t9G1s@j(=d_{>}xO{s62PzA<nsT+YJ%L0Ftld5<T9J_PfcHw!c1W>(p)mnUK! zmBx4;xy3ZJwE|pjDclwq_M@KrXl4(A?1iBy26@nZp9s-45E+?K3KYv9GP5Gb7o1JL zW6_(6adY>`c;?u7T_8(>-K)_?NxBY=g-4U%BHuO%cf76Hu_=&+(gdfd3@_$e$2QvT zcHS7}d2W4V$7W&eA%q0!sdRt^Zv{EeYV%M9+dX67*b5$TzDk))_|7!2R1jZ4b8>x_ g=x(WGQlnjeU)JqEF3vCCoL^j?|9%nIZtj#{051;)R{#J2 diff --git a/packer_templates/cookbooks/packer/recipes/updates.rb b/packer_templates/cookbooks/packer/recipes/updates.rb deleted file mode 100644 index f602be4db..000000000 --- a/packer_templates/cookbooks/packer/recipes/updates.rb +++ /dev/null @@ -1,13 +0,0 @@ -if windows_nt_version == '10.0.17763' # 2019 - # This is basically a service pack and we should install it to fix a giant pile of bugs - msu_package '2020-04 monthly rollup' do - source 'http://download.windowsupdate.com/d/msdownload/update/software/updt/2020/04/windows10.0-kb4550969-x64_7d0a6efbe9e4d44253babdc161873513f88fc1e4.msu' - action :install - end -elsif windows_nt_version == '10.0.14393' # 2016 - # This is basically a service pack and we should install it to fix a giant pile of bugs - msu_package '2020-04 monthly rollup' do - source 'http://download.windowsupdate.com/d/msdownload/update/software/updt/2020/04/windows10.0-kb4550947-x64_f2ec932f8fb2be82d2f430b5dcd1ec4b92a7611c.msu' - action :install - end -end diff --git a/packer_templates/cookbooks/packer/recipes/vm_tools.rb b/packer_templates/cookbooks/packer/recipes/vm_tools.rb deleted file mode 100644 index d5b87c232..000000000 --- a/packer_templates/cookbooks/packer/recipes/vm_tools.rb +++ /dev/null @@ -1,37 +0,0 @@ -# install virtualbox guest additions on vbox guests -if vbox? - directory 'C:/Windows/Temp/virtualbox' do - recursive true - end - - powershell_script 'install vbox guest additions' do - code <<-EOH - Get-ChildItem E:/cert/ -Filter vbox*.cer | ForEach-Object { - E:/cert/VBoxCertUtil.exe add-trusted-publisher $_.FullName --root $_.FullName - } - - Start-Process -FilePath "e:/VBoxWindowsAdditions.exe" -ArgumentList "/S" -WorkingDirectory "C:/Windows/Temp/virtualbox" -Wait - EOH - ignore_failure true - end - - directory 'C:/Windows/Temp/virtualbox' do - action :delete - end -end - -# install vmware tools on vmware guests -# This is from https://github.com/luciusbono/Packer-Windows10/blob/master/install-guest-tools.ps1 -if vmware? - powershell_script 'install vmware tools' do - code <<-'EOH' - $isopath = 'C:\Windows\Temp\vmware.iso' - Mount-DiskImage -ImagePath $isopath - $exe = ((Get-DiskImage -ImagePath $isopath | Get-Volume).Driveletter + ':\setup.exe') - $parameters = '/S /v "/qn REBOOT=R"' - Start-Process -FilePath $exe -ArgumentList $parameters -Wait - Dismount-DiskImage -ImagePath $isopath - Remove-Item $isopath - EOH - end -end diff --git a/packer_templates/http/ubuntu/preseed-hyperv.cfg b/packer_templates/http/ubuntu/preseed-hyperv.cfg deleted file mode 100755 index 6b40fbd7d..000000000 --- a/packer_templates/http/ubuntu/preseed-hyperv.cfg +++ /dev/null @@ -1,37 +0,0 @@ -choose-mirror-bin mirror/http/proxy string -d-i base-installer/kernel/override-image string linux-server -d-i clock-setup/utc boolean true -d-i clock-setup/utc-auto boolean true -d-i finish-install/reboot_in_progress note -d-i grub-installer/only_debian boolean true -d-i grub-installer/with_other_os boolean true -d-i mirror/country string manual -d-i mirror/http/directory string /ubuntu/ -d-i mirror/http/hostname string archive.ubuntu.com -d-i mirror/http/proxy string -d-i partman-auto-lvm/guided_size string max -d-i partman-auto/choose_recipe select atomic -d-i partman-auto/method string lvm -d-i partman-lvm/confirm boolean true -d-i partman-lvm/confirm_nooverwrite boolean true -d-i partman-lvm/device_remove_lvm boolean true -d-i partman/choose_partition select finish -d-i partman/confirm boolean true -d-i partman/confirm_nooverwrite boolean true -d-i partman/confirm_write_new_label boolean true -d-i partman-partitioning/no_bootable_gpt_biosgrub boolean false -d-i partman-partitioning/no_bootable_gpt_efi boolean false -d-i partman-efi/non_efi_system boolean true -d-i passwd/user-fullname string vagrant -d-i passwd/user-uid string 1000 -d-i passwd/user-password password vagrant -d-i passwd/user-password-again password vagrant -d-i passwd/username string vagrant -d-i pkgsel/include string openssh-server ntp dkms linux-tools-$(uname -r) linux-cloud-tools-$(uname -r) linux-cloud-tools-common cifs-utils software-properties-common ifupdown -d-i pkgsel/install-language-support boolean false -d-i pkgsel/update-policy select none -d-i pkgsel/upgrade select full-upgrade -d-i time/zone string UTC -d-i user-setup/allow-password-weak boolean true -d-i user-setup/encrypt-home boolean false -tasksel tasksel/first multiselect standard, server diff --git a/packer_templates/http/ubuntu/preseed.cfg b/packer_templates/http/ubuntu/preseed.cfg deleted file mode 100644 index 63dbda0f2..000000000 --- a/packer_templates/http/ubuntu/preseed.cfg +++ /dev/null @@ -1,90 +0,0 @@ -#_preseed_V1 -# Automatic installation -d-i auto-install/enable boolean true - -# Preseeding only locale sets language, country and locale. -d-i debian-installer/language string en -d-i debian-installer/country string US -d-i debian-installer/locale string en_US.UTF-8 - -d-i console-setup/ask_detect boolean false -d-i debconf/frontend select noninteractive - -# Keyboard selection. -d-i keyboard-configuration/xkb-keymap select us -d-i keymap select us - -choose-mirror-bin mirror/http/proxy string -d-i apt-setup/use_mirror boolean true -d-i base-installer/kernel/override-image string linux-server - -### Clock and time zone setup -d-i clock-setup/utc boolean true -d-i clock-setup/utc-auto boolean true -d-i time/zone string UTC - -# Avoid that last message about the install being complete. -d-i finish-install/reboot_in_progress note - -# This is fairly safe to set, it makes grub install automatically to the MBR -# if no other operating system is detected on the machine. -d-i grub-installer/only_debian boolean true - -# This one makes grub-installer install to the MBR if it also finds some other -# OS, which is less safe as it might not be able to boot that other OS. -d-i grub-installer/with_other_os boolean true - -# Set dev for grub boot -d-i grub-installer/bootdev string /dev/sda - -### Mirror settings -# If you select ftp, the mirror/country string does not need to be set. -d-i mirror/country string manual -d-i mirror/http/directory string /ubuntu/ -d-i mirror/http/hostname string archive.ubuntu.com -d-i mirror/http/proxy string - -# This makes partman automatically partition without confirmation. -d-i partman-efi/non_efi_system boolean true -d-i partman-auto-lvm/guided_size string max -d-i partman-auto/choose_recipe select atomic -d-i partman-auto/method string lvm -d-i partman-lvm/confirm boolean true -d-i partman-lvm/confirm_nooverwrite boolean true -d-i partman-lvm/device_remove_lvm boolean true -d-i partman/choose_partition select finish -d-i partman/confirm boolean true -d-i partman/confirm_nooverwrite boolean true -d-i partman/confirm_write_new_label boolean true - -### Account setup -d-i passwd/root-login boolean false -d-i passwd/user-fullname string vagrant -d-i passwd/user-uid string 1000 -d-i passwd/user-password password vagrant -d-i passwd/user-password-again password vagrant -d-i passwd/username string vagrant - -# The installer will warn about weak passwords. If you are sure you know -# what you're doing and want to override it, uncomment this. -d-i user-setup/allow-password-weak boolean true -d-i user-setup/encrypt-home boolean false - -### Package selection -tasksel tasksel/first multiselect standard, server -d-i pkgsel/include string openssh-server sudo cryptsetup libssl-dev libreadline-dev zlib1g-dev linux-source dkms nfs-common linux-headers-$(uname -r) perl cifs-utils software-properties-common rsync ifupdown -d-i pkgsel/install-language-support boolean false - -# disable automatic package updates -d-i pkgsel/update-policy select none -d-i pkgsel/upgrade select full-upgrade - -# Disable polularity contest -popularity-contest popularity-contest/participate boolean false - -# Select base install -tasksel tasksel/first multiselect standard, ssh-server - -# Setup passwordless sudo for packer user -d-i preseed/late_command string \ -echo "vagrant ALL=(ALL:ALL) NOPASSWD:ALL" > /target/etc/sudoers.d/vagrant && chmod 0440 /target/etc/sudoers.d/vagrant diff --git a/packer_templates/pkr-builder.pkr.hcl b/packer_templates/pkr-builder.pkr.hcl index 67387065d..799b849a3 100644 --- a/packer_templates/pkr-builder.pkr.hcl +++ b/packer_templates/pkr-builder.pkr.hcl @@ -1,16 +1,12 @@ packer { required_version = ">= 1.7.0" required_plugins { - chef = { - version = ">= 1.0.0" - source = "github.com/hashicorp/chef" - } hyperv = { version = ">= 1.0.0" source = "github.com/hashicorp/hyperv" } parallels = { - version = ">= 1.0.1" + version = ">= 1.0.2" source = "github.com/parallels/parallels" } qemu = { @@ -27,13 +23,8 @@ packer { } vmware = { version = ">= 1.0.9" - source = "github.com/Stromweld/vmware" + source = "github.com/hashicorp/vmware" } - # Temp switch till bug fix for x86 tools location is fixed - # vmware = { - # version = ">= 1.0.8" - # source = "github.com/hashicorp/vmware" - # } windows-update = { version = ">= 0.14.1" source = "github.com/rgl/windows-update" @@ -42,130 +33,121 @@ packer { } locals { - scripts = var.is_windows ? ( - substr(var.os_version, 0, 2) == "10" || - substr(var.os_version, 0, 2) == "11" ? [ - # "${path.root}/scripts/windows/base_setup.ps1", + scripts = var.scripts == null ? ( + var.is_windows ? [ "${path.root}/scripts/windows/provision.ps1", + "${path.root}/scripts/windows/configure-power.ps1", + "${path.root}/scripts/windows/disable-windows-uac.ps1", + "${path.root}/scripts/windows/disable-system-restore.ps1", + "${path.root}/scripts/windows/disable-screensaver.ps1", + "${path.root}/scripts/windows/ui-tweaks.ps1", "${path.root}/scripts/windows/disable-windows-updates.ps1", "${path.root}/scripts/windows/disable-windows-defender.ps1", - "${path.root}/scripts/windows/remove-one-drive.ps1", + "${path.root}/scripts/windows/remove-one-drive-and-teams.ps1", "${path.root}/scripts/windows/remove-apps.ps1", - "${path.root}/scripts/windows/virtualbox-prevent-vboxsrv-resolution-delay.ps1", - "${path.root}/scripts/windows/provision-winrm.ps1", "${path.root}/scripts/windows/enable-remote-desktop.ps1", + "${path.root}/scripts/windows/enable-file-sharing.ps1", "${path.root}/scripts/windows/eject-media.ps1" - ] : [ - # "${path.root}/scripts/windows/base_setup.ps1", - "${path.root}/scripts/windows/provision.ps1", - "${path.root}/scripts/windows/disable-windows-updates.ps1", - "${path.root}/scripts/windows/disable-windows-defender.ps1", - "${path.root}/scripts/windows/remove-one-drive.ps1", - # "${path.root}/scripts/windows/remove-apps.ps1", - "${path.root}/scripts/windows/virtualbox-prevent-vboxsrv-resolution-delay.ps1", - "${path.root}/scripts/windows/provision-winrm.ps1", - "${path.root}/scripts/windows/enable-remote-desktop.ps1", - "${path.root}/scripts/windows/eject-media.ps1" - ] - ) : ( - var.os_name == "solaris" ? [ - "${path.root}/scripts/solaris/update_solaris.sh", - "${path.root}/scripts/_common/vagrant.sh", - "${path.root}/scripts/solaris/vmtools_solaris.sh", - "${path.root}/scripts/solaris/minimize_solaris.sh" ] : ( - var.os_name == "freebsd" ? [ - "${path.root}/scripts/freebsd/update_freebsd.sh", - "${path.root}/scripts/freebsd/postinstall_freebsd.sh", - "${path.root}/scripts/freebsd/sudoers_freebsd.sh", + var.os_name == "solaris" ? [ + "${path.root}/scripts/solaris/update_solaris.sh", "${path.root}/scripts/_common/vagrant.sh", - "${path.root}/scripts/freebsd/vmtools_freebsd.sh", - "${path.root}/scripts/freebsd/cleanup_freebsd.sh", - "${path.root}/scripts/freebsd/minimize_freebsd.sh" + "${path.root}/scripts/solaris/vmtools_solaris.sh", + "${path.root}/scripts/solaris/minimize_solaris.sh" ] : ( - var.os_name == "opensuse" || - var.os_name == "sles" ? [ - "${path.root}/scripts/suse/repositories_suse.sh", - "${path.root}/scripts/suse/update_suse.sh", - "${path.root}/scripts/_common/motd.sh", - "${path.root}/scripts/_common/sshd.sh", + var.os_name == "freebsd" ? [ + "${path.root}/scripts/freebsd/update_freebsd.sh", + "${path.root}/scripts/freebsd/postinstall_freebsd.sh", + "${path.root}/scripts/freebsd/sudoers_freebsd.sh", "${path.root}/scripts/_common/vagrant.sh", - "${path.root}/scripts/suse/unsupported-modules_suse.sh", - "${path.root}/scripts/_common/virtualbox.sh", - "${path.root}/scripts/_common/vmware_suse.sh", - "${path.root}/scripts/_common/parallels.sh", - "${path.root}/scripts/suse/vagrant_group_suse.sh", - "${path.root}/scripts/suse/sudoers_suse.sh", - "${path.root}/scripts/suse/zypper-locks_suse.sh", - "${path.root}/scripts/suse/remove-dvd-source_suse.sh", - "${path.root}/scripts/suse/cleanup_suse.sh", - "${path.root}/scripts/_common/minimize.sh" + "${path.root}/scripts/freebsd/vmtools_freebsd.sh", + "${path.root}/scripts/freebsd/cleanup_freebsd.sh", + "${path.root}/scripts/freebsd/minimize_freebsd.sh" ] : ( - var.os_name == "ubuntu" || - var.os_name == "debian" ? [ - "${path.root}/scripts/${var.os_name}/update_${var.os_name}.sh", + var.os_name == "opensuse" || + var.os_name == "sles" ? [ + "${path.root}/scripts/suse/repositories_suse.sh", + "${path.root}/scripts/suse/update_suse.sh", "${path.root}/scripts/_common/motd.sh", "${path.root}/scripts/_common/sshd.sh", - "${path.root}/scripts/${var.os_name}/networking_${var.os_name}.sh", - "${path.root}/scripts/${var.os_name}/sudoers_${var.os_name}.sh", "${path.root}/scripts/_common/vagrant.sh", - "${path.root}/scripts/${var.os_name}/systemd_${var.os_name}.sh", + "${path.root}/scripts/suse/unsupported-modules_suse.sh", "${path.root}/scripts/_common/virtualbox.sh", - "${path.root}/scripts/_common/vmware_debian_ubuntu.sh", + "${path.root}/scripts/_common/vmware_suse.sh", "${path.root}/scripts/_common/parallels.sh", - "${path.root}/scripts/${var.os_name}/hyperv_${var.os_name}.sh", - "${path.root}/scripts/${var.os_name}/cleanup_${var.os_name}.sh", - "${path.root}/scripts/_common/parallels_post_cleanup_debian_ubuntu.sh", + "${path.root}/scripts/suse/vagrant_group_suse.sh", + "${path.root}/scripts/suse/sudoers_suse.sh", + "${path.root}/scripts/suse/zypper-locks_suse.sh", + "${path.root}/scripts/suse/remove-dvd-source_suse.sh", + "${path.root}/scripts/suse/cleanup_suse.sh", "${path.root}/scripts/_common/minimize.sh" ] : ( - var.os_name == "fedora" ? [ - "${path.root}/scripts/fedora/networking_fedora.sh", - "${path.root}/scripts/fedora/update_dnf.sh", - "${path.root}/scripts/fedora/build-tools_fedora.sh", - "${path.root}/scripts/fedora/install-supporting-packages_fedora.sh", + var.os_name == "ubuntu" || + var.os_name == "debian" ? [ + "${path.root}/scripts/${var.os_name}/update_${var.os_name}.sh", "${path.root}/scripts/_common/motd.sh", "${path.root}/scripts/_common/sshd.sh", - "${path.root}/scripts/_common/virtualbox.sh", - "${path.root}/scripts/_common/vmware_fedora.sh", - "${path.root}/scripts/_common/parallels-rhel.sh", + "${path.root}/scripts/${var.os_name}/networking_${var.os_name}.sh", + "${path.root}/scripts/${var.os_name}/sudoers_${var.os_name}.sh", "${path.root}/scripts/_common/vagrant.sh", - "${path.root}/scripts/fedora/real-tmp_fedora.sh", - "${path.root}/scripts/fedora/cleanup_dnf.sh", + "${path.root}/scripts/${var.os_name}/systemd_${var.os_name}.sh", + "${path.root}/scripts/_common/virtualbox.sh", + "${path.root}/scripts/_common/vmware_debian_ubuntu.sh", + "${path.root}/scripts/_common/parallels.sh", + "${path.root}/scripts/${var.os_name}/hyperv_${var.os_name}.sh", + "${path.root}/scripts/${var.os_name}/cleanup_${var.os_name}.sh", + "${path.root}/scripts/_common/parallels_post_cleanup_debian_ubuntu.sh", "${path.root}/scripts/_common/minimize.sh" ] : ( - "${var.os_name}-${substr(var.os_version, 0, 1)}" == "amazonlinux-2" || - "${var.os_name}-${substr(var.os_version, 0, 1)}" == "centos-7" || - "${var.os_name}-${substr(var.os_version, 0, 1)}" == "oracle-7" || - "${var.os_name}-${substr(var.os_version, 0, 1)}" == "rhel-7" || - "${var.os_name}-${substr(var.os_version, 0, 1)}" == "scientificlinux-7" || - "${var.os_name}-${substr(var.os_version, 0, 1)}" == "springdalelinux-7" ? [ - "${path.root}/scripts/rhel/update_yum.sh", + var.os_name == "fedora" ? [ + "${path.root}/scripts/fedora/networking_fedora.sh", + "${path.root}/scripts/fedora/update_dnf.sh", + "${path.root}/scripts/fedora/build-tools_fedora.sh", + "${path.root}/scripts/fedora/install-supporting-packages_fedora.sh", "${path.root}/scripts/_common/motd.sh", "${path.root}/scripts/_common/sshd.sh", - "${path.root}/scripts/rhel/networking_rhel7.sh", - "${path.root}/scripts/_common/vagrant.sh", "${path.root}/scripts/_common/virtualbox.sh", - "${path.root}/scripts/_common/vmware_rhel.sh", + "${path.root}/scripts/_common/vmware_fedora.sh", "${path.root}/scripts/_common/parallels-rhel.sh", - "${path.root}/scripts/rhel/cleanup_yum.sh", - "${path.root}/scripts/_common/minimize.sh" - ] : [ - "${path.root}/scripts/rhel/update_dnf.sh", - "${path.root}/scripts/_common/motd.sh", - "${path.root}/scripts/_common/sshd.sh", "${path.root}/scripts/_common/vagrant.sh", - "${path.root}/scripts/_common/virtualbox.sh", - "${path.root}/scripts/_common/vmware_rhel.sh", - "${path.root}/scripts/_common/parallels-rhel.sh", - "${path.root}/scripts/rhel/cleanup_dnf.sh", + "${path.root}/scripts/fedora/real-tmp_fedora.sh", + "${path.root}/scripts/fedora/cleanup_dnf.sh", "${path.root}/scripts/_common/minimize.sh" - ] + ] : ( + "${var.os_name}-${substr(var.os_version, 0, 1)}" == "amazonlinux-2" || + "${var.os_name}-${substr(var.os_version, 0, 1)}" == "centos-7" || + "${var.os_name}-${substr(var.os_version, 0, 1)}" == "oracle-7" || + "${var.os_name}-${substr(var.os_version, 0, 1)}" == "rhel-7" || + "${var.os_name}-${substr(var.os_version, 0, 1)}" == "scientificlinux-7" || + "${var.os_name}-${substr(var.os_version, 0, 1)}" == "springdalelinux-7" ? [ + "${path.root}/scripts/rhel/update_yum.sh", + "${path.root}/scripts/_common/motd.sh", + "${path.root}/scripts/_common/sshd.sh", + "${path.root}/scripts/rhel/networking_rhel7.sh", + "${path.root}/scripts/_common/vagrant.sh", + "${path.root}/scripts/_common/virtualbox.sh", + "${path.root}/scripts/_common/vmware_rhel.sh", + "${path.root}/scripts/_common/parallels-rhel.sh", + "${path.root}/scripts/rhel/cleanup_yum.sh", + "${path.root}/scripts/_common/minimize.sh" + ] : [ + "${path.root}/scripts/rhel/update_dnf.sh", + "${path.root}/scripts/_common/motd.sh", + "${path.root}/scripts/_common/sshd.sh", + "${path.root}/scripts/_common/vagrant.sh", + "${path.root}/scripts/_common/virtualbox.sh", + "${path.root}/scripts/_common/vmware_rhel.sh", + "${path.root}/scripts/_common/parallels-rhel.sh", + "${path.root}/scripts/rhel/cleanup_dnf.sh", + "${path.root}/scripts/_common/minimize.sh" + ] + ) ) ) ) ) ) - ) + ) : var.scripts source_names = [for source in var.sources_enabled : trimprefix(source, "source.")] } @@ -198,50 +180,20 @@ build { } # Windows Updates and scripts - provisioner "powershell" { - elevated_password = "vagrant" - elevated_user = "vagrant" - scripts = local.scripts - except = var.is_windows ? null : local.source_names - } - provisioner "windows-restart" { - except = var.is_windows ? null : local.source_names - } provisioner "windows-update" { search_criteria = "IsInstalled=0" except = var.is_windows ? null : local.source_names } - provisioner "chef-solo" { - chef_license = "accept-no-persist" - version = "17" - cookbook_paths = [ - "${path.root}/cookbooks" - ] - guest_os_type = "windows" - run_list = [ - "packer::disable_uac", - "packer::configure_power", - "packer::disable_screensaver", - "packer::features", - "packer::enable_file_sharing", - "packer::ui_tweaks" - ] - except = var.is_windows ? null : local.source_names - } provisioner "windows-restart" { except = var.is_windows ? null : local.source_names } - provisioner "chef-solo" { - chef_license = "accept-no-persist" - version = "17" - cookbook_paths = [ - "${path.root}/cookbooks" - ] - guest_os_type = "windows" - run_list = [ - "packer::cleanup", - "packer::defrag" - ] + provisioner "powershell" { + elevated_password = "vagrant" + elevated_user = "vagrant" + scripts = local.scripts + except = var.is_windows ? null : local.source_names + } + provisioner "windows-restart" { except = var.is_windows ? null : local.source_names } provisioner "powershell" { @@ -253,12 +205,14 @@ build { ] except = var.is_windows ? null : local.source_names } + provisioner "windows-restart" { + except = var.is_windows ? null : local.source_names + } # Convert machines to vagrant boxes post-processor "vagrant" { compression_level = 9 - keep_input_artifact = var.is_windows output = "${path.root}/../builds/${var.os_name}-${var.os_version}-${var.os_arch}.{{ .Provider }}.box" - vagrantfile_template = var.is_windows ? (var.hyperv_generation == 1 ? "${path.root}/vagrantfile-windows.template" : "${path.root}/vagrantfile-windows-gen2.template") : null + vagrantfile_template = var.is_windows ? "${path.root}/vagrantfile-windows.template" : null } } diff --git a/packer_templates/pkr-sources.pkr.hcl b/packer_templates/pkr-sources.pkr.hcl index c2035e1b4..9dafa9856 100644 --- a/packer_templates/pkr-sources.pkr.hcl +++ b/packer_templates/pkr-sources.pkr.hcl @@ -34,17 +34,13 @@ locals { var.os_arch == "aarch64" ? "virt" : "q35" ) : var.qemu_machine_type qemuargs = var.qemuargs == null ? ( - var.hyperv_generation == 2 && var.is_windows ? [ - ["-bios", "/usr/share/OVMF/OVMF_CODE.fd"], + var.is_windows ? [ + ["-drive", "file=${path.root}/win_answer_files/virtio-win.iso,media=cdrom,index=3"], + ["-drive", "file=${path.root}/../builds/packer-${var.os_name}-${var.os_version}-${var.os_arch}-qemu/{{ .Name }},if=virtio,cache=writeback,discard=ignore,format=qcow2,index=1"], ] : ( - var.is_windows ? [ - ["-drive", "file=${path.root}/win_answer_files/virtio-win.iso,media=cdrom,index=3"], - ["-drive", "file=${path.root}/../builds/packer-${var.os_name}-${var.os_version}-${var.os_arch}-qemu/{{ .Name }},if=virtio,cache=writeback,discard=ignore,format=qcow2,index=1"], - ] : ( - var.os_arch == "aarch64" ? [ - ["-boot", "strict=off"] - ] : null - ) + var.os_arch == "aarch64" ? [ + ["-boot", "strict=off"] + ] : null ) ) : var.qemuargs @@ -56,7 +52,7 @@ locals { var.is_windows ? 128 : 33 ) : var.vbox_gfx_vram_size vbox_guest_additions_mode = var.vbox_guest_additions_mode == null ? ( - var.is_windows && var.hyperv_generation == 1 ? "attach" : "upload" + var.is_windows ? "attach" : "upload" ) : var.vbox_guest_additions_mode # virtualbox-ovf @@ -73,27 +69,28 @@ locals { ) : var.vmware_tools_upload_path # Source block common - boot_wait = var.boot_wait == null ? ( - var.is_windows ? "60s" : "10s" - ) : var.boot_wait + default_boot_wait = var.default_boot_wait == null ? ( + var.is_windows ? "60s" : "5s" + ) : var.default_boot_wait cd_files = var.cd_files == null ? ( - var.hyperv_generation == 2 && var.is_windows ? [ - "${path.root}/win_answer_files/${substr(var.os_version, 0, 2)}/gen2_Autounattend.xml" - ] : null + var.is_windows ? ( + var.hyperv_generation == 2 ? [ + "${path.root}/win_answer_files/${var.os_version}/hyperv-gen2/Autounattend.xml", + ] : [ + "${path.root}/win_answer_files/${var.os_version}/Autounattend.xml", + ] + ) : null ) : var.cd_files communicator = var.communicator == null ? ( var.is_windows ? "winrm" : "ssh" ) : var.communicator floppy_files = var.floppy_files == null ? ( - var.hyperv_generation == 2 ? null : ( - var.is_windows ? [ - "${path.root}/win_answer_files/${var.os_version}/Autounattend.xml", - "${path.root}/scripts/windows/base_setup.ps1" - ] : ( - var.os_name == "springdalelinux" ? [ - "${path.root}/http/rhel/${substr(var.os_version, 0, 1)}ks.cfg" - ] : null - ) + var.is_windows ? [ + "${path.root}/win_answer_files/${var.os_version}/Autounattend.xml", + ] : ( + var.os_name == "springdalelinux" ? [ + "${path.root}/http/rhel/${substr(var.os_version, 0, 1)}ks.cfg" + ] : null ) ) : var.floppy_files http_directory = var.http_directory == null ? "${path.root}/http" : var.http_directory @@ -119,11 +116,12 @@ source "hyperv-iso" "vm" { switch_name = var.hyperv_switch_name # Source block common options boot_command = var.boot_command - boot_wait = local.boot_wait + boot_wait = var.hyperv_boot_wait == null ? local.default_boot_wait : var.hyperv_boot_wait + cd_files = var.hyperv_generation == 2 ? local.cd_files : null cpus = var.cpus communicator = local.communicator disk_size = var.disk_size - floppy_files = local.floppy_files + floppy_files = var.hyperv_generation == 2 ? null : local.floppy_files headless = var.headless http_directory = local.http_directory iso_checksum = var.iso_checksum @@ -150,7 +148,7 @@ source "parallels-iso" "vm" { prlctl_version_file = var.parallels_prlctl_version_file # Source block common options boot_command = var.boot_command - boot_wait = local.boot_wait + boot_wait = var.parallels_boot_wait == null ? local.default_boot_wait : var.parallels_boot_wait cpus = var.cpus communicator = local.communicator disk_size = var.disk_size @@ -180,7 +178,7 @@ source "qemu" "vm" { qemuargs = local.qemuargs # Source block common options boot_command = var.boot_command - boot_wait = local.boot_wait + boot_wait = var.qemu_boot_wait == null ? local.default_boot_wait : var.qemu_boot_wait cd_files = local.cd_files cpus = var.cpus communicator = local.communicator @@ -217,7 +215,7 @@ source "virtualbox-iso" "vm" { virtualbox_version_file = var.virtualbox_version_file # Source block common options boot_command = var.boot_command - boot_wait = local.boot_wait + boot_wait = var.vbox_boot_wait == null ? local.default_boot_wait : var.vbox_boot_wait cpus = var.cpus communicator = local.communicator disk_size = var.disk_size @@ -272,7 +270,7 @@ source "vmware-iso" "vm" { vmx_remove_ethernet_interfaces = var.vmware_vmx_remove_ethernet_interfaces # Source block common options boot_command = var.boot_command - boot_wait = local.boot_wait + boot_wait = var.vmware_boot_wait == null ? local.default_boot_wait : var.vmware_boot_wait cpus = var.cpus communicator = local.communicator disk_size = var.disk_size diff --git a/packer_templates/pkr-variables.pkr.hcl b/packer_templates/pkr-variables.pkr.hcl index 5f67e0e8f..1ba744623 100644 --- a/packer_templates/pkr-variables.pkr.hcl +++ b/packer_templates/pkr-variables.pkr.hcl @@ -49,6 +49,10 @@ variable "sources_enabled" { # Source block provider specific variables # hyperv-iso +variable "hyperv_boot_wait" { + type = string + default = null +} variable "hyperv_enable_dynamic_memory" { type = bool default = null @@ -59,7 +63,7 @@ variable "hyperv_enable_secure_boot" { } variable "hyperv_generation" { type = number - default = 1 + default = 2 description = "Hyper-v generation version" } variable "hyperv_guest_additions_mode" { @@ -72,6 +76,10 @@ variable "hyperv_switch_name" { } # parallels-iso +variable "parallels_boot_wait" { + type = string + default = null +} variable "parallels_guest_os_type" { type = string default = null @@ -103,6 +111,10 @@ variable "qemu_binary" { type = string default = null } +variable "qemu_boot_wait" { + type = string + default = null +} variable "qemu_display" { type = string default = "none" @@ -117,6 +129,10 @@ variable "qemuargs" { } # virtualbox-iso +variable "vbox_boot_wait" { + type = string + default = null +} variable "vbox_gfx_controller" { type = string default = null @@ -175,6 +191,10 @@ variable "vbox_source" { } # vmware-iso +variable "vmware_boot_wait" { + type = string + default = null +} variable "vmware_cdrom_adapter_type" { type = string default = "sata" @@ -234,7 +254,7 @@ variable "boot_command" { default = null description = "Commands to pass to gui session to initiate automated install" } -variable "boot_wait" { +variable "default_boot_wait" { type = string default = null } @@ -303,7 +323,7 @@ variable "ssh_port" { } variable "ssh_timeout" { type = string - default = "60m" + default = "30m" } variable "ssh_username" { type = string @@ -325,3 +345,9 @@ variable "vm_name" { type = string default = null } + +# builder common block +variable "scripts" { + type = list(string) + default = null +} diff --git a/packer_templates/scripts/windows/base_setup.ps1 b/packer_templates/scripts/windows/base_setup.ps1 deleted file mode 100644 index c448e0fec..000000000 --- a/packer_templates/scripts/windows/base_setup.ps1 +++ /dev/null @@ -1,54 +0,0 @@ -Write-Host "Performing the WinRM setup necessary to get the host ready for packer to run Chef..." - -# Make 100% sure we prevent Packer from connecting to WinRM while we -# attempt to configure everything -Disable-NetFirewallRule -DisplayGroup 'Windows Remote Management' - -# Disable UAC -Set-ItemProperty -Path "registry::HKLM\Software\Microsoft\Windows\CurrentVersion\Policies\System" -Name "EnableLUA" -Value 0 - -# parts of this are from https://github.com/luciusbono/Packer-Windows10/blob/master/configure-winrm.ps1 -# and https://github.com/rgl/windows-2016-vagrant/blob/master/winrm.ps1 - -# Supress network location Prompt -New-Item -Path "HKLM:\SYSTEM\CurrentControlSet\Control\Network\NewNetworkWindowOff" -Force - -# The above suppresses the prompt but defaults to "Public" which prevents WinRM from being enabled even with the SkipNetworkProfileCheck arg -# This command sets any network connections detected to Private to allow WinRM to be configured and started -Get-NetConnectionProfile | Set-NetConnectionProfile -NetworkCategory "Private" - -# Does a lot: https://docs.microsoft.com/en-us/powershell/module/microsoft.powershell.core/enable-psremoting?view=powershell-6 -Enable-PSRemoting -SkipNetworkProfileCheck -Force -# May not be necessary since we set the profile to Private above -Set-NetFirewallRule -Name "WINRM-HTTP-In-TCP" -RemoteAddress Any # allow winrm over public profile interfaces - -Write-Host '* Deleting any pre-existing listeners' -winrm delete winrm/config/listener?Address=*+Transport=HTTP 2>$Null -winrm delete winrm/config/listener?Address=*+Transport=HTTPS 2>$Null -Write-Host '* Creating an HTTP listener' -winrm create winrm/config/listener?Address=*+Transport=HTTP | Out-Null -winrm create winrm/config/listener?Address=*+Transport=HTTPS | Out-Null - -winrm set winrm/config '@{MaxTimeoutms="1800000"}' -winrm set winrm/config/winrs '@{MaxMemoryPerShellMB="2048"}' -winrm set winrm/config/service '@{AllowUnencrypted="true"}' -winrm set winrm/config/service/auth '@{Basic="true"}' -winrm set winrm/config/client/auth '@{Basic="true"}' - -# Restart WinRM service -Stop-Service -Name "winrm" -Set-Service -Name "winrm" -StartupType "Automatic" -Start-Service -Name "winrm" - -# Enable WinRM in Firewall for any remote address -Get-NetFirewallRule -DisplayGroup "Windows Remote Management" | Get-NetFirewallAddressFilter | Set-NetFirewallAddressFilter -RemoteAddress Any -Enable-NetFirewallRule -DisplayGroup "Windows Remote Management" - -# Reset auto logon count -# https://docs.microsoft.com/en-us/windows-hardware/customize/desktop/unattend/microsoft-windows-shell-setup-autologon-logoncount#logoncount-known-issue -Set-ItemProperty -Path 'HKLM:\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon' -Name AutoLogonCount -Value 0 - -# Allow time to view output before window is closed -Start-Sleep -Seconds 2 - -exit 0 diff --git a/packer_templates/scripts/windows/cleanup.ps1 b/packer_templates/scripts/windows/cleanup.ps1 index 0c64f432f..e746d0852 100644 --- a/packer_templates/scripts/windows/cleanup.ps1 +++ b/packer_templates/scripts/windows/cleanup.ps1 @@ -1,12 +1,46 @@ -Write-Host "Uninstalling Chef..." -$app = Get-WmiObject -Class Win32_Product | Where-Object { - $_.Name -match "Chef" +Set-StrictMode -Version Latest +$ProgressPreference = 'SilentlyContinue' +$ErrorActionPreference = 'Stop' + +trap { + Write-Host + Write-Host "ERROR: $_" + ($_.ScriptStackTrace -split '\r?\n') -replace '^(.*)$','ERROR: $1' | Write-Host + ($_.Exception.ToString() -split '\r?\n') -replace '^(.*)$','ERROR EXCEPTION: $1' | Write-Host + Write-Host + Write-Host 'Sleeping for 60m to give you time to look around the virtual machine before self-destruction...' + Start-Sleep -Seconds (60*60) + Exit 1 } -$app.Uninstall() -Write-Host "Removing leftover Chef files..." -Remove-Item "C:\Opscode\" -Recurse -Force -ErrorAction SilentlyContinue -Remove-Item "C:\Chef\" -Recurse -Force -ErrorAction SilentlyContinue +Write-Host 'Run Cleanmgr only if on workstation. Server edition doesnt have cleanmgr.' +$osInfo = Get-CimInstance -ClassName Win32_OperatingSystem +if ($osInfo.ProductType -eq 1) { # cleanmgr isn't on servers + # registry key locations pulled from https://github.com/spjeff/spadmin/blob/master/Cleanmgr.ps1 + Write-Host 'Clearing CleanMgr.exe automation settings.' + Get-ItemProperty -Path 'HKLM:\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\*' -Name StateFlags0001 -ErrorAction SilentlyContinue | Remove-ItemProperty -Name StateFlags0001 -ErrorAction SilentlyContinue + + Write-Host 'Enabling Update Cleanup. This is done automatically in Windows 10 via a scheduled task.' + New-ItemProperty -Path 'HKLM:\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\Update Cleanup' -Name StateFlags0001 -Value 2 -Type DWord + + Write-Host 'Enabling Temporary Files Cleanup.' + New-ItemProperty -Path 'HKLM:\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\Temporary Files' -Name StateFlags0001 -Value 2 -Type DWord + + Write-Host 'Starting CleanMgr.exe...' + Start-Process -FilePath CleanMgr.exe -ArgumentList '/sagerun:1' -Wait # -WindowStyle Hidden + Write-Host 'Waiting for CleanMgr and DismHost processes. Second wait neccesary as CleanMgr.exe spins off separate processes.' + Get-Process -Name cleanmgr,dismhost -ErrorAction SilentlyContinue | Wait-Process +} + +Write-Host 'Clean all of the event logs' +@( + 'Application', + 'Security', + 'Setup', + 'System' +) | ForEach-Object { + wevtutil clear-log $_ +} Write-Host "Cleaning Temp Files..." try { @@ -14,3 +48,69 @@ try { Icacls "C:\Windows\Temp\*" /GRANT:r administrators:F /T /c /q 2>&1 Remove-Item "C:\Windows\Temp\*" -Recurse -Force -ErrorAction SilentlyContinue } catch { } + +# +# remove temporary files. +# NB we ignore the packer generated files so it won't complain in the output. + +Write-Host 'Stopping services that might interfere with temporary file removal...' +function Stop-ServiceForReal($name) { + while ($true) { + Stop-Service -ErrorAction SilentlyContinue $name + if ((Get-Service $name).Status -eq 'Stopped') { + break + } + } +} +Stop-ServiceForReal TrustedInstaller # Windows Modules Installer +Stop-ServiceForReal wuauserv # Windows Update +Stop-ServiceForReal BITS # Background Intelligent Transfer Service +@( +"$env:LOCALAPPDATA\Temp\*" +"$env:windir\Temp\*" +"$env:windir\Logs\*" +"$env:windir\Panther\*" +"$env:windir\WinSxS\ManifestCache\*" +"$env:windir\SoftwareDistribution\Download" +"C:\Users\vagrant\Favorites\*" +) | Where-Object {Test-Path $_} | ForEach-Object { + Write-Host "Removing temporary files $_..." + try { + takeown.exe /D Y /R /F $_ | Out-Null + icacls.exe $_ /grant:r Administrators:F /T /C /Q 2>&1 | Out-Null + } catch { + Write-Host "Ignoring taking ownership of temporary files error: $_" + } + try { + Remove-Item $_ -Exclude 'packer-*' -Recurse -Force -ErrorAction SilentlyContinue | Out-Null + } catch { + Write-Host "Ignoring failure to remove files error: $_" + } +} + +# +# cleanup the WinSxS folder. + +# NB even thou the automatic maintenance includes a component cleanup task, +# it will not clean everything, as such, dism will clean the rest. +# NB to analyse the used space use: dism.exe /Online /Cleanup-Image /AnalyzeComponentStore +# see https://docs.microsoft.com/en-us/windows-hardware/manufacture/desktop/clean-up-the-winsxs-folder +Write-Host 'Cleaning up the WinSxS folder...' +dism.exe /Online /Quiet /Cleanup-Image /StartComponentCleanup /ResetBase +if ($LASTEXITCODE) { + throw "Failed with Exit Code $LASTEXITCODE" +} + +# NB even after cleaning up the WinSxS folder the "Backups and Disabled Features" +# field of the analysis report will display a non-zero number because the +# disabled features packages are still on disk. you can remove them with: +Get-WindowsOptionalFeature -Online | Where-Object {$_.State -eq 'Disabled'} | ForEach-Object { + Write-Host "Removing feature $($_.FeatureName)..." + dism.exe /Online /Quiet /Disable-Feature "/FeatureName:$($_.FeatureName)" /Remove +} +# NB a removed feature can still be installed from other sources (e.g. windows update). +Write-Host 'Analyzing the WinSxS folder...' +dism.exe /Online /Cleanup-Image /AnalyzeComponentStore + +Write-Host 'Remove pagefile, it will get created on boot next time.' +New-ItemProperty -Path 'HKLM:\SYSTEM\CurrentControlSet\Control\Session Manager\Memory Management' -Name PagingFiles -Value '' -Force diff --git a/packer_templates/scripts/windows/configure-power 2.ps1 b/packer_templates/scripts/windows/configure-power 2.ps1 new file mode 100644 index 000000000..b64d5b782 --- /dev/null +++ b/packer_templates/scripts/windows/configure-power 2.ps1 @@ -0,0 +1,32 @@ +Set-StrictMode -Version Latest +$ProgressPreference = 'SilentlyContinue' +$ErrorActionPreference = 'Stop' + +trap { + Write-Host + Write-Host "ERROR: $_" + ($_.ScriptStackTrace -split '\r?\n') -replace '^(.*)$','ERROR: $1' | Write-Host + ($_.Exception.ToString() -split '\r?\n') -replace '^(.*)$','ERROR EXCEPTION: $1' | Write-Host + Write-Host + Write-Host 'Sleeping for 60m to give you time to look around the virtual machine before self-destruction...' + Start-Sleep -Seconds (60*60) + Exit 1 +} + +Write-Host 'Set high performance power profile' +powercfg -setactive '8c5e7fda-e8bf-4a96-9a85-a6e23a8c635c' + +Write-Host 'Turn off Hibernation' +powercfg.exe /hibernate off + +Write-Host 'Turn off monitor timeout on AC power' +powercfg -Change -monitor-timeout-ac 0 + +Write-Host 'Turn off monitor timeout on DC power' +powercfg -Change -monitor-timeout-dc 0 + +Write-Host 'Zero Hibernation File' +Set-ItemProperty -Path 'HKLM:\SYSTEM\CurrentControlSet\Control\Power' -Name HiberFileSizePercent -Type DWORD -Value 0 + +Write-Host 'Disable Hibernation Mode' +Set-ItemProperty -Path 'HKLM:\SYSTEM\CurrentControlSet\Control\Power' -Name HibernateEnabled -Type DWORD -Value 0 diff --git a/packer_templates/scripts/windows/configure-power.ps1 b/packer_templates/scripts/windows/configure-power.ps1 new file mode 100644 index 000000000..b64d5b782 --- /dev/null +++ b/packer_templates/scripts/windows/configure-power.ps1 @@ -0,0 +1,32 @@ +Set-StrictMode -Version Latest +$ProgressPreference = 'SilentlyContinue' +$ErrorActionPreference = 'Stop' + +trap { + Write-Host + Write-Host "ERROR: $_" + ($_.ScriptStackTrace -split '\r?\n') -replace '^(.*)$','ERROR: $1' | Write-Host + ($_.Exception.ToString() -split '\r?\n') -replace '^(.*)$','ERROR EXCEPTION: $1' | Write-Host + Write-Host + Write-Host 'Sleeping for 60m to give you time to look around the virtual machine before self-destruction...' + Start-Sleep -Seconds (60*60) + Exit 1 +} + +Write-Host 'Set high performance power profile' +powercfg -setactive '8c5e7fda-e8bf-4a96-9a85-a6e23a8c635c' + +Write-Host 'Turn off Hibernation' +powercfg.exe /hibernate off + +Write-Host 'Turn off monitor timeout on AC power' +powercfg -Change -monitor-timeout-ac 0 + +Write-Host 'Turn off monitor timeout on DC power' +powercfg -Change -monitor-timeout-dc 0 + +Write-Host 'Zero Hibernation File' +Set-ItemProperty -Path 'HKLM:\SYSTEM\CurrentControlSet\Control\Power' -Name HiberFileSizePercent -Type DWORD -Value 0 + +Write-Host 'Disable Hibernation Mode' +Set-ItemProperty -Path 'HKLM:\SYSTEM\CurrentControlSet\Control\Power' -Name HibernateEnabled -Type DWORD -Value 0 diff --git a/packer_templates/scripts/windows/disable-screensaver 2.ps1 b/packer_templates/scripts/windows/disable-screensaver 2.ps1 new file mode 100644 index 000000000..4fbbdad2e --- /dev/null +++ b/packer_templates/scripts/windows/disable-screensaver 2.ps1 @@ -0,0 +1,17 @@ +Set-StrictMode -Version Latest +$ProgressPreference = 'SilentlyContinue' +$ErrorActionPreference = 'Stop' + +trap { + Write-Host + Write-Host "ERROR: $_" + ($_.ScriptStackTrace -split '\r?\n') -replace '^(.*)$','ERROR: $1' | Write-Host + ($_.Exception.ToString() -split '\r?\n') -replace '^(.*)$','ERROR EXCEPTION: $1' | Write-Host + Write-Host + Write-Host 'Sleeping for 60m to give you time to look around the virtual machine before self-destruction...' + Start-Sleep -Seconds (60*60) + Exit 1 +} + +Write-Host 'Disable the screensaver' +Set-ItemProperty -Path 'HKCU:\Control Panel\Desktop' -Name ScreenSaveActive -Type DWORD -Value 0 diff --git a/packer_templates/scripts/windows/disable-screensaver.ps1 b/packer_templates/scripts/windows/disable-screensaver.ps1 new file mode 100644 index 000000000..4fbbdad2e --- /dev/null +++ b/packer_templates/scripts/windows/disable-screensaver.ps1 @@ -0,0 +1,17 @@ +Set-StrictMode -Version Latest +$ProgressPreference = 'SilentlyContinue' +$ErrorActionPreference = 'Stop' + +trap { + Write-Host + Write-Host "ERROR: $_" + ($_.ScriptStackTrace -split '\r?\n') -replace '^(.*)$','ERROR: $1' | Write-Host + ($_.Exception.ToString() -split '\r?\n') -replace '^(.*)$','ERROR EXCEPTION: $1' | Write-Host + Write-Host + Write-Host 'Sleeping for 60m to give you time to look around the virtual machine before self-destruction...' + Start-Sleep -Seconds (60*60) + Exit 1 +} + +Write-Host 'Disable the screensaver' +Set-ItemProperty -Path 'HKCU:\Control Panel\Desktop' -Name ScreenSaveActive -Type DWORD -Value 0 diff --git a/packer_templates/scripts/windows/disable-system-restore 2.ps1 b/packer_templates/scripts/windows/disable-system-restore 2.ps1 new file mode 100644 index 000000000..f3dee15d7 --- /dev/null +++ b/packer_templates/scripts/windows/disable-system-restore 2.ps1 @@ -0,0 +1,17 @@ +Set-StrictMode -Version Latest +$ProgressPreference = 'SilentlyContinue' +$ErrorActionPreference = 'Stop' + +trap { + Write-Host + Write-Host "ERROR: $_" + ($_.ScriptStackTrace -split '\r?\n') -replace '^(.*)$','ERROR: $1' | Write-Host + ($_.Exception.ToString() -split '\r?\n') -replace '^(.*)$','ERROR EXCEPTION: $1' | Write-Host + Write-Host + Write-Host 'Sleeping for 60m to give you time to look around the virtual machine before self-destruction...' + Start-Sleep -Seconds (60*60) + Exit 1 +} + +Write-Host 'Disabling System Restore' +Disable-ComputerRestore -Drive "C:\" diff --git a/packer_templates/scripts/windows/disable-system-restore.ps1 b/packer_templates/scripts/windows/disable-system-restore.ps1 new file mode 100644 index 000000000..f3dee15d7 --- /dev/null +++ b/packer_templates/scripts/windows/disable-system-restore.ps1 @@ -0,0 +1,17 @@ +Set-StrictMode -Version Latest +$ProgressPreference = 'SilentlyContinue' +$ErrorActionPreference = 'Stop' + +trap { + Write-Host + Write-Host "ERROR: $_" + ($_.ScriptStackTrace -split '\r?\n') -replace '^(.*)$','ERROR: $1' | Write-Host + ($_.Exception.ToString() -split '\r?\n') -replace '^(.*)$','ERROR EXCEPTION: $1' | Write-Host + Write-Host + Write-Host 'Sleeping for 60m to give you time to look around the virtual machine before self-destruction...' + Start-Sleep -Seconds (60*60) + Exit 1 +} + +Write-Host 'Disabling System Restore' +Disable-ComputerRestore -Drive "C:\" diff --git a/packer_templates/scripts/windows/disable-windows-defender.ps1 b/packer_templates/scripts/windows/disable-windows-defender.ps1 index 7a69552e9..2851ffa0e 100644 --- a/packer_templates/scripts/windows/disable-windows-defender.ps1 +++ b/packer_templates/scripts/windows/disable-windows-defender.ps1 @@ -34,6 +34,7 @@ trap { Exit 1 } +Write-Host 'Disabling Windows Defender' if (Get-Command -ErrorAction SilentlyContinue Uninstall-WindowsFeature) { # for Windows Server. Get-WindowsFeature 'Windows-Defender*' | Uninstall-WindowsFeature diff --git a/packer_templates/scripts/windows/disable-windows-uac 2.ps1 b/packer_templates/scripts/windows/disable-windows-uac 2.ps1 new file mode 100644 index 000000000..20af5398f --- /dev/null +++ b/packer_templates/scripts/windows/disable-windows-uac 2.ps1 @@ -0,0 +1,20 @@ +Set-StrictMode -Version Latest +$ProgressPreference = 'SilentlyContinue' +$ErrorActionPreference = 'Stop' + +trap { + Write-Host + Write-Host "ERROR: $_" + ($_.ScriptStackTrace -split '\r?\n') -replace '^(.*)$','ERROR: $1' | Write-Host + ($_.Exception.ToString() -split '\r?\n') -replace '^(.*)$','ERROR EXCEPTION: $1' | Write-Host + Write-Host + Write-Host 'Sleeping for 60m to give you time to look around the virtual machine before self-destruction...' + Start-Sleep -Seconds (60*60) + Exit 1 +} + +Write-Host 'Disable Windows UAC' +Set-ItemProperty -Path 'HKLM:\Software\Microsoft\Windows\CurrentVersion\Policies\System' -Name ConsentPromptBehaviorAdmin -Type DWORD -Value 0 +Set-ItemProperty -Path 'HKLM:\Software\Microsoft\Windows\CurrentVersion\Policies\System' -Name PromptOnSecureDesktop -Type DWORD -Value 0 +Set-ItemProperty -Path 'HKLM:\Software\Microsoft\Windows\CurrentVersion\Policies\System' -Name EnableLUA -Type DWORD -Value 0 +Set-ItemProperty -Path 'HKLM:\Software\Microsoft\Windows\CurrentVersion\Policies\System' -Name LocalAccountTokenFilterPolicy -Type DWORD -Value 1 diff --git a/packer_templates/scripts/windows/disable-windows-uac.ps1 b/packer_templates/scripts/windows/disable-windows-uac.ps1 new file mode 100644 index 000000000..20af5398f --- /dev/null +++ b/packer_templates/scripts/windows/disable-windows-uac.ps1 @@ -0,0 +1,20 @@ +Set-StrictMode -Version Latest +$ProgressPreference = 'SilentlyContinue' +$ErrorActionPreference = 'Stop' + +trap { + Write-Host + Write-Host "ERROR: $_" + ($_.ScriptStackTrace -split '\r?\n') -replace '^(.*)$','ERROR: $1' | Write-Host + ($_.Exception.ToString() -split '\r?\n') -replace '^(.*)$','ERROR EXCEPTION: $1' | Write-Host + Write-Host + Write-Host 'Sleeping for 60m to give you time to look around the virtual machine before self-destruction...' + Start-Sleep -Seconds (60*60) + Exit 1 +} + +Write-Host 'Disable Windows UAC' +Set-ItemProperty -Path 'HKLM:\Software\Microsoft\Windows\CurrentVersion\Policies\System' -Name ConsentPromptBehaviorAdmin -Type DWORD -Value 0 +Set-ItemProperty -Path 'HKLM:\Software\Microsoft\Windows\CurrentVersion\Policies\System' -Name PromptOnSecureDesktop -Type DWORD -Value 0 +Set-ItemProperty -Path 'HKLM:\Software\Microsoft\Windows\CurrentVersion\Policies\System' -Name EnableLUA -Type DWORD -Value 0 +Set-ItemProperty -Path 'HKLM:\Software\Microsoft\Windows\CurrentVersion\Policies\System' -Name LocalAccountTokenFilterPolicy -Type DWORD -Value 1 diff --git a/packer_templates/scripts/windows/disable-windows-updates.ps1 b/packer_templates/scripts/windows/disable-windows-updates.ps1 index ec3aee739..987c7fbd5 100644 --- a/packer_templates/scripts/windows/disable-windows-updates.ps1 +++ b/packer_templates/scripts/windows/disable-windows-updates.ps1 @@ -34,6 +34,7 @@ trap { Exit 1 } +Write-Host 'Disabling windows automatic updates' # disable automatic updates. # XXX this does not seem to work anymore. # see How to configure automatic updates by using Group Policy or registry settings @@ -68,7 +69,7 @@ New-ItemProperty ` New-ItemProperty ` -Path $auPath ` -Name AUOptions ` - -Value 2 ` + -Value 1 ` -PropertyType DWORD ` -Force ` | Out-Null diff --git a/packer_templates/scripts/windows/enable-file-sharing 2.ps1 b/packer_templates/scripts/windows/enable-file-sharing 2.ps1 new file mode 100644 index 000000000..fefc29d9d --- /dev/null +++ b/packer_templates/scripts/windows/enable-file-sharing 2.ps1 @@ -0,0 +1,17 @@ +Set-StrictMode -Version Latest +$ProgressPreference = 'SilentlyContinue' +$ErrorActionPreference = 'Stop' + +trap { + Write-Host + Write-Host "ERROR: $_" + ($_.ScriptStackTrace -split '\r?\n') -replace '^(.*)$','ERROR: $1' | Write-Host + ($_.Exception.ToString() -split '\r?\n') -replace '^(.*)$','ERROR EXCEPTION: $1' | Write-Host + Write-Host + Write-Host 'Sleeping for 60m to give you time to look around the virtual machine before self-destruction...' + Start-Sleep -Seconds (60*60) + Exit 1 +} + +Write-Host 'Enable filesharing' +Enable-NetFirewallRule -DisplayGroup "File and Printer Sharing" diff --git a/packer_templates/scripts/windows/enable-file-sharing.ps1 b/packer_templates/scripts/windows/enable-file-sharing.ps1 new file mode 100644 index 000000000..fefc29d9d --- /dev/null +++ b/packer_templates/scripts/windows/enable-file-sharing.ps1 @@ -0,0 +1,17 @@ +Set-StrictMode -Version Latest +$ProgressPreference = 'SilentlyContinue' +$ErrorActionPreference = 'Stop' + +trap { + Write-Host + Write-Host "ERROR: $_" + ($_.ScriptStackTrace -split '\r?\n') -replace '^(.*)$','ERROR: $1' | Write-Host + ($_.Exception.ToString() -split '\r?\n') -replace '^(.*)$','ERROR EXCEPTION: $1' | Write-Host + Write-Host + Write-Host 'Sleeping for 60m to give you time to look around the virtual machine before self-destruction...' + Start-Sleep -Seconds (60*60) + Exit 1 +} + +Write-Host 'Enable filesharing' +Enable-NetFirewallRule -DisplayGroup "File and Printer Sharing" diff --git a/packer_templates/scripts/windows/enable-remote-desktop.ps1 b/packer_templates/scripts/windows/enable-remote-desktop.ps1 index 1eed756f1..f753c46f4 100644 --- a/packer_templates/scripts/windows/enable-remote-desktop.ps1 +++ b/packer_templates/scripts/windows/enable-remote-desktop.ps1 @@ -35,9 +35,5 @@ trap { } Write-Host 'Enabling Remote Desktop...' -Set-ItemProperty ` - -Path 'HKLM:\System\CurrentControlSet\Control\Terminal Server' ` - -Name fDenyTSConnections ` - -Value 0 -Enable-NetFirewallRule ` - -DisplayGroup 'Remote Desktop' +Set-ItemProperty -Path 'HKLM:\System\CurrentControlSet\Control\Terminal Server' -Name fDenyTSConnections -Value 0 +Enable-NetFirewallRule -DisplayGroup 'Remote Desktop' diff --git a/packer_templates/scripts/windows/optimize.ps1 b/packer_templates/scripts/windows/optimize.ps1 index a6908c2aa..e9489fb3e 100644 --- a/packer_templates/scripts/windows/optimize.ps1 +++ b/packer_templates/scripts/windows/optimize.ps1 @@ -23,6 +23,7 @@ Set-StrictMode -Version Latest $ProgressPreference = 'SilentlyContinue' $ErrorActionPreference = 'Stop' + trap { Write-Host Write-Host "ERROR: $_" @@ -111,7 +112,6 @@ Write-Host 'Running Automatic Maintenance...' MSchedExe.exe Start Wait-Condition {@(Get-ScheduledTasks | Where-Object {($_.State -ge 4) -and (Test-IsMaintenanceTask $_.XML)}).Count -eq 0} -DebounceSeconds 60 - # # generate the .net frameworks native images. # NB this is normally done in the Automatic Maintenance step, but for @@ -123,72 +123,9 @@ Get-ChildItem "$env:windir\Microsoft.NET\*\*\ngen.exe" | ForEach-Object { &$_ executeQueuedItems /nologo /silent } - -# -# remove temporary files. -# NB we ignore the packer generated files so it won't complain in the output. - -Write-Host 'Stopping services that might interfere with temporary file removal...' -function Stop-ServiceForReal($name) { - while ($true) { - Stop-Service -ErrorAction SilentlyContinue $name - if ((Get-Service $name).Status -eq 'Stopped') { - break - } - } -} -Stop-ServiceForReal TrustedInstaller # Windows Modules Installer -Stop-ServiceForReal wuauserv # Windows Update -Stop-ServiceForReal BITS # Background Intelligent Transfer Service -@( - "$env:LOCALAPPDATA\Temp\*" - "$env:windir\Temp\*" - "$env:windir\Logs\*" - "$env:windir\Panther\*" - "$env:windir\WinSxS\ManifestCache\*" - "$env:windir\SoftwareDistribution\Download" -) | Where-Object {Test-Path $_} | ForEach-Object { - Write-Host "Removing temporary files $_..." - try { - takeown.exe /D Y /R /F $_ | Out-Null - icacls.exe $_ /grant:r Administrators:F /T /C /Q 2>&1 | Out-Null - } catch { - Write-Host "Ignoring taking ownership of temporary files error: $_" - } - try { - Remove-Item $_ -Exclude 'packer-*' -Recurse -Force -ErrorAction SilentlyContinue | Out-Null - } catch { - Write-Host "Ignoring failure to remove files error: $_" - } -} - - -# -# cleanup the WinSxS folder. - -# NB even thou the automatic maintenance includes a component cleanup task, -# it will not clean everything, as such, dism will clean the rest. -# NB to analyse the used space use: dism.exe /Online /Cleanup-Image /AnalyzeComponentStore -# see https://docs.microsoft.com/en-us/windows-hardware/manufacture/desktop/clean-up-the-winsxs-folder -Write-Host 'Cleaning up the WinSxS folder...' -dism.exe /Online /Quiet /Cleanup-Image /StartComponentCleanup /ResetBase -if ($LASTEXITCODE) { - throw "Failed with Exit Code $LASTEXITCODE" -} - -# NB even after cleaning up the WinSxS folder the "Backups and Disabled Features" -# field of the analysis report will display a non-zero number because the -# disabled features packages are still on disk. you can remove them with: -# Get-WindowsOptionalFeature -Online ` -# | Where-Object {$_.State -eq 'Disabled'} ` -# | ForEach-Object { -# Write-Host "Removing feature $($_.FeatureName)..." -# dism.exe /Online /Quiet /Disable-Feature "/FeatureName:$($_.FeatureName)" /Remove -# } -# NB a removed feature can still be installed from other sources (e.g. windows update). -Write-Host 'Analyzing the WinSxS folder...' -dism.exe /Online /Cleanup-Image /AnalyzeComponentStore - +Write-Host "Optimizing Drive" +Optimize-Volume -DriveLetter C +compact.exe /compactOS:always # # reclaim the free disk space. diff --git a/packer_templates/scripts/windows/provision-winrm.ps1 b/packer_templates/scripts/windows/provision-winrm.ps1 deleted file mode 100644 index a6640536b..000000000 --- a/packer_templates/scripts/windows/provision-winrm.ps1 +++ /dev/null @@ -1,100 +0,0 @@ -#MIT License -# -#Copyright (c) 2017 Rui Lopes -# -#Permission is hereby granted, free of charge, to any person obtaining a copy -#of this software and associated documentation files (the "Software"), to deal -#in the Software without restriction, including without limitation the rights -#to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -#copies of the Software, and to permit persons to whom the Software is -#furnished to do so, subject to the following conditions: -# -#The above copyright notice and this permission notice shall be included in all -#copies or substantial portions of the Software. -# -#THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -#IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -#FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -#AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -#LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -#OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -#SOFTWARE. - -Set-StrictMode -Version Latest -$ProgressPreference = 'SilentlyContinue' -$ErrorActionPreference = 'Stop' -trap { - Write-Host - Write-Host "ERROR: $_" - ($_.ScriptStackTrace -split '\r?\n') -replace '^(.*)$','ERROR: $1' | Write-Host - ($_.Exception.ToString() -split '\r?\n') -replace '^(.*)$','ERROR EXCEPTION: $1' | Write-Host - Write-Host - Write-Host 'Sleeping for 60m to give you time to look around the virtual machine before self-destruction...' - Start-Sleep -Seconds (60*60) - Exit 1 -} - -## for troubleshoot purposes, save this script output to a file. -#Start-Transcript C:\winrm-autounattend.txt - -## for troubleshoot purposes, save the current user details. this will be later displayed by provision.ps1. -#whoami /all >C:\whoami-autounattend.txt - -if (![Environment]::Is64BitProcess) { - throw 'this must run in a 64-bit PowerShell session' -} - -if (!(New-Object System.Security.Principal.WindowsPrincipal( - [Security.Principal.WindowsIdentity]::GetCurrent())).IsInRole( - [Security.Principal.WindowsBuiltInRole]::Administrator)) { - throw 'this must run with Administrator privileges (e.g. in a elevated shell session)' -} - -# move all (non-domain) network interfaces into the private profile to make winrm happy (it needs at -# least one private interface; for vagrant its enough to configure the first network interface). -# NB in windows server it would be enough to call winrm -force argument, but -# in windows client 10, we must set the network interface profile. -Get-NetConnectionProfile ` - | Where-Object {$_.NetworkCategory -ne 'DomainAuthenticated'} ` - | Set-NetConnectionProfile -NetworkCategory Private - -# configure WinRM. -Write-Output 'Configuring WinRM...' -winrm quickconfig -quiet -winrm set winrm/config/service '@{AllowUnencrypted="true"}' -winrm set winrm/config/service/auth '@{Basic="true"}' -winrm set winrm/config/service/auth '@{CredSSP="true"}' -# make sure the WinRM service startup type is delayed-auto -# even when the default config is auto (e.g. Windows 2019 -# changed that default). -# WARN do not be tempted to change the default WinRM service startup type from -# delayed-auto to auto, as the later proved to be unreliable. -$result = sc.exe config WinRM start= delayed-auto -if ($result -ne '[SC] ChangeServiceConfig SUCCESS') { - throw "sc.exe config failed with $result" -} - -# dump the WinRM configuration. -Write-Output 'WinRM Configuration:' -winrm enumerate winrm/config/listener -winrm get winrm/config -winrm id - -# disable UAC remote restrictions. -# see https://support.microsoft.com/en-us/help/951016/description-of-user-account-control-and-remote-restrictions-in-windows -# see https://docs.microsoft.com/en-us/windows/desktop/wmisdk/user-account-control-and-wmi#handling-remote-connections-under-uac -New-ItemProperty ` - -Path 'HKLM:\SOFTWARE\Microsoft\Windows\CurrentVersion\Policies\System' ` - -Name LocalAccountTokenFilterPolicy ` - -Value 1 ` - -Force ` - | Out-Null - -# make sure winrm can be accessed from any network location. -New-NetFirewallRule ` - -DisplayName WINRM-HTTP-In-TCP-VAGRANT ` - -Direction Inbound ` - -Action Allow ` - -Protocol TCP ` - -LocalPort 5985 ` - | Out-Null diff --git a/packer_templates/scripts/windows/provision.ps1 b/packer_templates/scripts/windows/provision.ps1 index 122f2a343..b3a4fc488 100644 --- a/packer_templates/scripts/windows/provision.ps1 +++ b/packer_templates/scripts/windows/provision.ps1 @@ -87,12 +87,14 @@ if ($systemVendor -eq 'QEMU') { # do nothing. Hyper-V enlightments are already bundled with Windows. } elseif ($systemVendor -eq 'VMware, Inc.') { Write-Host 'Mounting VMware Tools ISO...' - Mount-DiskImage -ImagePath C:\\vmware-tools.iso -PassThru | Get-Volume | Set-Volume -DriveLetter B + Mount-DiskImage -ImagePath C:\vmware-tools.iso -PassThru | Get-Volume Write-Host 'Installing VMware Tools...' - Start-Process -Wait -FilePath D:\\setup.exe -ArgumentList '/s' + Start-Process -Wait -FilePath E:\setup64.exe -ArgumentList '/S /v "/qn REBOOT=R"' Write-Output 'Installing VMware Tools...' # silent install without rebooting. - B:\setup64.exe /s /v '/qn reboot=r'| Out-String -Stream + E:\setup64.exe /S /v '/qn reboot=r'| Out-String -Stream + Dismount-DiskImage -ImagePath C:\vmware-tools.iso + Remove-Item C:\vmware-tools.iso } elseif ($systemVendor -eq 'Parallels Software International Inc.') { Write-Host 'Installing the Parallels Tools for Guest VM...' E:\PTAgent.exe /install_silent | Out-String -Stream @@ -130,12 +132,6 @@ Set-ItemProperty ` -Name DisabledComponents ` -Value 0xff -Write-Host 'Disabling hibernation...' -powercfg /hibernate off - -Write-Host 'Setting the power plan to high performance...' -powercfg /setactive 8c5e7fda-e8bf-4a96-9a85-a6e23a8c635c - Write-Host 'Disabling the Windows Boot Manager menu...' # NB to have the menu show with a lower timeout, run this instead: bcdedit /timeout 2 # NB with a timeout of 2 you can still press F8 to show the boot manager menu. diff --git a/packer_templates/scripts/windows/remove-apps.ps1 b/packer_templates/scripts/windows/remove-apps.ps1 index 3209a66de..137eefa04 100644 --- a/packer_templates/scripts/windows/remove-apps.ps1 +++ b/packer_templates/scripts/windows/remove-apps.ps1 @@ -23,6 +23,7 @@ Set-StrictMode -Version Latest $ProgressPreference = 'SilentlyContinue' $ErrorActionPreference = 'Stop' + trap { Write-Host Write-Host "ERROR: $_" @@ -62,7 +63,11 @@ Get-AppXProvisionedPackage -Online | ForEach-Object { # NB some packages fail to be removed and thats OK. # see https://docs.microsoft.com/en-us/windows/application-management/apps-in-windows-10 @( + 'Clipchamp.Clipchamp' + 'Microsoft.549981C3F5F10' + 'Microsoft.BingNews' 'Microsoft.BingWeather' + 'Microsoft.GamingApp' 'Microsoft.GetHelp' 'Microsoft.Getstarted' 'Microsoft.Microsoft3DViewer' @@ -72,11 +77,15 @@ Get-AppXProvisionedPackage -Online | ForEach-Object { 'Microsoft.MixedReality.Portal' 'Microsoft.MSPaint' 'Microsoft.Office.OneNote' + 'Microsoft.OneDriveSync' + 'Microsoft.Paint' 'Microsoft.People' + 'Microsoft.PowerAutomateDesktop' 'Microsoft.ScreenSketch' 'Microsoft.Services.Store.Engagement' 'Microsoft.SkypeApp' 'Microsoft.StorePurchaseApp' + 'Microsoft.Todos' 'Microsoft.Wallet' 'Microsoft.Windows.Photos' 'Microsoft.WindowsAlarms' @@ -96,7 +105,9 @@ Get-AppXProvisionedPackage -Online | ForEach-Object { 'Microsoft.YourPhone' 'Microsoft.ZuneMusic' 'Microsoft.ZuneVideo' - #'Microsoft.BioEnrollment' # NB this fails to remove. + 'MicrosoftCorporationII.QuickAssist' + 'MicrosoftWindows.Client.WebExperience' + 'MicrosoftTeams' ) | ForEach-Object { $appx = Get-AppxPackage -AllUsers $_ if ($appx) { @@ -104,7 +115,7 @@ Get-AppXProvisionedPackage -Online | ForEach-Object { try { $appx | Remove-AppxPackage -AllUsers } catch { - Write-Output "WARN Failed to remove appx: $_" + Write-Host "WARN Failed to remove appx: $_" } } } diff --git a/packer_templates/scripts/windows/remove-one-drive-and-teams 2.ps1 b/packer_templates/scripts/windows/remove-one-drive-and-teams 2.ps1 new file mode 100644 index 000000000..f3724d959 --- /dev/null +++ b/packer_templates/scripts/windows/remove-one-drive-and-teams 2.ps1 @@ -0,0 +1,259 @@ +Set-StrictMode -Version Latest +$ProgressPreference = 'SilentlyContinue' +$ErrorActionPreference = 'Stop' +trap { + Write-Host + Write-Host "ERROR: $_" + ($_.ScriptStackTrace -split '\r?\n') -replace '^(.*)$','ERROR: $1' | Write-Host + ($_.Exception.ToString() -split '\r?\n') -replace '^(.*)$','ERROR EXCEPTION: $1' | Write-Host + Write-Host + Write-Host 'Sleeping for 60m to give you time to look around the virtual machine before self-destruction...' + Start-Sleep -Seconds (60*60) + Exit 1 +} + +Write-Host 'Removing OneDrive' +function force-mkdir($path) { + if (!(Test-Path $path)) { + #Write-Host "-- Creating full path to: " $path -ForegroundColor White -BackgroundColor DarkGreen + New-Item -ItemType Directory -Force -Path $path + }} + +function Takeown-Registry($key) { + # TODO does not work for all root keys yet + switch ($key.split('\')[0]) { + "HKEY_CLASSES_ROOT" { + $reg = [Microsoft.Win32.Registry]::ClassesRoot + $key = $key.substring(18) + } + "HKEY_CURRENT_USER" { + $reg = [Microsoft.Win32.Registry]::CurrentUser + $key = $key.substring(18) + } + "HKEY_LOCAL_MACHINE" { + $reg = [Microsoft.Win32.Registry]::LocalMachine + $key = $key.substring(19) + } + } + + # get administraor group + $admins = New-Object System.Security.Principal.SecurityIdentifier("S-1-5-32-544") + $admins = $admins.Translate([System.Security.Principal.NTAccount]) + + # set owner + $key = $reg.OpenSubKey($key, "ReadWriteSubTree", "TakeOwnership") + $acl = $key.GetAccessControl() + $acl.SetOwner($admins) + $key.SetAccessControl($acl) + + # set FullControl + $acl = $key.GetAccessControl() + $rule = New-Object System.Security.AccessControl.RegistryAccessRule($admins, "FullControl", "Allow") + $acl.SetAccessRule($rule) + $key.SetAccessControl($acl) +} + +function Takeown-File($path) { + takeown.exe /A /F $path + $acl = Get-Acl $path + + # get administraor group + $admins = New-Object System.Security.Principal.SecurityIdentifier("S-1-5-32-544") + $admins = $admins.Translate([System.Security.Principal.NTAccount]) + + # add NT Authority\SYSTEM + $rule = New-Object System.Security.AccessControl.FileSystemAccessRule($admins, "FullControl", "None", "None", "Allow") + $acl.AddAccessRule($rule) + + Set-Acl -Path $path -AclObject $acl +} + +function Takeown-Folder($path) { + Takeown-File $path + foreach ($item in Get-ChildItem $path) { + if (Test-Path $item -PathType Container) { + Takeown-Folder $item.FullName + } else { + Takeown-File $item.FullName + } + } +} + +function Elevate-Privileges { + param($Privilege) + $Definition = @" + using System; + using System.Runtime.InteropServices; + public class AdjPriv { + [DllImport("advapi32.dll", ExactSpelling = true, SetLastError = true)] + internal static extern bool AdjustTokenPrivileges(IntPtr htok, bool disall, ref TokPriv1Luid newst, int len, IntPtr prev, IntPtr rele); + [DllImport("advapi32.dll", ExactSpelling = true, SetLastError = true)] + internal static extern bool OpenProcessToken(IntPtr h, int acc, ref IntPtr phtok); + [DllImport("advapi32.dll", SetLastError = true)] + internal static extern bool LookupPrivilegeValue(string host, string name, ref long pluid); + [StructLayout(LayoutKind.Sequential, Pack = 1)] + internal struct TokPriv1Luid { + public int Count; + public long Luid; + public int Attr; + } + internal const int SE_PRIVILEGE_ENABLED = 0x00000002; + internal const int TOKEN_QUERY = 0x00000008; + internal const int TOKEN_ADJUST_PRIVILEGES = 0x00000020; + public static bool EnablePrivilege(long processHandle, string privilege) { + bool retVal; + TokPriv1Luid tp; + IntPtr hproc = new IntPtr(processHandle); + IntPtr htok = IntPtr.Zero; + retVal = OpenProcessToken(hproc, TOKEN_ADJUST_PRIVILEGES | TOKEN_QUERY, ref htok); + tp.Count = 1; + tp.Luid = 0; + tp.Attr = SE_PRIVILEGE_ENABLED; + retVal = LookupPrivilegeValue(null, privilege, ref tp.Luid); + retVal = AdjustTokenPrivileges(htok, false, ref tp, 0, IntPtr.Zero, IntPtr.Zero); + return retVal; + } + } +"@ + $ProcessHandle = (Get-Process -id $pid).Handle + $type = Add-Type $definition -PassThru + $type[0]::EnablePrivilege($processHandle, $Privilege) +} + +Write-Host "73 OneDrive process and explorer" +taskkill.exe /F /IM "OneDrive.exe" +taskkill.exe /F /IM "explorer.exe" + +Write-Host "Remove OneDrive" +if (Test-Path "$env:systemroot\System32\OneDriveSetup.exe") { + & "$env:systemroot\System32\OneDriveSetup.exe" /uninstall +} +if (Test-Path "$env:systemroot\SysWOW64\OneDriveSetup.exe") { + & "$env:systemroot\SysWOW64\OneDriveSetup.exe" /uninstall +} + +Write-Host "Disable OneDrive via Group Policies" +force-mkdir "HKLM:\SOFTWARE\Wow6432Node\Policies\Microsoft\Windows\OneDrive" +Set-ItemProperty "HKLM:\SOFTWARE\Wow6432Node\Policies\Microsoft\Windows\OneDrive" -Name DisableFileSyncNGSC -Value 1 + +Write-Host "Removing OneDrive leftovers trash" +rm -Recurse -Force -ErrorAction SilentlyContinue "$env:localappdata\Microsoft\OneDrive" +rm -Recurse -Force -ErrorAction SilentlyContinue "$env:programdata\Microsoft OneDrive" +rm -Recurse -Force -ErrorAction SilentlyContinue "C:\OneDriveTemp" + +Write-Host "Remove Onedrive from explorer sidebar" +New-PSDrive -PSProvider "Registry" -Root "HKEY_CLASSES_ROOT" -Name "HKCR" +mkdir -Force "HKCR:\CLSID\{018D5C66-4533-4307-9B53-224DE2ED1FE6}" +Set-ItemProperty "HKCR:\CLSID\{018D5C66-4533-4307-9B53-224DE2ED1FE6}" -Name System.IsPinnedToNameSpaceTree -Value 0 +mkdir -Force "HKCR:\Wow6432Node\CLSID\{018D5C66-4533-4307-9B53-224DE2ED1FE6}" +Set-ItemProperty "HKCR:\Wow6432Node\CLSID\{018D5C66-4533-4307-9B53-224DE2ED1FE6}" -Name System.IsPinnedToNameSpaceTree -Value 0 +Remove-PSDrive "HKCR" + +Write-Host "Removing run option for new users" +reg load "hku\Default" "C:\Users\Default\NTUSER.DAT" +reg delete "HKEY_USERS\Default\SOFTWARE\Microsoft\Windows\CurrentVersion\Run" /v "OneDriveSetup" /f +reg unload "hku\Default" + +Write-Host "Removing startmenu junk entry" +rm -Force -ErrorAction SilentlyContinue "$env:userprofile\AppData\Roaming\Microsoft\Windows\Start Menu\Programs\OneDrive.lnk" + +Write-Host "Restarting explorer..." +start "explorer.exe" + +Write-Host "Wait for EX reload.." +sleep 15 + +Write-Host "Removing additional OneDrive leftovers" +foreach ($item in (ls "$env:WinDir\WinSxS\*onedrive*")) { + Takeown-Folder $item.FullName + rm -Recurse -Force $item.FullName -ErrorAction SilentlyContinue +} + +########################################################################################### +Write-Host "Removing Teams" +# Clearing Teams Cache by Mark Vale +# Uninstall Teams by Rudy Mens + +Write-Host "Stopping Teams Process" -ForegroundColor Yellow +try{ + Get-Process -ProcessName Teams | Stop-Process -Force + Start-Sleep -Seconds 3 + Write-Host "Teams Process Sucessfully Stopped" -ForegroundColor Green +}catch{ + Write-Host $_ +} + +Write-Host "Clearing Teams Disk Cache" -ForegroundColor Yellow +try{ + Get-ChildItem -Path $env:APPDATA\"Microsoft\teams\application cache\cache" | Remove-Item -Confirm:$false + Get-ChildItem -Path $env:APPDATA\"Microsoft\teams\blob_storage" | Remove-Item -Confirm:$false + Get-ChildItem -Path $env:APPDATA\"Microsoft\teams\databases" | Remove-Item -Confirm:$false + Get-ChildItem -Path $env:APPDATA\"Microsoft\teams\cache" | Remove-Item -Confirm:$false + Get-ChildItem -Path $env:APPDATA\"Microsoft\teams\gpucache" | Remove-Item -Confirm:$false + Get-ChildItem -Path $env:APPDATA\"Microsoft\teams\Indexeddb" | Remove-Item -Confirm:$false + Get-ChildItem -Path $env:APPDATA\"Microsoft\teams\Local Storage" | Remove-Item -Confirm:$false + Get-ChildItem -Path $env:APPDATA\"Microsoft\teams\tmp" | Remove-Item -Confirm:$false + Write-Host "Teams Disk Cache Cleaned" -ForegroundColor Green +}catch{ + Write-Host $_ +} + +Write-Host "Stopping IE Process" -ForegroundColor Yellow +try{ + Get-Process -ProcessName MicrosoftEdge | Stop-Process -Force + Get-Process -ProcessName IExplore | Stop-Process -Force + Write-Host "Internet Explorer and Edge Processes Sucessfully Stopped" -ForegroundColor Green +}catch{ + Write-Host $_ +} + +Write-Host "Clearing IE Cache" -ForegroundColor Yellow +try{ + RunDll32.exe InetCpl.cpl, ClearMyTracksByProcess 8 + RunDll32.exe InetCpl.cpl, ClearMyTracksByProcess 2 + Write-Host "IE and Edge Cleaned" -ForegroundColor Green +}catch{ + Write-Host $_ +} +Write-Host "Cleanup Complete..." + + +Write-Host "Removing Teams Machine-wide Installer" +try +{ + $MachineWide = Get-WmiObject -Class Win32_Product | Where-Object{$_.Name -eq "Teams Machine-Wide Installer"} + $MachineWide.Uninstall() +} +catch +{ + Write-Warning $_ +} + +function unInstallTeams($path) { + $clientInstaller = "$($path)\Update.exe" + try { + $process = Start-Process -FilePath "$clientInstaller" -ArgumentList "--uninstall /s" -PassThru -Wait -ErrorAction STOP + if ($process.ExitCode -ne 0) + { + Write-Warning "UnInstallation failed with exit code $($process.ExitCode)." + } + } + catch { + Write-Warning $_.Exception.Message + } +} + +#Locate installation folder +$localAppData = "$($env:LOCALAPPDATA)\Microsoft\Teams" +$programData = "$($env:ProgramData)\$($env:USERNAME)\Microsoft\Teams" + +If (Test-Path "$($localAppData)\Current\Teams.exe") +{ + unInstallTeams($localAppData) +} +elseif (Test-Path "$($programData)\Current\Teams.exe") { + unInstallTeams($programData) +} +else { + Write-Warning "Teams installation not found" +} diff --git a/packer_templates/scripts/windows/remove-one-drive-and-teams.ps1 b/packer_templates/scripts/windows/remove-one-drive-and-teams.ps1 new file mode 100644 index 000000000..f3724d959 --- /dev/null +++ b/packer_templates/scripts/windows/remove-one-drive-and-teams.ps1 @@ -0,0 +1,259 @@ +Set-StrictMode -Version Latest +$ProgressPreference = 'SilentlyContinue' +$ErrorActionPreference = 'Stop' +trap { + Write-Host + Write-Host "ERROR: $_" + ($_.ScriptStackTrace -split '\r?\n') -replace '^(.*)$','ERROR: $1' | Write-Host + ($_.Exception.ToString() -split '\r?\n') -replace '^(.*)$','ERROR EXCEPTION: $1' | Write-Host + Write-Host + Write-Host 'Sleeping for 60m to give you time to look around the virtual machine before self-destruction...' + Start-Sleep -Seconds (60*60) + Exit 1 +} + +Write-Host 'Removing OneDrive' +function force-mkdir($path) { + if (!(Test-Path $path)) { + #Write-Host "-- Creating full path to: " $path -ForegroundColor White -BackgroundColor DarkGreen + New-Item -ItemType Directory -Force -Path $path + }} + +function Takeown-Registry($key) { + # TODO does not work for all root keys yet + switch ($key.split('\')[0]) { + "HKEY_CLASSES_ROOT" { + $reg = [Microsoft.Win32.Registry]::ClassesRoot + $key = $key.substring(18) + } + "HKEY_CURRENT_USER" { + $reg = [Microsoft.Win32.Registry]::CurrentUser + $key = $key.substring(18) + } + "HKEY_LOCAL_MACHINE" { + $reg = [Microsoft.Win32.Registry]::LocalMachine + $key = $key.substring(19) + } + } + + # get administraor group + $admins = New-Object System.Security.Principal.SecurityIdentifier("S-1-5-32-544") + $admins = $admins.Translate([System.Security.Principal.NTAccount]) + + # set owner + $key = $reg.OpenSubKey($key, "ReadWriteSubTree", "TakeOwnership") + $acl = $key.GetAccessControl() + $acl.SetOwner($admins) + $key.SetAccessControl($acl) + + # set FullControl + $acl = $key.GetAccessControl() + $rule = New-Object System.Security.AccessControl.RegistryAccessRule($admins, "FullControl", "Allow") + $acl.SetAccessRule($rule) + $key.SetAccessControl($acl) +} + +function Takeown-File($path) { + takeown.exe /A /F $path + $acl = Get-Acl $path + + # get administraor group + $admins = New-Object System.Security.Principal.SecurityIdentifier("S-1-5-32-544") + $admins = $admins.Translate([System.Security.Principal.NTAccount]) + + # add NT Authority\SYSTEM + $rule = New-Object System.Security.AccessControl.FileSystemAccessRule($admins, "FullControl", "None", "None", "Allow") + $acl.AddAccessRule($rule) + + Set-Acl -Path $path -AclObject $acl +} + +function Takeown-Folder($path) { + Takeown-File $path + foreach ($item in Get-ChildItem $path) { + if (Test-Path $item -PathType Container) { + Takeown-Folder $item.FullName + } else { + Takeown-File $item.FullName + } + } +} + +function Elevate-Privileges { + param($Privilege) + $Definition = @" + using System; + using System.Runtime.InteropServices; + public class AdjPriv { + [DllImport("advapi32.dll", ExactSpelling = true, SetLastError = true)] + internal static extern bool AdjustTokenPrivileges(IntPtr htok, bool disall, ref TokPriv1Luid newst, int len, IntPtr prev, IntPtr rele); + [DllImport("advapi32.dll", ExactSpelling = true, SetLastError = true)] + internal static extern bool OpenProcessToken(IntPtr h, int acc, ref IntPtr phtok); + [DllImport("advapi32.dll", SetLastError = true)] + internal static extern bool LookupPrivilegeValue(string host, string name, ref long pluid); + [StructLayout(LayoutKind.Sequential, Pack = 1)] + internal struct TokPriv1Luid { + public int Count; + public long Luid; + public int Attr; + } + internal const int SE_PRIVILEGE_ENABLED = 0x00000002; + internal const int TOKEN_QUERY = 0x00000008; + internal const int TOKEN_ADJUST_PRIVILEGES = 0x00000020; + public static bool EnablePrivilege(long processHandle, string privilege) { + bool retVal; + TokPriv1Luid tp; + IntPtr hproc = new IntPtr(processHandle); + IntPtr htok = IntPtr.Zero; + retVal = OpenProcessToken(hproc, TOKEN_ADJUST_PRIVILEGES | TOKEN_QUERY, ref htok); + tp.Count = 1; + tp.Luid = 0; + tp.Attr = SE_PRIVILEGE_ENABLED; + retVal = LookupPrivilegeValue(null, privilege, ref tp.Luid); + retVal = AdjustTokenPrivileges(htok, false, ref tp, 0, IntPtr.Zero, IntPtr.Zero); + return retVal; + } + } +"@ + $ProcessHandle = (Get-Process -id $pid).Handle + $type = Add-Type $definition -PassThru + $type[0]::EnablePrivilege($processHandle, $Privilege) +} + +Write-Host "73 OneDrive process and explorer" +taskkill.exe /F /IM "OneDrive.exe" +taskkill.exe /F /IM "explorer.exe" + +Write-Host "Remove OneDrive" +if (Test-Path "$env:systemroot\System32\OneDriveSetup.exe") { + & "$env:systemroot\System32\OneDriveSetup.exe" /uninstall +} +if (Test-Path "$env:systemroot\SysWOW64\OneDriveSetup.exe") { + & "$env:systemroot\SysWOW64\OneDriveSetup.exe" /uninstall +} + +Write-Host "Disable OneDrive via Group Policies" +force-mkdir "HKLM:\SOFTWARE\Wow6432Node\Policies\Microsoft\Windows\OneDrive" +Set-ItemProperty "HKLM:\SOFTWARE\Wow6432Node\Policies\Microsoft\Windows\OneDrive" -Name DisableFileSyncNGSC -Value 1 + +Write-Host "Removing OneDrive leftovers trash" +rm -Recurse -Force -ErrorAction SilentlyContinue "$env:localappdata\Microsoft\OneDrive" +rm -Recurse -Force -ErrorAction SilentlyContinue "$env:programdata\Microsoft OneDrive" +rm -Recurse -Force -ErrorAction SilentlyContinue "C:\OneDriveTemp" + +Write-Host "Remove Onedrive from explorer sidebar" +New-PSDrive -PSProvider "Registry" -Root "HKEY_CLASSES_ROOT" -Name "HKCR" +mkdir -Force "HKCR:\CLSID\{018D5C66-4533-4307-9B53-224DE2ED1FE6}" +Set-ItemProperty "HKCR:\CLSID\{018D5C66-4533-4307-9B53-224DE2ED1FE6}" -Name System.IsPinnedToNameSpaceTree -Value 0 +mkdir -Force "HKCR:\Wow6432Node\CLSID\{018D5C66-4533-4307-9B53-224DE2ED1FE6}" +Set-ItemProperty "HKCR:\Wow6432Node\CLSID\{018D5C66-4533-4307-9B53-224DE2ED1FE6}" -Name System.IsPinnedToNameSpaceTree -Value 0 +Remove-PSDrive "HKCR" + +Write-Host "Removing run option for new users" +reg load "hku\Default" "C:\Users\Default\NTUSER.DAT" +reg delete "HKEY_USERS\Default\SOFTWARE\Microsoft\Windows\CurrentVersion\Run" /v "OneDriveSetup" /f +reg unload "hku\Default" + +Write-Host "Removing startmenu junk entry" +rm -Force -ErrorAction SilentlyContinue "$env:userprofile\AppData\Roaming\Microsoft\Windows\Start Menu\Programs\OneDrive.lnk" + +Write-Host "Restarting explorer..." +start "explorer.exe" + +Write-Host "Wait for EX reload.." +sleep 15 + +Write-Host "Removing additional OneDrive leftovers" +foreach ($item in (ls "$env:WinDir\WinSxS\*onedrive*")) { + Takeown-Folder $item.FullName + rm -Recurse -Force $item.FullName -ErrorAction SilentlyContinue +} + +########################################################################################### +Write-Host "Removing Teams" +# Clearing Teams Cache by Mark Vale +# Uninstall Teams by Rudy Mens + +Write-Host "Stopping Teams Process" -ForegroundColor Yellow +try{ + Get-Process -ProcessName Teams | Stop-Process -Force + Start-Sleep -Seconds 3 + Write-Host "Teams Process Sucessfully Stopped" -ForegroundColor Green +}catch{ + Write-Host $_ +} + +Write-Host "Clearing Teams Disk Cache" -ForegroundColor Yellow +try{ + Get-ChildItem -Path $env:APPDATA\"Microsoft\teams\application cache\cache" | Remove-Item -Confirm:$false + Get-ChildItem -Path $env:APPDATA\"Microsoft\teams\blob_storage" | Remove-Item -Confirm:$false + Get-ChildItem -Path $env:APPDATA\"Microsoft\teams\databases" | Remove-Item -Confirm:$false + Get-ChildItem -Path $env:APPDATA\"Microsoft\teams\cache" | Remove-Item -Confirm:$false + Get-ChildItem -Path $env:APPDATA\"Microsoft\teams\gpucache" | Remove-Item -Confirm:$false + Get-ChildItem -Path $env:APPDATA\"Microsoft\teams\Indexeddb" | Remove-Item -Confirm:$false + Get-ChildItem -Path $env:APPDATA\"Microsoft\teams\Local Storage" | Remove-Item -Confirm:$false + Get-ChildItem -Path $env:APPDATA\"Microsoft\teams\tmp" | Remove-Item -Confirm:$false + Write-Host "Teams Disk Cache Cleaned" -ForegroundColor Green +}catch{ + Write-Host $_ +} + +Write-Host "Stopping IE Process" -ForegroundColor Yellow +try{ + Get-Process -ProcessName MicrosoftEdge | Stop-Process -Force + Get-Process -ProcessName IExplore | Stop-Process -Force + Write-Host "Internet Explorer and Edge Processes Sucessfully Stopped" -ForegroundColor Green +}catch{ + Write-Host $_ +} + +Write-Host "Clearing IE Cache" -ForegroundColor Yellow +try{ + RunDll32.exe InetCpl.cpl, ClearMyTracksByProcess 8 + RunDll32.exe InetCpl.cpl, ClearMyTracksByProcess 2 + Write-Host "IE and Edge Cleaned" -ForegroundColor Green +}catch{ + Write-Host $_ +} +Write-Host "Cleanup Complete..." + + +Write-Host "Removing Teams Machine-wide Installer" +try +{ + $MachineWide = Get-WmiObject -Class Win32_Product | Where-Object{$_.Name -eq "Teams Machine-Wide Installer"} + $MachineWide.Uninstall() +} +catch +{ + Write-Warning $_ +} + +function unInstallTeams($path) { + $clientInstaller = "$($path)\Update.exe" + try { + $process = Start-Process -FilePath "$clientInstaller" -ArgumentList "--uninstall /s" -PassThru -Wait -ErrorAction STOP + if ($process.ExitCode -ne 0) + { + Write-Warning "UnInstallation failed with exit code $($process.ExitCode)." + } + } + catch { + Write-Warning $_.Exception.Message + } +} + +#Locate installation folder +$localAppData = "$($env:LOCALAPPDATA)\Microsoft\Teams" +$programData = "$($env:ProgramData)\$($env:USERNAME)\Microsoft\Teams" + +If (Test-Path "$($localAppData)\Current\Teams.exe") +{ + unInstallTeams($localAppData) +} +elseif (Test-Path "$($programData)\Current\Teams.exe") { + unInstallTeams($programData) +} +else { + Write-Warning "Teams installation not found" +} diff --git a/packer_templates/scripts/windows/remove-one-drive.ps1 b/packer_templates/scripts/windows/remove-one-drive.ps1 deleted file mode 100644 index 30d869cbd..000000000 --- a/packer_templates/scripts/windows/remove-one-drive.ps1 +++ /dev/null @@ -1,69 +0,0 @@ -#MIT License -# -#Copyright (c) 2017 Rui Lopes -# -#Permission is hereby granted, free of charge, to any person obtaining a copy -#of this software and associated documentation files (the "Software"), to deal -#in the Software without restriction, including without limitation the rights -#to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -#copies of the Software, and to permit persons to whom the Software is -#furnished to do so, subject to the following conditions: -# -#The above copyright notice and this permission notice shall be included in all -#copies or substantial portions of the Software. -# -#THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -#IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -#FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -#AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -#LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -#OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -#SOFTWARE. - -Set-StrictMode -Version Latest -$ProgressPreference = 'SilentlyContinue' -$ErrorActionPreference = 'Stop' -trap { - Write-Host - Write-Host "ERROR: $_" - ($_.ScriptStackTrace -split '\r?\n') -replace '^(.*)$','ERROR: $1' | Write-Host - ($_.Exception.ToString() -split '\r?\n') -replace '^(.*)$','ERROR EXCEPTION: $1' | Write-Host - Write-Host - Write-Host 'Sleeping for 60m to give you time to look around the virtual machine before self-destruction...' - Start-Sleep -Seconds (60*60) - Exit 1 -} - -$oneDriveSetup = 'C:\Windows\SysWOW64\OneDriveSetup.exe' - -# bail when OneDrive is not installed. -if (!(Test-Path $oneDriveSetup)) { - Exit 0 -} - -# disable OneDrive. -New-Item ` - -Path 'HKLM:\SOFTWARE\Policies\Microsoft\Windows' ` - -Name OneDrive ` - -Force ` - | Out-Null -New-ItemProperty ` - -Path 'HKLM:\SOFTWARE\Policies\Microsoft\Windows\OneDrive' ` - -Name DisableFileSyncNGSC ` - -Value 1 ` - -Force ` - | Out-Null - -# uninstall OneDrive. -# NB one drive setup will still be WinSxS and it does not seem possible to -# remove with Remove-WindowsPackage. -Get-Process OneDrive -ErrorAction SilentlyContinue | Stop-Process -Force -&$oneDriveSetup /uninstall | Out-String -Stream - -# ignore uninstall error. -# NB because it fails in windows 20H2, and not having OneDrive is just a -# nice to have. -if ($LASTEXITCODE) { - Write-Output "WARN Failed to uninstall OneDrive with exit code $LASTEXITCODE." - Exit 0 -} diff --git a/packer_templates/scripts/windows/ui-tweaks 2.ps1 b/packer_templates/scripts/windows/ui-tweaks 2.ps1 new file mode 100644 index 000000000..3982f0a98 --- /dev/null +++ b/packer_templates/scripts/windows/ui-tweaks 2.ps1 @@ -0,0 +1,65 @@ +Set-StrictMode -Version Latest +$ProgressPreference = 'SilentlyContinue' +$ErrorActionPreference = 'Stop' + +trap { + Write-Host + Write-Host "ERROR: $_" + ($_.ScriptStackTrace -split '\r?\n') -replace '^(.*)$','ERROR: $1' | Write-Host + ($_.Exception.ToString() -split '\r?\n') -replace '^(.*)$','ERROR EXCEPTION: $1' | Write-Host + Write-Host + Write-Host 'Sleeping for 60m to give you time to look around the virtual machine before self-destruction...' + Start-Sleep -Seconds (60*60) + Exit 1 +} + +@( + # Show file extensions + {Set-ItemProperty -Path 'HKCU:\Software\Microsoft\Windows\CurrentVersion\Explorer\Advanced' -Name HideFileExt -Type DWORD -Value 0} + # Show hidden files + {Set-ItemProperty -Path 'HKCU:\Software\Microsoft\Windows\CurrentVersion\Explorer\Advanced' -Name Hidden -Type DWORD -Value 1} + # Launch explorer to the PC not the user + {Set-ItemProperty -Path 'HKCU:\Software\Microsoft\Windows\CurrentVersion\Explorer\Advanced' -Name LaunchTo -Type DWORD -Value 1} + {Set-ItemProperty -Path 'HKCU:\Software\Microsoft\Windows\CurrentVersion\Explorer\Advanced' -Name FullPathAddress -Type DWORD -Value 1} + # Disable notification popups + {Set-ItemProperty -Path 'HKCU:\Software\Microsoft\Windows\CurrentVersion\Explorer\Advanced' -Name EnableBalloonTips -Type DWORD -Value 0} + # Disable error reporting popups + {Set-ItemProperty -Path 'HKCU:\Software\Microsoft\Windows\Windows Error Reporting' -Name DontShowUI -Type DWORD -Value 0} + # Disable prompting for a shutdown reason + {Set-ItemProperty -Path 'HKLM:\SOFTWARE\Policies\Microsoft\Windows NT\Reliability' -Name ShutdownReasonOn -Type DWORD -Value 0} + # Set visual effects to best performance + {Set-ItemProperty -Path 'HKCU:\Software\Microsoft\Windows\CurrentVersion\Explorer\VisualEffects' -Name VisualFXSetting -Type DWORD -Value 2} + # Dont use visual styles on windows and buttons + {Set-ItemProperty -Path 'HKCU:\Software\Microsoft\Windows\CurrentVersion\ThemeManager' -Name ThemeActive -Type DWORD -Value 1} + # Dont use common tasks in folders + {Set-ItemProperty -Path 'HKCU:\Software\Microsoft\Windows\CurrentVersion\Explorer\Advanced' -Name WebView -Type DWORD -Value 0} + # Dont use drop shadows for icon labels on the desktop + {Set-ItemProperty -Path 'HKCU:\Software\Microsoft\Windows\CurrentVersion\Explorer\Advanced' -Name ListviewShadow -Type DWORD -Value 0} + # Dont use a background image for each folder type + {Set-ItemProperty -Path 'HKCU:\Software\Microsoft\Windows\CurrentVersion\Explorer\Advanced' -Name ListviewWatermark -Type DWORD -Value 0} + # Dont slide taskbar buttons + {Set-ItemProperty -Path 'HKCU:\Software\Microsoft\Windows\CurrentVersion\Explorer\Advanced' -Name TaskbarAnimations -Type DWORD -Value 0} + # Dont animate windows when minimizing and maximizing + {Set-ItemProperty -Path 'HKCU:\Control Panel\Desktop\WindowMetrics' -Name MinAnimate -Type STRING -Value 0} + # Dont show window contents while dragging + {Set-ItemProperty -Path 'HKCU:\Control Panel\Desktop' -Name DragFullWindows -Type STRING -Value 0} + # Dont Smooth edges of screen fonts + {Set-ItemProperty -Path 'HKCU:\Control Panel\Desktop' -Name FontSmoothing -Type STRING -Value 0} + # Dont smooth scroll list boxes + # Dont slide open combo boxes + # Dont fade or slide menus into view + # Dont show shadows under mouse pointer + # Dont fade or slide tooltips into view + # Dont fade out menu items after clicking + # Dont show shadows under menus + {Set-ItemProperty -Path 'HKCU:\Control Panel\Desktop' -Name UserPreferencesMask -Type BINARY -Value (90,12,01,80)} +) | ForEach-Object { + try + { + Invoke-Command -ScriptBlock $_ + } + catch + { + Write-Host "WARN Failed to run: $_" + } +} diff --git a/packer_templates/scripts/windows/ui-tweaks.ps1 b/packer_templates/scripts/windows/ui-tweaks.ps1 new file mode 100644 index 000000000..3982f0a98 --- /dev/null +++ b/packer_templates/scripts/windows/ui-tweaks.ps1 @@ -0,0 +1,65 @@ +Set-StrictMode -Version Latest +$ProgressPreference = 'SilentlyContinue' +$ErrorActionPreference = 'Stop' + +trap { + Write-Host + Write-Host "ERROR: $_" + ($_.ScriptStackTrace -split '\r?\n') -replace '^(.*)$','ERROR: $1' | Write-Host + ($_.Exception.ToString() -split '\r?\n') -replace '^(.*)$','ERROR EXCEPTION: $1' | Write-Host + Write-Host + Write-Host 'Sleeping for 60m to give you time to look around the virtual machine before self-destruction...' + Start-Sleep -Seconds (60*60) + Exit 1 +} + +@( + # Show file extensions + {Set-ItemProperty -Path 'HKCU:\Software\Microsoft\Windows\CurrentVersion\Explorer\Advanced' -Name HideFileExt -Type DWORD -Value 0} + # Show hidden files + {Set-ItemProperty -Path 'HKCU:\Software\Microsoft\Windows\CurrentVersion\Explorer\Advanced' -Name Hidden -Type DWORD -Value 1} + # Launch explorer to the PC not the user + {Set-ItemProperty -Path 'HKCU:\Software\Microsoft\Windows\CurrentVersion\Explorer\Advanced' -Name LaunchTo -Type DWORD -Value 1} + {Set-ItemProperty -Path 'HKCU:\Software\Microsoft\Windows\CurrentVersion\Explorer\Advanced' -Name FullPathAddress -Type DWORD -Value 1} + # Disable notification popups + {Set-ItemProperty -Path 'HKCU:\Software\Microsoft\Windows\CurrentVersion\Explorer\Advanced' -Name EnableBalloonTips -Type DWORD -Value 0} + # Disable error reporting popups + {Set-ItemProperty -Path 'HKCU:\Software\Microsoft\Windows\Windows Error Reporting' -Name DontShowUI -Type DWORD -Value 0} + # Disable prompting for a shutdown reason + {Set-ItemProperty -Path 'HKLM:\SOFTWARE\Policies\Microsoft\Windows NT\Reliability' -Name ShutdownReasonOn -Type DWORD -Value 0} + # Set visual effects to best performance + {Set-ItemProperty -Path 'HKCU:\Software\Microsoft\Windows\CurrentVersion\Explorer\VisualEffects' -Name VisualFXSetting -Type DWORD -Value 2} + # Dont use visual styles on windows and buttons + {Set-ItemProperty -Path 'HKCU:\Software\Microsoft\Windows\CurrentVersion\ThemeManager' -Name ThemeActive -Type DWORD -Value 1} + # Dont use common tasks in folders + {Set-ItemProperty -Path 'HKCU:\Software\Microsoft\Windows\CurrentVersion\Explorer\Advanced' -Name WebView -Type DWORD -Value 0} + # Dont use drop shadows for icon labels on the desktop + {Set-ItemProperty -Path 'HKCU:\Software\Microsoft\Windows\CurrentVersion\Explorer\Advanced' -Name ListviewShadow -Type DWORD -Value 0} + # Dont use a background image for each folder type + {Set-ItemProperty -Path 'HKCU:\Software\Microsoft\Windows\CurrentVersion\Explorer\Advanced' -Name ListviewWatermark -Type DWORD -Value 0} + # Dont slide taskbar buttons + {Set-ItemProperty -Path 'HKCU:\Software\Microsoft\Windows\CurrentVersion\Explorer\Advanced' -Name TaskbarAnimations -Type DWORD -Value 0} + # Dont animate windows when minimizing and maximizing + {Set-ItemProperty -Path 'HKCU:\Control Panel\Desktop\WindowMetrics' -Name MinAnimate -Type STRING -Value 0} + # Dont show window contents while dragging + {Set-ItemProperty -Path 'HKCU:\Control Panel\Desktop' -Name DragFullWindows -Type STRING -Value 0} + # Dont Smooth edges of screen fonts + {Set-ItemProperty -Path 'HKCU:\Control Panel\Desktop' -Name FontSmoothing -Type STRING -Value 0} + # Dont smooth scroll list boxes + # Dont slide open combo boxes + # Dont fade or slide menus into view + # Dont show shadows under mouse pointer + # Dont fade or slide tooltips into view + # Dont fade out menu items after clicking + # Dont show shadows under menus + {Set-ItemProperty -Path 'HKCU:\Control Panel\Desktop' -Name UserPreferencesMask -Type BINARY -Value (90,12,01,80)} +) | ForEach-Object { + try + { + Invoke-Command -ScriptBlock $_ + } + catch + { + Write-Host "WARN Failed to run: $_" + } +} diff --git a/packer_templates/scripts/windows/virtualbox-prevent-vboxsrv-resolution-delay.ps1 b/packer_templates/scripts/windows/virtualbox-prevent-vboxsrv-resolution-delay.ps1 deleted file mode 100644 index be5267040..000000000 --- a/packer_templates/scripts/windows/virtualbox-prevent-vboxsrv-resolution-delay.ps1 +++ /dev/null @@ -1,34 +0,0 @@ -#MIT License -# -#Copyright (c) 2017 Rui Lopes -# -#Permission is hereby granted, free of charge, to any person obtaining a copy -#of this software and associated documentation files (the "Software"), to deal -#in the Software without restriction, including without limitation the rights -#to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -#copies of the Software, and to permit persons to whom the Software is -#furnished to do so, subject to the following conditions: -# -#The above copyright notice and this permission notice shall be included in all -#copies or substantial portions of the Software. -# -#THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -#IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -#FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -#AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -#LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -#OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -#SOFTWARE. - -if ('VirtualBox' -ne (Get-CimInstance -ClassName WIN32_BIOS -Property SMBIOSBIOSVersion).SMBIOSBIOSVersion) { - Exit 0 -} - -# to prevent long delays while resolving the vboxsrv (used by c:\vagrant) -# NetBIOS name, hard-code its address in the lmhosts file. -# see 12.3.9. Long delays when accessing shared folders -# at https://www.virtualbox.org/manual/ch12.html#idm10219 -Write-Output @' -255.255.255.255 VBOXSVR #PRE -255.255.255.255 VBOXSRV #PRE -'@ | Out-File -Encoding ASCII -Append 'c:\windows\system32\drivers\etc\lmhosts' diff --git a/packer_templates/vagrantfile-windows-gen2.template b/packer_templates/vagrantfile-windows-gen2.template deleted file mode 100644 index 8a0a1ebb0..000000000 --- a/packer_templates/vagrantfile-windows-gen2.template +++ /dev/null @@ -1,22 +0,0 @@ -# -*- mode: ruby -*- -# vi: set ft=ruby : - -Vagrant.require_version ">= 1.6.2" - -Vagrant.configure("2") do |config| - config.vm.box = "hyperv_win_10" - config.vm.communicator = "winrm" - config.vm.synced_folder ".", "/vagrant", SharedFoldersEnableSymlinksCreate: false - - config.vm.guest = :windows - - config.vm.network :forwarded_port, guest: 3389, host: 3399, id: "rdp", auto_correct: true - config.vm.network :forwarded_port, guest: 5985, host: 5985, id: "winrm", auto_correct: true - - config.vm.provider "hyperv" do |hv| - hv.ip_address_timeout = 240 - hv.memory = 2048 - hv.cpus = 2 - hv.enable_virtualization_extensions = true - end -end diff --git a/packer_templates/vagrantfile-windows.template b/packer_templates/vagrantfile-windows.template index de22af3cc..4a19e63d7 100644 --- a/packer_templates/vagrantfile-windows.template +++ b/packer_templates/vagrantfile-windows.template @@ -6,19 +6,23 @@ Vagrant.configure(2) do |config| config.vm.communicator = "winrm" config.vm.boot_timeout = 300 config.vm.network :forwarded_port, guest: 3389, host: 3389, id: 'rdp', auto_correct: true + config.vm.network :forwarded_port, guest: 5985, host: 5985, id: "winrm", auto_correct: true config.vm.provider "virtualbox" do |vb| vb.gui = true - vb.memory = 2048 + vb.cpus = 2 + vb.memory = 4096 end config.vm.provider 'hyperv' do |hv| hv.ip_address_timeout = 240 - hv.memory = 2048 + hv.memory = 4096 + hv.cpus = 2 + hv.enable_virtualization_extensions = true end config.vm.provider :libvirt do |domain| - domain.memory = 2028 + domain.memory = 4096 domain.cpus = 2 end end diff --git a/packer_templates/win_answer_files/10/Autounattend.xml b/packer_templates/win_answer_files/10/Autounattend.xml index 03669b711..e54d1ce35 100644 --- a/packer_templates/win_answer_files/10/Autounattend.xml +++ b/packer_templates/win_answer_files/10/Autounattend.xml @@ -1,171 +1,170 @@ <?xml version="1.0" encoding="utf-8"?> -<unattend xmlns="urn:schemas-microsoft-com:unattend"> - <settings pass="windowsPE"> - <component name="Microsoft-Windows-PnpCustomizationsWinPE" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" processorArchitecture="amd64" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State"> - <!-- - This makes the VirtIO drivers available to Windows, assuming that - the VirtIO driver disk at https://fedorapeople.org/groups/virt/virtio-win/direct-downloads/stable-virtio/virtio-win.iso - (see https://docs.fedoraproject.org/en-US/quick-docs/creating-windows-virtual-machines-using-virtio-drivers/index.html#virtio-win-direct-downloads) - is available as drive E: - --> - <DriverPaths> - <PathAndCredentials wcm:action="add" wcm:keyValue="2"> - <Path>E:\viostor\w10\amd64</Path> - </PathAndCredentials> - - <PathAndCredentials wcm:action="add" wcm:keyValue="3"> - <Path>E:\NetKVM\w10\amd64</Path> - </PathAndCredentials> - - <PathAndCredentials wcm:action="add" wcm:keyValue="4"> - <Path>E:\Balloon\w10\amd64</Path> - </PathAndCredentials> - - <PathAndCredentials wcm:action="add" wcm:keyValue="5"> - <Path>E:\pvpanic\w10\amd64</Path> - </PathAndCredentials> - - <PathAndCredentials wcm:action="add" wcm:keyValue="6"> - <Path>E:\qemupciserial\w10\amd64</Path> - </PathAndCredentials> - - <PathAndCredentials wcm:action="add" wcm:keyValue="7"> - <Path>E:\qxldod\w10\amd64</Path> - </PathAndCredentials> - - <PathAndCredentials wcm:action="add" wcm:keyValue="8"> - <Path>E:\vioinput\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:\vioscsi\w10\amd64</Path> - </PathAndCredentials> - - <PathAndCredentials wcm:action="add" wcm:keyValue="11"> - <Path>E:\vioserial\w10\amd64</Path> - </PathAndCredentials> - </DriverPaths> - </component> - <component name="Microsoft-Windows-International-Core-WinPE" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - <SetupUILanguage> - <UILanguage>en-US</UILanguage> - </SetupUILanguage> - <InputLocale>en-US</InputLocale> - <SystemLocale>en-US</SystemLocale> - <UILanguage>en-US</UILanguage> - <UILanguageFallback>en-US</UILanguageFallback> - <UserLocale>en-US</UserLocale> - </component> - <component name="Microsoft-Windows-Setup" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - <DiskConfiguration> - <Disk wcm:action="add"> - <CreatePartitions> - <CreatePartition wcm:action="add"> - <Type>Primary</Type> - <Order>1</Order> - <Size>100</Size> - </CreatePartition> - <CreatePartition wcm:action="add"> - <Order>2</Order> - <Type>Primary</Type> - <Extend>true</Extend> - </CreatePartition> - </CreatePartitions> - <ModifyPartitions> - <ModifyPartition wcm:action="add"> - <Active>true</Active> - <Format>NTFS</Format> - <Label>boot</Label> - <Order>1</Order> - <PartitionID>1</PartitionID> - </ModifyPartition> - <ModifyPartition wcm:action="add"> - <Format>NTFS</Format> - <Label>Windows 10</Label> - <Letter>C</Letter> - <Order>2</Order> - <PartitionID>2</PartitionID> - </ModifyPartition> - </ModifyPartitions> - <DiskID>0</DiskID> - <WillWipeDisk>true</WillWipeDisk> - </Disk> - </DiskConfiguration> - <ImageInstall> - <OSImage> - <InstallFrom> - <MetaData wcm:action="add"> - <Key>/IMAGE/NAME</Key> - <Value>Windows 10 Enterprise Evaluation</Value> - </MetaData> - </InstallFrom> - <InstallTo> - <DiskID>0</DiskID> - <PartitionID>2</PartitionID> - </InstallTo> - </OSImage> - </ImageInstall> - <UserData> - <ProductKey> - <WillShowUI>OnError</WillShowUI> - </ProductKey> - <AcceptEula>true</AcceptEula> - <FullName>Vagrant</FullName> - <Organization>Bento by Chef Software, Inc.</Organization> - </UserData> - </component> - </settings> - <settings pass="generalize"> - <component name="Microsoft-Windows-Security-SPP" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - <SkipRearm>1</SkipRearm> - </component> - <component name="Microsoft-Windows-PnpSysprep" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - <PersistAllDeviceInstalls>false</PersistAllDeviceInstalls> - <DoNotCleanUpNonPresentDevices>false</DoNotCleanUpNonPresentDevices> - </component> - </settings> - <settings pass="oobeSystem"> - <component name="Microsoft-Windows-International-Core" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - <InputLocale>en-US</InputLocale> - <SystemLocale>en-US</SystemLocale> - <UILanguage>en-US</UILanguage> - <UserLocale>en-US</UserLocale> - </component> - <component name="Microsoft-Windows-Shell-Setup" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - <OOBE> - <HideEULAPage>true</HideEULAPage> - <HideLocalAccountScreen>true</HideLocalAccountScreen> - <HideOEMRegistrationScreen>true</HideOEMRegistrationScreen> - <HideOnlineAccountScreens>true</HideOnlineAccountScreens> - <HideWirelessSetupInOOBE>true</HideWirelessSetupInOOBE> - <NetworkLocation>Work</NetworkLocation> - <ProtectYourPC>3</ProtectYourPC> - <SkipMachineOOBE>true</SkipMachineOOBE> - <SkipUserOOBE>true</SkipUserOOBE> - </OOBE> - <TimeZone>UTC</TimeZone> - <UserAccounts> - <AdministratorPassword> - <Value>vagrant</Value> - <PlainText>true</PlainText> - </AdministratorPassword> - <LocalAccounts> - <LocalAccount wcm:action="add"> - <Password> - <Value>vagrant</Value> - <PlainText>true</PlainText> - </Password> - <Description>Vagrant User</Description> - <DisplayName>vagrant</DisplayName> - <Group>administrators</Group> - <Name>vagrant</Name> - </LocalAccount> - </LocalAccounts> - </UserAccounts> +<unattend xmlns="urn:schemas-microsoft-com:unattend" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <settings pass="windowsPE"> + <component name="Microsoft-Windows-PnpCustomizationsWinPE" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" processorArchitecture="amd64"> + <!-- + This makes the VirtIO drivers available to Windows, assuming that + the VirtIO driver disk at https://fedorapeople.org/groups/virt/virtio-win/direct-downloads/stable-virtio/virtio-win.iso + (see https://docs.fedoraproject.org/en-US/quick-docs/creating-windows-virtual-machines-using-virtio-drivers/index.html#virtio-win-direct-downloads) + is available as drive E: + --> + <DriverPaths> + <PathAndCredentials wcm:action="add" wcm:keyValue="2"> + <Path>E:\viostor\w10\amd64</Path> + </PathAndCredentials> + <PathAndCredentials wcm:action="add" wcm:keyValue="3"> + <Path>E:\NetKVM\w10\amd64</Path> + </PathAndCredentials> + <PathAndCredentials wcm:action="add" wcm:keyValue="4"> + <Path>E:\Balloon\w10\amd64</Path> + </PathAndCredentials> + <PathAndCredentials wcm:action="add" wcm:keyValue="5"> + <Path>E:\pvpanic\w10\amd64</Path> + </PathAndCredentials> + <PathAndCredentials wcm:action="add" wcm:keyValue="6"> + <Path>E:\qemupciserial\w10\amd64</Path> + </PathAndCredentials> + <PathAndCredentials wcm:action="add" wcm:keyValue="7"> + <Path>E:\qxldod\w10\amd64</Path> + </PathAndCredentials> + <PathAndCredentials wcm:action="add" wcm:keyValue="8"> + <Path>E:\vioinput\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:\vioscsi\w10\amd64</Path> + </PathAndCredentials> + <PathAndCredentials wcm:action="add" wcm:keyValue="11"> + <Path>E:\vioserial\w10\amd64</Path> + </PathAndCredentials> + </DriverPaths> + </component> + <component name="Microsoft-Windows-International-Core-WinPE" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> + <SetupUILanguage> + <UILanguage>en-US</UILanguage> + </SetupUILanguage> + <InputLocale>en-US</InputLocale> + <SystemLocale>en-US</SystemLocale> + <UILanguage>en-US</UILanguage> + <UILanguageFallback>en-US</UILanguageFallback> + <UserLocale>en-US</UserLocale> + </component> + <component name="Microsoft-Windows-Setup" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> + <DiskConfiguration> + <Disk wcm:action="add"> + <CreatePartitions> + <CreatePartition wcm:action="add"> + <Type>Primary</Type> + <Order>1</Order> + <Size>100</Size> + </CreatePartition> + <CreatePartition wcm:action="add"> + <Order>2</Order> + <Type>Primary</Type> + <Extend>true</Extend> + </CreatePartition> + </CreatePartitions> + <ModifyPartitions> + <ModifyPartition wcm:action="add"> + <Active>true</Active> + <Format>NTFS</Format> + <Label>boot</Label> + <Order>1</Order> + <PartitionID>1</PartitionID> + </ModifyPartition> + <ModifyPartition wcm:action="add"> + <Format>NTFS</Format> + <Label>Windows</Label> + <Letter>C</Letter> + <Order>2</Order> + <PartitionID>2</PartitionID> + </ModifyPartition> + </ModifyPartitions> + <DiskID>0</DiskID> + <WillWipeDisk>true</WillWipeDisk> + </Disk> + </DiskConfiguration> + <ImageInstall> + <OSImage> + <InstallFrom> + <MetaData wcm:action="add"> + <Key>/IMAGE/NAME</Key> + <Value>Windows 10 Enterprise Evaluation</Value> + </MetaData> + </InstallFrom> + <InstallTo> + <DiskID>0</DiskID> + <PartitionID>2</PartitionID> + </InstallTo> + </OSImage> + </ImageInstall> + <UserData> + <ProductKey> + <WillShowUI>OnError</WillShowUI> + </ProductKey> + <AcceptEula>true</AcceptEula> + <FullName>Vagrant</FullName> + <Organization>Bento by Chef Software, Inc.</Organization> + </UserData> + <DynamicUpdate> + <Enable>false</Enable> + </DynamicUpdate> + </component> + </settings> + <settings pass="generalize"> + <component name="Microsoft-Windows-Security-SPP" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> + <SkipRearm>1</SkipRearm> + </component> + <component name="Microsoft-Windows-PnpSysprep" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> + <PersistAllDeviceInstalls>false</PersistAllDeviceInstalls> + <DoNotCleanUpNonPresentDevices>false</DoNotCleanUpNonPresentDevices> + </component> + </settings> + <settings pass="oobeSystem"> + <component name="Microsoft-Windows-International-Core" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> + <InputLocale>en-US</InputLocale> + <SystemLocale>en-US</SystemLocale> + <UILanguage>en-US</UILanguage> + <UserLocale>en-US</UserLocale> + </component> + <component name="Microsoft-Windows-Shell-Setup" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> + <OOBE> + <HideEULAPage>true</HideEULAPage> + <HideLocalAccountScreen>true</HideLocalAccountScreen> + <HideOEMRegistrationScreen>true</HideOEMRegistrationScreen> + <HideOnlineAccountScreens>true</HideOnlineAccountScreens> + <HideWirelessSetupInOOBE>true</HideWirelessSetupInOOBE> + <NetworkLocation>Work</NetworkLocation> + <ProtectYourPC>3</ProtectYourPC> + <SkipMachineOOBE>true</SkipMachineOOBE> + <SkipUserOOBE>true</SkipUserOOBE> + <VMModeOptimizations> + <SkipAdministratorProfileRemoval>true</SkipAdministratorProfileRemoval> + <SkipNotifyUILanguageChange>true</SkipNotifyUILanguageChange> + <SkipWinREInitialization>true</SkipWinREInitialization> + </VMModeOptimizations> + </OOBE> + <TimeZone>UTC</TimeZone> + <UserAccounts> + <AdministratorPassword> + <Value>vagrant</Value> + <PlainText>true</PlainText> + </AdministratorPassword> + <LocalAccounts> + <LocalAccount wcm:action="add"> + <Password> + <Value>vagrant</Value> + <PlainText>true</PlainText> + </Password> + <Description>Vagrant User</Description> + <DisplayName>vagrant</DisplayName> + <Group>administrators</Group> + <Name>vagrant</Name> + </LocalAccount> + </LocalAccounts> + </UserAccounts> <AutoLogon> <Password> <Value>vagrant</Value> @@ -174,44 +173,129 @@ <Username>vagrant</Username> <Enabled>true</Enabled> </AutoLogon> - <FirstLogonCommands> - <SynchronousCommand wcm:action="add"> - <CommandLine>cmd.exe /c powershell -Command "Set-ExecutionPolicy -ExecutionPolicy RemoteSigned -Force"</CommandLine> - <Description>Set Execution Policy 64 Bit</Description> - <Order>1</Order> - <RequiresUserInput>true</RequiresUserInput> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <CommandLine>C:\Windows\SysWOW64\cmd.exe /c powershell -Command "Set-ExecutionPolicy -ExecutionPolicy RemoteSigned -Force"</CommandLine> - <Description>Set Execution Policy 32 Bit</Description> - <Order>2</Order> - <RequiresUserInput>true</RequiresUserInput> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <CommandLine>powershell -NoLogo -ExecutionPolicy RemoteSigned -File a:\base_setup.ps1</CommandLine> - <Description>Configure WinRM so packer can connect to run Chef</Description> - <Order>3</Order> - <RequiresUserInput>false</RequiresUserInput> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <CommandLine>cmd.exe /c wmic useraccount where "name='vagrant'" set PasswordExpires=FALSE</CommandLine> - <Order>4</Order> - <Description>Disable password expiration for vagrant user</Description> - </SynchronousCommand> - </FirstLogonCommands> - </component> - </settings> - <settings pass="specialize"> - <component xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" name="Microsoft-Windows-ServerManager-SvrMgrNc" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> - <DoNotOpenServerManagerAtLogon>true</DoNotOpenServerManagerAtLogon> - </component> - <component xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" name="Microsoft-Windows-IE-ESC" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> - <!-- Disable IE ESC. --> - <IEHardenAdmin>false</IEHardenAdmin> - <IEHardenUser>false</IEHardenUser> - </component> - <component xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" name="Microsoft-Windows-OutOfBoxExperience" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> - <DoNotOpenInitialConfigurationTasksAtLogon>true</DoNotOpenInitialConfigurationTasksAtLogon> - </component> - </settings> + <FirstLogonCommands> + <SynchronousCommand wcm:action="add"> + <CommandLine>%windir%\System32\WindowsPowerShell\v1.0\powershell.exe -Command "Set-ExecutionPolicy -ExecutionPolicy RemoteSigned -Force"</CommandLine> + <Description>Set Execution Policy 64 Bit</Description> + <Order>1</Order> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <CommandLine>%windir%\SysWOW64\cmd.exe /c powershell -Command "Set-ExecutionPolicy -ExecutionPolicy RemoteSigned -Force"</CommandLine> + <Description>Set Execution Policy 32 Bit</Description> + <Order>2</Order> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <Order>3</Order> + <CommandLine>%windir%\System32\WindowsPowerShell\v1.0\powershell.exe -Command Get-NetConnectionProfile | Set-NetConnectionProfile -NetworkCategory "Private"</CommandLine> + <Description>Sets detected network connections to private to allow start of winrm</Description> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <Order>4</Order> + <CommandLine>%windir%\System32\WindowsPowerShell\v1.0\powershell.exe -Command Set-NetFirewallRule -Name "WINRM-HTTP-In-TCP" -RemoteAddress Any</CommandLine> + <Description>Allows winrm over public profile interfaces</Description> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <Order>5</Order> + <CommandLine>%windir%\System32\cmd.exe /c winrm quickconfig -q</CommandLine> + <Description>winrm quickconfig -q</Description> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <Order>6</Order> + <CommandLine>%windir%\System32\cmd.exe /c winrm quickconfig -transport:http</CommandLine> + <Description>winrm quickconfig -transport:http</Description> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <Order>7</Order> + <CommandLine>%windir%\System32\cmd.exe /c winrm set winrm/config @{MaxTimeoutms="1800000"}</CommandLine> + <Description>Win RM MaxTimoutms</Description> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <Order>8</Order> + <CommandLine>%windir%\System32\cmd.exe /c winrm set winrm/config/winrs @{MaxMemoryPerShellMB="2048"}</CommandLine> + <Description>Win RM MaxMemoryPerShellMB</Description> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <Order>9</Order> + <CommandLine>%windir%\System32\cmd.exe /c winrm set winrm/config/service @{AllowUnencrypted="true"}</CommandLine> + <Description>Win RM AllowUnencrypted</Description> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <Order>10</Order> + <CommandLine>%windir%\System32\cmd.exe /c winrm set winrm/config/service/auth @{Basic="true"}</CommandLine> + <Description>Win RM auth Basic</Description> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <Order>11</Order> + <CommandLine>%windir%\System32\cmd.exe /c winrm set winrm/config/client/auth @{Basic="true"}</CommandLine> + <Description>Win RM client auth Basic</Description> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <Order>12</Order> + <CommandLine>%windir%\System32\cmd.exe /c winrm set winrm/config/listener?Address=*+Transport=HTTP @{Port="5985"}</CommandLine> + <Description>Win RM listener Address/Port</Description> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <Order>13</Order> + <CommandLine>%windir%\System32\cmd.exe /c netsh firewall add portopening TCP 5985 "Port 5985"</CommandLine> + <Description>Win RM port open</Description> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <Order>14</Order> + <CommandLine>%windir%\System32\cmd.exe /c net stop winrm</CommandLine> + <Description>Stop Win RM Service</Description> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <Order>15</Order> + <CommandLine>%windir%\System32\cmd.exe /c sc config winrm start= auto</CommandLine> + <Description>Win RM Autostart</Description> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <Order>16</Order> + <CommandLine>%windir%\System32\cmd.exe /c net start winrm</CommandLine> + <Description>Start Win RM Service</Description> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <Order>17</Order> + <CommandLine>%windir%\System32\cmd.exe /c wmic useraccount where "name='vagrant'" set PasswordExpires=FALSE</CommandLine> + <Description>Disable password expiration for vagrant user</Description> + </SynchronousCommand> + </FirstLogonCommands> + </component> + <component name="Microsoft-Windows-WinRE-RecoveryAgent" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> + <UninstallWindowsRE>true</UninstallWindowsRE> + </component> + </settings> + <settings pass="specialize"> + <component name="Microsoft-Windows-SystemRestore-Main" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> + <DisableSR>1</DisableSR> + </component> + <component name="Microsoft-Windows-SystemSettingsThreshold" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> + <DisplayNetworkSelection>false</DisplayNetworkSelection> + </component> + <component name="Networking-MPSSVC-Svc" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> + <FirewallGroups> + <FirewallGroup wcm:action="add" wcm:keyValue="WindowsRemoteManagement"> + <Active>true</Active> + <Group>Windows Remote Management</Group> + <Profile>all</Profile> + </FirewallGroup> + <FirewallGroup wcm:action="add" wcm:keyValue="RemoteAdministration"> + <Active>true</Active> + <Group>Remote Administration</Group> + <Profile>all</Profile> + </FirewallGroup> + </FirewallGroups> + </component> + <component name="Microsoft-Windows-SQMApi" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> + <CEIPEnabled>0</CEIPEnabled> + </component> + <component name="Microsoft-Windows-Security-SPP-UX" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> + <SkipAutoActivation>true</SkipAutoActivation> + </component> + </settings> + <settings pass="offlineServicing"> + <component name="Microsoft-Windows-LUA-Settings" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> + <EnableLUA>false</EnableLUA> + </component> + </settings> </unattend> diff --git a/packer_templates/win_answer_files/10/gen2_Autounattend.xml b/packer_templates/win_answer_files/10/hyperv-gen2/Autounattend 2.xml similarity index 53% rename from packer_templates/win_answer_files/10/gen2_Autounattend.xml rename to packer_templates/win_answer_files/10/hyperv-gen2/Autounattend 2.xml index d64883c09..4465d46ea 100644 --- a/packer_templates/win_answer_files/10/gen2_Autounattend.xml +++ b/packer_templates/win_answer_files/10/hyperv-gen2/Autounattend 2.xml @@ -1,59 +1,46 @@ <?xml version="1.0" encoding="utf-8"?> -<unattend xmlns="urn:schemas-microsoft-com:unattend"> +<unattend xmlns="urn:schemas-microsoft-com:unattend" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> <settings pass="windowsPE"> - <component name="Microsoft-Windows-PnpCustomizationsWinPE" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" processorArchitecture="amd64" - xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State"> - <!-- - This makes the VirtIO drivers available to Windows, assuming that - the VirtIO driver disk at https://fedorapeople.org/groups/virt/virtio-win/direct-downloads/stable-virtio/virtio-win.iso - (see https://docs.fedoraproject.org/en-US/quick-docs/creating-windows-virtual-machines-using-virtio-drivers/index.html#virtio-win-direct-downloads) - is available as drive E: - --> + <component name="Microsoft-Windows-PnpCustomizationsWinPE" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" processorArchitecture="amd64"> <!-- + This makes the VirtIO drivers available to Windows, assuming that + the VirtIO driver disk at https://fedorapeople.org/groups/virt/virtio-win/direct-downloads/stable-virtio/virtio-win.iso + (see https://docs.fedoraproject.org/en-US/quick-docs/creating-windows-virtual-machines-using-virtio-drivers/index.html#virtio-win-direct-downloads) + is available as drive E: + --> <DriverPaths> <PathAndCredentials wcm:action="add" wcm:keyValue="2"> <Path>F:\viostor\w10\amd64</Path> </PathAndCredentials> - <PathAndCredentials wcm:action="add" wcm:keyValue="3"> <Path>F:\NetKVM\w10\amd64</Path> </PathAndCredentials> - <PathAndCredentials wcm:action="add" wcm:keyValue="4"> <Path>F:\Balloon\w10\amd64</Path> </PathAndCredentials> - <PathAndCredentials wcm:action="add" wcm:keyValue="5"> <Path>F:\pvpanic\w10\amd64</Path> </PathAndCredentials> - <PathAndCredentials wcm:action="add" wcm:keyValue="6"> <Path>F:\qemupciserial\w10\amd64</Path> </PathAndCredentials> - <PathAndCredentials wcm:action="add" wcm:keyValue="7"> <Path>F:\qxldod\w10\amd64</Path> </PathAndCredentials> - <PathAndCredentials wcm:action="add" wcm:keyValue="8"> <Path>F:\vioinput\w10\amd64</Path> </PathAndCredentials> - <PathAndCredentials wcm:action="add" wcm:keyValue="9"> <Path>F:\viorng\w10\amd64</Path> </PathAndCredentials> - <PathAndCredentials wcm:action="add" wcm:keyValue="10"> <Path>F:\vioscsi\w10\amd64</Path> </PathAndCredentials> - <PathAndCredentials wcm:action="add" wcm:keyValue="11"> <Path>F:\vioserial\w10\amd64</Path> </PathAndCredentials> </DriverPaths> </component> - <component name="Microsoft-Windows-International-Core-WinPE" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" - xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <component name="Microsoft-Windows-International-Core-WinPE" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> <SetupUILanguage> <UILanguage>en-US</UILanguage> </SetupUILanguage> @@ -63,9 +50,7 @@ <UILanguageFallback>en-US</UILanguageFallback> <UserLocale>en-US</UserLocale> </component> - <component name="Microsoft-Windows-Setup" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" - xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <component name="Microsoft-Windows-Setup" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> <DiskConfiguration> <Disk wcm:action="add"> <CreatePartitions> @@ -142,33 +127,28 @@ <FullName>Vagrant</FullName> <Organization>Bento by Chef Software, Inc.</Organization> </UserData> + <DynamicUpdate> + <Enable>false</Enable> + </DynamicUpdate> </component> </settings> <settings pass="generalize"> - <component name="Microsoft-Windows-Security-SPP" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" - xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <component name="Microsoft-Windows-Security-SPP" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> <SkipRearm>1</SkipRearm> </component> - <component name="Microsoft-Windows-PnpSysprep" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" - xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <component name="Microsoft-Windows-PnpSysprep" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> <PersistAllDeviceInstalls>false</PersistAllDeviceInstalls> <DoNotCleanUpNonPresentDevices>false</DoNotCleanUpNonPresentDevices> </component> </settings> <settings pass="oobeSystem"> - <component name="Microsoft-Windows-International-Core" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" - xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <component name="Microsoft-Windows-International-Core" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> <InputLocale>en-US</InputLocale> <SystemLocale>en-US</SystemLocale> <UILanguage>en-US</UILanguage> <UserLocale>en-US</UserLocale> </component> - <component name="Microsoft-Windows-Shell-Setup" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" - xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <component name="Microsoft-Windows-Shell-Setup" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> <OOBE> <HideEULAPage>true</HideEULAPage> <HideLocalAccountScreen>true</HideLocalAccountScreen> @@ -179,6 +159,11 @@ <ProtectYourPC>3</ProtectYourPC> <SkipMachineOOBE>true</SkipMachineOOBE> <SkipUserOOBE>true</SkipUserOOBE> + <VMModeOptimizations> + <SkipAdministratorProfileRemoval>true</SkipAdministratorProfileRemoval> + <SkipNotifyUILanguageChange>true</SkipNotifyUILanguageChange> + <SkipWinREInitialization>true</SkipWinREInitialization> + </VMModeOptimizations> </OOBE> <TimeZone>UTC</TimeZone> <UserAccounts> @@ -209,45 +194,127 @@ </AutoLogon> <FirstLogonCommands> <SynchronousCommand wcm:action="add"> - <CommandLine>cmd.exe /c powershell -Command "Set-ExecutionPolicy -ExecutionPolicy RemoteSigned -Force"</CommandLine> + <CommandLine>%windir%\System32\WindowsPowerShell\v1.0\powershell.exe -Command "Set-ExecutionPolicy -ExecutionPolicy RemoteSigned -Force"</CommandLine> <Description>Set Execution Policy 64 Bit</Description> <Order>1</Order> - <RequiresUserInput>true</RequiresUserInput> </SynchronousCommand> <SynchronousCommand wcm:action="add"> - <CommandLine>C:\Windows\SysWOW64\cmd.exe /c powershell -Command "Set-ExecutionPolicy -ExecutionPolicy RemoteSigned -Force"</CommandLine> + <CommandLine>%windir%\SysWOW64\cmd.exe /c powershell -Command "Set-ExecutionPolicy -ExecutionPolicy RemoteSigned -Force"</CommandLine> <Description>Set Execution Policy 32 Bit</Description> <Order>2</Order> - <RequiresUserInput>true</RequiresUserInput> </SynchronousCommand> <SynchronousCommand wcm:action="add"> - <CommandLine>powershell -NoLogo -ExecutionPolicy RemoteSigned -File e:\base_setup.ps1</CommandLine> - <Description>Configure WinRM so packer can connect to run Chef</Description> <Order>3</Order> - <RequiresUserInput>false</RequiresUserInput> + <CommandLine>%windir%\System32\WindowsPowerShell\v1.0\powershell.exe -Command Get-NetConnectionProfile | Set-NetConnectionProfile -NetworkCategory "Private"</CommandLine> + <Description>Sets detected network connections to private to allow start of winrm</Description> </SynchronousCommand> <SynchronousCommand wcm:action="add"> - <CommandLine>cmd.exe /c wmic useraccount where "name='vagrant'" set PasswordExpires=FALSE</CommandLine> <Order>4</Order> + <CommandLine>%windir%\System32\WindowsPowerShell\v1.0\powershell.exe -Command Set-NetFirewallRule -Name "WINRM-HTTP-In-TCP" -RemoteAddress Any</CommandLine> + <Description>Allows winrm over public profile interfaces</Description> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <Order>5</Order> + <CommandLine>%windir%\System32\cmd.exe /c winrm quickconfig -q</CommandLine> + <Description>winrm quickconfig -q</Description> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <Order>6</Order> + <CommandLine>%windir%\System32\cmd.exe /c winrm quickconfig -transport:http</CommandLine> + <Description>winrm quickconfig -transport:http</Description> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <Order>7</Order> + <CommandLine>%windir%\System32\cmd.exe /c winrm set winrm/config @{MaxTimeoutms="1800000"}</CommandLine> + <Description>Win RM MaxTimoutms</Description> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <Order>8</Order> + <CommandLine>%windir%\System32\cmd.exe /c winrm set winrm/config/winrs @{MaxMemoryPerShellMB="2048"}</CommandLine> + <Description>Win RM MaxMemoryPerShellMB</Description> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <Order>9</Order> + <CommandLine>%windir%\System32\cmd.exe /c winrm set winrm/config/service @{AllowUnencrypted="true"}</CommandLine> + <Description>Win RM AllowUnencrypted</Description> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <Order>10</Order> + <CommandLine>%windir%\System32\cmd.exe /c winrm set winrm/config/service/auth @{Basic="true"}</CommandLine> + <Description>Win RM auth Basic</Description> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <Order>11</Order> + <CommandLine>%windir%\System32\cmd.exe /c winrm set winrm/config/client/auth @{Basic="true"}</CommandLine> + <Description>Win RM client auth Basic</Description> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <Order>12</Order> + <CommandLine>%windir%\System32\cmd.exe /c winrm set winrm/config/listener?Address=*+Transport=HTTP @{Port="5985"}</CommandLine> + <Description>Win RM listener Address/Port</Description> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <Order>13</Order> + <CommandLine>%windir%\System32\cmd.exe /c netsh firewall add portopening TCP 5985 "Port 5985"</CommandLine> + <Description>Win RM port open</Description> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <Order>14</Order> + <CommandLine>%windir%\System32\cmd.exe /c net stop winrm</CommandLine> + <Description>Stop Win RM Service</Description> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <Order>15</Order> + <CommandLine>%windir%\System32\cmd.exe /c sc config winrm start= auto</CommandLine> + <Description>Win RM Autostart</Description> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <Order>16</Order> + <CommandLine>%windir%\System32\cmd.exe /c net start winrm</CommandLine> + <Description>Start Win RM Service</Description> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <Order>17</Order> + <CommandLine>%windir%\System32\cmd.exe /c wmic useraccount where "name='vagrant'" set PasswordExpires=FALSE</CommandLine> <Description>Disable password expiration for vagrant user</Description> </SynchronousCommand> </FirstLogonCommands> </component> + <component name="Microsoft-Windows-WinRE-RecoveryAgent" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> + <UninstallWindowsRE>true</UninstallWindowsRE> + </component> </settings> <settings pass="specialize"> - <component xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" name="Microsoft-Windows-ServerManager-SvrMgrNc" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> - <DoNotOpenServerManagerAtLogon>true</DoNotOpenServerManagerAtLogon> + <component name="Microsoft-Windows-SystemRestore-Main" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> + <DisableSR>1</DisableSR> + </component> + <component name="Microsoft-Windows-SystemSettingsThreshold" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> + <DisplayNetworkSelection>false</DisplayNetworkSelection> </component> - <component xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" name="Microsoft-Windows-IE-ESC" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> - <!-- Disable IE ESC. --> - <IEHardenAdmin>false</IEHardenAdmin> - <IEHardenUser>false</IEHardenUser> + <component name="Networking-MPSSVC-Svc" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> + <FirewallGroups> + <FirewallGroup wcm:action="add" wcm:keyValue="WindowsRemoteManagement"> + <Active>true</Active> + <Group>Windows Remote Management</Group> + <Profile>all</Profile> + </FirewallGroup> + <FirewallGroup wcm:action="add" wcm:keyValue="RemoteAdministration"> + <Active>true</Active> + <Group>Remote Administration</Group> + <Profile>all</Profile> + </FirewallGroup> + </FirewallGroups> </component> - <component xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" name="Microsoft-Windows-OutOfBoxExperience" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> - <DoNotOpenInitialConfigurationTasksAtLogon>true</DoNotOpenInitialConfigurationTasksAtLogon> + <component name="Microsoft-Windows-SQMApi" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> + <CEIPEnabled>0</CEIPEnabled> + </component> + <component name="Microsoft-Windows-Security-SPP-UX" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> + <SkipAutoActivation>true</SkipAutoActivation> + </component> + </settings> + <settings pass="offlineServicing"> + <component name="Microsoft-Windows-LUA-Settings" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> + <EnableLUA>false</EnableLUA> </component> </settings> </unattend> diff --git a/packer_templates/win_answer_files/11/gen2_Autounattend.xml b/packer_templates/win_answer_files/10/hyperv-gen2/Autounattend.xml similarity index 50% rename from packer_templates/win_answer_files/11/gen2_Autounattend.xml rename to packer_templates/win_answer_files/10/hyperv-gen2/Autounattend.xml index 89e9c2602..4465d46ea 100644 --- a/packer_templates/win_answer_files/11/gen2_Autounattend.xml +++ b/packer_templates/win_answer_files/10/hyperv-gen2/Autounattend.xml @@ -1,63 +1,46 @@ <?xml version="1.0" encoding="utf-8"?> -<unattend xmlns="urn:schemas-microsoft-com:unattend"> +<unattend xmlns="urn:schemas-microsoft-com:unattend" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> <settings pass="windowsPE"> - <component name="Microsoft-Windows-PnpCustomizationsWinPE" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" processorArchitecture="amd64" - xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State"> - <!-- - This makes the VirtIO drivers available to Windows, assuming that - the VirtIO driver disk at https://fedorapeople.org/groups/virt/virtio-win/direct-downloads/stable-virtio/virtio-win.iso - (see https://docs.fedoraproject.org/en-US/quick-docs/creating-windows-virtual-machines-using-virtio-drivers/index.html#virtio-win-direct-downloads) - is available as drive E: - --> + <component name="Microsoft-Windows-PnpCustomizationsWinPE" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" processorArchitecture="amd64"> <!-- + This makes the VirtIO drivers available to Windows, assuming that + the VirtIO driver disk at https://fedorapeople.org/groups/virt/virtio-win/direct-downloads/stable-virtio/virtio-win.iso + (see https://docs.fedoraproject.org/en-US/quick-docs/creating-windows-virtual-machines-using-virtio-drivers/index.html#virtio-win-direct-downloads) + is available as drive E: + --> <DriverPaths> <PathAndCredentials wcm:action="add" wcm:keyValue="2"> - <Path>F:\viostor\w11\amd64</Path> + <Path>F:\viostor\w10\amd64</Path> </PathAndCredentials> - <PathAndCredentials wcm:action="add" wcm:keyValue="3"> - <Path>F:\NetKVM\w11\amd64</Path> + <Path>F:\NetKVM\w10\amd64</Path> </PathAndCredentials> - <PathAndCredentials wcm:action="add" wcm:keyValue="4"> - <Path>F:\Balloon\w11\amd64</Path> + <Path>F:\Balloon\w10\amd64</Path> </PathAndCredentials> - <PathAndCredentials wcm:action="add" wcm:keyValue="5"> - <Path>F:\pvpanic\w11\amd64</Path> + <Path>F:\pvpanic\w10\amd64</Path> </PathAndCredentials> - <PathAndCredentials wcm:action="add" wcm:keyValue="6"> - <Path>F:\qemupciserial\w11\amd64</Path> + <Path>F:\qemupciserial\w10\amd64</Path> </PathAndCredentials> - <PathAndCredentials wcm:action="add" wcm:keyValue="7"> - <Path>F:\qxldod\w11\amd64</Path> + <Path>F:\qxldod\w10\amd64</Path> </PathAndCredentials> - <PathAndCredentials wcm:action="add" wcm:keyValue="8"> - <Path>F:\vioinput\w11\amd64</Path> + <Path>F:\vioinput\w10\amd64</Path> </PathAndCredentials> - <PathAndCredentials wcm:action="add" wcm:keyValue="9"> - <Path>F:\viorng\w11\amd64</Path> + <Path>F:\viorng\w10\amd64</Path> </PathAndCredentials> - <PathAndCredentials wcm:action="add" wcm:keyValue="10"> - <Path>F:\vioscsi\w11\amd64</Path> + <Path>F:\vioscsi\w10\amd64</Path> </PathAndCredentials> - <PathAndCredentials wcm:action="add" wcm:keyValue="11"> - <Path>F:\vioserial\w11\amd64</Path> - </PathAndCredentials> - - <PathAndCredentials wcm:action="add" wcm:keyValue="12"> - <Path>F:\vioserial\w11\amd64</Path> + <Path>F:\vioserial\w10\amd64</Path> </PathAndCredentials> </DriverPaths> </component> - <component name="Microsoft-Windows-International-Core-WinPE" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" - xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <component name="Microsoft-Windows-International-Core-WinPE" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> <SetupUILanguage> <UILanguage>en-US</UILanguage> </SetupUILanguage> @@ -67,9 +50,7 @@ <UILanguageFallback>en-US</UILanguageFallback> <UserLocale>en-US</UserLocale> </component> - <component name="Microsoft-Windows-Setup" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" - xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <component name="Microsoft-Windows-Setup" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> <DiskConfiguration> <Disk wcm:action="add"> <CreatePartitions> @@ -129,7 +110,7 @@ <InstallFrom> <MetaData wcm:action="add"> <Key>/IMAGE/NAME</Key> - <Value>Windows 11 Enterprise Evaluation</Value> + <Value>Windows 10 Enterprise Evaluation</Value> </MetaData> </InstallFrom> <InstallTo> @@ -146,33 +127,28 @@ <FullName>Vagrant</FullName> <Organization>Bento by Chef Software, Inc.</Organization> </UserData> + <DynamicUpdate> + <Enable>false</Enable> + </DynamicUpdate> </component> </settings> <settings pass="generalize"> - <component name="Microsoft-Windows-Security-SPP" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" - xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <component name="Microsoft-Windows-Security-SPP" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> <SkipRearm>1</SkipRearm> </component> - <component name="Microsoft-Windows-PnpSysprep" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" - xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <component name="Microsoft-Windows-PnpSysprep" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> <PersistAllDeviceInstalls>false</PersistAllDeviceInstalls> <DoNotCleanUpNonPresentDevices>false</DoNotCleanUpNonPresentDevices> </component> </settings> <settings pass="oobeSystem"> - <component name="Microsoft-Windows-International-Core" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" - xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <component name="Microsoft-Windows-International-Core" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> <InputLocale>en-US</InputLocale> <SystemLocale>en-US</SystemLocale> <UILanguage>en-US</UILanguage> <UserLocale>en-US</UserLocale> </component> - <component name="Microsoft-Windows-Shell-Setup" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" - xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <component name="Microsoft-Windows-Shell-Setup" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> <OOBE> <HideEULAPage>true</HideEULAPage> <HideLocalAccountScreen>true</HideLocalAccountScreen> @@ -183,6 +159,11 @@ <ProtectYourPC>3</ProtectYourPC> <SkipMachineOOBE>true</SkipMachineOOBE> <SkipUserOOBE>true</SkipUserOOBE> + <VMModeOptimizations> + <SkipAdministratorProfileRemoval>true</SkipAdministratorProfileRemoval> + <SkipNotifyUILanguageChange>true</SkipNotifyUILanguageChange> + <SkipWinREInitialization>true</SkipWinREInitialization> + </VMModeOptimizations> </OOBE> <TimeZone>UTC</TimeZone> <UserAccounts> @@ -213,45 +194,127 @@ </AutoLogon> <FirstLogonCommands> <SynchronousCommand wcm:action="add"> - <CommandLine>cmd.exe /c powershell -Command "Set-ExecutionPolicy -ExecutionPolicy RemoteSigned -Force"</CommandLine> + <CommandLine>%windir%\System32\WindowsPowerShell\v1.0\powershell.exe -Command "Set-ExecutionPolicy -ExecutionPolicy RemoteSigned -Force"</CommandLine> <Description>Set Execution Policy 64 Bit</Description> <Order>1</Order> - <RequiresUserInput>true</RequiresUserInput> </SynchronousCommand> <SynchronousCommand wcm:action="add"> - <CommandLine>C:\Windows\SysWOW64\cmd.exe /c powershell -Command "Set-ExecutionPolicy -ExecutionPolicy RemoteSigned -Force"</CommandLine> + <CommandLine>%windir%\SysWOW64\cmd.exe /c powershell -Command "Set-ExecutionPolicy -ExecutionPolicy RemoteSigned -Force"</CommandLine> <Description>Set Execution Policy 32 Bit</Description> <Order>2</Order> - <RequiresUserInput>true</RequiresUserInput> </SynchronousCommand> <SynchronousCommand wcm:action="add"> - <CommandLine>powershell -NoLogo -ExecutionPolicy RemoteSigned -File e:\base_setup.ps1</CommandLine> - <Description>Configure WinRM so packer can connect to run Chef</Description> <Order>3</Order> - <RequiresUserInput>false</RequiresUserInput> + <CommandLine>%windir%\System32\WindowsPowerShell\v1.0\powershell.exe -Command Get-NetConnectionProfile | Set-NetConnectionProfile -NetworkCategory "Private"</CommandLine> + <Description>Sets detected network connections to private to allow start of winrm</Description> </SynchronousCommand> <SynchronousCommand wcm:action="add"> - <CommandLine>cmd.exe /c wmic useraccount where "name='vagrant'" set PasswordExpires=FALSE</CommandLine> <Order>4</Order> + <CommandLine>%windir%\System32\WindowsPowerShell\v1.0\powershell.exe -Command Set-NetFirewallRule -Name "WINRM-HTTP-In-TCP" -RemoteAddress Any</CommandLine> + <Description>Allows winrm over public profile interfaces</Description> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <Order>5</Order> + <CommandLine>%windir%\System32\cmd.exe /c winrm quickconfig -q</CommandLine> + <Description>winrm quickconfig -q</Description> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <Order>6</Order> + <CommandLine>%windir%\System32\cmd.exe /c winrm quickconfig -transport:http</CommandLine> + <Description>winrm quickconfig -transport:http</Description> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <Order>7</Order> + <CommandLine>%windir%\System32\cmd.exe /c winrm set winrm/config @{MaxTimeoutms="1800000"}</CommandLine> + <Description>Win RM MaxTimoutms</Description> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <Order>8</Order> + <CommandLine>%windir%\System32\cmd.exe /c winrm set winrm/config/winrs @{MaxMemoryPerShellMB="2048"}</CommandLine> + <Description>Win RM MaxMemoryPerShellMB</Description> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <Order>9</Order> + <CommandLine>%windir%\System32\cmd.exe /c winrm set winrm/config/service @{AllowUnencrypted="true"}</CommandLine> + <Description>Win RM AllowUnencrypted</Description> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <Order>10</Order> + <CommandLine>%windir%\System32\cmd.exe /c winrm set winrm/config/service/auth @{Basic="true"}</CommandLine> + <Description>Win RM auth Basic</Description> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <Order>11</Order> + <CommandLine>%windir%\System32\cmd.exe /c winrm set winrm/config/client/auth @{Basic="true"}</CommandLine> + <Description>Win RM client auth Basic</Description> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <Order>12</Order> + <CommandLine>%windir%\System32\cmd.exe /c winrm set winrm/config/listener?Address=*+Transport=HTTP @{Port="5985"}</CommandLine> + <Description>Win RM listener Address/Port</Description> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <Order>13</Order> + <CommandLine>%windir%\System32\cmd.exe /c netsh firewall add portopening TCP 5985 "Port 5985"</CommandLine> + <Description>Win RM port open</Description> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <Order>14</Order> + <CommandLine>%windir%\System32\cmd.exe /c net stop winrm</CommandLine> + <Description>Stop Win RM Service</Description> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <Order>15</Order> + <CommandLine>%windir%\System32\cmd.exe /c sc config winrm start= auto</CommandLine> + <Description>Win RM Autostart</Description> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <Order>16</Order> + <CommandLine>%windir%\System32\cmd.exe /c net start winrm</CommandLine> + <Description>Start Win RM Service</Description> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <Order>17</Order> + <CommandLine>%windir%\System32\cmd.exe /c wmic useraccount where "name='vagrant'" set PasswordExpires=FALSE</CommandLine> <Description>Disable password expiration for vagrant user</Description> </SynchronousCommand> </FirstLogonCommands> </component> + <component name="Microsoft-Windows-WinRE-RecoveryAgent" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> + <UninstallWindowsRE>true</UninstallWindowsRE> + </component> </settings> <settings pass="specialize"> - <component xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" name="Microsoft-Windows-ServerManager-SvrMgrNc" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> - <DoNotOpenServerManagerAtLogon>true</DoNotOpenServerManagerAtLogon> + <component name="Microsoft-Windows-SystemRestore-Main" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> + <DisableSR>1</DisableSR> </component> - <component xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" name="Microsoft-Windows-IE-ESC" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> - <!-- Disable IE ESC. --> - <IEHardenAdmin>false</IEHardenAdmin> - <IEHardenUser>false</IEHardenUser> + <component name="Microsoft-Windows-SystemSettingsThreshold" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> + <DisplayNetworkSelection>false</DisplayNetworkSelection> </component> - <component xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" name="Microsoft-Windows-OutOfBoxExperience" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> - <DoNotOpenInitialConfigurationTasksAtLogon>true</DoNotOpenInitialConfigurationTasksAtLogon> + <component name="Networking-MPSSVC-Svc" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> + <FirewallGroups> + <FirewallGroup wcm:action="add" wcm:keyValue="WindowsRemoteManagement"> + <Active>true</Active> + <Group>Windows Remote Management</Group> + <Profile>all</Profile> + </FirewallGroup> + <FirewallGroup wcm:action="add" wcm:keyValue="RemoteAdministration"> + <Active>true</Active> + <Group>Remote Administration</Group> + <Profile>all</Profile> + </FirewallGroup> + </FirewallGroups> + </component> + <component name="Microsoft-Windows-SQMApi" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> + <CEIPEnabled>0</CEIPEnabled> + </component> + <component name="Microsoft-Windows-Security-SPP-UX" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> + <SkipAutoActivation>true</SkipAutoActivation> + </component> + </settings> + <settings pass="offlineServicing"> + <component name="Microsoft-Windows-LUA-Settings" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> + <EnableLUA>false</EnableLUA> </component> </settings> </unattend> diff --git a/packer_templates/win_answer_files/11/Autounattend.xml b/packer_templates/win_answer_files/11/Autounattend.xml index 1c09214e2..dad87a233 100644 --- a/packer_templates/win_answer_files/11/Autounattend.xml +++ b/packer_templates/win_answer_files/11/Autounattend.xml @@ -1,175 +1,180 @@ <?xml version="1.0" encoding="utf-8"?> -<unattend xmlns="urn:schemas-microsoft-com:unattend"> - <settings pass="windowsPE"> - <component name="Microsoft-Windows-PnpCustomizationsWinPE" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" processorArchitecture="amd64" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State"> - <!-- - This makes the VirtIO drivers available to Windows, assuming that - the VirtIO driver disk at https://fedorapeople.org/groups/virt/virtio-win/direct-downloads/stable-virtio/virtio-win.iso - (see https://docs.fedoraproject.org/en-US/quick-docs/creating-windows-virtual-machines-using-virtio-drivers/index.html#virtio-win-direct-downloads) - is available as drive E: - --> - <DriverPaths> - <PathAndCredentials wcm:action="add" wcm:keyValue="2"> - <Path>E:\viostor\w11\amd64</Path> - </PathAndCredentials> - - <PathAndCredentials wcm:action="add" wcm:keyValue="3"> - <Path>E:\NetKVM\w11\amd64</Path> - </PathAndCredentials> - - <PathAndCredentials wcm:action="add" wcm:keyValue="4"> - <Path>E:\Balloon\w11\amd64</Path> - </PathAndCredentials> - - <PathAndCredentials wcm:action="add" wcm:keyValue="5"> - <Path>E:\pvpanic\w11\amd64</Path> - </PathAndCredentials> - - <PathAndCredentials wcm:action="add" wcm:keyValue="6"> - <Path>E:\qemupciserial\w11\amd64</Path> - </PathAndCredentials> - - <PathAndCredentials wcm:action="add" wcm:keyValue="7"> - <Path>E:\qxldod\w11\amd64</Path> - </PathAndCredentials> - - <PathAndCredentials wcm:action="add" wcm:keyValue="8"> - <Path>E:\vioinput\w11\amd64</Path> - </PathAndCredentials> - - <PathAndCredentials wcm:action="add" wcm:keyValue="9"> - <Path>E:\viorng\w11\amd64</Path> - </PathAndCredentials> - - <PathAndCredentials wcm:action="add" wcm:keyValue="10"> - <Path>E:\vioscsi\w11\amd64</Path> - </PathAndCredentials> - - <PathAndCredentials wcm:action="add" wcm:keyValue="11"> - <Path>E:\vioserial\w11\amd64</Path> - </PathAndCredentials> - - <PathAndCredentials wcm:action="add" wcm:keyValue="12"> - <Path>E:\vioserial\w11\amd64</Path> - </PathAndCredentials> - </DriverPaths> - </component> - <component name="Microsoft-Windows-International-Core-WinPE" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - <SetupUILanguage> - <UILanguage>en-US</UILanguage> - </SetupUILanguage> - <InputLocale>en-US</InputLocale> - <SystemLocale>en-US</SystemLocale> - <UILanguage>en-US</UILanguage> - <UILanguageFallback>en-US</UILanguageFallback> - <UserLocale>en-US</UserLocale> - </component> - <component name="Microsoft-Windows-Setup" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - <DiskConfiguration> - <Disk wcm:action="add"> - <CreatePartitions> - <CreatePartition wcm:action="add"> - <Type>Primary</Type> - <Order>1</Order> - <Size>100</Size> - </CreatePartition> - <CreatePartition wcm:action="add"> - <Order>2</Order> - <Type>Primary</Type> - <Extend>true</Extend> - </CreatePartition> - </CreatePartitions> - <ModifyPartitions> - <ModifyPartition wcm:action="add"> - <Active>true</Active> - <Format>NTFS</Format> - <Label>boot</Label> - <Order>1</Order> - <PartitionID>1</PartitionID> - </ModifyPartition> - <ModifyPartition wcm:action="add"> - <Format>NTFS</Format> - <Label>Windows 11</Label> - <Letter>C</Letter> - <Order>2</Order> - <PartitionID>2</PartitionID> - </ModifyPartition> - </ModifyPartitions> - <DiskID>0</DiskID> - <WillWipeDisk>true</WillWipeDisk> - </Disk> - </DiskConfiguration> - <ImageInstall> - <OSImage> - <InstallFrom> - <MetaData wcm:action="add"> - <Key>/IMAGE/NAME</Key> - <Value>Windows 11 Enterprise Evaluation</Value> - </MetaData> - </InstallFrom> - <InstallTo> - <DiskID>0</DiskID> - <PartitionID>2</PartitionID> - </InstallTo> - </OSImage> - </ImageInstall> - <UserData> - <ProductKey> - <WillShowUI>OnError</WillShowUI> - </ProductKey> - <AcceptEula>true</AcceptEula> - <FullName>Vagrant</FullName> - <Organization>Bento by Chef Software, Inc.</Organization> - </UserData> - </component> - </settings> - <settings pass="generalize"> - <component name="Microsoft-Windows-Security-SPP" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - <SkipRearm>1</SkipRearm> - </component> - <component name="Microsoft-Windows-PnpSysprep" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - <PersistAllDeviceInstalls>false</PersistAllDeviceInstalls> - <DoNotCleanUpNonPresentDevices>false</DoNotCleanUpNonPresentDevices> - </component> - </settings> - <settings pass="oobeSystem"> - <component name="Microsoft-Windows-International-Core" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - <InputLocale>en-US</InputLocale> - <SystemLocale>en-US</SystemLocale> - <UILanguage>en-US</UILanguage> - <UserLocale>en-US</UserLocale> - </component> - <component name="Microsoft-Windows-Shell-Setup" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - <OOBE> - <HideEULAPage>true</HideEULAPage> - <HideLocalAccountScreen>true</HideLocalAccountScreen> - <HideOEMRegistrationScreen>true</HideOEMRegistrationScreen> - <HideOnlineAccountScreens>true</HideOnlineAccountScreens> - <HideWirelessSetupInOOBE>true</HideWirelessSetupInOOBE> - <NetworkLocation>Work</NetworkLocation> - <ProtectYourPC>3</ProtectYourPC> - <SkipMachineOOBE>true</SkipMachineOOBE> - <SkipUserOOBE>true</SkipUserOOBE> - </OOBE> - <TimeZone>UTC</TimeZone> - <UserAccounts> - <AdministratorPassword> - <Value>vagrant</Value> - <PlainText>true</PlainText> - </AdministratorPassword> - <LocalAccounts> - <LocalAccount wcm:action="add"> - <Password> - <Value>vagrant</Value> - <PlainText>true</PlainText> - </Password> - <Description>Vagrant User</Description> - <DisplayName>vagrant</DisplayName> - <Group>administrators</Group> - <Name>vagrant</Name> - </LocalAccount> - </LocalAccounts> - </UserAccounts> +<unattend xmlns="urn:schemas-microsoft-com:unattend" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <settings pass="windowsPE"> + <component name="Microsoft-Windows-PnpCustomizationsWinPE" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" processorArchitecture="amd64"> + <!-- + This makes the VirtIO drivers available to Windows, assuming that + the VirtIO driver disk at https://fedorapeople.org/groups/virt/virtio-win/direct-downloads/stable-virtio/virtio-win.iso + (see https://docs.fedoraproject.org/en-US/quick-docs/creating-windows-virtual-machines-using-virtio-drivers/index.html#virtio-win-direct-downloads) + is available as drive E: + --> + <DriverPaths> + <PathAndCredentials wcm:action="add" wcm:keyValue="2"> + <Path>E:\viostor\w11\amd64</Path> + </PathAndCredentials> + <PathAndCredentials wcm:action="add" wcm:keyValue="3"> + <Path>E:\NetKVM\w11\amd64</Path> + </PathAndCredentials> + <PathAndCredentials wcm:action="add" wcm:keyValue="4"> + <Path>E:\Balloon\w11\amd64</Path> + </PathAndCredentials> + <PathAndCredentials wcm:action="add" wcm:keyValue="5"> + <Path>E:\pvpanic\w11\amd64</Path> + </PathAndCredentials> + <PathAndCredentials wcm:action="add" wcm:keyValue="6"> + <Path>E:\qemupciserial\w11\amd64</Path> + </PathAndCredentials> + <PathAndCredentials wcm:action="add" wcm:keyValue="7"> + <Path>E:\qxldod\w11\amd64</Path> + </PathAndCredentials> + <PathAndCredentials wcm:action="add" wcm:keyValue="8"> + <Path>E:\vioinput\w11\amd64</Path> + </PathAndCredentials> + <PathAndCredentials wcm:action="add" wcm:keyValue="9"> + <Path>E:\viorng\w11\amd64</Path> + </PathAndCredentials> + <PathAndCredentials wcm:action="add" wcm:keyValue="10"> + <Path>E:\vioscsi\w11\amd64</Path> + </PathAndCredentials> + <PathAndCredentials wcm:action="add" wcm:keyValue="11"> + <Path>E:\vioserial\w11\amd64</Path> + </PathAndCredentials> + </DriverPaths> + </component> + <component name="Microsoft-Windows-International-Core-WinPE" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> + <SetupUILanguage> + <UILanguage>en-US</UILanguage> + </SetupUILanguage> + <InputLocale>en-US</InputLocale> + <SystemLocale>en-US</SystemLocale> + <UILanguage>en-US</UILanguage> + <UILanguageFallback>en-US</UILanguageFallback> + <UserLocale>en-US</UserLocale> + </component> + <component name="Microsoft-Windows-Setup" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> + <RunSynchronous> + <RunSynchronousCommand wcm:action="add"> + <Order>1</Order> + <Path>%windir%\System32\reg.exe add "HKLM\SYSTEM\Setup\LabConfig" /v BypassTPMCheck /t REG_DWORD /d 1 /f</Path> + </RunSynchronousCommand> + <RunSynchronousCommand wcm:action="add"> + <Order>2</Order> + <Path>%windir%\System32\reg.exe add "HKLM\SYSTEM\Setup\LabConfig" /v BypassSecureBootCheck /t REG_DWORD /d 1 /f</Path> + </RunSynchronousCommand> + </RunSynchronous> + <DiskConfiguration> + <Disk wcm:action="add"> + <CreatePartitions> + <CreatePartition wcm:action="add"> + <Type>Primary</Type> + <Order>1</Order> + <Size>100</Size> + </CreatePartition> + <CreatePartition wcm:action="add"> + <Order>2</Order> + <Type>Primary</Type> + <Extend>true</Extend> + </CreatePartition> + </CreatePartitions> + <ModifyPartitions> + <ModifyPartition wcm:action="add"> + <Active>true</Active> + <Format>NTFS</Format> + <Label>boot</Label> + <Order>1</Order> + <PartitionID>1</PartitionID> + </ModifyPartition> + <ModifyPartition wcm:action="add"> + <Format>NTFS</Format> + <Label>Windows</Label> + <Letter>C</Letter> + <Order>2</Order> + <PartitionID>2</PartitionID> + </ModifyPartition> + </ModifyPartitions> + <DiskID>0</DiskID> + <WillWipeDisk>true</WillWipeDisk> + </Disk> + </DiskConfiguration> + <ImageInstall> + <OSImage> + <InstallFrom> + <MetaData wcm:action="add"> + <Key>/IMAGE/NAME</Key> + <Value>Windows 11 Enterprise Evaluation</Value> + </MetaData> + </InstallFrom> + <InstallTo> + <DiskID>0</DiskID> + <PartitionID>2</PartitionID> + </InstallTo> + </OSImage> + </ImageInstall> + <UserData> + <ProductKey> + <WillShowUI>OnError</WillShowUI> + </ProductKey> + <AcceptEula>true</AcceptEula> + <FullName>Vagrant</FullName> + <Organization>Bento by Chef Software, Inc.</Organization> + </UserData> + <DynamicUpdate> + <Enable>false</Enable> + </DynamicUpdate> + </component> + </settings> + <settings pass="generalize"> + <component name="Microsoft-Windows-Security-SPP" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> + <SkipRearm>1</SkipRearm> + </component> + <component name="Microsoft-Windows-PnpSysprep" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> + <PersistAllDeviceInstalls>false</PersistAllDeviceInstalls> + <DoNotCleanUpNonPresentDevices>false</DoNotCleanUpNonPresentDevices> + </component> + </settings> + <settings pass="oobeSystem"> + <component name="Microsoft-Windows-International-Core" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> + <InputLocale>en-US</InputLocale> + <SystemLocale>en-US</SystemLocale> + <UILanguage>en-US</UILanguage> + <UserLocale>en-US</UserLocale> + </component> + <component name="Microsoft-Windows-Shell-Setup" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> + <OOBE> + <HideEULAPage>true</HideEULAPage> + <HideLocalAccountScreen>true</HideLocalAccountScreen> + <HideOEMRegistrationScreen>true</HideOEMRegistrationScreen> + <HideOnlineAccountScreens>true</HideOnlineAccountScreens> + <HideWirelessSetupInOOBE>true</HideWirelessSetupInOOBE> + <NetworkLocation>Work</NetworkLocation> + <ProtectYourPC>3</ProtectYourPC> + <SkipMachineOOBE>true</SkipMachineOOBE> + <SkipUserOOBE>true</SkipUserOOBE> + <VMModeOptimizations> + <SkipAdministratorProfileRemoval>true</SkipAdministratorProfileRemoval> + <SkipNotifyUILanguageChange>true</SkipNotifyUILanguageChange> + <SkipWinREInitialization>true</SkipWinREInitialization> + </VMModeOptimizations> + </OOBE> + <TimeZone>UTC</TimeZone> + <UserAccounts> + <AdministratorPassword> + <Value>vagrant</Value> + <PlainText>true</PlainText> + </AdministratorPassword> + <LocalAccounts> + <LocalAccount wcm:action="add"> + <Password> + <Value>vagrant</Value> + <PlainText>true</PlainText> + </Password> + <Description>Vagrant User</Description> + <DisplayName>vagrant</DisplayName> + <Group>administrators</Group> + <Name>vagrant</Name> + </LocalAccount> + </LocalAccounts> + </UserAccounts> <AutoLogon> <Password> <Value>vagrant</Value> @@ -178,44 +183,139 @@ <Username>vagrant</Username> <Enabled>true</Enabled> </AutoLogon> - <FirstLogonCommands> - <SynchronousCommand wcm:action="add"> - <CommandLine>cmd.exe /c powershell -Command "Set-ExecutionPolicy -ExecutionPolicy RemoteSigned -Force"</CommandLine> - <Description>Set Execution Policy 64 Bit</Description> - <Order>1</Order> - <RequiresUserInput>true</RequiresUserInput> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <CommandLine>C:\Windows\SysWOW64\cmd.exe /c powershell -Command "Set-ExecutionPolicy -ExecutionPolicy RemoteSigned -Force"</CommandLine> - <Description>Set Execution Policy 32 Bit</Description> - <Order>2</Order> - <RequiresUserInput>true</RequiresUserInput> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <CommandLine>powershell -NoLogo -ExecutionPolicy RemoteSigned -File a:\base_setup.ps1</CommandLine> - <Description>Configure WinRM so packer can connect to run Chef</Description> - <Order>3</Order> - <RequiresUserInput>false</RequiresUserInput> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <CommandLine>cmd.exe /c wmic useraccount where "name='vagrant'" set PasswordExpires=FALSE</CommandLine> - <Order>4</Order> - <Description>Disable password expiration for vagrant user</Description> - </SynchronousCommand> - </FirstLogonCommands> - </component> - </settings> - <settings pass="specialize"> - <component xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" name="Microsoft-Windows-ServerManager-SvrMgrNc" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> - <DoNotOpenServerManagerAtLogon>true</DoNotOpenServerManagerAtLogon> - </component> - <component xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" name="Microsoft-Windows-IE-ESC" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> - <!-- Disable IE ESC. --> - <IEHardenAdmin>false</IEHardenAdmin> - <IEHardenUser>false</IEHardenUser> - </component> - <component xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" name="Microsoft-Windows-OutOfBoxExperience" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> - <DoNotOpenInitialConfigurationTasksAtLogon>true</DoNotOpenInitialConfigurationTasksAtLogon> - </component> - </settings> + <FirstLogonCommands> + <SynchronousCommand wcm:action="add"> + <CommandLine>%windir%\System32\WindowsPowerShell\v1.0\powershell.exe -Command "Set-ExecutionPolicy -ExecutionPolicy RemoteSigned -Force"</CommandLine> + <Description>Set Execution Policy 64 Bit</Description> + <Order>1</Order> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <CommandLine>%windir%\SysWOW64\cmd.exe /c powershell -Command "Set-ExecutionPolicy -ExecutionPolicy RemoteSigned -Force"</CommandLine> + <Description>Set Execution Policy 32 Bit</Description> + <Order>2</Order> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <Order>3</Order> + <CommandLine>%windir%\System32\WindowsPowerShell\v1.0\powershell.exe -Command Get-NetConnectionProfile | Set-NetConnectionProfile -NetworkCategory "Private"</CommandLine> + <Description>Sets detected network connections to private to allow start of winrm</Description> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <Order>4</Order> + <CommandLine>%windir%\System32\WindowsPowerShell\v1.0\powershell.exe -Command Set-NetFirewallRule -Name "WINRM-HTTP-In-TCP" -RemoteAddress Any</CommandLine> + <Description>Allows winrm over public profile interfaces</Description> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <Order>5</Order> + <CommandLine>%windir%\System32\cmd.exe /c winrm quickconfig -q</CommandLine> + <Description>winrm quickconfig -q</Description> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <Order>6</Order> + <CommandLine>%windir%\System32\cmd.exe /c winrm quickconfig -transport:http</CommandLine> + <Description>winrm quickconfig -transport:http</Description> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <Order>7</Order> + <CommandLine>%windir%\System32\cmd.exe /c winrm set winrm/config @{MaxTimeoutms="1800000"}</CommandLine> + <Description>Win RM MaxTimoutms</Description> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <Order>8</Order> + <CommandLine>%windir%\System32\cmd.exe /c winrm set winrm/config/winrs @{MaxMemoryPerShellMB="2048"}</CommandLine> + <Description>Win RM MaxMemoryPerShellMB</Description> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <Order>9</Order> + <CommandLine>%windir%\System32\cmd.exe /c winrm set winrm/config/service @{AllowUnencrypted="true"}</CommandLine> + <Description>Win RM AllowUnencrypted</Description> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <Order>10</Order> + <CommandLine>%windir%\System32\cmd.exe /c winrm set winrm/config/service/auth @{Basic="true"}</CommandLine> + <Description>Win RM auth Basic</Description> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <Order>11</Order> + <CommandLine>%windir%\System32\cmd.exe /c winrm set winrm/config/client/auth @{Basic="true"}</CommandLine> + <Description>Win RM client auth Basic</Description> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <Order>12</Order> + <CommandLine>%windir%\System32\cmd.exe /c winrm set winrm/config/listener?Address=*+Transport=HTTP @{Port="5985"}</CommandLine> + <Description>Win RM listener Address/Port</Description> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <Order>13</Order> + <CommandLine>%windir%\System32\cmd.exe /c netsh firewall add portopening TCP 5985 "Port 5985"</CommandLine> + <Description>Win RM port open</Description> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <Order>14</Order> + <CommandLine>%windir%\System32\cmd.exe /c net stop winrm</CommandLine> + <Description>Stop Win RM Service</Description> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <Order>15</Order> + <CommandLine>%windir%\System32\cmd.exe /c sc config winrm start= auto</CommandLine> + <Description>Win RM Autostart</Description> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <Order>16</Order> + <CommandLine>%windir%\System32\cmd.exe /c net start winrm</CommandLine> + <Description>Start Win RM Service</Description> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <Order>17</Order> + <CommandLine>%windir%\System32\cmd.exe /c wmic useraccount where "name='vagrant'" set PasswordExpires=FALSE</CommandLine> + <Description>Disable password expiration for vagrant user</Description> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <CommandLine>%SystemRoot%\System32\reg.exe ADD "HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon" /v DefaultPassword /t REG_SZ /d "vagrant" /f</CommandLine> + <Order>18</Order> + <Description>Enable AutoLogon</Description> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <CommandLine>%SystemRoot%\System32\reg.exe ADD "HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon" /v AutoAdminLogon /t REG_SZ /d 1 /f</CommandLine> + <Order>19</Order> + <Description>Enable AutoLogon</Description> + </SynchronousCommand> + </FirstLogonCommands> + </component> + <component name="Microsoft-Windows-WinRE-RecoveryAgent" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> + <UninstallWindowsRE>true</UninstallWindowsRE> + </component> + </settings> + <settings pass="specialize"> + <component name="Microsoft-Windows-SystemRestore-Main" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> + <DisableSR>1</DisableSR> + </component> + <component name="Microsoft-Windows-SystemSettingsThreshold" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> + <DisplayNetworkSelection>false</DisplayNetworkSelection> + </component> + <component name="Networking-MPSSVC-Svc" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> + <FirewallGroups> + <FirewallGroup wcm:action="add" wcm:keyValue="WindowsRemoteManagement"> + <Active>true</Active> + <Group>Windows Remote Management</Group> + <Profile>all</Profile> + </FirewallGroup> + <FirewallGroup wcm:action="add" wcm:keyValue="RemoteAdministration"> + <Active>true</Active> + <Group>Remote Administration</Group> + <Profile>all</Profile> + </FirewallGroup> + </FirewallGroups> + </component> + <component name="Microsoft-Windows-SQMApi" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> + <CEIPEnabled>0</CEIPEnabled> + </component> + <component name="Microsoft-Windows-Security-SPP-UX" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> + <SkipAutoActivation>true</SkipAutoActivation> + </component> + </settings> + <settings pass="offlineServicing"> + <component name="Microsoft-Windows-LUA-Settings" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> + <EnableLUA>false</EnableLUA> + </component> + </settings> </unattend> diff --git a/packer_templates/win_answer_files/11/hyperv-gen2/Autounattend 2.xml b/packer_templates/win_answer_files/11/hyperv-gen2/Autounattend 2.xml new file mode 100644 index 000000000..65a4caaa3 --- /dev/null +++ b/packer_templates/win_answer_files/11/hyperv-gen2/Autounattend 2.xml @@ -0,0 +1,341 @@ +<?xml version="1.0" encoding="utf-8"?> +<unattend xmlns="urn:schemas-microsoft-com:unattend" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <settings pass="windowsPE"> + <component name="Microsoft-Windows-PnpCustomizationsWinPE" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" processorArchitecture="amd64"> + <!-- + This makes the VirtIO drivers available to Windows, assuming that + the VirtIO driver disk at https://fedorapeople.org/groups/virt/virtio-win/direct-downloads/stable-virtio/virtio-win.iso + (see https://docs.fedoraproject.org/en-US/quick-docs/creating-windows-virtual-machines-using-virtio-drivers/index.html#virtio-win-direct-downloads) + is available as drive E: + --> + <DriverPaths> + <PathAndCredentials wcm:action="add" wcm:keyValue="2"> + <Path>F:\viostor\w11\amd64</Path> + </PathAndCredentials> + <PathAndCredentials wcm:action="add" wcm:keyValue="3"> + <Path>F:\NetKVM\w11\amd64</Path> + </PathAndCredentials> + <PathAndCredentials wcm:action="add" wcm:keyValue="4"> + <Path>F:\Balloon\w11\amd64</Path> + </PathAndCredentials> + <PathAndCredentials wcm:action="add" wcm:keyValue="5"> + <Path>F:\pvpanic\w11\amd64</Path> + </PathAndCredentials> + <PathAndCredentials wcm:action="add" wcm:keyValue="6"> + <Path>F:\qemupciserial\w11\amd64</Path> + </PathAndCredentials> + <PathAndCredentials wcm:action="add" wcm:keyValue="7"> + <Path>F:\qxldod\w11\amd64</Path> + </PathAndCredentials> + <PathAndCredentials wcm:action="add" wcm:keyValue="8"> + <Path>F:\vioinput\w11\amd64</Path> + </PathAndCredentials> + <PathAndCredentials wcm:action="add" wcm:keyValue="9"> + <Path>F:\viorng\w11\amd64</Path> + </PathAndCredentials> + <PathAndCredentials wcm:action="add" wcm:keyValue="10"> + <Path>F:\vioscsi\w11\amd64</Path> + </PathAndCredentials> + <PathAndCredentials wcm:action="add" wcm:keyValue="11"> + <Path>F:\vioserial\w11\amd64</Path> + </PathAndCredentials> + </DriverPaths> + </component> + <component name="Microsoft-Windows-International-Core-WinPE" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> + <SetupUILanguage> + <UILanguage>en-US</UILanguage> + </SetupUILanguage> + <InputLocale>en-US</InputLocale> + <SystemLocale>en-US</SystemLocale> + <UILanguage>en-US</UILanguage> + <UILanguageFallback>en-US</UILanguageFallback> + <UserLocale>en-US</UserLocale> + </component> + <component name="Microsoft-Windows-Setup" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> + <RunSynchronous> + <RunSynchronousCommand wcm:action="add"> + <Order>1</Order> + <Path>%windir%\System32\reg.exe add "HKLM\SYSTEM\Setup\LabConfig" /v BypassTPMCheck /t REG_DWORD /d 1 /f</Path> + </RunSynchronousCommand> + <RunSynchronousCommand wcm:action="add"> + <Order>2</Order> + <Path>%windir%\System32\reg.exe add "HKLM\SYSTEM\Setup\LabConfig" /v BypassSecureBootCheck /t REG_DWORD /d 1 /f</Path> + </RunSynchronousCommand> + </RunSynchronous> + <DiskConfiguration> + <Disk wcm:action="add"> + <CreatePartitions> + <CreatePartition wcm:action="add"> + <Order>1</Order> + <Size>350</Size> + <Type>Primary</Type> + </CreatePartition> + <CreatePartition wcm:action="add"> + <Order>2</Order> + <Size>100</Size> + <Type>EFI</Type> + </CreatePartition> + <CreatePartition wcm:action="add"> + <Order>3</Order> + <Size>128</Size> + <Type>MSR</Type> + </CreatePartition> + <CreatePartition wcm:action="add"> + <Order>4</Order> + <Extend>true</Extend> + <Type>Primary</Type> + </CreatePartition> + </CreatePartitions> + <ModifyPartitions> + <ModifyPartition wcm:action="add"> + <Order>1</Order> + <PartitionID>1</PartitionID> + <Label>WINRE</Label> + <Format>NTFS</Format> + <TypeID>de94bba4-06d1-4d40-a16a-bfd50179d6ac</TypeID> + </ModifyPartition> + <ModifyPartition wcm:action="add"> + <Order>2</Order> + <PartitionID>2</PartitionID> + <Label>System</Label> + <Format>FAT32</Format> + </ModifyPartition> + <ModifyPartition wcm:action="add"> + <Order>3</Order> + <PartitionID>3</PartitionID> + </ModifyPartition> + <ModifyPartition wcm:action="add"> + <Order>4</Order> + <PartitionID>4</PartitionID> + <Label>Windows</Label> + <Format>NTFS</Format> + </ModifyPartition> + </ModifyPartitions> + <DiskID>0</DiskID> + <WillWipeDisk>true</WillWipeDisk> + </Disk> + <WillShowUI>OnError</WillShowUI> + </DiskConfiguration> + <ImageInstall> + <OSImage> + <InstallFrom> + <MetaData wcm:action="add"> + <Key>/IMAGE/NAME</Key> + <Value>Windows 11 Enterprise Evaluation</Value> + </MetaData> + </InstallFrom> + <InstallTo> + <DiskID>0</DiskID> + <PartitionID>4</PartitionID> + </InstallTo> + </OSImage> + </ImageInstall> + <UserData> + <ProductKey> + <WillShowUI>OnError</WillShowUI> + </ProductKey> + <AcceptEula>true</AcceptEula> + <FullName>Vagrant</FullName> + <Organization>Bento by Chef Software, Inc.</Organization> + </UserData> + <DynamicUpdate> + <Enable>false</Enable> + </DynamicUpdate> + </component> + </settings> + <settings pass="generalize"> + <component name="Microsoft-Windows-Security-SPP" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> + <SkipRearm>1</SkipRearm> + </component> + <component name="Microsoft-Windows-PnpSysprep" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> + <PersistAllDeviceInstalls>false</PersistAllDeviceInstalls> + <DoNotCleanUpNonPresentDevices>false</DoNotCleanUpNonPresentDevices> + </component> + </settings> + <settings pass="oobeSystem"> + <component name="Microsoft-Windows-International-Core" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> + <InputLocale>en-US</InputLocale> + <SystemLocale>en-US</SystemLocale> + <UILanguage>en-US</UILanguage> + <UserLocale>en-US</UserLocale> + </component> + <component name="Microsoft-Windows-Shell-Setup" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> + <OOBE> + <HideEULAPage>true</HideEULAPage> + <HideLocalAccountScreen>true</HideLocalAccountScreen> + <HideOEMRegistrationScreen>true</HideOEMRegistrationScreen> + <HideOnlineAccountScreens>true</HideOnlineAccountScreens> + <HideWirelessSetupInOOBE>true</HideWirelessSetupInOOBE> + <NetworkLocation>Work</NetworkLocation> + <ProtectYourPC>3</ProtectYourPC> + <SkipMachineOOBE>true</SkipMachineOOBE> + <SkipUserOOBE>true</SkipUserOOBE> + <VMModeOptimizations> + <SkipAdministratorProfileRemoval>true</SkipAdministratorProfileRemoval> + <SkipNotifyUILanguageChange>true</SkipNotifyUILanguageChange> + <SkipWinREInitialization>true</SkipWinREInitialization> + </VMModeOptimizations> + </OOBE> + <TimeZone>UTC</TimeZone> + <UserAccounts> + <AdministratorPassword> + <Value>vagrant</Value> + <PlainText>true</PlainText> + </AdministratorPassword> + <LocalAccounts> + <LocalAccount wcm:action="add"> + <Password> + <Value>vagrant</Value> + <PlainText>true</PlainText> + </Password> + <Description>Vagrant User</Description> + <DisplayName>vagrant</DisplayName> + <Group>administrators</Group> + <Name>vagrant</Name> + </LocalAccount> + </LocalAccounts> + </UserAccounts> + <AutoLogon> + <Password> + <Value>vagrant</Value> + <PlainText>true</PlainText> + </Password> + <Username>vagrant</Username> + <Enabled>true</Enabled> + </AutoLogon> + <FirstLogonCommands> + <SynchronousCommand wcm:action="add"> + <CommandLine>%windir%\System32\WindowsPowerShell\v1.0\powershell.exe -Command "Set-ExecutionPolicy -ExecutionPolicy RemoteSigned -Force"</CommandLine> + <Description>Set Execution Policy 64 Bit</Description> + <Order>1</Order> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <CommandLine>%windir%\SysWOW64\cmd.exe /c powershell -Command "Set-ExecutionPolicy -ExecutionPolicy RemoteSigned -Force"</CommandLine> + <Description>Set Execution Policy 32 Bit</Description> + <Order>2</Order> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <Order>3</Order> + <CommandLine>%windir%\System32\WindowsPowerShell\v1.0\powershell.exe -Command Get-NetConnectionProfile | Set-NetConnectionProfile -NetworkCategory "Private"</CommandLine> + <Description>Sets detected network connections to private to allow start of winrm</Description> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <Order>4</Order> + <CommandLine>%windir%\System32\WindowsPowerShell\v1.0\powershell.exe -Command Set-NetFirewallRule -Name "WINRM-HTTP-In-TCP" -RemoteAddress Any</CommandLine> + <Description>Allows winrm over public profile interfaces</Description> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <Order>5</Order> + <CommandLine>%windir%\System32\cmd.exe /c winrm quickconfig -q</CommandLine> + <Description>winrm quickconfig -q</Description> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <Order>6</Order> + <CommandLine>%windir%\System32\cmd.exe /c winrm quickconfig -transport:http</CommandLine> + <Description>winrm quickconfig -transport:http</Description> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <Order>7</Order> + <CommandLine>%windir%\System32\cmd.exe /c winrm set winrm/config @{MaxTimeoutms="1800000"}</CommandLine> + <Description>Win RM MaxTimoutms</Description> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <Order>8</Order> + <CommandLine>%windir%\System32\cmd.exe /c winrm set winrm/config/winrs @{MaxMemoryPerShellMB="2048"}</CommandLine> + <Description>Win RM MaxMemoryPerShellMB</Description> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <Order>9</Order> + <CommandLine>%windir%\System32\cmd.exe /c winrm set winrm/config/service @{AllowUnencrypted="true"}</CommandLine> + <Description>Win RM AllowUnencrypted</Description> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <Order>10</Order> + <CommandLine>%windir%\System32\cmd.exe /c winrm set winrm/config/service/auth @{Basic="true"}</CommandLine> + <Description>Win RM auth Basic</Description> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <Order>11</Order> + <CommandLine>%windir%\System32\cmd.exe /c winrm set winrm/config/client/auth @{Basic="true"}</CommandLine> + <Description>Win RM client auth Basic</Description> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <Order>12</Order> + <CommandLine>%windir%\System32\cmd.exe /c winrm set winrm/config/listener?Address=*+Transport=HTTP @{Port="5985"}</CommandLine> + <Description>Win RM listener Address/Port</Description> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <Order>13</Order> + <CommandLine>%windir%\System32\cmd.exe /c netsh firewall add portopening TCP 5985 "Port 5985"</CommandLine> + <Description>Win RM port open</Description> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <Order>14</Order> + <CommandLine>%windir%\System32\cmd.exe /c net stop winrm</CommandLine> + <Description>Stop Win RM Service</Description> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <Order>15</Order> + <CommandLine>%windir%\System32\cmd.exe /c sc config winrm start= auto</CommandLine> + <Description>Win RM Autostart</Description> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <Order>16</Order> + <CommandLine>%windir%\System32\cmd.exe /c net start winrm</CommandLine> + <Description>Start Win RM Service</Description> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <Order>17</Order> + <CommandLine>%windir%\System32\cmd.exe /c wmic useraccount where "name='vagrant'" set PasswordExpires=FALSE</CommandLine> + <Description>Disable password expiration for vagrant user</Description> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <CommandLine>%SystemRoot%\System32\reg.exe ADD "HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon" /v DefaultPassword /t REG_SZ /d "vagrant" /f</CommandLine> + <Order>18</Order> + <Description>Enable AutoLogon</Description> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <CommandLine>%SystemRoot%\System32\reg.exe ADD "HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon" /v AutoAdminLogon /t REG_SZ /d 1 /f</CommandLine> + <Order>19</Order> + <Description>Enable AutoLogon</Description> + </SynchronousCommand> + </FirstLogonCommands> + </component> + <component name="Microsoft-Windows-WinRE-RecoveryAgent" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> + <UninstallWindowsRE>true</UninstallWindowsRE> + </component> + </settings> + <settings pass="specialize"> + <component name="Microsoft-Windows-SystemRestore-Main" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> + <DisableSR>1</DisableSR> + </component> + <component name="Microsoft-Windows-SystemSettingsThreshold" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> + <DisplayNetworkSelection>false</DisplayNetworkSelection> + </component> + <component name="Networking-MPSSVC-Svc" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> + <FirewallGroups> + <FirewallGroup wcm:action="add" wcm:keyValue="WindowsRemoteManagement"> + <Active>true</Active> + <Group>Windows Remote Management</Group> + <Profile>all</Profile> + </FirewallGroup> + <FirewallGroup wcm:action="add" wcm:keyValue="RemoteAdministration"> + <Active>true</Active> + <Group>Remote Administration</Group> + <Profile>all</Profile> + </FirewallGroup> + </FirewallGroups> + </component> + <component name="Microsoft-Windows-SQMApi" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> + <CEIPEnabled>0</CEIPEnabled> + </component> + <component name="Microsoft-Windows-Security-SPP-UX" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> + <SkipAutoActivation>true</SkipAutoActivation> + </component> + </settings> + <settings pass="offlineServicing"> + <component name="Microsoft-Windows-LUA-Settings" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> + <EnableLUA>false</EnableLUA> + </component> + </settings> +</unattend> diff --git a/packer_templates/win_answer_files/11/hyperv-gen2/Autounattend.xml b/packer_templates/win_answer_files/11/hyperv-gen2/Autounattend.xml new file mode 100644 index 000000000..65a4caaa3 --- /dev/null +++ b/packer_templates/win_answer_files/11/hyperv-gen2/Autounattend.xml @@ -0,0 +1,341 @@ +<?xml version="1.0" encoding="utf-8"?> +<unattend xmlns="urn:schemas-microsoft-com:unattend" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <settings pass="windowsPE"> + <component name="Microsoft-Windows-PnpCustomizationsWinPE" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" processorArchitecture="amd64"> + <!-- + This makes the VirtIO drivers available to Windows, assuming that + the VirtIO driver disk at https://fedorapeople.org/groups/virt/virtio-win/direct-downloads/stable-virtio/virtio-win.iso + (see https://docs.fedoraproject.org/en-US/quick-docs/creating-windows-virtual-machines-using-virtio-drivers/index.html#virtio-win-direct-downloads) + is available as drive E: + --> + <DriverPaths> + <PathAndCredentials wcm:action="add" wcm:keyValue="2"> + <Path>F:\viostor\w11\amd64</Path> + </PathAndCredentials> + <PathAndCredentials wcm:action="add" wcm:keyValue="3"> + <Path>F:\NetKVM\w11\amd64</Path> + </PathAndCredentials> + <PathAndCredentials wcm:action="add" wcm:keyValue="4"> + <Path>F:\Balloon\w11\amd64</Path> + </PathAndCredentials> + <PathAndCredentials wcm:action="add" wcm:keyValue="5"> + <Path>F:\pvpanic\w11\amd64</Path> + </PathAndCredentials> + <PathAndCredentials wcm:action="add" wcm:keyValue="6"> + <Path>F:\qemupciserial\w11\amd64</Path> + </PathAndCredentials> + <PathAndCredentials wcm:action="add" wcm:keyValue="7"> + <Path>F:\qxldod\w11\amd64</Path> + </PathAndCredentials> + <PathAndCredentials wcm:action="add" wcm:keyValue="8"> + <Path>F:\vioinput\w11\amd64</Path> + </PathAndCredentials> + <PathAndCredentials wcm:action="add" wcm:keyValue="9"> + <Path>F:\viorng\w11\amd64</Path> + </PathAndCredentials> + <PathAndCredentials wcm:action="add" wcm:keyValue="10"> + <Path>F:\vioscsi\w11\amd64</Path> + </PathAndCredentials> + <PathAndCredentials wcm:action="add" wcm:keyValue="11"> + <Path>F:\vioserial\w11\amd64</Path> + </PathAndCredentials> + </DriverPaths> + </component> + <component name="Microsoft-Windows-International-Core-WinPE" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> + <SetupUILanguage> + <UILanguage>en-US</UILanguage> + </SetupUILanguage> + <InputLocale>en-US</InputLocale> + <SystemLocale>en-US</SystemLocale> + <UILanguage>en-US</UILanguage> + <UILanguageFallback>en-US</UILanguageFallback> + <UserLocale>en-US</UserLocale> + </component> + <component name="Microsoft-Windows-Setup" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> + <RunSynchronous> + <RunSynchronousCommand wcm:action="add"> + <Order>1</Order> + <Path>%windir%\System32\reg.exe add "HKLM\SYSTEM\Setup\LabConfig" /v BypassTPMCheck /t REG_DWORD /d 1 /f</Path> + </RunSynchronousCommand> + <RunSynchronousCommand wcm:action="add"> + <Order>2</Order> + <Path>%windir%\System32\reg.exe add "HKLM\SYSTEM\Setup\LabConfig" /v BypassSecureBootCheck /t REG_DWORD /d 1 /f</Path> + </RunSynchronousCommand> + </RunSynchronous> + <DiskConfiguration> + <Disk wcm:action="add"> + <CreatePartitions> + <CreatePartition wcm:action="add"> + <Order>1</Order> + <Size>350</Size> + <Type>Primary</Type> + </CreatePartition> + <CreatePartition wcm:action="add"> + <Order>2</Order> + <Size>100</Size> + <Type>EFI</Type> + </CreatePartition> + <CreatePartition wcm:action="add"> + <Order>3</Order> + <Size>128</Size> + <Type>MSR</Type> + </CreatePartition> + <CreatePartition wcm:action="add"> + <Order>4</Order> + <Extend>true</Extend> + <Type>Primary</Type> + </CreatePartition> + </CreatePartitions> + <ModifyPartitions> + <ModifyPartition wcm:action="add"> + <Order>1</Order> + <PartitionID>1</PartitionID> + <Label>WINRE</Label> + <Format>NTFS</Format> + <TypeID>de94bba4-06d1-4d40-a16a-bfd50179d6ac</TypeID> + </ModifyPartition> + <ModifyPartition wcm:action="add"> + <Order>2</Order> + <PartitionID>2</PartitionID> + <Label>System</Label> + <Format>FAT32</Format> + </ModifyPartition> + <ModifyPartition wcm:action="add"> + <Order>3</Order> + <PartitionID>3</PartitionID> + </ModifyPartition> + <ModifyPartition wcm:action="add"> + <Order>4</Order> + <PartitionID>4</PartitionID> + <Label>Windows</Label> + <Format>NTFS</Format> + </ModifyPartition> + </ModifyPartitions> + <DiskID>0</DiskID> + <WillWipeDisk>true</WillWipeDisk> + </Disk> + <WillShowUI>OnError</WillShowUI> + </DiskConfiguration> + <ImageInstall> + <OSImage> + <InstallFrom> + <MetaData wcm:action="add"> + <Key>/IMAGE/NAME</Key> + <Value>Windows 11 Enterprise Evaluation</Value> + </MetaData> + </InstallFrom> + <InstallTo> + <DiskID>0</DiskID> + <PartitionID>4</PartitionID> + </InstallTo> + </OSImage> + </ImageInstall> + <UserData> + <ProductKey> + <WillShowUI>OnError</WillShowUI> + </ProductKey> + <AcceptEula>true</AcceptEula> + <FullName>Vagrant</FullName> + <Organization>Bento by Chef Software, Inc.</Organization> + </UserData> + <DynamicUpdate> + <Enable>false</Enable> + </DynamicUpdate> + </component> + </settings> + <settings pass="generalize"> + <component name="Microsoft-Windows-Security-SPP" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> + <SkipRearm>1</SkipRearm> + </component> + <component name="Microsoft-Windows-PnpSysprep" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> + <PersistAllDeviceInstalls>false</PersistAllDeviceInstalls> + <DoNotCleanUpNonPresentDevices>false</DoNotCleanUpNonPresentDevices> + </component> + </settings> + <settings pass="oobeSystem"> + <component name="Microsoft-Windows-International-Core" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> + <InputLocale>en-US</InputLocale> + <SystemLocale>en-US</SystemLocale> + <UILanguage>en-US</UILanguage> + <UserLocale>en-US</UserLocale> + </component> + <component name="Microsoft-Windows-Shell-Setup" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> + <OOBE> + <HideEULAPage>true</HideEULAPage> + <HideLocalAccountScreen>true</HideLocalAccountScreen> + <HideOEMRegistrationScreen>true</HideOEMRegistrationScreen> + <HideOnlineAccountScreens>true</HideOnlineAccountScreens> + <HideWirelessSetupInOOBE>true</HideWirelessSetupInOOBE> + <NetworkLocation>Work</NetworkLocation> + <ProtectYourPC>3</ProtectYourPC> + <SkipMachineOOBE>true</SkipMachineOOBE> + <SkipUserOOBE>true</SkipUserOOBE> + <VMModeOptimizations> + <SkipAdministratorProfileRemoval>true</SkipAdministratorProfileRemoval> + <SkipNotifyUILanguageChange>true</SkipNotifyUILanguageChange> + <SkipWinREInitialization>true</SkipWinREInitialization> + </VMModeOptimizations> + </OOBE> + <TimeZone>UTC</TimeZone> + <UserAccounts> + <AdministratorPassword> + <Value>vagrant</Value> + <PlainText>true</PlainText> + </AdministratorPassword> + <LocalAccounts> + <LocalAccount wcm:action="add"> + <Password> + <Value>vagrant</Value> + <PlainText>true</PlainText> + </Password> + <Description>Vagrant User</Description> + <DisplayName>vagrant</DisplayName> + <Group>administrators</Group> + <Name>vagrant</Name> + </LocalAccount> + </LocalAccounts> + </UserAccounts> + <AutoLogon> + <Password> + <Value>vagrant</Value> + <PlainText>true</PlainText> + </Password> + <Username>vagrant</Username> + <Enabled>true</Enabled> + </AutoLogon> + <FirstLogonCommands> + <SynchronousCommand wcm:action="add"> + <CommandLine>%windir%\System32\WindowsPowerShell\v1.0\powershell.exe -Command "Set-ExecutionPolicy -ExecutionPolicy RemoteSigned -Force"</CommandLine> + <Description>Set Execution Policy 64 Bit</Description> + <Order>1</Order> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <CommandLine>%windir%\SysWOW64\cmd.exe /c powershell -Command "Set-ExecutionPolicy -ExecutionPolicy RemoteSigned -Force"</CommandLine> + <Description>Set Execution Policy 32 Bit</Description> + <Order>2</Order> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <Order>3</Order> + <CommandLine>%windir%\System32\WindowsPowerShell\v1.0\powershell.exe -Command Get-NetConnectionProfile | Set-NetConnectionProfile -NetworkCategory "Private"</CommandLine> + <Description>Sets detected network connections to private to allow start of winrm</Description> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <Order>4</Order> + <CommandLine>%windir%\System32\WindowsPowerShell\v1.0\powershell.exe -Command Set-NetFirewallRule -Name "WINRM-HTTP-In-TCP" -RemoteAddress Any</CommandLine> + <Description>Allows winrm over public profile interfaces</Description> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <Order>5</Order> + <CommandLine>%windir%\System32\cmd.exe /c winrm quickconfig -q</CommandLine> + <Description>winrm quickconfig -q</Description> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <Order>6</Order> + <CommandLine>%windir%\System32\cmd.exe /c winrm quickconfig -transport:http</CommandLine> + <Description>winrm quickconfig -transport:http</Description> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <Order>7</Order> + <CommandLine>%windir%\System32\cmd.exe /c winrm set winrm/config @{MaxTimeoutms="1800000"}</CommandLine> + <Description>Win RM MaxTimoutms</Description> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <Order>8</Order> + <CommandLine>%windir%\System32\cmd.exe /c winrm set winrm/config/winrs @{MaxMemoryPerShellMB="2048"}</CommandLine> + <Description>Win RM MaxMemoryPerShellMB</Description> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <Order>9</Order> + <CommandLine>%windir%\System32\cmd.exe /c winrm set winrm/config/service @{AllowUnencrypted="true"}</CommandLine> + <Description>Win RM AllowUnencrypted</Description> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <Order>10</Order> + <CommandLine>%windir%\System32\cmd.exe /c winrm set winrm/config/service/auth @{Basic="true"}</CommandLine> + <Description>Win RM auth Basic</Description> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <Order>11</Order> + <CommandLine>%windir%\System32\cmd.exe /c winrm set winrm/config/client/auth @{Basic="true"}</CommandLine> + <Description>Win RM client auth Basic</Description> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <Order>12</Order> + <CommandLine>%windir%\System32\cmd.exe /c winrm set winrm/config/listener?Address=*+Transport=HTTP @{Port="5985"}</CommandLine> + <Description>Win RM listener Address/Port</Description> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <Order>13</Order> + <CommandLine>%windir%\System32\cmd.exe /c netsh firewall add portopening TCP 5985 "Port 5985"</CommandLine> + <Description>Win RM port open</Description> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <Order>14</Order> + <CommandLine>%windir%\System32\cmd.exe /c net stop winrm</CommandLine> + <Description>Stop Win RM Service</Description> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <Order>15</Order> + <CommandLine>%windir%\System32\cmd.exe /c sc config winrm start= auto</CommandLine> + <Description>Win RM Autostart</Description> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <Order>16</Order> + <CommandLine>%windir%\System32\cmd.exe /c net start winrm</CommandLine> + <Description>Start Win RM Service</Description> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <Order>17</Order> + <CommandLine>%windir%\System32\cmd.exe /c wmic useraccount where "name='vagrant'" set PasswordExpires=FALSE</CommandLine> + <Description>Disable password expiration for vagrant user</Description> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <CommandLine>%SystemRoot%\System32\reg.exe ADD "HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon" /v DefaultPassword /t REG_SZ /d "vagrant" /f</CommandLine> + <Order>18</Order> + <Description>Enable AutoLogon</Description> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <CommandLine>%SystemRoot%\System32\reg.exe ADD "HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon" /v AutoAdminLogon /t REG_SZ /d 1 /f</CommandLine> + <Order>19</Order> + <Description>Enable AutoLogon</Description> + </SynchronousCommand> + </FirstLogonCommands> + </component> + <component name="Microsoft-Windows-WinRE-RecoveryAgent" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> + <UninstallWindowsRE>true</UninstallWindowsRE> + </component> + </settings> + <settings pass="specialize"> + <component name="Microsoft-Windows-SystemRestore-Main" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> + <DisableSR>1</DisableSR> + </component> + <component name="Microsoft-Windows-SystemSettingsThreshold" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> + <DisplayNetworkSelection>false</DisplayNetworkSelection> + </component> + <component name="Networking-MPSSVC-Svc" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> + <FirewallGroups> + <FirewallGroup wcm:action="add" wcm:keyValue="WindowsRemoteManagement"> + <Active>true</Active> + <Group>Windows Remote Management</Group> + <Profile>all</Profile> + </FirewallGroup> + <FirewallGroup wcm:action="add" wcm:keyValue="RemoteAdministration"> + <Active>true</Active> + <Group>Remote Administration</Group> + <Profile>all</Profile> + </FirewallGroup> + </FirewallGroups> + </component> + <component name="Microsoft-Windows-SQMApi" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> + <CEIPEnabled>0</CEIPEnabled> + </component> + <component name="Microsoft-Windows-Security-SPP-UX" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> + <SkipAutoActivation>true</SkipAutoActivation> + </component> + </settings> + <settings pass="offlineServicing"> + <component name="Microsoft-Windows-LUA-Settings" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> + <EnableLUA>false</EnableLUA> + </component> + </settings> +</unattend> diff --git a/packer_templates/win_answer_files/2012/Autounattend.xml b/packer_templates/win_answer_files/2012/Autounattend.xml deleted file mode 100644 index 52937873b..000000000 --- a/packer_templates/win_answer_files/2012/Autounattend.xml +++ /dev/null @@ -1,289 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<unattend xmlns="urn:schemas-microsoft-com:unattend"> - <settings pass="windowsPE"> - <component name="Microsoft-Windows-PnpCustomizationsWinPE" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - <!-- - This makes the VirtIO drivers available to Windows, assuming that - the VirtIO driver disk at https://fedorapeople.org/groups/virt/virtio-win/direct-downloads/stable-virtio/virtio-win.iso - (see https://docs.fedoraproject.org/en-US/quick-docs/creating-windows-virtual-machines-using-virtio-drivers/index.html#virtio-win-direct-downloads) - is available as drive E: - --> - <DriverPaths> - <PathAndCredentials wcm:action="add" wcm:keyValue="2"> - <Path>E:\viostor\2k12\amd64</Path> - </PathAndCredentials> - - <PathAndCredentials wcm:action="add" wcm:keyValue="3"> - <Path>E:\NetKVM\2k12\amd64</Path> - </PathAndCredentials> - - <PathAndCredentials wcm:action="add" wcm:keyValue="4"> - <Path>E:\Balloon\2k12\amd64</Path> - </PathAndCredentials> - - <PathAndCredentials wcm:action="add" wcm:keyValue="5"> - <Path>E:\pvpanic\2k12\amd64</Path> - </PathAndCredentials> - - <PathAndCredentials wcm:action="add" wcm:keyValue="6"> - <Path>E:\qemupciserial\2k12\amd64</Path> - </PathAndCredentials> - - <PathAndCredentials wcm:action="add" wcm:keyValue="7"> - <Path>E:\qxldod\2k12\amd64</Path> - </PathAndCredentials> - - <PathAndCredentials wcm:action="add" wcm:keyValue="8"> - <Path>E:\vioinput\2k12\amd64</Path> - </PathAndCredentials> - - <PathAndCredentials wcm:action="add" wcm:keyValue="9"> - <Path>E:\viorng\2k12\amd64</Path> - </PathAndCredentials> - - <PathAndCredentials wcm:action="add" wcm:keyValue="10"> - <Path>E:\vioscsi\2k12\amd64</Path> - </PathAndCredentials> - - <PathAndCredentials wcm:action="add" wcm:keyValue="11"> - <Path>E:\vioserial\2k12\amd64</Path> - </PathAndCredentials> - </DriverPaths> - </component> - <component name="Microsoft-Windows-International-Core-WinPE" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - <SetupUILanguage> - <UILanguage>en-US</UILanguage> - </SetupUILanguage> - <InputLocale>en-US</InputLocale> - <SystemLocale>en-US</SystemLocale> - <UILanguage>en-US</UILanguage> - <UILanguageFallback>en-US</UILanguageFallback> - <UserLocale>en-US</UserLocale> - </component> - <component name="Microsoft-Windows-Setup" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - <DiskConfiguration> - <Disk wcm:action="add"> - <CreatePartitions> - <CreatePartition wcm:action="add"> - <Type>Primary</Type> - <Order>1</Order> - <Size>350</Size> - </CreatePartition> - <CreatePartition wcm:action="add"> - <Order>2</Order> - <Type>Primary</Type> - <Extend>true</Extend> - </CreatePartition> - </CreatePartitions> - <ModifyPartitions> - <ModifyPartition wcm:action="add"> - <Active>true</Active> - <Format>NTFS</Format> - <Label>boot</Label> - <Order>1</Order> - <PartitionID>1</PartitionID> - </ModifyPartition> - <ModifyPartition wcm:action="add"> - <Format>NTFS</Format> - <Label>Windows 2012</Label> - <Letter>C</Letter> - <Order>2</Order> - <PartitionID>2</PartitionID> - </ModifyPartition> - </ModifyPartitions> - <DiskID>0</DiskID> - <WillWipeDisk>true</WillWipeDisk> - </Disk> - </DiskConfiguration> - <ImageInstall> - <OSImage> - <InstallFrom> - <MetaData wcm:action="add"> - <Key>/IMAGE/NAME</Key> - <Value>Windows Server 2012 SERVERSTANDARD</Value> - </MetaData> - </InstallFrom> - <InstallTo> - <DiskID>0</DiskID> - <PartitionID>2</PartitionID> - </InstallTo> - </OSImage> - </ImageInstall> - <UserData> - <ProductKey> - <WillShowUI>OnError</WillShowUI> - </ProductKey> - <AcceptEula>true</AcceptEula> - <FullName>Vagrant</FullName> - <Organization>Bento by Chef Software, Inc.</Organization> - </UserData> - </component> - </settings> - <settings pass="generalize"> - <component name="Microsoft-Windows-Security-SPP" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - <SkipRearm>1</SkipRearm> - </component> - <component name="Microsoft-Windows-PnpSysprep" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - <PersistAllDeviceInstalls>false</PersistAllDeviceInstalls> - <DoNotCleanUpNonPresentDevices>false</DoNotCleanUpNonPresentDevices> - </component> - </settings> - <settings pass="oobeSystem"> - <component name="Microsoft-Windows-International-Core" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - <InputLocale>en-US</InputLocale> - <SystemLocale>en-US</SystemLocale> - <UILanguage>en-US</UILanguage> - <UserLocale>en-US</UserLocale> - </component> - <component name="Microsoft-Windows-Shell-Setup" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - <OOBE> - <HideEULAPage>true</HideEULAPage> - <HideLocalAccountScreen>true</HideLocalAccountScreen> - <HideOEMRegistrationScreen>true</HideOEMRegistrationScreen> - <HideOnlineAccountScreens>true</HideOnlineAccountScreens> - <HideWirelessSetupInOOBE>true</HideWirelessSetupInOOBE> - <NetworkLocation>Home</NetworkLocation> - <ProtectYourPC>3</ProtectYourPC> - <SkipMachineOOBE>true</SkipMachineOOBE> - <SkipUserOOBE>true</SkipUserOOBE> - </OOBE> - <TimeZone>UTC</TimeZone> - <UserAccounts> - <AdministratorPassword> - <Value>vagrant</Value> - <PlainText>true</PlainText> - </AdministratorPassword> - <LocalAccounts> - <LocalAccount wcm:action="add"> - <Password> - <Value>vagrant</Value> - <PlainText>true</PlainText> - </Password> - <Description>Vagrant User</Description> - <DisplayName>vagrant</DisplayName> - <Group>administrators</Group> - <Name>vagrant</Name> - </LocalAccount> - </LocalAccounts> - </UserAccounts> - <AutoLogon> - <Password> - <Value>vagrant</Value> - <PlainText>true</PlainText> - </Password> - <Username>vagrant</Username> - <Enabled>true</Enabled> - </AutoLogon> - <FirstLogonCommands> - <SynchronousCommand wcm:action="add"> - <CommandLine>cmd.exe /c powershell -Command "Set-ExecutionPolicy -ExecutionPolicy RemoteSigned -Force"</CommandLine> - <Description>Set Execution Policy 64 Bit</Description> - <Order>1</Order> - <RequiresUserInput>true</RequiresUserInput> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <CommandLine>C:\Windows\SysWOW64\cmd.exe /c powershell -Command "Set-ExecutionPolicy -ExecutionPolicy RemoteSigned -Force"</CommandLine> - <Description>Set Execution Policy 32 Bit</Description> - <Order>2</Order> - <RequiresUserInput>true</RequiresUserInput> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <CommandLine>cmd.exe /c winrm quickconfig -q</CommandLine> - <Description>winrm quickconfig -q</Description> - <Order>3</Order> - <RequiresUserInput>true</RequiresUserInput> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <CommandLine>cmd.exe /c winrm quickconfig -transport:http</CommandLine> - <Description>winrm quickconfig -transport:http</Description> - <Order>4</Order> - <RequiresUserInput>true</RequiresUserInput> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <CommandLine>cmd.exe /c winrm set winrm/config @{MaxTimeoutms="1800000"}</CommandLine> - <Description>Win RM MaxTimoutms</Description> - <Order>5</Order> - <RequiresUserInput>true</RequiresUserInput> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <CommandLine>cmd.exe /c winrm set winrm/config/winrs @{MaxMemoryPerShellMB="800"}</CommandLine> - <Description>Win RM MaxMemoryPerShellMB</Description> - <Order>6</Order> - <RequiresUserInput>true</RequiresUserInput> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <CommandLine>cmd.exe /c winrm set winrm/config/service @{AllowUnencrypted="true"}</CommandLine> - <Description>Win RM AllowUnencrypted</Description> - <Order>7</Order> - <RequiresUserInput>true</RequiresUserInput> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <CommandLine>cmd.exe /c winrm set winrm/config/service/auth @{Basic="true"}</CommandLine> - <Description>Win RM auth Basic</Description> - <Order>8</Order> - <RequiresUserInput>true</RequiresUserInput> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <CommandLine>cmd.exe /c winrm set winrm/config/client/auth @{Basic="true"}</CommandLine> - <Description>Win RM client auth Basic</Description> - <Order>9</Order> - <RequiresUserInput>true</RequiresUserInput> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <CommandLine>cmd.exe /c winrm set winrm/config/listener?Address=*+Transport=HTTP @{Port="5985"} </CommandLine> - <Description>Win RM listener Address/Port</Description> - <Order>10</Order> - <RequiresUserInput>true</RequiresUserInput> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <CommandLine>cmd.exe /c netsh advfirewall firewall set rule group="remote administration" new enable=yes </CommandLine> - <Description>Win RM adv firewall enable</Description> - <Order>11</Order> - <RequiresUserInput>true</RequiresUserInput> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <CommandLine>cmd.exe /c netsh firewall add portopening TCP 5985 "Port 5985" </CommandLine> - <Description>Win RM port open</Description> - <Order>12</Order> - <RequiresUserInput>true</RequiresUserInput> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <CommandLine>cmd.exe /c net stop winrm </CommandLine> - <Description>Stop Win RM Service </Description> - <Order>13</Order> - <RequiresUserInput>true</RequiresUserInput> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <CommandLine>cmd.exe /c sc config winrm start= auto</CommandLine> - <Description>Win RM Autostart</Description> - <Order>14</Order> - <RequiresUserInput>true</RequiresUserInput> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <CommandLine>cmd.exe /c net start winrm</CommandLine> - <Description>Start Win RM Service</Description> - <Order>15</Order> - <RequiresUserInput>true</RequiresUserInput> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <CommandLine>cmd.exe /c wmic useraccount where "name='vagrant'" set PasswordExpires=FALSE</CommandLine> - <Order>16</Order> - <Description>Disable password expiration for vagrant user</Description> - </SynchronousCommand> - </FirstLogonCommands> - </component> - </settings> - <settings pass="specialize"> - <component xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" name="Microsoft-Windows-ServerManager-SvrMgrNc" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> - <DoNotOpenServerManagerAtLogon>true</DoNotOpenServerManagerAtLogon> - </component> - <component xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" name="Microsoft-Windows-IE-ESC" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> - <!-- Disable IE ESC. --> - <IEHardenAdmin>false</IEHardenAdmin> - <IEHardenUser>false</IEHardenUser> - </component> - <component xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" name="Microsoft-Windows-OutOfBoxExperience" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> - <DoNotOpenInitialConfigurationTasksAtLogon>true</DoNotOpenInitialConfigurationTasksAtLogon> - </component> - </settings> -</unattend> diff --git a/packer_templates/win_answer_files/2012r2/Autounattend.xml b/packer_templates/win_answer_files/2012r2/Autounattend.xml deleted file mode 100644 index 4c020b308..000000000 --- a/packer_templates/win_answer_files/2012r2/Autounattend.xml +++ /dev/null @@ -1,289 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<unattend xmlns="urn:schemas-microsoft-com:unattend"> - <settings pass="windowsPE"> - <component name="Microsoft-Windows-PnpCustomizationsWinPE" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - <!-- - This makes the VirtIO drivers available to Windows, assuming that - the VirtIO driver disk at https://fedorapeople.org/groups/virt/virtio-win/direct-downloads/stable-virtio/virtio-win.iso - (see https://docs.fedoraproject.org/en-US/quick-docs/creating-windows-virtual-machines-using-virtio-drivers/index.html#virtio-win-direct-downloads) - is available as drive E: - --> - <DriverPaths> - <PathAndCredentials wcm:action="add" wcm:keyValue="2"> - <Path>E:\viostor\2k12R2\amd64</Path> - </PathAndCredentials> - - <PathAndCredentials wcm:action="add" wcm:keyValue="3"> - <Path>E:\NetKVM\2k12R2\amd64</Path> - </PathAndCredentials> - - <PathAndCredentials wcm:action="add" wcm:keyValue="4"> - <Path>E:\Balloon\2k12R2\amd64</Path> - </PathAndCredentials> - - <PathAndCredentials wcm:action="add" wcm:keyValue="5"> - <Path>E:\pvpanic\2k12R2\amd64</Path> - </PathAndCredentials> - - <PathAndCredentials wcm:action="add" wcm:keyValue="6"> - <Path>E:\qemupciserial\2k12R2\amd64</Path> - </PathAndCredentials> - - <PathAndCredentials wcm:action="add" wcm:keyValue="7"> - <Path>E:\qxldod\2k12R2\amd64</Path> - </PathAndCredentials> - - <PathAndCredentials wcm:action="add" wcm:keyValue="8"> - <Path>E:\vioinput\2k12R2\amd64</Path> - </PathAndCredentials> - - <PathAndCredentials wcm:action="add" wcm:keyValue="9"> - <Path>E:\viorng\2k12R2\amd64</Path> - </PathAndCredentials> - - <PathAndCredentials wcm:action="add" wcm:keyValue="10"> - <Path>E:\vioscsi\2k12R2\amd64</Path> - </PathAndCredentials> - - <PathAndCredentials wcm:action="add" wcm:keyValue="11"> - <Path>E:\vioserial\2k12R2\amd64</Path> - </PathAndCredentials> - </DriverPaths> - </component> - <component name="Microsoft-Windows-International-Core-WinPE" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - <SetupUILanguage> - <UILanguage>en-US</UILanguage> - </SetupUILanguage> - <InputLocale>en-US</InputLocale> - <SystemLocale>en-US</SystemLocale> - <UILanguage>en-US</UILanguage> - <UILanguageFallback>en-US</UILanguageFallback> - <UserLocale>en-US</UserLocale> - </component> - <component name="Microsoft-Windows-Setup" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - <DiskConfiguration> - <Disk wcm:action="add"> - <CreatePartitions> - <CreatePartition wcm:action="add"> - <Type>Primary</Type> - <Order>1</Order> - <Size>350</Size> - </CreatePartition> - <CreatePartition wcm:action="add"> - <Order>2</Order> - <Type>Primary</Type> - <Extend>true</Extend> - </CreatePartition> - </CreatePartitions> - <ModifyPartitions> - <ModifyPartition wcm:action="add"> - <Active>true</Active> - <Format>NTFS</Format> - <Label>boot</Label> - <Order>1</Order> - <PartitionID>1</PartitionID> - </ModifyPartition> - <ModifyPartition wcm:action="add"> - <Format>NTFS</Format> - <Label>Windows 2012 R2</Label> - <Letter>C</Letter> - <Order>2</Order> - <PartitionID>2</PartitionID> - </ModifyPartition> - </ModifyPartitions> - <DiskID>0</DiskID> - <WillWipeDisk>true</WillWipeDisk> - </Disk> - </DiskConfiguration> - <ImageInstall> - <OSImage> - <InstallFrom> - <MetaData wcm:action="add"> - <Key>/IMAGE/NAME</Key> - <Value>Windows Server 2012 R2 SERVERSTANDARD</Value> - </MetaData> - </InstallFrom> - <InstallTo> - <DiskID>0</DiskID> - <PartitionID>2</PartitionID> - </InstallTo> - </OSImage> - </ImageInstall> - <UserData> - <ProductKey> - <WillShowUI>OnError</WillShowUI> - </ProductKey> - <AcceptEula>true</AcceptEula> - <FullName>Vagrant</FullName> - <Organization>Bento by Chef Software, Inc.</Organization> - </UserData> - </component> - </settings> - <settings pass="generalize"> - <component name="Microsoft-Windows-Security-SPP" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - <SkipRearm>1</SkipRearm> - </component> - <component name="Microsoft-Windows-PnpSysprep" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - <PersistAllDeviceInstalls>false</PersistAllDeviceInstalls> - <DoNotCleanUpNonPresentDevices>false</DoNotCleanUpNonPresentDevices> - </component> - </settings> - <settings pass="oobeSystem"> - <component name="Microsoft-Windows-International-Core" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - <InputLocale>en-US</InputLocale> - <SystemLocale>en-US</SystemLocale> - <UILanguage>en-US</UILanguage> - <UserLocale>en-US</UserLocale> - </component> - <component name="Microsoft-Windows-Shell-Setup" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - <OOBE> - <HideEULAPage>true</HideEULAPage> - <HideLocalAccountScreen>true</HideLocalAccountScreen> - <HideOEMRegistrationScreen>true</HideOEMRegistrationScreen> - <HideOnlineAccountScreens>true</HideOnlineAccountScreens> - <HideWirelessSetupInOOBE>true</HideWirelessSetupInOOBE> - <NetworkLocation>Home</NetworkLocation> - <ProtectYourPC>3</ProtectYourPC> - <SkipMachineOOBE>true</SkipMachineOOBE> - <SkipUserOOBE>true</SkipUserOOBE> - </OOBE> - <TimeZone>UTC</TimeZone> - <UserAccounts> - <AdministratorPassword> - <Value>vagrant</Value> - <PlainText>true</PlainText> - </AdministratorPassword> - <LocalAccounts> - <LocalAccount wcm:action="add"> - <Password> - <Value>vagrant</Value> - <PlainText>true</PlainText> - </Password> - <Description>Vagrant User</Description> - <DisplayName>vagrant</DisplayName> - <Group>administrators</Group> - <Name>vagrant</Name> - </LocalAccount> - </LocalAccounts> - </UserAccounts> - <AutoLogon> - <Password> - <Value>vagrant</Value> - <PlainText>true</PlainText> - </Password> - <Username>vagrant</Username> - <Enabled>true</Enabled> - </AutoLogon> - <FirstLogonCommands> - <SynchronousCommand wcm:action="add"> - <CommandLine>cmd.exe /c powershell -Command "Set-ExecutionPolicy -ExecutionPolicy RemoteSigned -Force"</CommandLine> - <Description>Set Execution Policy 64 Bit</Description> - <Order>1</Order> - <RequiresUserInput>true</RequiresUserInput> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <CommandLine>C:\Windows\SysWOW64\cmd.exe /c powershell -Command "Set-ExecutionPolicy -ExecutionPolicy RemoteSigned -Force"</CommandLine> - <Description>Set Execution Policy 32 Bit</Description> - <Order>2</Order> - <RequiresUserInput>true</RequiresUserInput> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <CommandLine>cmd.exe /c winrm quickconfig -q</CommandLine> - <Description>winrm quickconfig -q</Description> - <Order>3</Order> - <RequiresUserInput>true</RequiresUserInput> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <CommandLine>cmd.exe /c winrm quickconfig -transport:http</CommandLine> - <Description>winrm quickconfig -transport:http</Description> - <Order>4</Order> - <RequiresUserInput>true</RequiresUserInput> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <CommandLine>cmd.exe /c winrm set winrm/config @{MaxTimeoutms="1800000"}</CommandLine> - <Description>Win RM MaxTimoutms</Description> - <Order>5</Order> - <RequiresUserInput>true</RequiresUserInput> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <CommandLine>cmd.exe /c winrm set winrm/config/winrs @{MaxMemoryPerShellMB="800"}</CommandLine> - <Description>Win RM MaxMemoryPerShellMB</Description> - <Order>6</Order> - <RequiresUserInput>true</RequiresUserInput> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <CommandLine>cmd.exe /c winrm set winrm/config/service @{AllowUnencrypted="true"}</CommandLine> - <Description>Win RM AllowUnencrypted</Description> - <Order>7</Order> - <RequiresUserInput>true</RequiresUserInput> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <CommandLine>cmd.exe /c winrm set winrm/config/service/auth @{Basic="true"}</CommandLine> - <Description>Win RM auth Basic</Description> - <Order>8</Order> - <RequiresUserInput>true</RequiresUserInput> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <CommandLine>cmd.exe /c winrm set winrm/config/client/auth @{Basic="true"}</CommandLine> - <Description>Win RM client auth Basic</Description> - <Order>9</Order> - <RequiresUserInput>true</RequiresUserInput> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <CommandLine>cmd.exe /c winrm set winrm/config/listener?Address=*+Transport=HTTP @{Port="5985"} </CommandLine> - <Description>Win RM listener Address/Port</Description> - <Order>10</Order> - <RequiresUserInput>true</RequiresUserInput> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <CommandLine>cmd.exe /c netsh advfirewall firewall set rule group="remote administration" new enable=yes </CommandLine> - <Description>Win RM adv firewall enable</Description> - <Order>11</Order> - <RequiresUserInput>true</RequiresUserInput> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <CommandLine>cmd.exe /c netsh firewall add portopening TCP 5985 "Port 5985" </CommandLine> - <Description>Win RM port open</Description> - <Order>12</Order> - <RequiresUserInput>true</RequiresUserInput> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <CommandLine>cmd.exe /c net stop winrm </CommandLine> - <Description>Stop Win RM Service </Description> - <Order>13</Order> - <RequiresUserInput>true</RequiresUserInput> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <CommandLine>cmd.exe /c sc config winrm start= auto</CommandLine> - <Description>Win RM Autostart</Description> - <Order>14</Order> - <RequiresUserInput>true</RequiresUserInput> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <CommandLine>cmd.exe /c net start winrm</CommandLine> - <Description>Start Win RM Service</Description> - <Order>15</Order> - <RequiresUserInput>true</RequiresUserInput> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <CommandLine>cmd.exe /c wmic useraccount where "name='vagrant'" set PasswordExpires=FALSE</CommandLine> - <Order>16</Order> - <Description>Disable password expiration for vagrant user</Description> - </SynchronousCommand> - </FirstLogonCommands> - </component> - </settings> - <settings pass="specialize"> - <component xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" name="Microsoft-Windows-ServerManager-SvrMgrNc" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> - <DoNotOpenServerManagerAtLogon>true</DoNotOpenServerManagerAtLogon> - </component> - <component xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" name="Microsoft-Windows-IE-ESC" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> - <!-- Disable IE ESC. --> - <IEHardenAdmin>false</IEHardenAdmin> - <IEHardenUser>false</IEHardenUser> - </component> - <component xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" name="Microsoft-Windows-OutOfBoxExperience" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> - <DoNotOpenInitialConfigurationTasksAtLogon>true</DoNotOpenInitialConfigurationTasksAtLogon> - </component> - </settings> -</unattend> diff --git a/packer_templates/win_answer_files/2016/Autounattend.xml b/packer_templates/win_answer_files/2016/Autounattend.xml index 7b2f80ba8..f58062063 100644 --- a/packer_templates/win_answer_files/2016/Autounattend.xml +++ b/packer_templates/win_answer_files/2016/Autounattend.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> -<unattend xmlns="urn:schemas-microsoft-com:unattend"> +<unattend xmlns="urn:schemas-microsoft-com:unattend" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> <settings pass="windowsPE"> - <component name="Microsoft-Windows-PnpCustomizationsWinPE" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" processorArchitecture="amd64" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State"> + <component name="Microsoft-Windows-PnpCustomizationsWinPE" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" processorArchitecture="amd64"> <!-- This makes the VirtIO drivers available to Windows, assuming that the VirtIO driver disk at https://fedorapeople.org/groups/virt/virtio-win/direct-downloads/stable-virtio/virtio-win.iso @@ -12,45 +12,36 @@ <PathAndCredentials wcm:action="add" wcm:keyValue="2"> <Path>E:\viostor\2k16\amd64</Path> </PathAndCredentials> - <PathAndCredentials wcm:action="add" wcm:keyValue="3"> <Path>E:\NetKVM\2k16\amd64</Path> </PathAndCredentials> - <PathAndCredentials wcm:action="add" wcm:keyValue="4"> <Path>E:\Balloon\2k16\amd64</Path> </PathAndCredentials> - <PathAndCredentials wcm:action="add" wcm:keyValue="5"> <Path>E:\pvpanic\2k16\amd64</Path> </PathAndCredentials> - <PathAndCredentials wcm:action="add" wcm:keyValue="6"> <Path>E:\qemupciserial\2k16\amd64</Path> </PathAndCredentials> - <PathAndCredentials wcm:action="add" wcm:keyValue="7"> <Path>E:\qxldod\2k16\amd64</Path> </PathAndCredentials> - <PathAndCredentials wcm:action="add" wcm:keyValue="8"> <Path>E:\vioinput\2k16\amd64</Path> </PathAndCredentials> - <PathAndCredentials wcm:action="add" wcm:keyValue="9"> <Path>E:\viorng\2k16\amd64</Path> </PathAndCredentials> - <PathAndCredentials wcm:action="add" wcm:keyValue="10"> <Path>E:\vioscsi\2k16\amd64</Path> </PathAndCredentials> - <PathAndCredentials wcm:action="add" wcm:keyValue="11"> <Path>E:\vioserial\2k16\amd64</Path> </PathAndCredentials> </DriverPaths> </component> - <component name="Microsoft-Windows-International-Core-WinPE" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <component name="Microsoft-Windows-International-Core-WinPE" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> <SetupUILanguage> <UILanguage>en-US</UILanguage> </SetupUILanguage> @@ -60,14 +51,14 @@ <UILanguageFallback>en-US</UILanguageFallback> <UserLocale>en-US</UserLocale> </component> - <component name="Microsoft-Windows-Setup" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <component name="Microsoft-Windows-Setup" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> <DiskConfiguration> <Disk wcm:action="add"> <CreatePartitions> <CreatePartition wcm:action="add"> <Type>Primary</Type> <Order>1</Order> - <Size>350</Size> + <Size>100</Size> </CreatePartition> <CreatePartition wcm:action="add"> <Order>2</Order> @@ -85,7 +76,7 @@ </ModifyPartition> <ModifyPartition wcm:action="add"> <Format>NTFS</Format> - <Label>Windows 2016</Label> + <Label>Windows</Label> <Letter>C</Letter> <Order>2</Order> <PartitionID>2</PartitionID> @@ -100,7 +91,7 @@ <InstallFrom> <MetaData wcm:action="add"> <Key>/IMAGE/NAME</Key> - <Value>Windows Server 2016 SERVERDATACENTER</Value> + <Value>Windows Server 2016 SERVERSTANDARD</Value> </MetaData> </InstallFrom> <InstallTo> @@ -117,55 +108,63 @@ <FullName>Vagrant</FullName> <Organization>Bento by Chef Software, Inc.</Organization> </UserData> + <DynamicUpdate> + <Enable>false</Enable> + </DynamicUpdate> </component> </settings> - <settings pass="generalize"> - <component name="Microsoft-Windows-Security-SPP" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - <SkipRearm>1</SkipRearm> - </component> - <component name="Microsoft-Windows-PnpSysprep" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - <PersistAllDeviceInstalls>false</PersistAllDeviceInstalls> - <DoNotCleanUpNonPresentDevices>false</DoNotCleanUpNonPresentDevices> - </component> - </settings> - <settings pass="oobeSystem"> - <component name="Microsoft-Windows-International-Core" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - <InputLocale>en-US</InputLocale> - <SystemLocale>en-US</SystemLocale> - <UILanguage>en-US</UILanguage> - <UserLocale>en-US</UserLocale> - </component> - <component name="Microsoft-Windows-Shell-Setup" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <settings pass="generalize"> + <component name="Microsoft-Windows-Security-SPP" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> + <SkipRearm>1</SkipRearm> + </component> + <component name="Microsoft-Windows-PnpSysprep" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> + <PersistAllDeviceInstalls>false</PersistAllDeviceInstalls> + <DoNotCleanUpNonPresentDevices>false</DoNotCleanUpNonPresentDevices> + </component> + </settings> + <settings pass="oobeSystem"> + <component name="Microsoft-Windows-International-Core" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> + <InputLocale>en-US</InputLocale> + <SystemLocale>en-US</SystemLocale> + <UILanguage>en-US</UILanguage> + <UserLocale>en-US</UserLocale> + </component> + <component name="Microsoft-Windows-Shell-Setup" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> <OOBE> <HideEULAPage>true</HideEULAPage> <HideLocalAccountScreen>true</HideLocalAccountScreen> <HideOEMRegistrationScreen>true</HideOEMRegistrationScreen> <HideOnlineAccountScreens>true</HideOnlineAccountScreens> <HideWirelessSetupInOOBE>true</HideWirelessSetupInOOBE> - <NetworkLocation>Home</NetworkLocation> + <NetworkLocation>Work</NetworkLocation> <ProtectYourPC>3</ProtectYourPC> <SkipMachineOOBE>true</SkipMachineOOBE> <SkipUserOOBE>true</SkipUserOOBE> + <VMModeOptimizations> + <SkipAdministratorProfileRemoval>true</SkipAdministratorProfileRemoval> + <SkipNotifyUILanguageChange>true</SkipNotifyUILanguageChange> + <SkipWinREInitialization>true</SkipWinREInitialization> + </VMModeOptimizations> </OOBE> - <TimeZone>UTC</TimeZone> - <UserAccounts> - <AdministratorPassword> - <Value>vagrant</Value> - <PlainText>true</PlainText> - </AdministratorPassword> - <LocalAccounts> - <LocalAccount wcm:action="add"> - <Password> - <Value>vagrant</Value> - <PlainText>true</PlainText> - </Password> - <Description>Vagrant User</Description> - <DisplayName>vagrant</DisplayName> - <Group>administrators</Group> - <Name>vagrant</Name> - </LocalAccount> - </LocalAccounts> - </UserAccounts> + <TimeZone>UTC</TimeZone> + <UserAccounts> + <AdministratorPassword> + <Value>vagrant</Value> + <PlainText>true</PlainText> + </AdministratorPassword> + <LocalAccounts> + <LocalAccount wcm:action="add"> + <Password> + <Value>vagrant</Value> + <PlainText>true</PlainText> + </Password> + <Description>Vagrant User</Description> + <DisplayName>vagrant</DisplayName> + <Group>administrators</Group> + <Name>vagrant</Name> + </LocalAccount> + </LocalAccounts> + </UserAccounts> <AutoLogon> <Password> <Value>vagrant</Value> @@ -174,105 +173,98 @@ <Username>vagrant</Username> <Enabled>true</Enabled> </AutoLogon> - <FirstLogonCommands> - <SynchronousCommand wcm:action="add"> - <CommandLine>cmd.exe /c powershell -Command "Set-ExecutionPolicy -ExecutionPolicy RemoteSigned -Force"</CommandLine> - <Description>Set Execution Policy 64 Bit</Description> - <Order>1</Order> - <RequiresUserInput>true</RequiresUserInput> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <CommandLine>C:\Windows\SysWOW64\cmd.exe /c powershell -Command "Set-ExecutionPolicy -ExecutionPolicy RemoteSigned -Force"</CommandLine> - <Description>Set Execution Policy 32 Bit</Description> - <Order>2</Order> - <RequiresUserInput>true</RequiresUserInput> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <CommandLine>cmd.exe /c winrm quickconfig -q</CommandLine> - <Description>winrm quickconfig -q</Description> - <Order>3</Order> - <RequiresUserInput>true</RequiresUserInput> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <CommandLine>cmd.exe /c winrm quickconfig -transport:http</CommandLine> - <Description>winrm quickconfig -transport:http</Description> - <Order>4</Order> - <RequiresUserInput>true</RequiresUserInput> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <CommandLine>cmd.exe /c winrm set winrm/config @{MaxTimeoutms="1800000"}</CommandLine> - <Description>Win RM MaxTimoutms</Description> - <Order>5</Order> - <RequiresUserInput>true</RequiresUserInput> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <CommandLine>cmd.exe /c winrm set winrm/config/winrs @{MaxMemoryPerShellMB="800"}</CommandLine> - <Description>Win RM MaxMemoryPerShellMB</Description> - <Order>6</Order> - <RequiresUserInput>true</RequiresUserInput> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <CommandLine>cmd.exe /c winrm set winrm/config/service @{AllowUnencrypted="true"}</CommandLine> - <Description>Win RM AllowUnencrypted</Description> - <Order>7</Order> - <RequiresUserInput>true</RequiresUserInput> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <CommandLine>cmd.exe /c winrm set winrm/config/service/auth @{Basic="true"}</CommandLine> - <Description>Win RM auth Basic</Description> - <Order>8</Order> - <RequiresUserInput>true</RequiresUserInput> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <CommandLine>cmd.exe /c winrm set winrm/config/client/auth @{Basic="true"}</CommandLine> - <Description>Win RM client auth Basic</Description> - <Order>9</Order> - <RequiresUserInput>true</RequiresUserInput> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <CommandLine>cmd.exe /c winrm set winrm/config/listener?Address=*+Transport=HTTP @{Port="5985"} </CommandLine> - <Description>Win RM listener Address/Port</Description> - <Order>10</Order> - <RequiresUserInput>true</RequiresUserInput> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <CommandLine>cmd.exe /c netsh advfirewall firewall set rule group="remote administration" new enable=yes </CommandLine> - <Description>Win RM adv firewall enable</Description> - <Order>11</Order> - <RequiresUserInput>true</RequiresUserInput> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <CommandLine>cmd.exe /c netsh firewall add portopening TCP 5985 "Port 5985" </CommandLine> - <Description>Win RM port open</Description> - <Order>12</Order> - <RequiresUserInput>true</RequiresUserInput> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <CommandLine>cmd.exe /c net stop winrm </CommandLine> - <Description>Stop Win RM Service </Description> - <Order>13</Order> - <RequiresUserInput>true</RequiresUserInput> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <CommandLine>cmd.exe /c sc config winrm start= auto</CommandLine> - <Description>Win RM Autostart</Description> - <Order>14</Order> - <RequiresUserInput>true</RequiresUserInput> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <CommandLine>cmd.exe /c net start winrm</CommandLine> - <Description>Start Win RM Service</Description> - <Order>15</Order> - <RequiresUserInput>true</RequiresUserInput> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <CommandLine>cmd.exe /c wmic useraccount where "name='vagrant'" set PasswordExpires=FALSE</CommandLine> - <Order>16</Order> - <Description>Disable password expiration for vagrant user</Description> - </SynchronousCommand> - </FirstLogonCommands> - </component> - </settings> + <FirstLogonCommands> + <SynchronousCommand wcm:action="add"> + <CommandLine>%windir%\System32\WindowsPowerShell\v1.0\powershell.exe -Command "Set-ExecutionPolicy -ExecutionPolicy RemoteSigned -Force"</CommandLine> + <Description>Set Execution Policy 64 Bit</Description> + <Order>1</Order> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <CommandLine>%windir%\SysWOW64\cmd.exe /c powershell -Command "Set-ExecutionPolicy -ExecutionPolicy RemoteSigned -Force"</CommandLine> + <Description>Set Execution Policy 32 Bit</Description> + <Order>2</Order> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <Order>3</Order> + <CommandLine>%windir%\System32\WindowsPowerShell\v1.0\powershell.exe -Command Get-NetConnectionProfile | Set-NetConnectionProfile -NetworkCategory "Private"</CommandLine> + <Description>Sets detected network connections to private to allow start of winrm</Description> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <Order>4</Order> + <CommandLine>%windir%\System32\WindowsPowerShell\v1.0\powershell.exe -Command Set-NetFirewallRule -Name "WINRM-HTTP-In-TCP" -RemoteAddress Any</CommandLine> + <Description>Allows winrm over public profile interfaces</Description> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <Order>5</Order> + <CommandLine>%windir%\System32\cmd.exe /c winrm quickconfig -q</CommandLine> + <Description>winrm quickconfig -q</Description> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <Order>6</Order> + <CommandLine>%windir%\System32\cmd.exe /c winrm quickconfig -transport:http</CommandLine> + <Description>winrm quickconfig -transport:http</Description> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <Order>7</Order> + <CommandLine>%windir%\System32\cmd.exe /c winrm set winrm/config @{MaxTimeoutms="1800000"}</CommandLine> + <Description>Win RM MaxTimoutms</Description> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <Order>8</Order> + <CommandLine>%windir%\System32\cmd.exe /c winrm set winrm/config/winrs @{MaxMemoryPerShellMB="2048"}</CommandLine> + <Description>Win RM MaxMemoryPerShellMB</Description> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <Order>9</Order> + <CommandLine>%windir%\System32\cmd.exe /c winrm set winrm/config/service @{AllowUnencrypted="true"}</CommandLine> + <Description>Win RM AllowUnencrypted</Description> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <Order>10</Order> + <CommandLine>%windir%\System32\cmd.exe /c winrm set winrm/config/service/auth @{Basic="true"}</CommandLine> + <Description>Win RM auth Basic</Description> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <Order>11</Order> + <CommandLine>%windir%\System32\cmd.exe /c winrm set winrm/config/client/auth @{Basic="true"}</CommandLine> + <Description>Win RM client auth Basic</Description> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <Order>12</Order> + <CommandLine>%windir%\System32\cmd.exe /c winrm set winrm/config/listener?Address=*+Transport=HTTP @{Port="5985"}</CommandLine> + <Description>Win RM listener Address/Port</Description> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <Order>13</Order> + <CommandLine>%windir%\System32\cmd.exe /c netsh firewall add portopening TCP 5985 "Port 5985"</CommandLine> + <Description>Win RM port open</Description> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <Order>14</Order> + <CommandLine>%windir%\System32\cmd.exe /c net stop winrm</CommandLine> + <Description>Stop Win RM Service</Description> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <Order>15</Order> + <CommandLine>%windir%\System32\cmd.exe /c sc config winrm start= auto</CommandLine> + <Description>Win RM Autostart</Description> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <Order>16</Order> + <CommandLine>%windir%\System32\cmd.exe /c net start winrm</CommandLine> + <Description>Start Win RM Service</Description> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <Order>17</Order> + <CommandLine>%windir%\System32\cmd.exe /c wmic useraccount where "name='vagrant'" set PasswordExpires=FALSE</CommandLine> + <Description>Disable password expiration for vagrant user</Description> + </SynchronousCommand> + </FirstLogonCommands> + </component> + <component name="Microsoft-Windows-WinRE-RecoveryAgent" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> + <UninstallWindowsRE>true</UninstallWindowsRE> + </component> + </settings> <settings pass="specialize"> <component xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" name="Microsoft-Windows-ServerManager-SvrMgrNc" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> <DoNotOpenServerManagerAtLogon>true</DoNotOpenServerManagerAtLogon> @@ -285,5 +277,36 @@ <component xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" name="Microsoft-Windows-OutOfBoxExperience" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> <DoNotOpenInitialConfigurationTasksAtLogon>true</DoNotOpenInitialConfigurationTasksAtLogon> </component> + <component name="Microsoft-Windows-SystemRestore-Main" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> + <DisableSR>1</DisableSR> + </component> + <component name="Microsoft-Windows-SystemSettingsThreshold" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> + <DisplayNetworkSelection>false</DisplayNetworkSelection> + </component> + <component name="Networking-MPSSVC-Svc" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> + <FirewallGroups> + <FirewallGroup wcm:action="add" wcm:keyValue="WindowsRemoteManagement"> + <Active>true</Active> + <Group>Windows Remote Management</Group> + <Profile>all</Profile> + </FirewallGroup> + <FirewallGroup wcm:action="add" wcm:keyValue="RemoteAdministration"> + <Active>true</Active> + <Group>Remote Administration</Group> + <Profile>all</Profile> + </FirewallGroup> + </FirewallGroups> + </component> + <component name="Microsoft-Windows-SQMApi" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> + <CEIPEnabled>0</CEIPEnabled> + </component> + <component name="Microsoft-Windows-Security-SPP-UX" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> + <SkipAutoActivation>true</SkipAutoActivation> + </component> + </settings> + <settings pass="offlineServicing"> + <component name="Microsoft-Windows-LUA-Settings" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> + <EnableLUA>false</EnableLUA> + </component> </settings> </unattend> diff --git a/packer_templates/win_answer_files/2016/hyperv-gen2/Autounattend 2.xml b/packer_templates/win_answer_files/2016/hyperv-gen2/Autounattend 2.xml new file mode 100644 index 000000000..64579c515 --- /dev/null +++ b/packer_templates/win_answer_files/2016/hyperv-gen2/Autounattend 2.xml @@ -0,0 +1,332 @@ +<?xml version="1.0" encoding="utf-8"?> +<unattend xmlns="urn:schemas-microsoft-com:unattend" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <settings pass="windowsPE"> + <component name="Microsoft-Windows-PnpCustomizationsWinPE" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" processorArchitecture="amd64"> + <!-- + This makes the VirtIO drivers available to Windows, assuming that + the VirtIO driver disk at https://fedorapeople.org/groups/virt/virtio-win/direct-downloads/stable-virtio/virtio-win.iso + (see https://docs.fedoraproject.org/en-US/quick-docs/creating-windows-virtual-machines-using-virtio-drivers/index.html#virtio-win-direct-downloads) + is available as drive E: + --> + <DriverPaths> + <PathAndCredentials wcm:action="add" wcm:keyValue="2"> + <Path>F:\viostor\2k16\amd64</Path> + </PathAndCredentials> + <PathAndCredentials wcm:action="add" wcm:keyValue="3"> + <Path>F:\NetKVM\2k16\amd64</Path> + </PathAndCredentials> + <PathAndCredentials wcm:action="add" wcm:keyValue="4"> + <Path>F:\Balloon\2k16\amd64</Path> + </PathAndCredentials> + <PathAndCredentials wcm:action="add" wcm:keyValue="5"> + <Path>F:\pvpanic\2k16\amd64</Path> + </PathAndCredentials> + <PathAndCredentials wcm:action="add" wcm:keyValue="6"> + <Path>F:\qemupciserial\2k16\amd64</Path> + </PathAndCredentials> + <PathAndCredentials wcm:action="add" wcm:keyValue="7"> + <Path>F:\qxldod\2k16\amd64</Path> + </PathAndCredentials> + <PathAndCredentials wcm:action="add" wcm:keyValue="8"> + <Path>F:\vioinput\2k16\amd64</Path> + </PathAndCredentials> + <PathAndCredentials wcm:action="add" wcm:keyValue="9"> + <Path>F:\viorng\2k16\amd64</Path> + </PathAndCredentials> + <PathAndCredentials wcm:action="add" wcm:keyValue="10"> + <Path>F:\vioscsi\2k16\amd64</Path> + </PathAndCredentials> + <PathAndCredentials wcm:action="add" wcm:keyValue="11"> + <Path>F:\vioserial\2k16\amd64</Path> + </PathAndCredentials> + </DriverPaths> + </component> + <component name="Microsoft-Windows-International-Core-WinPE" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> + <SetupUILanguage> + <UILanguage>en-US</UILanguage> + </SetupUILanguage> + <InputLocale>en-US</InputLocale> + <SystemLocale>en-US</SystemLocale> + <UILanguage>en-US</UILanguage> + <UILanguageFallback>en-US</UILanguageFallback> + <UserLocale>en-US</UserLocale> + </component> + <component name="Microsoft-Windows-Setup" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> + <DiskConfiguration> + <Disk wcm:action="add"> + <CreatePartitions> + <CreatePartition wcm:action="add"> + <Order>1</Order> + <Size>350</Size> + <Type>Primary</Type> + </CreatePartition> + <CreatePartition wcm:action="add"> + <Order>2</Order> + <Size>100</Size> + <Type>EFI</Type> + </CreatePartition> + <CreatePartition wcm:action="add"> + <Order>3</Order> + <Size>128</Size> + <Type>MSR</Type> + </CreatePartition> + <CreatePartition wcm:action="add"> + <Order>4</Order> + <Extend>true</Extend> + <Type>Primary</Type> + </CreatePartition> + </CreatePartitions> + <ModifyPartitions> + <ModifyPartition wcm:action="add"> + <Order>1</Order> + <PartitionID>1</PartitionID> + <Label>WINRE</Label> + <Format>NTFS</Format> + <TypeID>de94bba4-06d1-4d40-a16a-bfd50179d6ac</TypeID> + </ModifyPartition> + <ModifyPartition wcm:action="add"> + <Order>2</Order> + <PartitionID>2</PartitionID> + <Label>System</Label> + <Format>FAT32</Format> + </ModifyPartition> + <ModifyPartition wcm:action="add"> + <Order>3</Order> + <PartitionID>3</PartitionID> + </ModifyPartition> + <ModifyPartition wcm:action="add"> + <Order>4</Order> + <PartitionID>4</PartitionID> + <Label>Windows</Label> + <Format>NTFS</Format> + </ModifyPartition> + </ModifyPartitions> + <DiskID>0</DiskID> + <WillWipeDisk>true</WillWipeDisk> + </Disk> + <WillShowUI>OnError</WillShowUI> + </DiskConfiguration> + <ImageInstall> + <OSImage> + <InstallFrom> + <MetaData wcm:action="add"> + <Key>/IMAGE/NAME</Key> + <Value>Windows Server 2016 SERVERSTANDARD</Value> + </MetaData> + </InstallFrom> + <InstallTo> + <DiskID>0</DiskID> + <PartitionID>4</PartitionID> + </InstallTo> + </OSImage> + </ImageInstall> + <UserData> + <ProductKey> + <WillShowUI>OnError</WillShowUI> + </ProductKey> + <AcceptEula>true</AcceptEula> + <FullName>Vagrant</FullName> + <Organization>Bento by Chef Software, Inc.</Organization> + </UserData> + <DynamicUpdate> + <Enable>false</Enable> + </DynamicUpdate> + </component> + </settings> + <settings pass="generalize"> + <component name="Microsoft-Windows-Security-SPP" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> + <SkipRearm>1</SkipRearm> + </component> + <component name="Microsoft-Windows-PnpSysprep" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> + <PersistAllDeviceInstalls>false</PersistAllDeviceInstalls> + <DoNotCleanUpNonPresentDevices>false</DoNotCleanUpNonPresentDevices> + </component> + </settings> + <settings pass="oobeSystem"> + <component name="Microsoft-Windows-International-Core" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> + <InputLocale>en-US</InputLocale> + <SystemLocale>en-US</SystemLocale> + <UILanguage>en-US</UILanguage> + <UserLocale>en-US</UserLocale> + </component> + <component name="Microsoft-Windows-Shell-Setup" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> + <OOBE> + <HideEULAPage>true</HideEULAPage> + <HideLocalAccountScreen>true</HideLocalAccountScreen> + <HideOEMRegistrationScreen>true</HideOEMRegistrationScreen> + <HideOnlineAccountScreens>true</HideOnlineAccountScreens> + <HideWirelessSetupInOOBE>true</HideWirelessSetupInOOBE> + <NetworkLocation>Work</NetworkLocation> + <ProtectYourPC>3</ProtectYourPC> + <SkipMachineOOBE>true</SkipMachineOOBE> + <SkipUserOOBE>true</SkipUserOOBE> + <VMModeOptimizations> + <SkipAdministratorProfileRemoval>true</SkipAdministratorProfileRemoval> + <SkipNotifyUILanguageChange>true</SkipNotifyUILanguageChange> + <SkipWinREInitialization>true</SkipWinREInitialization> + </VMModeOptimizations> + </OOBE> + <TimeZone>UTC</TimeZone> + <UserAccounts> + <AdministratorPassword> + <Value>vagrant</Value> + <PlainText>true</PlainText> + </AdministratorPassword> + <LocalAccounts> + <LocalAccount wcm:action="add"> + <Password> + <Value>vagrant</Value> + <PlainText>true</PlainText> + </Password> + <Description>Vagrant User</Description> + <DisplayName>vagrant</DisplayName> + <Group>administrators</Group> + <Name>vagrant</Name> + </LocalAccount> + </LocalAccounts> + </UserAccounts> + <AutoLogon> + <Password> + <Value>vagrant</Value> + <PlainText>true</PlainText> + </Password> + <Username>vagrant</Username> + <Enabled>true</Enabled> + </AutoLogon> + <FirstLogonCommands> + <SynchronousCommand wcm:action="add"> + <CommandLine>%windir%\System32\WindowsPowerShell\v1.0\powershell.exe -Command "Set-ExecutionPolicy -ExecutionPolicy RemoteSigned -Force"</CommandLine> + <Description>Set Execution Policy 64 Bit</Description> + <Order>1</Order> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <CommandLine>%windir%\SysWOW64\cmd.exe /c powershell -Command "Set-ExecutionPolicy -ExecutionPolicy RemoteSigned -Force"</CommandLine> + <Description>Set Execution Policy 32 Bit</Description> + <Order>2</Order> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <Order>3</Order> + <CommandLine>%windir%\System32\WindowsPowerShell\v1.0\powershell.exe -Command Get-NetConnectionProfile | Set-NetConnectionProfile -NetworkCategory "Private"</CommandLine> + <Description>Sets detected network connections to private to allow start of winrm</Description> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <Order>4</Order> + <CommandLine>%windir%\System32\WindowsPowerShell\v1.0\powershell.exe -Command Set-NetFirewallRule -Name "WINRM-HTTP-In-TCP" -RemoteAddress Any</CommandLine> + <Description>Allows winrm over public profile interfaces</Description> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <Order>5</Order> + <CommandLine>%windir%\System32\cmd.exe /c winrm quickconfig -q</CommandLine> + <Description>winrm quickconfig -q</Description> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <Order>6</Order> + <CommandLine>%windir%\System32\cmd.exe /c winrm quickconfig -transport:http</CommandLine> + <Description>winrm quickconfig -transport:http</Description> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <Order>7</Order> + <CommandLine>%windir%\System32\cmd.exe /c winrm set winrm/config @{MaxTimeoutms="1800000"}</CommandLine> + <Description>Win RM MaxTimoutms</Description> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <Order>8</Order> + <CommandLine>%windir%\System32\cmd.exe /c winrm set winrm/config/winrs @{MaxMemoryPerShellMB="2048"}</CommandLine> + <Description>Win RM MaxMemoryPerShellMB</Description> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <Order>9</Order> + <CommandLine>%windir%\System32\cmd.exe /c winrm set winrm/config/service @{AllowUnencrypted="true"}</CommandLine> + <Description>Win RM AllowUnencrypted</Description> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <Order>10</Order> + <CommandLine>%windir%\System32\cmd.exe /c winrm set winrm/config/service/auth @{Basic="true"}</CommandLine> + <Description>Win RM auth Basic</Description> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <Order>11</Order> + <CommandLine>%windir%\System32\cmd.exe /c winrm set winrm/config/client/auth @{Basic="true"}</CommandLine> + <Description>Win RM client auth Basic</Description> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <Order>12</Order> + <CommandLine>%windir%\System32\cmd.exe /c winrm set winrm/config/listener?Address=*+Transport=HTTP @{Port="5985"}</CommandLine> + <Description>Win RM listener Address/Port</Description> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <Order>13</Order> + <CommandLine>%windir%\System32\cmd.exe /c netsh firewall add portopening TCP 5985 "Port 5985"</CommandLine> + <Description>Win RM port open</Description> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <Order>14</Order> + <CommandLine>%windir%\System32\cmd.exe /c net stop winrm</CommandLine> + <Description>Stop Win RM Service</Description> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <Order>15</Order> + <CommandLine>%windir%\System32\cmd.exe /c sc config winrm start= auto</CommandLine> + <Description>Win RM Autostart</Description> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <Order>16</Order> + <CommandLine>%windir%\System32\cmd.exe /c net start winrm</CommandLine> + <Description>Start Win RM Service</Description> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <Order>17</Order> + <CommandLine>%windir%\System32\cmd.exe /c wmic useraccount where "name='vagrant'" set PasswordExpires=FALSE</CommandLine> + <Description>Disable password expiration for vagrant user</Description> + </SynchronousCommand> + </FirstLogonCommands> + </component> + <component name="Microsoft-Windows-WinRE-RecoveryAgent" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> + <UninstallWindowsRE>true</UninstallWindowsRE> + </component> + </settings> + <settings pass="specialize"> + <component name="Microsoft-Windows-ServerManager-SvrMgrNc" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> + <DoNotOpenServerManagerAtLogon>true</DoNotOpenServerManagerAtLogon> + </component> + <component name="Microsoft-Windows-IE-ESC" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> + <!-- Disable IE ESC. --> + <IEHardenAdmin>false</IEHardenAdmin> + <IEHardenUser>false</IEHardenUser> + </component> + <component name="Microsoft-Windows-OutOfBoxExperience" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> + <DoNotOpenInitialConfigurationTasksAtLogon>true</DoNotOpenInitialConfigurationTasksAtLogon> + </component> + <component name="Microsoft-Windows-SystemRestore-Main" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> + <DisableSR>1</DisableSR> + </component> + <component name="Microsoft-Windows-SystemSettingsThreshold" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> + <DisplayNetworkSelection>false</DisplayNetworkSelection> + </component> + <component name="Networking-MPSSVC-Svc" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> + <FirewallGroups> + <FirewallGroup wcm:action="add" wcm:keyValue="WindowsRemoteManagement"> + <Active>true</Active> + <Group>Windows Remote Management</Group> + <Profile>all</Profile> + </FirewallGroup> + <FirewallGroup wcm:action="add" wcm:keyValue="RemoteAdministration"> + <Active>true</Active> + <Group>Remote Administration</Group> + <Profile>all</Profile> + </FirewallGroup> + </FirewallGroups> + </component> + <component name="Microsoft-Windows-SQMApi" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> + <CEIPEnabled>0</CEIPEnabled> + </component> + <component name="Microsoft-Windows-Security-SPP-UX" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> + <SkipAutoActivation>true</SkipAutoActivation> + </component> + </settings> + <settings pass="offlineServicing"> + <component name="Microsoft-Windows-LUA-Settings" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> + <EnableLUA>false</EnableLUA> + </component> + </settings> +</unattend> diff --git a/packer_templates/win_answer_files/2016/hyperv-gen2/Autounattend.xml b/packer_templates/win_answer_files/2016/hyperv-gen2/Autounattend.xml new file mode 100644 index 000000000..64579c515 --- /dev/null +++ b/packer_templates/win_answer_files/2016/hyperv-gen2/Autounattend.xml @@ -0,0 +1,332 @@ +<?xml version="1.0" encoding="utf-8"?> +<unattend xmlns="urn:schemas-microsoft-com:unattend" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <settings pass="windowsPE"> + <component name="Microsoft-Windows-PnpCustomizationsWinPE" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" processorArchitecture="amd64"> + <!-- + This makes the VirtIO drivers available to Windows, assuming that + the VirtIO driver disk at https://fedorapeople.org/groups/virt/virtio-win/direct-downloads/stable-virtio/virtio-win.iso + (see https://docs.fedoraproject.org/en-US/quick-docs/creating-windows-virtual-machines-using-virtio-drivers/index.html#virtio-win-direct-downloads) + is available as drive E: + --> + <DriverPaths> + <PathAndCredentials wcm:action="add" wcm:keyValue="2"> + <Path>F:\viostor\2k16\amd64</Path> + </PathAndCredentials> + <PathAndCredentials wcm:action="add" wcm:keyValue="3"> + <Path>F:\NetKVM\2k16\amd64</Path> + </PathAndCredentials> + <PathAndCredentials wcm:action="add" wcm:keyValue="4"> + <Path>F:\Balloon\2k16\amd64</Path> + </PathAndCredentials> + <PathAndCredentials wcm:action="add" wcm:keyValue="5"> + <Path>F:\pvpanic\2k16\amd64</Path> + </PathAndCredentials> + <PathAndCredentials wcm:action="add" wcm:keyValue="6"> + <Path>F:\qemupciserial\2k16\amd64</Path> + </PathAndCredentials> + <PathAndCredentials wcm:action="add" wcm:keyValue="7"> + <Path>F:\qxldod\2k16\amd64</Path> + </PathAndCredentials> + <PathAndCredentials wcm:action="add" wcm:keyValue="8"> + <Path>F:\vioinput\2k16\amd64</Path> + </PathAndCredentials> + <PathAndCredentials wcm:action="add" wcm:keyValue="9"> + <Path>F:\viorng\2k16\amd64</Path> + </PathAndCredentials> + <PathAndCredentials wcm:action="add" wcm:keyValue="10"> + <Path>F:\vioscsi\2k16\amd64</Path> + </PathAndCredentials> + <PathAndCredentials wcm:action="add" wcm:keyValue="11"> + <Path>F:\vioserial\2k16\amd64</Path> + </PathAndCredentials> + </DriverPaths> + </component> + <component name="Microsoft-Windows-International-Core-WinPE" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> + <SetupUILanguage> + <UILanguage>en-US</UILanguage> + </SetupUILanguage> + <InputLocale>en-US</InputLocale> + <SystemLocale>en-US</SystemLocale> + <UILanguage>en-US</UILanguage> + <UILanguageFallback>en-US</UILanguageFallback> + <UserLocale>en-US</UserLocale> + </component> + <component name="Microsoft-Windows-Setup" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> + <DiskConfiguration> + <Disk wcm:action="add"> + <CreatePartitions> + <CreatePartition wcm:action="add"> + <Order>1</Order> + <Size>350</Size> + <Type>Primary</Type> + </CreatePartition> + <CreatePartition wcm:action="add"> + <Order>2</Order> + <Size>100</Size> + <Type>EFI</Type> + </CreatePartition> + <CreatePartition wcm:action="add"> + <Order>3</Order> + <Size>128</Size> + <Type>MSR</Type> + </CreatePartition> + <CreatePartition wcm:action="add"> + <Order>4</Order> + <Extend>true</Extend> + <Type>Primary</Type> + </CreatePartition> + </CreatePartitions> + <ModifyPartitions> + <ModifyPartition wcm:action="add"> + <Order>1</Order> + <PartitionID>1</PartitionID> + <Label>WINRE</Label> + <Format>NTFS</Format> + <TypeID>de94bba4-06d1-4d40-a16a-bfd50179d6ac</TypeID> + </ModifyPartition> + <ModifyPartition wcm:action="add"> + <Order>2</Order> + <PartitionID>2</PartitionID> + <Label>System</Label> + <Format>FAT32</Format> + </ModifyPartition> + <ModifyPartition wcm:action="add"> + <Order>3</Order> + <PartitionID>3</PartitionID> + </ModifyPartition> + <ModifyPartition wcm:action="add"> + <Order>4</Order> + <PartitionID>4</PartitionID> + <Label>Windows</Label> + <Format>NTFS</Format> + </ModifyPartition> + </ModifyPartitions> + <DiskID>0</DiskID> + <WillWipeDisk>true</WillWipeDisk> + </Disk> + <WillShowUI>OnError</WillShowUI> + </DiskConfiguration> + <ImageInstall> + <OSImage> + <InstallFrom> + <MetaData wcm:action="add"> + <Key>/IMAGE/NAME</Key> + <Value>Windows Server 2016 SERVERSTANDARD</Value> + </MetaData> + </InstallFrom> + <InstallTo> + <DiskID>0</DiskID> + <PartitionID>4</PartitionID> + </InstallTo> + </OSImage> + </ImageInstall> + <UserData> + <ProductKey> + <WillShowUI>OnError</WillShowUI> + </ProductKey> + <AcceptEula>true</AcceptEula> + <FullName>Vagrant</FullName> + <Organization>Bento by Chef Software, Inc.</Organization> + </UserData> + <DynamicUpdate> + <Enable>false</Enable> + </DynamicUpdate> + </component> + </settings> + <settings pass="generalize"> + <component name="Microsoft-Windows-Security-SPP" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> + <SkipRearm>1</SkipRearm> + </component> + <component name="Microsoft-Windows-PnpSysprep" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> + <PersistAllDeviceInstalls>false</PersistAllDeviceInstalls> + <DoNotCleanUpNonPresentDevices>false</DoNotCleanUpNonPresentDevices> + </component> + </settings> + <settings pass="oobeSystem"> + <component name="Microsoft-Windows-International-Core" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> + <InputLocale>en-US</InputLocale> + <SystemLocale>en-US</SystemLocale> + <UILanguage>en-US</UILanguage> + <UserLocale>en-US</UserLocale> + </component> + <component name="Microsoft-Windows-Shell-Setup" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> + <OOBE> + <HideEULAPage>true</HideEULAPage> + <HideLocalAccountScreen>true</HideLocalAccountScreen> + <HideOEMRegistrationScreen>true</HideOEMRegistrationScreen> + <HideOnlineAccountScreens>true</HideOnlineAccountScreens> + <HideWirelessSetupInOOBE>true</HideWirelessSetupInOOBE> + <NetworkLocation>Work</NetworkLocation> + <ProtectYourPC>3</ProtectYourPC> + <SkipMachineOOBE>true</SkipMachineOOBE> + <SkipUserOOBE>true</SkipUserOOBE> + <VMModeOptimizations> + <SkipAdministratorProfileRemoval>true</SkipAdministratorProfileRemoval> + <SkipNotifyUILanguageChange>true</SkipNotifyUILanguageChange> + <SkipWinREInitialization>true</SkipWinREInitialization> + </VMModeOptimizations> + </OOBE> + <TimeZone>UTC</TimeZone> + <UserAccounts> + <AdministratorPassword> + <Value>vagrant</Value> + <PlainText>true</PlainText> + </AdministratorPassword> + <LocalAccounts> + <LocalAccount wcm:action="add"> + <Password> + <Value>vagrant</Value> + <PlainText>true</PlainText> + </Password> + <Description>Vagrant User</Description> + <DisplayName>vagrant</DisplayName> + <Group>administrators</Group> + <Name>vagrant</Name> + </LocalAccount> + </LocalAccounts> + </UserAccounts> + <AutoLogon> + <Password> + <Value>vagrant</Value> + <PlainText>true</PlainText> + </Password> + <Username>vagrant</Username> + <Enabled>true</Enabled> + </AutoLogon> + <FirstLogonCommands> + <SynchronousCommand wcm:action="add"> + <CommandLine>%windir%\System32\WindowsPowerShell\v1.0\powershell.exe -Command "Set-ExecutionPolicy -ExecutionPolicy RemoteSigned -Force"</CommandLine> + <Description>Set Execution Policy 64 Bit</Description> + <Order>1</Order> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <CommandLine>%windir%\SysWOW64\cmd.exe /c powershell -Command "Set-ExecutionPolicy -ExecutionPolicy RemoteSigned -Force"</CommandLine> + <Description>Set Execution Policy 32 Bit</Description> + <Order>2</Order> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <Order>3</Order> + <CommandLine>%windir%\System32\WindowsPowerShell\v1.0\powershell.exe -Command Get-NetConnectionProfile | Set-NetConnectionProfile -NetworkCategory "Private"</CommandLine> + <Description>Sets detected network connections to private to allow start of winrm</Description> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <Order>4</Order> + <CommandLine>%windir%\System32\WindowsPowerShell\v1.0\powershell.exe -Command Set-NetFirewallRule -Name "WINRM-HTTP-In-TCP" -RemoteAddress Any</CommandLine> + <Description>Allows winrm over public profile interfaces</Description> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <Order>5</Order> + <CommandLine>%windir%\System32\cmd.exe /c winrm quickconfig -q</CommandLine> + <Description>winrm quickconfig -q</Description> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <Order>6</Order> + <CommandLine>%windir%\System32\cmd.exe /c winrm quickconfig -transport:http</CommandLine> + <Description>winrm quickconfig -transport:http</Description> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <Order>7</Order> + <CommandLine>%windir%\System32\cmd.exe /c winrm set winrm/config @{MaxTimeoutms="1800000"}</CommandLine> + <Description>Win RM MaxTimoutms</Description> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <Order>8</Order> + <CommandLine>%windir%\System32\cmd.exe /c winrm set winrm/config/winrs @{MaxMemoryPerShellMB="2048"}</CommandLine> + <Description>Win RM MaxMemoryPerShellMB</Description> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <Order>9</Order> + <CommandLine>%windir%\System32\cmd.exe /c winrm set winrm/config/service @{AllowUnencrypted="true"}</CommandLine> + <Description>Win RM AllowUnencrypted</Description> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <Order>10</Order> + <CommandLine>%windir%\System32\cmd.exe /c winrm set winrm/config/service/auth @{Basic="true"}</CommandLine> + <Description>Win RM auth Basic</Description> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <Order>11</Order> + <CommandLine>%windir%\System32\cmd.exe /c winrm set winrm/config/client/auth @{Basic="true"}</CommandLine> + <Description>Win RM client auth Basic</Description> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <Order>12</Order> + <CommandLine>%windir%\System32\cmd.exe /c winrm set winrm/config/listener?Address=*+Transport=HTTP @{Port="5985"}</CommandLine> + <Description>Win RM listener Address/Port</Description> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <Order>13</Order> + <CommandLine>%windir%\System32\cmd.exe /c netsh firewall add portopening TCP 5985 "Port 5985"</CommandLine> + <Description>Win RM port open</Description> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <Order>14</Order> + <CommandLine>%windir%\System32\cmd.exe /c net stop winrm</CommandLine> + <Description>Stop Win RM Service</Description> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <Order>15</Order> + <CommandLine>%windir%\System32\cmd.exe /c sc config winrm start= auto</CommandLine> + <Description>Win RM Autostart</Description> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <Order>16</Order> + <CommandLine>%windir%\System32\cmd.exe /c net start winrm</CommandLine> + <Description>Start Win RM Service</Description> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <Order>17</Order> + <CommandLine>%windir%\System32\cmd.exe /c wmic useraccount where "name='vagrant'" set PasswordExpires=FALSE</CommandLine> + <Description>Disable password expiration for vagrant user</Description> + </SynchronousCommand> + </FirstLogonCommands> + </component> + <component name="Microsoft-Windows-WinRE-RecoveryAgent" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> + <UninstallWindowsRE>true</UninstallWindowsRE> + </component> + </settings> + <settings pass="specialize"> + <component name="Microsoft-Windows-ServerManager-SvrMgrNc" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> + <DoNotOpenServerManagerAtLogon>true</DoNotOpenServerManagerAtLogon> + </component> + <component name="Microsoft-Windows-IE-ESC" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> + <!-- Disable IE ESC. --> + <IEHardenAdmin>false</IEHardenAdmin> + <IEHardenUser>false</IEHardenUser> + </component> + <component name="Microsoft-Windows-OutOfBoxExperience" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> + <DoNotOpenInitialConfigurationTasksAtLogon>true</DoNotOpenInitialConfigurationTasksAtLogon> + </component> + <component name="Microsoft-Windows-SystemRestore-Main" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> + <DisableSR>1</DisableSR> + </component> + <component name="Microsoft-Windows-SystemSettingsThreshold" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> + <DisplayNetworkSelection>false</DisplayNetworkSelection> + </component> + <component name="Networking-MPSSVC-Svc" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> + <FirewallGroups> + <FirewallGroup wcm:action="add" wcm:keyValue="WindowsRemoteManagement"> + <Active>true</Active> + <Group>Windows Remote Management</Group> + <Profile>all</Profile> + </FirewallGroup> + <FirewallGroup wcm:action="add" wcm:keyValue="RemoteAdministration"> + <Active>true</Active> + <Group>Remote Administration</Group> + <Profile>all</Profile> + </FirewallGroup> + </FirewallGroups> + </component> + <component name="Microsoft-Windows-SQMApi" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> + <CEIPEnabled>0</CEIPEnabled> + </component> + <component name="Microsoft-Windows-Security-SPP-UX" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> + <SkipAutoActivation>true</SkipAutoActivation> + </component> + </settings> + <settings pass="offlineServicing"> + <component name="Microsoft-Windows-LUA-Settings" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> + <EnableLUA>false</EnableLUA> + </component> + </settings> +</unattend> diff --git a/packer_templates/win_answer_files/2019/Autounattend.xml b/packer_templates/win_answer_files/2019/Autounattend.xml index 4dd84f9de..041dccbef 100644 --- a/packer_templates/win_answer_files/2019/Autounattend.xml +++ b/packer_templates/win_answer_files/2019/Autounattend.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> -<unattend xmlns="urn:schemas-microsoft-com:unattend"> +<unattend xmlns="urn:schemas-microsoft-com:unattend" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> <settings pass="windowsPE"> - <component name="Microsoft-Windows-PnpCustomizationsWinPE" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" processorArchitecture="amd64" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State"> + <component name="Microsoft-Windows-PnpCustomizationsWinPE" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" processorArchitecture="amd64"> <!-- This makes the VirtIO drivers available to Windows, assuming that the VirtIO driver disk at https://fedorapeople.org/groups/virt/virtio-win/direct-downloads/stable-virtio/virtio-win.iso @@ -12,45 +12,36 @@ <PathAndCredentials wcm:action="add" wcm:keyValue="2"> <Path>E:\viostor\2k19\amd64</Path> </PathAndCredentials> - <PathAndCredentials wcm:action="add" wcm:keyValue="3"> <Path>E:\NetKVM\2k19\amd64</Path> </PathAndCredentials> - <PathAndCredentials wcm:action="add" wcm:keyValue="4"> <Path>E:\Balloon\2k19\amd64</Path> </PathAndCredentials> - <PathAndCredentials wcm:action="add" wcm:keyValue="5"> <Path>E:\pvpanic\2k19\amd64</Path> </PathAndCredentials> - <PathAndCredentials wcm:action="add" wcm:keyValue="6"> <Path>E:\qemupciserial\2k19\amd64</Path> </PathAndCredentials> - <PathAndCredentials wcm:action="add" wcm:keyValue="7"> <Path>E:\qxldod\2k19\amd64</Path> </PathAndCredentials> - <PathAndCredentials wcm:action="add" wcm:keyValue="8"> <Path>E:\vioinput\2k19\amd64</Path> </PathAndCredentials> - <PathAndCredentials wcm:action="add" wcm:keyValue="9"> <Path>E:\viorng\2k19\amd64</Path> </PathAndCredentials> - <PathAndCredentials wcm:action="add" wcm:keyValue="10"> <Path>E:\vioscsi\2k19\amd64</Path> </PathAndCredentials> - <PathAndCredentials wcm:action="add" wcm:keyValue="11"> <Path>E:\vioserial\2k19\amd64</Path> </PathAndCredentials> </DriverPaths> </component> - <component name="Microsoft-Windows-International-Core-WinPE" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <component name="Microsoft-Windows-International-Core-WinPE" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> <SetupUILanguage> <UILanguage>en-US</UILanguage> </SetupUILanguage> @@ -60,14 +51,14 @@ <UILanguageFallback>en-US</UILanguageFallback> <UserLocale>en-US</UserLocale> </component> - <component name="Microsoft-Windows-Setup" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <component name="Microsoft-Windows-Setup" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> <DiskConfiguration> <Disk wcm:action="add"> <CreatePartitions> <CreatePartition wcm:action="add"> <Type>Primary</Type> <Order>1</Order> - <Size>350</Size> + <Size>100</Size> </CreatePartition> <CreatePartition wcm:action="add"> <Order>2</Order> @@ -85,7 +76,7 @@ </ModifyPartition> <ModifyPartition wcm:action="add"> <Format>NTFS</Format> - <Label>Windows 2019</Label> + <Label>Windows</Label> <Letter>C</Letter> <Order>2</Order> <PartitionID>2</PartitionID> @@ -100,7 +91,7 @@ <InstallFrom> <MetaData wcm:action="add"> <Key>/IMAGE/NAME</Key> - <Value>Windows Server 2019 SERVERDATACENTER</Value> + <Value>Windows Server 2019 SERVERSTANDARD</Value> </MetaData> </InstallFrom> <InstallTo> @@ -117,55 +108,63 @@ <FullName>Vagrant</FullName> <Organization>Bento by Chef Software, Inc.</Organization> </UserData> + <DynamicUpdate> + <Enable>false</Enable> + </DynamicUpdate> </component> </settings> - <settings pass="generalize"> - <component name="Microsoft-Windows-Security-SPP" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - <SkipRearm>1</SkipRearm> - </component> - <component name="Microsoft-Windows-PnpSysprep" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - <PersistAllDeviceInstalls>false</PersistAllDeviceInstalls> - <DoNotCleanUpNonPresentDevices>false</DoNotCleanUpNonPresentDevices> - </component> - </settings> - <settings pass="oobeSystem"> - <component name="Microsoft-Windows-International-Core" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - <InputLocale>en-US</InputLocale> - <SystemLocale>en-US</SystemLocale> - <UILanguage>en-US</UILanguage> - <UserLocale>en-US</UserLocale> - </component> - <component name="Microsoft-Windows-Shell-Setup" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <settings pass="generalize"> + <component name="Microsoft-Windows-Security-SPP" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> + <SkipRearm>1</SkipRearm> + </component> + <component name="Microsoft-Windows-PnpSysprep" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> + <PersistAllDeviceInstalls>false</PersistAllDeviceInstalls> + <DoNotCleanUpNonPresentDevices>false</DoNotCleanUpNonPresentDevices> + </component> + </settings> + <settings pass="oobeSystem"> + <component name="Microsoft-Windows-International-Core" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> + <InputLocale>en-US</InputLocale> + <SystemLocale>en-US</SystemLocale> + <UILanguage>en-US</UILanguage> + <UserLocale>en-US</UserLocale> + </component> + <component name="Microsoft-Windows-Shell-Setup" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> <OOBE> <HideEULAPage>true</HideEULAPage> <HideLocalAccountScreen>true</HideLocalAccountScreen> <HideOEMRegistrationScreen>true</HideOEMRegistrationScreen> <HideOnlineAccountScreens>true</HideOnlineAccountScreens> <HideWirelessSetupInOOBE>true</HideWirelessSetupInOOBE> - <NetworkLocation>Home</NetworkLocation> + <NetworkLocation>Work</NetworkLocation> <ProtectYourPC>3</ProtectYourPC> <SkipMachineOOBE>true</SkipMachineOOBE> <SkipUserOOBE>true</SkipUserOOBE> + <VMModeOptimizations> + <SkipAdministratorProfileRemoval>true</SkipAdministratorProfileRemoval> + <SkipNotifyUILanguageChange>true</SkipNotifyUILanguageChange> + <SkipWinREInitialization>true</SkipWinREInitialization> + </VMModeOptimizations> </OOBE> - <TimeZone>UTC</TimeZone> - <UserAccounts> - <AdministratorPassword> - <Value>vagrant</Value> - <PlainText>true</PlainText> - </AdministratorPassword> - <LocalAccounts> - <LocalAccount wcm:action="add"> - <Password> - <Value>vagrant</Value> - <PlainText>true</PlainText> - </Password> - <Description>Vagrant User</Description> - <DisplayName>vagrant</DisplayName> - <Group>administrators</Group> - <Name>vagrant</Name> - </LocalAccount> - </LocalAccounts> - </UserAccounts> + <TimeZone>UTC</TimeZone> + <UserAccounts> + <AdministratorPassword> + <Value>vagrant</Value> + <PlainText>true</PlainText> + </AdministratorPassword> + <LocalAccounts> + <LocalAccount wcm:action="add"> + <Password> + <Value>vagrant</Value> + <PlainText>true</PlainText> + </Password> + <Description>Vagrant User</Description> + <DisplayName>vagrant</DisplayName> + <Group>administrators</Group> + <Name>vagrant</Name> + </LocalAccount> + </LocalAccounts> + </UserAccounts> <AutoLogon> <Password> <Value>vagrant</Value> @@ -174,105 +173,98 @@ <Username>vagrant</Username> <Enabled>true</Enabled> </AutoLogon> - <FirstLogonCommands> - <SynchronousCommand wcm:action="add"> - <CommandLine>cmd.exe /c powershell -Command "Set-ExecutionPolicy -ExecutionPolicy RemoteSigned -Force"</CommandLine> - <Description>Set Execution Policy 64 Bit</Description> - <Order>1</Order> - <RequiresUserInput>true</RequiresUserInput> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <CommandLine>C:\Windows\SysWOW64\cmd.exe /c powershell -Command "Set-ExecutionPolicy -ExecutionPolicy RemoteSigned -Force"</CommandLine> - <Description>Set Execution Policy 32 Bit</Description> - <Order>2</Order> - <RequiresUserInput>true</RequiresUserInput> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <CommandLine>cmd.exe /c winrm quickconfig -q</CommandLine> - <Description>winrm quickconfig -q</Description> - <Order>3</Order> - <RequiresUserInput>true</RequiresUserInput> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <CommandLine>cmd.exe /c winrm quickconfig -transport:http</CommandLine> - <Description>winrm quickconfig -transport:http</Description> - <Order>4</Order> - <RequiresUserInput>true</RequiresUserInput> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <CommandLine>cmd.exe /c winrm set winrm/config @{MaxTimeoutms="1800000"}</CommandLine> - <Description>Win RM MaxTimoutms</Description> - <Order>5</Order> - <RequiresUserInput>true</RequiresUserInput> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <CommandLine>cmd.exe /c winrm set winrm/config/winrs @{MaxMemoryPerShellMB="800"}</CommandLine> - <Description>Win RM MaxMemoryPerShellMB</Description> - <Order>6</Order> - <RequiresUserInput>true</RequiresUserInput> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <CommandLine>cmd.exe /c winrm set winrm/config/service @{AllowUnencrypted="true"}</CommandLine> - <Description>Win RM AllowUnencrypted</Description> - <Order>7</Order> - <RequiresUserInput>true</RequiresUserInput> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <CommandLine>cmd.exe /c winrm set winrm/config/service/auth @{Basic="true"}</CommandLine> - <Description>Win RM auth Basic</Description> - <Order>8</Order> - <RequiresUserInput>true</RequiresUserInput> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <CommandLine>cmd.exe /c winrm set winrm/config/client/auth @{Basic="true"}</CommandLine> - <Description>Win RM client auth Basic</Description> - <Order>9</Order> - <RequiresUserInput>true</RequiresUserInput> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <CommandLine>cmd.exe /c winrm set winrm/config/listener?Address=*+Transport=HTTP @{Port="5985"} </CommandLine> - <Description>Win RM listener Address/Port</Description> - <Order>10</Order> - <RequiresUserInput>true</RequiresUserInput> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <CommandLine>cmd.exe /c netsh advfirewall firewall set rule group="remote administration" new enable=yes </CommandLine> - <Description>Win RM adv firewall enable</Description> - <Order>11</Order> - <RequiresUserInput>true</RequiresUserInput> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <CommandLine>cmd.exe /c netsh firewall add portopening TCP 5985 "Port 5985" </CommandLine> - <Description>Win RM port open</Description> - <Order>12</Order> - <RequiresUserInput>true</RequiresUserInput> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <CommandLine>cmd.exe /c net stop winrm </CommandLine> - <Description>Stop Win RM Service </Description> - <Order>13</Order> - <RequiresUserInput>true</RequiresUserInput> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <CommandLine>cmd.exe /c sc config winrm start= auto</CommandLine> - <Description>Win RM Autostart</Description> - <Order>14</Order> - <RequiresUserInput>true</RequiresUserInput> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <CommandLine>cmd.exe /c net start winrm</CommandLine> - <Description>Start Win RM Service</Description> - <Order>15</Order> - <RequiresUserInput>true</RequiresUserInput> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <CommandLine>cmd.exe /c wmic useraccount where "name='vagrant'" set PasswordExpires=FALSE</CommandLine> - <Order>16</Order> - <Description>Disable password expiration for vagrant user</Description> - </SynchronousCommand> - </FirstLogonCommands> - </component> - </settings> + <FirstLogonCommands> + <SynchronousCommand wcm:action="add"> + <CommandLine>%windir%\System32\WindowsPowerShell\v1.0\powershell.exe -Command "Set-ExecutionPolicy -ExecutionPolicy RemoteSigned -Force"</CommandLine> + <Description>Set Execution Policy 64 Bit</Description> + <Order>1</Order> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <CommandLine>%windir%\SysWOW64\cmd.exe /c powershell -Command "Set-ExecutionPolicy -ExecutionPolicy RemoteSigned -Force"</CommandLine> + <Description>Set Execution Policy 32 Bit</Description> + <Order>2</Order> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <Order>3</Order> + <CommandLine>%windir%\System32\WindowsPowerShell\v1.0\powershell.exe -Command Get-NetConnectionProfile | Set-NetConnectionProfile -NetworkCategory "Private"</CommandLine> + <Description>Sets detected network connections to private to allow start of winrm</Description> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <Order>4</Order> + <CommandLine>%windir%\System32\WindowsPowerShell\v1.0\powershell.exe -Command Set-NetFirewallRule -Name "WINRM-HTTP-In-TCP" -RemoteAddress Any</CommandLine> + <Description>Allows winrm over public profile interfaces</Description> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <Order>5</Order> + <CommandLine>%windir%\System32\cmd.exe /c winrm quickconfig -q</CommandLine> + <Description>winrm quickconfig -q</Description> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <Order>6</Order> + <CommandLine>%windir%\System32\cmd.exe /c winrm quickconfig -transport:http</CommandLine> + <Description>winrm quickconfig -transport:http</Description> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <Order>7</Order> + <CommandLine>%windir%\System32\cmd.exe /c winrm set winrm/config @{MaxTimeoutms="1800000"}</CommandLine> + <Description>Win RM MaxTimoutms</Description> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <Order>8</Order> + <CommandLine>%windir%\System32\cmd.exe /c winrm set winrm/config/winrs @{MaxMemoryPerShellMB="2048"}</CommandLine> + <Description>Win RM MaxMemoryPerShellMB</Description> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <Order>9</Order> + <CommandLine>%windir%\System32\cmd.exe /c winrm set winrm/config/service @{AllowUnencrypted="true"}</CommandLine> + <Description>Win RM AllowUnencrypted</Description> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <Order>10</Order> + <CommandLine>%windir%\System32\cmd.exe /c winrm set winrm/config/service/auth @{Basic="true"}</CommandLine> + <Description>Win RM auth Basic</Description> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <Order>11</Order> + <CommandLine>%windir%\System32\cmd.exe /c winrm set winrm/config/client/auth @{Basic="true"}</CommandLine> + <Description>Win RM client auth Basic</Description> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <Order>12</Order> + <CommandLine>%windir%\System32\cmd.exe /c winrm set winrm/config/listener?Address=*+Transport=HTTP @{Port="5985"}</CommandLine> + <Description>Win RM listener Address/Port</Description> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <Order>13</Order> + <CommandLine>%windir%\System32\cmd.exe /c netsh firewall add portopening TCP 5985 "Port 5985"</CommandLine> + <Description>Win RM port open</Description> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <Order>14</Order> + <CommandLine>%windir%\System32\cmd.exe /c net stop winrm</CommandLine> + <Description>Stop Win RM Service</Description> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <Order>15</Order> + <CommandLine>%windir%\System32\cmd.exe /c sc config winrm start= auto</CommandLine> + <Description>Win RM Autostart</Description> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <Order>16</Order> + <CommandLine>%windir%\System32\cmd.exe /c net start winrm</CommandLine> + <Description>Start Win RM Service</Description> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <Order>17</Order> + <CommandLine>%windir%\System32\cmd.exe /c wmic useraccount where "name='vagrant'" set PasswordExpires=FALSE</CommandLine> + <Description>Disable password expiration for vagrant user</Description> + </SynchronousCommand> + </FirstLogonCommands> + </component> + <component name="Microsoft-Windows-WinRE-RecoveryAgent" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> + <UninstallWindowsRE>true</UninstallWindowsRE> + </component> + </settings> <settings pass="specialize"> <component xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" name="Microsoft-Windows-ServerManager-SvrMgrNc" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> <DoNotOpenServerManagerAtLogon>true</DoNotOpenServerManagerAtLogon> @@ -285,5 +277,36 @@ <component xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" name="Microsoft-Windows-OutOfBoxExperience" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> <DoNotOpenInitialConfigurationTasksAtLogon>true</DoNotOpenInitialConfigurationTasksAtLogon> </component> + <component name="Microsoft-Windows-SystemRestore-Main" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> + <DisableSR>1</DisableSR> + </component> + <component name="Microsoft-Windows-SystemSettingsThreshold" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> + <DisplayNetworkSelection>false</DisplayNetworkSelection> + </component> + <component name="Networking-MPSSVC-Svc" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> + <FirewallGroups> + <FirewallGroup wcm:action="add" wcm:keyValue="WindowsRemoteManagement"> + <Active>true</Active> + <Group>Windows Remote Management</Group> + <Profile>all</Profile> + </FirewallGroup> + <FirewallGroup wcm:action="add" wcm:keyValue="RemoteAdministration"> + <Active>true</Active> + <Group>Remote Administration</Group> + <Profile>all</Profile> + </FirewallGroup> + </FirewallGroups> + </component> + <component name="Microsoft-Windows-SQMApi" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> + <CEIPEnabled>0</CEIPEnabled> + </component> + <component name="Microsoft-Windows-Security-SPP-UX" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> + <SkipAutoActivation>true</SkipAutoActivation> + </component> + </settings> + <settings pass="offlineServicing"> + <component name="Microsoft-Windows-LUA-Settings" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> + <EnableLUA>false</EnableLUA> + </component> </settings> </unattend> diff --git a/packer_templates/win_answer_files/2019/hyperv-gen2/Autounattend 2.xml b/packer_templates/win_answer_files/2019/hyperv-gen2/Autounattend 2.xml new file mode 100644 index 000000000..58f6821a7 --- /dev/null +++ b/packer_templates/win_answer_files/2019/hyperv-gen2/Autounattend 2.xml @@ -0,0 +1,332 @@ +<?xml version="1.0" encoding="utf-8"?> +<unattend xmlns="urn:schemas-microsoft-com:unattend" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <settings pass="windowsPE"> + <component name="Microsoft-Windows-PnpCustomizationsWinPE" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" processorArchitecture="amd64"> + <!-- + This makes the VirtIO drivers available to Windows, assuming that + the VirtIO driver disk at https://fedorapeople.org/groups/virt/virtio-win/direct-downloads/stable-virtio/virtio-win.iso + (see https://docs.fedoraproject.org/en-US/quick-docs/creating-windows-virtual-machines-using-virtio-drivers/index.html#virtio-win-direct-downloads) + is available as drive E: + --> + <DriverPaths> + <PathAndCredentials wcm:action="add" wcm:keyValue="2"> + <Path>F:\viostor\2k19\amd64</Path> + </PathAndCredentials> + <PathAndCredentials wcm:action="add" wcm:keyValue="3"> + <Path>F:\NetKVM\2k19\amd64</Path> + </PathAndCredentials> + <PathAndCredentials wcm:action="add" wcm:keyValue="4"> + <Path>F:\Balloon\2k19\amd64</Path> + </PathAndCredentials> + <PathAndCredentials wcm:action="add" wcm:keyValue="5"> + <Path>F:\pvpanic\2k19\amd64</Path> + </PathAndCredentials> + <PathAndCredentials wcm:action="add" wcm:keyValue="6"> + <Path>F:\qemupciserial\2k19\amd64</Path> + </PathAndCredentials> + <PathAndCredentials wcm:action="add" wcm:keyValue="7"> + <Path>F:\qxldod\2k19\amd64</Path> + </PathAndCredentials> + <PathAndCredentials wcm:action="add" wcm:keyValue="8"> + <Path>F:\vioinput\2k19\amd64</Path> + </PathAndCredentials> + <PathAndCredentials wcm:action="add" wcm:keyValue="9"> + <Path>F:\viorng\2k19\amd64</Path> + </PathAndCredentials> + <PathAndCredentials wcm:action="add" wcm:keyValue="10"> + <Path>F:\vioscsi\2k19\amd64</Path> + </PathAndCredentials> + <PathAndCredentials wcm:action="add" wcm:keyValue="11"> + <Path>F:\vioserial\2k19\amd64</Path> + </PathAndCredentials> + </DriverPaths> + </component> + <component name="Microsoft-Windows-International-Core-WinPE" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> + <SetupUILanguage> + <UILanguage>en-US</UILanguage> + </SetupUILanguage> + <InputLocale>en-US</InputLocale> + <SystemLocale>en-US</SystemLocale> + <UILanguage>en-US</UILanguage> + <UILanguageFallback>en-US</UILanguageFallback> + <UserLocale>en-US</UserLocale> + </component> + <component name="Microsoft-Windows-Setup" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> + <DiskConfiguration> + <Disk wcm:action="add"> + <CreatePartitions> + <CreatePartition wcm:action="add"> + <Order>1</Order> + <Size>350</Size> + <Type>Primary</Type> + </CreatePartition> + <CreatePartition wcm:action="add"> + <Order>2</Order> + <Size>100</Size> + <Type>EFI</Type> + </CreatePartition> + <CreatePartition wcm:action="add"> + <Order>3</Order> + <Size>128</Size> + <Type>MSR</Type> + </CreatePartition> + <CreatePartition wcm:action="add"> + <Order>4</Order> + <Extend>true</Extend> + <Type>Primary</Type> + </CreatePartition> + </CreatePartitions> + <ModifyPartitions> + <ModifyPartition wcm:action="add"> + <Order>1</Order> + <PartitionID>1</PartitionID> + <Label>WINRE</Label> + <Format>NTFS</Format> + <TypeID>de94bba4-06d1-4d40-a16a-bfd50179d6ac</TypeID> + </ModifyPartition> + <ModifyPartition wcm:action="add"> + <Order>2</Order> + <PartitionID>2</PartitionID> + <Label>System</Label> + <Format>FAT32</Format> + </ModifyPartition> + <ModifyPartition wcm:action="add"> + <Order>3</Order> + <PartitionID>3</PartitionID> + </ModifyPartition> + <ModifyPartition wcm:action="add"> + <Order>4</Order> + <PartitionID>4</PartitionID> + <Label>Windows</Label> + <Format>NTFS</Format> + </ModifyPartition> + </ModifyPartitions> + <DiskID>0</DiskID> + <WillWipeDisk>true</WillWipeDisk> + </Disk> + <WillShowUI>OnError</WillShowUI> + </DiskConfiguration> + <ImageInstall> + <OSImage> + <InstallFrom> + <MetaData wcm:action="add"> + <Key>/IMAGE/NAME</Key> + <Value>Windows Server 2019 SERVERSTANDARD</Value> + </MetaData> + </InstallFrom> + <InstallTo> + <DiskID>0</DiskID> + <PartitionID>4</PartitionID> + </InstallTo> + </OSImage> + </ImageInstall> + <UserData> + <ProductKey> + <WillShowUI>OnError</WillShowUI> + </ProductKey> + <AcceptEula>true</AcceptEula> + <FullName>Vagrant</FullName> + <Organization>Bento by Chef Software, Inc.</Organization> + </UserData> + <DynamicUpdate> + <Enable>false</Enable> + </DynamicUpdate> + </component> + </settings> + <settings pass="generalize"> + <component name="Microsoft-Windows-Security-SPP" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> + <SkipRearm>1</SkipRearm> + </component> + <component name="Microsoft-Windows-PnpSysprep" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> + <PersistAllDeviceInstalls>false</PersistAllDeviceInstalls> + <DoNotCleanUpNonPresentDevices>false</DoNotCleanUpNonPresentDevices> + </component> + </settings> + <settings pass="oobeSystem"> + <component name="Microsoft-Windows-International-Core" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> + <InputLocale>en-US</InputLocale> + <SystemLocale>en-US</SystemLocale> + <UILanguage>en-US</UILanguage> + <UserLocale>en-US</UserLocale> + </component> + <component name="Microsoft-Windows-Shell-Setup" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> + <OOBE> + <HideEULAPage>true</HideEULAPage> + <HideLocalAccountScreen>true</HideLocalAccountScreen> + <HideOEMRegistrationScreen>true</HideOEMRegistrationScreen> + <HideOnlineAccountScreens>true</HideOnlineAccountScreens> + <HideWirelessSetupInOOBE>true</HideWirelessSetupInOOBE> + <NetworkLocation>Work</NetworkLocation> + <ProtectYourPC>3</ProtectYourPC> + <SkipMachineOOBE>true</SkipMachineOOBE> + <SkipUserOOBE>true</SkipUserOOBE> + <VMModeOptimizations> + <SkipAdministratorProfileRemoval>true</SkipAdministratorProfileRemoval> + <SkipNotifyUILanguageChange>true</SkipNotifyUILanguageChange> + <SkipWinREInitialization>true</SkipWinREInitialization> + </VMModeOptimizations> + </OOBE> + <TimeZone>UTC</TimeZone> + <UserAccounts> + <AdministratorPassword> + <Value>vagrant</Value> + <PlainText>true</PlainText> + </AdministratorPassword> + <LocalAccounts> + <LocalAccount wcm:action="add"> + <Password> + <Value>vagrant</Value> + <PlainText>true</PlainText> + </Password> + <Description>Vagrant User</Description> + <DisplayName>vagrant</DisplayName> + <Group>administrators</Group> + <Name>vagrant</Name> + </LocalAccount> + </LocalAccounts> + </UserAccounts> + <AutoLogon> + <Password> + <Value>vagrant</Value> + <PlainText>true</PlainText> + </Password> + <Username>vagrant</Username> + <Enabled>true</Enabled> + </AutoLogon> + <FirstLogonCommands> + <SynchronousCommand wcm:action="add"> + <CommandLine>%windir%\System32\WindowsPowerShell\v1.0\powershell.exe -Command "Set-ExecutionPolicy -ExecutionPolicy RemoteSigned -Force"</CommandLine> + <Description>Set Execution Policy 64 Bit</Description> + <Order>1</Order> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <CommandLine>%windir%\SysWOW64\cmd.exe /c powershell -Command "Set-ExecutionPolicy -ExecutionPolicy RemoteSigned -Force"</CommandLine> + <Description>Set Execution Policy 32 Bit</Description> + <Order>2</Order> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <Order>3</Order> + <CommandLine>%windir%\System32\WindowsPowerShell\v1.0\powershell.exe -Command Get-NetConnectionProfile | Set-NetConnectionProfile -NetworkCategory "Private"</CommandLine> + <Description>Sets detected network connections to private to allow start of winrm</Description> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <Order>4</Order> + <CommandLine>%windir%\System32\WindowsPowerShell\v1.0\powershell.exe -Command Set-NetFirewallRule -Name "WINRM-HTTP-In-TCP" -RemoteAddress Any</CommandLine> + <Description>Allows winrm over public profile interfaces</Description> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <Order>5</Order> + <CommandLine>%windir%\System32\cmd.exe /c winrm quickconfig -q</CommandLine> + <Description>winrm quickconfig -q</Description> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <Order>6</Order> + <CommandLine>%windir%\System32\cmd.exe /c winrm quickconfig -transport:http</CommandLine> + <Description>winrm quickconfig -transport:http</Description> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <Order>7</Order> + <CommandLine>%windir%\System32\cmd.exe /c winrm set winrm/config @{MaxTimeoutms="1800000"}</CommandLine> + <Description>Win RM MaxTimoutms</Description> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <Order>8</Order> + <CommandLine>%windir%\System32\cmd.exe /c winrm set winrm/config/winrs @{MaxMemoryPerShellMB="2048"}</CommandLine> + <Description>Win RM MaxMemoryPerShellMB</Description> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <Order>9</Order> + <CommandLine>%windir%\System32\cmd.exe /c winrm set winrm/config/service @{AllowUnencrypted="true"}</CommandLine> + <Description>Win RM AllowUnencrypted</Description> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <Order>10</Order> + <CommandLine>%windir%\System32\cmd.exe /c winrm set winrm/config/service/auth @{Basic="true"}</CommandLine> + <Description>Win RM auth Basic</Description> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <Order>11</Order> + <CommandLine>%windir%\System32\cmd.exe /c winrm set winrm/config/client/auth @{Basic="true"}</CommandLine> + <Description>Win RM client auth Basic</Description> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <Order>12</Order> + <CommandLine>%windir%\System32\cmd.exe /c winrm set winrm/config/listener?Address=*+Transport=HTTP @{Port="5985"}</CommandLine> + <Description>Win RM listener Address/Port</Description> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <Order>13</Order> + <CommandLine>%windir%\System32\cmd.exe /c netsh firewall add portopening TCP 5985 "Port 5985"</CommandLine> + <Description>Win RM port open</Description> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <Order>14</Order> + <CommandLine>%windir%\System32\cmd.exe /c net stop winrm</CommandLine> + <Description>Stop Win RM Service</Description> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <Order>15</Order> + <CommandLine>%windir%\System32\cmd.exe /c sc config winrm start= auto</CommandLine> + <Description>Win RM Autostart</Description> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <Order>16</Order> + <CommandLine>%windir%\System32\cmd.exe /c net start winrm</CommandLine> + <Description>Start Win RM Service</Description> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <Order>17</Order> + <CommandLine>%windir%\System32\cmd.exe /c wmic useraccount where "name='vagrant'" set PasswordExpires=FALSE</CommandLine> + <Description>Disable password expiration for vagrant user</Description> + </SynchronousCommand> + </FirstLogonCommands> + </component> + <component name="Microsoft-Windows-WinRE-RecoveryAgent" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> + <UninstallWindowsRE>true</UninstallWindowsRE> + </component> + </settings> + <settings pass="specialize"> + <component name="Microsoft-Windows-ServerManager-SvrMgrNc" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> + <DoNotOpenServerManagerAtLogon>true</DoNotOpenServerManagerAtLogon> + </component> + <component name="Microsoft-Windows-IE-ESC" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> + <!-- Disable IE ESC. --> + <IEHardenAdmin>false</IEHardenAdmin> + <IEHardenUser>false</IEHardenUser> + </component> + <component name="Microsoft-Windows-OutOfBoxExperience" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> + <DoNotOpenInitialConfigurationTasksAtLogon>true</DoNotOpenInitialConfigurationTasksAtLogon> + </component> + <component name="Microsoft-Windows-SystemRestore-Main" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> + <DisableSR>1</DisableSR> + </component> + <component name="Microsoft-Windows-SystemSettingsThreshold" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> + <DisplayNetworkSelection>false</DisplayNetworkSelection> + </component> + <component name="Networking-MPSSVC-Svc" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> + <FirewallGroups> + <FirewallGroup wcm:action="add" wcm:keyValue="WindowsRemoteManagement"> + <Active>true</Active> + <Group>Windows Remote Management</Group> + <Profile>all</Profile> + </FirewallGroup> + <FirewallGroup wcm:action="add" wcm:keyValue="RemoteAdministration"> + <Active>true</Active> + <Group>Remote Administration</Group> + <Profile>all</Profile> + </FirewallGroup> + </FirewallGroups> + </component> + <component name="Microsoft-Windows-SQMApi" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> + <CEIPEnabled>0</CEIPEnabled> + </component> + <component name="Microsoft-Windows-Security-SPP-UX" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> + <SkipAutoActivation>true</SkipAutoActivation> + </component> + </settings> + <settings pass="offlineServicing"> + <component name="Microsoft-Windows-LUA-Settings" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> + <EnableLUA>false</EnableLUA> + </component> + </settings> +</unattend> diff --git a/packer_templates/win_answer_files/2019/hyperv-gen2/Autounattend.xml b/packer_templates/win_answer_files/2019/hyperv-gen2/Autounattend.xml new file mode 100644 index 000000000..58f6821a7 --- /dev/null +++ b/packer_templates/win_answer_files/2019/hyperv-gen2/Autounattend.xml @@ -0,0 +1,332 @@ +<?xml version="1.0" encoding="utf-8"?> +<unattend xmlns="urn:schemas-microsoft-com:unattend" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <settings pass="windowsPE"> + <component name="Microsoft-Windows-PnpCustomizationsWinPE" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" processorArchitecture="amd64"> + <!-- + This makes the VirtIO drivers available to Windows, assuming that + the VirtIO driver disk at https://fedorapeople.org/groups/virt/virtio-win/direct-downloads/stable-virtio/virtio-win.iso + (see https://docs.fedoraproject.org/en-US/quick-docs/creating-windows-virtual-machines-using-virtio-drivers/index.html#virtio-win-direct-downloads) + is available as drive E: + --> + <DriverPaths> + <PathAndCredentials wcm:action="add" wcm:keyValue="2"> + <Path>F:\viostor\2k19\amd64</Path> + </PathAndCredentials> + <PathAndCredentials wcm:action="add" wcm:keyValue="3"> + <Path>F:\NetKVM\2k19\amd64</Path> + </PathAndCredentials> + <PathAndCredentials wcm:action="add" wcm:keyValue="4"> + <Path>F:\Balloon\2k19\amd64</Path> + </PathAndCredentials> + <PathAndCredentials wcm:action="add" wcm:keyValue="5"> + <Path>F:\pvpanic\2k19\amd64</Path> + </PathAndCredentials> + <PathAndCredentials wcm:action="add" wcm:keyValue="6"> + <Path>F:\qemupciserial\2k19\amd64</Path> + </PathAndCredentials> + <PathAndCredentials wcm:action="add" wcm:keyValue="7"> + <Path>F:\qxldod\2k19\amd64</Path> + </PathAndCredentials> + <PathAndCredentials wcm:action="add" wcm:keyValue="8"> + <Path>F:\vioinput\2k19\amd64</Path> + </PathAndCredentials> + <PathAndCredentials wcm:action="add" wcm:keyValue="9"> + <Path>F:\viorng\2k19\amd64</Path> + </PathAndCredentials> + <PathAndCredentials wcm:action="add" wcm:keyValue="10"> + <Path>F:\vioscsi\2k19\amd64</Path> + </PathAndCredentials> + <PathAndCredentials wcm:action="add" wcm:keyValue="11"> + <Path>F:\vioserial\2k19\amd64</Path> + </PathAndCredentials> + </DriverPaths> + </component> + <component name="Microsoft-Windows-International-Core-WinPE" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> + <SetupUILanguage> + <UILanguage>en-US</UILanguage> + </SetupUILanguage> + <InputLocale>en-US</InputLocale> + <SystemLocale>en-US</SystemLocale> + <UILanguage>en-US</UILanguage> + <UILanguageFallback>en-US</UILanguageFallback> + <UserLocale>en-US</UserLocale> + </component> + <component name="Microsoft-Windows-Setup" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> + <DiskConfiguration> + <Disk wcm:action="add"> + <CreatePartitions> + <CreatePartition wcm:action="add"> + <Order>1</Order> + <Size>350</Size> + <Type>Primary</Type> + </CreatePartition> + <CreatePartition wcm:action="add"> + <Order>2</Order> + <Size>100</Size> + <Type>EFI</Type> + </CreatePartition> + <CreatePartition wcm:action="add"> + <Order>3</Order> + <Size>128</Size> + <Type>MSR</Type> + </CreatePartition> + <CreatePartition wcm:action="add"> + <Order>4</Order> + <Extend>true</Extend> + <Type>Primary</Type> + </CreatePartition> + </CreatePartitions> + <ModifyPartitions> + <ModifyPartition wcm:action="add"> + <Order>1</Order> + <PartitionID>1</PartitionID> + <Label>WINRE</Label> + <Format>NTFS</Format> + <TypeID>de94bba4-06d1-4d40-a16a-bfd50179d6ac</TypeID> + </ModifyPartition> + <ModifyPartition wcm:action="add"> + <Order>2</Order> + <PartitionID>2</PartitionID> + <Label>System</Label> + <Format>FAT32</Format> + </ModifyPartition> + <ModifyPartition wcm:action="add"> + <Order>3</Order> + <PartitionID>3</PartitionID> + </ModifyPartition> + <ModifyPartition wcm:action="add"> + <Order>4</Order> + <PartitionID>4</PartitionID> + <Label>Windows</Label> + <Format>NTFS</Format> + </ModifyPartition> + </ModifyPartitions> + <DiskID>0</DiskID> + <WillWipeDisk>true</WillWipeDisk> + </Disk> + <WillShowUI>OnError</WillShowUI> + </DiskConfiguration> + <ImageInstall> + <OSImage> + <InstallFrom> + <MetaData wcm:action="add"> + <Key>/IMAGE/NAME</Key> + <Value>Windows Server 2019 SERVERSTANDARD</Value> + </MetaData> + </InstallFrom> + <InstallTo> + <DiskID>0</DiskID> + <PartitionID>4</PartitionID> + </InstallTo> + </OSImage> + </ImageInstall> + <UserData> + <ProductKey> + <WillShowUI>OnError</WillShowUI> + </ProductKey> + <AcceptEula>true</AcceptEula> + <FullName>Vagrant</FullName> + <Organization>Bento by Chef Software, Inc.</Organization> + </UserData> + <DynamicUpdate> + <Enable>false</Enable> + </DynamicUpdate> + </component> + </settings> + <settings pass="generalize"> + <component name="Microsoft-Windows-Security-SPP" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> + <SkipRearm>1</SkipRearm> + </component> + <component name="Microsoft-Windows-PnpSysprep" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> + <PersistAllDeviceInstalls>false</PersistAllDeviceInstalls> + <DoNotCleanUpNonPresentDevices>false</DoNotCleanUpNonPresentDevices> + </component> + </settings> + <settings pass="oobeSystem"> + <component name="Microsoft-Windows-International-Core" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> + <InputLocale>en-US</InputLocale> + <SystemLocale>en-US</SystemLocale> + <UILanguage>en-US</UILanguage> + <UserLocale>en-US</UserLocale> + </component> + <component name="Microsoft-Windows-Shell-Setup" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> + <OOBE> + <HideEULAPage>true</HideEULAPage> + <HideLocalAccountScreen>true</HideLocalAccountScreen> + <HideOEMRegistrationScreen>true</HideOEMRegistrationScreen> + <HideOnlineAccountScreens>true</HideOnlineAccountScreens> + <HideWirelessSetupInOOBE>true</HideWirelessSetupInOOBE> + <NetworkLocation>Work</NetworkLocation> + <ProtectYourPC>3</ProtectYourPC> + <SkipMachineOOBE>true</SkipMachineOOBE> + <SkipUserOOBE>true</SkipUserOOBE> + <VMModeOptimizations> + <SkipAdministratorProfileRemoval>true</SkipAdministratorProfileRemoval> + <SkipNotifyUILanguageChange>true</SkipNotifyUILanguageChange> + <SkipWinREInitialization>true</SkipWinREInitialization> + </VMModeOptimizations> + </OOBE> + <TimeZone>UTC</TimeZone> + <UserAccounts> + <AdministratorPassword> + <Value>vagrant</Value> + <PlainText>true</PlainText> + </AdministratorPassword> + <LocalAccounts> + <LocalAccount wcm:action="add"> + <Password> + <Value>vagrant</Value> + <PlainText>true</PlainText> + </Password> + <Description>Vagrant User</Description> + <DisplayName>vagrant</DisplayName> + <Group>administrators</Group> + <Name>vagrant</Name> + </LocalAccount> + </LocalAccounts> + </UserAccounts> + <AutoLogon> + <Password> + <Value>vagrant</Value> + <PlainText>true</PlainText> + </Password> + <Username>vagrant</Username> + <Enabled>true</Enabled> + </AutoLogon> + <FirstLogonCommands> + <SynchronousCommand wcm:action="add"> + <CommandLine>%windir%\System32\WindowsPowerShell\v1.0\powershell.exe -Command "Set-ExecutionPolicy -ExecutionPolicy RemoteSigned -Force"</CommandLine> + <Description>Set Execution Policy 64 Bit</Description> + <Order>1</Order> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <CommandLine>%windir%\SysWOW64\cmd.exe /c powershell -Command "Set-ExecutionPolicy -ExecutionPolicy RemoteSigned -Force"</CommandLine> + <Description>Set Execution Policy 32 Bit</Description> + <Order>2</Order> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <Order>3</Order> + <CommandLine>%windir%\System32\WindowsPowerShell\v1.0\powershell.exe -Command Get-NetConnectionProfile | Set-NetConnectionProfile -NetworkCategory "Private"</CommandLine> + <Description>Sets detected network connections to private to allow start of winrm</Description> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <Order>4</Order> + <CommandLine>%windir%\System32\WindowsPowerShell\v1.0\powershell.exe -Command Set-NetFirewallRule -Name "WINRM-HTTP-In-TCP" -RemoteAddress Any</CommandLine> + <Description>Allows winrm over public profile interfaces</Description> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <Order>5</Order> + <CommandLine>%windir%\System32\cmd.exe /c winrm quickconfig -q</CommandLine> + <Description>winrm quickconfig -q</Description> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <Order>6</Order> + <CommandLine>%windir%\System32\cmd.exe /c winrm quickconfig -transport:http</CommandLine> + <Description>winrm quickconfig -transport:http</Description> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <Order>7</Order> + <CommandLine>%windir%\System32\cmd.exe /c winrm set winrm/config @{MaxTimeoutms="1800000"}</CommandLine> + <Description>Win RM MaxTimoutms</Description> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <Order>8</Order> + <CommandLine>%windir%\System32\cmd.exe /c winrm set winrm/config/winrs @{MaxMemoryPerShellMB="2048"}</CommandLine> + <Description>Win RM MaxMemoryPerShellMB</Description> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <Order>9</Order> + <CommandLine>%windir%\System32\cmd.exe /c winrm set winrm/config/service @{AllowUnencrypted="true"}</CommandLine> + <Description>Win RM AllowUnencrypted</Description> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <Order>10</Order> + <CommandLine>%windir%\System32\cmd.exe /c winrm set winrm/config/service/auth @{Basic="true"}</CommandLine> + <Description>Win RM auth Basic</Description> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <Order>11</Order> + <CommandLine>%windir%\System32\cmd.exe /c winrm set winrm/config/client/auth @{Basic="true"}</CommandLine> + <Description>Win RM client auth Basic</Description> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <Order>12</Order> + <CommandLine>%windir%\System32\cmd.exe /c winrm set winrm/config/listener?Address=*+Transport=HTTP @{Port="5985"}</CommandLine> + <Description>Win RM listener Address/Port</Description> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <Order>13</Order> + <CommandLine>%windir%\System32\cmd.exe /c netsh firewall add portopening TCP 5985 "Port 5985"</CommandLine> + <Description>Win RM port open</Description> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <Order>14</Order> + <CommandLine>%windir%\System32\cmd.exe /c net stop winrm</CommandLine> + <Description>Stop Win RM Service</Description> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <Order>15</Order> + <CommandLine>%windir%\System32\cmd.exe /c sc config winrm start= auto</CommandLine> + <Description>Win RM Autostart</Description> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <Order>16</Order> + <CommandLine>%windir%\System32\cmd.exe /c net start winrm</CommandLine> + <Description>Start Win RM Service</Description> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <Order>17</Order> + <CommandLine>%windir%\System32\cmd.exe /c wmic useraccount where "name='vagrant'" set PasswordExpires=FALSE</CommandLine> + <Description>Disable password expiration for vagrant user</Description> + </SynchronousCommand> + </FirstLogonCommands> + </component> + <component name="Microsoft-Windows-WinRE-RecoveryAgent" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> + <UninstallWindowsRE>true</UninstallWindowsRE> + </component> + </settings> + <settings pass="specialize"> + <component name="Microsoft-Windows-ServerManager-SvrMgrNc" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> + <DoNotOpenServerManagerAtLogon>true</DoNotOpenServerManagerAtLogon> + </component> + <component name="Microsoft-Windows-IE-ESC" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> + <!-- Disable IE ESC. --> + <IEHardenAdmin>false</IEHardenAdmin> + <IEHardenUser>false</IEHardenUser> + </component> + <component name="Microsoft-Windows-OutOfBoxExperience" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> + <DoNotOpenInitialConfigurationTasksAtLogon>true</DoNotOpenInitialConfigurationTasksAtLogon> + </component> + <component name="Microsoft-Windows-SystemRestore-Main" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> + <DisableSR>1</DisableSR> + </component> + <component name="Microsoft-Windows-SystemSettingsThreshold" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> + <DisplayNetworkSelection>false</DisplayNetworkSelection> + </component> + <component name="Networking-MPSSVC-Svc" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> + <FirewallGroups> + <FirewallGroup wcm:action="add" wcm:keyValue="WindowsRemoteManagement"> + <Active>true</Active> + <Group>Windows Remote Management</Group> + <Profile>all</Profile> + </FirewallGroup> + <FirewallGroup wcm:action="add" wcm:keyValue="RemoteAdministration"> + <Active>true</Active> + <Group>Remote Administration</Group> + <Profile>all</Profile> + </FirewallGroup> + </FirewallGroups> + </component> + <component name="Microsoft-Windows-SQMApi" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> + <CEIPEnabled>0</CEIPEnabled> + </component> + <component name="Microsoft-Windows-Security-SPP-UX" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> + <SkipAutoActivation>true</SkipAutoActivation> + </component> + </settings> + <settings pass="offlineServicing"> + <component name="Microsoft-Windows-LUA-Settings" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> + <EnableLUA>false</EnableLUA> + </component> + </settings> +</unattend> diff --git a/packer_templates/win_answer_files/2022/Autounattend.xml b/packer_templates/win_answer_files/2022/Autounattend.xml index 82ceb0b89..929915b8c 100644 --- a/packer_templates/win_answer_files/2022/Autounattend.xml +++ b/packer_templates/win_answer_files/2022/Autounattend.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> -<unattend xmlns="urn:schemas-microsoft-com:unattend"> +<unattend xmlns="urn:schemas-microsoft-com:unattend" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> <settings pass="windowsPE"> - <component name="Microsoft-Windows-PnpCustomizationsWinPE" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" processorArchitecture="amd64" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State"> + <component name="Microsoft-Windows-PnpCustomizationsWinPE" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" processorArchitecture="amd64"> <!-- This makes the VirtIO drivers available to Windows, assuming that the VirtIO driver disk at https://fedorapeople.org/groups/virt/virtio-win/direct-downloads/stable-virtio/virtio-win.iso @@ -12,45 +12,36 @@ <PathAndCredentials wcm:action="add" wcm:keyValue="2"> <Path>E:\viostor\2k22\amd64</Path> </PathAndCredentials> - <PathAndCredentials wcm:action="add" wcm:keyValue="3"> <Path>E:\NetKVM\2k22\amd64</Path> </PathAndCredentials> - <PathAndCredentials wcm:action="add" wcm:keyValue="4"> <Path>E:\Balloon\2k22\amd64</Path> </PathAndCredentials> - <PathAndCredentials wcm:action="add" wcm:keyValue="5"> <Path>E:\pvpanic\2k22\amd64</Path> </PathAndCredentials> - <PathAndCredentials wcm:action="add" wcm:keyValue="6"> <Path>E:\qemupciserial\2k22\amd64</Path> </PathAndCredentials> - <PathAndCredentials wcm:action="add" wcm:keyValue="7"> <Path>E:\qxldod\2k22\amd64</Path> </PathAndCredentials> - <PathAndCredentials wcm:action="add" wcm:keyValue="8"> <Path>E:\vioinput\2k22\amd64</Path> </PathAndCredentials> - <PathAndCredentials wcm:action="add" wcm:keyValue="9"> <Path>E:\viorng\2k22\amd64</Path> </PathAndCredentials> - <PathAndCredentials wcm:action="add" wcm:keyValue="10"> <Path>E:\vioscsi\2k22\amd64</Path> </PathAndCredentials> - <PathAndCredentials wcm:action="add" wcm:keyValue="11"> <Path>E:\vioserial\2k22\amd64</Path> </PathAndCredentials> </DriverPaths> </component> - <component name="Microsoft-Windows-International-Core-WinPE" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <component name="Microsoft-Windows-International-Core-WinPE" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> <SetupUILanguage> <UILanguage>en-US</UILanguage> </SetupUILanguage> @@ -60,14 +51,14 @@ <UILanguageFallback>en-US</UILanguageFallback> <UserLocale>en-US</UserLocale> </component> - <component name="Microsoft-Windows-Setup" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <component name="Microsoft-Windows-Setup" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> <DiskConfiguration> <Disk wcm:action="add"> <CreatePartitions> <CreatePartition wcm:action="add"> <Type>Primary</Type> <Order>1</Order> - <Size>350</Size> + <Size>100</Size> </CreatePartition> <CreatePartition wcm:action="add"> <Order>2</Order> @@ -85,7 +76,7 @@ </ModifyPartition> <ModifyPartition wcm:action="add"> <Format>NTFS</Format> - <Label>Windows 2022</Label> + <Label>Windows</Label> <Letter>C</Letter> <Order>2</Order> <PartitionID>2</PartitionID> @@ -100,7 +91,7 @@ <InstallFrom> <MetaData wcm:action="add"> <Key>/IMAGE/NAME</Key> - <Value>Windows Server 2022 SERVERDATACENTER</Value> + <Value>Windows Server 2022 SERVERSTANDARD</Value> </MetaData> </InstallFrom> <InstallTo> @@ -117,55 +108,63 @@ <FullName>Vagrant</FullName> <Organization>Bento by Chef Software, Inc.</Organization> </UserData> + <DynamicUpdate> + <Enable>false</Enable> + </DynamicUpdate> </component> </settings> - <settings pass="generalize"> - <component name="Microsoft-Windows-Security-SPP" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - <SkipRearm>1</SkipRearm> - </component> - <component name="Microsoft-Windows-PnpSysprep" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - <PersistAllDeviceInstalls>false</PersistAllDeviceInstalls> - <DoNotCleanUpNonPresentDevices>false</DoNotCleanUpNonPresentDevices> - </component> - </settings> - <settings pass="oobeSystem"> - <component name="Microsoft-Windows-International-Core" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - <InputLocale>en-US</InputLocale> - <SystemLocale>en-US</SystemLocale> - <UILanguage>en-US</UILanguage> - <UserLocale>en-US</UserLocale> - </component> - <component name="Microsoft-Windows-Shell-Setup" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <settings pass="generalize"> + <component name="Microsoft-Windows-Security-SPP" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> + <SkipRearm>1</SkipRearm> + </component> + <component name="Microsoft-Windows-PnpSysprep" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> + <PersistAllDeviceInstalls>false</PersistAllDeviceInstalls> + <DoNotCleanUpNonPresentDevices>false</DoNotCleanUpNonPresentDevices> + </component> + </settings> + <settings pass="oobeSystem"> + <component name="Microsoft-Windows-International-Core" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> + <InputLocale>en-US</InputLocale> + <SystemLocale>en-US</SystemLocale> + <UILanguage>en-US</UILanguage> + <UserLocale>en-US</UserLocale> + </component> + <component name="Microsoft-Windows-Shell-Setup" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> <OOBE> <HideEULAPage>true</HideEULAPage> <HideLocalAccountScreen>true</HideLocalAccountScreen> <HideOEMRegistrationScreen>true</HideOEMRegistrationScreen> <HideOnlineAccountScreens>true</HideOnlineAccountScreens> <HideWirelessSetupInOOBE>true</HideWirelessSetupInOOBE> - <NetworkLocation>Home</NetworkLocation> + <NetworkLocation>Work</NetworkLocation> <ProtectYourPC>3</ProtectYourPC> <SkipMachineOOBE>true</SkipMachineOOBE> <SkipUserOOBE>true</SkipUserOOBE> + <VMModeOptimizations> + <SkipAdministratorProfileRemoval>true</SkipAdministratorProfileRemoval> + <SkipNotifyUILanguageChange>true</SkipNotifyUILanguageChange> + <SkipWinREInitialization>true</SkipWinREInitialization> + </VMModeOptimizations> </OOBE> - <TimeZone>UTC</TimeZone> - <UserAccounts> - <AdministratorPassword> - <Value>vagrant</Value> - <PlainText>true</PlainText> - </AdministratorPassword> - <LocalAccounts> - <LocalAccount wcm:action="add"> - <Password> - <Value>vagrant</Value> - <PlainText>true</PlainText> - </Password> - <Description>Vagrant User</Description> - <DisplayName>vagrant</DisplayName> - <Group>administrators</Group> - <Name>vagrant</Name> - </LocalAccount> - </LocalAccounts> - </UserAccounts> + <TimeZone>UTC</TimeZone> + <UserAccounts> + <AdministratorPassword> + <Value>vagrant</Value> + <PlainText>true</PlainText> + </AdministratorPassword> + <LocalAccounts> + <LocalAccount wcm:action="add"> + <Password> + <Value>vagrant</Value> + <PlainText>true</PlainText> + </Password> + <Description>Vagrant User</Description> + <DisplayName>vagrant</DisplayName> + <Group>administrators</Group> + <Name>vagrant</Name> + </LocalAccount> + </LocalAccounts> + </UserAccounts> <AutoLogon> <Password> <Value>vagrant</Value> @@ -174,105 +173,98 @@ <Username>vagrant</Username> <Enabled>true</Enabled> </AutoLogon> - <FirstLogonCommands> - <SynchronousCommand wcm:action="add"> - <CommandLine>cmd.exe /c powershell -Command "Set-ExecutionPolicy -ExecutionPolicy RemoteSigned -Force"</CommandLine> - <Description>Set Execution Policy 64 Bit</Description> - <Order>1</Order> - <RequiresUserInput>true</RequiresUserInput> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <CommandLine>C:\Windows\SysWOW64\cmd.exe /c powershell -Command "Set-ExecutionPolicy -ExecutionPolicy RemoteSigned -Force"</CommandLine> - <Description>Set Execution Policy 32 Bit</Description> - <Order>2</Order> - <RequiresUserInput>true</RequiresUserInput> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <CommandLine>cmd.exe /c winrm quickconfig -q</CommandLine> - <Description>winrm quickconfig -q</Description> - <Order>3</Order> - <RequiresUserInput>true</RequiresUserInput> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <CommandLine>cmd.exe /c winrm quickconfig -transport:http</CommandLine> - <Description>winrm quickconfig -transport:http</Description> - <Order>4</Order> - <RequiresUserInput>true</RequiresUserInput> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <CommandLine>cmd.exe /c winrm set winrm/config @{MaxTimeoutms="1800000"}</CommandLine> - <Description>Win RM MaxTimoutms</Description> - <Order>5</Order> - <RequiresUserInput>true</RequiresUserInput> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <CommandLine>cmd.exe /c winrm set winrm/config/winrs @{MaxMemoryPerShellMB="800"}</CommandLine> - <Description>Win RM MaxMemoryPerShellMB</Description> - <Order>6</Order> - <RequiresUserInput>true</RequiresUserInput> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <CommandLine>cmd.exe /c winrm set winrm/config/service @{AllowUnencrypted="true"}</CommandLine> - <Description>Win RM AllowUnencrypted</Description> - <Order>7</Order> - <RequiresUserInput>true</RequiresUserInput> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <CommandLine>cmd.exe /c winrm set winrm/config/service/auth @{Basic="true"}</CommandLine> - <Description>Win RM auth Basic</Description> - <Order>8</Order> - <RequiresUserInput>true</RequiresUserInput> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <CommandLine>cmd.exe /c winrm set winrm/config/client/auth @{Basic="true"}</CommandLine> - <Description>Win RM client auth Basic</Description> - <Order>9</Order> - <RequiresUserInput>true</RequiresUserInput> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <CommandLine>cmd.exe /c winrm set winrm/config/listener?Address=*+Transport=HTTP @{Port="5985"} </CommandLine> - <Description>Win RM listener Address/Port</Description> - <Order>10</Order> - <RequiresUserInput>true</RequiresUserInput> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <CommandLine>cmd.exe /c netsh advfirewall firewall set rule group="remote administration" new enable=yes </CommandLine> - <Description>Win RM adv firewall enable</Description> - <Order>11</Order> - <RequiresUserInput>true</RequiresUserInput> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <CommandLine>cmd.exe /c netsh firewall add portopening TCP 5985 "Port 5985" </CommandLine> - <Description>Win RM port open</Description> - <Order>12</Order> - <RequiresUserInput>true</RequiresUserInput> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <CommandLine>cmd.exe /c net stop winrm </CommandLine> - <Description>Stop Win RM Service </Description> - <Order>13</Order> - <RequiresUserInput>true</RequiresUserInput> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <CommandLine>cmd.exe /c sc config winrm start= auto</CommandLine> - <Description>Win RM Autostart</Description> - <Order>14</Order> - <RequiresUserInput>true</RequiresUserInput> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <CommandLine>cmd.exe /c net start winrm</CommandLine> - <Description>Start Win RM Service</Description> - <Order>15</Order> - <RequiresUserInput>true</RequiresUserInput> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <CommandLine>cmd.exe /c wmic useraccount where "name='vagrant'" set PasswordExpires=FALSE</CommandLine> - <Order>16</Order> - <Description>Disable password expiration for vagrant user</Description> - </SynchronousCommand> - </FirstLogonCommands> - </component> - </settings> + <FirstLogonCommands> + <SynchronousCommand wcm:action="add"> + <CommandLine>%windir%\System32\WindowsPowerShell\v1.0\powershell.exe -Command "Set-ExecutionPolicy -ExecutionPolicy RemoteSigned -Force"</CommandLine> + <Description>Set Execution Policy 64 Bit</Description> + <Order>1</Order> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <CommandLine>%windir%\SysWOW64\cmd.exe /c powershell -Command "Set-ExecutionPolicy -ExecutionPolicy RemoteSigned -Force"</CommandLine> + <Description>Set Execution Policy 32 Bit</Description> + <Order>2</Order> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <Order>3</Order> + <CommandLine>%windir%\System32\WindowsPowerShell\v1.0\powershell.exe -Command Get-NetConnectionProfile | Set-NetConnectionProfile -NetworkCategory "Private"</CommandLine> + <Description>Sets detected network connections to private to allow start of winrm</Description> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <Order>4</Order> + <CommandLine>%windir%\System32\WindowsPowerShell\v1.0\powershell.exe -Command Set-NetFirewallRule -Name "WINRM-HTTP-In-TCP" -RemoteAddress Any</CommandLine> + <Description>Allows winrm over public profile interfaces</Description> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <Order>5</Order> + <CommandLine>%windir%\System32\cmd.exe /c winrm quickconfig -q</CommandLine> + <Description>winrm quickconfig -q</Description> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <Order>6</Order> + <CommandLine>%windir%\System32\cmd.exe /c winrm quickconfig -transport:http</CommandLine> + <Description>winrm quickconfig -transport:http</Description> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <Order>7</Order> + <CommandLine>%windir%\System32\cmd.exe /c winrm set winrm/config @{MaxTimeoutms="1800000"}</CommandLine> + <Description>Win RM MaxTimoutms</Description> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <Order>8</Order> + <CommandLine>%windir%\System32\cmd.exe /c winrm set winrm/config/winrs @{MaxMemoryPerShellMB="2048"}</CommandLine> + <Description>Win RM MaxMemoryPerShellMB</Description> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <Order>9</Order> + <CommandLine>%windir%\System32\cmd.exe /c winrm set winrm/config/service @{AllowUnencrypted="true"}</CommandLine> + <Description>Win RM AllowUnencrypted</Description> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <Order>10</Order> + <CommandLine>%windir%\System32\cmd.exe /c winrm set winrm/config/service/auth @{Basic="true"}</CommandLine> + <Description>Win RM auth Basic</Description> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <Order>11</Order> + <CommandLine>%windir%\System32\cmd.exe /c winrm set winrm/config/client/auth @{Basic="true"}</CommandLine> + <Description>Win RM client auth Basic</Description> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <Order>12</Order> + <CommandLine>%windir%\System32\cmd.exe /c winrm set winrm/config/listener?Address=*+Transport=HTTP @{Port="5985"}</CommandLine> + <Description>Win RM listener Address/Port</Description> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <Order>13</Order> + <CommandLine>%windir%\System32\cmd.exe /c netsh firewall add portopening TCP 5985 "Port 5985"</CommandLine> + <Description>Win RM port open</Description> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <Order>14</Order> + <CommandLine>%windir%\System32\cmd.exe /c net stop winrm</CommandLine> + <Description>Stop Win RM Service</Description> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <Order>15</Order> + <CommandLine>%windir%\System32\cmd.exe /c sc config winrm start= auto</CommandLine> + <Description>Win RM Autostart</Description> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <Order>16</Order> + <CommandLine>%windir%\System32\cmd.exe /c net start winrm</CommandLine> + <Description>Start Win RM Service</Description> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <Order>17</Order> + <CommandLine>%windir%\System32\cmd.exe /c wmic useraccount where "name='vagrant'" set PasswordExpires=FALSE</CommandLine> + <Description>Disable password expiration for vagrant user</Description> + </SynchronousCommand> + </FirstLogonCommands> + </component> + <component name="Microsoft-Windows-WinRE-RecoveryAgent" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> + <UninstallWindowsRE>true</UninstallWindowsRE> + </component> + </settings> <settings pass="specialize"> <component xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" name="Microsoft-Windows-ServerManager-SvrMgrNc" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> <DoNotOpenServerManagerAtLogon>true</DoNotOpenServerManagerAtLogon> @@ -285,5 +277,36 @@ <component xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" name="Microsoft-Windows-OutOfBoxExperience" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> <DoNotOpenInitialConfigurationTasksAtLogon>true</DoNotOpenInitialConfigurationTasksAtLogon> </component> + <component name="Microsoft-Windows-SystemRestore-Main" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> + <DisableSR>1</DisableSR> + </component> + <component name="Microsoft-Windows-SystemSettingsThreshold" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> + <DisplayNetworkSelection>false</DisplayNetworkSelection> + </component> + <component name="Networking-MPSSVC-Svc" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> + <FirewallGroups> + <FirewallGroup wcm:action="add" wcm:keyValue="WindowsRemoteManagement"> + <Active>true</Active> + <Group>Windows Remote Management</Group> + <Profile>all</Profile> + </FirewallGroup> + <FirewallGroup wcm:action="add" wcm:keyValue="RemoteAdministration"> + <Active>true</Active> + <Group>Remote Administration</Group> + <Profile>all</Profile> + </FirewallGroup> + </FirewallGroups> + </component> + <component name="Microsoft-Windows-SQMApi" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> + <CEIPEnabled>0</CEIPEnabled> + </component> + <component name="Microsoft-Windows-Security-SPP-UX" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> + <SkipAutoActivation>true</SkipAutoActivation> + </component> + </settings> + <settings pass="offlineServicing"> + <component name="Microsoft-Windows-LUA-Settings" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> + <EnableLUA>false</EnableLUA> + </component> </settings> </unattend> diff --git a/packer_templates/win_answer_files/2022/hyperv-gen2/Autounattend 2.xml b/packer_templates/win_answer_files/2022/hyperv-gen2/Autounattend 2.xml new file mode 100644 index 000000000..ecfca3ebe --- /dev/null +++ b/packer_templates/win_answer_files/2022/hyperv-gen2/Autounattend 2.xml @@ -0,0 +1,332 @@ +<?xml version="1.0" encoding="utf-8"?> +<unattend xmlns="urn:schemas-microsoft-com:unattend" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <settings pass="windowsPE"> + <component name="Microsoft-Windows-PnpCustomizationsWinPE" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" processorArchitecture="amd64"> + <!-- + This makes the VirtIO drivers available to Windows, assuming that + the VirtIO driver disk at https://fedorapeople.org/groups/virt/virtio-win/direct-downloads/stable-virtio/virtio-win.iso + (see https://docs.fedoraproject.org/en-US/quick-docs/creating-windows-virtual-machines-using-virtio-drivers/index.html#virtio-win-direct-downloads) + is available as drive E: + --> + <DriverPaths> + <PathAndCredentials wcm:action="add" wcm:keyValue="2"> + <Path>F:\viostor\2k22\amd64</Path> + </PathAndCredentials> + <PathAndCredentials wcm:action="add" wcm:keyValue="3"> + <Path>F:\NetKVM\2k22\amd64</Path> + </PathAndCredentials> + <PathAndCredentials wcm:action="add" wcm:keyValue="4"> + <Path>F:\Balloon\2k22\amd64</Path> + </PathAndCredentials> + <PathAndCredentials wcm:action="add" wcm:keyValue="5"> + <Path>F:\pvpanic\2k22\amd64</Path> + </PathAndCredentials> + <PathAndCredentials wcm:action="add" wcm:keyValue="6"> + <Path>F:\qemupciserial\2k22\amd64</Path> + </PathAndCredentials> + <PathAndCredentials wcm:action="add" wcm:keyValue="7"> + <Path>F:\qxldod\2k22\amd64</Path> + </PathAndCredentials> + <PathAndCredentials wcm:action="add" wcm:keyValue="8"> + <Path>F:\vioinput\2k22\amd64</Path> + </PathAndCredentials> + <PathAndCredentials wcm:action="add" wcm:keyValue="9"> + <Path>F:\viorng\2k22\amd64</Path> + </PathAndCredentials> + <PathAndCredentials wcm:action="add" wcm:keyValue="10"> + <Path>F:\vioscsi\2k22\amd64</Path> + </PathAndCredentials> + <PathAndCredentials wcm:action="add" wcm:keyValue="11"> + <Path>F:\vioserial\2k22\amd64</Path> + </PathAndCredentials> + </DriverPaths> + </component> + <component name="Microsoft-Windows-International-Core-WinPE" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> + <SetupUILanguage> + <UILanguage>en-US</UILanguage> + </SetupUILanguage> + <InputLocale>en-US</InputLocale> + <SystemLocale>en-US</SystemLocale> + <UILanguage>en-US</UILanguage> + <UILanguageFallback>en-US</UILanguageFallback> + <UserLocale>en-US</UserLocale> + </component> + <component name="Microsoft-Windows-Setup" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> + <DiskConfiguration> + <Disk wcm:action="add"> + <CreatePartitions> + <CreatePartition wcm:action="add"> + <Order>1</Order> + <Size>350</Size> + <Type>Primary</Type> + </CreatePartition> + <CreatePartition wcm:action="add"> + <Order>2</Order> + <Size>100</Size> + <Type>EFI</Type> + </CreatePartition> + <CreatePartition wcm:action="add"> + <Order>3</Order> + <Size>128</Size> + <Type>MSR</Type> + </CreatePartition> + <CreatePartition wcm:action="add"> + <Order>4</Order> + <Extend>true</Extend> + <Type>Primary</Type> + </CreatePartition> + </CreatePartitions> + <ModifyPartitions> + <ModifyPartition wcm:action="add"> + <Order>1</Order> + <PartitionID>1</PartitionID> + <Label>WINRE</Label> + <Format>NTFS</Format> + <TypeID>de94bba4-06d1-4d40-a16a-bfd50179d6ac</TypeID> + </ModifyPartition> + <ModifyPartition wcm:action="add"> + <Order>2</Order> + <PartitionID>2</PartitionID> + <Label>System</Label> + <Format>FAT32</Format> + </ModifyPartition> + <ModifyPartition wcm:action="add"> + <Order>3</Order> + <PartitionID>3</PartitionID> + </ModifyPartition> + <ModifyPartition wcm:action="add"> + <Order>4</Order> + <PartitionID>4</PartitionID> + <Label>Windows</Label> + <Format>NTFS</Format> + </ModifyPartition> + </ModifyPartitions> + <DiskID>0</DiskID> + <WillWipeDisk>true</WillWipeDisk> + </Disk> + <WillShowUI>OnError</WillShowUI> + </DiskConfiguration> + <ImageInstall> + <OSImage> + <InstallFrom> + <MetaData wcm:action="add"> + <Key>/IMAGE/NAME</Key> + <Value>Windows Server 2022 SERVERSTANDARD</Value> + </MetaData> + </InstallFrom> + <InstallTo> + <DiskID>0</DiskID> + <PartitionID>4</PartitionID> + </InstallTo> + </OSImage> + </ImageInstall> + <UserData> + <ProductKey> + <WillShowUI>OnError</WillShowUI> + </ProductKey> + <AcceptEula>true</AcceptEula> + <FullName>Vagrant</FullName> + <Organization>Bento by Chef Software, Inc.</Organization> + </UserData> + <DynamicUpdate> + <Enable>false</Enable> + </DynamicUpdate> + </component> + </settings> + <settings pass="generalize"> + <component name="Microsoft-Windows-Security-SPP" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> + <SkipRearm>1</SkipRearm> + </component> + <component name="Microsoft-Windows-PnpSysprep" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> + <PersistAllDeviceInstalls>false</PersistAllDeviceInstalls> + <DoNotCleanUpNonPresentDevices>false</DoNotCleanUpNonPresentDevices> + </component> + </settings> + <settings pass="oobeSystem"> + <component name="Microsoft-Windows-International-Core" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> + <InputLocale>en-US</InputLocale> + <SystemLocale>en-US</SystemLocale> + <UILanguage>en-US</UILanguage> + <UserLocale>en-US</UserLocale> + </component> + <component name="Microsoft-Windows-Shell-Setup" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> + <OOBE> + <HideEULAPage>true</HideEULAPage> + <HideLocalAccountScreen>true</HideLocalAccountScreen> + <HideOEMRegistrationScreen>true</HideOEMRegistrationScreen> + <HideOnlineAccountScreens>true</HideOnlineAccountScreens> + <HideWirelessSetupInOOBE>true</HideWirelessSetupInOOBE> + <NetworkLocation>Work</NetworkLocation> + <ProtectYourPC>3</ProtectYourPC> + <SkipMachineOOBE>true</SkipMachineOOBE> + <SkipUserOOBE>true</SkipUserOOBE> + <VMModeOptimizations> + <SkipAdministratorProfileRemoval>true</SkipAdministratorProfileRemoval> + <SkipNotifyUILanguageChange>true</SkipNotifyUILanguageChange> + <SkipWinREInitialization>true</SkipWinREInitialization> + </VMModeOptimizations> + </OOBE> + <TimeZone>UTC</TimeZone> + <UserAccounts> + <AdministratorPassword> + <Value>vagrant</Value> + <PlainText>true</PlainText> + </AdministratorPassword> + <LocalAccounts> + <LocalAccount wcm:action="add"> + <Password> + <Value>vagrant</Value> + <PlainText>true</PlainText> + </Password> + <Description>Vagrant User</Description> + <DisplayName>vagrant</DisplayName> + <Group>administrators</Group> + <Name>vagrant</Name> + </LocalAccount> + </LocalAccounts> + </UserAccounts> + <AutoLogon> + <Password> + <Value>vagrant</Value> + <PlainText>true</PlainText> + </Password> + <Username>vagrant</Username> + <Enabled>true</Enabled> + </AutoLogon> + <FirstLogonCommands> + <SynchronousCommand wcm:action="add"> + <CommandLine>%windir%\System32\WindowsPowerShell\v1.0\powershell.exe -Command "Set-ExecutionPolicy -ExecutionPolicy RemoteSigned -Force"</CommandLine> + <Description>Set Execution Policy 64 Bit</Description> + <Order>1</Order> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <CommandLine>%windir%\SysWOW64\cmd.exe /c powershell -Command "Set-ExecutionPolicy -ExecutionPolicy RemoteSigned -Force"</CommandLine> + <Description>Set Execution Policy 32 Bit</Description> + <Order>2</Order> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <Order>3</Order> + <CommandLine>%windir%\System32\WindowsPowerShell\v1.0\powershell.exe -Command Get-NetConnectionProfile | Set-NetConnectionProfile -NetworkCategory "Private"</CommandLine> + <Description>Sets detected network connections to private to allow start of winrm</Description> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <Order>4</Order> + <CommandLine>%windir%\System32\WindowsPowerShell\v1.0\powershell.exe -Command Set-NetFirewallRule -Name "WINRM-HTTP-In-TCP" -RemoteAddress Any</CommandLine> + <Description>Allows winrm over public profile interfaces</Description> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <Order>5</Order> + <CommandLine>%windir%\System32\cmd.exe /c winrm quickconfig -q</CommandLine> + <Description>winrm quickconfig -q</Description> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <Order>6</Order> + <CommandLine>%windir%\System32\cmd.exe /c winrm quickconfig -transport:http</CommandLine> + <Description>winrm quickconfig -transport:http</Description> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <Order>7</Order> + <CommandLine>%windir%\System32\cmd.exe /c winrm set winrm/config @{MaxTimeoutms="1800000"}</CommandLine> + <Description>Win RM MaxTimoutms</Description> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <Order>8</Order> + <CommandLine>%windir%\System32\cmd.exe /c winrm set winrm/config/winrs @{MaxMemoryPerShellMB="2048"}</CommandLine> + <Description>Win RM MaxMemoryPerShellMB</Description> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <Order>9</Order> + <CommandLine>%windir%\System32\cmd.exe /c winrm set winrm/config/service @{AllowUnencrypted="true"}</CommandLine> + <Description>Win RM AllowUnencrypted</Description> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <Order>10</Order> + <CommandLine>%windir%\System32\cmd.exe /c winrm set winrm/config/service/auth @{Basic="true"}</CommandLine> + <Description>Win RM auth Basic</Description> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <Order>11</Order> + <CommandLine>%windir%\System32\cmd.exe /c winrm set winrm/config/client/auth @{Basic="true"}</CommandLine> + <Description>Win RM client auth Basic</Description> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <Order>12</Order> + <CommandLine>%windir%\System32\cmd.exe /c winrm set winrm/config/listener?Address=*+Transport=HTTP @{Port="5985"}</CommandLine> + <Description>Win RM listener Address/Port</Description> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <Order>13</Order> + <CommandLine>%windir%\System32\cmd.exe /c netsh firewall add portopening TCP 5985 "Port 5985"</CommandLine> + <Description>Win RM port open</Description> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <Order>14</Order> + <CommandLine>%windir%\System32\cmd.exe /c net stop winrm</CommandLine> + <Description>Stop Win RM Service</Description> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <Order>15</Order> + <CommandLine>%windir%\System32\cmd.exe /c sc config winrm start= auto</CommandLine> + <Description>Win RM Autostart</Description> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <Order>16</Order> + <CommandLine>%windir%\System32\cmd.exe /c net start winrm</CommandLine> + <Description>Start Win RM Service</Description> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <Order>17</Order> + <CommandLine>%windir%\System32\cmd.exe /c wmic useraccount where "name='vagrant'" set PasswordExpires=FALSE</CommandLine> + <Description>Disable password expiration for vagrant user</Description> + </SynchronousCommand> + </FirstLogonCommands> + </component> + <component name="Microsoft-Windows-WinRE-RecoveryAgent" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> + <UninstallWindowsRE>true</UninstallWindowsRE> + </component> + </settings> + <settings pass="specialize"> + <component name="Microsoft-Windows-ServerManager-SvrMgrNc" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> + <DoNotOpenServerManagerAtLogon>true</DoNotOpenServerManagerAtLogon> + </component> + <component name="Microsoft-Windows-IE-ESC" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> + <!-- Disable IE ESC. --> + <IEHardenAdmin>false</IEHardenAdmin> + <IEHardenUser>false</IEHardenUser> + </component> + <component name="Microsoft-Windows-OutOfBoxExperience" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> + <DoNotOpenInitialConfigurationTasksAtLogon>true</DoNotOpenInitialConfigurationTasksAtLogon> + </component> + <component name="Microsoft-Windows-SystemRestore-Main" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> + <DisableSR>1</DisableSR> + </component> + <component name="Microsoft-Windows-SystemSettingsThreshold" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> + <DisplayNetworkSelection>false</DisplayNetworkSelection> + </component> + <component name="Networking-MPSSVC-Svc" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> + <FirewallGroups> + <FirewallGroup wcm:action="add" wcm:keyValue="WindowsRemoteManagement"> + <Active>true</Active> + <Group>Windows Remote Management</Group> + <Profile>all</Profile> + </FirewallGroup> + <FirewallGroup wcm:action="add" wcm:keyValue="RemoteAdministration"> + <Active>true</Active> + <Group>Remote Administration</Group> + <Profile>all</Profile> + </FirewallGroup> + </FirewallGroups> + </component> + <component name="Microsoft-Windows-SQMApi" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> + <CEIPEnabled>0</CEIPEnabled> + </component> + <component name="Microsoft-Windows-Security-SPP-UX" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> + <SkipAutoActivation>true</SkipAutoActivation> + </component> + </settings> + <settings pass="offlineServicing"> + <component name="Microsoft-Windows-LUA-Settings" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> + <EnableLUA>false</EnableLUA> + </component> + </settings> +</unattend> diff --git a/packer_templates/win_answer_files/2022/hyperv-gen2/Autounattend.xml b/packer_templates/win_answer_files/2022/hyperv-gen2/Autounattend.xml new file mode 100644 index 000000000..ecfca3ebe --- /dev/null +++ b/packer_templates/win_answer_files/2022/hyperv-gen2/Autounattend.xml @@ -0,0 +1,332 @@ +<?xml version="1.0" encoding="utf-8"?> +<unattend xmlns="urn:schemas-microsoft-com:unattend" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <settings pass="windowsPE"> + <component name="Microsoft-Windows-PnpCustomizationsWinPE" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" processorArchitecture="amd64"> + <!-- + This makes the VirtIO drivers available to Windows, assuming that + the VirtIO driver disk at https://fedorapeople.org/groups/virt/virtio-win/direct-downloads/stable-virtio/virtio-win.iso + (see https://docs.fedoraproject.org/en-US/quick-docs/creating-windows-virtual-machines-using-virtio-drivers/index.html#virtio-win-direct-downloads) + is available as drive E: + --> + <DriverPaths> + <PathAndCredentials wcm:action="add" wcm:keyValue="2"> + <Path>F:\viostor\2k22\amd64</Path> + </PathAndCredentials> + <PathAndCredentials wcm:action="add" wcm:keyValue="3"> + <Path>F:\NetKVM\2k22\amd64</Path> + </PathAndCredentials> + <PathAndCredentials wcm:action="add" wcm:keyValue="4"> + <Path>F:\Balloon\2k22\amd64</Path> + </PathAndCredentials> + <PathAndCredentials wcm:action="add" wcm:keyValue="5"> + <Path>F:\pvpanic\2k22\amd64</Path> + </PathAndCredentials> + <PathAndCredentials wcm:action="add" wcm:keyValue="6"> + <Path>F:\qemupciserial\2k22\amd64</Path> + </PathAndCredentials> + <PathAndCredentials wcm:action="add" wcm:keyValue="7"> + <Path>F:\qxldod\2k22\amd64</Path> + </PathAndCredentials> + <PathAndCredentials wcm:action="add" wcm:keyValue="8"> + <Path>F:\vioinput\2k22\amd64</Path> + </PathAndCredentials> + <PathAndCredentials wcm:action="add" wcm:keyValue="9"> + <Path>F:\viorng\2k22\amd64</Path> + </PathAndCredentials> + <PathAndCredentials wcm:action="add" wcm:keyValue="10"> + <Path>F:\vioscsi\2k22\amd64</Path> + </PathAndCredentials> + <PathAndCredentials wcm:action="add" wcm:keyValue="11"> + <Path>F:\vioserial\2k22\amd64</Path> + </PathAndCredentials> + </DriverPaths> + </component> + <component name="Microsoft-Windows-International-Core-WinPE" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> + <SetupUILanguage> + <UILanguage>en-US</UILanguage> + </SetupUILanguage> + <InputLocale>en-US</InputLocale> + <SystemLocale>en-US</SystemLocale> + <UILanguage>en-US</UILanguage> + <UILanguageFallback>en-US</UILanguageFallback> + <UserLocale>en-US</UserLocale> + </component> + <component name="Microsoft-Windows-Setup" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> + <DiskConfiguration> + <Disk wcm:action="add"> + <CreatePartitions> + <CreatePartition wcm:action="add"> + <Order>1</Order> + <Size>350</Size> + <Type>Primary</Type> + </CreatePartition> + <CreatePartition wcm:action="add"> + <Order>2</Order> + <Size>100</Size> + <Type>EFI</Type> + </CreatePartition> + <CreatePartition wcm:action="add"> + <Order>3</Order> + <Size>128</Size> + <Type>MSR</Type> + </CreatePartition> + <CreatePartition wcm:action="add"> + <Order>4</Order> + <Extend>true</Extend> + <Type>Primary</Type> + </CreatePartition> + </CreatePartitions> + <ModifyPartitions> + <ModifyPartition wcm:action="add"> + <Order>1</Order> + <PartitionID>1</PartitionID> + <Label>WINRE</Label> + <Format>NTFS</Format> + <TypeID>de94bba4-06d1-4d40-a16a-bfd50179d6ac</TypeID> + </ModifyPartition> + <ModifyPartition wcm:action="add"> + <Order>2</Order> + <PartitionID>2</PartitionID> + <Label>System</Label> + <Format>FAT32</Format> + </ModifyPartition> + <ModifyPartition wcm:action="add"> + <Order>3</Order> + <PartitionID>3</PartitionID> + </ModifyPartition> + <ModifyPartition wcm:action="add"> + <Order>4</Order> + <PartitionID>4</PartitionID> + <Label>Windows</Label> + <Format>NTFS</Format> + </ModifyPartition> + </ModifyPartitions> + <DiskID>0</DiskID> + <WillWipeDisk>true</WillWipeDisk> + </Disk> + <WillShowUI>OnError</WillShowUI> + </DiskConfiguration> + <ImageInstall> + <OSImage> + <InstallFrom> + <MetaData wcm:action="add"> + <Key>/IMAGE/NAME</Key> + <Value>Windows Server 2022 SERVERSTANDARD</Value> + </MetaData> + </InstallFrom> + <InstallTo> + <DiskID>0</DiskID> + <PartitionID>4</PartitionID> + </InstallTo> + </OSImage> + </ImageInstall> + <UserData> + <ProductKey> + <WillShowUI>OnError</WillShowUI> + </ProductKey> + <AcceptEula>true</AcceptEula> + <FullName>Vagrant</FullName> + <Organization>Bento by Chef Software, Inc.</Organization> + </UserData> + <DynamicUpdate> + <Enable>false</Enable> + </DynamicUpdate> + </component> + </settings> + <settings pass="generalize"> + <component name="Microsoft-Windows-Security-SPP" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> + <SkipRearm>1</SkipRearm> + </component> + <component name="Microsoft-Windows-PnpSysprep" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> + <PersistAllDeviceInstalls>false</PersistAllDeviceInstalls> + <DoNotCleanUpNonPresentDevices>false</DoNotCleanUpNonPresentDevices> + </component> + </settings> + <settings pass="oobeSystem"> + <component name="Microsoft-Windows-International-Core" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> + <InputLocale>en-US</InputLocale> + <SystemLocale>en-US</SystemLocale> + <UILanguage>en-US</UILanguage> + <UserLocale>en-US</UserLocale> + </component> + <component name="Microsoft-Windows-Shell-Setup" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> + <OOBE> + <HideEULAPage>true</HideEULAPage> + <HideLocalAccountScreen>true</HideLocalAccountScreen> + <HideOEMRegistrationScreen>true</HideOEMRegistrationScreen> + <HideOnlineAccountScreens>true</HideOnlineAccountScreens> + <HideWirelessSetupInOOBE>true</HideWirelessSetupInOOBE> + <NetworkLocation>Work</NetworkLocation> + <ProtectYourPC>3</ProtectYourPC> + <SkipMachineOOBE>true</SkipMachineOOBE> + <SkipUserOOBE>true</SkipUserOOBE> + <VMModeOptimizations> + <SkipAdministratorProfileRemoval>true</SkipAdministratorProfileRemoval> + <SkipNotifyUILanguageChange>true</SkipNotifyUILanguageChange> + <SkipWinREInitialization>true</SkipWinREInitialization> + </VMModeOptimizations> + </OOBE> + <TimeZone>UTC</TimeZone> + <UserAccounts> + <AdministratorPassword> + <Value>vagrant</Value> + <PlainText>true</PlainText> + </AdministratorPassword> + <LocalAccounts> + <LocalAccount wcm:action="add"> + <Password> + <Value>vagrant</Value> + <PlainText>true</PlainText> + </Password> + <Description>Vagrant User</Description> + <DisplayName>vagrant</DisplayName> + <Group>administrators</Group> + <Name>vagrant</Name> + </LocalAccount> + </LocalAccounts> + </UserAccounts> + <AutoLogon> + <Password> + <Value>vagrant</Value> + <PlainText>true</PlainText> + </Password> + <Username>vagrant</Username> + <Enabled>true</Enabled> + </AutoLogon> + <FirstLogonCommands> + <SynchronousCommand wcm:action="add"> + <CommandLine>%windir%\System32\WindowsPowerShell\v1.0\powershell.exe -Command "Set-ExecutionPolicy -ExecutionPolicy RemoteSigned -Force"</CommandLine> + <Description>Set Execution Policy 64 Bit</Description> + <Order>1</Order> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <CommandLine>%windir%\SysWOW64\cmd.exe /c powershell -Command "Set-ExecutionPolicy -ExecutionPolicy RemoteSigned -Force"</CommandLine> + <Description>Set Execution Policy 32 Bit</Description> + <Order>2</Order> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <Order>3</Order> + <CommandLine>%windir%\System32\WindowsPowerShell\v1.0\powershell.exe -Command Get-NetConnectionProfile | Set-NetConnectionProfile -NetworkCategory "Private"</CommandLine> + <Description>Sets detected network connections to private to allow start of winrm</Description> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <Order>4</Order> + <CommandLine>%windir%\System32\WindowsPowerShell\v1.0\powershell.exe -Command Set-NetFirewallRule -Name "WINRM-HTTP-In-TCP" -RemoteAddress Any</CommandLine> + <Description>Allows winrm over public profile interfaces</Description> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <Order>5</Order> + <CommandLine>%windir%\System32\cmd.exe /c winrm quickconfig -q</CommandLine> + <Description>winrm quickconfig -q</Description> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <Order>6</Order> + <CommandLine>%windir%\System32\cmd.exe /c winrm quickconfig -transport:http</CommandLine> + <Description>winrm quickconfig -transport:http</Description> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <Order>7</Order> + <CommandLine>%windir%\System32\cmd.exe /c winrm set winrm/config @{MaxTimeoutms="1800000"}</CommandLine> + <Description>Win RM MaxTimoutms</Description> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <Order>8</Order> + <CommandLine>%windir%\System32\cmd.exe /c winrm set winrm/config/winrs @{MaxMemoryPerShellMB="2048"}</CommandLine> + <Description>Win RM MaxMemoryPerShellMB</Description> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <Order>9</Order> + <CommandLine>%windir%\System32\cmd.exe /c winrm set winrm/config/service @{AllowUnencrypted="true"}</CommandLine> + <Description>Win RM AllowUnencrypted</Description> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <Order>10</Order> + <CommandLine>%windir%\System32\cmd.exe /c winrm set winrm/config/service/auth @{Basic="true"}</CommandLine> + <Description>Win RM auth Basic</Description> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <Order>11</Order> + <CommandLine>%windir%\System32\cmd.exe /c winrm set winrm/config/client/auth @{Basic="true"}</CommandLine> + <Description>Win RM client auth Basic</Description> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <Order>12</Order> + <CommandLine>%windir%\System32\cmd.exe /c winrm set winrm/config/listener?Address=*+Transport=HTTP @{Port="5985"}</CommandLine> + <Description>Win RM listener Address/Port</Description> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <Order>13</Order> + <CommandLine>%windir%\System32\cmd.exe /c netsh firewall add portopening TCP 5985 "Port 5985"</CommandLine> + <Description>Win RM port open</Description> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <Order>14</Order> + <CommandLine>%windir%\System32\cmd.exe /c net stop winrm</CommandLine> + <Description>Stop Win RM Service</Description> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <Order>15</Order> + <CommandLine>%windir%\System32\cmd.exe /c sc config winrm start= auto</CommandLine> + <Description>Win RM Autostart</Description> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <Order>16</Order> + <CommandLine>%windir%\System32\cmd.exe /c net start winrm</CommandLine> + <Description>Start Win RM Service</Description> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <Order>17</Order> + <CommandLine>%windir%\System32\cmd.exe /c wmic useraccount where "name='vagrant'" set PasswordExpires=FALSE</CommandLine> + <Description>Disable password expiration for vagrant user</Description> + </SynchronousCommand> + </FirstLogonCommands> + </component> + <component name="Microsoft-Windows-WinRE-RecoveryAgent" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> + <UninstallWindowsRE>true</UninstallWindowsRE> + </component> + </settings> + <settings pass="specialize"> + <component name="Microsoft-Windows-ServerManager-SvrMgrNc" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> + <DoNotOpenServerManagerAtLogon>true</DoNotOpenServerManagerAtLogon> + </component> + <component name="Microsoft-Windows-IE-ESC" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> + <!-- Disable IE ESC. --> + <IEHardenAdmin>false</IEHardenAdmin> + <IEHardenUser>false</IEHardenUser> + </component> + <component name="Microsoft-Windows-OutOfBoxExperience" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> + <DoNotOpenInitialConfigurationTasksAtLogon>true</DoNotOpenInitialConfigurationTasksAtLogon> + </component> + <component name="Microsoft-Windows-SystemRestore-Main" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> + <DisableSR>1</DisableSR> + </component> + <component name="Microsoft-Windows-SystemSettingsThreshold" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> + <DisplayNetworkSelection>false</DisplayNetworkSelection> + </component> + <component name="Networking-MPSSVC-Svc" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> + <FirewallGroups> + <FirewallGroup wcm:action="add" wcm:keyValue="WindowsRemoteManagement"> + <Active>true</Active> + <Group>Windows Remote Management</Group> + <Profile>all</Profile> + </FirewallGroup> + <FirewallGroup wcm:action="add" wcm:keyValue="RemoteAdministration"> + <Active>true</Active> + <Group>Remote Administration</Group> + <Profile>all</Profile> + </FirewallGroup> + </FirewallGroups> + </component> + <component name="Microsoft-Windows-SQMApi" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> + <CEIPEnabled>0</CEIPEnabled> + </component> + <component name="Microsoft-Windows-Security-SPP-UX" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> + <SkipAutoActivation>true</SkipAutoActivation> + </component> + </settings> + <settings pass="offlineServicing"> + <component name="Microsoft-Windows-LUA-Settings" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> + <EnableLUA>false</EnableLUA> + </component> + </settings> +</unattend> From da8c149f368552b9539dee600523a2e2891d87c2 Mon Sep 17 00:00:00 2001 From: Matthew Bradbury <MBradbury@users.noreply.github.com> Date: Thu, 21 Sep 2023 14:58:18 +0100 Subject: [PATCH 1532/1622] Avoid downloading application to implement eject-media (#1529) Signed-off-by: Matthew Bradbury <m.s.bradbury@lancaster.ac.uk> --- .../scripts/windows/eject-media.ps1 | 26 +++++++++++-------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/packer_templates/scripts/windows/eject-media.ps1 b/packer_templates/scripts/windows/eject-media.ps1 index 9bea3a073..59e87ec02 100644 --- a/packer_templates/scripts/windows/eject-media.ps1 +++ b/packer_templates/scripts/windows/eject-media.ps1 @@ -45,16 +45,20 @@ trap { # # eject removable volume media. -Write-Host 'Downloaing EjectVolumeMedia...' -$ejectVolumeMediaExeUrl = 'https://github.com/rgl/EjectVolumeMedia/releases/download/v1.0.0/EjectVolumeMedia.exe' -$ejectVolumeMediaExeHash = 'f7863394085e1b3c5aa999808b012fba577b4a027804ea292abf7962e5467ba0' -$ejectVolumeMediaExe = "$env:TEMP\EjectVolumeMedia.exe" -Invoke-WebRequest $ejectVolumeMediaExeUrl -OutFile $ejectVolumeMediaExe -$ejectVolumeMediaExeActualHash = (Get-FileHash $ejectVolumeMediaExe -Algorithm SHA256).Hash -if ($ejectVolumeMediaExeActualHash -ne $ejectVolumeMediaExeHash) { - throw "the $ejectVolumeMediaExeUrl file hash $ejectVolumeMediaExeActualHash does not match the expected $ejectVolumeMediaExeHash" -} +$volList = Get-Volume | Where-Object {$_.DriveType -ne 'Fixed' -and $_.DriveLetter} + +ForEach ($vol in $volList) { + $volLetter = $vol.DriveLetter + Write-Host "Ejecting drive ${volLetter}:" + + try { + $Eject = New-Object -comObject Shell.Application + + # Namespace 17 represents ssfDRIVES + # See: https://learn.microsoft.com/en-us/windows/win32/api/shldisp/ne-shldisp-shellspecialfolderconstants -Get-Volume | Where-Object {$_.DriveType -ne 'Fixed' -and $_.DriveLetter} | ForEach-Object { - &$ejectVolumeMediaExe $_.DriveLetter + $Eject.NameSpace(17).ParseName("${volLetter}:").InvokeVerb("Eject") + } finally { + [System.Runtime.InteropServices.Marshal]::ReleaseComObject($Eject) | Out-Null + } } From 53462a154dc1de98045f97421d8b5e8cf5382b87 Mon Sep 17 00:00:00 2001 From: Corey Hemminger <hemminger@hotmail.com> Date: Sat, 23 Sep 2023 15:57:02 -0500 Subject: [PATCH 1533/1622] don't try to disable system restore on servers (#1530) Signed-off-by: Corey Hemminger <hemminger@hotmail.com> --- .../scripts/windows/configure-power 2.ps1 | 32 -- .../scripts/windows/disable-screensaver 2.ps1 | 17 - .../windows/disable-system-restore 2.ps1 | 17 - .../windows/disable-system-restore.ps1 | 9 +- .../scripts/windows/disable-windows-uac 2.ps1 | 20 - .../scripts/windows/enable-file-sharing 2.ps1 | 17 - .../windows/remove-one-drive-and-teams 2.ps1 | 259 ------------- .../scripts/windows/ui-tweaks 2.ps1 | 65 ---- .../10/hyperv-gen2/Autounattend 2.xml | 320 ---------------- .../11/hyperv-gen2/Autounattend 2.xml | 341 ------------------ .../2016/hyperv-gen2/Autounattend 2.xml | 332 ----------------- .../2019/hyperv-gen2/Autounattend 2.xml | 332 ----------------- .../2022/hyperv-gen2/Autounattend 2.xml | 332 ----------------- 13 files changed, 7 insertions(+), 2086 deletions(-) delete mode 100644 packer_templates/scripts/windows/configure-power 2.ps1 delete mode 100644 packer_templates/scripts/windows/disable-screensaver 2.ps1 delete mode 100644 packer_templates/scripts/windows/disable-system-restore 2.ps1 delete mode 100644 packer_templates/scripts/windows/disable-windows-uac 2.ps1 delete mode 100644 packer_templates/scripts/windows/enable-file-sharing 2.ps1 delete mode 100644 packer_templates/scripts/windows/remove-one-drive-and-teams 2.ps1 delete mode 100644 packer_templates/scripts/windows/ui-tweaks 2.ps1 delete mode 100644 packer_templates/win_answer_files/10/hyperv-gen2/Autounattend 2.xml delete mode 100644 packer_templates/win_answer_files/11/hyperv-gen2/Autounattend 2.xml delete mode 100644 packer_templates/win_answer_files/2016/hyperv-gen2/Autounattend 2.xml delete mode 100644 packer_templates/win_answer_files/2019/hyperv-gen2/Autounattend 2.xml delete mode 100644 packer_templates/win_answer_files/2022/hyperv-gen2/Autounattend 2.xml diff --git a/packer_templates/scripts/windows/configure-power 2.ps1 b/packer_templates/scripts/windows/configure-power 2.ps1 deleted file mode 100644 index b64d5b782..000000000 --- a/packer_templates/scripts/windows/configure-power 2.ps1 +++ /dev/null @@ -1,32 +0,0 @@ -Set-StrictMode -Version Latest -$ProgressPreference = 'SilentlyContinue' -$ErrorActionPreference = 'Stop' - -trap { - Write-Host - Write-Host "ERROR: $_" - ($_.ScriptStackTrace -split '\r?\n') -replace '^(.*)$','ERROR: $1' | Write-Host - ($_.Exception.ToString() -split '\r?\n') -replace '^(.*)$','ERROR EXCEPTION: $1' | Write-Host - Write-Host - Write-Host 'Sleeping for 60m to give you time to look around the virtual machine before self-destruction...' - Start-Sleep -Seconds (60*60) - Exit 1 -} - -Write-Host 'Set high performance power profile' -powercfg -setactive '8c5e7fda-e8bf-4a96-9a85-a6e23a8c635c' - -Write-Host 'Turn off Hibernation' -powercfg.exe /hibernate off - -Write-Host 'Turn off monitor timeout on AC power' -powercfg -Change -monitor-timeout-ac 0 - -Write-Host 'Turn off monitor timeout on DC power' -powercfg -Change -monitor-timeout-dc 0 - -Write-Host 'Zero Hibernation File' -Set-ItemProperty -Path 'HKLM:\SYSTEM\CurrentControlSet\Control\Power' -Name HiberFileSizePercent -Type DWORD -Value 0 - -Write-Host 'Disable Hibernation Mode' -Set-ItemProperty -Path 'HKLM:\SYSTEM\CurrentControlSet\Control\Power' -Name HibernateEnabled -Type DWORD -Value 0 diff --git a/packer_templates/scripts/windows/disable-screensaver 2.ps1 b/packer_templates/scripts/windows/disable-screensaver 2.ps1 deleted file mode 100644 index 4fbbdad2e..000000000 --- a/packer_templates/scripts/windows/disable-screensaver 2.ps1 +++ /dev/null @@ -1,17 +0,0 @@ -Set-StrictMode -Version Latest -$ProgressPreference = 'SilentlyContinue' -$ErrorActionPreference = 'Stop' - -trap { - Write-Host - Write-Host "ERROR: $_" - ($_.ScriptStackTrace -split '\r?\n') -replace '^(.*)$','ERROR: $1' | Write-Host - ($_.Exception.ToString() -split '\r?\n') -replace '^(.*)$','ERROR EXCEPTION: $1' | Write-Host - Write-Host - Write-Host 'Sleeping for 60m to give you time to look around the virtual machine before self-destruction...' - Start-Sleep -Seconds (60*60) - Exit 1 -} - -Write-Host 'Disable the screensaver' -Set-ItemProperty -Path 'HKCU:\Control Panel\Desktop' -Name ScreenSaveActive -Type DWORD -Value 0 diff --git a/packer_templates/scripts/windows/disable-system-restore 2.ps1 b/packer_templates/scripts/windows/disable-system-restore 2.ps1 deleted file mode 100644 index f3dee15d7..000000000 --- a/packer_templates/scripts/windows/disable-system-restore 2.ps1 +++ /dev/null @@ -1,17 +0,0 @@ -Set-StrictMode -Version Latest -$ProgressPreference = 'SilentlyContinue' -$ErrorActionPreference = 'Stop' - -trap { - Write-Host - Write-Host "ERROR: $_" - ($_.ScriptStackTrace -split '\r?\n') -replace '^(.*)$','ERROR: $1' | Write-Host - ($_.Exception.ToString() -split '\r?\n') -replace '^(.*)$','ERROR EXCEPTION: $1' | Write-Host - Write-Host - Write-Host 'Sleeping for 60m to give you time to look around the virtual machine before self-destruction...' - Start-Sleep -Seconds (60*60) - Exit 1 -} - -Write-Host 'Disabling System Restore' -Disable-ComputerRestore -Drive "C:\" diff --git a/packer_templates/scripts/windows/disable-system-restore.ps1 b/packer_templates/scripts/windows/disable-system-restore.ps1 index f3dee15d7..70713fed0 100644 --- a/packer_templates/scripts/windows/disable-system-restore.ps1 +++ b/packer_templates/scripts/windows/disable-system-restore.ps1 @@ -13,5 +13,10 @@ trap { Exit 1 } -Write-Host 'Disabling System Restore' -Disable-ComputerRestore -Drive "C:\" +$osInfo = Get-CimInstance -ClassName Win32_OperatingSystem +if ($osInfo.ProductType -eq 1) +{ +# system-restore isn't on servers + Write-Host 'Disabling System Restore' + Disable-ComputerRestore -Drive "C:\" +} diff --git a/packer_templates/scripts/windows/disable-windows-uac 2.ps1 b/packer_templates/scripts/windows/disable-windows-uac 2.ps1 deleted file mode 100644 index 20af5398f..000000000 --- a/packer_templates/scripts/windows/disable-windows-uac 2.ps1 +++ /dev/null @@ -1,20 +0,0 @@ -Set-StrictMode -Version Latest -$ProgressPreference = 'SilentlyContinue' -$ErrorActionPreference = 'Stop' - -trap { - Write-Host - Write-Host "ERROR: $_" - ($_.ScriptStackTrace -split '\r?\n') -replace '^(.*)$','ERROR: $1' | Write-Host - ($_.Exception.ToString() -split '\r?\n') -replace '^(.*)$','ERROR EXCEPTION: $1' | Write-Host - Write-Host - Write-Host 'Sleeping for 60m to give you time to look around the virtual machine before self-destruction...' - Start-Sleep -Seconds (60*60) - Exit 1 -} - -Write-Host 'Disable Windows UAC' -Set-ItemProperty -Path 'HKLM:\Software\Microsoft\Windows\CurrentVersion\Policies\System' -Name ConsentPromptBehaviorAdmin -Type DWORD -Value 0 -Set-ItemProperty -Path 'HKLM:\Software\Microsoft\Windows\CurrentVersion\Policies\System' -Name PromptOnSecureDesktop -Type DWORD -Value 0 -Set-ItemProperty -Path 'HKLM:\Software\Microsoft\Windows\CurrentVersion\Policies\System' -Name EnableLUA -Type DWORD -Value 0 -Set-ItemProperty -Path 'HKLM:\Software\Microsoft\Windows\CurrentVersion\Policies\System' -Name LocalAccountTokenFilterPolicy -Type DWORD -Value 1 diff --git a/packer_templates/scripts/windows/enable-file-sharing 2.ps1 b/packer_templates/scripts/windows/enable-file-sharing 2.ps1 deleted file mode 100644 index fefc29d9d..000000000 --- a/packer_templates/scripts/windows/enable-file-sharing 2.ps1 +++ /dev/null @@ -1,17 +0,0 @@ -Set-StrictMode -Version Latest -$ProgressPreference = 'SilentlyContinue' -$ErrorActionPreference = 'Stop' - -trap { - Write-Host - Write-Host "ERROR: $_" - ($_.ScriptStackTrace -split '\r?\n') -replace '^(.*)$','ERROR: $1' | Write-Host - ($_.Exception.ToString() -split '\r?\n') -replace '^(.*)$','ERROR EXCEPTION: $1' | Write-Host - Write-Host - Write-Host 'Sleeping for 60m to give you time to look around the virtual machine before self-destruction...' - Start-Sleep -Seconds (60*60) - Exit 1 -} - -Write-Host 'Enable filesharing' -Enable-NetFirewallRule -DisplayGroup "File and Printer Sharing" diff --git a/packer_templates/scripts/windows/remove-one-drive-and-teams 2.ps1 b/packer_templates/scripts/windows/remove-one-drive-and-teams 2.ps1 deleted file mode 100644 index f3724d959..000000000 --- a/packer_templates/scripts/windows/remove-one-drive-and-teams 2.ps1 +++ /dev/null @@ -1,259 +0,0 @@ -Set-StrictMode -Version Latest -$ProgressPreference = 'SilentlyContinue' -$ErrorActionPreference = 'Stop' -trap { - Write-Host - Write-Host "ERROR: $_" - ($_.ScriptStackTrace -split '\r?\n') -replace '^(.*)$','ERROR: $1' | Write-Host - ($_.Exception.ToString() -split '\r?\n') -replace '^(.*)$','ERROR EXCEPTION: $1' | Write-Host - Write-Host - Write-Host 'Sleeping for 60m to give you time to look around the virtual machine before self-destruction...' - Start-Sleep -Seconds (60*60) - Exit 1 -} - -Write-Host 'Removing OneDrive' -function force-mkdir($path) { - if (!(Test-Path $path)) { - #Write-Host "-- Creating full path to: " $path -ForegroundColor White -BackgroundColor DarkGreen - New-Item -ItemType Directory -Force -Path $path - }} - -function Takeown-Registry($key) { - # TODO does not work for all root keys yet - switch ($key.split('\')[0]) { - "HKEY_CLASSES_ROOT" { - $reg = [Microsoft.Win32.Registry]::ClassesRoot - $key = $key.substring(18) - } - "HKEY_CURRENT_USER" { - $reg = [Microsoft.Win32.Registry]::CurrentUser - $key = $key.substring(18) - } - "HKEY_LOCAL_MACHINE" { - $reg = [Microsoft.Win32.Registry]::LocalMachine - $key = $key.substring(19) - } - } - - # get administraor group - $admins = New-Object System.Security.Principal.SecurityIdentifier("S-1-5-32-544") - $admins = $admins.Translate([System.Security.Principal.NTAccount]) - - # set owner - $key = $reg.OpenSubKey($key, "ReadWriteSubTree", "TakeOwnership") - $acl = $key.GetAccessControl() - $acl.SetOwner($admins) - $key.SetAccessControl($acl) - - # set FullControl - $acl = $key.GetAccessControl() - $rule = New-Object System.Security.AccessControl.RegistryAccessRule($admins, "FullControl", "Allow") - $acl.SetAccessRule($rule) - $key.SetAccessControl($acl) -} - -function Takeown-File($path) { - takeown.exe /A /F $path - $acl = Get-Acl $path - - # get administraor group - $admins = New-Object System.Security.Principal.SecurityIdentifier("S-1-5-32-544") - $admins = $admins.Translate([System.Security.Principal.NTAccount]) - - # add NT Authority\SYSTEM - $rule = New-Object System.Security.AccessControl.FileSystemAccessRule($admins, "FullControl", "None", "None", "Allow") - $acl.AddAccessRule($rule) - - Set-Acl -Path $path -AclObject $acl -} - -function Takeown-Folder($path) { - Takeown-File $path - foreach ($item in Get-ChildItem $path) { - if (Test-Path $item -PathType Container) { - Takeown-Folder $item.FullName - } else { - Takeown-File $item.FullName - } - } -} - -function Elevate-Privileges { - param($Privilege) - $Definition = @" - using System; - using System.Runtime.InteropServices; - public class AdjPriv { - [DllImport("advapi32.dll", ExactSpelling = true, SetLastError = true)] - internal static extern bool AdjustTokenPrivileges(IntPtr htok, bool disall, ref TokPriv1Luid newst, int len, IntPtr prev, IntPtr rele); - [DllImport("advapi32.dll", ExactSpelling = true, SetLastError = true)] - internal static extern bool OpenProcessToken(IntPtr h, int acc, ref IntPtr phtok); - [DllImport("advapi32.dll", SetLastError = true)] - internal static extern bool LookupPrivilegeValue(string host, string name, ref long pluid); - [StructLayout(LayoutKind.Sequential, Pack = 1)] - internal struct TokPriv1Luid { - public int Count; - public long Luid; - public int Attr; - } - internal const int SE_PRIVILEGE_ENABLED = 0x00000002; - internal const int TOKEN_QUERY = 0x00000008; - internal const int TOKEN_ADJUST_PRIVILEGES = 0x00000020; - public static bool EnablePrivilege(long processHandle, string privilege) { - bool retVal; - TokPriv1Luid tp; - IntPtr hproc = new IntPtr(processHandle); - IntPtr htok = IntPtr.Zero; - retVal = OpenProcessToken(hproc, TOKEN_ADJUST_PRIVILEGES | TOKEN_QUERY, ref htok); - tp.Count = 1; - tp.Luid = 0; - tp.Attr = SE_PRIVILEGE_ENABLED; - retVal = LookupPrivilegeValue(null, privilege, ref tp.Luid); - retVal = AdjustTokenPrivileges(htok, false, ref tp, 0, IntPtr.Zero, IntPtr.Zero); - return retVal; - } - } -"@ - $ProcessHandle = (Get-Process -id $pid).Handle - $type = Add-Type $definition -PassThru - $type[0]::EnablePrivilege($processHandle, $Privilege) -} - -Write-Host "73 OneDrive process and explorer" -taskkill.exe /F /IM "OneDrive.exe" -taskkill.exe /F /IM "explorer.exe" - -Write-Host "Remove OneDrive" -if (Test-Path "$env:systemroot\System32\OneDriveSetup.exe") { - & "$env:systemroot\System32\OneDriveSetup.exe" /uninstall -} -if (Test-Path "$env:systemroot\SysWOW64\OneDriveSetup.exe") { - & "$env:systemroot\SysWOW64\OneDriveSetup.exe" /uninstall -} - -Write-Host "Disable OneDrive via Group Policies" -force-mkdir "HKLM:\SOFTWARE\Wow6432Node\Policies\Microsoft\Windows\OneDrive" -Set-ItemProperty "HKLM:\SOFTWARE\Wow6432Node\Policies\Microsoft\Windows\OneDrive" -Name DisableFileSyncNGSC -Value 1 - -Write-Host "Removing OneDrive leftovers trash" -rm -Recurse -Force -ErrorAction SilentlyContinue "$env:localappdata\Microsoft\OneDrive" -rm -Recurse -Force -ErrorAction SilentlyContinue "$env:programdata\Microsoft OneDrive" -rm -Recurse -Force -ErrorAction SilentlyContinue "C:\OneDriveTemp" - -Write-Host "Remove Onedrive from explorer sidebar" -New-PSDrive -PSProvider "Registry" -Root "HKEY_CLASSES_ROOT" -Name "HKCR" -mkdir -Force "HKCR:\CLSID\{018D5C66-4533-4307-9B53-224DE2ED1FE6}" -Set-ItemProperty "HKCR:\CLSID\{018D5C66-4533-4307-9B53-224DE2ED1FE6}" -Name System.IsPinnedToNameSpaceTree -Value 0 -mkdir -Force "HKCR:\Wow6432Node\CLSID\{018D5C66-4533-4307-9B53-224DE2ED1FE6}" -Set-ItemProperty "HKCR:\Wow6432Node\CLSID\{018D5C66-4533-4307-9B53-224DE2ED1FE6}" -Name System.IsPinnedToNameSpaceTree -Value 0 -Remove-PSDrive "HKCR" - -Write-Host "Removing run option for new users" -reg load "hku\Default" "C:\Users\Default\NTUSER.DAT" -reg delete "HKEY_USERS\Default\SOFTWARE\Microsoft\Windows\CurrentVersion\Run" /v "OneDriveSetup" /f -reg unload "hku\Default" - -Write-Host "Removing startmenu junk entry" -rm -Force -ErrorAction SilentlyContinue "$env:userprofile\AppData\Roaming\Microsoft\Windows\Start Menu\Programs\OneDrive.lnk" - -Write-Host "Restarting explorer..." -start "explorer.exe" - -Write-Host "Wait for EX reload.." -sleep 15 - -Write-Host "Removing additional OneDrive leftovers" -foreach ($item in (ls "$env:WinDir\WinSxS\*onedrive*")) { - Takeown-Folder $item.FullName - rm -Recurse -Force $item.FullName -ErrorAction SilentlyContinue -} - -########################################################################################### -Write-Host "Removing Teams" -# Clearing Teams Cache by Mark Vale -# Uninstall Teams by Rudy Mens - -Write-Host "Stopping Teams Process" -ForegroundColor Yellow -try{ - Get-Process -ProcessName Teams | Stop-Process -Force - Start-Sleep -Seconds 3 - Write-Host "Teams Process Sucessfully Stopped" -ForegroundColor Green -}catch{ - Write-Host $_ -} - -Write-Host "Clearing Teams Disk Cache" -ForegroundColor Yellow -try{ - Get-ChildItem -Path $env:APPDATA\"Microsoft\teams\application cache\cache" | Remove-Item -Confirm:$false - Get-ChildItem -Path $env:APPDATA\"Microsoft\teams\blob_storage" | Remove-Item -Confirm:$false - Get-ChildItem -Path $env:APPDATA\"Microsoft\teams\databases" | Remove-Item -Confirm:$false - Get-ChildItem -Path $env:APPDATA\"Microsoft\teams\cache" | Remove-Item -Confirm:$false - Get-ChildItem -Path $env:APPDATA\"Microsoft\teams\gpucache" | Remove-Item -Confirm:$false - Get-ChildItem -Path $env:APPDATA\"Microsoft\teams\Indexeddb" | Remove-Item -Confirm:$false - Get-ChildItem -Path $env:APPDATA\"Microsoft\teams\Local Storage" | Remove-Item -Confirm:$false - Get-ChildItem -Path $env:APPDATA\"Microsoft\teams\tmp" | Remove-Item -Confirm:$false - Write-Host "Teams Disk Cache Cleaned" -ForegroundColor Green -}catch{ - Write-Host $_ -} - -Write-Host "Stopping IE Process" -ForegroundColor Yellow -try{ - Get-Process -ProcessName MicrosoftEdge | Stop-Process -Force - Get-Process -ProcessName IExplore | Stop-Process -Force - Write-Host "Internet Explorer and Edge Processes Sucessfully Stopped" -ForegroundColor Green -}catch{ - Write-Host $_ -} - -Write-Host "Clearing IE Cache" -ForegroundColor Yellow -try{ - RunDll32.exe InetCpl.cpl, ClearMyTracksByProcess 8 - RunDll32.exe InetCpl.cpl, ClearMyTracksByProcess 2 - Write-Host "IE and Edge Cleaned" -ForegroundColor Green -}catch{ - Write-Host $_ -} -Write-Host "Cleanup Complete..." - - -Write-Host "Removing Teams Machine-wide Installer" -try -{ - $MachineWide = Get-WmiObject -Class Win32_Product | Where-Object{$_.Name -eq "Teams Machine-Wide Installer"} - $MachineWide.Uninstall() -} -catch -{ - Write-Warning $_ -} - -function unInstallTeams($path) { - $clientInstaller = "$($path)\Update.exe" - try { - $process = Start-Process -FilePath "$clientInstaller" -ArgumentList "--uninstall /s" -PassThru -Wait -ErrorAction STOP - if ($process.ExitCode -ne 0) - { - Write-Warning "UnInstallation failed with exit code $($process.ExitCode)." - } - } - catch { - Write-Warning $_.Exception.Message - } -} - -#Locate installation folder -$localAppData = "$($env:LOCALAPPDATA)\Microsoft\Teams" -$programData = "$($env:ProgramData)\$($env:USERNAME)\Microsoft\Teams" - -If (Test-Path "$($localAppData)\Current\Teams.exe") -{ - unInstallTeams($localAppData) -} -elseif (Test-Path "$($programData)\Current\Teams.exe") { - unInstallTeams($programData) -} -else { - Write-Warning "Teams installation not found" -} diff --git a/packer_templates/scripts/windows/ui-tweaks 2.ps1 b/packer_templates/scripts/windows/ui-tweaks 2.ps1 deleted file mode 100644 index 3982f0a98..000000000 --- a/packer_templates/scripts/windows/ui-tweaks 2.ps1 +++ /dev/null @@ -1,65 +0,0 @@ -Set-StrictMode -Version Latest -$ProgressPreference = 'SilentlyContinue' -$ErrorActionPreference = 'Stop' - -trap { - Write-Host - Write-Host "ERROR: $_" - ($_.ScriptStackTrace -split '\r?\n') -replace '^(.*)$','ERROR: $1' | Write-Host - ($_.Exception.ToString() -split '\r?\n') -replace '^(.*)$','ERROR EXCEPTION: $1' | Write-Host - Write-Host - Write-Host 'Sleeping for 60m to give you time to look around the virtual machine before self-destruction...' - Start-Sleep -Seconds (60*60) - Exit 1 -} - -@( - # Show file extensions - {Set-ItemProperty -Path 'HKCU:\Software\Microsoft\Windows\CurrentVersion\Explorer\Advanced' -Name HideFileExt -Type DWORD -Value 0} - # Show hidden files - {Set-ItemProperty -Path 'HKCU:\Software\Microsoft\Windows\CurrentVersion\Explorer\Advanced' -Name Hidden -Type DWORD -Value 1} - # Launch explorer to the PC not the user - {Set-ItemProperty -Path 'HKCU:\Software\Microsoft\Windows\CurrentVersion\Explorer\Advanced' -Name LaunchTo -Type DWORD -Value 1} - {Set-ItemProperty -Path 'HKCU:\Software\Microsoft\Windows\CurrentVersion\Explorer\Advanced' -Name FullPathAddress -Type DWORD -Value 1} - # Disable notification popups - {Set-ItemProperty -Path 'HKCU:\Software\Microsoft\Windows\CurrentVersion\Explorer\Advanced' -Name EnableBalloonTips -Type DWORD -Value 0} - # Disable error reporting popups - {Set-ItemProperty -Path 'HKCU:\Software\Microsoft\Windows\Windows Error Reporting' -Name DontShowUI -Type DWORD -Value 0} - # Disable prompting for a shutdown reason - {Set-ItemProperty -Path 'HKLM:\SOFTWARE\Policies\Microsoft\Windows NT\Reliability' -Name ShutdownReasonOn -Type DWORD -Value 0} - # Set visual effects to best performance - {Set-ItemProperty -Path 'HKCU:\Software\Microsoft\Windows\CurrentVersion\Explorer\VisualEffects' -Name VisualFXSetting -Type DWORD -Value 2} - # Dont use visual styles on windows and buttons - {Set-ItemProperty -Path 'HKCU:\Software\Microsoft\Windows\CurrentVersion\ThemeManager' -Name ThemeActive -Type DWORD -Value 1} - # Dont use common tasks in folders - {Set-ItemProperty -Path 'HKCU:\Software\Microsoft\Windows\CurrentVersion\Explorer\Advanced' -Name WebView -Type DWORD -Value 0} - # Dont use drop shadows for icon labels on the desktop - {Set-ItemProperty -Path 'HKCU:\Software\Microsoft\Windows\CurrentVersion\Explorer\Advanced' -Name ListviewShadow -Type DWORD -Value 0} - # Dont use a background image for each folder type - {Set-ItemProperty -Path 'HKCU:\Software\Microsoft\Windows\CurrentVersion\Explorer\Advanced' -Name ListviewWatermark -Type DWORD -Value 0} - # Dont slide taskbar buttons - {Set-ItemProperty -Path 'HKCU:\Software\Microsoft\Windows\CurrentVersion\Explorer\Advanced' -Name TaskbarAnimations -Type DWORD -Value 0} - # Dont animate windows when minimizing and maximizing - {Set-ItemProperty -Path 'HKCU:\Control Panel\Desktop\WindowMetrics' -Name MinAnimate -Type STRING -Value 0} - # Dont show window contents while dragging - {Set-ItemProperty -Path 'HKCU:\Control Panel\Desktop' -Name DragFullWindows -Type STRING -Value 0} - # Dont Smooth edges of screen fonts - {Set-ItemProperty -Path 'HKCU:\Control Panel\Desktop' -Name FontSmoothing -Type STRING -Value 0} - # Dont smooth scroll list boxes - # Dont slide open combo boxes - # Dont fade or slide menus into view - # Dont show shadows under mouse pointer - # Dont fade or slide tooltips into view - # Dont fade out menu items after clicking - # Dont show shadows under menus - {Set-ItemProperty -Path 'HKCU:\Control Panel\Desktop' -Name UserPreferencesMask -Type BINARY -Value (90,12,01,80)} -) | ForEach-Object { - try - { - Invoke-Command -ScriptBlock $_ - } - catch - { - Write-Host "WARN Failed to run: $_" - } -} diff --git a/packer_templates/win_answer_files/10/hyperv-gen2/Autounattend 2.xml b/packer_templates/win_answer_files/10/hyperv-gen2/Autounattend 2.xml deleted file mode 100644 index 4465d46ea..000000000 --- a/packer_templates/win_answer_files/10/hyperv-gen2/Autounattend 2.xml +++ /dev/null @@ -1,320 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<unattend xmlns="urn:schemas-microsoft-com:unattend" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - <settings pass="windowsPE"> - <component name="Microsoft-Windows-PnpCustomizationsWinPE" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" processorArchitecture="amd64"> <!-- - This makes the VirtIO drivers available to Windows, assuming that - the VirtIO driver disk at https://fedorapeople.org/groups/virt/virtio-win/direct-downloads/stable-virtio/virtio-win.iso - (see https://docs.fedoraproject.org/en-US/quick-docs/creating-windows-virtual-machines-using-virtio-drivers/index.html#virtio-win-direct-downloads) - is available as drive E: - --> - <DriverPaths> - <PathAndCredentials wcm:action="add" wcm:keyValue="2"> - <Path>F:\viostor\w10\amd64</Path> - </PathAndCredentials> - <PathAndCredentials wcm:action="add" wcm:keyValue="3"> - <Path>F:\NetKVM\w10\amd64</Path> - </PathAndCredentials> - <PathAndCredentials wcm:action="add" wcm:keyValue="4"> - <Path>F:\Balloon\w10\amd64</Path> - </PathAndCredentials> - <PathAndCredentials wcm:action="add" wcm:keyValue="5"> - <Path>F:\pvpanic\w10\amd64</Path> - </PathAndCredentials> - <PathAndCredentials wcm:action="add" wcm:keyValue="6"> - <Path>F:\qemupciserial\w10\amd64</Path> - </PathAndCredentials> - <PathAndCredentials wcm:action="add" wcm:keyValue="7"> - <Path>F:\qxldod\w10\amd64</Path> - </PathAndCredentials> - <PathAndCredentials wcm:action="add" wcm:keyValue="8"> - <Path>F:\vioinput\w10\amd64</Path> - </PathAndCredentials> - <PathAndCredentials wcm:action="add" wcm:keyValue="9"> - <Path>F:\viorng\w10\amd64</Path> - </PathAndCredentials> - <PathAndCredentials wcm:action="add" wcm:keyValue="10"> - <Path>F:\vioscsi\w10\amd64</Path> - </PathAndCredentials> - <PathAndCredentials wcm:action="add" wcm:keyValue="11"> - <Path>F:\vioserial\w10\amd64</Path> - </PathAndCredentials> - </DriverPaths> - </component> - <component name="Microsoft-Windows-International-Core-WinPE" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> - <SetupUILanguage> - <UILanguage>en-US</UILanguage> - </SetupUILanguage> - <InputLocale>en-US</InputLocale> - <SystemLocale>en-US</SystemLocale> - <UILanguage>en-US</UILanguage> - <UILanguageFallback>en-US</UILanguageFallback> - <UserLocale>en-US</UserLocale> - </component> - <component name="Microsoft-Windows-Setup" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> - <DiskConfiguration> - <Disk wcm:action="add"> - <CreatePartitions> - <CreatePartition wcm:action="add"> - <Order>1</Order> - <Size>350</Size> - <Type>Primary</Type> - </CreatePartition> - <CreatePartition wcm:action="add"> - <Order>2</Order> - <Size>100</Size> - <Type>EFI</Type> - </CreatePartition> - <CreatePartition wcm:action="add"> - <Order>3</Order> - <Size>128</Size> - <Type>MSR</Type> - </CreatePartition> - <CreatePartition wcm:action="add"> - <Order>4</Order> - <Extend>true</Extend> - <Type>Primary</Type> - </CreatePartition> - </CreatePartitions> - <ModifyPartitions> - <ModifyPartition wcm:action="add"> - <Order>1</Order> - <PartitionID>1</PartitionID> - <Label>WINRE</Label> - <Format>NTFS</Format> - <TypeID>de94bba4-06d1-4d40-a16a-bfd50179d6ac</TypeID> - </ModifyPartition> - <ModifyPartition wcm:action="add"> - <Order>2</Order> - <PartitionID>2</PartitionID> - <Label>System</Label> - <Format>FAT32</Format> - </ModifyPartition> - <ModifyPartition wcm:action="add"> - <Order>3</Order> - <PartitionID>3</PartitionID> - </ModifyPartition> - <ModifyPartition wcm:action="add"> - <Order>4</Order> - <PartitionID>4</PartitionID> - <Label>Windows</Label> - <Format>NTFS</Format> - </ModifyPartition> - </ModifyPartitions> - <DiskID>0</DiskID> - <WillWipeDisk>true</WillWipeDisk> - </Disk> - <WillShowUI>OnError</WillShowUI> - </DiskConfiguration> - <ImageInstall> - <OSImage> - <InstallFrom> - <MetaData wcm:action="add"> - <Key>/IMAGE/NAME</Key> - <Value>Windows 10 Enterprise Evaluation</Value> - </MetaData> - </InstallFrom> - <InstallTo> - <DiskID>0</DiskID> - <PartitionID>4</PartitionID> - </InstallTo> - </OSImage> - </ImageInstall> - <UserData> - <ProductKey> - <WillShowUI>OnError</WillShowUI> - </ProductKey> - <AcceptEula>true</AcceptEula> - <FullName>Vagrant</FullName> - <Organization>Bento by Chef Software, Inc.</Organization> - </UserData> - <DynamicUpdate> - <Enable>false</Enable> - </DynamicUpdate> - </component> - </settings> - <settings pass="generalize"> - <component name="Microsoft-Windows-Security-SPP" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> - <SkipRearm>1</SkipRearm> - </component> - <component name="Microsoft-Windows-PnpSysprep" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> - <PersistAllDeviceInstalls>false</PersistAllDeviceInstalls> - <DoNotCleanUpNonPresentDevices>false</DoNotCleanUpNonPresentDevices> - </component> - </settings> - <settings pass="oobeSystem"> - <component name="Microsoft-Windows-International-Core" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> - <InputLocale>en-US</InputLocale> - <SystemLocale>en-US</SystemLocale> - <UILanguage>en-US</UILanguage> - <UserLocale>en-US</UserLocale> - </component> - <component name="Microsoft-Windows-Shell-Setup" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> - <OOBE> - <HideEULAPage>true</HideEULAPage> - <HideLocalAccountScreen>true</HideLocalAccountScreen> - <HideOEMRegistrationScreen>true</HideOEMRegistrationScreen> - <HideOnlineAccountScreens>true</HideOnlineAccountScreens> - <HideWirelessSetupInOOBE>true</HideWirelessSetupInOOBE> - <NetworkLocation>Work</NetworkLocation> - <ProtectYourPC>3</ProtectYourPC> - <SkipMachineOOBE>true</SkipMachineOOBE> - <SkipUserOOBE>true</SkipUserOOBE> - <VMModeOptimizations> - <SkipAdministratorProfileRemoval>true</SkipAdministratorProfileRemoval> - <SkipNotifyUILanguageChange>true</SkipNotifyUILanguageChange> - <SkipWinREInitialization>true</SkipWinREInitialization> - </VMModeOptimizations> - </OOBE> - <TimeZone>UTC</TimeZone> - <UserAccounts> - <AdministratorPassword> - <Value>vagrant</Value> - <PlainText>true</PlainText> - </AdministratorPassword> - <LocalAccounts> - <LocalAccount wcm:action="add"> - <Password> - <Value>vagrant</Value> - <PlainText>true</PlainText> - </Password> - <Description>Vagrant User</Description> - <DisplayName>vagrant</DisplayName> - <Group>administrators</Group> - <Name>vagrant</Name> - </LocalAccount> - </LocalAccounts> - </UserAccounts> - <AutoLogon> - <Password> - <Value>vagrant</Value> - <PlainText>true</PlainText> - </Password> - <Username>vagrant</Username> - <Enabled>true</Enabled> - </AutoLogon> - <FirstLogonCommands> - <SynchronousCommand wcm:action="add"> - <CommandLine>%windir%\System32\WindowsPowerShell\v1.0\powershell.exe -Command "Set-ExecutionPolicy -ExecutionPolicy RemoteSigned -Force"</CommandLine> - <Description>Set Execution Policy 64 Bit</Description> - <Order>1</Order> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <CommandLine>%windir%\SysWOW64\cmd.exe /c powershell -Command "Set-ExecutionPolicy -ExecutionPolicy RemoteSigned -Force"</CommandLine> - <Description>Set Execution Policy 32 Bit</Description> - <Order>2</Order> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <Order>3</Order> - <CommandLine>%windir%\System32\WindowsPowerShell\v1.0\powershell.exe -Command Get-NetConnectionProfile | Set-NetConnectionProfile -NetworkCategory "Private"</CommandLine> - <Description>Sets detected network connections to private to allow start of winrm</Description> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <Order>4</Order> - <CommandLine>%windir%\System32\WindowsPowerShell\v1.0\powershell.exe -Command Set-NetFirewallRule -Name "WINRM-HTTP-In-TCP" -RemoteAddress Any</CommandLine> - <Description>Allows winrm over public profile interfaces</Description> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <Order>5</Order> - <CommandLine>%windir%\System32\cmd.exe /c winrm quickconfig -q</CommandLine> - <Description>winrm quickconfig -q</Description> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <Order>6</Order> - <CommandLine>%windir%\System32\cmd.exe /c winrm quickconfig -transport:http</CommandLine> - <Description>winrm quickconfig -transport:http</Description> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <Order>7</Order> - <CommandLine>%windir%\System32\cmd.exe /c winrm set winrm/config @{MaxTimeoutms="1800000"}</CommandLine> - <Description>Win RM MaxTimoutms</Description> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <Order>8</Order> - <CommandLine>%windir%\System32\cmd.exe /c winrm set winrm/config/winrs @{MaxMemoryPerShellMB="2048"}</CommandLine> - <Description>Win RM MaxMemoryPerShellMB</Description> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <Order>9</Order> - <CommandLine>%windir%\System32\cmd.exe /c winrm set winrm/config/service @{AllowUnencrypted="true"}</CommandLine> - <Description>Win RM AllowUnencrypted</Description> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <Order>10</Order> - <CommandLine>%windir%\System32\cmd.exe /c winrm set winrm/config/service/auth @{Basic="true"}</CommandLine> - <Description>Win RM auth Basic</Description> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <Order>11</Order> - <CommandLine>%windir%\System32\cmd.exe /c winrm set winrm/config/client/auth @{Basic="true"}</CommandLine> - <Description>Win RM client auth Basic</Description> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <Order>12</Order> - <CommandLine>%windir%\System32\cmd.exe /c winrm set winrm/config/listener?Address=*+Transport=HTTP @{Port="5985"}</CommandLine> - <Description>Win RM listener Address/Port</Description> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <Order>13</Order> - <CommandLine>%windir%\System32\cmd.exe /c netsh firewall add portopening TCP 5985 "Port 5985"</CommandLine> - <Description>Win RM port open</Description> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <Order>14</Order> - <CommandLine>%windir%\System32\cmd.exe /c net stop winrm</CommandLine> - <Description>Stop Win RM Service</Description> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <Order>15</Order> - <CommandLine>%windir%\System32\cmd.exe /c sc config winrm start= auto</CommandLine> - <Description>Win RM Autostart</Description> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <Order>16</Order> - <CommandLine>%windir%\System32\cmd.exe /c net start winrm</CommandLine> - <Description>Start Win RM Service</Description> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <Order>17</Order> - <CommandLine>%windir%\System32\cmd.exe /c wmic useraccount where "name='vagrant'" set PasswordExpires=FALSE</CommandLine> - <Description>Disable password expiration for vagrant user</Description> - </SynchronousCommand> - </FirstLogonCommands> - </component> - <component name="Microsoft-Windows-WinRE-RecoveryAgent" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> - <UninstallWindowsRE>true</UninstallWindowsRE> - </component> - </settings> - <settings pass="specialize"> - <component name="Microsoft-Windows-SystemRestore-Main" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> - <DisableSR>1</DisableSR> - </component> - <component name="Microsoft-Windows-SystemSettingsThreshold" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> - <DisplayNetworkSelection>false</DisplayNetworkSelection> - </component> - <component name="Networking-MPSSVC-Svc" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> - <FirewallGroups> - <FirewallGroup wcm:action="add" wcm:keyValue="WindowsRemoteManagement"> - <Active>true</Active> - <Group>Windows Remote Management</Group> - <Profile>all</Profile> - </FirewallGroup> - <FirewallGroup wcm:action="add" wcm:keyValue="RemoteAdministration"> - <Active>true</Active> - <Group>Remote Administration</Group> - <Profile>all</Profile> - </FirewallGroup> - </FirewallGroups> - </component> - <component name="Microsoft-Windows-SQMApi" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> - <CEIPEnabled>0</CEIPEnabled> - </component> - <component name="Microsoft-Windows-Security-SPP-UX" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> - <SkipAutoActivation>true</SkipAutoActivation> - </component> - </settings> - <settings pass="offlineServicing"> - <component name="Microsoft-Windows-LUA-Settings" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> - <EnableLUA>false</EnableLUA> - </component> - </settings> -</unattend> diff --git a/packer_templates/win_answer_files/11/hyperv-gen2/Autounattend 2.xml b/packer_templates/win_answer_files/11/hyperv-gen2/Autounattend 2.xml deleted file mode 100644 index 65a4caaa3..000000000 --- a/packer_templates/win_answer_files/11/hyperv-gen2/Autounattend 2.xml +++ /dev/null @@ -1,341 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<unattend xmlns="urn:schemas-microsoft-com:unattend" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - <settings pass="windowsPE"> - <component name="Microsoft-Windows-PnpCustomizationsWinPE" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" processorArchitecture="amd64"> - <!-- - This makes the VirtIO drivers available to Windows, assuming that - the VirtIO driver disk at https://fedorapeople.org/groups/virt/virtio-win/direct-downloads/stable-virtio/virtio-win.iso - (see https://docs.fedoraproject.org/en-US/quick-docs/creating-windows-virtual-machines-using-virtio-drivers/index.html#virtio-win-direct-downloads) - is available as drive E: - --> - <DriverPaths> - <PathAndCredentials wcm:action="add" wcm:keyValue="2"> - <Path>F:\viostor\w11\amd64</Path> - </PathAndCredentials> - <PathAndCredentials wcm:action="add" wcm:keyValue="3"> - <Path>F:\NetKVM\w11\amd64</Path> - </PathAndCredentials> - <PathAndCredentials wcm:action="add" wcm:keyValue="4"> - <Path>F:\Balloon\w11\amd64</Path> - </PathAndCredentials> - <PathAndCredentials wcm:action="add" wcm:keyValue="5"> - <Path>F:\pvpanic\w11\amd64</Path> - </PathAndCredentials> - <PathAndCredentials wcm:action="add" wcm:keyValue="6"> - <Path>F:\qemupciserial\w11\amd64</Path> - </PathAndCredentials> - <PathAndCredentials wcm:action="add" wcm:keyValue="7"> - <Path>F:\qxldod\w11\amd64</Path> - </PathAndCredentials> - <PathAndCredentials wcm:action="add" wcm:keyValue="8"> - <Path>F:\vioinput\w11\amd64</Path> - </PathAndCredentials> - <PathAndCredentials wcm:action="add" wcm:keyValue="9"> - <Path>F:\viorng\w11\amd64</Path> - </PathAndCredentials> - <PathAndCredentials wcm:action="add" wcm:keyValue="10"> - <Path>F:\vioscsi\w11\amd64</Path> - </PathAndCredentials> - <PathAndCredentials wcm:action="add" wcm:keyValue="11"> - <Path>F:\vioserial\w11\amd64</Path> - </PathAndCredentials> - </DriverPaths> - </component> - <component name="Microsoft-Windows-International-Core-WinPE" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> - <SetupUILanguage> - <UILanguage>en-US</UILanguage> - </SetupUILanguage> - <InputLocale>en-US</InputLocale> - <SystemLocale>en-US</SystemLocale> - <UILanguage>en-US</UILanguage> - <UILanguageFallback>en-US</UILanguageFallback> - <UserLocale>en-US</UserLocale> - </component> - <component name="Microsoft-Windows-Setup" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> - <RunSynchronous> - <RunSynchronousCommand wcm:action="add"> - <Order>1</Order> - <Path>%windir%\System32\reg.exe add "HKLM\SYSTEM\Setup\LabConfig" /v BypassTPMCheck /t REG_DWORD /d 1 /f</Path> - </RunSynchronousCommand> - <RunSynchronousCommand wcm:action="add"> - <Order>2</Order> - <Path>%windir%\System32\reg.exe add "HKLM\SYSTEM\Setup\LabConfig" /v BypassSecureBootCheck /t REG_DWORD /d 1 /f</Path> - </RunSynchronousCommand> - </RunSynchronous> - <DiskConfiguration> - <Disk wcm:action="add"> - <CreatePartitions> - <CreatePartition wcm:action="add"> - <Order>1</Order> - <Size>350</Size> - <Type>Primary</Type> - </CreatePartition> - <CreatePartition wcm:action="add"> - <Order>2</Order> - <Size>100</Size> - <Type>EFI</Type> - </CreatePartition> - <CreatePartition wcm:action="add"> - <Order>3</Order> - <Size>128</Size> - <Type>MSR</Type> - </CreatePartition> - <CreatePartition wcm:action="add"> - <Order>4</Order> - <Extend>true</Extend> - <Type>Primary</Type> - </CreatePartition> - </CreatePartitions> - <ModifyPartitions> - <ModifyPartition wcm:action="add"> - <Order>1</Order> - <PartitionID>1</PartitionID> - <Label>WINRE</Label> - <Format>NTFS</Format> - <TypeID>de94bba4-06d1-4d40-a16a-bfd50179d6ac</TypeID> - </ModifyPartition> - <ModifyPartition wcm:action="add"> - <Order>2</Order> - <PartitionID>2</PartitionID> - <Label>System</Label> - <Format>FAT32</Format> - </ModifyPartition> - <ModifyPartition wcm:action="add"> - <Order>3</Order> - <PartitionID>3</PartitionID> - </ModifyPartition> - <ModifyPartition wcm:action="add"> - <Order>4</Order> - <PartitionID>4</PartitionID> - <Label>Windows</Label> - <Format>NTFS</Format> - </ModifyPartition> - </ModifyPartitions> - <DiskID>0</DiskID> - <WillWipeDisk>true</WillWipeDisk> - </Disk> - <WillShowUI>OnError</WillShowUI> - </DiskConfiguration> - <ImageInstall> - <OSImage> - <InstallFrom> - <MetaData wcm:action="add"> - <Key>/IMAGE/NAME</Key> - <Value>Windows 11 Enterprise Evaluation</Value> - </MetaData> - </InstallFrom> - <InstallTo> - <DiskID>0</DiskID> - <PartitionID>4</PartitionID> - </InstallTo> - </OSImage> - </ImageInstall> - <UserData> - <ProductKey> - <WillShowUI>OnError</WillShowUI> - </ProductKey> - <AcceptEula>true</AcceptEula> - <FullName>Vagrant</FullName> - <Organization>Bento by Chef Software, Inc.</Organization> - </UserData> - <DynamicUpdate> - <Enable>false</Enable> - </DynamicUpdate> - </component> - </settings> - <settings pass="generalize"> - <component name="Microsoft-Windows-Security-SPP" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> - <SkipRearm>1</SkipRearm> - </component> - <component name="Microsoft-Windows-PnpSysprep" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> - <PersistAllDeviceInstalls>false</PersistAllDeviceInstalls> - <DoNotCleanUpNonPresentDevices>false</DoNotCleanUpNonPresentDevices> - </component> - </settings> - <settings pass="oobeSystem"> - <component name="Microsoft-Windows-International-Core" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> - <InputLocale>en-US</InputLocale> - <SystemLocale>en-US</SystemLocale> - <UILanguage>en-US</UILanguage> - <UserLocale>en-US</UserLocale> - </component> - <component name="Microsoft-Windows-Shell-Setup" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> - <OOBE> - <HideEULAPage>true</HideEULAPage> - <HideLocalAccountScreen>true</HideLocalAccountScreen> - <HideOEMRegistrationScreen>true</HideOEMRegistrationScreen> - <HideOnlineAccountScreens>true</HideOnlineAccountScreens> - <HideWirelessSetupInOOBE>true</HideWirelessSetupInOOBE> - <NetworkLocation>Work</NetworkLocation> - <ProtectYourPC>3</ProtectYourPC> - <SkipMachineOOBE>true</SkipMachineOOBE> - <SkipUserOOBE>true</SkipUserOOBE> - <VMModeOptimizations> - <SkipAdministratorProfileRemoval>true</SkipAdministratorProfileRemoval> - <SkipNotifyUILanguageChange>true</SkipNotifyUILanguageChange> - <SkipWinREInitialization>true</SkipWinREInitialization> - </VMModeOptimizations> - </OOBE> - <TimeZone>UTC</TimeZone> - <UserAccounts> - <AdministratorPassword> - <Value>vagrant</Value> - <PlainText>true</PlainText> - </AdministratorPassword> - <LocalAccounts> - <LocalAccount wcm:action="add"> - <Password> - <Value>vagrant</Value> - <PlainText>true</PlainText> - </Password> - <Description>Vagrant User</Description> - <DisplayName>vagrant</DisplayName> - <Group>administrators</Group> - <Name>vagrant</Name> - </LocalAccount> - </LocalAccounts> - </UserAccounts> - <AutoLogon> - <Password> - <Value>vagrant</Value> - <PlainText>true</PlainText> - </Password> - <Username>vagrant</Username> - <Enabled>true</Enabled> - </AutoLogon> - <FirstLogonCommands> - <SynchronousCommand wcm:action="add"> - <CommandLine>%windir%\System32\WindowsPowerShell\v1.0\powershell.exe -Command "Set-ExecutionPolicy -ExecutionPolicy RemoteSigned -Force"</CommandLine> - <Description>Set Execution Policy 64 Bit</Description> - <Order>1</Order> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <CommandLine>%windir%\SysWOW64\cmd.exe /c powershell -Command "Set-ExecutionPolicy -ExecutionPolicy RemoteSigned -Force"</CommandLine> - <Description>Set Execution Policy 32 Bit</Description> - <Order>2</Order> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <Order>3</Order> - <CommandLine>%windir%\System32\WindowsPowerShell\v1.0\powershell.exe -Command Get-NetConnectionProfile | Set-NetConnectionProfile -NetworkCategory "Private"</CommandLine> - <Description>Sets detected network connections to private to allow start of winrm</Description> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <Order>4</Order> - <CommandLine>%windir%\System32\WindowsPowerShell\v1.0\powershell.exe -Command Set-NetFirewallRule -Name "WINRM-HTTP-In-TCP" -RemoteAddress Any</CommandLine> - <Description>Allows winrm over public profile interfaces</Description> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <Order>5</Order> - <CommandLine>%windir%\System32\cmd.exe /c winrm quickconfig -q</CommandLine> - <Description>winrm quickconfig -q</Description> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <Order>6</Order> - <CommandLine>%windir%\System32\cmd.exe /c winrm quickconfig -transport:http</CommandLine> - <Description>winrm quickconfig -transport:http</Description> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <Order>7</Order> - <CommandLine>%windir%\System32\cmd.exe /c winrm set winrm/config @{MaxTimeoutms="1800000"}</CommandLine> - <Description>Win RM MaxTimoutms</Description> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <Order>8</Order> - <CommandLine>%windir%\System32\cmd.exe /c winrm set winrm/config/winrs @{MaxMemoryPerShellMB="2048"}</CommandLine> - <Description>Win RM MaxMemoryPerShellMB</Description> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <Order>9</Order> - <CommandLine>%windir%\System32\cmd.exe /c winrm set winrm/config/service @{AllowUnencrypted="true"}</CommandLine> - <Description>Win RM AllowUnencrypted</Description> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <Order>10</Order> - <CommandLine>%windir%\System32\cmd.exe /c winrm set winrm/config/service/auth @{Basic="true"}</CommandLine> - <Description>Win RM auth Basic</Description> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <Order>11</Order> - <CommandLine>%windir%\System32\cmd.exe /c winrm set winrm/config/client/auth @{Basic="true"}</CommandLine> - <Description>Win RM client auth Basic</Description> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <Order>12</Order> - <CommandLine>%windir%\System32\cmd.exe /c winrm set winrm/config/listener?Address=*+Transport=HTTP @{Port="5985"}</CommandLine> - <Description>Win RM listener Address/Port</Description> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <Order>13</Order> - <CommandLine>%windir%\System32\cmd.exe /c netsh firewall add portopening TCP 5985 "Port 5985"</CommandLine> - <Description>Win RM port open</Description> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <Order>14</Order> - <CommandLine>%windir%\System32\cmd.exe /c net stop winrm</CommandLine> - <Description>Stop Win RM Service</Description> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <Order>15</Order> - <CommandLine>%windir%\System32\cmd.exe /c sc config winrm start= auto</CommandLine> - <Description>Win RM Autostart</Description> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <Order>16</Order> - <CommandLine>%windir%\System32\cmd.exe /c net start winrm</CommandLine> - <Description>Start Win RM Service</Description> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <Order>17</Order> - <CommandLine>%windir%\System32\cmd.exe /c wmic useraccount where "name='vagrant'" set PasswordExpires=FALSE</CommandLine> - <Description>Disable password expiration for vagrant user</Description> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <CommandLine>%SystemRoot%\System32\reg.exe ADD "HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon" /v DefaultPassword /t REG_SZ /d "vagrant" /f</CommandLine> - <Order>18</Order> - <Description>Enable AutoLogon</Description> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <CommandLine>%SystemRoot%\System32\reg.exe ADD "HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon" /v AutoAdminLogon /t REG_SZ /d 1 /f</CommandLine> - <Order>19</Order> - <Description>Enable AutoLogon</Description> - </SynchronousCommand> - </FirstLogonCommands> - </component> - <component name="Microsoft-Windows-WinRE-RecoveryAgent" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> - <UninstallWindowsRE>true</UninstallWindowsRE> - </component> - </settings> - <settings pass="specialize"> - <component name="Microsoft-Windows-SystemRestore-Main" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> - <DisableSR>1</DisableSR> - </component> - <component name="Microsoft-Windows-SystemSettingsThreshold" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> - <DisplayNetworkSelection>false</DisplayNetworkSelection> - </component> - <component name="Networking-MPSSVC-Svc" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> - <FirewallGroups> - <FirewallGroup wcm:action="add" wcm:keyValue="WindowsRemoteManagement"> - <Active>true</Active> - <Group>Windows Remote Management</Group> - <Profile>all</Profile> - </FirewallGroup> - <FirewallGroup wcm:action="add" wcm:keyValue="RemoteAdministration"> - <Active>true</Active> - <Group>Remote Administration</Group> - <Profile>all</Profile> - </FirewallGroup> - </FirewallGroups> - </component> - <component name="Microsoft-Windows-SQMApi" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> - <CEIPEnabled>0</CEIPEnabled> - </component> - <component name="Microsoft-Windows-Security-SPP-UX" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> - <SkipAutoActivation>true</SkipAutoActivation> - </component> - </settings> - <settings pass="offlineServicing"> - <component name="Microsoft-Windows-LUA-Settings" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> - <EnableLUA>false</EnableLUA> - </component> - </settings> -</unattend> diff --git a/packer_templates/win_answer_files/2016/hyperv-gen2/Autounattend 2.xml b/packer_templates/win_answer_files/2016/hyperv-gen2/Autounattend 2.xml deleted file mode 100644 index 64579c515..000000000 --- a/packer_templates/win_answer_files/2016/hyperv-gen2/Autounattend 2.xml +++ /dev/null @@ -1,332 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<unattend xmlns="urn:schemas-microsoft-com:unattend" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - <settings pass="windowsPE"> - <component name="Microsoft-Windows-PnpCustomizationsWinPE" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" processorArchitecture="amd64"> - <!-- - This makes the VirtIO drivers available to Windows, assuming that - the VirtIO driver disk at https://fedorapeople.org/groups/virt/virtio-win/direct-downloads/stable-virtio/virtio-win.iso - (see https://docs.fedoraproject.org/en-US/quick-docs/creating-windows-virtual-machines-using-virtio-drivers/index.html#virtio-win-direct-downloads) - is available as drive E: - --> - <DriverPaths> - <PathAndCredentials wcm:action="add" wcm:keyValue="2"> - <Path>F:\viostor\2k16\amd64</Path> - </PathAndCredentials> - <PathAndCredentials wcm:action="add" wcm:keyValue="3"> - <Path>F:\NetKVM\2k16\amd64</Path> - </PathAndCredentials> - <PathAndCredentials wcm:action="add" wcm:keyValue="4"> - <Path>F:\Balloon\2k16\amd64</Path> - </PathAndCredentials> - <PathAndCredentials wcm:action="add" wcm:keyValue="5"> - <Path>F:\pvpanic\2k16\amd64</Path> - </PathAndCredentials> - <PathAndCredentials wcm:action="add" wcm:keyValue="6"> - <Path>F:\qemupciserial\2k16\amd64</Path> - </PathAndCredentials> - <PathAndCredentials wcm:action="add" wcm:keyValue="7"> - <Path>F:\qxldod\2k16\amd64</Path> - </PathAndCredentials> - <PathAndCredentials wcm:action="add" wcm:keyValue="8"> - <Path>F:\vioinput\2k16\amd64</Path> - </PathAndCredentials> - <PathAndCredentials wcm:action="add" wcm:keyValue="9"> - <Path>F:\viorng\2k16\amd64</Path> - </PathAndCredentials> - <PathAndCredentials wcm:action="add" wcm:keyValue="10"> - <Path>F:\vioscsi\2k16\amd64</Path> - </PathAndCredentials> - <PathAndCredentials wcm:action="add" wcm:keyValue="11"> - <Path>F:\vioserial\2k16\amd64</Path> - </PathAndCredentials> - </DriverPaths> - </component> - <component name="Microsoft-Windows-International-Core-WinPE" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> - <SetupUILanguage> - <UILanguage>en-US</UILanguage> - </SetupUILanguage> - <InputLocale>en-US</InputLocale> - <SystemLocale>en-US</SystemLocale> - <UILanguage>en-US</UILanguage> - <UILanguageFallback>en-US</UILanguageFallback> - <UserLocale>en-US</UserLocale> - </component> - <component name="Microsoft-Windows-Setup" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> - <DiskConfiguration> - <Disk wcm:action="add"> - <CreatePartitions> - <CreatePartition wcm:action="add"> - <Order>1</Order> - <Size>350</Size> - <Type>Primary</Type> - </CreatePartition> - <CreatePartition wcm:action="add"> - <Order>2</Order> - <Size>100</Size> - <Type>EFI</Type> - </CreatePartition> - <CreatePartition wcm:action="add"> - <Order>3</Order> - <Size>128</Size> - <Type>MSR</Type> - </CreatePartition> - <CreatePartition wcm:action="add"> - <Order>4</Order> - <Extend>true</Extend> - <Type>Primary</Type> - </CreatePartition> - </CreatePartitions> - <ModifyPartitions> - <ModifyPartition wcm:action="add"> - <Order>1</Order> - <PartitionID>1</PartitionID> - <Label>WINRE</Label> - <Format>NTFS</Format> - <TypeID>de94bba4-06d1-4d40-a16a-bfd50179d6ac</TypeID> - </ModifyPartition> - <ModifyPartition wcm:action="add"> - <Order>2</Order> - <PartitionID>2</PartitionID> - <Label>System</Label> - <Format>FAT32</Format> - </ModifyPartition> - <ModifyPartition wcm:action="add"> - <Order>3</Order> - <PartitionID>3</PartitionID> - </ModifyPartition> - <ModifyPartition wcm:action="add"> - <Order>4</Order> - <PartitionID>4</PartitionID> - <Label>Windows</Label> - <Format>NTFS</Format> - </ModifyPartition> - </ModifyPartitions> - <DiskID>0</DiskID> - <WillWipeDisk>true</WillWipeDisk> - </Disk> - <WillShowUI>OnError</WillShowUI> - </DiskConfiguration> - <ImageInstall> - <OSImage> - <InstallFrom> - <MetaData wcm:action="add"> - <Key>/IMAGE/NAME</Key> - <Value>Windows Server 2016 SERVERSTANDARD</Value> - </MetaData> - </InstallFrom> - <InstallTo> - <DiskID>0</DiskID> - <PartitionID>4</PartitionID> - </InstallTo> - </OSImage> - </ImageInstall> - <UserData> - <ProductKey> - <WillShowUI>OnError</WillShowUI> - </ProductKey> - <AcceptEula>true</AcceptEula> - <FullName>Vagrant</FullName> - <Organization>Bento by Chef Software, Inc.</Organization> - </UserData> - <DynamicUpdate> - <Enable>false</Enable> - </DynamicUpdate> - </component> - </settings> - <settings pass="generalize"> - <component name="Microsoft-Windows-Security-SPP" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> - <SkipRearm>1</SkipRearm> - </component> - <component name="Microsoft-Windows-PnpSysprep" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> - <PersistAllDeviceInstalls>false</PersistAllDeviceInstalls> - <DoNotCleanUpNonPresentDevices>false</DoNotCleanUpNonPresentDevices> - </component> - </settings> - <settings pass="oobeSystem"> - <component name="Microsoft-Windows-International-Core" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> - <InputLocale>en-US</InputLocale> - <SystemLocale>en-US</SystemLocale> - <UILanguage>en-US</UILanguage> - <UserLocale>en-US</UserLocale> - </component> - <component name="Microsoft-Windows-Shell-Setup" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> - <OOBE> - <HideEULAPage>true</HideEULAPage> - <HideLocalAccountScreen>true</HideLocalAccountScreen> - <HideOEMRegistrationScreen>true</HideOEMRegistrationScreen> - <HideOnlineAccountScreens>true</HideOnlineAccountScreens> - <HideWirelessSetupInOOBE>true</HideWirelessSetupInOOBE> - <NetworkLocation>Work</NetworkLocation> - <ProtectYourPC>3</ProtectYourPC> - <SkipMachineOOBE>true</SkipMachineOOBE> - <SkipUserOOBE>true</SkipUserOOBE> - <VMModeOptimizations> - <SkipAdministratorProfileRemoval>true</SkipAdministratorProfileRemoval> - <SkipNotifyUILanguageChange>true</SkipNotifyUILanguageChange> - <SkipWinREInitialization>true</SkipWinREInitialization> - </VMModeOptimizations> - </OOBE> - <TimeZone>UTC</TimeZone> - <UserAccounts> - <AdministratorPassword> - <Value>vagrant</Value> - <PlainText>true</PlainText> - </AdministratorPassword> - <LocalAccounts> - <LocalAccount wcm:action="add"> - <Password> - <Value>vagrant</Value> - <PlainText>true</PlainText> - </Password> - <Description>Vagrant User</Description> - <DisplayName>vagrant</DisplayName> - <Group>administrators</Group> - <Name>vagrant</Name> - </LocalAccount> - </LocalAccounts> - </UserAccounts> - <AutoLogon> - <Password> - <Value>vagrant</Value> - <PlainText>true</PlainText> - </Password> - <Username>vagrant</Username> - <Enabled>true</Enabled> - </AutoLogon> - <FirstLogonCommands> - <SynchronousCommand wcm:action="add"> - <CommandLine>%windir%\System32\WindowsPowerShell\v1.0\powershell.exe -Command "Set-ExecutionPolicy -ExecutionPolicy RemoteSigned -Force"</CommandLine> - <Description>Set Execution Policy 64 Bit</Description> - <Order>1</Order> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <CommandLine>%windir%\SysWOW64\cmd.exe /c powershell -Command "Set-ExecutionPolicy -ExecutionPolicy RemoteSigned -Force"</CommandLine> - <Description>Set Execution Policy 32 Bit</Description> - <Order>2</Order> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <Order>3</Order> - <CommandLine>%windir%\System32\WindowsPowerShell\v1.0\powershell.exe -Command Get-NetConnectionProfile | Set-NetConnectionProfile -NetworkCategory "Private"</CommandLine> - <Description>Sets detected network connections to private to allow start of winrm</Description> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <Order>4</Order> - <CommandLine>%windir%\System32\WindowsPowerShell\v1.0\powershell.exe -Command Set-NetFirewallRule -Name "WINRM-HTTP-In-TCP" -RemoteAddress Any</CommandLine> - <Description>Allows winrm over public profile interfaces</Description> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <Order>5</Order> - <CommandLine>%windir%\System32\cmd.exe /c winrm quickconfig -q</CommandLine> - <Description>winrm quickconfig -q</Description> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <Order>6</Order> - <CommandLine>%windir%\System32\cmd.exe /c winrm quickconfig -transport:http</CommandLine> - <Description>winrm quickconfig -transport:http</Description> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <Order>7</Order> - <CommandLine>%windir%\System32\cmd.exe /c winrm set winrm/config @{MaxTimeoutms="1800000"}</CommandLine> - <Description>Win RM MaxTimoutms</Description> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <Order>8</Order> - <CommandLine>%windir%\System32\cmd.exe /c winrm set winrm/config/winrs @{MaxMemoryPerShellMB="2048"}</CommandLine> - <Description>Win RM MaxMemoryPerShellMB</Description> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <Order>9</Order> - <CommandLine>%windir%\System32\cmd.exe /c winrm set winrm/config/service @{AllowUnencrypted="true"}</CommandLine> - <Description>Win RM AllowUnencrypted</Description> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <Order>10</Order> - <CommandLine>%windir%\System32\cmd.exe /c winrm set winrm/config/service/auth @{Basic="true"}</CommandLine> - <Description>Win RM auth Basic</Description> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <Order>11</Order> - <CommandLine>%windir%\System32\cmd.exe /c winrm set winrm/config/client/auth @{Basic="true"}</CommandLine> - <Description>Win RM client auth Basic</Description> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <Order>12</Order> - <CommandLine>%windir%\System32\cmd.exe /c winrm set winrm/config/listener?Address=*+Transport=HTTP @{Port="5985"}</CommandLine> - <Description>Win RM listener Address/Port</Description> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <Order>13</Order> - <CommandLine>%windir%\System32\cmd.exe /c netsh firewall add portopening TCP 5985 "Port 5985"</CommandLine> - <Description>Win RM port open</Description> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <Order>14</Order> - <CommandLine>%windir%\System32\cmd.exe /c net stop winrm</CommandLine> - <Description>Stop Win RM Service</Description> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <Order>15</Order> - <CommandLine>%windir%\System32\cmd.exe /c sc config winrm start= auto</CommandLine> - <Description>Win RM Autostart</Description> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <Order>16</Order> - <CommandLine>%windir%\System32\cmd.exe /c net start winrm</CommandLine> - <Description>Start Win RM Service</Description> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <Order>17</Order> - <CommandLine>%windir%\System32\cmd.exe /c wmic useraccount where "name='vagrant'" set PasswordExpires=FALSE</CommandLine> - <Description>Disable password expiration for vagrant user</Description> - </SynchronousCommand> - </FirstLogonCommands> - </component> - <component name="Microsoft-Windows-WinRE-RecoveryAgent" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> - <UninstallWindowsRE>true</UninstallWindowsRE> - </component> - </settings> - <settings pass="specialize"> - <component name="Microsoft-Windows-ServerManager-SvrMgrNc" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> - <DoNotOpenServerManagerAtLogon>true</DoNotOpenServerManagerAtLogon> - </component> - <component name="Microsoft-Windows-IE-ESC" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> - <!-- Disable IE ESC. --> - <IEHardenAdmin>false</IEHardenAdmin> - <IEHardenUser>false</IEHardenUser> - </component> - <component name="Microsoft-Windows-OutOfBoxExperience" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> - <DoNotOpenInitialConfigurationTasksAtLogon>true</DoNotOpenInitialConfigurationTasksAtLogon> - </component> - <component name="Microsoft-Windows-SystemRestore-Main" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> - <DisableSR>1</DisableSR> - </component> - <component name="Microsoft-Windows-SystemSettingsThreshold" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> - <DisplayNetworkSelection>false</DisplayNetworkSelection> - </component> - <component name="Networking-MPSSVC-Svc" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> - <FirewallGroups> - <FirewallGroup wcm:action="add" wcm:keyValue="WindowsRemoteManagement"> - <Active>true</Active> - <Group>Windows Remote Management</Group> - <Profile>all</Profile> - </FirewallGroup> - <FirewallGroup wcm:action="add" wcm:keyValue="RemoteAdministration"> - <Active>true</Active> - <Group>Remote Administration</Group> - <Profile>all</Profile> - </FirewallGroup> - </FirewallGroups> - </component> - <component name="Microsoft-Windows-SQMApi" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> - <CEIPEnabled>0</CEIPEnabled> - </component> - <component name="Microsoft-Windows-Security-SPP-UX" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> - <SkipAutoActivation>true</SkipAutoActivation> - </component> - </settings> - <settings pass="offlineServicing"> - <component name="Microsoft-Windows-LUA-Settings" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> - <EnableLUA>false</EnableLUA> - </component> - </settings> -</unattend> diff --git a/packer_templates/win_answer_files/2019/hyperv-gen2/Autounattend 2.xml b/packer_templates/win_answer_files/2019/hyperv-gen2/Autounattend 2.xml deleted file mode 100644 index 58f6821a7..000000000 --- a/packer_templates/win_answer_files/2019/hyperv-gen2/Autounattend 2.xml +++ /dev/null @@ -1,332 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<unattend xmlns="urn:schemas-microsoft-com:unattend" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - <settings pass="windowsPE"> - <component name="Microsoft-Windows-PnpCustomizationsWinPE" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" processorArchitecture="amd64"> - <!-- - This makes the VirtIO drivers available to Windows, assuming that - the VirtIO driver disk at https://fedorapeople.org/groups/virt/virtio-win/direct-downloads/stable-virtio/virtio-win.iso - (see https://docs.fedoraproject.org/en-US/quick-docs/creating-windows-virtual-machines-using-virtio-drivers/index.html#virtio-win-direct-downloads) - is available as drive E: - --> - <DriverPaths> - <PathAndCredentials wcm:action="add" wcm:keyValue="2"> - <Path>F:\viostor\2k19\amd64</Path> - </PathAndCredentials> - <PathAndCredentials wcm:action="add" wcm:keyValue="3"> - <Path>F:\NetKVM\2k19\amd64</Path> - </PathAndCredentials> - <PathAndCredentials wcm:action="add" wcm:keyValue="4"> - <Path>F:\Balloon\2k19\amd64</Path> - </PathAndCredentials> - <PathAndCredentials wcm:action="add" wcm:keyValue="5"> - <Path>F:\pvpanic\2k19\amd64</Path> - </PathAndCredentials> - <PathAndCredentials wcm:action="add" wcm:keyValue="6"> - <Path>F:\qemupciserial\2k19\amd64</Path> - </PathAndCredentials> - <PathAndCredentials wcm:action="add" wcm:keyValue="7"> - <Path>F:\qxldod\2k19\amd64</Path> - </PathAndCredentials> - <PathAndCredentials wcm:action="add" wcm:keyValue="8"> - <Path>F:\vioinput\2k19\amd64</Path> - </PathAndCredentials> - <PathAndCredentials wcm:action="add" wcm:keyValue="9"> - <Path>F:\viorng\2k19\amd64</Path> - </PathAndCredentials> - <PathAndCredentials wcm:action="add" wcm:keyValue="10"> - <Path>F:\vioscsi\2k19\amd64</Path> - </PathAndCredentials> - <PathAndCredentials wcm:action="add" wcm:keyValue="11"> - <Path>F:\vioserial\2k19\amd64</Path> - </PathAndCredentials> - </DriverPaths> - </component> - <component name="Microsoft-Windows-International-Core-WinPE" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> - <SetupUILanguage> - <UILanguage>en-US</UILanguage> - </SetupUILanguage> - <InputLocale>en-US</InputLocale> - <SystemLocale>en-US</SystemLocale> - <UILanguage>en-US</UILanguage> - <UILanguageFallback>en-US</UILanguageFallback> - <UserLocale>en-US</UserLocale> - </component> - <component name="Microsoft-Windows-Setup" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> - <DiskConfiguration> - <Disk wcm:action="add"> - <CreatePartitions> - <CreatePartition wcm:action="add"> - <Order>1</Order> - <Size>350</Size> - <Type>Primary</Type> - </CreatePartition> - <CreatePartition wcm:action="add"> - <Order>2</Order> - <Size>100</Size> - <Type>EFI</Type> - </CreatePartition> - <CreatePartition wcm:action="add"> - <Order>3</Order> - <Size>128</Size> - <Type>MSR</Type> - </CreatePartition> - <CreatePartition wcm:action="add"> - <Order>4</Order> - <Extend>true</Extend> - <Type>Primary</Type> - </CreatePartition> - </CreatePartitions> - <ModifyPartitions> - <ModifyPartition wcm:action="add"> - <Order>1</Order> - <PartitionID>1</PartitionID> - <Label>WINRE</Label> - <Format>NTFS</Format> - <TypeID>de94bba4-06d1-4d40-a16a-bfd50179d6ac</TypeID> - </ModifyPartition> - <ModifyPartition wcm:action="add"> - <Order>2</Order> - <PartitionID>2</PartitionID> - <Label>System</Label> - <Format>FAT32</Format> - </ModifyPartition> - <ModifyPartition wcm:action="add"> - <Order>3</Order> - <PartitionID>3</PartitionID> - </ModifyPartition> - <ModifyPartition wcm:action="add"> - <Order>4</Order> - <PartitionID>4</PartitionID> - <Label>Windows</Label> - <Format>NTFS</Format> - </ModifyPartition> - </ModifyPartitions> - <DiskID>0</DiskID> - <WillWipeDisk>true</WillWipeDisk> - </Disk> - <WillShowUI>OnError</WillShowUI> - </DiskConfiguration> - <ImageInstall> - <OSImage> - <InstallFrom> - <MetaData wcm:action="add"> - <Key>/IMAGE/NAME</Key> - <Value>Windows Server 2019 SERVERSTANDARD</Value> - </MetaData> - </InstallFrom> - <InstallTo> - <DiskID>0</DiskID> - <PartitionID>4</PartitionID> - </InstallTo> - </OSImage> - </ImageInstall> - <UserData> - <ProductKey> - <WillShowUI>OnError</WillShowUI> - </ProductKey> - <AcceptEula>true</AcceptEula> - <FullName>Vagrant</FullName> - <Organization>Bento by Chef Software, Inc.</Organization> - </UserData> - <DynamicUpdate> - <Enable>false</Enable> - </DynamicUpdate> - </component> - </settings> - <settings pass="generalize"> - <component name="Microsoft-Windows-Security-SPP" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> - <SkipRearm>1</SkipRearm> - </component> - <component name="Microsoft-Windows-PnpSysprep" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> - <PersistAllDeviceInstalls>false</PersistAllDeviceInstalls> - <DoNotCleanUpNonPresentDevices>false</DoNotCleanUpNonPresentDevices> - </component> - </settings> - <settings pass="oobeSystem"> - <component name="Microsoft-Windows-International-Core" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> - <InputLocale>en-US</InputLocale> - <SystemLocale>en-US</SystemLocale> - <UILanguage>en-US</UILanguage> - <UserLocale>en-US</UserLocale> - </component> - <component name="Microsoft-Windows-Shell-Setup" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> - <OOBE> - <HideEULAPage>true</HideEULAPage> - <HideLocalAccountScreen>true</HideLocalAccountScreen> - <HideOEMRegistrationScreen>true</HideOEMRegistrationScreen> - <HideOnlineAccountScreens>true</HideOnlineAccountScreens> - <HideWirelessSetupInOOBE>true</HideWirelessSetupInOOBE> - <NetworkLocation>Work</NetworkLocation> - <ProtectYourPC>3</ProtectYourPC> - <SkipMachineOOBE>true</SkipMachineOOBE> - <SkipUserOOBE>true</SkipUserOOBE> - <VMModeOptimizations> - <SkipAdministratorProfileRemoval>true</SkipAdministratorProfileRemoval> - <SkipNotifyUILanguageChange>true</SkipNotifyUILanguageChange> - <SkipWinREInitialization>true</SkipWinREInitialization> - </VMModeOptimizations> - </OOBE> - <TimeZone>UTC</TimeZone> - <UserAccounts> - <AdministratorPassword> - <Value>vagrant</Value> - <PlainText>true</PlainText> - </AdministratorPassword> - <LocalAccounts> - <LocalAccount wcm:action="add"> - <Password> - <Value>vagrant</Value> - <PlainText>true</PlainText> - </Password> - <Description>Vagrant User</Description> - <DisplayName>vagrant</DisplayName> - <Group>administrators</Group> - <Name>vagrant</Name> - </LocalAccount> - </LocalAccounts> - </UserAccounts> - <AutoLogon> - <Password> - <Value>vagrant</Value> - <PlainText>true</PlainText> - </Password> - <Username>vagrant</Username> - <Enabled>true</Enabled> - </AutoLogon> - <FirstLogonCommands> - <SynchronousCommand wcm:action="add"> - <CommandLine>%windir%\System32\WindowsPowerShell\v1.0\powershell.exe -Command "Set-ExecutionPolicy -ExecutionPolicy RemoteSigned -Force"</CommandLine> - <Description>Set Execution Policy 64 Bit</Description> - <Order>1</Order> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <CommandLine>%windir%\SysWOW64\cmd.exe /c powershell -Command "Set-ExecutionPolicy -ExecutionPolicy RemoteSigned -Force"</CommandLine> - <Description>Set Execution Policy 32 Bit</Description> - <Order>2</Order> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <Order>3</Order> - <CommandLine>%windir%\System32\WindowsPowerShell\v1.0\powershell.exe -Command Get-NetConnectionProfile | Set-NetConnectionProfile -NetworkCategory "Private"</CommandLine> - <Description>Sets detected network connections to private to allow start of winrm</Description> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <Order>4</Order> - <CommandLine>%windir%\System32\WindowsPowerShell\v1.0\powershell.exe -Command Set-NetFirewallRule -Name "WINRM-HTTP-In-TCP" -RemoteAddress Any</CommandLine> - <Description>Allows winrm over public profile interfaces</Description> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <Order>5</Order> - <CommandLine>%windir%\System32\cmd.exe /c winrm quickconfig -q</CommandLine> - <Description>winrm quickconfig -q</Description> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <Order>6</Order> - <CommandLine>%windir%\System32\cmd.exe /c winrm quickconfig -transport:http</CommandLine> - <Description>winrm quickconfig -transport:http</Description> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <Order>7</Order> - <CommandLine>%windir%\System32\cmd.exe /c winrm set winrm/config @{MaxTimeoutms="1800000"}</CommandLine> - <Description>Win RM MaxTimoutms</Description> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <Order>8</Order> - <CommandLine>%windir%\System32\cmd.exe /c winrm set winrm/config/winrs @{MaxMemoryPerShellMB="2048"}</CommandLine> - <Description>Win RM MaxMemoryPerShellMB</Description> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <Order>9</Order> - <CommandLine>%windir%\System32\cmd.exe /c winrm set winrm/config/service @{AllowUnencrypted="true"}</CommandLine> - <Description>Win RM AllowUnencrypted</Description> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <Order>10</Order> - <CommandLine>%windir%\System32\cmd.exe /c winrm set winrm/config/service/auth @{Basic="true"}</CommandLine> - <Description>Win RM auth Basic</Description> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <Order>11</Order> - <CommandLine>%windir%\System32\cmd.exe /c winrm set winrm/config/client/auth @{Basic="true"}</CommandLine> - <Description>Win RM client auth Basic</Description> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <Order>12</Order> - <CommandLine>%windir%\System32\cmd.exe /c winrm set winrm/config/listener?Address=*+Transport=HTTP @{Port="5985"}</CommandLine> - <Description>Win RM listener Address/Port</Description> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <Order>13</Order> - <CommandLine>%windir%\System32\cmd.exe /c netsh firewall add portopening TCP 5985 "Port 5985"</CommandLine> - <Description>Win RM port open</Description> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <Order>14</Order> - <CommandLine>%windir%\System32\cmd.exe /c net stop winrm</CommandLine> - <Description>Stop Win RM Service</Description> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <Order>15</Order> - <CommandLine>%windir%\System32\cmd.exe /c sc config winrm start= auto</CommandLine> - <Description>Win RM Autostart</Description> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <Order>16</Order> - <CommandLine>%windir%\System32\cmd.exe /c net start winrm</CommandLine> - <Description>Start Win RM Service</Description> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <Order>17</Order> - <CommandLine>%windir%\System32\cmd.exe /c wmic useraccount where "name='vagrant'" set PasswordExpires=FALSE</CommandLine> - <Description>Disable password expiration for vagrant user</Description> - </SynchronousCommand> - </FirstLogonCommands> - </component> - <component name="Microsoft-Windows-WinRE-RecoveryAgent" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> - <UninstallWindowsRE>true</UninstallWindowsRE> - </component> - </settings> - <settings pass="specialize"> - <component name="Microsoft-Windows-ServerManager-SvrMgrNc" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> - <DoNotOpenServerManagerAtLogon>true</DoNotOpenServerManagerAtLogon> - </component> - <component name="Microsoft-Windows-IE-ESC" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> - <!-- Disable IE ESC. --> - <IEHardenAdmin>false</IEHardenAdmin> - <IEHardenUser>false</IEHardenUser> - </component> - <component name="Microsoft-Windows-OutOfBoxExperience" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> - <DoNotOpenInitialConfigurationTasksAtLogon>true</DoNotOpenInitialConfigurationTasksAtLogon> - </component> - <component name="Microsoft-Windows-SystemRestore-Main" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> - <DisableSR>1</DisableSR> - </component> - <component name="Microsoft-Windows-SystemSettingsThreshold" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> - <DisplayNetworkSelection>false</DisplayNetworkSelection> - </component> - <component name="Networking-MPSSVC-Svc" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> - <FirewallGroups> - <FirewallGroup wcm:action="add" wcm:keyValue="WindowsRemoteManagement"> - <Active>true</Active> - <Group>Windows Remote Management</Group> - <Profile>all</Profile> - </FirewallGroup> - <FirewallGroup wcm:action="add" wcm:keyValue="RemoteAdministration"> - <Active>true</Active> - <Group>Remote Administration</Group> - <Profile>all</Profile> - </FirewallGroup> - </FirewallGroups> - </component> - <component name="Microsoft-Windows-SQMApi" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> - <CEIPEnabled>0</CEIPEnabled> - </component> - <component name="Microsoft-Windows-Security-SPP-UX" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> - <SkipAutoActivation>true</SkipAutoActivation> - </component> - </settings> - <settings pass="offlineServicing"> - <component name="Microsoft-Windows-LUA-Settings" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> - <EnableLUA>false</EnableLUA> - </component> - </settings> -</unattend> diff --git a/packer_templates/win_answer_files/2022/hyperv-gen2/Autounattend 2.xml b/packer_templates/win_answer_files/2022/hyperv-gen2/Autounattend 2.xml deleted file mode 100644 index ecfca3ebe..000000000 --- a/packer_templates/win_answer_files/2022/hyperv-gen2/Autounattend 2.xml +++ /dev/null @@ -1,332 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<unattend xmlns="urn:schemas-microsoft-com:unattend" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - <settings pass="windowsPE"> - <component name="Microsoft-Windows-PnpCustomizationsWinPE" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" processorArchitecture="amd64"> - <!-- - This makes the VirtIO drivers available to Windows, assuming that - the VirtIO driver disk at https://fedorapeople.org/groups/virt/virtio-win/direct-downloads/stable-virtio/virtio-win.iso - (see https://docs.fedoraproject.org/en-US/quick-docs/creating-windows-virtual-machines-using-virtio-drivers/index.html#virtio-win-direct-downloads) - is available as drive E: - --> - <DriverPaths> - <PathAndCredentials wcm:action="add" wcm:keyValue="2"> - <Path>F:\viostor\2k22\amd64</Path> - </PathAndCredentials> - <PathAndCredentials wcm:action="add" wcm:keyValue="3"> - <Path>F:\NetKVM\2k22\amd64</Path> - </PathAndCredentials> - <PathAndCredentials wcm:action="add" wcm:keyValue="4"> - <Path>F:\Balloon\2k22\amd64</Path> - </PathAndCredentials> - <PathAndCredentials wcm:action="add" wcm:keyValue="5"> - <Path>F:\pvpanic\2k22\amd64</Path> - </PathAndCredentials> - <PathAndCredentials wcm:action="add" wcm:keyValue="6"> - <Path>F:\qemupciserial\2k22\amd64</Path> - </PathAndCredentials> - <PathAndCredentials wcm:action="add" wcm:keyValue="7"> - <Path>F:\qxldod\2k22\amd64</Path> - </PathAndCredentials> - <PathAndCredentials wcm:action="add" wcm:keyValue="8"> - <Path>F:\vioinput\2k22\amd64</Path> - </PathAndCredentials> - <PathAndCredentials wcm:action="add" wcm:keyValue="9"> - <Path>F:\viorng\2k22\amd64</Path> - </PathAndCredentials> - <PathAndCredentials wcm:action="add" wcm:keyValue="10"> - <Path>F:\vioscsi\2k22\amd64</Path> - </PathAndCredentials> - <PathAndCredentials wcm:action="add" wcm:keyValue="11"> - <Path>F:\vioserial\2k22\amd64</Path> - </PathAndCredentials> - </DriverPaths> - </component> - <component name="Microsoft-Windows-International-Core-WinPE" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> - <SetupUILanguage> - <UILanguage>en-US</UILanguage> - </SetupUILanguage> - <InputLocale>en-US</InputLocale> - <SystemLocale>en-US</SystemLocale> - <UILanguage>en-US</UILanguage> - <UILanguageFallback>en-US</UILanguageFallback> - <UserLocale>en-US</UserLocale> - </component> - <component name="Microsoft-Windows-Setup" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> - <DiskConfiguration> - <Disk wcm:action="add"> - <CreatePartitions> - <CreatePartition wcm:action="add"> - <Order>1</Order> - <Size>350</Size> - <Type>Primary</Type> - </CreatePartition> - <CreatePartition wcm:action="add"> - <Order>2</Order> - <Size>100</Size> - <Type>EFI</Type> - </CreatePartition> - <CreatePartition wcm:action="add"> - <Order>3</Order> - <Size>128</Size> - <Type>MSR</Type> - </CreatePartition> - <CreatePartition wcm:action="add"> - <Order>4</Order> - <Extend>true</Extend> - <Type>Primary</Type> - </CreatePartition> - </CreatePartitions> - <ModifyPartitions> - <ModifyPartition wcm:action="add"> - <Order>1</Order> - <PartitionID>1</PartitionID> - <Label>WINRE</Label> - <Format>NTFS</Format> - <TypeID>de94bba4-06d1-4d40-a16a-bfd50179d6ac</TypeID> - </ModifyPartition> - <ModifyPartition wcm:action="add"> - <Order>2</Order> - <PartitionID>2</PartitionID> - <Label>System</Label> - <Format>FAT32</Format> - </ModifyPartition> - <ModifyPartition wcm:action="add"> - <Order>3</Order> - <PartitionID>3</PartitionID> - </ModifyPartition> - <ModifyPartition wcm:action="add"> - <Order>4</Order> - <PartitionID>4</PartitionID> - <Label>Windows</Label> - <Format>NTFS</Format> - </ModifyPartition> - </ModifyPartitions> - <DiskID>0</DiskID> - <WillWipeDisk>true</WillWipeDisk> - </Disk> - <WillShowUI>OnError</WillShowUI> - </DiskConfiguration> - <ImageInstall> - <OSImage> - <InstallFrom> - <MetaData wcm:action="add"> - <Key>/IMAGE/NAME</Key> - <Value>Windows Server 2022 SERVERSTANDARD</Value> - </MetaData> - </InstallFrom> - <InstallTo> - <DiskID>0</DiskID> - <PartitionID>4</PartitionID> - </InstallTo> - </OSImage> - </ImageInstall> - <UserData> - <ProductKey> - <WillShowUI>OnError</WillShowUI> - </ProductKey> - <AcceptEula>true</AcceptEula> - <FullName>Vagrant</FullName> - <Organization>Bento by Chef Software, Inc.</Organization> - </UserData> - <DynamicUpdate> - <Enable>false</Enable> - </DynamicUpdate> - </component> - </settings> - <settings pass="generalize"> - <component name="Microsoft-Windows-Security-SPP" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> - <SkipRearm>1</SkipRearm> - </component> - <component name="Microsoft-Windows-PnpSysprep" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> - <PersistAllDeviceInstalls>false</PersistAllDeviceInstalls> - <DoNotCleanUpNonPresentDevices>false</DoNotCleanUpNonPresentDevices> - </component> - </settings> - <settings pass="oobeSystem"> - <component name="Microsoft-Windows-International-Core" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> - <InputLocale>en-US</InputLocale> - <SystemLocale>en-US</SystemLocale> - <UILanguage>en-US</UILanguage> - <UserLocale>en-US</UserLocale> - </component> - <component name="Microsoft-Windows-Shell-Setup" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> - <OOBE> - <HideEULAPage>true</HideEULAPage> - <HideLocalAccountScreen>true</HideLocalAccountScreen> - <HideOEMRegistrationScreen>true</HideOEMRegistrationScreen> - <HideOnlineAccountScreens>true</HideOnlineAccountScreens> - <HideWirelessSetupInOOBE>true</HideWirelessSetupInOOBE> - <NetworkLocation>Work</NetworkLocation> - <ProtectYourPC>3</ProtectYourPC> - <SkipMachineOOBE>true</SkipMachineOOBE> - <SkipUserOOBE>true</SkipUserOOBE> - <VMModeOptimizations> - <SkipAdministratorProfileRemoval>true</SkipAdministratorProfileRemoval> - <SkipNotifyUILanguageChange>true</SkipNotifyUILanguageChange> - <SkipWinREInitialization>true</SkipWinREInitialization> - </VMModeOptimizations> - </OOBE> - <TimeZone>UTC</TimeZone> - <UserAccounts> - <AdministratorPassword> - <Value>vagrant</Value> - <PlainText>true</PlainText> - </AdministratorPassword> - <LocalAccounts> - <LocalAccount wcm:action="add"> - <Password> - <Value>vagrant</Value> - <PlainText>true</PlainText> - </Password> - <Description>Vagrant User</Description> - <DisplayName>vagrant</DisplayName> - <Group>administrators</Group> - <Name>vagrant</Name> - </LocalAccount> - </LocalAccounts> - </UserAccounts> - <AutoLogon> - <Password> - <Value>vagrant</Value> - <PlainText>true</PlainText> - </Password> - <Username>vagrant</Username> - <Enabled>true</Enabled> - </AutoLogon> - <FirstLogonCommands> - <SynchronousCommand wcm:action="add"> - <CommandLine>%windir%\System32\WindowsPowerShell\v1.0\powershell.exe -Command "Set-ExecutionPolicy -ExecutionPolicy RemoteSigned -Force"</CommandLine> - <Description>Set Execution Policy 64 Bit</Description> - <Order>1</Order> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <CommandLine>%windir%\SysWOW64\cmd.exe /c powershell -Command "Set-ExecutionPolicy -ExecutionPolicy RemoteSigned -Force"</CommandLine> - <Description>Set Execution Policy 32 Bit</Description> - <Order>2</Order> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <Order>3</Order> - <CommandLine>%windir%\System32\WindowsPowerShell\v1.0\powershell.exe -Command Get-NetConnectionProfile | Set-NetConnectionProfile -NetworkCategory "Private"</CommandLine> - <Description>Sets detected network connections to private to allow start of winrm</Description> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <Order>4</Order> - <CommandLine>%windir%\System32\WindowsPowerShell\v1.0\powershell.exe -Command Set-NetFirewallRule -Name "WINRM-HTTP-In-TCP" -RemoteAddress Any</CommandLine> - <Description>Allows winrm over public profile interfaces</Description> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <Order>5</Order> - <CommandLine>%windir%\System32\cmd.exe /c winrm quickconfig -q</CommandLine> - <Description>winrm quickconfig -q</Description> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <Order>6</Order> - <CommandLine>%windir%\System32\cmd.exe /c winrm quickconfig -transport:http</CommandLine> - <Description>winrm quickconfig -transport:http</Description> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <Order>7</Order> - <CommandLine>%windir%\System32\cmd.exe /c winrm set winrm/config @{MaxTimeoutms="1800000"}</CommandLine> - <Description>Win RM MaxTimoutms</Description> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <Order>8</Order> - <CommandLine>%windir%\System32\cmd.exe /c winrm set winrm/config/winrs @{MaxMemoryPerShellMB="2048"}</CommandLine> - <Description>Win RM MaxMemoryPerShellMB</Description> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <Order>9</Order> - <CommandLine>%windir%\System32\cmd.exe /c winrm set winrm/config/service @{AllowUnencrypted="true"}</CommandLine> - <Description>Win RM AllowUnencrypted</Description> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <Order>10</Order> - <CommandLine>%windir%\System32\cmd.exe /c winrm set winrm/config/service/auth @{Basic="true"}</CommandLine> - <Description>Win RM auth Basic</Description> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <Order>11</Order> - <CommandLine>%windir%\System32\cmd.exe /c winrm set winrm/config/client/auth @{Basic="true"}</CommandLine> - <Description>Win RM client auth Basic</Description> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <Order>12</Order> - <CommandLine>%windir%\System32\cmd.exe /c winrm set winrm/config/listener?Address=*+Transport=HTTP @{Port="5985"}</CommandLine> - <Description>Win RM listener Address/Port</Description> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <Order>13</Order> - <CommandLine>%windir%\System32\cmd.exe /c netsh firewall add portopening TCP 5985 "Port 5985"</CommandLine> - <Description>Win RM port open</Description> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <Order>14</Order> - <CommandLine>%windir%\System32\cmd.exe /c net stop winrm</CommandLine> - <Description>Stop Win RM Service</Description> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <Order>15</Order> - <CommandLine>%windir%\System32\cmd.exe /c sc config winrm start= auto</CommandLine> - <Description>Win RM Autostart</Description> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <Order>16</Order> - <CommandLine>%windir%\System32\cmd.exe /c net start winrm</CommandLine> - <Description>Start Win RM Service</Description> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <Order>17</Order> - <CommandLine>%windir%\System32\cmd.exe /c wmic useraccount where "name='vagrant'" set PasswordExpires=FALSE</CommandLine> - <Description>Disable password expiration for vagrant user</Description> - </SynchronousCommand> - </FirstLogonCommands> - </component> - <component name="Microsoft-Windows-WinRE-RecoveryAgent" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> - <UninstallWindowsRE>true</UninstallWindowsRE> - </component> - </settings> - <settings pass="specialize"> - <component name="Microsoft-Windows-ServerManager-SvrMgrNc" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> - <DoNotOpenServerManagerAtLogon>true</DoNotOpenServerManagerAtLogon> - </component> - <component name="Microsoft-Windows-IE-ESC" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> - <!-- Disable IE ESC. --> - <IEHardenAdmin>false</IEHardenAdmin> - <IEHardenUser>false</IEHardenUser> - </component> - <component name="Microsoft-Windows-OutOfBoxExperience" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> - <DoNotOpenInitialConfigurationTasksAtLogon>true</DoNotOpenInitialConfigurationTasksAtLogon> - </component> - <component name="Microsoft-Windows-SystemRestore-Main" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> - <DisableSR>1</DisableSR> - </component> - <component name="Microsoft-Windows-SystemSettingsThreshold" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> - <DisplayNetworkSelection>false</DisplayNetworkSelection> - </component> - <component name="Networking-MPSSVC-Svc" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> - <FirewallGroups> - <FirewallGroup wcm:action="add" wcm:keyValue="WindowsRemoteManagement"> - <Active>true</Active> - <Group>Windows Remote Management</Group> - <Profile>all</Profile> - </FirewallGroup> - <FirewallGroup wcm:action="add" wcm:keyValue="RemoteAdministration"> - <Active>true</Active> - <Group>Remote Administration</Group> - <Profile>all</Profile> - </FirewallGroup> - </FirewallGroups> - </component> - <component name="Microsoft-Windows-SQMApi" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> - <CEIPEnabled>0</CEIPEnabled> - </component> - <component name="Microsoft-Windows-Security-SPP-UX" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> - <SkipAutoActivation>true</SkipAutoActivation> - </component> - </settings> - <settings pass="offlineServicing"> - <component name="Microsoft-Windows-LUA-Settings" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> - <EnableLUA>false</EnableLUA> - </component> - </settings> -</unattend> From d54f811220cbc9bf5432ceab12d1b1c514981e6a Mon Sep 17 00:00:00 2001 From: Thorsten Bruhns <Rendanic@users.noreply.github.com> Date: Sun, 12 Nov 2023 17:39:15 +0100 Subject: [PATCH 1534/1622] rhel: Check for networking-scripts before removal (#1532) --- packer_templates/scripts/rhel/cleanup_dnf.sh | 14 ++++++++------ packer_templates/scripts/rhel/cleanup_yum.sh | 13 +++++++------ 2 files changed, 15 insertions(+), 12 deletions(-) diff --git a/packer_templates/scripts/rhel/cleanup_dnf.sh b/packer_templates/scripts/rhel/cleanup_dnf.sh index 2fa9737d8..7f8ddd206 100644 --- a/packer_templates/scripts/rhel/cleanup_dnf.sh +++ b/packer_templates/scripts/rhel/cleanup_dnf.sh @@ -31,12 +31,14 @@ mkdir -p /etc/udev/rules.d/70-persistent-net.rules; rm -f /lib/udev/rules.d/75-persistent-net-generator.rules; rm -rf /dev/.udev/; -for ndev in /etc/sysconfig/network-scripts/ifcfg-*; do - if [ "$(basename "$ndev")" != "ifcfg-lo" ]; then - sed -i '/^HWADDR/d' "$ndev"; - sed -i '/^UUID/d' "$ndev"; - fi -done +if test -f /etc/sysconfig/network-scripts/ifcfg-*; then + for ndev in /etc/sysconfig/network-scripts/ifcfg-*; do + if [ "$(basename "$ndev")" != "ifcfg-lo" ]; then + sed -i '/^HWADDR/d' "$ndev"; + sed -i '/^UUID/d' "$ndev"; + fi + done +fi echo "truncate any logs that have built up during the install" find /var/log -type f -exec truncate --size=0 {} \; diff --git a/packer_templates/scripts/rhel/cleanup_yum.sh b/packer_templates/scripts/rhel/cleanup_yum.sh index 6dd7cf34e..077319234 100644 --- a/packer_templates/scripts/rhel/cleanup_yum.sh +++ b/packer_templates/scripts/rhel/cleanup_yum.sh @@ -31,13 +31,14 @@ mkdir -p /etc/udev/rules.d/70-persistent-net.rules; rm -f /lib/udev/rules.d/75-persistent-net-generator.rules; rm -rf /dev/.udev/; -for ndev in /etc/sysconfig/network-scripts/ifcfg-*; do - if [ "$(basename "$ndev")" != "ifcfg-lo" ]; then - sed -i '/^HWADDR/d' "$ndev"; - sed -i '/^UUID/d' "$ndev"; - fi -done +if test -f /etc/sysconfig/network-scripts/ifcfg-*; then + for ndev in /etc/sysconfig/network-scripts/ifcfg-*; do + if [ "$(basename "$ndev")" != "ifcfg-lo" ]; then + sed -i '/^UUID/d' "$ndev"; + fi + done +fi echo "truncate any logs that have built up during the install" find /var/log -type f -exec truncate --size=0 {} \; From b9b4cb2613a3b8cc56de2045596ba3f7664634cb Mon Sep 17 00:00:00 2001 From: jstaph <jstaph@users.noreply.github.com> Date: Sun, 12 Nov 2023 11:41:55 -0500 Subject: [PATCH 1535/1622] feat: remove fedora 37 and add fedora 39 (#1535) Signed-off-by: Jason A. Staph <jstaph@staph.us> --- .github/workflows/pkr-bld-hyperv-x64.yml | 2 +- .github/workflows/pkr-bld-parallels-arm64.yml | 2 +- .github/workflows/pkr-bld-parallels-x64.yml | 2 +- .github/workflows/pkr-bld-qemu-arm64.yml | 2 +- .github/workflows/pkr-bld-qemu-x64.yml | 2 +- .github/workflows/pkr-bld-virtualbox-arm64.yml | 2 +- .github/workflows/pkr-bld-virtualbox-x64.yml | 2 +- .github/workflows/pkr-bld-vmware-arm64.yml | 2 +- .github/workflows/pkr-bld-vmware-x64.yml | 2 +- README.md | 2 +- builds.yml | 4 ++-- ...aarch64.pkrvars.hcl => fedora-39-aarch64.pkrvars.hcl} | 9 +++++---- ...7-x86_64.pkrvars.hcl => fedora-39-x86_64.pkrvars.hcl} | 6 +++--- 13 files changed, 20 insertions(+), 19 deletions(-) rename os_pkrvars/fedora/{fedora-37-aarch64.pkrvars.hcl => fedora-39-aarch64.pkrvars.hcl} (51%) rename os_pkrvars/fedora/{fedora-37-x86_64.pkrvars.hcl => fedora-39-x86_64.pkrvars.hcl} (54%) diff --git a/.github/workflows/pkr-bld-hyperv-x64.yml b/.github/workflows/pkr-bld-hyperv-x64.yml index 1365135c4..bfb2cb1d5 100644 --- a/.github/workflows/pkr-bld-hyperv-x64.yml +++ b/.github/workflows/pkr-bld-hyperv-x64.yml @@ -19,8 +19,8 @@ jobs: - centos-stream-9 - debian-11 - debian-12 - - fedora-37 - fedora-38 + - fedora-39 - freebsd-12 - freebsd-13 - opensuse-leap-15 diff --git a/.github/workflows/pkr-bld-parallels-arm64.yml b/.github/workflows/pkr-bld-parallels-arm64.yml index 56abac053..475684809 100644 --- a/.github/workflows/pkr-bld-parallels-arm64.yml +++ b/.github/workflows/pkr-bld-parallels-arm64.yml @@ -19,8 +19,8 @@ jobs: - centos-stream-9 - debian-11 - debian-12 - - fedora-37 - fedora-38 + - fedora-39 - freebsd-12 - freebsd-13 - opensuse-leap-15 diff --git a/.github/workflows/pkr-bld-parallels-x64.yml b/.github/workflows/pkr-bld-parallels-x64.yml index 2b2ae6d87..ad314d708 100644 --- a/.github/workflows/pkr-bld-parallels-x64.yml +++ b/.github/workflows/pkr-bld-parallels-x64.yml @@ -19,8 +19,8 @@ jobs: - centos-stream-9 - debian-11 - debian-12 - - fedora-37 - fedora-38 + - fedora-39 - freebsd-12 - freebsd-13 - opensuse-leap-15 diff --git a/.github/workflows/pkr-bld-qemu-arm64.yml b/.github/workflows/pkr-bld-qemu-arm64.yml index d67067856..84f662037 100644 --- a/.github/workflows/pkr-bld-qemu-arm64.yml +++ b/.github/workflows/pkr-bld-qemu-arm64.yml @@ -19,8 +19,8 @@ jobs: - centos-stream-9 - debian-11 - debian-12 - - fedora-37 - fedora-38 + - fedora-39 - freebsd-12 - freebsd-13 - opensuse-leap-15 diff --git a/.github/workflows/pkr-bld-qemu-x64.yml b/.github/workflows/pkr-bld-qemu-x64.yml index b530ccbe3..81939a74b 100644 --- a/.github/workflows/pkr-bld-qemu-x64.yml +++ b/.github/workflows/pkr-bld-qemu-x64.yml @@ -19,8 +19,8 @@ jobs: - centos-stream-9 - debian-11 - debian-12 - - fedora-37 - fedora-38 + - fedora-39 - freebsd-12 - freebsd-13 - opensuse-leap-15 diff --git a/.github/workflows/pkr-bld-virtualbox-arm64.yml b/.github/workflows/pkr-bld-virtualbox-arm64.yml index c3a09e81f..4388429b6 100644 --- a/.github/workflows/pkr-bld-virtualbox-arm64.yml +++ b/.github/workflows/pkr-bld-virtualbox-arm64.yml @@ -19,8 +19,8 @@ jobs: - centos-stream-9 - debian-11 - debian-12 - - fedora-37 - fedora-38 + - fedora-39 - freebsd-12 - freebsd-13 - opensuse-leap-15 diff --git a/.github/workflows/pkr-bld-virtualbox-x64.yml b/.github/workflows/pkr-bld-virtualbox-x64.yml index b8bc64e4c..173c381b8 100644 --- a/.github/workflows/pkr-bld-virtualbox-x64.yml +++ b/.github/workflows/pkr-bld-virtualbox-x64.yml @@ -19,8 +19,8 @@ jobs: - centos-stream-9 - debian-11 - debian-12 - - fedora-37 - fedora-38 + - fedora-39 - freebsd-12 - freebsd-13 - opensuse-leap-15 diff --git a/.github/workflows/pkr-bld-vmware-arm64.yml b/.github/workflows/pkr-bld-vmware-arm64.yml index 52512cd77..f5cedfc32 100644 --- a/.github/workflows/pkr-bld-vmware-arm64.yml +++ b/.github/workflows/pkr-bld-vmware-arm64.yml @@ -19,8 +19,8 @@ jobs: - centos-stream-9 - debian-11 - debian-12 - - fedora-37 - fedora-38 + - fedora-39 - freebsd-12 - freebsd-13 - opensuse-leap-15 diff --git a/.github/workflows/pkr-bld-vmware-x64.yml b/.github/workflows/pkr-bld-vmware-x64.yml index a44502ab2..1b37b9abc 100644 --- a/.github/workflows/pkr-bld-vmware-x64.yml +++ b/.github/workflows/pkr-bld-vmware-x64.yml @@ -19,8 +19,8 @@ jobs: - centos-stream-9 - debian-11 - debian-12 - - fedora-37 - fedora-38 + - fedora-39 - freebsd-12 - freebsd-13 - opensuse-leap-15 diff --git a/README.md b/README.md index 303a5924f..da579c5c5 100644 --- a/README.md +++ b/README.md @@ -126,7 +126,7 @@ To use an alternate url ````bash cd <path/to>/bento packer init -upgrade ./packer_templates -packer build -var 'iso_url=http://mirror.utexas.edu/fedora/linux' -var-file=os_pkrvars/fedora/fedor-37-x86_64.pkrvars.hcl ./packer_templates +packer build -var 'iso_url=https://mirrors.rit.edu/fedora/fedora/linux/releases/39/Server/x86_64/iso/Fedora-Server-dvd-x86_64-39-1.5.iso' -var-file=os_pkrvars/fedora/fedora-39-x86_64.pkrvars.hcl ./packer_templates ```` If the build is successful, your box files will be in the `builds` directory at the root of the repository. diff --git a/builds.yml b/builds.yml index 0604a03f8..34ba53df2 100644 --- a/builds.yml +++ b/builds.yml @@ -11,8 +11,8 @@ public: - 'centos-stream-9' - 'debian-11' - 'debian-12' - - 'fedora-37' - 'fedora-38' + - 'fedora-39' - 'freebsd-12' - 'freebsd-13' - 'opensuse-leap-15' @@ -37,8 +37,8 @@ public: - 'centos-stream-9-arm64' - 'debian-11-arm64' - 'debian-12-arm64' - - 'fedora-37-arm64' - 'fedora-38-arm64' + - 'fedora-39-arm64' - 'freebsd-12-arm64' - 'freebsd-13-arm64' - 'opensuse-leap-15-arm64' diff --git a/os_pkrvars/fedora/fedora-37-aarch64.pkrvars.hcl b/os_pkrvars/fedora/fedora-39-aarch64.pkrvars.hcl similarity index 51% rename from os_pkrvars/fedora/fedora-37-aarch64.pkrvars.hcl rename to os_pkrvars/fedora/fedora-39-aarch64.pkrvars.hcl index 1be7ae464..3ad5175de 100644 --- a/os_pkrvars/fedora/fedora-37-aarch64.pkrvars.hcl +++ b/os_pkrvars/fedora/fedora-39-aarch64.pkrvars.hcl @@ -1,9 +1,10 @@ + os_name = "fedora" -os_version = "37" +os_version = "39" os_arch = "aarch64" -iso_url = "https://download.fedoraproject.org/pub/fedora/linux/releases/37/Server/aarch64/iso/Fedora-Server-dvd-aarch64-37-1.7.iso" -iso_checksum = "sha256:1c2deba876bd2da3a429b1b0cd5e294508b8379b299913d97dd6dd6ebcd8b56f" +iso_url = "https://mirrors.rit.edu/fedora/fedora/linux/releases/39/Server/aarch64/iso/Fedora-Server-dvd-aarch64-39-1.5.iso" +iso_checksum = "sha256:d19dc2a39758155fa53e6fd555d0d173ccc8175b55dea48002d499f39cb30ce0" parallels_guest_os_type = "fedora-core" vbox_guest_os_type = "Fedora_64" vmware_guest_os_type = "arm-fedora-64" -boot_command = ["<wait><up><up>e<wait><down><down><end> inst.text inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/fedora/ks.cfg<F10><wait>"] +boot_command = ["<wait><up><up>e<wait><down><down><end> inst.text inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/fedora/ks.cfg<F10><wait>"] \ No newline at end of file diff --git a/os_pkrvars/fedora/fedora-37-x86_64.pkrvars.hcl b/os_pkrvars/fedora/fedora-39-x86_64.pkrvars.hcl similarity index 54% rename from os_pkrvars/fedora/fedora-37-x86_64.pkrvars.hcl rename to os_pkrvars/fedora/fedora-39-x86_64.pkrvars.hcl index a304f86c4..44e8cc9bd 100644 --- a/os_pkrvars/fedora/fedora-37-x86_64.pkrvars.hcl +++ b/os_pkrvars/fedora/fedora-39-x86_64.pkrvars.hcl @@ -1,8 +1,8 @@ os_name = "fedora" -os_version = "37" +os_version = "39" os_arch = "x86_64" -iso_url = "https://download.fedoraproject.org/pub/fedora/linux/releases/37/Server/x86_64/iso/Fedora-Server-dvd-x86_64-37-1.7.iso" -iso_checksum = "sha256:0a4de5157af47b41a07a53726cd62ffabd04d5c1a4afece5ee7c7a84c1213e4f" +iso_url = "https://mirrors.rit.edu/fedora/fedora/linux/releases/39/Server/x86_64/iso/Fedora-Server-dvd-x86_64-39-1.5.iso" +iso_checksum = "sha256:2755cdff6ac6365c75be60334bf1935ade838fc18de53d4c640a13d3e904f6e9" parallels_guest_os_type = "fedora-core" vbox_guest_os_type = "Fedora_64" vmware_guest_os_type = "fedora-64" From eadc216b10810cd5bd7efcc8f7aedf19a609b95a Mon Sep 17 00:00:00 2001 From: Li-Wen Hsu <lwhsu@lwhsu.org> Date: Mon, 27 Nov 2023 23:33:56 +0800 Subject: [PATCH 1536/1622] Add FreeBSD 14.0-RELEASE (#1538) Signed-off-by: Li-Wen Hsu <lwhsu@lwhsu.org> --- .github/workflows/pkr-bld-hyperv-x64.yml | 1 + .github/workflows/pkr-bld-parallels-arm64.yml | 1 + .github/workflows/pkr-bld-parallels-x64.yml | 1 + .github/workflows/pkr-bld-qemu-arm64.yml | 1 + .github/workflows/pkr-bld-qemu-x64.yml | 1 + .github/workflows/pkr-bld-virtualbox-arm64.yml | 1 + .github/workflows/pkr-bld-virtualbox-x64.yml | 1 + .github/workflows/pkr-bld-vmware-arm64.yml | 1 + .github/workflows/pkr-bld-vmware-x64.yml | 1 + builds.yml | 3 +++ os_pkrvars/freebsd/freebsd-14-aarch64.pkrvars.hcl | 9 +++++++++ os_pkrvars/freebsd/freebsd-14-x86_64.pkrvars.hcl | 9 +++++++++ 12 files changed, 30 insertions(+) create mode 100644 os_pkrvars/freebsd/freebsd-14-aarch64.pkrvars.hcl create mode 100644 os_pkrvars/freebsd/freebsd-14-x86_64.pkrvars.hcl diff --git a/.github/workflows/pkr-bld-hyperv-x64.yml b/.github/workflows/pkr-bld-hyperv-x64.yml index bfb2cb1d5..62dabdbb2 100644 --- a/.github/workflows/pkr-bld-hyperv-x64.yml +++ b/.github/workflows/pkr-bld-hyperv-x64.yml @@ -23,6 +23,7 @@ jobs: - fedora-39 - freebsd-12 - freebsd-13 + - freebsd-14 - opensuse-leap-15 - oracle-7 - oracle-8 diff --git a/.github/workflows/pkr-bld-parallels-arm64.yml b/.github/workflows/pkr-bld-parallels-arm64.yml index 475684809..353648dac 100644 --- a/.github/workflows/pkr-bld-parallels-arm64.yml +++ b/.github/workflows/pkr-bld-parallels-arm64.yml @@ -23,6 +23,7 @@ jobs: - fedora-39 - freebsd-12 - freebsd-13 + - freebsd-14 - opensuse-leap-15 - oracle-7 - oracle-8 diff --git a/.github/workflows/pkr-bld-parallels-x64.yml b/.github/workflows/pkr-bld-parallels-x64.yml index ad314d708..02c6c09e2 100644 --- a/.github/workflows/pkr-bld-parallels-x64.yml +++ b/.github/workflows/pkr-bld-parallels-x64.yml @@ -23,6 +23,7 @@ jobs: - fedora-39 - freebsd-12 - freebsd-13 + - freebsd-14 - opensuse-leap-15 - oracle-7 - oracle-8 diff --git a/.github/workflows/pkr-bld-qemu-arm64.yml b/.github/workflows/pkr-bld-qemu-arm64.yml index 84f662037..a49121387 100644 --- a/.github/workflows/pkr-bld-qemu-arm64.yml +++ b/.github/workflows/pkr-bld-qemu-arm64.yml @@ -23,6 +23,7 @@ jobs: - fedora-39 - freebsd-12 - freebsd-13 + - freebsd-14 - opensuse-leap-15 - oracle-7 - oracle-8 diff --git a/.github/workflows/pkr-bld-qemu-x64.yml b/.github/workflows/pkr-bld-qemu-x64.yml index 81939a74b..3a86d84fb 100644 --- a/.github/workflows/pkr-bld-qemu-x64.yml +++ b/.github/workflows/pkr-bld-qemu-x64.yml @@ -23,6 +23,7 @@ jobs: - fedora-39 - freebsd-12 - freebsd-13 + - freebsd-14 - opensuse-leap-15 - oracle-7 - oracle-8 diff --git a/.github/workflows/pkr-bld-virtualbox-arm64.yml b/.github/workflows/pkr-bld-virtualbox-arm64.yml index 4388429b6..83e89b93c 100644 --- a/.github/workflows/pkr-bld-virtualbox-arm64.yml +++ b/.github/workflows/pkr-bld-virtualbox-arm64.yml @@ -23,6 +23,7 @@ jobs: - fedora-39 - freebsd-12 - freebsd-13 + - freebsd-14 - opensuse-leap-15 - oracle-7 - oracle-8 diff --git a/.github/workflows/pkr-bld-virtualbox-x64.yml b/.github/workflows/pkr-bld-virtualbox-x64.yml index 173c381b8..3b8619d86 100644 --- a/.github/workflows/pkr-bld-virtualbox-x64.yml +++ b/.github/workflows/pkr-bld-virtualbox-x64.yml @@ -23,6 +23,7 @@ jobs: - fedora-39 - freebsd-12 - freebsd-13 + - freebsd-14 - opensuse-leap-15 - oracle-7 - oracle-8 diff --git a/.github/workflows/pkr-bld-vmware-arm64.yml b/.github/workflows/pkr-bld-vmware-arm64.yml index f5cedfc32..527c3cd8d 100644 --- a/.github/workflows/pkr-bld-vmware-arm64.yml +++ b/.github/workflows/pkr-bld-vmware-arm64.yml @@ -23,6 +23,7 @@ jobs: - fedora-39 - freebsd-12 - freebsd-13 + - freebsd-14 - opensuse-leap-15 - oracle-7 - oracle-8 diff --git a/.github/workflows/pkr-bld-vmware-x64.yml b/.github/workflows/pkr-bld-vmware-x64.yml index 1b37b9abc..94f43c695 100644 --- a/.github/workflows/pkr-bld-vmware-x64.yml +++ b/.github/workflows/pkr-bld-vmware-x64.yml @@ -23,6 +23,7 @@ jobs: - fedora-39 - freebsd-12 - freebsd-13 + - freebsd-14 - opensuse-leap-15 - oracle-7 - oracle-8 diff --git a/builds.yml b/builds.yml index 34ba53df2..4aa1bf5df 100644 --- a/builds.yml +++ b/builds.yml @@ -15,6 +15,7 @@ public: - 'fedora-39' - 'freebsd-12' - 'freebsd-13' + - 'freebsd-14' - 'opensuse-leap-15' - 'oracle-7' - 'oracle-8' @@ -41,6 +42,7 @@ public: - 'fedora-39-arm64' - 'freebsd-12-arm64' - 'freebsd-13-arm64' + - 'freebsd-14-arm64' - 'opensuse-leap-15-arm64' - 'oracle-7-arm64' - 'oracle-8-arm64' @@ -65,6 +67,7 @@ slugs: 'fedora-latest': 'fedora-38' 'freebsd-12': 'freebsd-12' 'freebsd-13': 'freebsd-13' + 'freebsd-14': 'freebsd-14' 'opensuse-leap-15': 'opensuse-leap-15' 'oracle-7': 'oracle-7' 'oracle-8': 'oracle-8' diff --git a/os_pkrvars/freebsd/freebsd-14-aarch64.pkrvars.hcl b/os_pkrvars/freebsd/freebsd-14-aarch64.pkrvars.hcl new file mode 100644 index 000000000..69344d36c --- /dev/null +++ b/os_pkrvars/freebsd/freebsd-14-aarch64.pkrvars.hcl @@ -0,0 +1,9 @@ +os_name = "freebsd" +os_version = "14.0" +os_arch = "aarch64" +iso_url = "https://download.freebsd.org/releases/arm64/aarch64/ISO-IMAGES/14.0/FreeBSD-14.0-RELEASE-arm64-aarch64-disc1.iso" +iso_checksum = "file:https://download.freebsd.org/releases/arm64/aarch64/ISO-IMAGES/14.0/CHECKSUM.SHA256-FreeBSD-14.0-RELEASE-arm64-aarch64" +parallels_guest_os_type = "freebsd" +vbox_guest_os_type = "FreeBSD_64" +vmware_guest_os_type = "arm-freebsd-64" +boot_command = ["<wait><esc><wait>boot -s<wait><enter><wait><wait10><wait10>/bin/sh<enter><wait>mdmfs -s 100m md1 /tmp<enter><wait>mdmfs -s 100m md2 /mnt<enter><wait>dhclient -p /tmp/dhclient.em0.pid -l /tmp/dhclient.lease.em0 em0<enter><wait><wait5>fetch -o /tmp/installerconfig http://{{ .HTTPIP }}:{{ .HTTPPort }}/freebsd/installerconfig && bsdinstall script /tmp/installerconfig<enter><wait>"] diff --git a/os_pkrvars/freebsd/freebsd-14-x86_64.pkrvars.hcl b/os_pkrvars/freebsd/freebsd-14-x86_64.pkrvars.hcl new file mode 100644 index 000000000..3e2c2138e --- /dev/null +++ b/os_pkrvars/freebsd/freebsd-14-x86_64.pkrvars.hcl @@ -0,0 +1,9 @@ +os_name = "freebsd" +os_version = "14.0" +os_arch = "x86_64" +iso_url = "https://download.freebsd.org/releases/amd64/amd64/ISO-IMAGES/14.0/FreeBSD-14.0-RELEASE-amd64-disc1.iso" +iso_checksum = "file:https://download.freebsd.org/releases/amd64/amd64/ISO-IMAGES/14.0/CHECKSUM.SHA256-FreeBSD-14.0-RELEASE-amd64" +parallels_guest_os_type = "freebsd" +vbox_guest_os_type = "FreeBSD_64" +vmware_guest_os_type = "freebsd-64" +boot_command = ["<wait><esc><wait>boot -s<wait><enter><wait><wait10><wait10>/bin/sh<enter><wait>mdmfs -s 100m md1 /tmp<enter><wait>mdmfs -s 100m md2 /mnt<enter><wait>dhclient -p /tmp/dhclient.em0.pid -l /tmp/dhclient.lease.em0 em0<enter><wait><wait5>fetch -o /tmp/installerconfig http://{{ .HTTPIP }}:{{ .HTTPPort }}/freebsd/installerconfig && bsdinstall script /tmp/installerconfig<enter><wait>"] From 014e04f23e0d5678adbc82ae25e5312f3b9f2b55 Mon Sep 17 00:00:00 2001 From: Li-Wen Hsu <lwhsu@lwhsu.org> Date: Tue, 28 Nov 2023 00:49:27 +0800 Subject: [PATCH 1537/1622] Fix os_arch of freebsd-13-aarch64 config (#1539) Signed-off-by: Li-Wen Hsu <lwhsu@lwhsu.org> --- os_pkrvars/freebsd/freebsd-13-aarch64.pkrvars.hcl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/os_pkrvars/freebsd/freebsd-13-aarch64.pkrvars.hcl b/os_pkrvars/freebsd/freebsd-13-aarch64.pkrvars.hcl index 6c8ec883a..b467c948e 100644 --- a/os_pkrvars/freebsd/freebsd-13-aarch64.pkrvars.hcl +++ b/os_pkrvars/freebsd/freebsd-13-aarch64.pkrvars.hcl @@ -1,6 +1,6 @@ os_name = "freebsd" os_version = "13.2" -os_arch = "x86_64" +os_arch = "aarch64" iso_url = "https://download.freebsd.org/releases/arm64/aarch64/ISO-IMAGES/13.2/FreeBSD-13.2-RELEASE-arm64-aarch64-disc1.iso" iso_checksum = "file:https://download.freebsd.org/releases/arm64/aarch64/ISO-IMAGES/13.2/CHECKSUM.SHA256-FreeBSD-13.2-RELEASE-arm64-aarch64" parallels_guest_os_type = "freebsd" From 04c78b2d25ab497e57c28ece640285bba8f5bff0 Mon Sep 17 00:00:00 2001 From: Shawn Kelly O'Shea <shawn@eth0.net> Date: Thu, 7 Dec 2023 14:05:50 -0500 Subject: [PATCH 1538/1622] Bump almalinux minor versions (#1540) --- os_pkrvars/almalinux/almalinux-8-aarch64.pkrvars.hcl | 4 ++-- os_pkrvars/almalinux/almalinux-8-x86_64.pkrvars.hcl | 4 ++-- os_pkrvars/almalinux/almalinux-9-aarch64.pkrvars.hcl | 4 ++-- os_pkrvars/almalinux/almalinux-9-x86_64.pkrvars.hcl | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/os_pkrvars/almalinux/almalinux-8-aarch64.pkrvars.hcl b/os_pkrvars/almalinux/almalinux-8-aarch64.pkrvars.hcl index 1e576d376..56b364127 100644 --- a/os_pkrvars/almalinux/almalinux-8-aarch64.pkrvars.hcl +++ b/os_pkrvars/almalinux/almalinux-8-aarch64.pkrvars.hcl @@ -1,7 +1,7 @@ os_name = "almalinux" -os_version = "8.8" +os_version = "8.9" os_arch = "aarch64" -iso_url = "https://repo.almalinux.org/almalinux/8/isos/aarch64/AlmaLinux-8.8-aarch64-minimal.iso" +iso_url = "https://repo.almalinux.org/almalinux/8/isos/aarch64/AlmaLinux-8.9-aarch64-minimal.iso" iso_checksum = "file:https://repo.almalinux.org/almalinux/8/isos/aarch64/CHECKSUM" parallels_guest_os_type = "centos" vbox_guest_os_type = "RedHat_64" diff --git a/os_pkrvars/almalinux/almalinux-8-x86_64.pkrvars.hcl b/os_pkrvars/almalinux/almalinux-8-x86_64.pkrvars.hcl index 3ca1bb569..494183e16 100644 --- a/os_pkrvars/almalinux/almalinux-8-x86_64.pkrvars.hcl +++ b/os_pkrvars/almalinux/almalinux-8-x86_64.pkrvars.hcl @@ -1,7 +1,7 @@ os_name = "almalinux" -os_version = "8.8" +os_version = "8.9" os_arch = "x86_64" -iso_url = "https://repo.almalinux.org/almalinux/8/isos/x86_64/AlmaLinux-8.8-x86_64-minimal.iso" +iso_url = "https://repo.almalinux.org/almalinux/8/isos/x86_64/AlmaLinux-8.9-x86_64-minimal.iso" iso_checksum = "file:https://repo.almalinux.org/almalinux/8/isos/x86_64/CHECKSUM" parallels_guest_os_type = "centos" vbox_guest_os_type = "RedHat_64" diff --git a/os_pkrvars/almalinux/almalinux-9-aarch64.pkrvars.hcl b/os_pkrvars/almalinux/almalinux-9-aarch64.pkrvars.hcl index 1052b8951..9a0c45b7b 100644 --- a/os_pkrvars/almalinux/almalinux-9-aarch64.pkrvars.hcl +++ b/os_pkrvars/almalinux/almalinux-9-aarch64.pkrvars.hcl @@ -1,7 +1,7 @@ os_name = "almalinux" -os_version = "9.2" +os_version = "9.3" os_arch = "aarch64" -iso_url = "https://repo.almalinux.org/almalinux/9/isos/aarch64/AlmaLinux-9.2-aarch64-dvd.iso" +iso_url = "https://repo.almalinux.org/almalinux/9/isos/aarch64/AlmaLinux-9.3-aarch64-dvd.iso" iso_checksum = "file:https://repo.almalinux.org/almalinux/9/isos/aarch64/CHECKSUM" parallels_guest_os_type = "centos" vbox_guest_os_type = "RedHat_64" diff --git a/os_pkrvars/almalinux/almalinux-9-x86_64.pkrvars.hcl b/os_pkrvars/almalinux/almalinux-9-x86_64.pkrvars.hcl index 722d23ee1..7a6a8456b 100644 --- a/os_pkrvars/almalinux/almalinux-9-x86_64.pkrvars.hcl +++ b/os_pkrvars/almalinux/almalinux-9-x86_64.pkrvars.hcl @@ -1,7 +1,7 @@ os_name = "almalinux" -os_version = "9.2" +os_version = "9.3" os_arch = "x86_64" -iso_url = "https://repo.almalinux.org/almalinux/9/isos/x86_64/AlmaLinux-9.2-x86_64-dvd.iso" +iso_url = "https://repo.almalinux.org/almalinux/9/isos/x86_64/AlmaLinux-9.3-x86_64-dvd.iso" iso_checksum = "file:https://repo.almalinux.org/almalinux/9/isos/x86_64/CHECKSUM" parallels_guest_os_type = "centos" vbox_guest_os_type = "RedHat_64" From be8b5e342a582e9d30eeb5bbf3b86b52dd1264f0 Mon Sep 17 00:00:00 2001 From: Phillip Ross <phillipross@users.noreply.github.com> Date: Sat, 23 Dec 2023 21:31:15 -0500 Subject: [PATCH 1539/1622] - update to rockylinux 9.3 (#1542) --- os_pkrvars/rockylinux/rockylinux-9-aarch64.pkrvars.hcl | 4 ++-- os_pkrvars/rockylinux/rockylinux-9-x86_64.pkrvars.hcl | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/os_pkrvars/rockylinux/rockylinux-9-aarch64.pkrvars.hcl b/os_pkrvars/rockylinux/rockylinux-9-aarch64.pkrvars.hcl index 016152923..f3d975df4 100644 --- a/os_pkrvars/rockylinux/rockylinux-9-aarch64.pkrvars.hcl +++ b/os_pkrvars/rockylinux/rockylinux-9-aarch64.pkrvars.hcl @@ -1,7 +1,7 @@ os_name = "rockylinux" -os_version = "9.2" +os_version = "9.3" os_arch = "aarch64" -iso_url = "https://download.rockylinux.org/pub/rocky/9/isos/aarch64/Rocky-9.2-aarch64-minimal.iso" +iso_url = "https://download.rockylinux.org/pub/rocky/9/isos/aarch64/Rocky-9.3-aarch64-minimal.iso" iso_checksum = "file:https://download.rockylinux.org/pub/rocky/9/isos/aarch64/CHECKSUM" parallels_guest_os_type = "centos" vbox_guest_os_type = "RedHat_64" diff --git a/os_pkrvars/rockylinux/rockylinux-9-x86_64.pkrvars.hcl b/os_pkrvars/rockylinux/rockylinux-9-x86_64.pkrvars.hcl index c2080690f..19438d23a 100644 --- a/os_pkrvars/rockylinux/rockylinux-9-x86_64.pkrvars.hcl +++ b/os_pkrvars/rockylinux/rockylinux-9-x86_64.pkrvars.hcl @@ -1,7 +1,7 @@ os_name = "rockylinux" -os_version = "9.2" +os_version = "9.3" os_arch = "x86_64" -iso_url = "https://download.rockylinux.org/pub/rocky/9/isos/x86_64/Rocky-9.2-x86_64-dvd.iso" +iso_url = "https://download.rockylinux.org/pub/rocky/9/isos/x86_64/Rocky-9.3-x86_64-dvd.iso" iso_checksum = "file:https://download.rockylinux.org/pub/rocky/9/isos/x86_64/CHECKSUM" parallels_guest_os_type = "centos" vbox_guest_os_type = "RedHat_64" From 99d5e1d90754cebbf25c2f784409f1fa448f7244 Mon Sep 17 00:00:00 2001 From: Seth Grover <13872653+mmguero@users.noreply.github.com> Date: Thu, 18 Jan 2024 17:11:29 -0700 Subject: [PATCH 1540/1622] Bump Debian to v12.4, released December 10th, 2023 (#1541) --- os_pkrvars/debian/debian-12-aarch64.pkrvars.hcl | 6 +++--- os_pkrvars/debian/debian-12-x86_64.pkrvars.hcl | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/os_pkrvars/debian/debian-12-aarch64.pkrvars.hcl b/os_pkrvars/debian/debian-12-aarch64.pkrvars.hcl index a09a8ca52..aa3acc355 100644 --- a/os_pkrvars/debian/debian-12-aarch64.pkrvars.hcl +++ b/os_pkrvars/debian/debian-12-aarch64.pkrvars.hcl @@ -1,8 +1,8 @@ os_name = "debian" -os_version = "12.1" +os_version = "12.4" os_arch = "aarch64" -iso_url = "https://cdimage.debian.org/cdimage/release/12.1.0/arm64/iso-dvd/debian-12.1.0-arm64-DVD-1.iso" -iso_checksum = "file:https://cdimage.debian.org/cdimage/release/12.1.0/arm64/iso-dvd/SHA256SUMS" +iso_url = "https://cdimage.debian.org/cdimage/release/12.4.0/arm64/iso-dvd/debian-12.4.0-arm64-DVD-1.iso" +iso_checksum = "file:https://cdimage.debian.org/cdimage/release/12.4.0/arm64/iso-dvd/SHA256SUMS" parallels_guest_os_type = "debian" vbox_guest_os_type = "Debian_64" vmware_guest_os_type = "arm-debian-64" diff --git a/os_pkrvars/debian/debian-12-x86_64.pkrvars.hcl b/os_pkrvars/debian/debian-12-x86_64.pkrvars.hcl index 27a47e5d1..817f0a3c3 100644 --- a/os_pkrvars/debian/debian-12-x86_64.pkrvars.hcl +++ b/os_pkrvars/debian/debian-12-x86_64.pkrvars.hcl @@ -1,8 +1,8 @@ os_name = "debian" -os_version = "12.1" +os_version = "12.4" os_arch = "x86_64" -iso_url = "https://cdimage.debian.org/cdimage/release/12.1.0/amd64/iso-dvd/debian-12.1.0-amd64-DVD-1.iso" -iso_checksum = "file:https://cdimage.debian.org/cdimage/release/12.1.0/amd64/iso-dvd/SHA256SUMS" +iso_url = "https://cdimage.debian.org/cdimage/release/12.4.0/amd64/iso-dvd/debian-12.4.0-amd64-DVD-1.iso" +iso_checksum = "file:https://cdimage.debian.org/cdimage/release/12.4.0/amd64/iso-dvd/SHA256SUMS" parallels_guest_os_type = "debian" vbox_guest_os_type = "Debian_64" vmware_guest_os_type = "debian-64" From ba10f22c8c82b8baf868f8e79bf985af3de4d253 Mon Sep 17 00:00:00 2001 From: Corey Hemminger <hemminger@hotmail.com> Date: Wed, 31 Jan 2024 16:07:00 -0600 Subject: [PATCH 1541/1622] Update latest OS versions and fix arm64 build list command (#1543) * Update latest OS versions and fix arm64 build list command --------- --- .github/workflows/pkr-bld-hyperv-x64.yml | 7 +- .github/workflows/pkr-bld-parallels-arm64.yml | 3 +- .github/workflows/pkr-bld-parallels-x64.yml | 7 +- .github/workflows/pkr-bld-qemu-arm64.yml | 3 +- .github/workflows/pkr-bld-qemu-x64.yml | 7 +- .../workflows/pkr-bld-virtualbox-arm64.yml | 3 +- .github/workflows/pkr-bld-virtualbox-x64.yml | 7 +- .github/workflows/pkr-bld-vmware-arm64.yml | 3 +- .github/workflows/pkr-bld-vmware-x64.yml | 7 +- CHANGELOG.md | 90 ++++++++++--------- README.md | 9 +- builds.yml | 25 +----- lib/bento/cli.rb | 9 +- lib/bento/common.rb | 1 + lib/bento/upload.rb | 19 ++-- lib/bento/version.rb | 2 +- .../centos/centos-7-aarch64.pkrvars.hcl | 2 +- os_pkrvars/centos/centos-7-x86_64.pkrvars.hcl | 2 +- .../debian/debian-11-aarch64.pkrvars.hcl | 4 +- .../debian/debian-11-x86_64.pkrvars.hcl | 4 +- .../freebsd/freebsd-12-aarch64.pkrvars.hcl | 9 -- .../freebsd/freebsd-12-x86_64.pkrvars.hcl | 9 -- .../oracle/oracle-8-aarch64.pkrvars.hcl | 6 +- os_pkrvars/oracle/oracle-8-x86_64.pkrvars.hcl | 6 +- .../oracle/oracle-9-aarch64.pkrvars.hcl | 6 +- os_pkrvars/oracle/oracle-9-x86_64.pkrvars.hcl | 6 +- os_pkrvars/rhel/rhel-8-aarch64.pkrvars.hcl | 2 +- os_pkrvars/rhel/rhel-8-x86_64.pkrvars.hcl | 2 +- os_pkrvars/rhel/rhel-9-aarch64.pkrvars.hcl | 2 +- os_pkrvars/rhel/rhel-9-x86_64.pkrvars.hcl | 2 +- .../rockylinux-8-aarch64.pkrvars.hcl | 4 +- .../rockylinux-8-x86_64.pkrvars.hcl | 4 +- .../scientificlinux-7-x86_64.pkrvars.hcl | 9 -- os_pkrvars/sles/sles-15-x86_64.pkrvars.hcl | 6 +- .../springdalelinux-7-x86_64.pkrvars.hcl | 9 -- .../springdalelinux-8-x86_64.pkrvars.hcl | 9 -- .../springdalelinux-9-x86_64.pkrvars.hcl | 9 -- .../ubuntu/ubuntu-20.04-aarch64.pkrvars.hcl | 2 +- ...s.hcl => ubuntu-23.10-aarch64.pkrvars.hcl} | 6 +- ...rs.hcl => ubuntu-23.10-x86_64.pkrvars.hcl} | 6 +- 40 files changed, 125 insertions(+), 203 deletions(-) delete mode 100644 os_pkrvars/freebsd/freebsd-12-aarch64.pkrvars.hcl delete mode 100644 os_pkrvars/freebsd/freebsd-12-x86_64.pkrvars.hcl delete mode 100644 os_pkrvars/scientificlinux/scientificlinux-7-x86_64.pkrvars.hcl delete mode 100644 os_pkrvars/springdalelinux/springdalelinux-7-x86_64.pkrvars.hcl delete mode 100644 os_pkrvars/springdalelinux/springdalelinux-8-x86_64.pkrvars.hcl delete mode 100644 os_pkrvars/springdalelinux/springdalelinux-9-x86_64.pkrvars.hcl rename os_pkrvars/ubuntu/{ubuntu-23.04-aarch64.pkrvars.hcl => ubuntu-23.10-aarch64.pkrvars.hcl} (69%) rename os_pkrvars/ubuntu/{ubuntu-23.04-x86_64.pkrvars.hcl => ubuntu-23.10-x86_64.pkrvars.hcl} (61%) diff --git a/.github/workflows/pkr-bld-hyperv-x64.yml b/.github/workflows/pkr-bld-hyperv-x64.yml index 62dabdbb2..fae3953c8 100644 --- a/.github/workflows/pkr-bld-hyperv-x64.yml +++ b/.github/workflows/pkr-bld-hyperv-x64.yml @@ -21,7 +21,6 @@ jobs: - debian-12 - fedora-38 - fedora-39 - - freebsd-12 - freebsd-13 - freebsd-14 - opensuse-leap-15 @@ -30,13 +29,9 @@ jobs: - oracle-9 - rockylinux-8 - rockylinux-9 - - scientificlinux-7 - - springdalelinux-7 - - springdalelinux-8 - - springdalelinux-9 - ubuntu-20.04 - ubuntu-22.04 - - ubuntu-23.04 + - ubuntu-23.10 provider: - hyperv-iso steps: diff --git a/.github/workflows/pkr-bld-parallels-arm64.yml b/.github/workflows/pkr-bld-parallels-arm64.yml index 353648dac..08ec7d8ab 100644 --- a/.github/workflows/pkr-bld-parallels-arm64.yml +++ b/.github/workflows/pkr-bld-parallels-arm64.yml @@ -21,7 +21,6 @@ jobs: - debian-12 - fedora-38 - fedora-39 - - freebsd-12 - freebsd-13 - freebsd-14 - opensuse-leap-15 @@ -32,7 +31,7 @@ jobs: - rockylinux-9 - ubuntu-20.04 - ubuntu-22.04 - - ubuntu-23.04 + - ubuntu-23.10 provider: - parallels-iso steps: diff --git a/.github/workflows/pkr-bld-parallels-x64.yml b/.github/workflows/pkr-bld-parallels-x64.yml index 02c6c09e2..1b9d1d3e2 100644 --- a/.github/workflows/pkr-bld-parallels-x64.yml +++ b/.github/workflows/pkr-bld-parallels-x64.yml @@ -21,7 +21,6 @@ jobs: - debian-12 - fedora-38 - fedora-39 - - freebsd-12 - freebsd-13 - freebsd-14 - opensuse-leap-15 @@ -30,13 +29,9 @@ jobs: - oracle-9 - rockylinux-8 - rockylinux-9 - - scientificlinux-7 - - springdalelinux-7 - - springdalelinux-8 - - springdalelinux-9 - ubuntu-20.04 - ubuntu-22.04 - - ubuntu-23.04 + - ubuntu-23.10 provider: - parallels-iso steps: diff --git a/.github/workflows/pkr-bld-qemu-arm64.yml b/.github/workflows/pkr-bld-qemu-arm64.yml index a49121387..69e50b286 100644 --- a/.github/workflows/pkr-bld-qemu-arm64.yml +++ b/.github/workflows/pkr-bld-qemu-arm64.yml @@ -21,7 +21,6 @@ jobs: - debian-12 - fedora-38 - fedora-39 - - freebsd-12 - freebsd-13 - freebsd-14 - opensuse-leap-15 @@ -32,7 +31,7 @@ jobs: - rockylinux-9 - ubuntu-20.04 - ubuntu-22.04 - - ubuntu-23.04 + - ubuntu-23.10 provider: - qemu steps: diff --git a/.github/workflows/pkr-bld-qemu-x64.yml b/.github/workflows/pkr-bld-qemu-x64.yml index 3a86d84fb..b5fbc75bd 100644 --- a/.github/workflows/pkr-bld-qemu-x64.yml +++ b/.github/workflows/pkr-bld-qemu-x64.yml @@ -21,7 +21,6 @@ jobs: - debian-12 - fedora-38 - fedora-39 - - freebsd-12 - freebsd-13 - freebsd-14 - opensuse-leap-15 @@ -30,13 +29,9 @@ jobs: - oracle-9 - rockylinux-8 - rockylinux-9 - - scientificlinux-7 - - springdalelinux-7 - - springdalelinux-8 - - springdalelinux-9 - ubuntu-20.04 - ubuntu-22.04 - - ubuntu-23.04 + - ubuntu-23.10 provider: - qemu steps: diff --git a/.github/workflows/pkr-bld-virtualbox-arm64.yml b/.github/workflows/pkr-bld-virtualbox-arm64.yml index 83e89b93c..5a5057700 100644 --- a/.github/workflows/pkr-bld-virtualbox-arm64.yml +++ b/.github/workflows/pkr-bld-virtualbox-arm64.yml @@ -21,7 +21,6 @@ jobs: - debian-12 - fedora-38 - fedora-39 - - freebsd-12 - freebsd-13 - freebsd-14 - opensuse-leap-15 @@ -32,7 +31,7 @@ jobs: - rockylinux-9 - ubuntu-20.04 - ubuntu-22.04 - - ubuntu-23.04 + - ubuntu-23.10 provider: - virtualbox-iso steps: diff --git a/.github/workflows/pkr-bld-virtualbox-x64.yml b/.github/workflows/pkr-bld-virtualbox-x64.yml index 3b8619d86..e3d29389e 100644 --- a/.github/workflows/pkr-bld-virtualbox-x64.yml +++ b/.github/workflows/pkr-bld-virtualbox-x64.yml @@ -21,7 +21,6 @@ jobs: - debian-12 - fedora-38 - fedora-39 - - freebsd-12 - freebsd-13 - freebsd-14 - opensuse-leap-15 @@ -30,13 +29,9 @@ jobs: - oracle-9 - rockylinux-8 - rockylinux-9 - - scientificlinux-7 - - springdalelinux-7 - - springdalelinux-8 - - springdalelinux-9 - ubuntu-20.04 - ubuntu-22.04 - - ubuntu-23.04 + - ubuntu-23.10 provider: - virtualbox-iso steps: diff --git a/.github/workflows/pkr-bld-vmware-arm64.yml b/.github/workflows/pkr-bld-vmware-arm64.yml index 527c3cd8d..dcfd9e484 100644 --- a/.github/workflows/pkr-bld-vmware-arm64.yml +++ b/.github/workflows/pkr-bld-vmware-arm64.yml @@ -21,7 +21,6 @@ jobs: - debian-12 - fedora-38 - fedora-39 - - freebsd-12 - freebsd-13 - freebsd-14 - opensuse-leap-15 @@ -32,7 +31,7 @@ jobs: - rockylinux-9 - ubuntu-20.04 - ubuntu-22.04 - - ubuntu-23.04 + - ubuntu-23.10 provider: - vmware-iso steps: diff --git a/.github/workflows/pkr-bld-vmware-x64.yml b/.github/workflows/pkr-bld-vmware-x64.yml index 94f43c695..0e8b489d4 100644 --- a/.github/workflows/pkr-bld-vmware-x64.yml +++ b/.github/workflows/pkr-bld-vmware-x64.yml @@ -21,7 +21,6 @@ jobs: - debian-12 - fedora-38 - fedora-39 - - freebsd-12 - freebsd-13 - freebsd-14 - opensuse-leap-15 @@ -30,13 +29,9 @@ jobs: - oracle-9 - rockylinux-8 - rockylinux-9 - - scientificlinux-7 - - springdalelinux-7 - - springdalelinux-8 - - springdalelinux-9 - ubuntu-20.04 - ubuntu-22.04 - - ubuntu-23.04 + - ubuntu-23.10 provider: - vmware-iso steps: diff --git a/CHANGELOG.md b/CHANGELOG.md index 395fa9c4d..073a25234 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,45 +5,41 @@ ***Note:** Markdown table generated at <https://www.tablesgenerator.com/markdown_tables#> -| | hyperv<br>x86_64 | parallels<br>x86_64 | parallels<br>aarch64 | qemu<br>x86_64 | qemu<br>aarch64 | virtualbox<br>x86_64 | virtualbox<br>aarch64 | vmware<br>x86_64 | vmware<br>aarch64 | -|:---:|:---:|:---:|:---:|:---:|:---:|:---:|:---:|:---:|:---:| -| almalinux-8 | | x | | x | | x | | x | | -| almalinux-9 | | x | x | | | x | | x | x | -| amazonlinux-2 | | na | na | | | | na | | na | -| amazonlinux-2023 | na | na | na | na | na | na | na | na | na | -| centos-7 | | x | | x | | x | | x | | -| centos-stream-8 | | x | | x | | x | | x | | -| centos-stream-9 | | | x | | | | | | | -| debian-11 | | x | x | | | x | | x | | -| debian-12 | | x | x | | | x | | x | x | -| fedora-37 | | x | x | x | | x | | x | x | -| fedora-38 | | x | | x | | x | | x | x | -| freebsd-12 | | | | | | x | | x | | -| freebsd-13 | | | | | | x | | x | | -| opensuse-leap-15 | | x | | x | | x | | x | | -| oraclelinux-7 | | x | | x | | x | | x | | -| oraclelinux-8 | | | | x | | x | | x | | -| oraclelinux-9 | | x | x | | | x | | x | | -| rhel-7 | license<br>needed | license<br>needed | license<br>needed | license<br>needed | license<br>needed | license<br>needed | license<br>needed | license<br>needed | license<br>needed | -| rhel-8 | license<br>needed | license<br>needed | license<br>needed | license<br>needed | license<br>needed | license<br>needed | license<br>needed | license<br>needed | license<br>needed | -| rhel-9 | license<br>needed | license<br>needed | license<br>needed | license<br>needed | license<br>needed | license<br>needed | license<br>needed | license<br>needed | license<br>needed | -| rockylinux-8 | | x | | x | | x | | x | | -| rockylinux-9 | | x | | | | x | | x | x | -| scientificlinux-7 | | x | na | x | na | x | na | x | na | -| sles-12 | license<br>needed | license<br>needed | na | license<br>needed | na | license<br>needed | na | license<br>needed | na | -| sles-13 | license<br>needed | license<br>needed | na | license<br>needed | na | license<br>needed | na | license<br>needed | na | -| solaris-11 | license<br>needed | license<br>needed | na | license<br>needed | na | license<br>needed | na | license<br>needed | na | -| springdalelinux-7 | | x | na | x | na | | na | | na | -| springdalelinux-8 | | x | na | x | na | x | na | x | na | -| springdalelinux-9 | | | na | | na | | na | | na | -| ubuntu-20.04 | | x | x | | | x | | x | x | -| ubuntu-22.04 | | x | | x | | x | | x | | -| ubuntu-23.04 | | x | | x | | x | | x | | -| windows-10 | | x | na | | na | x | na | | na | -| windows-11 | | x | na | | na | x | na | | na | -| windows-2016 | | x | na | | na | x | na | | na | -| windows-2019 | | x | na | | na | x | na | | na | -| windows-2022 | | x | na | | na | x | na | | na | +| | hyperv<br>x86_64 | parallels<br>x86_64 | parallels<br>aarch64 | qemu<br>x86_64 | qemu<br>aarch64 | virtualbox<br>x86_64 | virtualbox<br>aarch64 | vmware<br>x86_64 | vmware<br>aarch64 | +|:-----------------:|:---:|:---:|:--------------------:|:---:|:---:|:---:|:---:|:---:|:---:| +| almalinux-8 | | x | | x | | x | | x | | +| almalinux-9 | | x | x | | | x | | x | x | +| amazonlinux-2 | | na | na | | | | na | | na | +| amazonlinux-2023 | na | na | na | na | na | na | na | na | na | +| centos-7 | | x | | x | | x | | x | | +| centos-stream-8 | | x | | x | | x | | x | | +| centos-stream-9 | | | x | | | | | | | +| debian-11 | | x | x | | | x | | x | | +| debian-12 | | x | x | | | x | | x | x | +| fedora-38 | | x | | x | | x | | x | x | +| fedora-39 | | | | | | | | | | +| freebsd-12 | | | | | | x | | x | | +| freebsd-13 | | | | | | x | | x | | +| opensuse-leap-15 | | x | | x | | x | | x | | +| oraclelinux-7 | | x | | x | | x | | x | | +| oraclelinux-8 | | | | x | | x | | x | | +| oraclelinux-9 | | x | x | | | x | | x | | +| rhel-7 | license<br>needed | license<br>needed | license<br>needed | license<br>needed | license<br>needed | license<br>needed | license<br>needed | license<br>needed | license<br>needed | +| rhel-8 | license<br>needed | license<br>needed | license<br>needed | license<br>needed | license<br>needed | license<br>needed | license<br>needed | license<br>needed | license<br>needed | +| rhel-9 | license<br>needed | license<br>needed | license<br>needed | license<br>needed | license<br>needed | license<br>needed | license<br>needed | license<br>needed | license<br>needed | +| rockylinux-8 | | x | | x | | x | | x | | +| rockylinux-9 | | x | | | | x | | x | x | +| sles-12 | license<br>needed | license<br>needed | na | license<br>needed | na | license<br>needed | na | license<br>needed | na | +| sles-13 | license<br>needed | license<br>needed | na | license<br>needed | na | license<br>needed | na | license<br>needed | na | +| solaris-11 | license<br>needed | license<br>needed | na | license<br>needed | na | license<br>needed | na | license<br>needed | na | +| ubuntu-20.04 | | x | x | | | x | | x | x | +| ubuntu-22.04 | | x | | x | | x | | x | | +| ubuntu-23.10 | | | | | | | | | | +| windows-10 | | x | na | | na | x | na | | na | +| windows-11 | | x | na | | na | x | na | | na | +| windows-2016 | | x | na | | na | x | na | | na | +| windows-2019 | | x | na | | na | x | na | | na | +| windows-2022 | | x | na | | na | x | na | | na | ### Todo @@ -58,7 +54,21 @@ Markdown table generated at <https://www.tablesgenerator.com/markdown_tables#> - Create CD pipeline to build and upload new versions of vagrant boxes once every 3 months with the latest patches - Added ability to configure bento upload of private or public boxes in builds.yml, defaults to private -## [unreleased] (2023-09-15) +## [unreleased] (2024-01-31) + +- Fix build list generation on aarch64 machines +- Updated Debian 12 to 12.4 +- Updated RockyLinux 9 to 9.3 +- Updated Oracle Linux 8 to 8.9 +- Updated Oracle Linux 9 to 9.3 +- Added FreeBSD 14 +- Removed FreeBSD 12 +- Added Fedora 39 +- Removed Fedora 37 +- Remove Scientific Linux 7 +- Remove Springdale Linux builds +- Removed Ubuntu 23.04 +- Added Ubuntu 23.10 ## [v.3.2.0] (2023-09-15) diff --git a/README.md b/README.md index da579c5c5..5daaa8919 100644 --- a/README.md +++ b/README.md @@ -33,11 +33,12 @@ end - [VirtualBox](https://www.virtualbox.org/) - [VMware Fusion](https://www.vmware.com/products/fusion.html) - [VMware Workstation](https://www.vmware.com/products/workstation-pro.html) - - [Parallels Desktop](https://www.parallels.com/products/desktop/) also requires [Parallels Virtualization SDK](https://www.parallels.com/products/desktop/download/) for versons < 19.x - - [qemu](https://www.qemu.org/) * - - [Hyper-V](https://docs.microsoft.com/en-us/virtualization/hyper-v-on-windows/about/) * + - [Parallels Desktop Pro](https://www.parallels.com/products/desktop/)*2 also requires [Parallels Virtualization SDK](https://www.parallels.com/products/desktop/download/) for versions < 19.x + - [qemu](https://www.qemu.org/) *1 + - [Hyper-V](https://docs.microsoft.com/en-us/virtualization/hyper-v-on-windows/about/) *1 -***NOTE:** support for these providers is considered experimental and corresponding Vagrant Cloud images may or may not exist. +*1**NOTE:** support for these providers is considered experimental and corresponding Vagrant Cloud images may or may not exist. +*2**NOTE:** AARCH64 or ARM64 support is only guaranteed through parallels provider. ### Using `bento` executable diff --git a/builds.yml b/builds.yml index 4aa1bf5df..a429f96e8 100644 --- a/builds.yml +++ b/builds.yml @@ -13,7 +13,6 @@ public: - 'debian-12' - 'fedora-38' - 'fedora-39' - - 'freebsd-12' - 'freebsd-13' - 'freebsd-14' - 'opensuse-leap-15' @@ -22,13 +21,9 @@ public: - 'oracle-9' - 'rockylinux-8' - 'rockylinux-9' - - 'scientific-7' - - 'springdalelinux-7' - - 'springdalelinux-8' - - 'springdalelinux-9' - 'ubuntu-20.04' - 'ubuntu-22.04' - - 'ubuntu-23.04' + - 'ubuntu-23.10' - 'almalinux-8-arm64' - 'almalinux-9-arm64' - 'amazon-2-arm64' @@ -40,7 +35,6 @@ public: - 'debian-12-arm64' - 'fedora-38-arm64' - 'fedora-39-arm64' - - 'freebsd-12-arm64' - 'freebsd-13-arm64' - 'freebsd-14-arm64' - 'opensuse-leap-15-arm64' @@ -49,13 +43,9 @@ public: - 'oracle-9-arm64' - 'rockylinux-8-arm64' - 'rockylinux-9-arm64' - - 'scientific-7-arm64' - - 'springdalelinux-7-arm64' - - 'springdalelinux-8-arm64' - - 'springdalelinux-9-arm64' - 'ubuntu-20.04-arm64' - 'ubuntu-22.04-arm64' - - 'ubuntu-23.04-arm64' + - 'ubuntu-23.10-arm64' # slug box name: text string from standard box name to match (generally the same) slugs: @@ -64,8 +54,7 @@ slugs: 'centos-7': 'centos-7' 'debian-12': 'debian-12' 'debian-11': 'debian-11' - 'fedora-latest': 'fedora-38' - 'freebsd-12': 'freebsd-12' + 'fedora-latest': 'fedora-39' 'freebsd-13': 'freebsd-13' 'freebsd-14': 'freebsd-14' 'opensuse-leap-15': 'opensuse-leap-15' @@ -74,16 +63,12 @@ slugs: 'oracle-9': 'oracle-9' 'rockylinux-8': 'rockylinux-8' 'rockylinux-9': 'rockylinux-9' - 'scientific-7': 'scientific-7' - 'springdalelinux-7': 'springdalelinux-7' - 'springdalelinux-8': 'springdalelinux-8' - 'springdalelinux-9': 'springdalelinux-9' 'almalinux-8-arm64': 'almalinux-8' 'almalinux-9-arm64': 'almalinux-9' 'centos-7-arm64': 'centos-7' 'debian-12-arm64': 'debian-12' 'debian-11-arm64': 'debian-11' - 'fedora-latest-arm64': 'fedora-38' + 'fedora-latest-arm64': 'fedora-39' 'oracle-7-arm64': 'oracle-7' 'oracle-8-arm64': 'oracle-8' 'oracle-9-arm64': 'oracle-9' @@ -105,6 +90,4 @@ do_not_build: # - opensuse-leap # - oracle # - rockylinux -# - scientificlinux -# - springdalelinux # - ubuntu diff --git a/lib/bento/cli.rb b/lib/bento/cli.rb index bd3301287..5b44ae3ce 100644 --- a/lib/bento/cli.rb +++ b/lib/bento/cli.rb @@ -11,9 +11,14 @@ class Options NAME = File.basename($PROGRAM_NAME).freeze def self.parse(args) + arch = if RbConfig::CONFIG['host_cpu'] == 'arm64' + 'aarch64' + else + RbConfig::CONFIG['host_cpu'] + end not_buildable = YAML.load(File.read('builds.yml'))['do_not_build'] options = OpenStruct.new - options.template_files = calculate_templates("os_pkrvars/**/*-#{RbConfig::CONFIG['host_cpu']}.pkrvars.hcl") + options.template_files = calculate_templates("os_pkrvars/**/*-#{arch}.pkrvars.hcl") not_buildable.each do |os| options.template_files.delete_if { |template| template.include?(os) } end @@ -83,7 +88,7 @@ def self.parse(args) options.debug = opt end - opts.on('-o BUILDS', '--only BUILDS', 'Only build some Packer builds (ex: parallels-iso,virtualbox-iso,vmware-iso)') do |opt| + opts.on('-o BUILDS', '--only BUILDS', 'Only build some Packer builds (ex: parallels-iso.vm,virtualbox-iso.vm,vmware-iso.vm)') do |opt| options.only = opt end diff --git a/lib/bento/common.rb b/lib/bento/common.rb index a6c6ddf8c..24aa0b81f 100644 --- a/lib/bento/common.rb +++ b/lib/bento/common.rb @@ -64,6 +64,7 @@ def box_metadata(metadata_file) # metadata needed for upload: boxname, version, provider, box filename metadata['name'] = json['name'] metadata['version'] = json['version'] + metadata['arch'] = json['arch'] metadata['box_basename'] = json['box_basename'] metadata['packer'] = json['packer'] metadata['vagrant'] = json['vagrant'] diff --git a/lib/bento/upload.rb b/lib/bento/upload.rb index b78c228db..c5cca05ba 100644 --- a/lib/bento/upload.rb +++ b/lib/bento/upload.rb @@ -34,20 +34,26 @@ def start # def upload_box(md_file) md_data = box_metadata(md_file) - + arch = case md_data['arch'] + when 'x86_64', 'amd64' + 'amd64' + when 'aarch64', 'arm64' + 'arm64' + else + raise "Unknown arch #{md_data.inspect}" + end md_data['providers'].each_pair do |prov, prov_data| if File.exist?(File.join('builds', prov_data['file'])) puts '' banner("Uploading #{builds_yml['vagrant_cloud_account']}/#{md_data['box_basename']} version:#{md_data['version']} provider:#{prov}...") - - upload_cmd = "vagrant cloud publish --no-direct-upload #{builds_yml['vagrant_cloud_account']}/#{md_data['box_basename']} #{md_data['version']} #{prov} builds/#{prov_data['file']} --description '#{box_desc(md_data['name'])}' --short-description '#{box_desc(md_data['name'])}' --version-description '#{ver_desc(md_data)}' --force --release #{public_private_box(md_data['box_basename'])}" + upload_cmd = "vagrant cloud publish --architecture #{arch} --no-direct-upload #{builds_yml['vagrant_cloud_account']}/#{md_data['box_basename']} #{md_data['version']} #{prov} builds/#{prov_data['file']} --description '#{box_desc(md_data['box_basename'])}' --short-description '#{box_desc(md_data['box_basename'])}' --version-description '#{ver_desc(md_data)}' --force --release #{public_private_box(md_data['box_basename'])}" shellout(upload_cmd) slug_name = lookup_slug(md_data['name']) if slug_name puts '' banner("Uploading slug #{builds_yml['vagrant_cloud_account']}/#{slug_name} from #{md_data['box_basename']} version:#{md_data['version']} provider:#{prov}...") - upload_cmd = "vagrant cloud publish --no-direct-upload #{builds_yml['vagrant_cloud_account']}/#{slug_name} #{md_data['version']} #{prov} builds/#{prov_data['file']} --description '#{slug_desc(slug_name)}' --short-description '#{slug_desc(slug_name)}' --version-description '#{ver_desc(md_data)}' --force --release #{public_private_box(md_data['box_basename'])}" + upload_cmd = "vagrant cloud publish --architecture #{arch} --no-direct-upload #{builds_yml['vagrant_cloud_account']}/#{slug_name} #{md_data['version']} #{prov} builds/#{prov_data['file']} --description '#{slug_desc(slug_name)}' --short-description '#{slug_desc(slug_name)}' --version-description '#{ver_desc(md_data)}' --force --release #{public_private_box(md_data['box_basename'])}" shellout(upload_cmd) end @@ -86,9 +92,8 @@ def public_private_box(name) else return '--no-private' if name.start_with?(public) && !public.include?('arm64') end - - return '--private' end + return '--private' end def box_desc(name) @@ -115,6 +120,6 @@ def ver_desc(md_data) tool_versions.sort! tool_versions << "packer: #{md_data['packer']}" - "#{md_data['name'].tr('-', ' ').capitalize} Vagrant box version #{md_data['version']} created with Bento by Chef. Built with: #{tool_versions.join(', ')}" + "#{md_data['box_basename'].capitalize.tr('-', ' ')} Vagrant box version #{md_data['version']} created with Bento by Chef. Built with: #{tool_versions.join(', ')}" end end diff --git a/lib/bento/version.rb b/lib/bento/version.rb index 643cd2b80..b701c30fe 100644 --- a/lib/bento/version.rb +++ b/lib/bento/version.rb @@ -1,3 +1,3 @@ module Bento - VERSION = '3.2.0'.freeze + VERSION = '3.2.1'.freeze end diff --git a/os_pkrvars/centos/centos-7-aarch64.pkrvars.hcl b/os_pkrvars/centos/centos-7-aarch64.pkrvars.hcl index 2c4fbc7eb..c9cb1a8bc 100644 --- a/os_pkrvars/centos/centos-7-aarch64.pkrvars.hcl +++ b/os_pkrvars/centos/centos-7-aarch64.pkrvars.hcl @@ -2,7 +2,7 @@ os_name = "centos" os_version = "7.9" os_arch = "aarch64" iso_url = "https://quantum-mirror.hu/mirrors/pub/centos-altarch/7.9.2009/isos/aarch64/CentOS-7-aarch64-Minimal-2009.iso" -iso_checksum = "1bef71329e51f9bed12349aa026b3fe0c4bb27db729399a3f9addae22848da9b" +iso_checksum = "file:https://quantum-mirror.hu/mirrors/pub/centos-altarch/7.9.2009/isos/aarch64/sha256sum.txt" parallels_guest_os_type = "centos" vbox_guest_os_type = "RedHat_64" vmware_guest_os_type = "arm-centos-64" diff --git a/os_pkrvars/centos/centos-7-x86_64.pkrvars.hcl b/os_pkrvars/centos/centos-7-x86_64.pkrvars.hcl index 867d24baf..b78910cf8 100644 --- a/os_pkrvars/centos/centos-7-x86_64.pkrvars.hcl +++ b/os_pkrvars/centos/centos-7-x86_64.pkrvars.hcl @@ -2,7 +2,7 @@ os_name = "centos" os_version = "7.9" os_arch = "x86_64" iso_url = "http://mirrors.kernel.org/centos/7.9.2009/isos/x86_64/CentOS-7-x86_64-Minimal-2009.iso" -iso_checksum = "07b94e6b1a0b0260b94c83d6bb76b26bf7a310dc78d7a9c7432809fb9bc6194a" +iso_checksum = "file:https://mirrors.edge.kernel.org/centos/7.9.2009/isos/x86_64/sha256sum.txt" parallels_guest_os_type = "centos" vbox_guest_os_type = "RedHat_64" vmware_guest_os_type = "centos-64" diff --git a/os_pkrvars/debian/debian-11-aarch64.pkrvars.hcl b/os_pkrvars/debian/debian-11-aarch64.pkrvars.hcl index cf5dfbab2..ee5e7dedd 100644 --- a/os_pkrvars/debian/debian-11-aarch64.pkrvars.hcl +++ b/os_pkrvars/debian/debian-11-aarch64.pkrvars.hcl @@ -1,7 +1,7 @@ os_name = "debian" -os_version = "11.7" +os_version = "11.8" os_arch = "aarch64" -iso_url = "https://cdimage.debian.org/cdimage/archive/latest-oldstable/arm64/iso-dvd/debian-11.7.0-arm64-DVD-1.iso" +iso_url = "https://cdimage.debian.org/cdimage/archive/latest-oldstable/arm64/iso-dvd/debian-11.8.0-arm64-DVD-1.iso" iso_checksum = "file:https://cdimage.debian.org/cdimage/archive/latest-oldstable/arm64/iso-dvd/SHA256SUMS" parallels_guest_os_type = "debian" vbox_guest_os_type = "Debian_64" diff --git a/os_pkrvars/debian/debian-11-x86_64.pkrvars.hcl b/os_pkrvars/debian/debian-11-x86_64.pkrvars.hcl index 989e2875e..9107b7f2e 100644 --- a/os_pkrvars/debian/debian-11-x86_64.pkrvars.hcl +++ b/os_pkrvars/debian/debian-11-x86_64.pkrvars.hcl @@ -1,7 +1,7 @@ os_name = "debian" -os_version = "11.7" +os_version = "11.8" os_arch = "x86_64" -iso_url = "https://cdimage.debian.org/cdimage/archive/latest-oldstable/amd64/iso-dvd/debian-11.7.0-amd64-DVD-1.iso" +iso_url = "https://cdimage.debian.org/cdimage/archive/latest-oldstable/amd64/iso-dvd/debian-11.8.0-amd64-DVD-1.iso" iso_checksum = "file:https://cdimage.debian.org/cdimage/archive/latest-oldstable/amd64/iso-dvd/SHA256SUMS" parallels_guest_os_type = "debian" vbox_guest_os_type = "Debian_64" diff --git a/os_pkrvars/freebsd/freebsd-12-aarch64.pkrvars.hcl b/os_pkrvars/freebsd/freebsd-12-aarch64.pkrvars.hcl deleted file mode 100644 index b79ee2f48..000000000 --- a/os_pkrvars/freebsd/freebsd-12-aarch64.pkrvars.hcl +++ /dev/null @@ -1,9 +0,0 @@ -os_name = "freebsd" -os_version = "12.4" -os_arch = "aarch64" -iso_url = "https://download.freebsd.org/releases/arm64/aarch64/ISO-IMAGES/12.4/FreeBSD-12.4-RELEASE-arm64-aarch64-disc1.iso" -iso_checksum = "file:https://download.freebsd.org/releases/arm64/aarch64/ISO-IMAGES/12.4/CHECKSUM.SHA256-FreeBSD-12.4-RELEASE-arm64-aarch64" -parallels_guest_os_type = "freebsd" -vbox_guest_os_type = "FreeBSD_64" -vmware_guest_os_type = "arm-freebsd-64" -boot_command = ["<wait><esc><wait>boot -s<wait><enter><wait><wait10><wait10>/bin/sh<enter><wait>mdmfs -s 100m md1 /tmp<enter><wait>mdmfs -s 100m md2 /mnt<enter><wait>dhclient -p /tmp/dhclient.em0.pid -l /tmp/dhclient.lease.em0 em0<enter><wait>fetch -o /tmp/installerconfig http://{{ .HTTPIP }}:{{ .HTTPPort }}/freebsd/installerconfig \u0026\u0026 bsdinstall script /tmp/installerconfig<enter><wait>"] diff --git a/os_pkrvars/freebsd/freebsd-12-x86_64.pkrvars.hcl b/os_pkrvars/freebsd/freebsd-12-x86_64.pkrvars.hcl deleted file mode 100644 index 41181b3a9..000000000 --- a/os_pkrvars/freebsd/freebsd-12-x86_64.pkrvars.hcl +++ /dev/null @@ -1,9 +0,0 @@ -os_name = "freebsd" -os_version = "12.4" -os_arch = "x86_64" -iso_url = "https://download.freebsd.org/releases/amd64/amd64/ISO-IMAGES/12.4/FreeBSD-12.4-RELEASE-amd64-disc1.iso" -iso_checksum = "606435637b76991f96df68f561badf03266f3d5452e9f72ed9b130d96b188800" -parallels_guest_os_type = "freebsd" -vbox_guest_os_type = "FreeBSD_64" -vmware_guest_os_type = "freebsd-64" -boot_command = ["<wait><esc><wait>boot -s<wait><enter><wait><wait10><wait10>/bin/sh<enter><wait>mdmfs -s 100m md1 /tmp<enter><wait>mdmfs -s 100m md2 /mnt<enter><wait>dhclient -p /tmp/dhclient.em0.pid -l /tmp/dhclient.lease.em0 em0<enter><wait>fetch -o /tmp/installerconfig http://{{ .HTTPIP }}:{{ .HTTPPort }}/freebsd/installerconfig \u0026\u0026 bsdinstall script /tmp/installerconfig<enter><wait>"] diff --git a/os_pkrvars/oracle/oracle-8-aarch64.pkrvars.hcl b/os_pkrvars/oracle/oracle-8-aarch64.pkrvars.hcl index f95e9f8f7..dd1c6561d 100644 --- a/os_pkrvars/oracle/oracle-8-aarch64.pkrvars.hcl +++ b/os_pkrvars/oracle/oracle-8-aarch64.pkrvars.hcl @@ -1,8 +1,8 @@ os_name = "oracle" -os_version = "8.8" +os_version = "8.9" os_arch = "aarch64" -iso_url = "https://yum.oracle.com/ISOS/OracleLinux/OL8/u8/aarch64/OracleLinux-R8-U8-aarch64-dvd.iso" -iso_checksum = "6fe0c274b08084787f8d82d8cf2ff7893eea91f018c1f2d0c72383588b2fd480" +iso_url = "https://yum.oracle.com/ISOS/OracleLinux/OL8/u9/aarch64/OracleLinux-R8-U9-aarch64-dvd.iso" +iso_checksum = "c732ec9bb4a85349c0f1ca82020a8514341247506d114b8b79ec32bf99d59ea0" parallels_guest_os_type = "centos" vbox_guest_os_type = "RedHat_64" vmware_guest_os_type = "arm-centos-64" diff --git a/os_pkrvars/oracle/oracle-8-x86_64.pkrvars.hcl b/os_pkrvars/oracle/oracle-8-x86_64.pkrvars.hcl index 3768bb278..af05d8767 100644 --- a/os_pkrvars/oracle/oracle-8-x86_64.pkrvars.hcl +++ b/os_pkrvars/oracle/oracle-8-x86_64.pkrvars.hcl @@ -1,8 +1,8 @@ os_name = "oracle" -os_version = "8.8" +os_version = "8.9" os_arch = "x86_64" -iso_url = "https://yum.oracle.com/ISOS/OracleLinux/OL8/u8/x86_64/OracleLinux-R8-U8-x86_64-dvd.iso" -iso_checksum = "cae39116245ff7c3c86d5305d9c11430ce5c4e512987563435ac59c37a082d7e" +iso_url = "https://yum.oracle.com/ISOS/OracleLinux/OL8/u9/x86_64/OracleLinux-R8-U9-x86_64-dvd.iso" +iso_checksum = "ce90b598be2e9889fa880128fc53b3e9c1f95d9e31859759e5e180602312c181" parallels_guest_os_type = "centos" vbox_guest_os_type = "RedHat_64" vmware_guest_os_type = "centos-64" diff --git a/os_pkrvars/oracle/oracle-9-aarch64.pkrvars.hcl b/os_pkrvars/oracle/oracle-9-aarch64.pkrvars.hcl index 606a8d3cf..f5384427d 100644 --- a/os_pkrvars/oracle/oracle-9-aarch64.pkrvars.hcl +++ b/os_pkrvars/oracle/oracle-9-aarch64.pkrvars.hcl @@ -1,8 +1,8 @@ os_name = "oracle" -os_version = "9.2" +os_version = "9.3" os_arch = "aarch64" -iso_url = "https://yum.oracle.com/ISOS/OracleLinux/OL9/u2/aarch64/OracleLinux-R9-U2-aarch64-dvd.iso" -iso_checksum = "412f1a5e90d11313735a2a98a977f82d0d09642e3ab14a03da36d4e2b0b0d275" +iso_url = "https://yum.oracle.com/ISOS/OracleLinux/OL9/u3/aarch64/OracleLinux-R9-U3-aarch64-dvd.iso" +iso_checksum = "7cc50a48f361cb1100a28621ba455edaac3a38182f6dd3fe67588b3eeaf18dc3" parallels_guest_os_type = "centos" vbox_guest_os_type = "RedHat_64" vmware_guest_os_type = "arm-centos-64" diff --git a/os_pkrvars/oracle/oracle-9-x86_64.pkrvars.hcl b/os_pkrvars/oracle/oracle-9-x86_64.pkrvars.hcl index 9bb6e5078..b76944965 100644 --- a/os_pkrvars/oracle/oracle-9-x86_64.pkrvars.hcl +++ b/os_pkrvars/oracle/oracle-9-x86_64.pkrvars.hcl @@ -1,8 +1,8 @@ os_name = "oracle" -os_version = "9.2" +os_version = "9.3" os_arch = "x86_64" -iso_url = "https://yum.oracle.com/ISOS/OracleLinux/OL9/u2/x86_64/OracleLinux-R9-U2-x86_64-dvd.iso" -iso_checksum = "cac3c41cc2d3467ba8902a5d74575bcf460f129634d5a0d1d67d87094dd70b09" +iso_url = "https://yum.oracle.com/ISOS/OracleLinux/OL9/u3/x86_64/OracleLinux-R9-U3-x86_64-dvd.iso" +iso_checksum = "242f0ecc37417995137507862cb170215c0b5bd512c47badd16b623686ef39e2" parallels_guest_os_type = "centos" vbox_guest_os_type = "RedHat_64" vmware_guest_os_type = "centos-64" diff --git a/os_pkrvars/rhel/rhel-8-aarch64.pkrvars.hcl b/os_pkrvars/rhel/rhel-8-aarch64.pkrvars.hcl index 03b29e385..0785f59d0 100644 --- a/os_pkrvars/rhel/rhel-8-aarch64.pkrvars.hcl +++ b/os_pkrvars/rhel/rhel-8-aarch64.pkrvars.hcl @@ -1,5 +1,5 @@ os_name = "rhel" -os_version = "8.8" +os_version = "8.9" os_arch = "aarch64" iso_url = "https://www.redhat.com/en/technologies/linux-platforms/enterprise-linux" iso_checksum = "none" diff --git a/os_pkrvars/rhel/rhel-8-x86_64.pkrvars.hcl b/os_pkrvars/rhel/rhel-8-x86_64.pkrvars.hcl index 29168e5db..0d939441b 100644 --- a/os_pkrvars/rhel/rhel-8-x86_64.pkrvars.hcl +++ b/os_pkrvars/rhel/rhel-8-x86_64.pkrvars.hcl @@ -1,5 +1,5 @@ os_name = "rhel" -os_version = "8.8" +os_version = "8.9" os_arch = "x86_64" iso_url = "https://www.redhat.com/en/technologies/linux-platforms/enterprise-linux" iso_checksum = "none" diff --git a/os_pkrvars/rhel/rhel-9-aarch64.pkrvars.hcl b/os_pkrvars/rhel/rhel-9-aarch64.pkrvars.hcl index 7223a554a..345324625 100644 --- a/os_pkrvars/rhel/rhel-9-aarch64.pkrvars.hcl +++ b/os_pkrvars/rhel/rhel-9-aarch64.pkrvars.hcl @@ -1,5 +1,5 @@ os_name = "rhel" -os_version = "9.2" +os_version = "9.3" os_arch = "aarch64" iso_url = "https://www.redhat.com/en/technologies/linux-platforms/enterprise-linux" iso_checksum = "none" diff --git a/os_pkrvars/rhel/rhel-9-x86_64.pkrvars.hcl b/os_pkrvars/rhel/rhel-9-x86_64.pkrvars.hcl index 434e0c5f8..aac6e2b5d 100644 --- a/os_pkrvars/rhel/rhel-9-x86_64.pkrvars.hcl +++ b/os_pkrvars/rhel/rhel-9-x86_64.pkrvars.hcl @@ -1,5 +1,5 @@ os_name = "rhel" -os_version = "9.2" +os_version = "9.3" os_arch = "x86_64" iso_url = "https://www.redhat.com/en/technologies/linux-platforms/enterprise-linux" iso_checksum = "none" diff --git a/os_pkrvars/rockylinux/rockylinux-8-aarch64.pkrvars.hcl b/os_pkrvars/rockylinux/rockylinux-8-aarch64.pkrvars.hcl index 5a8e84ba1..9a542230e 100644 --- a/os_pkrvars/rockylinux/rockylinux-8-aarch64.pkrvars.hcl +++ b/os_pkrvars/rockylinux/rockylinux-8-aarch64.pkrvars.hcl @@ -1,7 +1,7 @@ os_name = "rockylinux" -os_version = "8.8" +os_version = "8.9" os_arch = "aarch64" -iso_url = "https://download.rockylinux.org/pub/rocky/8/isos/aarch64/Rocky-8.8-aarch64-minimal.iso" +iso_url = "https://download.rockylinux.org/pub/rocky/8/isos/aarch64/Rocky-8.9-aarch64-minimal.iso" iso_checksum = "file:https://download.rockylinux.org/pub/rocky/8/isos/aarch64/CHECKSUM" parallels_guest_os_type = "centos" vbox_guest_os_type = "RedHat_64" diff --git a/os_pkrvars/rockylinux/rockylinux-8-x86_64.pkrvars.hcl b/os_pkrvars/rockylinux/rockylinux-8-x86_64.pkrvars.hcl index 97dbf6978..e64db8fcd 100644 --- a/os_pkrvars/rockylinux/rockylinux-8-x86_64.pkrvars.hcl +++ b/os_pkrvars/rockylinux/rockylinux-8-x86_64.pkrvars.hcl @@ -1,7 +1,7 @@ os_name = "rockylinux" -os_version = "8.8" +os_version = "8.9" os_arch = "x86_64" -iso_url = "https://download.rockylinux.org/pub/rocky/8/isos/x86_64/Rocky-8.8-x86_64-minimal.iso" +iso_url = "https://download.rockylinux.org/pub/rocky/8/isos/x86_64/Rocky-8.9-x86_64-minimal.iso" iso_checksum = "file:https://download.rockylinux.org/pub/rocky/8/isos/x86_64/CHECKSUM" parallels_guest_os_type = "centos" vbox_guest_os_type = "RedHat_64" diff --git a/os_pkrvars/scientificlinux/scientificlinux-7-x86_64.pkrvars.hcl b/os_pkrvars/scientificlinux/scientificlinux-7-x86_64.pkrvars.hcl deleted file mode 100644 index 90f2d7d52..000000000 --- a/os_pkrvars/scientificlinux/scientificlinux-7-x86_64.pkrvars.hcl +++ /dev/null @@ -1,9 +0,0 @@ -os_name = "scientificlinux" -os_version = "7.9" -os_arch = "x86_64" -iso_url = "http://www.gtlib.gatech.edu/pub/scientific/7.9/x86_64/iso/SL-7-DVD-x86_64.iso" -iso_checksum = "7ac643e164c4a0da0b9f33411c68368cf908e0c34254904044957a3ca7793934" -parallels_guest_os_type = "centos" -vbox_guest_os_type = "RedHat_64" -vmware_guest_os_type = "centos-64" -boot_command = ["<wait><up><wait><tab> inst.text inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/rhel/7ks.cfg<enter><wait>"] diff --git a/os_pkrvars/sles/sles-15-x86_64.pkrvars.hcl b/os_pkrvars/sles/sles-15-x86_64.pkrvars.hcl index 4cb327e06..4d9b85d40 100644 --- a/os_pkrvars/sles/sles-15-x86_64.pkrvars.hcl +++ b/os_pkrvars/sles/sles-15-x86_64.pkrvars.hcl @@ -1,8 +1,8 @@ os_name = "suse" -os_version = "15.4" +os_version = "15.5" os_arch = "x86_64" -iso_url = "https://updates.suse.com/SUSE/Products/SLE-Product-SLES/15-SP4/x86_64/iso/SLE-15-SP4-Online-x86_64-GM-Media1.iso" -iso_checksum = "c0ceebe14d23c6c9484a1594fc5159225292f0847f7f15046f45a83319536d0e" +iso_url = "https://updates.suse.com/SUSE/Products/SLE-Product-SLES/15-SP5/x86_64/iso/SLE-15-SP5-Online-x86_64-GM-Media1.iso" +iso_checksum = "" parallels_guest_os_type = "suse" vbox_guest_os_type = "SUSE_LE_64" vmware_guest_os_type = "sles15-64" diff --git a/os_pkrvars/springdalelinux/springdalelinux-7-x86_64.pkrvars.hcl b/os_pkrvars/springdalelinux/springdalelinux-7-x86_64.pkrvars.hcl deleted file mode 100644 index 3c35a3201..000000000 --- a/os_pkrvars/springdalelinux/springdalelinux-7-x86_64.pkrvars.hcl +++ /dev/null @@ -1,9 +0,0 @@ -os_name = "springdalelinux" -os_version = "7.9" -os_arch = "x86_64" -iso_url = "http://springdale.princeton.edu/data/springdale/7/x86_64/iso/Springdale%20Linux-7.9-x86_64-netinst.iso" -iso_checksum = "ad47807e17f796bdca35bb3ec5b65f1340d43b698ee04dcf60faecc8c6818c67" -parallels_guest_os_type = "centos" -vbox_guest_os_type = "RedHat_64" -vmware_guest_os_type = "centos-64" -boot_command = ["<wait><up><wait><tab> inst.text inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/springdalelinux/7ks.cfg<enter><wait>"] diff --git a/os_pkrvars/springdalelinux/springdalelinux-8-x86_64.pkrvars.hcl b/os_pkrvars/springdalelinux/springdalelinux-8-x86_64.pkrvars.hcl deleted file mode 100644 index 443cd96ce..000000000 --- a/os_pkrvars/springdalelinux/springdalelinux-8-x86_64.pkrvars.hcl +++ /dev/null @@ -1,9 +0,0 @@ -os_name = "springdalelinux" -os_version = "8.8" -os_arch = "x86_64" -iso_url = "http://springdale.princeton.edu/data/springdale/8/x86_64/iso/Springdale%20Linux-8.8-x86_64-netinst.iso" -iso_checksum = "8bd617eb9fb050387fdf5abd9445722a1ef247523f2aa66d9cd9f952fbc9f6ff" -parallels_guest_os_type = "centos" -vbox_guest_os_type = "RedHat_64" -vmware_guest_os_type = "centos-64" -boot_command = ["<wait><up><wait><tab> inst.text inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/springdalelinux/8ks.cfg<enter><wait>"] diff --git a/os_pkrvars/springdalelinux/springdalelinux-9-x86_64.pkrvars.hcl b/os_pkrvars/springdalelinux/springdalelinux-9-x86_64.pkrvars.hcl deleted file mode 100644 index 22c7d987c..000000000 --- a/os_pkrvars/springdalelinux/springdalelinux-9-x86_64.pkrvars.hcl +++ /dev/null @@ -1,9 +0,0 @@ -os_name = "springdalelinux" -os_version = "9.2" -os_arch = "x86_64" -iso_url = "http://springdale.princeton.edu/data/springdale/9/x86_64/iso/Springdale%20Linux-9.2-x86_64-netinst.iso" -iso_checksum = "88138260fec7898decf421fe0ae53953f9512c68009dd24cbd897ce226c6295d" -parallels_guest_os_type = "centos" -vbox_guest_os_type = "RedHat_64" -vmware_guest_os_type = "centos-64" -boot_command = ["<wait><up><wait><tab> inst.text inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/springdalelinux/9ks.cfg<enter><wait>"] diff --git a/os_pkrvars/ubuntu/ubuntu-20.04-aarch64.pkrvars.hcl b/os_pkrvars/ubuntu/ubuntu-20.04-aarch64.pkrvars.hcl index 2ab4099ce..f24afed1b 100644 --- a/os_pkrvars/ubuntu/ubuntu-20.04-aarch64.pkrvars.hcl +++ b/os_pkrvars/ubuntu/ubuntu-20.04-aarch64.pkrvars.hcl @@ -2,7 +2,7 @@ os_name = "ubuntu" os_version = "20.04" os_arch = "aarch64" iso_url = "http://cdimage.ubuntu.com/releases/focal/release/ubuntu-20.04.5-live-server-arm64.iso" -iso_checksum = "sha256:e42d6373dd39173094af5c26cbf2497770426f42049f8b9ea3e60ce35bebdedf" +iso_checksum = "file:https://cdimage.ubuntu.com/releases/focal/release/SHA256SUMS" parallels_guest_os_type = "ubuntu" vbox_guest_os_type = "Ubuntu_64" vmware_guest_os_type = "arm-ubuntu-64" diff --git a/os_pkrvars/ubuntu/ubuntu-23.04-aarch64.pkrvars.hcl b/os_pkrvars/ubuntu/ubuntu-23.10-aarch64.pkrvars.hcl similarity index 69% rename from os_pkrvars/ubuntu/ubuntu-23.04-aarch64.pkrvars.hcl rename to os_pkrvars/ubuntu/ubuntu-23.10-aarch64.pkrvars.hcl index a4d080aeb..770a5671a 100644 --- a/os_pkrvars/ubuntu/ubuntu-23.04-aarch64.pkrvars.hcl +++ b/os_pkrvars/ubuntu/ubuntu-23.10-aarch64.pkrvars.hcl @@ -1,8 +1,8 @@ os_name = "ubuntu" -os_version = "23.04" +os_version = "23.10" os_arch = "aarch64" -iso_url = "https://cdimage.ubuntu.com/releases/lunar/release/ubuntu-23.04-live-server-arm64.iso" -iso_checksum = "file:https://cdimage.ubuntu.com/releases/lunar/release/SHA256SUMS" +iso_url = "https://cdimage.ubuntu.com/releases/mantic/release/ubuntu-23.10-live-server-arm64.iso" +iso_checksum = "file:https://cdimage.ubuntu.com/releases/mantic/release/SHA256SUMS" parallels_guest_os_type = "ubuntu" vbox_guest_os_type = "Ubuntu_64" vmware_guest_os_type = "arm-ubuntu-64" diff --git a/os_pkrvars/ubuntu/ubuntu-23.04-x86_64.pkrvars.hcl b/os_pkrvars/ubuntu/ubuntu-23.10-x86_64.pkrvars.hcl similarity index 61% rename from os_pkrvars/ubuntu/ubuntu-23.04-x86_64.pkrvars.hcl rename to os_pkrvars/ubuntu/ubuntu-23.10-x86_64.pkrvars.hcl index b63e4dd21..43a2a3941 100644 --- a/os_pkrvars/ubuntu/ubuntu-23.04-x86_64.pkrvars.hcl +++ b/os_pkrvars/ubuntu/ubuntu-23.10-x86_64.pkrvars.hcl @@ -1,8 +1,8 @@ os_name = "ubuntu" -os_version = "23.04" +os_version = "23.10" os_arch = "x86_64" -iso_url = "https://releases.ubuntu.com/lunar/ubuntu-23.04-live-server-amd64.iso" -iso_checksum = "file:https://releases.ubuntu.com/lunar/SHA256SUMS" +iso_url = "https://releases.ubuntu.com/mantic/ubuntu-23.10-live-server-amd64.iso" +iso_checksum = "file:https://releases.ubuntu.com/mantic/SHA256SUMS" parallels_guest_os_type = "ubuntu" vbox_guest_os_type = "Ubuntu_64" vmware_guest_os_type = "ubuntu-64" From 82435a503823e5a6536b1421d6e1aa0f7458e868 Mon Sep 17 00:00:00 2001 From: Corey Hemminger <hemminger@hotmail.com> Date: Thu, 1 Feb 2024 22:09:54 -0600 Subject: [PATCH 1542/1622] Fix upload public/private flag lookup (#1544) * fix upload public or private flag lookup * oracle 7 cleanup script error removing linux-firmware * ubuntu 23.10 post install command on file that doesn't exist --- CHANGELOG.md | 10 +++++++++- lib/bento/upload.rb | 2 +- lib/bento/version.rb | 2 +- packer_templates/http/ubuntu/user-data | 1 - packer_templates/scripts/rhel/cleanup_yum.sh | 8 ++++++-- packer_templates/scripts/ubuntu/cleanup_ubuntu.sh | 3 ++- 6 files changed, 19 insertions(+), 7 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 073a25234..da48662fa 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -54,7 +54,15 @@ Markdown table generated at <https://www.tablesgenerator.com/markdown_tables#> - Create CD pipeline to build and upload new versions of vagrant boxes once every 3 months with the latest patches - Added ability to configure bento upload of private or public boxes in builds.yml, defaults to private -## [unreleased] (2024-01-31) +## [unreleased] (2024-02-01) + +## [v3.2.2] (2024-02-01) + +- Fix upload private or public flag lookup in builds.yml +- Fix yum cleanup script for oracle linux 7 error removing linux-firmware +- Fix ubuntu user-data post command modifying a file that doesn't exist on 23.10 + +## [v3.2.1] (2024-01-31) - Fix build list generation on aarch64 machines - Updated Debian 12 to 12.4 diff --git a/lib/bento/upload.rb b/lib/bento/upload.rb index c5cca05ba..56863406b 100644 --- a/lib/bento/upload.rb +++ b/lib/bento/upload.rb @@ -87,7 +87,7 @@ def lookup_slug(name) def public_private_box(name) builds_yml['public'].each do |public| - if name.include?('arm64') + if name.include?('arm64') || name.include?('aarch64') return '--no-private' if name.start_with?(public) && public.include?('arm64') else return '--no-private' if name.start_with?(public) && !public.include?('arm64') diff --git a/lib/bento/version.rb b/lib/bento/version.rb index b701c30fe..40b214786 100644 --- a/lib/bento/version.rb +++ b/lib/bento/version.rb @@ -1,3 +1,3 @@ module Bento - VERSION = '3.2.1'.freeze + VERSION = '3.2.2'.freeze end diff --git a/packer_templates/http/ubuntu/user-data b/packer_templates/http/ubuntu/user-data index df9c1b033..01a91e224 100644 --- a/packer_templates/http/ubuntu/user-data +++ b/packer_templates/http/ubuntu/user-data @@ -13,7 +13,6 @@ autoinstall: install-server: yes allow-pw: yes late-commands: - - 'sed -i "s/dhcp4: true/&\n dhcp-identifier: mac/" /target/etc/netplan/00-installer-config.yaml' - echo 'vagrant ALL=(ALL) NOPASSWD:ALL' > /target/etc/sudoers.d/vagrant # Enable hyper-v daemons only if using hyper-v virtualization - if [ $(virt-what) == "hyperv" ]; then apt-get update && apt-get install -y hyperv-daemons linux-tools-$(uname -r) linux-cloud-tools-$(uname -r) linux-cloud-tools-common cifs-utils && systemctl enable hypervvssd && systemctl enable hypervkvpd && systemctl start hypervvssd && systemctl start hypervkvpd; fi diff --git a/packer_templates/scripts/rhel/cleanup_yum.sh b/packer_templates/scripts/rhel/cleanup_yum.sh index 077319234..abc88a934 100644 --- a/packer_templates/scripts/rhel/cleanup_yum.sh +++ b/packer_templates/scripts/rhel/cleanup_yum.sh @@ -19,8 +19,12 @@ package-cleanup --oldkernels --count=1 -y # Avoid ~200 meg firmware package we don't need # this cannot be done in the KS file so we do it here -echo "Removing extra firmware packages" -yum -y remove linux-firmware +if test "$(uname -r)" == -- *el7uek*; then + echo "Skipping firmware removal for Oracle Linux" +else + echo "Removing extra firmware packages" + yum -y remove linux-firmware +fi echo "clean all package cache information" yum -y clean all --enablerepo=\*; diff --git a/packer_templates/scripts/ubuntu/cleanup_ubuntu.sh b/packer_templates/scripts/ubuntu/cleanup_ubuntu.sh index 91f05656c..a009405f0 100644 --- a/packer_templates/scripts/ubuntu/cleanup_ubuntu.sh +++ b/packer_templates/scripts/ubuntu/cleanup_ubuntu.sh @@ -26,11 +26,12 @@ dpkg --list \ | grep linux-source \ | xargs apt-get -y purge; +# 23.10 gives dependency errors for systemd-dev package echo "remove all development packages" dpkg --list \ | awk '{ print $2 }' \ | grep -- '-dev\(:[a-z0-9]\+\)\?$' \ - | xargs apt-get -y purge; + | xargs -I % apt-get -y purge % || true; echo "remove docs packages" dpkg --list \ From 7bbfea46d8214dc5f13ecacef923b24103613ebf Mon Sep 17 00:00:00 2001 From: Corey Hemminger <hemminger@hotmail.com> Date: Mon, 5 Feb 2024 17:43:51 -0600 Subject: [PATCH 1543/1622] vagrant cloud cpu architecture support added (#1546) * vagrant cloud cpu architecture support added --- CHANGELOG.md | 79 +++++++++-------- README.md | 22 ++--- builds.yml | 37 +------- lib/bento/buildmetadata.rb | 14 +--- lib/bento/cli.rb | 9 ++ lib/bento/runner.rb | 6 +- lib/bento/upload.rb | 29 ++++--- lib/bento/version.rb | 2 +- packer_templates/http/springdalelinux/7ks.cfg | 81 ------------------ packer_templates/http/springdalelinux/8ks.cfg | 84 ------------------- packer_templates/http/springdalelinux/9ks.cfg | 82 ------------------ packer_templates/http/ubuntu/user-data | 6 +- 12 files changed, 91 insertions(+), 360 deletions(-) delete mode 100644 packer_templates/http/springdalelinux/7ks.cfg delete mode 100644 packer_templates/http/springdalelinux/8ks.cfg delete mode 100644 packer_templates/http/springdalelinux/9ks.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index da48662fa..0b7ad41a4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,41 +5,41 @@ ***Note:** Markdown table generated at <https://www.tablesgenerator.com/markdown_tables#> -| | hyperv<br>x86_64 | parallels<br>x86_64 | parallels<br>aarch64 | qemu<br>x86_64 | qemu<br>aarch64 | virtualbox<br>x86_64 | virtualbox<br>aarch64 | vmware<br>x86_64 | vmware<br>aarch64 | -|:-----------------:|:---:|:---:|:--------------------:|:---:|:---:|:---:|:---:|:---:|:---:| -| almalinux-8 | | x | | x | | x | | x | | -| almalinux-9 | | x | x | | | x | | x | x | -| amazonlinux-2 | | na | na | | | | na | | na | -| amazonlinux-2023 | na | na | na | na | na | na | na | na | na | -| centos-7 | | x | | x | | x | | x | | -| centos-stream-8 | | x | | x | | x | | x | | -| centos-stream-9 | | | x | | | | | | | -| debian-11 | | x | x | | | x | | x | | -| debian-12 | | x | x | | | x | | x | x | -| fedora-38 | | x | | x | | x | | x | x | -| fedora-39 | | | | | | | | | | -| freebsd-12 | | | | | | x | | x | | -| freebsd-13 | | | | | | x | | x | | -| opensuse-leap-15 | | x | | x | | x | | x | | -| oraclelinux-7 | | x | | x | | x | | x | | -| oraclelinux-8 | | | | x | | x | | x | | -| oraclelinux-9 | | x | x | | | x | | x | | -| rhel-7 | license<br>needed | license<br>needed | license<br>needed | license<br>needed | license<br>needed | license<br>needed | license<br>needed | license<br>needed | license<br>needed | -| rhel-8 | license<br>needed | license<br>needed | license<br>needed | license<br>needed | license<br>needed | license<br>needed | license<br>needed | license<br>needed | license<br>needed | -| rhel-9 | license<br>needed | license<br>needed | license<br>needed | license<br>needed | license<br>needed | license<br>needed | license<br>needed | license<br>needed | license<br>needed | -| rockylinux-8 | | x | | x | | x | | x | | -| rockylinux-9 | | x | | | | x | | x | x | -| sles-12 | license<br>needed | license<br>needed | na | license<br>needed | na | license<br>needed | na | license<br>needed | na | -| sles-13 | license<br>needed | license<br>needed | na | license<br>needed | na | license<br>needed | na | license<br>needed | na | -| solaris-11 | license<br>needed | license<br>needed | na | license<br>needed | na | license<br>needed | na | license<br>needed | na | -| ubuntu-20.04 | | x | x | | | x | | x | x | -| ubuntu-22.04 | | x | | x | | x | | x | | -| ubuntu-23.10 | | | | | | | | | | -| windows-10 | | x | na | | na | x | na | | na | -| windows-11 | | x | na | | na | x | na | | na | -| windows-2016 | | x | na | | na | x | na | | na | -| windows-2019 | | x | na | | na | x | na | | na | -| windows-2022 | | x | na | | na | x | na | | na | +| | hyperv<br>x86_64 | parallels<br>x86_64 | parallels<br>aarch64 | qemu<br>x86_64 | qemu<br>aarch64 | virtualbox<br>x86_64 | virtualbox<br>aarch64 | vmware<br>x86_64 | vmware<br>aarch64 | +|:----------------:|:---:|:-------------------:|:--------------------:|:---:|:---:|:--------------------:|:---:|:-----------------:|:-----------------:| +| almalinux-8 | | x | | x | | x | | x | | +| almalinux-9 | | x | x | | | x | | x | x | +| amazonlinux-2 | | na | na | | | | na | | na | +| amazonlinux-2023 | na | na | na | na | na | na | na | na | na | +| centos-7 | | x | | x | | x | | x | | +| centos-stream-8 | | x | | x | | x | | x | | +| centos-stream-9 | | | x | | | | | | | +| debian-11 | | x | x | | | x | | x | | +| debian-12 | | x | x | | | x | | x | x | +| fedora-38 | | x | | x | | x | | x | x | +| fedora-39 | | | | | | | | | | +| freebsd-13 | | | | | | x | | x | x | +| freebsd-14 | | | | | | x | | x | | +| opensuse-leap-15 | | x | | x | | x | | x | | +| oraclelinux-7 | | x | | x | | x | | x | | +| oraclelinux-8 | | | | x | | x | | x | | +| oraclelinux-9 | | x | x | | | x | | x | | +| rhel-7 | license<br>needed | license<br>needed | license<br>needed | license<br>needed | license<br>needed | license<br>needed | license<br>needed | license<br>needed | license<br>needed | +| rhel-8 | license<br>needed | license<br>needed | license<br>needed | license<br>needed | license<br>needed | license<br>needed | license<br>needed | license<br>needed | license<br>needed | +| rhel-9 | license<br>needed | license<br>needed | license<br>needed | license<br>needed | license<br>needed | license<br>needed | license<br>needed | license<br>needed | license<br>needed | +| rockylinux-8 | | x | | x | | x | | x | | +| rockylinux-9 | | x | | | | x | | x | x | +| sles-12 | license<br>needed | license<br>needed | na | license<br>needed | na | license<br>needed | na | license<br>needed | na | +| sles-13 | license<br>needed | license<br>needed | na | license<br>needed | na | license<br>needed | na | license<br>needed | na | +| solaris-11 | license<br>needed | license<br>needed | na | license<br>needed | na | license<br>needed | na | license<br>needed | na | +| ubuntu-20.04 | | x | x | | | x | | x | x | +| ubuntu-22.04 | | x | | x | | x | | x | | +| ubuntu-23.10 | | x | x | | | x | | x | x | +| windows-10 | | x | na | | na | x | na | | na | +| windows-11 | | x | na | | na | x | na | | na | +| windows-2016 | | x | na | | na | x | na | | na | +| windows-2019 | | x | na | | na | x | na | | na | +| windows-2022 | | x | na | | na | x | na | | na | ### Todo @@ -54,7 +54,14 @@ Markdown table generated at <https://www.tablesgenerator.com/markdown_tables#> - Create CD pipeline to build and upload new versions of vagrant boxes once every 3 months with the latest patches - Added ability to configure bento upload of private or public boxes in builds.yml, defaults to private -## [unreleased] (2024-02-01) +## [unreleased] (2024-02-05) + +## [v4.0.0] (2024-02-05) + +- Added Vagrant Cloud architecture flags so amd64 and arm64 boxes can live under the same cloud box +- Setting amd64 as default architecture for uploads, configurable in the builds.yml file +- Update descriptions mentioning chef to progress chef +- Update README.md to reflect vagrant version for new architecture support ## [v3.2.2] (2024-02-01) diff --git a/README.md b/README.md index 5daaa8919..5a9038a61 100644 --- a/README.md +++ b/README.md @@ -4,6 +4,7 @@ Bento is a project that encapsulates [Packer](https://www.packer.io/) templates ***NOTE:** +- Vagrant 2.4.0+ is required for new cpu archetecture support - Virutalbox 6.x requires disabling nat config that allows vbox 7.x guests to connect to the host. To use comment out lines #161 and #162 in bento/packer_templates/pkr-variables.pkr.hcl or add variable `vboxmanage = []` to os_pkrvars files. - When running packer build command the output directory is relative to the working directory the command is currently running in. Suggest running packer build commands from bento root directory for build working files to be placed in bento/builds/(build_name) directory by default. If the output_directory variable isn't overwritten a directory called builds/(build_name) will be created in the current working directory that you are running the command from @@ -28,17 +29,18 @@ end #### Requirements - [Packer](https://www.packer.io/) >= 1.7.0 -- [Vagrant](https://www.vagrantup.com/) +- [Vagrant](https://www.vagrantup.com/) >= 2.4.0 - At least one of the following virtualization providers: - - [VirtualBox](https://www.virtualbox.org/) - - [VMware Fusion](https://www.vmware.com/products/fusion.html) - - [VMware Workstation](https://www.vmware.com/products/workstation-pro.html) - - [Parallels Desktop Pro](https://www.parallels.com/products/desktop/)*2 also requires [Parallels Virtualization SDK](https://www.parallels.com/products/desktop/download/) for versions < 19.x - - [qemu](https://www.qemu.org/) *1 - - [Hyper-V](https://docs.microsoft.com/en-us/virtualization/hyper-v-on-windows/about/) *1 + - [VirtualBox](https://www.virtualbox.org/)*2 + - [VMware Fusion](https://www.vmware.com/products/fusion.html)*2 + - [VMware Workstation](https://www.vmware.com/products/workstation-pro.html)*2 + - [Parallels Desktop Pro](https://www.parallels.com/products/desktop/) also requires [Parallels Virtualization SDK](https://www.parallels.com/products/desktop/download/) for versions < 19.x + - [qemu](https://www.qemu.org/) *1 *2 + - [Hyper-V](https://docs.microsoft.com/en-us/virtualization/hyper-v-on-windows/about/) *1 *2 -*1**NOTE:** support for these providers is considered experimental and corresponding Vagrant Cloud images may or may not exist. -*2**NOTE:** AARCH64 or ARM64 support is only guaranteed through parallels provider. +*1 **NOTE:** support for these providers is considered experimental and corresponding Vagrant Cloud images may or may not exist. + +*2 **NOTE:** AARCH64 or ARM64 support is a work in progress only guaranteed through parallels and vmware provider. ### Using `bento` executable @@ -196,7 +198,7 @@ These basebox templates were converted from [veewee](https://github.com/jedi4eve - Author: Corey Hemminger ([corey.hemminger@progress.com](mailto:corey.hemminger@progress.com)) ```text -Copyright 2012-2023, Progress Software, Inc. (<legal@chef.io>) +Copyright 2012-2024, Progress Software, Inc. (<legal@chef.io>) Copyright 2011-2012, Tim Dysinger (<tim@dysinger.net>) Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/builds.yml b/builds.yml index a429f96e8..6f0cd3b65 100644 --- a/builds.yml +++ b/builds.yml @@ -1,6 +1,10 @@ --- vagrant_cloud_account: 'bento' +default_architectures: + - 'x86_64' + - 'amd64' + public: - 'almalinux-8' - 'almalinux-9' @@ -24,28 +28,6 @@ public: - 'ubuntu-20.04' - 'ubuntu-22.04' - 'ubuntu-23.10' - - 'almalinux-8-arm64' - - 'almalinux-9-arm64' - - 'amazon-2-arm64' - - 'amazon-2023-arm64' - - 'centos-7-arm64' - - 'centos-stream-8-arm64' - - 'centos-stream-9-arm64' - - 'debian-11-arm64' - - 'debian-12-arm64' - - 'fedora-38-arm64' - - 'fedora-39-arm64' - - 'freebsd-13-arm64' - - 'freebsd-14-arm64' - - 'opensuse-leap-15-arm64' - - 'oracle-7-arm64' - - 'oracle-8-arm64' - - 'oracle-9-arm64' - - 'rockylinux-8-arm64' - - 'rockylinux-9-arm64' - - 'ubuntu-20.04-arm64' - - 'ubuntu-22.04-arm64' - - 'ubuntu-23.10-arm64' # slug box name: text string from standard box name to match (generally the same) slugs: @@ -63,17 +45,6 @@ slugs: 'oracle-9': 'oracle-9' 'rockylinux-8': 'rockylinux-8' 'rockylinux-9': 'rockylinux-9' - 'almalinux-8-arm64': 'almalinux-8' - 'almalinux-9-arm64': 'almalinux-9' - 'centos-7-arm64': 'centos-7' - 'debian-12-arm64': 'debian-12' - 'debian-11-arm64': 'debian-11' - 'fedora-latest-arm64': 'fedora-39' - 'oracle-7-arm64': 'oracle-7' - 'oracle-8-arm64': 'oracle-8' - 'oracle-9-arm64': 'oracle-9' - 'rockylinux-8-arm64': 'rockylinux-8' - 'rockylinux-9-arm64': 'rockylinux-9' do_not_build: - amazon diff --git a/lib/bento/buildmetadata.rb b/lib/bento/buildmetadata.rb index ecbba79d5..d343686dc 100644 --- a/lib/bento/buildmetadata.rb +++ b/lib/bento/buildmetadata.rb @@ -33,12 +33,7 @@ def read attr_reader :template, :build_timestamp, :override_version, :pkr_cmd def box_basename - temp_name = name.gsub('/', '__').split('-') - if temp_name.last == 'arm64' - temp_name.join('-') - else - (temp_name.first temp_name.size - 1).join('-') - end + name.gsub('/', '__').split('-')[0...-1].join('-') end def git_revision @@ -54,12 +49,7 @@ def merged_vars end def name - arch = merged_vars.fetch('arch', UNKNOWN).downcase - if arch == 'aarch64' || arch == 'arm64' - "#{merged_vars.fetch('name', template)}-arm64" - else - "#{merged_vars.fetch('name', template)}-x86_64" - end + merged_vars.fetch('name', template) end def arch diff --git a/lib/bento/cli.rb b/lib/bento/cli.rb index 5b44ae3ce..0727465e4 100644 --- a/lib/bento/cli.rb +++ b/lib/bento/cli.rb @@ -6,6 +6,7 @@ require 'bento/normalize' require 'bento/test' require 'bento/upload' +require 'bento/version' class Options NAME = File.basename($PROGRAM_NAME).freeze @@ -33,6 +34,7 @@ def self.parse(args) normalize : normalize one or more templates test : test one or more builds with kitchen upload : upload and release one or more builds to Vagrant Cloud + version : prints the version of #{NAME} COMMANDS end @@ -59,6 +61,13 @@ def self.parse(args) exit(0) }, }, + version: { + parser: OptionParser.new {}, + argv: proc { |_opts| + puts Bento::VERSION + exit(0) + }, + }, build: { class: BuildRunner, parser: OptionParser.new do |opts| diff --git a/lib/bento/runner.rb b/lib/bento/runner.rb index f1f170046..9c3331622 100644 --- a/lib/bento/runner.rb +++ b/lib/bento/runner.rb @@ -17,7 +17,7 @@ def initialize(opts) @dry_run = opts.dry_run @metadata_only = opts.metadata_only @debug = opts.debug - @only = opts.only ||= 'parallels-iso.vm,virtualbox-iso.vm,vmware-iso.vm' + @only = opts.only ||= 'parallels-iso.vm,virtualbox-iso.vm,vmware-iso.vm,qemu.vm' @except = opts.except @mirror = opts.mirror @headed = opts.headed ||= false @@ -64,8 +64,8 @@ def build(file) time = Benchmark.measure do cmd.run_command end - if Dir.glob("../../builds/*.box").empty? - banner("Not writing metadata file since no boxes exist") + if Dir.glob("../../builds/#{template.split('-')[0...-1].join('-')}*-#{template.split('-')[-1]}.*.box").empty? + banner('Not writing metadata file since no boxes exist') else write_final_metadata(template, time.real.ceil) end diff --git a/lib/bento/upload.rb b/lib/bento/upload.rb index 56863406b..d9c5699ca 100644 --- a/lib/bento/upload.rb +++ b/lib/bento/upload.rb @@ -46,7 +46,7 @@ def upload_box(md_file) if File.exist?(File.join('builds', prov_data['file'])) puts '' banner("Uploading #{builds_yml['vagrant_cloud_account']}/#{md_data['box_basename']} version:#{md_data['version']} provider:#{prov}...") - upload_cmd = "vagrant cloud publish --architecture #{arch} --no-direct-upload #{builds_yml['vagrant_cloud_account']}/#{md_data['box_basename']} #{md_data['version']} #{prov} builds/#{prov_data['file']} --description '#{box_desc(md_data['box_basename'])}' --short-description '#{box_desc(md_data['box_basename'])}' --version-description '#{ver_desc(md_data)}' --force --release #{public_private_box(md_data['box_basename'])}" + upload_cmd = "vagrant cloud publish --architecture #{arch} #{default_arch(arch)} --no-direct-upload #{builds_yml['vagrant_cloud_account']}/#{md_data['box_basename']} #{md_data['version']} #{prov} builds/#{prov_data['file']} --description '#{box_desc(md_data['box_basename'])}' --short-description '#{box_desc(md_data['box_basename'])}' --version-description '#{ver_desc(md_data)}' --force --release #{public_private_box(md_data['box_basename'])}" shellout(upload_cmd) slug_name = lookup_slug(md_data['name']) @@ -75,11 +75,7 @@ def upload_box(md_file) # def lookup_slug(name) builds_yml['slugs'].each_pair do |slug, match_string| - if name.include?('arm64') - return slug if name.start_with?(match_string) && slug.include?('arm64') - else - return slug if name.start_with?(match_string) && !slug.include?('arm64') - end + return slug if name.start_with?(match_string) end nil @@ -87,21 +83,24 @@ def lookup_slug(name) def public_private_box(name) builds_yml['public'].each do |public| - if name.include?('arm64') || name.include?('aarch64') - return '--no-private' if name.start_with?(public) && public.include?('arm64') - else - return '--no-private' if name.start_with?(public) && !public.include?('arm64') - end + return '--no-private' if name.start_with?(public) + end + '--private' + end + + def default_arch(architecture) + builds_yml['default_architectures'].each do |arch| + return '--default-architecture' if architecture.eql?(arch) end - return '--private' + '--no-default-architecture' end def box_desc(name) - "Vanilla #{name.tr('-', ' ').capitalize} Vagrant box created with Bento by Chef" + "Vanilla #{name.tr('-', ' ').capitalize} Vagrant box created with Bento by Progress Chef" end def slug_desc(name) - "Vanilla #{name.tr('-', ' ').capitalize} Vagrant box created with Bento by Chef. This box will be updated with the latest releases of #{name.tr('-', ' ').capitalize} as they become available" + "Vanilla #{name.tr('-', ' ').capitalize} Vagrant box created with Bento by Progress Chef. This box will be updated with the latest releases of #{name.tr('-', ' ').capitalize} as they become available" end def ver_desc(md_data) @@ -120,6 +119,6 @@ def ver_desc(md_data) tool_versions.sort! tool_versions << "packer: #{md_data['packer']}" - "#{md_data['box_basename'].capitalize.tr('-', ' ')} Vagrant box version #{md_data['version']} created with Bento by Chef. Built with: #{tool_versions.join(', ')}" + "#{md_data['box_basename'].capitalize.tr('-', ' ')} Vagrant box version #{md_data['version']} created with Bento by Progress Chef. Built with: #{tool_versions.join(', ')}" end end diff --git a/lib/bento/version.rb b/lib/bento/version.rb index 40b214786..afc40757d 100644 --- a/lib/bento/version.rb +++ b/lib/bento/version.rb @@ -1,3 +1,3 @@ module Bento - VERSION = '3.2.2'.freeze + VERSION = '4.0.0'.freeze end diff --git a/packer_templates/http/springdalelinux/7ks.cfg b/packer_templates/http/springdalelinux/7ks.cfg deleted file mode 100644 index bef5e9bd7..000000000 --- a/packer_templates/http/springdalelinux/7ks.cfg +++ /dev/null @@ -1,81 +0,0 @@ -install -eula --agreed -url --url="http://springdale.princeton.edu/data/Springdale/7/x86_64/os" -repo --name="Addons" --baseurl=http://springdale.princeton.edu/data/Springdale/7/x86_64/os/Addons -repo --name="Computational" --baseurl=http://springdale.princeton.edu/data/Springdale/7/x86_64/os/Computational -repo --name="Updates" --baseurl=http://springdale.princeton.edu/data/Springdale/7/x86_64/os/Updates -lang en_US.UTF-8 -keyboard us -network --bootproto=dhcp --noipv6 --onboot=on --device=eth0 -rootpw --plaintext vagrant -firewall --disabled -selinux --permissive -timezone UTC -bootloader --timeout=1 --location=mbr --append="net.ifnames=0 biosdevname=0" -text -skipx -zerombr -clearpart --all --initlabel -autopart --type=plain -firstboot --disabled -reboot --eject -user --name=vagrant --plaintext --password vagrant - -%packages --ignoremissing --excludedocs -@core -openssh-clients -sudo -selinux-policy-devel -wget -nfs-utils -net-tools -tar -bzip2 -deltarpm -rsync -dnf-utils -redhat-lsb-core -elfutils-libelf-devel -network-scripts --fprintd-pam --intltool --iwl*-firmware --microcode_ctl -%end - -%post -# sudo -echo 'Defaults:vagrant !requiretty' > /etc/sudoers.d/vagrant -echo '%vagrant ALL=(ALL) NOPASSWD: ALL' >> /etc/sudoers.d/vagrant -chmod 440 /etc/sudoers.d/vagrant - -# Enable hyper-v daemons only if using hyper-v virtualization -if [ $(virt-what) == "hyperv" ]; then -dnf -y install hyperv-daemons cifs-utils -systemctl enable hypervvssd -systemctl enable hypervkvpd -fi - -# Since we disable consistent network naming, we need to make sure the eth0 -# configuration file is in place so it will come up. -# Delete other network configuration first because RHEL/C7 networking will not -# restart successfully if there are configuration files for devices that do not -# exist. -rm -f /etc/sysconfig/network-scripts/ifcfg-e* -cat > /etc/sysconfig/network-scripts/ifcfg-eth0 << _EOF_ -TYPE=Ethernet -PROXY_METHOD=none - BROWSER_ONLY=no - BOOTPROTO=dhcp - DEFROUTE=yes -IPV4_FAILURE_FATAL=no -IPV6INIT=yes -IPV6_AUTOCONF=yes -IPV6_DEFROUTE=yes - IPV6_FAILURE_FATAL=no - IPV6_ADDR_GEN_MODE=stable-privacy - NAME=eth0 -DEVICE=eth0 -ONBOOT=yes -_EOF_ -%end diff --git a/packer_templates/http/springdalelinux/8ks.cfg b/packer_templates/http/springdalelinux/8ks.cfg deleted file mode 100644 index 9209acbaf..000000000 --- a/packer_templates/http/springdalelinux/8ks.cfg +++ /dev/null @@ -1,84 +0,0 @@ -install -url --url="http://springdale.princeton.edu/data/Springdale/8/x86_64/os" -lang en_US.UTF-8 -keyboard us -network --bootproto=dhcp --noipv6 --onboot=on --device=eth0 -rootpw --plaintext vagrant -firewall --disabled -selinux --permissive -timezone UTC -bootloader --timeout=1 --location=mbr --append="net.ifnames=0 biosdevname=0" -text -skipx -zerombr -clearpart --all --initlabel -autopart --nohome --nolvm --noboot -firstboot --disabled -reboot --eject -user --name=vagrant --plaintext --password vagrant - -%packages --ignoremissing --excludedocs --instLangs=en_US.utf8 -# maybe prb needed for vbos guest additions? https://github.com/chef/bento/issues/1345 -# kernel-devel -# gcc -# make -# perl -# elfutils-libelf-devel -# end vbox -# vagrant needs this to copy initial files via scp -openssh-clients -sudo -selinux-policy-devel -wget -nfs-utils -net-tools -tar -bzip2 -deltarpm -rsync -dnf-utils -redhat-lsb-core -elfutils-libelf-devel -network-scripts --fprintd-pam --intltool --iwl*-firmware --microcode_ctl -%end - -%post -# sudo -echo 'Defaults:vagrant !requiretty' > /etc/sudoers.d/vagrant -echo '%vagrant ALL=(ALL) NOPASSWD: ALL' >> /etc/sudoers.d/vagrant -chmod 440 /etc/sudoers.d/vagrant - -# Enable hyper-v daemons only if using hyper-v virtualization -if [ $(virt-what) == "hyperv" ]; then -dnf -y install hyperv-daemons cifs-utils -systemctl enable hypervvssd -systemctl enable hypervkvpd -fi - -# Since we disable consistent network naming, we need to make sure the eth0 -# configuration file is in place so it will come up. -# Delete other network configuration first because RHEL/C7 networking will not -# restart successfully if there are configuration files for devices that do not -# exist. -rm -f /etc/sysconfig/network-scripts/ifcfg-e* -cat > /etc/sysconfig/network-scripts/ifcfg-eth0 << _EOF_ -TYPE=Ethernet -PROXY_METHOD=none - BROWSER_ONLY=no - BOOTPROTO=dhcp - DEFROUTE=yes -IPV4_FAILURE_FATAL=no -IPV6INIT=yes -IPV6_AUTOCONF=yes -IPV6_DEFROUTE=yes - IPV6_FAILURE_FATAL=no - IPV6_ADDR_GEN_MODE=stable-privacy - NAME=eth0 -DEVICE=eth0 -ONBOOT=yes -_EOF_ -%end diff --git a/packer_templates/http/springdalelinux/9ks.cfg b/packer_templates/http/springdalelinux/9ks.cfg deleted file mode 100644 index 8f2523d42..000000000 --- a/packer_templates/http/springdalelinux/9ks.cfg +++ /dev/null @@ -1,82 +0,0 @@ -# Kickstart file for springdalelinux 9 -lang en_US.UTF-8 -keyboard us -network --bootproto=dhcp --noipv6 --onboot=on --device=eth0 -rootpw --plaintext vagrant -firewall --disabled -selinux --permissive -timezone UTC -bootloader --timeout=1 --location=mbr --append="net.ifnames=0 biosdevname=0" -text -skipx -zerombr -clearpart --all --initlabel -autopart --nohome --nolvm --noboot -firstboot --disabled -reboot --eject -user --name=vagrant --plaintext --password vagrant - -url --url="http://springdale.princeton.edu/data/springdale/9/x86_64/os" -repo --name="BaseOS" --baseurl=http://springdale.princeton.edu/data/springdale/9/x86_64/os/BaseOS -repo --name="Updates_BaseOS" --baseurl=http://springdale.princeton.edu/data/springdale/9/x86_64/os/Updates_BaseOS -repo --name="AppStream" --baseurl=http://springdale.princeton.edu/data/springdale/9/x86_64/os/AppStream -repo --name="Updates_AppStream" --baseurl=http://springdale.princeton.edu/data/springdale/9/x86_64/os/Updates_AppStream - -%packages --ignoremissing --excludedocs -@^server-product-environment -openssh-clients -sudo -selinux-policy-devel -wget -nfs-utils -net-tools -tar -bzip2 -deltarpm -rsync -dnf-utils -redhat-lsb-core -elfutils-libelf-devel -network-scripts --fprintd-pam --intltool --iwl*-firmware --microcode_ctl -%end - -%post -# sudo -echo 'Defaults:vagrant !requiretty' > /etc/sudoers.d/vagrant -echo '%vagrant ALL=(ALL) NOPASSWD: ALL' >> /etc/sudoers.d/vagrant -chmod 440 /etc/sudoers.d/vagrant - -# Enable hyper-v daemons only if using hyper-v virtualization -if [ $(virt-what) == "hyperv" ]; then -dnf -y install hyperv-daemons cifs-utils -systemctl enable hypervvssd -systemctl enable hypervkvpd -fi - -# Since we disable consistent network naming, we need to make sure the eth0 -# configuration file is in place so it will come up. -# Delete other network configuration first because RHEL/C7 networking will not -# restart successfully if there are configuration files for devices that do not -# exist. -rm -f /etc/sysconfig/network-scripts/ifcfg-e* -cat > /etc/sysconfig/network-scripts/ifcfg-eth0 << _EOF_ -TYPE=Ethernet -PROXY_METHOD=none - BROWSER_ONLY=no - BOOTPROTO=dhcp - DEFROUTE=yes -IPV4_FAILURE_FATAL=no -IPV6INIT=yes -IPV6_AUTOCONF=yes -IPV6_DEFROUTE=yes - IPV6_FAILURE_FATAL=no - IPV6_ADDR_GEN_MODE=stable-privacy - NAME=eth0 -DEVICE=eth0 -ONBOOT=yes -_EOF_ -%end diff --git a/packer_templates/http/ubuntu/user-data b/packer_templates/http/ubuntu/user-data index 01a91e224..17f05ca0a 100644 --- a/packer_templates/http/ubuntu/user-data +++ b/packer_templates/http/ubuntu/user-data @@ -13,6 +13,6 @@ autoinstall: install-server: yes allow-pw: yes late-commands: - - echo 'vagrant ALL=(ALL) NOPASSWD:ALL' > /target/etc/sudoers.d/vagrant - # Enable hyper-v daemons only if using hyper-v virtualization - - if [ $(virt-what) == "hyperv" ]; then apt-get update && apt-get install -y hyperv-daemons linux-tools-$(uname -r) linux-cloud-tools-$(uname -r) linux-cloud-tools-common cifs-utils && systemctl enable hypervvssd && systemctl enable hypervkvpd && systemctl start hypervvssd && systemctl start hypervkvpd; fi + - echo 'vagrant ALL=(ALL) NOPASSWD:ALL' > /target/etc/sudoers.d/vagrant + # Enable hyper-v daemons only if using hyper-v virtualization + - if [ $(virt-what) == "hyperv" ]; then apt-get update && apt-get install -y hyperv-daemons linux-tools-$(uname -r) linux-cloud-tools-$(uname -r) linux-cloud-tools-common cifs-utils && systemctl enable hypervvssd && systemctl enable hypervkvpd && systemctl start hypervvssd && systemctl start hypervkvpd; fi From 3094137d6b6a1a937d48cb729a4da28790d72fa5 Mon Sep 17 00:00:00 2001 From: Corey Hemminger <hemminger@hotmail.com> Date: Fri, 16 Feb 2024 15:50:05 -0600 Subject: [PATCH 1544/1622] fix metadata basename (#1548) fixed metadata base_boxname updated debian 11 to 11.9 updated debian 12 to 12.5 --- CHANGELOG.md | 9 +- lib/bento/buildmetadata.rb | 2 +- .../debian/debian-11-aarch64.pkrvars.hcl | 4 +- .../debian/debian-11-x86_64.pkrvars.hcl | 4 +- .../debian/debian-12-aarch64.pkrvars.hcl | 6 +- .../debian/debian-12-x86_64.pkrvars.hcl | 6 +- .../windows/windows-10-x86_64.pkrvars.hcl | 1 - .../windows/windows-11-aarch64.pkrvars.hcl | 9 + packer_templates/http/ubuntu/user-data | 2 + packer_templates/pkr-builder.pkr.hcl | 4 +- packer_templates/pkr-sources.pkr.hcl | 40 +- packer_templates/pkr-variables.pkr.hcl | 1 + .../win_answer_files/10/Autounattend.xml | 2 +- .../10/hyperv-gen2/Autounattend.xml | 2 +- .../win_answer_files/11/Autounattend.xml | 2 +- .../11/arm64/Autounattend.xml | 720 ++++++++++++++++++ .../11/hyperv-gen2/Autounattend.xml | 2 +- .../win_answer_files/2016/Autounattend.xml | 2 +- .../2016/hyperv-gen2/Autounattend.xml | 2 +- .../win_answer_files/2019/Autounattend.xml | 2 +- .../2019/hyperv-gen2/Autounattend.xml | 2 +- .../win_answer_files/2022/Autounattend.xml | 2 +- .../2022/hyperv-gen2/Autounattend.xml | 2 +- 23 files changed, 784 insertions(+), 44 deletions(-) create mode 100644 os_pkrvars/windows/windows-11-aarch64.pkrvars.hcl create mode 100644 packer_templates/win_answer_files/11/arm64/Autounattend.xml diff --git a/CHANGELOG.md b/CHANGELOG.md index 0b7ad41a4..a6abc2b66 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -54,7 +54,14 @@ Markdown table generated at <https://www.tablesgenerator.com/markdown_tables#> - Create CD pipeline to build and upload new versions of vagrant boxes once every 3 months with the latest patches - Added ability to configure bento upload of private or public boxes in builds.yml, defaults to private -## [unreleased] (2024-02-05) +## [unreleased] (2024-02-16) + +## [v4.0.1] (2024-02-16) + +- Fix metadata file box_basename +- Updated Debian 11 to 11.9 +- Updated Debian 12 to 12.5 +- Added Windows 11 aarch64 template ## [v4.0.0] (2024-02-05) diff --git a/lib/bento/buildmetadata.rb b/lib/bento/buildmetadata.rb index d343686dc..5b9c61341 100644 --- a/lib/bento/buildmetadata.rb +++ b/lib/bento/buildmetadata.rb @@ -33,7 +33,7 @@ def read attr_reader :template, :build_timestamp, :override_version, :pkr_cmd def box_basename - name.gsub('/', '__').split('-')[0...-1].join('-') + name.gsub('/', '__').split('-').join('-') end def git_revision diff --git a/os_pkrvars/debian/debian-11-aarch64.pkrvars.hcl b/os_pkrvars/debian/debian-11-aarch64.pkrvars.hcl index ee5e7dedd..88909284d 100644 --- a/os_pkrvars/debian/debian-11-aarch64.pkrvars.hcl +++ b/os_pkrvars/debian/debian-11-aarch64.pkrvars.hcl @@ -1,7 +1,7 @@ os_name = "debian" -os_version = "11.8" +os_version = "11.9" os_arch = "aarch64" -iso_url = "https://cdimage.debian.org/cdimage/archive/latest-oldstable/arm64/iso-dvd/debian-11.8.0-arm64-DVD-1.iso" +iso_url = "https://cdimage.debian.org/cdimage/archive/latest-oldstable/arm64/iso-dvd/debian-11.9.0-arm64-DVD-1.iso" iso_checksum = "file:https://cdimage.debian.org/cdimage/archive/latest-oldstable/arm64/iso-dvd/SHA256SUMS" parallels_guest_os_type = "debian" vbox_guest_os_type = "Debian_64" diff --git a/os_pkrvars/debian/debian-11-x86_64.pkrvars.hcl b/os_pkrvars/debian/debian-11-x86_64.pkrvars.hcl index 9107b7f2e..e60ff9fb2 100644 --- a/os_pkrvars/debian/debian-11-x86_64.pkrvars.hcl +++ b/os_pkrvars/debian/debian-11-x86_64.pkrvars.hcl @@ -1,7 +1,7 @@ os_name = "debian" -os_version = "11.8" +os_version = "11.9" os_arch = "x86_64" -iso_url = "https://cdimage.debian.org/cdimage/archive/latest-oldstable/amd64/iso-dvd/debian-11.8.0-amd64-DVD-1.iso" +iso_url = "https://cdimage.debian.org/cdimage/archive/latest-oldstable/amd64/iso-dvd/debian-11.9.0-amd64-DVD-1.iso" iso_checksum = "file:https://cdimage.debian.org/cdimage/archive/latest-oldstable/amd64/iso-dvd/SHA256SUMS" parallels_guest_os_type = "debian" vbox_guest_os_type = "Debian_64" diff --git a/os_pkrvars/debian/debian-12-aarch64.pkrvars.hcl b/os_pkrvars/debian/debian-12-aarch64.pkrvars.hcl index aa3acc355..1fcfb21ac 100644 --- a/os_pkrvars/debian/debian-12-aarch64.pkrvars.hcl +++ b/os_pkrvars/debian/debian-12-aarch64.pkrvars.hcl @@ -1,8 +1,8 @@ os_name = "debian" -os_version = "12.4" +os_version = "12.5" os_arch = "aarch64" -iso_url = "https://cdimage.debian.org/cdimage/release/12.4.0/arm64/iso-dvd/debian-12.4.0-arm64-DVD-1.iso" -iso_checksum = "file:https://cdimage.debian.org/cdimage/release/12.4.0/arm64/iso-dvd/SHA256SUMS" +iso_url = "https://cdimage.debian.org/cdimage/release/12.5.0/arm64/iso-dvd/debian-12.5.0-arm64-DVD-1.iso" +iso_checksum = "file:https://cdimage.debian.org/cdimage/release/12.5.0/arm64/iso-dvd/SHA256SUMS" parallels_guest_os_type = "debian" vbox_guest_os_type = "Debian_64" vmware_guest_os_type = "arm-debian-64" diff --git a/os_pkrvars/debian/debian-12-x86_64.pkrvars.hcl b/os_pkrvars/debian/debian-12-x86_64.pkrvars.hcl index 817f0a3c3..6ad4b3f04 100644 --- a/os_pkrvars/debian/debian-12-x86_64.pkrvars.hcl +++ b/os_pkrvars/debian/debian-12-x86_64.pkrvars.hcl @@ -1,8 +1,8 @@ os_name = "debian" -os_version = "12.4" +os_version = "12.5" os_arch = "x86_64" -iso_url = "https://cdimage.debian.org/cdimage/release/12.4.0/amd64/iso-dvd/debian-12.4.0-amd64-DVD-1.iso" -iso_checksum = "file:https://cdimage.debian.org/cdimage/release/12.4.0/amd64/iso-dvd/SHA256SUMS" +iso_url = "https://cdimage.debian.org/cdimage/release/12.5.0/amd64/iso-dvd/debian-12.5.0-amd64-DVD-1.iso" +iso_checksum = "file:https://cdimage.debian.org/cdimage/release/12.5.0/amd64/iso-dvd/SHA256SUMS" parallels_guest_os_type = "debian" vbox_guest_os_type = "Debian_64" vmware_guest_os_type = "debian-64" diff --git a/os_pkrvars/windows/windows-10-x86_64.pkrvars.hcl b/os_pkrvars/windows/windows-10-x86_64.pkrvars.hcl index ad283fb4e..0036e7c10 100644 --- a/os_pkrvars/windows/windows-10-x86_64.pkrvars.hcl +++ b/os_pkrvars/windows/windows-10-x86_64.pkrvars.hcl @@ -7,4 +7,3 @@ iso_checksum = "ef7312733a9f5d7d51cfa04ac497671995674ca5e1058d5164d60 parallels_guest_os_type = "win-10" vbox_guest_os_type = "Windows10_64" vmware_guest_os_type = "windows9srv-64" - diff --git a/os_pkrvars/windows/windows-11-aarch64.pkrvars.hcl b/os_pkrvars/windows/windows-11-aarch64.pkrvars.hcl new file mode 100644 index 000000000..876c78c06 --- /dev/null +++ b/os_pkrvars/windows/windows-11-aarch64.pkrvars.hcl @@ -0,0 +1,9 @@ +os_name = "windows" +os_version = "11" +os_arch = "aarch64" +is_windows = true +iso_url = "../../builds/iso/WIN11_PROFESSIONAL_ARM64_EN-US.ISO" +iso_checksum = "90d4f9b5377e3c41784696ad0bb021b690e4f981f8e278fad62e07726f86bd77" +parallels_guest_os_type = "win-11" +vbox_guest_os_type = "Windows11_64" +vmware_guest_os_type = "windows9srv-64" diff --git a/packer_templates/http/ubuntu/user-data b/packer_templates/http/ubuntu/user-data index 17f05ca0a..24598df56 100644 --- a/packer_templates/http/ubuntu/user-data +++ b/packer_templates/http/ubuntu/user-data @@ -13,6 +13,8 @@ autoinstall: install-server: yes allow-pw: yes late-commands: + - sed -i 's/^#*\(send dhcp-client-identifier\).*$/\1 = hardware;/' /target/etc/dhcp/dhclient.conf + - 'sed -i "s/dhcp4: true/&\n dhcp-identifier: mac/" /target/etc/netplan/00-installer-config.yaml' - echo 'vagrant ALL=(ALL) NOPASSWD:ALL' > /target/etc/sudoers.d/vagrant # Enable hyper-v daemons only if using hyper-v virtualization - if [ $(virt-what) == "hyperv" ]; then apt-get update && apt-get install -y hyperv-daemons linux-tools-$(uname -r) linux-cloud-tools-$(uname -r) linux-cloud-tools-common cifs-utils && systemctl enable hypervvssd && systemctl enable hypervkvpd && systemctl start hypervvssd && systemctl start hypervkvpd; fi diff --git a/packer_templates/pkr-builder.pkr.hcl b/packer_templates/pkr-builder.pkr.hcl index 799b849a3..4604def93 100644 --- a/packer_templates/pkr-builder.pkr.hcl +++ b/packer_templates/pkr-builder.pkr.hcl @@ -117,9 +117,7 @@ locals { "${var.os_name}-${substr(var.os_version, 0, 1)}" == "amazonlinux-2" || "${var.os_name}-${substr(var.os_version, 0, 1)}" == "centos-7" || "${var.os_name}-${substr(var.os_version, 0, 1)}" == "oracle-7" || - "${var.os_name}-${substr(var.os_version, 0, 1)}" == "rhel-7" || - "${var.os_name}-${substr(var.os_version, 0, 1)}" == "scientificlinux-7" || - "${var.os_name}-${substr(var.os_version, 0, 1)}" == "springdalelinux-7" ? [ + "${var.os_name}-${substr(var.os_version, 0, 1)}" == "rhel-7" ? [ "${path.root}/scripts/rhel/update_yum.sh", "${path.root}/scripts/_common/motd.sh", "${path.root}/scripts/_common/sshd.sh", diff --git a/packer_templates/pkr-sources.pkr.hcl b/packer_templates/pkr-sources.pkr.hcl index 9dafa9856..25f92d8ee 100644 --- a/packer_templates/pkr-sources.pkr.hcl +++ b/packer_templates/pkr-sources.pkr.hcl @@ -2,10 +2,10 @@ locals { # Source block provider specific # hyperv-iso hyperv_enable_dynamic_memory = var.hyperv_enable_dynamic_memory == null ? ( - var.hyperv_generation == 2 && var.is_windows ? "true" : null + var.hyperv_generation == 2 && var.is_windows ? true : false ) : var.hyperv_enable_dynamic_memory hyperv_enable_secure_boot = var.hyperv_enable_secure_boot == null ? ( - var.hyperv_generation == 2 && var.is_windows ? false : null + var.hyperv_generation == 2 && var.is_windows ? true : false ) : var.hyperv_enable_secure_boot # parallels-iso @@ -21,11 +21,10 @@ locals { ) : var.parallels_tools_mode parallels_prlctl = var.parallels_prlctl == null ? ( var.is_windows ? [ - ["set", "{{ .Name }}", "--efi-boot", "off"] - ] : [ - ["set", "{{ .Name }}", "--3d-accelerate", "off"], - ["set", "{{ .Name }}", "--videosize", "16"] - ] + ["set", "{{ .Name }}", "--efi-boot", "off"], + ["set", "{{ .Name }}", "--efi-secure-boot", "off"], + ["set", "{{ .Name }}", "--device-add", "cdrom", "--image", "${path.root}/../builds/iso/unattended.iso", "--connect"], + ] : null ) : var.parallels_prlctl # qemu @@ -35,7 +34,7 @@ locals { ) : var.qemu_machine_type qemuargs = var.qemuargs == null ? ( var.is_windows ? [ - ["-drive", "file=${path.root}/win_answer_files/virtio-win.iso,media=cdrom,index=3"], + ["-drive", "file=${path.root}/../builds/iso/virtio-win.iso,media=cdrom,index=3"], ["-drive", "file=${path.root}/../builds/packer-${var.os_name}-${var.os_version}-${var.os_arch}-qemu/{{ .Name }},if=virtio,cache=writeback,discard=ignore,format=qcow2,index=1"], ] : ( var.os_arch == "aarch64" ? [ @@ -76,22 +75,26 @@ locals { var.is_windows ? ( var.hyperv_generation == 2 ? [ "${path.root}/win_answer_files/${var.os_version}/hyperv-gen2/Autounattend.xml", - ] : [ - "${path.root}/win_answer_files/${var.os_version}/Autounattend.xml", - ] + ] : ( + var.os_arch == "x86_64" ? [ + "${path.root}/win_answer_files/${var.os_version}/Autounattend.xml", + ] : [ + "${path.root}/win_answer_files/${var.os_version}/arm64/Autounattend.xml", + ] + ) ) : null ) : var.cd_files communicator = var.communicator == null ? ( var.is_windows ? "winrm" : "ssh" ) : var.communicator floppy_files = var.floppy_files == null ? ( - var.is_windows ? [ - "${path.root}/win_answer_files/${var.os_version}/Autounattend.xml", - ] : ( - var.os_name == "springdalelinux" ? [ - "${path.root}/http/rhel/${substr(var.os_version, 0, 1)}ks.cfg" - ] : null - ) + var.is_windows ? ( + var.os_arch == "x86_64" ? [ + "${path.root}/win_answer_files/${var.os_version}/Autounattend.xml", + ] : [ + "${path.root}/win_answer_files/${var.os_version}/arm64/Autounattend.xml", + ] + ) : null ) : var.floppy_files http_directory = var.http_directory == null ? "${path.root}/http" : var.http_directory memory = var.memory == null ? (var.is_windows ? 4096 : 2048) : var.memory @@ -203,6 +206,7 @@ source "qemu" "vm" { } source "virtualbox-iso" "vm" { # Virtualbox specific options + #firmware = "efi" gfx_controller = local.vbox_gfx_controller gfx_vram_size = local.vbox_gfx_vram_size guest_additions_path = var.vbox_guest_additions_path diff --git a/packer_templates/pkr-variables.pkr.hcl b/packer_templates/pkr-variables.pkr.hcl index 1ba744623..049ca0d6d 100644 --- a/packer_templates/pkr-variables.pkr.hcl +++ b/packer_templates/pkr-variables.pkr.hcl @@ -225,6 +225,7 @@ variable "vmware_version" { variable "vmware_vmx_data" { type = map(string) default = { + # "firmware" = "efi" "cpuid.coresPerSocket" = "2" "ethernet0.pciSlotNumber" = "32" "svga.autodetect" = true diff --git a/packer_templates/win_answer_files/10/Autounattend.xml b/packer_templates/win_answer_files/10/Autounattend.xml index e54d1ce35..9686440fb 100644 --- a/packer_templates/win_answer_files/10/Autounattend.xml +++ b/packer_templates/win_answer_files/10/Autounattend.xml @@ -106,7 +106,7 @@ </ProductKey> <AcceptEula>true</AcceptEula> <FullName>Vagrant</FullName> - <Organization>Bento by Chef Software, Inc.</Organization> + <Organization>Bento by Progress Chef</Organization> </UserData> <DynamicUpdate> <Enable>false</Enable> diff --git a/packer_templates/win_answer_files/10/hyperv-gen2/Autounattend.xml b/packer_templates/win_answer_files/10/hyperv-gen2/Autounattend.xml index 4465d46ea..b56757830 100644 --- a/packer_templates/win_answer_files/10/hyperv-gen2/Autounattend.xml +++ b/packer_templates/win_answer_files/10/hyperv-gen2/Autounattend.xml @@ -125,7 +125,7 @@ </ProductKey> <AcceptEula>true</AcceptEula> <FullName>Vagrant</FullName> - <Organization>Bento by Chef Software, Inc.</Organization> + <Organization>Bento by Progress Chef</Organization> </UserData> <DynamicUpdate> <Enable>false</Enable> diff --git a/packer_templates/win_answer_files/11/Autounattend.xml b/packer_templates/win_answer_files/11/Autounattend.xml index dad87a233..5a8171159 100644 --- a/packer_templates/win_answer_files/11/Autounattend.xml +++ b/packer_templates/win_answer_files/11/Autounattend.xml @@ -116,7 +116,7 @@ </ProductKey> <AcceptEula>true</AcceptEula> <FullName>Vagrant</FullName> - <Organization>Bento by Chef Software, Inc.</Organization> + <Organization>Bento by Progress Chef.</Organization> </UserData> <DynamicUpdate> <Enable>false</Enable> diff --git a/packer_templates/win_answer_files/11/arm64/Autounattend.xml b/packer_templates/win_answer_files/11/arm64/Autounattend.xml new file mode 100644 index 000000000..ae51928dd --- /dev/null +++ b/packer_templates/win_answer_files/11/arm64/Autounattend.xml @@ -0,0 +1,720 @@ +<?xml version="1.0" encoding="utf-8"?> +<unattend xmlns="urn:schemas-microsoft-com:unattend" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State"> + <!--https://schneegans.de/windows/unattend-generator/?LanguageMode=Unattended&UILanguage=en-US&UserLocale=en-US&KeyboardLayout=0409%3A00000409&ProcessorArchitecture=arm64&BypassRequirementsCheck=true&ComputerNameMode=Custom&ComputerName=Vagrant&TimeZoneMode=Implicit&PartitionMode=Unattended&PartitionLayout=GPT&EspSize=100&RecoveryMode=None&WindowsEditionMode=Unattended&WindowsEdition=pro&UserAccountMode=Unattended&AccountName0=vagrant&AccountPassword0=vagrant&AccountGroup0=Administrators&AccountName1=&AccountName2=&AccountName3=&AccountName4=&AutoLogonMode=Own&LockoutMode=Disabled&DisableSystemRestore=true&EnableRemoteDesktop=true&AllowPowerShellScripts=true&DisableAppSuggestions=true&DisableWidgets=true&WifiMode=Skip&ExpressSettings=DisableAll&Remove3DViewer=true&RemoveCalculator=true&RemoveCamera=true&RemoveClipchamp=true&RemoveClock=true&RemoveCortana=true&RemoveDevHome=true&RemoveFeedbackHub=true&RemoveGetHelp=true&RemoveInternetExplorer=true&RemoveMaps=true&RemoveMathInputPanel=true&RemoveZuneVideo=true&RemoveNews=true&RemoveNotepad=true&RemoveOffice365=true&RemoveOneDrive=true&RemoveOneNote=true&RemoveOutlook=true&RemovePaint=true&RemovePaint3D=true&RemovePeople=true&RemovePhotos=true&RemovePowerAutomate=true&RemoveQuickAssist=true&RemoveSkype=true&RemoveSnippingTool=true&RemoveSolitaire=true&RemoveStepsRecorder=true&RemoveStickyNotes=true&RemoveTeams=true&RemoveGetStarted=true&RemoveToDo=true&RemoveVoiceRecorder=true&RemoveWeather=true&RemoveWindowsMediaPlayer=true&RemoveZuneMusic=true&RemoveXboxApps=true&RemoveYourPhone=true&WdacMode=Skip--> + <settings pass="windowsPE"> + <component name="Microsoft-Windows-PnpCustomizationsWinPE" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" processorArchitecture="arm64"> + <!-- + This makes the VirtIO drivers available to Windows, assuming that + the VirtIO driver disk at https://fedorapeople.org/groups/virt/virtio-win/direct-downloads/stable-virtio/virtio-win.iso + (see https://docs.fedoraproject.org/en-US/quick-docs/creating-windows-virtual-machines-using-virtio-drivers/index.html#virtio-win-direct-downloads) + is available as drive F: + --> + <DriverPaths> + <PathAndCredentials wcm:action="add" wcm:keyValue="2"> + <Path>F:\drivers\viostor\w11\ARM64</Path> + </PathAndCredentials> + <PathAndCredentials wcm:action="add" wcm:keyValue="3"> + <Path>F:\drivers\NetKVM\w11\ARM64</Path> + </PathAndCredentials> + <PathAndCredentials wcm:action="add" wcm:keyValue="4"> + <Path>F:\drivers\Balloon\w11\ARM64</Path> + </PathAndCredentials> + <PathAndCredentials wcm:action="add" wcm:keyValue="5"> + <Path>F:\drivers\pvpanic\w11\ARM64</Path> + </PathAndCredentials> + <PathAndCredentials wcm:action="add" wcm:keyValue="8"> + <Path>F:\drivers\vioinput\w11\ARM64</Path> + </PathAndCredentials> + <PathAndCredentials wcm:action="add" wcm:keyValue="9"> + <Path>F:\drivers\viorng\w11\ARM64</Path> + </PathAndCredentials> + <PathAndCredentials wcm:action="add" wcm:keyValue="10"> + <Path>F:\drivers\vioscsi\w11\ARM64</Path> + </PathAndCredentials> + <PathAndCredentials wcm:action="add" wcm:keyValue="11"> + <Path>F:\drivers\vioserial\w11\ARM64</Path> + </PathAndCredentials> + </DriverPaths> + </component> + <component name="Microsoft-Windows-International-Core-WinPE" processorArchitecture="arm64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> + <SetupUILanguage> + <UILanguage>en-US</UILanguage> + </SetupUILanguage> + <SystemLocale>en-US</SystemLocale> + <UILanguage>en-US</UILanguage> + <UserLocale>en-US</UserLocale> + </component> + <component name="Microsoft-Windows-Setup" processorArchitecture="arm64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> + <ImageInstall> + <OSImage> + <InstallFrom> + <MetaData wcm:action="add"> + <Key>/IMAGE/NAME</Key> + <Value>Windows 11 Professional</Value> + </MetaData> + </InstallFrom> + <InstallTo> + <DiskID>0</DiskID> + <PartitionID>3</PartitionID> + </InstallTo> + </OSImage> + </ImageInstall> + <UserData> + <ProductKey> + <Key>VK7JG-NPHTM-C97JM-9MPGT-3V66T</Key> + </ProductKey> + <AcceptEula>true</AcceptEula> + </UserData> + <RunSynchronous> + <RunSynchronousCommand wcm:action="add"> + <Order>1</Order> + <Path>cmd.exe /c "&gt;&gt;"X:\diskpart.txt" echo SELECT DISK=0"</Path> + </RunSynchronousCommand> + <RunSynchronousCommand wcm:action="add"> + <Order>2</Order> + <Path>cmd.exe /c "&gt;&gt;"X:\diskpart.txt" echo CLEAN"</Path> + </RunSynchronousCommand> + <RunSynchronousCommand wcm:action="add"> + <Order>3</Order> + <Path>cmd.exe /c "&gt;&gt;"X:\diskpart.txt" echo CONVERT GPT"</Path> + </RunSynchronousCommand> + <RunSynchronousCommand wcm:action="add"> + <Order>4</Order> + <Path>cmd.exe /c "&gt;&gt;"X:\diskpart.txt" echo CREATE PARTITION EFI SIZE=100"</Path> + </RunSynchronousCommand> + <RunSynchronousCommand wcm:action="add"> + <Order>5</Order> + <Path>cmd.exe /c "&gt;&gt;"X:\diskpart.txt" echo FORMAT QUICK FS=FAT32 LABEL="System""</Path> + </RunSynchronousCommand> + <RunSynchronousCommand wcm:action="add"> + <Order>6</Order> + <Path>cmd.exe /c "&gt;&gt;"X:\diskpart.txt" echo CREATE PARTITION MSR SIZE=16"</Path> + </RunSynchronousCommand> + <RunSynchronousCommand wcm:action="add"> + <Order>7</Order> + <Path>cmd.exe /c "&gt;&gt;"X:\diskpart.txt" echo CREATE PARTITION PRIMARY"</Path> + </RunSynchronousCommand> + <RunSynchronousCommand wcm:action="add"> + <Order>8</Order> + <Path>cmd.exe /c "&gt;&gt;"X:\diskpart.txt" echo FORMAT QUICK FS=NTFS LABEL="Windows""</Path> + </RunSynchronousCommand> + <RunSynchronousCommand wcm:action="add"> + <Order>9</Order> + <Path>cmd.exe /c "&gt;&gt;"X:\diskpart.log" diskpart.exe /s "X:\diskpart.txt""</Path> + </RunSynchronousCommand> + <RunSynchronousCommand wcm:action="add"> + <Order>10</Order> + <Path>reg.exe add "HKLM\SYSTEM\Setup\LabConfig" /v BypassTPMCheck /t REG_DWORD /d 1 /f</Path> + </RunSynchronousCommand> + <RunSynchronousCommand wcm:action="add"> + <Order>11</Order> + <Path>reg.exe add "HKLM\SYSTEM\Setup\LabConfig" /v BypassSecureBootCheck /t REG_DWORD /d 1 /f</Path> + </RunSynchronousCommand> + <RunSynchronousCommand wcm:action="add"> + <Order>12</Order> + <Path>reg.exe add "HKLM\SYSTEM\Setup\LabConfig" /v BypassStorageCheck /t REG_DWORD /d 1 /f</Path> + </RunSynchronousCommand> + <RunSynchronousCommand wcm:action="add"> + <Order>13</Order> + <Path>reg.exe add "HKLM\SYSTEM\Setup\LabConfig" /v BypassCPUCheck /t REG_DWORD /d 1 /f</Path> + </RunSynchronousCommand> + <RunSynchronousCommand wcm:action="add"> + <Order>14</Order> + <Path>reg.exe add "HKLM\SYSTEM\Setup\LabConfig" /v BypassRAMCheck /t REG_DWORD /d 1 /f</Path> + </RunSynchronousCommand> + <RunSynchronousCommand wcm:action="add"> + <Order>15</Order> + <Path>reg.exe add "HKLM\SYSTEM\Setup\LabConfig" /v BypassDiskCheck /t REG_DWORD /d 1 /f</Path> + </RunSynchronousCommand> + </RunSynchronous> + </component> + </settings> + <settings pass="generalize"> + <component name="Microsoft-Windows-Security-SPP" processorArchitecture="arm64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> + <SkipRearm>1</SkipRearm> + </component> + <component name="Microsoft-Windows-PnpSysprep" processorArchitecture="arm64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> + <PersistAllDeviceInstalls>false</PersistAllDeviceInstalls> + <DoNotCleanUpNonPresentDevices>false</DoNotCleanUpNonPresentDevices> + </component> + </settings> + <settings pass="specialize"> + <component name="Microsoft-Windows-SystemRestore-Main" processorArchitecture="arm64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> + <DisableSR>1</DisableSR> + </component> + <component name="Microsoft-Windows-SystemSettingsThreshold" processorArchitecture="arm64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> + <DisplayNetworkSelection>false</DisplayNetworkSelection> + </component> + <component name="Networking-MPSSVC-Svc" processorArchitecture="arm64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> + <FirewallGroups> + <FirewallGroup wcm:action="add" wcm:keyValue="WindowsRemoteManagement"> + <Active>true</Active> + <Group>Windows Remote Management</Group> + <Profile>all</Profile> + </FirewallGroup> + <FirewallGroup wcm:action="add" wcm:keyValue="RemoteAdministration"> + <Active>true</Active> + <Group>Remote Administration</Group> + <Profile>all</Profile> + </FirewallGroup> + </FirewallGroups> + </component> + <component name="Microsoft-Windows-SQMApi" processorArchitecture="arm64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> + <CEIPEnabled>0</CEIPEnabled> + </component> + <component name="Microsoft-Windows-Security-SPP-UX" processorArchitecture="arm64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> + <SkipAutoActivation>true</SkipAutoActivation> + </component> + <component name="Microsoft-Windows-Deployment" processorArchitecture="arm64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> + <RunSynchronous> + <RunSynchronousCommand wcm:action="add"> + <Order>1</Order> + <Path>ReAgentc.exe /disable</Path> + </RunSynchronousCommand> + <RunSynchronousCommand wcm:action="add"> + <Order>2</Order> + <Path>cmd.exe /c "del /a /f "C:\Windows\System32\Recovery\Winre.wim""</Path> + </RunSynchronousCommand> + <RunSynchronousCommand wcm:action="add"> + <Order>3</Order> + <Path>cmd.exe /c "&gt;&gt;"%TEMP%\remove-packages.txt" echo Microsoft.Microsoft3DViewer"</Path> + </RunSynchronousCommand> + <RunSynchronousCommand wcm:action="add"> + <Order>4</Order> + <Path>cmd.exe /c "&gt;&gt;"%TEMP%\remove-packages.txt" echo Microsoft.WindowsCalculator"</Path> + </RunSynchronousCommand> + <RunSynchronousCommand wcm:action="add"> + <Order>5</Order> + <Path>cmd.exe /c "&gt;&gt;"%TEMP%\remove-packages.txt" echo Microsoft.WindowsCamera"</Path> + </RunSynchronousCommand> + <RunSynchronousCommand wcm:action="add"> + <Order>6</Order> + <Path>cmd.exe /c "&gt;&gt;"%TEMP%\remove-packages.txt" echo Clipchamp.Clipchamp"</Path> + </RunSynchronousCommand> + <RunSynchronousCommand wcm:action="add"> + <Order>7</Order> + <Path>cmd.exe /c "&gt;&gt;"%TEMP%\remove-packages.txt" echo Microsoft.WindowsAlarms"</Path> + </RunSynchronousCommand> + <RunSynchronousCommand wcm:action="add"> + <Order>8</Order> + <Path>cmd.exe /c "&gt;&gt;"%TEMP%\remove-packages.txt" echo Microsoft.549981C3F5F10"</Path> + </RunSynchronousCommand> + <RunSynchronousCommand wcm:action="add"> + <Order>9</Order> + <Path>reg.exe delete "HKLM\SOFTWARE\Microsoft\WindowsUpdate\Orchestrator\UScheduler_Oobe\DevHomeUpdate" /f</Path> + </RunSynchronousCommand> + <RunSynchronousCommand wcm:action="add"> + <Order>10</Order> + <Path>cmd.exe /c "&gt;&gt;"%TEMP%\remove-packages.txt" echo Microsoft.WindowsFeedbackHub"</Path> + </RunSynchronousCommand> + <RunSynchronousCommand wcm:action="add"> + <Order>11</Order> + <Path>cmd.exe /c "&gt;&gt;"%TEMP%\remove-packages.txt" echo Microsoft.GetHelp"</Path> + </RunSynchronousCommand> + <RunSynchronousCommand wcm:action="add"> + <Order>12</Order> + <Path>cmd.exe /c "&gt;&gt;"%TEMP%\remove-caps.txt" echo Browser.InternetExplorer"</Path> + </RunSynchronousCommand> + <RunSynchronousCommand wcm:action="add"> + <Order>13</Order> + <Path>cmd.exe /c "&gt;&gt;"%TEMP%\remove-packages.txt" echo Microsoft.WindowsMaps"</Path> + </RunSynchronousCommand> + <RunSynchronousCommand wcm:action="add"> + <Order>14</Order> + <Path>cmd.exe /c "&gt;&gt;"%TEMP%\remove-caps.txt" echo MathRecognizer"</Path> + </RunSynchronousCommand> + <RunSynchronousCommand wcm:action="add"> + <Order>15</Order> + <Path>cmd.exe /c "&gt;&gt;"%TEMP%\remove-packages.txt" echo Microsoft.ZuneVideo"</Path> + </RunSynchronousCommand> + <RunSynchronousCommand wcm:action="add"> + <Order>16</Order> + <Path>cmd.exe /c "&gt;&gt;"%TEMP%\remove-packages.txt" echo Microsoft.BingNews"</Path> + </RunSynchronousCommand> + <RunSynchronousCommand wcm:action="add"> + <Order>17</Order> + <Path>cmd.exe /c "&gt;&gt;"%TEMP%\remove-packages.txt" echo Microsoft.WindowsNotepad"</Path> + </RunSynchronousCommand> + <RunSynchronousCommand wcm:action="add"> + <Order>18</Order> + <Path>reg.exe load "HKU\mount" "C:\Users\Default\NTUSER.DAT"</Path> + </RunSynchronousCommand> + <RunSynchronousCommand wcm:action="add"> + <Order>19</Order> + <Path>reg.exe add "HKU\mount\Software\Microsoft\Notepad" /v ShowStoreBanner /t REG_DWORD /d 0 /f</Path> + </RunSynchronousCommand> + <RunSynchronousCommand wcm:action="add"> + <Order>20</Order> + <Path>reg.exe unload "HKU\mount"</Path> + </RunSynchronousCommand> + <RunSynchronousCommand wcm:action="add"> + <Order>21</Order> + <Path>cmd.exe /c "&gt;&gt;"%TEMP%\remove-packages.txt" echo Microsoft.MicrosoftOfficeHub"</Path> + </RunSynchronousCommand> + <RunSynchronousCommand wcm:action="add"> + <Order>22</Order> + <Path>cmd.exe /c "del "C:\Users\Default\AppData\Roaming\Microsoft\Windows\Start Menu\Programs\OneDrive.lnk""</Path> + </RunSynchronousCommand> + <RunSynchronousCommand wcm:action="add"> + <Order>23</Order> + <Path>cmd.exe /c "del "C:\Windows\System32\OneDriveSetup.exe""</Path> + </RunSynchronousCommand> + <RunSynchronousCommand wcm:action="add"> + <Order>24</Order> + <Path>cmd.exe /c "del "C:\Windows\SysWOW64\OneDriveSetup.exe""</Path> + </RunSynchronousCommand> + <RunSynchronousCommand wcm:action="add"> + <Order>25</Order> + <Path>reg.exe load "HKU\mount" "C:\Users\Default\NTUSER.DAT"</Path> + </RunSynchronousCommand> + <RunSynchronousCommand wcm:action="add"> + <Order>26</Order> + <Path>reg.exe delete "HKU\mount\Software\Microsoft\Windows\CurrentVersion\Run" /v OneDriveSetup /f</Path> + </RunSynchronousCommand> + <RunSynchronousCommand wcm:action="add"> + <Order>27</Order> + <Path>reg.exe unload "HKU\mount"</Path> + </RunSynchronousCommand> + <RunSynchronousCommand wcm:action="add"> + <Order>28</Order> + <Path>cmd.exe /c "&gt;&gt;"%TEMP%\remove-packages.txt" echo Microsoft.Office.OneNote"</Path> + </RunSynchronousCommand> + <RunSynchronousCommand wcm:action="add"> + <Order>29</Order> + <Path>reg.exe delete "HKLM\SOFTWARE\Microsoft\WindowsUpdate\Orchestrator\UScheduler_Oobe\OutlookUpdate" /f</Path> + </RunSynchronousCommand> + <RunSynchronousCommand wcm:action="add"> + <Order>30</Order> + <Path>cmd.exe /c "&gt;&gt;"%TEMP%\remove-caps.txt" echo Microsoft.Windows.MSPaint"</Path> + </RunSynchronousCommand> + <RunSynchronousCommand wcm:action="add"> + <Order>31</Order> + <Path>cmd.exe /c "&gt;&gt;"%TEMP%\remove-packages.txt" echo Microsoft.Paint"</Path> + </RunSynchronousCommand> + <RunSynchronousCommand wcm:action="add"> + <Order>32</Order> + <Path>cmd.exe /c "&gt;&gt;"%TEMP%\remove-packages.txt" echo Microsoft.MSPaint"</Path> + </RunSynchronousCommand> + <RunSynchronousCommand wcm:action="add"> + <Order>33</Order> + <Path>cmd.exe /c "&gt;&gt;"%TEMP%\remove-packages.txt" echo Microsoft.People"</Path> + </RunSynchronousCommand> + <RunSynchronousCommand wcm:action="add"> + <Order>34</Order> + <Path>cmd.exe /c "&gt;&gt;"%TEMP%\remove-packages.txt" echo Microsoft.Windows.Photos"</Path> + </RunSynchronousCommand> + <RunSynchronousCommand wcm:action="add"> + <Order>35</Order> + <Path>cmd.exe /c "&gt;&gt;"%TEMP%\remove-packages.txt" echo Microsoft.PowerAutomateDesktop"</Path> + </RunSynchronousCommand> + <RunSynchronousCommand wcm:action="add"> + <Order>36</Order> + <Path>cmd.exe /c "&gt;&gt;"%TEMP%\remove-caps.txt" echo App.Support.QuickAssist"</Path> + </RunSynchronousCommand> + <RunSynchronousCommand wcm:action="add"> + <Order>37</Order> + <Path>cmd.exe /c "&gt;&gt;"%TEMP%\remove-packages.txt" echo MicrosoftCorporationII.QuickAssist"</Path> + </RunSynchronousCommand> + <RunSynchronousCommand wcm:action="add"> + <Order>38</Order> + <Path>cmd.exe /c "&gt;&gt;"%TEMP%\remove-packages.txt" echo Microsoft.SkypeApp"</Path> + </RunSynchronousCommand> + <RunSynchronousCommand wcm:action="add"> + <Order>39</Order> + <Path>cmd.exe /c "&gt;&gt;"%TEMP%\remove-packages.txt" echo Microsoft.ScreenSketch"</Path> + </RunSynchronousCommand> + <RunSynchronousCommand wcm:action="add"> + <Order>40</Order> + <Path>cmd.exe /c "&gt;&gt;"%TEMP%\remove-packages.txt" echo Microsoft.MicrosoftSolitaireCollection"</Path> + </RunSynchronousCommand> + <RunSynchronousCommand wcm:action="add"> + <Order>41</Order> + <Path>cmd.exe /c "&gt;&gt;"%TEMP%\remove-caps.txt" echo App.StepsRecorder"</Path> + </RunSynchronousCommand> + <RunSynchronousCommand wcm:action="add"> + <Order>42</Order> + <Path>cmd.exe /c "&gt;&gt;"%TEMP%\remove-packages.txt" echo Microsoft.MicrosoftStickyNotes"</Path> + </RunSynchronousCommand> + <RunSynchronousCommand wcm:action="add"> + <Order>43</Order> + <Path>reg.exe add "HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Communications" /v ConfigureChatAutoInstall /t REG_DWORD /d 0 /f</Path> + </RunSynchronousCommand> + <RunSynchronousCommand wcm:action="add"> + <Order>44</Order> + <Path>cmd.exe /c "&gt;&gt;"%TEMP%\remove-packages.txt" echo Microsoft.Getstarted"</Path> + </RunSynchronousCommand> + <RunSynchronousCommand wcm:action="add"> + <Order>45</Order> + <Path>cmd.exe /c "&gt;&gt;"%TEMP%\remove-packages.txt" echo Microsoft.Todos"</Path> + </RunSynchronousCommand> + <RunSynchronousCommand wcm:action="add"> + <Order>46</Order> + <Path>cmd.exe /c "&gt;&gt;"%TEMP%\remove-packages.txt" echo Microsoft.WindowsSoundRecorder"</Path> + </RunSynchronousCommand> + <RunSynchronousCommand wcm:action="add"> + <Order>47</Order> + <Path>cmd.exe /c "&gt;&gt;"%TEMP%\remove-packages.txt" echo Microsoft.BingWeather"</Path> + </RunSynchronousCommand> + <RunSynchronousCommand wcm:action="add"> + <Order>48</Order> + <Path>cmd.exe /c "&gt;&gt;"%TEMP%\remove-caps.txt" echo Media.WindowsMediaPlayer"</Path> + </RunSynchronousCommand> + <RunSynchronousCommand wcm:action="add"> + <Order>49</Order> + <Path>cmd.exe /c "&gt;&gt;"%TEMP%\remove-packages.txt" echo Microsoft.ZuneMusic"</Path> + </RunSynchronousCommand> + <RunSynchronousCommand wcm:action="add"> + <Order>50</Order> + <Path>cmd.exe /c "&gt;&gt;"%TEMP%\remove-packages.txt" echo Microsoft.Xbox.TCUI"</Path> + </RunSynchronousCommand> + <RunSynchronousCommand wcm:action="add"> + <Order>51</Order> + <Path>cmd.exe /c "&gt;&gt;"%TEMP%\remove-packages.txt" echo Microsoft.XboxApp"</Path> + </RunSynchronousCommand> + <RunSynchronousCommand wcm:action="add"> + <Order>52</Order> + <Path>cmd.exe /c "&gt;&gt;"%TEMP%\remove-packages.txt" echo Microsoft.XboxGameOverlay"</Path> + </RunSynchronousCommand> + <RunSynchronousCommand wcm:action="add"> + <Order>53</Order> + <Path>cmd.exe /c "&gt;&gt;"%TEMP%\remove-packages.txt" echo Microsoft.XboxGamingOverlay"</Path> + </RunSynchronousCommand> + <RunSynchronousCommand wcm:action="add"> + <Order>54</Order> + <Path>cmd.exe /c "&gt;&gt;"%TEMP%\remove-packages.txt" echo Microsoft.XboxIdentityProvider"</Path> + </RunSynchronousCommand> + <RunSynchronousCommand wcm:action="add"> + <Order>55</Order> + <Path>cmd.exe /c "&gt;&gt;"%TEMP%\remove-packages.txt" echo Microsoft.XboxSpeechToTextOverlay"</Path> + </RunSynchronousCommand> + <RunSynchronousCommand wcm:action="add"> + <Order>56</Order> + <Path>cmd.exe /c "&gt;&gt;"%TEMP%\remove-packages.txt" echo Microsoft.GamingApp"</Path> + </RunSynchronousCommand> + <RunSynchronousCommand wcm:action="add"> + <Order>57</Order> + <Path>cmd.exe /c "&gt;&gt;"%TEMP%\remove-packages.txt" echo Microsoft.YourPhone"</Path> + </RunSynchronousCommand> + <RunSynchronousCommand wcm:action="add"> + <Order>58</Order> + <Path>powershell.exe -NoProfile -Command "Get-AppxProvisionedPackage -Online | where DisplayName -In (Get-Content $env:TEMP\remove-packages.txt ) | Remove-AppxProvisionedPackage -AllUsers -Online *&gt;&amp;1 &gt;&gt; $env:TEMP\remove-packages.log;"</Path> + </RunSynchronousCommand> + <RunSynchronousCommand wcm:action="add"> + <Order>59</Order> + <Path>powershell.exe -NoProfile -Command "Get-WindowsCapability -Online | where {($_.Name -split '~')[0] -in (Get-Content $env:TEMP\remove-caps.txt ) } | Remove-WindowsCapability -Online *&gt;&amp;1 &gt;&gt; $env:TEMP\remove-caps.log;"</Path> + </RunSynchronousCommand> + <RunSynchronousCommand wcm:action="add"> + <Order>60</Order> + <Path>cmd.exe /c "&gt;&gt;"C:\Users\Default\AppData\Local\Microsoft\Windows\Shell\LayoutModification.xml" echo ^&lt;LayoutModificationTemplate Version="1" xmlns="http://schemas.microsoft.com/Start/2014/LayoutModification"^&gt;"</Path> + </RunSynchronousCommand> + <RunSynchronousCommand wcm:action="add"> + <Order>61</Order> + <Path>cmd.exe /c "&gt;&gt;"C:\Users\Default\AppData\Local\Microsoft\Windows\Shell\LayoutModification.xml" echo ^&lt;LayoutOptions StartTileGroupCellWidth="6" /^&gt;"</Path> + </RunSynchronousCommand> + <RunSynchronousCommand wcm:action="add"> + <Order>62</Order> + <Path>cmd.exe /c "&gt;&gt;"C:\Users\Default\AppData\Local\Microsoft\Windows\Shell\LayoutModification.xml" echo ^&lt;DefaultLayoutOverride^&gt;"</Path> + </RunSynchronousCommand> + <RunSynchronousCommand wcm:action="add"> + <Order>63</Order> + <Path>cmd.exe /c "&gt;&gt;"C:\Users\Default\AppData\Local\Microsoft\Windows\Shell\LayoutModification.xml" echo ^&lt;StartLayoutCollection^&gt;"</Path> + </RunSynchronousCommand> + <RunSynchronousCommand wcm:action="add"> + <Order>64</Order> + <Path>cmd.exe /c "&gt;&gt;"C:\Users\Default\AppData\Local\Microsoft\Windows\Shell\LayoutModification.xml" echo ^&lt;StartLayout GroupCellWidth="6" xmlns="http://schemas.microsoft.com/Start/2014/FullDefaultLayout" /^&gt;"</Path> + </RunSynchronousCommand> + <RunSynchronousCommand wcm:action="add"> + <Order>65</Order> + <Path>cmd.exe /c "&gt;&gt;"C:\Users\Default\AppData\Local\Microsoft\Windows\Shell\LayoutModification.xml" echo ^&lt;/StartLayoutCollection^&gt;"</Path> + </RunSynchronousCommand> + <RunSynchronousCommand wcm:action="add"> + <Order>66</Order> + <Path>cmd.exe /c "&gt;&gt;"C:\Users\Default\AppData\Local\Microsoft\Windows\Shell\LayoutModification.xml" echo ^&lt;/DefaultLayoutOverride^&gt;"</Path> + </RunSynchronousCommand> + <RunSynchronousCommand wcm:action="add"> + <Order>67</Order> + <Path>cmd.exe /c "&gt;&gt;"C:\Users\Default\AppData\Local\Microsoft\Windows\Shell\LayoutModification.xml" echo ^&lt;/LayoutModificationTemplate^&gt;"</Path> + </RunSynchronousCommand> + <RunSynchronousCommand wcm:action="add"> + <Order>68</Order> + <Path>reg.exe add "HKLM\SOFTWARE\Microsoft\PolicyManager\current\device\Start" /v ConfigureStartPins /t REG_SZ /d "{ \"pinnedList\": [] }" /f</Path> + </RunSynchronousCommand> + <RunSynchronousCommand wcm:action="add"> + <Order>69</Order> + <Path>reg.exe add "HKLM\SOFTWARE\Microsoft\PolicyManager\current\device\Start" /v ConfigureStartPins_ProviderSet /t REG_DWORD /d 1 /f</Path> + </RunSynchronousCommand> + <RunSynchronousCommand wcm:action="add"> + <Order>70</Order> + <Path>reg.exe add "HKLM\SOFTWARE\Microsoft\PolicyManager\current\device\Start" /v ConfigureStartPins_WinningProvider /t REG_SZ /d B5292708-1619-419B-9923-E5D9F3925E71 /f</Path> + </RunSynchronousCommand> + <RunSynchronousCommand wcm:action="add"> + <Order>71</Order> + <Path>reg.exe add "HKLM\SOFTWARE\Microsoft\PolicyManager\providers\B5292708-1619-419B-9923-E5D9F3925E71\default\Device\Start" /v ConfigureStartPins /t REG_SZ /d "{ \"pinnedList\": [] }" /f</Path> + </RunSynchronousCommand> + <RunSynchronousCommand wcm:action="add"> + <Order>72</Order> + <Path>reg.exe add "HKLM\SOFTWARE\Microsoft\PolicyManager\providers\B5292708-1619-419B-9923-E5D9F3925E71\default\Device\Start" /v ConfigureStartPins_LastWrite /t REG_DWORD /d 1 /f</Path> + </RunSynchronousCommand> + <RunSynchronousCommand wcm:action="add"> + <Order>73</Order> + <Path>net.exe accounts /lockoutthreshold:0</Path> + </RunSynchronousCommand> + <RunSynchronousCommand wcm:action="add"> + <Order>74</Order> + <Path>netsh.exe advfirewall firewall set rule group="Remote Desktop" new enable=Yes</Path> + </RunSynchronousCommand> + <RunSynchronousCommand wcm:action="add"> + <Order>75</Order> + <Path>reg.exe add "HKLM\SYSTEM\CurrentControlSet\Control\Terminal Server" /v fDenyTSConnections /t REG_DWORD /d 0 /f</Path> + </RunSynchronousCommand> + <RunSynchronousCommand wcm:action="add"> + <Order>76</Order> + <Path>powershell.exe -NoProfile -Command "Set-ExecutionPolicy -Scope 'LocalMachine' -ExecutionPolicy 'RemoteSigned' -Force;"</Path> + </RunSynchronousCommand> + <RunSynchronousCommand wcm:action="add"> + <Order>77</Order> + <Path>reg.exe add "HKLM\SOFTWARE\Policies\Microsoft\Dsh" /v AllowNewsAndInterests /t REG_DWORD /d 0 /f</Path> + </RunSynchronousCommand> + <RunSynchronousCommand wcm:action="add"> + <Order>78</Order> + <Path>reg.exe load "HKU\mount" "C:\Users\Default\NTUSER.DAT"</Path> + </RunSynchronousCommand> + <RunSynchronousCommand wcm:action="add"> + <Order>79</Order> + <Path>reg.exe add "HKU\mount\Software\Microsoft\Windows\CurrentVersion\ContentDeliveryManager" /v "ContentDeliveryAllowed" /t REG_DWORD /d 0 /f</Path> + </RunSynchronousCommand> + <RunSynchronousCommand wcm:action="add"> + <Order>80</Order> + <Path>reg.exe add "HKU\mount\Software\Microsoft\Windows\CurrentVersion\ContentDeliveryManager" /v "FeatureManagementEnabled" /t REG_DWORD /d 0 /f</Path> + </RunSynchronousCommand> + <RunSynchronousCommand wcm:action="add"> + <Order>81</Order> + <Path>reg.exe add "HKU\mount\Software\Microsoft\Windows\CurrentVersion\ContentDeliveryManager" /v "OEMPreInstalledAppsEnabled" /t REG_DWORD /d 0 /f</Path> + </RunSynchronousCommand> + <RunSynchronousCommand wcm:action="add"> + <Order>82</Order> + <Path>reg.exe add "HKU\mount\Software\Microsoft\Windows\CurrentVersion\ContentDeliveryManager" /v "PreInstalledAppsEnabled" /t REG_DWORD /d 0 /f</Path> + </RunSynchronousCommand> + <RunSynchronousCommand wcm:action="add"> + <Order>83</Order> + <Path>reg.exe add "HKU\mount\Software\Microsoft\Windows\CurrentVersion\ContentDeliveryManager" /v "PreInstalledAppsEverEnabled" /t REG_DWORD /d 0 /f</Path> + </RunSynchronousCommand> + <RunSynchronousCommand wcm:action="add"> + <Order>84</Order> + <Path>reg.exe add "HKU\mount\Software\Microsoft\Windows\CurrentVersion\ContentDeliveryManager" /v "SilentInstalledAppsEnabled" /t REG_DWORD /d 0 /f</Path> + </RunSynchronousCommand> + <RunSynchronousCommand wcm:action="add"> + <Order>85</Order> + <Path>reg.exe add "HKU\mount\Software\Microsoft\Windows\CurrentVersion\ContentDeliveryManager" /v "SoftLandingEnabled" /t REG_DWORD /d 0 /f</Path> + </RunSynchronousCommand> + <RunSynchronousCommand wcm:action="add"> + <Order>86</Order> + <Path>reg.exe add "HKU\mount\Software\Microsoft\Windows\CurrentVersion\ContentDeliveryManager" /v "SubscribedContentEnabled" /t REG_DWORD /d 0 /f</Path> + </RunSynchronousCommand> + <RunSynchronousCommand wcm:action="add"> + <Order>87</Order> + <Path>reg.exe add "HKU\mount\Software\Microsoft\Windows\CurrentVersion\ContentDeliveryManager" /v "SubscribedContent-310093Enabled" /t REG_DWORD /d 0 /f</Path> + </RunSynchronousCommand> + <RunSynchronousCommand wcm:action="add"> + <Order>88</Order> + <Path>reg.exe add "HKU\mount\Software\Microsoft\Windows\CurrentVersion\ContentDeliveryManager" /v "SubscribedContent-338387Enabled" /t REG_DWORD /d 0 /f</Path> + </RunSynchronousCommand> + <RunSynchronousCommand wcm:action="add"> + <Order>89</Order> + <Path>reg.exe add "HKU\mount\Software\Microsoft\Windows\CurrentVersion\ContentDeliveryManager" /v "SubscribedContent-338388Enabled" /t REG_DWORD /d 0 /f</Path> + </RunSynchronousCommand> + <RunSynchronousCommand wcm:action="add"> + <Order>90</Order> + <Path>reg.exe add "HKU\mount\Software\Microsoft\Windows\CurrentVersion\ContentDeliveryManager" /v "SubscribedContent-338389Enabled" /t REG_DWORD /d 0 /f</Path> + </RunSynchronousCommand> + <RunSynchronousCommand wcm:action="add"> + <Order>91</Order> + <Path>reg.exe add "HKU\mount\Software\Microsoft\Windows\CurrentVersion\ContentDeliveryManager" /v "SubscribedContent-338393Enabled" /t REG_DWORD /d 0 /f</Path> + </RunSynchronousCommand> + <RunSynchronousCommand wcm:action="add"> + <Order>92</Order> + <Path>reg.exe add "HKU\mount\Software\Microsoft\Windows\CurrentVersion\ContentDeliveryManager" /v "SubscribedContent-353698Enabled" /t REG_DWORD /d 0 /f</Path> + </RunSynchronousCommand> + <RunSynchronousCommand wcm:action="add"> + <Order>93</Order> + <Path>reg.exe add "HKU\mount\Software\Microsoft\Windows\CurrentVersion\ContentDeliveryManager" /v "SystemPaneSuggestionsEnabled" /t REG_DWORD /d 0 /f</Path> + </RunSynchronousCommand> + <RunSynchronousCommand wcm:action="add"> + <Order>94</Order> + <Path>reg.exe unload "HKU\mount"</Path> + </RunSynchronousCommand> + <RunSynchronousCommand wcm:action="add"> + <Order>95</Order> + <Path>reg.exe add "HKLM\Software\Policies\Microsoft\Windows\CloudContent" /v "DisableWindowsConsumerFeatures" /t REG_DWORD /d 0 /f</Path> + </RunSynchronousCommand> + </RunSynchronous> + </component> + </settings> + <settings pass="oobeSystem"> + <component name="Microsoft-Windows-International-Core" processorArchitecture="arm64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> + <InputLocale>en-US</InputLocale> + <SystemLocale>en-US</SystemLocale> + <UILanguage>en-US</UILanguage> + <UserLocale>en-US</UserLocale> + </component> + <component name="Microsoft-Windows-Shell-Setup" processorArchitecture="arm64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> + <OOBE> + <HideEULAPage>true</HideEULAPage> + <HideLocalAccountScreen>true</HideLocalAccountScreen> + <HideOEMRegistrationScreen>true</HideOEMRegistrationScreen> + <HideOnlineAccountScreens>true</HideOnlineAccountScreens> + <HideWirelessSetupInOOBE>true</HideWirelessSetupInOOBE> + <NetworkLocation>Work</NetworkLocation> + <ProtectYourPC>3</ProtectYourPC> + <SkipMachineOOBE>true</SkipMachineOOBE> + <SkipUserOOBE>true</SkipUserOOBE> + <VMModeOptimizations> + <SkipAdministratorProfileRemoval>true</SkipAdministratorProfileRemoval> + <SkipNotifyUILanguageChange>true</SkipNotifyUILanguageChange> + <SkipWinREInitialization>true</SkipWinREInitialization> + </VMModeOptimizations> + </OOBE> + <UserAccounts> + <AdministratorPassword> + <Value>vagrant</Value> + <PlainText>true</PlainText> + </AdministratorPassword> + <LocalAccounts> + <LocalAccount wcm:action="add"> + <Password> + <Value>vagrant</Value> + <PlainText>true</PlainText> + </Password> + <Description>Vagrant User</Description> + <DisplayName>vagrant</DisplayName> + <Group>Administrators</Group> + <Name>vagrant</Name> + </LocalAccount> + </LocalAccounts> + </UserAccounts> + <AutoLogon> + <Password> + <Value>vagrant</Value> + <PlainText>true</PlainText> + </Password> + <Username>vagrant</Username> + <Enabled>true</Enabled> + </AutoLogon> + <FirstLogonCommands> + <SynchronousCommand wcm:action="add"> + <CommandLine>%windir%\System32\WindowsPowerShell\v1.0\powershell.exe -Command "Set-ExecutionPolicy -ExecutionPolicy RemoteSigned -Force"</CommandLine> + <Description>Set Execution Policy 64 Bit</Description> + <Order>1</Order> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <CommandLine>%windir%\SysWOW64\cmd.exe /c powershell -Command "Set-ExecutionPolicy -ExecutionPolicy RemoteSigned -Force"</CommandLine> + <Description>Set Execution Policy 32 Bit</Description> + <Order>2</Order> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <Order>3</Order> + <CommandLine>%windir%\System32\WindowsPowerShell\v1.0\powershell.exe -Command Get-NetConnectionProfile | Set-NetConnectionProfile -NetworkCategory "Private"</CommandLine> + <Description>Sets detected network connections to private to allow start of winrm</Description> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <Order>4</Order> + <CommandLine>%windir%\System32\WindowsPowerShell\v1.0\powershell.exe -Command Set-NetFirewallRule -Name "WINRM-HTTP-In-TCP" -RemoteAddress Any</CommandLine> + <Description>Allows winrm over public profile interfaces</Description> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <Order>5</Order> + <CommandLine>%windir%\System32\cmd.exe /c winrm quickconfig -q</CommandLine> + <Description>winrm quickconfig -q</Description> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <Order>6</Order> + <CommandLine>%windir%\System32\cmd.exe /c winrm quickconfig -transport:http</CommandLine> + <Description>winrm quickconfig -transport:http</Description> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <Order>7</Order> + <CommandLine>%windir%\System32\cmd.exe /c winrm set winrm/config @{MaxTimeoutms="1800000"}</CommandLine> + <Description>Win RM MaxTimoutms</Description> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <Order>8</Order> + <CommandLine>%windir%\System32\cmd.exe /c winrm set winrm/config/winrs @{MaxMemoryPerShellMB="2048"}</CommandLine> + <Description>Win RM MaxMemoryPerShellMB</Description> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <Order>9</Order> + <CommandLine>%windir%\System32\cmd.exe /c winrm set winrm/config/service @{AllowUnencrypted="true"}</CommandLine> + <Description>Win RM AllowUnencrypted</Description> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <Order>10</Order> + <CommandLine>%windir%\System32\cmd.exe /c winrm set winrm/config/service/auth @{Basic="true"}</CommandLine> + <Description>Win RM auth Basic</Description> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <Order>11</Order> + <CommandLine>%windir%\System32\cmd.exe /c winrm set winrm/config/client/auth @{Basic="true"}</CommandLine> + <Description>Win RM client auth Basic</Description> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <Order>12</Order> + <CommandLine>%windir%\System32\cmd.exe /c winrm set winrm/config/listener?Address=*+Transport=HTTP @{Port="5985"}</CommandLine> + <Description>Win RM listener Address/Port</Description> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <Order>13</Order> + <CommandLine>%windir%\System32\cmd.exe /c netsh firewall add portopening TCP 5985 "Port 5985"</CommandLine> + <Description>Win RM port open</Description> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <Order>14</Order> + <CommandLine>%windir%\System32\cmd.exe /c net stop winrm</CommandLine> + <Description>Stop Win RM Service</Description> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <Order>15</Order> + <CommandLine>%windir%\System32\cmd.exe /c sc config winrm start= auto</CommandLine> + <Description>Win RM Autostart</Description> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <Order>16</Order> + <CommandLine>%windir%\System32\cmd.exe /c net start winrm</CommandLine> + <Description>Start Win RM Service</Description> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <Order>17</Order> + <CommandLine>%windir%\System32\cmd.exe /c wmic useraccount where "name='vagrant'" set PasswordExpires=FALSE</CommandLine> + <Description>Disable password expiration for vagrant user</Description> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <CommandLine>%SystemRoot%\System32\reg.exe ADD "HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon" /v DefaultPassword /t REG_SZ /d "vagrant" /f</CommandLine> + <Order>18</Order> + <Description>Enable AutoLogon</Description> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <CommandLine>%SystemRoot%\System32\reg.exe ADD "HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon" /v AutoAdminLogon /t REG_SZ /d 1 /f</CommandLine> + <Order>19</Order> + <Description>Enable AutoLogon</Description> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <Order>20</Order> + <CommandLine>powershell.exe -NoProfile -Command "Disable-ComputerRestore -Drive 'C:';"</CommandLine> + <Description>Disable Computer Restore</Description> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <CommandLine>cmd.exe /c E:\PTAgent.exe /install_silent</CommandLine> + <Description>Install Parallels Desktop tools</Description> + <Order>21</Order> + </SynchronousCommand> + </FirstLogonCommands> + </component> + <component name="Microsoft-Windows-WinRE-RecoveryAgent" processorArchitecture="arm64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> + <UninstallWindowsRE>true</UninstallWindowsRE> + </component> + </settings> + <settings pass="offlineServicing"> + <component name="Microsoft-Windows-LUA-Settings" processorArchitecture="arm64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> + <EnableLUA>false</EnableLUA> + </component> + </settings> +</unattend> diff --git a/packer_templates/win_answer_files/11/hyperv-gen2/Autounattend.xml b/packer_templates/win_answer_files/11/hyperv-gen2/Autounattend.xml index 65a4caaa3..431ef5e0c 100644 --- a/packer_templates/win_answer_files/11/hyperv-gen2/Autounattend.xml +++ b/packer_templates/win_answer_files/11/hyperv-gen2/Autounattend.xml @@ -136,7 +136,7 @@ </ProductKey> <AcceptEula>true</AcceptEula> <FullName>Vagrant</FullName> - <Organization>Bento by Chef Software, Inc.</Organization> + <Organization>Bento by Progress Chef.</Organization> </UserData> <DynamicUpdate> <Enable>false</Enable> diff --git a/packer_templates/win_answer_files/2016/Autounattend.xml b/packer_templates/win_answer_files/2016/Autounattend.xml index f58062063..6379e2f8c 100644 --- a/packer_templates/win_answer_files/2016/Autounattend.xml +++ b/packer_templates/win_answer_files/2016/Autounattend.xml @@ -106,7 +106,7 @@ </ProductKey> <AcceptEula>true</AcceptEula> <FullName>Vagrant</FullName> - <Organization>Bento by Chef Software, Inc.</Organization> + <Organization>Bento by Progress Chef</Organization> </UserData> <DynamicUpdate> <Enable>false</Enable> diff --git a/packer_templates/win_answer_files/2016/hyperv-gen2/Autounattend.xml b/packer_templates/win_answer_files/2016/hyperv-gen2/Autounattend.xml index 64579c515..c51a95ee9 100644 --- a/packer_templates/win_answer_files/2016/hyperv-gen2/Autounattend.xml +++ b/packer_templates/win_answer_files/2016/hyperv-gen2/Autounattend.xml @@ -126,7 +126,7 @@ </ProductKey> <AcceptEula>true</AcceptEula> <FullName>Vagrant</FullName> - <Organization>Bento by Chef Software, Inc.</Organization> + <Organization>Bento by Progress Chef</Organization> </UserData> <DynamicUpdate> <Enable>false</Enable> diff --git a/packer_templates/win_answer_files/2019/Autounattend.xml b/packer_templates/win_answer_files/2019/Autounattend.xml index 041dccbef..6cb3a61b4 100644 --- a/packer_templates/win_answer_files/2019/Autounattend.xml +++ b/packer_templates/win_answer_files/2019/Autounattend.xml @@ -106,7 +106,7 @@ </ProductKey> <AcceptEula>true</AcceptEula> <FullName>Vagrant</FullName> - <Organization>Bento by Chef Software, Inc.</Organization> + <Organization>Bento by Progress Chef</Organization> </UserData> <DynamicUpdate> <Enable>false</Enable> diff --git a/packer_templates/win_answer_files/2019/hyperv-gen2/Autounattend.xml b/packer_templates/win_answer_files/2019/hyperv-gen2/Autounattend.xml index 58f6821a7..8d8498365 100644 --- a/packer_templates/win_answer_files/2019/hyperv-gen2/Autounattend.xml +++ b/packer_templates/win_answer_files/2019/hyperv-gen2/Autounattend.xml @@ -126,7 +126,7 @@ </ProductKey> <AcceptEula>true</AcceptEula> <FullName>Vagrant</FullName> - <Organization>Bento by Chef Software, Inc.</Organization> + <Organization>Bento by Progress Chef</Organization> </UserData> <DynamicUpdate> <Enable>false</Enable> diff --git a/packer_templates/win_answer_files/2022/Autounattend.xml b/packer_templates/win_answer_files/2022/Autounattend.xml index 929915b8c..9d02fb7df 100644 --- a/packer_templates/win_answer_files/2022/Autounattend.xml +++ b/packer_templates/win_answer_files/2022/Autounattend.xml @@ -106,7 +106,7 @@ </ProductKey> <AcceptEula>true</AcceptEula> <FullName>Vagrant</FullName> - <Organization>Bento by Chef Software, Inc.</Organization> + <Organization>Bento by Progress Chef</Organization> </UserData> <DynamicUpdate> <Enable>false</Enable> diff --git a/packer_templates/win_answer_files/2022/hyperv-gen2/Autounattend.xml b/packer_templates/win_answer_files/2022/hyperv-gen2/Autounattend.xml index ecfca3ebe..8d6565fc0 100644 --- a/packer_templates/win_answer_files/2022/hyperv-gen2/Autounattend.xml +++ b/packer_templates/win_answer_files/2022/hyperv-gen2/Autounattend.xml @@ -126,7 +126,7 @@ </ProductKey> <AcceptEula>true</AcceptEula> <FullName>Vagrant</FullName> - <Organization>Bento by Chef Software, Inc.</Organization> + <Organization>Bento by Progress Chef</Organization> </UserData> <DynamicUpdate> <Enable>false</Enable> From 45792040a997156a257660bd3e2d8f6b1209b677 Mon Sep 17 00:00:00 2001 From: Theo Dickinson <theodson@gmail.com> Date: Wed, 21 Feb 2024 05:49:03 +1100 Subject: [PATCH 1545/1622] Fix waiting for ssh - ubuntu netplan dhcp-identifer format error (#1550) --- packer_templates/http/ubuntu/user-data | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packer_templates/http/ubuntu/user-data b/packer_templates/http/ubuntu/user-data index 24598df56..bd5b64355 100644 --- a/packer_templates/http/ubuntu/user-data +++ b/packer_templates/http/ubuntu/user-data @@ -14,7 +14,7 @@ autoinstall: allow-pw: yes late-commands: - sed -i 's/^#*\(send dhcp-client-identifier\).*$/\1 = hardware;/' /target/etc/dhcp/dhclient.conf - - 'sed -i "s/dhcp4: true/&\n dhcp-identifier: mac/" /target/etc/netplan/00-installer-config.yaml' + - 'sed -i "s/dhcp4: true/&\n dhcp-identifier: mac/" /target/etc/netplan/00-installer-config.yaml' - echo 'vagrant ALL=(ALL) NOPASSWD:ALL' > /target/etc/sudoers.d/vagrant # Enable hyper-v daemons only if using hyper-v virtualization - if [ $(virt-what) == "hyperv" ]; then apt-get update && apt-get install -y hyperv-daemons linux-tools-$(uname -r) linux-cloud-tools-$(uname -r) linux-cloud-tools-common cifs-utils && systemctl enable hypervvssd && systemctl enable hypervkvpd && systemctl start hypervvssd && systemctl start hypervkvpd; fi From 9a3547ae99c8bfd5bc53e2e4f8927e26572ff190 Mon Sep 17 00:00:00 2001 From: Jimmy Huang <jimmy.huang@duragility.com> Date: Wed, 28 Feb 2024 07:54:44 -0800 Subject: [PATCH 1546/1622] bumped iso url versions (#1553) --- os_pkrvars/ubuntu/ubuntu-22.04-aarch64.pkrvars.hcl | 2 +- os_pkrvars/ubuntu/ubuntu-22.04-x86_64.pkrvars.hcl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/os_pkrvars/ubuntu/ubuntu-22.04-aarch64.pkrvars.hcl b/os_pkrvars/ubuntu/ubuntu-22.04-aarch64.pkrvars.hcl index 35e379886..e49428e2b 100644 --- a/os_pkrvars/ubuntu/ubuntu-22.04-aarch64.pkrvars.hcl +++ b/os_pkrvars/ubuntu/ubuntu-22.04-aarch64.pkrvars.hcl @@ -1,7 +1,7 @@ os_name = "ubuntu" os_version = "22.04" os_arch = "aarch64" -iso_url = "https://cdimage.ubuntu.com/releases/jammy/release/ubuntu-22.04.3-live-server-arm64.iso" +iso_url = "https://cdimage.ubuntu.com/releases/jammy/release/ubuntu-22.04.4-live-server-arm64.iso" iso_checksum = "file:https://cdimage.ubuntu.com/releases/jammy/release/SHA256SUMS" parallels_guest_os_type = "ubuntu" vbox_guest_os_type = "Ubuntu_64" diff --git a/os_pkrvars/ubuntu/ubuntu-22.04-x86_64.pkrvars.hcl b/os_pkrvars/ubuntu/ubuntu-22.04-x86_64.pkrvars.hcl index 7475a60a4..c4f1bb6fe 100644 --- a/os_pkrvars/ubuntu/ubuntu-22.04-x86_64.pkrvars.hcl +++ b/os_pkrvars/ubuntu/ubuntu-22.04-x86_64.pkrvars.hcl @@ -1,7 +1,7 @@ os_name = "ubuntu" os_version = "22.04" os_arch = "x86_64" -iso_url = "https://releases.ubuntu.com/jammy/ubuntu-22.04.3-live-server-amd64.iso" +iso_url = "https://releases.ubuntu.com/jammy/ubuntu-22.04.4-live-server-amd64.iso" iso_checksum = "file:https://releases.ubuntu.com/jammy/SHA256SUMS" parallels_guest_os_type = "ubuntu" vbox_guest_os_type = "Ubuntu_64" From 5ff5536c8d80d9a97cf3b8ce62d46c4944cfb2dd Mon Sep 17 00:00:00 2001 From: Li-Wen Hsu <lwhsu@lwhsu.org> Date: Wed, 6 Mar 2024 12:12:51 +0800 Subject: [PATCH 1547/1622] Update to FreeBSD 13.3 (#1556) --- os_pkrvars/freebsd/freebsd-13-aarch64.pkrvars.hcl | 6 +++--- os_pkrvars/freebsd/freebsd-13-x86_64.pkrvars.hcl | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/os_pkrvars/freebsd/freebsd-13-aarch64.pkrvars.hcl b/os_pkrvars/freebsd/freebsd-13-aarch64.pkrvars.hcl index b467c948e..dd7dc26fc 100644 --- a/os_pkrvars/freebsd/freebsd-13-aarch64.pkrvars.hcl +++ b/os_pkrvars/freebsd/freebsd-13-aarch64.pkrvars.hcl @@ -1,8 +1,8 @@ os_name = "freebsd" -os_version = "13.2" +os_version = "13.3" os_arch = "aarch64" -iso_url = "https://download.freebsd.org/releases/arm64/aarch64/ISO-IMAGES/13.2/FreeBSD-13.2-RELEASE-arm64-aarch64-disc1.iso" -iso_checksum = "file:https://download.freebsd.org/releases/arm64/aarch64/ISO-IMAGES/13.2/CHECKSUM.SHA256-FreeBSD-13.2-RELEASE-arm64-aarch64" +iso_url = "https://download.freebsd.org/releases/arm64/aarch64/ISO-IMAGES/13.3/FreeBSD-13.3-RELEASE-arm64-aarch64-disc1.iso" +iso_checksum = "file:https://download.freebsd.org/releases/arm64/aarch64/ISO-IMAGES/13.3/CHECKSUM.SHA256-FreeBSD-13.3-RELEASE-arm64-aarch64" parallels_guest_os_type = "freebsd" vbox_guest_os_type = "FreeBSD_64" vmware_guest_os_type = "arm-freebsd-64" diff --git a/os_pkrvars/freebsd/freebsd-13-x86_64.pkrvars.hcl b/os_pkrvars/freebsd/freebsd-13-x86_64.pkrvars.hcl index 74d59042e..1b14f89e3 100644 --- a/os_pkrvars/freebsd/freebsd-13-x86_64.pkrvars.hcl +++ b/os_pkrvars/freebsd/freebsd-13-x86_64.pkrvars.hcl @@ -1,8 +1,8 @@ os_name = "freebsd" -os_version = "13.2" +os_version = "13.3" os_arch = "x86_64" -iso_url = "https://download.freebsd.org/releases/amd64/amd64/ISO-IMAGES/13.2/FreeBSD-13.2-RELEASE-amd64-disc1.iso" -iso_checksum = "file:https://download.freebsd.org/releases/amd64/amd64/ISO-IMAGES/13.2/CHECKSUM.SHA256-FreeBSD-13.2-RELEASE-amd64" +iso_url = "https://download.freebsd.org/releases/amd64/amd64/ISO-IMAGES/13.3/FreeBSD-13.3-RELEASE-amd64-disc1.iso" +iso_checksum = "file:https://download.freebsd.org/releases/amd64/amd64/ISO-IMAGES/13.3/CHECKSUM.SHA256-FreeBSD-13.3-RELEASE-amd64" parallels_guest_os_type = "freebsd" vbox_guest_os_type = "FreeBSD_64" vmware_guest_os_type = "freebsd-64" From 292fdc63dafc8244a792221960273ec921daa4e7 Mon Sep 17 00:00:00 2001 From: Corey Hemminger <hemminger@hotmail.com> Date: Wed, 20 Mar 2024 18:18:18 -0500 Subject: [PATCH 1548/1622] Update (#1559) Add amz Linux 2023 and update testing scripts --- .gitignore | 1 + AMZ_README_FIRST.md | 12 +-- CHANGELOG.md | 17 ++++- README.md | 10 ++- ...> amazonlinux-2-x86_64-virtualbox-build.sh | 16 ++-- amazonlinux-2023-aarch64-virtualbox-build.sh | 75 +++++++++++++++++++ amazonlinux-2023-x86_64-virtualbox-build.sh | 73 ++++++++++++++++++ builds.yml | 2 + lib/bento/runner.rb | 4 +- lib/bento/test.rb | 26 ++++++- lib/bento/test_templates/kitchen.yml.erb | 3 +- lib/bento/upload.rb | 4 +- lib/bento/version.rb | 2 +- .../amazonlinux-2-aarch64.pkrvars.hcl | 11 +++ .../amazonlinux-2-x86_64.pkrvars.hcl | 22 ++---- .../amazonlinux-2023-aarch64.pkrvars.hcl | 11 +++ .../amazonlinux-2023-x86_64.pkrvars.hcl | 28 +++---- .../centos/centos-7-aarch64.pkrvars.hcl | 2 +- .../centos-stream-8-aarch64.pkrvars.hcl | 2 +- .../centos-stream-9-aarch64.pkrvars.hcl | 2 +- .../debian/debian-11-aarch64.pkrvars.hcl | 2 +- .../debian/debian-12-aarch64.pkrvars.hcl | 2 +- .../freebsd/freebsd-13-aarch64.pkrvars.hcl | 2 +- .../freebsd/freebsd-14-aarch64.pkrvars.hcl | 2 +- .../opensuse-leap-15-aarch64.pkrvars.hcl | 2 +- .../oracle/oracle-7-aarch64.pkrvars.hcl | 2 +- .../oracle/oracle-8-aarch64.pkrvars.hcl | 2 +- .../oracle/oracle-9-aarch64.pkrvars.hcl | 2 +- os_pkrvars/rhel/rhel-7-aarch64.pkrvars.hcl | 2 +- os_pkrvars/rhel/rhel-8-aarch64.pkrvars.hcl | 2 +- os_pkrvars/rhel/rhel-9-aarch64.pkrvars.hcl | 2 +- .../rockylinux-8-aarch64.pkrvars.hcl | 2 +- packer_templates/amz_seed_iso/user-data | 28 ++----- packer_templates/pkr-builder.pkr.hcl | 2 +- packer_templates/pkr-sources.pkr.hcl | 26 ++++--- packer_templates/pkr-variables.pkr.hcl | 45 +++++++++-- .../scripts/_common/vmware_rhel.sh | 24 +++--- packer_templates/scripts/rhel/cleanup_dnf.sh | 4 +- 38 files changed, 347 insertions(+), 129 deletions(-) rename AMZ_build_virtualbox-ovf.sh => amazonlinux-2-x86_64-virtualbox-build.sh (74%) create mode 100755 amazonlinux-2023-aarch64-virtualbox-build.sh create mode 100755 amazonlinux-2023-x86_64-virtualbox-build.sh create mode 100644 os_pkrvars/amazonlinux/amazonlinux-2-aarch64.pkrvars.hcl create mode 100644 os_pkrvars/amazonlinux/amazonlinux-2023-aarch64.pkrvars.hcl diff --git a/.gitignore b/.gitignore index 175b1f75c..14efcc395 100644 --- a/.gitignore +++ b/.gitignore @@ -5,6 +5,7 @@ *.ovf *.vmdk *.vdi +*.qcow2 *.log virtualfloppy.vfd packer_cache/ diff --git a/AMZ_README_FIRST.md b/AMZ_README_FIRST.md index 5393c82d2..1fd70bdbf 100644 --- a/AMZ_README_FIRST.md +++ b/AMZ_README_FIRST.md @@ -1,12 +1,12 @@ -This is not your normal Bento box. Instead of building a system from an ISO we're building a system from an Amazon provided VirtualBox VDI file. This means the process is a bit different than usual. +This is not your normal Bento box. Instead of building a system from an ISO we're building a system from an Amazon provided vm hdd image files. This means the process is a bit different than usual. # Building this box -Simply run the AMZ_build_virtualbox-ovf.sh script +Simply run one of the amazonlinxu-2*-build.sh scripts -This script will: +These scripts will: -1. Download the VirtualBox .vdi file for Amazon Linux 2 and place it in the amz_working_files directory. Amazon hosts these at <https://cdn.amazonlinux.com/os-images/latest/virtualbox/>. It will name it amazon.vdi instead of the version specific name that Amazon gives it on their site -1. It will prepare this VDI file for packer and export it as a OVF file +1. Download the vm image file for Amazon Linux 2 or 2023 and place it in the amz_working_files directory. Amazon hosts these at <https://cdn.amazonlinux.com/os-images/latest/> and <https://cdn.amazonlinux.com/al2023/os-images/latest/>. +1. It will prepare the VDI file for packer and export it as a OVF file 1. It will run the packer build -1. Lastly it will clean up the leftover files in the working directory +1. Lastly it will clean up the leftover files in the working directory on successful completion diff --git a/CHANGELOG.md b/CHANGELOG.md index a6abc2b66..13dcfefa0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -52,9 +52,21 @@ Markdown table generated at <https://www.tablesgenerator.com/markdown_tables#> - Look into making all build uefi default builds - Create CD pipeline to upload vagrant boxes after PR is merged - Create CD pipeline to build and upload new versions of vagrant boxes once every 3 months with the latest patches -- Added ability to configure bento upload of private or public boxes in builds.yml, defaults to private -## [unreleased] (2024-02-16) +## [unreleased] (2024-03-20) + +## [v4.0.2] (2024-03-20) + +- Update upload message to show architecture +- Fix open-vm-tools install for vmware builds +- Fix amazonlinux 2 build script +- Added amazonlinux 2023 build scripts +- Allow failed tests to continue and report at the end each test that failed +- Added amazonlinux aarch64 packer templates +- removed unneeded config from amazon user-data script for seed.iso +- Added additional qemu variables for various qemu source properties +- Added virtualbox-ovf vbox_source_path and vbox_checksum variables +- Added recursive flag to rhel cleanup scripts for persistent network files ## [v4.0.1] (2024-02-16) @@ -108,6 +120,7 @@ Markdown table generated at <https://www.tablesgenerator.com/markdown_tables#> - Updated Bento to continue builds even if one fails and report all failures at the end and exit with exit code 1 - Added qemu clone of libvirt box when metadata file is created for uploading to vagrant qemu provider - Made build shell scripts customizable through packer variable +- Added ability to configure bento upload of private or public boxes in builds.yml, defaults to private ## [v3.1.1] (2023-07-07) diff --git a/README.md b/README.md index 5a9038a61..5b074914c 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ Bento is a project that encapsulates [Packer](https://www.packer.io/) templates ***NOTE:** -- Vagrant 2.4.0+ is required for new cpu archetecture support +- Vagrant 2.4.0+ is required for new cpu architecture support - Virutalbox 6.x requires disabling nat config that allows vbox 7.x guests to connect to the host. To use comment out lines #161 and #162 in bento/packer_templates/pkr-variables.pkr.hcl or add variable `vboxmanage = []` to os_pkrvars files. - When running packer build command the output directory is relative to the working directory the command is currently running in. Suggest running packer build commands from bento root directory for build working files to be placed in bento/builds/(build_name) directory by default. If the output_directory variable isn't overwritten a directory called builds/(build_name) will be created in the current working directory that you are running the command from @@ -24,6 +24,14 @@ Vagrant.configure("2") do |config| end ``` +### Installing Bento + +1. install ruby environment +1. clone repo +1. cd <path/to>/bento +1. gem build bento.gemspec +1. gem install bento-*.gem + ### Building Boxes #### Requirements diff --git a/AMZ_build_virtualbox-ovf.sh b/amazonlinux-2-x86_64-virtualbox-build.sh similarity index 74% rename from AMZ_build_virtualbox-ovf.sh rename to amazonlinux-2-x86_64-virtualbox-build.sh index d935dc3c9..8902e9dae 100755 --- a/AMZ_build_virtualbox-ovf.sh +++ b/amazonlinux-2-x86_64-virtualbox-build.sh @@ -12,10 +12,10 @@ IMG="$(wget -q https://cdn.amazonlinux.com/os-images/latest/virtualbox/ -O - | g # Download vbox vdi echo "Downloading Vbox VDI $IMG" -wget -q -O "$AMZDIR"/amazon.vdi -c https://cdn.amazonlinux.com/os-images/latest/virtualbox/"$IMG" +wget -q -O "$AMZDIR"/amazon2_x86_64.vdi -c https://cdn.amazonlinux.com/os-images/latest/virtualbox/"$IMG" -if [ ! -f "$AMZDIR"/amazon.vdi ]; then - echo There must be a file named amazon.vdi in "$AMZDIR"! +if [ ! -f "$AMZDIR"/amazon2_x86_64.vdi ]; then + echo There must be a file named amazon2_x86_64.vdi in "$AMZDIR"! echo You can download the vdi file at https://cdn.amazonlinux.com/os-images/latest/virtualbox/ exit 1 fi @@ -36,8 +36,8 @@ echo "Creating the VM" # from https://www.perkin.org.uk/posts/create-virtualbox-vm-from-the-command-line.html VBoxManage createvm --name $VM --ostype "RedHat_64" --register VBoxManage storagectl $VM --name "SATA Controller" --add sata --controller IntelAHCI -VBoxManage storageattach $VM --storagectl "SATA Controller" --port 0 --device 0 --type hdd --medium "$AMZDIR"/amazon.vdi -VBoxManage storageattach $VM --storagectl "SATA Controller" --port 0 --device 1 --type dvddrive --medium "$AMZDIR"/seed.iso +VBoxManage storageattach $VM --storagectl "SATA Controller" --port 0 --device 0 --type hdd --medium "$AMZDIR"/amazon2_x86_64.vdi +VBoxManage storageattach $VM --storagectl "SATA Controller" --port 1 --device 0 --type dvddrive --medium "$AMZDIR"/seed.iso VBoxManage modifyvm $VM --memory 2048 VBoxManage modifyvm $VM --cpus 2 VBoxManage modifyvm $VM --audio-driver none @@ -48,18 +48,18 @@ echo Sleeping for 120 seconds to let the system boot and cloud-init to run VBoxManage startvm $VM --type headless sleep 120 VBoxManage controlvm $VM poweroff --type headless -VBoxManage storageattach $VM --storagectl "SATA Controller" --port 0 --device 1 --type dvddrive --medium none +VBoxManage storageattach $VM --storagectl "SATA Controller" --port 1 --device 0 --type dvddrive --medium none sleep 5 echo Exporting the VM to an OVF file -vboxmanage export $VM -o "$AMZDIR"/amazon2.ovf +vboxmanage export $VM -o "$AMZDIR"/amazon2_x86_64.ovf sleep 5 echo Deleting the VM vboxmanage unregistervm $VM --delete echo starting packer build of amazonlinux -if packer build -timestamp-ui -only=virtualbox-ovf.amazonlinux -var-file="$AMZDIR"/../../os_pkrvars/amazonlinux/amazonlinux-2-x86_64.pkrvars.hcl "$AMZDIR"/../../packer_templates; then +if packer build -timestamp-ui -var "vbox_source_path=$AMZDIR/amazon2_x86_64.ovf" -var "vbox_checksum=null" -var-file="$AMZDIR"/../../os_pkrvars/amazonlinux/amazonlinux-2-x86_64.pkrvars.hcl "$AMZDIR"/../../packer_templates; then echo "Cleaning up files" rm -f "$AMZDIR"/*.ovf "$AMZDIR"/*.vmdk "$AMZDIR"/*.iso else diff --git a/amazonlinux-2023-aarch64-virtualbox-build.sh b/amazonlinux-2023-aarch64-virtualbox-build.sh new file mode 100755 index 000000000..5d0ec7ae8 --- /dev/null +++ b/amazonlinux-2023-aarch64-virtualbox-build.sh @@ -0,0 +1,75 @@ +#!/usr/bin/env bash + +# Getting script directory location +SCRIPT_RELATIVE_DIR=$(dirname "${BASH_SOURCE[0]}") +cd "$SCRIPT_RELATIVE_DIR" || exit + +# set tmp dir for files +AMZDIR="$(pwd)/packer_templates/amz_working_files" + +echo "Cleaning up old files" +rm -f "$AMZDIR"/*.iso "$AMZDIR"/*.ovf "$AMZDIR"/*.vmdk "$AMZDIR"/*.vdi + +# Get virtualbox vdi file name with latest version number +IMG="$(wget -q https://cdn.amazonlinux.com/al2023/os-images/latest/kvm-arm64/ -O - | grep ".qcow2" | cut -d "\"" -f 2)" + +echo "Downloading $IMG" +wget -q -O "$AMZDIR"/amazon2023_arm64.qcow2 -c https://cdn.amazonlinux.com/al2023/os-images/latest/kvm-arm64/"$IMG" + +echo "Convert qcow2 to vdi" +qemu-img convert -f qcow2 "$AMZDIR"/amazon2023_arm64.qcow2 -O vdi "$AMZDIR"/amazon2023_arm64.vdi + +if [ ! -f "$AMZDIR"/amazon2023_arm64.vdi ]; then + echo There must be a file named amazon2023_arm64.vdi in "$AMZDIR"! + echo You can download the files at https://cdn.amazonlinux.com/al2023/os-images/latest/ + exit 1 +fi + +echo "Creating ISO" +hdiutil makehybrid -o "$AMZDIR"/seed.iso -hfs -joliet -iso -default-volume-name cidata "$AMZDIR"/../amz_seed_iso + +VM="AmazonLinuxBento" +echo Powering off and deleting any existing VMs named $VM +VBoxManage controlvm $VM poweroff --type headless 2> /dev/null +VBoxManage unregistervm $VM --delete 2> /dev/null +sleep 5 + +echo "Creating the VM" +# from https://www.perkin.org.uk/posts/create-virtualbox-vm-from-the-command-line.html +VBoxManage createvm --name $VM --ostype "Fedora_64" --register +VBoxManage storagectl $VM --name "SATA Controller" --add sata --controller IntelAHCI +VBoxManage storageattach $VM --storagectl "SATA Controller" --port 0 --device 0 --type hdd --medium "$AMZDIR"/amazon2023_arm64.vdi +VBoxManage storageattach $VM --storagectl "SATA Controller" --port 1 --device 0 --type dvddrive --medium "$AMZDIR"/seed.iso +VBoxManage modifyvm $VM --chipset ich9 +VBoxManage modifyvm $VM --firmware efi +VBoxManage modifyvm $VM --memory 2048 +VBoxManage modifyvm $VM --cpus 2 +VBoxManage modifyvm $VM --nat-localhostreachable1 on +VBoxManage modifyvm $VM --vram 33 +VBoxManage modifyvm $VM --graphicscontroller vmsvga +VBoxManage modifyvm $VM --vrde off +VBoxManage modifyvm $VM --audio-driver none +VBoxManage modifyvm $VM --ioapic on +sleep 5 + +echo "Sleeping for 120 seconds to let the system boot and cloud-init to run" +VBoxManage startvm $VM --type headless +sleep 120 +VBoxManage controlvm $VM poweroff --type headless +VBoxManage storageattach $VM --storagectl "SATA Controller" --port 1 --device 0 --type dvddrive --medium none +sleep 5 + +echo "Exporting the VM to an OVF file" +vboxmanage export $VM -o "$AMZDIR"/amazon2023_arm64.ovf +sleep 5 + +echo "Deleting the VM" +vboxmanage unregistervm $VM --delete + +echo "starting packer build of amazonlinux" +if packer build -timestamp-ui -var "vbox_source_path=$AMZDIR/amazon2023_arm64.ovf" -var "vbox_checksum=null" -var-file="$AMZDIR"/../../os_pkrvars/amazonlinux/amazonlinux-2023-aarch64.pkrvars.hcl "$AMZDIR"/../../packer_templates; then + echo "Cleaning up files" + rm -f "$AMZDIR"/*.ovf "$AMZDIR"/*.vmdk "$AMZDIR"/*.iso "$AMZDIR"/*.vdi "$AMZDIR"/*.qcow2 +else + exit 1 +fi diff --git a/amazonlinux-2023-x86_64-virtualbox-build.sh b/amazonlinux-2023-x86_64-virtualbox-build.sh new file mode 100755 index 000000000..f58fb84b6 --- /dev/null +++ b/amazonlinux-2023-x86_64-virtualbox-build.sh @@ -0,0 +1,73 @@ +#!/usr/bin/env bash + +# Getting script directory location +SCRIPT_RELATIVE_DIR=$(dirname "${BASH_SOURCE[0]}") +cd "$SCRIPT_RELATIVE_DIR" || exit + +# set tmp dir for files +AMZDIR="$(pwd)/packer_templates/amz_working_files" + +echo "Cleaning up old files" +rm -f "$AMZDIR"/*.iso "$AMZDIR"/*.ovf "$AMZDIR"/*.vmdk "$AMZDIR"/*.vdi + +# Get virtualbox vdi file name with latest version number +IMG="$(wget -q https://cdn.amazonlinux.com/al2023/os-images/latest/kvm/ -O - | grep ".qcow2" | cut -d "\"" -f 2)" + +echo "Downloading $IMG" +wget -q -O "$AMZDIR"/amazon2023_x86_64.qcow2 -c https://cdn.amazonlinux.com/al2023/os-images/latest/kvm/"$IMG" + +echo "Convert qcow2 to vdi" +qemu-img convert -f qcow2 "$AMZDIR"/amazon2023_x86_64.qcow2 -O vdi "$AMZDIR"/amazon2023_x86_64.vdi + +if [ ! -f "$AMZDIR"/amazon2023_x86_64.vdi ]; then + echo There must be a file named amazon2023_x86_64.vdi in "$AMZDIR"! + echo You can download the files at https://cdn.amazonlinux.com/al2023/os-images/latest/ + exit 1 +fi + +echo "Creating ISO" +hdiutil makehybrid -o "$AMZDIR"/seed.iso -hfs -joliet -iso -default-volume-name cidata "$AMZDIR"/../amz_seed_iso + +VM="AmazonLinuxBento" +echo Powering off and deleting any existing VMs named $VM +VBoxManage controlvm $VM poweroff --type headless 2> /dev/null +VBoxManage unregistervm $VM --delete 2> /dev/null +sleep 5 + +echo "Creating the VM" +# from https://www.perkin.org.uk/posts/create-virtualbox-vm-from-the-command-line.html +VBoxManage createvm --name $VM --ostype "Fedora_64" --register +VBoxManage storagectl $VM --name "SATA Controller" --add sata --controller IntelAHCI +VBoxManage storageattach $VM --storagectl "SATA Controller" --port 0 --device 0 --type hdd --medium "$AMZDIR"/amazon2023_x86_64.vdi +VBoxManage storageattach $VM --storagectl "SATA Controller" --port 1 --device 0 --type dvddrive --medium "$AMZDIR"/seed.iso +VBoxManage modifyvm $VM --memory 2048 +VBoxManage modifyvm $VM --cpus 2 +VBoxManage modifyvm $VM --nat-localhostreachable1 on +VBoxManage modifyvm $VM --vram 10 +VBoxManage modifyvm $VM --graphicscontroller vmsvga +VBoxManage modifyvm $VM --vrde off +VBoxManage modifyvm $VM --audio-driver none +VBoxManage modifyvm $VM --ioapic on +sleep 5 + +echo "Sleeping for 120 seconds to let the system boot and cloud-init to run" +VBoxManage startvm $VM --type headless +sleep 120 +VBoxManage controlvm $VM poweroff --type headless +VBoxManage storageattach $VM --storagectl "SATA Controller" --port 1 --device 0 --type dvddrive --medium none +sleep 5 + +echo "Exporting the VM to an OVF file" +vboxmanage export $VM -o "$AMZDIR"/amazon2023_x86_64.ovf +sleep 5 + +echo "Deleting the VM" +vboxmanage unregistervm $VM --delete + +echo "starting packer build of amazonlinux" +if packer build -timestamp-ui -var "vbox_source_path=$AMZDIR/amazon2023_x86_64.ovf" -var "vbox_checksum=null" -var-file="$AMZDIR"/../../os_pkrvars/amazonlinux/amazonlinux-2023-x86_64.pkrvars.hcl "$AMZDIR"/../../packer_templates; then + echo "Cleaning up files" + rm -f "$AMZDIR"/*.ovf "$AMZDIR"/*.vmdk "$AMZDIR"/*.iso "$AMZDIR"/*.vdi "$AMZDIR"/*.qcow2 +else + exit 1 +fi diff --git a/builds.yml b/builds.yml index 6f0cd3b65..6a3567516 100644 --- a/builds.yml +++ b/builds.yml @@ -6,6 +6,8 @@ default_architectures: - 'amd64' public: + - 'amazonlinux-2' + - 'amazonlinux-2023' - 'almalinux-8' - 'almalinux-9' - 'amazon-2' diff --git a/lib/bento/runner.rb b/lib/bento/runner.rb index 9c3331622..b59554dcc 100644 --- a/lib/bento/runner.rb +++ b/lib/bento/runner.rb @@ -17,7 +17,7 @@ def initialize(opts) @dry_run = opts.dry_run @metadata_only = opts.metadata_only @debug = opts.debug - @only = opts.only ||= 'parallels-iso.vm,virtualbox-iso.vm,vmware-iso.vm,qemu.vm' + @only = opts.only ||= nil @except = opts.except @mirror = opts.mirror @headed = opts.headed ||= false @@ -87,7 +87,7 @@ def packer_build_cmd(template, _var_file) var_files.each do |var_file| cmd.insert(5, "-var-file=#{var_file}") if File.exist?(var_file) end if var_files - cmd.insert(4, "-only=#{only}") + cmd.insert(4, "-only=#{only}") if only cmd.insert(4, "-except=#{except}") if except # Build the command line in the correct order and without spaces as future input for the splat operator. cmd.insert(4, "-var cpus=#{cpus}") if cpus diff --git a/lib/bento/test.rb b/lib/bento/test.rb index b4a572f56..21c2b684d 100644 --- a/lib/bento/test.rb +++ b/lib/bento/test.rb @@ -5,12 +5,13 @@ class TestRunner include Common - attr_reader :shared_folder, :boxname, :provider, :box_url, :no_shared, :provisioner + attr_reader :shared_folder, :boxname, :provider, :box_url, :no_shared, :provisioner, :errors def initialize(opts) @debug = opts.debug @no_shared = opts.no_shared @provisioner = opts.provisioner.nil? ? 'shell' : opts.provisioner + @errors = [] end def start @@ -23,6 +24,9 @@ def start end end banner("Testing finished in #{duration(time.real)}.") + unless errors.empty? + raise("Failed Tests:\n #{errors.join("\n")}\n exited #{$CHILD_STATUS}") + end end private @@ -45,8 +49,17 @@ def test_box(md_json) temp_dir = "#{bento_dir}/builds/test-kitchen" Dir.mkdir(temp_dir) unless Dir.exist?(temp_dir) md = box_metadata(md_json) + arch = case md['arch'] + when 'x86_64', 'amd64' + 'amd64' + when 'aarch64', 'arm64' + 'arm64' + else + raise "Unknown arch #{md_data.inspect}" + end @boxname = md['name'] @providers = md['providers'] + @arch = arch @share_disabled = no_shared || /(bsd|opensuse)/.match(boxname) ? true : false dir = "#{File.expand_path('../../', File.dirname(__FILE__))}/lib/bento/test_templates" @@ -58,9 +71,14 @@ def test_box(md_json) Dir.chdir(temp_dir) banner("Test kitchen file located in #{temp_dir}") - test = Mixlib::ShellOut.new('kitchen test', timeout: 900, live_stream: STDOUT) - test.run_command - test.error! + @providers.each do |k, _v| + test = Mixlib::ShellOut.new("kitchen test #{@boxname}-#{@arch}-#{k.tr('_', '-')}", timeout: 900, live_stream: STDOUT) + test.run_command + if test.error? + test.stderr + errors << "#{@boxname}-#{@arch}-#{k}" + end + end Dir.chdir(bento_dir) FileUtils.rm_rf(temp_dir) end diff --git a/lib/bento/test_templates/kitchen.yml.erb b/lib/bento/test_templates/kitchen.yml.erb index f676bab8f..56836444e 100644 --- a/lib/bento/test_templates/kitchen.yml.erb +++ b/lib/bento/test_templates/kitchen.yml.erb @@ -4,13 +4,14 @@ provisioner: platforms: <% @providers.each do |k,v| -%> -- name: <%= @boxname + '-' + k %> +- name: <%= "#{@boxname}-#{@arch}-#{k}" %> driver: name: vagrant provider: <%= k %> vm_hostname: bento-test box: bento-<%= @boxname %> box_url: file://<%= Dir.pwd %>/builds/<%= v['file'] %> + box_arch: <%= @arch %> synced_folders: <% if k =~ /hyperv/ -%> - [".", "/vagrant", "disabled: true"] diff --git a/lib/bento/upload.rb b/lib/bento/upload.rb index d9c5699ca..582cc9d70 100644 --- a/lib/bento/upload.rb +++ b/lib/bento/upload.rb @@ -45,14 +45,14 @@ def upload_box(md_file) md_data['providers'].each_pair do |prov, prov_data| if File.exist?(File.join('builds', prov_data['file'])) puts '' - banner("Uploading #{builds_yml['vagrant_cloud_account']}/#{md_data['box_basename']} version:#{md_data['version']} provider:#{prov}...") + banner("Uploading #{builds_yml['vagrant_cloud_account']}/#{md_data['box_basename']} version:#{md_data['version']} provider:#{prov} arch:#{arch}...") upload_cmd = "vagrant cloud publish --architecture #{arch} #{default_arch(arch)} --no-direct-upload #{builds_yml['vagrant_cloud_account']}/#{md_data['box_basename']} #{md_data['version']} #{prov} builds/#{prov_data['file']} --description '#{box_desc(md_data['box_basename'])}' --short-description '#{box_desc(md_data['box_basename'])}' --version-description '#{ver_desc(md_data)}' --force --release #{public_private_box(md_data['box_basename'])}" shellout(upload_cmd) slug_name = lookup_slug(md_data['name']) if slug_name puts '' - banner("Uploading slug #{builds_yml['vagrant_cloud_account']}/#{slug_name} from #{md_data['box_basename']} version:#{md_data['version']} provider:#{prov}...") + banner("Uploading slug #{builds_yml['vagrant_cloud_account']}/#{slug_name} from #{md_data['box_basename']} version:#{md_data['version']} provider:#{prov} arch:#{arch}...") upload_cmd = "vagrant cloud publish --architecture #{arch} --no-direct-upload #{builds_yml['vagrant_cloud_account']}/#{slug_name} #{md_data['version']} #{prov} builds/#{prov_data['file']} --description '#{slug_desc(slug_name)}' --short-description '#{slug_desc(slug_name)}' --version-description '#{ver_desc(md_data)}' --force --release #{public_private_box(md_data['box_basename'])}" shellout(upload_cmd) end diff --git a/lib/bento/version.rb b/lib/bento/version.rb index afc40757d..9cba61623 100644 --- a/lib/bento/version.rb +++ b/lib/bento/version.rb @@ -1,3 +1,3 @@ module Bento - VERSION = '4.0.0'.freeze + VERSION = '4.0.2'.freeze end diff --git a/os_pkrvars/amazonlinux/amazonlinux-2-aarch64.pkrvars.hcl b/os_pkrvars/amazonlinux/amazonlinux-2-aarch64.pkrvars.hcl new file mode 100644 index 000000000..0895fcfd9 --- /dev/null +++ b/os_pkrvars/amazonlinux/amazonlinux-2-aarch64.pkrvars.hcl @@ -0,0 +1,11 @@ +os_name = "amazonlinux" +os_version = "2" +os_arch = "aarch64" +vbox_source_path = "https://cdn.amazonlinux.com/os-images/latest/kvm-arm64/amzn2-kvm-2.0.20240306.2-arm64.xfs.gpt.qcow2" +vbox_checksum = "file:https://cdn.amazonlinux.com/os-images/latest/kvm-arm64/SHA256SUMS" +parallels_guest_os_type = "fedora-core" +vbox_guest_os_type = "Fedora_64" +vmware_guest_os_type = "arm-fedora-64" +sources_enabled = [ + "source.virtualbox-ovf.vm" +] diff --git a/os_pkrvars/amazonlinux/amazonlinux-2-x86_64.pkrvars.hcl b/os_pkrvars/amazonlinux/amazonlinux-2-x86_64.pkrvars.hcl index 4707acc7d..08baf9a58 100644 --- a/os_pkrvars/amazonlinux/amazonlinux-2-x86_64.pkrvars.hcl +++ b/os_pkrvars/amazonlinux/amazonlinux-2-x86_64.pkrvars.hcl @@ -1,21 +1,11 @@ os_name = "amazonlinux" os_version = "2" os_arch = "x86_64" -vbox_guest_os_type = "RedHat_64" +vbox_source_path = "https://cdn.amazonlinux.com/os-images/latest/virtualbox/amzn2-virtualbox-2.0.20240306.2-x86_64.xfs.gpt.vdi" +vbox_checksum = "file:https://cdn.amazonlinux.com/os-images/latest/virtualbox/SHA256SUMS" +parallels_guest_os_type = "centos" +vbox_guest_os_type = "RedHat_64" +vmware_guest_os_type = "rhel9-64" sources_enabled = [ - "source.virtualbox-ovf.amazonlinux" -] -vboxmanage = [ - [ - "modifyvm", - "{{ .Name }}", - "--memory", - "2048", - "--cpus", - "2", - "--audio", - "none", - "--nat-localhostreachable1", - "on", - ] + "source.virtualbox-ovf.vm" ] diff --git a/os_pkrvars/amazonlinux/amazonlinux-2023-aarch64.pkrvars.hcl b/os_pkrvars/amazonlinux/amazonlinux-2023-aarch64.pkrvars.hcl new file mode 100644 index 000000000..6a72f30af --- /dev/null +++ b/os_pkrvars/amazonlinux/amazonlinux-2023-aarch64.pkrvars.hcl @@ -0,0 +1,11 @@ +os_name = "amazonlinux" +os_version = "2023" +os_arch = "aarch64" +vbox_source_path = "https://cdn.amazonlinux.com/al2023/os-images/2023.3.20240312.0/vmware/al2023-vmware_esx-2023.3.20240312.0-kernel-6.1-x86_64.xfs.gpt.ova" +vbox_checksum = "file:https://cdn.amazonlinux.com/al2023/os-images/2023.3.20240312.0/vmware/SHA256SUMS" +parallels_guest_os_type = "fedora-core" +vbox_guest_os_type = "Fedora_64" +vmware_guest_os_type = "arm-fedora-64" +sources_enabled = [ + "source.virtualbox-ovf.vm" +] diff --git a/os_pkrvars/amazonlinux/amazonlinux-2023-x86_64.pkrvars.hcl b/os_pkrvars/amazonlinux/amazonlinux-2023-x86_64.pkrvars.hcl index 421326585..b059b2b4a 100644 --- a/os_pkrvars/amazonlinux/amazonlinux-2023-x86_64.pkrvars.hcl +++ b/os_pkrvars/amazonlinux/amazonlinux-2023-x86_64.pkrvars.hcl @@ -1,21 +1,11 @@ -os_name = "amazonlinux" -os_version = "2023" -os_arch = "x86_64" -vbox_guest_os_type = "RedHat_64" +os_name = "amazonlinux" +os_version = "2023" +os_arch = "x86_64" +vbox_source_path = "https://cdn.amazonlinux.com/al2023/os-images/latest/vmware/al2023-vmware_esx-2023.3.20240312.0-kernel-6.1-x86_64.xfs.gpt.ova" +vbox_checksum = "file:https://cdn.amazonlinux.com/al2023/os-images/latest/vmware/SHA256SUMS" +parallels_guest_os_type = "fedora-core" +vbox_guest_os_type = "Fedora_64" +vmware_guest_os_type = "fedora-64" sources_enabled = [ - "source.virtualbox-ovf.amazonlinux" -] -vboxmanage = [ - [ - "modifyvm", - "{{ .Name }}", - "--memory", - "2048", - "--cpus", - "2", - "--audio", - "none", - "--nat-localhostreachable1", - "on", - ] + "source.virtualbox-ovf.vm" ] diff --git a/os_pkrvars/centos/centos-7-aarch64.pkrvars.hcl b/os_pkrvars/centos/centos-7-aarch64.pkrvars.hcl index c9cb1a8bc..1d5b199f2 100644 --- a/os_pkrvars/centos/centos-7-aarch64.pkrvars.hcl +++ b/os_pkrvars/centos/centos-7-aarch64.pkrvars.hcl @@ -5,5 +5,5 @@ iso_url = "https://quantum-mirror.hu/mirrors/pub/centos-altarch/ iso_checksum = "file:https://quantum-mirror.hu/mirrors/pub/centos-altarch/7.9.2009/isos/aarch64/sha256sum.txt" parallels_guest_os_type = "centos" vbox_guest_os_type = "RedHat_64" -vmware_guest_os_type = "arm-centos-64" +vmware_guest_os_type = "arm-other-64" boot_command = ["<wait><up>e<wait><down><down><end><wait> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/rhel/7ks.cfg <leftCtrlOn>x<leftCtrlOff>"] diff --git a/os_pkrvars/centos/centos-stream-8-aarch64.pkrvars.hcl b/os_pkrvars/centos/centos-stream-8-aarch64.pkrvars.hcl index 20fb10372..08d946e6b 100644 --- a/os_pkrvars/centos/centos-stream-8-aarch64.pkrvars.hcl +++ b/os_pkrvars/centos/centos-stream-8-aarch64.pkrvars.hcl @@ -5,5 +5,5 @@ iso_url = "https://mirrors.edge.kernel.org/centos/8-stream/isos/ iso_checksum = "file:https://mirrors.edge.kernel.org/centos/8-stream/isos/aarch64/CHECKSUM" parallels_guest_os_type = "centos" vbox_guest_os_type = "RedHat_64" -vmware_guest_os_type = "arm-centos-64" +vmware_guest_os_type = "arm-other-64" boot_command = ["<wait><up>e<wait><down><down><end><wait> inst.text inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/rhel/8ks.cfg <leftCtrlOn>x<leftCtrlOff>"] diff --git a/os_pkrvars/centos/centos-stream-9-aarch64.pkrvars.hcl b/os_pkrvars/centos/centos-stream-9-aarch64.pkrvars.hcl index 9acbd0cf6..635e561ba 100644 --- a/os_pkrvars/centos/centos-stream-9-aarch64.pkrvars.hcl +++ b/os_pkrvars/centos/centos-stream-9-aarch64.pkrvars.hcl @@ -5,5 +5,5 @@ iso_url = "https://mirror.stream.centos.org/9-stream/BaseOS/aarc iso_checksum = "file:https://mirror.stream.centos.org/9-stream/BaseOS/aarch64/iso/CentOS-Stream-9-latest-aarch64-dvd1.iso.SHA256SUM" parallels_guest_os_type = "centos" vbox_guest_os_type = "RedHat_64" -vmware_guest_os_type = "arm-centos-64" +vmware_guest_os_type = "arm-rhel9-64" boot_command = ["<wait><up>e<wait><down><down><end><wait> inst.text inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/rhel/9ks.cfg <leftCtrlOn>x<leftCtrlOff>"] diff --git a/os_pkrvars/debian/debian-11-aarch64.pkrvars.hcl b/os_pkrvars/debian/debian-11-aarch64.pkrvars.hcl index 88909284d..e06e354f1 100644 --- a/os_pkrvars/debian/debian-11-aarch64.pkrvars.hcl +++ b/os_pkrvars/debian/debian-11-aarch64.pkrvars.hcl @@ -5,5 +5,5 @@ iso_url = "https://cdimage.debian.org/cdimage/archive/latest-old iso_checksum = "file:https://cdimage.debian.org/cdimage/archive/latest-oldstable/arm64/iso-dvd/SHA256SUMS" parallels_guest_os_type = "debian" vbox_guest_os_type = "Debian_64" -vmware_guest_os_type = "arm-debian-64" +vmware_guest_os_type = "arm-debian11-64" boot_command = ["<wait><up>e<wait><down><down><down><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><wait>install <wait> preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/debian/preseed.cfg <wait>debian-installer=en_US.UTF-8 <wait>auto <wait>locale=en_US.UTF-8 <wait>kbd-chooser/method=us <wait>keyboard-configuration/xkb-keymap=us <wait>netcfg/get_hostname={{ .Name }} <wait>netcfg/get_domain=vagrantup.com <wait>fb=false <wait>debconf/frontend=noninteractive <wait>console-setup/ask_detect=false <wait>console-keymaps-at/keymap=us <wait>grub-installer/bootdev=/dev/sda <wait><f10><wait>"] diff --git a/os_pkrvars/debian/debian-12-aarch64.pkrvars.hcl b/os_pkrvars/debian/debian-12-aarch64.pkrvars.hcl index 1fcfb21ac..a1f98a930 100644 --- a/os_pkrvars/debian/debian-12-aarch64.pkrvars.hcl +++ b/os_pkrvars/debian/debian-12-aarch64.pkrvars.hcl @@ -5,5 +5,5 @@ iso_url = "https://cdimage.debian.org/cdimage/release/12.5.0/arm iso_checksum = "file:https://cdimage.debian.org/cdimage/release/12.5.0/arm64/iso-dvd/SHA256SUMS" parallels_guest_os_type = "debian" vbox_guest_os_type = "Debian_64" -vmware_guest_os_type = "arm-debian-64" +vmware_guest_os_type = "arm-debian12-64" boot_command = ["<wait><up>e<wait><down><down><down><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><wait>install <wait> preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/debian/preseed.cfg <wait>debian-installer=en_US.UTF-8 <wait>auto <wait>locale=en_US.UTF-8 <wait>kbd-chooser/method=us <wait>keyboard-configuration/xkb-keymap=us <wait>netcfg/get_hostname={{ .Name }} <wait>netcfg/get_domain=vagrantup.com <wait>fb=false <wait>debconf/frontend=noninteractive <wait>console-setup/ask_detect=false <wait>console-keymaps-at/keymap=us <wait>grub-installer/bootdev=/dev/sda <wait><f10><wait>"] diff --git a/os_pkrvars/freebsd/freebsd-13-aarch64.pkrvars.hcl b/os_pkrvars/freebsd/freebsd-13-aarch64.pkrvars.hcl index dd7dc26fc..d981c6986 100644 --- a/os_pkrvars/freebsd/freebsd-13-aarch64.pkrvars.hcl +++ b/os_pkrvars/freebsd/freebsd-13-aarch64.pkrvars.hcl @@ -5,5 +5,5 @@ iso_url = "https://download.freebsd.org/releases/arm64/aarch64/I iso_checksum = "file:https://download.freebsd.org/releases/arm64/aarch64/ISO-IMAGES/13.3/CHECKSUM.SHA256-FreeBSD-13.3-RELEASE-arm64-aarch64" parallels_guest_os_type = "freebsd" vbox_guest_os_type = "FreeBSD_64" -vmware_guest_os_type = "arm-freebsd-64" +vmware_guest_os_type = "arm-freebsd13-64" boot_command = ["<wait><esc><wait>boot -s<wait><enter><wait><wait10><wait10>/bin/sh<enter><wait>mdmfs -s 100m md1 /tmp<enter><wait>mdmfs -s 100m md2 /mnt<enter><wait>dhclient -p /tmp/dhclient.em0.pid -l /tmp/dhclient.lease.em0 em0<enter><wait><wait5>fetch -o /tmp/installerconfig http://{{ .HTTPIP }}:{{ .HTTPPort }}/freebsd/installerconfig && bsdinstall script /tmp/installerconfig<enter><wait>"] diff --git a/os_pkrvars/freebsd/freebsd-14-aarch64.pkrvars.hcl b/os_pkrvars/freebsd/freebsd-14-aarch64.pkrvars.hcl index 69344d36c..f2dfcfdb6 100644 --- a/os_pkrvars/freebsd/freebsd-14-aarch64.pkrvars.hcl +++ b/os_pkrvars/freebsd/freebsd-14-aarch64.pkrvars.hcl @@ -5,5 +5,5 @@ iso_url = "https://download.freebsd.org/releases/arm64/aarch64/I iso_checksum = "file:https://download.freebsd.org/releases/arm64/aarch64/ISO-IMAGES/14.0/CHECKSUM.SHA256-FreeBSD-14.0-RELEASE-arm64-aarch64" parallels_guest_os_type = "freebsd" vbox_guest_os_type = "FreeBSD_64" -vmware_guest_os_type = "arm-freebsd-64" +vmware_guest_os_type = "arm-freebsd14-64" boot_command = ["<wait><esc><wait>boot -s<wait><enter><wait><wait10><wait10>/bin/sh<enter><wait>mdmfs -s 100m md1 /tmp<enter><wait>mdmfs -s 100m md2 /mnt<enter><wait>dhclient -p /tmp/dhclient.em0.pid -l /tmp/dhclient.lease.em0 em0<enter><wait><wait5>fetch -o /tmp/installerconfig http://{{ .HTTPIP }}:{{ .HTTPPort }}/freebsd/installerconfig && bsdinstall script /tmp/installerconfig<enter><wait>"] diff --git a/os_pkrvars/opensuse/opensuse-leap-15-aarch64.pkrvars.hcl b/os_pkrvars/opensuse/opensuse-leap-15-aarch64.pkrvars.hcl index ae1d00738..29b434d07 100644 --- a/os_pkrvars/opensuse/opensuse-leap-15-aarch64.pkrvars.hcl +++ b/os_pkrvars/opensuse/opensuse-leap-15-aarch64.pkrvars.hcl @@ -5,5 +5,5 @@ iso_url = "http://provo-mirror.opensuse.org/distribution/leap/15 iso_checksum = "file:https://provo-mirror.opensuse.org/distribution/leap/15.5/iso/openSUSE-Leap-15.5-DVD-aarch64-Media.iso.sha256" parallels_guest_os_type = "opensuse" vbox_guest_os_type = "OpenSUSE_64" -vmware_guest_os_type = "arm-opensuse-64" +vmware_guest_os_type = "arm-other-64" boot_command = ["<wait5><esc><wait>e<wait><down><down><down><down><end> biosdevname=0 net.ifnames=0 netdevice=eth0 netsetup=dhcp lang=en_US textmode=1 modprobe.blacklist=vmwgfx autoyast=http://{{ .HTTPIP }}:{{ .HTTPPort }}/opensuse/autoinst-uefi.xml<f10><wait>"] diff --git a/os_pkrvars/oracle/oracle-7-aarch64.pkrvars.hcl b/os_pkrvars/oracle/oracle-7-aarch64.pkrvars.hcl index ec6471c14..67873935e 100644 --- a/os_pkrvars/oracle/oracle-7-aarch64.pkrvars.hcl +++ b/os_pkrvars/oracle/oracle-7-aarch64.pkrvars.hcl @@ -5,5 +5,5 @@ iso_url = "https://yum.oracle.com/ISOS/OracleLinux/OL7/u9/aarch6 iso_checksum = "fd2c1b1e26858576534f6e6c4cf000a15cd81bec010dad5e827b204a14a1750e" parallels_guest_os_type = "centos" vbox_guest_os_type = "RedHat_64" -vmware_guest_os_type = "arm-centos-64" +vmware_guest_os_type = "arm-other-64" boot_command = ["<wait><up>e<wait><down><down><end><wait> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/rhel/7ks.cfg <leftCtrlOn>x<leftCtrlOff>"] diff --git a/os_pkrvars/oracle/oracle-8-aarch64.pkrvars.hcl b/os_pkrvars/oracle/oracle-8-aarch64.pkrvars.hcl index dd1c6561d..8656e267d 100644 --- a/os_pkrvars/oracle/oracle-8-aarch64.pkrvars.hcl +++ b/os_pkrvars/oracle/oracle-8-aarch64.pkrvars.hcl @@ -5,5 +5,5 @@ iso_url = "https://yum.oracle.com/ISOS/OracleLinux/OL8/u9/aarch6 iso_checksum = "c732ec9bb4a85349c0f1ca82020a8514341247506d114b8b79ec32bf99d59ea0" parallels_guest_os_type = "centos" vbox_guest_os_type = "RedHat_64" -vmware_guest_os_type = "arm-centos-64" +vmware_guest_os_type = "arm-other-64" boot_command = ["<wait><up>e<wait><down><down><end><wait> inst.text inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/rhel/8ks.cfg <leftCtrlOn>x<leftCtrlOff>"] diff --git a/os_pkrvars/oracle/oracle-9-aarch64.pkrvars.hcl b/os_pkrvars/oracle/oracle-9-aarch64.pkrvars.hcl index f5384427d..2357d748e 100644 --- a/os_pkrvars/oracle/oracle-9-aarch64.pkrvars.hcl +++ b/os_pkrvars/oracle/oracle-9-aarch64.pkrvars.hcl @@ -5,5 +5,5 @@ iso_url = "https://yum.oracle.com/ISOS/OracleLinux/OL9/u3/aarch6 iso_checksum = "7cc50a48f361cb1100a28621ba455edaac3a38182f6dd3fe67588b3eeaf18dc3" parallels_guest_os_type = "centos" vbox_guest_os_type = "RedHat_64" -vmware_guest_os_type = "arm-centos-64" +vmware_guest_os_type = "arm-rhel9-64" boot_command = ["<wait><up>e<wait><down><down><end><wait> inst.text inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/rhel/9ks.cfg <leftCtrlOn>x<leftCtrlOff>"] diff --git a/os_pkrvars/rhel/rhel-7-aarch64.pkrvars.hcl b/os_pkrvars/rhel/rhel-7-aarch64.pkrvars.hcl index a6c26ef33..940473f9a 100644 --- a/os_pkrvars/rhel/rhel-7-aarch64.pkrvars.hcl +++ b/os_pkrvars/rhel/rhel-7-aarch64.pkrvars.hcl @@ -5,5 +5,5 @@ iso_url = "https://www.redhat.com/en/technologies/linux-platform iso_checksum = "1b8004961150b60f6c5ec3f25139d3217eee55707cf9fa19e826919fc58e328b" parallels_guest_os_type = "rhel" vbox_guest_os_type = "RedHat_64" -vmware_guest_os_type = "arm-centos-64" +vmware_guest_os_type = "arm-other-64" boot_command = ["<wait><up><wait><tab> inst.text inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/rhel/7ks.cfg<enter><wait>"] diff --git a/os_pkrvars/rhel/rhel-8-aarch64.pkrvars.hcl b/os_pkrvars/rhel/rhel-8-aarch64.pkrvars.hcl index 0785f59d0..e5950dceb 100644 --- a/os_pkrvars/rhel/rhel-8-aarch64.pkrvars.hcl +++ b/os_pkrvars/rhel/rhel-8-aarch64.pkrvars.hcl @@ -5,5 +5,5 @@ iso_url = "https://www.redhat.com/en/technologies/linux-platform iso_checksum = "none" parallels_guest_os_type = "rhel" vbox_guest_os_type = "RedHat_64" -vmware_guest_os_type = "arm-centos-64" +vmware_guest_os_type = "arm-other-64" boot_command = ["<wait><up><wait><tab> inst.text inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/rhel/8ks.cfg<enter><wait>"] diff --git a/os_pkrvars/rhel/rhel-9-aarch64.pkrvars.hcl b/os_pkrvars/rhel/rhel-9-aarch64.pkrvars.hcl index 345324625..42d86f15d 100644 --- a/os_pkrvars/rhel/rhel-9-aarch64.pkrvars.hcl +++ b/os_pkrvars/rhel/rhel-9-aarch64.pkrvars.hcl @@ -5,5 +5,5 @@ iso_url = "https://www.redhat.com/en/technologies/linux-platform iso_checksum = "none" parallels_guest_os_type = "rhel" vbox_guest_os_type = "RedHat_64" -vmware_guest_os_type = "arm-centos-64" +vmware_guest_os_type = "arm-rhel9-64" boot_command = ["<wait><up><wait><tab> inst.text inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/rhel/9ks.cfg<enter><wait>"] diff --git a/os_pkrvars/rockylinux/rockylinux-8-aarch64.pkrvars.hcl b/os_pkrvars/rockylinux/rockylinux-8-aarch64.pkrvars.hcl index 9a542230e..8f769dde5 100644 --- a/os_pkrvars/rockylinux/rockylinux-8-aarch64.pkrvars.hcl +++ b/os_pkrvars/rockylinux/rockylinux-8-aarch64.pkrvars.hcl @@ -5,5 +5,5 @@ iso_url = "https://download.rockylinux.org/pub/rocky/8/isos/aarc iso_checksum = "file:https://download.rockylinux.org/pub/rocky/8/isos/aarch64/CHECKSUM" parallels_guest_os_type = "centos" vbox_guest_os_type = "RedHat_64" -vmware_guest_os_type = "arm-centos-64" +vmware_guest_os_type = "arm-other-64" boot_command = ["<wait><up>e<wait><down><down><end><wait> inst.text inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/rhel/8ks.cfg <leftCtrlOn>x<leftCtrlOff>"] diff --git a/packer_templates/amz_seed_iso/user-data b/packer_templates/amz_seed_iso/user-data index 222eb4e59..078342858 100644 --- a/packer_templates/amz_seed_iso/user-data +++ b/packer_templates/amz_seed_iso/user-data @@ -1,29 +1,15 @@ #cloud-config #vim:syntax=yaml -user: vagrant -password: vagrant +users: + - name: vagrant + lock_passwd: false + passwd: $6$TbOu26d1hYO4EC/D$MymO7cTo/tID7tkH8TtAGyAdaK9nHwGQfDD9KwQmql3xP1BPPc67YCmoR8UO3Dw5jacOx3GvnBLqvAmHLHC4H0 + sudo: ALL=(ALL) NOPASSWD:ALL -# install packages for vbox guest additions to complete -packages: - - gcc - - kernel-devel - - kernel-headers - - dkms - - make - - bzip2 - - perl - -# make sure we don't setup the network on every boot +# Enable password authentication for SSH write_files: - - path: /etc/cloud/cloud.cfg.d/80_disable_network_after_firstboot.cfg - content: | - # Disable network configuration after first boot - network: - config: disabled - - path: /etc/cloud/cloud.cfg.d/90_enable_ssh_pwauth.cfg content: | runcmd: - sed -i "s/^PasswordAuthentication.*/PasswordAuthentication yes/" /etc/ssh/sshd_config - - sed -i "/^HWADDR/d" /etc/sysconfig/network-scripts/ifcfg-eth0 - - systemctl restart network sshd + - systemctl restart sshd diff --git a/packer_templates/pkr-builder.pkr.hcl b/packer_templates/pkr-builder.pkr.hcl index 4604def93..8111c87e4 100644 --- a/packer_templates/pkr-builder.pkr.hcl +++ b/packer_templates/pkr-builder.pkr.hcl @@ -114,7 +114,7 @@ locals { "${path.root}/scripts/fedora/cleanup_dnf.sh", "${path.root}/scripts/_common/minimize.sh" ] : ( - "${var.os_name}-${substr(var.os_version, 0, 1)}" == "amazonlinux-2" || + "${var.os_name}-${var.os_version}" == "amazonlinux-2" || "${var.os_name}-${substr(var.os_version, 0, 1)}" == "centos-7" || "${var.os_name}-${substr(var.os_version, 0, 1)}" == "oracle-7" || "${var.os_name}-${substr(var.os_version, 0, 1)}" == "rhel-7" ? [ diff --git a/packer_templates/pkr-sources.pkr.hcl b/packer_templates/pkr-sources.pkr.hcl index 25f92d8ee..2fe6dbb03 100644 --- a/packer_templates/pkr-sources.pkr.hcl +++ b/packer_templates/pkr-sources.pkr.hcl @@ -54,11 +54,6 @@ locals { var.is_windows ? "attach" : "upload" ) : var.vbox_guest_additions_mode - # virtualbox-ovf - vbox_source = var.vbox_source == null ? ( - var.os_name == "amazonlinux" ? "${path.root}/amz_working_files/amazon2.ovf" : null - ) : var.vbox_source - # vmware-iso vmware_tools_upload_flavor = var.vmware_tools_upload_flavor == null ? ( var.is_windows ? "windows" : "linux" @@ -174,11 +169,17 @@ source "parallels-iso" "vm" { } source "qemu" "vm" { # QEMU specific options - accelerator = var.qemu_accelerator - display = var.headless ? "none" : var.qemu_display - machine_type = local.qemu_machine_type - qemu_binary = local.qemu_binary - qemuargs = local.qemuargs + accelerator = var.qemu_accelerator + display = var.headless ? "none" : var.qemu_display + disk_image = var.qemu_disk_image + efi_boot = var.qemu_efi_boot + efi_firmware_code = var.qemu_efi_firmware_code + efi_firmware_vars = var.qemu_efi_firmware_vars + efi_drop_efivars = var.qemu_efi_drop_efivars + format = var.qemu_format + machine_type = local.qemu_machine_type + qemu_binary = local.qemu_binary + qemuargs = local.qemuargs # Source block common options boot_command = var.boot_command boot_wait = var.qemu_boot_wait == null ? local.default_boot_wait : var.qemu_boot_wait @@ -241,10 +242,11 @@ source "virtualbox-iso" "vm" { winrm_username = var.winrm_username vm_name = local.vm_name } -source "virtualbox-ovf" "amazonlinux" { +source "virtualbox-ovf" "vm" { # Virtualbox specific options guest_additions_path = var.vbox_guest_additions_path - source_path = local.vbox_source + source_path = var.vbox_source_path + checksum = var.vbox_checksum vboxmanage = var.vboxmanage virtualbox_version_file = var.virtualbox_version_file # Source block common options diff --git a/packer_templates/pkr-variables.pkr.hcl b/packer_templates/pkr-variables.pkr.hcl index 049ca0d6d..a09aca878 100644 --- a/packer_templates/pkr-variables.pkr.hcl +++ b/packer_templates/pkr-variables.pkr.hcl @@ -38,7 +38,6 @@ variable "no_proxy" { variable "sources_enabled" { type = list(string) default = [ - "source.hyperv-iso.vm", "source.parallels-iso.vm", "source.qemu.vm", "source.virtualbox-iso.vm", @@ -119,6 +118,36 @@ variable "qemu_display" { type = string default = "none" } +variable "qemu_disk_image" { + type = bool + default = null + description = "Whether iso_url is a bootable qcow2 disk image" +} +variable "qemu_efi_boot" { + type = bool + default = false + description = "Enable EFI boot" +} +variable "qemu_efi_firmware_code" { + type = string + default = null + description = "EFI firmware code path" +} +variable "qemu_efi_firmware_vars" { + type = string + default = null + description = "EFI firmware vars file path" +} +variable "qemu_efi_drop_efivars" { + type = bool + default = false + description = "Drop EFI vars" +} +variable "qemu_format" { + type = string + default = "qcow2" + description = "Disk format, takes qcow2 or raw" +} variable "qemu_machine_type" { type = string default = null @@ -185,9 +214,15 @@ variable "virtualbox_version_file" { } # virtualbox-ovf -variable "vbox_source" { - type = string - default = null +variable "vbox_source_path" { + type = string + default = null + description = "Path to the OVA/OVF file" +} +variable "vbox_checksum" { + type = string + default = null + description = "Checksum of the OVA/OVF file" } # vmware-iso @@ -220,7 +255,7 @@ variable "vmware_tools_upload_path" { } variable "vmware_version" { type = number - default = 20 + default = 21 } variable "vmware_vmx_data" { type = map(string) diff --git a/packer_templates/scripts/_common/vmware_rhel.sh b/packer_templates/scripts/_common/vmware_rhel.sh index 835230df6..d8f8e7399 100644 --- a/packer_templates/scripts/_common/vmware_rhel.sh +++ b/packer_templates/scripts/_common/vmware_rhel.sh @@ -1,18 +1,20 @@ -#!/bin/sh -eux +#!/bin/bash -eux # set a default HOME_DIR environment variable if not set -HOME_DIR="${HOME_DIR:-/home/vagrant}"; +HOME_DIR="${HOME_DIR:-/home/vagrant}" case "$PACKER_BUILDER_TYPE" in vmware-iso|vmware-vmx) - # determine the major EL version we're runninng - major_version="$(sed 's/^.\+ release \([.0-9]\+\).*/\1/' /etc/redhat-release | awk -F. '{print $1}')"; + # determine the major EL version we're runninng + major_version="$(sed 's/^.\+ release \([.0-9]\+\).*/\1/' /etc/redhat-release | awk -F. '{print $1}')" - # make sure we use dnf on EL 8+ - if [ "$major_version" -ge 8 ]; then - dnf -y install open-vm-tools - else - yum -y install open-vm-tools - fi - ;; + # make sure we use dnf on EL 8+ + if [ "$major_version" -ge 8 ]; then + dnf install -y open-vm-tools + else + yum install -y open-vm-tools + fi + + systemctl enable vmtoolsd + systemctl start vmtoolsd esac diff --git a/packer_templates/scripts/rhel/cleanup_dnf.sh b/packer_templates/scripts/rhel/cleanup_dnf.sh index 7f8ddd206..2018ca3c4 100644 --- a/packer_templates/scripts/rhel/cleanup_dnf.sh +++ b/packer_templates/scripts/rhel/cleanup_dnf.sh @@ -26,9 +26,9 @@ echo "clean all package cache information" dnf -y clean all --enablerepo=\* # Clean up network interface persistence -rm -f /etc/udev/rules.d/70-persistent-net.rules; +rm -rf /etc/udev/rules.d/70-persistent-net.rules; mkdir -p /etc/udev/rules.d/70-persistent-net.rules; -rm -f /lib/udev/rules.d/75-persistent-net-generator.rules; +rm -rf /lib/udev/rules.d/75-persistent-net-generator.rules; rm -rf /dev/.udev/; if test -f /etc/sysconfig/network-scripts/ifcfg-*; then From 061ca8217a151bea5676fd239691fb1b37fa7dbf Mon Sep 17 00:00:00 2001 From: Corey Hemminger <hemminger@hotmail.com> Date: Thu, 11 Apr 2024 17:34:21 -0500 Subject: [PATCH 1549/1622] switch to ubuntu-latest runners (#1561) - Add back iso check, packer lint, and amazonlinux builds to build pipeline - Fix amazonlinux 2 build script - Added amazonlinux 2023 build scripts - Migrate Virtualbox and Qemu builds to github hosted runners from self-hosted runners - Added test-kitchen and kitchen-vagrant dependencies to gemspec - Added arg for bento test command to specify a specific build to test - this passes the arg to the kitchen test command - Fix vagrant post-processor to specify custom vagrant file for freebsd builds - Remove gui true from windows custom vagrant file - Fix test to skip removing linux-firmware on oraclelinux - Renamed oracle boxes to oraclelinux for consistency and remove edge cases in code - Removed unused -c flag for specifying a specific config file for bento build - Added --on-error flag to bento build command to pass to packer command - Added cpu architecture support to bento build command, so it'll only test builds that work with the current cpu architecture - Remove additional Ubuntu user-date last-command that may be locking macaddress - Add to test to move failed test boxes to builds/failed_testing directory - Changed ssh_timeout to 15m --- .github/workflows/ci-build.yml | 16 +++- .github/workflows/pkr-bld-amazonlinux-x64.yml | 64 ++++++++------- .github/workflows/pkr-bld-hyperv-x64.yml | 20 ++--- .github/workflows/pkr-bld-parallels-arm64.yml | 35 ++++----- .github/workflows/pkr-bld-parallels-x64.yml | 35 ++++----- .github/workflows/pkr-bld-qemu-arm64.yml | 60 +++++++------- .github/workflows/pkr-bld-qemu-x64.yml | 78 ++++++++++++------- .../workflows/pkr-bld-virtualbox-arm64.yml | 68 ++++++++-------- .github/workflows/pkr-bld-virtualbox-x64.yml | 74 ++++++++++-------- .github/workflows/pkr-bld-vmware-arm64.yml | 35 ++++----- .github/workflows/pkr-bld-vmware-x64.yml | 35 ++++----- .gitignore | 1 + CHANGELOG.md | 27 ++++++- amazonlinux-2-x86_64-virtualbox-build.sh | 19 +++-- amazonlinux-2023-aarch64-virtualbox-build.sh | 19 +++-- amazonlinux-2023-x86_64-virtualbox-build.sh | 19 +++-- bento.gemspec | 2 + builds.yml | 8 +- builds/failed_testing/.gitkeep | 0 builds/iso/.gitkeep | 0 lib/bento/cli.rb | 16 ++-- lib/bento/common.rb | 36 ++------- lib/bento/providermetadata.rb | 2 +- lib/bento/runner.rb | 12 +-- lib/bento/test.rb | 36 +++++++-- lib/bento/version.rb | 2 +- .../amazonlinux-2-x86_64.pkrvars.hcl | 10 +-- .../opensuse-leap-15-aarch64.pkrvars.hcl | 2 +- .../opensuse-leap-15-x86_64.pkrvars.hcl | 2 +- .../oraclelinux-7-aarch64.pkrvars.hcl} | 2 +- .../oraclelinux-7-x86_64.pkrvars.hcl} | 2 +- .../oraclelinux-8-aarch64.pkrvars.hcl} | 2 +- .../oraclelinux-8-x86_64.pkrvars.hcl} | 2 +- .../oraclelinux-9-aarch64.pkrvars.hcl} | 2 +- .../oraclelinux-9-x86_64.pkrvars.hcl} | 2 +- os_pkrvars/sles/sles-15-x86_64.pkrvars.hcl | 2 +- packer_templates/http/ubuntu/user-data | 2 +- packer_templates/pkr-builder.pkr.hcl | 10 ++- packer_templates/pkr-variables.pkr.hcl | 2 +- packer_templates/scripts/rhel/cleanup_yum.sh | 5 +- packer_templates/vagrantfile-windows.template | 1 - 41 files changed, 419 insertions(+), 348 deletions(-) create mode 100644 builds/failed_testing/.gitkeep create mode 100644 builds/iso/.gitkeep rename os_pkrvars/{oracle/oracle-7-aarch64.pkrvars.hcl => oraclelinux/oraclelinux-7-aarch64.pkrvars.hcl} (93%) rename os_pkrvars/{oracle/oracle-7-x86_64.pkrvars.hcl => oraclelinux/oraclelinux-7-x86_64.pkrvars.hcl} (92%) rename os_pkrvars/{oracle/oracle-8-aarch64.pkrvars.hcl => oraclelinux/oraclelinux-8-aarch64.pkrvars.hcl} (93%) rename os_pkrvars/{oracle/oracle-8-x86_64.pkrvars.hcl => oraclelinux/oraclelinux-8-x86_64.pkrvars.hcl} (92%) rename os_pkrvars/{oracle/oracle-9-aarch64.pkrvars.hcl => oraclelinux/oraclelinux-9-aarch64.pkrvars.hcl} (93%) rename os_pkrvars/{oracle/oracle-9-x86_64.pkrvars.hcl => oraclelinux/oraclelinux-9-x86_64.pkrvars.hcl} (92%) diff --git a/.github/workflows/ci-build.yml b/.github/workflows/ci-build.yml index 6864185e1..59932627c 100644 --- a/.github/workflows/ci-build.yml +++ b/.github/workflows/ci-build.yml @@ -28,9 +28,18 @@ jobs: powershell-lint: uses: chef/github-workflows/.github/workflows/powershell-lint.yml@main -# pkr-bld-amazonlinux-x64: -# uses: ./.github/workflows/pkr-bld-amazonlinux-x64.yml -# secrets: inherit + packer-iso-check: + uses: chef/github-workflows/.github/workflows/packer-iso-url-checker.yml@main + with: + EXCLUDE_REGEX: 'amazonlinux-2.*|rhel.*|sles.*|solaris.*|windows-11-aarch64.*' + + packer-lint: + uses: chef/github-workflows/.github/workflows/packer-lint.yml@main + secrets: inherit + + pkr-bld-amazonlinux-x64: + uses: ./.github/workflows/pkr-bld-amazonlinux-x64.yml + secrets: inherit pkr-bld-hyperv-x64: uses: ./.github/workflows/pkr-bld-hyperv-x64.yml @@ -77,6 +86,7 @@ jobs: - xml-lint - powershell-lint - shellcheck-lint + - packer-lint runs-on: Ubuntu-latest steps: - name: Decide whether the needed jobs succeeded or failed diff --git a/.github/workflows/pkr-bld-amazonlinux-x64.yml b/.github/workflows/pkr-bld-amazonlinux-x64.yml index 033202112..e12c54d14 100644 --- a/.github/workflows/pkr-bld-amazonlinux-x64.yml +++ b/.github/workflows/pkr-bld-amazonlinux-x64.yml @@ -4,51 +4,61 @@ on: env: PACKER_GITHUB_API_TOKEN: "${{ secrets.GITHUB_TOKEN }}" + PACKER_LOG: "1" jobs: x86_64: - runs-on: [self-hosted, X64, virtualbox] + runs-on: ubuntu-latest strategy: fail-fast: false matrix: os: - amazonlinux-2 + - amazonlinux-2023 steps: + - name: Install Vagrant and VirtualBox + run: | + wget -O- https://apt.releases.hashicorp.com/gpg | gpg --dearmor | sudo tee /usr/share/keyrings/hashicorp-archive-keyring.gpg + wget -O- https://www.virtualbox.org/download/oracle_vbox_2016.asc | gpg --dearmor | sudo tee /usr/share/keyrings/oracle-virtualbox-2016.gpg + echo "deb [signed-by=/usr/share/keyrings/hashicorp-archive-keyring.gpg] https://apt.releases.hashicorp.com $(lsb_release -cs) main" | sudo tee /etc/apt/sources.list.d/hashicorp.list + echo "deb [signed-by=/usr/share/keyrings/oracle-virtualbox-2016.gpg] https://download.virtualbox.org/virtualbox/debian $(lsb_release -cs) contrib" | sudo tee /etc/apt/sources.list.d/virtualbox.list + sudo apt-get update + sudo apt-get install -y software-properties-common vagrant virtualbox-7.0 qemu-utils genisoimage + VBoxManage --version + vagrant --version + - name: Install Chef + uses: actionshub/chef-install@3.0.0 + - name: Setup Packer + uses: hashicorp/setup-packer@main + with: + version: latest - name: Checkout uses: actions/checkout@main -# - name: Setup Packer -# uses: hashicorp/setup-packer@main -# with: -# version: latest - - name: Packer Init - run: packer init -upgrade packer_templates - - name: Packer FMT - run: if packer fmt -check -recursive .; then exit 0; else echo "Some packer files need to be formatted, run 'packer fmt -recursive .' to fix"; exit 1; fi - - name: Packer Validate - run: packer validate -var-file=os_pkrvars/$(echo ${{ matrix.os }} | cut -d "-" -f 1)/"${{ matrix.os }}-x86_64.pkrvars.hcl" packer_templates + - name: Install Bento + run: | + eval "$(chef shell-init bash)" + gem build bento.gemspec + gem install bento-*.gem - name: Bento build run: | + rm -rf builds + sudo mkdir -p /mnt/builds/iso + sudo chmod -R 777 /mnt/builds + sudo ln -s /mnt/builds ./ eval "$(chef shell-init bash)" - ./AMZ_build_virtualbox-ovf.sh - bento build --metadata_only os_pkrvars/$(echo ${{ matrix.os }} | cut -d "-" -f 1)/"${{ matrix.os }}-x86_64.pkrvars.hcl" + ./${{ matrix.os }}-x86_64-virtualbox-build.sh ls -alh builds -# - name: Bento Test -# run: | -# eval "$(chef shell-init bash)" -# bento test - - name: Remove VM in case of canceled job - if: cancelled() - run: | - echo Powering off and deleting any existing VMs named AmazonLinuxBento - VBoxManage controlvm AmazonLinuxBento poweroff --type headless 2> /dev/null - sleep 1 - VBoxManage unregistervm AmazonLinuxBento --delete 2> /dev/null - sleep 2 + cat builds/${{ matrix.os }}*-x86_64._metadata.json - name: Upload build artifact uses: actions/upload-artifact@main with: name: "${{ matrix.os }}-virtualbox-x86_64" path: | - builds - !builds/uploaded/* + builds/*.box + builds/*.json retention-days: 10 + compression-level: 0 # no compression + - name: Bento Test + run: | + eval "$(chef shell-init bash)" + bento test diff --git a/.github/workflows/pkr-bld-hyperv-x64.yml b/.github/workflows/pkr-bld-hyperv-x64.yml index fae3953c8..833ce338c 100644 --- a/.github/workflows/pkr-bld-hyperv-x64.yml +++ b/.github/workflows/pkr-bld-hyperv-x64.yml @@ -4,6 +4,7 @@ on: env: PACKER_GITHUB_API_TOKEN: "${{ secrets.GITHUB_TOKEN }}" + PACKER_LOG: "1" jobs: x86_64: @@ -24,9 +25,9 @@ jobs: - freebsd-13 - freebsd-14 - opensuse-leap-15 - - oracle-7 - - oracle-8 - - oracle-9 + - oraclelinux-7 + - oraclelinux-8 + - oraclelinux-9 - rockylinux-8 - rockylinux-9 - ubuntu-20.04 @@ -37,20 +38,11 @@ jobs: steps: - name: Checkout uses: actions/checkout@main - - name: iso-availability - shell: pwsh - run: Invoke-RestMethod -Method Head -Verbose -Uri $(Get-Content os_pkrvars/$('${{ matrix.os }}'.split('-')[0])/${{ matrix.os }}-x86_64.pkrvars.hcl | ConvertFrom-StringData).iso_url.Trim('"') # - name: Setup Packer # uses: hashicorp/setup-packer@main # with: # version: latest - - name: Packer Init - run: packer init -upgrade packer_templates - - name: Packer FMT - run: packer fmt -check -recursive . - - name: Packer Validate - run: packer validate -var-file="os_pkrvars/$("${{ matrix.os }}".Split('-')[0])/${{ matrix.os }}-x86_64.pkrvars.hcl" packer_templates - - name: Packer build + - name: Bento build run: packer build -timestamp-ui -only="${{ matrix.provider }}.vm" -var-file="os_pkrvars/$("${{ matrix.os }}".Split('-')[0])/${{ matrix.os }}-x86_64.pkrvars.hcl" packer_templates - name: Remove VM in case of canceled job if: cancelled() @@ -66,4 +58,6 @@ jobs: name: "${{ matrix.os }}-hyperv-x86_64" path: | builds/*.box + builds/*.json retention-days: 10 + compression-level: 0 # no compression diff --git a/.github/workflows/pkr-bld-parallels-arm64.yml b/.github/workflows/pkr-bld-parallels-arm64.yml index 08ec7d8ab..626841710 100644 --- a/.github/workflows/pkr-bld-parallels-arm64.yml +++ b/.github/workflows/pkr-bld-parallels-arm64.yml @@ -4,6 +4,7 @@ on: env: PACKER_GITHUB_API_TOKEN: "${{ secrets.GITHUB_TOKEN }}" + PACKER_LOG: "1" jobs: aarch64: @@ -24,9 +25,9 @@ jobs: - freebsd-13 - freebsd-14 - opensuse-leap-15 - - oracle-7 - - oracle-8 - - oracle-9 + - oraclelinux-7 + - oraclelinux-8 + - oraclelinux-9 - rockylinux-8 - rockylinux-9 - ubuntu-20.04 @@ -37,30 +38,17 @@ jobs: steps: - name: Checkout uses: actions/checkout@main - - name: iso-availability - shell: pwsh - run: Invoke-RestMethod -Method Head -Verbose -Uri $(Get-Content os_pkrvars/$('${{ matrix.os }}'.split('-')[0])/${{ matrix.os }}-x86_64.pkrvars.hcl | ConvertFrom-StringData).iso_url.Trim('"') # - name: Setup Packer # if: steps.verify-changed-files.outputs.files_changed == 'true' # uses: hashicorp/setup-packer@main # with: # version: latest - - name: Packer Init - run: packer init -upgrade packer_templates - - name: Packer FMT - run: if packer fmt -check -recursive .; then exit 0; else echo "Some packer files need to be formatted, run 'packer fmt -recursive .' to fix"; exit 1; fi - - name: Packer Validate - run: packer validate -var-file=os_pkrvars/$(echo ${{ matrix.os }} | cut -d "-" -f 1)/"${{ matrix.os }}-aarch64.pkrvars.hcl" packer_templates - - name: Packer build -# run: packer build -timestamp-ui -only=${{ matrix.provider }}.vm -var-file=os_pkrvars/$(echo ${{ matrix.os }} | cut -d "-" -f 1)/"${{ matrix.os }}-aarch64.pkrvars.hcl" packer_templates + - name: Bento build run: | eval "$(chef shell-init bash)" bento build -o ${{ matrix.provider }}.vm os_pkrvars/$(echo ${{ matrix.os }} | cut -d "-" -f 1)/"${{ matrix.os }}-aarch64.pkrvars.hcl" - ls -alh builds -# - name: Bento Test -# run: | -# eval "$(chef shell-init bash)" -# bento test + ls -alh builds/ + cat builds/${{ matrix.os }}*-aarch64._metadata.json - name: Remove VM in case of canceled job if: cancelled() run: | @@ -75,6 +63,11 @@ jobs: with: name: "${{ matrix.os }}-parallels-aarch64" path: | - builds - !builds/uploaded/* + builds/*.box + builds/*.json retention-days: 10 + compression-level: 0 # no compression + - name: Bento Test + run: | + eval "$(chef shell-init bash)" + bento test diff --git a/.github/workflows/pkr-bld-parallels-x64.yml b/.github/workflows/pkr-bld-parallels-x64.yml index 1b9d1d3e2..aa1a55797 100644 --- a/.github/workflows/pkr-bld-parallels-x64.yml +++ b/.github/workflows/pkr-bld-parallels-x64.yml @@ -4,6 +4,7 @@ on: env: PACKER_GITHUB_API_TOKEN: "${{ secrets.GITHUB_TOKEN }}" + PACKER_LOG: "1" jobs: x86_64: @@ -24,9 +25,9 @@ jobs: - freebsd-13 - freebsd-14 - opensuse-leap-15 - - oracle-7 - - oracle-8 - - oracle-9 + - oraclelinux-7 + - oraclelinux-8 + - oraclelinux-9 - rockylinux-8 - rockylinux-9 - ubuntu-20.04 @@ -37,29 +38,16 @@ jobs: steps: - name: Checkout uses: actions/checkout@main - - name: iso-availability - shell: pwsh - run: Invoke-RestMethod -Method Head -Verbose -Uri $(Get-Content os_pkrvars/$('${{ matrix.os }}'.split('-')[0])/${{ matrix.os }}-x86_64.pkrvars.hcl | ConvertFrom-StringData).iso_url.Trim('"') # - name: Setup Packer # uses: hashicorp/setup-packer@main # with: # version: latest - - name: Packer Init - run: packer init -upgrade packer_templates - - name: Packer FMT - run: if packer fmt -check -recursive .; then exit 0; else echo "Some packer files need to be formatted, run 'packer fmt -recursive .' to fix"; exit 1; fi - - name: Packer Validate - run: packer validate -var-file=os_pkrvars/$(echo ${{ matrix.os }} | cut -d "-" -f 1)/"${{ matrix.os }}-x86_64.pkrvars.hcl" packer_templates - - name: Packer build -# run: packer build -timestamp-ui -only=${{ matrix.provider }}.vm -var-file=os_pkrvars/$(echo ${{ matrix.os }} | cut -d "-" -f 1)/"${{ matrix.os }}-x86_64.pkrvars.hcl" packer_templates + - name: Bento build run: | eval "$(chef shell-init bash)" bento build -o ${{ matrix.provider }}.vm os_pkrvars/$(echo ${{ matrix.os }} | cut -d "-" -f 1)/"${{ matrix.os }}-x86_64.pkrvars.hcl" - ls -alh builds -# - name: Bento Test -# run: | -# eval "$(chef shell-init bash)" -# bento test + ls -alh builds/ + cat builds/${{ matrix.os }}*-x86_64._metadata.json - name: Remove VM in case of canceled job if: cancelled() run: | @@ -74,6 +62,11 @@ jobs: with: name: "${{ matrix.os }}-parallels-x86_64" path: | - builds - !builds/uploaded/* + builds/*.box + builds/*.json retention-days: 10 + compression-level: 0 # no compression + - name: Bento Test + run: | + eval "$(chef shell-init bash)" + bento test diff --git a/.github/workflows/pkr-bld-qemu-arm64.yml b/.github/workflows/pkr-bld-qemu-arm64.yml index 69e50b286..e32c89878 100644 --- a/.github/workflows/pkr-bld-qemu-arm64.yml +++ b/.github/workflows/pkr-bld-qemu-arm64.yml @@ -4,10 +4,11 @@ on: env: PACKER_GITHUB_API_TOKEN: "${{ secrets.GITHUB_TOKEN }}" + PACKER_LOG: "1" jobs: aarch64: - runs-on: [self-hosted, ARM64, qemu] + runs-on: macos-14 strategy: fail-fast: false matrix: @@ -24,9 +25,9 @@ jobs: - freebsd-13 - freebsd-14 - opensuse-leap-15 - - oracle-7 - - oracle-8 - - oracle-9 + - oraclelinux-7 + - oraclelinux-8 + - oraclelinux-9 - rockylinux-8 - rockylinux-9 - ubuntu-20.04 @@ -37,35 +38,40 @@ jobs: steps: - name: Checkout uses: actions/checkout@main - - name: iso-availability - shell: pwsh - run: Invoke-RestMethod -Method Head -Verbose -Uri $(Get-Content os_pkrvars/$('${{ matrix.os }}'.split('-')[0])/${{ matrix.os }}-x86_64.pkrvars.hcl | ConvertFrom-StringData).iso_url.Trim('"') -# - name: Setup Packer -# if: steps.verify-changed-files.outputs.files_changed == 'true' -# uses: hashicorp/setup-packer@main -# with: -# version: latest - - name: Packer Init - run: packer init -upgrade packer_templates - - name: Packer FMT - run: if packer fmt -check -recursive .; then exit 0; else echo "Some packer files need to be formatted, run 'packer fmt -recursive .' to fix"; exit 1; fi - - name: Packer Validate - run: packer validate -var-file=os_pkrvars/$(echo ${{ matrix.os }} | cut -d "-" -f 1)/"${{ matrix.os }}-aarch64.pkrvars.hcl" packer_templates - - name: Packer build -# run: packer build -timestamp-ui -only=${{ matrix.provider }}.vm -var "qemu_accelerator=hvf" -var-file=os_pkrvars/$(echo ${{ matrix.os }} | cut -d "-" -f 1)/"${{ matrix.os }}-aarch64.pkrvars.hcl" packer_templates + - name: Install Vagrant QEMU + run: | + brew install qemu libvirt + brew tap hashicorp/tap + brew install --cask hashicorp/tap/hashicorp-vagrant + brew services start libvirt + vagrant plugin install vagrant-libvirt vagrant-qemu + - name: Install Chef + uses: actionshub/chef-install@3.0.0 + - name: Setup Packer + uses: hashicorp/setup-packer@main + with: + version: latest + - name: Install Bento + run: | + eval "$(chef shell-init bash)" + gem build bento.gemspec + gem install bento-*.gem + - name: Bento build run: | eval "$(chef shell-init bash)" bento build -o ${{ matrix.provider }}.vm --vars "qemu_accelerator=hvf" os_pkrvars/$(echo ${{ matrix.os }} | cut -d "-" -f 1)/"${{ matrix.os }}-aarch64.pkrvars.hcl" - ls -alh builds -# - name: Bento Test -# run: | -# eval "$(chef shell-init bash)" -# bento test + ls -alh builds/ + cat builds/${{ matrix.os }}*-aarch64._metadata.json - name: Upload build artifact uses: actions/upload-artifact@v3 with: name: "${{ matrix.os }}-qemu-aarch64" path: | - builds - !builds/uploaded/* + builds/*.box + builds/*.json retention-days: 10 + compression-level: 0 # no compression + - name: Bento Test + run: | + eval "$(chef shell-init bash)" + bento test libvirt diff --git a/.github/workflows/pkr-bld-qemu-x64.yml b/.github/workflows/pkr-bld-qemu-x64.yml index b5fbc75bd..86e2dc5a3 100644 --- a/.github/workflows/pkr-bld-qemu-x64.yml +++ b/.github/workflows/pkr-bld-qemu-x64.yml @@ -4,10 +4,11 @@ on: env: PACKER_GITHUB_API_TOKEN: "${{ secrets.GITHUB_TOKEN }}" + PACKER_LOG: "1" jobs: x86_64: - runs-on: [self-hosted, X64, qemu] + runs-on: ubuntu-latest strategy: fail-fast: false matrix: @@ -24,9 +25,9 @@ jobs: - freebsd-13 - freebsd-14 - opensuse-leap-15 - - oracle-7 - - oracle-8 - - oracle-9 + - oraclelinux-7 + - oraclelinux-8 + - oraclelinux-9 - rockylinux-8 - rockylinux-9 - ubuntu-20.04 @@ -37,36 +38,55 @@ jobs: steps: - name: Checkout uses: actions/checkout@main - - name: iso-availability - shell: pwsh - run: Invoke-RestMethod -Method Head -Verbose -Uri $(Get-Content os_pkrvars/$('${{ matrix.os }}'.split('-')[0])/${{ matrix.os }}-x86_64.pkrvars.hcl | ConvertFrom-StringData).iso_url.Trim('"') - - name: Download virtio-win.iso - run: curl https://fedorapeople.org/groups/virt/virtio-win/direct-downloads/archive-virtio/virtio-win-0.1.229-1/virtio-win.iso -o packer_templates/win_answer_files/virtio-win.iso -# - name: Setup Packer -# uses: hashicorp/setup-packer@main -# with: -# version: latest - - name: Packer Init - run: packer init -upgrade packer_templates - - name: Packer FMT - run: if packer fmt -check -recursive .; then exit 0; else echo "Some packer files need to be formatted, run 'packer fmt -recursive .' to fix"; exit 1; fi - - name: Packer Validate - run: packer validate -var-file=os_pkrvars/$(echo ${{ matrix.os }} | cut -d "-" -f 1)/"${{ matrix.os }}-x86_64.pkrvars.hcl" packer_templates - - name: Packer build -# run: packer build -timestamp-ui -only=${{ matrix.provider }}.vm -var "qemu_accelerator=hvf" -var-file=os_pkrvars/$(echo ${{ matrix.os }} | cut -d "-" -f 1)/"${{ matrix.os }}-x86_64.pkrvars.hcl" packer_templates + - name: Install Vagrant and kvm + run: | + wget -O- https://apt.releases.hashicorp.com/gpg | gpg --dearmor | sudo tee /usr/share/keyrings/hashicorp-archive-keyring.gpg + echo "deb [signed-by=/usr/share/keyrings/hashicorp-archive-keyring.gpg] https://apt.releases.hashicorp.com $(lsb_release -cs) main" | sudo tee /etc/apt/sources.list.d/hashicorp.list + sudo apt-get update + sudo apt-get install -y software-properties-common vagrant qemu-kvm libvirt-daemon-system virtinst libvirt-clients bridge-utils qemu-utils libvirt-dev + vagrant plugin install vagrant-libvirt vagrant-qemu + vagrant --version + - name: Enable KVM + run: | + echo 'KERNEL=="kvm", GROUP="kvm", MODE="0666", OPTIONS+="static_node=kvm"' | sudo tee /etc/udev/rules.d/99-kvm4all.rules + sudo udevadm control --reload-rules + sudo udevadm trigger --name-match=kvm + sudo usermod -aG kvm $USER + sudo usermod -aG libvirt $USER + sudo chmod o+rw /var/run/libvirt/libvirt-sock + sudo systemctl start libvirtd + sudo systemctl status libvirtd + - name: Install Chef + uses: actionshub/chef-install@3.0.0 + - name: Setup Packer + uses: hashicorp/setup-packer@main + with: + version: latest + - name: Install Bento run: | eval "$(chef shell-init bash)" - bento build -o ${{ matrix.provider }}.vm --vars "qemu_accelerator=hvf" os_pkrvars/$(echo ${{ matrix.os }} | cut -d "-" -f 1)/"${{ matrix.os }}-x86_64.pkrvars.hcl" - ls -alh builds -# - name: Bento Test -# run: | -# eval "$(chef shell-init bash)" -# bento test + gem build bento.gemspec + gem install bento-*.gem + - name: Bento build + run: | + rm -rf builds + sudo mkdir -p /mnt/builds/iso + sudo chmod -R 777 /mnt/builds + sudo ln -s /mnt/builds ./ + eval "$(chef shell-init bash)" + bento build -o ${{ matrix.provider }}.vm --vars "qemu_accelerator=kvm" os_pkrvars/$(echo ${{ matrix.os }} | cut -d "-" -f 1)/"${{ matrix.os }}-x86_64.pkrvars.hcl" + ls -alh builds/ + cat builds/${{ matrix.os }}*-x86_64._metadata.json - name: Upload build artifact uses: actions/upload-artifact@main with: name: "${{ matrix.os }}-qemu-x86_64" path: | - builds - !builds/uploaded/* + builds/*.box + builds/*.json retention-days: 10 + compression-level: 0 # no compression + - name: Bento Test + run: | + eval "$(chef shell-init bash)" + bento test libvirt diff --git a/.github/workflows/pkr-bld-virtualbox-arm64.yml b/.github/workflows/pkr-bld-virtualbox-arm64.yml index 5a5057700..f97be204e 100644 --- a/.github/workflows/pkr-bld-virtualbox-arm64.yml +++ b/.github/workflows/pkr-bld-virtualbox-arm64.yml @@ -4,10 +4,11 @@ on: env: PACKER_GITHUB_API_TOKEN: "${{ secrets.GITHUB_TOKEN }}" + PACKER_LOG: "1" jobs: aarch64: - runs-on: [self-hosted, ARM64, virtualbox] + runs-on: macos-14 strategy: fail-fast: false matrix: @@ -24,9 +25,9 @@ jobs: - freebsd-13 - freebsd-14 - opensuse-leap-15 - - oracle-7 - - oracle-8 - - oracle-9 + - oraclelinux-7 + - oraclelinux-8 + - oraclelinux-9 - rockylinux-8 - rockylinux-9 - ubuntu-20.04 @@ -37,43 +38,40 @@ jobs: steps: - name: Checkout uses: actions/checkout@main - - name: iso-availability - shell: pwsh - run: Invoke-RestMethod -Method Head -Verbose -Uri $(Get-Content os_pkrvars/$('${{ matrix.os }}'.split('-')[0])/${{ matrix.os }}-x86_64.pkrvars.hcl | ConvertFrom-StringData).iso_url.Trim('"') -# - name: Setup Packer -# if: steps.verify-changed-files.outputs.files_changed == 'true' -# uses: hashicorp/setup-packer@main -# with: -# version: latest - - name: Packer Init - run: packer init -upgrade packer_templates - - name: Packer FMT - run: if packer fmt -check -recursive .; then exit 0; else echo "Some packer files need to be formatted, run 'packer fmt -recursive .' to fix"; exit 1; fi - - name: Packer Validate - run: packer validate -var-file=os_pkrvars/$(echo ${{ matrix.os }} | cut -d "-" -f 1)/"${{ matrix.os }}-aarch64.pkrvars.hcl" packer_templates - - name: Packer build -# run: packer build -timestamp-ui -only=${{ matrix.provider }}.vm -var-file=os_pkrvars/$(echo ${{ matrix.os }} | cut -d "-" -f 1)/"${{ matrix.os }}-aarch64.pkrvars.hcl" packer_templates + - name: Install Vagrant Virtualbox + run: | + brew tap hashicorp/tap + brew install --cask hashicorp/tap/hashicorp-vagrant + wget -q https://www.virtualbox.org/download/testcase/VirtualBox-7.0.15_BETA4-162549-macOSArm64.dmg + hdiutil attach VirtualBox-7.0.15_BETA4-162549-macOSArm64.dmg + sudo installer -pkg /Volumes/VirtualBox/VirtualBox.pkg -target / + - name: Install Chef + uses: actionshub/chef-install@3.0.0 + - name: Setup Packer + uses: hashicorp/setup-packer@main + with: + version: latest + - name: Install Bento run: | eval "$(chef shell-init bash)" - bento build -o ${{ matrix.provider }}.vm os_pkrvars/$(echo ${{ matrix.os }} | cut -d "-" -f 1)/"${{ matrix.os }}-aarch64.pkrvars.hcl" - ls -alh builds -# - name: Bento Test -# run: | -# eval "$(chef shell-init bash)" -# bento test - - name: Remove VM in case of canceled job - if: cancelled() + gem build bento.gemspec + gem install bento-*.gem + - name: Bento build run: | - echo Powering off and deleting any existing VMs named ${{ matrix.os }}*-aarch64 - VBoxManage controlvm ${{ matrix.os }}*-aarch64 poweroff --type headless 2> /dev/null - sleep 1 - VBoxManage unregistervm ${{ matrix.os }}*-aarch64 --delete 2> /dev/null - sleep 2 + eval "$(chef shell-init bash)" + bento build -o ${{ matrix.provider }}.vm os_pkrvars/$(echo ${{ matrix.os }} | cut -d "-" -f 1)/"${{ matrix.os }}-aarch64.pkrvars.hcl" + ls -alh builds/ + cat builds/${{ matrix.os }}*-aarch64._metadata.json - name: Upload build artifact uses: actions/upload-artifact@main with: name: "${{ matrix.os }}-virtualbox-aarch64" path: | - builds - !builds/uploaded/* + builds/*.box + builds/*.json retention-days: 10 + compression-level: 0 # no compression + - name: Bento Test + run: | + eval "$(chef shell-init bash)" + bento test diff --git a/.github/workflows/pkr-bld-virtualbox-x64.yml b/.github/workflows/pkr-bld-virtualbox-x64.yml index e3d29389e..7638f9875 100644 --- a/.github/workflows/pkr-bld-virtualbox-x64.yml +++ b/.github/workflows/pkr-bld-virtualbox-x64.yml @@ -4,10 +4,11 @@ on: env: PACKER_GITHUB_API_TOKEN: "${{ secrets.GITHUB_TOKEN }}" + PACKER_LOG: "1" jobs: x86_64: - runs-on: [self-hosted, X64, virtualbox] + runs-on: ubuntu-latest strategy: fail-fast: false matrix: @@ -24,9 +25,9 @@ jobs: - freebsd-13 - freebsd-14 - opensuse-leap-15 - - oracle-7 - - oracle-8 - - oracle-9 + - oraclelinux-7 + - oraclelinux-8 + - oraclelinux-9 - rockylinux-8 - rockylinux-9 - ubuntu-20.04 @@ -37,42 +38,47 @@ jobs: steps: - name: Checkout uses: actions/checkout@main - - name: iso-availability - shell: pwsh - run: Invoke-RestMethod -Method Head -Verbose -Uri $(Get-Content os_pkrvars/$('${{ matrix.os }}'.split('-')[0])/${{ matrix.os }}-x86_64.pkrvars.hcl | ConvertFrom-StringData).iso_url.Trim('"') -# - name: Setup Packer -# uses: hashicorp/setup-packer@main -# with: -# version: latest - - name: Packer Init - run: packer init -upgrade packer_templates - - name: Packer FMT - run: if packer fmt -check -recursive .; then exit 0; else echo "Some packer files need to be formatted, run 'packer fmt -recursive .' to fix"; exit 1; fi - - name: Packer Validate - run: packer validate -var-file=os_pkrvars/$(echo ${{ matrix.os }} | cut -d "-" -f 1)/"${{ matrix.os }}-x86_64.pkrvars.hcl" packer_templates - - name: Packer build -# run: packer build -timestamp-ui -only=${{ matrix.provider }}.vm -var-file=os_pkrvars/$(echo ${{ matrix.os }} | cut -d "-" -f 1)/"${{ matrix.os }}-x86_64.pkrvars.hcl" packer_templates + - name: Install Vagrant and VirtualBox + run: | + wget -O- https://apt.releases.hashicorp.com/gpg | gpg --dearmor | sudo tee /usr/share/keyrings/hashicorp-archive-keyring.gpg + wget -O- https://www.virtualbox.org/download/oracle_vbox_2016.asc | gpg --dearmor | sudo tee /usr/share/keyrings/oracle-virtualbox-2016.gpg + echo "deb [signed-by=/usr/share/keyrings/hashicorp-archive-keyring.gpg] https://apt.releases.hashicorp.com $(lsb_release -cs) main" | sudo tee /etc/apt/sources.list.d/hashicorp.list + echo "deb [signed-by=/usr/share/keyrings/oracle-virtualbox-2016.gpg] https://download.virtualbox.org/virtualbox/debian $(lsb_release -cs) contrib" | sudo tee /etc/apt/sources.list.d/virtualbox.list + sudo apt-get update + sudo apt-get install -y software-properties-common vagrant virtualbox-7.0 + VBoxManage --version + vagrant --version + - name: Install Chef + uses: actionshub/chef-install@3.0.0 + - name: Setup Packer + uses: hashicorp/setup-packer@main + with: + version: latest + - name: Install Bento run: | eval "$(chef shell-init bash)" - bento build -o ${{ matrix.provider }}.vm os_pkrvars/$(echo ${{ matrix.os }} | cut -d "-" -f 1)/"${{ matrix.os }}-x86_64.pkrvars.hcl" - ls -alh builds -# - name: Bento Test -# run: | -# eval "$(chef shell-init bash)" -# bento test - - name: Remove VM in case of canceled job - if: cancelled() + gem build bento.gemspec + gem install bento-*.gem + - name: Bento build run: | - echo Powering off and deleting any existing VMs named ${{ matrix.os }}*-amd64 - VBoxManage controlvm ${{ matrix.os }}*-amd64 poweroff --type headless 2> /dev/null - sleep 1 - VBoxManage unregistervm ${{ matrix.os }}*-amd64 --delete 2> /dev/null - sleep 2 + rm -rf builds + sudo mkdir -p /mnt/builds/iso + sudo chmod -R 777 /mnt/builds + sudo ln -s /mnt/builds ./ + eval "$(chef shell-init bash)" + bento build -o ${{ matrix.provider }}.vm os_pkrvars/$(echo ${{ matrix.os }} | cut -d "-" -f 1)/"${{ matrix.os }}-x86_64.pkrvars.hcl" + ls -alh builds/ + cat builds/${{ matrix.os }}*-x86_64._metadata.json - name: Upload build artifact uses: actions/upload-artifact@main with: name: "${{ matrix.os }}-virtualbox-x86_64" path: | - builds - !builds/uploaded/* + builds/*.box + builds/*.json retention-days: 10 + compression-level: 0 # no compression + - name: Bento Test + run: | + eval "$(chef shell-init bash)" + bento test diff --git a/.github/workflows/pkr-bld-vmware-arm64.yml b/.github/workflows/pkr-bld-vmware-arm64.yml index dcfd9e484..ecb3a0c5b 100644 --- a/.github/workflows/pkr-bld-vmware-arm64.yml +++ b/.github/workflows/pkr-bld-vmware-arm64.yml @@ -4,6 +4,7 @@ on: env: PACKER_GITHUB_API_TOKEN: "${{ secrets.GITHUB_TOKEN }}" + PACKER_LOG: "1" jobs: aarch64: @@ -24,9 +25,9 @@ jobs: - freebsd-13 - freebsd-14 - opensuse-leap-15 - - oracle-7 - - oracle-8 - - oracle-9 + - oraclelinux-7 + - oraclelinux-8 + - oraclelinux-9 - rockylinux-8 - rockylinux-9 - ubuntu-20.04 @@ -37,30 +38,17 @@ jobs: steps: - name: Checkout uses: actions/checkout@main - - name: iso-availability - shell: pwsh - run: Invoke-RestMethod -Method Head -Verbose -Uri $(Get-Content os_pkrvars/$('${{ matrix.os }}'.split('-')[0])/${{ matrix.os }}-x86_64.pkrvars.hcl | ConvertFrom-StringData).iso_url.Trim('"') # - name: Setup Packer # if: steps.verify-changed-files.outputs.files_changed == 'true' # uses: hashicorp/setup-packer@main # with: # version: latest - - name: Packer Init - run: packer init -upgrade packer_templates - - name: Packer FMT - run: if packer fmt -check -recursive .; then exit 0; else echo "Some packer files need to be formatted, run 'packer fmt -recursive .' to fix"; exit 1; fi - - name: Packer Validate - run: packer validate -var-file=os_pkrvars/$(echo ${{ matrix.os }} | cut -d "-" -f 1)/"${{ matrix.os }}-aarch64.pkrvars.hcl" packer_templates - - name: Packer build -# run: packer build -timestamp-ui -only=${{ matrix.provider }}.vm -var-file=os_pkrvars/$(echo ${{ matrix.os }} | cut -d "-" -f 1)/"${{ matrix.os }}-aarch64.pkrvars.hcl" packer_templates + - name: Bento build run: | eval "$(chef shell-init bash)" bento build -o ${{ matrix.provider }}.vm os_pkrvars/$(echo ${{ matrix.os }} | cut -d "-" -f 1)/"${{ matrix.os }}-aarch64.pkrvars.hcl" - ls -alh builds -# - name: Bento Test -# run: | -# eval "$(chef shell-init bash)" -# bento test + ls -alh builds/ + cat builds/${{ matrix.os }}*-aarch64._metadata.json - name: Remove VM in case of canceled job if: cancelled() run: | @@ -74,6 +62,11 @@ jobs: with: name: "${{ matrix.os }}-vmware-aarch64" path: | - builds - !builds/uploaded/* + builds/*.box + builds/*.json retention-days: 10 + compression-level: 0 # no compression + - name: Bento Test + run: | + eval "$(chef shell-init bash)" + bento test diff --git a/.github/workflows/pkr-bld-vmware-x64.yml b/.github/workflows/pkr-bld-vmware-x64.yml index 0e8b489d4..8e1bcaa57 100644 --- a/.github/workflows/pkr-bld-vmware-x64.yml +++ b/.github/workflows/pkr-bld-vmware-x64.yml @@ -4,6 +4,7 @@ on: env: PACKER_GITHUB_API_TOKEN: "${{ secrets.GITHUB_TOKEN }}" + PACKER_LOG: "1" jobs: x86_64: @@ -24,9 +25,9 @@ jobs: - freebsd-13 - freebsd-14 - opensuse-leap-15 - - oracle-7 - - oracle-8 - - oracle-9 + - oraclelinux-7 + - oraclelinux-8 + - oraclelinux-9 - rockylinux-8 - rockylinux-9 - ubuntu-20.04 @@ -37,29 +38,16 @@ jobs: steps: - name: Checkout uses: actions/checkout@main - - name: iso-availability - shell: pwsh - run: Invoke-RestMethod -Method Head -Verbose -Uri $(Get-Content os_pkrvars/$('${{ matrix.os }}'.split('-')[0])/${{ matrix.os }}-x86_64.pkrvars.hcl | ConvertFrom-StringData).iso_url.Trim('"') # - name: Setup Packer # uses: hashicorp/setup-packer@main # with: # version: latest - - name: Packer Init - run: packer init -upgrade packer_templates - - name: Packer FMT - run: if packer fmt -check -recursive .; then exit 0; else echo "Some packer files need to be formatted, run 'packer fmt -recursive .' to fix"; exit 1; fi - - name: Packer Validate - run: packer validate -var-file=os_pkrvars/$(echo ${{ matrix.os }} | cut -d "-" -f 1)/"${{ matrix.os }}-x86_64.pkrvars.hcl" packer_templates - - name: Packer build -# run: packer build -timestamp-ui -only=${{ matrix.provider }}.vm -var-file=os_pkrvars/$(echo ${{ matrix.os }} | cut -d "-" -f 1)/"${{ matrix.os }}-x86_64.pkrvars.hcl" packer_templates + - name: Bento build run: | eval "$(chef shell-init bash)" bento build -o ${{ matrix.provider }}.vm os_pkrvars/$(echo ${{ matrix.os }} | cut -d "-" -f 1)/"${{ matrix.os }}-x86_64.pkrvars.hcl" - ls -alh builds -# - name: Bento Test -# run: | -# eval "$(chef shell-init bash)" -# bento test + ls -alh builds/ + cat builds/${{ matrix.os }}*-x86_64._metadata.json - name: Remove VM in case of canceled job if: cancelled() run: | @@ -73,6 +61,11 @@ jobs: with: name: "${{ matrix.os }}-vmware-x86_64" path: | - builds - !builds/uploaded/* + builds/*.box + builds/*.json retention-days: 10 + compression-level: 0 # no compression + - name: Bento Test + run: | + eval "$(chef shell-init bash)" + bento test diff --git a/.gitignore b/.gitignore index 14efcc395..b85965350 100644 --- a/.gitignore +++ b/.gitignore @@ -2,6 +2,7 @@ **/builds/ *.iso *.box +*.ova *.ovf *.vmdk *.vdi diff --git a/CHANGELOG.md b/CHANGELOG.md index 13dcfefa0..04b123644 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,8 +9,8 @@ Markdown table generated at <https://www.tablesgenerator.com/markdown_tables#> |:----------------:|:---:|:-------------------:|:--------------------:|:---:|:---:|:--------------------:|:---:|:-----------------:|:-----------------:| | almalinux-8 | | x | | x | | x | | x | | | almalinux-9 | | x | x | | | x | | x | x | -| amazonlinux-2 | | na | na | | | | na | | na | -| amazonlinux-2023 | na | na | na | na | na | na | na | na | na | +| amazonlinux-2 | | | | | | x | | | | +| amazonlinux-2023 | | | | | | x | | | | | centos-7 | | x | | x | | x | | x | | | centos-stream-8 | | x | | x | | x | | x | | | centos-stream-9 | | | x | | | | | | | @@ -36,7 +36,7 @@ Markdown table generated at <https://www.tablesgenerator.com/markdown_tables#> | ubuntu-22.04 | | x | | x | | x | | x | | | ubuntu-23.10 | | x | x | | | x | | x | x | | windows-10 | | x | na | | na | x | na | | na | -| windows-11 | | x | na | | na | x | na | | na | +| windows-11 | | x | x | | na | x | na | | | | windows-2016 | | x | na | | na | x | na | | na | | windows-2019 | | x | na | | na | x | na | | na | | windows-2022 | | x | na | | na | x | na | | na | @@ -53,7 +53,26 @@ Markdown table generated at <https://www.tablesgenerator.com/markdown_tables#> - Create CD pipeline to upload vagrant boxes after PR is merged - Create CD pipeline to build and upload new versions of vagrant boxes once every 3 months with the latest patches -## [unreleased] (2024-03-20) +## [unreleased] (2024-04-11) + +## [v4.1.0] (2024-04-11) + +- Add back iso check, packer lint, and amazonlinux builds to build pipeline +- Fix amazonlinux 2 build script +- Added amazonlinux 2023 build scripts +- Migrate Virtualbox and Qemu builds to github hosted runners from self-hosted runners +- Added test-kitchen and kitchen-vagrant dependencies to gemspec +- Added arg for bento test command to specify a specific build to test - this passes the arg to the kitchen test command +- Fix vagrant post-processor to specify custom vagrant file for freebsd builds +- Remove gui true from windows custom vagrant file +- Fix test to skip removing linux-firmware on oraclelinux +- Renamed oracle boxes to oraclelinux for consistency and remove edge cases in code +- Removed unused -c flag for specifying a specific config file for bento build +- Added --on-error flag to bento build command to pass to packer command +- Added cpu architecture support to bento build command, so it'll only test builds that work with the current cpu architecture +- Remove additional Ubuntu user-date last-command that may be locking macaddress +- Add to test to move failed test boxes to builds/failed_testing directory +- Changed ssh_timeout to 15m ## [v4.0.2] (2024-03-20) diff --git a/amazonlinux-2-x86_64-virtualbox-build.sh b/amazonlinux-2-x86_64-virtualbox-build.sh index 8902e9dae..9bddec904 100755 --- a/amazonlinux-2-x86_64-virtualbox-build.sh +++ b/amazonlinux-2-x86_64-virtualbox-build.sh @@ -24,7 +24,16 @@ echo "Cleaning up old files" rm -f "$AMZDIR"/*.iso "$AMZDIR"/*.ovf "$AMZDIR"/*.vmdk echo "Creating ISO" -hdiutil makehybrid -o "$AMZDIR"/seed.iso -hfs -joliet -iso -default-volume-name cidata "$AMZDIR"/../amz_seed_iso +if [ -x "$(command -v genisoimage)" ]; then + genisoimage -output "$AMZDIR"/seed.iso -volid cidata -joliet -rock "$AMZDIR"/../amz_seed_iso/user-data "$AMZDIR"/../amz_seed_iso/meta-data +elif [ -x "$(command -v hdiutil)" ]; then + hdiutil makehybrid -o "$AMZDIR"/seed.iso -hfs -joliet -iso -default-volume-name cidata "$AMZDIR"/../amz_seed_iso +elif [ -x "$(command -v mkisofs)" ]; then + mkfsiso9660 -o "$AMZDIR"/seed.iso "$AMZDIR"/../amz_seed_iso +else + echo "No tool found to create the seed.iso" + exit 1 +fi VM="AmazonLinuxBento" echo Powering off and deleting any existing VMs named $VM @@ -36,8 +45,8 @@ echo "Creating the VM" # from https://www.perkin.org.uk/posts/create-virtualbox-vm-from-the-command-line.html VBoxManage createvm --name $VM --ostype "RedHat_64" --register VBoxManage storagectl $VM --name "SATA Controller" --add sata --controller IntelAHCI -VBoxManage storageattach $VM --storagectl "SATA Controller" --port 0 --device 0 --type hdd --medium "$AMZDIR"/amazon2_x86_64.vdi -VBoxManage storageattach $VM --storagectl "SATA Controller" --port 1 --device 0 --type dvddrive --medium "$AMZDIR"/seed.iso +VBoxManage storageattach $VM --storagectl "SATA Controller" --port 0 --type hdd --medium "$AMZDIR"/amazon2_x86_64.vdi +VBoxManage storageattach $VM --storagectl "SATA Controller" --port 1 --type dvddrive --medium "$AMZDIR"/seed.iso VBoxManage modifyvm $VM --memory 2048 VBoxManage modifyvm $VM --cpus 2 VBoxManage modifyvm $VM --audio-driver none @@ -48,7 +57,7 @@ echo Sleeping for 120 seconds to let the system boot and cloud-init to run VBoxManage startvm $VM --type headless sleep 120 VBoxManage controlvm $VM poweroff --type headless -VBoxManage storageattach $VM --storagectl "SATA Controller" --port 1 --device 0 --type dvddrive --medium none +VBoxManage storageattach $VM --storagectl "SATA Controller" --port 1 --type dvddrive --medium none sleep 5 echo Exporting the VM to an OVF file @@ -59,7 +68,7 @@ echo Deleting the VM vboxmanage unregistervm $VM --delete echo starting packer build of amazonlinux -if packer build -timestamp-ui -var "vbox_source_path=$AMZDIR/amazon2_x86_64.ovf" -var "vbox_checksum=null" -var-file="$AMZDIR"/../../os_pkrvars/amazonlinux/amazonlinux-2-x86_64.pkrvars.hcl "$AMZDIR"/../../packer_templates; then +if bento build --vars vbox_source_path="$AMZDIR"/amazon2_x86_64.ovf,vbox_checksum=null "$AMZDIR"/../../os_pkrvars/amazonlinux/amazonlinux-2-x86_64.pkrvars.hcl; then echo "Cleaning up files" rm -f "$AMZDIR"/*.ovf "$AMZDIR"/*.vmdk "$AMZDIR"/*.iso else diff --git a/amazonlinux-2023-aarch64-virtualbox-build.sh b/amazonlinux-2023-aarch64-virtualbox-build.sh index 5d0ec7ae8..2bee4bf56 100755 --- a/amazonlinux-2023-aarch64-virtualbox-build.sh +++ b/amazonlinux-2023-aarch64-virtualbox-build.sh @@ -26,7 +26,16 @@ if [ ! -f "$AMZDIR"/amazon2023_arm64.vdi ]; then fi echo "Creating ISO" -hdiutil makehybrid -o "$AMZDIR"/seed.iso -hfs -joliet -iso -default-volume-name cidata "$AMZDIR"/../amz_seed_iso +if [ -x "$(command -v genisoimage)" ]; then + genisoimage -output "$AMZDIR"/seed.iso -volid cidata -joliet -rock "$AMZDIR"/../amz_seed_iso/user-data "$AMZDIR"/../amz_seed_iso/meta-data +elif [ -x "$(command -v hdiutil)" ]; then + hdiutil makehybrid -o "$AMZDIR"/seed.iso -hfs -joliet -iso -default-volume-name cidata "$AMZDIR"/../amz_seed_iso +elif [ -x "$(command -v mkisofs)" ]; then + mkfsiso9660 -o "$AMZDIR"/seed.iso "$AMZDIR"/../amz_seed_iso +else + echo "No tool found to create the seed.iso" + exit 1 +fi VM="AmazonLinuxBento" echo Powering off and deleting any existing VMs named $VM @@ -38,8 +47,8 @@ echo "Creating the VM" # from https://www.perkin.org.uk/posts/create-virtualbox-vm-from-the-command-line.html VBoxManage createvm --name $VM --ostype "Fedora_64" --register VBoxManage storagectl $VM --name "SATA Controller" --add sata --controller IntelAHCI -VBoxManage storageattach $VM --storagectl "SATA Controller" --port 0 --device 0 --type hdd --medium "$AMZDIR"/amazon2023_arm64.vdi -VBoxManage storageattach $VM --storagectl "SATA Controller" --port 1 --device 0 --type dvddrive --medium "$AMZDIR"/seed.iso +VBoxManage storageattach $VM --storagectl "SATA Controller" --port 0 --type hdd --medium "$AMZDIR"/amazon2023_arm64.vdi +VBoxManage storageattach $VM --storagectl "SATA Controller" --port 1 --type dvddrive --medium "$AMZDIR"/seed.iso VBoxManage modifyvm $VM --chipset ich9 VBoxManage modifyvm $VM --firmware efi VBoxManage modifyvm $VM --memory 2048 @@ -56,7 +65,7 @@ echo "Sleeping for 120 seconds to let the system boot and cloud-init to run" VBoxManage startvm $VM --type headless sleep 120 VBoxManage controlvm $VM poweroff --type headless -VBoxManage storageattach $VM --storagectl "SATA Controller" --port 1 --device 0 --type dvddrive --medium none +VBoxManage storageattach $VM --storagectl "SATA Controller" --port 1 --type dvddrive --medium none sleep 5 echo "Exporting the VM to an OVF file" @@ -67,7 +76,7 @@ echo "Deleting the VM" vboxmanage unregistervm $VM --delete echo "starting packer build of amazonlinux" -if packer build -timestamp-ui -var "vbox_source_path=$AMZDIR/amazon2023_arm64.ovf" -var "vbox_checksum=null" -var-file="$AMZDIR"/../../os_pkrvars/amazonlinux/amazonlinux-2023-aarch64.pkrvars.hcl "$AMZDIR"/../../packer_templates; then +if bento build --vars vbox_source_path="$AMZDIR"/amazon2023_arm64.ovf,vbox_checksum=null "$AMZDIR"/../../os_pkrvars/amazonlinux/amazonlinux-2023-aarch64.pkrvars.hcl; then echo "Cleaning up files" rm -f "$AMZDIR"/*.ovf "$AMZDIR"/*.vmdk "$AMZDIR"/*.iso "$AMZDIR"/*.vdi "$AMZDIR"/*.qcow2 else diff --git a/amazonlinux-2023-x86_64-virtualbox-build.sh b/amazonlinux-2023-x86_64-virtualbox-build.sh index f58fb84b6..0591f6a86 100755 --- a/amazonlinux-2023-x86_64-virtualbox-build.sh +++ b/amazonlinux-2023-x86_64-virtualbox-build.sh @@ -26,7 +26,16 @@ if [ ! -f "$AMZDIR"/amazon2023_x86_64.vdi ]; then fi echo "Creating ISO" -hdiutil makehybrid -o "$AMZDIR"/seed.iso -hfs -joliet -iso -default-volume-name cidata "$AMZDIR"/../amz_seed_iso +if [ -x "$(command -v genisoimage)" ]; then + genisoimage -output "$AMZDIR"/seed.iso -volid cidata -joliet -rock "$AMZDIR"/../amz_seed_iso/user-data "$AMZDIR"/../amz_seed_iso/meta-data +elif [ -x "$(command -v hdiutil)" ]; then + hdiutil makehybrid -o "$AMZDIR"/seed.iso -hfs -joliet -iso -default-volume-name cidata "$AMZDIR"/../amz_seed_iso +elif [ -x "$(command -v mkisofs)" ]; then + mkfsiso9660 -o "$AMZDIR"/seed.iso "$AMZDIR"/../amz_seed_iso +else + echo "No tool found to create the seed.iso" + exit 1 +fi VM="AmazonLinuxBento" echo Powering off and deleting any existing VMs named $VM @@ -38,8 +47,8 @@ echo "Creating the VM" # from https://www.perkin.org.uk/posts/create-virtualbox-vm-from-the-command-line.html VBoxManage createvm --name $VM --ostype "Fedora_64" --register VBoxManage storagectl $VM --name "SATA Controller" --add sata --controller IntelAHCI -VBoxManage storageattach $VM --storagectl "SATA Controller" --port 0 --device 0 --type hdd --medium "$AMZDIR"/amazon2023_x86_64.vdi -VBoxManage storageattach $VM --storagectl "SATA Controller" --port 1 --device 0 --type dvddrive --medium "$AMZDIR"/seed.iso +VBoxManage storageattach $VM --storagectl "SATA Controller" --port 0 --type hdd --medium "$AMZDIR"/amazon2023_x86_64.vdi +VBoxManage storageattach $VM --storagectl "SATA Controller" --port 1 --type dvddrive --medium "$AMZDIR"/seed.iso VBoxManage modifyvm $VM --memory 2048 VBoxManage modifyvm $VM --cpus 2 VBoxManage modifyvm $VM --nat-localhostreachable1 on @@ -54,7 +63,7 @@ echo "Sleeping for 120 seconds to let the system boot and cloud-init to run" VBoxManage startvm $VM --type headless sleep 120 VBoxManage controlvm $VM poweroff --type headless -VBoxManage storageattach $VM --storagectl "SATA Controller" --port 1 --device 0 --type dvddrive --medium none +VBoxManage storageattach $VM --storagectl "SATA Controller" --port 1 --type dvddrive --medium none sleep 5 echo "Exporting the VM to an OVF file" @@ -65,7 +74,7 @@ echo "Deleting the VM" vboxmanage unregistervm $VM --delete echo "starting packer build of amazonlinux" -if packer build -timestamp-ui -var "vbox_source_path=$AMZDIR/amazon2023_x86_64.ovf" -var "vbox_checksum=null" -var-file="$AMZDIR"/../../os_pkrvars/amazonlinux/amazonlinux-2023-x86_64.pkrvars.hcl "$AMZDIR"/../../packer_templates; then +if bento build --vars vbox_source_path="$AMZDIR"/amazon2023_x86_64.ovf,vbox_checksum=null "$AMZDIR"/../../os_pkrvars/amazonlinux/amazonlinux-2023-x86_64.pkrvars.hcl; then echo "Cleaning up files" rm -f "$AMZDIR"/*.ovf "$AMZDIR"/*.vmdk "$AMZDIR"/*.iso "$AMZDIR"/*.vdi "$AMZDIR"/*.qcow2 else diff --git a/bento.gemspec b/bento.gemspec index 690638410..51343bad0 100644 --- a/bento.gemspec +++ b/bento.gemspec @@ -14,6 +14,8 @@ Gem::Specification.new do |s| s.required_ruby_version = '>= 2.6' s.add_dependency 'mixlib-shellout', '>= 2.3.2' + s.add_dependency 'test-kitchen' + s.add_dependency 'kitchen-vagrant' s.bindir = 'bin' s.executables = %w(bento) diff --git a/builds.yml b/builds.yml index 6a3567516..873b50a90 100644 --- a/builds.yml +++ b/builds.yml @@ -10,8 +10,6 @@ public: - 'amazonlinux-2023' - 'almalinux-8' - 'almalinux-9' - - 'amazon-2' - - 'amazon-2023' - 'centos-7' - 'centos-stream-8' - 'centos-stream-9' @@ -22,9 +20,9 @@ public: - 'freebsd-13' - 'freebsd-14' - 'opensuse-leap-15' - - 'oracle-7' - - 'oracle-8' - - 'oracle-9' + - 'oraclelinux-7' + - 'oraclelinux-8' + - 'oraclelinux-9' - 'rockylinux-8' - 'rockylinux-9' - 'ubuntu-20.04' diff --git a/builds/failed_testing/.gitkeep b/builds/failed_testing/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/builds/iso/.gitkeep b/builds/iso/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/lib/bento/cli.rb b/lib/bento/cli.rb index 0727465e4..e68ab53c8 100644 --- a/lib/bento/cli.rb +++ b/lib/bento/cli.rb @@ -49,6 +49,10 @@ def self.parse(args) end } + test_argv_proc = proc { |opts| + opts.regx = ARGV[0] + } + md_json_argv_proc = proc { |opts| opts.md_json = ARGV[0] } @@ -81,6 +85,10 @@ def self.parse(args) options.metadata_only = opt end + opts.on('--on-error', '[cleanup|abort|ask|run-cleanup-provisioner] If the build fails do: clean up (default), abort, ask, or run-cleanup-provisioner.') do |opt| + options.on_error = opt + end + opts.on('--vars VARS', 'Comma seperated list of variable names equal values (ex: boot_wait="2s",ssh_timeout="5s")') do |opt| options.vars = opt end @@ -89,10 +97,6 @@ def self.parse(args) options.var_files = opt end - opts.on('-c BUILD_YML', '--config BUILD_YML', 'Use a configuration file') do |opt| - options.config = opt - end - opts.on('-d', '--[no-]debug', 'Run packer with debug output') do |opt| options.debug = opt end @@ -165,7 +169,7 @@ def self.parse(args) options.provisioner = opt end end, - argv: proc {}, + argv: test_argv_proc, }, upload: { class: UploadRunner, @@ -206,7 +210,7 @@ def initialize(opts) end def start - templates.each { |template| puts template } + puts templates.join("\n") end end diff --git a/lib/bento/common.rb b/lib/bento/common.rb index 24aa0b81f..8b3b9a63d 100644 --- a/lib/bento/common.rb +++ b/lib/bento/common.rb @@ -75,40 +75,20 @@ def box_metadata(metadata_file) metadata end - def metadata_files - @metadata_files ||= Dir.glob('builds/*.json') + def metadata_files(arch_support = false) + arch = if RbConfig::CONFIG['host_cpu'] == 'arm64' + 'aarch64' + else + RbConfig::CONFIG['host_cpu'] + end + glob = "builds/*#{"-#{arch}" if arch_support}._metadata.json" + @metadata_files ||= Dir.glob(glob) end def builds_yml YAML.load(File.read('builds.yml')) end - def build_list - arm64 = [] - x86_64 = [] - builds_yml['public'].each do |platform, versions| - versions.each do |version, archs| - archs.each do |arch| - folder = case platform - when 'opensuse-leap' - 'opensuse' - when 'oracle' - 'oraclelinux' - else - platform - end - case arch - when 'aarch64' - arm64 << "#{folder}/#{platform}-#{version}-#{arch}" - else - x86_64 << "#{folder}/#{platform}-#{version}-#{arch}" - end - end - end - end - x86_64 + arm64 - end - def private_box?(boxname) proprietary_os_list = %w(macos windows sles solaris rhel) proprietary_os_list.any? { |p| boxname.include?(p) } diff --git a/lib/bento/providermetadata.rb b/lib/bento/providermetadata.rb index 051b41a9d..7850e4c49 100644 --- a/lib/bento/providermetadata.rb +++ b/lib/bento/providermetadata.rb @@ -93,7 +93,7 @@ def ver_vbox end def ver_libvirt - cmd = Mixlib::ShellOut.new('/usr/local/opt/libvirt/sbin/libvirtd -V') + cmd = Mixlib::ShellOut.new('libvirtd -V') cmd.run_command cmd.stdout.split(' ').last end diff --git a/lib/bento/runner.rb b/lib/bento/runner.rb index b59554dcc..7c41b5804 100644 --- a/lib/bento/runner.rb +++ b/lib/bento/runner.rb @@ -8,7 +8,7 @@ class BuildRunner include Common include PackerExec - attr_reader :template_files, :config, :dry_run, :debug, :only, :except, :mirror, :headed, :single, :errors, + attr_reader :template_files, :dry_run, :debug, :only, :except, :mirror, :headed, :single, :errors, :on_error, :override_version, :build_timestamp, :cpus, :mem, :metadata_only, :vars, :var_files, :pkr_cmd def initialize(opts) @@ -17,6 +17,7 @@ def initialize(opts) @dry_run = opts.dry_run @metadata_only = opts.metadata_only @debug = opts.debug + @on_error = opts.on_error ||= nil @only = opts.only ||= nil @except = opts.except @mirror = opts.mirror @@ -33,7 +34,7 @@ def initialize(opts) end def start - templates = config ? build_list : template_files + templates = template_files banner('Starting build for templates:') banner('Installing packer plugins') unless dry_run || metadata_only shellout("packer init -upgrade #{File.dirname(templates.first)}/../../packer_templates") unless dry_run || metadata_only @@ -43,7 +44,7 @@ def start end banner("Build finished in #{duration(time.real)}.") unless errors.empty? - raise("Failed Builds:\n #{errors.join("\n")}\n exited #{$CHILD_STATUS}") + raise("Failed Builds:\n#{errors.join("\n")}\nexited #{$CHILD_STATUS}") end end @@ -95,6 +96,7 @@ def packer_build_cmd(template, _var_file) cmd.insert(4, '-var headless=false') if headed cmd.insert(2, '-parallel=false') if single cmd.insert(2, '-debug') if debug + cmd.insert(2, "-on-error=#{on_error}") if on_error cmd.insert(0, 'echo') if dry_run || metadata_only cmd end @@ -106,8 +108,8 @@ def write_final_metadata(template, buildtime) md[:providers] = ProviderMetadata.new(path, md[:template]).read md[:providers].each do |p| p[:build_time] = buildtime - p[:build_cpus] = cpus unless cpus.nil? - p[:build_mem] = mem unless mem.nil? + p[:build_cpus] = cpus if cpus + p[:build_mem] = mem if mem end if dry_run diff --git a/lib/bento/test.rb b/lib/bento/test.rb index 21c2b684d..0d733aa15 100644 --- a/lib/bento/test.rb +++ b/lib/bento/test.rb @@ -5,19 +5,22 @@ class TestRunner include Common - attr_reader :shared_folder, :boxname, :provider, :box_url, :no_shared, :provisioner, :errors + attr_reader :shared_folder, :boxname, :provider, :box_url, :no_shared, :provisioner, :errors, :regx def initialize(opts) @debug = opts.debug @no_shared = opts.no_shared @provisioner = opts.provisioner.nil? ? 'shell' : opts.provisioner @errors = [] + @regx = opts.regx || nil end def start banner('Starting testing...') + md_files = metadata_files(true) + puts md_files.join("\n") time = Benchmark.measure do - metadata_files.each do |metadata_file| + md_files.each do |metadata_file| destroy_all_bento test_box(metadata_file) destroy_all_bento @@ -25,7 +28,7 @@ def start end banner("Testing finished in #{duration(time.real)}.") unless errors.empty? - raise("Failed Tests:\n #{errors.join("\n")}\n exited #{$CHILD_STATUS}") + raise("Failed Tests:\n#{errors.join("\n")}\nexited #{$CHILD_STATUS}") end end @@ -55,7 +58,7 @@ def test_box(md_json) when 'aarch64', 'arm64' 'arm64' else - raise "Unknown arch #{md_data.inspect}" + raise "Unknown arch #{md['arch'].inspect}" end @boxname = md['name'] @providers = md['providers'] @@ -71,14 +74,33 @@ def test_box(md_json) Dir.chdir(temp_dir) banner("Test kitchen file located in #{temp_dir}") - @providers.each do |k, _v| - test = Mixlib::ShellOut.new("kitchen test #{@boxname}-#{@arch}-#{k.tr('_', '-')}", timeout: 900, live_stream: STDOUT) + if regx + test = Mixlib::ShellOut.new("kitchen test #{regx.tr('.', '').tr('_', '-')}", timeout: 900, live_stream: STDOUT) test.run_command if test.error? - test.stderr + puts test.stderr + errors << "#{regex}" + end + else + @providers.each do |k, v| + banner("Testing #{@boxname.tr('.', '')}-#{@arch}-#{k.tr('_', '-')}") + test = Mixlib::ShellOut.new("kitchen test #{@boxname.tr('.', '')}-#{@arch}-#{k.tr('_', '-')}", timeout: 900, live_stream: STDOUT) + test.run_command + next unless test.error? + puts test.stderr errors << "#{@boxname}-#{@arch}-#{k}" + FileUtils.cp(File.join(bento_dir, md_json), File.join(bento_dir, 'builds', 'failed_testing', File.basename(md_json))) unless File.exist?(File.join(bento_dir, 'builds', 'failed_testing', File.basename(md_json))) + FileUtils.mv(File.join(bento_dir, 'builds', v['file']), File.join(bento_dir, 'builds', 'failed_testing', v['file'])) + @providers.delete(k) + if @providers.empty? + File.delete(File.join(bento_dir, md_json)) if File.exist?(File.join(bento_dir, md_json)) + else + File.binwrite(File.join(bento_dir, md_json), JSON.pretty_generate(md)) + end end end + destroy = Mixlib::ShellOut.new('kitchen destroy', timeout: 900, live_stream: STDOUT) + destroy.run_command Dir.chdir(bento_dir) FileUtils.rm_rf(temp_dir) end diff --git a/lib/bento/version.rb b/lib/bento/version.rb index 9cba61623..4cb808c14 100644 --- a/lib/bento/version.rb +++ b/lib/bento/version.rb @@ -1,3 +1,3 @@ module Bento - VERSION = '4.0.2'.freeze + VERSION = '4.1.0'.freeze end diff --git a/os_pkrvars/amazonlinux/amazonlinux-2-x86_64.pkrvars.hcl b/os_pkrvars/amazonlinux/amazonlinux-2-x86_64.pkrvars.hcl index 08baf9a58..812d44045 100644 --- a/os_pkrvars/amazonlinux/amazonlinux-2-x86_64.pkrvars.hcl +++ b/os_pkrvars/amazonlinux/amazonlinux-2-x86_64.pkrvars.hcl @@ -1,8 +1,8 @@ -os_name = "amazonlinux" -os_version = "2" -os_arch = "x86_64" -vbox_source_path = "https://cdn.amazonlinux.com/os-images/latest/virtualbox/amzn2-virtualbox-2.0.20240306.2-x86_64.xfs.gpt.vdi" -vbox_checksum = "file:https://cdn.amazonlinux.com/os-images/latest/virtualbox/SHA256SUMS" +os_name = "amazonlinux" +os_version = "2" +os_arch = "x86_64" +vbox_source_path = "https://cdn.amazonlinux.com/os-images/latest/virtualbox/amzn2-virtualbox-2.0.20240306.2-x86_64.xfs.gpt.vdi" +vbox_checksum = "file:https://cdn.amazonlinux.com/os-images/latest/virtualbox/SHA256SUMS" parallels_guest_os_type = "centos" vbox_guest_os_type = "RedHat_64" vmware_guest_os_type = "rhel9-64" diff --git a/os_pkrvars/opensuse/opensuse-leap-15-aarch64.pkrvars.hcl b/os_pkrvars/opensuse/opensuse-leap-15-aarch64.pkrvars.hcl index 29b434d07..754aaebab 100644 --- a/os_pkrvars/opensuse/opensuse-leap-15-aarch64.pkrvars.hcl +++ b/os_pkrvars/opensuse/opensuse-leap-15-aarch64.pkrvars.hcl @@ -1,4 +1,4 @@ -os_name = "opensuse" +os_name = "opensuse-leap" os_version = "15.5" os_arch = "aarch64" iso_url = "http://provo-mirror.opensuse.org/distribution/leap/15.5/iso/openSUSE-Leap-15.5-DVD-aarch64-Media.iso" diff --git a/os_pkrvars/opensuse/opensuse-leap-15-x86_64.pkrvars.hcl b/os_pkrvars/opensuse/opensuse-leap-15-x86_64.pkrvars.hcl index 487b637bf..33202e42f 100644 --- a/os_pkrvars/opensuse/opensuse-leap-15-x86_64.pkrvars.hcl +++ b/os_pkrvars/opensuse/opensuse-leap-15-x86_64.pkrvars.hcl @@ -1,4 +1,4 @@ -os_name = "opensuse" +os_name = "opensuse-leap" os_version = "15.5" os_arch = "x86_64" iso_url = "http://sfo-korg-mirror.kernel.org/opensuse/distribution/leap/15.5/iso/openSUSE-Leap-15.5-DVD-x86_64-Media.iso" diff --git a/os_pkrvars/oracle/oracle-7-aarch64.pkrvars.hcl b/os_pkrvars/oraclelinux/oraclelinux-7-aarch64.pkrvars.hcl similarity index 93% rename from os_pkrvars/oracle/oracle-7-aarch64.pkrvars.hcl rename to os_pkrvars/oraclelinux/oraclelinux-7-aarch64.pkrvars.hcl index 67873935e..8fbfc33f8 100644 --- a/os_pkrvars/oracle/oracle-7-aarch64.pkrvars.hcl +++ b/os_pkrvars/oraclelinux/oraclelinux-7-aarch64.pkrvars.hcl @@ -1,4 +1,4 @@ -os_name = "oracle" +os_name = "oraclelinux" os_version = "7.9" os_arch = "aarch64" iso_url = "https://yum.oracle.com/ISOS/OracleLinux/OL7/u9/aarch64/OracleLinux-R7-U9-Server-aarch64-dvd.iso" diff --git a/os_pkrvars/oracle/oracle-7-x86_64.pkrvars.hcl b/os_pkrvars/oraclelinux/oraclelinux-7-x86_64.pkrvars.hcl similarity index 92% rename from os_pkrvars/oracle/oracle-7-x86_64.pkrvars.hcl rename to os_pkrvars/oraclelinux/oraclelinux-7-x86_64.pkrvars.hcl index 49a1a6f40..6bd8977ad 100644 --- a/os_pkrvars/oracle/oracle-7-x86_64.pkrvars.hcl +++ b/os_pkrvars/oraclelinux/oraclelinux-7-x86_64.pkrvars.hcl @@ -1,4 +1,4 @@ -os_name = "oracle" +os_name = "oraclelinux" os_version = "7.9" os_arch = "x86_64" iso_url = "http://mirrors.dotsrc.org/oracle-linux/OL7/u9/x86_64/OracleLinux-R7-U9-Server-x86_64-dvd.iso" diff --git a/os_pkrvars/oracle/oracle-8-aarch64.pkrvars.hcl b/os_pkrvars/oraclelinux/oraclelinux-8-aarch64.pkrvars.hcl similarity index 93% rename from os_pkrvars/oracle/oracle-8-aarch64.pkrvars.hcl rename to os_pkrvars/oraclelinux/oraclelinux-8-aarch64.pkrvars.hcl index 8656e267d..c04cf1f0e 100644 --- a/os_pkrvars/oracle/oracle-8-aarch64.pkrvars.hcl +++ b/os_pkrvars/oraclelinux/oraclelinux-8-aarch64.pkrvars.hcl @@ -1,4 +1,4 @@ -os_name = "oracle" +os_name = "oraclelinux" os_version = "8.9" os_arch = "aarch64" iso_url = "https://yum.oracle.com/ISOS/OracleLinux/OL8/u9/aarch64/OracleLinux-R8-U9-aarch64-dvd.iso" diff --git a/os_pkrvars/oracle/oracle-8-x86_64.pkrvars.hcl b/os_pkrvars/oraclelinux/oraclelinux-8-x86_64.pkrvars.hcl similarity index 92% rename from os_pkrvars/oracle/oracle-8-x86_64.pkrvars.hcl rename to os_pkrvars/oraclelinux/oraclelinux-8-x86_64.pkrvars.hcl index af05d8767..499533fd4 100644 --- a/os_pkrvars/oracle/oracle-8-x86_64.pkrvars.hcl +++ b/os_pkrvars/oraclelinux/oraclelinux-8-x86_64.pkrvars.hcl @@ -1,4 +1,4 @@ -os_name = "oracle" +os_name = "oraclelinux" os_version = "8.9" os_arch = "x86_64" iso_url = "https://yum.oracle.com/ISOS/OracleLinux/OL8/u9/x86_64/OracleLinux-R8-U9-x86_64-dvd.iso" diff --git a/os_pkrvars/oracle/oracle-9-aarch64.pkrvars.hcl b/os_pkrvars/oraclelinux/oraclelinux-9-aarch64.pkrvars.hcl similarity index 93% rename from os_pkrvars/oracle/oracle-9-aarch64.pkrvars.hcl rename to os_pkrvars/oraclelinux/oraclelinux-9-aarch64.pkrvars.hcl index 2357d748e..7d64a0a65 100644 --- a/os_pkrvars/oracle/oracle-9-aarch64.pkrvars.hcl +++ b/os_pkrvars/oraclelinux/oraclelinux-9-aarch64.pkrvars.hcl @@ -1,4 +1,4 @@ -os_name = "oracle" +os_name = "oraclelinux" os_version = "9.3" os_arch = "aarch64" iso_url = "https://yum.oracle.com/ISOS/OracleLinux/OL9/u3/aarch64/OracleLinux-R9-U3-aarch64-dvd.iso" diff --git a/os_pkrvars/oracle/oracle-9-x86_64.pkrvars.hcl b/os_pkrvars/oraclelinux/oraclelinux-9-x86_64.pkrvars.hcl similarity index 92% rename from os_pkrvars/oracle/oracle-9-x86_64.pkrvars.hcl rename to os_pkrvars/oraclelinux/oraclelinux-9-x86_64.pkrvars.hcl index b76944965..0aa28f6e1 100644 --- a/os_pkrvars/oracle/oracle-9-x86_64.pkrvars.hcl +++ b/os_pkrvars/oraclelinux/oraclelinux-9-x86_64.pkrvars.hcl @@ -1,4 +1,4 @@ -os_name = "oracle" +os_name = "oraclelinux" os_version = "9.3" os_arch = "x86_64" iso_url = "https://yum.oracle.com/ISOS/OracleLinux/OL9/u3/x86_64/OracleLinux-R9-U3-x86_64-dvd.iso" diff --git a/os_pkrvars/sles/sles-15-x86_64.pkrvars.hcl b/os_pkrvars/sles/sles-15-x86_64.pkrvars.hcl index 4d9b85d40..bf705c990 100644 --- a/os_pkrvars/sles/sles-15-x86_64.pkrvars.hcl +++ b/os_pkrvars/sles/sles-15-x86_64.pkrvars.hcl @@ -2,7 +2,7 @@ os_name = "suse" os_version = "15.5" os_arch = "x86_64" iso_url = "https://updates.suse.com/SUSE/Products/SLE-Product-SLES/15-SP5/x86_64/iso/SLE-15-SP5-Online-x86_64-GM-Media1.iso" -iso_checksum = "" +iso_checksum = "b0920189fd7f2624983a9cf8bc062bbb7a8557658e3feadde77b80e72f66b6ef" parallels_guest_os_type = "suse" vbox_guest_os_type = "SUSE_LE_64" vmware_guest_os_type = "sles15-64" diff --git a/packer_templates/http/ubuntu/user-data b/packer_templates/http/ubuntu/user-data index bd5b64355..d9393c65d 100644 --- a/packer_templates/http/ubuntu/user-data +++ b/packer_templates/http/ubuntu/user-data @@ -13,7 +13,7 @@ autoinstall: install-server: yes allow-pw: yes late-commands: - - sed -i 's/^#*\(send dhcp-client-identifier\).*$/\1 = hardware;/' /target/etc/dhcp/dhclient.conf + # - sed -i 's/^#*\(send dhcp-client-identifier\).*$/\1 = hardware;/' /target/etc/dhcp/dhclient.conf - 'sed -i "s/dhcp4: true/&\n dhcp-identifier: mac/" /target/etc/netplan/00-installer-config.yaml' - echo 'vagrant ALL=(ALL) NOPASSWD:ALL' > /target/etc/sudoers.d/vagrant # Enable hyper-v daemons only if using hyper-v virtualization diff --git a/packer_templates/pkr-builder.pkr.hcl b/packer_templates/pkr-builder.pkr.hcl index 8111c87e4..66c797904 100644 --- a/packer_templates/pkr-builder.pkr.hcl +++ b/packer_templates/pkr-builder.pkr.hcl @@ -64,7 +64,7 @@ locals { "${path.root}/scripts/freebsd/cleanup_freebsd.sh", "${path.root}/scripts/freebsd/minimize_freebsd.sh" ] : ( - var.os_name == "opensuse" || + var.os_name == "opensuse-leap" || var.os_name == "sles" ? [ "${path.root}/scripts/suse/repositories_suse.sh", "${path.root}/scripts/suse/update_suse.sh", @@ -209,8 +209,10 @@ build { # Convert machines to vagrant boxes post-processor "vagrant" { - compression_level = 9 - output = "${path.root}/../builds/${var.os_name}-${var.os_version}-${var.os_arch}.{{ .Provider }}.box" - vagrantfile_template = var.is_windows ? "${path.root}/vagrantfile-windows.template" : null + compression_level = 9 + output = "${path.root}/../builds/${var.os_name}-${var.os_version}-${var.os_arch}.{{ .Provider }}.box" + vagrantfile_template = var.is_windows ? "${path.root}/vagrantfile-windows.template" : ( + var.os_name == "freebsd" ? "${path.root}/vagrantfile-freebsd.template" : null + ) } } diff --git a/packer_templates/pkr-variables.pkr.hcl b/packer_templates/pkr-variables.pkr.hcl index a09aca878..16ef20dd8 100644 --- a/packer_templates/pkr-variables.pkr.hcl +++ b/packer_templates/pkr-variables.pkr.hcl @@ -359,7 +359,7 @@ variable "ssh_port" { } variable "ssh_timeout" { type = string - default = "30m" + default = "15m" } variable "ssh_username" { type = string diff --git a/packer_templates/scripts/rhel/cleanup_yum.sh b/packer_templates/scripts/rhel/cleanup_yum.sh index abc88a934..22cf50b4d 100644 --- a/packer_templates/scripts/rhel/cleanup_yum.sh +++ b/packer_templates/scripts/rhel/cleanup_yum.sh @@ -19,9 +19,8 @@ package-cleanup --oldkernels --count=1 -y # Avoid ~200 meg firmware package we don't need # this cannot be done in the KS file so we do it here -if test "$(uname -r)" == -- *el7uek*; then - echo "Skipping firmware removal for Oracle Linux" -else +distro="$(rpm -qf --queryformat '%{NAME}' /etc/redhat-release | cut -f 1 -d '-')" +if [ "$distro" != 'oraclelinux' ]; then echo "Removing extra firmware packages" yum -y remove linux-firmware fi diff --git a/packer_templates/vagrantfile-windows.template b/packer_templates/vagrantfile-windows.template index 4a19e63d7..d6838e0e8 100644 --- a/packer_templates/vagrantfile-windows.template +++ b/packer_templates/vagrantfile-windows.template @@ -9,7 +9,6 @@ Vagrant.configure(2) do |config| config.vm.network :forwarded_port, guest: 5985, host: 5985, id: "winrm", auto_correct: true config.vm.provider "virtualbox" do |vb| - vb.gui = true vb.cpus = 2 vb.memory = 4096 end From db7858d0d0a8d58bee5778851162a9560c9cb10a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20Bl=C3=BCmel?= <blaimi@blaimi.de> Date: Fri, 12 Apr 2024 17:34:57 +0200 Subject: [PATCH 1550/1622] fix typo in README (#1554) * fix typo in README * fix virtio-win.iso directory in README * fix mount of downloaded iso in qemu * Upgrade Windows 11 to 23H2 --- README.md | 5 +++-- os_pkrvars/windows/windows-11-x86_64.pkrvars.hcl | 4 ++-- packer_templates/pkr-sources.pkr.hcl | 1 + 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 5b074914c..d34eb2a4e 100644 --- a/README.md +++ b/README.md @@ -144,13 +144,14 @@ If the build is successful, your box files will be in the `builds` directory at ### KVM/qemu support for Windows -You must download [the iso image with the Windows drivers for paravirtualized KVM/qemu hardware](https://fedorapeople.org/groups/virt/virtio-win/direct-downloads/stable-virtio/virtio-win.iso). You can do this from the command line: `wget -nv -nc https://fedorapeople.org/groups/virt/virtio-win/direct-downloads/stable-virtio/virtio-win.iso -O virtio-win.iso` and place it in the packer_templates/win_answer_files/ directory. +You must download [the iso image with the Windows drivers for paravirtualized KVM/qemu hardware](https://fedorapeople.org/groups/virt/virtio-win/direct-downloads/stable-virtio/virtio-win.iso) and place it in the builds/iso/ directory. +You can do this from the command line: `mkdir -p builds/iso/; wget -nv -nc https://fedorapeople.org/groups/virt/virtio-win/direct-downloads/stable-virtio/virtio-win.iso -O builds/iso/virtio-win.iso` You can use the following sample command to build a KVM/qemu Windows box: ```bash packer init -upgrade ./packer_templates -packer build --only=qemu.vm -var-file=os_pkrvars/windwos/windows-2022-x86_64.pkrvars.hcl ./packer_templates +packer build --only=qemu.vm -var-file=os_pkrvars/windows/windows-2022-x86_64.pkrvars.hcl ./packer_templates ``` ### Proprietary Templates diff --git a/os_pkrvars/windows/windows-11-x86_64.pkrvars.hcl b/os_pkrvars/windows/windows-11-x86_64.pkrvars.hcl index 579e5840c..3c059d44a 100644 --- a/os_pkrvars/windows/windows-11-x86_64.pkrvars.hcl +++ b/os_pkrvars/windows/windows-11-x86_64.pkrvars.hcl @@ -3,8 +3,8 @@ os_version = "11" os_arch = "x86_64" is_windows = true # Windows 11 source requires a prompt to select OS to install. This allows the system time to add reg keys to ignore TPM Check before the install begins. -iso_url = "https://software-static.download.prss.microsoft.com/dbazure/988969d5-f34g-4e03-ac9d-1f9786c66751/22621.525.220925-0207.ni_release_svc_refresh_CLIENTENTERPRISEEVAL_OEMRET_x64FRE_en-us.iso" -iso_checksum = "ebbc79106715f44f5020f77bd90721b17c5a877cbc15a3535b99155493a1bb3f" +iso_url = "https://software-static.download.prss.microsoft.com/dbazure/888969d5-f34g-4e03-ac9d-1f9786c66749/22631.2428.231001-0608.23H2_NI_RELEASE_SVC_REFRESH_CLIENTENTERPRISEEVAL_OEMRET_x64FRE_en-us.iso" +iso_checksum = "c8dbc96b61d04c8b01faf6ce0794fdf33965c7b350eaa3eb1e6697019902945c" parallels_guest_os_type = "win-11" vbox_guest_os_type = "Windows11_64" vmware_guest_os_type = "windows9srv-64" diff --git a/packer_templates/pkr-sources.pkr.hcl b/packer_templates/pkr-sources.pkr.hcl index 2fe6dbb03..2cb1a1d21 100644 --- a/packer_templates/pkr-sources.pkr.hcl +++ b/packer_templates/pkr-sources.pkr.hcl @@ -35,6 +35,7 @@ locals { qemuargs = var.qemuargs == null ? ( var.is_windows ? [ ["-drive", "file=${path.root}/../builds/iso/virtio-win.iso,media=cdrom,index=3"], + ["-drive", "file=${var.iso_url},media=cdrom,index=2"], ["-drive", "file=${path.root}/../builds/packer-${var.os_name}-${var.os_version}-${var.os_arch}-qemu/{{ .Name }},if=virtio,cache=writeback,discard=ignore,format=qcow2,index=1"], ] : ( var.os_arch == "aarch64" ? [ From b34c9c6b0742d63c694f018dde953258100f03af Mon Sep 17 00:00:00 2001 From: Corey Hemminger <hemminger@hotmail.com> Date: Fri, 26 Apr 2024 16:58:49 -0500 Subject: [PATCH 1551/1622] add macos build (#1566) - Require ruby >= 3.0.0 - Add parallels-ipsw source - Added MacOS template for parallels-ipsw - Created MacOS scripts - Adjusted build flags to all be lower case for consistency - Removed extra amazonlinux directories to be more consistent with other builds - Added build_files directory for all temp files to be stored in during packer building - Opensuse-leap-15.5 updated to 15.6 - Remove Fedora 38 and add 40 builds - Remove Ubuntu 23.10 and add 24.04 builds --- .github/workflows/ci-build.yml | 2 +- .github/workflows/pkr-bld-hyperv-x64.yml | 2 +- .github/workflows/pkr-bld-parallels-arm64.yml | 4 +- .github/workflows/pkr-bld-parallels-x64.yml | 4 +- .github/workflows/pkr-bld-qemu-arm64.yml | 4 +- .github/workflows/pkr-bld-qemu-x64.yml | 4 +- .../workflows/pkr-bld-virtualbox-arm64.yml | 4 +- .github/workflows/pkr-bld-virtualbox-x64.yml | 4 +- .github/workflows/pkr-bld-vmware-arm64.yml | 4 +- .github/workflows/pkr-bld-vmware-x64.yml | 4 +- CHANGELOG.md | 86 ++++++----- amazonlinux-2-x86_64-virtualbox-build.sh | 15 +- amazonlinux-2023-aarch64-virtualbox-build.sh | 14 +- amazonlinux-2023-x86_64-virtualbox-build.sh | 14 +- bento.gemspec | 2 +- builds.yml | 79 +++++----- builds/build_files/.gitkeep | 0 lib/bento/cli.rb | 10 +- lib/bento/test.rb | 4 +- lib/bento/upload.rb | 4 +- lib/bento/version.rb | 2 +- .../fedora/fedora-39-aarch64.pkrvars.hcl | 3 +- ...vars.hcl => fedora-40-aarch64.pkrvars.hcl} | 6 +- ...rvars.hcl => fedora-40-x86_64.pkrvars.hcl} | 6 +- os_pkrvars/macos/macos-14-aarch64.pkrvars.hcl | 73 +++++++++ .../opensuse-leap-15-aarch64.pkrvars.hcl | 6 +- .../opensuse-leap-15-x86_64.pkrvars.hcl | 6 +- ...s.hcl => ubuntu-24.04-aarch64.pkrvars.hcl} | 6 +- ...rs.hcl => ubuntu-24.04-x86_64.pkrvars.hcl} | 6 +- packer_templates/amz_seed_iso/README.md | 1 - packer_templates/amz_working_files/README.md | 1 - .../{amz_seed_iso => http/amazon}/meta-data | 0 .../{amz_seed_iso => http/amazon}/user-data | 0 packer_templates/http/ubuntu/user-data | 6 +- packer_templates/pkr-builder.pkr.hcl | 146 ++++++++++-------- packer_templates/pkr-sources.pkr.hcl | 61 ++++++-- packer_templates/pkr-variables.pkr.hcl | 27 ++++ packer_templates/scripts/_common/motd.sh | 7 +- packer_templates/scripts/_common/vagrant.sh | 6 +- .../scripts/macos/parallels-tools.sh | 12 ++ packer_templates/scripts/macos/shrink.sh | 37 +++++ .../scripts/macos/system-default.sh | 32 ++++ .../scripts/macos/system-update.sh | 16 ++ packer_templates/scripts/macos/vagrant.sh | 30 ++++ .../scripts/macos/vmware-tools.sh | 48 ++++++ 45 files changed, 579 insertions(+), 229 deletions(-) create mode 100644 builds/build_files/.gitkeep rename os_pkrvars/fedora/{fedora-38-aarch64.pkrvars.hcl => fedora-40-aarch64.pkrvars.hcl} (59%) rename os_pkrvars/fedora/{fedora-38-x86_64.pkrvars.hcl => fedora-40-x86_64.pkrvars.hcl} (59%) create mode 100644 os_pkrvars/macos/macos-14-aarch64.pkrvars.hcl rename os_pkrvars/ubuntu/{ubuntu-23.10-aarch64.pkrvars.hcl => ubuntu-24.04-aarch64.pkrvars.hcl} (69%) rename os_pkrvars/ubuntu/{ubuntu-23.10-x86_64.pkrvars.hcl => ubuntu-24.04-x86_64.pkrvars.hcl} (61%) delete mode 100644 packer_templates/amz_seed_iso/README.md delete mode 100644 packer_templates/amz_working_files/README.md rename packer_templates/{amz_seed_iso => http/amazon}/meta-data (100%) rename packer_templates/{amz_seed_iso => http/amazon}/user-data (100%) create mode 100644 packer_templates/scripts/macos/parallels-tools.sh create mode 100644 packer_templates/scripts/macos/shrink.sh create mode 100644 packer_templates/scripts/macos/system-default.sh create mode 100644 packer_templates/scripts/macos/system-update.sh create mode 100644 packer_templates/scripts/macos/vagrant.sh create mode 100644 packer_templates/scripts/macos/vmware-tools.sh diff --git a/.github/workflows/ci-build.yml b/.github/workflows/ci-build.yml index 59932627c..4caf23c95 100644 --- a/.github/workflows/ci-build.yml +++ b/.github/workflows/ci-build.yml @@ -31,7 +31,7 @@ jobs: packer-iso-check: uses: chef/github-workflows/.github/workflows/packer-iso-url-checker.yml@main with: - EXCLUDE_REGEX: 'amazonlinux-2.*|rhel.*|sles.*|solaris.*|windows-11-aarch64.*' + EXCLUDE_REGEX: 'amazonlinux-2.*|rhel.*|sles.*|solaris.*|windows-11-aarch64.*,macos-*' packer-lint: uses: chef/github-workflows/.github/workflows/packer-lint.yml@main diff --git a/.github/workflows/pkr-bld-hyperv-x64.yml b/.github/workflows/pkr-bld-hyperv-x64.yml index 833ce338c..7002d7f76 100644 --- a/.github/workflows/pkr-bld-hyperv-x64.yml +++ b/.github/workflows/pkr-bld-hyperv-x64.yml @@ -32,7 +32,7 @@ jobs: - rockylinux-9 - ubuntu-20.04 - ubuntu-22.04 - - ubuntu-23.10 + - ubuntu-24.04 provider: - hyperv-iso steps: diff --git a/.github/workflows/pkr-bld-parallels-arm64.yml b/.github/workflows/pkr-bld-parallels-arm64.yml index 626841710..6934da07f 100644 --- a/.github/workflows/pkr-bld-parallels-arm64.yml +++ b/.github/workflows/pkr-bld-parallels-arm64.yml @@ -20,8 +20,8 @@ jobs: - centos-stream-9 - debian-11 - debian-12 - - fedora-38 - fedora-39 + - fedora-40 - freebsd-13 - freebsd-14 - opensuse-leap-15 @@ -32,7 +32,7 @@ jobs: - rockylinux-9 - ubuntu-20.04 - ubuntu-22.04 - - ubuntu-23.10 + - ubuntu-24.04 provider: - parallels-iso steps: diff --git a/.github/workflows/pkr-bld-parallels-x64.yml b/.github/workflows/pkr-bld-parallels-x64.yml index aa1a55797..9af99ba4c 100644 --- a/.github/workflows/pkr-bld-parallels-x64.yml +++ b/.github/workflows/pkr-bld-parallels-x64.yml @@ -20,8 +20,8 @@ jobs: - centos-stream-9 - debian-11 - debian-12 - - fedora-38 - fedora-39 + - fedora-40 - freebsd-13 - freebsd-14 - opensuse-leap-15 @@ -32,7 +32,7 @@ jobs: - rockylinux-9 - ubuntu-20.04 - ubuntu-22.04 - - ubuntu-23.10 + - ubuntu-24.04 provider: - parallels-iso steps: diff --git a/.github/workflows/pkr-bld-qemu-arm64.yml b/.github/workflows/pkr-bld-qemu-arm64.yml index e32c89878..944f8c95f 100644 --- a/.github/workflows/pkr-bld-qemu-arm64.yml +++ b/.github/workflows/pkr-bld-qemu-arm64.yml @@ -20,8 +20,8 @@ jobs: - centos-stream-9 - debian-11 - debian-12 - - fedora-38 - fedora-39 + - fedora-40 - freebsd-13 - freebsd-14 - opensuse-leap-15 @@ -32,7 +32,7 @@ jobs: - rockylinux-9 - ubuntu-20.04 - ubuntu-22.04 - - ubuntu-23.10 + - ubuntu-24.04 provider: - qemu steps: diff --git a/.github/workflows/pkr-bld-qemu-x64.yml b/.github/workflows/pkr-bld-qemu-x64.yml index 86e2dc5a3..5bb0eee9b 100644 --- a/.github/workflows/pkr-bld-qemu-x64.yml +++ b/.github/workflows/pkr-bld-qemu-x64.yml @@ -20,8 +20,8 @@ jobs: - centos-stream-9 - debian-11 - debian-12 - - fedora-38 - fedora-39 + - fedora-40 - freebsd-13 - freebsd-14 - opensuse-leap-15 @@ -32,7 +32,7 @@ jobs: - rockylinux-9 - ubuntu-20.04 - ubuntu-22.04 - - ubuntu-23.10 + - ubuntu-24.04 provider: - qemu steps: diff --git a/.github/workflows/pkr-bld-virtualbox-arm64.yml b/.github/workflows/pkr-bld-virtualbox-arm64.yml index f97be204e..d649e759c 100644 --- a/.github/workflows/pkr-bld-virtualbox-arm64.yml +++ b/.github/workflows/pkr-bld-virtualbox-arm64.yml @@ -20,8 +20,8 @@ jobs: - centos-stream-9 - debian-11 - debian-12 - - fedora-38 - fedora-39 + - fedora-40 - freebsd-13 - freebsd-14 - opensuse-leap-15 @@ -32,7 +32,7 @@ jobs: - rockylinux-9 - ubuntu-20.04 - ubuntu-22.04 - - ubuntu-23.10 + - ubuntu-24.04 provider: - virtualbox-iso steps: diff --git a/.github/workflows/pkr-bld-virtualbox-x64.yml b/.github/workflows/pkr-bld-virtualbox-x64.yml index 7638f9875..2aafba2ae 100644 --- a/.github/workflows/pkr-bld-virtualbox-x64.yml +++ b/.github/workflows/pkr-bld-virtualbox-x64.yml @@ -20,8 +20,8 @@ jobs: - centos-stream-9 - debian-11 - debian-12 - - fedora-38 - fedora-39 + - fedora-40 - freebsd-13 - freebsd-14 - opensuse-leap-15 @@ -32,7 +32,7 @@ jobs: - rockylinux-9 - ubuntu-20.04 - ubuntu-22.04 - - ubuntu-23.10 + - ubuntu-24.04 provider: - virtualbox-iso steps: diff --git a/.github/workflows/pkr-bld-vmware-arm64.yml b/.github/workflows/pkr-bld-vmware-arm64.yml index ecb3a0c5b..567e56ccd 100644 --- a/.github/workflows/pkr-bld-vmware-arm64.yml +++ b/.github/workflows/pkr-bld-vmware-arm64.yml @@ -20,8 +20,8 @@ jobs: - centos-stream-9 - debian-11 - debian-12 - - fedora-38 - fedora-39 + - fedora-40 - freebsd-13 - freebsd-14 - opensuse-leap-15 @@ -32,7 +32,7 @@ jobs: - rockylinux-9 - ubuntu-20.04 - ubuntu-22.04 - - ubuntu-23.10 + - ubuntu-24.04 provider: - vmware-iso steps: diff --git a/.github/workflows/pkr-bld-vmware-x64.yml b/.github/workflows/pkr-bld-vmware-x64.yml index 8e1bcaa57..71a95f361 100644 --- a/.github/workflows/pkr-bld-vmware-x64.yml +++ b/.github/workflows/pkr-bld-vmware-x64.yml @@ -20,8 +20,8 @@ jobs: - centos-stream-9 - debian-11 - debian-12 - - fedora-38 - fedora-39 + - fedora-40 - freebsd-13 - freebsd-14 - opensuse-leap-15 @@ -32,7 +32,7 @@ jobs: - rockylinux-9 - ubuntu-20.04 - ubuntu-22.04 - - ubuntu-23.10 + - ubuntu-24.04 provider: - vmware-iso steps: diff --git a/CHANGELOG.md b/CHANGELOG.md index 04b123644..1a3583a05 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,41 +5,42 @@ ***Note:** Markdown table generated at <https://www.tablesgenerator.com/markdown_tables#> -| | hyperv<br>x86_64 | parallels<br>x86_64 | parallels<br>aarch64 | qemu<br>x86_64 | qemu<br>aarch64 | virtualbox<br>x86_64 | virtualbox<br>aarch64 | vmware<br>x86_64 | vmware<br>aarch64 | -|:----------------:|:---:|:-------------------:|:--------------------:|:---:|:---:|:--------------------:|:---:|:-----------------:|:-----------------:| -| almalinux-8 | | x | | x | | x | | x | | -| almalinux-9 | | x | x | | | x | | x | x | -| amazonlinux-2 | | | | | | x | | | | -| amazonlinux-2023 | | | | | | x | | | | -| centos-7 | | x | | x | | x | | x | | -| centos-stream-8 | | x | | x | | x | | x | | -| centos-stream-9 | | | x | | | | | | | -| debian-11 | | x | x | | | x | | x | | -| debian-12 | | x | x | | | x | | x | x | -| fedora-38 | | x | | x | | x | | x | x | -| fedora-39 | | | | | | | | | | -| freebsd-13 | | | | | | x | | x | x | -| freebsd-14 | | | | | | x | | x | | -| opensuse-leap-15 | | x | | x | | x | | x | | -| oraclelinux-7 | | x | | x | | x | | x | | -| oraclelinux-8 | | | | x | | x | | x | | -| oraclelinux-9 | | x | x | | | x | | x | | -| rhel-7 | license<br>needed | license<br>needed | license<br>needed | license<br>needed | license<br>needed | license<br>needed | license<br>needed | license<br>needed | license<br>needed | -| rhel-8 | license<br>needed | license<br>needed | license<br>needed | license<br>needed | license<br>needed | license<br>needed | license<br>needed | license<br>needed | license<br>needed | -| rhel-9 | license<br>needed | license<br>needed | license<br>needed | license<br>needed | license<br>needed | license<br>needed | license<br>needed | license<br>needed | license<br>needed | -| rockylinux-8 | | x | | x | | x | | x | | -| rockylinux-9 | | x | | | | x | | x | x | -| sles-12 | license<br>needed | license<br>needed | na | license<br>needed | na | license<br>needed | na | license<br>needed | na | -| sles-13 | license<br>needed | license<br>needed | na | license<br>needed | na | license<br>needed | na | license<br>needed | na | -| solaris-11 | license<br>needed | license<br>needed | na | license<br>needed | na | license<br>needed | na | license<br>needed | na | -| ubuntu-20.04 | | x | x | | | x | | x | x | -| ubuntu-22.04 | | x | | x | | x | | x | | -| ubuntu-23.10 | | x | x | | | x | | x | x | -| windows-10 | | x | na | | na | x | na | | na | -| windows-11 | | x | x | | na | x | na | | | -| windows-2016 | | x | na | | na | x | na | | na | -| windows-2019 | | x | na | | na | x | na | | na | -| windows-2022 | | x | na | | na | x | na | | na | +| os | hyperv<br>x86_64 | parallels<br>x86_64 | parallels<br>aarch64 | qemu<br>x86_64 | qemu<br>aarch64 | virtualbox<br>x86_64 | virtualbox<br>aarch64 | vmware<br>x86_64 | vmware<br>aarch64 | +|:---:|:---:|:---:|:---:|:---:|:---:|:---:|:---:|:---:|:---:| +| almalinux-8 | | x | | | | x | | x | | +| almalinux-9 | | x | | | | x | | x | x | +| amazonlinux-2 | | | | | | x | | | | +| amazonlinux-2023 | | | | | | x | | | | +| centos-7 | | | | | | x | | x | | +| centos-stream-8 | | x | | | | x | | x | | +| centos-stream-9 | | x | | | | x | | x | x | +| debian-11 | | x | x | | | x | | x | | +| debian-12 | | x | x | | | x | | x | x | +| fedora-39 | | x | x | | | x | | x | x | +| fedora-40 | | | | | | | | | | +| freebsd-13 | | | | | | x | | x | x | +| freebsd-14 | | | | | | | | | | +| macos | | | x | | | | | | | +| opensuse-leap-15 | | | | | | x | | x | x | +| oraclelinux-7 | | x | | | | x | | x | | +| oraclelinux-8 | | | | | | x | | x | | +| oraclelinux-9 | | x | x | | | x | | x | x | +| rhel-7 | license<br>needed | license<br>needed | license<br>needed | license<br>needed | license<br>needed | license<br>needed | license<br>needed | license<br>needed | license<br>needed | +| rhel-8 | license<br>needed | license<br>needed | license<br>needed | license<br>needed | license<br>needed | license<br>needed | license<br>needed | license<br>needed | license<br>needed | +| rhel-9 | license<br>needed | license<br>needed | license<br>needed | license<br>needed | license<br>needed | license<br>needed | license<br>needed | license<br>needed | license<br>needed | +| rockylinux-8 | | x | | | | x | | x | | +| rockylinux-9 | | x | | | | x | | x | x | +| sles-12 | license<br>needed | license<br>needed | na | license<br>needed | na | license<br>needed | na | license<br>needed | na | +| sles-15 | license<br>needed | license<br>needed | na | license<br>needed | na | license<br>needed | na | license<br>needed | na | +| solaris-11 | license<br>needed | license<br>needed | na | license<br>needed | na | license<br>needed | na | license<br>needed | na | +| ubuntu-20.04 | | | x | | | x | | x | x | +| ubuntu-22.04 | | x | | | | x | | | | +| ubuntu-24.04 | | x | x | | | x | | x | x | +| windows-10 | | | na | | na | x | na | | na | +| windows-11 | | x | x | | | x | | x | | +| windows-2016 | | x | na | | na | x | na | x | na | +| windows-2019 | | x | na | | na | x | na | x | na | +| windows-2022 | | x | na | | na | x | na | | na | ### Todo @@ -53,7 +54,20 @@ Markdown table generated at <https://www.tablesgenerator.com/markdown_tables#> - Create CD pipeline to upload vagrant boxes after PR is merged - Create CD pipeline to build and upload new versions of vagrant boxes once every 3 months with the latest patches -## [unreleased] (2024-04-11) +## [unreleased] (2024-04-26) + +## [v4.1.1] (2024-04-26) + +- Require ruby >= 3.0.0 +- Add parallels-ipsw source +- Added MacOS template for parallels-ipsw +- Created MacOS scripts +- Adjusted build flags to all be lower case for consistency +- Removed extra amazonlinux directories to be more consistent with other builds +- Added build_files directory for all temp files to be stored in during packer building +- Opensuse-leap-15.5 updated to 15.6 +- Remove Fedora 38 and add 40 builds +- Remove Ubuntu 23.10 and add 24.04 builds ## [v4.1.0] (2024-04-11) diff --git a/amazonlinux-2-x86_64-virtualbox-build.sh b/amazonlinux-2-x86_64-virtualbox-build.sh index 9bddec904..b7d8e0775 100755 --- a/amazonlinux-2-x86_64-virtualbox-build.sh +++ b/amazonlinux-2-x86_64-virtualbox-build.sh @@ -5,8 +5,8 @@ SCRIPT_RELATIVE_DIR=$(dirname "${BASH_SOURCE[0]}") cd "$SCRIPT_RELATIVE_DIR" || exit # set tmp dir for files -AMZDIR="$(pwd)/packer_templates/amz_working_files" - +AMZDIR="$(pwd)/builds/build_files/amazonlinux-2-x86_64-virtualbox" +mkdir -p "$AMZDIR" # Get virtualbox vdi file name with latest version number IMG="$(wget -q https://cdn.amazonlinux.com/os-images/latest/virtualbox/ -O - | grep ".vdi" | cut -d "\"" -f 2)" @@ -24,12 +24,13 @@ echo "Cleaning up old files" rm -f "$AMZDIR"/*.iso "$AMZDIR"/*.ovf "$AMZDIR"/*.vmdk echo "Creating ISO" +SEED_ISO_DIR="$(pwd)/packer_templates/http/amazon" if [ -x "$(command -v genisoimage)" ]; then - genisoimage -output "$AMZDIR"/seed.iso -volid cidata -joliet -rock "$AMZDIR"/../amz_seed_iso/user-data "$AMZDIR"/../amz_seed_iso/meta-data + genisoimage -output "$AMZDIR"/seed.iso -volid cidata -joliet -rock "$SEED_ISO_DIR"/user-data "$SEED_ISO_DIR"/meta-data elif [ -x "$(command -v hdiutil)" ]; then - hdiutil makehybrid -o "$AMZDIR"/seed.iso -hfs -joliet -iso -default-volume-name cidata "$AMZDIR"/../amz_seed_iso + hdiutil makehybrid -o "$AMZDIR"/seed.iso -hfs -joliet -iso -default-volume-name cidata "$SEED_ISO_DIR"/ elif [ -x "$(command -v mkisofs)" ]; then - mkfsiso9660 -o "$AMZDIR"/seed.iso "$AMZDIR"/../amz_seed_iso + mkfsiso9660 -o "$AMZDIR"/seed.iso "$SEED_ISO_DIR"/ else echo "No tool found to create the seed.iso" exit 1 @@ -68,9 +69,9 @@ echo Deleting the VM vboxmanage unregistervm $VM --delete echo starting packer build of amazonlinux -if bento build --vars vbox_source_path="$AMZDIR"/amazon2_x86_64.ovf,vbox_checksum=null "$AMZDIR"/../../os_pkrvars/amazonlinux/amazonlinux-2-x86_64.pkrvars.hcl; then +if bento build --vars vbox_source_path="$AMZDIR"/amazon2_x86_64.ovf,vbox_checksum=null "$(pwd)"/os_pkrvars/amazonlinux/amazonlinux-2-x86_64.pkrvars.hcl; then echo "Cleaning up files" - rm -f "$AMZDIR"/*.ovf "$AMZDIR"/*.vmdk "$AMZDIR"/*.iso + rm -f "$AMZDIR" else exit 1 fi diff --git a/amazonlinux-2023-aarch64-virtualbox-build.sh b/amazonlinux-2023-aarch64-virtualbox-build.sh index 2bee4bf56..bdb1a01e0 100755 --- a/amazonlinux-2023-aarch64-virtualbox-build.sh +++ b/amazonlinux-2023-aarch64-virtualbox-build.sh @@ -5,7 +5,8 @@ SCRIPT_RELATIVE_DIR=$(dirname "${BASH_SOURCE[0]}") cd "$SCRIPT_RELATIVE_DIR" || exit # set tmp dir for files -AMZDIR="$(pwd)/packer_templates/amz_working_files" +AMZDIR="$(pwd)/builds/build_files/amazonlinux-2023-aarch64-virtualbox" +mkdir -p "$AMZDIR" echo "Cleaning up old files" rm -f "$AMZDIR"/*.iso "$AMZDIR"/*.ovf "$AMZDIR"/*.vmdk "$AMZDIR"/*.vdi @@ -26,12 +27,13 @@ if [ ! -f "$AMZDIR"/amazon2023_arm64.vdi ]; then fi echo "Creating ISO" +SEED_ISO_DIR="$(pwd)/packer_templates/http/amazon" if [ -x "$(command -v genisoimage)" ]; then - genisoimage -output "$AMZDIR"/seed.iso -volid cidata -joliet -rock "$AMZDIR"/../amz_seed_iso/user-data "$AMZDIR"/../amz_seed_iso/meta-data + genisoimage -output "$AMZDIR"/seed.iso -volid cidata -joliet -rock "$SEED_ISO_DIR"/user-data "$SEED_ISO_DIR"/meta-data elif [ -x "$(command -v hdiutil)" ]; then - hdiutil makehybrid -o "$AMZDIR"/seed.iso -hfs -joliet -iso -default-volume-name cidata "$AMZDIR"/../amz_seed_iso + hdiutil makehybrid -o "$AMZDIR"/seed.iso -hfs -joliet -iso -default-volume-name cidata "$SEED_ISO_DIR"/ elif [ -x "$(command -v mkisofs)" ]; then - mkfsiso9660 -o "$AMZDIR"/seed.iso "$AMZDIR"/../amz_seed_iso + mkfsiso9660 -o "$AMZDIR"/seed.iso "$SEED_ISO_DIR"/ else echo "No tool found to create the seed.iso" exit 1 @@ -76,9 +78,9 @@ echo "Deleting the VM" vboxmanage unregistervm $VM --delete echo "starting packer build of amazonlinux" -if bento build --vars vbox_source_path="$AMZDIR"/amazon2023_arm64.ovf,vbox_checksum=null "$AMZDIR"/../../os_pkrvars/amazonlinux/amazonlinux-2023-aarch64.pkrvars.hcl; then +if bento build --vars vbox_source_path="$AMZDIR"/amazon2023_arm64.ovf,vbox_checksum=null "$(pwd)"/os_pkrvars/amazonlinux/amazonlinux-2023-aarch64.pkrvars.hcl; then echo "Cleaning up files" - rm -f "$AMZDIR"/*.ovf "$AMZDIR"/*.vmdk "$AMZDIR"/*.iso "$AMZDIR"/*.vdi "$AMZDIR"/*.qcow2 + rm -f "$AMZDIR" else exit 1 fi diff --git a/amazonlinux-2023-x86_64-virtualbox-build.sh b/amazonlinux-2023-x86_64-virtualbox-build.sh index 0591f6a86..da6d3d097 100755 --- a/amazonlinux-2023-x86_64-virtualbox-build.sh +++ b/amazonlinux-2023-x86_64-virtualbox-build.sh @@ -5,7 +5,8 @@ SCRIPT_RELATIVE_DIR=$(dirname "${BASH_SOURCE[0]}") cd "$SCRIPT_RELATIVE_DIR" || exit # set tmp dir for files -AMZDIR="$(pwd)/packer_templates/amz_working_files" +AMZDIR="$(pwd)/builds/build_files/amazonlinux-2023-x86_64-virtualbox" +mkdir -p "$AMZDIR" echo "Cleaning up old files" rm -f "$AMZDIR"/*.iso "$AMZDIR"/*.ovf "$AMZDIR"/*.vmdk "$AMZDIR"/*.vdi @@ -26,12 +27,13 @@ if [ ! -f "$AMZDIR"/amazon2023_x86_64.vdi ]; then fi echo "Creating ISO" +SEED_ISO_DIR="$(pwd)/packer_templates/http/amazon" if [ -x "$(command -v genisoimage)" ]; then - genisoimage -output "$AMZDIR"/seed.iso -volid cidata -joliet -rock "$AMZDIR"/../amz_seed_iso/user-data "$AMZDIR"/../amz_seed_iso/meta-data + genisoimage -output "$AMZDIR"/seed.iso -volid cidata -joliet -rock "$SEED_ISO_DIR"/user-data "$SEED_ISO_DIR"/meta-data elif [ -x "$(command -v hdiutil)" ]; then - hdiutil makehybrid -o "$AMZDIR"/seed.iso -hfs -joliet -iso -default-volume-name cidata "$AMZDIR"/../amz_seed_iso + hdiutil makehybrid -o "$AMZDIR"/seed.iso -hfs -joliet -iso -default-volume-name cidata "$SEED_ISO_DIR"/ elif [ -x "$(command -v mkisofs)" ]; then - mkfsiso9660 -o "$AMZDIR"/seed.iso "$AMZDIR"/../amz_seed_iso + mkfsiso9660 -o "$AMZDIR"/seed.iso "$SEED_ISO_DIR"/ else echo "No tool found to create the seed.iso" exit 1 @@ -74,9 +76,9 @@ echo "Deleting the VM" vboxmanage unregistervm $VM --delete echo "starting packer build of amazonlinux" -if bento build --vars vbox_source_path="$AMZDIR"/amazon2023_x86_64.ovf,vbox_checksum=null "$AMZDIR"/../../os_pkrvars/amazonlinux/amazonlinux-2023-x86_64.pkrvars.hcl; then +if bento build --vars vbox_source_path="$AMZDIR"/amazon2023_x86_64.ovf,vbox_checksum=null "$(pwd)"/os_pkrvars/amazonlinux/amazonlinux-2023-x86_64.pkrvars.hcl; then echo "Cleaning up files" - rm -f "$AMZDIR"/*.ovf "$AMZDIR"/*.vmdk "$AMZDIR"/*.iso "$AMZDIR"/*.vdi "$AMZDIR"/*.qcow2 + rm -f "$AMZDIR" else exit 1 fi diff --git a/bento.gemspec b/bento.gemspec index 51343bad0..23dfd1fd0 100644 --- a/bento.gemspec +++ b/bento.gemspec @@ -11,7 +11,7 @@ Gem::Specification.new do |s| s.email = 'oss@chef.io' s.homepage = 'https://github.com/chef/bento/' - s.required_ruby_version = '>= 2.6' + s.required_ruby_version = '>= 3.0' s.add_dependency 'mixlib-shellout', '>= 2.3.2' s.add_dependency 'test-kitchen' diff --git a/builds.yml b/builds.yml index 873b50a90..373d0b86d 100644 --- a/builds.yml +++ b/builds.yml @@ -2,49 +2,50 @@ vagrant_cloud_account: 'bento' default_architectures: - - 'x86_64' - - 'amd64' + - x86_64 + - amd64 public: - - 'amazonlinux-2' - - 'amazonlinux-2023' - - 'almalinux-8' - - 'almalinux-9' - - 'centos-7' - - 'centos-stream-8' - - 'centos-stream-9' - - 'debian-11' - - 'debian-12' - - 'fedora-38' - - 'fedora-39' - - 'freebsd-13' - - 'freebsd-14' - - 'opensuse-leap-15' - - 'oraclelinux-7' - - 'oraclelinux-8' - - 'oraclelinux-9' - - 'rockylinux-8' - - 'rockylinux-9' - - 'ubuntu-20.04' - - 'ubuntu-22.04' - - 'ubuntu-23.10' + - amazonlinux-2 + - amazonlinux-2023 + - almalinux-8 + - almalinux-9 + - centos-7 + - centos-stream-8 + - centos-stream-9 + - debian-11 + - debian-12 + - fedora-39 + - fedora-40 + - freebsd-13 + - freebsd-14 + - opensuse-leap-15 + - oraclelinux-7 + - oraclelinux-8 + - oraclelinux-9 + - rockylinux-8 + - rockylinux-9 + - ubuntu-20.04 + - ubuntu-22.04 + - ubuntu-24.04 -# slug box name: text string from standard box name to match (generally the same) +# slug box name: text string from standard box name to match slugs: - 'almalinux-8': 'almalinux-8' - 'almalinux-9': 'almalinux-9' - 'centos-7': 'centos-7' - 'debian-12': 'debian-12' - 'debian-11': 'debian-11' - 'fedora-latest': 'fedora-39' - 'freebsd-13': 'freebsd-13' - 'freebsd-14': 'freebsd-14' - 'opensuse-leap-15': 'opensuse-leap-15' - 'oracle-7': 'oracle-7' - 'oracle-8': 'oracle-8' - 'oracle-9': 'oracle-9' - 'rockylinux-8': 'rockylinux-8' - 'rockylinux-9': 'rockylinux-9' + - almalinux-8 + - almalinux-9 + - centos-7 + - debian-12 + - debian-11 + - fedora-latest + - freebsd-13 + - freebsd-14 + - opensuse-leap-15 + - oracle-7 + - oracle-8 + - oracle-9 + - rockylinux-8 + - rockylinux-9 + - macos-14 do_not_build: - amazon diff --git a/builds/build_files/.gitkeep b/builds/build_files/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/lib/bento/cli.rb b/lib/bento/cli.rb index e68ab53c8..696dd5c7d 100644 --- a/lib/bento/cli.rb +++ b/lib/bento/cli.rb @@ -85,7 +85,7 @@ def self.parse(args) options.metadata_only = opt end - opts.on('--on-error', '[cleanup|abort|ask|run-cleanup-provisioner] If the build fails do: clean up (default), abort, ask, or run-cleanup-provisioner.') do |opt| + opts.on('--on-error OPT', '[cleanup|abort|ask|run-cleanup-provisioner] If the build fails do: clean up (default), abort, ask, or run-cleanup-provisioner.') do |opt| options.on_error = opt end @@ -109,15 +109,15 @@ def self.parse(args) options.except = opt end - opts.on('-m MIRROR', '--mirror MIRROR', 'Look for isos at MIRROR') do |opt| + opts.on('-M MIRROR', '--mirror MIRROR', 'Look for isos at MIRROR') do |opt| options.mirror = opt end - opts.on('-C cpus', '--cpus CPUS', '# of CPUs per provider') do |opt| + opts.on('-c CPUS', '--cpus CPUS', '# of CPUs per provider') do |opt| options.cpus = opt end - opts.on('-M MEMORY', '--memory MEMORY', 'Memory (MB) per provider') do |opt| + opts.on('-m MEMORY', '--memory MEMORY', 'Memory (MB) per provider') do |opt| options.mem = opt end @@ -125,7 +125,7 @@ def self.parse(args) options.headed = opt end - opts.on('-S', '--single', 'Disable parallelization of Packer builds') do |opt| + opts.on('-s', '--single', 'Disable parallelization of Packer builds') do |opt| options.single = opt end diff --git a/lib/bento/test.rb b/lib/bento/test.rb index 0d733aa15..5bdbc4952 100644 --- a/lib/bento/test.rb +++ b/lib/bento/test.rb @@ -27,7 +27,9 @@ def start end end banner("Testing finished in #{duration(time.real)}.") - unless errors.empty? + if errors.empty? + banner('All tests passed.') + else raise("Failed Tests:\n#{errors.join("\n")}\nexited #{$CHILD_STATUS}") end end diff --git a/lib/bento/upload.rb b/lib/bento/upload.rb index 582cc9d70..078902800 100644 --- a/lib/bento/upload.rb +++ b/lib/bento/upload.rb @@ -74,8 +74,8 @@ def upload_box(md_file) # @return [String, NilClass] The slug name or nil # def lookup_slug(name) - builds_yml['slugs'].each_pair do |slug, match_string| - return slug if name.start_with?(match_string) + builds_yml['slugs'].each do |slug| + return slug if name.start_with?(slug) end nil diff --git a/lib/bento/version.rb b/lib/bento/version.rb index 4cb808c14..30e078423 100644 --- a/lib/bento/version.rb +++ b/lib/bento/version.rb @@ -1,3 +1,3 @@ module Bento - VERSION = '4.1.0'.freeze + VERSION = '4.1.1'.freeze end diff --git a/os_pkrvars/fedora/fedora-39-aarch64.pkrvars.hcl b/os_pkrvars/fedora/fedora-39-aarch64.pkrvars.hcl index 3ad5175de..b6e1b86db 100644 --- a/os_pkrvars/fedora/fedora-39-aarch64.pkrvars.hcl +++ b/os_pkrvars/fedora/fedora-39-aarch64.pkrvars.hcl @@ -1,4 +1,3 @@ - os_name = "fedora" os_version = "39" os_arch = "aarch64" @@ -7,4 +6,4 @@ iso_checksum = "sha256:d19dc2a39758155fa53e6fd555d0d173ccc8175b55dea4 parallels_guest_os_type = "fedora-core" vbox_guest_os_type = "Fedora_64" vmware_guest_os_type = "arm-fedora-64" -boot_command = ["<wait><up><up>e<wait><down><down><end> inst.text inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/fedora/ks.cfg<F10><wait>"] \ No newline at end of file +boot_command = ["<wait><up><up>e<wait><down><down><end> inst.text inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/fedora/ks.cfg<F10><wait>"] diff --git a/os_pkrvars/fedora/fedora-38-aarch64.pkrvars.hcl b/os_pkrvars/fedora/fedora-40-aarch64.pkrvars.hcl similarity index 59% rename from os_pkrvars/fedora/fedora-38-aarch64.pkrvars.hcl rename to os_pkrvars/fedora/fedora-40-aarch64.pkrvars.hcl index fe5750727..24c62af3a 100644 --- a/os_pkrvars/fedora/fedora-38-aarch64.pkrvars.hcl +++ b/os_pkrvars/fedora/fedora-40-aarch64.pkrvars.hcl @@ -1,8 +1,8 @@ os_name = "fedora" -os_version = "38" +os_version = "40" os_arch = "aarch64" -iso_url = "https://download.fedoraproject.org/pub/fedora/linux/releases/38/Server/aarch64/iso/Fedora-Server-dvd-aarch64-38-1.6.iso" -iso_checksum = "sha256:0b40485d74fc60c0a78f071396aba78fafb2f8f3b1ab4cbc3388bda82f764f9b" +iso_url = "https://download.fedoraproject.org/pub/fedora/linux/releases/40/Server/aarch64/iso/Fedora-Server-dvd-aarch64-40-1.14.iso" +iso_checksum = "file:https://download.fedoraproject.org/pub/fedora/linux/releases/40/Server/aarch64/iso/Fedora-Server-40-1.14-aarch64-CHECKSUM" parallels_guest_os_type = "fedora-core" vbox_guest_os_type = "Fedora_64" vmware_guest_os_type = "arm-fedora-64" diff --git a/os_pkrvars/fedora/fedora-38-x86_64.pkrvars.hcl b/os_pkrvars/fedora/fedora-40-x86_64.pkrvars.hcl similarity index 59% rename from os_pkrvars/fedora/fedora-38-x86_64.pkrvars.hcl rename to os_pkrvars/fedora/fedora-40-x86_64.pkrvars.hcl index 2ae962cb3..18aec053c 100644 --- a/os_pkrvars/fedora/fedora-38-x86_64.pkrvars.hcl +++ b/os_pkrvars/fedora/fedora-40-x86_64.pkrvars.hcl @@ -1,8 +1,8 @@ os_name = "fedora" -os_version = "38" +os_version = "40" os_arch = "x86_64" -iso_url = "https://download.fedoraproject.org/pub/fedora/linux/releases/38/Server/x86_64/iso/Fedora-Server-dvd-x86_64-38-1.6.iso" -iso_checksum = "sha256:66b52d7cb39386644cd740930b0bef0a5a2f2be569328fef6b1f9b3679fdc54d" +iso_url = "https://download.fedoraproject.org/pub/fedora/linux/releases/40/Server/x86_64/iso/Fedora-Server-dvd-x86_64-40-1.14.iso" +iso_checksum = "file:https://download.fedoraproject.org/pub/fedora/linux/releases/40/Server/x86_64/iso/Fedora-Server-40-1.14-x86_64-CHECKSUM" parallels_guest_os_type = "fedora-core" vbox_guest_os_type = "Fedora_64" vmware_guest_os_type = "fedora-64" diff --git a/os_pkrvars/macos/macos-14-aarch64.pkrvars.hcl b/os_pkrvars/macos/macos-14-aarch64.pkrvars.hcl new file mode 100644 index 000000000..d488f91bc --- /dev/null +++ b/os_pkrvars/macos/macos-14-aarch64.pkrvars.hcl @@ -0,0 +1,73 @@ +os_name = "macos" +os_version = "14.4.1" +os_arch = "aarch64" +parallels_ipsw_url = "https://updates.cdn-apple.com/2024WinterFCS/fullrestores/052-77579/4569734E-120C-4F31-AD08-FC1FF825D059/UniversalMac_14.4.1_23E224_Restore.ipsw" +parallels_ipsw_checksum = "78b39816521a6eeaf29221a4e59e83dae98ef5f9e8e718b846f8faab540a48c1" +sources_enabled = ["source.parallels-ipsw.vm"] +boot_command = [ + # hello, hola, bonjour, etc. + "<wait><spacebar><wait5s>", + # Select Language English (US) + "<enter><wait10s>", + # Select Your Country and Region + "<leftShiftOn><tab><leftShiftOff><wait><spacebar><wait5s>", + # Written and Spoken Languages + "<leftShiftOn><tab><leftShiftOff><wait><spacebar><wait5s>", + # Accessibility + "<leftShiftOn><tab><leftShiftOff><wait><spacebar><wait5s>", + # Data & Privacy + "<leftShiftOn><tab><leftShiftOff><wait><spacebar><wait5s>", + # Migration Assistant + "<tab><wait><tab><wait><tab><wait><spacebar><wait5s>", + # Sign In with Your Apple ID + "<leftShiftOn><tab><wait><tab><leftShiftOff><wait><spacebar><wait5s>", + # Are you sure you want to skip signing in with an Apple ID? + "<tab><wait><spacebar><wait5s>", + # Terms and Conditions + "<leftShiftOn><tab><leftShiftOff><wait><spacebar><wait5s>", + # I have read and agree to the macOS Software License Agreement + "<tab><wait><spacebar><wait5s>", + # Create a Computer Account + "vagrant<wait><tab><wait><tab><wait>vagrant<wait><tab><wait>vagrant<wait><tab><wait><tab><wait><tab><wait><spacebar><wait1m>", + # Enable Location Services + "<leftShiftOn><tab><leftShiftOff><wait><spacebar><wait5s>", + # Are you sure you don't want to use Location Services? + "<tab><wait><spacebar><wait5s>", + # Select Your Time Zone + "<tab><wait>UTC<wait><enter><wait><leftShiftOn><tab><leftShiftOff><wait><spacebar><wait5s>", + # Analytics + "<tab><wait><spacebar><wait><leftShiftOn><tab><leftShiftOff><wait><spacebar><wait5s>", + # Screen Time + "<tab><wait><spacebar><wait5s>", + # Siri + "<tab><wait><spacebar><wait><leftShiftOn><tab><leftShiftOff><wait><spacebar><wait5s>", + # Choose Your Look + "<leftShiftOn><tab><leftShiftOff><wait><spacebar><wait30s>", + # Enable keyboard navigation + "<leftCtrlOn><f7><leftCtrlOff><wait2s>", + # Open System Settings + "<leftSuperOn><spacebar><leftSuperOff><wait>System<spacebar>Settings<wait><enter><wait5s>", + # Enable Remote Management + "<up><wait><tab><tab><tab><tab><tab><tab><tab><tab><tab><wait><spacebar><wait5s>", + "<tab><tab><tab><tab><tab><tab><tab><tab><tab><tab><tab><tab><tab><tab><tab><tab><tab><wait><spacebar><wait5s>", + # Enable Remote Login + "<tab><tab><wait><spacebar><wait5s>", + # Close System Preferences + "<leftSuperOn>q<leftSuperOff><wait5s>", + # Disable keyboard navigation + "<leftCtrlOn><f7><leftCtrlOff><wait2s>", + # Open Terminal + "<leftSuperOn><spacebar><leftSuperOff><wait>terminal<wait><enter><wait5s>", + # Add vagrant user to sudoers + "echo 'vagrant' | sudo -S sh -c 'echo \"vagrant ALL=(ALL) NOPASSWD: ALL\" > /etc/sudoers.d/vagrant'<wait><enter><wait5s>", + # Set Auto login for vagrant + "sudo sysadminctl -autologin set -userName vagrant -password vagrant<wait><enter><wait5s>", + # Disable screen lock + "sudo sysadminctl -screenLock off -password vagrant<wait><enter><wait5s>", + # Install Parallels Tools + "sudo installer -pkg /Volumes/Parallels\\ Tools/Install.app/Contents/Resources/Install.mpkg -target /<wait><enter><wait5s>", + # Reboot + "sudo shutdown -r +15s<wait><enter><wait5s>", + "exit<enter><wait5s>", + "<leftSuperOn>q<leftSuperOff>" +] diff --git a/os_pkrvars/opensuse/opensuse-leap-15-aarch64.pkrvars.hcl b/os_pkrvars/opensuse/opensuse-leap-15-aarch64.pkrvars.hcl index 754aaebab..fbd8b25d4 100644 --- a/os_pkrvars/opensuse/opensuse-leap-15-aarch64.pkrvars.hcl +++ b/os_pkrvars/opensuse/opensuse-leap-15-aarch64.pkrvars.hcl @@ -1,8 +1,8 @@ os_name = "opensuse-leap" -os_version = "15.5" +os_version = "15.6" os_arch = "aarch64" -iso_url = "http://provo-mirror.opensuse.org/distribution/leap/15.5/iso/openSUSE-Leap-15.5-DVD-aarch64-Media.iso" -iso_checksum = "file:https://provo-mirror.opensuse.org/distribution/leap/15.5/iso/openSUSE-Leap-15.5-DVD-aarch64-Media.iso.sha256" +iso_url = "http://provo-mirror.opensuse.org/distribution/leap/15.6/iso/openSUSE-Leap-15.6-DVD-aarch64-Media.iso" +iso_checksum = "file:https://provo-mirror.opensuse.org/distribution/leap/15.6/iso/openSUSE-Leap-15.6-DVD-aarch64-Media.iso.sha256" parallels_guest_os_type = "opensuse" vbox_guest_os_type = "OpenSUSE_64" vmware_guest_os_type = "arm-other-64" diff --git a/os_pkrvars/opensuse/opensuse-leap-15-x86_64.pkrvars.hcl b/os_pkrvars/opensuse/opensuse-leap-15-x86_64.pkrvars.hcl index 33202e42f..0daf936b8 100644 --- a/os_pkrvars/opensuse/opensuse-leap-15-x86_64.pkrvars.hcl +++ b/os_pkrvars/opensuse/opensuse-leap-15-x86_64.pkrvars.hcl @@ -1,8 +1,8 @@ os_name = "opensuse-leap" -os_version = "15.5" +os_version = "15.6" os_arch = "x86_64" -iso_url = "http://sfo-korg-mirror.kernel.org/opensuse/distribution/leap/15.5/iso/openSUSE-Leap-15.5-DVD-x86_64-Media.iso" -iso_checksum = "file:http://sfo-korg-mirror.kernel.org/opensuse/distribution/leap/15.5/iso/openSUSE-Leap-15.5-DVD-x86_64-Media.iso.sha256" +iso_url = "http://sfo-korg-mirror.kernel.org/opensuse/distribution/leap/15.6/iso/openSUSE-Leap-15.6-DVD-x86_64-Media.iso" +iso_checksum = "file:http://sfo-korg-mirror.kernel.org/opensuse/distribution/leap/15.6/iso/openSUSE-Leap-15.6-DVD-x86_64-Media.iso.sha256" parallels_guest_os_type = "opensuse" vbox_guest_os_type = "OpenSUSE_64" vmware_guest_os_type = "opensuse-64" diff --git a/os_pkrvars/ubuntu/ubuntu-23.10-aarch64.pkrvars.hcl b/os_pkrvars/ubuntu/ubuntu-24.04-aarch64.pkrvars.hcl similarity index 69% rename from os_pkrvars/ubuntu/ubuntu-23.10-aarch64.pkrvars.hcl rename to os_pkrvars/ubuntu/ubuntu-24.04-aarch64.pkrvars.hcl index 770a5671a..f3625a163 100644 --- a/os_pkrvars/ubuntu/ubuntu-23.10-aarch64.pkrvars.hcl +++ b/os_pkrvars/ubuntu/ubuntu-24.04-aarch64.pkrvars.hcl @@ -1,8 +1,8 @@ os_name = "ubuntu" -os_version = "23.10" +os_version = "24.04" os_arch = "aarch64" -iso_url = "https://cdimage.ubuntu.com/releases/mantic/release/ubuntu-23.10-live-server-arm64.iso" -iso_checksum = "file:https://cdimage.ubuntu.com/releases/mantic/release/SHA256SUMS" +iso_url = "https://cdimage.ubuntu.com/releases/noble/release/ubuntu-24.04-live-server-arm64.iso" +iso_checksum = "file:https://cdimage.ubuntu.com/releases/noble/release/SHA256SUMS" parallels_guest_os_type = "ubuntu" vbox_guest_os_type = "Ubuntu_64" vmware_guest_os_type = "arm-ubuntu-64" diff --git a/os_pkrvars/ubuntu/ubuntu-23.10-x86_64.pkrvars.hcl b/os_pkrvars/ubuntu/ubuntu-24.04-x86_64.pkrvars.hcl similarity index 61% rename from os_pkrvars/ubuntu/ubuntu-23.10-x86_64.pkrvars.hcl rename to os_pkrvars/ubuntu/ubuntu-24.04-x86_64.pkrvars.hcl index 43a2a3941..ef40daf4f 100644 --- a/os_pkrvars/ubuntu/ubuntu-23.10-x86_64.pkrvars.hcl +++ b/os_pkrvars/ubuntu/ubuntu-24.04-x86_64.pkrvars.hcl @@ -1,8 +1,8 @@ os_name = "ubuntu" -os_version = "23.10" +os_version = "24.04" os_arch = "x86_64" -iso_url = "https://releases.ubuntu.com/mantic/ubuntu-23.10-live-server-amd64.iso" -iso_checksum = "file:https://releases.ubuntu.com/mantic/SHA256SUMS" +iso_url = "https://releases.ubuntu.com/noble/ubuntu-24.04-live-server-amd64.iso" +iso_checksum = "file:https://releases.ubuntu.com/noble/SHA256SUMS" parallels_guest_os_type = "ubuntu" vbox_guest_os_type = "Ubuntu_64" vmware_guest_os_type = "ubuntu-64" diff --git a/packer_templates/amz_seed_iso/README.md b/packer_templates/amz_seed_iso/README.md deleted file mode 100644 index 8ffadfe42..000000000 --- a/packer_templates/amz_seed_iso/README.md +++ /dev/null @@ -1 +0,0 @@ -# Used by Amazon Linux script to convert vdi to packer/vagrant ready ovf diff --git a/packer_templates/amz_working_files/README.md b/packer_templates/amz_working_files/README.md deleted file mode 100644 index 5142457a4..000000000 --- a/packer_templates/amz_working_files/README.md +++ /dev/null @@ -1 +0,0 @@ -# Used to store temp Amazon Linux files for packer build diff --git a/packer_templates/amz_seed_iso/meta-data b/packer_templates/http/amazon/meta-data similarity index 100% rename from packer_templates/amz_seed_iso/meta-data rename to packer_templates/http/amazon/meta-data diff --git a/packer_templates/amz_seed_iso/user-data b/packer_templates/http/amazon/user-data similarity index 100% rename from packer_templates/amz_seed_iso/user-data rename to packer_templates/http/amazon/user-data diff --git a/packer_templates/http/ubuntu/user-data b/packer_templates/http/ubuntu/user-data index d9393c65d..5e619f9a5 100644 --- a/packer_templates/http/ubuntu/user-data +++ b/packer_templates/http/ubuntu/user-data @@ -13,8 +13,10 @@ autoinstall: install-server: yes allow-pw: yes late-commands: - # - sed -i 's/^#*\(send dhcp-client-identifier\).*$/\1 = hardware;/' /target/etc/dhcp/dhclient.conf - - 'sed -i "s/dhcp4: true/&\n dhcp-identifier: mac/" /target/etc/netplan/00-installer-config.yaml' + - | + if [ -f /target/etc/netplan/00-installer-config.yaml ]; then + 'sed -i "s/dhcp4: true/&\n dhcp-identifier: mac/" /target/etc/netplan/00-installer-config.yaml' + fi - echo 'vagrant ALL=(ALL) NOPASSWD:ALL' > /target/etc/sudoers.d/vagrant # Enable hyper-v daemons only if using hyper-v virtualization - if [ $(virt-what) == "hyperv" ]; then apt-get update && apt-get install -y hyperv-daemons linux-tools-$(uname -r) linux-cloud-tools-$(uname -r) linux-cloud-tools-common cifs-utils && systemctl enable hypervvssd && systemctl enable hypervkvpd && systemctl start hypervvssd && systemctl start hypervkvpd; fi diff --git a/packer_templates/pkr-builder.pkr.hcl b/packer_templates/pkr-builder.pkr.hcl index 66c797904..6c62ae330 100644 --- a/packer_templates/pkr-builder.pkr.hcl +++ b/packer_templates/pkr-builder.pkr.hcl @@ -6,7 +6,7 @@ packer { source = "github.com/hashicorp/hyperv" } parallels = { - version = ">= 1.0.2" + version = ">= 1.1.6" source = "github.com/parallels/parallels" } qemu = { @@ -49,96 +49,106 @@ locals { "${path.root}/scripts/windows/enable-file-sharing.ps1", "${path.root}/scripts/windows/eject-media.ps1" ] : ( - var.os_name == "solaris" ? [ - "${path.root}/scripts/solaris/update_solaris.sh", - "${path.root}/scripts/_common/vagrant.sh", - "${path.root}/scripts/solaris/vmtools_solaris.sh", - "${path.root}/scripts/solaris/minimize_solaris.sh" + var.os_name == "macos" ? [ + "${path.root}/scripts/macos/system-default.sh", + "${path.root}/scripts/macos/system-update.sh", + "${path.root}/scripts/macos/vagrant.sh", + "${path.root}/scripts/_common/motd.sh", + "${path.root}/scripts/macos/parallels-tools.sh", + "${path.root}/scripts/macos/vmware-tools.sh", + "${path.root}/scripts/macos/shrink.sh" ] : ( - var.os_name == "freebsd" ? [ - "${path.root}/scripts/freebsd/update_freebsd.sh", - "${path.root}/scripts/freebsd/postinstall_freebsd.sh", - "${path.root}/scripts/freebsd/sudoers_freebsd.sh", + var.os_name == "solaris" ? [ + "${path.root}/scripts/solaris/update_solaris.sh", "${path.root}/scripts/_common/vagrant.sh", - "${path.root}/scripts/freebsd/vmtools_freebsd.sh", - "${path.root}/scripts/freebsd/cleanup_freebsd.sh", - "${path.root}/scripts/freebsd/minimize_freebsd.sh" + "${path.root}/scripts/solaris/vmtools_solaris.sh", + "${path.root}/scripts/solaris/minimize_solaris.sh" ] : ( - var.os_name == "opensuse-leap" || - var.os_name == "sles" ? [ - "${path.root}/scripts/suse/repositories_suse.sh", - "${path.root}/scripts/suse/update_suse.sh", - "${path.root}/scripts/_common/motd.sh", - "${path.root}/scripts/_common/sshd.sh", + var.os_name == "freebsd" ? [ + "${path.root}/scripts/freebsd/update_freebsd.sh", + "${path.root}/scripts/freebsd/postinstall_freebsd.sh", + "${path.root}/scripts/freebsd/sudoers_freebsd.sh", "${path.root}/scripts/_common/vagrant.sh", - "${path.root}/scripts/suse/unsupported-modules_suse.sh", - "${path.root}/scripts/_common/virtualbox.sh", - "${path.root}/scripts/_common/vmware_suse.sh", - "${path.root}/scripts/_common/parallels.sh", - "${path.root}/scripts/suse/vagrant_group_suse.sh", - "${path.root}/scripts/suse/sudoers_suse.sh", - "${path.root}/scripts/suse/zypper-locks_suse.sh", - "${path.root}/scripts/suse/remove-dvd-source_suse.sh", - "${path.root}/scripts/suse/cleanup_suse.sh", - "${path.root}/scripts/_common/minimize.sh" + "${path.root}/scripts/freebsd/vmtools_freebsd.sh", + "${path.root}/scripts/freebsd/cleanup_freebsd.sh", + "${path.root}/scripts/freebsd/minimize_freebsd.sh" ] : ( - var.os_name == "ubuntu" || - var.os_name == "debian" ? [ - "${path.root}/scripts/${var.os_name}/update_${var.os_name}.sh", + var.os_name == "opensuse-leap" || + var.os_name == "sles" ? [ + "${path.root}/scripts/suse/repositories_suse.sh", + "${path.root}/scripts/suse/update_suse.sh", "${path.root}/scripts/_common/motd.sh", "${path.root}/scripts/_common/sshd.sh", - "${path.root}/scripts/${var.os_name}/networking_${var.os_name}.sh", - "${path.root}/scripts/${var.os_name}/sudoers_${var.os_name}.sh", "${path.root}/scripts/_common/vagrant.sh", - "${path.root}/scripts/${var.os_name}/systemd_${var.os_name}.sh", + "${path.root}/scripts/suse/unsupported-modules_suse.sh", "${path.root}/scripts/_common/virtualbox.sh", - "${path.root}/scripts/_common/vmware_debian_ubuntu.sh", + "${path.root}/scripts/_common/vmware_suse.sh", "${path.root}/scripts/_common/parallels.sh", - "${path.root}/scripts/${var.os_name}/hyperv_${var.os_name}.sh", - "${path.root}/scripts/${var.os_name}/cleanup_${var.os_name}.sh", - "${path.root}/scripts/_common/parallels_post_cleanup_debian_ubuntu.sh", + "${path.root}/scripts/suse/vagrant_group_suse.sh", + "${path.root}/scripts/suse/sudoers_suse.sh", + "${path.root}/scripts/suse/zypper-locks_suse.sh", + "${path.root}/scripts/suse/remove-dvd-source_suse.sh", + "${path.root}/scripts/suse/cleanup_suse.sh", "${path.root}/scripts/_common/minimize.sh" ] : ( - var.os_name == "fedora" ? [ - "${path.root}/scripts/fedora/networking_fedora.sh", - "${path.root}/scripts/fedora/update_dnf.sh", - "${path.root}/scripts/fedora/build-tools_fedora.sh", - "${path.root}/scripts/fedora/install-supporting-packages_fedora.sh", + var.os_name == "ubuntu" || + var.os_name == "debian" ? [ + "${path.root}/scripts/${var.os_name}/update_${var.os_name}.sh", "${path.root}/scripts/_common/motd.sh", "${path.root}/scripts/_common/sshd.sh", - "${path.root}/scripts/_common/virtualbox.sh", - "${path.root}/scripts/_common/vmware_fedora.sh", - "${path.root}/scripts/_common/parallels-rhel.sh", + "${path.root}/scripts/${var.os_name}/networking_${var.os_name}.sh", + "${path.root}/scripts/${var.os_name}/sudoers_${var.os_name}.sh", "${path.root}/scripts/_common/vagrant.sh", - "${path.root}/scripts/fedora/real-tmp_fedora.sh", - "${path.root}/scripts/fedora/cleanup_dnf.sh", + "${path.root}/scripts/${var.os_name}/systemd_${var.os_name}.sh", + "${path.root}/scripts/_common/virtualbox.sh", + "${path.root}/scripts/_common/vmware_debian_ubuntu.sh", + "${path.root}/scripts/_common/parallels.sh", + "${path.root}/scripts/${var.os_name}/hyperv_${var.os_name}.sh", + "${path.root}/scripts/${var.os_name}/cleanup_${var.os_name}.sh", + "${path.root}/scripts/_common/parallels_post_cleanup_debian_ubuntu.sh", "${path.root}/scripts/_common/minimize.sh" ] : ( - "${var.os_name}-${var.os_version}" == "amazonlinux-2" || - "${var.os_name}-${substr(var.os_version, 0, 1)}" == "centos-7" || - "${var.os_name}-${substr(var.os_version, 0, 1)}" == "oracle-7" || - "${var.os_name}-${substr(var.os_version, 0, 1)}" == "rhel-7" ? [ - "${path.root}/scripts/rhel/update_yum.sh", + var.os_name == "fedora" ? [ + "${path.root}/scripts/fedora/networking_fedora.sh", + "${path.root}/scripts/fedora/update_dnf.sh", + "${path.root}/scripts/fedora/build-tools_fedora.sh", + "${path.root}/scripts/fedora/install-supporting-packages_fedora.sh", "${path.root}/scripts/_common/motd.sh", "${path.root}/scripts/_common/sshd.sh", - "${path.root}/scripts/rhel/networking_rhel7.sh", - "${path.root}/scripts/_common/vagrant.sh", "${path.root}/scripts/_common/virtualbox.sh", - "${path.root}/scripts/_common/vmware_rhel.sh", + "${path.root}/scripts/_common/vmware_fedora.sh", "${path.root}/scripts/_common/parallels-rhel.sh", - "${path.root}/scripts/rhel/cleanup_yum.sh", - "${path.root}/scripts/_common/minimize.sh" - ] : [ - "${path.root}/scripts/rhel/update_dnf.sh", - "${path.root}/scripts/_common/motd.sh", - "${path.root}/scripts/_common/sshd.sh", "${path.root}/scripts/_common/vagrant.sh", - "${path.root}/scripts/_common/virtualbox.sh", - "${path.root}/scripts/_common/vmware_rhel.sh", - "${path.root}/scripts/_common/parallels-rhel.sh", - "${path.root}/scripts/rhel/cleanup_dnf.sh", + "${path.root}/scripts/fedora/real-tmp_fedora.sh", + "${path.root}/scripts/fedora/cleanup_dnf.sh", "${path.root}/scripts/_common/minimize.sh" - ] + ] : ( + "${var.os_name}-${var.os_version}" == "amazonlinux-2" || + "${var.os_name}-${substr(var.os_version, 0, 1)}" == "centos-7" || + "${var.os_name}-${substr(var.os_version, 0, 1)}" == "oraclelinux-7" || + "${var.os_name}-${substr(var.os_version, 0, 1)}" == "rhel-7" ? [ + "${path.root}/scripts/rhel/update_yum.sh", + "${path.root}/scripts/_common/motd.sh", + "${path.root}/scripts/_common/sshd.sh", + "${path.root}/scripts/rhel/networking_rhel7.sh", + "${path.root}/scripts/_common/vagrant.sh", + "${path.root}/scripts/_common/virtualbox.sh", + "${path.root}/scripts/_common/vmware_rhel.sh", + "${path.root}/scripts/_common/parallels-rhel.sh", + "${path.root}/scripts/rhel/cleanup_yum.sh", + "${path.root}/scripts/_common/minimize.sh" + ] : [ + "${path.root}/scripts/rhel/update_dnf.sh", + "${path.root}/scripts/_common/motd.sh", + "${path.root}/scripts/_common/sshd.sh", + "${path.root}/scripts/_common/vagrant.sh", + "${path.root}/scripts/_common/virtualbox.sh", + "${path.root}/scripts/_common/vmware_rhel.sh", + "${path.root}/scripts/_common/parallels-rhel.sh", + "${path.root}/scripts/rhel/cleanup_dnf.sh", + "${path.root}/scripts/_common/minimize.sh" + ] + ) ) ) ) diff --git a/packer_templates/pkr-sources.pkr.hcl b/packer_templates/pkr-sources.pkr.hcl index 2cb1a1d21..1b0e9367c 100644 --- a/packer_templates/pkr-sources.pkr.hcl +++ b/packer_templates/pkr-sources.pkr.hcl @@ -20,11 +20,18 @@ locals { var.is_windows ? "attach" : "upload" ) : var.parallels_tools_mode parallels_prlctl = var.parallels_prlctl == null ? ( - var.is_windows ? [ - ["set", "{{ .Name }}", "--efi-boot", "off"], - ["set", "{{ .Name }}", "--efi-secure-boot", "off"], - ["set", "{{ .Name }}", "--device-add", "cdrom", "--image", "${path.root}/../builds/iso/unattended.iso", "--connect"], - ] : null + var.is_windows ? ( + var.os_arch == "x86_64" ? [ + ["set", "{{ .Name }}", "--efi-boot", "off"] + ] : [ + ["set", "{{ .Name }}", "--efi-boot", "off"], + ["set", "{{ .Name }}", "--efi-secure-boot", "off"], + ["set", "{{ .Name }}", "--device-add", "cdrom", "--image", "${path.root}/../builds/iso/unattended.iso", "--connect"], + ] + ) : [ + ["set", "{{ .Name }}", "--3d-accelerate", "off"], + ["set", "{{ .Name }}", "--videosize", "16"] + ] ) : var.parallels_prlctl # qemu @@ -36,7 +43,7 @@ locals { var.is_windows ? [ ["-drive", "file=${path.root}/../builds/iso/virtio-win.iso,media=cdrom,index=3"], ["-drive", "file=${var.iso_url},media=cdrom,index=2"], - ["-drive", "file=${path.root}/../builds/packer-${var.os_name}-${var.os_version}-${var.os_arch}-qemu/{{ .Name }},if=virtio,cache=writeback,discard=ignore,format=qcow2,index=1"], + ["-drive", "file=${path.root}/../builds/build_files/packer-${var.os_name}-${var.os_version}-${var.os_arch}-qemu/{{ .Name }},if=virtio,cache=writeback,discard=ignore,format=qcow2,index=1"], ] : ( var.os_arch == "aarch64" ? [ ["-boot", "strict=off"] @@ -65,7 +72,9 @@ locals { # Source block common default_boot_wait = var.default_boot_wait == null ? ( - var.is_windows ? "60s" : "5s" + var.is_windows ? "60s" : ( + var.os_name == "macos" ? "8m" : "5s" + ) ) : var.default_boot_wait cd_files = var.cd_files == null ? ( var.is_windows ? ( @@ -92,12 +101,16 @@ locals { ] ) : null ) : var.floppy_files - http_directory = var.http_directory == null ? "${path.root}/http" : var.http_directory - memory = var.memory == null ? (var.is_windows ? 4096 : 2048) : var.memory - output_directory = var.output_directory == null ? "${path.root}/../builds/packer-${var.os_name}-${var.os_version}-${var.os_arch}" : var.output_directory + http_directory = var.http_directory == null ? "${path.root}/http" : var.http_directory + memory = var.memory == null ? ( + var.is_windows || var.os_name == "macos" ? 4096 : 2048 + ) : var.memory + output_directory = var.output_directory == null ? "${path.root}/../builds/build_files/packer-${var.os_name}-${var.os_version}-${var.os_arch}" : var.output_directory shutdown_command = var.shutdown_command == null ? ( var.is_windows ? "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"" : ( - var.os_name == "freebsd" ? "echo 'vagrant' | su -m root -c 'shutdown -p now'" : "echo 'vagrant' | sudo -S /sbin/halt -h -p" + var.os_name == "macos" ? "echo 'vagrant' | sudo -S shutdown -h now" : ( + var.os_name == "freebsd" ? "echo 'vagrant' | su -m root -c 'shutdown -p now'" : "echo 'vagrant' | sudo -S /sbin/halt -h -p" + ) ) ) : var.shutdown_command vm_name = var.vm_name == null ? ( @@ -138,6 +151,32 @@ source "hyperv-iso" "vm" { winrm_username = var.winrm_username vm_name = local.vm_name } +source "parallels-ipsw" "vm" { + # Parallels specific options + host_interfaces = var.parallels_host_interfaces + ipsw_url = var.parallels_ipsw_url + ipsw_checksum = var.parallels_ipsw_checksum + prlctl = local.parallels_prlctl + prlctl_post = var.parallels_prlctl_post + prlctl_version_file = var.parallels_prlctl_version_file + # Source block common options + boot_command = var.boot_command + boot_wait = var.parallels_boot_wait == null ? local.default_boot_wait : var.parallels_boot_wait + cpus = var.cpus + communicator = local.communicator + disk_size = var.disk_size + http_directory = local.http_directory + http_content = var.http_content + memory = local.memory + output_directory = "${local.output_directory}-parallels" + shutdown_command = local.shutdown_command + shutdown_timeout = var.shutdown_timeout + ssh_password = var.ssh_password + ssh_port = var.ssh_port + ssh_timeout = var.ssh_timeout + ssh_username = var.ssh_username + vm_name = local.vm_name +} source "parallels-iso" "vm" { # Parallels specific options guest_os_type = var.parallels_guest_os_type diff --git a/packer_templates/pkr-variables.pkr.hcl b/packer_templates/pkr-variables.pkr.hcl index 16ef20dd8..5b0c027fd 100644 --- a/packer_templates/pkr-variables.pkr.hcl +++ b/packer_templates/pkr-variables.pkr.hcl @@ -74,6 +74,33 @@ variable "hyperv_switch_name" { default = "bento" } +# parallels-ipsw +variable "parallels_host_interfaces" { + type = list(string) + default = null + description = "Host interfaces to use for the parallels-ipsw builder" +} +variable "parallels_ipsw_url" { + type = string + default = null + description = "URL to download the IPSW file" +} +variable "parallels_ipsw_checksum" { + type = string + default = null + description = "Checksum of the IPSW file" +} +variable "parallels_prlctl_post" { + type = list(list(string)) + default = null + description = "Commands to run after the VM is created" +} +variable "http_content" { + type = map(string) + default = null + description = "Content to be served by the http server" +} + # parallels-iso variable "parallels_boot_wait" { type = string diff --git a/packer_templates/scripts/_common/motd.sh b/packer_templates/scripts/_common/motd.sh index 2a82b9b70..e3eb4334d 100644 --- a/packer_templates/scripts/_common/motd.sh +++ b/packer_templates/scripts/_common/motd.sh @@ -2,7 +2,9 @@ bento=' This system is built by the Bento project by Chef Software -More information can be found at https://github.com/chef/bento' +More information can be found at https://github.com/chef/bento + +Use of this system is acceptance of the OS vendor EULA and License Agreements.' if [ -d /etc/update-motd.d ]; then MOTD_CONFIG='/etc/update-motd.d/99-bento' @@ -17,5 +19,8 @@ BENTO chmod 0755 "$MOTD_CONFIG" else + touch /etc/motd + chmod 0777 /etc/motd echo "$bento" >> /etc/motd + chmod 0755 /etc/motd fi diff --git a/packer_templates/scripts/_common/vagrant.sh b/packer_templates/scripts/_common/vagrant.sh index 9dfbc090e..37e74bf52 100644 --- a/packer_templates/scripts/_common/vagrant.sh +++ b/packer_templates/scripts/_common/vagrant.sh @@ -5,10 +5,10 @@ HOME_DIR="${HOME_DIR:-/home/vagrant}"; pubkey_url="https://raw.githubusercontent.com/hashicorp/vagrant/main/keys/vagrant.pub"; mkdir -p "$HOME_DIR"/.ssh; -if command -v wget >/dev/null 2>&1; then - wget --no-check-certificate "$pubkey_url" -O "$HOME_DIR"/.ssh/authorized_keys; -elif command -v curl >/dev/null 2>&1; then +if command -v curl >/dev/null 2>&1; then curl --insecure --location "$pubkey_url" > "$HOME_DIR"/.ssh/authorized_keys; +elif command -v wget >/dev/null 2>&1; then + wget --no-check-certificate "$pubkey_url" -O "$HOME_DIR"/.ssh/authorized_keys; elif command -v fetch >/dev/null 2>&1; then fetch -am -o "$HOME_DIR"/.ssh/authorized_keys "$pubkey_url"; else diff --git a/packer_templates/scripts/macos/parallels-tools.sh b/packer_templates/scripts/macos/parallels-tools.sh new file mode 100644 index 000000000..4eea703a6 --- /dev/null +++ b/packer_templates/scripts/macos/parallels-tools.sh @@ -0,0 +1,12 @@ +#!/bin/sh + +if [ -e .PACKER_BUILDER_TYPE ] || echo "$PACKER_BUILDER_TYPE" | grep -q '^parallels'; then + echo "Installing Parallels Tools..." + installer -pkg /Volumes/Parallels\ Tools/Install.app/Contents/Resources/Install.mpkg -target / + + # This usually works but gives a failed to eject error + hdiutil detach /Volumes/Parallels\ Tools || echo "exit code $? is suppressed"; + + # Reboot is needed for tools install + reboot +fi diff --git a/packer_templates/scripts/macos/shrink.sh b/packer_templates/scripts/macos/shrink.sh new file mode 100644 index 000000000..14301079a --- /dev/null +++ b/packer_templates/scripts/macos/shrink.sh @@ -0,0 +1,37 @@ +#!/bin/bash +# The MIT License (MIT) +# Copyright (c) 2013-2017 Timothy Sutton +# +# Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated +# documentation files (the "Software"), to deal in the Software without restriction, including without limitation the +# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit +# persons to whom the Software is furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE +# WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR +# COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR +# OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +echo 'Disable spotlight...' +mdutil -a -i off + +echo 'Turn off hibernation and get rid of the sleepimage' +pmset hibernatemode 0 +rm -f /var/vm/sleepimage + +echo 'Remove Screensaver video files' +rm -rf /Library/Application Support/com.apple.idleassetsd/Customer/* || echo "rm screensaver videos exit code $? is suppressed" + +echo 'Remove logs' +rm -rf /Library/Logs/* || echo "rm library logs exit code $? is suppressed" + +echo 'Remove swap file' +rm -rf /System/Volumes/VM/swapfile* || echo "rm swapfile exit code $? is suppressed" + +if [ -e .vmfusion_version ] || [[ "$PACKER_BUILDER_TYPE" == vmware* ]]; then + echo 'VMware Fusion specific items' + echo 'Shrink the disk' + /Library/Application\ Support/VMware\ Tools/vmware-tools-cli disk shrink / +fi diff --git a/packer_templates/scripts/macos/system-default.sh b/packer_templates/scripts/macos/system-default.sh new file mode 100644 index 000000000..36a56e923 --- /dev/null +++ b/packer_templates/scripts/macos/system-default.sh @@ -0,0 +1,32 @@ +#!/bin/sh +# The MIT License (MIT) +# Copyright (c) 2013-2017 Timothy Sutton +# +# Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated +# documentation files (the "Software"), to deal in the Software without restriction, including without limitation the +# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit +# persons to whom the Software is furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE +# WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR +# COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR +# OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +PlistBuddy="/usr/libexec/PlistBuddy" + +echo 'Disable loginwindow screensaver to save CPU cycles' +$PlistBuddy -c 'Add :loginWindowIdleTime integer 0' "/Library/Preferences/com.apple.screensaver.plist" +defaults -currentHost write com.apple.screensaver idleTime 0 + +echo 'Prevent the VM from sleeping' +systemsetup -setdisplaysleep Off 2>/dev/null +systemsetup -setsleep Off 2>/dev/null +systemsetup -setcomputersleep Off 2>/dev/null + +echo "Enabling automatic GUI login for the 'Vagrant' user." +sysadminctl -autologin set -userName vagrant -password vagrant + +echo 'Disable screen lock' +sysadminctl -screenLock off -password vagrant diff --git a/packer_templates/scripts/macos/system-update.sh b/packer_templates/scripts/macos/system-update.sh new file mode 100644 index 000000000..b6112915d --- /dev/null +++ b/packer_templates/scripts/macos/system-update.sh @@ -0,0 +1,16 @@ +#!/bin/sh + +echo "Downloading and installing system updates..." +softwareupdate -i -a -R + +echo 'Disable automatic updates' +# TOGGLE ALL OFF (auto checking is on to show other prefs are toggled off) +# before setting values quit system preferences & stop software update - stops defaults cache breaking 'AutomaticCheckEnabled' +osascript -e "tell application \"System Preferences\" to quit" +softwareupdate --schedule off +defaults write /Library/Preferences/com.apple.SoftwareUpdate.plist AutomaticCheckEnabled -bool No +defaults write /Library/Preferences/com.apple.SoftwareUpdate.plist AutomaticDownload -bool NO +defaults write /Library/Preferences/com.apple.SoftwareUpdate.plist ConfigDataInstall -bool NO +defaults write /Library/Preferences/com.apple.SoftwareUpdate.plist CriticalUpdateInstall -bool NO +defaults write /Library/Preferences/com.apple.commerce.plist AutoUpdateRestartRequired -bool NO +defaults write /Library/Preferences/com.apple.commerce.plist AutoUpdate -bool NO diff --git a/packer_templates/scripts/macos/vagrant.sh b/packer_templates/scripts/macos/vagrant.sh new file mode 100644 index 000000000..108c289d5 --- /dev/null +++ b/packer_templates/scripts/macos/vagrant.sh @@ -0,0 +1,30 @@ +#!/bin/sh +# The MIT License (MIT) +# Copyright (c) 2013-2017 Timothy Sutton +# +# Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated +# documentation files (the "Software"), to deal in the Software without restriction, including without limitation the +# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit +# persons to whom the Software is furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE +# WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR +# COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR +# OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +date > /etc/box_build_time +OSX_VERS=$(sw_vers -productVersion | awk -F "." '{print $1}') + +# Set computer/hostname +COMPNAME=macos-${OSX_VERS} +scutil --set ComputerName "${COMPNAME}" +scutil --set HostName "${COMPNAME}".vagrantup.com + +echo "Installing vagrant keys for vagrant user" +mkdir "/Users/vagrant/.ssh" +chmod 700 "/Users/vagrant/.ssh" +curl -L 'https://raw.githubusercontent.com/hashicorp/vagrant/main/keys/vagrant.pub' > "/Users/vagrant/.ssh/authorized_keys" +chmod 600 "/Users/vagrant/.ssh/authorized_keys" +chown -R "vagrant" "/Users/vagrant/.ssh" diff --git a/packer_templates/scripts/macos/vmware-tools.sh b/packer_templates/scripts/macos/vmware-tools.sh new file mode 100644 index 000000000..08218ba56 --- /dev/null +++ b/packer_templates/scripts/macos/vmware-tools.sh @@ -0,0 +1,48 @@ +#!/bin/sh +# The MIT License (MIT) +# Copyright (c) 2013-2017 Timothy Sutton +# +# Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated +# documentation files (the "Software"), to deal in the Software without restriction, including without limitation the +# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit +# persons to whom the Software is furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE +# WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR +# COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR +# OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +echo 'VMware Fusion specific items' +if [ -e .vmfusion_version ] || echo "$PACKER_BUILDER_TYPE" | grep -q '^vmware'; then + # Globbing here: VMware Fusion >= 8.5.4 includes a second + # 'darwinPre15.iso' for any OS X guests pre-10.11 + TOOLS_PATH=$(find "/Users/vagrant/" -name '*darwin*.iso' -print) + if [ ! -e "$TOOLS_PATH" ]; then + echo "Couldn't locate uploaded tools iso at $TOOLS_PATH!" + exit 1 + fi + + TMPMOUNT=$(/usr/bin/mktemp -d /tmp/vmware-tools.XXXX) + hdiutil attach "$TOOLS_PATH" -mountpoint "$TMPMOUNT" + + INSTALLER_PKG="$TMPMOUNT/Install VMware Tools.app/Contents/Resources/VMware Tools.pkg" + if [ ! -e "$INSTALLER_PKG" ]; then + echo "Couldn't locate VMware installer pkg at $INSTALLER_PKG!" + exit 1 + fi + + echo "Installing VMware tools.." + installer -pkg "$TMPMOUNT/Install VMware Tools.app/Contents/Resources/VMware Tools.pkg" -target / + + # This usually fails + hdiutil detach "$TMPMOUNT" || echo "exit code $? is suppressed"; + rm -rf "$TMPMOUNT" + rm -f "$TOOLS_PATH" + + # Point Linux shared folder root to that used by OS X guests, + # useful for the Hashicorp vmware_fusion Vagrant provider plugin + mkdir /mnt + ln -sf /Volumes/VMware\ Shared\ Folders /mnt/hgfs +fi From 036e8d1cd3e71c2086adbc1e9207fdab49d06d85 Mon Sep 17 00:00:00 2001 From: Daniel Widerin <daniel@widerin.net> Date: Thu, 23 May 2024 16:35:23 +0200 Subject: [PATCH 1552/1622] Fix qemu_format="raw" causing wrong format for qemu (#1568) --- packer_templates/pkr-sources.pkr.hcl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packer_templates/pkr-sources.pkr.hcl b/packer_templates/pkr-sources.pkr.hcl index 1b0e9367c..58e48758a 100644 --- a/packer_templates/pkr-sources.pkr.hcl +++ b/packer_templates/pkr-sources.pkr.hcl @@ -43,7 +43,7 @@ locals { var.is_windows ? [ ["-drive", "file=${path.root}/../builds/iso/virtio-win.iso,media=cdrom,index=3"], ["-drive", "file=${var.iso_url},media=cdrom,index=2"], - ["-drive", "file=${path.root}/../builds/build_files/packer-${var.os_name}-${var.os_version}-${var.os_arch}-qemu/{{ .Name }},if=virtio,cache=writeback,discard=ignore,format=qcow2,index=1"], + ["-drive", "file=${path.root}/../builds/build_files/packer-${var.os_name}-${var.os_version}-${var.os_arch}-qemu/{{ .Name }},if=virtio,cache=writeback,discard=ignore,format=${var.qemu_format},index=1"], ] : ( var.os_arch == "aarch64" ? [ ["-boot", "strict=off"] From 2b80f1c13b8cf50a6b98341062d36a3a900c10a9 Mon Sep 17 00:00:00 2001 From: Corey Hemminger <hemminger@hotmail.com> Date: Thu, 23 May 2024 11:56:02 -0500 Subject: [PATCH 1553/1622] setup workflow for hosted runners (#1547) * setup workflow for hosted runners --- .github/workflows/ci-build.yml | 4 + .github/workflows/pkr-bld-amazonlinux-x64.yml | 6 +- .github/workflows/pkr-bld-hyperv-x64.yml | 48 +++--- .github/workflows/pkr-bld-parallels-arm64.yml | 5 +- .github/workflows/pkr-bld-parallels-x64.yml | 5 +- .github/workflows/pkr-bld-qemu-arm64.yml | 11 +- .github/workflows/pkr-bld-qemu-x64.yml | 10 +- .../workflows/pkr-bld-virtualbox-arm64.yml | 14 +- .github/workflows/pkr-bld-virtualbox-x64.yml | 15 +- .github/workflows/pkr-bld-vmware-arm64.yml | 147 +++++++++++++++--- .github/workflows/pkr-bld-vmware-x64.yml | 146 +++++++++++++++-- .github/workflows/test-pkr-bld-parallels.yml | 145 +++++++++++++++++ CHANGELOG.md | 42 +++-- README.md | 1 + amazonlinux-2-x86_64-virtualbox-build.sh | 2 +- amazonlinux-2023-aarch64-virtualbox-build.sh | 2 +- amazonlinux-2023-x86_64-virtualbox-build.sh | 2 +- bento.gemspec | 2 - builds.yml | 8 +- lib/bento/runner.rb | 2 +- lib/bento/upload.rb | 9 ++ lib/bento/version.rb | 2 +- .../almalinux/almalinux-9-aarch64.pkrvars.hcl | 4 +- .../almalinux/almalinux-9-x86_64.pkrvars.hcl | 4 +- .../centos/centos-7-aarch64.pkrvars.hcl | 9 -- os_pkrvars/centos/centos-7-x86_64.pkrvars.hcl | 9 -- .../centos-stream-8-aarch64.pkrvars.hcl | 9 -- .../centos/centos-stream-8-x86_64.pkrvars.hcl | 9 -- .../oraclelinux-7-aarch64.pkrvars.hcl | 9 -- .../oraclelinux-7-x86_64.pkrvars.hcl | 9 -- .../oraclelinux-9-aarch64.pkrvars.hcl | 6 +- .../oraclelinux-9-x86_64.pkrvars.hcl | 6 +- os_pkrvars/rhel/rhel-7-aarch64.pkrvars.hcl | 9 -- os_pkrvars/rhel/rhel-7-x86_64.pkrvars.hcl | 9 -- os_pkrvars/rhel/rhel-9-aarch64.pkrvars.hcl | 2 +- os_pkrvars/rhel/rhel-9-x86_64.pkrvars.hcl | 2 +- .../rockylinux-9-aarch64.pkrvars.hcl | 4 +- .../rockylinux-9-x86_64.pkrvars.hcl | 4 +- packer_templates/http/ubuntu/user-data | 9 +- packer_templates/pkr-builder.pkr.hcl | 5 +- packer_templates/pkr-sources.pkr.hcl | 31 ++-- packer_templates/pkr-variables.pkr.hcl | 18 ++- 42 files changed, 567 insertions(+), 228 deletions(-) create mode 100644 .github/workflows/test-pkr-bld-parallels.yml delete mode 100644 os_pkrvars/centos/centos-7-aarch64.pkrvars.hcl delete mode 100644 os_pkrvars/centos/centos-7-x86_64.pkrvars.hcl delete mode 100644 os_pkrvars/centos/centos-stream-8-aarch64.pkrvars.hcl delete mode 100644 os_pkrvars/centos/centos-stream-8-x86_64.pkrvars.hcl delete mode 100644 os_pkrvars/oraclelinux/oraclelinux-7-aarch64.pkrvars.hcl delete mode 100644 os_pkrvars/oraclelinux/oraclelinux-7-x86_64.pkrvars.hcl delete mode 100644 os_pkrvars/rhel/rhel-7-aarch64.pkrvars.hcl delete mode 100644 os_pkrvars/rhel/rhel-7-x86_64.pkrvars.hcl diff --git a/.github/workflows/ci-build.yml b/.github/workflows/ci-build.yml index 4caf23c95..783a4d1ed 100644 --- a/.github/workflows/ci-build.yml +++ b/.github/workflows/ci-build.yml @@ -95,3 +95,7 @@ jobs: allowed-failures: allowed-skips: ${{ toJSON(needs) }} jobs: ${{ toJSON(needs) }} + +# pkr-bld-parallels-test: +# uses: ./.github/workflows/test-pkr-bld-parallels.yml +# secrets: inherit diff --git a/.github/workflows/pkr-bld-amazonlinux-x64.yml b/.github/workflows/pkr-bld-amazonlinux-x64.yml index e12c54d14..111cbeb33 100644 --- a/.github/workflows/pkr-bld-amazonlinux-x64.yml +++ b/.github/workflows/pkr-bld-amazonlinux-x64.yml @@ -4,7 +4,7 @@ on: env: PACKER_GITHUB_API_TOKEN: "${{ secrets.GITHUB_TOKEN }}" - PACKER_LOG: "1" + # PACKER_LOG: "1" jobs: x86_64: @@ -28,6 +28,8 @@ jobs: vagrant --version - name: Install Chef uses: actionshub/chef-install@3.0.0 + with: + version: 24.2.1058 - name: Setup Packer uses: hashicorp/setup-packer@main with: @@ -46,6 +48,7 @@ jobs: sudo chmod -R 777 /mnt/builds sudo ln -s /mnt/builds ./ eval "$(chef shell-init bash)" + export LOGNAME=$USER ./${{ matrix.os }}-x86_64-virtualbox-build.sh ls -alh builds cat builds/${{ matrix.os }}*-x86_64._metadata.json @@ -61,4 +64,5 @@ jobs: - name: Bento Test run: | eval "$(chef shell-init bash)" + export LOGNAME=$USER bento test diff --git a/.github/workflows/pkr-bld-hyperv-x64.yml b/.github/workflows/pkr-bld-hyperv-x64.yml index 7002d7f76..4c2121d7c 100644 --- a/.github/workflows/pkr-bld-hyperv-x64.yml +++ b/.github/workflows/pkr-bld-hyperv-x64.yml @@ -4,28 +4,25 @@ on: env: PACKER_GITHUB_API_TOKEN: "${{ secrets.GITHUB_TOKEN }}" - PACKER_LOG: "1" + # PACKER_LOG: "1" jobs: x86_64: - runs-on: [self-hosted, X64, hyperv] + runs-on: windows-latest strategy: fail-fast: false matrix: os: - almalinux-8 - almalinux-9 - - centos-7 - - centos-stream-8 - centos-stream-9 - debian-11 - debian-12 - - fedora-38 - fedora-39 + - fedora-40 - freebsd-13 - freebsd-14 - opensuse-leap-15 - - oraclelinux-7 - oraclelinux-8 - oraclelinux-9 - rockylinux-8 @@ -38,20 +35,29 @@ jobs: steps: - name: Checkout uses: actions/checkout@main -# - name: Setup Packer -# uses: hashicorp/setup-packer@main -# with: -# version: latest - - name: Bento build - run: packer build -timestamp-ui -only="${{ matrix.provider }}.vm" -var-file="os_pkrvars/$("${{ matrix.os }}".Split('-')[0])/${{ matrix.os }}-x86_64.pkrvars.hcl" packer_templates - - name: Remove VM in case of canceled job - if: cancelled() + - name: Install Chef + uses: actionshub/chef-install@3.0.0 + with: + version: 24.2.1058 + - name: Setup Packer + uses: hashicorp/setup-packer@main + with: + version: latest + - name: Install Bento run: | - echo Powering off and deleting any existing VMs named ${{ matrix.os }}*-amd64 - Stop-VM -Force ${{ matrix.os }}*-amd64 - sleep 1 - Remove-VM -Force ${{ matrix.os }}*-amd64 - sleep 2 + chef shell-init powershell + gem build bento.gemspec + gem install bento-*.gem + - name: Create VM Switch for Hyper-V + shell: pwsh + run: | + Get-PsDrive -PsProvider FileSystem + pwd + New-VMSwitch -Name "bento" -NetAdapterName "Ethernet" -AllowManagementOS $true + - name: Packer Init + run: packer init -upgrade packer_templates + - name: Packer build + run: packer build -timestamp-ui -only="${{ matrix.provider }}.vm" -var 'sources_enabled=["hyperv-iso.vm"]' -var-file="os_pkrvars/$("${{ matrix.os }}".Split('-')[0])/${{ matrix.os }}-x86_64.pkrvars.hcl" packer_templates - name: Upload build artifact uses: actions/upload-artifact@main with: @@ -61,3 +67,7 @@ jobs: builds/*.json retention-days: 10 compression-level: 0 # no compression + - name: Bento Test + run: | + chef shell-init powershell + bento test diff --git a/.github/workflows/pkr-bld-parallels-arm64.yml b/.github/workflows/pkr-bld-parallels-arm64.yml index 6934da07f..be31c1e6c 100644 --- a/.github/workflows/pkr-bld-parallels-arm64.yml +++ b/.github/workflows/pkr-bld-parallels-arm64.yml @@ -4,7 +4,7 @@ on: env: PACKER_GITHUB_API_TOKEN: "${{ secrets.GITHUB_TOKEN }}" - PACKER_LOG: "1" + # PACKER_LOG: "1" jobs: aarch64: @@ -15,8 +15,6 @@ jobs: os: - almalinux-8 - almalinux-9 - - centos-7 - - centos-stream-8 - centos-stream-9 - debian-11 - debian-12 @@ -25,7 +23,6 @@ jobs: - freebsd-13 - freebsd-14 - opensuse-leap-15 - - oraclelinux-7 - oraclelinux-8 - oraclelinux-9 - rockylinux-8 diff --git a/.github/workflows/pkr-bld-parallels-x64.yml b/.github/workflows/pkr-bld-parallels-x64.yml index 9af99ba4c..a2836e92b 100644 --- a/.github/workflows/pkr-bld-parallels-x64.yml +++ b/.github/workflows/pkr-bld-parallels-x64.yml @@ -4,7 +4,7 @@ on: env: PACKER_GITHUB_API_TOKEN: "${{ secrets.GITHUB_TOKEN }}" - PACKER_LOG: "1" + # PACKER_LOG: "1" jobs: x86_64: @@ -15,8 +15,6 @@ jobs: os: - almalinux-8 - almalinux-9 - - centos-7 - - centos-stream-8 - centos-stream-9 - debian-11 - debian-12 @@ -25,7 +23,6 @@ jobs: - freebsd-13 - freebsd-14 - opensuse-leap-15 - - oraclelinux-7 - oraclelinux-8 - oraclelinux-9 - rockylinux-8 diff --git a/.github/workflows/pkr-bld-qemu-arm64.yml b/.github/workflows/pkr-bld-qemu-arm64.yml index 944f8c95f..0213abdd6 100644 --- a/.github/workflows/pkr-bld-qemu-arm64.yml +++ b/.github/workflows/pkr-bld-qemu-arm64.yml @@ -8,15 +8,13 @@ env: jobs: aarch64: - runs-on: macos-14 + runs-on: macos-latest strategy: fail-fast: false matrix: os: - almalinux-8 - almalinux-9 - - centos-7 - - centos-stream-8 - centos-stream-9 - debian-11 - debian-12 @@ -25,7 +23,6 @@ jobs: - freebsd-13 - freebsd-14 - opensuse-leap-15 - - oraclelinux-7 - oraclelinux-8 - oraclelinux-9 - rockylinux-8 @@ -40,13 +37,17 @@ jobs: uses: actions/checkout@main - name: Install Vagrant QEMU run: | - brew install qemu libvirt brew tap hashicorp/tap + brew update + brew install qemu + brew install libvirt brew install --cask hashicorp/tap/hashicorp-vagrant brew services start libvirt vagrant plugin install vagrant-libvirt vagrant-qemu - name: Install Chef uses: actionshub/chef-install@3.0.0 + with: + version: 24.2.1058 - name: Setup Packer uses: hashicorp/setup-packer@main with: diff --git a/.github/workflows/pkr-bld-qemu-x64.yml b/.github/workflows/pkr-bld-qemu-x64.yml index 5bb0eee9b..729343d38 100644 --- a/.github/workflows/pkr-bld-qemu-x64.yml +++ b/.github/workflows/pkr-bld-qemu-x64.yml @@ -4,7 +4,7 @@ on: env: PACKER_GITHUB_API_TOKEN: "${{ secrets.GITHUB_TOKEN }}" - PACKER_LOG: "1" + # PACKER_LOG: "1" jobs: x86_64: @@ -15,8 +15,6 @@ jobs: os: - almalinux-8 - almalinux-9 - - centos-7 - - centos-stream-8 - centos-stream-9 - debian-11 - debian-12 @@ -25,7 +23,6 @@ jobs: - freebsd-13 - freebsd-14 - opensuse-leap-15 - - oraclelinux-7 - oraclelinux-8 - oraclelinux-9 - rockylinux-8 @@ -38,14 +35,13 @@ jobs: steps: - name: Checkout uses: actions/checkout@main - - name: Install Vagrant and kvm + - name: Install Vagrant QEMU run: | wget -O- https://apt.releases.hashicorp.com/gpg | gpg --dearmor | sudo tee /usr/share/keyrings/hashicorp-archive-keyring.gpg echo "deb [signed-by=/usr/share/keyrings/hashicorp-archive-keyring.gpg] https://apt.releases.hashicorp.com $(lsb_release -cs) main" | sudo tee /etc/apt/sources.list.d/hashicorp.list sudo apt-get update sudo apt-get install -y software-properties-common vagrant qemu-kvm libvirt-daemon-system virtinst libvirt-clients bridge-utils qemu-utils libvirt-dev vagrant plugin install vagrant-libvirt vagrant-qemu - vagrant --version - name: Enable KVM run: | echo 'KERNEL=="kvm", GROUP="kvm", MODE="0666", OPTIONS+="static_node=kvm"' | sudo tee /etc/udev/rules.d/99-kvm4all.rules @@ -58,6 +54,8 @@ jobs: sudo systemctl status libvirtd - name: Install Chef uses: actionshub/chef-install@3.0.0 + with: + version: 24.2.1058 - name: Setup Packer uses: hashicorp/setup-packer@main with: diff --git a/.github/workflows/pkr-bld-virtualbox-arm64.yml b/.github/workflows/pkr-bld-virtualbox-arm64.yml index d649e759c..f1e9450d9 100644 --- a/.github/workflows/pkr-bld-virtualbox-arm64.yml +++ b/.github/workflows/pkr-bld-virtualbox-arm64.yml @@ -4,19 +4,17 @@ on: env: PACKER_GITHUB_API_TOKEN: "${{ secrets.GITHUB_TOKEN }}" - PACKER_LOG: "1" + # PACKER_LOG: "1" jobs: aarch64: - runs-on: macos-14 + runs-on: macos-latest strategy: fail-fast: false matrix: os: - almalinux-8 - almalinux-9 - - centos-7 - - centos-stream-8 - centos-stream-9 - debian-11 - debian-12 @@ -25,7 +23,6 @@ jobs: - freebsd-13 - freebsd-14 - opensuse-leap-15 - - oraclelinux-7 - oraclelinux-8 - oraclelinux-9 - rockylinux-8 @@ -41,12 +38,13 @@ jobs: - name: Install Vagrant Virtualbox run: | brew tap hashicorp/tap + brew update brew install --cask hashicorp/tap/hashicorp-vagrant - wget -q https://www.virtualbox.org/download/testcase/VirtualBox-7.0.15_BETA4-162549-macOSArm64.dmg - hdiutil attach VirtualBox-7.0.15_BETA4-162549-macOSArm64.dmg - sudo installer -pkg /Volumes/VirtualBox/VirtualBox.pkg -target / + brew install --cask virtualbox@beta - name: Install Chef uses: actionshub/chef-install@3.0.0 + with: + version: 24.2.1058 - name: Setup Packer uses: hashicorp/setup-packer@main with: diff --git a/.github/workflows/pkr-bld-virtualbox-x64.yml b/.github/workflows/pkr-bld-virtualbox-x64.yml index 2aafba2ae..e1d52132a 100644 --- a/.github/workflows/pkr-bld-virtualbox-x64.yml +++ b/.github/workflows/pkr-bld-virtualbox-x64.yml @@ -3,8 +3,8 @@ on: workflow_call: env: - PACKER_GITHUB_API_TOKEN: "${{ secrets.GITHUB_TOKEN }}" - PACKER_LOG: "1" + PACKER_GITHUB_API_TOKEN: ${{ secrets.GITHUB_TOKEN }} + # PACKER_LOG: 1 jobs: x86_64: @@ -15,8 +15,6 @@ jobs: os: - almalinux-8 - almalinux-9 - - centos-7 - - centos-stream-8 - centos-stream-9 - debian-11 - debian-12 @@ -25,7 +23,6 @@ jobs: - freebsd-13 - freebsd-14 - opensuse-leap-15 - - oraclelinux-7 - oraclelinux-8 - oraclelinux-9 - rockylinux-8 @@ -38,7 +35,7 @@ jobs: steps: - name: Checkout uses: actions/checkout@main - - name: Install Vagrant and VirtualBox + - name: Install Vagrant VirtualBox run: | wget -O- https://apt.releases.hashicorp.com/gpg | gpg --dearmor | sudo tee /usr/share/keyrings/hashicorp-archive-keyring.gpg wget -O- https://www.virtualbox.org/download/oracle_vbox_2016.asc | gpg --dearmor | sudo tee /usr/share/keyrings/oracle-virtualbox-2016.gpg @@ -46,10 +43,10 @@ jobs: echo "deb [signed-by=/usr/share/keyrings/oracle-virtualbox-2016.gpg] https://download.virtualbox.org/virtualbox/debian $(lsb_release -cs) contrib" | sudo tee /etc/apt/sources.list.d/virtualbox.list sudo apt-get update sudo apt-get install -y software-properties-common vagrant virtualbox-7.0 - VBoxManage --version - vagrant --version - name: Install Chef uses: actionshub/chef-install@3.0.0 + with: + version: 24.2.1058 - name: Setup Packer uses: hashicorp/setup-packer@main with: @@ -66,6 +63,7 @@ jobs: sudo chmod -R 777 /mnt/builds sudo ln -s /mnt/builds ./ eval "$(chef shell-init bash)" + export LOGNAME=$USER bento build -o ${{ matrix.provider }}.vm os_pkrvars/$(echo ${{ matrix.os }} | cut -d "-" -f 1)/"${{ matrix.os }}-x86_64.pkrvars.hcl" ls -alh builds/ cat builds/${{ matrix.os }}*-x86_64._metadata.json @@ -81,4 +79,5 @@ jobs: - name: Bento Test run: | eval "$(chef shell-init bash)" + export LOGNAME=$USER bento test diff --git a/.github/workflows/pkr-bld-vmware-arm64.yml b/.github/workflows/pkr-bld-vmware-arm64.yml index 567e56ccd..e4f0a66fa 100644 --- a/.github/workflows/pkr-bld-vmware-arm64.yml +++ b/.github/workflows/pkr-bld-vmware-arm64.yml @@ -4,19 +4,17 @@ on: env: PACKER_GITHUB_API_TOKEN: "${{ secrets.GITHUB_TOKEN }}" - PACKER_LOG: "1" + # PACKER_LOG: "1" jobs: aarch64: - runs-on: [self-hosted, ARM64, vmware-fusion] + runs-on: macos-latest strategy: fail-fast: false matrix: os: - almalinux-8 - almalinux-9 - - centos-7 - - centos-stream-8 - centos-stream-9 - debian-11 - debian-12 @@ -25,7 +23,6 @@ jobs: - freebsd-13 - freebsd-14 - opensuse-leap-15 - - oraclelinux-7 - oraclelinux-8 - oraclelinux-9 - rockylinux-8 @@ -38,25 +35,139 @@ jobs: steps: - name: Checkout uses: actions/checkout@main -# - name: Setup Packer -# if: steps.verify-changed-files.outputs.files_changed == 'true' -# uses: hashicorp/setup-packer@main -# with: -# version: latest + - name: Install Vagrant VMware-fusion + run: | + brew tap hashicorp/tap + brew update + brew install --cask hashicorp/tap/hashicorp-vagrant + brew install --cask vmware-fusion + brew install --cask vagrant-vmware-utility + vagrant plugin install vagrant-vmware-desktop + sudo mkdir -p /Library/Preferences/VMware\ Fusion/vmnet8 + NETWORKING_CONF="/Library/Preferences/VMware Fusion/networking" + DHCPD_CONF="/Library/Preferences/VMware Fusion/vmnet8/dhcpd.conf" + NAT_CONF="/Library/Preferences/VMware Fusion/vmnet8/nat.conf" + NAT_MAC_CONF="/Library/Preferences/VMware Fusion/vmnet8/nat.mac" + DHCPD_CONFIG=' + # Configuration file for ISC 2.0 vmnet-dhcpd operating on vmnet8. + + ###### VMNET DHCP Configuration. Start of "DO NOT MODIFY SECTION" ##### + # Modification Instructions: This section of the configuration file contains + # information generated by the configuration program. Do not modify this + # section. + + # Written at: 05/20/2024 11:50:44 + allow unknown-clients; + default-lease-time 1800; # default is 30 minutes + max-lease-time 7200; # default is 2 hours + + subnet 172.16.38.0 netmask 255.255.255.0 { + range 172.16.38.128 172.16.38.254; + option broadcast-address 172.16.38.255; + option domain-name-servers 172.16.38.2; + option domain-name localdomain; + default-lease-time 1800; # default is 30 minutes + max-lease-time 7200; # default is 2 hours + option netbios-name-servers 172.16.38.2; + option routers 172.16.38.2; + } + host vmnet8 { + hardware ethernet 00:50:56:C0:00:08; + fixed-address 172.16.38.1; + option domain-name-servers 0.0.0.0; + option domain-name ""; + option routers 0.0.0.0; + } + ####### VMNET DHCP Configuration. End of "DO NOT MODIFY SECTION" ####### + ' + NAT_CONFIG=" + # VMware NAT configuration file + [host] + # Use MacOS network virtualization API + useMacosVmnetVirtApi = 1 + # NAT gateway address + ip = 172.16.38.2 + netmask = 255.255.255.0 + # VMnet device if not specified on command line + device = vmnet8 + # Allow PORT/EPRT FTP commands (they need incoming TCP stream ...) + activeFTP = 1 + # Allows the source to have any OUI. Turn this on if you change the OUI in the MAC address of your virtual machines. + allowAnyOUI = 1 + # VMnet host IP address + hostIp = 172.16.38.1 + # Controls if (TCP) connections should be reset when the adapter they are bound to goes down + resetConnectionOnLinkDown = 1 + # Controls if (TCP) connection should be reset when guest packet's destination is NAT's IP address + resetConnectionOnDestLocalHost = 1 + # Controls if enable nat ipv6 + natIp6Enable = 0 + # Controls if enable nat ipv6 + natIp6Prefix = fd15:4ba5:5a2b:1008::/64 + [tcp] + # Value of timeout in TCP TIME_WAIT state, in seconds + timeWaitTimeout = 30 + [udp] + # Timeout in seconds. Dynamically-created UDP mappings will purged if idle for this duration of time 0 = no timeout, default = 60; real value might be up to 100% longer + timeout = 60 + [netbios] + # Timeout for NBNS queries. + nbnsTimeout = 2 + # Number of retries for each NBNS query. + nbnsRetries = 3 + # Timeout for NBDS queries. + nbdsTimeout = 3 + [incomingtcp] + # Use these with care - anyone can enter into your VM through these... + # The format and example are as follows: + #<external port number> = <VM's IP address>:<VM's port number> + #8080 = 172.16.3.128:80 + [incomingudp] + # UDP port forwarding example + #6000 = 172.16.3.0:6001 + " + NAT_MAC_CONFIG="00:50:56:F2:C7:28" + NETWORKING_CONFIG=" + VERSION=1,0 + answer VNET_1_DHCP yes + answer VNET_1_DHCP_CFG_HASH 97D56988968565698E051056ADEDEEACF00F5981 + answer VNET_1_HOSTONLY_NETMASK 255.255.255.0 + answer VNET_1_HOSTONLY_SUBNET 172.16.252.0 + answer VNET_1_HOSTONLY_UUID 74A7B7F5-AB8E-41CF-9E0F-595F9C9FA1C5 + answer VNET_1_VIRTUAL_ADAPTER yes + answer VNET_8_DHCP yes + answer VNET_8_DHCP_CFG_HASH 2040265D0F7053A921FB3F6EDE944490D9E687D6 + answer VNET_8_HOSTONLY_NETMASK 255.255.255.0 + answer VNET_8_HOSTONLY_SUBNET 172.16.38.0 + answer VNET_8_HOSTONLY_UUID 3CBAC6B3-6A71-4182-8BC6-849058A947B8 + answer VNET_8_NAT yes + answer VNET_8_VIRTUAL_ADAPTER yes + " + # Write the network configuration to the file + echo "$NETWORKING_CONFIG" | sudo tee "$NETWORKING_CONF" > /dev/null + echo "$DHCPD_CONFIG" | sudo tee "$DHCPD_CONF" > /dev/null + echo "$NAT_CONFIG" | sudo tee "$NAT_CONF" > /dev/null + echo "$NAT_MAC_CONFIG" | sudo tee "$NAT_MAC_CONF" > /dev/null + echo "VMware Fusion networking configuration updated." + - name: Install Chef + uses: actionshub/chef-install@3.0.0 + with: + version: 24.2.1058 + - name: Setup Packer + uses: hashicorp/setup-packer@main + with: + version: latest + - name: Install Bento + run: | + eval "$(chef shell-init bash)" + gem build bento.gemspec + gem install bento-*.gem - name: Bento build run: | eval "$(chef shell-init bash)" bento build -o ${{ matrix.provider }}.vm os_pkrvars/$(echo ${{ matrix.os }} | cut -d "-" -f 1)/"${{ matrix.os }}-aarch64.pkrvars.hcl" ls -alh builds/ cat builds/${{ matrix.os }}*-aarch64._metadata.json - - name: Remove VM in case of canceled job - if: cancelled() - run: | - echo Powering off and deleting any existing VMs named ${{ matrix.os }}*-aarch64 - vmrun -T fusion stop builds/packer-${{ matrix.os }}*-x86_64-vmware/${{ matrix.os }}*-aarch64.vmx hard 2> /dev/null - sleep 1 - vmrun -T fusion deleteVM builds/packer-${{ matrix.os }}*-x86_64-vmware/${{ matrix.os }}*-aarch64.vmx 2> /dev/null - sleep 2 - name: Upload build artifact uses: actions/upload-artifact@v3 with: diff --git a/.github/workflows/pkr-bld-vmware-x64.yml b/.github/workflows/pkr-bld-vmware-x64.yml index 71a95f361..97dc27ff3 100644 --- a/.github/workflows/pkr-bld-vmware-x64.yml +++ b/.github/workflows/pkr-bld-vmware-x64.yml @@ -4,19 +4,17 @@ on: env: PACKER_GITHUB_API_TOKEN: "${{ secrets.GITHUB_TOKEN }}" - PACKER_LOG: "1" + # PACKER_LOG: "1" jobs: x86_64: - runs-on: [self-hosted, X64, vmware-fusion] + runs-on: macos-13 strategy: fail-fast: false matrix: os: - almalinux-8 - almalinux-9 - - centos-7 - - centos-stream-8 - centos-stream-9 - debian-11 - debian-12 @@ -25,7 +23,6 @@ jobs: - freebsd-13 - freebsd-14 - opensuse-leap-15 - - oraclelinux-7 - oraclelinux-8 - oraclelinux-9 - rockylinux-8 @@ -38,24 +35,139 @@ jobs: steps: - name: Checkout uses: actions/checkout@main -# - name: Setup Packer -# uses: hashicorp/setup-packer@main -# with: -# version: latest + - name: Install Vagrant VMware-fusion + run: | + brew tap hashicorp/tap + brew update + brew install --cask hashicorp/tap/hashicorp-vagrant + brew install --cask vmware-fusion + brew install --cask vagrant-vmware-utility + vagrant plugin install vagrant-vmware-desktop + sudo mkdir -p /Library/Preferences/VMware\ Fusion/vmnet8 + NETWORKING_CONF="/Library/Preferences/VMware Fusion/networking" + DHCPD_CONF="/Library/Preferences/VMware Fusion/vmnet8/dhcpd.conf" + NAT_CONF="/Library/Preferences/VMware Fusion/vmnet8/nat.conf" + NAT_MAC_CONF="/Library/Preferences/VMware Fusion/vmnet8/nat.mac" + DHCPD_CONFIG=' + # Configuration file for ISC 2.0 vmnet-dhcpd operating on vmnet8. + + ###### VMNET DHCP Configuration. Start of "DO NOT MODIFY SECTION" ##### + # Modification Instructions: This section of the configuration file contains + # information generated by the configuration program. Do not modify this + # section. + + # Written at: 05/20/2024 11:50:44 + allow unknown-clients; + default-lease-time 1800; # default is 30 minutes + max-lease-time 7200; # default is 2 hours + + subnet 172.16.38.0 netmask 255.255.255.0 { + range 172.16.38.128 172.16.38.254; + option broadcast-address 172.16.38.255; + option domain-name-servers 172.16.38.2; + option domain-name localdomain; + default-lease-time 1800; # default is 30 minutes + max-lease-time 7200; # default is 2 hours + option netbios-name-servers 172.16.38.2; + option routers 172.16.38.2; + } + host vmnet8 { + hardware ethernet 00:50:56:C0:00:08; + fixed-address 172.16.38.1; + option domain-name-servers 0.0.0.0; + option domain-name ""; + option routers 0.0.0.0; + } + ####### VMNET DHCP Configuration. End of "DO NOT MODIFY SECTION" ####### + ' + NAT_CONFIG=" + # VMware NAT configuration file + [host] + # Use MacOS network virtualization API + useMacosVmnetVirtApi = 1 + # NAT gateway address + ip = 172.16.38.2 + netmask = 255.255.255.0 + # VMnet device if not specified on command line + device = vmnet8 + # Allow PORT/EPRT FTP commands (they need incoming TCP stream ...) + activeFTP = 1 + # Allows the source to have any OUI. Turn this on if you change the OUI in the MAC address of your virtual machines. + allowAnyOUI = 1 + # VMnet host IP address + hostIp = 172.16.38.1 + # Controls if (TCP) connections should be reset when the adapter they are bound to goes down + resetConnectionOnLinkDown = 1 + # Controls if (TCP) connection should be reset when guest packet's destination is NAT's IP address + resetConnectionOnDestLocalHost = 1 + # Controls if enable nat ipv6 + natIp6Enable = 0 + # Controls if enable nat ipv6 + natIp6Prefix = fd15:4ba5:5a2b:1008::/64 + [tcp] + # Value of timeout in TCP TIME_WAIT state, in seconds + timeWaitTimeout = 30 + [udp] + # Timeout in seconds. Dynamically-created UDP mappings will purged if idle for this duration of time 0 = no timeout, default = 60; real value might be up to 100% longer + timeout = 60 + [netbios] + # Timeout for NBNS queries. + nbnsTimeout = 2 + # Number of retries for each NBNS query. + nbnsRetries = 3 + # Timeout for NBDS queries. + nbdsTimeout = 3 + [incomingtcp] + # Use these with care - anyone can enter into your VM through these... + # The format and example are as follows: + #<external port number> = <VM's IP address>:<VM's port number> + #8080 = 172.16.3.128:80 + [incomingudp] + # UDP port forwarding example + #6000 = 172.16.3.0:6001 + " + NAT_MAC_CONFIG="00:50:56:F2:C7:28" + NETWORKING_CONFIG=" + VERSION=1,0 + answer VNET_1_DHCP yes + answer VNET_1_DHCP_CFG_HASH 97D56988968565698E051056ADEDEEACF00F5981 + answer VNET_1_HOSTONLY_NETMASK 255.255.255.0 + answer VNET_1_HOSTONLY_SUBNET 172.16.252.0 + answer VNET_1_HOSTONLY_UUID 74A7B7F5-AB8E-41CF-9E0F-595F9C9FA1C5 + answer VNET_1_VIRTUAL_ADAPTER yes + answer VNET_8_DHCP yes + answer VNET_8_DHCP_CFG_HASH 2040265D0F7053A921FB3F6EDE944490D9E687D6 + answer VNET_8_HOSTONLY_NETMASK 255.255.255.0 + answer VNET_8_HOSTONLY_SUBNET 172.16.38.0 + answer VNET_8_HOSTONLY_UUID 3CBAC6B3-6A71-4182-8BC6-849058A947B8 + answer VNET_8_NAT yes + answer VNET_8_VIRTUAL_ADAPTER yes + " + # Write the network configuration to the file + echo "$NETWORKING_CONFIG" | sudo tee "$NETWORKING_CONF" > /dev/null + echo "$DHCPD_CONFIG" | sudo tee "$DHCPD_CONF" > /dev/null + echo "$NAT_CONFIG" | sudo tee "$NAT_CONF" > /dev/null + echo "$NAT_MAC_CONFIG" | sudo tee "$NAT_MAC_CONF" > /dev/null + echo "VMware Fusion networking configuration updated." + - name: Install Chef + uses: actionshub/chef-install@3.0.0 + with: + version: 24.2.1058 + - name: Setup Packer + uses: hashicorp/setup-packer@main + with: + version: latest + - name: Install Bento + run: | + eval "$(chef shell-init bash)" + gem build bento.gemspec + gem install bento-*.gem - name: Bento build run: | eval "$(chef shell-init bash)" bento build -o ${{ matrix.provider }}.vm os_pkrvars/$(echo ${{ matrix.os }} | cut -d "-" -f 1)/"${{ matrix.os }}-x86_64.pkrvars.hcl" ls -alh builds/ cat builds/${{ matrix.os }}*-x86_64._metadata.json - - name: Remove VM in case of canceled job - if: cancelled() - run: | - echo Powering off and deleting any existing VMs named ${{ matrix.os }}*-amd64 - vmrun -T fusion stop builds/packer-${{ matrix.os }}*-x86_64-vmware/${{ matrix.os }}*-amd64.vmx hard 2> /dev/null - sleep 1 - vmrun -T fusion deleteVM builds/packer-${{ matrix.os }}*-x86_64-vmware/${{ matrix.os }}*-amd64.vmx 2> /dev/null - sleep 2 - name: Upload build artifact uses: actions/upload-artifact@v3 with: diff --git a/.github/workflows/test-pkr-bld-parallels.yml b/.github/workflows/test-pkr-bld-parallels.yml new file mode 100644 index 000000000..53ae3a969 --- /dev/null +++ b/.github/workflows/test-pkr-bld-parallels.yml @@ -0,0 +1,145 @@ +--- +on: + workflow_call: + +env: + PACKER_GITHUB_API_TOKEN: "${{ secrets.GITHUB_TOKEN }}" + +jobs: + x86_64: + runs-on: macos-13 + strategy: + fail-fast: false + matrix: + os: + - almalinux-8 + - almalinux-9 + - centos-stream-9 + - debian-11 + - debian-12 + - fedora-39 + - fedora-40 + - freebsd-13 + - freebsd-14 + - opensuse-leap-15 + - oraclelinux-8 + - oraclelinux-9 + - rockylinux-8 + - rockylinux-9 + - ubuntu-20.04 + - ubuntu-22.04 + - ubuntu-24.04 + provider: + - parallels-iso + steps: + - name: Checkout + uses: actions/checkout@main + - name: Install Vagrant Parallels + run: | + brew tap hashicorp/tap + brew update + brew install --cask hashicorp/tap/hashicorp-vagrant + brew install --cask parallels + brew install --cask parallels-virtualization-sdk + vagrant plugin install vagrant-parallels + - name: Install Chef + uses: actionshub/chef-install@3.0.0 + with: + version: 24.2.1058 + - name: Setup Packer + uses: hashicorp/setup-packer@main + with: + version: latest + - name: Install Bento + run: | + eval "$(chef shell-init bash)" + gem build bento.gemspec + gem install bento-*.gem + - name: Bento build + run: | + eval "$(chef shell-init bash)" + bento build -o ${{ matrix.provider }}.vm os_pkrvars/$(echo ${{ matrix.os }} | cut -d "-" -f 1)/"${{ matrix.os }}-x86_64.pkrvars.hcl" + ls -alh builds/ + cat builds/${{ matrix.os }}*-x86_64._metadata.json + - name: Upload build artifact + uses: actions/upload-artifact@v3 + with: + name: "${{ matrix.os }}-parallels-x86_64" + path: | + builds/*.box + builds/*.json + retention-days: 10 + compression-level: 0 # no compression + - name: Bento Test + run: | + eval "$(chef shell-init bash)" + bento test + + aarch64: + runs-on: macos-latest + strategy: + fail-fast: false + matrix: + os: + - almalinux-8 + - almalinux-9 + - centos-stream-9 + - debian-11 + - debian-12 + - fedora-39 + - fedora-40 + - freebsd-13 + - freebsd-14 + - opensuse-leap-15 + - oraclelinux-8 + - oraclelinux-9 + - rockylinux-8 + - rockylinux-9 + - ubuntu-20.04 + - ubuntu-22.04 + - ubuntu-24.04 + provider: + - parallels-iso + steps: + - name: Checkout + uses: actions/checkout@main + - name: Install Vagrant Parallels + run: | + brew tap hashicorp/tap + brew update + brew install --cask hashicorp/tap/hashicorp-vagrant + brew install --cask parallels + brew install --cask parallels-virtualization-sdk + vagrant plugin install vagrant-parallels + - name: Install Chef + uses: actionshub/chef-install@3.0.0 + with: + version: 24.2.1058 + - name: Setup Packer + uses: hashicorp/setup-packer@main + with: + version: latest + - name: Install Bento + run: | + eval "$(chef shell-init bash)" + gem build bento.gemspec + gem install bento-*.gem + - name: Bento build + run: | + eval "$(chef shell-init bash)" + bento build -o ${{ matrix.provider }}.vm os_pkrvars/$(echo ${{ matrix.os }} | cut -d "-" -f 1)/"${{ matrix.os }}-aarch64.pkrvars.hcl" + ls -alh builds/ + cat builds/${{ matrix.os }}*-aarch64._metadata.json + - name: Upload build artifact + uses: actions/upload-artifact@v3 + with: + name: "${{ matrix.os }}-parallels-aarch64" + path: | + builds/*.box + builds/*.json + retention-days: 10 + compression-level: 0 # no compression + - name: Bento Test + run: | + eval "$(chef shell-init bash)" + bento test diff --git a/CHANGELOG.md b/CHANGELOG.md index 1a3583a05..b8a2f9fe8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,35 +7,31 @@ Markdown table generated at <https://www.tablesgenerator.com/markdown_tables#> | os | hyperv<br>x86_64 | parallels<br>x86_64 | parallels<br>aarch64 | qemu<br>x86_64 | qemu<br>aarch64 | virtualbox<br>x86_64 | virtualbox<br>aarch64 | vmware<br>x86_64 | vmware<br>aarch64 | |:---:|:---:|:---:|:---:|:---:|:---:|:---:|:---:|:---:|:---:| -| almalinux-8 | | x | | | | x | | x | | -| almalinux-9 | | x | | | | x | | x | x | +| almalinux-8 | | x | | x | | x | | x | | +| almalinux-9 | | x | x | | | x | | x | x | | amazonlinux-2 | | | | | | x | | | | | amazonlinux-2023 | | | | | | x | | | | -| centos-7 | | | | | | x | | x | | -| centos-stream-8 | | x | | | | x | | x | | | centos-stream-9 | | x | | | | x | | x | x | | debian-11 | | x | x | | | x | | x | | | debian-12 | | x | x | | | x | | x | x | -| fedora-39 | | x | x | | | x | | x | x | -| fedora-40 | | | | | | | | | | +| fedora-39 | | x | x | x | | x | | x | x | +| fedora-40 | | x | | x | | x | | x | x | | freebsd-13 | | | | | | x | | x | x | | freebsd-14 | | | | | | | | | | | macos | | | x | | | | | | | -| opensuse-leap-15 | | | | | | x | | x | x | -| oraclelinux-7 | | x | | | | x | | x | | +| opensuse-leap-15 | | | | x | | x | | x | x | | oraclelinux-8 | | | | | | x | | x | | | oraclelinux-9 | | x | x | | | x | | x | x | -| rhel-7 | license<br>needed | license<br>needed | license<br>needed | license<br>needed | license<br>needed | license<br>needed | license<br>needed | license<br>needed | license<br>needed | | rhel-8 | license<br>needed | license<br>needed | license<br>needed | license<br>needed | license<br>needed | license<br>needed | license<br>needed | license<br>needed | license<br>needed | | rhel-9 | license<br>needed | license<br>needed | license<br>needed | license<br>needed | license<br>needed | license<br>needed | license<br>needed | license<br>needed | license<br>needed | -| rockylinux-8 | | x | | | | x | | x | | +| rockylinux-8 | | x | | x | | x | | x | | | rockylinux-9 | | x | | | | x | | x | x | | sles-12 | license<br>needed | license<br>needed | na | license<br>needed | na | license<br>needed | na | license<br>needed | na | | sles-15 | license<br>needed | license<br>needed | na | license<br>needed | na | license<br>needed | na | license<br>needed | na | | solaris-11 | license<br>needed | license<br>needed | na | license<br>needed | na | license<br>needed | na | license<br>needed | na | | ubuntu-20.04 | | | x | | | x | | x | x | | ubuntu-22.04 | | x | | | | x | | | | -| ubuntu-24.04 | | x | x | | | x | | x | x | +| ubuntu-24.04 | | x | x | x | | x | | x | x | | windows-10 | | | na | | na | x | na | | na | | windows-11 | | x | x | | | x | | x | | | windows-2016 | | x | na | | na | x | na | x | na | @@ -45,16 +41,30 @@ Markdown table generated at <https://www.tablesgenerator.com/markdown_tables#> ### Todo - Fix failing builds -- migrate from http directory for hosting files to floppy_files or cd_files in source templates +- migrate from http directory for hosting files to cd_files in source templates - This makes all builds compatible with hyper-v gen 2 which removes floppy disk capability - - This also makes things universal for Virtualbox 6.1 to 7.x due to latter requiring extra config for guests on NAT to be able to connect to host - - Also eliminates any potential networking issues + - Eliminates any potential networking issues - Update pipelines to only run on updated pkrvars files -- Look into making all build uefi default builds +- Look into making all builds uefi default builds - Create CD pipeline to upload vagrant boxes after PR is merged - Create CD pipeline to build and upload new versions of vagrant boxes once every 3 months with the latest patches -## [unreleased] (2024-04-26) +## [unreleased] (2024-05-23) + +## [v4.1.2] (2024-05-23) + +- Fix for hyper-v build option +- Remove test-kitchen and kitchen-vagrant dependencies from gemspec to fix gem compile error on windows +- Updated hyper-v builds to use github actions hosted runners +- Updated VMware builds to use github actions hosted runners +- Better handle bento uploads of slugs ending in 'latest' +- Fix oraclelinux slug names +- Update almalinux 9.3 to 9.4 +- Update rhel 9.3 to 94 +- Update oraclelinux 9.3 to 9.4 +- Update rockylinux 9.3 to 9.4 +- Remove Centos 7, Centos Stream 8, RHEL 7, Oraclelinux 7 builds due to EOL +- Fix windows qemu args to match disk format when variable is specified ## [v4.1.1] (2024-04-26) diff --git a/README.md b/README.md index d34eb2a4e..5d25ec903 100644 --- a/README.md +++ b/README.md @@ -5,6 +5,7 @@ Bento is a project that encapsulates [Packer](https://www.packer.io/) templates ***NOTE:** - Vagrant 2.4.0+ is required for new cpu architecture support +- For `bento test` command to work test-kitchen and kitchen-vagrant gems must be installed - Virutalbox 6.x requires disabling nat config that allows vbox 7.x guests to connect to the host. To use comment out lines #161 and #162 in bento/packer_templates/pkr-variables.pkr.hcl or add variable `vboxmanage = []` to os_pkrvars files. - When running packer build command the output directory is relative to the working directory the command is currently running in. Suggest running packer build commands from bento root directory for build working files to be placed in bento/builds/(build_name) directory by default. If the output_directory variable isn't overwritten a directory called builds/(build_name) will be created in the current working directory that you are running the command from diff --git a/amazonlinux-2-x86_64-virtualbox-build.sh b/amazonlinux-2-x86_64-virtualbox-build.sh index b7d8e0775..213346346 100755 --- a/amazonlinux-2-x86_64-virtualbox-build.sh +++ b/amazonlinux-2-x86_64-virtualbox-build.sh @@ -71,7 +71,7 @@ vboxmanage unregistervm $VM --delete echo starting packer build of amazonlinux if bento build --vars vbox_source_path="$AMZDIR"/amazon2_x86_64.ovf,vbox_checksum=null "$(pwd)"/os_pkrvars/amazonlinux/amazonlinux-2-x86_64.pkrvars.hcl; then echo "Cleaning up files" - rm -f "$AMZDIR" + rm -rf "$AMZDIR" else exit 1 fi diff --git a/amazonlinux-2023-aarch64-virtualbox-build.sh b/amazonlinux-2023-aarch64-virtualbox-build.sh index bdb1a01e0..0fcc85a1e 100755 --- a/amazonlinux-2023-aarch64-virtualbox-build.sh +++ b/amazonlinux-2023-aarch64-virtualbox-build.sh @@ -80,7 +80,7 @@ vboxmanage unregistervm $VM --delete echo "starting packer build of amazonlinux" if bento build --vars vbox_source_path="$AMZDIR"/amazon2023_arm64.ovf,vbox_checksum=null "$(pwd)"/os_pkrvars/amazonlinux/amazonlinux-2023-aarch64.pkrvars.hcl; then echo "Cleaning up files" - rm -f "$AMZDIR" + rm -rf "$AMZDIR" else exit 1 fi diff --git a/amazonlinux-2023-x86_64-virtualbox-build.sh b/amazonlinux-2023-x86_64-virtualbox-build.sh index da6d3d097..ae3f612c1 100755 --- a/amazonlinux-2023-x86_64-virtualbox-build.sh +++ b/amazonlinux-2023-x86_64-virtualbox-build.sh @@ -78,7 +78,7 @@ vboxmanage unregistervm $VM --delete echo "starting packer build of amazonlinux" if bento build --vars vbox_source_path="$AMZDIR"/amazon2023_x86_64.ovf,vbox_checksum=null "$(pwd)"/os_pkrvars/amazonlinux/amazonlinux-2023-x86_64.pkrvars.hcl; then echo "Cleaning up files" - rm -f "$AMZDIR" + rm -rf "$AMZDIR" else exit 1 fi diff --git a/bento.gemspec b/bento.gemspec index 23dfd1fd0..e90d43c4f 100644 --- a/bento.gemspec +++ b/bento.gemspec @@ -14,8 +14,6 @@ Gem::Specification.new do |s| s.required_ruby_version = '>= 3.0' s.add_dependency 'mixlib-shellout', '>= 2.3.2' - s.add_dependency 'test-kitchen' - s.add_dependency 'kitchen-vagrant' s.bindir = 'bin' s.executables = %w(bento) diff --git a/builds.yml b/builds.yml index 373d0b86d..665696e27 100644 --- a/builds.yml +++ b/builds.yml @@ -10,8 +10,6 @@ public: - amazonlinux-2023 - almalinux-8 - almalinux-9 - - centos-7 - - centos-stream-8 - centos-stream-9 - debian-11 - debian-12 @@ -20,7 +18,6 @@ public: - freebsd-13 - freebsd-14 - opensuse-leap-15 - - oraclelinux-7 - oraclelinux-8 - oraclelinux-9 - rockylinux-8 @@ -40,9 +37,8 @@ slugs: - freebsd-13 - freebsd-14 - opensuse-leap-15 - - oracle-7 - - oracle-8 - - oracle-9 + - oraclelinux-8 + - oraclelinux-9 - rockylinux-8 - rockylinux-9 - macos-14 diff --git a/lib/bento/runner.rb b/lib/bento/runner.rb index 7c41b5804..b705918d9 100644 --- a/lib/bento/runner.rb +++ b/lib/bento/runner.rb @@ -90,7 +90,7 @@ def packer_build_cmd(template, _var_file) end if var_files cmd.insert(4, "-only=#{only}") if only cmd.insert(4, "-except=#{except}") if except - # Build the command line in the correct order and without spaces as future input for the splat operator. + cmd.insert(4, "-var 'sources_enabled=#{only.split(',').inspect}'") if only cmd.insert(4, "-var cpus=#{cpus}") if cpus cmd.insert(4, "-var memory=#{mem}") if mem cmd.insert(4, '-var headless=false') if headed diff --git a/lib/bento/upload.rb b/lib/bento/upload.rb index 078902800..7a79d6dcb 100644 --- a/lib/bento/upload.rb +++ b/lib/bento/upload.rb @@ -76,6 +76,15 @@ def upload_box(md_file) def lookup_slug(name) builds_yml['slugs'].each do |slug| return slug if name.start_with?(slug) + if slug.end_with?('latest') + box_name = slug.split('-').first + box_version = [] + Dir.glob("os_pkrvars/#{box_name}/**/*.pkrvars.hcl").each do |boxes| + box_version << File.basename(boxes).split('-')[1].to_i + end + latest = box_version.uniq!.max { |a, b| a <=> b } + return slug if name.start_with?("#{box_name}-#{latest}") + end end nil diff --git a/lib/bento/version.rb b/lib/bento/version.rb index 30e078423..cb7e9b360 100644 --- a/lib/bento/version.rb +++ b/lib/bento/version.rb @@ -1,3 +1,3 @@ module Bento - VERSION = '4.1.1'.freeze + VERSION = '4.1.2'.freeze end diff --git a/os_pkrvars/almalinux/almalinux-9-aarch64.pkrvars.hcl b/os_pkrvars/almalinux/almalinux-9-aarch64.pkrvars.hcl index 9a0c45b7b..a36a2f5b2 100644 --- a/os_pkrvars/almalinux/almalinux-9-aarch64.pkrvars.hcl +++ b/os_pkrvars/almalinux/almalinux-9-aarch64.pkrvars.hcl @@ -1,7 +1,7 @@ os_name = "almalinux" -os_version = "9.3" +os_version = "9.4" os_arch = "aarch64" -iso_url = "https://repo.almalinux.org/almalinux/9/isos/aarch64/AlmaLinux-9.3-aarch64-dvd.iso" +iso_url = "https://repo.almalinux.org/almalinux/9/isos/aarch64/AlmaLinux-9.4-aarch64-dvd.iso" iso_checksum = "file:https://repo.almalinux.org/almalinux/9/isos/aarch64/CHECKSUM" parallels_guest_os_type = "centos" vbox_guest_os_type = "RedHat_64" diff --git a/os_pkrvars/almalinux/almalinux-9-x86_64.pkrvars.hcl b/os_pkrvars/almalinux/almalinux-9-x86_64.pkrvars.hcl index 7a6a8456b..ac64fbf20 100644 --- a/os_pkrvars/almalinux/almalinux-9-x86_64.pkrvars.hcl +++ b/os_pkrvars/almalinux/almalinux-9-x86_64.pkrvars.hcl @@ -1,7 +1,7 @@ os_name = "almalinux" -os_version = "9.3" +os_version = "9.4" os_arch = "x86_64" -iso_url = "https://repo.almalinux.org/almalinux/9/isos/x86_64/AlmaLinux-9.3-x86_64-dvd.iso" +iso_url = "https://repo.almalinux.org/almalinux/9/isos/x86_64/AlmaLinux-9.4-x86_64-dvd.iso" iso_checksum = "file:https://repo.almalinux.org/almalinux/9/isos/x86_64/CHECKSUM" parallels_guest_os_type = "centos" vbox_guest_os_type = "RedHat_64" diff --git a/os_pkrvars/centos/centos-7-aarch64.pkrvars.hcl b/os_pkrvars/centos/centos-7-aarch64.pkrvars.hcl deleted file mode 100644 index 1d5b199f2..000000000 --- a/os_pkrvars/centos/centos-7-aarch64.pkrvars.hcl +++ /dev/null @@ -1,9 +0,0 @@ -os_name = "centos" -os_version = "7.9" -os_arch = "aarch64" -iso_url = "https://quantum-mirror.hu/mirrors/pub/centos-altarch/7.9.2009/isos/aarch64/CentOS-7-aarch64-Minimal-2009.iso" -iso_checksum = "file:https://quantum-mirror.hu/mirrors/pub/centos-altarch/7.9.2009/isos/aarch64/sha256sum.txt" -parallels_guest_os_type = "centos" -vbox_guest_os_type = "RedHat_64" -vmware_guest_os_type = "arm-other-64" -boot_command = ["<wait><up>e<wait><down><down><end><wait> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/rhel/7ks.cfg <leftCtrlOn>x<leftCtrlOff>"] diff --git a/os_pkrvars/centos/centos-7-x86_64.pkrvars.hcl b/os_pkrvars/centos/centos-7-x86_64.pkrvars.hcl deleted file mode 100644 index b78910cf8..000000000 --- a/os_pkrvars/centos/centos-7-x86_64.pkrvars.hcl +++ /dev/null @@ -1,9 +0,0 @@ -os_name = "centos" -os_version = "7.9" -os_arch = "x86_64" -iso_url = "http://mirrors.kernel.org/centos/7.9.2009/isos/x86_64/CentOS-7-x86_64-Minimal-2009.iso" -iso_checksum = "file:https://mirrors.edge.kernel.org/centos/7.9.2009/isos/x86_64/sha256sum.txt" -parallels_guest_os_type = "centos" -vbox_guest_os_type = "RedHat_64" -vmware_guest_os_type = "centos-64" -boot_command = ["<wait><up><wait><tab> inst.text inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/rhel/7ks.cfg<enter><wait>"] diff --git a/os_pkrvars/centos/centos-stream-8-aarch64.pkrvars.hcl b/os_pkrvars/centos/centos-stream-8-aarch64.pkrvars.hcl deleted file mode 100644 index 08d946e6b..000000000 --- a/os_pkrvars/centos/centos-stream-8-aarch64.pkrvars.hcl +++ /dev/null @@ -1,9 +0,0 @@ -os_name = "centos-stream" -os_version = "8" -os_arch = "aarch64" -iso_url = "https://mirrors.edge.kernel.org/centos/8-stream/isos/aarch64/CentOS-Stream-8-aarch64-latest-boot.iso" -iso_checksum = "file:https://mirrors.edge.kernel.org/centos/8-stream/isos/aarch64/CHECKSUM" -parallels_guest_os_type = "centos" -vbox_guest_os_type = "RedHat_64" -vmware_guest_os_type = "arm-other-64" -boot_command = ["<wait><up>e<wait><down><down><end><wait> inst.text inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/rhel/8ks.cfg <leftCtrlOn>x<leftCtrlOff>"] diff --git a/os_pkrvars/centos/centos-stream-8-x86_64.pkrvars.hcl b/os_pkrvars/centos/centos-stream-8-x86_64.pkrvars.hcl deleted file mode 100644 index c2bfab5e4..000000000 --- a/os_pkrvars/centos/centos-stream-8-x86_64.pkrvars.hcl +++ /dev/null @@ -1,9 +0,0 @@ -os_name = "centos-stream" -os_version = "8" -os_arch = "x86_64" -iso_url = "http://mirrors.kernel.org/centos/8-stream/isos/x86_64/CentOS-Stream-8-x86_64-latest-dvd1.iso" -iso_checksum = "file:https://mirrors.edge.kernel.org/centos/8-stream/isos/x86_64/CHECKSUM" -parallels_guest_os_type = "centos" -vbox_guest_os_type = "RedHat_64" -vmware_guest_os_type = "centos-64" -boot_command = ["<wait><up><wait><tab> inst.text inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/rhel/8ks.cfg<enter><wait>"] diff --git a/os_pkrvars/oraclelinux/oraclelinux-7-aarch64.pkrvars.hcl b/os_pkrvars/oraclelinux/oraclelinux-7-aarch64.pkrvars.hcl deleted file mode 100644 index 8fbfc33f8..000000000 --- a/os_pkrvars/oraclelinux/oraclelinux-7-aarch64.pkrvars.hcl +++ /dev/null @@ -1,9 +0,0 @@ -os_name = "oraclelinux" -os_version = "7.9" -os_arch = "aarch64" -iso_url = "https://yum.oracle.com/ISOS/OracleLinux/OL7/u9/aarch64/OracleLinux-R7-U9-Server-aarch64-dvd.iso" -iso_checksum = "fd2c1b1e26858576534f6e6c4cf000a15cd81bec010dad5e827b204a14a1750e" -parallels_guest_os_type = "centos" -vbox_guest_os_type = "RedHat_64" -vmware_guest_os_type = "arm-other-64" -boot_command = ["<wait><up>e<wait><down><down><end><wait> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/rhel/7ks.cfg <leftCtrlOn>x<leftCtrlOff>"] diff --git a/os_pkrvars/oraclelinux/oraclelinux-7-x86_64.pkrvars.hcl b/os_pkrvars/oraclelinux/oraclelinux-7-x86_64.pkrvars.hcl deleted file mode 100644 index 6bd8977ad..000000000 --- a/os_pkrvars/oraclelinux/oraclelinux-7-x86_64.pkrvars.hcl +++ /dev/null @@ -1,9 +0,0 @@ -os_name = "oraclelinux" -os_version = "7.9" -os_arch = "x86_64" -iso_url = "http://mirrors.dotsrc.org/oracle-linux/OL7/u9/x86_64/OracleLinux-R7-U9-Server-x86_64-dvd.iso" -iso_checksum = "dc2782bfd92b4c060cf8006fbc6e18036c27f599eebf3584a1a2ac54f008bf2f" -parallels_guest_os_type = "centos" -vbox_guest_os_type = "RedHat_64" -vmware_guest_os_type = "centos-64" -boot_command = ["<wait><up><wait><tab> inst.text inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/rhel/7ks.cfg<enter><wait>"] diff --git a/os_pkrvars/oraclelinux/oraclelinux-9-aarch64.pkrvars.hcl b/os_pkrvars/oraclelinux/oraclelinux-9-aarch64.pkrvars.hcl index 7d64a0a65..0325a8108 100644 --- a/os_pkrvars/oraclelinux/oraclelinux-9-aarch64.pkrvars.hcl +++ b/os_pkrvars/oraclelinux/oraclelinux-9-aarch64.pkrvars.hcl @@ -1,8 +1,8 @@ os_name = "oraclelinux" -os_version = "9.3" +os_version = "9.4" os_arch = "aarch64" -iso_url = "https://yum.oracle.com/ISOS/OracleLinux/OL9/u3/aarch64/OracleLinux-R9-U3-aarch64-dvd.iso" -iso_checksum = "7cc50a48f361cb1100a28621ba455edaac3a38182f6dd3fe67588b3eeaf18dc3" +iso_url = "https://yum.oracle.com/ISOS/OracleLinux/OL9/u4/aarch64/OracleLinux-R9-U4-aarch64-dvd.iso" +iso_checksum = "file:https://linux.oracle.com/security/gpg/checksum/OracleLinux-R9-U4-Server-aarch64.checksum" parallels_guest_os_type = "centos" vbox_guest_os_type = "RedHat_64" vmware_guest_os_type = "arm-rhel9-64" diff --git a/os_pkrvars/oraclelinux/oraclelinux-9-x86_64.pkrvars.hcl b/os_pkrvars/oraclelinux/oraclelinux-9-x86_64.pkrvars.hcl index 0aa28f6e1..221a8564d 100644 --- a/os_pkrvars/oraclelinux/oraclelinux-9-x86_64.pkrvars.hcl +++ b/os_pkrvars/oraclelinux/oraclelinux-9-x86_64.pkrvars.hcl @@ -1,8 +1,8 @@ os_name = "oraclelinux" -os_version = "9.3" +os_version = "9.4" os_arch = "x86_64" -iso_url = "https://yum.oracle.com/ISOS/OracleLinux/OL9/u3/x86_64/OracleLinux-R9-U3-x86_64-dvd.iso" -iso_checksum = "242f0ecc37417995137507862cb170215c0b5bd512c47badd16b623686ef39e2" +iso_url = "https://yum.oracle.com/ISOS/OracleLinux/OL9/u4/x86_64/OracleLinux-R9-U4-x86_64-dvd.iso" +iso_checksum = "file:https://linux.oracle.com/security/gpg/checksum/OracleLinux-R9-U4-Server-x86_64.checksum" parallels_guest_os_type = "centos" vbox_guest_os_type = "RedHat_64" vmware_guest_os_type = "centos-64" diff --git a/os_pkrvars/rhel/rhel-7-aarch64.pkrvars.hcl b/os_pkrvars/rhel/rhel-7-aarch64.pkrvars.hcl deleted file mode 100644 index 940473f9a..000000000 --- a/os_pkrvars/rhel/rhel-7-aarch64.pkrvars.hcl +++ /dev/null @@ -1,9 +0,0 @@ -os_name = "rhel" -os_version = "7.9" -os_arch = "aarch64" -iso_url = "https://www.redhat.com/en/technologies/linux-platforms/enterprise-linux" -iso_checksum = "1b8004961150b60f6c5ec3f25139d3217eee55707cf9fa19e826919fc58e328b" -parallels_guest_os_type = "rhel" -vbox_guest_os_type = "RedHat_64" -vmware_guest_os_type = "arm-other-64" -boot_command = ["<wait><up><wait><tab> inst.text inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/rhel/7ks.cfg<enter><wait>"] diff --git a/os_pkrvars/rhel/rhel-7-x86_64.pkrvars.hcl b/os_pkrvars/rhel/rhel-7-x86_64.pkrvars.hcl deleted file mode 100644 index d3f3d5372..000000000 --- a/os_pkrvars/rhel/rhel-7-x86_64.pkrvars.hcl +++ /dev/null @@ -1,9 +0,0 @@ -os_name = "rhel" -os_version = "7.9" -os_arch = "x86_64" -iso_url = "https://www.redhat.com/en/technologies/linux-platforms/enterprise-linux" -iso_checksum = "1b8004961150b60f6c5ec3f25139d3217eee55707cf9fa19e826919fc58e328b" -parallels_guest_os_type = "rhel" -vbox_guest_os_type = "RedHat_64" -vmware_guest_os_type = "centos-64" -boot_command = ["<wait><up><wait><tab> inst.text inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/rhel/7ks.cfg<enter><wait>"] diff --git a/os_pkrvars/rhel/rhel-9-aarch64.pkrvars.hcl b/os_pkrvars/rhel/rhel-9-aarch64.pkrvars.hcl index 42d86f15d..cde337d59 100644 --- a/os_pkrvars/rhel/rhel-9-aarch64.pkrvars.hcl +++ b/os_pkrvars/rhel/rhel-9-aarch64.pkrvars.hcl @@ -1,5 +1,5 @@ os_name = "rhel" -os_version = "9.3" +os_version = "9.4" os_arch = "aarch64" iso_url = "https://www.redhat.com/en/technologies/linux-platforms/enterprise-linux" iso_checksum = "none" diff --git a/os_pkrvars/rhel/rhel-9-x86_64.pkrvars.hcl b/os_pkrvars/rhel/rhel-9-x86_64.pkrvars.hcl index aac6e2b5d..25909fb92 100644 --- a/os_pkrvars/rhel/rhel-9-x86_64.pkrvars.hcl +++ b/os_pkrvars/rhel/rhel-9-x86_64.pkrvars.hcl @@ -1,5 +1,5 @@ os_name = "rhel" -os_version = "9.3" +os_version = "9.4" os_arch = "x86_64" iso_url = "https://www.redhat.com/en/technologies/linux-platforms/enterprise-linux" iso_checksum = "none" diff --git a/os_pkrvars/rockylinux/rockylinux-9-aarch64.pkrvars.hcl b/os_pkrvars/rockylinux/rockylinux-9-aarch64.pkrvars.hcl index f3d975df4..838bc2d50 100644 --- a/os_pkrvars/rockylinux/rockylinux-9-aarch64.pkrvars.hcl +++ b/os_pkrvars/rockylinux/rockylinux-9-aarch64.pkrvars.hcl @@ -1,7 +1,7 @@ os_name = "rockylinux" -os_version = "9.3" +os_version = "9.4" os_arch = "aarch64" -iso_url = "https://download.rockylinux.org/pub/rocky/9/isos/aarch64/Rocky-9.3-aarch64-minimal.iso" +iso_url = "https://download.rockylinux.org/pub/rocky/9/isos/aarch64/Rocky-9.4-aarch64-minimal.iso" iso_checksum = "file:https://download.rockylinux.org/pub/rocky/9/isos/aarch64/CHECKSUM" parallels_guest_os_type = "centos" vbox_guest_os_type = "RedHat_64" diff --git a/os_pkrvars/rockylinux/rockylinux-9-x86_64.pkrvars.hcl b/os_pkrvars/rockylinux/rockylinux-9-x86_64.pkrvars.hcl index 19438d23a..73aa82e53 100644 --- a/os_pkrvars/rockylinux/rockylinux-9-x86_64.pkrvars.hcl +++ b/os_pkrvars/rockylinux/rockylinux-9-x86_64.pkrvars.hcl @@ -1,7 +1,7 @@ os_name = "rockylinux" -os_version = "9.3" +os_version = "9.4" os_arch = "x86_64" -iso_url = "https://download.rockylinux.org/pub/rocky/9/isos/x86_64/Rocky-9.3-x86_64-dvd.iso" +iso_url = "https://download.rockylinux.org/pub/rocky/9/isos/x86_64/Rocky-9.4-x86_64-dvd.iso" iso_checksum = "file:https://download.rockylinux.org/pub/rocky/9/isos/x86_64/CHECKSUM" parallels_guest_os_type = "centos" vbox_guest_os_type = "RedHat_64" diff --git a/packer_templates/http/ubuntu/user-data b/packer_templates/http/ubuntu/user-data index 5e619f9a5..f1b517f1b 100644 --- a/packer_templates/http/ubuntu/user-data +++ b/packer_templates/http/ubuntu/user-data @@ -19,4 +19,11 @@ autoinstall: fi - echo 'vagrant ALL=(ALL) NOPASSWD:ALL' > /target/etc/sudoers.d/vagrant # Enable hyper-v daemons only if using hyper-v virtualization - - if [ $(virt-what) == "hyperv" ]; then apt-get update && apt-get install -y hyperv-daemons linux-tools-$(uname -r) linux-cloud-tools-$(uname -r) linux-cloud-tools-common cifs-utils && systemctl enable hypervvssd && systemctl enable hypervkvpd && systemctl start hypervvssd && systemctl start hypervkvpd; fi + - | + if [ $(virt-what) == "hyperv" ]; then + apt-get update && apt-get install -y hyperv-daemons linux-tools-$(uname -r) linux-cloud-tools-$(uname -r) linux-cloud-tools-common cifs-utils + systemctl enable hypervvssd + systemctl enable hypervkvpd + systemctl start hypervvssd + systemctl start hypervkvpd + fi diff --git a/packer_templates/pkr-builder.pkr.hcl b/packer_templates/pkr-builder.pkr.hcl index 6c62ae330..519fb889d 100644 --- a/packer_templates/pkr-builder.pkr.hcl +++ b/packer_templates/pkr-builder.pkr.hcl @@ -123,10 +123,7 @@ locals { "${path.root}/scripts/fedora/cleanup_dnf.sh", "${path.root}/scripts/_common/minimize.sh" ] : ( - "${var.os_name}-${var.os_version}" == "amazonlinux-2" || - "${var.os_name}-${substr(var.os_version, 0, 1)}" == "centos-7" || - "${var.os_name}-${substr(var.os_version, 0, 1)}" == "oraclelinux-7" || - "${var.os_name}-${substr(var.os_version, 0, 1)}" == "rhel-7" ? [ + "${var.os_name}-${var.os_version}" == "amazonlinux-2" ? [ "${path.root}/scripts/rhel/update_yum.sh", "${path.root}/scripts/_common/motd.sh", "${path.root}/scripts/_common/sshd.sh", diff --git a/packer_templates/pkr-sources.pkr.hcl b/packer_templates/pkr-sources.pkr.hcl index 58e48758a..4c31488e3 100644 --- a/packer_templates/pkr-sources.pkr.hcl +++ b/packer_templates/pkr-sources.pkr.hcl @@ -35,7 +35,11 @@ locals { ) : var.parallels_prlctl # qemu - qemu_binary = var.qemu_binary == null ? "qemu-system-${var.os_arch}" : var.qemu_binary + qemu_binary = var.qemu_binary == null ? "qemu-system-${var.os_arch}" : var.qemu_binary + qemu_display = var.qemu_display == null ? "none" : var.qemu_display + qemu_use_default_display = var.qemu_use_default_display == null ? ( + var.os_arch == "aarch64" ? true : false + ) : var.qemu_use_default_display qemu_machine_type = var.qemu_machine_type == null ? ( var.os_arch == "aarch64" ? "virt" : "q35" ) : var.qemu_machine_type @@ -47,6 +51,8 @@ locals { ] : ( var.os_arch == "aarch64" ? [ ["-boot", "strict=off"] + # ["-cpu", "host"], + # ["-monitor", "stdio"] ] : null ) ) : var.qemuargs @@ -209,17 +215,18 @@ source "parallels-iso" "vm" { } source "qemu" "vm" { # QEMU specific options - accelerator = var.qemu_accelerator - display = var.headless ? "none" : var.qemu_display - disk_image = var.qemu_disk_image - efi_boot = var.qemu_efi_boot - efi_firmware_code = var.qemu_efi_firmware_code - efi_firmware_vars = var.qemu_efi_firmware_vars - efi_drop_efivars = var.qemu_efi_drop_efivars - format = var.qemu_format - machine_type = local.qemu_machine_type - qemu_binary = local.qemu_binary - qemuargs = local.qemuargs + accelerator = var.qemu_accelerator + display = local.qemu_display + use_default_display = local.qemu_use_default_display + disk_image = var.qemu_disk_image + efi_boot = var.qemu_efi_boot + efi_firmware_code = var.qemu_efi_firmware_code + efi_firmware_vars = var.qemu_efi_firmware_vars + efi_drop_efivars = var.qemu_efi_drop_efivars + format = var.qemu_format + machine_type = local.qemu_machine_type + qemu_binary = local.qemu_binary + qemuargs = local.qemuargs # Source block common options boot_command = var.boot_command boot_wait = var.qemu_boot_wait == null ? local.default_boot_wait : var.qemu_boot_wait diff --git a/packer_templates/pkr-variables.pkr.hcl b/packer_templates/pkr-variables.pkr.hcl index 5b0c027fd..5a6354105 100644 --- a/packer_templates/pkr-variables.pkr.hcl +++ b/packer_templates/pkr-variables.pkr.hcl @@ -142,8 +142,14 @@ variable "qemu_boot_wait" { default = null } variable "qemu_display" { - type = string - default = "none" + type = string + default = null + description = "What QEMU -display option to use. Defaults to gtk, use none to not pass the -display option allowing QEMU to choose the default" +} +variable "qemu_use_default_display" { + type = bool + default = null + description = "If true, do not pass a -display option to qemu, allowing it to choose the default" } variable "qemu_disk_image" { type = bool @@ -171,8 +177,12 @@ variable "qemu_efi_drop_efivars" { description = "Drop EFI vars" } variable "qemu_format" { - type = string - default = "qcow2" + type = string + default = "qcow2" + validation { + condition = var.qemu_format == "qcow2" || var.qemu_format == "raw" + error_message = "Disk format, takes qcow2 or raw." + } description = "Disk format, takes qcow2 or raw" } variable "qemu_machine_type" { From b72e88533d37280babd6678fe39d6ad394b99eb9 Mon Sep 17 00:00:00 2001 From: Shawn Kelly O'Shea <shawn@eth0.net> Date: Thu, 30 May 2024 13:07:09 -0400 Subject: [PATCH 1554/1622] bump AlmaLinux 8 version to 8.10 (#1569) --- os_pkrvars/almalinux/almalinux-8-aarch64.pkrvars.hcl | 4 ++-- os_pkrvars/almalinux/almalinux-8-x86_64.pkrvars.hcl | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/os_pkrvars/almalinux/almalinux-8-aarch64.pkrvars.hcl b/os_pkrvars/almalinux/almalinux-8-aarch64.pkrvars.hcl index 56b364127..275c9f6b7 100644 --- a/os_pkrvars/almalinux/almalinux-8-aarch64.pkrvars.hcl +++ b/os_pkrvars/almalinux/almalinux-8-aarch64.pkrvars.hcl @@ -1,7 +1,7 @@ os_name = "almalinux" -os_version = "8.9" +os_version = "8.10" os_arch = "aarch64" -iso_url = "https://repo.almalinux.org/almalinux/8/isos/aarch64/AlmaLinux-8.9-aarch64-minimal.iso" +iso_url = "https://repo.almalinux.org/almalinux/8/isos/aarch64/AlmaLinux-8.10-aarch64-minimal.iso" iso_checksum = "file:https://repo.almalinux.org/almalinux/8/isos/aarch64/CHECKSUM" parallels_guest_os_type = "centos" vbox_guest_os_type = "RedHat_64" diff --git a/os_pkrvars/almalinux/almalinux-8-x86_64.pkrvars.hcl b/os_pkrvars/almalinux/almalinux-8-x86_64.pkrvars.hcl index 494183e16..31fbb83af 100644 --- a/os_pkrvars/almalinux/almalinux-8-x86_64.pkrvars.hcl +++ b/os_pkrvars/almalinux/almalinux-8-x86_64.pkrvars.hcl @@ -1,7 +1,7 @@ os_name = "almalinux" -os_version = "8.9" +os_version = "8.10" os_arch = "x86_64" -iso_url = "https://repo.almalinux.org/almalinux/8/isos/x86_64/AlmaLinux-8.9-x86_64-minimal.iso" +iso_url = "https://repo.almalinux.org/almalinux/8/isos/x86_64/AlmaLinux-8.10-x86_64-minimal.iso" iso_checksum = "file:https://repo.almalinux.org/almalinux/8/isos/x86_64/CHECKSUM" parallels_guest_os_type = "centos" vbox_guest_os_type = "RedHat_64" From 6fe9fa20d1f37e916a7babdee87c89ba38ce54a4 Mon Sep 17 00:00:00 2001 From: Corey Hemminger <hemminger@hotmail.com> Date: Wed, 5 Jun 2024 09:30:40 -0500 Subject: [PATCH 1555/1622] update OS versions (#1570) * update OS versions --------- Signed-off-by: Corey Hemminger <hemminger@hotmail.com> --- CHANGELOG.md | 6 ++++++ os_pkrvars/freebsd/freebsd-14-aarch64.pkrvars.hcl | 6 +++--- os_pkrvars/freebsd/freebsd-14-x86_64.pkrvars.hcl | 6 +++--- os_pkrvars/oraclelinux/oraclelinux-8-aarch64.pkrvars.hcl | 6 +++--- os_pkrvars/oraclelinux/oraclelinux-8-x86_64.pkrvars.hcl | 6 +++--- os_pkrvars/rhel/rhel-8-aarch64.pkrvars.hcl | 2 +- os_pkrvars/rhel/rhel-8-x86_64.pkrvars.hcl | 2 +- os_pkrvars/rockylinux/rockylinux-8-aarch64.pkrvars.hcl | 4 ++-- os_pkrvars/rockylinux/rockylinux-8-x86_64.pkrvars.hcl | 4 ++-- 9 files changed, 24 insertions(+), 18 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b8a2f9fe8..3fd6532b1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -51,6 +51,12 @@ Markdown table generated at <https://www.tablesgenerator.com/markdown_tables#> ## [unreleased] (2024-05-23) +- Update almalinux 8 to 8.10 +- Update rockylinux 8 to 8.10 +- Update oraclelinux 8 to 8.10 +- Update rhel 8 to 8.10 +- Update freebsd 14 to 14.1 + ## [v4.1.2] (2024-05-23) - Fix for hyper-v build option diff --git a/os_pkrvars/freebsd/freebsd-14-aarch64.pkrvars.hcl b/os_pkrvars/freebsd/freebsd-14-aarch64.pkrvars.hcl index f2dfcfdb6..d09fcb69a 100644 --- a/os_pkrvars/freebsd/freebsd-14-aarch64.pkrvars.hcl +++ b/os_pkrvars/freebsd/freebsd-14-aarch64.pkrvars.hcl @@ -1,8 +1,8 @@ os_name = "freebsd" -os_version = "14.0" +os_version = "14.1" os_arch = "aarch64" -iso_url = "https://download.freebsd.org/releases/arm64/aarch64/ISO-IMAGES/14.0/FreeBSD-14.0-RELEASE-arm64-aarch64-disc1.iso" -iso_checksum = "file:https://download.freebsd.org/releases/arm64/aarch64/ISO-IMAGES/14.0/CHECKSUM.SHA256-FreeBSD-14.0-RELEASE-arm64-aarch64" +iso_url = "https://download.freebsd.org/releases/arm64/aarch64/ISO-IMAGES/14.1/FreeBSD-14.1-RELEASE-arm64-aarch64-disc1.iso" +iso_checksum = "file:https://download.freebsd.org/releases/arm64/aarch64/ISO-IMAGES/14.1/CHECKSUM.SHA256-FreeBSD-14.1-RELEASE-arm64-aarch64" parallels_guest_os_type = "freebsd" vbox_guest_os_type = "FreeBSD_64" vmware_guest_os_type = "arm-freebsd14-64" diff --git a/os_pkrvars/freebsd/freebsd-14-x86_64.pkrvars.hcl b/os_pkrvars/freebsd/freebsd-14-x86_64.pkrvars.hcl index 3e2c2138e..d01d5138b 100644 --- a/os_pkrvars/freebsd/freebsd-14-x86_64.pkrvars.hcl +++ b/os_pkrvars/freebsd/freebsd-14-x86_64.pkrvars.hcl @@ -1,8 +1,8 @@ os_name = "freebsd" -os_version = "14.0" +os_version = "14.1" os_arch = "x86_64" -iso_url = "https://download.freebsd.org/releases/amd64/amd64/ISO-IMAGES/14.0/FreeBSD-14.0-RELEASE-amd64-disc1.iso" -iso_checksum = "file:https://download.freebsd.org/releases/amd64/amd64/ISO-IMAGES/14.0/CHECKSUM.SHA256-FreeBSD-14.0-RELEASE-amd64" +iso_url = "https://download.freebsd.org/releases/amd64/amd64/ISO-IMAGES/14.1/FreeBSD-14.1-RELEASE-amd64-disc1.iso" +iso_checksum = "file:https://download.freebsd.org/releases/amd64/amd64/ISO-IMAGES/14.1/CHECKSUM.SHA256-FreeBSD-14.1-RELEASE-amd64" parallels_guest_os_type = "freebsd" vbox_guest_os_type = "FreeBSD_64" vmware_guest_os_type = "freebsd-64" diff --git a/os_pkrvars/oraclelinux/oraclelinux-8-aarch64.pkrvars.hcl b/os_pkrvars/oraclelinux/oraclelinux-8-aarch64.pkrvars.hcl index c04cf1f0e..5ca97bd82 100644 --- a/os_pkrvars/oraclelinux/oraclelinux-8-aarch64.pkrvars.hcl +++ b/os_pkrvars/oraclelinux/oraclelinux-8-aarch64.pkrvars.hcl @@ -1,8 +1,8 @@ os_name = "oraclelinux" -os_version = "8.9" +os_version = "8.10" os_arch = "aarch64" -iso_url = "https://yum.oracle.com/ISOS/OracleLinux/OL8/u9/aarch64/OracleLinux-R8-U9-aarch64-dvd.iso" -iso_checksum = "c732ec9bb4a85349c0f1ca82020a8514341247506d114b8b79ec32bf99d59ea0" +iso_url = "https://yum.oracle.com/ISOS/OracleLinux/OL8/u10/aarch64/OracleLinux-R8-U10-aarch64-dvd.iso" +iso_checksum = "file:https://linux.oracle.com/security/gpg/checksum/OracleLinux-R8-U10-Server-aarch64.checksum" parallels_guest_os_type = "centos" vbox_guest_os_type = "RedHat_64" vmware_guest_os_type = "arm-other-64" diff --git a/os_pkrvars/oraclelinux/oraclelinux-8-x86_64.pkrvars.hcl b/os_pkrvars/oraclelinux/oraclelinux-8-x86_64.pkrvars.hcl index 499533fd4..7fa3b597f 100644 --- a/os_pkrvars/oraclelinux/oraclelinux-8-x86_64.pkrvars.hcl +++ b/os_pkrvars/oraclelinux/oraclelinux-8-x86_64.pkrvars.hcl @@ -1,8 +1,8 @@ os_name = "oraclelinux" -os_version = "8.9" +os_version = "8.10" os_arch = "x86_64" -iso_url = "https://yum.oracle.com/ISOS/OracleLinux/OL8/u9/x86_64/OracleLinux-R8-U9-x86_64-dvd.iso" -iso_checksum = "ce90b598be2e9889fa880128fc53b3e9c1f95d9e31859759e5e180602312c181" +iso_url = "https://yum.oracle.com/ISOS/OracleLinux/OL8/u10/x86_64/OracleLinux-R8-U10-x86_64-dvd.iso" +iso_checksum = "file:https://linux.oracle.com/security/gpg/checksum/OracleLinux-R8-U10-Server-x86_64.checksum" parallels_guest_os_type = "centos" vbox_guest_os_type = "RedHat_64" vmware_guest_os_type = "centos-64" diff --git a/os_pkrvars/rhel/rhel-8-aarch64.pkrvars.hcl b/os_pkrvars/rhel/rhel-8-aarch64.pkrvars.hcl index e5950dceb..273648ca3 100644 --- a/os_pkrvars/rhel/rhel-8-aarch64.pkrvars.hcl +++ b/os_pkrvars/rhel/rhel-8-aarch64.pkrvars.hcl @@ -1,5 +1,5 @@ os_name = "rhel" -os_version = "8.9" +os_version = "8.10" os_arch = "aarch64" iso_url = "https://www.redhat.com/en/technologies/linux-platforms/enterprise-linux" iso_checksum = "none" diff --git a/os_pkrvars/rhel/rhel-8-x86_64.pkrvars.hcl b/os_pkrvars/rhel/rhel-8-x86_64.pkrvars.hcl index 0d939441b..061431f40 100644 --- a/os_pkrvars/rhel/rhel-8-x86_64.pkrvars.hcl +++ b/os_pkrvars/rhel/rhel-8-x86_64.pkrvars.hcl @@ -1,5 +1,5 @@ os_name = "rhel" -os_version = "8.9" +os_version = "8.10" os_arch = "x86_64" iso_url = "https://www.redhat.com/en/technologies/linux-platforms/enterprise-linux" iso_checksum = "none" diff --git a/os_pkrvars/rockylinux/rockylinux-8-aarch64.pkrvars.hcl b/os_pkrvars/rockylinux/rockylinux-8-aarch64.pkrvars.hcl index 8f769dde5..157d97c79 100644 --- a/os_pkrvars/rockylinux/rockylinux-8-aarch64.pkrvars.hcl +++ b/os_pkrvars/rockylinux/rockylinux-8-aarch64.pkrvars.hcl @@ -1,7 +1,7 @@ os_name = "rockylinux" -os_version = "8.9" +os_version = "8.10" os_arch = "aarch64" -iso_url = "https://download.rockylinux.org/pub/rocky/8/isos/aarch64/Rocky-8.9-aarch64-minimal.iso" +iso_url = "https://download.rockylinux.org/pub/rocky/8/isos/aarch64/Rocky-8.10-aarch64-minimal.iso" iso_checksum = "file:https://download.rockylinux.org/pub/rocky/8/isos/aarch64/CHECKSUM" parallels_guest_os_type = "centos" vbox_guest_os_type = "RedHat_64" diff --git a/os_pkrvars/rockylinux/rockylinux-8-x86_64.pkrvars.hcl b/os_pkrvars/rockylinux/rockylinux-8-x86_64.pkrvars.hcl index e64db8fcd..19ae2b407 100644 --- a/os_pkrvars/rockylinux/rockylinux-8-x86_64.pkrvars.hcl +++ b/os_pkrvars/rockylinux/rockylinux-8-x86_64.pkrvars.hcl @@ -1,7 +1,7 @@ os_name = "rockylinux" -os_version = "8.9" +os_version = "8.10" os_arch = "x86_64" -iso_url = "https://download.rockylinux.org/pub/rocky/8/isos/x86_64/Rocky-8.9-x86_64-minimal.iso" +iso_url = "https://download.rockylinux.org/pub/rocky/8/isos/x86_64/Rocky-8.10-x86_64-minimal.iso" iso_checksum = "file:https://download.rockylinux.org/pub/rocky/8/isos/x86_64/CHECKSUM" parallels_guest_os_type = "centos" vbox_guest_os_type = "RedHat_64" From 7baa403ae131f2a0f8d3f31c1ae8f7d9adcaa123 Mon Sep 17 00:00:00 2001 From: ls-2018 <m202140037@xs.ustb.edu.cn> Date: Tue, 23 Jul 2024 02:15:50 +0800 Subject: [PATCH 1556/1622] :bug: fix shell exec err (#1572) Signed-off-by: acejilam <acejilam@gmail.com> --- packer_templates/http/ubuntu/user-data | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packer_templates/http/ubuntu/user-data b/packer_templates/http/ubuntu/user-data index f1b517f1b..c8d22760d 100644 --- a/packer_templates/http/ubuntu/user-data +++ b/packer_templates/http/ubuntu/user-data @@ -15,7 +15,7 @@ autoinstall: late-commands: - | if [ -f /target/etc/netplan/00-installer-config.yaml ]; then - 'sed -i "s/dhcp4: true/&\n dhcp-identifier: mac/" /target/etc/netplan/00-installer-config.yaml' + sed -i "s/dhcp4: true/&\n dhcp-identifier: mac/" /target/etc/netplan/00-installer-config.yaml fi - echo 'vagrant ALL=(ALL) NOPASSWD:ALL' > /target/etc/sudoers.d/vagrant # Enable hyper-v daemons only if using hyper-v virtualization From 4496079764dcc3719a49753f766a0b2c02e9bc94 Mon Sep 17 00:00:00 2001 From: Anton Alekseev <anton@alekseev.cc> Date: Tue, 23 Jul 2024 01:19:10 +0700 Subject: [PATCH 1557/1622] Fix a bug in freebsd-14.x due to changes in bsdinstall (#1573) Since FreeBSD 14.0, bsdinstall creates ZFS dataset for `home` rather than `/usr/home`, see https://github.com/freebsd/freebsd-src/commit/3bb92304b4fe79babd19ba0d9c74d29af9117a22. This way, the previous workaround was broken, preventing the normal provisioning of the default Vagrant public keys. Signed-off-by: Anton Alekseev <anton@alekseev.cc> Co-authored-by: Corey Hemminger <hemminger@hotmail.com> --- packer_templates/http/freebsd/installerconfig | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/packer_templates/http/freebsd/installerconfig b/packer_templates/http/freebsd/installerconfig index 02045660c..726c8130d 100644 --- a/packer_templates/http/freebsd/installerconfig +++ b/packer_templates/http/freebsd/installerconfig @@ -44,12 +44,22 @@ EOT # zfs doesn't use an fstab, but some rc scripts expect one touch /etc/fstab +# Since FreeBSD 14.0 bsdinstall again creates dataset for /home rather then /usr/home +# Thus on versions prior to 14.0 we have to create /home -> /usr/home symlink, +# otherwise just use /home as the base for vagrant's home +version=$(freebsd-version -u) +if [ "${version%%.*}" -lt "14" ]; then + home_base="/usr/home" + ln -s $home_base /home +else + home_base="/home" +fi + # Set up user accounts -echo "vagrant" | pw -V /etc useradd vagrant -h 0 -s /bin/sh -G wheel -d /usr/home/vagrant -c "Vagrant User" +echo "vagrant" | pw -V /etc useradd vagrant -h 0 -s /bin/sh -G wheel -d ${home_base}/vagrant -c "Vagrant User" echo "vagrant" | pw -V /etc usermod root -mkdir -p /usr/home/vagrant -chown 1001:1001 /usr/home/vagrant -ln -s /usr/home /home +mkdir -p ${home_base}/vagrant +chown 1001:1001 ${home_base}/vagrant reboot From 1fb7b9e796cc384fd6baaeea5072261f2e3f330d Mon Sep 17 00:00:00 2001 From: fgierlinger <2966031+fgierlinger@users.noreply.github.com> Date: Mon, 22 Jul 2024 20:27:02 +0200 Subject: [PATCH 1558/1622] Fix arm64 builds for debian 11 (#1571) * fix open-vm-tools installation in debian11 Signed-off-by: fgierlinger <2966031+fgierlinger@users.noreply.github.com> * prevent "unknown ioctl 1976" log spam Signed-off-by: fgierlinger <2966031+fgierlinger@users.noreply.github.com> --------- Signed-off-by: fgierlinger <2966031+fgierlinger@users.noreply.github.com> Co-authored-by: Corey Hemminger <hemminger@hotmail.com> --- .../scripts/_common/vmware_debian_ubuntu.sh | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/packer_templates/scripts/_common/vmware_debian_ubuntu.sh b/packer_templates/scripts/_common/vmware_debian_ubuntu.sh index 1409a8bd6..981bb6894 100644 --- a/packer_templates/scripts/_common/vmware_debian_ubuntu.sh +++ b/packer_templates/scripts/_common/vmware_debian_ubuntu.sh @@ -2,7 +2,20 @@ case "$PACKER_BUILDER_TYPE" in vmware-iso|vmware-vmx) + # determine the major Debian version we're runninng + major_version="$(grep VERSION_ID /etc/os-release | awk -F= '{print $2}' | tr -d '"')" + architecture="$(uname -m)" + + # open-vm-tools for amd64 are only available in bullseye-backports repo echo "install open-vm-tools" + if [ "$major_version" -eq 11 ] && [ "$architecture" = "aarch64" ]; then + echo 'deb http://deb.debian.org/debian bullseye-backports main' >> /etc/apt/sources.list + apt-get update + cat > /etc/modprobe.d/blacklist.conf <<EOF +blacklist vsock_loopback +blacklist vmw_vsock_virtio_transport_common +EOF + fi apt-get install -y open-vm-tools; mkdir /mnt/hgfs; systemctl enable open-vm-tools From 9f6671c4d78dfead41c6a5a59377d0da09a8b121 Mon Sep 17 00:00:00 2001 From: Phillip Ross <phillipross@users.noreply.github.com> Date: Tue, 3 Sep 2024 13:58:40 -0400 Subject: [PATCH 1559/1622] Update ubuntu-24.04 to latest ISO urls (24.04 to 24.04.1) (#1577) Signed-off-by: Phillip Ross <phillip.w.g.ross@gmail.com> --- os_pkrvars/ubuntu/ubuntu-24.04-aarch64.pkrvars.hcl | 2 +- os_pkrvars/ubuntu/ubuntu-24.04-x86_64.pkrvars.hcl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/os_pkrvars/ubuntu/ubuntu-24.04-aarch64.pkrvars.hcl b/os_pkrvars/ubuntu/ubuntu-24.04-aarch64.pkrvars.hcl index f3625a163..370ecaf15 100644 --- a/os_pkrvars/ubuntu/ubuntu-24.04-aarch64.pkrvars.hcl +++ b/os_pkrvars/ubuntu/ubuntu-24.04-aarch64.pkrvars.hcl @@ -1,7 +1,7 @@ os_name = "ubuntu" os_version = "24.04" os_arch = "aarch64" -iso_url = "https://cdimage.ubuntu.com/releases/noble/release/ubuntu-24.04-live-server-arm64.iso" +iso_url = "https://cdimage.ubuntu.com/releases/noble/release/ubuntu-24.04.1-live-server-arm64.iso" iso_checksum = "file:https://cdimage.ubuntu.com/releases/noble/release/SHA256SUMS" parallels_guest_os_type = "ubuntu" vbox_guest_os_type = "Ubuntu_64" diff --git a/os_pkrvars/ubuntu/ubuntu-24.04-x86_64.pkrvars.hcl b/os_pkrvars/ubuntu/ubuntu-24.04-x86_64.pkrvars.hcl index ef40daf4f..57924fc2c 100644 --- a/os_pkrvars/ubuntu/ubuntu-24.04-x86_64.pkrvars.hcl +++ b/os_pkrvars/ubuntu/ubuntu-24.04-x86_64.pkrvars.hcl @@ -1,7 +1,7 @@ os_name = "ubuntu" os_version = "24.04" os_arch = "x86_64" -iso_url = "https://releases.ubuntu.com/noble/ubuntu-24.04-live-server-amd64.iso" +iso_url = "https://releases.ubuntu.com/noble/ubuntu-24.04.1-live-server-amd64.iso" iso_checksum = "file:https://releases.ubuntu.com/noble/SHA256SUMS" parallels_guest_os_type = "ubuntu" vbox_guest_os_type = "Ubuntu_64" From 18751d784d0593986813f011250fc8546c297c97 Mon Sep 17 00:00:00 2001 From: Seth Grover <13872653+mmguero@users.noreply.github.com> Date: Sun, 29 Sep 2024 22:42:46 -0600 Subject: [PATCH 1560/1622] update hashicorp/qemu packer plugin to fix QEMU build, supporting efi_drop_efivars variable (#1580) --- packer_templates/pkr-builder.pkr.hcl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packer_templates/pkr-builder.pkr.hcl b/packer_templates/pkr-builder.pkr.hcl index 519fb889d..7e0754510 100644 --- a/packer_templates/pkr-builder.pkr.hcl +++ b/packer_templates/pkr-builder.pkr.hcl @@ -10,7 +10,7 @@ packer { source = "github.com/parallels/parallels" } qemu = { - version = ">= 1.0.8" + version = ">= 1.1.0" source = "github.com/hashicorp/qemu" } vagrant = { From 6d94d75c98c666bca49e366d14cedfaa480f9c8f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20Sj=C3=B6gren?= <konstruktoid@users.noreply.github.com> Date: Mon, 30 Sep 2024 07:06:57 +0200 Subject: [PATCH 1561/1622] update Ubuntu Jammy releases (#1578) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * update Ubuntu releases Signed-off-by: Thomas Sjögren <konstruktoid@users.noreply.github.com> * 23.10 removed Signed-off-by: Thomas Sjögren <konstruktoid@users.noreply.github.com> --------- Signed-off-by: Thomas Sjögren <konstruktoid@users.noreply.github.com> Co-authored-by: Corey Hemminger <hemminger@hotmail.com> --- os_pkrvars/ubuntu/ubuntu-22.04-aarch64.pkrvars.hcl | 2 +- os_pkrvars/ubuntu/ubuntu-22.04-x86_64.pkrvars.hcl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/os_pkrvars/ubuntu/ubuntu-22.04-aarch64.pkrvars.hcl b/os_pkrvars/ubuntu/ubuntu-22.04-aarch64.pkrvars.hcl index e49428e2b..783648773 100644 --- a/os_pkrvars/ubuntu/ubuntu-22.04-aarch64.pkrvars.hcl +++ b/os_pkrvars/ubuntu/ubuntu-22.04-aarch64.pkrvars.hcl @@ -1,7 +1,7 @@ os_name = "ubuntu" os_version = "22.04" os_arch = "aarch64" -iso_url = "https://cdimage.ubuntu.com/releases/jammy/release/ubuntu-22.04.4-live-server-arm64.iso" +iso_url = "https://cdimage.ubuntu.com/releases/jammy/release/ubuntu-22.04.5-live-server-arm64.iso" iso_checksum = "file:https://cdimage.ubuntu.com/releases/jammy/release/SHA256SUMS" parallels_guest_os_type = "ubuntu" vbox_guest_os_type = "Ubuntu_64" diff --git a/os_pkrvars/ubuntu/ubuntu-22.04-x86_64.pkrvars.hcl b/os_pkrvars/ubuntu/ubuntu-22.04-x86_64.pkrvars.hcl index c4f1bb6fe..21077f3bd 100644 --- a/os_pkrvars/ubuntu/ubuntu-22.04-x86_64.pkrvars.hcl +++ b/os_pkrvars/ubuntu/ubuntu-22.04-x86_64.pkrvars.hcl @@ -1,7 +1,7 @@ os_name = "ubuntu" os_version = "22.04" os_arch = "x86_64" -iso_url = "https://releases.ubuntu.com/jammy/ubuntu-22.04.4-live-server-amd64.iso" +iso_url = "https://releases.ubuntu.com/jammy/ubuntu-22.04.5-live-server-amd64.iso" iso_checksum = "file:https://releases.ubuntu.com/jammy/SHA256SUMS" parallels_guest_os_type = "ubuntu" vbox_guest_os_type = "Ubuntu_64" From 88b34f92342f855c50c127203763eaadaedac93a Mon Sep 17 00:00:00 2001 From: Seth Grover <13872653+mmguero@users.noreply.github.com> Date: Sun, 29 Sep 2024 23:08:04 -0600 Subject: [PATCH 1562/1622] Bump Debian from 12.5 to 12.7 (#1579) Signed-off-by: Seth Grover <seth.d.grover@gmail.com> --- os_pkrvars/debian/debian-12-aarch64.pkrvars.hcl | 6 +++--- os_pkrvars/debian/debian-12-x86_64.pkrvars.hcl | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/os_pkrvars/debian/debian-12-aarch64.pkrvars.hcl b/os_pkrvars/debian/debian-12-aarch64.pkrvars.hcl index a1f98a930..40280c58e 100644 --- a/os_pkrvars/debian/debian-12-aarch64.pkrvars.hcl +++ b/os_pkrvars/debian/debian-12-aarch64.pkrvars.hcl @@ -1,8 +1,8 @@ os_name = "debian" -os_version = "12.5" +os_version = "12.7" os_arch = "aarch64" -iso_url = "https://cdimage.debian.org/cdimage/release/12.5.0/arm64/iso-dvd/debian-12.5.0-arm64-DVD-1.iso" -iso_checksum = "file:https://cdimage.debian.org/cdimage/release/12.5.0/arm64/iso-dvd/SHA256SUMS" +iso_url = "https://cdimage.debian.org/cdimage/release/12.7.0/arm64/iso-dvd/debian-12.7.0-arm64-DVD-1.iso" +iso_checksum = "file:https://cdimage.debian.org/cdimage/release/12.7.0/arm64/iso-dvd/SHA256SUMS" parallels_guest_os_type = "debian" vbox_guest_os_type = "Debian_64" vmware_guest_os_type = "arm-debian12-64" diff --git a/os_pkrvars/debian/debian-12-x86_64.pkrvars.hcl b/os_pkrvars/debian/debian-12-x86_64.pkrvars.hcl index 6ad4b3f04..997b38f99 100644 --- a/os_pkrvars/debian/debian-12-x86_64.pkrvars.hcl +++ b/os_pkrvars/debian/debian-12-x86_64.pkrvars.hcl @@ -1,8 +1,8 @@ os_name = "debian" -os_version = "12.5" +os_version = "12.7" os_arch = "x86_64" -iso_url = "https://cdimage.debian.org/cdimage/release/12.5.0/amd64/iso-dvd/debian-12.5.0-amd64-DVD-1.iso" -iso_checksum = "file:https://cdimage.debian.org/cdimage/release/12.5.0/amd64/iso-dvd/SHA256SUMS" +iso_url = "https://cdimage.debian.org/cdimage/release/12.7.0/amd64/iso-dvd/debian-12.7.0-amd64-DVD-1.iso" +iso_checksum = "file:https://cdimage.debian.org/cdimage/release/12.7.0/amd64/iso-dvd/SHA256SUMS" parallels_guest_os_type = "debian" vbox_guest_os_type = "Debian_64" vmware_guest_os_type = "debian-64" From 12fbc3461cdb767927a05bf50e8b5e0a616bb5e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20Sj=C3=B6gren?= <konstruktoid@users.noreply.github.com> Date: Fri, 11 Oct 2024 17:01:00 +0200 Subject: [PATCH 1563/1622] add Ubuntu 24.10 (Oracular Oriole) (#1583) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Thomas Sjögren <konstruktoid@users.noreply.github.com> --- os_pkrvars/ubuntu/ubuntu-24.10-aarch64.pkrvars.hcl | 9 +++++++++ os_pkrvars/ubuntu/ubuntu-24.10-x86_64.pkrvars.hcl | 9 +++++++++ 2 files changed, 18 insertions(+) create mode 100644 os_pkrvars/ubuntu/ubuntu-24.10-aarch64.pkrvars.hcl create mode 100644 os_pkrvars/ubuntu/ubuntu-24.10-x86_64.pkrvars.hcl diff --git a/os_pkrvars/ubuntu/ubuntu-24.10-aarch64.pkrvars.hcl b/os_pkrvars/ubuntu/ubuntu-24.10-aarch64.pkrvars.hcl new file mode 100644 index 000000000..329d4c474 --- /dev/null +++ b/os_pkrvars/ubuntu/ubuntu-24.10-aarch64.pkrvars.hcl @@ -0,0 +1,9 @@ +os_name = "ubuntu" +os_version = "24.10" +os_arch = "aarch64" +iso_url = "https://cdimage.ubuntu.com/releases/oracular/release/ubuntu-24.10-live-server-arm64.iso" +iso_checksum = "file:https://cdimage.ubuntu.com/releases/oracular/release/SHA256SUMS" +parallels_guest_os_type = "ubuntu" +vbox_guest_os_type = "Ubuntu_64" +vmware_guest_os_type = "arm-ubuntu-64" +boot_command = ["<wait>e<wait><down><down><down><end> autoinstall ds=nocloud-net\\;s=http://{{.HTTPIP}}:{{.HTTPPort}}/ubuntu/<wait><f10><wait>"] diff --git a/os_pkrvars/ubuntu/ubuntu-24.10-x86_64.pkrvars.hcl b/os_pkrvars/ubuntu/ubuntu-24.10-x86_64.pkrvars.hcl new file mode 100644 index 000000000..f77c1d40b --- /dev/null +++ b/os_pkrvars/ubuntu/ubuntu-24.10-x86_64.pkrvars.hcl @@ -0,0 +1,9 @@ +os_name = "ubuntu" +os_version = "24.10" +os_arch = "x86_64" +iso_url = "https://releases.ubuntu.com/oracular/ubuntu-24.10-live-server-amd64.iso" +iso_checksum = "file:https://releases.ubuntu.com/oracular/SHA256SUMS" +parallels_guest_os_type = "ubuntu" +vbox_guest_os_type = "Ubuntu_64" +vmware_guest_os_type = "ubuntu-64" +boot_command = ["<wait>e<wait><down><down><down><end> autoinstall ds=nocloud-net\\;s=http://{{.HTTPIP}}:{{.HTTPPort}}/ubuntu/<wait><f10><wait>"] From 8692c540dc425fe86d0b7a881627383d2d21d08f Mon Sep 17 00:00:00 2001 From: Li-Wen Hsu <lwhsu@lwhsu.org> Date: Mon, 9 Dec 2024 05:44:26 +0800 Subject: [PATCH 1564/1622] Update FreeBSD 13 and 14 to latest RELEASE (#1589) --- os_pkrvars/freebsd/freebsd-13-aarch64.pkrvars.hcl | 6 +++--- os_pkrvars/freebsd/freebsd-13-x86_64.pkrvars.hcl | 6 +++--- os_pkrvars/freebsd/freebsd-14-aarch64.pkrvars.hcl | 6 +++--- os_pkrvars/freebsd/freebsd-14-x86_64.pkrvars.hcl | 6 +++--- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/os_pkrvars/freebsd/freebsd-13-aarch64.pkrvars.hcl b/os_pkrvars/freebsd/freebsd-13-aarch64.pkrvars.hcl index d981c6986..1fe88e612 100644 --- a/os_pkrvars/freebsd/freebsd-13-aarch64.pkrvars.hcl +++ b/os_pkrvars/freebsd/freebsd-13-aarch64.pkrvars.hcl @@ -1,8 +1,8 @@ os_name = "freebsd" -os_version = "13.3" +os_version = "13.4" os_arch = "aarch64" -iso_url = "https://download.freebsd.org/releases/arm64/aarch64/ISO-IMAGES/13.3/FreeBSD-13.3-RELEASE-arm64-aarch64-disc1.iso" -iso_checksum = "file:https://download.freebsd.org/releases/arm64/aarch64/ISO-IMAGES/13.3/CHECKSUM.SHA256-FreeBSD-13.3-RELEASE-arm64-aarch64" +iso_url = "https://download.freebsd.org/releases/arm64/aarch64/ISO-IMAGES/13.4/FreeBSD-13.4-RELEASE-arm64-aarch64-disc1.iso" +iso_checksum = "file:https://download.freebsd.org/releases/arm64/aarch64/ISO-IMAGES/13.4/CHECKSUM.SHA256-FreeBSD-13.4-RELEASE-arm64-aarch64" parallels_guest_os_type = "freebsd" vbox_guest_os_type = "FreeBSD_64" vmware_guest_os_type = "arm-freebsd13-64" diff --git a/os_pkrvars/freebsd/freebsd-13-x86_64.pkrvars.hcl b/os_pkrvars/freebsd/freebsd-13-x86_64.pkrvars.hcl index 1b14f89e3..d572e7aaa 100644 --- a/os_pkrvars/freebsd/freebsd-13-x86_64.pkrvars.hcl +++ b/os_pkrvars/freebsd/freebsd-13-x86_64.pkrvars.hcl @@ -1,8 +1,8 @@ os_name = "freebsd" -os_version = "13.3" +os_version = "13.4" os_arch = "x86_64" -iso_url = "https://download.freebsd.org/releases/amd64/amd64/ISO-IMAGES/13.3/FreeBSD-13.3-RELEASE-amd64-disc1.iso" -iso_checksum = "file:https://download.freebsd.org/releases/amd64/amd64/ISO-IMAGES/13.3/CHECKSUM.SHA256-FreeBSD-13.3-RELEASE-amd64" +iso_url = "https://download.freebsd.org/releases/amd64/amd64/ISO-IMAGES/13.4/FreeBSD-13.4-RELEASE-amd64-disc1.iso" +iso_checksum = "file:https://download.freebsd.org/releases/amd64/amd64/ISO-IMAGES/13.4/CHECKSUM.SHA256-FreeBSD-13.4-RELEASE-amd64" parallels_guest_os_type = "freebsd" vbox_guest_os_type = "FreeBSD_64" vmware_guest_os_type = "freebsd-64" diff --git a/os_pkrvars/freebsd/freebsd-14-aarch64.pkrvars.hcl b/os_pkrvars/freebsd/freebsd-14-aarch64.pkrvars.hcl index d09fcb69a..3811f76c1 100644 --- a/os_pkrvars/freebsd/freebsd-14-aarch64.pkrvars.hcl +++ b/os_pkrvars/freebsd/freebsd-14-aarch64.pkrvars.hcl @@ -1,8 +1,8 @@ os_name = "freebsd" -os_version = "14.1" +os_version = "14.2" os_arch = "aarch64" -iso_url = "https://download.freebsd.org/releases/arm64/aarch64/ISO-IMAGES/14.1/FreeBSD-14.1-RELEASE-arm64-aarch64-disc1.iso" -iso_checksum = "file:https://download.freebsd.org/releases/arm64/aarch64/ISO-IMAGES/14.1/CHECKSUM.SHA256-FreeBSD-14.1-RELEASE-arm64-aarch64" +iso_url = "https://download.freebsd.org/releases/arm64/aarch64/ISO-IMAGES/14.2/FreeBSD-14.2-RELEASE-arm64-aarch64-disc1.iso" +iso_checksum = "file:https://download.freebsd.org/releases/arm64/aarch64/ISO-IMAGES/14.2/CHECKSUM.SHA256-FreeBSD-14.2-RELEASE-arm64-aarch64" parallels_guest_os_type = "freebsd" vbox_guest_os_type = "FreeBSD_64" vmware_guest_os_type = "arm-freebsd14-64" diff --git a/os_pkrvars/freebsd/freebsd-14-x86_64.pkrvars.hcl b/os_pkrvars/freebsd/freebsd-14-x86_64.pkrvars.hcl index d01d5138b..c49a904f8 100644 --- a/os_pkrvars/freebsd/freebsd-14-x86_64.pkrvars.hcl +++ b/os_pkrvars/freebsd/freebsd-14-x86_64.pkrvars.hcl @@ -1,8 +1,8 @@ os_name = "freebsd" -os_version = "14.1" +os_version = "14.2" os_arch = "x86_64" -iso_url = "https://download.freebsd.org/releases/amd64/amd64/ISO-IMAGES/14.1/FreeBSD-14.1-RELEASE-amd64-disc1.iso" -iso_checksum = "file:https://download.freebsd.org/releases/amd64/amd64/ISO-IMAGES/14.1/CHECKSUM.SHA256-FreeBSD-14.1-RELEASE-amd64" +iso_url = "https://download.freebsd.org/releases/amd64/amd64/ISO-IMAGES/14.2/FreeBSD-14.2-RELEASE-amd64-disc1.iso" +iso_checksum = "file:https://download.freebsd.org/releases/amd64/amd64/ISO-IMAGES/14.2/CHECKSUM.SHA256-FreeBSD-14.2-RELEASE-amd64" parallels_guest_os_type = "freebsd" vbox_guest_os_type = "FreeBSD_64" vmware_guest_os_type = "freebsd-64" From 675cb90ea2650dca9d248e6985ed37fc8d9400db Mon Sep 17 00:00:00 2001 From: Jason Staph <jstaph@users.noreply.github.com> Date: Tue, 10 Dec 2024 09:51:06 -0500 Subject: [PATCH 1565/1622] feat(fedora): remove fedora 39 (eol) and add fedora 41 (#1584) Signed-off-by: Jason A. Staph <jstaph@staph.us> Co-authored-by: Corey Hemminger <hemminger@hotmail.com> --- .github/workflows/pkr-bld-hyperv-x64.yml | 2 +- .github/workflows/pkr-bld-parallels-arm64.yml | 2 +- .github/workflows/pkr-bld-parallels-x64.yml | 2 +- .github/workflows/pkr-bld-qemu-arm64.yml | 2 +- .github/workflows/pkr-bld-qemu-x64.yml | 2 +- .../workflows/pkr-bld-virtualbox-arm64.yml | 2 +- .github/workflows/pkr-bld-virtualbox-x64.yml | 2 +- .github/workflows/pkr-bld-vmware-arm64.yml | 2 +- .github/workflows/pkr-bld-vmware-x64.yml | 2 +- .github/workflows/test-pkr-bld-parallels.yml | 4 +- CHANGELOG.md | 49 +++++++++++-------- README.md | 2 +- builds.yml | 2 +- ...vars.hcl => fedora-41-aarch64.pkrvars.hcl} | 6 +-- ...rvars.hcl => fedora-41-x86_64.pkrvars.hcl} | 6 +-- 15 files changed, 47 insertions(+), 40 deletions(-) rename os_pkrvars/fedora/{fedora-39-aarch64.pkrvars.hcl => fedora-41-aarch64.pkrvars.hcl} (66%) rename os_pkrvars/fedora/{fedora-39-x86_64.pkrvars.hcl => fedora-41-x86_64.pkrvars.hcl} (65%) diff --git a/.github/workflows/pkr-bld-hyperv-x64.yml b/.github/workflows/pkr-bld-hyperv-x64.yml index 4c2121d7c..1cca3ee5e 100644 --- a/.github/workflows/pkr-bld-hyperv-x64.yml +++ b/.github/workflows/pkr-bld-hyperv-x64.yml @@ -18,8 +18,8 @@ jobs: - centos-stream-9 - debian-11 - debian-12 - - fedora-39 - fedora-40 + - fedora-41 - freebsd-13 - freebsd-14 - opensuse-leap-15 diff --git a/.github/workflows/pkr-bld-parallels-arm64.yml b/.github/workflows/pkr-bld-parallels-arm64.yml index be31c1e6c..5b1d6b0e9 100644 --- a/.github/workflows/pkr-bld-parallels-arm64.yml +++ b/.github/workflows/pkr-bld-parallels-arm64.yml @@ -18,8 +18,8 @@ jobs: - centos-stream-9 - debian-11 - debian-12 - - fedora-39 - fedora-40 + - fedora-41 - freebsd-13 - freebsd-14 - opensuse-leap-15 diff --git a/.github/workflows/pkr-bld-parallels-x64.yml b/.github/workflows/pkr-bld-parallels-x64.yml index a2836e92b..7d9a387c2 100644 --- a/.github/workflows/pkr-bld-parallels-x64.yml +++ b/.github/workflows/pkr-bld-parallels-x64.yml @@ -18,8 +18,8 @@ jobs: - centos-stream-9 - debian-11 - debian-12 - - fedora-39 - fedora-40 + - fedora-41 - freebsd-13 - freebsd-14 - opensuse-leap-15 diff --git a/.github/workflows/pkr-bld-qemu-arm64.yml b/.github/workflows/pkr-bld-qemu-arm64.yml index 0213abdd6..a375d2c58 100644 --- a/.github/workflows/pkr-bld-qemu-arm64.yml +++ b/.github/workflows/pkr-bld-qemu-arm64.yml @@ -18,8 +18,8 @@ jobs: - centos-stream-9 - debian-11 - debian-12 - - fedora-39 - fedora-40 + - fedora-41 - freebsd-13 - freebsd-14 - opensuse-leap-15 diff --git a/.github/workflows/pkr-bld-qemu-x64.yml b/.github/workflows/pkr-bld-qemu-x64.yml index 729343d38..405896f7f 100644 --- a/.github/workflows/pkr-bld-qemu-x64.yml +++ b/.github/workflows/pkr-bld-qemu-x64.yml @@ -18,8 +18,8 @@ jobs: - centos-stream-9 - debian-11 - debian-12 - - fedora-39 - fedora-40 + - fedora-41 - freebsd-13 - freebsd-14 - opensuse-leap-15 diff --git a/.github/workflows/pkr-bld-virtualbox-arm64.yml b/.github/workflows/pkr-bld-virtualbox-arm64.yml index f1e9450d9..ee5abb123 100644 --- a/.github/workflows/pkr-bld-virtualbox-arm64.yml +++ b/.github/workflows/pkr-bld-virtualbox-arm64.yml @@ -18,8 +18,8 @@ jobs: - centos-stream-9 - debian-11 - debian-12 - - fedora-39 - fedora-40 + - fedora-41 - freebsd-13 - freebsd-14 - opensuse-leap-15 diff --git a/.github/workflows/pkr-bld-virtualbox-x64.yml b/.github/workflows/pkr-bld-virtualbox-x64.yml index e1d52132a..45b86559a 100644 --- a/.github/workflows/pkr-bld-virtualbox-x64.yml +++ b/.github/workflows/pkr-bld-virtualbox-x64.yml @@ -18,8 +18,8 @@ jobs: - centos-stream-9 - debian-11 - debian-12 - - fedora-39 - fedora-40 + - fedora-41 - freebsd-13 - freebsd-14 - opensuse-leap-15 diff --git a/.github/workflows/pkr-bld-vmware-arm64.yml b/.github/workflows/pkr-bld-vmware-arm64.yml index e4f0a66fa..aefd8666e 100644 --- a/.github/workflows/pkr-bld-vmware-arm64.yml +++ b/.github/workflows/pkr-bld-vmware-arm64.yml @@ -18,8 +18,8 @@ jobs: - centos-stream-9 - debian-11 - debian-12 - - fedora-39 - fedora-40 + - fedora-41 - freebsd-13 - freebsd-14 - opensuse-leap-15 diff --git a/.github/workflows/pkr-bld-vmware-x64.yml b/.github/workflows/pkr-bld-vmware-x64.yml index 97dc27ff3..3fe5ef48f 100644 --- a/.github/workflows/pkr-bld-vmware-x64.yml +++ b/.github/workflows/pkr-bld-vmware-x64.yml @@ -18,8 +18,8 @@ jobs: - centos-stream-9 - debian-11 - debian-12 - - fedora-39 - fedora-40 + - fedora-41 - freebsd-13 - freebsd-14 - opensuse-leap-15 diff --git a/.github/workflows/test-pkr-bld-parallels.yml b/.github/workflows/test-pkr-bld-parallels.yml index 53ae3a969..3a8b9e421 100644 --- a/.github/workflows/test-pkr-bld-parallels.yml +++ b/.github/workflows/test-pkr-bld-parallels.yml @@ -17,8 +17,8 @@ jobs: - centos-stream-9 - debian-11 - debian-12 - - fedora-39 - fedora-40 + - fedora-41 - freebsd-13 - freebsd-14 - opensuse-leap-15 @@ -86,8 +86,8 @@ jobs: - centos-stream-9 - debian-11 - debian-12 - - fedora-39 - fedora-40 + - fedora-41 - freebsd-13 - freebsd-14 - opensuse-leap-15 diff --git a/CHANGELOG.md b/CHANGELOG.md index 3fd6532b1..830e5088d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,7 +2,7 @@ ## Working Builds -***Note:** +*__Note:__ Markdown table generated at <https://www.tablesgenerator.com/markdown_tables#> | os | hyperv<br>x86_64 | parallels<br>x86_64 | parallels<br>aarch64 | qemu<br>x86_64 | qemu<br>aarch64 | virtualbox<br>x86_64 | virtualbox<br>aarch64 | vmware<br>x86_64 | vmware<br>aarch64 | @@ -14,8 +14,8 @@ Markdown table generated at <https://www.tablesgenerator.com/markdown_tables#> | centos-stream-9 | | x | | | | x | | x | x | | debian-11 | | x | x | | | x | | x | | | debian-12 | | x | x | | | x | | x | x | -| fedora-39 | | x | x | x | | x | | x | x | | fedora-40 | | x | | x | | x | | x | x | +| fedora-41 | | x | | x | | x | | x | x | | freebsd-13 | | | | | | x | | x | x | | freebsd-14 | | | | | | | | | | | macos | | | x | | | | | | | @@ -42,8 +42,9 @@ Markdown table generated at <https://www.tablesgenerator.com/markdown_tables#> - Fix failing builds - migrate from http directory for hosting files to cd_files in source templates - - This makes all builds compatible with hyper-v gen 2 which removes floppy disk capability - - Eliminates any potential networking issues + - This makes all builds compatible with hyper-v gen 2 which removes floppy disk capability + - Eliminates any potential networking issues + - Update pipelines to only run on updated pkrvars files - Look into making all builds uefi default builds - Create CD pipeline to upload vagrant boxes after PR is merged @@ -220,8 +221,9 @@ Markdown table generated at <https://www.tablesgenerator.com/markdown_tables#> - Fix failing builds - Finish removal of deprecated chef-solo provider to powershell provider for windows - migrate from http directory for hosting files to cd_files in source templates - - This makes all builds compatable with hyper-v gen 2 which removes floppy disk capability - - This also makes things universal for Virtualbox 6.1 to 7.x due to latter requiring extra config for guests on NAT to be able to connect to host + - This makes all builds compatable with hyper-v gen 2 which removes floppy disk capability + - This also makes things universal for Virtualbox 6.1 to 7.x due to latter requiring extra config for guests on NAT to be able to connect to host + - Update pipelines to only run on updated pkrvars files - Look into making all build uefi default builds - Create CD pipeline to upload vagrant boxes after PR is merged @@ -245,14 +247,17 @@ Markdown table generated at <https://www.tablesgenerator.com/markdown_tables#> - Fix failing builds - Add more Virtualization providers to build pipelines - - vmware - - aarch64 - vmware plugin has issues with fusion 13 - - virtualbox - - aarch64 - Vbox Beta support currently + - vmware + - aarch64 - vmware plugin has issues with fusion 13 + + - virtualbox + - aarch64 - Vbox Beta support currently + - Finish removal of deprecated chef-solo provider to powershell provider for windows - migrate from http directory for hosting files to cd_files in source templates - - This makes all builds compatable with hyper-v gen 2 which removes floppy disk capability - - This also makes things universal for Virtualbox 6.1 to 7.x due to latter requiring extra config for guests on NAT to be able to connect to host + - This makes all builds compatable with hyper-v gen 2 which removes floppy disk capability + - This also makes things universal for Virtualbox 6.1 to 7.x due to latter requiring extra config for guests on NAT to be able to connect to host + - Update pipelines to only run on updated pkrvars files - Create CD pipeline to upload vagrant boxes after PR is merged - Create CD pipeline to build and upload new versions of vagrant boxes once every 3 months with the latest patches @@ -294,8 +299,9 @@ Markdown table generated at <https://www.tablesgenerator.com/markdown_tables#> - Add more Virtualization providers to build pipelines - Finish removal of deprecated chef-solo provider to powershell provider for windows - migrate from http directory for hosting files to cd_files in source templates - - This makes all builds compatable with hyper-v gen 2 which removes floppy disk capability - - This also makes things universal for Virtualbox 6.1 to 7.x due to latter requiring extra config for guests on NAT to be able to connect to host + - This makes all builds compatable with hyper-v gen 2 which removes floppy disk capability + - This also makes things universal for Virtualbox 6.1 to 7.x due to latter requiring extra config for guests on NAT to be able to connect to host + - Update pipelines to only run on updated pkrvars files - Create CD pipeline to upload vagrant boxes after PR is merged - Create CD pipeline to build and upload new versions of vagrant boxes once every 3 months with the latest patches @@ -373,8 +379,9 @@ Markdown table generated at <https://www.tablesgenerator.com/markdown_tables#> - Add more Virtualization providers to build pipelines - Finish removal of deprecated chef-solo provider to powershell provider for windows - migrate from http directory for hosting files to cd_files in source templates - - This makes all builds compatable with hyper-v gen 2 which removes floppy disk capability - - This also makes things universal for Virtualbox 6.1 to 7.x due to latter requiring extra config for guests on NAT to be able to connect to host + - This makes all builds compatable with hyper-v gen 2 which removes floppy disk capability + - This also makes things universal for Virtualbox 6.1 to 7.x due to latter requiring extra config for guests on NAT to be able to connect to host + - Update pipelines to only run on updated pkrvars files - Create CD pipeline to upload vagrant boxes after PR is merged - Create CD pipeline to build and upload new versions of vagrant boxes once every 3 months with the latest patches @@ -635,10 +642,10 @@ Markdown table generated at <https://www.tablesgenerator.com/markdown_tables#> - Suppress VMX whitelisting warning by removing interfaces at end of build - Use archive.ubuntu.com instead of US specific domain - Latest Tooling - - VirtualBox 5.1.24 - - VMware Fusion 8.5.8 - - Parallels 12.2.1 - - Packer 1.0.3 + - VirtualBox 5.1.24 + - VMware Fusion 8.5.8 + - Parallels 12.2.1 + - Packer 1.0.3 ## [2.3.7] (2017-07-03) @@ -1375,4 +1382,4 @@ Please ensure that Virtualbox is at least 5.1.6 and Vagrant at least 1.8.6 befor - \[BENTO-2\] Update Ubuntu iso filenames, md5sums. [\#6](https://github.com/chef/bento/pull/6) ([torandu](https://github.com/torandu)) - \[BENTO-4\] Updated centos 6.2 iso urls to use the vault.centos.org url [\#4](https://github.com/chef/bento/pull/4) ([cburyta](https://github.com/cburyta)) -\* *This Change Log was automatically generated by [github_changelog_generator](https://github.com/skywinder/Github-Changelog-Generator)* +\* _This Change Log was automatically generated by [github_changelog_generator](https://github.com/skywinder/Github-Changelog-Generator)_ diff --git a/README.md b/README.md index 5d25ec903..bac27c846 100644 --- a/README.md +++ b/README.md @@ -138,7 +138,7 @@ To use an alternate url ````bash cd <path/to>/bento packer init -upgrade ./packer_templates -packer build -var 'iso_url=https://mirrors.rit.edu/fedora/fedora/linux/releases/39/Server/x86_64/iso/Fedora-Server-dvd-x86_64-39-1.5.iso' -var-file=os_pkrvars/fedora/fedora-39-x86_64.pkrvars.hcl ./packer_templates +packer build -var 'iso_url=https://mirrors.rit.edu/fedora/fedora/linux/releases/41/Server/x86_64/iso/Fedora-Server-dvd-x86_64-41-1.4.iso' -var-file=os_pkrvars/fedora/fedora-41-x86_64.pkrvars.hcl ./packer_templates ```` If the build is successful, your box files will be in the `builds` directory at the root of the repository. diff --git a/builds.yml b/builds.yml index 665696e27..44e3afd87 100644 --- a/builds.yml +++ b/builds.yml @@ -13,8 +13,8 @@ public: - centos-stream-9 - debian-11 - debian-12 - - fedora-39 - fedora-40 + - fedora-41 - freebsd-13 - freebsd-14 - opensuse-leap-15 diff --git a/os_pkrvars/fedora/fedora-39-aarch64.pkrvars.hcl b/os_pkrvars/fedora/fedora-41-aarch64.pkrvars.hcl similarity index 66% rename from os_pkrvars/fedora/fedora-39-aarch64.pkrvars.hcl rename to os_pkrvars/fedora/fedora-41-aarch64.pkrvars.hcl index b6e1b86db..6da393c1c 100644 --- a/os_pkrvars/fedora/fedora-39-aarch64.pkrvars.hcl +++ b/os_pkrvars/fedora/fedora-41-aarch64.pkrvars.hcl @@ -1,8 +1,8 @@ os_name = "fedora" -os_version = "39" +os_version = "41" os_arch = "aarch64" -iso_url = "https://mirrors.rit.edu/fedora/fedora/linux/releases/39/Server/aarch64/iso/Fedora-Server-dvd-aarch64-39-1.5.iso" -iso_checksum = "sha256:d19dc2a39758155fa53e6fd555d0d173ccc8175b55dea48002d499f39cb30ce0" +iso_url = "https://mirrors.rit.edu/fedora/fedora/linux/releases/41/Server/aarch64/iso/Fedora-Server-dvd-aarch64-41-1.4.iso" +iso_checksum = "sha256:99e7801b943e81f78a7b104fe348196b0ac1bc748ce647378f22a2c875c923ec" parallels_guest_os_type = "fedora-core" vbox_guest_os_type = "Fedora_64" vmware_guest_os_type = "arm-fedora-64" diff --git a/os_pkrvars/fedora/fedora-39-x86_64.pkrvars.hcl b/os_pkrvars/fedora/fedora-41-x86_64.pkrvars.hcl similarity index 65% rename from os_pkrvars/fedora/fedora-39-x86_64.pkrvars.hcl rename to os_pkrvars/fedora/fedora-41-x86_64.pkrvars.hcl index 44e8cc9bd..eefbb3a8c 100644 --- a/os_pkrvars/fedora/fedora-39-x86_64.pkrvars.hcl +++ b/os_pkrvars/fedora/fedora-41-x86_64.pkrvars.hcl @@ -1,8 +1,8 @@ os_name = "fedora" -os_version = "39" +os_version = "41" os_arch = "x86_64" -iso_url = "https://mirrors.rit.edu/fedora/fedora/linux/releases/39/Server/x86_64/iso/Fedora-Server-dvd-x86_64-39-1.5.iso" -iso_checksum = "sha256:2755cdff6ac6365c75be60334bf1935ade838fc18de53d4c640a13d3e904f6e9" +iso_url = "https://mirrors.rit.edu/fedora/fedora/linux/releases/41/Server/x86_64/iso/Fedora-Server-dvd-x86_64-41-1.4.iso" +iso_checksum = "sha256:6037e489103401a6ad4e54a4bcb2df7525693bdc3f2ce4aa895838b65647e551" parallels_guest_os_type = "fedora-core" vbox_guest_os_type = "Fedora_64" vmware_guest_os_type = "fedora-64" From 0676084a55c456972bdd0f0cba2a6652e7cde4a0 Mon Sep 17 00:00:00 2001 From: Phillip Ross <phillipross@users.noreply.github.com> Date: Thu, 12 Dec 2024 15:58:45 -0500 Subject: [PATCH 1566/1622] Rockylinux update to v9.5 (#1587) * use full version and vault URLs to prevent releases of newer versions from breaking builds Signed-off-by: Phillip Ross <phillip.w.g.ross@gmail.com> * update to rockylinux 9.5 Signed-off-by: Phillip Ross <phillip.w.g.ross@gmail.com> * revert using full versions in URLs since builds breaking are used as indicators that new versions are available. Signed-off-by: Phillip Ross <phillip.w.g.ross@gmail.com> --------- Signed-off-by: Phillip Ross <phillip.w.g.ross@gmail.com> --- os_pkrvars/rockylinux/rockylinux-9-aarch64.pkrvars.hcl | 4 ++-- os_pkrvars/rockylinux/rockylinux-9-x86_64.pkrvars.hcl | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/os_pkrvars/rockylinux/rockylinux-9-aarch64.pkrvars.hcl b/os_pkrvars/rockylinux/rockylinux-9-aarch64.pkrvars.hcl index 838bc2d50..07b12be71 100644 --- a/os_pkrvars/rockylinux/rockylinux-9-aarch64.pkrvars.hcl +++ b/os_pkrvars/rockylinux/rockylinux-9-aarch64.pkrvars.hcl @@ -1,7 +1,7 @@ os_name = "rockylinux" -os_version = "9.4" +os_version = "9.5" os_arch = "aarch64" -iso_url = "https://download.rockylinux.org/pub/rocky/9/isos/aarch64/Rocky-9.4-aarch64-minimal.iso" +iso_url = "https://download.rockylinux.org/pub/rocky/9/isos/aarch64/Rocky-9.5-aarch64-minimal.iso" iso_checksum = "file:https://download.rockylinux.org/pub/rocky/9/isos/aarch64/CHECKSUM" parallels_guest_os_type = "centos" vbox_guest_os_type = "RedHat_64" diff --git a/os_pkrvars/rockylinux/rockylinux-9-x86_64.pkrvars.hcl b/os_pkrvars/rockylinux/rockylinux-9-x86_64.pkrvars.hcl index 73aa82e53..c692ff7fb 100644 --- a/os_pkrvars/rockylinux/rockylinux-9-x86_64.pkrvars.hcl +++ b/os_pkrvars/rockylinux/rockylinux-9-x86_64.pkrvars.hcl @@ -1,7 +1,7 @@ os_name = "rockylinux" -os_version = "9.4" +os_version = "9.5" os_arch = "x86_64" -iso_url = "https://download.rockylinux.org/pub/rocky/9/isos/x86_64/Rocky-9.4-x86_64-dvd.iso" +iso_url = "https://download.rockylinux.org/pub/rocky/9/isos/x86_64/Rocky-9.5-x86_64-dvd.iso" iso_checksum = "file:https://download.rockylinux.org/pub/rocky/9/isos/x86_64/CHECKSUM" parallels_guest_os_type = "centos" vbox_guest_os_type = "RedHat_64" From 2764117fc35f7eee3cebccd04b634e927b918ae1 Mon Sep 17 00:00:00 2001 From: Phillip Ross <phillipross@users.noreply.github.com> Date: Thu, 12 Dec 2024 15:59:29 -0500 Subject: [PATCH 1567/1622] Almalinux update to v9.5 (#1586) * use full version URLs to prevent releases of newer versions from breaking builds Signed-off-by: Phillip Ross <phillip.w.g.ross@gmail.com> * update to almalinux 9.5 Signed-off-by: Phillip Ross <phillip.w.g.ross@gmail.com> * revert using full versions in URLs since builds breaking are used as indicators that new versions are available. Signed-off-by: Phillip Ross <phillip.w.g.ross@gmail.com> --------- Signed-off-by: Phillip Ross <phillip.w.g.ross@gmail.com> --- os_pkrvars/almalinux/almalinux-9-aarch64.pkrvars.hcl | 4 ++-- os_pkrvars/almalinux/almalinux-9-x86_64.pkrvars.hcl | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/os_pkrvars/almalinux/almalinux-9-aarch64.pkrvars.hcl b/os_pkrvars/almalinux/almalinux-9-aarch64.pkrvars.hcl index a36a2f5b2..2a1a0763f 100644 --- a/os_pkrvars/almalinux/almalinux-9-aarch64.pkrvars.hcl +++ b/os_pkrvars/almalinux/almalinux-9-aarch64.pkrvars.hcl @@ -1,7 +1,7 @@ os_name = "almalinux" -os_version = "9.4" +os_version = "9.5" os_arch = "aarch64" -iso_url = "https://repo.almalinux.org/almalinux/9/isos/aarch64/AlmaLinux-9.4-aarch64-dvd.iso" +iso_url = "https://repo.almalinux.org/almalinux/9/isos/aarch64/AlmaLinux-9.5-aarch64-dvd.iso" iso_checksum = "file:https://repo.almalinux.org/almalinux/9/isos/aarch64/CHECKSUM" parallels_guest_os_type = "centos" vbox_guest_os_type = "RedHat_64" diff --git a/os_pkrvars/almalinux/almalinux-9-x86_64.pkrvars.hcl b/os_pkrvars/almalinux/almalinux-9-x86_64.pkrvars.hcl index ac64fbf20..c15cf939a 100644 --- a/os_pkrvars/almalinux/almalinux-9-x86_64.pkrvars.hcl +++ b/os_pkrvars/almalinux/almalinux-9-x86_64.pkrvars.hcl @@ -1,7 +1,7 @@ os_name = "almalinux" -os_version = "9.4" +os_version = "9.5" os_arch = "x86_64" -iso_url = "https://repo.almalinux.org/almalinux/9/isos/x86_64/AlmaLinux-9.4-x86_64-dvd.iso" +iso_url = "https://repo.almalinux.org/almalinux/9/isos/x86_64/AlmaLinux-9.5-x86_64-dvd.iso" iso_checksum = "file:https://repo.almalinux.org/almalinux/9/isos/x86_64/CHECKSUM" parallels_guest_os_type = "centos" vbox_guest_os_type = "RedHat_64" From 74602d4de8af13357f542de74b75d449e26a7f35 Mon Sep 17 00:00:00 2001 From: Seth Grover <13872653+mmguero@users.noreply.github.com> Date: Thu, 12 Dec 2024 14:13:25 -0700 Subject: [PATCH 1568/1622] Bump Debian from 12.7.0 to 12.8.0 (https://www.debian.org/News/2024/20241109) (#1590) Signed-off-by: Seth Grover <seth.d.grover@gmail.com> --- os_pkrvars/debian/debian-12-aarch64.pkrvars.hcl | 6 +++--- os_pkrvars/debian/debian-12-x86_64.pkrvars.hcl | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/os_pkrvars/debian/debian-12-aarch64.pkrvars.hcl b/os_pkrvars/debian/debian-12-aarch64.pkrvars.hcl index 40280c58e..f4e578c47 100644 --- a/os_pkrvars/debian/debian-12-aarch64.pkrvars.hcl +++ b/os_pkrvars/debian/debian-12-aarch64.pkrvars.hcl @@ -1,8 +1,8 @@ os_name = "debian" -os_version = "12.7" +os_version = "12.8" os_arch = "aarch64" -iso_url = "https://cdimage.debian.org/cdimage/release/12.7.0/arm64/iso-dvd/debian-12.7.0-arm64-DVD-1.iso" -iso_checksum = "file:https://cdimage.debian.org/cdimage/release/12.7.0/arm64/iso-dvd/SHA256SUMS" +iso_url = "https://cdimage.debian.org/cdimage/release/12.8.0/arm64/iso-dvd/debian-12.8.0-arm64-DVD-1.iso" +iso_checksum = "file:https://cdimage.debian.org/cdimage/release/12.8.0/arm64/iso-dvd/SHA256SUMS" parallels_guest_os_type = "debian" vbox_guest_os_type = "Debian_64" vmware_guest_os_type = "arm-debian12-64" diff --git a/os_pkrvars/debian/debian-12-x86_64.pkrvars.hcl b/os_pkrvars/debian/debian-12-x86_64.pkrvars.hcl index 997b38f99..ba34b7474 100644 --- a/os_pkrvars/debian/debian-12-x86_64.pkrvars.hcl +++ b/os_pkrvars/debian/debian-12-x86_64.pkrvars.hcl @@ -1,8 +1,8 @@ os_name = "debian" -os_version = "12.7" +os_version = "12.8" os_arch = "x86_64" -iso_url = "https://cdimage.debian.org/cdimage/release/12.7.0/amd64/iso-dvd/debian-12.7.0-amd64-DVD-1.iso" -iso_checksum = "file:https://cdimage.debian.org/cdimage/release/12.7.0/amd64/iso-dvd/SHA256SUMS" +iso_url = "https://cdimage.debian.org/cdimage/release/12.8.0/amd64/iso-dvd/debian-12.8.0-amd64-DVD-1.iso" +iso_checksum = "file:https://cdimage.debian.org/cdimage/release/12.8.0/amd64/iso-dvd/SHA256SUMS" parallels_guest_os_type = "debian" vbox_guest_os_type = "Debian_64" vmware_guest_os_type = "debian-64" From 3d87d007ca1efe7c00c3a556db091f634315fa3d Mon Sep 17 00:00:00 2001 From: Nicolino Curalli <nicolino.curalli@gmail.com> Date: Mon, 27 Jan 2025 19:00:11 +0100 Subject: [PATCH 1569/1622] fixing the opensuse build for different providers (#1591) * fixing the opensuse build for different providers --------- Signed-off-by: Nicolino Curalli <nicolino.curalli@gmail.com> --- .../opensuse-leap-15-aarch64.pkrvars.hcl | 21 +++- .../opensuse-leap-15-x86_64.pkrvars.hcl | 6 +- packer_templates/pkr-sources.pkr.hcl | 2 +- packer_templates/pkr-variables.pkr.hcl | 4 + packer_templates/scripts/_common/parallels.sh | 65 +++++----- .../scripts/_common/virtualbox.sh | 112 +++++++++--------- 6 files changed, 119 insertions(+), 91 deletions(-) diff --git a/os_pkrvars/opensuse/opensuse-leap-15-aarch64.pkrvars.hcl b/os_pkrvars/opensuse/opensuse-leap-15-aarch64.pkrvars.hcl index fbd8b25d4..82daa1f8e 100644 --- a/os_pkrvars/opensuse/opensuse-leap-15-aarch64.pkrvars.hcl +++ b/os_pkrvars/opensuse/opensuse-leap-15-aarch64.pkrvars.hcl @@ -1,9 +1,24 @@ os_name = "opensuse-leap" os_version = "15.6" os_arch = "aarch64" -iso_url = "http://provo-mirror.opensuse.org/distribution/leap/15.6/iso/openSUSE-Leap-15.6-DVD-aarch64-Media.iso" -iso_checksum = "file:https://provo-mirror.opensuse.org/distribution/leap/15.6/iso/openSUSE-Leap-15.6-DVD-aarch64-Media.iso.sha256" +iso_url = "https://download.opensuse.org/distribution/leap/15.6/iso/openSUSE-Leap-15.6-DVD-aarch64-Build710.3-Media.iso" +iso_checksum = "sha256:6ecade658ef3e4dd7175176781f80fcd070250fe7e922f6240224ff810755ac6" parallels_guest_os_type = "opensuse" -vbox_guest_os_type = "OpenSUSE_64" +vbox_guest_os_type = "OpenSUSE_Leap_arm64" vmware_guest_os_type = "arm-other-64" boot_command = ["<wait5><esc><wait>e<wait><down><down><down><down><end> biosdevname=0 net.ifnames=0 netdevice=eth0 netsetup=dhcp lang=en_US textmode=1 modprobe.blacklist=vmwgfx autoyast=http://{{ .HTTPIP }}:{{ .HTTPPort }}/opensuse/autoinst-uefi.xml<f10><wait>"] +vboxmanage = [ + [ + "modifyvm", + "{{.Name}}", + "--audio", + "none", + "--nat-localhostreachable1", + "on", + "--usb-xhci", + "on" + ] +] +vbox_hard_drive_interface = "virtio" +vbox_iso_interface = "virtio" +vbox_firmware_option = "efi" diff --git a/os_pkrvars/opensuse/opensuse-leap-15-x86_64.pkrvars.hcl b/os_pkrvars/opensuse/opensuse-leap-15-x86_64.pkrvars.hcl index 0daf936b8..497086bf5 100644 --- a/os_pkrvars/opensuse/opensuse-leap-15-x86_64.pkrvars.hcl +++ b/os_pkrvars/opensuse/opensuse-leap-15-x86_64.pkrvars.hcl @@ -1,9 +1,9 @@ os_name = "opensuse-leap" os_version = "15.6" os_arch = "x86_64" -iso_url = "http://sfo-korg-mirror.kernel.org/opensuse/distribution/leap/15.6/iso/openSUSE-Leap-15.6-DVD-x86_64-Media.iso" -iso_checksum = "file:http://sfo-korg-mirror.kernel.org/opensuse/distribution/leap/15.6/iso/openSUSE-Leap-15.6-DVD-x86_64-Media.iso.sha256" +iso_url = "https://download.opensuse.org/distribution/leap/15.6/iso/openSUSE-Leap-15.6-DVD-x86_64-Build710.3-Media.iso" +iso_checksum = "sha256:a74d4072e639c75ca127df3d869c1e57bcc44a093a969550f348a3ead561fe4f" parallels_guest_os_type = "opensuse" -vbox_guest_os_type = "OpenSUSE_64" +vbox_guest_os_type = "OpenSUSE_Leap_64" vmware_guest_os_type = "opensuse-64" boot_command = ["<wait5><esc><enter><wait>linux biosdevname=0 net.ifnames=0 netdevice=eth0 netsetup=dhcp lang=en_US textmode=1 autoyast=http://{{ .HTTPIP }}:{{ .HTTPPort }}/opensuse/autoinst.xml<enter><wait>"] diff --git a/packer_templates/pkr-sources.pkr.hcl b/packer_templates/pkr-sources.pkr.hcl index 4c31488e3..d8aefb8c7 100644 --- a/packer_templates/pkr-sources.pkr.hcl +++ b/packer_templates/pkr-sources.pkr.hcl @@ -254,7 +254,7 @@ source "qemu" "vm" { } source "virtualbox-iso" "vm" { # Virtualbox specific options - #firmware = "efi" + firmware = var.vbox_firmware_option gfx_controller = local.vbox_gfx_controller gfx_vram_size = local.vbox_gfx_vram_size guest_additions_path = var.vbox_guest_additions_path diff --git a/packer_templates/pkr-variables.pkr.hcl b/packer_templates/pkr-variables.pkr.hcl index 5a6354105..625e8b9b6 100644 --- a/packer_templates/pkr-variables.pkr.hcl +++ b/packer_templates/pkr-variables.pkr.hcl @@ -249,6 +249,10 @@ variable "virtualbox_version_file" { type = string default = ".vbox_version" } +variable "vbox_firmware_option" { + type = string + default = "bios" +} # virtualbox-ovf variable "vbox_source_path" { diff --git a/packer_templates/scripts/_common/parallels.sh b/packer_templates/scripts/_common/parallels.sh index def4f01aa..c1501f5eb 100644 --- a/packer_templates/scripts/_common/parallels.sh +++ b/packer_templates/scripts/_common/parallels.sh @@ -3,37 +3,42 @@ # set a default HOME_DIR environment variable if not set HOME_DIR="${HOME_DIR:-/home/vagrant}"; -case "$PACKER_BUILDER_TYPE" in -parallels-iso|parallels-pvm) - mkdir -p /tmp/parallels; - if [ "$(uname -m)" = "aarch64" ] ; then - mount -o loop "$HOME_DIR"/prl-tools-lin-arm.iso /tmp/parallels; - else - mount -o loop "$HOME_DIR"/prl-tools-lin.iso /tmp/parallels; - fi - VER="$(cat /tmp/parallels/version)"; +if ! ([ "$(uname -m)" = "aarch64" ] && [ -f /etc/os-release ] && (grep -qi 'opensuse' /etc/os-release || grep -qi 'sles' /etc/os-release)); then - echo "Parallels Tools Version: $VER"; + case "$PACKER_BUILDER_TYPE" in + parallels-iso|parallels-pvm) + mkdir -p /tmp/parallels; + if [ "$(uname -m)" = "aarch64" ] ; then + mount -o loop "$HOME_DIR"/prl-tools-lin-arm.iso /tmp/parallels; + else + mount -o loop "$HOME_DIR"/prl-tools-lin.iso /tmp/parallels; + fi + VER="$(cat /tmp/parallels/version)"; - /tmp/parallels/install --install-unattended-with-deps \ - || (code="$?"; \ - echo "Parallels tools installation exited $code, attempting" \ - "to output /var/log/parallels-tools-install.log"; \ - cat /var/log/parallels-tools-install.log; \ - exit $code); - umount /tmp/parallels; - rm -rf /tmp/parallels; - rm -f "$HOME_DIR"/*.iso; + echo "Parallels Tools Version: $VER"; - # Parallels Tools for Linux includes native auto-mount script, - # which causes losing some of Vagrant-relative shared folders. - # So, we should disable this behavior. - # https://github.com/Parallels/vagrant-parallels/issues/325#issuecomment-418727113 - # TODO: verify this is fixed in latest version of parallels - # auto_mount_script='/usr/bin/prlfsmountd' - # if [ -f "${auto_mount_script}" ]; then - # printf '#!/bin/sh\n # Shared folders auto-mount is disabled by Vagrant' > "${auto_mount_script}" - # fi + /tmp/parallels/install --install-unattended-with-deps \ + || (code="$?"; \ + echo "Parallels tools installation exited $code, attempting" \ + "to output /var/log/parallels-tools-install.log"; \ + cat /var/log/parallels-tools-install.log; \ + exit $code); + umount /tmp/parallels; + rm -rf /tmp/parallels; + rm -f "$HOME_DIR"/*.iso; - ;; -esac + # Parallels Tools for Linux includes native auto-mount script, + # which causes losing some of Vagrant-relative shared folders. + # So, we should disable this behavior. + # https://github.com/Parallels/vagrant-parallels/issues/325#issuecomment-418727113 + # TODO: verify this is fixed in latest version of parallels + # auto_mount_script='/usr/bin/prlfsmountd' + # if [ -f "${auto_mount_script}" ]; then + # printf '#!/bin/sh\n # Shared folders auto-mount is disabled by Vagrant' > "${auto_mount_script}" + # fi + + ;; + esac +else + echo "Skipping Parallels Tools installation on aarch64 architecture for opensuse and derivatives" +fi diff --git a/packer_templates/scripts/_common/virtualbox.sh b/packer_templates/scripts/_common/virtualbox.sh index f6e66b7f1..7384ff2aa 100644 --- a/packer_templates/scripts/_common/virtualbox.sh +++ b/packer_templates/scripts/_common/virtualbox.sh @@ -1,55 +1,59 @@ #!/bin/sh -eux - -# set a default HOME_DIR environment variable if not set -HOME_DIR="${HOME_DIR:-/home/vagrant}"; - -case "$PACKER_BUILDER_TYPE" in -virtualbox-iso|virtualbox-ovf) - VER="$(cat "$HOME_DIR"/.vbox_version)"; - ISO="VBoxGuestAdditions_$VER.iso"; - - # mount the ISO to /tmp/vbox - mkdir -p /tmp/vbox; - mount -o loop "$HOME_DIR"/"$ISO" /tmp/vbox; - - echo "installing deps necessary to compile kernel modules" - # We install things like kernel-headers here vs. kickstart files so we make sure we install them for the updated kernel not the stock kernel - if [ -f "/bin/dnf" ]; then - dnf install -y --skip-broken perl cpp gcc make bzip2 tar kernel-headers kernel-devel kernel-uek-devel || true # not all these packages are on every system - elif [ -f "/bin/yum" ] || [ -f "/usr/bin/yum" ]; then - yum install -y --skip-broken perl cpp gcc make bzip2 tar kernel-headers kernel-devel kernel-uek-devel || true # not all these packages are on every system - elif [ -f "/usr/bin/apt-get" ]; then - apt-get install -y build-essential dkms bzip2 tar linux-headers-"$(uname -r)" - elif [ -f "/usr/bin/zypper" ]; then - zypper install -y perl cpp gcc make bzip2 tar kernel-default-devel - fi - - echo "installing the vbox additions" - # this install script fails with non-zero exit codes for no apparent reason so we need better ways to know if it worked - /tmp/vbox/VBoxLinuxAdditions.run --nox11 || true - - if ! modinfo vboxsf >/dev/null 2>&1; then - echo "Cannot find vbox kernel module. Installation of guest additions unsuccessful!" - exit 1 - fi - - echo "unmounting and removing the vbox ISO" - umount /tmp/vbox; - rm -rf /tmp/vbox; - rm -f "$HOME_DIR"/*.iso; - - echo "removing kernel dev packages and compilers we no longer need" - if [ -f "/bin/dnf" ]; then - dnf remove -y gcc cpp kernel-headers kernel-devel kernel-uek-devel - elif [ -f "/bin/yum" ] || [ -f "/usr/bin/yum" ]; then - yum remove -y gcc cpp kernel-headers kernel-devel kernel-uek-devel - elif [ -f "/usr/bin/apt-get" ]; then - apt-get remove -y build-essential gcc g++ make libc6-dev dkms linux-headers-"$(uname -r)" - elif [ -f "/usr/bin/zypper" ]; then - zypper -n rm -u kernel-default-devel gcc make - fi - - echo "removing leftover logs" - rm -rf /var/log/vboxadd* - ;; -esac +if ! ([ "$(uname -m)" = "aarch64" ] && [ -f /etc/os-release ] && (grep -qi 'opensuse' /etc/os-release || grep -qi 'sles' /etc/os-release)); then + + # set a default HOME_DIR environment variable if not set + HOME_DIR="${HOME_DIR:-/home/vagrant}"; + + case "$PACKER_BUILDER_TYPE" in + virtualbox-iso|virtualbox-ovf) + VER="$(cat "$HOME_DIR"/.vbox_version)"; + ISO="VBoxGuestAdditions_$VER.iso"; + + # mount the ISO to /tmp/vbox + mkdir -p /tmp/vbox; + mount -o loop "$HOME_DIR"/"$ISO" /tmp/vbox; + + echo "installing deps necessary to compile kernel modules" + # We install things like kernel-headers here vs. kickstart files so we make sure we install them for the updated kernel not the stock kernel + if [ -f "/bin/dnf" ]; then + dnf install -y --skip-broken perl cpp gcc make bzip2 tar kernel-headers kernel-devel kernel-uek-devel || true # not all these packages are on every system + elif [ -f "/bin/yum" ] || [ -f "/usr/bin/yum" ]; then + yum install -y --skip-broken perl cpp gcc make bzip2 tar kernel-headers kernel-devel kernel-uek-devel || true # not all these packages are on every system + elif [ -f "/usr/bin/apt-get" ]; then + apt-get install -y build-essential dkms bzip2 tar linux-headers-"$(uname -r)" + elif [ -f "/usr/bin/zypper" ]; then + zypper install -y perl cpp gcc make bzip2 tar kernel-default-devel + fi + + echo "installing the vbox additions" + # this install script fails with non-zero exit codes for no apparent reason so we need better ways to know if it worked + /tmp/vbox/VBoxLinuxAdditions.run --nox11 || true + + if ! modinfo vboxsf >/dev/null 2>&1; then + echo "Cannot find vbox kernel module. Installation of guest additions unsuccessful!" + exit 1 + fi + + echo "unmounting and removing the vbox ISO" + umount /tmp/vbox; + rm -rf /tmp/vbox; + rm -f "$HOME_DIR"/*.iso; + + echo "removing kernel dev packages and compilers we no longer need" + if [ -f "/bin/dnf" ]; then + dnf remove -y gcc cpp kernel-headers kernel-devel kernel-uek-devel + elif [ -f "/bin/yum" ] || [ -f "/usr/bin/yum" ]; then + yum remove -y gcc cpp kernel-headers kernel-devel kernel-uek-devel + elif [ -f "/usr/bin/apt-get" ]; then + apt-get remove -y build-essential gcc g++ make libc6-dev dkms linux-headers-"$(uname -r)" + elif [ -f "/usr/bin/zypper" ]; then + zypper -n rm -u kernel-default-devel gcc make + fi + + echo "removing leftover logs" + rm -rf /var/log/vboxadd* + ;; + esac +else + echo "Skipping Virtualbox guest additions installation on aarch64 architecture for opensuse and derivatives" +fi From 4c00a1694430ded1d570b3185872f1ef5b39bac9 Mon Sep 17 00:00:00 2001 From: Seth Grover <13872653+mmguero@users.noreply.github.com> Date: Thu, 13 Feb 2025 14:31:28 -0700 Subject: [PATCH 1570/1622] Bump Debian version from 12.8 to 12.9, released 2025-01-11 (#1598) Signed-off-by: Seth Grover <seth.d.grover@gmail.com> --- os_pkrvars/debian/debian-12-aarch64.pkrvars.hcl | 6 +++--- os_pkrvars/debian/debian-12-x86_64.pkrvars.hcl | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/os_pkrvars/debian/debian-12-aarch64.pkrvars.hcl b/os_pkrvars/debian/debian-12-aarch64.pkrvars.hcl index f4e578c47..3facc62d3 100644 --- a/os_pkrvars/debian/debian-12-aarch64.pkrvars.hcl +++ b/os_pkrvars/debian/debian-12-aarch64.pkrvars.hcl @@ -1,8 +1,8 @@ os_name = "debian" -os_version = "12.8" +os_version = "12.9" os_arch = "aarch64" -iso_url = "https://cdimage.debian.org/cdimage/release/12.8.0/arm64/iso-dvd/debian-12.8.0-arm64-DVD-1.iso" -iso_checksum = "file:https://cdimage.debian.org/cdimage/release/12.8.0/arm64/iso-dvd/SHA256SUMS" +iso_url = "https://cdimage.debian.org/cdimage/release/12.9.0/arm64/iso-dvd/debian-12.9.0-arm64-DVD-1.iso" +iso_checksum = "file:https://cdimage.debian.org/cdimage/release/12.9.0/arm64/iso-dvd/SHA256SUMS" parallels_guest_os_type = "debian" vbox_guest_os_type = "Debian_64" vmware_guest_os_type = "arm-debian12-64" diff --git a/os_pkrvars/debian/debian-12-x86_64.pkrvars.hcl b/os_pkrvars/debian/debian-12-x86_64.pkrvars.hcl index ba34b7474..70327d98a 100644 --- a/os_pkrvars/debian/debian-12-x86_64.pkrvars.hcl +++ b/os_pkrvars/debian/debian-12-x86_64.pkrvars.hcl @@ -1,8 +1,8 @@ os_name = "debian" -os_version = "12.8" +os_version = "12.9" os_arch = "x86_64" -iso_url = "https://cdimage.debian.org/cdimage/release/12.8.0/amd64/iso-dvd/debian-12.8.0-amd64-DVD-1.iso" -iso_checksum = "file:https://cdimage.debian.org/cdimage/release/12.8.0/amd64/iso-dvd/SHA256SUMS" +iso_url = "https://cdimage.debian.org/cdimage/release/12.9.0/amd64/iso-dvd/debian-12.9.0-amd64-DVD-1.iso" +iso_checksum = "file:https://cdimage.debian.org/cdimage/release/12.9.0/amd64/iso-dvd/SHA256SUMS" parallels_guest_os_type = "debian" vbox_guest_os_type = "Debian_64" vmware_guest_os_type = "debian-64" From a3aa132868d20d8a4399f44d3ab43d4815dc280c Mon Sep 17 00:00:00 2001 From: Corey Hemminger <hemminger@hotmail.com> Date: Fri, 21 Feb 2025 16:57:21 -0600 Subject: [PATCH 1571/1622] latest OS version updates (#1596) - Removed amazonlinux 2 builds - Removed Ubuntu 20.04 builds - Removed OpenSUSE Leap 12 builds - Removed SLES 12 builds - Removed Ubuntu 24.10 builds - Added CentOS Stream 10 builds - Added SLES 15 Aarch64 template - Added Windows 2025 template - Update almalinux 8 to 8.10 - Update rockylinux 8 to 8.10 - Update oraclelinux 8 to 8.10 - Update rhel 8 to 8.10 - Update almalinux 9 to 9.5 - Update rockylinux 9 to 9.5 - Update oraclelinux 9 to 9.5 - Update rhel 9 to 9.5 - Update freebsd 14 to 14.2 - Update debian 11 to 11.11 - Update debian 12 to 12.9 - Update MacOS 14 to 14.6.1 - Update OpenSUSE Leap 15 to 15.6 - Update SLES 15 to 15.6 - Add MacOS 15 at 15.3.1 - Remove ask from --on-error flag options(it did nothing) - Switched most iso urls to boot images to shrink disk usage space and speed up downloads - Removed RHEL 7 ks.cfg file - Added RHEL 10 ks.cfg file - Fix Vbox 7.1.6+ VBoxManage and hardware config for Aarch64 builds - Consolidated and updated few post processing scripts to clean up code - Added Packer variable for iso_target_path to default iso downloads to the local builds/iso directory --------- Signed-off-by: Corey Hemminger <hemminger@hotmail.com> --- .github/workflows/ci-build.yml | 4 + .../workflows/pkr-bld-amazonlinux-arm64.yml | 63 ++++ .github/workflows/pkr-bld-amazonlinux-x64.yml | 6 +- .github/workflows/pkr-bld-hyperv-x64.yml | 5 +- .github/workflows/pkr-bld-parallels-arm64.yml | 7 +- .github/workflows/pkr-bld-parallels-x64.yml | 7 +- .github/workflows/pkr-bld-qemu-arm64.yml | 7 +- .github/workflows/pkr-bld-qemu-x64.yml | 7 +- .../workflows/pkr-bld-virtualbox-arm64.yml | 7 +- .github/workflows/pkr-bld-virtualbox-x64.yml | 9 +- .github/workflows/pkr-bld-vmware-arm64.yml | 40 ++- .github/workflows/pkr-bld-vmware-x64.yml | 127 +------ .github/workflows/test-pkr-bld-parallels.yml | 5 +- CHANGELOG.md | 65 +++- README.md | 17 +- amazonlinux-2-x86_64-virtualbox-build.sh | 77 ---- amazonlinux-2023-aarch64-virtualbox-build.sh | 29 +- amazonlinux-2023-x86_64-virtualbox-build.sh | 2 +- builds.yml | 5 +- lib/bento/cli.rb | 2 +- lib/bento/version.rb | 2 +- .../almalinux/almalinux-8-aarch64.pkrvars.hcl | 8 +- .../almalinux/almalinux-8-x86_64.pkrvars.hcl | 4 +- .../almalinux/almalinux-9-aarch64.pkrvars.hcl | 6 +- .../almalinux/almalinux-9-x86_64.pkrvars.hcl | 4 +- .../amazonlinux-2-aarch64.pkrvars.hcl | 11 - .../amazonlinux-2-x86_64.pkrvars.hcl | 11 - .../amazonlinux-2023-aarch64.pkrvars.hcl | 12 +- .../centos-stream-10-aarch64.pkrvars.hcl | 9 + .../centos-stream-10-x86_64.pkrvars.hcl | 9 + .../centos-stream-9-aarch64.pkrvars.hcl | 8 +- .../centos/centos-stream-9-x86_64.pkrvars.hcl | 6 +- .../debian/debian-11-aarch64.pkrvars.hcl | 8 +- .../debian/debian-11-x86_64.pkrvars.hcl | 8 +- .../debian/debian-12-aarch64.pkrvars.hcl | 9 +- .../debian/debian-12-x86_64.pkrvars.hcl | 6 +- .../fedora/fedora-40-aarch64.pkrvars.hcl | 6 +- .../fedora/fedora-40-x86_64.pkrvars.hcl | 4 +- .../fedora/fedora-41-aarch64.pkrvars.hcl | 9 +- .../fedora/fedora-41-x86_64.pkrvars.hcl | 6 +- .../freebsd/freebsd-13-aarch64.pkrvars.hcl | 5 +- .../freebsd/freebsd-13-x86_64.pkrvars.hcl | 3 +- .../freebsd/freebsd-14-aarch64.pkrvars.hcl | 5 +- .../freebsd/freebsd-14-x86_64.pkrvars.hcl | 3 +- os_pkrvars/macos/macos-14-aarch64.pkrvars.hcl | 6 +- os_pkrvars/macos/macos-15-aarch64.pkrvars.hcl | 73 ++++ .../opensuse-leap-15-aarch64.pkrvars.hcl | 19 +- .../opensuse-leap-15-x86_64.pkrvars.hcl | 4 +- .../oraclelinux-8-aarch64.pkrvars.hcl | 7 +- .../oraclelinux-8-x86_64.pkrvars.hcl | 6 +- .../oraclelinux-9-aarch64.pkrvars.hcl | 10 +- .../oraclelinux-9-x86_64.pkrvars.hcl | 10 +- os_pkrvars/rhel/rhel-8-aarch64.pkrvars.hcl | 4 +- os_pkrvars/rhel/rhel-9-aarch64.pkrvars.hcl | 4 +- os_pkrvars/rhel/rhel-9-x86_64.pkrvars.hcl | 2 +- .../rockylinux-8-aarch64.pkrvars.hcl | 8 +- .../rockylinux-8-x86_64.pkrvars.hcl | 6 +- .../rockylinux-9-aarch64.pkrvars.hcl | 6 +- .../rockylinux-9-x86_64.pkrvars.hcl | 6 +- os_pkrvars/sles/sles-12-x86_64.pkrvars.hcl | 9 - os_pkrvars/sles/sles-15-aarch64.pkrvars.hcl | 9 + os_pkrvars/sles/sles-15-x86_64.pkrvars.hcl | 6 +- .../ubuntu/ubuntu-20.04-aarch64.pkrvars.hcl | 9 - .../ubuntu/ubuntu-20.04-x86_64.pkrvars.hcl | 9 - .../ubuntu/ubuntu-22.04-aarch64.pkrvars.hcl | 2 +- .../ubuntu/ubuntu-24.04-aarch64.pkrvars.hcl | 4 +- .../ubuntu/ubuntu-24.04-x86_64.pkrvars.hcl | 2 +- .../ubuntu/ubuntu-24.10-aarch64.pkrvars.hcl | 9 - .../ubuntu/ubuntu-24.10-x86_64.pkrvars.hcl | 9 - .../windows/windows-2022-x86_64.pkrvars.hcl | 2 +- .../windows/windows-2025-x86_64.pkrvars.hcl | 9 + packer_templates/http/freebsd/installerconfig | 6 + .../http/opensuse/autoinst-uefi.xml | 148 ++++---- packer_templates/http/opensuse/autoinst.xml | 22 +- packer_templates/http/rhel/10ks.cfg | 57 +++ packer_templates/http/rhel/7ks.cfg | 77 ---- packer_templates/http/rhel/8ks.cfg | 31 +- packer_templates/http/rhel/9ks.cfg | 23 +- packer_templates/pkr-builder.pkr.hcl | 57 ++- packer_templates/pkr-sources.pkr.hcl | 97 +++-- packer_templates/pkr-variables.pkr.hcl | 66 ++-- .../scripts/_common/parallels-rhel.sh | 47 --- packer_templates/scripts/_common/parallels.sh | 69 ++-- packer_templates/scripts/_common/vagrant.sh | 26 +- .../scripts/_common/virtualbox.sh | 116 +++--- packer_templates/scripts/_common/vmware.sh | 38 ++ .../scripts/_common/vmware_debian_ubuntu.sh | 24 -- .../scripts/_common/vmware_fedora.sh | 9 - .../scripts/_common/vmware_rhel.sh | 20 -- .../scripts/_common/vmware_suse.sh | 10 - .../scripts/fedora/cleanup_dnf.sh | 5 +- .../scripts/freebsd/vmtools_freebsd.sh | 62 ++-- packer_templates/scripts/rhel/cleanup_yum.sh | 66 ---- .../scripts/rhel/networking_rhel7.sh | 15 - packer_templates/scripts/rhel/update_yum.sh | 5 - .../win_answer_files/2025/Autounattend.xml | 312 ++++++++++++++++ .../2025/hyperv-gen2/Autounattend.xml | 332 ++++++++++++++++++ 97 files changed, 1588 insertions(+), 1055 deletions(-) create mode 100644 .github/workflows/pkr-bld-amazonlinux-arm64.yml delete mode 100755 amazonlinux-2-x86_64-virtualbox-build.sh delete mode 100644 os_pkrvars/amazonlinux/amazonlinux-2-aarch64.pkrvars.hcl delete mode 100644 os_pkrvars/amazonlinux/amazonlinux-2-x86_64.pkrvars.hcl create mode 100644 os_pkrvars/centos/centos-stream-10-aarch64.pkrvars.hcl create mode 100644 os_pkrvars/centos/centos-stream-10-x86_64.pkrvars.hcl create mode 100644 os_pkrvars/macos/macos-15-aarch64.pkrvars.hcl delete mode 100644 os_pkrvars/sles/sles-12-x86_64.pkrvars.hcl create mode 100644 os_pkrvars/sles/sles-15-aarch64.pkrvars.hcl delete mode 100644 os_pkrvars/ubuntu/ubuntu-20.04-aarch64.pkrvars.hcl delete mode 100644 os_pkrvars/ubuntu/ubuntu-20.04-x86_64.pkrvars.hcl delete mode 100644 os_pkrvars/ubuntu/ubuntu-24.10-aarch64.pkrvars.hcl delete mode 100644 os_pkrvars/ubuntu/ubuntu-24.10-x86_64.pkrvars.hcl create mode 100644 os_pkrvars/windows/windows-2025-x86_64.pkrvars.hcl create mode 100644 packer_templates/http/rhel/10ks.cfg delete mode 100644 packer_templates/http/rhel/7ks.cfg delete mode 100644 packer_templates/scripts/_common/parallels-rhel.sh create mode 100644 packer_templates/scripts/_common/vmware.sh delete mode 100644 packer_templates/scripts/_common/vmware_debian_ubuntu.sh delete mode 100644 packer_templates/scripts/_common/vmware_fedora.sh delete mode 100644 packer_templates/scripts/_common/vmware_rhel.sh delete mode 100644 packer_templates/scripts/_common/vmware_suse.sh delete mode 100644 packer_templates/scripts/rhel/cleanup_yum.sh delete mode 100644 packer_templates/scripts/rhel/networking_rhel7.sh delete mode 100644 packer_templates/scripts/rhel/update_yum.sh create mode 100644 packer_templates/win_answer_files/2025/Autounattend.xml create mode 100644 packer_templates/win_answer_files/2025/hyperv-gen2/Autounattend.xml diff --git a/.github/workflows/ci-build.yml b/.github/workflows/ci-build.yml index 783a4d1ed..af0bddd90 100644 --- a/.github/workflows/ci-build.yml +++ b/.github/workflows/ci-build.yml @@ -37,6 +37,10 @@ jobs: uses: chef/github-workflows/.github/workflows/packer-lint.yml@main secrets: inherit + pkr-bld-amazonlinux-arm64: + uses: ./.github/workflows/pkr-bld-amazonlinux-arm64.yml + secrets: inherit + pkr-bld-amazonlinux-x64: uses: ./.github/workflows/pkr-bld-amazonlinux-x64.yml secrets: inherit diff --git a/.github/workflows/pkr-bld-amazonlinux-arm64.yml b/.github/workflows/pkr-bld-amazonlinux-arm64.yml new file mode 100644 index 000000000..67b91cb0e --- /dev/null +++ b/.github/workflows/pkr-bld-amazonlinux-arm64.yml @@ -0,0 +1,63 @@ +--- +on: + workflow_call: + +env: + PACKER_GITHUB_API_TOKEN: "${{ secrets.GITHUB_TOKEN }}" + # PACKER_LOG: "1" + +jobs: + aarch64: + runs-on: macos-latest + strategy: + fail-fast: false + matrix: + os: + - amazonlinux-2023 + steps: + - name: Checkout + uses: actions/checkout@main + - name: Install Vagrant Virtualbox + run: | + brew tap hashicorp/tap + brew update + brew install qemu + brew install --cask hashicorp/tap/hashicorp-vagrant + brew install --cask virtualbox@beta + - name: Install Chef + uses: actionshub/chef-install@3.0.0 + with: + version: 24.2.1058 + - name: Setup Packer + uses: hashicorp/setup-packer@main + with: + version: latest + - name: Checkout + uses: actions/checkout@main + - name: Install Bento + run: | + eval "$(chef shell-init bash)" + gem build bento.gemspec + gem install bento-*.gem + - name: Bento build + run: | + eval "$(chef shell-init bash)" + export LOGNAME=$USER + ./${{ matrix.os }}-aarch64-virtualbox-build.sh + ls -alh builds + cat builds/${{ matrix.os }}*-x86_64._metadata.json + - name: Upload build artifact + uses: actions/upload-artifact@v4 + with: + name: "${{ matrix.os }}-virtualbox-x86_64" + path: | + builds/*.box + builds/*.json + overwrite: true + retention-days: 10 + compression-level: 0 # no compression + - name: Bento Test + run: | + eval "$(chef shell-init bash)" + export LOGNAME=$USER + bento test diff --git a/.github/workflows/pkr-bld-amazonlinux-x64.yml b/.github/workflows/pkr-bld-amazonlinux-x64.yml index 111cbeb33..33e1bad27 100644 --- a/.github/workflows/pkr-bld-amazonlinux-x64.yml +++ b/.github/workflows/pkr-bld-amazonlinux-x64.yml @@ -13,7 +13,6 @@ jobs: fail-fast: false matrix: os: - - amazonlinux-2 - amazonlinux-2023 steps: - name: Install Vagrant and VirtualBox @@ -23,7 +22,7 @@ jobs: echo "deb [signed-by=/usr/share/keyrings/hashicorp-archive-keyring.gpg] https://apt.releases.hashicorp.com $(lsb_release -cs) main" | sudo tee /etc/apt/sources.list.d/hashicorp.list echo "deb [signed-by=/usr/share/keyrings/oracle-virtualbox-2016.gpg] https://download.virtualbox.org/virtualbox/debian $(lsb_release -cs) contrib" | sudo tee /etc/apt/sources.list.d/virtualbox.list sudo apt-get update - sudo apt-get install -y software-properties-common vagrant virtualbox-7.0 qemu-utils genisoimage + sudo apt-get install -y software-properties-common vagrant virtualbox-7.1 qemu-utils genisoimage VBoxManage --version vagrant --version - name: Install Chef @@ -53,12 +52,13 @@ jobs: ls -alh builds cat builds/${{ matrix.os }}*-x86_64._metadata.json - name: Upload build artifact - uses: actions/upload-artifact@main + uses: actions/upload-artifact@v4 with: name: "${{ matrix.os }}-virtualbox-x86_64" path: | builds/*.box builds/*.json + overwrite: true retention-days: 10 compression-level: 0 # no compression - name: Bento Test diff --git a/.github/workflows/pkr-bld-hyperv-x64.yml b/.github/workflows/pkr-bld-hyperv-x64.yml index 1cca3ee5e..016feb26a 100644 --- a/.github/workflows/pkr-bld-hyperv-x64.yml +++ b/.github/workflows/pkr-bld-hyperv-x64.yml @@ -16,6 +16,7 @@ jobs: - almalinux-8 - almalinux-9 - centos-stream-9 + - centos-stream-10 - debian-11 - debian-12 - fedora-40 @@ -27,7 +28,6 @@ jobs: - oraclelinux-9 - rockylinux-8 - rockylinux-9 - - ubuntu-20.04 - ubuntu-22.04 - ubuntu-24.04 provider: @@ -59,12 +59,13 @@ jobs: - name: Packer build run: packer build -timestamp-ui -only="${{ matrix.provider }}.vm" -var 'sources_enabled=["hyperv-iso.vm"]' -var-file="os_pkrvars/$("${{ matrix.os }}".Split('-')[0])/${{ matrix.os }}-x86_64.pkrvars.hcl" packer_templates - name: Upload build artifact - uses: actions/upload-artifact@main + uses: actions/upload-artifact@v4 with: name: "${{ matrix.os }}-hyperv-x86_64" path: | builds/*.box builds/*.json + overwrite: true retention-days: 10 compression-level: 0 # no compression - name: Bento Test diff --git a/.github/workflows/pkr-bld-parallels-arm64.yml b/.github/workflows/pkr-bld-parallels-arm64.yml index 5b1d6b0e9..fb443b9cb 100644 --- a/.github/workflows/pkr-bld-parallels-arm64.yml +++ b/.github/workflows/pkr-bld-parallels-arm64.yml @@ -16,6 +16,7 @@ jobs: - almalinux-8 - almalinux-9 - centos-stream-9 + - centos-stream-10 - debian-11 - debian-12 - fedora-40 @@ -27,7 +28,6 @@ jobs: - oraclelinux-9 - rockylinux-8 - rockylinux-9 - - ubuntu-20.04 - ubuntu-22.04 - ubuntu-24.04 provider: @@ -43,7 +43,7 @@ jobs: - name: Bento build run: | eval "$(chef shell-init bash)" - bento build -o ${{ matrix.provider }}.vm os_pkrvars/$(echo ${{ matrix.os }} | cut -d "-" -f 1)/"${{ matrix.os }}-aarch64.pkrvars.hcl" + bento build -o ${{ matrix.provider }}.vm --vars 'ssh_timeout=60m' os_pkrvars/$(echo ${{ matrix.os }} | cut -d "-" -f 1)/"${{ matrix.os }}-aarch64.pkrvars.hcl" ls -alh builds/ cat builds/${{ matrix.os }}*-aarch64._metadata.json - name: Remove VM in case of canceled job @@ -56,12 +56,13 @@ jobs: prlctl delete "$VM" 2> /dev/null sleep 2 - name: Upload build artifact - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: "${{ matrix.os }}-parallels-aarch64" path: | builds/*.box builds/*.json + overwrite: true retention-days: 10 compression-level: 0 # no compression - name: Bento Test diff --git a/.github/workflows/pkr-bld-parallels-x64.yml b/.github/workflows/pkr-bld-parallels-x64.yml index 7d9a387c2..3c1d6f3cb 100644 --- a/.github/workflows/pkr-bld-parallels-x64.yml +++ b/.github/workflows/pkr-bld-parallels-x64.yml @@ -16,6 +16,7 @@ jobs: - almalinux-8 - almalinux-9 - centos-stream-9 + - centos-stream-10 - debian-11 - debian-12 - fedora-40 @@ -27,7 +28,6 @@ jobs: - oraclelinux-9 - rockylinux-8 - rockylinux-9 - - ubuntu-20.04 - ubuntu-22.04 - ubuntu-24.04 provider: @@ -42,7 +42,7 @@ jobs: - name: Bento build run: | eval "$(chef shell-init bash)" - bento build -o ${{ matrix.provider }}.vm os_pkrvars/$(echo ${{ matrix.os }} | cut -d "-" -f 1)/"${{ matrix.os }}-x86_64.pkrvars.hcl" + bento build -o ${{ matrix.provider }}.vm --vars 'ssh_timeout=60m' os_pkrvars/$(echo ${{ matrix.os }} | cut -d "-" -f 1)/"${{ matrix.os }}-x86_64.pkrvars.hcl" ls -alh builds/ cat builds/${{ matrix.os }}*-x86_64._metadata.json - name: Remove VM in case of canceled job @@ -55,12 +55,13 @@ jobs: prlctl delete "$VM" 2> /dev/null sleep 2 - name: Upload build artifact - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: "${{ matrix.os }}-parallels-x86_64" path: | builds/*.box builds/*.json + overwrite: true retention-days: 10 compression-level: 0 # no compression - name: Bento Test diff --git a/.github/workflows/pkr-bld-qemu-arm64.yml b/.github/workflows/pkr-bld-qemu-arm64.yml index a375d2c58..2e881fbaa 100644 --- a/.github/workflows/pkr-bld-qemu-arm64.yml +++ b/.github/workflows/pkr-bld-qemu-arm64.yml @@ -16,6 +16,7 @@ jobs: - almalinux-8 - almalinux-9 - centos-stream-9 + - centos-stream-10 - debian-11 - debian-12 - fedora-40 @@ -27,7 +28,6 @@ jobs: - oraclelinux-9 - rockylinux-8 - rockylinux-9 - - ubuntu-20.04 - ubuntu-22.04 - ubuntu-24.04 provider: @@ -60,16 +60,17 @@ jobs: - name: Bento build run: | eval "$(chef shell-init bash)" - bento build -o ${{ matrix.provider }}.vm --vars "qemu_accelerator=hvf" os_pkrvars/$(echo ${{ matrix.os }} | cut -d "-" -f 1)/"${{ matrix.os }}-aarch64.pkrvars.hcl" + bento build -o ${{ matrix.provider }}.vm --vars 'ssh_timeout=60m' --vars "qemu_accelerator=hvf" os_pkrvars/$(echo ${{ matrix.os }} | cut -d "-" -f 1)/"${{ matrix.os }}-aarch64.pkrvars.hcl" ls -alh builds/ cat builds/${{ matrix.os }}*-aarch64._metadata.json - name: Upload build artifact - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: "${{ matrix.os }}-qemu-aarch64" path: | builds/*.box builds/*.json + overwrite: true retention-days: 10 compression-level: 0 # no compression - name: Bento Test diff --git a/.github/workflows/pkr-bld-qemu-x64.yml b/.github/workflows/pkr-bld-qemu-x64.yml index 405896f7f..48c773f82 100644 --- a/.github/workflows/pkr-bld-qemu-x64.yml +++ b/.github/workflows/pkr-bld-qemu-x64.yml @@ -16,6 +16,7 @@ jobs: - almalinux-8 - almalinux-9 - centos-stream-9 + - centos-stream-10 - debian-11 - debian-12 - fedora-40 @@ -27,7 +28,6 @@ jobs: - oraclelinux-9 - rockylinux-8 - rockylinux-9 - - ubuntu-20.04 - ubuntu-22.04 - ubuntu-24.04 provider: @@ -72,16 +72,17 @@ jobs: sudo chmod -R 777 /mnt/builds sudo ln -s /mnt/builds ./ eval "$(chef shell-init bash)" - bento build -o ${{ matrix.provider }}.vm --vars "qemu_accelerator=kvm" os_pkrvars/$(echo ${{ matrix.os }} | cut -d "-" -f 1)/"${{ matrix.os }}-x86_64.pkrvars.hcl" + bento build -o ${{ matrix.provider }}.vm --vars 'ssh_timeout=60m' --vars "qemu_accelerator=kvm" os_pkrvars/$(echo ${{ matrix.os }} | cut -d "-" -f 1)/"${{ matrix.os }}-x86_64.pkrvars.hcl" ls -alh builds/ cat builds/${{ matrix.os }}*-x86_64._metadata.json - name: Upload build artifact - uses: actions/upload-artifact@main + uses: actions/upload-artifact@v4 with: name: "${{ matrix.os }}-qemu-x86_64" path: | builds/*.box builds/*.json + overwrite: true retention-days: 10 compression-level: 0 # no compression - name: Bento Test diff --git a/.github/workflows/pkr-bld-virtualbox-arm64.yml b/.github/workflows/pkr-bld-virtualbox-arm64.yml index ee5abb123..196d86047 100644 --- a/.github/workflows/pkr-bld-virtualbox-arm64.yml +++ b/.github/workflows/pkr-bld-virtualbox-arm64.yml @@ -16,6 +16,7 @@ jobs: - almalinux-8 - almalinux-9 - centos-stream-9 + - centos-stream-10 - debian-11 - debian-12 - fedora-40 @@ -27,7 +28,6 @@ jobs: - oraclelinux-9 - rockylinux-8 - rockylinux-9 - - ubuntu-20.04 - ubuntu-22.04 - ubuntu-24.04 provider: @@ -57,16 +57,17 @@ jobs: - name: Bento build run: | eval "$(chef shell-init bash)" - bento build -o ${{ matrix.provider }}.vm os_pkrvars/$(echo ${{ matrix.os }} | cut -d "-" -f 1)/"${{ matrix.os }}-aarch64.pkrvars.hcl" + bento build -o ${{ matrix.provider }}.vm --vars 'ssh_timeout=60m' os_pkrvars/$(echo ${{ matrix.os }} | cut -d "-" -f 1)/"${{ matrix.os }}-aarch64.pkrvars.hcl" ls -alh builds/ cat builds/${{ matrix.os }}*-aarch64._metadata.json - name: Upload build artifact - uses: actions/upload-artifact@main + uses: actions/upload-artifact@v4 with: name: "${{ matrix.os }}-virtualbox-aarch64" path: | builds/*.box builds/*.json + overwrite: true retention-days: 10 compression-level: 0 # no compression - name: Bento Test diff --git a/.github/workflows/pkr-bld-virtualbox-x64.yml b/.github/workflows/pkr-bld-virtualbox-x64.yml index 45b86559a..0c6e59c0b 100644 --- a/.github/workflows/pkr-bld-virtualbox-x64.yml +++ b/.github/workflows/pkr-bld-virtualbox-x64.yml @@ -16,6 +16,7 @@ jobs: - almalinux-8 - almalinux-9 - centos-stream-9 + - centos-stream-10 - debian-11 - debian-12 - fedora-40 @@ -27,7 +28,6 @@ jobs: - oraclelinux-9 - rockylinux-8 - rockylinux-9 - - ubuntu-20.04 - ubuntu-22.04 - ubuntu-24.04 provider: @@ -42,7 +42,7 @@ jobs: echo "deb [signed-by=/usr/share/keyrings/hashicorp-archive-keyring.gpg] https://apt.releases.hashicorp.com $(lsb_release -cs) main" | sudo tee /etc/apt/sources.list.d/hashicorp.list echo "deb [signed-by=/usr/share/keyrings/oracle-virtualbox-2016.gpg] https://download.virtualbox.org/virtualbox/debian $(lsb_release -cs) contrib" | sudo tee /etc/apt/sources.list.d/virtualbox.list sudo apt-get update - sudo apt-get install -y software-properties-common vagrant virtualbox-7.0 + sudo apt-get install -y software-properties-common vagrant virtualbox-7.1 - name: Install Chef uses: actionshub/chef-install@3.0.0 with: @@ -64,16 +64,17 @@ jobs: sudo ln -s /mnt/builds ./ eval "$(chef shell-init bash)" export LOGNAME=$USER - bento build -o ${{ matrix.provider }}.vm os_pkrvars/$(echo ${{ matrix.os }} | cut -d "-" -f 1)/"${{ matrix.os }}-x86_64.pkrvars.hcl" + bento build -o ${{ matrix.provider }}.vm --vars 'ssh_timeout=60m' os_pkrvars/$(echo ${{ matrix.os }} | cut -d "-" -f 1)/"${{ matrix.os }}-x86_64.pkrvars.hcl" ls -alh builds/ cat builds/${{ matrix.os }}*-x86_64._metadata.json - name: Upload build artifact - uses: actions/upload-artifact@main + uses: actions/upload-artifact@v4 with: name: "${{ matrix.os }}-virtualbox-x86_64" path: | builds/*.box builds/*.json + overwrite: true retention-days: 10 compression-level: 0 # no compression - name: Bento Test diff --git a/.github/workflows/pkr-bld-vmware-arm64.yml b/.github/workflows/pkr-bld-vmware-arm64.yml index aefd8666e..b69a56b60 100644 --- a/.github/workflows/pkr-bld-vmware-arm64.yml +++ b/.github/workflows/pkr-bld-vmware-arm64.yml @@ -16,6 +16,7 @@ jobs: - almalinux-8 - almalinux-9 - centos-stream-9 + - centos-stream-10 - debian-11 - debian-12 - fedora-40 @@ -27,7 +28,6 @@ jobs: - oraclelinux-9 - rockylinux-8 - rockylinux-9 - - ubuntu-20.04 - ubuntu-22.04 - ubuntu-24.04 provider: @@ -50,13 +50,24 @@ jobs: NAT_MAC_CONF="/Library/Preferences/VMware Fusion/vmnet8/nat.mac" DHCPD_CONFIG=' # Configuration file for ISC 2.0 vmnet-dhcpd operating on vmnet8. - + # + # This file was automatically generated by the VMware configuration program. + # See Instructions below if you want to modify it. + # + # We set domain-name-servers to make some DHCP clients happy + # (dhclient as configured in SuSE, TurboLinux, etc.). + # We also supply a domain name to make pump (Red Hat 6.x) happy. + # ###### VMNET DHCP Configuration. Start of "DO NOT MODIFY SECTION" ##### # Modification Instructions: This section of the configuration file contains # information generated by the configuration program. Do not modify this # section. + # You are free to modify everything else. Also, this section must start + # on a new line + # This file will get backed up with a different name in the same directory + # if this section is edited and you try to configure DHCP again. - # Written at: 05/20/2024 11:50:44 + # Written at: 01/13/2025 14:31:48 allow unknown-clients; default-lease-time 1800; # default is 30 minutes max-lease-time 7200; # default is 2 hours @@ -82,6 +93,7 @@ jobs: ' NAT_CONFIG=" # VMware NAT configuration file + # Manual editing of this file is not recommended. Using UI is preferred. [host] # Use MacOS network virtualization API useMacosVmnetVirtApi = 1 @@ -92,13 +104,16 @@ jobs: device = vmnet8 # Allow PORT/EPRT FTP commands (they need incoming TCP stream ...) activeFTP = 1 - # Allows the source to have any OUI. Turn this on if you change the OUI in the MAC address of your virtual machines. + # Allows the source to have any OUI. Turn this on if you change the OUI + # in the MAC address of your virtual machines. allowAnyOUI = 1 # VMnet host IP address hostIp = 172.16.38.1 - # Controls if (TCP) connections should be reset when the adapter they are bound to goes down + # Controls if (TCP) connections should be reset when the adapter they are + # bound to goes down resetConnectionOnLinkDown = 1 - # Controls if (TCP) connection should be reset when guest packet's destination is NAT's IP address + # Controls if (TCP) connection should be reset when guest packet's destination + # is NAT's IP address resetConnectionOnDestLocalHost = 1 # Controls if enable nat ipv6 natIp6Enable = 0 @@ -108,7 +123,9 @@ jobs: # Value of timeout in TCP TIME_WAIT state, in seconds timeWaitTimeout = 30 [udp] - # Timeout in seconds. Dynamically-created UDP mappings will purged if idle for this duration of time 0 = no timeout, default = 60; real value might be up to 100% longer + # Timeout in seconds. Dynamically-created UDP mappings will purged if + # idle for this duration of time 0 = no timeout, default = 60; real + # value might be up to 100% longer timeout = 60 [netbios] # Timeout for NBNS queries. @@ -130,13 +147,13 @@ jobs: NETWORKING_CONFIG=" VERSION=1,0 answer VNET_1_DHCP yes - answer VNET_1_DHCP_CFG_HASH 97D56988968565698E051056ADEDEEACF00F5981 + answer VNET_1_DHCP_CFG_HASH 5F120565E3B0B0AC342F79EC042F0F4799B6D26A answer VNET_1_HOSTONLY_NETMASK 255.255.255.0 answer VNET_1_HOSTONLY_SUBNET 172.16.252.0 answer VNET_1_HOSTONLY_UUID 74A7B7F5-AB8E-41CF-9E0F-595F9C9FA1C5 answer VNET_1_VIRTUAL_ADAPTER yes answer VNET_8_DHCP yes - answer VNET_8_DHCP_CFG_HASH 2040265D0F7053A921FB3F6EDE944490D9E687D6 + answer VNET_8_DHCP_CFG_HASH 927D275B6D70F56E200F5FF00ABA5D2EB7DF2F82 answer VNET_8_HOSTONLY_NETMASK 255.255.255.0 answer VNET_8_HOSTONLY_SUBNET 172.16.38.0 answer VNET_8_HOSTONLY_UUID 3CBAC6B3-6A71-4182-8BC6-849058A947B8 @@ -165,16 +182,17 @@ jobs: - name: Bento build run: | eval "$(chef shell-init bash)" - bento build -o ${{ matrix.provider }}.vm os_pkrvars/$(echo ${{ matrix.os }} | cut -d "-" -f 1)/"${{ matrix.os }}-aarch64.pkrvars.hcl" + bento build -o ${{ matrix.provider }}.vm --vars 'ssh_timeout=60m' os_pkrvars/$(echo ${{ matrix.os }} | cut -d "-" -f 1)/"${{ matrix.os }}-aarch64.pkrvars.hcl" ls -alh builds/ cat builds/${{ matrix.os }}*-aarch64._metadata.json - name: Upload build artifact - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: "${{ matrix.os }}-vmware-aarch64" path: | builds/*.box builds/*.json + overwrite: true retention-days: 10 compression-level: 0 # no compression - name: Bento Test diff --git a/.github/workflows/pkr-bld-vmware-x64.yml b/.github/workflows/pkr-bld-vmware-x64.yml index 3fe5ef48f..0463fda2b 100644 --- a/.github/workflows/pkr-bld-vmware-x64.yml +++ b/.github/workflows/pkr-bld-vmware-x64.yml @@ -8,7 +8,7 @@ env: jobs: x86_64: - runs-on: macos-13 + runs-on: ubuntu-latest strategy: fail-fast: false matrix: @@ -16,6 +16,7 @@ jobs: - almalinux-8 - almalinux-9 - centos-stream-9 + - centos-stream-10 - debian-11 - debian-12 - fedora-40 @@ -27,7 +28,6 @@ jobs: - oraclelinux-9 - rockylinux-8 - rockylinux-9 - - ubuntu-20.04 - ubuntu-22.04 - ubuntu-24.04 provider: @@ -37,118 +37,14 @@ jobs: uses: actions/checkout@main - name: Install Vagrant VMware-fusion run: | - brew tap hashicorp/tap - brew update - brew install --cask hashicorp/tap/hashicorp-vagrant - brew install --cask vmware-fusion - brew install --cask vagrant-vmware-utility + curl https://softwareupdate.vmware.com/cds/vmw-desktop/ws/17.6.2/24409262/linux/core/VMware-Workstation-17.6.2-24409262.x86_64.bundle.tar -o VMware-Workstation-17.6.2-24409262.x86_64.bundle.tar + tar -xvf VMware-Workstation-17.6.2-24409262.x86_64.bundle.tar + chmod +x VMware-Workstation-17.6.2-24409262.x86_64.bundle + sudo ./VMware-Workstation-17.6.2-24409262.x86_64.bundle --console --required + wget -O - https://apt.releases.hashicorp.com/gpg | sudo gpg --dearmor -o /usr/share/keyrings/hashicorp-archive-keyring.gpg + echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/hashicorp-archive-keyring.gpg] https://apt.releases.hashicorp.com $(lsb_release -cs) main" | sudo tee /etc/apt/sources.list.d/hashicorp.list + sudo apt update && sudo apt install vagrant vagrant plugin install vagrant-vmware-desktop - sudo mkdir -p /Library/Preferences/VMware\ Fusion/vmnet8 - NETWORKING_CONF="/Library/Preferences/VMware Fusion/networking" - DHCPD_CONF="/Library/Preferences/VMware Fusion/vmnet8/dhcpd.conf" - NAT_CONF="/Library/Preferences/VMware Fusion/vmnet8/nat.conf" - NAT_MAC_CONF="/Library/Preferences/VMware Fusion/vmnet8/nat.mac" - DHCPD_CONFIG=' - # Configuration file for ISC 2.0 vmnet-dhcpd operating on vmnet8. - - ###### VMNET DHCP Configuration. Start of "DO NOT MODIFY SECTION" ##### - # Modification Instructions: This section of the configuration file contains - # information generated by the configuration program. Do not modify this - # section. - - # Written at: 05/20/2024 11:50:44 - allow unknown-clients; - default-lease-time 1800; # default is 30 minutes - max-lease-time 7200; # default is 2 hours - - subnet 172.16.38.0 netmask 255.255.255.0 { - range 172.16.38.128 172.16.38.254; - option broadcast-address 172.16.38.255; - option domain-name-servers 172.16.38.2; - option domain-name localdomain; - default-lease-time 1800; # default is 30 minutes - max-lease-time 7200; # default is 2 hours - option netbios-name-servers 172.16.38.2; - option routers 172.16.38.2; - } - host vmnet8 { - hardware ethernet 00:50:56:C0:00:08; - fixed-address 172.16.38.1; - option domain-name-servers 0.0.0.0; - option domain-name ""; - option routers 0.0.0.0; - } - ####### VMNET DHCP Configuration. End of "DO NOT MODIFY SECTION" ####### - ' - NAT_CONFIG=" - # VMware NAT configuration file - [host] - # Use MacOS network virtualization API - useMacosVmnetVirtApi = 1 - # NAT gateway address - ip = 172.16.38.2 - netmask = 255.255.255.0 - # VMnet device if not specified on command line - device = vmnet8 - # Allow PORT/EPRT FTP commands (they need incoming TCP stream ...) - activeFTP = 1 - # Allows the source to have any OUI. Turn this on if you change the OUI in the MAC address of your virtual machines. - allowAnyOUI = 1 - # VMnet host IP address - hostIp = 172.16.38.1 - # Controls if (TCP) connections should be reset when the adapter they are bound to goes down - resetConnectionOnLinkDown = 1 - # Controls if (TCP) connection should be reset when guest packet's destination is NAT's IP address - resetConnectionOnDestLocalHost = 1 - # Controls if enable nat ipv6 - natIp6Enable = 0 - # Controls if enable nat ipv6 - natIp6Prefix = fd15:4ba5:5a2b:1008::/64 - [tcp] - # Value of timeout in TCP TIME_WAIT state, in seconds - timeWaitTimeout = 30 - [udp] - # Timeout in seconds. Dynamically-created UDP mappings will purged if idle for this duration of time 0 = no timeout, default = 60; real value might be up to 100% longer - timeout = 60 - [netbios] - # Timeout for NBNS queries. - nbnsTimeout = 2 - # Number of retries for each NBNS query. - nbnsRetries = 3 - # Timeout for NBDS queries. - nbdsTimeout = 3 - [incomingtcp] - # Use these with care - anyone can enter into your VM through these... - # The format and example are as follows: - #<external port number> = <VM's IP address>:<VM's port number> - #8080 = 172.16.3.128:80 - [incomingudp] - # UDP port forwarding example - #6000 = 172.16.3.0:6001 - " - NAT_MAC_CONFIG="00:50:56:F2:C7:28" - NETWORKING_CONFIG=" - VERSION=1,0 - answer VNET_1_DHCP yes - answer VNET_1_DHCP_CFG_HASH 97D56988968565698E051056ADEDEEACF00F5981 - answer VNET_1_HOSTONLY_NETMASK 255.255.255.0 - answer VNET_1_HOSTONLY_SUBNET 172.16.252.0 - answer VNET_1_HOSTONLY_UUID 74A7B7F5-AB8E-41CF-9E0F-595F9C9FA1C5 - answer VNET_1_VIRTUAL_ADAPTER yes - answer VNET_8_DHCP yes - answer VNET_8_DHCP_CFG_HASH 2040265D0F7053A921FB3F6EDE944490D9E687D6 - answer VNET_8_HOSTONLY_NETMASK 255.255.255.0 - answer VNET_8_HOSTONLY_SUBNET 172.16.38.0 - answer VNET_8_HOSTONLY_UUID 3CBAC6B3-6A71-4182-8BC6-849058A947B8 - answer VNET_8_NAT yes - answer VNET_8_VIRTUAL_ADAPTER yes - " - # Write the network configuration to the file - echo "$NETWORKING_CONFIG" | sudo tee "$NETWORKING_CONF" > /dev/null - echo "$DHCPD_CONFIG" | sudo tee "$DHCPD_CONF" > /dev/null - echo "$NAT_CONFIG" | sudo tee "$NAT_CONF" > /dev/null - echo "$NAT_MAC_CONFIG" | sudo tee "$NAT_MAC_CONF" > /dev/null - echo "VMware Fusion networking configuration updated." - name: Install Chef uses: actionshub/chef-install@3.0.0 with: @@ -165,16 +61,17 @@ jobs: - name: Bento build run: | eval "$(chef shell-init bash)" - bento build -o ${{ matrix.provider }}.vm os_pkrvars/$(echo ${{ matrix.os }} | cut -d "-" -f 1)/"${{ matrix.os }}-x86_64.pkrvars.hcl" + bento build -o ${{ matrix.provider }}.vm --vars 'ssh_timeout=60m' os_pkrvars/$(echo ${{ matrix.os }} | cut -d "-" -f 1)/"${{ matrix.os }}-x86_64.pkrvars.hcl" ls -alh builds/ cat builds/${{ matrix.os }}*-x86_64._metadata.json - name: Upload build artifact - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: "${{ matrix.os }}-vmware-x86_64" path: | builds/*.box builds/*.json + overwrite: true retention-days: 10 compression-level: 0 # no compression - name: Bento Test diff --git a/.github/workflows/test-pkr-bld-parallels.yml b/.github/workflows/test-pkr-bld-parallels.yml index 3a8b9e421..cdc09f589 100644 --- a/.github/workflows/test-pkr-bld-parallels.yml +++ b/.github/workflows/test-pkr-bld-parallels.yml @@ -127,16 +127,17 @@ jobs: - name: Bento build run: | eval "$(chef shell-init bash)" - bento build -o ${{ matrix.provider }}.vm os_pkrvars/$(echo ${{ matrix.os }} | cut -d "-" -f 1)/"${{ matrix.os }}-aarch64.pkrvars.hcl" + bento build -o ${{ matrix.provider }}.vm --vars 'ssh_timeout=60m' os_pkrvars/$(echo ${{ matrix.os }} | cut -d "-" -f 1)/"${{ matrix.os }}-aarch64.pkrvars.hcl" ls -alh builds/ cat builds/${{ matrix.os }}*-aarch64._metadata.json - name: Upload build artifact - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: "${{ matrix.os }}-parallels-aarch64" path: | builds/*.box builds/*.json + overwrite: true retention-days: 10 compression-level: 0 # no compression - name: Bento Test diff --git a/CHANGELOG.md b/CHANGELOG.md index 830e5088d..2c0dd5747 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,38 +5,40 @@ *__Note:__ Markdown table generated at <https://www.tablesgenerator.com/markdown_tables#> + | os | hyperv<br>x86_64 | parallels<br>x86_64 | parallels<br>aarch64 | qemu<br>x86_64 | qemu<br>aarch64 | virtualbox<br>x86_64 | virtualbox<br>aarch64 | vmware<br>x86_64 | vmware<br>aarch64 | |:---:|:---:|:---:|:---:|:---:|:---:|:---:|:---:|:---:|:---:| -| almalinux-8 | | x | | x | | x | | x | | -| almalinux-9 | | x | x | | | x | | x | x | -| amazonlinux-2 | | | | | | x | | | | +| almalinux-8 | | x | | | | x | | x | | +| almalinux-9 | | x | x | | | x | x | x | x | | amazonlinux-2023 | | | | | | x | | | | -| centos-stream-9 | | x | | | | x | | x | x | -| debian-11 | | x | x | | | x | | x | | +| centos-stream-9 | | x | x | | | x | x | x | x | +| centos-stream-10 | | x | x | | | x | x | x | x | +| debian-11 | | x | x | | | x | | x | x | | debian-12 | | x | x | | | x | | x | x | -| fedora-40 | | x | | x | | x | | x | x | -| fedora-41 | | x | | x | | x | | x | x | -| freebsd-13 | | | | | | x | | x | x | -| freebsd-14 | | | | | | | | | | -| macos | | | x | | | | | | | -| opensuse-leap-15 | | | | x | | x | | x | x | -| oraclelinux-8 | | | | | | x | | x | | -| oraclelinux-9 | | x | x | | | x | | x | x | +| fedora-40 | | x | x | | | x | x | x | x | +| fedora-41 | | x | x | | | x | x | x | x | +| freebsd-13 | | x | x | | | x | x | x | x | +| freebsd-14 | | x | x | | | x | x | x | x | +| macos-14 | | | x | | | | | | | +| macos-15 | | | | | | | | | | +| opensuse-leap-15 | | x | x | | | x | x | x | x | +| oraclelinux-8 | | x | | | | x | | x | | +| oraclelinux-9 | | x | x | | | x | x | x | x | | rhel-8 | license<br>needed | license<br>needed | license<br>needed | license<br>needed | license<br>needed | license<br>needed | license<br>needed | license<br>needed | license<br>needed | | rhel-9 | license<br>needed | license<br>needed | license<br>needed | license<br>needed | license<br>needed | license<br>needed | license<br>needed | license<br>needed | license<br>needed | -| rockylinux-8 | | x | | x | | x | | x | | -| rockylinux-9 | | x | | | | x | | x | x | +| rockylinux-8 | | x | | | | x | | x | | +| rockylinux-9 | | x | x | | | x | x | x | x | | sles-12 | license<br>needed | license<br>needed | na | license<br>needed | na | license<br>needed | na | license<br>needed | na | | sles-15 | license<br>needed | license<br>needed | na | license<br>needed | na | license<br>needed | na | license<br>needed | na | | solaris-11 | license<br>needed | license<br>needed | na | license<br>needed | na | license<br>needed | na | license<br>needed | na | -| ubuntu-20.04 | | | x | | | x | | x | x | -| ubuntu-22.04 | | x | | | | x | | | | -| ubuntu-24.04 | | x | x | x | | x | | x | x | +| ubuntu-22.04 | | x | x | | | x | x | x | x | +| ubuntu-24.04 | | x | x | | | x | x | x | x | | windows-10 | | | na | | na | x | na | | na | | windows-11 | | x | x | | | x | | x | | | windows-2016 | | x | na | | na | x | na | x | na | | windows-2019 | | x | na | | na | x | na | x | na | | windows-2022 | | x | na | | na | x | na | | na | +| windows-2025 | | | na | | na | | na | | na | ### Todo @@ -52,11 +54,36 @@ Markdown table generated at <https://www.tablesgenerator.com/markdown_tables#> ## [unreleased] (2024-05-23) +- Removed amazonlinux 2 builds +- Removed Ubuntu 20.04 builds +- Removed OpenSUSE Leap 12 builds +- Removed SLES 12 builds +- Removed Ubuntu 24.10 builds +- Added CentOS Stream 10 builds +- Added SLES 15 Aarch64 template +- Added Windows 2025 template - Update almalinux 8 to 8.10 - Update rockylinux 8 to 8.10 - Update oraclelinux 8 to 8.10 - Update rhel 8 to 8.10 -- Update freebsd 14 to 14.1 +- Update almalinux 9 to 9.5 +- Update rockylinux 9 to 9.5 +- Update oraclelinux 9 to 9.5 +- Update rhel 9 to 9.5 +- Update freebsd 14 to 14.2 +- Update debian 11 to 11.11 +- Update debian 12 to 12.9 +- Update MacOS 14 to 14.6.1 +- Update OpenSUSE Leap 15 to 15.6 +- Update SLES 15 to 15.6 +- Add MacOS 15 at 15.3.1 +- Remove ask from --on-error flag options(it did nothing) +- Switched most iso urls to boot images to shrink disk usage space and speed up downloads +- Removed RHEL 7 ks.cfg file +- Added RHEL 10 ks.cfg file +- Fix Vbox 7.1.6+ VBoxManage and hardware config for Aarch64 builds +- Consolidated and updated few post processing scripts to clean up code +- Added Packer variable for iso_target_path to default iso downloads to the local builds/iso directory ## [v4.1.2] (2024-05-23) diff --git a/README.md b/README.md index bac27c846..a035e3959 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ Bento is a project that encapsulates [Packer](https://www.packer.io/) templates - Vagrant 2.4.0+ is required for new cpu architecture support - For `bento test` command to work test-kitchen and kitchen-vagrant gems must be installed -- Virutalbox 6.x requires disabling nat config that allows vbox 7.x guests to connect to the host. To use comment out lines #161 and #162 in bento/packer_templates/pkr-variables.pkr.hcl or add variable `vboxmanage = []` to os_pkrvars files. +- Virutalbox 7.1.6+ required for arm64 support - When running packer build command the output directory is relative to the working directory the command is currently running in. Suggest running packer build commands from bento root directory for build working files to be placed in bento/builds/(build_name) directory by default. If the output_directory variable isn't overwritten a directory called builds/(build_name) will be created in the current working directory that you are running the command from ## Using Public Boxes @@ -40,17 +40,15 @@ end - [Packer](https://www.packer.io/) >= 1.7.0 - [Vagrant](https://www.vagrantup.com/) >= 2.4.0 - At least one of the following virtualization providers: - - [VirtualBox](https://www.virtualbox.org/)*2 - - [VMware Fusion](https://www.vmware.com/products/fusion.html)*2 - - [VMware Workstation](https://www.vmware.com/products/workstation-pro.html)*2 - - [Parallels Desktop Pro](https://www.parallels.com/products/desktop/) also requires [Parallels Virtualization SDK](https://www.parallels.com/products/desktop/download/) for versions < 19.x - - [qemu](https://www.qemu.org/) *1 *2 - - [Hyper-V](https://docs.microsoft.com/en-us/virtualization/hyper-v-on-windows/about/) *1 *2 + - [VirtualBox](https://www.virtualbox.org/) + - [VMware Fusion](https://www.vmware.com/products/fusion.html) + - [VMware Workstation](https://www.vmware.com/products/workstation-pro.html) + - [Parallels Desktop Pro](https://www.parallels.com/products/desktop/) + - [qemu](https://www.qemu.org/) *1 + - [Hyper-V](https://docs.microsoft.com/en-us/virtualization/hyper-v-on-windows/about/) *1 *1 **NOTE:** support for these providers is considered experimental and corresponding Vagrant Cloud images may or may not exist. -*2 **NOTE:** AARCH64 or ARM64 support is a work in progress only guaranteed through parallels and vmware provider. - ### Using `bento` executable #### build @@ -66,6 +64,7 @@ Other available options: - cpus - Specify the number of CPUs needed in the new build - mem - Specify the memory - config - Use a configuration file other than default builds.yml +- on-error - Choose what to do if a build fails - vars - Comma seperated list of variable names equal values (ex: boot_wait="2s",ssh_timeout="5s") - var_files - Comma seperated list of pkrvar.hcl files to include in the builds (ex: /path/to/var_file.pkrvars.hcl,/path/to/next/var_file2.pkrvars.hcl) - metadata_only - Only generate the metadata json file diff --git a/amazonlinux-2-x86_64-virtualbox-build.sh b/amazonlinux-2-x86_64-virtualbox-build.sh deleted file mode 100755 index 213346346..000000000 --- a/amazonlinux-2-x86_64-virtualbox-build.sh +++ /dev/null @@ -1,77 +0,0 @@ -#!/usr/bin/env bash - -# Getting script directory location -SCRIPT_RELATIVE_DIR=$(dirname "${BASH_SOURCE[0]}") -cd "$SCRIPT_RELATIVE_DIR" || exit - -# set tmp dir for files -AMZDIR="$(pwd)/builds/build_files/amazonlinux-2-x86_64-virtualbox" -mkdir -p "$AMZDIR" -# Get virtualbox vdi file name with latest version number -IMG="$(wget -q https://cdn.amazonlinux.com/os-images/latest/virtualbox/ -O - | grep ".vdi" | cut -d "\"" -f 2)" - -# Download vbox vdi -echo "Downloading Vbox VDI $IMG" -wget -q -O "$AMZDIR"/amazon2_x86_64.vdi -c https://cdn.amazonlinux.com/os-images/latest/virtualbox/"$IMG" - -if [ ! -f "$AMZDIR"/amazon2_x86_64.vdi ]; then - echo There must be a file named amazon2_x86_64.vdi in "$AMZDIR"! - echo You can download the vdi file at https://cdn.amazonlinux.com/os-images/latest/virtualbox/ - exit 1 -fi - -echo "Cleaning up old files" -rm -f "$AMZDIR"/*.iso "$AMZDIR"/*.ovf "$AMZDIR"/*.vmdk - -echo "Creating ISO" -SEED_ISO_DIR="$(pwd)/packer_templates/http/amazon" -if [ -x "$(command -v genisoimage)" ]; then - genisoimage -output "$AMZDIR"/seed.iso -volid cidata -joliet -rock "$SEED_ISO_DIR"/user-data "$SEED_ISO_DIR"/meta-data -elif [ -x "$(command -v hdiutil)" ]; then - hdiutil makehybrid -o "$AMZDIR"/seed.iso -hfs -joliet -iso -default-volume-name cidata "$SEED_ISO_DIR"/ -elif [ -x "$(command -v mkisofs)" ]; then - mkfsiso9660 -o "$AMZDIR"/seed.iso "$SEED_ISO_DIR"/ -else - echo "No tool found to create the seed.iso" - exit 1 -fi - -VM="AmazonLinuxBento" -echo Powering off and deleting any existing VMs named $VM -VBoxManage controlvm $VM poweroff --type headless 2> /dev/null -VBoxManage unregistervm $VM --delete 2> /dev/null -sleep 5 - -echo "Creating the VM" -# from https://www.perkin.org.uk/posts/create-virtualbox-vm-from-the-command-line.html -VBoxManage createvm --name $VM --ostype "RedHat_64" --register -VBoxManage storagectl $VM --name "SATA Controller" --add sata --controller IntelAHCI -VBoxManage storageattach $VM --storagectl "SATA Controller" --port 0 --type hdd --medium "$AMZDIR"/amazon2_x86_64.vdi -VBoxManage storageattach $VM --storagectl "SATA Controller" --port 1 --type dvddrive --medium "$AMZDIR"/seed.iso -VBoxManage modifyvm $VM --memory 2048 -VBoxManage modifyvm $VM --cpus 2 -VBoxManage modifyvm $VM --audio-driver none -VBoxManage modifyvm $VM --ioapic on -sleep 5 - -echo Sleeping for 120 seconds to let the system boot and cloud-init to run -VBoxManage startvm $VM --type headless -sleep 120 -VBoxManage controlvm $VM poweroff --type headless -VBoxManage storageattach $VM --storagectl "SATA Controller" --port 1 --type dvddrive --medium none -sleep 5 - -echo Exporting the VM to an OVF file -vboxmanage export $VM -o "$AMZDIR"/amazon2_x86_64.ovf -sleep 5 - -echo Deleting the VM -vboxmanage unregistervm $VM --delete - -echo starting packer build of amazonlinux -if bento build --vars vbox_source_path="$AMZDIR"/amazon2_x86_64.ovf,vbox_checksum=null "$(pwd)"/os_pkrvars/amazonlinux/amazonlinux-2-x86_64.pkrvars.hcl; then - echo "Cleaning up files" - rm -rf "$AMZDIR" -else - exit 1 -fi diff --git a/amazonlinux-2023-aarch64-virtualbox-build.sh b/amazonlinux-2023-aarch64-virtualbox-build.sh index 0fcc85a1e..4dafc74ab 100755 --- a/amazonlinux-2023-aarch64-virtualbox-build.sh +++ b/amazonlinux-2023-aarch64-virtualbox-build.sh @@ -47,27 +47,32 @@ sleep 5 echo "Creating the VM" # from https://www.perkin.org.uk/posts/create-virtualbox-vm-from-the-command-line.html -VBoxManage createvm --name $VM --ostype "Fedora_64" --register -VBoxManage storagectl $VM --name "SATA Controller" --add sata --controller IntelAHCI -VBoxManage storageattach $VM --storagectl "SATA Controller" --port 0 --type hdd --medium "$AMZDIR"/amazon2023_arm64.vdi -VBoxManage storageattach $VM --storagectl "SATA Controller" --port 1 --type dvddrive --medium "$AMZDIR"/seed.iso -VBoxManage modifyvm $VM --chipset ich9 +VBoxManage createvm --name $VM --ostype "Fedora_arm64" --register +VBoxManage storagectl $VM --name "VirtioSCSI" --add virtio-scsi --controller VirtIO +VBoxManage storageattach $VM --storagectl "VirtioSCSI" --port 0 --type hdd --medium "$AMZDIR"/amazon2023_arm64.vdi +VBoxManage storageattach $VM --storagectl "VirtioSCSI" --port 1 --type dvddrive --medium "$AMZDIR"/seed.iso +VBoxManage modifyvm $VM --chipset armv8virtual VBoxManage modifyvm $VM --firmware efi -VBoxManage modifyvm $VM --memory 2048 +VBoxManage modifyvm $VM --memory 4096 VBoxManage modifyvm $VM --cpus 2 VBoxManage modifyvm $VM --nat-localhostreachable1 on VBoxManage modifyvm $VM --vram 33 VBoxManage modifyvm $VM --graphicscontroller vmsvga -VBoxManage modifyvm $VM --vrde off -VBoxManage modifyvm $VM --audio-driver none +VBoxManage modifyvm $VM --vrde on +VBoxManage modifyvm $VM --audio-enabled off VBoxManage modifyvm $VM --ioapic on +VBoxManage modifyvm $VM --usb-xhci on +VBoxManage modifyvm $VM --mouse usb +VBoxManage modifyvm $VM --keyboard usb +VBoxManage modifyvm $VM --boot1 disk +VBoxManage modifyvm $VM --boot2 dvd sleep 5 -echo "Sleeping for 120 seconds to let the system boot and cloud-init to run" +echo "Starting $VM then sleeping for 120 seconds to let the system boot and cloud-init to run" VBoxManage startvm $VM --type headless sleep 120 -VBoxManage controlvm $VM poweroff --type headless -VBoxManage storageattach $VM --storagectl "SATA Controller" --port 1 --type dvddrive --medium none +VBoxManage controlvm $VM poweroff +VBoxManage storageattach $VM --storagectl "VirtioSCSI" --port 1 --type dvddrive --medium none sleep 5 echo "Exporting the VM to an OVF file" @@ -78,7 +83,7 @@ echo "Deleting the VM" vboxmanage unregistervm $VM --delete echo "starting packer build of amazonlinux" -if bento build --vars vbox_source_path="$AMZDIR"/amazon2023_arm64.ovf,vbox_checksum=null "$(pwd)"/os_pkrvars/amazonlinux/amazonlinux-2023-aarch64.pkrvars.hcl; then +if bento build --vars 'ssh_timeout=60m' --vars vbox_source_path="$AMZDIR"/amazon2023_arm64.ovf,vbox_checksum=null "$(pwd)"/os_pkrvars/amazonlinux/amazonlinux-2023-aarch64.pkrvars.hcl; then echo "Cleaning up files" rm -rf "$AMZDIR" else diff --git a/amazonlinux-2023-x86_64-virtualbox-build.sh b/amazonlinux-2023-x86_64-virtualbox-build.sh index ae3f612c1..457c11e9c 100755 --- a/amazonlinux-2023-x86_64-virtualbox-build.sh +++ b/amazonlinux-2023-x86_64-virtualbox-build.sh @@ -76,7 +76,7 @@ echo "Deleting the VM" vboxmanage unregistervm $VM --delete echo "starting packer build of amazonlinux" -if bento build --vars vbox_source_path="$AMZDIR"/amazon2023_x86_64.ovf,vbox_checksum=null "$(pwd)"/os_pkrvars/amazonlinux/amazonlinux-2023-x86_64.pkrvars.hcl; then +if bento build --vars 'ssh_timeout=60m' --vars vbox_source_path="$AMZDIR"/amazon2023_x86_64.ovf,vbox_checksum=null "$(pwd)"/os_pkrvars/amazonlinux/amazonlinux-2023-x86_64.pkrvars.hcl; then echo "Cleaning up files" rm -rf "$AMZDIR" else diff --git a/builds.yml b/builds.yml index 44e3afd87..9baf1a2e2 100644 --- a/builds.yml +++ b/builds.yml @@ -6,11 +6,11 @@ default_architectures: - amd64 public: - - amazonlinux-2 - amazonlinux-2023 - almalinux-8 - almalinux-9 - centos-stream-9 + - centos-stream-10 - debian-11 - debian-12 - fedora-40 @@ -22,7 +22,6 @@ public: - oraclelinux-9 - rockylinux-8 - rockylinux-9 - - ubuntu-20.04 - ubuntu-22.04 - ubuntu-24.04 @@ -30,7 +29,6 @@ public: slugs: - almalinux-8 - almalinux-9 - - centos-7 - debian-12 - debian-11 - fedora-latest @@ -42,6 +40,7 @@ slugs: - rockylinux-8 - rockylinux-9 - macos-14 + - macos-15 do_not_build: - amazon diff --git a/lib/bento/cli.rb b/lib/bento/cli.rb index 696dd5c7d..9bac87426 100644 --- a/lib/bento/cli.rb +++ b/lib/bento/cli.rb @@ -85,7 +85,7 @@ def self.parse(args) options.metadata_only = opt end - opts.on('--on-error OPT', '[cleanup|abort|ask|run-cleanup-provisioner] If the build fails do: clean up (default), abort, ask, or run-cleanup-provisioner.') do |opt| + opts.on('--on-error OPT', '[cleanup|abort|run-cleanup-provisioner] If the build fails do: clean up (default), abort, or run-cleanup-provisioner.') do |opt| options.on_error = opt end diff --git a/lib/bento/version.rb b/lib/bento/version.rb index cb7e9b360..c0ee870e3 100644 --- a/lib/bento/version.rb +++ b/lib/bento/version.rb @@ -1,3 +1,3 @@ module Bento - VERSION = '4.1.2'.freeze + VERSION = '4.1.3'.freeze end diff --git a/os_pkrvars/almalinux/almalinux-8-aarch64.pkrvars.hcl b/os_pkrvars/almalinux/almalinux-8-aarch64.pkrvars.hcl index 275c9f6b7..087fd113d 100644 --- a/os_pkrvars/almalinux/almalinux-8-aarch64.pkrvars.hcl +++ b/os_pkrvars/almalinux/almalinux-8-aarch64.pkrvars.hcl @@ -1,9 +1,9 @@ os_name = "almalinux" os_version = "8.10" os_arch = "aarch64" -iso_url = "https://repo.almalinux.org/almalinux/8/isos/aarch64/AlmaLinux-8.10-aarch64-minimal.iso" +iso_url = "https://repo.almalinux.org/almalinux/8/isos/aarch64/AlmaLinux-8.10-aarch64-boot.iso" iso_checksum = "file:https://repo.almalinux.org/almalinux/8/isos/aarch64/CHECKSUM" parallels_guest_os_type = "centos" -vbox_guest_os_type = "RedHat_64" -vmware_guest_os_type = "arm-centos-64" -boot_command = ["<wait><up>e<wait><down><down><end><wait> inst.text inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/rhel/8ks.cfg <leftCtrlOn>x<leftCtrlOff>"] +vbox_guest_os_type = "Oracle_arm64" +vmware_guest_os_type = "arm-rhel9-64" +boot_command = ["<wait><up><wait>e<wait><down><wait><down><wait><end><wait> inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/rhel/8ks.cfg inst.repo=https://repo.almalinux.org/almalinux/8/BaseOS/aarch64/os/ <wait><leftCtrlOn><wait>x<wait><leftCtrlOff>"] diff --git a/os_pkrvars/almalinux/almalinux-8-x86_64.pkrvars.hcl b/os_pkrvars/almalinux/almalinux-8-x86_64.pkrvars.hcl index 31fbb83af..68c3a54a8 100644 --- a/os_pkrvars/almalinux/almalinux-8-x86_64.pkrvars.hcl +++ b/os_pkrvars/almalinux/almalinux-8-x86_64.pkrvars.hcl @@ -1,9 +1,9 @@ os_name = "almalinux" os_version = "8.10" os_arch = "x86_64" -iso_url = "https://repo.almalinux.org/almalinux/8/isos/x86_64/AlmaLinux-8.10-x86_64-minimal.iso" +iso_url = "https://repo.almalinux.org/almalinux/8/isos/x86_64/AlmaLinux-8.10-x86_64-boot.iso" iso_checksum = "file:https://repo.almalinux.org/almalinux/8/isos/x86_64/CHECKSUM" parallels_guest_os_type = "centos" vbox_guest_os_type = "RedHat_64" vmware_guest_os_type = "centos-64" -boot_command = ["<wait><up><wait><tab> inst.text inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/rhel/8ks.cfg<enter><wait>"] +boot_command = ["<wait><up><wait><tab> inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/rhel/8ks.cfg inst.repo=https://repo.almalinux.org/almalinux/8/BaseOS/x86_64/os/ <enter><wait>"] diff --git a/os_pkrvars/almalinux/almalinux-9-aarch64.pkrvars.hcl b/os_pkrvars/almalinux/almalinux-9-aarch64.pkrvars.hcl index 2a1a0763f..3a73a2b9e 100644 --- a/os_pkrvars/almalinux/almalinux-9-aarch64.pkrvars.hcl +++ b/os_pkrvars/almalinux/almalinux-9-aarch64.pkrvars.hcl @@ -1,9 +1,9 @@ os_name = "almalinux" os_version = "9.5" os_arch = "aarch64" -iso_url = "https://repo.almalinux.org/almalinux/9/isos/aarch64/AlmaLinux-9.5-aarch64-dvd.iso" +iso_url = "https://repo.almalinux.org/almalinux/9/isos/aarch64/AlmaLinux-9.5-aarch64-boot.iso" iso_checksum = "file:https://repo.almalinux.org/almalinux/9/isos/aarch64/CHECKSUM" parallels_guest_os_type = "centos" -vbox_guest_os_type = "RedHat_64" +vbox_guest_os_type = "Oracle9_arm64" vmware_guest_os_type = "arm-rhel9-64" -boot_command = ["<wait><up>e<wait><down><down><end><wait> inst.text inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/rhel/9ks.cfg <leftCtrlOn>x<leftCtrlOff>"] +boot_command = ["<wait><up><wait>e<wait><down><wait><down><wait><end><wait> inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/rhel/9ks.cfg inst.repo=https://repo.almalinux.org/almalinux/9/BaseOS/aarch64/os/ <wait><leftCtrlOn><wait>x<wait><leftCtrlOff>"] diff --git a/os_pkrvars/almalinux/almalinux-9-x86_64.pkrvars.hcl b/os_pkrvars/almalinux/almalinux-9-x86_64.pkrvars.hcl index c15cf939a..5af09ae10 100644 --- a/os_pkrvars/almalinux/almalinux-9-x86_64.pkrvars.hcl +++ b/os_pkrvars/almalinux/almalinux-9-x86_64.pkrvars.hcl @@ -1,9 +1,9 @@ os_name = "almalinux" os_version = "9.5" os_arch = "x86_64" -iso_url = "https://repo.almalinux.org/almalinux/9/isos/x86_64/AlmaLinux-9.5-x86_64-dvd.iso" +iso_url = "https://repo.almalinux.org/almalinux/9/isos/x86_64/AlmaLinux-9.5-x86_64-boot.iso" iso_checksum = "file:https://repo.almalinux.org/almalinux/9/isos/x86_64/CHECKSUM" parallels_guest_os_type = "centos" vbox_guest_os_type = "RedHat_64" vmware_guest_os_type = "centos-64" -boot_command = ["<wait><wait><up><wait><tab> inst.text inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/rhel/9ks.cfg<enter><wait>"] +boot_command = ["<wait><wait><up><wait><tab> inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/rhel/9ks.cfg inst.repo=https://repo.almalinux.org/almalinux/9/BaseOS/x86_64/os/ <enter><wait>"] diff --git a/os_pkrvars/amazonlinux/amazonlinux-2-aarch64.pkrvars.hcl b/os_pkrvars/amazonlinux/amazonlinux-2-aarch64.pkrvars.hcl deleted file mode 100644 index 0895fcfd9..000000000 --- a/os_pkrvars/amazonlinux/amazonlinux-2-aarch64.pkrvars.hcl +++ /dev/null @@ -1,11 +0,0 @@ -os_name = "amazonlinux" -os_version = "2" -os_arch = "aarch64" -vbox_source_path = "https://cdn.amazonlinux.com/os-images/latest/kvm-arm64/amzn2-kvm-2.0.20240306.2-arm64.xfs.gpt.qcow2" -vbox_checksum = "file:https://cdn.amazonlinux.com/os-images/latest/kvm-arm64/SHA256SUMS" -parallels_guest_os_type = "fedora-core" -vbox_guest_os_type = "Fedora_64" -vmware_guest_os_type = "arm-fedora-64" -sources_enabled = [ - "source.virtualbox-ovf.vm" -] diff --git a/os_pkrvars/amazonlinux/amazonlinux-2-x86_64.pkrvars.hcl b/os_pkrvars/amazonlinux/amazonlinux-2-x86_64.pkrvars.hcl deleted file mode 100644 index 812d44045..000000000 --- a/os_pkrvars/amazonlinux/amazonlinux-2-x86_64.pkrvars.hcl +++ /dev/null @@ -1,11 +0,0 @@ -os_name = "amazonlinux" -os_version = "2" -os_arch = "x86_64" -vbox_source_path = "https://cdn.amazonlinux.com/os-images/latest/virtualbox/amzn2-virtualbox-2.0.20240306.2-x86_64.xfs.gpt.vdi" -vbox_checksum = "file:https://cdn.amazonlinux.com/os-images/latest/virtualbox/SHA256SUMS" -parallels_guest_os_type = "centos" -vbox_guest_os_type = "RedHat_64" -vmware_guest_os_type = "rhel9-64" -sources_enabled = [ - "source.virtualbox-ovf.vm" -] diff --git a/os_pkrvars/amazonlinux/amazonlinux-2023-aarch64.pkrvars.hcl b/os_pkrvars/amazonlinux/amazonlinux-2023-aarch64.pkrvars.hcl index 6a72f30af..09720a156 100644 --- a/os_pkrvars/amazonlinux/amazonlinux-2023-aarch64.pkrvars.hcl +++ b/os_pkrvars/amazonlinux/amazonlinux-2023-aarch64.pkrvars.hcl @@ -4,8 +4,18 @@ os_arch = "aarch64" vbox_source_path = "https://cdn.amazonlinux.com/al2023/os-images/2023.3.20240312.0/vmware/al2023-vmware_esx-2023.3.20240312.0-kernel-6.1-x86_64.xfs.gpt.ova" vbox_checksum = "file:https://cdn.amazonlinux.com/al2023/os-images/2023.3.20240312.0/vmware/SHA256SUMS" parallels_guest_os_type = "fedora-core" -vbox_guest_os_type = "Fedora_64" +vbox_guest_os_type = "Fedora_arm64" vmware_guest_os_type = "arm-fedora-64" sources_enabled = [ "source.virtualbox-ovf.vm" ] +vboxmanage = [ + ["modifyvm", "{{.Name}}", "--chipset", "armv8virtual"], + ["modifyvm", "{{.Name}}", "--audio-enabled", "off"], + ["modifyvm", "{{.Name}}", "--nat-localhostreachable1", "on"], + ["modifyvm", "{{.Name}}", "--nic-type1", "virtio"], + ["modifyvm", "{{.Name}}", "--usb-xhci", "on"], + ["modifyvm", "{{.Name}}", "--graphicscontroller", "qemuramfb"], + ["modifyvm", "{{.Name}}", "--mouse", "usb"], + ["modifyvm", "{{.Name}}", "--keyboard", "usb"], +] diff --git a/os_pkrvars/centos/centos-stream-10-aarch64.pkrvars.hcl b/os_pkrvars/centos/centos-stream-10-aarch64.pkrvars.hcl new file mode 100644 index 000000000..1f43d8cc9 --- /dev/null +++ b/os_pkrvars/centos/centos-stream-10-aarch64.pkrvars.hcl @@ -0,0 +1,9 @@ +os_name = "centos-stream" +os_version = "10" +os_arch = "aarch64" +iso_url = "https://mirror.stream.centos.org/10-stream/BaseOS/aarch64/iso/CentOS-Stream-10-latest-aarch64-boot.iso" +iso_checksum = "file:https://mirror.stream.centos.org/10-stream/BaseOS/aarch64/iso/CentOS-Stream-10-latest-aarch64-boot.iso.SHA256SUM" +parallels_guest_os_type = "centos" +vbox_guest_os_type = "Oracle9_arm64" +vmware_guest_os_type = "arm-rhel9-64" +boot_command = ["<wait><up>e<wait><down><down><end><wait> inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/rhel/10ks.cfg inst.repo=https://mirror.stream.centos.org/10-stream/BaseOS/aarch64/os/ <leftCtrlOn>x<leftCtrlOff><wait>"] diff --git a/os_pkrvars/centos/centos-stream-10-x86_64.pkrvars.hcl b/os_pkrvars/centos/centos-stream-10-x86_64.pkrvars.hcl new file mode 100644 index 000000000..77c058b59 --- /dev/null +++ b/os_pkrvars/centos/centos-stream-10-x86_64.pkrvars.hcl @@ -0,0 +1,9 @@ +os_name = "centos-stream" +os_version = "10" +os_arch = "x86_64" +iso_url = "https://mirror.stream.centos.org/10-stream/BaseOS/x86_64/iso/CentOS-Stream-10-latest-x86_64-boot.iso" +iso_checksum = "file:https://mirror.stream.centos.org/10-stream/BaseOS/x86_64/iso/CentOS-Stream-10-latest-x86_64-boot.iso.SHA256SUM" +parallels_guest_os_type = "centos" +vbox_guest_os_type = "RedHat_64" +vmware_guest_os_type = "centos-64" +boot_command = ["<wait><up>e<wait><down><down><end><wait> inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/rhel/10ks.cfg inst.repo=https://mirror.stream.centos.org/10-stream/BaseOS/x86_64/os/ <leftCtrlOn>x<leftCtrlOff><wait>"] diff --git a/os_pkrvars/centos/centos-stream-9-aarch64.pkrvars.hcl b/os_pkrvars/centos/centos-stream-9-aarch64.pkrvars.hcl index 635e561ba..166ca4c48 100644 --- a/os_pkrvars/centos/centos-stream-9-aarch64.pkrvars.hcl +++ b/os_pkrvars/centos/centos-stream-9-aarch64.pkrvars.hcl @@ -1,9 +1,9 @@ os_name = "centos-stream" os_version = "9" os_arch = "aarch64" -iso_url = "https://mirror.stream.centos.org/9-stream/BaseOS/aarch64/iso/CentOS-Stream-9-latest-aarch64-dvd1.iso" -iso_checksum = "file:https://mirror.stream.centos.org/9-stream/BaseOS/aarch64/iso/CentOS-Stream-9-latest-aarch64-dvd1.iso.SHA256SUM" +iso_url = "https://mirror.stream.centos.org/9-stream/BaseOS/aarch64/iso/CentOS-Stream-9-latest-aarch64-boot.iso" +iso_checksum = "file:https://mirror.stream.centos.org/9-stream/BaseOS/aarch64/iso/CentOS-Stream-9-latest-aarch64-boot.iso.SHA256SUM" parallels_guest_os_type = "centos" -vbox_guest_os_type = "RedHat_64" +vbox_guest_os_type = "Oracle9_arm64" vmware_guest_os_type = "arm-rhel9-64" -boot_command = ["<wait><up>e<wait><down><down><end><wait> inst.text inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/rhel/9ks.cfg <leftCtrlOn>x<leftCtrlOff>"] +boot_command = ["<wait><up>e<wait><down><down><end><wait> inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/rhel/9ks.cfg inst.repo=https://mirror.stream.centos.org/9-stream/BaseOS/aarch64/os/ <leftCtrlOn>x<leftCtrlOff>"] diff --git a/os_pkrvars/centos/centos-stream-9-x86_64.pkrvars.hcl b/os_pkrvars/centos/centos-stream-9-x86_64.pkrvars.hcl index 6275223b8..070e00370 100644 --- a/os_pkrvars/centos/centos-stream-9-x86_64.pkrvars.hcl +++ b/os_pkrvars/centos/centos-stream-9-x86_64.pkrvars.hcl @@ -1,9 +1,9 @@ os_name = "centos-stream" os_version = "9" os_arch = "x86_64" -iso_url = "https://mirror.stream.centos.org/9-stream/BaseOS/x86_64/iso/CentOS-Stream-9-latest-x86_64-dvd1.iso" -iso_checksum = "file:https://mirror.stream.centos.org/9-stream/BaseOS/x86_64/iso/CentOS-Stream-9-latest-x86_64-dvd1.iso.SHA256SUM" +iso_url = "https://mirror.stream.centos.org/9-stream/BaseOS/x86_64/iso/CentOS-Stream-9-latest-x86_64-boot.iso" +iso_checksum = "file:https://mirror.stream.centos.org/9-stream/BaseOS/x86_64/iso/CentOS-Stream-9-latest-x86_64-boot.iso.SHA256SUM" parallels_guest_os_type = "centos" vbox_guest_os_type = "RedHat_64" vmware_guest_os_type = "centos-64" -boot_command = ["<wait><up><wait><tab> inst.text inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/rhel/9ks.cfg<enter><wait>"] +boot_command = ["<wait><up><wait><tab> inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/rhel/9ks.cfg inst.repo=https://mirror.stream.centos.org/9-stream/BaseOS/x86_64/os/ <enter><wait>"] diff --git a/os_pkrvars/debian/debian-11-aarch64.pkrvars.hcl b/os_pkrvars/debian/debian-11-aarch64.pkrvars.hcl index e06e354f1..93986c297 100644 --- a/os_pkrvars/debian/debian-11-aarch64.pkrvars.hcl +++ b/os_pkrvars/debian/debian-11-aarch64.pkrvars.hcl @@ -1,9 +1,9 @@ os_name = "debian" -os_version = "11.9" +os_version = "11.11" os_arch = "aarch64" -iso_url = "https://cdimage.debian.org/cdimage/archive/latest-oldstable/arm64/iso-dvd/debian-11.9.0-arm64-DVD-1.iso" -iso_checksum = "file:https://cdimage.debian.org/cdimage/archive/latest-oldstable/arm64/iso-dvd/SHA256SUMS" +iso_url = "https://cdimage.debian.org/cdimage/archive/latest-oldstable/arm64/iso-cd/debian-11.11.0-arm64-netinst.iso" +iso_checksum = "file:https://cdimage.debian.org/cdimage/archive/latest-oldstable/arm64/iso-cd/SHA256SUMS" parallels_guest_os_type = "debian" -vbox_guest_os_type = "Debian_64" +vbox_guest_os_type = "Debian11_arm64" vmware_guest_os_type = "arm-debian11-64" boot_command = ["<wait><up>e<wait><down><down><down><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><wait>install <wait> preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/debian/preseed.cfg <wait>debian-installer=en_US.UTF-8 <wait>auto <wait>locale=en_US.UTF-8 <wait>kbd-chooser/method=us <wait>keyboard-configuration/xkb-keymap=us <wait>netcfg/get_hostname={{ .Name }} <wait>netcfg/get_domain=vagrantup.com <wait>fb=false <wait>debconf/frontend=noninteractive <wait>console-setup/ask_detect=false <wait>console-keymaps-at/keymap=us <wait>grub-installer/bootdev=/dev/sda <wait><f10><wait>"] diff --git a/os_pkrvars/debian/debian-11-x86_64.pkrvars.hcl b/os_pkrvars/debian/debian-11-x86_64.pkrvars.hcl index e60ff9fb2..a1a4b3079 100644 --- a/os_pkrvars/debian/debian-11-x86_64.pkrvars.hcl +++ b/os_pkrvars/debian/debian-11-x86_64.pkrvars.hcl @@ -1,9 +1,9 @@ os_name = "debian" -os_version = "11.9" +os_version = "11.11" os_arch = "x86_64" -iso_url = "https://cdimage.debian.org/cdimage/archive/latest-oldstable/amd64/iso-dvd/debian-11.9.0-amd64-DVD-1.iso" -iso_checksum = "file:https://cdimage.debian.org/cdimage/archive/latest-oldstable/amd64/iso-dvd/SHA256SUMS" +iso_url = "https://cdimage.debian.org/cdimage/archive/latest-oldstable/amd64/iso-cd/debian-11.11.0-amd64-netinst.iso" +iso_checksum = "file:https://cdimage.debian.org/cdimage/archive/latest-oldstable/amd64/iso-cd/SHA256SUMS" parallels_guest_os_type = "debian" -vbox_guest_os_type = "Debian_64" +vbox_guest_os_type = "Debian11_64" vmware_guest_os_type = "debian-64" boot_command = ["<wait><esc><wait>auto preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/debian/preseed.cfg netcfg/get_hostname={{ .Name }}<enter>"] diff --git a/os_pkrvars/debian/debian-12-aarch64.pkrvars.hcl b/os_pkrvars/debian/debian-12-aarch64.pkrvars.hcl index 3facc62d3..06eb5ebe4 100644 --- a/os_pkrvars/debian/debian-12-aarch64.pkrvars.hcl +++ b/os_pkrvars/debian/debian-12-aarch64.pkrvars.hcl @@ -1,9 +1,10 @@ os_name = "debian" os_version = "12.9" os_arch = "aarch64" -iso_url = "https://cdimage.debian.org/cdimage/release/12.9.0/arm64/iso-dvd/debian-12.9.0-arm64-DVD-1.iso" -iso_checksum = "file:https://cdimage.debian.org/cdimage/release/12.9.0/arm64/iso-dvd/SHA256SUMS" +iso_url = "https://cdimage.debian.org/debian-cd/current/arm64/iso-cd/debian-12.9.0-arm64-netinst.iso" +iso_checksum = "file:https://cdimage.debian.org/debian-cd/current/arm64/iso-cd/SHA256SUMS" parallels_guest_os_type = "debian" -vbox_guest_os_type = "Debian_64" +vbox_guest_os_type = "Debian12_arm64" vmware_guest_os_type = "arm-debian12-64" -boot_command = ["<wait><up>e<wait><down><down><down><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><wait>install <wait> preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/debian/preseed.cfg <wait>debian-installer=en_US.UTF-8 <wait>auto <wait>locale=en_US.UTF-8 <wait>kbd-chooser/method=us <wait>keyboard-configuration/xkb-keymap=us <wait>netcfg/get_hostname={{ .Name }} <wait>netcfg/get_domain=vagrantup.com <wait>fb=false <wait>debconf/frontend=noninteractive <wait>console-setup/ask_detect=false <wait>console-keymaps-at/keymap=us <wait>grub-installer/bootdev=/dev/sda <wait><f10><wait>"] +default_boot_wait = "10s" +boot_command = ["<wait>e<wait><down><down><down><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><wait>install <wait> preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/debian/preseed.cfg <wait>debian-installer=en_US.UTF-8 <wait>auto <wait>locale=en_US.UTF-8 <wait>kbd-chooser/method=us <wait>keyboard-configuration/xkb-keymap=us <wait>netcfg/get_hostname={{ .Name }} <wait>netcfg/get_domain=vagrantup.com <wait>fb=false <wait>debconf/frontend=noninteractive <wait>console-setup/ask_detect=false <wait>console-keymaps-at/keymap=us <wait>grub-installer/bootdev=/dev/sda <wait><f10><wait>"] diff --git a/os_pkrvars/debian/debian-12-x86_64.pkrvars.hcl b/os_pkrvars/debian/debian-12-x86_64.pkrvars.hcl index 70327d98a..4c6c90e63 100644 --- a/os_pkrvars/debian/debian-12-x86_64.pkrvars.hcl +++ b/os_pkrvars/debian/debian-12-x86_64.pkrvars.hcl @@ -1,9 +1,9 @@ os_name = "debian" os_version = "12.9" os_arch = "x86_64" -iso_url = "https://cdimage.debian.org/cdimage/release/12.9.0/amd64/iso-dvd/debian-12.9.0-amd64-DVD-1.iso" -iso_checksum = "file:https://cdimage.debian.org/cdimage/release/12.9.0/amd64/iso-dvd/SHA256SUMS" +iso_url = "https://cdimage.debian.org/debian-cd/current/amd64/iso-cd/debian-12.9.0-amd64-netinst.iso" +iso_checksum = "file:https://cdimage.debian.org/debian-cd/current/amd64/iso-cd/SHA256SUMS" parallels_guest_os_type = "debian" -vbox_guest_os_type = "Debian_64" +vbox_guest_os_type = "Debian12_64" vmware_guest_os_type = "debian-64" boot_command = ["<wait><esc><wait>auto preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/debian/preseed.cfg netcfg/get_hostname={{ .Name }}<enter>"] diff --git a/os_pkrvars/fedora/fedora-40-aarch64.pkrvars.hcl b/os_pkrvars/fedora/fedora-40-aarch64.pkrvars.hcl index 24c62af3a..d7094dd28 100644 --- a/os_pkrvars/fedora/fedora-40-aarch64.pkrvars.hcl +++ b/os_pkrvars/fedora/fedora-40-aarch64.pkrvars.hcl @@ -1,9 +1,9 @@ os_name = "fedora" os_version = "40" os_arch = "aarch64" -iso_url = "https://download.fedoraproject.org/pub/fedora/linux/releases/40/Server/aarch64/iso/Fedora-Server-dvd-aarch64-40-1.14.iso" +iso_url = "https://download.fedoraproject.org/pub/fedora/linux/releases/40/Server/aarch64/iso/Fedora-Server-netinst-aarch64-40-1.14.iso" iso_checksum = "file:https://download.fedoraproject.org/pub/fedora/linux/releases/40/Server/aarch64/iso/Fedora-Server-40-1.14-aarch64-CHECKSUM" parallels_guest_os_type = "fedora-core" -vbox_guest_os_type = "Fedora_64" +vbox_guest_os_type = "Fedora_arm64" vmware_guest_os_type = "arm-fedora-64" -boot_command = ["<wait><up><up>e<wait><down><down><end> inst.text inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/fedora/ks.cfg<F10><wait>"] +boot_command = ["<wait><up>e<wait><down><down><end> inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/fedora/ks.cfg inst.repo=https://download.fedoraproject.org/pub/fedora/linux/releases/40/Server/aarch64/os/ <F10><wait>"] diff --git a/os_pkrvars/fedora/fedora-40-x86_64.pkrvars.hcl b/os_pkrvars/fedora/fedora-40-x86_64.pkrvars.hcl index 18aec053c..a38099feb 100644 --- a/os_pkrvars/fedora/fedora-40-x86_64.pkrvars.hcl +++ b/os_pkrvars/fedora/fedora-40-x86_64.pkrvars.hcl @@ -1,9 +1,9 @@ os_name = "fedora" os_version = "40" os_arch = "x86_64" -iso_url = "https://download.fedoraproject.org/pub/fedora/linux/releases/40/Server/x86_64/iso/Fedora-Server-dvd-x86_64-40-1.14.iso" +iso_url = "https://download.fedoraproject.org/pub/fedora/linux/releases/40/Server/x86_64/iso/Fedora-Server-netinst-x86_64-40-1.14.iso" iso_checksum = "file:https://download.fedoraproject.org/pub/fedora/linux/releases/40/Server/x86_64/iso/Fedora-Server-40-1.14-x86_64-CHECKSUM" parallels_guest_os_type = "fedora-core" vbox_guest_os_type = "Fedora_64" vmware_guest_os_type = "fedora-64" -boot_command = ["<wait><up>e<wait><down><down><end> inst.text inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/fedora/ks.cfg<F10><wait>"] +boot_command = ["<wait><up>e<wait><down><down><end> inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/fedora/ks.cfg inst.repo=https://download.fedoraproject.org/pub/fedora/linux/releases/40/Server/x86_64/os/ <F10><wait>"] diff --git a/os_pkrvars/fedora/fedora-41-aarch64.pkrvars.hcl b/os_pkrvars/fedora/fedora-41-aarch64.pkrvars.hcl index 6da393c1c..2f46f8111 100644 --- a/os_pkrvars/fedora/fedora-41-aarch64.pkrvars.hcl +++ b/os_pkrvars/fedora/fedora-41-aarch64.pkrvars.hcl @@ -1,9 +1,10 @@ os_name = "fedora" os_version = "41" os_arch = "aarch64" -iso_url = "https://mirrors.rit.edu/fedora/fedora/linux/releases/41/Server/aarch64/iso/Fedora-Server-dvd-aarch64-41-1.4.iso" -iso_checksum = "sha256:99e7801b943e81f78a7b104fe348196b0ac1bc748ce647378f22a2c875c923ec" +iso_url = "https://download.fedoraproject.org/pub/fedora/linux/releases/41/Server/aarch64/iso/Fedora-Server-netinst-aarch64-41-1.4.iso" +iso_checksum = "file:https://download.fedoraproject.org/pub/fedora/linux/releases/41/Server/aarch64/iso/Fedora-Server-41-1.4-aarch64-CHECKSUM" parallels_guest_os_type = "fedora-core" -vbox_guest_os_type = "Fedora_64" +vbox_guest_os_type = "Fedora_arm64" vmware_guest_os_type = "arm-fedora-64" -boot_command = ["<wait><up><up>e<wait><down><down><end> inst.text inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/fedora/ks.cfg<F10><wait>"] +parallels_boot_wait = "0s" +boot_command = ["<up>e<wait><down><down><end> inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/fedora/ks.cfg inst.repo=https://download.fedoraproject.org/pub/fedora/linux/releases/41/Server/aarch64/os/ <F10><wait>"] diff --git a/os_pkrvars/fedora/fedora-41-x86_64.pkrvars.hcl b/os_pkrvars/fedora/fedora-41-x86_64.pkrvars.hcl index eefbb3a8c..2761ca0b9 100644 --- a/os_pkrvars/fedora/fedora-41-x86_64.pkrvars.hcl +++ b/os_pkrvars/fedora/fedora-41-x86_64.pkrvars.hcl @@ -1,9 +1,9 @@ os_name = "fedora" os_version = "41" os_arch = "x86_64" -iso_url = "https://mirrors.rit.edu/fedora/fedora/linux/releases/41/Server/x86_64/iso/Fedora-Server-dvd-x86_64-41-1.4.iso" -iso_checksum = "sha256:6037e489103401a6ad4e54a4bcb2df7525693bdc3f2ce4aa895838b65647e551" +iso_url = "https://download.fedoraproject.org/pub/fedora/linux/releases/41/Server/x86_64/iso/Fedora-Server-netinst-x86_64-41-1.4.iso" +iso_checksum = "file:https://download.fedoraproject.org/pub/fedora/linux/releases/41/Server/x86_64/iso/Fedora-Server-41-1.4-x86_64-CHECKSUM" parallels_guest_os_type = "fedora-core" vbox_guest_os_type = "Fedora_64" vmware_guest_os_type = "fedora-64" -boot_command = ["<wait><up>e<wait><down><down><end> inst.text inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/fedora/ks.cfg<F10><wait>"] +boot_command = ["<wait><up>e<wait><down><down><end> inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/fedora/ks.cfg inst.repo=https://download.fedoraproject.org/pub/fedora/linux/releases/41/Server/x86_64/os/ <F10><wait>"] diff --git a/os_pkrvars/freebsd/freebsd-13-aarch64.pkrvars.hcl b/os_pkrvars/freebsd/freebsd-13-aarch64.pkrvars.hcl index 1fe88e612..19e2e571f 100644 --- a/os_pkrvars/freebsd/freebsd-13-aarch64.pkrvars.hcl +++ b/os_pkrvars/freebsd/freebsd-13-aarch64.pkrvars.hcl @@ -4,6 +4,7 @@ os_arch = "aarch64" iso_url = "https://download.freebsd.org/releases/arm64/aarch64/ISO-IMAGES/13.4/FreeBSD-13.4-RELEASE-arm64-aarch64-disc1.iso" iso_checksum = "file:https://download.freebsd.org/releases/arm64/aarch64/ISO-IMAGES/13.4/CHECKSUM.SHA256-FreeBSD-13.4-RELEASE-arm64-aarch64" parallels_guest_os_type = "freebsd" -vbox_guest_os_type = "FreeBSD_64" +vbox_guest_os_type = "FreeBSD_arm64" vmware_guest_os_type = "arm-freebsd13-64" -boot_command = ["<wait><esc><wait>boot -s<wait><enter><wait><wait10><wait10>/bin/sh<enter><wait>mdmfs -s 100m md1 /tmp<enter><wait>mdmfs -s 100m md2 /mnt<enter><wait>dhclient -p /tmp/dhclient.em0.pid -l /tmp/dhclient.lease.em0 em0<enter><wait><wait5>fetch -o /tmp/installerconfig http://{{ .HTTPIP }}:{{ .HTTPPort }}/freebsd/installerconfig && bsdinstall script /tmp/installerconfig<enter><wait>"] +default_boot_wait = "60s" +boot_command = ["<wait>s<wait2>mdmfs -s 100m md1 /tmp<enter><wait>mdmfs -s 100m md2 /mnt<enter><wait>dhclient -p /tmp/dhclient.$(ifconfig -l | awk '{print $1}').pid -l /tmp/dhclient.lease.$(ifconfig -l | awk '{print $1}') $(ifconfig -l | awk '{print $1}')<enter><wait10>fetch -o /tmp/installerconfig http://{{ .HTTPIP }}:{{ .HTTPPort }}/freebsd/installerconfig && bsdinstall script /tmp/installerconfig<enter><wait>"] diff --git a/os_pkrvars/freebsd/freebsd-13-x86_64.pkrvars.hcl b/os_pkrvars/freebsd/freebsd-13-x86_64.pkrvars.hcl index d572e7aaa..b1e3d85fd 100644 --- a/os_pkrvars/freebsd/freebsd-13-x86_64.pkrvars.hcl +++ b/os_pkrvars/freebsd/freebsd-13-x86_64.pkrvars.hcl @@ -6,4 +6,5 @@ iso_checksum = "file:https://download.freebsd.org/releases/amd64/amd6 parallels_guest_os_type = "freebsd" vbox_guest_os_type = "FreeBSD_64" vmware_guest_os_type = "freebsd-64" -boot_command = ["<wait><esc><wait>boot -s<wait><enter><wait><wait10><wait10>/bin/sh<enter><wait>mdmfs -s 100m md1 /tmp<enter><wait>mdmfs -s 100m md2 /mnt<enter><wait>dhclient -p /tmp/dhclient.em0.pid -l /tmp/dhclient.lease.em0 em0<enter><wait><wait5>fetch -o /tmp/installerconfig http://{{ .HTTPIP }}:{{ .HTTPPort }}/freebsd/installerconfig && bsdinstall script /tmp/installerconfig<enter><wait>"] +default_boot_wait = "60s" +boot_command = ["<wait>s<wait2>mdmfs -s 100m md1 /tmp<enter><wait>mdmfs -s 100m md2 /mnt<enter><wait>dhclient -p /tmp/dhclient.$(ifconfig -l | awk '{print $1}').pid -l /tmp/dhclient.lease.$(ifconfig -l | awk '{print $1}') $(ifconfig -l | awk '{print $1}')<enter><wait10>fetch -o /tmp/installerconfig http://{{ .HTTPIP }}:{{ .HTTPPort }}/freebsd/installerconfig && bsdinstall script /tmp/installerconfig<enter><wait>"] diff --git a/os_pkrvars/freebsd/freebsd-14-aarch64.pkrvars.hcl b/os_pkrvars/freebsd/freebsd-14-aarch64.pkrvars.hcl index 3811f76c1..e1bdd3964 100644 --- a/os_pkrvars/freebsd/freebsd-14-aarch64.pkrvars.hcl +++ b/os_pkrvars/freebsd/freebsd-14-aarch64.pkrvars.hcl @@ -4,6 +4,7 @@ os_arch = "aarch64" iso_url = "https://download.freebsd.org/releases/arm64/aarch64/ISO-IMAGES/14.2/FreeBSD-14.2-RELEASE-arm64-aarch64-disc1.iso" iso_checksum = "file:https://download.freebsd.org/releases/arm64/aarch64/ISO-IMAGES/14.2/CHECKSUM.SHA256-FreeBSD-14.2-RELEASE-arm64-aarch64" parallels_guest_os_type = "freebsd" -vbox_guest_os_type = "FreeBSD_64" +vbox_guest_os_type = "FreeBSD_arm64" vmware_guest_os_type = "arm-freebsd14-64" -boot_command = ["<wait><esc><wait>boot -s<wait><enter><wait><wait10><wait10>/bin/sh<enter><wait>mdmfs -s 100m md1 /tmp<enter><wait>mdmfs -s 100m md2 /mnt<enter><wait>dhclient -p /tmp/dhclient.em0.pid -l /tmp/dhclient.lease.em0 em0<enter><wait><wait5>fetch -o /tmp/installerconfig http://{{ .HTTPIP }}:{{ .HTTPPort }}/freebsd/installerconfig && bsdinstall script /tmp/installerconfig<enter><wait>"] +default_boot_wait = "60s" +boot_command = ["<wait>s<wait2>mdmfs -s 100m md1 /tmp<enter><wait>mdmfs -s 100m md2 /mnt<enter><wait>dhclient -p /tmp/dhclient.$(ifconfig -l | awk '{print $1}').pid -l /tmp/dhclient.lease.$(ifconfig -l | awk '{print $1}') $(ifconfig -l | awk '{print $1}')<enter><wait10>fetch -o /tmp/installerconfig http://{{ .HTTPIP }}:{{ .HTTPPort }}/freebsd/installerconfig && bsdinstall script /tmp/installerconfig<enter><wait>"] diff --git a/os_pkrvars/freebsd/freebsd-14-x86_64.pkrvars.hcl b/os_pkrvars/freebsd/freebsd-14-x86_64.pkrvars.hcl index c49a904f8..9c3d5d881 100644 --- a/os_pkrvars/freebsd/freebsd-14-x86_64.pkrvars.hcl +++ b/os_pkrvars/freebsd/freebsd-14-x86_64.pkrvars.hcl @@ -6,4 +6,5 @@ iso_checksum = "file:https://download.freebsd.org/releases/amd64/amd6 parallels_guest_os_type = "freebsd" vbox_guest_os_type = "FreeBSD_64" vmware_guest_os_type = "freebsd-64" -boot_command = ["<wait><esc><wait>boot -s<wait><enter><wait><wait10><wait10>/bin/sh<enter><wait>mdmfs -s 100m md1 /tmp<enter><wait>mdmfs -s 100m md2 /mnt<enter><wait>dhclient -p /tmp/dhclient.em0.pid -l /tmp/dhclient.lease.em0 em0<enter><wait><wait5>fetch -o /tmp/installerconfig http://{{ .HTTPIP }}:{{ .HTTPPort }}/freebsd/installerconfig && bsdinstall script /tmp/installerconfig<enter><wait>"] +default_boot_wait = "60s" +boot_command = ["<wait>s<wait2>mdmfs -s 100m md1 /tmp<enter><wait>mdmfs -s 100m md2 /mnt<enter><wait>dhclient -p /tmp/dhclient.$(ifconfig -l | awk '{print $1}').pid -l /tmp/dhclient.lease.$(ifconfig -l | awk '{print $1}') $(ifconfig -l | awk '{print $1}')<enter><wait10>fetch -o /tmp/installerconfig http://{{ .HTTPIP }}:{{ .HTTPPort }}/freebsd/installerconfig && bsdinstall script /tmp/installerconfig<enter><wait>"] diff --git a/os_pkrvars/macos/macos-14-aarch64.pkrvars.hcl b/os_pkrvars/macos/macos-14-aarch64.pkrvars.hcl index d488f91bc..a98e4b1f4 100644 --- a/os_pkrvars/macos/macos-14-aarch64.pkrvars.hcl +++ b/os_pkrvars/macos/macos-14-aarch64.pkrvars.hcl @@ -1,8 +1,8 @@ os_name = "macos" -os_version = "14.4.1" +os_version = "14.6.1" os_arch = "aarch64" -parallels_ipsw_url = "https://updates.cdn-apple.com/2024WinterFCS/fullrestores/052-77579/4569734E-120C-4F31-AD08-FC1FF825D059/UniversalMac_14.4.1_23E224_Restore.ipsw" -parallels_ipsw_checksum = "78b39816521a6eeaf29221a4e59e83dae98ef5f9e8e718b846f8faab540a48c1" +parallels_ipsw_url = "https://updates.cdn-apple.com/2024SummerFCS/fullrestores/062-52859/932E0A8F-6644-4759-82DA-F8FA8DEA806A/UniversalMac_14.6.1_23G93_Restore.ipsw" +parallels_ipsw_checksum = "e387251e63387150ba76cf784bdb97d2016e5d43c6f809c90a115eb067a097b8" sources_enabled = ["source.parallels-ipsw.vm"] boot_command = [ # hello, hola, bonjour, etc. diff --git a/os_pkrvars/macos/macos-15-aarch64.pkrvars.hcl b/os_pkrvars/macos/macos-15-aarch64.pkrvars.hcl new file mode 100644 index 000000000..b20a59e64 --- /dev/null +++ b/os_pkrvars/macos/macos-15-aarch64.pkrvars.hcl @@ -0,0 +1,73 @@ +os_name = "macos" +os_version = "15.3.1" +os_arch = "aarch64" +parallels_ipsw_url = "https://updates.cdn-apple.com/2025WinterFCS/fullrestores/072-70618/42F1A8CC-7E07-4329-958A-757FF600C303/UniversalMac_15.3.1_24D70_Restore.ipsw" +parallels_ipsw_checksum = "c2b5bca53c6cf475e7a2a0b6d6c0db19477d69eb" +sources_enabled = ["source.parallels-ipsw.vm"] +boot_command = [ + # hello, hola, bonjour, etc. + "<wait><spacebar><wait5s>", + # Select Language English (US) + "<enter><wait10s>", + # Select Your Country and Region + "<leftShiftOn><tab><leftShiftOff><wait><spacebar><wait5s>", + # Written and Spoken Languages + "<leftShiftOn><tab><leftShiftOff><wait><spacebar><wait5s>", + # Accessibility + "<leftShiftOn><tab><leftShiftOff><wait><spacebar><wait5s>", + # Data & Privacy + "<leftShiftOn><tab><leftShiftOff><wait><spacebar><wait5s>", + # Migration Assistant + "<tab><wait><tab><wait><tab><wait><spacebar><wait5s>", + # Sign In with Your Apple ID + "<leftShiftOn><tab><wait><tab><leftShiftOff><wait><spacebar><wait5s>", + # Are you sure you want to skip signing in with an Apple ID? + "<tab><wait><spacebar><wait5s>", + # Terms and Conditions + "<leftShiftOn><tab><leftShiftOff><wait><spacebar><wait5s>", + # I have read and agree to the macOS Software License Agreement + "<tab><wait><spacebar><wait5s>", + # Create a Computer Account + "vagrant<wait><tab><wait><tab><wait>vagrant<wait><tab><wait>vagrant<wait><tab><wait><tab><wait><tab><wait><spacebar><wait1m>", + # Enable Location Services + "<leftShiftOn><tab><leftShiftOff><wait><spacebar><wait5s>", + # Are you sure you don't want to use Location Services? + "<tab><wait><spacebar><wait5s>", + # Select Your Time Zone + "<tab><wait>UTC<wait><enter><wait><leftShiftOn><tab><leftShiftOff><wait><spacebar><wait5s>", + # Analytics + "<tab><wait><spacebar><wait><leftShiftOn><tab><leftShiftOff><wait><spacebar><wait5s>", + # Screen Time + "<tab><wait><spacebar><wait5s>", + # Siri + "<tab><wait><spacebar><wait><leftShiftOn><tab><leftShiftOff><wait><spacebar><wait5s>", + # Choose Your Look + "<leftShiftOn><tab><leftShiftOff><wait><spacebar><wait30s>", + # Enable keyboard navigation + "<leftCtrlOn><f7><leftCtrlOff><wait2s>", + # Open System Settings + "<leftSuperOn><spacebar><leftSuperOff><wait>System<spacebar>Settings<wait><enter><wait5s>", + # Enable Remote Management + "<up><wait><tab><tab><tab><tab><tab><tab><tab><tab><tab><wait><spacebar><wait5s>", + "<tab><tab><tab><tab><tab><tab><tab><tab><tab><tab><tab><tab><tab><tab><tab><tab><tab><wait><spacebar><wait5s>", + # Enable Remote Login + "<tab><tab><wait><spacebar><wait5s>", + # Close System Preferences + "<leftSuperOn>q<leftSuperOff><wait5s>", + # Disable keyboard navigation + "<leftCtrlOn><f7><leftCtrlOff><wait2s>", + # Open Terminal + "<leftSuperOn><spacebar><leftSuperOff><wait>terminal<wait><enter><wait5s>", + # Add vagrant user to sudoers + "echo 'vagrant' | sudo -S sh -c 'echo \"vagrant ALL=(ALL) NOPASSWD: ALL\" > /etc/sudoers.d/vagrant'<wait><enter><wait5s>", + # Set Auto login for vagrant + "sudo sysadminctl -autologin set -userName vagrant -password vagrant<wait><enter><wait5s>", + # Disable screen lock + "sudo sysadminctl -screenLock off -password vagrant<wait><enter><wait5s>", + # Install Parallels Tools + "sudo installer -pkg /Volumes/Parallels\\ Tools/Install.app/Contents/Resources/Install.mpkg -target /<wait><enter><wait5s>", + # Reboot + "sudo shutdown -r +15s<wait><enter><wait5s>", + "exit<enter><wait5s>", + "<leftSuperOn>q<leftSuperOff>" +] diff --git a/os_pkrvars/opensuse/opensuse-leap-15-aarch64.pkrvars.hcl b/os_pkrvars/opensuse/opensuse-leap-15-aarch64.pkrvars.hcl index 82daa1f8e..a737f74f1 100644 --- a/os_pkrvars/opensuse/opensuse-leap-15-aarch64.pkrvars.hcl +++ b/os_pkrvars/opensuse/opensuse-leap-15-aarch64.pkrvars.hcl @@ -1,24 +1,9 @@ os_name = "opensuse-leap" os_version = "15.6" os_arch = "aarch64" -iso_url = "https://download.opensuse.org/distribution/leap/15.6/iso/openSUSE-Leap-15.6-DVD-aarch64-Build710.3-Media.iso" -iso_checksum = "sha256:6ecade658ef3e4dd7175176781f80fcd070250fe7e922f6240224ff810755ac6" +iso_url = "https://download.opensuse.org/distribution/leap/15.6/iso/openSUSE-Leap-15.6-NET-aarch64-Media.iso" +iso_checksum = "file:https://download.opensuse.org/distribution/leap/15.6/iso/openSUSE-Leap-15.6-NET-aarch64-Media.iso.sha256" parallels_guest_os_type = "opensuse" vbox_guest_os_type = "OpenSUSE_Leap_arm64" vmware_guest_os_type = "arm-other-64" boot_command = ["<wait5><esc><wait>e<wait><down><down><down><down><end> biosdevname=0 net.ifnames=0 netdevice=eth0 netsetup=dhcp lang=en_US textmode=1 modprobe.blacklist=vmwgfx autoyast=http://{{ .HTTPIP }}:{{ .HTTPPort }}/opensuse/autoinst-uefi.xml<f10><wait>"] -vboxmanage = [ - [ - "modifyvm", - "{{.Name}}", - "--audio", - "none", - "--nat-localhostreachable1", - "on", - "--usb-xhci", - "on" - ] -] -vbox_hard_drive_interface = "virtio" -vbox_iso_interface = "virtio" -vbox_firmware_option = "efi" diff --git a/os_pkrvars/opensuse/opensuse-leap-15-x86_64.pkrvars.hcl b/os_pkrvars/opensuse/opensuse-leap-15-x86_64.pkrvars.hcl index 497086bf5..b5dd7995c 100644 --- a/os_pkrvars/opensuse/opensuse-leap-15-x86_64.pkrvars.hcl +++ b/os_pkrvars/opensuse/opensuse-leap-15-x86_64.pkrvars.hcl @@ -1,8 +1,8 @@ os_name = "opensuse-leap" os_version = "15.6" os_arch = "x86_64" -iso_url = "https://download.opensuse.org/distribution/leap/15.6/iso/openSUSE-Leap-15.6-DVD-x86_64-Build710.3-Media.iso" -iso_checksum = "sha256:a74d4072e639c75ca127df3d869c1e57bcc44a093a969550f348a3ead561fe4f" +iso_url = "https://download.opensuse.org/distribution/leap/15.6/iso/openSUSE-Leap-15.6-NET-x86_64-Media.iso" +iso_checksum = "file:https://download.opensuse.org/distribution/leap/15.6/iso/openSUSE-Leap-15.6-NET-x86_64-Media.iso.sha256" parallels_guest_os_type = "opensuse" vbox_guest_os_type = "OpenSUSE_Leap_64" vmware_guest_os_type = "opensuse-64" diff --git a/os_pkrvars/oraclelinux/oraclelinux-8-aarch64.pkrvars.hcl b/os_pkrvars/oraclelinux/oraclelinux-8-aarch64.pkrvars.hcl index 5ca97bd82..3655f979d 100644 --- a/os_pkrvars/oraclelinux/oraclelinux-8-aarch64.pkrvars.hcl +++ b/os_pkrvars/oraclelinux/oraclelinux-8-aarch64.pkrvars.hcl @@ -4,6 +4,7 @@ os_arch = "aarch64" iso_url = "https://yum.oracle.com/ISOS/OracleLinux/OL8/u10/aarch64/OracleLinux-R8-U10-aarch64-dvd.iso" iso_checksum = "file:https://linux.oracle.com/security/gpg/checksum/OracleLinux-R8-U10-Server-aarch64.checksum" parallels_guest_os_type = "centos" -vbox_guest_os_type = "RedHat_64" -vmware_guest_os_type = "arm-other-64" -boot_command = ["<wait><up>e<wait><down><down><end><wait> inst.text inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/rhel/8ks.cfg <leftCtrlOn>x<leftCtrlOff>"] +vbox_guest_os_type = "Oracle9_arm64" +vmware_guest_os_type = "arm-rhel9-64" +parallels_boot_wait = "0s" +boot_command = ["<wait><up>e<wait><down><down><end><wait> inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/rhel/8ks.cfg inst.repo=https://yum.oracle.com/repo/OracleLinux/OL8/baseos/latest/aarch64/ <leftCtrlOn>x<leftCtrlOff>"] diff --git a/os_pkrvars/oraclelinux/oraclelinux-8-x86_64.pkrvars.hcl b/os_pkrvars/oraclelinux/oraclelinux-8-x86_64.pkrvars.hcl index 7fa3b597f..5914dac24 100644 --- a/os_pkrvars/oraclelinux/oraclelinux-8-x86_64.pkrvars.hcl +++ b/os_pkrvars/oraclelinux/oraclelinux-8-x86_64.pkrvars.hcl @@ -1,9 +1,9 @@ os_name = "oraclelinux" os_version = "8.10" os_arch = "x86_64" -iso_url = "https://yum.oracle.com/ISOS/OracleLinux/OL8/u10/x86_64/OracleLinux-R8-U10-x86_64-dvd.iso" +iso_url = "https://yum.oracle.com/ISOS/OracleLinux/OL8/u10/x86_64/OracleLinux-R8-U10-x86_64-boot.iso" iso_checksum = "file:https://linux.oracle.com/security/gpg/checksum/OracleLinux-R8-U10-Server-x86_64.checksum" parallels_guest_os_type = "centos" -vbox_guest_os_type = "RedHat_64" +vbox_guest_os_type = "Oracle_64" vmware_guest_os_type = "centos-64" -boot_command = ["<wait><up><wait><tab> inst.text inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/rhel/8ks.cfg<enter><wait>"] +boot_command = ["<wait><up><wait><tab> inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/rhel/8ks.cfg inst.repo=https://yum.oracle.com/repo/OracleLinux/OL8/baseos/latest/x86_64/ <enter><wait>"] diff --git a/os_pkrvars/oraclelinux/oraclelinux-9-aarch64.pkrvars.hcl b/os_pkrvars/oraclelinux/oraclelinux-9-aarch64.pkrvars.hcl index 0325a8108..2459327ac 100644 --- a/os_pkrvars/oraclelinux/oraclelinux-9-aarch64.pkrvars.hcl +++ b/os_pkrvars/oraclelinux/oraclelinux-9-aarch64.pkrvars.hcl @@ -1,9 +1,9 @@ os_name = "oraclelinux" -os_version = "9.4" +os_version = "9.5" os_arch = "aarch64" -iso_url = "https://yum.oracle.com/ISOS/OracleLinux/OL9/u4/aarch64/OracleLinux-R9-U4-aarch64-dvd.iso" -iso_checksum = "file:https://linux.oracle.com/security/gpg/checksum/OracleLinux-R9-U4-Server-aarch64.checksum" +iso_url = "https://yum.oracle.com/ISOS/OracleLinux/OL9/u5/aarch64/OracleLinux-R9-U5-aarch64-boot-uek.iso" +iso_checksum = "file:https://linux.oracle.com/security/gpg/checksum/OracleLinux-R9-U5-Server-aarch64.checksum" parallels_guest_os_type = "centos" -vbox_guest_os_type = "RedHat_64" +vbox_guest_os_type = "Oracle9_arm64" vmware_guest_os_type = "arm-rhel9-64" -boot_command = ["<wait><up>e<wait><down><down><end><wait> inst.text inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/rhel/9ks.cfg <leftCtrlOn>x<leftCtrlOff>"] +boot_command = ["<wait><up>e<wait><down><down><end><wait> inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/rhel/9ks.cfg inst.repo=https://yum.oracle.com/repo/OracleLinux/OL9/baseos/latest/aarch64/ <leftCtrlOn>x<leftCtrlOff>"] diff --git a/os_pkrvars/oraclelinux/oraclelinux-9-x86_64.pkrvars.hcl b/os_pkrvars/oraclelinux/oraclelinux-9-x86_64.pkrvars.hcl index 221a8564d..fe296dcec 100644 --- a/os_pkrvars/oraclelinux/oraclelinux-9-x86_64.pkrvars.hcl +++ b/os_pkrvars/oraclelinux/oraclelinux-9-x86_64.pkrvars.hcl @@ -1,9 +1,9 @@ os_name = "oraclelinux" -os_version = "9.4" +os_version = "9.5" os_arch = "x86_64" -iso_url = "https://yum.oracle.com/ISOS/OracleLinux/OL9/u4/x86_64/OracleLinux-R9-U4-x86_64-dvd.iso" -iso_checksum = "file:https://linux.oracle.com/security/gpg/checksum/OracleLinux-R9-U4-Server-x86_64.checksum" +iso_url = "https://yum.oracle.com/ISOS/OracleLinux/OL9/u5/x86_64/OracleLinux-R9-U5-x86_64-boot.iso" +iso_checksum = "file:https://linux.oracle.com/security/gpg/checksum/OracleLinux-R9-U5-Server-x86_64.checksum" parallels_guest_os_type = "centos" -vbox_guest_os_type = "RedHat_64" +vbox_guest_os_type = "Oracle_64" vmware_guest_os_type = "centos-64" -boot_command = ["<wait><up><wait><tab> inst.text inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/rhel/9ks.cfg<enter><wait>"] +boot_command = ["<wait><up><wait><tab> inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/rhel/9ks.cfg inst.repo=https://yum.oracle.com/repo/OracleLinux/OL9/baseos/latest/x86_64/ <enter><wait>"] diff --git a/os_pkrvars/rhel/rhel-8-aarch64.pkrvars.hcl b/os_pkrvars/rhel/rhel-8-aarch64.pkrvars.hcl index 273648ca3..57f5508b2 100644 --- a/os_pkrvars/rhel/rhel-8-aarch64.pkrvars.hcl +++ b/os_pkrvars/rhel/rhel-8-aarch64.pkrvars.hcl @@ -4,6 +4,6 @@ os_arch = "aarch64" iso_url = "https://www.redhat.com/en/technologies/linux-platforms/enterprise-linux" iso_checksum = "none" parallels_guest_os_type = "rhel" -vbox_guest_os_type = "RedHat_64" -vmware_guest_os_type = "arm-other-64" +vbox_guest_os_type = "Oracle_arm64" +vmware_guest_os_type = "arm-rhel9-64" boot_command = ["<wait><up><wait><tab> inst.text inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/rhel/8ks.cfg<enter><wait>"] diff --git a/os_pkrvars/rhel/rhel-9-aarch64.pkrvars.hcl b/os_pkrvars/rhel/rhel-9-aarch64.pkrvars.hcl index cde337d59..5e096f087 100644 --- a/os_pkrvars/rhel/rhel-9-aarch64.pkrvars.hcl +++ b/os_pkrvars/rhel/rhel-9-aarch64.pkrvars.hcl @@ -1,9 +1,9 @@ os_name = "rhel" -os_version = "9.4" +os_version = "9.5" os_arch = "aarch64" iso_url = "https://www.redhat.com/en/technologies/linux-platforms/enterprise-linux" iso_checksum = "none" parallels_guest_os_type = "rhel" -vbox_guest_os_type = "RedHat_64" +vbox_guest_os_type = "Oracle9_arm64" vmware_guest_os_type = "arm-rhel9-64" boot_command = ["<wait><up><wait><tab> inst.text inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/rhel/9ks.cfg<enter><wait>"] diff --git a/os_pkrvars/rhel/rhel-9-x86_64.pkrvars.hcl b/os_pkrvars/rhel/rhel-9-x86_64.pkrvars.hcl index 25909fb92..9e62b5923 100644 --- a/os_pkrvars/rhel/rhel-9-x86_64.pkrvars.hcl +++ b/os_pkrvars/rhel/rhel-9-x86_64.pkrvars.hcl @@ -1,5 +1,5 @@ os_name = "rhel" -os_version = "9.4" +os_version = "9.5" os_arch = "x86_64" iso_url = "https://www.redhat.com/en/technologies/linux-platforms/enterprise-linux" iso_checksum = "none" diff --git a/os_pkrvars/rockylinux/rockylinux-8-aarch64.pkrvars.hcl b/os_pkrvars/rockylinux/rockylinux-8-aarch64.pkrvars.hcl index 157d97c79..2a833e3ce 100644 --- a/os_pkrvars/rockylinux/rockylinux-8-aarch64.pkrvars.hcl +++ b/os_pkrvars/rockylinux/rockylinux-8-aarch64.pkrvars.hcl @@ -1,9 +1,9 @@ os_name = "rockylinux" os_version = "8.10" os_arch = "aarch64" -iso_url = "https://download.rockylinux.org/pub/rocky/8/isos/aarch64/Rocky-8.10-aarch64-minimal.iso" +iso_url = "https://download.rockylinux.org/pub/rocky/8/isos/aarch64/Rocky-8.10-aarch64-boot.iso" iso_checksum = "file:https://download.rockylinux.org/pub/rocky/8/isos/aarch64/CHECKSUM" parallels_guest_os_type = "centos" -vbox_guest_os_type = "RedHat_64" -vmware_guest_os_type = "arm-other-64" -boot_command = ["<wait><up>e<wait><down><down><end><wait> inst.text inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/rhel/8ks.cfg <leftCtrlOn>x<leftCtrlOff>"] +vbox_guest_os_type = "Oracle_arm64" +vmware_guest_os_type = "arm-rhel9-64" +boot_command = ["<wait><up>e<wait><down><down><end><wait> inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/rhel/8ks.cfg inst.repo=https://download.rockylinux.org/pub/rocky/8/BaseOS/aarch64/os/ <leftCtrlOn>x<leftCtrlOff>"] diff --git a/os_pkrvars/rockylinux/rockylinux-8-x86_64.pkrvars.hcl b/os_pkrvars/rockylinux/rockylinux-8-x86_64.pkrvars.hcl index 19ae2b407..505cef607 100644 --- a/os_pkrvars/rockylinux/rockylinux-8-x86_64.pkrvars.hcl +++ b/os_pkrvars/rockylinux/rockylinux-8-x86_64.pkrvars.hcl @@ -1,9 +1,9 @@ os_name = "rockylinux" os_version = "8.10" os_arch = "x86_64" -iso_url = "https://download.rockylinux.org/pub/rocky/8/isos/x86_64/Rocky-8.10-x86_64-minimal.iso" +iso_url = "https://download.rockylinux.org/pub/rocky/8/isos/x86_64/Rocky-8.10-x86_64-boot.iso" iso_checksum = "file:https://download.rockylinux.org/pub/rocky/8/isos/x86_64/CHECKSUM" parallels_guest_os_type = "centos" -vbox_guest_os_type = "RedHat_64" +vbox_guest_os_type = "Oracle_64" vmware_guest_os_type = "centos-64" -boot_command = ["<wait><up><wait><tab> inst.text inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/rhel/8ks.cfg<enter><wait>"] +boot_command = ["<wait><up><wait><tab> inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/rhel/8ks.cfg inst.repo=https://download.rockylinux.org/pub/rocky/8/BaseOS/x86_64/os/ <enter><wait>"] diff --git a/os_pkrvars/rockylinux/rockylinux-9-aarch64.pkrvars.hcl b/os_pkrvars/rockylinux/rockylinux-9-aarch64.pkrvars.hcl index 07b12be71..127999e53 100644 --- a/os_pkrvars/rockylinux/rockylinux-9-aarch64.pkrvars.hcl +++ b/os_pkrvars/rockylinux/rockylinux-9-aarch64.pkrvars.hcl @@ -1,9 +1,9 @@ os_name = "rockylinux" os_version = "9.5" os_arch = "aarch64" -iso_url = "https://download.rockylinux.org/pub/rocky/9/isos/aarch64/Rocky-9.5-aarch64-minimal.iso" +iso_url = "https://download.rockylinux.org/pub/rocky/9/isos/aarch64/Rocky-9.5-aarch64-boot.iso" iso_checksum = "file:https://download.rockylinux.org/pub/rocky/9/isos/aarch64/CHECKSUM" parallels_guest_os_type = "centos" -vbox_guest_os_type = "RedHat_64" +vbox_guest_os_type = "Oracle9_arm64" vmware_guest_os_type = "arm-rhel9-64" -boot_command = ["<wait><up>e<wait><down><down><end><wait> inst.text inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/rhel/9ks.cfg <leftCtrlOn>x<leftCtrlOff>"] +boot_command = ["<wait><up>e<wait><down><down><end><wait> inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/rhel/9ks.cfg inst.repo=https://download.rockylinux.org/pub/rocky/9/BaseOS/aarch64/os/ <leftCtrlOn>x<leftCtrlOff>"] diff --git a/os_pkrvars/rockylinux/rockylinux-9-x86_64.pkrvars.hcl b/os_pkrvars/rockylinux/rockylinux-9-x86_64.pkrvars.hcl index c692ff7fb..ee4c4501b 100644 --- a/os_pkrvars/rockylinux/rockylinux-9-x86_64.pkrvars.hcl +++ b/os_pkrvars/rockylinux/rockylinux-9-x86_64.pkrvars.hcl @@ -1,9 +1,9 @@ os_name = "rockylinux" os_version = "9.5" os_arch = "x86_64" -iso_url = "https://download.rockylinux.org/pub/rocky/9/isos/x86_64/Rocky-9.5-x86_64-dvd.iso" +iso_url = "https://download.rockylinux.org/pub/rocky/9/isos/x86_64/Rocky-9.5-x86_64-boot.iso" iso_checksum = "file:https://download.rockylinux.org/pub/rocky/9/isos/x86_64/CHECKSUM" parallels_guest_os_type = "centos" -vbox_guest_os_type = "RedHat_64" +vbox_guest_os_type = "Oracle_64" vmware_guest_os_type = "centos-64" -boot_command = ["<wait><up><wait><tab> inst.text inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/rhel/9ks.cfg<enter><wait>"] +boot_command = ["<wait><up><wait><tab> inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/rhel/9ks.cfg inst.repo=https://download.rockylinux.org/pub/rocky/9/BaseOS/x86_64/os/ <enter><wait>"] diff --git a/os_pkrvars/sles/sles-12-x86_64.pkrvars.hcl b/os_pkrvars/sles/sles-12-x86_64.pkrvars.hcl deleted file mode 100644 index a1e7e7266..000000000 --- a/os_pkrvars/sles/sles-12-x86_64.pkrvars.hcl +++ /dev/null @@ -1,9 +0,0 @@ -os_name = "suse" -os_version = "12.5" -os_arch = "x86_64" -iso_url = "https://updates.suse.com/SUSE/Products/SLE-SERVER/12-SP5/x86_64/iso/SLE-12-SP5-Server-DVD-x86_64-GM-DVD1.iso" -iso_checksum = "5a12561f8c2869bca4f820787971f3b92f44dce77442906115cd21c359327b9f" -parallels_guest_os_type = "suse" -vbox_guest_os_type = "SUSE_LE_64" -vmware_guest_os_type = "sles12-64" -boot_command = ["<wait><esc><enter><wait>linux netdevice=eth0 netsetup=dhcp install=cd:/<wait> lang=en_US autoyast=http://{{ .HTTPIP }}:{{ .HTTPPort }}/sles/12-autoinst.xml<wait> textmode=1<wait><enter><wait>"] diff --git a/os_pkrvars/sles/sles-15-aarch64.pkrvars.hcl b/os_pkrvars/sles/sles-15-aarch64.pkrvars.hcl new file mode 100644 index 000000000..bbd11fe89 --- /dev/null +++ b/os_pkrvars/sles/sles-15-aarch64.pkrvars.hcl @@ -0,0 +1,9 @@ +os_name = "suse" +os_version = "15.6" +os_arch = "aarch64" +iso_url = "https://updates.suse.com/SUSE/Products/SLE-Product-SLES/15-SP6/aarch64/iso/SLE-15-SP6-Online-aarch64-GM-Media1.iso" +iso_checksum = "56f67a6d10a502901cc2c291231089e375dd7c2b51fc951d5deaa57439c2686e" +parallels_guest_os_type = "opensuse" +vbox_guest_os_type = "OpenSUSE_Leap_arm64" +vmware_guest_os_type = "arm-other-64" +boot_command = ["<wait><esc><enter><wait>linux netdevice=eth0 netsetup=dhcp install=cd:/<wait> lang=en_US autoyast=http://{{ .HTTPIP }}:{{ .HTTPPort }}/sles/15-autoinst.xml<wait> textmode=1<wait><enter><wait>"] diff --git a/os_pkrvars/sles/sles-15-x86_64.pkrvars.hcl b/os_pkrvars/sles/sles-15-x86_64.pkrvars.hcl index bf705c990..4e3686e96 100644 --- a/os_pkrvars/sles/sles-15-x86_64.pkrvars.hcl +++ b/os_pkrvars/sles/sles-15-x86_64.pkrvars.hcl @@ -1,8 +1,8 @@ os_name = "suse" -os_version = "15.5" +os_version = "15.6" os_arch = "x86_64" -iso_url = "https://updates.suse.com/SUSE/Products/SLE-Product-SLES/15-SP5/x86_64/iso/SLE-15-SP5-Online-x86_64-GM-Media1.iso" -iso_checksum = "b0920189fd7f2624983a9cf8bc062bbb7a8557658e3feadde77b80e72f66b6ef" +iso_url = "https://updates.suse.com/SUSE/Products/SLE-Product-SLES/15-SP6/x86_64/iso/SLE-15-SP6-Online-x86_64-GM-Media1.iso" +iso_checksum = "c816a46b76de157e49d6b931284b9827b3781260f0cdd2a365296246313dd7ce" parallels_guest_os_type = "suse" vbox_guest_os_type = "SUSE_LE_64" vmware_guest_os_type = "sles15-64" diff --git a/os_pkrvars/ubuntu/ubuntu-20.04-aarch64.pkrvars.hcl b/os_pkrvars/ubuntu/ubuntu-20.04-aarch64.pkrvars.hcl deleted file mode 100644 index f24afed1b..000000000 --- a/os_pkrvars/ubuntu/ubuntu-20.04-aarch64.pkrvars.hcl +++ /dev/null @@ -1,9 +0,0 @@ -os_name = "ubuntu" -os_version = "20.04" -os_arch = "aarch64" -iso_url = "http://cdimage.ubuntu.com/releases/focal/release/ubuntu-20.04.5-live-server-arm64.iso" -iso_checksum = "file:https://cdimage.ubuntu.com/releases/focal/release/SHA256SUMS" -parallels_guest_os_type = "ubuntu" -vbox_guest_os_type = "Ubuntu_64" -vmware_guest_os_type = "arm-ubuntu-64" -boot_command = ["<wait><esc>linux /casper/vmlinuz quiet autoinstall ds='nocloud-net;s=http://{{.HTTPIP}}:{{.HTTPPort}}/ubuntu/'<enter>initrd /casper/initrd<enter>boot<enter>"] diff --git a/os_pkrvars/ubuntu/ubuntu-20.04-x86_64.pkrvars.hcl b/os_pkrvars/ubuntu/ubuntu-20.04-x86_64.pkrvars.hcl deleted file mode 100644 index 1b7b9a2e9..000000000 --- a/os_pkrvars/ubuntu/ubuntu-20.04-x86_64.pkrvars.hcl +++ /dev/null @@ -1,9 +0,0 @@ -os_name = "ubuntu" -os_version = "20.04" -os_arch = "x86_64" -iso_url = "https://releases.ubuntu.com/focal/ubuntu-20.04.6-live-server-amd64.iso" -iso_checksum = "file:https://releases.ubuntu.com/focal/SHA256SUMS" -parallels_guest_os_type = "ubuntu" -vbox_guest_os_type = "Ubuntu_64" -vmware_guest_os_type = "ubuntu-64" -boot_command = ["<wait><enter><wait><enter><wait><f6><wait><esc><wait> autoinstall ds=nocloud-net;seedfrom=http://{{ .HTTPIP }}:{{ .HTTPPort }}/ubuntu/<enter><wait>"] diff --git a/os_pkrvars/ubuntu/ubuntu-22.04-aarch64.pkrvars.hcl b/os_pkrvars/ubuntu/ubuntu-22.04-aarch64.pkrvars.hcl index 783648773..b7005a4c9 100644 --- a/os_pkrvars/ubuntu/ubuntu-22.04-aarch64.pkrvars.hcl +++ b/os_pkrvars/ubuntu/ubuntu-22.04-aarch64.pkrvars.hcl @@ -4,6 +4,6 @@ os_arch = "aarch64" iso_url = "https://cdimage.ubuntu.com/releases/jammy/release/ubuntu-22.04.5-live-server-arm64.iso" iso_checksum = "file:https://cdimage.ubuntu.com/releases/jammy/release/SHA256SUMS" parallels_guest_os_type = "ubuntu" -vbox_guest_os_type = "Ubuntu_64" +vbox_guest_os_type = "Ubuntu_arm64" vmware_guest_os_type = "arm-ubuntu-64" boot_command = ["<wait>e<wait><down><down><down><end><wait> autoinstall ds=nocloud-net\\;s=http://{{.HTTPIP}}:{{.HTTPPort}}/ubuntu/<f10><wait>"] diff --git a/os_pkrvars/ubuntu/ubuntu-24.04-aarch64.pkrvars.hcl b/os_pkrvars/ubuntu/ubuntu-24.04-aarch64.pkrvars.hcl index 370ecaf15..84c824532 100644 --- a/os_pkrvars/ubuntu/ubuntu-24.04-aarch64.pkrvars.hcl +++ b/os_pkrvars/ubuntu/ubuntu-24.04-aarch64.pkrvars.hcl @@ -1,9 +1,9 @@ os_name = "ubuntu" os_version = "24.04" os_arch = "aarch64" -iso_url = "https://cdimage.ubuntu.com/releases/noble/release/ubuntu-24.04.1-live-server-arm64.iso" +iso_url = "https://cdimage.ubuntu.com/releases/noble/release/ubuntu-24.04.2-live-server-arm64.iso" iso_checksum = "file:https://cdimage.ubuntu.com/releases/noble/release/SHA256SUMS" parallels_guest_os_type = "ubuntu" -vbox_guest_os_type = "Ubuntu_64" +vbox_guest_os_type = "Ubuntu24_LTS_arm64" vmware_guest_os_type = "arm-ubuntu-64" boot_command = ["<wait>e<wait><down><down><down><end> autoinstall ds=nocloud-net\\;s=http://{{.HTTPIP}}:{{.HTTPPort}}/ubuntu/<wait><f10><wait>"] diff --git a/os_pkrvars/ubuntu/ubuntu-24.04-x86_64.pkrvars.hcl b/os_pkrvars/ubuntu/ubuntu-24.04-x86_64.pkrvars.hcl index 57924fc2c..8d8c56aab 100644 --- a/os_pkrvars/ubuntu/ubuntu-24.04-x86_64.pkrvars.hcl +++ b/os_pkrvars/ubuntu/ubuntu-24.04-x86_64.pkrvars.hcl @@ -1,7 +1,7 @@ os_name = "ubuntu" os_version = "24.04" os_arch = "x86_64" -iso_url = "https://releases.ubuntu.com/noble/ubuntu-24.04.1-live-server-amd64.iso" +iso_url = "https://releases.ubuntu.com/noble/ubuntu-24.04.2-live-server-amd64.iso" iso_checksum = "file:https://releases.ubuntu.com/noble/SHA256SUMS" parallels_guest_os_type = "ubuntu" vbox_guest_os_type = "Ubuntu_64" diff --git a/os_pkrvars/ubuntu/ubuntu-24.10-aarch64.pkrvars.hcl b/os_pkrvars/ubuntu/ubuntu-24.10-aarch64.pkrvars.hcl deleted file mode 100644 index 329d4c474..000000000 --- a/os_pkrvars/ubuntu/ubuntu-24.10-aarch64.pkrvars.hcl +++ /dev/null @@ -1,9 +0,0 @@ -os_name = "ubuntu" -os_version = "24.10" -os_arch = "aarch64" -iso_url = "https://cdimage.ubuntu.com/releases/oracular/release/ubuntu-24.10-live-server-arm64.iso" -iso_checksum = "file:https://cdimage.ubuntu.com/releases/oracular/release/SHA256SUMS" -parallels_guest_os_type = "ubuntu" -vbox_guest_os_type = "Ubuntu_64" -vmware_guest_os_type = "arm-ubuntu-64" -boot_command = ["<wait>e<wait><down><down><down><end> autoinstall ds=nocloud-net\\;s=http://{{.HTTPIP}}:{{.HTTPPort}}/ubuntu/<wait><f10><wait>"] diff --git a/os_pkrvars/ubuntu/ubuntu-24.10-x86_64.pkrvars.hcl b/os_pkrvars/ubuntu/ubuntu-24.10-x86_64.pkrvars.hcl deleted file mode 100644 index f77c1d40b..000000000 --- a/os_pkrvars/ubuntu/ubuntu-24.10-x86_64.pkrvars.hcl +++ /dev/null @@ -1,9 +0,0 @@ -os_name = "ubuntu" -os_version = "24.10" -os_arch = "x86_64" -iso_url = "https://releases.ubuntu.com/oracular/ubuntu-24.10-live-server-amd64.iso" -iso_checksum = "file:https://releases.ubuntu.com/oracular/SHA256SUMS" -parallels_guest_os_type = "ubuntu" -vbox_guest_os_type = "Ubuntu_64" -vmware_guest_os_type = "ubuntu-64" -boot_command = ["<wait>e<wait><down><down><down><end> autoinstall ds=nocloud-net\\;s=http://{{.HTTPIP}}:{{.HTTPPort}}/ubuntu/<wait><f10><wait>"] diff --git a/os_pkrvars/windows/windows-2022-x86_64.pkrvars.hcl b/os_pkrvars/windows/windows-2022-x86_64.pkrvars.hcl index 6c45a4baa..4e561032f 100644 --- a/os_pkrvars/windows/windows-2022-x86_64.pkrvars.hcl +++ b/os_pkrvars/windows/windows-2022-x86_64.pkrvars.hcl @@ -3,7 +3,7 @@ os_version = "2022" os_arch = "x86_64" is_windows = true iso_url = "https://software-static.download.prss.microsoft.com/sg/download/888969d5-f34g-4e03-ac9d-1f9786c66749/SERVER_EVAL_x64FRE_en-us.iso" -iso_checksum = "sha256:3e4fa6d8507b554856fc9ca6079cc402df11a8b79344871669f0251535255325" +iso_checksum = "sha256:d0ef4502e350e3c6c53c15b1b3020d38a5ded011bf04998e950720ac8579b23d" parallels_guest_os_type = "win-2022" vbox_guest_os_type = "Windows2022_64" vmware_guest_os_type = "windows9srv-64" diff --git a/os_pkrvars/windows/windows-2025-x86_64.pkrvars.hcl b/os_pkrvars/windows/windows-2025-x86_64.pkrvars.hcl new file mode 100644 index 000000000..97d46b897 --- /dev/null +++ b/os_pkrvars/windows/windows-2025-x86_64.pkrvars.hcl @@ -0,0 +1,9 @@ +os_name = "windows" +os_version = "2025" +os_arch = "x86_64" +is_windows = true +iso_url = "https://software-static.download.prss.microsoft.com/dbazure/888969d5-f34g-4e03-ac9d-1f9786c66749/26100.1742.240906-0331.ge_release_svc_refresh_SERVER_EVAL_x64FRE_en-us.iso" +iso_checksum = "sha256:3e4fa6d8507b554856fc9ca6079cc402df11a8b79344871669f0251535255325" +parallels_guest_os_type = "win-2022" +vbox_guest_os_type = "Windows2022_64" +vmware_guest_os_type = "windows9srv-64" diff --git a/packer_templates/http/freebsd/installerconfig b/packer_templates/http/freebsd/installerconfig index 726c8130d..6e332595b 100644 --- a/packer_templates/http/freebsd/installerconfig +++ b/packer_templates/http/freebsd/installerconfig @@ -28,8 +28,13 @@ HOSTNAME=freebsd ifdev=$(ifconfig | grep '^[a-z]' | cut -d: -f1 | head -n 1) # Enable required services cat >> /etc/rc.conf << EOT +clear_tmp_enable="YES" +syslogd_flags="-ss" +sendmail_enable="NONE" ifconfig_${ifdev}="dhcp" sshd_enable="YES" +dumpdev="NO" +zfs_enable="YES" EOT # Tune and boot from zfs @@ -62,4 +67,5 @@ echo "vagrant" | pw -V /etc usermod root mkdir -p ${home_base}/vagrant chown 1001:1001 ${home_base}/vagrant +cdcontrol eject reboot diff --git a/packer_templates/http/opensuse/autoinst-uefi.xml b/packer_templates/http/opensuse/autoinst-uefi.xml index a13ae7f02..d81616191 100644 --- a/packer_templates/http/opensuse/autoinst-uefi.xml +++ b/packer_templates/http/opensuse/autoinst-uefi.xml @@ -1,6 +1,14 @@ <?xml version="1.0"?> <!DOCTYPE profile> +<!-- http://doc.opensuse.org/projects/autoyast/configuration.html --> <profile xmlns="http://www.suse.com/1.0/yast2ns" xmlns:config="http://www.suse.com/1.0/configns"> + <general t="map"> + <mode t="map"> + <confirm t="boolean">false</confirm> + <forceboot config:type="boolean">true</forceboot> + <final_reboot config:type="boolean">false</final_reboot> + </mode> + </general> <report> <messages> <show config:type="boolean">false</show> @@ -25,62 +33,10 @@ <language>en_US</language> <languages>en_US</languages> </language> - <bootloader t="map"> - <global t="map"> - <append>splash=silent biosdevname=0 net.ifnames=0 modprobe.blacklist=vmwgfx preempt=full mitigations=auto quiet</append> - <secure_boot>false</secure_boot> - <terminal>console</terminal> - <timeout t="integer">1</timeout> - <update_nvram>true</update_nvram> - </global> - <loader_type>grub2-efi</loader_type> - </bootloader> - <firewall t="map"> - <enable_firewall t="boolean">false</enable_firewall> - <start_firewall t="boolean">false</start_firewall> - </firewall> - <general t="map"> - <mode t="map"> - <confirm t="boolean">false</confirm> - <forceboot config:type="boolean">true</forceboot> - <final_reboot config:type="boolean">false</final_reboot> - </mode> - </general> - <groups t="list"> - <group t="map"> - <gid>100</gid> - <groupname>users</groupname> - <userlist/> - </group> - </groups> - <networking t="map"> - <ipv6 t="boolean">false</ipv6> - <keep_install_network t="boolean">true</keep_install_network> - <dns t="map"> - <dhcp_hostname t="boolean">false</dhcp_hostname> - <hostname>opensuse15.localdomain</hostname> - <domain>localdomain</domain> - </dns> - <interfaces t="list"> - <interface t="map"> - <bootproto>dhcp</bootproto> - <name>eth0</name> - <startmode>auto</startmode> - <zone>public</zone> - </interface> - </interfaces> - </networking> - <ntp-client t="map"> - <ntp_policy>auto</ntp_policy> - <ntp_servers t="list"> - <ntp_server t="map"> - <address>1.opensuse.pool.ntp.org</address> - <iburst t="boolean">true</iburst> - <offline t="boolean">false</offline> - </ntp_server> - </ntp_servers> - <ntp_sync>systemd</ntp_sync> - </ntp-client> + <timezone t="map"> + <hwclock>UTC</hwclock> + <timezone>Etc/UTC</timezone> + </timezone> <partitioning t="list"> <drive t="map"> <device>/dev/sda</device> @@ -164,14 +120,37 @@ <use>all</use> </drive> </partitioning> - <services-manager t="map"> - <default_target>multi-user</default_target> - <services t="map"> - <enable t="list"> - <service>sshd</service> - </enable> - </services> - </services-manager> + <bootloader t="map"> + <global t="map"> + <append>splash=silent biosdevname=0 net.ifnames=0 modprobe.blacklist=vmwgfx preempt=full mitigations=auto quiet</append> + <secure_boot>false</secure_boot> + <terminal>console</terminal> + <timeout t="integer">1</timeout> + <update_nvram>true</update_nvram> + </global> + <loader_type>grub2-efi</loader_type> + </bootloader> + <networking t="map"> + <ipv6 t="boolean">false</ipv6> + <keep_install_network t="boolean">true</keep_install_network> + <dns t="map"> + <dhcp_hostname t="boolean">false</dhcp_hostname> + <hostname>opensuse15.localdomain</hostname> + <domain>localdomain</domain> + </dns> + <interfaces t="list"> + <interface t="map"> + <bootproto>dhcp</bootproto> + <name>eth0</name> + <startmode>auto</startmode> + <zone>public</zone> + </interface> + </interfaces> + </networking> + <firewall t="map"> + <enable_firewall t="boolean">false</enable_firewall> + <start_firewall t="boolean">false</start_firewall> + </firewall> <software t="map"> <instsource/> <packages t="list"> @@ -216,10 +195,21 @@ <product>Leap</product> </products> </software> - <timezone t="map"> - <hwclock>UTC</hwclock> - <timezone>Etc/UTC</timezone> - </timezone> + <services-manager t="map"> + <default_target>multi-user</default_target> + <services t="map"> + <enable t="list"> + <service>sshd</service> + </enable> + </services> + </services-manager> + <groups t="list"> + <group t="map"> + <gid>100</gid> + <groupname>users</groupname> + <userlist/> + </group> + </groups> <user_defaults t="map"> <expire/> <group>100</group> @@ -261,13 +251,25 @@ <script> <filename>post.sh</filename> <interpreter>shell</interpreter> - <source><![CDATA[ + <source><![CDATA[ #!/bin/bash dmesg | grep -E "Hypervisor detected: Microsoft HyperV|Hypervisor detected: Microsoft Hyper-V" if [ $? -eq 0 ]; then systemctl enable hv_kvp_daemon.service ; fi +eject -v ]]> - </source> - </script> - </post-scripts> - </scripts> + </source> + </script> + </post-scripts> + </scripts> + <ntp-client t="map"> + <ntp_policy>auto</ntp_policy> + <ntp_servers t="list"> + <ntp_server t="map"> + <address>1.opensuse.pool.ntp.org</address> + <iburst t="boolean">true</iburst> + <offline t="boolean">false</offline> + </ntp_server> + </ntp_servers> + <ntp_sync>systemd</ntp_sync> + </ntp-client> </profile> diff --git a/packer_templates/http/opensuse/autoinst.xml b/packer_templates/http/opensuse/autoinst.xml index 4b1a823a2..d17649980 100644 --- a/packer_templates/http/opensuse/autoinst.xml +++ b/packer_templates/http/opensuse/autoinst.xml @@ -96,11 +96,11 @@ </partitioning> <bootloader> <loader_type>grub2</loader_type> - <global> - <activate>true</activate> - <timeout config:type="integer">1</timeout> - <boot_mbr>true</boot_mbr> - </global> + <global> + <activate>true</activate> + <timeout config:type="integer">1</timeout> + <boot_mbr>true</boot_mbr> + </global> </bootloader> <networking> <ipv6 config:type="boolean">false</ipv6> @@ -222,14 +222,14 @@ <script> <filename>post.sh</filename> <interpreter>shell</interpreter> - <source><![CDATA[ + <source><![CDATA[ #!/bin/bash dmesg | grep -E "Hypervisor detected: Microsoft HyperV|Hypervisor detected: Microsoft Hyper-V" if [ $? -eq 0 ]; then systemctl enable hv_kvp_daemon.service ; fi +eject -v ]]> - </source> - </script> - </post-scripts> - </scripts> - + </source> + </script> + </post-scripts> + </scripts> </profile> diff --git a/packer_templates/http/rhel/10ks.cfg b/packer_templates/http/rhel/10ks.cfg new file mode 100644 index 000000000..08ea88322 --- /dev/null +++ b/packer_templates/http/rhel/10ks.cfg @@ -0,0 +1,57 @@ +lang en_US.UTF-8 +keyboard us +network --bootproto=dhcp --noipv6 --onboot=on --device=eth0 --activate +rootpw --plaintext vagrant +firewall --enabled --ssh +selinux --enforcing +timezone UTC +bootloader --timeout=0 --location=mbr --append="console=tty0 console=ttyS0,115200n8 no_timer_check" +text +skipx +zerombr +clearpart --all --initlabel +autopart --nohome --nolvm --noboot +firstboot --disabled +reboot --eject +user --name=vagrant --plaintext --password vagrant +services --enabled=sshd + +%addon com_redhat_kdump --disable +%end + +%packages --ignoremissing --excludedocs +@^server-product-environment +# vagrant needs this to copy initial files via scp +openssh-clients +sudo +selinux-policy-devel +wget +nfs-utils +net-tools +tar +bzip2 +deltarpm +rsync +dnf-utils +redhat-lsb-core +elfutils-libelf-devel +-dracut-config-rescue +-fprintd-pam +-intltool +-*firmware +-microcode_ctl +%end + +%post +# sudo +echo 'Defaults:vagrant !requiretty' > /etc/sudoers.d/vagrant +echo '%vagrant ALL=(ALL) NOPASSWD: ALL' >> /etc/sudoers.d/vagrant +chmod 440 /etc/sudoers.d/vagrant + +# Enable hyper-v daemons only if using hyper-v virtualization +if [ $(virt-what) == "hyperv" ]; then + dnf -y install hyperv-daemons cifs-utils + systemctl enable hypervvssd + systemctl enable hypervkvpd +fi +%end diff --git a/packer_templates/http/rhel/7ks.cfg b/packer_templates/http/rhel/7ks.cfg deleted file mode 100644 index ce5b2d96b..000000000 --- a/packer_templates/http/rhel/7ks.cfg +++ /dev/null @@ -1,77 +0,0 @@ -install -cdrom -lang en_US.UTF-8 -keyboard us -network --bootproto=dhcp --noipv6 --onboot=on --device=eth0 -rootpw --plaintext vagrant -firewall --disabled -selinux --permissive -timezone UTC -unsupported_hardware -bootloader --timeout=1 --location=mbr --append="net.ifnames=0 biosdevname=0" -text -skipx -zerombr -clearpart --all --initlabel -autopart --nohome --nolvm -auth --enableshadow --passalgo=sha512 --kickstart -firstboot --disabled -reboot --eject -user --name=vagrant --plaintext --password vagrant - -%packages --nobase --ignoremissing --excludedocs --instLangs=en_US.utf8 -# vagrant needs this to copy initial files via scp -openssh-clients -sudo -selinux-policy-devel -wget -nfs-utils -net-tools -tar -bzip2 -deltarpm -rsync --fprintd-pam --intltool - -# unnecessary firmware --*firmware --microcode_ctl -%end - -%post -# sudo -echo 'Defaults:vagrant !requiretty' > /etc/sudoers.d/vagrant -echo '%vagrant ALL=(ALL) NOPASSWD: ALL' >> /etc/sudoers.d/vagrant -chmod 440 /etc/sudoers.d/vagrant - -# Enable hyper-v daemons only if using hyper-v virtualization -if [ $(virt-what) == "hyperv" ]; then - yum -y install hyperv-daemons cifs-utils - systemctl enable hypervvssd - systemctl enable hypervkvpd -fi - -# Since we disable consistent network naming, we need to make sure the eth0 -# configuration file is in place so it will come up. -# Delete other network configuration first because RHEL/C7 networking will not -# restart successfully if there are configuration files for devices that do not -# exist. -rm -f /etc/sysconfig/network-scripts/ifcfg-e* -cat > /etc/sysconfig/network-scripts/ifcfg-eth0 << _EOF_ -TYPE=Ethernet -PROXY_METHOD=none -BROWSER_ONLY=no -BOOTPROTO=dhcp -DEFROUTE=yes -IPV4_FAILURE_FATAL=no -IPV6INIT=yes -IPV6_AUTOCONF=yes -IPV6_DEFROUTE=yes -IPV6_FAILURE_FATAL=no -IPV6_ADDR_GEN_MODE=stable-privacy -NAME=eth0 -DEVICE=eth0 -ONBOOT=yes -_EOF_ -%end diff --git a/packer_templates/http/rhel/8ks.cfg b/packer_templates/http/rhel/8ks.cfg index 595f4950f..f8f8917b4 100644 --- a/packer_templates/http/rhel/8ks.cfg +++ b/packer_templates/http/rhel/8ks.cfg @@ -1,13 +1,11 @@ -install -cdrom lang en_US.UTF-8 keyboard us -network --bootproto=dhcp --noipv6 --onboot=on --device=eth0 +network --bootproto=dhcp --noipv6 --onboot=on --device=eth0 --activate rootpw --plaintext vagrant -firewall --disabled -selinux --permissive +firewall --enabled --ssh +selinux --enforcing timezone UTC -bootloader --timeout=1 --location=mbr --append="net.ifnames=0 biosdevname=0" +bootloader --timeout=0 --location=mbr --append="console=tty0 console=ttyS0,115200n8 no_timer_check net.ifnames=0 biosdevname=0" text skipx zerombr @@ -16,8 +14,10 @@ autopart --nohome --nolvm --noboot firstboot --disabled reboot --eject user --name=vagrant --plaintext --password vagrant +services --disabled=kdump --enabled=sshd %packages --ignoremissing --excludedocs --instLangs=en_US.utf8 +@^server-product-environment # vagrant needs this to copy initial files via scp openssh-clients sudo @@ -33,6 +33,7 @@ dnf-utils redhat-lsb-core elfutils-libelf-devel network-scripts +-dracut-config-rescue -fprintd-pam -intltool -iwl*-firmware @@ -47,9 +48,9 @@ chmod 440 /etc/sudoers.d/vagrant # Enable hyper-v daemons only if using hyper-v virtualization if [ $(virt-what) == "hyperv" ]; then - dnf -y install hyperv-daemons cifs-utils - systemctl enable hypervvssd - systemctl enable hypervkvpd + dnf -y install hyperv-daemons cifs-utils + systemctl enable hypervvssd + systemctl enable hypervkvpd fi # Since we disable consistent network naming, we need to make sure the eth0 @@ -61,16 +62,16 @@ rm -f /etc/sysconfig/network-scripts/ifcfg-e* cat > /etc/sysconfig/network-scripts/ifcfg-eth0 << _EOF_ TYPE=Ethernet PROXY_METHOD=none -BROWSER_ONLY=no -BOOTPROTO=dhcp -DEFROUTE=yes + BROWSER_ONLY=no + BOOTPROTO=dhcp + DEFROUTE=yes IPV4_FAILURE_FATAL=no IPV6INIT=yes IPV6_AUTOCONF=yes IPV6_DEFROUTE=yes -IPV6_FAILURE_FATAL=no -IPV6_ADDR_GEN_MODE=stable-privacy -NAME=eth0 + IPV6_FAILURE_FATAL=no + IPV6_ADDR_GEN_MODE=stable-privacy + NAME=eth0 DEVICE=eth0 ONBOOT=yes _EOF_ diff --git a/packer_templates/http/rhel/9ks.cfg b/packer_templates/http/rhel/9ks.cfg index 0ea7d91af..0581ad088 100644 --- a/packer_templates/http/rhel/9ks.cfg +++ b/packer_templates/http/rhel/9ks.cfg @@ -1,12 +1,11 @@ -cdrom lang en_US.UTF-8 keyboard us -network --bootproto=dhcp --noipv6 --onboot=on --device=eth0 +network --bootproto=dhcp --noipv6 --onboot=on --device=eth0 --activate rootpw --plaintext vagrant -firewall --disabled -selinux --permissive +firewall --enabled --ssh +selinux --enforcing timezone UTC -bootloader --timeout=1 --location=mbr --append="net.ifnames=0 biosdevname=0" +bootloader --timeout=0 --location=mbr --append="console=tty0 console=ttyS0,115200n8 no_timer_check net.ifnames=0 biosdevname=0" text skipx zerombr @@ -15,8 +14,13 @@ autopart --nohome --nolvm --noboot firstboot --disabled reboot --eject user --name=vagrant --plaintext --password vagrant +services --enabled=sshd + +%addon com_redhat_kdump --disable +%end %packages --ignoremissing --excludedocs +@^server-product-environment # vagrant needs this to copy initial files via scp openssh-clients sudo @@ -32,9 +36,10 @@ dnf-utils redhat-lsb-core elfutils-libelf-devel network-scripts +-dracut-config-rescue -fprintd-pam -intltool --iwl*-firmware +-*firmware -microcode_ctl %end @@ -46,9 +51,9 @@ chmod 440 /etc/sudoers.d/vagrant # Enable hyper-v daemons only if using hyper-v virtualization if [ $(virt-what) == "hyperv" ]; then -dnf -y install hyperv-daemons cifs-utils -systemctl enable hypervvssd -systemctl enable hypervkvpd + dnf -y install hyperv-daemons cifs-utils + systemctl enable hypervvssd + systemctl enable hypervkvpd fi # Since we disable consistent network naming, we need to make sure the eth0 diff --git a/packer_templates/pkr-builder.pkr.hcl b/packer_templates/pkr-builder.pkr.hcl index 7e0754510..f90e7df70 100644 --- a/packer_templates/pkr-builder.pkr.hcl +++ b/packer_templates/pkr-builder.pkr.hcl @@ -2,7 +2,7 @@ packer { required_version = ">= 1.7.0" required_plugins { hyperv = { - version = ">= 1.0.0" + version = ">= 1.0.3" source = "github.com/hashicorp/hyperv" } parallels = { @@ -14,15 +14,15 @@ packer { source = "github.com/hashicorp/qemu" } vagrant = { - version = ">= 1.0.2" + version = ">= 1.1.0" source = "github.com/hashicorp/vagrant" } virtualbox = { - version = ">= 0.0.1" + version = ">= 1.0.3" source = "github.com/hashicorp/virtualbox" } vmware = { - version = ">= 1.0.9" + version = ">= 1.1.0" source = "github.com/hashicorp/vmware" } windows-update = { @@ -52,8 +52,8 @@ locals { var.os_name == "macos" ? [ "${path.root}/scripts/macos/system-default.sh", "${path.root}/scripts/macos/system-update.sh", - "${path.root}/scripts/macos/vagrant.sh", "${path.root}/scripts/_common/motd.sh", + "${path.root}/scripts/macos/vagrant.sh", "${path.root}/scripts/macos/parallels-tools.sh", "${path.root}/scripts/macos/vmware-tools.sh", "${path.root}/scripts/macos/shrink.sh" @@ -82,7 +82,7 @@ locals { "${path.root}/scripts/_common/vagrant.sh", "${path.root}/scripts/suse/unsupported-modules_suse.sh", "${path.root}/scripts/_common/virtualbox.sh", - "${path.root}/scripts/_common/vmware_suse.sh", + "${path.root}/scripts/_common/vmware.sh", "${path.root}/scripts/_common/parallels.sh", "${path.root}/scripts/suse/vagrant_group_suse.sh", "${path.root}/scripts/suse/sudoers_suse.sh", @@ -101,7 +101,7 @@ locals { "${path.root}/scripts/_common/vagrant.sh", "${path.root}/scripts/${var.os_name}/systemd_${var.os_name}.sh", "${path.root}/scripts/_common/virtualbox.sh", - "${path.root}/scripts/_common/vmware_debian_ubuntu.sh", + "${path.root}/scripts/_common/vmware.sh", "${path.root}/scripts/_common/parallels.sh", "${path.root}/scripts/${var.os_name}/hyperv_${var.os_name}.sh", "${path.root}/scripts/${var.os_name}/cleanup_${var.os_name}.sh", @@ -111,41 +111,28 @@ locals { var.os_name == "fedora" ? [ "${path.root}/scripts/fedora/networking_fedora.sh", "${path.root}/scripts/fedora/update_dnf.sh", - "${path.root}/scripts/fedora/build-tools_fedora.sh", - "${path.root}/scripts/fedora/install-supporting-packages_fedora.sh", "${path.root}/scripts/_common/motd.sh", "${path.root}/scripts/_common/sshd.sh", + "${path.root}/scripts/fedora/install-supporting-packages_fedora.sh", + "${path.root}/scripts/fedora/build-tools_fedora.sh", "${path.root}/scripts/_common/virtualbox.sh", - "${path.root}/scripts/_common/vmware_fedora.sh", - "${path.root}/scripts/_common/parallels-rhel.sh", + "${path.root}/scripts/_common/vmware.sh", + "${path.root}/scripts/_common/parallels.sh", "${path.root}/scripts/_common/vagrant.sh", "${path.root}/scripts/fedora/real-tmp_fedora.sh", "${path.root}/scripts/fedora/cleanup_dnf.sh", "${path.root}/scripts/_common/minimize.sh" - ] : ( - "${var.os_name}-${var.os_version}" == "amazonlinux-2" ? [ - "${path.root}/scripts/rhel/update_yum.sh", - "${path.root}/scripts/_common/motd.sh", - "${path.root}/scripts/_common/sshd.sh", - "${path.root}/scripts/rhel/networking_rhel7.sh", - "${path.root}/scripts/_common/vagrant.sh", - "${path.root}/scripts/_common/virtualbox.sh", - "${path.root}/scripts/_common/vmware_rhel.sh", - "${path.root}/scripts/_common/parallels-rhel.sh", - "${path.root}/scripts/rhel/cleanup_yum.sh", - "${path.root}/scripts/_common/minimize.sh" - ] : [ - "${path.root}/scripts/rhel/update_dnf.sh", - "${path.root}/scripts/_common/motd.sh", - "${path.root}/scripts/_common/sshd.sh", - "${path.root}/scripts/_common/vagrant.sh", - "${path.root}/scripts/_common/virtualbox.sh", - "${path.root}/scripts/_common/vmware_rhel.sh", - "${path.root}/scripts/_common/parallels-rhel.sh", - "${path.root}/scripts/rhel/cleanup_dnf.sh", - "${path.root}/scripts/_common/minimize.sh" - ] - ) + ] : [ + "${path.root}/scripts/rhel/update_dnf.sh", + "${path.root}/scripts/_common/motd.sh", + "${path.root}/scripts/_common/sshd.sh", + "${path.root}/scripts/_common/vagrant.sh", + "${path.root}/scripts/_common/virtualbox.sh", + "${path.root}/scripts/_common/vmware.sh", + "${path.root}/scripts/_common/parallels.sh", + "${path.root}/scripts/rhel/cleanup_dnf.sh", + "${path.root}/scripts/_common/minimize.sh" + ] ) ) ) diff --git a/packer_templates/pkr-sources.pkr.hcl b/packer_templates/pkr-sources.pkr.hcl index d8aefb8c7..3dde90f8f 100644 --- a/packer_templates/pkr-sources.pkr.hcl +++ b/packer_templates/pkr-sources.pkr.hcl @@ -24,14 +24,20 @@ locals { var.os_arch == "x86_64" ? [ ["set", "{{ .Name }}", "--efi-boot", "off"] ] : [ - ["set", "{{ .Name }}", "--efi-boot", "off"], + ["set", "{{ .Name }}", "--efi-boot", "on"], ["set", "{{ .Name }}", "--efi-secure-boot", "off"], ["set", "{{ .Name }}", "--device-add", "cdrom", "--image", "${path.root}/../builds/iso/unattended.iso", "--connect"], ] - ) : [ - ["set", "{{ .Name }}", "--3d-accelerate", "off"], - ["set", "{{ .Name }}", "--videosize", "16"] - ] + ) : ( + var.os_name == "freebsd" && var.os_arch == "x86_64" ? [ + ["set", "{{ .Name }}", "--bios-type", "efi64"], + ["set", "{{ .Name }}", "--efi-boot", "on"], + ["set", "{{ .Name }}", "--efi-secure-boot", "off"], + ] : [ + ["set", "{{ .Name }}", "--3d-accelerate", "off"], + ["set", "{{ .Name }}", "--videosize", "16"] + ] + ) ) : var.parallels_prlctl # qemu @@ -50,14 +56,15 @@ locals { ["-drive", "file=${path.root}/../builds/build_files/packer-${var.os_name}-${var.os_version}-${var.os_arch}-qemu/{{ .Name }},if=virtio,cache=writeback,discard=ignore,format=${var.qemu_format},index=1"], ] : ( var.os_arch == "aarch64" ? [ - ["-boot", "strict=off"] - # ["-cpu", "host"], - # ["-monitor", "stdio"] + ["-boot", "strict=off"], ] : null ) ) : var.qemuargs # virtualbox-iso + vbox_firmware = var.vbox_firmware == null ? ( + var.os_arch == "aarch64" ? "efi" : "bios" + ) : var.vbox_firmware vbox_gfx_controller = var.vbox_gfx_controller == null ? ( var.is_windows ? "vboxsvga" : "vmsvga" ) : var.vbox_gfx_controller @@ -67,10 +74,35 @@ locals { vbox_guest_additions_mode = var.vbox_guest_additions_mode == null ? ( var.is_windows ? "attach" : "upload" ) : var.vbox_guest_additions_mode + vbox_hard_drive_interface = var.vbox_hard_drive_interface == null ? ( + var.os_arch == "aarch64" ? "virtio" : "sata" + ) : var.vbox_hard_drive_interface + vbox_iso_interface = var.vbox_iso_interface == null ? ( + var.os_arch == "aarch64" ? "virtio" : "sata" + ) : var.vbox_iso_interface + vboxmanage = var.vboxmanage == null ? ( + var.os_arch == "aarch64" ? [ + ["modifyvm", "{{.Name}}", "--chipset", "armv8virtual"], + ["modifyvm", "{{.Name}}", "--audio-enabled", "off"], + ["modifyvm", "{{.Name}}", "--nat-localhostreachable1", "on"], + ["modifyvm", "{{.Name}}", "--usb-xhci", "on"], + ["modifyvm", "{{.Name}}", "--graphicscontroller", "qemuramfb"], + ["modifyvm", "{{.Name}}", "--mouse", "usb"], + ["modifyvm", "{{.Name}}", "--keyboard", "usb"], + ["storagectl", "{{.Name}}", "--name", "IDE Controller", "--remove"], + ] : [ + ["modifyvm", "{{.Name}}", "--chipset", "ich9"], + ["modifyvm", "{{.Name}}", "--audio-enabled", "off"], + ["modifyvm", "{{.Name}}", "--nat-localhostreachable1", "on"] + ] + ) : var.vboxmanage + vbox_nic_type = var.vbox_nic_type == null ? ( + var.os_name == "freebsd" ? "82545EM" : null + ) : var.vbox_nic_type # vmware-iso vmware_tools_upload_flavor = var.vmware_tools_upload_flavor == null ? ( - var.is_windows ? "windows" : "linux" + var.is_windows ? "windows" : null ) : var.vmware_tools_upload_flavor vmware_tools_upload_path = var.vmware_tools_upload_path == null ? ( var.is_windows ? "c:\\vmware-tools.iso" : "/tmp/vmware-tools.iso" @@ -79,7 +111,7 @@ locals { # Source block common default_boot_wait = var.default_boot_wait == null ? ( var.is_windows ? "60s" : ( - var.os_name == "macos" ? "8m" : "5s" + var.os_name == "macos" ? "8m" : "10s" ) ) : var.default_boot_wait cd_files = var.cd_files == null ? ( @@ -107,9 +139,10 @@ locals { ] ) : null ) : var.floppy_files - http_directory = var.http_directory == null ? "${path.root}/http" : var.http_directory + http_directory = var.http_directory == null ? "${path.root}/http" : var.http_directory + iso_target_path = var.iso_target_path == "build_dir_iso" ? "${path.root}/../builds/iso/${var.os_name}-${var.os_version}-${var.os_arch}.iso" : var.iso_target_path memory = var.memory == null ? ( - var.is_windows || var.os_name == "macos" ? 4096 : 2048 + var.is_windows || var.os_name == "macos" || var.os_arch == "aarch64" ? 4096 : 3072 ) : var.memory output_directory = var.output_directory == null ? "${path.root}/../builds/build_files/packer-${var.os_name}-${var.os_version}-${var.os_arch}" : var.output_directory shutdown_command = var.shutdown_command == null ? ( @@ -143,6 +176,7 @@ source "hyperv-iso" "vm" { headless = var.headless http_directory = local.http_directory iso_checksum = var.iso_checksum + iso_target_path = local.iso_target_path iso_url = var.iso_url memory = local.memory output_directory = "${local.output_directory}-hyperv" @@ -199,6 +233,7 @@ source "parallels-iso" "vm" { floppy_files = local.floppy_files http_directory = local.http_directory iso_checksum = var.iso_checksum + iso_target_path = local.iso_target_path iso_url = var.iso_url memory = local.memory output_directory = "${local.output_directory}-parallels" @@ -238,6 +273,7 @@ source "qemu" "vm" { headless = var.headless http_directory = local.http_directory iso_checksum = var.iso_checksum + iso_target_path = local.iso_target_path iso_url = var.iso_url memory = local.memory output_directory = "${local.output_directory}-qemu" @@ -254,16 +290,18 @@ source "qemu" "vm" { } source "virtualbox-iso" "vm" { # Virtualbox specific options - firmware = var.vbox_firmware_option + firmware = local.vbox_firmware gfx_controller = local.vbox_gfx_controller gfx_vram_size = local.vbox_gfx_vram_size guest_additions_path = var.vbox_guest_additions_path guest_additions_mode = local.vbox_guest_additions_mode guest_additions_interface = var.vbox_guest_additions_interface guest_os_type = var.vbox_guest_os_type - hard_drive_interface = var.vbox_hard_drive_interface - iso_interface = var.vbox_iso_interface - vboxmanage = var.vboxmanage + hard_drive_interface = local.vbox_hard_drive_interface + iso_interface = local.vbox_iso_interface + nic_type = local.vbox_nic_type + rtc_time_base = var.vbox_rtc_time_base + vboxmanage = local.vboxmanage virtualbox_version_file = var.virtualbox_version_file # Source block common options boot_command = var.boot_command @@ -275,6 +313,7 @@ source "virtualbox-iso" "vm" { headless = var.headless http_directory = local.http_directory iso_checksum = var.iso_checksum + iso_target_path = local.iso_target_path iso_url = var.iso_url memory = local.memory output_directory = "${local.output_directory}-virtualbox" @@ -294,7 +333,7 @@ source "virtualbox-ovf" "vm" { guest_additions_path = var.vbox_guest_additions_path source_path = var.vbox_source_path checksum = var.vbox_checksum - vboxmanage = var.vboxmanage + vboxmanage = local.vboxmanage virtualbox_version_file = var.virtualbox_version_file # Source block common options communicator = local.communicator @@ -310,27 +349,31 @@ source "virtualbox-ovf" "vm" { } source "vmware-iso" "vm" { # VMware specific options + cores = var.vmware_cores cdrom_adapter_type = var.vmware_cdrom_adapter_type disk_adapter_type = var.vmware_disk_adapter_type + firmware = var.vmware_firmware guest_os_type = var.vmware_guest_os_type network = var.vmware_network network_adapter_type = var.vmware_network_adapter_type tools_upload_flavor = local.vmware_tools_upload_flavor tools_upload_path = local.vmware_tools_upload_path - usb = var.vmware_enable_usb + usb = var.vmware_usb version = var.vmware_version vmx_data = var.vmware_vmx_data vmx_remove_ethernet_interfaces = var.vmware_vmx_remove_ethernet_interfaces + vnc_disable_password = var.vmware_vnc_disable_password # Source block common options - boot_command = var.boot_command - boot_wait = var.vmware_boot_wait == null ? local.default_boot_wait : var.vmware_boot_wait - cpus = var.cpus - communicator = local.communicator - disk_size = var.disk_size - floppy_files = local.floppy_files - headless = var.headless - http_directory = local.http_directory - iso_checksum = var.iso_checksum + boot_command = var.boot_command + boot_wait = var.vmware_boot_wait == null ? local.default_boot_wait : var.vmware_boot_wait + cpus = var.cpus + communicator = local.communicator + disk_size = var.disk_size + floppy_files = local.floppy_files + headless = var.headless + http_directory = local.http_directory + iso_checksum = var.iso_checksum + # iso_target_path = local.iso_target_path # Currently breaks builds https://github.com/hashicorp/packer-plugin-vmware/issues/276 iso_url = var.iso_url memory = local.memory output_directory = "${local.output_directory}-vmware" diff --git a/packer_templates/pkr-variables.pkr.hcl b/packer_templates/pkr-variables.pkr.hcl index 625e8b9b6..179afb669 100644 --- a/packer_templates/pkr-variables.pkr.hcl +++ b/packer_templates/pkr-variables.pkr.hcl @@ -199,6 +199,11 @@ variable "vbox_boot_wait" { type = string default = null } +variable "vbox_firmware" { + type = string + default = null + description = "Firmware type, takes bios or efi" +} variable "vbox_gfx_controller" { type = string default = null @@ -226,32 +231,28 @@ variable "vbox_guest_os_type" { } variable "vbox_hard_drive_interface" { type = string - default = "sata" + default = null } variable "vbox_iso_interface" { type = string - default = "sata" + default = null } variable "vboxmanage" { - type = list(list(string)) - default = [ - [ - "modifyvm", - "{{.Name}}", - "--audio", - "none", - "--nat-localhostreachable1", - "on", - ] - ] + type = list(list(string)) + default = null +} +variable "vbox_nic_type" { + type = string + default = null } variable "virtualbox_version_file" { type = string default = ".vbox_version" } -variable "vbox_firmware_option" { - type = string - default = "bios" +variable "vbox_rtc_time_base" { + type = string + default = "UTC" + description = "RTC time base" } # virtualbox-ovf @@ -276,11 +277,21 @@ variable "vmware_cdrom_adapter_type" { default = "sata" description = "CDROM adapter type. Needs to be SATA (or non-SCSI) for ARM64 builds." } +variable "vmware_cores" { + type = number + default = 2 + description = "The number of virtual CPU cores per socket for the virtual machine" +} variable "vmware_disk_adapter_type" { type = string default = "sata" description = "Disk adapter type. Needs to be SATA (PVSCSI, or non-SCSI) for ARM64 builds." } +variable "vmware_firmware" { + type = string + default = null + description = "The firmware type for the virtual machine. Allowed values are bios, efi, and efi-secure (for secure boot). Defaults to the recommended firmware type for the guest operating system" +} variable "vmware_guest_os_type" { type = string default = null @@ -301,20 +312,18 @@ variable "vmware_version" { variable "vmware_vmx_data" { type = map(string) default = { - # "firmware" = "efi" - "cpuid.coresPerSocket" = "2" - "ethernet0.pciSlotNumber" = "32" - "svga.autodetect" = true - "usb_xhci.present" = true + "svga.autodetect" = true + "usb_xhci.present" = true } } variable "vmware_vmx_remove_ethernet_interfaces" { type = bool default = true } -variable "vmware_enable_usb" { - type = bool - default = true +variable "vmware_usb" { + type = bool + default = false + description = "Enable the USB 2.0 controllers for the virtual machine" } variable "vmware_network_adapter_type" { type = string @@ -324,6 +333,10 @@ variable "vmware_network" { type = string default = "nat" } +variable "vmware_vnc_disable_password" { + type = bool + default = true +} # Source block common variables variable "boot_command" { @@ -369,6 +382,11 @@ variable "iso_checksum" { default = null description = "ISO download checksum" } +variable "iso_target_path" { + type = string + default = "build_dir_iso" + description = "Path to store the ISO file. Null will use packer cache default or build_dir_iso will put it in the local build/iso directory." +} variable "iso_url" { type = string default = null diff --git a/packer_templates/scripts/_common/parallels-rhel.sh b/packer_templates/scripts/_common/parallels-rhel.sh deleted file mode 100644 index fde6f59fb..000000000 --- a/packer_templates/scripts/_common/parallels-rhel.sh +++ /dev/null @@ -1,47 +0,0 @@ -#!/bin/sh -eux - -# set a default HOME_DIR environment variable if not set -HOME_DIR="${HOME_DIR:-/home/vagrant}"; - -case "$PACKER_BUILDER_TYPE" in -parallels-iso|parallels-pvm) - major_version="$(sed 's/^.\+ release \([.0-9]\+\).*/\1/' /etc/redhat-release | awk -F. '{print $1}')" - # make sure we use dnf on EL 8+ - if [ "$major_version" -ge 8 ]; then - dnf -y install checkpolicy selinux-policy-devel gcc kernel-devel kernel-headers make - else - yum -y install checkpolicy selinux-policy-devel gcc kernel-devel kernel-headers make - fi - - mkdir -p /tmp/parallels; - if [ "$(uname -m)" = "aarch64" ] ; then - mount -o loop "$HOME_DIR"/prl-tools-lin-arm.iso /tmp/parallels; - else - mount -o loop "$HOME_DIR"/prl-tools-lin.iso /tmp/parallels; - fi - VER="$(cat /tmp/parallels/version)"; - - echo "Parallels Tools Version: $VER"; - - /tmp/parallels/install --install-unattended-with-deps \ - || (code="$?"; \ - echo "Parallels tools installation exited $code, attempting" \ - "to output /var/log/parallels-tools-install.log"; \ - cat /var/log/parallels-tools-install.log; \ - exit $code); - umount /tmp/parallels; - rm -rf /tmp/parallels; - rm -f "$HOME_DIR"/*.iso; - - # Parallels Tools for Linux includes native auto-mount script, - # which causes losing some of Vagrant-relative shared folders. - # So, we should disable this behavior. - # https://github.com/Parallels/vagrant-parallels/issues/325#issuecomment-418727113 - # TODO: verify this is fixed in latest version of parallels - # auto_mount_script='/usr/bin/prlfsmountd' - # if [ -f "${auto_mount_script}" ]; then - # printf '#!/bin/sh\n # Shared folders auto-mount is disabled by Vagrant' > "${auto_mount_script}" - # fi - - ;; -esac diff --git a/packer_templates/scripts/_common/parallels.sh b/packer_templates/scripts/_common/parallels.sh index c1501f5eb..935df7832 100644 --- a/packer_templates/scripts/_common/parallels.sh +++ b/packer_templates/scripts/_common/parallels.sh @@ -3,42 +3,35 @@ # set a default HOME_DIR environment variable if not set HOME_DIR="${HOME_DIR:-/home/vagrant}"; -if ! ([ "$(uname -m)" = "aarch64" ] && [ -f /etc/os-release ] && (grep -qi 'opensuse' /etc/os-release || grep -qi 'sles' /etc/os-release)); then - - case "$PACKER_BUILDER_TYPE" in - parallels-iso|parallels-pvm) - mkdir -p /tmp/parallels; - if [ "$(uname -m)" = "aarch64" ] ; then - mount -o loop "$HOME_DIR"/prl-tools-lin-arm.iso /tmp/parallels; - else - mount -o loop "$HOME_DIR"/prl-tools-lin.iso /tmp/parallels; - fi - VER="$(cat /tmp/parallels/version)"; - - echo "Parallels Tools Version: $VER"; - - /tmp/parallels/install --install-unattended-with-deps \ - || (code="$?"; \ - echo "Parallels tools installation exited $code, attempting" \ - "to output /var/log/parallels-tools-install.log"; \ - cat /var/log/parallels-tools-install.log; \ - exit $code); - umount /tmp/parallels; - rm -rf /tmp/parallels; - rm -f "$HOME_DIR"/*.iso; - - # Parallels Tools for Linux includes native auto-mount script, - # which causes losing some of Vagrant-relative shared folders. - # So, we should disable this behavior. - # https://github.com/Parallels/vagrant-parallels/issues/325#issuecomment-418727113 - # TODO: verify this is fixed in latest version of parallels - # auto_mount_script='/usr/bin/prlfsmountd' - # if [ -f "${auto_mount_script}" ]; then - # printf '#!/bin/sh\n # Shared folders auto-mount is disabled by Vagrant' > "${auto_mount_script}" - # fi - - ;; - esac -else +case "$PACKER_BUILDER_TYPE" in +parallels-iso|parallels-pvm) + if ! ([ "$(uname -m)" = "aarch64" ] && [ -f /etc/os-release ] && (grep -qi 'opensuse' /etc/os-release || grep -qi 'sles' /etc/os-release)); then + if command -v dnf >/dev/null 2>&1; then + dnf -y install checkpolicy selinux-policy-devel gcc kernel-devel kernel-headers make + fi + mkdir -p /tmp/parallels; + if [ "$(uname -m)" = "aarch64" ] ; then + mount -o loop "$HOME_DIR"/prl-tools-lin-arm.iso /tmp/parallels; + else + mount -o loop "$HOME_DIR"/prl-tools-lin.iso /tmp/parallels; + fi + VER="$(cat /tmp/parallels/version)"; + echo "Parallels Tools Version: $VER"; + /tmp/parallels/install --install-unattended-with-deps || ( + code="$?"; + echo "Parallels tools installation exited $code, attempting to output /var/log/parallels-tools-install.log"; + cat /var/log/parallels-tools-install.log; + exit $code + ); + umount /tmp/parallels; + rm -rf /tmp/parallels; + rm -f "$HOME_DIR"/*.iso; + echo "removing kernel dev packages and compilers we no longer need" + if command -v dnf >/dev/null 2>&1; then + dnf remove -y install checkpolicy selinux-policy-devel gcc kernel-devel kernel-headers make + fi + else echo "Skipping Parallels Tools installation on aarch64 architecture for opensuse and derivatives" -fi + fi + ;; +esac diff --git a/packer_templates/scripts/_common/vagrant.sh b/packer_templates/scripts/_common/vagrant.sh index 37e74bf52..142731ab5 100644 --- a/packer_templates/scripts/_common/vagrant.sh +++ b/packer_templates/scripts/_common/vagrant.sh @@ -3,14 +3,28 @@ # set a default HOME_DIR environment variable if not set HOME_DIR="${HOME_DIR:-/home/vagrant}"; +if command -v ping > /dev/null 2>&1; then + echo "Pinging raw.githubusercontent.com"; + if ! ping -c 1 raw.githubusercontent.com > /dev/null 2>&1; then + echo "Ping failed, sleeping for 30 seconds"; + sleep 30; + fi +else + echo "Cannot ping, sleeping for 30 seconds"; + sleep 30; +fi + pubkey_url="https://raw.githubusercontent.com/hashicorp/vagrant/main/keys/vagrant.pub"; mkdir -p "$HOME_DIR"/.ssh; -if command -v curl >/dev/null 2>&1; then - curl --insecure --location "$pubkey_url" > "$HOME_DIR"/.ssh/authorized_keys; -elif command -v wget >/dev/null 2>&1; then - wget --no-check-certificate "$pubkey_url" -O "$HOME_DIR"/.ssh/authorized_keys; -elif command -v fetch >/dev/null 2>&1; then - fetch -am -o "$HOME_DIR"/.ssh/authorized_keys "$pubkey_url"; +if command -v curl > /dev/null 2>&1; then + curl --insecure --location "$pubkey_url" > "$HOME_DIR"/.ssh/authorized_keys && \ + echo "Successfully downloaded vagrant public key with curl"; +elif command -v wget > /dev/null 2>&1; then + wget --no-check-certificate "$pubkey_url" -O "$HOME_DIR"/.ssh/authorized_keys && \ + echo "Successfully downloaded vagrant public key with wget"; +elif command -v fetch > /dev/null 2>&1; then + fetch -am -o "$HOME_DIR"/.ssh/authorized_keys "$pubkey_url" && \ + echo "Successfully downloaded vagrant public key with fetch"; else echo "Cannot download vagrant public key"; exit 1; diff --git a/packer_templates/scripts/_common/virtualbox.sh b/packer_templates/scripts/_common/virtualbox.sh index 7384ff2aa..8b0447d46 100644 --- a/packer_templates/scripts/_common/virtualbox.sh +++ b/packer_templates/scripts/_common/virtualbox.sh @@ -1,59 +1,61 @@ #!/bin/sh -eux -if ! ([ "$(uname -m)" = "aarch64" ] && [ -f /etc/os-release ] && (grep -qi 'opensuse' /etc/os-release || grep -qi 'sles' /etc/os-release)); then - - # set a default HOME_DIR environment variable if not set - HOME_DIR="${HOME_DIR:-/home/vagrant}"; - - case "$PACKER_BUILDER_TYPE" in - virtualbox-iso|virtualbox-ovf) - VER="$(cat "$HOME_DIR"/.vbox_version)"; - ISO="VBoxGuestAdditions_$VER.iso"; - - # mount the ISO to /tmp/vbox - mkdir -p /tmp/vbox; - mount -o loop "$HOME_DIR"/"$ISO" /tmp/vbox; - - echo "installing deps necessary to compile kernel modules" - # We install things like kernel-headers here vs. kickstart files so we make sure we install them for the updated kernel not the stock kernel - if [ -f "/bin/dnf" ]; then - dnf install -y --skip-broken perl cpp gcc make bzip2 tar kernel-headers kernel-devel kernel-uek-devel || true # not all these packages are on every system - elif [ -f "/bin/yum" ] || [ -f "/usr/bin/yum" ]; then - yum install -y --skip-broken perl cpp gcc make bzip2 tar kernel-headers kernel-devel kernel-uek-devel || true # not all these packages are on every system - elif [ -f "/usr/bin/apt-get" ]; then - apt-get install -y build-essential dkms bzip2 tar linux-headers-"$(uname -r)" - elif [ -f "/usr/bin/zypper" ]; then - zypper install -y perl cpp gcc make bzip2 tar kernel-default-devel - fi - - echo "installing the vbox additions" - # this install script fails with non-zero exit codes for no apparent reason so we need better ways to know if it worked - /tmp/vbox/VBoxLinuxAdditions.run --nox11 || true - - if ! modinfo vboxsf >/dev/null 2>&1; then - echo "Cannot find vbox kernel module. Installation of guest additions unsuccessful!" - exit 1 - fi - - echo "unmounting and removing the vbox ISO" - umount /tmp/vbox; - rm -rf /tmp/vbox; - rm -f "$HOME_DIR"/*.iso; - - echo "removing kernel dev packages and compilers we no longer need" - if [ -f "/bin/dnf" ]; then - dnf remove -y gcc cpp kernel-headers kernel-devel kernel-uek-devel - elif [ -f "/bin/yum" ] || [ -f "/usr/bin/yum" ]; then - yum remove -y gcc cpp kernel-headers kernel-devel kernel-uek-devel - elif [ -f "/usr/bin/apt-get" ]; then - apt-get remove -y build-essential gcc g++ make libc6-dev dkms linux-headers-"$(uname -r)" - elif [ -f "/usr/bin/zypper" ]; then - zypper -n rm -u kernel-default-devel gcc make - fi - - echo "removing leftover logs" - rm -rf /var/log/vboxadd* - ;; - esac -else + +# set a default HOME_DIR environment variable if not set +HOME_DIR="${HOME_DIR:-/home/vagrant}"; + +case "$PACKER_BUILDER_TYPE" in +virtualbox-iso|virtualbox-ovf) + if ! ([ "$(uname -m)" = "aarch64" ] && [ -f /etc/os-release ] && (grep -qi 'opensuse' /etc/os-release || grep -qi 'sles' /etc/os-release)); then + ARCHITECTURE="$(uname -m)"; + VER="$(cat "$HOME_DIR"/.vbox_version)"; + ISO="VBoxGuestAdditions_$VER.iso"; + + # mount the ISO to /tmp/vbox + mkdir -p /tmp/vbox; + mount -o loop "$HOME_DIR"/"$ISO" /tmp/vbox; + + echo "installing deps necessary to compile kernel modules" + # We install things like kernel-headers here vs. kickstart files so we make sure we install them for the updated kernel not the stock kernel + if [ -f "/bin/dnf" ]; then + dnf install -y --skip-broken perl cpp gcc make bzip2 tar kernel-headers kernel-devel kernel-uek-devel || true # not all these packages are on every system + elif [ -f "/usr/bin/apt-get" ]; then + apt-get install -y build-essential dkms bzip2 tar linux-headers-"$(uname -r)" + elif [ -f "/usr/bin/zypper" ]; then + zypper install -y perl cpp gcc make bzip2 tar kernel-default-devel + fi + + echo "installing the vbox additions for architecture $ARCHITECTURE" + # this install script fails with non-zero exit codes for no apparent reason so we need better ways to know if it worked + if [ "$ARCHITECTURE" = "aarch64" ]; then + /tmp/vbox/VBoxLinuxAdditions-arm64.run --nox11 || true + else + /tmp/vbox/VBoxLinuxAdditions.run --nox11 || true + fi + + if ! modinfo vboxsf >/dev/null 2>&1; then + echo "Cannot find vbox kernel module. Installation of guest additions unsuccessful!" + exit 1 + fi + + echo "unmounting and removing the vbox ISO" + umount /tmp/vbox; + rm -rf /tmp/vbox; + rm -f "$HOME_DIR"/*.iso; + + echo "removing kernel dev packages and compilers we no longer need" + if [ -f "/bin/dnf" ]; then + dnf remove -y gcc cpp kernel-headers kernel-devel kernel-uek-devel + elif [ -f "/usr/bin/apt-get" ]; then + apt-get remove -y build-essential gcc g++ make libc6-dev dkms linux-headers-"$(uname -r)" + elif [ -f "/usr/bin/zypper" ]; then + zypper -n rm -u kernel-default-devel gcc make + fi + + echo "removing leftover logs" + rm -rf /var/log/vboxadd* + + else echo "Skipping Virtualbox guest additions installation on aarch64 architecture for opensuse and derivatives" -fi + fi + ;; +esac diff --git a/packer_templates/scripts/_common/vmware.sh b/packer_templates/scripts/_common/vmware.sh new file mode 100644 index 000000000..b6a3c171e --- /dev/null +++ b/packer_templates/scripts/_common/vmware.sh @@ -0,0 +1,38 @@ +#!/bin/bash -eux + +# set a default HOME_DIR environment variable if not set +HOME_DIR="${HOME_DIR:-/home/vagrant}" + +case "$PACKER_BUILDER_TYPE" in +vmware-iso|vmware-vmx) + echo "installing open-vm-tools" + if [ -f "/bin/dnf" ]; then + dnf install -y open-vm-tools + systemctl enable vmtoolsd + systemctl start vmtoolsd + elif [ -f "/usr/bin/apt-get" ]; then + # determine the major Debian version we're runninng + major_version="$(grep VERSION_ID /etc/os-release | awk -F= '{print $2}' | tr -d '"')" + architecture="$(uname -m)" + # open-vm-tools for amd64 are only available in bullseye-backports repo + echo "install open-vm-tools" + if [ "$major_version" -eq 11 ] && [ "$architecture" = "aarch64" ]; then + echo 'deb http://deb.debian.org/debian bullseye-backports main' >> /etc/apt/sources.list + apt-get update + cat > /etc/modprobe.d/blacklist.conf <<EOF +blacklist vsock_loopback +blacklist vmw_vsock_virtio_transport_common +EOF + fi + apt-get install -y open-vm-tools; + mkdir /mnt/hgfs; + systemctl enable open-vm-tools + systemctl start open-vm-tools + elif [ -f "/usr/bin/zypper" ]; then + zypper install -y open-vm-tools insserv-compat + mkdir /mnt/hgfs + systemctl enable vmtoolsd + systemctl start vmtoolsd + fi + echo "platform specific vmware.sh executed" +esac diff --git a/packer_templates/scripts/_common/vmware_debian_ubuntu.sh b/packer_templates/scripts/_common/vmware_debian_ubuntu.sh deleted file mode 100644 index 981bb6894..000000000 --- a/packer_templates/scripts/_common/vmware_debian_ubuntu.sh +++ /dev/null @@ -1,24 +0,0 @@ -#!/bin/sh -eux - -case "$PACKER_BUILDER_TYPE" in -vmware-iso|vmware-vmx) - # determine the major Debian version we're runninng - major_version="$(grep VERSION_ID /etc/os-release | awk -F= '{print $2}' | tr -d '"')" - architecture="$(uname -m)" - - # open-vm-tools for amd64 are only available in bullseye-backports repo - echo "install open-vm-tools" - if [ "$major_version" -eq 11 ] && [ "$architecture" = "aarch64" ]; then - echo 'deb http://deb.debian.org/debian bullseye-backports main' >> /etc/apt/sources.list - apt-get update - cat > /etc/modprobe.d/blacklist.conf <<EOF -blacklist vsock_loopback -blacklist vmw_vsock_virtio_transport_common -EOF - fi - apt-get install -y open-vm-tools; - mkdir /mnt/hgfs; - systemctl enable open-vm-tools - systemctl start open-vm-tools - echo "platform specific vmware.sh executed"; -esac diff --git a/packer_templates/scripts/_common/vmware_fedora.sh b/packer_templates/scripts/_common/vmware_fedora.sh deleted file mode 100644 index 8e02760c6..000000000 --- a/packer_templates/scripts/_common/vmware_fedora.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/bash -eux - -# the proprietary vm tools don't work on Fedora 30 so we'll install the open-vm-tools -case "$PACKER_BUILDER_TYPE" in -vmware-iso|vmware-vmx) - dnf install -y open-vm-tools - systemctl enable vmtoolsd - systemctl start vmtoolsd -esac diff --git a/packer_templates/scripts/_common/vmware_rhel.sh b/packer_templates/scripts/_common/vmware_rhel.sh deleted file mode 100644 index d8f8e7399..000000000 --- a/packer_templates/scripts/_common/vmware_rhel.sh +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/bash -eux - -# set a default HOME_DIR environment variable if not set -HOME_DIR="${HOME_DIR:-/home/vagrant}" - -case "$PACKER_BUILDER_TYPE" in -vmware-iso|vmware-vmx) - # determine the major EL version we're runninng - major_version="$(sed 's/^.\+ release \([.0-9]\+\).*/\1/' /etc/redhat-release | awk -F. '{print $1}')" - - # make sure we use dnf on EL 8+ - if [ "$major_version" -ge 8 ]; then - dnf install -y open-vm-tools - else - yum install -y open-vm-tools - fi - - systemctl enable vmtoolsd - systemctl start vmtoolsd -esac diff --git a/packer_templates/scripts/_common/vmware_suse.sh b/packer_templates/scripts/_common/vmware_suse.sh deleted file mode 100644 index 1905bbdb5..000000000 --- a/packer_templates/scripts/_common/vmware_suse.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/sh -eux - -case "$PACKER_BUILDER_TYPE" in -vmware-iso|vmware-vmx) - zypper install -y open-vm-tools insserv-compat - mkdir /mnt/hgfs - systemctl enable vmtoolsd - systemctl start vmtoolsd - echo "platform specific vmware.sh executed" -esac diff --git a/packer_templates/scripts/fedora/cleanup_dnf.sh b/packer_templates/scripts/fedora/cleanup_dnf.sh index 8757cedaf..b2cf06f91 100644 --- a/packer_templates/scripts/fedora/cleanup_dnf.sh +++ b/packer_templates/scripts/fedora/cleanup_dnf.sh @@ -25,7 +25,10 @@ echo "truncate any logs that have built up during the install" find /var/log -type f -exec truncate --size=0 {} \; echo "Remove any non-loopback network configs" -find /etc/sysconfig/network-scripts -name "ifcfg-*" -not -name "ifcfg-lo" -exec rm -f {} \; +if test -d /etc/sysconfig/network-scripts +then + find /etc/sysconfig/network-scripts -name "ifcfg-*" -not -name "ifcfg-lo" -exec rm -f {} \; +fi echo "remove the install log" rm -f /root/anaconda-ks.cfg /root/original-ks.cfg diff --git a/packer_templates/scripts/freebsd/vmtools_freebsd.sh b/packer_templates/scripts/freebsd/vmtools_freebsd.sh index dfaadf577..e24d6f882 100644 --- a/packer_templates/scripts/freebsd/vmtools_freebsd.sh +++ b/packer_templates/scripts/freebsd/vmtools_freebsd.sh @@ -3,46 +3,52 @@ case "$PACKER_BUILDER_TYPE" in virtualbox-iso|virtualbox-ovf) - # Disable X11 because vagrants are (usually) headless - echo 'WITHOUT_X11="YES"' >> /etc/make.conf; + # There are no vbox-guest additions for freebsd arm64 + ARCH=$(uname -m) + if [ "$ARCH" = "arm64" ]; then + return + fi - pkg install -y virtualbox-ose-additions-nox11; + # Disable X11 because vagrants are (usually) headless + echo 'WITHOUT_X11="YES"' >> /etc/make.conf; - echo 'vboxdrv_load="YES"' >>/boot/loader.conf; - echo 'vboxnet_enable="YES"' >>/etc/rc.conf; - echo 'vboxguest_enable="YES"' >>/etc/rc.conf; - echo 'vboxservice_enable="YES"' >>/etc/rc.conf; + pkg install -y virtualbox-ose-additions-nox11; - echo 'virtio_blk_load="YES"' >>/boot/loader.conf; - echo 'virtio_scsi_load="YES"' >>/boot/loader.conf; - echo 'virtio_balloon_load="YES"' >>/boot/loader.conf; - echo 'if_vtnet_load="YES"' >>/boot/loader.conf; + echo 'vboxdrv_load="YES"' >>/boot/loader.conf; + echo 'vboxnet_enable="YES"' >>/etc/rc.conf; + echo 'vboxguest_enable="YES"' >>/etc/rc.conf; + echo 'vboxservice_enable="YES"' >>/etc/rc.conf; - echo 'ifconfig_vtnet0_name="em0"' >>/etc/rc.conf; - echo 'ifconfig_vtnet1_name="em1"' >>/etc/rc.conf; - echo 'ifconfig_vtnet2_name="em2"' >>/etc/rc.conf; - echo 'ifconfig_vtnet3_name="em3"' >>/etc/rc.conf; + echo 'virtio_blk_load="YES"' >>/boot/loader.conf; + echo 'virtio_scsi_load="YES"' >>/boot/loader.conf; + echo 'virtio_balloon_load="YES"' >>/boot/loader.conf; + echo 'if_vtnet_load="YES"' >>/boot/loader.conf; - pw groupadd vboxusers; - pw groupmod vboxusers -m vagrant; - ;; + echo 'ifconfig_vtnet0_name="em0"' >>/etc/rc.conf; + echo 'ifconfig_vtnet1_name="em1"' >>/etc/rc.conf; + echo 'ifconfig_vtnet2_name="em2"' >>/etc/rc.conf; + echo 'ifconfig_vtnet3_name="em3"' >>/etc/rc.conf; + + pw groupadd vboxusers; + pw groupmod vboxusers -m vagrant; + ;; vmware-iso|vmware-vmx) - pkg install -y open-vm-tools-nox11; + pkg install -y open-vm-tools-nox11; - # for shared folder - echo 'fuse_load="YES"' >>/boot/loader.conf; + # for shared folder + echo 'fuse_load="YES"' >>/boot/loader.conf; - echo 'ifconfig_vmx0="dhcp"' >>/etc/rc.conf; - ;; + echo 'ifconfig_vmx0="dhcp"' >>/etc/rc.conf; + ;; parallels-iso|parallels-pvm) - pkg install -y parallels-tools - ;; + pkg install -y parallels-tools + ;; *) - echo "Unknown Packer Builder Type >>$PACKER_BUILDER_TYPE<< selected."; - echo "Known are virtualbox-iso|virtualbox-ovf|vmware-iso|vmware-vmx|parallels-iso|parallels-pvm."; - ;; + echo "Unknown Packer Builder Type >>$PACKER_BUILDER_TYPE<< selected."; + echo "Known are virtualbox-iso|virtualbox-ovf|vmware-iso|vmware-vmx|parallels-iso|parallels-pvm."; + ;; esac diff --git a/packer_templates/scripts/rhel/cleanup_yum.sh b/packer_templates/scripts/rhel/cleanup_yum.sh deleted file mode 100644 index 22cf50b4d..000000000 --- a/packer_templates/scripts/rhel/cleanup_yum.sh +++ /dev/null @@ -1,66 +0,0 @@ -#!/bin/sh -eux - -echo "reduce the grub menu time to 1 second" -sed -i -e 's/^GRUB_TIMEOUT=[0-9]\+$/GRUB_TIMEOUT=1/' /etc/default/grub -grub2-mkconfig -o /boot/grub2/grub.cfg - -echo "Remove development and kernel source packages" -yum -y remove gcc cpp gc kernel-devel kernel-headers glibc-devel elfutils-libelf-devel glibc-headers kernel-devel kernel-headers - -echo "remove orphaned packages" -yum -y autoremove - -echo "Remove previous kernels that preserved for rollbacks" -if ! command -v package-cleanup >/dev/null 2>&1; then - yum -y install yum-utils -fi - -package-cleanup --oldkernels --count=1 -y - -# Avoid ~200 meg firmware package we don't need -# this cannot be done in the KS file so we do it here -distro="$(rpm -qf --queryformat '%{NAME}' /etc/redhat-release | cut -f 1 -d '-')" -if [ "$distro" != 'oraclelinux' ]; then - echo "Removing extra firmware packages" - yum -y remove linux-firmware -fi - -echo "clean all package cache information" -yum -y clean all --enablerepo=\*; - -# Clean up network interface persistence -rm -f /etc/udev/rules.d/70-persistent-net.rules; -mkdir -p /etc/udev/rules.d/70-persistent-net.rules; -rm -f /lib/udev/rules.d/75-persistent-net-generator.rules; -rm -rf /dev/.udev/; - -if test -f /etc/sysconfig/network-scripts/ifcfg-*; then - for ndev in /etc/sysconfig/network-scripts/ifcfg-*; do - if [ "$(basename "$ndev")" != "ifcfg-lo" ]; then - - sed -i '/^UUID/d' "$ndev"; - fi - done -fi -echo "truncate any logs that have built up during the install" -find /var/log -type f -exec truncate --size=0 {} \; - -echo "remove the install log" -rm -f /root/anaconda-ks.cfg /root/original-ks.cfg - -echo "remove the contents of /tmp and /var/tmp" -rm -rf /tmp/* /var/tmp/* - -echo "Force a new random seed to be generated" -rm -f /var/lib/systemd/random-seed - -echo "Wipe netplan machine-id (DUID) so machines get unique ID generated on boot" -truncate -s 0 /etc/machine-id -if test -f /var/lib/dbus/machine-id -then - truncate -s 0 /var/lib/dbus/machine-id # if not symlinked to "/etc/machine-id" -fi - -echo "Clear the history so our install commands aren't there" -rm -f /root/.wget-hsts -export HISTSIZE=0 diff --git a/packer_templates/scripts/rhel/networking_rhel7.sh b/packer_templates/scripts/rhel/networking_rhel7.sh deleted file mode 100644 index 285079cf8..000000000 --- a/packer_templates/scripts/rhel/networking_rhel7.sh +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/sh -eux - -case "$PACKER_BUILDER_TYPE" in - -virtualbox-iso|virtualbox-ovf) - # Fix slow DNS: - # Add 'single-request-reopen' so it is included when /etc/resolv.conf is - # generated - # https://access.redhat.com/site/solutions/58625 (subscription required) - echo 'RES_OPTIONS="single-request-reopen"' >>/etc/sysconfig/network; - service network restart; - echo 'Slow DNS fix applied (single-request-reopen)'; - ;; - -esac diff --git a/packer_templates/scripts/rhel/update_yum.sh b/packer_templates/scripts/rhel/update_yum.sh deleted file mode 100644 index d3ef300c5..000000000 --- a/packer_templates/scripts/rhel/update_yum.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/sh -eux - -yum -y upgrade --skip-broken; -reboot; -sleep 60; diff --git a/packer_templates/win_answer_files/2025/Autounattend.xml b/packer_templates/win_answer_files/2025/Autounattend.xml new file mode 100644 index 000000000..2816d97fe --- /dev/null +++ b/packer_templates/win_answer_files/2025/Autounattend.xml @@ -0,0 +1,312 @@ +<?xml version="1.0" encoding="utf-8"?> +<unattend xmlns="urn:schemas-microsoft-com:unattend" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <settings pass="windowsPE"> + <component name="Microsoft-Windows-PnpCustomizationsWinPE" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" processorArchitecture="amd64"> + <!-- + This makes the VirtIO drivers available to Windows, assuming that + the VirtIO driver disk at https://fedorapeople.org/groups/virt/virtio-win/direct-downloads/stable-virtio/virtio-win.iso + (see https://docs.fedoraproject.org/en-US/quick-docs/creating-windows-virtual-machines-using-virtio-drivers/index.html#virtio-win-direct-downloads) + is available as drive E: + --> + <DriverPaths> + <PathAndCredentials wcm:action="add" wcm:keyValue="2"> + <Path>E:\viostor\2k22\amd64</Path> + </PathAndCredentials> + <PathAndCredentials wcm:action="add" wcm:keyValue="3"> + <Path>E:\NetKVM\2k22\amd64</Path> + </PathAndCredentials> + <PathAndCredentials wcm:action="add" wcm:keyValue="4"> + <Path>E:\Balloon\2k22\amd64</Path> + </PathAndCredentials> + <PathAndCredentials wcm:action="add" wcm:keyValue="5"> + <Path>E:\pvpanic\2k22\amd64</Path> + </PathAndCredentials> + <PathAndCredentials wcm:action="add" wcm:keyValue="6"> + <Path>E:\qemupciserial\2k22\amd64</Path> + </PathAndCredentials> + <PathAndCredentials wcm:action="add" wcm:keyValue="7"> + <Path>E:\qxldod\2k22\amd64</Path> + </PathAndCredentials> + <PathAndCredentials wcm:action="add" wcm:keyValue="8"> + <Path>E:\vioinput\2k22\amd64</Path> + </PathAndCredentials> + <PathAndCredentials wcm:action="add" wcm:keyValue="9"> + <Path>E:\viorng\2k22\amd64</Path> + </PathAndCredentials> + <PathAndCredentials wcm:action="add" wcm:keyValue="10"> + <Path>E:\vioscsi\2k22\amd64</Path> + </PathAndCredentials> + <PathAndCredentials wcm:action="add" wcm:keyValue="11"> + <Path>E:\vioserial\2k22\amd64</Path> + </PathAndCredentials> + </DriverPaths> + </component> + <component name="Microsoft-Windows-International-Core-WinPE" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> + <SetupUILanguage> + <UILanguage>en-US</UILanguage> + </SetupUILanguage> + <InputLocale>en-US</InputLocale> + <SystemLocale>en-US</SystemLocale> + <UILanguage>en-US</UILanguage> + <UILanguageFallback>en-US</UILanguageFallback> + <UserLocale>en-US</UserLocale> + </component> + <component name="Microsoft-Windows-Setup" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> + <DiskConfiguration> + <Disk wcm:action="add"> + <CreatePartitions> + <CreatePartition wcm:action="add"> + <Type>Primary</Type> + <Order>1</Order> + <Size>100</Size> + </CreatePartition> + <CreatePartition wcm:action="add"> + <Order>2</Order> + <Type>Primary</Type> + <Extend>true</Extend> + </CreatePartition> + </CreatePartitions> + <ModifyPartitions> + <ModifyPartition wcm:action="add"> + <Active>true</Active> + <Format>NTFS</Format> + <Label>boot</Label> + <Order>1</Order> + <PartitionID>1</PartitionID> + </ModifyPartition> + <ModifyPartition wcm:action="add"> + <Format>NTFS</Format> + <Label>Windows</Label> + <Letter>C</Letter> + <Order>2</Order> + <PartitionID>2</PartitionID> + </ModifyPartition> + </ModifyPartitions> + <DiskID>0</DiskID> + <WillWipeDisk>true</WillWipeDisk> + </Disk> + </DiskConfiguration> + <ImageInstall> + <OSImage> + <InstallFrom> + <MetaData wcm:action="add"> + <Key>/IMAGE/NAME</Key> + <Value>Windows Server 2025 SERVERSTANDARD</Value> + </MetaData> + </InstallFrom> + <InstallTo> + <DiskID>0</DiskID> + <PartitionID>2</PartitionID> + </InstallTo> + </OSImage> + </ImageInstall> + <UserData> + <ProductKey> + <WillShowUI>OnError</WillShowUI> + </ProductKey> + <AcceptEula>true</AcceptEula> + <FullName>Vagrant</FullName> + <Organization>Bento by Progress Chef</Organization> + </UserData> + <DynamicUpdate> + <Enable>false</Enable> + </DynamicUpdate> + </component> + </settings> + <settings pass="generalize"> + <component name="Microsoft-Windows-Security-SPP" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> + <SkipRearm>1</SkipRearm> + </component> + <component name="Microsoft-Windows-PnpSysprep" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> + <PersistAllDeviceInstalls>false</PersistAllDeviceInstalls> + <DoNotCleanUpNonPresentDevices>false</DoNotCleanUpNonPresentDevices> + </component> + </settings> + <settings pass="oobeSystem"> + <component name="Microsoft-Windows-International-Core" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> + <InputLocale>en-US</InputLocale> + <SystemLocale>en-US</SystemLocale> + <UILanguage>en-US</UILanguage> + <UserLocale>en-US</UserLocale> + </component> + <component name="Microsoft-Windows-Shell-Setup" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> + <OOBE> + <HideEULAPage>true</HideEULAPage> + <HideLocalAccountScreen>true</HideLocalAccountScreen> + <HideOEMRegistrationScreen>true</HideOEMRegistrationScreen> + <HideOnlineAccountScreens>true</HideOnlineAccountScreens> + <HideWirelessSetupInOOBE>true</HideWirelessSetupInOOBE> + <NetworkLocation>Work</NetworkLocation> + <ProtectYourPC>3</ProtectYourPC> + <SkipMachineOOBE>true</SkipMachineOOBE> + <SkipUserOOBE>true</SkipUserOOBE> + <VMModeOptimizations> + <SkipAdministratorProfileRemoval>true</SkipAdministratorProfileRemoval> + <SkipNotifyUILanguageChange>true</SkipNotifyUILanguageChange> + <SkipWinREInitialization>true</SkipWinREInitialization> + </VMModeOptimizations> + </OOBE> + <TimeZone>UTC</TimeZone> + <UserAccounts> + <AdministratorPassword> + <Value>vagrant</Value> + <PlainText>true</PlainText> + </AdministratorPassword> + <LocalAccounts> + <LocalAccount wcm:action="add"> + <Password> + <Value>vagrant</Value> + <PlainText>true</PlainText> + </Password> + <Description>Vagrant User</Description> + <DisplayName>vagrant</DisplayName> + <Group>administrators</Group> + <Name>vagrant</Name> + </LocalAccount> + </LocalAccounts> + </UserAccounts> + <AutoLogon> + <Password> + <Value>vagrant</Value> + <PlainText>true</PlainText> + </Password> + <Username>vagrant</Username> + <Enabled>true</Enabled> + </AutoLogon> + <FirstLogonCommands> + <SynchronousCommand wcm:action="add"> + <CommandLine>%windir%\System32\WindowsPowerShell\v1.0\powershell.exe -Command "Set-ExecutionPolicy -ExecutionPolicy RemoteSigned -Force"</CommandLine> + <Description>Set Execution Policy 64 Bit</Description> + <Order>1</Order> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <CommandLine>%windir%\SysWOW64\cmd.exe /c powershell -Command "Set-ExecutionPolicy -ExecutionPolicy RemoteSigned -Force"</CommandLine> + <Description>Set Execution Policy 32 Bit</Description> + <Order>2</Order> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <Order>3</Order> + <CommandLine>%windir%\System32\WindowsPowerShell\v1.0\powershell.exe -Command Get-NetConnectionProfile | Set-NetConnectionProfile -NetworkCategory "Private"</CommandLine> + <Description>Sets detected network connections to private to allow start of winrm</Description> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <Order>4</Order> + <CommandLine>%windir%\System32\WindowsPowerShell\v1.0\powershell.exe -Command Set-NetFirewallRule -Name "WINRM-HTTP-In-TCP" -RemoteAddress Any</CommandLine> + <Description>Allows winrm over public profile interfaces</Description> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <Order>5</Order> + <CommandLine>%windir%\System32\cmd.exe /c winrm quickconfig -q</CommandLine> + <Description>winrm quickconfig -q</Description> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <Order>6</Order> + <CommandLine>%windir%\System32\cmd.exe /c winrm quickconfig -transport:http</CommandLine> + <Description>winrm quickconfig -transport:http</Description> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <Order>7</Order> + <CommandLine>%windir%\System32\cmd.exe /c winrm set winrm/config @{MaxTimeoutms="1800000"}</CommandLine> + <Description>Win RM MaxTimoutms</Description> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <Order>8</Order> + <CommandLine>%windir%\System32\cmd.exe /c winrm set winrm/config/winrs @{MaxMemoryPerShellMB="2048"}</CommandLine> + <Description>Win RM MaxMemoryPerShellMB</Description> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <Order>9</Order> + <CommandLine>%windir%\System32\cmd.exe /c winrm set winrm/config/service @{AllowUnencrypted="true"}</CommandLine> + <Description>Win RM AllowUnencrypted</Description> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <Order>10</Order> + <CommandLine>%windir%\System32\cmd.exe /c winrm set winrm/config/service/auth @{Basic="true"}</CommandLine> + <Description>Win RM auth Basic</Description> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <Order>11</Order> + <CommandLine>%windir%\System32\cmd.exe /c winrm set winrm/config/client/auth @{Basic="true"}</CommandLine> + <Description>Win RM client auth Basic</Description> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <Order>12</Order> + <CommandLine>%windir%\System32\cmd.exe /c winrm set winrm/config/listener?Address=*+Transport=HTTP @{Port="5985"}</CommandLine> + <Description>Win RM listener Address/Port</Description> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <Order>13</Order> + <CommandLine>%windir%\System32\cmd.exe /c netsh firewall add portopening TCP 5985 "Port 5985"</CommandLine> + <Description>Win RM port open</Description> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <Order>14</Order> + <CommandLine>%windir%\System32\cmd.exe /c net stop winrm</CommandLine> + <Description>Stop Win RM Service</Description> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <Order>15</Order> + <CommandLine>%windir%\System32\cmd.exe /c sc config winrm start= auto</CommandLine> + <Description>Win RM Autostart</Description> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <Order>16</Order> + <CommandLine>%windir%\System32\cmd.exe /c net start winrm</CommandLine> + <Description>Start Win RM Service</Description> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <Order>17</Order> + <CommandLine>%windir%\System32\cmd.exe /c wmic useraccount where "name='vagrant'" set PasswordExpires=FALSE</CommandLine> + <Description>Disable password expiration for vagrant user</Description> + </SynchronousCommand> + </FirstLogonCommands> + </component> + <component name="Microsoft-Windows-WinRE-RecoveryAgent" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> + <UninstallWindowsRE>true</UninstallWindowsRE> + </component> + </settings> + <settings pass="specialize"> + <component xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" name="Microsoft-Windows-ServerManager-SvrMgrNc" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> + <DoNotOpenServerManagerAtLogon>true</DoNotOpenServerManagerAtLogon> + </component> + <component xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" name="Microsoft-Windows-IE-ESC" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> + <!-- Disable IE ESC. --> + <IEHardenAdmin>false</IEHardenAdmin> + <IEHardenUser>false</IEHardenUser> + </component> + <component xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" name="Microsoft-Windows-OutOfBoxExperience" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> + <DoNotOpenInitialConfigurationTasksAtLogon>true</DoNotOpenInitialConfigurationTasksAtLogon> + </component> + <component name="Microsoft-Windows-SystemRestore-Main" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> + <DisableSR>1</DisableSR> + </component> + <component name="Microsoft-Windows-SystemSettingsThreshold" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> + <DisplayNetworkSelection>false</DisplayNetworkSelection> + </component> + <component name="Networking-MPSSVC-Svc" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> + <FirewallGroups> + <FirewallGroup wcm:action="add" wcm:keyValue="WindowsRemoteManagement"> + <Active>true</Active> + <Group>Windows Remote Management</Group> + <Profile>all</Profile> + </FirewallGroup> + <FirewallGroup wcm:action="add" wcm:keyValue="RemoteAdministration"> + <Active>true</Active> + <Group>Remote Administration</Group> + <Profile>all</Profile> + </FirewallGroup> + </FirewallGroups> + </component> + <component name="Microsoft-Windows-SQMApi" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> + <CEIPEnabled>0</CEIPEnabled> + </component> + <component name="Microsoft-Windows-Security-SPP-UX" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> + <SkipAutoActivation>true</SkipAutoActivation> + </component> + </settings> + <settings pass="offlineServicing"> + <component name="Microsoft-Windows-LUA-Settings" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> + <EnableLUA>false</EnableLUA> + </component> + </settings> +</unattend> diff --git a/packer_templates/win_answer_files/2025/hyperv-gen2/Autounattend.xml b/packer_templates/win_answer_files/2025/hyperv-gen2/Autounattend.xml new file mode 100644 index 000000000..1caef64bf --- /dev/null +++ b/packer_templates/win_answer_files/2025/hyperv-gen2/Autounattend.xml @@ -0,0 +1,332 @@ +<?xml version="1.0" encoding="utf-8"?> +<unattend xmlns="urn:schemas-microsoft-com:unattend" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <settings pass="windowsPE"> + <component name="Microsoft-Windows-PnpCustomizationsWinPE" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" processorArchitecture="amd64"> + <!-- + This makes the VirtIO drivers available to Windows, assuming that + the VirtIO driver disk at https://fedorapeople.org/groups/virt/virtio-win/direct-downloads/stable-virtio/virtio-win.iso + (see https://docs.fedoraproject.org/en-US/quick-docs/creating-windows-virtual-machines-using-virtio-drivers/index.html#virtio-win-direct-downloads) + is available as drive E: + --> + <DriverPaths> + <PathAndCredentials wcm:action="add" wcm:keyValue="2"> + <Path>F:\viostor\2k22\amd64</Path> + </PathAndCredentials> + <PathAndCredentials wcm:action="add" wcm:keyValue="3"> + <Path>F:\NetKVM\2k22\amd64</Path> + </PathAndCredentials> + <PathAndCredentials wcm:action="add" wcm:keyValue="4"> + <Path>F:\Balloon\2k22\amd64</Path> + </PathAndCredentials> + <PathAndCredentials wcm:action="add" wcm:keyValue="5"> + <Path>F:\pvpanic\2k22\amd64</Path> + </PathAndCredentials> + <PathAndCredentials wcm:action="add" wcm:keyValue="6"> + <Path>F:\qemupciserial\2k22\amd64</Path> + </PathAndCredentials> + <PathAndCredentials wcm:action="add" wcm:keyValue="7"> + <Path>F:\qxldod\2k22\amd64</Path> + </PathAndCredentials> + <PathAndCredentials wcm:action="add" wcm:keyValue="8"> + <Path>F:\vioinput\2k22\amd64</Path> + </PathAndCredentials> + <PathAndCredentials wcm:action="add" wcm:keyValue="9"> + <Path>F:\viorng\2k22\amd64</Path> + </PathAndCredentials> + <PathAndCredentials wcm:action="add" wcm:keyValue="10"> + <Path>F:\vioscsi\2k22\amd64</Path> + </PathAndCredentials> + <PathAndCredentials wcm:action="add" wcm:keyValue="11"> + <Path>F:\vioserial\2k22\amd64</Path> + </PathAndCredentials> + </DriverPaths> + </component> + <component name="Microsoft-Windows-International-Core-WinPE" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> + <SetupUILanguage> + <UILanguage>en-US</UILanguage> + </SetupUILanguage> + <InputLocale>en-US</InputLocale> + <SystemLocale>en-US</SystemLocale> + <UILanguage>en-US</UILanguage> + <UILanguageFallback>en-US</UILanguageFallback> + <UserLocale>en-US</UserLocale> + </component> + <component name="Microsoft-Windows-Setup" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> + <DiskConfiguration> + <Disk wcm:action="add"> + <CreatePartitions> + <CreatePartition wcm:action="add"> + <Order>1</Order> + <Size>350</Size> + <Type>Primary</Type> + </CreatePartition> + <CreatePartition wcm:action="add"> + <Order>2</Order> + <Size>100</Size> + <Type>EFI</Type> + </CreatePartition> + <CreatePartition wcm:action="add"> + <Order>3</Order> + <Size>128</Size> + <Type>MSR</Type> + </CreatePartition> + <CreatePartition wcm:action="add"> + <Order>4</Order> + <Extend>true</Extend> + <Type>Primary</Type> + </CreatePartition> + </CreatePartitions> + <ModifyPartitions> + <ModifyPartition wcm:action="add"> + <Order>1</Order> + <PartitionID>1</PartitionID> + <Label>WINRE</Label> + <Format>NTFS</Format> + <TypeID>de94bba4-06d1-4d40-a16a-bfd50179d6ac</TypeID> + </ModifyPartition> + <ModifyPartition wcm:action="add"> + <Order>2</Order> + <PartitionID>2</PartitionID> + <Label>System</Label> + <Format>FAT32</Format> + </ModifyPartition> + <ModifyPartition wcm:action="add"> + <Order>3</Order> + <PartitionID>3</PartitionID> + </ModifyPartition> + <ModifyPartition wcm:action="add"> + <Order>4</Order> + <PartitionID>4</PartitionID> + <Label>Windows</Label> + <Format>NTFS</Format> + </ModifyPartition> + </ModifyPartitions> + <DiskID>0</DiskID> + <WillWipeDisk>true</WillWipeDisk> + </Disk> + <WillShowUI>OnError</WillShowUI> + </DiskConfiguration> + <ImageInstall> + <OSImage> + <InstallFrom> + <MetaData wcm:action="add"> + <Key>/IMAGE/NAME</Key> + <Value>Windows Server 2025 SERVERSTANDARD</Value> + </MetaData> + </InstallFrom> + <InstallTo> + <DiskID>0</DiskID> + <PartitionID>4</PartitionID> + </InstallTo> + </OSImage> + </ImageInstall> + <UserData> + <ProductKey> + <WillShowUI>OnError</WillShowUI> + </ProductKey> + <AcceptEula>true</AcceptEula> + <FullName>Vagrant</FullName> + <Organization>Bento by Progress Chef</Organization> + </UserData> + <DynamicUpdate> + <Enable>false</Enable> + </DynamicUpdate> + </component> + </settings> + <settings pass="generalize"> + <component name="Microsoft-Windows-Security-SPP" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> + <SkipRearm>1</SkipRearm> + </component> + <component name="Microsoft-Windows-PnpSysprep" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> + <PersistAllDeviceInstalls>false</PersistAllDeviceInstalls> + <DoNotCleanUpNonPresentDevices>false</DoNotCleanUpNonPresentDevices> + </component> + </settings> + <settings pass="oobeSystem"> + <component name="Microsoft-Windows-International-Core" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> + <InputLocale>en-US</InputLocale> + <SystemLocale>en-US</SystemLocale> + <UILanguage>en-US</UILanguage> + <UserLocale>en-US</UserLocale> + </component> + <component name="Microsoft-Windows-Shell-Setup" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> + <OOBE> + <HideEULAPage>true</HideEULAPage> + <HideLocalAccountScreen>true</HideLocalAccountScreen> + <HideOEMRegistrationScreen>true</HideOEMRegistrationScreen> + <HideOnlineAccountScreens>true</HideOnlineAccountScreens> + <HideWirelessSetupInOOBE>true</HideWirelessSetupInOOBE> + <NetworkLocation>Work</NetworkLocation> + <ProtectYourPC>3</ProtectYourPC> + <SkipMachineOOBE>true</SkipMachineOOBE> + <SkipUserOOBE>true</SkipUserOOBE> + <VMModeOptimizations> + <SkipAdministratorProfileRemoval>true</SkipAdministratorProfileRemoval> + <SkipNotifyUILanguageChange>true</SkipNotifyUILanguageChange> + <SkipWinREInitialization>true</SkipWinREInitialization> + </VMModeOptimizations> + </OOBE> + <TimeZone>UTC</TimeZone> + <UserAccounts> + <AdministratorPassword> + <Value>vagrant</Value> + <PlainText>true</PlainText> + </AdministratorPassword> + <LocalAccounts> + <LocalAccount wcm:action="add"> + <Password> + <Value>vagrant</Value> + <PlainText>true</PlainText> + </Password> + <Description>Vagrant User</Description> + <DisplayName>vagrant</DisplayName> + <Group>administrators</Group> + <Name>vagrant</Name> + </LocalAccount> + </LocalAccounts> + </UserAccounts> + <AutoLogon> + <Password> + <Value>vagrant</Value> + <PlainText>true</PlainText> + </Password> + <Username>vagrant</Username> + <Enabled>true</Enabled> + </AutoLogon> + <FirstLogonCommands> + <SynchronousCommand wcm:action="add"> + <CommandLine>%windir%\System32\WindowsPowerShell\v1.0\powershell.exe -Command "Set-ExecutionPolicy -ExecutionPolicy RemoteSigned -Force"</CommandLine> + <Description>Set Execution Policy 64 Bit</Description> + <Order>1</Order> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <CommandLine>%windir%\SysWOW64\cmd.exe /c powershell -Command "Set-ExecutionPolicy -ExecutionPolicy RemoteSigned -Force"</CommandLine> + <Description>Set Execution Policy 32 Bit</Description> + <Order>2</Order> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <Order>3</Order> + <CommandLine>%windir%\System32\WindowsPowerShell\v1.0\powershell.exe -Command Get-NetConnectionProfile | Set-NetConnectionProfile -NetworkCategory "Private"</CommandLine> + <Description>Sets detected network connections to private to allow start of winrm</Description> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <Order>4</Order> + <CommandLine>%windir%\System32\WindowsPowerShell\v1.0\powershell.exe -Command Set-NetFirewallRule -Name "WINRM-HTTP-In-TCP" -RemoteAddress Any</CommandLine> + <Description>Allows winrm over public profile interfaces</Description> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <Order>5</Order> + <CommandLine>%windir%\System32\cmd.exe /c winrm quickconfig -q</CommandLine> + <Description>winrm quickconfig -q</Description> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <Order>6</Order> + <CommandLine>%windir%\System32\cmd.exe /c winrm quickconfig -transport:http</CommandLine> + <Description>winrm quickconfig -transport:http</Description> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <Order>7</Order> + <CommandLine>%windir%\System32\cmd.exe /c winrm set winrm/config @{MaxTimeoutms="1800000"}</CommandLine> + <Description>Win RM MaxTimoutms</Description> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <Order>8</Order> + <CommandLine>%windir%\System32\cmd.exe /c winrm set winrm/config/winrs @{MaxMemoryPerShellMB="2048"}</CommandLine> + <Description>Win RM MaxMemoryPerShellMB</Description> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <Order>9</Order> + <CommandLine>%windir%\System32\cmd.exe /c winrm set winrm/config/service @{AllowUnencrypted="true"}</CommandLine> + <Description>Win RM AllowUnencrypted</Description> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <Order>10</Order> + <CommandLine>%windir%\System32\cmd.exe /c winrm set winrm/config/service/auth @{Basic="true"}</CommandLine> + <Description>Win RM auth Basic</Description> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <Order>11</Order> + <CommandLine>%windir%\System32\cmd.exe /c winrm set winrm/config/client/auth @{Basic="true"}</CommandLine> + <Description>Win RM client auth Basic</Description> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <Order>12</Order> + <CommandLine>%windir%\System32\cmd.exe /c winrm set winrm/config/listener?Address=*+Transport=HTTP @{Port="5985"}</CommandLine> + <Description>Win RM listener Address/Port</Description> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <Order>13</Order> + <CommandLine>%windir%\System32\cmd.exe /c netsh firewall add portopening TCP 5985 "Port 5985"</CommandLine> + <Description>Win RM port open</Description> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <Order>14</Order> + <CommandLine>%windir%\System32\cmd.exe /c net stop winrm</CommandLine> + <Description>Stop Win RM Service</Description> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <Order>15</Order> + <CommandLine>%windir%\System32\cmd.exe /c sc config winrm start= auto</CommandLine> + <Description>Win RM Autostart</Description> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <Order>16</Order> + <CommandLine>%windir%\System32\cmd.exe /c net start winrm</CommandLine> + <Description>Start Win RM Service</Description> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <Order>17</Order> + <CommandLine>%windir%\System32\cmd.exe /c wmic useraccount where "name='vagrant'" set PasswordExpires=FALSE</CommandLine> + <Description>Disable password expiration for vagrant user</Description> + </SynchronousCommand> + </FirstLogonCommands> + </component> + <component name="Microsoft-Windows-WinRE-RecoveryAgent" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> + <UninstallWindowsRE>true</UninstallWindowsRE> + </component> + </settings> + <settings pass="specialize"> + <component name="Microsoft-Windows-ServerManager-SvrMgrNc" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> + <DoNotOpenServerManagerAtLogon>true</DoNotOpenServerManagerAtLogon> + </component> + <component name="Microsoft-Windows-IE-ESC" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> + <!-- Disable IE ESC. --> + <IEHardenAdmin>false</IEHardenAdmin> + <IEHardenUser>false</IEHardenUser> + </component> + <component name="Microsoft-Windows-OutOfBoxExperience" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> + <DoNotOpenInitialConfigurationTasksAtLogon>true</DoNotOpenInitialConfigurationTasksAtLogon> + </component> + <component name="Microsoft-Windows-SystemRestore-Main" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> + <DisableSR>1</DisableSR> + </component> + <component name="Microsoft-Windows-SystemSettingsThreshold" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> + <DisplayNetworkSelection>false</DisplayNetworkSelection> + </component> + <component name="Networking-MPSSVC-Svc" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> + <FirewallGroups> + <FirewallGroup wcm:action="add" wcm:keyValue="WindowsRemoteManagement"> + <Active>true</Active> + <Group>Windows Remote Management</Group> + <Profile>all</Profile> + </FirewallGroup> + <FirewallGroup wcm:action="add" wcm:keyValue="RemoteAdministration"> + <Active>true</Active> + <Group>Remote Administration</Group> + <Profile>all</Profile> + </FirewallGroup> + </FirewallGroups> + </component> + <component name="Microsoft-Windows-SQMApi" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> + <CEIPEnabled>0</CEIPEnabled> + </component> + <component name="Microsoft-Windows-Security-SPP-UX" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> + <SkipAutoActivation>true</SkipAutoActivation> + </component> + </settings> + <settings pass="offlineServicing"> + <component name="Microsoft-Windows-LUA-Settings" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> + <EnableLUA>false</EnableLUA> + </component> + </settings> +</unattend> From 9f47e0d5ad91c0065e11f30883c86fffed7f11f6 Mon Sep 17 00:00:00 2001 From: Li-Wen Hsu <lwhsu@lwhsu.org> Date: Wed, 12 Mar 2025 00:06:52 +0800 Subject: [PATCH 1572/1622] Update to FreeBSD 13.5 (#1603) Signed-off-by: Li-Wen Hsu <lwhsu@lwhsu.org> --- os_pkrvars/freebsd/freebsd-13-aarch64.pkrvars.hcl | 6 +++--- os_pkrvars/freebsd/freebsd-13-x86_64.pkrvars.hcl | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/os_pkrvars/freebsd/freebsd-13-aarch64.pkrvars.hcl b/os_pkrvars/freebsd/freebsd-13-aarch64.pkrvars.hcl index 19e2e571f..4d2da9216 100644 --- a/os_pkrvars/freebsd/freebsd-13-aarch64.pkrvars.hcl +++ b/os_pkrvars/freebsd/freebsd-13-aarch64.pkrvars.hcl @@ -1,8 +1,8 @@ os_name = "freebsd" -os_version = "13.4" +os_version = "13.5" os_arch = "aarch64" -iso_url = "https://download.freebsd.org/releases/arm64/aarch64/ISO-IMAGES/13.4/FreeBSD-13.4-RELEASE-arm64-aarch64-disc1.iso" -iso_checksum = "file:https://download.freebsd.org/releases/arm64/aarch64/ISO-IMAGES/13.4/CHECKSUM.SHA256-FreeBSD-13.4-RELEASE-arm64-aarch64" +iso_url = "https://download.freebsd.org/releases/arm64/aarch64/ISO-IMAGES/13.5/FreeBSD-13.5-RELEASE-arm64-aarch64-disc1.iso" +iso_checksum = "file:https://download.freebsd.org/releases/arm64/aarch64/ISO-IMAGES/13.5/CHECKSUM.SHA256-FreeBSD-13.5-RELEASE-arm64-aarch64" parallels_guest_os_type = "freebsd" vbox_guest_os_type = "FreeBSD_arm64" vmware_guest_os_type = "arm-freebsd13-64" diff --git a/os_pkrvars/freebsd/freebsd-13-x86_64.pkrvars.hcl b/os_pkrvars/freebsd/freebsd-13-x86_64.pkrvars.hcl index b1e3d85fd..199b0b6b9 100644 --- a/os_pkrvars/freebsd/freebsd-13-x86_64.pkrvars.hcl +++ b/os_pkrvars/freebsd/freebsd-13-x86_64.pkrvars.hcl @@ -1,8 +1,8 @@ os_name = "freebsd" -os_version = "13.4" +os_version = "13.5" os_arch = "x86_64" -iso_url = "https://download.freebsd.org/releases/amd64/amd64/ISO-IMAGES/13.4/FreeBSD-13.4-RELEASE-amd64-disc1.iso" -iso_checksum = "file:https://download.freebsd.org/releases/amd64/amd64/ISO-IMAGES/13.4/CHECKSUM.SHA256-FreeBSD-13.4-RELEASE-amd64" +iso_url = "https://download.freebsd.org/releases/amd64/amd64/ISO-IMAGES/13.5/FreeBSD-13.5-RELEASE-amd64-disc1.iso" +iso_checksum = "file:https://download.freebsd.org/releases/amd64/amd64/ISO-IMAGES/13.5/CHECKSUM.SHA256-FreeBSD-13.5-RELEASE-amd64" parallels_guest_os_type = "freebsd" vbox_guest_os_type = "FreeBSD_64" vmware_guest_os_type = "freebsd-64" From b45713e4f41cc13735db32a58ad9daf56368612b Mon Sep 17 00:00:00 2001 From: Corey Hemminger <hemminger@hotmail.com> Date: Tue, 11 Mar 2025 19:23:10 -0500 Subject: [PATCH 1573/1622] Windows build fixes (#1599) *fix windows builds --------- Signed-off-by: Corey Hemminger <hemminger@hotmail.com> --- .github/workflows/ci-build.yml | 8 +- .../workflows/pkr-bld-amazonlinux-arm64.yml | 2 +- .github/workflows/pkr-bld-hyperv-x64.yml | 2 +- .github/workflows/pkr-bld-parallels-arm64.yml | 2 +- .github/workflows/pkr-bld-parallels-x64.yml | 2 +- .github/workflows/pkr-bld-qemu-arm64.yml | 2 +- .github/workflows/pkr-bld-qemu-x64.yml | 2 +- .../workflows/pkr-bld-virtualbox-arm64.yml | 4 +- .github/workflows/pkr-bld-virtualbox-x64.yml | 2 +- .github/workflows/pkr-bld-vmware-arm64.yml | 2 +- .github/workflows/pkr-bld-vmware-x64.yml | 2 +- .github/workflows/test-pkr-bld-parallels.yml | 2 +- CHANGELOG.md | 54 +- builds/.gitkeep | 0 os_pkrvars/macos/macos-14-aarch64.pkrvars.hcl | 8 +- os_pkrvars/macos/macos-15-aarch64.pkrvars.hcl | 20 +- .../windows/windows-10-x86_64.pkrvars.hcl | 13 +- .../windows/windows-11-aarch64.pkrvars.hcl | 22 +- .../windows/windows-11-x86_64.pkrvars.hcl | 6 +- .../windows/windows-2016-x86_64.pkrvars.hcl | 9 +- .../windows/windows-2019-x86_64.pkrvars.hcl | 13 +- .../windows/windows-2022-x86_64.pkrvars.hcl | 11 +- .../windows/windows-2025-x86_64.pkrvars.hcl | 11 +- packer_templates/pkr-builder.pkr.hcl | 40 +- packer_templates/pkr-sources.pkr.hcl | 146 ++- packer_templates/pkr-variables.pkr.hcl | 67 +- .../scripts/macos/disable_auto_update.sh | 15 + .../scripts/macos/system-update-complete.sh | 11 + .../scripts/macos/system-update.sh | 14 +- packer_templates/scripts/windows/cleanup.ps1 | 53 +- packer_templates/scripts/windows/optimize.ps1 | 11 - .../scripts/windows/provision.ps1 | 216 ++- .../scripts/windows/remove-apps.ps1 | 90 ++ .../scripts/windows/remove-capabilities.ps1 | 61 + .../scripts/windows/remove-features.ps1 | 50 + .../11/arm64/Autounattend.xml | 1158 +++++++---------- 36 files changed, 1158 insertions(+), 973 deletions(-) delete mode 100644 builds/.gitkeep create mode 100644 packer_templates/scripts/macos/disable_auto_update.sh create mode 100644 packer_templates/scripts/macos/system-update-complete.sh create mode 100644 packer_templates/scripts/windows/remove-capabilities.ps1 create mode 100644 packer_templates/scripts/windows/remove-features.ps1 diff --git a/.github/workflows/ci-build.yml b/.github/workflows/ci-build.yml index af0bddd90..657dd5f63 100644 --- a/.github/workflows/ci-build.yml +++ b/.github/workflows/ci-build.yml @@ -33,9 +33,9 @@ jobs: with: EXCLUDE_REGEX: 'amazonlinux-2.*|rhel.*|sles.*|solaris.*|windows-11-aarch64.*,macos-*' - packer-lint: - uses: chef/github-workflows/.github/workflows/packer-lint.yml@main - secrets: inherit +# packer-lint: +# uses: chef/github-workflows/.github/workflows/packer-lint.yml@main +# secrets: inherit pkr-bld-amazonlinux-arm64: uses: ./.github/workflows/pkr-bld-amazonlinux-arm64.yml @@ -90,7 +90,7 @@ jobs: - xml-lint - powershell-lint - shellcheck-lint - - packer-lint + # - packer-lint runs-on: Ubuntu-latest steps: - name: Decide whether the needed jobs succeeded or failed diff --git a/.github/workflows/pkr-bld-amazonlinux-arm64.yml b/.github/workflows/pkr-bld-amazonlinux-arm64.yml index 67b91cb0e..94b9ba8b6 100644 --- a/.github/workflows/pkr-bld-amazonlinux-arm64.yml +++ b/.github/workflows/pkr-bld-amazonlinux-arm64.yml @@ -23,7 +23,7 @@ jobs: brew update brew install qemu brew install --cask hashicorp/tap/hashicorp-vagrant - brew install --cask virtualbox@beta + brew install --cask virtualbox - name: Install Chef uses: actionshub/chef-install@3.0.0 with: diff --git a/.github/workflows/pkr-bld-hyperv-x64.yml b/.github/workflows/pkr-bld-hyperv-x64.yml index 016feb26a..94287ae0a 100644 --- a/.github/workflows/pkr-bld-hyperv-x64.yml +++ b/.github/workflows/pkr-bld-hyperv-x64.yml @@ -57,7 +57,7 @@ jobs: - name: Packer Init run: packer init -upgrade packer_templates - name: Packer build - run: packer build -timestamp-ui -only="${{ matrix.provider }}.vm" -var 'sources_enabled=["hyperv-iso.vm"]' -var-file="os_pkrvars/$("${{ matrix.os }}".Split('-')[0])/${{ matrix.os }}-x86_64.pkrvars.hcl" packer_templates + run: packer build -timestamp-ui -only="${{ matrix.provider }}.vm" -var 'ssh_timeout=30m' -var 'sources_enabled=["hyperv-iso.vm"]' -var-file="os_pkrvars/$("${{ matrix.os }}".Split('-')[0])/${{ matrix.os }}-x86_64.pkrvars.hcl" packer_templates - name: Upload build artifact uses: actions/upload-artifact@v4 with: diff --git a/.github/workflows/pkr-bld-parallels-arm64.yml b/.github/workflows/pkr-bld-parallels-arm64.yml index fb443b9cb..ce9696518 100644 --- a/.github/workflows/pkr-bld-parallels-arm64.yml +++ b/.github/workflows/pkr-bld-parallels-arm64.yml @@ -43,7 +43,7 @@ jobs: - name: Bento build run: | eval "$(chef shell-init bash)" - bento build -o ${{ matrix.provider }}.vm --vars 'ssh_timeout=60m' os_pkrvars/$(echo ${{ matrix.os }} | cut -d "-" -f 1)/"${{ matrix.os }}-aarch64.pkrvars.hcl" + bento build -o ${{ matrix.provider }}.vm --vars 'ssh_timeout=30m' os_pkrvars/$(echo ${{ matrix.os }} | cut -d "-" -f 1)/"${{ matrix.os }}-aarch64.pkrvars.hcl" ls -alh builds/ cat builds/${{ matrix.os }}*-aarch64._metadata.json - name: Remove VM in case of canceled job diff --git a/.github/workflows/pkr-bld-parallels-x64.yml b/.github/workflows/pkr-bld-parallels-x64.yml index 3c1d6f3cb..96b83055b 100644 --- a/.github/workflows/pkr-bld-parallels-x64.yml +++ b/.github/workflows/pkr-bld-parallels-x64.yml @@ -42,7 +42,7 @@ jobs: - name: Bento build run: | eval "$(chef shell-init bash)" - bento build -o ${{ matrix.provider }}.vm --vars 'ssh_timeout=60m' os_pkrvars/$(echo ${{ matrix.os }} | cut -d "-" -f 1)/"${{ matrix.os }}-x86_64.pkrvars.hcl" + bento build -o ${{ matrix.provider }}.vm --vars 'ssh_timeout=30m' os_pkrvars/$(echo ${{ matrix.os }} | cut -d "-" -f 1)/"${{ matrix.os }}-x86_64.pkrvars.hcl" ls -alh builds/ cat builds/${{ matrix.os }}*-x86_64._metadata.json - name: Remove VM in case of canceled job diff --git a/.github/workflows/pkr-bld-qemu-arm64.yml b/.github/workflows/pkr-bld-qemu-arm64.yml index 2e881fbaa..0c39e0367 100644 --- a/.github/workflows/pkr-bld-qemu-arm64.yml +++ b/.github/workflows/pkr-bld-qemu-arm64.yml @@ -60,7 +60,7 @@ jobs: - name: Bento build run: | eval "$(chef shell-init bash)" - bento build -o ${{ matrix.provider }}.vm --vars 'ssh_timeout=60m' --vars "qemu_accelerator=hvf" os_pkrvars/$(echo ${{ matrix.os }} | cut -d "-" -f 1)/"${{ matrix.os }}-aarch64.pkrvars.hcl" + bento build -o ${{ matrix.provider }}.vm --vars 'ssh_timeout=30m' --vars "qemu_accelerator=hvf" os_pkrvars/$(echo ${{ matrix.os }} | cut -d "-" -f 1)/"${{ matrix.os }}-aarch64.pkrvars.hcl" ls -alh builds/ cat builds/${{ matrix.os }}*-aarch64._metadata.json - name: Upload build artifact diff --git a/.github/workflows/pkr-bld-qemu-x64.yml b/.github/workflows/pkr-bld-qemu-x64.yml index 48c773f82..8c6062e86 100644 --- a/.github/workflows/pkr-bld-qemu-x64.yml +++ b/.github/workflows/pkr-bld-qemu-x64.yml @@ -72,7 +72,7 @@ jobs: sudo chmod -R 777 /mnt/builds sudo ln -s /mnt/builds ./ eval "$(chef shell-init bash)" - bento build -o ${{ matrix.provider }}.vm --vars 'ssh_timeout=60m' --vars "qemu_accelerator=kvm" os_pkrvars/$(echo ${{ matrix.os }} | cut -d "-" -f 1)/"${{ matrix.os }}-x86_64.pkrvars.hcl" + bento build -o ${{ matrix.provider }}.vm --vars 'ssh_timeout=30m' --vars "qemu_accelerator=kvm" os_pkrvars/$(echo ${{ matrix.os }} | cut -d "-" -f 1)/"${{ matrix.os }}-x86_64.pkrvars.hcl" ls -alh builds/ cat builds/${{ matrix.os }}*-x86_64._metadata.json - name: Upload build artifact diff --git a/.github/workflows/pkr-bld-virtualbox-arm64.yml b/.github/workflows/pkr-bld-virtualbox-arm64.yml index 196d86047..14b4bdcb5 100644 --- a/.github/workflows/pkr-bld-virtualbox-arm64.yml +++ b/.github/workflows/pkr-bld-virtualbox-arm64.yml @@ -40,7 +40,7 @@ jobs: brew tap hashicorp/tap brew update brew install --cask hashicorp/tap/hashicorp-vagrant - brew install --cask virtualbox@beta + brew install --cask virtualbox - name: Install Chef uses: actionshub/chef-install@3.0.0 with: @@ -57,7 +57,7 @@ jobs: - name: Bento build run: | eval "$(chef shell-init bash)" - bento build -o ${{ matrix.provider }}.vm --vars 'ssh_timeout=60m' os_pkrvars/$(echo ${{ matrix.os }} | cut -d "-" -f 1)/"${{ matrix.os }}-aarch64.pkrvars.hcl" + bento build -o ${{ matrix.provider }}.vm --vars 'ssh_timeout=30m' os_pkrvars/$(echo ${{ matrix.os }} | cut -d "-" -f 1)/"${{ matrix.os }}-aarch64.pkrvars.hcl" ls -alh builds/ cat builds/${{ matrix.os }}*-aarch64._metadata.json - name: Upload build artifact diff --git a/.github/workflows/pkr-bld-virtualbox-x64.yml b/.github/workflows/pkr-bld-virtualbox-x64.yml index 0c6e59c0b..fd962b1b8 100644 --- a/.github/workflows/pkr-bld-virtualbox-x64.yml +++ b/.github/workflows/pkr-bld-virtualbox-x64.yml @@ -64,7 +64,7 @@ jobs: sudo ln -s /mnt/builds ./ eval "$(chef shell-init bash)" export LOGNAME=$USER - bento build -o ${{ matrix.provider }}.vm --vars 'ssh_timeout=60m' os_pkrvars/$(echo ${{ matrix.os }} | cut -d "-" -f 1)/"${{ matrix.os }}-x86_64.pkrvars.hcl" + bento build -o ${{ matrix.provider }}.vm --vars 'ssh_timeout=30m' os_pkrvars/$(echo ${{ matrix.os }} | cut -d "-" -f 1)/"${{ matrix.os }}-x86_64.pkrvars.hcl" ls -alh builds/ cat builds/${{ matrix.os }}*-x86_64._metadata.json - name: Upload build artifact diff --git a/.github/workflows/pkr-bld-vmware-arm64.yml b/.github/workflows/pkr-bld-vmware-arm64.yml index b69a56b60..12ca0c7fc 100644 --- a/.github/workflows/pkr-bld-vmware-arm64.yml +++ b/.github/workflows/pkr-bld-vmware-arm64.yml @@ -182,7 +182,7 @@ jobs: - name: Bento build run: | eval "$(chef shell-init bash)" - bento build -o ${{ matrix.provider }}.vm --vars 'ssh_timeout=60m' os_pkrvars/$(echo ${{ matrix.os }} | cut -d "-" -f 1)/"${{ matrix.os }}-aarch64.pkrvars.hcl" + bento build -o ${{ matrix.provider }}.vm --vars 'ssh_timeout=30m' os_pkrvars/$(echo ${{ matrix.os }} | cut -d "-" -f 1)/"${{ matrix.os }}-aarch64.pkrvars.hcl" ls -alh builds/ cat builds/${{ matrix.os }}*-aarch64._metadata.json - name: Upload build artifact diff --git a/.github/workflows/pkr-bld-vmware-x64.yml b/.github/workflows/pkr-bld-vmware-x64.yml index 0463fda2b..6c8cd1c46 100644 --- a/.github/workflows/pkr-bld-vmware-x64.yml +++ b/.github/workflows/pkr-bld-vmware-x64.yml @@ -61,7 +61,7 @@ jobs: - name: Bento build run: | eval "$(chef shell-init bash)" - bento build -o ${{ matrix.provider }}.vm --vars 'ssh_timeout=60m' os_pkrvars/$(echo ${{ matrix.os }} | cut -d "-" -f 1)/"${{ matrix.os }}-x86_64.pkrvars.hcl" + bento build -o ${{ matrix.provider }}.vm --vars 'ssh_timeout=30m' os_pkrvars/$(echo ${{ matrix.os }} | cut -d "-" -f 1)/"${{ matrix.os }}-x86_64.pkrvars.hcl" ls -alh builds/ cat builds/${{ matrix.os }}*-x86_64._metadata.json - name: Upload build artifact diff --git a/.github/workflows/test-pkr-bld-parallels.yml b/.github/workflows/test-pkr-bld-parallels.yml index cdc09f589..5fc3d17b0 100644 --- a/.github/workflows/test-pkr-bld-parallels.yml +++ b/.github/workflows/test-pkr-bld-parallels.yml @@ -127,7 +127,7 @@ jobs: - name: Bento build run: | eval "$(chef shell-init bash)" - bento build -o ${{ matrix.provider }}.vm --vars 'ssh_timeout=60m' os_pkrvars/$(echo ${{ matrix.os }} | cut -d "-" -f 1)/"${{ matrix.os }}-aarch64.pkrvars.hcl" + bento build -o ${{ matrix.provider }}.vm --vars 'ssh_timeout=30m' os_pkrvars/$(echo ${{ matrix.os }} | cut -d "-" -f 1)/"${{ matrix.os }}-aarch64.pkrvars.hcl" ls -alh builds/ cat builds/${{ matrix.os }}*-aarch64._metadata.json - name: Upload build artifact diff --git a/CHANGELOG.md b/CHANGELOG.md index 2c0dd5747..9348c0fd5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,40 +5,39 @@ *__Note:__ Markdown table generated at <https://www.tablesgenerator.com/markdown_tables#> - | os | hyperv<br>x86_64 | parallels<br>x86_64 | parallels<br>aarch64 | qemu<br>x86_64 | qemu<br>aarch64 | virtualbox<br>x86_64 | virtualbox<br>aarch64 | vmware<br>x86_64 | vmware<br>aarch64 | |:---:|:---:|:---:|:---:|:---:|:---:|:---:|:---:|:---:|:---:| -| almalinux-8 | | x | | | | x | | x | | -| almalinux-9 | | x | x | | | x | x | x | x | +| almalinux-8 | | x | na | x | na | x | na | x | na | +| almalinux-9 | | x | x | x | | x | x | x | x | | amazonlinux-2023 | | | | | | x | | | | -| centos-stream-9 | | x | x | | | x | x | x | x | -| centos-stream-10 | | x | x | | | x | x | x | x | +| centos-stream-9 | | x | x | x | | x | x | x | x | +| centos-stream-10 | | x | x | x | | x | x | x | x | | debian-11 | | x | x | | | x | | x | x | | debian-12 | | x | x | | | x | | x | x | -| fedora-40 | | x | x | | | x | x | x | x | -| fedora-41 | | x | x | | | x | x | x | x | -| freebsd-13 | | x | x | | | x | x | x | x | -| freebsd-14 | | x | x | | | x | x | x | x | +| fedora-40 | | x | x | x | | x | x | x | x | +| fedora-41 | | x | x | x | | x | x | x | x | +| freebsd-13 | | x | x | x | | x | x | x | x | +| freebsd-14 | | x | x | x | | x | x | x | x | | macos-14 | | | x | | | | | | | -| macos-15 | | | | | | | | | | -| opensuse-leap-15 | | x | x | | | x | x | x | x | +| macos-15 | | | x | | | | | | | +| opensuse-leap-15 | | x | x | x | | x | x | x | x | | oraclelinux-8 | | x | | | | x | | x | | -| oraclelinux-9 | | x | x | | | x | x | x | x | +| oraclelinux-9 | | x | x | x | | x | x | x | x | | rhel-8 | license<br>needed | license<br>needed | license<br>needed | license<br>needed | license<br>needed | license<br>needed | license<br>needed | license<br>needed | license<br>needed | | rhel-9 | license<br>needed | license<br>needed | license<br>needed | license<br>needed | license<br>needed | license<br>needed | license<br>needed | license<br>needed | license<br>needed | -| rockylinux-8 | | x | | | | x | | x | | -| rockylinux-9 | | x | x | | | x | x | x | x | +| rockylinux-8 | | x | na | x | na | x | na | x | na | +| rockylinux-9 | | x | x | x | | x | x | x | x | | sles-12 | license<br>needed | license<br>needed | na | license<br>needed | na | license<br>needed | na | license<br>needed | na | | sles-15 | license<br>needed | license<br>needed | na | license<br>needed | na | license<br>needed | na | license<br>needed | na | | solaris-11 | license<br>needed | license<br>needed | na | license<br>needed | na | license<br>needed | na | license<br>needed | na | -| ubuntu-22.04 | | x | x | | | x | x | x | x | -| ubuntu-24.04 | | x | x | | | x | x | x | x | -| windows-10 | | | na | | na | x | na | | na | -| windows-11 | | x | x | | | x | | x | | -| windows-2016 | | x | na | | na | x | na | x | na | -| windows-2019 | | x | na | | na | x | na | x | na | -| windows-2022 | | x | na | | na | x | na | | na | -| windows-2025 | | | na | | na | | na | | na | +| ubuntu-22.04 | | x | x | x | | x | x | x | x | +| ubuntu-24.04 | | x | x | x | | x | x | x | x | +| windows-10 | | | na | x | na | x | na | | na | +| windows-11 | | x | x | | | x | | x | x | +| windows-2016 | | x | na | x | na | x | na | x | na | +| windows-2019 | | x | na | x | na | x | na | x | na | +| windows-2022 | | x | na | x | na | x | na | | na | +| windows-2025 | | x | na | | na | x | na | x | na | ### Todo @@ -71,26 +70,29 @@ Markdown table generated at <https://www.tablesgenerator.com/markdown_tables#> - Update oraclelinux 9 to 9.5 - Update rhel 9 to 9.5 - Update freebsd 14 to 14.2 +- Update freebsd 13 to 13.5 - Update debian 11 to 11.11 - Update debian 12 to 12.9 - Update MacOS 14 to 14.6.1 - Update OpenSUSE Leap 15 to 15.6 - Update SLES 15 to 15.6 -- Add MacOS 15 at 15.3.1 +- Add macOS 15 at 15.3.1 - Remove ask from --on-error flag options(it did nothing) - Switched most iso urls to boot images to shrink disk usage space and speed up downloads - Removed RHEL 7 ks.cfg file - Added RHEL 10 ks.cfg file - Fix Vbox 7.1.6+ VBoxManage and hardware config for Aarch64 builds -- Consolidated and updated few post processing scripts to clean up code +- Consolidated and updated few post-processing scripts to clean up code - Added Packer variable for iso_target_path to default iso downloads to the local builds/iso directory +- Updated windows scripts and order for better build performance +- Fixed Windows 11 aarch64 builds - vbox 7.6.1 currently doesn't support Windows 11 aarch64 ## [v4.1.2] (2024-05-23) - Fix for hyper-v build option - Remove test-kitchen and kitchen-vagrant dependencies from gemspec to fix gem compile error on windows -- Updated hyper-v builds to use github actions hosted runners -- Updated VMware builds to use github actions hosted runners +- Updated hyper-v builds to use GitHub actions hosted runners +- Updated VMware builds to use GitHub actions hosted runners - Better handle bento uploads of slugs ending in 'latest' - Fix oraclelinux slug names - Update almalinux 9.3 to 9.4 diff --git a/builds/.gitkeep b/builds/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/os_pkrvars/macos/macos-14-aarch64.pkrvars.hcl b/os_pkrvars/macos/macos-14-aarch64.pkrvars.hcl index a98e4b1f4..db1f92d2b 100644 --- a/os_pkrvars/macos/macos-14-aarch64.pkrvars.hcl +++ b/os_pkrvars/macos/macos-14-aarch64.pkrvars.hcl @@ -1,9 +1,11 @@ -os_name = "macos" -os_version = "14.6.1" -os_arch = "aarch64" +os_name = "macos" +os_version = "14.6.1" +os_arch = "aarch64" +# Download urls cn be foud at https://ipsw.me/VirtualMac2,1 parallels_ipsw_url = "https://updates.cdn-apple.com/2024SummerFCS/fullrestores/062-52859/932E0A8F-6644-4759-82DA-F8FA8DEA806A/UniversalMac_14.6.1_23G93_Restore.ipsw" parallels_ipsw_checksum = "e387251e63387150ba76cf784bdb97d2016e5d43c6f809c90a115eb067a097b8" sources_enabled = ["source.parallels-ipsw.vm"] +default_boot_wait = "15s" boot_command = [ # hello, hola, bonjour, etc. "<wait><spacebar><wait5s>", diff --git a/os_pkrvars/macos/macos-15-aarch64.pkrvars.hcl b/os_pkrvars/macos/macos-15-aarch64.pkrvars.hcl index b20a59e64..cada474ca 100644 --- a/os_pkrvars/macos/macos-15-aarch64.pkrvars.hcl +++ b/os_pkrvars/macos/macos-15-aarch64.pkrvars.hcl @@ -1,9 +1,11 @@ -os_name = "macos" -os_version = "15.3.1" -os_arch = "aarch64" +os_name = "macos" +os_version = "15.3.1" +os_arch = "aarch64" +# Download urls cn be foud at https://ipsw.me/VirtualMac2,1 parallels_ipsw_url = "https://updates.cdn-apple.com/2025WinterFCS/fullrestores/072-70618/42F1A8CC-7E07-4329-958A-757FF600C303/UniversalMac_15.3.1_24D70_Restore.ipsw" -parallels_ipsw_checksum = "c2b5bca53c6cf475e7a2a0b6d6c0db19477d69eb" +parallels_ipsw_checksum = "559a78b75adc6bec77665b17db0e166eba326b04fc534e2a086253be92e043b0" sources_enabled = ["source.parallels-ipsw.vm"] +default_boot_wait = "15s" boot_command = [ # hello, hola, bonjour, etc. "<wait><spacebar><wait5s>", @@ -18,7 +20,7 @@ boot_command = [ # Data & Privacy "<leftShiftOn><tab><leftShiftOff><wait><spacebar><wait5s>", # Migration Assistant - "<tab><wait><tab><wait><tab><wait><spacebar><wait5s>", + "<leftShiftOn><tab><wait><tab><wait><tab><leftShiftOff><wait><spacebar><wait5s>", # Sign In with Your Apple ID "<leftShiftOn><tab><wait><tab><leftShiftOff><wait><spacebar><wait5s>", # Are you sure you want to skip signing in with an Apple ID? @@ -32,9 +34,9 @@ boot_command = [ # Enable Location Services "<leftShiftOn><tab><leftShiftOff><wait><spacebar><wait5s>", # Are you sure you don't want to use Location Services? - "<tab><wait><spacebar><wait5s>", + "<tab><wait><spacebar><wait10s>", # Select Your Time Zone - "<tab><wait>UTC<wait><enter><wait><leftShiftOn><tab><leftShiftOff><wait><spacebar><wait5s>", + "<tab><wait><tab><wait>UTC<wait><enter><wait><leftShiftOn><tab><wait><tab><leftShiftOff><wait><spacebar><wait5s>", # Analytics "<tab><wait><spacebar><wait><leftShiftOn><tab><leftShiftOff><wait><spacebar><wait5s>", # Screen Time @@ -44,11 +46,11 @@ boot_command = [ # Choose Your Look "<leftShiftOn><tab><leftShiftOff><wait><spacebar><wait30s>", # Enable keyboard navigation - "<leftCtrlOn><f7><leftCtrlOff><wait2s>", + "<space><wait><leftCtrlOn><f7><leftCtrlOff><wait2s>", # Open System Settings "<leftSuperOn><spacebar><leftSuperOff><wait>System<spacebar>Settings<wait><enter><wait5s>", # Enable Remote Management - "<up><wait><tab><tab><tab><tab><tab><tab><tab><tab><tab><wait><spacebar><wait5s>", + "<tab><tab><tab><tab><tab><tab><tab><tab><tab><tab><wait><spacebar><wait5s>", "<tab><tab><tab><tab><tab><tab><tab><tab><tab><tab><tab><tab><tab><tab><tab><tab><tab><wait><spacebar><wait5s>", # Enable Remote Login "<tab><tab><wait><spacebar><wait5s>", diff --git a/os_pkrvars/windows/windows-10-x86_64.pkrvars.hcl b/os_pkrvars/windows/windows-10-x86_64.pkrvars.hcl index 0036e7c10..b61f4b2de 100644 --- a/os_pkrvars/windows/windows-10-x86_64.pkrvars.hcl +++ b/os_pkrvars/windows/windows-10-x86_64.pkrvars.hcl @@ -1,9 +1,10 @@ -os_name = "windows" -os_version = "10" -os_arch = "x86_64" -is_windows = true +os_name = "windows" +os_version = "10" +os_arch = "x86_64" +is_windows = true +# Download url's found at https://www.microsoft.com/en-us/evalcenter/download-windows-10-enterprise iso_url = "https://software-static.download.prss.microsoft.com/dbazure/988969d5-f34g-4e03-ac9d-1f9786c66750/19045.2006.220908-0225.22h2_release_svc_refresh_CLIENTENTERPRISEEVAL_OEMRET_x64FRE_en-us.iso" -iso_checksum = "ef7312733a9f5d7d51cfa04ac497671995674ca5e1058d5164d6028f0938d668" +iso_checksum = "EF7312733A9F5D7D51CFA04AC497671995674CA5E1058D5164D6028F0938D668" parallels_guest_os_type = "win-10" vbox_guest_os_type = "Windows10_64" -vmware_guest_os_type = "windows9srv-64" +vmware_guest_os_type = "windows9-64" diff --git a/os_pkrvars/windows/windows-11-aarch64.pkrvars.hcl b/os_pkrvars/windows/windows-11-aarch64.pkrvars.hcl index 876c78c06..6799ab778 100644 --- a/os_pkrvars/windows/windows-11-aarch64.pkrvars.hcl +++ b/os_pkrvars/windows/windows-11-aarch64.pkrvars.hcl @@ -1,9 +1,15 @@ -os_name = "windows" -os_version = "11" -os_arch = "aarch64" -is_windows = true -iso_url = "../../builds/iso/WIN11_PROFESSIONAL_ARM64_EN-US.ISO" -iso_checksum = "90d4f9b5377e3c41784696ad0bb021b690e4f981f8e278fad62e07726f86bd77" +os_name = "windows" +os_version = "11" +os_arch = "aarch64" +is_windows = true +hyperv_generation = 2 +# Download url's found at https://www.microsoft.com/en-us/evalcenter/download-windows-11-enterprise +iso_url = "https://software-static.download.prss.microsoft.com/dbazure/888969d5-f34g-4e03-ac9d-1f9786c66749/26100.1.240331-1435.ge_release_CLIENTENTERPRISEEVAL_OEMRET_A64FRE_en-us.iso" +iso_checksum = "DAD633276073F14F3E0373EF7E787569E216D54942CE522B39451C8F2D38AD43" +sources_enabled = ["source.parallels-iso.vm", "source.qemu.vm", "source.vmware-iso.vm"] parallels_guest_os_type = "win-11" -vbox_guest_os_type = "Windows11_64" -vmware_guest_os_type = "windows9srv-64" +vbox_guest_os_type = "Windows11_arm64" +vmware_guest_os_type = "arm-windows11-64" +vmware_firmware = "efi-secure" +parallels_boot_wait = "180s" +boot_command = ["<up><wait><down><down><enter><wait><up>", ] diff --git a/os_pkrvars/windows/windows-11-x86_64.pkrvars.hcl b/os_pkrvars/windows/windows-11-x86_64.pkrvars.hcl index 3c059d44a..0c05ae5b7 100644 --- a/os_pkrvars/windows/windows-11-x86_64.pkrvars.hcl +++ b/os_pkrvars/windows/windows-11-x86_64.pkrvars.hcl @@ -2,9 +2,9 @@ os_name = "windows" os_version = "11" os_arch = "x86_64" is_windows = true -# Windows 11 source requires a prompt to select OS to install. This allows the system time to add reg keys to ignore TPM Check before the install begins. -iso_url = "https://software-static.download.prss.microsoft.com/dbazure/888969d5-f34g-4e03-ac9d-1f9786c66749/22631.2428.231001-0608.23H2_NI_RELEASE_SVC_REFRESH_CLIENTENTERPRISEEVAL_OEMRET_x64FRE_en-us.iso" -iso_checksum = "c8dbc96b61d04c8b01faf6ce0794fdf33965c7b350eaa3eb1e6697019902945c" +# Download url's found at https://www.microsoft.com/en-us/evalcenter/download-windows-11-enterprise +iso_url = "https://software-static.download.prss.microsoft.com/dbazure/888969d5-f34g-4e03-ac9d-1f9786c66749/26100.1742.240906-0331.ge_release_svc_refresh_CLIENTENTERPRISEEVAL_OEMRET_x64FRE_en-us.iso" +iso_checksum = "755A90D43E826A74B9E1932A34788B898E028272439B777E5593DEE8D53622AE" parallels_guest_os_type = "win-11" vbox_guest_os_type = "Windows11_64" vmware_guest_os_type = "windows9srv-64" diff --git a/os_pkrvars/windows/windows-2016-x86_64.pkrvars.hcl b/os_pkrvars/windows/windows-2016-x86_64.pkrvars.hcl index 0346a55c2..79f734e5a 100644 --- a/os_pkrvars/windows/windows-2016-x86_64.pkrvars.hcl +++ b/os_pkrvars/windows/windows-2016-x86_64.pkrvars.hcl @@ -1,7 +1,8 @@ -os_name = "windows" -os_version = "2016" -os_arch = "x86_64" -is_windows = true +os_name = "windows" +os_version = "2016" +os_arch = "x86_64" +is_windows = true +# Download url's found at https://www.microsoft.com/en-us/evalcenter/download-windows-server-2016 iso_url = "https://software-static.download.prss.microsoft.com/pr/download/Windows_Server_2016_Datacenter_EVAL_en-us_14393_refresh.ISO" iso_checksum = "1ce702a578a3cb1ac3d14873980838590f06d5b7101c5daaccbac9d73f1fb50f" parallels_guest_os_type = "win-2016" diff --git a/os_pkrvars/windows/windows-2019-x86_64.pkrvars.hcl b/os_pkrvars/windows/windows-2019-x86_64.pkrvars.hcl index 04c9e3f54..87614c762 100644 --- a/os_pkrvars/windows/windows-2019-x86_64.pkrvars.hcl +++ b/os_pkrvars/windows/windows-2019-x86_64.pkrvars.hcl @@ -1,9 +1,10 @@ -os_name = "windows" -os_version = "2019" -os_arch = "x86_64" -is_windows = true -iso_url = "https://software-static.download.prss.microsoft.com/pr/download/17763.737.190906-2324.rs5_release_svc_refresh_SERVER_EVAL_x64FRE_en-us_1.iso" -iso_checksum = "549bca46c055157291be6c22a3aaaed8330e78ef4382c99ee82c896426a1cee1" +os_name = "windows" +os_version = "2019" +os_arch = "x86_64" +is_windows = true +# Download url's found at https://www.microsoft.com/en-us/evalcenter/download-windows-server-2019 +iso_url = "https://software-static.download.prss.microsoft.com/dbazure/988969d5-f34g-4e03-ac9d-1f9786c66749/17763.3650.221105-1748.rs5_release_svc_refresh_SERVER_EVAL_x64FRE_en-us.iso" +iso_checksum = "6dae072e7f78f4ccab74a45341de0d6e2d45c39be25f1f5920a2ab4f51d7bcbb" parallels_guest_os_type = "win-2019" vbox_guest_os_type = "Windows2019_64" vmware_guest_os_type = "windows9srv-64" diff --git a/os_pkrvars/windows/windows-2022-x86_64.pkrvars.hcl b/os_pkrvars/windows/windows-2022-x86_64.pkrvars.hcl index 4e561032f..b0ad18b28 100644 --- a/os_pkrvars/windows/windows-2022-x86_64.pkrvars.hcl +++ b/os_pkrvars/windows/windows-2022-x86_64.pkrvars.hcl @@ -1,9 +1,10 @@ -os_name = "windows" -os_version = "2022" -os_arch = "x86_64" -is_windows = true +os_name = "windows" +os_version = "2022" +os_arch = "x86_64" +is_windows = true +# Download url's found at https://www.microsoft.com/en-us/evalcenter/download-windows-server-2022 iso_url = "https://software-static.download.prss.microsoft.com/sg/download/888969d5-f34g-4e03-ac9d-1f9786c66749/SERVER_EVAL_x64FRE_en-us.iso" -iso_checksum = "sha256:d0ef4502e350e3c6c53c15b1b3020d38a5ded011bf04998e950720ac8579b23d" +iso_checksum = "3e4fa6d8507b554856fc9ca6079cc402df11a8b79344871669f0251535255325" parallels_guest_os_type = "win-2022" vbox_guest_os_type = "Windows2022_64" vmware_guest_os_type = "windows9srv-64" diff --git a/os_pkrvars/windows/windows-2025-x86_64.pkrvars.hcl b/os_pkrvars/windows/windows-2025-x86_64.pkrvars.hcl index 97d46b897..46228c754 100644 --- a/os_pkrvars/windows/windows-2025-x86_64.pkrvars.hcl +++ b/os_pkrvars/windows/windows-2025-x86_64.pkrvars.hcl @@ -1,9 +1,10 @@ -os_name = "windows" -os_version = "2025" -os_arch = "x86_64" -is_windows = true +os_name = "windows" +os_version = "2025" +os_arch = "x86_64" +is_windows = true +# Download url's found at https://www.microsoft.com/en-us/evalcenter/download-windows-server-2025 iso_url = "https://software-static.download.prss.microsoft.com/dbazure/888969d5-f34g-4e03-ac9d-1f9786c66749/26100.1742.240906-0331.ge_release_svc_refresh_SERVER_EVAL_x64FRE_en-us.iso" -iso_checksum = "sha256:3e4fa6d8507b554856fc9ca6079cc402df11a8b79344871669f0251535255325" +iso_checksum = "d0ef4502e350e3c6c53c15b1b3020d38a5ded011bf04998e950720ac8579b23d" parallels_guest_os_type = "win-2022" vbox_guest_os_type = "Windows2022_64" vmware_guest_os_type = "windows9srv-64" diff --git a/packer_templates/pkr-builder.pkr.hcl b/packer_templates/pkr-builder.pkr.hcl index f90e7df70..41a627197 100644 --- a/packer_templates/pkr-builder.pkr.hcl +++ b/packer_templates/pkr-builder.pkr.hcl @@ -35,7 +35,6 @@ packer { locals { scripts = var.scripts == null ? ( var.is_windows ? [ - "${path.root}/scripts/windows/provision.ps1", "${path.root}/scripts/windows/configure-power.ps1", "${path.root}/scripts/windows/disable-windows-uac.ps1", "${path.root}/scripts/windows/disable-system-restore.ps1", @@ -43,8 +42,6 @@ locals { "${path.root}/scripts/windows/ui-tweaks.ps1", "${path.root}/scripts/windows/disable-windows-updates.ps1", "${path.root}/scripts/windows/disable-windows-defender.ps1", - "${path.root}/scripts/windows/remove-one-drive-and-teams.ps1", - "${path.root}/scripts/windows/remove-apps.ps1", "${path.root}/scripts/windows/enable-remote-desktop.ps1", "${path.root}/scripts/windows/enable-file-sharing.ps1", "${path.root}/scripts/windows/eject-media.ps1" @@ -52,10 +49,12 @@ locals { var.os_name == "macos" ? [ "${path.root}/scripts/macos/system-default.sh", "${path.root}/scripts/macos/system-update.sh", + "${path.root}/scripts/macos/system-update-complete.sh", "${path.root}/scripts/_common/motd.sh", "${path.root}/scripts/macos/vagrant.sh", "${path.root}/scripts/macos/parallels-tools.sh", "${path.root}/scripts/macos/vmware-tools.sh", + "${path.root}/scripts/macos/disable_auto_update.sh", "${path.root}/scripts/macos/shrink.sh" ] : ( var.os_name == "solaris" ? [ @@ -172,13 +171,36 @@ build { } # Windows Updates and scripts - provisioner "windows-update" { - search_criteria = "IsInstalled=0" - except = var.is_windows ? null : local.source_names + provisioner "powershell" { + elevated_password = "vagrant" + elevated_user = "vagrant" + scripts = [ + "${path.root}/scripts/windows/provision.ps1", + "${path.root}/scripts/windows/remove-one-drive-and-teams.ps1", + "${path.root}/scripts/windows/remove-apps.ps1", + "${path.root}/scripts/windows/remove-capabilities.ps1", + "${path.root}/scripts/windows/remove-features.ps1", + ] + except = var.is_windows ? null : local.source_names } provisioner "windows-restart" { + restart_timeout = "30m" + except = var.is_windows ? null : local.source_names + } + provisioner "windows-update" { + search_criteria = "IsInstalled=0 and IsHidden = 0" + filters = [ + "exclude:$_.Title -like '*Preview*'", + "exclude:$_.Title -like '*Cumulative Update for Microsoft server*'", + "exclude:$_.Title -like '*Cumulative Update for Windows *'", + "include:$true", + ] except = var.is_windows ? null : local.source_names } + provisioner "windows-restart" { + restart_timeout = "30m" + except = var.is_windows ? null : local.source_names + } provisioner "powershell" { elevated_password = "vagrant" elevated_user = "vagrant" @@ -186,7 +208,8 @@ build { except = var.is_windows ? null : local.source_names } provisioner "windows-restart" { - except = var.is_windows ? null : local.source_names + restart_timeout = "30m" + except = var.is_windows ? null : local.source_names } provisioner "powershell" { elevated_password = "vagrant" @@ -197,9 +220,6 @@ build { ] except = var.is_windows ? null : local.source_names } - provisioner "windows-restart" { - except = var.is_windows ? null : local.source_names - } # Convert machines to vagrant boxes post-processor "vagrant" { diff --git a/packer_templates/pkr-sources.pkr.hcl b/packer_templates/pkr-sources.pkr.hcl index 3dde90f8f..1969f4828 100644 --- a/packer_templates/pkr-sources.pkr.hcl +++ b/packer_templates/pkr-sources.pkr.hcl @@ -8,6 +8,9 @@ locals { var.hyperv_generation == 2 && var.is_windows ? true : false ) : var.hyperv_enable_secure_boot + # parallels-ipsw + parallels_ipsw_target_path = var.parallels_ipsw_target_path == "build_dir_iso" ? "${path.root}/../builds/iso/${var.os_name}-${var.os_version}-${var.os_arch}.ipsw" : var.parallels_ipsw_target_path + # parallels-iso parallels_tools_flavor = var.parallels_tools_flavor == null ? ( var.is_windows ? ( @@ -26,7 +29,6 @@ locals { ] : [ ["set", "{{ .Name }}", "--efi-boot", "on"], ["set", "{{ .Name }}", "--efi-secure-boot", "off"], - ["set", "{{ .Name }}", "--device-add", "cdrom", "--image", "${path.root}/../builds/iso/unattended.iso", "--connect"], ] ) : ( var.os_name == "freebsd" && var.os_arch == "x86_64" ? [ @@ -43,17 +45,34 @@ locals { # qemu qemu_binary = var.qemu_binary == null ? "qemu-system-${var.os_arch}" : var.qemu_binary qemu_display = var.qemu_display == null ? "none" : var.qemu_display + qemu_efi_boot = var.qemu_efi_boot == null ? ( + var.os_arch == "aarch64" ? true : false + ) : var.qemu_efi_boot + qemu_efi_firmware_code = var.qemu_efi_firmware_code == null ? ( + local.qemu_efi_boot ? ( + var.os_arch == "aarch64" ? "/opt/homebrew/share/qemu/edk2-aarch64-code.fd" : null + ) : null + ) : var.qemu_efi_firmware_code + qemu_efi_firmware_vars = var.qemu_efi_firmware_vars == null ? ( + local.qemu_efi_boot ? ( + var.os_arch == "aarch64" ? "/opt/homebrew/share/qemu/edk2-arm-vars.fd" : null + ) : null + ) : var.qemu_efi_firmware_vars qemu_use_default_display = var.qemu_use_default_display == null ? ( var.os_arch == "aarch64" ? true : false ) : var.qemu_use_default_display qemu_machine_type = var.qemu_machine_type == null ? ( var.os_arch == "aarch64" ? "virt" : "q35" ) : var.qemu_machine_type + build-dir = abspath("${path.root}/../builds/") qemuargs = var.qemuargs == null ? ( var.is_windows ? [ - ["-drive", "file=${path.root}/../builds/iso/virtio-win.iso,media=cdrom,index=3"], - ["-drive", "file=${var.iso_url},media=cdrom,index=2"], - ["-drive", "file=${path.root}/../builds/build_files/packer-${var.os_name}-${var.os_version}-${var.os_arch}-qemu/{{ .Name }},if=virtio,cache=writeback,discard=ignore,format=${var.qemu_format},index=1"], + ["-device", "qemu-xhci"], + ["-device", "virtio-tablet"], + ["-drive", "file=${local.build-dir}/iso/virtio-win.iso,media=cdrom,index=3"], + ["-drive", "file=${abspath(local.iso_target_path)},media=cdrom,index=2"], + ["-drive", "file=${local.build-dir}/build_files/packer-${var.os_name}-${var.os_version}-${var.os_arch}-qemu/{{ .Name }},if=virtio,cache=writeback,discard=ignore,format=${var.qemu_format},index=1"], + ["-boot", "order=c,order=d"] ] : ( var.os_arch == "aarch64" ? [ ["-boot", "strict=off"], @@ -101,42 +120,59 @@ locals { ) : var.vbox_nic_type # vmware-iso + vmware_network_adapter_type = var.vmware_network_adapter_type == null ? ( + var.is_windows && var.os_arch == "aarch64" ? "vmxnet3" : "e1000e" + ) : var.vmware_network_adapter_type vmware_tools_upload_flavor = var.vmware_tools_upload_flavor == null ? ( - var.is_windows ? "windows" : null + var.is_windows ? "windows" : ( + var.os_name == "macos" ? "darwin" : null + ) ) : var.vmware_tools_upload_flavor vmware_tools_upload_path = var.vmware_tools_upload_path == null ? ( var.is_windows ? "c:\\vmware-tools.iso" : "/tmp/vmware-tools.iso" ) : var.vmware_tools_upload_path + vmware_vmx_data = var.vmware_vmx_data == null ? ( + var.is_windows && var.os_arch == "aarch64" ? { + "sata1.present" = "TRUE" + "sata1:2.devicetype" = "cdrom-image" + "sata1:2.filename" = "/Applications/VMware Fusion.app/Contents/Library/isoimages/arm64/windows.iso" + "sata1:2.present" = "TRUE" + "svga.autodetect" = "TRUE" + "usb_xhci.present" = "TRUE" + } : { + "svga.autodetect" = "TRUE" + "usb_xhci.present" = "TRUE" + } + ) : var.vmware_vmx_data # Source block common default_boot_wait = var.default_boot_wait == null ? ( - var.is_windows ? "60s" : ( - var.os_name == "macos" ? "8m" : "10s" - ) + var.is_windows ? "60s" : "10s" ) : var.default_boot_wait cd_files = var.cd_files == null ? ( var.is_windows ? ( - var.hyperv_generation == 2 ? [ - "${path.root}/win_answer_files/${var.os_version}/hyperv-gen2/Autounattend.xml", - ] : ( - var.os_arch == "x86_64" ? [ - "${path.root}/win_answer_files/${var.os_version}/Autounattend.xml", + var.os_arch == "x86_64" ? ( + var.hyperv_generation == 2 ? [ + "${path.root}/win_answer_files/${var.os_version}/hyperv-gen2/Autounattend.xml", ] : [ - "${path.root}/win_answer_files/${var.os_version}/arm64/Autounattend.xml", + "${path.root}/win_answer_files/${var.os_version}/Autounattend.xml", ] - ) + ) : [ + "${path.root}/win_answer_files/${var.os_version}/arm64/Autounattend.xml", + ] ) : null ) : var.cd_files communicator = var.communicator == null ? ( var.is_windows ? "winrm" : "ssh" ) : var.communicator + disk_size = var.disk_size == null ? ( + var.is_windows ? 131072 : 65536 + ) : var.disk_size floppy_files = var.floppy_files == null ? ( var.is_windows ? ( var.os_arch == "x86_64" ? [ "${path.root}/win_answer_files/${var.os_version}/Autounattend.xml", - ] : [ - "${path.root}/win_answer_files/${var.os_version}/arm64/Autounattend.xml", - ] + ] : null ) : null ) : var.floppy_files http_directory = var.http_directory == null ? "${path.root}/http" : var.http_directory @@ -168,10 +204,12 @@ source "hyperv-iso" "vm" { # Source block common options boot_command = var.boot_command boot_wait = var.hyperv_boot_wait == null ? local.default_boot_wait : var.hyperv_boot_wait + cd_content = var.cd_content cd_files = var.hyperv_generation == 2 ? local.cd_files : null + cd_label = var.cd_label cpus = var.cpus communicator = local.communicator - disk_size = var.disk_size + disk_size = local.disk_size floppy_files = var.hyperv_generation == 2 ? null : local.floppy_files headless = var.headless http_directory = local.http_directory @@ -196,6 +234,7 @@ source "parallels-ipsw" "vm" { host_interfaces = var.parallels_host_interfaces ipsw_url = var.parallels_ipsw_url ipsw_checksum = var.parallels_ipsw_checksum + ipsw_target_path = local.parallels_ipsw_target_path prlctl = local.parallels_prlctl prlctl_post = var.parallels_prlctl_post prlctl_version_file = var.parallels_prlctl_version_file @@ -204,7 +243,7 @@ source "parallels-ipsw" "vm" { boot_wait = var.parallels_boot_wait == null ? local.default_boot_wait : var.parallels_boot_wait cpus = var.cpus communicator = local.communicator - disk_size = var.disk_size + disk_size = local.disk_size http_directory = local.http_directory http_content = var.http_content memory = local.memory @@ -227,9 +266,12 @@ source "parallels-iso" "vm" { # Source block common options boot_command = var.boot_command boot_wait = var.parallels_boot_wait == null ? local.default_boot_wait : var.parallels_boot_wait + cd_content = var.cd_content + cd_files = local.cd_files + cd_label = var.cd_label cpus = var.cpus communicator = local.communicator - disk_size = var.disk_size + disk_size = local.disk_size floppy_files = local.floppy_files http_directory = local.http_directory iso_checksum = var.iso_checksum @@ -251,24 +293,34 @@ source "parallels-iso" "vm" { source "qemu" "vm" { # QEMU specific options accelerator = var.qemu_accelerator + cpu_model = var.qemu_cpu_model display = local.qemu_display use_default_display = local.qemu_use_default_display - disk_image = var.qemu_disk_image - efi_boot = var.qemu_efi_boot - efi_firmware_code = var.qemu_efi_firmware_code - efi_firmware_vars = var.qemu_efi_firmware_vars - efi_drop_efivars = var.qemu_efi_drop_efivars - format = var.qemu_format - machine_type = local.qemu_machine_type - qemu_binary = local.qemu_binary - qemuargs = local.qemuargs + # disk_cache = var.qemu_disk_cache + # disk_compression = var.qemu_disk_compression + # disk_detect_zeroes = var.qemu_disk_detect_zeroes + # disk_discard = var.qemu_disk_discard + disk_image = var.qemu_disk_image + # disk_interface = var.qemu_disk_interface + efi_boot = local.qemu_efi_boot + efi_firmware_code = local.qemu_efi_firmware_code + efi_firmware_vars = local.qemu_efi_firmware_vars + efi_drop_efivars = var.qemu_efi_drop_efivars + format = var.qemu_format + machine_type = local.qemu_machine_type + # net_device = var.qemu_net_device + qemu_binary = local.qemu_binary + qemuargs = local.qemuargs + # use_pflash = var.qemu_use_pflash # Source block common options boot_command = var.boot_command boot_wait = var.qemu_boot_wait == null ? local.default_boot_wait : var.qemu_boot_wait + cd_content = var.cd_content cd_files = local.cd_files + cd_label = var.cd_label cpus = var.cpus communicator = local.communicator - disk_size = var.disk_size + disk_size = local.disk_size floppy_files = local.floppy_files headless = var.headless http_directory = local.http_directory @@ -306,9 +358,12 @@ source "virtualbox-iso" "vm" { # Source block common options boot_command = var.boot_command boot_wait = var.vbox_boot_wait == null ? local.default_boot_wait : var.vbox_boot_wait + cd_content = var.cd_content + cd_files = local.cd_files + cd_label = var.cd_label cpus = var.cpus communicator = local.communicator - disk_size = var.disk_size + disk_size = local.disk_size floppy_files = local.floppy_files headless = var.headless http_directory = local.http_directory @@ -355,25 +410,28 @@ source "vmware-iso" "vm" { firmware = var.vmware_firmware guest_os_type = var.vmware_guest_os_type network = var.vmware_network - network_adapter_type = var.vmware_network_adapter_type + network_adapter_type = local.vmware_network_adapter_type tools_upload_flavor = local.vmware_tools_upload_flavor tools_upload_path = local.vmware_tools_upload_path usb = var.vmware_usb version = var.vmware_version - vmx_data = var.vmware_vmx_data + vmx_data = local.vmware_vmx_data vmx_remove_ethernet_interfaces = var.vmware_vmx_remove_ethernet_interfaces vnc_disable_password = var.vmware_vnc_disable_password # Source block common options - boot_command = var.boot_command - boot_wait = var.vmware_boot_wait == null ? local.default_boot_wait : var.vmware_boot_wait - cpus = var.cpus - communicator = local.communicator - disk_size = var.disk_size - floppy_files = local.floppy_files - headless = var.headless - http_directory = local.http_directory - iso_checksum = var.iso_checksum - # iso_target_path = local.iso_target_path # Currently breaks builds https://github.com/hashicorp/packer-plugin-vmware/issues/276 + boot_command = var.boot_command + boot_wait = var.vmware_boot_wait == null ? local.default_boot_wait : var.vmware_boot_wait + cd_content = var.cd_content + cd_files = local.cd_files # Broken and not creating disks + cd_label = var.cd_label + cpus = var.cpus + communicator = local.communicator + disk_size = local.disk_size + floppy_files = local.floppy_files + headless = var.headless + http_directory = local.http_directory + iso_checksum = var.iso_checksum + iso_target_path = abspath(local.iso_target_path) iso_url = var.iso_url memory = local.memory output_directory = "${local.output_directory}-vmware" diff --git a/packer_templates/pkr-variables.pkr.hcl b/packer_templates/pkr-variables.pkr.hcl index 179afb669..ba8d27663 100644 --- a/packer_templates/pkr-variables.pkr.hcl +++ b/packer_templates/pkr-variables.pkr.hcl @@ -62,7 +62,7 @@ variable "hyperv_enable_secure_boot" { } variable "hyperv_generation" { type = number - default = 2 + default = 1 description = "Hyper-v generation version" } variable "hyperv_guest_additions_mode" { @@ -90,6 +90,11 @@ variable "parallels_ipsw_checksum" { default = null description = "Checksum of the IPSW file" } +variable "parallels_ipsw_target_path" { + type = string + default = "build_dir_iso" + description = "Path to store the IPSW file. Null will use packer cache default or build_dir_iso will put it in the local build/iso directory." +} variable "parallels_prlctl_post" { type = list(list(string)) default = null @@ -141,9 +146,33 @@ variable "qemu_boot_wait" { type = string default = null } +variable "qemu_cpu_model" { + type = string + default = "host" +} +variable "qemu_disk_cache" { + type = string + default = "unsafe" +} +variable "qemu_disk_compression" { + type = bool + default = true +} +variable "qemu_disk_detect_zeroes" { + type = string + default = "unmap" +} +variable "qemu_disk_discard" { + type = string + default = "unmap" +} +variable "qemu_disk_interface" { + type = string + default = "virtio" +} variable "qemu_display" { type = string - default = null + default = "none" description = "What QEMU -display option to use. Defaults to gtk, use none to not pass the -display option allowing QEMU to choose the default" } variable "qemu_use_default_display" { @@ -153,12 +182,12 @@ variable "qemu_use_default_display" { } variable "qemu_disk_image" { type = bool - default = null + default = false description = "Whether iso_url is a bootable qcow2 disk image" } variable "qemu_efi_boot" { type = bool - default = false + default = null description = "Enable EFI boot" } variable "qemu_efi_firmware_code" { @@ -189,10 +218,18 @@ variable "qemu_machine_type" { type = string default = null } +variable "qemu_net_device" { + type = string + default = "virtio-net" +} variable "qemuargs" { type = list(list(string)) default = null } +variable "qemu_use_pflash" { + type = bool + default = false +} # virtualbox-iso variable "vbox_boot_wait" { @@ -214,7 +251,7 @@ variable "vbox_gfx_vram_size" { } variable "vbox_guest_additions_interface" { type = string - default = "sata" + default = null } variable "vbox_guest_additions_mode" { type = string @@ -310,11 +347,8 @@ variable "vmware_version" { default = 21 } variable "vmware_vmx_data" { - type = map(string) - default = { - "svga.autodetect" = true - "usb_xhci.present" = true - } + type = map(string) + default = null } variable "vmware_vmx_remove_ethernet_interfaces" { type = bool @@ -327,7 +361,7 @@ variable "vmware_usb" { } variable "vmware_network_adapter_type" { type = string - default = "e1000e" + default = null } variable "vmware_network" { type = string @@ -348,10 +382,19 @@ variable "default_boot_wait" { type = string default = null } +variable "cd_content" { + type = map(string) + default = null + description = "Content to be served by the cdrom" +} variable "cd_files" { type = list(string) default = null } +variable "cd_label" { + type = string + default = "cidata" +} variable "cpus" { type = number default = 2 @@ -362,7 +405,7 @@ variable "communicator" { } variable "disk_size" { type = number - default = 65536 + default = null } variable "floppy_files" { type = list(string) diff --git a/packer_templates/scripts/macos/disable_auto_update.sh b/packer_templates/scripts/macos/disable_auto_update.sh new file mode 100644 index 000000000..7f4a9a4c1 --- /dev/null +++ b/packer_templates/scripts/macos/disable_auto_update.sh @@ -0,0 +1,15 @@ +#!/bin/sh + +sleep 10 + +echo 'Disable automatic updates' +# TOGGLE ALL OFF (auto checking is on to show other prefs are toggled off) +# before setting values quit system preferences & stop software update - stops defaults cache breaking 'AutomaticCheckEnabled' +osascript -e "tell application \"System Preferences\" to quit" +softwareupdate --schedule off +defaults write /Library/Preferences/com.apple.SoftwareUpdate.plist AutomaticCheckEnabled -bool No +defaults write /Library/Preferences/com.apple.SoftwareUpdate.plist AutomaticDownload -bool NO +defaults write /Library/Preferences/com.apple.SoftwareUpdate.plist ConfigDataInstall -bool NO +defaults write /Library/Preferences/com.apple.SoftwareUpdate.plist CriticalUpdateInstall -bool NO +defaults write /Library/Preferences/com.apple.commerce.plist AutoUpdateRestartRequired -bool NO +defaults write /Library/Preferences/com.apple.commerce.plist AutoUpdate -bool NO diff --git a/packer_templates/scripts/macos/system-update-complete.sh b/packer_templates/scripts/macos/system-update-complete.sh new file mode 100644 index 000000000..2056bdc5f --- /dev/null +++ b/packer_templates/scripts/macos/system-update-complete.sh @@ -0,0 +1,11 @@ +#!/bin/sh +set -euo +IFS="$(printf ' \n\t')" + +# wait for the update process to complete +if (grep "Action.*restart" ~/Library/Logs/packer_softwareupdate.log); then + tail -f /var/log/install.log | sed '/.*Setup Assistant.*ISAP.*Done.*/ q' | grep ISAP || true + sleep 180 +fi + +echo "Software update completed" diff --git a/packer_templates/scripts/macos/system-update.sh b/packer_templates/scripts/macos/system-update.sh index b6112915d..ebf35e392 100644 --- a/packer_templates/scripts/macos/system-update.sh +++ b/packer_templates/scripts/macos/system-update.sh @@ -1,16 +1,4 @@ #!/bin/sh echo "Downloading and installing system updates..." -softwareupdate -i -a -R - -echo 'Disable automatic updates' -# TOGGLE ALL OFF (auto checking is on to show other prefs are toggled off) -# before setting values quit system preferences & stop software update - stops defaults cache breaking 'AutomaticCheckEnabled' -osascript -e "tell application \"System Preferences\" to quit" -softwareupdate --schedule off -defaults write /Library/Preferences/com.apple.SoftwareUpdate.plist AutomaticCheckEnabled -bool No -defaults write /Library/Preferences/com.apple.SoftwareUpdate.plist AutomaticDownload -bool NO -defaults write /Library/Preferences/com.apple.SoftwareUpdate.plist ConfigDataInstall -bool NO -defaults write /Library/Preferences/com.apple.SoftwareUpdate.plist CriticalUpdateInstall -bool NO -defaults write /Library/Preferences/com.apple.commerce.plist AutoUpdateRestartRequired -bool NO -defaults write /Library/Preferences/com.apple.commerce.plist AutoUpdate -bool NO +softwareupdate -i -r -R diff --git a/packer_templates/scripts/windows/cleanup.ps1 b/packer_templates/scripts/windows/cleanup.ps1 index e746d0852..a86ec12bc 100644 --- a/packer_templates/scripts/windows/cleanup.ps1 +++ b/packer_templates/scripts/windows/cleanup.ps1 @@ -21,13 +21,14 @@ if ($osInfo.ProductType -eq 1) { # cleanmgr isn't on servers Get-ItemProperty -Path 'HKLM:\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\*' -Name StateFlags0001 -ErrorAction SilentlyContinue | Remove-ItemProperty -Name StateFlags0001 -ErrorAction SilentlyContinue Write-Host 'Enabling Update Cleanup. This is done automatically in Windows 10 via a scheduled task.' - New-ItemProperty -Path 'HKLM:\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\Update Cleanup' -Name StateFlags0001 -Value 2 -Type DWord + New-ItemProperty -Path 'HKLM:\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\Update Cleanup' -Name StateFlags0001 -Value 2 -PropertyType DWord Write-Host 'Enabling Temporary Files Cleanup.' - New-ItemProperty -Path 'HKLM:\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\Temporary Files' -Name StateFlags0001 -Value 2 -Type DWord + New-ItemProperty -Path 'HKLM:\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\Temporary Files' -Name StateFlags0001 -Value 2 -PropertyType DWord Write-Host 'Starting CleanMgr.exe...' Start-Process -FilePath CleanMgr.exe -ArgumentList '/sagerun:1' -Wait # -WindowStyle Hidden + Write-Host 'Waiting for CleanMgr and DismHost processes. Second wait neccesary as CleanMgr.exe spins off separate processes.' Get-Process -Name cleanmgr,dismhost -ErrorAction SilentlyContinue | Wait-Process } @@ -96,21 +97,53 @@ Stop-ServiceForReal BITS # Background Intelligent Transfer Service # NB to analyse the used space use: dism.exe /Online /Cleanup-Image /AnalyzeComponentStore # see https://docs.microsoft.com/en-us/windows-hardware/manufacture/desktop/clean-up-the-winsxs-folder Write-Host 'Cleaning up the WinSxS folder...' -dism.exe /Online /Quiet /Cleanup-Image /StartComponentCleanup /ResetBase -if ($LASTEXITCODE) { - throw "Failed with Exit Code $LASTEXITCODE" +try +{ + dism.exe /Online /Cleanup-Image /StartComponentCleanup /ResetBase +} +catch +{ + try { + # fix for error 0x800f0806 + write-host "Failed with Exit Code $LASTEXITCODE, trying to restart services" + net stop wuauserv + net stop cryptSvc + net stop bits + net stop msiserver + Remove-Item C:\Windows\SoftwareDistribution + Remove-Item C:\Windows\System32\catroot2 + net start wuauserv + net start cryptSvc + net start bits + net start msiserver + dism.exe /Online /Cleanup-Image /StartComponentCleanup /ResetBase + } + catch { + write-host "Failed with Exit Code $LASTEXITCODE, trying scheduled task..." + schtasks.exe /Run /TN "\Microsoft\Windows\Servicing\StartComponentCleanup" + } } # NB even after cleaning up the WinSxS folder the "Backups and Disabled Features" # field of the analysis report will display a non-zero number because the # disabled features packages are still on disk. you can remove them with: -Get-WindowsOptionalFeature -Online | Where-Object {$_.State -eq 'Disabled'} | ForEach-Object { - Write-Host "Removing feature $($_.FeatureName)..." - dism.exe /Online /Quiet /Disable-Feature "/FeatureName:$($_.FeatureName)" /Remove +try { + Get-WindowsOptionalFeature -Online | Where-Object {$_.State -eq 'Disabled'} | ForEach-Object { + Write-Host "Removing feature $($_.FeatureName)..." + dism.exe /Online /Quiet /Disable-Feature "/FeatureName:$($_.FeatureName)" /Remove + } } +catch { } + # NB a removed feature can still be installed from other sources (e.g. windows update). Write-Host 'Analyzing the WinSxS folder...' -dism.exe /Online /Cleanup-Image /AnalyzeComponentStore +try { + dism.exe /Online /Cleanup-Image /AnalyzeComponentStore +} +catch { } Write-Host 'Remove pagefile, it will get created on boot next time.' -New-ItemProperty -Path 'HKLM:\SYSTEM\CurrentControlSet\Control\Session Manager\Memory Management' -Name PagingFiles -Value '' -Force +try { + New-ItemProperty -Path 'HKLM:\SYSTEM\CurrentControlSet\Control\Session Manager\Memory Management' -Name PagingFiles -Value '' -Force +} +catch { } diff --git a/packer_templates/scripts/windows/optimize.ps1 b/packer_templates/scripts/windows/optimize.ps1 index e9489fb3e..01ad5a1e2 100644 --- a/packer_templates/scripts/windows/optimize.ps1 +++ b/packer_templates/scripts/windows/optimize.ps1 @@ -112,17 +112,6 @@ Write-Host 'Running Automatic Maintenance...' MSchedExe.exe Start Wait-Condition {@(Get-ScheduledTasks | Where-Object {($_.State -ge 4) -and (Test-IsMaintenanceTask $_.XML)}).Count -eq 0} -DebounceSeconds 60 -# -# generate the .net frameworks native images. -# NB this is normally done in the Automatic Maintenance step, but for -# some reason, sometimes its not. -# see https://docs.microsoft.com/en-us/dotnet/framework/tools/ngen-exe-native-image-generator - -Get-ChildItem "$env:windir\Microsoft.NET\*\*\ngen.exe" | ForEach-Object { - Write-Host "Generating the .NET Framework native images with $_..." - &$_ executeQueuedItems /nologo /silent -} - Write-Host "Optimizing Drive" Optimize-Volume -DriveLetter C compact.exe /compactOS:always diff --git a/packer_templates/scripts/windows/provision.ps1 b/packer_templates/scripts/windows/provision.ps1 index b3a4fc488..257de3159 100644 --- a/packer_templates/scripts/windows/provision.ps1 +++ b/packer_templates/scripts/windows/provision.ps1 @@ -40,71 +40,6 @@ trap { Exit 1 } -# enable TLS 1.2. -[Net.ServicePointManager]::SecurityProtocol = [Net.ServicePointManager]::SecurityProtocol ` - -bor [Net.SecurityProtocolType]::Tls12 - -if (![Environment]::Is64BitProcess) { - throw 'this must run in a 64-bit PowerShell session' -} - -if (!(New-Object System.Security.Principal.WindowsPrincipal( - [Security.Principal.WindowsIdentity]::GetCurrent())).IsInRole( - [Security.Principal.WindowsBuiltInRole]::Administrator)) { - throw 'this must run with Administrator privileges (e.g. in a elevated shell session)' -} - -Add-Type -A System.IO.Compression.FileSystem - -# install Guest Additions. -$systemVendor = (Get-CimInstance -ClassName Win32_ComputerSystemProduct -Property Vendor).Vendor -if ($systemVendor -eq 'QEMU') { - # in more recent virtio-win.iso virtio-win-guest-tools.exe has move to E:\ - $guestToolsPath = dir -Path E:\ -Filter virtio-win-guest-tools.exe -Recurse | %{$_.FullName} - if (!$guestToolsPath) { - throw "did not find virtio-win-guest-tools.exe on E:\" - } - $guestToolsLog = "$env:TEMP\$(Split-Path -Leaf $guestToolsPath).log" - Write-Host 'Installing the guest tools...' - &$guestToolsPath /install /norestart /quiet /log $guestToolsLog | Out-String -Stream - if ($LASTEXITCODE) { - throw "failed to install guest tools with exit code $LASTEXITCODE" - } - Write-Host "Done installing the guest tools." -} elseif ($systemVendor -eq 'innotek GmbH') { - Write-Host 'Importing the Oracle (for VirtualBox) certificate as a Trusted Publisher...' - E:\cert\VBoxCertUtil.exe add-trusted-publisher E:\cert\vbox-sha1.cer - if ($LASTEXITCODE) { - throw "failed to import certificate with exit code $LASTEXITCODE" - } - - Write-Host 'Installing the VirtualBox Guest Additions...' - E:\VBoxWindowsAdditions-amd64.exe /S | Out-String -Stream - if ($LASTEXITCODE) { - throw "failed to install with exit code $LASTEXITCODE. Check the logs at C:\Program Files\Oracle\VirtualBox Guest Additions\install.log." - } -} elseif ($systemVendor -eq 'Microsoft Corporation') { - # do nothing. Hyper-V enlightments are already bundled with Windows. -} elseif ($systemVendor -eq 'VMware, Inc.') { - Write-Host 'Mounting VMware Tools ISO...' - Mount-DiskImage -ImagePath C:\vmware-tools.iso -PassThru | Get-Volume - Write-Host 'Installing VMware Tools...' - Start-Process -Wait -FilePath E:\setup64.exe -ArgumentList '/S /v "/qn REBOOT=R"' - Write-Output 'Installing VMware Tools...' - # silent install without rebooting. - E:\setup64.exe /S /v '/qn reboot=r'| Out-String -Stream - Dismount-DiskImage -ImagePath C:\vmware-tools.iso - Remove-Item C:\vmware-tools.iso -} elseif ($systemVendor -eq 'Parallels Software International Inc.') { - Write-Host 'Installing the Parallels Tools for Guest VM...' - E:\PTAgent.exe /install_silent | Out-String -Stream - if ($LASTEXITCODE) { - throw "failed to install with exit code $LASTEXITCODE. Check the logs at C:\Program Files\Oracle\VirtualBox Guest Additions\install.log." - } -} else { - Write-Host "Cannot install Guest Additions: Unsupported system ($systemVendor)." -} - Write-Host 'Setting the vagrant account properties...' # see the ADS_USER_FLAG_ENUM enumeration at https://msdn.microsoft.com/en-us/library/aa772300(v=vs.85).aspx $AdsScript = 0x00001 @@ -136,3 +71,154 @@ Write-Host 'Disabling the Windows Boot Manager menu...' # NB to have the menu show with a lower timeout, run this instead: bcdedit /timeout 2 # NB with a timeout of 2 you can still press F8 to show the boot manager menu. bcdedit /set '{bootmgr}' displaybootmenu no + +Write-Host "Enable TLS 1.2." +[Net.ServicePointManager]::SecurityProtocol = [Net.ServicePointManager]::SecurityProtocol ` + -bor [Net.SecurityProtocolType]::Tls12 + +if (![Environment]::Is64BitProcess) { + throw 'this must run in a 64-bit PowerShell session' +} + +if (!(New-Object System.Security.Principal.WindowsPrincipal( + [Security.Principal.WindowsIdentity]::GetCurrent())).IsInRole( + [Security.Principal.WindowsBuiltInRole]::Administrator)) { + throw 'this must run with Administrator privileges (e.g. in a elevated shell session)' +} + +Add-Type -A System.IO.Compression.FileSystem + +# install Guest Additions. +Write-Output "Looking for Guest Tools for $env:PACKER_BUILDER_TYPE..." +$volList = Get-Volume | Where-Object {$_.DriveType -ne 'Fixed' -and $_.DriveLetter} +switch ($env:PACKER_BUILDER_TYPE) { + {$_ -in "virtualbox-iso", "virtualbox-ovf"} { + # Actions for VirtualBox ISO builder + foreach( $vol in $volList ) { + $letter = $vol.DriveLetter + $exe = "${letter}:\VBoxWindowsAdditions.exe" + $installed = $false + if( Test-Path -LiteralPath $exe ) { + Write-host "Guest Tools found at $exe" + try { + Write-Host 'Installing the VirtualBox Guest Additions...' + $certs = "${letter}:\cert" + Start-Process -FilePath "${certs}\VBoxCertUtil.exe" -ArgumentList "add-trusted-publisher ${certs}\vbox*.cer", "--root ${certs}\vbox*.cer" -Wait + Start-Process -FilePath $exe -ArgumentList '/with_wddm', '/S' -Wait + $installed = $true + break + } + catch { + throw "failed to install guest tools with exit code $LASTEXITCODE" + } + } else { + Write-Host "Guest Tools NOT FOUND at $exe" + } + } + if ( $installed ) { + Write-Host "Done installing the guest tools." + } else { + throw "Guest Tools not found." + } + break + } + {$_ -in "vmware-iso", "vmware-vmx"} { + # Actions for VMware ISO builder + Write-Host 'Mounting VMware Tools ISO...' + Mount-DiskImage -ImagePath C:\vmware-tools.iso -PassThru | Get-Volume + $volList = Get-Volume | Where-Object {$_.DriveType -ne 'Fixed' -and $_.DriveLetter} + foreach( $vol in $volList ) { + $letter = $vol.DriveLetter + $exe = "${letter}:\setup.exe" + $installed = $false + if( Test-Path -LiteralPath $exe ) { + Write-host "Guest Tools found at $exe" + try { + Write-Host 'Installing VMware Tools...' + Start-Process -FilePath $exe -ArgumentList '/S /v "/qn REBOOT=R"' -Wait + $installed = $true + break + } + catch { + throw "failed to install guest tools with exit code $LASTEXITCODE" + } + } else { + Write-Host "Guest Tools NOT FOUND at $exe" + } + } + Dismount-DiskImage -ImagePath C:\vmware-tools.iso + Remove-Item C:\vmware-tools.iso + if ( $installed ) { + Write-Host "Done installing the guest tools." + } else { + throw "Guest Tools not found. Skipping installation." + } + break + } + {$_ -in "parallels-iso", "parallels-pvm"} { + # Actions for Parallels ISO builder + foreach( $vol in $volList ) { + $letter = $vol.DriveLetter + $exe = "${letter}:\PTAgent.exe" + $installed = $false + if( Test-Path -LiteralPath $exe ) { + Write-host "Guest Tools found at $exe" + try { + Write-Host 'Installing the Parallels Tools for Guest VM...' + Start-Process -FilePath $exe -ArgumentList '/install_silent' -Wait + $installed = $true + break + } + catch { + throw "failed to install guest tools with exit code $LASTEXITCODE" + } + Start-Process -FilePath $exe -ArgumentList '/install_silent' -Wait + break + } else { + Write-Host "Guest Tools NOT FOUND at $exe" + } + } + if ( $installed ) { + Write-Host "Done installing the guest tools." + } else { + throw "Guest Tools not found." + } + break + } + "qemu" { + # Actions for QEMU builder + foreach( $vol in $volList ) { + $letter = $vol.DriveLetter + $exe = "${letter}:\virtio-win-guest-tools.exe" + $installed = $false + if( Test-Path -LiteralPath $exe ) { + Write-host "Guest Tools found at $exe" + try { + Write-Host 'Installing the guest tools...' + Start-Process -FilePath $exe -ArgumentList '/passive', '/norestart' -Wait + $installed = $true + break + } + catch { + throw "failed to install guest tools with exit code $LASTEXITCODE" + } + } else { + Write-Host "Guest Tools NOT FOUND at $exe" + } + } + if ( $installed ) { + Write-Host "Done installing the guest tools." + } else { + throw "Guest Tools not found." + } + break + } + "hyperv-iso" { + # Actions for Hyper-V ISO builder + # do nothing. Hyper-V enlightments are already bundled with Windows. + break + } + default { + throw "Unknown PACKER_BUILDER_TYPE: $env:PACKER_BUILDER_TYPE" + } +} diff --git a/packer_templates/scripts/windows/remove-apps.ps1 b/packer_templates/scripts/windows/remove-apps.ps1 index 137eefa04..ed7ec0f26 100644 --- a/packer_templates/scripts/windows/remove-apps.ps1 +++ b/packer_templates/scripts/windows/remove-apps.ps1 @@ -119,3 +119,93 @@ Get-AppXProvisionedPackage -Online | ForEach-Object { } } } + +# New selection +$selectors = @( + 'Microsoft.Microsoft3DViewer' + 'Microsoft.BingSearch' + 'Microsoft.WindowsCalculator' + 'Microsoft.WindowsCamera' + 'Clipchamp.Clipchamp' + 'Microsoft.WindowsAlarms' + 'Microsoft.549981C3F5F10' + 'Microsoft.Windows.DevHome' + 'MicrosoftCorporationII.MicrosoftFamily' + 'Microsoft.WindowsFeedbackHub' + 'Microsoft.GetHelp' + 'Microsoft.Getstarted' + 'microsoft.windowscommunicationsapps' + 'Microsoft.WindowsMaps' + 'Microsoft.MixedReality.Portal' + 'Microsoft.BingNews' + 'Microsoft.MicrosoftOfficeHub' + 'Microsoft.Office.OneNote' + 'Microsoft.OutlookForWindows' + 'Microsoft.Paint' + 'Microsoft.MSPaint' + 'Microsoft.People' + 'Microsoft.Windows.Photos' + 'Microsoft.PowerAutomateDesktop' + 'MicrosoftCorporationII.QuickAssist' + 'Microsoft.SkypeApp' + 'Microsoft.ScreenSketch' + 'Microsoft.MicrosoftSolitaireCollection' + 'Microsoft.MicrosoftStickyNotes' + 'MicrosoftTeams' + 'MSTeams' + 'Microsoft.Todos' + 'Microsoft.WindowsSoundRecorder' + 'Microsoft.Wallet' + 'Microsoft.BingWeather' + 'Microsoft.Xbox.TCUI' + 'Microsoft.XboxApp' + 'Microsoft.XboxGameOverlay' + 'Microsoft.XboxGamingOverlay' + 'Microsoft.XboxIdentityProvider' + 'Microsoft.XboxSpeechToTextOverlay' + 'Microsoft.GamingApp' + 'Microsoft.YourPhone' + 'Microsoft.ZuneMusic' + 'Microsoft.ZuneVideo' +) + +$getCommand = { + Get-AppxProvisionedPackage -Online; +} + +$filterCommand = { + $_.DisplayName -eq $selector; +} + +$removeCommand = { + [CmdletBinding()] + param( + [Parameter( Mandatory, ValueFromPipeline )] + $InputObject + ) + process { + $InputObject | Remove-AppxProvisionedPackage -AllUsers -Online -ErrorAction 'Continue'; + } +} + +$type = 'Package'; +$installed = & $getCommand + +foreach( $selector in $selectors ) { + $result = [ordered] @{ + Selector = $selector + } + $found = $installed | Where-Object -FilterScript $filterCommand + if( $found ) { + $result.Output = $found | & $removeCommand + if( $? ) { + $result.Message = "$type removed." + } else { + $result.Message = "$type not removed." + $result.Error = $Error[0] + } + } else { + $result.Message = "$type not installed." + } + $result | ConvertTo-Json -Depth 3 -Compress +} diff --git a/packer_templates/scripts/windows/remove-capabilities.ps1 b/packer_templates/scripts/windows/remove-capabilities.ps1 new file mode 100644 index 000000000..5d7fec00f --- /dev/null +++ b/packer_templates/scripts/windows/remove-capabilities.ps1 @@ -0,0 +1,61 @@ +$selectors = @( + 'Print.Fax.Scan' + 'Language.Handwriting' + 'Browser.InternetExplorer' + 'MathRecognizer' + 'OneCoreUAP.OneSync' + 'Microsoft.Windows.MSPaint' + 'App.Support.QuickAssist' + 'Microsoft.Windows.SnippingTool' + 'Language.Speech' + 'Language.TextToSpeech' + 'App.StepsRecorder' + 'Hello.Face.18967' + 'Hello.Face.Migration.18967' + 'Hello.Face.20134' + 'Media.WindowsMediaPlayer' +) + +$getCommand = { + Get-WindowsCapability -Online | Where-Object -Property 'State' -NotIn -Value @( + 'NotPresent' + 'Removed' + ) +} + +$filterCommand = { + ($_.Name -split '~')[0] -eq $selector +} + +$removeCommand = { + [CmdletBinding()] + param( + [Parameter( Mandatory, ValueFromPipeline )] + $InputObject + ) + process { + $InputObject | Remove-WindowsCapability -Online -ErrorAction 'Continue' + } +} + +$type = 'Capability'; +$installed = & $getCommand; + +foreach( $selector in $selectors ) { + $result = [ordered] @{ + Selector = $selector + } + $found = $installed | Where-Object -FilterScript $filterCommand + if( $found ) { + $result.Output = $found | & $removeCommand + if( $? ) { + $result.Message = "$type removed." + } else { + $result.Message = "$type not removed." + $result.Error = $Error[0] + } + } else { + $result.Message = "$type not installed." + } + $result | ConvertTo-Json -Depth 3 -Compress +} diff --git a/packer_templates/scripts/windows/remove-features.ps1 b/packer_templates/scripts/windows/remove-features.ps1 new file mode 100644 index 000000000..5704061d1 --- /dev/null +++ b/packer_templates/scripts/windows/remove-features.ps1 @@ -0,0 +1,50 @@ +$selectors = @( + 'MediaPlayback' + 'MicrosoftWindowsPowerShellV2Root' + 'Recall' + 'Microsoft-SnippingTool' +) + +$getCommand = { + Get-WindowsOptionalFeature -Online | Where-Object -Property 'State' -NotIn -Value @( + 'Disabled' + 'DisabledWithPayloadRemoved' + ) +} + +$filterCommand = { + $_.FeatureName -eq $selector +} + +$removeCommand = { + [CmdletBinding()] + param( + [Parameter( Mandatory, ValueFromPipeline )] + $InputObject + ) + process { + $InputObject | Disable-WindowsOptionalFeature -Online -Remove -NoRestart -ErrorAction 'Continue' + } +} + +$type = 'Feature' +$installed = & $getCommand; + +foreach( $selector in $selectors ) { + $result = [ordered] @{ + Selector = $selector + } + $found = $installed | Where-Object -FilterScript $filterCommand + if( $found ) { + $result.Output = $found | & $removeCommand + if( $? ) { + $result.Message = "$type removed." + } else { + $result.Message = "$type not removed." + $result.Error = $Error[0] + } + } else { + $result.Message = "$type not installed." + } + $result | ConvertTo-Json -Depth 3 -Compress +} diff --git a/packer_templates/win_answer_files/11/arm64/Autounattend.xml b/packer_templates/win_answer_files/11/arm64/Autounattend.xml index ae51928dd..36c527a73 100644 --- a/packer_templates/win_answer_files/11/arm64/Autounattend.xml +++ b/packer_templates/win_answer_files/11/arm64/Autounattend.xml @@ -1,720 +1,444 @@ <?xml version="1.0" encoding="utf-8"?> <unattend xmlns="urn:schemas-microsoft-com:unattend" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State"> - <!--https://schneegans.de/windows/unattend-generator/?LanguageMode=Unattended&UILanguage=en-US&UserLocale=en-US&KeyboardLayout=0409%3A00000409&ProcessorArchitecture=arm64&BypassRequirementsCheck=true&ComputerNameMode=Custom&ComputerName=Vagrant&TimeZoneMode=Implicit&PartitionMode=Unattended&PartitionLayout=GPT&EspSize=100&RecoveryMode=None&WindowsEditionMode=Unattended&WindowsEdition=pro&UserAccountMode=Unattended&AccountName0=vagrant&AccountPassword0=vagrant&AccountGroup0=Administrators&AccountName1=&AccountName2=&AccountName3=&AccountName4=&AutoLogonMode=Own&LockoutMode=Disabled&DisableSystemRestore=true&EnableRemoteDesktop=true&AllowPowerShellScripts=true&DisableAppSuggestions=true&DisableWidgets=true&WifiMode=Skip&ExpressSettings=DisableAll&Remove3DViewer=true&RemoveCalculator=true&RemoveCamera=true&RemoveClipchamp=true&RemoveClock=true&RemoveCortana=true&RemoveDevHome=true&RemoveFeedbackHub=true&RemoveGetHelp=true&RemoveInternetExplorer=true&RemoveMaps=true&RemoveMathInputPanel=true&RemoveZuneVideo=true&RemoveNews=true&RemoveNotepad=true&RemoveOffice365=true&RemoveOneDrive=true&RemoveOneNote=true&RemoveOutlook=true&RemovePaint=true&RemovePaint3D=true&RemovePeople=true&RemovePhotos=true&RemovePowerAutomate=true&RemoveQuickAssist=true&RemoveSkype=true&RemoveSnippingTool=true&RemoveSolitaire=true&RemoveStepsRecorder=true&RemoveStickyNotes=true&RemoveTeams=true&RemoveGetStarted=true&RemoveToDo=true&RemoveVoiceRecorder=true&RemoveWeather=true&RemoveWindowsMediaPlayer=true&RemoveZuneMusic=true&RemoveXboxApps=true&RemoveYourPhone=true&WdacMode=Skip--> - <settings pass="windowsPE"> - <component name="Microsoft-Windows-PnpCustomizationsWinPE" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" processorArchitecture="arm64"> - <!-- - This makes the VirtIO drivers available to Windows, assuming that - the VirtIO driver disk at https://fedorapeople.org/groups/virt/virtio-win/direct-downloads/stable-virtio/virtio-win.iso - (see https://docs.fedoraproject.org/en-US/quick-docs/creating-windows-virtual-machines-using-virtio-drivers/index.html#virtio-win-direct-downloads) - is available as drive F: - --> - <DriverPaths> - <PathAndCredentials wcm:action="add" wcm:keyValue="2"> - <Path>F:\drivers\viostor\w11\ARM64</Path> - </PathAndCredentials> - <PathAndCredentials wcm:action="add" wcm:keyValue="3"> - <Path>F:\drivers\NetKVM\w11\ARM64</Path> - </PathAndCredentials> - <PathAndCredentials wcm:action="add" wcm:keyValue="4"> - <Path>F:\drivers\Balloon\w11\ARM64</Path> - </PathAndCredentials> - <PathAndCredentials wcm:action="add" wcm:keyValue="5"> - <Path>F:\drivers\pvpanic\w11\ARM64</Path> - </PathAndCredentials> - <PathAndCredentials wcm:action="add" wcm:keyValue="8"> - <Path>F:\drivers\vioinput\w11\ARM64</Path> - </PathAndCredentials> - <PathAndCredentials wcm:action="add" wcm:keyValue="9"> - <Path>F:\drivers\viorng\w11\ARM64</Path> - </PathAndCredentials> - <PathAndCredentials wcm:action="add" wcm:keyValue="10"> - <Path>F:\drivers\vioscsi\w11\ARM64</Path> - </PathAndCredentials> - <PathAndCredentials wcm:action="add" wcm:keyValue="11"> - <Path>F:\drivers\vioserial\w11\ARM64</Path> - </PathAndCredentials> - </DriverPaths> - </component> - <component name="Microsoft-Windows-International-Core-WinPE" processorArchitecture="arm64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> - <SetupUILanguage> - <UILanguage>en-US</UILanguage> - </SetupUILanguage> - <SystemLocale>en-US</SystemLocale> - <UILanguage>en-US</UILanguage> - <UserLocale>en-US</UserLocale> - </component> - <component name="Microsoft-Windows-Setup" processorArchitecture="arm64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> - <ImageInstall> - <OSImage> - <InstallFrom> - <MetaData wcm:action="add"> - <Key>/IMAGE/NAME</Key> - <Value>Windows 11 Professional</Value> - </MetaData> - </InstallFrom> - <InstallTo> - <DiskID>0</DiskID> - <PartitionID>3</PartitionID> - </InstallTo> - </OSImage> - </ImageInstall> - <UserData> - <ProductKey> - <Key>VK7JG-NPHTM-C97JM-9MPGT-3V66T</Key> - </ProductKey> - <AcceptEula>true</AcceptEula> - </UserData> - <RunSynchronous> - <RunSynchronousCommand wcm:action="add"> - <Order>1</Order> - <Path>cmd.exe /c "&gt;&gt;"X:\diskpart.txt" echo SELECT DISK=0"</Path> - </RunSynchronousCommand> - <RunSynchronousCommand wcm:action="add"> - <Order>2</Order> - <Path>cmd.exe /c "&gt;&gt;"X:\diskpart.txt" echo CLEAN"</Path> - </RunSynchronousCommand> - <RunSynchronousCommand wcm:action="add"> - <Order>3</Order> - <Path>cmd.exe /c "&gt;&gt;"X:\diskpart.txt" echo CONVERT GPT"</Path> - </RunSynchronousCommand> - <RunSynchronousCommand wcm:action="add"> - <Order>4</Order> - <Path>cmd.exe /c "&gt;&gt;"X:\diskpart.txt" echo CREATE PARTITION EFI SIZE=100"</Path> - </RunSynchronousCommand> - <RunSynchronousCommand wcm:action="add"> - <Order>5</Order> - <Path>cmd.exe /c "&gt;&gt;"X:\diskpart.txt" echo FORMAT QUICK FS=FAT32 LABEL="System""</Path> - </RunSynchronousCommand> - <RunSynchronousCommand wcm:action="add"> - <Order>6</Order> - <Path>cmd.exe /c "&gt;&gt;"X:\diskpart.txt" echo CREATE PARTITION MSR SIZE=16"</Path> - </RunSynchronousCommand> - <RunSynchronousCommand wcm:action="add"> - <Order>7</Order> - <Path>cmd.exe /c "&gt;&gt;"X:\diskpart.txt" echo CREATE PARTITION PRIMARY"</Path> - </RunSynchronousCommand> - <RunSynchronousCommand wcm:action="add"> - <Order>8</Order> - <Path>cmd.exe /c "&gt;&gt;"X:\diskpart.txt" echo FORMAT QUICK FS=NTFS LABEL="Windows""</Path> - </RunSynchronousCommand> - <RunSynchronousCommand wcm:action="add"> - <Order>9</Order> - <Path>cmd.exe /c "&gt;&gt;"X:\diskpart.log" diskpart.exe /s "X:\diskpart.txt""</Path> - </RunSynchronousCommand> - <RunSynchronousCommand wcm:action="add"> - <Order>10</Order> - <Path>reg.exe add "HKLM\SYSTEM\Setup\LabConfig" /v BypassTPMCheck /t REG_DWORD /d 1 /f</Path> - </RunSynchronousCommand> - <RunSynchronousCommand wcm:action="add"> - <Order>11</Order> - <Path>reg.exe add "HKLM\SYSTEM\Setup\LabConfig" /v BypassSecureBootCheck /t REG_DWORD /d 1 /f</Path> - </RunSynchronousCommand> - <RunSynchronousCommand wcm:action="add"> - <Order>12</Order> - <Path>reg.exe add "HKLM\SYSTEM\Setup\LabConfig" /v BypassStorageCheck /t REG_DWORD /d 1 /f</Path> - </RunSynchronousCommand> - <RunSynchronousCommand wcm:action="add"> - <Order>13</Order> - <Path>reg.exe add "HKLM\SYSTEM\Setup\LabConfig" /v BypassCPUCheck /t REG_DWORD /d 1 /f</Path> - </RunSynchronousCommand> - <RunSynchronousCommand wcm:action="add"> - <Order>14</Order> - <Path>reg.exe add "HKLM\SYSTEM\Setup\LabConfig" /v BypassRAMCheck /t REG_DWORD /d 1 /f</Path> - </RunSynchronousCommand> - <RunSynchronousCommand wcm:action="add"> - <Order>15</Order> - <Path>reg.exe add "HKLM\SYSTEM\Setup\LabConfig" /v BypassDiskCheck /t REG_DWORD /d 1 /f</Path> - </RunSynchronousCommand> - </RunSynchronous> - </component> - </settings> - <settings pass="generalize"> - <component name="Microsoft-Windows-Security-SPP" processorArchitecture="arm64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> - <SkipRearm>1</SkipRearm> - </component> - <component name="Microsoft-Windows-PnpSysprep" processorArchitecture="arm64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> - <PersistAllDeviceInstalls>false</PersistAllDeviceInstalls> - <DoNotCleanUpNonPresentDevices>false</DoNotCleanUpNonPresentDevices> - </component> - </settings> - <settings pass="specialize"> - <component name="Microsoft-Windows-SystemRestore-Main" processorArchitecture="arm64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> - <DisableSR>1</DisableSR> - </component> - <component name="Microsoft-Windows-SystemSettingsThreshold" processorArchitecture="arm64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> - <DisplayNetworkSelection>false</DisplayNetworkSelection> - </component> - <component name="Networking-MPSSVC-Svc" processorArchitecture="arm64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> - <FirewallGroups> - <FirewallGroup wcm:action="add" wcm:keyValue="WindowsRemoteManagement"> - <Active>true</Active> - <Group>Windows Remote Management</Group> - <Profile>all</Profile> - </FirewallGroup> - <FirewallGroup wcm:action="add" wcm:keyValue="RemoteAdministration"> - <Active>true</Active> - <Group>Remote Administration</Group> - <Profile>all</Profile> - </FirewallGroup> - </FirewallGroups> - </component> - <component name="Microsoft-Windows-SQMApi" processorArchitecture="arm64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> - <CEIPEnabled>0</CEIPEnabled> - </component> - <component name="Microsoft-Windows-Security-SPP-UX" processorArchitecture="arm64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> - <SkipAutoActivation>true</SkipAutoActivation> - </component> - <component name="Microsoft-Windows-Deployment" processorArchitecture="arm64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> - <RunSynchronous> - <RunSynchronousCommand wcm:action="add"> - <Order>1</Order> - <Path>ReAgentc.exe /disable</Path> - </RunSynchronousCommand> - <RunSynchronousCommand wcm:action="add"> - <Order>2</Order> - <Path>cmd.exe /c "del /a /f "C:\Windows\System32\Recovery\Winre.wim""</Path> - </RunSynchronousCommand> - <RunSynchronousCommand wcm:action="add"> - <Order>3</Order> - <Path>cmd.exe /c "&gt;&gt;"%TEMP%\remove-packages.txt" echo Microsoft.Microsoft3DViewer"</Path> - </RunSynchronousCommand> - <RunSynchronousCommand wcm:action="add"> - <Order>4</Order> - <Path>cmd.exe /c "&gt;&gt;"%TEMP%\remove-packages.txt" echo Microsoft.WindowsCalculator"</Path> - </RunSynchronousCommand> - <RunSynchronousCommand wcm:action="add"> - <Order>5</Order> - <Path>cmd.exe /c "&gt;&gt;"%TEMP%\remove-packages.txt" echo Microsoft.WindowsCamera"</Path> - </RunSynchronousCommand> - <RunSynchronousCommand wcm:action="add"> - <Order>6</Order> - <Path>cmd.exe /c "&gt;&gt;"%TEMP%\remove-packages.txt" echo Clipchamp.Clipchamp"</Path> - </RunSynchronousCommand> - <RunSynchronousCommand wcm:action="add"> - <Order>7</Order> - <Path>cmd.exe /c "&gt;&gt;"%TEMP%\remove-packages.txt" echo Microsoft.WindowsAlarms"</Path> - </RunSynchronousCommand> - <RunSynchronousCommand wcm:action="add"> - <Order>8</Order> - <Path>cmd.exe /c "&gt;&gt;"%TEMP%\remove-packages.txt" echo Microsoft.549981C3F5F10"</Path> - </RunSynchronousCommand> - <RunSynchronousCommand wcm:action="add"> - <Order>9</Order> - <Path>reg.exe delete "HKLM\SOFTWARE\Microsoft\WindowsUpdate\Orchestrator\UScheduler_Oobe\DevHomeUpdate" /f</Path> - </RunSynchronousCommand> - <RunSynchronousCommand wcm:action="add"> - <Order>10</Order> - <Path>cmd.exe /c "&gt;&gt;"%TEMP%\remove-packages.txt" echo Microsoft.WindowsFeedbackHub"</Path> - </RunSynchronousCommand> - <RunSynchronousCommand wcm:action="add"> - <Order>11</Order> - <Path>cmd.exe /c "&gt;&gt;"%TEMP%\remove-packages.txt" echo Microsoft.GetHelp"</Path> - </RunSynchronousCommand> - <RunSynchronousCommand wcm:action="add"> - <Order>12</Order> - <Path>cmd.exe /c "&gt;&gt;"%TEMP%\remove-caps.txt" echo Browser.InternetExplorer"</Path> - </RunSynchronousCommand> - <RunSynchronousCommand wcm:action="add"> - <Order>13</Order> - <Path>cmd.exe /c "&gt;&gt;"%TEMP%\remove-packages.txt" echo Microsoft.WindowsMaps"</Path> - </RunSynchronousCommand> - <RunSynchronousCommand wcm:action="add"> - <Order>14</Order> - <Path>cmd.exe /c "&gt;&gt;"%TEMP%\remove-caps.txt" echo MathRecognizer"</Path> - </RunSynchronousCommand> - <RunSynchronousCommand wcm:action="add"> - <Order>15</Order> - <Path>cmd.exe /c "&gt;&gt;"%TEMP%\remove-packages.txt" echo Microsoft.ZuneVideo"</Path> - </RunSynchronousCommand> - <RunSynchronousCommand wcm:action="add"> - <Order>16</Order> - <Path>cmd.exe /c "&gt;&gt;"%TEMP%\remove-packages.txt" echo Microsoft.BingNews"</Path> - </RunSynchronousCommand> - <RunSynchronousCommand wcm:action="add"> - <Order>17</Order> - <Path>cmd.exe /c "&gt;&gt;"%TEMP%\remove-packages.txt" echo Microsoft.WindowsNotepad"</Path> - </RunSynchronousCommand> - <RunSynchronousCommand wcm:action="add"> - <Order>18</Order> - <Path>reg.exe load "HKU\mount" "C:\Users\Default\NTUSER.DAT"</Path> - </RunSynchronousCommand> - <RunSynchronousCommand wcm:action="add"> - <Order>19</Order> - <Path>reg.exe add "HKU\mount\Software\Microsoft\Notepad" /v ShowStoreBanner /t REG_DWORD /d 0 /f</Path> - </RunSynchronousCommand> - <RunSynchronousCommand wcm:action="add"> - <Order>20</Order> - <Path>reg.exe unload "HKU\mount"</Path> - </RunSynchronousCommand> - <RunSynchronousCommand wcm:action="add"> - <Order>21</Order> - <Path>cmd.exe /c "&gt;&gt;"%TEMP%\remove-packages.txt" echo Microsoft.MicrosoftOfficeHub"</Path> - </RunSynchronousCommand> - <RunSynchronousCommand wcm:action="add"> - <Order>22</Order> - <Path>cmd.exe /c "del "C:\Users\Default\AppData\Roaming\Microsoft\Windows\Start Menu\Programs\OneDrive.lnk""</Path> - </RunSynchronousCommand> - <RunSynchronousCommand wcm:action="add"> - <Order>23</Order> - <Path>cmd.exe /c "del "C:\Windows\System32\OneDriveSetup.exe""</Path> - </RunSynchronousCommand> - <RunSynchronousCommand wcm:action="add"> - <Order>24</Order> - <Path>cmd.exe /c "del "C:\Windows\SysWOW64\OneDriveSetup.exe""</Path> - </RunSynchronousCommand> - <RunSynchronousCommand wcm:action="add"> - <Order>25</Order> - <Path>reg.exe load "HKU\mount" "C:\Users\Default\NTUSER.DAT"</Path> - </RunSynchronousCommand> - <RunSynchronousCommand wcm:action="add"> - <Order>26</Order> - <Path>reg.exe delete "HKU\mount\Software\Microsoft\Windows\CurrentVersion\Run" /v OneDriveSetup /f</Path> - </RunSynchronousCommand> - <RunSynchronousCommand wcm:action="add"> - <Order>27</Order> - <Path>reg.exe unload "HKU\mount"</Path> - </RunSynchronousCommand> - <RunSynchronousCommand wcm:action="add"> - <Order>28</Order> - <Path>cmd.exe /c "&gt;&gt;"%TEMP%\remove-packages.txt" echo Microsoft.Office.OneNote"</Path> - </RunSynchronousCommand> - <RunSynchronousCommand wcm:action="add"> - <Order>29</Order> - <Path>reg.exe delete "HKLM\SOFTWARE\Microsoft\WindowsUpdate\Orchestrator\UScheduler_Oobe\OutlookUpdate" /f</Path> - </RunSynchronousCommand> - <RunSynchronousCommand wcm:action="add"> - <Order>30</Order> - <Path>cmd.exe /c "&gt;&gt;"%TEMP%\remove-caps.txt" echo Microsoft.Windows.MSPaint"</Path> - </RunSynchronousCommand> - <RunSynchronousCommand wcm:action="add"> - <Order>31</Order> - <Path>cmd.exe /c "&gt;&gt;"%TEMP%\remove-packages.txt" echo Microsoft.Paint"</Path> - </RunSynchronousCommand> - <RunSynchronousCommand wcm:action="add"> - <Order>32</Order> - <Path>cmd.exe /c "&gt;&gt;"%TEMP%\remove-packages.txt" echo Microsoft.MSPaint"</Path> - </RunSynchronousCommand> - <RunSynchronousCommand wcm:action="add"> - <Order>33</Order> - <Path>cmd.exe /c "&gt;&gt;"%TEMP%\remove-packages.txt" echo Microsoft.People"</Path> - </RunSynchronousCommand> - <RunSynchronousCommand wcm:action="add"> - <Order>34</Order> - <Path>cmd.exe /c "&gt;&gt;"%TEMP%\remove-packages.txt" echo Microsoft.Windows.Photos"</Path> - </RunSynchronousCommand> - <RunSynchronousCommand wcm:action="add"> - <Order>35</Order> - <Path>cmd.exe /c "&gt;&gt;"%TEMP%\remove-packages.txt" echo Microsoft.PowerAutomateDesktop"</Path> - </RunSynchronousCommand> - <RunSynchronousCommand wcm:action="add"> - <Order>36</Order> - <Path>cmd.exe /c "&gt;&gt;"%TEMP%\remove-caps.txt" echo App.Support.QuickAssist"</Path> - </RunSynchronousCommand> - <RunSynchronousCommand wcm:action="add"> - <Order>37</Order> - <Path>cmd.exe /c "&gt;&gt;"%TEMP%\remove-packages.txt" echo MicrosoftCorporationII.QuickAssist"</Path> - </RunSynchronousCommand> - <RunSynchronousCommand wcm:action="add"> - <Order>38</Order> - <Path>cmd.exe /c "&gt;&gt;"%TEMP%\remove-packages.txt" echo Microsoft.SkypeApp"</Path> - </RunSynchronousCommand> - <RunSynchronousCommand wcm:action="add"> - <Order>39</Order> - <Path>cmd.exe /c "&gt;&gt;"%TEMP%\remove-packages.txt" echo Microsoft.ScreenSketch"</Path> - </RunSynchronousCommand> - <RunSynchronousCommand wcm:action="add"> - <Order>40</Order> - <Path>cmd.exe /c "&gt;&gt;"%TEMP%\remove-packages.txt" echo Microsoft.MicrosoftSolitaireCollection"</Path> - </RunSynchronousCommand> - <RunSynchronousCommand wcm:action="add"> - <Order>41</Order> - <Path>cmd.exe /c "&gt;&gt;"%TEMP%\remove-caps.txt" echo App.StepsRecorder"</Path> - </RunSynchronousCommand> - <RunSynchronousCommand wcm:action="add"> - <Order>42</Order> - <Path>cmd.exe /c "&gt;&gt;"%TEMP%\remove-packages.txt" echo Microsoft.MicrosoftStickyNotes"</Path> - </RunSynchronousCommand> - <RunSynchronousCommand wcm:action="add"> - <Order>43</Order> - <Path>reg.exe add "HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Communications" /v ConfigureChatAutoInstall /t REG_DWORD /d 0 /f</Path> - </RunSynchronousCommand> - <RunSynchronousCommand wcm:action="add"> - <Order>44</Order> - <Path>cmd.exe /c "&gt;&gt;"%TEMP%\remove-packages.txt" echo Microsoft.Getstarted"</Path> - </RunSynchronousCommand> - <RunSynchronousCommand wcm:action="add"> - <Order>45</Order> - <Path>cmd.exe /c "&gt;&gt;"%TEMP%\remove-packages.txt" echo Microsoft.Todos"</Path> - </RunSynchronousCommand> - <RunSynchronousCommand wcm:action="add"> - <Order>46</Order> - <Path>cmd.exe /c "&gt;&gt;"%TEMP%\remove-packages.txt" echo Microsoft.WindowsSoundRecorder"</Path> - </RunSynchronousCommand> - <RunSynchronousCommand wcm:action="add"> - <Order>47</Order> - <Path>cmd.exe /c "&gt;&gt;"%TEMP%\remove-packages.txt" echo Microsoft.BingWeather"</Path> - </RunSynchronousCommand> - <RunSynchronousCommand wcm:action="add"> - <Order>48</Order> - <Path>cmd.exe /c "&gt;&gt;"%TEMP%\remove-caps.txt" echo Media.WindowsMediaPlayer"</Path> - </RunSynchronousCommand> - <RunSynchronousCommand wcm:action="add"> - <Order>49</Order> - <Path>cmd.exe /c "&gt;&gt;"%TEMP%\remove-packages.txt" echo Microsoft.ZuneMusic"</Path> - </RunSynchronousCommand> - <RunSynchronousCommand wcm:action="add"> - <Order>50</Order> - <Path>cmd.exe /c "&gt;&gt;"%TEMP%\remove-packages.txt" echo Microsoft.Xbox.TCUI"</Path> - </RunSynchronousCommand> - <RunSynchronousCommand wcm:action="add"> - <Order>51</Order> - <Path>cmd.exe /c "&gt;&gt;"%TEMP%\remove-packages.txt" echo Microsoft.XboxApp"</Path> - </RunSynchronousCommand> - <RunSynchronousCommand wcm:action="add"> - <Order>52</Order> - <Path>cmd.exe /c "&gt;&gt;"%TEMP%\remove-packages.txt" echo Microsoft.XboxGameOverlay"</Path> - </RunSynchronousCommand> - <RunSynchronousCommand wcm:action="add"> - <Order>53</Order> - <Path>cmd.exe /c "&gt;&gt;"%TEMP%\remove-packages.txt" echo Microsoft.XboxGamingOverlay"</Path> - </RunSynchronousCommand> - <RunSynchronousCommand wcm:action="add"> - <Order>54</Order> - <Path>cmd.exe /c "&gt;&gt;"%TEMP%\remove-packages.txt" echo Microsoft.XboxIdentityProvider"</Path> - </RunSynchronousCommand> - <RunSynchronousCommand wcm:action="add"> - <Order>55</Order> - <Path>cmd.exe /c "&gt;&gt;"%TEMP%\remove-packages.txt" echo Microsoft.XboxSpeechToTextOverlay"</Path> - </RunSynchronousCommand> - <RunSynchronousCommand wcm:action="add"> - <Order>56</Order> - <Path>cmd.exe /c "&gt;&gt;"%TEMP%\remove-packages.txt" echo Microsoft.GamingApp"</Path> - </RunSynchronousCommand> - <RunSynchronousCommand wcm:action="add"> - <Order>57</Order> - <Path>cmd.exe /c "&gt;&gt;"%TEMP%\remove-packages.txt" echo Microsoft.YourPhone"</Path> - </RunSynchronousCommand> - <RunSynchronousCommand wcm:action="add"> - <Order>58</Order> - <Path>powershell.exe -NoProfile -Command "Get-AppxProvisionedPackage -Online | where DisplayName -In (Get-Content $env:TEMP\remove-packages.txt ) | Remove-AppxProvisionedPackage -AllUsers -Online *&gt;&amp;1 &gt;&gt; $env:TEMP\remove-packages.log;"</Path> - </RunSynchronousCommand> - <RunSynchronousCommand wcm:action="add"> - <Order>59</Order> - <Path>powershell.exe -NoProfile -Command "Get-WindowsCapability -Online | where {($_.Name -split '~')[0] -in (Get-Content $env:TEMP\remove-caps.txt ) } | Remove-WindowsCapability -Online *&gt;&amp;1 &gt;&gt; $env:TEMP\remove-caps.log;"</Path> - </RunSynchronousCommand> - <RunSynchronousCommand wcm:action="add"> - <Order>60</Order> - <Path>cmd.exe /c "&gt;&gt;"C:\Users\Default\AppData\Local\Microsoft\Windows\Shell\LayoutModification.xml" echo ^&lt;LayoutModificationTemplate Version="1" xmlns="http://schemas.microsoft.com/Start/2014/LayoutModification"^&gt;"</Path> - </RunSynchronousCommand> - <RunSynchronousCommand wcm:action="add"> - <Order>61</Order> - <Path>cmd.exe /c "&gt;&gt;"C:\Users\Default\AppData\Local\Microsoft\Windows\Shell\LayoutModification.xml" echo ^&lt;LayoutOptions StartTileGroupCellWidth="6" /^&gt;"</Path> - </RunSynchronousCommand> - <RunSynchronousCommand wcm:action="add"> - <Order>62</Order> - <Path>cmd.exe /c "&gt;&gt;"C:\Users\Default\AppData\Local\Microsoft\Windows\Shell\LayoutModification.xml" echo ^&lt;DefaultLayoutOverride^&gt;"</Path> - </RunSynchronousCommand> - <RunSynchronousCommand wcm:action="add"> - <Order>63</Order> - <Path>cmd.exe /c "&gt;&gt;"C:\Users\Default\AppData\Local\Microsoft\Windows\Shell\LayoutModification.xml" echo ^&lt;StartLayoutCollection^&gt;"</Path> - </RunSynchronousCommand> - <RunSynchronousCommand wcm:action="add"> - <Order>64</Order> - <Path>cmd.exe /c "&gt;&gt;"C:\Users\Default\AppData\Local\Microsoft\Windows\Shell\LayoutModification.xml" echo ^&lt;StartLayout GroupCellWidth="6" xmlns="http://schemas.microsoft.com/Start/2014/FullDefaultLayout" /^&gt;"</Path> - </RunSynchronousCommand> - <RunSynchronousCommand wcm:action="add"> - <Order>65</Order> - <Path>cmd.exe /c "&gt;&gt;"C:\Users\Default\AppData\Local\Microsoft\Windows\Shell\LayoutModification.xml" echo ^&lt;/StartLayoutCollection^&gt;"</Path> - </RunSynchronousCommand> - <RunSynchronousCommand wcm:action="add"> - <Order>66</Order> - <Path>cmd.exe /c "&gt;&gt;"C:\Users\Default\AppData\Local\Microsoft\Windows\Shell\LayoutModification.xml" echo ^&lt;/DefaultLayoutOverride^&gt;"</Path> - </RunSynchronousCommand> - <RunSynchronousCommand wcm:action="add"> - <Order>67</Order> - <Path>cmd.exe /c "&gt;&gt;"C:\Users\Default\AppData\Local\Microsoft\Windows\Shell\LayoutModification.xml" echo ^&lt;/LayoutModificationTemplate^&gt;"</Path> - </RunSynchronousCommand> - <RunSynchronousCommand wcm:action="add"> - <Order>68</Order> - <Path>reg.exe add "HKLM\SOFTWARE\Microsoft\PolicyManager\current\device\Start" /v ConfigureStartPins /t REG_SZ /d "{ \"pinnedList\": [] }" /f</Path> - </RunSynchronousCommand> - <RunSynchronousCommand wcm:action="add"> - <Order>69</Order> - <Path>reg.exe add "HKLM\SOFTWARE\Microsoft\PolicyManager\current\device\Start" /v ConfigureStartPins_ProviderSet /t REG_DWORD /d 1 /f</Path> - </RunSynchronousCommand> - <RunSynchronousCommand wcm:action="add"> - <Order>70</Order> - <Path>reg.exe add "HKLM\SOFTWARE\Microsoft\PolicyManager\current\device\Start" /v ConfigureStartPins_WinningProvider /t REG_SZ /d B5292708-1619-419B-9923-E5D9F3925E71 /f</Path> - </RunSynchronousCommand> - <RunSynchronousCommand wcm:action="add"> - <Order>71</Order> - <Path>reg.exe add "HKLM\SOFTWARE\Microsoft\PolicyManager\providers\B5292708-1619-419B-9923-E5D9F3925E71\default\Device\Start" /v ConfigureStartPins /t REG_SZ /d "{ \"pinnedList\": [] }" /f</Path> - </RunSynchronousCommand> - <RunSynchronousCommand wcm:action="add"> - <Order>72</Order> - <Path>reg.exe add "HKLM\SOFTWARE\Microsoft\PolicyManager\providers\B5292708-1619-419B-9923-E5D9F3925E71\default\Device\Start" /v ConfigureStartPins_LastWrite /t REG_DWORD /d 1 /f</Path> - </RunSynchronousCommand> - <RunSynchronousCommand wcm:action="add"> - <Order>73</Order> - <Path>net.exe accounts /lockoutthreshold:0</Path> - </RunSynchronousCommand> - <RunSynchronousCommand wcm:action="add"> - <Order>74</Order> - <Path>netsh.exe advfirewall firewall set rule group="Remote Desktop" new enable=Yes</Path> - </RunSynchronousCommand> - <RunSynchronousCommand wcm:action="add"> - <Order>75</Order> - <Path>reg.exe add "HKLM\SYSTEM\CurrentControlSet\Control\Terminal Server" /v fDenyTSConnections /t REG_DWORD /d 0 /f</Path> - </RunSynchronousCommand> - <RunSynchronousCommand wcm:action="add"> - <Order>76</Order> - <Path>powershell.exe -NoProfile -Command "Set-ExecutionPolicy -Scope 'LocalMachine' -ExecutionPolicy 'RemoteSigned' -Force;"</Path> - </RunSynchronousCommand> - <RunSynchronousCommand wcm:action="add"> - <Order>77</Order> - <Path>reg.exe add "HKLM\SOFTWARE\Policies\Microsoft\Dsh" /v AllowNewsAndInterests /t REG_DWORD /d 0 /f</Path> - </RunSynchronousCommand> - <RunSynchronousCommand wcm:action="add"> - <Order>78</Order> - <Path>reg.exe load "HKU\mount" "C:\Users\Default\NTUSER.DAT"</Path> - </RunSynchronousCommand> - <RunSynchronousCommand wcm:action="add"> - <Order>79</Order> - <Path>reg.exe add "HKU\mount\Software\Microsoft\Windows\CurrentVersion\ContentDeliveryManager" /v "ContentDeliveryAllowed" /t REG_DWORD /d 0 /f</Path> - </RunSynchronousCommand> - <RunSynchronousCommand wcm:action="add"> - <Order>80</Order> - <Path>reg.exe add "HKU\mount\Software\Microsoft\Windows\CurrentVersion\ContentDeliveryManager" /v "FeatureManagementEnabled" /t REG_DWORD /d 0 /f</Path> - </RunSynchronousCommand> - <RunSynchronousCommand wcm:action="add"> - <Order>81</Order> - <Path>reg.exe add "HKU\mount\Software\Microsoft\Windows\CurrentVersion\ContentDeliveryManager" /v "OEMPreInstalledAppsEnabled" /t REG_DWORD /d 0 /f</Path> - </RunSynchronousCommand> - <RunSynchronousCommand wcm:action="add"> - <Order>82</Order> - <Path>reg.exe add "HKU\mount\Software\Microsoft\Windows\CurrentVersion\ContentDeliveryManager" /v "PreInstalledAppsEnabled" /t REG_DWORD /d 0 /f</Path> - </RunSynchronousCommand> - <RunSynchronousCommand wcm:action="add"> - <Order>83</Order> - <Path>reg.exe add "HKU\mount\Software\Microsoft\Windows\CurrentVersion\ContentDeliveryManager" /v "PreInstalledAppsEverEnabled" /t REG_DWORD /d 0 /f</Path> - </RunSynchronousCommand> - <RunSynchronousCommand wcm:action="add"> - <Order>84</Order> - <Path>reg.exe add "HKU\mount\Software\Microsoft\Windows\CurrentVersion\ContentDeliveryManager" /v "SilentInstalledAppsEnabled" /t REG_DWORD /d 0 /f</Path> - </RunSynchronousCommand> - <RunSynchronousCommand wcm:action="add"> - <Order>85</Order> - <Path>reg.exe add "HKU\mount\Software\Microsoft\Windows\CurrentVersion\ContentDeliveryManager" /v "SoftLandingEnabled" /t REG_DWORD /d 0 /f</Path> - </RunSynchronousCommand> - <RunSynchronousCommand wcm:action="add"> - <Order>86</Order> - <Path>reg.exe add "HKU\mount\Software\Microsoft\Windows\CurrentVersion\ContentDeliveryManager" /v "SubscribedContentEnabled" /t REG_DWORD /d 0 /f</Path> - </RunSynchronousCommand> - <RunSynchronousCommand wcm:action="add"> - <Order>87</Order> - <Path>reg.exe add "HKU\mount\Software\Microsoft\Windows\CurrentVersion\ContentDeliveryManager" /v "SubscribedContent-310093Enabled" /t REG_DWORD /d 0 /f</Path> - </RunSynchronousCommand> - <RunSynchronousCommand wcm:action="add"> - <Order>88</Order> - <Path>reg.exe add "HKU\mount\Software\Microsoft\Windows\CurrentVersion\ContentDeliveryManager" /v "SubscribedContent-338387Enabled" /t REG_DWORD /d 0 /f</Path> - </RunSynchronousCommand> - <RunSynchronousCommand wcm:action="add"> - <Order>89</Order> - <Path>reg.exe add "HKU\mount\Software\Microsoft\Windows\CurrentVersion\ContentDeliveryManager" /v "SubscribedContent-338388Enabled" /t REG_DWORD /d 0 /f</Path> - </RunSynchronousCommand> - <RunSynchronousCommand wcm:action="add"> - <Order>90</Order> - <Path>reg.exe add "HKU\mount\Software\Microsoft\Windows\CurrentVersion\ContentDeliveryManager" /v "SubscribedContent-338389Enabled" /t REG_DWORD /d 0 /f</Path> - </RunSynchronousCommand> - <RunSynchronousCommand wcm:action="add"> - <Order>91</Order> - <Path>reg.exe add "HKU\mount\Software\Microsoft\Windows\CurrentVersion\ContentDeliveryManager" /v "SubscribedContent-338393Enabled" /t REG_DWORD /d 0 /f</Path> - </RunSynchronousCommand> - <RunSynchronousCommand wcm:action="add"> - <Order>92</Order> - <Path>reg.exe add "HKU\mount\Software\Microsoft\Windows\CurrentVersion\ContentDeliveryManager" /v "SubscribedContent-353698Enabled" /t REG_DWORD /d 0 /f</Path> - </RunSynchronousCommand> - <RunSynchronousCommand wcm:action="add"> - <Order>93</Order> - <Path>reg.exe add "HKU\mount\Software\Microsoft\Windows\CurrentVersion\ContentDeliveryManager" /v "SystemPaneSuggestionsEnabled" /t REG_DWORD /d 0 /f</Path> - </RunSynchronousCommand> - <RunSynchronousCommand wcm:action="add"> - <Order>94</Order> - <Path>reg.exe unload "HKU\mount"</Path> - </RunSynchronousCommand> - <RunSynchronousCommand wcm:action="add"> - <Order>95</Order> - <Path>reg.exe add "HKLM\Software\Policies\Microsoft\Windows\CloudContent" /v "DisableWindowsConsumerFeatures" /t REG_DWORD /d 0 /f</Path> - </RunSynchronousCommand> - </RunSynchronous> - </component> - </settings> - <settings pass="oobeSystem"> - <component name="Microsoft-Windows-International-Core" processorArchitecture="arm64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> - <InputLocale>en-US</InputLocale> - <SystemLocale>en-US</SystemLocale> - <UILanguage>en-US</UILanguage> - <UserLocale>en-US</UserLocale> - </component> - <component name="Microsoft-Windows-Shell-Setup" processorArchitecture="arm64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> - <OOBE> - <HideEULAPage>true</HideEULAPage> - <HideLocalAccountScreen>true</HideLocalAccountScreen> - <HideOEMRegistrationScreen>true</HideOEMRegistrationScreen> - <HideOnlineAccountScreens>true</HideOnlineAccountScreens> - <HideWirelessSetupInOOBE>true</HideWirelessSetupInOOBE> - <NetworkLocation>Work</NetworkLocation> - <ProtectYourPC>3</ProtectYourPC> - <SkipMachineOOBE>true</SkipMachineOOBE> - <SkipUserOOBE>true</SkipUserOOBE> - <VMModeOptimizations> - <SkipAdministratorProfileRemoval>true</SkipAdministratorProfileRemoval> - <SkipNotifyUILanguageChange>true</SkipNotifyUILanguageChange> - <SkipWinREInitialization>true</SkipWinREInitialization> - </VMModeOptimizations> - </OOBE> - <UserAccounts> - <AdministratorPassword> - <Value>vagrant</Value> - <PlainText>true</PlainText> - </AdministratorPassword> - <LocalAccounts> - <LocalAccount wcm:action="add"> - <Password> - <Value>vagrant</Value> - <PlainText>true</PlainText> - </Password> - <Description>Vagrant User</Description> - <DisplayName>vagrant</DisplayName> - <Group>Administrators</Group> - <Name>vagrant</Name> - </LocalAccount> - </LocalAccounts> - </UserAccounts> - <AutoLogon> - <Password> - <Value>vagrant</Value> - <PlainText>true</PlainText> - </Password> - <Username>vagrant</Username> - <Enabled>true</Enabled> - </AutoLogon> - <FirstLogonCommands> - <SynchronousCommand wcm:action="add"> - <CommandLine>%windir%\System32\WindowsPowerShell\v1.0\powershell.exe -Command "Set-ExecutionPolicy -ExecutionPolicy RemoteSigned -Force"</CommandLine> - <Description>Set Execution Policy 64 Bit</Description> - <Order>1</Order> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <CommandLine>%windir%\SysWOW64\cmd.exe /c powershell -Command "Set-ExecutionPolicy -ExecutionPolicy RemoteSigned -Force"</CommandLine> - <Description>Set Execution Policy 32 Bit</Description> - <Order>2</Order> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <Order>3</Order> - <CommandLine>%windir%\System32\WindowsPowerShell\v1.0\powershell.exe -Command Get-NetConnectionProfile | Set-NetConnectionProfile -NetworkCategory "Private"</CommandLine> - <Description>Sets detected network connections to private to allow start of winrm</Description> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <Order>4</Order> - <CommandLine>%windir%\System32\WindowsPowerShell\v1.0\powershell.exe -Command Set-NetFirewallRule -Name "WINRM-HTTP-In-TCP" -RemoteAddress Any</CommandLine> - <Description>Allows winrm over public profile interfaces</Description> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <Order>5</Order> - <CommandLine>%windir%\System32\cmd.exe /c winrm quickconfig -q</CommandLine> - <Description>winrm quickconfig -q</Description> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <Order>6</Order> - <CommandLine>%windir%\System32\cmd.exe /c winrm quickconfig -transport:http</CommandLine> - <Description>winrm quickconfig -transport:http</Description> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <Order>7</Order> - <CommandLine>%windir%\System32\cmd.exe /c winrm set winrm/config @{MaxTimeoutms="1800000"}</CommandLine> - <Description>Win RM MaxTimoutms</Description> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <Order>8</Order> - <CommandLine>%windir%\System32\cmd.exe /c winrm set winrm/config/winrs @{MaxMemoryPerShellMB="2048"}</CommandLine> - <Description>Win RM MaxMemoryPerShellMB</Description> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <Order>9</Order> - <CommandLine>%windir%\System32\cmd.exe /c winrm set winrm/config/service @{AllowUnencrypted="true"}</CommandLine> - <Description>Win RM AllowUnencrypted</Description> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <Order>10</Order> - <CommandLine>%windir%\System32\cmd.exe /c winrm set winrm/config/service/auth @{Basic="true"}</CommandLine> - <Description>Win RM auth Basic</Description> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <Order>11</Order> - <CommandLine>%windir%\System32\cmd.exe /c winrm set winrm/config/client/auth @{Basic="true"}</CommandLine> - <Description>Win RM client auth Basic</Description> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <Order>12</Order> - <CommandLine>%windir%\System32\cmd.exe /c winrm set winrm/config/listener?Address=*+Transport=HTTP @{Port="5985"}</CommandLine> - <Description>Win RM listener Address/Port</Description> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <Order>13</Order> - <CommandLine>%windir%\System32\cmd.exe /c netsh firewall add portopening TCP 5985 "Port 5985"</CommandLine> - <Description>Win RM port open</Description> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <Order>14</Order> - <CommandLine>%windir%\System32\cmd.exe /c net stop winrm</CommandLine> - <Description>Stop Win RM Service</Description> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <Order>15</Order> - <CommandLine>%windir%\System32\cmd.exe /c sc config winrm start= auto</CommandLine> - <Description>Win RM Autostart</Description> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <Order>16</Order> - <CommandLine>%windir%\System32\cmd.exe /c net start winrm</CommandLine> - <Description>Start Win RM Service</Description> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <Order>17</Order> - <CommandLine>%windir%\System32\cmd.exe /c wmic useraccount where "name='vagrant'" set PasswordExpires=FALSE</CommandLine> - <Description>Disable password expiration for vagrant user</Description> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <CommandLine>%SystemRoot%\System32\reg.exe ADD "HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon" /v DefaultPassword /t REG_SZ /d "vagrant" /f</CommandLine> - <Order>18</Order> - <Description>Enable AutoLogon</Description> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <CommandLine>%SystemRoot%\System32\reg.exe ADD "HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon" /v AutoAdminLogon /t REG_SZ /d 1 /f</CommandLine> - <Order>19</Order> - <Description>Enable AutoLogon</Description> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <Order>20</Order> - <CommandLine>powershell.exe -NoProfile -Command "Disable-ComputerRestore -Drive 'C:';"</CommandLine> - <Description>Disable Computer Restore</Description> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <CommandLine>cmd.exe /c E:\PTAgent.exe /install_silent</CommandLine> - <Description>Install Parallels Desktop tools</Description> - <Order>21</Order> - </SynchronousCommand> - </FirstLogonCommands> - </component> - <component name="Microsoft-Windows-WinRE-RecoveryAgent" processorArchitecture="arm64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> - <UninstallWindowsRE>true</UninstallWindowsRE> - </component> - </settings> - <settings pass="offlineServicing"> - <component name="Microsoft-Windows-LUA-Settings" processorArchitecture="arm64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> - <EnableLUA>false</EnableLUA> - </component> - </settings> + <!--https://schneegans.de/windows/unattend-generator/?LanguageMode=Unattended&UILanguage=en-US&Locale=en-US&Keyboard=00000409&GeoLocation=244&ProcessorArchitecture=amd64&ProcessorArchitecture=arm64&BypassRequirementsCheck=true&ComputerNameMode=Custom&ComputerName=bento&CompactOsMode=Default&TimeZoneMode=Explicit&TimeZone=UTC&PartitionMode=Unattended&PartitionLayout=GPT&EspSize=100&RecoveryMode=None&WindowsEditionMode=Generic&WindowsEdition=enterprise&UserAccountMode=Unattended&AccountName0=vagrant&AccountDisplayName0=&AccountPassword0=vagrant&AccountGroup0=Administrators&AccountName1=&AccountName2=&AccountName3=&AccountName4=&AutoLogonMode=Own&PasswordExpirationMode=Unlimited&LockoutMode=Disabled&HideFiles=HiddenSystem&ShowFileExtensions=true&TaskbarSearch=Box&TaskbarIconsMode=Default&DisableWidgets=true&StartTilesMode=Default&StartPinsMode=Default&DisableUac=true&DisableSac=true&DisableSmartScreen=true&DisableFastStartup=true&DisableSystemRestore=true&EnableRemoteDesktop=true&AllowPowerShellScripts=true&DisableAppSuggestions=true&PreventDeviceEncryption=true&HideEdgeFre=true&DeleteWindowsOld=true&EffectsMode=Performance&DesktopIconsMode=Default&VBoxGuestAdditions=true&VMwareTools=true&VirtIoGuestTools=true&WifiMode=Skip&ExpressSettings=DisableAll&KeysMode=Skip&ColorMode=Default&WallpaperMode=Default&Remove3DViewer=true&RemoveBingSearch=true&RemoveCalculator=true&RemoveCamera=true&RemoveClipchamp=true&RemoveClock=true&RemoveCopilot=true&RemoveCortana=true&RemoveDevHome=true&RemoveFamily=true&RemoveFeedbackHub=true&RemoveGetHelp=true&RemoveHandwriting=true&RemoveInternetExplorer=true&RemoveMailCalendar=true&RemoveMaps=true&RemoveMathInputPanel=true&RemoveMediaFeatures=true&RemoveMixedReality=true&RemoveZuneVideo=true&RemoveNews=true&RemoveOffice365=true&RemoveOneDrive=true&RemoveOneNote=true&RemoveOneSync=true&RemoveOutlook=true&RemovePaint=true&RemovePaint3D=true&RemovePeople=true&RemovePhotos=true&RemovePowerAutomate=true&RemovePowerShell2=true&RemoveQuickAssist=true&RemoveRecall=true&RemoveSkype=true&RemoveSnippingTool=true&RemoveSolitaire=true&RemoveSpeech=true&RemoveStepsRecorder=true&RemoveStickyNotes=true&RemoveTeams=true&RemoveGetStarted=true&RemoveToDo=true&RemoveVoiceRecorder=true&RemoveWallet=true&RemoveWeather=true&RemoveFaxAndScan=true&RemoveWindowsHello=true&RemoveWindowsMediaPlayer=true&RemoveZuneMusic=true&RemoveXboxApps=true&RemoveYourPhone=true&SystemScript0=%26+%7B%0D%0A++foreach%28+%24letter+in+%27DEFGHIJKLMNOPQRSTUVWXYZ%27.ToCharArray%28%29+%29+%7B%0D%0A++++%24exe+%3D+%22%24%7Bletter%7D%3A%5CPTAgent.exe%22%3B%0D%0A++++if%28+Test-Path+-LiteralPath+%24exe+%29+%7B%0D%0A++++++Start-Process+-FilePath+%24exe+-ArgumentList+%27%2Finstall_silent%27%2C+%27%2Fnorestart%27+-Wait%3B%0D%0A++++++return%3B%0D%0A++++%7D%0D%0A++%7D%0D%0A++%27Parallels+Tools+image+%28windows.iso%29+is+not+attached+to+this+VM.%27%3B%0D%0A%7D+*%3E%261+%3E%3E+%27C%3A%5CWindows%5CSetup%5CScripts%5CParallelsTools.log%27%3B&SystemScriptType0=Ps1&FirstLogonScript0=Get-NetConnectionProfile+%7C+Set-NetConnectionProfile+-NetworkCategory+%22Private%22%3B%0D%0ASet-NetFirewallRule+-Name+%22WINRM-HTTP-In-TCP%22+-RemoteAddress+Any%3B%0D%0Areg.exe+ADD+%22HKLM%5CSOFTWARE%5CMicrosoft%5CWindows+NT%5CCurrentVersion%5CWinlogon%22+%2Fv+AutoAdminLogon+%2Ft+REG_SZ+%2Fd+1+%2Ff%3B%0D%0Areg.exe+ADD+%22HKLM%5CSOFTWARE%5CMicrosoft%5CWindows+NT%5CCurrentVersion%5CWinlogon%22+%2Fv+DefaultUserName+%2Ft+REG_SZ+%2Fd+%22vagrant%22+%2Ff%3B%0D%0Areg.exe+ADD+%22HKLM%5CSOFTWARE%5CMicrosoft%5CWindows+NT%5CCurrentVersion%5CWinlogon%22+%2Fv+DefaultPassword+%2Ft+REG_SZ+%2Fd+%22vagrant%22+%2Ff%3B%0D%0Acmd.exe+%2Fc+winrm+quickconfig+-q%3B%0D%0Acmd.exe+%2Fc+winrm+quickconfig+-transport%3Ahttp%3B%0D%0Acmd.exe+%2Fc+winrm+set+winrm%2Fconfig+%40%7BMaxTimeoutms%3D%221800000%22%7D%3B%0D%0Acmd.exe+%2Fc+winrm+set+winrm%2Fconfig%2Fwinrs+%40%7BMaxMemoryPerShellMB%3D%222048%22%7D%3B%0D%0Acmd.exe+%2Fc+winrm+set+winrm%2Fconfig%2Fservice+%40%7BAllowUnencrypted%3D%22true%22%7D%3B%0D%0Acmd.exe+%2Fc+winrm+set+winrm%2Fconfig%2Fservice%2Fauth+%40%7BBasic%3D%22true%22%7D%3B%0D%0Acmd.exe+%2Fc+winrm+set+winrm%2Fconfig%2Fclient%2Fauth+%40%7BBasic%3D%22true%22%7D%3B%0D%0Acmd.exe+%2Fc+winrm+set+winrm%2Fconfig%2Flistener%3FAddress%3D*%2BTransport%3DHTTP+%40%7BPort%3D%225985%22%7D%3B%0D%0Acmd.exe+%2Fc+netsh+firewall+add+portopening+TCP+5985+%22Port+5985%22%3B%0D%0Acmd.exe+%2Fc+net+stop+winrm%3B%0D%0Acmd.exe+%2Fc+sc+config+winrm+start%3D+auto%3B%0D%0Acmd.exe+%2Fc+net+start+winrm%3B%0D%0Acmd.exe+%2Fc+wmic+useraccount+where+%22name%3D%27vagrant%27%22+set+PasswordExpires%3DFALSE%3B&FirstLogonScriptType0=Ps1&WdacMode=Skip--> + <settings pass="offlineServicing"></settings> + <settings pass="windowsPE"> + <component name="Microsoft-Windows-International-Core-WinPE" processorArchitecture="arm64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> + <SetupUILanguage> + <UILanguage>en-US</UILanguage> + </SetupUILanguage> + <InputLocale>0409:00000409</InputLocale> + <SystemLocale>en-US</SystemLocale> + <UILanguage>en-US</UILanguage> + <UserLocale>en-US</UserLocale> + </component> + <component name="Microsoft-Windows-Setup" processorArchitecture="arm64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> + <ImageInstall> + <OSImage> + <InstallTo> + <DiskID>0</DiskID> + <PartitionID>3</PartitionID> + </InstallTo> + </OSImage> + </ImageInstall> + <UserData> + <ProductKey> + <Key>XGVPP-NMH47-7TTHJ-W3FW7-8HV2C</Key> + <WillShowUI>OnError</WillShowUI> + </ProductKey> + <AcceptEula>true</AcceptEula> + </UserData> + <UseConfigurationSet>false</UseConfigurationSet> + <RunSynchronous> + <RunSynchronousCommand wcm:action="add"> + <Order>1</Order> + <Path>cmd.exe /c "&gt;&gt;"X:\diskpart.txt" (echo SELECT DISK=0&amp;echo CLEAN&amp;echo CONVERT GPT&amp;echo CREATE PARTITION EFI SIZE=100&amp;echo FORMAT QUICK FS=FAT32 LABEL="System"&amp;echo CREATE PARTITION MSR SIZE=16)"</Path> + </RunSynchronousCommand> + <RunSynchronousCommand wcm:action="add"> + <Order>2</Order> + <Path>cmd.exe /c "&gt;&gt;"X:\diskpart.txt" (echo CREATE PARTITION PRIMARY&amp;echo FORMAT QUICK FS=NTFS LABEL="Windows")"</Path> + </RunSynchronousCommand> + <RunSynchronousCommand wcm:action="add"> + <Order>3</Order> + <Path>cmd.exe /c "diskpart.exe /s "X:\diskpart.txt" &gt;&gt;"X:\diskpart.log" || ( type "X:\diskpart.log" &amp; echo diskpart encountered an error. &amp; pause &amp; exit /b 1 )"</Path> + </RunSynchronousCommand> + <RunSynchronousCommand wcm:action="add"> + <Order>4</Order> + <Path>reg.exe add "HKLM\SYSTEM\Setup\LabConfig" /v BypassTPMCheck /t REG_DWORD /d 1 /f</Path> + </RunSynchronousCommand> + <RunSynchronousCommand wcm:action="add"> + <Order>5</Order> + <Path>reg.exe add "HKLM\SYSTEM\Setup\LabConfig" /v BypassSecureBootCheck /t REG_DWORD /d 1 /f</Path> + </RunSynchronousCommand> + <RunSynchronousCommand wcm:action="add"> + <Order>6</Order> + <Path>reg.exe add "HKLM\SYSTEM\Setup\LabConfig" /v BypassRAMCheck /t REG_DWORD /d 1 /f</Path> + </RunSynchronousCommand> + </RunSynchronous> + </component> + </settings> + <settings pass="generalize"></settings> + <settings pass="specialize"> + <component name="Microsoft-Windows-Shell-Setup" processorArchitecture="arm64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> + <ComputerName>bento</ComputerName> + <TimeZone>UTC</TimeZone> + </component> + <component name="Microsoft-Windows-Deployment" processorArchitecture="arm64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> + <RunSynchronous> + <RunSynchronousCommand wcm:action="add"> + <Order>1</Order> + <Path>powershell.exe -WindowStyle Normal -NoProfile -Command "$xml = [xml]::new(); $xml.Load('C:\Windows\Panther\unattend.xml'); $sb = [scriptblock]::Create( $xml.unattend.Extensions.ExtractScript ); Invoke-Command -ScriptBlock $sb -ArgumentList $xml;"</Path> + </RunSynchronousCommand> + <RunSynchronousCommand wcm:action="add"> + <Order>2</Order> + <Path>powershell.exe -WindowStyle Normal -NoProfile -Command "Get-Content -LiteralPath 'C:\Windows\Setup\Scripts\Specialize.ps1' -Raw | Invoke-Expression;"</Path> + </RunSynchronousCommand> + <RunSynchronousCommand wcm:action="add"> + <Order>3</Order> + <Path>reg.exe load "HKU\DefaultUser" "C:\Users\Default\NTUSER.DAT"</Path> + </RunSynchronousCommand> + <RunSynchronousCommand wcm:action="add"> + <Order>4</Order> + <Path>powershell.exe -WindowStyle Normal -NoProfile -Command "Get-Content -LiteralPath 'C:\Windows\Setup\Scripts\DefaultUser.ps1' -Raw | Invoke-Expression;"</Path> + </RunSynchronousCommand> + <RunSynchronousCommand wcm:action="add"> + <Order>5</Order> + <Path>reg.exe unload "HKU\DefaultUser"</Path> + </RunSynchronousCommand> + </RunSynchronous> + </component> + </settings> + <settings pass="auditSystem"></settings> + <settings pass="auditUser"></settings> + <settings pass="oobeSystem"> + <component name="Microsoft-Windows-International-Core" processorArchitecture="arm64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> + <InputLocale>0409:00000409</InputLocale> + <SystemLocale>en-US</SystemLocale> + <UILanguage>en-US</UILanguage> + <UserLocale>en-US</UserLocale> + </component> + <component name="Microsoft-Windows-Shell-Setup" processorArchitecture="arm64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> + <UserAccounts> + <LocalAccounts> + <LocalAccount wcm:action="add"> + <Name>vagrant</Name> + <DisplayName></DisplayName> + <Group>Administrators</Group> + <Password> + <Value>vagrant</Value> + <PlainText>true</PlainText> + </Password> + </LocalAccount> + </LocalAccounts> + </UserAccounts> + <AutoLogon> + <Username>vagrant</Username> + <Enabled>true</Enabled> + <LogonCount>1</LogonCount> + <Password> + <Value>vagrant</Value> + <PlainText>true</PlainText> + </Password> + </AutoLogon> + <OOBE> + <ProtectYourPC>3</ProtectYourPC> + <HideEULAPage>true</HideEULAPage> + <HideWirelessSetupInOOBE>true</HideWirelessSetupInOOBE> + <HideOnlineAccountScreens>true</HideOnlineAccountScreens> + </OOBE> + <FirstLogonCommands> + <SynchronousCommand wcm:action="add"> + <Order>1</Order> + <CommandLine>powershell.exe -WindowStyle Normal -NoProfile -Command "Get-Content -LiteralPath 'C:\Windows\Setup\Scripts\FirstLogon.ps1' -Raw | Invoke-Expression;"</CommandLine> + </SynchronousCommand> + </FirstLogonCommands> + </component> + </settings> + <Extensions xmlns="https://schneegans.de/windows/unattend-generator/"> + <ExtractScript> +param( + [xml] $Document +); + +foreach( $file in $Document.unattend.Extensions.File ) { + $path = [System.Environment]::ExpandEnvironmentVariables( $file.GetAttribute( 'path' ) ); + mkdir -Path( $path | Split-Path -Parent ) -ErrorAction 'SilentlyContinue'; + $encoding = switch( [System.IO.Path]::GetExtension( $path ) ) { + { $_ -in '.ps1', '.xml' } { [System.Text.Encoding]::UTF8; } + { $_ -in '.reg', '.vbs', '.js' } { [System.Text.UnicodeEncoding]::new( $false, $true ); } + default { [System.Text.Encoding]::Default; } + }; + $bytes = $encoding.GetPreamble() + $encoding.GetBytes( $file.InnerText.Trim() ); + [System.IO.File]::WriteAllBytes( $path, $bytes ); +} + </ExtractScript> + <File path="C:\Windows\Setup\Scripts\VBoxGuestAdditions.ps1"> +&amp; { + foreach( $letter in 'DEFGHIJKLMNOPQRSTUVWXYZ'.ToCharArray() ) { + $exe = "${letter}:\VBoxWindowsAdditions.exe"; + if( Test-Path -LiteralPath $exe ) { + $certs = "${letter}:\cert"; + Start-Process -FilePath "${certs}\VBoxCertUtil.exe" -ArgumentList "add-trusted-publisher ${certs}\vbox*.cer", "--root ${certs}\vbox*.cer" -Wait; + Start-Process -FilePath $exe -ArgumentList '/with_wddm', '/S' -Wait; + return; + } + } + 'VBoxGuestAdditions.iso is not attached to this VM.'; +} *&gt;&amp;1 &gt;&gt; 'C:\Windows\Setup\Scripts\VBoxGuestAdditions.log'; + </File> + <File path="C:\Windows\Setup\Scripts\VMwareTools.ps1"> +&amp; { + foreach( $letter in 'DEFGHIJKLMNOPQRSTUVWXYZ'.ToCharArray() ) { + $exe = "${letter}:\setup.exe"; + if( ( Get-Item -LiteralPath $exe -ErrorAction 'SilentlyContinue' | Select-Object -ExpandProperty 'VersionInfo' | Select-Object -ExpandProperty 'ProductName' ) -eq 'VMware Tools' ) { + Start-Process -FilePath $exe -ArgumentList '/s /v /qn REBOOT=R' -Wait; + return; + } + } + 'VMware Tools image (windows.iso) is not attached to this VM.'; +} *&gt;&amp;1 &gt;&gt; "C:\Windows\Setup\Scripts\VMwareTools.log"; + </File> + <File path="C:\Windows\Setup\Scripts\VirtIoGuestTools.ps1"> +&amp; { + foreach( $letter in 'DEFGHIJKLMNOPQRSTUVWXYZ'.ToCharArray() ) { + $exe = "${letter}:\virtio-win-guest-tools.exe"; + if( Test-Path -LiteralPath $exe ) { + Start-Process -FilePath $exe -ArgumentList '/passive', '/norestart' -Wait; + return; + } + } + 'VirtIO Guest Tools image (virtio-win-*.iso) is not attached to this VM.'; +} *&gt;&amp;1 &gt;&gt; 'C:\Windows\Setup\Scripts\VirtIoGuestTools.log'; + </File> + <File path="C:\Windows\Setup\Scripts\ParallelsTools.ps1"> +&amp; { + foreach( $letter in 'DEFGHIJKLMNOPQRSTUVWXYZ'.ToCharArray() ) { + $exe = "${letter}:\PTAgent.exe"; + if( Test-Path -LiteralPath $exe ) { + Start-Process -FilePath $exe -ArgumentList '/install_silent' -Wait; + return; + } + } + 'Parallels Tools image (windows.iso) is not attached to this VM.'; +} *&gt;&amp;1 &gt;&gt; 'C:\Windows\Setup\Scripts\VirtIoGuestTools.log'; + </File> + <File path="C:\Windows\Setup\Scripts\unattend-01.ps1"> +&amp; { + Get-NetConnectionProfile | Set-NetConnectionProfile -NetworkCategory "Private"; + Set-NetFirewallRule -Name "WINRM-HTTP-In-TCP" -RemoteAddress Any; + reg.exe ADD "HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon" /v AutoAdminLogon /t REG_SZ /d 1 /f; + reg.exe ADD "HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon" /v DefaultUserName /t REG_SZ /d "vagrant" /f; + reg.exe ADD "HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon" /v DefaultPassword /t REG_SZ /d "vagrant" /f; + cmd.exe /c 'winrm quickconfig -q -transport:http -force'; + cmd.exe /c 'winrm set winrm/config @{MaxTimeoutms="1800000"}'; + cmd.exe /c 'winrm set winrm/config/winrs @{MaxMemoryPerShellMB="2048"}'; + cmd.exe /c 'winrm set winrm/config/service @{AllowUnencrypted="true"}'; + cmd.exe /c 'winrm set winrm/config/service/auth @{Basic="true"}'; + cmd.exe /c 'winrm set winrm/config/client/auth @{Basic="true"}'; + cmd.exe /c 'winrm set winrm/config/listener?Address=*+Transport=HTTP @{Port="5985"}'; + netsh advfirewall firewall add rule name= "Open Port 5985" dir=in action=allow protocol=TCP localport=5985 + net stop winrm; + cmd.exe /c 'sc config winrm start= auto'; + net start winrm; + wmic useraccount where "name='vagrant'" set PasswordExpires=FALSE; +} *&gt;&amp;1 &gt;&gt; 'C:\Windows\Setup\Scripts\unattend-01.log'; + </File> + <File path="C:\Windows\Setup\Scripts\Specialize.ps1"> +$scripts = @( + { + ReAgentc.exe /disable; + Remove-Item -LiteralPath 'C:\Windows\System32\Recovery\Winre.wim' -Force -ErrorAction 'SilentlyContinue'; + }; + { + reg.exe add "HKLM\SYSTEM\Setup\MoSetup" /v AllowUpgradesWithUnsupportedTPMOrCPU /t REG_DWORD /d 1 /f; + }; + { + Remove-Item -LiteralPath 'Registry::HKLM\Software\Microsoft\WindowsUpdate\Orchestrator\UScheduler_Oobe\DevHomeUpdate' -Force -ErrorAction 'SilentlyContinue'; + }; + { + Remove-Item -LiteralPath 'C:\Users\Default\AppData\Roaming\Microsoft\Windows\Start Menu\Programs\OneDrive.lnk', 'C:\Windows\System32\OneDriveSetup.exe', 'C:\Windows\SysWOW64\OneDriveSetup.exe' -ErrorAction 'Continue'; + }; + { + Remove-Item -LiteralPath 'Registry::HKLM\Software\Microsoft\WindowsUpdate\Orchestrator\UScheduler_Oobe\OutlookUpdate' -Force -ErrorAction 'SilentlyContinue'; + }; + { + reg.exe add "HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Communications" /v ConfigureChatAutoInstall /t REG_DWORD /d 0 /f; + }; + { + net.exe accounts /lockoutthreshold:0; + }; + { + net.exe accounts /maxpwage:UNLIMITED; + }; + { + reg.exe add "HKLM\SYSTEM\CurrentControlSet\Control\CI\Policy" /v VerifiedAndReputablePolicyState /t REG_DWORD /d 0 /f; + }; + { + reg.exe add "HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer" /v SmartScreenEnabled /t REG_SZ /d "Off" /f; + reg.exe add "HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\WTDS\Components" /v ServiceEnabled /t REG_DWORD /d 0 /f; + reg.exe add "HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\WTDS\Components" /v NotifyMalicious /t REG_DWORD /d 0 /f; + reg.exe add "HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\WTDS\Components" /v NotifyPasswordReuse /t REG_DWORD /d 0 /f; + reg.exe add "HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\WTDS\Components" /v NotifyUnsafeApp /t REG_DWORD /d 0 /f; + reg.exe add "HKLM\SOFTWARE\Policies\Microsoft\Windows Defender Security Center\Systray" /v HideSystray /t REG_DWORD /d 1 /f; + }; + { + reg.exe add "HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Policies\System" /v EnableLUA /t REG_DWORD /d 0 /f + }; + { + netsh.exe advfirewall firewall set rule group="@FirewallAPI.dll,-28752" new enable=Yes; + reg.exe add "HKLM\SYSTEM\CurrentControlSet\Control\Terminal Server" /v fDenyTSConnections /t REG_DWORD /d 0 /f; + }; + { + Set-ExecutionPolicy -Scope 'LocalMachine' -ExecutionPolicy 'RemoteSigned' -Force; + }; + { + reg.exe add "HKLM\SYSTEM\CurrentControlSet\Control\Session Manager\Power" /v HiberbootEnabled /t REG_DWORD /d 0 /f; + }; + { + reg.exe add "HKLM\SOFTWARE\Policies\Microsoft\Dsh" /v AllowNewsAndInterests /t REG_DWORD /d 0 /f; + }; + { + reg.exe add "HKLM\Software\Policies\Microsoft\Windows\CloudContent" /v "DisableWindowsConsumerFeatures" /t REG_DWORD /d 1 /f; + }; + { + reg.exe add "HKLM\SYSTEM\CurrentControlSet\Control\BitLocker" /v "PreventDeviceEncryption" /t REG_DWORD /d 1 /f; + }; + { + reg.exe add "HKLM\SOFTWARE\Policies\Microsoft\Edge" /v HideFirstRunExperience /t REG_DWORD /d 1 /f; + }; + { + Set-ItemProperty -LiteralPath "Registry::HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VisualEffects\ControlAnimations" -Name 'DefaultValue' -Value 0 -Type 'DWord' -Force; + Set-ItemProperty -LiteralPath "Registry::HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VisualEffects\AnimateMinMax" -Name 'DefaultValue' -Value 0 -Type 'DWord' -Force; + Set-ItemProperty -LiteralPath "Registry::HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VisualEffects\TaskbarAnimations" -Name 'DefaultValue' -Value 0 -Type 'DWord' -Force; + Set-ItemProperty -LiteralPath "Registry::HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VisualEffects\DWMAeroPeekEnabled" -Name 'DefaultValue' -Value 0 -Type 'DWord' -Force; + Set-ItemProperty -LiteralPath "Registry::HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VisualEffects\MenuAnimation" -Name 'DefaultValue' -Value 0 -Type 'DWord' -Force; + Set-ItemProperty -LiteralPath "Registry::HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VisualEffects\TooltipAnimation" -Name 'DefaultValue' -Value 0 -Type 'DWord' -Force; + Set-ItemProperty -LiteralPath "Registry::HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VisualEffects\SelectionFade" -Name 'DefaultValue' -Value 0 -Type 'DWord' -Force; + Set-ItemProperty -LiteralPath "Registry::HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VisualEffects\DWMSaveThumbnailEnabled" -Name 'DefaultValue' -Value 0 -Type 'DWord' -Force; + Set-ItemProperty -LiteralPath "Registry::HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VisualEffects\CursorShadow" -Name 'DefaultValue' -Value 0 -Type 'DWord' -Force; + Set-ItemProperty -LiteralPath "Registry::HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VisualEffects\ListviewShadow" -Name 'DefaultValue' -Value 0 -Type 'DWord' -Force; + Set-ItemProperty -LiteralPath "Registry::HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VisualEffects\ThumbnailsOrIcon" -Name 'DefaultValue' -Value 0 -Type 'DWord' -Force; + Set-ItemProperty -LiteralPath "Registry::HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VisualEffects\ListviewAlphaSelect" -Name 'DefaultValue' -Value 0 -Type 'DWord' -Force; + Set-ItemProperty -LiteralPath "Registry::HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VisualEffects\DragFullWindows" -Name 'DefaultValue' -Value 0 -Type 'DWord' -Force; + Set-ItemProperty -LiteralPath "Registry::HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VisualEffects\ComboBoxAnimation" -Name 'DefaultValue' -Value 0 -Type 'DWord' -Force; + Set-ItemProperty -LiteralPath "Registry::HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VisualEffects\FontSmoothing" -Name 'DefaultValue' -Value 0 -Type 'DWord' -Force; + Set-ItemProperty -LiteralPath "Registry::HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VisualEffects\ListBoxSmoothScrolling" -Name 'DefaultValue' -Value 0 -Type 'DWord' -Force; + Set-ItemProperty -LiteralPath "Registry::HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VisualEffects\DropShadow" -Name 'DefaultValue' -Value 0 -Type 'DWord' -Force; + }; +); + +&amp; { + [float] $complete = 0; + [float] $increment = 100 / $scripts.Count; + foreach( $script in $scripts ) { + Write-Progress -Activity 'Running scripts to customize your Windows installation. Do not close this window.' -PercentComplete $complete; + &amp; $script; + $complete += $increment; + } +} *&gt;&amp;1 &gt;&gt; "C:\Windows\Setup\Scripts\Specialize.log"; + </File> + <File path="C:\Windows\Setup\Scripts\UserOnce.ps1"> +$scripts = @( + { + Get-AppxPackage -Name 'Microsoft.Windows.Ai.Copilot.Provider' | Remove-AppxPackage; + }; + { + Set-ItemProperty -LiteralPath 'Registry::HKEY_CURRENT_USER\Software\Microsoft\Windows\CurrentVersion\Explorer\VisualEffects' -Name 'VisualFXSetting' -Type 'DWord' -Value 2 -Force; + }; +); + +&amp; { + [float] $complete = 0; + [float] $increment = 100 / $scripts.Count; + foreach( $script in $scripts ) { + Write-Progress -Activity 'Running scripts to configure this user account. Do not close this window.' -PercentComplete $complete; + &amp; $script; + $complete += $increment; + } +} *&gt;&amp;1 &gt;&gt; "$env:TEMP\UserOnce.log"; + </File> + <File path="C:\Windows\Setup\Scripts\DefaultUser.ps1"> +$scripts = @( + { + reg.exe add "HKU\DefaultUser\Software\Policies\Microsoft\Windows\WindowsCopilot" /v TurnOffWindowsCopilot /t REG_DWORD /d 1 /f; + }; + { + Remove-ItemProperty -LiteralPath 'Registry::HKU\DefaultUser\Software\Microsoft\Windows\CurrentVersion\Run' -Name 'OneDriveSetup' -Force -ErrorAction 'Continue'; + }; + { + reg.exe add "HKU\DefaultUser\Software\Microsoft\Windows\CurrentVersion\GameDVR" /v AppCaptureEnabled /t REG_DWORD /d 0 /f; + }; + { + reg.exe add "HKU\DefaultUser\Software\Microsoft\Windows\CurrentVersion\Explorer\Advanced" /v "HideFileExt" /t REG_DWORD /d 0 /f; + }; + { + reg.exe add "HKU\DefaultUser\Software\Microsoft\Windows\CurrentVersion\Explorer\Advanced" /v "Hidden" /t REG_DWORD /d 1 /f; + }; + { + reg.exe add "HKU\DefaultUser\Software\Microsoft\Edge\SmartScreenEnabled" /ve /t REG_DWORD /d 0 /f; + reg.exe add "HKU\DefaultUser\Software\Microsoft\Edge\SmartScreenPuaEnabled" /ve /t REG_DWORD /d 0 /f; + reg.exe add "HKU\DefaultUser\Software\Microsoft\Windows\CurrentVersion\AppHost" /v EnableWebContentEvaluation /t REG_DWORD /d 0 /f; + reg.exe add "HKU\DefaultUser\Software\Microsoft\Windows\CurrentVersion\AppHost" /v PreventOverride /t REG_DWORD /d 0 /f; + }; + { + $names = @( + 'ContentDeliveryAllowed'; + 'FeatureManagementEnabled'; + 'OEMPreInstalledAppsEnabled'; + 'PreInstalledAppsEnabled'; + 'PreInstalledAppsEverEnabled'; + 'SilentInstalledAppsEnabled'; + 'SoftLandingEnabled'; + 'SubscribedContentEnabled'; + 'SubscribedContent-310093Enabled'; + 'SubscribedContent-338387Enabled'; + 'SubscribedContent-338388Enabled'; + 'SubscribedContent-338389Enabled'; + 'SubscribedContent-338393Enabled'; + 'SubscribedContent-353698Enabled'; + 'SystemPaneSuggestionsEnabled'; + ); + + foreach( $name in $names ) { + reg.exe add "HKU\DefaultUser\Software\Microsoft\Windows\CurrentVersion\ContentDeliveryManager" /v $name /t REG_DWORD /d 0 /f; + } + }; + { + reg.exe add "HKU\DefaultUser\Software\Policies\Microsoft\Windows\Explorer" /v DisableSearchBoxSuggestions /t REG_DWORD /d 1 /f; + }; + { + reg.exe add "HKU\DefaultUser\Software\Microsoft\Windows\CurrentVersion\RunOnce" /v "UnattendedSetup" /t REG_SZ /d "powershell.exe -WindowStyle Normal -NoProfile -Command \""Get-Content -LiteralPath 'C:\Windows\Setup\Scripts\UserOnce.ps1' -Raw | Invoke-Expression;\""" /f; + }; +); + +&amp; { + [float] $complete = 0; + [float] $increment = 100 / $scripts.Count; + foreach( $script in $scripts ) { + Write-Progress -Activity 'Running scripts to modify the default user&#x2019;&#x2019;s registry hive. Do not close this window.' -PercentComplete $complete; + &amp; $script; + $complete += $increment; + } +} *&gt;&amp;1 &gt;&gt; "C:\Windows\Setup\Scripts\DefaultUser.log"; + </File> + <File path="C:\Windows\Setup\Scripts\FirstLogon.ps1"> +$scripts = @( + { + Set-ItemProperty -LiteralPath 'Registry::HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon' -Name 'AutoLogonCount' -Type 'DWord' -Force -Value 0; + }; + { + Disable-ComputerRestore -Drive 'C:\'; + }; + { + Get-Content -LiteralPath 'C:\Windows\Setup\Scripts\VBoxGuestAdditions.ps1' -Raw | Invoke-Expression; + }; + { + Get-Content -LiteralPath 'C:\Windows\Setup\Scripts\VMwareTools.ps1' -Raw | Invoke-Expression; + }; + { + Get-Content -LiteralPath 'C:\Windows\Setup\Scripts\ParallelsTools.ps1' -Raw | Invoke-Expression; + }; + { + Get-Content -LiteralPath 'C:\Windows\Setup\Scripts\VirtIoGuestTools.ps1' -Raw | Invoke-Expression; + }; + { + Get-Content -LiteralPath 'C:\Windows\Setup\Scripts\unattend-01.ps1' -Raw | Invoke-Expression; + }; + + { + cmd.exe /c "rmdir C:\Windows.old"; + }; +); + +&amp; { + [float] $complete = 0; + [float] $increment = 100 / $scripts.Count; + foreach( $script in $scripts ) { + Write-Progress -Activity 'Running scripts to finalize your Windows installation. Do not close this window.' -PercentComplete $complete; + &amp; $script; + $complete += $increment; + } +} *&gt;&amp;1 &gt;&gt; "C:\Windows\Setup\Scripts\FirstLogon.log"; + </File> + </Extensions> </unattend> From aac165e33f4a38e38196433cb0e633cc12cfb437 Mon Sep 17 00:00:00 2001 From: Seth Grover <13872653+mmguero@users.noreply.github.com> Date: Wed, 16 Apr 2025 22:02:40 -0600 Subject: [PATCH 1574/1622] Bump Debian release from 12.9 to 12.10 (#1610) --- CHANGELOG.md | 2 +- os_pkrvars/debian/debian-12-aarch64.pkrvars.hcl | 4 ++-- os_pkrvars/debian/debian-12-x86_64.pkrvars.hcl | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9348c0fd5..690d919fe 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -72,7 +72,7 @@ Markdown table generated at <https://www.tablesgenerator.com/markdown_tables#> - Update freebsd 14 to 14.2 - Update freebsd 13 to 13.5 - Update debian 11 to 11.11 -- Update debian 12 to 12.9 +- Update debian 12 to 12.10 - Update MacOS 14 to 14.6.1 - Update OpenSUSE Leap 15 to 15.6 - Update SLES 15 to 15.6 diff --git a/os_pkrvars/debian/debian-12-aarch64.pkrvars.hcl b/os_pkrvars/debian/debian-12-aarch64.pkrvars.hcl index 06eb5ebe4..587091f24 100644 --- a/os_pkrvars/debian/debian-12-aarch64.pkrvars.hcl +++ b/os_pkrvars/debian/debian-12-aarch64.pkrvars.hcl @@ -1,7 +1,7 @@ os_name = "debian" -os_version = "12.9" +os_version = "12.10" os_arch = "aarch64" -iso_url = "https://cdimage.debian.org/debian-cd/current/arm64/iso-cd/debian-12.9.0-arm64-netinst.iso" +iso_url = "https://cdimage.debian.org/debian-cd/current/arm64/iso-cd/debian-12.10.0-arm64-netinst.iso" iso_checksum = "file:https://cdimage.debian.org/debian-cd/current/arm64/iso-cd/SHA256SUMS" parallels_guest_os_type = "debian" vbox_guest_os_type = "Debian12_arm64" diff --git a/os_pkrvars/debian/debian-12-x86_64.pkrvars.hcl b/os_pkrvars/debian/debian-12-x86_64.pkrvars.hcl index 4c6c90e63..b81c6b64e 100644 --- a/os_pkrvars/debian/debian-12-x86_64.pkrvars.hcl +++ b/os_pkrvars/debian/debian-12-x86_64.pkrvars.hcl @@ -1,7 +1,7 @@ os_name = "debian" -os_version = "12.9" +os_version = "12.10" os_arch = "x86_64" -iso_url = "https://cdimage.debian.org/debian-cd/current/amd64/iso-cd/debian-12.9.0-amd64-netinst.iso" +iso_url = "https://cdimage.debian.org/debian-cd/current/amd64/iso-cd/debian-12.10.0-amd64-netinst.iso" iso_checksum = "file:https://cdimage.debian.org/debian-cd/current/amd64/iso-cd/SHA256SUMS" parallels_guest_os_type = "debian" vbox_guest_os_type = "Debian12_64" From 7218e187af67e3e9204054837f8d1bee62069f05 Mon Sep 17 00:00:00 2001 From: Nils Ballmann <45712604+nsballmann@users.noreply.github.com> Date: Thu, 24 Apr 2025 18:23:43 +0200 Subject: [PATCH 1575/1622] feat(fedora): add Fedora 42 (#1612) Signed-off-by: Nils Ballmann <nils.ballmann@siemens.com> --- .github/workflows/pkr-bld-hyperv-x64.yml | 1 + .github/workflows/pkr-bld-parallels-arm64.yml | 1 + .github/workflows/pkr-bld-parallels-x64.yml | 1 + .github/workflows/pkr-bld-qemu-arm64.yml | 1 + .github/workflows/pkr-bld-qemu-x64.yml | 1 + .github/workflows/pkr-bld-virtualbox-arm64.yml | 1 + .github/workflows/pkr-bld-virtualbox-x64.yml | 1 + .github/workflows/pkr-bld-vmware-arm64.yml | 1 + .github/workflows/pkr-bld-vmware-x64.yml | 1 + .github/workflows/test-pkr-bld-parallels.yml | 1 + builds.yml | 1 + os_pkrvars/fedora/fedora-42-aarch64.pkrvars.hcl | 10 ++++++++++ os_pkrvars/fedora/fedora-42-x86_64.pkrvars.hcl | 9 +++++++++ 13 files changed, 30 insertions(+) create mode 100644 os_pkrvars/fedora/fedora-42-aarch64.pkrvars.hcl create mode 100644 os_pkrvars/fedora/fedora-42-x86_64.pkrvars.hcl diff --git a/.github/workflows/pkr-bld-hyperv-x64.yml b/.github/workflows/pkr-bld-hyperv-x64.yml index 94287ae0a..e05b8c58f 100644 --- a/.github/workflows/pkr-bld-hyperv-x64.yml +++ b/.github/workflows/pkr-bld-hyperv-x64.yml @@ -21,6 +21,7 @@ jobs: - debian-12 - fedora-40 - fedora-41 + - fedora-42 - freebsd-13 - freebsd-14 - opensuse-leap-15 diff --git a/.github/workflows/pkr-bld-parallels-arm64.yml b/.github/workflows/pkr-bld-parallels-arm64.yml index ce9696518..d57a3e4cf 100644 --- a/.github/workflows/pkr-bld-parallels-arm64.yml +++ b/.github/workflows/pkr-bld-parallels-arm64.yml @@ -21,6 +21,7 @@ jobs: - debian-12 - fedora-40 - fedora-41 + - fedora-42 - freebsd-13 - freebsd-14 - opensuse-leap-15 diff --git a/.github/workflows/pkr-bld-parallels-x64.yml b/.github/workflows/pkr-bld-parallels-x64.yml index 96b83055b..1969684e1 100644 --- a/.github/workflows/pkr-bld-parallels-x64.yml +++ b/.github/workflows/pkr-bld-parallels-x64.yml @@ -21,6 +21,7 @@ jobs: - debian-12 - fedora-40 - fedora-41 + - fedora-42 - freebsd-13 - freebsd-14 - opensuse-leap-15 diff --git a/.github/workflows/pkr-bld-qemu-arm64.yml b/.github/workflows/pkr-bld-qemu-arm64.yml index 0c39e0367..4e93a7ce1 100644 --- a/.github/workflows/pkr-bld-qemu-arm64.yml +++ b/.github/workflows/pkr-bld-qemu-arm64.yml @@ -21,6 +21,7 @@ jobs: - debian-12 - fedora-40 - fedora-41 + - fedora-42 - freebsd-13 - freebsd-14 - opensuse-leap-15 diff --git a/.github/workflows/pkr-bld-qemu-x64.yml b/.github/workflows/pkr-bld-qemu-x64.yml index 8c6062e86..3b2e8b988 100644 --- a/.github/workflows/pkr-bld-qemu-x64.yml +++ b/.github/workflows/pkr-bld-qemu-x64.yml @@ -21,6 +21,7 @@ jobs: - debian-12 - fedora-40 - fedora-41 + - fedora-42 - freebsd-13 - freebsd-14 - opensuse-leap-15 diff --git a/.github/workflows/pkr-bld-virtualbox-arm64.yml b/.github/workflows/pkr-bld-virtualbox-arm64.yml index 14b4bdcb5..ceafc7825 100644 --- a/.github/workflows/pkr-bld-virtualbox-arm64.yml +++ b/.github/workflows/pkr-bld-virtualbox-arm64.yml @@ -21,6 +21,7 @@ jobs: - debian-12 - fedora-40 - fedora-41 + - fedora-42 - freebsd-13 - freebsd-14 - opensuse-leap-15 diff --git a/.github/workflows/pkr-bld-virtualbox-x64.yml b/.github/workflows/pkr-bld-virtualbox-x64.yml index fd962b1b8..13eba58ad 100644 --- a/.github/workflows/pkr-bld-virtualbox-x64.yml +++ b/.github/workflows/pkr-bld-virtualbox-x64.yml @@ -21,6 +21,7 @@ jobs: - debian-12 - fedora-40 - fedora-41 + - fedora-42 - freebsd-13 - freebsd-14 - opensuse-leap-15 diff --git a/.github/workflows/pkr-bld-vmware-arm64.yml b/.github/workflows/pkr-bld-vmware-arm64.yml index 12ca0c7fc..7be4caf84 100644 --- a/.github/workflows/pkr-bld-vmware-arm64.yml +++ b/.github/workflows/pkr-bld-vmware-arm64.yml @@ -21,6 +21,7 @@ jobs: - debian-12 - fedora-40 - fedora-41 + - fedora-42 - freebsd-13 - freebsd-14 - opensuse-leap-15 diff --git a/.github/workflows/pkr-bld-vmware-x64.yml b/.github/workflows/pkr-bld-vmware-x64.yml index 6c8cd1c46..911d40fa7 100644 --- a/.github/workflows/pkr-bld-vmware-x64.yml +++ b/.github/workflows/pkr-bld-vmware-x64.yml @@ -21,6 +21,7 @@ jobs: - debian-12 - fedora-40 - fedora-41 + - fedora-42 - freebsd-13 - freebsd-14 - opensuse-leap-15 diff --git a/.github/workflows/test-pkr-bld-parallels.yml b/.github/workflows/test-pkr-bld-parallels.yml index 5fc3d17b0..0c660185e 100644 --- a/.github/workflows/test-pkr-bld-parallels.yml +++ b/.github/workflows/test-pkr-bld-parallels.yml @@ -19,6 +19,7 @@ jobs: - debian-12 - fedora-40 - fedora-41 + - fedora-42 - freebsd-13 - freebsd-14 - opensuse-leap-15 diff --git a/builds.yml b/builds.yml index 9baf1a2e2..59ae5334a 100644 --- a/builds.yml +++ b/builds.yml @@ -15,6 +15,7 @@ public: - debian-12 - fedora-40 - fedora-41 + - fedora-42 - freebsd-13 - freebsd-14 - opensuse-leap-15 diff --git a/os_pkrvars/fedora/fedora-42-aarch64.pkrvars.hcl b/os_pkrvars/fedora/fedora-42-aarch64.pkrvars.hcl new file mode 100644 index 000000000..3e512e4db --- /dev/null +++ b/os_pkrvars/fedora/fedora-42-aarch64.pkrvars.hcl @@ -0,0 +1,10 @@ +os_name = "fedora" +os_version = "42" +os_arch = "aarch64" +iso_url = "https://download.fedoraproject.org/pub/fedora/linux/releases/42/Server/aarch64/iso/Fedora-Server-netinst-aarch64-42-1.1.iso" +iso_checksum = "file:https://download.fedoraproject.org/pub/fedora/linux/releases/42/Server/aarch64/iso/Fedora-Server-42-1.1-aarch64-CHECKSUM" +parallels_guest_os_type = "fedora-core" +vbox_guest_os_type = "Fedora_arm64" +vmware_guest_os_type = "arm-fedora-64" +parallels_boot_wait = "0s" +boot_command = ["<up>e<wait><down><down><end> inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/fedora/ks.cfg inst.repo=https://download.fedoraproject.org/pub/fedora/linux/releases/42/Server/aarch64/os/ <F10><wait>"] diff --git a/os_pkrvars/fedora/fedora-42-x86_64.pkrvars.hcl b/os_pkrvars/fedora/fedora-42-x86_64.pkrvars.hcl new file mode 100644 index 000000000..6f03223a1 --- /dev/null +++ b/os_pkrvars/fedora/fedora-42-x86_64.pkrvars.hcl @@ -0,0 +1,9 @@ +os_name = "fedora" +os_version = "42" +os_arch = "x86_64" +iso_url = "https://download.fedoraproject.org/pub/fedora/linux/releases/42/Server/x86_64/iso/Fedora-Server-netinst-x86_64-42-1.1.iso" +iso_checksum = "file:https://download.fedoraproject.org/pub/fedora/linux/releases/42/Server/x86_64/iso/Fedora-Server-42-1.1-x86_64-CHECKSUM" +parallels_guest_os_type = "fedora-core" +vbox_guest_os_type = "Fedora_64" +vmware_guest_os_type = "fedora-64" +boot_command = ["<wait><up>e<wait><down><down><end> inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/fedora/ks.cfg inst.repo=https://download.fedoraproject.org/pub/fedora/linux/releases/42/Server/x86_64/os/ <F10><wait>"] From a91ea8caeeed688322b0730a4f4f195b59d7ad98 Mon Sep 17 00:00:00 2001 From: akelbikhanov <171678411+akelbikhanov@users.noreply.github.com> Date: Tue, 13 May 2025 20:29:56 +0300 Subject: [PATCH 1576/1622] Fix: prevent cleanup script crash on empty package matches (Debian & Ubuntu) (#1614) Signed-off-by: akelbikhanov <171678411+akelbikhanov@users.noreply.github.com> --- .../scripts/debian/cleanup_debian.sh | 18 ++++++------ .../scripts/ubuntu/cleanup_ubuntu.sh | 28 +++++++++---------- 2 files changed, 23 insertions(+), 23 deletions(-) diff --git a/packer_templates/scripts/debian/cleanup_debian.sh b/packer_templates/scripts/debian/cleanup_debian.sh index 8a6aa48a5..e34a10bc6 100644 --- a/packer_templates/scripts/debian/cleanup_debian.sh +++ b/packer_templates/scripts/debian/cleanup_debian.sh @@ -3,27 +3,27 @@ echo "remove linux-headers" dpkg --list \ | awk '{ print $2 }' \ - | grep 'linux-headers' \ - | xargs apt-get -y purge; + | grep 'linux-headers' || true \ + | xargs -r apt-get -y purge; echo "remove specific Linux kernels, such as linux-image-4.9.0-13-amd64 but keeps the current kernel and does not touch the virtual packages" dpkg --list \ | awk '{ print $2 }' \ - | grep 'linux-image-[1-9].*' \ - | grep -v "$(uname -r)" \ - | xargs apt-get -y purge; + | grep 'linux-image-[1-9].*' || true \ + | grep -v "$(uname -r)" || true \ + | xargs -r apt-get -y purge; echo "remove linux-source package" dpkg --list \ | awk '{ print $2 }' \ - | grep linux-source \ - | xargs apt-get -y purge; + | grep linux-source || true \ + | xargs -r apt-get -y purge; echo "remove all development packages" dpkg --list \ | awk '{ print $2 }' \ - | grep -- '-dev\(:[a-z0-9]\+\)\?$' \ - | xargs apt-get -y purge; + | grep -- '-dev\(:[a-z0-9]\+\)\?$' || true \ + | xargs -r apt-get -y purge; echo "remove X11 libraries" apt-get -y purge libx11-data xauth libxmuu1 libxcb1 libx11-6 libxext6; diff --git a/packer_templates/scripts/ubuntu/cleanup_ubuntu.sh b/packer_templates/scripts/ubuntu/cleanup_ubuntu.sh index a009405f0..7ac788ddd 100644 --- a/packer_templates/scripts/ubuntu/cleanup_ubuntu.sh +++ b/packer_templates/scripts/ubuntu/cleanup_ubuntu.sh @@ -3,41 +3,41 @@ echo "remove linux-headers" dpkg --list \ | awk '{ print $2 }' \ - | grep 'linux-headers' \ - | xargs apt-get -y purge; + | grep 'linux-headers' || true \ + | xargs -r apt-get -y purge; echo "remove specific Linux kernels, such as linux-image-3.11.0-15-generic but keeps the current kernel and does not touch the virtual packages" dpkg --list \ | awk '{ print $2 }' \ - | grep 'linux-image-.*-generic' \ - | grep -v "$(uname -r)" \ - | xargs apt-get -y purge; + | grep 'linux-image-.*-generic' || true \ + | grep -v "$(uname -r)" || true \ + | xargs -r apt-get -y purge; echo "remove old kernel modules packages" dpkg --list \ | awk '{ print $2 }' \ - | grep 'linux-modules-.*-generic' \ - | grep -v "$(uname -r)" \ - | xargs apt-get -y purge; + | grep 'linux-modules-.*-generic' || true \ + | grep -v "$(uname -r)" || true \ + | xargs -r apt-get -y purge; echo "remove linux-source package" dpkg --list \ | awk '{ print $2 }' \ - | grep linux-source \ - | xargs apt-get -y purge; + | grep linux-source || true \ + | xargs -r apt-get -y purge; # 23.10 gives dependency errors for systemd-dev package echo "remove all development packages" dpkg --list \ | awk '{ print $2 }' \ - | grep -- '-dev\(:[a-z0-9]\+\)\?$' \ - | xargs -I % apt-get -y purge % || true; + | grep -- '-dev\(:[a-z0-9]\+\)\?$' || true \ + | xargs -r -I % apt-get -y purge % || true; echo "remove docs packages" dpkg --list \ | awk '{ print $2 }' \ - | grep -- '-doc$' \ - | xargs apt-get -y purge; + | grep -- '-doc$' || true \ + | xargs -r apt-get -y purge; echo "remove X11 libraries" apt-get -y purge libx11-data xauth libxmuu1 libxcb1 libx11-6 libxext6; From 47af20c455cfbef873bf36e244c48bdd077e1bd4 Mon Sep 17 00:00:00 2001 From: akelbikhanov <171678411+akelbikhanov@users.noreply.github.com> Date: Wed, 14 May 2025 01:14:04 +0300 Subject: [PATCH 1577/1622] fix: wrap late_command in sh -c to ensure proper redirection (#1615) Signed-off-by: akelbikhanov <171678411+akelbikhanov@users.noreply.github.com> --- packer_templates/http/debian/preseed.cfg | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/packer_templates/http/debian/preseed.cfg b/packer_templates/http/debian/preseed.cfg index 4d065bc1b..b16f4c9a9 100644 --- a/packer_templates/http/debian/preseed.cfg +++ b/packer_templates/http/debian/preseed.cfg @@ -96,9 +96,8 @@ popularity-contest popularity-contest/participate boolean false # Select base install tasksel tasksel/first multiselect standard, ssh-server -# Setup passwordless sudo for packer user +# Setup passwordless sudo for packer user and remove cdrom from apt sources d-i preseed/late_command string \ -echo "vagrant ALL=(ALL:ALL) NOPASSWD:ALL" > /target/etc/sudoers.d/vagrant && chmod 0440 /target/etc/sudoers.d/vagrant - -# remove cdrom from apt sources -d-i preseed/late_command string sed -i '/^deb cdrom:/s/^/#/' /target/etc/apt/sources.list +sh -c "echo 'vagrant ALL=(ALL:ALL) NOPASSWD:ALL' > /target/etc/sudoers.d/vagrant && \ +chmod 0440 /target/etc/sudoers.d/vagrant && \ +sed -i '/^deb cdrom:/s/^/#/' /target/etc/apt/sources.list" From 16f317197e97be627ddfe5d3bd0c06b7b013eb6b Mon Sep 17 00:00:00 2001 From: Phillip Ross <phillipross@users.noreply.github.com> Date: Mon, 2 Jun 2025 12:58:58 -0400 Subject: [PATCH 1578/1622] update to almalinux 9.6 (#1617) Signed-off-by: Phillip Ross <phillip.w.g.ross@gmail.com> --- os_pkrvars/almalinux/almalinux-9-aarch64.pkrvars.hcl | 4 ++-- os_pkrvars/almalinux/almalinux-9-x86_64.pkrvars.hcl | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/os_pkrvars/almalinux/almalinux-9-aarch64.pkrvars.hcl b/os_pkrvars/almalinux/almalinux-9-aarch64.pkrvars.hcl index 3a73a2b9e..350c54b29 100644 --- a/os_pkrvars/almalinux/almalinux-9-aarch64.pkrvars.hcl +++ b/os_pkrvars/almalinux/almalinux-9-aarch64.pkrvars.hcl @@ -1,7 +1,7 @@ os_name = "almalinux" -os_version = "9.5" +os_version = "9.6" os_arch = "aarch64" -iso_url = "https://repo.almalinux.org/almalinux/9/isos/aarch64/AlmaLinux-9.5-aarch64-boot.iso" +iso_url = "https://repo.almalinux.org/almalinux/9/isos/aarch64/AlmaLinux-9.6-aarch64-boot.iso" iso_checksum = "file:https://repo.almalinux.org/almalinux/9/isos/aarch64/CHECKSUM" parallels_guest_os_type = "centos" vbox_guest_os_type = "Oracle9_arm64" diff --git a/os_pkrvars/almalinux/almalinux-9-x86_64.pkrvars.hcl b/os_pkrvars/almalinux/almalinux-9-x86_64.pkrvars.hcl index 5af09ae10..526c3f82b 100644 --- a/os_pkrvars/almalinux/almalinux-9-x86_64.pkrvars.hcl +++ b/os_pkrvars/almalinux/almalinux-9-x86_64.pkrvars.hcl @@ -1,7 +1,7 @@ os_name = "almalinux" -os_version = "9.5" +os_version = "9.6" os_arch = "x86_64" -iso_url = "https://repo.almalinux.org/almalinux/9/isos/x86_64/AlmaLinux-9.5-x86_64-boot.iso" +iso_url = "https://repo.almalinux.org/almalinux/9/isos/x86_64/AlmaLinux-9.6-x86_64-boot.iso" iso_checksum = "file:https://repo.almalinux.org/almalinux/9/isos/x86_64/CHECKSUM" parallels_guest_os_type = "centos" vbox_guest_os_type = "RedHat_64" From 129e3f074308139869fcae90b91e53cc878925f3 Mon Sep 17 00:00:00 2001 From: Phillip Ross <phillipross@users.noreply.github.com> Date: Thu, 5 Jun 2025 13:37:28 -0400 Subject: [PATCH 1579/1622] update to rockylinux 9.6 (#1618) Signed-off-by: Phillip Ross <phillip.w.g.ross@gmail.com> --- os_pkrvars/rockylinux/rockylinux-9-aarch64.pkrvars.hcl | 4 ++-- os_pkrvars/rockylinux/rockylinux-9-x86_64.pkrvars.hcl | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/os_pkrvars/rockylinux/rockylinux-9-aarch64.pkrvars.hcl b/os_pkrvars/rockylinux/rockylinux-9-aarch64.pkrvars.hcl index 127999e53..e2aa942f4 100644 --- a/os_pkrvars/rockylinux/rockylinux-9-aarch64.pkrvars.hcl +++ b/os_pkrvars/rockylinux/rockylinux-9-aarch64.pkrvars.hcl @@ -1,7 +1,7 @@ os_name = "rockylinux" -os_version = "9.5" +os_version = "9.6" os_arch = "aarch64" -iso_url = "https://download.rockylinux.org/pub/rocky/9/isos/aarch64/Rocky-9.5-aarch64-boot.iso" +iso_url = "https://download.rockylinux.org/pub/rocky/9/isos/aarch64/Rocky-9.6-aarch64-boot.iso" iso_checksum = "file:https://download.rockylinux.org/pub/rocky/9/isos/aarch64/CHECKSUM" parallels_guest_os_type = "centos" vbox_guest_os_type = "Oracle9_arm64" diff --git a/os_pkrvars/rockylinux/rockylinux-9-x86_64.pkrvars.hcl b/os_pkrvars/rockylinux/rockylinux-9-x86_64.pkrvars.hcl index ee4c4501b..7ad513367 100644 --- a/os_pkrvars/rockylinux/rockylinux-9-x86_64.pkrvars.hcl +++ b/os_pkrvars/rockylinux/rockylinux-9-x86_64.pkrvars.hcl @@ -1,7 +1,7 @@ os_name = "rockylinux" -os_version = "9.5" +os_version = "9.6" os_arch = "x86_64" -iso_url = "https://download.rockylinux.org/pub/rocky/9/isos/x86_64/Rocky-9.5-x86_64-boot.iso" +iso_url = "https://download.rockylinux.org/pub/rocky/9/isos/x86_64/Rocky-9.6-x86_64-boot.iso" iso_checksum = "file:https://download.rockylinux.org/pub/rocky/9/isos/x86_64/CHECKSUM" parallels_guest_os_type = "centos" vbox_guest_os_type = "Oracle_64" From b31d44d1309e2451b1198a29842ab8b78e6de217 Mon Sep 17 00:00:00 2001 From: Li-Wen Hsu <lwhsu@lwhsu.org> Date: Wed, 9 Jul 2025 00:03:57 +0800 Subject: [PATCH 1580/1622] Update to FreeBSD 14.3 (#1619) Signed-off-by: Li-Wen Hsu <lwhsu@lwhsu.org> --- os_pkrvars/freebsd/freebsd-14-aarch64.pkrvars.hcl | 6 +++--- os_pkrvars/freebsd/freebsd-14-x86_64.pkrvars.hcl | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/os_pkrvars/freebsd/freebsd-14-aarch64.pkrvars.hcl b/os_pkrvars/freebsd/freebsd-14-aarch64.pkrvars.hcl index e1bdd3964..8351e3449 100644 --- a/os_pkrvars/freebsd/freebsd-14-aarch64.pkrvars.hcl +++ b/os_pkrvars/freebsd/freebsd-14-aarch64.pkrvars.hcl @@ -1,8 +1,8 @@ os_name = "freebsd" -os_version = "14.2" +os_version = "14.3" os_arch = "aarch64" -iso_url = "https://download.freebsd.org/releases/arm64/aarch64/ISO-IMAGES/14.2/FreeBSD-14.2-RELEASE-arm64-aarch64-disc1.iso" -iso_checksum = "file:https://download.freebsd.org/releases/arm64/aarch64/ISO-IMAGES/14.2/CHECKSUM.SHA256-FreeBSD-14.2-RELEASE-arm64-aarch64" +iso_url = "https://download.freebsd.org/releases/arm64/aarch64/ISO-IMAGES/14.3/FreeBSD-14.3-RELEASE-arm64-aarch64-disc1.iso" +iso_checksum = "file:https://download.freebsd.org/releases/arm64/aarch64/ISO-IMAGES/14.3/CHECKSUM.SHA256-FreeBSD-14.3-RELEASE-arm64-aarch64" parallels_guest_os_type = "freebsd" vbox_guest_os_type = "FreeBSD_arm64" vmware_guest_os_type = "arm-freebsd14-64" diff --git a/os_pkrvars/freebsd/freebsd-14-x86_64.pkrvars.hcl b/os_pkrvars/freebsd/freebsd-14-x86_64.pkrvars.hcl index 9c3d5d881..df385512d 100644 --- a/os_pkrvars/freebsd/freebsd-14-x86_64.pkrvars.hcl +++ b/os_pkrvars/freebsd/freebsd-14-x86_64.pkrvars.hcl @@ -1,8 +1,8 @@ os_name = "freebsd" -os_version = "14.2" +os_version = "14.3" os_arch = "x86_64" -iso_url = "https://download.freebsd.org/releases/amd64/amd64/ISO-IMAGES/14.2/FreeBSD-14.2-RELEASE-amd64-disc1.iso" -iso_checksum = "file:https://download.freebsd.org/releases/amd64/amd64/ISO-IMAGES/14.2/CHECKSUM.SHA256-FreeBSD-14.2-RELEASE-amd64" +iso_url = "https://download.freebsd.org/releases/amd64/amd64/ISO-IMAGES/14.3/FreeBSD-14.3-RELEASE-amd64-disc1.iso" +iso_checksum = "file:https://download.freebsd.org/releases/amd64/amd64/ISO-IMAGES/14.3/CHECKSUM.SHA256-FreeBSD-14.3-RELEASE-amd64" parallels_guest_os_type = "freebsd" vbox_guest_os_type = "FreeBSD_64" vmware_guest_os_type = "freebsd-64" From aa1f267196908d460bce03f176e54daff2474101 Mon Sep 17 00:00:00 2001 From: Carlos Rodrigues <937276+carlosefr@users.noreply.github.com> Date: Tue, 15 Jul 2025 23:13:30 +0100 Subject: [PATCH 1581/1622] Fix Debian 12 builds (by updating to 12.11 and adding an EFI fallback) (#1621) * Update Debian 12 to 12.11 This fixes the failing builds due to 12.10's netinst ISO no longer existing under the "current" path. Signed-off-by: Carlos Rodrigues <crodrigues@cloudflare.com> * Fix Debian 12 not booting under ARM64 EFI (e.g. Apple Silicon) The export process does not keep the "debian" boot entry in EFI, and Debian doesn't put a "removable" entry in place by default. Signed-off-by: Carlos Rodrigues <crodrigues@cloudflare.com> --------- Signed-off-by: Carlos Rodrigues <crodrigues@cloudflare.com> --- os_pkrvars/debian/debian-12-aarch64.pkrvars.hcl | 4 ++-- os_pkrvars/debian/debian-12-x86_64.pkrvars.hcl | 4 ++-- packer_templates/scripts/debian/cleanup_debian.sh | 5 +++++ 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/os_pkrvars/debian/debian-12-aarch64.pkrvars.hcl b/os_pkrvars/debian/debian-12-aarch64.pkrvars.hcl index 587091f24..6a1bfb40a 100644 --- a/os_pkrvars/debian/debian-12-aarch64.pkrvars.hcl +++ b/os_pkrvars/debian/debian-12-aarch64.pkrvars.hcl @@ -1,7 +1,7 @@ os_name = "debian" -os_version = "12.10" +os_version = "12.11" os_arch = "aarch64" -iso_url = "https://cdimage.debian.org/debian-cd/current/arm64/iso-cd/debian-12.10.0-arm64-netinst.iso" +iso_url = "https://cdimage.debian.org/debian-cd/current/arm64/iso-cd/debian-12.11.0-arm64-netinst.iso" iso_checksum = "file:https://cdimage.debian.org/debian-cd/current/arm64/iso-cd/SHA256SUMS" parallels_guest_os_type = "debian" vbox_guest_os_type = "Debian12_arm64" diff --git a/os_pkrvars/debian/debian-12-x86_64.pkrvars.hcl b/os_pkrvars/debian/debian-12-x86_64.pkrvars.hcl index b81c6b64e..30c1a1913 100644 --- a/os_pkrvars/debian/debian-12-x86_64.pkrvars.hcl +++ b/os_pkrvars/debian/debian-12-x86_64.pkrvars.hcl @@ -1,7 +1,7 @@ os_name = "debian" -os_version = "12.10" +os_version = "12.11" os_arch = "x86_64" -iso_url = "https://cdimage.debian.org/debian-cd/current/amd64/iso-cd/debian-12.10.0-amd64-netinst.iso" +iso_url = "https://cdimage.debian.org/debian-cd/current/amd64/iso-cd/debian-12.11.0-amd64-netinst.iso" iso_checksum = "file:https://cdimage.debian.org/debian-cd/current/amd64/iso-cd/SHA256SUMS" parallels_guest_os_type = "debian" vbox_guest_os_type = "Debian12_64" diff --git a/packer_templates/scripts/debian/cleanup_debian.sh b/packer_templates/scripts/debian/cleanup_debian.sh index e34a10bc6..0c8104d4d 100644 --- a/packer_templates/scripts/debian/cleanup_debian.sh +++ b/packer_templates/scripts/debian/cleanup_debian.sh @@ -1,5 +1,10 @@ #!/bin/sh -eux +if [ -d /sys/firmware/efi ]; then + # Ensure the system can boot by adding the bootloader at the fallback path + grub-install --target=$(dpkg --print-architecture)-efi --efi-directory=/boot/efi --bootloader-id=debian --removable +fi + echo "remove linux-headers" dpkg --list \ | awk '{ print $2 }' \ From 3a47cb74f277418a6a0b939c977369dd19562f45 Mon Sep 17 00:00:00 2001 From: Corey Hemminger <hemminger@hotmail.com> Date: Sun, 10 Aug 2025 09:23:20 -0500 Subject: [PATCH 1582/1622] os-updates (#1622) * os-updates --------- Signed-off-by: Corey Hemminger <hemminger@hotmail.com> --- .../workflows/pkr-bld-amazonlinux-arm64.yml | 12 +- .github/workflows/pkr-bld-amazonlinux-x64.yml | 10 +- .github/workflows/pkr-bld-hyperv-x64.yml | 17 +- .github/workflows/pkr-bld-parallels-arm64.yml | 17 +- .github/workflows/pkr-bld-parallels-x64.yml | 14 +- .github/workflows/pkr-bld-qemu-arm64.yml | 46 +-- .github/workflows/pkr-bld-qemu-x64.yml | 14 +- .../workflows/pkr-bld-virtualbox-arm64.yml | 54 ++- .github/workflows/pkr-bld-virtualbox-x64.yml | 16 +- .github/workflows/pkr-bld-vmware-arm64.yml | 179 ++-------- .github/workflows/pkr-bld-vmware-x64.yml | 55 ++- .github/workflows/test-pkr-bld-parallels.yml | 15 +- CHANGELOG.md | 99 +++--- amazonlinux-2023-aarch64-virtualbox-build.sh | 2 +- builds.yml | 11 +- lib/bento/buildmetadata.rb | 9 +- lib/bento/test.rb | 3 + lib/bento/test_templates/bootstrap.sh.erb | 2 +- lib/bento/upload.rb | 2 +- lib/bento/version.rb | 2 +- .../almalinux-10-aarch64.pkrvars.hcl | 9 + .../almalinux/almalinux-10-x86_64.pkrvars.hcl | 9 + .../debian/debian-11-aarch64.pkrvars.hcl | 9 - .../debian/debian-11-x86_64.pkrvars.hcl | 9 - .../debian/debian-12-aarch64.pkrvars.hcl | 4 +- .../debian/debian-12-x86_64.pkrvars.hcl | 4 +- .../debian/debian-13-aarch64.pkrvars.hcl | 10 + .../debian/debian-13-x86_64.pkrvars.hcl | 9 + .../fedora/fedora-40-aarch64.pkrvars.hcl | 9 - .../fedora/fedora-40-x86_64.pkrvars.hcl | 9 - os_pkrvars/macos/macos-14-aarch64.pkrvars.hcl | 7 +- os_pkrvars/macos/macos-15-aarch64.pkrvars.hcl | 23 +- .../oraclelinux-10-aarch64.pkrvars.hcl | 9 + .../oraclelinux-10-x86_64.pkrvars.hcl | 9 + .../oraclelinux-9-aarch64.pkrvars.hcl | 6 +- .../oraclelinux-9-x86_64.pkrvars.hcl | 6 +- os_pkrvars/rhel/rhel-10-aarch64.pkrvars.hcl | 9 + os_pkrvars/rhel/rhel-10-x86_64.pkrvars.hcl | 9 + os_pkrvars/rhel/rhel-9-aarch64.pkrvars.hcl | 2 +- os_pkrvars/rhel/rhel-9-x86_64.pkrvars.hcl | 2 +- .../rockylinux-10-aarch64.pkrvars.hcl | 9 + .../rockylinux-10-x86_64.pkrvars.hcl | 9 + os_pkrvars/sles/sles-15-aarch64.pkrvars.hcl | 4 +- os_pkrvars/sles/sles-15-x86_64.pkrvars.hcl | 4 +- .../ubuntu/ubuntu-24.04-aarch64.pkrvars.hcl | 2 +- .../ubuntu/ubuntu-24.04-x86_64.pkrvars.hcl | 2 +- .../windows/windows-10-x86_64.pkrvars.hcl | 10 - .../windows/windows-11-aarch64.pkrvars.hcl | 2 +- packer_templates/http/debian/preseed.cfg | 5 - packer_templates/pkr-builder.pkr.hcl | 211 ++++++------ packer_templates/pkr-plugins.pkr.hcl | 33 ++ packer_templates/pkr-sources.pkr.hcl | 4 +- .../scripts/_common/build_tools.sh | 48 +++ ...{parallels.sh => guest_tools_parallels.sh} | 21 +- ...irtualbox.sh => guest_tools_virtualbox.sh} | 41 ++- .../scripts/_common/guest_tools_vmware.sh | 58 ++++ packer_templates/scripts/_common/metadata.sh | 6 - packer_templates/scripts/_common/minimize.sh | 95 ++++-- packer_templates/scripts/_common/motd.sh | 7 + packer_templates/scripts/_common/sshd.sh | 7 + .../scripts/_common/update_packages.sh | 93 +++++ packer_templates/scripts/_common/vagrant.sh | 29 +- packer_templates/scripts/_common/vmware.sh | 38 --- .../scripts/debian/cleanup_debian.sh | 2 +- .../scripts/debian/update_debian.sh | 26 -- .../scripts/fedora/build-tools_fedora.sh | 3 - packer_templates/scripts/fedora/update_dnf.sh | 7 - .../scripts/freebsd/minimize_freebsd.sh | 16 - .../scripts/freebsd/update_freebsd.sh | 16 - .../scripts/freebsd/vmtools_freebsd.sh | 54 --- .../scripts/macos/parallels-tools.sh | 12 - packer_templates/scripts/macos/shrink.sh | 37 -- .../scripts/macos/system-update.sh | 4 - packer_templates/scripts/macos/vagrant.sh | 30 -- .../scripts/macos/vmware-tools.sh | 48 --- packer_templates/scripts/rhel/update_dnf.sh | 7 - packer_templates/scripts/suse/update_suse.sh | 6 - .../scripts/ubuntu/update_ubuntu.sh | 35 -- .../win_answer_files/10/Autounattend.xml | 301 ---------------- .../10/hyperv-gen2/Autounattend.xml | 320 ------------------ 80 files changed, 835 insertions(+), 1569 deletions(-) create mode 100644 os_pkrvars/almalinux/almalinux-10-aarch64.pkrvars.hcl create mode 100644 os_pkrvars/almalinux/almalinux-10-x86_64.pkrvars.hcl delete mode 100644 os_pkrvars/debian/debian-11-aarch64.pkrvars.hcl delete mode 100644 os_pkrvars/debian/debian-11-x86_64.pkrvars.hcl create mode 100644 os_pkrvars/debian/debian-13-aarch64.pkrvars.hcl create mode 100644 os_pkrvars/debian/debian-13-x86_64.pkrvars.hcl delete mode 100644 os_pkrvars/fedora/fedora-40-aarch64.pkrvars.hcl delete mode 100644 os_pkrvars/fedora/fedora-40-x86_64.pkrvars.hcl create mode 100644 os_pkrvars/oraclelinux/oraclelinux-10-aarch64.pkrvars.hcl create mode 100644 os_pkrvars/oraclelinux/oraclelinux-10-x86_64.pkrvars.hcl create mode 100644 os_pkrvars/rhel/rhel-10-aarch64.pkrvars.hcl create mode 100644 os_pkrvars/rhel/rhel-10-x86_64.pkrvars.hcl create mode 100644 os_pkrvars/rockylinux/rockylinux-10-aarch64.pkrvars.hcl create mode 100644 os_pkrvars/rockylinux/rockylinux-10-x86_64.pkrvars.hcl delete mode 100644 os_pkrvars/windows/windows-10-x86_64.pkrvars.hcl create mode 100644 packer_templates/pkr-plugins.pkr.hcl create mode 100644 packer_templates/scripts/_common/build_tools.sh rename packer_templates/scripts/_common/{parallels.sh => guest_tools_parallels.sh} (62%) rename packer_templates/scripts/_common/{virtualbox.sh => guest_tools_virtualbox.sh} (64%) create mode 100644 packer_templates/scripts/_common/guest_tools_vmware.sh delete mode 100755 packer_templates/scripts/_common/metadata.sh create mode 100644 packer_templates/scripts/_common/update_packages.sh delete mode 100644 packer_templates/scripts/_common/vmware.sh delete mode 100644 packer_templates/scripts/debian/update_debian.sh delete mode 100644 packer_templates/scripts/fedora/build-tools_fedora.sh delete mode 100644 packer_templates/scripts/fedora/update_dnf.sh delete mode 100644 packer_templates/scripts/freebsd/minimize_freebsd.sh delete mode 100644 packer_templates/scripts/freebsd/update_freebsd.sh delete mode 100644 packer_templates/scripts/freebsd/vmtools_freebsd.sh delete mode 100644 packer_templates/scripts/macos/parallels-tools.sh delete mode 100644 packer_templates/scripts/macos/shrink.sh delete mode 100644 packer_templates/scripts/macos/system-update.sh delete mode 100644 packer_templates/scripts/macos/vagrant.sh delete mode 100644 packer_templates/scripts/macos/vmware-tools.sh delete mode 100644 packer_templates/scripts/rhel/update_dnf.sh delete mode 100644 packer_templates/scripts/suse/update_suse.sh delete mode 100644 packer_templates/scripts/ubuntu/update_ubuntu.sh delete mode 100644 packer_templates/win_answer_files/10/Autounattend.xml delete mode 100644 packer_templates/win_answer_files/10/hyperv-gen2/Autounattend.xml diff --git a/.github/workflows/pkr-bld-amazonlinux-arm64.yml b/.github/workflows/pkr-bld-amazonlinux-arm64.yml index 94b9ba8b6..342c2bacb 100644 --- a/.github/workflows/pkr-bld-amazonlinux-arm64.yml +++ b/.github/workflows/pkr-bld-amazonlinux-arm64.yml @@ -8,7 +8,7 @@ env: jobs: aarch64: - runs-on: macos-latest + runs-on: [self-hosted, ARM64, virtualbox] strategy: fail-fast: false matrix: @@ -46,6 +46,11 @@ jobs: ./${{ matrix.os }}-aarch64-virtualbox-build.sh ls -alh builds cat builds/${{ matrix.os }}*-x86_64._metadata.json + - name: Bento Test + run: | + eval "$(chef shell-init bash)" + export LOGNAME=$USER + bento test - name: Upload build artifact uses: actions/upload-artifact@v4 with: @@ -56,8 +61,3 @@ jobs: overwrite: true retention-days: 10 compression-level: 0 # no compression - - name: Bento Test - run: | - eval "$(chef shell-init bash)" - export LOGNAME=$USER - bento test diff --git a/.github/workflows/pkr-bld-amazonlinux-x64.yml b/.github/workflows/pkr-bld-amazonlinux-x64.yml index 33e1bad27..9111a0526 100644 --- a/.github/workflows/pkr-bld-amazonlinux-x64.yml +++ b/.github/workflows/pkr-bld-amazonlinux-x64.yml @@ -51,6 +51,11 @@ jobs: ./${{ matrix.os }}-x86_64-virtualbox-build.sh ls -alh builds cat builds/${{ matrix.os }}*-x86_64._metadata.json + - name: Bento Test + run: | + eval "$(chef shell-init bash)" + export LOGNAME=$USER + bento test - name: Upload build artifact uses: actions/upload-artifact@v4 with: @@ -61,8 +66,3 @@ jobs: overwrite: true retention-days: 10 compression-level: 0 # no compression - - name: Bento Test - run: | - eval "$(chef shell-init bash)" - export LOGNAME=$USER - bento test diff --git a/.github/workflows/pkr-bld-hyperv-x64.yml b/.github/workflows/pkr-bld-hyperv-x64.yml index e05b8c58f..a6d6f81b0 100644 --- a/.github/workflows/pkr-bld-hyperv-x64.yml +++ b/.github/workflows/pkr-bld-hyperv-x64.yml @@ -15,11 +15,11 @@ jobs: os: - almalinux-8 - almalinux-9 + - almalinux-10 - centos-stream-9 - centos-stream-10 - - debian-11 - debian-12 - - fedora-40 + - debian-13 - fedora-41 - fedora-42 - freebsd-13 @@ -27,8 +27,10 @@ jobs: - opensuse-leap-15 - oraclelinux-8 - oraclelinux-9 + - oraclelinux-10 - rockylinux-8 - rockylinux-9 + - rockylinux-10 - ubuntu-22.04 - ubuntu-24.04 provider: @@ -54,11 +56,16 @@ jobs: run: | Get-PsDrive -PsProvider FileSystem pwd - New-VMSwitch -Name "bento" -NetAdapterName "Ethernet" -AllowManagementOS $true + $adapter = (Get-NetAdapter | Where-Object { $_.Status -eq "Up" })[0].Name + New-VMSwitch -Name "bento" -NetAdapterName $adapter -AllowManagementOS $true - name: Packer Init run: packer init -upgrade packer_templates - name: Packer build run: packer build -timestamp-ui -only="${{ matrix.provider }}.vm" -var 'ssh_timeout=30m' -var 'sources_enabled=["hyperv-iso.vm"]' -var-file="os_pkrvars/$("${{ matrix.os }}".Split('-')[0])/${{ matrix.os }}-x86_64.pkrvars.hcl" packer_templates + - name: Bento Test + run: | + chef shell-init powershell + bento test - name: Upload build artifact uses: actions/upload-artifact@v4 with: @@ -69,7 +76,3 @@ jobs: overwrite: true retention-days: 10 compression-level: 0 # no compression - - name: Bento Test - run: | - chef shell-init powershell - bento test diff --git a/.github/workflows/pkr-bld-parallels-arm64.yml b/.github/workflows/pkr-bld-parallels-arm64.yml index d57a3e4cf..ef850d0f4 100644 --- a/.github/workflows/pkr-bld-parallels-arm64.yml +++ b/.github/workflows/pkr-bld-parallels-arm64.yml @@ -13,22 +13,21 @@ jobs: fail-fast: false matrix: os: - - almalinux-8 - almalinux-9 + - almalinux-10 - centos-stream-9 - centos-stream-10 - - debian-11 - debian-12 - - fedora-40 + - debian-13 - fedora-41 - fedora-42 - freebsd-13 - freebsd-14 - opensuse-leap-15 - - oraclelinux-8 - oraclelinux-9 - - rockylinux-8 + - oraclelinux-10 - rockylinux-9 + - rockylinux-10 - ubuntu-22.04 - ubuntu-24.04 provider: @@ -56,6 +55,10 @@ jobs: sleep 1 prlctl delete "$VM" 2> /dev/null sleep 2 + - name: Bento Test + run: | + eval "$(chef shell-init bash)" + bento test - name: Upload build artifact uses: actions/upload-artifact@v4 with: @@ -66,7 +69,3 @@ jobs: overwrite: true retention-days: 10 compression-level: 0 # no compression - - name: Bento Test - run: | - eval "$(chef shell-init bash)" - bento test diff --git a/.github/workflows/pkr-bld-parallels-x64.yml b/.github/workflows/pkr-bld-parallels-x64.yml index 1969684e1..50c8d55b0 100644 --- a/.github/workflows/pkr-bld-parallels-x64.yml +++ b/.github/workflows/pkr-bld-parallels-x64.yml @@ -15,11 +15,11 @@ jobs: os: - almalinux-8 - almalinux-9 + - almalinux-10 - centos-stream-9 - centos-stream-10 - - debian-11 - debian-12 - - fedora-40 + - debian-13 - fedora-41 - fedora-42 - freebsd-13 @@ -27,8 +27,10 @@ jobs: - opensuse-leap-15 - oraclelinux-8 - oraclelinux-9 + - oraclelinux-10 - rockylinux-8 - rockylinux-9 + - rockylinux-10 - ubuntu-22.04 - ubuntu-24.04 provider: @@ -55,6 +57,10 @@ jobs: sleep 1 prlctl delete "$VM" 2> /dev/null sleep 2 + - name: Bento Test + run: | + eval "$(chef shell-init bash)" + bento test - name: Upload build artifact uses: actions/upload-artifact@v4 with: @@ -65,7 +71,3 @@ jobs: overwrite: true retention-days: 10 compression-level: 0 # no compression - - name: Bento Test - run: | - eval "$(chef shell-init bash)" - bento test diff --git a/.github/workflows/pkr-bld-qemu-arm64.yml b/.github/workflows/pkr-bld-qemu-arm64.yml index 4e93a7ce1..a7a27197d 100644 --- a/.github/workflows/pkr-bld-qemu-arm64.yml +++ b/.github/workflows/pkr-bld-qemu-arm64.yml @@ -8,27 +8,26 @@ env: jobs: aarch64: - runs-on: macos-latest + runs-on: [self-hosted, ARM64, qemu] strategy: fail-fast: false matrix: os: - - almalinux-8 - almalinux-9 + - almalinux-10 - centos-stream-9 - centos-stream-10 - - debian-11 - debian-12 - - fedora-40 + - debian-13 - fedora-41 - fedora-42 - freebsd-13 - freebsd-14 - opensuse-leap-15 - - oraclelinux-8 - oraclelinux-9 - - rockylinux-8 + - oraclelinux-10 - rockylinux-9 + - rockylinux-10 - ubuntu-22.04 - ubuntu-24.04 provider: @@ -36,34 +35,21 @@ jobs: steps: - name: Checkout uses: actions/checkout@main - - name: Install Vagrant QEMU - run: | - brew tap hashicorp/tap - brew update - brew install qemu - brew install libvirt - brew install --cask hashicorp/tap/hashicorp-vagrant - brew services start libvirt - vagrant plugin install vagrant-libvirt vagrant-qemu - - name: Install Chef - uses: actionshub/chef-install@3.0.0 - with: - version: 24.2.1058 - - name: Setup Packer - uses: hashicorp/setup-packer@main - with: - version: latest - - name: Install Bento - run: | - eval "$(chef shell-init bash)" - gem build bento.gemspec - gem install bento-*.gem +# - name: Setup Packer +# if: steps.verify-changed-files.outputs.files_changed == 'true' +# uses: hashicorp/setup-packer@main +# with: +# version: latest - name: Bento build run: | eval "$(chef shell-init bash)" bento build -o ${{ matrix.provider }}.vm --vars 'ssh_timeout=30m' --vars "qemu_accelerator=hvf" os_pkrvars/$(echo ${{ matrix.os }} | cut -d "-" -f 1)/"${{ matrix.os }}-aarch64.pkrvars.hcl" ls -alh builds/ cat builds/${{ matrix.os }}*-aarch64._metadata.json + - name: Bento Test + run: | + eval "$(chef shell-init bash)" + bento test libvirt - name: Upload build artifact uses: actions/upload-artifact@v4 with: @@ -74,7 +60,3 @@ jobs: overwrite: true retention-days: 10 compression-level: 0 # no compression - - name: Bento Test - run: | - eval "$(chef shell-init bash)" - bento test libvirt diff --git a/.github/workflows/pkr-bld-qemu-x64.yml b/.github/workflows/pkr-bld-qemu-x64.yml index 3b2e8b988..b191649d5 100644 --- a/.github/workflows/pkr-bld-qemu-x64.yml +++ b/.github/workflows/pkr-bld-qemu-x64.yml @@ -15,11 +15,11 @@ jobs: os: - almalinux-8 - almalinux-9 + - almalinux-10 - centos-stream-9 - centos-stream-10 - - debian-11 - debian-12 - - fedora-40 + - debian-13 - fedora-41 - fedora-42 - freebsd-13 @@ -27,8 +27,10 @@ jobs: - opensuse-leap-15 - oraclelinux-8 - oraclelinux-9 + - oraclelinux-10 - rockylinux-8 - rockylinux-9 + - rockylinux-10 - ubuntu-22.04 - ubuntu-24.04 provider: @@ -76,6 +78,10 @@ jobs: bento build -o ${{ matrix.provider }}.vm --vars 'ssh_timeout=30m' --vars "qemu_accelerator=kvm" os_pkrvars/$(echo ${{ matrix.os }} | cut -d "-" -f 1)/"${{ matrix.os }}-x86_64.pkrvars.hcl" ls -alh builds/ cat builds/${{ matrix.os }}*-x86_64._metadata.json + - name: Bento Test + run: | + eval "$(chef shell-init bash)" + bento test libvirt - name: Upload build artifact uses: actions/upload-artifact@v4 with: @@ -86,7 +92,3 @@ jobs: overwrite: true retention-days: 10 compression-level: 0 # no compression - - name: Bento Test - run: | - eval "$(chef shell-init bash)" - bento test libvirt diff --git a/.github/workflows/pkr-bld-virtualbox-arm64.yml b/.github/workflows/pkr-bld-virtualbox-arm64.yml index ceafc7825..5bf795560 100644 --- a/.github/workflows/pkr-bld-virtualbox-arm64.yml +++ b/.github/workflows/pkr-bld-virtualbox-arm64.yml @@ -8,27 +8,26 @@ env: jobs: aarch64: - runs-on: macos-latest + runs-on: [self-hosted, ARM64, virtualbox] strategy: fail-fast: false matrix: os: - - almalinux-8 - almalinux-9 + - almalinux-10 - centos-stream-9 - centos-stream-10 - - debian-11 - debian-12 - - fedora-40 + - debian-13 - fedora-41 - fedora-42 - freebsd-13 - freebsd-14 - opensuse-leap-15 - - oraclelinux-8 - oraclelinux-9 - - rockylinux-8 + - oraclelinux-10 - rockylinux-9 + - rockylinux-10 - ubuntu-22.04 - ubuntu-24.04 provider: @@ -36,42 +35,37 @@ jobs: steps: - name: Checkout uses: actions/checkout@main - - name: Install Vagrant Virtualbox - run: | - brew tap hashicorp/tap - brew update - brew install --cask hashicorp/tap/hashicorp-vagrant - brew install --cask virtualbox - - name: Install Chef - uses: actionshub/chef-install@3.0.0 - with: - version: 24.2.1058 - - name: Setup Packer - uses: hashicorp/setup-packer@main - with: - version: latest - - name: Install Bento - run: | - eval "$(chef shell-init bash)" - gem build bento.gemspec - gem install bento-*.gem +# - name: Setup Packer +# if: steps.verify-changed-files.outputs.files_changed == 'true' +# uses: hashicorp/setup-packer@main +# with: +# version: latest - name: Bento build run: | eval "$(chef shell-init bash)" bento build -o ${{ matrix.provider }}.vm --vars 'ssh_timeout=30m' os_pkrvars/$(echo ${{ matrix.os }} | cut -d "-" -f 1)/"${{ matrix.os }}-aarch64.pkrvars.hcl" ls -alh builds/ cat builds/${{ matrix.os }}*-aarch64._metadata.json + - name: Remove VM in case of canceled job + if: cancelled() + run: | + VM="$(prlctl list -a | grep ${{ matrix.os }} | cut -d " " -f 1)" + echo Powering off and deleting any existing VMs named ${{ matrix.os }}*-aarch64 + prlctl stop "$VM" --kill 2> /dev/null + sleep 1 + prlctl delete "$VM" 2> /dev/null + sleep 2 + - name: Bento Test + run: | + eval "$(chef shell-init bash)" + bento test - name: Upload build artifact uses: actions/upload-artifact@v4 with: - name: "${{ matrix.os }}-virtualbox-aarch64" + name: "${{ matrix.os }}-parallels-aarch64" path: | builds/*.box builds/*.json overwrite: true retention-days: 10 compression-level: 0 # no compression - - name: Bento Test - run: | - eval "$(chef shell-init bash)" - bento test diff --git a/.github/workflows/pkr-bld-virtualbox-x64.yml b/.github/workflows/pkr-bld-virtualbox-x64.yml index 13eba58ad..9b6838fdd 100644 --- a/.github/workflows/pkr-bld-virtualbox-x64.yml +++ b/.github/workflows/pkr-bld-virtualbox-x64.yml @@ -15,11 +15,11 @@ jobs: os: - almalinux-8 - almalinux-9 + - almalinux-10 - centos-stream-9 - centos-stream-10 - - debian-11 - debian-12 - - fedora-40 + - debian-13 - fedora-41 - fedora-42 - freebsd-13 @@ -27,8 +27,10 @@ jobs: - opensuse-leap-15 - oraclelinux-8 - oraclelinux-9 + - oraclelinux-10 - rockylinux-8 - rockylinux-9 + - rockylinux-10 - ubuntu-22.04 - ubuntu-24.04 provider: @@ -68,6 +70,11 @@ jobs: bento build -o ${{ matrix.provider }}.vm --vars 'ssh_timeout=30m' os_pkrvars/$(echo ${{ matrix.os }} | cut -d "-" -f 1)/"${{ matrix.os }}-x86_64.pkrvars.hcl" ls -alh builds/ cat builds/${{ matrix.os }}*-x86_64._metadata.json + - name: Bento Test + run: | + eval "$(chef shell-init bash)" + export LOGNAME=$USER + bento test - name: Upload build artifact uses: actions/upload-artifact@v4 with: @@ -78,8 +85,3 @@ jobs: overwrite: true retention-days: 10 compression-level: 0 # no compression - - name: Bento Test - run: | - eval "$(chef shell-init bash)" - export LOGNAME=$USER - bento test diff --git a/.github/workflows/pkr-bld-vmware-arm64.yml b/.github/workflows/pkr-bld-vmware-arm64.yml index 7be4caf84..203afaf57 100644 --- a/.github/workflows/pkr-bld-vmware-arm64.yml +++ b/.github/workflows/pkr-bld-vmware-arm64.yml @@ -8,27 +8,26 @@ env: jobs: aarch64: - runs-on: macos-latest + runs-on: [self-hosted, ARM64, vmware] strategy: fail-fast: false matrix: os: - - almalinux-8 - almalinux-9 + - almalinux-10 - centos-stream-9 - centos-stream-10 - - debian-11 - debian-12 - - fedora-40 + - debian-13 - fedora-41 - fedora-42 - freebsd-13 - freebsd-14 - opensuse-leap-15 - - oraclelinux-8 - oraclelinux-9 - - rockylinux-8 + - oraclelinux-10 - rockylinux-9 + - rockylinux-10 - ubuntu-22.04 - ubuntu-24.04 provider: @@ -36,167 +35,37 @@ jobs: steps: - name: Checkout uses: actions/checkout@main - - name: Install Vagrant VMware-fusion - run: | - brew tap hashicorp/tap - brew update - brew install --cask hashicorp/tap/hashicorp-vagrant - brew install --cask vmware-fusion - brew install --cask vagrant-vmware-utility - vagrant plugin install vagrant-vmware-desktop - sudo mkdir -p /Library/Preferences/VMware\ Fusion/vmnet8 - NETWORKING_CONF="/Library/Preferences/VMware Fusion/networking" - DHCPD_CONF="/Library/Preferences/VMware Fusion/vmnet8/dhcpd.conf" - NAT_CONF="/Library/Preferences/VMware Fusion/vmnet8/nat.conf" - NAT_MAC_CONF="/Library/Preferences/VMware Fusion/vmnet8/nat.mac" - DHCPD_CONFIG=' - # Configuration file for ISC 2.0 vmnet-dhcpd operating on vmnet8. - # - # This file was automatically generated by the VMware configuration program. - # See Instructions below if you want to modify it. - # - # We set domain-name-servers to make some DHCP clients happy - # (dhclient as configured in SuSE, TurboLinux, etc.). - # We also supply a domain name to make pump (Red Hat 6.x) happy. - # - ###### VMNET DHCP Configuration. Start of "DO NOT MODIFY SECTION" ##### - # Modification Instructions: This section of the configuration file contains - # information generated by the configuration program. Do not modify this - # section. - # You are free to modify everything else. Also, this section must start - # on a new line - # This file will get backed up with a different name in the same directory - # if this section is edited and you try to configure DHCP again. - - # Written at: 01/13/2025 14:31:48 - allow unknown-clients; - default-lease-time 1800; # default is 30 minutes - max-lease-time 7200; # default is 2 hours - - subnet 172.16.38.0 netmask 255.255.255.0 { - range 172.16.38.128 172.16.38.254; - option broadcast-address 172.16.38.255; - option domain-name-servers 172.16.38.2; - option domain-name localdomain; - default-lease-time 1800; # default is 30 minutes - max-lease-time 7200; # default is 2 hours - option netbios-name-servers 172.16.38.2; - option routers 172.16.38.2; - } - host vmnet8 { - hardware ethernet 00:50:56:C0:00:08; - fixed-address 172.16.38.1; - option domain-name-servers 0.0.0.0; - option domain-name ""; - option routers 0.0.0.0; - } - ####### VMNET DHCP Configuration. End of "DO NOT MODIFY SECTION" ####### - ' - NAT_CONFIG=" - # VMware NAT configuration file - # Manual editing of this file is not recommended. Using UI is preferred. - [host] - # Use MacOS network virtualization API - useMacosVmnetVirtApi = 1 - # NAT gateway address - ip = 172.16.38.2 - netmask = 255.255.255.0 - # VMnet device if not specified on command line - device = vmnet8 - # Allow PORT/EPRT FTP commands (they need incoming TCP stream ...) - activeFTP = 1 - # Allows the source to have any OUI. Turn this on if you change the OUI - # in the MAC address of your virtual machines. - allowAnyOUI = 1 - # VMnet host IP address - hostIp = 172.16.38.1 - # Controls if (TCP) connections should be reset when the adapter they are - # bound to goes down - resetConnectionOnLinkDown = 1 - # Controls if (TCP) connection should be reset when guest packet's destination - # is NAT's IP address - resetConnectionOnDestLocalHost = 1 - # Controls if enable nat ipv6 - natIp6Enable = 0 - # Controls if enable nat ipv6 - natIp6Prefix = fd15:4ba5:5a2b:1008::/64 - [tcp] - # Value of timeout in TCP TIME_WAIT state, in seconds - timeWaitTimeout = 30 - [udp] - # Timeout in seconds. Dynamically-created UDP mappings will purged if - # idle for this duration of time 0 = no timeout, default = 60; real - # value might be up to 100% longer - timeout = 60 - [netbios] - # Timeout for NBNS queries. - nbnsTimeout = 2 - # Number of retries for each NBNS query. - nbnsRetries = 3 - # Timeout for NBDS queries. - nbdsTimeout = 3 - [incomingtcp] - # Use these with care - anyone can enter into your VM through these... - # The format and example are as follows: - #<external port number> = <VM's IP address>:<VM's port number> - #8080 = 172.16.3.128:80 - [incomingudp] - # UDP port forwarding example - #6000 = 172.16.3.0:6001 - " - NAT_MAC_CONFIG="00:50:56:F2:C7:28" - NETWORKING_CONFIG=" - VERSION=1,0 - answer VNET_1_DHCP yes - answer VNET_1_DHCP_CFG_HASH 5F120565E3B0B0AC342F79EC042F0F4799B6D26A - answer VNET_1_HOSTONLY_NETMASK 255.255.255.0 - answer VNET_1_HOSTONLY_SUBNET 172.16.252.0 - answer VNET_1_HOSTONLY_UUID 74A7B7F5-AB8E-41CF-9E0F-595F9C9FA1C5 - answer VNET_1_VIRTUAL_ADAPTER yes - answer VNET_8_DHCP yes - answer VNET_8_DHCP_CFG_HASH 927D275B6D70F56E200F5FF00ABA5D2EB7DF2F82 - answer VNET_8_HOSTONLY_NETMASK 255.255.255.0 - answer VNET_8_HOSTONLY_SUBNET 172.16.38.0 - answer VNET_8_HOSTONLY_UUID 3CBAC6B3-6A71-4182-8BC6-849058A947B8 - answer VNET_8_NAT yes - answer VNET_8_VIRTUAL_ADAPTER yes - " - # Write the network configuration to the file - echo "$NETWORKING_CONFIG" | sudo tee "$NETWORKING_CONF" > /dev/null - echo "$DHCPD_CONFIG" | sudo tee "$DHCPD_CONF" > /dev/null - echo "$NAT_CONFIG" | sudo tee "$NAT_CONF" > /dev/null - echo "$NAT_MAC_CONFIG" | sudo tee "$NAT_MAC_CONF" > /dev/null - echo "VMware Fusion networking configuration updated." - - name: Install Chef - uses: actionshub/chef-install@3.0.0 - with: - version: 24.2.1058 - - name: Setup Packer - uses: hashicorp/setup-packer@main - with: - version: latest - - name: Install Bento - run: | - eval "$(chef shell-init bash)" - gem build bento.gemspec - gem install bento-*.gem +# - name: Setup Packer +# if: steps.verify-changed-files.outputs.files_changed == 'true' +# uses: hashicorp/setup-packer@main +# with: +# version: latest - name: Bento build run: | eval "$(chef shell-init bash)" bento build -o ${{ matrix.provider }}.vm --vars 'ssh_timeout=30m' os_pkrvars/$(echo ${{ matrix.os }} | cut -d "-" -f 1)/"${{ matrix.os }}-aarch64.pkrvars.hcl" ls -alh builds/ cat builds/${{ matrix.os }}*-aarch64._metadata.json + - name: Remove VM in case of canceled job + if: cancelled() + run: | + VM="$(prlctl list -a | grep ${{ matrix.os }} | cut -d " " -f 1)" + echo Powering off and deleting any existing VMs named ${{ matrix.os }}*-aarch64 + prlctl stop "$VM" --kill 2> /dev/null + sleep 1 + prlctl delete "$VM" 2> /dev/null + sleep 2 + - name: Bento Test + run: | + eval "$(chef shell-init bash)" + bento test - name: Upload build artifact uses: actions/upload-artifact@v4 with: - name: "${{ matrix.os }}-vmware-aarch64" + name: "${{ matrix.os }}-parallels-aarch64" path: | builds/*.box builds/*.json overwrite: true retention-days: 10 compression-level: 0 # no compression - - name: Bento Test - run: | - eval "$(chef shell-init bash)" - bento test diff --git a/.github/workflows/pkr-bld-vmware-x64.yml b/.github/workflows/pkr-bld-vmware-x64.yml index 911d40fa7..dfd8b3fff 100644 --- a/.github/workflows/pkr-bld-vmware-x64.yml +++ b/.github/workflows/pkr-bld-vmware-x64.yml @@ -8,18 +8,18 @@ env: jobs: x86_64: - runs-on: ubuntu-latest + runs-on: [self-hosted, X64, vmware] strategy: fail-fast: false matrix: os: - almalinux-8 - almalinux-9 + - almalinux-10 - centos-stream-9 - centos-stream-10 - - debian-11 - debian-12 - - fedora-40 + - debian-13 - fedora-41 - fedora-42 - freebsd-13 @@ -27,8 +27,10 @@ jobs: - opensuse-leap-15 - oraclelinux-8 - oraclelinux-9 + - oraclelinux-10 - rockylinux-8 - rockylinux-9 + - rockylinux-10 - ubuntu-22.04 - ubuntu-24.04 provider: @@ -36,46 +38,37 @@ jobs: steps: - name: Checkout uses: actions/checkout@main - - name: Install Vagrant VMware-fusion - run: | - curl https://softwareupdate.vmware.com/cds/vmw-desktop/ws/17.6.2/24409262/linux/core/VMware-Workstation-17.6.2-24409262.x86_64.bundle.tar -o VMware-Workstation-17.6.2-24409262.x86_64.bundle.tar - tar -xvf VMware-Workstation-17.6.2-24409262.x86_64.bundle.tar - chmod +x VMware-Workstation-17.6.2-24409262.x86_64.bundle - sudo ./VMware-Workstation-17.6.2-24409262.x86_64.bundle --console --required - wget -O - https://apt.releases.hashicorp.com/gpg | sudo gpg --dearmor -o /usr/share/keyrings/hashicorp-archive-keyring.gpg - echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/hashicorp-archive-keyring.gpg] https://apt.releases.hashicorp.com $(lsb_release -cs) main" | sudo tee /etc/apt/sources.list.d/hashicorp.list - sudo apt update && sudo apt install vagrant - vagrant plugin install vagrant-vmware-desktop - - name: Install Chef - uses: actionshub/chef-install@3.0.0 - with: - version: 24.2.1058 - - name: Setup Packer - uses: hashicorp/setup-packer@main - with: - version: latest - - name: Install Bento - run: | - eval "$(chef shell-init bash)" - gem build bento.gemspec - gem install bento-*.gem +# - name: Setup Packer +# if: steps.verify-changed-files.outputs.files_changed == 'true' +# uses: hashicorp/setup-packer@main +# with: +# version: latest - name: Bento build run: | eval "$(chef shell-init bash)" bento build -o ${{ matrix.provider }}.vm --vars 'ssh_timeout=30m' os_pkrvars/$(echo ${{ matrix.os }} | cut -d "-" -f 1)/"${{ matrix.os }}-x86_64.pkrvars.hcl" ls -alh builds/ cat builds/${{ matrix.os }}*-x86_64._metadata.json + - name: Remove VM in case of canceled job + if: cancelled() + run: | + VM="$(prlctl list -a | grep ${{ matrix.os }} | cut -d " " -f 1)" + echo Powering off and deleting any existing VMs named ${{ matrix.os }}*-x86_64 + prlctl stop "$VM" --kill 2> /dev/null + sleep 1 + prlctl delete "$VM" 2> /dev/null + sleep 2 + - name: Bento Test + run: | + eval "$(chef shell-init bash)" + bento test - name: Upload build artifact uses: actions/upload-artifact@v4 with: - name: "${{ matrix.os }}-vmware-x86_64" + name: "${{ matrix.os }}-parallels-x86_64" path: | builds/*.box builds/*.json overwrite: true retention-days: 10 compression-level: 0 # no compression - - name: Bento Test - run: | - eval "$(chef shell-init bash)" - bento test diff --git a/.github/workflows/test-pkr-bld-parallels.yml b/.github/workflows/test-pkr-bld-parallels.yml index 0c660185e..5dde3246c 100644 --- a/.github/workflows/test-pkr-bld-parallels.yml +++ b/.github/workflows/test-pkr-bld-parallels.yml @@ -7,17 +7,17 @@ env: jobs: x86_64: - runs-on: macos-13 + runs-on: macos-latest strategy: fail-fast: false matrix: os: - almalinux-8 - almalinux-9 + - almalinux-10 - centos-stream-9 - debian-11 - debian-12 - - fedora-40 - fedora-41 - fedora-42 - freebsd-13 @@ -25,9 +25,10 @@ jobs: - opensuse-leap-15 - oraclelinux-8 - oraclelinux-9 + - oraclelinux-10 - rockylinux-8 - rockylinux-9 - - ubuntu-20.04 + - rockylinux-10 - ubuntu-22.04 - ubuntu-24.04 provider: @@ -131,6 +132,10 @@ jobs: bento build -o ${{ matrix.provider }}.vm --vars 'ssh_timeout=30m' os_pkrvars/$(echo ${{ matrix.os }} | cut -d "-" -f 1)/"${{ matrix.os }}-aarch64.pkrvars.hcl" ls -alh builds/ cat builds/${{ matrix.os }}*-aarch64._metadata.json + - name: Bento Test + run: | + eval "$(chef shell-init bash)" + bento test - name: Upload build artifact uses: actions/upload-artifact@v4 with: @@ -141,7 +146,3 @@ jobs: overwrite: true retention-days: 10 compression-level: 0 # no compression - - name: Bento Test - run: | - eval "$(chef shell-init bash)" - bento test diff --git a/CHANGELOG.md b/CHANGELOG.md index 690d919fe..03b749ef1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,39 +5,38 @@ *__Note:__ Markdown table generated at <https://www.tablesgenerator.com/markdown_tables#> -| os | hyperv<br>x86_64 | parallels<br>x86_64 | parallels<br>aarch64 | qemu<br>x86_64 | qemu<br>aarch64 | virtualbox<br>x86_64 | virtualbox<br>aarch64 | vmware<br>x86_64 | vmware<br>aarch64 | +## Builds for version 202508.03.0 + +| os | virtualbox<br>x86_64 | virtualbox<br>aarch64 | vmware<br>x86_64 | vmware<br>aarch64 | parallels<br>x86_64 | parallels<br>aarch64 | qemu<br>x86_64 | qemu<br>aarch64 | hyperv<br>x86_64 | |:---:|:---:|:---:|:---:|:---:|:---:|:---:|:---:|:---:|:---:| -| almalinux-8 | | x | na | x | na | x | na | x | na | -| almalinux-9 | | x | x | x | | x | x | x | x | -| amazonlinux-2023 | | | | | | x | | | | -| centos-stream-9 | | x | x | x | | x | x | x | x | -| centos-stream-10 | | x | x | x | | x | x | x | x | -| debian-11 | | x | x | | | x | | x | x | -| debian-12 | | x | x | | | x | | x | x | -| fedora-40 | | x | x | x | | x | x | x | x | -| fedora-41 | | x | x | x | | x | x | x | x | -| freebsd-13 | | x | x | x | | x | x | x | x | -| freebsd-14 | | x | x | x | | x | x | x | x | -| macos-14 | | | x | | | | | | | -| macos-15 | | | x | | | | | | | -| opensuse-leap-15 | | x | x | x | | x | x | x | x | -| oraclelinux-8 | | x | | | | x | | x | | -| oraclelinux-9 | | x | x | x | | x | x | x | x | -| rhel-8 | license<br>needed | license<br>needed | license<br>needed | license<br>needed | license<br>needed | license<br>needed | license<br>needed | license<br>needed | license<br>needed | -| rhel-9 | license<br>needed | license<br>needed | license<br>needed | license<br>needed | license<br>needed | license<br>needed | license<br>needed | license<br>needed | license<br>needed | -| rockylinux-8 | | x | na | x | na | x | na | x | na | -| rockylinux-9 | | x | x | x | | x | x | x | x | -| sles-12 | license<br>needed | license<br>needed | na | license<br>needed | na | license<br>needed | na | license<br>needed | na | -| sles-15 | license<br>needed | license<br>needed | na | license<br>needed | na | license<br>needed | na | license<br>needed | na | -| solaris-11 | license<br>needed | license<br>needed | na | license<br>needed | na | license<br>needed | na | license<br>needed | na | -| ubuntu-22.04 | | x | x | x | | x | x | x | x | -| ubuntu-24.04 | | x | x | x | | x | x | x | x | -| windows-10 | | | na | x | na | x | na | | na | -| windows-11 | | x | x | | | x | | x | x | -| windows-2016 | | x | na | x | na | x | na | x | na | -| windows-2019 | | x | na | x | na | x | na | x | na | -| windows-2022 | | x | na | x | na | x | na | | na | -| windows-2025 | | x | na | | na | x | na | x | na | +| almalinux-8 | x | na | x | na | x | na | x | na | | +| almalinux-9 | x | x | x | x | x | x | x | | | +| almalinux-10 | x | x | x | x | x | x | | | | +| amazonlinux-2023 | x | | | | | | | | | +| centos-stream-9 | x | x | x | x | x | x | x | | | +| centos-stream-10 | x | x | x | x | | x | | | | +| debian-12 | x | x | x | x | x | x | | | | +| debian-13 | x | x | x | x | x | x | | | | +| fedora-41 | x | x | x | x | x | x | x | | | +| fedora-42 | x | x | x | x | x | x | x | | | +| freebsd-13 | x | x | x | x | x | x | x | | | +| freebsd-14 | x | x | x | x | x | x | x | | | +| macos-14 | na | na | na | na | na | x | na | na | na | +| macos-15 | na | na | na | na | na | x | na | na | na | +| opensuse-leap-15 | x | x | x | x | x | x | x | | | +| oraclelinux-8 | x | na | x | na | x | na | x | na | | +| oraclelinux-9 | x | x | x | x | x | x | x | | | +| oraclelinux-10 | x | | x | | x | | x | | | +| rockylinux-8 | x | na | x | na | x | na | x | na | | +| rockylinux-9 | x | x | x | x | x | x | x | | | +| rockylinux-10 | x | x | x | x | x | x | | | | +| ubuntu-22.04 | x | x | x | x | x | x | | | | +| ubuntu-24.04 | x | x | x | x | x | x | x | | | +| windows-11 | x | na | x | x | x | x | | | | +| windows-2016 | x | na | x | na | x | na | | na | | +| windows-2019 | x | na | x | na | x | na | | na | | +| windows-2022 | x | na | x | na | x | na | | na | | +| windows-2025 | x | na | x | na | x | na | | na | | ### Todo @@ -51,32 +50,42 @@ Markdown table generated at <https://www.tablesgenerator.com/markdown_tables#> - Create CD pipeline to upload vagrant boxes after PR is merged - Create CD pipeline to build and upload new versions of vagrant boxes once every 3 months with the latest patches -## [unreleased] (2024-05-23) +## [unreleased] (2025-08-10) + +## [v4.2.0] (2025-08-10) - Removed amazonlinux 2 builds - Removed Ubuntu 20.04 builds - Removed OpenSUSE Leap 12 builds +- Removed Debian 11 builds - Removed SLES 12 builds - Removed Ubuntu 24.10 builds +- Removed Windows 10 builds +- Removed Fedora 40 builds - Added CentOS Stream 10 builds +- Added Debian 13 builds - Added SLES 15 Aarch64 template - Added Windows 2025 template -- Update almalinux 8 to 8.10 +- Update almalinux 8 to 8.11 - Update rockylinux 8 to 8.10 - Update oraclelinux 8 to 8.10 - Update rhel 8 to 8.10 -- Update almalinux 9 to 9.5 -- Update rockylinux 9 to 9.5 -- Update oraclelinux 9 to 9.5 -- Update rhel 9 to 9.5 -- Update freebsd 14 to 14.2 +- Update almalinux 9 to 9.6 +- Update rockylinux 9 to 9.6 +- Update oraclelinux 9 to 9.6 +- Update rhel 9 to 9.6 +- Added almalinux 10 builds +- Added rockylinux 10 builds +- Added oraclelinux 10 builds +- Added rhel 10 builds +- Update freebsd 14 to 14.3 - Update freebsd 13 to 13.5 - Update debian 11 to 11.11 -- Update debian 12 to 12.10 +- Update debian 12 to 12.11 - Update MacOS 14 to 14.6.1 - Update OpenSUSE Leap 15 to 15.6 -- Update SLES 15 to 15.6 -- Add macOS 15 at 15.3.1 +- Update SLES 15 to 15.7 +- Add macOS 15 at 15.6 - Remove ask from --on-error flag options(it did nothing) - Switched most iso urls to boot images to shrink disk usage space and speed up downloads - Removed RHEL 7 ks.cfg file @@ -86,6 +95,12 @@ Markdown table generated at <https://www.tablesgenerator.com/markdown_tables#> - Added Packer variable for iso_target_path to default iso downloads to the local builds/iso directory - Updated windows scripts and order for better build performance - Fixed Windows 11 aarch64 builds - vbox 7.6.1 currently doesn't support Windows 11 aarch64 +- Enabled firewalld and selinux in rhel kickstart files to mimic more closely a default rhel install +- Consolidated more scripts into common scripts +- Updated common scripts and rearranged order for more reliable builds +- add test pass or fail error to metadata for bento tests +- Shorten vagrant cloud upload box short description to meet max 120 characters +- make iso name have a portion of the hash for url string to make iso downloads unique when updated ## [v4.1.2] (2024-05-23) diff --git a/amazonlinux-2023-aarch64-virtualbox-build.sh b/amazonlinux-2023-aarch64-virtualbox-build.sh index 4dafc74ab..a1edc3ad2 100755 --- a/amazonlinux-2023-aarch64-virtualbox-build.sh +++ b/amazonlinux-2023-aarch64-virtualbox-build.sh @@ -57,7 +57,7 @@ VBoxManage modifyvm $VM --memory 4096 VBoxManage modifyvm $VM --cpus 2 VBoxManage modifyvm $VM --nat-localhostreachable1 on VBoxManage modifyvm $VM --vram 33 -VBoxManage modifyvm $VM --graphicscontroller vmsvga +VBoxManage modifyvm $VM --graphicscontroller QemuRamFB VBoxManage modifyvm $VM --vrde on VBoxManage modifyvm $VM --audio-enabled off VBoxManage modifyvm $VM --ioapic on diff --git a/builds.yml b/builds.yml index 59ae5334a..c6fa6c0be 100644 --- a/builds.yml +++ b/builds.yml @@ -9,11 +9,11 @@ public: - amazonlinux-2023 - almalinux-8 - almalinux-9 + - almalinux-10 - centos-stream-9 - centos-stream-10 - - debian-11 - debian-12 - - fedora-40 + - debian-13 - fedora-41 - fedora-42 - freebsd-13 @@ -21,8 +21,10 @@ public: - opensuse-leap-15 - oraclelinux-8 - oraclelinux-9 + - oraclelinux-10 - rockylinux-8 - rockylinux-9 + - rockylinux-10 - ubuntu-22.04 - ubuntu-24.04 @@ -30,16 +32,19 @@ public: slugs: - almalinux-8 - almalinux-9 + - almalinux-10 - debian-12 - - debian-11 + - debian-13 - fedora-latest - freebsd-13 - freebsd-14 - opensuse-leap-15 - oraclelinux-8 - oraclelinux-9 + - oraclelinux-10 - rockylinux-8 - rockylinux-9 + - rockylinux-10 - macos-14 - macos-15 diff --git a/lib/bento/buildmetadata.rb b/lib/bento/buildmetadata.rb index 5b9c61341..e67be4a48 100644 --- a/lib/bento/buildmetadata.rb +++ b/lib/bento/buildmetadata.rb @@ -23,6 +23,7 @@ def read box_basename: box_basename, template: template_vars.fetch('template', UNKNOWN), packer: packer_ver, + vagrant: vagrant_ver, } end @@ -81,6 +82,12 @@ def version def packer_ver cmd = Mixlib::ShellOut.new('packer --version') cmd.run_command - cmd.stdout.split("\n")[0] + cmd.stdout.split(' ')[1] + end + + def vagrant_ver + cmd = Mixlib::ShellOut.new('vagrant --version') + cmd.run_command + cmd.stdout.split(' ')[1] end end diff --git a/lib/bento/test.rb b/lib/bento/test.rb index 5bdbc4952..df3434129 100644 --- a/lib/bento/test.rb +++ b/lib/bento/test.rb @@ -88,9 +88,12 @@ def test_box(md_json) banner("Testing #{@boxname.tr('.', '')}-#{@arch}-#{k.tr('_', '-')}") test = Mixlib::ShellOut.new("kitchen test #{@boxname.tr('.', '')}-#{@arch}-#{k.tr('_', '-')}", timeout: 900, live_stream: STDOUT) test.run_command + @providers[k][:testing] = "passed" unless test.error? next unless test.error? puts test.stderr + @providers[k][:testing] = "failed: #{test.stderr}" errors << "#{@boxname}-#{@arch}-#{k}" + @providers[k][:testing] = "failed: #{test.stderr}" FileUtils.cp(File.join(bento_dir, md_json), File.join(bento_dir, 'builds', 'failed_testing', File.basename(md_json))) unless File.exist?(File.join(bento_dir, 'builds', 'failed_testing', File.basename(md_json))) FileUtils.mv(File.join(bento_dir, 'builds', v['file']), File.join(bento_dir, 'builds', 'failed_testing', v['file'])) @providers.delete(k) diff --git a/lib/bento/test_templates/bootstrap.sh.erb b/lib/bento/test_templates/bootstrap.sh.erb index 99d3975e1..27a7b320c 100644 --- a/lib/bento/test_templates/bootstrap.sh.erb +++ b/lib/bento/test_templates/bootstrap.sh.erb @@ -1 +1 @@ -echo "Shell Provisioner Says What" +echo "*****Shell Provisioner Says What*****" diff --git a/lib/bento/upload.rb b/lib/bento/upload.rb index 7a79d6dcb..ea8e746fe 100644 --- a/lib/bento/upload.rb +++ b/lib/bento/upload.rb @@ -53,7 +53,7 @@ def upload_box(md_file) if slug_name puts '' banner("Uploading slug #{builds_yml['vagrant_cloud_account']}/#{slug_name} from #{md_data['box_basename']} version:#{md_data['version']} provider:#{prov} arch:#{arch}...") - upload_cmd = "vagrant cloud publish --architecture #{arch} --no-direct-upload #{builds_yml['vagrant_cloud_account']}/#{slug_name} #{md_data['version']} #{prov} builds/#{prov_data['file']} --description '#{slug_desc(slug_name)}' --short-description '#{slug_desc(slug_name)}' --version-description '#{ver_desc(md_data)}' --force --release #{public_private_box(md_data['box_basename'])}" + upload_cmd = "vagrant cloud publish --architecture #{arch} --no-direct-upload #{builds_yml['vagrant_cloud_account']}/#{slug_name} #{md_data['version']} #{prov} builds/#{prov_data['file']} --description '#{slug_desc(slug_name)}' --short-description '#{box_desc(slug_name)}' --version-description '#{ver_desc(md_data)}' --force --release #{public_private_box(md_data['box_basename'])}" shellout(upload_cmd) end diff --git a/lib/bento/version.rb b/lib/bento/version.rb index c0ee870e3..b771e40ae 100644 --- a/lib/bento/version.rb +++ b/lib/bento/version.rb @@ -1,3 +1,3 @@ module Bento - VERSION = '4.1.3'.freeze + VERSION = '4.2.0'.freeze end diff --git a/os_pkrvars/almalinux/almalinux-10-aarch64.pkrvars.hcl b/os_pkrvars/almalinux/almalinux-10-aarch64.pkrvars.hcl new file mode 100644 index 000000000..4caf154d2 --- /dev/null +++ b/os_pkrvars/almalinux/almalinux-10-aarch64.pkrvars.hcl @@ -0,0 +1,9 @@ +os_name = "almalinux" +os_version = "10.0" +os_arch = "aarch64" +iso_url = "https://repo.almalinux.org/almalinux/10/isos/aarch64/AlmaLinux-10.0-aarch64-boot.iso" +iso_checksum = "file:https://repo.almalinux.org/almalinux/10/isos/aarch64/CHECKSUM" +parallels_guest_os_type = "centos" +vbox_guest_os_type = "Oracle_arm64" +vmware_guest_os_type = "arm-rhel9-64" +boot_command = ["<wait><up><wait>e<wait><down><wait><down><wait><end><wait> inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/rhel/10ks.cfg inst.repo=https://repo.almalinux.org/almalinux/10/BaseOS/aarch64/os/ <wait><leftCtrlOn><wait>x<wait><leftCtrlOff>"] diff --git a/os_pkrvars/almalinux/almalinux-10-x86_64.pkrvars.hcl b/os_pkrvars/almalinux/almalinux-10-x86_64.pkrvars.hcl new file mode 100644 index 000000000..2567bb9f2 --- /dev/null +++ b/os_pkrvars/almalinux/almalinux-10-x86_64.pkrvars.hcl @@ -0,0 +1,9 @@ +os_name = "almalinux" +os_version = "10.0" +os_arch = "x86_64" +iso_url = "https://repo.almalinux.org/almalinux/10/isos/x86_64/AlmaLinux-10.0-x86_64-boot.iso" +iso_checksum = "file:https://repo.almalinux.org/almalinux/10/isos/x86_64/CHECKSUM" +parallels_guest_os_type = "centos" +vbox_guest_os_type = "RedHat_64" +vmware_guest_os_type = "centos-64" +boot_command = ["<wait><up><wait>e<wait><down><wait><down><wait><end><wait> inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/rhel/10ks.cfg inst.repo=https://repo.almalinux.org/almalinux/10/BaseOS/x86_64/os/ <leftCtrlOn>x<leftCtrlOff>"] diff --git a/os_pkrvars/debian/debian-11-aarch64.pkrvars.hcl b/os_pkrvars/debian/debian-11-aarch64.pkrvars.hcl deleted file mode 100644 index 93986c297..000000000 --- a/os_pkrvars/debian/debian-11-aarch64.pkrvars.hcl +++ /dev/null @@ -1,9 +0,0 @@ -os_name = "debian" -os_version = "11.11" -os_arch = "aarch64" -iso_url = "https://cdimage.debian.org/cdimage/archive/latest-oldstable/arm64/iso-cd/debian-11.11.0-arm64-netinst.iso" -iso_checksum = "file:https://cdimage.debian.org/cdimage/archive/latest-oldstable/arm64/iso-cd/SHA256SUMS" -parallels_guest_os_type = "debian" -vbox_guest_os_type = "Debian11_arm64" -vmware_guest_os_type = "arm-debian11-64" -boot_command = ["<wait><up>e<wait><down><down><down><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><wait>install <wait> preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/debian/preseed.cfg <wait>debian-installer=en_US.UTF-8 <wait>auto <wait>locale=en_US.UTF-8 <wait>kbd-chooser/method=us <wait>keyboard-configuration/xkb-keymap=us <wait>netcfg/get_hostname={{ .Name }} <wait>netcfg/get_domain=vagrantup.com <wait>fb=false <wait>debconf/frontend=noninteractive <wait>console-setup/ask_detect=false <wait>console-keymaps-at/keymap=us <wait>grub-installer/bootdev=/dev/sda <wait><f10><wait>"] diff --git a/os_pkrvars/debian/debian-11-x86_64.pkrvars.hcl b/os_pkrvars/debian/debian-11-x86_64.pkrvars.hcl deleted file mode 100644 index a1a4b3079..000000000 --- a/os_pkrvars/debian/debian-11-x86_64.pkrvars.hcl +++ /dev/null @@ -1,9 +0,0 @@ -os_name = "debian" -os_version = "11.11" -os_arch = "x86_64" -iso_url = "https://cdimage.debian.org/cdimage/archive/latest-oldstable/amd64/iso-cd/debian-11.11.0-amd64-netinst.iso" -iso_checksum = "file:https://cdimage.debian.org/cdimage/archive/latest-oldstable/amd64/iso-cd/SHA256SUMS" -parallels_guest_os_type = "debian" -vbox_guest_os_type = "Debian11_64" -vmware_guest_os_type = "debian-64" -boot_command = ["<wait><esc><wait>auto preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/debian/preseed.cfg netcfg/get_hostname={{ .Name }}<enter>"] diff --git a/os_pkrvars/debian/debian-12-aarch64.pkrvars.hcl b/os_pkrvars/debian/debian-12-aarch64.pkrvars.hcl index 6a1bfb40a..dc77e6156 100644 --- a/os_pkrvars/debian/debian-12-aarch64.pkrvars.hcl +++ b/os_pkrvars/debian/debian-12-aarch64.pkrvars.hcl @@ -1,8 +1,8 @@ os_name = "debian" os_version = "12.11" os_arch = "aarch64" -iso_url = "https://cdimage.debian.org/debian-cd/current/arm64/iso-cd/debian-12.11.0-arm64-netinst.iso" -iso_checksum = "file:https://cdimage.debian.org/debian-cd/current/arm64/iso-cd/SHA256SUMS" +iso_url = "https://cdimage.debian.org/cdimage/archive/latest-oldstable/arm64/iso-cd/debian-12.11.0-arm64-netinst.iso" +iso_checksum = "file:https://cdimage.debian.org/cdimage/archive/latest-oldstable/arm64/iso-cd/SHA256SUMS" parallels_guest_os_type = "debian" vbox_guest_os_type = "Debian12_arm64" vmware_guest_os_type = "arm-debian12-64" diff --git a/os_pkrvars/debian/debian-12-x86_64.pkrvars.hcl b/os_pkrvars/debian/debian-12-x86_64.pkrvars.hcl index 30c1a1913..5b1c800b3 100644 --- a/os_pkrvars/debian/debian-12-x86_64.pkrvars.hcl +++ b/os_pkrvars/debian/debian-12-x86_64.pkrvars.hcl @@ -1,8 +1,8 @@ os_name = "debian" os_version = "12.11" os_arch = "x86_64" -iso_url = "https://cdimage.debian.org/debian-cd/current/amd64/iso-cd/debian-12.11.0-amd64-netinst.iso" -iso_checksum = "file:https://cdimage.debian.org/debian-cd/current/amd64/iso-cd/SHA256SUMS" +iso_url = "https://cdimage.debian.org/cdimage/archive/latest-oldstable/amd64/iso-cd/debian-12.11.0-amd64-netinst.iso" +iso_checksum = "file:https://cdimage.debian.org/cdimage/archive/latest-oldstable/amd64/iso-cd/SHA256SUMS" parallels_guest_os_type = "debian" vbox_guest_os_type = "Debian12_64" vmware_guest_os_type = "debian-64" diff --git a/os_pkrvars/debian/debian-13-aarch64.pkrvars.hcl b/os_pkrvars/debian/debian-13-aarch64.pkrvars.hcl new file mode 100644 index 000000000..8a71a4791 --- /dev/null +++ b/os_pkrvars/debian/debian-13-aarch64.pkrvars.hcl @@ -0,0 +1,10 @@ +os_name = "debian" +os_version = "13.0" +os_arch = "aarch64" +iso_url = "https://cdimage.debian.org/debian-cd/current/arm64/iso-cd/debian-13.0.0-arm64-netinst.iso" +iso_checksum = "file:https://cdimage.debian.org/debian-cd/current/arm64/iso-cd/SHA256SUMS" +parallels_guest_os_type = "debian" +vbox_guest_os_type = "Debian12_arm64" +vmware_guest_os_type = "arm-debian12-64" +default_boot_wait = "10s" +boot_command = ["<wait>e<wait><down><down><down><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><wait>install <wait> preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/debian/preseed.cfg <wait>debian-installer=en_US.UTF-8 <wait>auto <wait>locale=en_US.UTF-8 <wait>kbd-chooser/method=us <wait>keyboard-configuration/xkb-keymap=us <wait>netcfg/get_hostname={{ .Name }} <wait>netcfg/get_domain=vagrantup.com <wait>fb=false <wait>debconf/frontend=noninteractive <wait>console-setup/ask_detect=false <wait>console-keymaps-at/keymap=us <wait>grub-installer/bootdev=/dev/sda <wait><f10><wait>"] diff --git a/os_pkrvars/debian/debian-13-x86_64.pkrvars.hcl b/os_pkrvars/debian/debian-13-x86_64.pkrvars.hcl new file mode 100644 index 000000000..c64de05f8 --- /dev/null +++ b/os_pkrvars/debian/debian-13-x86_64.pkrvars.hcl @@ -0,0 +1,9 @@ +os_name = "debian" +os_version = "13.0" +os_arch = "x86_64" +iso_url = "https://cdimage.debian.org/debian-cd/current/amd64/iso-cd/debian-13.0.0-amd64-netinst.iso" +iso_checksum = "file:https://cdimage.debian.org/debian-cd/current/amd64/iso-cd/SHA256SUMS" +parallels_guest_os_type = "debian" +vbox_guest_os_type = "Debian12_64" +vmware_guest_os_type = "debian-64" +boot_command = ["<wait><esc><wait>auto preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/debian/preseed.cfg netcfg/get_hostname={{ .Name }}<enter>"] diff --git a/os_pkrvars/fedora/fedora-40-aarch64.pkrvars.hcl b/os_pkrvars/fedora/fedora-40-aarch64.pkrvars.hcl deleted file mode 100644 index d7094dd28..000000000 --- a/os_pkrvars/fedora/fedora-40-aarch64.pkrvars.hcl +++ /dev/null @@ -1,9 +0,0 @@ -os_name = "fedora" -os_version = "40" -os_arch = "aarch64" -iso_url = "https://download.fedoraproject.org/pub/fedora/linux/releases/40/Server/aarch64/iso/Fedora-Server-netinst-aarch64-40-1.14.iso" -iso_checksum = "file:https://download.fedoraproject.org/pub/fedora/linux/releases/40/Server/aarch64/iso/Fedora-Server-40-1.14-aarch64-CHECKSUM" -parallels_guest_os_type = "fedora-core" -vbox_guest_os_type = "Fedora_arm64" -vmware_guest_os_type = "arm-fedora-64" -boot_command = ["<wait><up>e<wait><down><down><end> inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/fedora/ks.cfg inst.repo=https://download.fedoraproject.org/pub/fedora/linux/releases/40/Server/aarch64/os/ <F10><wait>"] diff --git a/os_pkrvars/fedora/fedora-40-x86_64.pkrvars.hcl b/os_pkrvars/fedora/fedora-40-x86_64.pkrvars.hcl deleted file mode 100644 index a38099feb..000000000 --- a/os_pkrvars/fedora/fedora-40-x86_64.pkrvars.hcl +++ /dev/null @@ -1,9 +0,0 @@ -os_name = "fedora" -os_version = "40" -os_arch = "x86_64" -iso_url = "https://download.fedoraproject.org/pub/fedora/linux/releases/40/Server/x86_64/iso/Fedora-Server-netinst-x86_64-40-1.14.iso" -iso_checksum = "file:https://download.fedoraproject.org/pub/fedora/linux/releases/40/Server/x86_64/iso/Fedora-Server-40-1.14-x86_64-CHECKSUM" -parallels_guest_os_type = "fedora-core" -vbox_guest_os_type = "Fedora_64" -vmware_guest_os_type = "fedora-64" -boot_command = ["<wait><up>e<wait><down><down><end> inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/fedora/ks.cfg inst.repo=https://download.fedoraproject.org/pub/fedora/linux/releases/40/Server/x86_64/os/ <F10><wait>"] diff --git a/os_pkrvars/macos/macos-14-aarch64.pkrvars.hcl b/os_pkrvars/macos/macos-14-aarch64.pkrvars.hcl index db1f92d2b..ce532381e 100644 --- a/os_pkrvars/macos/macos-14-aarch64.pkrvars.hcl +++ b/os_pkrvars/macos/macos-14-aarch64.pkrvars.hcl @@ -1,5 +1,5 @@ os_name = "macos" -os_version = "14.6.1" +os_version = "14.7.7" os_arch = "aarch64" # Download urls cn be foud at https://ipsw.me/VirtualMac2,1 parallels_ipsw_url = "https://updates.cdn-apple.com/2024SummerFCS/fullrestores/062-52859/932E0A8F-6644-4759-82DA-F8FA8DEA806A/UniversalMac_14.6.1_23G93_Restore.ipsw" @@ -66,10 +66,7 @@ boot_command = [ "sudo sysadminctl -autologin set -userName vagrant -password vagrant<wait><enter><wait5s>", # Disable screen lock "sudo sysadminctl -screenLock off -password vagrant<wait><enter><wait5s>", - # Install Parallels Tools - "sudo installer -pkg /Volumes/Parallels\\ Tools/Install.app/Contents/Resources/Install.mpkg -target /<wait><enter><wait5s>", - # Reboot - "sudo shutdown -r +15s<wait><enter><wait5s>", + # Close terminal "exit<enter><wait5s>", "<leftSuperOn>q<leftSuperOff>" ] diff --git a/os_pkrvars/macos/macos-15-aarch64.pkrvars.hcl b/os_pkrvars/macos/macos-15-aarch64.pkrvars.hcl index cada474ca..97a5c5a6f 100644 --- a/os_pkrvars/macos/macos-15-aarch64.pkrvars.hcl +++ b/os_pkrvars/macos/macos-15-aarch64.pkrvars.hcl @@ -1,9 +1,9 @@ os_name = "macos" -os_version = "15.3.1" +os_version = "15.6" os_arch = "aarch64" # Download urls cn be foud at https://ipsw.me/VirtualMac2,1 -parallels_ipsw_url = "https://updates.cdn-apple.com/2025WinterFCS/fullrestores/072-70618/42F1A8CC-7E07-4329-958A-757FF600C303/UniversalMac_15.3.1_24D70_Restore.ipsw" -parallels_ipsw_checksum = "559a78b75adc6bec77665b17db0e166eba326b04fc534e2a086253be92e043b0" +parallels_ipsw_url = "https://updates.cdn-apple.com/2025SummerFCS/fullrestores/082-08674/51294E4D-A273-44BE-A280-A69FC347FB87/UniversalMac_15.6_24G84_Restore.ipsw" +parallels_ipsw_checksum = "8fbeaca047b66bcbc8ea557f2b3f95bcb84cd0f60cbfdadb52fc23ecfe671317" sources_enabled = ["source.parallels-ipsw.vm"] default_boot_wait = "15s" boot_command = [ @@ -12,15 +12,17 @@ boot_command = [ # Select Language English (US) "<enter><wait10s>", # Select Your Country and Region - "<leftShiftOn><tab><leftShiftOff><wait><spacebar><wait5s>", + "<leftShiftOn><tab><leftShiftOff><wait><spacebar><wait10s>", + # Transfer your data to this Mac + "<tab><wait><tab><wait><tab><wait><spacebar><wait><tab><wait><tab><wait><spacebar><wait5s>", # Written and Spoken Languages "<leftShiftOn><tab><leftShiftOff><wait><spacebar><wait5s>", # Accessibility "<leftShiftOn><tab><leftShiftOff><wait><spacebar><wait5s>", # Data & Privacy "<leftShiftOn><tab><leftShiftOff><wait><spacebar><wait5s>", - # Migration Assistant - "<leftShiftOn><tab><wait><tab><wait><tab><leftShiftOff><wait><spacebar><wait5s>", + # Create a Computer Account + "vagrant<wait><tab><wait><tab><wait>vagrant<wait><tab><wait>vagrant<wait><tab><wait><tab><wait><spacebar><wait><tab><wait><tab><wait><spacebar><wait1m>", # Sign In with Your Apple ID "<leftShiftOn><tab><wait><tab><leftShiftOff><wait><spacebar><wait5s>", # Are you sure you want to skip signing in with an Apple ID? @@ -29,8 +31,6 @@ boot_command = [ "<leftShiftOn><tab><leftShiftOff><wait><spacebar><wait5s>", # I have read and agree to the macOS Software License Agreement "<tab><wait><spacebar><wait5s>", - # Create a Computer Account - "vagrant<wait><tab><wait><tab><wait>vagrant<wait><tab><wait>vagrant<wait><tab><wait><tab><wait><tab><wait><spacebar><wait1m>", # Enable Location Services "<leftShiftOn><tab><leftShiftOff><wait><spacebar><wait5s>", # Are you sure you don't want to use Location Services? @@ -44,6 +44,8 @@ boot_command = [ # Siri "<tab><wait><spacebar><wait><leftShiftOn><tab><leftShiftOff><wait><spacebar><wait5s>", # Choose Your Look + "<leftShiftOn><tab><leftShiftOff><wait><spacebar><wait5s>", + # Update mac "<leftShiftOn><tab><leftShiftOff><wait><spacebar><wait30s>", # Enable keyboard navigation "<space><wait><leftCtrlOn><f7><leftCtrlOff><wait2s>", @@ -66,10 +68,7 @@ boot_command = [ "sudo sysadminctl -autologin set -userName vagrant -password vagrant<wait><enter><wait5s>", # Disable screen lock "sudo sysadminctl -screenLock off -password vagrant<wait><enter><wait5s>", - # Install Parallels Tools - "sudo installer -pkg /Volumes/Parallels\\ Tools/Install.app/Contents/Resources/Install.mpkg -target /<wait><enter><wait5s>", - # Reboot - "sudo shutdown -r +15s<wait><enter><wait5s>", + # Close terminal "exit<enter><wait5s>", "<leftSuperOn>q<leftSuperOff>" ] diff --git a/os_pkrvars/oraclelinux/oraclelinux-10-aarch64.pkrvars.hcl b/os_pkrvars/oraclelinux/oraclelinux-10-aarch64.pkrvars.hcl new file mode 100644 index 000000000..f1fb76c92 --- /dev/null +++ b/os_pkrvars/oraclelinux/oraclelinux-10-aarch64.pkrvars.hcl @@ -0,0 +1,9 @@ +os_name = "oraclelinux" +os_version = "10.0" +os_arch = "aarch64" +iso_url = "https://yum.oracle.com/ISOS/OracleLinux/OL10/u0/aarch64/OracleLinux-R10-U0-aarch64-boot-uek.iso" +iso_checksum = "file:https://linux.oracle.com/security/gpg/checksum/OracleLinux-R10-U0-Server-aarch64.checksum" +parallels_guest_os_type = "centos" +vbox_guest_os_type = "Oracle_arm64" +vmware_guest_os_type = "arm-rhel9-64" +boot_command = ["<wait><up>e<wait><down><down><end><wait> inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/rhel/10ks.cfg inst.repo=https://yum.oracle.com/repo/OracleLinux/OL10/baseos/latest/aarch64/ <leftCtrlOn>x<leftCtrlOff>"] diff --git a/os_pkrvars/oraclelinux/oraclelinux-10-x86_64.pkrvars.hcl b/os_pkrvars/oraclelinux/oraclelinux-10-x86_64.pkrvars.hcl new file mode 100644 index 000000000..e68260664 --- /dev/null +++ b/os_pkrvars/oraclelinux/oraclelinux-10-x86_64.pkrvars.hcl @@ -0,0 +1,9 @@ +os_name = "oraclelinux" +os_version = "10.0" +os_arch = "x86_64" +iso_url = "https://yum.oracle.com/ISOS/OracleLinux/OL10/u0/x86_64/OracleLinux-R10-U0-x86_64-boot.iso" +iso_checksum = "file:https://linux.oracle.com/security/gpg/checksum/OracleLinux-R10-U0-Server-x86_64.checksum" +parallels_guest_os_type = "centos" +vbox_guest_os_type = "Oracle_64" +vmware_guest_os_type = "centos-64" +boot_command = ["<wait><up><wait>e<wait><down><wait><down><wait><end><wait> inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/rhel/10ks.cfg inst.repo=https://yum.oracle.com/repo/OracleLinux/OL10/baseos/latest/x86_64/ <leftCtrlOn>x<leftCtrlOff>"] diff --git a/os_pkrvars/oraclelinux/oraclelinux-9-aarch64.pkrvars.hcl b/os_pkrvars/oraclelinux/oraclelinux-9-aarch64.pkrvars.hcl index 2459327ac..2032cd029 100644 --- a/os_pkrvars/oraclelinux/oraclelinux-9-aarch64.pkrvars.hcl +++ b/os_pkrvars/oraclelinux/oraclelinux-9-aarch64.pkrvars.hcl @@ -1,8 +1,8 @@ os_name = "oraclelinux" -os_version = "9.5" +os_version = "9.6" os_arch = "aarch64" -iso_url = "https://yum.oracle.com/ISOS/OracleLinux/OL9/u5/aarch64/OracleLinux-R9-U5-aarch64-boot-uek.iso" -iso_checksum = "file:https://linux.oracle.com/security/gpg/checksum/OracleLinux-R9-U5-Server-aarch64.checksum" +iso_url = "https://yum.oracle.com/ISOS/OracleLinux/OL9/u6/aarch64/OracleLinux-R9-U6-aarch64-boot-uek.iso" +iso_checksum = "file:https://linux.oracle.com/security/gpg/checksum/OracleLinux-R9-U6-Server-aarch64.checksum" parallels_guest_os_type = "centos" vbox_guest_os_type = "Oracle9_arm64" vmware_guest_os_type = "arm-rhel9-64" diff --git a/os_pkrvars/oraclelinux/oraclelinux-9-x86_64.pkrvars.hcl b/os_pkrvars/oraclelinux/oraclelinux-9-x86_64.pkrvars.hcl index fe296dcec..70929c213 100644 --- a/os_pkrvars/oraclelinux/oraclelinux-9-x86_64.pkrvars.hcl +++ b/os_pkrvars/oraclelinux/oraclelinux-9-x86_64.pkrvars.hcl @@ -1,8 +1,8 @@ os_name = "oraclelinux" -os_version = "9.5" +os_version = "9.6" os_arch = "x86_64" -iso_url = "https://yum.oracle.com/ISOS/OracleLinux/OL9/u5/x86_64/OracleLinux-R9-U5-x86_64-boot.iso" -iso_checksum = "file:https://linux.oracle.com/security/gpg/checksum/OracleLinux-R9-U5-Server-x86_64.checksum" +iso_url = "https://yum.oracle.com/ISOS/OracleLinux/OL9/u6/x86_64/OracleLinux-R9-U6-x86_64-boot.iso" +iso_checksum = "file:https://linux.oracle.com/security/gpg/checksum/OracleLinux-R9-U6-Server-x86_64.checksum" parallels_guest_os_type = "centos" vbox_guest_os_type = "Oracle_64" vmware_guest_os_type = "centos-64" diff --git a/os_pkrvars/rhel/rhel-10-aarch64.pkrvars.hcl b/os_pkrvars/rhel/rhel-10-aarch64.pkrvars.hcl new file mode 100644 index 000000000..ca9845fb4 --- /dev/null +++ b/os_pkrvars/rhel/rhel-10-aarch64.pkrvars.hcl @@ -0,0 +1,9 @@ +os_name = "rhel" +os_version = "10.0" +os_arch = "aarch64" +iso_url = "https://www.redhat.com/en/technologies/linux-platforms/enterprise-linux" +iso_checksum = "none" +parallels_guest_os_type = "rhel" +vbox_guest_os_type = "Oracle_arm64" +vmware_guest_os_type = "arm-rhel9-64" +boot_command = ["<wait><up><wait><tab> inst.text inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/rhel/10ks.cfg<enter><wait>"] diff --git a/os_pkrvars/rhel/rhel-10-x86_64.pkrvars.hcl b/os_pkrvars/rhel/rhel-10-x86_64.pkrvars.hcl new file mode 100644 index 000000000..1d7deec4f --- /dev/null +++ b/os_pkrvars/rhel/rhel-10-x86_64.pkrvars.hcl @@ -0,0 +1,9 @@ +os_name = "rhel" +os_version = "10.0" +os_arch = "x86_64" +iso_url = "https://www.redhat.com/en/technologies/linux-platforms/enterprise-linux" +iso_checksum = "none" +parallels_guest_os_type = "rhel" +vbox_guest_os_type = "RedHat_64" +vmware_guest_os_type = "centos-64" +boot_command = ["<wait><up><wait><tab> inst.text inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/rhel/10ks.cfg<enter><wait>"] diff --git a/os_pkrvars/rhel/rhel-9-aarch64.pkrvars.hcl b/os_pkrvars/rhel/rhel-9-aarch64.pkrvars.hcl index 5e096f087..f21c7a69b 100644 --- a/os_pkrvars/rhel/rhel-9-aarch64.pkrvars.hcl +++ b/os_pkrvars/rhel/rhel-9-aarch64.pkrvars.hcl @@ -1,5 +1,5 @@ os_name = "rhel" -os_version = "9.5" +os_version = "9.6" os_arch = "aarch64" iso_url = "https://www.redhat.com/en/technologies/linux-platforms/enterprise-linux" iso_checksum = "none" diff --git a/os_pkrvars/rhel/rhel-9-x86_64.pkrvars.hcl b/os_pkrvars/rhel/rhel-9-x86_64.pkrvars.hcl index 9e62b5923..88a35d638 100644 --- a/os_pkrvars/rhel/rhel-9-x86_64.pkrvars.hcl +++ b/os_pkrvars/rhel/rhel-9-x86_64.pkrvars.hcl @@ -1,5 +1,5 @@ os_name = "rhel" -os_version = "9.5" +os_version = "9.6" os_arch = "x86_64" iso_url = "https://www.redhat.com/en/technologies/linux-platforms/enterprise-linux" iso_checksum = "none" diff --git a/os_pkrvars/rockylinux/rockylinux-10-aarch64.pkrvars.hcl b/os_pkrvars/rockylinux/rockylinux-10-aarch64.pkrvars.hcl new file mode 100644 index 000000000..de1c103f6 --- /dev/null +++ b/os_pkrvars/rockylinux/rockylinux-10-aarch64.pkrvars.hcl @@ -0,0 +1,9 @@ +os_name = "rockylinux" +os_version = "10.0" +os_arch = "aarch64" +iso_url = "https://download.rockylinux.org/pub/rocky/10/isos/aarch64/Rocky-10.0-aarch64-boot.iso" +iso_checksum = "file:https://download.rockylinux.org/pub/rocky/10/isos/aarch64/CHECKSUM" +parallels_guest_os_type = "centos" +vbox_guest_os_type = "Oracle_arm64" +vmware_guest_os_type = "arm-rhel9-64" +boot_command = ["<wait><up>e<wait><down><down><end><wait> inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/rhel/10ks.cfg inst.repo=https://download.rockylinux.org/pub/rocky/10/BaseOS/aarch64/os/ <leftCtrlOn>x<leftCtrlOff>"] diff --git a/os_pkrvars/rockylinux/rockylinux-10-x86_64.pkrvars.hcl b/os_pkrvars/rockylinux/rockylinux-10-x86_64.pkrvars.hcl new file mode 100644 index 000000000..53a393cf6 --- /dev/null +++ b/os_pkrvars/rockylinux/rockylinux-10-x86_64.pkrvars.hcl @@ -0,0 +1,9 @@ +os_name = "rockylinux" +os_version = "10.0" +os_arch = "x86_64" +iso_url = "https://download.rockylinux.org/pub/rocky/10/isos/x86_64/Rocky-10.0-x86_64-boot.iso" +iso_checksum = "file:https://download.rockylinux.org/pub/rocky/10/isos/x86_64/CHECKSUM" +parallels_guest_os_type = "centos" +vbox_guest_os_type = "Oracle_64" +vmware_guest_os_type = "centos-64" +boot_command = ["<wait><up>e<wait><down><down><end><wait> inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/rhel/10ks.cfg inst.repo=https://download.rockylinux.org/pub/rocky/10/BaseOS/x86_64/os/ <leftCtrlOn>x<leftCtrlOff>"] diff --git a/os_pkrvars/sles/sles-15-aarch64.pkrvars.hcl b/os_pkrvars/sles/sles-15-aarch64.pkrvars.hcl index bbd11fe89..04d3d2ef4 100644 --- a/os_pkrvars/sles/sles-15-aarch64.pkrvars.hcl +++ b/os_pkrvars/sles/sles-15-aarch64.pkrvars.hcl @@ -1,7 +1,7 @@ os_name = "suse" -os_version = "15.6" +os_version = "15.7" os_arch = "aarch64" -iso_url = "https://updates.suse.com/SUSE/Products/SLE-Product-SLES/15-SP6/aarch64/iso/SLE-15-SP6-Online-aarch64-GM-Media1.iso" +iso_url = "https://updates.suse.com/SUSE/Products/SLE-Product-SLES/15-SP7/aarch64/iso/SLE-15-SP7-Online-aarch64-GM-Media1.iso" iso_checksum = "56f67a6d10a502901cc2c291231089e375dd7c2b51fc951d5deaa57439c2686e" parallels_guest_os_type = "opensuse" vbox_guest_os_type = "OpenSUSE_Leap_arm64" diff --git a/os_pkrvars/sles/sles-15-x86_64.pkrvars.hcl b/os_pkrvars/sles/sles-15-x86_64.pkrvars.hcl index 4e3686e96..d0d8985fb 100644 --- a/os_pkrvars/sles/sles-15-x86_64.pkrvars.hcl +++ b/os_pkrvars/sles/sles-15-x86_64.pkrvars.hcl @@ -1,7 +1,7 @@ os_name = "suse" -os_version = "15.6" +os_version = "15.7" os_arch = "x86_64" -iso_url = "https://updates.suse.com/SUSE/Products/SLE-Product-SLES/15-SP6/x86_64/iso/SLE-15-SP6-Online-x86_64-GM-Media1.iso" +iso_url = "https://updates.suse.com/SUSE/Products/SLE-Product-SLES/15-SP7/x86_64/iso/SLE-15-SP7-Online-x86_64-GM-Media1.iso" iso_checksum = "c816a46b76de157e49d6b931284b9827b3781260f0cdd2a365296246313dd7ce" parallels_guest_os_type = "suse" vbox_guest_os_type = "SUSE_LE_64" diff --git a/os_pkrvars/ubuntu/ubuntu-24.04-aarch64.pkrvars.hcl b/os_pkrvars/ubuntu/ubuntu-24.04-aarch64.pkrvars.hcl index 84c824532..5fdff862b 100644 --- a/os_pkrvars/ubuntu/ubuntu-24.04-aarch64.pkrvars.hcl +++ b/os_pkrvars/ubuntu/ubuntu-24.04-aarch64.pkrvars.hcl @@ -1,7 +1,7 @@ os_name = "ubuntu" os_version = "24.04" os_arch = "aarch64" -iso_url = "https://cdimage.ubuntu.com/releases/noble/release/ubuntu-24.04.2-live-server-arm64.iso" +iso_url = "https://cdimage.ubuntu.com/releases/noble/release/ubuntu-24.04.3-live-server-arm64.iso" iso_checksum = "file:https://cdimage.ubuntu.com/releases/noble/release/SHA256SUMS" parallels_guest_os_type = "ubuntu" vbox_guest_os_type = "Ubuntu24_LTS_arm64" diff --git a/os_pkrvars/ubuntu/ubuntu-24.04-x86_64.pkrvars.hcl b/os_pkrvars/ubuntu/ubuntu-24.04-x86_64.pkrvars.hcl index 8d8c56aab..0a651db90 100644 --- a/os_pkrvars/ubuntu/ubuntu-24.04-x86_64.pkrvars.hcl +++ b/os_pkrvars/ubuntu/ubuntu-24.04-x86_64.pkrvars.hcl @@ -1,7 +1,7 @@ os_name = "ubuntu" os_version = "24.04" os_arch = "x86_64" -iso_url = "https://releases.ubuntu.com/noble/ubuntu-24.04.2-live-server-amd64.iso" +iso_url = "https://releases.ubuntu.com/noble/ubuntu-24.04.3-live-server-amd64.iso" iso_checksum = "file:https://releases.ubuntu.com/noble/SHA256SUMS" parallels_guest_os_type = "ubuntu" vbox_guest_os_type = "Ubuntu_64" diff --git a/os_pkrvars/windows/windows-10-x86_64.pkrvars.hcl b/os_pkrvars/windows/windows-10-x86_64.pkrvars.hcl deleted file mode 100644 index b61f4b2de..000000000 --- a/os_pkrvars/windows/windows-10-x86_64.pkrvars.hcl +++ /dev/null @@ -1,10 +0,0 @@ -os_name = "windows" -os_version = "10" -os_arch = "x86_64" -is_windows = true -# Download url's found at https://www.microsoft.com/en-us/evalcenter/download-windows-10-enterprise -iso_url = "https://software-static.download.prss.microsoft.com/dbazure/988969d5-f34g-4e03-ac9d-1f9786c66750/19045.2006.220908-0225.22h2_release_svc_refresh_CLIENTENTERPRISEEVAL_OEMRET_x64FRE_en-us.iso" -iso_checksum = "EF7312733A9F5D7D51CFA04AC497671995674CA5E1058D5164D6028F0938D668" -parallels_guest_os_type = "win-10" -vbox_guest_os_type = "Windows10_64" -vmware_guest_os_type = "windows9-64" diff --git a/os_pkrvars/windows/windows-11-aarch64.pkrvars.hcl b/os_pkrvars/windows/windows-11-aarch64.pkrvars.hcl index 6799ab778..fa598a714 100644 --- a/os_pkrvars/windows/windows-11-aarch64.pkrvars.hcl +++ b/os_pkrvars/windows/windows-11-aarch64.pkrvars.hcl @@ -8,7 +8,7 @@ iso_url = "https://software-static.download.prss.microsoft.com/d iso_checksum = "DAD633276073F14F3E0373EF7E787569E216D54942CE522B39451C8F2D38AD43" sources_enabled = ["source.parallels-iso.vm", "source.qemu.vm", "source.vmware-iso.vm"] parallels_guest_os_type = "win-11" -vbox_guest_os_type = "Windows11_arm64" +vbox_guest_os_type = "Other_arm64" vmware_guest_os_type = "arm-windows11-64" vmware_firmware = "efi-secure" parallels_boot_wait = "180s" diff --git a/packer_templates/http/debian/preseed.cfg b/packer_templates/http/debian/preseed.cfg index b16f4c9a9..9f47c1c88 100644 --- a/packer_templates/http/debian/preseed.cfg +++ b/packer_templates/http/debian/preseed.cfg @@ -75,11 +75,6 @@ tasksel tasksel/first multiselect standard, ssh-server d-i pkgsel/include string openssh-server sudo bzip2 acpid cryptsetup zlib1g-dev wget curl dkms fuse make nfs-common net-tools cifs-utils rsync d-i pkgsel/install-language-support boolean false -# Prevent packaged version of VirtualBox Guest Additions being installed: -d-i preseed/early_command string sed -i \ -'/in-target/idiscover(){/sbin/discover|grep -v VirtualBox;}' \ -/usr/lib/pre-pkgsel.d/20install-hwpackages - # Do not scan additional CDs apt-cdrom-setup apt-setup/cdrom/set-first boolean false diff --git a/packer_templates/pkr-builder.pkr.hcl b/packer_templates/pkr-builder.pkr.hcl index 41a627197..5f3b02726 100644 --- a/packer_templates/pkr-builder.pkr.hcl +++ b/packer_templates/pkr-builder.pkr.hcl @@ -1,38 +1,12 @@ -packer { - required_version = ">= 1.7.0" - required_plugins { - hyperv = { - version = ">= 1.0.3" - source = "github.com/hashicorp/hyperv" - } - parallels = { - version = ">= 1.1.6" - source = "github.com/parallels/parallels" - } - qemu = { - version = ">= 1.1.0" - source = "github.com/hashicorp/qemu" - } - vagrant = { - version = ">= 1.1.0" - source = "github.com/hashicorp/vagrant" - } - virtualbox = { - version = ">= 1.0.3" - source = "github.com/hashicorp/virtualbox" - } - vmware = { - version = ">= 1.1.0" - source = "github.com/hashicorp/vmware" - } - windows-update = { - version = ">= 0.14.1" - source = "github.com/rgl/windows-update" - } - } -} - locals { + common_scripts = [ + "${path.root}/scripts/_common/motd.sh", + "${path.root}/scripts/_common/vagrant.sh", + "${path.root}/scripts/_common/sshd.sh", + "${path.root}/scripts/_common/guest_tools_virtualbox.sh", + "${path.root}/scripts/_common/guest_tools_vmware.sh", + "${path.root}/scripts/_common/guest_tools_parallels.sh" + ] scripts = var.scripts == null ? ( var.is_windows ? [ "${path.root}/scripts/windows/configure-power.ps1", @@ -48,89 +22,44 @@ locals { ] : ( var.os_name == "macos" ? [ "${path.root}/scripts/macos/system-default.sh", - "${path.root}/scripts/macos/system-update.sh", "${path.root}/scripts/macos/system-update-complete.sh", - "${path.root}/scripts/_common/motd.sh", - "${path.root}/scripts/macos/vagrant.sh", - "${path.root}/scripts/macos/parallels-tools.sh", - "${path.root}/scripts/macos/vmware-tools.sh", - "${path.root}/scripts/macos/disable_auto_update.sh", - "${path.root}/scripts/macos/shrink.sh" + "${path.root}/scripts/macos/disable_auto_update.sh" ] : ( var.os_name == "solaris" ? [ "${path.root}/scripts/solaris/update_solaris.sh", - "${path.root}/scripts/_common/vagrant.sh", "${path.root}/scripts/solaris/vmtools_solaris.sh", "${path.root}/scripts/solaris/minimize_solaris.sh" ] : ( var.os_name == "freebsd" ? [ - "${path.root}/scripts/freebsd/update_freebsd.sh", "${path.root}/scripts/freebsd/postinstall_freebsd.sh", "${path.root}/scripts/freebsd/sudoers_freebsd.sh", - "${path.root}/scripts/_common/vagrant.sh", - "${path.root}/scripts/freebsd/vmtools_freebsd.sh", - "${path.root}/scripts/freebsd/cleanup_freebsd.sh", - "${path.root}/scripts/freebsd/minimize_freebsd.sh" + "${path.root}/scripts/freebsd/cleanup_freebsd.sh" ] : ( var.os_name == "opensuse-leap" || var.os_name == "sles" ? [ - "${path.root}/scripts/suse/repositories_suse.sh", - "${path.root}/scripts/suse/update_suse.sh", - "${path.root}/scripts/_common/motd.sh", - "${path.root}/scripts/_common/sshd.sh", - "${path.root}/scripts/_common/vagrant.sh", "${path.root}/scripts/suse/unsupported-modules_suse.sh", - "${path.root}/scripts/_common/virtualbox.sh", - "${path.root}/scripts/_common/vmware.sh", - "${path.root}/scripts/_common/parallels.sh", "${path.root}/scripts/suse/vagrant_group_suse.sh", "${path.root}/scripts/suse/sudoers_suse.sh", "${path.root}/scripts/suse/zypper-locks_suse.sh", "${path.root}/scripts/suse/remove-dvd-source_suse.sh", - "${path.root}/scripts/suse/cleanup_suse.sh", - "${path.root}/scripts/_common/minimize.sh" + "${path.root}/scripts/suse/cleanup_suse.sh" ] : ( var.os_name == "ubuntu" || var.os_name == "debian" ? [ - "${path.root}/scripts/${var.os_name}/update_${var.os_name}.sh", - "${path.root}/scripts/_common/motd.sh", - "${path.root}/scripts/_common/sshd.sh", "${path.root}/scripts/${var.os_name}/networking_${var.os_name}.sh", "${path.root}/scripts/${var.os_name}/sudoers_${var.os_name}.sh", - "${path.root}/scripts/_common/vagrant.sh", "${path.root}/scripts/${var.os_name}/systemd_${var.os_name}.sh", - "${path.root}/scripts/_common/virtualbox.sh", - "${path.root}/scripts/_common/vmware.sh", - "${path.root}/scripts/_common/parallels.sh", "${path.root}/scripts/${var.os_name}/hyperv_${var.os_name}.sh", "${path.root}/scripts/${var.os_name}/cleanup_${var.os_name}.sh", - "${path.root}/scripts/_common/parallels_post_cleanup_debian_ubuntu.sh", - "${path.root}/scripts/_common/minimize.sh" + "${path.root}/scripts/_common/parallels_post_cleanup_debian_ubuntu.sh" ] : ( var.os_name == "fedora" ? [ "${path.root}/scripts/fedora/networking_fedora.sh", - "${path.root}/scripts/fedora/update_dnf.sh", - "${path.root}/scripts/_common/motd.sh", - "${path.root}/scripts/_common/sshd.sh", "${path.root}/scripts/fedora/install-supporting-packages_fedora.sh", - "${path.root}/scripts/fedora/build-tools_fedora.sh", - "${path.root}/scripts/_common/virtualbox.sh", - "${path.root}/scripts/_common/vmware.sh", - "${path.root}/scripts/_common/parallels.sh", - "${path.root}/scripts/_common/vagrant.sh", "${path.root}/scripts/fedora/real-tmp_fedora.sh", "${path.root}/scripts/fedora/cleanup_dnf.sh", - "${path.root}/scripts/_common/minimize.sh" ] : [ - "${path.root}/scripts/rhel/update_dnf.sh", - "${path.root}/scripts/_common/motd.sh", - "${path.root}/scripts/_common/sshd.sh", - "${path.root}/scripts/_common/vagrant.sh", - "${path.root}/scripts/_common/virtualbox.sh", - "${path.root}/scripts/_common/vmware.sh", - "${path.root}/scripts/_common/parallels.sh", - "${path.root}/scripts/rhel/cleanup_dnf.sh", - "${path.root}/scripts/_common/minimize.sh" + "${path.root}/scripts/rhel/cleanup_dnf.sh" ] ) ) @@ -139,41 +68,105 @@ locals { ) ) ) : var.scripts - source_names = [for source in var.sources_enabled : trimprefix(source, "source.")] + nix_environment_vars = var.os_name == "freebsd" ? [ + "HOME_DIR=/home/vagrant", + "http_proxy=${var.http_proxy}", + "https_proxy=${var.https_proxy}", + "no_proxy=${var.no_proxy}", + "pkg_branch=quarterly" + ] : ( + var.os_name == "solaris" ? [] : [ + "HOME_DIR=/home/vagrant", + "http_proxy=${var.http_proxy}", + "https_proxy=${var.https_proxy}", + "no_proxy=${var.no_proxy}" + ] + ) + nix_execute_command = var.os_name == "freebsd" ? "echo 'vagrant' | {{.Vars}} su -m root -c 'sh -eux {{.Path}}'" : ( + var.os_name == "solaris" ? "echo 'vagrant'|sudo -S bash {{.Path}}" : "echo 'vagrant' | {{ .Vars }} sudo -S -E sh -eux '{{ .Path }}'" + ) + elevated_user = "vagrant" + elevated_password = "vagrant" + source_names = [for source in var.sources_enabled : trimprefix(source, "source.")] } # https://www.packer.io/docs/templates/hcl_templates/blocks/build build { sources = var.sources_enabled - # Linux Shell scipts + # Linux Shell scripts + # Install updates and reboot provisioner "shell" { - environment_vars = var.os_name == "freebsd" ? [ - "HOME_DIR=/home/vagrant", - "http_proxy=${var.http_proxy}", - "https_proxy=${var.https_proxy}", - "no_proxy=${var.no_proxy}", - "pkg_branch=quarterly" - ] : ( - var.os_name == "solaris" ? [] : [ - "HOME_DIR=/home/vagrant", - "http_proxy=${var.http_proxy}", - "https_proxy=${var.https_proxy}", - "no_proxy=${var.no_proxy}" - ] - ) - execute_command = var.os_name == "freebsd" ? "echo 'vagrant' | {{.Vars}} su -m root -c 'sh -eux {{.Path}}'" : ( - var.os_name == "solaris" ? "echo 'vagrant'|sudo -S bash {{.Path}}" : "echo 'vagrant' | {{ .Vars }} sudo -S -E sh -eux '{{ .Path }}'" - ) + environment_vars = local.nix_environment_vars + execute_command = local.nix_execute_command + expect_disconnect = true + pause_before = "10s" + scripts = ["${path.root}/scripts/_common/update_packages.sh", ] + valid_exit_codes = [0, 143] + except = var.is_windows ? local.source_names : null + } + provisioner "shell" { + inline = [ + "echo 'After reboot'" + ] + pause_after = "10s" + except = var.is_windows ? local.source_names : null + } + # Install build tools and reboot + provisioner "shell" { + environment_vars = local.nix_environment_vars + execute_command = local.nix_execute_command + expect_disconnect = true + pause_before = "10s" + scripts = ["${path.root}/scripts/_common/build_tools.sh", ] + except = var.is_windows ? local.source_names : null + } + provisioner "shell" { + inline = [ + "echo 'After reboot'" + ] + pause_after = "10s" + except = var.is_windows ? local.source_names : null + } + # Run common scripts and guest tools installation + provisioner "shell" { + environment_vars = local.nix_environment_vars + execute_command = local.nix_execute_command expect_disconnect = true + pause_before = "10s" + scripts = local.common_scripts + except = var.is_windows ? local.source_names : null + } + provisioner "shell" { + inline = [ + "echo 'After reboot'" + ] + pause_after = "10s" + except = var.is_windows ? local.source_names : null + } + # Run OS specific scripts + provisioner "shell" { + environment_vars = local.nix_environment_vars + execute_command = local.nix_execute_command + expect_disconnect = true + pause_before = "10s" scripts = local.scripts except = var.is_windows ? local.source_names : null } + # Run minimize script + provisioner "shell" { + environment_vars = local.nix_environment_vars + execute_command = local.nix_execute_command + expect_disconnect = true + pause_after = "10s" + scripts = ["${path.root}/scripts/_common/minimize.sh", ] + except = var.is_windows ? local.source_names : null + } # Windows Updates and scripts provisioner "powershell" { - elevated_password = "vagrant" - elevated_user = "vagrant" + elevated_password = local.elevated_password + elevated_user = local.elevated_user scripts = [ "${path.root}/scripts/windows/provision.ps1", "${path.root}/scripts/windows/remove-one-drive-and-teams.ps1", @@ -202,8 +195,8 @@ build { except = var.is_windows ? null : local.source_names } provisioner "powershell" { - elevated_password = "vagrant" - elevated_user = "vagrant" + elevated_password = local.elevated_password + elevated_user = local.elevated_user scripts = local.scripts except = var.is_windows ? null : local.source_names } @@ -212,8 +205,8 @@ build { except = var.is_windows ? null : local.source_names } provisioner "powershell" { - elevated_password = "vagrant" - elevated_user = "vagrant" + elevated_password = local.elevated_password + elevated_user = local.elevated_user scripts = [ "${path.root}/scripts/windows/cleanup.ps1", "${path.root}/scripts/windows/optimize.ps1" diff --git a/packer_templates/pkr-plugins.pkr.hcl b/packer_templates/pkr-plugins.pkr.hcl new file mode 100644 index 000000000..5027429be --- /dev/null +++ b/packer_templates/pkr-plugins.pkr.hcl @@ -0,0 +1,33 @@ +packer { + required_version = ">= 1.7.0" + required_plugins { + hyperv = { + version = ">= 1.0.3" + source = "github.com/hashicorp/hyperv" + } + parallels = { + version = ">= 1.1.6" + source = "github.com/parallels/parallels" + } + qemu = { + version = ">= 1.1.0" + source = "github.com/hashicorp/qemu" + } + vagrant = { + version = ">= 1.1.0" + source = "github.com/hashicorp/vagrant" + } + virtualbox = { + version = ">= 1.0.3" + source = "github.com/hashicorp/virtualbox" + } + vmware = { + version = ">= 1.1.0" + source = "github.com/hashicorp/vmware" + } + windows-update = { + version = ">= 0.14.1" + source = "github.com/rgl/windows-update" + } + } +} diff --git a/packer_templates/pkr-sources.pkr.hcl b/packer_templates/pkr-sources.pkr.hcl index 1969f4828..6fe874c4e 100644 --- a/packer_templates/pkr-sources.pkr.hcl +++ b/packer_templates/pkr-sources.pkr.hcl @@ -9,7 +9,7 @@ locals { ) : var.hyperv_enable_secure_boot # parallels-ipsw - parallels_ipsw_target_path = var.parallels_ipsw_target_path == "build_dir_iso" ? "${path.root}/../builds/iso/${var.os_name}-${var.os_version}-${var.os_arch}.ipsw" : var.parallels_ipsw_target_path + parallels_ipsw_target_path = var.parallels_ipsw_target_path == "build_dir_iso" && var.parallels_ipsw_url != null ? "${path.root}/../builds/iso/${var.os_name}-${var.os_version}-${var.os_arch}-${substr(sha256(var.parallels_ipsw_url), 0, 8)}.ipsw" : var.parallels_ipsw_target_path # parallels-iso parallels_tools_flavor = var.parallels_tools_flavor == null ? ( @@ -176,7 +176,7 @@ locals { ) : null ) : var.floppy_files http_directory = var.http_directory == null ? "${path.root}/http" : var.http_directory - iso_target_path = var.iso_target_path == "build_dir_iso" ? "${path.root}/../builds/iso/${var.os_name}-${var.os_version}-${var.os_arch}.iso" : var.iso_target_path + iso_target_path = var.iso_target_path == "build_dir_iso" && var.iso_url != null ? "${path.root}/../builds/iso/${var.os_name}-${var.os_version}-${var.os_arch}-${substr(sha256(var.iso_url), 0, 8)}.iso" : var.iso_target_path memory = var.memory == null ? ( var.is_windows || var.os_name == "macos" || var.os_arch == "aarch64" ? 4096 : 3072 ) : var.memory diff --git a/packer_templates/scripts/_common/build_tools.sh b/packer_templates/scripts/_common/build_tools.sh new file mode 100644 index 000000000..fbd96e6ca --- /dev/null +++ b/packer_templates/scripts/_common/build_tools.sh @@ -0,0 +1,48 @@ +#!/bin/sh -eux + +OS_NAME=$(uname -s) + +if [ "$OS_NAME" = "FreeBSD" ] || [ "$OS_NAME" = "Darwin" ]; then + echo "Nothing to do for $OS_NAME" + exit 0 +fi + +echo "Installing build tools for $PACKER_BUILDER_TYPE" + +case "$PACKER_BUILDER_TYPE" in +parallels-iso|parallels-pvm) + if ! ([ "$(uname -m)" = "aarch64" ] && [ -f /etc/os-release ] && (grep -qi 'opensuse' /etc/os-release || grep -qi 'sles' /etc/os-release)); then + if command -v dnf >/dev/null 2>&1; then + if [ -f /etc/fedora-release ]; then + dnf -y install fuse-libs kernel-headers kernel-devel elfutils-libelf-devel gcc make perl + else + dnf install -y --skip-broken checkpolicy selinux-policy-devel gcc kernel-devel kernel-headers make kernel-uek-devel + fi + fi + else + echo "Skipping Parallels Tools installation on aarch64 architecture for opensuse and derivatives" + fi + ;; +virtualbox-iso|virtualbox-ovf) + if ! ([ "$(uname -m)" = "aarch64" ] && [ -f /etc/os-release ] && (grep -qi 'opensuse' /etc/os-release || grep -qi 'sles' /etc/os-release)); then + echo "installing deps necessary to compile kernel modules" + # We install things like kernel-headers here vs. kickstart files so we make sure we install them for the updated kernel not the stock kernel + if [ -f "/bin/dnf" ]; then + dnf install -y --skip-broken perl cpp gcc make bzip2 tar kernel-headers kernel-devel kernel-uek-devel || true # not all these packages are on every system + elif [ -f "/usr/bin/apt-get" ]; then + apt-get install -y build-essential dkms bzip2 tar linux-headers-"$(uname -r)" + elif [ -f "/usr/bin/zypper" ]; then + zypper install -y perl cpp gcc make bzip2 tar kernel-default-devel + fi + else + echo "Skipping Virtualbox guest additions installation on aarch64 architecture for opensuse and derivatives" + fi + ;; +*) + echo "Unknown Packer Builder Type >>$PACKER_BUILDER_TYPE<< selected." + ;; +esac + +echo "build tools installed rebooting" +reboot +sleep 60 diff --git a/packer_templates/scripts/_common/parallels.sh b/packer_templates/scripts/_common/guest_tools_parallels.sh similarity index 62% rename from packer_templates/scripts/_common/parallels.sh rename to packer_templates/scripts/_common/guest_tools_parallels.sh index 935df7832..333ef8a63 100644 --- a/packer_templates/scripts/_common/parallels.sh +++ b/packer_templates/scripts/_common/guest_tools_parallels.sh @@ -1,14 +1,19 @@ #!/bin/sh -eux # set a default HOME_DIR environment variable if not set -HOME_DIR="${HOME_DIR:-/home/vagrant}"; +HOME_DIR="${HOME_DIR:-/home/vagrant}" +OS_NAME=$(uname -s) case "$PACKER_BUILDER_TYPE" in -parallels-iso|parallels-pvm) - if ! ([ "$(uname -m)" = "aarch64" ] && [ -f /etc/os-release ] && (grep -qi 'opensuse' /etc/os-release || grep -qi 'sles' /etc/os-release)); then - if command -v dnf >/dev/null 2>&1; then - dnf -y install checkpolicy selinux-policy-devel gcc kernel-devel kernel-headers make - fi +parallels-iso|parallels-pvm|parallels-ipsw) + echo "Installing Parallels Tools..." + if [ "$OS_NAME" = "FreeBSD" ]; then + pkg install -y parallels-tools + elif [ "$OS_NAME" = "Darwin" ]; then + installer -pkg /Volumes/Parallels\ Tools/Install.app/Contents/Resources/Install.mpkg -target / + # This usually works but gives a failed to eject error + hdiutil detach /Volumes/Parallels\ Tools || echo "exit code $? is suppressed"; + elif ! ([ "$(uname -m)" = "aarch64" ] && [ -f /etc/os-release ] && (grep -qi 'opensuse' /etc/os-release || grep -qi 'sles' /etc/os-release)); then mkdir -p /tmp/parallels; if [ "$(uname -m)" = "aarch64" ] ; then mount -o loop "$HOME_DIR"/prl-tools-lin-arm.iso /tmp/parallels; @@ -30,8 +35,10 @@ parallels-iso|parallels-pvm) if command -v dnf >/dev/null 2>&1; then dnf remove -y install checkpolicy selinux-policy-devel gcc kernel-devel kernel-headers make fi + reboot + sleep 60 else echo "Skipping Parallels Tools installation on aarch64 architecture for opensuse and derivatives" fi - ;; + ;; esac diff --git a/packer_templates/scripts/_common/virtualbox.sh b/packer_templates/scripts/_common/guest_tools_virtualbox.sh similarity index 64% rename from packer_templates/scripts/_common/virtualbox.sh rename to packer_templates/scripts/_common/guest_tools_virtualbox.sh index 8b0447d46..69a4dbd68 100644 --- a/packer_templates/scripts/_common/virtualbox.sh +++ b/packer_templates/scripts/_common/guest_tools_virtualbox.sh @@ -1,11 +1,42 @@ #!/bin/sh -eux # set a default HOME_DIR environment variable if not set -HOME_DIR="${HOME_DIR:-/home/vagrant}"; +HOME_DIR="${HOME_DIR:-/home/vagrant}" +OS_NAME=$(uname -s) case "$PACKER_BUILDER_TYPE" in virtualbox-iso|virtualbox-ovf) - if ! ([ "$(uname -m)" = "aarch64" ] && [ -f /etc/os-release ] && (grep -qi 'opensuse' /etc/os-release || grep -qi 'sles' /etc/os-release)); then + if [ "$OS_NAME" = "FreeBSD" ]; then + # There are no vbox-guest additions for freebsd arm64 + ARCH=$(uname -m) + if [ "$ARCH" = "arm64" ]; then + return + fi + # Disable X11 because vagrants are (usually) headless + echo 'WITHOUT_X11="YES"' >> /etc/make.conf + pkg install -y virtualbox-ose-additions-nox11 + { + echo 'vboxdrv_load="YES"' + echo 'virtio_blk_load="YES"' + echo 'virtio_scsi_load="YES"' + echo 'virtio_balloon_load="YES"' + echo 'if_vtnet_load="YES"' + } >> /boot/loader.conf + { + echo 'vboxnet_enable="YES"' + echo 'vboxguest_enable="YES"' + echo 'vboxservice_enable="YES"' + echo 'ifconfig_vtnet0_name="em0"' + echo 'ifconfig_vtnet1_name="em1"' + echo 'ifconfig_vtnet2_name="em2"' + echo 'ifconfig_vtnet3_name="em3"' + } >> /etc/rc.conf + pw groupadd vboxusers; + pw groupmod vboxusers -m vagrant; + elif [ "$OS_NAME" = "Darwin" ]; then + echo "Nothing to do for $OS_NAME" + exit 0 + elif ! ([ "$(uname -m)" = "aarch64" ] && [ -f /etc/os-release ] && (grep -qi 'opensuse' /etc/os-release || grep -qi 'sles' /etc/os-release)); then ARCHITECTURE="$(uname -m)"; VER="$(cat "$HOME_DIR"/.vbox_version)"; ISO="VBoxGuestAdditions_$VER.iso"; @@ -23,7 +54,6 @@ virtualbox-iso|virtualbox-ovf) elif [ -f "/usr/bin/zypper" ]; then zypper install -y perl cpp gcc make bzip2 tar kernel-default-devel fi - echo "installing the vbox additions for architecture $ARCHITECTURE" # this install script fails with non-zero exit codes for no apparent reason so we need better ways to know if it worked if [ "$ARCHITECTURE" = "aarch64" ]; then @@ -53,9 +83,10 @@ virtualbox-iso|virtualbox-ovf) echo "removing leftover logs" rm -rf /var/log/vboxadd* - + reboot + sleep 60 else echo "Skipping Virtualbox guest additions installation on aarch64 architecture for opensuse and derivatives" fi - ;; + ;; esac diff --git a/packer_templates/scripts/_common/guest_tools_vmware.sh b/packer_templates/scripts/_common/guest_tools_vmware.sh new file mode 100644 index 000000000..f75c5487d --- /dev/null +++ b/packer_templates/scripts/_common/guest_tools_vmware.sh @@ -0,0 +1,58 @@ +#!/bin/bash -eux + +# set a default HOME_DIR environment variable if not set +HOME_DIR="${HOME_DIR:-/home/vagrant}" +OS_NAME=$(uname -s) + +case "$PACKER_BUILDER_TYPE" in +vmware-iso|vmware-vmx) + if [ "$OS_NAME" = "FreeBSD" ]; then + pkg install -y open-vm-tools-nox11 + # for shared folder + echo 'fuse_load="YES"' >>/boot/loader.conf + echo 'ifconfig_vmx0="dhcp"' >>/etc/rc.conf + elif [ "$OS_NAME" = "Darwin" ]; then + # Globbing here: VMware Fusion >= 8.5.4 includes a second + # 'darwinPre15.iso' for any OS X guests pre-10.11 + TOOLS_PATH=$(find "/Users/vagrant/" -name '*darwin*.iso' -print) + if [ ! -e "$TOOLS_PATH" ]; then + echo "Couldn't locate uploaded tools iso at $TOOLS_PATH!" + exit 1 + fi + TMPMOUNT=$(/usr/bin/mktemp -d /tmp/vmware-tools.XXXX) + hdiutil attach "$TOOLS_PATH" -mountpoint "$TMPMOUNT" + INSTALLER_PKG="$TMPMOUNT/Install VMware Tools.app/Contents/Resources/VMware Tools.pkg" + if [ ! -e "$INSTALLER_PKG" ]; then + echo "Couldn't locate VMware installer pkg at $INSTALLER_PKG!" + exit 1 + fi + echo "Installing VMware tools.." + installer -pkg "$TMPMOUNT/Install VMware Tools.app/Contents/Resources/VMware Tools.pkg" -target / + # This usually fails + hdiutil detach "$TMPMOUNT" || echo "exit code $? is suppressed"; + rm -rf "$TMPMOUNT" + rm -f "$TOOLS_PATH" + # Point Linux shared folder root to that used by OS X guests, + # useful for the Hashicorp vmware_fusion Vagrant provider plugin + mkdir /mnt + ln -sf /Volumes/VMware\ Shared\ Folders /mnt/hgfs + elif [ -f "/bin/dnf" ]; then + dnf install -y open-vm-tools + systemctl enable vmtoolsd + systemctl start vmtoolsd + elif [ -f "/usr/bin/apt-get" ]; then + apt-get install -y open-vm-tools; + mkdir /mnt/hgfs; + systemctl enable open-vm-tools + systemctl start open-vm-tools + elif [ -f "/usr/bin/zypper" ]; then + zypper install -y open-vm-tools insserv-compat + mkdir /mnt/hgfs + systemctl enable vmtoolsd + systemctl start vmtoolsd + fi + echo "platform specific vmware.sh executed" + reboot + sleep 60 + ;; +esac diff --git a/packer_templates/scripts/_common/metadata.sh b/packer_templates/scripts/_common/metadata.sh deleted file mode 100755 index 42386ac26..000000000 --- a/packer_templates/scripts/_common/metadata.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/sh -eux - -mkdir -p /etc; -cp /tmp/bento-metadata.json /etc/bento-metadata.json; -chmod 0444 /etc/bento-metadata.json; -rm -f /tmp/bento-metadata.json; diff --git a/packer_templates/scripts/_common/minimize.sh b/packer_templates/scripts/_common/minimize.sh index c51667583..75bdd3d30 100644 --- a/packer_templates/scripts/_common/minimize.sh +++ b/packer_templates/scripts/_common/minimize.sh @@ -4,33 +4,70 @@ case "$PACKER_BUILDER_TYPE" in qemu) exit 0 ;; esac -# Whiteout root -count=$(df --sync -kP / | tail -n1 | awk -F ' ' '{print $4}') -count=$((count - 1)) -dd if=/dev/zero of=/tmp/whitespace bs=1M count=$count || echo "dd exit code $? is suppressed"; -rm /tmp/whitespace - -# Whiteout /boot -count=$(df --sync -kP /boot | tail -n1 | awk -F ' ' '{print $4}') -count=$((count - 1)) -dd if=/dev/zero of=/boot/whitespace bs=1M count=$count || echo "dd exit code $? is suppressed"; -rm /boot/whitespace - -set +e -swapuuid="$(/sbin/blkid -o value -l -s UUID -t TYPE=swap)"; -case "$?" in - 2|0) ;; - *) exit 1 ;; -esac -set -e - -if [ "x${swapuuid}" != "x" ]; then - # Whiteout the swap partition to reduce box size - # Swap is disabled till reboot - swappart="$(readlink -f /dev/disk/by-uuid/"$swapuuid")"; - /sbin/swapoff "$swappart" || true; - dd if=/dev/zero of="$swappart" bs=1M || echo "dd exit code $? is suppressed"; - /sbin/mkswap -U "$swapuuid" "$swappart"; -fi +OS_NAME=$(uname -s) + +if [ "$OS_NAME" = "FreeBSD" ]; then + ZROOT="zroot/ROOT/default" + + zfs set compression=off $ZROOT; + dd if=/dev/zero of=/EMPTY bs=1m || echo "dd(1) exits after taking over all the space" + sync + rm -f /EMPTY; + # Block until the empty file has been removed, otherwise, Packer + # will try to kill the box while the disk is still full and that's bad + sync; + zfs set compression=lz4 $ZROOT; +elif [ "$OS_NAME" = "Darwin" ]; then + echo 'Disable spotlight...' + mdutil -a -i off + + echo 'Turn off hibernation and get rid of the sleepimage' + pmset hibernatemode 0 + rm -f /var/vm/sleepimage + + echo 'Remove Screensaver video files' + rm -rf /Library/Application Support/com.apple.idleassetsd/Customer/* || echo "rm screensaver videos exit code $? is suppressed" + + echo 'Remove logs' + rm -rf /Library/Logs/* || echo "rm library logs exit code $? is suppressed" -sync; + echo 'Remove swap file' + rm -rf /System/Volumes/VM/swapfile* || echo "rm swapfile exit code $? is suppressed" + + if [ -e .vmfusion_version ] || [ "$PACKER_BUILDER_TYPE" = "vmware*" ]; then + echo 'VMware Fusion specific items' + echo 'Shrink the disk' + /Library/Application\ Support/VMware\ Tools/vmware-tools-cli disk shrink / + fi +else + # Whiteout root + count=$(df --sync -kP / | tail -n1 | awk -F ' ' '{print $4}') + count=$((count - 1)) + dd if=/dev/zero of=/tmp/whitespace bs=1M count=$count || echo "dd exit code $? is suppressed"; + rm /tmp/whitespace + + # Whiteout /boot + count=$(df --sync -kP /boot | tail -n1 | awk -F ' ' '{print $4}') + count=$((count - 1)) + dd if=/dev/zero of=/boot/whitespace bs=1M count=$count || echo "dd exit code $? is suppressed"; + rm /boot/whitespace + + set +e + swapuuid="$(/sbin/blkid -o value -l -s UUID -t TYPE=swap)"; + case "$?" in + 2|0) ;; + *) exit 1 ;; + esac + set -e + + if [ "x${swapuuid}" != "x" ]; then + # Whiteout the swap partition to reduce box size + # Swap is disabled till reboot + swappart="$(readlink -f /dev/disk/by-uuid/"$swapuuid")"; + /sbin/swapoff "$swappart" || true; + dd if=/dev/zero of="$swappart" bs=1M || echo "dd exit code $? is suppressed"; + /sbin/mkswap -U "$swapuuid" "$swappart"; + fi + + sync; +fi diff --git a/packer_templates/scripts/_common/motd.sh b/packer_templates/scripts/_common/motd.sh index e3eb4334d..cd6526df9 100644 --- a/packer_templates/scripts/_common/motd.sh +++ b/packer_templates/scripts/_common/motd.sh @@ -1,5 +1,12 @@ #!/bin/sh -eux +OS_NAME=$(uname -s) + +if [ "$OS_NAME" = "Darwin" ]; then + echo "Nothing to do for $OS_NAME" + exit 0 +fi + bento=' This system is built by the Bento project by Chef Software More information can be found at https://github.com/chef/bento diff --git a/packer_templates/scripts/_common/sshd.sh b/packer_templates/scripts/_common/sshd.sh index 835193f29..6f9938519 100644 --- a/packer_templates/scripts/_common/sshd.sh +++ b/packer_templates/scripts/_common/sshd.sh @@ -1,5 +1,12 @@ #!/bin/sh -eux +OS_NAME=$(uname -s) + +if [ "$OS_NAME" = "Darwin" ]; then + echo "Nothing to do for $OS_NAME" + exit 0 +fi + SSHD_CONFIG="/etc/ssh/sshd_config" # ensure that there is a trailing newline before attempting to concatenate diff --git a/packer_templates/scripts/_common/update_packages.sh b/packer_templates/scripts/_common/update_packages.sh new file mode 100644 index 000000000..04f4f9206 --- /dev/null +++ b/packer_templates/scripts/_common/update_packages.sh @@ -0,0 +1,93 @@ +#!/bin/sh -eux + +# set a default HOME_DIR environment variable if not set +HOME_DIR="${HOME_DIR:-/home/vagrant}" +OS_NAME=$(uname -s) +if [ -f /etc/os-release ]; then + OS_ID=$(grep '^ID=' /etc/os-release | cut -d= -f2 | tr -d '"') +fi + +echo "installing updates" +if [ -f "/bin/dnf" ]; then + dnf -y upgrade +elif [ -f "/usr/bin/apt-get" ]; then + echo "disable systemd apt timers/services" + systemctl stop apt-daily.timer + systemctl stop apt-daily-upgrade.timer + systemctl disable apt-daily.timer + systemctl disable apt-daily-upgrade.timer + systemctl mask apt-daily.service + systemctl mask apt-daily-upgrade.service + systemctl daemon-reload + # Disable periodic activities of apt to be safe + cat <<EOF >/etc/apt/apt.conf.d/10periodic +APT::Periodic::Enable "0"; +APT::Periodic::Update-Package-Lists "0"; +APT::Periodic::Download-Upgradeable-Packages "0"; +APT::Periodic::AutocleanInterval "0"; +APT::Periodic::Unattended-Upgrade "0"; +EOF + if [ "$OS_ID" = "ubuntu" ]; then + echo "Detected Ubuntu" + export DEBIAN_FRONTEND=noninteractive + + echo "disable release-upgrades" + sed -i.bak 's/^Prompt=.*$/Prompt=never/' /etc/update-manager/release-upgrades + + echo "remove the unattended-upgrades and ubuntu-release-upgrader-core packages" + rm -rf /var/log/unattended-upgrades; + apt-get -y purge unattended-upgrades ubuntu-release-upgrader-core; + + echo "update the package list" + apt-get -y update; + + echo "upgrade all installed packages incl. kernel and kernel headers" + apt-get -y dist-upgrade -o Dpkg::Options::="--force-confnew"; + elif [ "$OS_ID" = "debian" ]; then + echo "Detected Debian" + arch="$(uname -r | sed 's/^.*[0-9]\{1,\}\.[0-9]\{1,\}\.[0-9]\{1,\}\(-[0-9]\{1,2\}\)-//')" + apt-get update + apt-get -y upgrade linux-image-"$arch" + apt-get -y install linux-headers-"$(uname -r)" + else + echo "Unsupported OS: $OS_ID" + exit 1 + fi +elif [ -f "/usr/bin/zypper" ]; then + version=$(grep VERSION= /etc/os-release | cut -f2 -d\" | cut -f1 -d\ ) + + zypper removerepo "openSUSE-${version}-0" + + zypper ar http://download.opensuse.org/distribution/leap/"${version}"/repo/oss/ openSUSE-Leap-"${version}"-Oss + zypper ar http://download.opensuse.org/distribution/leap/"${version}"/repo/non-oss/ openSUSE-Leap-"${version}"-Non-Oss + zypper ar http://download.opensuse.org/update/leap/"${version}"/oss/ openSUSE-Leap-"${version}"-Update + zypper ar http://download.opensuse.org/update/leap/"${version}"/non-oss/ openSUSE-Leap-"${version}"-Update-Non-Oss + + zypper refresh + zypper update -y +elif [ "$OS_NAME" = "FreeBSD" ]; then + freebsd_update="/usr/sbin/freebsd-update --not-running-from-cron"; + + # Update FreeBSD + # NOTE: the install action fails if there are no updates so || true it + env PAGER=/bin/cat "$freebsd_update" fetch || true; + env PAGER=/bin/cat "$freebsd_update" install || true; + + # shellcheck disable=SC2154 + if [ "$pkg_branch" != "quarterly" ]; then + sed -i.bak -e "s,pkg+http://pkg.FreeBSD.org/\${ABI}/quarterly,pkg+http://pkg.FreeBSD.org/\${ABI}/${pkg_branch}," /etc/pkg/FreeBSD.conf + rm -f /etc/pkg/FreeBSD.conf.bak + fi + + env ASSUME_ALWAYS_YES=true pkg update; +elif [ "$OS_NAME" = "Darwin" ]; then + echo "Downloading and installing system updates..." + sudo softwareupdate --agree-to-license -i -r -R --stdinpass vagrant +else + echo "Unsupported OS: $OS_NAME" + exit 1 +fi + +echo "updates installed rebooting" +reboot +sleep 60 diff --git a/packer_templates/scripts/_common/vagrant.sh b/packer_templates/scripts/_common/vagrant.sh index 142731ab5..941f330c3 100644 --- a/packer_templates/scripts/_common/vagrant.sh +++ b/packer_templates/scripts/_common/vagrant.sh @@ -1,33 +1,38 @@ #!/bin/sh -eux # set a default HOME_DIR environment variable if not set -HOME_DIR="${HOME_DIR:-/home/vagrant}"; +OS_NAME=$(uname -s) +if [ "$OS_NAME" = "Darwin" ]; then + HOME_DIR="/Users/vagrant}" +else + HOME_DIR="${HOME_DIR:-/home/vagrant}" +fi if command -v ping > /dev/null 2>&1; then echo "Pinging raw.githubusercontent.com"; if ! ping -c 1 raw.githubusercontent.com > /dev/null 2>&1; then - echo "Ping failed, sleeping for 30 seconds"; + echo "Ping failed, sleeping for 30 seconds" sleep 30; fi else - echo "Cannot ping, sleeping for 30 seconds"; + echo "Cannot ping, sleeping for 30 seconds" sleep 30; fi -pubkey_url="https://raw.githubusercontent.com/hashicorp/vagrant/main/keys/vagrant.pub"; -mkdir -p "$HOME_DIR"/.ssh; +pubkey_url="https://raw.githubusercontent.com/hashicorp/vagrant/main/keys/vagrant.pub" +mkdir -p "$HOME_DIR"/.ssh if command -v curl > /dev/null 2>&1; then curl --insecure --location "$pubkey_url" > "$HOME_DIR"/.ssh/authorized_keys && \ - echo "Successfully downloaded vagrant public key with curl"; + echo "Successfully downloaded vagrant public key with curl" elif command -v wget > /dev/null 2>&1; then wget --no-check-certificate "$pubkey_url" -O "$HOME_DIR"/.ssh/authorized_keys && \ - echo "Successfully downloaded vagrant public key with wget"; + echo "Successfully downloaded vagrant public key with wget" elif command -v fetch > /dev/null 2>&1; then fetch -am -o "$HOME_DIR"/.ssh/authorized_keys "$pubkey_url" && \ - echo "Successfully downloaded vagrant public key with fetch"; + echo "Successfully downloaded vagrant public key with fetch" else - echo "Cannot download vagrant public key"; - exit 1; + echo "Cannot download vagrant public key" + exit 1 fi -chown -R vagrant "$HOME_DIR"/.ssh; -chmod -R go-rwsx "$HOME_DIR"/.ssh; +chown -R vagrant "$HOME_DIR"/.ssh +chmod -R go-rwsx "$HOME_DIR"/.ssh diff --git a/packer_templates/scripts/_common/vmware.sh b/packer_templates/scripts/_common/vmware.sh deleted file mode 100644 index b6a3c171e..000000000 --- a/packer_templates/scripts/_common/vmware.sh +++ /dev/null @@ -1,38 +0,0 @@ -#!/bin/bash -eux - -# set a default HOME_DIR environment variable if not set -HOME_DIR="${HOME_DIR:-/home/vagrant}" - -case "$PACKER_BUILDER_TYPE" in -vmware-iso|vmware-vmx) - echo "installing open-vm-tools" - if [ -f "/bin/dnf" ]; then - dnf install -y open-vm-tools - systemctl enable vmtoolsd - systemctl start vmtoolsd - elif [ -f "/usr/bin/apt-get" ]; then - # determine the major Debian version we're runninng - major_version="$(grep VERSION_ID /etc/os-release | awk -F= '{print $2}' | tr -d '"')" - architecture="$(uname -m)" - # open-vm-tools for amd64 are only available in bullseye-backports repo - echo "install open-vm-tools" - if [ "$major_version" -eq 11 ] && [ "$architecture" = "aarch64" ]; then - echo 'deb http://deb.debian.org/debian bullseye-backports main' >> /etc/apt/sources.list - apt-get update - cat > /etc/modprobe.d/blacklist.conf <<EOF -blacklist vsock_loopback -blacklist vmw_vsock_virtio_transport_common -EOF - fi - apt-get install -y open-vm-tools; - mkdir /mnt/hgfs; - systemctl enable open-vm-tools - systemctl start open-vm-tools - elif [ -f "/usr/bin/zypper" ]; then - zypper install -y open-vm-tools insserv-compat - mkdir /mnt/hgfs - systemctl enable vmtoolsd - systemctl start vmtoolsd - fi - echo "platform specific vmware.sh executed" -esac diff --git a/packer_templates/scripts/debian/cleanup_debian.sh b/packer_templates/scripts/debian/cleanup_debian.sh index 0c8104d4d..820b8417d 100644 --- a/packer_templates/scripts/debian/cleanup_debian.sh +++ b/packer_templates/scripts/debian/cleanup_debian.sh @@ -2,7 +2,7 @@ if [ -d /sys/firmware/efi ]; then # Ensure the system can boot by adding the bootloader at the fallback path - grub-install --target=$(dpkg --print-architecture)-efi --efi-directory=/boot/efi --bootloader-id=debian --removable + grub-install --target="$(dpkg --print-architecture)"-efi --efi-directory=/boot/efi --bootloader-id=debian --removable fi echo "remove linux-headers" diff --git a/packer_templates/scripts/debian/update_debian.sh b/packer_templates/scripts/debian/update_debian.sh deleted file mode 100644 index ee07e8ea9..000000000 --- a/packer_templates/scripts/debian/update_debian.sh +++ /dev/null @@ -1,26 +0,0 @@ -#!/bin/sh -eux - -arch="$(uname -r | sed 's/^.*[0-9]\{1,\}\.[0-9]\{1,\}\.[0-9]\{1,\}\(-[0-9]\{1,2\}\)-//')" - -# Disable systemd apt timers/services -systemctl stop apt-daily.timer; -systemctl stop apt-daily-upgrade.timer; -systemctl disable apt-daily.timer; -systemctl disable apt-daily-upgrade.timer; -systemctl mask apt-daily.service; -systemctl mask apt-daily-upgrade.service; -systemctl daemon-reload; - -# Disable periodic activities of apt -cat <<EOF >/etc/apt/apt.conf.d/10periodic; -APT::Periodic::Enable "0"; -APT::Periodic::Update-Package-Lists "0"; -APT::Periodic::Download-Upgradeable-Packages "0"; -APT::Periodic::AutocleanInterval "0"; -APT::Periodic::Unattended-Upgrade "0"; -EOF - -apt-get update; - -apt-get -y upgrade linux-image-"$arch"; -apt-get -y install linux-headers-"$(uname -r)"; diff --git a/packer_templates/scripts/fedora/build-tools_fedora.sh b/packer_templates/scripts/fedora/build-tools_fedora.sh deleted file mode 100644 index e00cd1e4e..000000000 --- a/packer_templates/scripts/fedora/build-tools_fedora.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash -eux -# Installing build tools here because Fedora 22+ will not do so during kickstart -dnf -y install kernel-headers kernel-devel-"$(uname -r)" elfutils-libelf-devel gcc make perl diff --git a/packer_templates/scripts/fedora/update_dnf.sh b/packer_templates/scripts/fedora/update_dnf.sh deleted file mode 100644 index 856c12b35..000000000 --- a/packer_templates/scripts/fedora/update_dnf.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/sh -eux - -# update all packages -dnf -y upgrade - -reboot; -sleep 60; diff --git a/packer_templates/scripts/freebsd/minimize_freebsd.sh b/packer_templates/scripts/freebsd/minimize_freebsd.sh deleted file mode 100644 index 92cfaf4af..000000000 --- a/packer_templates/scripts/freebsd/minimize_freebsd.sh +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/sh -eux - -case "$PACKER_BUILDER_TYPE" in - qemu) exit 0 ;; -esac - -ZROOT="zroot/ROOT/default" - -zfs set compression=off $ZROOT; -dd if=/dev/zero of=/EMPTY bs=1m || echo "dd(1) exits after taking over all the space" -sync -rm -f /EMPTY; -# Block until the empty file has been removed, otherwise, Packer -# will try to kill the box while the disk is still full and that's bad -sync; -zfs set compression=lz4 $ZROOT; diff --git a/packer_templates/scripts/freebsd/update_freebsd.sh b/packer_templates/scripts/freebsd/update_freebsd.sh deleted file mode 100644 index 5ab088054..000000000 --- a/packer_templates/scripts/freebsd/update_freebsd.sh +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/sh -eux - -freebsd_update="/usr/sbin/freebsd-update --not-running-from-cron"; - -# Update FreeBSD -# NOTE: the install action fails if there are no updates so || true it -env PAGER=/bin/cat "$freebsd_update" fetch || true; -env PAGER=/bin/cat "$freebsd_update" install || true; - -# shellcheck disable=SC2154 -if [ "$pkg_branch" != "quarterly" ]; then - sed -i.bak -e "s,pkg+http://pkg.FreeBSD.org/\${ABI}/quarterly,pkg+http://pkg.FreeBSD.org/\${ABI}/${pkg_branch}," /etc/pkg/FreeBSD.conf - rm -f /etc/pkg/FreeBSD.conf.bak -fi - -env ASSUME_ALWAYS_YES=true pkg update; diff --git a/packer_templates/scripts/freebsd/vmtools_freebsd.sh b/packer_templates/scripts/freebsd/vmtools_freebsd.sh deleted file mode 100644 index e24d6f882..000000000 --- a/packer_templates/scripts/freebsd/vmtools_freebsd.sh +++ /dev/null @@ -1,54 +0,0 @@ -#!/bin/sh -eux - -case "$PACKER_BUILDER_TYPE" in - -virtualbox-iso|virtualbox-ovf) - # There are no vbox-guest additions for freebsd arm64 - ARCH=$(uname -m) - if [ "$ARCH" = "arm64" ]; then - return - fi - - # Disable X11 because vagrants are (usually) headless - echo 'WITHOUT_X11="YES"' >> /etc/make.conf; - - pkg install -y virtualbox-ose-additions-nox11; - - echo 'vboxdrv_load="YES"' >>/boot/loader.conf; - echo 'vboxnet_enable="YES"' >>/etc/rc.conf; - echo 'vboxguest_enable="YES"' >>/etc/rc.conf; - echo 'vboxservice_enable="YES"' >>/etc/rc.conf; - - echo 'virtio_blk_load="YES"' >>/boot/loader.conf; - echo 'virtio_scsi_load="YES"' >>/boot/loader.conf; - echo 'virtio_balloon_load="YES"' >>/boot/loader.conf; - echo 'if_vtnet_load="YES"' >>/boot/loader.conf; - - echo 'ifconfig_vtnet0_name="em0"' >>/etc/rc.conf; - echo 'ifconfig_vtnet1_name="em1"' >>/etc/rc.conf; - echo 'ifconfig_vtnet2_name="em2"' >>/etc/rc.conf; - echo 'ifconfig_vtnet3_name="em3"' >>/etc/rc.conf; - - pw groupadd vboxusers; - pw groupmod vboxusers -m vagrant; - ;; - -vmware-iso|vmware-vmx) - pkg install -y open-vm-tools-nox11; - - # for shared folder - echo 'fuse_load="YES"' >>/boot/loader.conf; - - echo 'ifconfig_vmx0="dhcp"' >>/etc/rc.conf; - ;; - -parallels-iso|parallels-pvm) - pkg install -y parallels-tools - ;; - -*) - echo "Unknown Packer Builder Type >>$PACKER_BUILDER_TYPE<< selected."; - echo "Known are virtualbox-iso|virtualbox-ovf|vmware-iso|vmware-vmx|parallels-iso|parallels-pvm."; - ;; - -esac diff --git a/packer_templates/scripts/macos/parallels-tools.sh b/packer_templates/scripts/macos/parallels-tools.sh deleted file mode 100644 index 4eea703a6..000000000 --- a/packer_templates/scripts/macos/parallels-tools.sh +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/sh - -if [ -e .PACKER_BUILDER_TYPE ] || echo "$PACKER_BUILDER_TYPE" | grep -q '^parallels'; then - echo "Installing Parallels Tools..." - installer -pkg /Volumes/Parallels\ Tools/Install.app/Contents/Resources/Install.mpkg -target / - - # This usually works but gives a failed to eject error - hdiutil detach /Volumes/Parallels\ Tools || echo "exit code $? is suppressed"; - - # Reboot is needed for tools install - reboot -fi diff --git a/packer_templates/scripts/macos/shrink.sh b/packer_templates/scripts/macos/shrink.sh deleted file mode 100644 index 14301079a..000000000 --- a/packer_templates/scripts/macos/shrink.sh +++ /dev/null @@ -1,37 +0,0 @@ -#!/bin/bash -# The MIT License (MIT) -# Copyright (c) 2013-2017 Timothy Sutton -# -# Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated -# documentation files (the "Software"), to deal in the Software without restriction, including without limitation the -# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit -# persons to whom the Software is furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE -# WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR -# COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR -# OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - -echo 'Disable spotlight...' -mdutil -a -i off - -echo 'Turn off hibernation and get rid of the sleepimage' -pmset hibernatemode 0 -rm -f /var/vm/sleepimage - -echo 'Remove Screensaver video files' -rm -rf /Library/Application Support/com.apple.idleassetsd/Customer/* || echo "rm screensaver videos exit code $? is suppressed" - -echo 'Remove logs' -rm -rf /Library/Logs/* || echo "rm library logs exit code $? is suppressed" - -echo 'Remove swap file' -rm -rf /System/Volumes/VM/swapfile* || echo "rm swapfile exit code $? is suppressed" - -if [ -e .vmfusion_version ] || [[ "$PACKER_BUILDER_TYPE" == vmware* ]]; then - echo 'VMware Fusion specific items' - echo 'Shrink the disk' - /Library/Application\ Support/VMware\ Tools/vmware-tools-cli disk shrink / -fi diff --git a/packer_templates/scripts/macos/system-update.sh b/packer_templates/scripts/macos/system-update.sh deleted file mode 100644 index ebf35e392..000000000 --- a/packer_templates/scripts/macos/system-update.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh - -echo "Downloading and installing system updates..." -softwareupdate -i -r -R diff --git a/packer_templates/scripts/macos/vagrant.sh b/packer_templates/scripts/macos/vagrant.sh deleted file mode 100644 index 108c289d5..000000000 --- a/packer_templates/scripts/macos/vagrant.sh +++ /dev/null @@ -1,30 +0,0 @@ -#!/bin/sh -# The MIT License (MIT) -# Copyright (c) 2013-2017 Timothy Sutton -# -# Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated -# documentation files (the "Software"), to deal in the Software without restriction, including without limitation the -# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit -# persons to whom the Software is furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE -# WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR -# COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR -# OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - -date > /etc/box_build_time -OSX_VERS=$(sw_vers -productVersion | awk -F "." '{print $1}') - -# Set computer/hostname -COMPNAME=macos-${OSX_VERS} -scutil --set ComputerName "${COMPNAME}" -scutil --set HostName "${COMPNAME}".vagrantup.com - -echo "Installing vagrant keys for vagrant user" -mkdir "/Users/vagrant/.ssh" -chmod 700 "/Users/vagrant/.ssh" -curl -L 'https://raw.githubusercontent.com/hashicorp/vagrant/main/keys/vagrant.pub' > "/Users/vagrant/.ssh/authorized_keys" -chmod 600 "/Users/vagrant/.ssh/authorized_keys" -chown -R "vagrant" "/Users/vagrant/.ssh" diff --git a/packer_templates/scripts/macos/vmware-tools.sh b/packer_templates/scripts/macos/vmware-tools.sh deleted file mode 100644 index 08218ba56..000000000 --- a/packer_templates/scripts/macos/vmware-tools.sh +++ /dev/null @@ -1,48 +0,0 @@ -#!/bin/sh -# The MIT License (MIT) -# Copyright (c) 2013-2017 Timothy Sutton -# -# Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated -# documentation files (the "Software"), to deal in the Software without restriction, including without limitation the -# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit -# persons to whom the Software is furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE -# WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR -# COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR -# OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - -echo 'VMware Fusion specific items' -if [ -e .vmfusion_version ] || echo "$PACKER_BUILDER_TYPE" | grep -q '^vmware'; then - # Globbing here: VMware Fusion >= 8.5.4 includes a second - # 'darwinPre15.iso' for any OS X guests pre-10.11 - TOOLS_PATH=$(find "/Users/vagrant/" -name '*darwin*.iso' -print) - if [ ! -e "$TOOLS_PATH" ]; then - echo "Couldn't locate uploaded tools iso at $TOOLS_PATH!" - exit 1 - fi - - TMPMOUNT=$(/usr/bin/mktemp -d /tmp/vmware-tools.XXXX) - hdiutil attach "$TOOLS_PATH" -mountpoint "$TMPMOUNT" - - INSTALLER_PKG="$TMPMOUNT/Install VMware Tools.app/Contents/Resources/VMware Tools.pkg" - if [ ! -e "$INSTALLER_PKG" ]; then - echo "Couldn't locate VMware installer pkg at $INSTALLER_PKG!" - exit 1 - fi - - echo "Installing VMware tools.." - installer -pkg "$TMPMOUNT/Install VMware Tools.app/Contents/Resources/VMware Tools.pkg" -target / - - # This usually fails - hdiutil detach "$TMPMOUNT" || echo "exit code $? is suppressed"; - rm -rf "$TMPMOUNT" - rm -f "$TOOLS_PATH" - - # Point Linux shared folder root to that used by OS X guests, - # useful for the Hashicorp vmware_fusion Vagrant provider plugin - mkdir /mnt - ln -sf /Volumes/VMware\ Shared\ Folders /mnt/hgfs -fi diff --git a/packer_templates/scripts/rhel/update_dnf.sh b/packer_templates/scripts/rhel/update_dnf.sh deleted file mode 100644 index 62c95df90..000000000 --- a/packer_templates/scripts/rhel/update_dnf.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/sh -eux - -# update all packages -dnf -y upgrade --skip-broken - -reboot; -sleep 60; diff --git a/packer_templates/scripts/suse/update_suse.sh b/packer_templates/scripts/suse/update_suse.sh deleted file mode 100644 index 4da63d378..000000000 --- a/packer_templates/scripts/suse/update_suse.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/sh -eux - -echo "updating all packages" -zypper update -y - -reboot diff --git a/packer_templates/scripts/ubuntu/update_ubuntu.sh b/packer_templates/scripts/ubuntu/update_ubuntu.sh deleted file mode 100644 index 79ca01b65..000000000 --- a/packer_templates/scripts/ubuntu/update_ubuntu.sh +++ /dev/null @@ -1,35 +0,0 @@ -#!/bin/sh -eux -export DEBIAN_FRONTEND=noninteractive - -echo "disable release-upgrades" -sed -i.bak 's/^Prompt=.*$/Prompt=never/' /etc/update-manager/release-upgrades; - -echo "disable systemd apt timers/services" -systemctl stop apt-daily.timer; -systemctl stop apt-daily-upgrade.timer; -systemctl disable apt-daily.timer; -systemctl disable apt-daily-upgrade.timer; -systemctl mask apt-daily.service; -systemctl mask apt-daily-upgrade.service; -systemctl daemon-reload; - -# Disable periodic activities of apt to be safe -cat <<EOF >/etc/apt/apt.conf.d/10periodic; -APT::Periodic::Enable "0"; -APT::Periodic::Update-Package-Lists "0"; -APT::Periodic::Download-Upgradeable-Packages "0"; -APT::Periodic::AutocleanInterval "0"; -APT::Periodic::Unattended-Upgrade "0"; -EOF - -echo "remove the unattended-upgrades and ubuntu-release-upgrader-core packages" -rm -rf /var/log/unattended-upgrades; -apt-get -y purge unattended-upgrades ubuntu-release-upgrader-core; - -echo "update the package list" -apt-get -y update; - -echo "upgrade all installed packages incl. kernel and kernel headers" -apt-get -y dist-upgrade -o Dpkg::Options::="--force-confnew"; - -reboot diff --git a/packer_templates/win_answer_files/10/Autounattend.xml b/packer_templates/win_answer_files/10/Autounattend.xml deleted file mode 100644 index 9686440fb..000000000 --- a/packer_templates/win_answer_files/10/Autounattend.xml +++ /dev/null @@ -1,301 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<unattend xmlns="urn:schemas-microsoft-com:unattend" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - <settings pass="windowsPE"> - <component name="Microsoft-Windows-PnpCustomizationsWinPE" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" processorArchitecture="amd64"> - <!-- - This makes the VirtIO drivers available to Windows, assuming that - the VirtIO driver disk at https://fedorapeople.org/groups/virt/virtio-win/direct-downloads/stable-virtio/virtio-win.iso - (see https://docs.fedoraproject.org/en-US/quick-docs/creating-windows-virtual-machines-using-virtio-drivers/index.html#virtio-win-direct-downloads) - is available as drive E: - --> - <DriverPaths> - <PathAndCredentials wcm:action="add" wcm:keyValue="2"> - <Path>E:\viostor\w10\amd64</Path> - </PathAndCredentials> - <PathAndCredentials wcm:action="add" wcm:keyValue="3"> - <Path>E:\NetKVM\w10\amd64</Path> - </PathAndCredentials> - <PathAndCredentials wcm:action="add" wcm:keyValue="4"> - <Path>E:\Balloon\w10\amd64</Path> - </PathAndCredentials> - <PathAndCredentials wcm:action="add" wcm:keyValue="5"> - <Path>E:\pvpanic\w10\amd64</Path> - </PathAndCredentials> - <PathAndCredentials wcm:action="add" wcm:keyValue="6"> - <Path>E:\qemupciserial\w10\amd64</Path> - </PathAndCredentials> - <PathAndCredentials wcm:action="add" wcm:keyValue="7"> - <Path>E:\qxldod\w10\amd64</Path> - </PathAndCredentials> - <PathAndCredentials wcm:action="add" wcm:keyValue="8"> - <Path>E:\vioinput\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:\vioscsi\w10\amd64</Path> - </PathAndCredentials> - <PathAndCredentials wcm:action="add" wcm:keyValue="11"> - <Path>E:\vioserial\w10\amd64</Path> - </PathAndCredentials> - </DriverPaths> - </component> - <component name="Microsoft-Windows-International-Core-WinPE" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> - <SetupUILanguage> - <UILanguage>en-US</UILanguage> - </SetupUILanguage> - <InputLocale>en-US</InputLocale> - <SystemLocale>en-US</SystemLocale> - <UILanguage>en-US</UILanguage> - <UILanguageFallback>en-US</UILanguageFallback> - <UserLocale>en-US</UserLocale> - </component> - <component name="Microsoft-Windows-Setup" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> - <DiskConfiguration> - <Disk wcm:action="add"> - <CreatePartitions> - <CreatePartition wcm:action="add"> - <Type>Primary</Type> - <Order>1</Order> - <Size>100</Size> - </CreatePartition> - <CreatePartition wcm:action="add"> - <Order>2</Order> - <Type>Primary</Type> - <Extend>true</Extend> - </CreatePartition> - </CreatePartitions> - <ModifyPartitions> - <ModifyPartition wcm:action="add"> - <Active>true</Active> - <Format>NTFS</Format> - <Label>boot</Label> - <Order>1</Order> - <PartitionID>1</PartitionID> - </ModifyPartition> - <ModifyPartition wcm:action="add"> - <Format>NTFS</Format> - <Label>Windows</Label> - <Letter>C</Letter> - <Order>2</Order> - <PartitionID>2</PartitionID> - </ModifyPartition> - </ModifyPartitions> - <DiskID>0</DiskID> - <WillWipeDisk>true</WillWipeDisk> - </Disk> - </DiskConfiguration> - <ImageInstall> - <OSImage> - <InstallFrom> - <MetaData wcm:action="add"> - <Key>/IMAGE/NAME</Key> - <Value>Windows 10 Enterprise Evaluation</Value> - </MetaData> - </InstallFrom> - <InstallTo> - <DiskID>0</DiskID> - <PartitionID>2</PartitionID> - </InstallTo> - </OSImage> - </ImageInstall> - <UserData> - <ProductKey> - <WillShowUI>OnError</WillShowUI> - </ProductKey> - <AcceptEula>true</AcceptEula> - <FullName>Vagrant</FullName> - <Organization>Bento by Progress Chef</Organization> - </UserData> - <DynamicUpdate> - <Enable>false</Enable> - </DynamicUpdate> - </component> - </settings> - <settings pass="generalize"> - <component name="Microsoft-Windows-Security-SPP" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> - <SkipRearm>1</SkipRearm> - </component> - <component name="Microsoft-Windows-PnpSysprep" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> - <PersistAllDeviceInstalls>false</PersistAllDeviceInstalls> - <DoNotCleanUpNonPresentDevices>false</DoNotCleanUpNonPresentDevices> - </component> - </settings> - <settings pass="oobeSystem"> - <component name="Microsoft-Windows-International-Core" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> - <InputLocale>en-US</InputLocale> - <SystemLocale>en-US</SystemLocale> - <UILanguage>en-US</UILanguage> - <UserLocale>en-US</UserLocale> - </component> - <component name="Microsoft-Windows-Shell-Setup" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> - <OOBE> - <HideEULAPage>true</HideEULAPage> - <HideLocalAccountScreen>true</HideLocalAccountScreen> - <HideOEMRegistrationScreen>true</HideOEMRegistrationScreen> - <HideOnlineAccountScreens>true</HideOnlineAccountScreens> - <HideWirelessSetupInOOBE>true</HideWirelessSetupInOOBE> - <NetworkLocation>Work</NetworkLocation> - <ProtectYourPC>3</ProtectYourPC> - <SkipMachineOOBE>true</SkipMachineOOBE> - <SkipUserOOBE>true</SkipUserOOBE> - <VMModeOptimizations> - <SkipAdministratorProfileRemoval>true</SkipAdministratorProfileRemoval> - <SkipNotifyUILanguageChange>true</SkipNotifyUILanguageChange> - <SkipWinREInitialization>true</SkipWinREInitialization> - </VMModeOptimizations> - </OOBE> - <TimeZone>UTC</TimeZone> - <UserAccounts> - <AdministratorPassword> - <Value>vagrant</Value> - <PlainText>true</PlainText> - </AdministratorPassword> - <LocalAccounts> - <LocalAccount wcm:action="add"> - <Password> - <Value>vagrant</Value> - <PlainText>true</PlainText> - </Password> - <Description>Vagrant User</Description> - <DisplayName>vagrant</DisplayName> - <Group>administrators</Group> - <Name>vagrant</Name> - </LocalAccount> - </LocalAccounts> - </UserAccounts> - <AutoLogon> - <Password> - <Value>vagrant</Value> - <PlainText>true</PlainText> - </Password> - <Username>vagrant</Username> - <Enabled>true</Enabled> - </AutoLogon> - <FirstLogonCommands> - <SynchronousCommand wcm:action="add"> - <CommandLine>%windir%\System32\WindowsPowerShell\v1.0\powershell.exe -Command "Set-ExecutionPolicy -ExecutionPolicy RemoteSigned -Force"</CommandLine> - <Description>Set Execution Policy 64 Bit</Description> - <Order>1</Order> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <CommandLine>%windir%\SysWOW64\cmd.exe /c powershell -Command "Set-ExecutionPolicy -ExecutionPolicy RemoteSigned -Force"</CommandLine> - <Description>Set Execution Policy 32 Bit</Description> - <Order>2</Order> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <Order>3</Order> - <CommandLine>%windir%\System32\WindowsPowerShell\v1.0\powershell.exe -Command Get-NetConnectionProfile | Set-NetConnectionProfile -NetworkCategory "Private"</CommandLine> - <Description>Sets detected network connections to private to allow start of winrm</Description> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <Order>4</Order> - <CommandLine>%windir%\System32\WindowsPowerShell\v1.0\powershell.exe -Command Set-NetFirewallRule -Name "WINRM-HTTP-In-TCP" -RemoteAddress Any</CommandLine> - <Description>Allows winrm over public profile interfaces</Description> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <Order>5</Order> - <CommandLine>%windir%\System32\cmd.exe /c winrm quickconfig -q</CommandLine> - <Description>winrm quickconfig -q</Description> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <Order>6</Order> - <CommandLine>%windir%\System32\cmd.exe /c winrm quickconfig -transport:http</CommandLine> - <Description>winrm quickconfig -transport:http</Description> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <Order>7</Order> - <CommandLine>%windir%\System32\cmd.exe /c winrm set winrm/config @{MaxTimeoutms="1800000"}</CommandLine> - <Description>Win RM MaxTimoutms</Description> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <Order>8</Order> - <CommandLine>%windir%\System32\cmd.exe /c winrm set winrm/config/winrs @{MaxMemoryPerShellMB="2048"}</CommandLine> - <Description>Win RM MaxMemoryPerShellMB</Description> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <Order>9</Order> - <CommandLine>%windir%\System32\cmd.exe /c winrm set winrm/config/service @{AllowUnencrypted="true"}</CommandLine> - <Description>Win RM AllowUnencrypted</Description> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <Order>10</Order> - <CommandLine>%windir%\System32\cmd.exe /c winrm set winrm/config/service/auth @{Basic="true"}</CommandLine> - <Description>Win RM auth Basic</Description> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <Order>11</Order> - <CommandLine>%windir%\System32\cmd.exe /c winrm set winrm/config/client/auth @{Basic="true"}</CommandLine> - <Description>Win RM client auth Basic</Description> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <Order>12</Order> - <CommandLine>%windir%\System32\cmd.exe /c winrm set winrm/config/listener?Address=*+Transport=HTTP @{Port="5985"}</CommandLine> - <Description>Win RM listener Address/Port</Description> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <Order>13</Order> - <CommandLine>%windir%\System32\cmd.exe /c netsh firewall add portopening TCP 5985 "Port 5985"</CommandLine> - <Description>Win RM port open</Description> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <Order>14</Order> - <CommandLine>%windir%\System32\cmd.exe /c net stop winrm</CommandLine> - <Description>Stop Win RM Service</Description> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <Order>15</Order> - <CommandLine>%windir%\System32\cmd.exe /c sc config winrm start= auto</CommandLine> - <Description>Win RM Autostart</Description> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <Order>16</Order> - <CommandLine>%windir%\System32\cmd.exe /c net start winrm</CommandLine> - <Description>Start Win RM Service</Description> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <Order>17</Order> - <CommandLine>%windir%\System32\cmd.exe /c wmic useraccount where "name='vagrant'" set PasswordExpires=FALSE</CommandLine> - <Description>Disable password expiration for vagrant user</Description> - </SynchronousCommand> - </FirstLogonCommands> - </component> - <component name="Microsoft-Windows-WinRE-RecoveryAgent" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> - <UninstallWindowsRE>true</UninstallWindowsRE> - </component> - </settings> - <settings pass="specialize"> - <component name="Microsoft-Windows-SystemRestore-Main" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> - <DisableSR>1</DisableSR> - </component> - <component name="Microsoft-Windows-SystemSettingsThreshold" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> - <DisplayNetworkSelection>false</DisplayNetworkSelection> - </component> - <component name="Networking-MPSSVC-Svc" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> - <FirewallGroups> - <FirewallGroup wcm:action="add" wcm:keyValue="WindowsRemoteManagement"> - <Active>true</Active> - <Group>Windows Remote Management</Group> - <Profile>all</Profile> - </FirewallGroup> - <FirewallGroup wcm:action="add" wcm:keyValue="RemoteAdministration"> - <Active>true</Active> - <Group>Remote Administration</Group> - <Profile>all</Profile> - </FirewallGroup> - </FirewallGroups> - </component> - <component name="Microsoft-Windows-SQMApi" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> - <CEIPEnabled>0</CEIPEnabled> - </component> - <component name="Microsoft-Windows-Security-SPP-UX" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> - <SkipAutoActivation>true</SkipAutoActivation> - </component> - </settings> - <settings pass="offlineServicing"> - <component name="Microsoft-Windows-LUA-Settings" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> - <EnableLUA>false</EnableLUA> - </component> - </settings> -</unattend> diff --git a/packer_templates/win_answer_files/10/hyperv-gen2/Autounattend.xml b/packer_templates/win_answer_files/10/hyperv-gen2/Autounattend.xml deleted file mode 100644 index b56757830..000000000 --- a/packer_templates/win_answer_files/10/hyperv-gen2/Autounattend.xml +++ /dev/null @@ -1,320 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<unattend xmlns="urn:schemas-microsoft-com:unattend" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - <settings pass="windowsPE"> - <component name="Microsoft-Windows-PnpCustomizationsWinPE" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" processorArchitecture="amd64"> <!-- - This makes the VirtIO drivers available to Windows, assuming that - the VirtIO driver disk at https://fedorapeople.org/groups/virt/virtio-win/direct-downloads/stable-virtio/virtio-win.iso - (see https://docs.fedoraproject.org/en-US/quick-docs/creating-windows-virtual-machines-using-virtio-drivers/index.html#virtio-win-direct-downloads) - is available as drive E: - --> - <DriverPaths> - <PathAndCredentials wcm:action="add" wcm:keyValue="2"> - <Path>F:\viostor\w10\amd64</Path> - </PathAndCredentials> - <PathAndCredentials wcm:action="add" wcm:keyValue="3"> - <Path>F:\NetKVM\w10\amd64</Path> - </PathAndCredentials> - <PathAndCredentials wcm:action="add" wcm:keyValue="4"> - <Path>F:\Balloon\w10\amd64</Path> - </PathAndCredentials> - <PathAndCredentials wcm:action="add" wcm:keyValue="5"> - <Path>F:\pvpanic\w10\amd64</Path> - </PathAndCredentials> - <PathAndCredentials wcm:action="add" wcm:keyValue="6"> - <Path>F:\qemupciserial\w10\amd64</Path> - </PathAndCredentials> - <PathAndCredentials wcm:action="add" wcm:keyValue="7"> - <Path>F:\qxldod\w10\amd64</Path> - </PathAndCredentials> - <PathAndCredentials wcm:action="add" wcm:keyValue="8"> - <Path>F:\vioinput\w10\amd64</Path> - </PathAndCredentials> - <PathAndCredentials wcm:action="add" wcm:keyValue="9"> - <Path>F:\viorng\w10\amd64</Path> - </PathAndCredentials> - <PathAndCredentials wcm:action="add" wcm:keyValue="10"> - <Path>F:\vioscsi\w10\amd64</Path> - </PathAndCredentials> - <PathAndCredentials wcm:action="add" wcm:keyValue="11"> - <Path>F:\vioserial\w10\amd64</Path> - </PathAndCredentials> - </DriverPaths> - </component> - <component name="Microsoft-Windows-International-Core-WinPE" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> - <SetupUILanguage> - <UILanguage>en-US</UILanguage> - </SetupUILanguage> - <InputLocale>en-US</InputLocale> - <SystemLocale>en-US</SystemLocale> - <UILanguage>en-US</UILanguage> - <UILanguageFallback>en-US</UILanguageFallback> - <UserLocale>en-US</UserLocale> - </component> - <component name="Microsoft-Windows-Setup" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> - <DiskConfiguration> - <Disk wcm:action="add"> - <CreatePartitions> - <CreatePartition wcm:action="add"> - <Order>1</Order> - <Size>350</Size> - <Type>Primary</Type> - </CreatePartition> - <CreatePartition wcm:action="add"> - <Order>2</Order> - <Size>100</Size> - <Type>EFI</Type> - </CreatePartition> - <CreatePartition wcm:action="add"> - <Order>3</Order> - <Size>128</Size> - <Type>MSR</Type> - </CreatePartition> - <CreatePartition wcm:action="add"> - <Order>4</Order> - <Extend>true</Extend> - <Type>Primary</Type> - </CreatePartition> - </CreatePartitions> - <ModifyPartitions> - <ModifyPartition wcm:action="add"> - <Order>1</Order> - <PartitionID>1</PartitionID> - <Label>WINRE</Label> - <Format>NTFS</Format> - <TypeID>de94bba4-06d1-4d40-a16a-bfd50179d6ac</TypeID> - </ModifyPartition> - <ModifyPartition wcm:action="add"> - <Order>2</Order> - <PartitionID>2</PartitionID> - <Label>System</Label> - <Format>FAT32</Format> - </ModifyPartition> - <ModifyPartition wcm:action="add"> - <Order>3</Order> - <PartitionID>3</PartitionID> - </ModifyPartition> - <ModifyPartition wcm:action="add"> - <Order>4</Order> - <PartitionID>4</PartitionID> - <Label>Windows</Label> - <Format>NTFS</Format> - </ModifyPartition> - </ModifyPartitions> - <DiskID>0</DiskID> - <WillWipeDisk>true</WillWipeDisk> - </Disk> - <WillShowUI>OnError</WillShowUI> - </DiskConfiguration> - <ImageInstall> - <OSImage> - <InstallFrom> - <MetaData wcm:action="add"> - <Key>/IMAGE/NAME</Key> - <Value>Windows 10 Enterprise Evaluation</Value> - </MetaData> - </InstallFrom> - <InstallTo> - <DiskID>0</DiskID> - <PartitionID>4</PartitionID> - </InstallTo> - </OSImage> - </ImageInstall> - <UserData> - <ProductKey> - <WillShowUI>OnError</WillShowUI> - </ProductKey> - <AcceptEula>true</AcceptEula> - <FullName>Vagrant</FullName> - <Organization>Bento by Progress Chef</Organization> - </UserData> - <DynamicUpdate> - <Enable>false</Enable> - </DynamicUpdate> - </component> - </settings> - <settings pass="generalize"> - <component name="Microsoft-Windows-Security-SPP" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> - <SkipRearm>1</SkipRearm> - </component> - <component name="Microsoft-Windows-PnpSysprep" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> - <PersistAllDeviceInstalls>false</PersistAllDeviceInstalls> - <DoNotCleanUpNonPresentDevices>false</DoNotCleanUpNonPresentDevices> - </component> - </settings> - <settings pass="oobeSystem"> - <component name="Microsoft-Windows-International-Core" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> - <InputLocale>en-US</InputLocale> - <SystemLocale>en-US</SystemLocale> - <UILanguage>en-US</UILanguage> - <UserLocale>en-US</UserLocale> - </component> - <component name="Microsoft-Windows-Shell-Setup" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> - <OOBE> - <HideEULAPage>true</HideEULAPage> - <HideLocalAccountScreen>true</HideLocalAccountScreen> - <HideOEMRegistrationScreen>true</HideOEMRegistrationScreen> - <HideOnlineAccountScreens>true</HideOnlineAccountScreens> - <HideWirelessSetupInOOBE>true</HideWirelessSetupInOOBE> - <NetworkLocation>Work</NetworkLocation> - <ProtectYourPC>3</ProtectYourPC> - <SkipMachineOOBE>true</SkipMachineOOBE> - <SkipUserOOBE>true</SkipUserOOBE> - <VMModeOptimizations> - <SkipAdministratorProfileRemoval>true</SkipAdministratorProfileRemoval> - <SkipNotifyUILanguageChange>true</SkipNotifyUILanguageChange> - <SkipWinREInitialization>true</SkipWinREInitialization> - </VMModeOptimizations> - </OOBE> - <TimeZone>UTC</TimeZone> - <UserAccounts> - <AdministratorPassword> - <Value>vagrant</Value> - <PlainText>true</PlainText> - </AdministratorPassword> - <LocalAccounts> - <LocalAccount wcm:action="add"> - <Password> - <Value>vagrant</Value> - <PlainText>true</PlainText> - </Password> - <Description>Vagrant User</Description> - <DisplayName>vagrant</DisplayName> - <Group>administrators</Group> - <Name>vagrant</Name> - </LocalAccount> - </LocalAccounts> - </UserAccounts> - <AutoLogon> - <Password> - <Value>vagrant</Value> - <PlainText>true</PlainText> - </Password> - <Username>vagrant</Username> - <Enabled>true</Enabled> - </AutoLogon> - <FirstLogonCommands> - <SynchronousCommand wcm:action="add"> - <CommandLine>%windir%\System32\WindowsPowerShell\v1.0\powershell.exe -Command "Set-ExecutionPolicy -ExecutionPolicy RemoteSigned -Force"</CommandLine> - <Description>Set Execution Policy 64 Bit</Description> - <Order>1</Order> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <CommandLine>%windir%\SysWOW64\cmd.exe /c powershell -Command "Set-ExecutionPolicy -ExecutionPolicy RemoteSigned -Force"</CommandLine> - <Description>Set Execution Policy 32 Bit</Description> - <Order>2</Order> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <Order>3</Order> - <CommandLine>%windir%\System32\WindowsPowerShell\v1.0\powershell.exe -Command Get-NetConnectionProfile | Set-NetConnectionProfile -NetworkCategory "Private"</CommandLine> - <Description>Sets detected network connections to private to allow start of winrm</Description> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <Order>4</Order> - <CommandLine>%windir%\System32\WindowsPowerShell\v1.0\powershell.exe -Command Set-NetFirewallRule -Name "WINRM-HTTP-In-TCP" -RemoteAddress Any</CommandLine> - <Description>Allows winrm over public profile interfaces</Description> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <Order>5</Order> - <CommandLine>%windir%\System32\cmd.exe /c winrm quickconfig -q</CommandLine> - <Description>winrm quickconfig -q</Description> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <Order>6</Order> - <CommandLine>%windir%\System32\cmd.exe /c winrm quickconfig -transport:http</CommandLine> - <Description>winrm quickconfig -transport:http</Description> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <Order>7</Order> - <CommandLine>%windir%\System32\cmd.exe /c winrm set winrm/config @{MaxTimeoutms="1800000"}</CommandLine> - <Description>Win RM MaxTimoutms</Description> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <Order>8</Order> - <CommandLine>%windir%\System32\cmd.exe /c winrm set winrm/config/winrs @{MaxMemoryPerShellMB="2048"}</CommandLine> - <Description>Win RM MaxMemoryPerShellMB</Description> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <Order>9</Order> - <CommandLine>%windir%\System32\cmd.exe /c winrm set winrm/config/service @{AllowUnencrypted="true"}</CommandLine> - <Description>Win RM AllowUnencrypted</Description> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <Order>10</Order> - <CommandLine>%windir%\System32\cmd.exe /c winrm set winrm/config/service/auth @{Basic="true"}</CommandLine> - <Description>Win RM auth Basic</Description> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <Order>11</Order> - <CommandLine>%windir%\System32\cmd.exe /c winrm set winrm/config/client/auth @{Basic="true"}</CommandLine> - <Description>Win RM client auth Basic</Description> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <Order>12</Order> - <CommandLine>%windir%\System32\cmd.exe /c winrm set winrm/config/listener?Address=*+Transport=HTTP @{Port="5985"}</CommandLine> - <Description>Win RM listener Address/Port</Description> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <Order>13</Order> - <CommandLine>%windir%\System32\cmd.exe /c netsh firewall add portopening TCP 5985 "Port 5985"</CommandLine> - <Description>Win RM port open</Description> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <Order>14</Order> - <CommandLine>%windir%\System32\cmd.exe /c net stop winrm</CommandLine> - <Description>Stop Win RM Service</Description> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <Order>15</Order> - <CommandLine>%windir%\System32\cmd.exe /c sc config winrm start= auto</CommandLine> - <Description>Win RM Autostart</Description> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <Order>16</Order> - <CommandLine>%windir%\System32\cmd.exe /c net start winrm</CommandLine> - <Description>Start Win RM Service</Description> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <Order>17</Order> - <CommandLine>%windir%\System32\cmd.exe /c wmic useraccount where "name='vagrant'" set PasswordExpires=FALSE</CommandLine> - <Description>Disable password expiration for vagrant user</Description> - </SynchronousCommand> - </FirstLogonCommands> - </component> - <component name="Microsoft-Windows-WinRE-RecoveryAgent" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> - <UninstallWindowsRE>true</UninstallWindowsRE> - </component> - </settings> - <settings pass="specialize"> - <component name="Microsoft-Windows-SystemRestore-Main" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> - <DisableSR>1</DisableSR> - </component> - <component name="Microsoft-Windows-SystemSettingsThreshold" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> - <DisplayNetworkSelection>false</DisplayNetworkSelection> - </component> - <component name="Networking-MPSSVC-Svc" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> - <FirewallGroups> - <FirewallGroup wcm:action="add" wcm:keyValue="WindowsRemoteManagement"> - <Active>true</Active> - <Group>Windows Remote Management</Group> - <Profile>all</Profile> - </FirewallGroup> - <FirewallGroup wcm:action="add" wcm:keyValue="RemoteAdministration"> - <Active>true</Active> - <Group>Remote Administration</Group> - <Profile>all</Profile> - </FirewallGroup> - </FirewallGroups> - </component> - <component name="Microsoft-Windows-SQMApi" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> - <CEIPEnabled>0</CEIPEnabled> - </component> - <component name="Microsoft-Windows-Security-SPP-UX" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> - <SkipAutoActivation>true</SkipAutoActivation> - </component> - </settings> - <settings pass="offlineServicing"> - <component name="Microsoft-Windows-LUA-Settings" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> - <EnableLUA>false</EnableLUA> - </component> - </settings> -</unattend> From 04d0862fc9b90e0bbedd83cacd6ef89214d7a6ae Mon Sep 17 00:00:00 2001 From: Corey Hemminger <hemminger@hotmail.com> Date: Sun, 10 Aug 2025 14:46:52 -0500 Subject: [PATCH 1583/1622] update common scripts reboot command (#1624) * update common scripts reboot command --------- Signed-off-by: Corey Hemminger <hemminger@hotmail.com> --- .github/workflows/pkr-bld-amazonlinux-arm64.yml | 2 -- .github/workflows/pkr-bld-amazonlinux-x64.yml | 2 -- .github/workflows/pkr-bld-hyperv-x64.yml | 2 -- .github/workflows/pkr-bld-qemu-x64.yml | 2 -- .github/workflows/pkr-bld-virtualbox-x64.yml | 2 -- .github/workflows/test-pkr-bld-parallels.yml | 2 -- os_pkrvars/macos/macos-15-aarch64.pkrvars.hcl | 2 +- packer_templates/scripts/_common/build_tools.sh | 3 ++- .../scripts/_common/guest_tools_parallels.sh | 12 +++++++++--- .../scripts/_common/guest_tools_virtualbox.sh | 12 ++++++++---- .../scripts/_common/guest_tools_vmware.sh | 2 +- packer_templates/scripts/_common/update_packages.sh | 4 +--- packer_templates/scripts/_common/vagrant.sh | 4 ++-- 13 files changed, 24 insertions(+), 27 deletions(-) diff --git a/.github/workflows/pkr-bld-amazonlinux-arm64.yml b/.github/workflows/pkr-bld-amazonlinux-arm64.yml index 342c2bacb..ffa8f35b3 100644 --- a/.github/workflows/pkr-bld-amazonlinux-arm64.yml +++ b/.github/workflows/pkr-bld-amazonlinux-arm64.yml @@ -26,8 +26,6 @@ jobs: brew install --cask virtualbox - name: Install Chef uses: actionshub/chef-install@3.0.0 - with: - version: 24.2.1058 - name: Setup Packer uses: hashicorp/setup-packer@main with: diff --git a/.github/workflows/pkr-bld-amazonlinux-x64.yml b/.github/workflows/pkr-bld-amazonlinux-x64.yml index 9111a0526..c28dc0a74 100644 --- a/.github/workflows/pkr-bld-amazonlinux-x64.yml +++ b/.github/workflows/pkr-bld-amazonlinux-x64.yml @@ -27,8 +27,6 @@ jobs: vagrant --version - name: Install Chef uses: actionshub/chef-install@3.0.0 - with: - version: 24.2.1058 - name: Setup Packer uses: hashicorp/setup-packer@main with: diff --git a/.github/workflows/pkr-bld-hyperv-x64.yml b/.github/workflows/pkr-bld-hyperv-x64.yml index a6d6f81b0..eac1fa06b 100644 --- a/.github/workflows/pkr-bld-hyperv-x64.yml +++ b/.github/workflows/pkr-bld-hyperv-x64.yml @@ -40,8 +40,6 @@ jobs: uses: actions/checkout@main - name: Install Chef uses: actionshub/chef-install@3.0.0 - with: - version: 24.2.1058 - name: Setup Packer uses: hashicorp/setup-packer@main with: diff --git a/.github/workflows/pkr-bld-qemu-x64.yml b/.github/workflows/pkr-bld-qemu-x64.yml index b191649d5..3d5141615 100644 --- a/.github/workflows/pkr-bld-qemu-x64.yml +++ b/.github/workflows/pkr-bld-qemu-x64.yml @@ -57,8 +57,6 @@ jobs: sudo systemctl status libvirtd - name: Install Chef uses: actionshub/chef-install@3.0.0 - with: - version: 24.2.1058 - name: Setup Packer uses: hashicorp/setup-packer@main with: diff --git a/.github/workflows/pkr-bld-virtualbox-x64.yml b/.github/workflows/pkr-bld-virtualbox-x64.yml index 9b6838fdd..4baa1f2d7 100644 --- a/.github/workflows/pkr-bld-virtualbox-x64.yml +++ b/.github/workflows/pkr-bld-virtualbox-x64.yml @@ -48,8 +48,6 @@ jobs: sudo apt-get install -y software-properties-common vagrant virtualbox-7.1 - name: Install Chef uses: actionshub/chef-install@3.0.0 - with: - version: 24.2.1058 - name: Setup Packer uses: hashicorp/setup-packer@main with: diff --git a/.github/workflows/test-pkr-bld-parallels.yml b/.github/workflows/test-pkr-bld-parallels.yml index 5dde3246c..86bd15bc9 100644 --- a/.github/workflows/test-pkr-bld-parallels.yml +++ b/.github/workflows/test-pkr-bld-parallels.yml @@ -46,8 +46,6 @@ jobs: vagrant plugin install vagrant-parallels - name: Install Chef uses: actionshub/chef-install@3.0.0 - with: - version: 24.2.1058 - name: Setup Packer uses: hashicorp/setup-packer@main with: diff --git a/os_pkrvars/macos/macos-15-aarch64.pkrvars.hcl b/os_pkrvars/macos/macos-15-aarch64.pkrvars.hcl index 97a5c5a6f..1552fcde3 100644 --- a/os_pkrvars/macos/macos-15-aarch64.pkrvars.hcl +++ b/os_pkrvars/macos/macos-15-aarch64.pkrvars.hcl @@ -14,7 +14,7 @@ boot_command = [ # Select Your Country and Region "<leftShiftOn><tab><leftShiftOff><wait><spacebar><wait10s>", # Transfer your data to this Mac - "<tab><wait><tab><wait><tab><wait><spacebar><wait><tab><wait><tab><wait><spacebar><wait5s>", + "<tab><wait><tab><wait><tab><wait><tab><wait><spacebar><wait><tab><wait><tab><wait><spacebar><wait5s>", # Written and Spoken Languages "<leftShiftOn><tab><leftShiftOff><wait><spacebar><wait5s>", # Accessibility diff --git a/packer_templates/scripts/_common/build_tools.sh b/packer_templates/scripts/_common/build_tools.sh index fbd96e6ca..38bc53120 100644 --- a/packer_templates/scripts/_common/build_tools.sh +++ b/packer_templates/scripts/_common/build_tools.sh @@ -40,9 +40,10 @@ virtualbox-iso|virtualbox-ovf) ;; *) echo "Unknown Packer Builder Type >>$PACKER_BUILDER_TYPE<< selected." + exit 0 ;; esac echo "build tools installed rebooting" -reboot +shutdown -r now sleep 60 diff --git a/packer_templates/scripts/_common/guest_tools_parallels.sh b/packer_templates/scripts/_common/guest_tools_parallels.sh index 333ef8a63..25a46c038 100644 --- a/packer_templates/scripts/_common/guest_tools_parallels.sh +++ b/packer_templates/scripts/_common/guest_tools_parallels.sh @@ -1,7 +1,11 @@ #!/bin/sh -eux # set a default HOME_DIR environment variable if not set -HOME_DIR="${HOME_DIR:-/home/vagrant}" +if [ "$OS_NAME" = "Darwin" ]; then + HOME_DIR="/Users/vagrant" +else + HOME_DIR="${HOME_DIR:-/home/vagrant}" +fi OS_NAME=$(uname -s) case "$PACKER_BUILDER_TYPE" in @@ -12,7 +16,7 @@ parallels-iso|parallels-pvm|parallels-ipsw) elif [ "$OS_NAME" = "Darwin" ]; then installer -pkg /Volumes/Parallels\ Tools/Install.app/Contents/Resources/Install.mpkg -target / # This usually works but gives a failed to eject error - hdiutil detach /Volumes/Parallels\ Tools || echo "exit code $? is suppressed"; + hdiutil detach /Volumes/Parallels\ Tools || echo "exit code $? is suppressed" elif ! ([ "$(uname -m)" = "aarch64" ] && [ -f /etc/os-release ] && (grep -qi 'opensuse' /etc/os-release || grep -qi 'sles' /etc/os-release)); then mkdir -p /tmp/parallels; if [ "$(uname -m)" = "aarch64" ] ; then @@ -35,10 +39,12 @@ parallels-iso|parallels-pvm|parallels-ipsw) if command -v dnf >/dev/null 2>&1; then dnf remove -y install checkpolicy selinux-policy-devel gcc kernel-devel kernel-headers make fi - reboot + shutdown -r now sleep 60 else echo "Skipping Parallels Tools installation on aarch64 architecture for opensuse and derivatives" fi + shutdown -r now + sleep 60 ;; esac diff --git a/packer_templates/scripts/_common/guest_tools_virtualbox.sh b/packer_templates/scripts/_common/guest_tools_virtualbox.sh index 69a4dbd68..2a6ca32ba 100644 --- a/packer_templates/scripts/_common/guest_tools_virtualbox.sh +++ b/packer_templates/scripts/_common/guest_tools_virtualbox.sh @@ -1,7 +1,11 @@ #!/bin/sh -eux # set a default HOME_DIR environment variable if not set -HOME_DIR="${HOME_DIR:-/home/vagrant}" +if [ "$OS_NAME" = "Darwin" ]; then + HOME_DIR="/Users/vagrant" +else + HOME_DIR="${HOME_DIR:-/home/vagrant}" +fi OS_NAME=$(uname -s) case "$PACKER_BUILDER_TYPE" in @@ -32,7 +36,7 @@ virtualbox-iso|virtualbox-ovf) echo 'ifconfig_vtnet3_name="em3"' } >> /etc/rc.conf pw groupadd vboxusers; - pw groupmod vboxusers -m vagrant; + pw groupmod vboxusers -m vagrant elif [ "$OS_NAME" = "Darwin" ]; then echo "Nothing to do for $OS_NAME" exit 0 @@ -83,10 +87,10 @@ virtualbox-iso|virtualbox-ovf) echo "removing leftover logs" rm -rf /var/log/vboxadd* - reboot - sleep 60 else echo "Skipping Virtualbox guest additions installation on aarch64 architecture for opensuse and derivatives" fi + shutdown -r now + sleep 60 ;; esac diff --git a/packer_templates/scripts/_common/guest_tools_vmware.sh b/packer_templates/scripts/_common/guest_tools_vmware.sh index f75c5487d..b7d68b0c3 100644 --- a/packer_templates/scripts/_common/guest_tools_vmware.sh +++ b/packer_templates/scripts/_common/guest_tools_vmware.sh @@ -52,7 +52,7 @@ vmware-iso|vmware-vmx) systemctl start vmtoolsd fi echo "platform specific vmware.sh executed" - reboot + shutdown -r now sleep 60 ;; esac diff --git a/packer_templates/scripts/_common/update_packages.sh b/packer_templates/scripts/_common/update_packages.sh index 04f4f9206..d5de2c2a2 100644 --- a/packer_templates/scripts/_common/update_packages.sh +++ b/packer_templates/scripts/_common/update_packages.sh @@ -1,7 +1,5 @@ #!/bin/sh -eux -# set a default HOME_DIR environment variable if not set -HOME_DIR="${HOME_DIR:-/home/vagrant}" OS_NAME=$(uname -s) if [ -f /etc/os-release ]; then OS_ID=$(grep '^ID=' /etc/os-release | cut -d= -f2 | tr -d '"') @@ -89,5 +87,5 @@ else fi echo "updates installed rebooting" -reboot +shutdown -r now sleep 60 diff --git a/packer_templates/scripts/_common/vagrant.sh b/packer_templates/scripts/_common/vagrant.sh index 941f330c3..7604e85a9 100644 --- a/packer_templates/scripts/_common/vagrant.sh +++ b/packer_templates/scripts/_common/vagrant.sh @@ -3,13 +3,13 @@ # set a default HOME_DIR environment variable if not set OS_NAME=$(uname -s) if [ "$OS_NAME" = "Darwin" ]; then - HOME_DIR="/Users/vagrant}" + HOME_DIR="/Users/vagrant" else HOME_DIR="${HOME_DIR:-/home/vagrant}" fi if command -v ping > /dev/null 2>&1; then - echo "Pinging raw.githubusercontent.com"; + echo "Pinging raw.githubusercontent.com" if ! ping -c 1 raw.githubusercontent.com > /dev/null 2>&1; then echo "Ping failed, sleeping for 30 seconds" sleep 30; From 308083f5efe7b2e454c54add3f5bb174dd394e54 Mon Sep 17 00:00:00 2001 From: Corey Hemminger <hemminger@hotmail.com> Date: Mon, 11 Aug 2025 16:51:33 -0500 Subject: [PATCH 1584/1622] fix HOME_DIR and OS_NAME order in common scripts (#1626) Signed-off-by: Corey Hemminger <hemminger@hotmail.com> --- packer_templates/scripts/_common/guest_tools_parallels.sh | 2 +- packer_templates/scripts/_common/guest_tools_virtualbox.sh | 2 +- packer_templates/scripts/_common/guest_tools_vmware.sh | 6 +++++- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/packer_templates/scripts/_common/guest_tools_parallels.sh b/packer_templates/scripts/_common/guest_tools_parallels.sh index 25a46c038..1cff6c06a 100644 --- a/packer_templates/scripts/_common/guest_tools_parallels.sh +++ b/packer_templates/scripts/_common/guest_tools_parallels.sh @@ -1,12 +1,12 @@ #!/bin/sh -eux # set a default HOME_DIR environment variable if not set +OS_NAME=$(uname -s) if [ "$OS_NAME" = "Darwin" ]; then HOME_DIR="/Users/vagrant" else HOME_DIR="${HOME_DIR:-/home/vagrant}" fi -OS_NAME=$(uname -s) case "$PACKER_BUILDER_TYPE" in parallels-iso|parallels-pvm|parallels-ipsw) diff --git a/packer_templates/scripts/_common/guest_tools_virtualbox.sh b/packer_templates/scripts/_common/guest_tools_virtualbox.sh index 2a6ca32ba..41e703b78 100644 --- a/packer_templates/scripts/_common/guest_tools_virtualbox.sh +++ b/packer_templates/scripts/_common/guest_tools_virtualbox.sh @@ -1,12 +1,12 @@ #!/bin/sh -eux # set a default HOME_DIR environment variable if not set +OS_NAME=$(uname -s) if [ "$OS_NAME" = "Darwin" ]; then HOME_DIR="/Users/vagrant" else HOME_DIR="${HOME_DIR:-/home/vagrant}" fi -OS_NAME=$(uname -s) case "$PACKER_BUILDER_TYPE" in virtualbox-iso|virtualbox-ovf) diff --git a/packer_templates/scripts/_common/guest_tools_vmware.sh b/packer_templates/scripts/_common/guest_tools_vmware.sh index b7d68b0c3..a90784f68 100644 --- a/packer_templates/scripts/_common/guest_tools_vmware.sh +++ b/packer_templates/scripts/_common/guest_tools_vmware.sh @@ -1,8 +1,12 @@ #!/bin/bash -eux # set a default HOME_DIR environment variable if not set -HOME_DIR="${HOME_DIR:-/home/vagrant}" OS_NAME=$(uname -s) +if [ "$OS_NAME" = "Darwin" ]; then + HOME_DIR="/Users/vagrant" +else + HOME_DIR="${HOME_DIR:-/home/vagrant}" +fi case "$PACKER_BUILDER_TYPE" in vmware-iso|vmware-vmx) From 481216e56bc3a6e3c9c5b9f13fd551728823e253 Mon Sep 17 00:00:00 2001 From: Seth Grover <13872653+mmguero@users.noreply.github.com> Date: Tue, 23 Sep 2025 15:56:32 -0600 Subject: [PATCH 1585/1622] Update Debian from 13.0 to 13.1 (#1630) Signed-off-by: Seth Grover <seth.d.grover@gmail.com> --- os_pkrvars/debian/debian-13-aarch64.pkrvars.hcl | 4 ++-- os_pkrvars/debian/debian-13-x86_64.pkrvars.hcl | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/os_pkrvars/debian/debian-13-aarch64.pkrvars.hcl b/os_pkrvars/debian/debian-13-aarch64.pkrvars.hcl index 8a71a4791..079d616d5 100644 --- a/os_pkrvars/debian/debian-13-aarch64.pkrvars.hcl +++ b/os_pkrvars/debian/debian-13-aarch64.pkrvars.hcl @@ -1,7 +1,7 @@ os_name = "debian" -os_version = "13.0" +os_version = "13.1" os_arch = "aarch64" -iso_url = "https://cdimage.debian.org/debian-cd/current/arm64/iso-cd/debian-13.0.0-arm64-netinst.iso" +iso_url = "https://cdimage.debian.org/debian-cd/current/arm64/iso-cd/debian-13.1.0-arm64-netinst.iso" iso_checksum = "file:https://cdimage.debian.org/debian-cd/current/arm64/iso-cd/SHA256SUMS" parallels_guest_os_type = "debian" vbox_guest_os_type = "Debian12_arm64" diff --git a/os_pkrvars/debian/debian-13-x86_64.pkrvars.hcl b/os_pkrvars/debian/debian-13-x86_64.pkrvars.hcl index c64de05f8..6b48eabb5 100644 --- a/os_pkrvars/debian/debian-13-x86_64.pkrvars.hcl +++ b/os_pkrvars/debian/debian-13-x86_64.pkrvars.hcl @@ -1,7 +1,7 @@ os_name = "debian" -os_version = "13.0" +os_version = "13.1" os_arch = "x86_64" -iso_url = "https://cdimage.debian.org/debian-cd/current/amd64/iso-cd/debian-13.0.0-amd64-netinst.iso" +iso_url = "https://cdimage.debian.org/debian-cd/current/amd64/iso-cd/debian-13.1.0-amd64-netinst.iso" iso_checksum = "file:https://cdimage.debian.org/debian-cd/current/amd64/iso-cd/SHA256SUMS" parallels_guest_os_type = "debian" vbox_guest_os_type = "Debian12_64" From f0d2ca8dea97f8e22f97094f5efae330d661ef30 Mon Sep 17 00:00:00 2001 From: Carsten Senger <carsten.senger@gmx.de> Date: Wed, 24 Sep 2025 15:34:43 +0200 Subject: [PATCH 1586/1622] Fix Debian libvirt build (#1631) * Update Debian from 12.11 to 12.12 Signed-off-by: Carsten Senger <senger@rehfisch.de> * Fix Debian libvirt builds This fixes the Debian libvirt builds failing cause the installer can't install grub. Libvirt's virtio driver creates the block device as `/dev/vda` while the other providers create `/dev/sda`. `grub-installer/bootdev` uses "(hd0)" as the default value and works for both. Signed-off-by: Carsten Senger <senger@rehfisch.de> --------- Signed-off-by: Carsten Senger <senger@rehfisch.de> --- os_pkrvars/debian/debian-12-aarch64.pkrvars.hcl | 6 +++--- os_pkrvars/debian/debian-12-x86_64.pkrvars.hcl | 4 ++-- os_pkrvars/debian/debian-13-aarch64.pkrvars.hcl | 2 +- packer_templates/http/debian/preseed.cfg | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/os_pkrvars/debian/debian-12-aarch64.pkrvars.hcl b/os_pkrvars/debian/debian-12-aarch64.pkrvars.hcl index dc77e6156..d101afd88 100644 --- a/os_pkrvars/debian/debian-12-aarch64.pkrvars.hcl +++ b/os_pkrvars/debian/debian-12-aarch64.pkrvars.hcl @@ -1,10 +1,10 @@ os_name = "debian" -os_version = "12.11" +os_version = "12.12" os_arch = "aarch64" -iso_url = "https://cdimage.debian.org/cdimage/archive/latest-oldstable/arm64/iso-cd/debian-12.11.0-arm64-netinst.iso" +iso_url = "https://cdimage.debian.org/cdimage/archive/latest-oldstable/arm64/iso-cd/debian-12.12.0-arm64-netinst.iso" iso_checksum = "file:https://cdimage.debian.org/cdimage/archive/latest-oldstable/arm64/iso-cd/SHA256SUMS" parallels_guest_os_type = "debian" vbox_guest_os_type = "Debian12_arm64" vmware_guest_os_type = "arm-debian12-64" default_boot_wait = "10s" -boot_command = ["<wait>e<wait><down><down><down><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><wait>install <wait> preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/debian/preseed.cfg <wait>debian-installer=en_US.UTF-8 <wait>auto <wait>locale=en_US.UTF-8 <wait>kbd-chooser/method=us <wait>keyboard-configuration/xkb-keymap=us <wait>netcfg/get_hostname={{ .Name }} <wait>netcfg/get_domain=vagrantup.com <wait>fb=false <wait>debconf/frontend=noninteractive <wait>console-setup/ask_detect=false <wait>console-keymaps-at/keymap=us <wait>grub-installer/bootdev=/dev/sda <wait><f10><wait>"] +boot_command = ["<wait>e<wait><down><down><down><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><wait>install <wait> preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/debian/preseed.cfg <wait>debian-installer=en_US.UTF-8 <wait>auto <wait>locale=en_US.UTF-8 <wait>kbd-chooser/method=us <wait>keyboard-configuration/xkb-keymap=us <wait>netcfg/get_hostname={{ .Name }} <wait>netcfg/get_domain=vagrantup.com <wait>fb=false <wait>debconf/frontend=noninteractive <wait>console-setup/ask_detect=false <wait>console-keymaps-at/keymap=us <wait>grub-installer/bootdev=default <wait><f10><wait>"] diff --git a/os_pkrvars/debian/debian-12-x86_64.pkrvars.hcl b/os_pkrvars/debian/debian-12-x86_64.pkrvars.hcl index 5b1c800b3..4f4e74216 100644 --- a/os_pkrvars/debian/debian-12-x86_64.pkrvars.hcl +++ b/os_pkrvars/debian/debian-12-x86_64.pkrvars.hcl @@ -1,7 +1,7 @@ os_name = "debian" -os_version = "12.11" +os_version = "12.12" os_arch = "x86_64" -iso_url = "https://cdimage.debian.org/cdimage/archive/latest-oldstable/amd64/iso-cd/debian-12.11.0-amd64-netinst.iso" +iso_url = "https://cdimage.debian.org/cdimage/archive/latest-oldstable/amd64/iso-cd/debian-12.12.0-amd64-netinst.iso" iso_checksum = "file:https://cdimage.debian.org/cdimage/archive/latest-oldstable/amd64/iso-cd/SHA256SUMS" parallels_guest_os_type = "debian" vbox_guest_os_type = "Debian12_64" diff --git a/os_pkrvars/debian/debian-13-aarch64.pkrvars.hcl b/os_pkrvars/debian/debian-13-aarch64.pkrvars.hcl index 079d616d5..c5a89968b 100644 --- a/os_pkrvars/debian/debian-13-aarch64.pkrvars.hcl +++ b/os_pkrvars/debian/debian-13-aarch64.pkrvars.hcl @@ -7,4 +7,4 @@ parallels_guest_os_type = "debian" vbox_guest_os_type = "Debian12_arm64" vmware_guest_os_type = "arm-debian12-64" default_boot_wait = "10s" -boot_command = ["<wait>e<wait><down><down><down><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><wait>install <wait> preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/debian/preseed.cfg <wait>debian-installer=en_US.UTF-8 <wait>auto <wait>locale=en_US.UTF-8 <wait>kbd-chooser/method=us <wait>keyboard-configuration/xkb-keymap=us <wait>netcfg/get_hostname={{ .Name }} <wait>netcfg/get_domain=vagrantup.com <wait>fb=false <wait>debconf/frontend=noninteractive <wait>console-setup/ask_detect=false <wait>console-keymaps-at/keymap=us <wait>grub-installer/bootdev=/dev/sda <wait><f10><wait>"] +boot_command = ["<wait>e<wait><down><down><down><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><wait>install <wait> preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/debian/preseed.cfg <wait>debian-installer=en_US.UTF-8 <wait>auto <wait>locale=en_US.UTF-8 <wait>kbd-chooser/method=us <wait>keyboard-configuration/xkb-keymap=us <wait>netcfg/get_hostname={{ .Name }} <wait>netcfg/get_domain=vagrantup.com <wait>fb=false <wait>debconf/frontend=noninteractive <wait>console-setup/ask_detect=false <wait>console-keymaps-at/keymap=us <wait>grub-installer/bootdev=default <wait><f10><wait>"] diff --git a/packer_templates/http/debian/preseed.cfg b/packer_templates/http/debian/preseed.cfg index 9f47c1c88..98f5d19dd 100644 --- a/packer_templates/http/debian/preseed.cfg +++ b/packer_templates/http/debian/preseed.cfg @@ -35,7 +35,7 @@ d-i grub-installer/only_debian boolean true d-i grub-installer/with_other_os boolean true # Set dev for grub boot -d-i grub-installer/bootdev string /dev/sda +d-i grub-installer/bootdev string default ### Mirror settings # If you select ftp, the mirror/country string does not need to be set. From a5a8a99b3a005223b081e0f2c85c54821a93f3cd Mon Sep 17 00:00:00 2001 From: cgunasree08 <Chintha.Gunasree@progress.com> Date: Thu, 9 Oct 2025 21:20:22 +0530 Subject: [PATCH 1587/1622] Create CODE_OF_CONDUCT.md with standard template (#1632) Signed-off-by: cgunasree08 <Chintha.Gunasree@progress.com> --- CODE_OF_CONDUCT.md | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 CODE_OF_CONDUCT.md diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md new file mode 100644 index 000000000..3ae9e7718 --- /dev/null +++ b/CODE_OF_CONDUCT.md @@ -0,0 +1,3 @@ +# Chef Code of Conduct + +Participants in this project must adhere to the [Chef Code of Conduct](https://chef.github.io/chef-oss-practices/policies/code-of-conduct/). \ No newline at end of file From 803d1ccb896ba322f76a4040b9f47c5ecda9850e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20Sj=C3=B6gren?= <konstruktoid@users.noreply.github.com> Date: Thu, 9 Oct 2025 19:46:24 +0200 Subject: [PATCH 1588/1622] re-actors/alls-green doesnt have a main branch (#1636) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Thomas Sjögren <konstruktoid@users.noreply.github.com> --- .github/workflows/ci-build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci-build.yml b/.github/workflows/ci-build.yml index 657dd5f63..67d6cfc9a 100644 --- a/.github/workflows/ci-build.yml +++ b/.github/workflows/ci-build.yml @@ -94,7 +94,7 @@ jobs: runs-on: Ubuntu-latest steps: - name: Decide whether the needed jobs succeeded or failed - uses: re-actors/alls-green@main + uses: re-actors/alls-green@release/v1 with: allowed-failures: allowed-skips: ${{ toJSON(needs) }} From ce8ad2e6f5435a6bc07532111bde19b7e6969b22 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20Sj=C3=B6gren?= <konstruktoid@users.noreply.github.com> Date: Sat, 11 Oct 2025 00:25:39 +0200 Subject: [PATCH 1589/1622] Allow PACKER_BUILDER_TYPE when running sudo and misc Ubuntu fixes (#1634) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * add cableconnected1 to speed up ubuntu builds Signed-off-by: Thomas Sjögren <konstruktoid@users.noreply.github.com> * fix hanging libpam-systemd installation Signed-off-by: Thomas Sjögren <konstruktoid@users.noreply.github.com> * allow PACKER_ environment variables when using sudo Signed-off-by: Thomas Sjögren <konstruktoid@users.noreply.github.com> --------- Signed-off-by: Thomas Sjögren <konstruktoid@users.noreply.github.com> --- packer_templates/pkr-sources.pkr.hcl | 3 ++- packer_templates/scripts/_common/minimize.sh | 4 ++++ packer_templates/scripts/_common/update_packages.sh | 4 ++++ packer_templates/scripts/ubuntu/systemd_ubuntu.sh | 2 +- 4 files changed, 11 insertions(+), 2 deletions(-) diff --git a/packer_templates/pkr-sources.pkr.hcl b/packer_templates/pkr-sources.pkr.hcl index 6fe874c4e..103c4e8bc 100644 --- a/packer_templates/pkr-sources.pkr.hcl +++ b/packer_templates/pkr-sources.pkr.hcl @@ -112,7 +112,8 @@ locals { ] : [ ["modifyvm", "{{.Name}}", "--chipset", "ich9"], ["modifyvm", "{{.Name}}", "--audio-enabled", "off"], - ["modifyvm", "{{.Name}}", "--nat-localhostreachable1", "on"] + ["modifyvm", "{{.Name}}", "--nat-localhostreachable1", "on"], + ["modifyvm", "{{.Name}}", "--cableconnected1", "on"], ] ) : var.vboxmanage vbox_nic_type = var.vbox_nic_type == null ? ( diff --git a/packer_templates/scripts/_common/minimize.sh b/packer_templates/scripts/_common/minimize.sh index 75bdd3d30..7d8628f9d 100644 --- a/packer_templates/scripts/_common/minimize.sh +++ b/packer_templates/scripts/_common/minimize.sh @@ -6,6 +6,10 @@ esac OS_NAME=$(uname -s) +if [ -f /etc/sudoers.d/_packer_env ]; then + rm -f /etc/sudoers.d/_packer_env +fi + if [ "$OS_NAME" = "FreeBSD" ]; then ZROOT="zroot/ROOT/default" diff --git a/packer_templates/scripts/_common/update_packages.sh b/packer_templates/scripts/_common/update_packages.sh index d5de2c2a2..bdaa94f3b 100644 --- a/packer_templates/scripts/_common/update_packages.sh +++ b/packer_templates/scripts/_common/update_packages.sh @@ -5,6 +5,10 @@ if [ -f /etc/os-release ]; then OS_ID=$(grep '^ID=' /etc/os-release | cut -d= -f2 | tr -d '"') fi +if [ -d /etc/sudoers.d ]; then + echo 'Defaults:%sudo env_keep += "PACKER_*"' >> /etc/sudoers.d/_packer_env +fi + echo "installing updates" if [ -f "/bin/dnf" ]; then dnf -y upgrade diff --git a/packer_templates/scripts/ubuntu/systemd_ubuntu.sh b/packer_templates/scripts/ubuntu/systemd_ubuntu.sh index 2d1b5a71e..f41b942cd 100644 --- a/packer_templates/scripts/ubuntu/systemd_ubuntu.sh +++ b/packer_templates/scripts/ubuntu/systemd_ubuntu.sh @@ -1,4 +1,4 @@ #!/bin/sh -eux # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=751636 -apt-get install libpam-systemd +apt-get -y install libpam-systemd From 8cafe9d18f460804253f282c502e06b683f40c25 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20Sj=C3=B6gren?= <konstruktoid@users.noreply.github.com> Date: Sat, 11 Oct 2025 00:32:48 +0200 Subject: [PATCH 1590/1622] add Ubuntu 25.04 and 25.10 (#1635) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Thomas Sjögren <konstruktoid@users.noreply.github.com> --- os_pkrvars/ubuntu/ubuntu-25.04-x86_64.pkvars.hcl | 9 +++++++++ os_pkrvars/ubuntu/ubuntu-25.10-x86_64.pkvars.hcl | 9 +++++++++ 2 files changed, 18 insertions(+) create mode 100644 os_pkrvars/ubuntu/ubuntu-25.04-x86_64.pkvars.hcl create mode 100644 os_pkrvars/ubuntu/ubuntu-25.10-x86_64.pkvars.hcl diff --git a/os_pkrvars/ubuntu/ubuntu-25.04-x86_64.pkvars.hcl b/os_pkrvars/ubuntu/ubuntu-25.04-x86_64.pkvars.hcl new file mode 100644 index 000000000..a2f0b5ada --- /dev/null +++ b/os_pkrvars/ubuntu/ubuntu-25.04-x86_64.pkvars.hcl @@ -0,0 +1,9 @@ +os_name = "ubuntu" +os_version = "25.04" +os_arch = "x86_64" +iso_url = "https://releases.ubuntu.com/plucky/ubuntu-25.04-live-server-amd64.iso" +iso_checksum = "file:https://releases.ubuntu.com/plucky/SHA256SUMS" +parallels_guest_os_type = "ubuntu" +vbox_guest_os_type = "Ubuntu_64" +vmware_guest_os_type = "ubuntu-64" +boot_command = ["<wait>e<wait><down><down><down><end> autoinstall ds=nocloud-net\\;s=http://{{.HTTPIP}}:{{.HTTPPort}}/ubuntu/<wait><f10><wait>"] diff --git a/os_pkrvars/ubuntu/ubuntu-25.10-x86_64.pkvars.hcl b/os_pkrvars/ubuntu/ubuntu-25.10-x86_64.pkvars.hcl new file mode 100644 index 000000000..ae7ec390b --- /dev/null +++ b/os_pkrvars/ubuntu/ubuntu-25.10-x86_64.pkvars.hcl @@ -0,0 +1,9 @@ +os_name = "ubuntu" +os_version = "25.10" +os_arch = "x86_64" +iso_url = "https://releases.ubuntu.com/questing/ubuntu-25.10-live-server-amd64.iso" +iso_checksum = "file:https://releases.ubuntu.com/questing/SHA256SUMS" +parallels_guest_os_type = "ubuntu" +vbox_guest_os_type = "Ubuntu_64" +vmware_guest_os_type = "ubuntu-64" +boot_command = ["<wait>e<wait><down><down><down><end> autoinstall ds=nocloud-net\\;s=http://{{.HTTPIP}}:{{.HTTPPort}}/ubuntu/<wait><f10><wait>"] From eafa703e9c27ceb2502ef24e880e37c43dad0c9e Mon Sep 17 00:00:00 2001 From: nandanhegde73 <220186393+nandanhegde73@users.noreply.github.com> Date: Sat, 25 Oct 2025 01:41:39 +0530 Subject: [PATCH 1591/1622] Update copyright notices to Progress Software Corporation (#1639) Signed-off-by: Progress Copyright Bot <github-bot@progress.com> Co-authored-by: Progress Copyright Bot <github-bot@progress.com> --- NOTICE.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/NOTICE.md b/NOTICE.md index a2fcc43b9..a5d39651e 100644 --- a/NOTICE.md +++ b/NOTICE.md @@ -2,8 +2,7 @@ Chef Bento Copyright 2019-2023, Progress Software Corporation -Copyright 2012-2019, Chef Software, Inc. - +Copyright (c) 2012-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. The baseboxes in the "definitions" directory is from Tim Dysinger's "basebox" project. From 50199ef4eac1e9e034f2fa4dc3d5160d368222a8 Mon Sep 17 00:00:00 2001 From: Corey Hemminger <hemminger@hotmail.com> Date: Mon, 27 Oct 2025 09:25:51 -0500 Subject: [PATCH 1592/1622] add utm provider (#1605) - Add UTM virtualization support <https://mac.getutm.app/> - Fix Win11 vbox guest os type for aarch64 - Update qemu args for aarch64 on macos to properly boot linux vms - Fix workflows to remove vms on cancelled jobs - Set workflows that have restrictions on automating virtual provider install or arm hosts to use self hosted runners - Fix Oracle Linux 10 aarch64 install of gcc after newer kernel updates built on newer gcc version - Add check on linux scripts if reboot is needed otherwise move on - Added qemu guest tools install script for linux - Added utm provider to windows vagrant file template - Updated fedora ks file to enable firewall and set selinux to enforcing similar to a default install - Added provider specific boot command variables - if null falls back to boot_command variable - Consolidate kickstart files - Added macOS 26 builds - Updated Debian 13 to 13.1 - Added OpenSUSE Leap 16 builds - Fix Debian libvirt build - Added Ubuntu 25.04 and 25.10 builds - Misc Ubuntu script fixes - update testing to move files to testing_passed and testing_failed directories - completed build now go to builds/build_complete directory - fix scripts reboot checks --------- Signed-off-by: Corey Hemminger <hemminger@hotmail.com> --- .github/workflows/ci-build.yml | 27 ++- .github/workflows/ci-lint.yml | 3 + .../workflows/pkr-bld-amazonlinux-arm64.yml | 51 +++--- .github/workflows/pkr-bld-amazonlinux-x64.yml | 14 +- .github/workflows/pkr-bld-hyperv-x64.yml | 12 +- .github/workflows/pkr-bld-parallels-arm64.yml | 17 +- .github/workflows/pkr-bld-parallels-x64.yml | 17 +- .github/workflows/pkr-bld-qemu-arm64.yml | 51 ++++-- .github/workflows/pkr-bld-qemu-x64.yml | 17 +- .github/workflows/pkr-bld-utm-arm64.yml | 92 ++++++++++ .github/workflows/pkr-bld-utm-x64.yml | 99 ++++++++++ .../workflows/pkr-bld-virtualbox-arm64.yml | 25 ++- .github/workflows/pkr-bld-virtualbox-x64.yml | 19 +- .github/workflows/pkr-bld-vmware-arm64.yml | 45 +++-- .github/workflows/pkr-bld-vmware-x64.yml | 45 +++-- .github/workflows/test-pkr-bld-parallels.yml | 21 ++- .shellcheckrc | 3 + CHANGELOG.md | 89 +++++---- README.md | 49 ++--- builds.yml | 4 + builds/failed_testing/.gitkeep | 0 lib/bento/common.rb | 25 +-- lib/bento/providermetadata.rb | 10 +- lib/bento/runner.rb | 4 +- lib/bento/test.rb | 72 +++++--- lib/bento/test_templates/kitchen.yml.erb | 12 +- lib/bento/upload.rb | 57 +++--- lib/bento/version.rb | 2 +- .../almalinux-10-aarch64.pkrvars.hcl | 3 +- .../almalinux/almalinux-10-x86_64.pkrvars.hcl | 3 +- .../almalinux/almalinux-8-aarch64.pkrvars.hcl | 1 + .../almalinux/almalinux-8-x86_64.pkrvars.hcl | 4 +- .../almalinux/almalinux-9-aarch64.pkrvars.hcl | 4 +- .../almalinux/almalinux-9-x86_64.pkrvars.hcl | 4 +- .../amazonlinux-2023-aarch64.pkrvars.hcl | 1 + .../amazonlinux-2023-x86_64.pkrvars.hcl | 1 + .../centos-stream-10-aarch64.pkrvars.hcl | 3 +- .../centos-stream-10-x86_64.pkrvars.hcl | 3 +- .../centos-stream-9-aarch64.pkrvars.hcl | 3 +- .../centos/centos-stream-9-x86_64.pkrvars.hcl | 4 +- .../debian/debian-12-aarch64.pkrvars.hcl | 2 +- .../debian/debian-12-x86_64.pkrvars.hcl | 1 + .../debian/debian-13-aarch64.pkrvars.hcl | 2 +- .../debian/debian-13-x86_64.pkrvars.hcl | 1 + .../fedora/fedora-41-aarch64.pkrvars.hcl | 5 +- .../fedora/fedora-41-x86_64.pkrvars.hcl | 3 +- .../fedora/fedora-42-aarch64.pkrvars.hcl | 5 +- .../fedora/fedora-42-x86_64.pkrvars.hcl | 3 +- .../freebsd/freebsd-13-aarch64.pkrvars.hcl | 2 + .../freebsd/freebsd-13-x86_64.pkrvars.hcl | 3 +- .../freebsd/freebsd-14-aarch64.pkrvars.hcl | 2 + .../freebsd/freebsd-14-x86_64.pkrvars.hcl | 3 +- os_pkrvars/macos/macos-14-aarch64.pkrvars.hcl | 1 + os_pkrvars/macos/macos-15-aarch64.pkrvars.hcl | 7 +- os_pkrvars/macos/macos-26-aarch64.pkrvars.hcl | 75 ++++++++ .../opensuse-leap-15-aarch64.pkrvars.hcl | 1 + .../opensuse-leap-15-x86_64.pkrvars.hcl | 1 + .../opensuse-leap-16-aarch64.pkrvars.hcl | 26 +++ .../opensuse-leap-16-x86_64.pkrvars.hcl | 17 ++ .../oraclelinux-10-aarch64.pkrvars.hcl | 3 +- .../oraclelinux-10-x86_64.pkrvars.hcl | 3 +- .../oraclelinux-8-aarch64.pkrvars.hcl | 3 +- .../oraclelinux-8-x86_64.pkrvars.hcl | 4 +- .../oraclelinux-9-aarch64.pkrvars.hcl | 3 +- .../oraclelinux-9-x86_64.pkrvars.hcl | 4 +- os_pkrvars/rhel/rhel-10-aarch64.pkrvars.hcl | 1 + os_pkrvars/rhel/rhel-10-x86_64.pkrvars.hcl | 1 + os_pkrvars/rhel/rhel-8-aarch64.pkrvars.hcl | 1 + os_pkrvars/rhel/rhel-8-x86_64.pkrvars.hcl | 1 + os_pkrvars/rhel/rhel-9-aarch64.pkrvars.hcl | 1 + os_pkrvars/rhel/rhel-9-x86_64.pkrvars.hcl | 1 + .../rockylinux-10-aarch64.pkrvars.hcl | 3 +- .../rockylinux-10-x86_64.pkrvars.hcl | 3 +- .../rockylinux-8-aarch64.pkrvars.hcl | 1 + .../rockylinux-8-x86_64.pkrvars.hcl | 4 +- .../rockylinux-9-aarch64.pkrvars.hcl | 3 +- .../rockylinux-9-x86_64.pkrvars.hcl | 4 +- os_pkrvars/sles/sles-15-aarch64.pkrvars.hcl | 1 + os_pkrvars/sles/sles-15-x86_64.pkrvars.hcl | 1 + .../solaris/solaris-11-x86_64.pkrvars.hcl | 1 + .../ubuntu/ubuntu-22.04-aarch64.pkrvars.hcl | 1 + .../ubuntu/ubuntu-22.04-x86_64.pkrvars.hcl | 1 + .../ubuntu/ubuntu-24.04-aarch64.pkrvars.hcl | 1 + .../ubuntu/ubuntu-24.04-x86_64.pkrvars.hcl | 1 + .../ubuntu/ubuntu-25.04-aarch64.pkrvars.hcl | 10 + ...rs.hcl => ubuntu-25.04-x86_64.pkrvars.hcl} | 1 + .../ubuntu/ubuntu-25.10-aarch64.pkrvars.hcl | 10 + ...rs.hcl => ubuntu-25.10-x86_64.pkrvars.hcl} | 1 + .../windows/windows-11-aarch64.pkrvars.hcl | 3 +- .../windows/windows-11-x86_64.pkrvars.hcl | 1 + .../windows/windows-2016-x86_64.pkrvars.hcl | 1 + .../windows/windows-2019-x86_64.pkrvars.hcl | 1 + .../windows/windows-2022-x86_64.pkrvars.hcl | 1 + .../windows/windows-2025-x86_64.pkrvars.hcl | 1 + packer_templates/http/fedora/ks.cfg | 47 ----- packer_templates/http/freebsd/installerconfig | 12 +- .../http/opensuse/agama-profile.json | 30 +++ packer_templates/http/rhel/8ks.cfg | 49 ++--- packer_templates/http/rhel/9ks.cfg | 81 --------- .../http/rhel/{10ks.cfg => ks.cfg} | 28 ++- packer_templates/pkr-builder.pkr.hcl | 21 ++- packer_templates/pkr-plugins.pkr.hcl | 8 + packer_templates/pkr-sources.pkr.hcl | 171 +++++++++++++----- packer_templates/pkr-variables.pkr.hcl | 122 ++++++++++++- .../scripts/_common/build_tools.sh | 73 +++++--- .../scripts/_common/guest_tools_parallels.sh | 73 +++++--- .../scripts/_common/guest_tools_qemu.sh | 112 ++++++++++++ .../scripts/_common/guest_tools_virtualbox.sh | 25 ++- .../scripts/_common/guest_tools_vmware.sh | 30 ++- packer_templates/scripts/_common/minimize.sh | 8 +- packer_templates/scripts/_common/sshd.sh | 17 +- .../scripts/_common/update_packages.sh | 47 ++++- .../scripts/windows/provision.ps1 | 4 +- .../vagrantfile-freebsd-utm.template | 15 ++ packer_templates/vagrantfile-utm.template | 15 ++ .../vagrantfile-windows-utm.template | 17 ++ 116 files changed, 1583 insertions(+), 579 deletions(-) create mode 100644 .github/workflows/pkr-bld-utm-arm64.yml create mode 100644 .github/workflows/pkr-bld-utm-x64.yml create mode 100644 .shellcheckrc delete mode 100644 builds/failed_testing/.gitkeep create mode 100644 os_pkrvars/macos/macos-26-aarch64.pkrvars.hcl create mode 100644 os_pkrvars/opensuse/opensuse-leap-16-aarch64.pkrvars.hcl create mode 100644 os_pkrvars/opensuse/opensuse-leap-16-x86_64.pkrvars.hcl create mode 100644 os_pkrvars/ubuntu/ubuntu-25.04-aarch64.pkrvars.hcl rename os_pkrvars/ubuntu/{ubuntu-25.04-x86_64.pkvars.hcl => ubuntu-25.04-x86_64.pkrvars.hcl} (93%) create mode 100644 os_pkrvars/ubuntu/ubuntu-25.10-aarch64.pkrvars.hcl rename os_pkrvars/ubuntu/{ubuntu-25.10-x86_64.pkvars.hcl => ubuntu-25.10-x86_64.pkrvars.hcl} (94%) delete mode 100644 packer_templates/http/fedora/ks.cfg create mode 100644 packer_templates/http/opensuse/agama-profile.json delete mode 100644 packer_templates/http/rhel/9ks.cfg rename packer_templates/http/rhel/{10ks.cfg => ks.cfg} (70%) create mode 100644 packer_templates/scripts/_common/guest_tools_qemu.sh create mode 100644 packer_templates/vagrantfile-freebsd-utm.template create mode 100644 packer_templates/vagrantfile-utm.template create mode 100644 packer_templates/vagrantfile-windows-utm.template diff --git a/.github/workflows/ci-build.yml b/.github/workflows/ci-build.yml index 67d6cfc9a..f269fec82 100644 --- a/.github/workflows/ci-build.yml +++ b/.github/workflows/ci-build.yml @@ -2,16 +2,19 @@ on: pull_request: +permissions: + contents: read + concurrency: group: ci-build-${{ github.ref }} cancel-in-progress: true jobs: - markdown-lint: - uses: chef/github-workflows/.github/workflows/markdown-lint.yml@main - - markdown-link-checker: - uses: chef/github-workflows/.github/workflows/markdown-link-checker.yml@main +# markdown-lint: +# uses: chef/github-workflows/.github/workflows/markdown-lint.yml@main +# +# markdown-link-checker: +# uses: chef/github-workflows/.github/workflows/markdown-link-checker.yml@main yaml-lint: uses: chef/github-workflows/.github/workflows/yaml-lint.yml@main @@ -31,7 +34,7 @@ jobs: packer-iso-check: uses: chef/github-workflows/.github/workflows/packer-iso-url-checker.yml@main with: - EXCLUDE_REGEX: 'amazonlinux-2.*|rhel.*|sles.*|solaris.*|windows-11-aarch64.*,macos-*' + EXCLUDE_REGEX: 'amazonlinux-2.*|rhel.*|sles.*|solaris.*|macos-.*' # packer-lint: # uses: chef/github-workflows/.github/workflows/packer-lint.yml@main @@ -65,6 +68,14 @@ jobs: uses: ./.github/workflows/pkr-bld-qemu-x64.yml secrets: inherit + pkr-bld-utm-arm64: + uses: ./.github/workflows/pkr-bld-utm-arm64.yml + secrets: inherit + + pkr-bld-utm-x64: + uses: ./.github/workflows/pkr-bld-utm-x64.yml + secrets: inherit + pkr-bld-virtualbox-arm64: uses: ./.github/workflows/pkr-bld-virtualbox-arm64.yml secrets: inherit @@ -84,13 +95,13 @@ jobs: check_jobs_pass: if: always() needs: - - markdown-lint +# - markdown-lint - yaml-lint - json-lint - xml-lint - powershell-lint - shellcheck-lint - # - packer-lint +# - packer-lint runs-on: Ubuntu-latest steps: - name: Decide whether the needed jobs succeeded or failed diff --git a/.github/workflows/ci-lint.yml b/.github/workflows/ci-lint.yml index 5fb3b2075..f9e0e5894 100644 --- a/.github/workflows/ci-lint.yml +++ b/.github/workflows/ci-lint.yml @@ -3,6 +3,9 @@ on: schedule: - cron: '0 0 * * 0' +permissions: + contents: read + jobs: markdown-lint: uses: chef/github-workflows/.github/workflows/markdown-lint.yml@main diff --git a/.github/workflows/pkr-bld-amazonlinux-arm64.yml b/.github/workflows/pkr-bld-amazonlinux-arm64.yml index ffa8f35b3..7d7d38a69 100644 --- a/.github/workflows/pkr-bld-amazonlinux-arm64.yml +++ b/.github/workflows/pkr-bld-amazonlinux-arm64.yml @@ -2,6 +2,9 @@ on: workflow_call: +permissions: + contents: read + env: PACKER_GITHUB_API_TOKEN: "${{ secrets.GITHUB_TOKEN }}" # PACKER_LOG: "1" @@ -17,45 +20,39 @@ jobs: steps: - name: Checkout uses: actions/checkout@main - - name: Install Vagrant Virtualbox - run: | - brew tap hashicorp/tap - brew update - brew install qemu - brew install --cask hashicorp/tap/hashicorp-vagrant - brew install --cask virtualbox - - name: Install Chef - uses: actionshub/chef-install@3.0.0 - - name: Setup Packer - uses: hashicorp/setup-packer@main - with: - version: latest - - name: Checkout - uses: actions/checkout@main - - name: Install Bento - run: | - eval "$(chef shell-init bash)" - gem build bento.gemspec - gem install bento-*.gem +# - name: Setup Packer +# if: steps.verify-changed-files.outputs.files_changed == 'true' +# uses: hashicorp/setup-packer@main +# with: +# version: latest - name: Bento build run: | eval "$(chef shell-init bash)" - export LOGNAME=$USER ./${{ matrix.os }}-aarch64-virtualbox-build.sh - ls -alh builds - cat builds/${{ matrix.os }}*-x86_64._metadata.json + ls -alh builds/build_complete + cat builds/build_complete/${{ matrix.os }}*-aarch64._metadata.json + + - name: Remove VM in case of canceled job + if: cancelled() + run: | + VM="$(VBoxManage list vms | grep ${{ matrix.os }} | cut -d " " -f 1)" + echo "VM Name: $VM" + echo Powering off and deleting any existing VMs named ${{ matrix.os }}*-aarch64 + VBoxManage controlvm $VM poweroff + sleep 1 + vboxmanage unregistervm $VM --delete + sleep 2 - name: Bento Test run: | eval "$(chef shell-init bash)" - export LOGNAME=$USER bento test - name: Upload build artifact uses: actions/upload-artifact@v4 with: - name: "${{ matrix.os }}-virtualbox-x86_64" + name: "${{ matrix.os }}-virtualbox-aarch64" path: | - builds/*.box - builds/*.json + builds/build_complete/*.box + builds/build_complete/*.json overwrite: true retention-days: 10 compression-level: 0 # no compression diff --git a/.github/workflows/pkr-bld-amazonlinux-x64.yml b/.github/workflows/pkr-bld-amazonlinux-x64.yml index c28dc0a74..f4a56c859 100644 --- a/.github/workflows/pkr-bld-amazonlinux-x64.yml +++ b/.github/workflows/pkr-bld-amazonlinux-x64.yml @@ -2,6 +2,9 @@ on: workflow_call: +permissions: + contents: read + env: PACKER_GITHUB_API_TOKEN: "${{ secrets.GITHUB_TOKEN }}" # PACKER_LOG: "1" @@ -42,25 +45,24 @@ jobs: run: | rm -rf builds sudo mkdir -p /mnt/builds/iso + sudo mkdir -p /mnt/builds/build_complete sudo chmod -R 777 /mnt/builds sudo ln -s /mnt/builds ./ eval "$(chef shell-init bash)" - export LOGNAME=$USER ./${{ matrix.os }}-x86_64-virtualbox-build.sh - ls -alh builds - cat builds/${{ matrix.os }}*-x86_64._metadata.json + ls -alh builds/build_complete + cat builds/build_complete/${{ matrix.os }}*-x86_64._metadata.json - name: Bento Test run: | eval "$(chef shell-init bash)" - export LOGNAME=$USER bento test - name: Upload build artifact uses: actions/upload-artifact@v4 with: name: "${{ matrix.os }}-virtualbox-x86_64" path: | - builds/*.box - builds/*.json + builds/build_complete/*.box + builds/build_complete/*.json overwrite: true retention-days: 10 compression-level: 0 # no compression diff --git a/.github/workflows/pkr-bld-hyperv-x64.yml b/.github/workflows/pkr-bld-hyperv-x64.yml index eac1fa06b..62844caf5 100644 --- a/.github/workflows/pkr-bld-hyperv-x64.yml +++ b/.github/workflows/pkr-bld-hyperv-x64.yml @@ -2,6 +2,9 @@ on: workflow_call: +permissions: + contents: read + env: PACKER_GITHUB_API_TOKEN: "${{ secrets.GITHUB_TOKEN }}" # PACKER_LOG: "1" @@ -25,6 +28,7 @@ jobs: - freebsd-13 - freebsd-14 - opensuse-leap-15 + - opensuse-leap-16 - oraclelinux-8 - oraclelinux-9 - oraclelinux-10 @@ -33,6 +37,8 @@ jobs: - rockylinux-10 - ubuntu-22.04 - ubuntu-24.04 + - ubuntu-25.04 + - ubuntu-25.10 provider: - hyperv-iso steps: @@ -59,7 +65,7 @@ jobs: - name: Packer Init run: packer init -upgrade packer_templates - name: Packer build - run: packer build -timestamp-ui -only="${{ matrix.provider }}.vm" -var 'ssh_timeout=30m' -var 'sources_enabled=["hyperv-iso.vm"]' -var-file="os_pkrvars/$("${{ matrix.os }}".Split('-')[0])/${{ matrix.os }}-x86_64.pkrvars.hcl" packer_templates + run: packer build -timestamp-ui -only="${{ matrix.provider }}.vm" -var 'sources_enabled=["hyperv-iso.vm"]' -var-file="os_pkrvars/$("${{ matrix.os }}".Split('-')[0])/${{ matrix.os }}-x86_64.pkrvars.hcl" packer_templates - name: Bento Test run: | chef shell-init powershell @@ -69,8 +75,8 @@ jobs: with: name: "${{ matrix.os }}-hyperv-x86_64" path: | - builds/*.box - builds/*.json + builds/build_complete/*.box + builds/build_complete/*.json overwrite: true retention-days: 10 compression-level: 0 # no compression diff --git a/.github/workflows/pkr-bld-parallels-arm64.yml b/.github/workflows/pkr-bld-parallels-arm64.yml index ef850d0f4..a404a4122 100644 --- a/.github/workflows/pkr-bld-parallels-arm64.yml +++ b/.github/workflows/pkr-bld-parallels-arm64.yml @@ -2,6 +2,9 @@ on: workflow_call: +permissions: + contents: read + env: PACKER_GITHUB_API_TOKEN: "${{ secrets.GITHUB_TOKEN }}" # PACKER_LOG: "1" @@ -24,12 +27,15 @@ jobs: - freebsd-13 - freebsd-14 - opensuse-leap-15 + - opensuse-leap-16 - oraclelinux-9 - oraclelinux-10 - rockylinux-9 - rockylinux-10 - ubuntu-22.04 - ubuntu-24.04 + - ubuntu-25.04 + - ubuntu-25.10 provider: - parallels-iso steps: @@ -43,13 +49,14 @@ jobs: - name: Bento build run: | eval "$(chef shell-init bash)" - bento build -o ${{ matrix.provider }}.vm --vars 'ssh_timeout=30m' os_pkrvars/$(echo ${{ matrix.os }} | cut -d "-" -f 1)/"${{ matrix.os }}-aarch64.pkrvars.hcl" - ls -alh builds/ - cat builds/${{ matrix.os }}*-aarch64._metadata.json + bento build -o ${{ matrix.provider }}.vm os_pkrvars/$(echo ${{ matrix.os }} | cut -d "-" -f 1)/"${{ matrix.os }}-aarch64.pkrvars.hcl" + ls -alh builds/build_complete/ + cat builds/build_complete/${{ matrix.os }}*-aarch64._metadata.json - name: Remove VM in case of canceled job if: cancelled() run: | VM="$(prlctl list -a | grep ${{ matrix.os }} | cut -d " " -f 1)" + echo "VM Name: $VM" echo Powering off and deleting any existing VMs named ${{ matrix.os }}*-aarch64 prlctl stop "$VM" --kill 2> /dev/null sleep 1 @@ -64,8 +71,8 @@ jobs: with: name: "${{ matrix.os }}-parallels-aarch64" path: | - builds/*.box - builds/*.json + builds/build_complete/*.box + builds/build_complete/*.json overwrite: true retention-days: 10 compression-level: 0 # no compression diff --git a/.github/workflows/pkr-bld-parallels-x64.yml b/.github/workflows/pkr-bld-parallels-x64.yml index 50c8d55b0..2f9dead03 100644 --- a/.github/workflows/pkr-bld-parallels-x64.yml +++ b/.github/workflows/pkr-bld-parallels-x64.yml @@ -2,6 +2,9 @@ on: workflow_call: +permissions: + contents: read + env: PACKER_GITHUB_API_TOKEN: "${{ secrets.GITHUB_TOKEN }}" # PACKER_LOG: "1" @@ -25,6 +28,7 @@ jobs: - freebsd-13 - freebsd-14 - opensuse-leap-15 + - opensuse-leap-16 - oraclelinux-8 - oraclelinux-9 - oraclelinux-10 @@ -33,6 +37,8 @@ jobs: - rockylinux-10 - ubuntu-22.04 - ubuntu-24.04 + - ubuntu-25.04 + - ubuntu-25.10 provider: - parallels-iso steps: @@ -45,13 +51,14 @@ jobs: - name: Bento build run: | eval "$(chef shell-init bash)" - bento build -o ${{ matrix.provider }}.vm --vars 'ssh_timeout=30m' os_pkrvars/$(echo ${{ matrix.os }} | cut -d "-" -f 1)/"${{ matrix.os }}-x86_64.pkrvars.hcl" - ls -alh builds/ - cat builds/${{ matrix.os }}*-x86_64._metadata.json + bento build -o ${{ matrix.provider }}.vm os_pkrvars/$(echo ${{ matrix.os }} | cut -d "-" -f 1)/"${{ matrix.os }}-x86_64.pkrvars.hcl" + ls -alh builds/build_complete/ + cat builds/build_complete/${{ matrix.os }}*-x86_64._metadata.json - name: Remove VM in case of canceled job if: cancelled() run: | VM="$(prlctl list -a | grep ${{ matrix.os }} | cut -d " " -f 1)" + echo "VM Name: $VM" echo Powering off and deleting any existing VMs named ${{ matrix.os }}*-amd64 prlctl stop "$VM" --kill 2> /dev/null sleep 1 @@ -66,8 +73,8 @@ jobs: with: name: "${{ matrix.os }}-parallels-x86_64" path: | - builds/*.box - builds/*.json + builds/build_complete/*.box + builds/build_complete/*.json overwrite: true retention-days: 10 compression-level: 0 # no compression diff --git a/.github/workflows/pkr-bld-qemu-arm64.yml b/.github/workflows/pkr-bld-qemu-arm64.yml index a7a27197d..c065d2407 100644 --- a/.github/workflows/pkr-bld-qemu-arm64.yml +++ b/.github/workflows/pkr-bld-qemu-arm64.yml @@ -2,9 +2,12 @@ on: workflow_call: +permissions: + contents: read + env: PACKER_GITHUB_API_TOKEN: "${{ secrets.GITHUB_TOKEN }}" - PACKER_LOG: "1" + # PACKER_LOG: "1" jobs: aarch64: @@ -24,28 +27,54 @@ jobs: - freebsd-13 - freebsd-14 - opensuse-leap-15 + - opensuse-leap-16 - oraclelinux-9 - oraclelinux-10 - rockylinux-9 - rockylinux-10 - ubuntu-22.04 - ubuntu-24.04 + - ubuntu-25.04 + - ubuntu-25.10 provider: - qemu steps: - name: Checkout uses: actions/checkout@main -# - name: Setup Packer -# if: steps.verify-changed-files.outputs.files_changed == 'true' -# uses: hashicorp/setup-packer@main -# with: -# version: latest +# - name: Install Vagrant QEMU +# run: | +# wget -O- https://apt.releases.hashicorp.com/gpg | gpg --dearmor | sudo tee /usr/share/keyrings/hashicorp-archive-keyring.gpg +# echo "deb [signed-by=/usr/share/keyrings/hashicorp-archive-keyring.gpg] https://apt.releases.hashicorp.com $(lsb_release -cs) main" | sudo tee /etc/apt/sources.list.d/hashicorp.list +# sudo apt-get update +# sudo apt-get install -y software-properties-common vagrant qemu-kvm libvirt-daemon-system virtinst libvirt-clients bridge-utils qemu-utils libvirt-dev +# vagrant plugin install vagrant-libvirt vagrant-qemu +# - name: Enable KVM +# run: | +# echo 'KERNEL=="kvm", GROUP="kvm", MODE="0666", OPTIONS+="static_node=kvm"' | sudo tee /etc/udev/rules.d/99-kvm4all.rules +# sudo udevadm control --reload-rules +# sudo udevadm trigger --name-match=kvm +# sudo usermod -aG kvm $USER +# sudo usermod -aG libvirt $USER +# sudo chmod o+rw /var/run/libvirt/libvirt-sock +# sudo systemctl start libvirtd +# sudo systemctl status libvirtd +# - name: Install Chef +# uses: actionshub/chef-install@3.0.0 +# - name: Setup Packer +# uses: hashicorp/setup-packer@main +# with: +# version: latest +# - name: Install Bento +# run: | +# eval "$(chef shell-init bash)" +# gem build bento.gemspec +# gem install bento-*.gem - name: Bento build run: | eval "$(chef shell-init bash)" - bento build -o ${{ matrix.provider }}.vm --vars 'ssh_timeout=30m' --vars "qemu_accelerator=hvf" os_pkrvars/$(echo ${{ matrix.os }} | cut -d "-" -f 1)/"${{ matrix.os }}-aarch64.pkrvars.hcl" - ls -alh builds/ - cat builds/${{ matrix.os }}*-aarch64._metadata.json + bento build -o ${{ matrix.provider }}.vm os_pkrvars/$(echo ${{ matrix.os }} | cut -d "-" -f 1)/"${{ matrix.os }}-aarch64.pkrvars.hcl" + ls -alh builds/build_complete/ + cat builds/build_complete/${{ matrix.os }}*-aarch64._metadata.json - name: Bento Test run: | eval "$(chef shell-init bash)" @@ -55,8 +84,8 @@ jobs: with: name: "${{ matrix.os }}-qemu-aarch64" path: | - builds/*.box - builds/*.json + builds/build_complete/*.box + builds/build_complete/*.json overwrite: true retention-days: 10 compression-level: 0 # no compression diff --git a/.github/workflows/pkr-bld-qemu-x64.yml b/.github/workflows/pkr-bld-qemu-x64.yml index 3d5141615..89cf62d72 100644 --- a/.github/workflows/pkr-bld-qemu-x64.yml +++ b/.github/workflows/pkr-bld-qemu-x64.yml @@ -2,6 +2,9 @@ on: workflow_call: +permissions: + contents: read + env: PACKER_GITHUB_API_TOKEN: "${{ secrets.GITHUB_TOKEN }}" # PACKER_LOG: "1" @@ -25,6 +28,7 @@ jobs: - freebsd-13 - freebsd-14 - opensuse-leap-15 + - opensuse-leap-16 - oraclelinux-8 - oraclelinux-9 - oraclelinux-10 @@ -33,6 +37,8 @@ jobs: - rockylinux-10 - ubuntu-22.04 - ubuntu-24.04 + - ubuntu-25.04 + - ubuntu-25.10 provider: - qemu steps: @@ -70,12 +76,13 @@ jobs: run: | rm -rf builds sudo mkdir -p /mnt/builds/iso + sudo mkdir -p /mnt/builds/build_complete sudo chmod -R 777 /mnt/builds sudo ln -s /mnt/builds ./ eval "$(chef shell-init bash)" - bento build -o ${{ matrix.provider }}.vm --vars 'ssh_timeout=30m' --vars "qemu_accelerator=kvm" os_pkrvars/$(echo ${{ matrix.os }} | cut -d "-" -f 1)/"${{ matrix.os }}-x86_64.pkrvars.hcl" - ls -alh builds/ - cat builds/${{ matrix.os }}*-x86_64._metadata.json + bento build -o ${{ matrix.provider }}.vm os_pkrvars/$(echo ${{ matrix.os }} | cut -d "-" -f 1)/"${{ matrix.os }}-x86_64.pkrvars.hcl" + ls -alh builds/build_complete/ + cat builds/build_complete/${{ matrix.os }}*-x86_64._metadata.json - name: Bento Test run: | eval "$(chef shell-init bash)" @@ -85,8 +92,8 @@ jobs: with: name: "${{ matrix.os }}-qemu-x86_64" path: | - builds/*.box - builds/*.json + builds/build_complete/*.box + builds/build_complete/*.json overwrite: true retention-days: 10 compression-level: 0 # no compression diff --git a/.github/workflows/pkr-bld-utm-arm64.yml b/.github/workflows/pkr-bld-utm-arm64.yml new file mode 100644 index 000000000..263c9b2df --- /dev/null +++ b/.github/workflows/pkr-bld-utm-arm64.yml @@ -0,0 +1,92 @@ +--- +on: + workflow_call: + +permissions: + contents: read + +env: + PACKER_GITHUB_API_TOKEN: "${{ secrets.GITHUB_TOKEN }}" + # PACKER_LOG: "1" + +jobs: + aarch64: + runs-on: [self-hosted, ARM64, utm] + strategy: + fail-fast: false + matrix: + os: + - almalinux-9 + - almalinux-10 + - centos-stream-9 + - centos-stream-10 + - debian-12 + - debian-13 + - fedora-41 + - fedora-42 + - freebsd-13 + - freebsd-14 + - opensuse-leap-15 + - opensuse-leap-16 + - oraclelinux-9 + - oraclelinux-10 + - rockylinux-9 + - rockylinux-10 + - ubuntu-22.04 + - ubuntu-24.04 + - ubuntu-25.04 + - ubuntu-25.10 + provider: + - utm-iso + steps: + - name: Checkout + uses: actions/checkout@main +# - name: Install UTM vagrant` +# run: | +# brew tap hashicorp/tap +# brew update +# brew install --cask hashicorp/tap/hashicorp-vagrant +# brew install utm +# vagrant plugin install vagrant_utm +# - name: Setup Packer +# if: steps.verify-changed-files.outputs.files_changed == 'true' +# uses: hashicorp/setup-packer@main +# with: +# version: latest +# - name: Install Chef +# uses: actionshub/chef-install@3.0.0 +# - name: Install Bento +# run: | +# eval "$(chef shell-init bash)" +# gem build bento.gemspec +# gem install bento-*.gem + - name: Bento build + run: | + eval "$(chef shell-init bash)" + bento build -o ${{ matrix.provider }}.vm os_pkrvars/$(echo ${{ matrix.os }} | cut -d "-" -f 1)/"${{ matrix.os }}-aarch64.pkrvars.hcl" + ls -alh builds/build_complete/ + cat builds/build_complete/${{ matrix.os }}*-aarch64._metadata.json + - name: Remove VM in case of canceled job + if: cancelled() + run: | + VM="$(utmctl list -a | grep ${{ matrix.os }} | cut -d " " -f 1)" + echo "VM Name: $VM" + echo Powering off and deleting any existing VMs named ${{ matrix.os }}*-aarch64 + utmctl stop "$VM" + sleep 1 + utmctl delete "$VM" + sleep 2 + - name: Bento Test + run: | + eval "$(chef shell-init bash)" + bento test + - name: Upload build artifact + uses: actions/upload-artifact@v4 + with: + name: "${{ matrix.os }}-utm-aarch64" + path: | + builds/build_complete/*.box + builds/build_complete/*.json + overwrite: true + retention-days: 10 + compression-level: 0 # no compression diff --git a/.github/workflows/pkr-bld-utm-x64.yml b/.github/workflows/pkr-bld-utm-x64.yml new file mode 100644 index 000000000..482b29a66 --- /dev/null +++ b/.github/workflows/pkr-bld-utm-x64.yml @@ -0,0 +1,99 @@ +--- +on: + workflow_call: + +permissions: + contents: read + +env: + PACKER_GITHUB_API_TOKEN: ${{ secrets.GITHUB_TOKEN }} + # PACKER_LOG: 1 + +jobs: + x86_64: + runs-on: [self-hosted, X64, utm] + strategy: + fail-fast: false + matrix: + os: + - almalinux-8 + - almalinux-9 + - almalinux-10 + - centos-stream-9 + - centos-stream-10 + - debian-12 + - debian-13 + - fedora-41 + - fedora-42 + - freebsd-13 + - freebsd-14 + - opensuse-leap-15 + - opensuse-leap-16 + - oraclelinux-8 + - oraclelinux-9 + - oraclelinux-10 + - rockylinux-8 + - rockylinux-9 + - rockylinux-10 + - ubuntu-22.04 + - ubuntu-24.04 + - ubuntu-25.04 + - ubuntu-25.10 + provider: + - utm-iso + steps: + - name: Checkout + uses: actions/checkout@main +# - name: Install UTM vagrant` +# run: | +# brew tap hashicorp/tap +# brew update +# brew install --cask hashicorp/tap/hashicorp-vagrant +# brew install utm +# vagrant plugin install vagrant_utm +# - name: Setup Packer +# if: steps.verify-changed-files.outputs.files_changed == 'true' +# uses: hashicorp/setup-packer@main +# with: +# version: latest +# - name: Install Chef +# uses: actionshub/chef-install@3.0.0 +# - name: Setup Packer +# uses: hashicorp/setup-packer@main +# with: +# version: latest +# - name: Install Bento +# run: | +# eval "$(chef shell-init bash)" +# gem build bento.gemspec +# gem install bento-*.gem + - name: Bento build + run: | + eval "$(chef shell-init bash)" + bento build -o ${{ matrix.provider }}.vm --vars 'ssh_timeout=60m' os_pkrvars/$(echo ${{ matrix.os }} | cut -d "-" -f 1)/"${{ matrix.os }}-x86_64.pkrvars.hcl" + ls -alh builds/build_complete/ + cat builds/build_complete/${{ matrix.os }}*-x86_64._metadata.json + - name: Remove VM in case of canceled job + if: cancelled() + run: | + VM="$(utmctl list -a | grep ${{ matrix.os }} | cut -d " " -f 1)" + echo "VM Name: $VM" + echo Powering off and deleting any existing VMs named ${{ matrix.os }}*-x86_64 + utmctl stop "$VM" + sleep 1 + utmctl delete "$VM" + sleep 2 + - name: Bento Test + run: | + eval "$(chef shell-init bash)" + bento test + - name: Upload build artifact + uses: actions/upload-artifact@v4 + with: + name: "${{ matrix.os }}-utm-x86_64" + path: | + builds/build_complete/*.box + builds/build_complete/*.json + overwrite: true + retention-days: 10 + compression-level: 0 # no compression diff --git a/.github/workflows/pkr-bld-virtualbox-arm64.yml b/.github/workflows/pkr-bld-virtualbox-arm64.yml index 5bf795560..47d7ee434 100644 --- a/.github/workflows/pkr-bld-virtualbox-arm64.yml +++ b/.github/workflows/pkr-bld-virtualbox-arm64.yml @@ -2,6 +2,9 @@ on: workflow_call: +permissions: + contents: read + env: PACKER_GITHUB_API_TOKEN: "${{ secrets.GITHUB_TOKEN }}" # PACKER_LOG: "1" @@ -24,12 +27,15 @@ jobs: - freebsd-13 - freebsd-14 - opensuse-leap-15 + - opensuse-leap-16 - oraclelinux-9 - oraclelinux-10 - rockylinux-9 - rockylinux-10 - ubuntu-22.04 - ubuntu-24.04 + - ubuntu-25.04 + - ubuntu-25.10 provider: - virtualbox-iso steps: @@ -43,17 +49,18 @@ jobs: - name: Bento build run: | eval "$(chef shell-init bash)" - bento build -o ${{ matrix.provider }}.vm --vars 'ssh_timeout=30m' os_pkrvars/$(echo ${{ matrix.os }} | cut -d "-" -f 1)/"${{ matrix.os }}-aarch64.pkrvars.hcl" - ls -alh builds/ - cat builds/${{ matrix.os }}*-aarch64._metadata.json + bento build -o ${{ matrix.provider }}.vm os_pkrvars/$(echo ${{ matrix.os }} | cut -d "-" -f 1)/"${{ matrix.os }}-aarch64.pkrvars.hcl" + ls -alh builds/build_complete/ + cat builds/build_complete/${{ matrix.os }}*-aarch64._metadata.json - name: Remove VM in case of canceled job if: cancelled() run: | - VM="$(prlctl list -a | grep ${{ matrix.os }} | cut -d " " -f 1)" + VM="$(VBoxManage list vms | grep ${{ matrix.os }} | cut -d " " -f 1)" + echo "VM Name: $VM" echo Powering off and deleting any existing VMs named ${{ matrix.os }}*-aarch64 - prlctl stop "$VM" --kill 2> /dev/null + VBoxManage controlvm $VM poweroff sleep 1 - prlctl delete "$VM" 2> /dev/null + vboxmanage unregistervm $VM --delete sleep 2 - name: Bento Test run: | @@ -62,10 +69,10 @@ jobs: - name: Upload build artifact uses: actions/upload-artifact@v4 with: - name: "${{ matrix.os }}-parallels-aarch64" + name: "${{ matrix.os }}-virtualbox-aarch64" path: | - builds/*.box - builds/*.json + builds/build_complete/*.box + builds/build_complete/*.json overwrite: true retention-days: 10 compression-level: 0 # no compression diff --git a/.github/workflows/pkr-bld-virtualbox-x64.yml b/.github/workflows/pkr-bld-virtualbox-x64.yml index 4baa1f2d7..685ef56f2 100644 --- a/.github/workflows/pkr-bld-virtualbox-x64.yml +++ b/.github/workflows/pkr-bld-virtualbox-x64.yml @@ -2,6 +2,9 @@ on: workflow_call: +permissions: + contents: read + env: PACKER_GITHUB_API_TOKEN: ${{ secrets.GITHUB_TOKEN }} # PACKER_LOG: 1 @@ -25,6 +28,7 @@ jobs: - freebsd-13 - freebsd-14 - opensuse-leap-15 + - opensuse-leap-16 - oraclelinux-8 - oraclelinux-9 - oraclelinux-10 @@ -33,6 +37,8 @@ jobs: - rockylinux-10 - ubuntu-22.04 - ubuntu-24.04 + - ubuntu-25.04 + - ubuntu-25.10 provider: - virtualbox-iso steps: @@ -45,7 +51,7 @@ jobs: echo "deb [signed-by=/usr/share/keyrings/hashicorp-archive-keyring.gpg] https://apt.releases.hashicorp.com $(lsb_release -cs) main" | sudo tee /etc/apt/sources.list.d/hashicorp.list echo "deb [signed-by=/usr/share/keyrings/oracle-virtualbox-2016.gpg] https://download.virtualbox.org/virtualbox/debian $(lsb_release -cs) contrib" | sudo tee /etc/apt/sources.list.d/virtualbox.list sudo apt-get update - sudo apt-get install -y software-properties-common vagrant virtualbox-7.1 + sudo apt-get install -y software-properties-common vagrant virtualbox-7.2 - name: Install Chef uses: actionshub/chef-install@3.0.0 - name: Setup Packer @@ -61,13 +67,14 @@ jobs: run: | rm -rf builds sudo mkdir -p /mnt/builds/iso + sudo mkdir -p /mnt/builds/build_complete sudo chmod -R 777 /mnt/builds sudo ln -s /mnt/builds ./ eval "$(chef shell-init bash)" export LOGNAME=$USER - bento build -o ${{ matrix.provider }}.vm --vars 'ssh_timeout=30m' os_pkrvars/$(echo ${{ matrix.os }} | cut -d "-" -f 1)/"${{ matrix.os }}-x86_64.pkrvars.hcl" - ls -alh builds/ - cat builds/${{ matrix.os }}*-x86_64._metadata.json + bento build -o ${{ matrix.provider }}.vm os_pkrvars/$(echo ${{ matrix.os }} | cut -d "-" -f 1)/"${{ matrix.os }}-x86_64.pkrvars.hcl" + ls -alh builds/build_complete/ + cat builds/build_complete/${{ matrix.os }}*-x86_64._metadata.json - name: Bento Test run: | eval "$(chef shell-init bash)" @@ -78,8 +85,8 @@ jobs: with: name: "${{ matrix.os }}-virtualbox-x86_64" path: | - builds/*.box - builds/*.json + builds/build_complete/*.box + builds/build_complete/*.json overwrite: true retention-days: 10 compression-level: 0 # no compression diff --git a/.github/workflows/pkr-bld-vmware-arm64.yml b/.github/workflows/pkr-bld-vmware-arm64.yml index 203afaf57..6faa1587c 100644 --- a/.github/workflows/pkr-bld-vmware-arm64.yml +++ b/.github/workflows/pkr-bld-vmware-arm64.yml @@ -2,6 +2,9 @@ on: workflow_call: +permissions: + contents: read + env: PACKER_GITHUB_API_TOKEN: "${{ secrets.GITHUB_TOKEN }}" # PACKER_LOG: "1" @@ -24,12 +27,15 @@ jobs: - freebsd-13 - freebsd-14 - opensuse-leap-15 + - opensuse-leap-16 - oraclelinux-9 - oraclelinux-10 - rockylinux-9 - rockylinux-10 - ubuntu-22.04 - ubuntu-24.04 + - ubuntu-25.04 + - ubuntu-25.10 provider: - vmware-iso steps: @@ -43,18 +49,35 @@ jobs: - name: Bento build run: | eval "$(chef shell-init bash)" - bento build -o ${{ matrix.provider }}.vm --vars 'ssh_timeout=30m' os_pkrvars/$(echo ${{ matrix.os }} | cut -d "-" -f 1)/"${{ matrix.os }}-aarch64.pkrvars.hcl" - ls -alh builds/ - cat builds/${{ matrix.os }}*-aarch64._metadata.json + bento build -o ${{ matrix.provider }}.vm os_pkrvars/$(echo ${{ matrix.os }} | cut -d "-" -f 1)/"${{ matrix.os }}-aarch64.pkrvars.hcl" + ls -alh builds/build_complete/ + cat builds/build_complete/${{ matrix.os }}*-aarch64._metadata.json - name: Remove VM in case of canceled job if: cancelled() run: | - VM="$(prlctl list -a | grep ${{ matrix.os }} | cut -d " " -f 1)" - echo Powering off and deleting any existing VMs named ${{ matrix.os }}*-aarch64 - prlctl stop "$VM" --kill 2> /dev/null - sleep 1 - prlctl delete "$VM" 2> /dev/null - sleep 2 + # Set your VM directory path + VM_DIR="$HOME/Documents/Virtual Machines.localized" + # VM name to search for (case-sensitive) + TARGET_VM_NAME="${{ matrix.os }}" + # List all VMs + echo "Listing all VMs in $VM_DIR..." + VM_PATHS=$(find "$VM_DIR" -name "*.vmx") + # Loop through each VM and match by name + for VMX in $VM_PATHS; do + if grep -q "$TARGET_VM_NAME" <<< "$VMX"; then + echo "Found VM: $VMX" + # Stop the VM + echo "Stopping VM..." + vmrun stop "$VMX" soft + # Wait a bit to ensure it's stopped + sleep 5 + # Delete the VM directory + VM_FOLDER=$(dirname "$VMX") + echo "Deleting VM folder: $VM_FOLDER" + rm -rf "$VM_FOLDER" + echo "VM '$TARGET_VM_NAME' has been stopped and deleted." + fi + done - name: Bento Test run: | eval "$(chef shell-init bash)" @@ -64,8 +87,8 @@ jobs: with: name: "${{ matrix.os }}-parallels-aarch64" path: | - builds/*.box - builds/*.json + builds/build_complete/*.box + builds/build_complete/*.json overwrite: true retention-days: 10 compression-level: 0 # no compression diff --git a/.github/workflows/pkr-bld-vmware-x64.yml b/.github/workflows/pkr-bld-vmware-x64.yml index dfd8b3fff..ff7e237ba 100644 --- a/.github/workflows/pkr-bld-vmware-x64.yml +++ b/.github/workflows/pkr-bld-vmware-x64.yml @@ -2,6 +2,9 @@ on: workflow_call: +permissions: + contents: read + env: PACKER_GITHUB_API_TOKEN: "${{ secrets.GITHUB_TOKEN }}" # PACKER_LOG: "1" @@ -25,6 +28,7 @@ jobs: - freebsd-13 - freebsd-14 - opensuse-leap-15 + - opensuse-leap-16 - oraclelinux-8 - oraclelinux-9 - oraclelinux-10 @@ -33,6 +37,8 @@ jobs: - rockylinux-10 - ubuntu-22.04 - ubuntu-24.04 + - ubuntu-25.04 + - ubuntu-25.10 provider: - vmware-iso steps: @@ -46,18 +52,35 @@ jobs: - name: Bento build run: | eval "$(chef shell-init bash)" - bento build -o ${{ matrix.provider }}.vm --vars 'ssh_timeout=30m' os_pkrvars/$(echo ${{ matrix.os }} | cut -d "-" -f 1)/"${{ matrix.os }}-x86_64.pkrvars.hcl" - ls -alh builds/ - cat builds/${{ matrix.os }}*-x86_64._metadata.json + bento build -o ${{ matrix.provider }}.vm os_pkrvars/$(echo ${{ matrix.os }} | cut -d "-" -f 1)/"${{ matrix.os }}-x86_64.pkrvars.hcl" + ls -alh builds/build_complete/ + cat builds/build_complete/${{ matrix.os }}*-x86_64._metadata.json - name: Remove VM in case of canceled job if: cancelled() run: | - VM="$(prlctl list -a | grep ${{ matrix.os }} | cut -d " " -f 1)" - echo Powering off and deleting any existing VMs named ${{ matrix.os }}*-x86_64 - prlctl stop "$VM" --kill 2> /dev/null - sleep 1 - prlctl delete "$VM" 2> /dev/null - sleep 2 + # Set your VM directory path + VM_DIR="$HOME/Documents/Virtual Machines.localized" + # VM name to search for (case-sensitive) + TARGET_VM_NAME="${{ matrix.os }}" + # List all VMs + echo "Listing all VMs in $VM_DIR..." + VM_PATHS=$(find "$VM_DIR" -name "*.vmx") + # Loop through each VM and match by name + for VMX in $VM_PATHS; do + if grep -q "$TARGET_VM_NAME" <<< "$VMX"; then + echo "Found VM: $VMX" + # Stop the VM + echo "Stopping VM..." + vmrun stop "$VMX" soft + # Wait a bit to ensure it's stopped + sleep 5 + # Delete the VM directory + VM_FOLDER=$(dirname "$VMX") + echo "Deleting VM folder: $VM_FOLDER" + rm -rf "$VM_FOLDER" + echo "VM '$TARGET_VM_NAME' has been stopped and deleted." + fi + done - name: Bento Test run: | eval "$(chef shell-init bash)" @@ -67,8 +90,8 @@ jobs: with: name: "${{ matrix.os }}-parallels-x86_64" path: | - builds/*.box - builds/*.json + builds/build_complete/*.box + builds/build_complete/*.json overwrite: true retention-days: 10 compression-level: 0 # no compression diff --git a/.github/workflows/test-pkr-bld-parallels.yml b/.github/workflows/test-pkr-bld-parallels.yml index 86bd15bc9..06d35e7a0 100644 --- a/.github/workflows/test-pkr-bld-parallels.yml +++ b/.github/workflows/test-pkr-bld-parallels.yml @@ -2,8 +2,12 @@ on: workflow_call: +permissions: + contents: read + env: PACKER_GITHUB_API_TOKEN: "${{ secrets.GITHUB_TOKEN }}" + # PACKER_LOG: "1" jobs: x86_64: @@ -23,6 +27,7 @@ jobs: - freebsd-13 - freebsd-14 - opensuse-leap-15 + - opensuse-leap-16 - oraclelinux-8 - oraclelinux-9 - oraclelinux-10 @@ -59,15 +64,15 @@ jobs: run: | eval "$(chef shell-init bash)" bento build -o ${{ matrix.provider }}.vm os_pkrvars/$(echo ${{ matrix.os }} | cut -d "-" -f 1)/"${{ matrix.os }}-x86_64.pkrvars.hcl" - ls -alh builds/ - cat builds/${{ matrix.os }}*-x86_64._metadata.json + ls -alh builds/build_complete/ + cat builds/build_complete/${{ matrix.os }}*-x86_64._metadata.json - name: Upload build artifact uses: actions/upload-artifact@v3 with: name: "${{ matrix.os }}-parallels-x86_64" path: | - builds/*.box - builds/*.json + builds/build_complete/*.box + builds/build_complete/*.json retention-days: 10 compression-level: 0 # no compression - name: Bento Test @@ -128,8 +133,8 @@ jobs: run: | eval "$(chef shell-init bash)" bento build -o ${{ matrix.provider }}.vm --vars 'ssh_timeout=30m' os_pkrvars/$(echo ${{ matrix.os }} | cut -d "-" -f 1)/"${{ matrix.os }}-aarch64.pkrvars.hcl" - ls -alh builds/ - cat builds/${{ matrix.os }}*-aarch64._metadata.json + ls -alh builds/build_complete/ + cat builds/build_complete/${{ matrix.os }}*-aarch64._metadata.json - name: Bento Test run: | eval "$(chef shell-init bash)" @@ -139,8 +144,8 @@ jobs: with: name: "${{ matrix.os }}-parallels-aarch64" path: | - builds/*.box - builds/*.json + builds/build_complete/*.box + builds/build_complete/*.json overwrite: true retention-days: 10 compression-level: 0 # no compression diff --git a/.shellcheckrc b/.shellcheckrc new file mode 100644 index 000000000..076f6a9b9 --- /dev/null +++ b/.shellcheckrc @@ -0,0 +1,3 @@ +# ~/.shellcheckrc +# disable=SC2059,SC2034 # Disable individual error codes +# disable=SC1090-SC1100 # Disable a range of error codes diff --git a/CHANGELOG.md b/CHANGELOG.md index 03b749ef1..e037244a5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,36 +7,39 @@ Markdown table generated at <https://www.tablesgenerator.com/markdown_tables#> ## Builds for version 202508.03.0 -| os | virtualbox<br>x86_64 | virtualbox<br>aarch64 | vmware<br>x86_64 | vmware<br>aarch64 | parallels<br>x86_64 | parallels<br>aarch64 | qemu<br>x86_64 | qemu<br>aarch64 | hyperv<br>x86_64 | -|:---:|:---:|:---:|:---:|:---:|:---:|:---:|:---:|:---:|:---:| -| almalinux-8 | x | na | x | na | x | na | x | na | | -| almalinux-9 | x | x | x | x | x | x | x | | | -| almalinux-10 | x | x | x | x | x | x | | | | -| amazonlinux-2023 | x | | | | | | | | | -| centos-stream-9 | x | x | x | x | x | x | x | | | -| centos-stream-10 | x | x | x | x | | x | | | | -| debian-12 | x | x | x | x | x | x | | | | -| debian-13 | x | x | x | x | x | x | | | | -| fedora-41 | x | x | x | x | x | x | x | | | -| fedora-42 | x | x | x | x | x | x | x | | | -| freebsd-13 | x | x | x | x | x | x | x | | | -| freebsd-14 | x | x | x | x | x | x | x | | | -| macos-14 | na | na | na | na | na | x | na | na | na | -| macos-15 | na | na | na | na | na | x | na | na | na | -| opensuse-leap-15 | x | x | x | x | x | x | x | | | -| oraclelinux-8 | x | na | x | na | x | na | x | na | | -| oraclelinux-9 | x | x | x | x | x | x | x | | | -| oraclelinux-10 | x | | x | | x | | x | | | -| rockylinux-8 | x | na | x | na | x | na | x | na | | -| rockylinux-9 | x | x | x | x | x | x | x | | | -| rockylinux-10 | x | x | x | x | x | x | | | | -| ubuntu-22.04 | x | x | x | x | x | x | | | | -| ubuntu-24.04 | x | x | x | x | x | x | x | | | -| windows-11 | x | na | x | x | x | x | | | | -| windows-2016 | x | na | x | na | x | na | | na | | -| windows-2019 | x | na | x | na | x | na | | na | | -| windows-2022 | x | na | x | na | x | na | | na | | -| windows-2025 | x | na | x | na | x | na | | na | | +| os | virtualbox<br>x86_64 | virtualbox<br>aarch64 | vmware<br>x86_64 | vmware<br>aarch64 | parallels<br>x86_64 | parallels<br>aarch64 | utm<br>x86_64 | utm<br>aarch64 | qemu<br>x86_64 | qemu<br>aarch64 | hyperv<br>x86_64 | +|:---:|:---:|:---:|:---:|:---:|:---:|:---:|:---:|:---:|:---:|:---:|:---:| +| almalinux-8 | x | na | x | na | x | na | x | na | | na | | +| almalinux-9 | x | x | x | x | x | x | x | x | | | | +| almalinux-10 | x | x | x | x | x | x | x | x | | | | +| amazonlinux-2023 | x | | | | | | | | | | | +| centos-stream-9 | x | x | x | x | x | x | | | | | | +| centos-stream-10 | x | x | x | x | | x | x | x | | | | +| debian-12 | x | x | x | x | x | x | | | | | | +| debian-13 | x | x | x | x | x | x | | | | | | +| fedora-41 | x | x | x | x | x | x | x | x | | | | +| fedora-42 | x | x | x | x | x | x | x | x | | | | +| freebsd-13 | x | x | x | x | x | x | x | | | | | +| freebsd-14 | x | x | x | x | x | x | x | x | | | | +| macos-14 | na | na | na | na | na | x | | | na | na | na | +| macos-15 | na | na | na | na | na | x | | | na | na | na | +| opensuse-leap-15 | x | x | x | x | x | x | | | | | | +| opensuse-leap-16 | x | x | x | x | x | x | | x | | | | +| oraclelinux-8 | x | na | x | na | x | na | x | na | | na | | +| oraclelinux-9 | x | x | x | x | x | x | x | x | | | | +| oraclelinux-10 | x | | x | | x | | x | | | | | +| rockylinux-8 | x | na | x | na | x | na | x | na | | na | | +| rockylinux-9 | x | x | x | x | x | x | x | x | | | | +| rockylinux-10 | x | x | x | x | x | x | x | x | | | | +| ubuntu-22.04 | x | x | x | x | x | x | x | x | | | | +| ubuntu-24.04 | x | x | x | x | x | x | x | x | x | | | +| ubuntu-25.04 | x | x | x | x | x | x | x | x | x | | | +| ubuntu-25.10 | | | | | | | | | | | | +| windows-11 | x | na | x | x | x | x | | | | | | +| windows-2016 | x | na | x | na | x | na | | na | | na | | +| windows-2019 | x | na | x | na | x | na | | na | | na | | +| windows-2022 | x | na | x | na | x | na | | na | | na | | +| windows-2025 | x | na | x | na | x | na | | na | | na | | ### Todo @@ -50,7 +53,31 @@ Markdown table generated at <https://www.tablesgenerator.com/markdown_tables#> - Create CD pipeline to upload vagrant boxes after PR is merged - Create CD pipeline to build and upload new versions of vagrant boxes once every 3 months with the latest patches -## [unreleased] (2025-08-10) +## [unreleased] (2025-10-27) + +## [v5.0.0] (2025-08-27) + +- Add UTM virtualization support <https://mac.getutm.app/> +- Fix Win11 vbox guest os type for aarch64 +- Update qemu args for aarch64 on macos to properly boot linux vms +- Fix workflows to remove vms on cancelled jobs +- Set workflows that have restrictions on automating virtual provider install or arm hosts to use self hosted runners +- Fix Oracle Linux 10 aarch64 install of gcc after newer kernel updates built on newer gcc version +- Add check on linux scripts if reboot is needed otherwise move on +- Added qemu guest tools install script for linux +- Added utm provider to windows vagrant file template +- Updated fedora ks file to enable firewall and set selinux to enforcing similar to a default install +- Added provider specific boot command variables - if null falls back to boot_command variable +- Consolidate kickstart files +- Added macOS 26 builds +- Updated Debian 13 to 13.1 +- Added OpenSUSE Leap 16 builds +- Fix Debian libvirt build +- Added Ubuntu 25.04 and 25.10 builds +- Misc Ubuntu script fixes +- update testing to move files to testing_passed and testing_failed directories +- completed build now go to builds/build_complete directory +- fix scripts reboot checks ## [v4.2.0] (2025-08-10) diff --git a/README.md b/README.md index a035e3959..e0b1301bb 100644 --- a/README.md +++ b/README.md @@ -7,7 +7,7 @@ Bento is a project that encapsulates [Packer](https://www.packer.io/) templates - Vagrant 2.4.0+ is required for new cpu architecture support - For `bento test` command to work test-kitchen and kitchen-vagrant gems must be installed - Virutalbox 7.1.6+ required for arm64 support -- When running packer build command the output directory is relative to the working directory the command is currently running in. Suggest running packer build commands from bento root directory for build working files to be placed in bento/builds/(build_name) directory by default. If the output_directory variable isn't overwritten a directory called builds/(build_name) will be created in the current working directory that you are running the command from +- When running packer build command the output directory is relative to the working directory the command is currently running in. Suggest running packer build commands from bento root directory for build working files to be placed in bento/builds/build_complete/(build_name) directory by default. If the output_directory variable isn't overwritten a directory called builds/build_complete/(build_name) will be created in the current working directory that you are running the command from ## Using Public Boxes @@ -44,6 +44,7 @@ end - [VMware Fusion](https://www.vmware.com/products/fusion.html) - [VMware Workstation](https://www.vmware.com/products/workstation-pro.html) - [Parallels Desktop Pro](https://www.parallels.com/products/desktop/) + - [UTM](https://mac.getutm.app/) - [qemu](https://www.qemu.org/) *1 - [Hyper-V](https://docs.microsoft.com/en-us/virtualization/hyper-v-on-windows/about/) *1 @@ -56,25 +57,25 @@ end To build a Debian vagrant box using the bento tool with the template available in the `os_pkrvars` dir, we can use the following command: ```bash -bento build --cpus 2 os_pkrvars/debian/debian-12-x86_64.pkrvars.hcl +bento build os_pkrvars/debian/debian-13-x86_64.pkrvars.hcl ``` Other available options: -- cpus - Specify the number of CPUs needed in the new build -- mem - Specify the memory -- config - Use a configuration file other than default builds.yml -- on-error - Choose what to do if a build fails -- vars - Comma seperated list of variable names equal values (ex: boot_wait="2s",ssh_timeout="5s") -- var_files - Comma seperated list of pkrvar.hcl files to include in the builds (ex: /path/to/var_file.pkrvars.hcl,/path/to/next/var_file2.pkrvars.hcl) -- metadata_only - Only generate the metadata json file -- mirror - The template will have a default mirror link, if you wish to use an alternative one, you can utilise this configuration -- dry-run - This will not create any build, but will create a metadata file for reference -- only - Only build some Packer builds (Default: parallels-iso.vm,virtualbox-iso.vm,vmware-iso.vm -- except - Build all Packer builds except these (ex: parallels-iso.vm,virtualbox-iso.vm,vmware-iso.vm) -- debug - Print the debug logs -- gui - Packer will be building VirtualBox virtual machines by launching a GUI that shows the console of the machine being built. This option is false by default -- single - This can be used to disable the parallel builds +- --cpus - Specify the number of CPUs needed in the new build +- --mem - Specify the memory +- --config - Use a configuration file other than default builds.yml +- --on-error - Choose what to do if a build fails +- --vars - Comma seperated list of variable names equal values (ex: boot_wait="2s",ssh_timeout="5s") +- --var_files - Comma seperated list of pkrvar.hcl files to include in the builds (ex: /path/to/var_file.pkrvars.hcl,/path/to/next/var_file2.pkrvars.hcl) +- --metadata-only - Only generate the metadata json file +- --mirror - The template will have a default mirror link, if you wish to use an alternative one, you can utilise this configuration +- --dry-run - This will not create any build, but will create a metadata file for reference +- --only - Only build some Packer builds (Default: parallels-iso.vm,virtualbox-iso.vm,vmware-iso.vm +- --except - Build all Packer builds except these (ex: parallels-iso.vm,virtualbox-iso.vm,vmware-iso.vm) +- --debug - Print the debug logs +- --gui - Packer will be building VirtualBox virtual machines by launching a GUI that shows the console of the machine being built. This option is false by default +- --single - This can be used to disable the parallel builds #### list @@ -88,7 +89,7 @@ bento list #### test -If you have successfully built a vagrant box using the bento tool, you should have the vagrant box and a metadata file in the `builds` folder. You can use these files to test the build with a test-kitchen configuration. Run the following command to test the build. +If you have successfully built a vagrant box using the bento tool, you should have the vagrant box and a metadata file in the `builds/build_complete` folder. You can use these files to test the build with a test-kitchen configuration. Run the following command to test the build. ```bash bento test @@ -96,7 +97,7 @@ bento test #### upload -To upload boxes in the builds directory to your vagrant cloud account update the build.yml file to specify your account name and which OSs are going to be public. +To upload boxes in the builds/testing_passed directory to your vagrant cloud account update the build.yml file to specify your account name and which OSs are going to be public. Make sure you have configured the vagrant cli and logged into your account for the upload command to work. @@ -113,7 +114,7 @@ To build a Ubuntu 22.04 box for only the VirtualBox provider ```bash cd <path/to>/bento packer init -upgrade ./packer_templates -packer build -only=virtualbox-iso.vm -var-file=os_pkrvars/ubuntu/ubuntu-22.04-x86_64.pkrvars.hcl ./packer_templates +packer build -only=virtualbox-iso.vm -var-file=os_pkrvars/ubuntu/ubuntu-24.04-x86_64.pkrvars.hcl ./packer_templates ``` To build latest Debian 12 boxes for all possible providers (simultaneously) @@ -121,7 +122,7 @@ To build latest Debian 12 boxes for all possible providers (simultaneously) ```bash cd <path/to>/bento packer init -upgrade ./packer_templates -packer build -var-file=os_pkrvars/debian/debian-12-x86_64.pkrvars.hcl ./packer_templates +packer build -var-file=os_pkrvars/debian/debian-13-x86_64.pkrvars.hcl ./packer_templates ``` To build latest CentOS 7 boxes for all providers except VMware and Parallels @@ -129,7 +130,7 @@ To build latest CentOS 7 boxes for all providers except VMware and Parallels ```bash cd <path/to>/bento packer init -upgrade ./packer_templates -packer build -except=parallels-iso.vm,vmware-iso.vm -var-file=os_pkrvars/centos/centos-7-x86_64.pkrvars.hcl ./packer_templates +packer build -except=parallels-iso.vm,vmware-iso.vm -var-file=os_pkrvars/almalinux/almalinux-10-x86_64.pkrvars.hcl ./packer_templates ``` To use an alternate url @@ -137,10 +138,10 @@ To use an alternate url ````bash cd <path/to>/bento packer init -upgrade ./packer_templates -packer build -var 'iso_url=https://mirrors.rit.edu/fedora/fedora/linux/releases/41/Server/x86_64/iso/Fedora-Server-dvd-x86_64-41-1.4.iso' -var-file=os_pkrvars/fedora/fedora-41-x86_64.pkrvars.hcl ./packer_templates +packer build -var 'iso_url=https://mirrors.rit.edu/fedora/fedora/linux/releases/42/Server/x86_64/iso/Fedora-Server-dvd-x86_64-42-1.4.iso' -var-file=os_pkrvars/fedora/fedora-42-x86_64.pkrvars.hcl ./packer_templates ```` -If the build is successful, your box files will be in the `builds` directory at the root of the repository. +If the build is successful, your box files will be in the `builds/build_complete` directory at the root of the repository. ### KVM/qemu support for Windows @@ -207,7 +208,7 @@ These basebox templates were converted from [veewee](https://github.com/jedi4eve - Author: Corey Hemminger ([corey.hemminger@progress.com](mailto:corey.hemminger@progress.com)) ```text -Copyright 2012-2024, Progress Software, Inc. (<legal@chef.io>) +Copyright 2012-2025, Progress Software, Inc. (<legal@chef.io>) Copyright 2011-2012, Tim Dysinger (<tim@dysinger.net>) Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/builds.yml b/builds.yml index c6fa6c0be..f908fbacf 100644 --- a/builds.yml +++ b/builds.yml @@ -19,6 +19,7 @@ public: - freebsd-13 - freebsd-14 - opensuse-leap-15 + - opensuse-leap-16 - oraclelinux-8 - oraclelinux-9 - oraclelinux-10 @@ -27,6 +28,8 @@ public: - rockylinux-10 - ubuntu-22.04 - ubuntu-24.04 + - ubuntu-25.04 + - ubuntu-25.10 # slug box name: text string from standard box name to match slugs: @@ -47,6 +50,7 @@ slugs: - rockylinux-10 - macos-14 - macos-15 + - macos-26 do_not_build: - amazon diff --git a/builds/failed_testing/.gitkeep b/builds/failed_testing/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/lib/bento/common.rb b/lib/bento/common.rb index 8b3b9a63d..398f31c50 100644 --- a/lib/bento/common.rb +++ b/lib/bento/common.rb @@ -57,31 +57,20 @@ def duration(total) end def box_metadata(metadata_file) - metadata = {} - file = File.read(metadata_file) - json = JSON.parse(file) - - # metadata needed for upload: boxname, version, provider, box filename - metadata['name'] = json['name'] - metadata['version'] = json['version'] - metadata['arch'] = json['arch'] - metadata['box_basename'] = json['box_basename'] - metadata['packer'] = json['packer'] - metadata['vagrant'] = json['vagrant'] - metadata['providers'] = {} - json['providers'].each do |provider| - metadata['providers'][provider['name']] = provider.reject { |k, _| k == 'name' } - end - metadata + JSON.parse(File.read(metadata_file)) end - def metadata_files(arch_support = false) + def metadata_files(arch_support = false, upload = false) arch = if RbConfig::CONFIG['host_cpu'] == 'arm64' 'aarch64' else RbConfig::CONFIG['host_cpu'] end - glob = "builds/*#{"-#{arch}" if arch_support}._metadata.json" + glob = if upload + "builds/testing_passed/**/*#{"-#{arch}" if arch_support}._metadata.json" + else + "builds/build_complete/*#{"-#{arch}" if arch_support}._metadata.json" + end @metadata_files ||= Dir.glob(glob) end diff --git a/lib/bento/providermetadata.rb b/lib/bento/providermetadata.rb index 7850e4c49..cbfd8de78 100644 --- a/lib/bento/providermetadata.rb +++ b/lib/bento/providermetadata.rb @@ -61,6 +61,8 @@ def version(provider) ver_qemu when /hyperv/ ver_hyperv + when /utm/ + ver_utm end end @@ -80,7 +82,6 @@ def ver_vmware def ver_parallels raise 'Platform is not macOS, exiting...' unless macos? - cmd = Mixlib::ShellOut.new('prlctl --version') cmd.run_command cmd.stdout.split(' ')[2] @@ -109,4 +110,11 @@ def ver_hyperv cmd.run_command cmd.stdout + 'Gen 2' end + + def ver_utm + raise 'Platform is not macOS, exiting...' unless macos? + cmd = Mixlib::ShellOut.new('utmctl version') + cmd.run_command + cmd.stdout.chomp + end end diff --git a/lib/bento/runner.rb b/lib/bento/runner.rb index b705918d9..f54326d13 100644 --- a/lib/bento/runner.rb +++ b/lib/bento/runner.rb @@ -65,7 +65,7 @@ def build(file) time = Benchmark.measure do cmd.run_command end - if Dir.glob("../../builds/#{template.split('-')[0...-1].join('-')}*-#{template.split('-')[-1]}.*.box").empty? + if Dir.glob("../../builds/build_complete/#{template.split('-')[0...-1].join('-')}*-#{template.split('-')[-1]}.*.box").empty? banner('Not writing metadata file since no boxes exist') else write_final_metadata(template, time.real.ceil) @@ -103,7 +103,7 @@ def packer_build_cmd(template, _var_file) def write_final_metadata(template, buildtime) md = BuildMetadata.new(template, build_timestamp, override_version, pkr_cmd).read - path = File.join('../../builds') + path = File.join('../../builds/build_complete') filename = File.join(path, "#{md[:template]}._metadata.json") md[:providers] = ProviderMetadata.new(path, md[:template]).read md[:providers].each do |p| diff --git a/lib/bento/test.rb b/lib/bento/test.rb index df3434129..6b0fb1750 100644 --- a/lib/bento/test.rb +++ b/lib/bento/test.rb @@ -50,10 +50,14 @@ def destroy_all_bento end def test_box(md_json) - bento_dir = Dir.pwd - temp_dir = "#{bento_dir}/builds/test-kitchen" - Dir.mkdir(temp_dir) unless Dir.exist?(temp_dir) md = box_metadata(md_json) + bento_dir = Dir.pwd + build_dir = File.join(bento_dir, 'builds') + build_complete_dir = File.join(build_dir, 'build_complete') + kitchen_dir = File.join(build_dir, 'test-kitchen') + test_passed_dir = File.join(build_dir, 'testing_passed', md['arch']) + test_failed_dir = File.join(build_dir, 'testing_failed', md['arch']) + md_json_file = File.basename(md_json) arch = case md['arch'] when 'x86_64', 'amd64' 'amd64' @@ -67,46 +71,60 @@ def test_box(md_json) @arch = arch @share_disabled = no_shared || /(bsd|opensuse)/.match(boxname) ? true : false - dir = "#{File.expand_path('../../', File.dirname(__FILE__))}/lib/bento/test_templates" + Dir.mkdir(kitchen_dir) unless Dir.exist?(kitchen_dir) + template_dir = "#{File.expand_path('../../', File.dirname(__FILE__))}/lib/bento/test_templates" %w(kitchen.yml bootstrap.sh).each do |file| t = file =~ /kitchen/ ? 'kitchen.yml.erb' : "#{file}.erb" - erb = ERB.new(File.read(dir + "/#{t}"), trim_mode: '-').result(binding) - File.open("#{temp_dir}/#{file}", 'w') { |f| f.puts erb } + erb = ERB.new(File.read(template_dir + "/#{t}"), trim_mode: '-').result(binding) + File.open("#{kitchen_dir}/#{file}", 'w') { |f| f.puts erb } end + banner("Test kitchen file created at #{kitchen_dir}/kitchen.yml") + + Dir.chdir(kitchen_dir) - Dir.chdir(temp_dir) - banner("Test kitchen file located in #{temp_dir}") if regx - test = Mixlib::ShellOut.new("kitchen test #{regx.tr('.', '').tr('_', '-')}", timeout: 900, live_stream: STDOUT) + box_name = regx.tr('.', '').tr('_', '-') + test = Mixlib::ShellOut.new("kitchen test #{box_name}", timeout: 900, live_stream: STDOUT) test.run_command if test.error? - puts test.stderr - errors << "#{regex}" + errors << box_name end else - @providers.each do |k, v| - banner("Testing #{@boxname.tr('.', '')}-#{@arch}-#{k.tr('_', '-')}") - test = Mixlib::ShellOut.new("kitchen test #{@boxname.tr('.', '')}-#{@arch}-#{k.tr('_', '-')}", timeout: 900, live_stream: STDOUT) + passed_providers = [] + failed_providers = [] + new_md = md.dup + new_md['providers'].each do |provider| + box_name = "#{@boxname.tr('.', '')}-#{@arch}-#{provider['name'].tr('_', '-')}" + banner("Testing #{box_name}") + test = Mixlib::ShellOut.new("kitchen test #{box_name}", timeout: 900, live_stream: STDOUT) test.run_command - @providers[k][:testing] = "passed" unless test.error? - next unless test.error? - puts test.stderr - @providers[k][:testing] = "failed: #{test.stderr}" - errors << "#{@boxname}-#{@arch}-#{k}" - @providers[k][:testing] = "failed: #{test.stderr}" - FileUtils.cp(File.join(bento_dir, md_json), File.join(bento_dir, 'builds', 'failed_testing', File.basename(md_json))) unless File.exist?(File.join(bento_dir, 'builds', 'failed_testing', File.basename(md_json))) - FileUtils.mv(File.join(bento_dir, 'builds', v['file']), File.join(bento_dir, 'builds', 'failed_testing', v['file'])) - @providers.delete(k) - if @providers.empty? - File.delete(File.join(bento_dir, md_json)) if File.exist?(File.join(bento_dir, md_json)) + if test.error? + banner("Testing failed for #{provider['file']}") + provider['testing'] = "failed: #{test.stderr}" + failed_providers << provider + errors << provider['file'] + new_md['providers'] = failed_providers + FileUtils.mkdir_p(test_failed_dir) unless Dir.exist?(test_failed_dir) + File.binwrite(File.join(test_failed_dir, md_json_file), JSON.pretty_generate(new_md)) + FileUtils.mv(File.join(build_complete_dir, provider['file']), File.join(test_failed_dir, provider['file'])) else - File.binwrite(File.join(bento_dir, md_json), JSON.pretty_generate(md)) + banner("Testing passed for #{provider['file']}") + provider['testing'] = 'passed' + passed_providers << provider + new_md['providers'] = passed_providers + FileUtils.mkdir_p(test_passed_dir) unless Dir.exist?(test_passed_dir) + File.binwrite(File.join(test_passed_dir, md_json_file), JSON.pretty_generate(new_md)) + FileUtils.mv(File.join(build_complete_dir, provider['file']), File.join(test_passed_dir, provider['file'])) end end end + banner("Cleaning up test files for #{@boxname}") destroy = Mixlib::ShellOut.new('kitchen destroy', timeout: 900, live_stream: STDOUT) destroy.run_command + if Dir.glob("#{build_complete_dir}/#{@boxname}-#{md['arch']}.*.box").empty? + File.delete(File.join(bento_dir, md_json)) + end Dir.chdir(bento_dir) - FileUtils.rm_rf(temp_dir) + FileUtils.rm_rf(kitchen_dir) end end diff --git a/lib/bento/test_templates/kitchen.yml.erb b/lib/bento/test_templates/kitchen.yml.erb index 56836444e..4d5f07a6d 100644 --- a/lib/bento/test_templates/kitchen.yml.erb +++ b/lib/bento/test_templates/kitchen.yml.erb @@ -3,21 +3,17 @@ provisioner: name: <%= @provisioner %> platforms: -<% @providers.each do |k,v| -%> -- name: <%= "#{@boxname}-#{@arch}-#{k}" %> +<% @providers.each do |provider| -%> +- name: <%= "#{@boxname}-#{@arch}-#{provider['name']}" %> driver: name: vagrant - provider: <%= k %> + provider: <%= provider['name'] %> vm_hostname: bento-test box: bento-<%= @boxname %> - box_url: file://<%= Dir.pwd %>/builds/<%= v['file'] %> + box_url: file://<%= Dir.pwd %>/builds/build_complete/<%= provider['file'] %> box_arch: <%= @arch %> synced_folders: -<% if k =~ /hyperv/ -%> - [".", "/vagrant", "disabled: true"] -<% else -%> - - [".", "/vagrant", "disabled: <%= @share_disabled %>"] -<% end -%> <% end -%> suites: - name: default diff --git a/lib/bento/upload.rb b/lib/bento/upload.rb index ea8e746fe..d0b70e0d0 100644 --- a/lib/bento/upload.rb +++ b/lib/bento/upload.rb @@ -18,7 +18,7 @@ def start banner('Starting uploads...') time = Benchmark.measure do - files = md_json ? [md_json] : metadata_files + files = md_json ? [md_json] : metadata_files(false, true) files.each do |md_file| upload_box(md_file) end @@ -34,6 +34,10 @@ def start # def upload_box(md_file) md_data = box_metadata(md_file) + bento_dir = Dir.pwd + build_dir = File.join(bento_dir, 'builds') + test_passed_dir = File.join(build_dir, 'testing_passed', md_data['arch']) + uploaded_dir = File.join(build_dir, 'uploaded', md_data['arch']) arch = case md_data['arch'] when 'x86_64', 'amd64' 'amd64' @@ -42,30 +46,34 @@ def upload_box(md_file) else raise "Unknown arch #{md_data.inspect}" end - md_data['providers'].each_pair do |prov, prov_data| - if File.exist?(File.join('builds', prov_data['file'])) + md_data['providers'].each do |provider| + if File.exist?(File.join(test_passed_dir, provider['file'])) puts '' - banner("Uploading #{builds_yml['vagrant_cloud_account']}/#{md_data['box_basename']} version:#{md_data['version']} provider:#{prov} arch:#{arch}...") - upload_cmd = "vagrant cloud publish --architecture #{arch} #{default_arch(arch)} --no-direct-upload #{builds_yml['vagrant_cloud_account']}/#{md_data['box_basename']} #{md_data['version']} #{prov} builds/#{prov_data['file']} --description '#{box_desc(md_data['box_basename'])}' --short-description '#{box_desc(md_data['box_basename'])}' --version-description '#{ver_desc(md_data)}' --force --release #{public_private_box(md_data['box_basename'])}" + banner("Uploading #{builds_yml['vagrant_cloud_account']}/#{md_data['box_basename']} version:#{md_data['version']} provider:#{provider['name']} arch:#{arch}...") + upload_cmd = "vagrant cloud publish --architecture #{arch} #{default_arch(arch)} --no-direct-upload #{builds_yml['vagrant_cloud_account']}/#{md_data['box_basename']} #{md_data['version']} #{provider['name']} #{test_passed_dir}/#{provider['file']} --description '#{box_desc(md_data['box_basename'])}' --short-description '#{box_desc(md_data['box_basename'])}' --version-description '#{ver_desc(md_data)}' --force --release #{public_private_box(md_data['box_basename'])}" shellout(upload_cmd) slug_name = lookup_slug(md_data['name']) if slug_name puts '' - banner("Uploading slug #{builds_yml['vagrant_cloud_account']}/#{slug_name} from #{md_data['box_basename']} version:#{md_data['version']} provider:#{prov} arch:#{arch}...") - upload_cmd = "vagrant cloud publish --architecture #{arch} --no-direct-upload #{builds_yml['vagrant_cloud_account']}/#{slug_name} #{md_data['version']} #{prov} builds/#{prov_data['file']} --description '#{slug_desc(slug_name)}' --short-description '#{box_desc(slug_name)}' --version-description '#{ver_desc(md_data)}' --force --release #{public_private_box(md_data['box_basename'])}" + banner("Uploading slug #{builds_yml['vagrant_cloud_account']}/#{slug_name} from #{md_data['box_basename']} version:#{md_data['version']} provider:#{provider['name']} arch:#{arch}...") + upload_cmd = "vagrant cloud publish --architecture #{arch} --no-direct-upload #{builds_yml['vagrant_cloud_account']}/#{slug_name} #{md_data['version']} #{provider['name']} #{test_passed_dir}/#{provider['file']} --description '#{slug_desc(slug_name)}' --short-description '#{box_desc(slug_name)}' --version-description '#{ver_desc(md_data)}' --force --release #{public_private_box(md_data['box_basename'])}" shellout(upload_cmd) end # move the box file to the completed directory - FileUtils.mv(File.join('builds', prov_data['file']), File.join('builds', 'uploaded', prov_data['file'])) + FileUtils.mkdir_p(uploaded_dir) unless File.exist?(uploaded_dir) + FileUtils.mv(File.join(test_passed_dir, provider['file']), File.join(uploaded_dir, provider['file'])) else # box in metadata isn't on disk - warn "The #{prov} box defined in the metadata file #{md_file} does not exist at builds/#{prov_data['file']}. Skipping!" + warn "The #{provider['name']} box defined in the metadata file #{md_file} does not exist at #{test_passed_dir}/#{provider['file']}. Skipping!" end end - # move the metadata file to the completed directory - FileUtils.mv(md_file, File.join('builds', 'uploaded', File.basename(md_file))) + if Dir.glob("#{test_passed_dir}/#{@boxname}-#{md_data['arch']}.*.box").empty? + # move the metadata file to the completed directory + FileUtils.mkdir_p(uploaded_dir) unless File.exist?(uploaded_dir) + FileUtils.mv(md_file, File.join(uploaded_dir, File.basename(md_file))) + end end # @@ -76,15 +84,14 @@ def upload_box(md_file) def lookup_slug(name) builds_yml['slugs'].each do |slug| return slug if name.start_with?(slug) - if slug.end_with?('latest') - box_name = slug.split('-').first - box_version = [] - Dir.glob("os_pkrvars/#{box_name}/**/*.pkrvars.hcl").each do |boxes| - box_version << File.basename(boxes).split('-')[1].to_i - end - latest = box_version.uniq!.max { |a, b| a <=> b } - return slug if name.start_with?("#{box_name}-#{latest}") + next unless slug.end_with?('latest') + box_name = slug.split('-').first + box_version = [] + Dir.glob("os_pkrvars/#{box_name}/**/*.pkrvars.hcl").each do |boxes| + box_version << File.basename(boxes).split('-')[1].to_i end + latest = box_version.uniq!.max { |a, b| a <=> b } + return slug if name.start_with?("#{box_name}-#{latest}") end nil @@ -114,20 +121,20 @@ def slug_desc(name) def ver_desc(md_data) tool_versions = [] - md_data['providers'].each_key do |hv| - tool_versions << if hv == 'vmware_desktop' + md_data['providers'].each do |provider| + tool_versions << if provider['name'] == 'vmware_desktop' if macos? - "vmware-fusion: #{md_data['providers'][hv]['version']}" + "vmware-fusion: #{provider['version']}" else - "vmware-workstation: #{md_data['providers'][hv]['version']}" + "vmware-workstation: #{provider['version']}" end else - "#{hv}: #{md_data['providers'][hv]['version']}" + "#{provider['name']}: #{provider['version']}" end end tool_versions.sort! tool_versions << "packer: #{md_data['packer']}" - "#{md_data['box_basename'].capitalize.tr('-', ' ')} Vagrant box version #{md_data['version']} created with Bento by Progress Chef. Built with: #{tool_versions.join(', ')}" + "#{md_data['box_basename'].capitalize.tr('-', ' ')} Vagrant box version #{md_data['version']} created with Bento by Progress Chef. Built with: #{tool_versions.join(', ')} and tested with vagrant: #{md_data['vagrant']}" end end diff --git a/lib/bento/version.rb b/lib/bento/version.rb index b771e40ae..08bbbc847 100644 --- a/lib/bento/version.rb +++ b/lib/bento/version.rb @@ -1,3 +1,3 @@ module Bento - VERSION = '4.2.0'.freeze + VERSION = '5.0.0'.freeze end diff --git a/os_pkrvars/almalinux/almalinux-10-aarch64.pkrvars.hcl b/os_pkrvars/almalinux/almalinux-10-aarch64.pkrvars.hcl index 4caf154d2..4f99e2367 100644 --- a/os_pkrvars/almalinux/almalinux-10-aarch64.pkrvars.hcl +++ b/os_pkrvars/almalinux/almalinux-10-aarch64.pkrvars.hcl @@ -6,4 +6,5 @@ iso_checksum = "file:https://repo.almalinux.org/almalinux/10/isos/aar parallels_guest_os_type = "centos" vbox_guest_os_type = "Oracle_arm64" vmware_guest_os_type = "arm-rhel9-64" -boot_command = ["<wait><up><wait>e<wait><down><wait><down><wait><end><wait> inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/rhel/10ks.cfg inst.repo=https://repo.almalinux.org/almalinux/10/BaseOS/aarch64/os/ <wait><leftCtrlOn><wait>x<wait><leftCtrlOff>"] +utm_vm_icon = "almalinux" +boot_command = ["<wait><up><wait>e<wait><down><wait><down><wait><end><wait> inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/rhel/ks.cfg inst.repo=https://repo.almalinux.org/almalinux/10/BaseOS/aarch64/os/ <wait><leftCtrlOn><wait>x<wait><leftCtrlOff>"] diff --git a/os_pkrvars/almalinux/almalinux-10-x86_64.pkrvars.hcl b/os_pkrvars/almalinux/almalinux-10-x86_64.pkrvars.hcl index 2567bb9f2..14b1edcdf 100644 --- a/os_pkrvars/almalinux/almalinux-10-x86_64.pkrvars.hcl +++ b/os_pkrvars/almalinux/almalinux-10-x86_64.pkrvars.hcl @@ -6,4 +6,5 @@ iso_checksum = "file:https://repo.almalinux.org/almalinux/10/isos/x86 parallels_guest_os_type = "centos" vbox_guest_os_type = "RedHat_64" vmware_guest_os_type = "centos-64" -boot_command = ["<wait><up><wait>e<wait><down><wait><down><wait><end><wait> inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/rhel/10ks.cfg inst.repo=https://repo.almalinux.org/almalinux/10/BaseOS/x86_64/os/ <leftCtrlOn>x<leftCtrlOff>"] +utm_vm_icon = "almalinux" +boot_command = ["<wait><up><wait>e<wait><down><wait><down><wait><end><wait> inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/rhel/ks.cfg inst.repo=https://repo.almalinux.org/almalinux/10/BaseOS/x86_64/os/ <leftCtrlOn>x<leftCtrlOff>"] diff --git a/os_pkrvars/almalinux/almalinux-8-aarch64.pkrvars.hcl b/os_pkrvars/almalinux/almalinux-8-aarch64.pkrvars.hcl index 087fd113d..ed74020ef 100644 --- a/os_pkrvars/almalinux/almalinux-8-aarch64.pkrvars.hcl +++ b/os_pkrvars/almalinux/almalinux-8-aarch64.pkrvars.hcl @@ -6,4 +6,5 @@ iso_checksum = "file:https://repo.almalinux.org/almalinux/8/isos/aarc parallels_guest_os_type = "centos" vbox_guest_os_type = "Oracle_arm64" vmware_guest_os_type = "arm-rhel9-64" +utm_vm_icon = "almalinux" boot_command = ["<wait><up><wait>e<wait><down><wait><down><wait><end><wait> inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/rhel/8ks.cfg inst.repo=https://repo.almalinux.org/almalinux/8/BaseOS/aarch64/os/ <wait><leftCtrlOn><wait>x<wait><leftCtrlOff>"] diff --git a/os_pkrvars/almalinux/almalinux-8-x86_64.pkrvars.hcl b/os_pkrvars/almalinux/almalinux-8-x86_64.pkrvars.hcl index 68c3a54a8..e50308b7e 100644 --- a/os_pkrvars/almalinux/almalinux-8-x86_64.pkrvars.hcl +++ b/os_pkrvars/almalinux/almalinux-8-x86_64.pkrvars.hcl @@ -6,4 +6,6 @@ iso_checksum = "file:https://repo.almalinux.org/almalinux/8/isos/x86_ parallels_guest_os_type = "centos" vbox_guest_os_type = "RedHat_64" vmware_guest_os_type = "centos-64" -boot_command = ["<wait><up><wait><tab> inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/rhel/8ks.cfg inst.repo=https://repo.almalinux.org/almalinux/8/BaseOS/x86_64/os/ <enter><wait>"] +utm_vm_icon = "almalinux" +boot_command = ["<wait><up><wait><tab><wait><end><wait> inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/rhel/8ks.cfg inst.repo=https://repo.almalinux.org/almalinux/8/BaseOS/x86_64/os/ <wait><enter><wait>"] +utm_boot_command = ["<wait><up>e<wait><down><down><end><wait> inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/rhel/8ks.cfg inst.repo=https://repo.almalinux.org/almalinux/8/BaseOS/x86_64/os/ <wait><leftCtrlOn><wait>x<wait><leftCtrlOff>"] diff --git a/os_pkrvars/almalinux/almalinux-9-aarch64.pkrvars.hcl b/os_pkrvars/almalinux/almalinux-9-aarch64.pkrvars.hcl index 350c54b29..5f840f1d1 100644 --- a/os_pkrvars/almalinux/almalinux-9-aarch64.pkrvars.hcl +++ b/os_pkrvars/almalinux/almalinux-9-aarch64.pkrvars.hcl @@ -4,6 +4,8 @@ os_arch = "aarch64" iso_url = "https://repo.almalinux.org/almalinux/9/isos/aarch64/AlmaLinux-9.6-aarch64-boot.iso" iso_checksum = "file:https://repo.almalinux.org/almalinux/9/isos/aarch64/CHECKSUM" parallels_guest_os_type = "centos" +parallels_boot_wait = "1s" vbox_guest_os_type = "Oracle9_arm64" vmware_guest_os_type = "arm-rhel9-64" -boot_command = ["<wait><up><wait>e<wait><down><wait><down><wait><end><wait> inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/rhel/9ks.cfg inst.repo=https://repo.almalinux.org/almalinux/9/BaseOS/aarch64/os/ <wait><leftCtrlOn><wait>x<wait><leftCtrlOff>"] +utm_vm_icon = "almalinux" +boot_command = ["<wait><up><wait>e<wait><down><wait><down><wait><end><wait> inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/rhel/ks.cfg inst.repo=https://repo.almalinux.org/almalinux/9/BaseOS/aarch64/os/ <wait><leftCtrlOn><wait>x<wait><leftCtrlOff>"] diff --git a/os_pkrvars/almalinux/almalinux-9-x86_64.pkrvars.hcl b/os_pkrvars/almalinux/almalinux-9-x86_64.pkrvars.hcl index 526c3f82b..b0dfebf1b 100644 --- a/os_pkrvars/almalinux/almalinux-9-x86_64.pkrvars.hcl +++ b/os_pkrvars/almalinux/almalinux-9-x86_64.pkrvars.hcl @@ -6,4 +6,6 @@ iso_checksum = "file:https://repo.almalinux.org/almalinux/9/isos/x86_ parallels_guest_os_type = "centos" vbox_guest_os_type = "RedHat_64" vmware_guest_os_type = "centos-64" -boot_command = ["<wait><wait><up><wait><tab> inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/rhel/9ks.cfg inst.repo=https://repo.almalinux.org/almalinux/9/BaseOS/x86_64/os/ <enter><wait>"] +utm_vm_icon = "almalinux" +boot_command = ["<wait><up><wait><tab><wait><end><wait> inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/rhel/ks.cfg inst.repo=https://repo.almalinux.org/almalinux/9/BaseOS/x86_64/os/ <wait><enter><wait>"] +utm_boot_command = ["<wait><up><wait>e<wait><down><wait><down><wait><end><wait> inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/rhel/ks.cfg inst.repo=https://repo.almalinux.org/almalinux/9/BaseOS/x86_64/os/ <wait><leftCtrlOn><wait>x<wait><leftCtrlOff>"] diff --git a/os_pkrvars/amazonlinux/amazonlinux-2023-aarch64.pkrvars.hcl b/os_pkrvars/amazonlinux/amazonlinux-2023-aarch64.pkrvars.hcl index 09720a156..1cd719f88 100644 --- a/os_pkrvars/amazonlinux/amazonlinux-2023-aarch64.pkrvars.hcl +++ b/os_pkrvars/amazonlinux/amazonlinux-2023-aarch64.pkrvars.hcl @@ -6,6 +6,7 @@ vbox_checksum = "file:https://cdn.amazonlinux.com/al2023/os-images/202 parallels_guest_os_type = "fedora-core" vbox_guest_os_type = "Fedora_arm64" vmware_guest_os_type = "arm-fedora-64" +utm_vm_icon = "linux" sources_enabled = [ "source.virtualbox-ovf.vm" ] diff --git a/os_pkrvars/amazonlinux/amazonlinux-2023-x86_64.pkrvars.hcl b/os_pkrvars/amazonlinux/amazonlinux-2023-x86_64.pkrvars.hcl index b059b2b4a..2595fc41f 100644 --- a/os_pkrvars/amazonlinux/amazonlinux-2023-x86_64.pkrvars.hcl +++ b/os_pkrvars/amazonlinux/amazonlinux-2023-x86_64.pkrvars.hcl @@ -6,6 +6,7 @@ vbox_checksum = "file:https://cdn.amazonlinux.com/al2023/os-images/lat parallels_guest_os_type = "fedora-core" vbox_guest_os_type = "Fedora_64" vmware_guest_os_type = "fedora-64" +utm_vm_icon = "linux" sources_enabled = [ "source.virtualbox-ovf.vm" ] diff --git a/os_pkrvars/centos/centos-stream-10-aarch64.pkrvars.hcl b/os_pkrvars/centos/centos-stream-10-aarch64.pkrvars.hcl index 1f43d8cc9..5961991b8 100644 --- a/os_pkrvars/centos/centos-stream-10-aarch64.pkrvars.hcl +++ b/os_pkrvars/centos/centos-stream-10-aarch64.pkrvars.hcl @@ -6,4 +6,5 @@ iso_checksum = "file:https://mirror.stream.centos.org/10-stream/BaseO parallels_guest_os_type = "centos" vbox_guest_os_type = "Oracle9_arm64" vmware_guest_os_type = "arm-rhel9-64" -boot_command = ["<wait><up>e<wait><down><down><end><wait> inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/rhel/10ks.cfg inst.repo=https://mirror.stream.centos.org/10-stream/BaseOS/aarch64/os/ <leftCtrlOn>x<leftCtrlOff><wait>"] +utm_vm_icon = "centos" +boot_command = ["<wait><up>e<wait><down><down><end><wait> inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/rhel/ks.cfg inst.repo=https://mirror.stream.centos.org/10-stream/BaseOS/aarch64/os/ <leftCtrlOn>x<leftCtrlOff><wait>"] diff --git a/os_pkrvars/centos/centos-stream-10-x86_64.pkrvars.hcl b/os_pkrvars/centos/centos-stream-10-x86_64.pkrvars.hcl index 77c058b59..1f6bde999 100644 --- a/os_pkrvars/centos/centos-stream-10-x86_64.pkrvars.hcl +++ b/os_pkrvars/centos/centos-stream-10-x86_64.pkrvars.hcl @@ -6,4 +6,5 @@ iso_checksum = "file:https://mirror.stream.centos.org/10-stream/BaseO parallels_guest_os_type = "centos" vbox_guest_os_type = "RedHat_64" vmware_guest_os_type = "centos-64" -boot_command = ["<wait><up>e<wait><down><down><end><wait> inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/rhel/10ks.cfg inst.repo=https://mirror.stream.centos.org/10-stream/BaseOS/x86_64/os/ <leftCtrlOn>x<leftCtrlOff><wait>"] +utm_vm_icon = "centos" +boot_command = ["<wait><up>e<wait><down><down><end><wait> inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/rhel/ks.cfg inst.repo=https://mirror.stream.centos.org/10-stream/BaseOS/x86_64/os/ <leftCtrlOn>x<leftCtrlOff><wait>"] diff --git a/os_pkrvars/centos/centos-stream-9-aarch64.pkrvars.hcl b/os_pkrvars/centos/centos-stream-9-aarch64.pkrvars.hcl index 166ca4c48..58883a89d 100644 --- a/os_pkrvars/centos/centos-stream-9-aarch64.pkrvars.hcl +++ b/os_pkrvars/centos/centos-stream-9-aarch64.pkrvars.hcl @@ -6,4 +6,5 @@ iso_checksum = "file:https://mirror.stream.centos.org/9-stream/BaseOS parallels_guest_os_type = "centos" vbox_guest_os_type = "Oracle9_arm64" vmware_guest_os_type = "arm-rhel9-64" -boot_command = ["<wait><up>e<wait><down><down><end><wait> inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/rhel/9ks.cfg inst.repo=https://mirror.stream.centos.org/9-stream/BaseOS/aarch64/os/ <leftCtrlOn>x<leftCtrlOff>"] +utm_vm_icon = "centos" +boot_command = ["<wait><up>e<wait><down><down><end><wait> inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/rhel/ks.cfg inst.repo=https://mirror.stream.centos.org/9-stream/BaseOS/aarch64/os/ <leftCtrlOn>x<leftCtrlOff>"] diff --git a/os_pkrvars/centos/centos-stream-9-x86_64.pkrvars.hcl b/os_pkrvars/centos/centos-stream-9-x86_64.pkrvars.hcl index 070e00370..05730a3f9 100644 --- a/os_pkrvars/centos/centos-stream-9-x86_64.pkrvars.hcl +++ b/os_pkrvars/centos/centos-stream-9-x86_64.pkrvars.hcl @@ -6,4 +6,6 @@ iso_checksum = "file:https://mirror.stream.centos.org/9-stream/BaseOS parallels_guest_os_type = "centos" vbox_guest_os_type = "RedHat_64" vmware_guest_os_type = "centos-64" -boot_command = ["<wait><up><wait><tab> inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/rhel/9ks.cfg inst.repo=https://mirror.stream.centos.org/9-stream/BaseOS/x86_64/os/ <enter><wait>"] +utm_vm_icon = "centos" +boot_command = ["<wait><up><wait><tab><wait><end><wait> inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/rhel/ks.cfg inst.repo=https://mirror.stream.centos.org/9-stream/BaseOS/x86_64/os/ <wait><enter><wait>"] +utm_boot_command = ["<wait><up><wait>e<wait><down><wait><down><wait><end><wait> inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/rhel/ks.cfg inst.repo=https://mirror.stream.centos.org/9-stream/BaseOS/x86_64/os/ <wait><leftCtrlOn><wait>x<wait><leftCtrlOff>"] diff --git a/os_pkrvars/debian/debian-12-aarch64.pkrvars.hcl b/os_pkrvars/debian/debian-12-aarch64.pkrvars.hcl index d101afd88..6e7b76494 100644 --- a/os_pkrvars/debian/debian-12-aarch64.pkrvars.hcl +++ b/os_pkrvars/debian/debian-12-aarch64.pkrvars.hcl @@ -6,5 +6,5 @@ iso_checksum = "file:https://cdimage.debian.org/cdimage/archive/lates parallels_guest_os_type = "debian" vbox_guest_os_type = "Debian12_arm64" vmware_guest_os_type = "arm-debian12-64" -default_boot_wait = "10s" +utm_vm_icon = "debian" boot_command = ["<wait>e<wait><down><down><down><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><wait>install <wait> preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/debian/preseed.cfg <wait>debian-installer=en_US.UTF-8 <wait>auto <wait>locale=en_US.UTF-8 <wait>kbd-chooser/method=us <wait>keyboard-configuration/xkb-keymap=us <wait>netcfg/get_hostname={{ .Name }} <wait>netcfg/get_domain=vagrantup.com <wait>fb=false <wait>debconf/frontend=noninteractive <wait>console-setup/ask_detect=false <wait>console-keymaps-at/keymap=us <wait>grub-installer/bootdev=default <wait><f10><wait>"] diff --git a/os_pkrvars/debian/debian-12-x86_64.pkrvars.hcl b/os_pkrvars/debian/debian-12-x86_64.pkrvars.hcl index 4f4e74216..114186bd5 100644 --- a/os_pkrvars/debian/debian-12-x86_64.pkrvars.hcl +++ b/os_pkrvars/debian/debian-12-x86_64.pkrvars.hcl @@ -6,4 +6,5 @@ iso_checksum = "file:https://cdimage.debian.org/cdimage/archive/lates parallels_guest_os_type = "debian" vbox_guest_os_type = "Debian12_64" vmware_guest_os_type = "debian-64" +utm_vm_icon = "debian" boot_command = ["<wait><esc><wait>auto preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/debian/preseed.cfg netcfg/get_hostname={{ .Name }}<enter>"] diff --git a/os_pkrvars/debian/debian-13-aarch64.pkrvars.hcl b/os_pkrvars/debian/debian-13-aarch64.pkrvars.hcl index c5a89968b..5cf9f42d1 100644 --- a/os_pkrvars/debian/debian-13-aarch64.pkrvars.hcl +++ b/os_pkrvars/debian/debian-13-aarch64.pkrvars.hcl @@ -6,5 +6,5 @@ iso_checksum = "file:https://cdimage.debian.org/debian-cd/current/arm parallels_guest_os_type = "debian" vbox_guest_os_type = "Debian12_arm64" vmware_guest_os_type = "arm-debian12-64" -default_boot_wait = "10s" +utm_vm_icon = "debian" boot_command = ["<wait>e<wait><down><down><down><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><wait>install <wait> preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/debian/preseed.cfg <wait>debian-installer=en_US.UTF-8 <wait>auto <wait>locale=en_US.UTF-8 <wait>kbd-chooser/method=us <wait>keyboard-configuration/xkb-keymap=us <wait>netcfg/get_hostname={{ .Name }} <wait>netcfg/get_domain=vagrantup.com <wait>fb=false <wait>debconf/frontend=noninteractive <wait>console-setup/ask_detect=false <wait>console-keymaps-at/keymap=us <wait>grub-installer/bootdev=default <wait><f10><wait>"] diff --git a/os_pkrvars/debian/debian-13-x86_64.pkrvars.hcl b/os_pkrvars/debian/debian-13-x86_64.pkrvars.hcl index 6b48eabb5..9f2614db8 100644 --- a/os_pkrvars/debian/debian-13-x86_64.pkrvars.hcl +++ b/os_pkrvars/debian/debian-13-x86_64.pkrvars.hcl @@ -6,4 +6,5 @@ iso_checksum = "file:https://cdimage.debian.org/debian-cd/current/amd parallels_guest_os_type = "debian" vbox_guest_os_type = "Debian12_64" vmware_guest_os_type = "debian-64" +utm_vm_icon = "debian" boot_command = ["<wait><esc><wait>auto preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/debian/preseed.cfg netcfg/get_hostname={{ .Name }}<enter>"] diff --git a/os_pkrvars/fedora/fedora-41-aarch64.pkrvars.hcl b/os_pkrvars/fedora/fedora-41-aarch64.pkrvars.hcl index 2f46f8111..cf4071265 100644 --- a/os_pkrvars/fedora/fedora-41-aarch64.pkrvars.hcl +++ b/os_pkrvars/fedora/fedora-41-aarch64.pkrvars.hcl @@ -6,5 +6,6 @@ iso_checksum = "file:https://download.fedoraproject.org/pub/fedora/li parallels_guest_os_type = "fedora-core" vbox_guest_os_type = "Fedora_arm64" vmware_guest_os_type = "arm-fedora-64" -parallels_boot_wait = "0s" -boot_command = ["<up>e<wait><down><down><end> inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/fedora/ks.cfg inst.repo=https://download.fedoraproject.org/pub/fedora/linux/releases/41/Server/aarch64/os/ <F10><wait>"] +utm_vm_icon = "fedora" +parallels_boot_wait = "1s" +boot_command = ["<up>e<wait><down><down><end> inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/rhel/ks.cfg inst.repo=https://download.fedoraproject.org/pub/fedora/linux/releases/41/Server/aarch64/os/ <F10><wait>"] diff --git a/os_pkrvars/fedora/fedora-41-x86_64.pkrvars.hcl b/os_pkrvars/fedora/fedora-41-x86_64.pkrvars.hcl index 2761ca0b9..dfe34092a 100644 --- a/os_pkrvars/fedora/fedora-41-x86_64.pkrvars.hcl +++ b/os_pkrvars/fedora/fedora-41-x86_64.pkrvars.hcl @@ -6,4 +6,5 @@ iso_checksum = "file:https://download.fedoraproject.org/pub/fedora/li parallels_guest_os_type = "fedora-core" vbox_guest_os_type = "Fedora_64" vmware_guest_os_type = "fedora-64" -boot_command = ["<wait><up>e<wait><down><down><end> inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/fedora/ks.cfg inst.repo=https://download.fedoraproject.org/pub/fedora/linux/releases/41/Server/x86_64/os/ <F10><wait>"] +utm_vm_icon = "fedora" +boot_command = ["<wait><up>e<wait><down><down><end> inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/rhel/ks.cfg inst.repo=https://download.fedoraproject.org/pub/fedora/linux/releases/41/Server/x86_64/os/ <F10><wait>"] diff --git a/os_pkrvars/fedora/fedora-42-aarch64.pkrvars.hcl b/os_pkrvars/fedora/fedora-42-aarch64.pkrvars.hcl index 3e512e4db..69dff304e 100644 --- a/os_pkrvars/fedora/fedora-42-aarch64.pkrvars.hcl +++ b/os_pkrvars/fedora/fedora-42-aarch64.pkrvars.hcl @@ -6,5 +6,6 @@ iso_checksum = "file:https://download.fedoraproject.org/pub/fedora/li parallels_guest_os_type = "fedora-core" vbox_guest_os_type = "Fedora_arm64" vmware_guest_os_type = "arm-fedora-64" -parallels_boot_wait = "0s" -boot_command = ["<up>e<wait><down><down><end> inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/fedora/ks.cfg inst.repo=https://download.fedoraproject.org/pub/fedora/linux/releases/42/Server/aarch64/os/ <F10><wait>"] +utm_vm_icon = "fedora" +parallels_boot_wait = "1s" +boot_command = ["<up>e<wait><down><down><end> inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/rhel/ks.cfg inst.repo=https://download.fedoraproject.org/pub/fedora/linux/releases/42/Server/aarch64/os/ <F10><wait>"] diff --git a/os_pkrvars/fedora/fedora-42-x86_64.pkrvars.hcl b/os_pkrvars/fedora/fedora-42-x86_64.pkrvars.hcl index 6f03223a1..949ad6419 100644 --- a/os_pkrvars/fedora/fedora-42-x86_64.pkrvars.hcl +++ b/os_pkrvars/fedora/fedora-42-x86_64.pkrvars.hcl @@ -6,4 +6,5 @@ iso_checksum = "file:https://download.fedoraproject.org/pub/fedora/li parallels_guest_os_type = "fedora-core" vbox_guest_os_type = "Fedora_64" vmware_guest_os_type = "fedora-64" -boot_command = ["<wait><up>e<wait><down><down><end> inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/fedora/ks.cfg inst.repo=https://download.fedoraproject.org/pub/fedora/linux/releases/42/Server/x86_64/os/ <F10><wait>"] +utm_vm_icon = "fedora" +boot_command = ["<wait><up>e<wait><down><down><end> inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/rhel/ks.cfg inst.repo=https://download.fedoraproject.org/pub/fedora/linux/releases/42/Server/x86_64/os/ <F10><wait>"] diff --git a/os_pkrvars/freebsd/freebsd-13-aarch64.pkrvars.hcl b/os_pkrvars/freebsd/freebsd-13-aarch64.pkrvars.hcl index 4d2da9216..273f148b6 100644 --- a/os_pkrvars/freebsd/freebsd-13-aarch64.pkrvars.hcl +++ b/os_pkrvars/freebsd/freebsd-13-aarch64.pkrvars.hcl @@ -6,5 +6,7 @@ iso_checksum = "file:https://download.freebsd.org/releases/arm64/aarc parallels_guest_os_type = "freebsd" vbox_guest_os_type = "FreeBSD_arm64" vmware_guest_os_type = "arm-freebsd13-64" +utm_vm_icon = "freebsd" default_boot_wait = "60s" boot_command = ["<wait>s<wait2>mdmfs -s 100m md1 /tmp<enter><wait>mdmfs -s 100m md2 /mnt<enter><wait>dhclient -p /tmp/dhclient.$(ifconfig -l | awk '{print $1}').pid -l /tmp/dhclient.lease.$(ifconfig -l | awk '{print $1}') $(ifconfig -l | awk '{print $1}')<enter><wait10>fetch -o /tmp/installerconfig http://{{ .HTTPIP }}:{{ .HTTPPort }}/freebsd/installerconfig && bsdinstall script /tmp/installerconfig<enter><wait>"] +utm_boot_command = ["<wait>s<wait2>mdmfs -s 100m md1 /tmp<enter><wait>mdmfs -s 100m md2 /mnt<enter><wait>dhclient -p /tmp/dhclient.$(ifconfig -l | awk '{print $1}').pid -l /tmp/dhclient.lease.$(ifconfig -l | awk '{print $1}') $(ifconfig -l | awk '{print $1}')<enter><wait10>dhclient -p /tmp/dhclient.$(ifconfig -l | awk '{print $2}').pid -l /tmp/dhclient.lease.$(ifconfig -l | awk '{print $2}') $(ifconfig -l | awk '{print $2}')<enter><wait10>fetch -o /tmp/installerconfig http://{{ .HTTPIP }}:{{ .HTTPPort }}/freebsd/installerconfig && bsdinstall script /tmp/installerconfig<enter><wait>"] diff --git a/os_pkrvars/freebsd/freebsd-13-x86_64.pkrvars.hcl b/os_pkrvars/freebsd/freebsd-13-x86_64.pkrvars.hcl index 199b0b6b9..b83951f1a 100644 --- a/os_pkrvars/freebsd/freebsd-13-x86_64.pkrvars.hcl +++ b/os_pkrvars/freebsd/freebsd-13-x86_64.pkrvars.hcl @@ -6,5 +6,6 @@ iso_checksum = "file:https://download.freebsd.org/releases/amd64/amd6 parallels_guest_os_type = "freebsd" vbox_guest_os_type = "FreeBSD_64" vmware_guest_os_type = "freebsd-64" +utm_vm_icon = "freebsd" default_boot_wait = "60s" -boot_command = ["<wait>s<wait2>mdmfs -s 100m md1 /tmp<enter><wait>mdmfs -s 100m md2 /mnt<enter><wait>dhclient -p /tmp/dhclient.$(ifconfig -l | awk '{print $1}').pid -l /tmp/dhclient.lease.$(ifconfig -l | awk '{print $1}') $(ifconfig -l | awk '{print $1}')<enter><wait10>fetch -o /tmp/installerconfig http://{{ .HTTPIP }}:{{ .HTTPPort }}/freebsd/installerconfig && bsdinstall script /tmp/installerconfig<enter><wait>"] +boot_command = ["<wait>s<wait2>mdmfs -s 100m md1 /tmp<enter><wait>mdmfs -s 100m md2 /mnt<enter><wait>dhclient -p /tmp/dhclient.$(ifconfig -l | awk '{print $1}').pid -l /tmp/dhclient.lease.$(ifconfig -l | awk '{print $1}') $(ifconfig -l | awk '{print $1}')<enter><wait10>dhclient -p /tmp/dhclient.$(ifconfig -l | awk '{print $2}').pid -l /tmp/dhclient.lease.$(ifconfig -l | awk '{print $2}') $(ifconfig -l | awk '{print $2}')<enter><wait10>fetch -o /tmp/installerconfig http://{{ .HTTPIP }}:{{ .HTTPPort }}/freebsd/installerconfig && bsdinstall script /tmp/installerconfig<enter><wait>"] diff --git a/os_pkrvars/freebsd/freebsd-14-aarch64.pkrvars.hcl b/os_pkrvars/freebsd/freebsd-14-aarch64.pkrvars.hcl index 8351e3449..0bd7d66f3 100644 --- a/os_pkrvars/freebsd/freebsd-14-aarch64.pkrvars.hcl +++ b/os_pkrvars/freebsd/freebsd-14-aarch64.pkrvars.hcl @@ -6,5 +6,7 @@ iso_checksum = "file:https://download.freebsd.org/releases/arm64/aarc parallels_guest_os_type = "freebsd" vbox_guest_os_type = "FreeBSD_arm64" vmware_guest_os_type = "arm-freebsd14-64" +utm_vm_icon = "freebsd" default_boot_wait = "60s" boot_command = ["<wait>s<wait2>mdmfs -s 100m md1 /tmp<enter><wait>mdmfs -s 100m md2 /mnt<enter><wait>dhclient -p /tmp/dhclient.$(ifconfig -l | awk '{print $1}').pid -l /tmp/dhclient.lease.$(ifconfig -l | awk '{print $1}') $(ifconfig -l | awk '{print $1}')<enter><wait10>fetch -o /tmp/installerconfig http://{{ .HTTPIP }}:{{ .HTTPPort }}/freebsd/installerconfig && bsdinstall script /tmp/installerconfig<enter><wait>"] +utm_boot_command = ["<wait>s<wait2>mdmfs -s 100m md1 /tmp<enter><wait>mdmfs -s 100m md2 /mnt<enter><wait>dhclient -p /tmp/dhclient.$(ifconfig -l | awk '{print $1}').pid -l /tmp/dhclient.lease.$(ifconfig -l | awk '{print $1}') $(ifconfig -l | awk '{print $1}')<enter><wait10>dhclient -p /tmp/dhclient.$(ifconfig -l | awk '{print $2}').pid -l /tmp/dhclient.lease.$(ifconfig -l | awk '{print $2}') $(ifconfig -l | awk '{print $2}')<enter><wait10>fetch -o /tmp/installerconfig http://{{ .HTTPIP }}:{{ .HTTPPort }}/freebsd/installerconfig && bsdinstall script /tmp/installerconfig<enter><wait>"] diff --git a/os_pkrvars/freebsd/freebsd-14-x86_64.pkrvars.hcl b/os_pkrvars/freebsd/freebsd-14-x86_64.pkrvars.hcl index df385512d..2be52a41e 100644 --- a/os_pkrvars/freebsd/freebsd-14-x86_64.pkrvars.hcl +++ b/os_pkrvars/freebsd/freebsd-14-x86_64.pkrvars.hcl @@ -6,5 +6,6 @@ iso_checksum = "file:https://download.freebsd.org/releases/amd64/amd6 parallels_guest_os_type = "freebsd" vbox_guest_os_type = "FreeBSD_64" vmware_guest_os_type = "freebsd-64" +utm_vm_icon = "freebsd" default_boot_wait = "60s" -boot_command = ["<wait>s<wait2>mdmfs -s 100m md1 /tmp<enter><wait>mdmfs -s 100m md2 /mnt<enter><wait>dhclient -p /tmp/dhclient.$(ifconfig -l | awk '{print $1}').pid -l /tmp/dhclient.lease.$(ifconfig -l | awk '{print $1}') $(ifconfig -l | awk '{print $1}')<enter><wait10>fetch -o /tmp/installerconfig http://{{ .HTTPIP }}:{{ .HTTPPort }}/freebsd/installerconfig && bsdinstall script /tmp/installerconfig<enter><wait>"] +boot_command = ["<wait>s<wait2>mdmfs -s 100m md1 /tmp<enter><wait>mdmfs -s 100m md2 /mnt<enter><wait>dhclient -p /tmp/dhclient.$(ifconfig -l | awk '{print $1}').pid -l /tmp/dhclient.lease.$(ifconfig -l | awk '{print $1}') $(ifconfig -l | awk '{print $1}')<enter><wait10>dhclient -p /tmp/dhclient.$(ifconfig -l | awk '{print $2}').pid -l /tmp/dhclient.lease.$(ifconfig -l | awk '{print $2}') $(ifconfig -l | awk '{print $2}')<enter><wait10>fetch -o /tmp/installerconfig http://{{ .HTTPIP }}:{{ .HTTPPort }}/freebsd/installerconfig && bsdinstall script /tmp/installerconfig<enter><wait>"] diff --git a/os_pkrvars/macos/macos-14-aarch64.pkrvars.hcl b/os_pkrvars/macos/macos-14-aarch64.pkrvars.hcl index ce532381e..0ef04f0f1 100644 --- a/os_pkrvars/macos/macos-14-aarch64.pkrvars.hcl +++ b/os_pkrvars/macos/macos-14-aarch64.pkrvars.hcl @@ -4,6 +4,7 @@ os_arch = "aarch64" # Download urls cn be foud at https://ipsw.me/VirtualMac2,1 parallels_ipsw_url = "https://updates.cdn-apple.com/2024SummerFCS/fullrestores/062-52859/932E0A8F-6644-4759-82DA-F8FA8DEA806A/UniversalMac_14.6.1_23G93_Restore.ipsw" parallels_ipsw_checksum = "e387251e63387150ba76cf784bdb97d2016e5d43c6f809c90a115eb067a097b8" +utm_vm_icon = "mac" sources_enabled = ["source.parallels-ipsw.vm"] default_boot_wait = "15s" boot_command = [ diff --git a/os_pkrvars/macos/macos-15-aarch64.pkrvars.hcl b/os_pkrvars/macos/macos-15-aarch64.pkrvars.hcl index 1552fcde3..13d261f8d 100644 --- a/os_pkrvars/macos/macos-15-aarch64.pkrvars.hcl +++ b/os_pkrvars/macos/macos-15-aarch64.pkrvars.hcl @@ -1,9 +1,10 @@ os_name = "macos" -os_version = "15.6" +os_version = "15.6.1" os_arch = "aarch64" # Download urls cn be foud at https://ipsw.me/VirtualMac2,1 -parallels_ipsw_url = "https://updates.cdn-apple.com/2025SummerFCS/fullrestores/082-08674/51294E4D-A273-44BE-A280-A69FC347FB87/UniversalMac_15.6_24G84_Restore.ipsw" -parallels_ipsw_checksum = "8fbeaca047b66bcbc8ea557f2b3f95bcb84cd0f60cbfdadb52fc23ecfe671317" +parallels_ipsw_url = "https://updates.cdn-apple.com/2025SummerFCS/fullrestores/093-10809/CFD6DD38-DAF0-40DA-854F-31AAD1294C6F/UniversalMac_15.6.1_24G90_Restore.ipsw" +parallels_ipsw_checksum = "3d87686b691ac765eb6a6b3082b2334e2af9710096a00432dd519af89ff2ea78" +utm_vm_icon = "mac" sources_enabled = ["source.parallels-ipsw.vm"] default_boot_wait = "15s" boot_command = [ diff --git a/os_pkrvars/macos/macos-26-aarch64.pkrvars.hcl b/os_pkrvars/macos/macos-26-aarch64.pkrvars.hcl new file mode 100644 index 000000000..7ed7c922d --- /dev/null +++ b/os_pkrvars/macos/macos-26-aarch64.pkrvars.hcl @@ -0,0 +1,75 @@ +os_name = "macos" +os_version = "26.0.1" +os_arch = "aarch64" +# Download urls cn be foud at https://ipsw.me/VirtualMac2,1 +parallels_ipsw_url = "https://updates.cdn-apple.com/2025FallFCS/fullrestores/093-50898/60AE7E97-3E60-441B-9B34-E603C694C5C1/UniversalMac_26.0.1_25A362_Restore.ipsw" +parallels_ipsw_checksum = "018b76e84e31026eb70a270e12bf4f3adfd722b611489af6553b035343e5ec05" +utm_vm_icon = "mac" +sources_enabled = ["source.parallels-ipsw.vm"] +default_boot_wait = "15s" +boot_command = [ + # hello, hola, bonjour, etc. + "<wait><spacebar><wait5s>", + # Select Language English (US) + "<enter><wait10s>", + # Select Your Country and Region + "<leftShiftOn><tab><leftShiftOff><wait><spacebar><wait10s>", + # Transfer your data to this Mac + "<tab><wait><tab><wait><tab><wait><tab><wait><spacebar><wait><tab><wait><tab><wait><spacebar><wait5s>", + # Written and Spoken Languages + "<leftShiftOn><tab><leftShiftOff><wait><spacebar><wait5s>", + # Accessibility + "<leftShiftOn><tab><leftShiftOff><wait><spacebar><wait5s>", + # Data & Privacy + "<leftShiftOn><tab><leftShiftOff><wait><spacebar><wait5s>", + # Create a Computer Account + "vagrant<wait><tab><wait><tab><wait>vagrant<wait><tab><wait>vagrant<wait><tab><wait><tab><wait><spacebar><wait><tab><wait><tab><wait><spacebar><wait1m>", + # Sign In with Your Apple ID + "<leftShiftOn><tab><wait><tab><leftShiftOff><wait><spacebar><wait5s>", + # Are you sure you want to skip signing in with an Apple ID? + "<tab><wait><spacebar><wait5s>", + # Terms and Conditions + "<leftShiftOn><tab><leftShiftOff><wait><spacebar><wait5s>", + # I have read and agree to the macOS Software License Agreement + "<tab><wait><spacebar><wait5s>", + # Enable Location Services + "<leftShiftOn><tab><leftShiftOff><wait><spacebar><wait5s>", + # Are you sure you don't want to use Location Services? + "<tab><wait><spacebar><wait10s>", + # Select Your Time Zone + "<tab><wait><tab><wait>UTC<wait><enter><wait><leftShiftOn><tab><wait><tab><leftShiftOff><wait><spacebar><wait5s>", + # Analytics + "<tab><wait><spacebar><wait><leftShiftOn><tab><leftShiftOff><wait><spacebar><wait5s>", + # Screen Time + "<tab><wait><spacebar><wait5s>", + # Siri + "<tab><wait><spacebar><wait><leftShiftOn><tab><leftShiftOff><wait><spacebar><wait5s>", + # Choose Your Look + "<leftShiftOn><tab><leftShiftOff><wait><spacebar><wait5s>", + # Update mac + "<leftShiftOn><tab><leftShiftOff><wait><spacebar><wait30s>", + # Enable keyboard navigation + "<space><wait><leftCtrlOn><f7><leftCtrlOff><wait2s>", + # Open System Settings + "<leftSuperOn><spacebar><leftSuperOff><wait>System<spacebar>Settings<wait><enter><wait5s>", + # Enable Remote Management + "<tab><tab><tab><tab><tab><tab><tab><tab><tab><tab><wait><spacebar><wait5s>", + "<tab><tab><tab><tab><tab><tab><tab><tab><tab><tab><tab><tab><tab><tab><tab><tab><tab><wait><spacebar><wait5s>", + # Enable Remote Login + "<tab><tab><wait><spacebar><wait5s>", + # Close System Preferences + "<leftSuperOn>q<leftSuperOff><wait5s>", + # Disable keyboard navigation + "<leftCtrlOn><f7><leftCtrlOff><wait2s>", + # Open Terminal + "<leftSuperOn><spacebar><leftSuperOff><wait>terminal<wait><enter><wait5s>", + # Add vagrant user to sudoers + "echo 'vagrant' | sudo -S sh -c 'echo \"vagrant ALL=(ALL) NOPASSWD: ALL\" > /etc/sudoers.d/vagrant'<wait><enter><wait5s>", + # Set Auto login for vagrant + "sudo sysadminctl -autologin set -userName vagrant -password vagrant<wait><enter><wait5s>", + # Disable screen lock + "sudo sysadminctl -screenLock off -password vagrant<wait><enter><wait5s>", + # Close terminal + "exit<enter><wait5s>", + "<leftSuperOn>q<leftSuperOff>" +] diff --git a/os_pkrvars/opensuse/opensuse-leap-15-aarch64.pkrvars.hcl b/os_pkrvars/opensuse/opensuse-leap-15-aarch64.pkrvars.hcl index a737f74f1..b1eaff749 100644 --- a/os_pkrvars/opensuse/opensuse-leap-15-aarch64.pkrvars.hcl +++ b/os_pkrvars/opensuse/opensuse-leap-15-aarch64.pkrvars.hcl @@ -6,4 +6,5 @@ iso_checksum = "file:https://download.opensuse.org/distribution/leap/ parallels_guest_os_type = "opensuse" vbox_guest_os_type = "OpenSUSE_Leap_arm64" vmware_guest_os_type = "arm-other-64" +utm_vm_icon = "suse" boot_command = ["<wait5><esc><wait>e<wait><down><down><down><down><end> biosdevname=0 net.ifnames=0 netdevice=eth0 netsetup=dhcp lang=en_US textmode=1 modprobe.blacklist=vmwgfx autoyast=http://{{ .HTTPIP }}:{{ .HTTPPort }}/opensuse/autoinst-uefi.xml<f10><wait>"] diff --git a/os_pkrvars/opensuse/opensuse-leap-15-x86_64.pkrvars.hcl b/os_pkrvars/opensuse/opensuse-leap-15-x86_64.pkrvars.hcl index b5dd7995c..307e1ac41 100644 --- a/os_pkrvars/opensuse/opensuse-leap-15-x86_64.pkrvars.hcl +++ b/os_pkrvars/opensuse/opensuse-leap-15-x86_64.pkrvars.hcl @@ -6,4 +6,5 @@ iso_checksum = "file:https://download.opensuse.org/distribution/leap/ parallels_guest_os_type = "opensuse" vbox_guest_os_type = "OpenSUSE_Leap_64" vmware_guest_os_type = "opensuse-64" +utm_vm_icon = "suse" boot_command = ["<wait5><esc><enter><wait>linux biosdevname=0 net.ifnames=0 netdevice=eth0 netsetup=dhcp lang=en_US textmode=1 autoyast=http://{{ .HTTPIP }}:{{ .HTTPPort }}/opensuse/autoinst.xml<enter><wait>"] diff --git a/os_pkrvars/opensuse/opensuse-leap-16-aarch64.pkrvars.hcl b/os_pkrvars/opensuse/opensuse-leap-16-aarch64.pkrvars.hcl new file mode 100644 index 000000000..92906a886 --- /dev/null +++ b/os_pkrvars/opensuse/opensuse-leap-16-aarch64.pkrvars.hcl @@ -0,0 +1,26 @@ +os_name = "opensuse-leap" +os_version = "16.0" +os_arch = "aarch64" +iso_url = "https://download.opensuse.org/distribution/leap/16.0/offline/Leap-16.0-online-installer-aarch64.install.iso" +iso_checksum = "file:https://download.opensuse.org/distribution/leap/16.0/offline/Leap-16.0-online-installer-aarch64.install.iso.sha256" +parallels_guest_os_type = "opensuse" +parallels_boot_wait = "1s" +vbox_guest_os_type = "OpenSUSE_Leap_arm64" +vboxmanage = [ + ["modifyvm", "{{.Name}}", "--chipset", "armv8virtual"], + ["modifyvm", "{{.Name}}", "--audio-enabled", "off"], + ["modifyvm", "{{.Name}}", "--nat-localhostreachable1", "on"], + ["modifyvm", "{{.Name}}", "--cableconnected1", "on"], + ["modifyvm", "{{.Name}}", "--usb-xhci", "on"], + ["modifyvm", "{{.Name}}", "--mouse", "usb"], + ["modifyvm", "{{.Name}}", "--keyboard", "usb"], + ["storagectl", "{{.Name}}", "--name", "IDE Controller", "--remove"], +] +vmware_guest_os_type = "arm-other-64" +utm_vm_icon = "suse" +boot_command = [ + "<down><wait>e<wait>", + "<down><down><down><down><end><wait>", + " inst.auto=http://{{ .HTTPIP }}:{{ .HTTPPort }}/opensuse/agama-profile.json<wait>", + "<leftCtrlOn><wait>x<wait><leftCtrlOff>" +] diff --git a/os_pkrvars/opensuse/opensuse-leap-16-x86_64.pkrvars.hcl b/os_pkrvars/opensuse/opensuse-leap-16-x86_64.pkrvars.hcl new file mode 100644 index 000000000..a083422b9 --- /dev/null +++ b/os_pkrvars/opensuse/opensuse-leap-16-x86_64.pkrvars.hcl @@ -0,0 +1,17 @@ +os_name = "opensuse-leap" +os_version = "16.0" +os_arch = "x86_64" +iso_url = "https://download.opensuse.org/distribution/leap/16.0/installer/iso/agama-installer.x86_64-Leap_16.0.iso" +iso_checksum = "file:https://download.opensuse.org/distribution/leap/16.0/installer/iso/agama-installer.x86_64-Leap_16.0.iso.sha256" +parallels_guest_os_type = "opensuse" +parallels_boot_wait = "1s" +vbox_guest_os_type = "OpenSUSE_Leap_64" +vmware_guest_os_type = "opensuse-64" +utm_vm_icon = "suse" +boot_command = [ + "<wait>", + "<down><wait>e<wait>", + "<down><down><down><down><end><wait>", + " inst.auto=http://{{ .HTTPIP }}:{{ .HTTPPort }}/opensuse/agama-profile.json<wait>", + "<leftCtrlOn><wait>x<wait><leftCtrlOff>" +] diff --git a/os_pkrvars/oraclelinux/oraclelinux-10-aarch64.pkrvars.hcl b/os_pkrvars/oraclelinux/oraclelinux-10-aarch64.pkrvars.hcl index f1fb76c92..37b02238a 100644 --- a/os_pkrvars/oraclelinux/oraclelinux-10-aarch64.pkrvars.hcl +++ b/os_pkrvars/oraclelinux/oraclelinux-10-aarch64.pkrvars.hcl @@ -6,4 +6,5 @@ iso_checksum = "file:https://linux.oracle.com/security/gpg/checksum/O parallels_guest_os_type = "centos" vbox_guest_os_type = "Oracle_arm64" vmware_guest_os_type = "arm-rhel9-64" -boot_command = ["<wait><up>e<wait><down><down><end><wait> inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/rhel/10ks.cfg inst.repo=https://yum.oracle.com/repo/OracleLinux/OL10/baseos/latest/aarch64/ <leftCtrlOn>x<leftCtrlOff>"] +utm_vm_icon = "linux" +boot_command = ["<wait><up>e<wait><down><down><end><wait> inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/rhel/ks.cfg inst.repo=https://yum.oracle.com/repo/OracleLinux/OL10/baseos/latest/aarch64/ <leftCtrlOn>x<leftCtrlOff>"] diff --git a/os_pkrvars/oraclelinux/oraclelinux-10-x86_64.pkrvars.hcl b/os_pkrvars/oraclelinux/oraclelinux-10-x86_64.pkrvars.hcl index e68260664..86e919655 100644 --- a/os_pkrvars/oraclelinux/oraclelinux-10-x86_64.pkrvars.hcl +++ b/os_pkrvars/oraclelinux/oraclelinux-10-x86_64.pkrvars.hcl @@ -6,4 +6,5 @@ iso_checksum = "file:https://linux.oracle.com/security/gpg/checksum/O parallels_guest_os_type = "centos" vbox_guest_os_type = "Oracle_64" vmware_guest_os_type = "centos-64" -boot_command = ["<wait><up><wait>e<wait><down><wait><down><wait><end><wait> inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/rhel/10ks.cfg inst.repo=https://yum.oracle.com/repo/OracleLinux/OL10/baseos/latest/x86_64/ <leftCtrlOn>x<leftCtrlOff>"] +utm_vm_icon = "linux" +boot_command = ["<wait><up><wait>e<wait><down><wait><down><wait><end><wait> inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/rhel/ks.cfg inst.repo=https://yum.oracle.com/repo/OracleLinux/OL10/baseos/latest/x86_64/ <leftCtrlOn>x<leftCtrlOff>"] diff --git a/os_pkrvars/oraclelinux/oraclelinux-8-aarch64.pkrvars.hcl b/os_pkrvars/oraclelinux/oraclelinux-8-aarch64.pkrvars.hcl index 3655f979d..cbf610800 100644 --- a/os_pkrvars/oraclelinux/oraclelinux-8-aarch64.pkrvars.hcl +++ b/os_pkrvars/oraclelinux/oraclelinux-8-aarch64.pkrvars.hcl @@ -6,5 +6,6 @@ iso_checksum = "file:https://linux.oracle.com/security/gpg/checksum/O parallels_guest_os_type = "centos" vbox_guest_os_type = "Oracle9_arm64" vmware_guest_os_type = "arm-rhel9-64" -parallels_boot_wait = "0s" +utm_vm_icon = "linux" +parallels_boot_wait = "1s" boot_command = ["<wait><up>e<wait><down><down><end><wait> inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/rhel/8ks.cfg inst.repo=https://yum.oracle.com/repo/OracleLinux/OL8/baseos/latest/aarch64/ <leftCtrlOn>x<leftCtrlOff>"] diff --git a/os_pkrvars/oraclelinux/oraclelinux-8-x86_64.pkrvars.hcl b/os_pkrvars/oraclelinux/oraclelinux-8-x86_64.pkrvars.hcl index 5914dac24..785bb814e 100644 --- a/os_pkrvars/oraclelinux/oraclelinux-8-x86_64.pkrvars.hcl +++ b/os_pkrvars/oraclelinux/oraclelinux-8-x86_64.pkrvars.hcl @@ -6,4 +6,6 @@ iso_checksum = "file:https://linux.oracle.com/security/gpg/checksum/O parallels_guest_os_type = "centos" vbox_guest_os_type = "Oracle_64" vmware_guest_os_type = "centos-64" -boot_command = ["<wait><up><wait><tab> inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/rhel/8ks.cfg inst.repo=https://yum.oracle.com/repo/OracleLinux/OL8/baseos/latest/x86_64/ <enter><wait>"] +utm_vm_icon = "linux" +boot_command = ["<wait><up><tab><wait><end><wait> inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/rhel/8ks.cfg inst.repo=https://yum.oracle.com/repo/OracleLinux/OL8/baseos/latest/x86_64/ <wait><enter><wait>"] +utm_boot_command = ["<wait><up>e<wait><down><down><end><wait> inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/rhel/8ks.cfg inst.repo=https://yum.oracle.com/repo/OracleLinux/OL8/baseos/latest/x86_64/ <wait><leftCtrlOn><wait>x<wait><leftCtrlOff>"] diff --git a/os_pkrvars/oraclelinux/oraclelinux-9-aarch64.pkrvars.hcl b/os_pkrvars/oraclelinux/oraclelinux-9-aarch64.pkrvars.hcl index 2032cd029..807659871 100644 --- a/os_pkrvars/oraclelinux/oraclelinux-9-aarch64.pkrvars.hcl +++ b/os_pkrvars/oraclelinux/oraclelinux-9-aarch64.pkrvars.hcl @@ -6,4 +6,5 @@ iso_checksum = "file:https://linux.oracle.com/security/gpg/checksum/O parallels_guest_os_type = "centos" vbox_guest_os_type = "Oracle9_arm64" vmware_guest_os_type = "arm-rhel9-64" -boot_command = ["<wait><up>e<wait><down><down><end><wait> inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/rhel/9ks.cfg inst.repo=https://yum.oracle.com/repo/OracleLinux/OL9/baseos/latest/aarch64/ <leftCtrlOn>x<leftCtrlOff>"] +utm_vm_icon = "linux" +boot_command = ["<wait><up>e<wait><down><down><end><wait> inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/rhel/ks.cfg inst.repo=https://yum.oracle.com/repo/OracleLinux/OL9/baseos/latest/aarch64/ <leftCtrlOn>x<leftCtrlOff>"] diff --git a/os_pkrvars/oraclelinux/oraclelinux-9-x86_64.pkrvars.hcl b/os_pkrvars/oraclelinux/oraclelinux-9-x86_64.pkrvars.hcl index 70929c213..85f8d5999 100644 --- a/os_pkrvars/oraclelinux/oraclelinux-9-x86_64.pkrvars.hcl +++ b/os_pkrvars/oraclelinux/oraclelinux-9-x86_64.pkrvars.hcl @@ -6,4 +6,6 @@ iso_checksum = "file:https://linux.oracle.com/security/gpg/checksum/O parallels_guest_os_type = "centos" vbox_guest_os_type = "Oracle_64" vmware_guest_os_type = "centos-64" -boot_command = ["<wait><up><wait><tab> inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/rhel/9ks.cfg inst.repo=https://yum.oracle.com/repo/OracleLinux/OL9/baseos/latest/x86_64/ <enter><wait>"] +utm_vm_icon = "linux" +boot_command = ["<wait><up><wait><tab><wait><end><wait> inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/rhel/ks.cfg inst.repo=https://yum.oracle.com/repo/OracleLinux/OL9/baseos/latest/x86_64/ <wait><enter><wait>"] +utm_boot_command = ["<wait><up><wait>e<wait><down><wait><down><wait><end><wait> inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/rhel/ks.cfg inst.repo=https://yum.oracle.com/repo/OracleLinux/OL9/baseos/latest/x86_64/ <wait><leftCtrlOn><wait>x<wait><leftCtrlOff>"] diff --git a/os_pkrvars/rhel/rhel-10-aarch64.pkrvars.hcl b/os_pkrvars/rhel/rhel-10-aarch64.pkrvars.hcl index ca9845fb4..0b1caab18 100644 --- a/os_pkrvars/rhel/rhel-10-aarch64.pkrvars.hcl +++ b/os_pkrvars/rhel/rhel-10-aarch64.pkrvars.hcl @@ -6,4 +6,5 @@ iso_checksum = "none" parallels_guest_os_type = "rhel" vbox_guest_os_type = "Oracle_arm64" vmware_guest_os_type = "arm-rhel9-64" +utm_vm_icon = "red-hat" boot_command = ["<wait><up><wait><tab> inst.text inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/rhel/10ks.cfg<enter><wait>"] diff --git a/os_pkrvars/rhel/rhel-10-x86_64.pkrvars.hcl b/os_pkrvars/rhel/rhel-10-x86_64.pkrvars.hcl index 1d7deec4f..87055fc6a 100644 --- a/os_pkrvars/rhel/rhel-10-x86_64.pkrvars.hcl +++ b/os_pkrvars/rhel/rhel-10-x86_64.pkrvars.hcl @@ -6,4 +6,5 @@ iso_checksum = "none" parallels_guest_os_type = "rhel" vbox_guest_os_type = "RedHat_64" vmware_guest_os_type = "centos-64" +utm_vm_icon = "red-hat" boot_command = ["<wait><up><wait><tab> inst.text inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/rhel/10ks.cfg<enter><wait>"] diff --git a/os_pkrvars/rhel/rhel-8-aarch64.pkrvars.hcl b/os_pkrvars/rhel/rhel-8-aarch64.pkrvars.hcl index 57f5508b2..61632a8aa 100644 --- a/os_pkrvars/rhel/rhel-8-aarch64.pkrvars.hcl +++ b/os_pkrvars/rhel/rhel-8-aarch64.pkrvars.hcl @@ -6,4 +6,5 @@ iso_checksum = "none" parallels_guest_os_type = "rhel" vbox_guest_os_type = "Oracle_arm64" vmware_guest_os_type = "arm-rhel9-64" +utm_vm_icon = "red-hat" boot_command = ["<wait><up><wait><tab> inst.text inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/rhel/8ks.cfg<enter><wait>"] diff --git a/os_pkrvars/rhel/rhel-8-x86_64.pkrvars.hcl b/os_pkrvars/rhel/rhel-8-x86_64.pkrvars.hcl index 061431f40..e2ec0ebe8 100644 --- a/os_pkrvars/rhel/rhel-8-x86_64.pkrvars.hcl +++ b/os_pkrvars/rhel/rhel-8-x86_64.pkrvars.hcl @@ -6,4 +6,5 @@ iso_checksum = "none" parallels_guest_os_type = "rhel" vbox_guest_os_type = "RedHat_64" vmware_guest_os_type = "centos-64" +utm_vm_icon = "red-hat" boot_command = ["<wait><up><wait><tab> inst.text inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/rhel/8ks.cfg<enter><wait>"] diff --git a/os_pkrvars/rhel/rhel-9-aarch64.pkrvars.hcl b/os_pkrvars/rhel/rhel-9-aarch64.pkrvars.hcl index f21c7a69b..13a9f7675 100644 --- a/os_pkrvars/rhel/rhel-9-aarch64.pkrvars.hcl +++ b/os_pkrvars/rhel/rhel-9-aarch64.pkrvars.hcl @@ -6,4 +6,5 @@ iso_checksum = "none" parallels_guest_os_type = "rhel" vbox_guest_os_type = "Oracle9_arm64" vmware_guest_os_type = "arm-rhel9-64" +utm_vm_icon = "red-hat" boot_command = ["<wait><up><wait><tab> inst.text inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/rhel/9ks.cfg<enter><wait>"] diff --git a/os_pkrvars/rhel/rhel-9-x86_64.pkrvars.hcl b/os_pkrvars/rhel/rhel-9-x86_64.pkrvars.hcl index 88a35d638..34fbb254c 100644 --- a/os_pkrvars/rhel/rhel-9-x86_64.pkrvars.hcl +++ b/os_pkrvars/rhel/rhel-9-x86_64.pkrvars.hcl @@ -6,4 +6,5 @@ iso_checksum = "none" parallels_guest_os_type = "rhel" vbox_guest_os_type = "RedHat_64" vmware_guest_os_type = "centos-64" +utm_vm_icon = "red-hat" boot_command = ["<wait><up><wait><tab> inst.text inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/rhel/9ks.cfg<enter><wait>"] diff --git a/os_pkrvars/rockylinux/rockylinux-10-aarch64.pkrvars.hcl b/os_pkrvars/rockylinux/rockylinux-10-aarch64.pkrvars.hcl index de1c103f6..221519c2a 100644 --- a/os_pkrvars/rockylinux/rockylinux-10-aarch64.pkrvars.hcl +++ b/os_pkrvars/rockylinux/rockylinux-10-aarch64.pkrvars.hcl @@ -6,4 +6,5 @@ iso_checksum = "file:https://download.rockylinux.org/pub/rocky/10/iso parallels_guest_os_type = "centos" vbox_guest_os_type = "Oracle_arm64" vmware_guest_os_type = "arm-rhel9-64" -boot_command = ["<wait><up>e<wait><down><down><end><wait> inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/rhel/10ks.cfg inst.repo=https://download.rockylinux.org/pub/rocky/10/BaseOS/aarch64/os/ <leftCtrlOn>x<leftCtrlOff>"] +utm_vm_icon = "linux" +boot_command = ["<wait><up>e<wait><down><down><end><wait> inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/rhel/ks.cfg inst.repo=https://download.rockylinux.org/pub/rocky/10/BaseOS/aarch64/os/ <leftCtrlOn>x<leftCtrlOff>"] diff --git a/os_pkrvars/rockylinux/rockylinux-10-x86_64.pkrvars.hcl b/os_pkrvars/rockylinux/rockylinux-10-x86_64.pkrvars.hcl index 53a393cf6..b8f5f4ed9 100644 --- a/os_pkrvars/rockylinux/rockylinux-10-x86_64.pkrvars.hcl +++ b/os_pkrvars/rockylinux/rockylinux-10-x86_64.pkrvars.hcl @@ -6,4 +6,5 @@ iso_checksum = "file:https://download.rockylinux.org/pub/rocky/10/iso parallels_guest_os_type = "centos" vbox_guest_os_type = "Oracle_64" vmware_guest_os_type = "centos-64" -boot_command = ["<wait><up>e<wait><down><down><end><wait> inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/rhel/10ks.cfg inst.repo=https://download.rockylinux.org/pub/rocky/10/BaseOS/x86_64/os/ <leftCtrlOn>x<leftCtrlOff>"] +utm_vm_icon = "linux" +boot_command = ["<wait><up>e<wait><down><down><end><wait> inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/rhel/ks.cfg inst.repo=https://download.rockylinux.org/pub/rocky/10/BaseOS/x86_64/os/ <leftCtrlOn>x<leftCtrlOff>"] diff --git a/os_pkrvars/rockylinux/rockylinux-8-aarch64.pkrvars.hcl b/os_pkrvars/rockylinux/rockylinux-8-aarch64.pkrvars.hcl index 2a833e3ce..ee96c87d5 100644 --- a/os_pkrvars/rockylinux/rockylinux-8-aarch64.pkrvars.hcl +++ b/os_pkrvars/rockylinux/rockylinux-8-aarch64.pkrvars.hcl @@ -6,4 +6,5 @@ iso_checksum = "file:https://download.rockylinux.org/pub/rocky/8/isos parallels_guest_os_type = "centos" vbox_guest_os_type = "Oracle_arm64" vmware_guest_os_type = "arm-rhel9-64" +utm_vm_icon = "linux" boot_command = ["<wait><up>e<wait><down><down><end><wait> inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/rhel/8ks.cfg inst.repo=https://download.rockylinux.org/pub/rocky/8/BaseOS/aarch64/os/ <leftCtrlOn>x<leftCtrlOff>"] diff --git a/os_pkrvars/rockylinux/rockylinux-8-x86_64.pkrvars.hcl b/os_pkrvars/rockylinux/rockylinux-8-x86_64.pkrvars.hcl index 505cef607..98d09becf 100644 --- a/os_pkrvars/rockylinux/rockylinux-8-x86_64.pkrvars.hcl +++ b/os_pkrvars/rockylinux/rockylinux-8-x86_64.pkrvars.hcl @@ -6,4 +6,6 @@ iso_checksum = "file:https://download.rockylinux.org/pub/rocky/8/isos parallels_guest_os_type = "centos" vbox_guest_os_type = "Oracle_64" vmware_guest_os_type = "centos-64" -boot_command = ["<wait><up><wait><tab> inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/rhel/8ks.cfg inst.repo=https://download.rockylinux.org/pub/rocky/8/BaseOS/x86_64/os/ <enter><wait>"] +utm_vm_icon = "linux" +boot_command = ["<wait><up><tab><wait><end><wait> inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/rhel/8ks.cfg inst.repo=https://download.rockylinux.org/pub/rocky/8/BaseOS/x86_64/os/ <wait><enter><wait>"] +utm_boot_command = ["<wait><up>e<wait><down><down><end><wait> inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/rhel/8ks.cfg inst.repo=https://download.rockylinux.org/pub/rocky/8/BaseOS/x86_64/os/ <wait><leftCtrlOn><wait>x<wait><leftCtrlOff>"] diff --git a/os_pkrvars/rockylinux/rockylinux-9-aarch64.pkrvars.hcl b/os_pkrvars/rockylinux/rockylinux-9-aarch64.pkrvars.hcl index e2aa942f4..6a1b36cd1 100644 --- a/os_pkrvars/rockylinux/rockylinux-9-aarch64.pkrvars.hcl +++ b/os_pkrvars/rockylinux/rockylinux-9-aarch64.pkrvars.hcl @@ -6,4 +6,5 @@ iso_checksum = "file:https://download.rockylinux.org/pub/rocky/9/isos parallels_guest_os_type = "centos" vbox_guest_os_type = "Oracle9_arm64" vmware_guest_os_type = "arm-rhel9-64" -boot_command = ["<wait><up>e<wait><down><down><end><wait> inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/rhel/9ks.cfg inst.repo=https://download.rockylinux.org/pub/rocky/9/BaseOS/aarch64/os/ <leftCtrlOn>x<leftCtrlOff>"] +utm_vm_icon = "linux" +boot_command = ["<wait><up>e<wait><down><down><end><wait> inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/rhel/ks.cfg inst.repo=https://download.rockylinux.org/pub/rocky/9/BaseOS/aarch64/os/ <leftCtrlOn>x<leftCtrlOff>"] diff --git a/os_pkrvars/rockylinux/rockylinux-9-x86_64.pkrvars.hcl b/os_pkrvars/rockylinux/rockylinux-9-x86_64.pkrvars.hcl index 7ad513367..4dd0e176c 100644 --- a/os_pkrvars/rockylinux/rockylinux-9-x86_64.pkrvars.hcl +++ b/os_pkrvars/rockylinux/rockylinux-9-x86_64.pkrvars.hcl @@ -6,4 +6,6 @@ iso_checksum = "file:https://download.rockylinux.org/pub/rocky/9/isos parallels_guest_os_type = "centos" vbox_guest_os_type = "Oracle_64" vmware_guest_os_type = "centos-64" -boot_command = ["<wait><up><wait><tab> inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/rhel/9ks.cfg inst.repo=https://download.rockylinux.org/pub/rocky/9/BaseOS/x86_64/os/ <enter><wait>"] +utm_vm_icon = "linux" +boot_command = ["<wait><up><wait><tab><wait><end><wait> inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/rhel/ks.cfg inst.repo=https://download.rockylinux.org/pub/rocky/9/BaseOS/x86_64/os/ <wait><enter><wait>"] +utm_boot_command = ["<wait><up><wait>e<wait><down><wait><down><wait><end><wait> inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/rhel/ks.cfg inst.repo=https://download.rockylinux.org/pub/rocky/9/BaseOS/x86_64/os/ <wait><leftCtrlOn><wait>x<wait><leftCtrlOff>"] diff --git a/os_pkrvars/sles/sles-15-aarch64.pkrvars.hcl b/os_pkrvars/sles/sles-15-aarch64.pkrvars.hcl index 04d3d2ef4..5e2ce5bbe 100644 --- a/os_pkrvars/sles/sles-15-aarch64.pkrvars.hcl +++ b/os_pkrvars/sles/sles-15-aarch64.pkrvars.hcl @@ -6,4 +6,5 @@ iso_checksum = "56f67a6d10a502901cc2c291231089e375dd7c2b51fc951d5deaa parallels_guest_os_type = "opensuse" vbox_guest_os_type = "OpenSUSE_Leap_arm64" vmware_guest_os_type = "arm-other-64" +utm_vm_icon = "suse" boot_command = ["<wait><esc><enter><wait>linux netdevice=eth0 netsetup=dhcp install=cd:/<wait> lang=en_US autoyast=http://{{ .HTTPIP }}:{{ .HTTPPort }}/sles/15-autoinst.xml<wait> textmode=1<wait><enter><wait>"] diff --git a/os_pkrvars/sles/sles-15-x86_64.pkrvars.hcl b/os_pkrvars/sles/sles-15-x86_64.pkrvars.hcl index d0d8985fb..aa61c27e0 100644 --- a/os_pkrvars/sles/sles-15-x86_64.pkrvars.hcl +++ b/os_pkrvars/sles/sles-15-x86_64.pkrvars.hcl @@ -6,4 +6,5 @@ iso_checksum = "c816a46b76de157e49d6b931284b9827b3781260f0cdd2a365296 parallels_guest_os_type = "suse" vbox_guest_os_type = "SUSE_LE_64" vmware_guest_os_type = "sles15-64" +utm_vm_icon = "suse" boot_command = ["<wait><esc><enter><wait>linux netdevice=eth0 netsetup=dhcp install=cd:/<wait> lang=en_US autoyast=http://{{ .HTTPIP }}:{{ .HTTPPort }}/sles/15-autoinst.xml<wait> textmode=1<wait><enter><wait>"] diff --git a/os_pkrvars/solaris/solaris-11-x86_64.pkrvars.hcl b/os_pkrvars/solaris/solaris-11-x86_64.pkrvars.hcl index 19dec5cc2..bf4b57186 100644 --- a/os_pkrvars/solaris/solaris-11-x86_64.pkrvars.hcl +++ b/os_pkrvars/solaris/solaris-11-x86_64.pkrvars.hcl @@ -6,4 +6,5 @@ iso_checksum = "sha256:e3a29507e583acbc0b912f371c8f328fea7cb6257d587c parallels_guest_os_type = "solaris" vbox_guest_os_type = "Solaris11_64" vmware_guest_os_type = "solaris11-64" +utm_vm_icon = "solaris" boot_command = ["<wait>e<wait><down><down><down><down><down><wait><end><wait><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><wait>false<wait><f10><wait><wait10><wait10><wait10><wait10><wait10><wait10><wait10><wait10><wait10><wait10><wait10><wait10><wait10><wait10><wait10><wait10><wait10><wait10>root<enter><wait><wait>solaris<enter><wait><wait><wait10>while (true); do sleep 5; test -f /a/etc/sudoers && grep -v \"vagrant\" \"/a/etc/sudoers\" 2> /dev/null<wait> && echo \"vagrant ALL=(ALL) NOPASSWD: ALL\" >> /a/etc/sudoers && break ; done &<enter><wait><enter>while (true); do grep \"You may wish to reboot\" \"/var/svc/log/application-auto-installer:default.log\" 2> /dev/null<wait> && reboot; sleep 10; done &<enter><wait>sleep 5; curl http://{{ .HTTPIP }}:{{ .HTTPPort }}/solaris/default.xml -o default.xml;<wait>curl http://{{ .HTTPIP }}:{{ .HTTPPort }}/solaris/profile.xml -o profile.xml;<wait>cp default.xml /system/volatile/ai.xml;<wait>mkdir /system/volatile/profile;<wait>cp profile.xml /system/volatile/profile/profile.xml;<wait>svcadm enable svc:/application/auto-installer:default;<wait><enter><wait10><wait><wait><enter><wait>tail -f /var/svc/log/application-auto-installer\\:default.log<enter><wait>"] diff --git a/os_pkrvars/ubuntu/ubuntu-22.04-aarch64.pkrvars.hcl b/os_pkrvars/ubuntu/ubuntu-22.04-aarch64.pkrvars.hcl index b7005a4c9..c158f0ed8 100644 --- a/os_pkrvars/ubuntu/ubuntu-22.04-aarch64.pkrvars.hcl +++ b/os_pkrvars/ubuntu/ubuntu-22.04-aarch64.pkrvars.hcl @@ -6,4 +6,5 @@ iso_checksum = "file:https://cdimage.ubuntu.com/releases/jammy/releas parallels_guest_os_type = "ubuntu" vbox_guest_os_type = "Ubuntu_arm64" vmware_guest_os_type = "arm-ubuntu-64" +utm_vm_icon = "ubuntu" boot_command = ["<wait>e<wait><down><down><down><end><wait> autoinstall ds=nocloud-net\\;s=http://{{.HTTPIP}}:{{.HTTPPort}}/ubuntu/<f10><wait>"] diff --git a/os_pkrvars/ubuntu/ubuntu-22.04-x86_64.pkrvars.hcl b/os_pkrvars/ubuntu/ubuntu-22.04-x86_64.pkrvars.hcl index 21077f3bd..9d2a19335 100644 --- a/os_pkrvars/ubuntu/ubuntu-22.04-x86_64.pkrvars.hcl +++ b/os_pkrvars/ubuntu/ubuntu-22.04-x86_64.pkrvars.hcl @@ -6,4 +6,5 @@ iso_checksum = "file:https://releases.ubuntu.com/jammy/SHA256SUMS" parallels_guest_os_type = "ubuntu" vbox_guest_os_type = "Ubuntu_64" vmware_guest_os_type = "ubuntu-64" +utm_vm_icon = "ubuntu" boot_command = ["<wait>c<wait>set gfxpayload=keep<enter><wait>linux /casper/vmlinuz quiet autoinstall ds=nocloud-net\\;s=http://{{.HTTPIP}}:{{.HTTPPort}}/ubuntu/ ---<enter><wait>initrd /casper/initrd<wait><enter><wait>boot<enter><wait>"] diff --git a/os_pkrvars/ubuntu/ubuntu-24.04-aarch64.pkrvars.hcl b/os_pkrvars/ubuntu/ubuntu-24.04-aarch64.pkrvars.hcl index 5fdff862b..296354f9b 100644 --- a/os_pkrvars/ubuntu/ubuntu-24.04-aarch64.pkrvars.hcl +++ b/os_pkrvars/ubuntu/ubuntu-24.04-aarch64.pkrvars.hcl @@ -6,4 +6,5 @@ iso_checksum = "file:https://cdimage.ubuntu.com/releases/noble/releas parallels_guest_os_type = "ubuntu" vbox_guest_os_type = "Ubuntu24_LTS_arm64" vmware_guest_os_type = "arm-ubuntu-64" +utm_vm_icon = "ubuntu" boot_command = ["<wait>e<wait><down><down><down><end> autoinstall ds=nocloud-net\\;s=http://{{.HTTPIP}}:{{.HTTPPort}}/ubuntu/<wait><f10><wait>"] diff --git a/os_pkrvars/ubuntu/ubuntu-24.04-x86_64.pkrvars.hcl b/os_pkrvars/ubuntu/ubuntu-24.04-x86_64.pkrvars.hcl index 0a651db90..8923b2536 100644 --- a/os_pkrvars/ubuntu/ubuntu-24.04-x86_64.pkrvars.hcl +++ b/os_pkrvars/ubuntu/ubuntu-24.04-x86_64.pkrvars.hcl @@ -6,4 +6,5 @@ iso_checksum = "file:https://releases.ubuntu.com/noble/SHA256SUMS" parallels_guest_os_type = "ubuntu" vbox_guest_os_type = "Ubuntu_64" vmware_guest_os_type = "ubuntu-64" +utm_vm_icon = "ubuntu" boot_command = ["<wait>e<wait><down><down><down><end> autoinstall ds=nocloud-net\\;s=http://{{.HTTPIP}}:{{.HTTPPort}}/ubuntu/<wait><f10><wait>"] diff --git a/os_pkrvars/ubuntu/ubuntu-25.04-aarch64.pkrvars.hcl b/os_pkrvars/ubuntu/ubuntu-25.04-aarch64.pkrvars.hcl new file mode 100644 index 000000000..a387d8ec7 --- /dev/null +++ b/os_pkrvars/ubuntu/ubuntu-25.04-aarch64.pkrvars.hcl @@ -0,0 +1,10 @@ +os_name = "ubuntu" +os_version = "25.04" +os_arch = "aarch64" +iso_url = "https://cdimage.ubuntu.com/releases/plucky/release/ubuntu-25.04-live-server-arm64.iso" +iso_checksum = "file:https://cdimage.ubuntu.com/releases/plucky/release/SHA256SUMS" +parallels_guest_os_type = "ubuntu" +vbox_guest_os_type = "Ubuntu24_LTS_arm64" +vmware_guest_os_type = "arm-ubuntu-64" +utm_vm_icon = "ubuntu" +boot_command = ["<wait>e<wait><down><down><down><end> autoinstall ds=nocloud-net\\;s=http://{{.HTTPIP}}:{{.HTTPPort}}/ubuntu/<wait><f10><wait>"] diff --git a/os_pkrvars/ubuntu/ubuntu-25.04-x86_64.pkvars.hcl b/os_pkrvars/ubuntu/ubuntu-25.04-x86_64.pkrvars.hcl similarity index 93% rename from os_pkrvars/ubuntu/ubuntu-25.04-x86_64.pkvars.hcl rename to os_pkrvars/ubuntu/ubuntu-25.04-x86_64.pkrvars.hcl index a2f0b5ada..d73b16cce 100644 --- a/os_pkrvars/ubuntu/ubuntu-25.04-x86_64.pkvars.hcl +++ b/os_pkrvars/ubuntu/ubuntu-25.04-x86_64.pkrvars.hcl @@ -6,4 +6,5 @@ iso_checksum = "file:https://releases.ubuntu.com/plucky/SHA256SUMS" parallels_guest_os_type = "ubuntu" vbox_guest_os_type = "Ubuntu_64" vmware_guest_os_type = "ubuntu-64" +utm_vm_icon = "ubuntu" boot_command = ["<wait>e<wait><down><down><down><end> autoinstall ds=nocloud-net\\;s=http://{{.HTTPIP}}:{{.HTTPPort}}/ubuntu/<wait><f10><wait>"] diff --git a/os_pkrvars/ubuntu/ubuntu-25.10-aarch64.pkrvars.hcl b/os_pkrvars/ubuntu/ubuntu-25.10-aarch64.pkrvars.hcl new file mode 100644 index 000000000..53070fa23 --- /dev/null +++ b/os_pkrvars/ubuntu/ubuntu-25.10-aarch64.pkrvars.hcl @@ -0,0 +1,10 @@ +os_name = "ubuntu" +os_version = "25.10" +os_arch = "aarch64" +iso_url = "https://cdimage.ubuntu.com/releases/questing/release/ubuntu-25.10-live-server-arm64.iso" +iso_checksum = "file:https://cdimage.ubuntu.com/releases/questing/release/SHA256SUMS" +parallels_guest_os_type = "ubuntu" +vbox_guest_os_type = "Ubuntu24_LTS_arm64" +vmware_guest_os_type = "arm-ubuntu-64" +utm_vm_icon = "ubuntu" +boot_command = ["<wait>e<wait><down><down><down><end> autoinstall ds=nocloud-net\\;s=http://{{.HTTPIP}}:{{.HTTPPort}}/ubuntu/<wait><f10><wait>"] diff --git a/os_pkrvars/ubuntu/ubuntu-25.10-x86_64.pkvars.hcl b/os_pkrvars/ubuntu/ubuntu-25.10-x86_64.pkrvars.hcl similarity index 94% rename from os_pkrvars/ubuntu/ubuntu-25.10-x86_64.pkvars.hcl rename to os_pkrvars/ubuntu/ubuntu-25.10-x86_64.pkrvars.hcl index ae7ec390b..92c427f83 100644 --- a/os_pkrvars/ubuntu/ubuntu-25.10-x86_64.pkvars.hcl +++ b/os_pkrvars/ubuntu/ubuntu-25.10-x86_64.pkrvars.hcl @@ -6,4 +6,5 @@ iso_checksum = "file:https://releases.ubuntu.com/questing/SHA256SUMS" parallels_guest_os_type = "ubuntu" vbox_guest_os_type = "Ubuntu_64" vmware_guest_os_type = "ubuntu-64" +utm_vm_icon = "ubuntu" boot_command = ["<wait>e<wait><down><down><down><end> autoinstall ds=nocloud-net\\;s=http://{{.HTTPIP}}:{{.HTTPPort}}/ubuntu/<wait><f10><wait>"] diff --git a/os_pkrvars/windows/windows-11-aarch64.pkrvars.hcl b/os_pkrvars/windows/windows-11-aarch64.pkrvars.hcl index fa598a714..fc3d390b0 100644 --- a/os_pkrvars/windows/windows-11-aarch64.pkrvars.hcl +++ b/os_pkrvars/windows/windows-11-aarch64.pkrvars.hcl @@ -8,8 +8,9 @@ iso_url = "https://software-static.download.prss.microsoft.com/d iso_checksum = "DAD633276073F14F3E0373EF7E787569E216D54942CE522B39451C8F2D38AD43" sources_enabled = ["source.parallels-iso.vm", "source.qemu.vm", "source.vmware-iso.vm"] parallels_guest_os_type = "win-11" -vbox_guest_os_type = "Other_arm64" +vbox_guest_os_type = "Windows11_arm64" vmware_guest_os_type = "arm-windows11-64" vmware_firmware = "efi-secure" +utm_vm_icon = "windows-11" parallels_boot_wait = "180s" boot_command = ["<up><wait><down><down><enter><wait><up>", ] diff --git a/os_pkrvars/windows/windows-11-x86_64.pkrvars.hcl b/os_pkrvars/windows/windows-11-x86_64.pkrvars.hcl index 0c05ae5b7..f12d0fafb 100644 --- a/os_pkrvars/windows/windows-11-x86_64.pkrvars.hcl +++ b/os_pkrvars/windows/windows-11-x86_64.pkrvars.hcl @@ -8,3 +8,4 @@ iso_checksum = "755A90D43E826A74B9E1932A34788B898E028272439B777E5593D parallels_guest_os_type = "win-11" vbox_guest_os_type = "Windows11_64" vmware_guest_os_type = "windows9srv-64" +utm_vm_icon = "windows-11" diff --git a/os_pkrvars/windows/windows-2016-x86_64.pkrvars.hcl b/os_pkrvars/windows/windows-2016-x86_64.pkrvars.hcl index 79f734e5a..ce4291a00 100644 --- a/os_pkrvars/windows/windows-2016-x86_64.pkrvars.hcl +++ b/os_pkrvars/windows/windows-2016-x86_64.pkrvars.hcl @@ -8,3 +8,4 @@ iso_checksum = "1ce702a578a3cb1ac3d14873980838590f06d5b7101c5daaccbac parallels_guest_os_type = "win-2016" vbox_guest_os_type = "Windows2016_64" vmware_guest_os_type = "windows9srv-64" +utm_vm_icon = "windows" diff --git a/os_pkrvars/windows/windows-2019-x86_64.pkrvars.hcl b/os_pkrvars/windows/windows-2019-x86_64.pkrvars.hcl index 87614c762..eba7f76c9 100644 --- a/os_pkrvars/windows/windows-2019-x86_64.pkrvars.hcl +++ b/os_pkrvars/windows/windows-2019-x86_64.pkrvars.hcl @@ -8,3 +8,4 @@ iso_checksum = "6dae072e7f78f4ccab74a45341de0d6e2d45c39be25f1f5920a2a parallels_guest_os_type = "win-2019" vbox_guest_os_type = "Windows2019_64" vmware_guest_os_type = "windows9srv-64" +utm_vm_icon = "windows" diff --git a/os_pkrvars/windows/windows-2022-x86_64.pkrvars.hcl b/os_pkrvars/windows/windows-2022-x86_64.pkrvars.hcl index b0ad18b28..c443a1eec 100644 --- a/os_pkrvars/windows/windows-2022-x86_64.pkrvars.hcl +++ b/os_pkrvars/windows/windows-2022-x86_64.pkrvars.hcl @@ -8,3 +8,4 @@ iso_checksum = "3e4fa6d8507b554856fc9ca6079cc402df11a8b79344871669f02 parallels_guest_os_type = "win-2022" vbox_guest_os_type = "Windows2022_64" vmware_guest_os_type = "windows9srv-64" +utm_vm_icon = "windows" diff --git a/os_pkrvars/windows/windows-2025-x86_64.pkrvars.hcl b/os_pkrvars/windows/windows-2025-x86_64.pkrvars.hcl index 46228c754..d84892207 100644 --- a/os_pkrvars/windows/windows-2025-x86_64.pkrvars.hcl +++ b/os_pkrvars/windows/windows-2025-x86_64.pkrvars.hcl @@ -8,3 +8,4 @@ iso_checksum = "d0ef4502e350e3c6c53c15b1b3020d38a5ded011bf04998e95072 parallels_guest_os_type = "win-2022" vbox_guest_os_type = "Windows2022_64" vmware_guest_os_type = "windows9srv-64" +utm_vm_icon = "windows" diff --git a/packer_templates/http/fedora/ks.cfg b/packer_templates/http/fedora/ks.cfg deleted file mode 100644 index f31e5330c..000000000 --- a/packer_templates/http/fedora/ks.cfg +++ /dev/null @@ -1,47 +0,0 @@ -lang en_US.UTF-8 -keyboard --xlayouts='us' -network --bootproto=dhcp --noipv6 --onboot=on --device=eth0 -rootpw --plaintext vagrant -firewall --disabled -selinux --permissive -timezone UTC -bootloader --timeout=1 --location=mbr --append="net.ifnames=0 biosdevname=0" -text -skipx -zerombr -clearpart --all --initlabel -autopart --nohome --nolvm --noboot -firstboot --disabled -reboot --eject -user --name=vagrant --plaintext --password vagrant - -%packages --ignoremissing --excludedocs -bzip2 -tar -wget -nfs-utils -net-tools -rsync -dkms --plymouth --plymouth-core-libs --fedora-release-notes --mcelog --smartmontools --usbutils --microcode_ctl -%end - -%post -# sudo -echo 'Defaults:vagrant !requiretty' > /etc/sudoers.d/vagrant -echo '%vagrant ALL=(ALL) NOPASSWD: ALL' >> /etc/sudoers.d/vagrant -chmod 440 /etc/sudoers.d/vagrant - -# Enable hyper-v daemons only if using hyper-v virtualization -if [ $(virt-what) == "hyperv" ]; then -dnf -y install hyperv-daemons cifs-utils -systemctl enable hypervvssd -systemctl enable hypervkvpd -fi -%end diff --git a/packer_templates/http/freebsd/installerconfig b/packer_templates/http/freebsd/installerconfig index 6e332595b..e4c817950 100644 --- a/packer_templates/http/freebsd/installerconfig +++ b/packer_templates/http/freebsd/installerconfig @@ -25,13 +25,21 @@ HOSTNAME=freebsd #!/bin/sh -x -ifdev=$(ifconfig | grep '^[a-z]' | cut -d: -f1 | head -n 1) +# Get all network interfaces except loopback +ifdevs=$(ifconfig | grep '^[a-z]' | cut -d: -f1 | grep -v '^lo') + +# Configure each interface for DHCP +for ifdev in $ifdevs; do +cat >> /etc/rc.conf << EOT +ifconfig_${ifdev}="dhcp" +EOT +done + # Enable required services cat >> /etc/rc.conf << EOT clear_tmp_enable="YES" syslogd_flags="-ss" sendmail_enable="NONE" -ifconfig_${ifdev}="dhcp" sshd_enable="YES" dumpdev="NO" zfs_enable="YES" diff --git a/packer_templates/http/opensuse/agama-profile.json b/packer_templates/http/opensuse/agama-profile.json new file mode 100644 index 000000000..12dc2f312 --- /dev/null +++ b/packer_templates/http/opensuse/agama-profile.json @@ -0,0 +1,30 @@ +{ + "product": { + "id": "openSUSE_Leap" + }, + "localization": { + "language": "en_US.UTF-8", + "keyboard": "us", + "timezone": "UTC" + }, + "user": { + "fullName": "Vagrant", + "userName": "vagrant", + "password": "vagrant", + "hashedPassword": false + }, + "root": { + "password": "vagrant", + "hashedPassword": false, + "sshPublicKey": "" + }, + "scripts": { + "post": [ + { + "name": "vagrant_sudo_ssh", + "chroot": true, + "content": "#!/bin/bash\necho 'vagrant ALL=(ALL) NOPASSWD: ALL' > /etc/sudoers.d/vagrant\nchmod 0440 /etc/sudoers.d/vagrant\nsystemctl enable sshd" + } + ] + } +} diff --git a/packer_templates/http/rhel/8ks.cfg b/packer_templates/http/rhel/8ks.cfg index f8f8917b4..de2554c74 100644 --- a/packer_templates/http/rhel/8ks.cfg +++ b/packer_templates/http/rhel/8ks.cfg @@ -1,12 +1,12 @@ + lang en_US.UTF-8 keyboard us -network --bootproto=dhcp --noipv6 --onboot=on --device=eth0 --activate +network --bootproto=dhcp --noipv6 --onboot=on --activate rootpw --plaintext vagrant firewall --enabled --ssh selinux --enforcing timezone UTC -bootloader --timeout=0 --location=mbr --append="console=tty0 console=ttyS0,115200n8 no_timer_check net.ifnames=0 biosdevname=0" -text +bootloader --timeout=0 --location=mbr --append="console=tty0 console=ttyS0,115200n8 no_timer_check" skipx zerombr clearpart --all --initlabel @@ -21,7 +21,6 @@ services --disabled=kdump --enabled=sshd # vagrant needs this to copy initial files via scp openssh-clients sudo -selinux-policy-devel wget nfs-utils net-tools @@ -31,12 +30,15 @@ deltarpm rsync dnf-utils redhat-lsb-core -elfutils-libelf-devel -network-scripts -dracut-config-rescue -fprintd-pam -intltool --iwl*-firmware +-microcode_ctl +-plymouth +-plymouth-core-libs +-mcelog +-smartmontools +-usbutils -microcode_ctl %end @@ -46,33 +48,20 @@ echo 'Defaults:vagrant !requiretty' > /etc/sudoers.d/vagrant echo '%vagrant ALL=(ALL) NOPASSWD: ALL' >> /etc/sudoers.d/vagrant chmod 440 /etc/sudoers.d/vagrant +# Configure systemd-networkd to use DHCP on all interfaces +cat > /etc/systemd/network/99-dhcp-all.network << 'EOT' +[Match] +Name=* + +[Network] +DHCP=yes +LLMNR=no +EOT + # Enable hyper-v daemons only if using hyper-v virtualization if [ $(virt-what) == "hyperv" ]; then dnf -y install hyperv-daemons cifs-utils systemctl enable hypervvssd systemctl enable hypervkvpd fi - -# Since we disable consistent network naming, we need to make sure the eth0 -# configuration file is in place so it will come up. -# Delete other network configuration first because RHEL/C7 networking will not -# restart successfully if there are configuration files for devices that do not -# exist. -rm -f /etc/sysconfig/network-scripts/ifcfg-e* -cat > /etc/sysconfig/network-scripts/ifcfg-eth0 << _EOF_ -TYPE=Ethernet -PROXY_METHOD=none - BROWSER_ONLY=no - BOOTPROTO=dhcp - DEFROUTE=yes -IPV4_FAILURE_FATAL=no -IPV6INIT=yes -IPV6_AUTOCONF=yes -IPV6_DEFROUTE=yes - IPV6_FAILURE_FATAL=no - IPV6_ADDR_GEN_MODE=stable-privacy - NAME=eth0 -DEVICE=eth0 -ONBOOT=yes -_EOF_ %end diff --git a/packer_templates/http/rhel/9ks.cfg b/packer_templates/http/rhel/9ks.cfg deleted file mode 100644 index 0581ad088..000000000 --- a/packer_templates/http/rhel/9ks.cfg +++ /dev/null @@ -1,81 +0,0 @@ -lang en_US.UTF-8 -keyboard us -network --bootproto=dhcp --noipv6 --onboot=on --device=eth0 --activate -rootpw --plaintext vagrant -firewall --enabled --ssh -selinux --enforcing -timezone UTC -bootloader --timeout=0 --location=mbr --append="console=tty0 console=ttyS0,115200n8 no_timer_check net.ifnames=0 biosdevname=0" -text -skipx -zerombr -clearpart --all --initlabel -autopart --nohome --nolvm --noboot -firstboot --disabled -reboot --eject -user --name=vagrant --plaintext --password vagrant -services --enabled=sshd - -%addon com_redhat_kdump --disable -%end - -%packages --ignoremissing --excludedocs -@^server-product-environment -# vagrant needs this to copy initial files via scp -openssh-clients -sudo -selinux-policy-devel -wget -nfs-utils -net-tools -tar -bzip2 -deltarpm -rsync -dnf-utils -redhat-lsb-core -elfutils-libelf-devel -network-scripts --dracut-config-rescue --fprintd-pam --intltool --*firmware --microcode_ctl -%end - -%post -# sudo -echo 'Defaults:vagrant !requiretty' > /etc/sudoers.d/vagrant -echo '%vagrant ALL=(ALL) NOPASSWD: ALL' >> /etc/sudoers.d/vagrant -chmod 440 /etc/sudoers.d/vagrant - -# Enable hyper-v daemons only if using hyper-v virtualization -if [ $(virt-what) == "hyperv" ]; then - dnf -y install hyperv-daemons cifs-utils - systemctl enable hypervvssd - systemctl enable hypervkvpd -fi - -# Since we disable consistent network naming, we need to make sure the eth0 -# configuration file is in place so it will come up. -# Delete other network configuration first because RHEL/C7 networking will not -# restart successfully if there are configuration files for devices that do not -# exist. -rm -f /etc/sysconfig/network-scripts/ifcfg-e* -cat > /etc/sysconfig/network-scripts/ifcfg-eth0 << _EOF_ -TYPE=Ethernet -PROXY_METHOD=none - BROWSER_ONLY=no - BOOTPROTO=dhcp - DEFROUTE=yes -IPV4_FAILURE_FATAL=no -IPV6INIT=yes -IPV6_AUTOCONF=yes -IPV6_DEFROUTE=yes - IPV6_FAILURE_FATAL=no - IPV6_ADDR_GEN_MODE=stable-privacy - NAME=eth0 -DEVICE=eth0 -ONBOOT=yes -_EOF_ -%end diff --git a/packer_templates/http/rhel/10ks.cfg b/packer_templates/http/rhel/ks.cfg similarity index 70% rename from packer_templates/http/rhel/10ks.cfg rename to packer_templates/http/rhel/ks.cfg index 08ea88322..ceefa11e3 100644 --- a/packer_templates/http/rhel/10ks.cfg +++ b/packer_templates/http/rhel/ks.cfg @@ -1,12 +1,11 @@ lang en_US.UTF-8 keyboard us -network --bootproto=dhcp --noipv6 --onboot=on --device=eth0 --activate +network --bootproto=dhcp --noipv6 --onboot=on --activate rootpw --plaintext vagrant firewall --enabled --ssh selinux --enforcing timezone UTC bootloader --timeout=0 --location=mbr --append="console=tty0 console=ttyS0,115200n8 no_timer_check" -text skipx zerombr clearpart --all --initlabel @@ -24,7 +23,6 @@ services --enabled=sshd # vagrant needs this to copy initial files via scp openssh-clients sudo -selinux-policy-devel wget nfs-utils net-tools @@ -34,12 +32,18 @@ deltarpm rsync dnf-utils redhat-lsb-core -elfutils-libelf-devel -dracut-config-rescue -fprintd-pam -intltool -*firmware -microcode_ctl +-plymouth +-plymouth-core-libs +-fedora-release-notes +-mcelog +-smartmontools +-usbutils +-microcode_ctl %end %post @@ -48,10 +52,20 @@ echo 'Defaults:vagrant !requiretty' > /etc/sudoers.d/vagrant echo '%vagrant ALL=(ALL) NOPASSWD: ALL' >> /etc/sudoers.d/vagrant chmod 440 /etc/sudoers.d/vagrant +# Configure systemd-networkd to use DHCP on all interfaces +cat > /etc/systemd/network/99-dhcp-all.network << 'EOT' +[Match] +Name=* + +[Network] +DHCP=yes +LLMNR=no +EOT + # Enable hyper-v daemons only if using hyper-v virtualization if [ $(virt-what) == "hyperv" ]; then - dnf -y install hyperv-daemons cifs-utils - systemctl enable hypervvssd - systemctl enable hypervkvpd +dnf -y install hyperv-daemons cifs-utils +systemctl enable hypervvssd +systemctl enable hypervkvpd fi %end diff --git a/packer_templates/pkr-builder.pkr.hcl b/packer_templates/pkr-builder.pkr.hcl index 5f3b02726..30643317a 100644 --- a/packer_templates/pkr-builder.pkr.hcl +++ b/packer_templates/pkr-builder.pkr.hcl @@ -5,7 +5,8 @@ locals { "${path.root}/scripts/_common/sshd.sh", "${path.root}/scripts/_common/guest_tools_virtualbox.sh", "${path.root}/scripts/_common/guest_tools_vmware.sh", - "${path.root}/scripts/_common/guest_tools_parallels.sh" + "${path.root}/scripts/_common/guest_tools_parallels.sh", + "${path.root}/scripts/_common/guest_tools_qemu.sh", ] scripts = var.scripts == null ? ( var.is_windows ? [ @@ -107,7 +108,7 @@ build { } provisioner "shell" { inline = [ - "echo 'After reboot'" + "echo 'Waiting after reboot'" ] pause_after = "10s" except = var.is_windows ? local.source_names : null @@ -123,7 +124,7 @@ build { } provisioner "shell" { inline = [ - "echo 'After reboot'" + "echo 'Waiting after reboot'" ] pause_after = "10s" except = var.is_windows ? local.source_names : null @@ -139,7 +140,7 @@ build { } provisioner "shell" { inline = [ - "echo 'After reboot'" + "echo 'Waiting after reboot'" ] pause_after = "10s" except = var.is_windows ? local.source_names : null @@ -217,9 +218,19 @@ build { # Convert machines to vagrant boxes post-processor "vagrant" { compression_level = 9 - output = "${path.root}/../builds/${var.os_name}-${var.os_version}-${var.os_arch}.{{ .Provider }}.box" + output = "${path.root}/../builds/build_complete/${var.os_name}-${var.os_version}-${var.os_arch}.{{ .Provider }}.box" vagrantfile_template = var.is_windows ? "${path.root}/vagrantfile-windows.template" : ( var.os_name == "freebsd" ? "${path.root}/vagrantfile-freebsd.template" : null ) + except = ["utm-iso.vm"] + } + post-processor "utm-vagrant" { + compression_level = 9 + output = "${path.root}/../builds/build_complete/${var.os_name}-${var.os_version}-${var.os_arch}.{{ .Provider }}.box" + vagrantfile_template = var.is_windows ? "${path.root}/vagrantfile-windows-utm.template" : ( + var.os_name == "freebsd" ? "${path.root}/vagrantfile-freebsd-utm.template" : "${path.root}/vagrantfile-utm.template" + ) + architecture = "${var.os_arch == "x86_64" ? "amd64" : var.os_arch == "aarch64" ? "arm64" : var.os_arch}" + only = ["utm-iso.vm"] } } diff --git a/packer_templates/pkr-plugins.pkr.hcl b/packer_templates/pkr-plugins.pkr.hcl index 5027429be..9588f166e 100644 --- a/packer_templates/pkr-plugins.pkr.hcl +++ b/packer_templates/pkr-plugins.pkr.hcl @@ -1,6 +1,10 @@ packer { required_version = ">= 1.7.0" required_plugins { + external = { + version = "> 0.0.2" + source = "github.com/joomcode/external" + } hyperv = { version = ">= 1.0.3" source = "github.com/hashicorp/hyperv" @@ -13,6 +17,10 @@ packer { version = ">= 1.1.0" source = "github.com/hashicorp/qemu" } + utm = { + version = ">= 0.3.3" + source = "github.com/naveenrajm7/utm" + } vagrant = { version = ">= 1.1.0" source = "github.com/hashicorp/vagrant" diff --git a/packer_templates/pkr-sources.pkr.hcl b/packer_templates/pkr-sources.pkr.hcl index 103c4e8bc..e6356ab3b 100644 --- a/packer_templates/pkr-sources.pkr.hcl +++ b/packer_templates/pkr-sources.pkr.hcl @@ -1,4 +1,11 @@ +data "external-raw" "host_os" { + program = ["uname", "-s"] +} + locals { + # helper locals + build_dir = abspath("${path.root}/../builds/") + host_os = chomp(data.external-raw.host_os.result) # Source block provider specific # hyperv-iso hyperv_enable_dynamic_memory = var.hyperv_enable_dynamic_memory == null ? ( @@ -43,43 +50,79 @@ locals { ) : var.parallels_prlctl # qemu - qemu_binary = var.qemu_binary == null ? "qemu-system-${var.os_arch}" : var.qemu_binary - qemu_display = var.qemu_display == null ? "none" : var.qemu_display + qemu_accelerator = var.qemu_accelerator == null ? ( + local.host_os == "Darwin" ? "hvf" : null + ) : var.qemu_accelerator + qemu_binary = var.qemu_binary == null ? "qemu-system-${var.os_arch}" : var.qemu_binary + qemu_display = var.qemu_display == null ? ( + var.is_windows ? ( + var.os_arch == "aarch64" ? "virtio-ramfb-gl" : "virtio-vga-gl" + ) : ( + local.host_os == "Darwin" ? ( + var.os_arch == "aarch64" ? "cocoa" : "virtio-gpu-pci" + ) : ( + var.os_arch == "aarch64" ? "virtio-ramfb" : "virtio-vga" + ) + ) + ) : var.qemu_display qemu_efi_boot = var.qemu_efi_boot == null ? ( var.os_arch == "aarch64" ? true : false ) : var.qemu_efi_boot qemu_efi_firmware_code = var.qemu_efi_firmware_code == null ? ( - local.qemu_efi_boot ? ( - var.os_arch == "aarch64" ? "/opt/homebrew/share/qemu/edk2-aarch64-code.fd" : null - ) : null + local.host_os == "Darwin" ? "/opt/homebrew/share/qemu/edk2-${var.os_arch}-code.fd" : "/usr/local/share/qemu/edk2-x86_64-code.fd" ) : var.qemu_efi_firmware_code qemu_efi_firmware_vars = var.qemu_efi_firmware_vars == null ? ( - local.qemu_efi_boot ? ( - var.os_arch == "aarch64" ? "/opt/homebrew/share/qemu/edk2-arm-vars.fd" : null + local.host_os == "Darwin" ? ( + var.os_arch == "aarch64" ? "/opt/homebrew/share/qemu/edk2-arm-vars.fd" : "/usr/local/share/qemu/edk2-i386-vars.fd" ) : null ) : var.qemu_efi_firmware_vars - qemu_use_default_display = var.qemu_use_default_display == null ? ( - var.os_arch == "aarch64" ? true : false - ) : var.qemu_use_default_display qemu_machine_type = var.qemu_machine_type == null ? ( var.os_arch == "aarch64" ? "virt" : "q35" ) : var.qemu_machine_type - build-dir = abspath("${path.root}/../builds/") qemuargs = var.qemuargs == null ? ( var.is_windows ? [ ["-device", "qemu-xhci"], ["-device", "virtio-tablet"], - ["-drive", "file=${local.build-dir}/iso/virtio-win.iso,media=cdrom,index=3"], + ["-drive", "file=${local.build_dir}/iso/virtio-win.iso,media=cdrom,index=3"], ["-drive", "file=${abspath(local.iso_target_path)},media=cdrom,index=2"], - ["-drive", "file=${local.build-dir}/build_files/packer-${var.os_name}-${var.os_version}-${var.os_arch}-qemu/{{ .Name }},if=virtio,cache=writeback,discard=ignore,format=${var.qemu_format},index=1"], + ["-drive", "file=${local.build_dir}/build_files/packer-${var.os_name}-${var.os_version}-${var.os_arch}-qemu/{{ .Name }},if=virtio,cache=writeback,discard=ignore,format=${var.qemu_format},index=1"], ["-boot", "order=c,order=d"] ] : ( var.os_arch == "aarch64" ? [ + ["-device", "virtio-gpu-pci"], + ["-device", "qemu-xhci"], + ["-device", "virtio-tablet"], + ["-device", "driver=virtio-keyboard-pci"], + ["-device", "driver=virtio-mouse-pci"], + ["-device", "driver=usb-kbd"], + ["-device", "driver=usb-mouse"], + ["-device", "virtio-serial"], + ["-chardev", "socket,name=org.qemu.guest_agent.0,id=org.qemu.guest_agent,server=on,wait=off"], + ["-device", "virtserialport,chardev=org.qemu.guest_agent,name=org.qemu.guest_agent.0"], ["-boot", "strict=off"], - ] : null + ] : [ + ["-device", "virtio-serial"], + ["-chardev", "socket,name=org.qemu.guest_agent.0,id=org.qemu.guest_agent,server=on,wait=off"], + ["-device", "virtserialport,chardev=org.qemu.guest_agent,name=org.qemu.guest_agent.0"], + ] ) ) : var.qemuargs + # utm-iso + utm_display_hardware_type = var.utm_display_hardware_type == null ? ( + var.os_arch == "aarch64" ? ( + var.is_windows ? "virtio-ramfb-gl" : "virtio-gpu-pci" + ) : ( + var.is_windows ? "virtio-vga-gl" : "virtio-vga" + ) + ) : var.utm_display_hardware_type + utm_hard_drive_interface = var.utm_hard_drive_interface == null ? ( + var.is_windows ? "nvme" : "virtio" + ) : var.utm_hard_drive_interface + utm_guest_additions_mode = var.utm_guest_additions_mode == null ? ( + var.is_windows ? "attach" : "disable" + ) : var.utm_guest_additions_mode + # virtualbox-iso vbox_firmware = var.vbox_firmware == null ? ( var.os_arch == "aarch64" ? "efi" : "bios" @@ -104,6 +147,7 @@ locals { ["modifyvm", "{{.Name}}", "--chipset", "armv8virtual"], ["modifyvm", "{{.Name}}", "--audio-enabled", "off"], ["modifyvm", "{{.Name}}", "--nat-localhostreachable1", "on"], + ["modifyvm", "{{.Name}}", "--cableconnected1", "on"], ["modifyvm", "{{.Name}}", "--usb-xhci", "on"], ["modifyvm", "{{.Name}}", "--graphicscontroller", "qemuramfb"], ["modifyvm", "{{.Name}}", "--mouse", "usb"], @@ -147,9 +191,6 @@ locals { ) : var.vmware_vmx_data # Source block common - default_boot_wait = var.default_boot_wait == null ? ( - var.is_windows ? "60s" : "10s" - ) : var.default_boot_wait cd_files = var.cd_files == null ? ( var.is_windows ? ( var.os_arch == "x86_64" ? ( @@ -166,6 +207,10 @@ locals { communicator = var.communicator == null ? ( var.is_windows ? "winrm" : "ssh" ) : var.communicator + default_boot_command = var.boot_command + default_boot_wait = var.default_boot_wait == null ? ( + var.is_windows ? "60s" : "10s" + ) : var.default_boot_wait disk_size = var.disk_size == null ? ( var.is_windows ? 131072 : 65536 ) : var.disk_size @@ -203,7 +248,7 @@ source "hyperv-iso" "vm" { guest_additions_mode = var.hyperv_guest_additions_mode switch_name = var.hyperv_switch_name # Source block common options - boot_command = var.boot_command + boot_command = var.hyperv_boot_command == null ? local.default_boot_command : var.hyperv_boot_command boot_wait = var.hyperv_boot_wait == null ? local.default_boot_wait : var.hyperv_boot_wait cd_content = var.cd_content cd_files = var.hyperv_generation == 2 ? local.cd_files : null @@ -240,7 +285,7 @@ source "parallels-ipsw" "vm" { prlctl_post = var.parallels_prlctl_post prlctl_version_file = var.parallels_prlctl_version_file # Source block common options - boot_command = var.boot_command + boot_command = var.parallels-ipsw_boot_command == null ? local.default_boot_command : var.parallels_boot_command boot_wait = var.parallels_boot_wait == null ? local.default_boot_wait : var.parallels_boot_wait cpus = var.cpus communicator = local.communicator @@ -265,7 +310,7 @@ source "parallels-iso" "vm" { prlctl = local.parallels_prlctl prlctl_version_file = var.parallels_prlctl_version_file # Source block common options - boot_command = var.boot_command + boot_command = var.parallels-iso_boot_command == null ? local.default_boot_command : var.parallels_boot_command boot_wait = var.parallels_boot_wait == null ? local.default_boot_wait : var.parallels_boot_wait cd_content = var.cd_content cd_files = local.cd_files @@ -293,28 +338,28 @@ source "parallels-iso" "vm" { } source "qemu" "vm" { # QEMU specific options - accelerator = var.qemu_accelerator + accelerator = local.qemu_accelerator cpu_model = var.qemu_cpu_model display = local.qemu_display - use_default_display = local.qemu_use_default_display - # disk_cache = var.qemu_disk_cache - # disk_compression = var.qemu_disk_compression - # disk_detect_zeroes = var.qemu_disk_detect_zeroes - # disk_discard = var.qemu_disk_discard - disk_image = var.qemu_disk_image - # disk_interface = var.qemu_disk_interface - efi_boot = local.qemu_efi_boot - efi_firmware_code = local.qemu_efi_firmware_code - efi_firmware_vars = local.qemu_efi_firmware_vars - efi_drop_efivars = var.qemu_efi_drop_efivars - format = var.qemu_format - machine_type = local.qemu_machine_type - # net_device = var.qemu_net_device - qemu_binary = local.qemu_binary - qemuargs = local.qemuargs - # use_pflash = var.qemu_use_pflash + disk_cache = var.qemu_disk_cache + disk_compression = var.qemu_disk_compression + disk_detect_zeroes = var.qemu_disk_detect_zeroes + disk_discard = var.qemu_disk_discard + disk_image = var.qemu_disk_image + disk_interface = var.qemu_disk_interface + efi_boot = local.qemu_efi_boot + efi_firmware_code = local.qemu_efi_firmware_code + efi_firmware_vars = local.qemu_efi_firmware_vars + efi_drop_efivars = var.qemu_efi_drop_efivars + format = var.qemu_format + machine_type = local.qemu_machine_type + net_device = var.qemu_net_device + qemu_binary = local.qemu_binary + qemuargs = local.qemuargs + use_default_display = var.qemu_use_default_display + use_pflash = var.qemu_use_pflash # Source block common options - boot_command = var.boot_command + boot_command = var.qemu_boot_command == null ? local.default_boot_command : var.qemu_boot_command boot_wait = var.qemu_boot_wait == null ? local.default_boot_wait : var.qemu_boot_wait cd_content = var.cd_content cd_files = local.cd_files @@ -341,6 +386,50 @@ source "qemu" "vm" { winrm_username = var.winrm_username vm_name = local.vm_name } +source "utm-iso" "vm" { + # UTM specific options + boot_nopause = var.utm_boot_nopause + display_hardware_type = local.utm_display_hardware_type + display_nopause = var.utm_display_nopause + export_nopause = var.utm_export_nopause + guest_additions_mode = local.utm_guest_additions_mode + guest_additions_path = var.utm_guest_additions_path + guest_additions_interface = var.utm_guest_additions_interface + guest_additions_url = var.utm_guest_additions_url + guest_additions_sha256 = var.utm_guest_additions_sha256 + hard_drive_interface = local.utm_hard_drive_interface + hypervisor = var.utm_hypervisor + uefi_boot = var.utm_uefi_boot + vm_arch = var.os_arch + vm_backend = var.utm_vm_backend + vm_icon = var.utm_vm_icon + # Source block common options + boot_command = var.utm_boot_command == null ? local.default_boot_command : var.utm_boot_command + boot_wait = var.utm_boot_wait == null ? local.default_boot_wait : var.utm_boot_wait + cd_content = var.cd_content + cd_files = local.cd_files + cd_label = var.cd_label + cpus = var.cpus + communicator = local.communicator + disk_size = local.disk_size + floppy_files = local.floppy_files + http_directory = local.http_directory + iso_checksum = var.iso_checksum + iso_target_path = null # local.iso_target_path # TODO: remove null after https://github.com/naveenrajm7/packer-plugin-utm/issues/25 is fixed + iso_url = var.iso_url + memory = local.memory + output_directory = "${local.output_directory}-utm" + shutdown_command = local.shutdown_command + shutdown_timeout = var.shutdown_timeout + ssh_password = var.ssh_password + ssh_port = var.ssh_port + ssh_timeout = var.ssh_timeout + ssh_username = var.ssh_username + winrm_password = var.winrm_password + winrm_timeout = var.winrm_timeout + winrm_username = var.winrm_username + vm_name = local.vm_name +} source "virtualbox-iso" "vm" { # Virtualbox specific options firmware = local.vbox_firmware @@ -357,7 +446,7 @@ source "virtualbox-iso" "vm" { vboxmanage = local.vboxmanage virtualbox_version_file = var.virtualbox_version_file # Source block common options - boot_command = var.boot_command + boot_command = var.vbox_boot_command == null ? local.default_boot_command : var.vbox_boot_command boot_wait = var.vbox_boot_wait == null ? local.default_boot_wait : var.vbox_boot_wait cd_content = var.cd_content cd_files = local.cd_files @@ -420,7 +509,7 @@ source "vmware-iso" "vm" { vmx_remove_ethernet_interfaces = var.vmware_vmx_remove_ethernet_interfaces vnc_disable_password = var.vmware_vnc_disable_password # Source block common options - boot_command = var.boot_command + boot_command = var.vmware_boot_command == null ? local.default_boot_command : var.vmware_boot_command boot_wait = var.vmware_boot_wait == null ? local.default_boot_wait : var.vmware_boot_wait cd_content = var.cd_content cd_files = local.cd_files # Broken and not creating disks diff --git a/packer_templates/pkr-variables.pkr.hcl b/packer_templates/pkr-variables.pkr.hcl index ba8d27663..9b7e5db8a 100644 --- a/packer_templates/pkr-variables.pkr.hcl +++ b/packer_templates/pkr-variables.pkr.hcl @@ -40,6 +40,7 @@ variable "sources_enabled" { default = [ "source.parallels-iso.vm", "source.qemu.vm", + "source.utm-iso.vm", "source.virtualbox-iso.vm", "source.vmware-iso.vm", ] @@ -48,6 +49,11 @@ variable "sources_enabled" { # Source block provider specific variables # hyperv-iso +variable "hyperv_boot_command" { + type = list(string) + default = null + description = "Commands to pass to gui session to initiate automated install" +} variable "hyperv_boot_wait" { type = string default = null @@ -75,6 +81,11 @@ variable "hyperv_switch_name" { } # parallels-ipsw +variable "parallels-ipsw_boot_command" { + type = list(string) + default = null + description = "Commands to pass to gui session to initiate automated install" +} variable "parallels_host_interfaces" { type = list(string) default = null @@ -107,6 +118,11 @@ variable "http_content" { } # parallels-iso +variable "parallels-iso_boot_command" { + type = list(string) + default = null + description = "Commands to pass to gui session to initiate automated install" +} variable "parallels_boot_wait" { type = string default = null @@ -142,6 +158,11 @@ variable "qemu_binary" { type = string default = null } +variable "qemu_boot_command" { + type = list(string) + default = null + description = "Commands to pass to gui session to initiate automated install" +} variable "qemu_boot_wait" { type = string default = null @@ -172,13 +193,8 @@ variable "qemu_disk_interface" { } variable "qemu_display" { type = string - default = "none" - description = "What QEMU -display option to use. Defaults to gtk, use none to not pass the -display option allowing QEMU to choose the default" -} -variable "qemu_use_default_display" { - type = bool default = null - description = "If true, do not pass a -display option to qemu, allowing it to choose the default" + description = "What QEMU -display option to use. Defaults to gtk, use none to not pass the -display option allowing QEMU to choose the default" } variable "qemu_disk_image" { type = bool @@ -202,7 +218,7 @@ variable "qemu_efi_firmware_vars" { } variable "qemu_efi_drop_efivars" { type = bool - default = false + default = null description = "Drop EFI vars" } variable "qemu_format" { @@ -220,18 +236,101 @@ variable "qemu_machine_type" { } variable "qemu_net_device" { type = string - default = "virtio-net" + default = "virtio-net-pci" } variable "qemuargs" { type = list(list(string)) default = null } +variable "qemu_use_default_display" { + type = bool + default = null +} variable "qemu_use_pflash" { type = bool - default = false + default = true +} + +# utm-iso +variable "utm_boot_command" { + type = list(string) + default = null + description = "Commands to pass to gui session to initiate automated install" +} +variable "utm_boot_nopause" { + type = bool + default = true + description = "If true, the build process will not pause to confirm successful boot." +} +variable "utm_boot_wait" { + type = string + default = null +} +variable "utm_display_hardware_type" { + type = string + default = null +} +variable "utm_display_nopause" { + type = bool + default = true + description = "If true, the build process will not pause to add display." +} +variable "utm_export_nopause" { + type = bool + default = true + description = "If true, the build process will not pause to allow pre-export steps." +} +variable "utm_guest_additions_mode" { + type = string + default = null +} +variable "utm_guest_additions_path" { + type = string + default = null +} +variable "utm_guest_additions_interface" { + type = string + default = null +} +variable "utm_guest_additions_url" { + type = string + default = null +} +variable "utm_guest_additions_sha256" { + type = string + default = "65b6a69b392ee01dd314c10f3dad9ebbf9c4160be43f5f0dd6bb715944d9095b" +} +variable "utm_hard_drive_interface" { + type = string + default = null +} +variable "utm_hypervisor" { + type = bool + default = true +} +variable "utm_uefi_boot" { + type = bool + default = true +} +variable "utm_vm_arch" { + type = string + default = null +} +variable "utm_vm_backend" { + type = string + default = null +} +variable "utm_vm_icon" { + type = string + default = null } # virtualbox-iso +variable "vbox_boot_command" { + type = list(string) + default = null + description = "Commands to pass to gui session to initiate automated install" +} variable "vbox_boot_wait" { type = string default = null @@ -305,6 +404,11 @@ variable "vbox_checksum" { } # vmware-iso +variable "vmware_boot_command" { + type = list(string) + default = null + description = "Commands to pass to gui session to initiate automated install" +} variable "vmware_boot_wait" { type = string default = null diff --git a/packer_templates/scripts/_common/build_tools.sh b/packer_templates/scripts/_common/build_tools.sh index 38bc53120..04ff5b135 100644 --- a/packer_templates/scripts/_common/build_tools.sh +++ b/packer_templates/scripts/_common/build_tools.sh @@ -1,6 +1,8 @@ #!/bin/sh -eux OS_NAME=$(uname -s) +major_version="$(sed 's/^.\+ release \([.0-9]\+\).*/\1/' /etc/redhat-release | awk -F. '{print $1}')" +distro="$(rpm -qf --queryformat '%{NAME}' /etc/redhat-release | cut -f 1 -d '-')" if [ "$OS_NAME" = "FreeBSD" ] || [ "$OS_NAME" = "Darwin" ]; then echo "Nothing to do for $OS_NAME" @@ -11,39 +13,64 @@ echo "Installing build tools for $PACKER_BUILDER_TYPE" case "$PACKER_BUILDER_TYPE" in parallels-iso|parallels-pvm) - if ! ([ "$(uname -m)" = "aarch64" ] && [ -f /etc/os-release ] && (grep -qi 'opensuse' /etc/os-release || grep -qi 'sles' /etc/os-release)); then - if command -v dnf >/dev/null 2>&1; then - if [ -f /etc/fedora-release ]; then - dnf -y install fuse-libs kernel-headers kernel-devel elfutils-libelf-devel gcc make perl - else - dnf install -y --skip-broken checkpolicy selinux-policy-devel gcc kernel-devel kernel-headers make kernel-uek-devel + if command -v dnf >/dev/null 2>&1; then + if [ -f /etc/fedora-release ]; then + dnf -y install fuse-libs kernel-headers kernel-devel elfutils-libelf-devel gcc make perl + else + dnf install -y --skip-broken checkpolicy selinux-policy-devel gcc kernel-devel kernel-headers make kernel-uek-devel + if [ "$major_version" -eq 10 ] && [ "$distro" = 'oraclelinux' ] && [ "$(uname -m)" = "aarch64" ]; then + dnf -y install -- *epel-release* + dnf -y install gcc-toolset-14 gcc-toolset-14-runtime gcc-toolset-14-gcc-c++ + mv /usr/bin/gcc /usr/bin/gcc.old + ln -s /opt/rh/gcc-toolset-14/root/usr/bin/gcc /usr/bin/gcc + dnf -y remove -- *epel-release* fi fi - else - echo "Skipping Parallels Tools installation on aarch64 architecture for opensuse and derivatives" fi ;; virtualbox-iso|virtualbox-ovf) - if ! ([ "$(uname -m)" = "aarch64" ] && [ -f /etc/os-release ] && (grep -qi 'opensuse' /etc/os-release || grep -qi 'sles' /etc/os-release)); then - echo "installing deps necessary to compile kernel modules" - # We install things like kernel-headers here vs. kickstart files so we make sure we install them for the updated kernel not the stock kernel - if [ -f "/bin/dnf" ]; then - dnf install -y --skip-broken perl cpp gcc make bzip2 tar kernel-headers kernel-devel kernel-uek-devel || true # not all these packages are on every system - elif [ -f "/usr/bin/apt-get" ]; then - apt-get install -y build-essential dkms bzip2 tar linux-headers-"$(uname -r)" - elif [ -f "/usr/bin/zypper" ]; then - zypper install -y perl cpp gcc make bzip2 tar kernel-default-devel - fi - else - echo "Skipping Virtualbox guest additions installation on aarch64 architecture for opensuse and derivatives" + echo "installing deps necessary to compile kernel modules" + # We install things like kernel-headers here vs. kickstart files so we make sure we install them for the updated kernel not the stock kernel + if [ -f "/bin/dnf" ]; then + dnf install -y --skip-broken perl cpp gcc make bzip2 tar kernel-headers kernel-devel kernel-uek-devel || true # not all these packages are on every system + elif [ -f "/usr/bin/apt-get" ]; then + apt-get install -y build-essential dkms bzip2 tar linux-headers-"$(uname -r)" + elif [ -f "/usr/bin/zypper" ]; then + zypper install -y perl cpp gcc make bzip2 tar kernel-default-devel fi ;; +hyperv-iso) + echo "nothing to do for hyperv-iso" + ;; +utm-iso|qemu) + echo "nothing to do for utm or qemu" + ;; *) echo "Unknown Packer Builder Type >>$PACKER_BUILDER_TYPE<< selected." exit 0 ;; esac -echo "build tools installed rebooting" -shutdown -r now -sleep 60 +REBOOT_NEEDED=false +# Check for the /var/run/reboot-required file (common on Debian/Ubuntu) +if [ -f /var/run/reboot-required ]; then + REBOOT_NEEDED=true +# Check for the needs-restarting command (common on RHEL based systems) +elif command -v needs-restarting > /dev/null 2>&1; then + # needs-restarting -r: indicates a full reboot is needed (exit code 1) + # needs-restarting -s: indicates a service restart is needed (exit code 1) + if needs-restarting -r > /dev/null 2>&1 || needs-restarting -s > /dev/null 2>&1; then + REBOOT_NEEDED=true + fi +else + echo "Unable to determine if a reboot is needed defaulting to reboot anyway" + REBOOT_NEEDED=true +fi + +if [ "$REBOOT_NEEDED" = true ]; then + echo "pkgs installed needing reboot" + shutdown -r now + sleep 60 +else + echo "no pkgs installed needing reboot" +fi diff --git a/packer_templates/scripts/_common/guest_tools_parallels.sh b/packer_templates/scripts/_common/guest_tools_parallels.sh index 1cff6c06a..ab5600ef0 100644 --- a/packer_templates/scripts/_common/guest_tools_parallels.sh +++ b/packer_templates/scripts/_common/guest_tools_parallels.sh @@ -12,39 +12,68 @@ case "$PACKER_BUILDER_TYPE" in parallels-iso|parallels-pvm|parallels-ipsw) echo "Installing Parallels Tools..." if [ "$OS_NAME" = "FreeBSD" ]; then + pkg update pkg install -y parallels-tools elif [ "$OS_NAME" = "Darwin" ]; then installer -pkg /Volumes/Parallels\ Tools/Install.app/Contents/Resources/Install.mpkg -target / # This usually works but gives a failed to eject error hdiutil detach /Volumes/Parallels\ Tools || echo "exit code $? is suppressed" - elif ! ([ "$(uname -m)" = "aarch64" ] && [ -f /etc/os-release ] && (grep -qi 'opensuse' /etc/os-release || grep -qi 'sles' /etc/os-release)); then - mkdir -p /tmp/parallels; - if [ "$(uname -m)" = "aarch64" ] ; then - mount -o loop "$HOME_DIR"/prl-tools-lin-arm.iso /tmp/parallels; + else + # Check kernel version + KERNEL_VERSION=$(uname -r | cut -d. -f1,2) + KERNEL_MAJOR=$(echo "$KERNEL_VERSION" | cut -d. -f1) + KERNEL_MINOR=$(echo "$KERNEL_VERSION" | cut -d. -f2) + if [ "$KERNEL_MAJOR" -lt 5 ] || { [ "$KERNEL_MAJOR" -eq 5 ] && [ "$KERNEL_MINOR" -lt 10 ]; }; then + echo "Skipping Parallels Tools installation: kernel version $KERNEL_VERSION is below 5.10" else - mount -o loop "$HOME_DIR"/prl-tools-lin.iso /tmp/parallels; + mkdir -p /tmp/parallels; + if [ "$(uname -m)" = "aarch64" ] ; then + mount -o loop "$HOME_DIR"/prl-tools-lin-arm.iso /tmp/parallels; + else + mount -o loop "$HOME_DIR"/prl-tools-lin.iso /tmp/parallels; + fi + VER="$(cat /tmp/parallels/version)"; + echo "Parallels Tools Version: $VER"; + /tmp/parallels/install --install-unattended-with-deps || ( + code="$?"; + echo "Parallels tools installation exited $code, attempting to output /var/log/parallels-tools-install.log"; + cat /var/log/parallels-tools-install.log; + exit $code + ); + umount /tmp/parallels; + rm -rf /tmp/parallels; + rm -f "$HOME_DIR"/*.iso; + echo "removing kernel dev packages and compilers we no longer need" + if command -v dnf >/dev/null 2>&1; then + dnf remove -y install checkpolicy selinux-policy-devel gcc kernel-devel kernel-headers make + fi + shutdown -r now + sleep 60 fi - VER="$(cat /tmp/parallels/version)"; - echo "Parallels Tools Version: $VER"; - /tmp/parallels/install --install-unattended-with-deps || ( - code="$?"; - echo "Parallels tools installation exited $code, attempting to output /var/log/parallels-tools-install.log"; - cat /var/log/parallels-tools-install.log; - exit $code - ); - umount /tmp/parallels; - rm -rf /tmp/parallels; - rm -f "$HOME_DIR"/*.iso; - echo "removing kernel dev packages and compilers we no longer need" - if command -v dnf >/dev/null 2>&1; then - dnf remove -y install checkpolicy selinux-policy-devel gcc kernel-devel kernel-headers make + fi + + REBOOT_NEEDED=false + # Check for the /var/run/reboot-required file (common on Debian/Ubuntu) + if [ -f /var/run/reboot-required ]; then + REBOOT_NEEDED=true + # Check for the needs-restarting command (common on RHEL based systems) + elif command -v needs-restarting > /dev/null 2>&1; then + # needs-restarting -r: indicates a full reboot is needed (exit code 1) + # needs-restarting -s: indicates a service restart is needed (exit code 1) + if needs-restarting -r > /dev/null 2>&1 || needs-restarting -s > /dev/null 2>&1; then + REBOOT_NEEDED=true fi + else + echo "Unable to determine if a reboot is needed defaulting to reboot anyway" + REBOOT_NEEDED=true + fi + + if [ "$REBOOT_NEEDED" = true ]; then + echo "pkgs installed needing reboot" shutdown -r now sleep 60 else - echo "Skipping Parallels Tools installation on aarch64 architecture for opensuse and derivatives" + echo "no pkgs installed needing reboot" fi - shutdown -r now - sleep 60 ;; esac diff --git a/packer_templates/scripts/_common/guest_tools_qemu.sh b/packer_templates/scripts/_common/guest_tools_qemu.sh new file mode 100644 index 000000000..13e95200d --- /dev/null +++ b/packer_templates/scripts/_common/guest_tools_qemu.sh @@ -0,0 +1,112 @@ +#!/bin/bash -eux + +# set a default HOME_DIR environment variable if not set +OS_NAME=$(uname -s) +if [ "$OS_NAME" = "Darwin" ]; then + HOME_DIR="/Users/vagrant" +else + HOME_DIR="${HOME_DIR:-/home/vagrant}" +fi + +case "$PACKER_BUILDER_TYPE" in +utm-iso) + echo "installing pkgs necessary for UTM guest support" + # We install things like spice-vdagent (clipboard sharing and dynamic display resolution ) + # QEMU Agent (time syncing and scripting are supported by the QEMU agent.) + # SPICE WebDAV (QEMU directory sharing) + if [ "$OS_NAME" = "FreeBSD" ]; then + pkg update + pkg install -y qemu-guest-agent + cat >> /etc/rc.conf <<EOT +qemu_guest_agent_enable="YES" +EOT + service qemu-guest-agent start + return + elif [ -f "/bin/dnf" ]; then + dnf install -y --skip-broken spice-vdagent qemu-guest-agent spice-webdavd + sed -i 's/^BLACKLIST_RPC=/# BLACKLIST_RPC=/' /etc/sysconfig/qemu-ga # RHEL 8 instances + sed -i 's/^FILTER_RPC_ARGS=/# FILTER_RPC_ARGS=/' /etc/sysconfig/qemu-ga # RHEL 9+ instances + systemctl enable spice-vdagentd + systemctl start spice-vdagentd + systemctl enable spice-webdavd || true + systemctl start spice-webdavd || true + elif [ -f "/usr/bin/apt-get" ]; then + apt-get update + apt-get install -y spice-vdagent qemu-guest-agent spice-webdavd + systemctl enable spice-vdagentd + systemctl start spice-vdagentd + systemctl enable spice-webdavd || true + systemctl start spice-webdavd || true + elif [ -f "/usr/bin/zypper" ]; then + zypper install -y qemu-guest-agent + fi + systemctl enable qemu-guest-agent + systemctl start qemu-guest-agent + REBOOT_NEEDED=false + if [ -f /var/run/reboot-required ]; then + REBOOT_NEEDED=true + elif command -v needs-restarting > /dev/null 2>&1; then + if needs-restarting -r > /dev/null 2>&1 || needs-restarting -s > /dev/null 2>&1; then + REBOOT_NEEDED=true + fi + else + echo "Unable to determine if a reboot is needed defaulting to reboot anyway" + REBOOT_NEEDED=true + fi + + if [ "$REBOOT_NEEDED" = true ]; then + echo "pkgs installed needing reboot" + shutdown -r now + sleep 60 + else + echo "no pkgs installed needing reboot" + fi + ;; +qemu) + echo "installing pkgs necessary for QEMU guest support" + if [ "$OS_NAME" = "FreeBSD" ]; then + pkg update + pkg install -y qemu-guest-agent + cat >> /etc/rc.conf <<EOT +qemu_guest_agent_enable="YES" +EOT + service qemu-guest-agent start + return + elif [ -f "/bin/dnf" ]; then + dnf install -y --skip-broken qemu-guest-agent + sed -i 's/^BLACKLIST_RPC=/# BLACKLIST_RPC=/' /etc/sysconfig/qemu-ga # RHEL 8 instances + sed -i 's/^FILTER_RPC_ARGS=/# FILTER_RPC_ARGS=/' /etc/sysconfig/qemu-ga # RHEL 9+ instances + elif [ -f "/usr/bin/apt-get" ]; then + apt-get update + apt-get install -y qemu-guest-agent + elif [ -f "/usr/bin/zypper" ]; then + zypper install -y qemu-guest-agent + fi + systemctl enable qemu-guest-agent + systemctl start qemu-guest-agent + + REBOOT_NEEDED=false + # Check for the /var/run/reboot-required file (common on Debian/Ubuntu) + if [ -f /var/run/reboot-required ]; then + REBOOT_NEEDED=true + # Check for the needs-restarting command (common on RHEL based systems) + elif command -v needs-restarting > /dev/null 2>&1; then + # needs-restarting -r: indicates a full reboot is needed (exit code 1) + # needs-restarting -s: indicates a service restart is needed (exit code 1) + if needs-restarting -r > /dev/null 2>&1 || needs-restarting -s > /dev/null 2>&1; then + REBOOT_NEEDED=true + fi + else + echo "Unable to determine if a reboot is needed defaulting to reboot anyway" + REBOOT_NEEDED=true + fi + + if [ "$REBOOT_NEEDED" = true ]; then + echo "pkgs installed needing reboot" + shutdown -r now + sleep 60 + else + echo "no pkgs installed needing reboot" + fi + ;; +esac diff --git a/packer_templates/scripts/_common/guest_tools_virtualbox.sh b/packer_templates/scripts/_common/guest_tools_virtualbox.sh index 41e703b78..c758b38c3 100644 --- a/packer_templates/scripts/_common/guest_tools_virtualbox.sh +++ b/packer_templates/scripts/_common/guest_tools_virtualbox.sh @@ -40,7 +40,7 @@ virtualbox-iso|virtualbox-ovf) elif [ "$OS_NAME" = "Darwin" ]; then echo "Nothing to do for $OS_NAME" exit 0 - elif ! ([ "$(uname -m)" = "aarch64" ] && [ -f /etc/os-release ] && (grep -qi 'opensuse' /etc/os-release || grep -qi 'sles' /etc/os-release)); then + else ARCHITECTURE="$(uname -m)"; VER="$(cat "$HOME_DIR"/.vbox_version)"; ISO="VBoxGuestAdditions_$VER.iso"; @@ -87,10 +87,27 @@ virtualbox-iso|virtualbox-ovf) echo "removing leftover logs" rm -rf /var/log/vboxadd* + fi + + REBOOT_NEEDED=false + # Check for the /var/run/reboot-required file (common on Debian/Ubuntu) + if [ -f /var/run/reboot-required ]; then + REBOOT_NEEDED=true + # Check for the needs-restarting command (common on RHEL based systems) + elif command -v needs-restarting > /dev/null 2>&1; then + # needs-restarting -r: indicates a full reboot is needed (exit code 1) + # needs-restarting -s: indicates a service restart is needed (exit code 1) + if needs-restarting -r > /dev/null 2>&1 || needs-restarting -s > /dev/null 2>&1; then + REBOOT_NEEDED=true + fi + fi + + if [ "$REBOOT_NEEDED" = true ]; then + echo "pkgs installed needing reboot" + shutdown -r now + sleep 60 else - echo "Skipping Virtualbox guest additions installation on aarch64 architecture for opensuse and derivatives" + echo "no pkgs installed needing reboot" fi - shutdown -r now - sleep 60 ;; esac diff --git a/packer_templates/scripts/_common/guest_tools_vmware.sh b/packer_templates/scripts/_common/guest_tools_vmware.sh index a90784f68..cd90c250f 100644 --- a/packer_templates/scripts/_common/guest_tools_vmware.sh +++ b/packer_templates/scripts/_common/guest_tools_vmware.sh @@ -11,6 +11,7 @@ fi case "$PACKER_BUILDER_TYPE" in vmware-iso|vmware-vmx) if [ "$OS_NAME" = "FreeBSD" ]; then + pkg update pkg install -y open-vm-tools-nox11 # for shared folder echo 'fuse_load="YES"' >>/boot/loader.conf @@ -50,13 +51,34 @@ vmware-iso|vmware-vmx) systemctl enable open-vm-tools systemctl start open-vm-tools elif [ -f "/usr/bin/zypper" ]; then - zypper install -y open-vm-tools insserv-compat + zypper install -y open-vm-tools mkdir /mnt/hgfs systemctl enable vmtoolsd systemctl start vmtoolsd fi - echo "platform specific vmware.sh executed" - shutdown -r now - sleep 60 + + REBOOT_NEEDED=false + # Check for the /var/run/reboot-required file (common on Debian/Ubuntu) + if [ -f /var/run/reboot-required ]; then + REBOOT_NEEDED=true + # Check for the needs-restarting command (common on RHEL based systems) + elif command -v needs-restarting > /dev/null 2>&1; then + # needs-restarting -r: indicates a full reboot is needed (exit code 1) + # needs-restarting -s: indicates a service restart is needed (exit code 1) + if needs-restarting -r > /dev/null 2>&1 || needs-restarting -s > /dev/null 2>&1; then + REBOOT_NEEDED=true + fi + else + echo "Unable to determine if a reboot is needed defaulting to reboot anyway" + REBOOT_NEEDED=true + fi + + if [ "$REBOOT_NEEDED" = true ]; then + echo "pkgs installed needing reboot" + shutdown -r now + sleep 60 + else + echo "no pkgs installed needing reboot" + fi ;; esac diff --git a/packer_templates/scripts/_common/minimize.sh b/packer_templates/scripts/_common/minimize.sh index 7d8628f9d..e704a8a44 100644 --- a/packer_templates/scripts/_common/minimize.sh +++ b/packer_templates/scripts/_common/minimize.sh @@ -1,7 +1,10 @@ #!/bin/sh -eux case "$PACKER_BUILDER_TYPE" in - qemu) exit 0 ;; +utm-iso|qemu) + echo "Nothing to do for utm or qemu" + exit 0 + ;; esac OS_NAME=$(uname -s) @@ -70,7 +73,8 @@ else swappart="$(readlink -f /dev/disk/by-uuid/"$swapuuid")"; /sbin/swapoff "$swappart" || true; dd if=/dev/zero of="$swappart" bs=1M || echo "dd exit code $? is suppressed"; - /sbin/mkswap -U "$swapuuid" "$swappart"; + chmod 0600 "$swappart" || true; + /sbin/mkswap -U "$swapuuid" "$swappart" || echo "mkswap exit code $? is suppressed"; fi sync; diff --git a/packer_templates/scripts/_common/sshd.sh b/packer_templates/scripts/_common/sshd.sh index 6f9938519..a2d764282 100644 --- a/packer_templates/scripts/_common/sshd.sh +++ b/packer_templates/scripts/_common/sshd.sh @@ -7,7 +7,14 @@ if [ "$OS_NAME" = "Darwin" ]; then exit 0 fi -SSHD_CONFIG="/etc/ssh/sshd_config" +if [ -f "/etc/ssh/sshd_config" ]; then + SSHD_CONFIG="/etc/ssh/sshd_config" +elif [ -f "/usr/etc/ssh/sshd_config" ]; then + SSHD_CONFIG="/usr/etc/ssh/sshd_config" +else + echo "Unable to find sshd_config" + exit 1 +fi # ensure that there is a trailing newline before attempting to concatenate # shellcheck disable=SC1003 @@ -15,14 +22,14 @@ sed -i -e '$a\' "$SSHD_CONFIG" USEDNS="UseDNS no" if grep -q -E "^[[:space:]]*UseDNS" "$SSHD_CONFIG"; then - sed -i "s/^\s*UseDNS.*/${USEDNS}/" "$SSHD_CONFIG" + sed -i "s/^\s*UseDNS.*/${USEDNS}/" "$SSHD_CONFIG" else - echo "$USEDNS" >>"$SSHD_CONFIG" + echo "$USEDNS" >>"$SSHD_CONFIG" fi GSSAPI="GSSAPIAuthentication no" if grep -q -E "^[[:space:]]*GSSAPIAuthentication" "$SSHD_CONFIG"; then - sed -i "s/^\s*GSSAPIAuthentication.*/${GSSAPI}/" "$SSHD_CONFIG" + sed -i "s/^\s*GSSAPIAuthentication.*/${GSSAPI}/" "$SSHD_CONFIG" else - echo "$GSSAPI" >>"$SSHD_CONFIG" + echo "$GSSAPI" >>"$SSHD_CONFIG" fi diff --git a/packer_templates/scripts/_common/update_packages.sh b/packer_templates/scripts/_common/update_packages.sh index bdaa94f3b..f236045d3 100644 --- a/packer_templates/scripts/_common/update_packages.sh +++ b/packer_templates/scripts/_common/update_packages.sh @@ -58,12 +58,20 @@ EOF elif [ -f "/usr/bin/zypper" ]; then version=$(grep VERSION= /etc/os-release | cut -f2 -d\" | cut -f1 -d\ ) - zypper removerepo "openSUSE-${version}-0" + # Compare version to determine repository setup + if [ "$(printf '%s\n' "16.0" "$version" | sort -V | head -n1)" = "16.0" ] && [ "$version" != "16.0" ]; then + # Version is less than 16.0 + zypper removerepo "openSUSE-${version}-0" - zypper ar http://download.opensuse.org/distribution/leap/"${version}"/repo/oss/ openSUSE-Leap-"${version}"-Oss - zypper ar http://download.opensuse.org/distribution/leap/"${version}"/repo/non-oss/ openSUSE-Leap-"${version}"-Non-Oss - zypper ar http://download.opensuse.org/update/leap/"${version}"/oss/ openSUSE-Leap-"${version}"-Update - zypper ar http://download.opensuse.org/update/leap/"${version}"/non-oss/ openSUSE-Leap-"${version}"-Update-Non-Oss + zypper ar http://download.opensuse.org/distribution/leap/"${version}"/repo/oss/ openSUSE-Leap-"${version}"-Oss + zypper ar http://download.opensuse.org/distribution/leap/"${version}"/repo/non-oss/ openSUSE-Leap-"${version}"-Non-Oss + zypper ar http://download.opensuse.org/update/leap/"${version}"/oss/ openSUSE-Leap-"${version}"-Update + zypper ar http://download.opensuse.org/update/leap/"${version}"/non-oss/ openSUSE-Leap-"${version}"-Update-Non-Oss + else + # Version is 16.0 or greater + zypper ar http://download.opensuse.org/distribution/leap/"${version}"/repo/oss/ openSUSE-Leap-"${version}"-Oss + zypper ar http://download.opensuse.org/distribution/leap/"${version}"/repo/non-oss/ openSUSE-Leap-"${version}"-Non-Oss + fi zypper refresh zypper update -y @@ -81,7 +89,8 @@ elif [ "$OS_NAME" = "FreeBSD" ]; then rm -f /etc/pkg/FreeBSD.conf.bak fi - env ASSUME_ALWAYS_YES=true pkg update; + env ASSUME_ALWAYS_YES=true pkg update + pkg upgrade elif [ "$OS_NAME" = "Darwin" ]; then echo "Downloading and installing system updates..." sudo softwareupdate --agree-to-license -i -r -R --stdinpass vagrant @@ -90,6 +99,26 @@ else exit 1 fi -echo "updates installed rebooting" -shutdown -r now -sleep 60 +REBOOT_NEEDED=false +# Check for the /var/run/reboot-required file (common on Debian/Ubuntu) +if [ -f /var/run/reboot-required ]; then + REBOOT_NEEDED=true +# Check for the needs-restarting command (common on RHEL based systems) +elif command -v needs-restarting > /dev/null 2>&1; then + # needs-restarting -r: indicates a full reboot is needed (exit code 1) + # needs-restarting -s: indicates a service restart is needed (exit code 1) + if needs-restarting -r > /dev/null 2>&1 || needs-restarting -s > /dev/null 2>&1; then + REBOOT_NEEDED=true + fi +else + echo "Unable to determine if a reboot is needed defaulting to reboot anyway" + REBOOT_NEEDED=true +fi + +if [ "$REBOOT_NEEDED" = true ]; then + echo "pkgs installed needing reboot" + shutdown -r now + sleep 60 +else + echo "no pkgs installed needing reboot" +fi diff --git a/packer_templates/scripts/windows/provision.ps1 b/packer_templates/scripts/windows/provision.ps1 index 257de3159..90041104b 100644 --- a/packer_templates/scripts/windows/provision.ps1 +++ b/packer_templates/scripts/windows/provision.ps1 @@ -185,8 +185,8 @@ switch ($env:PACKER_BUILDER_TYPE) { } break } - "qemu" { - # Actions for QEMU builder + {$_ -in "utm-iso", "qemu"} { + # Actions for UTM and QEMU builder foreach( $vol in $volList ) { $letter = $vol.DriveLetter $exe = "${letter}:\virtio-win-guest-tools.exe" diff --git a/packer_templates/vagrantfile-freebsd-utm.template b/packer_templates/vagrantfile-freebsd-utm.template new file mode 100644 index 000000000..de9420936 --- /dev/null +++ b/packer_templates/vagrantfile-freebsd-utm.template @@ -0,0 +1,15 @@ +# -*- mode: ruby -*- +# vi: set ft=ruby : + +Vagrant.configure(2) do |config| + config.vagrant.plugins = "vagrant_utm" + config.ssh.shell = "sh" + + # Disable the base shared folder, Guest Tools supporting this feature are + # unavailable for all providers. + config.vm.synced_folder ".", "/vagrant", disabled: true + + config.vm.provider "utm" do |utm| + utm.check_guest_additions = false + end +end diff --git a/packer_templates/vagrantfile-utm.template b/packer_templates/vagrantfile-utm.template new file mode 100644 index 000000000..bf7d51501 --- /dev/null +++ b/packer_templates/vagrantfile-utm.template @@ -0,0 +1,15 @@ +# -*- mode: ruby -*- +# vi: set ft=ruby : + +Vagrant.configure(2) do |config| + config.vagrant.plugins = "vagrant_utm" + + # Disable the base shared folder + config.vm.synced_folder ".", "/vagrant", disabled: true + + # config.vm.allowed_synced_folder_types = [:rsync] + + config.vm.provider :utm do |utm| + utm.directory_share_mode = "webDAV" + end +end diff --git a/packer_templates/vagrantfile-windows-utm.template b/packer_templates/vagrantfile-windows-utm.template new file mode 100644 index 000000000..972fff25f --- /dev/null +++ b/packer_templates/vagrantfile-windows-utm.template @@ -0,0 +1,17 @@ +# -*- mode: ruby -*- +# vi: set ft=ruby : + +Vagrant.configure(2) do |config| + config.vagrant.plugins = "vagrant_utm" + config.vm.guest = :windows + config.vm.communicator = "winrm" + config.vm.boot_timeout = 300 + config.vm.network :forwarded_port, guest: 3389, host: 3389, id: 'rdp', auto_correct: true + config.vm.network :forwarded_port, guest: 5985, host: 5985, id: "winrm", auto_correct: true + + config.vm.provider "utm" do |utm| + utm.cpus = 2 + utm.memory = 4096 + utm.check_guest_additions = false + end +end From 635483b1eb573fe414320dfcd6148215f95c0fb5 Mon Sep 17 00:00:00 2001 From: Corey Hemminger <hemminger@hotmail.com> Date: Mon, 27 Oct 2025 11:03:57 -0500 Subject: [PATCH 1593/1622] udpate changelog build table (#1640) Signed-off-by: Corey Hemminger <hemminger@hotmail.com> --- CHANGELOG.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e037244a5..a289a9dee 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,7 +5,7 @@ *__Note:__ Markdown table generated at <https://www.tablesgenerator.com/markdown_tables#> -## Builds for version 202508.03.0 +## Builds for version 202510.26.0 | os | virtualbox<br>x86_64 | virtualbox<br>aarch64 | vmware<br>x86_64 | vmware<br>aarch64 | parallels<br>x86_64 | parallels<br>aarch64 | utm<br>x86_64 | utm<br>aarch64 | qemu<br>x86_64 | qemu<br>aarch64 | hyperv<br>x86_64 | |:---:|:---:|:---:|:---:|:---:|:---:|:---:|:---:|:---:|:---:|:---:|:---:| @@ -13,7 +13,7 @@ Markdown table generated at <https://www.tablesgenerator.com/markdown_tables#> | almalinux-9 | x | x | x | x | x | x | x | x | | | | | almalinux-10 | x | x | x | x | x | x | x | x | | | | | amazonlinux-2023 | x | | | | | | | | | | | -| centos-stream-9 | x | x | x | x | x | x | | | | | | +| centos-stream-9 | x | x | x | x | x | x | x | x | | | | | centos-stream-10 | x | x | x | x | | x | x | x | | | | | debian-12 | x | x | x | x | x | x | | | | | | | debian-13 | x | x | x | x | x | x | | | | | | @@ -24,7 +24,7 @@ Markdown table generated at <https://www.tablesgenerator.com/markdown_tables#> | macos-14 | na | na | na | na | na | x | | | na | na | na | | macos-15 | na | na | na | na | na | x | | | na | na | na | | opensuse-leap-15 | x | x | x | x | x | x | | | | | | -| opensuse-leap-16 | x | x | x | x | x | x | | x | | | | +| opensuse-leap-16 | x | x | x | x | x | x | x | x | | | | | oraclelinux-8 | x | na | x | na | x | na | x | na | | na | | | oraclelinux-9 | x | x | x | x | x | x | x | x | | | | | oraclelinux-10 | x | | x | | x | | x | | | | | From b5763108d7cbb65ea216f6aee7c42b2fdf08804a Mon Sep 17 00:00:00 2001 From: Corey Hemminger <hemminger@hotmail.com> Date: Mon, 27 Oct 2025 11:26:40 -0500 Subject: [PATCH 1594/1622] fix workflow artifact upload location Signed-off-by: Corey Hemminger <hemminger@hotmail.com> --- .github/workflows/pkr-bld-amazonlinux-arm64.yml | 4 ++-- .github/workflows/pkr-bld-amazonlinux-x64.yml | 4 ++-- .github/workflows/pkr-bld-hyperv-x64.yml | 4 ++-- .github/workflows/pkr-bld-parallels-arm64.yml | 4 ++-- .github/workflows/pkr-bld-parallels-x64.yml | 4 ++-- .github/workflows/pkr-bld-qemu-arm64.yml | 4 ++-- .github/workflows/pkr-bld-qemu-x64.yml | 4 ++-- .github/workflows/pkr-bld-utm-arm64.yml | 4 ++-- .github/workflows/pkr-bld-utm-x64.yml | 4 ++-- .github/workflows/pkr-bld-virtualbox-arm64.yml | 4 ++-- .github/workflows/pkr-bld-virtualbox-x64.yml | 4 ++-- .github/workflows/pkr-bld-vmware-arm64.yml | 4 ++-- .github/workflows/pkr-bld-vmware-x64.yml | 4 ++-- .github/workflows/test-pkr-bld-parallels.yml | 4 ++-- 14 files changed, 28 insertions(+), 28 deletions(-) diff --git a/.github/workflows/pkr-bld-amazonlinux-arm64.yml b/.github/workflows/pkr-bld-amazonlinux-arm64.yml index 7d7d38a69..a8753cb16 100644 --- a/.github/workflows/pkr-bld-amazonlinux-arm64.yml +++ b/.github/workflows/pkr-bld-amazonlinux-arm64.yml @@ -51,8 +51,8 @@ jobs: with: name: "${{ matrix.os }}-virtualbox-aarch64" path: | - builds/build_complete/*.box - builds/build_complete/*.json + builds/testing_passed/aarch64/*.box + builds/testing_passed/aarch64/*.json overwrite: true retention-days: 10 compression-level: 0 # no compression diff --git a/.github/workflows/pkr-bld-amazonlinux-x64.yml b/.github/workflows/pkr-bld-amazonlinux-x64.yml index f4a56c859..f169f5a80 100644 --- a/.github/workflows/pkr-bld-amazonlinux-x64.yml +++ b/.github/workflows/pkr-bld-amazonlinux-x64.yml @@ -61,8 +61,8 @@ jobs: with: name: "${{ matrix.os }}-virtualbox-x86_64" path: | - builds/build_complete/*.box - builds/build_complete/*.json + builds/testing_passed/x86_64/*.box + builds/testing_passed/x86_64/*.json overwrite: true retention-days: 10 compression-level: 0 # no compression diff --git a/.github/workflows/pkr-bld-hyperv-x64.yml b/.github/workflows/pkr-bld-hyperv-x64.yml index 62844caf5..12dbf358e 100644 --- a/.github/workflows/pkr-bld-hyperv-x64.yml +++ b/.github/workflows/pkr-bld-hyperv-x64.yml @@ -75,8 +75,8 @@ jobs: with: name: "${{ matrix.os }}-hyperv-x86_64" path: | - builds/build_complete/*.box - builds/build_complete/*.json + builds/testing_passed/x86_64/*.box + builds/testing_passed/x86_64/*.json overwrite: true retention-days: 10 compression-level: 0 # no compression diff --git a/.github/workflows/pkr-bld-parallels-arm64.yml b/.github/workflows/pkr-bld-parallels-arm64.yml index a404a4122..4b448d860 100644 --- a/.github/workflows/pkr-bld-parallels-arm64.yml +++ b/.github/workflows/pkr-bld-parallels-arm64.yml @@ -71,8 +71,8 @@ jobs: with: name: "${{ matrix.os }}-parallels-aarch64" path: | - builds/build_complete/*.box - builds/build_complete/*.json + builds/testing_passed/aarch64/*.box + builds/testing_passed/aarch64/*.json overwrite: true retention-days: 10 compression-level: 0 # no compression diff --git a/.github/workflows/pkr-bld-parallels-x64.yml b/.github/workflows/pkr-bld-parallels-x64.yml index 2f9dead03..13eab4718 100644 --- a/.github/workflows/pkr-bld-parallels-x64.yml +++ b/.github/workflows/pkr-bld-parallels-x64.yml @@ -73,8 +73,8 @@ jobs: with: name: "${{ matrix.os }}-parallels-x86_64" path: | - builds/build_complete/*.box - builds/build_complete/*.json + builds/testing_passed/x86_64/*.box + builds/testing_passed/x86_64/*.json overwrite: true retention-days: 10 compression-level: 0 # no compression diff --git a/.github/workflows/pkr-bld-qemu-arm64.yml b/.github/workflows/pkr-bld-qemu-arm64.yml index c065d2407..10f7d01ae 100644 --- a/.github/workflows/pkr-bld-qemu-arm64.yml +++ b/.github/workflows/pkr-bld-qemu-arm64.yml @@ -84,8 +84,8 @@ jobs: with: name: "${{ matrix.os }}-qemu-aarch64" path: | - builds/build_complete/*.box - builds/build_complete/*.json + builds/testing_passed/aarch64/*.box + builds/testing_passed/aarch64/*.json overwrite: true retention-days: 10 compression-level: 0 # no compression diff --git a/.github/workflows/pkr-bld-qemu-x64.yml b/.github/workflows/pkr-bld-qemu-x64.yml index 89cf62d72..2b514d665 100644 --- a/.github/workflows/pkr-bld-qemu-x64.yml +++ b/.github/workflows/pkr-bld-qemu-x64.yml @@ -92,8 +92,8 @@ jobs: with: name: "${{ matrix.os }}-qemu-x86_64" path: | - builds/build_complete/*.box - builds/build_complete/*.json + builds/testing_passed/x86_64/*.box + builds/testing_passed/x86_64/*.json overwrite: true retention-days: 10 compression-level: 0 # no compression diff --git a/.github/workflows/pkr-bld-utm-arm64.yml b/.github/workflows/pkr-bld-utm-arm64.yml index 263c9b2df..7cad53223 100644 --- a/.github/workflows/pkr-bld-utm-arm64.yml +++ b/.github/workflows/pkr-bld-utm-arm64.yml @@ -85,8 +85,8 @@ jobs: with: name: "${{ matrix.os }}-utm-aarch64" path: | - builds/build_complete/*.box - builds/build_complete/*.json + builds/testing_passed/aarch64/*.box + builds/testing_passed/aarch64/*.json overwrite: true retention-days: 10 compression-level: 0 # no compression diff --git a/.github/workflows/pkr-bld-utm-x64.yml b/.github/workflows/pkr-bld-utm-x64.yml index 482b29a66..165ce8e49 100644 --- a/.github/workflows/pkr-bld-utm-x64.yml +++ b/.github/workflows/pkr-bld-utm-x64.yml @@ -92,8 +92,8 @@ jobs: with: name: "${{ matrix.os }}-utm-x86_64" path: | - builds/build_complete/*.box - builds/build_complete/*.json + builds/testing_passed/x86_64/*.box + builds/testing_passed/x86_64/*.json overwrite: true retention-days: 10 compression-level: 0 # no compression diff --git a/.github/workflows/pkr-bld-virtualbox-arm64.yml b/.github/workflows/pkr-bld-virtualbox-arm64.yml index 47d7ee434..2e79baa40 100644 --- a/.github/workflows/pkr-bld-virtualbox-arm64.yml +++ b/.github/workflows/pkr-bld-virtualbox-arm64.yml @@ -71,8 +71,8 @@ jobs: with: name: "${{ matrix.os }}-virtualbox-aarch64" path: | - builds/build_complete/*.box - builds/build_complete/*.json + builds/testing_passed/aarch64/*.box + builds/testing_passed/aarch64/*.json overwrite: true retention-days: 10 compression-level: 0 # no compression diff --git a/.github/workflows/pkr-bld-virtualbox-x64.yml b/.github/workflows/pkr-bld-virtualbox-x64.yml index 685ef56f2..9096b4631 100644 --- a/.github/workflows/pkr-bld-virtualbox-x64.yml +++ b/.github/workflows/pkr-bld-virtualbox-x64.yml @@ -85,8 +85,8 @@ jobs: with: name: "${{ matrix.os }}-virtualbox-x86_64" path: | - builds/build_complete/*.box - builds/build_complete/*.json + builds/testing_passed/x86_64/*.box + builds/testing_passed/x86_64/*.json overwrite: true retention-days: 10 compression-level: 0 # no compression diff --git a/.github/workflows/pkr-bld-vmware-arm64.yml b/.github/workflows/pkr-bld-vmware-arm64.yml index 6faa1587c..f685c0b85 100644 --- a/.github/workflows/pkr-bld-vmware-arm64.yml +++ b/.github/workflows/pkr-bld-vmware-arm64.yml @@ -87,8 +87,8 @@ jobs: with: name: "${{ matrix.os }}-parallels-aarch64" path: | - builds/build_complete/*.box - builds/build_complete/*.json + builds/testing_passed/aarch64/*.box + builds/testing_passed/aarch64/*.json overwrite: true retention-days: 10 compression-level: 0 # no compression diff --git a/.github/workflows/pkr-bld-vmware-x64.yml b/.github/workflows/pkr-bld-vmware-x64.yml index ff7e237ba..9c878883f 100644 --- a/.github/workflows/pkr-bld-vmware-x64.yml +++ b/.github/workflows/pkr-bld-vmware-x64.yml @@ -90,8 +90,8 @@ jobs: with: name: "${{ matrix.os }}-parallels-x86_64" path: | - builds/build_complete/*.box - builds/build_complete/*.json + builds/testing_passed/x86_64/*.box + builds/testing_passed/x86_64/*.json overwrite: true retention-days: 10 compression-level: 0 # no compression diff --git a/.github/workflows/test-pkr-bld-parallels.yml b/.github/workflows/test-pkr-bld-parallels.yml index 06d35e7a0..37d3db3de 100644 --- a/.github/workflows/test-pkr-bld-parallels.yml +++ b/.github/workflows/test-pkr-bld-parallels.yml @@ -144,8 +144,8 @@ jobs: with: name: "${{ matrix.os }}-parallels-aarch64" path: | - builds/build_complete/*.box - builds/build_complete/*.json + builds/testing_passed/aarch64/*.box + builds/testing_passed/aarch64/*.json overwrite: true retention-days: 10 compression-level: 0 # no compression From 1e2608438f7aa104d571214e5ef8daae80d5a880 Mon Sep 17 00:00:00 2001 From: Markus Urbanczyk <markus.urbanczyk@evosoft.com> Date: Wed, 12 Nov 2025 16:50:27 +0100 Subject: [PATCH 1595/1622] feat(fedora): add Fedora 43 (#1643) Signed-off-by: Markus Urbanczyk <markus.urbanczyk@evosoft.com> --- .github/workflows/pkr-bld-hyperv-x64.yml | 1 + .github/workflows/pkr-bld-parallels-arm64.yml | 1 + .github/workflows/pkr-bld-parallels-x64.yml | 1 + .github/workflows/pkr-bld-qemu-arm64.yml | 1 + .github/workflows/pkr-bld-qemu-x64.yml | 1 + .github/workflows/pkr-bld-virtualbox-arm64.yml | 1 + .github/workflows/pkr-bld-virtualbox-x64.yml | 1 + .github/workflows/pkr-bld-vmware-arm64.yml | 1 + .github/workflows/pkr-bld-vmware-x64.yml | 1 + .github/workflows/test-pkr-bld-parallels.yml | 1 + builds.yml | 1 + os_pkrvars/fedora/fedora-43-aarch64.pkrvars.hcl | 11 +++++++++++ os_pkrvars/fedora/fedora-43-x86_64.pkrvars.hcl | 10 ++++++++++ 13 files changed, 32 insertions(+) create mode 100644 os_pkrvars/fedora/fedora-43-aarch64.pkrvars.hcl create mode 100644 os_pkrvars/fedora/fedora-43-x86_64.pkrvars.hcl diff --git a/.github/workflows/pkr-bld-hyperv-x64.yml b/.github/workflows/pkr-bld-hyperv-x64.yml index 12dbf358e..f72fea66d 100644 --- a/.github/workflows/pkr-bld-hyperv-x64.yml +++ b/.github/workflows/pkr-bld-hyperv-x64.yml @@ -25,6 +25,7 @@ jobs: - debian-13 - fedora-41 - fedora-42 + - fedora-43 - freebsd-13 - freebsd-14 - opensuse-leap-15 diff --git a/.github/workflows/pkr-bld-parallels-arm64.yml b/.github/workflows/pkr-bld-parallels-arm64.yml index 4b448d860..52234a294 100644 --- a/.github/workflows/pkr-bld-parallels-arm64.yml +++ b/.github/workflows/pkr-bld-parallels-arm64.yml @@ -24,6 +24,7 @@ jobs: - debian-13 - fedora-41 - fedora-42 + - fedora-43 - freebsd-13 - freebsd-14 - opensuse-leap-15 diff --git a/.github/workflows/pkr-bld-parallels-x64.yml b/.github/workflows/pkr-bld-parallels-x64.yml index 13eab4718..a171b05c8 100644 --- a/.github/workflows/pkr-bld-parallels-x64.yml +++ b/.github/workflows/pkr-bld-parallels-x64.yml @@ -25,6 +25,7 @@ jobs: - debian-13 - fedora-41 - fedora-42 + - fedora-43 - freebsd-13 - freebsd-14 - opensuse-leap-15 diff --git a/.github/workflows/pkr-bld-qemu-arm64.yml b/.github/workflows/pkr-bld-qemu-arm64.yml index 10f7d01ae..4fcc4863e 100644 --- a/.github/workflows/pkr-bld-qemu-arm64.yml +++ b/.github/workflows/pkr-bld-qemu-arm64.yml @@ -24,6 +24,7 @@ jobs: - debian-13 - fedora-41 - fedora-42 + - fedora-43 - freebsd-13 - freebsd-14 - opensuse-leap-15 diff --git a/.github/workflows/pkr-bld-qemu-x64.yml b/.github/workflows/pkr-bld-qemu-x64.yml index 2b514d665..3fce50a5c 100644 --- a/.github/workflows/pkr-bld-qemu-x64.yml +++ b/.github/workflows/pkr-bld-qemu-x64.yml @@ -25,6 +25,7 @@ jobs: - debian-13 - fedora-41 - fedora-42 + - fedora-43 - freebsd-13 - freebsd-14 - opensuse-leap-15 diff --git a/.github/workflows/pkr-bld-virtualbox-arm64.yml b/.github/workflows/pkr-bld-virtualbox-arm64.yml index 2e79baa40..360891e4a 100644 --- a/.github/workflows/pkr-bld-virtualbox-arm64.yml +++ b/.github/workflows/pkr-bld-virtualbox-arm64.yml @@ -24,6 +24,7 @@ jobs: - debian-13 - fedora-41 - fedora-42 + - fedora-43 - freebsd-13 - freebsd-14 - opensuse-leap-15 diff --git a/.github/workflows/pkr-bld-virtualbox-x64.yml b/.github/workflows/pkr-bld-virtualbox-x64.yml index 9096b4631..ad23cd5a1 100644 --- a/.github/workflows/pkr-bld-virtualbox-x64.yml +++ b/.github/workflows/pkr-bld-virtualbox-x64.yml @@ -25,6 +25,7 @@ jobs: - debian-13 - fedora-41 - fedora-42 + - fedora-43 - freebsd-13 - freebsd-14 - opensuse-leap-15 diff --git a/.github/workflows/pkr-bld-vmware-arm64.yml b/.github/workflows/pkr-bld-vmware-arm64.yml index f685c0b85..5bd37185f 100644 --- a/.github/workflows/pkr-bld-vmware-arm64.yml +++ b/.github/workflows/pkr-bld-vmware-arm64.yml @@ -24,6 +24,7 @@ jobs: - debian-13 - fedora-41 - fedora-42 + - fedora-43 - freebsd-13 - freebsd-14 - opensuse-leap-15 diff --git a/.github/workflows/pkr-bld-vmware-x64.yml b/.github/workflows/pkr-bld-vmware-x64.yml index 9c878883f..16d4fb5ee 100644 --- a/.github/workflows/pkr-bld-vmware-x64.yml +++ b/.github/workflows/pkr-bld-vmware-x64.yml @@ -25,6 +25,7 @@ jobs: - debian-13 - fedora-41 - fedora-42 + - fedora-43 - freebsd-13 - freebsd-14 - opensuse-leap-15 diff --git a/.github/workflows/test-pkr-bld-parallels.yml b/.github/workflows/test-pkr-bld-parallels.yml index 37d3db3de..2ebe73ece 100644 --- a/.github/workflows/test-pkr-bld-parallels.yml +++ b/.github/workflows/test-pkr-bld-parallels.yml @@ -24,6 +24,7 @@ jobs: - debian-12 - fedora-41 - fedora-42 + - fedora-43 - freebsd-13 - freebsd-14 - opensuse-leap-15 diff --git a/builds.yml b/builds.yml index f908fbacf..7eaaceb84 100644 --- a/builds.yml +++ b/builds.yml @@ -16,6 +16,7 @@ public: - debian-13 - fedora-41 - fedora-42 + - fedora-43 - freebsd-13 - freebsd-14 - opensuse-leap-15 diff --git a/os_pkrvars/fedora/fedora-43-aarch64.pkrvars.hcl b/os_pkrvars/fedora/fedora-43-aarch64.pkrvars.hcl new file mode 100644 index 000000000..8b3605558 --- /dev/null +++ b/os_pkrvars/fedora/fedora-43-aarch64.pkrvars.hcl @@ -0,0 +1,11 @@ +os_name = "fedora" +os_version = "43" +os_arch = "aarch64" +iso_url = "https://download.fedoraproject.org/pub/fedora/linux/releases/43/Server/aarch64/iso/Fedora-Server-netinst-aarch64-43-1.6.iso" +iso_checksum = "file:https://download.fedoraproject.org/pub/fedora/linux/releases/43/Server/aarch64/iso/Fedora-Server-43-1.6-aarch64-CHECKSUM" +parallels_guest_os_type = "fedora-core" +vbox_guest_os_type = "Fedora_arm64" +vmware_guest_os_type = "arm-fedora-64" +utm_vm_icon = "fedora" +parallels_boot_wait = "1s" +boot_command = ["<up>e<wait><down><down><end> inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/rhel/ks.cfg inst.repo=https://download.fedoraproject.org/pub/fedora/linux/releases/43/Server/aarch64/os/ <F10><wait>"] diff --git a/os_pkrvars/fedora/fedora-43-x86_64.pkrvars.hcl b/os_pkrvars/fedora/fedora-43-x86_64.pkrvars.hcl new file mode 100644 index 000000000..9e0e69113 --- /dev/null +++ b/os_pkrvars/fedora/fedora-43-x86_64.pkrvars.hcl @@ -0,0 +1,10 @@ +os_name = "fedora" +os_version = "43" +os_arch = "x86_64" +iso_url = "https://download.fedoraproject.org/pub/fedora/linux/releases/43/Server/x86_64/iso/Fedora-Server-netinst-x86_64-43-1.6.iso" +iso_checksum = "file:https://download.fedoraproject.org/pub/fedora/linux/releases/43/Server/x86_64/iso/Fedora-Server-43-1.6-x86_64-CHECKSUM" +parallels_guest_os_type = "fedora-core" +vbox_guest_os_type = "Fedora_64" +vmware_guest_os_type = "fedora-64" +utm_vm_icon = "fedora" +boot_command = ["<wait><up>e<wait><down><down><end> inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/rhel/ks.cfg inst.repo=https://download.fedoraproject.org/pub/fedora/linux/releases/43/Server/x86_64/os/ <F10><wait>"] From f8b0c1a7c1ab78b130dea377215c9580c5bc6e61 Mon Sep 17 00:00:00 2001 From: Corey Hemminger <hemminger@hotmail.com> Date: Fri, 21 Nov 2025 14:42:06 -0600 Subject: [PATCH 1596/1622] Windows updates (#1645) * updates for windows and macos builds --------- Signed-off-by: Corey Hemminger <hemminger@hotmail.com> --- .github/workflows/pkr-bld-hyperv-x64.yml | 1 - .github/workflows/pkr-bld-parallels-arm64.yml | 1 - .github/workflows/pkr-bld-parallels-x64.yml | 1 - .github/workflows/pkr-bld-qemu-arm64.yml | 1 - .github/workflows/pkr-bld-qemu-x64.yml | 1 - .github/workflows/pkr-bld-utm-arm64.yml | 1 - .github/workflows/pkr-bld-utm-x64.yml | 1 - .../workflows/pkr-bld-virtualbox-arm64.yml | 1 - .github/workflows/pkr-bld-virtualbox-x64.yml | 1 - .github/workflows/pkr-bld-vmware-arm64.yml | 1 - .github/workflows/pkr-bld-vmware-x64.yml | 1 - .github/workflows/test-pkr-bld-parallels.yml | 1 - CHANGELOG.md | 25 +- builds.yml | 1 - lib/bento/runner.rb | 4 +- lib/bento/test.rb | 4 +- lib/bento/version.rb | 2 +- .../fedora/fedora-41-aarch64.pkrvars.hcl | 11 - .../fedora/fedora-41-x86_64.pkrvars.hcl | 10 - os_pkrvars/macos/macos-14-aarch64.pkrvars.hcl | 2 +- os_pkrvars/macos/macos-15-aarch64.pkrvars.hcl | 2 +- os_pkrvars/macos/macos-26-aarch64.pkrvars.hcl | 6 +- .../windows/windows-11-aarch64.pkrvars.hcl | 11 +- .../windows/windows-11-x86_64.pkrvars.hcl | 9 +- .../windows/windows-2016-x86_64.pkrvars.hcl | 3 + .../windows/windows-2019-x86_64.pkrvars.hcl | 5 +- .../windows/windows-2022-x86_64.pkrvars.hcl | 5 +- .../windows/windows-2025-x86_64.pkrvars.hcl | 7 +- packer_templates/pkr-builder.pkr.hcl | 2 + packer_templates/pkr-plugins.pkr.hcl | 8 +- packer_templates/pkr-sources.pkr.hcl | 236 +++++++++++------- packer_templates/pkr-variables.pkr.hcl | 49 +++- .../scripts/windows/provision.ps1 | 25 +- .../win_answer_files/11/Autounattend.xml | 106 ++++---- .../11/arm64/Autounattend.xml | 107 ++++++-- .../win_answer_files/2016/Autounattend.xml | 56 +++-- .../win_answer_files/2019/Autounattend.xml | 56 +++-- .../win_answer_files/2022/Autounattend.xml | 56 +++-- .../win_answer_files/2025/Autounattend.xml | 56 +++-- 39 files changed, 550 insertions(+), 326 deletions(-) delete mode 100644 os_pkrvars/fedora/fedora-41-aarch64.pkrvars.hcl delete mode 100644 os_pkrvars/fedora/fedora-41-x86_64.pkrvars.hcl diff --git a/.github/workflows/pkr-bld-hyperv-x64.yml b/.github/workflows/pkr-bld-hyperv-x64.yml index f72fea66d..67d0362a4 100644 --- a/.github/workflows/pkr-bld-hyperv-x64.yml +++ b/.github/workflows/pkr-bld-hyperv-x64.yml @@ -23,7 +23,6 @@ jobs: - centos-stream-10 - debian-12 - debian-13 - - fedora-41 - fedora-42 - fedora-43 - freebsd-13 diff --git a/.github/workflows/pkr-bld-parallels-arm64.yml b/.github/workflows/pkr-bld-parallels-arm64.yml index 52234a294..0c3a9295d 100644 --- a/.github/workflows/pkr-bld-parallels-arm64.yml +++ b/.github/workflows/pkr-bld-parallels-arm64.yml @@ -22,7 +22,6 @@ jobs: - centos-stream-10 - debian-12 - debian-13 - - fedora-41 - fedora-42 - fedora-43 - freebsd-13 diff --git a/.github/workflows/pkr-bld-parallels-x64.yml b/.github/workflows/pkr-bld-parallels-x64.yml index a171b05c8..63da37071 100644 --- a/.github/workflows/pkr-bld-parallels-x64.yml +++ b/.github/workflows/pkr-bld-parallels-x64.yml @@ -23,7 +23,6 @@ jobs: - centos-stream-10 - debian-12 - debian-13 - - fedora-41 - fedora-42 - fedora-43 - freebsd-13 diff --git a/.github/workflows/pkr-bld-qemu-arm64.yml b/.github/workflows/pkr-bld-qemu-arm64.yml index 4fcc4863e..0abe387af 100644 --- a/.github/workflows/pkr-bld-qemu-arm64.yml +++ b/.github/workflows/pkr-bld-qemu-arm64.yml @@ -22,7 +22,6 @@ jobs: - centos-stream-10 - debian-12 - debian-13 - - fedora-41 - fedora-42 - fedora-43 - freebsd-13 diff --git a/.github/workflows/pkr-bld-qemu-x64.yml b/.github/workflows/pkr-bld-qemu-x64.yml index 3fce50a5c..f36951ed3 100644 --- a/.github/workflows/pkr-bld-qemu-x64.yml +++ b/.github/workflows/pkr-bld-qemu-x64.yml @@ -23,7 +23,6 @@ jobs: - centos-stream-10 - debian-12 - debian-13 - - fedora-41 - fedora-42 - fedora-43 - freebsd-13 diff --git a/.github/workflows/pkr-bld-utm-arm64.yml b/.github/workflows/pkr-bld-utm-arm64.yml index 7cad53223..d16643c60 100644 --- a/.github/workflows/pkr-bld-utm-arm64.yml +++ b/.github/workflows/pkr-bld-utm-arm64.yml @@ -22,7 +22,6 @@ jobs: - centos-stream-10 - debian-12 - debian-13 - - fedora-41 - fedora-42 - freebsd-13 - freebsd-14 diff --git a/.github/workflows/pkr-bld-utm-x64.yml b/.github/workflows/pkr-bld-utm-x64.yml index 165ce8e49..4fb0f5ef3 100644 --- a/.github/workflows/pkr-bld-utm-x64.yml +++ b/.github/workflows/pkr-bld-utm-x64.yml @@ -23,7 +23,6 @@ jobs: - centos-stream-10 - debian-12 - debian-13 - - fedora-41 - fedora-42 - freebsd-13 - freebsd-14 diff --git a/.github/workflows/pkr-bld-virtualbox-arm64.yml b/.github/workflows/pkr-bld-virtualbox-arm64.yml index 360891e4a..30fd595d1 100644 --- a/.github/workflows/pkr-bld-virtualbox-arm64.yml +++ b/.github/workflows/pkr-bld-virtualbox-arm64.yml @@ -22,7 +22,6 @@ jobs: - centos-stream-10 - debian-12 - debian-13 - - fedora-41 - fedora-42 - fedora-43 - freebsd-13 diff --git a/.github/workflows/pkr-bld-virtualbox-x64.yml b/.github/workflows/pkr-bld-virtualbox-x64.yml index ad23cd5a1..89238b4de 100644 --- a/.github/workflows/pkr-bld-virtualbox-x64.yml +++ b/.github/workflows/pkr-bld-virtualbox-x64.yml @@ -23,7 +23,6 @@ jobs: - centos-stream-10 - debian-12 - debian-13 - - fedora-41 - fedora-42 - fedora-43 - freebsd-13 diff --git a/.github/workflows/pkr-bld-vmware-arm64.yml b/.github/workflows/pkr-bld-vmware-arm64.yml index 5bd37185f..c82013340 100644 --- a/.github/workflows/pkr-bld-vmware-arm64.yml +++ b/.github/workflows/pkr-bld-vmware-arm64.yml @@ -22,7 +22,6 @@ jobs: - centos-stream-10 - debian-12 - debian-13 - - fedora-41 - fedora-42 - fedora-43 - freebsd-13 diff --git a/.github/workflows/pkr-bld-vmware-x64.yml b/.github/workflows/pkr-bld-vmware-x64.yml index 16d4fb5ee..9bb796809 100644 --- a/.github/workflows/pkr-bld-vmware-x64.yml +++ b/.github/workflows/pkr-bld-vmware-x64.yml @@ -23,7 +23,6 @@ jobs: - centos-stream-10 - debian-12 - debian-13 - - fedora-41 - fedora-42 - fedora-43 - freebsd-13 diff --git a/.github/workflows/test-pkr-bld-parallels.yml b/.github/workflows/test-pkr-bld-parallels.yml index 2ebe73ece..da1f902fa 100644 --- a/.github/workflows/test-pkr-bld-parallels.yml +++ b/.github/workflows/test-pkr-bld-parallels.yml @@ -22,7 +22,6 @@ jobs: - centos-stream-9 - debian-11 - debian-12 - - fedora-41 - fedora-42 - fedora-43 - freebsd-13 diff --git a/CHANGELOG.md b/CHANGELOG.md index a289a9dee..a56331eca 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -35,25 +35,32 @@ Markdown table generated at <https://www.tablesgenerator.com/markdown_tables#> | ubuntu-24.04 | x | x | x | x | x | x | x | x | x | | | | ubuntu-25.04 | x | x | x | x | x | x | x | x | x | | | | ubuntu-25.10 | | | | | | | | | | | | -| windows-11 | x | na | x | x | x | x | | | | | | -| windows-2016 | x | na | x | na | x | na | | na | | na | | -| windows-2019 | x | na | x | na | x | na | | na | | na | | -| windows-2022 | x | na | x | na | x | na | | na | | na | | -| windows-2025 | x | na | x | na | x | na | | na | | na | | +| windows-11 | x | na | x | | x | x | x | x | | | | +| windows-2016 | x | na | x | na | x | na | x | na | | na | | +| windows-2019 | x | na | x | na | x | na | x | na | | na | | +| windows-2022 | x | na | x | na | x | na | x | na | | na | | +| windows-2025 | x | na | x | na | x | na | x | na | | na | | ### Todo - Fix failing builds - migrate from http directory for hosting files to cd_files in source templates - This makes all builds compatible with hyper-v gen 2 which removes floppy disk capability - - Eliminates any potential networking issues - + - Eliminates any potential networking issues with host firewalls - Update pipelines to only run on updated pkrvars files -- Look into making all builds uefi default builds - Create CD pipeline to upload vagrant boxes after PR is merged - Create CD pipeline to build and upload new versions of vagrant boxes once every 3 months with the latest patches -## [unreleased] (2025-10-27) +## [unreleased] (2025-11-21) + +## [v5.0.1] (2025-11-21) + +- Updated bento to use absolute paths for packer templates +- Added Fedora 43 builds +- Removed EOL Fedora 41 templates +- Defaulting all sources to use uefi where possible +- Defaulting all sources to use nvme primary disk where possible +- Switched to new host-info packer plugin for host info detection ## [v5.0.0] (2025-08-27) diff --git a/builds.yml b/builds.yml index 7eaaceb84..1558a1d4b 100644 --- a/builds.yml +++ b/builds.yml @@ -14,7 +14,6 @@ public: - centos-stream-10 - debian-12 - debian-13 - - fedora-41 - fedora-42 - fedora-43 - freebsd-13 diff --git a/lib/bento/runner.rb b/lib/bento/runner.rb index f54326d13..4e73d5d85 100644 --- a/lib/bento/runner.rb +++ b/lib/bento/runner.rb @@ -37,7 +37,7 @@ def start templates = template_files banner('Starting build for templates:') banner('Installing packer plugins') unless dry_run || metadata_only - shellout("packer init -upgrade #{File.dirname(templates.first)}/../../packer_templates") unless dry_run || metadata_only + shellout("packer init -upgrade #{File.absolute_path("#{File.dirname(templates.first)}/../../packer_templates")}") unless dry_run || metadata_only templates.each { |t| puts "- #{t}" } time = Benchmark.measure do templates.each { |template| build(template) } @@ -81,7 +81,7 @@ def build(file) def packer_build_cmd(template, _var_file) pkrvars = "#{template}.pkrvars.hcl" - cmd = %W(packer build -timestamp-ui -force -var-file=#{pkrvars} ../../packer_templates) + cmd = %W(packer build -timestamp-ui -force -var-file=#{File.absolute_path(pkrvars)} #{File.absolute_path("../../packer_templates")}) vars.each do |var| cmd.insert(4, "-var #{var}") end if vars diff --git a/lib/bento/test.rb b/lib/bento/test.rb index 6b0fb1750..5dce71959 100644 --- a/lib/bento/test.rb +++ b/lib/bento/test.rb @@ -18,7 +18,9 @@ def initialize(opts) def start banner('Starting testing...') md_files = metadata_files(true) - puts md_files.join("\n") + md_files.each do |file| + puts File.absolute_path(file) + end time = Benchmark.measure do md_files.each do |metadata_file| destroy_all_bento diff --git a/lib/bento/version.rb b/lib/bento/version.rb index 08bbbc847..365eb8707 100644 --- a/lib/bento/version.rb +++ b/lib/bento/version.rb @@ -1,3 +1,3 @@ module Bento - VERSION = '5.0.0'.freeze + VERSION = '5.0.1'.freeze end diff --git a/os_pkrvars/fedora/fedora-41-aarch64.pkrvars.hcl b/os_pkrvars/fedora/fedora-41-aarch64.pkrvars.hcl deleted file mode 100644 index cf4071265..000000000 --- a/os_pkrvars/fedora/fedora-41-aarch64.pkrvars.hcl +++ /dev/null @@ -1,11 +0,0 @@ -os_name = "fedora" -os_version = "41" -os_arch = "aarch64" -iso_url = "https://download.fedoraproject.org/pub/fedora/linux/releases/41/Server/aarch64/iso/Fedora-Server-netinst-aarch64-41-1.4.iso" -iso_checksum = "file:https://download.fedoraproject.org/pub/fedora/linux/releases/41/Server/aarch64/iso/Fedora-Server-41-1.4-aarch64-CHECKSUM" -parallels_guest_os_type = "fedora-core" -vbox_guest_os_type = "Fedora_arm64" -vmware_guest_os_type = "arm-fedora-64" -utm_vm_icon = "fedora" -parallels_boot_wait = "1s" -boot_command = ["<up>e<wait><down><down><end> inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/rhel/ks.cfg inst.repo=https://download.fedoraproject.org/pub/fedora/linux/releases/41/Server/aarch64/os/ <F10><wait>"] diff --git a/os_pkrvars/fedora/fedora-41-x86_64.pkrvars.hcl b/os_pkrvars/fedora/fedora-41-x86_64.pkrvars.hcl deleted file mode 100644 index dfe34092a..000000000 --- a/os_pkrvars/fedora/fedora-41-x86_64.pkrvars.hcl +++ /dev/null @@ -1,10 +0,0 @@ -os_name = "fedora" -os_version = "41" -os_arch = "x86_64" -iso_url = "https://download.fedoraproject.org/pub/fedora/linux/releases/41/Server/x86_64/iso/Fedora-Server-netinst-x86_64-41-1.4.iso" -iso_checksum = "file:https://download.fedoraproject.org/pub/fedora/linux/releases/41/Server/x86_64/iso/Fedora-Server-41-1.4-x86_64-CHECKSUM" -parallels_guest_os_type = "fedora-core" -vbox_guest_os_type = "Fedora_64" -vmware_guest_os_type = "fedora-64" -utm_vm_icon = "fedora" -boot_command = ["<wait><up>e<wait><down><down><end> inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/rhel/ks.cfg inst.repo=https://download.fedoraproject.org/pub/fedora/linux/releases/41/Server/x86_64/os/ <F10><wait>"] diff --git a/os_pkrvars/macos/macos-14-aarch64.pkrvars.hcl b/os_pkrvars/macos/macos-14-aarch64.pkrvars.hcl index 0ef04f0f1..984a6dd63 100644 --- a/os_pkrvars/macos/macos-14-aarch64.pkrvars.hcl +++ b/os_pkrvars/macos/macos-14-aarch64.pkrvars.hcl @@ -1,5 +1,5 @@ os_name = "macos" -os_version = "14.7.7" +os_version = "14.8.2" os_arch = "aarch64" # Download urls cn be foud at https://ipsw.me/VirtualMac2,1 parallels_ipsw_url = "https://updates.cdn-apple.com/2024SummerFCS/fullrestores/062-52859/932E0A8F-6644-4759-82DA-F8FA8DEA806A/UniversalMac_14.6.1_23G93_Restore.ipsw" diff --git a/os_pkrvars/macos/macos-15-aarch64.pkrvars.hcl b/os_pkrvars/macos/macos-15-aarch64.pkrvars.hcl index 13d261f8d..4d57aa19b 100644 --- a/os_pkrvars/macos/macos-15-aarch64.pkrvars.hcl +++ b/os_pkrvars/macos/macos-15-aarch64.pkrvars.hcl @@ -1,5 +1,5 @@ os_name = "macos" -os_version = "15.6.1" +os_version = "15.7.2" os_arch = "aarch64" # Download urls cn be foud at https://ipsw.me/VirtualMac2,1 parallels_ipsw_url = "https://updates.cdn-apple.com/2025SummerFCS/fullrestores/093-10809/CFD6DD38-DAF0-40DA-854F-31AAD1294C6F/UniversalMac_15.6.1_24G90_Restore.ipsw" diff --git a/os_pkrvars/macos/macos-26-aarch64.pkrvars.hcl b/os_pkrvars/macos/macos-26-aarch64.pkrvars.hcl index 7ed7c922d..8f75d4041 100644 --- a/os_pkrvars/macos/macos-26-aarch64.pkrvars.hcl +++ b/os_pkrvars/macos/macos-26-aarch64.pkrvars.hcl @@ -1,9 +1,9 @@ os_name = "macos" -os_version = "26.0.1" +os_version = "26.1" os_arch = "aarch64" # Download urls cn be foud at https://ipsw.me/VirtualMac2,1 -parallels_ipsw_url = "https://updates.cdn-apple.com/2025FallFCS/fullrestores/093-50898/60AE7E97-3E60-441B-9B34-E603C694C5C1/UniversalMac_26.0.1_25A362_Restore.ipsw" -parallels_ipsw_checksum = "018b76e84e31026eb70a270e12bf4f3adfd722b611489af6553b035343e5ec05" +parallels_ipsw_url = "https://updates.cdn-apple.com/2025FallFCS/fullrestores/089-04148/791B6F00-A30B-4EB0-B2E3-257167F7715B/UniversalMac_26.1_25B78_Restore.ipsw" +parallels_ipsw_checksum = "e0217b3cd0f2edb9ab3294480bef5af2a0be43e86d84a15fab6bca31d3802ee8" utm_vm_icon = "mac" sources_enabled = ["source.parallels-ipsw.vm"] default_boot_wait = "15s" diff --git a/os_pkrvars/windows/windows-11-aarch64.pkrvars.hcl b/os_pkrvars/windows/windows-11-aarch64.pkrvars.hcl index fc3d390b0..92ef520da 100644 --- a/os_pkrvars/windows/windows-11-aarch64.pkrvars.hcl +++ b/os_pkrvars/windows/windows-11-aarch64.pkrvars.hcl @@ -4,13 +4,12 @@ os_arch = "aarch64" is_windows = true hyperv_generation = 2 # Download url's found at https://www.microsoft.com/en-us/evalcenter/download-windows-11-enterprise -iso_url = "https://software-static.download.prss.microsoft.com/dbazure/888969d5-f34g-4e03-ac9d-1f9786c66749/26100.1.240331-1435.ge_release_CLIENTENTERPRISEEVAL_OEMRET_A64FRE_en-us.iso" -iso_checksum = "DAD633276073F14F3E0373EF7E787569E216D54942CE522B39451C8F2D38AD43" -sources_enabled = ["source.parallels-iso.vm", "source.qemu.vm", "source.vmware-iso.vm"] +iso_url = "https://software-static.download.prss.microsoft.com/dbazure/888969d5-f34g-4e03-ac9d-1f9786c66749/26200.6584.250915-1905.25h2_ge_release_svc_refresh_CLIENT_CONSUMER_a64fre_en-us.iso" +iso_checksum = "32cde0071ed8086b29bb6c8c3bf17ba9e3cdf43200537434a811a9b6cc2711a1" parallels_guest_os_type = "win-11" vbox_guest_os_type = "Windows11_arm64" vmware_guest_os_type = "arm-windows11-64" -vmware_firmware = "efi-secure" utm_vm_icon = "windows-11" -parallels_boot_wait = "180s" -boot_command = ["<up><wait><down><down><enter><wait><up>", ] +default_boot_wait = "1s" +vbox_boot_wait = "10s" +boot_command = ["<up><wait><up>"] diff --git a/os_pkrvars/windows/windows-11-x86_64.pkrvars.hcl b/os_pkrvars/windows/windows-11-x86_64.pkrvars.hcl index f12d0fafb..e828e1536 100644 --- a/os_pkrvars/windows/windows-11-x86_64.pkrvars.hcl +++ b/os_pkrvars/windows/windows-11-x86_64.pkrvars.hcl @@ -3,9 +3,12 @@ os_version = "11" os_arch = "x86_64" is_windows = true # Download url's found at https://www.microsoft.com/en-us/evalcenter/download-windows-11-enterprise -iso_url = "https://software-static.download.prss.microsoft.com/dbazure/888969d5-f34g-4e03-ac9d-1f9786c66749/26100.1742.240906-0331.ge_release_svc_refresh_CLIENTENTERPRISEEVAL_OEMRET_x64FRE_en-us.iso" -iso_checksum = "755A90D43E826A74B9E1932A34788B898E028272439B777E5593DEE8D53622AE" +iso_url = "https://software-static.download.prss.microsoft.com/dbazure/888969d5-f34g-4e03-ac9d-1f9786c66749/26200.6584.250915-1905.25h2_ge_release_svc_refresh_CLIENTENTERPRISEEVAL_OEMRET_x64FRE_en-us.iso" +iso_checksum = "a61adeab895ef5a4db436e0a7011c92a2ff17bb0357f58b13bbc4062e535e7b9" parallels_guest_os_type = "win-11" vbox_guest_os_type = "Windows11_64" -vmware_guest_os_type = "windows9srv-64" +vmware_guest_os_type = "windows11-64" utm_vm_icon = "windows-11" +default_boot_wait = "1s" +vbox_boot_wait = "10s" +boot_command = ["<up><wait><up>"] diff --git a/os_pkrvars/windows/windows-2016-x86_64.pkrvars.hcl b/os_pkrvars/windows/windows-2016-x86_64.pkrvars.hcl index ce4291a00..5dc462850 100644 --- a/os_pkrvars/windows/windows-2016-x86_64.pkrvars.hcl +++ b/os_pkrvars/windows/windows-2016-x86_64.pkrvars.hcl @@ -9,3 +9,6 @@ parallels_guest_os_type = "win-2016" vbox_guest_os_type = "Windows2016_64" vmware_guest_os_type = "windows9srv-64" utm_vm_icon = "windows" +default_boot_wait = "1s" +vbox_boot_wait = "10s" +boot_command = ["<up><wait><up>"] diff --git a/os_pkrvars/windows/windows-2019-x86_64.pkrvars.hcl b/os_pkrvars/windows/windows-2019-x86_64.pkrvars.hcl index eba7f76c9..7979eabb0 100644 --- a/os_pkrvars/windows/windows-2019-x86_64.pkrvars.hcl +++ b/os_pkrvars/windows/windows-2019-x86_64.pkrvars.hcl @@ -7,5 +7,8 @@ iso_url = "https://software-static.download.prss.microsoft.com/d iso_checksum = "6dae072e7f78f4ccab74a45341de0d6e2d45c39be25f1f5920a2ab4f51d7bcbb" parallels_guest_os_type = "win-2019" vbox_guest_os_type = "Windows2019_64" -vmware_guest_os_type = "windows9srv-64" +vmware_guest_os_type = "windows2019srv-64" utm_vm_icon = "windows" +default_boot_wait = "1s" +vbox_boot_wait = "10s" +boot_command = ["<up><wait><up>"] diff --git a/os_pkrvars/windows/windows-2022-x86_64.pkrvars.hcl b/os_pkrvars/windows/windows-2022-x86_64.pkrvars.hcl index c443a1eec..1885127c3 100644 --- a/os_pkrvars/windows/windows-2022-x86_64.pkrvars.hcl +++ b/os_pkrvars/windows/windows-2022-x86_64.pkrvars.hcl @@ -7,5 +7,8 @@ iso_url = "https://software-static.download.prss.microsoft.com/s iso_checksum = "3e4fa6d8507b554856fc9ca6079cc402df11a8b79344871669f0251535255325" parallels_guest_os_type = "win-2022" vbox_guest_os_type = "Windows2022_64" -vmware_guest_os_type = "windows9srv-64" +vmware_guest_os_type = "windows2019srvNext-64" utm_vm_icon = "windows" +default_boot_wait = "1s" +vbox_boot_wait = "10s" +boot_command = ["<up><wait><up>"] diff --git a/os_pkrvars/windows/windows-2025-x86_64.pkrvars.hcl b/os_pkrvars/windows/windows-2025-x86_64.pkrvars.hcl index d84892207..7ad8b7922 100644 --- a/os_pkrvars/windows/windows-2025-x86_64.pkrvars.hcl +++ b/os_pkrvars/windows/windows-2025-x86_64.pkrvars.hcl @@ -6,6 +6,9 @@ is_windows = true iso_url = "https://software-static.download.prss.microsoft.com/dbazure/888969d5-f34g-4e03-ac9d-1f9786c66749/26100.1742.240906-0331.ge_release_svc_refresh_SERVER_EVAL_x64FRE_en-us.iso" iso_checksum = "d0ef4502e350e3c6c53c15b1b3020d38a5ded011bf04998e950720ac8579b23d" parallels_guest_os_type = "win-2022" -vbox_guest_os_type = "Windows2022_64" -vmware_guest_os_type = "windows9srv-64" +vbox_guest_os_type = "Windows2025_64" +vmware_guest_os_type = "windows2022srvNext-64" utm_vm_icon = "windows" +default_boot_wait = "1s" +vbox_boot_wait = "10s" +boot_command = ["<up><wait><up>"] diff --git a/packer_templates/pkr-builder.pkr.hcl b/packer_templates/pkr-builder.pkr.hcl index 30643317a..61434a45a 100644 --- a/packer_templates/pkr-builder.pkr.hcl +++ b/packer_templates/pkr-builder.pkr.hcl @@ -187,6 +187,8 @@ build { "exclude:$_.Title -like '*Preview*'", "exclude:$_.Title -like '*Cumulative Update for Microsoft server*'", "exclude:$_.Title -like '*Cumulative Update for Windows *'", + "exclude:$_.Title -like '*-* Security Update*'", # New naming scheme for cumulative updates + "exclude:$_.InstallationBehavior.CanRequestUserInput", "include:$true", ] except = var.is_windows ? null : local.source_names diff --git a/packer_templates/pkr-plugins.pkr.hcl b/packer_templates/pkr-plugins.pkr.hcl index 9588f166e..52e9e9900 100644 --- a/packer_templates/pkr-plugins.pkr.hcl +++ b/packer_templates/pkr-plugins.pkr.hcl @@ -1,9 +1,9 @@ packer { required_version = ">= 1.7.0" required_plugins { - external = { - version = "> 0.0.2" - source = "github.com/joomcode/external" + host-info = { + version = ">= 1.0.0" + source = "github.com/stromweld/host-info" } hyperv = { version = ">= 1.0.3" @@ -18,7 +18,7 @@ packer { source = "github.com/hashicorp/qemu" } utm = { - version = ">= 0.3.3" + version = ">= 0.4.0" source = "github.com/naveenrajm7/utm" } vagrant = { diff --git a/packer_templates/pkr-sources.pkr.hcl b/packer_templates/pkr-sources.pkr.hcl index e6356ab3b..f7dfbc615 100644 --- a/packer_templates/pkr-sources.pkr.hcl +++ b/packer_templates/pkr-sources.pkr.hcl @@ -1,11 +1,9 @@ -data "external-raw" "host_os" { - program = ["uname", "-s"] -} +data "host-info" "this" {} locals { # helper locals build_dir = abspath("${path.root}/../builds/") - host_os = chomp(data.external-raw.host_os.result) + host_os = data.host-info.this.os_type # Source block provider specific # hyperv-iso hyperv_enable_dynamic_memory = var.hyperv_enable_dynamic_memory == null ? ( @@ -23,6 +21,9 @@ locals { var.is_windows ? ( var.os_arch == "x86_64" ? "win" : "win-arm" ) : ( + var.os_name == "macos" ? ( + var.os_arch == "x86_64" ? "mac" : "mac-arm" + ) : var.os_arch == "x86_64" ? "lin" : "lin-arm" ) ) : var.parallels_tools_flavor @@ -30,14 +31,10 @@ locals { var.is_windows ? "attach" : "upload" ) : var.parallels_tools_mode parallels_prlctl = var.parallels_prlctl == null ? ( - var.is_windows ? ( - var.os_arch == "x86_64" ? [ - ["set", "{{ .Name }}", "--efi-boot", "off"] - ] : [ - ["set", "{{ .Name }}", "--efi-boot", "on"], - ["set", "{{ .Name }}", "--efi-secure-boot", "off"], - ] - ) : ( + var.is_windows ? [ + ["set", "{{ .Name }}", "--efi-boot", "on"], + ["set", "{{ .Name }}", "--efi-secure-boot", "off"], + ] : ( var.os_name == "freebsd" && var.os_arch == "x86_64" ? [ ["set", "{{ .Name }}", "--bios-type", "efi64"], ["set", "{{ .Name }}", "--efi-boot", "on"], @@ -51,31 +48,39 @@ locals { # qemu qemu_accelerator = var.qemu_accelerator == null ? ( - local.host_os == "Darwin" ? "hvf" : null + local.host_os == "darwin" ? "hvf" : null ) : var.qemu_accelerator qemu_binary = var.qemu_binary == null ? "qemu-system-${var.os_arch}" : var.qemu_binary qemu_display = var.qemu_display == null ? ( var.is_windows ? ( var.os_arch == "aarch64" ? "virtio-ramfb-gl" : "virtio-vga-gl" ) : ( - local.host_os == "Darwin" ? ( + local.host_os == "darwin" ? ( var.os_arch == "aarch64" ? "cocoa" : "virtio-gpu-pci" ) : ( var.os_arch == "aarch64" ? "virtio-ramfb" : "virtio-vga" ) ) ) : var.qemu_display - qemu_efi_boot = var.qemu_efi_boot == null ? ( - var.os_arch == "aarch64" ? true : false - ) : var.qemu_efi_boot - qemu_efi_firmware_code = var.qemu_efi_firmware_code == null ? ( - local.host_os == "Darwin" ? "/opt/homebrew/share/qemu/edk2-${var.os_arch}-code.fd" : "/usr/local/share/qemu/edk2-x86_64-code.fd" - ) : var.qemu_efi_firmware_code - qemu_efi_firmware_vars = var.qemu_efi_firmware_vars == null ? ( - local.host_os == "Darwin" ? ( - var.os_arch == "aarch64" ? "/opt/homebrew/share/qemu/edk2-arm-vars.fd" : "/usr/local/share/qemu/edk2-i386-vars.fd" - ) : null - ) : var.qemu_efi_firmware_vars + qemu_efi_boot = var.qemu_efi_boot == null ? true : var.qemu_efi_boot + qemu_efi_firmware_code = local.qemu_efi_boot ? ( + var.qemu_efi_firmware_code == null ? ( + local.host_os == "darwin" ? ( + var.os_arch == "aarch64" ? "/opt/homebrew/share/qemu/edk2-aarch64-code.fd" : "/usr/local/share/qemu/edk2-x86_64-code.fd" + ) : ( + var.os_arch == "aarch64" ? "/usr/local/share/qemu/edk2-aarch64-code.fd" : "/usr/local/share/qemu/edk2-x86_64-code.fd" + ) + ) : var.qemu_efi_firmware_code + ) : null + qemu_efi_firmware_vars = local.qemu_efi_boot ? ( + var.qemu_efi_firmware_vars == null ? ( + local.host_os == "darwin" ? ( + var.os_arch == "aarch64" ? "/opt/homebrew/share/qemu/edk2-arm-vars.fd" : "/usr/local/share/qemu/edk2-i386-vars.fd" + ) : ( + var.os_arch == "aarch64" ? "/usr/local/share/qemu/edk2-arm-vars.fd" : "/usr/local/share/qemu/edk2-i386-vars.fd" + ) + ) : var.qemu_efi_firmware_vars + ) : null qemu_machine_type = var.qemu_machine_type == null ? ( var.os_arch == "aarch64" ? "virt" : "q35" ) : var.qemu_machine_type @@ -109,6 +114,9 @@ locals { ) : var.qemuargs # utm-iso + utm_boot_command = var.utm_boot_command == null ? ( + local.utm_disable_vnc ? null : local.default_boot_command + ) : var.utm_boot_command utm_display_hardware_type = var.utm_display_hardware_type == null ? ( var.os_arch == "aarch64" ? ( var.is_windows ? "virtio-ramfb-gl" : "virtio-gpu-pci" @@ -116,17 +124,20 @@ locals { var.is_windows ? "virtio-vga-gl" : "virtio-vga" ) ) : var.utm_display_hardware_type - utm_hard_drive_interface = var.utm_hard_drive_interface == null ? ( - var.is_windows ? "nvme" : "virtio" - ) : var.utm_hard_drive_interface + utm_disable_vnc = var.utm_disable_vnc == null ? ( + var.is_windows ? true : false + ) : var.utm_disable_vnc utm_guest_additions_mode = var.utm_guest_additions_mode == null ? ( var.is_windows ? "attach" : "disable" ) : var.utm_guest_additions_mode + utm_guest_additions_url = var.utm_guest_additions_url == null ? ( + var.is_windows ? "https://fedorapeople.org/groups/virt/virtio-win/direct-downloads/archive-virtio/virtio-win-0.1.271-1/virtio-win.iso" : null + ) : var.utm_guest_additions_url + utm_guest_additions_sha256 = var.utm_guest_additions_sha256 == null ? "none" : var.utm_guest_additions_sha256 + utm_guest_additions_target_path = var.utm_guest_additions_target_path == null && local.utm_guest_additions_url != null ? "${path.root}/../builds/iso/${split(".", basename(local.utm_guest_additions_url))[0]}-${substr(sha256(local.utm_guest_additions_url), 0, 8)}.iso" : var.utm_guest_additions_target_path # virtualbox-iso - vbox_firmware = var.vbox_firmware == null ? ( - var.os_arch == "aarch64" ? "efi" : "bios" - ) : var.vbox_firmware + vbox_chipset = var.vbox_chipset == null ? "ich9" : var.vbox_chipset vbox_gfx_controller = var.vbox_gfx_controller == null ? ( var.is_windows ? "vboxsvga" : "vmsvga" ) : var.vbox_gfx_controller @@ -136,29 +147,44 @@ locals { vbox_guest_additions_mode = var.vbox_guest_additions_mode == null ? ( var.is_windows ? "attach" : "upload" ) : var.vbox_guest_additions_mode - vbox_hard_drive_interface = var.vbox_hard_drive_interface == null ? ( - var.os_arch == "aarch64" ? "virtio" : "sata" - ) : var.vbox_hard_drive_interface - vbox_iso_interface = var.vbox_iso_interface == null ? ( - var.os_arch == "aarch64" ? "virtio" : "sata" - ) : var.vbox_iso_interface vboxmanage = var.vboxmanage == null ? ( - var.os_arch == "aarch64" ? [ - ["modifyvm", "{{.Name}}", "--chipset", "armv8virtual"], - ["modifyvm", "{{.Name}}", "--audio-enabled", "off"], - ["modifyvm", "{{.Name}}", "--nat-localhostreachable1", "on"], - ["modifyvm", "{{.Name}}", "--cableconnected1", "on"], - ["modifyvm", "{{.Name}}", "--usb-xhci", "on"], - ["modifyvm", "{{.Name}}", "--graphicscontroller", "qemuramfb"], - ["modifyvm", "{{.Name}}", "--mouse", "usb"], - ["modifyvm", "{{.Name}}", "--keyboard", "usb"], - ["storagectl", "{{.Name}}", "--name", "IDE Controller", "--remove"], - ] : [ - ["modifyvm", "{{.Name}}", "--chipset", "ich9"], - ["modifyvm", "{{.Name}}", "--audio-enabled", "off"], - ["modifyvm", "{{.Name}}", "--nat-localhostreachable1", "on"], - ["modifyvm", "{{.Name}}", "--cableconnected1", "on"], - ] + var.is_windows ? ( + var.os_arch == "aarch64" ? [ + ["modifyvm", "{{.Name}}", "--chipset", "armv8virtual"], + ["modifyvm", "{{.Name}}", "--audio-enabled", "off"], + ["modifyvm", "{{.Name}}", "--nat-localhostreachable1", "on"], + ["modifyvm", "{{.Name}}", "--cableconnected1", "on"], + ["modifyvm", "{{.Name}}", "--usb-xhci", "on"], + ["modifyvm", "{{.Name}}", "--mouse", "usb"], + ["modifyvm", "{{.Name}}", "--keyboard", "usb"], + ["modifyvm", "{{.Name}}", "--nic-type1", "usbnet"], + ["storagectl", "{{.Name}}", "--name", "IDE Controller", "--remove"], + ] : [ + ["modifyvm", "{{.Name}}", "--audio-enabled", "off"], + ["modifyvm", "{{.Name}}", "--nat-localhostreachable1", "on"], + ["modifyvm", "{{.Name}}", "--cableconnected1", "on"], + ["modifyvm", "{{.Name}}", "--usb-xhci", "on"], + ["modifyvm", "{{.Name}}", "--mouse", "usb"], + ["modifyvm", "{{.Name}}", "--keyboard", "usb"], + ["storagectl", "{{.Name}}", "--name", "IDE Controller", "--remove"], + ] + ) : ( + var.os_arch == "aarch64" ? [ + ["modifyvm", "{{.Name}}", "--chipset", "armv8virtual"], + ["modifyvm", "{{.Name}}", "--audio-enabled", "off"], + ["modifyvm", "{{.Name}}", "--nat-localhostreachable1", "on"], + ["modifyvm", "{{.Name}}", "--cableconnected1", "on"], + ["modifyvm", "{{.Name}}", "--usb-xhci", "on"], + ["modifyvm", "{{.Name}}", "--graphicscontroller", "qemuramfb"], + ["modifyvm", "{{.Name}}", "--mouse", "usb"], + ["modifyvm", "{{.Name}}", "--keyboard", "usb"], + ["storagectl", "{{.Name}}", "--name", "IDE Controller", "--remove"], + ] : [ + ["modifyvm", "{{.Name}}", "--audio-enabled", "off"], + ["modifyvm", "{{.Name}}", "--nat-localhostreachable1", "on"], + ["modifyvm", "{{.Name}}", "--cableconnected1", "on"], + ] + ) ) : var.vboxmanage vbox_nic_type = var.vbox_nic_type == null ? ( var.os_name == "freebsd" ? "82545EM" : null @@ -169,7 +195,9 @@ locals { var.is_windows && var.os_arch == "aarch64" ? "vmxnet3" : "e1000e" ) : var.vmware_network_adapter_type vmware_tools_upload_flavor = var.vmware_tools_upload_flavor == null ? ( - var.is_windows ? "windows" : ( + var.is_windows ? ( + var.os_arch == "x86_64" ? "windows" : null + ) : ( var.os_name == "macos" ? "darwin" : null ) ) : var.vmware_tools_upload_flavor @@ -177,14 +205,28 @@ locals { var.is_windows ? "c:\\vmware-tools.iso" : "/tmp/vmware-tools.iso" ) : var.vmware_tools_upload_path vmware_vmx_data = var.vmware_vmx_data == null ? ( - var.is_windows && var.os_arch == "aarch64" ? { - "sata1.present" = "TRUE" - "sata1:2.devicetype" = "cdrom-image" - "sata1:2.filename" = "/Applications/VMware Fusion.app/Contents/Library/isoimages/arm64/windows.iso" - "sata1:2.present" = "TRUE" - "svga.autodetect" = "TRUE" - "usb_xhci.present" = "TRUE" - } : { + local.host_os == "darwin" ? ( + var.is_windows ? ( + var.os_arch == "aarch64" ? { + "sata1.present" = "TRUE" + "sata1:2.devicetype" = "cdrom-image" + "sata1:2.filename" = "/Applications/VMware Fusion.app/Contents/Library/isoimages/arm64/windows.iso" + "sata1:2.present" = "TRUE" + "svga.autodetect" = "TRUE" + "usb_xhci.present" = "TRUE" + } : { + "sata1.present" = "TRUE" + "sata1:2.devicetype" = "cdrom-image" + "sata1:2.filename" = "/Applications/VMware Fusion.app/Contents/Library/isoimages/x86_64/windows.iso" + "sata1:2.present" = "TRUE" + "svga.autodetect" = "TRUE" + "usb_xhci.present" = "TRUE" + } + ) : { + "svga.autodetect" = "TRUE" + "usb_xhci.present" = "TRUE" + } + ) : { "svga.autodetect" = "TRUE" "usb_xhci.present" = "TRUE" } @@ -214,13 +256,6 @@ locals { disk_size = var.disk_size == null ? ( var.is_windows ? 131072 : 65536 ) : var.disk_size - floppy_files = var.floppy_files == null ? ( - var.is_windows ? ( - var.os_arch == "x86_64" ? [ - "${path.root}/win_answer_files/${var.os_version}/Autounattend.xml", - ] : null - ) : null - ) : var.floppy_files http_directory = var.http_directory == null ? "${path.root}/http" : var.http_directory iso_target_path = var.iso_target_path == "build_dir_iso" && var.iso_url != null ? "${path.root}/../builds/iso/${var.os_name}-${var.os_version}-${var.os_arch}-${substr(sha256(var.iso_url), 0, 8)}.iso" : var.iso_target_path memory = var.memory == null ? ( @@ -251,12 +286,12 @@ source "hyperv-iso" "vm" { boot_command = var.hyperv_boot_command == null ? local.default_boot_command : var.hyperv_boot_command boot_wait = var.hyperv_boot_wait == null ? local.default_boot_wait : var.hyperv_boot_wait cd_content = var.cd_content - cd_files = var.hyperv_generation == 2 ? local.cd_files : null + cd_files = local.cd_files cd_label = var.cd_label cpus = var.cpus communicator = local.communicator disk_size = local.disk_size - floppy_files = var.hyperv_generation == 2 ? null : local.floppy_files + floppy_files = var.floppy_files headless = var.headless http_directory = local.http_directory iso_checksum = var.iso_checksum @@ -318,7 +353,7 @@ source "parallels-iso" "vm" { cpus = var.cpus communicator = local.communicator disk_size = local.disk_size - floppy_files = local.floppy_files + floppy_files = var.floppy_files http_directory = local.http_directory iso_checksum = var.iso_checksum iso_target_path = local.iso_target_path @@ -367,7 +402,7 @@ source "qemu" "vm" { cpus = var.cpus communicator = local.communicator disk_size = local.disk_size - floppy_files = local.floppy_files + floppy_files = var.floppy_files headless = var.headless http_directory = local.http_directory iso_checksum = var.iso_checksum @@ -388,23 +423,26 @@ source "qemu" "vm" { } source "utm-iso" "vm" { # UTM specific options - boot_nopause = var.utm_boot_nopause - display_hardware_type = local.utm_display_hardware_type - display_nopause = var.utm_display_nopause - export_nopause = var.utm_export_nopause - guest_additions_mode = local.utm_guest_additions_mode - guest_additions_path = var.utm_guest_additions_path - guest_additions_interface = var.utm_guest_additions_interface - guest_additions_url = var.utm_guest_additions_url - guest_additions_sha256 = var.utm_guest_additions_sha256 - hard_drive_interface = local.utm_hard_drive_interface - hypervisor = var.utm_hypervisor - uefi_boot = var.utm_uefi_boot - vm_arch = var.os_arch - vm_backend = var.utm_vm_backend - vm_icon = var.utm_vm_icon + boot_nopause = var.utm_boot_nopause + disable_vnc = local.utm_disable_vnc + display_hardware_type = local.utm_display_hardware_type + display_nopause = var.utm_display_nopause + export_nopause = var.utm_export_nopause + guest_additions_mode = local.utm_guest_additions_mode + guest_additions_path = var.utm_guest_additions_path + guest_additions_interface = var.utm_guest_additions_interface + guest_additions_url = local.utm_guest_additions_url + guest_additions_sha256 = local.utm_guest_additions_sha256 + guest_additions_target_path = local.utm_guest_additions_target_path + hard_drive_interface = var.utm_hard_drive_interface + hypervisor = var.utm_hypervisor + iso_interface = var.utm_iso_interface + uefi_boot = var.utm_uefi_boot + vm_arch = var.os_arch + vm_backend = var.utm_vm_backend + vm_icon = var.utm_vm_icon # Source block common options - boot_command = var.utm_boot_command == null ? local.default_boot_command : var.utm_boot_command + boot_command = local.utm_boot_command boot_wait = var.utm_boot_wait == null ? local.default_boot_wait : var.utm_boot_wait cd_content = var.cd_content cd_files = local.cd_files @@ -412,10 +450,10 @@ source "utm-iso" "vm" { cpus = var.cpus communicator = local.communicator disk_size = local.disk_size - floppy_files = local.floppy_files + floppy_files = var.floppy_files http_directory = local.http_directory iso_checksum = var.iso_checksum - iso_target_path = null # local.iso_target_path # TODO: remove null after https://github.com/naveenrajm7/packer-plugin-utm/issues/25 is fixed + iso_target_path = local.iso_target_path iso_url = var.iso_url memory = local.memory output_directory = "${local.output_directory}-utm" @@ -432,17 +470,21 @@ source "utm-iso" "vm" { } source "virtualbox-iso" "vm" { # Virtualbox specific options - firmware = local.vbox_firmware + chipset = local.vbox_chipset + firmware = var.vbox_firmware + gfx_accelerate_3d = var.vbox_gfx_accelerate_3d gfx_controller = local.vbox_gfx_controller gfx_vram_size = local.vbox_gfx_vram_size guest_additions_path = var.vbox_guest_additions_path guest_additions_mode = local.vbox_guest_additions_mode guest_additions_interface = var.vbox_guest_additions_interface guest_os_type = var.vbox_guest_os_type - hard_drive_interface = local.vbox_hard_drive_interface - iso_interface = local.vbox_iso_interface + hard_drive_interface = var.vbox_hard_drive_interface + iso_interface = var.vbox_iso_interface + nested_virt = var.vbox_nested_virt nic_type = local.vbox_nic_type rtc_time_base = var.vbox_rtc_time_base + usb = var.vbox_usb vboxmanage = local.vboxmanage virtualbox_version_file = var.virtualbox_version_file # Source block common options @@ -454,7 +496,7 @@ source "virtualbox-iso" "vm" { cpus = var.cpus communicator = local.communicator disk_size = local.disk_size - floppy_files = local.floppy_files + floppy_files = var.floppy_files headless = var.headless http_directory = local.http_directory iso_checksum = var.iso_checksum @@ -512,12 +554,12 @@ source "vmware-iso" "vm" { boot_command = var.vmware_boot_command == null ? local.default_boot_command : var.vmware_boot_command boot_wait = var.vmware_boot_wait == null ? local.default_boot_wait : var.vmware_boot_wait cd_content = var.cd_content - cd_files = local.cd_files # Broken and not creating disks + cd_files = local.cd_files cd_label = var.cd_label cpus = var.cpus communicator = local.communicator disk_size = local.disk_size - floppy_files = local.floppy_files + floppy_files = var.floppy_files headless = var.headless http_directory = local.http_directory iso_checksum = var.iso_checksum diff --git a/packer_templates/pkr-variables.pkr.hcl b/packer_templates/pkr-variables.pkr.hcl index 9b7e5db8a..6947ae29c 100644 --- a/packer_templates/pkr-variables.pkr.hcl +++ b/packer_templates/pkr-variables.pkr.hcl @@ -266,6 +266,10 @@ variable "utm_boot_wait" { type = string default = null } +variable "utm_disable_vnc" { + type = bool + default = null +} variable "utm_display_hardware_type" { type = string default = null @@ -290,7 +294,7 @@ variable "utm_guest_additions_path" { } variable "utm_guest_additions_interface" { type = string - default = null + default = "usb" } variable "utm_guest_additions_url" { type = string @@ -298,16 +302,25 @@ variable "utm_guest_additions_url" { } variable "utm_guest_additions_sha256" { type = string - default = "65b6a69b392ee01dd314c10f3dad9ebbf9c4160be43f5f0dd6bb715944d9095b" + default = null +} +variable "utm_guest_additions_target_path" { + type = string + default = null + description = "Target path for guest additions iso to be downloaded to" } variable "utm_hard_drive_interface" { type = string - default = null + default = "nvme" } variable "utm_hypervisor" { type = bool default = true } +variable "utm_iso_interface" { + type = string + default = "usb" +} variable "utm_uefi_boot" { type = bool default = true @@ -335,11 +348,19 @@ variable "vbox_boot_wait" { type = string default = null } +variable "vbox_chipset" { + type = string + default = null +} variable "vbox_firmware" { type = string - default = null + default = "efi" description = "Firmware type, takes bios or efi" } +variable "vbox_gfx_accelerate_3d" { + type = bool + default = null +} variable "vbox_gfx_controller" { type = string default = null @@ -367,16 +388,20 @@ variable "vbox_guest_os_type" { } variable "vbox_hard_drive_interface" { type = string - default = null + default = "sata" } variable "vbox_iso_interface" { type = string - default = null + default = "sata" } variable "vboxmanage" { type = list(list(string)) default = null } +variable "vbox_nested_virt" { + type = bool + default = null +} variable "vbox_nic_type" { type = string default = null @@ -390,6 +415,10 @@ variable "vbox_rtc_time_base" { default = "UTC" description = "RTC time base" } +variable "vbox_usb" { + type = bool + default = true +} # virtualbox-ovf variable "vbox_source_path" { @@ -425,12 +454,12 @@ variable "vmware_cores" { } variable "vmware_disk_adapter_type" { type = string - default = "sata" - description = "Disk adapter type. Needs to be SATA (PVSCSI, or non-SCSI) for ARM64 builds." + default = "nvme" + description = "The adapter type for additional virtual disk(s). Available options are ide, sata, nvme, or scsi." } variable "vmware_firmware" { type = string - default = null + default = "efi" description = "The firmware type for the virtual machine. Allowed values are bios, efi, and efi-secure (for secure boot). Defaults to the recommended firmware type for the guest operating system" } variable "vmware_guest_os_type" { @@ -577,7 +606,7 @@ variable "winrm_password" { } variable "winrm_timeout" { type = string - default = "60m" + default = "30m" } variable "winrm_username" { type = string diff --git a/packer_templates/scripts/windows/provision.ps1 b/packer_templates/scripts/windows/provision.ps1 index 90041104b..bf4d8153e 100644 --- a/packer_templates/scripts/windows/provision.ps1 +++ b/packer_templates/scripts/windows/provision.ps1 @@ -94,10 +94,10 @@ $volList = Get-Volume | Where-Object {$_.DriveType -ne 'Fixed' -and $_.DriveLett switch ($env:PACKER_BUILDER_TYPE) { {$_ -in "virtualbox-iso", "virtualbox-ovf"} { # Actions for VirtualBox ISO builder + $installed = $false foreach( $vol in $volList ) { $letter = $vol.DriveLetter $exe = "${letter}:\VBoxWindowsAdditions.exe" - $installed = $false if( Test-Path -LiteralPath $exe ) { Write-host "Guest Tools found at $exe" try { @@ -124,13 +124,17 @@ switch ($env:PACKER_BUILDER_TYPE) { } {$_ -in "vmware-iso", "vmware-vmx"} { # Actions for VMware ISO builder - Write-Host 'Mounting VMware Tools ISO...' - Mount-DiskImage -ImagePath C:\vmware-tools.iso -PassThru | Get-Volume - $volList = Get-Volume | Where-Object {$_.DriveType -ne 'Fixed' -and $_.DriveLetter} + $installed = $false + # Check if vmware-tools.iso exists and mount it + $iso_exists = Test-Path -LiteralPath "C:\vmware-tools.iso" + if ( $iso_exists ) { + Write-Host "Found C:\vmware-tools.iso, mounting it..." + Mount-DiskImage -ImagePath C:\vmware-tools.iso -PassThru | Get-Volume + } + $volList = Get-Volume | Where-Object {$_.FileSystemLabel -eq 'VMware Tools' -and $_.DriveLetter} foreach( $vol in $volList ) { $letter = $vol.DriveLetter $exe = "${letter}:\setup.exe" - $installed = $false if( Test-Path -LiteralPath $exe ) { Write-host "Guest Tools found at $exe" try { @@ -146,8 +150,10 @@ switch ($env:PACKER_BUILDER_TYPE) { Write-Host "Guest Tools NOT FOUND at $exe" } } - Dismount-DiskImage -ImagePath C:\vmware-tools.iso - Remove-Item C:\vmware-tools.iso + if ( $iso_exists ) { + Dismount-DiskImage -ImagePath C:\vmware-tools.iso + Remove-Item C:\vmware-tools.iso + } if ( $installed ) { Write-Host "Done installing the guest tools." } else { @@ -157,10 +163,10 @@ switch ($env:PACKER_BUILDER_TYPE) { } {$_ -in "parallels-iso", "parallels-pvm"} { # Actions for Parallels ISO builder + $installed = $false foreach( $vol in $volList ) { $letter = $vol.DriveLetter $exe = "${letter}:\PTAgent.exe" - $installed = $false if( Test-Path -LiteralPath $exe ) { Write-host "Guest Tools found at $exe" try { @@ -187,10 +193,11 @@ switch ($env:PACKER_BUILDER_TYPE) { } {$_ -in "utm-iso", "qemu"} { # Actions for UTM and QEMU builder + $installed = $false foreach( $vol in $volList ) { $letter = $vol.DriveLetter $exe = "${letter}:\virtio-win-guest-tools.exe" - $installed = $false + if( Test-Path -LiteralPath $exe ) { Write-host "Guest Tools found at $exe" try { diff --git a/packer_templates/win_answer_files/11/Autounattend.xml b/packer_templates/win_answer_files/11/Autounattend.xml index 5a8171159..8f2a4f3c5 100644 --- a/packer_templates/win_answer_files/11/Autounattend.xml +++ b/packer_templates/win_answer_files/11/Autounattend.xml @@ -6,38 +6,38 @@ This makes the VirtIO drivers available to Windows, assuming that the VirtIO driver disk at https://fedorapeople.org/groups/virt/virtio-win/direct-downloads/stable-virtio/virtio-win.iso (see https://docs.fedoraproject.org/en-US/quick-docs/creating-windows-virtual-machines-using-virtio-drivers/index.html#virtio-win-direct-downloads) - is available as drive E: + is available as drive F: --> <DriverPaths> <PathAndCredentials wcm:action="add" wcm:keyValue="2"> - <Path>E:\viostor\w11\amd64</Path> + <Path>F:\viostor\w11\amd64</Path> </PathAndCredentials> <PathAndCredentials wcm:action="add" wcm:keyValue="3"> - <Path>E:\NetKVM\w11\amd64</Path> + <Path>F:\NetKVM\w11\amd64</Path> </PathAndCredentials> <PathAndCredentials wcm:action="add" wcm:keyValue="4"> - <Path>E:\Balloon\w11\amd64</Path> + <Path>F:\Balloon\w11\amd64</Path> </PathAndCredentials> <PathAndCredentials wcm:action="add" wcm:keyValue="5"> - <Path>E:\pvpanic\w11\amd64</Path> + <Path>F:\pvpanic\w11\amd64</Path> </PathAndCredentials> <PathAndCredentials wcm:action="add" wcm:keyValue="6"> - <Path>E:\qemupciserial\w11\amd64</Path> + <Path>F:\qemupciserial\w11\amd64</Path> </PathAndCredentials> <PathAndCredentials wcm:action="add" wcm:keyValue="7"> - <Path>E:\qxldod\w11\amd64</Path> + <Path>F:\qxldod\w11\amd64</Path> </PathAndCredentials> <PathAndCredentials wcm:action="add" wcm:keyValue="8"> - <Path>E:\vioinput\w11\amd64</Path> + <Path>F:\vioinput\w11\amd64</Path> </PathAndCredentials> <PathAndCredentials wcm:action="add" wcm:keyValue="9"> - <Path>E:\viorng\w11\amd64</Path> + <Path>F:\viorng\w11\amd64</Path> </PathAndCredentials> <PathAndCredentials wcm:action="add" wcm:keyValue="10"> - <Path>E:\vioscsi\w11\amd64</Path> + <Path>F:\vioscsi\w11\amd64</Path> </PathAndCredentials> <PathAndCredentials wcm:action="add" wcm:keyValue="11"> - <Path>E:\vioserial\w11\amd64</Path> + <Path>F:\vioserial\w11\amd64</Path> </PathAndCredentials> </DriverPaths> </component> @@ -52,45 +52,49 @@ <UserLocale>en-US</UserLocale> </component> <component name="Microsoft-Windows-Setup" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> - <RunSynchronous> - <RunSynchronousCommand wcm:action="add"> - <Order>1</Order> - <Path>%windir%\System32\reg.exe add "HKLM\SYSTEM\Setup\LabConfig" /v BypassTPMCheck /t REG_DWORD /d 1 /f</Path> - </RunSynchronousCommand> - <RunSynchronousCommand wcm:action="add"> - <Order>2</Order> - <Path>%windir%\System32\reg.exe add "HKLM\SYSTEM\Setup\LabConfig" /v BypassSecureBootCheck /t REG_DWORD /d 1 /f</Path> - </RunSynchronousCommand> - </RunSynchronous> <DiskConfiguration> <Disk wcm:action="add"> <CreatePartitions> + <!-- 1. EFI System Partition --> <CreatePartition wcm:action="add"> - <Type>Primary</Type> <Order>1</Order> - <Size>100</Size> + <Size>500</Size> + <Type>EFI</Type> </CreatePartition> + <!-- 2. Microsoft Reserved Partition (MSR) --> <CreatePartition wcm:action="add"> <Order>2</Order> - <Type>Primary</Type> + <Size>128</Size> + <Type>MSR</Type> + </CreatePartition> + <!-- 3. Windows Primary Partition (rest of the space) --> + <CreatePartition wcm:action="add"> + <Order>3</Order> <Extend>true</Extend> + <Type>Primary</Type> </CreatePartition> </CreatePartitions> <ModifyPartitions> + <!-- Format the EFI partition --> <ModifyPartition wcm:action="add"> - <Active>true</Active> - <Format>NTFS</Format> - <Label>boot</Label> <Order>1</Order> <PartitionID>1</PartitionID> + <Label>System</Label> + <Format>FAT32</Format> </ModifyPartition> + <!-- MSR partition - no format but needs entry --> <ModifyPartition wcm:action="add"> - <Format>NTFS</Format> - <Label>Windows</Label> - <Letter>C</Letter> <Order>2</Order> <PartitionID>2</PartitionID> </ModifyPartition> + <!-- Format the Windows partition --> + <ModifyPartition wcm:action="add"> + <Order>3</Order> + <PartitionID>3</PartitionID> + <Label>Windows</Label> + <Format>NTFS</Format> + <Letter>C</Letter> + </ModifyPartition> </ModifyPartitions> <DiskID>0</DiskID> <WillWipeDisk>true</WillWipeDisk> @@ -98,29 +102,47 @@ </DiskConfiguration> <ImageInstall> <OSImage> - <InstallFrom> - <MetaData wcm:action="add"> - <Key>/IMAGE/NAME</Key> - <Value>Windows 11 Enterprise Evaluation</Value> - </MetaData> - </InstallFrom> <InstallTo> <DiskID>0</DiskID> - <PartitionID>2</PartitionID> + <PartitionID>3</PartitionID> </InstallTo> </OSImage> </ImageInstall> <UserData> <ProductKey> + <!-- Public Trial license key --> + <Key>XGVPP-NMH47-7TTHJ-W3FW7-8HV2C</Key> <WillShowUI>OnError</WillShowUI> </ProductKey> <AcceptEula>true</AcceptEula> - <FullName>Vagrant</FullName> - <Organization>Bento by Progress Chef.</Organization> </UserData> - <DynamicUpdate> - <Enable>false</Enable> - </DynamicUpdate> + <UseConfigurationSet>false</UseConfigurationSet> + <RunSynchronous> + <RunSynchronousCommand wcm:action="add"> + <Order>1</Order> + <Path>cmd.exe /c "&gt;&gt;"X:\diskpart.txt" (echo SELECT DISK=0&amp;echo CLEAN&amp;echo CONVERT GPT&amp;echo CREATE PARTITION EFI SIZE=100&amp;echo FORMAT QUICK FS=FAT32 LABEL="System"&amp;echo CREATE PARTITION MSR SIZE=16)"</Path> + </RunSynchronousCommand> + <RunSynchronousCommand wcm:action="add"> + <Order>2</Order> + <Path>cmd.exe /c "&gt;&gt;"X:\diskpart.txt" (echo CREATE PARTITION PRIMARY&amp;echo FORMAT QUICK FS=NTFS LABEL="Windows")"</Path> + </RunSynchronousCommand> + <RunSynchronousCommand wcm:action="add"> + <Order>3</Order> + <Path>cmd.exe /c "diskpart.exe /s "X:\diskpart.txt" &gt;&gt;"X:\diskpart.log" || ( type "X:\diskpart.log" &amp; echo diskpart encountered an error. &amp; pause &amp; exit /b 1 )"</Path> + </RunSynchronousCommand> + <RunSynchronousCommand wcm:action="add"> + <Order>4</Order> + <Path>reg.exe add "HKLM\SYSTEM\Setup\LabConfig" /v BypassTPMCheck /t REG_DWORD /d 1 /f</Path> + </RunSynchronousCommand> + <RunSynchronousCommand wcm:action="add"> + <Order>5</Order> + <Path>reg.exe add "HKLM\SYSTEM\Setup\LabConfig" /v BypassSecureBootCheck /t REG_DWORD /d 1 /f</Path> + </RunSynchronousCommand> + <RunSynchronousCommand wcm:action="add"> + <Order>6</Order> + <Path>reg.exe add "HKLM\SYSTEM\Setup\LabConfig" /v BypassRAMCheck /t REG_DWORD /d 1 /f</Path> + </RunSynchronousCommand> + </RunSynchronous> </component> </settings> <settings pass="generalize"> diff --git a/packer_templates/win_answer_files/11/arm64/Autounattend.xml b/packer_templates/win_answer_files/11/arm64/Autounattend.xml index 36c527a73..7fb5bf435 100644 --- a/packer_templates/win_answer_files/11/arm64/Autounattend.xml +++ b/packer_templates/win_answer_files/11/arm64/Autounattend.xml @@ -3,6 +3,46 @@ <!--https://schneegans.de/windows/unattend-generator/?LanguageMode=Unattended&UILanguage=en-US&Locale=en-US&Keyboard=00000409&GeoLocation=244&ProcessorArchitecture=amd64&ProcessorArchitecture=arm64&BypassRequirementsCheck=true&ComputerNameMode=Custom&ComputerName=bento&CompactOsMode=Default&TimeZoneMode=Explicit&TimeZone=UTC&PartitionMode=Unattended&PartitionLayout=GPT&EspSize=100&RecoveryMode=None&WindowsEditionMode=Generic&WindowsEdition=enterprise&UserAccountMode=Unattended&AccountName0=vagrant&AccountDisplayName0=&AccountPassword0=vagrant&AccountGroup0=Administrators&AccountName1=&AccountName2=&AccountName3=&AccountName4=&AutoLogonMode=Own&PasswordExpirationMode=Unlimited&LockoutMode=Disabled&HideFiles=HiddenSystem&ShowFileExtensions=true&TaskbarSearch=Box&TaskbarIconsMode=Default&DisableWidgets=true&StartTilesMode=Default&StartPinsMode=Default&DisableUac=true&DisableSac=true&DisableSmartScreen=true&DisableFastStartup=true&DisableSystemRestore=true&EnableRemoteDesktop=true&AllowPowerShellScripts=true&DisableAppSuggestions=true&PreventDeviceEncryption=true&HideEdgeFre=true&DeleteWindowsOld=true&EffectsMode=Performance&DesktopIconsMode=Default&VBoxGuestAdditions=true&VMwareTools=true&VirtIoGuestTools=true&WifiMode=Skip&ExpressSettings=DisableAll&KeysMode=Skip&ColorMode=Default&WallpaperMode=Default&Remove3DViewer=true&RemoveBingSearch=true&RemoveCalculator=true&RemoveCamera=true&RemoveClipchamp=true&RemoveClock=true&RemoveCopilot=true&RemoveCortana=true&RemoveDevHome=true&RemoveFamily=true&RemoveFeedbackHub=true&RemoveGetHelp=true&RemoveHandwriting=true&RemoveInternetExplorer=true&RemoveMailCalendar=true&RemoveMaps=true&RemoveMathInputPanel=true&RemoveMediaFeatures=true&RemoveMixedReality=true&RemoveZuneVideo=true&RemoveNews=true&RemoveOffice365=true&RemoveOneDrive=true&RemoveOneNote=true&RemoveOneSync=true&RemoveOutlook=true&RemovePaint=true&RemovePaint3D=true&RemovePeople=true&RemovePhotos=true&RemovePowerAutomate=true&RemovePowerShell2=true&RemoveQuickAssist=true&RemoveRecall=true&RemoveSkype=true&RemoveSnippingTool=true&RemoveSolitaire=true&RemoveSpeech=true&RemoveStepsRecorder=true&RemoveStickyNotes=true&RemoveTeams=true&RemoveGetStarted=true&RemoveToDo=true&RemoveVoiceRecorder=true&RemoveWallet=true&RemoveWeather=true&RemoveFaxAndScan=true&RemoveWindowsHello=true&RemoveWindowsMediaPlayer=true&RemoveZuneMusic=true&RemoveXboxApps=true&RemoveYourPhone=true&SystemScript0=%26+%7B%0D%0A++foreach%28+%24letter+in+%27DEFGHIJKLMNOPQRSTUVWXYZ%27.ToCharArray%28%29+%29+%7B%0D%0A++++%24exe+%3D+%22%24%7Bletter%7D%3A%5CPTAgent.exe%22%3B%0D%0A++++if%28+Test-Path+-LiteralPath+%24exe+%29+%7B%0D%0A++++++Start-Process+-FilePath+%24exe+-ArgumentList+%27%2Finstall_silent%27%2C+%27%2Fnorestart%27+-Wait%3B%0D%0A++++++return%3B%0D%0A++++%7D%0D%0A++%7D%0D%0A++%27Parallels+Tools+image+%28windows.iso%29+is+not+attached+to+this+VM.%27%3B%0D%0A%7D+*%3E%261+%3E%3E+%27C%3A%5CWindows%5CSetup%5CScripts%5CParallelsTools.log%27%3B&SystemScriptType0=Ps1&FirstLogonScript0=Get-NetConnectionProfile+%7C+Set-NetConnectionProfile+-NetworkCategory+%22Private%22%3B%0D%0ASet-NetFirewallRule+-Name+%22WINRM-HTTP-In-TCP%22+-RemoteAddress+Any%3B%0D%0Areg.exe+ADD+%22HKLM%5CSOFTWARE%5CMicrosoft%5CWindows+NT%5CCurrentVersion%5CWinlogon%22+%2Fv+AutoAdminLogon+%2Ft+REG_SZ+%2Fd+1+%2Ff%3B%0D%0Areg.exe+ADD+%22HKLM%5CSOFTWARE%5CMicrosoft%5CWindows+NT%5CCurrentVersion%5CWinlogon%22+%2Fv+DefaultUserName+%2Ft+REG_SZ+%2Fd+%22vagrant%22+%2Ff%3B%0D%0Areg.exe+ADD+%22HKLM%5CSOFTWARE%5CMicrosoft%5CWindows+NT%5CCurrentVersion%5CWinlogon%22+%2Fv+DefaultPassword+%2Ft+REG_SZ+%2Fd+%22vagrant%22+%2Ff%3B%0D%0Acmd.exe+%2Fc+winrm+quickconfig+-q%3B%0D%0Acmd.exe+%2Fc+winrm+quickconfig+-transport%3Ahttp%3B%0D%0Acmd.exe+%2Fc+winrm+set+winrm%2Fconfig+%40%7BMaxTimeoutms%3D%221800000%22%7D%3B%0D%0Acmd.exe+%2Fc+winrm+set+winrm%2Fconfig%2Fwinrs+%40%7BMaxMemoryPerShellMB%3D%222048%22%7D%3B%0D%0Acmd.exe+%2Fc+winrm+set+winrm%2Fconfig%2Fservice+%40%7BAllowUnencrypted%3D%22true%22%7D%3B%0D%0Acmd.exe+%2Fc+winrm+set+winrm%2Fconfig%2Fservice%2Fauth+%40%7BBasic%3D%22true%22%7D%3B%0D%0Acmd.exe+%2Fc+winrm+set+winrm%2Fconfig%2Fclient%2Fauth+%40%7BBasic%3D%22true%22%7D%3B%0D%0Acmd.exe+%2Fc+winrm+set+winrm%2Fconfig%2Flistener%3FAddress%3D*%2BTransport%3DHTTP+%40%7BPort%3D%225985%22%7D%3B%0D%0Acmd.exe+%2Fc+netsh+firewall+add+portopening+TCP+5985+%22Port+5985%22%3B%0D%0Acmd.exe+%2Fc+net+stop+winrm%3B%0D%0Acmd.exe+%2Fc+sc+config+winrm+start%3D+auto%3B%0D%0Acmd.exe+%2Fc+net+start+winrm%3B%0D%0Acmd.exe+%2Fc+wmic+useraccount+where+%22name%3D%27vagrant%27%22+set+PasswordExpires%3DFALSE%3B&FirstLogonScriptType0=Ps1&WdacMode=Skip--> <settings pass="offlineServicing"></settings> <settings pass="windowsPE"> + <component name="Microsoft-Windows-PnpCustomizationsWinPE" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" processorArchitecture="arm64"> + <!-- + This makes the VirtIO drivers available to Windows, assuming that + the VirtIO driver disk at https://fedorapeople.org/groups/virt/virtio-win/direct-downloads/stable-virtio/virtio-win.iso + (see https://docs.fedoraproject.org/en-US/quick-docs/creating-windows-virtual-machines-using-virtio-drivers/index.html#virtio-win-direct-downloads) + is available as drive F: + --> + <DriverPaths> + <PathAndCredentials wcm:action="add" wcm:keyValue="2"> + <Path>F:\viostor\w11\ARM64</Path> + </PathAndCredentials> + <PathAndCredentials wcm:action="add" wcm:keyValue="3"> + <Path>F:\NetKVM\w11\ARM64</Path> + </PathAndCredentials> + <PathAndCredentials wcm:action="add" wcm:keyValue="4"> + <Path>F:\Balloon\w11\ARM64</Path> + </PathAndCredentials> + <PathAndCredentials wcm:action="add" wcm:keyValue="5"> + <Path>F:\pvpanic\w11\ARM64</Path> + </PathAndCredentials> + <PathAndCredentials wcm:action="add" wcm:keyValue="6"> + <Path>F:\qemupciserial\w11\ARM64</Path> + </PathAndCredentials> + <PathAndCredentials wcm:action="add" wcm:keyValue="7"> + <Path>F:\qxldod\w11\ARM64</Path> + </PathAndCredentials> + <PathAndCredentials wcm:action="add" wcm:keyValue="8"> + <Path>F:\vioinput\w11\ARM64</Path> + </PathAndCredentials> + <PathAndCredentials wcm:action="add" wcm:keyValue="9"> + <Path>F:\viorng\w11\ARM64</Path> + </PathAndCredentials> + <PathAndCredentials wcm:action="add" wcm:keyValue="10"> + <Path>F:\vioscsi\w11\ARM64</Path> + </PathAndCredentials> + <PathAndCredentials wcm:action="add" wcm:keyValue="11"> + <Path>F:\vioserial\w11\ARM64</Path> + </PathAndCredentials> + </DriverPaths> + </component> <component name="Microsoft-Windows-International-Core-WinPE" processorArchitecture="arm64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> <SetupUILanguage> <UILanguage>en-US</UILanguage> @@ -13,7 +53,55 @@ <UserLocale>en-US</UserLocale> </component> <component name="Microsoft-Windows-Setup" processorArchitecture="arm64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> - <ImageInstall> + <DiskConfiguration> + <Disk wcm:action="add"> + <CreatePartitions> + <!-- 1. EFI System Partition --> + <CreatePartition wcm:action="add"> + <Order>1</Order> + <Size>500</Size> + <Type>EFI</Type> + </CreatePartition> + <!-- 2. Microsoft Reserved Partition (MSR) --> + <CreatePartition wcm:action="add"> + <Order>2</Order> + <Size>128</Size> + <Type>MSR</Type> + </CreatePartition> + <!-- 3. Windows Primary Partition (rest of the space) --> + <CreatePartition wcm:action="add"> + <Order>3</Order> + <Extend>true</Extend> + <Type>Primary</Type> + </CreatePartition> + </CreatePartitions> + <ModifyPartitions> + <!-- Format the EFI partition --> + <ModifyPartition wcm:action="add"> + <Order>1</Order> + <PartitionID>1</PartitionID> + <Label>System</Label> + <Format>FAT32</Format> + </ModifyPartition> + <!-- MSR partition - no format but needs entry --> + <ModifyPartition wcm:action="add"> + <Order>2</Order> + <PartitionID>2</PartitionID> + </ModifyPartition> + <!-- Format the Windows partition --> + <ModifyPartition wcm:action="add"> + <Order>3</Order> + <PartitionID>3</PartitionID> + <Label>Windows</Label> + <Format>NTFS</Format> + <Letter>C</Letter> + </ModifyPartition> + </ModifyPartitions> + <DiskID>0</DiskID> + <WillWipeDisk>true</WillWipeDisk> + </Disk> + </DiskConfiguration> + <ImageInstall> <OSImage> <InstallTo> <DiskID>0</DiskID> @@ -23,6 +111,7 @@ </ImageInstall> <UserData> <ProductKey> + <!-- Public Trial license key --> <Key>XGVPP-NMH47-7TTHJ-W3FW7-8HV2C</Key> <WillShowUI>OnError</WillShowUI> </ProductKey> @@ -32,26 +121,14 @@ <RunSynchronous> <RunSynchronousCommand wcm:action="add"> <Order>1</Order> - <Path>cmd.exe /c "&gt;&gt;"X:\diskpart.txt" (echo SELECT DISK=0&amp;echo CLEAN&amp;echo CONVERT GPT&amp;echo CREATE PARTITION EFI SIZE=100&amp;echo FORMAT QUICK FS=FAT32 LABEL="System"&amp;echo CREATE PARTITION MSR SIZE=16)"</Path> - </RunSynchronousCommand> - <RunSynchronousCommand wcm:action="add"> - <Order>2</Order> - <Path>cmd.exe /c "&gt;&gt;"X:\diskpart.txt" (echo CREATE PARTITION PRIMARY&amp;echo FORMAT QUICK FS=NTFS LABEL="Windows")"</Path> - </RunSynchronousCommand> - <RunSynchronousCommand wcm:action="add"> - <Order>3</Order> - <Path>cmd.exe /c "diskpart.exe /s "X:\diskpart.txt" &gt;&gt;"X:\diskpart.log" || ( type "X:\diskpart.log" &amp; echo diskpart encountered an error. &amp; pause &amp; exit /b 1 )"</Path> - </RunSynchronousCommand> - <RunSynchronousCommand wcm:action="add"> - <Order>4</Order> <Path>reg.exe add "HKLM\SYSTEM\Setup\LabConfig" /v BypassTPMCheck /t REG_DWORD /d 1 /f</Path> </RunSynchronousCommand> <RunSynchronousCommand wcm:action="add"> - <Order>5</Order> + <Order>2</Order> <Path>reg.exe add "HKLM\SYSTEM\Setup\LabConfig" /v BypassSecureBootCheck /t REG_DWORD /d 1 /f</Path> </RunSynchronousCommand> <RunSynchronousCommand wcm:action="add"> - <Order>6</Order> + <Order>3</Order> <Path>reg.exe add "HKLM\SYSTEM\Setup\LabConfig" /v BypassRAMCheck /t REG_DWORD /d 1 /f</Path> </RunSynchronousCommand> </RunSynchronous> diff --git a/packer_templates/win_answer_files/2016/Autounattend.xml b/packer_templates/win_answer_files/2016/Autounattend.xml index 6379e2f8c..6b3877c88 100644 --- a/packer_templates/win_answer_files/2016/Autounattend.xml +++ b/packer_templates/win_answer_files/2016/Autounattend.xml @@ -6,38 +6,38 @@ This makes the VirtIO drivers available to Windows, assuming that the VirtIO driver disk at https://fedorapeople.org/groups/virt/virtio-win/direct-downloads/stable-virtio/virtio-win.iso (see https://docs.fedoraproject.org/en-US/quick-docs/creating-windows-virtual-machines-using-virtio-drivers/index.html#virtio-win-direct-downloads) - is available as drive E: + is available as drive F: --> <DriverPaths> <PathAndCredentials wcm:action="add" wcm:keyValue="2"> - <Path>E:\viostor\2k16\amd64</Path> + <Path>F:\viostor\2k16\amd64</Path> </PathAndCredentials> <PathAndCredentials wcm:action="add" wcm:keyValue="3"> - <Path>E:\NetKVM\2k16\amd64</Path> + <Path>F:\NetKVM\2k16\amd64</Path> </PathAndCredentials> <PathAndCredentials wcm:action="add" wcm:keyValue="4"> - <Path>E:\Balloon\2k16\amd64</Path> + <Path>F:\Balloon\2k16\amd64</Path> </PathAndCredentials> <PathAndCredentials wcm:action="add" wcm:keyValue="5"> - <Path>E:\pvpanic\2k16\amd64</Path> + <Path>F:\pvpanic\2k16\amd64</Path> </PathAndCredentials> <PathAndCredentials wcm:action="add" wcm:keyValue="6"> - <Path>E:\qemupciserial\2k16\amd64</Path> + <Path>F:\qemupciserial\2k16\amd64</Path> </PathAndCredentials> <PathAndCredentials wcm:action="add" wcm:keyValue="7"> - <Path>E:\qxldod\2k16\amd64</Path> + <Path>F:\qxldod\2k16\amd64</Path> </PathAndCredentials> <PathAndCredentials wcm:action="add" wcm:keyValue="8"> - <Path>E:\vioinput\2k16\amd64</Path> + <Path>F:\vioinput\2k16\amd64</Path> </PathAndCredentials> <PathAndCredentials wcm:action="add" wcm:keyValue="9"> - <Path>E:\viorng\2k16\amd64</Path> + <Path>F:\viorng\2k16\amd64</Path> </PathAndCredentials> <PathAndCredentials wcm:action="add" wcm:keyValue="10"> - <Path>E:\vioscsi\2k16\amd64</Path> + <Path>F:\vioscsi\2k16\amd64</Path> </PathAndCredentials> <PathAndCredentials wcm:action="add" wcm:keyValue="11"> - <Path>E:\vioserial\2k16\amd64</Path> + <Path>F:\vioserial\2k16\amd64</Path> </PathAndCredentials> </DriverPaths> </component> @@ -55,32 +55,46 @@ <DiskConfiguration> <Disk wcm:action="add"> <CreatePartitions> + <!-- 1. EFI System Partition --> <CreatePartition wcm:action="add"> - <Type>Primary</Type> <Order>1</Order> - <Size>100</Size> + <Size>500</Size> + <Type>EFI</Type> </CreatePartition> + <!-- 2. Microsoft Reserved Partition (MSR) --> <CreatePartition wcm:action="add"> <Order>2</Order> - <Type>Primary</Type> + <Size>128</Size> + <Type>MSR</Type> + </CreatePartition> + <!-- 3. Windows Primary Partition (rest of the space) --> + <CreatePartition wcm:action="add"> + <Order>3</Order> <Extend>true</Extend> + <Type>Primary</Type> </CreatePartition> </CreatePartitions> <ModifyPartitions> + <!-- Format the EFI partition --> <ModifyPartition wcm:action="add"> - <Active>true</Active> - <Format>NTFS</Format> - <Label>boot</Label> <Order>1</Order> <PartitionID>1</PartitionID> + <Label>System</Label> + <Format>FAT32</Format> </ModifyPartition> + <!-- MSR partition - no format but needs entry --> <ModifyPartition wcm:action="add"> - <Format>NTFS</Format> - <Label>Windows</Label> - <Letter>C</Letter> <Order>2</Order> <PartitionID>2</PartitionID> </ModifyPartition> + <!-- Format the Windows partition --> + <ModifyPartition wcm:action="add"> + <Order>3</Order> + <PartitionID>3</PartitionID> + <Label>Windows</Label> + <Format>NTFS</Format> + <Letter>C</Letter> + </ModifyPartition> </ModifyPartitions> <DiskID>0</DiskID> <WillWipeDisk>true</WillWipeDisk> @@ -96,7 +110,7 @@ </InstallFrom> <InstallTo> <DiskID>0</DiskID> - <PartitionID>2</PartitionID> + <PartitionID>3</PartitionID> </InstallTo> </OSImage> </ImageInstall> diff --git a/packer_templates/win_answer_files/2019/Autounattend.xml b/packer_templates/win_answer_files/2019/Autounattend.xml index 6cb3a61b4..3043d5e03 100644 --- a/packer_templates/win_answer_files/2019/Autounattend.xml +++ b/packer_templates/win_answer_files/2019/Autounattend.xml @@ -6,38 +6,38 @@ This makes the VirtIO drivers available to Windows, assuming that the VirtIO driver disk at https://fedorapeople.org/groups/virt/virtio-win/direct-downloads/stable-virtio/virtio-win.iso (see https://docs.fedoraproject.org/en-US/quick-docs/creating-windows-virtual-machines-using-virtio-drivers/index.html#virtio-win-direct-downloads) - is available as drive E: + is available as drive F: --> <DriverPaths> <PathAndCredentials wcm:action="add" wcm:keyValue="2"> - <Path>E:\viostor\2k19\amd64</Path> + <Path>F:\viostor\2k19\amd64</Path> </PathAndCredentials> <PathAndCredentials wcm:action="add" wcm:keyValue="3"> - <Path>E:\NetKVM\2k19\amd64</Path> + <Path>F:\NetKVM\2k19\amd64</Path> </PathAndCredentials> <PathAndCredentials wcm:action="add" wcm:keyValue="4"> - <Path>E:\Balloon\2k19\amd64</Path> + <Path>F:\Balloon\2k19\amd64</Path> </PathAndCredentials> <PathAndCredentials wcm:action="add" wcm:keyValue="5"> - <Path>E:\pvpanic\2k19\amd64</Path> + <Path>F:\pvpanic\2k19\amd64</Path> </PathAndCredentials> <PathAndCredentials wcm:action="add" wcm:keyValue="6"> - <Path>E:\qemupciserial\2k19\amd64</Path> + <Path>F:\qemupciserial\2k19\amd64</Path> </PathAndCredentials> <PathAndCredentials wcm:action="add" wcm:keyValue="7"> - <Path>E:\qxldod\2k19\amd64</Path> + <Path>F:\qxldod\2k19\amd64</Path> </PathAndCredentials> <PathAndCredentials wcm:action="add" wcm:keyValue="8"> - <Path>E:\vioinput\2k19\amd64</Path> + <Path>F:\vioinput\2k19\amd64</Path> </PathAndCredentials> <PathAndCredentials wcm:action="add" wcm:keyValue="9"> - <Path>E:\viorng\2k19\amd64</Path> + <Path>F:\viorng\2k19\amd64</Path> </PathAndCredentials> <PathAndCredentials wcm:action="add" wcm:keyValue="10"> - <Path>E:\vioscsi\2k19\amd64</Path> + <Path>F:\vioscsi\2k19\amd64</Path> </PathAndCredentials> <PathAndCredentials wcm:action="add" wcm:keyValue="11"> - <Path>E:\vioserial\2k19\amd64</Path> + <Path>F:\vioserial\2k19\amd64</Path> </PathAndCredentials> </DriverPaths> </component> @@ -55,32 +55,46 @@ <DiskConfiguration> <Disk wcm:action="add"> <CreatePartitions> + <!-- 1. EFI System Partition --> <CreatePartition wcm:action="add"> - <Type>Primary</Type> <Order>1</Order> - <Size>100</Size> + <Size>500</Size> + <Type>EFI</Type> </CreatePartition> + <!-- 2. Microsoft Reserved Partition (MSR) --> <CreatePartition wcm:action="add"> <Order>2</Order> - <Type>Primary</Type> + <Size>128</Size> + <Type>MSR</Type> + </CreatePartition> + <!-- 3. Windows Primary Partition (rest of the space) --> + <CreatePartition wcm:action="add"> + <Order>3</Order> <Extend>true</Extend> + <Type>Primary</Type> </CreatePartition> </CreatePartitions> <ModifyPartitions> + <!-- Format the EFI partition --> <ModifyPartition wcm:action="add"> - <Active>true</Active> - <Format>NTFS</Format> - <Label>boot</Label> <Order>1</Order> <PartitionID>1</PartitionID> + <Label>System</Label> + <Format>FAT32</Format> </ModifyPartition> + <!-- MSR partition - no format but needs entry --> <ModifyPartition wcm:action="add"> - <Format>NTFS</Format> - <Label>Windows</Label> - <Letter>C</Letter> <Order>2</Order> <PartitionID>2</PartitionID> </ModifyPartition> + <!-- Format the Windows partition --> + <ModifyPartition wcm:action="add"> + <Order>3</Order> + <PartitionID>3</PartitionID> + <Label>Windows</Label> + <Format>NTFS</Format> + <Letter>C</Letter> + </ModifyPartition> </ModifyPartitions> <DiskID>0</DiskID> <WillWipeDisk>true</WillWipeDisk> @@ -96,7 +110,7 @@ </InstallFrom> <InstallTo> <DiskID>0</DiskID> - <PartitionID>2</PartitionID> + <PartitionID>3</PartitionID> </InstallTo> </OSImage> </ImageInstall> diff --git a/packer_templates/win_answer_files/2022/Autounattend.xml b/packer_templates/win_answer_files/2022/Autounattend.xml index 9d02fb7df..ecb2b0de8 100644 --- a/packer_templates/win_answer_files/2022/Autounattend.xml +++ b/packer_templates/win_answer_files/2022/Autounattend.xml @@ -6,38 +6,38 @@ This makes the VirtIO drivers available to Windows, assuming that the VirtIO driver disk at https://fedorapeople.org/groups/virt/virtio-win/direct-downloads/stable-virtio/virtio-win.iso (see https://docs.fedoraproject.org/en-US/quick-docs/creating-windows-virtual-machines-using-virtio-drivers/index.html#virtio-win-direct-downloads) - is available as drive E: + is available as drive F: --> <DriverPaths> <PathAndCredentials wcm:action="add" wcm:keyValue="2"> - <Path>E:\viostor\2k22\amd64</Path> + <Path>F:\viostor\2k22\amd64</Path> </PathAndCredentials> <PathAndCredentials wcm:action="add" wcm:keyValue="3"> - <Path>E:\NetKVM\2k22\amd64</Path> + <Path>F:\NetKVM\2k22\amd64</Path> </PathAndCredentials> <PathAndCredentials wcm:action="add" wcm:keyValue="4"> - <Path>E:\Balloon\2k22\amd64</Path> + <Path>F:\Balloon\2k22\amd64</Path> </PathAndCredentials> <PathAndCredentials wcm:action="add" wcm:keyValue="5"> - <Path>E:\pvpanic\2k22\amd64</Path> + <Path>F:\pvpanic\2k22\amd64</Path> </PathAndCredentials> <PathAndCredentials wcm:action="add" wcm:keyValue="6"> - <Path>E:\qemupciserial\2k22\amd64</Path> + <Path>F:\qemupciserial\2k22\amd64</Path> </PathAndCredentials> <PathAndCredentials wcm:action="add" wcm:keyValue="7"> - <Path>E:\qxldod\2k22\amd64</Path> + <Path>F:\qxldod\2k22\amd64</Path> </PathAndCredentials> <PathAndCredentials wcm:action="add" wcm:keyValue="8"> - <Path>E:\vioinput\2k22\amd64</Path> + <Path>F:\vioinput\2k22\amd64</Path> </PathAndCredentials> <PathAndCredentials wcm:action="add" wcm:keyValue="9"> - <Path>E:\viorng\2k22\amd64</Path> + <Path>F:\viorng\2k22\amd64</Path> </PathAndCredentials> <PathAndCredentials wcm:action="add" wcm:keyValue="10"> - <Path>E:\vioscsi\2k22\amd64</Path> + <Path>F:\vioscsi\2k22\amd64</Path> </PathAndCredentials> <PathAndCredentials wcm:action="add" wcm:keyValue="11"> - <Path>E:\vioserial\2k22\amd64</Path> + <Path>F:\vioserial\2k22\amd64</Path> </PathAndCredentials> </DriverPaths> </component> @@ -55,32 +55,46 @@ <DiskConfiguration> <Disk wcm:action="add"> <CreatePartitions> + <!-- 1. EFI System Partition --> <CreatePartition wcm:action="add"> - <Type>Primary</Type> <Order>1</Order> - <Size>100</Size> + <Size>500</Size> + <Type>EFI</Type> </CreatePartition> + <!-- 2. Microsoft Reserved Partition (MSR) --> <CreatePartition wcm:action="add"> <Order>2</Order> - <Type>Primary</Type> + <Size>128</Size> + <Type>MSR</Type> + </CreatePartition> + <!-- 3. Windows Primary Partition (rest of the space) --> + <CreatePartition wcm:action="add"> + <Order>3</Order> <Extend>true</Extend> + <Type>Primary</Type> </CreatePartition> </CreatePartitions> <ModifyPartitions> + <!-- Format the EFI partition --> <ModifyPartition wcm:action="add"> - <Active>true</Active> - <Format>NTFS</Format> - <Label>boot</Label> <Order>1</Order> <PartitionID>1</PartitionID> + <Label>System</Label> + <Format>FAT32</Format> </ModifyPartition> + <!-- MSR partition - no format but needs entry --> <ModifyPartition wcm:action="add"> - <Format>NTFS</Format> - <Label>Windows</Label> - <Letter>C</Letter> <Order>2</Order> <PartitionID>2</PartitionID> </ModifyPartition> + <!-- Format the Windows partition --> + <ModifyPartition wcm:action="add"> + <Order>3</Order> + <PartitionID>3</PartitionID> + <Label>Windows</Label> + <Format>NTFS</Format> + <Letter>C</Letter> + </ModifyPartition> </ModifyPartitions> <DiskID>0</DiskID> <WillWipeDisk>true</WillWipeDisk> @@ -96,7 +110,7 @@ </InstallFrom> <InstallTo> <DiskID>0</DiskID> - <PartitionID>2</PartitionID> + <PartitionID>3</PartitionID> </InstallTo> </OSImage> </ImageInstall> diff --git a/packer_templates/win_answer_files/2025/Autounattend.xml b/packer_templates/win_answer_files/2025/Autounattend.xml index 2816d97fe..7a6fa5713 100644 --- a/packer_templates/win_answer_files/2025/Autounattend.xml +++ b/packer_templates/win_answer_files/2025/Autounattend.xml @@ -6,38 +6,38 @@ This makes the VirtIO drivers available to Windows, assuming that the VirtIO driver disk at https://fedorapeople.org/groups/virt/virtio-win/direct-downloads/stable-virtio/virtio-win.iso (see https://docs.fedoraproject.org/en-US/quick-docs/creating-windows-virtual-machines-using-virtio-drivers/index.html#virtio-win-direct-downloads) - is available as drive E: + is available as drive F: --> <DriverPaths> <PathAndCredentials wcm:action="add" wcm:keyValue="2"> - <Path>E:\viostor\2k22\amd64</Path> + <Path>F:\viostor\2k25\amd64</Path> </PathAndCredentials> <PathAndCredentials wcm:action="add" wcm:keyValue="3"> - <Path>E:\NetKVM\2k22\amd64</Path> + <Path>F:\NetKVM\2k25\amd64</Path> </PathAndCredentials> <PathAndCredentials wcm:action="add" wcm:keyValue="4"> - <Path>E:\Balloon\2k22\amd64</Path> + <Path>F:\Balloon\2k25\amd64</Path> </PathAndCredentials> <PathAndCredentials wcm:action="add" wcm:keyValue="5"> - <Path>E:\pvpanic\2k22\amd64</Path> + <Path>F:\pvpanic\2k25\amd64</Path> </PathAndCredentials> <PathAndCredentials wcm:action="add" wcm:keyValue="6"> - <Path>E:\qemupciserial\2k22\amd64</Path> + <Path>F:\qemupciserial\2k25\amd64</Path> </PathAndCredentials> <PathAndCredentials wcm:action="add" wcm:keyValue="7"> - <Path>E:\qxldod\2k22\amd64</Path> + <Path>F:\qxldod\2k25\amd64</Path> </PathAndCredentials> <PathAndCredentials wcm:action="add" wcm:keyValue="8"> - <Path>E:\vioinput\2k22\amd64</Path> + <Path>F:\vioinput\2k25\amd64</Path> </PathAndCredentials> <PathAndCredentials wcm:action="add" wcm:keyValue="9"> - <Path>E:\viorng\2k22\amd64</Path> + <Path>F:\viorng\2k25\amd64</Path> </PathAndCredentials> <PathAndCredentials wcm:action="add" wcm:keyValue="10"> - <Path>E:\vioscsi\2k22\amd64</Path> + <Path>F:\vioscsi\2k25\amd64</Path> </PathAndCredentials> <PathAndCredentials wcm:action="add" wcm:keyValue="11"> - <Path>E:\vioserial\2k22\amd64</Path> + <Path>F:\vioserial\2k25\amd64</Path> </PathAndCredentials> </DriverPaths> </component> @@ -55,32 +55,46 @@ <DiskConfiguration> <Disk wcm:action="add"> <CreatePartitions> + <!-- 1. EFI System Partition --> <CreatePartition wcm:action="add"> - <Type>Primary</Type> <Order>1</Order> - <Size>100</Size> + <Size>500</Size> + <Type>EFI</Type> </CreatePartition> + <!-- 2. Microsoft Reserved Partition (MSR) --> <CreatePartition wcm:action="add"> <Order>2</Order> - <Type>Primary</Type> + <Size>128</Size> + <Type>MSR</Type> + </CreatePartition> + <!-- 3. Windows Primary Partition (rest of the space) --> + <CreatePartition wcm:action="add"> + <Order>3</Order> <Extend>true</Extend> + <Type>Primary</Type> </CreatePartition> </CreatePartitions> <ModifyPartitions> + <!-- Format the EFI partition --> <ModifyPartition wcm:action="add"> - <Active>true</Active> - <Format>NTFS</Format> - <Label>boot</Label> <Order>1</Order> <PartitionID>1</PartitionID> + <Label>System</Label> + <Format>FAT32</Format> </ModifyPartition> + <!-- MSR partition - no format but needs entry --> <ModifyPartition wcm:action="add"> - <Format>NTFS</Format> - <Label>Windows</Label> - <Letter>C</Letter> <Order>2</Order> <PartitionID>2</PartitionID> </ModifyPartition> + <!-- Format the Windows partition --> + <ModifyPartition wcm:action="add"> + <Order>3</Order> + <PartitionID>3</PartitionID> + <Label>Windows</Label> + <Format>NTFS</Format> + <Letter>C</Letter> + </ModifyPartition> </ModifyPartitions> <DiskID>0</DiskID> <WillWipeDisk>true</WillWipeDisk> @@ -96,7 +110,7 @@ </InstallFrom> <InstallTo> <DiskID>0</DiskID> - <PartitionID>2</PartitionID> + <PartitionID>3</PartitionID> </InstallTo> </OSImage> </ImageInstall> From 35e3300a480c6b340f36ef622733463b9b594293 Mon Sep 17 00:00:00 2001 From: Tim Smith <tsmith84@proton.me> Date: Sat, 22 Nov 2025 21:55:01 -0800 Subject: [PATCH 1597/1622] Update multiple distros to the latest (#1646) --- os_pkrvars/almalinux/almalinux-9-aarch64.pkrvars.hcl | 4 ++-- os_pkrvars/almalinux/almalinux-9-x86_64.pkrvars.hcl | 4 ++-- os_pkrvars/debian/debian-13-aarch64.pkrvars.hcl | 4 ++-- os_pkrvars/debian/debian-13-x86_64.pkrvars.hcl | 4 ++-- os_pkrvars/rhel/rhel-10-aarch64.pkrvars.hcl | 2 +- os_pkrvars/rhel/rhel-10-x86_64.pkrvars.hcl | 2 +- os_pkrvars/rhel/rhel-9-aarch64.pkrvars.hcl | 2 +- os_pkrvars/rhel/rhel-9-x86_64.pkrvars.hcl | 2 +- 8 files changed, 12 insertions(+), 12 deletions(-) diff --git a/os_pkrvars/almalinux/almalinux-9-aarch64.pkrvars.hcl b/os_pkrvars/almalinux/almalinux-9-aarch64.pkrvars.hcl index 5f840f1d1..10d15d3b4 100644 --- a/os_pkrvars/almalinux/almalinux-9-aarch64.pkrvars.hcl +++ b/os_pkrvars/almalinux/almalinux-9-aarch64.pkrvars.hcl @@ -1,7 +1,7 @@ os_name = "almalinux" -os_version = "9.6" +os_version = "9.7" os_arch = "aarch64" -iso_url = "https://repo.almalinux.org/almalinux/9/isos/aarch64/AlmaLinux-9.6-aarch64-boot.iso" +iso_url = "https://repo.almalinux.org/almalinux/9/isos/aarch64/AlmaLinux-9.7-aarch64-boot.iso" iso_checksum = "file:https://repo.almalinux.org/almalinux/9/isos/aarch64/CHECKSUM" parallels_guest_os_type = "centos" parallels_boot_wait = "1s" diff --git a/os_pkrvars/almalinux/almalinux-9-x86_64.pkrvars.hcl b/os_pkrvars/almalinux/almalinux-9-x86_64.pkrvars.hcl index b0dfebf1b..57e616f9f 100644 --- a/os_pkrvars/almalinux/almalinux-9-x86_64.pkrvars.hcl +++ b/os_pkrvars/almalinux/almalinux-9-x86_64.pkrvars.hcl @@ -1,7 +1,7 @@ os_name = "almalinux" -os_version = "9.6" +os_version = "9.7" os_arch = "x86_64" -iso_url = "https://repo.almalinux.org/almalinux/9/isos/x86_64/AlmaLinux-9.6-x86_64-boot.iso" +iso_url = "https://repo.almalinux.org/almalinux/9/isos/x86_64/AlmaLinux-9.7-x86_64-boot.iso" iso_checksum = "file:https://repo.almalinux.org/almalinux/9/isos/x86_64/CHECKSUM" parallels_guest_os_type = "centos" vbox_guest_os_type = "RedHat_64" diff --git a/os_pkrvars/debian/debian-13-aarch64.pkrvars.hcl b/os_pkrvars/debian/debian-13-aarch64.pkrvars.hcl index 5cf9f42d1..bf63acdec 100644 --- a/os_pkrvars/debian/debian-13-aarch64.pkrvars.hcl +++ b/os_pkrvars/debian/debian-13-aarch64.pkrvars.hcl @@ -1,7 +1,7 @@ os_name = "debian" -os_version = "13.1" +os_version = "13.2" os_arch = "aarch64" -iso_url = "https://cdimage.debian.org/debian-cd/current/arm64/iso-cd/debian-13.1.0-arm64-netinst.iso" +iso_url = "https://cdimage.debian.org/debian-cd/current/arm64/iso-cd/debian-13.2.0-arm64-netinst.iso" iso_checksum = "file:https://cdimage.debian.org/debian-cd/current/arm64/iso-cd/SHA256SUMS" parallels_guest_os_type = "debian" vbox_guest_os_type = "Debian12_arm64" diff --git a/os_pkrvars/debian/debian-13-x86_64.pkrvars.hcl b/os_pkrvars/debian/debian-13-x86_64.pkrvars.hcl index 9f2614db8..eb3e1028b 100644 --- a/os_pkrvars/debian/debian-13-x86_64.pkrvars.hcl +++ b/os_pkrvars/debian/debian-13-x86_64.pkrvars.hcl @@ -1,7 +1,7 @@ os_name = "debian" -os_version = "13.1" +os_version = "13.2" os_arch = "x86_64" -iso_url = "https://cdimage.debian.org/debian-cd/current/amd64/iso-cd/debian-13.1.0-amd64-netinst.iso" +iso_url = "https://cdimage.debian.org/debian-cd/current/amd64/iso-cd/debian-13.2.0-amd64-netinst.iso" iso_checksum = "file:https://cdimage.debian.org/debian-cd/current/amd64/iso-cd/SHA256SUMS" parallels_guest_os_type = "debian" vbox_guest_os_type = "Debian12_64" diff --git a/os_pkrvars/rhel/rhel-10-aarch64.pkrvars.hcl b/os_pkrvars/rhel/rhel-10-aarch64.pkrvars.hcl index 0b1caab18..ce6d7177e 100644 --- a/os_pkrvars/rhel/rhel-10-aarch64.pkrvars.hcl +++ b/os_pkrvars/rhel/rhel-10-aarch64.pkrvars.hcl @@ -1,5 +1,5 @@ os_name = "rhel" -os_version = "10.0" +os_version = "10.1" os_arch = "aarch64" iso_url = "https://www.redhat.com/en/technologies/linux-platforms/enterprise-linux" iso_checksum = "none" diff --git a/os_pkrvars/rhel/rhel-10-x86_64.pkrvars.hcl b/os_pkrvars/rhel/rhel-10-x86_64.pkrvars.hcl index 87055fc6a..242c7048f 100644 --- a/os_pkrvars/rhel/rhel-10-x86_64.pkrvars.hcl +++ b/os_pkrvars/rhel/rhel-10-x86_64.pkrvars.hcl @@ -1,5 +1,5 @@ os_name = "rhel" -os_version = "10.0" +os_version = "10.1" os_arch = "x86_64" iso_url = "https://www.redhat.com/en/technologies/linux-platforms/enterprise-linux" iso_checksum = "none" diff --git a/os_pkrvars/rhel/rhel-9-aarch64.pkrvars.hcl b/os_pkrvars/rhel/rhel-9-aarch64.pkrvars.hcl index 13a9f7675..f1ea42ddd 100644 --- a/os_pkrvars/rhel/rhel-9-aarch64.pkrvars.hcl +++ b/os_pkrvars/rhel/rhel-9-aarch64.pkrvars.hcl @@ -1,5 +1,5 @@ os_name = "rhel" -os_version = "9.6" +os_version = "9.7" os_arch = "aarch64" iso_url = "https://www.redhat.com/en/technologies/linux-platforms/enterprise-linux" iso_checksum = "none" diff --git a/os_pkrvars/rhel/rhel-9-x86_64.pkrvars.hcl b/os_pkrvars/rhel/rhel-9-x86_64.pkrvars.hcl index 34fbb254c..4893c391f 100644 --- a/os_pkrvars/rhel/rhel-9-x86_64.pkrvars.hcl +++ b/os_pkrvars/rhel/rhel-9-x86_64.pkrvars.hcl @@ -1,5 +1,5 @@ os_name = "rhel" -os_version = "9.6" +os_version = "9.7" os_arch = "x86_64" iso_url = "https://www.redhat.com/en/technologies/linux-platforms/enterprise-linux" iso_checksum = "none" From 22985a666a0ef7607a3555e121e15d636bbffe6b Mon Sep 17 00:00:00 2001 From: Corey Hemminger <hemminger@hotmail.com> Date: Mon, 24 Nov 2025 15:04:08 -0600 Subject: [PATCH 1598/1622] updated macos boot commands (#1647) * updated macos boot commands Signed-off-by: Corey Hemminger <hemminger@hotmail.com> * cleanup Signed-off-by: Corey Hemminger <hemminger@hotmail.com> --------- Signed-off-by: Corey Hemminger <hemminger@hotmail.com> --- CHANGELOG.md | 7 ++++ os_pkrvars/macos/macos-14-aarch64.pkrvars.hcl | 22 ++++++------- os_pkrvars/macos/macos-15-aarch64.pkrvars.hcl | 24 +++++++------- os_pkrvars/macos/macos-26-aarch64.pkrvars.hcl | 32 +++++++++---------- 4 files changed, 46 insertions(+), 39 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a56331eca..ec6d22c71 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -23,6 +23,7 @@ Markdown table generated at <https://www.tablesgenerator.com/markdown_tables#> | freebsd-14 | x | x | x | x | x | x | x | x | | | | | macos-14 | na | na | na | na | na | x | | | na | na | na | | macos-15 | na | na | na | na | na | x | | | na | na | na | +| macos-26 | na | na | na | na | na | x | | | na | na | na | | opensuse-leap-15 | x | x | x | x | x | x | | | | | | | opensuse-leap-16 | x | x | x | x | x | x | x | x | | | | | oraclelinux-8 | x | na | x | na | x | na | x | na | | na | | @@ -53,6 +54,12 @@ Markdown table generated at <https://www.tablesgenerator.com/markdown_tables#> ## [unreleased] (2025-11-21) +- Updated macos boot commands to enable remote login as last step +- Updated Almalinux 9 to 9.7 +- Updated Debian 13 to 13.2 +- Updated RHEL 9 to 9.7 +- Updated RHEL 10 to 10.1 + ## [v5.0.1] (2025-11-21) - Updated bento to use absolute paths for packer templates diff --git a/os_pkrvars/macos/macos-14-aarch64.pkrvars.hcl b/os_pkrvars/macos/macos-14-aarch64.pkrvars.hcl index 984a6dd63..721f5b938 100644 --- a/os_pkrvars/macos/macos-14-aarch64.pkrvars.hcl +++ b/os_pkrvars/macos/macos-14-aarch64.pkrvars.hcl @@ -46,6 +46,17 @@ boot_command = [ "<tab><wait><spacebar><wait><leftShiftOn><tab><leftShiftOff><wait><spacebar><wait5s>", # Choose Your Look "<leftShiftOn><tab><leftShiftOff><wait><spacebar><wait30s>", + # Open Terminal + "<spacebar><wait><leftSuperOn><spacebar><leftSuperOff><wait>terminal<wait><enter><wait5s>", + # Add vagrant user to sudoers + "echo 'vagrant' | sudo -S sh -c 'echo \"vagrant ALL=(ALL) NOPASSWD: ALL\" > /etc/sudoers.d/vagrant'<wait><enter><wait5s>", + # Set Auto login for vagrant + "sudo sysadminctl -autologin set -userName vagrant -password vagrant<wait><enter><wait5s>", + # Disable screen lock + "sudo sysadminctl -screenLock off -password vagrant<wait><enter><wait5s>", + # Close terminal + "exit<enter><wait5s>", + "<leftSuperOn>q<leftSuperOff>", # Enable keyboard navigation "<leftCtrlOn><f7><leftCtrlOff><wait2s>", # Open System Settings @@ -59,15 +70,4 @@ boot_command = [ "<leftSuperOn>q<leftSuperOff><wait5s>", # Disable keyboard navigation "<leftCtrlOn><f7><leftCtrlOff><wait2s>", - # Open Terminal - "<leftSuperOn><spacebar><leftSuperOff><wait>terminal<wait><enter><wait5s>", - # Add vagrant user to sudoers - "echo 'vagrant' | sudo -S sh -c 'echo \"vagrant ALL=(ALL) NOPASSWD: ALL\" > /etc/sudoers.d/vagrant'<wait><enter><wait5s>", - # Set Auto login for vagrant - "sudo sysadminctl -autologin set -userName vagrant -password vagrant<wait><enter><wait5s>", - # Disable screen lock - "sudo sysadminctl -screenLock off -password vagrant<wait><enter><wait5s>", - # Close terminal - "exit<enter><wait5s>", - "<leftSuperOn>q<leftSuperOff>" ] diff --git a/os_pkrvars/macos/macos-15-aarch64.pkrvars.hcl b/os_pkrvars/macos/macos-15-aarch64.pkrvars.hcl index 4d57aa19b..ebfb427f0 100644 --- a/os_pkrvars/macos/macos-15-aarch64.pkrvars.hcl +++ b/os_pkrvars/macos/macos-15-aarch64.pkrvars.hcl @@ -48,8 +48,19 @@ boot_command = [ "<leftShiftOn><tab><leftShiftOff><wait><spacebar><wait5s>", # Update mac "<leftShiftOn><tab><leftShiftOff><wait><spacebar><wait30s>", + # Open Terminal + "<spacebar><wait><leftSuperOn><spacebar><leftSuperOff><wait>terminal<wait><enter><wait5s>", + # Add vagrant user to sudoers + "echo 'vagrant' | sudo -S sh -c 'echo \"vagrant ALL=(ALL) NOPASSWD: ALL\" > /etc/sudoers.d/vagrant'<wait><enter><wait5s>", + # Set Auto login for vagrant + "sudo sysadminctl -autologin set -userName vagrant -password vagrant<wait><enter><wait5s>", + # Disable screen lock + "sudo sysadminctl -screenLock off -password vagrant<wait><enter><wait5s>", + # Close terminal + "exit<enter><wait5s>", + "<leftSuperOn>q<leftSuperOff>", # Enable keyboard navigation - "<space><wait><leftCtrlOn><f7><leftCtrlOff><wait2s>", + "<leftCtrlOn><f7><leftCtrlOff><wait2s>", # Open System Settings "<leftSuperOn><spacebar><leftSuperOff><wait>System<spacebar>Settings<wait><enter><wait5s>", # Enable Remote Management @@ -61,15 +72,4 @@ boot_command = [ "<leftSuperOn>q<leftSuperOff><wait5s>", # Disable keyboard navigation "<leftCtrlOn><f7><leftCtrlOff><wait2s>", - # Open Terminal - "<leftSuperOn><spacebar><leftSuperOff><wait>terminal<wait><enter><wait5s>", - # Add vagrant user to sudoers - "echo 'vagrant' | sudo -S sh -c 'echo \"vagrant ALL=(ALL) NOPASSWD: ALL\" > /etc/sudoers.d/vagrant'<wait><enter><wait5s>", - # Set Auto login for vagrant - "sudo sysadminctl -autologin set -userName vagrant -password vagrant<wait><enter><wait5s>", - # Disable screen lock - "sudo sysadminctl -screenLock off -password vagrant<wait><enter><wait5s>", - # Close terminal - "exit<enter><wait5s>", - "<leftSuperOn>q<leftSuperOff>" ] diff --git a/os_pkrvars/macos/macos-26-aarch64.pkrvars.hcl b/os_pkrvars/macos/macos-26-aarch64.pkrvars.hcl index 8f75d4041..6a2a5bf8a 100644 --- a/os_pkrvars/macos/macos-26-aarch64.pkrvars.hcl +++ b/os_pkrvars/macos/macos-26-aarch64.pkrvars.hcl @@ -11,11 +11,11 @@ boot_command = [ # hello, hola, bonjour, etc. "<wait><spacebar><wait5s>", # Select Language English (US) - "<enter><wait10s>", + "<enter><wait30s>", # Select Your Country and Region - "<leftShiftOn><tab><leftShiftOff><wait><spacebar><wait10s>", + "<leftShiftOn><tab><leftShiftOff><wait><spacebar><wait15s>", # Transfer your data to this Mac - "<tab><wait><tab><wait><tab><wait><tab><wait><spacebar><wait><tab><wait><tab><wait><spacebar><wait5s>", + "<tab><wait><tab><wait><tab><wait><tab><wait><spacebar><wait><leftShiftOn><tab><leftShiftOff><wait><spacebar><wait5s>", # Written and Spoken Languages "<leftShiftOn><tab><leftShiftOff><wait><spacebar><wait5s>", # Accessibility @@ -23,7 +23,7 @@ boot_command = [ # Data & Privacy "<leftShiftOn><tab><leftShiftOff><wait><spacebar><wait5s>", # Create a Computer Account - "vagrant<wait><tab><wait><tab><wait>vagrant<wait><tab><wait>vagrant<wait><tab><wait><tab><wait><spacebar><wait><tab><wait><tab><wait><spacebar><wait1m>", + "<tab><wait><tab><wait><tab><wait><tab><wait><tab><wait><tab><wait>vagrant<wait><tab><wait><tab><wait>vagrant<wait><tab><wait>vagrant<wait><tab><wait><tab><wait><spacebar><wait><tab><wait><tab><wait><spacebar><wait1m>", # Sign In with Your Apple ID "<leftShiftOn><tab><wait><tab><leftShiftOff><wait><spacebar><wait5s>", # Are you sure you want to skip signing in with an Apple ID? @@ -48,8 +48,19 @@ boot_command = [ "<leftShiftOn><tab><leftShiftOff><wait><spacebar><wait5s>", # Update mac "<leftShiftOn><tab><leftShiftOff><wait><spacebar><wait30s>", + # Open Terminal + "<spacebar><wait><leftSuperOn><spacebar><leftSuperOff><wait>terminal<wait><enter><wait5s>", + # Add vagrant user to sudoers + "echo 'vagrant' | sudo -S sh -c 'echo \"vagrant ALL=(ALL) NOPASSWD: ALL\" > /etc/sudoers.d/vagrant'<wait><enter><wait5s>", + # Set Auto login for vagrant + "sudo sysadminctl -autologin set -userName vagrant -password vagrant<wait><enter><wait5s>", + # Disable screen lock + "sudo sysadminctl -screenLock off -password vagrant<wait><enter><wait5s>", + # Close terminal + "exit<enter><wait5s>", + "<leftSuperOn>q<leftSuperOff>", # Enable keyboard navigation - "<space><wait><leftCtrlOn><f7><leftCtrlOff><wait2s>", + "<leftCtrlOn><f7><leftCtrlOff><wait2s>", # Open System Settings "<leftSuperOn><spacebar><leftSuperOff><wait>System<spacebar>Settings<wait><enter><wait5s>", # Enable Remote Management @@ -61,15 +72,4 @@ boot_command = [ "<leftSuperOn>q<leftSuperOff><wait5s>", # Disable keyboard navigation "<leftCtrlOn><f7><leftCtrlOff><wait2s>", - # Open Terminal - "<leftSuperOn><spacebar><leftSuperOff><wait>terminal<wait><enter><wait5s>", - # Add vagrant user to sudoers - "echo 'vagrant' | sudo -S sh -c 'echo \"vagrant ALL=(ALL) NOPASSWD: ALL\" > /etc/sudoers.d/vagrant'<wait><enter><wait5s>", - # Set Auto login for vagrant - "sudo sysadminctl -autologin set -userName vagrant -password vagrant<wait><enter><wait5s>", - # Disable screen lock - "sudo sysadminctl -screenLock off -password vagrant<wait><enter><wait5s>", - # Close terminal - "exit<enter><wait5s>", - "<leftSuperOn>q<leftSuperOff>" ] From 6bb523fcaaf3e5a896ab5b4c4e36bac0bd887461 Mon Sep 17 00:00:00 2001 From: Corey Hemminger <hemminger@hotmail.com> Date: Mon, 24 Nov 2025 17:51:22 -0600 Subject: [PATCH 1599/1622] Fix uefi (#1648) * fix vbox uefi and usb keyboard mouse for boot command to work --------- Signed-off-by: Corey Hemminger <hemminger@hotmail.com> --- .../almalinux/almalinux-10-aarch64.pkrvars.hcl | 2 +- .../almalinux/almalinux-10-x86_64.pkrvars.hcl | 2 +- .../almalinux/almalinux-8-aarch64.pkrvars.hcl | 2 +- .../almalinux/almalinux-8-x86_64.pkrvars.hcl | 5 ++--- .../almalinux/almalinux-9-aarch64.pkrvars.hcl | 3 +-- .../almalinux/almalinux-9-x86_64.pkrvars.hcl | 5 ++--- .../oraclelinux-10-aarch64.pkrvars.hcl | 4 ++-- .../oraclelinux-10-x86_64.pkrvars.hcl | 2 +- .../oraclelinux-8-aarch64.pkrvars.hcl | 5 ++--- .../oraclelinux/oraclelinux-8-x86_64.pkrvars.hcl | 5 ++--- .../oraclelinux-9-aarch64.pkrvars.hcl | 4 ++-- .../oraclelinux/oraclelinux-9-x86_64.pkrvars.hcl | 5 ++--- .../rockylinux/rockylinux-10-aarch64.pkrvars.hcl | 4 ++-- .../rockylinux/rockylinux-10-x86_64.pkrvars.hcl | 4 ++-- .../rockylinux/rockylinux-8-aarch64.pkrvars.hcl | 4 ++-- .../rockylinux/rockylinux-8-x86_64.pkrvars.hcl | 5 ++--- .../rockylinux/rockylinux-9-aarch64.pkrvars.hcl | 4 ++-- .../rockylinux/rockylinux-9-x86_64.pkrvars.hcl | 5 ++--- packer_templates/pkr-sources.pkr.hcl | 16 +++++++++++++--- packer_templates/pkr-variables.pkr.hcl | 6 +++--- 20 files changed, 47 insertions(+), 45 deletions(-) diff --git a/os_pkrvars/almalinux/almalinux-10-aarch64.pkrvars.hcl b/os_pkrvars/almalinux/almalinux-10-aarch64.pkrvars.hcl index 4f99e2367..9b84ebbfe 100644 --- a/os_pkrvars/almalinux/almalinux-10-aarch64.pkrvars.hcl +++ b/os_pkrvars/almalinux/almalinux-10-aarch64.pkrvars.hcl @@ -3,7 +3,7 @@ os_version = "10.0" os_arch = "aarch64" iso_url = "https://repo.almalinux.org/almalinux/10/isos/aarch64/AlmaLinux-10.0-aarch64-boot.iso" iso_checksum = "file:https://repo.almalinux.org/almalinux/10/isos/aarch64/CHECKSUM" -parallels_guest_os_type = "centos" +parallels_guest_os_type = "rhel" vbox_guest_os_type = "Oracle_arm64" vmware_guest_os_type = "arm-rhel9-64" utm_vm_icon = "almalinux" diff --git a/os_pkrvars/almalinux/almalinux-10-x86_64.pkrvars.hcl b/os_pkrvars/almalinux/almalinux-10-x86_64.pkrvars.hcl index 14b1edcdf..5c8e18b58 100644 --- a/os_pkrvars/almalinux/almalinux-10-x86_64.pkrvars.hcl +++ b/os_pkrvars/almalinux/almalinux-10-x86_64.pkrvars.hcl @@ -3,7 +3,7 @@ os_version = "10.0" os_arch = "x86_64" iso_url = "https://repo.almalinux.org/almalinux/10/isos/x86_64/AlmaLinux-10.0-x86_64-boot.iso" iso_checksum = "file:https://repo.almalinux.org/almalinux/10/isos/x86_64/CHECKSUM" -parallels_guest_os_type = "centos" +parallels_guest_os_type = "rhel" vbox_guest_os_type = "RedHat_64" vmware_guest_os_type = "centos-64" utm_vm_icon = "almalinux" diff --git a/os_pkrvars/almalinux/almalinux-8-aarch64.pkrvars.hcl b/os_pkrvars/almalinux/almalinux-8-aarch64.pkrvars.hcl index ed74020ef..1446d984d 100644 --- a/os_pkrvars/almalinux/almalinux-8-aarch64.pkrvars.hcl +++ b/os_pkrvars/almalinux/almalinux-8-aarch64.pkrvars.hcl @@ -3,7 +3,7 @@ os_version = "8.10" os_arch = "aarch64" iso_url = "https://repo.almalinux.org/almalinux/8/isos/aarch64/AlmaLinux-8.10-aarch64-boot.iso" iso_checksum = "file:https://repo.almalinux.org/almalinux/8/isos/aarch64/CHECKSUM" -parallels_guest_os_type = "centos" +parallels_guest_os_type = "rhel" vbox_guest_os_type = "Oracle_arm64" vmware_guest_os_type = "arm-rhel9-64" utm_vm_icon = "almalinux" diff --git a/os_pkrvars/almalinux/almalinux-8-x86_64.pkrvars.hcl b/os_pkrvars/almalinux/almalinux-8-x86_64.pkrvars.hcl index e50308b7e..bd256201e 100644 --- a/os_pkrvars/almalinux/almalinux-8-x86_64.pkrvars.hcl +++ b/os_pkrvars/almalinux/almalinux-8-x86_64.pkrvars.hcl @@ -3,9 +3,8 @@ os_version = "8.10" os_arch = "x86_64" iso_url = "https://repo.almalinux.org/almalinux/8/isos/x86_64/AlmaLinux-8.10-x86_64-boot.iso" iso_checksum = "file:https://repo.almalinux.org/almalinux/8/isos/x86_64/CHECKSUM" -parallels_guest_os_type = "centos" +parallels_guest_os_type = "rhel" vbox_guest_os_type = "RedHat_64" vmware_guest_os_type = "centos-64" utm_vm_icon = "almalinux" -boot_command = ["<wait><up><wait><tab><wait><end><wait> inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/rhel/8ks.cfg inst.repo=https://repo.almalinux.org/almalinux/8/BaseOS/x86_64/os/ <wait><enter><wait>"] -utm_boot_command = ["<wait><up>e<wait><down><down><end><wait> inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/rhel/8ks.cfg inst.repo=https://repo.almalinux.org/almalinux/8/BaseOS/x86_64/os/ <wait><leftCtrlOn><wait>x<wait><leftCtrlOff>"] +boot_command = ["<wait><up><wait>e<wait><down><down><end><wait> inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/rhel/8ks.cfg inst.repo=https://repo.almalinux.org/almalinux/8/BaseOS/x86_64/os/ <wait><leftCtrlOn><wait>x<wait><leftCtrlOff>"] diff --git a/os_pkrvars/almalinux/almalinux-9-aarch64.pkrvars.hcl b/os_pkrvars/almalinux/almalinux-9-aarch64.pkrvars.hcl index 10d15d3b4..09ff03728 100644 --- a/os_pkrvars/almalinux/almalinux-9-aarch64.pkrvars.hcl +++ b/os_pkrvars/almalinux/almalinux-9-aarch64.pkrvars.hcl @@ -3,8 +3,7 @@ os_version = "9.7" os_arch = "aarch64" iso_url = "https://repo.almalinux.org/almalinux/9/isos/aarch64/AlmaLinux-9.7-aarch64-boot.iso" iso_checksum = "file:https://repo.almalinux.org/almalinux/9/isos/aarch64/CHECKSUM" -parallels_guest_os_type = "centos" -parallels_boot_wait = "1s" +parallels_guest_os_type = "rhel" vbox_guest_os_type = "Oracle9_arm64" vmware_guest_os_type = "arm-rhel9-64" utm_vm_icon = "almalinux" diff --git a/os_pkrvars/almalinux/almalinux-9-x86_64.pkrvars.hcl b/os_pkrvars/almalinux/almalinux-9-x86_64.pkrvars.hcl index 57e616f9f..59235c33f 100644 --- a/os_pkrvars/almalinux/almalinux-9-x86_64.pkrvars.hcl +++ b/os_pkrvars/almalinux/almalinux-9-x86_64.pkrvars.hcl @@ -3,9 +3,8 @@ os_version = "9.7" os_arch = "x86_64" iso_url = "https://repo.almalinux.org/almalinux/9/isos/x86_64/AlmaLinux-9.7-x86_64-boot.iso" iso_checksum = "file:https://repo.almalinux.org/almalinux/9/isos/x86_64/CHECKSUM" -parallels_guest_os_type = "centos" +parallels_guest_os_type = "rhel" vbox_guest_os_type = "RedHat_64" vmware_guest_os_type = "centos-64" utm_vm_icon = "almalinux" -boot_command = ["<wait><up><wait><tab><wait><end><wait> inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/rhel/ks.cfg inst.repo=https://repo.almalinux.org/almalinux/9/BaseOS/x86_64/os/ <wait><enter><wait>"] -utm_boot_command = ["<wait><up><wait>e<wait><down><wait><down><wait><end><wait> inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/rhel/ks.cfg inst.repo=https://repo.almalinux.org/almalinux/9/BaseOS/x86_64/os/ <wait><leftCtrlOn><wait>x<wait><leftCtrlOff>"] +boot_command = ["<wait><up><wait>e<wait><down><wait><down><wait><end><wait> inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/rhel/ks.cfg inst.repo=https://repo.almalinux.org/almalinux/9/BaseOS/x86_64/os/ <wait><leftCtrlOn><wait>x<wait><leftCtrlOff>"] diff --git a/os_pkrvars/oraclelinux/oraclelinux-10-aarch64.pkrvars.hcl b/os_pkrvars/oraclelinux/oraclelinux-10-aarch64.pkrvars.hcl index 37b02238a..207dde275 100644 --- a/os_pkrvars/oraclelinux/oraclelinux-10-aarch64.pkrvars.hcl +++ b/os_pkrvars/oraclelinux/oraclelinux-10-aarch64.pkrvars.hcl @@ -3,8 +3,8 @@ os_version = "10.0" os_arch = "aarch64" iso_url = "https://yum.oracle.com/ISOS/OracleLinux/OL10/u0/aarch64/OracleLinux-R10-U0-aarch64-boot-uek.iso" iso_checksum = "file:https://linux.oracle.com/security/gpg/checksum/OracleLinux-R10-U0-Server-aarch64.checksum" -parallels_guest_os_type = "centos" +parallels_guest_os_type = "rhel" vbox_guest_os_type = "Oracle_arm64" vmware_guest_os_type = "arm-rhel9-64" utm_vm_icon = "linux" -boot_command = ["<wait><up>e<wait><down><down><end><wait> inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/rhel/ks.cfg inst.repo=https://yum.oracle.com/repo/OracleLinux/OL10/baseos/latest/aarch64/ <leftCtrlOn>x<leftCtrlOff>"] +boot_command = ["<wait><up><wait>e<wait><down><down><end><wait> inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/rhel/ks.cfg inst.repo=https://yum.oracle.com/repo/OracleLinux/OL10/baseos/latest/aarch64/ <leftCtrlOn>x<leftCtrlOff>"] diff --git a/os_pkrvars/oraclelinux/oraclelinux-10-x86_64.pkrvars.hcl b/os_pkrvars/oraclelinux/oraclelinux-10-x86_64.pkrvars.hcl index 86e919655..71954d819 100644 --- a/os_pkrvars/oraclelinux/oraclelinux-10-x86_64.pkrvars.hcl +++ b/os_pkrvars/oraclelinux/oraclelinux-10-x86_64.pkrvars.hcl @@ -3,7 +3,7 @@ os_version = "10.0" os_arch = "x86_64" iso_url = "https://yum.oracle.com/ISOS/OracleLinux/OL10/u0/x86_64/OracleLinux-R10-U0-x86_64-boot.iso" iso_checksum = "file:https://linux.oracle.com/security/gpg/checksum/OracleLinux-R10-U0-Server-x86_64.checksum" -parallels_guest_os_type = "centos" +parallels_guest_os_type = "rhel" vbox_guest_os_type = "Oracle_64" vmware_guest_os_type = "centos-64" utm_vm_icon = "linux" diff --git a/os_pkrvars/oraclelinux/oraclelinux-8-aarch64.pkrvars.hcl b/os_pkrvars/oraclelinux/oraclelinux-8-aarch64.pkrvars.hcl index cbf610800..d39f02178 100644 --- a/os_pkrvars/oraclelinux/oraclelinux-8-aarch64.pkrvars.hcl +++ b/os_pkrvars/oraclelinux/oraclelinux-8-aarch64.pkrvars.hcl @@ -3,9 +3,8 @@ os_version = "8.10" os_arch = "aarch64" iso_url = "https://yum.oracle.com/ISOS/OracleLinux/OL8/u10/aarch64/OracleLinux-R8-U10-aarch64-dvd.iso" iso_checksum = "file:https://linux.oracle.com/security/gpg/checksum/OracleLinux-R8-U10-Server-aarch64.checksum" -parallels_guest_os_type = "centos" +parallels_guest_os_type = "rhel" vbox_guest_os_type = "Oracle9_arm64" vmware_guest_os_type = "arm-rhel9-64" utm_vm_icon = "linux" -parallels_boot_wait = "1s" -boot_command = ["<wait><up>e<wait><down><down><end><wait> inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/rhel/8ks.cfg inst.repo=https://yum.oracle.com/repo/OracleLinux/OL8/baseos/latest/aarch64/ <leftCtrlOn>x<leftCtrlOff>"] +boot_command = ["<wait><up><wait>e<wait><down><down><end><wait> inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/rhel/8ks.cfg inst.repo=https://yum.oracle.com/repo/OracleLinux/OL8/baseos/latest/aarch64/ <leftCtrlOn>x<leftCtrlOff>"] diff --git a/os_pkrvars/oraclelinux/oraclelinux-8-x86_64.pkrvars.hcl b/os_pkrvars/oraclelinux/oraclelinux-8-x86_64.pkrvars.hcl index 785bb814e..dd355b08a 100644 --- a/os_pkrvars/oraclelinux/oraclelinux-8-x86_64.pkrvars.hcl +++ b/os_pkrvars/oraclelinux/oraclelinux-8-x86_64.pkrvars.hcl @@ -3,9 +3,8 @@ os_version = "8.10" os_arch = "x86_64" iso_url = "https://yum.oracle.com/ISOS/OracleLinux/OL8/u10/x86_64/OracleLinux-R8-U10-x86_64-boot.iso" iso_checksum = "file:https://linux.oracle.com/security/gpg/checksum/OracleLinux-R8-U10-Server-x86_64.checksum" -parallels_guest_os_type = "centos" +parallels_guest_os_type = "rhel" vbox_guest_os_type = "Oracle_64" vmware_guest_os_type = "centos-64" utm_vm_icon = "linux" -boot_command = ["<wait><up><tab><wait><end><wait> inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/rhel/8ks.cfg inst.repo=https://yum.oracle.com/repo/OracleLinux/OL8/baseos/latest/x86_64/ <wait><enter><wait>"] -utm_boot_command = ["<wait><up>e<wait><down><down><end><wait> inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/rhel/8ks.cfg inst.repo=https://yum.oracle.com/repo/OracleLinux/OL8/baseos/latest/x86_64/ <wait><leftCtrlOn><wait>x<wait><leftCtrlOff>"] +boot_command = ["<wait><up><wait>e<wait><down><down><end><wait> inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/rhel/8ks.cfg inst.repo=https://yum.oracle.com/repo/OracleLinux/OL8/baseos/latest/x86_64/ <wait><leftCtrlOn><wait>x<wait><leftCtrlOff>"] diff --git a/os_pkrvars/oraclelinux/oraclelinux-9-aarch64.pkrvars.hcl b/os_pkrvars/oraclelinux/oraclelinux-9-aarch64.pkrvars.hcl index 807659871..8314ec99f 100644 --- a/os_pkrvars/oraclelinux/oraclelinux-9-aarch64.pkrvars.hcl +++ b/os_pkrvars/oraclelinux/oraclelinux-9-aarch64.pkrvars.hcl @@ -3,8 +3,8 @@ os_version = "9.6" os_arch = "aarch64" iso_url = "https://yum.oracle.com/ISOS/OracleLinux/OL9/u6/aarch64/OracleLinux-R9-U6-aarch64-boot-uek.iso" iso_checksum = "file:https://linux.oracle.com/security/gpg/checksum/OracleLinux-R9-U6-Server-aarch64.checksum" -parallels_guest_os_type = "centos" +parallels_guest_os_type = "rhel" vbox_guest_os_type = "Oracle9_arm64" vmware_guest_os_type = "arm-rhel9-64" utm_vm_icon = "linux" -boot_command = ["<wait><up>e<wait><down><down><end><wait> inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/rhel/ks.cfg inst.repo=https://yum.oracle.com/repo/OracleLinux/OL9/baseos/latest/aarch64/ <leftCtrlOn>x<leftCtrlOff>"] +boot_command = ["<wait><up><wait>e<wait><down><down><end><wait> inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/rhel/ks.cfg inst.repo=https://yum.oracle.com/repo/OracleLinux/OL9/baseos/latest/aarch64/ <leftCtrlOn>x<leftCtrlOff>"] diff --git a/os_pkrvars/oraclelinux/oraclelinux-9-x86_64.pkrvars.hcl b/os_pkrvars/oraclelinux/oraclelinux-9-x86_64.pkrvars.hcl index 85f8d5999..426c55dc9 100644 --- a/os_pkrvars/oraclelinux/oraclelinux-9-x86_64.pkrvars.hcl +++ b/os_pkrvars/oraclelinux/oraclelinux-9-x86_64.pkrvars.hcl @@ -3,9 +3,8 @@ os_version = "9.6" os_arch = "x86_64" iso_url = "https://yum.oracle.com/ISOS/OracleLinux/OL9/u6/x86_64/OracleLinux-R9-U6-x86_64-boot.iso" iso_checksum = "file:https://linux.oracle.com/security/gpg/checksum/OracleLinux-R9-U6-Server-x86_64.checksum" -parallels_guest_os_type = "centos" +parallels_guest_os_type = "rhel" vbox_guest_os_type = "Oracle_64" vmware_guest_os_type = "centos-64" utm_vm_icon = "linux" -boot_command = ["<wait><up><wait><tab><wait><end><wait> inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/rhel/ks.cfg inst.repo=https://yum.oracle.com/repo/OracleLinux/OL9/baseos/latest/x86_64/ <wait><enter><wait>"] -utm_boot_command = ["<wait><up><wait>e<wait><down><wait><down><wait><end><wait> inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/rhel/ks.cfg inst.repo=https://yum.oracle.com/repo/OracleLinux/OL9/baseos/latest/x86_64/ <wait><leftCtrlOn><wait>x<wait><leftCtrlOff>"] +boot_command = ["<wait><up><wait>e<wait><down><wait><down><wait><end><wait> inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/rhel/ks.cfg inst.repo=https://yum.oracle.com/repo/OracleLinux/OL9/baseos/latest/x86_64/ <wait><leftCtrlOn><wait>x<wait><leftCtrlOff>"] diff --git a/os_pkrvars/rockylinux/rockylinux-10-aarch64.pkrvars.hcl b/os_pkrvars/rockylinux/rockylinux-10-aarch64.pkrvars.hcl index 221519c2a..5d9294c76 100644 --- a/os_pkrvars/rockylinux/rockylinux-10-aarch64.pkrvars.hcl +++ b/os_pkrvars/rockylinux/rockylinux-10-aarch64.pkrvars.hcl @@ -3,8 +3,8 @@ os_version = "10.0" os_arch = "aarch64" iso_url = "https://download.rockylinux.org/pub/rocky/10/isos/aarch64/Rocky-10.0-aarch64-boot.iso" iso_checksum = "file:https://download.rockylinux.org/pub/rocky/10/isos/aarch64/CHECKSUM" -parallels_guest_os_type = "centos" +parallels_guest_os_type = "rhel" vbox_guest_os_type = "Oracle_arm64" vmware_guest_os_type = "arm-rhel9-64" utm_vm_icon = "linux" -boot_command = ["<wait><up>e<wait><down><down><end><wait> inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/rhel/ks.cfg inst.repo=https://download.rockylinux.org/pub/rocky/10/BaseOS/aarch64/os/ <leftCtrlOn>x<leftCtrlOff>"] +boot_command = ["<wait><up><wait>e<wait><down><down><end><wait> inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/rhel/ks.cfg inst.repo=https://download.rockylinux.org/pub/rocky/10/BaseOS/aarch64/os/ <leftCtrlOn>x<leftCtrlOff>"] diff --git a/os_pkrvars/rockylinux/rockylinux-10-x86_64.pkrvars.hcl b/os_pkrvars/rockylinux/rockylinux-10-x86_64.pkrvars.hcl index b8f5f4ed9..926a94ed1 100644 --- a/os_pkrvars/rockylinux/rockylinux-10-x86_64.pkrvars.hcl +++ b/os_pkrvars/rockylinux/rockylinux-10-x86_64.pkrvars.hcl @@ -3,8 +3,8 @@ os_version = "10.0" os_arch = "x86_64" iso_url = "https://download.rockylinux.org/pub/rocky/10/isos/x86_64/Rocky-10.0-x86_64-boot.iso" iso_checksum = "file:https://download.rockylinux.org/pub/rocky/10/isos/x86_64/CHECKSUM" -parallels_guest_os_type = "centos" +parallels_guest_os_type = "rhel" vbox_guest_os_type = "Oracle_64" vmware_guest_os_type = "centos-64" utm_vm_icon = "linux" -boot_command = ["<wait><up>e<wait><down><down><end><wait> inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/rhel/ks.cfg inst.repo=https://download.rockylinux.org/pub/rocky/10/BaseOS/x86_64/os/ <leftCtrlOn>x<leftCtrlOff>"] +boot_command = ["<wait><up><wait>e<wait><down><down><end><wait> inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/rhel/ks.cfg inst.repo=https://download.rockylinux.org/pub/rocky/10/BaseOS/x86_64/os/ <leftCtrlOn>x<leftCtrlOff>"] diff --git a/os_pkrvars/rockylinux/rockylinux-8-aarch64.pkrvars.hcl b/os_pkrvars/rockylinux/rockylinux-8-aarch64.pkrvars.hcl index ee96c87d5..271d6333a 100644 --- a/os_pkrvars/rockylinux/rockylinux-8-aarch64.pkrvars.hcl +++ b/os_pkrvars/rockylinux/rockylinux-8-aarch64.pkrvars.hcl @@ -3,8 +3,8 @@ os_version = "8.10" os_arch = "aarch64" iso_url = "https://download.rockylinux.org/pub/rocky/8/isos/aarch64/Rocky-8.10-aarch64-boot.iso" iso_checksum = "file:https://download.rockylinux.org/pub/rocky/8/isos/aarch64/CHECKSUM" -parallels_guest_os_type = "centos" +parallels_guest_os_type = "rhel" vbox_guest_os_type = "Oracle_arm64" vmware_guest_os_type = "arm-rhel9-64" utm_vm_icon = "linux" -boot_command = ["<wait><up>e<wait><down><down><end><wait> inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/rhel/8ks.cfg inst.repo=https://download.rockylinux.org/pub/rocky/8/BaseOS/aarch64/os/ <leftCtrlOn>x<leftCtrlOff>"] +boot_command = ["<wait><up><wait>e<wait><down><down><end><wait> inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/rhel/8ks.cfg inst.repo=https://download.rockylinux.org/pub/rocky/8/BaseOS/aarch64/os/ <leftCtrlOn>x<leftCtrlOff>"] diff --git a/os_pkrvars/rockylinux/rockylinux-8-x86_64.pkrvars.hcl b/os_pkrvars/rockylinux/rockylinux-8-x86_64.pkrvars.hcl index 98d09becf..8e43d711b 100644 --- a/os_pkrvars/rockylinux/rockylinux-8-x86_64.pkrvars.hcl +++ b/os_pkrvars/rockylinux/rockylinux-8-x86_64.pkrvars.hcl @@ -3,9 +3,8 @@ os_version = "8.10" os_arch = "x86_64" iso_url = "https://download.rockylinux.org/pub/rocky/8/isos/x86_64/Rocky-8.10-x86_64-boot.iso" iso_checksum = "file:https://download.rockylinux.org/pub/rocky/8/isos/x86_64/CHECKSUM" -parallels_guest_os_type = "centos" +parallels_guest_os_type = "rhel" vbox_guest_os_type = "Oracle_64" vmware_guest_os_type = "centos-64" utm_vm_icon = "linux" -boot_command = ["<wait><up><tab><wait><end><wait> inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/rhel/8ks.cfg inst.repo=https://download.rockylinux.org/pub/rocky/8/BaseOS/x86_64/os/ <wait><enter><wait>"] -utm_boot_command = ["<wait><up>e<wait><down><down><end><wait> inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/rhel/8ks.cfg inst.repo=https://download.rockylinux.org/pub/rocky/8/BaseOS/x86_64/os/ <wait><leftCtrlOn><wait>x<wait><leftCtrlOff>"] +boot_command = ["<wait><up><wait>e<wait><down><down><end><wait> inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/rhel/8ks.cfg inst.repo=https://download.rockylinux.org/pub/rocky/8/BaseOS/x86_64/os/ <wait><leftCtrlOn><wait>x<wait><leftCtrlOff>"] diff --git a/os_pkrvars/rockylinux/rockylinux-9-aarch64.pkrvars.hcl b/os_pkrvars/rockylinux/rockylinux-9-aarch64.pkrvars.hcl index 6a1b36cd1..048ecee63 100644 --- a/os_pkrvars/rockylinux/rockylinux-9-aarch64.pkrvars.hcl +++ b/os_pkrvars/rockylinux/rockylinux-9-aarch64.pkrvars.hcl @@ -3,8 +3,8 @@ os_version = "9.6" os_arch = "aarch64" iso_url = "https://download.rockylinux.org/pub/rocky/9/isos/aarch64/Rocky-9.6-aarch64-boot.iso" iso_checksum = "file:https://download.rockylinux.org/pub/rocky/9/isos/aarch64/CHECKSUM" -parallels_guest_os_type = "centos" +parallels_guest_os_type = "rhel" vbox_guest_os_type = "Oracle9_arm64" vmware_guest_os_type = "arm-rhel9-64" utm_vm_icon = "linux" -boot_command = ["<wait><up>e<wait><down><down><end><wait> inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/rhel/ks.cfg inst.repo=https://download.rockylinux.org/pub/rocky/9/BaseOS/aarch64/os/ <leftCtrlOn>x<leftCtrlOff>"] +boot_command = ["<wait><up><wait>e<wait><down><down><end><wait> inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/rhel/ks.cfg inst.repo=https://download.rockylinux.org/pub/rocky/9/BaseOS/aarch64/os/ <leftCtrlOn>x<leftCtrlOff>"] diff --git a/os_pkrvars/rockylinux/rockylinux-9-x86_64.pkrvars.hcl b/os_pkrvars/rockylinux/rockylinux-9-x86_64.pkrvars.hcl index 4dd0e176c..8c100d072 100644 --- a/os_pkrvars/rockylinux/rockylinux-9-x86_64.pkrvars.hcl +++ b/os_pkrvars/rockylinux/rockylinux-9-x86_64.pkrvars.hcl @@ -3,9 +3,8 @@ os_version = "9.6" os_arch = "x86_64" iso_url = "https://download.rockylinux.org/pub/rocky/9/isos/x86_64/Rocky-9.6-x86_64-boot.iso" iso_checksum = "file:https://download.rockylinux.org/pub/rocky/9/isos/x86_64/CHECKSUM" -parallels_guest_os_type = "centos" +parallels_guest_os_type = "rhel" vbox_guest_os_type = "Oracle_64" vmware_guest_os_type = "centos-64" utm_vm_icon = "linux" -boot_command = ["<wait><up><wait><tab><wait><end><wait> inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/rhel/ks.cfg inst.repo=https://download.rockylinux.org/pub/rocky/9/BaseOS/x86_64/os/ <wait><enter><wait>"] -utm_boot_command = ["<wait><up><wait>e<wait><down><wait><down><wait><end><wait> inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/rhel/ks.cfg inst.repo=https://download.rockylinux.org/pub/rocky/9/BaseOS/x86_64/os/ <wait><leftCtrlOn><wait>x<wait><leftCtrlOff>"] +boot_command = ["<wait><up><wait>e<wait><down><wait><down><wait><end><wait> inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/rhel/ks.cfg inst.repo=https://download.rockylinux.org/pub/rocky/9/BaseOS/x86_64/os/ <wait><leftCtrlOn><wait>x<wait><leftCtrlOff>"] diff --git a/packer_templates/pkr-sources.pkr.hcl b/packer_templates/pkr-sources.pkr.hcl index f7dfbc615..b65ad5993 100644 --- a/packer_templates/pkr-sources.pkr.hcl +++ b/packer_templates/pkr-sources.pkr.hcl @@ -139,7 +139,7 @@ locals { # virtualbox-iso vbox_chipset = var.vbox_chipset == null ? "ich9" : var.vbox_chipset vbox_gfx_controller = var.vbox_gfx_controller == null ? ( - var.is_windows ? "vboxsvga" : "vmsvga" + var.is_windows ? "vboxsvga" : "vboxsvga" ) : var.vbox_gfx_controller vbox_gfx_vram_size = var.vbox_gfx_controller == null ? ( var.is_windows ? 128 : 33 @@ -147,6 +147,12 @@ locals { vbox_guest_additions_mode = var.vbox_guest_additions_mode == null ? ( var.is_windows ? "attach" : "upload" ) : var.vbox_guest_additions_mode + vbox_hard_drive_interface = var.vbox_hard_drive_interface == null ? ( + var.is_windows ? "sata" : "virtio" + ) : var.vbox_hard_drive_interface + vbox_iso_interface = var.vbox_iso_interface == null ? ( + var.is_windows ? "sata" : "virtio" + ) : var.vbox_iso_interface vboxmanage = var.vboxmanage == null ? ( var.is_windows ? ( var.os_arch == "aarch64" ? [ @@ -183,6 +189,10 @@ locals { ["modifyvm", "{{.Name}}", "--audio-enabled", "off"], ["modifyvm", "{{.Name}}", "--nat-localhostreachable1", "on"], ["modifyvm", "{{.Name}}", "--cableconnected1", "on"], + ["modifyvm", "{{.Name}}", "--usb-xhci", "on"], + ["modifyvm", "{{.Name}}", "--mouse", "usb"], + ["modifyvm", "{{.Name}}", "--keyboard", "usb"], + ["storagectl", "{{.Name}}", "--name", "IDE Controller", "--remove"], ] ) ) : var.vboxmanage @@ -479,8 +489,8 @@ source "virtualbox-iso" "vm" { guest_additions_mode = local.vbox_guest_additions_mode guest_additions_interface = var.vbox_guest_additions_interface guest_os_type = var.vbox_guest_os_type - hard_drive_interface = var.vbox_hard_drive_interface - iso_interface = var.vbox_iso_interface + hard_drive_interface = local.vbox_hard_drive_interface + iso_interface = local.vbox_iso_interface nested_virt = var.vbox_nested_virt nic_type = local.vbox_nic_type rtc_time_base = var.vbox_rtc_time_base diff --git a/packer_templates/pkr-variables.pkr.hcl b/packer_templates/pkr-variables.pkr.hcl index 6947ae29c..0dd0488f4 100644 --- a/packer_templates/pkr-variables.pkr.hcl +++ b/packer_templates/pkr-variables.pkr.hcl @@ -388,11 +388,11 @@ variable "vbox_guest_os_type" { } variable "vbox_hard_drive_interface" { type = string - default = "sata" + default = null } variable "vbox_iso_interface" { type = string - default = "sata" + default = null } variable "vboxmanage" { type = list(list(string)) @@ -417,7 +417,7 @@ variable "vbox_rtc_time_base" { } variable "vbox_usb" { type = bool - default = true + default = false } # virtualbox-ovf From acac6be40ceff0d28e095a5f280dd60ecc064d0c Mon Sep 17 00:00:00 2001 From: Corey Hemminger <hemminger@hotmail.com> Date: Tue, 25 Nov 2025 14:42:25 -0600 Subject: [PATCH 1600/1622] update almalinux 10 to 10.1 (#1649) Signed-off-by: Corey Hemminger <hemminger@hotmail.com> --- CHANGELOG.md | 1 + os_pkrvars/almalinux/almalinux-10-aarch64.pkrvars.hcl | 4 ++-- os_pkrvars/almalinux/almalinux-10-x86_64.pkrvars.hcl | 4 ++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ec6d22c71..7e599fefb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -56,6 +56,7 @@ Markdown table generated at <https://www.tablesgenerator.com/markdown_tables#> - Updated macos boot commands to enable remote login as last step - Updated Almalinux 9 to 9.7 +- Updated Almalinux 10 to 10.1 - Updated Debian 13 to 13.2 - Updated RHEL 9 to 9.7 - Updated RHEL 10 to 10.1 diff --git a/os_pkrvars/almalinux/almalinux-10-aarch64.pkrvars.hcl b/os_pkrvars/almalinux/almalinux-10-aarch64.pkrvars.hcl index 9b84ebbfe..eb697b0c8 100644 --- a/os_pkrvars/almalinux/almalinux-10-aarch64.pkrvars.hcl +++ b/os_pkrvars/almalinux/almalinux-10-aarch64.pkrvars.hcl @@ -1,7 +1,7 @@ os_name = "almalinux" -os_version = "10.0" +os_version = "10.1" os_arch = "aarch64" -iso_url = "https://repo.almalinux.org/almalinux/10/isos/aarch64/AlmaLinux-10.0-aarch64-boot.iso" +iso_url = "https://repo.almalinux.org/almalinux/10/isos/aarch64/AlmaLinux-10.1-aarch64-boot.iso" iso_checksum = "file:https://repo.almalinux.org/almalinux/10/isos/aarch64/CHECKSUM" parallels_guest_os_type = "rhel" vbox_guest_os_type = "Oracle_arm64" diff --git a/os_pkrvars/almalinux/almalinux-10-x86_64.pkrvars.hcl b/os_pkrvars/almalinux/almalinux-10-x86_64.pkrvars.hcl index 5c8e18b58..ee13a4615 100644 --- a/os_pkrvars/almalinux/almalinux-10-x86_64.pkrvars.hcl +++ b/os_pkrvars/almalinux/almalinux-10-x86_64.pkrvars.hcl @@ -1,7 +1,7 @@ os_name = "almalinux" -os_version = "10.0" +os_version = "10.1" os_arch = "x86_64" -iso_url = "https://repo.almalinux.org/almalinux/10/isos/x86_64/AlmaLinux-10.0-x86_64-boot.iso" +iso_url = "https://repo.almalinux.org/almalinux/10/isos/x86_64/AlmaLinux-10.1-x86_64-boot.iso" iso_checksum = "file:https://repo.almalinux.org/almalinux/10/isos/x86_64/CHECKSUM" parallels_guest_os_type = "rhel" vbox_guest_os_type = "RedHat_64" From 50025ca6411de68981a6a082e68d6a8d34069534 Mon Sep 17 00:00:00 2001 From: Phillip Ross <phillipross@users.noreply.github.com> Date: Fri, 28 Nov 2025 17:01:27 -0500 Subject: [PATCH 1601/1622] update rockylinux10 from v10.0 to v10.1 (#1650) --- os_pkrvars/rockylinux/rockylinux-10-aarch64.pkrvars.hcl | 4 ++-- os_pkrvars/rockylinux/rockylinux-10-x86_64.pkrvars.hcl | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/os_pkrvars/rockylinux/rockylinux-10-aarch64.pkrvars.hcl b/os_pkrvars/rockylinux/rockylinux-10-aarch64.pkrvars.hcl index 5d9294c76..5c1ad29e2 100644 --- a/os_pkrvars/rockylinux/rockylinux-10-aarch64.pkrvars.hcl +++ b/os_pkrvars/rockylinux/rockylinux-10-aarch64.pkrvars.hcl @@ -1,7 +1,7 @@ os_name = "rockylinux" -os_version = "10.0" +os_version = "10.1" os_arch = "aarch64" -iso_url = "https://download.rockylinux.org/pub/rocky/10/isos/aarch64/Rocky-10.0-aarch64-boot.iso" +iso_url = "https://download.rockylinux.org/pub/rocky/10/isos/aarch64/Rocky-10.1-aarch64-boot.iso" iso_checksum = "file:https://download.rockylinux.org/pub/rocky/10/isos/aarch64/CHECKSUM" parallels_guest_os_type = "rhel" vbox_guest_os_type = "Oracle_arm64" diff --git a/os_pkrvars/rockylinux/rockylinux-10-x86_64.pkrvars.hcl b/os_pkrvars/rockylinux/rockylinux-10-x86_64.pkrvars.hcl index 926a94ed1..d17a08f2c 100644 --- a/os_pkrvars/rockylinux/rockylinux-10-x86_64.pkrvars.hcl +++ b/os_pkrvars/rockylinux/rockylinux-10-x86_64.pkrvars.hcl @@ -1,7 +1,7 @@ os_name = "rockylinux" -os_version = "10.0" +os_version = "10.1" os_arch = "x86_64" -iso_url = "https://download.rockylinux.org/pub/rocky/10/isos/x86_64/Rocky-10.0-x86_64-boot.iso" +iso_url = "https://download.rockylinux.org/pub/rocky/10/isos/x86_64/Rocky-10.1-x86_64-boot.iso" iso_checksum = "file:https://download.rockylinux.org/pub/rocky/10/isos/x86_64/CHECKSUM" parallels_guest_os_type = "rhel" vbox_guest_os_type = "Oracle_64" From 5b222efa18e6ec9ae0b9258126832a77748f1c9a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20Sj=C3=B6gren?= <konstruktoid@users.noreply.github.com> Date: Fri, 12 Dec 2025 21:06:08 +0100 Subject: [PATCH 1602/1622] sudo-rs doesn't support exempt_group (#1657) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Thomas Sjögren <konstruktoid@users.noreply.github.com> --- packer_templates/scripts/ubuntu/sudoers_ubuntu.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/packer_templates/scripts/ubuntu/sudoers_ubuntu.sh b/packer_templates/scripts/ubuntu/sudoers_ubuntu.sh index e56537fea..737c3549f 100644 --- a/packer_templates/scripts/ubuntu/sudoers_ubuntu.sh +++ b/packer_templates/scripts/ubuntu/sudoers_ubuntu.sh @@ -1,6 +1,8 @@ #!/bin/sh -eux -sed -i -e '/Defaults\s\+env_reset/a Defaults\texempt_group=sudo' /etc/sudoers; +if ! sudo --version &>/dev/stdout | grep -q sudo-rs; then + sed -i -e '/Defaults\s\+env_reset/a Defaults\texempt_group=sudo' /etc/sudoers; +fi # Set up password-less sudo for the vagrant user echo 'vagrant ALL=(ALL) NOPASSWD:ALL' >/etc/sudoers.d/99_vagrant; From e377547e96d4d564902a645d4a6df87ce04ebcc0 Mon Sep 17 00:00:00 2001 From: cgunasree08 <Chintha.Gunasree@progress.com> Date: Sun, 14 Dec 2025 20:50:37 +0530 Subject: [PATCH 1603/1622] Added SECURITY.md with standard template (#1652) Signed-off-by: cgunasree08 <Chintha.Gunasree@progress.com> --- SECURITY.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 SECURITY.md diff --git a/SECURITY.md b/SECURITY.md new file mode 100644 index 000000000..98beddb32 --- /dev/null +++ b/SECURITY.md @@ -0,0 +1,5 @@ +# Security Policy + +## Reporting a Vulnerability + +See https://chef.io/security for our security policy and how to report a vulnerability. From 11dc13a8eeb6eeeabb2901052b8b6112b0869b8a Mon Sep 17 00:00:00 2001 From: Phillip Ross <phillipross@users.noreply.github.com> Date: Sun, 14 Dec 2025 10:27:14 -0500 Subject: [PATCH 1604/1622] update rockylinux9 from v9.6 to v9.7 (#1659) Signed-off-by: Phillip Ross <phillip.w.g.ross@gmail.com> --- os_pkrvars/rockylinux/rockylinux-9-aarch64.pkrvars.hcl | 4 ++-- os_pkrvars/rockylinux/rockylinux-9-x86_64.pkrvars.hcl | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/os_pkrvars/rockylinux/rockylinux-9-aarch64.pkrvars.hcl b/os_pkrvars/rockylinux/rockylinux-9-aarch64.pkrvars.hcl index 048ecee63..181dde624 100644 --- a/os_pkrvars/rockylinux/rockylinux-9-aarch64.pkrvars.hcl +++ b/os_pkrvars/rockylinux/rockylinux-9-aarch64.pkrvars.hcl @@ -1,7 +1,7 @@ os_name = "rockylinux" -os_version = "9.6" +os_version = "9.7" os_arch = "aarch64" -iso_url = "https://download.rockylinux.org/pub/rocky/9/isos/aarch64/Rocky-9.6-aarch64-boot.iso" +iso_url = "https://download.rockylinux.org/pub/rocky/9/isos/aarch64/Rocky-9.7-aarch64-boot.iso" iso_checksum = "file:https://download.rockylinux.org/pub/rocky/9/isos/aarch64/CHECKSUM" parallels_guest_os_type = "rhel" vbox_guest_os_type = "Oracle9_arm64" diff --git a/os_pkrvars/rockylinux/rockylinux-9-x86_64.pkrvars.hcl b/os_pkrvars/rockylinux/rockylinux-9-x86_64.pkrvars.hcl index 8c100d072..791dd7f9a 100644 --- a/os_pkrvars/rockylinux/rockylinux-9-x86_64.pkrvars.hcl +++ b/os_pkrvars/rockylinux/rockylinux-9-x86_64.pkrvars.hcl @@ -1,7 +1,7 @@ os_name = "rockylinux" -os_version = "9.6" +os_version = "9.7" os_arch = "x86_64" -iso_url = "https://download.rockylinux.org/pub/rocky/9/isos/x86_64/Rocky-9.6-x86_64-boot.iso" +iso_url = "https://download.rockylinux.org/pub/rocky/9/isos/x86_64/Rocky-9.7-x86_64-boot.iso" iso_checksum = "file:https://download.rockylinux.org/pub/rocky/9/isos/x86_64/CHECKSUM" parallels_guest_os_type = "rhel" vbox_guest_os_type = "Oracle_64" From a888f6d740329a8b9ba1901ebbff7b98f35ae99e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20Sj=C3=B6gren?= <konstruktoid@users.noreply.github.com> Date: Mon, 15 Dec 2025 18:10:50 +0100 Subject: [PATCH 1605/1622] [sudo-rs] disable some shellcheck checks (#1658) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * add disable shellcheck checks * be POSIX sh compliant --------- Signed-off-by: Thomas Sjögren <konstruktoid@users.noreply.github.com> --- packer_templates/scripts/ubuntu/sudoers_ubuntu.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packer_templates/scripts/ubuntu/sudoers_ubuntu.sh b/packer_templates/scripts/ubuntu/sudoers_ubuntu.sh index 737c3549f..8b334c259 100644 --- a/packer_templates/scripts/ubuntu/sudoers_ubuntu.sh +++ b/packer_templates/scripts/ubuntu/sudoers_ubuntu.sh @@ -1,6 +1,7 @@ #!/bin/sh -eux -if ! sudo --version &>/dev/stdout | grep -q sudo-rs; then +# shellcheck disable=SC2024,SC2260 +if ! sudo --version > /dev/stdout 2>&1 | grep -q sudo-rs; then sed -i -e '/Defaults\s\+env_reset/a Defaults\texempt_group=sudo' /etc/sudoers; fi From f62680167ffe35fba3a25b9be26c3df393fa737b Mon Sep 17 00:00:00 2001 From: Seth Grover <13872653+mmguero@users.noreply.github.com> Date: Tue, 13 Jan 2026 16:26:42 +0000 Subject: [PATCH 1606/1622] Updated Debian from 13.2 to 13.3 (#1664) --- CHANGELOG.md | 2 +- os_pkrvars/debian/debian-13-aarch64.pkrvars.hcl | 4 ++-- os_pkrvars/debian/debian-13-x86_64.pkrvars.hcl | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7e599fefb..7c2df364e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -57,7 +57,7 @@ Markdown table generated at <https://www.tablesgenerator.com/markdown_tables#> - Updated macos boot commands to enable remote login as last step - Updated Almalinux 9 to 9.7 - Updated Almalinux 10 to 10.1 -- Updated Debian 13 to 13.2 +- Updated Debian 13 to 13.3 - Updated RHEL 9 to 9.7 - Updated RHEL 10 to 10.1 diff --git a/os_pkrvars/debian/debian-13-aarch64.pkrvars.hcl b/os_pkrvars/debian/debian-13-aarch64.pkrvars.hcl index bf63acdec..680f3e3fb 100644 --- a/os_pkrvars/debian/debian-13-aarch64.pkrvars.hcl +++ b/os_pkrvars/debian/debian-13-aarch64.pkrvars.hcl @@ -1,7 +1,7 @@ os_name = "debian" -os_version = "13.2" +os_version = "13.3" os_arch = "aarch64" -iso_url = "https://cdimage.debian.org/debian-cd/current/arm64/iso-cd/debian-13.2.0-arm64-netinst.iso" +iso_url = "https://cdimage.debian.org/debian-cd/current/arm64/iso-cd/debian-13.3.0-arm64-netinst.iso" iso_checksum = "file:https://cdimage.debian.org/debian-cd/current/arm64/iso-cd/SHA256SUMS" parallels_guest_os_type = "debian" vbox_guest_os_type = "Debian12_arm64" diff --git a/os_pkrvars/debian/debian-13-x86_64.pkrvars.hcl b/os_pkrvars/debian/debian-13-x86_64.pkrvars.hcl index eb3e1028b..c7b12c4dd 100644 --- a/os_pkrvars/debian/debian-13-x86_64.pkrvars.hcl +++ b/os_pkrvars/debian/debian-13-x86_64.pkrvars.hcl @@ -1,7 +1,7 @@ os_name = "debian" -os_version = "13.2" +os_version = "13.3" os_arch = "x86_64" -iso_url = "https://cdimage.debian.org/debian-cd/current/amd64/iso-cd/debian-13.2.0-amd64-netinst.iso" +iso_url = "https://cdimage.debian.org/debian-cd/current/amd64/iso-cd/debian-13.3.0-amd64-netinst.iso" iso_checksum = "file:https://cdimage.debian.org/debian-cd/current/amd64/iso-cd/SHA256SUMS" parallels_guest_os_type = "debian" vbox_guest_os_type = "Debian12_64" From eef3a00d06eb5ae7e4830314e2ffd3059f0c7ff8 Mon Sep 17 00:00:00 2001 From: Seth Grover <13872653+mmguero@users.noreply.github.com> Date: Tue, 13 Jan 2026 18:57:48 +0000 Subject: [PATCH 1607/1622] fix chef/bento#1665 issue with debian-13-x86_64.pkrvars.hcl boot_command (#1666) changed boot_command in os_pkrvars/debian/debian-13-x86_64.pkrvars.hcl from boot_command = ["<wait><esc><wait>auto preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/debian/preseed.cfg netcfg/get_hostname={{ .Name }}<enter>"] to boot_command = ["<wait>e<wait><down><down><down><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><wait>install <wait> preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/debian/preseed.cfg <wait>debian-installer=en_US.UTF-8 <wait>auto <wait>locale=en_US.UTF-8 <wait>kbd-chooser/method=us <wait>keyboard-configuration/xkb-keymap=us <wait>netcfg/get_hostname={{ .Name }} <wait>netcfg/get_domain=vagrantup.com <wait>fb=false <wait>debconf/frontend=noninteractive <wait>console-setup/ask_detect=false <wait>console-keymaps-at/keymap=us <wait>grub-installer/bootdev=default <wait><f10><wait>"] which is what's in debian-13-aarch64.pkrvars.hcl. This fixes the installer getting confused and stuck in a language selection menu we shouldn't be getting into. --- os_pkrvars/debian/debian-13-x86_64.pkrvars.hcl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/os_pkrvars/debian/debian-13-x86_64.pkrvars.hcl b/os_pkrvars/debian/debian-13-x86_64.pkrvars.hcl index c7b12c4dd..50643e923 100644 --- a/os_pkrvars/debian/debian-13-x86_64.pkrvars.hcl +++ b/os_pkrvars/debian/debian-13-x86_64.pkrvars.hcl @@ -7,4 +7,4 @@ parallels_guest_os_type = "debian" vbox_guest_os_type = "Debian12_64" vmware_guest_os_type = "debian-64" utm_vm_icon = "debian" -boot_command = ["<wait><esc><wait>auto preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/debian/preseed.cfg netcfg/get_hostname={{ .Name }}<enter>"] +boot_command = ["<wait>e<wait><down><down><down><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><wait>install <wait> preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/debian/preseed.cfg <wait>debian-installer=en_US.UTF-8 <wait>auto <wait>locale=en_US.UTF-8 <wait>kbd-chooser/method=us <wait>keyboard-configuration/xkb-keymap=us <wait>netcfg/get_hostname={{ .Name }} <wait>netcfg/get_domain=vagrantup.com <wait>fb=false <wait>debconf/frontend=noninteractive <wait>console-setup/ask_detect=false <wait>console-keymaps-at/keymap=us <wait>grub-installer/bootdev=default <wait><f10><wait>"] From b3e33869d7418e5aafeeebe4b1342f7809150258 Mon Sep 17 00:00:00 2001 From: Seth Grover <13872653+mmguero@users.noreply.github.com> Date: Tue, 13 Jan 2026 22:39:50 +0000 Subject: [PATCH 1608/1622] fix grub-install for debian 13 (#1668) * fix error with missing /usr/lib/grub/amd64-efi/modinfo.sh used by grub-install in Debian 13 x86_64 machines --- packer_templates/scripts/debian/cleanup_debian.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/packer_templates/scripts/debian/cleanup_debian.sh b/packer_templates/scripts/debian/cleanup_debian.sh index 820b8417d..e895b504b 100644 --- a/packer_templates/scripts/debian/cleanup_debian.sh +++ b/packer_templates/scripts/debian/cleanup_debian.sh @@ -2,6 +2,7 @@ if [ -d /sys/firmware/efi ]; then # Ensure the system can boot by adding the bootloader at the fallback path + [ "$(uname -m)" = "x86_64" ] && ln -sfn /usr/lib/grub/x86_64-efi /usr/lib/grub/amd64-efi grub-install --target="$(dpkg --print-architecture)"-efi --efi-directory=/boot/efi --bootloader-id=debian --removable fi From 5a4fe0d922d14273d7659e452c1e5faa442f5d92 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Romain=20Tarti=C3=A8re?= <romain@blogreen.org> Date: Tue, 13 Jan 2026 12:46:02 -1000 Subject: [PATCH 1609/1622] Add FreeBSD 15.0-RELEASE (#1661) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit FreeBSD 15.0 was recently released. Copy the exisiting code related to FreeBSD 14.3 and adjust the version number accordingly. Signed-off-by: Romain Tartière <romain@blogreen.org> --- .github/workflows/pkr-bld-hyperv-x64.yml | 1 + .github/workflows/pkr-bld-parallels-arm64.yml | 1 + .github/workflows/pkr-bld-parallels-x64.yml | 1 + .github/workflows/pkr-bld-qemu-arm64.yml | 1 + .github/workflows/pkr-bld-qemu-x64.yml | 1 + .github/workflows/pkr-bld-utm-arm64.yml | 1 + .github/workflows/pkr-bld-utm-x64.yml | 1 + .github/workflows/pkr-bld-virtualbox-arm64.yml | 1 + .github/workflows/pkr-bld-virtualbox-x64.yml | 1 + .github/workflows/pkr-bld-vmware-arm64.yml | 1 + .github/workflows/pkr-bld-vmware-x64.yml | 1 + .github/workflows/test-pkr-bld-parallels.yml | 2 ++ builds.yml | 2 ++ os_pkrvars/freebsd/freebsd-15-aarch64.pkrvars.hcl | 12 ++++++++++++ os_pkrvars/freebsd/freebsd-15-x86_64.pkrvars.hcl | 11 +++++++++++ 15 files changed, 38 insertions(+) create mode 100644 os_pkrvars/freebsd/freebsd-15-aarch64.pkrvars.hcl create mode 100644 os_pkrvars/freebsd/freebsd-15-x86_64.pkrvars.hcl diff --git a/.github/workflows/pkr-bld-hyperv-x64.yml b/.github/workflows/pkr-bld-hyperv-x64.yml index 67d0362a4..9d6f82395 100644 --- a/.github/workflows/pkr-bld-hyperv-x64.yml +++ b/.github/workflows/pkr-bld-hyperv-x64.yml @@ -27,6 +27,7 @@ jobs: - fedora-43 - freebsd-13 - freebsd-14 + - freebsd-15 - opensuse-leap-15 - opensuse-leap-16 - oraclelinux-8 diff --git a/.github/workflows/pkr-bld-parallels-arm64.yml b/.github/workflows/pkr-bld-parallels-arm64.yml index 0c3a9295d..49eb79d12 100644 --- a/.github/workflows/pkr-bld-parallels-arm64.yml +++ b/.github/workflows/pkr-bld-parallels-arm64.yml @@ -26,6 +26,7 @@ jobs: - fedora-43 - freebsd-13 - freebsd-14 + - freebsd-15 - opensuse-leap-15 - opensuse-leap-16 - oraclelinux-9 diff --git a/.github/workflows/pkr-bld-parallels-x64.yml b/.github/workflows/pkr-bld-parallels-x64.yml index 63da37071..7a77972d7 100644 --- a/.github/workflows/pkr-bld-parallels-x64.yml +++ b/.github/workflows/pkr-bld-parallels-x64.yml @@ -27,6 +27,7 @@ jobs: - fedora-43 - freebsd-13 - freebsd-14 + - freebsd-15 - opensuse-leap-15 - opensuse-leap-16 - oraclelinux-8 diff --git a/.github/workflows/pkr-bld-qemu-arm64.yml b/.github/workflows/pkr-bld-qemu-arm64.yml index 0abe387af..86c3c6888 100644 --- a/.github/workflows/pkr-bld-qemu-arm64.yml +++ b/.github/workflows/pkr-bld-qemu-arm64.yml @@ -26,6 +26,7 @@ jobs: - fedora-43 - freebsd-13 - freebsd-14 + - freebsd-15 - opensuse-leap-15 - opensuse-leap-16 - oraclelinux-9 diff --git a/.github/workflows/pkr-bld-qemu-x64.yml b/.github/workflows/pkr-bld-qemu-x64.yml index f36951ed3..329d4e08a 100644 --- a/.github/workflows/pkr-bld-qemu-x64.yml +++ b/.github/workflows/pkr-bld-qemu-x64.yml @@ -27,6 +27,7 @@ jobs: - fedora-43 - freebsd-13 - freebsd-14 + - freebsd-15 - opensuse-leap-15 - opensuse-leap-16 - oraclelinux-8 diff --git a/.github/workflows/pkr-bld-utm-arm64.yml b/.github/workflows/pkr-bld-utm-arm64.yml index d16643c60..35ade64a8 100644 --- a/.github/workflows/pkr-bld-utm-arm64.yml +++ b/.github/workflows/pkr-bld-utm-arm64.yml @@ -25,6 +25,7 @@ jobs: - fedora-42 - freebsd-13 - freebsd-14 + - freebsd-15 - opensuse-leap-15 - opensuse-leap-16 - oraclelinux-9 diff --git a/.github/workflows/pkr-bld-utm-x64.yml b/.github/workflows/pkr-bld-utm-x64.yml index 4fb0f5ef3..ced8216f6 100644 --- a/.github/workflows/pkr-bld-utm-x64.yml +++ b/.github/workflows/pkr-bld-utm-x64.yml @@ -26,6 +26,7 @@ jobs: - fedora-42 - freebsd-13 - freebsd-14 + - freebsd-15 - opensuse-leap-15 - opensuse-leap-16 - oraclelinux-8 diff --git a/.github/workflows/pkr-bld-virtualbox-arm64.yml b/.github/workflows/pkr-bld-virtualbox-arm64.yml index 30fd595d1..6fc19480e 100644 --- a/.github/workflows/pkr-bld-virtualbox-arm64.yml +++ b/.github/workflows/pkr-bld-virtualbox-arm64.yml @@ -26,6 +26,7 @@ jobs: - fedora-43 - freebsd-13 - freebsd-14 + - freebsd-15 - opensuse-leap-15 - opensuse-leap-16 - oraclelinux-9 diff --git a/.github/workflows/pkr-bld-virtualbox-x64.yml b/.github/workflows/pkr-bld-virtualbox-x64.yml index 89238b4de..6f4b8f17d 100644 --- a/.github/workflows/pkr-bld-virtualbox-x64.yml +++ b/.github/workflows/pkr-bld-virtualbox-x64.yml @@ -27,6 +27,7 @@ jobs: - fedora-43 - freebsd-13 - freebsd-14 + - freebsd-15 - opensuse-leap-15 - opensuse-leap-16 - oraclelinux-8 diff --git a/.github/workflows/pkr-bld-vmware-arm64.yml b/.github/workflows/pkr-bld-vmware-arm64.yml index c82013340..1aa898291 100644 --- a/.github/workflows/pkr-bld-vmware-arm64.yml +++ b/.github/workflows/pkr-bld-vmware-arm64.yml @@ -26,6 +26,7 @@ jobs: - fedora-43 - freebsd-13 - freebsd-14 + - freebsd-15 - opensuse-leap-15 - opensuse-leap-16 - oraclelinux-9 diff --git a/.github/workflows/pkr-bld-vmware-x64.yml b/.github/workflows/pkr-bld-vmware-x64.yml index 9bb796809..330f0317c 100644 --- a/.github/workflows/pkr-bld-vmware-x64.yml +++ b/.github/workflows/pkr-bld-vmware-x64.yml @@ -27,6 +27,7 @@ jobs: - fedora-43 - freebsd-13 - freebsd-14 + - freebsd-15 - opensuse-leap-15 - opensuse-leap-16 - oraclelinux-8 diff --git a/.github/workflows/test-pkr-bld-parallels.yml b/.github/workflows/test-pkr-bld-parallels.yml index da1f902fa..fcc1d7429 100644 --- a/.github/workflows/test-pkr-bld-parallels.yml +++ b/.github/workflows/test-pkr-bld-parallels.yml @@ -26,6 +26,7 @@ jobs: - fedora-43 - freebsd-13 - freebsd-14 + - freebsd-15 - opensuse-leap-15 - opensuse-leap-16 - oraclelinux-8 @@ -95,6 +96,7 @@ jobs: - fedora-41 - freebsd-13 - freebsd-14 + - freebsd-15 - opensuse-leap-15 - oraclelinux-8 - oraclelinux-9 diff --git a/builds.yml b/builds.yml index 1558a1d4b..7094f033a 100644 --- a/builds.yml +++ b/builds.yml @@ -18,6 +18,7 @@ public: - fedora-43 - freebsd-13 - freebsd-14 + - freebsd-15 - opensuse-leap-15 - opensuse-leap-16 - oraclelinux-8 @@ -41,6 +42,7 @@ slugs: - fedora-latest - freebsd-13 - freebsd-14 + - freebsd-15 - opensuse-leap-15 - oraclelinux-8 - oraclelinux-9 diff --git a/os_pkrvars/freebsd/freebsd-15-aarch64.pkrvars.hcl b/os_pkrvars/freebsd/freebsd-15-aarch64.pkrvars.hcl new file mode 100644 index 000000000..ea44aa901 --- /dev/null +++ b/os_pkrvars/freebsd/freebsd-15-aarch64.pkrvars.hcl @@ -0,0 +1,12 @@ +os_name = "freebsd" +os_version = "15.0" +os_arch = "aarch64" +iso_url = "https://download.freebsd.org/releases/arm64/aarch64/ISO-IMAGES/15.0/FreeBSD-15.0-RELEASE-arm64-aarch64-disc1.iso" +iso_checksum = "file:https://download.freebsd.org/releases/arm64/aarch64/ISO-IMAGES/15.0/CHECKSUM.SHA256-FreeBSD-15.0-RELEASE-arm64-aarch64" +parallels_guest_os_type = "freebsd" +vbox_guest_os_type = "FreeBSD_arm64" +vmware_guest_os_type = "arm-freebsd15-64" +utm_vm_icon = "freebsd" +default_boot_wait = "60s" +boot_command = ["<wait>s<wait2>mdmfs -s 100m md1 /tmp<enter><wait>mdmfs -s 100m md2 /mnt<enter><wait>dhclient -p /tmp/dhclient.$(ifconfig -l | awk '{print $1}').pid -l /tmp/dhclient.lease.$(ifconfig -l | awk '{print $1}') $(ifconfig -l | awk '{print $1}')<enter><wait10>fetch -o /tmp/installerconfig http://{{ .HTTPIP }}:{{ .HTTPPort }}/freebsd/installerconfig && bsdinstall script /tmp/installerconfig<enter><wait>"] +utm_boot_command = ["<wait>s<wait2>mdmfs -s 100m md1 /tmp<enter><wait>mdmfs -s 100m md2 /mnt<enter><wait>dhclient -p /tmp/dhclient.$(ifconfig -l | awk '{print $1}').pid -l /tmp/dhclient.lease.$(ifconfig -l | awk '{print $1}') $(ifconfig -l | awk '{print $1}')<enter><wait10>dhclient -p /tmp/dhclient.$(ifconfig -l | awk '{print $2}').pid -l /tmp/dhclient.lease.$(ifconfig -l | awk '{print $2}') $(ifconfig -l | awk '{print $2}')<enter><wait10>fetch -o /tmp/installerconfig http://{{ .HTTPIP }}:{{ .HTTPPort }}/freebsd/installerconfig && bsdinstall script /tmp/installerconfig<enter><wait>"] diff --git a/os_pkrvars/freebsd/freebsd-15-x86_64.pkrvars.hcl b/os_pkrvars/freebsd/freebsd-15-x86_64.pkrvars.hcl new file mode 100644 index 000000000..b7fd8698b --- /dev/null +++ b/os_pkrvars/freebsd/freebsd-15-x86_64.pkrvars.hcl @@ -0,0 +1,11 @@ +os_name = "freebsd" +os_version = "15.0" +os_arch = "x86_64" +iso_url = "https://download.freebsd.org/releases/amd64/amd64/ISO-IMAGES/15.0/FreeBSD-15.0-RELEASE-amd64-disc1.iso" +iso_checksum = "file:https://download.freebsd.org/releases/amd64/amd64/ISO-IMAGES/15.0/CHECKSUM.SHA256-FreeBSD-15.0-RELEASE-amd64" +parallels_guest_os_type = "freebsd" +vbox_guest_os_type = "FreeBSD_64" +vmware_guest_os_type = "freebsd-64" +utm_vm_icon = "freebsd" +default_boot_wait = "60s" +boot_command = ["<wait>s<wait2>mdmfs -s 100m md1 /tmp<enter><wait>mdmfs -s 100m md2 /mnt<enter><wait>dhclient -p /tmp/dhclient.$(ifconfig -l | awk '{print $1}').pid -l /tmp/dhclient.lease.$(ifconfig -l | awk '{print $1}') $(ifconfig -l | awk '{print $1}')<enter><wait10>dhclient -p /tmp/dhclient.$(ifconfig -l | awk '{print $2}').pid -l /tmp/dhclient.lease.$(ifconfig -l | awk '{print $2}') $(ifconfig -l | awk '{print $2}')<enter><wait10>fetch -o /tmp/installerconfig http://{{ .HTTPIP }}:{{ .HTTPPort }}/freebsd/installerconfig && bsdinstall script /tmp/installerconfig<enter><wait>"] From 1da9795c1098561dbaad08a717b677a373ba11a9 Mon Sep 17 00:00:00 2001 From: Seth Grover <13872653+mmguero@users.noreply.github.com> Date: Tue, 31 Mar 2026 19:40:18 +0000 Subject: [PATCH 1610/1622] bump debian to 13.4 (#1674) --- os_pkrvars/debian/debian-13-aarch64.pkrvars.hcl | 4 ++-- os_pkrvars/debian/debian-13-x86_64.pkrvars.hcl | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/os_pkrvars/debian/debian-13-aarch64.pkrvars.hcl b/os_pkrvars/debian/debian-13-aarch64.pkrvars.hcl index 680f3e3fb..fcda11f94 100644 --- a/os_pkrvars/debian/debian-13-aarch64.pkrvars.hcl +++ b/os_pkrvars/debian/debian-13-aarch64.pkrvars.hcl @@ -1,7 +1,7 @@ os_name = "debian" -os_version = "13.3" +os_version = "13.4" os_arch = "aarch64" -iso_url = "https://cdimage.debian.org/debian-cd/current/arm64/iso-cd/debian-13.3.0-arm64-netinst.iso" +iso_url = "https://cdimage.debian.org/debian-cd/current/arm64/iso-cd/debian-13.4.0-arm64-netinst.iso" iso_checksum = "file:https://cdimage.debian.org/debian-cd/current/arm64/iso-cd/SHA256SUMS" parallels_guest_os_type = "debian" vbox_guest_os_type = "Debian12_arm64" diff --git a/os_pkrvars/debian/debian-13-x86_64.pkrvars.hcl b/os_pkrvars/debian/debian-13-x86_64.pkrvars.hcl index 50643e923..029bef373 100644 --- a/os_pkrvars/debian/debian-13-x86_64.pkrvars.hcl +++ b/os_pkrvars/debian/debian-13-x86_64.pkrvars.hcl @@ -1,7 +1,7 @@ os_name = "debian" -os_version = "13.3" +os_version = "13.4" os_arch = "x86_64" -iso_url = "https://cdimage.debian.org/debian-cd/current/amd64/iso-cd/debian-13.3.0-amd64-netinst.iso" +iso_url = "https://cdimage.debian.org/debian-cd/current/amd64/iso-cd/debian-13.4.0-amd64-netinst.iso" iso_checksum = "file:https://cdimage.debian.org/debian-cd/current/amd64/iso-cd/SHA256SUMS" parallels_guest_os_type = "debian" vbox_guest_os_type = "Debian12_64" From 5d5b6599caae2f91d0f08a04a9c2f1f184dd6fa6 Mon Sep 17 00:00:00 2001 From: Brandon Welsch <dev@brandon-welsch.eu> Date: Fri, 1 May 2026 14:49:19 +0200 Subject: [PATCH 1611/1622] feat(ubuntu): Add Ubuntu 26.04 (#1676) Signed-off-by: Brandon WELSCH <dev@brandon-welsch.eu> --- .github/workflows/pkr-bld-hyperv-x64.yml | 1 + .github/workflows/pkr-bld-parallels-arm64.yml | 1 + .github/workflows/pkr-bld-parallels-x64.yml | 1 + .github/workflows/pkr-bld-qemu-arm64.yml | 1 + .github/workflows/pkr-bld-qemu-x64.yml | 1 + .github/workflows/pkr-bld-utm-arm64.yml | 1 + .github/workflows/pkr-bld-utm-x64.yml | 1 + .github/workflows/pkr-bld-virtualbox-arm64.yml | 1 + .github/workflows/pkr-bld-virtualbox-x64.yml | 1 + .github/workflows/pkr-bld-vmware-arm64.yml | 1 + .github/workflows/pkr-bld-vmware-x64.yml | 1 + .github/workflows/test-pkr-bld-parallels.yml | 2 ++ builds.yml | 1 + os_pkrvars/ubuntu/ubuntu-26.04-aarch64.pkrvars.hcl | 10 ++++++++++ os_pkrvars/ubuntu/ubuntu-26.04-x86_64.pkrvars.hcl | 10 ++++++++++ 15 files changed, 34 insertions(+) create mode 100644 os_pkrvars/ubuntu/ubuntu-26.04-aarch64.pkrvars.hcl create mode 100644 os_pkrvars/ubuntu/ubuntu-26.04-x86_64.pkrvars.hcl diff --git a/.github/workflows/pkr-bld-hyperv-x64.yml b/.github/workflows/pkr-bld-hyperv-x64.yml index 9d6f82395..82c57b602 100644 --- a/.github/workflows/pkr-bld-hyperv-x64.yml +++ b/.github/workflows/pkr-bld-hyperv-x64.yml @@ -40,6 +40,7 @@ jobs: - ubuntu-24.04 - ubuntu-25.04 - ubuntu-25.10 + - ubuntu-26.04 provider: - hyperv-iso steps: diff --git a/.github/workflows/pkr-bld-parallels-arm64.yml b/.github/workflows/pkr-bld-parallels-arm64.yml index 49eb79d12..c167bd369 100644 --- a/.github/workflows/pkr-bld-parallels-arm64.yml +++ b/.github/workflows/pkr-bld-parallels-arm64.yml @@ -37,6 +37,7 @@ jobs: - ubuntu-24.04 - ubuntu-25.04 - ubuntu-25.10 + - ubuntu-26.04 provider: - parallels-iso steps: diff --git a/.github/workflows/pkr-bld-parallels-x64.yml b/.github/workflows/pkr-bld-parallels-x64.yml index 7a77972d7..695b25839 100644 --- a/.github/workflows/pkr-bld-parallels-x64.yml +++ b/.github/workflows/pkr-bld-parallels-x64.yml @@ -40,6 +40,7 @@ jobs: - ubuntu-24.04 - ubuntu-25.04 - ubuntu-25.10 + - ubuntu-26.04 provider: - parallels-iso steps: diff --git a/.github/workflows/pkr-bld-qemu-arm64.yml b/.github/workflows/pkr-bld-qemu-arm64.yml index 86c3c6888..36735a82e 100644 --- a/.github/workflows/pkr-bld-qemu-arm64.yml +++ b/.github/workflows/pkr-bld-qemu-arm64.yml @@ -37,6 +37,7 @@ jobs: - ubuntu-24.04 - ubuntu-25.04 - ubuntu-25.10 + - ubuntu-26.04 provider: - qemu steps: diff --git a/.github/workflows/pkr-bld-qemu-x64.yml b/.github/workflows/pkr-bld-qemu-x64.yml index 329d4e08a..42cb8d5c8 100644 --- a/.github/workflows/pkr-bld-qemu-x64.yml +++ b/.github/workflows/pkr-bld-qemu-x64.yml @@ -40,6 +40,7 @@ jobs: - ubuntu-24.04 - ubuntu-25.04 - ubuntu-25.10 + - ubuntu-26.04 provider: - qemu steps: diff --git a/.github/workflows/pkr-bld-utm-arm64.yml b/.github/workflows/pkr-bld-utm-arm64.yml index 35ade64a8..38267e17a 100644 --- a/.github/workflows/pkr-bld-utm-arm64.yml +++ b/.github/workflows/pkr-bld-utm-arm64.yml @@ -36,6 +36,7 @@ jobs: - ubuntu-24.04 - ubuntu-25.04 - ubuntu-25.10 + - ubuntu-26.04 provider: - utm-iso steps: diff --git a/.github/workflows/pkr-bld-utm-x64.yml b/.github/workflows/pkr-bld-utm-x64.yml index ced8216f6..5ba0043ef 100644 --- a/.github/workflows/pkr-bld-utm-x64.yml +++ b/.github/workflows/pkr-bld-utm-x64.yml @@ -39,6 +39,7 @@ jobs: - ubuntu-24.04 - ubuntu-25.04 - ubuntu-25.10 + - ubuntu-26.04 provider: - utm-iso steps: diff --git a/.github/workflows/pkr-bld-virtualbox-arm64.yml b/.github/workflows/pkr-bld-virtualbox-arm64.yml index 6fc19480e..8132e2238 100644 --- a/.github/workflows/pkr-bld-virtualbox-arm64.yml +++ b/.github/workflows/pkr-bld-virtualbox-arm64.yml @@ -37,6 +37,7 @@ jobs: - ubuntu-24.04 - ubuntu-25.04 - ubuntu-25.10 + - ubuntu-26.04 provider: - virtualbox-iso steps: diff --git a/.github/workflows/pkr-bld-virtualbox-x64.yml b/.github/workflows/pkr-bld-virtualbox-x64.yml index 6f4b8f17d..b09fcbc75 100644 --- a/.github/workflows/pkr-bld-virtualbox-x64.yml +++ b/.github/workflows/pkr-bld-virtualbox-x64.yml @@ -40,6 +40,7 @@ jobs: - ubuntu-24.04 - ubuntu-25.04 - ubuntu-25.10 + - ubuntu-26.04 provider: - virtualbox-iso steps: diff --git a/.github/workflows/pkr-bld-vmware-arm64.yml b/.github/workflows/pkr-bld-vmware-arm64.yml index 1aa898291..c89d18c5c 100644 --- a/.github/workflows/pkr-bld-vmware-arm64.yml +++ b/.github/workflows/pkr-bld-vmware-arm64.yml @@ -37,6 +37,7 @@ jobs: - ubuntu-24.04 - ubuntu-25.04 - ubuntu-25.10 + - ubuntu-26.04 provider: - vmware-iso steps: diff --git a/.github/workflows/pkr-bld-vmware-x64.yml b/.github/workflows/pkr-bld-vmware-x64.yml index 330f0317c..5d2341526 100644 --- a/.github/workflows/pkr-bld-vmware-x64.yml +++ b/.github/workflows/pkr-bld-vmware-x64.yml @@ -40,6 +40,7 @@ jobs: - ubuntu-24.04 - ubuntu-25.04 - ubuntu-25.10 + - ubuntu-26.04 provider: - vmware-iso steps: diff --git a/.github/workflows/test-pkr-bld-parallels.yml b/.github/workflows/test-pkr-bld-parallels.yml index fcc1d7429..d6de2796c 100644 --- a/.github/workflows/test-pkr-bld-parallels.yml +++ b/.github/workflows/test-pkr-bld-parallels.yml @@ -37,6 +37,7 @@ jobs: - rockylinux-10 - ubuntu-22.04 - ubuntu-24.04 + - ubuntu-26.04 provider: - parallels-iso steps: @@ -105,6 +106,7 @@ jobs: - ubuntu-20.04 - ubuntu-22.04 - ubuntu-24.04 + - ubuntu-26.04 provider: - parallels-iso steps: diff --git a/builds.yml b/builds.yml index 7094f033a..1aa72f64f 100644 --- a/builds.yml +++ b/builds.yml @@ -31,6 +31,7 @@ public: - ubuntu-24.04 - ubuntu-25.04 - ubuntu-25.10 + - ubuntu-26.04 # slug box name: text string from standard box name to match slugs: diff --git a/os_pkrvars/ubuntu/ubuntu-26.04-aarch64.pkrvars.hcl b/os_pkrvars/ubuntu/ubuntu-26.04-aarch64.pkrvars.hcl new file mode 100644 index 000000000..920a4e248 --- /dev/null +++ b/os_pkrvars/ubuntu/ubuntu-26.04-aarch64.pkrvars.hcl @@ -0,0 +1,10 @@ +os_name = "ubuntu" +os_version = "26.04" +os_arch = "aarch64" +iso_url = "https://cdimage.ubuntu.com/releases/resolute/release/ubuntu-26.04-live-server-arm64.iso" +iso_checksum = "file:https://cdimage.ubuntu.com/releases/resolute/release/SHA256SUMS" +parallels_guest_os_type = "ubuntu" +vbox_guest_os_type = "Ubuntu_arm64" +vmware_guest_os_type = "ubuntu64Guest" +utm_vm_icon = "ubuntu" +boot_command = ["<wait>e<wait><down><down><down><end> autoinstall ds=nocloud-net\\;s=http://{{.HTTPIP}}:{{.HTTPPort}}/ubuntu/<wait><f10><wait>"] diff --git a/os_pkrvars/ubuntu/ubuntu-26.04-x86_64.pkrvars.hcl b/os_pkrvars/ubuntu/ubuntu-26.04-x86_64.pkrvars.hcl new file mode 100644 index 000000000..bb57c130a --- /dev/null +++ b/os_pkrvars/ubuntu/ubuntu-26.04-x86_64.pkrvars.hcl @@ -0,0 +1,10 @@ +os_name = "ubuntu" +os_version = "26.04" +os_arch = "x86_64" +iso_url = "https://releases.ubuntu.com/resolute/ubuntu-26.04-live-server-amd64.iso" +iso_checksum = "file:https://releases.ubuntu.com/resolute/SHA256SUMS" +parallels_guest_os_type = "ubuntu" +vbox_guest_os_type = "Ubuntu_64" +vmware_guest_os_type = "ubuntu64Guest" +utm_vm_icon = "ubuntu" +boot_command = ["<wait>e<wait><down><down><down><end> autoinstall ds=nocloud-net\\;s=http://{{.HTTPIP}}:{{.HTTPPort}}/ubuntu/<wait><f10><wait>"] From 6df00bf75a9bea215d9e23c827a007e6244da03a Mon Sep 17 00:00:00 2001 From: Li-Wen Hsu <lwhsu@lwhsu.org> Date: Fri, 1 May 2026 20:56:03 +0800 Subject: [PATCH 1612/1622] Update FreeBSD 14 to 14.4-RELEASE (#1672) Signed-off-by: Li-Wen Hsu <lwhsu@lwhsu.org> --- CHANGELOG.md | 1 + os_pkrvars/freebsd/freebsd-14-aarch64.pkrvars.hcl | 6 +++--- os_pkrvars/freebsd/freebsd-14-x86_64.pkrvars.hcl | 6 +++--- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7c2df364e..ad38465f4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -54,6 +54,7 @@ Markdown table generated at <https://www.tablesgenerator.com/markdown_tables#> ## [unreleased] (2025-11-21) +- Update freebsd 14 to 14.4 - Updated macos boot commands to enable remote login as last step - Updated Almalinux 9 to 9.7 - Updated Almalinux 10 to 10.1 diff --git a/os_pkrvars/freebsd/freebsd-14-aarch64.pkrvars.hcl b/os_pkrvars/freebsd/freebsd-14-aarch64.pkrvars.hcl index 0bd7d66f3..a745e86d4 100644 --- a/os_pkrvars/freebsd/freebsd-14-aarch64.pkrvars.hcl +++ b/os_pkrvars/freebsd/freebsd-14-aarch64.pkrvars.hcl @@ -1,8 +1,8 @@ os_name = "freebsd" -os_version = "14.3" +os_version = "14.4" os_arch = "aarch64" -iso_url = "https://download.freebsd.org/releases/arm64/aarch64/ISO-IMAGES/14.3/FreeBSD-14.3-RELEASE-arm64-aarch64-disc1.iso" -iso_checksum = "file:https://download.freebsd.org/releases/arm64/aarch64/ISO-IMAGES/14.3/CHECKSUM.SHA256-FreeBSD-14.3-RELEASE-arm64-aarch64" +iso_url = "https://download.freebsd.org/releases/arm64/aarch64/ISO-IMAGES/14.4/FreeBSD-14.4-RELEASE-arm64-aarch64-disc1.iso" +iso_checksum = "file:https://download.freebsd.org/releases/arm64/aarch64/ISO-IMAGES/14.4/CHECKSUM.SHA256-FreeBSD-14.4-RELEASE-arm64-aarch64" parallels_guest_os_type = "freebsd" vbox_guest_os_type = "FreeBSD_arm64" vmware_guest_os_type = "arm-freebsd14-64" diff --git a/os_pkrvars/freebsd/freebsd-14-x86_64.pkrvars.hcl b/os_pkrvars/freebsd/freebsd-14-x86_64.pkrvars.hcl index 2be52a41e..69d463b05 100644 --- a/os_pkrvars/freebsd/freebsd-14-x86_64.pkrvars.hcl +++ b/os_pkrvars/freebsd/freebsd-14-x86_64.pkrvars.hcl @@ -1,8 +1,8 @@ os_name = "freebsd" -os_version = "14.3" +os_version = "14.4" os_arch = "x86_64" -iso_url = "https://download.freebsd.org/releases/amd64/amd64/ISO-IMAGES/14.3/FreeBSD-14.3-RELEASE-amd64-disc1.iso" -iso_checksum = "file:https://download.freebsd.org/releases/amd64/amd64/ISO-IMAGES/14.3/CHECKSUM.SHA256-FreeBSD-14.3-RELEASE-amd64" +iso_url = "https://download.freebsd.org/releases/amd64/amd64/ISO-IMAGES/14.4/FreeBSD-14.4-RELEASE-amd64-disc1.iso" +iso_checksum = "file:https://download.freebsd.org/releases/amd64/amd64/ISO-IMAGES/14.4/CHECKSUM.SHA256-FreeBSD-14.4-RELEASE-amd64" parallels_guest_os_type = "freebsd" vbox_guest_os_type = "FreeBSD_64" vmware_guest_os_type = "freebsd-64" From 8662f2117d9a24d1d7723cbc2f1a9afe5c7071e7 Mon Sep 17 00:00:00 2001 From: Hummeltech <6109326+hummeltech@users.noreply.github.com> Date: Fri, 1 May 2026 05:56:46 -0700 Subject: [PATCH 1613/1622] Use FreeBSD 15.0 DVD iso instead (#1670) Signed-off-by: David Hummel <6109326+hummeltech@users.noreply.github.com> --- os_pkrvars/freebsd/freebsd-15-aarch64.pkrvars.hcl | 2 +- os_pkrvars/freebsd/freebsd-15-x86_64.pkrvars.hcl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/os_pkrvars/freebsd/freebsd-15-aarch64.pkrvars.hcl b/os_pkrvars/freebsd/freebsd-15-aarch64.pkrvars.hcl index ea44aa901..477efafba 100644 --- a/os_pkrvars/freebsd/freebsd-15-aarch64.pkrvars.hcl +++ b/os_pkrvars/freebsd/freebsd-15-aarch64.pkrvars.hcl @@ -1,7 +1,7 @@ os_name = "freebsd" os_version = "15.0" os_arch = "aarch64" -iso_url = "https://download.freebsd.org/releases/arm64/aarch64/ISO-IMAGES/15.0/FreeBSD-15.0-RELEASE-arm64-aarch64-disc1.iso" +iso_url = "https://download.freebsd.org/releases/arm64/aarch64/ISO-IMAGES/15.0/FreeBSD-15.0-RELEASE-arm64-aarch64-dvd1.iso" iso_checksum = "file:https://download.freebsd.org/releases/arm64/aarch64/ISO-IMAGES/15.0/CHECKSUM.SHA256-FreeBSD-15.0-RELEASE-arm64-aarch64" parallels_guest_os_type = "freebsd" vbox_guest_os_type = "FreeBSD_arm64" diff --git a/os_pkrvars/freebsd/freebsd-15-x86_64.pkrvars.hcl b/os_pkrvars/freebsd/freebsd-15-x86_64.pkrvars.hcl index b7fd8698b..9b9b532de 100644 --- a/os_pkrvars/freebsd/freebsd-15-x86_64.pkrvars.hcl +++ b/os_pkrvars/freebsd/freebsd-15-x86_64.pkrvars.hcl @@ -1,7 +1,7 @@ os_name = "freebsd" os_version = "15.0" os_arch = "x86_64" -iso_url = "https://download.freebsd.org/releases/amd64/amd64/ISO-IMAGES/15.0/FreeBSD-15.0-RELEASE-amd64-disc1.iso" +iso_url = "https://download.freebsd.org/releases/amd64/amd64/ISO-IMAGES/15.0/FreeBSD-15.0-RELEASE-amd64-dvd1.iso" iso_checksum = "file:https://download.freebsd.org/releases/amd64/amd64/ISO-IMAGES/15.0/CHECKSUM.SHA256-FreeBSD-15.0-RELEASE-amd64" parallels_guest_os_type = "freebsd" vbox_guest_os_type = "FreeBSD_64" From 1d6a740cade2eab17dbefad3975d43b982628686 Mon Sep 17 00:00:00 2001 From: Seth Grover <13872653+mmguero@users.noreply.github.com> Date: Wed, 20 May 2026 23:33:50 +0000 Subject: [PATCH 1614/1622] Bump Debian from 13.4 to 13.5 (#1678) Signed-off-by: Seth Grover <seth.d.grover@gmail.com> --- os_pkrvars/debian/debian-13-aarch64.pkrvars.hcl | 4 ++-- os_pkrvars/debian/debian-13-x86_64.pkrvars.hcl | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/os_pkrvars/debian/debian-13-aarch64.pkrvars.hcl b/os_pkrvars/debian/debian-13-aarch64.pkrvars.hcl index fcda11f94..8fa9d8e0f 100644 --- a/os_pkrvars/debian/debian-13-aarch64.pkrvars.hcl +++ b/os_pkrvars/debian/debian-13-aarch64.pkrvars.hcl @@ -1,7 +1,7 @@ os_name = "debian" -os_version = "13.4" +os_version = "13.5" os_arch = "aarch64" -iso_url = "https://cdimage.debian.org/debian-cd/current/arm64/iso-cd/debian-13.4.0-arm64-netinst.iso" +iso_url = "https://cdimage.debian.org/debian-cd/current/arm64/iso-cd/debian-13.5.0-arm64-netinst.iso" iso_checksum = "file:https://cdimage.debian.org/debian-cd/current/arm64/iso-cd/SHA256SUMS" parallels_guest_os_type = "debian" vbox_guest_os_type = "Debian12_arm64" diff --git a/os_pkrvars/debian/debian-13-x86_64.pkrvars.hcl b/os_pkrvars/debian/debian-13-x86_64.pkrvars.hcl index 029bef373..36d9bbe04 100644 --- a/os_pkrvars/debian/debian-13-x86_64.pkrvars.hcl +++ b/os_pkrvars/debian/debian-13-x86_64.pkrvars.hcl @@ -1,7 +1,7 @@ os_name = "debian" -os_version = "13.4" +os_version = "13.5" os_arch = "x86_64" -iso_url = "https://cdimage.debian.org/debian-cd/current/amd64/iso-cd/debian-13.4.0-amd64-netinst.iso" +iso_url = "https://cdimage.debian.org/debian-cd/current/amd64/iso-cd/debian-13.5.0-amd64-netinst.iso" iso_checksum = "file:https://cdimage.debian.org/debian-cd/current/amd64/iso-cd/SHA256SUMS" parallels_guest_os_type = "debian" vbox_guest_os_type = "Debian12_64" From 374883c7c470db77c06300d966ef679e99c6b0b7 Mon Sep 17 00:00:00 2001 From: Yaroslav Halchenko <debian@onerussian.com> Date: Wed, 27 May 2026 16:54:09 -0400 Subject: [PATCH 1615/1622] Add codespell support with configuration and fixes (#1671) * Add github action to codespell --------- Signed-off-by: Yaroslav Halchenko <debian@onerussian.com> Co-authored-by: Claude Code 2.1.63 / Claude Opus 4.6 <noreply@anthropic.com> --- .codespellrc | 6 ++++++ .github/workflows/ci-lint.yml | 10 ++++++++++ CHANGELOG.md | 20 +++++++++---------- README.md | 6 +++--- lib/bento/cli.rb | 6 +++--- packer_templates/http/debian/preseed.cfg | 2 +- .../scripts/suse/vagrant_group_suse.sh | 2 +- packer_templates/scripts/windows/cleanup.ps1 | 4 ++-- .../scripts/windows/remove-apps.ps1 | 4 ++-- .../windows/remove-one-drive-and-teams.ps1 | 8 ++++---- 10 files changed, 42 insertions(+), 26 deletions(-) create mode 100644 .codespellrc diff --git a/.codespellrc b/.codespellrc new file mode 100644 index 000000000..4f6fcab78 --- /dev/null +++ b/.codespellrc @@ -0,0 +1,6 @@ +[codespell] +# Ref: https://github.com/codespell-project/codespell#using-a-config-file +skip = .git,.gitignore,.gitattributes,.codespellrc,.npm,.cache,.local +check-hidden = true +# ignore-regex = +# ignore-words-list = diff --git a/.github/workflows/ci-lint.yml b/.github/workflows/ci-lint.yml index f9e0e5894..ebc84ac24 100644 --- a/.github/workflows/ci-lint.yml +++ b/.github/workflows/ci-lint.yml @@ -34,3 +34,13 @@ jobs: packer-lint: uses: chef/github-workflows/.github/workflows/packer-lint.yml@main secrets: inherit + + # Codespell configuration is within .codespellrc + codespell: + name: Check for spelling errors + runs-on: ubuntu-latest + steps: + - name: Checkout + uses: actions/checkout@v4 + - name: Codespell + uses: codespell-project/actions-codespell@v2 diff --git a/CHANGELOG.md b/CHANGELOG.md index ad38465f4..c6871ea82 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -247,7 +247,7 @@ Markdown table generated at <https://www.tablesgenerator.com/markdown_tables#> - Updated windows vagrant template to default to 4GB of memory - Default hyperv to generation 2 - Removed EOL OS builds Windows2012r2, Ubuntu 18.04, Ubuntu 22.10, Debian 10 -- Remove use of deprecated chef-solo provisioner and cookbooks for widnows builds +- Remove use of deprecated chef-solo provisioner and cookbooks for windows builds - Add boot_wait variables for each provider - Adjusted default_boot_wait for linux to 5s - Added --vars and --var_files flags @@ -274,7 +274,7 @@ Markdown table generated at <https://www.tablesgenerator.com/markdown_tables#> ## [v3.1.0] (2023-05-17) -- Updated VMware disk and cdrom adaptor type to sata for aarch64 build compatability +- Updated VMware disk and cdrom adaptor type to sata for aarch64 build compatibility - Added "arm-" to aarch64 pkrvars files vmware_guest_os_type - Fixed readme example for bento debian build - Added pkrvars file for amazon 2023, more work needed to build vagrant box if/when amazon releases images for providers @@ -308,7 +308,7 @@ Markdown table generated at <https://www.tablesgenerator.com/markdown_tables#> - Fix failing builds - Finish removal of deprecated chef-solo provider to powershell provider for windows - migrate from http directory for hosting files to cd_files in source templates - - This makes all builds compatable with hyper-v gen 2 which removes floppy disk capability + - This makes all builds compatible with hyper-v gen 2 which removes floppy disk capability - This also makes things universal for Virtualbox 6.1 to 7.x due to latter requiring extra config for guests on NAT to be able to connect to host - Update pipelines to only run on updated pkrvars files @@ -342,7 +342,7 @@ Markdown table generated at <https://www.tablesgenerator.com/markdown_tables#> - Finish removal of deprecated chef-solo provider to powershell provider for windows - migrate from http directory for hosting files to cd_files in source templates - - This makes all builds compatable with hyper-v gen 2 which removes floppy disk capability + - This makes all builds compatible with hyper-v gen 2 which removes floppy disk capability - This also makes things universal for Virtualbox 6.1 to 7.x due to latter requiring extra config for guests on NAT to be able to connect to host - Update pipelines to only run on updated pkrvars files @@ -386,7 +386,7 @@ Markdown table generated at <https://www.tablesgenerator.com/markdown_tables#> - Add more Virtualization providers to build pipelines - Finish removal of deprecated chef-solo provider to powershell provider for windows - migrate from http directory for hosting files to cd_files in source templates - - This makes all builds compatable with hyper-v gen 2 which removes floppy disk capability + - This makes all builds compatible with hyper-v gen 2 which removes floppy disk capability - This also makes things universal for Virtualbox 6.1 to 7.x due to latter requiring extra config for guests on NAT to be able to connect to host - Update pipelines to only run on updated pkrvars files @@ -466,7 +466,7 @@ Markdown table generated at <https://www.tablesgenerator.com/markdown_tables#> - Add more Virtualization providers to build pipelines - Finish removal of deprecated chef-solo provider to powershell provider for windows - migrate from http directory for hosting files to cd_files in source templates - - This makes all builds compatable with hyper-v gen 2 which removes floppy disk capability + - This makes all builds compatible with hyper-v gen 2 which removes floppy disk capability - This also makes things universal for Virtualbox 6.1 to 7.x due to latter requiring extra config for guests on NAT to be able to connect to host - Update pipelines to only run on updated pkrvars files @@ -1046,7 +1046,7 @@ Please ensure that Virtualbox is at least 5.1.6 and Vagrant at least 1.8.6 befor - RHEL 6.7 image has wrong guest [\#501](https://github.com/chef/bento/issues/501) - Fedora 23 x86\_64 and virtualbox: no vboxsf [\#500](https://github.com/chef/bento/issues/500) - Broken url on description [\#493](https://github.com/chef/bento/issues/493) -- Porposal Fedora 23 [\#491](https://github.com/chef/bento/issues/491) +- Proposal Fedora 23 [\#491](https://github.com/chef/bento/issues/491) - Ubuntu 15.10 [\#482](https://github.com/chef/bento/issues/482) - /dev/sr0 is readonly [\#480](https://github.com/chef/bento/issues/480) - Ubuntu 14.04 Fails to build with bento/packer [\#477](https://github.com/chef/bento/issues/477) @@ -1220,7 +1220,7 @@ Please ensure that Virtualbox is at least 5.1.6 and Vagrant at least 1.8.6 befor - Guest Additions are installed without dkms support [\#332](https://github.com/chef/bento/issues/332) - need to get the correct cacert.pem for AWS on CentOS boxes [\#325](https://github.com/chef/bento/issues/325) - Use the SATA HDD controller for faster disk IO speeds [\#324](https://github.com/chef/bento/issues/324) -- Better package miror for Debian [\#322](https://github.com/chef/bento/issues/322) +- Better package mirror for Debian [\#322](https://github.com/chef/bento/issues/322) - Error building debian7.8-amd-64 [\#319](https://github.com/chef/bento/issues/319) - Fedora kickstart script downloads CA cert bundle over HTTP [\#318](https://github.com/chef/bento/issues/318) - CentOS and Fedora boxes packed without docs? [\#317](https://github.com/chef/bento/issues/317) @@ -1277,7 +1277,7 @@ Please ensure that Virtualbox is at least 5.1.6 and Vagrant at least 1.8.6 befor - \[macosx-\*\] Add support for {http,https,no}\_proxy environment variables. [\#391](https://github.com/chef/bento/pull/391) ([fnichol](https://github.com/fnichol)) - Remove files that are no longer referenced by any templates. [\#390](https://github.com/chef/bento/pull/390) ([fnichol](https://github.com/fnichol)) - \[macosx-\*\] Improve DRYness & correctness of Mac templates. [\#389](https://github.com/chef/bento/pull/389) ([fnichol](https://github.com/fnichol)) -- Add provider metadata to metdata files on build. [\#387](https://github.com/chef/bento/pull/387) ([fnichol](https://github.com/fnichol)) +- Add provider metadata to metadata files on build. [\#387](https://github.com/chef/bento/pull/387) ([fnichol](https://github.com/fnichol)) - updated debian's download redirector address [\#386](https://github.com/chef/bento/pull/386) ([rmoriz](https://github.com/rmoriz)) - preliminary debian 8.1 templates [\#385](https://github.com/chef/bento/pull/385) ([rmoriz](https://github.com/rmoriz)) - Add Mac OS X 10.10 template. [\#384](https://github.com/chef/bento/pull/384) ([fnichol](https://github.com/fnichol)) @@ -1292,7 +1292,7 @@ Please ensure that Virtualbox is at least 5.1.6 and Vagrant at least 1.8.6 befor - \[ubuntu-12.04-\*\] Update URL paths to use 12.04.5. [\#359](https://github.com/chef/bento/pull/359) ([fnichol](https://github.com/fnichol)) - Remove VeeWee definitions from project [\#358](https://github.com/chef/bento/pull/358) ([fnichol](https://github.com/fnichol)) - Add packer/bin/bento for building templates. [\#357](https://github.com/chef/bento/pull/357) ([fnichol](https://github.com/fnichol)) -- update README to point to Boxcutter intead of basebox [\#354](https://github.com/chef/bento/pull/354) ([OBrienCommaJosh](https://github.com/OBrienCommaJosh)) +- update README to point to Boxcutter instead of basebox [\#354](https://github.com/chef/bento/pull/354) ([OBrienCommaJosh](https://github.com/OBrienCommaJosh)) - Add MAINTAINERS.md file. [\#347](https://github.com/chef/bento/pull/347) ([fnichol](https://github.com/fnichol)) - Add RHEL 7.1 JSON file. [\#342](https://github.com/chef/bento/pull/342) ([lopaka](https://github.com/lopaka)) - Solaris 10u11 - zfs base box [\#341](https://github.com/chef/bento/pull/341) ([scotthain](https://github.com/scotthain)) diff --git a/README.md b/README.md index e0b1301bb..51c172100 100644 --- a/README.md +++ b/README.md @@ -66,8 +66,8 @@ Other available options: - --mem - Specify the memory - --config - Use a configuration file other than default builds.yml - --on-error - Choose what to do if a build fails -- --vars - Comma seperated list of variable names equal values (ex: boot_wait="2s",ssh_timeout="5s") -- --var_files - Comma seperated list of pkrvar.hcl files to include in the builds (ex: /path/to/var_file.pkrvars.hcl,/path/to/next/var_file2.pkrvars.hcl) +- --vars - Comma separated list of variable names equal values (ex: boot_wait="2s",ssh_timeout="5s") +- --var_files - Comma separated list of pkrvar.hcl files to include in the builds (ex: /path/to/var_file.pkrvars.hcl,/path/to/next/var_file2.pkrvars.hcl) - --metadata-only - Only generate the metadata json file - --mirror - The template will have a default mirror link, if you wish to use an alternative one, you can utilise this configuration - --dry-run - This will not create any build, but will create a metadata file for reference @@ -168,7 +168,7 @@ Most of the providers expect unrestricted access to networking in order to build ```powershell $VS = "Standardswitch" $IF_ALIAS = (Get-NetAdapter -Name "vEthernet ($VS)").ifAlias -New-NetFirewallRule -Displayname "Allow incomming from $VS" -Direction Inbound -InterfaceAlias $IF_ALIAS -Action Allow +New-NetFirewallRule -Displayname "Allow incoming from $VS" -Direction Inbound -InterfaceAlias $IF_ALIAS -Action Allow ``` #### Hyper-V Generation 2 VM's diff --git a/lib/bento/cli.rb b/lib/bento/cli.rb index 9bac87426..21a2cd9ca 100644 --- a/lib/bento/cli.rb +++ b/lib/bento/cli.rb @@ -89,11 +89,11 @@ def self.parse(args) options.on_error = opt end - opts.on('--vars VARS', 'Comma seperated list of variable names equal values (ex: boot_wait="2s",ssh_timeout="5s")') do |opt| + opts.on('--vars VARS', 'Comma separated list of variable names equal values (ex: boot_wait="2s",ssh_timeout="5s")') do |opt| options.vars = opt end - opts.on('--var_files VAR_FILES', 'Comma seperated list of pkrvar.hcl files to include in the builds (ex: /path/to/var_file.pkrvars.hcl,/path/to/next/var_file2.pkrvars.hcl)') do |opt| + opts.on('--var_files VAR_FILES', 'Comma separated list of pkrvar.hcl files to include in the builds (ex: /path/to/var_file.pkrvars.hcl,/path/to/next/var_file2.pkrvars.hcl)') do |opt| options.var_files = opt end @@ -165,7 +165,7 @@ def self.parse(args) options.no_shared = opt end - opts.on('-p', '--provisioner PROVISIONER', 'Use a specfic provisioner') do |opt| + opts.on('-p', '--provisioner PROVISIONER', 'Use a specific provisioner') do |opt| options.provisioner = opt end end, diff --git a/packer_templates/http/debian/preseed.cfg b/packer_templates/http/debian/preseed.cfg index 98f5d19dd..d7d2f8577 100644 --- a/packer_templates/http/debian/preseed.cfg +++ b/packer_templates/http/debian/preseed.cfg @@ -85,7 +85,7 @@ apt-mirror-setup apt-setup/use_mirror boolean true d-i pkgsel/update-policy select none d-i pkgsel/upgrade select full-upgrade -# Disable polularity contest +# Disable popularity contest popularity-contest popularity-contest/participate boolean false # Select base install diff --git a/packer_templates/scripts/suse/vagrant_group_suse.sh b/packer_templates/scripts/suse/vagrant_group_suse.sh index ad82963f8..701839cd5 100644 --- a/packer_templates/scripts/suse/vagrant_group_suse.sh +++ b/packer_templates/scripts/suse/vagrant_group_suse.sh @@ -1,6 +1,6 @@ #!/bin/sh -eux -# User 'vagrant' belogs to the 'users' group by default so we need to +# User 'vagrant' belongs to the 'users' group by default so we need to # create a new group 'vagrant' and put our user there. groupadd -f vagrant diff --git a/packer_templates/scripts/windows/cleanup.ps1 b/packer_templates/scripts/windows/cleanup.ps1 index a86ec12bc..0ac58b81b 100644 --- a/packer_templates/scripts/windows/cleanup.ps1 +++ b/packer_templates/scripts/windows/cleanup.ps1 @@ -13,7 +13,7 @@ trap { Exit 1 } -Write-Host 'Run Cleanmgr only if on workstation. Server edition doesnt have cleanmgr.' +Write-Host 'Run Cleanmgr only if on workstation. Server edition doesn''t have cleanmgr.' $osInfo = Get-CimInstance -ClassName Win32_OperatingSystem if ($osInfo.ProductType -eq 1) { # cleanmgr isn't on servers # registry key locations pulled from https://github.com/spjeff/spadmin/blob/master/Cleanmgr.ps1 @@ -29,7 +29,7 @@ if ($osInfo.ProductType -eq 1) { # cleanmgr isn't on servers Write-Host 'Starting CleanMgr.exe...' Start-Process -FilePath CleanMgr.exe -ArgumentList '/sagerun:1' -Wait # -WindowStyle Hidden - Write-Host 'Waiting for CleanMgr and DismHost processes. Second wait neccesary as CleanMgr.exe spins off separate processes.' + Write-Host 'Waiting for CleanMgr and DismHost processes. Second wait necessary as CleanMgr.exe spins off separate processes.' Get-Process -Name cleanmgr,dismhost -ErrorAction SilentlyContinue | Wait-Process } diff --git a/packer_templates/scripts/windows/remove-apps.ps1 b/packer_templates/scripts/windows/remove-apps.ps1 index ed7ec0f26..b784d01ed 100644 --- a/packer_templates/scripts/windows/remove-apps.ps1 +++ b/packer_templates/scripts/windows/remove-apps.ps1 @@ -49,7 +49,7 @@ if (($PSVersionTable.PSEdition -ne 'Desktop') -and ($build -lt 22000)) { } # remove all the provisioned appx packages. -# NB some packages fail to be removed and thats OK. +# NB some packages fail to be removed and that's OK. Get-AppXProvisionedPackage -Online | ForEach-Object { Write-Host "Removing the $($_.PackageName) provisioned appx package..." try { @@ -60,7 +60,7 @@ Get-AppXProvisionedPackage -Online | ForEach-Object { } # remove appx packages. -# NB some packages fail to be removed and thats OK. +# NB some packages fail to be removed and that's OK. # see https://docs.microsoft.com/en-us/windows/application-management/apps-in-windows-10 @( 'Clipchamp.Clipchamp' diff --git a/packer_templates/scripts/windows/remove-one-drive-and-teams.ps1 b/packer_templates/scripts/windows/remove-one-drive-and-teams.ps1 index f3724d959..300fdb78c 100644 --- a/packer_templates/scripts/windows/remove-one-drive-and-teams.ps1 +++ b/packer_templates/scripts/windows/remove-one-drive-and-teams.ps1 @@ -36,7 +36,7 @@ function Takeown-Registry($key) { } } - # get administraor group + # get administrator group $admins = New-Object System.Security.Principal.SecurityIdentifier("S-1-5-32-544") $admins = $admins.Translate([System.Security.Principal.NTAccount]) @@ -57,7 +57,7 @@ function Takeown-File($path) { takeown.exe /A /F $path $acl = Get-Acl $path - # get administraor group + # get administrator group $admins = New-Object System.Security.Principal.SecurityIdentifier("S-1-5-32-544") $admins = $admins.Translate([System.Security.Principal.NTAccount]) @@ -178,7 +178,7 @@ Write-Host "Stopping Teams Process" -ForegroundColor Yellow try{ Get-Process -ProcessName Teams | Stop-Process -Force Start-Sleep -Seconds 3 - Write-Host "Teams Process Sucessfully Stopped" -ForegroundColor Green + Write-Host "Teams Process Successfully Stopped" -ForegroundColor Green }catch{ Write-Host $_ } @@ -202,7 +202,7 @@ Write-Host "Stopping IE Process" -ForegroundColor Yellow try{ Get-Process -ProcessName MicrosoftEdge | Stop-Process -Force Get-Process -ProcessName IExplore | Stop-Process -Force - Write-Host "Internet Explorer and Edge Processes Sucessfully Stopped" -ForegroundColor Green + Write-Host "Internet Explorer and Edge Processes Successfully Stopped" -ForegroundColor Green }catch{ Write-Host $_ } From 27d6289c1f4fe69550a337f3633fd7b4633ce63f Mon Sep 17 00:00:00 2001 From: Takashi Matsumoto <77025706+t-mtsmt@users.noreply.github.com> Date: Sat, 30 May 2026 05:40:06 +0900 Subject: [PATCH 1616/1622] Fix vmware-iso validation by explicitly setting tools_mode (#1673) * Fix vmware-iso validation by explicitly setting tools_mode Signed-off-by: Takashi Matsumoto <tmtsmt.sec@gmail.com> * Improve VMware tools configuration for better performance - Change tools_mode default from 'upload' to 'attach' for better performance - Implement proper mutual exclusivity per VMware plugin documentation: - tools_source_path: Can be used with both 'attach' and 'upload' modes - tools_upload_flavor: Only used when tools_mode is 'upload' AND tools_source_path is null - These two options cannot be used together per plugin requirements - Make tools_upload_path conditional (only set when tools_mode is 'upload') - Allow user overrides of all settings via variables This improves on the original PR by defaulting to the faster 'attach' mode instead of 'upload' mode, while properly implementing the mutual exclusivity requirements from the Packer VMware plugin documentation. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Signed-off-by: Corey Hemminger <hemminger@hotmail.com> * clean up tools code * update vmware tools install scripts Signed-off-by: Corey Hemminger <hemminger@hotmail.com> --------- Signed-off-by: Takashi Matsumoto <tmtsmt.sec@gmail.com> Signed-off-by: Corey Hemminger <hemminger@hotmail.com> Co-authored-by: Corey Hemminger <hemminger@hotmail.com> Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> --- packer_templates/pkr-plugins.pkr.hcl | 2 +- packer_templates/pkr-sources.pkr.hcl | 50 ++++++--------- packer_templates/pkr-variables.pkr.hcl | 20 ++++-- .../scripts/_common/guest_tools_vmware.sh | 61 ++++++++++++++----- .../scripts/windows/provision.ps1 | 43 ++++++++++--- 5 files changed, 114 insertions(+), 62 deletions(-) diff --git a/packer_templates/pkr-plugins.pkr.hcl b/packer_templates/pkr-plugins.pkr.hcl index 52e9e9900..fb83d985d 100644 --- a/packer_templates/pkr-plugins.pkr.hcl +++ b/packer_templates/pkr-plugins.pkr.hcl @@ -30,7 +30,7 @@ packer { source = "github.com/hashicorp/virtualbox" } vmware = { - version = ">= 1.1.0" + version = ">= 2.1.3" source = "github.com/hashicorp/vmware" } windows-update = { diff --git a/packer_templates/pkr-sources.pkr.hcl b/packer_templates/pkr-sources.pkr.hcl index b65ad5993..b92dfe7b2 100644 --- a/packer_templates/pkr-sources.pkr.hcl +++ b/packer_templates/pkr-sources.pkr.hcl @@ -204,39 +204,23 @@ locals { vmware_network_adapter_type = var.vmware_network_adapter_type == null ? ( var.is_windows && var.os_arch == "aarch64" ? "vmxnet3" : "e1000e" ) : var.vmware_network_adapter_type - vmware_tools_upload_flavor = var.vmware_tools_upload_flavor == null ? ( - var.is_windows ? ( - var.os_arch == "x86_64" ? "windows" : null - ) : ( - var.os_name == "macos" ? "darwin" : null - ) - ) : var.vmware_tools_upload_flavor - vmware_tools_upload_path = var.vmware_tools_upload_path == null ? ( - var.is_windows ? "c:\\vmware-tools.iso" : "/tmp/vmware-tools.iso" - ) : var.vmware_tools_upload_path + vmware_tools_upload_flavor = var.vmware_tools_mode == "upload" && var.vmware_tools_source_path == null ? ( + var.vmware_tools_upload_flavor == null ? ( + var.is_windows ? "windows" : ( + var.os_name == "macos" ? "darwin" : "linux" + ) + ) : var.vmware_tools_upload_flavor + ) : null + vmware_tools_upload_path = var.vmware_tools_mode == "upload" ? ( + var.vmware_tools_upload_path == null ? ( + var.is_windows ? "c:\\vmware-tools.iso" : "/tmp/vmware-tools.iso" + ) : var.vmware_tools_upload_path + ) : null + vmware_tools_source_path = var.vmware_tools_mode == "disable" ? null : ( + var.vmware_tools_source_path == null ? null : var.vmware_tools_source_path + ) vmware_vmx_data = var.vmware_vmx_data == null ? ( - local.host_os == "darwin" ? ( - var.is_windows ? ( - var.os_arch == "aarch64" ? { - "sata1.present" = "TRUE" - "sata1:2.devicetype" = "cdrom-image" - "sata1:2.filename" = "/Applications/VMware Fusion.app/Contents/Library/isoimages/arm64/windows.iso" - "sata1:2.present" = "TRUE" - "svga.autodetect" = "TRUE" - "usb_xhci.present" = "TRUE" - } : { - "sata1.present" = "TRUE" - "sata1:2.devicetype" = "cdrom-image" - "sata1:2.filename" = "/Applications/VMware Fusion.app/Contents/Library/isoimages/x86_64/windows.iso" - "sata1:2.present" = "TRUE" - "svga.autodetect" = "TRUE" - "usb_xhci.present" = "TRUE" - } - ) : { - "svga.autodetect" = "TRUE" - "usb_xhci.present" = "TRUE" - } - ) : { + { "svga.autodetect" = "TRUE" "usb_xhci.present" = "TRUE" } @@ -553,6 +537,8 @@ source "vmware-iso" "vm" { guest_os_type = var.vmware_guest_os_type network = var.vmware_network network_adapter_type = local.vmware_network_adapter_type + tools_mode = var.vmware_tools_mode + tools_source_path = local.vmware_tools_source_path tools_upload_flavor = local.vmware_tools_upload_flavor tools_upload_path = local.vmware_tools_upload_path usb = var.vmware_usb diff --git a/packer_templates/pkr-variables.pkr.hcl b/packer_templates/pkr-variables.pkr.hcl index 0dd0488f4..635e3f077 100644 --- a/packer_templates/pkr-variables.pkr.hcl +++ b/packer_templates/pkr-variables.pkr.hcl @@ -467,13 +467,25 @@ variable "vmware_guest_os_type" { default = null description = "OS type for virtualization optimization" } +variable "vmware_tools_mode" { + type = string + default = "attach" + description = "How to handle VMware Tools. Options: 'attach' (default, best performance), 'upload', or 'disable'" +} +variable "vmware_tools_source_path" { + type = string + default = null + description = "Path to the VMware Tools ISO on the host. Can be used with 'attach' or 'upload' modes. When null and tools_mode is 'attach', auto-detects VMware installation path. Cannot be used with tools_upload_flavor" +} variable "vmware_tools_upload_flavor" { - type = string - default = null + type = string + default = null + description = "The flavor of VMware Tools to upload (darwin, linux, windows). Only used when tools_mode is 'upload' and tools_source_path is null. Cannot be used with tools_source_path" } variable "vmware_tools_upload_path" { - type = string - default = null + type = string + default = null + description = "The path where VMware Tools will be uploaded in the guest. Only used when tools_mode is 'upload'" } variable "vmware_version" { type = number diff --git a/packer_templates/scripts/_common/guest_tools_vmware.sh b/packer_templates/scripts/_common/guest_tools_vmware.sh index cd90c250f..4bfb5a92d 100644 --- a/packer_templates/scripts/_common/guest_tools_vmware.sh +++ b/packer_templates/scripts/_common/guest_tools_vmware.sh @@ -17,26 +17,57 @@ vmware-iso|vmware-vmx) echo 'fuse_load="YES"' >>/boot/loader.conf echo 'ifconfig_vmx0="dhcp"' >>/etc/rc.conf elif [ "$OS_NAME" = "Darwin" ]; then - # Globbing here: VMware Fusion >= 8.5.4 includes a second - # 'darwinPre15.iso' for any OS X guests pre-10.11 - TOOLS_PATH=$(find "/Users/vagrant/" -name '*darwin*.iso' -print) - if [ ! -e "$TOOLS_PATH" ]; then - echo "Couldn't locate uploaded tools iso at $TOOLS_PATH!" + INSTALLER_PKG="" + TMPMOUNT="" + TOOLS_ISO="" + + # First, check for already-mounted VMware Tools volume (attach mode). + # VMware attaches the tools ISO as a CD-ROM which macOS auto-mounts under /Volumes/. + for vol_dir in /Volumes/*/; do + candidate="${vol_dir}Install VMware Tools.app/Contents/Resources/VMware Tools.pkg" + if [ -e "$candidate" ]; then + INSTALLER_PKG="$candidate" + break + fi + done + + # If not found in mounted volumes, look for an uploaded ISO (upload mode). + # Check the default upload path (/tmp/vmware-tools.iso) first, then the legacy + # HOME_DIR location. VMware Fusion >= 8.5.4 may include 'darwinPre15.iso' for + # OS X guests pre-10.11, so glob for any *darwin*.iso as a fallback. + if [ -z "$INSTALLER_PKG" ]; then + if [ -f "/tmp/vmware-tools.iso" ]; then + TOOLS_ISO="/tmp/vmware-tools.iso" + else + TOOLS_ISO=$(find "$HOME_DIR" -name '*darwin*.iso' -print 2>/dev/null | head -1) + fi + + if [ -z "$TOOLS_ISO" ] || [ ! -e "$TOOLS_ISO" ]; then + echo "Couldn't locate VMware Tools ISO in mounted volumes or at known upload paths!" exit 1 + fi + + TMPMOUNT=$(/usr/bin/mktemp -d /tmp/vmware-tools.XXXX) + hdiutil attach "$TOOLS_ISO" -mountpoint "$TMPMOUNT" + INSTALLER_PKG="$TMPMOUNT/Install VMware Tools.app/Contents/Resources/VMware Tools.pkg" fi - TMPMOUNT=$(/usr/bin/mktemp -d /tmp/vmware-tools.XXXX) - hdiutil attach "$TOOLS_PATH" -mountpoint "$TMPMOUNT" - INSTALLER_PKG="$TMPMOUNT/Install VMware Tools.app/Contents/Resources/VMware Tools.pkg" + if [ ! -e "$INSTALLER_PKG" ]; then - echo "Couldn't locate VMware installer pkg at $INSTALLER_PKG!" - exit 1 + echo "Couldn't locate VMware installer pkg at $INSTALLER_PKG!" + exit 1 fi + echo "Installing VMware tools.." - installer -pkg "$TMPMOUNT/Install VMware Tools.app/Contents/Resources/VMware Tools.pkg" -target / - # This usually fails - hdiutil detach "$TMPMOUNT" || echo "exit code $? is suppressed"; - rm -rf "$TMPMOUNT" - rm -f "$TOOLS_PATH" + installer -pkg "$INSTALLER_PKG" -target / + + # Clean up only if we mounted the ISO ourselves (upload mode). + if [ -n "$TMPMOUNT" ]; then + # This detach usually fails on macOS guests; suppress the error + hdiutil detach "$TMPMOUNT" || echo "exit code $? is suppressed" + rm -rf "$TMPMOUNT" + rm -f "$TOOLS_ISO" + fi + # Point Linux shared folder root to that used by OS X guests, # useful for the Hashicorp vmware_fusion Vagrant provider plugin mkdir /mnt diff --git a/packer_templates/scripts/windows/provision.ps1 b/packer_templates/scripts/windows/provision.ps1 index bf4d8153e..d117a3065 100644 --- a/packer_templates/scripts/windows/provision.ps1 +++ b/packer_templates/scripts/windows/provision.ps1 @@ -125,13 +125,33 @@ switch ($env:PACKER_BUILDER_TYPE) { {$_ -in "vmware-iso", "vmware-vmx"} { # Actions for VMware ISO builder $installed = $false - # Check if vmware-tools.iso exists and mount it - $iso_exists = Test-Path -LiteralPath "C:\vmware-tools.iso" - if ( $iso_exists ) { - Write-Host "Found C:\vmware-tools.iso, mounting it..." - Mount-DiskImage -ImagePath C:\vmware-tools.iso -PassThru | Get-Volume - } + $iso_mounted = $false + + # First, scan for the VMware Tools volume on an attached CD-ROM (attach mode, the default). + # Searching by label handles multiple CD-ROMs (e.g. an autounattend disc) without ambiguity. $volList = Get-Volume | Where-Object {$_.FileSystemLabel -eq 'VMware Tools' -and $_.DriveLetter} + + # If the volume wasn't found via label, fall back to mounting an uploaded ISO (upload mode). + # Check paths in priority order: + # 1. C:\vmware-tools.iso — our template's explicit default (tools_upload_path) + # 2. C:\windows.iso — Packer plugin default when tools_upload_flavor="windows" + # and tools_upload_path is not set (resolves to {{.Flavor}}.iso) + if (-not $volList) { + $iso_path = $null + if (Test-Path -LiteralPath "C:\vmware-tools.iso") { + $iso_path = "C:\vmware-tools.iso" + } elseif (Test-Path -LiteralPath "C:\windows.iso") { + $iso_path = "C:\windows.iso" + } + if ($iso_path) { + Write-Host "VMware Tools not on an attached CD-ROM; mounting uploaded ISO at $iso_path..." + Mount-DiskImage -ImagePath $iso_path -PassThru | Get-Volume + $iso_mounted = $true + # Refresh list after mounting + $volList = Get-Volume | Where-Object {$_.FileSystemLabel -eq 'VMware Tools' -and $_.DriveLetter} + } + } + foreach( $vol in $volList ) { $letter = $vol.DriveLetter $exe = "${letter}:\setup.exe" @@ -150,14 +170,17 @@ switch ($env:PACKER_BUILDER_TYPE) { Write-Host "Guest Tools NOT FOUND at $exe" } } - if ( $iso_exists ) { - Dismount-DiskImage -ImagePath C:\vmware-tools.iso - Remove-Item C:\vmware-tools.iso + + # Only dismount and remove if we mounted the ISO ourselves (upload mode) + if ($iso_mounted) { + Dismount-DiskImage -ImagePath $iso_path + Remove-Item $iso_path } + if ( $installed ) { Write-Host "Done installing the guest tools." } else { - throw "Guest Tools not found. Skipping installation." + throw "Guest Tools not found." } break } From bbde531f138357aec864b01c17901595d9c51882 Mon Sep 17 00:00:00 2001 From: nandanhegde73 <220186393+nandanhegde73@users.noreply.github.com> Date: Sat, 30 May 2026 02:18:41 +0530 Subject: [PATCH 1617/1622] Rename NOTICE.md -> COPYRIGHT.md (#1637) Signed-off-by: Nandan Hegde <220186393+nandanhegde73@users.noreply.github.com> --- NOTICE.md => COPYRIGHT.md | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename NOTICE.md => COPYRIGHT.md (100%) diff --git a/NOTICE.md b/COPYRIGHT.md similarity index 100% rename from NOTICE.md rename to COPYRIGHT.md From c28988035e58a1e0070dd560d1c8ddaac43d7c31 Mon Sep 17 00:00:00 2001 From: Clinton Wolfe <156460+clintoncwolfe@users.noreply.github.com> Date: Fri, 29 May 2026 16:52:04 -0400 Subject: [PATCH 1618/1622] CHEF-27635 Update and standardize copyright notices to Progress Software Corporation - copyright_update (#1669) * [copyright-automator] Empty commit - placeholder to open PR for manual edits later Signed-off-by: Progress Copyright Bot <copyright@progress.com> * Manual copyright update Signed-off-by: Nandan Hegde <220186393+nandanhegde73@users.noreply.github.com> --------- Signed-off-by: Progress Copyright Bot <copyright@progress.com> Signed-off-by: Nandan Hegde <220186393+nandanhegde73@users.noreply.github.com> Co-authored-by: Progress Copyright Bot <copyright@progress.com> Co-authored-by: Nandan Hegde <220186393+nandanhegde73@users.noreply.github.com> Co-authored-by: Corey Hemminger <hemminger@hotmail.com> --- README.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 51c172100..aac86b8b5 100644 --- a/README.md +++ b/README.md @@ -208,7 +208,6 @@ These basebox templates were converted from [veewee](https://github.com/jedi4eve - Author: Corey Hemminger ([corey.hemminger@progress.com](mailto:corey.hemminger@progress.com)) ```text -Copyright 2012-2025, Progress Software, Inc. (<legal@chef.io>) Copyright 2011-2012, Tim Dysinger (<tim@dysinger.net>) Licensed under the Apache License, Version 2.0 (the "License"); @@ -223,3 +222,6 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ``` + +# Copyright +See [COPYRIGHT.md](./COPYRIGHT.md). From 0cf8167e6d9bfcb3069b95e4e6b295f7b84e6943 Mon Sep 17 00:00:00 2001 From: Corey Hemminger <hemminger@hotmail.com> Date: Thu, 4 Jun 2026 18:39:48 -0500 Subject: [PATCH 1619/1622] updated platform versions (#1679) - Updating platform versions - Fixes for packer plugin updates - Added test-kitchen as dep - Refactored bento test command to use test-kitchen directly vs shelling out --------- Signed-off-by: Corey Hemminger <hemminger@hotmail.com> Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> --- .github/workflows/ci-build.yml | 127 +++-- .github/workflows/ci-lint.yml | 17 +- .github/workflows/packer-iso-url-checker.yml | 42 ++ .github/workflows/packer-lint.yml | 53 +++ .../workflows/pkr-bld-amazonlinux-arm64.yml | 21 +- .github/workflows/pkr-bld-amazonlinux-x64.yml | 10 + .github/workflows/pkr-bld-hyperv-x64.yml | 42 +- .github/workflows/pkr-bld-parallels-arm64.yml | 48 +- .github/workflows/pkr-bld-parallels-x64.yml | 51 +- .github/workflows/pkr-bld-qemu-arm64.yml | 38 +- .github/workflows/pkr-bld-qemu-x64.yml | 41 +- .github/workflows/pkr-bld-utm-arm64.yml | 47 +- .github/workflows/pkr-bld-utm-x64.yml | 50 +- .../workflows/pkr-bld-virtualbox-arm64.yml | 48 +- .github/workflows/pkr-bld-virtualbox-x64.yml | 41 +- .github/workflows/pkr-bld-vmware-arm64.yml | 56 +-- .github/workflows/pkr-bld-vmware-x64.yml | 59 +-- .github/workflows/test-pkr-bld-parallels.yml | 155 ------ .markdownlint-cli2.yaml | 6 + .mdlrc | 1 - .rspec | 3 + AGENTS.md | 280 +++++++++++ CHANGELOG.md | 43 +- Gemfile | 3 + README.md | 3 +- Rakefile | 9 +- bento.gemspec | 8 +- builds.yml | 9 +- lib/bento/buildmetadata.rb | 36 +- lib/bento/cli.rb | 6 +- lib/bento/common.rb | 2 +- lib/bento/packerexec.rb | 12 +- lib/bento/providermetadata.rb | 2 +- lib/bento/runner.rb | 4 +- lib/bento/test.rb | 176 +++++-- lib/bento/test_templates/kitchen.yml.erb | 6 +- lib/bento/upload.rb | 28 +- lib/bento/version.rb | 2 +- .../almalinux-10-aarch64.pkrvars.hcl | 4 +- .../almalinux/almalinux-10-x86_64.pkrvars.hcl | 4 +- .../almalinux/almalinux-8-aarch64.pkrvars.hcl | 10 - .../almalinux/almalinux-9-aarch64.pkrvars.hcl | 4 +- .../almalinux/almalinux-9-x86_64.pkrvars.hcl | 4 +- .../debian/debian-12-aarch64.pkrvars.hcl | 4 +- .../debian/debian-12-x86_64.pkrvars.hcl | 4 +- ...vars.hcl => fedora-44-aarch64.pkrvars.hcl} | 8 +- ...rvars.hcl => fedora-44-x86_64.pkrvars.hcl} | 8 +- .../freebsd/freebsd-13-aarch64.pkrvars.hcl | 12 - .../freebsd/freebsd-13-x86_64.pkrvars.hcl | 11 - .../opensuse-leap-15-aarch64.pkrvars.hcl | 10 - .../opensuse-leap-15-x86_64.pkrvars.hcl | 10 - os_pkrvars/rhel/rhel-8-aarch64.pkrvars.hcl | 10 - .../rockylinux-10-aarch64.pkrvars.hcl | 4 +- .../rockylinux-10-x86_64.pkrvars.hcl | 4 +- .../rockylinux-8-aarch64.pkrvars.hcl | 10 - .../rockylinux-9-aarch64.pkrvars.hcl | 4 +- .../rockylinux-9-x86_64.pkrvars.hcl | 4 +- .../ubuntu/ubuntu-24.04-aarch64.pkrvars.hcl | 2 +- .../ubuntu/ubuntu-24.04-x86_64.pkrvars.hcl | 2 +- .../ubuntu/ubuntu-25.04-aarch64.pkrvars.hcl | 10 - .../ubuntu/ubuntu-25.04-x86_64.pkrvars.hcl | 10 - .../ubuntu/ubuntu-25.10-aarch64.pkrvars.hcl | 10 - .../ubuntu/ubuntu-25.10-x86_64.pkrvars.hcl | 10 - .../ubuntu/ubuntu-26.04-aarch64.pkrvars.hcl | 2 +- .../ubuntu/ubuntu-26.04-x86_64.pkrvars.hcl | 2 +- packer_templates/pkr-builder.pkr.hcl | 25 +- packer_templates/pkr-sources.pkr.hcl | 448 ++++++++++-------- packer_templates/pkr-variables.pkr.hcl | 12 +- .../scripts/windows/remove-apps.ps1 | 1 + spec/bento/buildmetadata_spec.rb | 122 +++++ spec/bento/common_spec.rb | 95 ++++ spec/bento/packerexec_spec.rb | 92 ++++ spec/bento/providermetadata_spec.rb | 99 ++++ spec/bento/runner_spec.rb | 112 +++++ spec/bento/test_spec.rb | 300 ++++++++++++ spec/bento/upload_spec.rb | 151 ++++++ spec/spec_helper.rb | 53 +++ 77 files changed, 2199 insertions(+), 1073 deletions(-) create mode 100644 .github/workflows/packer-iso-url-checker.yml create mode 100644 .github/workflows/packer-lint.yml delete mode 100644 .github/workflows/test-pkr-bld-parallels.yml create mode 100644 .markdownlint-cli2.yaml delete mode 100644 .mdlrc create mode 100644 .rspec create mode 100644 AGENTS.md delete mode 100644 os_pkrvars/almalinux/almalinux-8-aarch64.pkrvars.hcl rename os_pkrvars/fedora/{fedora-42-aarch64.pkrvars.hcl => fedora-44-aarch64.pkrvars.hcl} (66%) rename os_pkrvars/fedora/{fedora-42-x86_64.pkrvars.hcl => fedora-44-x86_64.pkrvars.hcl} (69%) delete mode 100644 os_pkrvars/freebsd/freebsd-13-aarch64.pkrvars.hcl delete mode 100644 os_pkrvars/freebsd/freebsd-13-x86_64.pkrvars.hcl delete mode 100644 os_pkrvars/opensuse/opensuse-leap-15-aarch64.pkrvars.hcl delete mode 100644 os_pkrvars/opensuse/opensuse-leap-15-x86_64.pkrvars.hcl delete mode 100644 os_pkrvars/rhel/rhel-8-aarch64.pkrvars.hcl delete mode 100644 os_pkrvars/rockylinux/rockylinux-8-aarch64.pkrvars.hcl delete mode 100644 os_pkrvars/ubuntu/ubuntu-25.04-aarch64.pkrvars.hcl delete mode 100644 os_pkrvars/ubuntu/ubuntu-25.04-x86_64.pkrvars.hcl delete mode 100644 os_pkrvars/ubuntu/ubuntu-25.10-aarch64.pkrvars.hcl delete mode 100644 os_pkrvars/ubuntu/ubuntu-25.10-x86_64.pkrvars.hcl create mode 100644 spec/bento/buildmetadata_spec.rb create mode 100644 spec/bento/common_spec.rb create mode 100644 spec/bento/packerexec_spec.rb create mode 100644 spec/bento/providermetadata_spec.rb create mode 100644 spec/bento/runner_spec.rb create mode 100644 spec/bento/test_spec.rb create mode 100644 spec/bento/upload_spec.rb create mode 100644 spec/spec_helper.rb diff --git a/.github/workflows/ci-build.yml b/.github/workflows/ci-build.yml index f269fec82..74d5e75bb 100644 --- a/.github/workflows/ci-build.yml +++ b/.github/workflows/ci-build.yml @@ -10,98 +10,125 @@ concurrency: cancel-in-progress: true jobs: -# markdown-lint: -# uses: chef/github-workflows/.github/workflows/markdown-lint.yml@main -# -# markdown-link-checker: -# uses: chef/github-workflows/.github/workflows/markdown-link-checker.yml@main - - yaml-lint: - uses: chef/github-workflows/.github/workflows/yaml-lint.yml@main - - json-lint: - uses: chef/github-workflows/.github/workflows/json-lint.yml@main - - xml-lint: - uses: chef/github-workflows/.github/workflows/xml-lint.yml@main - - shellcheck-lint: - uses: chef/github-workflows/.github/workflows/shellcheck-lint.yml@main + generate-matrix: + runs-on: ubuntu-latest + outputs: + x64_oses: ${{ steps.set-matrix.outputs.x64_oses }} + arm64_oses: ${{ steps.set-matrix.outputs.arm64_oses }} + steps: + - name: Checkout + uses: actions/checkout@main + - name: Set matrix + id: set-matrix + run: | + # arm64 exclusions: no aarch64 pkrvars exist for these OS versions + X64=$(ruby -r yaml -r json -e "puts YAML.load_file('builds.yml')['public'].reject { |o| o.start_with?('amazonlinux') }.to_json") + ARM64=$(ruby -r yaml -r json -e "excl=%w[almalinux-8 oraclelinux-8 rockylinux-8]; puts YAML.load_file('builds.yml')['public'].reject { |o| o.start_with?('amazonlinux') || excl.include?(o) }.to_json") + echo "x64_oses=${X64}" >> "$GITHUB_OUTPUT" + echo "arm64_oses=${ARM64}" >> "$GITHUB_OUTPUT" + ci-lint: + uses: ./.github/workflows/ci-lint.yml + secrets: inherit - powershell-lint: - uses: chef/github-workflows/.github/workflows/powershell-lint.yml@main + packer-lint: + uses: ./.github/workflows/packer-lint.yml + secrets: inherit packer-iso-check: - uses: chef/github-workflows/.github/workflows/packer-iso-url-checker.yml@main - with: - EXCLUDE_REGEX: 'amazonlinux-2.*|rhel.*|sles.*|solaris.*|macos-.*' + uses: ./.github/workflows/packer-iso-url-checker.yml -# packer-lint: -# uses: chef/github-workflows/.github/workflows/packer-lint.yml@main -# secrets: inherit + pkr-bld-amazonlinux-x64: + uses: ./.github/workflows/pkr-bld-amazonlinux-x64.yml + secrets: inherit pkr-bld-amazonlinux-arm64: uses: ./.github/workflows/pkr-bld-amazonlinux-arm64.yml secrets: inherit - pkr-bld-amazonlinux-x64: - uses: ./.github/workflows/pkr-bld-amazonlinux-x64.yml - secrets: inherit - pkr-bld-hyperv-x64: + needs: generate-matrix uses: ./.github/workflows/pkr-bld-hyperv-x64.yml secrets: inherit - - pkr-bld-parallels-arm64: - uses: ./.github/workflows/pkr-bld-parallels-arm64.yml - secrets: inherit + with: + os_matrix: ${{ needs.generate-matrix.outputs.x64_oses }} pkr-bld-parallels-x64: + needs: generate-matrix uses: ./.github/workflows/pkr-bld-parallels-x64.yml secrets: inherit + with: + os_matrix: ${{ needs.generate-matrix.outputs.x64_oses }} - pkr-bld-qemu-arm64: - uses: ./.github/workflows/pkr-bld-qemu-arm64.yml + pkr-bld-parallels-arm64: + needs: generate-matrix + uses: ./.github/workflows/pkr-bld-parallels-arm64.yml secrets: inherit + with: + os_matrix: ${{ needs.generate-matrix.outputs.arm64_oses }} pkr-bld-qemu-x64: + needs: generate-matrix uses: ./.github/workflows/pkr-bld-qemu-x64.yml secrets: inherit + with: + os_matrix: ${{ needs.generate-matrix.outputs.x64_oses }} - pkr-bld-utm-arm64: - uses: ./.github/workflows/pkr-bld-utm-arm64.yml + pkr-bld-qemu-arm64: + needs: generate-matrix + uses: ./.github/workflows/pkr-bld-qemu-arm64.yml secrets: inherit + with: + os_matrix: ${{ needs.generate-matrix.outputs.arm64_oses }} pkr-bld-utm-x64: + needs: generate-matrix uses: ./.github/workflows/pkr-bld-utm-x64.yml secrets: inherit + with: + os_matrix: ${{ needs.generate-matrix.outputs.x64_oses }} - pkr-bld-virtualbox-arm64: - uses: ./.github/workflows/pkr-bld-virtualbox-arm64.yml + pkr-bld-utm-arm64: + needs: generate-matrix + uses: ./.github/workflows/pkr-bld-utm-arm64.yml secrets: inherit + with: + os_matrix: ${{ needs.generate-matrix.outputs.arm64_oses }} pkr-bld-virtualbox-x64: + needs: generate-matrix uses: ./.github/workflows/pkr-bld-virtualbox-x64.yml secrets: inherit + with: + os_matrix: ${{ needs.generate-matrix.outputs.x64_oses }} - pkr-bld-vmware-arm64: - uses: ./.github/workflows/pkr-bld-vmware-arm64.yml + pkr-bld-virtualbox-arm64: + needs: generate-matrix + uses: ./.github/workflows/pkr-bld-virtualbox-arm64.yml secrets: inherit + with: + os_matrix: ${{ needs.generate-matrix.outputs.arm64_oses }} pkr-bld-vmware-x64: + needs: generate-matrix uses: ./.github/workflows/pkr-bld-vmware-x64.yml secrets: inherit + with: + os_matrix: ${{ needs.generate-matrix.outputs.x64_oses }} + + pkr-bld-vmware-arm64: + needs: generate-matrix + uses: ./.github/workflows/pkr-bld-vmware-arm64.yml + secrets: inherit + with: + os_matrix: ${{ needs.generate-matrix.outputs.arm64_oses }} check_jobs_pass: if: always() needs: -# - markdown-lint - - yaml-lint - - json-lint - - xml-lint - - powershell-lint - - shellcheck-lint -# - packer-lint + - ci-lint + - packer-lint + - packer-iso-check + runs-on: Ubuntu-latest steps: - name: Decide whether the needed jobs succeeded or failed @@ -110,7 +137,3 @@ jobs: allowed-failures: allowed-skips: ${{ toJSON(needs) }} jobs: ${{ toJSON(needs) }} - -# pkr-bld-parallels-test: -# uses: ./.github/workflows/test-pkr-bld-parallels.yml -# secrets: inherit diff --git a/.github/workflows/ci-lint.yml b/.github/workflows/ci-lint.yml index ebc84ac24..7ae2e31df 100644 --- a/.github/workflows/ci-lint.yml +++ b/.github/workflows/ci-lint.yml @@ -1,11 +1,14 @@ --- on: - schedule: - - cron: '0 0 * * 0' + workflow_call: permissions: contents: read +concurrency: + group: ci-lint-${{ github.ref }} + cancel-in-progress: true + jobs: markdown-lint: uses: chef/github-workflows/.github/workflows/markdown-lint.yml@main @@ -28,19 +31,11 @@ jobs: powershell-lint: uses: chef/github-workflows/.github/workflows/powershell-lint.yml@main - packer-iso-check: - uses: chef/github-workflows/.github/workflows/packer-iso-url-checker.yml@main - - packer-lint: - uses: chef/github-workflows/.github/workflows/packer-lint.yml@main - secrets: inherit - - # Codespell configuration is within .codespellrc codespell: name: Check for spelling errors runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v4 + uses: actions/checkout@main - name: Codespell uses: codespell-project/actions-codespell@v2 diff --git a/.github/workflows/packer-iso-url-checker.yml b/.github/workflows/packer-iso-url-checker.yml new file mode 100644 index 000000000..23af9e9ab --- /dev/null +++ b/.github/workflows/packer-iso-url-checker.yml @@ -0,0 +1,42 @@ +--- +on: + workflow_call: + schedule: + - cron: '0 0 1 * *' + +jobs: + enumerate_pkrvars: + runs-on: ubuntu-latest + steps: + - name: Checkout + uses: actions/checkout@main + - name: Enumerate iso + env: + EXCLUDE: 'rhel.*|sles.*|solaris.*' + shell: bash + run: | + mapfile -t < <(find os_pkrvars -name "*.pkrvars.hcl" | grep -Ev '(${{ env.EXCLUDE }})') + echo "matrix=$(jq -cRn '[inputs]' < <( (( ${#MAPFILE[@]} )) && printf '%s\n' "${MAPFILE[@]}"))" >> "$GITHUB_OUTPUT" + id: enumerate_pkrvars + outputs: + matrix: ${{ steps.enumerate_pkrvars.outputs.matrix }} + + iso-availability: + needs: enumerate_pkrvars + runs-on: ubuntu-latest + strategy: + fail-fast: false + matrix: + template: ${{ fromJson(needs.enumerate_pkrvars.outputs.matrix) }} + steps: + - name: Checkout Repository + uses: actions/checkout@main + - name: iso-availability + run: | + iso_url=$(grep -E '^\s*iso_url\s*=' '${{ matrix.template }}' | head -1 | sed 's/[^=]*=\s*"\(.*\)"/\1/') + if [ -z "$iso_url" ]; then + echo "No iso_url found in ${{ matrix.template }}, skipping" + exit 0 + fi + echo "Checking: $iso_url" + curl -fsSI "$iso_url" diff --git a/.github/workflows/packer-lint.yml b/.github/workflows/packer-lint.yml new file mode 100644 index 000000000..69e5eaf3b --- /dev/null +++ b/.github/workflows/packer-lint.yml @@ -0,0 +1,53 @@ +--- +on: + workflow_call: + +jobs: + packer-fmt: + runs-on: ubuntu-latest + steps: + - name: Checkout + uses: actions/checkout@main + - name: Setup Packer + uses: hashicorp/setup-packer@main + with: + version: latest + - name: Packer FMT + run: if packer fmt -check -recursive .; then exit 0; else echo "Some packer files need to be formatted, run 'packer fmt -recursive .' to fix"; exit 1; fi + + enumerate_pkrvars: + runs-on: ubuntu-latest + steps: + - name: Checkout + uses: actions/checkout@main + - name: Enumerate pkrvars validation + env: + EXCLUDE: 'windows.*' + shell: bash + run: | + mapfile -t < <(find os_pkrvars -name "*.pkrvars.hcl" | grep -Ev '(${{ env.EXCLUDE }})') + echo "matrix=$(jq -cRn '[inputs]' < <( (( ${#MAPFILE[@]} )) && printf '%s\n' "${MAPFILE[@]}"))" >> "$GITHUB_OUTPUT" + id: enumerate_pkrvars + outputs: + matrix: ${{ steps.enumerate_pkrvars.outputs.matrix }} + + packer-validate: + needs: enumerate_pkrvars + runs-on: ubuntu-latest + strategy: + fail-fast: false + matrix: + pkrvars: ${{ fromJson(needs.enumerate_pkrvars.outputs.matrix) }} + steps: + - name: Checkout Repository + uses: actions/checkout@main + - name: Setup Packer + uses: hashicorp/setup-packer@main + with: + version: latest + - name: Packer Init + env: + PACKER_GITHUB_API_TOKEN: "${{ secrets.GITHUB_TOKEN }}" + run: packer init -upgrade packer_templates + - name: Packer Validate + run: packer validate --evaluate-datasources -var-file="${{ matrix.pkrvars }}" packer_templates diff --git a/.github/workflows/pkr-bld-amazonlinux-arm64.yml b/.github/workflows/pkr-bld-amazonlinux-arm64.yml index a8753cb16..162003057 100644 --- a/.github/workflows/pkr-bld-amazonlinux-arm64.yml +++ b/.github/workflows/pkr-bld-amazonlinux-arm64.yml @@ -31,17 +31,6 @@ jobs: ./${{ matrix.os }}-aarch64-virtualbox-build.sh ls -alh builds/build_complete cat builds/build_complete/${{ matrix.os }}*-aarch64._metadata.json - - - name: Remove VM in case of canceled job - if: cancelled() - run: | - VM="$(VBoxManage list vms | grep ${{ matrix.os }} | cut -d " " -f 1)" - echo "VM Name: $VM" - echo Powering off and deleting any existing VMs named ${{ matrix.os }}*-aarch64 - VBoxManage controlvm $VM poweroff - sleep 1 - vboxmanage unregistervm $VM --delete - sleep 2 - name: Bento Test run: | eval "$(chef shell-init bash)" @@ -56,3 +45,13 @@ jobs: overwrite: true retention-days: 10 compression-level: 0 # no compression + - name: Remove VM in case of canceled job + if: cancelled() + run: | + VM="$(VBoxManage list vms | grep ${{ matrix.os }} | cut -d " " -f 1)" + echo "VM Name: $VM" + echo Powering off and deleting any existing VMs named ${{ matrix.os }}*-aarch64 + VBoxManage controlvm $VM poweroff + sleep 1 + vboxmanage unregistervm $VM --delete + sleep 2 diff --git a/.github/workflows/pkr-bld-amazonlinux-x64.yml b/.github/workflows/pkr-bld-amazonlinux-x64.yml index f169f5a80..c0e861ca1 100644 --- a/.github/workflows/pkr-bld-amazonlinux-x64.yml +++ b/.github/workflows/pkr-bld-amazonlinux-x64.yml @@ -66,3 +66,13 @@ jobs: overwrite: true retention-days: 10 compression-level: 0 # no compression + - name: Remove VM in case of canceled job + if: cancelled() + run: | + VM="$(VBoxManage list vms | grep ${{ matrix.os }} | cut -d " " -f 1)" + echo "VM Name: $VM" + echo Powering off and deleting any existing VMs named ${{ matrix.os }}*-aarch64 + VBoxManage controlvm $VM poweroff + sleep 1 + vboxmanage unregistervm $VM --delete + sleep 2 diff --git a/.github/workflows/pkr-bld-hyperv-x64.yml b/.github/workflows/pkr-bld-hyperv-x64.yml index 82c57b602..23579064e 100644 --- a/.github/workflows/pkr-bld-hyperv-x64.yml +++ b/.github/workflows/pkr-bld-hyperv-x64.yml @@ -1,6 +1,10 @@ --- on: workflow_call: + inputs: + os_matrix: + required: true + type: string permissions: contents: read @@ -15,32 +19,7 @@ jobs: strategy: fail-fast: false matrix: - os: - - almalinux-8 - - almalinux-9 - - almalinux-10 - - centos-stream-9 - - centos-stream-10 - - debian-12 - - debian-13 - - fedora-42 - - fedora-43 - - freebsd-13 - - freebsd-14 - - freebsd-15 - - opensuse-leap-15 - - opensuse-leap-16 - - oraclelinux-8 - - oraclelinux-9 - - oraclelinux-10 - - rockylinux-8 - - rockylinux-9 - - rockylinux-10 - - ubuntu-22.04 - - ubuntu-24.04 - - ubuntu-25.04 - - ubuntu-25.10 - - ubuntu-26.04 + os: ${{ fromJson(inputs.os_matrix) }} provider: - hyperv-iso steps: @@ -82,3 +61,14 @@ jobs: overwrite: true retention-days: 10 compression-level: 0 # no compression + - name: Remove VM in case of canceled job + if: cancelled() + shell: pwsh + run: | + $vm = Get-VM | Where-Object { $_.Name -like "*${{ matrix.os }}*" } | Select-Object -First 1 + if ($vm) { + Write-Host "Stopping and removing VM: $($vm.Name)" + Stop-VM -Name $vm.Name -Force -TurnOff -ErrorAction SilentlyContinue + Start-Sleep -Seconds 2 + Remove-VM -Name $vm.Name -Force -ErrorAction SilentlyContinue + } diff --git a/.github/workflows/pkr-bld-parallels-arm64.yml b/.github/workflows/pkr-bld-parallels-arm64.yml index c167bd369..48080c6c4 100644 --- a/.github/workflows/pkr-bld-parallels-arm64.yml +++ b/.github/workflows/pkr-bld-parallels-arm64.yml @@ -1,6 +1,10 @@ --- on: workflow_call: + inputs: + os_matrix: + required: true + type: string permissions: contents: read @@ -15,29 +19,7 @@ jobs: strategy: fail-fast: false matrix: - os: - - almalinux-9 - - almalinux-10 - - centos-stream-9 - - centos-stream-10 - - debian-12 - - debian-13 - - fedora-42 - - fedora-43 - - freebsd-13 - - freebsd-14 - - freebsd-15 - - opensuse-leap-15 - - opensuse-leap-16 - - oraclelinux-9 - - oraclelinux-10 - - rockylinux-9 - - rockylinux-10 - - ubuntu-22.04 - - ubuntu-24.04 - - ubuntu-25.04 - - ubuntu-25.10 - - ubuntu-26.04 + os: ${{ fromJson(inputs.os_matrix) }} provider: - parallels-iso steps: @@ -54,16 +36,6 @@ jobs: bento build -o ${{ matrix.provider }}.vm os_pkrvars/$(echo ${{ matrix.os }} | cut -d "-" -f 1)/"${{ matrix.os }}-aarch64.pkrvars.hcl" ls -alh builds/build_complete/ cat builds/build_complete/${{ matrix.os }}*-aarch64._metadata.json - - name: Remove VM in case of canceled job - if: cancelled() - run: | - VM="$(prlctl list -a | grep ${{ matrix.os }} | cut -d " " -f 1)" - echo "VM Name: $VM" - echo Powering off and deleting any existing VMs named ${{ matrix.os }}*-aarch64 - prlctl stop "$VM" --kill 2> /dev/null - sleep 1 - prlctl delete "$VM" 2> /dev/null - sleep 2 - name: Bento Test run: | eval "$(chef shell-init bash)" @@ -78,3 +50,13 @@ jobs: overwrite: true retention-days: 10 compression-level: 0 # no compression + - name: Remove VM in case of canceled job + if: cancelled() + run: | + VM="$(prlctl list -a | grep ${{ matrix.os }} | cut -d " " -f 1)" + echo "VM Name: $VM" + echo Powering off and deleting any existing VMs named ${{ matrix.os }}*-aarch64 + prlctl stop "$VM" --kill 2> /dev/null + sleep 1 + prlctl delete "$VM" 2> /dev/null + sleep 2 diff --git a/.github/workflows/pkr-bld-parallels-x64.yml b/.github/workflows/pkr-bld-parallels-x64.yml index 695b25839..bcff27c3f 100644 --- a/.github/workflows/pkr-bld-parallels-x64.yml +++ b/.github/workflows/pkr-bld-parallels-x64.yml @@ -1,6 +1,10 @@ --- on: workflow_call: + inputs: + os_matrix: + required: true + type: string permissions: contents: read @@ -15,32 +19,7 @@ jobs: strategy: fail-fast: false matrix: - os: - - almalinux-8 - - almalinux-9 - - almalinux-10 - - centos-stream-9 - - centos-stream-10 - - debian-12 - - debian-13 - - fedora-42 - - fedora-43 - - freebsd-13 - - freebsd-14 - - freebsd-15 - - opensuse-leap-15 - - opensuse-leap-16 - - oraclelinux-8 - - oraclelinux-9 - - oraclelinux-10 - - rockylinux-8 - - rockylinux-9 - - rockylinux-10 - - ubuntu-22.04 - - ubuntu-24.04 - - ubuntu-25.04 - - ubuntu-25.10 - - ubuntu-26.04 + os: ${{ fromJson(inputs.os_matrix) }} provider: - parallels-iso steps: @@ -56,16 +35,6 @@ jobs: bento build -o ${{ matrix.provider }}.vm os_pkrvars/$(echo ${{ matrix.os }} | cut -d "-" -f 1)/"${{ matrix.os }}-x86_64.pkrvars.hcl" ls -alh builds/build_complete/ cat builds/build_complete/${{ matrix.os }}*-x86_64._metadata.json - - name: Remove VM in case of canceled job - if: cancelled() - run: | - VM="$(prlctl list -a | grep ${{ matrix.os }} | cut -d " " -f 1)" - echo "VM Name: $VM" - echo Powering off and deleting any existing VMs named ${{ matrix.os }}*-amd64 - prlctl stop "$VM" --kill 2> /dev/null - sleep 1 - prlctl delete "$VM" 2> /dev/null - sleep 2 - name: Bento Test run: | eval "$(chef shell-init bash)" @@ -80,3 +49,13 @@ jobs: overwrite: true retention-days: 10 compression-level: 0 # no compression + - name: Remove VM in case of canceled job + if: cancelled() + run: | + VM="$(prlctl list -a | grep ${{ matrix.os }} | cut -d " " -f 1)" + echo "VM Name: $VM" + echo Powering off and deleting any existing VMs named ${{ matrix.os }}*-amd64 + prlctl stop "$VM" --kill 2> /dev/null + sleep 1 + prlctl delete "$VM" 2> /dev/null + sleep 2 diff --git a/.github/workflows/pkr-bld-qemu-arm64.yml b/.github/workflows/pkr-bld-qemu-arm64.yml index 36735a82e..b0a883c23 100644 --- a/.github/workflows/pkr-bld-qemu-arm64.yml +++ b/.github/workflows/pkr-bld-qemu-arm64.yml @@ -1,6 +1,10 @@ --- on: workflow_call: + inputs: + os_matrix: + required: true + type: string permissions: contents: read @@ -15,29 +19,7 @@ jobs: strategy: fail-fast: false matrix: - os: - - almalinux-9 - - almalinux-10 - - centos-stream-9 - - centos-stream-10 - - debian-12 - - debian-13 - - fedora-42 - - fedora-43 - - freebsd-13 - - freebsd-14 - - freebsd-15 - - opensuse-leap-15 - - opensuse-leap-16 - - oraclelinux-9 - - oraclelinux-10 - - rockylinux-9 - - rockylinux-10 - - ubuntu-22.04 - - ubuntu-24.04 - - ubuntu-25.04 - - ubuntu-25.10 - - ubuntu-26.04 + os: ${{ fromJson(inputs.os_matrix) }} provider: - qemu steps: @@ -80,7 +62,7 @@ jobs: - name: Bento Test run: | eval "$(chef shell-init bash)" - bento test libvirt + bento test qemu - name: Upload build artifact uses: actions/upload-artifact@v4 with: @@ -91,3 +73,11 @@ jobs: overwrite: true retention-days: 10 compression-level: 0 # no compression + - name: Remove VM in case of canceled job + if: cancelled() + run: | + VM="$(virsh list --all | grep '${{ matrix.os }}' | awk '{print $2}')" + echo "VM Name: $VM" + virsh destroy "$VM" 2>/dev/null || true + sleep 2 + virsh undefine "$VM" --remove-all-storage 2>/dev/null || true diff --git a/.github/workflows/pkr-bld-qemu-x64.yml b/.github/workflows/pkr-bld-qemu-x64.yml index 42cb8d5c8..c294e26a6 100644 --- a/.github/workflows/pkr-bld-qemu-x64.yml +++ b/.github/workflows/pkr-bld-qemu-x64.yml @@ -1,6 +1,10 @@ --- on: workflow_call: + inputs: + os_matrix: + required: true + type: string permissions: contents: read @@ -15,32 +19,7 @@ jobs: strategy: fail-fast: false matrix: - os: - - almalinux-8 - - almalinux-9 - - almalinux-10 - - centos-stream-9 - - centos-stream-10 - - debian-12 - - debian-13 - - fedora-42 - - fedora-43 - - freebsd-13 - - freebsd-14 - - freebsd-15 - - opensuse-leap-15 - - opensuse-leap-16 - - oraclelinux-8 - - oraclelinux-9 - - oraclelinux-10 - - rockylinux-8 - - rockylinux-9 - - rockylinux-10 - - ubuntu-22.04 - - ubuntu-24.04 - - ubuntu-25.04 - - ubuntu-25.10 - - ubuntu-26.04 + os: ${{ fromJson(inputs.os_matrix) }} provider: - qemu steps: @@ -88,7 +67,7 @@ jobs: - name: Bento Test run: | eval "$(chef shell-init bash)" - bento test libvirt + bento test qemu - name: Upload build artifact uses: actions/upload-artifact@v4 with: @@ -99,3 +78,11 @@ jobs: overwrite: true retention-days: 10 compression-level: 0 # no compression + - name: Remove VM in case of canceled job + if: cancelled() + run: | + VM="$(virsh list --all | grep '${{ matrix.os }}' | awk '{print $2}')" + echo "VM Name: $VM" + virsh destroy "$VM" 2>/dev/null || true + sleep 2 + virsh undefine "$VM" --remove-all-storage 2>/dev/null || true diff --git a/.github/workflows/pkr-bld-utm-arm64.yml b/.github/workflows/pkr-bld-utm-arm64.yml index 38267e17a..b04e9bb17 100644 --- a/.github/workflows/pkr-bld-utm-arm64.yml +++ b/.github/workflows/pkr-bld-utm-arm64.yml @@ -1,6 +1,10 @@ --- on: workflow_call: + inputs: + os_matrix: + required: true + type: string permissions: contents: read @@ -15,28 +19,7 @@ jobs: strategy: fail-fast: false matrix: - os: - - almalinux-9 - - almalinux-10 - - centos-stream-9 - - centos-stream-10 - - debian-12 - - debian-13 - - fedora-42 - - freebsd-13 - - freebsd-14 - - freebsd-15 - - opensuse-leap-15 - - opensuse-leap-16 - - oraclelinux-9 - - oraclelinux-10 - - rockylinux-9 - - rockylinux-10 - - ubuntu-22.04 - - ubuntu-24.04 - - ubuntu-25.04 - - ubuntu-25.10 - - ubuntu-26.04 + os: ${{ fromJson(inputs.os_matrix) }} provider: - utm-iso steps: @@ -67,16 +50,6 @@ jobs: bento build -o ${{ matrix.provider }}.vm os_pkrvars/$(echo ${{ matrix.os }} | cut -d "-" -f 1)/"${{ matrix.os }}-aarch64.pkrvars.hcl" ls -alh builds/build_complete/ cat builds/build_complete/${{ matrix.os }}*-aarch64._metadata.json - - name: Remove VM in case of canceled job - if: cancelled() - run: | - VM="$(utmctl list -a | grep ${{ matrix.os }} | cut -d " " -f 1)" - echo "VM Name: $VM" - echo Powering off and deleting any existing VMs named ${{ matrix.os }}*-aarch64 - utmctl stop "$VM" - sleep 1 - utmctl delete "$VM" - sleep 2 - name: Bento Test run: | eval "$(chef shell-init bash)" @@ -91,3 +64,13 @@ jobs: overwrite: true retention-days: 10 compression-level: 0 # no compression + - name: Remove VM in case of canceled job + if: cancelled() + run: | + VM="$(utmctl list -a | grep ${{ matrix.os }} | cut -d " " -f 1)" + echo "VM Name: $VM" + echo Powering off and deleting any existing VMs named ${{ matrix.os }}*-aarch64 + utmctl stop "$VM" + sleep 1 + utmctl delete "$VM" + sleep 2 diff --git a/.github/workflows/pkr-bld-utm-x64.yml b/.github/workflows/pkr-bld-utm-x64.yml index 5ba0043ef..8db4e5a10 100644 --- a/.github/workflows/pkr-bld-utm-x64.yml +++ b/.github/workflows/pkr-bld-utm-x64.yml @@ -1,6 +1,10 @@ --- on: workflow_call: + inputs: + os_matrix: + required: true + type: string permissions: contents: read @@ -15,31 +19,7 @@ jobs: strategy: fail-fast: false matrix: - os: - - almalinux-8 - - almalinux-9 - - almalinux-10 - - centos-stream-9 - - centos-stream-10 - - debian-12 - - debian-13 - - fedora-42 - - freebsd-13 - - freebsd-14 - - freebsd-15 - - opensuse-leap-15 - - opensuse-leap-16 - - oraclelinux-8 - - oraclelinux-9 - - oraclelinux-10 - - rockylinux-8 - - rockylinux-9 - - rockylinux-10 - - ubuntu-22.04 - - ubuntu-24.04 - - ubuntu-25.04 - - ubuntu-25.10 - - ubuntu-26.04 + os: ${{ fromJson(inputs.os_matrix) }} provider: - utm-iso steps: @@ -74,16 +54,6 @@ jobs: bento build -o ${{ matrix.provider }}.vm --vars 'ssh_timeout=60m' os_pkrvars/$(echo ${{ matrix.os }} | cut -d "-" -f 1)/"${{ matrix.os }}-x86_64.pkrvars.hcl" ls -alh builds/build_complete/ cat builds/build_complete/${{ matrix.os }}*-x86_64._metadata.json - - name: Remove VM in case of canceled job - if: cancelled() - run: | - VM="$(utmctl list -a | grep ${{ matrix.os }} | cut -d " " -f 1)" - echo "VM Name: $VM" - echo Powering off and deleting any existing VMs named ${{ matrix.os }}*-x86_64 - utmctl stop "$VM" - sleep 1 - utmctl delete "$VM" - sleep 2 - name: Bento Test run: | eval "$(chef shell-init bash)" @@ -98,3 +68,13 @@ jobs: overwrite: true retention-days: 10 compression-level: 0 # no compression + - name: Remove VM in case of canceled job + if: cancelled() + run: | + VM="$(utmctl list -a | grep ${{ matrix.os }} | cut -d " " -f 1)" + echo "VM Name: $VM" + echo Powering off and deleting any existing VMs named ${{ matrix.os }}*-aarch64 + utmctl stop "$VM" + sleep 1 + utmctl delete "$VM" + sleep 2 diff --git a/.github/workflows/pkr-bld-virtualbox-arm64.yml b/.github/workflows/pkr-bld-virtualbox-arm64.yml index 8132e2238..e9803bd74 100644 --- a/.github/workflows/pkr-bld-virtualbox-arm64.yml +++ b/.github/workflows/pkr-bld-virtualbox-arm64.yml @@ -1,6 +1,10 @@ --- on: workflow_call: + inputs: + os_matrix: + required: true + type: string permissions: contents: read @@ -15,29 +19,7 @@ jobs: strategy: fail-fast: false matrix: - os: - - almalinux-9 - - almalinux-10 - - centos-stream-9 - - centos-stream-10 - - debian-12 - - debian-13 - - fedora-42 - - fedora-43 - - freebsd-13 - - freebsd-14 - - freebsd-15 - - opensuse-leap-15 - - opensuse-leap-16 - - oraclelinux-9 - - oraclelinux-10 - - rockylinux-9 - - rockylinux-10 - - ubuntu-22.04 - - ubuntu-24.04 - - ubuntu-25.04 - - ubuntu-25.10 - - ubuntu-26.04 + os: ${{ fromJson(inputs.os_matrix) }} provider: - virtualbox-iso steps: @@ -54,16 +36,6 @@ jobs: bento build -o ${{ matrix.provider }}.vm os_pkrvars/$(echo ${{ matrix.os }} | cut -d "-" -f 1)/"${{ matrix.os }}-aarch64.pkrvars.hcl" ls -alh builds/build_complete/ cat builds/build_complete/${{ matrix.os }}*-aarch64._metadata.json - - name: Remove VM in case of canceled job - if: cancelled() - run: | - VM="$(VBoxManage list vms | grep ${{ matrix.os }} | cut -d " " -f 1)" - echo "VM Name: $VM" - echo Powering off and deleting any existing VMs named ${{ matrix.os }}*-aarch64 - VBoxManage controlvm $VM poweroff - sleep 1 - vboxmanage unregistervm $VM --delete - sleep 2 - name: Bento Test run: | eval "$(chef shell-init bash)" @@ -78,3 +50,13 @@ jobs: overwrite: true retention-days: 10 compression-level: 0 # no compression + - name: Remove VM in case of canceled job + if: cancelled() + run: | + VM="$(VBoxManage list vms | grep ${{ matrix.os }} | cut -d " " -f 1)" + echo "VM Name: $VM" + echo Powering off and deleting any existing VMs named ${{ matrix.os }}*-aarch64 + VBoxManage controlvm $VM poweroff + sleep 1 + vboxmanage unregistervm $VM --delete + sleep 2 diff --git a/.github/workflows/pkr-bld-virtualbox-x64.yml b/.github/workflows/pkr-bld-virtualbox-x64.yml index b09fcbc75..584833f3e 100644 --- a/.github/workflows/pkr-bld-virtualbox-x64.yml +++ b/.github/workflows/pkr-bld-virtualbox-x64.yml @@ -1,6 +1,10 @@ --- on: workflow_call: + inputs: + os_matrix: + required: true + type: string permissions: contents: read @@ -15,32 +19,7 @@ jobs: strategy: fail-fast: false matrix: - os: - - almalinux-8 - - almalinux-9 - - almalinux-10 - - centos-stream-9 - - centos-stream-10 - - debian-12 - - debian-13 - - fedora-42 - - fedora-43 - - freebsd-13 - - freebsd-14 - - freebsd-15 - - opensuse-leap-15 - - opensuse-leap-16 - - oraclelinux-8 - - oraclelinux-9 - - oraclelinux-10 - - rockylinux-8 - - rockylinux-9 - - rockylinux-10 - - ubuntu-22.04 - - ubuntu-24.04 - - ubuntu-25.04 - - ubuntu-25.10 - - ubuntu-26.04 + os: ${{ fromJson(inputs.os_matrix) }} provider: - virtualbox-iso steps: @@ -92,3 +71,13 @@ jobs: overwrite: true retention-days: 10 compression-level: 0 # no compression + - name: Remove VM in case of canceled job + if: cancelled() + run: | + VM="$(VBoxManage list vms | grep ${{ matrix.os }} | cut -d " " -f 1)" + echo "VM Name: $VM" + echo Powering off and deleting any existing VMs named ${{ matrix.os }}*-aarch64 + VBoxManage controlvm $VM poweroff + sleep 1 + vboxmanage unregistervm $VM --delete + sleep 2 diff --git a/.github/workflows/pkr-bld-vmware-arm64.yml b/.github/workflows/pkr-bld-vmware-arm64.yml index c89d18c5c..1a5e02528 100644 --- a/.github/workflows/pkr-bld-vmware-arm64.yml +++ b/.github/workflows/pkr-bld-vmware-arm64.yml @@ -1,6 +1,10 @@ --- on: workflow_call: + inputs: + os_matrix: + required: true + type: string permissions: contents: read @@ -15,29 +19,7 @@ jobs: strategy: fail-fast: false matrix: - os: - - almalinux-9 - - almalinux-10 - - centos-stream-9 - - centos-stream-10 - - debian-12 - - debian-13 - - fedora-42 - - fedora-43 - - freebsd-13 - - freebsd-14 - - freebsd-15 - - opensuse-leap-15 - - opensuse-leap-16 - - oraclelinux-9 - - oraclelinux-10 - - rockylinux-9 - - rockylinux-10 - - ubuntu-22.04 - - ubuntu-24.04 - - ubuntu-25.04 - - ubuntu-25.10 - - ubuntu-26.04 + os: ${{ fromJson(inputs.os_matrix) }} provider: - vmware-iso steps: @@ -54,6 +36,20 @@ jobs: bento build -o ${{ matrix.provider }}.vm os_pkrvars/$(echo ${{ matrix.os }} | cut -d "-" -f 1)/"${{ matrix.os }}-aarch64.pkrvars.hcl" ls -alh builds/build_complete/ cat builds/build_complete/${{ matrix.os }}*-aarch64._metadata.json + - name: Bento Test + run: | + eval "$(chef shell-init bash)" + bento test + - name: Upload build artifact + uses: actions/upload-artifact@v4 + with: + name: "${{ matrix.os }}-parallels-aarch64" + path: | + builds/testing_passed/aarch64/*.box + builds/testing_passed/aarch64/*.json + overwrite: true + retention-days: 10 + compression-level: 0 # no compression - name: Remove VM in case of canceled job if: cancelled() run: | @@ -80,17 +76,3 @@ jobs: echo "VM '$TARGET_VM_NAME' has been stopped and deleted." fi done - - name: Bento Test - run: | - eval "$(chef shell-init bash)" - bento test - - name: Upload build artifact - uses: actions/upload-artifact@v4 - with: - name: "${{ matrix.os }}-parallels-aarch64" - path: | - builds/testing_passed/aarch64/*.box - builds/testing_passed/aarch64/*.json - overwrite: true - retention-days: 10 - compression-level: 0 # no compression diff --git a/.github/workflows/pkr-bld-vmware-x64.yml b/.github/workflows/pkr-bld-vmware-x64.yml index 5d2341526..295859d56 100644 --- a/.github/workflows/pkr-bld-vmware-x64.yml +++ b/.github/workflows/pkr-bld-vmware-x64.yml @@ -1,6 +1,10 @@ --- on: workflow_call: + inputs: + os_matrix: + required: true + type: string permissions: contents: read @@ -15,32 +19,7 @@ jobs: strategy: fail-fast: false matrix: - os: - - almalinux-8 - - almalinux-9 - - almalinux-10 - - centos-stream-9 - - centos-stream-10 - - debian-12 - - debian-13 - - fedora-42 - - fedora-43 - - freebsd-13 - - freebsd-14 - - freebsd-15 - - opensuse-leap-15 - - opensuse-leap-16 - - oraclelinux-8 - - oraclelinux-9 - - oraclelinux-10 - - rockylinux-8 - - rockylinux-9 - - rockylinux-10 - - ubuntu-22.04 - - ubuntu-24.04 - - ubuntu-25.04 - - ubuntu-25.10 - - ubuntu-26.04 + os: ${{ fromJson(inputs.os_matrix) }} provider: - vmware-iso steps: @@ -57,6 +36,20 @@ jobs: bento build -o ${{ matrix.provider }}.vm os_pkrvars/$(echo ${{ matrix.os }} | cut -d "-" -f 1)/"${{ matrix.os }}-x86_64.pkrvars.hcl" ls -alh builds/build_complete/ cat builds/build_complete/${{ matrix.os }}*-x86_64._metadata.json + - name: Bento Test + run: | + eval "$(chef shell-init bash)" + bento test + - name: Upload build artifact + uses: actions/upload-artifact@v4 + with: + name: "${{ matrix.os }}-parallels-x86_64" + path: | + builds/testing_passed/x86_64/*.box + builds/testing_passed/x86_64/*.json + overwrite: true + retention-days: 10 + compression-level: 0 # no compression - name: Remove VM in case of canceled job if: cancelled() run: | @@ -83,17 +76,3 @@ jobs: echo "VM '$TARGET_VM_NAME' has been stopped and deleted." fi done - - name: Bento Test - run: | - eval "$(chef shell-init bash)" - bento test - - name: Upload build artifact - uses: actions/upload-artifact@v4 - with: - name: "${{ matrix.os }}-parallels-x86_64" - path: | - builds/testing_passed/x86_64/*.box - builds/testing_passed/x86_64/*.json - overwrite: true - retention-days: 10 - compression-level: 0 # no compression diff --git a/.github/workflows/test-pkr-bld-parallels.yml b/.github/workflows/test-pkr-bld-parallels.yml deleted file mode 100644 index d6de2796c..000000000 --- a/.github/workflows/test-pkr-bld-parallels.yml +++ /dev/null @@ -1,155 +0,0 @@ ---- -on: - workflow_call: - -permissions: - contents: read - -env: - PACKER_GITHUB_API_TOKEN: "${{ secrets.GITHUB_TOKEN }}" - # PACKER_LOG: "1" - -jobs: - x86_64: - runs-on: macos-latest - strategy: - fail-fast: false - matrix: - os: - - almalinux-8 - - almalinux-9 - - almalinux-10 - - centos-stream-9 - - debian-11 - - debian-12 - - fedora-42 - - fedora-43 - - freebsd-13 - - freebsd-14 - - freebsd-15 - - opensuse-leap-15 - - opensuse-leap-16 - - oraclelinux-8 - - oraclelinux-9 - - oraclelinux-10 - - rockylinux-8 - - rockylinux-9 - - rockylinux-10 - - ubuntu-22.04 - - ubuntu-24.04 - - ubuntu-26.04 - provider: - - parallels-iso - steps: - - name: Checkout - uses: actions/checkout@main - - name: Install Vagrant Parallels - run: | - brew tap hashicorp/tap - brew update - brew install --cask hashicorp/tap/hashicorp-vagrant - brew install --cask parallels - brew install --cask parallels-virtualization-sdk - vagrant plugin install vagrant-parallels - - name: Install Chef - uses: actionshub/chef-install@3.0.0 - - name: Setup Packer - uses: hashicorp/setup-packer@main - with: - version: latest - - name: Install Bento - run: | - eval "$(chef shell-init bash)" - gem build bento.gemspec - gem install bento-*.gem - - name: Bento build - run: | - eval "$(chef shell-init bash)" - bento build -o ${{ matrix.provider }}.vm os_pkrvars/$(echo ${{ matrix.os }} | cut -d "-" -f 1)/"${{ matrix.os }}-x86_64.pkrvars.hcl" - ls -alh builds/build_complete/ - cat builds/build_complete/${{ matrix.os }}*-x86_64._metadata.json - - name: Upload build artifact - uses: actions/upload-artifact@v3 - with: - name: "${{ matrix.os }}-parallels-x86_64" - path: | - builds/build_complete/*.box - builds/build_complete/*.json - retention-days: 10 - compression-level: 0 # no compression - - name: Bento Test - run: | - eval "$(chef shell-init bash)" - bento test - - aarch64: - runs-on: macos-latest - strategy: - fail-fast: false - matrix: - os: - - almalinux-8 - - almalinux-9 - - centos-stream-9 - - debian-11 - - debian-12 - - fedora-40 - - fedora-41 - - freebsd-13 - - freebsd-14 - - freebsd-15 - - opensuse-leap-15 - - oraclelinux-8 - - oraclelinux-9 - - rockylinux-8 - - rockylinux-9 - - ubuntu-20.04 - - ubuntu-22.04 - - ubuntu-24.04 - - ubuntu-26.04 - provider: - - parallels-iso - steps: - - name: Checkout - uses: actions/checkout@main - - name: Install Vagrant Parallels - run: | - brew tap hashicorp/tap - brew update - brew install --cask hashicorp/tap/hashicorp-vagrant - brew install --cask parallels - brew install --cask parallels-virtualization-sdk - vagrant plugin install vagrant-parallels - - name: Install Chef - uses: actionshub/chef-install@3.0.0 - with: - version: 24.2.1058 - - name: Setup Packer - uses: hashicorp/setup-packer@main - with: - version: latest - - name: Install Bento - run: | - eval "$(chef shell-init bash)" - gem build bento.gemspec - gem install bento-*.gem - - name: Bento build - run: | - eval "$(chef shell-init bash)" - bento build -o ${{ matrix.provider }}.vm --vars 'ssh_timeout=30m' os_pkrvars/$(echo ${{ matrix.os }} | cut -d "-" -f 1)/"${{ matrix.os }}-aarch64.pkrvars.hcl" - ls -alh builds/build_complete/ - cat builds/build_complete/${{ matrix.os }}*-aarch64._metadata.json - - name: Bento Test - run: | - eval "$(chef shell-init bash)" - bento test - - name: Upload build artifact - uses: actions/upload-artifact@v4 - with: - name: "${{ matrix.os }}-parallels-aarch64" - path: | - builds/testing_passed/aarch64/*.box - builds/testing_passed/aarch64/*.json - overwrite: true - retention-days: 10 - compression-level: 0 # no compression diff --git a/.markdownlint-cli2.yaml b/.markdownlint-cli2.yaml new file mode 100644 index 000000000..93a568f3b --- /dev/null +++ b/.markdownlint-cli2.yaml @@ -0,0 +1,6 @@ +--- +config: + line-length: false # MD013 +ignores: + - .github/copilot-instructions.md + - AGENTS.md diff --git a/.mdlrc b/.mdlrc deleted file mode 100644 index 295c24970..000000000 --- a/.mdlrc +++ /dev/null @@ -1 +0,0 @@ -rules "~MD007", "~MD013", "~MD024", "~MD033" diff --git a/.rspec b/.rspec new file mode 100644 index 000000000..4e33a322b --- /dev/null +++ b/.rspec @@ -0,0 +1,3 @@ +--require spec_helper +--color +--format documentation diff --git a/AGENTS.md b/AGENTS.md new file mode 100644 index 000000000..4673b5c03 --- /dev/null +++ b/AGENTS.md @@ -0,0 +1,280 @@ +# Bento Repository - Agent Instructions + +This repository contains the Bento project, which provides: +1. **Ruby CLI Wrapper**: A Ruby gem (`bento`) that wraps Hashicorp Packer for building Vagrant boxes +2. **Packer Templates**: HCL-based Packer templates for building Vagrant base boxes across multiple operating systems and providers + +## Repository Overview + +### Ruby Component (CLI Wrapper) +- **Language**: Ruby 3.0+ +- **Main Executable**: `bin/bento` +- **Library Code**: `lib/bento/` +- **Key Features**: Build, test, upload, list, and normalize Vagrant boxes +- **Dependencies**: mixlib-shellout, Packer, Vagrant + +### Packer Component (Box Definitions) +- **Language**: HCL (HashiCorp Configuration Language) +- **Templates Directory**: `packer_templates/` +- **OS Variable Files**: `os_pkrvars/` (organized by OS family) +- **Supported Providers**: VirtualBox, VMware, Parallels, UTM, QEMU, Hyper-V +- **Supported Architectures**: x86_64, aarch64 + +## Code Change Requirements + +### For ALL Changes to This Repository: + +#### 1. Linting Requirements +Before committing any changes, you **MUST** run the following linters based on the files modified: + +**Ruby Files** (`*.rb`, `Rakefile`, `*.gemspec`): +```bash +bundle install +bundle exec cookstyle -a . +``` + +**Markdown Files** (`*.md`): +```bash +# Markdown linting is performed via GitHub Actions +# Local testing not required but verify links work +``` + +**YAML Files** (`*.yml`, `*.yaml`): +```bash +# YAML linting is performed via GitHub Actions +# Ensure valid YAML syntax +``` + +**Shell Scripts** (`*.sh`): +```bash +shellcheck *.sh +``` + +**PowerShell Scripts** (`*.ps1`): +```bash +# PowerShell linting is performed via GitHub Actions +``` + +**Packer Templates** (`*.pkr.hcl`, `*.pkrvars.hcl`): +```bash +cd /path/to/bento +packer init -upgrade ./packer_templates +packer validate -var-file=os_pkrvars/<os>/<template>.pkrvars.hcl ./packer_templates +``` + +**All Packer Templates (Comprehensive Validation)**: +```bash +bundle exec rake validate +``` + +#### 2. Testing Requirements + +**For Ruby Code Changes**: +```bash +# Install all dependencies (includes test-kitchen, kitchen-vagrant, and rspec) +bundle install + +# Run the RSpec unit test suite +bundle exec rspec +# or equivalently: +bundle exec rake spec +# (bundle exec rake also runs spec by default) + +# Run the bento CLI commands to verify functionality +bento list +bento build --dry-run os_pkrvars/<test-template>.pkrvars.hcl +``` + +**RSpec test suite** is located in `spec/` and covers all library modules: +- `spec/bento/common_spec.rb` — Common module helpers +- `spec/bento/buildmetadata_spec.rb` — BuildMetadata +- `spec/bento/providermetadata_spec.rb` — ProviderMetadata +- `spec/bento/packerexec_spec.rb` — PackerExec +- `spec/bento/runner_spec.rb` — BuildRunner +- `spec/bento/test_spec.rb` — TestRunner +- `spec/bento/upload_spec.rb` — UploadRunner + +**For Packer Template Changes**: +```bash +# Validate the specific template +packer validate -var-file=os_pkrvars/<os>/<modified-template>.pkrvars.hcl ./packer_templates + +# If possible, run a test build (requires hypervisor) +bento build os_pkrvars/<os>/<modified-template>.pkrvars.hcl + +# Test with kitchen (if applicable) +bento test +``` + +#### 3. Documentation Updates + +**README.md** - Update if: +- Adding new features to the bento CLI +- Changing CLI command syntax or options +- Adding/removing supported operating systems +- Modifying build requirements or prerequisites +- Changing installation instructions + +**CHANGELOG.md** - Update for: +- **ALL user-facing changes** (bug fixes, features, breaking changes) +- New OS support or version updates +- Provider support changes (VirtualBox, VMware, etc.) +- Ruby gem version changes +- Template modifications affecting builds + +**Format for CHANGELOG.md**: +```markdown +## Builds for version <VERSION> + +[Add/update the build matrix table showing supported OS and providers] + +### Changes +- Added support for [OS Name] version [X.Y] +- Fixed [issue description] +- Updated [component] to improve [functionality] +- BREAKING: [description of breaking change] +``` + +**TESTING.md** - Update if: +- Changing test procedures +- Adding new test requirements +- Modifying how `bento test` works + +## Key Files to Understand + +### Ruby Codebase +- `lib/bento/cli.rb` - Command-line interface definitions +- `lib/bento/runner.rb` - Build orchestration logic +- `lib/bento/packerexec.rb` - Packer command execution +- `lib/bento/test.rb` - Test kitchen integration (uses Kitchen Ruby API directly via `require 'kitchen'`; no shell-out) +- `lib/bento/upload.rb` - Vagrant Cloud upload logic +- `lib/bento/buildmetadata.rb` - Metadata generation +- `bento.gemspec` - Gem specification and dependencies (`test-kitchen` and `kitchen-vagrant` are runtime deps) +- `spec/` - RSpec unit tests for all library modules +- `.rspec` - RSpec configuration (documentation format, color output) + +### Packer Templates +- `packer_templates/pkr-variables.pkr.hcl` - Variable definitions +- `packer_templates/pkr-sources.pkr.hcl` - Provider source configurations +- `packer_templates/pkr-builder.pkr.hcl` - Build orchestration +- `packer_templates/pkr-plugins.pkr.hcl` - Required Packer plugins +- `os_pkrvars/<os>/<os>-<version>-<arch>.pkrvars.hcl` - OS-specific variables + +### Configuration Files +- `builds.yml` - Build configuration (public boxes, architectures, exclusions) +- `Rakefile` - Build automation tasks + +## Workflow for Code Changes + +### 1. Before Making Changes +```bash +# Ensure dependencies are installed +bundle install +packer init -upgrade ./packer_templates +``` + +### 2. During Development +```bash +# For Ruby changes: run cookstyle frequently +bundle exec cookstyle -a . + +# For Packer changes: validate as you go +packer validate -var-file=os_pkrvars/<os>/<template>.pkrvars.hcl ./packer_templates +``` + +### 3. Before Committing +```bash +# Run all linters for modified file types +bundle exec cookstyle -a . # Ruby files +shellcheck *.sh # Shell scripts +bundle exec rake validate # All Packer templates + +# Update documentation +# - Update CHANGELOG.md with your changes +# - Update README.md if adding features or changing usage +# - Verify all documentation is accurate +``` + +### 4. Commit Message Format +``` +<type>(<scope>): <subject> + +<body> + +<footer> +``` + +**Types**: feat, fix, docs, style, refactor, test, chore +**Scopes**: cli, packer, templates, ubuntu, windows, etc. + +**Examples**: +``` +feat(templates): add Ubuntu 25.10 support + +- Add os_pkrvars for Ubuntu 25.10 x86_64 and aarch64 +- Update builds.yml to include new version +- Add to CHANGELOG.md build matrix + +Closes #123 +``` + +``` +fix(cli): correct memory allocation for virtualbox builds + +The --mem option was not being passed correctly to packer. +Fixed argument handling in packerexec.rb. +``` + +## Common Tasks + +### Adding a New OS Template +1. Create `os_pkrvars/<os>/<os>-<version>-<arch>.pkrvars.hcl` +2. Validate: `packer validate -var-file=os_pkrvars/<os>/<new-template>.pkrvars.hcl ./packer_templates` +3. Update `builds.yml` if the OS should be public +4. Update `CHANGELOG.md` with the new OS in the build matrix +5. Update `README.md` if it's a significant addition +6. Run: `bundle exec rake validate` to ensure all templates still validate + +### Modifying the Ruby CLI +1. Edit files in `lib/bento/` +2. Run unit tests: `bundle exec rspec` +3. Run linter: `bundle exec cookstyle -a .` +4. Test: `gem build bento.gemspec && gem install bento-*.gem` +5. Verify: `bento list`, `bento build --dry-run <template>` +6. Update `README.md` if CLI usage changes +7. Update `CHANGELOG.md` with the feature or fix + +### Updating Packer Templates +1. Edit `packer_templates/*.pkr.hcl` +2. Validate: `bundle exec rake validate` +3. Test with a sample build: `bento build os_pkrvars/ubuntu/ubuntu-24.04-x86_64.pkrvars.hcl` +4. Update `CHANGELOG.md` if behavior changes +5. Update `README.md` if new features are available + +## Important Notes + +- **Always run linters before committing** - CI will fail if linting errors exist +- **Keep CHANGELOG.md current** - It serves as the release notes +- **Test your changes** - Especially for Packer templates, validate before submitting +- **Documentation is code** - Outdated docs are bugs +- **Architecture awareness** - Many templates are architecture-specific (x86_64 vs aarch64) +- **Provider compatibility** - Not all OS/architecture combinations work with all providers +- **Build times** - Packer builds can take 30+ minutes; use `--dry-run` for quick validation +- **Vagrant Cloud** - The `bento upload` command publishes to https://app.vagrantup.com/bento + +## CI/CD + +The repository uses GitHub Actions for: +- Linting (YAML, JSON, XML, Shell, PowerShell, Markdown, Packer) +- Packer ISO URL validation +- Automated builds per provider and architecture +- PR validation + +See `.github/workflows/` for workflow definitions. + +## Resources + +- Packer Documentation: https://www.packer.io/docs +- Vagrant Documentation: https://www.vagrantup.com/docs +- Chef Bento Boxes: https://app.vagrantup.com/bento +- Kitchen-Vagrant: https://github.com/test-kitchen/kitchen-vagrant diff --git a/CHANGELOG.md b/CHANGELOG.md index c6871ea82..dfe5f4497 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -17,14 +17,13 @@ Markdown table generated at <https://www.tablesgenerator.com/markdown_tables#> | centos-stream-10 | x | x | x | x | | x | x | x | | | | | debian-12 | x | x | x | x | x | x | | | | | | | debian-13 | x | x | x | x | x | x | | | | | | -| fedora-41 | x | x | x | x | x | x | x | x | | | | -| fedora-42 | x | x | x | x | x | x | x | x | | | | -| freebsd-13 | x | x | x | x | x | x | x | | | | | +| fedora-43 | x | x | x | x | x | x | x | x | | | | +| fedora-44 | x | x | x | x | x | x | x | x | | | | | freebsd-14 | x | x | x | x | x | x | x | x | | | | +| freebsd-15 | x | x | x | x | x | x | x | x | | | | | macos-14 | na | na | na | na | na | x | | | na | na | na | | macos-15 | na | na | na | na | na | x | | | na | na | na | | macos-26 | na | na | na | na | na | x | | | na | na | na | -| opensuse-leap-15 | x | x | x | x | x | x | | | | | | | opensuse-leap-16 | x | x | x | x | x | x | x | x | | | | | oraclelinux-8 | x | na | x | na | x | na | x | na | | na | | | oraclelinux-9 | x | x | x | x | x | x | x | x | | | | @@ -34,8 +33,7 @@ Markdown table generated at <https://www.tablesgenerator.com/markdown_tables#> | rockylinux-10 | x | x | x | x | x | x | x | x | | | | | ubuntu-22.04 | x | x | x | x | x | x | x | x | | | | | ubuntu-24.04 | x | x | x | x | x | x | x | x | x | | | -| ubuntu-25.04 | x | x | x | x | x | x | x | x | x | | | -| ubuntu-25.10 | | | | | | | | | | | | +| ubuntu-26.04 | x | x | x | x | x | x | x | x | x | | | | windows-11 | x | na | x | | x | x | x | x | | | | | windows-2016 | x | na | x | na | x | na | x | na | | na | | | windows-2019 | x | na | x | na | x | na | x | na | | na | | @@ -52,15 +50,36 @@ Markdown table generated at <https://www.tablesgenerator.com/markdown_tables#> - Create CD pipeline to upload vagrant boxes after PR is merged - Create CD pipeline to build and upload new versions of vagrant boxes once every 3 months with the latest patches -## [unreleased] (2025-11-21) - +## [unreleased] (2026-06-04) + +## [5.1.0] (2026-06-04) + +- Removed Ubuntu 25.04 +- Removed Ubuntu 25.10 +- Removed Fedora 42 +- Removed FreeBSD 13 +- Removed openSUSE Leap 15 +- Removed Rocky, Alma, and RHEL 8 aarch64 builds +- Added Fedora 44 support (x86_64 and aarch64) +- Updated Ubuntu 24.04 to 24.04.4 LTS +- Updated builds.yml to reflect current supported OS versions +- Added AGENTS.md file with repository instructions for GitHub Copilot CLI +- Added new variables pause_before_connecting, ssh_read_write_timeout +- Fixed Vmware plugin changes in templates +- Added Test-Kitchen dependency for tests +- Refactored bento test command to run call TK directory vs shelling out - Update freebsd 14 to 14.4 - Updated macos boot commands to enable remote login as last step -- Updated Almalinux 9 to 9.7 -- Updated Almalinux 10 to 10.1 +- Updated Almalinux 9 to 9.8 +- Updated Almalinux 10 to 10.2 +- Updated Rockylinux 9 to 9.8 +- Updated Rockylinux 10 to 10.2 +- Updated Debian 12 to 12.14 - Updated Debian 13 to 13.3 -- Updated RHEL 9 to 9.7 +- Updated RHEL 9 to 9.8 - Updated RHEL 10 to 10.1 +- Updated Ubuntu 24 to 24.04.4 +- Added Ubuntu 26.04 ## [v5.0.1] (2025-11-21) @@ -1292,7 +1311,7 @@ Please ensure that Virtualbox is at least 5.1.6 and Vagrant at least 1.8.6 befor - \[ubuntu-12.04-\*\] Update URL paths to use 12.04.5. [\#359](https://github.com/chef/bento/pull/359) ([fnichol](https://github.com/fnichol)) - Remove VeeWee definitions from project [\#358](https://github.com/chef/bento/pull/358) ([fnichol](https://github.com/fnichol)) - Add packer/bin/bento for building templates. [\#357](https://github.com/chef/bento/pull/357) ([fnichol](https://github.com/fnichol)) -- update README to point to Boxcutter instead of basebox [\#354](https://github.com/chef/bento/pull/354) ([OBrienCommaJosh](https://github.com/OBrienCommaJosh)) +- update README to point to Boxcutter instead of basebox [\#354](https://github.com/chef/bento/pull/354) (OBrienCommaJosh) - Add MAINTAINERS.md file. [\#347](https://github.com/chef/bento/pull/347) ([fnichol](https://github.com/fnichol)) - Add RHEL 7.1 JSON file. [\#342](https://github.com/chef/bento/pull/342) ([lopaka](https://github.com/lopaka)) - Solaris 10u11 - zfs base box [\#341](https://github.com/chef/bento/pull/341) ([scotthain](https://github.com/scotthain)) diff --git a/Gemfile b/Gemfile index 807257881..e22ac2fa5 100644 --- a/Gemfile +++ b/Gemfile @@ -2,7 +2,10 @@ source 'https://rubygems.org' gemspec +gem 'stringio', '>= 3.1.0' + group :development do gem 'cookstyle' gem 'rake', '>= 12' + gem 'rspec', '~> 3.13' end diff --git a/README.md b/README.md index aac86b8b5..e454ad950 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,6 @@ Bento is a project that encapsulates [Packer](https://www.packer.io/) templates ***NOTE:** - Vagrant 2.4.0+ is required for new cpu architecture support -- For `bento test` command to work test-kitchen and kitchen-vagrant gems must be installed - Virutalbox 7.1.6+ required for arm64 support - When running packer build command the output directory is relative to the working directory the command is currently running in. Suggest running packer build commands from bento root directory for build working files to be placed in bento/builds/build_complete/(build_name) directory by default. If the output_directory variable isn't overwritten a directory called builds/build_complete/(build_name) will be created in the current working directory that you are running the command from @@ -95,6 +94,8 @@ If you have successfully built a vagrant box using the bento tool, you should ha bento test ``` +Test results are written to `builds/testing_passed` (on success) or `builds/testing_failed` (on failure). Each provider's result is **merged into** the metadata file rather than replacing it, so re-running a failed provider after a fix will update only that provider's entry while preserving the results of all other previously tested providers. + #### upload To upload boxes in the builds/testing_passed directory to your vagrant cloud account update the build.yml file to specify your account name and which OSs are going to be public. diff --git a/Rakefile b/Rakefile index 6116ee1f8..f9c5e2162 100644 --- a/Rakefile +++ b/Rakefile @@ -1,5 +1,10 @@ require 'yaml' require 'fileutils' +require 'rspec/core/rake_task' + +RSpec::Core::RakeTask.new(:spec) + +task default: :spec desc 'Validate all templates using Packer' task :validate do @@ -57,7 +62,7 @@ def a_to_s(*args) end def config - YAML.load(File.read('builds.yml')) + YAML.load_file('builds.yml') end def clean_array(*args) @@ -65,7 +70,7 @@ def clean_array(*args) end def box_name(template) - bn = template.split('/')[1].gsub!(/\.pkrvars\.hcl/, '') + bn = template.split('/')[1].gsub!('.pkrvars.hcl', '') bn.match(/-x86_64|-aarch64/) ? bn.gsub(/-x86_64|-aarch64/, '') : bn end diff --git a/bento.gemspec b/bento.gemspec index e90d43c4f..b70d94074 100644 --- a/bento.gemspec +++ b/bento.gemspec @@ -13,11 +13,15 @@ Gem::Specification.new do |s| s.required_ruby_version = '>= 3.0' - s.add_dependency 'mixlib-shellout', '>= 2.3.2' - s.bindir = 'bin' s.executables = %w(bento) s.require_path = 'lib' s.files = %w(LICENSE Gemfile) + Dir.glob('*.gemspec') + Dir.glob('lib/**/*') + + s.add_dependency 'mixlib-shellout', '>= 2.3.2' + s.add_dependency 'test-kitchen', '>= 4.0.0' + s.add_dependency 'kitchen-vagrant', '>= 2.2.1' + + s.add_development_dependency 'rspec', '~> 3.13' end diff --git a/builds.yml b/builds.yml index 1aa72f64f..f2018f693 100644 --- a/builds.yml +++ b/builds.yml @@ -14,12 +14,10 @@ public: - centos-stream-10 - debian-12 - debian-13 - - fedora-42 - fedora-43 - - freebsd-13 + - fedora-44 - freebsd-14 - freebsd-15 - - opensuse-leap-15 - opensuse-leap-16 - oraclelinux-8 - oraclelinux-9 @@ -29,8 +27,6 @@ public: - rockylinux-10 - ubuntu-22.04 - ubuntu-24.04 - - ubuntu-25.04 - - ubuntu-25.10 - ubuntu-26.04 # slug box name: text string from standard box name to match @@ -41,10 +37,9 @@ slugs: - debian-12 - debian-13 - fedora-latest - - freebsd-13 - freebsd-14 - freebsd-15 - - opensuse-leap-15 + - opensuse-leap-16 - oraclelinux-8 - oraclelinux-9 - oraclelinux-10 diff --git a/lib/bento/buildmetadata.rb b/lib/bento/buildmetadata.rb index e67be4a48..e93212523 100644 --- a/lib/bento/buildmetadata.rb +++ b/lib/bento/buildmetadata.rb @@ -13,17 +13,17 @@ def initialize(template, build_timestamp, override_version, pkr_cmd) def read { - name: name, - version: version, - arch: arch, - build_timestamp: build_timestamp, - packer_command: pkr_cmd, - git_revision: git_revision, - git_status: git_clean? ? 'clean' : 'dirty', - box_basename: box_basename, - template: template_vars.fetch('template', UNKNOWN), - packer: packer_ver, - vagrant: vagrant_ver, + name: name, + version: version, + arch: arch, + build_timestamp: build_timestamp, + packer_command: pkr_cmd, + git_revision: git_revision, + git_status: git_clean? ? 'clean' : 'dirty', + box_basename: box_basename, + template: template_vars.fetch('template', UNKNOWN), + packer: packer_ver, + vagrant: vagrant_ver, } end @@ -63,10 +63,10 @@ def template_vars File.open("#{template}.pkrvars.hcl", 'r') do |file| file.each_line do |line| line_data = line.split('=') - if line_data[0].strip.gsub(/"|os_/, '') == 'version' + if line_data.first.strip.gsub(/"|os_/, '') == 'version' file_data['name'] = "#{file_data['name']}-#{line_data[1]&.strip&.tr('"', '')}" else - file_data[line_data[0]&.strip&.gsub(/"|os_/, '')] = line_data[1]&.strip&.tr('"', '') + file_data[line_data.first&.strip&.gsub(/"|os_/, '')] = line_data[1]&.strip&.tr('"', '') end end file_data['template'] = "#{file_data['name']}-#{file_data['arch']}" @@ -82,12 +82,16 @@ def version def packer_ver cmd = Mixlib::ShellOut.new('packer --version') cmd.run_command - cmd.stdout.split(' ')[1] + cmd.error? ? nil : cmd.stdout.split(' ')[1] end def vagrant_ver cmd = Mixlib::ShellOut.new('vagrant --version') - cmd.run_command - cmd.stdout.split(' ')[1] + if defined?(Bundler) + Bundler.with_unbundled_env { cmd.run_command } + else + cmd.run_command + end + cmd.error? ? nil : cmd.stdout.split(' ')[1] end end diff --git a/lib/bento/cli.rb b/lib/bento/cli.rb index 21a2cd9ca..77df28465 100644 --- a/lib/bento/cli.rb +++ b/lib/bento/cli.rb @@ -17,7 +17,7 @@ def self.parse(args) else RbConfig::CONFIG['host_cpu'] end - not_buildable = YAML.load(File.read('builds.yml'))['do_not_build'] + not_buildable = YAML.load_file('builds.yml')['do_not_build'] options = OpenStruct.new options.template_files = calculate_templates("os_pkrvars/**/*-#{arch}.pkrvars.hcl") not_buildable.each do |os| @@ -50,11 +50,11 @@ def self.parse(args) } test_argv_proc = proc { |opts| - opts.regx = ARGV[0] + opts.regx = ARGV.first } md_json_argv_proc = proc { |opts| - opts.md_json = ARGV[0] + opts.md_json = ARGV.first } subcommand = { diff --git a/lib/bento/common.rb b/lib/bento/common.rb index 398f31c50..f1804523d 100644 --- a/lib/bento/common.rb +++ b/lib/bento/common.rb @@ -75,7 +75,7 @@ def metadata_files(arch_support = false, upload = false) end def builds_yml - YAML.load(File.read('builds.yml')) + YAML.load_file('builds.yml') end def private_box?(boxname) diff --git a/lib/bento/packerexec.rb b/lib/bento/packerexec.rb index c7394ce47..6b836d27a 100644 --- a/lib/bento/packerexec.rb +++ b/lib/bento/packerexec.rb @@ -19,12 +19,12 @@ def write_var_file(template, md_file, io) md = BuildMetadata.new(template, build_timestamp, override_version, pkr_cmd).read io.write(JSON.pretty_generate({ - box_basename: md[:box_basename], - build_timestamp: md[:build_timestamp], - git_revision: md[:git_revision], - metadata: md_file.path, - version: md[:version], - })) + box_basename: md[:box_basename], + build_timestamp: md[:build_timestamp], + git_revision: md[:git_revision], + metadata: md_file.path, + version: md[:version], + })) io.close end end diff --git a/lib/bento/providermetadata.rb b/lib/bento/providermetadata.rb index cbfd8de78..b9d67b81d 100644 --- a/lib/bento/providermetadata.rb +++ b/lib/bento/providermetadata.rb @@ -16,7 +16,7 @@ def read { name: provider_from_file(file), version: version(provider_from_file(file)), - file: "#{File.basename(file)}", + file: File.basename(file).to_s, checksum_type: 'sha256', checksum: shasum(file), size: "#{size_in_mb(file)} MB", diff --git a/lib/bento/runner.rb b/lib/bento/runner.rb index 4e73d5d85..199f5347e 100644 --- a/lib/bento/runner.rb +++ b/lib/bento/runner.rb @@ -65,7 +65,7 @@ def build(file) time = Benchmark.measure do cmd.run_command end - if Dir.glob("../../builds/build_complete/#{template.split('-')[0...-1].join('-')}*-#{template.split('-')[-1]}.*.box").empty? + if Dir.glob("../../builds/build_complete/#{template.split('-')[0...-1].join('-')}*-#{template.split('-').last}.*.box").empty? banner('Not writing metadata file since no boxes exist') else write_final_metadata(template, time.real.ceil) @@ -81,7 +81,7 @@ def build(file) def packer_build_cmd(template, _var_file) pkrvars = "#{template}.pkrvars.hcl" - cmd = %W(packer build -timestamp-ui -force -var-file=#{File.absolute_path(pkrvars)} #{File.absolute_path("../../packer_templates")}) + cmd = %W(packer build -timestamp-ui -force -var-file=#{File.absolute_path(pkrvars)} #{File.absolute_path('../../packer_templates')}) vars.each do |var| cmd.insert(4, "-var #{var}") end if vars diff --git a/lib/bento/test.rb b/lib/bento/test.rb index 5dce71959..a2e6984bf 100644 --- a/lib/bento/test.rb +++ b/lib/bento/test.rb @@ -1,6 +1,6 @@ require 'bento/common' -require 'mixlib/shellout' unless defined?(Mixlib::ShellOut) require 'erb' unless defined?(Erb) +require 'kitchen' class TestRunner include Common @@ -23,36 +23,83 @@ def start end time = Benchmark.measure do md_files.each do |metadata_file| - destroy_all_bento test_box(metadata_file) - destroy_all_bento end end banner("Testing finished in #{duration(time.real)}.") if errors.empty? banner('All tests passed.') else - raise("Failed Tests:\n#{errors.join("\n")}\nexited #{$CHILD_STATUS}") + raise("Failed Tests:\n#{errors.join("\n")}") end end private - def destroy_all_bento - cmd = Mixlib::ShellOut.new("vagrant box list | grep 'bento-'") + # Merge a single provider entry into an existing metadata JSON file, + # appending or replacing by provider name. When creating a new file the + # base metadata fields are copied but the providers list starts empty so + # only the current provider is written on the first call. + def update_metadata_file(path, base_md, provider) + existing = File.exist?(path) ? JSON.parse(File.read(path)) : base_md.merge('providers' => []) + existing['providers'].reject! { |p| p['name'] == provider['name'] } + existing['providers'] << provider + File.binwrite(path, JSON.pretty_generate(existing)) + end + + # Wrap block in Bundler.with_unbundled_env when Bundler is loaded (i.e. when + # invoked via `bundle exec`), so that BUNDLE_GEMFILE and RUBYOPT are cleared + # before vagrant subprocesses are spawned. When bento is installed and run + # as a plain gem (no bundler in scope) those env-vars are absent anyway, so + # we simply yield the block. + def with_unbundled_env(&block) + if defined?(Bundler) + Bundler.with_unbundled_env(&block) + else + block.call + end + end + + # Remove the vagrant box that was added during testing. + # First tries with --provider; if that fails (e.g. qemu boxes register as + # libvirt internally) falls back to removing all versions of the box name. + def remove_vagrant_box(box_name, provider_name) + vagrant_name = "bento-#{box_name}" + cmd = Mixlib::ShellOut.new("vagrant box remove #{vagrant_name} --provider #{provider_name} --force") cmd.run_command - boxes = cmd.stdout.split("\n") + unless cmd.error? + banner("Removed vagrant box #{vagrant_name} (#{provider_name})") + return + end + + # Fall back to removing all registered providers/versions for this box name + fallback = Mixlib::ShellOut.new("vagrant box remove #{vagrant_name} --all --force") + fallback.run_command + if fallback.error? + warn("Failed to remove vagrant box #{vagrant_name}: #{fallback.stderr.strip}") + else + banner("Removed vagrant box #{vagrant_name} (all providers)") + end + end + + # Remove a provider entry from the build_complete metadata file. + # Deletes the metadata file when the last provider has been removed. + def remove_from_build_complete(build_complete_dir, md_json_file, provider_name) + bc_md_path = File.join(build_complete_dir, md_json_file) + return unless File.exist?(bc_md_path) - boxes.each do |box| - b = box.split(' ') - rm_cmd = Mixlib::ShellOut.new("vagrant box remove --force #{b[0]} --provider #{b[1].to_s.gsub(/(,|\()/, '')}") - banner("Removing #{b[0]} for provider #{b[1].to_s.gsub(/(,|\()/, '')}") - rm_cmd.run_command + bc_md = JSON.parse(File.read(bc_md_path)) + bc_md['providers'].reject! { |p| p['name'] == provider_name } + if bc_md['providers'].empty? + File.delete(bc_md_path) + else + File.binwrite(bc_md_path, JSON.pretty_generate(bc_md)) end end def test_box(md_json) md = box_metadata(md_json) + box_errors = [] bento_dir = Dir.pwd build_dir = File.join(bento_dir, 'builds') build_complete_dir = File.join(build_dir, 'build_complete') @@ -84,49 +131,84 @@ def test_box(md_json) Dir.chdir(kitchen_dir) - if regx - box_name = regx.tr('.', '').tr('_', '-') - test = Mixlib::ShellOut.new("kitchen test #{box_name}", timeout: 900, live_stream: STDOUT) - test.run_command - if test.error? - errors << box_name - end - else - passed_providers = [] - failed_providers = [] - new_md = md.dup - new_md['providers'].each do |provider| + # Wrap all kitchen/vagrant operations in with_unbundled_env so that + # bundler environment variables (BUNDLE_GEMFILE, RUBYOPT, etc.) set by + # `bundle exec` are cleared before vagrant subprocesses are spawned. + # Vagrant ships its own embedded Ruby and will fail if it inherits the + # project's BUNDLE_GEMFILE. + with_unbundled_env do + kitchen_config = Kitchen::Config.new( + kitchen_root: kitchen_dir, + log_level: @debug ? :debug : :info + ) + + providers_to_test = if regx + box_name = regx.tr('.', '').tr('_', '-') + md['providers'].select { |p| "#{@boxname.tr('.', '')}-#{@arch}-#{p['name'].tr('_', '-')}" =~ /#{box_name}/i } + else + md['providers'] + end + + providers_to_test.each do |provider| box_name = "#{@boxname.tr('.', '')}-#{@arch}-#{provider['name'].tr('_', '-')}" banner("Testing #{box_name}") - test = Mixlib::ShellOut.new("kitchen test #{box_name}", timeout: 900, live_stream: STDOUT) - test.run_command - if test.error? - banner("Testing failed for #{provider['file']}") - provider['testing'] = "failed: #{test.stderr}" - failed_providers << provider - errors << provider['file'] - new_md['providers'] = failed_providers - FileUtils.mkdir_p(test_failed_dir) unless Dir.exist?(test_failed_dir) - File.binwrite(File.join(test_failed_dir, md_json_file), JSON.pretty_generate(new_md)) - FileUtils.mv(File.join(build_complete_dir, provider['file']), File.join(test_failed_dir, provider['file'])) - else + + instance = kitchen_config.instances.get("default-#{box_name}") + if instance.nil? + banner("No kitchen instance found for #{box_name}, skipping") + next + end + + begin + instance.test(:always) banner("Testing passed for #{provider['file']}") provider['testing'] = 'passed' - passed_providers << provider - new_md['providers'] = passed_providers FileUtils.mkdir_p(test_passed_dir) unless Dir.exist?(test_passed_dir) - File.binwrite(File.join(test_passed_dir, md_json_file), JSON.pretty_generate(new_md)) - FileUtils.mv(File.join(build_complete_dir, provider['file']), File.join(test_passed_dir, provider['file'])) + update_metadata_file(File.join(test_passed_dir, md_json_file), md, provider) + FileUtils.mv(File.join(build_complete_dir, provider['file']), File.join(test_passed_dir, provider['file']), force: true) + remove_from_build_complete(build_complete_dir, md_json_file, provider['name']) + remove_vagrant_box(@boxname, provider['name']) + # Remove from failed metadata if it was previously recorded there + failed_md_path = File.join(test_failed_dir, md_json_file) + if File.exist?(failed_md_path) + failed_md = JSON.parse(File.read(failed_md_path)) + failed_md['providers'].reject! { |p| p['name'] == provider['name'] } + if failed_md['providers'].empty? + File.delete(failed_md_path) + else + File.binwrite(failed_md_path, JSON.pretty_generate(failed_md)) + end + end + rescue Kitchen::ActionFailed, Kitchen::InstanceFailure => e + banner("Testing failed for #{provider['file']}") + provider['testing'] = "failed: #{e.message}" + errors << provider['file'] + box_errors << provider['file'] + FileUtils.mkdir_p(test_failed_dir) unless Dir.exist?(test_failed_dir) + update_metadata_file(File.join(test_failed_dir, md_json_file), md, provider) + box_src = File.join(build_complete_dir, provider['file']) + FileUtils.mv(box_src, File.join(test_failed_dir, provider['file']), force: true) if File.exist?(box_src) + remove_from_build_complete(build_complete_dir, md_json_file, provider['name']) + remove_vagrant_box(@boxname, provider['name']) + end + end + + banner("Cleaning up test files for #{@boxname}") + kitchen_config.instances.each do |inst| + begin + inst.destroy + rescue Kitchen::ActionFailed, Kitchen::InstanceFailure => e + warn("Failed to destroy instance #{inst.name}: #{e.message}") end end - end - banner("Cleaning up test files for #{@boxname}") - destroy = Mixlib::ShellOut.new('kitchen destroy', timeout: 900, live_stream: STDOUT) - destroy.run_command - if Dir.glob("#{build_complete_dir}/#{@boxname}-#{md['arch']}.*.box").empty? - File.delete(File.join(bento_dir, md_json)) end Dir.chdir(bento_dir) - FileUtils.rm_rf(kitchen_dir) + if box_errors.empty? + FileUtils.rm_rf(kitchen_dir) + prune = Mixlib::ShellOut.new('vagrant global-status --prune') + prune.run_command + else + banner("Keeping #{kitchen_dir} for troubleshooting (#{box_errors.length} failed provider(s))") + end end end diff --git a/lib/bento/test_templates/kitchen.yml.erb b/lib/bento/test_templates/kitchen.yml.erb index 4d5f07a6d..52d3ace83 100644 --- a/lib/bento/test_templates/kitchen.yml.erb +++ b/lib/bento/test_templates/kitchen.yml.erb @@ -4,7 +4,7 @@ provisioner: platforms: <% @providers.each do |provider| -%> -- name: <%= "#{@boxname}-#{@arch}-#{provider['name']}" %> +- name: <%= "#{@boxname.tr('.', '')}-#{@arch}-#{provider['name'].tr('_', '-')}" %> driver: name: vagrant provider: <%= provider['name'] %> @@ -14,6 +14,10 @@ platforms: box_arch: <%= @arch %> synced_folders: - [".", "/vagrant", "disabled: true"] +<% if provider['name'] == 'libvirt' -%> + customize: + inputs: [] +<% end -%> <% end -%> suites: - name: default diff --git a/lib/bento/upload.rb b/lib/bento/upload.rb index d0b70e0d0..dc3b48b0c 100644 --- a/lib/bento/upload.rb +++ b/lib/bento/upload.rb @@ -86,11 +86,10 @@ def lookup_slug(name) return slug if name.start_with?(slug) next unless slug.end_with?('latest') box_name = slug.split('-').first - box_version = [] - Dir.glob("os_pkrvars/#{box_name}/**/*.pkrvars.hcl").each do |boxes| - box_version << File.basename(boxes).split('-')[1].to_i + box_version = Dir.glob("os_pkrvars/#{box_name}/**/*.pkrvars.hcl").map do |boxes| + File.basename(boxes).split('-')[1].to_i end - latest = box_version.uniq!.max { |a, b| a <=> b } + latest = box_version.uniq.max { |a, b| a <=> b } return slug if name.start_with?("#{box_name}-#{latest}") end @@ -120,17 +119,16 @@ def slug_desc(name) end def ver_desc(md_data) - tool_versions = [] - md_data['providers'].each do |provider| - tool_versions << if provider['name'] == 'vmware_desktop' - if macos? - "vmware-fusion: #{provider['version']}" - else - "vmware-workstation: #{provider['version']}" - end - else - "#{provider['name']}: #{provider['version']}" - end + tool_versions = md_data['providers'].map do |provider| + if provider['name'] == 'vmware_desktop' + if macos? + "vmware-fusion: #{provider['version']}" + else + "vmware-workstation: #{provider['version']}" + end + else + "#{provider['name']}: #{provider['version']}" + end end tool_versions.sort! tool_versions << "packer: #{md_data['packer']}" diff --git a/lib/bento/version.rb b/lib/bento/version.rb index 365eb8707..969f9a3ac 100644 --- a/lib/bento/version.rb +++ b/lib/bento/version.rb @@ -1,3 +1,3 @@ module Bento - VERSION = '5.0.1'.freeze + VERSION = '5.1.0'.freeze end diff --git a/os_pkrvars/almalinux/almalinux-10-aarch64.pkrvars.hcl b/os_pkrvars/almalinux/almalinux-10-aarch64.pkrvars.hcl index eb697b0c8..b67f7a9ae 100644 --- a/os_pkrvars/almalinux/almalinux-10-aarch64.pkrvars.hcl +++ b/os_pkrvars/almalinux/almalinux-10-aarch64.pkrvars.hcl @@ -1,7 +1,7 @@ os_name = "almalinux" -os_version = "10.1" +os_version = "10.2" os_arch = "aarch64" -iso_url = "https://repo.almalinux.org/almalinux/10/isos/aarch64/AlmaLinux-10.1-aarch64-boot.iso" +iso_url = "https://repo.almalinux.org/almalinux/10/isos/aarch64/AlmaLinux-10.2-aarch64-boot.iso" iso_checksum = "file:https://repo.almalinux.org/almalinux/10/isos/aarch64/CHECKSUM" parallels_guest_os_type = "rhel" vbox_guest_os_type = "Oracle_arm64" diff --git a/os_pkrvars/almalinux/almalinux-10-x86_64.pkrvars.hcl b/os_pkrvars/almalinux/almalinux-10-x86_64.pkrvars.hcl index ee13a4615..c38fe5484 100644 --- a/os_pkrvars/almalinux/almalinux-10-x86_64.pkrvars.hcl +++ b/os_pkrvars/almalinux/almalinux-10-x86_64.pkrvars.hcl @@ -1,7 +1,7 @@ os_name = "almalinux" -os_version = "10.1" +os_version = "10.2" os_arch = "x86_64" -iso_url = "https://repo.almalinux.org/almalinux/10/isos/x86_64/AlmaLinux-10.1-x86_64-boot.iso" +iso_url = "https://repo.almalinux.org/almalinux/10/isos/x86_64/AlmaLinux-10.2-x86_64-boot.iso" iso_checksum = "file:https://repo.almalinux.org/almalinux/10/isos/x86_64/CHECKSUM" parallels_guest_os_type = "rhel" vbox_guest_os_type = "RedHat_64" diff --git a/os_pkrvars/almalinux/almalinux-8-aarch64.pkrvars.hcl b/os_pkrvars/almalinux/almalinux-8-aarch64.pkrvars.hcl deleted file mode 100644 index 1446d984d..000000000 --- a/os_pkrvars/almalinux/almalinux-8-aarch64.pkrvars.hcl +++ /dev/null @@ -1,10 +0,0 @@ -os_name = "almalinux" -os_version = "8.10" -os_arch = "aarch64" -iso_url = "https://repo.almalinux.org/almalinux/8/isos/aarch64/AlmaLinux-8.10-aarch64-boot.iso" -iso_checksum = "file:https://repo.almalinux.org/almalinux/8/isos/aarch64/CHECKSUM" -parallels_guest_os_type = "rhel" -vbox_guest_os_type = "Oracle_arm64" -vmware_guest_os_type = "arm-rhel9-64" -utm_vm_icon = "almalinux" -boot_command = ["<wait><up><wait>e<wait><down><wait><down><wait><end><wait> inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/rhel/8ks.cfg inst.repo=https://repo.almalinux.org/almalinux/8/BaseOS/aarch64/os/ <wait><leftCtrlOn><wait>x<wait><leftCtrlOff>"] diff --git a/os_pkrvars/almalinux/almalinux-9-aarch64.pkrvars.hcl b/os_pkrvars/almalinux/almalinux-9-aarch64.pkrvars.hcl index 09ff03728..416a6e71b 100644 --- a/os_pkrvars/almalinux/almalinux-9-aarch64.pkrvars.hcl +++ b/os_pkrvars/almalinux/almalinux-9-aarch64.pkrvars.hcl @@ -1,7 +1,7 @@ os_name = "almalinux" -os_version = "9.7" +os_version = "9.8" os_arch = "aarch64" -iso_url = "https://repo.almalinux.org/almalinux/9/isos/aarch64/AlmaLinux-9.7-aarch64-boot.iso" +iso_url = "https://repo.almalinux.org/almalinux/9/isos/aarch64/AlmaLinux-9.8-aarch64-boot.iso" iso_checksum = "file:https://repo.almalinux.org/almalinux/9/isos/aarch64/CHECKSUM" parallels_guest_os_type = "rhel" vbox_guest_os_type = "Oracle9_arm64" diff --git a/os_pkrvars/almalinux/almalinux-9-x86_64.pkrvars.hcl b/os_pkrvars/almalinux/almalinux-9-x86_64.pkrvars.hcl index 59235c33f..28656253d 100644 --- a/os_pkrvars/almalinux/almalinux-9-x86_64.pkrvars.hcl +++ b/os_pkrvars/almalinux/almalinux-9-x86_64.pkrvars.hcl @@ -1,7 +1,7 @@ os_name = "almalinux" -os_version = "9.7" +os_version = "9.8" os_arch = "x86_64" -iso_url = "https://repo.almalinux.org/almalinux/9/isos/x86_64/AlmaLinux-9.7-x86_64-boot.iso" +iso_url = "https://repo.almalinux.org/almalinux/9/isos/x86_64/AlmaLinux-9.8-x86_64-boot.iso" iso_checksum = "file:https://repo.almalinux.org/almalinux/9/isos/x86_64/CHECKSUM" parallels_guest_os_type = "rhel" vbox_guest_os_type = "RedHat_64" diff --git a/os_pkrvars/debian/debian-12-aarch64.pkrvars.hcl b/os_pkrvars/debian/debian-12-aarch64.pkrvars.hcl index 6e7b76494..98fbee29c 100644 --- a/os_pkrvars/debian/debian-12-aarch64.pkrvars.hcl +++ b/os_pkrvars/debian/debian-12-aarch64.pkrvars.hcl @@ -1,7 +1,7 @@ os_name = "debian" -os_version = "12.12" +os_version = "12.14" os_arch = "aarch64" -iso_url = "https://cdimage.debian.org/cdimage/archive/latest-oldstable/arm64/iso-cd/debian-12.12.0-arm64-netinst.iso" +iso_url = "https://cdimage.debian.org/cdimage/archive/latest-oldstable/arm64/iso-cd/debian-12.14.0-arm64-netinst.iso" iso_checksum = "file:https://cdimage.debian.org/cdimage/archive/latest-oldstable/arm64/iso-cd/SHA256SUMS" parallels_guest_os_type = "debian" vbox_guest_os_type = "Debian12_arm64" diff --git a/os_pkrvars/debian/debian-12-x86_64.pkrvars.hcl b/os_pkrvars/debian/debian-12-x86_64.pkrvars.hcl index 114186bd5..410f14580 100644 --- a/os_pkrvars/debian/debian-12-x86_64.pkrvars.hcl +++ b/os_pkrvars/debian/debian-12-x86_64.pkrvars.hcl @@ -1,7 +1,7 @@ os_name = "debian" -os_version = "12.12" +os_version = "12.14" os_arch = "x86_64" -iso_url = "https://cdimage.debian.org/cdimage/archive/latest-oldstable/amd64/iso-cd/debian-12.12.0-amd64-netinst.iso" +iso_url = "https://cdimage.debian.org/cdimage/archive/latest-oldstable/amd64/iso-cd/debian-12.14.0-amd64-netinst.iso" iso_checksum = "file:https://cdimage.debian.org/cdimage/archive/latest-oldstable/amd64/iso-cd/SHA256SUMS" parallels_guest_os_type = "debian" vbox_guest_os_type = "Debian12_64" diff --git a/os_pkrvars/fedora/fedora-42-aarch64.pkrvars.hcl b/os_pkrvars/fedora/fedora-44-aarch64.pkrvars.hcl similarity index 66% rename from os_pkrvars/fedora/fedora-42-aarch64.pkrvars.hcl rename to os_pkrvars/fedora/fedora-44-aarch64.pkrvars.hcl index 69dff304e..700bc9f2b 100644 --- a/os_pkrvars/fedora/fedora-42-aarch64.pkrvars.hcl +++ b/os_pkrvars/fedora/fedora-44-aarch64.pkrvars.hcl @@ -1,11 +1,11 @@ os_name = "fedora" -os_version = "42" +os_version = "44" os_arch = "aarch64" -iso_url = "https://download.fedoraproject.org/pub/fedora/linux/releases/42/Server/aarch64/iso/Fedora-Server-netinst-aarch64-42-1.1.iso" -iso_checksum = "file:https://download.fedoraproject.org/pub/fedora/linux/releases/42/Server/aarch64/iso/Fedora-Server-42-1.1-aarch64-CHECKSUM" +iso_url = "https://download.fedoraproject.org/pub/fedora/linux/releases/44/Server/aarch64/iso/Fedora-Server-netinst-aarch64-44-1.7.iso" +iso_checksum = "file:https://download.fedoraproject.org/pub/fedora/linux/releases/44/Server/aarch64/iso/Fedora-Server-44-1.7-aarch64-CHECKSUM" parallels_guest_os_type = "fedora-core" vbox_guest_os_type = "Fedora_arm64" vmware_guest_os_type = "arm-fedora-64" utm_vm_icon = "fedora" parallels_boot_wait = "1s" -boot_command = ["<up>e<wait><down><down><end> inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/rhel/ks.cfg inst.repo=https://download.fedoraproject.org/pub/fedora/linux/releases/42/Server/aarch64/os/ <F10><wait>"] +boot_command = ["<up>e<wait><down><down><end> inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/rhel/ks.cfg inst.repo=https://download.fedoraproject.org/pub/fedora/linux/releases/44/Server/aarch64/os/ <F10><wait>"] diff --git a/os_pkrvars/fedora/fedora-42-x86_64.pkrvars.hcl b/os_pkrvars/fedora/fedora-44-x86_64.pkrvars.hcl similarity index 69% rename from os_pkrvars/fedora/fedora-42-x86_64.pkrvars.hcl rename to os_pkrvars/fedora/fedora-44-x86_64.pkrvars.hcl index 949ad6419..14cc8e3c6 100644 --- a/os_pkrvars/fedora/fedora-42-x86_64.pkrvars.hcl +++ b/os_pkrvars/fedora/fedora-44-x86_64.pkrvars.hcl @@ -1,10 +1,10 @@ os_name = "fedora" -os_version = "42" +os_version = "44" os_arch = "x86_64" -iso_url = "https://download.fedoraproject.org/pub/fedora/linux/releases/42/Server/x86_64/iso/Fedora-Server-netinst-x86_64-42-1.1.iso" -iso_checksum = "file:https://download.fedoraproject.org/pub/fedora/linux/releases/42/Server/x86_64/iso/Fedora-Server-42-1.1-x86_64-CHECKSUM" +iso_url = "https://download.fedoraproject.org/pub/fedora/linux/releases/44/Server/x86_64/iso/Fedora-Server-netinst-x86_64-44-1.7.iso" +iso_checksum = "file:https://download.fedoraproject.org/pub/fedora/linux/releases/44/Server/x86_64/iso/Fedora-Server-44-1.7-x86_64-CHECKSUM" parallels_guest_os_type = "fedora-core" vbox_guest_os_type = "Fedora_64" vmware_guest_os_type = "fedora-64" utm_vm_icon = "fedora" -boot_command = ["<wait><up>e<wait><down><down><end> inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/rhel/ks.cfg inst.repo=https://download.fedoraproject.org/pub/fedora/linux/releases/42/Server/x86_64/os/ <F10><wait>"] +boot_command = ["<wait><up>e<wait><down><down><end> inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/rhel/ks.cfg inst.repo=https://download.fedoraproject.org/pub/fedora/linux/releases/44/Server/x86_64/os/ <F10><wait>"] diff --git a/os_pkrvars/freebsd/freebsd-13-aarch64.pkrvars.hcl b/os_pkrvars/freebsd/freebsd-13-aarch64.pkrvars.hcl deleted file mode 100644 index 273f148b6..000000000 --- a/os_pkrvars/freebsd/freebsd-13-aarch64.pkrvars.hcl +++ /dev/null @@ -1,12 +0,0 @@ -os_name = "freebsd" -os_version = "13.5" -os_arch = "aarch64" -iso_url = "https://download.freebsd.org/releases/arm64/aarch64/ISO-IMAGES/13.5/FreeBSD-13.5-RELEASE-arm64-aarch64-disc1.iso" -iso_checksum = "file:https://download.freebsd.org/releases/arm64/aarch64/ISO-IMAGES/13.5/CHECKSUM.SHA256-FreeBSD-13.5-RELEASE-arm64-aarch64" -parallels_guest_os_type = "freebsd" -vbox_guest_os_type = "FreeBSD_arm64" -vmware_guest_os_type = "arm-freebsd13-64" -utm_vm_icon = "freebsd" -default_boot_wait = "60s" -boot_command = ["<wait>s<wait2>mdmfs -s 100m md1 /tmp<enter><wait>mdmfs -s 100m md2 /mnt<enter><wait>dhclient -p /tmp/dhclient.$(ifconfig -l | awk '{print $1}').pid -l /tmp/dhclient.lease.$(ifconfig -l | awk '{print $1}') $(ifconfig -l | awk '{print $1}')<enter><wait10>fetch -o /tmp/installerconfig http://{{ .HTTPIP }}:{{ .HTTPPort }}/freebsd/installerconfig && bsdinstall script /tmp/installerconfig<enter><wait>"] -utm_boot_command = ["<wait>s<wait2>mdmfs -s 100m md1 /tmp<enter><wait>mdmfs -s 100m md2 /mnt<enter><wait>dhclient -p /tmp/dhclient.$(ifconfig -l | awk '{print $1}').pid -l /tmp/dhclient.lease.$(ifconfig -l | awk '{print $1}') $(ifconfig -l | awk '{print $1}')<enter><wait10>dhclient -p /tmp/dhclient.$(ifconfig -l | awk '{print $2}').pid -l /tmp/dhclient.lease.$(ifconfig -l | awk '{print $2}') $(ifconfig -l | awk '{print $2}')<enter><wait10>fetch -o /tmp/installerconfig http://{{ .HTTPIP }}:{{ .HTTPPort }}/freebsd/installerconfig && bsdinstall script /tmp/installerconfig<enter><wait>"] diff --git a/os_pkrvars/freebsd/freebsd-13-x86_64.pkrvars.hcl b/os_pkrvars/freebsd/freebsd-13-x86_64.pkrvars.hcl deleted file mode 100644 index b83951f1a..000000000 --- a/os_pkrvars/freebsd/freebsd-13-x86_64.pkrvars.hcl +++ /dev/null @@ -1,11 +0,0 @@ -os_name = "freebsd" -os_version = "13.5" -os_arch = "x86_64" -iso_url = "https://download.freebsd.org/releases/amd64/amd64/ISO-IMAGES/13.5/FreeBSD-13.5-RELEASE-amd64-disc1.iso" -iso_checksum = "file:https://download.freebsd.org/releases/amd64/amd64/ISO-IMAGES/13.5/CHECKSUM.SHA256-FreeBSD-13.5-RELEASE-amd64" -parallels_guest_os_type = "freebsd" -vbox_guest_os_type = "FreeBSD_64" -vmware_guest_os_type = "freebsd-64" -utm_vm_icon = "freebsd" -default_boot_wait = "60s" -boot_command = ["<wait>s<wait2>mdmfs -s 100m md1 /tmp<enter><wait>mdmfs -s 100m md2 /mnt<enter><wait>dhclient -p /tmp/dhclient.$(ifconfig -l | awk '{print $1}').pid -l /tmp/dhclient.lease.$(ifconfig -l | awk '{print $1}') $(ifconfig -l | awk '{print $1}')<enter><wait10>dhclient -p /tmp/dhclient.$(ifconfig -l | awk '{print $2}').pid -l /tmp/dhclient.lease.$(ifconfig -l | awk '{print $2}') $(ifconfig -l | awk '{print $2}')<enter><wait10>fetch -o /tmp/installerconfig http://{{ .HTTPIP }}:{{ .HTTPPort }}/freebsd/installerconfig && bsdinstall script /tmp/installerconfig<enter><wait>"] diff --git a/os_pkrvars/opensuse/opensuse-leap-15-aarch64.pkrvars.hcl b/os_pkrvars/opensuse/opensuse-leap-15-aarch64.pkrvars.hcl deleted file mode 100644 index b1eaff749..000000000 --- a/os_pkrvars/opensuse/opensuse-leap-15-aarch64.pkrvars.hcl +++ /dev/null @@ -1,10 +0,0 @@ -os_name = "opensuse-leap" -os_version = "15.6" -os_arch = "aarch64" -iso_url = "https://download.opensuse.org/distribution/leap/15.6/iso/openSUSE-Leap-15.6-NET-aarch64-Media.iso" -iso_checksum = "file:https://download.opensuse.org/distribution/leap/15.6/iso/openSUSE-Leap-15.6-NET-aarch64-Media.iso.sha256" -parallels_guest_os_type = "opensuse" -vbox_guest_os_type = "OpenSUSE_Leap_arm64" -vmware_guest_os_type = "arm-other-64" -utm_vm_icon = "suse" -boot_command = ["<wait5><esc><wait>e<wait><down><down><down><down><end> biosdevname=0 net.ifnames=0 netdevice=eth0 netsetup=dhcp lang=en_US textmode=1 modprobe.blacklist=vmwgfx autoyast=http://{{ .HTTPIP }}:{{ .HTTPPort }}/opensuse/autoinst-uefi.xml<f10><wait>"] diff --git a/os_pkrvars/opensuse/opensuse-leap-15-x86_64.pkrvars.hcl b/os_pkrvars/opensuse/opensuse-leap-15-x86_64.pkrvars.hcl deleted file mode 100644 index 307e1ac41..000000000 --- a/os_pkrvars/opensuse/opensuse-leap-15-x86_64.pkrvars.hcl +++ /dev/null @@ -1,10 +0,0 @@ -os_name = "opensuse-leap" -os_version = "15.6" -os_arch = "x86_64" -iso_url = "https://download.opensuse.org/distribution/leap/15.6/iso/openSUSE-Leap-15.6-NET-x86_64-Media.iso" -iso_checksum = "file:https://download.opensuse.org/distribution/leap/15.6/iso/openSUSE-Leap-15.6-NET-x86_64-Media.iso.sha256" -parallels_guest_os_type = "opensuse" -vbox_guest_os_type = "OpenSUSE_Leap_64" -vmware_guest_os_type = "opensuse-64" -utm_vm_icon = "suse" -boot_command = ["<wait5><esc><enter><wait>linux biosdevname=0 net.ifnames=0 netdevice=eth0 netsetup=dhcp lang=en_US textmode=1 autoyast=http://{{ .HTTPIP }}:{{ .HTTPPort }}/opensuse/autoinst.xml<enter><wait>"] diff --git a/os_pkrvars/rhel/rhel-8-aarch64.pkrvars.hcl b/os_pkrvars/rhel/rhel-8-aarch64.pkrvars.hcl deleted file mode 100644 index 61632a8aa..000000000 --- a/os_pkrvars/rhel/rhel-8-aarch64.pkrvars.hcl +++ /dev/null @@ -1,10 +0,0 @@ -os_name = "rhel" -os_version = "8.10" -os_arch = "aarch64" -iso_url = "https://www.redhat.com/en/technologies/linux-platforms/enterprise-linux" -iso_checksum = "none" -parallels_guest_os_type = "rhel" -vbox_guest_os_type = "Oracle_arm64" -vmware_guest_os_type = "arm-rhel9-64" -utm_vm_icon = "red-hat" -boot_command = ["<wait><up><wait><tab> inst.text inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/rhel/8ks.cfg<enter><wait>"] diff --git a/os_pkrvars/rockylinux/rockylinux-10-aarch64.pkrvars.hcl b/os_pkrvars/rockylinux/rockylinux-10-aarch64.pkrvars.hcl index 5c1ad29e2..5b21f77b6 100644 --- a/os_pkrvars/rockylinux/rockylinux-10-aarch64.pkrvars.hcl +++ b/os_pkrvars/rockylinux/rockylinux-10-aarch64.pkrvars.hcl @@ -1,7 +1,7 @@ os_name = "rockylinux" -os_version = "10.1" +os_version = "10.2" os_arch = "aarch64" -iso_url = "https://download.rockylinux.org/pub/rocky/10/isos/aarch64/Rocky-10.1-aarch64-boot.iso" +iso_url = "https://download.rockylinux.org/pub/rocky/10/isos/aarch64/Rocky-10.2-aarch64-boot.iso" iso_checksum = "file:https://download.rockylinux.org/pub/rocky/10/isos/aarch64/CHECKSUM" parallels_guest_os_type = "rhel" vbox_guest_os_type = "Oracle_arm64" diff --git a/os_pkrvars/rockylinux/rockylinux-10-x86_64.pkrvars.hcl b/os_pkrvars/rockylinux/rockylinux-10-x86_64.pkrvars.hcl index d17a08f2c..5b44ca778 100644 --- a/os_pkrvars/rockylinux/rockylinux-10-x86_64.pkrvars.hcl +++ b/os_pkrvars/rockylinux/rockylinux-10-x86_64.pkrvars.hcl @@ -1,7 +1,7 @@ os_name = "rockylinux" -os_version = "10.1" +os_version = "10.2" os_arch = "x86_64" -iso_url = "https://download.rockylinux.org/pub/rocky/10/isos/x86_64/Rocky-10.1-x86_64-boot.iso" +iso_url = "https://download.rockylinux.org/pub/rocky/10/isos/x86_64/Rocky-10.2-x86_64-boot.iso" iso_checksum = "file:https://download.rockylinux.org/pub/rocky/10/isos/x86_64/CHECKSUM" parallels_guest_os_type = "rhel" vbox_guest_os_type = "Oracle_64" diff --git a/os_pkrvars/rockylinux/rockylinux-8-aarch64.pkrvars.hcl b/os_pkrvars/rockylinux/rockylinux-8-aarch64.pkrvars.hcl deleted file mode 100644 index 271d6333a..000000000 --- a/os_pkrvars/rockylinux/rockylinux-8-aarch64.pkrvars.hcl +++ /dev/null @@ -1,10 +0,0 @@ -os_name = "rockylinux" -os_version = "8.10" -os_arch = "aarch64" -iso_url = "https://download.rockylinux.org/pub/rocky/8/isos/aarch64/Rocky-8.10-aarch64-boot.iso" -iso_checksum = "file:https://download.rockylinux.org/pub/rocky/8/isos/aarch64/CHECKSUM" -parallels_guest_os_type = "rhel" -vbox_guest_os_type = "Oracle_arm64" -vmware_guest_os_type = "arm-rhel9-64" -utm_vm_icon = "linux" -boot_command = ["<wait><up><wait>e<wait><down><down><end><wait> inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/rhel/8ks.cfg inst.repo=https://download.rockylinux.org/pub/rocky/8/BaseOS/aarch64/os/ <leftCtrlOn>x<leftCtrlOff>"] diff --git a/os_pkrvars/rockylinux/rockylinux-9-aarch64.pkrvars.hcl b/os_pkrvars/rockylinux/rockylinux-9-aarch64.pkrvars.hcl index 181dde624..c1d14e7ef 100644 --- a/os_pkrvars/rockylinux/rockylinux-9-aarch64.pkrvars.hcl +++ b/os_pkrvars/rockylinux/rockylinux-9-aarch64.pkrvars.hcl @@ -1,7 +1,7 @@ os_name = "rockylinux" -os_version = "9.7" +os_version = "9.8" os_arch = "aarch64" -iso_url = "https://download.rockylinux.org/pub/rocky/9/isos/aarch64/Rocky-9.7-aarch64-boot.iso" +iso_url = "https://download.rockylinux.org/pub/rocky/9/isos/aarch64/Rocky-9.8-aarch64-boot.iso" iso_checksum = "file:https://download.rockylinux.org/pub/rocky/9/isos/aarch64/CHECKSUM" parallels_guest_os_type = "rhel" vbox_guest_os_type = "Oracle9_arm64" diff --git a/os_pkrvars/rockylinux/rockylinux-9-x86_64.pkrvars.hcl b/os_pkrvars/rockylinux/rockylinux-9-x86_64.pkrvars.hcl index 791dd7f9a..c4b8eee6b 100644 --- a/os_pkrvars/rockylinux/rockylinux-9-x86_64.pkrvars.hcl +++ b/os_pkrvars/rockylinux/rockylinux-9-x86_64.pkrvars.hcl @@ -1,7 +1,7 @@ os_name = "rockylinux" -os_version = "9.7" +os_version = "9.8" os_arch = "x86_64" -iso_url = "https://download.rockylinux.org/pub/rocky/9/isos/x86_64/Rocky-9.7-x86_64-boot.iso" +iso_url = "https://download.rockylinux.org/pub/rocky/9/isos/x86_64/Rocky-9.8-x86_64-boot.iso" iso_checksum = "file:https://download.rockylinux.org/pub/rocky/9/isos/x86_64/CHECKSUM" parallels_guest_os_type = "rhel" vbox_guest_os_type = "Oracle_64" diff --git a/os_pkrvars/ubuntu/ubuntu-24.04-aarch64.pkrvars.hcl b/os_pkrvars/ubuntu/ubuntu-24.04-aarch64.pkrvars.hcl index 296354f9b..2996b75df 100644 --- a/os_pkrvars/ubuntu/ubuntu-24.04-aarch64.pkrvars.hcl +++ b/os_pkrvars/ubuntu/ubuntu-24.04-aarch64.pkrvars.hcl @@ -1,7 +1,7 @@ os_name = "ubuntu" os_version = "24.04" os_arch = "aarch64" -iso_url = "https://cdimage.ubuntu.com/releases/noble/release/ubuntu-24.04.3-live-server-arm64.iso" +iso_url = "https://cdimage.ubuntu.com/releases/noble/release/ubuntu-24.04.4-live-server-arm64.iso" iso_checksum = "file:https://cdimage.ubuntu.com/releases/noble/release/SHA256SUMS" parallels_guest_os_type = "ubuntu" vbox_guest_os_type = "Ubuntu24_LTS_arm64" diff --git a/os_pkrvars/ubuntu/ubuntu-24.04-x86_64.pkrvars.hcl b/os_pkrvars/ubuntu/ubuntu-24.04-x86_64.pkrvars.hcl index 8923b2536..82bc639a1 100644 --- a/os_pkrvars/ubuntu/ubuntu-24.04-x86_64.pkrvars.hcl +++ b/os_pkrvars/ubuntu/ubuntu-24.04-x86_64.pkrvars.hcl @@ -1,7 +1,7 @@ os_name = "ubuntu" os_version = "24.04" os_arch = "x86_64" -iso_url = "https://releases.ubuntu.com/noble/ubuntu-24.04.3-live-server-amd64.iso" +iso_url = "https://releases.ubuntu.com/noble/ubuntu-24.04.4-live-server-amd64.iso" iso_checksum = "file:https://releases.ubuntu.com/noble/SHA256SUMS" parallels_guest_os_type = "ubuntu" vbox_guest_os_type = "Ubuntu_64" diff --git a/os_pkrvars/ubuntu/ubuntu-25.04-aarch64.pkrvars.hcl b/os_pkrvars/ubuntu/ubuntu-25.04-aarch64.pkrvars.hcl deleted file mode 100644 index a387d8ec7..000000000 --- a/os_pkrvars/ubuntu/ubuntu-25.04-aarch64.pkrvars.hcl +++ /dev/null @@ -1,10 +0,0 @@ -os_name = "ubuntu" -os_version = "25.04" -os_arch = "aarch64" -iso_url = "https://cdimage.ubuntu.com/releases/plucky/release/ubuntu-25.04-live-server-arm64.iso" -iso_checksum = "file:https://cdimage.ubuntu.com/releases/plucky/release/SHA256SUMS" -parallels_guest_os_type = "ubuntu" -vbox_guest_os_type = "Ubuntu24_LTS_arm64" -vmware_guest_os_type = "arm-ubuntu-64" -utm_vm_icon = "ubuntu" -boot_command = ["<wait>e<wait><down><down><down><end> autoinstall ds=nocloud-net\\;s=http://{{.HTTPIP}}:{{.HTTPPort}}/ubuntu/<wait><f10><wait>"] diff --git a/os_pkrvars/ubuntu/ubuntu-25.04-x86_64.pkrvars.hcl b/os_pkrvars/ubuntu/ubuntu-25.04-x86_64.pkrvars.hcl deleted file mode 100644 index d73b16cce..000000000 --- a/os_pkrvars/ubuntu/ubuntu-25.04-x86_64.pkrvars.hcl +++ /dev/null @@ -1,10 +0,0 @@ -os_name = "ubuntu" -os_version = "25.04" -os_arch = "x86_64" -iso_url = "https://releases.ubuntu.com/plucky/ubuntu-25.04-live-server-amd64.iso" -iso_checksum = "file:https://releases.ubuntu.com/plucky/SHA256SUMS" -parallels_guest_os_type = "ubuntu" -vbox_guest_os_type = "Ubuntu_64" -vmware_guest_os_type = "ubuntu-64" -utm_vm_icon = "ubuntu" -boot_command = ["<wait>e<wait><down><down><down><end> autoinstall ds=nocloud-net\\;s=http://{{.HTTPIP}}:{{.HTTPPort}}/ubuntu/<wait><f10><wait>"] diff --git a/os_pkrvars/ubuntu/ubuntu-25.10-aarch64.pkrvars.hcl b/os_pkrvars/ubuntu/ubuntu-25.10-aarch64.pkrvars.hcl deleted file mode 100644 index 53070fa23..000000000 --- a/os_pkrvars/ubuntu/ubuntu-25.10-aarch64.pkrvars.hcl +++ /dev/null @@ -1,10 +0,0 @@ -os_name = "ubuntu" -os_version = "25.10" -os_arch = "aarch64" -iso_url = "https://cdimage.ubuntu.com/releases/questing/release/ubuntu-25.10-live-server-arm64.iso" -iso_checksum = "file:https://cdimage.ubuntu.com/releases/questing/release/SHA256SUMS" -parallels_guest_os_type = "ubuntu" -vbox_guest_os_type = "Ubuntu24_LTS_arm64" -vmware_guest_os_type = "arm-ubuntu-64" -utm_vm_icon = "ubuntu" -boot_command = ["<wait>e<wait><down><down><down><end> autoinstall ds=nocloud-net\\;s=http://{{.HTTPIP}}:{{.HTTPPort}}/ubuntu/<wait><f10><wait>"] diff --git a/os_pkrvars/ubuntu/ubuntu-25.10-x86_64.pkrvars.hcl b/os_pkrvars/ubuntu/ubuntu-25.10-x86_64.pkrvars.hcl deleted file mode 100644 index 92c427f83..000000000 --- a/os_pkrvars/ubuntu/ubuntu-25.10-x86_64.pkrvars.hcl +++ /dev/null @@ -1,10 +0,0 @@ -os_name = "ubuntu" -os_version = "25.10" -os_arch = "x86_64" -iso_url = "https://releases.ubuntu.com/questing/ubuntu-25.10-live-server-amd64.iso" -iso_checksum = "file:https://releases.ubuntu.com/questing/SHA256SUMS" -parallels_guest_os_type = "ubuntu" -vbox_guest_os_type = "Ubuntu_64" -vmware_guest_os_type = "ubuntu-64" -utm_vm_icon = "ubuntu" -boot_command = ["<wait>e<wait><down><down><down><end> autoinstall ds=nocloud-net\\;s=http://{{.HTTPIP}}:{{.HTTPPort}}/ubuntu/<wait><f10><wait>"] diff --git a/os_pkrvars/ubuntu/ubuntu-26.04-aarch64.pkrvars.hcl b/os_pkrvars/ubuntu/ubuntu-26.04-aarch64.pkrvars.hcl index 920a4e248..ef5a248e5 100644 --- a/os_pkrvars/ubuntu/ubuntu-26.04-aarch64.pkrvars.hcl +++ b/os_pkrvars/ubuntu/ubuntu-26.04-aarch64.pkrvars.hcl @@ -5,6 +5,6 @@ iso_url = "https://cdimage.ubuntu.com/releases/resolute/release/ iso_checksum = "file:https://cdimage.ubuntu.com/releases/resolute/release/SHA256SUMS" parallels_guest_os_type = "ubuntu" vbox_guest_os_type = "Ubuntu_arm64" -vmware_guest_os_type = "ubuntu64Guest" +vmware_guest_os_type = "arm-ubuntu-64" utm_vm_icon = "ubuntu" boot_command = ["<wait>e<wait><down><down><down><end> autoinstall ds=nocloud-net\\;s=http://{{.HTTPIP}}:{{.HTTPPort}}/ubuntu/<wait><f10><wait>"] diff --git a/os_pkrvars/ubuntu/ubuntu-26.04-x86_64.pkrvars.hcl b/os_pkrvars/ubuntu/ubuntu-26.04-x86_64.pkrvars.hcl index bb57c130a..af908a95b 100644 --- a/os_pkrvars/ubuntu/ubuntu-26.04-x86_64.pkrvars.hcl +++ b/os_pkrvars/ubuntu/ubuntu-26.04-x86_64.pkrvars.hcl @@ -5,6 +5,6 @@ iso_url = "https://releases.ubuntu.com/resolute/ubuntu-26.04-liv iso_checksum = "file:https://releases.ubuntu.com/resolute/SHA256SUMS" parallels_guest_os_type = "ubuntu" vbox_guest_os_type = "Ubuntu_64" -vmware_guest_os_type = "ubuntu64Guest" +vmware_guest_os_type = "ubuntu-64" utm_vm_icon = "ubuntu" boot_command = ["<wait>e<wait><down><down><down><end> autoinstall ds=nocloud-net\\;s=http://{{.HTTPIP}}:{{.HTTPPort}}/ubuntu/<wait><f10><wait>"] diff --git a/packer_templates/pkr-builder.pkr.hcl b/packer_templates/pkr-builder.pkr.hcl index 61434a45a..780ffe3eb 100644 --- a/packer_templates/pkr-builder.pkr.hcl +++ b/packer_templates/pkr-builder.pkr.hcl @@ -102,49 +102,31 @@ build { execute_command = local.nix_execute_command expect_disconnect = true pause_before = "10s" + pause_after = "30s" scripts = ["${path.root}/scripts/_common/update_packages.sh", ] valid_exit_codes = [0, 143] except = var.is_windows ? local.source_names : null } - provisioner "shell" { - inline = [ - "echo 'Waiting after reboot'" - ] - pause_after = "10s" - except = var.is_windows ? local.source_names : null - } # Install build tools and reboot provisioner "shell" { environment_vars = local.nix_environment_vars execute_command = local.nix_execute_command expect_disconnect = true pause_before = "10s" + pause_after = "30s" scripts = ["${path.root}/scripts/_common/build_tools.sh", ] except = var.is_windows ? local.source_names : null } - provisioner "shell" { - inline = [ - "echo 'Waiting after reboot'" - ] - pause_after = "10s" - except = var.is_windows ? local.source_names : null - } # Run common scripts and guest tools installation provisioner "shell" { environment_vars = local.nix_environment_vars execute_command = local.nix_execute_command expect_disconnect = true pause_before = "10s" + pause_after = "30s" scripts = local.common_scripts except = var.is_windows ? local.source_names : null } - provisioner "shell" { - inline = [ - "echo 'Waiting after reboot'" - ] - pause_after = "10s" - except = var.is_windows ? local.source_names : null - } # Run OS specific scripts provisioner "shell" { environment_vars = local.nix_environment_vars @@ -159,6 +141,7 @@ build { environment_vars = local.nix_environment_vars execute_command = local.nix_execute_command expect_disconnect = true + pause_before = "10s" pause_after = "10s" scripts = ["${path.root}/scripts/_common/minimize.sh", ] except = var.is_windows ? local.source_names : null diff --git a/packer_templates/pkr-sources.pkr.hcl b/packer_templates/pkr-sources.pkr.hcl index b92dfe7b2..b318d93c7 100644 --- a/packer_templates/pkr-sources.pkr.hcl +++ b/packer_templates/pkr-sources.pkr.hcl @@ -3,7 +3,8 @@ data "host-info" "this" {} locals { # helper locals build_dir = abspath("${path.root}/../builds/") - host_os = data.host-info.this.os_type + host_os = try(data.host-info.this.os_type, "unknown") + # Source block provider specific # hyperv-iso hyperv_enable_dynamic_memory = var.hyperv_enable_dynamic_memory == null ? ( @@ -48,16 +49,16 @@ locals { # qemu qemu_accelerator = var.qemu_accelerator == null ? ( - local.host_os == "darwin" ? "hvf" : null + local.host_os == "darwin" ? "hvf" : ( + local.host_os == "windows" ? "whpx" : "kvm" + ) ) : var.qemu_accelerator qemu_binary = var.qemu_binary == null ? "qemu-system-${var.os_arch}" : var.qemu_binary qemu_display = var.qemu_display == null ? ( var.is_windows ? ( var.os_arch == "aarch64" ? "virtio-ramfb-gl" : "virtio-vga-gl" ) : ( - local.host_os == "darwin" ? ( - var.os_arch == "aarch64" ? "cocoa" : "virtio-gpu-pci" - ) : ( + local.host_os == "darwin" ? "cocoa" : ( var.os_arch == "aarch64" ? "virtio-ramfb" : "virtio-vga" ) ) @@ -92,25 +93,19 @@ locals { ["-drive", "file=${abspath(local.iso_target_path)},media=cdrom,index=2"], ["-drive", "file=${local.build_dir}/build_files/packer-${var.os_name}-${var.os_version}-${var.os_arch}-qemu/{{ .Name }},if=virtio,cache=writeback,discard=ignore,format=${var.qemu_format},index=1"], ["-boot", "order=c,order=d"] - ] : ( - var.os_arch == "aarch64" ? [ - ["-device", "virtio-gpu-pci"], - ["-device", "qemu-xhci"], - ["-device", "virtio-tablet"], - ["-device", "driver=virtio-keyboard-pci"], - ["-device", "driver=virtio-mouse-pci"], - ["-device", "driver=usb-kbd"], - ["-device", "driver=usb-mouse"], - ["-device", "virtio-serial"], - ["-chardev", "socket,name=org.qemu.guest_agent.0,id=org.qemu.guest_agent,server=on,wait=off"], - ["-device", "virtserialport,chardev=org.qemu.guest_agent,name=org.qemu.guest_agent.0"], - ["-boot", "strict=off"], - ] : [ - ["-device", "virtio-serial"], - ["-chardev", "socket,name=org.qemu.guest_agent.0,id=org.qemu.guest_agent,server=on,wait=off"], - ["-device", "virtserialport,chardev=org.qemu.guest_agent,name=org.qemu.guest_agent.0"], - ] - ) + ] : [ + ["-device", "virtio-gpu-pci"], + ["-device", "qemu-xhci"], + ["-device", "virtio-tablet"], + ["-device", "driver=virtio-keyboard-pci"], + ["-device", "driver=virtio-mouse-pci"], + ["-device", "driver=usb-kbd"], + ["-device", "driver=usb-mouse"], + ["-device", "virtio-serial"], + ["-chardev", "socket,name=org.qemu.guest_agent.0,id=org.qemu.guest_agent,server=on,wait=off"], + ["-device", "virtserialport,chardev=org.qemu.guest_agent,name=org.qemu.guest_agent.0"], + ["-boot", "strict=off"], + ] ) : var.qemuargs # utm-iso @@ -204,20 +199,39 @@ locals { vmware_network_adapter_type = var.vmware_network_adapter_type == null ? ( var.is_windows && var.os_arch == "aarch64" ? "vmxnet3" : "e1000e" ) : var.vmware_network_adapter_type - vmware_tools_upload_flavor = var.vmware_tools_mode == "upload" && var.vmware_tools_source_path == null ? ( + vmware_tools_mode = var.vmware_tools_mode == null ? ( + var.is_windows ? "attach" : "disable" + ) : var.vmware_tools_mode + vmware_tools_upload_flavor = local.vmware_tools_mode == "upload" && var.vmware_tools_source_path == null ? ( var.vmware_tools_upload_flavor == null ? ( var.is_windows ? "windows" : ( var.os_name == "macos" ? "darwin" : "linux" ) ) : var.vmware_tools_upload_flavor ) : null - vmware_tools_upload_path = var.vmware_tools_mode == "upload" ? ( + vmware_tools_upload_path = local.vmware_tools_mode == "upload" ? ( var.vmware_tools_upload_path == null ? ( var.is_windows ? "c:\\vmware-tools.iso" : "/tmp/vmware-tools.iso" ) : var.vmware_tools_upload_path ) : null - vmware_tools_source_path = var.vmware_tools_mode == "disable" ? null : ( - var.vmware_tools_source_path == null ? null : var.vmware_tools_source_path + vmware_tools_source_path = local.vmware_tools_mode == "disable" ? null : ( + var.vmware_tools_source_path == null ? ( + local.vmware_tools_mode == "attach" || local.vmware_tools_mode == "upload" ? ( + local.host_os == "darwin" ? ( + var.is_windows ? ( + var.os_arch == "aarch64" ? "/Applications/VMware Fusion.app/Contents/Library/isoimages/arm64/windows.iso" : "/Applications/VMware Fusion.app/Contents/Library/isoimages/x86_64/windows.iso" + ) : null + ) : ( + local.host_os == "windows" ? ( + var.is_windows ? "C:\\Program Files (x86)\\VMware\\VMware Workstation\\windows.iso" : + "C:\\Program Files (x86)\\VMware\\VMware Workstation\\linux.iso" + ) : ( + var.is_windows ? "/usr/lib/vmware/isoimages/windows.iso" : + "/usr/lib/vmware/isoimages/linux.iso" + ) + ) + ) : null # upload mode without source_path: let tools_upload_flavor handle it + ) : var.vmware_tools_source_path ) vmware_vmx_data = var.vmware_vmx_data == null ? ( { @@ -277,32 +291,34 @@ source "hyperv-iso" "vm" { guest_additions_mode = var.hyperv_guest_additions_mode switch_name = var.hyperv_switch_name # Source block common options - boot_command = var.hyperv_boot_command == null ? local.default_boot_command : var.hyperv_boot_command - boot_wait = var.hyperv_boot_wait == null ? local.default_boot_wait : var.hyperv_boot_wait - cd_content = var.cd_content - cd_files = local.cd_files - cd_label = var.cd_label - cpus = var.cpus - communicator = local.communicator - disk_size = local.disk_size - floppy_files = var.floppy_files - headless = var.headless - http_directory = local.http_directory - iso_checksum = var.iso_checksum - iso_target_path = local.iso_target_path - iso_url = var.iso_url - memory = local.memory - output_directory = "${local.output_directory}-hyperv" - shutdown_command = local.shutdown_command - shutdown_timeout = var.shutdown_timeout - ssh_password = var.ssh_password - ssh_port = var.ssh_port - ssh_timeout = var.ssh_timeout - ssh_username = var.ssh_username - winrm_password = var.winrm_password - winrm_timeout = var.winrm_timeout - winrm_username = var.winrm_username - vm_name = local.vm_name + boot_command = var.hyperv_boot_command == null ? local.default_boot_command : var.hyperv_boot_command + boot_wait = var.hyperv_boot_wait == null ? local.default_boot_wait : var.hyperv_boot_wait + cd_content = var.cd_content + cd_files = local.cd_files + cd_label = var.cd_label + cpus = var.cpus + communicator = local.communicator + disk_size = local.disk_size + floppy_files = var.floppy_files + headless = var.headless + http_directory = local.http_directory + iso_checksum = var.iso_checksum + iso_target_path = local.iso_target_path + iso_url = var.iso_url + memory = local.memory + output_directory = "${local.output_directory}-hyperv" + pause_before_connecting = var.pause_before_connecting + shutdown_command = local.shutdown_command + shutdown_timeout = var.shutdown_timeout + ssh_password = var.ssh_password + ssh_port = var.ssh_port + ssh_read_write_timeout = var.ssh_read_write_timeout + ssh_timeout = var.ssh_timeout + ssh_username = var.ssh_username + winrm_password = var.winrm_password + winrm_timeout = var.winrm_timeout + winrm_username = var.winrm_username + vm_name = local.vm_name } source "parallels-ipsw" "vm" { # Parallels specific options @@ -314,22 +330,24 @@ source "parallels-ipsw" "vm" { prlctl_post = var.parallels_prlctl_post prlctl_version_file = var.parallels_prlctl_version_file # Source block common options - boot_command = var.parallels-ipsw_boot_command == null ? local.default_boot_command : var.parallels_boot_command - boot_wait = var.parallels_boot_wait == null ? local.default_boot_wait : var.parallels_boot_wait - cpus = var.cpus - communicator = local.communicator - disk_size = local.disk_size - http_directory = local.http_directory - http_content = var.http_content - memory = local.memory - output_directory = "${local.output_directory}-parallels" - shutdown_command = local.shutdown_command - shutdown_timeout = var.shutdown_timeout - ssh_password = var.ssh_password - ssh_port = var.ssh_port - ssh_timeout = var.ssh_timeout - ssh_username = var.ssh_username - vm_name = local.vm_name + boot_command = var.parallels-ipsw_boot_command == null ? local.default_boot_command : var.parallels_boot_command + boot_wait = var.parallels_boot_wait == null ? local.default_boot_wait : var.parallels_boot_wait + cpus = var.cpus + communicator = local.communicator + disk_size = local.disk_size + http_directory = local.http_directory + http_content = var.http_content + memory = local.memory + output_directory = "${local.output_directory}-parallels" + pause_before_connecting = var.pause_before_connecting + shutdown_command = local.shutdown_command + shutdown_timeout = var.shutdown_timeout + ssh_password = var.ssh_password + ssh_port = var.ssh_port + ssh_read_write_timeout = var.ssh_read_write_timeout + ssh_timeout = var.ssh_timeout + ssh_username = var.ssh_username + vm_name = local.vm_name } source "parallels-iso" "vm" { # Parallels specific options @@ -339,31 +357,33 @@ source "parallels-iso" "vm" { prlctl = local.parallels_prlctl prlctl_version_file = var.parallels_prlctl_version_file # Source block common options - boot_command = var.parallels-iso_boot_command == null ? local.default_boot_command : var.parallels_boot_command - boot_wait = var.parallels_boot_wait == null ? local.default_boot_wait : var.parallels_boot_wait - cd_content = var.cd_content - cd_files = local.cd_files - cd_label = var.cd_label - cpus = var.cpus - communicator = local.communicator - disk_size = local.disk_size - floppy_files = var.floppy_files - http_directory = local.http_directory - iso_checksum = var.iso_checksum - iso_target_path = local.iso_target_path - iso_url = var.iso_url - memory = local.memory - output_directory = "${local.output_directory}-parallels" - shutdown_command = local.shutdown_command - shutdown_timeout = var.shutdown_timeout - ssh_password = var.ssh_password - ssh_port = var.ssh_port - ssh_timeout = var.ssh_timeout - ssh_username = var.ssh_username - winrm_password = var.winrm_password - winrm_timeout = var.winrm_timeout - winrm_username = var.winrm_username - vm_name = local.vm_name + boot_command = var.parallels-iso_boot_command == null ? local.default_boot_command : var.parallels_boot_command + boot_wait = var.parallels_boot_wait == null ? local.default_boot_wait : var.parallels_boot_wait + cd_content = var.cd_content + cd_files = local.cd_files + cd_label = var.cd_label + cpus = var.cpus + communicator = local.communicator + disk_size = local.disk_size + floppy_files = var.floppy_files + http_directory = local.http_directory + iso_checksum = var.iso_checksum + iso_target_path = local.iso_target_path + iso_url = var.iso_url + memory = local.memory + output_directory = "${local.output_directory}-parallels" + pause_before_connecting = var.pause_before_connecting + shutdown_command = local.shutdown_command + shutdown_timeout = var.shutdown_timeout + ssh_password = var.ssh_password + ssh_port = var.ssh_port + ssh_read_write_timeout = var.ssh_read_write_timeout + ssh_timeout = var.ssh_timeout + ssh_username = var.ssh_username + winrm_password = var.winrm_password + winrm_timeout = var.winrm_timeout + winrm_username = var.winrm_username + vm_name = local.vm_name } source "qemu" "vm" { # QEMU specific options @@ -388,32 +408,34 @@ source "qemu" "vm" { use_default_display = var.qemu_use_default_display use_pflash = var.qemu_use_pflash # Source block common options - boot_command = var.qemu_boot_command == null ? local.default_boot_command : var.qemu_boot_command - boot_wait = var.qemu_boot_wait == null ? local.default_boot_wait : var.qemu_boot_wait - cd_content = var.cd_content - cd_files = local.cd_files - cd_label = var.cd_label - cpus = var.cpus - communicator = local.communicator - disk_size = local.disk_size - floppy_files = var.floppy_files - headless = var.headless - http_directory = local.http_directory - iso_checksum = var.iso_checksum - iso_target_path = local.iso_target_path - iso_url = var.iso_url - memory = local.memory - output_directory = "${local.output_directory}-qemu" - shutdown_command = local.shutdown_command - shutdown_timeout = var.shutdown_timeout - ssh_password = var.ssh_password - ssh_port = var.ssh_port - ssh_timeout = var.ssh_timeout - ssh_username = var.ssh_username - winrm_password = var.winrm_password - winrm_timeout = var.winrm_timeout - winrm_username = var.winrm_username - vm_name = local.vm_name + boot_command = var.qemu_boot_command == null ? local.default_boot_command : var.qemu_boot_command + boot_wait = var.qemu_boot_wait == null ? local.default_boot_wait : var.qemu_boot_wait + cd_content = var.cd_content + cd_files = local.cd_files + cd_label = var.cd_label + cpus = var.cpus + communicator = local.communicator + disk_size = local.disk_size + floppy_files = var.floppy_files + headless = var.headless + http_directory = local.http_directory + iso_checksum = var.iso_checksum + iso_target_path = local.iso_target_path + iso_url = var.iso_url + memory = local.memory + output_directory = "${local.output_directory}-qemu" + pause_before_connecting = var.pause_before_connecting + shutdown_command = local.shutdown_command + shutdown_timeout = var.shutdown_timeout + ssh_password = var.ssh_password + ssh_port = var.ssh_port + ssh_read_write_timeout = var.ssh_read_write_timeout + ssh_timeout = var.ssh_timeout + ssh_username = var.ssh_username + winrm_password = var.winrm_password + winrm_timeout = var.winrm_timeout + winrm_username = var.winrm_username + vm_name = local.vm_name } source "utm-iso" "vm" { # UTM specific options @@ -436,31 +458,33 @@ source "utm-iso" "vm" { vm_backend = var.utm_vm_backend vm_icon = var.utm_vm_icon # Source block common options - boot_command = local.utm_boot_command - boot_wait = var.utm_boot_wait == null ? local.default_boot_wait : var.utm_boot_wait - cd_content = var.cd_content - cd_files = local.cd_files - cd_label = var.cd_label - cpus = var.cpus - communicator = local.communicator - disk_size = local.disk_size - floppy_files = var.floppy_files - http_directory = local.http_directory - iso_checksum = var.iso_checksum - iso_target_path = local.iso_target_path - iso_url = var.iso_url - memory = local.memory - output_directory = "${local.output_directory}-utm" - shutdown_command = local.shutdown_command - shutdown_timeout = var.shutdown_timeout - ssh_password = var.ssh_password - ssh_port = var.ssh_port - ssh_timeout = var.ssh_timeout - ssh_username = var.ssh_username - winrm_password = var.winrm_password - winrm_timeout = var.winrm_timeout - winrm_username = var.winrm_username - vm_name = local.vm_name + boot_command = local.utm_boot_command + boot_wait = var.utm_boot_wait == null ? local.default_boot_wait : var.utm_boot_wait + cd_content = var.cd_content + cd_files = local.cd_files + cd_label = var.cd_label + cpus = var.cpus + communicator = local.communicator + disk_size = local.disk_size + floppy_files = var.floppy_files + http_directory = local.http_directory + iso_checksum = var.iso_checksum + iso_target_path = local.iso_target_path + iso_url = var.iso_url + memory = local.memory + output_directory = "${local.output_directory}-utm" + pause_before_connecting = var.pause_before_connecting + shutdown_command = local.shutdown_command + shutdown_timeout = var.shutdown_timeout + ssh_password = var.ssh_password + ssh_port = var.ssh_port + ssh_read_write_timeout = var.ssh_read_write_timeout + ssh_timeout = var.ssh_timeout + ssh_username = var.ssh_username + winrm_password = var.winrm_password + winrm_timeout = var.winrm_timeout + winrm_username = var.winrm_username + vm_name = local.vm_name } source "virtualbox-iso" "vm" { # Virtualbox specific options @@ -482,32 +506,34 @@ source "virtualbox-iso" "vm" { vboxmanage = local.vboxmanage virtualbox_version_file = var.virtualbox_version_file # Source block common options - boot_command = var.vbox_boot_command == null ? local.default_boot_command : var.vbox_boot_command - boot_wait = var.vbox_boot_wait == null ? local.default_boot_wait : var.vbox_boot_wait - cd_content = var.cd_content - cd_files = local.cd_files - cd_label = var.cd_label - cpus = var.cpus - communicator = local.communicator - disk_size = local.disk_size - floppy_files = var.floppy_files - headless = var.headless - http_directory = local.http_directory - iso_checksum = var.iso_checksum - iso_target_path = local.iso_target_path - iso_url = var.iso_url - memory = local.memory - output_directory = "${local.output_directory}-virtualbox" - shutdown_command = local.shutdown_command - shutdown_timeout = var.shutdown_timeout - ssh_password = var.ssh_password - ssh_port = var.ssh_port - ssh_timeout = var.ssh_timeout - ssh_username = var.ssh_username - winrm_password = var.winrm_password - winrm_timeout = var.winrm_timeout - winrm_username = var.winrm_username - vm_name = local.vm_name + boot_command = var.vbox_boot_command == null ? local.default_boot_command : var.vbox_boot_command + boot_wait = var.vbox_boot_wait == null ? local.default_boot_wait : var.vbox_boot_wait + cd_content = var.cd_content + cd_files = local.cd_files + cd_label = var.cd_label + cpus = var.cpus + communicator = local.communicator + disk_size = local.disk_size + floppy_files = var.floppy_files + headless = var.headless + http_directory = local.http_directory + iso_checksum = var.iso_checksum + iso_target_path = local.iso_target_path + iso_url = var.iso_url + memory = local.memory + output_directory = "${local.output_directory}-virtualbox" + pause_before_connecting = var.pause_before_connecting + shutdown_command = local.shutdown_command + shutdown_timeout = var.shutdown_timeout + ssh_password = var.ssh_password + ssh_port = var.ssh_port + ssh_read_write_timeout = var.ssh_read_write_timeout + ssh_timeout = var.ssh_timeout + ssh_username = var.ssh_username + winrm_password = var.winrm_password + winrm_timeout = var.winrm_timeout + winrm_username = var.winrm_username + vm_name = local.vm_name } source "virtualbox-ovf" "vm" { # Virtualbox specific options @@ -517,16 +543,18 @@ source "virtualbox-ovf" "vm" { vboxmanage = local.vboxmanage virtualbox_version_file = var.virtualbox_version_file # Source block common options - communicator = local.communicator - headless = var.headless - output_directory = "${local.output_directory}-virtualbox-ovf" - shutdown_command = local.shutdown_command - shutdown_timeout = var.shutdown_timeout - ssh_password = var.ssh_password - ssh_port = var.ssh_port - ssh_timeout = var.ssh_timeout - ssh_username = var.ssh_username - vm_name = local.vm_name + communicator = local.communicator + headless = var.headless + output_directory = "${local.output_directory}-virtualbox-ovf" + pause_before_connecting = var.pause_before_connecting + shutdown_command = local.shutdown_command + shutdown_timeout = var.shutdown_timeout + ssh_password = var.ssh_password + ssh_port = var.ssh_port + ssh_read_write_timeout = var.ssh_read_write_timeout + ssh_timeout = var.ssh_timeout + ssh_username = var.ssh_username + vm_name = local.vm_name } source "vmware-iso" "vm" { # VMware specific options @@ -537,7 +565,7 @@ source "vmware-iso" "vm" { guest_os_type = var.vmware_guest_os_type network = var.vmware_network network_adapter_type = local.vmware_network_adapter_type - tools_mode = var.vmware_tools_mode + tools_mode = local.vmware_tools_mode tools_source_path = local.vmware_tools_source_path tools_upload_flavor = local.vmware_tools_upload_flavor tools_upload_path = local.vmware_tools_upload_path @@ -547,30 +575,32 @@ source "vmware-iso" "vm" { vmx_remove_ethernet_interfaces = var.vmware_vmx_remove_ethernet_interfaces vnc_disable_password = var.vmware_vnc_disable_password # Source block common options - boot_command = var.vmware_boot_command == null ? local.default_boot_command : var.vmware_boot_command - boot_wait = var.vmware_boot_wait == null ? local.default_boot_wait : var.vmware_boot_wait - cd_content = var.cd_content - cd_files = local.cd_files - cd_label = var.cd_label - cpus = var.cpus - communicator = local.communicator - disk_size = local.disk_size - floppy_files = var.floppy_files - headless = var.headless - http_directory = local.http_directory - iso_checksum = var.iso_checksum - iso_target_path = abspath(local.iso_target_path) - iso_url = var.iso_url - memory = local.memory - output_directory = "${local.output_directory}-vmware" - shutdown_command = local.shutdown_command - shutdown_timeout = var.shutdown_timeout - ssh_password = var.ssh_password - ssh_port = var.ssh_port - ssh_timeout = var.ssh_timeout - ssh_username = var.ssh_username - winrm_password = var.winrm_password - winrm_timeout = var.winrm_timeout - winrm_username = var.winrm_username - vm_name = local.vm_name + boot_command = var.vmware_boot_command == null ? local.default_boot_command : var.vmware_boot_command + boot_wait = var.vmware_boot_wait == null ? local.default_boot_wait : var.vmware_boot_wait + cd_content = var.cd_content + cd_files = local.cd_files + cd_label = var.cd_label + cpus = var.cpus + communicator = local.communicator + disk_size = local.disk_size + floppy_files = var.floppy_files + headless = var.headless + http_directory = local.http_directory + iso_checksum = var.iso_checksum + iso_target_path = abspath(local.iso_target_path) + iso_url = var.iso_url + memory = local.memory + output_directory = "${local.output_directory}-vmware" + pause_before_connecting = var.pause_before_connecting + shutdown_command = local.shutdown_command + shutdown_timeout = var.shutdown_timeout + ssh_password = var.ssh_password + ssh_port = var.ssh_port + ssh_read_write_timeout = var.ssh_read_write_timeout + ssh_timeout = var.ssh_timeout + ssh_username = var.ssh_username + winrm_password = var.winrm_password + winrm_timeout = var.winrm_timeout + winrm_username = var.winrm_username + vm_name = local.vm_name } diff --git a/packer_templates/pkr-variables.pkr.hcl b/packer_templates/pkr-variables.pkr.hcl index 635e3f077..4069c1acf 100644 --- a/packer_templates/pkr-variables.pkr.hcl +++ b/packer_templates/pkr-variables.pkr.hcl @@ -469,8 +469,8 @@ variable "vmware_guest_os_type" { } variable "vmware_tools_mode" { type = string - default = "attach" - description = "How to handle VMware Tools. Options: 'attach' (default, best performance), 'upload', or 'disable'" + default = null + description = "How to handle VMware Tools. Options: 'attach', 'upload', or 'disable'" } variable "vmware_tools_source_path" { type = string @@ -548,6 +548,10 @@ variable "communicator" { type = string default = null } +variable "pause_before_connecting" { + type = string + default = null +} variable "disk_size" { type = number default = null @@ -604,6 +608,10 @@ variable "ssh_port" { type = number default = 22 } +variable "ssh_read_write_timeout" { + type = string + default = "30s" +} variable "ssh_timeout" { type = string default = "15m" diff --git a/packer_templates/scripts/windows/remove-apps.ps1 b/packer_templates/scripts/windows/remove-apps.ps1 index b784d01ed..86a9a0533 100644 --- a/packer_templates/scripts/windows/remove-apps.ps1 +++ b/packer_templates/scripts/windows/remove-apps.ps1 @@ -78,6 +78,7 @@ Get-AppXProvisionedPackage -Online | ForEach-Object { 'Microsoft.MSPaint' 'Microsoft.Office.OneNote' 'Microsoft.OneDriveSync' + 'Microsoft.Outlook' 'Microsoft.Paint' 'Microsoft.People' 'Microsoft.PowerAutomateDesktop' diff --git a/spec/bento/buildmetadata_spec.rb b/spec/bento/buildmetadata_spec.rb new file mode 100644 index 000000000..bbccfc53d --- /dev/null +++ b/spec/bento/buildmetadata_spec.rb @@ -0,0 +1,122 @@ +# frozen_string_literal: true + +require 'bento/buildmetadata' + +RSpec.describe BuildMetadata do + let(:template) { 'ubuntu-24.04-x86_64' } + let(:build_timestamp) { '20260601120000' } + let(:override_version) { '202506.01.0' } + let(:pkr_cmd) { 'packer build ...' } + + let(:pkrvars_content) do + <<~HCL + os_name = "ubuntu" + os_version = "24.04" + arch = "x86_64" + name = "ubuntu" + HCL + end + + subject(:metadata) { described_class.new(template, build_timestamp, override_version, pkr_cmd) } + + before do + allow(metadata).to receive(:git_revision).and_return('abc123') + allow(metadata).to receive(:git_clean?).and_return(true) + allow(metadata).to receive(:packer_ver).and_return('1.9.0') + allow(metadata).to receive(:vagrant_ver).and_return('2.4.1') + end + + describe '#read' do + context 'with a valid pkrvars.hcl file' do + around do |example| + Dir.mktmpdir do |dir| + Dir.chdir(dir) do + File.write("#{template}.pkrvars.hcl", pkrvars_content) + example.run + end + end + end + + it 'returns a hash with all required keys' do + result = metadata.read + expect(result).to include( + :name, :version, :arch, :build_timestamp, :packer_command, + :git_revision, :git_status, :box_basename, :template, :packer, :vagrant + ) + end + + it 'uses the override_version' do + expect(metadata.read[:version]).to eq(override_version) + end + + it 'sets git_status to clean when repo is clean' do + expect(metadata.read[:git_status]).to eq('clean') + end + + it 'sets git_status to dirty when repo has changes' do + allow(metadata).to receive(:git_clean?).and_return(false) + expect(metadata.read[:git_status]).to eq('dirty') + end + + it 'sets the packer_command' do + expect(metadata.read[:packer_command]).to eq(pkr_cmd) + end + + it 'sets the build_timestamp' do + expect(metadata.read[:build_timestamp]).to eq(build_timestamp) + end + + it 'derives box_basename from name' do + result = metadata.read + expect(result[:box_basename]).to be_a(String) + expect(result[:box_basename]).not_to be_empty + end + end + + context 'when override_version is nil' do + subject(:metadata) { described_class.new(template, build_timestamp, nil, pkr_cmd) } + + around do |example| + Dir.mktmpdir do |dir| + Dir.chdir(dir) do + File.write("#{template}.pkrvars.hcl", pkrvars_content) + example.run + end + end + end + + it 'falls back to a version derived from build_timestamp' do + result = metadata.read + expect(result[:version]).to include(build_timestamp) + end + end + end + + describe 'box_basename' do + around do |example| + Dir.mktmpdir do |dir| + Dir.chdir(dir) do + File.write("#{template}.pkrvars.hcl", pkrvars_content) + example.run + end + end + end + + it 'replaces slashes with double underscores' do + content = <<~HCL + name = "my/box" + os_version = "1.0" + arch = "x86_64" + HCL + Dir.mktmpdir do |dir| + Dir.chdir(dir) do + t = 'my-box-x86_64' + File.write("#{t}.pkrvars.hcl", content) + m = described_class.new(t, build_timestamp, override_version, pkr_cmd) + allow(m).to receive_messages(git_revision: 'abc', git_clean?: true, packer_ver: '1.9', vagrant_ver: '2.4') + expect(m.read[:box_basename]).to include('__') + end + end + end + end +end diff --git a/spec/bento/common_spec.rb b/spec/bento/common_spec.rb new file mode 100644 index 000000000..6f6f0ff6b --- /dev/null +++ b/spec/bento/common_spec.rb @@ -0,0 +1,95 @@ +# frozen_string_literal: true + +require 'bento/common' + +# Concrete class to mix the module into for testing +class CommonHost + include Common +end + +RSpec.describe Common do + subject(:host) { CommonHost.new } + + describe '#banner' do + it 'prints a banner-prefixed message to stdout' do + expect { host.banner('hello') }.to output("==> hello\n").to_stdout + end + end + + describe '#info' do + it 'prints an indented message to stdout' do + expect { host.info('detail') }.to output(" detail\n").to_stdout + end + end + + describe '#warn' do + it 'prints a warn-prefixed message to stdout' do + expect { host.warn('caution') }.to output(">>> caution\n").to_stdout + end + end + + describe '#duration' do + it 'formats seconds under a minute' do + expect(host.duration(45.5)).to eq('0m45.50s') + end + + it 'formats seconds spanning multiple minutes' do + expect(host.duration(125.0)).to eq('2m5.00s') + end + + it 'handles nil gracefully by treating it as zero' do + expect(host.duration(nil)).to eq('0m0.00s') + end + end + + describe '#box_metadata' do + it 'parses a JSON file into a hash' do + Dir.mktmpdir do |dir| + path = File.join(dir, 'test._metadata.json') + data = { 'name' => 'ubuntu-24.04', 'version' => '1.0' } + File.write(path, JSON.generate(data)) + expect(host.box_metadata(path)).to eq(data) + end + end + end + + describe '#metadata_files' do + it 'globs build_complete directory for metadata files' do + Dir.mktmpdir do |dir| + Dir.chdir(dir) do + FileUtils.mkdir_p('builds/build_complete') + File.write('builds/build_complete/ubuntu-24.04-x86_64._metadata.json', '{}') + File.write('builds/build_complete/other.txt', 'not json') + files = host.metadata_files(false) + expect(files.length).to eq(1) + expect(files.first).to include('_metadata.json') + end + end + end + + it 'globs testing_passed directory when upload flag is true' do + Dir.mktmpdir do |dir| + Dir.chdir(dir) do + arch = RbConfig::CONFIG['host_cpu'] == 'arm64' ? 'aarch64' : RbConfig::CONFIG['host_cpu'] + FileUtils.mkdir_p("builds/testing_passed/#{arch}") + File.write("builds/testing_passed/#{arch}/ubuntu-24.04-#{arch}._metadata.json", '{}') + files = host.metadata_files(true, true) + expect(files.length).to eq(1) + end + end + end + end + + describe '#builds_yml' do + it 'parses builds.yml from the current directory' do + Dir.mktmpdir do |dir| + Dir.chdir(dir) do + File.write('builds.yml', "vagrant_cloud_account: bento\npublic:\n - ubuntu\n") + result = host.builds_yml + expect(result['vagrant_cloud_account']).to eq('bento') + expect(result['public']).to include('ubuntu') + end + end + end + end +end diff --git a/spec/bento/packerexec_spec.rb b/spec/bento/packerexec_spec.rb new file mode 100644 index 000000000..f095fe36f --- /dev/null +++ b/spec/bento/packerexec_spec.rb @@ -0,0 +1,92 @@ +# frozen_string_literal: true + +require 'bento/packerexec' +require 'bento/buildmetadata' +require 'bento/common' + +class PackerExecHost + include Common + include PackerExec + + attr_reader :build_timestamp, :override_version, :pkr_cmd + + def initialize + @build_timestamp = '20260601120000' + @override_version = '202506.01.0' + @pkr_cmd = nil + end +end + +RSpec.describe PackerExec do + subject(:host) { PackerExecHost.new } + + let(:template) { 'ubuntu-24.04-x86_64' } + + let(:pkrvars_content) do + <<~HCL + os_name = "ubuntu" + os_version = "24.04" + arch = "x86_64" + name = "ubuntu" + HCL + end + + before do + # Stub external tool calls used by BuildMetadata + allow_any_instance_of(BuildMetadata).to receive(:git_revision).and_return('deadbeef') + allow_any_instance_of(BuildMetadata).to receive(:git_clean?).and_return(true) + allow_any_instance_of(BuildMetadata).to receive(:packer_ver).and_return('1.9.0') + allow_any_instance_of(BuildMetadata).to receive(:vagrant_ver).and_return('2.4.1') + end + + describe '#for_packer_run_with' do + it 'yields two Tempfile objects' do + Dir.mktmpdir do |dir| + Dir.chdir(dir) do + File.write("#{template}.pkrvars.hcl", pkrvars_content) + host.for_packer_run_with(template) do |md_file, var_file| + expect(md_file).to respond_to(:path) + expect(var_file).to respond_to(:path) + end + end + end + end + end + + describe '#write_box_metadata' do + it 'writes valid JSON to the file path' do + Dir.mktmpdir do |dir| + Dir.chdir(dir) do + File.write("#{template}.pkrvars.hcl", pkrvars_content) + Tempfile.open('test-md') do |f| + path = f.path + host.write_box_metadata(template, f) + # write_box_metadata closes the file; read via path + data = JSON.parse(File.read(path)) + expect(data).to include('name', 'version', 'arch') + end + end + end + end + end + + describe '#write_var_file' do + it 'writes valid JSON with box_basename and version' do + Dir.mktmpdir do |dir| + Dir.chdir(dir) do + File.write("#{template}.pkrvars.hcl", pkrvars_content) + Tempfile.open('test-md') do |md_file| + host.write_box_metadata(template, md_file) + md_file.path + Tempfile.open('test-var') do |var_file| + var_path = var_file.path + host.write_var_file(template, md_file, var_file) + data = JSON.parse(File.read(var_path)) + expect(data).to include('box_basename', 'version', 'build_timestamp', 'git_revision', 'metadata') + end + end + end + end + end + end +end diff --git a/spec/bento/providermetadata_spec.rb b/spec/bento/providermetadata_spec.rb new file mode 100644 index 000000000..04ca2b2ed --- /dev/null +++ b/spec/bento/providermetadata_spec.rb @@ -0,0 +1,99 @@ +# frozen_string_literal: true + +require 'bento/providermetadata' + +RSpec.describe ProviderMetadata do + let(:tmpdir) { Dir.mktmpdir } + let(:box_basename) { 'ubuntu-24.04-x86_64' } + + subject(:provider_meta) { described_class.new(tmpdir, box_basename) } + + after { FileUtils.rm_rf(tmpdir) } + + describe '#read' do + context 'with no box files present' do + it 'returns an empty array' do + expect(provider_meta.read).to eq([]) + end + end + + context 'with a single virtualbox box file' do + let(:box_file) { File.join(tmpdir, "#{box_basename}.virtualbox.box") } + + before do + File.write(box_file, 'fake box content') + allow(provider_meta).to receive(:version).with('virtualbox').and_return('7.1.0') + end + + it 'returns one provider entry' do + result = provider_meta.read + expect(result.length).to eq(1) + end + + it 'sets the provider name to virtualbox' do + expect(provider_meta.read.first[:name]).to eq('virtualbox') + end + + it 'sets the file to just the basename' do + expect(provider_meta.read.first[:file]).to eq(File.basename(box_file)) + end + + it 'sets checksum_type to sha256' do + expect(provider_meta.read.first[:checksum_type]).to eq('sha256') + end + + it 'calculates a sha256 checksum' do + result = provider_meta.read.first + expected = Digest::SHA256.file(box_file).hexdigest + expect(result[:checksum]).to eq(expected) + end + + it 'reports size in MB' do + expect(provider_meta.read.first[:size]).to match(/\d+ MB/) + end + end + + context 'with a vmware box file' do + let(:box_file) { File.join(tmpdir, "#{box_basename}.vmware.box") } + + before do + File.write(box_file, 'fake vmware box') + allow(provider_meta).to receive(:version).with('vmware_desktop').and_return('13.0') + end + + it 'maps vmware to vmware_desktop provider name' do + result = provider_meta.read + expect(result.first[:name]).to eq('vmware_desktop') + end + end + + context 'with a libvirt box file' do + let(:libvirt_file) { File.join(tmpdir, "#{box_basename}.libvirt.box") } + + before do + File.write(libvirt_file, 'fake libvirt box') + allow(provider_meta).to receive(:version).and_return('9.0') + end + + it 'copies libvirt box to a qemu box' do + provider_meta.read + expect(File.exist?(File.join(tmpdir, "#{box_basename}.qemu.box"))).to be true + end + + it 'includes both libvirt and qemu in providers' do + result = provider_meta.read + names = result.map { |p| p[:name] } + expect(names).to include('libvirt', 'qemu') + end + end + end + + describe 'provider_from_file (via read)' do + it 'extracts the provider name between the last two dots' do + File.write(File.join(tmpdir, "#{box_basename}.parallels.box"), 'x') + allow(provider_meta).to receive(:version).and_return('20.0') + result = provider_meta.read + expect(result.first[:name]).to eq('parallels') + end + end +end diff --git a/spec/bento/runner_spec.rb b/spec/bento/runner_spec.rb new file mode 100644 index 000000000..203c8d063 --- /dev/null +++ b/spec/bento/runner_spec.rb @@ -0,0 +1,112 @@ +# frozen_string_literal: true + +require 'bento/runner' + +RSpec.describe BuildRunner do + let(:template_file) { 'os_pkrvars/ubuntu/ubuntu-24.04-x86_64' } + let(:opts) { build_opts(template_files: [template_file], override_version: '202506.01.0') } + + subject(:runner) { described_class.new(opts) } + + describe '#initialize' do + it 'stores template_files' do + expect(runner.template_files).to eq([template_file]) + end + + it 'starts with empty errors' do + expect(runner.errors).to be_empty + end + + it 'generates a build_timestamp at construction time' do + expect(runner.build_timestamp).to match(/\A\d{14}\z/) + end + + it 'splits vars string into an array' do + r = described_class.new(build_opts(template_files: [], vars: 'boot_wait="2s",ssh_timeout="5s"')) + expect(r.vars).to eq(['boot_wait="2s"', 'ssh_timeout="5s"']) + end + + it 'splits var_files string into an array' do + r = described_class.new(build_opts(template_files: [], var_files: '/a/b.hcl,/c/d.hcl')) + expect(r.var_files).to eq(['/a/b.hcl', '/c/d.hcl']) + end + + it 'defaults vars to nil when not provided' do + expect(runner.vars).to be_nil + end + end + + describe '#packer_build_cmd (private)' do + subject { runner.send(:packer_build_cmd, template_file, nil) } + + it 'includes packer build' do + expect(subject.first).to eq('packer') + expect(subject).to include('build') + end + + it 'includes the -force flag' do + expect(subject).to include('-force') + end + + it 'prepends echo for dry runs' do + r = described_class.new(build_opts(template_files: [template_file], dry_run: true)) + expect(r.send(:packer_build_cmd, template_file, nil).first).to eq('echo') + end + + it 'prepends echo for metadata_only' do + r = described_class.new(build_opts(template_files: [template_file], metadata_only: true)) + expect(r.send(:packer_build_cmd, template_file, nil).first).to eq('echo') + end + + it 'inserts -only when provided' do + r = described_class.new(build_opts(template_files: [template_file], only: 'virtualbox-iso.vm')) + cmd = r.send(:packer_build_cmd, template_file, nil) + expect(cmd.join(' ')).to include('-only=virtualbox-iso.vm') + end + + it 'inserts -except when provided' do + r = described_class.new(build_opts(template_files: [template_file], except: 'parallels-iso')) + cmd = r.send(:packer_build_cmd, template_file, nil) + expect(cmd.join(' ')).to include('-except=parallels-iso') + end + + it 'inserts -debug when debug flag is set' do + r = described_class.new(build_opts(template_files: [template_file], debug: true)) + expect(r.send(:packer_build_cmd, template_file, nil)).to include('-debug') + end + + it 'inserts -parallel=false when single is set' do + r = described_class.new(build_opts(template_files: [template_file], single: true)) + expect(r.send(:packer_build_cmd, template_file, nil)).to include('-parallel=false') + end + + it 'inserts cpus var when specified' do + r = described_class.new(build_opts(template_files: [template_file], cpus: '4')) + expect(r.send(:packer_build_cmd, template_file, nil).join(' ')).to include('-var cpus=4') + end + + it 'inserts memory var when specified' do + r = described_class.new(build_opts(template_files: [template_file], mem: '4096')) + expect(r.send(:packer_build_cmd, template_file, nil).join(' ')).to include('-var memory=4096') + end + + it 'inserts headless=false when headed flag is set' do + r = described_class.new(build_opts(template_files: [template_file], headed: true)) + expect(r.send(:packer_build_cmd, template_file, nil).join(' ')).to include('-var headless=false') + end + end + + describe '#start' do + it 'raises with failed templates when builds fail' do + allow(runner).to receive(:shellout) + allow(runner).to receive(:build) { runner.errors << template_file } + expect { runner.start }.to raise_error(RuntimeError, /Failed Builds/) + end + + it 'completes without raising when all builds succeed' do + allow(runner).to receive(:shellout) + allow(runner).to receive(:build) + expect { runner.start }.not_to raise_error + end + end +end diff --git a/spec/bento/test_spec.rb b/spec/bento/test_spec.rb new file mode 100644 index 000000000..e14a6afe8 --- /dev/null +++ b/spec/bento/test_spec.rb @@ -0,0 +1,300 @@ +# frozen_string_literal: true + +require 'kitchen' +require 'bento/test' + +RSpec.describe TestRunner do + let(:opts) { build_opts } + + subject(:runner) { described_class.new(opts) } + + # ── constructor ──────────────────────────────────────────────────────────── + + describe '#initialize' do + it 'sets provisioner to shell when nil' do + expect(runner.provisioner).to eq('shell') + end + + it 'uses a provided provisioner' do + r = described_class.new(build_opts(provisioner: 'chef_zero')) + expect(r.provisioner).to eq('chef_zero') + end + + it 'starts with an empty errors array' do + expect(runner.errors).to be_empty + end + + it 'sets regx to nil when not provided' do + expect(runner.regx).to be_nil + end + + it 'stores the provided regx' do + r = described_class.new(build_opts(regx: 'ubuntu-24')) + expect(r.regx).to eq('ubuntu-24') + end + end + + # ── update_metadata_file (private helper) ────────────────────────────────── + + describe '#update_metadata_file (via send)' do + let(:base_md) do + { + 'name' => 'ubuntu-24.04', 'arch' => 'x86_64', + 'providers' => [ + { 'name' => 'virtualbox', 'file' => 'ubuntu-24.04-x86_64.virtualbox.box', 'testing' => 'passed' }, + ] + } + end + + it 'creates a new file with only the given provider (not all base_md providers)' do + Dir.mktmpdir do |dir| + path = File.join(dir, 'test._metadata.json') + new_provider = { 'name' => 'vmware_desktop', 'file' => 'ubuntu-24.04-x86_64.vmware.box', 'testing' => 'passed' } + runner.send(:update_metadata_file, path, base_md, new_provider) + written = JSON.parse(File.read(path)) + expect(written['providers'].map { |p| p['name'] }).to eq(['vmware_desktop']) + end + end + + it 'creates a new file when it does not exist' do + Dir.mktmpdir do |dir| + path = File.join(dir, 'test._metadata.json') + new_provider = { 'name' => 'vmware_desktop', 'file' => 'ubuntu-24.04-x86_64.vmware.box', 'testing' => 'passed' } + runner.send(:update_metadata_file, path, base_md, new_provider) + written = JSON.parse(File.read(path)) + expect(written['providers'].map { |p| p['name'] }).to include('vmware_desktop') + end + end + + it 'appends a new provider to an existing file without removing others' do + Dir.mktmpdir do |dir| + path = File.join(dir, 'test._metadata.json') + File.write(path, JSON.generate(base_md)) + new_provider = { 'name' => 'parallels', 'file' => 'ubuntu-24.04-x86_64.parallels.box', 'testing' => 'passed' } + runner.send(:update_metadata_file, path, base_md, new_provider) + written = JSON.parse(File.read(path)) + names = written['providers'].map { |p| p['name'] } + expect(names).to include('virtualbox', 'parallels') + end + end + + it 'replaces an existing provider entry with the same name' do + Dir.mktmpdir do |dir| + path = File.join(dir, 'test._metadata.json') + File.write(path, JSON.generate(base_md)) + updated_provider = { 'name' => 'virtualbox', 'file' => 'ubuntu-24.04-x86_64.virtualbox.box', 'testing' => 'passed (retry)' } + runner.send(:update_metadata_file, path, base_md, updated_provider) + written = JSON.parse(File.read(path)) + vbox_entries = written['providers'].select { |p| p['name'] == 'virtualbox' } + expect(vbox_entries.length).to eq(1) + expect(vbox_entries.first['testing']).to eq('passed (retry)') + end + end + + it 'does not duplicate providers across multiple calls' do + Dir.mktmpdir do |dir| + path = File.join(dir, 'test._metadata.json') + provider = { 'name' => 'virtualbox', 'file' => 'f.box', 'testing' => 'passed' } + runner.send(:update_metadata_file, path, base_md, provider) + runner.send(:update_metadata_file, path, base_md, provider) + written = JSON.parse(File.read(path)) + expect(written['providers'].count { |p| p['name'] == 'virtualbox' }).to eq(1) + end + end + end + + # ── remove_from_build_complete (private helper) ─────────────────────────── + + describe '#remove_from_build_complete (via send)' do + let(:bc_md) do + { + 'name' => 'ubuntu-2404', 'arch' => 'x86_64', + 'providers' => [ + { 'name' => 'virtualbox', 'file' => 'ubuntu-2404-x86_64.virtualbox.box' }, + { 'name' => 'parallels', 'file' => 'ubuntu-2404-x86_64.parallels.box' }, + ] + } + end + + it 'removes the named provider and rewrites the file' do + Dir.mktmpdir do |dir| + path = File.join(dir, 'ubuntu-2404-x86_64._metadata.json') + File.write(path, JSON.generate(bc_md)) + runner.send(:remove_from_build_complete, dir, 'ubuntu-2404-x86_64._metadata.json', 'virtualbox') + data = JSON.parse(File.read(path)) + expect(data['providers'].map { |p| p['name'] }).to eq(['parallels']) + end + end + + it 'deletes the metadata file when the last provider is removed' do + Dir.mktmpdir do |dir| + single_provider_md = bc_md.merge('providers' => [{ 'name' => 'virtualbox', 'file' => 'f.box' }]) + path = File.join(dir, 'ubuntu-2404-x86_64._metadata.json') + File.write(path, JSON.generate(single_provider_md)) + runner.send(:remove_from_build_complete, dir, 'ubuntu-2404-x86_64._metadata.json', 'virtualbox') + expect(File.exist?(path)).to be false + end + end + + it 'does nothing when the metadata file does not exist' do + Dir.mktmpdir do |dir| + expect { runner.send(:remove_from_build_complete, dir, 'missing._metadata.json', 'virtualbox') }.not_to raise_error + end + end + end + + # ── start ────────────────────────────────────────────────────────────────── + + describe '#start' do + it 'raises with a list of failed files when errors exist' do + allow(runner).to receive(:metadata_files).and_return(['fake._metadata.json']) + allow(runner).to receive(:test_box) { runner.errors << 'fake.box' } + expect { runner.start }.to raise_error(RuntimeError, /fake\.box/) + end + + it 'completes without raising when all tests pass' do + allow(runner).to receive(:metadata_files).and_return([]) + expect { runner.start }.not_to raise_error + end + end + + # ── test_box integration (light smoke) ──────────────────────────────────── + + describe '#test_box' do + let(:md) do + { + 'name' => 'ubuntu-2404', + 'arch' => 'x86_64', + 'providers' => [{ 'name' => 'virtualbox', 'file' => 'ubuntu-2404-x86_64.virtualbox.box' }], + } + end + + it 'skips an instance that does not exist in kitchen config' do + Dir.mktmpdir do |dir| + # md_json must be a relative path (as returned by metadata_files) + md_rel = 'ubuntu-2404-x86_64._metadata.json' + File.write(File.join(dir, md_rel), JSON.generate(md)) + + build_complete_dir = File.join(dir, 'builds', 'build_complete') + FileUtils.mkdir_p(build_complete_dir) + + Dir.chdir(dir) do + mock_config = instance_double(Kitchen::Config) + mock_collection = double('Kitchen::Collection') + allow(Kitchen::Config).to receive(:new).and_return(mock_config) + allow(mock_config).to receive(:instances).and_return(mock_collection) + allow(mock_collection).to receive(:get).and_return(nil) + allow(mock_collection).to receive(:each) + + expect { runner.send(:test_box, md_rel) }.not_to raise_error + expect(runner.errors).to be_empty + end + end + end + + it 'records a passing provider in the testing_passed metadata' do + Dir.mktmpdir do |dir| + md_rel = 'ubuntu-2404-x86_64._metadata.json' + File.write(File.join(dir, md_rel), JSON.generate(md)) + + build_complete_dir = File.join(dir, 'builds', 'build_complete') + FileUtils.mkdir_p(build_complete_dir) + File.write(File.join(build_complete_dir, 'ubuntu-2404-x86_64.virtualbox.box'), 'fake') + + Dir.chdir(dir) do + mock_instance = instance_double(Kitchen::Instance) + mock_config = instance_double(Kitchen::Config) + mock_collection = double('Kitchen::Collection') + + allow(Kitchen::Config).to receive(:new).and_return(mock_config) + allow(mock_config).to receive(:instances).and_return(mock_collection) + allow(mock_collection).to receive(:get).and_return(mock_instance) + allow(mock_instance).to receive(:test) + allow(mock_collection).to receive(:each) + + runner.send(:test_box, md_rel) + + passed_dir = File.join(dir, 'builds', 'testing_passed', 'x86_64') + passed_md = File.join(passed_dir, md_rel) + expect(File.exist?(passed_md)).to be true + data = JSON.parse(File.read(passed_md)) + expect(data['providers'].length).to eq(1) + expect(data['providers'].first['testing']).to eq('passed') + # Build-complete metadata should be removed (only provider was tested) + expect(File.exist?(File.join(build_complete_dir, md_rel))).to be false + end + end + end + + it 'records a failing provider in the testing_failed metadata' do + Dir.mktmpdir do |dir| + md_rel = 'ubuntu-2404-x86_64._metadata.json' + File.write(File.join(dir, md_rel), JSON.generate(md)) + + build_complete_dir = File.join(dir, 'builds', 'build_complete') + FileUtils.mkdir_p(build_complete_dir) + File.write(File.join(build_complete_dir, 'ubuntu-2404-x86_64.virtualbox.box'), 'fake') + + Dir.chdir(dir) do + mock_instance = instance_double(Kitchen::Instance) + mock_config = instance_double(Kitchen::Config) + mock_collection = double('Kitchen::Collection') + + allow(Kitchen::Config).to receive(:new).and_return(mock_config) + allow(mock_config).to receive(:instances).and_return(mock_collection) + allow(mock_collection).to receive(:get).and_return(mock_instance) + allow(mock_instance).to receive(:test).and_raise(Kitchen::ActionFailed, 'something went wrong') + allow(mock_collection).to receive(:each) + + runner.send(:test_box, md_rel) + + failed_dir = File.join(dir, 'builds', 'testing_failed', 'x86_64') + failed_md = File.join(failed_dir, md_rel) + expect(File.exist?(failed_md)).to be true + data = JSON.parse(File.read(failed_md)) + expect(data['providers'].length).to eq(1) + expect(data['providers'].first['testing']).to include('failed') + expect(runner.errors).to include('ubuntu-2404-x86_64.virtualbox.box') + # Build-complete metadata should be removed (only provider was tested) + expect(File.exist?(File.join(build_complete_dir, md_rel))).to be false + end + end + end + + it 'removes the provider from the failed metadata when it subsequently passes' do + Dir.mktmpdir do |dir| + arch = 'x86_64' + md_rel = "ubuntu-2404-#{arch}._metadata.json" + File.write(File.join(dir, md_rel), JSON.generate(md)) + + build_complete_dir = File.join(dir, 'builds', 'build_complete') + FileUtils.mkdir_p(build_complete_dir) + File.write(File.join(build_complete_dir, "ubuntu-2404-#{arch}.virtualbox.box"), 'fake') + + # Pre-populate a failed metadata entry + failed_dir = File.join(dir, 'builds', 'testing_failed', arch) + FileUtils.mkdir_p(failed_dir) + failed_md_path = File.join(failed_dir, md_rel) + failed_md_data = md.merge('providers' => [{ 'name' => 'virtualbox', 'file' => "ubuntu-2404-#{arch}.virtualbox.box", 'testing' => 'failed: old error' }]) + File.write(failed_md_path, JSON.generate(failed_md_data)) + + Dir.chdir(dir) do + mock_instance = instance_double(Kitchen::Instance) + mock_config = instance_double(Kitchen::Config) + mock_collection = double('Kitchen::Collection') + + allow(Kitchen::Config).to receive(:new).and_return(mock_config) + allow(mock_config).to receive(:instances).and_return(mock_collection) + allow(mock_collection).to receive(:get).and_return(mock_instance) + allow(mock_instance).to receive(:test) + allow(mock_collection).to receive(:each) + + runner.send(:test_box, md_rel) + + # Failed metadata should be gone (provider list empty → file deleted) + expect(File.exist?(failed_md_path)).to be false + end + end + end + end +end diff --git a/spec/bento/upload_spec.rb b/spec/bento/upload_spec.rb new file mode 100644 index 000000000..ec966ea7d --- /dev/null +++ b/spec/bento/upload_spec.rb @@ -0,0 +1,151 @@ +# frozen_string_literal: true + +require 'bento/upload' + +RSpec.describe UploadRunner do + let(:opts) { build_opts(md_json: nil) } + + subject(:runner) { described_class.new(opts) } + + # ── helpers ──────────────────────────────────────────────────────────────── + + describe '#box_desc' do + it 'returns a description containing the box name with hyphens replaced by spaces' do + expect(runner.box_desc('ubuntu-24.04')).to include('Ubuntu 24.04') + end + + it 'capitalizes the first character of the formatted name' do + desc = runner.box_desc('debian-12') + expect(desc).to include('Debian 12') + end + end + + describe '#slug_desc' do + it 'mentions the slug name in the description' do + expect(runner.slug_desc('ubuntu-lts')).to include('Ubuntu lts') + end + + it 'mentions the box will be updated with latest releases' do + expect(runner.slug_desc('debian-latest')).to include('latest releases') + end + end + + describe '#ver_desc' do + let(:md_data) do + { + 'box_basename' => 'ubuntu-24.04-x86_64', + 'version' => '202506.01.0', + 'packer' => '1.9.0', + 'vagrant' => '2.4.1', + 'providers' => [ + { 'name' => 'virtualbox', 'version' => '7.1.0' }, + { 'name' => 'vmware_desktop', 'version' => '13.0' }, + ], + } + end + + it 'includes the box version' do + expect(runner.ver_desc(md_data)).to include('202506.01.0') + end + + it 'includes the packer version' do + expect(runner.ver_desc(md_data)).to include('packer: 1.9.0') + end + + it 'includes the vagrant version' do + expect(runner.ver_desc(md_data)).to include('vagrant: 2.4.1') + end + + it 'labels vmware_desktop as vmware-fusion on macOS' do + allow(runner).to receive(:macos?).and_return(true) + expect(runner.ver_desc(md_data)).to include('vmware-fusion') + end + + it 'labels vmware_desktop as vmware-workstation on non-macOS' do + allow(runner).to receive(:macos?).and_return(false) + expect(runner.ver_desc(md_data)).to include('vmware-workstation') + end + end + + describe '#public_private_box' do + let(:builds_data) { { 'public' => %w(ubuntu debian), 'vagrant_cloud_account' => 'bento', 'slugs' => [], 'default_architectures' => [] } } + + before { allow(runner).to receive(:builds_yml).and_return(builds_data) } + + it 'returns --no-private for a box with a public prefix' do + expect(runner.public_private_box('ubuntu-24.04')).to eq('--no-private') + end + + it 'returns --private for an unlisted box' do + expect(runner.public_private_box('rhel-9')).to eq('--private') + end + end + + describe '#default_arch' do + let(:builds_data) { { 'default_architectures' => ['amd64'], 'public' => [], 'slugs' => [], 'vagrant_cloud_account' => 'bento' } } + + before { allow(runner).to receive(:builds_yml).and_return(builds_data) } + + it 'returns --default-architecture when arch matches a default' do + expect(runner.default_arch('amd64')).to eq('--default-architecture') + end + + it 'returns --no-default-architecture when arch is not a default' do + expect(runner.default_arch('arm64')).to eq('--no-default-architecture') + end + end + + describe '#lookup_slug' do + let(:builds_data) do + { + 'slugs' => %w(ubuntu debian-latest), + 'public' => [], + 'default_architectures' => [], + 'vagrant_cloud_account' => 'bento', + } + end + + before do + allow(runner).to receive(:builds_yml).and_return(builds_data) + allow(Dir).to receive(:glob).and_return([]) + end + + it 'returns the slug when box name starts with it' do + expect(runner.lookup_slug('ubuntu-24.04')).to eq('ubuntu') + end + + it 'returns nil when no slug matches' do + allow(runner).to receive(:builds_yml).and_return(builds_data) + allow(Dir).to receive(:glob).and_return([]) + expect(runner.lookup_slug('windows-2022')).to be_nil + end + end + + describe '#error_unless_logged_in' do + it 'warns when not logged into vagrant cloud' do + allow(runner).to receive(:logged_in?).and_return(false) + expect { runner.error_unless_logged_in }.to output(/cannot upload/).to_stdout + end + + it 'does nothing when logged in' do + allow(runner).to receive(:logged_in?).and_return(true) + expect { runner.error_unless_logged_in }.not_to output.to_stdout + end + end + + describe '#start' do + it 'calls upload_box for each metadata file' do + allow(runner).to receive(:error_unless_logged_in) + allow(runner).to receive(:metadata_files).and_return(['a._metadata.json', 'b._metadata.json']) + expect(runner).to receive(:upload_box).twice + runner.start + end + + it 'uses the specified md_json when provided' do + r = described_class.new(build_opts(md_json: 'custom._metadata.json')) + allow(r).to receive(:error_unless_logged_in) + expect(r).to receive(:upload_box).with('custom._metadata.json') + r.start + end + end +end diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb new file mode 100644 index 000000000..918d478e3 --- /dev/null +++ b/spec/spec_helper.rb @@ -0,0 +1,53 @@ +# frozen_string_literal: true + +require 'json' +require 'fileutils' +require 'tmpdir' +require 'ostruct' + +# Add lib to load path +$LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..', 'lib') + +RSpec.configure do |config| + config.expect_with :rspec do |expectations| + expectations.include_chain_clauses_in_custom_matcher_descriptions = true + end + + config.mock_with :rspec do |mocks| + mocks.verify_partial_doubles = true + end + + config.shared_context_metadata_behavior = :apply_to_host_groups + config.filter_run_when_matching :focus + config.disable_monkey_patching! + config.warnings = true + config.order = :random + Kernel.srand config.seed +end + +# Helper: build a minimal OpenStruct opts suitable for most runners +def build_opts(overrides = {}) + defaults = { + debug: false, + no_shared: false, + provisioner: nil, + regx: nil, + md_json: nil, + template_files: [], + dry_run: false, + metadata_only: false, + on_error: nil, + only: nil, + except: nil, + mirror: nil, + headed: false, + single: false, + override_version: '202506.01.0', + cpus: nil, + mem: nil, + vars: nil, + var_files: nil, + config: false, + } + OpenStruct.new(defaults.merge(overrides)) +end From 6c949e8ccb1c894799cd832ee252b30e159423e4 Mon Sep 17 00:00:00 2001 From: Li-Wen Hsu <lwhsu@lwhsu.org> Date: Fri, 26 Jun 2026 17:58:25 -0300 Subject: [PATCH 1620/1622] Update FreeBSD 15 to 15.1-RELEASE (#1688) Signed-off-by: Li-Wen Hsu <lwhsu@lwhsu.org> --- os_pkrvars/freebsd/freebsd-15-aarch64.pkrvars.hcl | 6 +++--- os_pkrvars/freebsd/freebsd-15-x86_64.pkrvars.hcl | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/os_pkrvars/freebsd/freebsd-15-aarch64.pkrvars.hcl b/os_pkrvars/freebsd/freebsd-15-aarch64.pkrvars.hcl index 477efafba..88c7d056b 100644 --- a/os_pkrvars/freebsd/freebsd-15-aarch64.pkrvars.hcl +++ b/os_pkrvars/freebsd/freebsd-15-aarch64.pkrvars.hcl @@ -1,8 +1,8 @@ os_name = "freebsd" -os_version = "15.0" +os_version = "15.1" os_arch = "aarch64" -iso_url = "https://download.freebsd.org/releases/arm64/aarch64/ISO-IMAGES/15.0/FreeBSD-15.0-RELEASE-arm64-aarch64-dvd1.iso" -iso_checksum = "file:https://download.freebsd.org/releases/arm64/aarch64/ISO-IMAGES/15.0/CHECKSUM.SHA256-FreeBSD-15.0-RELEASE-arm64-aarch64" +iso_url = "https://download.freebsd.org/releases/arm64/aarch64/ISO-IMAGES/15.1/FreeBSD-15.1-RELEASE-arm64-aarch64-dvd1.iso" +iso_checksum = "file:https://download.freebsd.org/releases/arm64/aarch64/ISO-IMAGES/15.1/CHECKSUM.SHA256-FreeBSD-15.1-RELEASE-arm64-aarch64" parallels_guest_os_type = "freebsd" vbox_guest_os_type = "FreeBSD_arm64" vmware_guest_os_type = "arm-freebsd15-64" diff --git a/os_pkrvars/freebsd/freebsd-15-x86_64.pkrvars.hcl b/os_pkrvars/freebsd/freebsd-15-x86_64.pkrvars.hcl index 9b9b532de..4a0a5aca2 100644 --- a/os_pkrvars/freebsd/freebsd-15-x86_64.pkrvars.hcl +++ b/os_pkrvars/freebsd/freebsd-15-x86_64.pkrvars.hcl @@ -1,8 +1,8 @@ os_name = "freebsd" -os_version = "15.0" +os_version = "15.1" os_arch = "x86_64" -iso_url = "https://download.freebsd.org/releases/amd64/amd64/ISO-IMAGES/15.0/FreeBSD-15.0-RELEASE-amd64-dvd1.iso" -iso_checksum = "file:https://download.freebsd.org/releases/amd64/amd64/ISO-IMAGES/15.0/CHECKSUM.SHA256-FreeBSD-15.0-RELEASE-amd64" +iso_url = "https://download.freebsd.org/releases/amd64/amd64/ISO-IMAGES/15.1/FreeBSD-15.1-RELEASE-amd64-dvd1.iso" +iso_checksum = "file:https://download.freebsd.org/releases/amd64/amd64/ISO-IMAGES/15.1/CHECKSUM.SHA256-FreeBSD-15.1-RELEASE-amd64" parallels_guest_os_type = "freebsd" vbox_guest_os_type = "FreeBSD_64" vmware_guest_os_type = "freebsd-64" From e061a06461e80b4cef85bc6e2372c36dd7e3606f Mon Sep 17 00:00:00 2001 From: Seth Grover <13872653+mmguero@users.noreply.github.com> Date: Sat, 18 Jul 2026 13:42:55 +0000 Subject: [PATCH 1621/1622] Bump Debian from 13.5 to 13.6 (#1690) Signed-off-by: Seth Grover <seth.d.grover@gmail.com> --- os_pkrvars/debian/debian-13-aarch64.pkrvars.hcl | 4 ++-- os_pkrvars/debian/debian-13-x86_64.pkrvars.hcl | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/os_pkrvars/debian/debian-13-aarch64.pkrvars.hcl b/os_pkrvars/debian/debian-13-aarch64.pkrvars.hcl index 8fa9d8e0f..8461a90a8 100644 --- a/os_pkrvars/debian/debian-13-aarch64.pkrvars.hcl +++ b/os_pkrvars/debian/debian-13-aarch64.pkrvars.hcl @@ -1,7 +1,7 @@ os_name = "debian" -os_version = "13.5" +os_version = "13.6" os_arch = "aarch64" -iso_url = "https://cdimage.debian.org/debian-cd/current/arm64/iso-cd/debian-13.5.0-arm64-netinst.iso" +iso_url = "https://cdimage.debian.org/debian-cd/current/arm64/iso-cd/debian-13.6.0-arm64-netinst.iso" iso_checksum = "file:https://cdimage.debian.org/debian-cd/current/arm64/iso-cd/SHA256SUMS" parallels_guest_os_type = "debian" vbox_guest_os_type = "Debian12_arm64" diff --git a/os_pkrvars/debian/debian-13-x86_64.pkrvars.hcl b/os_pkrvars/debian/debian-13-x86_64.pkrvars.hcl index 36d9bbe04..b90b1dac6 100644 --- a/os_pkrvars/debian/debian-13-x86_64.pkrvars.hcl +++ b/os_pkrvars/debian/debian-13-x86_64.pkrvars.hcl @@ -1,7 +1,7 @@ os_name = "debian" -os_version = "13.5" +os_version = "13.6" os_arch = "x86_64" -iso_url = "https://cdimage.debian.org/debian-cd/current/amd64/iso-cd/debian-13.5.0-amd64-netinst.iso" +iso_url = "https://cdimage.debian.org/debian-cd/current/amd64/iso-cd/debian-13.6.0-amd64-netinst.iso" iso_checksum = "file:https://cdimage.debian.org/debian-cd/current/amd64/iso-cd/SHA256SUMS" parallels_guest_os_type = "debian" vbox_guest_os_type = "Debian12_64" From 251c9d137e2bfe18f63e0b2fdb7dbe47062f6fdb Mon Sep 17 00:00:00 2001 From: Sn0wCrack <442287+Sn0wCrack@users.noreply.github.com> Date: Tue, 21 Jul 2026 08:47:57 +1000 Subject: [PATCH 1622/1622] fix: sudo not preseving passed in environment variables (#1691) This mainly effects Ubuntu 26.04, but could affect any distribution that decides to disable `-E` on sudo in a similar manner. Passing the environment variables through after the sudo guarantees they will be preserved in any executed script. Signed-off-by: Sn0wCrack <442287+Sn0wCrack@users.noreply.github.com> --- packer_templates/pkr-builder.pkr.hcl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packer_templates/pkr-builder.pkr.hcl b/packer_templates/pkr-builder.pkr.hcl index 780ffe3eb..686a94639 100644 --- a/packer_templates/pkr-builder.pkr.hcl +++ b/packer_templates/pkr-builder.pkr.hcl @@ -84,7 +84,7 @@ locals { ] ) nix_execute_command = var.os_name == "freebsd" ? "echo 'vagrant' | {{.Vars}} su -m root -c 'sh -eux {{.Path}}'" : ( - var.os_name == "solaris" ? "echo 'vagrant'|sudo -S bash {{.Path}}" : "echo 'vagrant' | {{ .Vars }} sudo -S -E sh -eux '{{ .Path }}'" + var.os_name == "solaris" ? "echo 'vagrant'|sudo -S bash {{.Path}}" : "echo 'vagrant' | sudo -S {{ .Vars }} sh -eux '{{ .Path }}'" ) elevated_user = "vagrant" elevated_password = "vagrant"